diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index cf3a84baa3..400db26dc5 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -10,3 +10,8 @@
 # Date:   Fri Sep 16 00:53:24 2022 +0100
 # Renormalise line endings
 84f8a6848a8b05502d7618ca7af8cca74f2c3bae
+
+# Author: clang-format-bot <bot@clang-format>
+# Date:   9/22/2022 9:26:05 PM
+# Apply clang-format to code base
+ddb0522bbf2aa8aa7c9e139ff7395fb8ed6a841f
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b381d6cb5e..8bd6c60fd5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -123,12 +123,12 @@ Ubuntu_GCC:
 Clang_Format:
   extends: .Ubuntu_Image
   stage: checks
-  # TODO: Remove this once the entire project is formatted.
-  allow_failure: true
   cache:
     key: Ubuntu_Clang_Format.ubuntu_22.04.v1
     paths:
       - apt-cache/
+  variables:
+    CLANG_FORMAT: clang-format-14
   before_script:
     - CI/install_debian_deps.sh openmw-clang-format
   script:
diff --git a/CI/check_clang_format.sh b/CI/check_clang_format.sh
index 9ae45d48af..109849a98a 100755
--- a/CI/check_clang_format.sh
+++ b/CI/check_clang_format.sh
@@ -1,23 +1,25 @@
 #!/bin/bash
 
-CLANG_FORMAT="clang-format-14"
+CLANG_FORMAT="${CLANG_FORMAT:-clang-format}"
 HAS_DIFFS=0
 
+check_format_file() {
+    local item=$1
+    "$CLANG_FORMAT" --dry-run -Werror "$item" &>/dev/null 
+    if [[ $? = 1 ]]; then
+        "${CLANG_FORMAT}" "${item}" | git diff --color=always --no-index "${item}" -
+        HAS_DIFFS=1
+    fi
+}
+
 check_format() {
     local path=$1
-    local tempfile=$(mktemp)
-    for item in $(find $path -type f -name "*");
+    find "$path" -type f -name "*" | while read item;
     do
         if [[ "$item" =~ .*\.(cpp|hpp|h) ]]; then
-            echo "Checking code formatting on $item"
-            $CLANG_FORMAT $item > $tempfile
-            git diff --color=always --no-index $item $tempfile
-            if [[ $? = 1 ]]; then
-                HAS_DIFFS=1
-            fi
+            check_format_file "$item"
         fi;
     done;
-    rm -f $tempfile
 }
 
 check_format "./apps"
diff --git a/apps/benchmarks/detournavigator/navmeshtilescache.cpp b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
index 79726955c9..f1d024a25f 100644
--- a/apps/benchmarks/detournavigator/navmeshtilescache.cpp
+++ b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
@@ -56,11 +56,16 @@ namespace
     {
         switch (index)
         {
-            case 0: return AreaType_null;
-            case 1: return AreaType_water;
-            case 2: return AreaType_door;
-            case 3: return AreaType_pathgrid;
-            case 4: return AreaType_ground;
+            case 0:
+                return AreaType_null;
+            case 1:
+                return AreaType_water;
+            case 2:
+                return AreaType_door;
+            case 3:
+                return AreaType_pathgrid;
+            case 4:
+                return AreaType_ground;
         }
         return AreaType_null;
     }
@@ -83,7 +88,7 @@ namespace
     {
         std::uniform_real_distribution<float> distribution(0.0, 1.0);
         std::generate_n(out, count, [&] {
-            return CellWater {generateVec2i(1000, random), Water {ESM::Land::REAL_SIZE, distribution(random)}};
+            return CellWater{ generateVec2i(1000, random), Water{ ESM::Land::REAL_SIZE, distribution(random) } };
         });
     }
 
@@ -97,7 +102,8 @@ namespace
         if (distribution(random) < 0.939)
         {
             generateVertices(std::back_inserter(vertices), triangles * 2.467, random);
-            generateIndices(std::back_inserter(indices), static_cast<int>(vertices.size() / 3) - 1, vertices.size() * 1.279, random);
+            generateIndices(std::back_inserter(indices), static_cast<int>(vertices.size() / 3) - 1,
+                vertices.size() * 1.279, random);
             generateAreaTypes(std::back_inserter(areaTypes), indices.size() / 3, random);
         }
         return Mesh(std::move(indices), std::move(vertices), std::move(areaTypes));
@@ -113,10 +119,8 @@ namespace
         result.mMinHeight = distribution(random);
         result.mMaxHeight = result.mMinHeight + 1.0;
         result.mLength = static_cast<std::uint8_t>(ESM::Land::LAND_SIZE);
-        std::generate_n(std::back_inserter(result.mHeights), ESM::Land::LAND_NUM_VERTS, [&]
-        {
-            return distribution(random);
-        });
+        std::generate_n(
+            std::back_inserter(result.mHeights), ESM::Land::LAND_NUM_VERTS, [&] { return distribution(random); });
         result.mOriginalSize = ESM::Land::LAND_SIZE;
         result.mMinX = 0;
         result.mMinY = 0;
@@ -140,16 +144,16 @@ namespace
         const CollisionShapeType agentShapeType = CollisionShapeType::Aabb;
         const osg::Vec3f agentHalfExtents = generateAgentHalfExtents(0.5, 1.5, random);
         const TilePosition tilePosition = generateVec2i(10000, random);
-        const Version version {
+        const Version version{
             .mGeneration = std::uniform_int_distribution<std::size_t>(0, 100)(random),
             .mRevision = std::uniform_int_distribution<std::size_t>(0, 10000)(random),
         };
         Mesh mesh = generateMesh(triangles, random);
         std::vector<CellWater> water;
         generateWater(std::back_inserter(water), 1, random);
-        RecastMesh recastMesh(version, std::move(mesh), std::move(water),
-                              {generateHeightfield(random)}, {generateFlatHeightfield(random)}, {});
-        return Key {AgentBounds {agentShapeType, agentHalfExtents}, tilePosition, std::move(recastMesh)};
+        RecastMesh recastMesh(version, std::move(mesh), std::move(water), { generateHeightfield(random) },
+            { generateFlatHeightfield(random) }, {});
+        return Key{ AgentBounds{ agentShapeType, agentHalfExtents }, tilePosition, std::move(recastMesh) };
     }
 
     constexpr std::size_t trianglesPerTile = 239;
@@ -168,8 +172,7 @@ namespace
         while (true)
         {
             Key key = generateKey(trianglesPerTile, random);
-            cache.set(key.mAgentBounds, key.mTilePosition, key.mRecastMesh,
-                      std::make_unique<PreparedNavMeshData>());
+            cache.set(key.mAgentBounds, key.mTilePosition, key.mRecastMesh, std::make_unique<PreparedNavMeshData>());
             *out++ = std::move(key);
             const std::size_t newSize = cache.getStats().mNavMeshCacheSize;
             if (size >= newSize)
@@ -250,8 +253,8 @@ namespace
         while (state.KeepRunning())
         {
             const auto& key = keys[n++ % keys.size()];
-            const auto result = cache.set(key.mAgentBounds, key.mTilePosition, key.mRecastMesh,
-                                          std::make_unique<PreparedNavMeshData>());
+            const auto result = cache.set(
+                key.mAgentBounds, key.mTilePosition, key.mRecastMesh, std::make_unique<PreparedNavMeshData>());
             benchmark::DoNotOptimize(result);
         }
     }
diff --git a/apps/bsatool/bsatool.cpp b/apps/bsatool/bsatool.cpp
index d17a81c4f2..d2189a96e0 100644
--- a/apps/bsatool/bsatool.cpp
+++ b/apps/bsatool/bsatool.cpp
@@ -1,15 +1,15 @@
 #include <filesystem>
 #include <fstream>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 #include <vector>
 
 #include <boost/program_options.hpp>
 
 #include <components/bsa/compressedbsafile.hpp>
-#include <components/misc/strings/algorithm.hpp>
 #include <components/files/configurationmanager.hpp>
 #include <components/files/conversion.hpp>
+#include <components/misc/strings/algorithm.hpp>
 #include <components/misc/strings/conversion.hpp>
 
 #define BSATOOL_VERSION 1.1
@@ -29,7 +29,7 @@ struct Arguments
     bool fullpath;
 };
 
-bool parseOptions (int argc, char** argv, Arguments &info)
+bool parseOptions(int argc, char** argv, Arguments& info)
 {
     bpo::options_description desc(R"(Inspect and extract files from Bethesda BSA archives
 
@@ -61,7 +61,7 @@ Allowed options)");
 
     auto addHiddenOption = hidden.add_options();
     addHiddenOption("mode,m", bpo::value<std::string>(), "bsatool mode");
-    addHiddenOption("input-file,i", bpo::value< Files::MaybeQuotedPathContainer >(), "input file");
+    addHiddenOption("input-file,i", bpo::value<Files::MaybeQuotedPathContainer>(), "input file");
 
     bpo::positional_options_description p;
     p.add("mode", 1).add("input-file", 3);
@@ -73,53 +73,50 @@ Allowed options)");
     bpo::variables_map variables;
     try
     {
-        bpo::parsed_options valid_opts = bpo::command_line_parser(argc, argv)
-            .options(all).positional(p).run();
+        bpo::parsed_options valid_opts = bpo::command_line_parser(argc, argv).options(all).positional(p).run();
         bpo::store(valid_opts, variables);
     }
-    catch(std::exception &e)
+    catch (std::exception& e)
     {
-        std::cout << "ERROR parsing arguments: " << e.what() << "\n\n"
-            << desc << std::endl;
+        std::cout << "ERROR parsing arguments: " << e.what() << "\n\n" << desc << std::endl;
         return false;
     }
 
     bpo::notify(variables);
 
-    if (variables.count ("help"))
+    if (variables.count("help"))
     {
         std::cout << desc << std::endl;
         return false;
     }
-    if (variables.count ("version"))
+    if (variables.count("version"))
     {
         std::cout << "BSATool version " << BSATOOL_VERSION << std::endl;
         return false;
     }
     if (!variables.count("mode"))
     {
-        std::cout << "ERROR: no mode specified!\n\n"
-            << desc << std::endl;
+        std::cout << "ERROR: no mode specified!\n\n" << desc << std::endl;
         return false;
     }
 
     info.mode = variables["mode"].as<std::string>();
-    if (!(info.mode == "list" || info.mode == "extract" || info.mode == "extractall" || info.mode == "add" || info.mode == "create"))
+    if (!(info.mode == "list" || info.mode == "extract" || info.mode == "extractall" || info.mode == "add"
+            || info.mode == "create"))
     {
-        std::cout << std::endl << "ERROR: invalid mode \"" << info.mode << "\"\n\n"
-            << desc << std::endl;
+        std::cout << std::endl << "ERROR: invalid mode \"" << info.mode << "\"\n\n" << desc << std::endl;
         return false;
     }
 
     if (!variables.count("input-file"))
     {
-        std::cout << "\nERROR: missing BSA archive\n\n"
-            << desc << std::endl;
+        std::cout << "\nERROR: missing BSA archive\n\n" << desc << std::endl;
         return false;
     }
-    auto inputFiles = variables["input-file"].as< Files::MaybeQuotedPathContainer >();
+    auto inputFiles = variables["input-file"].as<Files::MaybeQuotedPathContainer>();
 
-    info.filename = inputFiles[0].u8string(); // This call to u8string is redundant, but required to build on MSVC 14.26 due to implementation bugs.
+    info.filename = inputFiles[0].u8string(); // This call to u8string is redundant, but required to build on MSVC 14.26
+                                              // due to implementation bugs.
 
     // Default output to the working directory
     info.outdir = std::filesystem::current_path();
@@ -128,28 +125,30 @@ Allowed options)");
     {
         if (inputFiles.size() < 2)
         {
-            std::cout << "\nERROR: file to extract unspecified\n\n"
-                << desc << std::endl;
+            std::cout << "\nERROR: file to extract unspecified\n\n" << desc << std::endl;
             return false;
         }
         if (inputFiles.size() > 1)
-            info.extractfile = inputFiles[1].u8string(); // This call to u8string is redundant, but required to build on MSVC 14.26 due to implementation bugs.
+            info.extractfile = inputFiles[1].u8string(); // This call to u8string is redundant, but required to build on
+                                                         // MSVC 14.26 due to implementation bugs.
         if (inputFiles.size() > 2)
-            info.outdir = inputFiles[2].u8string(); // This call to u8string is redundant, but required to build on MSVC 14.26 due to implementation bugs.
+            info.outdir = inputFiles[2].u8string(); // This call to u8string is redundant, but required to build on
+                                                    // MSVC 14.26 due to implementation bugs.
     }
     else if (info.mode == "add")
     {
         if (inputFiles.empty())
         {
-            std::cout << "\nERROR: file to add unspecified\n\n"
-                << desc << std::endl;
+            std::cout << "\nERROR: file to add unspecified\n\n" << desc << std::endl;
             return false;
         }
         if (inputFiles.size() > 1)
-            info.addfile = inputFiles[1].u8string(); // This call to u8string is redundant, but required to build on MSVC 14.26 due to implementation bugs.
+            info.addfile = inputFiles[1].u8string(); // This call to u8string is redundant, but required to build on
+                                                     // MSVC 14.26 due to implementation bugs.
     }
     else if (inputFiles.size() > 1)
-        info.outdir = inputFiles[1].u8string(); // This call to u8string is redundant, but required to build on MSVC 14.26 due to implementation bugs.
+        info.outdir = inputFiles[1].u8string(); // This call to u8string is redundant, but required to build on
+                                                // MSVC 14.26 due to implementation bugs.
 
     info.longformat = variables.count("long") != 0;
     info.fullpath = variables.count("full-path") != 0;
@@ -157,14 +156,14 @@ Allowed options)");
     return true;
 }
 
-template<typename File>
+template <typename File>
 int list(std::unique_ptr<File>& bsa, Arguments& info)
 {
     // List all files
-    const auto &files = bsa->getList();
+    const auto& files = bsa->getList();
     for (const auto& file : files)
     {
-        if(info.longformat)
+        if (info.longformat)
         {
             // Long format
             std::ios::fmtflags f(std::cout.flags());
@@ -180,7 +179,7 @@ int list(std::unique_ptr<File>& bsa, Arguments& info)
     return 0;
 }
 
-template<typename File>
+template <typename File>
 int extract(std::unique_ptr<File>& bsa, Arguments& info)
 {
     auto archivePath = info.extractfile.u8string();
@@ -207,7 +206,7 @@ int extract(std::unique_ptr<File>& bsa, Arguments& info)
     }
 
     // Get the target path (the path the file will be extracted to)
-    std::filesystem::path relPath (extractPath);
+    std::filesystem::path relPath(extractPath);
 
     std::filesystem::path target;
     if (info.fullpath)
@@ -221,14 +220,16 @@ int extract(std::unique_ptr<File>& bsa, Arguments& info)
     std::filesystem::file_status s = std::filesystem::status(target.parent_path());
     if (!std::filesystem::is_directory(s))
     {
-        std::cout << "ERROR: " << Files::pathToUnicodeString(target.parent_path()) << " is not a directory." << std::endl;
+        std::cout << "ERROR: " << Files::pathToUnicodeString(target.parent_path()) << " is not a directory."
+                  << std::endl;
         return 3;
     }
 
     std::ofstream out(target, std::ios::binary);
 
     // Write the file to disk
-    std::cout << "Extracting " << Files::pathToUnicodeString(info.extractfile) << " to " << Files::pathToUnicodeString(target) << std::endl;
+    std::cout << "Extracting " << Files::pathToUnicodeString(info.extractfile) << " to "
+              << Files::pathToUnicodeString(target) << std::endl;
 
     out << stream->rdbuf();
     out.close();
@@ -236,10 +237,10 @@ int extract(std::unique_ptr<File>& bsa, Arguments& info)
     return 0;
 }
 
-template<typename File>
+template <typename File>
 int extractAll(std::unique_ptr<File>& bsa, Arguments& info)
 {
-    for (const auto &file : bsa->getList())
+    for (const auto& file : bsa->getList())
     {
         std::string extractPath(file.name());
         Misc::StringUtils::replaceAll(extractPath, "\\", "/");
@@ -271,7 +272,7 @@ int extractAll(std::unique_ptr<File>& bsa, Arguments& info)
     return 0;
 }
 
-template<typename File>
+template <typename File>
 int add(std::unique_ptr<File>& bsa, Arguments& info)
 {
     std::fstream stream(info.addfile, std::ios_base::binary | std::ios_base::out | std::ios_base::in);
@@ -280,7 +281,7 @@ int add(std::unique_ptr<File>& bsa, Arguments& info)
     return 0;
 }
 
-template<typename File>
+template <typename File>
 int call(Arguments& info)
 {
     std::unique_ptr<File> bsa = std::make_unique<File>();
diff --git a/apps/bulletobjecttool/main.cpp b/apps/bulletobjecttool/main.cpp
index a274fd9209..4169ef271a 100644
--- a/apps/bulletobjecttool/main.cpp
+++ b/apps/bulletobjecttool/main.cpp
@@ -1,11 +1,13 @@
 #include <components/debug/debugging.hpp>
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/loadcell.hpp>
+#include <components/esm3/readerscache.hpp>
 #include <components/esmloader/esmdata.hpp>
 #include <components/esmloader/load.hpp>
 #include <components/fallback/fallback.hpp>
 #include <components/fallback/validate.hpp>
 #include <components/files/configurationmanager.hpp>
+#include <components/platform/platform.hpp>
 #include <components/resource/bulletshapemanager.hpp>
 #include <components/resource/foreachbulletobject.hpp>
 #include <components/resource/imagemanager.hpp>
@@ -15,8 +17,6 @@
 #include <components/version/version.hpp>
 #include <components/vfs/manager.hpp>
 #include <components/vfs/registerarchives.hpp>
-#include <components/esm3/readerscache.hpp>
-#include <components/platform/platform.hpp>
 
 #include <boost/program_options.hpp>
 
@@ -27,7 +27,6 @@
 #include <string>
 #include <vector>
 
-
 namespace
 {
     namespace bpo = boost::program_options;
@@ -44,33 +43,41 @@ namespace
 
         addOption("version", "print version information and quit");
 
-        addOption("data", bpo::value<Files::MaybeQuotedPathContainer>()->default_value(Files::MaybeQuotedPathContainer(), "data")
-                ->multitoken()->composing(), "set data directories (later directories have higher priority)");
-
-        addOption("data-local", bpo::value<Files::MaybeQuotedPathContainer::value_type>()->default_value(Files::MaybeQuotedPathContainer::value_type(), ""),
-                "set local data directory (highest priority)");
-
-        addOption("fallback-archive", bpo::value<StringsVector>()->default_value(StringsVector(), "fallback-archive")
-                ->multitoken()->composing(), "set fallback BSA archives (later archives have higher priority)");
-
-        addOption("resources", bpo::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), "resources"),
-                "set resources directory");
-
-        addOption("content", bpo::value<StringsVector>()->default_value(StringsVector(), "")
-                ->multitoken()->composing(), "content file(s): esm/esp, or omwgame/omwaddon/omwscripts");
-
-        addOption("fs-strict", bpo::value<bool>()->implicit_value(true)
-                ->default_value(false), "strict file system handling (no case folding)");
-
-        addOption("encoding", bpo::value<std::string>()->
-                default_value("win1252"),
-                "Character encoding used in OpenMW game messages:\n"
-                "\n\twin1250 - Central and Eastern European such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, Croatian, Serbian (Latin script), Romanian and Albanian languages\n"
-                "\n\twin1251 - Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic and other languages\n"
-                "\n\twin1252 - Western European (Latin) alphabet, used by default");
-
-        addOption("fallback", bpo::value<FallbackMap>()->default_value(FallbackMap(), "")
-                ->multitoken()->composing(), "fallback values");
+        addOption("data",
+            bpo::value<Files::MaybeQuotedPathContainer>()
+                ->default_value(Files::MaybeQuotedPathContainer(), "data")
+                ->multitoken()
+                ->composing(),
+            "set data directories (later directories have higher priority)");
+
+        addOption("data-local",
+            bpo::value<Files::MaybeQuotedPathContainer::value_type>()->default_value(
+                Files::MaybeQuotedPathContainer::value_type(), ""),
+            "set local data directory (highest priority)");
+
+        addOption("fallback-archive",
+            bpo::value<StringsVector>()->default_value(StringsVector(), "fallback-archive")->multitoken()->composing(),
+            "set fallback BSA archives (later archives have higher priority)");
+
+        addOption("resources",
+            bpo::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), "resources"),
+            "set resources directory");
+
+        addOption("content", bpo::value<StringsVector>()->default_value(StringsVector(), "")->multitoken()->composing(),
+            "content file(s): esm/esp, or omwgame/omwaddon/omwscripts");
+
+        addOption("fs-strict", bpo::value<bool>()->implicit_value(true)->default_value(false),
+            "strict file system handling (no case folding)");
+
+        addOption("encoding", bpo::value<std::string>()->default_value("win1252"),
+            "Character encoding used in OpenMW game messages:\n"
+            "\n\twin1250 - Central and Eastern European such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, "
+            "Croatian, Serbian (Latin script), Romanian and Albanian languages\n"
+            "\n\twin1251 - Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic and other languages\n"
+            "\n\twin1252 - Western European (Latin) alphabet, used by default");
+
+        addOption("fallback", bpo::value<FallbackMap>()->default_value(FallbackMap(), "")->multitoken()->composing(),
+            "fallback values");
         ;
         Files::ConfigurationManager::addCommonOptions(result);
 
@@ -81,7 +88,7 @@ namespace
     {
         const float (&mValue)[3];
 
-        friend std::ostream& operator <<(std::ostream& stream, const WriteArray& value)
+        friend std::ostream& operator<<(std::ostream& stream, const WriteArray& value)
         {
             for (std::size_t i = 0; i < 2; ++i)
                 stream << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.mValue[i] << ", ";
@@ -104,14 +111,13 @@ namespace
         return buffer;
     }
 
-    int runBulletObjectTool(int argc, char *argv[])
+    int runBulletObjectTool(int argc, char* argv[])
     {
         Platform::init();
 
         bpo::options_description desc = makeOptionsDescription();
 
-        bpo::parsed_options options = bpo::command_line_parser(argc, argv)
-            .options(desc).allow_unregistered().run();
+        bpo::parsed_options options = bpo::command_line_parser(argc, argv).options(desc).allow_unregistered().run();
         bpo::variables_map variables;
 
         bpo::store(options, variables);
@@ -168,25 +174,28 @@ namespace
         query.mLoadGameSettings = true;
         query.mLoadLands = true;
         query.mLoadStatics = true;
-        const EsmLoader::EsmData esmData = EsmLoader::loadEsmData(query, contentFiles, fileCollections, readers, &encoder);
+        const EsmLoader::EsmData esmData
+            = EsmLoader::loadEsmData(query, contentFiles, fileCollections, readers, &encoder);
 
         Resource::ImageManager imageManager(&vfs);
         Resource::NifFileManager nifFileManager(&vfs);
         Resource::SceneManager sceneManager(&vfs, &imageManager, &nifFileManager);
         Resource::BulletShapeManager bulletShapeManager(&vfs, &sceneManager, &nifFileManager);
 
-        Resource::forEachBulletObject(readers, vfs, bulletShapeManager, esmData,
-            [] (const ESM::Cell& cell, const Resource::BulletObject& object)
-            {
+        Resource::forEachBulletObject(
+            readers, vfs, bulletShapeManager, esmData, [](const ESM::Cell& cell, const Resource::BulletObject& object) {
                 Log(Debug::Verbose) << "Found bullet object in " << (cell.isExterior() ? "exterior" : "interior")
-                    << " cell \"" << cell.getDescription() << "\":"
-                    << " fileName=\"" << object.mShape->mFileName << '"'
-                    << " fileHash=" << toHex(object.mShape->mFileHash)
-                    << " collisionShape=" << std::boolalpha << (object.mShape->mCollisionShape == nullptr)
-                    << " avoidCollisionShape=" << std::boolalpha << (object.mShape->mAvoidCollisionShape == nullptr)
-                    << " position=(" << WriteArray {object.mPosition.pos} << ')'
-                    << " rotation=(" << WriteArray {object.mPosition.rot} << ')'
-                    << " scale=" << std::setprecision(std::numeric_limits<float>::max_exponent10) << object.mScale;
+                                    << " cell \"" << cell.getDescription() << "\":"
+                                    << " fileName=\"" << object.mShape->mFileName << '"'
+                                    << " fileHash=" << toHex(object.mShape->mFileHash)
+                                    << " collisionShape=" << std::boolalpha
+                                    << (object.mShape->mCollisionShape == nullptr)
+                                    << " avoidCollisionShape=" << std::boolalpha
+                                    << (object.mShape->mAvoidCollisionShape == nullptr) << " position=("
+                                    << WriteArray{ object.mPosition.pos } << ')' << " rotation=("
+                                    << WriteArray{ object.mPosition.rot } << ')'
+                                    << " scale=" << std::setprecision(std::numeric_limits<float>::max_exponent10)
+                                    << object.mScale;
             });
 
         Log(Debug::Info) << "Done";
@@ -195,7 +204,7 @@ namespace
     }
 }
 
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 {
     return wrapApplication(runBulletObjectTool, argc, argv, "BulletObjectTool");
 }
diff --git a/apps/esmtool/arguments.hpp b/apps/esmtool/arguments.hpp
index bc5795942f..296b697089 100644
--- a/apps/esmtool/arguments.hpp
+++ b/apps/esmtool/arguments.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_ESMTOOL_ARGUMENTS_H
 #define OPENMW_ESMTOOL_ARGUMENTS_H
 
-#include <vector>
-#include <optional>
 #include <filesystem>
+#include <optional>
+#include <vector>
 
 #include <components/esm/format.hpp>
 
diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index f2c12869f4..f20a9f287b 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -1,54 +1,53 @@
-#include <iostream>
-#include <vector>
+#include <cmath>
 #include <deque>
+#include <fstream>
+#include <iomanip>
+#include <iostream>
 #include <list>
-#include <unordered_set>
 #include <map>
-#include <fstream>
-#include <cmath>
 #include <memory>
 #include <optional>
-#include <iomanip>
+#include <unordered_set>
+#include <vector>
 
 #include <boost/program_options.hpp>
 
+#include <components/esm/format.hpp>
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/esmwriter.hpp>
-#include <components/esm/format.hpp>
-#include <components/files/openfile.hpp>
-#include <components/misc/strings/algorithm.hpp>
 #include <components/files/configurationmanager.hpp>
 #include <components/files/conversion.hpp>
+#include <components/files/openfile.hpp>
+#include <components/misc/strings/algorithm.hpp>
 
-#include "record.hpp"
-#include "labels.hpp"
 #include "arguments.hpp"
+#include "labels.hpp"
+#include "record.hpp"
 #include "tes4.hpp"
 
 namespace
 {
 
-using namespace EsmTool;
-
-constexpr unsigned majorVersion = 1;
-constexpr unsigned minorVersion = 3;
+    using namespace EsmTool;
 
-// Create a local alias for brevity
-namespace bpo = boost::program_options;
+    constexpr unsigned majorVersion = 1;
+    constexpr unsigned minorVersion = 3;
 
-struct ESMData
-{
-    ESM::Header mHeader;
-    std::deque<std::unique_ptr<EsmTool::RecordBase>> mRecords;
-    // Value: (Reference, Deleted flag)
-    std::map<ESM::Cell *, std::deque<std::pair<ESM::CellRef, bool> > > mCellRefs;
-    std::map<int, int> mRecordStats;
-
-};
+    // Create a local alias for brevity
+    namespace bpo = boost::program_options;
 
-bool parseOptions (int argc, char** argv, Arguments &info)
-{
-    bpo::options_description desc(R"(Inspect and extract from Morrowind ES files (ESM, ESP, ESS)
+    struct ESMData
+    {
+        ESM::Header mHeader;
+        std::deque<std::unique_ptr<EsmTool::RecordBase>> mRecords;
+        // Value: (Reference, Deleted flag)
+        std::map<ESM::Cell*, std::deque<std::pair<ESM::CellRef, bool>>> mCellRefs;
+        std::map<int, int> mRecordStats;
+    };
+
+    bool parseOptions(int argc, char** argv, Arguments& info)
+    {
+        bpo::options_description desc(R"(Inspect and extract from Morrowind ES files (ESM, ESP, ESS)
 Syntax: esmtool [options] mode infile [outfile]
 Allowed modes:
   dump   Dumps all readable data from the input file.
@@ -56,148 +55,148 @@ Allowed modes:
   comp   Compares the given files.
 
 Allowed options)");
-    auto addOption = desc.add_options();
-    addOption("help,h", "print help message.");
-    addOption("version,v", "print version information and quit.");
-    addOption("raw,r", bpo::value<std::string>(),
-         "Show an unformatted list of all records and subrecords of given format:\n"
-         "\n\tTES3"
-         "\n\tTES4");
+        auto addOption = desc.add_options();
+        addOption("help,h", "print help message.");
+        addOption("version,v", "print version information and quit.");
+        addOption("raw,r", bpo::value<std::string>(),
+            "Show an unformatted list of all records and subrecords of given format:\n"
+            "\n\tTES3"
+            "\n\tTES4");
         // The intention is that this option would interact better
         // with other modes including clone, dump, and raw.
-    addOption("type,t", bpo::value< std::vector<std::string> >(),
-         "Show only records of this type (four character record code).  May "
-         "be specified multiple times.  Only affects dump mode.");
-    addOption("name,n", bpo::value<std::string>(),
-         "Show only the record with this name.  Only affects dump mode.");
-    addOption("plain,p", "Print contents of dialogs, books and scripts. "
-         "(skipped by default)"
-         "Only affects dump mode.");
-    addOption("quiet,q", "Suppress all record information. Useful for speed tests.");
-    addOption("loadcells,C", "Browse through contents of all cells.");
-
-    addOption( "encoding,e", bpo::value<std::string>(&(info.encoding))->
-          default_value("win1252"),
-          "Character encoding used in ESMTool:\n"
-          "\n\twin1250 - Central and Eastern European such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, Croatian, Serbian (Latin script), Romanian and Albanian languages\n"
-          "\n\twin1251 - Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic and other languages\n"
-          "\n\twin1252 - Western European (Latin) alphabet, used by default")
-        ;
-
-    std::string finalText = "\nIf no option is given, the default action is to parse all records in the archive\nand display diagnostic information.";
-
-    // input-file is hidden and used as a positional argument
-    bpo::options_description hidden("Hidden Options");
-    auto addHiddenOption = hidden.add_options();
-    addHiddenOption( "mode,m", bpo::value<std::string>(), "esmtool mode");
-    addHiddenOption( "input-file,i", bpo::value< Files::MaybeQuotedPathContainer >(), "input file");
-
-    bpo::positional_options_description p;
-    p.add("mode", 1).add("input-file", 2);
-
-    // there might be a better way to do this
-    bpo::options_description all;
-    all.add(desc).add(hidden);
-    bpo::variables_map variables;
+        addOption("type,t", bpo::value<std::vector<std::string>>(),
+            "Show only records of this type (four character record code).  May "
+            "be specified multiple times.  Only affects dump mode.");
+        addOption("name,n", bpo::value<std::string>(), "Show only the record with this name.  Only affects dump mode.");
+        addOption("plain,p",
+            "Print contents of dialogs, books and scripts. "
+            "(skipped by default)"
+            "Only affects dump mode.");
+        addOption("quiet,q", "Suppress all record information. Useful for speed tests.");
+        addOption("loadcells,C", "Browse through contents of all cells.");
+
+        addOption("encoding,e", bpo::value<std::string>(&(info.encoding))->default_value("win1252"),
+            "Character encoding used in ESMTool:\n"
+            "\n\twin1250 - Central and Eastern European such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, "
+            "Croatian, Serbian (Latin script), Romanian and Albanian languages\n"
+            "\n\twin1251 - Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic and other languages\n"
+            "\n\twin1252 - Western European (Latin) alphabet, used by default");
+
+        std::string finalText
+            = "\nIf no option is given, the default action is to parse all records in the archive\nand display "
+              "diagnostic information.";
+
+        // input-file is hidden and used as a positional argument
+        bpo::options_description hidden("Hidden Options");
+        auto addHiddenOption = hidden.add_options();
+        addHiddenOption("mode,m", bpo::value<std::string>(), "esmtool mode");
+        addHiddenOption("input-file,i", bpo::value<Files::MaybeQuotedPathContainer>(), "input file");
+
+        bpo::positional_options_description p;
+        p.add("mode", 1).add("input-file", 2);
+
+        // there might be a better way to do this
+        bpo::options_description all;
+        all.add(desc).add(hidden);
+        bpo::variables_map variables;
+
+        try
+        {
+            bpo::parsed_options valid_opts = bpo::command_line_parser(argc, argv).options(all).positional(p).run();
 
-    try
-    {
-        bpo::parsed_options valid_opts = bpo::command_line_parser(argc, argv)
-            .options(all).positional(p).run();
+            bpo::store(valid_opts, variables);
+        }
+        catch (std::exception& e)
+        {
+            std::cout << "ERROR parsing arguments: " << e.what() << std::endl;
+            return false;
+        }
 
-        bpo::store(valid_opts, variables);
-    }
-    catch(std::exception &e)
-    {
-        std::cout << "ERROR parsing arguments: " << e.what() << std::endl;
-        return false;
-    }
+        bpo::notify(variables);
 
-    bpo::notify(variables);
+        if (variables.count("help"))
+        {
+            std::cout << desc << finalText << std::endl;
+            return false;
+        }
+        if (variables.count("version"))
+        {
+            std::cout << "ESMTool version " << majorVersion << '.' << minorVersion << std::endl;
+            return false;
+        }
+        if (!variables.count("mode"))
+        {
+            std::cout << "No mode specified!\n\n" << desc << finalText << std::endl;
+            return false;
+        }
 
-    if (variables.count ("help"))
-    {
-        std::cout << desc << finalText << std::endl;
-        return false;
-    }
-    if (variables.count ("version"))
-    {
-        std::cout << "ESMTool version " << majorVersion << '.' << minorVersion << std::endl;
-        return false;
-    }
-    if (!variables.count("mode"))
-    {
-        std::cout << "No mode specified!\n\n"
-                  << desc << finalText << std::endl;
-        return false;
-    }
+        if (variables.count("type") > 0)
+            info.types = variables["type"].as<std::vector<std::string>>();
+        if (variables.count("name") > 0)
+            info.name = variables["name"].as<std::string>();
 
-    if (variables.count("type") > 0)
-        info.types = variables["type"].as< std::vector<std::string> >();
-    if (variables.count("name") > 0)
-        info.name = variables["name"].as<std::string>();
+        info.mode = variables["mode"].as<std::string>();
+        if (!(info.mode == "dump" || info.mode == "clone" || info.mode == "comp"))
+        {
+            std::cout << "\nERROR: invalid mode \"" << info.mode << "\"\n\n" << desc << finalText << std::endl;
+            return false;
+        }
 
-    info.mode = variables["mode"].as<std::string>();
-    if (!(info.mode == "dump" || info.mode == "clone" || info.mode == "comp"))
-    {
-        std::cout << "\nERROR: invalid mode \"" << info.mode << "\"\n\n"
-                  << desc << finalText << std::endl;
-        return false;
-    }
+        if (!variables.count("input-file"))
+        {
+            std::cout << "\nERROR: missing ES file\n\n";
+            std::cout << desc << finalText << std::endl;
+            return false;
+        }
 
-    if ( !variables.count("input-file") )
-    {
-        std::cout << "\nERROR: missing ES file\n\n";
-        std::cout << desc << finalText << std::endl;
-        return false;
-    }
+        // handling gracefully the user adding multiple files
+        /*    if (variables["input-file"].as< std::vector<std::string> >().size() > 1)
+              {
+              std::cout << "\nERROR: more than one ES file specified\n\n";
+              std::cout << desc << finalText << std::endl;
+              return false;
+              }*/
+
+        const auto inputFiles = variables["input-file"].as<Files::MaybeQuotedPathContainer>();
+        info.filename = inputFiles[0].u8string(); // This call to u8string is redundant, but required to build on
+                                                  // MSVC 14.26 due to implementation bugs.
+        if (inputFiles.size() > 1)
+            info.outname = inputFiles[1].u8string(); // This call to u8string is redundant, but required to build on
+                                                     // MSVC 14.26 due to implementation bugs.
+
+        if (const auto it = variables.find("raw"); it != variables.end())
+            info.mRawFormat = ESM::parseFormat(it->second.as<std::string>());
+
+        info.quiet_given = variables.count("quiet") != 0;
+        info.loadcells_given = variables.count("loadcells") != 0;
+        info.plain_given = variables.count("plain") != 0;
+
+        // Font encoding settings
+        info.encoding = variables["encoding"].as<std::string>();
+        if (info.encoding != "win1250" && info.encoding != "win1251" && info.encoding != "win1252")
+        {
+            std::cout << info.encoding << " is not a valid encoding option.\n";
+            info.encoding = "win1252";
+        }
+        std::cout << ToUTF8::encodingUsingMessage(info.encoding) << std::endl;
 
-    // handling gracefully the user adding multiple files
-/*    if (variables["input-file"].as< std::vector<std::string> >().size() > 1)
-      {
-      std::cout << "\nERROR: more than one ES file specified\n\n";
-      std::cout << desc << finalText << std::endl;
-      return false;
-      }*/
-
-    const auto inputFiles = variables["input-file"].as< Files::MaybeQuotedPathContainer >();
-    info.filename = inputFiles[0].u8string(); // This call to u8string is redundant, but required to build on MSVC 14.26 due to implementation bugs.
-    if (inputFiles.size() > 1)
-        info.outname = inputFiles[1].u8string(); // This call to u8string is redundant, but required to build on MSVC 14.26 due to implementation bugs.
-
-    if (const auto it = variables.find("raw"); it != variables.end())
-        info.mRawFormat = ESM::parseFormat(it->second.as<std::string>());
-
-    info.quiet_given = variables.count ("quiet") != 0;
-    info.loadcells_given = variables.count ("loadcells") != 0;
-    info.plain_given = variables.count("plain") != 0;
-
-    // Font encoding settings
-    info.encoding = variables["encoding"].as<std::string>();
-    if(info.encoding != "win1250" && info.encoding != "win1251" && info.encoding != "win1252")
-    {
-        std::cout << info.encoding << " is not a valid encoding option.\n";
-        info.encoding = "win1252";
+        return true;
     }
-    std::cout << ToUTF8::encodingUsingMessage(info.encoding) << std::endl;
-
-    return true;
-}
 
-void loadCell(const Arguments& info, ESM::Cell &cell, ESM::ESMReader &esm, ESMData* data);
+    void loadCell(const Arguments& info, ESM::Cell& cell, ESM::ESMReader& esm, ESMData* data);
 
-int load(const Arguments& info, ESMData* data);
-int clone(const Arguments& info);
-int comp(const Arguments& info);
+    int load(const Arguments& info, ESMData* data);
+    int clone(const Arguments& info);
+    int comp(const Arguments& info);
 
 }
 
-int main(int argc, char**argv)
+int main(int argc, char** argv)
 {
     try
     {
         Arguments info;
-        if(!parseOptions (argc, argv, info))
+        if (!parseOptions(argc, argv, info))
             return 1;
 
         if (info.mode == "dump")
@@ -224,370 +223,379 @@ int main(int argc, char**argv)
 namespace
 {
 
-void loadCell(const Arguments& info, ESM::Cell &cell, ESM::ESMReader &esm, ESMData* data)
-{
-    bool quiet = (info.quiet_given || info.mode == "clone");
-    bool save = (info.mode == "clone");
-
-    // Skip back to the beginning of the reference list
-    // FIXME: Changes to the references backend required to support multiple plugins have
-    //  almost certainly broken this following line. I'll leave it as is for now, so that
-    //  the compiler does not complain.
-    cell.restore(esm, 0);
-
-    // Loop through all the references
-    ESM::CellRef ref;
-    if(!quiet) std::cout << "  References:\n";
-
-    bool deleted = false;
-    ESM::MovedCellRef movedCellRef;
-    bool moved = false;
-    while(cell.getNextRef(esm, ref, deleted, movedCellRef, moved))
+    void loadCell(const Arguments& info, ESM::Cell& cell, ESM::ESMReader& esm, ESMData* data)
     {
-        if (data != nullptr && save)
-            data->mCellRefs[&cell].push_back(std::make_pair(ref, deleted));
-
-        if(quiet) continue;
-
-        std::cout << "  - Refnum: " << ref.mRefNum.mIndex << '\n';
-        std::cout << "    ID: " << ref.mRefID << '\n';
-        std::cout << "    Position: (" << ref.mPos.pos[0] << ", " << ref.mPos.pos[1] << ", " << ref.mPos.pos[2] << ")\n";
-        if (ref.mScale != 1.f)
-            std::cout << "    Scale: " << ref.mScale << '\n';
-        if (!ref.mOwner.empty())
-            std::cout << "    Owner: " << ref.mOwner << '\n';
-        if (!ref.mGlobalVariable.empty())
-            std::cout << "    Global: " << ref.mGlobalVariable << '\n';
-        if (!ref.mFaction.empty())
-            std::cout << "    Faction: " << ref.mFaction << '\n';
-        if (!ref.mFaction.empty() || ref.mFactionRank != -2)
-            std::cout << "    Faction rank: " << ref.mFactionRank << '\n';
-        std::cout << "    Enchantment charge: " << ref.mEnchantmentCharge << '\n';
-        std::cout << "    Uses/health: " << ref.mChargeInt << '\n';
-        std::cout << "    Gold value: " << ref.mGoldValue << '\n';
-        std::cout << "    Blocked: " << static_cast<int>(ref.mReferenceBlocked) << '\n';
-        std::cout << "    Deleted: " << deleted << '\n';
-        if (!ref.mKey.empty())
-            std::cout << "    Key: " << ref.mKey << '\n';
-        std::cout << "    Lock level: " << ref.mLockLevel << '\n';
-        if (!ref.mTrap.empty())
-            std::cout << "    Trap: " << ref.mTrap << '\n';
-        if (!ref.mSoul.empty())
-            std::cout << "    Soul: " << ref.mSoul << '\n';
-        if (ref.mTeleport)
-        {
-            std::cout << "    Destination position: (" << ref.mDoorDest.pos[0] << ", "
-                      << ref.mDoorDest.pos[1] << ", " << ref.mDoorDest.pos[2] << ")\n";
-            if (!ref.mDestCell.empty())
-                std::cout << "    Destination cell: " << ref.mDestCell << '\n';
-        }
-        std::cout << "    Moved: " << std::boolalpha << moved << std::noboolalpha << '\n';
-        if (moved)
+        bool quiet = (info.quiet_given || info.mode == "clone");
+        bool save = (info.mode == "clone");
+
+        // Skip back to the beginning of the reference list
+        // FIXME: Changes to the references backend required to support multiple plugins have
+        //  almost certainly broken this following line. I'll leave it as is for now, so that
+        //  the compiler does not complain.
+        cell.restore(esm, 0);
+
+        // Loop through all the references
+        ESM::CellRef ref;
+        if (!quiet)
+            std::cout << "  References:\n";
+
+        bool deleted = false;
+        ESM::MovedCellRef movedCellRef;
+        bool moved = false;
+        while (cell.getNextRef(esm, ref, deleted, movedCellRef, moved))
         {
-            std::cout << "    Moved refnum: " << movedCellRef.mRefNum.mIndex << '\n';
-            std::cout << "    Moved content file: " << movedCellRef.mRefNum.mContentFile << '\n';
-            std::cout << "    Target: " << movedCellRef.mTarget[0] << ", " << movedCellRef.mTarget[1] << '\n';
+            if (data != nullptr && save)
+                data->mCellRefs[&cell].push_back(std::make_pair(ref, deleted));
+
+            if (quiet)
+                continue;
+
+            std::cout << "  - Refnum: " << ref.mRefNum.mIndex << '\n';
+            std::cout << "    ID: " << ref.mRefID << '\n';
+            std::cout << "    Position: (" << ref.mPos.pos[0] << ", " << ref.mPos.pos[1] << ", " << ref.mPos.pos[2]
+                      << ")\n";
+            if (ref.mScale != 1.f)
+                std::cout << "    Scale: " << ref.mScale << '\n';
+            if (!ref.mOwner.empty())
+                std::cout << "    Owner: " << ref.mOwner << '\n';
+            if (!ref.mGlobalVariable.empty())
+                std::cout << "    Global: " << ref.mGlobalVariable << '\n';
+            if (!ref.mFaction.empty())
+                std::cout << "    Faction: " << ref.mFaction << '\n';
+            if (!ref.mFaction.empty() || ref.mFactionRank != -2)
+                std::cout << "    Faction rank: " << ref.mFactionRank << '\n';
+            std::cout << "    Enchantment charge: " << ref.mEnchantmentCharge << '\n';
+            std::cout << "    Uses/health: " << ref.mChargeInt << '\n';
+            std::cout << "    Gold value: " << ref.mGoldValue << '\n';
+            std::cout << "    Blocked: " << static_cast<int>(ref.mReferenceBlocked) << '\n';
+            std::cout << "    Deleted: " << deleted << '\n';
+            if (!ref.mKey.empty())
+                std::cout << "    Key: " << ref.mKey << '\n';
+            std::cout << "    Lock level: " << ref.mLockLevel << '\n';
+            if (!ref.mTrap.empty())
+                std::cout << "    Trap: " << ref.mTrap << '\n';
+            if (!ref.mSoul.empty())
+                std::cout << "    Soul: " << ref.mSoul << '\n';
+            if (ref.mTeleport)
+            {
+                std::cout << "    Destination position: (" << ref.mDoorDest.pos[0] << ", " << ref.mDoorDest.pos[1]
+                          << ", " << ref.mDoorDest.pos[2] << ")\n";
+                if (!ref.mDestCell.empty())
+                    std::cout << "    Destination cell: " << ref.mDestCell << '\n';
+            }
+            std::cout << "    Moved: " << std::boolalpha << moved << std::noboolalpha << '\n';
+            if (moved)
+            {
+                std::cout << "    Moved refnum: " << movedCellRef.mRefNum.mIndex << '\n';
+                std::cout << "    Moved content file: " << movedCellRef.mRefNum.mContentFile << '\n';
+                std::cout << "    Target: " << movedCellRef.mTarget[0] << ", " << movedCellRef.mTarget[1] << '\n';
+            }
         }
     }
-}
 
-void printRawTes3(const std::filesystem::path &path)
-{
-    std::cout << "TES3 RAW file listing: " << Files::pathToUnicodeString(path) << '\n';
-    ESM::ESMReader esm;
-    esm.openRaw(path);
-    while(esm.hasMoreRecs())
+    void printRawTes3(const std::filesystem::path& path)
     {
-        ESM::NAME n = esm.getRecName();
-        std::cout << "Record: " << n.toStringView() << '\n';
-        esm.getRecHeader();
-        while(esm.hasMoreSubs())
+        std::cout << "TES3 RAW file listing: " << Files::pathToUnicodeString(path) << '\n';
+        ESM::ESMReader esm;
+        esm.openRaw(path);
+        while (esm.hasMoreRecs())
         {
-            size_t offs = esm.getFileOffset();
-            esm.getSubName();
-            esm.skipHSub();
-            n = esm.retSubName();
-            std::ios::fmtflags f(std::cout.flags());
-            std::cout << "    " << n.toStringView() << " - " << esm.getSubSize()
-                 << " bytes @ 0x" << std::hex << offs << '\n';
-            std::cout.flags(f);
+            ESM::NAME n = esm.getRecName();
+            std::cout << "Record: " << n.toStringView() << '\n';
+            esm.getRecHeader();
+            while (esm.hasMoreSubs())
+            {
+                size_t offs = esm.getFileOffset();
+                esm.getSubName();
+                esm.skipHSub();
+                n = esm.retSubName();
+                std::ios::fmtflags f(std::cout.flags());
+                std::cout << "    " << n.toStringView() << " - " << esm.getSubSize() << " bytes @ 0x" << std::hex
+                          << offs << '\n';
+                std::cout.flags(f);
+            }
         }
     }
-}
 
-int loadTes3(const Arguments& info, std::unique_ptr<std::ifstream>&& stream, ESMData* data)
-{
-    std::cout << "Loading TES3 file: " << info.filename << '\n';
+    int loadTes3(const Arguments& info, std::unique_ptr<std::ifstream>&& stream, ESMData* data)
+    {
+        std::cout << "Loading TES3 file: " << info.filename << '\n';
 
-    ESM::ESMReader esm;
-    ToUTF8::Utf8Encoder encoder (ToUTF8::calculateEncoding(info.encoding));
-    esm.setEncoder(&encoder);
+        ESM::ESMReader esm;
+        ToUTF8::Utf8Encoder encoder(ToUTF8::calculateEncoding(info.encoding));
+        esm.setEncoder(&encoder);
 
-    std::unordered_set<uint32_t> skipped;
+        std::unordered_set<uint32_t> skipped;
 
-    try
-    {
-        bool quiet = (info.quiet_given || info.mode == "clone");
-        bool loadCells = (info.loadcells_given || info.mode == "clone");
-        bool save = (info.mode == "clone");
+        try
+        {
+            bool quiet = (info.quiet_given || info.mode == "clone");
+            bool loadCells = (info.loadcells_given || info.mode == "clone");
+            bool save = (info.mode == "clone");
 
-        esm.open(std::move(stream), info.filename);
+            esm.open(std::move(stream), info.filename);
 
-        if (data != nullptr)
-            data->mHeader = esm.getHeader();
+            if (data != nullptr)
+                data->mHeader = esm.getHeader();
 
-        if (!quiet)
-        {
-            std::cout << "Author: " << esm.getAuthor() << '\n'
-                 << "Description: " << esm.getDesc() << '\n'
-                 << "File format version: " << esm.getFVer() << '\n';
-            std::vector<ESM::Header::MasterData> masterData = esm.getGameFiles();
-            if (!masterData.empty())
+            if (!quiet)
             {
-                std::cout << "Masters:" << '\n';
-                for(const auto& master : masterData)
-                    std::cout << "  " << master.name << ", " << master.size << " bytes\n";
+                std::cout << "Author: " << esm.getAuthor() << '\n'
+                          << "Description: " << esm.getDesc() << '\n'
+                          << "File format version: " << esm.getFVer() << '\n';
+                std::vector<ESM::Header::MasterData> masterData = esm.getGameFiles();
+                if (!masterData.empty())
+                {
+                    std::cout << "Masters:" << '\n';
+                    for (const auto& master : masterData)
+                        std::cout << "  " << master.name << ", " << master.size << " bytes\n";
+                }
             }
-        }
-
-        // Loop through all records
-        while(esm.hasMoreRecs())
-        {
-            const ESM::NAME n = esm.getRecName();
-            uint32_t flags;
-            esm.getRecHeader(flags);
 
-            auto record = EsmTool::RecordBase::create(n);
-            if (record == nullptr)
+            // Loop through all records
+            while (esm.hasMoreRecs())
             {
-                if (!quiet && skipped.count(n.toInt()) == 0)
+                const ESM::NAME n = esm.getRecName();
+                uint32_t flags;
+                esm.getRecHeader(flags);
+
+                auto record = EsmTool::RecordBase::create(n);
+                if (record == nullptr)
                 {
-                    std::cout << "Skipping " << n.toStringView() << " records.\n";
-                    skipped.emplace(n.toInt());
+                    if (!quiet && skipped.count(n.toInt()) == 0)
+                    {
+                        std::cout << "Skipping " << n.toStringView() << " records.\n";
+                        skipped.emplace(n.toInt());
+                    }
+
+                    esm.skipRecord();
+                    if (quiet)
+                        break;
+                    std::cout << "  Skipping\n";
+
+                    continue;
                 }
 
-                esm.skipRecord();
-                if (quiet) break;
-                std::cout << "  Skipping\n";
+                record->setFlags(static_cast<int>(flags));
+                record->setPrintPlain(info.plain_given);
+                record->load(esm);
 
-                continue;
-            }
+                // Is the user interested in this record type?
+                bool interested = true;
+                if (!info.types.empty()
+                    && std::find(info.types.begin(), info.types.end(), n.toStringView()) == info.types.end())
+                    interested = false;
 
-            record->setFlags(static_cast<int>(flags));
-            record->setPrintPlain(info.plain_given);
-            record->load(esm);
+                if (!info.name.empty() && !Misc::StringUtils::ciEqual(info.name, record->getId()))
+                    interested = false;
 
-            // Is the user interested in this record type?
-            bool interested = true;
-            if (!info.types.empty() && std::find(info.types.begin(), info.types.end(), n.toStringView()) == info.types.end())
-                interested = false;
+                if (!quiet && interested)
+                {
+                    std::cout << "\nRecord: " << n.toStringView() << " '" << record->getId() << "'\n"
+                              << "Record flags: " << recordFlags(record->getFlags()) << '\n';
+                    record->print();
+                }
 
-            if (!info.name.empty() && !Misc::StringUtils::ciEqual(info.name, record->getId()))
-                interested = false;
+                if (record->getType().toInt() == ESM::REC_CELL && loadCells && interested)
+                {
+                    loadCell(info, record->cast<ESM::Cell>()->get(), esm, data);
+                }
 
-            if(!quiet && interested)
-            {
-                std::cout << "\nRecord: " << n.toStringView() << " '" << record->getId() << "'\n"
-                    << "Record flags: " << recordFlags(record->getFlags()) << '\n';
-                record->print();
+                if (data != nullptr)
+                {
+                    if (save)
+                        data->mRecords.push_back(std::move(record));
+                    ++data->mRecordStats[n.toInt()];
+                }
             }
+        }
+        catch (const std::exception& e)
+        {
+            std::cout << "\nERROR:\n\n  " << e.what() << std::endl;
+            if (data != nullptr)
+                data->mRecords.clear();
+            return 1;
+        }
 
-            if (record->getType().toInt() == ESM::REC_CELL && loadCells && interested)
-            {
-                loadCell(info, record->cast<ESM::Cell>()->get(), esm, data);
-            }
+        return 0;
+    }
 
-            if (data != nullptr)
+    int load(const Arguments& info, ESMData* data)
+    {
+        if (info.mRawFormat.has_value() && info.mode == "dump")
+        {
+            switch (*info.mRawFormat)
             {
-                if (save)
-                    data->mRecords.push_back(std::move(record));
-                ++data->mRecordStats[n.toInt()];
+                case ESM::Format::Tes3:
+                    printRawTes3(info.filename);
+                    break;
+                case ESM::Format::Tes4:
+                    std::cout << "Printing raw TES4 file is not supported: "
+                              << Files::pathToUnicodeString(info.filename) << "\n";
+                    break;
             }
+            return 0;
         }
-    }
-    catch (const std::exception &e)
-    {
-        std::cout << "\nERROR:\n\n  " << e.what() << std::endl;
-        if (data != nullptr)
-            data->mRecords.clear();
-        return 1;
-    }
 
-    return 0;
-}
+        auto stream = Files::openBinaryInputFileStream(info.filename);
+        if (!stream->is_open())
+        {
+            std::cout << "Failed to open file: " << std::strerror(errno) << '\n';
+            return -1;
+        }
 
-int load(const Arguments& info, ESMData* data)
-{
-    if (info.mRawFormat.has_value() && info.mode == "dump")
-    {
-        switch (*info.mRawFormat)
+        const ESM::Format format = ESM::readFormat(*stream);
+        stream->seekg(0);
+
+        switch (format)
         {
             case ESM::Format::Tes3:
-                printRawTes3(info.filename);
-                break;
+                return loadTes3(info, std::move(stream), data);
             case ESM::Format::Tes4:
-                std::cout << "Printing raw TES4 file is not supported: " << Files::pathToUnicodeString(info.filename) << "\n";
-                break;
+                if (data != nullptr)
+                {
+                    std::cout << "Collecting data from esm file is not supported for TES4\n";
+                    return -1;
+                }
+                return loadTes4(info, std::move(stream));
         }
-        return 0;
-    }
 
-    auto stream = Files::openBinaryInputFileStream(info.filename);
-    if (!stream->is_open())
-    {
-        std::cout << "Failed to open file: " << std::strerror(errno) << '\n';
+        std::cout << "Unsupported ESM format: " << ESM::NAME(format).toStringView() << '\n';
+
         return -1;
     }
 
-    const ESM::Format format = ESM::readFormat(*stream);
-    stream->seekg(0);
-
-    switch (format)
+    int clone(const Arguments& info)
     {
-        case ESM::Format::Tes3:
-            return loadTes3(info, std::move(stream), data);
-        case ESM::Format::Tes4:
-            if (data != nullptr)
-            {
-                std::cout << "Collecting data from esm file is not supported for TES4\n";
-                return -1;
-            }
-            return loadTes4(info, std::move(stream));
-    }
-
-    std::cout << "Unsupported ESM format: " << ESM::NAME(format).toStringView() << '\n';
-
-    return -1;
-}
+        if (info.outname.empty())
+        {
+            std::cout << "You need to specify an output name" << std::endl;
+            return 1;
+        }
 
-int clone(const Arguments& info)
-{
-    if (info.outname.empty())
-    {
-        std::cout << "You need to specify an output name" << std::endl;
-        return 1;
-    }
+        ESMData data;
+        if (load(info, &data) != 0)
+        {
+            std::cout << "Failed to load, aborting." << std::endl;
+            return 1;
+        }
 
-    ESMData data;
-    if (load(info, &data) != 0)
-    {
-        std::cout << "Failed to load, aborting." << std::endl;
-        return 1;
-    }
+        size_t recordCount = data.mRecords.size();
 
-    size_t recordCount = data.mRecords.size();
+        int digitCount = 1; // For a nicer output
+        if (recordCount > 0)
+            digitCount = (int)std::log10(recordCount) + 1;
 
-    int digitCount = 1; // For a nicer output
-    if (recordCount > 0)
-        digitCount = (int)std::log10(recordCount) + 1;
+        std::cout << "Loaded " << recordCount << " records:\n\n";
 
-    std::cout << "Loaded " << recordCount << " records:\n\n";
+        int i = 0;
+        for (std::pair<int, int> stat : data.mRecordStats)
+        {
+            ESM::NAME name;
+            name = stat.first;
+            int amount = stat.second;
+            std::cout << std::setw(digitCount) << amount << " " << name.toStringView() << "  ";
+            if (++i % 3 == 0)
+                std::cout << '\n';
+        }
 
-    int i = 0;
-    for (std::pair<int, int> stat : data.mRecordStats)
-    {
-        ESM::NAME name;
-        name = stat.first;
-        int amount = stat.second;
-        std::cout << std::setw(digitCount) << amount << " " << name.toStringView() << "  ";
-        if (++i % 3 == 0)
+        if (i % 3 != 0)
             std::cout << '\n';
-    }
-
-    if (i % 3 != 0)
-        std::cout << '\n';
 
-    std::cout << "\nSaving records to: " << Files::pathToUnicodeString(info.outname) << "...\n";
+        std::cout << "\nSaving records to: " << Files::pathToUnicodeString(info.outname) << "...\n";
 
-    ESM::ESMWriter esm;
-    ToUTF8::Utf8Encoder encoder (ToUTF8::calculateEncoding(info.encoding));
-    esm.setEncoder(&encoder);
-    esm.setHeader(data.mHeader);
-    esm.setVersion(ESM::VER_13);
-    esm.setRecordCount (recordCount);
+        ESM::ESMWriter esm;
+        ToUTF8::Utf8Encoder encoder(ToUTF8::calculateEncoding(info.encoding));
+        esm.setEncoder(&encoder);
+        esm.setHeader(data.mHeader);
+        esm.setVersion(ESM::VER_13);
+        esm.setRecordCount(recordCount);
 
-    std::fstream save(info.outname, std::fstream::out | std::fstream::binary);
-    esm.save(save);
+        std::fstream save(info.outname, std::fstream::out | std::fstream::binary);
+        esm.save(save);
 
-    int saved = 0;
-    for (auto& record : data.mRecords)
-    {
-        if (i <= 0)
-            break;
+        int saved = 0;
+        for (auto& record : data.mRecords)
+        {
+            if (i <= 0)
+                break;
 
-        const ESM::NAME typeName = record->getType();
+            const ESM::NAME typeName = record->getType();
 
-        esm.startRecord(typeName, record->getFlags());
+            esm.startRecord(typeName, record->getFlags());
 
-        record->save(esm);
-        if (typeName.toInt() == ESM::REC_CELL) {
-            ESM::Cell *ptr = &record->cast<ESM::Cell>()->get();
-            if (!data.mCellRefs[ptr].empty())
+            record->save(esm);
+            if (typeName.toInt() == ESM::REC_CELL)
             {
-                for (std::pair<ESM::CellRef, bool> &ref : data.mCellRefs[ptr])
-                    ref.first.save(esm, ref.second);
+                ESM::Cell* ptr = &record->cast<ESM::Cell>()->get();
+                if (!data.mCellRefs[ptr].empty())
+                {
+                    for (std::pair<ESM::CellRef, bool>& ref : data.mCellRefs[ptr])
+                        ref.first.save(esm, ref.second);
+                }
             }
-        }
 
-        esm.endRecord(typeName);
+            esm.endRecord(typeName);
 
-        saved++;
-        int perc = recordCount == 0 ? 100 : (int)((saved / (float)recordCount)*100);
-        if (perc % 10 == 0)
-        {
-            std::cerr << "\r" << perc << "%";
+            saved++;
+            int perc = recordCount == 0 ? 100 : (int)((saved / (float)recordCount) * 100);
+            if (perc % 10 == 0)
+            {
+                std::cerr << "\r" << perc << "%";
+            }
         }
-    }
 
-    std::cout << "\rDone!" << std::endl;
+        std::cout << "\rDone!" << std::endl;
 
-    esm.close();
-    save.close();
+        esm.close();
+        save.close();
 
-    return 0;
-}
+        return 0;
+    }
 
-int comp(const Arguments& info)
-{
-    if (info.filename.empty() || info.outname.empty())
+    int comp(const Arguments& info)
     {
-        std::cout << "You need to specify two input files" << std::endl;
-        return 1;
-    }
+        if (info.filename.empty() || info.outname.empty())
+        {
+            std::cout << "You need to specify two input files" << std::endl;
+            return 1;
+        }
 
-    Arguments fileOne;
-    Arguments fileTwo;
+        Arguments fileOne;
+        Arguments fileTwo;
 
-    fileOne.mode = "clone";
-    fileTwo.mode = "clone";
+        fileOne.mode = "clone";
+        fileTwo.mode = "clone";
 
-    fileOne.encoding = info.encoding;
-    fileTwo.encoding = info.encoding;
+        fileOne.encoding = info.encoding;
+        fileTwo.encoding = info.encoding;
 
-    fileOne.filename = info.filename;
-    fileTwo.filename = info.outname;
+        fileOne.filename = info.filename;
+        fileTwo.filename = info.outname;
 
-    ESMData dataOne;
-    if (load(fileOne, &dataOne) != 0)
-    {
-        std::cout << "Failed to load " << Files::pathToUnicodeString(info.filename) << ", aborting comparison." << std::endl;
-        return 1;
-    }
+        ESMData dataOne;
+        if (load(fileOne, &dataOne) != 0)
+        {
+            std::cout << "Failed to load " << Files::pathToUnicodeString(info.filename) << ", aborting comparison."
+                      << std::endl;
+            return 1;
+        }
 
-    ESMData dataTwo;
-    if (load(fileTwo, &dataTwo) != 0)
-    {
-        std::cout << "Failed to load " << Files::pathToUnicodeString(info.outname) << ", aborting comparison." << std::endl;
-        return 1;
-    }
+        ESMData dataTwo;
+        if (load(fileTwo, &dataTwo) != 0)
+        {
+            std::cout << "Failed to load " << Files::pathToUnicodeString(info.outname) << ", aborting comparison."
+                      << std::endl;
+            return 1;
+        }
 
-    if (dataOne.mRecords.size() != dataTwo.mRecords.size())
-    {
-        std::cout << "Not equal, different amount of records." << std::endl;
-        return 1;
-    }
+        if (dataOne.mRecords.size() != dataTwo.mRecords.size())
+        {
+            std::cout << "Not equal, different amount of records." << std::endl;
+            return 1;
+        }
 
-    return 0;
-}
+        return 0;
+    }
 
 }
diff --git a/apps/esmtool/labels.cpp b/apps/esmtool/labels.cpp
index 9737511274..d88a608466 100644
--- a/apps/esmtool/labels.cpp
+++ b/apps/esmtool/labels.cpp
@@ -19,7 +19,7 @@ std::string_view bodyPartLabel(int idx)
 {
     if (idx >= 0 && idx <= 26)
     {
-        static constexpr std::string_view bodyPartLabels[] =  {
+        static constexpr std::string_view bodyPartLabels[] = {
             "Head",
             "Hair",
             "Neck",
@@ -58,7 +58,7 @@ std::string_view meshPartLabel(int idx)
 {
     if (idx >= 0 && idx <= ESM::BodyPart::MP_Tail)
     {
-        static constexpr std::string_view meshPartLabels[] =  {
+        static constexpr std::string_view meshPartLabels[] = {
             "Head",
             "Hair",
             "Neck",
@@ -85,7 +85,7 @@ std::string_view meshTypeLabel(int idx)
 {
     if (idx >= 0 && idx <= ESM::BodyPart::MT_Armor)
     {
-        static constexpr std::string_view meshTypeLabels[] =  {
+        static constexpr std::string_view meshTypeLabels[] = {
             "Skin",
             "Clothing",
             "Armor",
@@ -122,7 +122,7 @@ std::string_view armorTypeLabel(int idx)
 {
     if (idx >= 0 && idx <= 10)
     {
-         static constexpr std::string_view armorTypeLabels[] = {
+        static constexpr std::string_view armorTypeLabels[] = {
             "Helmet",
             "Cuirass",
             "Left Pauldron",
@@ -243,11 +243,16 @@ std::string_view aiTypeLabel(ESM::AiPackageType type)
 {
     switch (type)
     {
-        case ESM::AI_Wander: return "Wander";
-        case ESM::AI_Travel: return "Travel";
-        case ESM::AI_Follow: return "Follow";
-        case ESM::AI_Escort: return "Escort";
-        case ESM::AI_Activate: return "Activate";
+        case ESM::AI_Wander:
+            return "Wander";
+        case ESM::AI_Travel:
+            return "Travel";
+        case ESM::AI_Follow:
+            return "Follow";
+        case ESM::AI_Escort:
+            return "Escort";
+        case ESM::AI_Activate:
+            return "Activate";
     }
     return "Invalid";
 }
@@ -256,7 +261,7 @@ std::string_view magicEffectLabel(int idx)
 {
     if (idx >= 0 && idx <= 142)
     {
-        static constexpr std::string_view magicEffectLabels [] = {
+        static constexpr std::string_view magicEffectLabels[] = {
             "Water Breathing",
             "Swift Swim",
             "Water Walking",
@@ -411,7 +416,7 @@ std::string_view attributeLabel(int idx)
 {
     if (idx >= 0 && idx <= 7)
     {
-        static constexpr std::string_view attributeLabels [] = {
+        static constexpr std::string_view attributeLabels[] = {
             "Strength",
             "Intelligence",
             "Willpower",
@@ -431,7 +436,7 @@ std::string_view spellTypeLabel(int idx)
 {
     if (idx >= 0 && idx <= 5)
     {
-        static constexpr std::string_view spellTypeLabels [] = {
+        static constexpr std::string_view spellTypeLabels[] = {
             "Spells",
             "Abilities",
             "Blight Disease",
@@ -449,7 +454,7 @@ std::string_view specializationLabel(int idx)
 {
     if (idx >= 0 && idx <= 2)
     {
-        static constexpr std::string_view specializationLabels [] = {
+        static constexpr std::string_view specializationLabels[] = {
             "Combat",
             "Magic",
             "Stealth",
@@ -464,7 +469,7 @@ std::string_view skillLabel(int idx)
 {
     if (idx >= 0 && idx <= 26)
     {
-        static constexpr std::string_view skillLabels [] = {
+        static constexpr std::string_view skillLabels[] = {
             "Block",
             "Armorer",
             "Medium Armor",
@@ -503,7 +508,7 @@ std::string_view apparatusTypeLabel(int idx)
 {
     if (idx >= 0 && idx <= 3)
     {
-        static constexpr std::string_view apparatusTypeLabels [] = {
+        static constexpr std::string_view apparatusTypeLabels[] = {
             "Mortar",
             "Alembic",
             "Calcinator",
@@ -519,7 +524,7 @@ std::string_view rangeTypeLabel(int idx)
 {
     if (idx >= 0 && idx <= 2)
     {
-        static constexpr std::string_view rangeTypeLabels [] = {
+        static constexpr std::string_view rangeTypeLabels[] = {
             "Self",
             "Touch",
             "Target",
@@ -534,7 +539,7 @@ std::string_view schoolLabel(int idx)
 {
     if (idx >= 0 && idx <= 5)
     {
-        static constexpr std::string_view schoolLabels [] = {
+        static constexpr std::string_view schoolLabels[] = {
             "Alteration",
             "Conjuration",
             "Destruction",
@@ -552,7 +557,7 @@ std::string_view enchantTypeLabel(int idx)
 {
     if (idx >= 0 && idx <= 3)
     {
-        static constexpr std::string_view enchantTypeLabels [] = {
+        static constexpr std::string_view enchantTypeLabels[] = {
             "Cast Once",
             "Cast When Strikes",
             "Cast When Used",
@@ -656,13 +661,15 @@ std::string_view ruleFunction(int idx)
 std::string bodyPartFlags(int flags)
 {
     std::string properties;
-    if (flags == 0) properties += "[None] ";
-    if (flags & ESM::BodyPart::BPF_Female) properties += "Female ";
-    if (flags & ESM::BodyPart::BPF_NotPlayable) properties += "NotPlayable ";
-    int unused = (0xFFFFFFFF ^
-                  (ESM::BodyPart::BPF_Female|
-                   ESM::BodyPart::BPF_NotPlayable));
-    if (flags & unused) properties += "Invalid ";
+    if (flags == 0)
+        properties += "[None] ";
+    if (flags & ESM::BodyPart::BPF_Female)
+        properties += "Female ";
+    if (flags & ESM::BodyPart::BPF_NotPlayable)
+        properties += "NotPlayable ";
+    int unused = (0xFFFFFFFF ^ (ESM::BodyPart::BPF_Female | ESM::BodyPart::BPF_NotPlayable));
+    if (flags & unused)
+        properties += "Invalid ";
     properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
@@ -670,20 +677,23 @@ std::string bodyPartFlags(int flags)
 std::string cellFlags(int flags)
 {
     std::string properties;
-    if (flags == 0) properties += "[None] ";
-    if (flags & ESM::Cell::HasWater) properties += "HasWater ";
-    if (flags & ESM::Cell::Interior) properties += "Interior ";
-    if (flags & ESM::Cell::NoSleep) properties += "NoSleep ";
-    if (flags & ESM::Cell::QuasiEx) properties += "QuasiEx ";
+    if (flags == 0)
+        properties += "[None] ";
+    if (flags & ESM::Cell::HasWater)
+        properties += "HasWater ";
+    if (flags & ESM::Cell::Interior)
+        properties += "Interior ";
+    if (flags & ESM::Cell::NoSleep)
+        properties += "NoSleep ";
+    if (flags & ESM::Cell::QuasiEx)
+        properties += "QuasiEx ";
     // This used value is not in the ESM component.
-    if (flags & 0x00000040) properties += "Unknown ";
-    int unused = (0xFFFFFFFF ^
-                  (ESM::Cell::HasWater|
-                   ESM::Cell::Interior|
-                   ESM::Cell::NoSleep|
-                   ESM::Cell::QuasiEx|
-                   0x00000040));
-    if (flags & unused) properties += "Invalid ";
+    if (flags & 0x00000040)
+        properties += "Unknown ";
+    int unused = (0xFFFFFFFF
+        ^ (ESM::Cell::HasWater | ESM::Cell::Interior | ESM::Cell::NoSleep | ESM::Cell::QuasiEx | 0x00000040));
+    if (flags & unused)
+        properties += "Invalid ";
     properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
@@ -691,15 +701,17 @@ std::string cellFlags(int flags)
 std::string containerFlags(int flags)
 {
     std::string properties;
-    if (flags == 0) properties += "[None] ";
-    if (flags & ESM::Container::Unknown) properties += "Unknown ";
-    if (flags & ESM::Container::Organic) properties += "Organic ";
-    if (flags & ESM::Container::Respawn) properties += "Respawn ";
-    int unused = (0xFFFFFFFF ^
-                  (ESM::Container::Unknown|
-                   ESM::Container::Organic|
-                   ESM::Container::Respawn));
-    if (flags & unused) properties += "Invalid ";
+    if (flags == 0)
+        properties += "[None] ";
+    if (flags & ESM::Container::Unknown)
+        properties += "Unknown ";
+    if (flags & ESM::Container::Organic)
+        properties += "Organic ";
+    if (flags & ESM::Container::Respawn)
+        properties += "Respawn ";
+    int unused = (0xFFFFFFFF ^ (ESM::Container::Unknown | ESM::Container::Organic | ESM::Container::Respawn));
+    if (flags & unused)
+        properties += "Invalid ";
     properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
@@ -707,25 +719,29 @@ std::string containerFlags(int flags)
 std::string creatureFlags(int flags)
 {
     std::string properties;
-    if (flags == 0) properties += "[None] ";
-    if (flags & ESM::Creature::Base) properties += "Base ";
-    if (flags & ESM::Creature::Walks) properties += "Walks ";
-    if (flags & ESM::Creature::Swims) properties += "Swims ";
-    if (flags & ESM::Creature::Flies) properties += "Flies ";
-    if (flags & ESM::Creature::Bipedal) properties += "Bipedal ";
-    if (flags & ESM::Creature::Respawn) properties += "Respawn ";
-    if (flags & ESM::Creature::Weapon) properties += "Weapon ";
-    if (flags & ESM::Creature::Essential) properties += "Essential ";
-    int unused = (0xFFFFFFFF ^
-                  (ESM::Creature::Base|
-                   ESM::Creature::Walks|
-                   ESM::Creature::Swims|
-                   ESM::Creature::Flies|
-                   ESM::Creature::Bipedal|
-                   ESM::Creature::Respawn|
-                   ESM::Creature::Weapon|
-                   ESM::Creature::Essential));
-    if (flags & unused) properties += "Invalid ";
+    if (flags == 0)
+        properties += "[None] ";
+    if (flags & ESM::Creature::Base)
+        properties += "Base ";
+    if (flags & ESM::Creature::Walks)
+        properties += "Walks ";
+    if (flags & ESM::Creature::Swims)
+        properties += "Swims ";
+    if (flags & ESM::Creature::Flies)
+        properties += "Flies ";
+    if (flags & ESM::Creature::Bipedal)
+        properties += "Bipedal ";
+    if (flags & ESM::Creature::Respawn)
+        properties += "Respawn ";
+    if (flags & ESM::Creature::Weapon)
+        properties += "Weapon ";
+    if (flags & ESM::Creature::Essential)
+        properties += "Essential ";
+    int unused = (0xFFFFFFFF
+        ^ (ESM::Creature::Base | ESM::Creature::Walks | ESM::Creature::Swims | ESM::Creature::Flies
+            | ESM::Creature::Bipedal | ESM::Creature::Respawn | ESM::Creature::Weapon | ESM::Creature::Essential));
+    if (flags & unused)
+        properties += "Invalid ";
     properties += Misc::StringUtils::format("(0x%02X)", flags);
     return properties;
 }
@@ -733,9 +749,12 @@ std::string creatureFlags(int flags)
 std::string enchantmentFlags(int flags)
 {
     std::string properties;
-    if (flags == 0) properties += "[None] ";
-    if (flags & ESM::Enchantment::Autocalc) properties += "Autocalc ";
-    if (flags & (0xFFFFFFFF ^ ESM::Enchantment::Autocalc)) properties += "Invalid ";
+    if (flags == 0)
+        properties += "[None] ";
+    if (flags & ESM::Enchantment::Autocalc)
+        properties += "Autocalc ";
+    if (flags & (0xFFFFFFFF ^ ESM::Enchantment::Autocalc))
+        properties += "Invalid ";
     properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
@@ -746,11 +765,16 @@ std::string landFlags(int flags)
     // The ESM component says that this first four bits are used, but
     // only the first three bits are used as far as I can tell.
     // There's also no enumeration of the bit in the ESM component.
-    if (flags == 0) properties += "[None] ";
-    if (flags & 0x00000001) properties += "Unknown1 ";
-    if (flags & 0x00000004) properties += "Unknown3 ";
-    if (flags & 0x00000002) properties += "Unknown2 ";
-    if (flags & 0xFFFFFFF8) properties += "Invalid ";
+    if (flags == 0)
+        properties += "[None] ";
+    if (flags & 0x00000001)
+        properties += "Unknown1 ";
+    if (flags & 0x00000004)
+        properties += "Unknown3 ";
+    if (flags & 0x00000002)
+        properties += "Unknown2 ";
+    if (flags & 0xFFFFFFF8)
+        properties += "Invalid ";
     properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
@@ -758,13 +782,15 @@ std::string landFlags(int flags)
 std::string itemListFlags(int flags)
 {
     std::string properties;
-    if (flags == 0) properties += "[None] ";
-    if (flags & ESM::ItemLevList::AllLevels) properties += "AllLevels ";
-    if (flags & ESM::ItemLevList::Each) properties += "Each ";
-    int unused = (0xFFFFFFFF ^
-                  (ESM::ItemLevList::AllLevels|
-                   ESM::ItemLevList::Each));
-    if (flags & unused) properties += "Invalid ";
+    if (flags == 0)
+        properties += "[None] ";
+    if (flags & ESM::ItemLevList::AllLevels)
+        properties += "AllLevels ";
+    if (flags & ESM::ItemLevList::Each)
+        properties += "Each ";
+    int unused = (0xFFFFFFFF ^ (ESM::ItemLevList::AllLevels | ESM::ItemLevList::Each));
+    if (flags & unused)
+        properties += "Invalid ";
     properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
@@ -772,10 +798,13 @@ std::string itemListFlags(int flags)
 std::string creatureListFlags(int flags)
 {
     std::string properties;
-    if (flags == 0) properties += "[None] ";
-    if (flags & ESM::CreatureLevList::AllLevels) properties += "AllLevels ";
+    if (flags == 0)
+        properties += "[None] ";
+    if (flags & ESM::CreatureLevList::AllLevels)
+        properties += "AllLevels ";
     int unused = (0xFFFFFFFF ^ ESM::CreatureLevList::AllLevels);
-    if (flags & unused) properties += "Invalid ";
+    if (flags & unused)
+        properties += "Invalid ";
     properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
@@ -783,27 +812,31 @@ std::string creatureListFlags(int flags)
 std::string lightFlags(int flags)
 {
     std::string properties;
-    if (flags == 0) properties += "[None] ";
-    if (flags & ESM::Light::Dynamic) properties += "Dynamic ";
-    if (flags & ESM::Light::Fire) properties += "Fire ";
-    if (flags & ESM::Light::Carry) properties += "Carry ";
-    if (flags & ESM::Light::Flicker) properties += "Flicker ";
-    if (flags & ESM::Light::FlickerSlow) properties += "FlickerSlow ";
-    if (flags & ESM::Light::Pulse) properties += "Pulse ";
-    if (flags & ESM::Light::PulseSlow) properties += "PulseSlow ";
-    if (flags & ESM::Light::Negative) properties += "Negative ";
-    if (flags & ESM::Light::OffDefault) properties += "OffDefault ";
-    int unused = (0xFFFFFFFF ^
-                  (ESM::Light::Dynamic|
-                   ESM::Light::Fire|
-                   ESM::Light::Carry|
-                   ESM::Light::Flicker|
-                   ESM::Light::FlickerSlow|
-                   ESM::Light::Pulse|
-                   ESM::Light::PulseSlow|
-                   ESM::Light::Negative|
-                   ESM::Light::OffDefault));
-    if (flags & unused) properties += "Invalid ";
+    if (flags == 0)
+        properties += "[None] ";
+    if (flags & ESM::Light::Dynamic)
+        properties += "Dynamic ";
+    if (flags & ESM::Light::Fire)
+        properties += "Fire ";
+    if (flags & ESM::Light::Carry)
+        properties += "Carry ";
+    if (flags & ESM::Light::Flicker)
+        properties += "Flicker ";
+    if (flags & ESM::Light::FlickerSlow)
+        properties += "FlickerSlow ";
+    if (flags & ESM::Light::Pulse)
+        properties += "Pulse ";
+    if (flags & ESM::Light::PulseSlow)
+        properties += "PulseSlow ";
+    if (flags & ESM::Light::Negative)
+        properties += "Negative ";
+    if (flags & ESM::Light::OffDefault)
+        properties += "OffDefault ";
+    int unused = (0xFFFFFFFF
+        ^ (ESM::Light::Dynamic | ESM::Light::Fire | ESM::Light::Carry | ESM::Light::Flicker | ESM::Light::FlickerSlow
+            | ESM::Light::Pulse | ESM::Light::PulseSlow | ESM::Light::Negative | ESM::Light::OffDefault));
+    if (flags & unused)
+        properties += "Invalid ";
     properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
@@ -811,27 +844,47 @@ std::string lightFlags(int flags)
 std::string magicEffectFlags(int flags)
 {
     std::string properties;
-    if (flags == 0) properties += "[None] ";
-    if (flags & ESM::MagicEffect::TargetAttribute) properties += "TargetAttribute ";
-    if (flags & ESM::MagicEffect::TargetSkill) properties += "TargetSkill ";
-    if (flags & ESM::MagicEffect::NoDuration) properties += "NoDuration ";
-    if (flags & ESM::MagicEffect::NoMagnitude) properties += "NoMagnitude ";
-    if (flags & ESM::MagicEffect::Harmful) properties += "Harmful ";
-    if (flags & ESM::MagicEffect::ContinuousVfx) properties += "ContinuousVFX ";
-    if (flags & ESM::MagicEffect::CastSelf) properties += "CastSelf ";
-    if (flags & ESM::MagicEffect::CastTouch) properties += "CastTouch ";
-    if (flags & ESM::MagicEffect::CastTarget) properties += "CastTarget ";
-    if (flags & ESM::MagicEffect::AppliedOnce) properties += "AppliedOnce ";
-    if (flags & ESM::MagicEffect::Stealth) properties += "Stealth ";
-    if (flags & ESM::MagicEffect::NonRecastable) properties += "NonRecastable ";
-    if (flags & ESM::MagicEffect::IllegalDaedra) properties += "IllegalDaedra ";
-    if (flags & ESM::MagicEffect::Unreflectable) properties += "Unreflectable ";
-    if (flags & ESM::MagicEffect::CasterLinked) properties += "CasterLinked ";
-    if (flags & ESM::MagicEffect::AllowSpellmaking) properties += "AllowSpellmaking ";
-    if (flags & ESM::MagicEffect::AllowEnchanting) properties += "AllowEnchanting ";
-    if (flags & ESM::MagicEffect::NegativeLight) properties += "NegativeLight ";
-
-    if (flags & 0xFFFC0000) properties += "Invalid ";
+    if (flags == 0)
+        properties += "[None] ";
+    if (flags & ESM::MagicEffect::TargetAttribute)
+        properties += "TargetAttribute ";
+    if (flags & ESM::MagicEffect::TargetSkill)
+        properties += "TargetSkill ";
+    if (flags & ESM::MagicEffect::NoDuration)
+        properties += "NoDuration ";
+    if (flags & ESM::MagicEffect::NoMagnitude)
+        properties += "NoMagnitude ";
+    if (flags & ESM::MagicEffect::Harmful)
+        properties += "Harmful ";
+    if (flags & ESM::MagicEffect::ContinuousVfx)
+        properties += "ContinuousVFX ";
+    if (flags & ESM::MagicEffect::CastSelf)
+        properties += "CastSelf ";
+    if (flags & ESM::MagicEffect::CastTouch)
+        properties += "CastTouch ";
+    if (flags & ESM::MagicEffect::CastTarget)
+        properties += "CastTarget ";
+    if (flags & ESM::MagicEffect::AppliedOnce)
+        properties += "AppliedOnce ";
+    if (flags & ESM::MagicEffect::Stealth)
+        properties += "Stealth ";
+    if (flags & ESM::MagicEffect::NonRecastable)
+        properties += "NonRecastable ";
+    if (flags & ESM::MagicEffect::IllegalDaedra)
+        properties += "IllegalDaedra ";
+    if (flags & ESM::MagicEffect::Unreflectable)
+        properties += "Unreflectable ";
+    if (flags & ESM::MagicEffect::CasterLinked)
+        properties += "CasterLinked ";
+    if (flags & ESM::MagicEffect::AllowSpellmaking)
+        properties += "AllowSpellmaking ";
+    if (flags & ESM::MagicEffect::AllowEnchanting)
+        properties += "AllowEnchanting ";
+    if (flags & ESM::MagicEffect::NegativeLight)
+        properties += "NegativeLight ";
+
+    if (flags & 0xFFFC0000)
+        properties += "Invalid ";
     properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
@@ -839,21 +892,24 @@ std::string magicEffectFlags(int flags)
 std::string npcFlags(int flags)
 {
     std::string properties;
-    if (flags == 0) properties += "[None] ";
-    if (flags & ESM::NPC::Base) properties += "Base ";
-    if (flags & ESM::NPC::Autocalc) properties += "Autocalc ";
-    if (flags & ESM::NPC::Female) properties += "Female ";
-    if (flags & ESM::NPC::Respawn) properties += "Respawn ";
-    if (flags & ESM::NPC::Essential) properties += "Essential ";
+    if (flags == 0)
+        properties += "[None] ";
+    if (flags & ESM::NPC::Base)
+        properties += "Base ";
+    if (flags & ESM::NPC::Autocalc)
+        properties += "Autocalc ";
+    if (flags & ESM::NPC::Female)
+        properties += "Female ";
+    if (flags & ESM::NPC::Respawn)
+        properties += "Respawn ";
+    if (flags & ESM::NPC::Essential)
+        properties += "Essential ";
     // Whether corpses persist is a bit that is unaccounted for,
     // however relatively few NPCs have this bit set.
-    int unused = (0xFF ^
-                  (ESM::NPC::Base|
-                   ESM::NPC::Autocalc|
-                   ESM::NPC::Female|
-                   ESM::NPC::Respawn|
-                   ESM::NPC::Essential));
-    if (flags & unused) properties += "Invalid ";
+    int unused
+        = (0xFF ^ (ESM::NPC::Base | ESM::NPC::Autocalc | ESM::NPC::Female | ESM::NPC::Respawn | ESM::NPC::Essential));
+    if (flags & unused)
+        properties += "Invalid ";
     properties += Misc::StringUtils::format("(0x%02X)", flags);
     return properties;
 }
@@ -861,14 +917,16 @@ std::string npcFlags(int flags)
 std::string raceFlags(int flags)
 {
     std::string properties;
-    if (flags == 0) properties += "[None] ";
+    if (flags == 0)
+        properties += "[None] ";
     // All races have the playable flag set in Bethesda files.
-    if (flags & ESM::Race::Playable) properties += "Playable ";
-    if (flags & ESM::Race::Beast) properties += "Beast ";
-    int unused = (0xFFFFFFFF ^
-                  (ESM::Race::Playable|
-                   ESM::Race::Beast));
-    if (flags & unused) properties += "Invalid ";
+    if (flags & ESM::Race::Playable)
+        properties += "Playable ";
+    if (flags & ESM::Race::Beast)
+        properties += "Beast ";
+    int unused = (0xFFFFFFFF ^ (ESM::Race::Playable | ESM::Race::Beast));
+    if (flags & unused)
+        properties += "Invalid ";
     properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
@@ -876,15 +934,17 @@ std::string raceFlags(int flags)
 std::string spellFlags(int flags)
 {
     std::string properties;
-    if (flags == 0) properties += "[None] ";
-    if (flags & ESM::Spell::F_Autocalc) properties += "Autocalc ";
-    if (flags & ESM::Spell::F_PCStart) properties += "PCStart ";
-    if (flags & ESM::Spell::F_Always) properties += "Always ";
-    int unused = (0xFFFFFFFF ^
-                  (ESM::Spell::F_Autocalc|
-                   ESM::Spell::F_PCStart|
-                   ESM::Spell::F_Always));
-    if (flags & unused) properties += "Invalid ";
+    if (flags == 0)
+        properties += "[None] ";
+    if (flags & ESM::Spell::F_Autocalc)
+        properties += "Autocalc ";
+    if (flags & ESM::Spell::F_PCStart)
+        properties += "PCStart ";
+    if (flags & ESM::Spell::F_Always)
+        properties += "Always ";
+    int unused = (0xFFFFFFFF ^ (ESM::Spell::F_Autocalc | ESM::Spell::F_PCStart | ESM::Spell::F_Always));
+    if (flags & unused)
+        properties += "Invalid ";
     properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
@@ -892,16 +952,18 @@ std::string spellFlags(int flags)
 std::string weaponFlags(int flags)
 {
     std::string properties;
-    if (flags == 0) properties += "[None] ";
+    if (flags == 0)
+        properties += "[None] ";
     // The interpretation of the flags are still unclear to me.
     // Apparently you can't be Silver without being Magical?  Many of
     // the "Magical" weapons don't have enchantments of any sort.
-    if (flags & ESM::Weapon::Magical) properties += "Magical ";
-    if (flags & ESM::Weapon::Silver) properties += "Silver ";
-    int unused = (0xFFFFFFFF ^
-                  (ESM::Weapon::Magical|
-                   ESM::Weapon::Silver));
-    if (flags & unused) properties += "Invalid ";
+    if (flags & ESM::Weapon::Magical)
+        properties += "Magical ";
+    if (flags & ESM::Weapon::Silver)
+        properties += "Silver ";
+    int unused = (0xFFFFFFFF ^ (ESM::Weapon::Magical | ESM::Weapon::Silver));
+    if (flags & unused)
+        properties += "Invalid ";
     properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
@@ -909,13 +971,19 @@ std::string weaponFlags(int flags)
 std::string recordFlags(uint32_t flags)
 {
     std::string properties;
-    if (flags == 0) properties += "[None] ";
-    if (flags & ESM::FLAG_Deleted) properties += "Deleted ";
-    if (flags & ESM::FLAG_Persistent) properties += "Persistent ";
-    if (flags & ESM::FLAG_Ignored) properties += "Ignored ";
-    if (flags & ESM::FLAG_Blocked) properties += "Blocked ";
+    if (flags == 0)
+        properties += "[None] ";
+    if (flags & ESM::FLAG_Deleted)
+        properties += "Deleted ";
+    if (flags & ESM::FLAG_Persistent)
+        properties += "Persistent ";
+    if (flags & ESM::FLAG_Ignored)
+        properties += "Ignored ";
+    if (flags & ESM::FLAG_Blocked)
+        properties += "Blocked ";
     int unused = ~(ESM::FLAG_Deleted | ESM::FLAG_Persistent | ESM::FLAG_Ignored | ESM::FLAG_Blocked);
-    if (flags & unused) properties += "Invalid ";
+    if (flags & unused)
+        properties += "Invalid ";
     properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
\ No newline at end of file
diff --git a/apps/esmtool/record.cpp b/apps/esmtool/record.cpp
index c7d9d372ec..78c55343c4 100644
--- a/apps/esmtool/record.cpp
+++ b/apps/esmtool/record.cpp
@@ -9,1349 +9,1364 @@
 namespace
 {
 
-void printAIPackage(const ESM::AIPackage& p)
-{
-    std::cout << "  AI Type: " << aiTypeLabel(p.mType)
-              << " (" << Misc::StringUtils::format("0x%08X", p.mType) << ")" << std::endl;
-    if (p.mType == ESM::AI_Wander)
-    {
-        std::cout << "    Distance: " << p.mWander.mDistance << std::endl;
-        std::cout << "    Duration: " << p.mWander.mDuration << std::endl;
-        std::cout << "    Time of Day: " << (int)p.mWander.mTimeOfDay << std::endl;
-        if (p.mWander.mShouldRepeat != 1)
-            std::cout << "    Should repeat: " << static_cast<bool>(p.mWander.mShouldRepeat != 0) << std::endl;
-
-        std::cout << "    Idle: ";
-        for (int i = 0; i != 8; i++)
-            std::cout << (int)p.mWander.mIdle[i] << " ";
-        std::cout << std::endl;
-    }
-    else if (p.mType == ESM::AI_Travel)
+    void printAIPackage(const ESM::AIPackage& p)
     {
-        std::cout << "    Travel Coordinates: (" << p.mTravel.mX << ","
-                  << p.mTravel.mY << "," << p.mTravel.mZ << ")" << std::endl;
-        std::cout << "    Should repeat: " << static_cast<bool>(p.mTravel.mShouldRepeat != 0) << std::endl;
-    }
-    else if (p.mType == ESM::AI_Follow || p.mType == ESM::AI_Escort)
-    {
-        std::cout << "    Follow Coordinates: (" << p.mTarget.mX << ","
-                  << p.mTarget.mY << "," << p.mTarget.mZ << ")" << std::endl;
-        std::cout << "    Duration: " << p.mTarget.mDuration << std::endl;
-        std::cout << "    Target ID: " << p.mTarget.mId.toString() << std::endl;
-        std::cout << "    Should repeat: " << static_cast<bool>(p.mTarget.mShouldRepeat != 0) << std::endl;
+        std::cout << "  AI Type: " << aiTypeLabel(p.mType) << " (" << Misc::StringUtils::format("0x%08X", p.mType)
+                  << ")" << std::endl;
+        if (p.mType == ESM::AI_Wander)
+        {
+            std::cout << "    Distance: " << p.mWander.mDistance << std::endl;
+            std::cout << "    Duration: " << p.mWander.mDuration << std::endl;
+            std::cout << "    Time of Day: " << (int)p.mWander.mTimeOfDay << std::endl;
+            if (p.mWander.mShouldRepeat != 1)
+                std::cout << "    Should repeat: " << static_cast<bool>(p.mWander.mShouldRepeat != 0) << std::endl;
+
+            std::cout << "    Idle: ";
+            for (int i = 0; i != 8; i++)
+                std::cout << (int)p.mWander.mIdle[i] << " ";
+            std::cout << std::endl;
+        }
+        else if (p.mType == ESM::AI_Travel)
+        {
+            std::cout << "    Travel Coordinates: (" << p.mTravel.mX << "," << p.mTravel.mY << "," << p.mTravel.mZ
+                      << ")" << std::endl;
+            std::cout << "    Should repeat: " << static_cast<bool>(p.mTravel.mShouldRepeat != 0) << std::endl;
+        }
+        else if (p.mType == ESM::AI_Follow || p.mType == ESM::AI_Escort)
+        {
+            std::cout << "    Follow Coordinates: (" << p.mTarget.mX << "," << p.mTarget.mY << "," << p.mTarget.mZ
+                      << ")" << std::endl;
+            std::cout << "    Duration: " << p.mTarget.mDuration << std::endl;
+            std::cout << "    Target ID: " << p.mTarget.mId.toString() << std::endl;
+            std::cout << "    Should repeat: " << static_cast<bool>(p.mTarget.mShouldRepeat != 0) << std::endl;
+        }
+        else if (p.mType == ESM::AI_Activate)
+        {
+            std::cout << "    Name: " << p.mActivate.mName.toString() << std::endl;
+            std::cout << "    Should repeat: " << static_cast<bool>(p.mActivate.mShouldRepeat != 0) << std::endl;
+        }
+        else
+        {
+            std::cout << "    BadPackage: " << Misc::StringUtils::format("0x%08X", p.mType) << std::endl;
+        }
+
+        if (!p.mCellName.empty())
+            std::cout << "    Cell Name: " << p.mCellName << std::endl;
     }
-    else if (p.mType == ESM::AI_Activate)
+
+    std::string ruleString(const ESM::DialInfo::SelectStruct& ss)
     {
-        std::cout << "    Name: " << p.mActivate.mName.toString() << std::endl;
-        std::cout << "    Should repeat: " << static_cast<bool>(p.mActivate.mShouldRepeat != 0) << std::endl;
-    }
-    else {
-        std::cout << "    BadPackage: " << Misc::StringUtils::format("0x%08X", p.mType) << std::endl;
-    }
+        std::string rule = ss.mSelectRule;
 
-    if (!p.mCellName.empty())
-        std::cout << "    Cell Name: " << p.mCellName << std::endl;
-}
+        if (rule.length() < 5)
+            return "INVALID";
 
-std::string ruleString(const ESM::DialInfo::SelectStruct& ss)
-{
-    std::string rule = ss.mSelectRule;
+        char type = rule[1];
+        char indicator = rule[2];
 
-    if (rule.length() < 5)
-        return "INVALID";
+        std::string type_str = "INVALID";
+        std::string func_str = Misc::StringUtils::format("INVALID=%s", rule.substr(1, 3));
+        int func;
+        std::istringstream iss(rule.substr(2, 2));
+        iss >> func;
 
-    char type = rule[1];
-    char indicator = rule[2];
+        switch (type)
+        {
+            case '1':
+                type_str = "Function";
+                func_str = std::string(ruleFunction(func));
+                break;
+            case '2':
+                if (indicator == 's')
+                    type_str = "Global short";
+                else if (indicator == 'l')
+                    type_str = "Global long";
+                else if (indicator == 'f')
+                    type_str = "Global float";
+                break;
+            case '3':
+                if (indicator == 's')
+                    type_str = "Local short";
+                else if (indicator == 'l')
+                    type_str = "Local long";
+                else if (indicator == 'f')
+                    type_str = "Local float";
+                break;
+            case '4':
+                if (indicator == 'J')
+                    type_str = "Journal";
+                break;
+            case '5':
+                if (indicator == 'I')
+                    type_str = "Item type";
+                break;
+            case '6':
+                if (indicator == 'D')
+                    type_str = "NPC Dead";
+                break;
+            case '7':
+                if (indicator == 'X')
+                    type_str = "Not ID";
+                break;
+            case '8':
+                if (indicator == 'F')
+                    type_str = "Not Faction";
+                break;
+            case '9':
+                if (indicator == 'C')
+                    type_str = "Not Class";
+                break;
+            case 'A':
+                if (indicator == 'R')
+                    type_str = "Not Race";
+                break;
+            case 'B':
+                if (indicator == 'L')
+                    type_str = "Not Cell";
+                break;
+            case 'C':
+                if (indicator == 's')
+                    type_str = "Not Local";
+                break;
+            default:
+                break;
+        }
 
-    std::string type_str = "INVALID";
-    std::string func_str = Misc::StringUtils::format("INVALID=%s", rule.substr(1,3));
-    int func;
-    std::istringstream iss(rule.substr(2,2));
-    iss >> func;
+        // Append the variable name to the function string if any.
+        if (type != '1')
+            func_str = rule.substr(5);
 
-    switch(type)
-    {
-    case '1':
-        type_str = "Function";
-        func_str = std::string(ruleFunction(func));
-        break;
-    case '2':
-        if (indicator == 's') type_str = "Global short";
-        else if (indicator == 'l') type_str = "Global long";
-        else if (indicator == 'f') type_str = "Global float";
-        break;
-    case '3':
-        if (indicator == 's') type_str = "Local short";
-        else if (indicator == 'l') type_str = "Local long";
-        else if (indicator == 'f') type_str = "Local float";
-        break;
-    case '4': if (indicator == 'J') type_str = "Journal"; break;
-    case '5': if (indicator == 'I') type_str = "Item type"; break;
-    case '6': if (indicator == 'D') type_str = "NPC Dead"; break;
-    case '7': if (indicator == 'X') type_str = "Not ID"; break;
-    case '8': if (indicator == 'F') type_str = "Not Faction"; break;
-    case '9': if (indicator == 'C') type_str = "Not Class"; break;
-    case 'A': if (indicator == 'R') type_str = "Not Race"; break;
-    case 'B': if (indicator == 'L') type_str = "Not Cell"; break;
-    case 'C': if (indicator == 's') type_str = "Not Local"; break;
-    default: break;
-    }
+        // In the previous switch, we assumed that the second char was X
+        // for all types not qual to one.  If this wasn't true, go back to
+        // the error message.
+        if (type != '1' && rule[3] != 'X')
+            func_str = Misc::StringUtils::format("INVALID=%s", rule.substr(1, 3));
 
-    // Append the variable name to the function string if any.
-    if (type != '1') func_str = rule.substr(5);
+        char oper = rule[4];
+        std::string oper_str = "??";
+        switch (oper)
+        {
+            case '0':
+                oper_str = "==";
+                break;
+            case '1':
+                oper_str = "!=";
+                break;
+            case '2':
+                oper_str = "> ";
+                break;
+            case '3':
+                oper_str = ">=";
+                break;
+            case '4':
+                oper_str = "< ";
+                break;
+            case '5':
+                oper_str = "<=";
+                break;
+            default:
+                break;
+        }
 
-    // In the previous switch, we assumed that the second char was X
-    // for all types not qual to one.  If this wasn't true, go back to
-    // the error message.
-    if (type != '1' && rule[3] != 'X')
-        func_str = Misc::StringUtils::format("INVALID=%s", rule.substr(1,3));
+        std::ostringstream stream;
+        stream << ss.mValue;
 
-    char oper = rule[4];
-    std::string oper_str = "??";
-    switch (oper)
-    {
-    case '0': oper_str = "=="; break;
-    case '1': oper_str = "!="; break;
-    case '2': oper_str = "> "; break;
-    case '3': oper_str = ">="; break;
-    case '4': oper_str = "< "; break;
-    case '5': oper_str = "<="; break;
-    default: break;
+        std::string result
+            = Misc::StringUtils::format("%-12s %-32s %2s %s", type_str, func_str, oper_str, stream.str());
+        return result;
     }
 
-    std::ostringstream stream;
-    stream << ss.mValue;
-
-    std::string result = Misc::StringUtils::format("%-12s %-32s %2s %s", type_str, func_str, oper_str, stream.str());
-    return result;
-}
-
-void printEffectList(const ESM::EffectList& effects)
-{
-    int i = 0;
-    for (const ESM::ENAMstruct& effect : effects.mList)
+    void printEffectList(const ESM::EffectList& effects)
     {
-        std::cout << "  Effect[" << i << "]: " << magicEffectLabel(effect.mEffectID)
-                  << " (" << effect.mEffectID << ")" << std::endl;
-        if (effect.mSkill != -1)
-            std::cout << "    Skill: " << skillLabel(effect.mSkill)
-                      << " (" << (int)effect.mSkill << ")" << std::endl;
-        if (effect.mAttribute != -1)
-            std::cout << "    Attribute: " << attributeLabel(effect.mAttribute)
-                      << " (" << (int)effect.mAttribute << ")" << std::endl;
-        std::cout << "    Range: " << rangeTypeLabel(effect.mRange)
-                  << " (" << effect.mRange << ")" << std::endl;
-        // Area is always zero if range type is "Self"
-        if (effect.mRange != ESM::RT_Self)
-            std::cout << "    Area: " << effect.mArea << std::endl;
-        std::cout << "    Duration: " << effect.mDuration << std::endl;
-        std::cout << "    Magnitude: " << effect.mMagnMin << "-" << effect.mMagnMax << std::endl;
-        i++;
+        int i = 0;
+        for (const ESM::ENAMstruct& effect : effects.mList)
+        {
+            std::cout << "  Effect[" << i << "]: " << magicEffectLabel(effect.mEffectID) << " (" << effect.mEffectID
+                      << ")" << std::endl;
+            if (effect.mSkill != -1)
+                std::cout << "    Skill: " << skillLabel(effect.mSkill) << " (" << (int)effect.mSkill << ")"
+                          << std::endl;
+            if (effect.mAttribute != -1)
+                std::cout << "    Attribute: " << attributeLabel(effect.mAttribute) << " (" << (int)effect.mAttribute
+                          << ")" << std::endl;
+            std::cout << "    Range: " << rangeTypeLabel(effect.mRange) << " (" << effect.mRange << ")" << std::endl;
+            // Area is always zero if range type is "Self"
+            if (effect.mRange != ESM::RT_Self)
+                std::cout << "    Area: " << effect.mArea << std::endl;
+            std::cout << "    Duration: " << effect.mDuration << std::endl;
+            std::cout << "    Magnitude: " << effect.mMagnMin << "-" << effect.mMagnMax << std::endl;
+            i++;
+        }
     }
-}
 
-void printTransport(const std::vector<ESM::Transport::Dest>& transport)
-{
-    for (const ESM::Transport::Dest& dest : transport)
+    void printTransport(const std::vector<ESM::Transport::Dest>& transport)
     {
-        std::cout << "  Destination Position: "
-                  << Misc::StringUtils::format("%12.3f", dest.mPos.pos[0]) << ","
-                  << Misc::StringUtils::format("%12.3f", dest.mPos.pos[1]) << ","
-                  << Misc::StringUtils::format("%12.3f", dest.mPos.pos[2]) << ")" << std::endl;
-        std::cout << "  Destination Rotation: "
-                  << Misc::StringUtils::format("%9.6f", dest.mPos.rot[0]) << ","
-                  << Misc::StringUtils::format("%9.6f", dest.mPos.rot[1]) << ","
-                  << Misc::StringUtils::format("%9.6f", dest.mPos.rot[2]) << ")" << std::endl;
-        if (!dest.mCellName.empty())
-            std::cout << "  Destination Cell: " << dest.mCellName << std::endl;
+        for (const ESM::Transport::Dest& dest : transport)
+        {
+            std::cout << "  Destination Position: " << Misc::StringUtils::format("%12.3f", dest.mPos.pos[0]) << ","
+                      << Misc::StringUtils::format("%12.3f", dest.mPos.pos[1]) << ","
+                      << Misc::StringUtils::format("%12.3f", dest.mPos.pos[2]) << ")" << std::endl;
+            std::cout << "  Destination Rotation: " << Misc::StringUtils::format("%9.6f", dest.mPos.rot[0]) << ","
+                      << Misc::StringUtils::format("%9.6f", dest.mPos.rot[1]) << ","
+                      << Misc::StringUtils::format("%9.6f", dest.mPos.rot[2]) << ")" << std::endl;
+            if (!dest.mCellName.empty())
+                std::cout << "  Destination Cell: " << dest.mCellName << std::endl;
+        }
     }
-}
 
 }
 
-namespace EsmTool {
-
-std::unique_ptr<RecordBase> RecordBase::create(const ESM::NAME type)
+namespace EsmTool
 {
-    std::unique_ptr<RecordBase> record;
 
-    switch (type.toInt())
-    {
-    case ESM::REC_ACTI:
-    {
-        record = std::make_unique<EsmTool::Record<ESM::Activator>>();
-        break;
-    }
-    case ESM::REC_ALCH:
-    {
-        record = std::make_unique<EsmTool::Record<ESM::Potion>>();
-        break;
-    }
-    case ESM::REC_APPA:
-    {
-        record = std::make_unique<EsmTool::Record<ESM::Apparatus>>();
-        break;
-    }
-    case ESM::REC_ARMO:
+    std::unique_ptr<RecordBase> RecordBase::create(const ESM::NAME type)
     {
-        record = std::make_unique<EsmTool::Record<ESM::Armor>>();
-        break;
-    }
-    case ESM::REC_BODY:
-    {
-        record = std::make_unique<EsmTool::Record<ESM::BodyPart>>();
-        break;
-    }
-    case ESM::REC_BOOK:
-    {
-        record = std::make_unique<EsmTool::Record<ESM::Book>>();
-        break;
-    }
-    case ESM::REC_BSGN:
-    {
-        record = std::make_unique<EsmTool::Record<ESM::BirthSign>>();
-        break;
-    }
-    case ESM::REC_CELL:
-    {
-        record = std::make_unique<EsmTool::Record<ESM::Cell>>();
-        break;
-    }
-    case ESM::REC_CLAS:
-    {
-        record = std::make_unique<EsmTool::Record<ESM::Class>>();
-        break;
-    }
-    case ESM::REC_CLOT:
-    {
-        record = std::make_unique<EsmTool::Record<ESM::Clothing>>();
-        break;
-    }
-    case ESM::REC_CONT:
-    {
-        record = std::make_unique<EsmTool::Record<ESM::Container>>();
-        break;
-    }
-    case ESM::REC_CREA:
-    {
-        record = std::make_unique<EsmTool::Record<ESM::Creature>>();
-        break;
-    }
-    case ESM::REC_DIAL:
-    {
-        record = std::make_unique<EsmTool::Record<ESM::Dialogue>>();
-        break;
-    }
-    case ESM::REC_DOOR:
-    {
-        record = std::make_unique<EsmTool::Record<ESM::Door>>();
-        break;
-    }
-    case ESM::REC_ENCH:
-    {
-        record = std::make_unique<EsmTool::Record<ESM::Enchantment>>();
-        break;
-    }
-    case ESM::REC_FACT:
-    {
-        record = std::make_unique<EsmTool::Record<ESM::Faction>>();
-        break;
-    }
-    case ESM::REC_GLOB:
-    {
-        record = std::make_unique<EsmTool::Record<ESM::Global>>();
-        break;
+        std::unique_ptr<RecordBase> record;
+
+        switch (type.toInt())
+        {
+            case ESM::REC_ACTI:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Activator>>();
+                break;
+            }
+            case ESM::REC_ALCH:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Potion>>();
+                break;
+            }
+            case ESM::REC_APPA:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Apparatus>>();
+                break;
+            }
+            case ESM::REC_ARMO:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Armor>>();
+                break;
+            }
+            case ESM::REC_BODY:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::BodyPart>>();
+                break;
+            }
+            case ESM::REC_BOOK:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Book>>();
+                break;
+            }
+            case ESM::REC_BSGN:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::BirthSign>>();
+                break;
+            }
+            case ESM::REC_CELL:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Cell>>();
+                break;
+            }
+            case ESM::REC_CLAS:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Class>>();
+                break;
+            }
+            case ESM::REC_CLOT:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Clothing>>();
+                break;
+            }
+            case ESM::REC_CONT:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Container>>();
+                break;
+            }
+            case ESM::REC_CREA:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Creature>>();
+                break;
+            }
+            case ESM::REC_DIAL:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Dialogue>>();
+                break;
+            }
+            case ESM::REC_DOOR:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Door>>();
+                break;
+            }
+            case ESM::REC_ENCH:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Enchantment>>();
+                break;
+            }
+            case ESM::REC_FACT:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Faction>>();
+                break;
+            }
+            case ESM::REC_GLOB:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Global>>();
+                break;
+            }
+            case ESM::REC_GMST:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::GameSetting>>();
+                break;
+            }
+            case ESM::REC_INFO:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::DialInfo>>();
+                break;
+            }
+            case ESM::REC_INGR:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Ingredient>>();
+                break;
+            }
+            case ESM::REC_LAND:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Land>>();
+                break;
+            }
+            case ESM::REC_LEVI:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::ItemLevList>>();
+                break;
+            }
+            case ESM::REC_LEVC:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::CreatureLevList>>();
+                break;
+            }
+            case ESM::REC_LIGH:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Light>>();
+                break;
+            }
+            case ESM::REC_LOCK:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Lockpick>>();
+                break;
+            }
+            case ESM::REC_LTEX:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::LandTexture>>();
+                break;
+            }
+            case ESM::REC_MISC:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Miscellaneous>>();
+                break;
+            }
+            case ESM::REC_MGEF:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::MagicEffect>>();
+                break;
+            }
+            case ESM::REC_NPC_:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::NPC>>();
+                break;
+            }
+            case ESM::REC_PGRD:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Pathgrid>>();
+                break;
+            }
+            case ESM::REC_PROB:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Probe>>();
+                break;
+            }
+            case ESM::REC_RACE:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Race>>();
+                break;
+            }
+            case ESM::REC_REGN:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Region>>();
+                break;
+            }
+            case ESM::REC_REPA:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Repair>>();
+                break;
+            }
+            case ESM::REC_SCPT:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Script>>();
+                break;
+            }
+            case ESM::REC_SKIL:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Skill>>();
+                break;
+            }
+            case ESM::REC_SNDG:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::SoundGenerator>>();
+                break;
+            }
+            case ESM::REC_SOUN:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Sound>>();
+                break;
+            }
+            case ESM::REC_SPEL:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Spell>>();
+                break;
+            }
+            case ESM::REC_STAT:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Static>>();
+                break;
+            }
+            case ESM::REC_WEAP:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::Weapon>>();
+                break;
+            }
+            case ESM::REC_SSCR:
+            {
+                record = std::make_unique<EsmTool::Record<ESM::StartScript>>();
+                break;
+            }
+            default:
+                break;
+        }
+        if (record)
+        {
+            record->mType = type;
+        }
+        return record;
     }
-    case ESM::REC_GMST:
+
+    template <>
+    void Record<ESM::Activator>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::GameSetting>>();
-        break;
+        std::cout << "  Name: " << mData.mName << std::endl;
+        std::cout << "  Model: " << mData.mModel << std::endl;
+        std::cout << "  Script: " << mData.mScript << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    case ESM::REC_INFO:
+
+    template <>
+    void Record<ESM::Potion>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::DialInfo>>();
-        break;
+        std::cout << "  Name: " << mData.mName << std::endl;
+        std::cout << "  Model: " << mData.mModel << std::endl;
+        std::cout << "  Icon: " << mData.mIcon << std::endl;
+        if (!mData.mScript.empty())
+            std::cout << "  Script: " << mData.mScript << std::endl;
+        std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
+        std::cout << "  Value: " << mData.mData.mValue << std::endl;
+        std::cout << "  AutoCalc: " << mData.mData.mAutoCalc << std::endl;
+        printEffectList(mData.mEffects);
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    case ESM::REC_INGR:
+
+    template <>
+    void Record<ESM::Armor>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::Ingredient>>();
-        break;
+        std::cout << "  Name: " << mData.mName << std::endl;
+        std::cout << "  Model: " << mData.mModel << std::endl;
+        std::cout << "  Icon: " << mData.mIcon << std::endl;
+        if (!mData.mScript.empty())
+            std::cout << "  Script: " << mData.mScript << std::endl;
+        if (!mData.mEnchant.empty())
+            std::cout << "  Enchantment: " << mData.mEnchant << std::endl;
+        std::cout << "  Type: " << armorTypeLabel(mData.mData.mType) << " (" << mData.mData.mType << ")" << std::endl;
+        std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
+        std::cout << "  Value: " << mData.mData.mValue << std::endl;
+        std::cout << "  Health: " << mData.mData.mHealth << std::endl;
+        std::cout << "  Armor: " << mData.mData.mArmor << std::endl;
+        std::cout << "  Enchantment Points: " << mData.mData.mEnchant << std::endl;
+        for (const ESM::PartReference& part : mData.mParts.mParts)
+        {
+            std::cout << "  Body Part: " << bodyPartLabel(part.mPart) << " (" << (int)(part.mPart) << ")" << std::endl;
+            std::cout << "    Male Name: " << part.mMale << std::endl;
+            if (!part.mFemale.empty())
+                std::cout << "    Female Name: " << part.mFemale << std::endl;
+        }
+
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    case ESM::REC_LAND:
+
+    template <>
+    void Record<ESM::Apparatus>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::Land>>();
-        break;
+        std::cout << "  Name: " << mData.mName << std::endl;
+        std::cout << "  Model: " << mData.mModel << std::endl;
+        std::cout << "  Icon: " << mData.mIcon << std::endl;
+        std::cout << "  Script: " << mData.mScript << std::endl;
+        std::cout << "  Type: " << apparatusTypeLabel(mData.mData.mType) << " (" << mData.mData.mType << ")"
+                  << std::endl;
+        std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
+        std::cout << "  Value: " << mData.mData.mValue << std::endl;
+        std::cout << "  Quality: " << mData.mData.mQuality << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    case ESM::REC_LEVI:
+
+    template <>
+    void Record<ESM::BodyPart>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::ItemLevList>>();
-        break;
+        std::cout << "  Race: " << mData.mRace << std::endl;
+        std::cout << "  Model: " << mData.mModel << std::endl;
+        std::cout << "  Type: " << meshTypeLabel(mData.mData.mType) << " (" << (int)mData.mData.mType << ")"
+                  << std::endl;
+        std::cout << "  Flags: " << bodyPartFlags(mData.mData.mFlags) << std::endl;
+        std::cout << "  Part: " << meshPartLabel(mData.mData.mPart) << " (" << (int)mData.mData.mPart << ")"
+                  << std::endl;
+        std::cout << "  Vampire: " << (int)mData.mData.mVampire << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    case ESM::REC_LEVC:
+
+    template <>
+    void Record<ESM::Book>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::CreatureLevList>>();
-        break;
+        std::cout << "  Name: " << mData.mName << std::endl;
+        std::cout << "  Model: " << mData.mModel << std::endl;
+        std::cout << "  Icon: " << mData.mIcon << std::endl;
+        if (!mData.mScript.empty())
+            std::cout << "  Script: " << mData.mScript << std::endl;
+        if (!mData.mEnchant.empty())
+            std::cout << "  Enchantment: " << mData.mEnchant << std::endl;
+        std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
+        std::cout << "  Value: " << mData.mData.mValue << std::endl;
+        std::cout << "  IsScroll: " << mData.mData.mIsScroll << std::endl;
+        std::cout << "  SkillId: " << mData.mData.mSkillId << std::endl;
+        std::cout << "  Enchantment Points: " << mData.mData.mEnchant << std::endl;
+        if (mPrintPlain)
+        {
+            std::cout << "  Text:" << std::endl;
+            std::cout << "START--------------------------------------" << std::endl;
+            std::cout << mData.mText << std::endl;
+            std::cout << "END----------------------------------------" << std::endl;
+        }
+        else
+        {
+            std::cout << "  Text: [skipped]" << std::endl;
+        }
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    case ESM::REC_LIGH:
+
+    template <>
+    void Record<ESM::BirthSign>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::Light>>();
-        break;
+        std::cout << "  Name: " << mData.mName << std::endl;
+        std::cout << "  Texture: " << mData.mTexture << std::endl;
+        std::cout << "  Description: " << mData.mDescription << std::endl;
+        for (const std::string& power : mData.mPowers.mList)
+            std::cout << "  Power: " << power << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    case ESM::REC_LOCK:
+
+    template <>
+    void Record<ESM::Cell>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::Lockpick>>();
-        break;
+        // None of the cells have names...
+        if (!mData.mName.empty())
+            std::cout << "  Name: " << mData.mName << std::endl;
+        if (!mData.mRegion.empty())
+            std::cout << "  Region: " << mData.mRegion << std::endl;
+        std::cout << "  Flags: " << cellFlags(mData.mData.mFlags) << std::endl;
+
+        std::cout << "  Coordinates: "
+                  << " (" << mData.getGridX() << "," << mData.getGridY() << ")" << std::endl;
+
+        if (mData.mData.mFlags & ESM::Cell::Interior && !(mData.mData.mFlags & ESM::Cell::QuasiEx))
+        {
+            if (mData.hasAmbient())
+            {
+                // TODO: see if we can change the integer representation to something more sensible
+                std::cout << "  Ambient Light Color: " << mData.mAmbi.mAmbient << std::endl;
+                std::cout << "  Sunlight Color: " << mData.mAmbi.mSunlight << std::endl;
+                std::cout << "  Fog Color: " << mData.mAmbi.mFog << std::endl;
+                std::cout << "  Fog Density: " << mData.mAmbi.mFogDensity << std::endl;
+            }
+            else
+            {
+                std::cout << "  No Ambient Information" << std::endl;
+            }
+            std::cout << "  Water Level: " << mData.mWater << std::endl;
+        }
+        else
+            std::cout << "  Map Color: " << Misc::StringUtils::format("0x%08X", mData.mMapColor) << std::endl;
+        std::cout << "  Water Level Int: " << mData.mWaterInt << std::endl;
+        std::cout << "  RefId counter: " << mData.mRefNumCounter << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    case ESM::REC_LTEX:
+
+    template <>
+    void Record<ESM::Class>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::LandTexture>>();
-        break;
-    }
-    case ESM::REC_MISC:
+        std::cout << "  Name: " << mData.mName << std::endl;
+        std::cout << "  Description: " << mData.mDescription << std::endl;
+        std::cout << "  Playable: " << mData.mData.mIsPlayable << std::endl;
+        std::cout << "  AutoCalc: " << mData.mData.mCalc << std::endl;
+        std::cout << "  Attribute1: " << attributeLabel(mData.mData.mAttribute[0]) << " (" << mData.mData.mAttribute[0]
+                  << ")" << std::endl;
+        std::cout << "  Attribute2: " << attributeLabel(mData.mData.mAttribute[1]) << " (" << mData.mData.mAttribute[1]
+                  << ")" << std::endl;
+        std::cout << "  Specialization: " << specializationLabel(mData.mData.mSpecialization) << " ("
+                  << mData.mData.mSpecialization << ")" << std::endl;
+        for (int i = 0; i != 5; i++)
+            std::cout << "  Minor Skill: " << skillLabel(mData.mData.mSkills[i][0]) << " (" << mData.mData.mSkills[i][0]
+                      << ")" << std::endl;
+        for (int i = 0; i != 5; i++)
+            std::cout << "  Major Skill: " << skillLabel(mData.mData.mSkills[i][1]) << " (" << mData.mData.mSkills[i][1]
+                      << ")" << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
+    }
+
+    template <>
+    void Record<ESM::Clothing>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::Miscellaneous>>();
-        break;
+        std::cout << "  Name: " << mData.mName << std::endl;
+        std::cout << "  Model: " << mData.mModel << std::endl;
+        std::cout << "  Icon: " << mData.mIcon << std::endl;
+        if (!mData.mScript.empty())
+            std::cout << "  Script: " << mData.mScript << std::endl;
+        if (!mData.mEnchant.empty())
+            std::cout << "  Enchantment: " << mData.mEnchant << std::endl;
+        std::cout << "  Type: " << clothingTypeLabel(mData.mData.mType) << " (" << mData.mData.mType << ")"
+                  << std::endl;
+        std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
+        std::cout << "  Value: " << mData.mData.mValue << std::endl;
+        std::cout << "  Enchantment Points: " << mData.mData.mEnchant << std::endl;
+        for (const ESM::PartReference& part : mData.mParts.mParts)
+        {
+            std::cout << "  Body Part: " << bodyPartLabel(part.mPart) << " (" << (int)(part.mPart) << ")" << std::endl;
+            std::cout << "    Male Name: " << part.mMale << std::endl;
+            if (!part.mFemale.empty())
+                std::cout << "    Female Name: " << part.mFemale << std::endl;
+        }
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    case ESM::REC_MGEF:
+
+    template <>
+    void Record<ESM::Container>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::MagicEffect>>();
-        break;
+        std::cout << "  Name: " << mData.mName << std::endl;
+        std::cout << "  Model: " << mData.mModel << std::endl;
+        if (!mData.mScript.empty())
+            std::cout << "  Script: " << mData.mScript << std::endl;
+        std::cout << "  Flags: " << containerFlags(mData.mFlags) << std::endl;
+        std::cout << "  Weight: " << mData.mWeight << std::endl;
+        for (const ESM::ContItem& item : mData.mInventory.mList)
+            std::cout << "  Inventory: Count: " << Misc::StringUtils::format("%4d", item.mCount)
+                      << " Item: " << item.mItem << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    case ESM::REC_NPC_:
+
+    template <>
+    void Record<ESM::Creature>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::NPC>>();
-        break;
-    }
-    case ESM::REC_PGRD:
+        std::cout << "  Name: " << mData.mName << std::endl;
+        std::cout << "  Model: " << mData.mModel << std::endl;
+        std::cout << "  Script: " << mData.mScript << std::endl;
+        std::cout << "  Flags: " << creatureFlags((int)mData.mFlags) << std::endl;
+        std::cout << "  Blood Type: " << mData.mBloodType + 1 << std::endl;
+        std::cout << "  Original: " << mData.mOriginal << std::endl;
+        std::cout << "  Scale: " << mData.mScale << std::endl;
+
+        std::cout << "  Type: " << creatureTypeLabel(mData.mData.mType) << " (" << mData.mData.mType << ")"
+                  << std::endl;
+        std::cout << "  Level: " << mData.mData.mLevel << std::endl;
+
+        std::cout << "  Attributes:" << std::endl;
+        std::cout << "    Strength: " << mData.mData.mStrength << std::endl;
+        std::cout << "    Intelligence: " << mData.mData.mIntelligence << std::endl;
+        std::cout << "    Willpower: " << mData.mData.mWillpower << std::endl;
+        std::cout << "    Agility: " << mData.mData.mAgility << std::endl;
+        std::cout << "    Speed: " << mData.mData.mSpeed << std::endl;
+        std::cout << "    Endurance: " << mData.mData.mEndurance << std::endl;
+        std::cout << "    Personality: " << mData.mData.mPersonality << std::endl;
+        std::cout << "    Luck: " << mData.mData.mLuck << std::endl;
+
+        std::cout << "  Health: " << mData.mData.mHealth << std::endl;
+        std::cout << "  Magicka: " << mData.mData.mMana << std::endl;
+        std::cout << "  Fatigue: " << mData.mData.mFatigue << std::endl;
+        std::cout << "  Soul: " << mData.mData.mSoul << std::endl;
+        std::cout << "  Combat: " << mData.mData.mCombat << std::endl;
+        std::cout << "  Magic: " << mData.mData.mMagic << std::endl;
+        std::cout << "  Stealth: " << mData.mData.mStealth << std::endl;
+        std::cout << "  Attack1: " << mData.mData.mAttack[0] << "-" << mData.mData.mAttack[1] << std::endl;
+        std::cout << "  Attack2: " << mData.mData.mAttack[2] << "-" << mData.mData.mAttack[3] << std::endl;
+        std::cout << "  Attack3: " << mData.mData.mAttack[4] << "-" << mData.mData.mAttack[5] << std::endl;
+        std::cout << "  Gold: " << mData.mData.mGold << std::endl;
+
+        for (const ESM::ContItem& item : mData.mInventory.mList)
+            std::cout << "  Inventory: Count: " << Misc::StringUtils::format("%4d", item.mCount)
+                      << " Item: " << item.mItem << std::endl;
+
+        for (const std::string& spell : mData.mSpells.mList)
+            std::cout << "  Spell: " << spell << std::endl;
+
+        printTransport(mData.getTransport());
+
+        std::cout << "  Artificial Intelligence: " << std::endl;
+        std::cout << "    AI Hello:" << (int)mData.mAiData.mHello << std::endl;
+        std::cout << "    AI Fight:" << (int)mData.mAiData.mFight << std::endl;
+        std::cout << "    AI Flee:" << (int)mData.mAiData.mFlee << std::endl;
+        std::cout << "    AI Alarm:" << (int)mData.mAiData.mAlarm << std::endl;
+        std::cout << "    AI U1:" << (int)mData.mAiData.mU1 << std::endl;
+        std::cout << "    AI U2:" << (int)mData.mAiData.mU2 << std::endl;
+        std::cout << "    AI U3:" << (int)mData.mAiData.mU3 << std::endl;
+        std::cout << "    AI Services:" << Misc::StringUtils::format("0x%08X", mData.mAiData.mServices) << std::endl;
+
+        for (const ESM::AIPackage& package : mData.mAiPackage.mList)
+            printAIPackage(package);
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
+    }
+
+    template <>
+    void Record<ESM::Dialogue>::print()
+    {
+        std::cout << "  Type: " << dialogTypeLabel(mData.mType) << " (" << (int)mData.mType << ")" << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
+        // Sadly, there are no DialInfos, because the loader dumps as it
+        // loads, rather than loading and then dumping. :-( Anyone mind if
+        // I change this?
+        for (const ESM::DialInfo& info : mData.mInfo)
+            std::cout << "INFO!" << info.mId << std::endl;
+    }
+
+    template <>
+    void Record<ESM::Door>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::Pathgrid>>();
-        break;
+        std::cout << "  Name: " << mData.mName << std::endl;
+        std::cout << "  Model: " << mData.mModel << std::endl;
+        std::cout << "  Script: " << mData.mScript << std::endl;
+        std::cout << "  OpenSound: " << mData.mOpenSound << std::endl;
+        std::cout << "  CloseSound: " << mData.mCloseSound << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    case ESM::REC_PROB:
+
+    template <>
+    void Record<ESM::Enchantment>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::Probe>>();
-        break;
+        std::cout << "  Type: " << enchantTypeLabel(mData.mData.mType) << " (" << mData.mData.mType << ")" << std::endl;
+        std::cout << "  Cost: " << mData.mData.mCost << std::endl;
+        std::cout << "  Charge: " << mData.mData.mCharge << std::endl;
+        std::cout << "  Flags: " << enchantmentFlags(mData.mData.mFlags) << std::endl;
+        printEffectList(mData.mEffects);
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    case ESM::REC_RACE:
+
+    template <>
+    void Record<ESM::Faction>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::Race>>();
-        break;
+        std::cout << "  Name: " << mData.mName << std::endl;
+        std::cout << "  Hidden: " << mData.mData.mIsHidden << std::endl;
+        std::cout << "  Attribute1: " << attributeLabel(mData.mData.mAttribute[0]) << " (" << mData.mData.mAttribute[0]
+                  << ")" << std::endl;
+        std::cout << "  Attribute2: " << attributeLabel(mData.mData.mAttribute[1]) << " (" << mData.mData.mAttribute[1]
+                  << ")" << std::endl;
+        for (int skill : mData.mData.mSkills)
+            if (skill != -1)
+                std::cout << "  Skill: " << skillLabel(skill) << " (" << skill << ")" << std::endl;
+        for (int i = 0; i != 10; i++)
+            if (!mData.mRanks[i].empty())
+            {
+                std::cout << "  Rank: " << mData.mRanks[i] << std::endl;
+                std::cout << "    Attribute1 Requirement: " << mData.mData.mRankData[i].mAttribute1 << std::endl;
+                std::cout << "    Attribute2 Requirement: " << mData.mData.mRankData[i].mAttribute2 << std::endl;
+                std::cout << "    One Skill at Level: " << mData.mData.mRankData[i].mPrimarySkill << std::endl;
+                std::cout << "    Two Skills at Level: " << mData.mData.mRankData[i].mFavouredSkill << std::endl;
+                std::cout << "    Faction Reaction: " << mData.mData.mRankData[i].mFactReaction << std::endl;
+            }
+        for (const auto& reaction : mData.mReactions)
+            std::cout << "  Reaction: " << reaction.second << " = " << reaction.first << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
+    }
+
+    template <>
+    void Record<ESM::Global>::print()
+    {
+        std::cout << "  " << mData.mValue << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
+    }
+
+    template <>
+    void Record<ESM::GameSetting>::print()
+    {
+        std::cout << "  " << mData.mValue << std::endl;
+    }
+
+    template <>
+    void Record<ESM::DialInfo>::print()
+    {
+        std::cout << "  Id: " << mData.mId << std::endl;
+        if (!mData.mPrev.empty())
+            std::cout << "  Previous ID: " << mData.mPrev << std::endl;
+        if (!mData.mNext.empty())
+            std::cout << "  Next ID: " << mData.mNext << std::endl;
+        std::cout << "  Text: " << mData.mResponse << std::endl;
+        if (!mData.mActor.empty())
+            std::cout << "  Actor: " << mData.mActor << std::endl;
+        if (!mData.mRace.empty())
+            std::cout << "  Race: " << mData.mRace << std::endl;
+        if (!mData.mClass.empty())
+            std::cout << "  Class: " << mData.mClass << std::endl;
+        std::cout << "  Factionless: " << mData.mFactionLess << std::endl;
+        if (!mData.mFaction.empty())
+            std::cout << "  NPC Faction: " << mData.mFaction << std::endl;
+        if (mData.mData.mRank != -1)
+            std::cout << "  NPC Rank: " << (int)mData.mData.mRank << std::endl;
+        if (!mData.mPcFaction.empty())
+            std::cout << "  PC Faction: " << mData.mPcFaction << std::endl;
+        // CHANGE? non-standard capitalization mPCrank -> mPCRank (mPcRank?)
+        if (mData.mData.mPCrank != -1)
+            std::cout << "  PC Rank: " << (int)mData.mData.mPCrank << std::endl;
+        if (!mData.mCell.empty())
+            std::cout << "  Cell: " << mData.mCell << std::endl;
+        if (mData.mData.mDisposition > 0)
+            std::cout << "  Disposition/Journal index: " << mData.mData.mDisposition << std::endl;
+        if (mData.mData.mGender != ESM::DialInfo::NA)
+            std::cout << "  Gender: " << mData.mData.mGender << std::endl;
+        if (!mData.mSound.empty())
+            std::cout << "  Sound File: " << mData.mSound << std::endl;
+
+        std::cout << "  Quest Status: " << questStatusLabel(mData.mQuestStatus) << " (" << mData.mQuestStatus << ")"
+                  << std::endl;
+        std::cout << "  Unknown1: " << mData.mData.mUnknown1 << std::endl;
+        std::cout << "  Unknown2: " << (int)mData.mData.mUnknown2 << std::endl;
+
+        for (const ESM::DialInfo::SelectStruct& rule : mData.mSelects)
+            std::cout << "  Select Rule: " << ruleString(rule) << std::endl;
+
+        if (!mData.mResultScript.empty())
+        {
+            if (mPrintPlain)
+            {
+                std::cout << "  Result Script:" << std::endl;
+                std::cout << "START--------------------------------------" << std::endl;
+                std::cout << mData.mResultScript << std::endl;
+                std::cout << "END----------------------------------------" << std::endl;
+            }
+            else
+            {
+                std::cout << "  Result Script: [skipped]" << std::endl;
+            }
+        }
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    case ESM::REC_REGN:
+
+    template <>
+    void Record<ESM::Ingredient>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::Region>>();
-        break;
+        std::cout << "  Name: " << mData.mName << std::endl;
+        std::cout << "  Model: " << mData.mModel << std::endl;
+        std::cout << "  Icon: " << mData.mIcon << std::endl;
+        if (!mData.mScript.empty())
+            std::cout << "  Script: " << mData.mScript << std::endl;
+        std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
+        std::cout << "  Value: " << mData.mData.mValue << std::endl;
+        for (int i = 0; i != 4; i++)
+        {
+            // A value of -1 means no effect
+            if (mData.mData.mEffectID[i] == -1)
+                continue;
+            std::cout << "  Effect: " << magicEffectLabel(mData.mData.mEffectID[i]) << " (" << mData.mData.mEffectID[i]
+                      << ")" << std::endl;
+            std::cout << "  Skill: " << skillLabel(mData.mData.mSkills[i]) << " (" << mData.mData.mSkills[i] << ")"
+                      << std::endl;
+            std::cout << "  Attribute: " << attributeLabel(mData.mData.mAttributes[i]) << " ("
+                      << mData.mData.mAttributes[i] << ")" << std::endl;
+        }
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    case ESM::REC_REPA:
+
+    template <>
+    void Record<ESM::Land>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::Repair>>();
-        break;
+        std::cout << "  Coordinates: (" << mData.mX << "," << mData.mY << ")" << std::endl;
+        std::cout << "  Flags: " << landFlags(mData.mFlags) << std::endl;
+        std::cout << "  DataTypes: " << mData.mDataTypes << std::endl;
+
+        if (const ESM::Land::LandData* data = mData.getLandData(mData.mDataTypes))
+        {
+            std::cout << "  Height Offset: " << data->mHeightOffset << std::endl;
+            // Lots of missing members.
+            std::cout << "  Unknown1: " << data->mUnk1 << std::endl;
+            std::cout << "  Unknown2: " << data->mUnk2 << std::endl;
+        }
+        mData.unloadData();
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    case ESM::REC_SCPT:
+
+    template <>
+    void Record<ESM::CreatureLevList>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::Script>>();
-        break;
+        std::cout << "  Chance for None: " << (int)mData.mChanceNone << std::endl;
+        std::cout << "  Flags: " << creatureListFlags(mData.mFlags) << std::endl;
+        std::cout << "  Number of items: " << mData.mList.size() << std::endl;
+        for (const ESM::LevelledListBase::LevelItem& item : mData.mList)
+            std::cout << "  Creature: Level: " << item.mLevel << " Creature: " << item.mId << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    case ESM::REC_SKIL:
+
+    template <>
+    void Record<ESM::ItemLevList>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::Skill>>();
-        break;
+        std::cout << "  Chance for None: " << (int)mData.mChanceNone << std::endl;
+        std::cout << "  Flags: " << itemListFlags(mData.mFlags) << std::endl;
+        std::cout << "  Number of items: " << mData.mList.size() << std::endl;
+        for (const ESM::LevelledListBase::LevelItem& item : mData.mList)
+            std::cout << "  Inventory: Level: " << item.mLevel << " Item: " << item.mId << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    case ESM::REC_SNDG:
+
+    template <>
+    void Record<ESM::Light>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::SoundGenerator>>();
-        break;
+        if (!mData.mName.empty())
+            std::cout << "  Name: " << mData.mName << std::endl;
+        if (!mData.mModel.empty())
+            std::cout << "  Model: " << mData.mModel << std::endl;
+        if (!mData.mIcon.empty())
+            std::cout << "  Icon: " << mData.mIcon << std::endl;
+        if (!mData.mScript.empty())
+            std::cout << "  Script: " << mData.mScript << std::endl;
+        std::cout << "  Flags: " << lightFlags(mData.mData.mFlags) << std::endl;
+        std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
+        std::cout << "  Value: " << mData.mData.mValue << std::endl;
+        std::cout << "  Sound: " << mData.mSound << std::endl;
+        std::cout << "  Duration: " << mData.mData.mTime << std::endl;
+        std::cout << "  Radius: " << mData.mData.mRadius << std::endl;
+        std::cout << "  Color: " << mData.mData.mColor << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    case ESM::REC_SOUN:
+
+    template <>
+    void Record<ESM::Lockpick>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::Sound>>();
-        break;
+        std::cout << "  Name: " << mData.mName << std::endl;
+        std::cout << "  Model: " << mData.mModel << std::endl;
+        std::cout << "  Icon: " << mData.mIcon << std::endl;
+        if (!mData.mScript.empty())
+            std::cout << "  Script: " << mData.mScript << std::endl;
+        std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
+        std::cout << "  Value: " << mData.mData.mValue << std::endl;
+        std::cout << "  Quality: " << mData.mData.mQuality << std::endl;
+        std::cout << "  Uses: " << mData.mData.mUses << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    case ESM::REC_SPEL:
+
+    template <>
+    void Record<ESM::Probe>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::Spell>>();
-        break;
+        std::cout << "  Name: " << mData.mName << std::endl;
+        std::cout << "  Model: " << mData.mModel << std::endl;
+        std::cout << "  Icon: " << mData.mIcon << std::endl;
+        if (!mData.mScript.empty())
+            std::cout << "  Script: " << mData.mScript << std::endl;
+        std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
+        std::cout << "  Value: " << mData.mData.mValue << std::endl;
+        std::cout << "  Quality: " << mData.mData.mQuality << std::endl;
+        std::cout << "  Uses: " << mData.mData.mUses << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    case ESM::REC_STAT:
+
+    template <>
+    void Record<ESM::Repair>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::Static>>();
-        break;
+        std::cout << "  Name: " << mData.mName << std::endl;
+        std::cout << "  Model: " << mData.mModel << std::endl;
+        std::cout << "  Icon: " << mData.mIcon << std::endl;
+        if (!mData.mScript.empty())
+            std::cout << "  Script: " << mData.mScript << std::endl;
+        std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
+        std::cout << "  Value: " << mData.mData.mValue << std::endl;
+        std::cout << "  Quality: " << mData.mData.mQuality << std::endl;
+        std::cout << "  Uses: " << mData.mData.mUses << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    case ESM::REC_WEAP:
+
+    template <>
+    void Record<ESM::LandTexture>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::Weapon>>();
-        break;
+        std::cout << "  Id: " << mData.mId << std::endl;
+        std::cout << "  Index: " << mData.mIndex << std::endl;
+        std::cout << "  Texture: " << mData.mTexture << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    case ESM::REC_SSCR:
+
+    template <>
+    void Record<ESM::MagicEffect>::print()
     {
-        record = std::make_unique<EsmTool::Record<ESM::StartScript>>();
-        break;
-    }
-    default:
-        break;
-    }
-    if (record)
+        std::cout << "  Index: " << magicEffectLabel(mData.mIndex) << " (" << mData.mIndex << ")" << std::endl;
+        std::cout << "  Description: " << mData.mDescription << std::endl;
+        std::cout << "  Icon: " << mData.mIcon << std::endl;
+        std::cout << "  Flags: " << magicEffectFlags(mData.mData.mFlags) << std::endl;
+        std::cout << "  Particle Texture: " << mData.mParticle << std::endl;
+        if (!mData.mCasting.empty())
+            std::cout << "  Casting Static: " << mData.mCasting << std::endl;
+        if (!mData.mCastSound.empty())
+            std::cout << "  Casting Sound: " << mData.mCastSound << std::endl;
+        if (!mData.mBolt.empty())
+            std::cout << "  Bolt Static: " << mData.mBolt << std::endl;
+        if (!mData.mBoltSound.empty())
+            std::cout << "  Bolt Sound: " << mData.mBoltSound << std::endl;
+        if (!mData.mHit.empty())
+            std::cout << "  Hit Static: " << mData.mHit << std::endl;
+        if (!mData.mHitSound.empty())
+            std::cout << "  Hit Sound: " << mData.mHitSound << std::endl;
+        if (!mData.mArea.empty())
+            std::cout << "  Area Static: " << mData.mArea << std::endl;
+        if (!mData.mAreaSound.empty())
+            std::cout << "  Area Sound: " << mData.mAreaSound << std::endl;
+        std::cout << "  School: " << schoolLabel(mData.mData.mSchool) << " (" << mData.mData.mSchool << ")"
+                  << std::endl;
+        std::cout << "  Base Cost: " << mData.mData.mBaseCost << std::endl;
+        std::cout << "  Unknown 1: " << mData.mData.mUnknown1 << std::endl;
+        std::cout << "  Speed: " << mData.mData.mSpeed << std::endl;
+        std::cout << "  Unknown 2: " << mData.mData.mUnknown2 << std::endl;
+        std::cout << "  RGB Color: "
+                  << "(" << mData.mData.mRed << "," << mData.mData.mGreen << "," << mData.mData.mBlue << ")"
+                  << std::endl;
+    }
+
+    template <>
+    void Record<ESM::Miscellaneous>::print()
     {
-        record->mType = type;
+        std::cout << "  Name: " << mData.mName << std::endl;
+        std::cout << "  Model: " << mData.mModel << std::endl;
+        std::cout << "  Icon: " << mData.mIcon << std::endl;
+        if (!mData.mScript.empty())
+            std::cout << "  Script: " << mData.mScript << std::endl;
+        std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
+        std::cout << "  Value: " << mData.mData.mValue << std::endl;
+        std::cout << "  Is Key: " << mData.mData.mIsKey << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    return record;
-}
-
-template<>
-void Record<ESM::Activator>::print()
-{
-    std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Model: " << mData.mModel << std::endl;
-    std::cout << "  Script: " << mData.mScript << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
 
-template<>
-void Record<ESM::Potion>::print()
-{
-    std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Model: " << mData.mModel << std::endl;
-    std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (!mData.mScript.empty())
-        std::cout << "  Script: " << mData.mScript << std::endl;
-    std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
-    std::cout << "  Value: " << mData.mData.mValue << std::endl;
-    std::cout << "  AutoCalc: " << mData.mData.mAutoCalc << std::endl;
-    printEffectList(mData.mEffects);
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
-
-template<>
-void Record<ESM::Armor>::print()
-{
-    std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Model: " << mData.mModel << std::endl;
-    std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (!mData.mScript.empty())
-        std::cout << "  Script: " << mData.mScript << std::endl;
-    if (!mData.mEnchant.empty())
-        std::cout << "  Enchantment: " << mData.mEnchant << std::endl;
-    std::cout << "  Type: " << armorTypeLabel(mData.mData.mType)
-              << " (" << mData.mData.mType << ")" << std::endl;
-    std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
-    std::cout << "  Value: " << mData.mData.mValue << std::endl;
-    std::cout << "  Health: " << mData.mData.mHealth << std::endl;
-    std::cout << "  Armor: " << mData.mData.mArmor << std::endl;
-    std::cout << "  Enchantment Points: " << mData.mData.mEnchant << std::endl;
-    for (const ESM::PartReference &part : mData.mParts.mParts)
+    template <>
+    void Record<ESM::NPC>::print()
     {
-        std::cout << "  Body Part: " << bodyPartLabel(part.mPart)
-                  << " (" << (int)(part.mPart) << ")" << std::endl;
-        std::cout << "    Male Name: " << part.mMale << std::endl;
-        if (!part.mFemale.empty())
-            std::cout << "    Female Name: " << part.mFemale << std::endl;
-    }
-
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
+        std::cout << "  Name: " << mData.mName << std::endl;
+        std::cout << "  Animation: " << mData.mModel << std::endl;
+        std::cout << "  Hair Model: " << mData.mHair << std::endl;
+        std::cout << "  Head Model: " << mData.mHead << std::endl;
+        std::cout << "  Race: " << mData.mRace << std::endl;
+        std::cout << "  Class: " << mData.mClass << std::endl;
+        if (!mData.mScript.empty())
+            std::cout << "  Script: " << mData.mScript << std::endl;
+        if (!mData.mFaction.empty())
+            std::cout << "  Faction: " << mData.mFaction << std::endl;
+        std::cout << "  Flags: " << npcFlags((int)mData.mFlags) << std::endl;
+        if (mData.mBloodType != 0)
+            std::cout << "  Blood Type: " << mData.mBloodType + 1 << std::endl;
+
+        if (mData.mNpdtType == ESM::NPC::NPC_WITH_AUTOCALCULATED_STATS)
+        {
+            std::cout << "  Level: " << mData.mNpdt.mLevel << std::endl;
+            std::cout << "  Reputation: " << (int)mData.mNpdt.mReputation << std::endl;
+            std::cout << "  Disposition: " << (int)mData.mNpdt.mDisposition << std::endl;
+            std::cout << "  Rank: " << (int)mData.mNpdt.mRank << std::endl;
+            std::cout << "  Gold: " << mData.mNpdt.mGold << std::endl;
+        }
+        else
+        {
+            std::cout << "  Level: " << mData.mNpdt.mLevel << std::endl;
+            std::cout << "  Reputation: " << (int)mData.mNpdt.mReputation << std::endl;
+            std::cout << "  Disposition: " << (int)mData.mNpdt.mDisposition << std::endl;
+            std::cout << "  Rank: " << (int)mData.mNpdt.mRank << std::endl;
+
+            std::cout << "  Attributes:" << std::endl;
+            std::cout << "    Strength: " << (int)mData.mNpdt.mStrength << std::endl;
+            std::cout << "    Intelligence: " << (int)mData.mNpdt.mIntelligence << std::endl;
+            std::cout << "    Willpower: " << (int)mData.mNpdt.mWillpower << std::endl;
+            std::cout << "    Agility: " << (int)mData.mNpdt.mAgility << std::endl;
+            std::cout << "    Speed: " << (int)mData.mNpdt.mSpeed << std::endl;
+            std::cout << "    Endurance: " << (int)mData.mNpdt.mEndurance << std::endl;
+            std::cout << "    Personality: " << (int)mData.mNpdt.mPersonality << std::endl;
+            std::cout << "    Luck: " << (int)mData.mNpdt.mLuck << std::endl;
+
+            std::cout << "  Skills:" << std::endl;
+            for (int i = 0; i != ESM::Skill::Length; i++)
+                std::cout << "    " << skillLabel(i) << ": " << (int)(mData.mNpdt.mSkills[i]) << std::endl;
+
+            std::cout << "  Health: " << mData.mNpdt.mHealth << std::endl;
+            std::cout << "  Magicka: " << mData.mNpdt.mMana << std::endl;
+            std::cout << "  Fatigue: " << mData.mNpdt.mFatigue << std::endl;
+            std::cout << "  Gold: " << mData.mNpdt.mGold << std::endl;
+        }
 
-template<>
-void Record<ESM::Apparatus>::print()
-{
-    std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Model: " << mData.mModel << std::endl;
-    std::cout << "  Icon: " << mData.mIcon << std::endl;
-    std::cout << "  Script: " << mData.mScript << std::endl;
-    std::cout << "  Type: " << apparatusTypeLabel(mData.mData.mType)
-              << " (" << mData.mData.mType << ")" << std::endl;
-    std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
-    std::cout << "  Value: " << mData.mData.mValue << std::endl;
-    std::cout << "  Quality: " << mData.mData.mQuality << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
+        for (const ESM::ContItem& item : mData.mInventory.mList)
+            std::cout << "  Inventory: Count: " << Misc::StringUtils::format("%4d", item.mCount)
+                      << " Item: " << item.mItem << std::endl;
 
-template<>
-void Record<ESM::BodyPart>::print()
-{
-    std::cout << "  Race: " << mData.mRace << std::endl;
-    std::cout << "  Model: " << mData.mModel << std::endl;
-    std::cout << "  Type: " << meshTypeLabel(mData.mData.mType)
-              << " (" << (int)mData.mData.mType << ")" << std::endl;
-    std::cout << "  Flags: " << bodyPartFlags(mData.mData.mFlags) << std::endl;
-    std::cout << "  Part: " << meshPartLabel(mData.mData.mPart)
-              << " (" << (int)mData.mData.mPart << ")" << std::endl;
-    std::cout << "  Vampire: " << (int)mData.mData.mVampire << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
+        for (const std::string& spell : mData.mSpells.mList)
+            std::cout << "  Spell: " << spell << std::endl;
 
-template<>
-void Record<ESM::Book>::print()
-{
-    std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Model: " << mData.mModel << std::endl;
-    std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (!mData.mScript.empty())
-        std::cout << "  Script: " << mData.mScript << std::endl;
-    if (!mData.mEnchant.empty())
-        std::cout << "  Enchantment: " << mData.mEnchant << std::endl;
-    std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
-    std::cout << "  Value: " << mData.mData.mValue << std::endl;
-    std::cout << "  IsScroll: " << mData.mData.mIsScroll << std::endl;
-    std::cout << "  SkillId: " << mData.mData.mSkillId << std::endl;
-    std::cout << "  Enchantment Points: " << mData.mData.mEnchant << std::endl;
-    if (mPrintPlain)
-    {
-        std::cout << "  Text:" << std::endl;
-        std::cout << "START--------------------------------------" << std::endl;
-        std::cout << mData.mText << std::endl;
-        std::cout << "END----------------------------------------" << std::endl;
-    }
-    else
-    {
-        std::cout << "  Text: [skipped]" << std::endl;
-    }
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
+        printTransport(mData.getTransport());
 
-template<>
-void Record<ESM::BirthSign>::print()
-{
-    std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Texture: " << mData.mTexture << std::endl;
-    std::cout << "  Description: " << mData.mDescription << std::endl;
-    for (const std::string &power : mData.mPowers.mList)
-        std::cout << "  Power: " << power << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
+        std::cout << "  Artificial Intelligence: " << std::endl;
+        std::cout << "    AI Hello:" << (int)mData.mAiData.mHello << std::endl;
+        std::cout << "    AI Fight:" << (int)mData.mAiData.mFight << std::endl;
+        std::cout << "    AI Flee:" << (int)mData.mAiData.mFlee << std::endl;
+        std::cout << "    AI Alarm:" << (int)mData.mAiData.mAlarm << std::endl;
+        std::cout << "    AI U1:" << (int)mData.mAiData.mU1 << std::endl;
+        std::cout << "    AI U2:" << (int)mData.mAiData.mU2 << std::endl;
+        std::cout << "    AI U3:" << (int)mData.mAiData.mU3 << std::endl;
+        std::cout << "    AI Services:" << Misc::StringUtils::format("0x%08X", mData.mAiData.mServices) << std::endl;
 
-template<>
-void Record<ESM::Cell>::print()
-{
-    // None of the cells have names...
-    if (!mData.mName.empty())
-        std::cout << "  Name: " << mData.mName << std::endl;
-    if (!mData.mRegion.empty())
-        std::cout << "  Region: " << mData.mRegion << std::endl;
-    std::cout << "  Flags: " << cellFlags(mData.mData.mFlags) << std::endl;
+        for (const ESM::AIPackage& package : mData.mAiPackage.mList)
+            printAIPackage(package);
 
-    std::cout << "  Coordinates: " << " (" << mData.getGridX() << ","
-              << mData.getGridY() << ")" << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
+    }
 
-    if (mData.mData.mFlags & ESM::Cell::Interior &&
-        !(mData.mData.mFlags & ESM::Cell::QuasiEx))
+    template <>
+    void Record<ESM::Pathgrid>::print()
     {
-        if (mData.hasAmbient())
+        std::cout << "  Cell: " << mData.mCell << std::endl;
+        std::cout << "  Coordinates: (" << mData.mData.mX << "," << mData.mData.mY << ")" << std::endl;
+        std::cout << "  Unknown S1: " << mData.mData.mS1 << std::endl;
+        if ((unsigned int)mData.mData.mS2 != mData.mPoints.size())
+            std::cout << "  Reported Point Count: " << mData.mData.mS2 << std::endl;
+        std::cout << "  Point Count: " << mData.mPoints.size() << std::endl;
+        std::cout << "  Edge Count: " << mData.mEdges.size() << std::endl;
+
+        int i = 0;
+        for (const ESM::Pathgrid::Point& point : mData.mPoints)
         {
-            // TODO: see if we can change the integer representation to something more sensible
-            std::cout << "  Ambient Light Color: " << mData.mAmbi.mAmbient << std::endl;
-            std::cout << "  Sunlight Color: " << mData.mAmbi.mSunlight << std::endl;
-            std::cout << "  Fog Color: " << mData.mAmbi.mFog << std::endl;
-            std::cout << "  Fog Density: " << mData.mAmbi.mFogDensity << std::endl;
+            std::cout << "  Point[" << i << "]:" << std::endl;
+            std::cout << "    Coordinates: (" << point.mX << "," << point.mY << "," << point.mZ << ")" << std::endl;
+            std::cout << "    Auto-Generated: " << (int)point.mAutogenerated << std::endl;
+            std::cout << "    Connections: " << (int)point.mConnectionNum << std::endl;
+            std::cout << "    Unknown: " << point.mUnknown << std::endl;
+            i++;
         }
-        else
+
+        i = 0;
+        for (const ESM::Pathgrid::Edge& edge : mData.mEdges)
         {
-            std::cout << "  No Ambient Information" << std::endl;
+            std::cout << "  Edge[" << i << "]: " << edge.mV0 << " -> " << edge.mV1 << std::endl;
+            if (edge.mV0 >= mData.mData.mS2 || edge.mV1 >= mData.mData.mS2)
+                std::cout << "  BAD POINT IN EDGE!" << std::endl;
+            i++;
         }
-        std::cout << "  Water Level: " << mData.mWater << std::endl;
-    }
-    else
-        std::cout << "  Map Color: " << Misc::StringUtils::format("0x%08X", mData.mMapColor) << std::endl;
-    std::cout << "  Water Level Int: " << mData.mWaterInt << std::endl;
-    std::cout << "  RefId counter: " << mData.mRefNumCounter << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-
-}
-
-template<>
-void Record<ESM::Class>::print()
-{
-    std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Description: " << mData.mDescription << std::endl;
-    std::cout << "  Playable: " << mData.mData.mIsPlayable << std::endl;
-    std::cout << "  AutoCalc: " << mData.mData.mCalc << std::endl;
-    std::cout << "  Attribute1: " << attributeLabel(mData.mData.mAttribute[0])
-              << " (" << mData.mData.mAttribute[0] << ")" << std::endl;
-    std::cout << "  Attribute2: " << attributeLabel(mData.mData.mAttribute[1])
-              << " (" << mData.mData.mAttribute[1] << ")" << std::endl;
-    std::cout << "  Specialization: " << specializationLabel(mData.mData.mSpecialization)
-              << " (" << mData.mData.mSpecialization << ")" << std::endl;
-    for (int i = 0; i != 5; i++)
-        std::cout << "  Minor Skill: " << skillLabel(mData.mData.mSkills[i][0])
-                  << " (" << mData.mData.mSkills[i][0] << ")" << std::endl;
-    for (int i = 0; i != 5; i++)
-        std::cout << "  Major Skill: " << skillLabel(mData.mData.mSkills[i][1])
-                  << " (" << mData.mData.mSkills[i][1] << ")" << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
 
-template<>
-void Record<ESM::Clothing>::print()
-{
-    std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Model: " << mData.mModel << std::endl;
-    std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (!mData.mScript.empty())
-        std::cout << "  Script: " << mData.mScript << std::endl;
-    if (!mData.mEnchant.empty())
-        std::cout << "  Enchantment: " << mData.mEnchant << std::endl;
-    std::cout << "  Type: " << clothingTypeLabel(mData.mData.mType)
-              << " (" << mData.mData.mType << ")" << std::endl;
-    std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
-    std::cout << "  Value: " << mData.mData.mValue << std::endl;
-    std::cout << "  Enchantment Points: " << mData.mData.mEnchant << std::endl;
-    for (const ESM::PartReference &part : mData.mParts.mParts)
-    {
-        std::cout << "  Body Part: " << bodyPartLabel(part.mPart)
-                  << " (" << (int)(part.mPart) << ")" << std::endl;
-        std::cout << "    Male Name: " << part.mMale << std::endl;
-        if (!part.mFemale.empty())
-            std::cout << "    Female Name: " << part.mFemale << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
 
-template<>
-void Record<ESM::Container>::print()
-{
-    std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Model: " << mData.mModel << std::endl;
-    if (!mData.mScript.empty())
-        std::cout << "  Script: " << mData.mScript << std::endl;
-    std::cout << "  Flags: " << containerFlags(mData.mFlags) << std::endl;
-    std::cout << "  Weight: " << mData.mWeight << std::endl;
-    for (const ESM::ContItem &item : mData.mInventory.mList)
-        std::cout << "  Inventory: Count: " << Misc::StringUtils::format("%4d", item.mCount)
-                  << " Item: " << item.mItem << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
+    template <>
+    void Record<ESM::Race>::print()
+    {
+        static const char* sAttributeNames[8]
+            = { "Strength", "Intelligence", "Willpower", "Agility", "Speed", "Endurance", "Personality", "Luck" };
 
-template<>
-void Record<ESM::Creature>::print()
-{
-    std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Model: " << mData.mModel << std::endl;
-    std::cout << "  Script: " << mData.mScript << std::endl;
-    std::cout << "  Flags: " << creatureFlags((int)mData.mFlags) << std::endl;
-    std::cout << "  Blood Type: " << mData.mBloodType+1 << std::endl;
-    std::cout << "  Original: " << mData.mOriginal << std::endl;
-    std::cout << "  Scale: " << mData.mScale << std::endl;
-
-    std::cout << "  Type: " << creatureTypeLabel(mData.mData.mType)
-              << " (" << mData.mData.mType << ")" << std::endl;
-    std::cout << "  Level: " << mData.mData.mLevel << std::endl;
-
-    std::cout << "  Attributes:" << std::endl;
-    std::cout << "    Strength: " << mData.mData.mStrength << std::endl;
-    std::cout << "    Intelligence: " << mData.mData.mIntelligence << std::endl;
-    std::cout << "    Willpower: " << mData.mData.mWillpower << std::endl;
-    std::cout << "    Agility: " << mData.mData.mAgility << std::endl;
-    std::cout << "    Speed: " << mData.mData.mSpeed << std::endl;
-    std::cout << "    Endurance: " << mData.mData.mEndurance << std::endl;
-    std::cout << "    Personality: " << mData.mData.mPersonality << std::endl;
-    std::cout << "    Luck: " << mData.mData.mLuck << std::endl;
-
-    std::cout << "  Health: " << mData.mData.mHealth << std::endl;
-    std::cout << "  Magicka: " << mData.mData.mMana << std::endl;
-    std::cout << "  Fatigue: " << mData.mData.mFatigue << std::endl;
-    std::cout << "  Soul: " << mData.mData.mSoul << std::endl;
-    std::cout << "  Combat: " << mData.mData.mCombat << std::endl;
-    std::cout << "  Magic: " << mData.mData.mMagic << std::endl;
-    std::cout << "  Stealth: " << mData.mData.mStealth << std::endl;
-    std::cout << "  Attack1: " << mData.mData.mAttack[0]
-              << "-" <<  mData.mData.mAttack[1] << std::endl;
-    std::cout << "  Attack2: " << mData.mData.mAttack[2]
-              << "-" <<  mData.mData.mAttack[3] << std::endl;
-    std::cout << "  Attack3: " << mData.mData.mAttack[4]
-              << "-" <<  mData.mData.mAttack[5] << std::endl;
-    std::cout << "  Gold: " << mData.mData.mGold << std::endl;
-
-    for (const ESM::ContItem &item : mData.mInventory.mList)
-        std::cout << "  Inventory: Count: " << Misc::StringUtils::format("%4d", item.mCount)
-                  << " Item: " << item.mItem << std::endl;
-
-    for (const std::string &spell : mData.mSpells.mList)
-        std::cout << "  Spell: " << spell << std::endl;
-
-    printTransport(mData.getTransport());
-
-    std::cout << "  Artificial Intelligence: " << std::endl;
-    std::cout << "    AI Hello:" << (int)mData.mAiData.mHello << std::endl;
-    std::cout << "    AI Fight:" << (int)mData.mAiData.mFight << std::endl;
-    std::cout << "    AI Flee:" << (int)mData.mAiData.mFlee << std::endl;
-    std::cout << "    AI Alarm:" << (int)mData.mAiData.mAlarm << std::endl;
-    std::cout << "    AI U1:" << (int)mData.mAiData.mU1 << std::endl;
-    std::cout << "    AI U2:" << (int)mData.mAiData.mU2 << std::endl;
-    std::cout << "    AI U3:" << (int)mData.mAiData.mU3 << std::endl;
-    std::cout << "    AI Services:" << Misc::StringUtils::format("0x%08X", mData.mAiData.mServices) << std::endl;
-
-    for (const ESM::AIPackage &package : mData.mAiPackage.mList)
-        printAIPackage(package);
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
+        std::cout << "  Name: " << mData.mName << std::endl;
+        std::cout << "  Description: " << mData.mDescription << std::endl;
+        std::cout << "  Flags: " << raceFlags(mData.mData.mFlags) << std::endl;
 
-template<>
-void Record<ESM::Dialogue>::print()
-{
-    std::cout << "  Type: " << dialogTypeLabel(mData.mType)
-              << " (" << (int)mData.mType << ")" << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-    // Sadly, there are no DialInfos, because the loader dumps as it
-    // loads, rather than loading and then dumping. :-( Anyone mind if
-    // I change this?
-    for (const ESM::DialInfo &info : mData.mInfo)
-        std::cout << "INFO!" << info.mId << std::endl;
-}
+        for (int i = 0; i < 2; ++i)
+        {
+            bool male = i == 0;
 
-template<>
-void Record<ESM::Door>::print()
-{
-    std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Model: " << mData.mModel << std::endl;
-    std::cout << "  Script: " << mData.mScript << std::endl;
-    std::cout << "  OpenSound: " << mData.mOpenSound << std::endl;
-    std::cout << "  CloseSound: " << mData.mCloseSound << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
+            std::cout << (male ? "  Male:" : "  Female:") << std::endl;
 
-template<>
-void Record<ESM::Enchantment>::print()
-{
-    std::cout << "  Type: " << enchantTypeLabel(mData.mData.mType)
-              << " (" << mData.mData.mType << ")" << std::endl;
-    std::cout << "  Cost: " << mData.mData.mCost << std::endl;
-    std::cout << "  Charge: " << mData.mData.mCharge << std::endl;
-    std::cout << "  Flags: " << enchantmentFlags(mData.mData.mFlags) << std::endl;
-    printEffectList(mData.mEffects);
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
+            for (int j = 0; j < 8; ++j)
+                std::cout << "    " << sAttributeNames[j] << ": " << mData.mData.mAttributeValues[j].getValue(male)
+                          << std::endl;
 
-template<>
-void Record<ESM::Faction>::print()
-{
-    std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Hidden: " << mData.mData.mIsHidden << std::endl;
-    std::cout << "  Attribute1: " << attributeLabel(mData.mData.mAttribute[0])
-              << " (" << mData.mData.mAttribute[0] << ")" << std::endl;
-    std::cout << "  Attribute2: " << attributeLabel(mData.mData.mAttribute[1])
-              << " (" << mData.mData.mAttribute[1] << ")" << std::endl;
-    for (int skill : mData.mData.mSkills)
-        if (skill != -1)
-            std::cout << "  Skill: " << skillLabel(skill) << " (" << skill << ")" << std::endl;
-    for (int i = 0; i != 10; i++)
-        if (!mData.mRanks[i].empty())
-        {
-            std::cout << "  Rank: " << mData.mRanks[i] << std::endl;
-            std::cout << "    Attribute1 Requirement: "
-                      << mData.mData.mRankData[i].mAttribute1 << std::endl;
-            std::cout << "    Attribute2 Requirement: "
-                      << mData.mData.mRankData[i].mAttribute2 << std::endl;
-            std::cout << "    One Skill at Level: "
-                      << mData.mData.mRankData[i].mPrimarySkill << std::endl;
-            std::cout << "    Two Skills at Level: "
-                      << mData.mData.mRankData[i].mFavouredSkill << std::endl;
-            std::cout << "    Faction Reaction: "
-                      << mData.mData.mRankData[i].mFactReaction << std::endl;
+            std::cout << "    Height: " << mData.mData.mHeight.getValue(male) << std::endl;
+            std::cout << "    Weight: " << mData.mData.mWeight.getValue(male) << std::endl;
         }
-    for (const auto &reaction : mData.mReactions)
-        std::cout << "  Reaction: " << reaction.second << " = " << reaction.first << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
-
-template<>
-void Record<ESM::Global>::print()
-{
-    std::cout << "  " << mData.mValue << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
 
-template<>
-void Record<ESM::GameSetting>::print()
-{
-    std::cout << "  " << mData.mValue << std::endl;
-}
+        for (int i = 0; i != 7; i++)
+            // Not all races have 7 skills.
+            if (mData.mData.mBonus[i].mSkill != -1)
+                std::cout << "  Skill: " << skillLabel(mData.mData.mBonus[i].mSkill) << " ("
+                          << mData.mData.mBonus[i].mSkill << ") = " << mData.mData.mBonus[i].mBonus << std::endl;
 
-template<>
-void Record<ESM::DialInfo>::print()
-{
-    std::cout << "  Id: " << mData.mId << std::endl;
-    if (!mData.mPrev.empty())
-        std::cout << "  Previous ID: " << mData.mPrev << std::endl;
-    if (!mData.mNext.empty())
-        std::cout << "  Next ID: " << mData.mNext << std::endl;
-    std::cout << "  Text: " << mData.mResponse << std::endl;
-    if (!mData.mActor.empty())
-        std::cout << "  Actor: " << mData.mActor << std::endl;
-    if (!mData.mRace.empty())
-        std::cout << "  Race: " << mData.mRace << std::endl;
-    if (!mData.mClass.empty())
-        std::cout << "  Class: " << mData.mClass << std::endl;
-    std::cout << "  Factionless: " << mData.mFactionLess << std::endl;
-    if (!mData.mFaction.empty())
-        std::cout << "  NPC Faction: " << mData.mFaction << std::endl;
-    if (mData.mData.mRank != -1)
-        std::cout << "  NPC Rank: " << (int)mData.mData.mRank << std::endl;
-    if (!mData.mPcFaction.empty())
-        std::cout << "  PC Faction: " << mData.mPcFaction << std::endl;
-    // CHANGE? non-standard capitalization mPCrank -> mPCRank (mPcRank?)
-    if (mData.mData.mPCrank != -1)
-        std::cout << "  PC Rank: " << (int)mData.mData.mPCrank << std::endl;
-    if (!mData.mCell.empty())
-        std::cout << "  Cell: " << mData.mCell << std::endl;
-    if (mData.mData.mDisposition > 0)
-        std::cout << "  Disposition/Journal index: " << mData.mData.mDisposition << std::endl;
-    if (mData.mData.mGender != ESM::DialInfo::NA)
-        std::cout << "  Gender: " << mData.mData.mGender << std::endl;
-    if (!mData.mSound.empty())
-        std::cout << "  Sound File: " << mData.mSound << std::endl;
+        for (const std::string& power : mData.mPowers.mList)
+            std::cout << "  Power: " << power << std::endl;
 
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
+    }
 
-    std::cout << "  Quest Status: " << questStatusLabel(mData.mQuestStatus)
-              << " (" << mData.mQuestStatus << ")" << std::endl;
-    std::cout << "  Unknown1: " << mData.mData.mUnknown1 << std::endl;
-    std::cout << "  Unknown2: " << (int)mData.mData.mUnknown2 << std::endl;
+    template <>
+    void Record<ESM::Region>::print()
+    {
+        std::cout << "  Name: " << mData.mName << std::endl;
 
-    for (const ESM::DialInfo::SelectStruct &rule : mData.mSelects)
-        std::cout << "  Select Rule: " << ruleString(rule) << std::endl;
+        std::cout << "  Weather:" << std::endl;
+        std::cout << "    Clear: " << (int)mData.mData.mClear << std::endl;
+        std::cout << "    Cloudy: " << (int)mData.mData.mCloudy << std::endl;
+        std::cout << "    Foggy: " << (int)mData.mData.mFoggy << std::endl;
+        std::cout << "    Overcast: " << (int)mData.mData.mOvercast << std::endl;
+        std::cout << "    Rain: " << (int)mData.mData.mOvercast << std::endl;
+        std::cout << "    Thunder: " << (int)mData.mData.mThunder << std::endl;
+        std::cout << "    Ash: " << (int)mData.mData.mAsh << std::endl;
+        std::cout << "    Blight: " << (int)mData.mData.mBlight << std::endl;
+        std::cout << "    Snow: " << (int)mData.mData.mSnow << std::endl;
+        std::cout << "    Blizzard: " << (int)mData.mData.mBlizzard << std::endl;
+        std::cout << "  Map Color: " << mData.mMapColor << std::endl;
+        if (!mData.mSleepList.empty())
+            std::cout << "  Sleep List: " << mData.mSleepList << std::endl;
+        for (const ESM::Region::SoundRef& soundref : mData.mSoundList)
+            std::cout << "  Sound: " << (int)soundref.mChance << " = " << soundref.mSound << std::endl;
+    }
+
+    template <>
+    void Record<ESM::Script>::print()
+    {
+        std::cout << "  Name: " << mData.mId << std::endl;
+
+        std::cout << "  Num Shorts: " << mData.mData.mNumShorts << std::endl;
+        std::cout << "  Num Longs: " << mData.mData.mNumLongs << std::endl;
+        std::cout << "  Num Floats: " << mData.mData.mNumFloats << std::endl;
+        std::cout << "  Script Data Size: " << mData.mData.mScriptDataSize << std::endl;
+        std::cout << "  Table Size: " << mData.mData.mStringTableSize << std::endl;
+
+        for (const std::string& variable : mData.mVarNames)
+            std::cout << "  Variable: " << variable << std::endl;
+
+        std::cout << "  ByteCode: ";
+        for (const unsigned char& byte : mData.mScriptData)
+            std::cout << Misc::StringUtils::format("%02X", (int)(byte));
+        std::cout << std::endl;
 
-    if (!mData.mResultScript.empty())
-    {
         if (mPrintPlain)
         {
-            std::cout << "  Result Script:" << std::endl;
+            std::cout << "  Script:" << std::endl;
             std::cout << "START--------------------------------------" << std::endl;
-            std::cout << mData.mResultScript << std::endl;
+            std::cout << mData.mScriptText << std::endl;
             std::cout << "END----------------------------------------" << std::endl;
         }
         else
         {
-            std::cout << "  Result Script: [skipped]" << std::endl;
+            std::cout << "  Script: [skipped]" << std::endl;
         }
+
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
 
-template<>
-void Record<ESM::Ingredient>::print()
-{
-    std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Model: " << mData.mModel << std::endl;
-    std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (!mData.mScript.empty())
-        std::cout << "  Script: " << mData.mScript << std::endl;
-    std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
-    std::cout << "  Value: " << mData.mData.mValue << std::endl;
-    for (int i = 0; i !=4; i++)
+    template <>
+    void Record<ESM::Skill>::print()
     {
-        // A value of -1 means no effect
-        if (mData.mData.mEffectID[i] == -1) continue;
-        std::cout << "  Effect: " << magicEffectLabel(mData.mData.mEffectID[i])
-                  << " (" << mData.mData.mEffectID[i] << ")" << std::endl;
-        std::cout << "  Skill: " << skillLabel(mData.mData.mSkills[i])
-                  << " (" << mData.mData.mSkills[i] << ")" << std::endl;
-        std::cout << "  Attribute: " << attributeLabel(mData.mData.mAttributes[i])
-                  << " (" << mData.mData.mAttributes[i] << ")" << std::endl;
+        std::cout << "  ID: " << skillLabel(mData.mIndex) << " (" << mData.mIndex << ")" << std::endl;
+        std::cout << "  Description: " << mData.mDescription << std::endl;
+        std::cout << "  Governing Attribute: " << attributeLabel(mData.mData.mAttribute) << " ("
+                  << mData.mData.mAttribute << ")" << std::endl;
+        std::cout << "  Specialization: " << specializationLabel(mData.mData.mSpecialization) << " ("
+                  << mData.mData.mSpecialization << ")" << std::endl;
+        for (int i = 0; i != 4; i++)
+            std::cout << "  UseValue[" << i << "]:" << mData.mData.mUseValue[i] << std::endl;
     }
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
-
-template<>
-void Record<ESM::Land>::print()
-{
-    std::cout << "  Coordinates: (" << mData.mX << "," << mData.mY << ")" << std::endl;
-    std::cout << "  Flags: " << landFlags(mData.mFlags) << std::endl;
-    std::cout << "  DataTypes: " << mData.mDataTypes << std::endl;
 
-    if (const ESM::Land::LandData *data = mData.getLandData (mData.mDataTypes))
+    template <>
+    void Record<ESM::SoundGenerator>::print()
     {
-        std::cout << "  Height Offset: " << data->mHeightOffset << std::endl;
-        // Lots of missing members.
-        std::cout << "  Unknown1: " << data->mUnk1 << std::endl;
-        std::cout << "  Unknown2: " << data->mUnk2 << std::endl;
+        if (!mData.mCreature.empty())
+            std::cout << "  Creature: " << mData.mCreature << std::endl;
+        std::cout << "  Sound: " << mData.mSound << std::endl;
+        std::cout << "  Type: " << soundTypeLabel(mData.mType) << " (" << mData.mType << ")" << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    mData.unloadData();
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
-
-template<>
-void Record<ESM::CreatureLevList>::print()
-{
-    std::cout << "  Chance for None: " << (int)mData.mChanceNone << std::endl;
-    std::cout << "  Flags: " << creatureListFlags(mData.mFlags) << std::endl;
-    std::cout << "  Number of items: " << mData.mList.size() << std::endl;
-    for (const ESM::LevelledListBase::LevelItem &item : mData.mList)
-        std::cout << "  Creature: Level: " << item.mLevel
-                  << " Creature: " << item.mId << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
 
-template<>
-void Record<ESM::ItemLevList>::print()
-{
-    std::cout << "  Chance for None: " << (int)mData.mChanceNone << std::endl;
-    std::cout << "  Flags: " << itemListFlags(mData.mFlags) << std::endl;
-    std::cout << "  Number of items: " << mData.mList.size() << std::endl;
-    for (const ESM::LevelledListBase::LevelItem &item : mData.mList)
-        std::cout << "  Inventory: Level: " << item.mLevel
-                  << " Item: " << item.mId << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
+    template <>
+    void Record<ESM::Sound>::print()
+    {
+        std::cout << "  Sound: " << mData.mSound << std::endl;
+        std::cout << "  Volume: " << (int)mData.mData.mVolume << std::endl;
+        if (mData.mData.mMinRange != 0 && mData.mData.mMaxRange != 0)
+            std::cout << "  Range: " << (int)mData.mData.mMinRange << " - " << (int)mData.mData.mMaxRange << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
+    }
 
-template<>
-void Record<ESM::Light>::print()
-{
-    if (!mData.mName.empty())
+    template <>
+    void Record<ESM::Spell>::print()
+    {
         std::cout << "  Name: " << mData.mName << std::endl;
-    if (!mData.mModel.empty())
-        std::cout << "  Model: " << mData.mModel << std::endl;
-    if (!mData.mIcon.empty())
-        std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (!mData.mScript.empty())
-        std::cout << "  Script: " << mData.mScript << std::endl;
-    std::cout << "  Flags: " << lightFlags(mData.mData.mFlags) << std::endl;
-    std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
-    std::cout << "  Value: " << mData.mData.mValue << std::endl;
-    std::cout << "  Sound: " << mData.mSound << std::endl;
-    std::cout << "  Duration: " << mData.mData.mTime << std::endl;
-    std::cout << "  Radius: " << mData.mData.mRadius << std::endl;
-    std::cout << "  Color: " << mData.mData.mColor << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
-
-template<>
-void Record<ESM::Lockpick>::print()
-{
-    std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Model: " << mData.mModel << std::endl;
-    std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (!mData.mScript.empty())
-        std::cout << "  Script: " << mData.mScript << std::endl;
-    std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
-    std::cout << "  Value: " << mData.mData.mValue << std::endl;
-    std::cout << "  Quality: " << mData.mData.mQuality << std::endl;
-    std::cout << "  Uses: " << mData.mData.mUses << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
-
-template<>
-void Record<ESM::Probe>::print()
-{
-    std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Model: " << mData.mModel << std::endl;
-    std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (!mData.mScript.empty())
-        std::cout << "  Script: " << mData.mScript << std::endl;
-    std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
-    std::cout << "  Value: " << mData.mData.mValue << std::endl;
-    std::cout << "  Quality: " << mData.mData.mQuality << std::endl;
-    std::cout << "  Uses: " << mData.mData.mUses << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
-
-template<>
-void Record<ESM::Repair>::print()
-{
-    std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Model: " << mData.mModel << std::endl;
-    std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (!mData.mScript.empty())
-        std::cout << "  Script: " << mData.mScript << std::endl;
-    std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
-    std::cout << "  Value: " << mData.mData.mValue << std::endl;
-    std::cout << "  Quality: " << mData.mData.mQuality << std::endl;
-    std::cout << "  Uses: " << mData.mData.mUses << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
-
-template<>
-void Record<ESM::LandTexture>::print()
-{
-    std::cout << "  Id: " << mData.mId << std::endl;
-    std::cout << "  Index: " << mData.mIndex << std::endl;
-    std::cout << "  Texture: " << mData.mTexture << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
-
-template<>
-void Record<ESM::MagicEffect>::print()
-{
-    std::cout << "  Index: " << magicEffectLabel(mData.mIndex)
-              << " (" << mData.mIndex << ")" << std::endl;
-    std::cout << "  Description: " << mData.mDescription << std::endl;
-    std::cout << "  Icon: " << mData.mIcon << std::endl;
-    std::cout << "  Flags: " << magicEffectFlags(mData.mData.mFlags) << std::endl;
-    std::cout << "  Particle Texture: " << mData.mParticle << std::endl;
-    if (!mData.mCasting.empty())
-        std::cout << "  Casting Static: " << mData.mCasting << std::endl;
-    if (!mData.mCastSound.empty())
-        std::cout << "  Casting Sound: " << mData.mCastSound << std::endl;
-    if (!mData.mBolt.empty())
-        std::cout << "  Bolt Static: " << mData.mBolt << std::endl;
-    if (!mData.mBoltSound.empty())
-        std::cout << "  Bolt Sound: " << mData.mBoltSound << std::endl;
-    if (!mData.mHit.empty())
-        std::cout << "  Hit Static: " << mData.mHit << std::endl;
-    if (!mData.mHitSound.empty())
-        std::cout << "  Hit Sound: " << mData.mHitSound << std::endl;
-    if (!mData.mArea.empty())
-        std::cout << "  Area Static: " << mData.mArea << std::endl;
-    if (!mData.mAreaSound.empty())
-        std::cout << "  Area Sound: " << mData.mAreaSound << std::endl;
-    std::cout << "  School: " << schoolLabel(mData.mData.mSchool)
-              << " (" << mData.mData.mSchool << ")" << std::endl;
-    std::cout << "  Base Cost: " << mData.mData.mBaseCost << std::endl;
-    std::cout << "  Unknown 1: " << mData.mData.mUnknown1 << std::endl;
-    std::cout << "  Speed: " << mData.mData.mSpeed << std::endl;
-    std::cout << "  Unknown 2: " << mData.mData.mUnknown2 << std::endl;
-    std::cout << "  RGB Color: " << "("
-              << mData.mData.mRed << ","
-              << mData.mData.mGreen << ","
-              << mData.mData.mBlue << ")" << std::endl;
-}
-
-template<>
-void Record<ESM::Miscellaneous>::print()
-{
-    std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Model: " << mData.mModel << std::endl;
-    std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (!mData.mScript.empty())
-        std::cout << "  Script: " << mData.mScript << std::endl;
-    std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
-    std::cout << "  Value: " << mData.mData.mValue << std::endl;
-    std::cout << "  Is Key: " << mData.mData.mIsKey << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
-
-template<>
-void Record<ESM::NPC>::print()
-{
-    std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Animation: " << mData.mModel << std::endl;
-    std::cout << "  Hair Model: " << mData.mHair << std::endl;
-    std::cout << "  Head Model: " << mData.mHead << std::endl;
-    std::cout << "  Race: " << mData.mRace << std::endl;
-    std::cout << "  Class: " << mData.mClass << std::endl;
-    if (!mData.mScript.empty())
-        std::cout << "  Script: " << mData.mScript << std::endl;
-    if (!mData.mFaction.empty())
-        std::cout << "  Faction: " << mData.mFaction << std::endl;
-    std::cout << "  Flags: " << npcFlags((int)mData.mFlags) << std::endl;
-    if (mData.mBloodType != 0)
-        std::cout << "  Blood Type: " << mData.mBloodType+1 << std::endl;
+        std::cout << "  Type: " << spellTypeLabel(mData.mData.mType) << " (" << mData.mData.mType << ")" << std::endl;
+        std::cout << "  Flags: " << spellFlags(mData.mData.mFlags) << std::endl;
+        std::cout << "  Cost: " << mData.mData.mCost << std::endl;
+        printEffectList(mData.mEffects);
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
+    }
 
-    if (mData.mNpdtType == ESM::NPC::NPC_WITH_AUTOCALCULATED_STATS)
+    template <>
+    void Record<ESM::StartScript>::print()
     {
-        std::cout << "  Level: " << mData.mNpdt.mLevel << std::endl;
-        std::cout << "  Reputation: " << (int)mData.mNpdt.mReputation << std::endl;
-        std::cout << "  Disposition: " << (int)mData.mNpdt.mDisposition << std::endl;
-        std::cout << "  Rank: " << (int)mData.mNpdt.mRank << std::endl;
-        std::cout << "  Gold: " << mData.mNpdt.mGold << std::endl;
+        std::cout << "  Start Script: " << mData.mId << std::endl;
+        std::cout << "  Start Data: " << mData.mData << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
-    else {
-        std::cout << "  Level: " << mData.mNpdt.mLevel << std::endl;
-        std::cout << "  Reputation: " << (int)mData.mNpdt.mReputation << std::endl;
-        std::cout << "  Disposition: " << (int)mData.mNpdt.mDisposition << std::endl;
-        std::cout << "  Rank: " << (int)mData.mNpdt.mRank << std::endl;
 
-        std::cout << "  Attributes:" << std::endl;
-        std::cout << "    Strength: " << (int)mData.mNpdt.mStrength << std::endl;
-        std::cout << "    Intelligence: " << (int)mData.mNpdt.mIntelligence << std::endl;
-        std::cout << "    Willpower: " << (int)mData.mNpdt.mWillpower << std::endl;
-        std::cout << "    Agility: " << (int)mData.mNpdt.mAgility << std::endl;
-        std::cout << "    Speed: " << (int)mData.mNpdt.mSpeed << std::endl;
-        std::cout << "    Endurance: " << (int)mData.mNpdt.mEndurance << std::endl;
-        std::cout << "    Personality: " << (int)mData.mNpdt.mPersonality << std::endl;
-        std::cout << "    Luck: " << (int)mData.mNpdt.mLuck << std::endl;
-
-        std::cout << "  Skills:" << std::endl;
-        for (int i = 0; i != ESM::Skill::Length; i++)
-            std::cout << "    " << skillLabel(i) << ": "
-                      << (int)(mData.mNpdt.mSkills[i]) << std::endl;
-
-        std::cout << "  Health: " << mData.mNpdt.mHealth << std::endl;
-        std::cout << "  Magicka: " << mData.mNpdt.mMana << std::endl;
-        std::cout << "  Fatigue: " << mData.mNpdt.mFatigue << std::endl;
-        std::cout << "  Gold: " << mData.mNpdt.mGold << std::endl;
+    template <>
+    void Record<ESM::Static>::print()
+    {
+        std::cout << "  Model: " << mData.mModel << std::endl;
     }
 
-    for (const ESM::ContItem &item : mData.mInventory.mList)
-        std::cout << "  Inventory: Count: " << Misc::StringUtils::format("%4d", item.mCount)
-                  << " Item: " << item.mItem << std::endl;
-
-    for (const std::string &spell : mData.mSpells.mList)
-        std::cout << "  Spell: " << spell << std::endl;
-
-    printTransport(mData.getTransport());
-
-    std::cout << "  Artificial Intelligence: " << std::endl;
-    std::cout << "    AI Hello:" << (int)mData.mAiData.mHello << std::endl;
-    std::cout << "    AI Fight:" << (int)mData.mAiData.mFight << std::endl;
-    std::cout << "    AI Flee:" << (int)mData.mAiData.mFlee << std::endl;
-    std::cout << "    AI Alarm:" << (int)mData.mAiData.mAlarm << std::endl;
-    std::cout << "    AI U1:" << (int)mData.mAiData.mU1 << std::endl;
-    std::cout << "    AI U2:" << (int)mData.mAiData.mU2 << std::endl;
-    std::cout << "    AI U3:" << (int)mData.mAiData.mU3 << std::endl;
-    std::cout << "    AI Services:" << Misc::StringUtils::format("0x%08X", mData.mAiData.mServices) << std::endl;
-
-    for (const ESM::AIPackage &package : mData.mAiPackage.mList)
-        printAIPackage(package);
-
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
-
-template<>
-void Record<ESM::Pathgrid>::print()
-{
-    std::cout << "  Cell: " << mData.mCell << std::endl;
-    std::cout << "  Coordinates: (" << mData.mData.mX << "," << mData.mData.mY << ")" << std::endl;
-    std::cout << "  Unknown S1: " << mData.mData.mS1 << std::endl;
-    if ((unsigned int)mData.mData.mS2 != mData.mPoints.size())
-        std::cout << "  Reported Point Count: " << mData.mData.mS2 << std::endl;
-    std::cout << "  Point Count: " << mData.mPoints.size() << std::endl;
-    std::cout << "  Edge Count: " << mData.mEdges.size() << std::endl;
-
-    int i = 0;
-    for (const ESM::Pathgrid::Point &point : mData.mPoints)
+    template <>
+    void Record<ESM::Weapon>::print()
     {
-        std::cout << "  Point[" << i << "]:" << std::endl;
-        std::cout << "    Coordinates: (" << point.mX << ","
-             << point.mY << "," << point.mZ << ")" << std::endl;
-        std::cout << "    Auto-Generated: " << (int)point.mAutogenerated << std::endl;
-        std::cout << "    Connections: " << (int)point.mConnectionNum << std::endl;
-        std::cout << "    Unknown: " << point.mUnknown << std::endl;
-        i++;
+        // No names on VFX bolts
+        if (!mData.mName.empty())
+            std::cout << "  Name: " << mData.mName << std::endl;
+        std::cout << "  Model: " << mData.mModel << std::endl;
+        // No icons on VFX bolts or magic bolts
+        if (!mData.mIcon.empty())
+            std::cout << "  Icon: " << mData.mIcon << std::endl;
+        if (!mData.mScript.empty())
+            std::cout << "  Script: " << mData.mScript << std::endl;
+        if (!mData.mEnchant.empty())
+            std::cout << "  Enchantment: " << mData.mEnchant << std::endl;
+        std::cout << "  Type: " << weaponTypeLabel(mData.mData.mType) << " (" << mData.mData.mType << ")" << std::endl;
+        std::cout << "  Flags: " << weaponFlags(mData.mData.mFlags) << std::endl;
+        std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
+        std::cout << "  Value: " << mData.mData.mValue << std::endl;
+        std::cout << "  Health: " << mData.mData.mHealth << std::endl;
+        std::cout << "  Speed: " << mData.mData.mSpeed << std::endl;
+        std::cout << "  Reach: " << mData.mData.mReach << std::endl;
+        std::cout << "  Enchantment Points: " << mData.mData.mEnchant << std::endl;
+        if (mData.mData.mChop[0] != 0 && mData.mData.mChop[1] != 0)
+            std::cout << "  Chop: " << (int)mData.mData.mChop[0] << "-" << (int)mData.mData.mChop[1] << std::endl;
+        if (mData.mData.mSlash[0] != 0 && mData.mData.mSlash[1] != 0)
+            std::cout << "  Slash: " << (int)mData.mData.mSlash[0] << "-" << (int)mData.mData.mSlash[1] << std::endl;
+        if (mData.mData.mThrust[0] != 0 && mData.mData.mThrust[1] != 0)
+            std::cout << "  Thrust: " << (int)mData.mData.mThrust[0] << "-" << (int)mData.mData.mThrust[1] << std::endl;
+        std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
 
-    i = 0;
-    for (const ESM::Pathgrid::Edge &edge : mData.mEdges)
+    template <>
+    std::string Record<ESM::Cell>::getId() const
     {
-        std::cout << "  Edge[" << i << "]: " << edge.mV0 << " -> " << edge.mV1 << std::endl;
-        if (edge.mV0 >= mData.mData.mS2 || edge.mV1 >= mData.mData.mS2)
-            std::cout << "  BAD POINT IN EDGE!" << std::endl;
-        i++;
+        return mData.mName;
     }
 
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
-
-template<>
-void Record<ESM::Race>::print()
-{
-    static const char *sAttributeNames[8] =
+    template <>
+    std::string Record<ESM::Land>::getId() const
     {
-        "Strength", "Intelligence", "Willpower", "Agility",
-        "Speed", "Endurance", "Personality", "Luck"
-    };
-
-    std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Description: " << mData.mDescription << std::endl;
-    std::cout << "  Flags: " << raceFlags(mData.mData.mFlags) << std::endl;
+        return std::string(); // No ID for Land record
+    }
 
-    for (int i=0; i<2; ++i)
+    template <>
+    std::string Record<ESM::MagicEffect>::getId() const
     {
-        bool male = i==0;
-
-        std::cout << (male ? "  Male:" : "  Female:") << std::endl;
-
-        for (int j=0; j<8; ++j)
-            std::cout << "    " << sAttributeNames[j] << ": "
-                << mData.mData.mAttributeValues[j].getValue (male) << std::endl;
-
-        std::cout << "    Height: " << mData.mData.mHeight.getValue (male) << std::endl;
-        std::cout << "    Weight: " << mData.mData.mWeight.getValue (male) << std::endl;
+        return std::string(); // No ID for MagicEffect record
     }
 
-    for (int i = 0; i != 7; i++)
-        // Not all races have 7 skills.
-        if (mData.mData.mBonus[i].mSkill != -1)
-            std::cout << "  Skill: "
-                      << skillLabel(mData.mData.mBonus[i].mSkill)
-                      << " (" << mData.mData.mBonus[i].mSkill << ") = "
-                      << mData.mData.mBonus[i].mBonus << std::endl;
-
-    for (const std::string &power : mData.mPowers.mList)
-        std::cout << "  Power: " << power << std::endl;
-
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
-
-template<>
-void Record<ESM::Region>::print()
-{
-    std::cout << "  Name: " << mData.mName << std::endl;
-
-    std::cout << "  Weather:" << std::endl;
-    std::cout << "    Clear: " << (int)mData.mData.mClear << std::endl;
-    std::cout << "    Cloudy: " << (int)mData.mData.mCloudy << std::endl;
-    std::cout << "    Foggy: " << (int)mData.mData.mFoggy << std::endl;
-    std::cout << "    Overcast: " << (int)mData.mData.mOvercast << std::endl;
-    std::cout << "    Rain: " << (int)mData.mData.mOvercast << std::endl;
-    std::cout << "    Thunder: " << (int)mData.mData.mThunder << std::endl;
-    std::cout << "    Ash: " << (int)mData.mData.mAsh << std::endl;
-    std::cout << "    Blight: " << (int)mData.mData.mBlight << std::endl;
-    std::cout << "    Snow: " << (int)mData.mData.mSnow << std::endl;
-    std::cout << "    Blizzard: " << (int)mData.mData.mBlizzard << std::endl;
-    std::cout << "  Map Color: " << mData.mMapColor << std::endl;
-    if (!mData.mSleepList.empty())
-        std::cout << "  Sleep List: " << mData.mSleepList << std::endl;
-    for (const ESM::Region::SoundRef &soundref : mData.mSoundList)
-        std::cout << "  Sound: " << (int)soundref.mChance << " = " << soundref.mSound << std::endl;
-}
-
-template<>
-void Record<ESM::Script>::print()
-{
-    std::cout << "  Name: " << mData.mId << std::endl;
-
-    std::cout << "  Num Shorts: " << mData.mData.mNumShorts << std::endl;
-    std::cout << "  Num Longs: " << mData.mData.mNumLongs << std::endl;
-    std::cout << "  Num Floats: " << mData.mData.mNumFloats << std::endl;
-    std::cout << "  Script Data Size: " << mData.mData.mScriptDataSize << std::endl;
-    std::cout << "  Table Size: " << mData.mData.mStringTableSize << std::endl;
-
-    for (const std::string &variable : mData.mVarNames)
-        std::cout << "  Variable: " << variable << std::endl;
-
-    std::cout << "  ByteCode: ";
-    for (const unsigned char &byte : mData.mScriptData)
-        std::cout << Misc::StringUtils::format("%02X", (int)(byte));
-    std::cout << std::endl;
-
-    if (mPrintPlain)
+    template <>
+    std::string Record<ESM::Pathgrid>::getId() const
     {
-        std::cout << "  Script:" << std::endl;
-        std::cout << "START--------------------------------------" << std::endl;
-        std::cout << mData.mScriptText << std::endl;
-        std::cout << "END----------------------------------------" << std::endl;
+        return std::string(); // No ID for Pathgrid record
     }
-    else
+
+    template <>
+    std::string Record<ESM::Skill>::getId() const
     {
-        std::cout << "  Script: [skipped]" << std::endl;
+        return std::string(); // No ID for Skill record
     }
 
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
-
-template<>
-void Record<ESM::Skill>::print()
-{
-    std::cout << "  ID: " << skillLabel(mData.mIndex)
-              << " (" << mData.mIndex << ")" << std::endl;
-    std::cout << "  Description: " << mData.mDescription << std::endl;
-    std::cout << "  Governing Attribute: " << attributeLabel(mData.mData.mAttribute)
-              << " (" << mData.mData.mAttribute << ")" << std::endl;
-    std::cout << "  Specialization: " << specializationLabel(mData.mData.mSpecialization)
-              << " (" << mData.mData.mSpecialization << ")" << std::endl;
-    for (int i = 0; i != 4; i++)
-        std::cout << "  UseValue[" << i << "]:" << mData.mData.mUseValue[i] << std::endl;
-}
-
-template<>
-void Record<ESM::SoundGenerator>::print()
-{
-    if (!mData.mCreature.empty())
-        std::cout << "  Creature: " << mData.mCreature << std::endl;
-    std::cout << "  Sound: " << mData.mSound << std::endl;
-    std::cout << "  Type: " << soundTypeLabel(mData.mType)
-              << " (" << mData.mType << ")" << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
-
-template<>
-void Record<ESM::Sound>::print()
-{
-    std::cout << "  Sound: " << mData.mSound << std::endl;
-    std::cout << "  Volume: " << (int)mData.mData.mVolume << std::endl;
-    if (mData.mData.mMinRange != 0 && mData.mData.mMaxRange != 0)
-        std::cout << "  Range: " << (int)mData.mData.mMinRange << " - "
-                  << (int)mData.mData.mMaxRange << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
-
-template<>
-void Record<ESM::Spell>::print()
-{
-    std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Type: " << spellTypeLabel(mData.mData.mType)
-              << " (" << mData.mData.mType << ")" << std::endl;
-    std::cout << "  Flags: " << spellFlags(mData.mData.mFlags) << std::endl;
-    std::cout << "  Cost: " << mData.mData.mCost << std::endl;
-    printEffectList(mData.mEffects);
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
-
-template<>
-void Record<ESM::StartScript>::print()
-{
-    std::cout << "  Start Script: " << mData.mId << std::endl;
-    std::cout << "  Start Data: " << mData.mData << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
-
-template<>
-void Record<ESM::Static>::print()
-{
-    std::cout << "  Model: " << mData.mModel << std::endl;
-}
-
-template<>
-void Record<ESM::Weapon>::print()
-{
-    // No names on VFX bolts
-    if (!mData.mName.empty())
-        std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Model: " << mData.mModel << std::endl;
-    // No icons on VFX bolts or magic bolts
-    if (!mData.mIcon.empty())
-        std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (!mData.mScript.empty())
-        std::cout << "  Script: " << mData.mScript << std::endl;
-    if (!mData.mEnchant.empty())
-        std::cout << "  Enchantment: " << mData.mEnchant << std::endl;
-    std::cout << "  Type: " << weaponTypeLabel(mData.mData.mType)
-              << " (" << mData.mData.mType << ")" << std::endl;
-    std::cout << "  Flags: " << weaponFlags(mData.mData.mFlags) << std::endl;
-    std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
-    std::cout << "  Value: " << mData.mData.mValue << std::endl;
-    std::cout << "  Health: " << mData.mData.mHealth << std::endl;
-    std::cout << "  Speed: " << mData.mData.mSpeed << std::endl;
-    std::cout << "  Reach: " << mData.mData.mReach << std::endl;
-    std::cout << "  Enchantment Points: " << mData.mData.mEnchant << std::endl;
-    if (mData.mData.mChop[0] != 0 && mData.mData.mChop[1] != 0)
-        std::cout << "  Chop: " << (int)mData.mData.mChop[0] << "-"
-                  << (int)mData.mData.mChop[1] << std::endl;
-    if (mData.mData.mSlash[0] != 0 && mData.mData.mSlash[1] != 0)
-        std::cout << "  Slash: " << (int)mData.mData.mSlash[0] << "-"
-                  << (int)mData.mData.mSlash[1] << std::endl;
-    if (mData.mData.mThrust[0] != 0 && mData.mData.mThrust[1] != 0)
-        std::cout << "  Thrust: " << (int)mData.mData.mThrust[0] << "-"
-                  << (int)mData.mData.mThrust[1] << std::endl;
-    std::cout << "  Deleted: " << mIsDeleted << std::endl;
-}
-
-template<> 
-std::string Record<ESM::Cell>::getId() const
-{
-    return mData.mName;
-}
-
-template<> 
-std::string Record<ESM::Land>::getId() const
-{
-    return std::string(); // No ID for Land record
-}
-
-template<> 
-std::string Record<ESM::MagicEffect>::getId() const
-{
-    return std::string(); // No ID for MagicEffect record
-}
-
-template<> 
-std::string Record<ESM::Pathgrid>::getId() const
-{
-    return std::string(); // No ID for Pathgrid record
-}
-
-template<> 
-std::string Record<ESM::Skill>::getId() const
-{
-    return std::string(); // No ID for Skill record
-}
-
 } // end namespace
diff --git a/apps/esmtool/record.hpp b/apps/esmtool/record.hpp
index ef90dd1310..46987c44b2 100644
--- a/apps/esmtool/record.hpp
+++ b/apps/esmtool/record.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_ESMTOOL_RECORD_H
 #define OPENMW_ESMTOOL_RECORD_H
 
-#include <string>
 #include <memory>
+#include <string>
 
 #include <components/esm/records.hpp>
 
@@ -14,7 +14,8 @@ namespace ESM
 
 namespace EsmTool
 {
-    template <class T> class Record;
+    template <class T>
+    class Record;
 
     class RecordBase
     {
@@ -25,9 +26,9 @@ namespace EsmTool
         bool mPrintPlain;
 
     public:
-        RecordBase ()
-          : mFlags(0)
-          , mPrintPlain(false)
+        RecordBase()
+            : mFlags(0)
+            , mPrintPlain(false)
         {
         }
 
@@ -35,32 +36,25 @@ namespace EsmTool
 
         virtual std::string getId() const = 0;
 
-        uint32_t getFlags() const {
-            return mFlags;
-        }
+        uint32_t getFlags() const { return mFlags; }
 
-        void setFlags(uint32_t flags) {
-            mFlags = flags;
-        }
+        void setFlags(uint32_t flags) { mFlags = flags; }
 
-        ESM::NAME getType() const {
-            return mType;
-        }
+        ESM::NAME getType() const { return mType; }
 
-        void setPrintPlain(bool plain) {
-            mPrintPlain = plain;
-        }
+        void setPrintPlain(bool plain) { mPrintPlain = plain; }
 
-        virtual void load(ESM::ESMReader &esm) = 0;
-        virtual void save(ESM::ESMWriter &esm) = 0;
+        virtual void load(ESM::ESMReader& esm) = 0;
+        virtual void save(ESM::ESMWriter& esm) = 0;
         virtual void print() = 0;
 
         static std::unique_ptr<RecordBase> create(ESM::NAME type);
 
         // just make it a bit shorter
         template <class T>
-        Record<T> *cast() {
-            return static_cast<Record<T> *>(this);
+        Record<T>* cast()
+        {
+            return static_cast<Record<T>*>(this);
         }
     };
 
@@ -73,75 +67,115 @@ namespace EsmTool
     public:
         Record()
             : mIsDeleted(false)
-        {}
-
-        std::string getId() const override {
-            return mData.mId;
+        {
         }
 
-        T &get() {
-            return mData;
-        }
+        std::string getId() const override { return mData.mId; }
 
-        void save(ESM::ESMWriter &esm) override {
-            mData.save(esm, mIsDeleted);
-        }
+        T& get() { return mData; }
 
-        void load(ESM::ESMReader &esm) override {
-            mData.load(esm, mIsDeleted);
-        }
+        void save(ESM::ESMWriter& esm) override { mData.save(esm, mIsDeleted); }
+
+        void load(ESM::ESMReader& esm) override { mData.load(esm, mIsDeleted); }
 
         void print() override;
     };
-    
-    template<> std::string Record<ESM::Cell>::getId() const;
-    template<> std::string Record<ESM::Land>::getId() const;
-    template<> std::string Record<ESM::MagicEffect>::getId() const;
-    template<> std::string Record<ESM::Pathgrid>::getId() const;
-    template<> std::string Record<ESM::Skill>::getId() const;
-
-    template<> void Record<ESM::Activator>::print();
-    template<> void Record<ESM::Potion>::print();
-    template<> void Record<ESM::Armor>::print();
-    template<> void Record<ESM::Apparatus>::print();
-    template<> void Record<ESM::BodyPart>::print();
-    template<> void Record<ESM::Book>::print();
-    template<> void Record<ESM::BirthSign>::print();
-    template<> void Record<ESM::Cell>::print();
-    template<> void Record<ESM::Class>::print();
-    template<> void Record<ESM::Clothing>::print();
-    template<> void Record<ESM::Container>::print();
-    template<> void Record<ESM::Creature>::print();
-    template<> void Record<ESM::Dialogue>::print();
-    template<> void Record<ESM::Door>::print();
-    template<> void Record<ESM::Enchantment>::print();
-    template<> void Record<ESM::Faction>::print();
-    template<> void Record<ESM::Global>::print();
-    template<> void Record<ESM::GameSetting>::print();
-    template<> void Record<ESM::DialInfo>::print();
-    template<> void Record<ESM::Ingredient>::print();
-    template<> void Record<ESM::Land>::print();
-    template<> void Record<ESM::CreatureLevList>::print();
-    template<> void Record<ESM::ItemLevList>::print();
-    template<> void Record<ESM::Light>::print();
-    template<> void Record<ESM::Lockpick>::print();
-    template<> void Record<ESM::Probe>::print();
-    template<> void Record<ESM::Repair>::print();
-    template<> void Record<ESM::LandTexture>::print();
-    template<> void Record<ESM::MagicEffect>::print();
-    template<> void Record<ESM::Miscellaneous>::print();
-    template<> void Record<ESM::NPC>::print();
-    template<> void Record<ESM::Pathgrid>::print();
-    template<> void Record<ESM::Race>::print();
-    template<> void Record<ESM::Region>::print();
-    template<> void Record<ESM::Script>::print();
-    template<> void Record<ESM::Skill>::print();
-    template<> void Record<ESM::SoundGenerator>::print();
-    template<> void Record<ESM::Sound>::print();
-    template<> void Record<ESM::Spell>::print();
-    template<> void Record<ESM::StartScript>::print();
-    template<> void Record<ESM::Static>::print();
-    template<> void Record<ESM::Weapon>::print();
+
+    template <>
+    std::string Record<ESM::Cell>::getId() const;
+    template <>
+    std::string Record<ESM::Land>::getId() const;
+    template <>
+    std::string Record<ESM::MagicEffect>::getId() const;
+    template <>
+    std::string Record<ESM::Pathgrid>::getId() const;
+    template <>
+    std::string Record<ESM::Skill>::getId() const;
+
+    template <>
+    void Record<ESM::Activator>::print();
+    template <>
+    void Record<ESM::Potion>::print();
+    template <>
+    void Record<ESM::Armor>::print();
+    template <>
+    void Record<ESM::Apparatus>::print();
+    template <>
+    void Record<ESM::BodyPart>::print();
+    template <>
+    void Record<ESM::Book>::print();
+    template <>
+    void Record<ESM::BirthSign>::print();
+    template <>
+    void Record<ESM::Cell>::print();
+    template <>
+    void Record<ESM::Class>::print();
+    template <>
+    void Record<ESM::Clothing>::print();
+    template <>
+    void Record<ESM::Container>::print();
+    template <>
+    void Record<ESM::Creature>::print();
+    template <>
+    void Record<ESM::Dialogue>::print();
+    template <>
+    void Record<ESM::Door>::print();
+    template <>
+    void Record<ESM::Enchantment>::print();
+    template <>
+    void Record<ESM::Faction>::print();
+    template <>
+    void Record<ESM::Global>::print();
+    template <>
+    void Record<ESM::GameSetting>::print();
+    template <>
+    void Record<ESM::DialInfo>::print();
+    template <>
+    void Record<ESM::Ingredient>::print();
+    template <>
+    void Record<ESM::Land>::print();
+    template <>
+    void Record<ESM::CreatureLevList>::print();
+    template <>
+    void Record<ESM::ItemLevList>::print();
+    template <>
+    void Record<ESM::Light>::print();
+    template <>
+    void Record<ESM::Lockpick>::print();
+    template <>
+    void Record<ESM::Probe>::print();
+    template <>
+    void Record<ESM::Repair>::print();
+    template <>
+    void Record<ESM::LandTexture>::print();
+    template <>
+    void Record<ESM::MagicEffect>::print();
+    template <>
+    void Record<ESM::Miscellaneous>::print();
+    template <>
+    void Record<ESM::NPC>::print();
+    template <>
+    void Record<ESM::Pathgrid>::print();
+    template <>
+    void Record<ESM::Race>::print();
+    template <>
+    void Record<ESM::Region>::print();
+    template <>
+    void Record<ESM::Script>::print();
+    template <>
+    void Record<ESM::Skill>::print();
+    template <>
+    void Record<ESM::SoundGenerator>::print();
+    template <>
+    void Record<ESM::Sound>::print();
+    template <>
+    void Record<ESM::Spell>::print();
+    template <>
+    void Record<ESM::StartScript>::print();
+    template <>
+    void Record<ESM::Static>::print();
+    template <>
+    void Record<ESM::Weapon>::print();
 }
 
 #endif
diff --git a/apps/esmtool/tes4.cpp b/apps/esmtool/tes4.cpp
index d635545f6e..f72175ec93 100644
--- a/apps/esmtool/tes4.cpp
+++ b/apps/esmtool/tes4.cpp
@@ -21,79 +21,115 @@ namespace EsmTool
 
             explicit Params(const Arguments& info)
                 : mQuite(info.quiet_given || info.mode == "clone")
-            {}
+            {
+            }
         };
 
         std::string toString(ESM4::GroupType type)
         {
             switch (type)
             {
-                case ESM4::Grp_RecordType: return "RecordType";
-                case ESM4::Grp_WorldChild: return "WorldChild";
-                case ESM4::Grp_InteriorCell: return "InteriorCell";
-                case ESM4::Grp_InteriorSubCell: return "InteriorSubCell";
-                case ESM4::Grp_ExteriorCell: return "ExteriorCell";
-                case ESM4::Grp_ExteriorSubCell: return "ExteriorSubCell";
-                case ESM4::Grp_CellChild: return "CellChild";
-                case ESM4::Grp_TopicChild: return "TopicChild";
-                case ESM4::Grp_CellPersistentChild: return "CellPersistentChild";
-                case ESM4::Grp_CellTemporaryChild: return "CellTemporaryChild";
-                case ESM4::Grp_CellVisibleDistChild: return "CellVisibleDistChild";
+                case ESM4::Grp_RecordType:
+                    return "RecordType";
+                case ESM4::Grp_WorldChild:
+                    return "WorldChild";
+                case ESM4::Grp_InteriorCell:
+                    return "InteriorCell";
+                case ESM4::Grp_InteriorSubCell:
+                    return "InteriorSubCell";
+                case ESM4::Grp_ExteriorCell:
+                    return "ExteriorCell";
+                case ESM4::Grp_ExteriorSubCell:
+                    return "ExteriorSubCell";
+                case ESM4::Grp_CellChild:
+                    return "CellChild";
+                case ESM4::Grp_TopicChild:
+                    return "TopicChild";
+                case ESM4::Grp_CellPersistentChild:
+                    return "CellPersistentChild";
+                case ESM4::Grp_CellTemporaryChild:
+                    return "CellTemporaryChild";
+                case ESM4::Grp_CellVisibleDistChild:
+                    return "CellVisibleDistChild";
             }
 
             return "Unknown (" + std::to_string(type) + ")";
         }
 
         template <class T, class = std::void_t<>>
-        struct HasFormId : std::false_type {};
+        struct HasFormId : std::false_type
+        {
+        };
 
         template <class T>
-        struct HasFormId<T, std::void_t<decltype(T::mFormId)>> : std::true_type {};
+        struct HasFormId<T, std::void_t<decltype(T::mFormId)>> : std::true_type
+        {
+        };
 
         template <class T>
         constexpr bool hasFormId = HasFormId<T>::value;
 
         template <class T, class = std::void_t<>>
-        struct HasFlags : std::false_type {};
+        struct HasFlags : std::false_type
+        {
+        };
 
         template <class T>
-        struct HasFlags<T, std::void_t<decltype(T::mFlags)>> : std::true_type {};
+        struct HasFlags<T, std::void_t<decltype(T::mFlags)>> : std::true_type
+        {
+        };
 
         template <class T>
         constexpr bool hasFlags = HasFlags<T>::value;
 
         template <class T, class = std::void_t<>>
-        struct HasEditorId : std::false_type {};
+        struct HasEditorId : std::false_type
+        {
+        };
 
         template <class T>
-        struct HasEditorId<T, std::void_t<decltype(T::mEditorId)>> : std::true_type {};
+        struct HasEditorId<T, std::void_t<decltype(T::mEditorId)>> : std::true_type
+        {
+        };
 
         template <class T>
         constexpr bool hasEditorId = HasEditorId<T>::value;
 
         template <class T, class = std::void_t<>>
-        struct HasModel : std::false_type {};
+        struct HasModel : std::false_type
+        {
+        };
 
         template <class T>
-        struct HasModel<T, std::void_t<decltype(T::mModel)>> : std::true_type {};
+        struct HasModel<T, std::void_t<decltype(T::mModel)>> : std::true_type
+        {
+        };
 
         template <class T>
         constexpr bool hasModel = HasModel<T>::value;
 
         template <class T, class = std::void_t<>>
-        struct HasNif : std::false_type {};
+        struct HasNif : std::false_type
+        {
+        };
 
         template <class T>
-        struct HasNif<T, std::void_t<decltype(T::mNif)>> : std::true_type {};
+        struct HasNif<T, std::void_t<decltype(T::mNif)>> : std::true_type
+        {
+        };
 
         template <class T>
         constexpr bool hasNif = HasNif<T>::value;
 
         template <class T, class = std::void_t<>>
-        struct HasKf : std::false_type {};
+        struct HasKf : std::false_type
+        {
+        };
 
         template <class T>
-        struct HasKf<T, std::void_t<decltype(T::mKf)>> : std::true_type {};
+        struct HasKf<T, std::void_t<decltype(T::mKf)>> : std::true_type
+        {
+        };
 
         template <class T>
         constexpr bool hasKf = HasKf<T>::value;
@@ -150,148 +186,286 @@ namespace EsmTool
         {
             switch (static_cast<ESM4::RecordTypes>(reader.hdr().record.typeId))
             {
-                case ESM4::REC_AACT: break;
-                case ESM4::REC_ACHR: return readTypedRecord<ESM4::ActorCharacter>(params, reader);
-                case ESM4::REC_ACRE: return readTypedRecord<ESM4::ActorCreature>(params, reader);
-                case ESM4::REC_ACTI: return readTypedRecord<ESM4::Activator>(params, reader);
-                case ESM4::REC_ADDN: break;
-                case ESM4::REC_ALCH: return readTypedRecord<ESM4::Potion>(params, reader);
-                case ESM4::REC_ALOC: return readTypedRecord<ESM4::MediaLocationController>(params, reader);
-                case ESM4::REC_AMMO: return readTypedRecord<ESM4::Ammunition>(params, reader);
-                case ESM4::REC_ANIO: return readTypedRecord<ESM4::AnimObject>(params, reader);
-                case ESM4::REC_APPA: return readTypedRecord<ESM4::Apparatus>(params, reader);
-                case ESM4::REC_ARMA: return readTypedRecord<ESM4::ArmorAddon>(params, reader);
-                case ESM4::REC_ARMO: return readTypedRecord<ESM4::Armor>(params, reader);
-                case ESM4::REC_ARTO: break;
-                case ESM4::REC_ASPC: return readTypedRecord<ESM4::AcousticSpace>(params, reader);
-                case ESM4::REC_ASTP: break;
-                case ESM4::REC_AVIF: break;
-                case ESM4::REC_BOOK: return readTypedRecord<ESM4::Book>(params, reader);
-                case ESM4::REC_BPTD: return readTypedRecord<ESM4::BodyPartData>(params, reader);
-                case ESM4::REC_CAMS: break;
-                case ESM4::REC_CCRD: break;
-                case ESM4::REC_CELL: return readTypedRecord<ESM4::Cell>(params, reader);
-                case ESM4::REC_CLAS: return readTypedRecord<ESM4::Class>(params, reader);
-                case ESM4::REC_CLFM: return readTypedRecord<ESM4::Colour>(params, reader);
-                case ESM4::REC_CLMT: break;
-                case ESM4::REC_CLOT: return readTypedRecord<ESM4::Clothing>(params, reader);
-                case ESM4::REC_CMNY: break;
-                case ESM4::REC_COBJ: break;
-                case ESM4::REC_COLL: break;
-                case ESM4::REC_CONT: return readTypedRecord<ESM4::Container>(params, reader);
-                case ESM4::REC_CPTH: break;
-                case ESM4::REC_CREA: return readTypedRecord<ESM4::Creature>(params, reader);
-                case ESM4::REC_CSTY: break;
-                case ESM4::REC_DEBR: break;
-                case ESM4::REC_DIAL: return readTypedRecord<ESM4::Dialogue>(params, reader);
-                case ESM4::REC_DLBR: break;
-                case ESM4::REC_DLVW: break;
-                case ESM4::REC_DOBJ: return readTypedRecord<ESM4::DefaultObj>(params, reader);
-                case ESM4::REC_DOOR: return readTypedRecord<ESM4::Door>(params, reader);
-                case ESM4::REC_DUAL: break;
-                case ESM4::REC_ECZN: break;
-                case ESM4::REC_EFSH: break;
-                case ESM4::REC_ENCH: break;
-                case ESM4::REC_EQUP: break;
-                case ESM4::REC_EXPL: break;
-                case ESM4::REC_EYES: return readTypedRecord<ESM4::Eyes>(params, reader);
-                case ESM4::REC_FACT: break;
-                case ESM4::REC_FLOR: return readTypedRecord<ESM4::Flora>(params, reader);
-                case ESM4::REC_FLST: return readTypedRecord<ESM4::FormIdList>(params, reader);
-                case ESM4::REC_FSTP: break;
-                case ESM4::REC_FSTS: break;
-                case ESM4::REC_FURN: return readTypedRecord<ESM4::Furniture>(params, reader);
-                case ESM4::REC_GLOB: return readTypedRecord<ESM4::GlobalVariable>(params, reader);
-                case ESM4::REC_GMST: break;
-                case ESM4::REC_GRAS: return readTypedRecord<ESM4::Grass>(params, reader);
-                case ESM4::REC_GRUP: break;
-                case ESM4::REC_HAIR: return readTypedRecord<ESM4::Hair>(params, reader);
-                case ESM4::REC_HAZD: break;
-                case ESM4::REC_HDPT: return readTypedRecord<ESM4::HeadPart>(params, reader);
+                case ESM4::REC_AACT:
+                    break;
+                case ESM4::REC_ACHR:
+                    return readTypedRecord<ESM4::ActorCharacter>(params, reader);
+                case ESM4::REC_ACRE:
+                    return readTypedRecord<ESM4::ActorCreature>(params, reader);
+                case ESM4::REC_ACTI:
+                    return readTypedRecord<ESM4::Activator>(params, reader);
+                case ESM4::REC_ADDN:
+                    break;
+                case ESM4::REC_ALCH:
+                    return readTypedRecord<ESM4::Potion>(params, reader);
+                case ESM4::REC_ALOC:
+                    return readTypedRecord<ESM4::MediaLocationController>(params, reader);
+                case ESM4::REC_AMMO:
+                    return readTypedRecord<ESM4::Ammunition>(params, reader);
+                case ESM4::REC_ANIO:
+                    return readTypedRecord<ESM4::AnimObject>(params, reader);
+                case ESM4::REC_APPA:
+                    return readTypedRecord<ESM4::Apparatus>(params, reader);
+                case ESM4::REC_ARMA:
+                    return readTypedRecord<ESM4::ArmorAddon>(params, reader);
+                case ESM4::REC_ARMO:
+                    return readTypedRecord<ESM4::Armor>(params, reader);
+                case ESM4::REC_ARTO:
+                    break;
+                case ESM4::REC_ASPC:
+                    return readTypedRecord<ESM4::AcousticSpace>(params, reader);
+                case ESM4::REC_ASTP:
+                    break;
+                case ESM4::REC_AVIF:
+                    break;
+                case ESM4::REC_BOOK:
+                    return readTypedRecord<ESM4::Book>(params, reader);
+                case ESM4::REC_BPTD:
+                    return readTypedRecord<ESM4::BodyPartData>(params, reader);
+                case ESM4::REC_CAMS:
+                    break;
+                case ESM4::REC_CCRD:
+                    break;
+                case ESM4::REC_CELL:
+                    return readTypedRecord<ESM4::Cell>(params, reader);
+                case ESM4::REC_CLAS:
+                    return readTypedRecord<ESM4::Class>(params, reader);
+                case ESM4::REC_CLFM:
+                    return readTypedRecord<ESM4::Colour>(params, reader);
+                case ESM4::REC_CLMT:
+                    break;
+                case ESM4::REC_CLOT:
+                    return readTypedRecord<ESM4::Clothing>(params, reader);
+                case ESM4::REC_CMNY:
+                    break;
+                case ESM4::REC_COBJ:
+                    break;
+                case ESM4::REC_COLL:
+                    break;
+                case ESM4::REC_CONT:
+                    return readTypedRecord<ESM4::Container>(params, reader);
+                case ESM4::REC_CPTH:
+                    break;
+                case ESM4::REC_CREA:
+                    return readTypedRecord<ESM4::Creature>(params, reader);
+                case ESM4::REC_CSTY:
+                    break;
+                case ESM4::REC_DEBR:
+                    break;
+                case ESM4::REC_DIAL:
+                    return readTypedRecord<ESM4::Dialogue>(params, reader);
+                case ESM4::REC_DLBR:
+                    break;
+                case ESM4::REC_DLVW:
+                    break;
+                case ESM4::REC_DOBJ:
+                    return readTypedRecord<ESM4::DefaultObj>(params, reader);
+                case ESM4::REC_DOOR:
+                    return readTypedRecord<ESM4::Door>(params, reader);
+                case ESM4::REC_DUAL:
+                    break;
+                case ESM4::REC_ECZN:
+                    break;
+                case ESM4::REC_EFSH:
+                    break;
+                case ESM4::REC_ENCH:
+                    break;
+                case ESM4::REC_EQUP:
+                    break;
+                case ESM4::REC_EXPL:
+                    break;
+                case ESM4::REC_EYES:
+                    return readTypedRecord<ESM4::Eyes>(params, reader);
+                case ESM4::REC_FACT:
+                    break;
+                case ESM4::REC_FLOR:
+                    return readTypedRecord<ESM4::Flora>(params, reader);
+                case ESM4::REC_FLST:
+                    return readTypedRecord<ESM4::FormIdList>(params, reader);
+                case ESM4::REC_FSTP:
+                    break;
+                case ESM4::REC_FSTS:
+                    break;
+                case ESM4::REC_FURN:
+                    return readTypedRecord<ESM4::Furniture>(params, reader);
+                case ESM4::REC_GLOB:
+                    return readTypedRecord<ESM4::GlobalVariable>(params, reader);
+                case ESM4::REC_GMST:
+                    break;
+                case ESM4::REC_GRAS:
+                    return readTypedRecord<ESM4::Grass>(params, reader);
+                case ESM4::REC_GRUP:
+                    break;
+                case ESM4::REC_HAIR:
+                    return readTypedRecord<ESM4::Hair>(params, reader);
+                case ESM4::REC_HAZD:
+                    break;
+                case ESM4::REC_HDPT:
+                    return readTypedRecord<ESM4::HeadPart>(params, reader);
                 case ESM4::REC_IDLE:
                     // FIXME: ESM4::IdleAnimation::load does not work with Oblivion.esm
                     // return readTypedRecord<ESM4::IdleAnimation>(params, reader);
                     break;
-                case ESM4::REC_IDLM: return readTypedRecord<ESM4::IdleMarker>(params, reader);
-                case ESM4::REC_IMAD: break;
-                case ESM4::REC_IMGS: break;
-                case ESM4::REC_IMOD: return readTypedRecord<ESM4::ItemMod>(params, reader);
-                case ESM4::REC_INFO: return readTypedRecord<ESM4::DialogInfo>(params, reader);
-                case ESM4::REC_INGR: return readTypedRecord<ESM4::Ingredient>(params, reader);
-                case ESM4::REC_IPCT: break;
-                case ESM4::REC_IPDS: break;
-                case ESM4::REC_KEYM: return readTypedRecord<ESM4::Key>(params, reader);
-                case ESM4::REC_KYWD: break;
-                case ESM4::REC_LAND: return readTypedRecord<ESM4::Land>(params, reader);
-                case ESM4::REC_LCRT: break;
-                case ESM4::REC_LCTN: break;
-                case ESM4::REC_LGTM: return readTypedRecord<ESM4::LightingTemplate>(params, reader);
-                case ESM4::REC_LIGH: return readTypedRecord<ESM4::Light>(params, reader);
-                case ESM4::REC_LSCR: break;
-                case ESM4::REC_LTEX: return readTypedRecord<ESM4::LandTexture>(params, reader);
-                case ESM4::REC_LVLC: return readTypedRecord<ESM4::LevelledCreature>(params, reader);
-                case ESM4::REC_LVLI: return readTypedRecord<ESM4::LevelledItem>(params, reader);
-                case ESM4::REC_LVLN: return readTypedRecord<ESM4::LevelledNpc>(params, reader);
-                case ESM4::REC_LVSP: break;
-                case ESM4::REC_MATO: return readTypedRecord<ESM4::Material>(params, reader);
-                case ESM4::REC_MATT: break;
-                case ESM4::REC_MESG: break;
-                case ESM4::REC_MGEF: break;
-                case ESM4::REC_MISC: return readTypedRecord<ESM4::MiscItem>(params, reader);
-                case ESM4::REC_MOVT: break;
-                case ESM4::REC_MSET: return readTypedRecord<ESM4::MediaSet>(params, reader);
-                case ESM4::REC_MSTT: return readTypedRecord<ESM4::MovableStatic>(params, reader);
-                case ESM4::REC_MUSC: return readTypedRecord<ESM4::Music>(params, reader);
-                case ESM4::REC_MUST: break;
-                case ESM4::REC_NAVI: return readTypedRecord<ESM4::Navigation>(params, reader);
-                case ESM4::REC_NAVM: return readTypedRecord<ESM4::NavMesh>(params, reader);
-                case ESM4::REC_NOTE: return readTypedRecord<ESM4::Note>(params, reader);
-                case ESM4::REC_NPC_: return readTypedRecord<ESM4::Npc>(params, reader);
-                case ESM4::REC_OTFT: return readTypedRecord<ESM4::Outfit>(params, reader);
-                case ESM4::REC_PACK: return readTypedRecord<ESM4::AIPackage>(params, reader);
-                case ESM4::REC_PERK: break;
-                case ESM4::REC_PGRD: return readTypedRecord<ESM4::Pathgrid>(params, reader);
-                case ESM4::REC_PGRE: return readTypedRecord<ESM4::PlacedGrenade>(params, reader);
-                case ESM4::REC_PHZD: break;
-                case ESM4::REC_PROJ: break;
-                case ESM4::REC_PWAT: return readTypedRecord<ESM4::PlaceableWater>(params, reader);
-                case ESM4::REC_QUST: return readTypedRecord<ESM4::Quest>(params, reader);
-                case ESM4::REC_RACE: return readTypedRecord<ESM4::Race>(params, reader);
-                case ESM4::REC_REFR: return readTypedRecord<ESM4::Reference>(params, reader);
-                case ESM4::REC_REGN: return readTypedRecord<ESM4::Region>(params, reader);
-                case ESM4::REC_RELA: break;
-                case ESM4::REC_REVB: break;
-                case ESM4::REC_RFCT: break;
-                case ESM4::REC_ROAD: return readTypedRecord<ESM4::Road>(params, reader);
-                case ESM4::REC_SBSP: return readTypedRecord<ESM4::SubSpace>(params, reader);
-                case ESM4::REC_SCEN: break;
-                case ESM4::REC_SCOL: return readTypedRecord<ESM4::StaticCollection>(params, reader);
-                case ESM4::REC_SCPT: return readTypedRecord<ESM4::Script>(params, reader);
-                case ESM4::REC_SCRL: return readTypedRecord<ESM4::Scroll>(params, reader);
-                case ESM4::REC_SGST: return readTypedRecord<ESM4::SigilStone>(params, reader);
-                case ESM4::REC_SHOU: break;
-                case ESM4::REC_SLGM: return readTypedRecord<ESM4::SoulGem>(params, reader);
-                case ESM4::REC_SMBN: break;
-                case ESM4::REC_SMEN: break;
-                case ESM4::REC_SMQN: break;
-                case ESM4::REC_SNCT: break;
-                case ESM4::REC_SNDR: return readTypedRecord<ESM4::SoundReference>(params, reader);
-                case ESM4::REC_SOPM: break;
-                case ESM4::REC_SOUN: return readTypedRecord<ESM4::Sound>(params, reader);
-                case ESM4::REC_SPEL: break;
-                case ESM4::REC_SPGD: break;
-                case ESM4::REC_STAT: return readTypedRecord<ESM4::Static>(params, reader);
-                case ESM4::REC_TACT: return readTypedRecord<ESM4::TalkingActivator>(params, reader);
-                case ESM4::REC_TERM: return readTypedRecord<ESM4::Terminal>(params, reader);
-                case ESM4::REC_TES4: return readTypedRecord<ESM4::Header>(params, reader);
-                case ESM4::REC_TREE: return readTypedRecord<ESM4::Tree>(params, reader);
-                case ESM4::REC_TXST: return readTypedRecord<ESM4::TextureSet>(params, reader);
-                case ESM4::REC_VTYP: break;
-                case ESM4::REC_WATR: break;
-                case ESM4::REC_WEAP: return readTypedRecord<ESM4::Weapon>(params, reader);
-                case ESM4::REC_WOOP: break;
-                case ESM4::REC_WRLD: return readTypedRecord<ESM4::World>(params, reader);
-                case ESM4::REC_WTHR: break;
+                case ESM4::REC_IDLM:
+                    return readTypedRecord<ESM4::IdleMarker>(params, reader);
+                case ESM4::REC_IMAD:
+                    break;
+                case ESM4::REC_IMGS:
+                    break;
+                case ESM4::REC_IMOD:
+                    return readTypedRecord<ESM4::ItemMod>(params, reader);
+                case ESM4::REC_INFO:
+                    return readTypedRecord<ESM4::DialogInfo>(params, reader);
+                case ESM4::REC_INGR:
+                    return readTypedRecord<ESM4::Ingredient>(params, reader);
+                case ESM4::REC_IPCT:
+                    break;
+                case ESM4::REC_IPDS:
+                    break;
+                case ESM4::REC_KEYM:
+                    return readTypedRecord<ESM4::Key>(params, reader);
+                case ESM4::REC_KYWD:
+                    break;
+                case ESM4::REC_LAND:
+                    return readTypedRecord<ESM4::Land>(params, reader);
+                case ESM4::REC_LCRT:
+                    break;
+                case ESM4::REC_LCTN:
+                    break;
+                case ESM4::REC_LGTM:
+                    return readTypedRecord<ESM4::LightingTemplate>(params, reader);
+                case ESM4::REC_LIGH:
+                    return readTypedRecord<ESM4::Light>(params, reader);
+                case ESM4::REC_LSCR:
+                    break;
+                case ESM4::REC_LTEX:
+                    return readTypedRecord<ESM4::LandTexture>(params, reader);
+                case ESM4::REC_LVLC:
+                    return readTypedRecord<ESM4::LevelledCreature>(params, reader);
+                case ESM4::REC_LVLI:
+                    return readTypedRecord<ESM4::LevelledItem>(params, reader);
+                case ESM4::REC_LVLN:
+                    return readTypedRecord<ESM4::LevelledNpc>(params, reader);
+                case ESM4::REC_LVSP:
+                    break;
+                case ESM4::REC_MATO:
+                    return readTypedRecord<ESM4::Material>(params, reader);
+                case ESM4::REC_MATT:
+                    break;
+                case ESM4::REC_MESG:
+                    break;
+                case ESM4::REC_MGEF:
+                    break;
+                case ESM4::REC_MISC:
+                    return readTypedRecord<ESM4::MiscItem>(params, reader);
+                case ESM4::REC_MOVT:
+                    break;
+                case ESM4::REC_MSET:
+                    return readTypedRecord<ESM4::MediaSet>(params, reader);
+                case ESM4::REC_MSTT:
+                    return readTypedRecord<ESM4::MovableStatic>(params, reader);
+                case ESM4::REC_MUSC:
+                    return readTypedRecord<ESM4::Music>(params, reader);
+                case ESM4::REC_MUST:
+                    break;
+                case ESM4::REC_NAVI:
+                    return readTypedRecord<ESM4::Navigation>(params, reader);
+                case ESM4::REC_NAVM:
+                    return readTypedRecord<ESM4::NavMesh>(params, reader);
+                case ESM4::REC_NOTE:
+                    return readTypedRecord<ESM4::Note>(params, reader);
+                case ESM4::REC_NPC_:
+                    return readTypedRecord<ESM4::Npc>(params, reader);
+                case ESM4::REC_OTFT:
+                    return readTypedRecord<ESM4::Outfit>(params, reader);
+                case ESM4::REC_PACK:
+                    return readTypedRecord<ESM4::AIPackage>(params, reader);
+                case ESM4::REC_PERK:
+                    break;
+                case ESM4::REC_PGRD:
+                    return readTypedRecord<ESM4::Pathgrid>(params, reader);
+                case ESM4::REC_PGRE:
+                    return readTypedRecord<ESM4::PlacedGrenade>(params, reader);
+                case ESM4::REC_PHZD:
+                    break;
+                case ESM4::REC_PROJ:
+                    break;
+                case ESM4::REC_PWAT:
+                    return readTypedRecord<ESM4::PlaceableWater>(params, reader);
+                case ESM4::REC_QUST:
+                    return readTypedRecord<ESM4::Quest>(params, reader);
+                case ESM4::REC_RACE:
+                    return readTypedRecord<ESM4::Race>(params, reader);
+                case ESM4::REC_REFR:
+                    return readTypedRecord<ESM4::Reference>(params, reader);
+                case ESM4::REC_REGN:
+                    return readTypedRecord<ESM4::Region>(params, reader);
+                case ESM4::REC_RELA:
+                    break;
+                case ESM4::REC_REVB:
+                    break;
+                case ESM4::REC_RFCT:
+                    break;
+                case ESM4::REC_ROAD:
+                    return readTypedRecord<ESM4::Road>(params, reader);
+                case ESM4::REC_SBSP:
+                    return readTypedRecord<ESM4::SubSpace>(params, reader);
+                case ESM4::REC_SCEN:
+                    break;
+                case ESM4::REC_SCOL:
+                    return readTypedRecord<ESM4::StaticCollection>(params, reader);
+                case ESM4::REC_SCPT:
+                    return readTypedRecord<ESM4::Script>(params, reader);
+                case ESM4::REC_SCRL:
+                    return readTypedRecord<ESM4::Scroll>(params, reader);
+                case ESM4::REC_SGST:
+                    return readTypedRecord<ESM4::SigilStone>(params, reader);
+                case ESM4::REC_SHOU:
+                    break;
+                case ESM4::REC_SLGM:
+                    return readTypedRecord<ESM4::SoulGem>(params, reader);
+                case ESM4::REC_SMBN:
+                    break;
+                case ESM4::REC_SMEN:
+                    break;
+                case ESM4::REC_SMQN:
+                    break;
+                case ESM4::REC_SNCT:
+                    break;
+                case ESM4::REC_SNDR:
+                    return readTypedRecord<ESM4::SoundReference>(params, reader);
+                case ESM4::REC_SOPM:
+                    break;
+                case ESM4::REC_SOUN:
+                    return readTypedRecord<ESM4::Sound>(params, reader);
+                case ESM4::REC_SPEL:
+                    break;
+                case ESM4::REC_SPGD:
+                    break;
+                case ESM4::REC_STAT:
+                    return readTypedRecord<ESM4::Static>(params, reader);
+                case ESM4::REC_TACT:
+                    return readTypedRecord<ESM4::TalkingActivator>(params, reader);
+                case ESM4::REC_TERM:
+                    return readTypedRecord<ESM4::Terminal>(params, reader);
+                case ESM4::REC_TES4:
+                    return readTypedRecord<ESM4::Header>(params, reader);
+                case ESM4::REC_TREE:
+                    return readTypedRecord<ESM4::Tree>(params, reader);
+                case ESM4::REC_TXST:
+                    return readTypedRecord<ESM4::TextureSet>(params, reader);
+                case ESM4::REC_VTYP:
+                    break;
+                case ESM4::REC_WATR:
+                    break;
+                case ESM4::REC_WEAP:
+                    return readTypedRecord<ESM4::Weapon>(params, reader);
+                case ESM4::REC_WOOP:
+                    break;
+                case ESM4::REC_WRLD:
+                    return readTypedRecord<ESM4::World>(params, reader);
+                case ESM4::REC_WTHR:
+                    break;
             }
 
             if (!params.mQuite)
@@ -307,8 +481,8 @@ namespace EsmTool
             const ESM4::RecordHeader& header = reader.hdr();
 
             if (!params.mQuite)
-                std::cout << "\nGroup: " << toString(static_cast<ESM4::GroupType>(header.group.type))
-                    << " " << ESM::NAME(header.group.typeId).toStringView() << '\n';
+                std::cout << "\nGroup: " << toString(static_cast<ESM4::GroupType>(header.group.type)) << " "
+                          << ESM::NAME(header.group.typeId).toStringView() << '\n';
 
             switch (static_cast<ESM4::GroupType>(header.group.type))
             {
@@ -366,8 +540,8 @@ namespace EsmTool
             if (!params.mQuite)
             {
                 std::cout << "Author: " << reader.getAuthor() << '\n'
-                    << "Description: " << reader.getDesc() << '\n'
-                    << "File format version: " << reader.esmVersion() << '\n';
+                          << "Description: " << reader.getDesc() << '\n'
+                          << "File format version: " << reader.esmVersion() << '\n';
 
                 if (const std::vector<ESM::MasterData>& masterData = reader.getGameFiles(); !masterData.empty())
                 {
diff --git a/apps/essimporter/convertacdt.cpp b/apps/essimporter/convertacdt.cpp
index 0ebf7b6817..8342310cf6 100644
--- a/apps/essimporter/convertacdt.cpp
+++ b/apps/essimporter/convertacdt.cpp
@@ -1,6 +1,6 @@
-#include <string>
 #include <iostream>
 #include <limits>
+#include <string>
 
 #include <components/misc/strings/lower.hpp>
 
@@ -18,16 +18,16 @@ namespace ESSImport
         return mwIndex;
     }
 
-    void convertACDT (const ACDT& acdt, ESM::CreatureStats& cStats)
+    void convertACDT(const ACDT& acdt, ESM::CreatureStats& cStats)
     {
-        for (int i=0; i<3; ++i)
+        for (int i = 0; i < 3; ++i)
         {
             int writeIndex = translateDynamicIndex(i);
             cStats.mDynamic[writeIndex].mBase = acdt.mDynamic[i][1];
             cStats.mDynamic[writeIndex].mMod = 0.f;
             cStats.mDynamic[writeIndex].mCurrent = acdt.mDynamic[i][0];
         }
-        for (int i=0; i<8; ++i)
+        for (int i = 0; i < 8; ++i)
         {
             cStats.mAttributes[i].mBase = acdt.mAttributes[i][1];
             cStats.mAttributes[i].mMod = 0.f;
@@ -38,14 +38,14 @@ namespace ESSImport
         cStats.mAttacked = (acdt.mFlags & Attacked) != 0;
     }
 
-    void convertACSC (const ACSC& acsc, ESM::CreatureStats& cStats)
+    void convertACSC(const ACSC& acsc, ESM::CreatureStats& cStats)
     {
         cStats.mDead = (acsc.mFlags & Dead) != 0;
     }
 
-    void convertNpcData (const ActorData& actorData, ESM::NpcStats& npcStats)
+    void convertNpcData(const ActorData& actorData, ESM::NpcStats& npcStats)
     {
-        for (int i=0; i<ESM::Skill::Length; ++i)
+        for (int i = 0; i < ESM::Skill::Length; ++i)
         {
             npcStats.mSkills[i].mMod = 0.f;
             npcStats.mSkills[i].mCurrent = actorData.mSkills[i][1];
@@ -55,32 +55,29 @@ namespace ESSImport
         npcStats.mTimeToStartDrowning = actorData.mACDT.mBreathMeter;
     }
 
-    void convertANIS (const ANIS& anis, ESM::AnimationState& state)
+    void convertANIS(const ANIS& anis, ESM::AnimationState& state)
     {
-        static const char* animGroups[] =
-        {
-            "Idle", "Idle2", "Idle3", "Idle4", "Idle5", "Idle6", "Idle7", "Idle8", "Idle9", "Idlehh", "Idle1h", "Idle2c",
-            "Idle2w", "IdleSwim", "IdleSpell", "IdleCrossbow", "IdleSneak", "IdleStorm", "Torch", "Hit1", "Hit2", "Hit3",
-            "Hit4", "Hit5", "SwimHit1", "SwimHit2", "SwimHit3", "Death1", "Death2", "Death3", "Death4", "Death5",
-            "DeathKnockDown", "DeathKnockOut", "KnockDown", "KnockOut", "SwimDeath", "SwimDeath2", "SwimDeath3",
-            "SwimDeathKnockDown", "SwimDeathKnockOut", "SwimKnockOut", "SwimKnockDown", "SwimWalkForward",
-            "SwimWalkBack", "SwimWalkLeft", "SwimWalkRight", "SwimRunForward", "SwimRunBack", "SwimRunLeft",
-            "SwimRunRight", "SwimTurnLeft", "SwimTurnRight", "WalkForward", "WalkBack", "WalkLeft", "WalkRight",
-            "TurnLeft", "TurnRight", "RunForward", "RunBack", "RunLeft", "RunRight", "SneakForward", "SneakBack",
-            "SneakLeft", "SneakRight", "Jump", "WalkForwardhh", "WalkBackhh", "WalkLefthh", "WalkRighthh",
-            "TurnLefthh", "TurnRighthh", "RunForwardhh", "RunBackhh", "RunLefthh", "RunRighthh", "SneakForwardhh",
-            "SneakBackhh", "SneakLefthh", "SneakRighthh", "Jumphh", "WalkForward1h", "WalkBack1h", "WalkLeft1h",
-            "WalkRight1h", "TurnLeft1h", "TurnRight1h", "RunForward1h", "RunBack1h", "RunLeft1h", "RunRight1h",
-            "SneakForward1h", "SneakBack1h", "SneakLeft1h", "SneakRight1h", "Jump1h", "WalkForward2c", "WalkBack2c",
-            "WalkLeft2c", "WalkRight2c", "TurnLeft2c", "TurnRight2c", "RunForward2c", "RunBack2c", "RunLeft2c",
-            "RunRight2c", "SneakForward2c", "SneakBack2c", "SneakLeft2c", "SneakRight2c", "Jump2c", "WalkForward2w",
-            "WalkBack2w", "WalkLeft2w", "WalkRight2w", "TurnLeft2w", "TurnRight2w", "RunForward2w", "RunBack2w",
-            "RunLeft2w", "RunRight2w", "SneakForward2w", "SneakBack2w", "SneakLeft2w", "SneakRight2w", "Jump2w",
-            "SpellCast", "SpellTurnLeft", "SpellTurnRight", "Attack1", "Attack2", "Attack3", "SwimAttack1",
+        static const char* animGroups[] = { "Idle", "Idle2", "Idle3", "Idle4", "Idle5", "Idle6", "Idle7", "Idle8",
+            "Idle9", "Idlehh", "Idle1h", "Idle2c", "Idle2w", "IdleSwim", "IdleSpell", "IdleCrossbow", "IdleSneak",
+            "IdleStorm", "Torch", "Hit1", "Hit2", "Hit3", "Hit4", "Hit5", "SwimHit1", "SwimHit2", "SwimHit3", "Death1",
+            "Death2", "Death3", "Death4", "Death5", "DeathKnockDown", "DeathKnockOut", "KnockDown", "KnockOut",
+            "SwimDeath", "SwimDeath2", "SwimDeath3", "SwimDeathKnockDown", "SwimDeathKnockOut", "SwimKnockOut",
+            "SwimKnockDown", "SwimWalkForward", "SwimWalkBack", "SwimWalkLeft", "SwimWalkRight", "SwimRunForward",
+            "SwimRunBack", "SwimRunLeft", "SwimRunRight", "SwimTurnLeft", "SwimTurnRight", "WalkForward", "WalkBack",
+            "WalkLeft", "WalkRight", "TurnLeft", "TurnRight", "RunForward", "RunBack", "RunLeft", "RunRight",
+            "SneakForward", "SneakBack", "SneakLeft", "SneakRight", "Jump", "WalkForwardhh", "WalkBackhh", "WalkLefthh",
+            "WalkRighthh", "TurnLefthh", "TurnRighthh", "RunForwardhh", "RunBackhh", "RunLefthh", "RunRighthh",
+            "SneakForwardhh", "SneakBackhh", "SneakLefthh", "SneakRighthh", "Jumphh", "WalkForward1h", "WalkBack1h",
+            "WalkLeft1h", "WalkRight1h", "TurnLeft1h", "TurnRight1h", "RunForward1h", "RunBack1h", "RunLeft1h",
+            "RunRight1h", "SneakForward1h", "SneakBack1h", "SneakLeft1h", "SneakRight1h", "Jump1h", "WalkForward2c",
+            "WalkBack2c", "WalkLeft2c", "WalkRight2c", "TurnLeft2c", "TurnRight2c", "RunForward2c", "RunBack2c",
+            "RunLeft2c", "RunRight2c", "SneakForward2c", "SneakBack2c", "SneakLeft2c", "SneakRight2c", "Jump2c",
+            "WalkForward2w", "WalkBack2w", "WalkLeft2w", "WalkRight2w", "TurnLeft2w", "TurnRight2w", "RunForward2w",
+            "RunBack2w", "RunLeft2w", "RunRight2w", "SneakForward2w", "SneakBack2w", "SneakLeft2w", "SneakRight2w",
+            "Jump2w", "SpellCast", "SpellTurnLeft", "SpellTurnRight", "Attack1", "Attack2", "Attack3", "SwimAttack1",
             "SwimAttack2", "SwimAttack3", "HandToHand", "Crossbow", "BowAndArrow", "ThrowWeapon", "WeaponOneHand",
             "WeaponTwoHand", "WeaponTwoWide", "Shield", "PickProbe", "InventoryHandToHand", "InventoryWeaponOneHand",
-            "InventoryWeaponTwoHand", "InventoryWeaponTwoWide"
-        };
+            "InventoryWeaponTwoHand", "InventoryWeaponTwoWide" };
 
         if (anis.mGroupIndex < (sizeof(animGroups) / sizeof(*animGroups)))
         {
diff --git a/apps/essimporter/convertacdt.hpp b/apps/essimporter/convertacdt.hpp
index 00e90ababf..0331c38ca9 100644
--- a/apps/essimporter/convertacdt.hpp
+++ b/apps/essimporter/convertacdt.hpp
@@ -1,10 +1,10 @@
 #ifndef OPENMW_ESSIMPORT_CONVERTACDT_H
 #define OPENMW_ESSIMPORT_CONVERTACDT_H
 
+#include <components/esm3/animationstate.hpp>
 #include <components/esm3/creaturestats.hpp>
-#include <components/esm3/npcstats.hpp>
 #include <components/esm3/loadskil.hpp>
-#include <components/esm3/animationstate.hpp>
+#include <components/esm3/npcstats.hpp>
 
 #include "importacdt.hpp"
 
@@ -14,13 +14,12 @@ namespace ESSImport
     // OpenMW uses Health,Magicka,Fatigue, MW uses Health,Fatigue,Magicka
     int translateDynamicIndex(int mwIndex);
 
+    void convertACDT(const ACDT& acdt, ESM::CreatureStats& cStats);
+    void convertACSC(const ACSC& acsc, ESM::CreatureStats& cStats);
 
-    void convertACDT (const ACDT& acdt, ESM::CreatureStats& cStats);
-    void convertACSC (const ACSC& acsc, ESM::CreatureStats& cStats);
-
-    void convertNpcData (const ActorData& actorData, ESM::NpcStats& npcStats);
+    void convertNpcData(const ActorData& actorData, ESM::NpcStats& npcStats);
 
-    void convertANIS (const ANIS& anis, ESM::AnimationState& state);
+    void convertANIS(const ANIS& anis, ESM::AnimationState& state);
 }
 
 #endif
diff --git a/apps/essimporter/convertcntc.cpp b/apps/essimporter/convertcntc.cpp
index 426ef44966..2b461ae3ad 100644
--- a/apps/essimporter/convertcntc.cpp
+++ b/apps/essimporter/convertcntc.cpp
@@ -5,7 +5,7 @@
 namespace ESSImport
 {
 
-    void convertCNTC(const CNTC &cntc, ESM::ContainerState &state)
+    void convertCNTC(const CNTC& cntc, ESM::ContainerState& state)
     {
         convertInventory(cntc.mInventory, state.mInventory);
     }
diff --git a/apps/essimporter/convertcrec.cpp b/apps/essimporter/convertcrec.cpp
index 34e1c00708..f8233bcbf5 100644
--- a/apps/essimporter/convertcrec.cpp
+++ b/apps/essimporter/convertcrec.cpp
@@ -5,7 +5,7 @@
 namespace ESSImport
 {
 
-    void convertCREC(const CREC &crec, ESM::CreatureState &state)
+    void convertCREC(const CREC& crec, ESM::CreatureState& state)
     {
         convertInventory(crec.mInventory, state.mInventory);
     }
diff --git a/apps/essimporter/converter.cpp b/apps/essimporter/converter.cpp
index d154f91ef9..8911858215 100644
--- a/apps/essimporter/converter.cpp
+++ b/apps/essimporter/converter.cpp
@@ -1,17 +1,17 @@
 #include "converter.hpp"
 
-#include <stdexcept>
 #include <algorithm>
+#include <stdexcept>
 
 #include <osgDB/WriteFile>
 
-#include <components/esm3/creaturestate.hpp>
 #include <components/esm3/containerstate.hpp>
+#include <components/esm3/creaturestate.hpp>
 
 #include <components/misc/constants.hpp>
 
-#include "convertcrec.hpp"
 #include "convertcntc.hpp"
+#include "convertcrec.hpp"
 #include "convertscri.hpp"
 
 namespace
@@ -19,7 +19,7 @@ namespace
 
     void convertImage(char* data, int size, int width, int height, GLenum pf, const std::string& out)
     {
-        osg::ref_ptr<osg::Image> image (new osg::Image);
+        osg::ref_ptr<osg::Image> image(new osg::Image);
         image->allocateImage(width, height, 1, pf, GL_UNSIGNED_BYTE);
         memcpy(image->data(), data, size);
         image->flipVertical();
@@ -27,7 +27,6 @@ namespace
         osgDB::writeImageFile(*image, out);
     }
 
-
     void convertCellRef(const ESSImport::CellRef& cellref, ESM::ObjectState& objstate)
     {
         objstate.mEnabled = cellref.mEnabled;
@@ -51,17 +50,17 @@ namespace
             return false; // entirely numeric refid, this is a reference to
                           // a dynamically created record e.g. player-enchanted weapon
 
-        std::string index = indexedRefId.substr(indexedRefId.size()-8);
+        std::string index = indexedRefId.substr(indexedRefId.size() - 8);
         return index.find_first_not_of("0123456789ABCDEF") == std::string::npos;
     }
 
     void splitIndexedRefId(const std::string& indexedRefId, int& refIndex, std::string& refId)
     {
         std::stringstream stream;
-        stream << std::hex << indexedRefId.substr(indexedRefId.size()-8,8);
+        stream << std::hex << indexedRefId.substr(indexedRefId.size() - 8, 8);
         stream >> refIndex;
 
-        refId = indexedRefId.substr(0,indexedRefId.size()-8);
+        refId = indexedRefId.substr(0, indexedRefId.size() - 8);
     }
 
     int convertActorId(const std::string& indexedRefId, ESSImport::Context& context)
@@ -89,14 +88,13 @@ namespace
 namespace ESSImport
 {
 
-
     struct MAPH
     {
         unsigned int size;
         unsigned int value;
     };
 
-    void ConvertFMAP::read(ESM::ESMReader &esm)
+    void ConvertFMAP::read(ESM::ESMReader& esm)
     {
         MAPH maph;
         esm.getHNT(maph, "MAPH");
@@ -112,55 +110,55 @@ namespace ESSImport
 
         // to match openmw size
         // FIXME: filtering?
-        mGlobalMapImage->scaleImage(maph.size*2, maph.size*2, 1, GL_UNSIGNED_BYTE);
+        mGlobalMapImage->scaleImage(maph.size * 2, maph.size * 2, 1, GL_UNSIGNED_BYTE);
     }
 
-    void ConvertFMAP::write(ESM::ESMWriter &esm)
+    void ConvertFMAP::write(ESM::ESMWriter& esm)
     {
         int numcells = mGlobalMapImage->s() / 18; // NB truncating, doesn't divide perfectly
-                                                       // with the 512x512 map the game has by default
-        int cellSize = mGlobalMapImage->s()/numcells;
+                                                  // with the 512x512 map the game has by default
+        int cellSize = mGlobalMapImage->s() / numcells;
 
         // Note the upper left corner of the (0,0) cell should be at (width/2, height/2)
 
-        mContext->mGlobalMapState.mBounds.mMinX = -numcells/2;
-        mContext->mGlobalMapState.mBounds.mMaxX = (numcells-1)/2;
-        mContext->mGlobalMapState.mBounds.mMinY = -(numcells-1)/2;
-        mContext->mGlobalMapState.mBounds.mMaxY = numcells/2;
+        mContext->mGlobalMapState.mBounds.mMinX = -numcells / 2;
+        mContext->mGlobalMapState.mBounds.mMaxX = (numcells - 1) / 2;
+        mContext->mGlobalMapState.mBounds.mMinY = -(numcells - 1) / 2;
+        mContext->mGlobalMapState.mBounds.mMaxY = numcells / 2;
 
-        osg::ref_ptr<osg::Image> image2 (new osg::Image);
-        int width = cellSize*numcells;
-        int height = cellSize*numcells;
+        osg::ref_ptr<osg::Image> image2(new osg::Image);
+        int width = cellSize * numcells;
+        int height = cellSize * numcells;
         std::vector<unsigned char> data;
-        data.resize(width*height*4, 0);
+        data.resize(width * height * 4, 0);
 
         image2->allocateImage(width, height, 1, GL_RGBA, GL_UNSIGNED_BYTE);
         memcpy(image2->data(), data.data(), data.size());
 
-        for (const auto & exploredCell : mContext->mExploredCells)
+        for (const auto& exploredCell : mContext->mExploredCells)
         {
             if (exploredCell.first > mContext->mGlobalMapState.mBounds.mMaxX
-                    || exploredCell.first < mContext->mGlobalMapState.mBounds.mMinX
-                    || exploredCell.second > mContext->mGlobalMapState.mBounds.mMaxY
-                    || exploredCell.second < mContext->mGlobalMapState.mBounds.mMinY)
+                || exploredCell.first < mContext->mGlobalMapState.mBounds.mMinX
+                || exploredCell.second > mContext->mGlobalMapState.mBounds.mMaxY
+                || exploredCell.second < mContext->mGlobalMapState.mBounds.mMinY)
             {
                 // out of bounds, I think this could happen, since the original engine had a fixed-size map
                 continue;
             }
 
-            int imageLeftSrc = mGlobalMapImage->s()/2;
-            int imageTopSrc = mGlobalMapImage->t()/2;
+            int imageLeftSrc = mGlobalMapImage->s() / 2;
+            int imageTopSrc = mGlobalMapImage->t() / 2;
             imageLeftSrc += exploredCell.first * cellSize;
             imageTopSrc -= exploredCell.second * cellSize;
-            int imageLeftDst = width/2;
-            int imageTopDst = height/2;
+            int imageLeftDst = width / 2;
+            int imageTopDst = height / 2;
             imageLeftDst += exploredCell.first * cellSize;
             imageTopDst -= exploredCell.second * cellSize;
-            for (int x=0; x<cellSize; ++x)
-                for (int y=0; y<cellSize; ++y)
+            for (int x = 0; x < cellSize; ++x)
+                for (int y = 0; y < cellSize; ++y)
                 {
-                    unsigned int col = *(unsigned int*)mGlobalMapImage->data(imageLeftSrc+x, imageTopSrc+y, 0);
-                    *(unsigned int*)image2->data(imageLeftDst+x, imageTopDst+y, 0) = col;
+                    unsigned int col = *(unsigned int*)mGlobalMapImage->data(imageLeftSrc + x, imageTopSrc + y, 0);
+                    *(unsigned int*)image2->data(imageLeftDst + x, imageTopDst + y, 0) = col;
                 }
         }
 
@@ -177,7 +175,8 @@ namespace ESSImport
         osgDB::ReaderWriter::WriteResult result = readerwriter->writeImage(*image2, ostream);
         if (!result.success())
         {
-            std::cerr << "Error: can't write global map image: " << result.message() << " code " << result.status() << std::endl;
+            std::cerr << "Error: can't write global map image: " << result.message() << " code " << result.status()
+                      << std::endl;
             return;
         }
 
@@ -189,7 +188,7 @@ namespace ESSImport
         esm.endRecord(ESM::REC_GMAP);
     }
 
-    void ConvertCell::read(ESM::ESMReader &esm)
+    void ConvertCell::read(ESM::ESMReader& esm)
     {
         ESM::Cell cell;
         bool isDeleted = false;
@@ -234,15 +233,15 @@ namespace ESSImport
 
             esm.getExact(nam8, 32);
 
-            newcell.mFogOfWar.reserve(16*16);
-            for (int x=0; x<16; ++x)
+            newcell.mFogOfWar.reserve(16 * 16);
+            for (int x = 0; x < 16; ++x)
             {
-                for (int y=0; y<16; ++y)
+                for (int y = 0; y < 16; ++y)
                 {
-                    size_t pos = x*16+y;
-                    size_t bytepos = pos/8;
-                    assert(bytepos<32);
-                    int bit = pos%8;
+                    size_t pos = x * 16 + y;
+                    size_t bytepos = pos / 8;
+                    assert(bytepos < 32);
+                    int bit = pos % 8;
                     newcell.mFogOfWar.push_back(((nam8[bytepos] >> bit) & (0x1)) ? 0xffffffff : 0x000000ff);
                 }
             }
@@ -252,7 +251,8 @@ namespace ESSImport
                 std::ostringstream filename;
                 filename << "fog_" << cell.mData.mX << "_" << cell.mData.mY << ".tga";
 
-                convertImage((char*)&newcell.mFogOfWar[0], newcell.mFogOfWar.size()*4, 16, 16, GL_RGBA, filename.str());
+                convertImage(
+                    (char*)&newcell.mFogOfWar[0], newcell.mFogOfWar.size() * 4, 16, 16, GL_RGBA, filename.str());
             }
         }
 
@@ -271,7 +271,7 @@ namespace ESSImport
         while (esm.hasMoreSubs() && esm.peekNextSub("FRMR"))
         {
             CellRef ref;
-            ref.load (esm);
+            ref.load(esm);
             cellrefs.push_back(ref);
         }
 
@@ -307,14 +307,13 @@ namespace ESSImport
 
         newcell.mRefs = cellrefs;
 
-
         if (cell.isExterior())
             mExtCells[std::make_pair(cell.mData.mX, cell.mData.mY)] = newcell;
         else
             mIntCells[cell.mName] = newcell;
     }
 
-    void ConvertCell::writeCell(const Cell &cell, ESM::ESMWriter& esm)
+    void ConvertCell::writeCell(const Cell& cell, ESM::ESMWriter& esm)
     {
         ESM::Cell esmcell = cell.mCell;
         esm.startRecord(ESM::REC_CSTA);
@@ -329,9 +328,9 @@ namespace ESSImport
         csta.mWaterLevel = esmcell.mWater;
         csta.save(esm);
 
-        for (const auto & cellref : cell.mRefs)
+        for (const auto& cellref : cell.mRefs)
         {
-            ESM::CellRef out (cellref);
+            ESM::CellRef out(cellref);
 
             // TODO: use mContext->mCreatures/mNpcs
 
@@ -348,7 +347,7 @@ namespace ESSImport
                 objstate.mRef.mRefID = idLower;
                 objstate.mHasCustomState = false;
                 convertCellRef(cellref, objstate);
-                esm.writeHNT ("OBJE", 0);
+                esm.writeHNT("OBJE", 0);
                 objstate.save(esm);
                 continue;
             }
@@ -359,8 +358,7 @@ namespace ESSImport
 
                 std::string idLower = Misc::StringUtils::lowerCase(out.mRefID);
 
-                auto npccIt = mContext->mNpcChanges.find(
-                            std::make_pair(refIndex, out.mRefID));
+                auto npccIt = mContext->mNpcChanges.find(std::make_pair(refIndex, out.mRefID));
                 if (npccIt != mContext->mNpcChanges.end())
                 {
                     ESM::NpcState objstate;
@@ -380,15 +378,15 @@ namespace ESSImport
                     convertCellRef(cellref, objstate);
 
                     objstate.mCreatureStats.mActorId = mContext->generateActorId();
-                    mContext->mActorIdMap.insert(std::make_pair(std::make_pair(refIndex, out.mRefID), objstate.mCreatureStats.mActorId));
+                    mContext->mActorIdMap.insert(
+                        std::make_pair(std::make_pair(refIndex, out.mRefID), objstate.mCreatureStats.mActorId));
 
-                    esm.writeHNT ("OBJE", ESM::REC_NPC_);
+                    esm.writeHNT("OBJE", ESM::REC_NPC_);
                     objstate.save(esm);
                     continue;
                 }
 
-                auto cntcIt = mContext->mContainerChanges.find(
-                            std::make_pair(refIndex, out.mRefID));
+                auto cntcIt = mContext->mContainerChanges.find(std::make_pair(refIndex, out.mRefID));
                 if (cntcIt != mContext->mContainerChanges.end())
                 {
                     ESM::ContainerState objstate;
@@ -397,13 +395,12 @@ namespace ESSImport
                     objstate.mRef.mRefID = idLower;
                     convertCNTC(cntcIt->second, objstate);
                     convertCellRef(cellref, objstate);
-                    esm.writeHNT ("OBJE", ESM::REC_CONT);
+                    esm.writeHNT("OBJE", ESM::REC_CONT);
                     objstate.save(esm);
                     continue;
                 }
 
-                auto crecIt = mContext->mCreatureChanges.find(
-                            std::make_pair(refIndex, out.mRefID));
+                auto crecIt = mContext->mCreatureChanges.find(std::make_pair(refIndex, out.mRefID));
                 if (crecIt != mContext->mCreatureChanges.end())
                 {
                     ESM::CreatureState objstate;
@@ -422,9 +419,10 @@ namespace ESSImport
                     convertCellRef(cellref, objstate);
 
                     objstate.mCreatureStats.mActorId = mContext->generateActorId();
-                    mContext->mActorIdMap.insert(std::make_pair(std::make_pair(refIndex, out.mRefID), objstate.mCreatureStats.mActorId));
+                    mContext->mActorIdMap.insert(
+                        std::make_pair(std::make_pair(refIndex, out.mRefID), objstate.mCreatureStats.mActorId));
 
-                    esm.writeHNT ("OBJE", ESM::REC_CREA);
+                    esm.writeHNT("OBJE", ESM::REC_CREA);
                     objstate.save(esm);
                     continue;
                 }
@@ -438,15 +436,15 @@ namespace ESSImport
         esm.endRecord(ESM::REC_CSTA);
     }
 
-    void ConvertCell::write(ESM::ESMWriter &esm)
+    void ConvertCell::write(ESM::ESMWriter& esm)
     {
-        for (const auto & cell : mIntCells)
+        for (const auto& cell : mIntCells)
             writeCell(cell.second, esm);
 
-        for (const auto & cell : mExtCells)
+        for (const auto& cell : mExtCells)
             writeCell(cell.second, esm);
 
-        for (const auto & marker : mMarkers)
+        for (const auto& marker : mMarkers)
         {
             esm.startRecord(ESM::REC_MARK);
             marker.save(esm);
@@ -482,11 +480,12 @@ namespace ESSImport
                 convertBaseState(out, pnam);
 
                 auto it = std::find_if(mContext->mActiveSpells.begin(), mContext->mActiveSpells.end(),
-                                       [&pnam](const SPLM::ActiveSpell& spell) -> bool { return spell.mIndex == pnam.mSplmIndex; });
+                    [&pnam](const SPLM::ActiveSpell& spell) -> bool { return spell.mIndex == pnam.mSplmIndex; });
 
                 if (it == mContext->mActiveSpells.end())
                 {
-                    std::cerr << "Warning: Skipped conversion for magic projectile \"" << pnam.mArrowId.toString() << "\" (invalid spell link)" << std::endl;
+                    std::cerr << "Warning: Skipped conversion for magic projectile \"" << pnam.mArrowId.toString()
+                              << "\" (invalid spell link)" << std::endl;
                     continue;
                 }
 
@@ -507,7 +506,7 @@ namespace ESSImport
         base.mPosition = pnam.mPosition;
 
         osg::Quat orient;
-        orient.makeRotate(osg::Vec3f(0,1,0), pnam.mVelocity);
+        orient.makeRotate(osg::Vec3f(0, 1, 0), pnam.mVelocity);
         base.mOrientation = orient;
 
         base.mActorId = convertActorId(pnam.mActorId.toString(), *mContext);
diff --git a/apps/essimporter/converter.hpp b/apps/essimporter/converter.hpp
index 59ba0ebddb..82cb10e53a 100644
--- a/apps/essimporter/converter.hpp
+++ b/apps/essimporter/converter.hpp
@@ -9,614 +9,619 @@
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/esmwriter.hpp>
 
-#include <components/esm3/loadcell.hpp>
-#include <components/esm3/loadbook.hpp>
-#include <components/esm3/loadclas.hpp>
-#include <components/esm3/loadglob.hpp>
 #include <components/esm3/cellstate.hpp>
-#include <components/esm3/loadfact.hpp>
-#include <components/esm3/dialoguestate.hpp>
 #include <components/esm3/custommarkerstate.hpp>
-#include <components/esm3/loadcrea.hpp>
-#include <components/esm3/weatherstate.hpp>
+#include <components/esm3/dialoguestate.hpp>
 #include <components/esm3/globalscript.hpp>
+#include <components/esm3/loadbook.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadfact.hpp>
+#include <components/esm3/loadglob.hpp>
+#include <components/esm3/projectilestate.hpp>
 #include <components/esm3/queststate.hpp>
 #include <components/esm3/stolenitems.hpp>
-#include <components/esm3/projectilestate.hpp>
+#include <components/esm3/weatherstate.hpp>
 
 #include <components/misc/strings/algorithm.hpp>
 
-#include "importcrec.hpp"
 #include "importcntc.hpp"
+#include "importcrec.hpp"
 
-#include "importercontext.hpp"
 #include "importcellref.hpp"
-#include "importklst.hpp"
+#include "importdial.hpp"
+#include "importercontext.hpp"
 #include "importgame.hpp"
 #include "importinfo.hpp"
-#include "importdial.hpp"
-#include "importques.hpp"
 #include "importjour.hpp"
-#include "importscpt.hpp"
+#include "importklst.hpp"
 #include "importproj.h"
+#include "importques.hpp"
+#include "importscpt.hpp"
 #include "importsplm.h"
 
 #include "convertacdt.hpp"
 #include "convertnpcc.hpp"
-#include "convertscpt.hpp"
 #include "convertplayer.hpp"
+#include "convertscpt.hpp"
 
 namespace ESSImport
 {
 
-class Converter
-{
-public:
-    /// @return the order for writing this converter's records to the output file, in relation to other converters
-    virtual int getStage() { return 1; }
+    class Converter
+    {
+    public:
+        /// @return the order for writing this converter's records to the output file, in relation to other converters
+        virtual int getStage() { return 1; }
 
-    virtual ~Converter() {}
+        virtual ~Converter() {}
 
-    void setContext(Context& context) { mContext = &context; }
+        void setContext(Context& context) { mContext = &context; }
 
-    /// @note The load method of ESM records accept the deleted flag as a parameter.
-    /// I don't know can the DELE sub-record appear in saved games, so the deleted flag will be ignored.
-    virtual void read(ESM::ESMReader& esm)
-    {
-    }
+        /// @note The load method of ESM records accept the deleted flag as a parameter.
+        /// I don't know can the DELE sub-record appear in saved games, so the deleted flag will be ignored.
+        virtual void read(ESM::ESMReader& esm) {}
+
+        /// Called after the input file has been read in completely, which may be necessary
+        /// if the conversion process relies on information in other records
+        virtual void write(ESM::ESMWriter& esm) {}
+
+    protected:
+        Context* mContext;
+    };
 
-    /// Called after the input file has been read in completely, which may be necessary
-    /// if the conversion process relies on information in other records
-    virtual void write(ESM::ESMWriter& esm)
+    /// Default converter: simply reads the record and writes it unmodified to the output
+    template <typename T>
+    class DefaultConverter : public Converter
     {
+    public:
+        int getStage() override { return 0; }
 
-    }
+        void read(ESM::ESMReader& esm) override
+        {
+            T record;
+            bool isDeleted = false;
 
-protected:
-    Context* mContext;
-};
+            record.load(esm, isDeleted);
+            mRecords[record.mId] = record;
+        }
 
-/// Default converter: simply reads the record and writes it unmodified to the output
-template <typename T>
-class DefaultConverter : public Converter
-{
-public:
-    int getStage() override { return 0; }
+        void write(ESM::ESMWriter& esm) override
+        {
+            for (typename std::map<std::string, T>::const_iterator it = mRecords.begin(); it != mRecords.end(); ++it)
+            {
+                esm.startRecord(T::sRecordId);
+                it->second.save(esm);
+                esm.endRecord(T::sRecordId);
+            }
+        }
+
+    protected:
+        std::map<std::string, T> mRecords;
+    };
 
-    void read(ESM::ESMReader& esm) override
+    class ConvertNPC : public Converter
     {
-        T record;
-        bool isDeleted = false;
+    public:
+        void read(ESM::ESMReader& esm) override
+        {
+            ESM::NPC npc;
+            bool isDeleted = false;
 
-        record.load(esm, isDeleted);
-        mRecords[record.mId] = record;
-    }
+            npc.load(esm, isDeleted);
+            if (npc.mId != "player")
+            {
+                // Handles changes to the NPC struct, but since there is no index here
+                // it will apply to ALL instances of the class. seems to be the reason for the
+                // "feature" in MW where changing AI settings of one guard will change it for all guards of that refID.
+                mContext->mNpcs[Misc::StringUtils::lowerCase(npc.mId)] = npc;
+            }
+            else
+            {
+                mContext->mPlayer.mObject.mCreatureStats.mLevel = npc.mNpdt.mLevel;
+                mContext->mPlayerBase = npc;
+                // FIXME: player start spells and birthsign spells aren't listed here,
+                // need to fix openmw to account for this
+                mContext->mPlayer.mObject.mCreatureStats.mSpells.mSpells = npc.mSpells.mList;
+
+                // Clear the list now that we've written it, this prevents issues cropping up with
+                // ensureCustomData() in OpenMW tripping over no longer existing spells, where an error would be fatal.
+                mContext->mPlayerBase.mSpells.mList.clear();
+
+                // Same with inventory. Actually it's strange this would contain something, since there's already an
+                // inventory list in NPCC. There seems to be a fair amount of redundancy in this format.
+                mContext->mPlayerBase.mInventory.mList.clear();
+            }
+        }
+    };
 
-    void write(ESM::ESMWriter& esm) override
+    class ConvertCREA : public Converter
     {
-        for (typename std::map<std::string, T>::const_iterator it = mRecords.begin(); it != mRecords.end(); ++it)
+    public:
+        void read(ESM::ESMReader& esm) override
         {
-            esm.startRecord(T::sRecordId);
-            it->second.save(esm);
-            esm.endRecord(T::sRecordId);
+            // See comment in ConvertNPC
+            ESM::Creature creature;
+            bool isDeleted = false;
+
+            creature.load(esm, isDeleted);
+            mContext->mCreatures[Misc::StringUtils::lowerCase(creature.mId)] = creature;
         }
-    }
+    };
 
-protected:
-    std::map<std::string, T> mRecords;
-};
+    // Do we need ConvertCONT?
+    // I've seen a CONT record in a certain save file, but the container contents in it
+    // were identical to a corresponding CNTC record. See previous comment about redundancy...
 
-class ConvertNPC : public Converter
-{
-public:
-    void read(ESM::ESMReader &esm) override
+    class ConvertGlobal : public DefaultConverter<ESM::Global>
     {
-        ESM::NPC npc;
-        bool isDeleted = false;
-
-        npc.load(esm, isDeleted);
-        if (npc.mId != "player")
+    public:
+        void read(ESM::ESMReader& esm) override
         {
-            // Handles changes to the NPC struct, but since there is no index here
-            // it will apply to ALL instances of the class. seems to be the reason for the
-            // "feature" in MW where changing AI settings of one guard will change it for all guards of that refID.
-            mContext->mNpcs[Misc::StringUtils::lowerCase(npc.mId)] = npc;
+            ESM::Global global;
+            bool isDeleted = false;
+
+            global.load(esm, isDeleted);
+            if (Misc::StringUtils::ciEqual(global.mId, "gamehour"))
+                mContext->mHour = global.mValue.getFloat();
+            if (Misc::StringUtils::ciEqual(global.mId, "day"))
+                mContext->mDay = global.mValue.getInteger();
+            if (Misc::StringUtils::ciEqual(global.mId, "month"))
+                mContext->mMonth = global.mValue.getInteger();
+            if (Misc::StringUtils::ciEqual(global.mId, "year"))
+                mContext->mYear = global.mValue.getInteger();
+            mRecords[global.mId] = global;
         }
-        else
+    };
+
+    class ConvertClass : public DefaultConverter<ESM::Class>
+    {
+    public:
+        void read(ESM::ESMReader& esm) override
         {
-            mContext->mPlayer.mObject.mCreatureStats.mLevel = npc.mNpdt.mLevel;
-            mContext->mPlayerBase = npc;
-            // FIXME: player start spells and birthsign spells aren't listed here,
-            // need to fix openmw to account for this
-            mContext->mPlayer.mObject.mCreatureStats.mSpells.mSpells = npc.mSpells.mList;
+            ESM::Class class_;
+            bool isDeleted = false;
 
-            // Clear the list now that we've written it, this prevents issues cropping up with
-            // ensureCustomData() in OpenMW tripping over no longer existing spells, where an error would be fatal.
-            mContext->mPlayerBase.mSpells.mList.clear();
+            class_.load(esm, isDeleted);
+            if (class_.mId == "NEWCLASSID_CHARGEN")
+                mContext->mCustomPlayerClassName = class_.mName;
 
-            // Same with inventory. Actually it's strange this would contain something, since there's already an
-            // inventory list in NPCC. There seems to be a fair amount of redundancy in this format.
-            mContext->mPlayerBase.mInventory.mList.clear();
+            mRecords[class_.mId] = class_;
         }
-    }
-};
+    };
 
-class ConvertCREA : public Converter
-{
-public:
-    void read(ESM::ESMReader &esm) override
+    class ConvertBook : public DefaultConverter<ESM::Book>
     {
-        // See comment in ConvertNPC
-        ESM::Creature creature;
-        bool isDeleted = false;
+    public:
+        void read(ESM::ESMReader& esm) override
+        {
+            ESM::Book book;
+            bool isDeleted = false;
 
-        creature.load(esm, isDeleted);
-        mContext->mCreatures[Misc::StringUtils::lowerCase(creature.mId)] = creature;
-    }
-};
+            book.load(esm, isDeleted);
+            if (book.mData.mSkillId == -1)
+                mContext->mPlayer.mObject.mNpcStats.mUsedIds.push_back(Misc::StringUtils::lowerCase(book.mId));
 
-// Do we need ConvertCONT?
-// I've seen a CONT record in a certain save file, but the container contents in it
-// were identical to a corresponding CNTC record. See previous comment about redundancy...
+            mRecords[book.mId] = book;
+        }
+    };
 
-class ConvertGlobal : public DefaultConverter<ESM::Global>
-{
-public:
-    void read(ESM::ESMReader &esm) override
-    {
-        ESM::Global global;
-        bool isDeleted = false;
-
-        global.load(esm, isDeleted);
-        if (Misc::StringUtils::ciEqual(global.mId, "gamehour"))
-            mContext->mHour = global.mValue.getFloat();
-        if (Misc::StringUtils::ciEqual(global.mId, "day"))
-            mContext->mDay = global.mValue.getInteger();
-        if (Misc::StringUtils::ciEqual(global.mId, "month"))
-            mContext->mMonth = global.mValue.getInteger();
-        if (Misc::StringUtils::ciEqual(global.mId, "year"))
-            mContext->mYear = global.mValue.getInteger();
-        mRecords[global.mId] = global;
-    }
-};
-
-class ConvertClass : public DefaultConverter<ESM::Class>
-{
-public:
-    void read(ESM::ESMReader &esm) override
+    class ConvertNPCC : public Converter
     {
-        ESM::Class class_;
-        bool isDeleted = false;
-
-        class_.load(esm, isDeleted);
-        if (class_.mId == "NEWCLASSID_CHARGEN")
-            mContext->mCustomPlayerClassName = class_.mName;
-
-        mRecords[class_.mId] = class_;
-    }
-};
+    public:
+        void read(ESM::ESMReader& esm) override
+        {
+            std::string id = esm.getHNString("NAME");
+            NPCC npcc;
+            npcc.load(esm);
+            if (id == "PlayerSaveGame")
+            {
+                convertNPCC(npcc, mContext->mPlayer.mObject);
+            }
+            else
+            {
+                int index = npcc.mNPDT.mIndex;
+                mContext->mNpcChanges.insert(std::make_pair(std::make_pair(index, id), npcc));
+            }
+        }
+    };
 
-class ConvertBook : public DefaultConverter<ESM::Book>
-{
-public:
-    void read(ESM::ESMReader &esm) override
+    class ConvertREFR : public Converter
     {
-        ESM::Book book;
-        bool isDeleted = false;
+    public:
+        void read(ESM::ESMReader& esm) override
+        {
+            CellRef refr;
+            refr.load(esm);
+            assert(refr.mIndexedRefId == "PlayerSaveGame");
+            mContext->mPlayer.mObject.mPosition = refr.mPos;
 
-        book.load(esm, isDeleted);
-        if (book.mData.mSkillId == -1)
-            mContext->mPlayer.mObject.mNpcStats.mUsedIds.push_back(Misc::StringUtils::lowerCase(book.mId));
+            ESM::CreatureStats& cStats = mContext->mPlayer.mObject.mCreatureStats;
+            convertACDT(refr.mActorData.mACDT, cStats);
 
-        mRecords[book.mId] = book;
-    }
-};
+            ESM::NpcStats& npcStats = mContext->mPlayer.mObject.mNpcStats;
+            convertNpcData(refr.mActorData, npcStats);
 
-class ConvertNPCC : public Converter
-{
-public:
-    void read(ESM::ESMReader &esm) override
-    {
-        std::string id = esm.getHNString("NAME");
-        NPCC npcc;
-        npcc.load(esm);
-        if (id == "PlayerSaveGame")
-        {
-            convertNPCC(npcc, mContext->mPlayer.mObject);
+            mSelectedSpell = refr.mActorData.mSelectedSpell;
+            if (!refr.mActorData.mSelectedEnchantItem.empty())
+            {
+                ESM::InventoryState& invState = mContext->mPlayer.mObject.mInventory;
+
+                for (unsigned int i = 0; i < invState.mItems.size(); ++i)
+                {
+                    // FIXME: in case of conflict (multiple items with this refID) use the already equipped one?
+                    if (Misc::StringUtils::ciEqual(
+                            invState.mItems[i].mRef.mRefID, refr.mActorData.mSelectedEnchantItem))
+                        invState.mSelectedEnchantItem = i;
+                }
+            }
         }
-        else
+        void write(ESM::ESMWriter& esm) override
         {
-            int index = npcc.mNPDT.mIndex;
-            mContext->mNpcChanges.insert(std::make_pair(std::make_pair(index,id), npcc));
+            esm.startRecord(ESM::REC_ASPL);
+            esm.writeHNString("ID__", mSelectedSpell);
+            esm.endRecord(ESM::REC_ASPL);
         }
-    }
-};
 
-class ConvertREFR : public Converter
-{
-public:
-    void read(ESM::ESMReader &esm) override
-    {
-        CellRef refr;
-        refr.load(esm);
-        assert(refr.mIndexedRefId == "PlayerSaveGame");
-        mContext->mPlayer.mObject.mPosition = refr.mPos;
-
-        ESM::CreatureStats& cStats = mContext->mPlayer.mObject.mCreatureStats;
-        convertACDT(refr.mActorData.mACDT, cStats);
+    private:
+        std::string mSelectedSpell;
+    };
 
-        ESM::NpcStats& npcStats = mContext->mPlayer.mObject.mNpcStats;
-        convertNpcData(refr.mActorData, npcStats);
+    class ConvertPCDT : public Converter
+    {
+    public:
+        ConvertPCDT()
+            : mFirstPersonCam(true)
+            , mTeleportingEnabled(true)
+            , mLevitationEnabled(true)
+        {
+        }
 
-        mSelectedSpell = refr.mActorData.mSelectedSpell;
-        if (!refr.mActorData.mSelectedEnchantItem.empty())
+        void read(ESM::ESMReader& esm) override
         {
-            ESM::InventoryState& invState = mContext->mPlayer.mObject.mInventory;
+            PCDT pcdt;
+            pcdt.load(esm);
 
-            for (unsigned int i=0; i<invState.mItems.size(); ++i)
-            {
-                // FIXME: in case of conflict (multiple items with this refID) use the already equipped one?
-                if (Misc::StringUtils::ciEqual(invState.mItems[i].mRef.mRefID, refr.mActorData.mSelectedEnchantItem))
-                    invState.mSelectedEnchantItem = i;
-            }
+            convertPCDT(pcdt, mContext->mPlayer, mContext->mDialogueState.mKnownTopics, mFirstPersonCam,
+                mTeleportingEnabled, mLevitationEnabled, mContext->mControlsState);
+        }
+        void write(ESM::ESMWriter& esm) override
+        {
+            esm.startRecord(ESM::REC_ENAB);
+            esm.writeHNT("TELE", mTeleportingEnabled);
+            esm.writeHNT("LEVT", mLevitationEnabled);
+            esm.endRecord(ESM::REC_ENAB);
+
+            esm.startRecord(ESM::REC_CAM_);
+            esm.writeHNT("FIRS", mFirstPersonCam);
+            esm.endRecord(ESM::REC_CAM_);
         }
-    }
-    void write(ESM::ESMWriter& esm) override
-    {
-        esm.startRecord(ESM::REC_ASPL);
-        esm.writeHNString("ID__", mSelectedSpell);
-        esm.endRecord(ESM::REC_ASPL);
-    }
-private:
-    std::string mSelectedSpell;
-};
-
-class ConvertPCDT : public Converter
-{
-public:
-    ConvertPCDT()
-        : mFirstPersonCam(true),
-          mTeleportingEnabled(true),
-          mLevitationEnabled(true)
-    {}
-
-    void read(ESM::ESMReader &esm) override
-    {
-        PCDT pcdt;
-        pcdt.load(esm);
 
-        convertPCDT(pcdt, mContext->mPlayer, mContext->mDialogueState.mKnownTopics, mFirstPersonCam, mTeleportingEnabled, mLevitationEnabled, mContext->mControlsState);
-    }
-    void write(ESM::ESMWriter &esm) override
-    {
-        esm.startRecord(ESM::REC_ENAB);
-        esm.writeHNT("TELE", mTeleportingEnabled);
-        esm.writeHNT("LEVT", mLevitationEnabled);
-        esm.endRecord(ESM::REC_ENAB);
-
-        esm.startRecord(ESM::REC_CAM_);
-        esm.writeHNT("FIRS", mFirstPersonCam);
-        esm.endRecord(ESM::REC_CAM_);
-    }
-private:
-    bool mFirstPersonCam;
-    bool mTeleportingEnabled;
-    bool mLevitationEnabled;
-};
-
-class ConvertCNTC : public Converter
-{
-    void read(ESM::ESMReader &esm) override
+    private:
+        bool mFirstPersonCam;
+        bool mTeleportingEnabled;
+        bool mLevitationEnabled;
+    };
+
+    class ConvertCNTC : public Converter
     {
-        std::string id = esm.getHNString("NAME");
-        CNTC cntc;
-        cntc.load(esm);
-        mContext->mContainerChanges.insert(std::make_pair(std::make_pair(cntc.mIndex,id), cntc));
-    }
-};
-
-class ConvertCREC : public Converter
-{
-public:
-    void read(ESM::ESMReader &esm) override
+        void read(ESM::ESMReader& esm) override
+        {
+            std::string id = esm.getHNString("NAME");
+            CNTC cntc;
+            cntc.load(esm);
+            mContext->mContainerChanges.insert(std::make_pair(std::make_pair(cntc.mIndex, id), cntc));
+        }
+    };
+
+    class ConvertCREC : public Converter
     {
-        std::string id = esm.getHNString("NAME");
-        CREC crec;
-        crec.load(esm);
-        mContext->mCreatureChanges.insert(std::make_pair(std::make_pair(crec.mIndex,id), crec));
-    }
-};
-
-class ConvertFMAP : public Converter
-{
-public:
-    void read(ESM::ESMReader &esm) override;
-    void write(ESM::ESMWriter &esm) override;
+    public:
+        void read(ESM::ESMReader& esm) override
+        {
+            std::string id = esm.getHNString("NAME");
+            CREC crec;
+            crec.load(esm);
+            mContext->mCreatureChanges.insert(std::make_pair(std::make_pair(crec.mIndex, id), crec));
+        }
+    };
 
-private:
-    osg::ref_ptr<osg::Image> mGlobalMapImage;
-};
+    class ConvertFMAP : public Converter
+    {
+    public:
+        void read(ESM::ESMReader& esm) override;
+        void write(ESM::ESMWriter& esm) override;
 
-class ConvertCell : public Converter
-{
-public:
-    void read(ESM::ESMReader& esm) override;
-    void write(ESM::ESMWriter& esm) override;
+    private:
+        osg::ref_ptr<osg::Image> mGlobalMapImage;
+    };
 
-private:
-    struct Cell
+    class ConvertCell : public Converter
     {
-        ESM::Cell mCell;
-        std::vector<CellRef> mRefs;
-        std::vector<unsigned int> mFogOfWar;
-    };
+    public:
+        void read(ESM::ESMReader& esm) override;
+        void write(ESM::ESMWriter& esm) override;
 
-    std::map<std::string, Cell> mIntCells;
-    std::map<std::pair<int, int>, Cell> mExtCells;
+    private:
+        struct Cell
+        {
+            ESM::Cell mCell;
+            std::vector<CellRef> mRefs;
+            std::vector<unsigned int> mFogOfWar;
+        };
 
-    std::vector<ESM::CustomMarker> mMarkers;
+        std::map<std::string, Cell> mIntCells;
+        std::map<std::pair<int, int>, Cell> mExtCells;
 
-    void writeCell(const Cell& cell, ESM::ESMWriter &esm);
-};
+        std::vector<ESM::CustomMarker> mMarkers;
 
-class ConvertKLST : public Converter
-{
-public:
-    void read(ESM::ESMReader& esm) override
+        void writeCell(const Cell& cell, ESM::ESMWriter& esm);
+    };
+
+    class ConvertKLST : public Converter
     {
-        KLST klst;
-        klst.load(esm);
-        mKillCounter = klst.mKillCounter;
+    public:
+        void read(ESM::ESMReader& esm) override
+        {
+            KLST klst;
+            klst.load(esm);
+            mKillCounter = klst.mKillCounter;
 
-        mContext->mPlayer.mObject.mNpcStats.mWerewolfKills = klst.mWerewolfKills;
-    }
+            mContext->mPlayer.mObject.mNpcStats.mWerewolfKills = klst.mWerewolfKills;
+        }
 
-    void write(ESM::ESMWriter &esm) override
-    {
-        esm.startRecord(ESM::REC_DCOU);
-        for (auto it = mKillCounter.begin(); it != mKillCounter.end(); ++it)
+        void write(ESM::ESMWriter& esm) override
         {
-            esm.writeHNString("ID__", it->first);
-            esm.writeHNT ("COUN", it->second);
+            esm.startRecord(ESM::REC_DCOU);
+            for (auto it = mKillCounter.begin(); it != mKillCounter.end(); ++it)
+            {
+                esm.writeHNString("ID__", it->first);
+                esm.writeHNT("COUN", it->second);
+            }
+            esm.endRecord(ESM::REC_DCOU);
         }
-        esm.endRecord(ESM::REC_DCOU);
-    }
 
-private:
-    std::map<std::string, int> mKillCounter;
-};
+    private:
+        std::map<std::string, int> mKillCounter;
+    };
 
-class ConvertFACT : public Converter
-{
-public:
-    void read(ESM::ESMReader& esm) override
+    class ConvertFACT : public Converter
     {
-        ESM::Faction faction;
-        bool isDeleted = false;
+    public:
+        void read(ESM::ESMReader& esm) override
+        {
+            ESM::Faction faction;
+            bool isDeleted = false;
 
-        faction.load(esm, isDeleted);
-        std::string id = Misc::StringUtils::lowerCase(faction.mId);
+            faction.load(esm, isDeleted);
+            std::string id = Misc::StringUtils::lowerCase(faction.mId);
 
-        for (auto it = faction.mReactions.begin(); it != faction.mReactions.end(); ++it)
-        {
-            std::string faction2 = Misc::StringUtils::lowerCase(it->first);
-            mContext->mDialogueState.mChangedFactionReaction[id].insert(std::make_pair(faction2, it->second));
+            for (auto it = faction.mReactions.begin(); it != faction.mReactions.end(); ++it)
+            {
+                std::string faction2 = Misc::StringUtils::lowerCase(it->first);
+                mContext->mDialogueState.mChangedFactionReaction[id].insert(std::make_pair(faction2, it->second));
+            }
         }
-    }
-};
+    };
 
-/// Stolen items
-class ConvertSTLN : public Converter
-{
-public:
-    void read(ESM::ESMReader &esm) override
+    /// Stolen items
+    class ConvertSTLN : public Converter
     {
-        std::string itemid = esm.getHNString("NAME");
-        Misc::StringUtils::lowerCaseInPlace(itemid);
-
-        while (esm.isNextSub("FNAM") || esm.isNextSub("ONAM"))
+    public:
+        void read(ESM::ESMReader& esm) override
         {
-            if (esm.retSubName().toString() == "FNAM")
-            {
-                std::string factionid = esm.getHString();
-                mStolenItems[itemid].insert(std::make_pair(Misc::StringUtils::lowerCase(factionid), true));
-            }
-            else
+            std::string itemid = esm.getHNString("NAME");
+            Misc::StringUtils::lowerCaseInPlace(itemid);
+
+            while (esm.isNextSub("FNAM") || esm.isNextSub("ONAM"))
             {
-                std::string ownerid = esm.getHString();
-                mStolenItems[itemid].insert(std::make_pair(Misc::StringUtils::lowerCase(ownerid), false));
+                if (esm.retSubName().toString() == "FNAM")
+                {
+                    std::string factionid = esm.getHString();
+                    mStolenItems[itemid].insert(std::make_pair(Misc::StringUtils::lowerCase(factionid), true));
+                }
+                else
+                {
+                    std::string ownerid = esm.getHString();
+                    mStolenItems[itemid].insert(std::make_pair(Misc::StringUtils::lowerCase(ownerid), false));
+                }
             }
         }
-    }
-    void write(ESM::ESMWriter &esm) override
-    {
-        ESM::StolenItems items;
-        for (auto it = mStolenItems.begin(); it != mStolenItems.end(); ++it)
+        void write(ESM::ESMWriter& esm) override
         {
-            std::map<std::pair<std::string, bool>, int> owners;
-            for (const auto & ownerIt : it->second)
+            ESM::StolenItems items;
+            for (auto it = mStolenItems.begin(); it != mStolenItems.end(); ++it)
             {
-                owners.insert(std::make_pair(std::make_pair(ownerIt.first, ownerIt.second)
-                                             // Since OpenMW doesn't suffer from the owner contamination bug,
-                                             // it needs a count argument. But for legacy savegames, we don't know
-                                             // this count, so must assume all items of that ID are stolen,
-                                             // like vanilla MW did.
-                                             ,std::numeric_limits<int>::max()));
+                std::map<std::pair<std::string, bool>, int> owners;
+                for (const auto& ownerIt : it->second)
+                {
+                    owners.insert(std::make_pair(std::make_pair(ownerIt.first, ownerIt.second)
+                        // Since OpenMW doesn't suffer from the owner contamination bug,
+                        // it needs a count argument. But for legacy savegames, we don't know
+                        // this count, so must assume all items of that ID are stolen,
+                        // like vanilla MW did.
+                        ,
+                        std::numeric_limits<int>::max()));
+                }
+
+                items.mStolenItems.insert(std::make_pair(it->first, owners));
             }
 
-            items.mStolenItems.insert(std::make_pair(it->first, owners));
+            esm.startRecord(ESM::REC_STLN);
+            items.write(esm);
+            esm.endRecord(ESM::REC_STLN);
         }
 
-        esm.startRecord(ESM::REC_STLN);
-        items.write(esm);
-        esm.endRecord(ESM::REC_STLN);
-    }
-
-private:
-    typedef std::pair<std::string, bool> Owner; // <owner id, bool isFaction>
+    private:
+        typedef std::pair<std::string, bool> Owner; // <owner id, bool isFaction>
 
-    std::map<std::string, std::set<Owner> > mStolenItems;
-};
+        std::map<std::string, std::set<Owner>> mStolenItems;
+    };
 
-/// Seen responses for a dialogue topic?
-/// Each DIAL record is followed by a number of INFO records, I believe, just like in ESMs
-/// Dialogue conversion problems:
-/// - Journal is stored in one continuous HTML markup rather than each entry separately with associated info ID.
-/// - Seen dialogue responses only store the INFO id, rather than the fulltext.
-/// - Quest stages only store the INFO id, rather than the journal entry fulltext.
-class ConvertINFO : public Converter
-{
-public:
-    void read(ESM::ESMReader& esm) override
+    /// Seen responses for a dialogue topic?
+    /// Each DIAL record is followed by a number of INFO records, I believe, just like in ESMs
+    /// Dialogue conversion problems:
+    /// - Journal is stored in one continuous HTML markup rather than each entry separately with associated info ID.
+    /// - Seen dialogue responses only store the INFO id, rather than the fulltext.
+    /// - Quest stages only store the INFO id, rather than the journal entry fulltext.
+    class ConvertINFO : public Converter
     {
-        INFO info;
-        info.load(esm);
-    }
-};
+    public:
+        void read(ESM::ESMReader& esm) override
+        {
+            INFO info;
+            info.load(esm);
+        }
+    };
 
-class ConvertDIAL : public Converter
-{
-public:
-    void read(ESM::ESMReader& esm) override
+    class ConvertDIAL : public Converter
     {
-        std::string id = esm.getHNString("NAME");
-        DIAL dial;
-        dial.load(esm);
-        if (dial.mIndex > 0)
-            mDials[id] = dial;
-    }
-    void write(ESM::ESMWriter &esm) override
-    {
-        for (auto it = mDials.begin(); it != mDials.end(); ++it)
-        {
-            esm.startRecord(ESM::REC_QUES);
-            ESM::QuestState state;
-            state.mFinished = 0;
-            state.mState = it->second.mIndex;
-            state.mTopic = Misc::StringUtils::lowerCase(it->first);
-            state.save(esm);
-            esm.endRecord(ESM::REC_QUES);
+    public:
+        void read(ESM::ESMReader& esm) override
+        {
+            std::string id = esm.getHNString("NAME");
+            DIAL dial;
+            dial.load(esm);
+            if (dial.mIndex > 0)
+                mDials[id] = dial;
+        }
+        void write(ESM::ESMWriter& esm) override
+        {
+            for (auto it = mDials.begin(); it != mDials.end(); ++it)
+            {
+                esm.startRecord(ESM::REC_QUES);
+                ESM::QuestState state;
+                state.mFinished = 0;
+                state.mState = it->second.mIndex;
+                state.mTopic = Misc::StringUtils::lowerCase(it->first);
+                state.save(esm);
+                esm.endRecord(ESM::REC_QUES);
+            }
         }
-    }
-private:
-    std::map<std::string, DIAL> mDials;
-};
 
-class ConvertQUES : public Converter
-{
-public:
-    void read(ESM::ESMReader& esm) override
-    {
-        std::string id = esm.getHNString("NAME");
-        QUES quest;
-        quest.load(esm);
-    }
-};
+    private:
+        std::map<std::string, DIAL> mDials;
+    };
 
-class ConvertJOUR : public Converter
-{
-public:
-    void read(ESM::ESMReader& esm) override
+    class ConvertQUES : public Converter
     {
-        JOUR journal;
-        journal.load(esm);
-    }
-};
+    public:
+        void read(ESM::ESMReader& esm) override
+        {
+            std::string id = esm.getHNString("NAME");
+            QUES quest;
+            quest.load(esm);
+        }
+    };
 
-class ConvertGAME : public Converter
-{
-public:
-    ConvertGAME()
-        : mHasGame(false)
+    class ConvertJOUR : public Converter
     {
-    }
+    public:
+        void read(ESM::ESMReader& esm) override
+        {
+            JOUR journal;
+            journal.load(esm);
+        }
+    };
 
-    void read(ESM::ESMReader &esm) override
+    class ConvertGAME : public Converter
     {
-        mGame.load(esm);
-        mHasGame = true;
-    }
+    public:
+        ConvertGAME()
+            : mHasGame(false)
+        {
+        }
 
-    int validateWeatherID(int weatherID)
-    {
-        if(weatherID >= -1 && weatherID < 10)
+        void read(ESM::ESMReader& esm) override
         {
-            return weatherID;
+            mGame.load(esm);
+            mHasGame = true;
         }
-        else
+
+        int validateWeatherID(int weatherID)
         {
-            throw std::runtime_error("Invalid weather ID: " + std::to_string(weatherID));
+            if (weatherID >= -1 && weatherID < 10)
+            {
+                return weatherID;
+            }
+            else
+            {
+                throw std::runtime_error("Invalid weather ID: " + std::to_string(weatherID));
+            }
         }
-    }
 
-    void write(ESM::ESMWriter &esm) override
-    {
-        if (!mHasGame)
-            return;
-        esm.startRecord(ESM::REC_WTHR);
-        ESM::WeatherState weather;
-        weather.mTimePassed = 0.0f;
-        weather.mFastForward = false;
-        weather.mWeatherUpdateTime = mGame.mGMDT.mTimeOfNextTransition - mContext->mHour;
-        weather.mTransitionFactor = 1 - (mGame.mGMDT.mWeatherTransition / 100.0f);
-        weather.mCurrentWeather = validateWeatherID(mGame.mGMDT.mCurrentWeather);
-        weather.mNextWeather = validateWeatherID(mGame.mGMDT.mNextWeather);
-        weather.mQueuedWeather = -1;
-        // TODO: Determine how ModRegion modifiers are saved in Morrowind.
-        weather.save(esm);
-        esm.endRecord(ESM::REC_WTHR);
-    }
-
-private:
-    bool mHasGame;
-    GAME mGame;
-};
-
-/// Running global script
-class ConvertSCPT : public Converter
-{
-public:
-    void read(ESM::ESMReader &esm) override
-    {
-        SCPT script;
-        script.load(esm);
-        ESM::GlobalScript out;
-        convertSCPT(script, out);
-        mScripts.push_back(out);
-    }
-    void write(ESM::ESMWriter &esm) override
+        void write(ESM::ESMWriter& esm) override
+        {
+            if (!mHasGame)
+                return;
+            esm.startRecord(ESM::REC_WTHR);
+            ESM::WeatherState weather;
+            weather.mTimePassed = 0.0f;
+            weather.mFastForward = false;
+            weather.mWeatherUpdateTime = mGame.mGMDT.mTimeOfNextTransition - mContext->mHour;
+            weather.mTransitionFactor = 1 - (mGame.mGMDT.mWeatherTransition / 100.0f);
+            weather.mCurrentWeather = validateWeatherID(mGame.mGMDT.mCurrentWeather);
+            weather.mNextWeather = validateWeatherID(mGame.mGMDT.mNextWeather);
+            weather.mQueuedWeather = -1;
+            // TODO: Determine how ModRegion modifiers are saved in Morrowind.
+            weather.save(esm);
+            esm.endRecord(ESM::REC_WTHR);
+        }
+
+    private:
+        bool mHasGame;
+        GAME mGame;
+    };
+
+    /// Running global script
+    class ConvertSCPT : public Converter
     {
-        for (const auto & script : mScripts)
+    public:
+        void read(ESM::ESMReader& esm) override
         {
-            esm.startRecord(ESM::REC_GSCR);
-            script.save(esm);
-            esm.endRecord(ESM::REC_GSCR);
+            SCPT script;
+            script.load(esm);
+            ESM::GlobalScript out;
+            convertSCPT(script, out);
+            mScripts.push_back(out);
+        }
+        void write(ESM::ESMWriter& esm) override
+        {
+            for (const auto& script : mScripts)
+            {
+                esm.startRecord(ESM::REC_GSCR);
+                script.save(esm);
+                esm.endRecord(ESM::REC_GSCR);
+            }
         }
-    }
-private:
-    std::vector<ESM::GlobalScript> mScripts;
-};
 
-/// Projectile converter
-class ConvertPROJ : public Converter
-{
-public:
-    int getStage() override { return 2; }
-    void read(ESM::ESMReader& esm) override;
-    void write(ESM::ESMWriter& esm) override;
-private:
-    void convertBaseState(ESM::BaseProjectileState& base, const PROJ::PNAM& pnam);
-    PROJ mProj;
-};
-
-class ConvertSPLM : public Converter
-{
-public:
-    void read(ESM::ESMReader& esm) override;
-    void write(ESM::ESMWriter& esm) override;
-private:
-    SPLM mSPLM;
-};
+    private:
+        std::vector<ESM::GlobalScript> mScripts;
+    };
+
+    /// Projectile converter
+    class ConvertPROJ : public Converter
+    {
+    public:
+        int getStage() override { return 2; }
+        void read(ESM::ESMReader& esm) override;
+        void write(ESM::ESMWriter& esm) override;
+
+    private:
+        void convertBaseState(ESM::BaseProjectileState& base, const PROJ::PNAM& pnam);
+        PROJ mProj;
+    };
+
+    class ConvertSPLM : public Converter
+    {
+    public:
+        void read(ESM::ESMReader& esm) override;
+        void write(ESM::ESMWriter& esm) override;
+
+    private:
+        SPLM mSPLM;
+    };
 
 }
 
diff --git a/apps/essimporter/convertinventory.cpp b/apps/essimporter/convertinventory.cpp
index 002cb4a4cf..484b9d1130 100644
--- a/apps/essimporter/convertinventory.cpp
+++ b/apps/essimporter/convertinventory.cpp
@@ -7,17 +7,17 @@
 namespace ESSImport
 {
 
-    void convertInventory(const Inventory &inventory, ESM::InventoryState &state)
+    void convertInventory(const Inventory& inventory, ESM::InventoryState& state)
     {
         int index = 0;
-        for (const auto & item : inventory.mItems)
+        for (const auto& item : inventory.mItems)
         {
             ESM::ObjectState objstate;
             objstate.blank();
             objstate.mRef = item;
             objstate.mRef.mRefID = Misc::StringUtils::lowerCase(item.mId);
             objstate.mCount = std::abs(item.mCount); // restocking items have negative count in the savefile
-                                                    // openmw handles them differently, so no need to set any flags
+                                                     // openmw handles them differently, so no need to set any flags
             state.mItems.push_back(objstate);
             if (item.mRelativeEquipmentSlot != -1)
                 // Note we should really write the absolute slot here, which we do not know about
diff --git a/apps/essimporter/convertinventory.hpp b/apps/essimporter/convertinventory.hpp
index 95d134d4fc..baa10d4414 100644
--- a/apps/essimporter/convertinventory.hpp
+++ b/apps/essimporter/convertinventory.hpp
@@ -8,7 +8,7 @@
 namespace ESSImport
 {
 
-    void convertInventory (const Inventory& inventory, ESM::InventoryState& state);
+    void convertInventory(const Inventory& inventory, ESM::InventoryState& state);
 
 }
 
diff --git a/apps/essimporter/convertnpcc.cpp b/apps/essimporter/convertnpcc.cpp
index 48d3d9232e..f049edd8d7 100644
--- a/apps/essimporter/convertnpcc.cpp
+++ b/apps/essimporter/convertnpcc.cpp
@@ -5,7 +5,7 @@
 namespace ESSImport
 {
 
-    void convertNPCC(const NPCC &npcc, ESM::NpcState &npcState)
+    void convertNPCC(const NPCC& npcc, ESM::NpcState& npcState)
     {
         npcState.mNpcStats.mDisposition = npcc.mNPDT.mDisposition;
         npcState.mNpcStats.mReputation = npcc.mNPDT.mReputation;
diff --git a/apps/essimporter/convertnpcc.hpp b/apps/essimporter/convertnpcc.hpp
index d0a395e33e..f0c35b72ab 100644
--- a/apps/essimporter/convertnpcc.hpp
+++ b/apps/essimporter/convertnpcc.hpp
@@ -8,7 +8,7 @@
 namespace ESSImport
 {
 
-    void convertNPCC (const NPCC& npcc, ESM::NpcState& npcState);
+    void convertNPCC(const NPCC& npcc, ESM::NpcState& npcState);
 
 }
 
diff --git a/apps/essimporter/convertplayer.cpp b/apps/essimporter/convertplayer.cpp
index 34dac06fab..3cb12c2f3a 100644
--- a/apps/essimporter/convertplayer.cpp
+++ b/apps/essimporter/convertplayer.cpp
@@ -8,13 +8,15 @@
 namespace ESSImport
 {
 
-    void convertPCDT(const PCDT& pcdt, ESM::Player& out, std::vector<std::string>& outDialogueTopics, bool& firstPersonCam, bool& teleportingEnabled, bool& levitationEnabled, ESM::ControlsState& controls)
+    void convertPCDT(const PCDT& pcdt, ESM::Player& out, std::vector<std::string>& outDialogueTopics,
+        bool& firstPersonCam, bool& teleportingEnabled, bool& levitationEnabled, ESM::ControlsState& controls)
     {
-        out.mObject.mPosition.rot[0] = -atan2(pcdt.mPNAM.mVerticalRotation.mData[2][1], pcdt.mPNAM.mVerticalRotation.mData[2][2]);
+        out.mObject.mPosition.rot[0]
+            = -atan2(pcdt.mPNAM.mVerticalRotation.mData[2][1], pcdt.mPNAM.mVerticalRotation.mData[2][2]);
 
         out.mBirthsign = pcdt.mBirthsign;
         out.mObject.mNpcStats.mBounty = pcdt.mBounty;
-        for (const auto & essFaction : pcdt.mFactions)
+        for (const auto& essFaction : pcdt.mFactions)
         {
             ESM::NpcStats::Faction faction;
             faction.mExpelled = (essFaction.mFlags & 0x2) != 0;
@@ -22,11 +24,11 @@ namespace ESSImport
             faction.mReputation = essFaction.mReputation;
             out.mObject.mNpcStats.mFactions[Misc::StringUtils::lowerCase(essFaction.mFactionName.toString())] = faction;
         }
-        for (int i=0; i<3; ++i)
+        for (int i = 0; i < 3; ++i)
             out.mObject.mNpcStats.mSpecIncreases[i] = pcdt.mPNAM.mSpecIncreases[i];
-        for (int i=0; i<8; ++i)
+        for (int i = 0; i < 8; ++i)
             out.mObject.mNpcStats.mSkillIncrease[i] = pcdt.mPNAM.mSkillIncreases[i];
-        for (int i=0; i<27; ++i)
+        for (int i = 0; i < 27; ++i)
             out.mObject.mNpcStats.mSkills[i].mProgress = pcdt.mPNAM.mSkillProgress[i];
         out.mObject.mNpcStats.mLevelProgress = pcdt.mPNAM.mLevelProgress;
 
@@ -39,7 +41,7 @@ namespace ESSImport
         teleportingEnabled = !(pcdt.mPNAM.mPlayerFlags & PCDT::PlayerFlags_TeleportingDisabled);
         levitationEnabled = !(pcdt.mPNAM.mPlayerFlags & PCDT::PlayerFlags_LevitationDisabled);
 
-        for (const auto & knownDialogueTopic : pcdt.mKnownDialogueTopics)
+        for (const auto& knownDialogueTopic : pcdt.mKnownDialogueTopics)
         {
             outDialogueTopics.push_back(Misc::StringUtils::lowerCase(knownDialogueTopic));
         }
diff --git a/apps/essimporter/convertplayer.hpp b/apps/essimporter/convertplayer.hpp
index 73c98309f8..864a7d8540 100644
--- a/apps/essimporter/convertplayer.hpp
+++ b/apps/essimporter/convertplayer.hpp
@@ -3,13 +3,14 @@
 
 #include "importplayer.hpp"
 
-#include <components/esm3/player.hpp>
 #include <components/esm3/controlsstate.hpp>
+#include <components/esm3/player.hpp>
 
 namespace ESSImport
 {
 
-    void convertPCDT(const PCDT& pcdt, ESM::Player& out, std::vector<std::string>& outDialogueTopics, bool& firstPersonCam, bool& teleportingEnabled, bool& levitationEnabled, ESM::ControlsState& controls);
+    void convertPCDT(const PCDT& pcdt, ESM::Player& out, std::vector<std::string>& outDialogueTopics,
+        bool& firstPersonCam, bool& teleportingEnabled, bool& levitationEnabled, ESM::ControlsState& controls);
 
 }
 
diff --git a/apps/essimporter/convertscpt.cpp b/apps/essimporter/convertscpt.cpp
index 45cc24db1f..9d03ae3d3c 100644
--- a/apps/essimporter/convertscpt.cpp
+++ b/apps/essimporter/convertscpt.cpp
@@ -7,7 +7,7 @@
 namespace ESSImport
 {
 
-    void convertSCPT(const SCPT &scpt, ESM::GlobalScript &out)
+    void convertSCPT(const SCPT& scpt, ESM::GlobalScript& out)
     {
         out.mId = Misc::StringUtils::lowerCase(scpt.mSCHD.mName.toString());
         out.mRunning = scpt.mRunning;
diff --git a/apps/essimporter/convertscpt.hpp b/apps/essimporter/convertscpt.hpp
index f4a4e34fe4..854cf7c9a0 100644
--- a/apps/essimporter/convertscpt.hpp
+++ b/apps/essimporter/convertscpt.hpp
@@ -8,7 +8,7 @@
 namespace ESSImport
 {
 
-void convertSCPT(const SCPT& scpt, ESM::GlobalScript& out);
+    void convertSCPT(const SCPT& scpt, ESM::GlobalScript& out);
 
 }
 
diff --git a/apps/essimporter/convertscri.cpp b/apps/essimporter/convertscri.cpp
index eba48df77d..1dbe476e2b 100644
--- a/apps/essimporter/convertscri.cpp
+++ b/apps/essimporter/convertscri.cpp
@@ -19,12 +19,12 @@ namespace
 namespace ESSImport
 {
 
-    void convertSCRI(const SCRI &scri, ESM::Locals &locals)
+    void convertSCRI(const SCRI& scri, ESM::Locals& locals)
     {
         // order *is* important, as we do not have variable names available in this format
-        storeVariables<short, ESM::VT_Short> (scri.mShorts, locals, scri.mScript);
-        storeVariables<int, ESM::VT_Int> (scri.mLongs, locals, scri.mScript);
-        storeVariables<float, ESM::VT_Float> (scri.mFloats, locals, scri.mScript);
+        storeVariables<short, ESM::VT_Short>(scri.mShorts, locals, scri.mScript);
+        storeVariables<int, ESM::VT_Int>(scri.mLongs, locals, scri.mScript);
+        storeVariables<float, ESM::VT_Float>(scri.mFloats, locals, scri.mScript);
     }
 
 }
diff --git a/apps/essimporter/convertscri.hpp b/apps/essimporter/convertscri.hpp
index 3908dbacf2..4a1026c399 100644
--- a/apps/essimporter/convertscri.hpp
+++ b/apps/essimporter/convertscri.hpp
@@ -9,7 +9,7 @@ namespace ESSImport
 {
 
     /// Convert script variable assignments
-    void convertSCRI (const SCRI& scri, ESM::Locals& locals);
+    void convertSCRI(const SCRI& scri, ESM::Locals& locals);
 
 }
 
diff --git a/apps/essimporter/importacdt.hpp b/apps/essimporter/importacdt.hpp
index 933cf0f577..785e988200 100644
--- a/apps/essimporter/importacdt.hpp
+++ b/apps/essimporter/importacdt.hpp
@@ -38,7 +38,8 @@ namespace ESSImport
         float mDynamic[3][2];
         unsigned char mUnknown3[16];
         float mAttributes[8][2];
-        float mMagicEffects[27]; // Effect attributes: https://wiki.openmw.org/index.php?title=Research:Magic#Effect_attributes
+        float mMagicEffects[27]; // Effect attributes:
+                                 // https://wiki.openmw.org/index.php?title=Research:Magic#Effect_attributes
         unsigned char mUnknown4[4];
         unsigned int mGoldPool;
         unsigned char mCountDown; // seen the same value as in ACSC.mCorpseClearCountdown, maybe
diff --git a/apps/essimporter/importcellref.cpp b/apps/essimporter/importcellref.cpp
index 3de1f73e70..0af765d4a8 100644
--- a/apps/essimporter/importcellref.cpp
+++ b/apps/essimporter/importcellref.cpp
@@ -5,7 +5,7 @@
 namespace ESSImport
 {
 
-    void CellRef::load(ESM::ESMReader &esm)
+    void CellRef::load(ESM::ESMReader& esm)
     {
         blank();
 
@@ -13,7 +13,7 @@ namespace ESSImport
 
         // this is required since openmw supports more than 255 content files
         int pluginIndex = (mRefNum.mIndex & 0xff000000) >> 24;
-        mRefNum.mContentFile = pluginIndex-1;
+        mRefNum.mContentFile = pluginIndex - 1;
         mRefNum.mIndex &= 0x00ffffff;
 
         mIndexedRefId = esm.getHNString("NAME");
@@ -39,7 +39,7 @@ namespace ESSImport
             esm.skipHSub();
 
         if (esm.isNextSub("MNAM"))
-           esm.skipHSub();
+            esm.skipHSub();
 
         bool isDeleted = false;
         ESM::CellRef::loadData(esm, isDeleted);
@@ -123,10 +123,10 @@ namespace ESSImport
 
         // FIXME: not all actors have this, add flag
         if (esm.isNextSub("CHRD")) // npc only
-            esm.getHExact(mActorData.mSkills, 27*2*sizeof(int));
+            esm.getHExact(mActorData.mSkills, 27 * 2 * sizeof(int));
 
         if (esm.isNextSub("CRED")) // creature only
-            esm.getHExact(mActorData.mCombatStats, 3*2*sizeof(int));
+            esm.getHExact(mActorData.mCombatStats, 3 * 2 * sizeof(int));
 
         mActorData.mSCRI.load(esm);
 
@@ -146,7 +146,7 @@ namespace ESSImport
             // probably some identifier for the creature that has been spawned?
             unsigned char lvcr;
             esm.getHT(lvcr);
-            //std::cout << "LVCR: " << (int)lvcr << std::endl;
+            // std::cout << "LVCR: " << (int)lvcr << std::endl;
         }
 
         mEnabled = true;
diff --git a/apps/essimporter/importcntc.cpp b/apps/essimporter/importcntc.cpp
index a4b54ca7b4..41f4e50101 100644
--- a/apps/essimporter/importcntc.cpp
+++ b/apps/essimporter/importcntc.cpp
@@ -5,7 +5,7 @@
 namespace ESSImport
 {
 
-    void CNTC::load(ESM::ESMReader &esm)
+    void CNTC::load(ESM::ESMReader& esm)
     {
         mIndex = 0;
         esm.getHNT(mIndex, "INDX");
diff --git a/apps/essimporter/importcrec.cpp b/apps/essimporter/importcrec.cpp
index 6cef13333b..38ebd724f7 100644
--- a/apps/essimporter/importcrec.cpp
+++ b/apps/essimporter/importcrec.cpp
@@ -5,7 +5,7 @@
 namespace ESSImport
 {
 
-    void CREC::load(ESM::ESMReader &esm)
+    void CREC::load(ESM::ESMReader& esm)
     {
         esm.getHNT(mIndex, "INDX");
 
@@ -14,9 +14,8 @@ namespace ESSImport
         float scale;
         esm.getHNOT(scale, "XSCL");
 
-
         while (esm.isNextSub("AI_W") || esm.isNextSub("AI_E") || esm.isNextSub("AI_T") || esm.isNextSub("AI_F")
-               || esm.isNextSub("AI_A"))
+            || esm.isNextSub("AI_A"))
             mAiPackages.add(esm);
 
         mInventory.load(esm);
diff --git a/apps/essimporter/importdial.cpp b/apps/essimporter/importdial.cpp
index 1467e43365..6c45f9d059 100644
--- a/apps/essimporter/importdial.cpp
+++ b/apps/essimporter/importdial.cpp
@@ -5,7 +5,7 @@
 namespace ESSImport
 {
 
-    void DIAL::load(ESM::ESMReader &esm)
+    void DIAL::load(ESM::ESMReader& esm)
     {
         // See ESM::Dialogue::Type enum, not sure why we would need this here though
         int type = 0;
diff --git a/apps/essimporter/importer.cpp b/apps/essimporter/importer.cpp
index 5bc8079bd1..179e31adbd 100644
--- a/apps/essimporter/importer.cpp
+++ b/apps/essimporter/importer.cpp
@@ -1,26 +1,26 @@
 #include "importer.hpp"
 
-#include <iomanip>
 #include <filesystem>
 #include <fstream>
+#include <iomanip>
 
-#include <osgDB/ReadFile>
 #include <osg/ImageUtils>
+#include <osgDB/ReadFile>
 
+#include <components/esm/defs.hpp>
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/esmwriter.hpp>
-#include <components/esm/defs.hpp>
 
-#include <components/esm3/savedgame.hpp>
 #include <components/esm3/player.hpp>
+#include <components/esm3/savedgame.hpp>
 
 #include <components/esm3/loadalch.hpp>
-#include <components/esm3/loadspel.hpp>
 #include <components/esm3/loadarmo.hpp>
-#include <components/esm3/loadweap.hpp>
 #include <components/esm3/loadclot.hpp>
 #include <components/esm3/loadench.hpp>
 #include <components/esm3/loadlevlist.hpp>
+#include <components/esm3/loadspel.hpp>
+#include <components/esm3/loadweap.hpp>
 
 #include <components/misc/constants.hpp>
 
@@ -35,25 +35,25 @@ namespace
 
     void writeScreenshot(const ESM::Header& fileHeader, ESM::SavedGame& out)
     {
-        if (fileHeader.mSCRS.size() != 128*128*4)
+        if (fileHeader.mSCRS.size() != 128 * 128 * 4)
         {
             std::cerr << "Error: unexpected screenshot size " << std::endl;
             return;
         }
 
-        osg::ref_ptr<osg::Image> image (new osg::Image);
+        osg::ref_ptr<osg::Image> image(new osg::Image);
         image->allocateImage(128, 128, 1, GL_RGB, GL_UNSIGNED_BYTE);
 
         // need to convert pixel format from BGRA to RGB as the jpg readerwriter doesn't support it otherwise
         auto it = fileHeader.mSCRS.begin();
-        for (int y=0; y<128; ++y)
+        for (int y = 0; y < 128; ++y)
         {
-            for (int x=0; x<128; ++x)
+            for (int x = 0; x < 128; ++x)
             {
-                assert(image->data(x,y));
-                *(image->data(x,y)+2) = *it++;
-                *(image->data(x,y)+1) = *it++;
-                *image->data(x,y) = *it++;
+                assert(image->data(x, y));
+                *(image->data(x, y) + 2) = *it++;
+                *(image->data(x, y) + 1) = *it++;
+                *image->data(x, y) = *it++;
                 ++it; // skip alpha
             }
         }
@@ -72,7 +72,8 @@ namespace
         osgDB::ReaderWriter::WriteResult result = readerwriter->writeImage(*image, ostream);
         if (!result.success())
         {
-            std::cerr << "Error: can't write screenshot: " << result.message() << " code " << result.status() << std::endl;
+            std::cerr << "Error: can't write screenshot: " << result.message() << " code " << result.status()
+                      << std::endl;
             return;
         }
 
@@ -85,12 +86,12 @@ namespace
 namespace ESSImport
 {
 
-    Importer::Importer(const std::filesystem::path &essfile, const std::filesystem::path &outfile, const std::string &encoding)
+    Importer::Importer(
+        const std::filesystem::path& essfile, const std::filesystem::path& outfile, const std::string& encoding)
         : mEssFile(essfile)
         , mOutFile(outfile)
         , mEncoding(encoding)
     {
-
     }
 
     struct File
@@ -112,7 +113,7 @@ namespace ESSImport
         std::vector<Record> mRecords;
     };
 
-    void read(const std::filesystem::path &filename, File& file)
+    void read(const std::filesystem::path& filename, File& file)
     {
         ESM::ESMReader esm;
         esm.open(filename);
@@ -143,14 +144,14 @@ namespace ESSImport
     void Importer::compare()
     {
         // data that always changes (and/or is already fully decoded) should be blacklisted
-        std::set<std::pair<std::string, std::string> > blacklist;
+        std::set<std::pair<std::string, std::string>> blacklist;
         blacklist.insert(std::make_pair("GLOB", "FLTV")); // gamehour
         blacklist.insert(std::make_pair("REFR", "DATA")); // player position
         blacklist.insert(std::make_pair("CELL", "NAM8")); // fog of war
         blacklist.insert(std::make_pair("GAME", "GMDT")); // weather data, current time always changes
         blacklist.insert(std::make_pair("CELL", "DELE")); // first 3 bytes are uninitialized
 
-         // this changes way too often, name suggests some renderer internal data?
+        // this changes way too often, name suggests some renderer internal data?
         blacklist.insert(std::make_pair("CELL", "ND3D"));
         blacklist.insert(std::make_pair("REFR", "ND3D"));
 
@@ -160,7 +161,7 @@ namespace ESSImport
         read(mOutFile, file2); // todo rename variable
 
         // FIXME: use max(size1, size2)
-        for (unsigned int i=0; i<file1.mRecords.size(); ++i)
+        for (unsigned int i = 0; i < file1.mRecords.size(); ++i)
         {
             File::Record rec = file1.mRecords[i];
 
@@ -183,14 +184,15 @@ namespace ESSImport
             }
 
             // FIXME: use max(size1, size2)
-            for (unsigned int j=0; j<rec.mSubrecords.size(); ++j)
+            for (unsigned int j = 0; j < rec.mSubrecords.size(); ++j)
             {
                 File::Subrecord sub = rec.mSubrecords[j];
 
                 if (j >= rec2.mSubrecords.size())
                 {
                     std::ios::fmtflags f(std::cout.flags());
-                    std::cout << "Subrecord in file1 not present in file2: (1) 0x" << std::hex << sub.mFileOffset << std::endl;
+                    std::cout << "Subrecord in file1 not present in file2: (1) 0x" << std::hex << sub.mFileOffset
+                              << std::endl;
                     std::cout.flags(f);
                     return;
                 }
@@ -200,8 +202,9 @@ namespace ESSImport
                 if (sub.mName != sub2.mName)
                 {
                     std::ios::fmtflags f(std::cout.flags());
-                    std::cout << "Different subrecord name (" << rec.mName << "." << sub.mName << " vs. " << sub2.mName << ") at (1) 0x" << std::hex << sub.mFileOffset
-                              << " (2) 0x" << sub2.mFileOffset << std::endl;
+                    std::cout << "Different subrecord name (" << rec.mName << "." << sub.mName << " vs. " << sub2.mName
+                              << ") at (1) 0x" << std::hex << sub.mFileOffset << " (2) 0x" << sub2.mFileOffset
+                              << std::endl;
                     std::cout.flags(f);
                     break; // TODO: try to recover
                 }
@@ -213,11 +216,11 @@ namespace ESSImport
 
                     std::ios::fmtflags f(std::cout.flags());
 
-                    std::cout << "Different subrecord data for " << rec.mName << "." << sub.mName << " at (1) 0x" << std::hex << sub.mFileOffset
-                              << " (2) 0x" << sub2.mFileOffset << std::endl;
+                    std::cout << "Different subrecord data for " << rec.mName << "." << sub.mName << " at (1) 0x"
+                              << std::hex << sub.mFileOffset << " (2) 0x" << sub2.mFileOffset << std::endl;
 
                     std::cout << "Data 1:" << std::endl;
-                    for (unsigned int k=0; k<sub.mData.size(); ++k)
+                    for (unsigned int k = 0; k < sub.mData.size(); ++k)
                     {
                         bool different = false;
                         if (k >= sub2.mData.size() || sub2.mData[k] != sub.mData[k])
@@ -232,7 +235,7 @@ namespace ESSImport
                     std::cout << std::endl;
 
                     std::cout << "Data 2:" << std::endl;
-                    for (unsigned int k=0; k<sub2.mData.size(); ++k)
+                    for (unsigned int k = 0; k < sub2.mData.size(); ++k)
                     {
                         bool different = false;
                         if (k >= sub.mData.size() || sub.mData[k] != sub2.mData[k])
@@ -279,12 +282,12 @@ namespace ESSImport
         converters[ESM::REC_CREA] = std::make_unique<ConvertCREA>();
         converters[ESM::REC_NPCC] = std::make_unique<ConvertNPCC>();
         converters[ESM::REC_CREC] = std::make_unique<ConvertCREC>();
-        converters[recREFR      ] = std::make_unique<ConvertREFR>();
-        converters[recPCDT      ] = std::make_unique<ConvertPCDT>();
-        converters[recFMAP      ] = std::make_unique<ConvertFMAP>();
-        converters[recKLST      ] = std::make_unique<ConvertKLST>();
-        converters[recSTLN      ] = std::make_unique<ConvertSTLN>();
-        converters[recGAME      ] = std::make_unique<ConvertGAME>();
+        converters[recREFR] = std::make_unique<ConvertREFR>();
+        converters[recPCDT] = std::make_unique<ConvertPCDT>();
+        converters[recFMAP] = std::make_unique<ConvertFMAP>();
+        converters[recKLST] = std::make_unique<ConvertKLST>();
+        converters[recSTLN] = std::make_unique<ConvertSTLN>();
+        converters[recGAME] = std::make_unique<ConvertGAME>();
         converters[ESM::REC_CELL] = std::make_unique<ConvertCell>();
         converters[ESM::REC_ALCH] = std::make_unique<DefaultConverter<ESM::Potion>>();
         converters[ESM::REC_CLAS] = std::make_unique<ConvertClass>();
@@ -301,7 +304,7 @@ namespace ESSImport
         converters[ESM::REC_INFO] = std::make_unique<ConvertINFO>();
         converters[ESM::REC_DIAL] = std::make_unique<ConvertDIAL>();
         converters[ESM::REC_QUES] = std::make_unique<ConvertQUES>();
-        converters[recJOUR      ] = std::make_unique<ConvertJOUR>();
+        converters[recJOUR] = std::make_unique<ConvertJOUR>();
         converters[ESM::REC_SCPT] = std::make_unique<ConvertSCPT>();
         converters[ESM::REC_PROJ] = std::make_unique<ConvertPROJ>();
         converters[recSPLM] = std::make_unique<ConvertSPLM>();
@@ -313,7 +316,7 @@ namespace ESSImport
 
         std::set<unsigned int> unknownRecords;
 
-        for (const auto & converter : converters)
+        for (const auto& converter : converters)
         {
             converter.second->setContext(context);
         }
@@ -333,7 +336,8 @@ namespace ESSImport
                 if (unknownRecords.insert(n.toInt()).second)
                 {
                     std::ios::fmtflags f(std::cerr.flags());
-                    std::cerr << "Error: unknown record " << n.toString() << " (0x" << std::hex << esm.getFileOffset() << ")" << std::endl;
+                    std::cerr << "Error: unknown record " << n.toString() << " (0x" << std::hex << esm.getFileOffset()
+                              << ")" << std::endl;
                     std::cerr.flags(f);
                 }
 
@@ -343,7 +347,7 @@ namespace ESSImport
 
         ESM::ESMWriter writer;
 
-        writer.setFormat (ESM::SavedGame::sCurrentFormat);
+        writer.setFormat(ESM::SavedGame::sCurrentFormat);
 
         std::ofstream stream(mOutFile, std::ios::out | std::ios::binary);
         // all unused
@@ -351,15 +355,15 @@ namespace ESSImport
         writer.setType(0);
         writer.setAuthor("");
         writer.setDescription("");
-        writer.setRecordCount (0);
+        writer.setRecordCount(0);
 
-        for (const auto & master : header.mMaster)
+        for (const auto& master : header.mMaster)
             writer.addMaster(master.name, 0); // not using the size information anyway -> use value of 0
 
-        writer.save (stream);
+        writer.save(stream);
 
         ESM::SavedGame profile;
-        for (const auto & master : header.mMaster)
+        for (const auto& master : header.mMaster)
         {
             profile.mContentFiles.push_back(master.name);
         }
@@ -379,14 +383,13 @@ namespace ESSImport
 
         writeScreenshot(header, profile);
 
-        writer.startRecord (ESM::REC_SAVE);
-        profile.save (writer);
-        writer.endRecord (ESM::REC_SAVE);
+        writer.startRecord(ESM::REC_SAVE);
+        profile.save(writer);
+        writer.endRecord(ESM::REC_SAVE);
 
         // Writing order should be Dynamic Store -> Cells -> Player,
         // so that references to dynamic records can be recognized when loading
-        for (auto it = converters.begin();
-             it != converters.end(); ++it)
+        for (auto it = converters.begin(); it != converters.end(); ++it)
         {
             if (it->second->getStage() != 0)
                 continue;
@@ -398,8 +401,7 @@ namespace ESSImport
         context.mPlayerBase.save(writer);
         writer.endRecord(ESM::REC_NPC_);
 
-        for (auto it = converters.begin();
-             it != converters.end(); ++it)
+        for (auto it = converters.begin(); it != converters.end(); ++it)
         {
             if (it->second->getStage() != 1)
                 continue;
@@ -410,8 +412,10 @@ namespace ESSImport
         if (context.mPlayer.mCellId.mPaged)
         {
             // exterior cell -> determine cell coordinates based on position
-            int cellX = static_cast<int>(std::floor(context.mPlayer.mObject.mPosition.pos[0] / Constants::CellSizeInUnits));
-            int cellY = static_cast<int>(std::floor(context.mPlayer.mObject.mPosition.pos[1] / Constants::CellSizeInUnits));
+            int cellX
+                = static_cast<int>(std::floor(context.mPlayer.mObject.mPosition.pos[0] / Constants::CellSizeInUnits));
+            int cellY
+                = static_cast<int>(std::floor(context.mPlayer.mObject.mPosition.pos[1] / Constants::CellSizeInUnits));
             context.mPlayer.mCellId.mIndex.mX = cellX;
             context.mPlayer.mCellId.mIndex.mY = cellY;
         }
@@ -423,15 +427,14 @@ namespace ESSImport
         writer.endRecord(ESM::REC_ACTC);
 
         // Stage 2 requires cell references to be written / actors IDs assigned
-        for (auto it = converters.begin();
-             it != converters.end(); ++it)
+        for (auto it = converters.begin(); it != converters.end(); ++it)
         {
             if (it->second->getStage() != 2)
                 continue;
             it->second->write(writer);
         }
 
-        writer.startRecord (ESM::REC_DIAS);
+        writer.startRecord(ESM::REC_DIAS);
         context.mDialogueState.save(writer);
         writer.endRecord(ESM::REC_DIAS);
 
@@ -440,5 +443,4 @@ namespace ESSImport
         writer.endRecord(ESM::REC_INPU);
     }
 
-
 }
diff --git a/apps/essimporter/importer.hpp b/apps/essimporter/importer.hpp
index 9d114fad27..fba1992808 100644
--- a/apps/essimporter/importer.hpp
+++ b/apps/essimporter/importer.hpp
@@ -9,7 +9,8 @@ namespace ESSImport
     class Importer
     {
     public:
-        Importer(const std::filesystem::path &essfile, const std::filesystem::path &outfile, const std::string& encoding);
+        Importer(
+            const std::filesystem::path& essfile, const std::filesystem::path& outfile, const std::string& encoding);
 
         void run();
 
diff --git a/apps/essimporter/importercontext.hpp b/apps/essimporter/importercontext.hpp
index a3a3e11884..baad8a366f 100644
--- a/apps/essimporter/importercontext.hpp
+++ b/apps/essimporter/importercontext.hpp
@@ -3,17 +3,16 @@
 
 #include <map>
 
-#include <components/esm3/loadnpc.hpp>
-#include <components/esm3/player.hpp>
+#include <components/esm3/controlsstate.hpp>
 #include <components/esm3/dialoguestate.hpp>
 #include <components/esm3/globalmap.hpp>
 #include <components/esm3/loadcrea.hpp>
 #include <components/esm3/loadnpc.hpp>
-#include <components/esm3/controlsstate.hpp>
+#include <components/esm3/player.hpp>
 
-#include "importnpcc.hpp"
-#include "importcrec.hpp"
 #include "importcntc.hpp"
+#include "importcrec.hpp"
+#include "importnpcc.hpp"
 #include "importsplm.h"
 
 namespace ESSImport
@@ -33,7 +32,7 @@ namespace ESSImport
         ESM::ControlsState mControlsState;
 
         // cells which should show an explored overlay on the global map
-        std::set<std::pair<int, int> > mExploredCells;
+        std::set<std::pair<int, int>> mExploredCells;
 
         ESM::GlobalMap mGlobalMapState;
 
@@ -64,10 +63,8 @@ namespace ESSImport
             playerCellId.mPaged = true;
             playerCellId.mIndex.mX = playerCellId.mIndex.mY = 0;
             mPlayer.mCellId = playerCellId;
-            mPlayer.mLastKnownExteriorPosition[0]
-                = mPlayer.mLastKnownExteriorPosition[1]
-                = mPlayer.mLastKnownExteriorPosition[2]
-                = 0.0f;
+            mPlayer.mLastKnownExteriorPosition[0] = mPlayer.mLastKnownExteriorPosition[1]
+                = mPlayer.mLastKnownExteriorPosition[2] = 0.0f;
             mPlayer.mHasMark = 0;
             mPlayer.mCurrentCrimeId = -1; // TODO
             mPlayer.mPaidCrimeId = -1;
@@ -84,10 +81,7 @@ namespace ESSImport
             mPlayerBase.blank();
         }
 
-        int generateActorId()
-        {
-            return mNextActorId++;
-        }
+        int generateActorId() { return mNextActorId++; }
     };
 
 }
diff --git a/apps/essimporter/importgame.cpp b/apps/essimporter/importgame.cpp
index df36afe784..2a2572aae3 100644
--- a/apps/essimporter/importgame.cpp
+++ b/apps/essimporter/importgame.cpp
@@ -5,25 +5,25 @@
 namespace ESSImport
 {
 
-void GAME::load(ESM::ESMReader &esm)
-{
-    esm.getSubNameIs("GMDT");
-    esm.getSubHeader();
-    if (esm.getSubSize() == 92)
-    {
-        esm.getExact(&mGMDT, 92);
-        mGMDT.mSecundaPhase = 0;
-    }
-    else if (esm.getSubSize() == 96)
+    void GAME::load(ESM::ESMReader& esm)
     {
-        esm.getT(mGMDT);
-    }
-    else
-        esm.fail("unexpected subrecord size for GAME.GMDT");
+        esm.getSubNameIs("GMDT");
+        esm.getSubHeader();
+        if (esm.getSubSize() == 92)
+        {
+            esm.getExact(&mGMDT, 92);
+            mGMDT.mSecundaPhase = 0;
+        }
+        else if (esm.getSubSize() == 96)
+        {
+            esm.getT(mGMDT);
+        }
+        else
+            esm.fail("unexpected subrecord size for GAME.GMDT");
 
-    mGMDT.mWeatherTransition &= (0x000000ff);
-    mGMDT.mSecundaPhase &= (0x000000ff);
-    mGMDT.mMasserPhase &= (0x000000ff);
-}
+        mGMDT.mWeatherTransition &= (0x000000ff);
+        mGMDT.mSecundaPhase &= (0x000000ff);
+        mGMDT.mMasserPhase &= (0x000000ff);
+    }
 
 }
diff --git a/apps/essimporter/importgame.hpp b/apps/essimporter/importgame.hpp
index d8051a527a..8b26b9d8bd 100644
--- a/apps/essimporter/importgame.hpp
+++ b/apps/essimporter/importgame.hpp
@@ -14,13 +14,13 @@ namespace ESSImport
     {
         struct GMDT
         {
-           char mCellName[64] {};
-           int mFogColour {0};
-           float mFogDensity {0.f};
-           int mCurrentWeather {0}, mNextWeather {0};
-           int mWeatherTransition {0}; // 0-100 transition between weathers, top 3 bytes may be garbage
-           float mTimeOfNextTransition {0.f}; // weather changes when gamehour == timeOfNextTransition
-           int mMasserPhase {0}, mSecundaPhase {0}; // top 3 bytes may be garbage
+            char mCellName[64]{};
+            int mFogColour{ 0 };
+            float mFogDensity{ 0.f };
+            int mCurrentWeather{ 0 }, mNextWeather{ 0 };
+            int mWeatherTransition{ 0 }; // 0-100 transition between weathers, top 3 bytes may be garbage
+            float mTimeOfNextTransition{ 0.f }; // weather changes when gamehour == timeOfNextTransition
+            int mMasserPhase{ 0 }, mSecundaPhase{ 0 }; // top 3 bytes may be garbage
         };
 
         GMDT mGMDT;
diff --git a/apps/essimporter/importinfo.cpp b/apps/essimporter/importinfo.cpp
index 49a0c745f6..66902f6ff4 100644
--- a/apps/essimporter/importinfo.cpp
+++ b/apps/essimporter/importinfo.cpp
@@ -5,7 +5,7 @@
 namespace ESSImport
 {
 
-    void INFO::load(ESM::ESMReader &esm)
+    void INFO::load(ESM::ESMReader& esm)
     {
         mInfo = esm.getHNString("INAM");
         mActorRefId = esm.getHNString("ACDT");
diff --git a/apps/essimporter/importinventory.cpp b/apps/essimporter/importinventory.cpp
index c4d11763f5..723151236d 100644
--- a/apps/essimporter/importinventory.cpp
+++ b/apps/essimporter/importinventory.cpp
@@ -7,7 +7,7 @@
 namespace ESSImport
 {
 
-    void Inventory::load(ESM::ESMReader &esm)
+    void Inventory::load(ESM::ESMReader& esm)
     {
         while (esm.isNextSub("NPCO"))
         {
@@ -23,7 +23,7 @@ namespace ESSImport
 
             unsigned int itemCount = std::abs(item.mCount);
             bool separateStacks = false;
-            for (unsigned int i=0;i<itemCount;++i)
+            for (unsigned int i = 0; i < itemCount; ++i)
             {
                 bool newStack = esm.isNextSub("XIDX");
                 if (newStack)
@@ -40,7 +40,7 @@ namespace ESSImport
                 bool isDeleted = false;
                 item.ESM::CellRef::loadData(esm, isDeleted);
 
-                int charge=-1;
+                int charge = -1;
                 esm.getHNOT(charge, "XHLT");
                 item.mChargeInt = charge;
 
diff --git a/apps/essimporter/importinventory.hpp b/apps/essimporter/importinventory.hpp
index 6f757ac9a0..7a11b3f0a0 100644
--- a/apps/essimporter/importinventory.hpp
+++ b/apps/essimporter/importinventory.hpp
@@ -1,11 +1,11 @@
 #ifndef OPENMW_ESSIMPORT_IMPORTINVENTORY_H
 #define OPENMW_ESSIMPORT_IMPORTINVENTORY_H
 
-#include <vector>
 #include <string>
+#include <vector>
 
-#include <components/esm3/cellref.hpp>
 #include <components/esm/esmcommon.hpp>
+#include <components/esm3/cellref.hpp>
 
 #include "importscri.hpp"
 
diff --git a/apps/essimporter/importjour.cpp b/apps/essimporter/importjour.cpp
index 1c46b3159c..19a2d601c2 100644
--- a/apps/essimporter/importjour.cpp
+++ b/apps/essimporter/importjour.cpp
@@ -5,7 +5,7 @@
 namespace ESSImport
 {
 
-    void JOUR::load(ESM::ESMReader &esm)
+    void JOUR::load(ESM::ESMReader& esm)
     {
         mText = esm.getHNString("NAME");
     }
diff --git a/apps/essimporter/importklst.cpp b/apps/essimporter/importklst.cpp
index 5d9f22a31c..d4cfc7f769 100644
--- a/apps/essimporter/importklst.cpp
+++ b/apps/essimporter/importklst.cpp
@@ -5,7 +5,7 @@
 namespace ESSImport
 {
 
-    void KLST::load(ESM::ESMReader &esm)
+    void KLST::load(ESM::ESMReader& esm)
     {
         while (esm.isNextSub("KNAM"))
         {
diff --git a/apps/essimporter/importklst.hpp b/apps/essimporter/importklst.hpp
index d07332600f..7c1ff03bb6 100644
--- a/apps/essimporter/importklst.hpp
+++ b/apps/essimporter/importklst.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_ESSIMPORT_KLST_H
 #define OPENMW_ESSIMPORT_KLST_H
 
-#include <string>
 #include <map>
+#include <string>
 
 namespace ESM
 {
diff --git a/apps/essimporter/importnpcc.cpp b/apps/essimporter/importnpcc.cpp
index 4d8da66f0f..1b1a87ab8e 100644
--- a/apps/essimporter/importnpcc.cpp
+++ b/apps/essimporter/importnpcc.cpp
@@ -5,12 +5,12 @@
 namespace ESSImport
 {
 
-    void NPCC::load(ESM::ESMReader &esm)
+    void NPCC::load(ESM::ESMReader& esm)
     {
         esm.getHNT(mNPDT, "NPDT");
 
         while (esm.isNextSub("AI_W") || esm.isNextSub("AI_E") || esm.isNextSub("AI_T") || esm.isNextSub("AI_F")
-               || esm.isNextSub("AI_A"))
+            || esm.isNextSub("AI_A"))
             mAiPackages.add(esm);
 
         mInventory.load(esm);
diff --git a/apps/essimporter/importnpcc.hpp b/apps/essimporter/importnpcc.hpp
index d525c00743..1cc355b06c 100644
--- a/apps/essimporter/importnpcc.hpp
+++ b/apps/essimporter/importnpcc.hpp
@@ -29,7 +29,7 @@ namespace ESSImport
         Inventory mInventory;
         ESM::AIPackageList mAiPackages;
 
-        void load(ESM::ESMReader &esm);
+        void load(ESM::ESMReader& esm);
     };
 
 }
diff --git a/apps/essimporter/importplayer.cpp b/apps/essimporter/importplayer.cpp
index 3285ac15e3..aa00e45b3e 100644
--- a/apps/essimporter/importplayer.cpp
+++ b/apps/essimporter/importplayer.cpp
@@ -5,7 +5,7 @@
 namespace ESSImport
 {
 
-    void PCDT::load(ESM::ESMReader &esm)
+    void PCDT::load(ESM::ESMReader& esm)
     {
         while (esm.isNextSub("DNAM"))
         {
diff --git a/apps/essimporter/importplayer.hpp b/apps/essimporter/importplayer.hpp
index 83d8dc1ead..252202ccf2 100644
--- a/apps/essimporter/importplayer.hpp
+++ b/apps/essimporter/importplayer.hpp
@@ -1,12 +1,12 @@
 #ifndef OPENMW_ESSIMPORT_PLAYER_H
 #define OPENMW_ESSIMPORT_PLAYER_H
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <components/esm/defs.hpp>
-#include <components/esm3/cellref.hpp>
 #include <components/esm/esmcommon.hpp>
+#include <components/esm3/cellref.hpp>
 
 namespace ESM
 {
@@ -16,102 +16,102 @@ namespace ESM
 namespace ESSImport
 {
 
-/// Other player data
-struct PCDT
-{
-    int mBounty;
-    std::string mBirthsign;
+    /// Other player data
+    struct PCDT
+    {
+        int mBounty;
+        std::string mBirthsign;
 
-    std::vector<std::string> mKnownDialogueTopics;
+        std::vector<std::string> mKnownDialogueTopics;
 
-    enum PlayerFlags
-    {
-        PlayerFlags_ViewSwitchDisabled = 0x1,
-        PlayerFlags_ControlsDisabled = 0x4,
-        PlayerFlags_Sleeping = 0x10,
-        PlayerFlags_Waiting = 0x40,
-        PlayerFlags_WeaponDrawn = 0x80,
-        PlayerFlags_SpellDrawn = 0x100,
-        PlayerFlags_InJail = 0x200,
-        PlayerFlags_JumpingDisabled = 0x1000,
-        PlayerFlags_LookingDisabled = 0x2000,
-        PlayerFlags_VanityModeDisabled = 0x4000,
-        PlayerFlags_WeaponDrawingDisabled = 0x8000,
-        PlayerFlags_SpellDrawingDisabled = 0x10000,
-        PlayerFlags_ThirdPerson = 0x20000,
-        PlayerFlags_TeleportingDisabled = 0x40000,
-        PlayerFlags_LevitationDisabled = 0x80000
-    };
+        enum PlayerFlags
+        {
+            PlayerFlags_ViewSwitchDisabled = 0x1,
+            PlayerFlags_ControlsDisabled = 0x4,
+            PlayerFlags_Sleeping = 0x10,
+            PlayerFlags_Waiting = 0x40,
+            PlayerFlags_WeaponDrawn = 0x80,
+            PlayerFlags_SpellDrawn = 0x100,
+            PlayerFlags_InJail = 0x200,
+            PlayerFlags_JumpingDisabled = 0x1000,
+            PlayerFlags_LookingDisabled = 0x2000,
+            PlayerFlags_VanityModeDisabled = 0x4000,
+            PlayerFlags_WeaponDrawingDisabled = 0x8000,
+            PlayerFlags_SpellDrawingDisabled = 0x10000,
+            PlayerFlags_ThirdPerson = 0x20000,
+            PlayerFlags_TeleportingDisabled = 0x40000,
+            PlayerFlags_LevitationDisabled = 0x80000
+        };
 
 #pragma pack(push)
 #pragma pack(1)
-    struct FNAM
-    {
-        unsigned char mRank;
-        unsigned char mUnknown1[3];
-        int mReputation;
-        unsigned char mFlags; // 0x1: unknown, 0x2: expelled
-        unsigned char mUnknown2[3];
-        ESM::NAME32 mFactionName;
-    };
-
-    struct PNAM
-    {
-        struct MarkLocation
+        struct FNAM
         {
-            float mX, mY, mZ; // worldspace position
-            float mRotZ; // Z angle in radians
-            int mCellX, mCellY; // grid coordinates; for interior cells this is always (0, 0)
+            unsigned char mRank;
+            unsigned char mUnknown1[3];
+            int mReputation;
+            unsigned char mFlags; // 0x1: unknown, 0x2: expelled
+            unsigned char mUnknown2[3];
+            ESM::NAME32 mFactionName;
         };
 
-        struct Rotation
+        struct PNAM
         {
-            float mData[3][3];
+            struct MarkLocation
+            {
+                float mX, mY, mZ; // worldspace position
+                float mRotZ; // Z angle in radians
+                int mCellX, mCellY; // grid coordinates; for interior cells this is always (0, 0)
+            };
+
+            struct Rotation
+            {
+                float mData[3][3];
+            };
+
+            int mPlayerFlags; // controls, camera and draw state
+            unsigned int mLevelProgress;
+            float mSkillProgress[27]; // skill progress, non-uniform scaled
+            unsigned char mSkillIncreases[8]; // number of skill increases for each attribute
+            int mTelekinesisRangeBonus; // in units; seems redundant
+            float mVisionBonus; // range: <0.0, 1.0>; affected by light spells and Get/Mod/SetPCVisionBonus
+            int mDetectKeyMagnitude; // seems redundant
+            int mDetectEnchantmentMagnitude; // seems redundant
+            int mDetectAnimalMagnitude; // seems redundant
+            MarkLocation mMarkLocation;
+            unsigned char mUnknown3[4];
+            Rotation mVerticalRotation;
+            unsigned char mSpecIncreases[3]; // number of skill increases for each specialization
+            unsigned char mUnknown4;
         };
 
-        int mPlayerFlags; // controls, camera and draw state
-        unsigned int mLevelProgress;
-        float mSkillProgress[27]; // skill progress, non-uniform scaled
-        unsigned char mSkillIncreases[8]; // number of skill increases for each attribute
-        int mTelekinesisRangeBonus; // in units; seems redundant
-        float mVisionBonus; // range: <0.0, 1.0>; affected by light spells and Get/Mod/SetPCVisionBonus
-        int mDetectKeyMagnitude; // seems redundant
-        int mDetectEnchantmentMagnitude; // seems redundant
-        int mDetectAnimalMagnitude; // seems redundant
-        MarkLocation mMarkLocation;
-        unsigned char mUnknown3[4];
-        Rotation mVerticalRotation;
-        unsigned char mSpecIncreases[3]; // number of skill increases for each specialization
-        unsigned char mUnknown4;
-    };
-
-    struct ENAM
-    {
-        int mCellX;
-        int mCellY;
-    };
+        struct ENAM
+        {
+            int mCellX;
+            int mCellY;
+        };
 
-    struct AADT // 44 bytes
-    {
-        int animGroupIndex; // See convertANIS() for the mapping.
-        unsigned char mUnknown5[40];
-    };
+        struct AADT // 44 bytes
+        {
+            int animGroupIndex; // See convertANIS() for the mapping.
+            unsigned char mUnknown5[40];
+        };
 #pragma pack(pop)
 
-    std::vector<FNAM> mFactions;
-    PNAM mPNAM;
+        std::vector<FNAM> mFactions;
+        PNAM mPNAM;
 
-    bool mHasMark;
-    std::string mMNAM; // mark cell name; can also be sDefaultCellname or region name
+        bool mHasMark;
+        std::string mMNAM; // mark cell name; can also be sDefaultCellname or region name
 
-    bool mHasENAM;
-    ENAM mENAM; // last exterior cell
+        bool mHasENAM;
+        ENAM mENAM; // last exterior cell
 
-    bool mHasAADT;
-    AADT mAADT;
+        bool mHasAADT;
+        AADT mAADT;
 
-    void load(ESM::ESMReader& esm);
-};
+        void load(ESM::ESMReader& esm);
+    };
 
 }
 
diff --git a/apps/essimporter/importproj.cpp b/apps/essimporter/importproj.cpp
index aada41a778..909b228417 100644
--- a/apps/essimporter/importproj.cpp
+++ b/apps/essimporter/importproj.cpp
@@ -5,14 +5,14 @@
 namespace ESSImport
 {
 
-void ESSImport::PROJ::load(ESM::ESMReader& esm)
-{
-    while (esm.isNextSub("PNAM"))
+    void ESSImport::PROJ::load(ESM::ESMReader& esm)
     {
-        PNAM pnam;
-        esm.getHT(pnam);
-        mProjectiles.push_back(pnam);
+        while (esm.isNextSub("PNAM"))
+        {
+            PNAM pnam;
+            esm.getHT(pnam);
+            mProjectiles.push_back(pnam);
+        }
     }
-}
 
 }
diff --git a/apps/essimporter/importproj.h b/apps/essimporter/importproj.h
index b8abab5fa2..d1c544f66f 100644
--- a/apps/essimporter/importproj.h
+++ b/apps/essimporter/importproj.h
@@ -1,9 +1,9 @@
 #ifndef OPENMW_ESSIMPORT_IMPORTPROJ_H
 #define OPENMW_ESSIMPORT_IMPORTPROJ_H
 
-#include <vector>
 #include <components/esm/esmcommon.hpp>
 #include <components/esm/util.hpp>
+#include <vector>
 
 namespace ESM
 {
@@ -13,34 +13,34 @@ namespace ESM
 namespace ESSImport
 {
 
-struct PROJ
-{
+    struct PROJ
+    {
 
 #pragma pack(push)
 #pragma pack(1)
-    struct PNAM // 184 bytes
-    {
-        float mAttackStrength;
-        float mSpeed;
-        unsigned char mUnknown[4*2];
-        float mFlightTime;
-        int mSplmIndex; // reference to a SPLM record (0 for ballistic projectiles)
-        unsigned char mUnknown2[4];
-        ESM::Vector3 mVelocity;
-        ESM::Vector3 mPosition;
-        unsigned char mUnknown3[4*9];
-        ESM::NAME32 mActorId; // indexed refID (with the exception of "PlayerSaveGame")
-        ESM::NAME32 mArrowId;
-        ESM::NAME32 mBowId;
-
-        bool isMagic() const { return mSplmIndex != 0; }
-    };
+        struct PNAM // 184 bytes
+        {
+            float mAttackStrength;
+            float mSpeed;
+            unsigned char mUnknown[4 * 2];
+            float mFlightTime;
+            int mSplmIndex; // reference to a SPLM record (0 for ballistic projectiles)
+            unsigned char mUnknown2[4];
+            ESM::Vector3 mVelocity;
+            ESM::Vector3 mPosition;
+            unsigned char mUnknown3[4 * 9];
+            ESM::NAME32 mActorId; // indexed refID (with the exception of "PlayerSaveGame")
+            ESM::NAME32 mArrowId;
+            ESM::NAME32 mBowId;
+
+            bool isMagic() const { return mSplmIndex != 0; }
+        };
 #pragma pack(pop)
 
-    std::vector<PNAM> mProjectiles;
+        std::vector<PNAM> mProjectiles;
 
-    void load(ESM::ESMReader& esm);
-};
+        void load(ESM::ESMReader& esm);
+    };
 
 }
 
diff --git a/apps/essimporter/importques.cpp b/apps/essimporter/importques.cpp
index b57083b0b3..46e08cdd9a 100644
--- a/apps/essimporter/importques.cpp
+++ b/apps/essimporter/importques.cpp
@@ -5,7 +5,7 @@
 namespace ESSImport
 {
 
-    void QUES::load(ESM::ESMReader &esm)
+    void QUES::load(ESM::ESMReader& esm)
     {
         while (esm.isNextSub("DATA"))
             mInfo.push_back(esm.getHString());
diff --git a/apps/essimporter/importscpt.cpp b/apps/essimporter/importscpt.cpp
index 5760d8b438..8768c27010 100644
--- a/apps/essimporter/importscpt.cpp
+++ b/apps/essimporter/importscpt.cpp
@@ -2,11 +2,10 @@
 
 #include <components/esm3/esmreader.hpp>
 
-
 namespace ESSImport
 {
 
-    void SCPT::load(ESM::ESMReader &esm)
+    void SCPT::load(ESM::ESMReader& esm)
     {
         esm.getHNT(mSCHD, "SCHD");
 
diff --git a/apps/essimporter/importscpt.hpp b/apps/essimporter/importscpt.hpp
index 78c6baebe4..8f60532447 100644
--- a/apps/essimporter/importscpt.hpp
+++ b/apps/essimporter/importscpt.hpp
@@ -3,8 +3,8 @@
 
 #include "importscri.hpp"
 
-#include <components/esm3/loadscpt.hpp>
 #include <components/esm/esmcommon.hpp>
+#include <components/esm3/loadscpt.hpp>
 
 namespace ESM
 {
@@ -16,8 +16,8 @@ namespace ESSImport
 
     struct SCHD
     {
-        ESM::NAME32              mName;
-        ESM::Script::SCHDstruct  mData;
+        ESM::NAME32 mName;
+        ESM::Script::SCHDstruct mData;
     };
 
     // A running global script
diff --git a/apps/essimporter/importscri.cpp b/apps/essimporter/importscri.cpp
index 40a5516147..b6c1d4094c 100644
--- a/apps/essimporter/importscri.cpp
+++ b/apps/essimporter/importscri.cpp
@@ -2,11 +2,10 @@
 
 #include <components/esm3/esmreader.hpp>
 
-
 namespace ESSImport
 {
 
-    void SCRI::load(ESM::ESMReader &esm)
+    void SCRI::load(ESM::ESMReader& esm)
     {
         mScript = esm.getHNOString("SCRI");
 
@@ -22,7 +21,7 @@ namespace ESSImport
         if (esm.isNextSub("SLSD"))
         {
             esm.getSubHeader();
-            for (int i=0; i<numShorts; ++i)
+            for (int i = 0; i < numShorts; ++i)
             {
                 short val;
                 esm.getT(val);
@@ -34,7 +33,7 @@ namespace ESSImport
         if (esm.isNextSub("SLLD"))
         {
             esm.getSubHeader();
-            for (int i=0; i<numLongs; ++i)
+            for (int i = 0; i < numLongs; ++i)
             {
                 int val;
                 esm.getT(val);
@@ -44,7 +43,7 @@ namespace ESSImport
         if (esm.isNextSub("SLFD"))
         {
             esm.getSubHeader();
-            for (int i=0; i<numFloats; ++i)
+            for (int i = 0; i < numFloats; ++i)
             {
                 float val;
                 esm.getT(val);
diff --git a/apps/essimporter/importsplm.cpp b/apps/essimporter/importsplm.cpp
index f635a8fdbb..b49a07cde2 100644
--- a/apps/essimporter/importsplm.cpp
+++ b/apps/essimporter/importsplm.cpp
@@ -5,39 +5,39 @@
 namespace ESSImport
 {
 
-void SPLM::load(ESM::ESMReader& esm)
-{
-    while (esm.isNextSub("NAME"))
+    void SPLM::load(ESM::ESMReader& esm)
     {
-        ActiveSpell spell;
-        esm.getHT(spell.mIndex);
-        esm.getHNT(spell.mSPDT, "SPDT");
-        spell.mTarget = esm.getHNOString("TNAM");
-
-        while (esm.isNextSub("NPDT"))
+        while (esm.isNextSub("NAME"))
         {
-            ActiveEffect effect;
-            esm.getHT(effect.mNPDT);
-
-            // Effect-specific subrecords can follow:
-            // - INAM for disintegration and bound effects
-            // - CNAM for summoning and command effects
-            // - VNAM for vampirism
-            // NOTE: There can be multiple INAMs per effect.
-            // TODO: Needs more research.
-
-            esm.skipHSubUntil("NAM0"); // sentinel
-            esm.getSubName();
-            esm.skipHSub();
-
-            spell.mActiveEffects.push_back(effect);
+            ActiveSpell spell;
+            esm.getHT(spell.mIndex);
+            esm.getHNT(spell.mSPDT, "SPDT");
+            spell.mTarget = esm.getHNOString("TNAM");
+
+            while (esm.isNextSub("NPDT"))
+            {
+                ActiveEffect effect;
+                esm.getHT(effect.mNPDT);
+
+                // Effect-specific subrecords can follow:
+                // - INAM for disintegration and bound effects
+                // - CNAM for summoning and command effects
+                // - VNAM for vampirism
+                // NOTE: There can be multiple INAMs per effect.
+                // TODO: Needs more research.
+
+                esm.skipHSubUntil("NAM0"); // sentinel
+                esm.getSubName();
+                esm.skipHSub();
+
+                spell.mActiveEffects.push_back(effect);
+            }
+
+            unsigned char xnam; // sentinel
+            esm.getHNT(xnam, "XNAM");
+
+            mActiveSpells.push_back(spell);
         }
-
-        unsigned char xnam; // sentinel
-        esm.getHNT(xnam, "XNAM");
-
-        mActiveSpells.push_back(spell);
     }
-}
 
 }
diff --git a/apps/essimporter/importsplm.h b/apps/essimporter/importsplm.h
index 1fc118a8f5..6c31363e4a 100644
--- a/apps/essimporter/importsplm.h
+++ b/apps/essimporter/importsplm.h
@@ -1,9 +1,9 @@
 #ifndef OPENMW_ESSIMPORT_IMPORTSPLM_H
 #define OPENMW_ESSIMPORT_IMPORTSPLM_H
 
-#include <vector>
 #include <components/esm/esmcommon.hpp>
 #include <components/esm/util.hpp>
+#include <vector>
 
 namespace ESM
 {
@@ -13,68 +13,67 @@ namespace ESM
 namespace ESSImport
 {
 
-struct SPLM
-{
+    struct SPLM
+    {
 
 #pragma pack(push)
 #pragma pack(1)
-    struct SPDT // 160 bytes
-    {
-        int mType; // 1 = spell, 2 = enchantment, 3 = potion
-        ESM::NAME32 mId; // base ID of a spell/enchantment/potion
-        unsigned char mUnknown[4*4];
-        ESM::NAME32 mCasterId;
-        ESM::NAME32 mSourceId; // empty for spells
-        unsigned char mUnknown2[4*11];
-    };
-
-    struct NPDT // 56 bytes
-    {
-        ESM::NAME32 mAffectedActorId;
-        unsigned char mUnknown[4*2];
-        int mMagnitude;
-        float mSecondsActive;
-        unsigned char mUnknown2[4*2];
-    };
-
-    struct INAM // 40 bytes
-    {
-        int mUnknown;
-        unsigned char mUnknown2;
-        ESM::FixedString<35> mItemId; // disintegrated item / bound item / item to re-equip after expiration
-    };
-
-    struct CNAM // 36 bytes
-    {
-        int mUnknown; // seems to always be 0
-        ESM::NAME32 mSummonedOrCommandedActor[32];
-    };
-
-    struct VNAM // 4 bytes
-    {
-        int mUnknown;
-    };
-
+        struct SPDT // 160 bytes
+        {
+            int mType; // 1 = spell, 2 = enchantment, 3 = potion
+            ESM::NAME32 mId; // base ID of a spell/enchantment/potion
+            unsigned char mUnknown[4 * 4];
+            ESM::NAME32 mCasterId;
+            ESM::NAME32 mSourceId; // empty for spells
+            unsigned char mUnknown2[4 * 11];
+        };
+
+        struct NPDT // 56 bytes
+        {
+            ESM::NAME32 mAffectedActorId;
+            unsigned char mUnknown[4 * 2];
+            int mMagnitude;
+            float mSecondsActive;
+            unsigned char mUnknown2[4 * 2];
+        };
+
+        struct INAM // 40 bytes
+        {
+            int mUnknown;
+            unsigned char mUnknown2;
+            ESM::FixedString<35> mItemId; // disintegrated item / bound item / item to re-equip after expiration
+        };
+
+        struct CNAM // 36 bytes
+        {
+            int mUnknown; // seems to always be 0
+            ESM::NAME32 mSummonedOrCommandedActor[32];
+        };
+
+        struct VNAM // 4 bytes
+        {
+            int mUnknown;
+        };
 
 #pragma pack(pop)
 
-    struct ActiveEffect
-    {
-        NPDT mNPDT;
-    };
+        struct ActiveEffect
+        {
+            NPDT mNPDT;
+        };
 
-    struct ActiveSpell
-    {
-        int mIndex;
-        SPDT mSPDT;
-        std::string mTarget;
-        std::vector<ActiveEffect> mActiveEffects;
-    };
+        struct ActiveSpell
+        {
+            int mIndex;
+            SPDT mSPDT;
+            std::string mTarget;
+            std::vector<ActiveEffect> mActiveEffects;
+        };
 
-    std::vector<ActiveSpell> mActiveSpells;
+        std::vector<ActiveSpell> mActiveSpells;
 
-    void load(ESM::ESMReader& esm);
-};
+        void load(ESM::ESMReader& esm);
+    };
 
 }
 
diff --git a/apps/essimporter/main.cpp b/apps/essimporter/main.cpp
index 6da7e189e7..7d3ad10bb1 100644
--- a/apps/essimporter/main.cpp
+++ b/apps/essimporter/main.cpp
@@ -1,5 +1,5 @@
-#include <iostream>
 #include <filesystem>
+#include <iostream>
 
 #include <boost/program_options.hpp>
 
@@ -9,7 +9,6 @@
 
 namespace bpo = boost::program_options;
 
-
 int main(int argc, char** argv)
 {
     try
@@ -22,19 +21,18 @@ Allowed options)");
         addOption("mwsave,m", bpo::value<Files::MaybeQuotedPath>(), "morrowind .ess save file");
         addOption("output,o", bpo::value<Files::MaybeQuotedPath>(), "output file (.omwsave)");
         addOption("compare,c", "compare two .ess files");
-        addOption("encoding", boost::program_options::value<std::string>()->default_value("win1252"), "encoding of the save file");
+        addOption("encoding", boost::program_options::value<std::string>()->default_value("win1252"),
+            "encoding of the save file");
         p_desc.add("mwsave", 1).add("output", 1);
         Files::ConfigurationManager::addCommonOptions(desc);
 
         bpo::variables_map variables;
 
-        bpo::parsed_options parsed = bpo::command_line_parser(argc, argv)
-            .options(desc)
-            .positional(p_desc)
-            .run();
+        bpo::parsed_options parsed = bpo::command_line_parser(argc, argv).options(desc).positional(p_desc).run();
         bpo::store(parsed, variables);
 
-        if(variables.count("help") || !variables.count("mwsave") || !variables.count("output")) {
+        if (variables.count("help") || !variables.count("mwsave") || !variables.count("output"))
+        {
             std::cout << desc;
             return 0;
         }
@@ -54,12 +52,13 @@ Allowed options)");
             importer.compare();
         else
         {
-            static constexpr std::u8string_view ext{u8".omwsave"};
+            static constexpr std::u8string_view ext{ u8".omwsave" };
             const auto length = outputFile.native().size();
             if (std::filesystem::exists(outputFile)
-                    && (length < ext.size() || outputFile.u8string().substr(length-ext.size()) != ext))
+                && (length < ext.size() || outputFile.u8string().substr(length - ext.size()) != ext))
             {
-                throw std::runtime_error("Output file already exists and does not end in .omwsave. Did you mean to use --compare?");
+                throw std::runtime_error(
+                    "Output file already exists and does not end in .omwsave. Did you mean to use --compare?");
             }
             importer.run();
         }
diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index 0f28c28b70..6f0a8dc52f 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -1,32 +1,32 @@
 #include "advancedpage.hpp"
 
 #include <array>
-#include <string>
 #include <cmath>
+#include <string>
 
-#include <QFileDialog>
 #include <QCompleter>
+#include <QFileDialog>
 #include <QString>
 
 #include <components/config/gamesettings.hpp>
-#include <components/contentselector/view/contentselector.hpp>
 #include <components/contentselector/model/esmfile.hpp>
+#include <components/contentselector/view/contentselector.hpp>
 #include <components/detournavigator/collisionshapetype.hpp>
 
 #include "utils/openalutil.hpp"
 
-Launcher::AdvancedPage::AdvancedPage(Config::GameSettings &gameSettings, QWidget *parent)
-        : QWidget(parent)
-        , mGameSettings(gameSettings)
+Launcher::AdvancedPage::AdvancedPage(Config::GameSettings& gameSettings, QWidget* parent)
+    : QWidget(parent)
+    , mGameSettings(gameSettings)
 {
-    setObjectName ("AdvancedPage");
+    setObjectName("AdvancedPage");
     setupUi(this);
 
-    for(const std::string& name : Launcher::enumerateOpenALDevices())
+    for (const std::string& name : Launcher::enumerateOpenALDevices())
     {
         audioDeviceSelectorComboBox->addItem(QString::fromStdString(name), QString::fromStdString(name));
     }
-    for(const std::string& name : Launcher::enumerateOpenALDevicesHrtf())
+    for (const std::string& name : Launcher::enumerateOpenALDevicesHrtf())
     {
         hrtfProfileSelectorComboBox->addItem(QString::fromStdString(name), QString::fromStdString(name));
     }
@@ -37,14 +37,16 @@ Launcher::AdvancedPage::AdvancedPage(Config::GameSettings &gameSettings, QWidget
     startDefaultCharacterAtField->setCompleter(&mCellNameCompleter);
 }
 
-void Launcher::AdvancedPage::loadCellsForAutocomplete(QStringList cellNames) {
+void Launcher::AdvancedPage::loadCellsForAutocomplete(QStringList cellNames)
+{
     // Update the list of suggestions for the "Start default character at" field
     mCellNameCompleterModel.setStringList(cellNames);
     mCellNameCompleter.setCompletionMode(QCompleter::PopupCompletion);
     mCellNameCompleter.setCaseSensitivity(Qt::CaseSensitivity::CaseInsensitive);
 }
 
-void Launcher::AdvancedPage::on_skipMenuCheckBox_stateChanged(int state) {
+void Launcher::AdvancedPage::on_skipMenuCheckBox_stateChanged(int state)
+{
     startDefaultCharacterAtLabel->setEnabled(state == Qt::Checked);
     startDefaultCharacterAtField->setEnabled(state == Qt::Checked);
 }
@@ -52,10 +54,7 @@ void Launcher::AdvancedPage::on_skipMenuCheckBox_stateChanged(int state) {
 void Launcher::AdvancedPage::on_runScriptAfterStartupBrowseButton_clicked()
 {
     QString scriptFile = QFileDialog::getOpenFileName(
-            this,
-            QObject::tr("Select script file"),
-            QDir::currentPath(),
-            QString(tr("Text file (*.txt)")));
+        this, QObject::tr("Select script file"), QDir::currentPath(), QString(tr("Text file (*.txt)")));
 
     if (scriptFile.isEmpty())
         return;
@@ -95,7 +94,8 @@ bool Launcher::AdvancedPage::loadSettings()
         loadSettingBool(enchantedWeaponsMagicalCheckBox, "enchanted weapons are magical", "Game");
         loadSettingBool(permanentBarterDispositionChangeCheckBox, "barter disposition change is permanent", "Game");
         loadSettingBool(classicReflectedAbsorbSpellsCheckBox, "classic reflected absorb spells behavior", "Game");
-        loadSettingBool(requireAppropriateAmmunitionCheckBox, "only appropriate ammunition bypasses resistance", "Game");
+        loadSettingBool(
+            requireAppropriateAmmunitionCheckBox, "only appropriate ammunition bypasses resistance", "Game");
         loadSettingBool(uncappedDamageFatigueCheckBox, "uncapped damage fatigue", "Game");
         loadSettingBool(normaliseRaceSpeedCheckBox, "normalise race speed", "Game");
         loadSettingBool(swimUpwardCorrectionCheckBox, "swim upward correction", "Game");
@@ -124,7 +124,8 @@ bool Launcher::AdvancedPage::loadSettings()
         loadSettingBool(bumpMapLocalLightingCheckBox, "apply lighting to environment maps", "Shaders");
         loadSettingBool(softParticlesCheckBox, "soft particles", "Shaders");
         loadSettingBool(antialiasAlphaTestCheckBox, "antialias alpha test", "Shaders");
-        if (Settings::Manager::getInt("antialiasing", "Video") == 0) {
+        if (Settings::Manager::getInt("antialiasing", "Video") == 0)
+        {
             antialiasAlphaTestCheckBox->setCheckState(Qt::Unchecked);
         }
         loadSettingBool(magicItemAnimationsCheckBox, "use magic item animations", "Game");
@@ -140,7 +141,8 @@ bool Launcher::AdvancedPage::loadSettings()
 
         const bool distantTerrain = Settings::Manager::getBool("distant terrain", "Terrain");
         const bool objectPaging = Settings::Manager::getBool("object paging", "Terrain");
-        if (distantTerrain && objectPaging) {
+        if (distantTerrain && objectPaging)
+        {
             distantLandCheckBox->setCheckState(Qt::Checked);
         }
 
@@ -210,17 +212,19 @@ bool Launcher::AdvancedPage::loadSettings()
     // Bug fixes
     {
         loadSettingBool(preventMerchantEquippingCheckBox, "prevent merchant equipping", "Game");
-        loadSettingBool(trainersTrainingSkillsBasedOnBaseSkillCheckBox, "trainers training skills based on base skill", "Game");
+        loadSettingBool(
+            trainersTrainingSkillsBasedOnBaseSkillCheckBox, "trainers training skills based on base skill", "Game");
     }
 
     // Miscellaneous
     {
         // Saves
         loadSettingBool(timePlayedCheckbox, "timeplayed", "Saves");
-        loadSettingInt(maximumQuicksavesComboBox,"max quicksaves", "Saves");
+        loadSettingInt(maximumQuicksavesComboBox, "max quicksaves", "Saves");
 
         // Other Settings
-        QString screenshotFormatString = QString::fromStdString(Settings::Manager::getString("screenshot format", "General")).toUpper();
+        QString screenshotFormatString
+            = QString::fromStdString(Settings::Manager::getString("screenshot format", "General")).toUpper();
         if (screenshotFormatComboBox->findText(screenshotFormatString) == -1)
             screenshotFormatComboBox->addItem(screenshotFormatString);
         screenshotFormatComboBox->setCurrentIndex(screenshotFormatComboBox->findText(screenshotFormatString));
@@ -257,7 +261,8 @@ void Launcher::AdvancedPage::saveSettings()
         saveSettingBool(enchantedWeaponsMagicalCheckBox, "enchanted weapons are magical", "Game");
         saveSettingBool(permanentBarterDispositionChangeCheckBox, "barter disposition change is permanent", "Game");
         saveSettingBool(classicReflectedAbsorbSpellsCheckBox, "classic reflected absorb spells behavior", "Game");
-        saveSettingBool(requireAppropriateAmmunitionCheckBox, "only appropriate ammunition bypasses resistance", "Game");
+        saveSettingBool(
+            requireAppropriateAmmunitionCheckBox, "only appropriate ammunition bypasses resistance", "Game");
         saveSettingBool(uncappedDamageFatigueCheckBox, "uncapped damage fatigue", "Game");
         saveSettingBool(normaliseRaceSpeedCheckBox, "normalise race speed", "Game");
         saveSettingBool(swimUpwardCorrectionCheckBox, "swim upward correction", "Game");
@@ -291,7 +296,8 @@ void Launcher::AdvancedPage::saveSettings()
         const bool distantTerrain = Settings::Manager::getBool("distant terrain", "Terrain");
         const bool objectPaging = Settings::Manager::getBool("object paging", "Terrain");
         const bool wantDistantLand = distantLandCheckBox->checkState();
-        if (wantDistantLand != (distantTerrain && objectPaging)) {
+        if (wantDistantLand != (distantTerrain && objectPaging))
+        {
             Settings::Manager::setBool("distant terrain", "Terrain", wantDistantLand);
             Settings::Manager::setBool("object paging", "Terrain", wantDistantLand);
         }
@@ -343,7 +349,7 @@ void Launcher::AdvancedPage::saveSettings()
         const std::string& prevHRTFProfile = Settings::Manager::getString("hrtf", "Sound");
         if (selectedHRTFProfileIndex != 0)
         {
-            const std::string& newHRTFProfile  = hrtfProfileSelectorComboBox->currentText().toUtf8().constData();
+            const std::string& newHRTFProfile = hrtfProfileSelectorComboBox->currentText().toUtf8().constData();
             if (newHRTFProfile != prevHRTFProfile)
                 Settings::Manager::setString("hrtf", "Sound", newHRTFProfile);
         }
@@ -360,7 +366,7 @@ void Launcher::AdvancedPage::saveSettings()
         saveSettingBool(showMeleeInfoCheckBox, "show melee info", "Game");
         saveSettingBool(showProjectileDamageCheckBox, "show projectile damage", "Game");
         saveSettingBool(changeDialogTopicsCheckBox, "color topic enable", "GUI");
-        saveSettingInt(showOwnedComboBox,"show owned", "Game");
+        saveSettingInt(showOwnedComboBox, "show owned", "Game");
         saveSettingBool(stretchBackgroundCheckBox, "stretch menu background", "GUI");
         saveSettingBool(useZoomOnMapCheckBox, "allow zooming", "Map");
         saveSettingBool(graphicHerbalismCheckBox, "graphic herbalism", "Game");
@@ -377,7 +383,8 @@ void Launcher::AdvancedPage::saveSettings()
     // Bug fixes
     {
         saveSettingBool(preventMerchantEquippingCheckBox, "prevent merchant equipping", "Game");
-        saveSettingBool(trainersTrainingSkillsBasedOnBaseSkillCheckBox, "trainers training skills based on base skill", "Game");
+        saveSettingBool(
+            trainersTrainingSkillsBasedOnBaseSkillCheckBox, "trainers training skills based on base skill", "Game");
     }
 
     // Miscellaneous
@@ -413,39 +420,39 @@ void Launcher::AdvancedPage::saveSettings()
     }
 }
 
-void Launcher::AdvancedPage::loadSettingBool(QCheckBox *checkbox, const std::string &setting, const std::string &group)
+void Launcher::AdvancedPage::loadSettingBool(QCheckBox* checkbox, const std::string& setting, const std::string& group)
 {
     if (Settings::Manager::getBool(setting, group))
         checkbox->setCheckState(Qt::Checked);
 }
 
-void Launcher::AdvancedPage::saveSettingBool(QCheckBox *checkbox, const std::string &setting, const std::string &group)
+void Launcher::AdvancedPage::saveSettingBool(QCheckBox* checkbox, const std::string& setting, const std::string& group)
 {
     bool cValue = checkbox->checkState();
     if (cValue != Settings::Manager::getBool(setting, group))
         Settings::Manager::setBool(setting, group, cValue);
 }
 
-void Launcher::AdvancedPage::loadSettingInt(QComboBox *comboBox, const std::string &setting, const std::string &group)
+void Launcher::AdvancedPage::loadSettingInt(QComboBox* comboBox, const std::string& setting, const std::string& group)
 {
     int currentIndex = Settings::Manager::getInt(setting, group);
     comboBox->setCurrentIndex(currentIndex);
 }
 
-void Launcher::AdvancedPage::saveSettingInt(QComboBox *comboBox, const std::string &setting, const std::string &group)
+void Launcher::AdvancedPage::saveSettingInt(QComboBox* comboBox, const std::string& setting, const std::string& group)
 {
     int currentIndex = comboBox->currentIndex();
     if (currentIndex != Settings::Manager::getInt(setting, group))
         Settings::Manager::setInt(setting, group, currentIndex);
 }
 
-void Launcher::AdvancedPage::loadSettingInt(QSpinBox *spinBox, const std::string &setting, const std::string &group)
+void Launcher::AdvancedPage::loadSettingInt(QSpinBox* spinBox, const std::string& setting, const std::string& group)
 {
     int value = Settings::Manager::getInt(setting, group);
     spinBox->setValue(value);
 }
 
-void Launcher::AdvancedPage::saveSettingInt(QSpinBox *spinBox, const std::string &setting, const std::string &group)
+void Launcher::AdvancedPage::saveSettingInt(QSpinBox* spinBox, const std::string& setting, const std::string& group)
 {
     int value = spinBox->value();
     if (value != Settings::Manager::getInt(setting, group))
diff --git a/apps/launcher/advancedpage.hpp b/apps/launcher/advancedpage.hpp
index a011602da8..0d5bc258d3 100644
--- a/apps/launcher/advancedpage.hpp
+++ b/apps/launcher/advancedpage.hpp
@@ -8,7 +8,10 @@
 
 #include <components/settings/settings.hpp>
 
-namespace Config { class GameSettings; }
+namespace Config
+{
+    class GameSettings;
+}
 
 namespace Launcher
 {
@@ -17,7 +20,7 @@ namespace Launcher
         Q_OBJECT
 
     public:
-        explicit AdvancedPage(Config::GameSettings &gameSettings, QWidget *parent = nullptr);
+        explicit AdvancedPage(Config::GameSettings& gameSettings, QWidget* parent = nullptr);
 
         bool loadSettings();
         void saveSettings();
@@ -33,7 +36,7 @@ namespace Launcher
         void slotSkyBlendingToggled(bool checked);
 
     private:
-        Config::GameSettings &mGameSettings;
+        Config::GameSettings& mGameSettings;
         QCompleter mCellNameCompleter;
         QStringListModel mCellNameCompleterModel;
 
@@ -42,12 +45,12 @@ namespace Launcher
          * @param filePaths the file paths of the content files to be examined
          */
         void loadCellsForAutocomplete(QStringList filePaths);
-        static void loadSettingBool(QCheckBox *checkbox, const std::string& setting, const std::string& group);
-        static void saveSettingBool(QCheckBox *checkbox, const std::string& setting, const std::string& group);
-        static void loadSettingInt(QComboBox *comboBox, const std::string& setting, const std::string& group);
-        static void saveSettingInt(QComboBox *comboBox, const std::string& setting, const std::string& group);
-        static void loadSettingInt(QSpinBox *spinBox, const std::string& setting, const std::string& group);
-        static void saveSettingInt(QSpinBox *spinBox, const std::string& setting, const std::string& group);
+        static void loadSettingBool(QCheckBox* checkbox, const std::string& setting, const std::string& group);
+        static void saveSettingBool(QCheckBox* checkbox, const std::string& setting, const std::string& group);
+        static void loadSettingInt(QComboBox* comboBox, const std::string& setting, const std::string& group);
+        static void saveSettingInt(QComboBox* comboBox, const std::string& setting, const std::string& group);
+        static void loadSettingInt(QSpinBox* spinBox, const std::string& setting, const std::string& group);
+        static void saveSettingInt(QSpinBox* spinBox, const std::string& setting, const std::string& group);
     };
 }
 #endif
diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index e7b03164b6..7a40d23baf 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -2,13 +2,13 @@
 #include "maindialog.hpp"
 
 #include <QDebug>
-#include <QPushButton>
-#include <QMessageBox>
 #include <QFileDialog>
+#include <QMessageBox>
+#include <QPushButton>
 
-#include <thread>
-#include <mutex>
 #include <algorithm>
+#include <mutex>
+#include <thread>
 
 #include <apps/launcher/utils/cellnameloader.hpp>
 #include <components/files/configurationmanager.hpp>
@@ -31,18 +31,18 @@
 
 #include "ui_directorypicker.h"
 
-const char *Launcher::DataFilesPage::mDefaultContentListName = "Default";
+const char* Launcher::DataFilesPage::mDefaultContentListName = "Default";
 
 namespace
 {
     void contentSubdirs(const QString& path, QStringList& dirs)
     {
-        QStringList fileFilter {"*.esm", "*.esp", "*.omwaddon", "*.bsa"};
-        QStringList dirFilter {"bookart", "icons", "meshes", "music", "sound", "textures"};
+        QStringList fileFilter{ "*.esm", "*.esp", "*.omwaddon", "*.bsa" };
+        QStringList dirFilter{ "bookart", "icons", "meshes", "music", "sound", "textures" };
 
         QDir currentDir(path);
         if (!currentDir.entryInfoList(fileFilter, QDir::Files).empty()
-                || !currentDir.entryInfoList(dirFilter, QDir::Dirs | QDir::NoDotAndDotDot).empty())
+            || !currentDir.entryInfoList(dirFilter, QDir::Dirs | QDir::NoDotAndDotDot).empty())
             dirs.push_back(currentDir.canonicalPath());
 
         for (const auto& subdir : currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot))
@@ -63,61 +63,44 @@ namespace Launcher
 
             HandleNavMeshToolMessage operator()(NavMeshTool::ExpectedCells&& message) const
             {
-                return HandleNavMeshToolMessage {
-                    static_cast<int>(message.mCount),
-                    mExpectedMaxProgress,
-                    static_cast<int>(message.mCount) * 100,
-                    mProgress
-                };
+                return HandleNavMeshToolMessage{ static_cast<int>(message.mCount), mExpectedMaxProgress,
+                    static_cast<int>(message.mCount) * 100, mProgress };
             }
 
             HandleNavMeshToolMessage operator()(NavMeshTool::ProcessedCells&& message) const
             {
-                return HandleNavMeshToolMessage {
-                    mCellsCount,
-                    mExpectedMaxProgress,
-                    mMaxProgress,
-                    std::max(mProgress, static_cast<int>(message.mCount))
-                };
+                return HandleNavMeshToolMessage{ mCellsCount, mExpectedMaxProgress, mMaxProgress,
+                    std::max(mProgress, static_cast<int>(message.mCount)) };
             }
 
             HandleNavMeshToolMessage operator()(NavMeshTool::ExpectedTiles&& message) const
             {
                 const int expectedMaxProgress = mCellsCount + static_cast<int>(message.mCount);
-                return HandleNavMeshToolMessage {
-                    mCellsCount,
-                    expectedMaxProgress,
-                    std::max(mMaxProgress, expectedMaxProgress),
-                    mProgress
-                };
+                return HandleNavMeshToolMessage{ mCellsCount, expectedMaxProgress,
+                    std::max(mMaxProgress, expectedMaxProgress), mProgress };
             }
 
             HandleNavMeshToolMessage operator()(NavMeshTool::GeneratedTiles&& message) const
             {
                 int progress = mCellsCount + static_cast<int>(message.mCount);
                 if (mExpectedMaxProgress < mMaxProgress)
-                    progress += static_cast<int>(std::round(
-                        (mMaxProgress - mExpectedMaxProgress)
-                        * (static_cast<float>(progress) / static_cast<float>(mExpectedMaxProgress))
-                    ));
-                return HandleNavMeshToolMessage {
-                    mCellsCount,
-                    mExpectedMaxProgress,
-                    mMaxProgress,
-                    std::max(mProgress, progress)
-                };
+                    progress += static_cast<int>(std::round((mMaxProgress - mExpectedMaxProgress)
+                        * (static_cast<float>(progress) / static_cast<float>(mExpectedMaxProgress))));
+                return HandleNavMeshToolMessage{ mCellsCount, mExpectedMaxProgress, mMaxProgress,
+                    std::max(mProgress, progress) };
             }
         };
 
         int getMaxNavMeshDbFileSizeMiB()
         {
-            return static_cast<int>(Settings::Manager::getInt64("max navmeshdb file size", "Navigator") / (1024 * 1024));
+            return static_cast<int>(
+                Settings::Manager::getInt64("max navmeshdb file size", "Navigator") / (1024 * 1024));
         }
     }
 }
 
-Launcher::DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings,
-                                       Config::LauncherSettings &launcherSettings, MainDialog *parent)
+Launcher::DataFilesPage::DataFilesPage(Files::ConfigurationManager& cfg, Config::GameSettings& gameSettings,
+    Config::LauncherSettings& launcherSettings, MainDialog* parent)
     : QWidget(parent)
     , mMainDialog(parent)
     , mCfgMgr(cfg)
@@ -125,78 +108,78 @@ Launcher::DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, Config:
     , mLauncherSettings(launcherSettings)
     , mNavMeshToolInvoker(new Process::ProcessInvoker(this))
 {
-    ui.setupUi (this);
-    setObjectName ("DataFilesPage");
-    mSelector = new ContentSelectorView::ContentSelector (ui.contentSelectorWidget, /*showOMWScripts=*/true);
+    ui.setupUi(this);
+    setObjectName("DataFilesPage");
+    mSelector = new ContentSelectorView::ContentSelector(ui.contentSelectorWidget, /*showOMWScripts=*/true);
     const QString encoding = mGameSettings.value("encoding", "win1252");
     mSelector->setEncoding(encoding);
 
     mNewProfileDialog = new TextInputDialog(tr("New Content List"), tr("Content List name:"), this);
     mCloneProfileDialog = new TextInputDialog(tr("Clone Content List"), tr("Content List name:"), this);
 
-    connect(mNewProfileDialog->lineEdit(), &LineEdit::textChanged,
-            this, &DataFilesPage::updateNewProfileOkButton);
-    connect(mCloneProfileDialog->lineEdit(), &LineEdit::textChanged,
-            this, &DataFilesPage::updateCloneProfileOkButton);
+    connect(mNewProfileDialog->lineEdit(), &LineEdit::textChanged, this, &DataFilesPage::updateNewProfileOkButton);
+    connect(mCloneProfileDialog->lineEdit(), &LineEdit::textChanged, this, &DataFilesPage::updateCloneProfileOkButton);
     connect(ui.directoryAddSubdirsButton, &QPushButton::released, this, [this]() { this->addSubdirectories(true); });
-    connect(ui.directoryInsertButton,     &QPushButton::released, this, [this]() { this->addSubdirectories(false); });
-    connect(ui.directoryUpButton,         &QPushButton::released, this, [this]() { this->moveDirectory(-1); });
-    connect(ui.directoryDownButton,       &QPushButton::released, this, [this]() { this->moveDirectory(1); });
-    connect(ui.directoryRemoveButton,     &QPushButton::released, this, [this]() { this->removeDirectory(); });
-    connect(ui.archiveUpButton,           &QPushButton::released, this, [this]() { this->moveArchive(-1); });
-    connect(ui.archiveDownButton,         &QPushButton::released, this, [this]() { this->moveArchive(1); });
-    connect(ui.directoryListWidget->model(), &QAbstractItemModel::rowsMoved, this, [this]() { this->sortDirectories(); });
+    connect(ui.directoryInsertButton, &QPushButton::released, this, [this]() { this->addSubdirectories(false); });
+    connect(ui.directoryUpButton, &QPushButton::released, this, [this]() { this->moveDirectory(-1); });
+    connect(ui.directoryDownButton, &QPushButton::released, this, [this]() { this->moveDirectory(1); });
+    connect(ui.directoryRemoveButton, &QPushButton::released, this, [this]() { this->removeDirectory(); });
+    connect(ui.archiveUpButton, &QPushButton::released, this, [this]() { this->moveArchive(-1); });
+    connect(ui.archiveDownButton, &QPushButton::released, this, [this]() { this->moveArchive(1); });
+    connect(
+        ui.directoryListWidget->model(), &QAbstractItemModel::rowsMoved, this, [this]() { this->sortDirectories(); });
 
     buildView();
     loadSettings();
 
     // Connect signal and slot after the settings have been loaded. We only care about the user changing
     // the addons and don't want to get signals of the system doing it during startup.
-    connect(mSelector, &ContentSelectorView::ContentSelector::signalAddonDataChanged,
-            this, &DataFilesPage::slotAddonDataChanged);
+    connect(mSelector, &ContentSelectorView::ContentSelector::signalAddonDataChanged, this,
+        &DataFilesPage::slotAddonDataChanged);
     // Call manually to indicate all changes to addon data during startup.
     slotAddonDataChanged();
 }
 
 void Launcher::DataFilesPage::buildView()
 {
-    QToolButton * refreshButton = mSelector->refreshButton();
+    QToolButton* refreshButton = mSelector->refreshButton();
 
-    //tool buttons
-    ui.newProfileButton->setToolTip ("Create a new Content List");
-    ui.cloneProfileButton->setToolTip ("Clone the current Content List");
-    ui.deleteProfileButton->setToolTip ("Delete an existing Content List");
+    // tool buttons
+    ui.newProfileButton->setToolTip("Create a new Content List");
+    ui.cloneProfileButton->setToolTip("Clone the current Content List");
+    ui.deleteProfileButton->setToolTip("Delete an existing Content List");
 
-    //combo box
+    // combo box
     ui.profilesComboBox->addItem(mDefaultContentListName);
-    ui.profilesComboBox->setPlaceholderText (QString("Select a Content List..."));
+    ui.profilesComboBox->setPlaceholderText(QString("Select a Content List..."));
     ui.profilesComboBox->setCurrentIndex(ui.profilesComboBox->findText(QLatin1String(mDefaultContentListName)));
 
     // Add the actions to the toolbuttons
-    ui.newProfileButton->setDefaultAction (ui.newProfileAction);
-    ui.cloneProfileButton->setDefaultAction (ui.cloneProfileAction);
-    ui.deleteProfileButton->setDefaultAction (ui.deleteProfileAction);
+    ui.newProfileButton->setDefaultAction(ui.newProfileAction);
+    ui.cloneProfileButton->setDefaultAction(ui.cloneProfileAction);
+    ui.deleteProfileButton->setDefaultAction(ui.deleteProfileAction);
     refreshButton->setDefaultAction(ui.refreshDataFilesAction);
 
-    //establish connections
-    connect (ui.profilesComboBox, qOverload<int>(&::ProfilesComboBox::currentIndexChanged),
-             this, &DataFilesPage::slotProfileChanged);
+    // establish connections
+    connect(ui.profilesComboBox, qOverload<int>(&::ProfilesComboBox::currentIndexChanged), this,
+        &DataFilesPage::slotProfileChanged);
 
-    connect (ui.profilesComboBox, &::ProfilesComboBox::profileRenamed,
-             this, &DataFilesPage::slotProfileRenamed);
+    connect(ui.profilesComboBox, &::ProfilesComboBox::profileRenamed, this, &DataFilesPage::slotProfileRenamed);
 
-    connect (ui.profilesComboBox, qOverload<const QString&,const QString&>(&::ProfilesComboBox::signalProfileChanged),
-             this, &DataFilesPage::slotProfileChangedByUser);
+    connect(ui.profilesComboBox, qOverload<const QString&, const QString&>(&::ProfilesComboBox::signalProfileChanged),
+        this, &DataFilesPage::slotProfileChangedByUser);
 
-    connect(ui.refreshDataFilesAction, &QAction::triggered,
-            this, &DataFilesPage::slotRefreshButtonClicked);
+    connect(ui.refreshDataFilesAction, &QAction::triggered, this, &DataFilesPage::slotRefreshButtonClicked);
 
     connect(ui.updateNavMeshButton, &QPushButton::clicked, this, &DataFilesPage::startNavMeshTool);
     connect(ui.cancelNavMeshButton, &QPushButton::clicked, this, &DataFilesPage::killNavMeshTool);
 
-    connect(mNavMeshToolInvoker->getProcess(), &QProcess::readyReadStandardOutput, this, &DataFilesPage::readNavMeshToolStdout);
-    connect(mNavMeshToolInvoker->getProcess(), &QProcess::readyReadStandardError, this, &DataFilesPage::readNavMeshToolStderr);
-    connect(mNavMeshToolInvoker->getProcess(), qOverload<int,QProcess::ExitStatus>(&QProcess::finished), this, &DataFilesPage::navMeshToolFinished);
+    connect(mNavMeshToolInvoker->getProcess(), &QProcess::readyReadStandardOutput, this,
+        &DataFilesPage::readNavMeshToolStdout);
+    connect(mNavMeshToolInvoker->getProcess(), &QProcess::readyReadStandardError, this,
+        &DataFilesPage::readNavMeshToolStderr);
+    connect(mNavMeshToolInvoker->getProcess(), qOverload<int, QProcess::ExitStatus>(&QProcess::finished), this,
+        &DataFilesPage::navMeshToolFinished);
 }
 
 bool Launcher::DataFilesPage::loadSettings()
@@ -208,8 +191,8 @@ bool Launcher::DataFilesPage::loadSettings()
 
     qDebug() << "The current profile is: " << currentProfile;
 
-    for (const QString &item : profiles)
-        addProfile (item, false);
+    for (const QString& item : profiles)
+        addProfile(item, false);
 
     // Hack: also add the current profile
     if (!currentProfile.isEmpty())
@@ -267,10 +250,11 @@ void Launcher::DataFilesPage::populateFileViews(const QString& contentModelName)
 
         // deactivate data-local and global data directory: they are always included
         const auto tmp = currentDir.toUtf8();
-        if (currentDir == mDataLocal || std::filesystem::path(Misc::StringUtils::stringToU8String(tmp)) == globalDataDir)
+        if (currentDir == mDataLocal
+            || std::filesystem::path(Misc::StringUtils::stringToU8String(tmp)) == globalDataDir)
         {
             auto flags = item->flags();
-            item->setFlags(flags & ~(Qt::ItemIsDragEnabled|Qt::ItemIsDropEnabled|Qt::ItemIsEnabled));
+            item->setFlags(flags & ~(Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | Qt::ItemIsEnabled));
         }
 
         // Add a "data file" icon if the directory contains a content file
@@ -293,7 +277,7 @@ void Launcher::DataFilesPage::populateFileViews(const QString& contentModelName)
 
     QStringList selectedArchives = mLauncherSettings.getArchiveList(contentModelName);
     if (selectedArchives.isEmpty())
-         selectedArchives = mGameSettings.getArchiveList();
+        selectedArchives = mGameSettings.getArchiveList();
 
     // sort and tick BSA according to profile
     int row = 0;
@@ -331,27 +315,28 @@ QStringList Launcher::DataFilesPage::filesInProfile(const QString& profileName,
     return filepaths;
 }
 
-void Launcher::DataFilesPage::saveSettings(const QString &profile)
+void Launcher::DataFilesPage::saveSettings(const QString& profile)
 {
     if (const int value = ui.navMeshMaxSizeSpinBox->value(); value != getMaxNavMeshDbFileSizeMiB())
-        Settings::Manager::setInt64("max navmeshdb file size", "Navigator", static_cast<std::int64_t>(value) * 1024 * 1024);
+        Settings::Manager::setInt64(
+            "max navmeshdb file size", "Navigator", static_cast<std::int64_t>(value) * 1024 * 1024);
 
     QString profileName = profile;
 
     if (profileName.isEmpty())
         profileName = ui.profilesComboBox->currentText();
 
-    //retrieve the data paths
+    // retrieve the data paths
     auto dirList = selectedDirectoriesPaths();
 
-    //retrieve the files selected for the profile
+    // retrieve the files selected for the profile
     ContentSelectorModel::ContentFileList items = mSelector->selectedFiles();
 
-    //set the value of the current profile (not necessarily the profile being saved!)
+    // set the value of the current profile (not necessarily the profile being saved!)
     mLauncherSettings.setCurrentContentListName(ui.profilesComboBox->currentText());
 
     QStringList fileNames;
-    for (const ContentSelectorModel::EsmFile *item : items)
+    for (const ContentSelectorModel::EsmFile* item : items)
     {
         fileNames.append(item->fileName());
     }
@@ -361,49 +346,49 @@ void Launcher::DataFilesPage::saveSettings(const QString &profile)
 
 QStringList Launcher::DataFilesPage::selectedDirectoriesPaths() const
 {
-   QStringList dirList;
-   for (int i = 0; i < ui.directoryListWidget->count(); ++i)
-   {
-       if (ui.directoryListWidget->item(i)->flags() & Qt::ItemIsEnabled)
-           dirList.append(ui.directoryListWidget->item(i)->text());
-   }
-   return dirList;
+    QStringList dirList;
+    for (int i = 0; i < ui.directoryListWidget->count(); ++i)
+    {
+        if (ui.directoryListWidget->item(i)->flags() & Qt::ItemIsEnabled)
+            dirList.append(ui.directoryListWidget->item(i)->text());
+    }
+    return dirList;
 }
 
 QStringList Launcher::DataFilesPage::selectedArchivePaths(bool all) const
 {
-   QStringList archiveList;
-   for (int i = 0; i < ui.archiveListWidget->count(); ++i)
-   {
-       const auto* item = ui.archiveListWidget->item(i);
-       const auto archive = ui.archiveListWidget->item(i)->text();
+    QStringList archiveList;
+    for (int i = 0; i < ui.archiveListWidget->count(); ++i)
+    {
+        const auto* item = ui.archiveListWidget->item(i);
+        const auto archive = ui.archiveListWidget->item(i)->text();
 
-       if (all ||item->checkState() == Qt::Checked)
-           archiveList.append(item->text());
-   }
-   return archiveList;
+        if (all || item->checkState() == Qt::Checked)
+            archiveList.append(item->text());
+    }
+    return archiveList;
 }
 
 QStringList Launcher::DataFilesPage::selectedFilePaths() const
 {
-    //retrieve the files selected for the profile
+    // retrieve the files selected for the profile
     ContentSelectorModel::ContentFileList items = mSelector->selectedFiles();
     QStringList filePaths;
-    for (const ContentSelectorModel::EsmFile *item : items)
+    for (const ContentSelectorModel::EsmFile* item : items)
     {
         QFile file(item->filePath());
-        if(file.exists())
+        if (file.exists())
             filePaths.append(item->filePath());
     }
     return filePaths;
 }
 
-void Launcher::DataFilesPage::removeProfile(const QString &profile)
+void Launcher::DataFilesPage::removeProfile(const QString& profile)
 {
     mLauncherSettings.removeContentList(profile);
 }
 
-QAbstractItemModel *Launcher::DataFilesPage::profilesModel() const
+QAbstractItemModel* Launcher::DataFilesPage::profilesModel() const
 {
     return ui.profilesComboBox->model();
 }
@@ -422,20 +407,20 @@ void Launcher::DataFilesPage::setProfile(int index, bool savePrevious)
 
         mPreviousProfile = current;
 
-        setProfile (previous, current, savePrevious);
+        setProfile(previous, current, savePrevious);
     }
 }
 
-void Launcher::DataFilesPage::setProfile (const QString &previous, const QString &current, bool savePrevious)
+void Launcher::DataFilesPage::setProfile(const QString& previous, const QString& current, bool savePrevious)
 {
-    //abort if no change (poss. duplicate signal)
+    // abort if no change (poss. duplicate signal)
     if (previous == current)
-            return;
+        return;
 
     if (!previous.isEmpty() && savePrevious)
-        saveSettings (previous);
+        saveSettings(previous);
 
-    ui.profilesComboBox->setCurrentProfile (ui.profilesComboBox->findText (current));
+    ui.profilesComboBox->setCurrentProfile(ui.profilesComboBox->findText(current));
 
     mNewDataDirs.clear();
     mKnownArchives.clear();
@@ -451,30 +436,30 @@ void Launcher::DataFilesPage::setProfile (const QString &previous, const QString
     checkForDefaultProfile();
 }
 
-void Launcher::DataFilesPage::slotProfileDeleted (const QString &item)
+void Launcher::DataFilesPage::slotProfileDeleted(const QString& item)
 {
-    removeProfile (item);
+    removeProfile(item);
 }
 
-void Launcher::DataFilesPage:: refreshDataFilesView ()
+void Launcher::DataFilesPage::refreshDataFilesView()
 {
     QString currentProfile = ui.profilesComboBox->currentText();
     saveSettings(currentProfile);
     populateFileViews(currentProfile);
 }
 
-void Launcher::DataFilesPage::slotRefreshButtonClicked ()
+void Launcher::DataFilesPage::slotRefreshButtonClicked()
 {
     refreshDataFilesView();
 }
 
-void Launcher::DataFilesPage::slotProfileChangedByUser(const QString &previous, const QString &current)
+void Launcher::DataFilesPage::slotProfileChangedByUser(const QString& previous, const QString& current)
 {
     setProfile(previous, current, true);
-    emit signalProfileChanged (ui.profilesComboBox->findText(current));
+    emit signalProfileChanged(ui.profilesComboBox->findText(current));
 }
 
-void Launcher::DataFilesPage::slotProfileRenamed(const QString &previous, const QString &current)
+void Launcher::DataFilesPage::slotProfileRenamed(const QString& previous, const QString& current)
 {
     if (previous.isEmpty())
         return;
@@ -483,7 +468,7 @@ void Launcher::DataFilesPage::slotProfileRenamed(const QString &previous, const
     saveSettings();
 
     // Remove the old one
-    removeProfile (previous);
+    removeProfile(previous);
 
     loadSettings();
 }
@@ -494,7 +479,7 @@ void Launcher::DataFilesPage::slotProfileChanged(int index)
     if (ui.profilesComboBox->currentIndex() != index)
         ui.profilesComboBox->setCurrentIndex(index);
 
-    setProfile (index, true);
+    setProfile(index, true);
 }
 
 void Launcher::DataFilesPage::on_newProfileAction_triggered()
@@ -514,16 +499,16 @@ void Launcher::DataFilesPage::on_newProfileAction_triggered()
     addProfile(profile, true);
 }
 
-void Launcher::DataFilesPage::addProfile (const QString &profile, bool setAsCurrent)
+void Launcher::DataFilesPage::addProfile(const QString& profile, bool setAsCurrent)
 {
     if (profile.isEmpty())
         return;
 
-    if (ui.profilesComboBox->findText (profile) == -1)
-        ui.profilesComboBox->addItem (profile);
+    if (ui.profilesComboBox->findText(profile) == -1)
+        ui.profilesComboBox->addItem(profile);
 
     if (setAsCurrent)
-        setProfile (ui.profilesComboBox->findText (profile), false);
+        setProfile(ui.profilesComboBox->findText(profile), false);
 }
 
 void Launcher::DataFilesPage::on_cloneProfileAction_triggered()
@@ -547,11 +532,11 @@ void Launcher::DataFilesPage::on_deleteProfileAction_triggered()
     if (profile.isEmpty())
         return;
 
-    if (!showDeleteMessageBox (profile))
+    if (!showDeleteMessageBox(profile))
         return;
 
     // this should work since the Default profile can't be deleted and is always index 0
-    int next = ui.profilesComboBox->currentIndex()-1;
+    int next = ui.profilesComboBox->currentIndex() - 1;
 
     // changing the profile forces a reload of plugin file views.
     ui.profilesComboBox->setCurrentIndex(next);
@@ -562,13 +547,13 @@ void Launcher::DataFilesPage::on_deleteProfileAction_triggered()
     checkForDefaultProfile();
 }
 
-void Launcher::DataFilesPage::updateNewProfileOkButton(const QString &text)
+void Launcher::DataFilesPage::updateNewProfileOkButton(const QString& text)
 {
     // We do this here because we need the profiles combobox text
     mNewProfileDialog->setOkButtonEnabled(!text.isEmpty() && ui.profilesComboBox->findText(text) == -1);
 }
 
-void Launcher::DataFilesPage::updateCloneProfileOkButton(const QString &text)
+void Launcher::DataFilesPage::updateCloneProfileOkButton(const QString& text)
 {
     // We do this here because we need the profiles combobox text
     mCloneProfileDialog->setOkButtonEnabled(!text.isEmpty() && ui.profilesComboBox->findText(text) == -1);
@@ -584,7 +569,6 @@ QString Launcher::DataFilesPage::selectDirectory()
         return {};
 
     return QDir(fileDialog.selectedFiles()[0]).canonicalPath();
-
 }
 
 void Launcher::DataFilesPage::addSubdirectories(bool append)
@@ -634,12 +618,12 @@ void Launcher::DataFilesPage::addSubdirectories(bool append)
 
     for (int i = 0; i < select.dirListWidget->count(); ++i)
     {
-       const auto* dir = select.dirListWidget->item(i);
-       if (dir->checkState() == Qt::Checked)
-       {
-           ui.directoryListWidget->insertItem(selectedRow++, dir->text());
-           mNewDataDirs.push_back(dir->text());
-       }
+        const auto* dir = select.dirListWidget->item(i);
+        if (dir->checkState() == Qt::Checked)
+        {
+            ui.directoryListWidget->insertItem(selectedRow++, dir->text());
+            mNewDataDirs.push_back(dir->text());
+        }
     }
 
     refreshDataFilesView();
@@ -650,8 +634,8 @@ void Launcher::DataFilesPage::sortDirectories()
     // Ensure disabled entries (aka default directories) are always at the top.
     for (auto i = 1; i < ui.directoryListWidget->count(); ++i)
     {
-        if (!(ui.directoryListWidget->item(i)->flags() & Qt::ItemIsEnabled) &&
-            (ui.directoryListWidget->item(i - 1)->flags() & Qt::ItemIsEnabled))
+        if (!(ui.directoryListWidget->item(i)->flags() & Qt::ItemIsEnabled)
+            && (ui.directoryListWidget->item(i - 1)->flags() & Qt::ItemIsEnabled))
         {
             const auto item = ui.directoryListWidget->takeItem(i);
             ui.directoryListWidget->insertItem(i - 1, item);
@@ -728,14 +712,14 @@ void Launcher::DataFilesPage::addArchivesFromDir(const QString& path)
 
 void Launcher::DataFilesPage::checkForDefaultProfile()
 {
-    //don't allow deleting "Default" profile
+    // don't allow deleting "Default" profile
     bool success = (ui.profilesComboBox->currentText() != mDefaultContentListName);
 
-    ui.deleteProfileAction->setEnabled (success);
-    ui.profilesComboBox->setEditEnabled (success);
+    ui.deleteProfileAction->setEnabled(success);
+    ui.profilesComboBox->setEditEnabled(success);
 }
 
-bool Launcher::DataFilesPage::showDeleteMessageBox (const QString &text)
+bool Launcher::DataFilesPage::showDeleteMessageBox(const QString& text)
 {
     QMessageBox msgBox(this);
     msgBox.setWindowTitle(tr("Delete Content List"));
@@ -743,8 +727,7 @@ bool Launcher::DataFilesPage::showDeleteMessageBox (const QString &text)
     msgBox.setStandardButtons(QMessageBox::Cancel);
     msgBox.setText(tr("Are you sure you want to delete <b>%1</b>?").arg(text));
 
-    QAbstractButton *deleteButton =
-    msgBox.addButton(tr("Delete"), QMessageBox::ActionRole);
+    QAbstractButton* deleteButton = msgBox.addButton(tr("Delete"), QMessageBox::ActionRole);
 
     msgBox.exec();
 
@@ -754,7 +737,8 @@ bool Launcher::DataFilesPage::showDeleteMessageBox (const QString &text)
 void Launcher::DataFilesPage::slotAddonDataChanged()
 {
     QStringList selectedFiles = selectedFilePaths();
-    if (previousSelectedFiles != selectedFiles) {
+    if (previousSelectedFiles != selectedFiles)
+    {
         previousSelectedFiles = selectedFiles;
         // Loading cells for core Morrowind + Expansions takes about 0.2 seconds, which is enough to cause a
         // barely perceptible UI lag. Splitting into its own thread to alleviate that.
@@ -774,7 +758,7 @@ void Launcher::DataFilesPage::reloadCells(QStringList selectedFiles)
 
     // The following code will run only if there is not another thread currently running it
     CellNameLoader cellNameLoader;
-#if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
     QSet<QString> set = cellNameLoader.getCellNames(selectedFiles);
     QStringList cellNamesList(set.begin(), set.end());
 #else
@@ -792,9 +776,9 @@ void Launcher::DataFilesPage::startNavMeshTool()
     ui.navMeshProgressBar->setValue(0);
     ui.navMeshProgressBar->setMaximum(1);
 
-    mNavMeshToolProgress = NavMeshToolProgress {};
+    mNavMeshToolProgress = NavMeshToolProgress{};
 
-    QStringList arguments({"--write-binary-log"});
+    QStringList arguments({ "--write-binary-log" });
     if (ui.navMeshRemoveUnusedTilesCheckBox->checkState() == Qt::Checked)
         arguments.append("--remove-unused-tiles");
 
@@ -824,7 +808,7 @@ void Launcher::DataFilesPage::updateNavMeshProgress(int minDataSize)
     const std::byte* const begin = reinterpret_cast<const std::byte*>(mNavMeshToolProgress.mMessagesData.constData());
     const std::byte* const end = begin + mNavMeshToolProgress.mMessagesData.size();
     const std::byte* position = begin;
-    HandleNavMeshToolMessage handle {
+    HandleNavMeshToolMessage handle{
         mNavMeshToolProgress.mCellsCount,
         mNavMeshToolProgress.mExpectedMaxProgress,
         ui.navMeshProgressBar->maximum(),
@@ -863,7 +847,8 @@ void Launcher::DataFilesPage::readNavMeshToolStdout()
 void Launcher::DataFilesPage::navMeshToolFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
     updateNavMeshProgress(0);
-    ui.navMeshLogPlainTextEdit->appendPlainText(QString::fromUtf8(mNavMeshToolInvoker->getProcess()->readAllStandardOutput()));
+    ui.navMeshLogPlainTextEdit->appendPlainText(
+        QString::fromUtf8(mNavMeshToolInvoker->getProcess()->readAllStandardOutput()));
     if (exitCode == 0 && exitStatus == QProcess::ExitStatus::NormalExit)
         ui.navMeshProgressBar->setValue(ui.navMeshProgressBar->maximum());
     ui.cancelNavMeshButton->setEnabled(false);
diff --git a/apps/launcher/datafilespage.hpp b/apps/launcher/datafilespage.hpp
index 0a235209f3..52b07da240 100644
--- a/apps/launcher/datafilespage.hpp
+++ b/apps/launcher/datafilespage.hpp
@@ -5,18 +5,27 @@
 
 #include <components/process/processinvoker.hpp>
 
-#include <QWidget>
 #include <QDir>
 #include <QStringList>
+#include <QWidget>
 
 class QSortFilterProxyModel;
 class QAbstractItemModel;
 class QMenu;
 
-namespace Files { struct ConfigurationManager; }
-namespace ContentSelectorView { class ContentSelector; }
-namespace Config { class GameSettings;
-                   class LauncherSettings; }
+namespace Files
+{
+    struct ConfigurationManager;
+}
+namespace ContentSelectorView
+{
+    class ContentSelector;
+}
+namespace Config
+{
+    class GameSettings;
+    class LauncherSettings;
+}
 
 namespace Launcher
 {
@@ -28,38 +37,38 @@ namespace Launcher
     {
         Q_OBJECT
 
-        ContentSelectorView::ContentSelector *mSelector;
+        ContentSelectorView::ContentSelector* mSelector;
         Ui::DataFilesPage ui;
 
     public:
-        explicit DataFilesPage (Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings,
-                                Config::LauncherSettings &launcherSettings, MainDialog *parent = nullptr);
+        explicit DataFilesPage(Files::ConfigurationManager& cfg, Config::GameSettings& gameSettings,
+            Config::LauncherSettings& launcherSettings, MainDialog* parent = nullptr);
 
         QAbstractItemModel* profilesModel() const;
 
         int profilesIndex() const;
 
-        //void writeConfig(QString profile = QString());
-        void saveSettings(const QString &profile = "");
+        // void writeConfig(QString profile = QString());
+        void saveSettings(const QString& profile = "");
         bool loadSettings();
 
     signals:
-        void signalProfileChanged (int index);
+        void signalProfileChanged(int index);
         void signalLoadedCellsChanged(QStringList selectedFiles);
 
     public slots:
-        void slotProfileChanged (int index);
+        void slotProfileChanged(int index);
 
     private slots:
 
-        void slotProfileChangedByUser(const QString &previous, const QString &current);
-        void slotProfileRenamed(const QString &previous, const QString &current);
-        void slotProfileDeleted(const QString &item);
-        void slotAddonDataChanged ();
-        void slotRefreshButtonClicked ();
+        void slotProfileChangedByUser(const QString& previous, const QString& current);
+        void slotProfileRenamed(const QString& previous, const QString& current);
+        void slotProfileDeleted(const QString& item);
+        void slotAddonDataChanged();
+        void slotRefreshButtonClicked();
 
-        void updateNewProfileOkButton(const QString &text);
-        void updateCloneProfileOkButton(const QString &text);
+        void updateNewProfileOkButton(const QString& text);
+        void updateCloneProfileOkButton(const QString& text);
         void addSubdirectories(bool append);
         void sortDirectories();
         void removeDirectory();
@@ -78,7 +87,7 @@ namespace Launcher
 
     public:
         /// Content List that is always present
-        const static char *mDefaultContentListName;
+        const static char* mDefaultContentListName;
 
     private:
         struct NavMeshToolProgress
@@ -90,14 +99,14 @@ namespace Launcher
             int mExpectedMaxProgress = 0;
         };
 
-        MainDialog *mMainDialog;
-        TextInputDialog *mNewProfileDialog;
-        TextInputDialog *mCloneProfileDialog;
+        MainDialog* mMainDialog;
+        TextInputDialog* mNewProfileDialog;
+        TextInputDialog* mCloneProfileDialog;
 
-        Files::ConfigurationManager &mCfgMgr;
+        Files::ConfigurationManager& mCfgMgr;
 
-        Config::GameSettings &mGameSettings;
-        Config::LauncherSettings &mLauncherSettings;
+        Config::GameSettings& mGameSettings;
+        Config::LauncherSettings& mLauncherSettings;
 
         QString mPreviousProfile;
         QStringList previousSelectedFiles;
@@ -111,15 +120,15 @@ namespace Launcher
         void addArchive(const QString& name, Qt::CheckState selected, int row = -1);
         void addArchivesFromDir(const QString& dir);
         void buildView();
-        void setProfile (int index, bool savePrevious);
-        void setProfile (const QString &previous, const QString &current, bool savePrevious);
-        void removeProfile (const QString &profile);
-        bool showDeleteMessageBox (const QString &text);
-        void addProfile (const QString &profile, bool setAsCurrent);
+        void setProfile(int index, bool savePrevious);
+        void setProfile(const QString& previous, const QString& current, bool savePrevious);
+        void removeProfile(const QString& profile);
+        bool showDeleteMessageBox(const QString& text);
+        void addProfile(const QString& profile, bool setAsCurrent);
         void checkForDefaultProfile();
         void populateFileViews(const QString& contentModelName);
         void reloadCells(QStringList selectedFiles);
-        void refreshDataFilesView ();
+        void refreshDataFilesView();
         void updateNavMeshProgress(int minDataSize);
         QString selectDirectory();
 
@@ -128,7 +137,7 @@ namespace Launcher
          * @return the file paths of all selected content files
          */
         QStringList selectedFilePaths() const;
-        QStringList selectedArchivePaths(bool all=false) const;
+        QStringList selectedArchivePaths(bool all = false) const;
         QStringList selectedDirectoriesPaths() const;
 
         class PathIterator
@@ -140,25 +149,24 @@ namespace Launcher
             QString mFilePath;
 
         public:
-            PathIterator (const QStringList &list)
+            PathIterator(const QStringList& list)
             {
                 mCitBegin = list.constBegin();
                 mCitCurrent = mCitBegin;
                 mCitEnd = list.constEnd();
             }
 
-            QString findFirstPath (const QString &file)
+            QString findFirstPath(const QString& file)
             {
                 mCitCurrent = mCitBegin;
                 mFile = file;
                 return path();
             }
 
-            QString findNextPath () { return path(); }
+            QString findNextPath() { return path(); }
 
         private:
-
-            QString path ()
+            QString path()
             {
                 bool success = false;
                 QDir dir;
@@ -169,8 +177,8 @@ namespace Launcher
                     if (mCitCurrent == mCitEnd)
                         break;
 
-                    dir.setPath (*(mCitCurrent++));
-                    file.setFile (dir.absoluteFilePath (mFile));
+                    dir.setPath(*(mCitCurrent++));
+                    file.setFile(dir.absoluteFilePath(mFile));
 
                     success = file.exists();
                 }
@@ -180,7 +188,6 @@ namespace Launcher
 
                 return "";
             }
-
         };
 
         QStringList filesInProfile(const QString& profileName, PathIterator& pathIterator);
diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp
index 363f0ec03b..7ee8ac2c05 100644
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@@ -13,12 +13,12 @@
 
 #include <SDL_video.h>
 
-#include <numeric>
 #include <array>
+#include <numeric>
 
 QString getAspect(int x, int y)
 {
-    int gcd = std::gcd (x, y);
+    int gcd = std::gcd(x, y);
     if (gcd == 0)
         return QString();
 
@@ -31,10 +31,10 @@ QString getAspect(int x, int y)
     return QString(QString::number(xaspect) + ":" + QString::number(yaspect));
 }
 
-Launcher::GraphicsPage::GraphicsPage(QWidget *parent)
+Launcher::GraphicsPage::GraphicsPage(QWidget* parent)
     : QWidget(parent)
 {
-    setObjectName ("GraphicsPage");
+    setObjectName("GraphicsPage");
     setupUi(this);
 
     // Set the maximum res we can set in windowed mode
@@ -42,7 +42,8 @@ Launcher::GraphicsPage::GraphicsPage(QWidget *parent)
     customWidthSpinBox->setMaximum(res.width());
     customHeightSpinBox->setMaximum(res.height());
 
-    connect(windowModeComboBox, qOverload<int>(&QComboBox::currentIndexChanged), this, &GraphicsPage::slotFullScreenChanged);
+    connect(windowModeComboBox, qOverload<int>(&QComboBox::currentIndexChanged), this,
+        &GraphicsPage::slotFullScreenChanged);
     connect(standardRadioButton, &QRadioButton::toggled, this, &GraphicsPage::slotStandardToggled);
     connect(screenComboBox, qOverload<int>(&QComboBox::currentIndexChanged), this, &GraphicsPage::screenChanged);
     connect(framerateLimitCheckBox, &QCheckBox::toggled, this, &GraphicsPage::slotFramerateLimitToggled);
@@ -65,7 +66,8 @@ bool Launcher::GraphicsPage::setupSDL()
         msgBox.setWindowTitle(tr("Error receiving number of screens"));
         msgBox.setIcon(QMessageBox::Critical);
         msgBox.setStandardButtons(QMessageBox::Ok);
-        msgBox.setText(tr("<br><b>SDL_GetNumVideoDisplays failed:</b><br><br>") + QString::fromUtf8(SDL_GetError()) + "<br>");
+        msgBox.setText(
+            tr("<br><b>SDL_GetNumVideoDisplays failed:</b><br><br>") + QString::fromUtf8(SDL_GetError()) + "<br>");
         msgBox.exec();
         return false;
     }
@@ -116,10 +118,13 @@ bool Launcher::GraphicsPage::loadSettings()
 
     int resIndex = resolutionComboBox->findText(resolution, Qt::MatchStartsWith);
 
-    if (resIndex != -1) {
+    if (resIndex != -1)
+    {
         standardRadioButton->toggle();
         resolutionComboBox->setCurrentIndex(resIndex);
-    } else {
+    }
+    else
+    {
         customRadioButton->toggle();
         customWidthSpinBox->setValue(width);
         customHeightSpinBox->setValue(height);
@@ -152,9 +157,8 @@ bool Launcher::GraphicsPage::loadSettings()
     if (Settings::Manager::getBool("enable indoor shadows", "Shadows"))
         indoorShadowsCheckBox->setCheckState(Qt::Checked);
 
-    shadowComputeSceneBoundsComboBox->setCurrentIndex(
-        shadowComputeSceneBoundsComboBox->findText(
-            QString(tr(Settings::Manager::getString("compute scene bounds", "Shadows").c_str()))));
+    shadowComputeSceneBoundsComboBox->setCurrentIndex(shadowComputeSceneBoundsComboBox->findText(
+        QString(tr(Settings::Manager::getString("compute scene bounds", "Shadows").c_str()))));
 
     int shadowDistLimit = Settings::Manager::getInt("maximum shadow map distance", "Shadows");
     if (shadowDistLimit > 0)
@@ -199,13 +203,17 @@ void Launcher::GraphicsPage::saveSettings()
 
     int cWidth = 0;
     int cHeight = 0;
-    if (standardRadioButton->isChecked()) {
+    if (standardRadioButton->isChecked())
+    {
         QRegExp resolutionRe(QString("(\\d+) x (\\d+).*"));
-        if (resolutionRe.exactMatch(resolutionComboBox->currentText().simplified())) {
+        if (resolutionRe.exactMatch(resolutionComboBox->currentText().simplified()))
+        {
             cWidth = resolutionRe.cap(1).toInt();
             cHeight = resolutionRe.cap(2).toInt();
         }
-    } else {
+    }
+    else
+    {
         cWidth = customWidthSpinBox->value();
         cHeight = customHeightSpinBox->value();
     }
@@ -232,7 +240,7 @@ void Launcher::GraphicsPage::saveSettings()
     }
 
     // Lighting
-    static std::array<std::string, 3> lightingMethodMap = {"legacy", "shaders compatibility", "shaders"};
+    static std::array<std::string, 3> lightingMethodMap = { "legacy", "shaders compatibility", "shaders" };
     const std::string& cLightingMethod = lightingMethodMap[lightingMethodComboBox->currentIndex()];
     if (cLightingMethod != Settings::Manager::getString("lighting method", "Shaders"))
         Settings::Manager::setString("lighting method", "Shaders", cLightingMethod);
@@ -301,7 +309,8 @@ QStringList Launcher::GraphicsPage::getAvailableResolutions(int screen)
         msgBox.setWindowTitle(tr("Error receiving resolutions"));
         msgBox.setIcon(QMessageBox::Critical);
         msgBox.setStandardButtons(QMessageBox::Ok);
-        msgBox.setText(tr("<br><b>SDL_GetNumDisplayModes failed:</b><br><br>") + QString::fromUtf8(SDL_GetError()) + "<br>");
+        msgBox.setText(
+            tr("<br><b>SDL_GetNumDisplayModes failed:</b><br><br>") + QString::fromUtf8(SDL_GetError()) + "<br>");
         msgBox.exec();
         return result;
     }
@@ -314,7 +323,8 @@ QStringList Launcher::GraphicsPage::getAvailableResolutions(int screen)
             msgBox.setWindowTitle(tr("Error receiving resolutions"));
             msgBox.setIcon(QMessageBox::Critical);
             msgBox.setStandardButtons(QMessageBox::Ok);
-            msgBox.setText(tr("<br><b>SDL_GetDisplayMode failed:</b><br><br>") + QString::fromUtf8(SDL_GetError()) + "<br>");
+            msgBox.setText(
+                tr("<br><b>SDL_GetDisplayMode failed:</b><br><br>") + QString::fromUtf8(SDL_GetError()) + "<br>");
             msgBox.exec();
             return result;
         }
@@ -322,10 +332,12 @@ QStringList Launcher::GraphicsPage::getAvailableResolutions(int screen)
         QString resolution = QString::number(mode.w) + QString(" x ") + QString::number(mode.h);
 
         QString aspect = getAspect(mode.w, mode.h);
-        if (aspect == QLatin1String("16:9") || aspect == QLatin1String("16:10")) {
+        if (aspect == QLatin1String("16:9") || aspect == QLatin1String("16:10"))
+        {
             resolution.append(tr("\t(Wide ") + aspect + ")");
-
-        } else if (aspect == QLatin1String("4:3")) {
+        }
+        else if (aspect == QLatin1String("4:3"))
+        {
             resolution.append(tr("\t(Standard 4:3)"));
         }
 
@@ -353,7 +365,8 @@ QRect Launcher::GraphicsPage::getMaximumResolution()
 
 void Launcher::GraphicsPage::screenChanged(int screen)
 {
-    if (screen >= 0) {
+    if (screen >= 0)
+    {
         resolutionComboBox->clear();
         resolutionComboBox->addItems(mResolutionsPerScreen[screen]);
     }
@@ -361,13 +374,17 @@ void Launcher::GraphicsPage::screenChanged(int screen)
 
 void Launcher::GraphicsPage::slotFullScreenChanged(int mode)
 {
-    if (mode == static_cast<int>(Settings::WindowMode::Fullscreen) || mode == static_cast<int>(Settings::WindowMode::WindowedFullscreen)) {
+    if (mode == static_cast<int>(Settings::WindowMode::Fullscreen)
+        || mode == static_cast<int>(Settings::WindowMode::WindowedFullscreen))
+    {
         standardRadioButton->toggle();
         customRadioButton->setEnabled(false);
         customWidthSpinBox->setEnabled(false);
         customHeightSpinBox->setEnabled(false);
         windowBorderCheckBox->setEnabled(false);
-    } else {
+    }
+    else
+    {
         customRadioButton->setEnabled(true);
         customWidthSpinBox->setEnabled(true);
         customHeightSpinBox->setEnabled(true);
@@ -377,11 +394,14 @@ void Launcher::GraphicsPage::slotFullScreenChanged(int mode)
 
 void Launcher::GraphicsPage::slotStandardToggled(bool checked)
 {
-    if (checked) {
+    if (checked)
+    {
         resolutionComboBox->setEnabled(true);
         customWidthSpinBox->setEnabled(false);
         customHeightSpinBox->setEnabled(false);
-    } else {
+    }
+    else
+    {
         resolutionComboBox->setEnabled(false);
         customWidthSpinBox->setEnabled(true);
         customHeightSpinBox->setEnabled(true);
diff --git a/apps/launcher/graphicspage.hpp b/apps/launcher/graphicspage.hpp
index b90cf3a66b..92bdf35ac4 100644
--- a/apps/launcher/graphicspage.hpp
+++ b/apps/launcher/graphicspage.hpp
@@ -5,7 +5,10 @@
 
 #include <components/settings/settings.hpp>
 
-namespace Files { struct ConfigurationManager; }
+namespace Files
+{
+    struct ConfigurationManager;
+}
 
 namespace Launcher
 {
@@ -16,7 +19,7 @@ namespace Launcher
         Q_OBJECT
 
     public:
-        explicit GraphicsPage(QWidget *parent = nullptr);
+        explicit GraphicsPage(QWidget* parent = nullptr);
 
         void saveSettings();
         bool loadSettings();
diff --git a/apps/launcher/main.cpp b/apps/launcher/main.cpp
index 486f771366..4aca9fc69e 100644
--- a/apps/launcher/main.cpp
+++ b/apps/launcher/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 
-#include <QTranslator>
 #include <QDir>
+#include <QTranslator>
 
 #include <components/debug/debugging.hpp>
 #include <components/platform/platform.hpp>
@@ -14,7 +14,7 @@
 
 #include "maindialog.hpp"
 
-int runLauncher(int argc, char *argv[])
+int runLauncher(int argc, char* argv[])
 {
     Platform::init();
 
@@ -22,7 +22,7 @@ int runLauncher(int argc, char *argv[])
     {
         QApplication app(argc, argv);
 
-        // Internationalization 
+        // Internationalization
         QString locale = QLocale::system().name().section('_', 0, 0);
 
         QTranslator appTranslator;
@@ -54,7 +54,7 @@ int runLauncher(int argc, char *argv[])
     }
 }
 
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 {
     return wrapApplication(runLauncher, argc, argv, "Launcher");
 }
diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index d0f3ebf0bc..9b89edd08a 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -1,14 +1,14 @@
 #include "maindialog.hpp"
 
-#include <components/version/version.hpp>
 #include <components/misc/helpviewer.hpp>
+#include <components/version/version.hpp>
 
-#include <QTime>
-#include <QDir>
+#include <QCloseEvent>
 #include <QDebug>
+#include <QDir>
 #include <QMessageBox>
-#include <QCloseEvent>
 #include <QTextCodec>
+#include <QTime>
 
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/variables_map.hpp>
@@ -23,7 +23,8 @@
 
 using namespace Process;
 
-void cfgError(const QString& title, const QString& msg) {
+void cfgError(const QString& title, const QString& msg)
+{
     QMessageBox msgBox;
     msgBox.setWindowTitle(title);
     msgBox.setIcon(QMessageBox::Critical);
@@ -32,19 +33,19 @@ void cfgError(const QString& title, const QString& msg) {
     msgBox.exec();
 }
 
-Launcher::MainDialog::MainDialog(QWidget *parent)
-    : QMainWindow(parent), mGameSettings (mCfgMgr)
+Launcher::MainDialog::MainDialog(QWidget* parent)
+    : QMainWindow(parent)
+    , mGameSettings(mCfgMgr)
 {
     setupUi(this);
 
     mGameInvoker = new ProcessInvoker();
     mWizardInvoker = new ProcessInvoker();
 
-    connect(mWizardInvoker->getProcess(), &QProcess::started,
-            this, &MainDialog::wizardStarted);
+    connect(mWizardInvoker->getProcess(), &QProcess::started, this, &MainDialog::wizardStarted);
 
-    connect(mWizardInvoker->getProcess(), qOverload<int,QProcess::ExitStatus>(&QProcess::finished),
-            this, &MainDialog::wizardFinished);
+    connect(mWizardInvoker->getProcess(), qOverload<int, QProcess::ExitStatus>(&QProcess::finished), this,
+        &MainDialog::wizardFinished);
 
     iconWidget->setViewMode(QListView::IconMode);
     iconWidget->setWrapping(false);
@@ -56,8 +57,8 @@ Launcher::MainDialog::MainDialog(QWidget *parent)
     iconWidget->setCurrentRow(0);
     iconWidget->setFlow(QListView::LeftToRight);
 
-    auto *helpButton = new QPushButton(tr("Help"));
-    auto *playButton = new QPushButton(tr("Play"));
+    auto* helpButton = new QPushButton(tr("Help"));
+    auto* playButton = new QPushButton(tr("Play"));
     buttonBox->button(QDialogButtonBox::Close)->setText(tr("Close"));
     buttonBox->addButton(helpButton, QDialogButtonBox::HelpRole);
     buttonBox->addButton(playButton, QDialogButtonBox::AcceptRole);
@@ -83,38 +84,37 @@ void Launcher::MainDialog::createIcons()
     if (!QIcon::hasThemeIcon("document-new"))
         QIcon::setThemeName("tango");
 
-    auto *playButton = new QListWidgetItem(iconWidget);
+    auto* playButton = new QListWidgetItem(iconWidget);
     playButton->setIcon(QIcon(":/images/openmw.png"));
     playButton->setText(tr("Play"));
     playButton->setTextAlignment(Qt::AlignCenter);
     playButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 
-    auto *dataFilesButton = new QListWidgetItem(iconWidget);
+    auto* dataFilesButton = new QListWidgetItem(iconWidget);
     dataFilesButton->setIcon(QIcon(":/images/openmw-plugin.png"));
     dataFilesButton->setText(tr("Data Files"));
     dataFilesButton->setTextAlignment(Qt::AlignHCenter | Qt::AlignBottom);
     dataFilesButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 
-    auto *graphicsButton = new QListWidgetItem(iconWidget);
+    auto* graphicsButton = new QListWidgetItem(iconWidget);
     graphicsButton->setIcon(QIcon(":/images/preferences-video.png"));
     graphicsButton->setText(tr("Graphics"));
     graphicsButton->setTextAlignment(Qt::AlignHCenter | Qt::AlignBottom | Qt::AlignAbsolute);
     graphicsButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 
-    auto *settingsButton = new QListWidgetItem(iconWidget);
+    auto* settingsButton = new QListWidgetItem(iconWidget);
     settingsButton->setIcon(QIcon(":/images/preferences.png"));
     settingsButton->setText(tr("Settings"));
     settingsButton->setTextAlignment(Qt::AlignHCenter | Qt::AlignBottom);
     settingsButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 
-    auto *advancedButton = new QListWidgetItem(iconWidget);
+    auto* advancedButton = new QListWidgetItem(iconWidget);
     advancedButton->setIcon(QIcon(":/images/preferences-advanced.png"));
     advancedButton->setText(tr("Advanced"));
     advancedButton->setTextAlignment(Qt::AlignHCenter | Qt::AlignBottom);
     advancedButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 
     connect(iconWidget, &QListWidget::currentItemChanged, this, &MainDialog::changePage);
-
 }
 
 void Launcher::MainDialog::createPages()
@@ -148,7 +148,8 @@ void Launcher::MainDialog::createPages()
     connect(mPlayPage, &PlayPage::signalProfileChanged, mDataFilesPage, &DataFilesPage::slotProfileChanged);
     connect(mDataFilesPage, &DataFilesPage::signalProfileChanged, mPlayPage, &PlayPage::setProfilesIndex);
     // Using Qt::QueuedConnection because signal is emitted in a subthread and slot is in the main thread
-    connect(mDataFilesPage, &DataFilesPage::signalLoadedCellsChanged, mAdvancedPage, &AdvancedPage::slotLoadedCellsChanged, Qt::QueuedConnection);
+    connect(mDataFilesPage, &DataFilesPage::signalLoadedCellsChanged, mAdvancedPage,
+        &AdvancedPage::slotLoadedCellsChanged, Qt::QueuedConnection);
 }
 
 Launcher::FirstRunDialogResult Launcher::MainDialog::showFirstRunDialog()
@@ -158,14 +159,15 @@ Launcher::FirstRunDialogResult Launcher::MainDialog::showFirstRunDialog()
 
     // Dialog wizard and setup will fail if the config directory does not already exist
     const auto& userConfigDir = mCfgMgr.getUserConfigPath();
-    if ( ! exists(userConfigDir) ) {
-        if ( ! create_directories(userConfigDir) )
+    if (!exists(userConfigDir))
+    {
+        if (!create_directories(userConfigDir))
         {
             cfgError(tr("Error opening OpenMW configuration file"),
-                     tr("<br><b>Could not create directory %0</b><br><br> \
+                tr("<br><b>Could not create directory %0</b><br><br> \
                         Please make sure you have the right permissions \
-                        and try again.<br>").arg(Files::pathToQString(canonical(userConfigDir)))
-            );
+                        and try again.<br>")
+                    .arg(Files::pathToQString(canonical(userConfigDir))));
             return FirstRunDialogResultFailure;
         }
     }
@@ -176,15 +178,15 @@ Launcher::FirstRunDialogResult Launcher::MainDialog::showFirstRunDialog()
         msgBox.setWindowTitle(tr("First run"));
         msgBox.setIcon(QMessageBox::Question);
         msgBox.setStandardButtons(QMessageBox::NoButton);
-        msgBox.setText(tr("<html><head/><body><p><b>Welcome to OpenMW!</b></p> \
+        msgBox.setText(
+            tr("<html><head/><body><p><b>Welcome to OpenMW!</b></p> \
                           <p>It is recommended to run the Installation Wizard.</p> \
                           <p>The Wizard will let you select an existing Morrowind installation, \
                           or install Morrowind for OpenMW to use.</p></body></html>"));
 
-        QAbstractButton *wizardButton =
-                msgBox.addButton(tr("Run &Installation Wizard"), QMessageBox::AcceptRole); // ActionRole doesn't work?!
-        QAbstractButton *skipButton =
-                msgBox.addButton(tr("Skip"), QMessageBox::RejectRole);
+        QAbstractButton* wizardButton
+            = msgBox.addButton(tr("Run &Installation Wizard"), QMessageBox::AcceptRole); // ActionRole doesn't work?!
+        QAbstractButton* skipButton = msgBox.addButton(tr("Skip"), QMessageBox::RejectRole);
 
         msgBox.exec();
 
@@ -202,7 +204,8 @@ Launcher::FirstRunDialogResult Launcher::MainDialog::showFirstRunDialog()
         return FirstRunDialogResultFailure;
     }
 
-    if (!setup() || !setupGameData()) {
+    if (!setup() || !setupGameData())
+    {
         return FirstRunDialogResultFailure;
     }
     return FirstRunDialogResultContinue;
@@ -225,8 +228,9 @@ void Launcher::MainDialog::setVersionLabel()
     // Add the compile date and time
     auto compileDate = QLocale(QLocale::C).toDate(QString(__DATE__).simplified(), QLatin1String("MMM d yyyy"));
     auto compileTime = QLocale(QLocale::C).toTime(QString(__TIME__).simplified(), QLatin1String("hh:mm:ss"));
-    versionLabel->setToolTip(tr("Compiled on %1 %2").arg(QLocale::system().toString(compileDate, QLocale::LongFormat),
-                                                         QLocale::system().toString(compileTime, QLocale::ShortFormat)));
+    versionLabel->setToolTip(tr("Compiled on %1 %2")
+                                 .arg(QLocale::system().toString(compileDate, QLocale::LongFormat),
+                                     QLocale::system().toString(compileTime, QLocale::ShortFormat)));
 }
 
 bool Launcher::MainDialog::setup()
@@ -281,7 +285,7 @@ bool Launcher::MainDialog::reloadSettings()
     return true;
 }
 
-void Launcher::MainDialog::changePage(QListWidgetItem *current, QListWidgetItem *previous)
+void Launcher::MainDialog::changePage(QListWidgetItem* current, QListWidgetItem* previous)
 {
     if (!current)
         current = previous;
@@ -303,16 +307,19 @@ bool Launcher::MainDialog::setupLauncherSettings()
     paths.append(QString(Config::LauncherSettings::sLauncherConfigFileName));
     paths.append(userPath + QString(Config::LauncherSettings::sLauncherConfigFileName));
 
-    for (const QString &path : paths)
+    for (const QString& path : paths)
     {
         qDebug() << "Loading config file:" << path.toUtf8().constData();
         QFile file(path);
-        if (file.exists()) {
-            if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        if (file.exists())
+        {
+            if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+            {
                 cfgError(tr("Error opening OpenMW configuration file"),
-                         tr("<br><b>Could not open %0 for reading</b><br><br> \
+                    tr("<br><b>Could not open %0 for reading</b><br><br> \
                              Please make sure you have the right permissions \
-                             and try again.<br>").arg(file.fileName()));
+                             and try again.<br>")
+                        .arg(file.fileName()));
                 return false;
             }
             QTextStream stream(&file);
@@ -336,16 +343,19 @@ bool Launcher::MainDialog::setupGameSettings()
 
     QFile file;
 
-    auto loadFile = [&] (const QString& path, bool(Config::GameSettings::*reader)(QTextStream&, bool), bool ignoreContent = false) -> std::optional<bool>
-    {
+    auto loadFile = [&](const QString& path, bool (Config::GameSettings::*reader)(QTextStream&, bool),
+                        bool ignoreContent = false) -> std::optional<bool> {
         qDebug() << "Loading config file:" << path.toUtf8().constData();
         file.setFileName(path);
-        if (file.exists()) {
-            if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        if (file.exists())
+        {
+            if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+            {
                 cfgError(tr("Error opening OpenMW configuration file"),
-                        tr("<br><b>Could not open %0 for reading</b><br><br> \
+                    tr("<br><b>Could not open %0 for reading</b><br><br> \
                             Please make sure you have the right permissions \
-                            and try again.<br>").arg(file.fileName()));
+                            and try again.<br>")
+                        .arg(file.fileName()));
                 return {};
             }
             QTextStream stream(&file);
@@ -360,19 +370,19 @@ bool Launcher::MainDialog::setupGameSettings()
 
     // Load the user config file first, separately
     // So we can write it properly, uncontaminated
-    if(!loadFile(userPath + QLatin1String("openmw.cfg"), &Config::GameSettings::readUserFile))
+    if (!loadFile(userPath + QLatin1String("openmw.cfg"), &Config::GameSettings::readUserFile))
         return false;
 
     // Now the rest - priority: user > local > global
-    if(auto result = loadFile(localPath + QString("openmw.cfg"), &Config::GameSettings::readFile, true))
+    if (auto result = loadFile(localPath + QString("openmw.cfg"), &Config::GameSettings::readFile, true))
     {
         // Load global if local wasn't found
-        if(!*result && !loadFile(globalPath + QString("openmw.cfg"), &Config::GameSettings::readFile, true))
+        if (!*result && !loadFile(globalPath + QString("openmw.cfg"), &Config::GameSettings::readFile, true))
             return false;
     }
     else
         return false;
-    if(!loadFile(userPath + QString("openmw.cfg"), &Config::GameSettings::readFile))
+    if (!loadFile(userPath + QString("openmw.cfg"), &Config::GameSettings::readFile))
         return false;
 
     return true;
@@ -387,7 +397,10 @@ bool Launcher::MainDialog::setupGameData()
     {
         QDir dir(path3);
         QStringList filters;
-        filters << "*.esp" << "*.esm" << "*.omwgame" << "*.omwaddon";
+        filters << "*.esp"
+                << "*.esm"
+                << "*.omwgame"
+                << "*.omwaddon";
 
         if (!dir.entryList(filters).isEmpty())
             dataDirs.append(path3);
@@ -399,13 +412,12 @@ bool Launcher::MainDialog::setupGameData()
         msgBox.setWindowTitle(tr("Error detecting Morrowind installation"));
         msgBox.setIcon(QMessageBox::Warning);
         msgBox.setStandardButtons(QMessageBox::NoButton);
-        msgBox.setText(tr("<br><b>Could not find the Data Files location</b><br><br> \
+        msgBox.setText(
+            tr("<br><b>Could not find the Data Files location</b><br><br> \
                                    The directory containing the data files was not found."));
 
-        QAbstractButton *wizardButton =
-                msgBox.addButton(tr("Run &Installation Wizard..."), QMessageBox::ActionRole);
-        QAbstractButton *skipButton =
-                msgBox.addButton(tr("Skip"), QMessageBox::RejectRole);
+        QAbstractButton* wizardButton = msgBox.addButton(tr("Run &Installation Wizard..."), QMessageBox::ActionRole);
+        QAbstractButton* skipButton = msgBox.addButton(tr("Skip"), QMessageBox::RejectRole);
 
         Q_UNUSED(skipButton); // Suppress compiler unused warning
 
@@ -423,7 +435,7 @@ bool Launcher::MainDialog::setupGameData()
 
 bool Launcher::MainDialog::setupGraphicsSettings()
 {
-    Settings::Manager::clear();  // Ensure to clear previous settings in case we had already loaded settings.
+    Settings::Manager::clear(); // Ensure to clear previous settings in case we had already loaded settings.
     try
     {
         boost::program_options::variables_map variables;
@@ -436,8 +448,9 @@ bool Launcher::MainDialog::setupGraphicsSettings()
     catch (std::exception& e)
     {
         cfgError(tr("Error reading OpenMW configuration files"),
-                 tr("<br>The problem may be due to an incomplete installation of OpenMW.<br> \
-                     Reinstalling OpenMW may resolve the problem.<br>") + e.what());
+            tr("<br>The problem may be due to an incomplete installation of OpenMW.<br> \
+                     Reinstalling OpenMW may resolve the problem.<br>")
+                + e.what());
         return false;
     }
 }
@@ -469,7 +482,6 @@ void Launcher::MainDialog::saveSettings()
     mLauncherSettings.setValue(QString("General/MainWindow/posy"), posY);
 
     mLauncherSettings.setValue(QString("General/firstrun"), QString("false"));
-
 }
 
 bool Launcher::MainDialog::writeSettings()
@@ -483,12 +495,15 @@ bool Launcher::MainDialog::writeSettings()
 
     const auto& userPath = mCfgMgr.getUserConfigPath();
 
-    if (!exists(userPath)) {
-        if (!create_directories(userPath)) {
+    if (!exists(userPath))
+    {
+        if (!create_directories(userPath))
+        {
             cfgError(tr("Error creating OpenMW configuration directory"),
-                     tr("<br><b>Could not create %0</b><br><br> \
+                tr("<br><b>Could not create %0</b><br><br> \
                          Please make sure you have the right permissions \
-                         and try again.<br>").arg(Files::pathToQString(userPath)));
+                         and try again.<br>")
+                    .arg(Files::pathToQString(userPath)));
             return false;
         }
     }
@@ -500,27 +515,30 @@ bool Launcher::MainDialog::writeSettings()
     QFile file(Files::pathToQString(userPath / "openmw.cfg"));
 #endif
 
-    if (!file.open(QIODevice::ReadWrite | QIODevice::Text)) {
+    if (!file.open(QIODevice::ReadWrite | QIODevice::Text))
+    {
         // File cannot be opened or created
         cfgError(tr("Error writing OpenMW configuration file"),
-                 tr("<br><b>Could not open or create %0 for writing</b><br><br> \
+            tr("<br><b>Could not open or create %0 for writing</b><br><br> \
                      Please make sure you have the right permissions \
-                     and try again.<br>").arg(file.fileName()));
+                     and try again.<br>")
+                .arg(file.fileName()));
         return false;
     }
 
-
     mGameSettings.writeFileWithComments(file);
     file.close();
 
     // Graphics settings
     const auto settingsPath = mCfgMgr.getUserConfigPath() / "settings.cfg";
-    try {
+    try
+    {
         Settings::Manager::saveUser(settingsPath);
     }
-    catch (std::exception& e) {
-        std::string msg = "<br><b>Error writing settings.cfg</b><br><br>" +
-            Files::pathToUnicodeString(settingsPath) + "<br><br>" + e.what();
+    catch (std::exception& e)
+    {
+        std::string msg = "<br><b>Error writing settings.cfg</b><br><br>" + Files::pathToUnicodeString(settingsPath)
+            + "<br><br>" + e.what();
         cfgError(tr("Error writing user settings file"), tr(msg.c_str()));
         return false;
     }
@@ -528,12 +546,14 @@ bool Launcher::MainDialog::writeSettings()
     // Launcher settings
     file.setFileName(Files::pathToQString(userPath / Config::LauncherSettings::sLauncherConfigFileName));
 
-    if (!file.open(QIODevice::ReadWrite | QIODevice::Text | QIODevice::Truncate)) {
+    if (!file.open(QIODevice::ReadWrite | QIODevice::Text | QIODevice::Truncate))
+    {
         // File cannot be opened or created
         cfgError(tr("Error writing Launcher configuration file"),
-                 tr("<br><b>Could not open or create %0 for writing</b><br><br> \
+            tr("<br><b>Could not open or create %0 for writing</b><br><br> \
                      Please make sure you have the right permissions \
-                     and try again.<br>").arg(file.fileName()));
+                     and try again.<br>")
+                .arg(file.fileName()));
         return false;
     }
 
@@ -547,7 +567,7 @@ bool Launcher::MainDialog::writeSettings()
     return true;
 }
 
-void Launcher::MainDialog::closeEvent(QCloseEvent *event)
+void Launcher::MainDialog::closeEvent(QCloseEvent* event)
 {
     writeSettings();
     event->accept();
@@ -575,12 +595,14 @@ void Launcher::MainDialog::play()
     if (!writeSettings())
         return qApp->quit();
 
-    if (!mGameSettings.hasMaster()) {
+    if (!mGameSettings.hasMaster())
+    {
         QMessageBox msgBox;
         msgBox.setWindowTitle(tr("No game file selected"));
         msgBox.setIcon(QMessageBox::Warning);
         msgBox.setStandardButtons(QMessageBox::Ok);
-        msgBox.setText(tr("<br><b>You do not have a game file selected.</b><br><br> \
+        msgBox.setText(
+            tr("<br><b>You do not have a game file selected.</b><br><br> \
                           OpenMW will not start without a game file selected.<br>"));
         msgBox.exec();
         return;
diff --git a/apps/launcher/maindialog.hpp b/apps/launcher/maindialog.hpp
index ca198cef54..6644012df8 100644
--- a/apps/launcher/maindialog.hpp
+++ b/apps/launcher/maindialog.hpp
@@ -1,7 +1,6 @@
 #ifndef MAINDIALOG_H
 #define MAINDIALOG_H
 
-
 #ifndef Q_MOC_RUN
 #include <components/files/configurationmanager.hpp>
 
@@ -44,7 +43,7 @@ namespace Launcher
         Q_OBJECT
 
     public:
-        explicit MainDialog(QWidget *parent = nullptr);
+        explicit MainDialog(QWidget* parent = nullptr);
         ~MainDialog() override;
 
         FirstRunDialogResult showFirstRunDialog();
@@ -53,7 +52,7 @@ namespace Launcher
         bool writeSettings();
 
     public slots:
-        void changePage(QListWidgetItem *current, QListWidgetItem *previous);
+        void changePage(QListWidgetItem* current, QListWidgetItem* previous);
         void play();
         void help();
 
@@ -77,25 +76,27 @@ namespace Launcher
         void loadSettings();
         void saveSettings();
 
-        inline bool startProgram(const QString &name, bool detached = false) { return startProgram(name, QStringList(), detached); }
-        bool startProgram(const QString &name, const QStringList &arguments, bool detached = false);
+        inline bool startProgram(const QString& name, bool detached = false)
+        {
+            return startProgram(name, QStringList(), detached);
+        }
+        bool startProgram(const QString& name, const QStringList& arguments, bool detached = false);
 
-        void closeEvent(QCloseEvent *event) override;
+        void closeEvent(QCloseEvent* event) override;
 
-        PlayPage *mPlayPage;
-        GraphicsPage *mGraphicsPage;
-        DataFilesPage *mDataFilesPage;
-        SettingsPage *mSettingsPage;
-        AdvancedPage *mAdvancedPage;
+        PlayPage* mPlayPage;
+        GraphicsPage* mGraphicsPage;
+        DataFilesPage* mDataFilesPage;
+        SettingsPage* mSettingsPage;
+        AdvancedPage* mAdvancedPage;
 
-        Process::ProcessInvoker *mGameInvoker;
-        Process::ProcessInvoker *mWizardInvoker;
+        Process::ProcessInvoker* mGameInvoker;
+        Process::ProcessInvoker* mWizardInvoker;
 
         Files::ConfigurationManager mCfgMgr;
 
         Config::GameSettings mGameSettings;
         Config::LauncherSettings mLauncherSettings;
-
     };
 }
 #endif
diff --git a/apps/launcher/playpage.cpp b/apps/launcher/playpage.cpp
index 9ecfaa8fce..c3c87e03fb 100644
--- a/apps/launcher/playpage.cpp
+++ b/apps/launcher/playpage.cpp
@@ -2,19 +2,19 @@
 
 #include <QListView>
 
-Launcher::PlayPage::PlayPage(QWidget *parent) : QWidget(parent)
+Launcher::PlayPage::PlayPage(QWidget* parent)
+    : QWidget(parent)
 {
-    setObjectName ("PlayPage");
+    setObjectName("PlayPage");
     setupUi(this);
 
     profilesComboBox->setView(new QListView());
 
     connect(profilesComboBox, qOverload<int>(&QComboBox::activated), this, &PlayPage::signalProfileChanged);
     connect(playButton, &QPushButton::clicked, this, &PlayPage::slotPlayClicked);
-
 }
 
-void Launcher::PlayPage::setProfilesModel(QAbstractItemModel *model)
+void Launcher::PlayPage::setProfilesModel(QAbstractItemModel* model)
 {
     profilesComboBox->setModel(model);
 }
diff --git a/apps/launcher/playpage.hpp b/apps/launcher/playpage.hpp
index 8f414dc6aa..8e658d6d2c 100644
--- a/apps/launcher/playpage.hpp
+++ b/apps/launcher/playpage.hpp
@@ -14,8 +14,8 @@ namespace Launcher
         Q_OBJECT
 
     public:
-        PlayPage(QWidget *parent = nullptr);
-        void setProfilesModel(QAbstractItemModel *model);
+        PlayPage(QWidget* parent = nullptr);
+        void setProfilesModel(QAbstractItemModel* model);
 
     signals:
         void signalProfileChanged(int index);
@@ -26,9 +26,6 @@ namespace Launcher
 
     private slots:
         void slotPlayClicked();
-
-
-
     };
 }
 #endif
diff --git a/apps/launcher/settingspage.cpp b/apps/launcher/settingspage.cpp
index 474b1a1c72..d65b8732a6 100644
--- a/apps/launcher/settingspage.cpp
+++ b/apps/launcher/settingspage.cpp
@@ -1,21 +1,20 @@
 #include "settingspage.hpp"
 
-#include <QFileDialog>
-#include <QMessageBox>
 #include <QDebug>
 #include <QDir>
+#include <QFileDialog>
+#include <QMessageBox>
 
 #include <components/files/conversion.hpp>
 #include <components/files/qtconversion.hpp>
 
-#include "utils/textinputdialog.hpp"
 #include "datafilespage.hpp"
+#include "utils/textinputdialog.hpp"
 
 using namespace Process;
 
-Launcher::SettingsPage::SettingsPage(Files::ConfigurationManager &cfg,
-                                     Config::GameSettings &gameSettings,
-                                     Config::LauncherSettings &launcherSettings, MainDialog *parent)
+Launcher::SettingsPage::SettingsPage(Files::ConfigurationManager& cfg, Config::GameSettings& gameSettings,
+    Config::LauncherSettings& launcherSettings, MainDialog* parent)
     : QWidget(parent)
     , mCfgMgr(cfg)
     , mGameSettings(gameSettings)
@@ -25,12 +24,7 @@ Launcher::SettingsPage::SettingsPage(Files::ConfigurationManager &cfg,
     setupUi(this);
 
     QStringList languages;
-    languages << tr("English")
-              << tr("French")
-              << tr("German")
-              << tr("Italian")
-              << tr("Polish")
-              << tr("Russian")
+    languages << tr("English") << tr("French") << tr("German") << tr("Italian") << tr("Polish") << tr("Russian")
               << tr("Spanish");
 
     languageComboBox->addItems(languages);
@@ -39,27 +33,24 @@ Launcher::SettingsPage::SettingsPage(Files::ConfigurationManager &cfg,
     mImporterInvoker = new ProcessInvoker();
     resetProgressBar();
 
-    connect(mWizardInvoker->getProcess(), &QProcess::started,
-            this, &SettingsPage::wizardStarted);
+    connect(mWizardInvoker->getProcess(), &QProcess::started, this, &SettingsPage::wizardStarted);
 
-    connect(mWizardInvoker->getProcess(), qOverload<int,QProcess::ExitStatus>(&QProcess::finished),
-            this, &SettingsPage::wizardFinished);
+    connect(mWizardInvoker->getProcess(), qOverload<int, QProcess::ExitStatus>(&QProcess::finished), this,
+        &SettingsPage::wizardFinished);
 
-    connect(mImporterInvoker->getProcess(), &QProcess::started,
-            this, &SettingsPage::importerStarted);
+    connect(mImporterInvoker->getProcess(), &QProcess::started, this, &SettingsPage::importerStarted);
 
-    connect(mImporterInvoker->getProcess(), qOverload<int,QProcess::ExitStatus>(&QProcess::finished),
-            this, &SettingsPage::importerFinished);
+    connect(mImporterInvoker->getProcess(), qOverload<int, QProcess::ExitStatus>(&QProcess::finished), this,
+        &SettingsPage::importerFinished);
 
     mProfileDialog = new TextInputDialog(tr("New Content List"), tr("Content List name:"), this);
 
-    connect(mProfileDialog->lineEdit(), &LineEdit::textChanged,
-            this, &SettingsPage::updateOkButton);
+    connect(mProfileDialog->lineEdit(), &LineEdit::textChanged, this, &SettingsPage::updateOkButton);
 
     // Detect Morrowind configuration files
     QStringList iniPaths;
 
-    for (const QString &path : mGameSettings.getDataDirs())
+    for (const QString& path : mGameSettings.getDataDirs())
     {
         QDir dir(path);
         dir.setPath(dir.canonicalPath()); // Resolve symlinks
@@ -76,10 +67,13 @@ Launcher::SettingsPage::SettingsPage(Files::ConfigurationManager &cfg,
         }
     }
 
-    if (!iniPaths.isEmpty()) {
+    if (!iniPaths.isEmpty())
+    {
         settingsComboBox->addItems(iniPaths);
         importerButton->setEnabled(true);
-    } else {
+    }
+    else
+    {
         importerButton->setEnabled(false);
     }
 
@@ -113,16 +107,20 @@ void Launcher::SettingsPage::on_importerButton_clicked()
     QFile file(Files::pathToQString(path));
 #endif
 
-    if (!file.exists()) {
-        if (!file.open(QIODevice::ReadWrite)) {
+    if (!file.exists())
+    {
+        if (!file.open(QIODevice::ReadWrite))
+        {
             // File cannot be created
             QMessageBox msgBox;
             msgBox.setWindowTitle(tr("Error writing OpenMW configuration file"));
             msgBox.setIcon(QMessageBox::Critical);
             msgBox.setStandardButtons(QMessageBox::Ok);
-            msgBox.setText(tr("<html><head/><body><p><b>Could not open or create %1 for writing </b></p> \
+            msgBox.setText(
+                tr("<html><head/><body><p><b>Could not open or create %1 for writing </b></p> \
                               <p>Please make sure you have the right permissions \
-                              and try again.</p></body></html>").arg(file.fileName()));
+                              and try again.</p></body></html>")
+                    .arg(file.fileName()));
             msgBox.exec();
             return;
         }
@@ -159,12 +157,8 @@ void Launcher::SettingsPage::on_importerButton_clicked()
 
 void Launcher::SettingsPage::on_browseButton_clicked()
 {
-    QString iniFile = QFileDialog::getOpenFileName(
-                this,
-                QObject::tr("Select configuration file"),
-                QDir::currentPath(),
-                QString(tr("Morrowind configuration file (*.ini)")));
-
+    QString iniFile = QFileDialog::getOpenFileName(this, QObject::tr("Select configuration file"), QDir::currentPath(),
+        QString(tr("Morrowind configuration file (*.ini)")));
 
     if (iniFile.isEmpty())
         return;
@@ -176,7 +170,8 @@ void Launcher::SettingsPage::on_browseButton_clicked()
 
     const QString path(QDir::toNativeSeparators(info.absoluteFilePath()));
 
-    if (settingsComboBox->findText(path) == -1) {
+    if (settingsComboBox->findText(path) == -1)
+    {
         settingsComboBox->addItem(path);
         settingsComboBox->setCurrentIndex(settingsComboBox->findText(path));
         importerButton->setEnabled(true);
@@ -238,19 +233,18 @@ void Launcher::SettingsPage::resetProgressBar()
     progressBar->reset();
 }
 
-void Launcher::SettingsPage::updateOkButton(const QString &text)
+void Launcher::SettingsPage::updateOkButton(const QString& text)
 {
     // We do this here because we need to access the profiles
-    if (text.isEmpty()) {
-         mProfileDialog->setOkButtonEnabled(false);
-         return;
+    if (text.isEmpty())
+    {
+        mProfileDialog->setOkButtonEnabled(false);
+        return;
     }
 
     const QStringList profiles(mLauncherSettings.getContentLists());
 
-    (profiles.contains(text))
-            ? mProfileDialog->setOkButtonEnabled(false)
-            : mProfileDialog->setOkButtonEnabled(true);
+    (profiles.contains(text)) ? mProfileDialog->setOkButtonEnabled(false) : mProfileDialog->setOkButtonEnabled(true);
 }
 
 void Launcher::SettingsPage::saveSettings()
@@ -259,11 +253,16 @@ void Launcher::SettingsPage::saveSettings()
 
     mLauncherSettings.setValue(QLatin1String("Settings/language"), language);
 
-    if (language == QLatin1String("Polish")) {
+    if (language == QLatin1String("Polish"))
+    {
         mGameSettings.setValue(QLatin1String("encoding"), QLatin1String("win1250"));
-    } else if (language == QLatin1String("Russian")) {
+    }
+    else if (language == QLatin1String("Russian"))
+    {
         mGameSettings.setValue(QLatin1String("encoding"), QLatin1String("win1251"));
-    }  else {
+    }
+    else
+    {
         mGameSettings.setValue(QLatin1String("encoding"), QLatin1String("win1252"));
     }
 }
diff --git a/apps/launcher/settingspage.hpp b/apps/launcher/settingspage.hpp
index fa31eb4033..8e5eefd306 100644
--- a/apps/launcher/settingspage.hpp
+++ b/apps/launcher/settingspage.hpp
@@ -7,9 +7,15 @@
 
 #include "maindialog.hpp"
 
-namespace Files { struct ConfigurationManager; }
-namespace Config { class GameSettings;
-                   class LauncherSettings; }
+namespace Files
+{
+    struct ConfigurationManager;
+}
+namespace Config
+{
+    class GameSettings;
+    class LauncherSettings;
+}
 
 namespace Launcher
 {
@@ -20,13 +26,13 @@ namespace Launcher
         Q_OBJECT
 
     public:
-        SettingsPage(Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings,
-                      Config::LauncherSettings &launcherSettings, MainDialog *parent = nullptr);
+        SettingsPage(Files::ConfigurationManager& cfg, Config::GameSettings& gameSettings,
+            Config::LauncherSettings& launcherSettings, MainDialog* parent = nullptr);
         ~SettingsPage() override;
 
         void saveSettings();
         bool loadSettings();
-        
+
         /// set progress bar on page to 0%
         void resetProgressBar();
 
@@ -42,21 +48,19 @@ namespace Launcher
         void importerStarted();
         void importerFinished(int exitCode, QProcess::ExitStatus exitStatus);
 
-        void updateOkButton(const QString &text);
+        void updateOkButton(const QString& text);
 
     private:
+        Process::ProcessInvoker* mWizardInvoker;
+        Process::ProcessInvoker* mImporterInvoker;
 
-        Process::ProcessInvoker *mWizardInvoker;
-        Process::ProcessInvoker *mImporterInvoker;
-
-        Files::ConfigurationManager &mCfgMgr;
-
-        Config::GameSettings &mGameSettings;
-        Config::LauncherSettings &mLauncherSettings;
+        Files::ConfigurationManager& mCfgMgr;
 
-        MainDialog *mMain;
-        TextInputDialog *mProfileDialog;
+        Config::GameSettings& mGameSettings;
+        Config::LauncherSettings& mLauncherSettings;
 
+        MainDialog* mMain;
+        TextInputDialog* mProfileDialog;
     };
 }
 
diff --git a/apps/launcher/textslotmsgbox.hpp b/apps/launcher/textslotmsgbox.hpp
index a0fefaa253..1eac6cf918 100644
--- a/apps/launcher/textslotmsgbox.hpp
+++ b/apps/launcher/textslotmsgbox.hpp
@@ -7,9 +7,9 @@ namespace Launcher
 {
     class TextSlotMsgBox : public QMessageBox
     {
-    Q_OBJECT
-        public slots:
-            void setTextSlot(const QString& string);
+        Q_OBJECT
+    public slots:
+        void setTextSlot(const QString& string);
     };
 }
 #endif
diff --git a/apps/launcher/utils/cellnameloader.cpp b/apps/launcher/utils/cellnameloader.cpp
index 4cb8b545aa..2f2bddbfb5 100644
--- a/apps/launcher/utils/cellnameloader.cpp
+++ b/apps/launcher/utils/cellnameloader.cpp
@@ -1,28 +1,31 @@
 #include "cellnameloader.hpp"
 
-#include <components/esm3/loadcell.hpp>
 #include <components/contentselector/view/contentselector.hpp>
+#include <components/esm3/loadcell.hpp>
 
-QSet<QString> CellNameLoader::getCellNames(QStringList &contentPaths)
+QSet<QString> CellNameLoader::getCellNames(QStringList& contentPaths)
 {
     QSet<QString> cellNames;
     ESM::ESMReader esmReader;
 
     // Loop through all content files
-    for (auto &contentPath : contentPaths) {
+    for (auto& contentPath : contentPaths)
+    {
         if (contentPath.endsWith(".omwscripts", Qt::CaseInsensitive))
             continue;
         esmReader.open(contentPath.toStdString());
 
         // Loop through all records
-        while(esmReader.hasMoreRecs())
+        while (esmReader.hasMoreRecs())
         {
             ESM::NAME recordName = esmReader.getRecName();
             esmReader.getRecHeader();
 
-            if (isCellRecord(recordName)) {
+            if (isCellRecord(recordName))
+            {
                 QString cellName = getCellName(esmReader);
-                if (!cellName.isEmpty()) {
+                if (!cellName.isEmpty())
+                {
                     cellNames.insert(cellName);
                 }
             }
@@ -35,12 +38,12 @@ QSet<QString> CellNameLoader::getCellNames(QStringList &contentPaths)
     return cellNames;
 }
 
-bool CellNameLoader::isCellRecord(ESM::NAME &recordName)
+bool CellNameLoader::isCellRecord(ESM::NAME& recordName)
 {
     return recordName.toInt() == ESM::REC_CELL;
 }
 
-QString CellNameLoader::getCellName(ESM::ESMReader &esmReader)
+QString CellNameLoader::getCellName(ESM::ESMReader& esmReader)
 {
     ESM::Cell cell;
     bool isDeleted = false;
@@ -48,4 +51,3 @@ QString CellNameLoader::getCellName(ESM::ESMReader &esmReader)
 
     return QString::fromStdString(cell.mName);
 }
-
diff --git a/apps/launcher/utils/cellnameloader.hpp b/apps/launcher/utils/cellnameloader.hpp
index 6143b78bd9..24ff187f41 100644
--- a/apps/launcher/utils/cellnameloader.hpp
+++ b/apps/launcher/utils/cellnameloader.hpp
@@ -6,19 +6,26 @@
 
 #include <components/esm3/esmreader.hpp>
 
-namespace ESM {class ESMReader; struct Cell;}
-namespace ContentSelectorView {class ContentSelector;}
-
-class CellNameLoader {
+namespace ESM
+{
+    class ESMReader;
+    struct Cell;
+}
+namespace ContentSelectorView
+{
+    class ContentSelector;
+}
+
+class CellNameLoader
+{
 
 public:
-
     /**
      * Returns the names of all cells contained within the given content files
      * @param contentPaths the file paths of each content file to be examined
      * @return the names of all cells
      */
-    QSet<QString> getCellNames(QStringList &contentPaths);
+    QSet<QString> getCellNames(QStringList& contentPaths);
 
 private:
     /**
@@ -26,15 +33,14 @@ private:
      * @param name The name associated with the record
      * @return whether or not the given record is of type "Cell"
      */
-    bool isCellRecord(ESM::NAME &name);
+    bool isCellRecord(ESM::NAME& name);
 
     /**
      * Returns the name of the cell
      * @param esmReader the reader currently pointed to a loaded cell
      * @return the name of the cell
      */
-    QString getCellName(ESM::ESMReader &esmReader);
+    QString getCellName(ESM::ESMReader& esmReader);
 };
 
-
-#endif //OPENMW_CELLNAMELOADER_H
+#endif // OPENMW_CELLNAMELOADER_H
diff --git a/apps/launcher/utils/lineedit.cpp b/apps/launcher/utils/lineedit.cpp
index 7942621f0f..011acd7699 100644
--- a/apps/launcher/utils/lineedit.cpp
+++ b/apps/launcher/utils/lineedit.cpp
@@ -1,6 +1,6 @@
 #include "lineedit.hpp"
 
-LineEdit::LineEdit(QWidget *parent)
+LineEdit::LineEdit(QWidget* parent)
     : QLineEdit(parent)
 {
     setupClearButton();
@@ -19,12 +19,11 @@ void LineEdit::setupClearButton()
     connect(this, &LineEdit::textChanged, this, &LineEdit::updateClearButton);
 }
 
-void LineEdit::resizeEvent(QResizeEvent *)
+void LineEdit::resizeEvent(QResizeEvent*)
 {
     QSize sz = mClearButton->sizeHint();
     int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
-    mClearButton->move(rect().right() - frameWidth - sz.width(),
-                      (rect().bottom() + 1 - sz.height())/2);
+    mClearButton->move(rect().right() - frameWidth - sz.width(), (rect().bottom() + 1 - sz.height()) / 2);
 }
 
 void LineEdit::updateClearButton(const QString& text)
diff --git a/apps/launcher/utils/lineedit.hpp b/apps/launcher/utils/lineedit.hpp
index 89de39588a..1a06c3ee06 100644
--- a/apps/launcher/utils/lineedit.hpp
+++ b/apps/launcher/utils/lineedit.hpp
@@ -23,19 +23,18 @@ class LineEdit : public QLineEdit
     QString mPlaceholderText;
 
 public:
-    LineEdit(QWidget *parent = nullptr);
+    LineEdit(QWidget* parent = nullptr);
 
 protected:
-    void resizeEvent(QResizeEvent *) override;
+    void resizeEvent(QResizeEvent*) override;
 
 private slots:
-    void updateClearButton(const QString &text);
+    void updateClearButton(const QString& text);
 
 protected:
-    QToolButton *mClearButton;
+    QToolButton* mClearButton;
 
     void setupClearButton();
 };
 
 #endif // LIENEDIT_H
-
diff --git a/apps/launcher/utils/openalutil.cpp b/apps/launcher/utils/openalutil.cpp
index 469872d158..1a332e9788 100644
--- a/apps/launcher/utils/openalutil.cpp
+++ b/apps/launcher/utils/openalutil.cpp
@@ -12,9 +12,9 @@
 std::vector<std::string> Launcher::enumerateOpenALDevices()
 {
     std::vector<std::string> devlist;
-    const ALCchar *devnames;
+    const ALCchar* devnames;
 
-    if(alcIsExtensionPresent(nullptr, "ALC_ENUMERATE_ALL_EXT"))
+    if (alcIsExtensionPresent(nullptr, "ALC_ENUMERATE_ALL_EXT"))
     {
         devnames = alcGetString(nullptr, ALC_ALL_DEVICES_SPECIFIER);
     }
@@ -23,10 +23,10 @@ std::vector<std::string> Launcher::enumerateOpenALDevices()
         devnames = alcGetString(nullptr, ALC_DEVICE_SPECIFIER);
     }
 
-    while(devnames && *devnames)
+    while (devnames && *devnames)
     {
         devlist.emplace_back(devnames);
-        devnames += strlen(devnames)+1;
+        devnames += strlen(devnames) + 1;
     }
     return devlist;
 }
@@ -35,10 +35,10 @@ std::vector<std::string> Launcher::enumerateOpenALDevicesHrtf()
 {
     std::vector<std::string> ret;
 
-    ALCdevice *device = alcOpenDevice(nullptr);
-    if(device)
+    ALCdevice* device = alcOpenDevice(nullptr);
+    if (device)
     {
-        if(alcIsExtensionPresent(device, "ALC_SOFT_HRTF"))
+        if (alcIsExtensionPresent(device, "ALC_SOFT_HRTF"))
         {
             LPALCGETSTRINGISOFT alcGetStringiSOFT = nullptr;
             void* funcPtr = alcGetProcAddress(device, "alcGetStringiSOFT");
@@ -46,10 +46,10 @@ std::vector<std::string> Launcher::enumerateOpenALDevicesHrtf()
             ALCint num_hrtf;
             alcGetIntegerv(device, ALC_NUM_HRTF_SPECIFIERS_SOFT, 1, &num_hrtf);
             ret.reserve(num_hrtf);
-            for(ALCint i = 0;i < num_hrtf;++i)
+            for (ALCint i = 0; i < num_hrtf; ++i)
             {
-                const ALCchar *entry = alcGetStringiSOFT(device, ALC_HRTF_SPECIFIER_SOFT, i);
-                if(strcmp(entry, "") == 0)
+                const ALCchar* entry = alcGetStringiSOFT(device, ALC_HRTF_SPECIFIER_SOFT, i);
+                if (strcmp(entry, "") == 0)
                     break;
                 ret.emplace_back(entry);
             }
diff --git a/apps/launcher/utils/openalutil.hpp b/apps/launcher/utils/openalutil.hpp
index b084dce7ce..f0add75390 100644
--- a/apps/launcher/utils/openalutil.hpp
+++ b/apps/launcher/utils/openalutil.hpp
@@ -1,5 +1,5 @@
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace Launcher
 {
diff --git a/apps/launcher/utils/profilescombobox.cpp b/apps/launcher/utils/profilescombobox.cpp
index 5ac51393f7..193dd8e4cf 100644
--- a/apps/launcher/utils/profilescombobox.cpp
+++ b/apps/launcher/utils/profilescombobox.cpp
@@ -1,13 +1,12 @@
-#include <QString>
 #include <QApplication>
+#include <QString>
 
 #include "profilescombobox.hpp"
 
-ProfilesComboBox::ProfilesComboBox(QWidget *parent) :
-    ContentSelectorView::ComboBox(parent)
+ProfilesComboBox::ProfilesComboBox(QWidget* parent)
+    : ContentSelectorView::ComboBox(parent)
 {
-    connect(this, qOverload<int>(&ProfilesComboBox::activated),
-            this, &ProfilesComboBox::slotIndexChangedByUser);
+    connect(this, qOverload<int>(&ProfilesComboBox::activated), this, &ProfilesComboBox::slotIndexChangedByUser);
 
     setInsertPolicy(QComboBox::NoInsert);
 }
@@ -17,7 +16,8 @@ void ProfilesComboBox::setEditEnabled(bool editable)
     if (isEditable() == editable)
         return;
 
-    if (!editable) {
+    if (!editable)
+    {
         disconnect(lineEdit(), &QLineEdit::editingFinished, this, &ProfilesComboBox::slotEditingFinished);
         disconnect(lineEdit(), &QLineEdit::textChanged, this, &ProfilesComboBox::slotTextChanged);
         return setEditable(false);
@@ -27,7 +27,7 @@ void ProfilesComboBox::setEditEnabled(bool editable)
     setEditable(true);
     setValidator(mValidator);
 
-    auto *edit = new ComboBoxLineEdit(this);
+    auto* edit = new ComboBoxLineEdit(this);
 
     setLineEdit(edit);
     setCompleter(nullptr);
@@ -39,16 +39,19 @@ void ProfilesComboBox::setEditEnabled(bool editable)
     connect(lineEdit(), &QLineEdit::textChanged, this, &ProfilesComboBox::signalProfileTextChanged);
 }
 
-void ProfilesComboBox::slotTextChanged(const QString &text)
+void ProfilesComboBox::slotTextChanged(const QString& text)
 {
     QPalette palette;
-    palette.setColor(QPalette::Text,Qt::red);
+    palette.setColor(QPalette::Text, Qt::red);
 
     int index = findText(text);
 
-    if (text.isEmpty() || (index != -1 && index != currentIndex())) {
+    if (text.isEmpty() || (index != -1 && index != currentIndex()))
+    {
         lineEdit()->setPalette(palette);
-    } else {
+    }
+    else
+    {
         lineEdit()->setPalette(QApplication::palette());
     }
 }
@@ -83,11 +86,12 @@ void ProfilesComboBox::slotIndexChangedByUser(int index)
     mOldProfile = currentText();
 }
 
-ProfilesComboBox::ComboBoxLineEdit::ComboBoxLineEdit (QWidget *parent)
-    : LineEdit (parent)
+ProfilesComboBox::ComboBoxLineEdit::ComboBoxLineEdit(QWidget* parent)
+    : LineEdit(parent)
 {
     int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
 
     setObjectName(QString("ComboBoxLineEdit"));
-    setStyleSheet(QString("ComboBoxLineEdit { background-color: transparent; padding-right: %1px; } ").arg(mClearButton->sizeHint().width() + frameWidth + 1));
+    setStyleSheet(QString("ComboBoxLineEdit { background-color: transparent; padding-right: %1px; } ")
+                      .arg(mClearButton->sizeHint().width() + frameWidth + 1));
 }
diff --git a/apps/launcher/utils/profilescombobox.hpp b/apps/launcher/utils/profilescombobox.hpp
index f29ac58e12..91f4f9ef9c 100644
--- a/apps/launcher/utils/profilescombobox.hpp
+++ b/apps/launcher/utils/profilescombobox.hpp
@@ -16,12 +16,11 @@ public:
     class ComboBoxLineEdit : public LineEdit
     {
     public:
-        explicit ComboBoxLineEdit (QWidget *parent = nullptr);
+        explicit ComboBoxLineEdit(QWidget* parent = nullptr);
     };
 
 public:
-
-    explicit ProfilesComboBox(QWidget *parent = nullptr);
+    explicit ProfilesComboBox(QWidget* parent = nullptr);
     void setEditEnabled(bool editable);
     void setCurrentProfile(int index)
     {
@@ -30,16 +29,16 @@ public:
     }
 
 signals:
-    void signalProfileTextChanged(const QString &item);
-    void signalProfileChanged(const QString &previous, const QString &current);
+    void signalProfileTextChanged(const QString& item);
+    void signalProfileChanged(const QString& previous, const QString& current);
     void signalProfileChanged(int index);
-    void profileRenamed(const QString &oldName, const QString &newName);
+    void profileRenamed(const QString& oldName, const QString& newName);
 
 private slots:
 
     void slotEditingFinished();
     void slotIndexChangedByUser(int index);
-    void slotTextChanged(const QString &text);
+    void slotTextChanged(const QString& text);
 
 private:
     QString mOldProfile;
diff --git a/apps/launcher/utils/textinputdialog.cpp b/apps/launcher/utils/textinputdialog.cpp
index cffb734350..73210afdfa 100644
--- a/apps/launcher/utils/textinputdialog.cpp
+++ b/apps/launcher/utils/textinputdialog.cpp
@@ -1,31 +1,31 @@
 #include "textinputdialog.hpp"
 
-#include <QDialogButtonBox>
 #include <QApplication>
+#include <QDialogButtonBox>
+#include <QLabel>
 #include <QPushButton>
 #include <QVBoxLayout>
 #include <QValidator>
-#include <QLabel>
 
-Launcher::TextInputDialog::TextInputDialog(const QString& title, const QString &text, QWidget *parent) :
-    QDialog(parent)
+Launcher::TextInputDialog::TextInputDialog(const QString& title, const QString& text, QWidget* parent)
+    : QDialog(parent)
 {
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
     mButtonBox = new QDialogButtonBox(this);
     mButtonBox->addButton(QDialogButtonBox::Ok);
     mButtonBox->addButton(QDialogButtonBox::Cancel);
-    mButtonBox->button(QDialogButtonBox::Ok)->setEnabled (false);
+    mButtonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
 
-    auto *label = new QLabel(this);
+    auto* label = new QLabel(this);
     label->setText(text);
 
     // Line edit
-    QValidator *validator = new QRegExpValidator(QRegExp("^[a-zA-Z0-9_]*$"), this); // Alpha-numeric + underscore
+    QValidator* validator = new QRegExpValidator(QRegExp("^[a-zA-Z0-9_]*$"), this); // Alpha-numeric + underscore
     mLineEdit = new LineEdit(this);
     mLineEdit->setValidator(validator);
     mLineEdit->setCompleter(nullptr);
 
-    auto *dialogLayout = new QVBoxLayout(this);
+    auto* dialogLayout = new QVBoxLayout(this);
     dialogLayout->addWidget(label);
     dialogLayout->addWidget(mLineEdit);
     dialogLayout->addWidget(mButtonBox);
@@ -43,9 +43,7 @@ Launcher::TextInputDialog::TextInputDialog(const QString& title, const QString &
     connect(mButtonBox, &QDialogButtonBox::rejected, this, &TextInputDialog::reject);
 }
 
-Launcher::TextInputDialog::~TextInputDialog()
-{
-}
+Launcher::TextInputDialog::~TextInputDialog() {}
 
 int Launcher::TextInputDialog::exec()
 {
@@ -56,15 +54,18 @@ int Launcher::TextInputDialog::exec()
 
 void Launcher::TextInputDialog::setOkButtonEnabled(bool enabled)
 {
-    QPushButton *okButton = mButtonBox->button(QDialogButtonBox::Ok);
+    QPushButton* okButton = mButtonBox->button(QDialogButtonBox::Ok);
     okButton->setEnabled(enabled);
 
     QPalette palette;
     palette.setColor(QPalette::Text, Qt::red);
 
-    if (enabled) {
+    if (enabled)
+    {
         mLineEdit->setPalette(QApplication::palette());
-    } else {
+    }
+    else
+    {
         // Existing profile name, make the text red
         mLineEdit->setPalette(palette);
     }
diff --git a/apps/launcher/utils/textinputdialog.hpp b/apps/launcher/utils/textinputdialog.hpp
index ad64cb3e2a..bba79cdee4 100644
--- a/apps/launcher/utils/textinputdialog.hpp
+++ b/apps/launcher/utils/textinputdialog.hpp
@@ -14,20 +14,17 @@ namespace Launcher
         Q_OBJECT
 
     public:
+        explicit TextInputDialog(const QString& title, const QString& text, QWidget* parent = nullptr);
+        ~TextInputDialog() override;
 
-        explicit TextInputDialog(const QString& title, const QString &text, QWidget *parent = nullptr);
-        ~TextInputDialog () override;
-
-        inline LineEdit *lineEdit() { return mLineEdit; }
+        inline LineEdit* lineEdit() { return mLineEdit; }
         void setOkButtonEnabled(bool enabled);
 
         int exec() override;
 
     private:
-
-        QDialogButtonBox *mButtonBox;
-        LineEdit *mLineEdit;
-
+        QDialogButtonBox* mButtonBox;
+        LineEdit* mLineEdit;
     };
 }
 
diff --git a/apps/mwiniimporter/importer.cpp b/apps/mwiniimporter/importer.cpp
index 43f2b429b1..53d396a0cd 100644
--- a/apps/mwiniimporter/importer.cpp
+++ b/apps/mwiniimporter/importer.cpp
@@ -1,17 +1,14 @@
 #include "importer.hpp"
 
-#include <iostream>
-#include <filesystem>
-#include <fstream>
+#include <components/esm3/esmreader.hpp>
+#include <components/files/conversion.hpp>
 #include <components/misc/strings/algorithm.hpp>
 #include <components/misc/strings/format.hpp>
 #include <components/misc/strings/lower.hpp>
-#include <components/esm3/esmreader.hpp>
 #include <components/misc/timeconvert.hpp>
-#include <components/files/conversion.hpp>
-
-
-
+#include <filesystem>
+#include <fstream>
+#include <iostream>
 
 namespace sfs = std::filesystem;
 
@@ -19,624 +16,240 @@ MwIniImporter::MwIniImporter()
     : mVerbose(false)
     , mEncoding(ToUTF8::WINDOWS_1250)
 {
-    const char *map[][2] =
-    {
-        { "no-sound", "General:Disable Audio" },
-        { 0, 0 }
-    };
-    const char *fallback[] = {
+    const char* map[][2] = { { "no-sound", "General:Disable Audio" }, { 0, 0 } };
+    const char* fallback[] = {
 
         // light
-        "LightAttenuation:UseConstant",
-        "LightAttenuation:ConstantValue",
-        "LightAttenuation:UseLinear",
-        "LightAttenuation:LinearMethod",
-        "LightAttenuation:LinearValue",
-        "LightAttenuation:LinearRadiusMult",
-        "LightAttenuation:UseQuadratic",
-        "LightAttenuation:QuadraticMethod",
-        "LightAttenuation:QuadraticValue",
-        "LightAttenuation:QuadraticRadiusMult",
-        "LightAttenuation:OutQuadInLin",
+        "LightAttenuation:UseConstant", "LightAttenuation:ConstantValue", "LightAttenuation:UseLinear",
+        "LightAttenuation:LinearMethod", "LightAttenuation:LinearValue", "LightAttenuation:LinearRadiusMult",
+        "LightAttenuation:UseQuadratic", "LightAttenuation:QuadraticMethod", "LightAttenuation:QuadraticValue",
+        "LightAttenuation:QuadraticRadiusMult", "LightAttenuation:OutQuadInLin",
 
         // inventory
-        "Inventory:DirectionalDiffuseR",
-        "Inventory:DirectionalDiffuseG",
-        "Inventory:DirectionalDiffuseB",
-        "Inventory:DirectionalAmbientR",
-        "Inventory:DirectionalAmbientG",
-        "Inventory:DirectionalAmbientB",
-        "Inventory:DirectionalRotationX",
-        "Inventory:DirectionalRotationY",
-        "Inventory:UniformScaling",
+        "Inventory:DirectionalDiffuseR", "Inventory:DirectionalDiffuseG", "Inventory:DirectionalDiffuseB",
+        "Inventory:DirectionalAmbientR", "Inventory:DirectionalAmbientG", "Inventory:DirectionalAmbientB",
+        "Inventory:DirectionalRotationX", "Inventory:DirectionalRotationY", "Inventory:UniformScaling",
 
         // map
-        "Map:Travel Siltstrider Red",
-        "Map:Travel Siltstrider Green",
-        "Map:Travel Siltstrider Blue",
-        "Map:Travel Boat Red",
-        "Map:Travel Boat Green",
-        "Map:Travel Boat Blue",
-        "Map:Travel Magic Red",
-        "Map:Travel Magic Green",
-        "Map:Travel Magic Blue",
-        "Map:Show Travel Lines",
+        "Map:Travel Siltstrider Red", "Map:Travel Siltstrider Green", "Map:Travel Siltstrider Blue",
+        "Map:Travel Boat Red", "Map:Travel Boat Green", "Map:Travel Boat Blue", "Map:Travel Magic Red",
+        "Map:Travel Magic Green", "Map:Travel Magic Blue", "Map:Show Travel Lines",
 
         // water
-        "Water:Map Alpha",
-        "Water:World Alpha",
-        "Water:SurfaceTextureSize",
-        "Water:SurfaceTileCount",
-        "Water:SurfaceFPS",
-        "Water:SurfaceTexture",
-        "Water:SurfaceFrameCount",
-        "Water:TileTextureDivisor",
-        "Water:RippleTexture",
-        "Water:RippleFrameCount",
-        "Water:RippleLifetime",
-        "Water:MaxNumberRipples",
-        "Water:RippleScale",
-        "Water:RippleRotSpeed",
-        "Water:RippleAlphas",
-        "Water:PSWaterReflectTerrain",
-        "Water:PSWaterReflectUpdate",
-        "Water:NearWaterRadius",
-        "Water:NearWaterPoints",
-        "Water:NearWaterUnderwaterFreq",
-        "Water:NearWaterUnderwaterVolume",
-        "Water:NearWaterIndoorTolerance",
-        "Water:NearWaterOutdoorTolerance",
-        "Water:NearWaterIndoorID",
-        "Water:NearWaterOutdoorID",
-        "Water:UnderwaterSunriseFog",
-        "Water:UnderwaterDayFog",
-        "Water:UnderwaterSunsetFog",
-        "Water:UnderwaterNightFog",
-        "Water:UnderwaterIndoorFog",
-        "Water:UnderwaterColor",
+        "Water:Map Alpha", "Water:World Alpha", "Water:SurfaceTextureSize", "Water:SurfaceTileCount",
+        "Water:SurfaceFPS", "Water:SurfaceTexture", "Water:SurfaceFrameCount", "Water:TileTextureDivisor",
+        "Water:RippleTexture", "Water:RippleFrameCount", "Water:RippleLifetime", "Water:MaxNumberRipples",
+        "Water:RippleScale", "Water:RippleRotSpeed", "Water:RippleAlphas", "Water:PSWaterReflectTerrain",
+        "Water:PSWaterReflectUpdate", "Water:NearWaterRadius", "Water:NearWaterPoints", "Water:NearWaterUnderwaterFreq",
+        "Water:NearWaterUnderwaterVolume", "Water:NearWaterIndoorTolerance", "Water:NearWaterOutdoorTolerance",
+        "Water:NearWaterIndoorID", "Water:NearWaterOutdoorID", "Water:UnderwaterSunriseFog", "Water:UnderwaterDayFog",
+        "Water:UnderwaterSunsetFog", "Water:UnderwaterNightFog", "Water:UnderwaterIndoorFog", "Water:UnderwaterColor",
         "Water:UnderwaterColorWeight",
 
         // pixelwater
-        "PixelWater:SurfaceFPS",
-        "PixelWater:TileCount",
-        "PixelWater:Resolution",
+        "PixelWater:SurfaceFPS", "PixelWater:TileCount", "PixelWater:Resolution",
 
         // fonts
-        "Fonts:Font 0",
-        "Fonts:Font 1",
-        "Fonts:Font 2",
+        "Fonts:Font 0", "Fonts:Font 1", "Fonts:Font 2",
 
         // UI colors
-        "FontColor:color_normal",
-        "FontColor:color_normal_over",
-        "FontColor:color_normal_pressed",
-        "FontColor:color_active",
-        "FontColor:color_active_over",
-        "FontColor:color_active_pressed",
-        "FontColor:color_disabled",
-        "FontColor:color_disabled_over",
-        "FontColor:color_disabled_pressed",
-        "FontColor:color_link",
-        "FontColor:color_link_over",
-        "FontColor:color_link_pressed",
-        "FontColor:color_journal_link",
-        "FontColor:color_journal_link_over",
-        "FontColor:color_journal_link_pressed",
-        "FontColor:color_journal_topic",
-        "FontColor:color_journal_topic_over",
-        "FontColor:color_journal_topic_pressed",
-        "FontColor:color_answer",
-        "FontColor:color_answer_over",
-        "FontColor:color_answer_pressed",
-        "FontColor:color_header",
-        "FontColor:color_notify",
-        "FontColor:color_big_normal",
-        "FontColor:color_big_normal_over",
-        "FontColor:color_big_normal_pressed",
-        "FontColor:color_big_link",
-        "FontColor:color_big_link_over",
-        "FontColor:color_big_link_pressed",
-        "FontColor:color_big_answer",
-        "FontColor:color_big_answer_over",
-        "FontColor:color_big_answer_pressed",
-        "FontColor:color_big_header",
-        "FontColor:color_big_notify",
-        "FontColor:color_background",
-        "FontColor:color_focus",
-        "FontColor:color_health",
-        "FontColor:color_magic",
-        "FontColor:color_fatigue",
-        "FontColor:color_misc",
-        "FontColor:color_weapon_fill",
-        "FontColor:color_magic_fill",
-        "FontColor:color_positive",
-        "FontColor:color_negative",
-        "FontColor:color_count",
+        "FontColor:color_normal", "FontColor:color_normal_over", "FontColor:color_normal_pressed",
+        "FontColor:color_active", "FontColor:color_active_over", "FontColor:color_active_pressed",
+        "FontColor:color_disabled", "FontColor:color_disabled_over", "FontColor:color_disabled_pressed",
+        "FontColor:color_link", "FontColor:color_link_over", "FontColor:color_link_pressed",
+        "FontColor:color_journal_link", "FontColor:color_journal_link_over", "FontColor:color_journal_link_pressed",
+        "FontColor:color_journal_topic", "FontColor:color_journal_topic_over", "FontColor:color_journal_topic_pressed",
+        "FontColor:color_answer", "FontColor:color_answer_over", "FontColor:color_answer_pressed",
+        "FontColor:color_header", "FontColor:color_notify", "FontColor:color_big_normal",
+        "FontColor:color_big_normal_over", "FontColor:color_big_normal_pressed", "FontColor:color_big_link",
+        "FontColor:color_big_link_over", "FontColor:color_big_link_pressed", "FontColor:color_big_answer",
+        "FontColor:color_big_answer_over", "FontColor:color_big_answer_pressed", "FontColor:color_big_header",
+        "FontColor:color_big_notify", "FontColor:color_background", "FontColor:color_focus", "FontColor:color_health",
+        "FontColor:color_magic", "FontColor:color_fatigue", "FontColor:color_misc", "FontColor:color_weapon_fill",
+        "FontColor:color_magic_fill", "FontColor:color_positive", "FontColor:color_negative", "FontColor:color_count",
 
         // level up messages
-        "Level Up:Level2",
-        "Level Up:Level3",
-        "Level Up:Level4",
-        "Level Up:Level5",
-        "Level Up:Level6",
-        "Level Up:Level7",
-        "Level Up:Level8",
-        "Level Up:Level9",
-        "Level Up:Level10",
-        "Level Up:Level11",
-        "Level Up:Level12",
-        "Level Up:Level13",
-        "Level Up:Level14",
-        "Level Up:Level15",
-        "Level Up:Level16",
-        "Level Up:Level17",
-        "Level Up:Level18",
-        "Level Up:Level19",
-        "Level Up:Level20",
-        "Level Up:Default",
+        "Level Up:Level2", "Level Up:Level3", "Level Up:Level4", "Level Up:Level5", "Level Up:Level6",
+        "Level Up:Level7", "Level Up:Level8", "Level Up:Level9", "Level Up:Level10", "Level Up:Level11",
+        "Level Up:Level12", "Level Up:Level13", "Level Up:Level14", "Level Up:Level15", "Level Up:Level16",
+        "Level Up:Level17", "Level Up:Level18", "Level Up:Level19", "Level Up:Level20", "Level Up:Default",
 
         // character creation multiple choice test
-        "Question 1:Question",
-        "Question 1:AnswerOne",
-        "Question 1:AnswerTwo",
-        "Question 1:AnswerThree",
-        "Question 1:Sound",
-        "Question 2:Question",
-        "Question 2:AnswerOne",
-        "Question 2:AnswerTwo",
-        "Question 2:AnswerThree",
-        "Question 2:Sound",
-        "Question 3:Question",
-        "Question 3:AnswerOne",
-        "Question 3:AnswerTwo",
-        "Question 3:AnswerThree",
-        "Question 3:Sound",
-        "Question 4:Question",
-        "Question 4:AnswerOne",
-        "Question 4:AnswerTwo",
-        "Question 4:AnswerThree",
-        "Question 4:Sound",
-        "Question 5:Question",
-        "Question 5:AnswerOne",
-        "Question 5:AnswerTwo",
-        "Question 5:AnswerThree",
-        "Question 5:Sound",
-        "Question 6:Question",
-        "Question 6:AnswerOne",
-        "Question 6:AnswerTwo",
-        "Question 6:AnswerThree",
-        "Question 6:Sound",
-        "Question 7:Question",
-        "Question 7:AnswerOne",
-        "Question 7:AnswerTwo",
-        "Question 7:AnswerThree",
-        "Question 7:Sound",
-        "Question 8:Question",
-        "Question 8:AnswerOne",
-        "Question 8:AnswerTwo",
-        "Question 8:AnswerThree",
-        "Question 8:Sound",
-        "Question 9:Question",
-        "Question 9:AnswerOne",
-        "Question 9:AnswerTwo",
-        "Question 9:AnswerThree",
-        "Question 9:Sound",
-        "Question 10:Question",
-        "Question 10:AnswerOne",
-        "Question 10:AnswerTwo",
-        "Question 10:AnswerThree",
-        "Question 10:Sound",
+        "Question 1:Question", "Question 1:AnswerOne", "Question 1:AnswerTwo", "Question 1:AnswerThree",
+        "Question 1:Sound", "Question 2:Question", "Question 2:AnswerOne", "Question 2:AnswerTwo",
+        "Question 2:AnswerThree", "Question 2:Sound", "Question 3:Question", "Question 3:AnswerOne",
+        "Question 3:AnswerTwo", "Question 3:AnswerThree", "Question 3:Sound", "Question 4:Question",
+        "Question 4:AnswerOne", "Question 4:AnswerTwo", "Question 4:AnswerThree", "Question 4:Sound",
+        "Question 5:Question", "Question 5:AnswerOne", "Question 5:AnswerTwo", "Question 5:AnswerThree",
+        "Question 5:Sound", "Question 6:Question", "Question 6:AnswerOne", "Question 6:AnswerTwo",
+        "Question 6:AnswerThree", "Question 6:Sound", "Question 7:Question", "Question 7:AnswerOne",
+        "Question 7:AnswerTwo", "Question 7:AnswerThree", "Question 7:Sound", "Question 8:Question",
+        "Question 8:AnswerOne", "Question 8:AnswerTwo", "Question 8:AnswerThree", "Question 8:Sound",
+        "Question 9:Question", "Question 9:AnswerOne", "Question 9:AnswerTwo", "Question 9:AnswerThree",
+        "Question 9:Sound", "Question 10:Question", "Question 10:AnswerOne", "Question 10:AnswerTwo",
+        "Question 10:AnswerThree", "Question 10:Sound",
 
         // blood textures and models
-        "Blood:Model 0",
-        "Blood:Model 1",
-        "Blood:Model 2",
-        "Blood:Texture 0",
-        "Blood:Texture 1",
-        "Blood:Texture 2",
-        "Blood:Texture 3",
-        "Blood:Texture 4",
-        "Blood:Texture 5",
-        "Blood:Texture 6",
-        "Blood:Texture 7",
-        "Blood:Texture Name 0",
-        "Blood:Texture Name 1",
-        "Blood:Texture Name 2",
-        "Blood:Texture Name 3",
-        "Blood:Texture Name 4",
-        "Blood:Texture Name 5",
-        "Blood:Texture Name 6",
-        "Blood:Texture Name 7",
+        "Blood:Model 0", "Blood:Model 1", "Blood:Model 2", "Blood:Texture 0", "Blood:Texture 1", "Blood:Texture 2",
+        "Blood:Texture 3", "Blood:Texture 4", "Blood:Texture 5", "Blood:Texture 6", "Blood:Texture 7",
+        "Blood:Texture Name 0", "Blood:Texture Name 1", "Blood:Texture Name 2", "Blood:Texture Name 3",
+        "Blood:Texture Name 4", "Blood:Texture Name 5", "Blood:Texture Name 6", "Blood:Texture Name 7",
 
         // movies
-        "Movies:Company Logo",
-        "Movies:Morrowind Logo",
-        "Movies:New Game",
-        "Movies:Loading",
-        "Movies:Options Menu",
+        "Movies:Company Logo", "Movies:Morrowind Logo", "Movies:New Game", "Movies:Loading", "Movies:Options Menu",
 
         // weather related values
 
-        "Weather Thunderstorm:Thunder Sound ID 0",
-        "Weather Thunderstorm:Thunder Sound ID 1",
-        "Weather Thunderstorm:Thunder Sound ID 2",
-        "Weather Thunderstorm:Thunder Sound ID 3",
-        "Weather:Sunrise Time",
-        "Weather:Sunset Time",
-        "Weather:Sunrise Duration",
-        "Weather:Sunset Duration",
+        "Weather Thunderstorm:Thunder Sound ID 0", "Weather Thunderstorm:Thunder Sound ID 1",
+        "Weather Thunderstorm:Thunder Sound ID 2", "Weather Thunderstorm:Thunder Sound ID 3", "Weather:Sunrise Time",
+        "Weather:Sunset Time", "Weather:Sunrise Duration", "Weather:Sunset Duration",
         "Weather:Hours Between Weather Changes", // AKA weather update time
-        "Weather Thunderstorm:Thunder Frequency",
-        "Weather Thunderstorm:Thunder Threshold",
-
-        "Weather:EnvReduceColor",
-        "Weather:LerpCloseColor",
-        "Weather:BumpFadeColor",
-        "Weather:AlphaReduce",
-        "Weather:Minimum Time Between Environmental Sounds",
-        "Weather:Maximum Time Between Environmental Sounds",
-        "Weather:Sun Glare Fader Max",
-        "Weather:Sun Glare Fader Angle Max",
-        "Weather:Sun Glare Fader Color",
-        "Weather:Timescale Clouds",
-        "Weather:Precip Gravity",
-        "Weather:Rain Ripples",
-        "Weather:Rain Ripple Radius",
-        "Weather:Rain Ripples Per Drop",
-        "Weather:Rain Ripple Scale",
-        "Weather:Rain Ripple Speed",
-        "Weather:Fog Depth Change Speed",
-        "Weather:Sky Pre-Sunrise Time",
-        "Weather:Sky Post-Sunrise Time",
-        "Weather:Sky Pre-Sunset Time",
-        "Weather:Sky Post-Sunset Time",
-        "Weather:Ambient Pre-Sunrise Time",
-        "Weather:Ambient Post-Sunrise Time",
-        "Weather:Ambient Pre-Sunset Time",
-        "Weather:Ambient Post-Sunset Time",
-        "Weather:Fog Pre-Sunrise Time",
-        "Weather:Fog Post-Sunrise Time",
-        "Weather:Fog Pre-Sunset Time",
-        "Weather:Fog Post-Sunset Time",
-        "Weather:Sun Pre-Sunrise Time",
-        "Weather:Sun Post-Sunrise Time",
-        "Weather:Sun Pre-Sunset Time",
-        "Weather:Sun Post-Sunset Time",
-        "Weather:Stars Post-Sunset Start",
-        "Weather:Stars Pre-Sunrise Finish",
-        "Weather:Stars Fading Duration",
-        "Weather:Snow Ripples",
-        "Weather:Snow Ripple Radius",
-        "Weather:Snow Ripples Per Flake",
-        "Weather:Snow Ripple Scale",
-        "Weather:Snow Ripple Speed",
-        "Weather:Snow Gravity Scale",
-        "Weather:Snow High Kill",
-        "Weather:Snow Low Kill",
-
-        "Weather Clear:Cloud Texture",
-        "Weather Clear:Clouds Maximum Percent",
-        "Weather Clear:Transition Delta",
-        "Weather Clear:Sky Sunrise Color",
-        "Weather Clear:Sky Day Color",
-        "Weather Clear:Sky Sunset Color",
-        "Weather Clear:Sky Night Color",
-        "Weather Clear:Fog Sunrise Color",
-        "Weather Clear:Fog Day Color",
-        "Weather Clear:Fog Sunset Color",
-        "Weather Clear:Fog Night Color",
-        "Weather Clear:Ambient Sunrise Color",
-        "Weather Clear:Ambient Day Color",
-        "Weather Clear:Ambient Sunset Color",
-        "Weather Clear:Ambient Night Color",
-        "Weather Clear:Sun Sunrise Color",
-        "Weather Clear:Sun Day Color",
-        "Weather Clear:Sun Sunset Color",
-        "Weather Clear:Sun Night Color",
-        "Weather Clear:Sun Disc Sunset Color",
-        "Weather Clear:Land Fog Day Depth",
-        "Weather Clear:Land Fog Night Depth",
-        "Weather Clear:Wind Speed",
-        "Weather Clear:Cloud Speed",
-        "Weather Clear:Glare View",
-        "Weather Clear:Ambient Loop Sound ID",
-
-        "Weather Cloudy:Cloud Texture",
-        "Weather Cloudy:Clouds Maximum Percent",
-        "Weather Cloudy:Transition Delta",
-        "Weather Cloudy:Sky Sunrise Color",
-        "Weather Cloudy:Sky Day Color",
-        "Weather Cloudy:Sky Sunset Color",
-        "Weather Cloudy:Sky Night Color",
-        "Weather Cloudy:Fog Sunrise Color",
-        "Weather Cloudy:Fog Day Color",
-        "Weather Cloudy:Fog Sunset Color",
-        "Weather Cloudy:Fog Night Color",
-        "Weather Cloudy:Ambient Sunrise Color",
-        "Weather Cloudy:Ambient Day Color",
-        "Weather Cloudy:Ambient Sunset Color",
-        "Weather Cloudy:Ambient Night Color",
-        "Weather Cloudy:Sun Sunrise Color",
-        "Weather Cloudy:Sun Day Color",
-        "Weather Cloudy:Sun Sunset Color",
-        "Weather Cloudy:Sun Night Color",
-        "Weather Cloudy:Sun Disc Sunset Color",
-        "Weather Cloudy:Land Fog Day Depth",
-        "Weather Cloudy:Land Fog Night Depth",
-        "Weather Cloudy:Wind Speed",
-        "Weather Cloudy:Cloud Speed",
-        "Weather Cloudy:Glare View",
-        "Weather Cloudy:Ambient Loop Sound ID",
-
-        "Weather Foggy:Cloud Texture",
-        "Weather Foggy:Clouds Maximum Percent",
-        "Weather Foggy:Transition Delta",
-        "Weather Foggy:Sky Sunrise Color",
-        "Weather Foggy:Sky Day Color",
-        "Weather Foggy:Sky Sunset Color",
-        "Weather Foggy:Sky Night Color",
-        "Weather Foggy:Fog Sunrise Color",
-        "Weather Foggy:Fog Day Color",
-        "Weather Foggy:Fog Sunset Color",
-        "Weather Foggy:Fog Night Color",
-        "Weather Foggy:Ambient Sunrise Color",
-        "Weather Foggy:Ambient Day Color",
-        "Weather Foggy:Ambient Sunset Color",
-        "Weather Foggy:Ambient Night Color",
-        "Weather Foggy:Sun Sunrise Color",
-        "Weather Foggy:Sun Day Color",
-        "Weather Foggy:Sun Sunset Color",
-        "Weather Foggy:Sun Night Color",
-        "Weather Foggy:Sun Disc Sunset Color",
-        "Weather Foggy:Land Fog Day Depth",
-        "Weather Foggy:Land Fog Night Depth",
-        "Weather Foggy:Wind Speed",
-        "Weather Foggy:Cloud Speed",
-        "Weather Foggy:Glare View",
-        "Weather Foggy:Ambient Loop Sound ID",
-
-        "Weather Thunderstorm:Cloud Texture",
-        "Weather Thunderstorm:Clouds Maximum Percent",
-        "Weather Thunderstorm:Transition Delta",
-        "Weather Thunderstorm:Sky Sunrise Color",
-        "Weather Thunderstorm:Sky Day Color",
-        "Weather Thunderstorm:Sky Sunset Color",
-        "Weather Thunderstorm:Sky Night Color",
-        "Weather Thunderstorm:Fog Sunrise Color",
-        "Weather Thunderstorm:Fog Day Color",
-        "Weather Thunderstorm:Fog Sunset Color",
-        "Weather Thunderstorm:Fog Night Color",
-        "Weather Thunderstorm:Ambient Sunrise Color",
-        "Weather Thunderstorm:Ambient Day Color",
-        "Weather Thunderstorm:Ambient Sunset Color",
-        "Weather Thunderstorm:Ambient Night Color",
-        "Weather Thunderstorm:Sun Sunrise Color",
-        "Weather Thunderstorm:Sun Day Color",
-        "Weather Thunderstorm:Sun Sunset Color",
-        "Weather Thunderstorm:Sun Night Color",
-        "Weather Thunderstorm:Sun Disc Sunset Color",
-        "Weather Thunderstorm:Land Fog Day Depth",
-        "Weather Thunderstorm:Land Fog Night Depth",
-        "Weather Thunderstorm:Wind Speed",
-        "Weather Thunderstorm:Cloud Speed",
-        "Weather Thunderstorm:Glare View",
-        "Weather Thunderstorm:Rain Loop Sound ID",
-        "Weather Thunderstorm:Using Precip",
-        "Weather Thunderstorm:Rain Diameter",
-        "Weather Thunderstorm:Rain Height Min",
-        "Weather Thunderstorm:Rain Height Max",
-        "Weather Thunderstorm:Rain Threshold",
-        "Weather Thunderstorm:Max Raindrops",
-        "Weather Thunderstorm:Rain Entrance Speed",
-        "Weather Thunderstorm:Ambient Loop Sound ID",
-        "Weather Thunderstorm:Flash Decrement",
-
-        "Weather Rain:Cloud Texture",
-        "Weather Rain:Clouds Maximum Percent",
-        "Weather Rain:Transition Delta",
-        "Weather Rain:Sky Sunrise Color",
-        "Weather Rain:Sky Day Color",
-        "Weather Rain:Sky Sunset Color",
-        "Weather Rain:Sky Night Color",
-        "Weather Rain:Fog Sunrise Color",
-        "Weather Rain:Fog Day Color",
-        "Weather Rain:Fog Sunset Color",
-        "Weather Rain:Fog Night Color",
-        "Weather Rain:Ambient Sunrise Color",
-        "Weather Rain:Ambient Day Color",
-        "Weather Rain:Ambient Sunset Color",
-        "Weather Rain:Ambient Night Color",
-        "Weather Rain:Sun Sunrise Color",
-        "Weather Rain:Sun Day Color",
-        "Weather Rain:Sun Sunset Color",
-        "Weather Rain:Sun Night Color",
-        "Weather Rain:Sun Disc Sunset Color",
-        "Weather Rain:Land Fog Day Depth",
-        "Weather Rain:Land Fog Night Depth",
-        "Weather Rain:Wind Speed",
-        "Weather Rain:Cloud Speed",
-        "Weather Rain:Glare View",
-        "Weather Rain:Rain Loop Sound ID",
-        "Weather Rain:Using Precip",
-        "Weather Rain:Rain Diameter",
-        "Weather Rain:Rain Height Min",
-        "Weather Rain:Rain Height Max",
-        "Weather Rain:Rain Threshold",
-        "Weather Rain:Rain Entrance Speed",
-        "Weather Rain:Ambient Loop Sound ID",
+        "Weather Thunderstorm:Thunder Frequency", "Weather Thunderstorm:Thunder Threshold",
+
+        "Weather:EnvReduceColor", "Weather:LerpCloseColor", "Weather:BumpFadeColor", "Weather:AlphaReduce",
+        "Weather:Minimum Time Between Environmental Sounds", "Weather:Maximum Time Between Environmental Sounds",
+        "Weather:Sun Glare Fader Max", "Weather:Sun Glare Fader Angle Max", "Weather:Sun Glare Fader Color",
+        "Weather:Timescale Clouds", "Weather:Precip Gravity", "Weather:Rain Ripples", "Weather:Rain Ripple Radius",
+        "Weather:Rain Ripples Per Drop", "Weather:Rain Ripple Scale", "Weather:Rain Ripple Speed",
+        "Weather:Fog Depth Change Speed", "Weather:Sky Pre-Sunrise Time", "Weather:Sky Post-Sunrise Time",
+        "Weather:Sky Pre-Sunset Time", "Weather:Sky Post-Sunset Time", "Weather:Ambient Pre-Sunrise Time",
+        "Weather:Ambient Post-Sunrise Time", "Weather:Ambient Pre-Sunset Time", "Weather:Ambient Post-Sunset Time",
+        "Weather:Fog Pre-Sunrise Time", "Weather:Fog Post-Sunrise Time", "Weather:Fog Pre-Sunset Time",
+        "Weather:Fog Post-Sunset Time", "Weather:Sun Pre-Sunrise Time", "Weather:Sun Post-Sunrise Time",
+        "Weather:Sun Pre-Sunset Time", "Weather:Sun Post-Sunset Time", "Weather:Stars Post-Sunset Start",
+        "Weather:Stars Pre-Sunrise Finish", "Weather:Stars Fading Duration", "Weather:Snow Ripples",
+        "Weather:Snow Ripple Radius", "Weather:Snow Ripples Per Flake", "Weather:Snow Ripple Scale",
+        "Weather:Snow Ripple Speed", "Weather:Snow Gravity Scale", "Weather:Snow High Kill", "Weather:Snow Low Kill",
+
+        "Weather Clear:Cloud Texture", "Weather Clear:Clouds Maximum Percent", "Weather Clear:Transition Delta",
+        "Weather Clear:Sky Sunrise Color", "Weather Clear:Sky Day Color", "Weather Clear:Sky Sunset Color",
+        "Weather Clear:Sky Night Color", "Weather Clear:Fog Sunrise Color", "Weather Clear:Fog Day Color",
+        "Weather Clear:Fog Sunset Color", "Weather Clear:Fog Night Color", "Weather Clear:Ambient Sunrise Color",
+        "Weather Clear:Ambient Day Color", "Weather Clear:Ambient Sunset Color", "Weather Clear:Ambient Night Color",
+        "Weather Clear:Sun Sunrise Color", "Weather Clear:Sun Day Color", "Weather Clear:Sun Sunset Color",
+        "Weather Clear:Sun Night Color", "Weather Clear:Sun Disc Sunset Color", "Weather Clear:Land Fog Day Depth",
+        "Weather Clear:Land Fog Night Depth", "Weather Clear:Wind Speed", "Weather Clear:Cloud Speed",
+        "Weather Clear:Glare View", "Weather Clear:Ambient Loop Sound ID",
+
+        "Weather Cloudy:Cloud Texture", "Weather Cloudy:Clouds Maximum Percent", "Weather Cloudy:Transition Delta",
+        "Weather Cloudy:Sky Sunrise Color", "Weather Cloudy:Sky Day Color", "Weather Cloudy:Sky Sunset Color",
+        "Weather Cloudy:Sky Night Color", "Weather Cloudy:Fog Sunrise Color", "Weather Cloudy:Fog Day Color",
+        "Weather Cloudy:Fog Sunset Color", "Weather Cloudy:Fog Night Color", "Weather Cloudy:Ambient Sunrise Color",
+        "Weather Cloudy:Ambient Day Color", "Weather Cloudy:Ambient Sunset Color", "Weather Cloudy:Ambient Night Color",
+        "Weather Cloudy:Sun Sunrise Color", "Weather Cloudy:Sun Day Color", "Weather Cloudy:Sun Sunset Color",
+        "Weather Cloudy:Sun Night Color", "Weather Cloudy:Sun Disc Sunset Color", "Weather Cloudy:Land Fog Day Depth",
+        "Weather Cloudy:Land Fog Night Depth", "Weather Cloudy:Wind Speed", "Weather Cloudy:Cloud Speed",
+        "Weather Cloudy:Glare View", "Weather Cloudy:Ambient Loop Sound ID",
+
+        "Weather Foggy:Cloud Texture", "Weather Foggy:Clouds Maximum Percent", "Weather Foggy:Transition Delta",
+        "Weather Foggy:Sky Sunrise Color", "Weather Foggy:Sky Day Color", "Weather Foggy:Sky Sunset Color",
+        "Weather Foggy:Sky Night Color", "Weather Foggy:Fog Sunrise Color", "Weather Foggy:Fog Day Color",
+        "Weather Foggy:Fog Sunset Color", "Weather Foggy:Fog Night Color", "Weather Foggy:Ambient Sunrise Color",
+        "Weather Foggy:Ambient Day Color", "Weather Foggy:Ambient Sunset Color", "Weather Foggy:Ambient Night Color",
+        "Weather Foggy:Sun Sunrise Color", "Weather Foggy:Sun Day Color", "Weather Foggy:Sun Sunset Color",
+        "Weather Foggy:Sun Night Color", "Weather Foggy:Sun Disc Sunset Color", "Weather Foggy:Land Fog Day Depth",
+        "Weather Foggy:Land Fog Night Depth", "Weather Foggy:Wind Speed", "Weather Foggy:Cloud Speed",
+        "Weather Foggy:Glare View", "Weather Foggy:Ambient Loop Sound ID",
+
+        "Weather Thunderstorm:Cloud Texture", "Weather Thunderstorm:Clouds Maximum Percent",
+        "Weather Thunderstorm:Transition Delta", "Weather Thunderstorm:Sky Sunrise Color",
+        "Weather Thunderstorm:Sky Day Color", "Weather Thunderstorm:Sky Sunset Color",
+        "Weather Thunderstorm:Sky Night Color", "Weather Thunderstorm:Fog Sunrise Color",
+        "Weather Thunderstorm:Fog Day Color", "Weather Thunderstorm:Fog Sunset Color",
+        "Weather Thunderstorm:Fog Night Color", "Weather Thunderstorm:Ambient Sunrise Color",
+        "Weather Thunderstorm:Ambient Day Color", "Weather Thunderstorm:Ambient Sunset Color",
+        "Weather Thunderstorm:Ambient Night Color", "Weather Thunderstorm:Sun Sunrise Color",
+        "Weather Thunderstorm:Sun Day Color", "Weather Thunderstorm:Sun Sunset Color",
+        "Weather Thunderstorm:Sun Night Color", "Weather Thunderstorm:Sun Disc Sunset Color",
+        "Weather Thunderstorm:Land Fog Day Depth", "Weather Thunderstorm:Land Fog Night Depth",
+        "Weather Thunderstorm:Wind Speed", "Weather Thunderstorm:Cloud Speed", "Weather Thunderstorm:Glare View",
+        "Weather Thunderstorm:Rain Loop Sound ID", "Weather Thunderstorm:Using Precip",
+        "Weather Thunderstorm:Rain Diameter", "Weather Thunderstorm:Rain Height Min",
+        "Weather Thunderstorm:Rain Height Max", "Weather Thunderstorm:Rain Threshold",
+        "Weather Thunderstorm:Max Raindrops", "Weather Thunderstorm:Rain Entrance Speed",
+        "Weather Thunderstorm:Ambient Loop Sound ID", "Weather Thunderstorm:Flash Decrement",
+
+        "Weather Rain:Cloud Texture", "Weather Rain:Clouds Maximum Percent", "Weather Rain:Transition Delta",
+        "Weather Rain:Sky Sunrise Color", "Weather Rain:Sky Day Color", "Weather Rain:Sky Sunset Color",
+        "Weather Rain:Sky Night Color", "Weather Rain:Fog Sunrise Color", "Weather Rain:Fog Day Color",
+        "Weather Rain:Fog Sunset Color", "Weather Rain:Fog Night Color", "Weather Rain:Ambient Sunrise Color",
+        "Weather Rain:Ambient Day Color", "Weather Rain:Ambient Sunset Color", "Weather Rain:Ambient Night Color",
+        "Weather Rain:Sun Sunrise Color", "Weather Rain:Sun Day Color", "Weather Rain:Sun Sunset Color",
+        "Weather Rain:Sun Night Color", "Weather Rain:Sun Disc Sunset Color", "Weather Rain:Land Fog Day Depth",
+        "Weather Rain:Land Fog Night Depth", "Weather Rain:Wind Speed", "Weather Rain:Cloud Speed",
+        "Weather Rain:Glare View", "Weather Rain:Rain Loop Sound ID", "Weather Rain:Using Precip",
+        "Weather Rain:Rain Diameter", "Weather Rain:Rain Height Min", "Weather Rain:Rain Height Max",
+        "Weather Rain:Rain Threshold", "Weather Rain:Rain Entrance Speed", "Weather Rain:Ambient Loop Sound ID",
         "Weather Rain:Max Raindrops",
 
-        "Weather Overcast:Cloud Texture",
-        "Weather Overcast:Clouds Maximum Percent",
-        "Weather Overcast:Transition Delta",
-        "Weather Overcast:Sky Sunrise Color",
-        "Weather Overcast:Sky Day Color",
-        "Weather Overcast:Sky Sunset Color",
-        "Weather Overcast:Sky Night Color",
-        "Weather Overcast:Fog Sunrise Color",
-        "Weather Overcast:Fog Day Color",
-        "Weather Overcast:Fog Sunset Color",
-        "Weather Overcast:Fog Night Color",
-        "Weather Overcast:Ambient Sunrise Color",
-        "Weather Overcast:Ambient Day Color",
-        "Weather Overcast:Ambient Sunset Color",
-        "Weather Overcast:Ambient Night Color",
-        "Weather Overcast:Sun Sunrise Color",
-        "Weather Overcast:Sun Day Color",
-        "Weather Overcast:Sun Sunset Color",
-        "Weather Overcast:Sun Night Color",
-        "Weather Overcast:Sun Disc Sunset Color",
-        "Weather Overcast:Land Fog Day Depth",
-        "Weather Overcast:Land Fog Night Depth",
-        "Weather Overcast:Wind Speed",
-        "Weather Overcast:Cloud Speed",
-        "Weather Overcast:Glare View",
-        "Weather Overcast:Ambient Loop Sound ID",
-
-        "Weather Ashstorm:Cloud Texture",
-        "Weather Ashstorm:Clouds Maximum Percent",
-        "Weather Ashstorm:Transition Delta",
-        "Weather Ashstorm:Sky Sunrise Color",
-        "Weather Ashstorm:Sky Day Color",
-        "Weather Ashstorm:Sky Sunset Color",
-        "Weather Ashstorm:Sky Night Color",
-        "Weather Ashstorm:Fog Sunrise Color",
-        "Weather Ashstorm:Fog Day Color",
-        "Weather Ashstorm:Fog Sunset Color",
-        "Weather Ashstorm:Fog Night Color",
-        "Weather Ashstorm:Ambient Sunrise Color",
-        "Weather Ashstorm:Ambient Day Color",
-        "Weather Ashstorm:Ambient Sunset Color",
-        "Weather Ashstorm:Ambient Night Color",
-        "Weather Ashstorm:Sun Sunrise Color",
-        "Weather Ashstorm:Sun Day Color",
-        "Weather Ashstorm:Sun Sunset Color",
-        "Weather Ashstorm:Sun Night Color",
-        "Weather Ashstorm:Sun Disc Sunset Color",
-        "Weather Ashstorm:Land Fog Day Depth",
-        "Weather Ashstorm:Land Fog Night Depth",
-        "Weather Ashstorm:Wind Speed",
-        "Weather Ashstorm:Cloud Speed",
-        "Weather Ashstorm:Glare View",
-        "Weather Ashstorm:Ambient Loop Sound ID",
+        "Weather Overcast:Cloud Texture", "Weather Overcast:Clouds Maximum Percent",
+        "Weather Overcast:Transition Delta", "Weather Overcast:Sky Sunrise Color", "Weather Overcast:Sky Day Color",
+        "Weather Overcast:Sky Sunset Color", "Weather Overcast:Sky Night Color", "Weather Overcast:Fog Sunrise Color",
+        "Weather Overcast:Fog Day Color", "Weather Overcast:Fog Sunset Color", "Weather Overcast:Fog Night Color",
+        "Weather Overcast:Ambient Sunrise Color", "Weather Overcast:Ambient Day Color",
+        "Weather Overcast:Ambient Sunset Color", "Weather Overcast:Ambient Night Color",
+        "Weather Overcast:Sun Sunrise Color", "Weather Overcast:Sun Day Color", "Weather Overcast:Sun Sunset Color",
+        "Weather Overcast:Sun Night Color", "Weather Overcast:Sun Disc Sunset Color",
+        "Weather Overcast:Land Fog Day Depth", "Weather Overcast:Land Fog Night Depth", "Weather Overcast:Wind Speed",
+        "Weather Overcast:Cloud Speed", "Weather Overcast:Glare View", "Weather Overcast:Ambient Loop Sound ID",
+
+        "Weather Ashstorm:Cloud Texture", "Weather Ashstorm:Clouds Maximum Percent",
+        "Weather Ashstorm:Transition Delta", "Weather Ashstorm:Sky Sunrise Color", "Weather Ashstorm:Sky Day Color",
+        "Weather Ashstorm:Sky Sunset Color", "Weather Ashstorm:Sky Night Color", "Weather Ashstorm:Fog Sunrise Color",
+        "Weather Ashstorm:Fog Day Color", "Weather Ashstorm:Fog Sunset Color", "Weather Ashstorm:Fog Night Color",
+        "Weather Ashstorm:Ambient Sunrise Color", "Weather Ashstorm:Ambient Day Color",
+        "Weather Ashstorm:Ambient Sunset Color", "Weather Ashstorm:Ambient Night Color",
+        "Weather Ashstorm:Sun Sunrise Color", "Weather Ashstorm:Sun Day Color", "Weather Ashstorm:Sun Sunset Color",
+        "Weather Ashstorm:Sun Night Color", "Weather Ashstorm:Sun Disc Sunset Color",
+        "Weather Ashstorm:Land Fog Day Depth", "Weather Ashstorm:Land Fog Night Depth", "Weather Ashstorm:Wind Speed",
+        "Weather Ashstorm:Cloud Speed", "Weather Ashstorm:Glare View", "Weather Ashstorm:Ambient Loop Sound ID",
         "Weather Ashstorm:Storm Threshold",
 
-        "Weather Blight:Cloud Texture",
-        "Weather Blight:Clouds Maximum Percent",
-        "Weather Blight:Transition Delta",
-        "Weather Blight:Sky Sunrise Color",
-        "Weather Blight:Sky Day Color",
-        "Weather Blight:Sky Sunset Color",
-        "Weather Blight:Sky Night Color",
-        "Weather Blight:Fog Sunrise Color",
-        "Weather Blight:Fog Day Color",
-        "Weather Blight:Fog Sunset Color",
-        "Weather Blight:Fog Night Color",
-        "Weather Blight:Ambient Sunrise Color",
-        "Weather Blight:Ambient Day Color",
-        "Weather Blight:Ambient Sunset Color",
-        "Weather Blight:Ambient Night Color",
-        "Weather Blight:Sun Sunrise Color",
-        "Weather Blight:Sun Day Color",
-        "Weather Blight:Sun Sunset Color",
-        "Weather Blight:Sun Night Color",
-        "Weather Blight:Sun Disc Sunset Color",
-        "Weather Blight:Land Fog Day Depth",
-        "Weather Blight:Land Fog Night Depth",
-        "Weather Blight:Wind Speed",
-        "Weather Blight:Cloud Speed",
-        "Weather Blight:Glare View",
-        "Weather Blight:Ambient Loop Sound ID",
-        "Weather Blight:Storm Threshold",
+        "Weather Blight:Cloud Texture", "Weather Blight:Clouds Maximum Percent", "Weather Blight:Transition Delta",
+        "Weather Blight:Sky Sunrise Color", "Weather Blight:Sky Day Color", "Weather Blight:Sky Sunset Color",
+        "Weather Blight:Sky Night Color", "Weather Blight:Fog Sunrise Color", "Weather Blight:Fog Day Color",
+        "Weather Blight:Fog Sunset Color", "Weather Blight:Fog Night Color", "Weather Blight:Ambient Sunrise Color",
+        "Weather Blight:Ambient Day Color", "Weather Blight:Ambient Sunset Color", "Weather Blight:Ambient Night Color",
+        "Weather Blight:Sun Sunrise Color", "Weather Blight:Sun Day Color", "Weather Blight:Sun Sunset Color",
+        "Weather Blight:Sun Night Color", "Weather Blight:Sun Disc Sunset Color", "Weather Blight:Land Fog Day Depth",
+        "Weather Blight:Land Fog Night Depth", "Weather Blight:Wind Speed", "Weather Blight:Cloud Speed",
+        "Weather Blight:Glare View", "Weather Blight:Ambient Loop Sound ID", "Weather Blight:Storm Threshold",
         "Weather Blight:Disease Chance",
 
         // for Bloodmoon
-        "Weather Snow:Cloud Texture",
-        "Weather Snow:Clouds Maximum Percent",
-        "Weather Snow:Transition Delta",
-        "Weather Snow:Sky Sunrise Color",
-        "Weather Snow:Sky Day Color",
-        "Weather Snow:Sky Sunset Color",
-        "Weather Snow:Sky Night Color",
-        "Weather Snow:Fog Sunrise Color",
-        "Weather Snow:Fog Day Color",
-        "Weather Snow:Fog Sunset Color",
-        "Weather Snow:Fog Night Color",
-        "Weather Snow:Ambient Sunrise Color",
-        "Weather Snow:Ambient Day Color",
-        "Weather Snow:Ambient Sunset Color",
-        "Weather Snow:Ambient Night Color",
-        "Weather Snow:Sun Sunrise Color",
-        "Weather Snow:Sun Day Color",
-        "Weather Snow:Sun Sunset Color",
-        "Weather Snow:Sun Night Color",
-        "Weather Snow:Sun Disc Sunset Color",
-        "Weather Snow:Land Fog Day Depth",
-        "Weather Snow:Land Fog Night Depth",
-        "Weather Snow:Wind Speed",
-        "Weather Snow:Cloud Speed",
-        "Weather Snow:Glare View",
-        "Weather Snow:Snow Diameter",
-        "Weather Snow:Snow Height Min",
-        "Weather Snow:Snow Height Max",
-        "Weather Snow:Snow Entrance Speed",
-        "Weather Snow:Max Snowflakes",
-        "Weather Snow:Ambient Loop Sound ID",
-        "Weather Snow:Snow Threshold",
+        "Weather Snow:Cloud Texture", "Weather Snow:Clouds Maximum Percent", "Weather Snow:Transition Delta",
+        "Weather Snow:Sky Sunrise Color", "Weather Snow:Sky Day Color", "Weather Snow:Sky Sunset Color",
+        "Weather Snow:Sky Night Color", "Weather Snow:Fog Sunrise Color", "Weather Snow:Fog Day Color",
+        "Weather Snow:Fog Sunset Color", "Weather Snow:Fog Night Color", "Weather Snow:Ambient Sunrise Color",
+        "Weather Snow:Ambient Day Color", "Weather Snow:Ambient Sunset Color", "Weather Snow:Ambient Night Color",
+        "Weather Snow:Sun Sunrise Color", "Weather Snow:Sun Day Color", "Weather Snow:Sun Sunset Color",
+        "Weather Snow:Sun Night Color", "Weather Snow:Sun Disc Sunset Color", "Weather Snow:Land Fog Day Depth",
+        "Weather Snow:Land Fog Night Depth", "Weather Snow:Wind Speed", "Weather Snow:Cloud Speed",
+        "Weather Snow:Glare View", "Weather Snow:Snow Diameter", "Weather Snow:Snow Height Min",
+        "Weather Snow:Snow Height Max", "Weather Snow:Snow Entrance Speed", "Weather Snow:Max Snowflakes",
+        "Weather Snow:Ambient Loop Sound ID", "Weather Snow:Snow Threshold",
 
         // for Bloodmoon
-        "Weather Blizzard:Cloud Texture",
-        "Weather Blizzard:Clouds Maximum Percent",
-        "Weather Blizzard:Transition Delta",
-        "Weather Blizzard:Sky Sunrise Color",
-        "Weather Blizzard:Sky Day Color",
-        "Weather Blizzard:Sky Sunset Color",
-        "Weather Blizzard:Sky Night Color",
-        "Weather Blizzard:Fog Sunrise Color",
-        "Weather Blizzard:Fog Day Color",
-        "Weather Blizzard:Fog Sunset Color",
-        "Weather Blizzard:Fog Night Color",
-        "Weather Blizzard:Ambient Sunrise Color",
-        "Weather Blizzard:Ambient Day Color",
-        "Weather Blizzard:Ambient Sunset Color",
-        "Weather Blizzard:Ambient Night Color",
-        "Weather Blizzard:Sun Sunrise Color",
-        "Weather Blizzard:Sun Day Color",
-        "Weather Blizzard:Sun Sunset Color",
-        "Weather Blizzard:Sun Night Color",
-        "Weather Blizzard:Sun Disc Sunset Color",
-        "Weather Blizzard:Land Fog Day Depth",
-        "Weather Blizzard:Land Fog Night Depth",
-        "Weather Blizzard:Wind Speed",
-        "Weather Blizzard:Cloud Speed",
-        "Weather Blizzard:Glare View",
-        "Weather Blizzard:Ambient Loop Sound ID",
+        "Weather Blizzard:Cloud Texture", "Weather Blizzard:Clouds Maximum Percent",
+        "Weather Blizzard:Transition Delta", "Weather Blizzard:Sky Sunrise Color", "Weather Blizzard:Sky Day Color",
+        "Weather Blizzard:Sky Sunset Color", "Weather Blizzard:Sky Night Color", "Weather Blizzard:Fog Sunrise Color",
+        "Weather Blizzard:Fog Day Color", "Weather Blizzard:Fog Sunset Color", "Weather Blizzard:Fog Night Color",
+        "Weather Blizzard:Ambient Sunrise Color", "Weather Blizzard:Ambient Day Color",
+        "Weather Blizzard:Ambient Sunset Color", "Weather Blizzard:Ambient Night Color",
+        "Weather Blizzard:Sun Sunrise Color", "Weather Blizzard:Sun Day Color", "Weather Blizzard:Sun Sunset Color",
+        "Weather Blizzard:Sun Night Color", "Weather Blizzard:Sun Disc Sunset Color",
+        "Weather Blizzard:Land Fog Day Depth", "Weather Blizzard:Land Fog Night Depth", "Weather Blizzard:Wind Speed",
+        "Weather Blizzard:Cloud Speed", "Weather Blizzard:Glare View", "Weather Blizzard:Ambient Loop Sound ID",
         "Weather Blizzard:Storm Threshold",
 
         // moons
-        "Moons:Secunda Size",
-        "Moons:Secunda Axis Offset",
-        "Moons:Secunda Speed",
-        "Moons:Secunda Daily Increment",
-        "Moons:Secunda Moon Shadow Early Fade Angle",
-        "Moons:Secunda Fade Start Angle",
-        "Moons:Secunda Fade End Angle",
-        "Moons:Secunda Fade In Start",
-        "Moons:Secunda Fade In Finish",
-        "Moons:Secunda Fade Out Start",
-        "Moons:Secunda Fade Out Finish",
-        "Moons:Masser Size",
-        "Moons:Masser Axis Offset",
-        "Moons:Masser Speed",
-        "Moons:Masser Daily Increment",
-        "Moons:Masser Moon Shadow Early Fade Angle",
-        "Moons:Masser Fade Start Angle",
-        "Moons:Masser Fade End Angle",
-        "Moons:Masser Fade In Start",
-        "Moons:Masser Fade In Finish",
-        "Moons:Masser Fade Out Start",
-        "Moons:Masser Fade Out Finish",
-        "Moons:Script Color",
+        "Moons:Secunda Size", "Moons:Secunda Axis Offset", "Moons:Secunda Speed", "Moons:Secunda Daily Increment",
+        "Moons:Secunda Moon Shadow Early Fade Angle", "Moons:Secunda Fade Start Angle", "Moons:Secunda Fade End Angle",
+        "Moons:Secunda Fade In Start", "Moons:Secunda Fade In Finish", "Moons:Secunda Fade Out Start",
+        "Moons:Secunda Fade Out Finish", "Moons:Masser Size", "Moons:Masser Axis Offset", "Moons:Masser Speed",
+        "Moons:Masser Daily Increment", "Moons:Masser Moon Shadow Early Fade Angle", "Moons:Masser Fade Start Angle",
+        "Moons:Masser Fade End Angle", "Moons:Masser Fade In Start", "Moons:Masser Fade In Finish",
+        "Moons:Masser Fade Out Start", "Moons:Masser Fade Out Finish", "Moons:Script Color",
 
         // werewolf (Bloodmoon)
         "General:Werewolf FOV",
@@ -644,20 +257,24 @@ MwIniImporter::MwIniImporter()
         0
     };
 
-    for(int i=0; map[i][0]; i++) {
+    for (int i = 0; map[i][0]; i++)
+    {
         mMergeMap.insert(std::make_pair<std::string, std::string>(map[i][0], map[i][1]));
     }
 
-    for(int i=0; fallback[i]; i++) {
+    for (int i = 0; fallback[i]; i++)
+    {
         mMergeFallback.emplace_back(fallback[i]);
     }
 }
 
-void MwIniImporter::setVerbose(bool verbose) {
+void MwIniImporter::setVerbose(bool verbose)
+{
     mVerbose = verbose;
 }
 
-MwIniImporter::multistrmap MwIniImporter::loadIniFile(const std::filesystem::path&  filename) const {
+MwIniImporter::multistrmap MwIniImporter::loadIniFile(const std::filesystem::path& filename) const
+{
     std::cout << "load ini file: " << Files::pathToUnicodeString(filename) << std::endl;
 
     std::string section("");
@@ -666,43 +283,51 @@ MwIniImporter::multistrmap MwIniImporter::loadIniFile(const std::filesystem::pat
     ToUTF8::Utf8Encoder encoder(mEncoding);
 
     std::string line;
-    while (std::getline(file, line)) {
+    while (std::getline(file, line))
+    {
 
         std::string_view utf8 = encoder.getUtf8(line);
 
         // unify Unix-style and Windows file ending
-        if (!(utf8.empty()) && (utf8[utf8.length()-1]) == '\r') {
-            utf8 = utf8.substr(0, utf8.length()-1);
+        if (!(utf8.empty()) && (utf8[utf8.length() - 1]) == '\r')
+        {
+            utf8 = utf8.substr(0, utf8.length() - 1);
         }
 
-        if(utf8.empty()) {
+        if (utf8.empty())
+        {
             continue;
         }
 
-        if(utf8[0] == '[') {
+        if (utf8[0] == '[')
+        {
             int pos = static_cast<int>(utf8.find(']'));
-            if(pos < 2) {
+            if (pos < 2)
+            {
                 std::cout << "Warning: ini file wrongly formatted (" << utf8 << "). Line ignored." << std::endl;
                 continue;
             }
 
-            section = utf8.substr(1, utf8.find(']')-1);
+            section = utf8.substr(1, utf8.find(']') - 1);
             continue;
         }
 
         int comment_pos = static_cast<int>(utf8.find(';'));
-        if(comment_pos > 0) {
-            utf8 = utf8.substr(0,comment_pos);
+        if (comment_pos > 0)
+        {
+            utf8 = utf8.substr(0, comment_pos);
         }
 
         int pos = static_cast<int>(utf8.find('='));
-        if(pos < 1) {
+        if (pos < 1)
+        {
             continue;
         }
 
         std::string key(section + ":" + std::string(utf8.substr(0, pos)));
-        const std::string_view value(utf8.substr(pos+1));
-        if(value.empty()) {
+        const std::string_view value(utf8.substr(pos + 1));
+        if (value.empty())
+        {
             std::cout << "Warning: ignored empty value for key '" << key << "'." << std::endl;
             continue;
         }
@@ -718,35 +343,41 @@ MwIniImporter::multistrmap MwIniImporter::loadIniFile(const std::filesystem::pat
     return map;
 }
 
-MwIniImporter::multistrmap MwIniImporter::loadCfgFile(const std::filesystem::path& filename) {
+MwIniImporter::multistrmap MwIniImporter::loadCfgFile(const std::filesystem::path& filename)
+{
     std::cout << "load cfg file: " << Files::pathToUnicodeString(filename) << std::endl;
 
     MwIniImporter::multistrmap map;
     std::ifstream file(filename);
 
     std::string line;
-    while (std::getline(file, line)) {
+    while (std::getline(file, line))
+    {
 
         // we cant say comment by only looking at first char anymore
         int comment_pos = static_cast<int>(line.find('#'));
-        if(comment_pos > 0) {
-            line = line.substr(0,comment_pos);
+        if (comment_pos > 0)
+        {
+            line = line.substr(0, comment_pos);
         }
 
-        if(line.empty()) {
+        if (line.empty())
+        {
             continue;
         }
 
         int pos = static_cast<int>(line.find('='));
-        if(pos < 1) {
+        if (pos < 1)
+        {
             continue;
         }
 
-        std::string key(line.substr(0,pos));
-        std::string value(line.substr(pos+1));
+        std::string key(line.substr(0, pos));
+        std::string value(line.substr(pos + 1));
 
-        if(map.find(key) == map.end()) {
-            map.insert( std::make_pair (key, std::vector<std::string>() ) );
+        if (map.find(key) == map.end())
+        {
+            map.insert(std::make_pair(key, std::vector<std::string>()));
         }
         map[key].push_back(value);
     }
@@ -754,11 +385,15 @@ MwIniImporter::multistrmap MwIniImporter::loadCfgFile(const std::filesystem::pat
     return map;
 }
 
-void MwIniImporter::merge(multistrmap &cfg, const multistrmap &ini) const {
+void MwIniImporter::merge(multistrmap& cfg, const multistrmap& ini) const
+{
     multistrmap::const_iterator iniIt;
-    for(strmap::const_iterator it=mMergeMap.begin(); it!=mMergeMap.end(); ++it) {
-        if((iniIt = ini.find(it->second)) != ini.end()) {
-            for(std::vector<std::string>::const_iterator vc = iniIt->second.begin(); vc != iniIt->second.end(); ++vc) {
+    for (strmap::const_iterator it = mMergeMap.begin(); it != mMergeMap.end(); ++it)
+    {
+        if ((iniIt = ini.find(it->second)) != ini.end())
+        {
+            for (std::vector<std::string>::const_iterator vc = iniIt->second.begin(); vc != iniIt->second.end(); ++vc)
+            {
                 cfg.erase(it->first);
                 insertMultistrmap(cfg, it->first, *vc);
             }
@@ -766,74 +401,82 @@ void MwIniImporter::merge(multistrmap &cfg, const multistrmap &ini) const {
     }
 }
 
-void MwIniImporter::mergeFallback(multistrmap &cfg, const multistrmap &ini) const {
+void MwIniImporter::mergeFallback(multistrmap& cfg, const multistrmap& ini) const
+{
     cfg.erase("fallback");
 
     multistrmap::const_iterator iniIt;
-    for(std::vector<std::string>::const_iterator it=mMergeFallback.begin(); it!=mMergeFallback.end(); ++it) {
-        if((iniIt = ini.find(*it)) != ini.end()) {
-            for(std::vector<std::string>::const_iterator vc = iniIt->second.begin(); vc != iniIt->second.end(); ++vc) {
+    for (std::vector<std::string>::const_iterator it = mMergeFallback.begin(); it != mMergeFallback.end(); ++it)
+    {
+        if ((iniIt = ini.find(*it)) != ini.end())
+        {
+            for (std::vector<std::string>::const_iterator vc = iniIt->second.begin(); vc != iniIt->second.end(); ++vc)
+            {
                 std::string value(*it);
-                std::replace( value.begin(), value.end(), ' ', '_' );
-                std::replace( value.begin(), value.end(), ':', '_' );
-                value.append(",").append(vc->substr(0,vc->length()));
+                std::replace(value.begin(), value.end(), ' ', '_');
+                std::replace(value.begin(), value.end(), ':', '_');
+                value.append(",").append(vc->substr(0, vc->length()));
                 insertMultistrmap(cfg, "fallback", value);
             }
         }
     }
 }
 
-void MwIniImporter::insertMultistrmap(multistrmap &cfg, const std::string& key, const std::string& value) {
+void MwIniImporter::insertMultistrmap(multistrmap& cfg, const std::string& key, const std::string& value)
+{
     const auto it = cfg.find(key);
-    if(it == cfg.end()) {
-        cfg.insert(std::make_pair (key, std::vector<std::string>() ));
+    if (it == cfg.end())
+    {
+        cfg.insert(std::make_pair(key, std::vector<std::string>()));
     }
     cfg[key].push_back(value);
 }
 
-void MwIniImporter::importArchives(multistrmap &cfg, const multistrmap &ini) const {
+void MwIniImporter::importArchives(multistrmap& cfg, const multistrmap& ini) const
+{
     std::vector<std::string> archives;
     std::string baseArchive("Archives:Archive ");
     std::string archive;
 
     // Search archives listed in ini file
     auto it = ini.begin();
-    for(int i=0; it != ini.end(); i++) {
+    for (int i = 0; it != ini.end(); i++)
+    {
         archive = baseArchive;
         archive.append(std::to_string(i));
 
         it = ini.find(archive);
-        if(it == ini.end()) {
+        if (it == ini.end())
+        {
             break;
         }
 
-        for(std::vector<std::string>::const_iterator entry = it->second.begin(); entry!=it->second.end(); ++entry) {
+        for (std::vector<std::string>::const_iterator entry = it->second.begin(); entry != it->second.end(); ++entry)
+        {
             archives.push_back(*entry);
         }
     }
 
     cfg.erase("fallback-archive");
-    cfg.insert( std::make_pair<std::string, std::vector<std::string> > ("fallback-archive", std::vector<std::string>()));
+    cfg.insert(std::make_pair<std::string, std::vector<std::string>>("fallback-archive", std::vector<std::string>()));
 
     // Add Morrowind.bsa by default, since Vanilla loads this archive even if it
     // does not appears in the ini file
     cfg["fallback-archive"].push_back("Morrowind.bsa");
 
-    for(auto iter=archives.begin(); iter!=archives.end(); ++iter) {
+    for (auto iter = archives.begin(); iter != archives.end(); ++iter)
+    {
         cfg["fallback-archive"].push_back(*iter);
     }
 }
 
-void MwIniImporter::dependencySortStep(std::string& element, MwIniImporter::dependencyList& source, std::vector<std::string>& result)
+void MwIniImporter::dependencySortStep(
+    std::string& element, MwIniImporter::dependencyList& source, std::vector<std::string>& result)
 {
     auto iter = std::find_if(
-        source.begin(),
-        source.end(),
-        [&element](std::pair< std::string, std::vector<std::string> >& sourceElement)
-        {
+        source.begin(), source.end(), [&element](std::pair<std::string, std::vector<std::string>>& sourceElement) {
             return sourceElement.first == element;
-        }
-    );
+        });
     if (iter != source.end())
     {
         auto foundElement = std::move(*iter);
@@ -856,15 +499,15 @@ std::vector<std::string> MwIniImporter::dependencySort(MwIniImporter::dependency
     return result;
 }
 
-std::vector<std::string>::iterator MwIniImporter::findString(std::vector<std::string>& source, const std::string& string)
+std::vector<std::string>::iterator MwIniImporter::findString(
+    std::vector<std::string>& source, const std::string& string)
 {
-    return std::find_if(source.begin(), source.end(), [&string](const std::string& sourceString)
-    {
-        return Misc::StringUtils::ciEqual(sourceString, string);
-    });
+    return std::find_if(source.begin(), source.end(),
+        [&string](const std::string& sourceString) { return Misc::StringUtils::ciEqual(sourceString, string); });
 }
 
-void MwIniImporter::addPaths(std::vector<std::filesystem::path>& output, std::vector<std::string> input) {
+void MwIniImporter::addPaths(std::vector<std::filesystem::path>& output, std::vector<std::string> input)
+{
     for (auto& path : input)
     {
         if (path.front() == '"')
@@ -876,7 +519,8 @@ void MwIniImporter::addPaths(std::vector<std::filesystem::path>& output, std::ve
     }
 }
 
-void MwIniImporter::importGameFiles(multistrmap &cfg, const multistrmap &ini, const std::filesystem::path& iniFilename) const
+void MwIniImporter::importGameFiles(
+    multistrmap& cfg, const multistrmap& ini, const std::filesystem::path& iniFilename) const
 {
     std::vector<std::pair<std::time_t, std::filesystem::path>> contentFiles;
     std::string baseGameFile("Game Files:GameFile");
@@ -893,24 +537,24 @@ void MwIniImporter::importGameFiles(multistrmap &cfg, const multistrmap &ini, co
     dataPaths.push_back(iniFilename.parent_path() /= "Data Files");
 
     auto it = ini.begin();
-    for (int i=0; it != ini.end(); i++)
+    for (int i = 0; it != ini.end(); i++)
     {
         std::string gameFile = baseGameFile;
         gameFile.append(std::to_string(i));
 
         it = ini.find(gameFile);
-        if(it == ini.end())
+        if (it == ini.end())
             break;
 
-        for(std::vector<std::string>::const_iterator entry = it->second.begin(); entry!=it->second.end(); ++entry)
+        for (std::vector<std::string>::const_iterator entry = it->second.begin(); entry != it->second.end(); ++entry)
         {
-            std::string filetype(entry->substr(entry->length()-3));
+            std::string filetype(entry->substr(entry->length() - 3));
             Misc::StringUtils::lowerCaseInPlace(filetype);
 
-            if(filetype.compare("esm") == 0 || filetype.compare("esp") == 0)
+            if (filetype.compare("esm") == 0 || filetype.compare("esp") == 0)
             {
                 bool found = false;
-                for (auto & dataPath : dataPaths)
+                for (auto& dataPath : dataPaths)
                 {
                     std::filesystem::path path = dataPath / *entry;
                     std::time_t time = lastWriteTime(path, defaultTime);
@@ -928,7 +572,7 @@ void MwIniImporter::importGameFiles(multistrmap &cfg, const multistrmap &ini, co
     }
 
     cfg.erase("content");
-    cfg.insert( std::make_pair("content", std::vector<std::string>() ) );
+    cfg.insert(std::make_pair("content", std::vector<std::string>()));
 
     // sort by timestamp
     sort(contentFiles.begin(), contentFiles.end());
@@ -952,15 +596,15 @@ void MwIniImporter::importGameFiles(multistrmap &cfg, const multistrmap &ini, co
     auto sortedFiles = dependencySort(unsortedFiles);
 
     // hard-coded dependency Morrowind - Tribunal - Bloodmoon
-    if(findString(sortedFiles, "Morrowind.esm") != sortedFiles.end())
+    if (findString(sortedFiles, "Morrowind.esm") != sortedFiles.end())
     {
-        auto tribunalIter  = findString(sortedFiles, "Tribunal.esm");
+        auto tribunalIter = findString(sortedFiles, "Tribunal.esm");
         auto bloodmoonIter = findString(sortedFiles, "Bloodmoon.esm");
 
         if (bloodmoonIter != sortedFiles.end() && tribunalIter != sortedFiles.end())
         {
             size_t bloodmoonIndex = std::distance(sortedFiles.begin(), bloodmoonIter);
-            size_t tribunalIndex  = std::distance(sortedFiles.begin(), tribunalIter);
+            size_t tribunalIndex = std::distance(sortedFiles.begin(), tribunalIter);
             if (bloodmoonIndex < tribunalIndex)
                 tribunalIndex++;
             sortedFiles.insert(bloodmoonIter, *tribunalIter);
@@ -972,18 +616,21 @@ void MwIniImporter::importGameFiles(multistrmap &cfg, const multistrmap &ini, co
         cfg["content"].push_back(file);
 }
 
-void MwIniImporter::writeToFile(std::ostream &out, const multistrmap &cfg) {
+void MwIniImporter::writeToFile(std::ostream& out, const multistrmap& cfg)
+{
 
-    for(multistrmap::const_iterator it=cfg.begin(); it != cfg.end(); ++it) {
-        for(auto entry=it->second.begin(); entry != it->second.end(); ++entry) {
+    for (multistrmap::const_iterator it = cfg.begin(); it != cfg.end(); ++it)
+    {
+        for (auto entry = it->second.begin(); entry != it->second.end(); ++entry)
+        {
             out << (it->first) << "=" << (*entry) << std::endl;
         }
     }
 }
 
-void MwIniImporter::setInputEncoding(const ToUTF8::FromType &encoding)
+void MwIniImporter::setInputEncoding(const ToUTF8::FromType& encoding)
 {
-  mEncoding = encoding;
+    mEncoding = encoding;
 }
 
 std::time_t MwIniImporter::lastWriteTime(const std::filesystem::path& filename, std::time_t defaultTime)
@@ -992,14 +639,14 @@ std::time_t MwIniImporter::lastWriteTime(const std::filesystem::path& filename,
     if (std::filesystem::exists(filename))
     {
         std::filesystem::path resolved = std::filesystem::canonical(filename);
-        writeTime = Misc::to_time_t(std::filesystem::last_write_time (resolved));
+        writeTime = Misc::to_time_t(std::filesystem::last_write_time(resolved));
 
         // print timestamp
-        const int size=1024;
+        const int size = 1024;
         char timeStrBuffer[size];
         if (std::strftime(timeStrBuffer, size, "%x %X", localtime(&writeTime)) > 0)
-            std::cout << "content file: " << resolved << " timestamp = (" << writeTime <<
-                ") " << timeStrBuffer << std::endl;
+            std::cout << "content file: " << resolved << " timestamp = (" << writeTime << ") " << timeStrBuffer
+                      << std::endl;
     }
     return writeTime;
 }
diff --git a/apps/mwiniimporter/importer.hpp b/apps/mwiniimporter/importer.hpp
index 6009b4ecb1..4c42caf5a3 100644
--- a/apps/mwiniimporter/importer.hpp
+++ b/apps/mwiniimporter/importer.hpp
@@ -1,40 +1,41 @@
 #ifndef MWINIIMPORTER_IMPORTER
 #define MWINIIMPORTER_IMPORTER 1
 
-#include <string>
-#include <map>
-#include <vector>
 #include <exception>
-#include <iosfwd>
 #include <filesystem>
+#include <iosfwd>
+#include <map>
+#include <string>
+#include <vector>
 
 #include <components/to_utf8/to_utf8.hpp>
 
-class MwIniImporter {
-  public:
+class MwIniImporter
+{
+public:
     typedef std::map<std::string, std::string> strmap;
-    typedef std::map<std::string, std::vector<std::string> > multistrmap;
-    typedef std::vector< std::pair< std::string, std::vector<std::string> > > dependencyList;
+    typedef std::map<std::string, std::vector<std::string>> multistrmap;
+    typedef std::vector<std::pair<std::string, std::vector<std::string>>> dependencyList;
 
     MwIniImporter();
-    void    setInputEncoding(const ToUTF8::FromType& encoding);
-    void    setVerbose(bool verbose);
-    multistrmap  loadIniFile(const std::filesystem::path& filename) const;
-    static multistrmap  loadCfgFile(const std::filesystem::path& filename);
-    void    merge(multistrmap &cfg, const multistrmap &ini) const;
-    void    mergeFallback(multistrmap &cfg, const multistrmap &ini) const;
-    void    importGameFiles(multistrmap &cfg, const multistrmap &ini,
-        const std::filesystem::path& iniFilename) const;
-    void    importArchives(multistrmap &cfg, const multistrmap &ini) const;
-    static void    writeToFile(std::ostream &out, const multistrmap &cfg);
+    void setInputEncoding(const ToUTF8::FromType& encoding);
+    void setVerbose(bool verbose);
+    multistrmap loadIniFile(const std::filesystem::path& filename) const;
+    static multistrmap loadCfgFile(const std::filesystem::path& filename);
+    void merge(multistrmap& cfg, const multistrmap& ini) const;
+    void mergeFallback(multistrmap& cfg, const multistrmap& ini) const;
+    void importGameFiles(multistrmap& cfg, const multistrmap& ini, const std::filesystem::path& iniFilename) const;
+    void importArchives(multistrmap& cfg, const multistrmap& ini) const;
+    static void writeToFile(std::ostream& out, const multistrmap& cfg);
 
     static std::vector<std::string> dependencySort(MwIniImporter::dependencyList source);
 
-  private:
-    static void dependencySortStep(std::string& element, MwIniImporter::dependencyList& source, std::vector<std::string>& result);
+private:
+    static void dependencySortStep(
+        std::string& element, MwIniImporter::dependencyList& source, std::vector<std::string>& result);
     static std::vector<std::string>::iterator findString(std::vector<std::string>& source, const std::string& string);
 
-    static void insertMultistrmap(multistrmap &cfg, const std::string& key, const std::string& value);
+    static void insertMultistrmap(multistrmap& cfg, const std::string& key, const std::string& value);
     static void addPaths(std::vector<std::filesystem::path>& output, std::vector<std::string> input);
 
     /// \return file's "last modified time", used in original MW to determine plug-in load order
diff --git a/apps/mwiniimporter/main.cpp b/apps/mwiniimporter/main.cpp
index d3040aca07..d17d7e747a 100644
--- a/apps/mwiniimporter/main.cpp
+++ b/apps/mwiniimporter/main.cpp
@@ -1,8 +1,8 @@
 #include "importer.hpp"
 
-#include <iostream>
 #include <filesystem>
 #include <fstream>
+#include <iostream>
 
 #include <boost/program_options.hpp>
 
@@ -13,7 +13,8 @@ namespace bpo = boost::program_options;
 namespace sfs = std::filesystem;
 
 #ifndef _WIN32
-int main(int argc, char *argv[]) {
+int main(int argc, char* argv[])
+{
 #else
 
 // Include on Windows only
@@ -22,26 +23,26 @@ int main(int argc, char *argv[]) {
 class utf8argv
 {
 public:
-
-    utf8argv(int argc, wchar_t *wargv[])
+    utf8argv(int argc, wchar_t* wargv[])
     {
         args.reserve(argc);
-        argv = new const char *[argc];
+        argv = new const char*[argc];
 
-        for (int i = 0; i < argc; ++i) {
+        for (int i = 0; i < argc; ++i)
+        {
             args.push_back(boost::locale::conv::utf_to_utf<char>(wargv[i]));
             argv[i] = args.back().c_str();
         }
     }
 
     ~utf8argv() { delete[] argv; }
-    char **get() const { return const_cast<char **>(argv); }
+    char** get() const { return const_cast<char**>(argv); }
 
 private:
     utf8argv(const utf8argv&);
     utf8argv& operator=(const utf8argv&);
 
-    const char **argv;
+    const char** argv;
     std::vector<std::string> args;
 };
 
@@ -52,9 +53,10 @@ private:
 
     For boost::filesystem::path::imbue see components/files/windowspath.cpp
 */
-int wmain(int argc, wchar_t *wargv[]) {
+int wmain(int argc, wchar_t* wargv[])
+{
     utf8argv converter(argc, wargv);
-    char **argv = converter.get();
+    char** argv = converter.get();
 #endif
 
     try
@@ -70,43 +72,54 @@ int wmain(int argc, wchar_t *wargv[]) {
         addOption("game-files,g", "import esm and esp files");
         addOption("fonts,f", "import bitmap fonts");
         addOption("no-archives,A", "disable bsa archives import");
-        addOption("encoding,e", bpo::value<std::string>()-> default_value("win1252"),
-                "Character encoding used in OpenMW game messages:\n"
-                "\n\twin1250 - Central and Eastern European such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, Croatian, Serbian (Latin script), Romanian and Albanian languages\n"
-                "\n\twin1251 - Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic and other languages\n"
-                "\n\twin1252 - Western European (Latin) alphabet, used by default");
-            ;
+        addOption("encoding,e", bpo::value<std::string>()->default_value("win1252"),
+            "Character encoding used in OpenMW game messages:\n"
+            "\n\twin1250 - Central and Eastern European such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, "
+            "Croatian, Serbian (Latin script), Romanian and Albanian languages\n"
+            "\n\twin1251 - Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic and other languages\n"
+            "\n\twin1252 - Western European (Latin) alphabet, used by default");
+        ;
         p_desc.add("ini", 1).add("cfg", 1);
 
         bpo::variables_map vm;
 
-        bpo::parsed_options parsed = bpo::command_line_parser(argc, argv)
-            .options(desc)
-            .positional(p_desc)
-            .run();
+        bpo::parsed_options parsed = bpo::command_line_parser(argc, argv).options(desc).positional(p_desc).run();
         bpo::store(parsed, vm);
 
-        if(vm.count("help") || !vm.count("ini") || !vm.count("cfg")) {
+        if (vm.count("help") || !vm.count("ini") || !vm.count("cfg"))
+        {
             std::cout << desc;
             return 0;
         }
 
         bpo::notify(vm);
 
-        std::filesystem::path iniFile(vm["ini"].as<Files::MaybeQuotedPath>().u8string()); // This call to u8string is redundant, but required to build on MSVC 14.26 due to implementation bugs.
-        std::filesystem::path cfgFile(vm["cfg"].as<Files::MaybeQuotedPath>().u8string()); // This call to u8string is redundant, but required to build on MSVC 14.26 due to implementation bugs.
+        std::filesystem::path iniFile(
+            vm["ini"].as<Files::MaybeQuotedPath>().u8string()); // This call to u8string is redundant, but required to
+                                                                // build on MSVC 14.26 due to implementation bugs.
+        std::filesystem::path cfgFile(
+            vm["cfg"].as<Files::MaybeQuotedPath>().u8string()); // This call to u8string is redundant, but required to
+                                                                // build on MSVC 14.26 due to implementation bugs.
 
         // if no output is given, write back to cfg file
-        std::filesystem::path outputFile = vm["output"].as<Files::MaybeQuotedPath>().u8string(); // This call to u8string is redundant, but required to build on MSVC 14.26 due to implementation bugs.
-        if(vm["output"].defaulted()) {
-            outputFile = vm["cfg"].as<Files::MaybeQuotedPath>().u8string(); // This call to u8string is redundant, but required to build on MSVC 14.26 due to implementation bugs.
+        std::filesystem::path outputFile = vm["output"]
+                                               .as<Files::MaybeQuotedPath>()
+                                               .u8string(); // This call to u8string is redundant, but required to build
+                                                            // on MSVC 14.26 due to implementation bugs.
+        if (vm["output"].defaulted())
+        {
+            outputFile = vm["cfg"]
+                             .as<Files::MaybeQuotedPath>()
+                             .u8string(); // This call to u8string is redundant, but required to build on MSVC 14.26 due
+                                          // to implementation bugs.
         }
 
-        if(!std::filesystem::exists(iniFile)) {
+        if (!std::filesystem::exists(iniFile))
+        {
             std::cerr << "ini file does not exist" << std::endl;
             return -3;
         }
-        if(!std::filesystem::exists(cfgFile))
+        if (!std::filesystem::exists(cfgFile))
             std::cerr << "cfg file does not exist" << std::endl;
 
         MwIniImporter importer;
@@ -129,11 +142,13 @@ int wmain(int argc, wchar_t *wargv[]) {
         importer.merge(cfg, ini);
         importer.mergeFallback(cfg, ini);
 
-        if(vm.count("game-files")) {
+        if (vm.count("game-files"))
+        {
             importer.importGameFiles(cfg, ini, iniFile);
         }
 
-        if(!vm.count("no-archives")) {
+        if (!vm.count("no-archives"))
+        {
             importer.importArchives(cfg, ini);
         }
 
diff --git a/apps/navmeshtool/main.cpp b/apps/navmeshtool/main.cpp
index d67db05529..cf7a3d6a4a 100644
--- a/apps/navmeshtool/main.cpp
+++ b/apps/navmeshtool/main.cpp
@@ -1,17 +1,21 @@
-#include "worldspacedata.hpp"
 #include "navmesh.hpp"
+#include "worldspacedata.hpp"
 
 #include <components/debug/debugging.hpp>
+#include <components/detournavigator/agentbounds.hpp>
 #include <components/detournavigator/navmeshdb.hpp>
 #include <components/detournavigator/recastglobalallocator.hpp>
 #include <components/detournavigator/settings.hpp>
 #include <components/esm3/esmreader.hpp>
+#include <components/esm3/readerscache.hpp>
 #include <components/esm3/variant.hpp>
 #include <components/esmloader/esmdata.hpp>
 #include <components/esmloader/load.hpp>
 #include <components/fallback/fallback.hpp>
 #include <components/fallback/validate.hpp>
 #include <components/files/configurationmanager.hpp>
+#include <components/files/conversion.hpp>
+#include <components/platform/platform.hpp>
 #include <components/resource/bulletshapemanager.hpp>
 #include <components/resource/imagemanager.hpp>
 #include <components/resource/niffilemanager.hpp>
@@ -21,10 +25,6 @@
 #include <components/version/version.hpp>
 #include <components/vfs/manager.hpp>
 #include <components/vfs/registerarchives.hpp>
-#include <components/esm3/readerscache.hpp>
-#include <components/platform/platform.hpp>
-#include <components/detournavigator/agentbounds.hpp>
-#include <components/files/conversion.hpp>
 
 #include <osg/Vec3f>
 
@@ -40,7 +40,6 @@
 #include <io.h>
 #endif
 
-
 namespace NavMeshTool
 {
     namespace
@@ -59,59 +58,76 @@ namespace NavMeshTool
 
             addOption("version", "print version information and quit");
 
-            addOption("data", bpo::value<Files::MaybeQuotedPathContainer>()->default_value(Files::MaybeQuotedPathContainer(), "data")
-                    ->multitoken()->composing(), "set data directories (later directories have higher priority)");
-
-            addOption("data-local", bpo::value<Files::MaybeQuotedPathContainer::value_type>()->default_value(Files::MaybeQuotedPathContainer::value_type(), ""),
-                    "set local data directory (highest priority)");
-
-            addOption("fallback-archive", bpo::value<StringsVector>()->default_value(StringsVector(), "fallback-archive")
-                    ->multitoken()->composing(), "set fallback BSA archives (later archives have higher priority)");
-
-            addOption("resources", bpo::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), "resources"),
-                    "set resources directory");
-
-            addOption("content", bpo::value<StringsVector>()->default_value(StringsVector(), "")
-                    ->multitoken()->composing(), "content file(s): esm/esp, or omwgame/omwaddon/omwscripts");
-
-            addOption("fs-strict", bpo::value<bool>()->implicit_value(true)
-                    ->default_value(false), "strict file system handling (no case folding)");
-
-            addOption("encoding", bpo::value<std::string>()->
-                    default_value("win1252"),
-                    "Character encoding used in OpenMW game messages:\n"
-                    "\n\twin1250 - Central and Eastern European such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, Croatian, Serbian (Latin script), Romanian and Albanian languages\n"
-                    "\n\twin1251 - Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic and other languages\n"
-                    "\n\twin1252 - Western European (Latin) alphabet, used by default");
-
-            addOption("fallback", bpo::value<Fallback::FallbackMap>()->default_value(Fallback::FallbackMap(), "")
-                    ->multitoken()->composing(), "fallback values");
-
-            addOption("threads", bpo::value<std::size_t>()->default_value(std::max<std::size_t>(std::thread::hardware_concurrency() - 1, 1)),
-                    "number of threads for parallel processing");
-
-            addOption("process-interior-cells", bpo::value<bool>()->implicit_value(true)
-                    ->default_value(false), "build navmesh for interior cells");
-
-            addOption("remove-unused-tiles", bpo::value<bool>()->implicit_value(true)
-                    ->default_value(false), "remove tiles from cache that will not be used with current content profile");
-
-            addOption("write-binary-log", bpo::value<bool>()->implicit_value(true)
-                    ->default_value(false), "write progress in binary messages to be consumed by the launcher");
+            addOption("data",
+                bpo::value<Files::MaybeQuotedPathContainer>()
+                    ->default_value(Files::MaybeQuotedPathContainer(), "data")
+                    ->multitoken()
+                    ->composing(),
+                "set data directories (later directories have higher priority)");
+
+            addOption("data-local",
+                bpo::value<Files::MaybeQuotedPathContainer::value_type>()->default_value(
+                    Files::MaybeQuotedPathContainer::value_type(), ""),
+                "set local data directory (highest priority)");
+
+            addOption("fallback-archive",
+                bpo::value<StringsVector>()
+                    ->default_value(StringsVector(), "fallback-archive")
+                    ->multitoken()
+                    ->composing(),
+                "set fallback BSA archives (later archives have higher priority)");
+
+            addOption("resources",
+                bpo::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), "resources"),
+                "set resources directory");
+
+            addOption("content",
+                bpo::value<StringsVector>()->default_value(StringsVector(), "")->multitoken()->composing(),
+                "content file(s): esm/esp, or omwgame/omwaddon/omwscripts");
+
+            addOption("fs-strict", bpo::value<bool>()->implicit_value(true)->default_value(false),
+                "strict file system handling (no case folding)");
+
+            addOption("encoding", bpo::value<std::string>()->default_value("win1252"),
+                "Character encoding used in OpenMW game messages:\n"
+                "\n\twin1250 - Central and Eastern European such as Polish, Czech, Slovak, Hungarian, Slovene, "
+                "Bosnian, Croatian, Serbian (Latin script), Romanian and Albanian languages\n"
+                "\n\twin1251 - Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic and other languages\n"
+                "\n\twin1252 - Western European (Latin) alphabet, used by default");
+
+            addOption("fallback",
+                bpo::value<Fallback::FallbackMap>()
+                    ->default_value(Fallback::FallbackMap(), "")
+                    ->multitoken()
+                    ->composing(),
+                "fallback values");
+
+            addOption("threads",
+                bpo::value<std::size_t>()->default_value(
+                    std::max<std::size_t>(std::thread::hardware_concurrency() - 1, 1)),
+                "number of threads for parallel processing");
+
+            addOption("process-interior-cells", bpo::value<bool>()->implicit_value(true)->default_value(false),
+                "build navmesh for interior cells");
+
+            addOption("remove-unused-tiles", bpo::value<bool>()->implicit_value(true)->default_value(false),
+                "remove tiles from cache that will not be used with current content profile");
+
+            addOption("write-binary-log", bpo::value<bool>()->implicit_value(true)->default_value(false),
+                "write progress in binary messages to be consumed by the launcher");
 
             Files::ConfigurationManager::addCommonOptions(result);
 
             return result;
         }
 
-        int runNavMeshTool(int argc, char *argv[])
+        int runNavMeshTool(int argc, char* argv[])
         {
             Platform::init();
 
             bpo::options_description desc = makeOptionsDescription();
 
-            bpo::parsed_options options = bpo::command_line_parser(argc, argv)
-                .options(desc).allow_unregistered().run();
+            bpo::parsed_options options = bpo::command_line_parser(argc, argv).options(desc).allow_unregistered().run();
             bpo::variables_map variables;
 
             bpo::store(options, variables);
@@ -175,10 +191,13 @@ namespace NavMeshTool
             Settings::Manager settings;
             settings.load(config);
 
-            const auto agentCollisionShape = DetourNavigator::toCollisionShapeType(Settings::Manager::getInt("actor collision shape type", "Game"));
-            const osg::Vec3f agentHalfExtents = Settings::Manager::getVector3("default actor pathfind half extents", "Game");
-            const DetourNavigator::AgentBounds agentBounds {agentCollisionShape, agentHalfExtents};
-            const std::uint64_t maxDbFileSize = static_cast<std::uint64_t>(Settings::Manager::getInt64("max navmeshdb file size", "Navigator"));
+            const auto agentCollisionShape = DetourNavigator::toCollisionShapeType(
+                Settings::Manager::getInt("actor collision shape type", "Game"));
+            const osg::Vec3f agentHalfExtents
+                = Settings::Manager::getVector3("default actor pathfind half extents", "Game");
+            const DetourNavigator::AgentBounds agentBounds{ agentCollisionShape, agentHalfExtents };
+            const std::uint64_t maxDbFileSize
+                = static_cast<std::uint64_t>(Settings::Manager::getInt64("max navmeshdb file size", "Navigator"));
             const auto dbPath = Files::pathToUnicodeString(config.getUserDataPath() / "navmesh.db");
 
             DetourNavigator::NavMeshDb db(dbPath, maxDbFileSize);
@@ -192,7 +211,8 @@ namespace NavMeshTool
             query.mLoadGameSettings = true;
             query.mLoadLands = true;
             query.mLoadStatics = true;
-            const EsmLoader::EsmData esmData = EsmLoader::loadEsmData(query, contentFiles, fileCollections, readers, &encoder);
+            const EsmLoader::EsmData esmData
+                = EsmLoader::loadEsmData(query, contentFiles, fileCollections, readers, &encoder);
 
             Resource::ImageManager imageManager(&vfs);
             Resource::NifFileManager nifFileManager(&vfs);
@@ -200,10 +220,11 @@ namespace NavMeshTool
             Resource::BulletShapeManager bulletShapeManager(&vfs, &sceneManager, &nifFileManager);
             DetourNavigator::RecastGlobalAllocator::init();
             DetourNavigator::Settings navigatorSettings = DetourNavigator::makeSettingsFromSettingsManager();
-            navigatorSettings.mRecast.mSwimHeightScale = EsmLoader::getGameSetting(esmData.mGameSettings, "fSwimHeightScale").getFloat();
+            navigatorSettings.mRecast.mSwimHeightScale
+                = EsmLoader::getGameSetting(esmData.mGameSettings, "fSwimHeightScale").getFloat();
 
-            WorldspaceData cellsData = gatherWorldspaceData(navigatorSettings, readers, vfs, bulletShapeManager,
-                                                            esmData, processInteriorCells, writeBinaryLog);
+            WorldspaceData cellsData = gatherWorldspaceData(
+                navigatorSettings, readers, vfs, bulletShapeManager, esmData, processInteriorCells, writeBinaryLog);
 
             const Status status = generateAllNavMeshTiles(agentBounds, navigatorSettings, threadsNumber,
                 removeUnusedTiles, writeBinaryLog, cellsData, std::move(db));
@@ -217,10 +238,12 @@ namespace NavMeshTool
                     Log(Debug::Warning) << "Cancelled";
                     break;
                 case Status::NotEnoughSpace:
-                    Log(Debug::Warning) << "Navmesh generation is cancelled due to running out of disk space or limits "
+                    Log(Debug::Warning)
+                        << "Navmesh generation is cancelled due to running out of disk space or limits "
                         << "for navmesh db. Check disk space at the db location \"" << dbPath
                         << "\". If there is enough space, adjust \"max navmeshdb file size\" setting (see "
-                        << "https://openmw.readthedocs.io/en/latest/reference/modding/settings/navigator.html?highlight=navmesh#max-navmeshdb-file-size).";
+                        << "https://openmw.readthedocs.io/en/latest/reference/modding/settings/"
+                           "navigator.html?highlight=navmesh#max-navmeshdb-file-size).";
                     break;
             }
 
@@ -229,7 +252,7 @@ namespace NavMeshTool
     }
 }
 
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 {
     return wrapApplication(NavMeshTool::runNavMeshTool, argc, argv, "NavMeshTool");
 }
diff --git a/apps/navmeshtool/navmesh.cpp b/apps/navmeshtool/navmesh.cpp
index 5a14ff3175..384c965466 100644
--- a/apps/navmeshtool/navmesh.cpp
+++ b/apps/navmeshtool/navmesh.cpp
@@ -2,6 +2,7 @@
 
 #include "worldspacedata.hpp"
 
+#include <components/debug/debugging.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/detournavigator/generatenavmeshtile.hpp>
 #include <components/detournavigator/gettilespositions.hpp>
@@ -14,20 +15,19 @@
 #include <components/detournavigator/settings.hpp>
 #include <components/detournavigator/tileposition.hpp>
 #include <components/misc/progressreporter.hpp>
+#include <components/navmeshtool/protocol.hpp>
 #include <components/sceneutil/workqueue.hpp>
 #include <components/sqlite3/transaction.hpp>
-#include <components/debug/debugging.hpp>
-#include <components/navmeshtool/protocol.hpp>
 
 #include <osg/Vec3f>
 
 #include <atomic>
 #include <chrono>
 #include <cstddef>
-#include <utility>
-#include <vector>
 #include <random>
 #include <string_view>
+#include <utility>
+#include <vector>
 
 namespace NavMeshTool
 {
@@ -35,50 +35,48 @@ namespace NavMeshTool
     {
         using DetourNavigator::AgentBounds;
         using DetourNavigator::GenerateNavMeshTile;
+        using DetourNavigator::MeshSource;
         using DetourNavigator::NavMeshDb;
         using DetourNavigator::NavMeshTileInfo;
         using DetourNavigator::PreparedNavMeshData;
         using DetourNavigator::RecastMeshProvider;
-        using DetourNavigator::MeshSource;
         using DetourNavigator::Settings;
         using DetourNavigator::ShapeId;
         using DetourNavigator::TileId;
         using DetourNavigator::TilePosition;
-        using DetourNavigator::TileVersion;
         using DetourNavigator::TilesPositionsRange;
+        using DetourNavigator::TileVersion;
         using Sqlite3::Transaction;
 
         void logGeneratedTiles(std::size_t provided, std::size_t expected)
         {
             Log(Debug::Info) << provided << "/" << expected << " ("
-                << (static_cast<double>(provided) / static_cast<double>(expected) * 100)
-                << "%) navmesh tiles are generated";
+                             << (static_cast<double>(provided) / static_cast<double>(expected) * 100)
+                             << "%) navmesh tiles are generated";
         }
 
         template <class T>
         void serializeToStderr(const T& value)
         {
             const std::vector<std::byte> data = serialize(value);
-            getLockedRawStderr()->write(reinterpret_cast<const char*>(data.data()), static_cast<std::streamsize>(data.size()));
+            getLockedRawStderr()->write(
+                reinterpret_cast<const char*>(data.data()), static_cast<std::streamsize>(data.size()));
         }
 
         void logGeneratedTilesMessage(std::size_t number)
         {
-            serializeToStderr(GeneratedTiles {static_cast<std::uint64_t>(number)});
+            serializeToStderr(GeneratedTiles{ static_cast<std::uint64_t>(number) });
         }
 
         struct LogGeneratedTiles
         {
-            void operator()(std::size_t provided, std::size_t expected) const
-            {
-                logGeneratedTiles(provided, expected);
-            }
+            void operator()(std::size_t provided, std::size_t expected) const { logGeneratedTiles(provided, expected); }
         };
 
         class NavMeshTileConsumer final : public DetourNavigator::NavMeshTileConsumer
         {
         public:
-            std::atomic_size_t mExpected {0};
+            std::atomic_size_t mExpected{ 0 };
 
             explicit NavMeshTileConsumer(NavMeshDb&& db, bool removeUnusedTiles, bool writeBinaryLog)
                 : mDb(std::move(db))
@@ -87,7 +85,8 @@ namespace NavMeshTool
                 , mTransaction(mDb.startTransaction(Sqlite3::TransactionMode::Immediate))
                 , mNextTileId(mDb.getMaxTileId() + 1)
                 , mNextShapeId(mDb.getMaxShapeId() + 1)
-            {}
+            {
+            }
 
             std::size_t getProvided() const { return mProvided.load(); }
 
@@ -107,8 +106,8 @@ namespace NavMeshTool
                 return DetourNavigator::resolveMeshSource(mDb, source, mNextShapeId);
             }
 
-            std::optional<NavMeshTileInfo> find(std::string_view worldspace, const TilePosition &tilePosition,
-                const std::vector<std::byte> &input) override
+            std::optional<NavMeshTileInfo> find(std::string_view worldspace, const TilePosition& tilePosition,
+                const std::vector<std::byte>& input) override
             {
                 std::optional<NavMeshTileInfo> result;
                 std::lock_guard lock(mMutex);
@@ -137,35 +136,38 @@ namespace NavMeshTool
                 if (mRemoveUnusedTiles)
                 {
                     std::lock_guard lock(mMutex);
-                    mDeleted += static_cast<std::size_t>(mDb.deleteTilesAtExcept(worldspace, tilePosition, TileId {tileId}));
+                    mDeleted += static_cast<std::size_t>(
+                        mDb.deleteTilesAtExcept(worldspace, tilePosition, TileId{ tileId }));
                 }
                 report();
             }
 
-            void insert(std::string_view worldspace, const TilePosition& tilePosition,
-                std::int64_t version, const std::vector<std::byte>& input, PreparedNavMeshData& data) override
+            void insert(std::string_view worldspace, const TilePosition& tilePosition, std::int64_t version,
+                const std::vector<std::byte>& input, PreparedNavMeshData& data) override
             {
                 {
                     std::lock_guard lock(mMutex);
                     if (mRemoveUnusedTiles)
                         mDeleted += static_cast<std::size_t>(mDb.deleteTilesAt(worldspace, tilePosition));
                     data.mUserId = static_cast<unsigned>(mNextTileId);
-                    mDb.insertTile(mNextTileId, worldspace, tilePosition, TileVersion {version}, input, serialize(data));
+                    mDb.insertTile(
+                        mNextTileId, worldspace, tilePosition, TileVersion{ version }, input, serialize(data));
                     ++mNextTileId;
                 }
                 ++mInserted;
                 report();
             }
 
-            void update(std::string_view worldspace, const TilePosition& tilePosition,
-                std::int64_t tileId, std::int64_t version, PreparedNavMeshData& data) override
+            void update(std::string_view worldspace, const TilePosition& tilePosition, std::int64_t tileId,
+                std::int64_t version, PreparedNavMeshData& data) override
             {
                 data.mUserId = static_cast<unsigned>(tileId);
                 {
                     std::lock_guard lock(mMutex);
                     if (mRemoveUnusedTiles)
-                        mDeleted += static_cast<std::size_t>(mDb.deleteTilesAtExcept(worldspace, tilePosition, TileId {tileId}));
-                    mDb.updateTile(TileId {tileId}, TileVersion {version}, serialize(data));
+                        mDeleted += static_cast<std::size_t>(
+                            mDb.deleteTilesAtExcept(worldspace, tilePosition, TileId{ tileId }));
+                    mDb.updateTile(TileId{ tileId }, TileVersion{ version }, serialize(data));
                 }
                 ++mUpdated;
                 report();
@@ -225,9 +227,9 @@ namespace NavMeshTool
             }
 
         private:
-            std::atomic_size_t mProvided {0};
-            std::atomic_size_t mInserted {0};
-            std::atomic_size_t mUpdated {0};
+            std::atomic_size_t mProvided{ 0 };
+            std::atomic_size_t mInserted{ 0 };
+            std::atomic_size_t mUpdated{ 0 };
             std::size_t mDeleted = 0;
             Status mStatus = Status::Ok;
             mutable std::mutex mMutex;
@@ -252,51 +254,43 @@ namespace NavMeshTool
         };
     }
 
-    Status generateAllNavMeshTiles(const AgentBounds& agentBounds, const Settings& settings,
-        std::size_t threadsNumber, bool removeUnusedTiles, bool writeBinaryLog, WorldspaceData& data,
-        NavMeshDb&& db)
+    Status generateAllNavMeshTiles(const AgentBounds& agentBounds, const Settings& settings, std::size_t threadsNumber,
+        bool removeUnusedTiles, bool writeBinaryLog, WorldspaceData& data, NavMeshDb&& db)
     {
         Log(Debug::Info) << "Generating navmesh tiles by " << threadsNumber << " parallel workers...";
 
         SceneUtil::WorkQueue workQueue(threadsNumber);
-        auto navMeshTileConsumer = std::make_shared<NavMeshTileConsumer>(std::move(db), removeUnusedTiles, writeBinaryLog);
+        auto navMeshTileConsumer
+            = std::make_shared<NavMeshTileConsumer>(std::move(db), removeUnusedTiles, writeBinaryLog);
         std::size_t tiles = 0;
         std::mt19937_64 random;
 
         for (const std::unique_ptr<WorldspaceNavMeshInput>& input : data.mNavMeshInputs)
         {
-            const auto range = DetourNavigator::makeTilesPositionsRange(
-                Misc::Convert::toOsgXY(input->mAabb.m_min),
-                Misc::Convert::toOsgXY(input->mAabb.m_max),
-                settings.mRecast
-            );
+            const auto range = DetourNavigator::makeTilesPositionsRange(Misc::Convert::toOsgXY(input->mAabb.m_min),
+                Misc::Convert::toOsgXY(input->mAabb.m_max), settings.mRecast);
 
             if (removeUnusedTiles)
                 navMeshTileConsumer->removeTilesOutsideRange(input->mWorldspace, range);
 
             std::vector<TilePosition> worldspaceTiles;
 
-            DetourNavigator::getTilesPositions(range,
-                [&] (const TilePosition& tilePosition) { worldspaceTiles.push_back(tilePosition); });
+            DetourNavigator::getTilesPositions(
+                range, [&](const TilePosition& tilePosition) { worldspaceTiles.push_back(tilePosition); });
 
             tiles += worldspaceTiles.size();
 
             if (writeBinaryLog)
-                serializeToStderr(ExpectedTiles {static_cast<std::uint64_t>(tiles)});
+                serializeToStderr(ExpectedTiles{ static_cast<std::uint64_t>(tiles) });
 
             navMeshTileConsumer->mExpected = tiles;
 
             std::shuffle(worldspaceTiles.begin(), worldspaceTiles.end(), random);
 
             for (const TilePosition& tilePosition : worldspaceTiles)
-                workQueue.addWorkItem(new GenerateNavMeshTile(
-                    input->mWorldspace,
-                    tilePosition,
-                    RecastMeshProvider(input->mTileCachedRecastMeshManager),
-                    agentBounds,
-                    settings,
-                    navMeshTileConsumer
-                ));
+                workQueue.addWorkItem(new GenerateNavMeshTile(input->mWorldspace, tilePosition,
+                    RecastMeshProvider(input->mTileCachedRecastMeshManager), agentBounds, settings,
+                    navMeshTileConsumer));
         }
 
         const Status status = navMeshTileConsumer->wait();
@@ -307,10 +301,8 @@ namespace NavMeshTool
         const auto updated = navMeshTileConsumer->getUpdated();
         const auto deleted = navMeshTileConsumer->getDeleted();
 
-        Log(Debug::Info) << "Generated navmesh for " << navMeshTileConsumer->getProvided() << " tiles, "
-            << inserted << " are inserted, "
-            << updated << " updated and "
-            << deleted << " deleted";
+        Log(Debug::Info) << "Generated navmesh for " << navMeshTileConsumer->getProvided() << " tiles, " << inserted
+                         << " are inserted, " << updated << " updated and " << deleted << " deleted";
 
         if (inserted + updated + deleted > 0)
         {
diff --git a/apps/navmeshtool/navmesh.hpp b/apps/navmeshtool/navmesh.hpp
index f0199ea1c4..817531a207 100644
--- a/apps/navmeshtool/navmesh.hpp
+++ b/apps/navmeshtool/navmesh.hpp
@@ -23,9 +23,9 @@ namespace NavMeshTool
         NotEnoughSpace,
     };
 
-    Status generateAllNavMeshTiles(const DetourNavigator::AgentBounds& agentBounds, const DetourNavigator::Settings& settings,
-        std::size_t threadsNumber, bool removeUnusedTiles, bool writeBinaryLog, WorldspaceData& cellsData,
-        DetourNavigator::NavMeshDb&& db);
+    Status generateAllNavMeshTiles(const DetourNavigator::AgentBounds& agentBounds,
+        const DetourNavigator::Settings& settings, std::size_t threadsNumber, bool removeUnusedTiles,
+        bool writeBinaryLog, WorldspaceData& cellsData, DetourNavigator::NavMeshDb&& db);
 }
 
 #endif
diff --git a/apps/navmeshtool/worldspacedata.cpp b/apps/navmeshtool/worldspacedata.cpp
index e43cfec96c..f66b54dd9b 100644
--- a/apps/navmeshtool/worldspacedata.cpp
+++ b/apps/navmeshtool/worldspacedata.cpp
@@ -1,27 +1,27 @@
 #include "worldspacedata.hpp"
 
 #include <components/bullethelpers/aabb.hpp>
+#include <components/debug/debugging.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/detournavigator/gettilespositions.hpp>
 #include <components/detournavigator/objectid.hpp>
 #include <components/detournavigator/recastmesh.hpp>
-#include <components/detournavigator/tilecachedrecastmeshmanager.hpp>
 #include <components/detournavigator/settings.hpp>
+#include <components/detournavigator/tilecachedrecastmeshmanager.hpp>
 #include <components/esm3/cellref.hpp>
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/loadcell.hpp>
 #include <components/esm3/loadland.hpp>
+#include <components/esm3/readerscache.hpp>
 #include <components/esmloader/esmdata.hpp>
 #include <components/esmloader/lessbyid.hpp>
 #include <components/esmloader/record.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/strings/lower.hpp>
+#include <components/navmeshtool/protocol.hpp>
 #include <components/resource/bulletshapemanager.hpp>
 #include <components/settings/settings.hpp>
 #include <components/vfs/manager.hpp>
-#include <components/debug/debugging.hpp>
-#include <components/navmeshtool/protocol.hpp>
-#include <components/esm3/readerscache.hpp>
 
 #include <LinearMath/btVector3.h>
 
@@ -56,21 +56,28 @@ namespace NavMeshTool
             float mScale;
             ESM::Position mPos;
 
-            CellRef(ESM::RecNameInts type, ESM::RefNum refNum, std::string&& refId, float scale, const ESM::Position& pos)
-                : mType(type), mRefNum(refNum), mRefId(std::move(refId)), mScale(scale), mPos(pos) {}
+            CellRef(
+                ESM::RecNameInts type, ESM::RefNum refNum, std::string&& refId, float scale, const ESM::Position& pos)
+                : mType(type)
+                , mRefNum(refNum)
+                , mRefId(std::move(refId))
+                , mScale(scale)
+                , mPos(pos)
+            {
+            }
         };
 
         ESM::RecNameInts getType(const EsmLoader::EsmData& esmData, std::string_view refId)
         {
-            const auto it = std::lower_bound(esmData.mRefIdTypes.begin(), esmData.mRefIdTypes.end(),
-                                             refId, EsmLoader::LessById {});
+            const auto it = std::lower_bound(
+                esmData.mRefIdTypes.begin(), esmData.mRefIdTypes.end(), refId, EsmLoader::LessById{});
             if (it == esmData.mRefIdTypes.end() || it->mId != refId)
                 return {};
             return it->mType;
         }
 
-        std::vector<CellRef> loadCellRefs(const ESM::Cell& cell, const EsmLoader::EsmData& esmData,
-            ESM::ReadersCache& readers)
+        std::vector<CellRef> loadCellRefs(
+            const ESM::Cell& cell, const EsmLoader::EsmData& esmData, ESM::ReadersCache& readers)
         {
             std::vector<EsmLoader::Record<CellRef>> cellRefs;
 
@@ -84,16 +91,17 @@ namespace NavMeshTool
                 {
                     Misc::StringUtils::lowerCaseInPlace(cellRef.mRefID);
                     const ESM::RecNameInts type = getType(esmData, cellRef.mRefID);
-                    if (type == ESM::RecNameInts {})
+                    if (type == ESM::RecNameInts{})
                         continue;
-                    cellRefs.emplace_back(deleted, type, cellRef.mRefNum, std::move(cellRef.mRefID),
-                                        cellRef.mScale, cellRef.mPos);
+                    cellRefs.emplace_back(
+                        deleted, type, cellRef.mRefNum, std::move(cellRef.mRefID), cellRef.mScale, cellRef.mPos);
                 }
             }
 
             Log(Debug::Debug) << "Loaded " << cellRefs.size() << " cell refs";
 
-            const auto getKey = [] (const EsmLoader::Record<CellRef>& v) -> const ESM::RefNum& { return v.mValue.mRefNum; };
+            const auto getKey
+                = [](const EsmLoader::Record<CellRef>& v) -> const ESM::RefNum& { return v.mValue.mRefNum; };
             std::vector<CellRef> result = prepareRecords(cellRefs, getKey);
 
             Log(Debug::Debug) << "Prepared " << result.size() << " unique cell refs";
@@ -103,8 +111,7 @@ namespace NavMeshTool
 
         template <class F>
         void forEachObject(const ESM::Cell& cell, const EsmLoader::EsmData& esmData, const VFS::Manager& vfs,
-            Resource::BulletShapeManager& bulletShapeManager, ESM::ReadersCache& readers,
-            F&& f)
+            Resource::BulletShapeManager& bulletShapeManager, ESM::ReadersCache& readers, F&& f)
         {
             std::vector<CellRef> cellRefs = loadCellRefs(cell, esmData, readers);
 
@@ -119,23 +126,24 @@ namespace NavMeshTool
                 if (cellRef.mType != ESM::REC_STAT)
                     model = Misc::ResourceHelpers::correctActorModelPath(model, &vfs);
 
-                osg::ref_ptr<const Resource::BulletShape> shape = [&]
-                {
+                osg::ref_ptr<const Resource::BulletShape> shape = [&] {
                     try
                     {
                         return bulletShapeManager.getShape(Misc::ResourceHelpers::correctMeshPath(model, &vfs));
                     }
                     catch (const std::exception& e)
                     {
-                        Log(Debug::Warning) << "Failed to load cell ref \"" << cellRef.mRefId << "\" model \"" << model << "\": " << e.what();
+                        Log(Debug::Warning) << "Failed to load cell ref \"" << cellRef.mRefId << "\" model \"" << model
+                                            << "\": " << e.what();
                         return osg::ref_ptr<const Resource::BulletShape>();
                     }
-                } ();
+                }();
 
                 if (shape == nullptr || shape->mCollisionShape == nullptr)
                     continue;
 
-                osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance(new Resource::BulletShapeInstance(std::move(shape)));
+                osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance(
+                    new Resource::BulletShapeInstance(std::move(shape)));
 
                 switch (cellRef.mType)
                 {
@@ -158,35 +166,20 @@ namespace NavMeshTool
 
         struct LessByXY
         {
-            bool operator ()(const ESM::Land& lhs, const ESM::Land& rhs) const
-            {
-                return GetXY {}(lhs) < GetXY {}(rhs);
-            }
+            bool operator()(const ESM::Land& lhs, const ESM::Land& rhs) const { return GetXY{}(lhs) < GetXY{}(rhs); }
 
-            bool operator ()(const ESM::Land& lhs, const osg::Vec2i& rhs) const
-            {
-                return GetXY {}(lhs) < rhs;
-            }
+            bool operator()(const ESM::Land& lhs, const osg::Vec2i& rhs) const { return GetXY{}(lhs) < rhs; }
 
-            bool operator ()(const osg::Vec2i& lhs, const ESM::Land& rhs) const
-            {
-                return lhs < GetXY {}(rhs);
-            }
+            bool operator()(const osg::Vec2i& lhs, const ESM::Land& rhs) const { return lhs < GetXY{}(rhs); }
         };
 
         btAABB getAabb(const osg::Vec2i& cellPosition, btScalar minHeight, btScalar maxHeight)
         {
             btAABB aabb;
-            aabb.m_min = btVector3(
-                static_cast<btScalar>(cellPosition.x() * ESM::Land::REAL_SIZE),
-                static_cast<btScalar>(cellPosition.y() * ESM::Land::REAL_SIZE),
-                minHeight
-            );
-            aabb.m_max = btVector3(
-                static_cast<btScalar>((cellPosition.x() + 1) * ESM::Land::REAL_SIZE),
-                static_cast<btScalar>((cellPosition.y() + 1) * ESM::Land::REAL_SIZE),
-                maxHeight
-            );
+            aabb.m_min = btVector3(static_cast<btScalar>(cellPosition.x() * ESM::Land::REAL_SIZE),
+                static_cast<btScalar>(cellPosition.y() * ESM::Land::REAL_SIZE), minHeight);
+            aabb.m_max = btVector3(static_cast<btScalar>((cellPosition.x() + 1) * ESM::Land::REAL_SIZE),
+                static_cast<btScalar>((cellPosition.y() + 1) * ESM::Land::REAL_SIZE), maxHeight);
             return aabb;
         }
 
@@ -205,8 +198,9 @@ namespace NavMeshTool
             std::vector<std::unique_ptr<ESM::Land::LandData>>& landDatas)
         {
             if (!land.has_value() || osg::Vec2i(land->mX, land->mY) != cellPosition
-                    || (land->mDataTypes & ESM::Land::DATA_VHGT) == 0)
-                return {HeightfieldPlane {ESM::Land::DEFAULT_HEIGHT}, ESM::Land::DEFAULT_HEIGHT, ESM::Land::DEFAULT_HEIGHT};
+                || (land->mDataTypes & ESM::Land::DATA_VHGT) == 0)
+                return { HeightfieldPlane{ ESM::Land::DEFAULT_HEIGHT }, ESM::Land::DEFAULT_HEIGHT,
+                    ESM::Land::DEFAULT_HEIGHT };
 
             ESM::Land::LandData& landData = *landDatas.emplace_back(std::make_unique<ESM::Land::LandData>());
             land->loadData(ESM::Land::DATA_VHGT, &landData);
@@ -216,7 +210,7 @@ namespace NavMeshTool
             surface.mMinHeight = landData.mMinHeight;
             surface.mMaxHeight = landData.mMaxHeight;
             surface.mSize = static_cast<std::size_t>(ESM::Land::LAND_SIZE);
-            return {surface, landData.mMinHeight, landData.mMaxHeight};
+            return { surface, landData.mMinHeight, landData.mMaxHeight };
         }
 
         template <class T>
@@ -227,7 +221,8 @@ namespace NavMeshTool
         }
     }
 
-    WorldspaceNavMeshInput::WorldspaceNavMeshInput(std::string worldspace, const DetourNavigator::RecastSettings& settings)
+    WorldspaceNavMeshInput::WorldspaceNavMeshInput(
+        std::string worldspace, const DetourNavigator::RecastSettings& settings)
         : mWorldspace(std::move(worldspace))
         , mTileCachedRecastMeshManager(settings)
     {
@@ -247,7 +242,7 @@ namespace NavMeshTool
         std::size_t objectsCounter = 0;
 
         if (writeBinaryLog)
-            serializeToStderr(ExpectedCells {static_cast<std::uint64_t>(esmData.mCells.size())});
+            serializeToStderr(ExpectedCells{ static_cast<std::uint64_t>(esmData.mCells.size()) });
 
         for (std::size_t i = 0; i < esmData.mCells.size(); ++i)
         {
@@ -257,97 +252,100 @@ namespace NavMeshTool
             if (!exterior && !processInteriorCells)
             {
                 if (writeBinaryLog)
-                    serializeToStderr(ProcessedCells {static_cast<std::uint64_t>(i + 1)});
+                    serializeToStderr(ProcessedCells{ static_cast<std::uint64_t>(i + 1) });
                 Log(Debug::Info) << "Skipped interior"
-                    << " cell (" << (i + 1) << "/" << esmData.mCells.size() << ") \"" << cell.getDescription() << "\"";
+                                 << " cell (" << (i + 1) << "/" << esmData.mCells.size() << ") \""
+                                 << cell.getDescription() << "\"";
                 continue;
             }
 
-            Log(Debug::Debug) << "Processing " << (exterior ? "exterior" : "interior")
-                << " cell (" << (i + 1) << "/" << esmData.mCells.size() << ") \"" << cell.getDescription() << "\"";
+            Log(Debug::Debug) << "Processing " << (exterior ? "exterior" : "interior") << " cell (" << (i + 1) << "/"
+                              << esmData.mCells.size() << ") \"" << cell.getDescription() << "\"";
 
             const osg::Vec2i cellPosition(cell.mData.mX, cell.mData.mY);
             const std::size_t cellObjectsBegin = data.mObjects.size();
 
-            WorldspaceNavMeshInput& navMeshInput = [&] () -> WorldspaceNavMeshInput&
-            {
+            WorldspaceNavMeshInput& navMeshInput = [&]() -> WorldspaceNavMeshInput& {
                 auto it = navMeshInputs.find(cell.mCellId.mWorldspace);
                 if (it == navMeshInputs.end())
                 {
-                    it = navMeshInputs.emplace(cell.mCellId.mWorldspace,
-                        std::make_unique<WorldspaceNavMeshInput>(cell.mCellId.mWorldspace, settings.mRecast)).first;
+                    it = navMeshInputs
+                             .emplace(cell.mCellId.mWorldspace,
+                                 std::make_unique<WorldspaceNavMeshInput>(cell.mCellId.mWorldspace, settings.mRecast))
+                             .first;
                     it->second->mTileCachedRecastMeshManager.setWorldspace(cell.mCellId.mWorldspace, nullptr);
                 }
                 return *it->second;
-            } ();
+            }();
 
             const TileCachedRecastMeshManager::UpdateGuard guard(navMeshInput.mTileCachedRecastMeshManager);
 
             if (exterior)
             {
-                const auto it = std::lower_bound(esmData.mLands.begin(), esmData.mLands.end(), cellPosition, LessByXY {});
-                const auto [heightfieldShape, minHeight, maxHeight] = makeHeightfieldShape(
-                    it == esmData.mLands.end() ? std::optional<ESM::Land>() : *it,
-                    cellPosition, data.mHeightfields, data.mLandData
-                );
+                const auto it
+                    = std::lower_bound(esmData.mLands.begin(), esmData.mLands.end(), cellPosition, LessByXY{});
+                const auto [heightfieldShape, minHeight, maxHeight]
+                    = makeHeightfieldShape(it == esmData.mLands.end() ? std::optional<ESM::Land>() : *it, cellPosition,
+                        data.mHeightfields, data.mLandData);
 
-                mergeOrAssign(getAabb(cellPosition, minHeight, maxHeight),
-                              navMeshInput.mAabb, navMeshInput.mAabbInitialized);
+                mergeOrAssign(
+                    getAabb(cellPosition, minHeight, maxHeight), navMeshInput.mAabb, navMeshInput.mAabbInitialized);
 
-                navMeshInput.mTileCachedRecastMeshManager.addHeightfield(cellPosition, ESM::Land::REAL_SIZE, heightfieldShape, &guard);
+                navMeshInput.mTileCachedRecastMeshManager.addHeightfield(
+                    cellPosition, ESM::Land::REAL_SIZE, heightfieldShape, &guard);
 
                 navMeshInput.mTileCachedRecastMeshManager.addWater(cellPosition, ESM::Land::REAL_SIZE, -1, &guard);
             }
             else
             {
                 if ((cell.mData.mFlags & ESM::Cell::HasWater) != 0)
-                    navMeshInput.mTileCachedRecastMeshManager.addWater(cellPosition, std::numeric_limits<int>::max(), cell.mWater, &guard);
+                    navMeshInput.mTileCachedRecastMeshManager.addWater(
+                        cellPosition, std::numeric_limits<int>::max(), cell.mWater, &guard);
             }
 
-            forEachObject(cell, esmData, vfs, bulletShapeManager, readers,
-                [&] (BulletObject object)
-                {
-                    if (object.getShapeInstance()->mVisualCollisionType != Resource::VisualCollisionType::None)
-                        return;
+            forEachObject(cell, esmData, vfs, bulletShapeManager, readers, [&](BulletObject object) {
+                if (object.getShapeInstance()->mVisualCollisionType != Resource::VisualCollisionType::None)
+                    return;
 
-                    const btTransform& transform = object.getCollisionObject().getWorldTransform();
-                    const btAABB aabb = BulletHelpers::getAabb(*object.getCollisionObject().getCollisionShape(), transform);
-                    mergeOrAssign(aabb, navMeshInput.mAabb, navMeshInput.mAabbInitialized);
-                    if (const btCollisionShape* avoid = object.getShapeInstance()->mAvoidCollisionShape.get())
-                        navMeshInput.mAabb.merge(BulletHelpers::getAabb(*avoid, transform));
+                const btTransform& transform = object.getCollisionObject().getWorldTransform();
+                const btAABB aabb = BulletHelpers::getAabb(*object.getCollisionObject().getCollisionShape(), transform);
+                mergeOrAssign(aabb, navMeshInput.mAabb, navMeshInput.mAabbInitialized);
+                if (const btCollisionShape* avoid = object.getShapeInstance()->mAvoidCollisionShape.get())
+                    navMeshInput.mAabb.merge(BulletHelpers::getAabb(*avoid, transform));
 
-                    const ObjectId objectId(++objectsCounter);
-                    const CollisionShape shape(object.getShapeInstance(), *object.getCollisionObject().getCollisionShape(), object.getObjectTransform());
+                const ObjectId objectId(++objectsCounter);
+                const CollisionShape shape(object.getShapeInstance(), *object.getCollisionObject().getCollisionShape(),
+                    object.getObjectTransform());
 
-                    navMeshInput.mTileCachedRecastMeshManager.addObject(objectId, shape, transform,
-                        DetourNavigator::AreaType_ground, &guard);
+                navMeshInput.mTileCachedRecastMeshManager.addObject(
+                    objectId, shape, transform, DetourNavigator::AreaType_ground, &guard);
 
-                    if (const btCollisionShape* avoid = object.getShapeInstance()->mAvoidCollisionShape.get())
-                    {
-                        const CollisionShape avoidShape(object.getShapeInstance(), *avoid, object.getObjectTransform());
-                        navMeshInput.mTileCachedRecastMeshManager.addObject(objectId, avoidShape, transform,
-                            DetourNavigator::AreaType_null, &guard);
-                    }
+                if (const btCollisionShape* avoid = object.getShapeInstance()->mAvoidCollisionShape.get())
+                {
+                    const CollisionShape avoidShape(object.getShapeInstance(), *avoid, object.getObjectTransform());
+                    navMeshInput.mTileCachedRecastMeshManager.addObject(
+                        objectId, avoidShape, transform, DetourNavigator::AreaType_null, &guard);
+                }
 
-                    data.mObjects.emplace_back(std::move(object));
-                });
+                data.mObjects.emplace_back(std::move(object));
+            });
 
             const auto cellDescription = cell.getDescription();
 
             if (writeBinaryLog)
-                serializeToStderr(ProcessedCells {static_cast<std::uint64_t>(i + 1)});
+                serializeToStderr(ProcessedCells{ static_cast<std::uint64_t>(i + 1) });
 
-            Log(Debug::Info) << "Processed " << (exterior ? "exterior" : "interior")
-                << " cell (" << (i + 1) << "/" << esmData.mCells.size() << ") " << cellDescription
-                << " with " << (data.mObjects.size() - cellObjectsBegin) << " objects";
+            Log(Debug::Info) << "Processed " << (exterior ? "exterior" : "interior") << " cell (" << (i + 1) << "/"
+                             << esmData.mCells.size() << ") " << cellDescription << " with "
+                             << (data.mObjects.size() - cellObjectsBegin) << " objects";
         }
 
         data.mNavMeshInputs.reserve(navMeshInputs.size());
         std::transform(navMeshInputs.begin(), navMeshInputs.end(), std::back_inserter(data.mNavMeshInputs),
-                       [] (auto& v) { return std::move(v.second); });
+            [](auto& v) { return std::move(v.second); });
 
-        Log(Debug::Info) << "Processed " << esmData.mCells.size() << " cells, added "
-            << data.mObjects.size() << " objects and " << data.mHeightfields.size() << " height fields";
+        Log(Debug::Info) << "Processed " << esmData.mCells.size() << " cells, added " << data.mObjects.size()
+                         << " objects and " << data.mHeightfields.size() << " height fields";
 
         return data;
     }
diff --git a/apps/navmeshtool/worldspacedata.hpp b/apps/navmeshtool/worldspacedata.hpp
index ca229ad1fa..b6ccce6733 100644
--- a/apps/navmeshtool/worldspacedata.hpp
+++ b/apps/navmeshtool/worldspacedata.hpp
@@ -43,8 +43,8 @@ namespace DetourNavigator
 
 namespace NavMeshTool
 {
-    using DetourNavigator::TileCachedRecastMeshManager;
     using DetourNavigator::ObjectTransform;
+    using DetourNavigator::TileCachedRecastMeshManager;
 
     struct WorldspaceNavMeshInput
     {
@@ -62,12 +62,10 @@ namespace NavMeshTool
         BulletObject(osg::ref_ptr<Resource::BulletShapeInstance>&& shapeInstance, const ESM::Position& position,
             float localScaling)
             : mShapeInstance(std::move(shapeInstance))
-            , mObjectTransform {position, localScaling}
-            , mCollisionObject(BulletHelpers::makeCollisionObject(
-                mShapeInstance->mCollisionShape.get(),
-                Misc::Convert::toBullet(position.asVec3()),
-                Misc::Convert::toBullet(Misc::Convert::makeOsgQuat(position))
-            ))
+            , mObjectTransform{ position, localScaling }
+            , mCollisionObject(BulletHelpers::makeCollisionObject(mShapeInstance->mCollisionShape.get(),
+                  Misc::Convert::toBullet(position.asVec3()),
+                  Misc::Convert::toBullet(Misc::Convert::makeOsgQuat(position))))
         {
             mShapeInstance->setLocalScaling(btVector3(localScaling, localScaling, localScaling));
         }
diff --git a/apps/niftest/niftest.cpp b/apps/niftest/niftest.cpp
index 8fbd5d6719..632f25f5de 100644
--- a/apps/niftest/niftest.cpp
+++ b/apps/niftest/niftest.cpp
@@ -1,38 +1,38 @@
-///Program to test .nif files both on the FileSystem and in BSA archives.
+/// Program to test .nif files both on the FileSystem and in BSA archives.
 
-#include <iostream>
 #include <filesystem>
+#include <iostream>
 
+#include <components/files/configurationmanager.hpp>
+#include <components/files/constrainedfilestream.hpp>
+#include <components/files/conversion.hpp>
 #include <components/misc/strings/algorithm.hpp>
 #include <components/nif/niffile.hpp>
-#include <components/files/constrainedfilestream.hpp>
-#include <components/vfs/manager.hpp>
 #include <components/vfs/bsaarchive.hpp>
 #include <components/vfs/filesystemarchive.hpp>
-#include <components/files/configurationmanager.hpp>
-#include <components/files/conversion.hpp>
+#include <components/vfs/manager.hpp>
 
 #include <boost/program_options.hpp>
 
 // Create local aliases for brevity
 namespace bpo = boost::program_options;
 
-///See if the file has the named extension
+/// See if the file has the named extension
 bool hasExtension(const std::filesystem::path& filename, const std::string& extensionToFind)
 {
     const auto extension = Files::pathToUnicodeString(filename.extension());
     return Misc::StringUtils::ciEqual(extension, extensionToFind);
 }
 
-///See if the file has the "nif" extension.
-bool isNIF(const std::filesystem::path &filename)
+/// See if the file has the "nif" extension.
+bool isNIF(const std::filesystem::path& filename)
 {
-    return hasExtension(filename,"nif");
+    return hasExtension(filename, "nif");
 }
-///See if the file has the "bsa" extension.
-bool isBSA(const std::filesystem::path &filename)
+/// See if the file has the "bsa" extension.
+bool isBSA(const std::filesystem::path& filename)
 {
-    return hasExtension(filename,"bsa");
+    return hasExtension(filename, "bsa");
 }
 
 /// Check all the nif files in a given VFS::Archive
@@ -43,21 +43,22 @@ void readVFS(std::unique_ptr<VFS::Archive>&& anArchive, const std::filesystem::p
     myManager.addArchive(std::move(anArchive));
     myManager.buildIndex();
 
-    for(const auto& name : myManager.getRecursiveDirectoryIterator(""))
+    for (const auto& name : myManager.getRecursiveDirectoryIterator(""))
     {
-        try{
-            if(isNIF(name))
+        try
+        {
+            if (isNIF(name))
             {
-            //           std::cout << "Decoding: " << name << std::endl;
-                Nif::NIFFile temp_nif(myManager.get(name),archivePath / name);
+                //           std::cout << "Decoding: " << name << std::endl;
+                Nif::NIFFile temp_nif(myManager.get(name), archivePath / name);
             }
-            else if(isBSA(name))
+            else if (isBSA(name))
             {
-                if(!archivePath.empty() && !isBSA(archivePath))
+                if (!archivePath.empty() && !isBSA(archivePath))
                 {
-//                     std::cout << "Reading BSA File: " << name << std::endl;
+                    //                     std::cout << "Reading BSA File: " << name << std::endl;
                     readVFS(std::make_unique<VFS::BsaArchive>(archivePath / name), archivePath / name);
-//                     std::cout << "Done with BSA File: " << name << std::endl;
+                    //                     std::cout << "Done with BSA File: " << name << std::endl;
                 }
             }
         }
@@ -68,7 +69,7 @@ void readVFS(std::unique_ptr<VFS::Archive>&& anArchive, const std::filesystem::p
     }
 }
 
-bool parseOptions (int argc, char** argv, std::vector<Files::MaybeQuotedPath> &files)
+bool parseOptions(int argc, char** argv, std::vector<Files::MaybeQuotedPath>& files)
 {
     bpo::options_description desc(R"(Ensure that OpenMW can use the provided NIF and BSA files
 
@@ -79,34 +80,32 @@ Usages:
 Allowed options)");
     auto addOption = desc.add_options();
     addOption("help,h", "print help message.");
-    addOption("input-file", bpo::value< Files::MaybeQuotedPathContainer >(), "input file");
+    addOption("input-file", bpo::value<Files::MaybeQuotedPathContainer>(), "input file");
 
-    //Default option if none provided
+    // Default option if none provided
     bpo::positional_options_description p;
     p.add("input-file", -1);
 
     bpo::variables_map variables;
     try
     {
-        bpo::parsed_options valid_opts = bpo::command_line_parser(argc, argv).
-            options(desc).positional(p).run();
+        bpo::parsed_options valid_opts = bpo::command_line_parser(argc, argv).options(desc).positional(p).run();
         bpo::store(valid_opts, variables);
         bpo::notify(variables);
-        if (variables.count ("help"))
+        if (variables.count("help"))
         {
             std::cout << desc << std::endl;
             return false;
         }
         if (variables.count("input-file"))
         {
-            files = variables["input-file"].as< Files::MaybeQuotedPathContainer >();
+            files = variables["input-file"].as<Files::MaybeQuotedPathContainer>();
             return true;
         }
     }
-    catch(std::exception &e)
+    catch (std::exception& e)
     {
-        std::cout << "ERROR parsing arguments: " << e.what() << "\n\n"
-            << desc << std::endl;
+        std::cout << "ERROR parsing arguments: " << e.what() << "\n\n" << desc << std::endl;
         return false;
     }
 
@@ -115,42 +114,43 @@ Allowed options)");
     return false;
 }
 
-int main(int argc, char **argv)
+int main(int argc, char** argv)
 {
     std::vector<Files::MaybeQuotedPath> files;
-    if(!parseOptions (argc, argv, files))
+    if (!parseOptions(argc, argv, files))
         return 1;
 
     Nif::NIFFile::setLoadUnsupportedFiles(true);
-//     std::cout << "Reading Files" << std::endl;
-    for(const auto& path : files)
+    //     std::cout << "Reading Files" << std::endl;
+    for (const auto& path : files)
     {
         try
         {
-            if(isNIF(path))
+            if (isNIF(path))
             {
-                //std::cout << "Decoding: " << name << std::endl;
+                // std::cout << "Decoding: " << name << std::endl;
                 Nif::NIFFile temp_nif(Files::openConstrainedFileStream(path), path);
-             }
-             else if(isBSA(path))
-             {
-//                 std::cout << "Reading BSA File: " << name << std::endl;
+            }
+            else if (isBSA(path))
+            {
+                //                 std::cout << "Reading BSA File: " << name << std::endl;
                 readVFS(std::make_unique<VFS::BsaArchive>(path));
-             }
-             else if(std::filesystem::is_directory(path))
-             {
-//                 std::cout << "Reading All Files in: " << name << std::endl;
+            }
+            else if (std::filesystem::is_directory(path))
+            {
+                //                 std::cout << "Reading All Files in: " << name << std::endl;
                 readVFS(std::make_unique<VFS::FileSystemArchive>(path), path);
-             }
-             else
-             {
-                 std::cerr << "ERROR:  \"" << Files::pathToUnicodeString(path) << "\" is not a nif file, bsa file, or directory!" << std::endl;
-             }
+            }
+            else
+            {
+                std::cerr << "ERROR:  \"" << Files::pathToUnicodeString(path)
+                          << "\" is not a nif file, bsa file, or directory!" << std::endl;
+            }
         }
         catch (std::exception& e)
         {
             std::cerr << "ERROR, an exception has occurred:  " << e.what() << std::endl;
         }
-     }
-     return 0;
+    }
+    return 0;
 }
diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index b5af84d079..729b9e58c6 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -25,12 +25,18 @@
 
 using namespace Fallback;
 
-CS::Editor::Editor (int argc, char **argv)
-: mConfigVariables(readConfiguration()), mSettingsState (mCfgMgr), mDocumentManager (mCfgMgr),
-  mPid(""), mLock(), mMerge (mDocumentManager),
-  mIpcServerName ("org.openmw.OpenCS"), mServer(nullptr), mClientSocket(nullptr)
+CS::Editor::Editor(int argc, char** argv)
+    : mConfigVariables(readConfiguration())
+    , mSettingsState(mCfgMgr)
+    , mDocumentManager(mCfgMgr)
+    , mPid("")
+    , mLock()
+    , mMerge(mDocumentManager)
+    , mIpcServerName("org.openmw.OpenCS")
+    , mServer(nullptr)
+    , mClientSocket(nullptr)
 {
-    std::pair<Files::PathContainer, std::vector<std::string> > config = readConfig();
+    std::pair<Files::PathContainer, std::vector<std::string>> config = readConfig();
 
     mViewManager = new CSVDoc::ViewManager(mDocumentManager);
     if (argc > 1)
@@ -43,44 +49,42 @@ CS::Editor::Editor (int argc, char **argv)
 
     mDocumentManager.setFileData(mFsStrict, config.first, config.second);
 
-    mNewGame.setLocalData (mLocal);
-    mFileDialog.setLocalData (mLocal);
-    mMerge.setLocalData (mLocal);
-
-    connect (&mDocumentManager, &CSMDoc::DocumentManager::documentAdded,
-        this, &Editor::documentAdded);
-    connect (&mDocumentManager, &CSMDoc::DocumentManager::documentAboutToBeRemoved,
-        this, &Editor::documentAboutToBeRemoved);
-    connect (&mDocumentManager, &CSMDoc::DocumentManager::lastDocumentDeleted,
-        this, &Editor::lastDocumentDeleted);
-
-    connect (mViewManager, &CSVDoc::ViewManager::newGameRequest, this, &Editor::createGame);
-    connect (mViewManager, &CSVDoc::ViewManager::newAddonRequest, this, &Editor::createAddon);
-    connect (mViewManager, &CSVDoc::ViewManager::loadDocumentRequest, this, &Editor::loadDocument);
-    connect (mViewManager, &CSVDoc::ViewManager::editSettingsRequest, this, &Editor::showSettings);
-    connect (mViewManager, &CSVDoc::ViewManager::mergeDocument, this, &Editor::mergeDocument);
-
-    connect (&mStartup, &CSVDoc::StartupDialogue::createGame, this, &Editor::createGame);
-    connect (&mStartup, &CSVDoc::StartupDialogue::createAddon, this, &Editor::createAddon);
-    connect (&mStartup, &CSVDoc::StartupDialogue::loadDocument, this, &Editor::loadDocument);
-    connect (&mStartup, &CSVDoc::StartupDialogue::editConfig, this, &Editor::showSettings);
-
-    connect (&mFileDialog, &CSVDoc::FileDialog::signalOpenFiles,
-        this, [this](const std::filesystem::path &savePath){ this->openFiles(savePath); });
-    connect (&mFileDialog, &CSVDoc::FileDialog::signalCreateNewFile, this, &Editor::createNewFile);
-    connect (&mFileDialog, &CSVDoc::FileDialog::rejected, this, &Editor::cancelFileDialog);
-
-    connect (&mNewGame, &CSVDoc::NewGameDialogue::createRequest, this, &Editor::createNewGame);
-    connect (&mNewGame, &CSVDoc::NewGameDialogue::cancelCreateGame, this, &Editor::cancelCreateGame);
+    mNewGame.setLocalData(mLocal);
+    mFileDialog.setLocalData(mLocal);
+    mMerge.setLocalData(mLocal);
+
+    connect(&mDocumentManager, &CSMDoc::DocumentManager::documentAdded, this, &Editor::documentAdded);
+    connect(
+        &mDocumentManager, &CSMDoc::DocumentManager::documentAboutToBeRemoved, this, &Editor::documentAboutToBeRemoved);
+    connect(&mDocumentManager, &CSMDoc::DocumentManager::lastDocumentDeleted, this, &Editor::lastDocumentDeleted);
+
+    connect(mViewManager, &CSVDoc::ViewManager::newGameRequest, this, &Editor::createGame);
+    connect(mViewManager, &CSVDoc::ViewManager::newAddonRequest, this, &Editor::createAddon);
+    connect(mViewManager, &CSVDoc::ViewManager::loadDocumentRequest, this, &Editor::loadDocument);
+    connect(mViewManager, &CSVDoc::ViewManager::editSettingsRequest, this, &Editor::showSettings);
+    connect(mViewManager, &CSVDoc::ViewManager::mergeDocument, this, &Editor::mergeDocument);
+
+    connect(&mStartup, &CSVDoc::StartupDialogue::createGame, this, &Editor::createGame);
+    connect(&mStartup, &CSVDoc::StartupDialogue::createAddon, this, &Editor::createAddon);
+    connect(&mStartup, &CSVDoc::StartupDialogue::loadDocument, this, &Editor::loadDocument);
+    connect(&mStartup, &CSVDoc::StartupDialogue::editConfig, this, &Editor::showSettings);
+
+    connect(&mFileDialog, &CSVDoc::FileDialog::signalOpenFiles, this,
+        [this](const std::filesystem::path& savePath) { this->openFiles(savePath); });
+    connect(&mFileDialog, &CSVDoc::FileDialog::signalCreateNewFile, this, &Editor::createNewFile);
+    connect(&mFileDialog, &CSVDoc::FileDialog::rejected, this, &Editor::cancelFileDialog);
+
+    connect(&mNewGame, &CSVDoc::NewGameDialogue::createRequest, this, &Editor::createNewGame);
+    connect(&mNewGame, &CSVDoc::NewGameDialogue::cancelCreateGame, this, &Editor::cancelCreateGame);
 }
 
-CS::Editor::~Editor ()
+CS::Editor::~Editor()
 {
     delete mViewManager;
 
     mPidFile.close();
 
-    if(mServer && std::filesystem::exists(mPid))
+    if (mServer && std::filesystem::exists(mPid))
         std::filesystem::remove(mPid);
 }
 
@@ -90,19 +94,32 @@ boost::program_options::variables_map CS::Editor::readConfiguration()
     boost::program_options::options_description desc("Syntax: openmw-cs <options>\nAllowed options");
 
     auto addOption = desc.add_options();
-    addOption("data", boost::program_options::value<Files::MaybeQuotedPathContainer>()->default_value(Files::MaybeQuotedPathContainer(), "data")->multitoken()->composing());
-    addOption("data-local", boost::program_options::value<Files::MaybeQuotedPathContainer::value_type>()->default_value(Files::MaybeQuotedPathContainer::value_type(), ""));
+    addOption("data",
+        boost::program_options::value<Files::MaybeQuotedPathContainer>()
+            ->default_value(Files::MaybeQuotedPathContainer(), "data")
+            ->multitoken()
+            ->composing());
+    addOption("data-local",
+        boost::program_options::value<Files::MaybeQuotedPathContainer::value_type>()->default_value(
+            Files::MaybeQuotedPathContainer::value_type(), ""));
     addOption("fs-strict", boost::program_options::value<bool>()->implicit_value(true)->default_value(false));
     addOption("encoding", boost::program_options::value<std::string>()->default_value("win1252"));
-    addOption("resources", boost::program_options::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), "resources"));
-    addOption("fallback-archive", boost::program_options::value<std::vector<std::string>>()->
-        default_value(std::vector<std::string>(), "fallback-archive")->multitoken());
-    addOption("fallback", boost::program_options::value<FallbackMap>()->default_value(FallbackMap(), "")
-        ->multitoken()->composing(), "fallback values");
-    addOption("script-blacklist", boost::program_options::value<std::vector<std::string>>()->default_value(std::vector<std::string>(), "")
-        ->multitoken(), "exclude specified script from the verifier (if the use of the blacklist is enabled)");
-    addOption("script-blacklist-use", boost::program_options::value<bool>()->implicit_value(true)
-        ->default_value(true), "enable script blacklisting");
+    addOption("resources",
+        boost::program_options::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), "resources"));
+    addOption("fallback-archive",
+        boost::program_options::value<std::vector<std::string>>()
+            ->default_value(std::vector<std::string>(), "fallback-archive")
+            ->multitoken());
+    addOption("fallback",
+        boost::program_options::value<FallbackMap>()->default_value(FallbackMap(), "")->multitoken()->composing(),
+        "fallback values");
+    addOption("script-blacklist",
+        boost::program_options::value<std::vector<std::string>>()
+            ->default_value(std::vector<std::string>(), "")
+            ->multitoken(),
+        "exclude specified script from the verifier (if the use of the blacklist is enabled)");
+    addOption("script-blacklist-use", boost::program_options::value<bool>()->implicit_value(true)->default_value(true),
+        "enable script blacklisting");
     Files::ConfigurationManager::addCommonOptions(desc);
 
     boost::program_options::notify(variables);
@@ -114,7 +131,7 @@ boost::program_options::variables_map CS::Editor::readConfiguration()
     return variables;
 }
 
-std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfig(bool quiet)
+std::pair<Files::PathContainer, std::vector<std::string>> CS::Editor::readConfig(bool quiet)
 {
     boost::program_options::variables_map& variables = mConfigVariables;
 
@@ -122,22 +139,28 @@ std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfi
 
     mEncodingName = variables["encoding"].as<std::string>();
     mDocumentManager.setEncoding(ToUTF8::calculateEncoding(mEncodingName));
-    mFileDialog.setEncoding (QString::fromUtf8(mEncodingName.c_str()));
+    mFileDialog.setEncoding(QString::fromUtf8(mEncodingName.c_str()));
 
-    mDocumentManager.setResourceDir (mResources = variables["resources"].as<Files::MaybeQuotedPath>().u8string()); // This call to u8string is redundant, but required to build on MSVC 14.26 due to implementation bugs.
+    mDocumentManager.setResourceDir(mResources = variables["resources"]
+                                                     .as<Files::MaybeQuotedPath>()
+                                                     .u8string()); // This call to u8string is redundant, but required
+                                                                   // to build on MSVC 14.26 due to implementation bugs.
 
     if (variables["script-blacklist-use"].as<bool>())
-        mDocumentManager.setBlacklistedScripts (
-            variables["script-blacklist"].as<std::vector<std::string>>());
+        mDocumentManager.setBlacklistedScripts(variables["script-blacklist"].as<std::vector<std::string>>());
 
     mFsStrict = variables["fs-strict"].as<bool>();
 
     Files::PathContainer dataDirs, dataLocal;
-    if (!variables["data"].empty()) {
+    if (!variables["data"].empty())
+    {
         dataDirs = asPathContainer(variables["data"].as<Files::MaybeQuotedPathContainer>());
     }
 
-    Files::PathContainer::value_type local(variables["data-local"].as<Files::MaybeQuotedPathContainer::value_type>().u8string()); // This call to u8string is redundant, but required to build on MSVC 14.26 due to implementation bugs.
+    Files::PathContainer::value_type local(variables["data-local"]
+                                               .as<Files::MaybeQuotedPathContainer::value_type>()
+                                               .u8string()); // This call to u8string is redundant, but required to
+                                                             // build on MSVC 14.26 due to implementation bugs.
     if (!local.empty())
     {
         std::filesystem::create_directories(local);
@@ -151,21 +174,23 @@ std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfi
     else
     {
         QMessageBox messageBox;
-        messageBox.setWindowTitle (tr ("No local data path available"));
-        messageBox.setIcon (QMessageBox::Critical);
-        messageBox.setStandardButtons (QMessageBox::Ok);
-        messageBox.setText(tr("<br><b>OpenCS is unable to access the local data directory. This may indicate a faulty configuration or a broken install.</b>"));
+        messageBox.setWindowTitle(tr("No local data path available"));
+        messageBox.setIcon(QMessageBox::Critical);
+        messageBox.setStandardButtons(QMessageBox::Ok);
+        messageBox.setText(
+            tr("<br><b>OpenCS is unable to access the local data directory. This may indicate a faulty configuration "
+               "or a broken install.</b>"));
         messageBox.exec();
 
-        QApplication::exit (1);
+        QApplication::exit(1);
     }
 
-    dataDirs.insert (dataDirs.end(), dataLocal.begin(), dataLocal.end());
+    dataDirs.insert(dataDirs.end(), dataLocal.begin(), dataLocal.end());
 
-    //iterate the data directories and add them to the file dialog for loading
+    // iterate the data directories and add them to the file dialog for loading
     mFileDialog.addFiles(dataDirs);
 
-    return std::make_pair (dataDirs, variables["fallback-archive"].as<std::vector<std::string>>());
+    return std::make_pair(dataDirs, variables["fallback-archive"].as<std::vector<std::string>>());
 }
 
 void CS::Editor::createGame()
@@ -198,9 +223,9 @@ void CS::Editor::createAddon()
     mStartup.hide();
 
     mFileDialog.clearFiles();
-    readConfig(/*quiet*/true);
+    readConfig(/*quiet*/ true);
 
-    mFileDialog.showDialog (CSVDoc::ContentAction_New);
+    mFileDialog.showDialog(CSVDoc::ContentAction_New);
 }
 
 void CS::Editor::cancelFileDialog()
@@ -222,18 +247,20 @@ void CS::Editor::loadDocument()
     mStartup.hide();
 
     mFileDialog.clearFiles();
-    readConfig(/*quiet*/true);
+    readConfig(/*quiet*/ true);
 
-    mFileDialog.showDialog (CSVDoc::ContentAction_Edit);
+    mFileDialog.showDialog(CSVDoc::ContentAction_Edit);
 }
 
-void CS::Editor::openFiles (const std::filesystem::path &savePath, const std::vector<std::filesystem::path> &discoveredFiles)
+void CS::Editor::openFiles(
+    const std::filesystem::path& savePath, const std::vector<std::filesystem::path>& discoveredFiles)
 {
     std::vector<std::filesystem::path> files;
 
-    if(discoveredFiles.empty())
+    if (discoveredFiles.empty())
     {
-        for (const QString &path : mFileDialog.selectedFilePaths()) {
+        for (const QString& path : mFileDialog.selectedFilePaths())
+        {
             files.emplace_back(Files::pathFromQString(path));
         }
     }
@@ -242,40 +269,41 @@ void CS::Editor::openFiles (const std::filesystem::path &savePath, const std::ve
         files = discoveredFiles;
     }
 
-    mDocumentManager.addDocument (files, savePath, false);
+    mDocumentManager.addDocument(files, savePath, false);
 
     mFileDialog.hide();
 }
 
-void CS::Editor::createNewFile (const std::filesystem::path &savePath)
+void CS::Editor::createNewFile(const std::filesystem::path& savePath)
 {
     std::vector<std::filesystem::path> files;
 
-    for (const QString &path : mFileDialog.selectedFilePaths()) {
+    for (const QString& path : mFileDialog.selectedFilePaths())
+    {
         files.emplace_back(Files::pathFromQString(path));
     }
 
-    files.push_back (savePath);
+    files.push_back(savePath);
 
-    mDocumentManager.addDocument (files, savePath, true);
+    mDocumentManager.addDocument(files, savePath, true);
 
     mFileDialog.hide();
 }
 
-void CS::Editor::createNewGame (const std::filesystem::path& file)
+void CS::Editor::createNewGame(const std::filesystem::path& file)
 {
     std::vector<std::filesystem::path> files;
 
-    files.push_back (file);
+    files.push_back(file);
 
-    mDocumentManager.addDocument (files, file, true);
+    mDocumentManager.addDocument(files, file, true);
 
     mNewGame.hide();
 }
 
 void CS::Editor::showStartup()
 {
-    if(mStartup.isHidden())
+    if (mStartup.isHidden())
         mStartup.show();
     mStartup.raise();
     mStartup.activateWindow();
@@ -286,7 +314,7 @@ void CS::Editor::showSettings()
     if (mSettings.isHidden())
         mSettings.show();
 
-    mSettings.move (QCursor::pos());
+    mSettings.move(QCursor::pos());
     mSettings.raise();
     mSettings.activateWindow();
 }
@@ -302,7 +330,7 @@ bool CS::Editor::makeIPCServer()
         mPidFile.open(mPid);
 
         mLock = boost::interprocess::file_lock(mPid.c_str());
-        if(!mLock.try_lock())
+        if (!mLock.try_lock())
         {
             Log(Debug::Error) << "Error: OpenMW-CS is already running.";
             return false;
@@ -316,7 +344,7 @@ bool CS::Editor::makeIPCServer()
 
         mServer = new QLocalServer(this);
 
-        if(pidExists)
+        if (pidExists)
         {
             // hack to get the temp directory path
             mServer->listen("dummy");
@@ -325,24 +353,24 @@ bool CS::Editor::makeIPCServer()
             fullPath.remove(QRegExp("dummy$"));
             fullPath += mIpcServerName;
             const auto path = Files::pathFromQString(fullPath);
-            if(exists(path))
+            if (exists(path))
             {
                 // TODO: compare pid of the current process with that in the file
                 Log(Debug::Info) << "Detected unclean shutdown.";
                 // delete the stale file
-                if(remove(path))
+                if (remove(path))
                     Log(Debug::Error) << "Error: can not remove stale connection file.";
             }
         }
     }
 
-    catch(const std::exception& e)
+    catch (const std::exception& e)
     {
         Log(Debug::Error) << "Error: " << e.what();
         return false;
     }
 
-    if(mServer->listen(mIpcServerName))
+    if (mServer->listen(mIpcServerName))
     {
         connect(mServer, &QLocalServer::newConnection, this, &Editor::showStartup);
         return true;
@@ -415,14 +443,14 @@ int CS::Editor::run()
     return QApplication::exec();
 }
 
-void CS::Editor::documentAdded (CSMDoc::Document *document)
+void CS::Editor::documentAdded(CSMDoc::Document* document)
 {
-    mViewManager->addView (document);
+    mViewManager->addView(document);
 }
 
-void CS::Editor::documentAboutToBeRemoved (CSMDoc::Document *document)
+void CS::Editor::documentAboutToBeRemoved(CSMDoc::Document* document)
 {
-    if (mMerge.getDocument()==document)
+    if (mMerge.getDocument() == document)
         mMerge.cancel();
 }
 
@@ -431,9 +459,9 @@ void CS::Editor::lastDocumentDeleted()
     QApplication::quit();
 }
 
-void CS::Editor::mergeDocument (CSMDoc::Document *document)
+void CS::Editor::mergeDocument(CSMDoc::Document* document)
 {
-    mMerge.configure (document);
+    mMerge.configure(document);
     mMerge.show();
     mMerge.raise();
     mMerge.activateWindow();
diff --git a/apps/opencs/editor.hpp b/apps/opencs/editor.hpp
index c9dba37193..cc0ed688b8 100644
--- a/apps/opencs/editor.hpp
+++ b/apps/opencs/editor.hpp
@@ -6,10 +6,10 @@
 #include <boost/interprocess/sync/file_lock.hpp>
 #include <boost/program_options/variables_map.hpp>
 
-#include <QObject>
-#include <QString>
 #include <QLocalServer>
 #include <QLocalSocket>
+#include <QObject>
+#include <QString>
 
 #ifndef Q_MOC_RUN
 #include <components/files/configurationmanager.hpp>
@@ -21,10 +21,10 @@
 
 #include "model/prefs/state.hpp"
 
-#include "view/doc/viewmanager.hpp"
-#include "view/doc/startup.hpp"
 #include "view/doc/filedialog.hpp"
 #include "view/doc/newgame.hpp"
+#include "view/doc/startup.hpp"
+#include "view/doc/viewmanager.hpp"
 
 #include "view/prefs/dialogue.hpp"
 
@@ -39,77 +39,77 @@ namespace CS
 {
     class Editor : public QObject
     {
-            Q_OBJECT
-
-            Files::ConfigurationManager mCfgMgr;
-            boost::program_options::variables_map mConfigVariables;
-            CSMPrefs::State mSettingsState;
-            CSMDoc::DocumentManager mDocumentManager;
-            CSVDoc::StartupDialogue mStartup;
-            CSVDoc::NewGameDialogue mNewGame;
-            CSVPrefs::Dialogue mSettings;
-            CSVDoc::FileDialog mFileDialog;
-            std::filesystem::path mLocal;
-            std::filesystem::path mResources;
-            std::filesystem::path mPid;
-            boost::interprocess::file_lock mLock;
-            std::ofstream mPidFile;
-            bool mFsStrict;
-            CSVTools::Merge mMerge;
-            CSVDoc::ViewManager* mViewManager;
-            std::filesystem::path mFileToLoad;
-            Files::PathContainer mDataDirs;
-            std::string mEncodingName;
-
-            boost::program_options::variables_map readConfiguration();
-            ///< Calls mCfgMgr.readConfiguration; should be used before initialization of mSettingsState as it depends on the configuration.
-            std::pair<Files::PathContainer, std::vector<std::string> > readConfig(bool quiet=false);
-            ///< \return data paths
-
-            // not implemented
-            Editor (const Editor&);
-            Editor& operator= (const Editor&);
-
-        public:
-
-            Editor (int argc, char **argv);
-            ~Editor ();
-
-            bool makeIPCServer();
-            void connectToIPCServer();
-
-            int run();
-            ///< \return error status
-
-        private slots:
-
-            void createGame();
-            void createAddon();
-            void cancelCreateGame();
-            void cancelFileDialog();
-
-            void loadDocument();
-            void openFiles (const std::filesystem::path &path, const std::vector<std::filesystem::path> &discoveredFiles = {});
-            void createNewFile (const std::filesystem::path& path);
-            void createNewGame (const std::filesystem::path& file);
-
-            void showStartup();
-
-            void showSettings();
-
-            void documentAdded (CSMDoc::Document *document);
-
-            void documentAboutToBeRemoved (CSMDoc::Document *document);
-
-            void lastDocumentDeleted();
-
-            void mergeDocument (CSMDoc::Document *document);
-
-        private:
-
-            QString mIpcServerName;
-            QLocalServer *mServer;
-            QLocalSocket *mClientSocket;
+        Q_OBJECT
+
+        Files::ConfigurationManager mCfgMgr;
+        boost::program_options::variables_map mConfigVariables;
+        CSMPrefs::State mSettingsState;
+        CSMDoc::DocumentManager mDocumentManager;
+        CSVDoc::StartupDialogue mStartup;
+        CSVDoc::NewGameDialogue mNewGame;
+        CSVPrefs::Dialogue mSettings;
+        CSVDoc::FileDialog mFileDialog;
+        std::filesystem::path mLocal;
+        std::filesystem::path mResources;
+        std::filesystem::path mPid;
+        boost::interprocess::file_lock mLock;
+        std::ofstream mPidFile;
+        bool mFsStrict;
+        CSVTools::Merge mMerge;
+        CSVDoc::ViewManager* mViewManager;
+        std::filesystem::path mFileToLoad;
+        Files::PathContainer mDataDirs;
+        std::string mEncodingName;
+
+        boost::program_options::variables_map readConfiguration();
+        ///< Calls mCfgMgr.readConfiguration; should be used before initialization of mSettingsState as it depends on
+        ///< the configuration.
+        std::pair<Files::PathContainer, std::vector<std::string>> readConfig(bool quiet = false);
+        ///< \return data paths
+
+        // not implemented
+        Editor(const Editor&);
+        Editor& operator=(const Editor&);
+
+    public:
+        Editor(int argc, char** argv);
+        ~Editor();
+
+        bool makeIPCServer();
+        void connectToIPCServer();
+
+        int run();
+        ///< \return error status
+
+    private slots:
+
+        void createGame();
+        void createAddon();
+        void cancelCreateGame();
+        void cancelFileDialog();
+
+        void loadDocument();
+        void openFiles(
+            const std::filesystem::path& path, const std::vector<std::filesystem::path>& discoveredFiles = {});
+        void createNewFile(const std::filesystem::path& path);
+        void createNewGame(const std::filesystem::path& file);
+
+        void showStartup();
+
+        void showSettings();
+
+        void documentAdded(CSMDoc::Document* document);
+
+        void documentAboutToBeRemoved(CSMDoc::Document* document);
+
+        void lastDocumentDeleted();
+
+        void mergeDocument(CSMDoc::Document* document);
+
+    private:
+        QString mIpcServerName;
+        QLocalServer* mServer;
+        QLocalSocket* mClientSocket;
     };
 }
 
diff --git a/apps/opencs/main.cpp b/apps/opencs/main.cpp
index e46a46a34e..cb843eb5c9 100644
--- a/apps/opencs/main.cpp
+++ b/apps/opencs/main.cpp
@@ -16,32 +16,33 @@
 #include <QDir>
 #endif
 
-Q_DECLARE_METATYPE (std::string)
+Q_DECLARE_METATYPE(std::string)
 
 class Application : public QApplication
 {
-    private:
-
-        bool notify (QObject *receiver, QEvent *event) override
+private:
+    bool notify(QObject* receiver, QEvent* event) override
+    {
+        try
+        {
+            return QApplication::notify(receiver, event);
+        }
+        catch (const std::exception& exception)
         {
-            try
-            {
-                return QApplication::notify (receiver, event);
-            }
-            catch (const std::exception& exception)
-            {
-                Log(Debug::Error) << "An exception has been caught: " << exception.what();
-            }
-
-            return false;
+            Log(Debug::Error) << "An exception has been caught: " << exception.what();
         }
 
-    public:
+        return false;
+    }
 
-        Application (int& argc, char *argv[]) : QApplication (argc, argv) {}
+public:
+    Application(int& argc, char* argv[])
+        : QApplication(argc, argv)
+    {
+    }
 };
 
-int runApplication(int argc, char *argv[])
+int runApplication(int argc, char* argv[])
 {
     Platform::init();
 
@@ -49,27 +50,27 @@ int runApplication(int argc, char *argv[])
     setenv("OSG_GL_TEXTURE_STORAGE", "OFF", 0);
 #endif
 
-    Q_INIT_RESOURCE (resources);
+    Q_INIT_RESOURCE(resources);
 
-    qRegisterMetaType<std::string> ("std::string");
-    qRegisterMetaType<CSMWorld::UniversalId> ("CSMWorld::UniversalId");
-    qRegisterMetaType<CSMDoc::Message> ("CSMDoc::Message");
+    qRegisterMetaType<std::string>("std::string");
+    qRegisterMetaType<CSMWorld::UniversalId>("CSMWorld::UniversalId");
+    qRegisterMetaType<CSMDoc::Message>("CSMDoc::Message");
 
-    Application application (argc, argv);
+    Application application(argc, argv);
 
 #ifdef Q_OS_MAC
     QDir dir(QCoreApplication::applicationDirPath());
     QDir::setCurrent(dir.absolutePath());
 #endif
 
-    application.setWindowIcon (QIcon (":./openmw-cs.png"));
+    application.setWindowIcon(QIcon(":./openmw-cs.png"));
 
     CS::Editor editor(argc, argv);
 #ifdef __linux__
-    setlocale(LC_NUMERIC,"C");
+    setlocale(LC_NUMERIC, "C");
 #endif
 
-    if(!editor.makeIPCServer())
+    if (!editor.makeIPCServer())
     {
         editor.connectToIPCServer();
         return 0;
@@ -78,8 +79,7 @@ int runApplication(int argc, char *argv[])
     return editor.run();
 }
 
-
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 {
     return wrapApplication(&runApplication, argc, argv, "OpenMW-CS", false);
 }
diff --git a/apps/opencs/model/doc/blacklist.cpp b/apps/opencs/model/doc/blacklist.cpp
index cd96618288..174459c3b4 100644
--- a/apps/opencs/model/doc/blacklist.cpp
+++ b/apps/opencs/model/doc/blacklist.cpp
@@ -4,27 +4,25 @@
 
 #include <components/misc/strings/lower.hpp>
 
-bool CSMDoc::Blacklist::isBlacklisted (const CSMWorld::UniversalId& id) const
+bool CSMDoc::Blacklist::isBlacklisted(const CSMWorld::UniversalId& id) const
 {
-    std::map<CSMWorld::UniversalId::Type, std::vector<std::string> >::const_iterator iter =
-        mIds.find (id.getType());
+    std::map<CSMWorld::UniversalId::Type, std::vector<std::string>>::const_iterator iter = mIds.find(id.getType());
 
-    if (iter==mIds.end())
+    if (iter == mIds.end())
         return false;
 
-    return std::binary_search (iter->second.begin(), iter->second.end(),
-        Misc::StringUtils::lowerCase (id.getId()));
+    return std::binary_search(iter->second.begin(), iter->second.end(), Misc::StringUtils::lowerCase(id.getId()));
 }
 
-void CSMDoc::Blacklist::add (CSMWorld::UniversalId::Type type,
-    const std::vector<std::string>& ids)
+void CSMDoc::Blacklist::add(CSMWorld::UniversalId::Type type, const std::vector<std::string>& ids)
 {
     std::vector<std::string>& list = mIds[type];
 
     size_t size = list.size();
 
-    list.resize (size+ids.size());
+    list.resize(size + ids.size());
 
-    std::transform (ids.begin(), ids.end(), list.begin()+size, [](const std::string& s) { return Misc::StringUtils::lowerCase(s); } );
-    std::sort (list.begin(), list.end());
+    std::transform(ids.begin(), ids.end(), list.begin() + size,
+        [](const std::string& s) { return Misc::StringUtils::lowerCase(s); });
+    std::sort(list.begin(), list.end());
 }
diff --git a/apps/opencs/model/doc/blacklist.hpp b/apps/opencs/model/doc/blacklist.hpp
index 9bf7f1d86f..e565aa252b 100644
--- a/apps/opencs/model/doc/blacklist.hpp
+++ b/apps/opencs/model/doc/blacklist.hpp
@@ -2,8 +2,8 @@
 #define CSM_DOC_BLACKLIST_H
 
 #include <map>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "../world/universalid.hpp"
 
@@ -12,13 +12,12 @@ namespace CSMDoc
     /// \brief ID blacklist sorted by UniversalId type
     class Blacklist
     {
-            std::map<CSMWorld::UniversalId::Type, std::vector<std::string> > mIds;
-
-        public:
+        std::map<CSMWorld::UniversalId::Type, std::vector<std::string>> mIds;
 
-            bool isBlacklisted (const CSMWorld::UniversalId& id) const;
+    public:
+        bool isBlacklisted(const CSMWorld::UniversalId& id) const;
 
-            void add (CSMWorld::UniversalId::Type type, const std::vector<std::string>& ids);
+        void add(CSMWorld::UniversalId::Type type, const std::vector<std::string>& ids);
     };
 }
 
diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index fc076bcfaa..27cb56e94f 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -3,8 +3,8 @@
 #include "state.hpp"
 
 #include <cassert>
-#include <memory>
 #include <filesystem>
+#include <memory>
 #include <utility>
 
 #include "../world/defaultgmsts.hpp"
@@ -18,142 +18,140 @@
 
 void CSMDoc::Document::addGmsts()
 {
-    for (size_t i=0; i < CSMWorld::DefaultGmsts::FloatCount; ++i)
+    for (size_t i = 0; i < CSMWorld::DefaultGmsts::FloatCount; ++i)
     {
         ESM::GameSetting gmst;
         gmst.mId = CSMWorld::DefaultGmsts::Floats[i];
-        gmst.mValue.setType (ESM::VT_Float);
+        gmst.mValue.setType(ESM::VT_Float);
         gmst.mRecordFlags = 0;
-        gmst.mValue.setFloat (CSMWorld::DefaultGmsts::FloatsDefaultValues[i]);
-        getData().getGmsts().add (gmst);
+        gmst.mValue.setFloat(CSMWorld::DefaultGmsts::FloatsDefaultValues[i]);
+        getData().getGmsts().add(gmst);
     }
 
-    for (size_t i=0; i < CSMWorld::DefaultGmsts::IntCount; ++i)
+    for (size_t i = 0; i < CSMWorld::DefaultGmsts::IntCount; ++i)
     {
         ESM::GameSetting gmst;
         gmst.mId = CSMWorld::DefaultGmsts::Ints[i];
-        gmst.mValue.setType (ESM::VT_Int);
+        gmst.mValue.setType(ESM::VT_Int);
         gmst.mRecordFlags = 0;
-        gmst.mValue.setInteger (CSMWorld::DefaultGmsts::IntsDefaultValues[i]);
-        getData().getGmsts().add (gmst);
+        gmst.mValue.setInteger(CSMWorld::DefaultGmsts::IntsDefaultValues[i]);
+        getData().getGmsts().add(gmst);
     }
 
-    for (size_t i=0; i < CSMWorld::DefaultGmsts::StringCount; ++i)
+    for (size_t i = 0; i < CSMWorld::DefaultGmsts::StringCount; ++i)
     {
         ESM::GameSetting gmst;
         gmst.mId = CSMWorld::DefaultGmsts::Strings[i];
-        gmst.mValue.setType (ESM::VT_String);
+        gmst.mValue.setType(ESM::VT_String);
         gmst.mRecordFlags = 0;
-        gmst.mValue.setString ("");
-        getData().getGmsts().add (gmst);
+        gmst.mValue.setString("");
+        getData().getGmsts().add(gmst);
     }
 }
 
 void CSMDoc::Document::addOptionalGmsts()
 {
-    for (size_t i=0; i < CSMWorld::DefaultGmsts::OptionalFloatCount; ++i)
+    for (size_t i = 0; i < CSMWorld::DefaultGmsts::OptionalFloatCount; ++i)
     {
         ESM::GameSetting gmst;
         gmst.mId = CSMWorld::DefaultGmsts::OptionalFloats[i];
         gmst.blank();
-        gmst.mValue.setType (ESM::VT_Float);
-        addOptionalGmst (gmst);
+        gmst.mValue.setType(ESM::VT_Float);
+        addOptionalGmst(gmst);
     }
 
-    for (size_t i=0; i < CSMWorld::DefaultGmsts::OptionalIntCount; ++i)
+    for (size_t i = 0; i < CSMWorld::DefaultGmsts::OptionalIntCount; ++i)
     {
         ESM::GameSetting gmst;
         gmst.mId = CSMWorld::DefaultGmsts::OptionalInts[i];
         gmst.blank();
-        gmst.mValue.setType (ESM::VT_Int);
-        addOptionalGmst (gmst);
+        gmst.mValue.setType(ESM::VT_Int);
+        addOptionalGmst(gmst);
     }
 
-    for (size_t i=0; i < CSMWorld::DefaultGmsts::OptionalStringCount; ++i)
+    for (size_t i = 0; i < CSMWorld::DefaultGmsts::OptionalStringCount; ++i)
     {
         ESM::GameSetting gmst;
         gmst.mId = CSMWorld::DefaultGmsts::OptionalStrings[i];
         gmst.blank();
-        gmst.mValue.setType (ESM::VT_String);
-        gmst.mValue.setString ("<no text>");
-        addOptionalGmst (gmst);
+        gmst.mValue.setType(ESM::VT_String);
+        gmst.mValue.setString("<no text>");
+        addOptionalGmst(gmst);
     }
 }
 
 void CSMDoc::Document::addOptionalGlobals()
 {
-    static const char *sGlobals[] =
-    {
+    static const char* sGlobals[] = {
         "DaysPassed",
         "PCWerewolf",
         "PCYear",
         nullptr,
     };
 
-    for (int i=0; sGlobals[i]; ++i)
+    for (int i = 0; sGlobals[i]; ++i)
     {
         ESM::Global global;
         global.mId = sGlobals[i];
         global.blank();
-        global.mValue.setType (ESM::VT_Long);
+        global.mValue.setType(ESM::VT_Long);
 
-        if (i==0)
-            global.mValue.setInteger (1); // dayspassed starts counting at 1
+        if (i == 0)
+            global.mValue.setInteger(1); // dayspassed starts counting at 1
 
-        addOptionalGlobal (global);
+        addOptionalGlobal(global);
     }
 }
 
 void CSMDoc::Document::addOptionalMagicEffects()
 {
-    for (int i=ESM::MagicEffect::SummonFabricant; i<=ESM::MagicEffect::SummonCreature05; ++i)
+    for (int i = ESM::MagicEffect::SummonFabricant; i <= ESM::MagicEffect::SummonCreature05; ++i)
     {
         ESM::MagicEffect effect;
         effect.mIndex = i;
-        effect.mId = ESM::MagicEffect::indexToId (i);
+        effect.mId = ESM::MagicEffect::indexToId(i);
         effect.blank();
 
-        addOptionalMagicEffect (effect);
+        addOptionalMagicEffect(effect);
     }
 }
 
-void CSMDoc::Document::addOptionalGmst (const ESM::GameSetting& gmst)
+void CSMDoc::Document::addOptionalGmst(const ESM::GameSetting& gmst)
 {
-    if (getData().getGmsts().searchId (gmst.mId)==-1)
+    if (getData().getGmsts().searchId(gmst.mId) == -1)
     {
         auto record = std::make_unique<CSMWorld::Record<ESM::GameSetting>>();
         record->mBase = gmst;
         record->mState = CSMWorld::RecordBase::State_BaseOnly;
-        getData().getGmsts().appendRecord (std::move(record));
+        getData().getGmsts().appendRecord(std::move(record));
     }
 }
 
-void CSMDoc::Document::addOptionalGlobal (const ESM::Global& global)
+void CSMDoc::Document::addOptionalGlobal(const ESM::Global& global)
 {
-    if (getData().getGlobals().searchId (global.mId)==-1)
+    if (getData().getGlobals().searchId(global.mId) == -1)
     {
         auto record = std::make_unique<CSMWorld::Record<ESM::Global>>();
         record->mBase = global;
         record->mState = CSMWorld::RecordBase::State_BaseOnly;
-        getData().getGlobals().appendRecord (std::move(record));
+        getData().getGlobals().appendRecord(std::move(record));
     }
 }
 
-void CSMDoc::Document::addOptionalMagicEffect (const ESM::MagicEffect& magicEffect)
+void CSMDoc::Document::addOptionalMagicEffect(const ESM::MagicEffect& magicEffect)
 {
-    if (getData().getMagicEffects().searchId (magicEffect.mId)==-1)
+    if (getData().getMagicEffects().searchId(magicEffect.mId) == -1)
     {
         auto record = std::make_unique<CSMWorld::Record<ESM::MagicEffect>>();
         record->mBase = magicEffect;
         record->mState = CSMWorld::RecordBase::State_BaseOnly;
-        getData().getMagicEffects().appendRecord (std::move(record));
+        getData().getMagicEffects().appendRecord(std::move(record));
     }
 }
 
 void CSMDoc::Document::createBase()
 {
-    static const char *sGlobals[] =
-    {
+    static const char* sGlobals[] = {
         "Day",
         "DaysPassed",
         "GameHour",
@@ -165,33 +163,32 @@ void CSMDoc::Document::createBase()
         nullptr,
     };
 
-    for (int i=0; sGlobals[i]; ++i)
+    for (int i = 0; sGlobals[i]; ++i)
     {
         ESM::Global record;
         record.mId = sGlobals[i];
         record.mRecordFlags = 0;
-        record.mValue.setType (i==2 ? ESM::VT_Float : ESM::VT_Long);
+        record.mValue.setType(i == 2 ? ESM::VT_Float : ESM::VT_Long);
 
-        if (i==0 || i==1)
-            record.mValue.setInteger (1);
+        if (i == 0 || i == 1)
+            record.mValue.setInteger(1);
 
-        getData().getGlobals().add (record);
+        getData().getGlobals().add(record);
     }
 
     addGmsts();
 
-    for (int i=0; i<27; ++i)
+    for (int i = 0; i < 27; ++i)
     {
         ESM::Skill record;
         record.mIndex = i;
-        record.mId = ESM::Skill::indexToId (record.mIndex);
+        record.mId = ESM::Skill::indexToId(record.mIndex);
         record.blank();
 
-        getData().getSkills().add (record);
+        getData().getSkills().add(record);
     }
 
-    static const char *sVoice[] =
-    {
+    static const char* sVoice[] = {
         "Intruder",
         "Attack",
         "Hello",
@@ -203,18 +200,17 @@ void CSMDoc::Document::createBase()
         nullptr,
     };
 
-    for (int i=0; sVoice[i]; ++i)
+    for (int i = 0; sVoice[i]; ++i)
     {
         ESM::Dialogue record;
         record.mId = sVoice[i];
         record.mType = ESM::Dialogue::Voice;
         record.blank();
 
-        getData().getTopics().add (record);
+        getData().getTopics().add(record);
     }
 
-    static const char *sGreetings[] =
-    {
+    static const char* sGreetings[] = {
         "Greeting 0",
         "Greeting 1",
         "Greeting 2",
@@ -228,18 +224,17 @@ void CSMDoc::Document::createBase()
         nullptr,
     };
 
-    for (int i=0; sGreetings[i]; ++i)
+    for (int i = 0; sGreetings[i]; ++i)
     {
         ESM::Dialogue record;
         record.mId = sGreetings[i];
         record.mType = ESM::Dialogue::Greeting;
         record.blank();
 
-        getData().getTopics().add (record);
+        getData().getTopics().add(record);
     }
 
-    static const char *sPersuasion[] =
-    {
+    static const char* sPersuasion[] = {
         "Intimidate Success",
         "Intimidate Fail",
         "Service Refusal",
@@ -253,47 +248,50 @@ void CSMDoc::Document::createBase()
         nullptr,
     };
 
-    for (int i=0; sPersuasion[i]; ++i)
+    for (int i = 0; sPersuasion[i]; ++i)
     {
         ESM::Dialogue record;
         record.mId = sPersuasion[i];
         record.mType = ESM::Dialogue::Persuasion;
         record.blank();
 
-        getData().getTopics().add (record);
+        getData().getTopics().add(record);
     }
 
-    for (int i=0; i<ESM::MagicEffect::Length; ++i)
+    for (int i = 0; i < ESM::MagicEffect::Length; ++i)
     {
         ESM::MagicEffect record;
 
         record.mIndex = i;
-        record.mId = ESM::MagicEffect::indexToId (i);
+        record.mId = ESM::MagicEffect::indexToId(i);
 
         record.blank();
 
-        getData().getMagicEffects().add (record);
+        getData().getMagicEffects().add(record);
     }
 }
 
-CSMDoc::Document::Document (const Files::ConfigurationManager& configuration,
-    std::vector< std::filesystem::path >  files,bool new_,
-    const std::filesystem::path& savePath, const std::filesystem::path& resDir,
-    ToUTF8::FromType encoding, const std::vector<std::string>& blacklistedScripts,
-    bool fsStrict, const Files::PathContainer& dataPaths, const std::vector<std::string>& archives)
-: mSavePath (savePath), mContentFiles (std::move(files)), mNew (new_), mData (encoding, fsStrict, dataPaths, archives, resDir),
-  mTools (*this, encoding),
-  mProjectPath ((configuration.getUserDataPath() / "projects") /
-  (savePath.filename().u8string() + u8".project")),
-  mSavingOperation (*this, mProjectPath, encoding),
-  mSaving (&mSavingOperation),
-  mResDir(resDir), mRunner (mProjectPath),
-  mDirty (false), mIdCompletionManager(mData)
+CSMDoc::Document::Document(const Files::ConfigurationManager& configuration, std::vector<std::filesystem::path> files,
+    bool new_, const std::filesystem::path& savePath, const std::filesystem::path& resDir, ToUTF8::FromType encoding,
+    const std::vector<std::string>& blacklistedScripts, bool fsStrict, const Files::PathContainer& dataPaths,
+    const std::vector<std::string>& archives)
+    : mSavePath(savePath)
+    , mContentFiles(std::move(files))
+    , mNew(new_)
+    , mData(encoding, fsStrict, dataPaths, archives, resDir)
+    , mTools(*this, encoding)
+    , mProjectPath((configuration.getUserDataPath() / "projects") / (savePath.filename().u8string() + u8".project"))
+    , mSavingOperation(*this, mProjectPath, encoding)
+    , mSaving(&mSavingOperation)
+    , mResDir(resDir)
+    , mRunner(mProjectPath)
+    , mDirty(false)
+    , mIdCompletionManager(mData)
 {
     if (mContentFiles.empty())
-        throw std::runtime_error ("Empty content file sequence");
+        throw std::runtime_error("Empty content file sequence");
 
-    if (mNew || !std::filesystem::exists (mProjectPath))
+    if (mNew || !std::filesystem::exists(mProjectPath))
     {
         auto filtersPath = configuration.getUserDataPath() / "defaultfilters";
 
@@ -302,7 +300,7 @@ CSMDoc::Document::Document (const Files::ConfigurationManager& configuration,
             throw std::runtime_error("Can not create project file: " + Files::pathToUnicodeString(mProjectPath));
         destination.exceptions(std::ios::failbit | std::ios::badbit);
 
-        if (!std::filesystem::exists (filtersPath))
+        if (!std::filesystem::exists(filtersPath))
             filtersPath = mResDir / "defaultfilters";
 
         std::ifstream source(filtersPath, std::ios::in | std::ios::binary);
@@ -315,35 +313,32 @@ CSMDoc::Document::Document (const Files::ConfigurationManager& configuration,
 
     if (mNew)
     {
-        if (mContentFiles.size()==1)
+        if (mContentFiles.size() == 1)
             createBase();
     }
 
-    mBlacklist.add (CSMWorld::UniversalId::Type_Script, blacklistedScripts);
+    mBlacklist.add(CSMWorld::UniversalId::Type_Script, blacklistedScripts);
 
     addOptionalGmsts();
     addOptionalGlobals();
     addOptionalMagicEffects();
 
-    connect (&mUndoStack, &QUndoStack::cleanChanged, this, &Document::modificationStateChanged);
+    connect(&mUndoStack, &QUndoStack::cleanChanged, this, &Document::modificationStateChanged);
 
-    connect (&mTools, &CSMTools::Tools::progress, this, qOverload<int, int, int>(&Document::progress));
-    connect (&mTools, &CSMTools::Tools::done, this, &Document::operationDone);
-    connect (&mTools, &CSMTools::Tools::done, this, &Document::operationDone2);
-    connect (&mTools, &CSMTools::Tools::mergeDone, this, &Document::mergeDone);
+    connect(&mTools, &CSMTools::Tools::progress, this, qOverload<int, int, int>(&Document::progress));
+    connect(&mTools, &CSMTools::Tools::done, this, &Document::operationDone);
+    connect(&mTools, &CSMTools::Tools::done, this, &Document::operationDone2);
+    connect(&mTools, &CSMTools::Tools::mergeDone, this, &Document::mergeDone);
 
-    connect (&mSaving, &OperationHolder::progress,
-        this, qOverload<int, int, int>(&Document::progress));
-    connect (&mSaving, &OperationHolder::done, this, &Document::operationDone2);
+    connect(&mSaving, &OperationHolder::progress, this, qOverload<int, int, int>(&Document::progress));
+    connect(&mSaving, &OperationHolder::done, this, &Document::operationDone2);
 
-    connect (&mSaving, &OperationHolder::reportMessage, this, &Document::reportMessage);
+    connect(&mSaving, &OperationHolder::reportMessage, this, &Document::reportMessage);
 
-    connect (&mRunner, &Runner::runStateChanged, this, &Document::runStateChanged);
+    connect(&mRunner, &Runner::runStateChanged, this, &Document::runStateChanged);
 }
 
-CSMDoc::Document::~Document()
-{
-}
+CSMDoc::Document::~Document() {}
 
 QUndoStack& CSMDoc::Document::getUndoStack()
 {
@@ -397,64 +392,62 @@ bool CSMDoc::Document::isNew() const
 void CSMDoc::Document::save()
 {
     if (mSaving.isRunning())
-        throw std::logic_error (
-            "Failed to initiate save, because a save operation is already running.");
+        throw std::logic_error("Failed to initiate save, because a save operation is already running.");
 
     mSaving.start();
 
-    emit stateChanged (getState(), this);
+    emit stateChanged(getState(), this);
 }
 
-CSMWorld::UniversalId CSMDoc::Document::verify (const CSMWorld::UniversalId& reportId)
+CSMWorld::UniversalId CSMDoc::Document::verify(const CSMWorld::UniversalId& reportId)
 {
-    CSMWorld::UniversalId id = mTools.runVerifier (reportId);
-    emit stateChanged (getState(), this);
+    CSMWorld::UniversalId id = mTools.runVerifier(reportId);
+    emit stateChanged(getState(), this);
     return id;
 }
 
-
 CSMWorld::UniversalId CSMDoc::Document::newSearch()
 {
     return mTools.newSearch();
 }
 
-void CSMDoc::Document::runSearch (const CSMWorld::UniversalId& searchId, const CSMTools::Search& search)
+void CSMDoc::Document::runSearch(const CSMWorld::UniversalId& searchId, const CSMTools::Search& search)
 {
-    mTools.runSearch (searchId, search);
-    emit stateChanged (getState(), this);
+    mTools.runSearch(searchId, search);
+    emit stateChanged(getState(), this);
 }
 
-void CSMDoc::Document::runMerge (std::unique_ptr<CSMDoc::Document> target)
+void CSMDoc::Document::runMerge(std::unique_ptr<CSMDoc::Document> target)
 {
-    mTools.runMerge (std::move(target));
-    emit stateChanged (getState(), this);
+    mTools.runMerge(std::move(target));
+    emit stateChanged(getState(), this);
 }
 
-void CSMDoc::Document::abortOperation (int type)
+void CSMDoc::Document::abortOperation(int type)
 {
-    if (type==State_Saving)
+    if (type == State_Saving)
         mSaving.abort();
     else
-        mTools.abortOperation (type);
+        mTools.abortOperation(type);
 }
 
-void CSMDoc::Document::modificationStateChanged (bool clean)
+void CSMDoc::Document::modificationStateChanged(bool clean)
 {
-    emit stateChanged (getState(), this);
+    emit stateChanged(getState(), this);
 }
 
-void CSMDoc::Document::reportMessage (const CSMDoc::Message& message, int type)
+void CSMDoc::Document::reportMessage(const CSMDoc::Message& message, int type)
 {
     /// \todo find a better way to get these messages to the user.
     Log(Debug::Info) << message.mMessage;
 }
 
-void CSMDoc::Document::operationDone2 (int type, bool failed)
+void CSMDoc::Document::operationDone2(int type, bool failed)
 {
-    if (type==CSMDoc::State_Saving && !failed)
+    if (type == CSMDoc::State_Saving && !failed)
         mDirty = false;
 
-    emit stateChanged (getState(), this);
+    emit stateChanged(getState(), this);
 }
 
 const CSMWorld::Data& CSMDoc::Document::getData() const
@@ -467,37 +460,35 @@ CSMWorld::Data& CSMDoc::Document::getData()
     return mData;
 }
 
-CSMTools::ReportModel *CSMDoc::Document::getReport (const CSMWorld::UniversalId& id)
+CSMTools::ReportModel* CSMDoc::Document::getReport(const CSMWorld::UniversalId& id)
 {
-    return mTools.getReport (id);
+    return mTools.getReport(id);
 }
 
-bool CSMDoc::Document::isBlacklisted (const CSMWorld::UniversalId& id)
-    const
+bool CSMDoc::Document::isBlacklisted(const CSMWorld::UniversalId& id) const
 {
-    return mBlacklist.isBlacklisted (id);
+    return mBlacklist.isBlacklisted(id);
 }
 
-void CSMDoc::Document::startRunning (const std::string& profile,
-    const std::string& startupInstruction)
+void CSMDoc::Document::startRunning(const std::string& profile, const std::string& startupInstruction)
 {
     std::vector<std::filesystem::path> contentFiles;
 
-    for (const auto & mContentFile : mContentFiles) {
+    for (const auto& mContentFile : mContentFiles)
+    {
         contentFiles.emplace_back(mContentFile.filename());
     }
 
-    mRunner.configure (getData().getDebugProfiles().getRecord (profile).get(), contentFiles,
-        startupInstruction);
+    mRunner.configure(getData().getDebugProfiles().getRecord(profile).get(), contentFiles, startupInstruction);
 
     int state = getState();
 
     if (state & State_Modified)
     {
         // need to save first
-        mRunner.start (true);
+        mRunner.start(true);
 
-        new SaveWatcher (&mRunner, &mSaving); // no, that is not a memory leak. Qt is weird.
+        new SaveWatcher(&mRunner, &mSaving); // no, that is not a memory leak. Qt is weird.
 
         if (!(state & State_Saving))
             save();
@@ -511,22 +502,22 @@ void CSMDoc::Document::stopRunning()
     mRunner.stop();
 }
 
-QTextDocument *CSMDoc::Document::getRunLog()
+QTextDocument* CSMDoc::Document::getRunLog()
 {
     return mRunner.getLog();
 }
 
 void CSMDoc::Document::runStateChanged()
 {
-    emit stateChanged (getState(), this);
+    emit stateChanged(getState(), this);
 }
 
-void CSMDoc::Document::progress (int current, int max, int type)
+void CSMDoc::Document::progress(int current, int max, int type)
 {
-    emit progress (current, max, type, 1, this);
+    emit progress(current, max, type, 1, this);
 }
 
-CSMWorld::IdCompletionManager &CSMDoc::Document::getIdCompletionManager()
+CSMWorld::IdCompletionManager& CSMDoc::Document::getIdCompletionManager()
 {
     return mIdCompletionManager;
 }
diff --git a/apps/opencs/model/doc/document.hpp b/apps/opencs/model/doc/document.hpp
index a012a7dc5a..942decb7b6 100644
--- a/apps/opencs/model/doc/document.hpp
+++ b/apps/opencs/model/doc/document.hpp
@@ -3,8 +3,8 @@
 
 #include <string>
 
-#include <QUndoStack>
 #include <QObject>
+#include <QUndoStack>
 
 #include <components/files/multidircollection.hpp>
 #include <components/to_utf8/to_utf8.hpp>
@@ -14,10 +14,10 @@
 
 #include "../tools/tools.hpp"
 
-#include "saving.hpp"
 #include "blacklist.hpp"
-#include "runner.hpp"
 #include "operationholder.hpp"
+#include "runner.hpp"
+#include "saving.hpp"
 
 class QAbstractItemModel;
 
@@ -52,133 +52,130 @@ namespace CSMDoc
 {
     class Document : public QObject
     {
-            Q_OBJECT
-
-        private:
-
-            std::filesystem::path mSavePath;
-            std::vector<std::filesystem::path> mContentFiles;
-            bool mNew;
-            CSMWorld::Data mData;
-            CSMTools::Tools mTools;
-            std::filesystem::path mProjectPath;
-            Saving mSavingOperation;
-            OperationHolder mSaving;
-            std::filesystem::path mResDir;
-            Blacklist mBlacklist;
-            Runner mRunner;
-            bool mDirty;
+        Q_OBJECT
 
-            CSMWorld::IdCompletionManager mIdCompletionManager;
+    private:
+        std::filesystem::path mSavePath;
+        std::vector<std::filesystem::path> mContentFiles;
+        bool mNew;
+        CSMWorld::Data mData;
+        CSMTools::Tools mTools;
+        std::filesystem::path mProjectPath;
+        Saving mSavingOperation;
+        OperationHolder mSaving;
+        std::filesystem::path mResDir;
+        Blacklist mBlacklist;
+        Runner mRunner;
+        bool mDirty;
 
-            // It is important that the undo stack is declared last, because on desctruction it fires a signal, that is connected to a slot, that is
-            // using other member variables.  Unfortunately this connection is cut only in the QObject destructor, which is way too late.
-            QUndoStack mUndoStack;
+        CSMWorld::IdCompletionManager mIdCompletionManager;
 
-            // not implemented
-            Document (const Document&);
-            Document& operator= (const Document&);
+        // It is important that the undo stack is declared last, because on desctruction it fires a signal, that is
+        // connected to a slot, that is using other member variables.  Unfortunately this connection is cut only in the
+        // QObject destructor, which is way too late.
+        QUndoStack mUndoStack;
 
-            void createBase();
+        // not implemented
+        Document(const Document&);
+        Document& operator=(const Document&);
 
-            void addGmsts();
+        void createBase();
 
-            void addOptionalGmsts();
+        void addGmsts();
 
-            void addOptionalGlobals();
+        void addOptionalGmsts();
 
-            void addOptionalMagicEffects();
+        void addOptionalGlobals();
 
-            void addOptionalGmst (const ESM::GameSetting& gmst);
+        void addOptionalMagicEffects();
 
-            void addOptionalGlobal (const ESM::Global& global);
+        void addOptionalGmst(const ESM::GameSetting& gmst);
 
-            void addOptionalMagicEffect (const ESM::MagicEffect& effect);
+        void addOptionalGlobal(const ESM::Global& global);
 
-        public:
+        void addOptionalMagicEffect(const ESM::MagicEffect& effect);
 
-            Document (const Files::ConfigurationManager& configuration,
-                std::vector< std::filesystem::path >  files, bool new_,
-                const std::filesystem::path& savePath, const std::filesystem::path& resDir,
-                ToUTF8::FromType encoding, const std::vector<std::string>& blacklistedScripts,
-                bool fsStrict, const Files::PathContainer& dataPaths, const std::vector<std::string>& archives);
+    public:
+        Document(const Files::ConfigurationManager& configuration, std::vector<std::filesystem::path> files, bool new_,
+            const std::filesystem::path& savePath, const std::filesystem::path& resDir, ToUTF8::FromType encoding,
+            const std::vector<std::string>& blacklistedScripts, bool fsStrict, const Files::PathContainer& dataPaths,
+            const std::vector<std::string>& archives);
 
-            ~Document();
+        ~Document();
 
-            QUndoStack& getUndoStack();
+        QUndoStack& getUndoStack();
 
-            int getState() const;
+        int getState() const;
 
-            const std::filesystem::path& getResourceDir() const;
+        const std::filesystem::path& getResourceDir() const;
 
-            const std::filesystem::path& getSavePath() const;
+        const std::filesystem::path& getSavePath() const;
 
-            const std::filesystem::path& getProjectPath() const;
+        const std::filesystem::path& getProjectPath() const;
 
-            const std::vector<std::filesystem::path>& getContentFiles() const;
-            ///< \attention The last element in this collection is the file that is being edited,
-            /// but with its original path instead of the save path.
+        const std::vector<std::filesystem::path>& getContentFiles() const;
+        ///< \attention The last element in this collection is the file that is being edited,
+        /// but with its original path instead of the save path.
 
-            bool isNew() const;
-            ///< Is this a newly created content file?
+        bool isNew() const;
+        ///< Is this a newly created content file?
 
-            void save();
+        void save();
 
-            CSMWorld::UniversalId verify (const CSMWorld::UniversalId& reportId = CSMWorld::UniversalId());
+        CSMWorld::UniversalId verify(const CSMWorld::UniversalId& reportId = CSMWorld::UniversalId());
 
-            CSMWorld::UniversalId newSearch();
+        CSMWorld::UniversalId newSearch();
 
-            void runSearch (const CSMWorld::UniversalId& searchId, const CSMTools::Search& search);
+        void runSearch(const CSMWorld::UniversalId& searchId, const CSMTools::Search& search);
 
-            void runMerge (std::unique_ptr<CSMDoc::Document> target);
+        void runMerge(std::unique_ptr<CSMDoc::Document> target);
 
-            void abortOperation (int type);
+        void abortOperation(int type);
 
-            const CSMWorld::Data& getData() const;
+        const CSMWorld::Data& getData() const;
 
-            CSMWorld::Data& getData();
+        CSMWorld::Data& getData();
 
-            CSMTools::ReportModel *getReport (const CSMWorld::UniversalId& id);
-            ///< The ownership of the returned report is not transferred.
+        CSMTools::ReportModel* getReport(const CSMWorld::UniversalId& id);
+        ///< The ownership of the returned report is not transferred.
 
-            bool isBlacklisted (const CSMWorld::UniversalId& id) const;
+        bool isBlacklisted(const CSMWorld::UniversalId& id) const;
 
-            void startRunning (const std::string& profile,
-                const std::string& startupInstruction = "");
+        void startRunning(const std::string& profile, const std::string& startupInstruction = "");
 
-            void stopRunning();
+        void stopRunning();
 
-            QTextDocument *getRunLog();
+        QTextDocument* getRunLog();
 
-            CSMWorld::IdCompletionManager &getIdCompletionManager();
+        CSMWorld::IdCompletionManager& getIdCompletionManager();
 
-            void flagAsDirty();
+        void flagAsDirty();
 
-        signals:
+    signals:
 
-            void stateChanged (int state, CSMDoc::Document *document);
+        void stateChanged(int state, CSMDoc::Document* document);
 
-            void progress (int current, int max, int type, int threads, CSMDoc::Document *document);
+        void progress(int current, int max, int type, int threads, CSMDoc::Document* document);
 
-            /// \attention When this signal is emitted, *this hands over the ownership of the
-            /// document. This signal must be handled to avoid a leak.
-            void mergeDone (CSMDoc::Document *document);
+        /// \attention When this signal is emitted, *this hands over the ownership of the
+        /// document. This signal must be handled to avoid a leak.
+        void mergeDone(CSMDoc::Document* document);
 
-            void operationDone (int type, bool failed);
+        void operationDone(int type, bool failed);
 
-        private slots:
+    private slots:
 
-            void modificationStateChanged (bool clean);
+        void modificationStateChanged(bool clean);
 
-            void reportMessage (const CSMDoc::Message& message, int type);
+        void reportMessage(const CSMDoc::Message& message, int type);
 
-            void operationDone2 (int type, bool failed);
+        void operationDone2(int type, bool failed);
 
-            void runStateChanged();
+        void runStateChanged();
 
-        public slots:
+    public slots:
 
-            void progress (int current, int max, int type);
+        void progress(int current, int max, int type);
     };
 }
 
diff --git a/apps/opencs/model/doc/documentmanager.cpp b/apps/opencs/model/doc/documentmanager.cpp
index 6e59baff90..b417a3ca8d 100644
--- a/apps/opencs/model/doc/documentmanager.cpp
+++ b/apps/opencs/model/doc/documentmanager.cpp
@@ -8,31 +8,26 @@
 
 #include "document.hpp"
 
-CSMDoc::DocumentManager::DocumentManager (const Files::ConfigurationManager& configuration)
-: mConfiguration (configuration), mEncoding (ToUTF8::WINDOWS_1252), mFsStrict(false)
+CSMDoc::DocumentManager::DocumentManager(const Files::ConfigurationManager& configuration)
+    : mConfiguration(configuration)
+    , mEncoding(ToUTF8::WINDOWS_1252)
+    , mFsStrict(false)
 {
     std::filesystem::path projectPath = configuration.getUserDataPath() / "projects";
 
-    if (!std::filesystem::is_directory (projectPath))
-        std::filesystem::create_directories (projectPath);
+    if (!std::filesystem::is_directory(projectPath))
+        std::filesystem::create_directories(projectPath);
 
-    mLoader.moveToThread (&mLoaderThread);
+    mLoader.moveToThread(&mLoaderThread);
     mLoaderThread.start();
 
-    connect (&mLoader, &Loader::documentLoaded,
-        this, &DocumentManager::documentLoaded);
-    connect (&mLoader, &Loader::documentNotLoaded,
-        this, &DocumentManager::documentNotLoaded);
-    connect (this, &DocumentManager::loadRequest,
-        &mLoader, &Loader::loadDocument);
-    connect (&mLoader, &Loader::nextStage,
-        this, &DocumentManager::nextStage);
-    connect (&mLoader, &Loader::nextRecord,
-        this, &DocumentManager::nextRecord);
-    connect (this, &DocumentManager::cancelLoading,
-        &mLoader, &Loader::abortLoading);
-    connect (&mLoader, &Loader::loadMessage,
-        this, &DocumentManager::loadMessage);
+    connect(&mLoader, &Loader::documentLoaded, this, &DocumentManager::documentLoaded);
+    connect(&mLoader, &Loader::documentNotLoaded, this, &DocumentManager::documentNotLoaded);
+    connect(this, &DocumentManager::loadRequest, &mLoader, &Loader::loadDocument);
+    connect(&mLoader, &Loader::nextStage, this, &DocumentManager::nextStage);
+    connect(&mLoader, &Loader::nextRecord, this, &DocumentManager::nextRecord);
+    connect(this, &DocumentManager::cancelLoading, &mLoader, &Loader::abortLoading);
+    connect(&mLoader, &Loader::loadMessage, this, &DocumentManager::loadMessage);
 }
 
 CSMDoc::DocumentManager::~DocumentManager()
@@ -42,7 +37,7 @@ CSMDoc::DocumentManager::~DocumentManager()
     mLoader.hasThingsToDo().wakeAll();
     mLoaderThread.wait();
 
-    for (std::vector<Document *>::iterator iter (mDocuments.begin()); iter!=mDocuments.end(); ++iter)
+    for (std::vector<Document*>::iterator iter(mDocuments.begin()); iter != mDocuments.end(); ++iter)
         delete *iter;
 }
 
@@ -51,78 +46,78 @@ bool CSMDoc::DocumentManager::isEmpty()
     return mDocuments.empty();
 }
 
-void CSMDoc::DocumentManager::addDocument (const std::vector<std::filesystem::path>& files, const std::filesystem::path& savePath,
-    bool new_)
+void CSMDoc::DocumentManager::addDocument(
+    const std::vector<std::filesystem::path>& files, const std::filesystem::path& savePath, bool new_)
 {
-    Document *document = makeDocument (files, savePath, new_);
-    insertDocument (document);
+    Document* document = makeDocument(files, savePath, new_);
+    insertDocument(document);
 }
 
-CSMDoc::Document *CSMDoc::DocumentManager::makeDocument (
-    const std::vector< std::filesystem::path >& files,
-    const std::filesystem::path& savePath, bool new_)
+CSMDoc::Document* CSMDoc::DocumentManager::makeDocument(
+    const std::vector<std::filesystem::path>& files, const std::filesystem::path& savePath, bool new_)
 {
-    return new Document (mConfiguration, files, new_, savePath, mResDir, mEncoding, mBlacklistedScripts, mFsStrict, mDataPaths, mArchives);
+    return new Document(mConfiguration, files, new_, savePath, mResDir, mEncoding, mBlacklistedScripts, mFsStrict,
+        mDataPaths, mArchives);
 }
 
-void CSMDoc::DocumentManager::insertDocument (CSMDoc::Document *document)
+void CSMDoc::DocumentManager::insertDocument(CSMDoc::Document* document)
 {
-    mDocuments.push_back (document);
+    mDocuments.push_back(document);
 
-    connect (document, SIGNAL (mergeDone (CSMDoc::Document*)),
-        this, SLOT (insertDocument (CSMDoc::Document*)));
+    connect(document, SIGNAL(mergeDone(CSMDoc::Document*)), this, SLOT(insertDocument(CSMDoc::Document*)));
 
-    emit loadRequest (document);
+    emit loadRequest(document);
 
     mLoader.hasThingsToDo().wakeAll();
 }
 
-void CSMDoc::DocumentManager::removeDocument (CSMDoc::Document *document)
+void CSMDoc::DocumentManager::removeDocument(CSMDoc::Document* document)
 {
-    std::vector<Document *>::iterator iter = std::find (mDocuments.begin(), mDocuments.end(), document);
+    std::vector<Document*>::iterator iter = std::find(mDocuments.begin(), mDocuments.end(), document);
 
-    if (iter==mDocuments.end())
-        throw std::runtime_error ("removing invalid document");
+    if (iter == mDocuments.end())
+        throw std::runtime_error("removing invalid document");
 
-    emit documentAboutToBeRemoved (document);
+    emit documentAboutToBeRemoved(document);
 
-    mDocuments.erase (iter);
+    mDocuments.erase(iter);
     document->deleteLater();
 
     if (mDocuments.empty())
         emit lastDocumentDeleted();
 }
 
-void CSMDoc::DocumentManager::setResourceDir (const std::filesystem::path& parResDir)
+void CSMDoc::DocumentManager::setResourceDir(const std::filesystem::path& parResDir)
 {
     mResDir = std::filesystem::absolute(parResDir);
 }
 
-void CSMDoc::DocumentManager::setEncoding (ToUTF8::FromType encoding)
+void CSMDoc::DocumentManager::setEncoding(ToUTF8::FromType encoding)
 {
     mEncoding = encoding;
 }
 
-void CSMDoc::DocumentManager::setBlacklistedScripts (const std::vector<std::string>& scriptIds)
+void CSMDoc::DocumentManager::setBlacklistedScripts(const std::vector<std::string>& scriptIds)
 {
     mBlacklistedScripts = scriptIds;
 }
 
-void CSMDoc::DocumentManager::documentLoaded (Document *document)
+void CSMDoc::DocumentManager::documentLoaded(Document* document)
 {
-    emit documentAdded (document);
-    emit loadingStopped (document, true, "");
+    emit documentAdded(document);
+    emit loadingStopped(document, true, "");
 }
 
-void CSMDoc::DocumentManager::documentNotLoaded (Document *document, const std::string& error)
+void CSMDoc::DocumentManager::documentNotLoaded(Document* document, const std::string& error)
 {
-    emit loadingStopped (document, false, error);
+    emit loadingStopped(document, false, error);
 
     if (error.empty()) // do not remove the document yet, if we have an error
-        removeDocument (document);
+        removeDocument(document);
 }
 
-void CSMDoc::DocumentManager::setFileData(bool strict, const Files::PathContainer& dataPaths, const std::vector<std::string>& archives)
+void CSMDoc::DocumentManager::setFileData(
+    bool strict, const Files::PathContainer& dataPaths, const std::vector<std::string>& archives)
 {
     mFsStrict = strict;
     mDataPaths = dataPaths;
diff --git a/apps/opencs/model/doc/documentmanager.hpp b/apps/opencs/model/doc/documentmanager.hpp
index 4dd5c550bb..6f1d783a20 100644
--- a/apps/opencs/model/doc/documentmanager.hpp
+++ b/apps/opencs/model/doc/documentmanager.hpp
@@ -1,15 +1,15 @@
 #ifndef CSM_DOC_DOCUMENTMGR_H
 #define CSM_DOC_DOCUMENTMGR_H
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <QObject>
 #include <QThread>
 
-#include <components/to_utf8/to_utf8.hpp>
 #include <components/fallback/fallback.hpp>
 #include <components/files/multidircollection.hpp>
+#include <components/to_utf8/to_utf8.hpp>
 
 #include "loader.hpp"
 
@@ -29,94 +29,91 @@ namespace CSMDoc
 
     class DocumentManager : public QObject
     {
-            Q_OBJECT
-
-            std::vector<Document *> mDocuments;
-            const Files::ConfigurationManager& mConfiguration;
-            QThread mLoaderThread;
-            Loader mLoader;
-            ToUTF8::FromType mEncoding;
-            std::vector<std::string> mBlacklistedScripts;
+        Q_OBJECT
 
-            std::filesystem::path mResDir;
+        std::vector<Document*> mDocuments;
+        const Files::ConfigurationManager& mConfiguration;
+        QThread mLoaderThread;
+        Loader mLoader;
+        ToUTF8::FromType mEncoding;
+        std::vector<std::string> mBlacklistedScripts;
 
-            bool mFsStrict;
-            Files::PathContainer mDataPaths;
-            std::vector<std::string> mArchives;
+        std::filesystem::path mResDir;
 
-            DocumentManager (const DocumentManager&);
-            DocumentManager& operator= (const DocumentManager&);
+        bool mFsStrict;
+        Files::PathContainer mDataPaths;
+        std::vector<std::string> mArchives;
 
-        public:
+        DocumentManager(const DocumentManager&);
+        DocumentManager& operator=(const DocumentManager&);
 
-            DocumentManager (const Files::ConfigurationManager& configuration);
+    public:
+        DocumentManager(const Files::ConfigurationManager& configuration);
 
-            ~DocumentManager();
+        ~DocumentManager();
 
-            void addDocument (const std::vector< std::filesystem::path >& files,
-                const std::filesystem::path& savePath, bool new_);
-            ///< \param new_ Do not load the last content file in \a files and instead create in an
-            /// appropriate way.
+        void addDocument(
+            const std::vector<std::filesystem::path>& files, const std::filesystem::path& savePath, bool new_);
+        ///< \param new_ Do not load the last content file in \a files and instead create in an
+        /// appropriate way.
 
-            /// Create a new document. The ownership of the created document is transferred to
-            /// the calling function. The DocumentManager does not manage it. Loading has not
-            /// taken place at the point when the document is returned.
-            ///
-            /// \param new_ Do not load the last content file in \a files and instead create in an
-            /// appropriate way.
-            Document *makeDocument (const std::vector< std::filesystem::path >& files,
-                const std::filesystem::path& savePath, bool new_);
+        /// Create a new document. The ownership of the created document is transferred to
+        /// the calling function. The DocumentManager does not manage it. Loading has not
+        /// taken place at the point when the document is returned.
+        ///
+        /// \param new_ Do not load the last content file in \a files and instead create in an
+        /// appropriate way.
+        Document* makeDocument(
+            const std::vector<std::filesystem::path>& files, const std::filesystem::path& savePath, bool new_);
 
-            void setResourceDir (const std::filesystem::path& parResDir);
+        void setResourceDir(const std::filesystem::path& parResDir);
 
-            void setEncoding (ToUTF8::FromType encoding);
+        void setEncoding(ToUTF8::FromType encoding);
 
-            void setBlacklistedScripts (const std::vector<std::string>& scriptIds);
+        void setBlacklistedScripts(const std::vector<std::string>& scriptIds);
 
-            /// Sets the file data that gets passed to newly created documents.
-            void setFileData(bool strict, const Files::PathContainer& dataPaths, const std::vector<std::string>& archives);
+        /// Sets the file data that gets passed to newly created documents.
+        void setFileData(bool strict, const Files::PathContainer& dataPaths, const std::vector<std::string>& archives);
 
-            bool isEmpty();
+        bool isEmpty();
 
-        private slots:
+    private slots:
 
-            void documentLoaded (Document *document);
-            ///< The ownership of \a document is not transferred.
+        void documentLoaded(Document* document);
+        ///< The ownership of \a document is not transferred.
 
-            void documentNotLoaded (Document *document, const std::string& error);
-            ///< Document load has been interrupted either because of a call to abortLoading
-            /// or a problem during loading). In the former case error will be an empty string.
+        void documentNotLoaded(Document* document, const std::string& error);
+        ///< Document load has been interrupted either because of a call to abortLoading
+        /// or a problem during loading). In the former case error will be an empty string.
 
-        public slots:
+    public slots:
 
-            void removeDocument (CSMDoc::Document *document);
-            ///< Emits the lastDocumentDeleted signal, if applicable.
+        void removeDocument(CSMDoc::Document* document);
+        ///< Emits the lastDocumentDeleted signal, if applicable.
 
-            /// Hand over document to *this. The ownership is transferred. The DocumentManager
-            /// will initiate the load procedure, if necessary
-            void insertDocument (CSMDoc::Document *document);
+        /// Hand over document to *this. The ownership is transferred. The DocumentManager
+        /// will initiate the load procedure, if necessary
+        void insertDocument(CSMDoc::Document* document);
 
-        signals:
+    signals:
 
-            void documentAdded (CSMDoc::Document *document);
+        void documentAdded(CSMDoc::Document* document);
 
-            void documentAboutToBeRemoved (CSMDoc::Document *document);
+        void documentAboutToBeRemoved(CSMDoc::Document* document);
 
-            void loadRequest (CSMDoc::Document *document);
+        void loadRequest(CSMDoc::Document* document);
 
-            void lastDocumentDeleted();
+        void lastDocumentDeleted();
 
-            void loadingStopped (CSMDoc::Document *document, bool completed,
-                const std::string& error);
+        void loadingStopped(CSMDoc::Document* document, bool completed, const std::string& error);
 
-            void nextStage (CSMDoc::Document *document, const std::string& name,
-                int totalRecords);
+        void nextStage(CSMDoc::Document* document, const std::string& name, int totalRecords);
 
-            void nextRecord (CSMDoc::Document *document, int records);
+        void nextRecord(CSMDoc::Document* document, int records);
 
-            void cancelLoading (CSMDoc::Document *document);
+        void cancelLoading(CSMDoc::Document* document);
 
-            void loadMessage (CSMDoc::Document *document, const std::string& message);
+        void loadMessage(CSMDoc::Document* document, const std::string& message);
     };
 }
 
diff --git a/apps/opencs/model/doc/loader.cpp b/apps/opencs/model/doc/loader.cpp
index a851707811..8a84a827b0 100644
--- a/apps/opencs/model/doc/loader.cpp
+++ b/apps/opencs/model/doc/loader.cpp
@@ -8,15 +8,19 @@
 
 #include "document.hpp"
 
-CSMDoc::Loader::Stage::Stage() : mFile (0), mRecordsLoaded (0), mRecordsLeft (false) {}
-
+CSMDoc::Loader::Stage::Stage()
+    : mFile(0)
+    , mRecordsLoaded(0)
+    , mRecordsLeft(false)
+{
+}
 
 CSMDoc::Loader::Loader()
     : mShouldStop(false)
 {
-    mTimer = new QTimer (this);
+    mTimer = new QTimer(this);
 
-    connect (mTimer, &QTimer::timeout, this, &Loader::load);
+    connect(mTimer, &QTimer::timeout, this, &Loader::load);
     mTimer->start();
 }
 
@@ -35,7 +39,7 @@ void CSMDoc::Loader::load()
     if (mDocuments.empty())
     {
         mMutex.lock();
-        mThingsToDo.wait (&mMutex);
+        mThingsToDo.wait(&mMutex);
         mMutex.unlock();
 
         if (mShouldStop)
@@ -44,12 +48,12 @@ void CSMDoc::Loader::load()
         return;
     }
 
-    std::vector<std::pair<Document *, Stage> >::iterator iter = mDocuments.begin();
+    std::vector<std::pair<Document*, Stage>>::iterator iter = mDocuments.begin();
 
-    Document *document = iter->first;
+    Document* document = iter->first;
 
-    int size = static_cast<int> (document->getContentFiles().size());
-    int editedIndex = size-1; // index of the file to be edited/created
+    int size = static_cast<int>(document->getContentFiles().size());
+    int editedIndex = size - 1; // index of the file to be edited/created
 
     if (document->isNew())
         --size;
@@ -60,10 +64,10 @@ void CSMDoc::Loader::load()
     {
         if (iter->second.mRecordsLeft)
         {
-            Messages messages (Message::Severity_Error);
+            Messages messages(Message::Severity_Error);
             const int batchingSize = 50;
-            for (int i=0; i<batchingSize; ++i) // do not flood the system with update signals
-                if (document->getData().continueLoading (messages))
+            for (int i = 0; i < batchingSize; ++i) // do not flood the system with update signals
+                if (document->getData().continueLoading(messages))
                 {
                     iter->second.mRecordsLeft = false;
                     break;
@@ -71,39 +75,39 @@ void CSMDoc::Loader::load()
                 else
                     ++(iter->second.mRecordsLoaded);
 
-            CSMWorld::UniversalId log (CSMWorld::UniversalId::Type_LoadErrorLog, 0);
+            CSMWorld::UniversalId log(CSMWorld::UniversalId::Type_LoadErrorLog, 0);
 
             { // silence a g++ warning
-            for (CSMDoc::Messages::Iterator messageIter (messages.begin());
-                messageIter!=messages.end(); ++messageIter)
-            {
-                document->getReport (log)->add (*messageIter);
-                emit loadMessage (document, messageIter->mMessage);
-            }
+                for (CSMDoc::Messages::Iterator messageIter(messages.begin()); messageIter != messages.end();
+                     ++messageIter)
+                {
+                    document->getReport(log)->add(*messageIter);
+                    emit loadMessage(document, messageIter->mMessage);
+                }
             }
 
-            emit nextRecord (document, iter->second.mRecordsLoaded);
+            emit nextRecord(document, iter->second.mRecordsLoaded);
 
             return;
         }
 
-        if (iter->second.mFile<size) // start loading the files
+        if (iter->second.mFile < size) // start loading the files
         {
             std::filesystem::path path = document->getContentFiles()[iter->second.mFile];
 
-            int steps = document->getData().startLoading (path, iter->second.mFile!=editedIndex, /*project*/false);
+            int steps = document->getData().startLoading(path, iter->second.mFile != editedIndex, /*project*/ false);
             iter->second.mRecordsLeft = true;
             iter->second.mRecordsLoaded = 0;
 
-            emit nextStage (document, Files::pathToUnicodeString(path.filename()), steps);
+            emit nextStage(document, Files::pathToUnicodeString(path.filename()), steps);
         }
-        else if (iter->second.mFile==size) // start loading the last (project) file
+        else if (iter->second.mFile == size) // start loading the last (project) file
         {
-            int steps = document->getData().startLoading (document->getProjectPath(), /*base*/false, true);
+            int steps = document->getData().startLoading(document->getProjectPath(), /*base*/ false, true);
             iter->second.mRecordsLeft = true;
             iter->second.mRecordsLoaded = 0;
 
-            emit nextStage (document, "Project File", steps);
+            emit nextStage(document, "Project File", steps);
         }
         else
         {
@@ -114,32 +118,31 @@ void CSMDoc::Loader::load()
     }
     catch (const std::exception& e)
     {
-        mDocuments.erase (iter);
-        emit documentNotLoaded (document, e.what());
+        mDocuments.erase(iter);
+        emit documentNotLoaded(document, e.what());
         return;
     }
 
     if (done)
     {
-        mDocuments.erase (iter);
-        emit documentLoaded (document);
+        mDocuments.erase(iter);
+        emit documentLoaded(document);
     }
 }
 
-void CSMDoc::Loader::loadDocument (CSMDoc::Document *document)
+void CSMDoc::Loader::loadDocument(CSMDoc::Document* document)
 {
-    mDocuments.emplace_back (document, Stage());
+    mDocuments.emplace_back(document, Stage());
 }
 
-void CSMDoc::Loader::abortLoading (CSMDoc::Document *document)
+void CSMDoc::Loader::abortLoading(CSMDoc::Document* document)
 {
-    for (std::vector<std::pair<Document *, Stage> >::iterator iter = mDocuments.begin();
-        iter!=mDocuments.end(); ++iter)
+    for (std::vector<std::pair<Document*, Stage>>::iterator iter = mDocuments.begin(); iter != mDocuments.end(); ++iter)
     {
-        if (iter->first==document)
+        if (iter->first == document)
         {
-            mDocuments.erase (iter);
-            emit documentNotLoaded (document, "");
+            mDocuments.erase(iter);
+            emit documentNotLoaded(document, "");
             break;
         }
     }
diff --git a/apps/opencs/model/doc/loader.hpp b/apps/opencs/model/doc/loader.hpp
index ce5bc5848a..24cb069f79 100644
--- a/apps/opencs/model/doc/loader.hpp
+++ b/apps/opencs/model/doc/loader.hpp
@@ -3,8 +3,8 @@
 
 #include <vector>
 
-#include <QObject>
 #include <QMutex>
+#include <QObject>
 #include <QTimer>
 #include <QWaitCondition>
 
@@ -14,65 +14,63 @@ namespace CSMDoc
 
     class Loader : public QObject
     {
-            Q_OBJECT
-
-            struct Stage
-            {
-                int mFile;
-                int mRecordsLoaded;
-                bool mRecordsLeft;
+        Q_OBJECT
 
-                Stage();
-            };
+        struct Stage
+        {
+            int mFile;
+            int mRecordsLoaded;
+            bool mRecordsLeft;
 
-            QMutex mMutex;
-            QWaitCondition mThingsToDo;
-            std::vector<std::pair<Document *, Stage> > mDocuments;
+            Stage();
+        };
 
-            QTimer* mTimer;
-            bool mShouldStop;
+        QMutex mMutex;
+        QWaitCondition mThingsToDo;
+        std::vector<std::pair<Document*, Stage>> mDocuments;
 
-        public:
+        QTimer* mTimer;
+        bool mShouldStop;
 
-            Loader();
+    public:
+        Loader();
 
-            QWaitCondition& hasThingsToDo();
+        QWaitCondition& hasThingsToDo();
 
-            void stop();
+        void stop();
 
-        private slots:
+    private slots:
 
-            void load();
+        void load();
 
-        public slots:
+    public slots:
 
-            void loadDocument (CSMDoc::Document *document);
-            ///< The ownership of \a document is not transferred.
+        void loadDocument(CSMDoc::Document* document);
+        ///< The ownership of \a document is not transferred.
 
-            void abortLoading (CSMDoc::Document *document);
-            ///< Abort loading \a docuemnt (ignored if \a document has already finished being
-            /// loaded). Will result in a documentNotLoaded signal, once the Loader has finished
-            /// cleaning up.
+        void abortLoading(CSMDoc::Document* document);
+        ///< Abort loading \a docuemnt (ignored if \a document has already finished being
+        /// loaded). Will result in a documentNotLoaded signal, once the Loader has finished
+        /// cleaning up.
 
-        signals:
+    signals:
 
-            void documentLoaded (Document *document);
-            ///< The ownership of \a document is not transferred.
+        void documentLoaded(Document* document);
+        ///< The ownership of \a document is not transferred.
 
-            void documentNotLoaded (Document *document, const std::string& error);
-            ///< Document load has been interrupted either because of a call to abortLoading
-            /// or a problem during loading). In the former case error will be an empty string.
+        void documentNotLoaded(Document* document, const std::string& error);
+        ///< Document load has been interrupted either because of a call to abortLoading
+        /// or a problem during loading). In the former case error will be an empty string.
 
-            void nextStage (CSMDoc::Document *document, const std::string& name,
-                int totalRecords);
+        void nextStage(CSMDoc::Document* document, const std::string& name, int totalRecords);
 
-            void nextRecord (CSMDoc::Document *document, int records);
-            ///< \note This signal is only given once per group of records. The group size is
-            /// approximately the total number of records divided by the steps value of the
-            /// previous nextStage signal.
+        void nextRecord(CSMDoc::Document* document, int records);
+        ///< \note This signal is only given once per group of records. The group size is
+        /// approximately the total number of records divided by the steps value of the
+        /// previous nextStage signal.
 
-            void loadMessage (CSMDoc::Document *document, const std::string& message);
-            ///< Non-critical load error or warning
+        void loadMessage(CSMDoc::Document* document, const std::string& message);
+        ///< Non-critical load error or warning
     };
 }
 
diff --git a/apps/opencs/model/doc/messages.cpp b/apps/opencs/model/doc/messages.cpp
index b70d44eda3..5d7a6ac6cb 100644
--- a/apps/opencs/model/doc/messages.cpp
+++ b/apps/opencs/model/doc/messages.cpp
@@ -1,38 +1,50 @@
 #include "messages.hpp"
 
-CSMDoc::Message::Message() : mSeverity(Severity_Default){}
+CSMDoc::Message::Message()
+    : mSeverity(Severity_Default)
+{
+}
 
-CSMDoc::Message::Message (const CSMWorld::UniversalId& id, const std::string& message,
-    const std::string& hint, Severity severity)
-: mId (id), mMessage (message), mHint (hint), mSeverity (severity)
-{}
+CSMDoc::Message::Message(
+    const CSMWorld::UniversalId& id, const std::string& message, const std::string& hint, Severity severity)
+    : mId(id)
+    , mMessage(message)
+    , mHint(hint)
+    , mSeverity(severity)
+{
+}
 
-std::string CSMDoc::Message::toString (Severity severity)
+std::string CSMDoc::Message::toString(Severity severity)
 {
     switch (severity)
     {
-        case CSMDoc::Message::Severity_Info: return "Information";
-        case CSMDoc::Message::Severity_Warning: return "Warning";
-        case CSMDoc::Message::Severity_Error: return "Error";
-        case CSMDoc::Message::Severity_SeriousError: return "Serious Error";
-        case CSMDoc::Message::Severity_Default: break;
+        case CSMDoc::Message::Severity_Info:
+            return "Information";
+        case CSMDoc::Message::Severity_Warning:
+            return "Warning";
+        case CSMDoc::Message::Severity_Error:
+            return "Error";
+        case CSMDoc::Message::Severity_SeriousError:
+            return "Serious Error";
+        case CSMDoc::Message::Severity_Default:
+            break;
     }
 
     return "";
 }
 
+CSMDoc::Messages::Messages(Message::Severity default_)
+    : mDefault(default_)
+{
+}
 
-CSMDoc::Messages::Messages (Message::Severity default_)
-: mDefault (default_)
-{}
-
-void CSMDoc::Messages::add (const CSMWorld::UniversalId& id, const std::string& message,
-    const std::string& hint, Message::Severity severity)
+void CSMDoc::Messages::add(
+    const CSMWorld::UniversalId& id, const std::string& message, const std::string& hint, Message::Severity severity)
 {
-    if (severity==Message::Severity_Default)
+    if (severity == Message::Severity_Default)
         severity = mDefault;
 
-    mMessages.push_back (Message (id, message, hint, severity));
+    mMessages.push_back(Message(id, message, hint, severity));
 }
 
 CSMDoc::Messages::Iterator CSMDoc::Messages::begin() const
diff --git a/apps/opencs/model/doc/messages.hpp b/apps/opencs/model/doc/messages.hpp
index 355493b79b..3186107914 100644
--- a/apps/opencs/model/doc/messages.hpp
+++ b/apps/opencs/model/doc/messages.hpp
@@ -12,9 +12,9 @@ namespace CSMDoc
     {
         enum Severity
         {
-            Severity_Info = 0,         // no problem
-            Severity_Warning = 1,      // a potential problem, but we are probably fine
-            Severity_Error = 2,        // an error; we are not fine
+            Severity_Info = 0, // no problem
+            Severity_Warning = 1, // a potential problem, but we are probably fine
+            Severity_Error = 2, // an error; we are not fine
             Severity_SeriousError = 3, // an error so bad we can't even be sure if we are
                                        // reporting it correctly
             Severity_Default = 4
@@ -27,39 +27,35 @@ namespace CSMDoc
 
         Message();
 
-        Message (const CSMWorld::UniversalId& id, const std::string& message,
-            const std::string& hint, Severity severity);
+        Message(
+            const CSMWorld::UniversalId& id, const std::string& message, const std::string& hint, Severity severity);
 
-        static std::string toString (Severity severity);
+        static std::string toString(Severity severity);
     };
 
     class Messages
     {
-        public:
+    public:
+        typedef std::vector<Message> Collection;
 
-            typedef std::vector<Message> Collection;
+        typedef Collection::const_iterator Iterator;
 
-            typedef Collection::const_iterator Iterator;
+    private:
+        Collection mMessages;
+        Message::Severity mDefault;
 
-        private:
+    public:
+        Messages(Message::Severity default_);
 
-            Collection mMessages;
-            Message::Severity mDefault;
+        void add(const CSMWorld::UniversalId& id, const std::string& message, const std::string& hint = "",
+            Message::Severity severity = Message::Severity_Default);
 
-        public:
+        Iterator begin() const;
 
-            Messages (Message::Severity default_);
-
-            void add (const CSMWorld::UniversalId& id, const std::string& message,
-                const std::string& hint = "",
-                Message::Severity severity = Message::Severity_Default);
-
-            Iterator begin() const;
-
-            Iterator end() const;
+        Iterator end() const;
     };
 }
 
-Q_DECLARE_METATYPE (CSMDoc::Message)
+Q_DECLARE_METATYPE(CSMDoc::Message)
 
 #endif
diff --git a/apps/opencs/model/doc/operation.cpp b/apps/opencs/model/doc/operation.cpp
index 21db0e04b9..396eb17962 100644
--- a/apps/opencs/model/doc/operation.cpp
+++ b/apps/opencs/model/doc/operation.cpp
@@ -17,25 +17,33 @@ void CSMDoc::Operation::prepareStages()
     mTotalSteps = 0;
     mError = false;
 
-    for (std::vector<std::pair<Stage *, int> >::iterator iter (mStages.begin()); iter!=mStages.end(); ++iter)
+    for (std::vector<std::pair<Stage*, int>>::iterator iter(mStages.begin()); iter != mStages.end(); ++iter)
     {
         iter->second = iter->first->setup();
         mTotalSteps += iter->second;
     }
 }
 
-CSMDoc::Operation::Operation (int type, bool ordered, bool finalAlways)
-: mType (type), mStages(std::vector<std::pair<Stage *, int> >()), mCurrentStage(mStages.begin()),
-  mCurrentStep(0), mCurrentStepTotal(0), mTotalSteps(0), mOrdered (ordered),
-  mFinalAlways (finalAlways), mError(false), mConnected (false), mPrepared (false),
-  mDefaultSeverity (Message::Severity_Error)
+CSMDoc::Operation::Operation(int type, bool ordered, bool finalAlways)
+    : mType(type)
+    , mStages(std::vector<std::pair<Stage*, int>>())
+    , mCurrentStage(mStages.begin())
+    , mCurrentStep(0)
+    , mCurrentStepTotal(0)
+    , mTotalSteps(0)
+    , mOrdered(ordered)
+    , mFinalAlways(finalAlways)
+    , mError(false)
+    , mConnected(false)
+    , mPrepared(false)
+    , mDefaultSeverity(Message::Severity_Error)
 {
-    mTimer = new QTimer (this);
+    mTimer = new QTimer(this);
 }
 
 CSMDoc::Operation::~Operation()
 {
-    for (std::vector<std::pair<Stage *, int> >::iterator iter (mStages.begin()); iter!=mStages.end(); ++iter)
+    for (std::vector<std::pair<Stage*, int>>::iterator iter(mStages.begin()); iter != mStages.end(); ++iter)
         delete iter->first;
 }
 
@@ -45,21 +53,21 @@ void CSMDoc::Operation::run()
 
     if (!mConnected)
     {
-        connect (mTimer, &QTimer::timeout, this, &Operation::executeStage);
+        connect(mTimer, &QTimer::timeout, this, &Operation::executeStage);
         mConnected = true;
     }
 
     mPrepared = false;
 
-    mTimer->start (0);
+    mTimer->start(0);
 }
 
-void CSMDoc::Operation::appendStage (Stage *stage)
+void CSMDoc::Operation::appendStage(Stage* stage)
 {
-    mStages.emplace_back (stage, 0);
+    mStages.emplace_back(stage, 0);
 }
 
-void CSMDoc::Operation::setDefaultSeverity (Message::Severity severity)
+void CSMDoc::Operation::setDefaultSeverity(Message::Severity severity)
 {
     mDefaultSeverity = severity;
 }
@@ -78,7 +86,7 @@ void CSMDoc::Operation::abort()
 
     if (mFinalAlways)
     {
-        if (mStages.begin()!=mStages.end() && mCurrentStage!=--mStages.end())
+        if (mStages.begin() != mStages.end() && mCurrentStage != --mStages.end())
         {
             mCurrentStep = 0;
             mCurrentStage = --mStages.end();
@@ -96,11 +104,11 @@ void CSMDoc::Operation::executeStage()
         mPrepared = true;
     }
 
-    Messages messages (mDefaultSeverity);
+    Messages messages(mDefaultSeverity);
 
-    while (mCurrentStage!=mStages.end())
+    while (mCurrentStage != mStages.end())
     {
-        if (mCurrentStep>=mCurrentStage->second)
+        if (mCurrentStep >= mCurrentStage->second)
         {
             mCurrentStep = 0;
             ++mCurrentStage;
@@ -109,11 +117,12 @@ void CSMDoc::Operation::executeStage()
         {
             try
             {
-                mCurrentStage->first->perform (mCurrentStep++, messages);
+                mCurrentStage->first->perform(mCurrentStep++, messages);
             }
             catch (const std::exception& e)
             {
-                emit reportMessage (Message (CSMWorld::UniversalId(), e.what(), "", Message::Severity_SeriousError), mType);
+                emit reportMessage(
+                    Message(CSMWorld::UniversalId(), e.what(), "", Message::Severity_SeriousError), mType);
                 abort();
             }
 
@@ -122,17 +131,17 @@ void CSMDoc::Operation::executeStage()
         }
     }
 
-    emit progress (mCurrentStepTotal, mTotalSteps ? mTotalSteps : 1, mType);
+    emit progress(mCurrentStepTotal, mTotalSteps ? mTotalSteps : 1, mType);
 
-    for (Messages::Iterator iter (messages.begin()); iter!=messages.end(); ++iter)
-        emit reportMessage (*iter, mType);
+    for (Messages::Iterator iter(messages.begin()); iter != messages.end(); ++iter)
+        emit reportMessage(*iter, mType);
 
-    if (mCurrentStage==mStages.end())
+    if (mCurrentStage == mStages.end())
         operationDone();
 }
 
 void CSMDoc::Operation::operationDone()
 {
     mTimer->stop();
-    emit done (mType, mError);
+    emit done(mType, mError);
 }
diff --git a/apps/opencs/model/doc/operation.hpp b/apps/opencs/model/doc/operation.hpp
index b094c08b4c..5ac89ff6b0 100644
--- a/apps/opencs/model/doc/operation.hpp
+++ b/apps/opencs/model/doc/operation.hpp
@@ -1,8 +1,8 @@
 #ifndef CSM_DOC_OPERATION_H
 #define CSM_DOC_OPERATION_H
 
-#include <vector>
 #include <map>
+#include <vector>
 
 #include <QObject>
 #include <QTimer>
@@ -20,63 +20,62 @@ namespace CSMDoc
 
     class Operation : public QObject
     {
-            Q_OBJECT
-
-            int mType;
-            std::vector<std::pair<Stage *, int> > mStages; // stage, number of steps
-            std::vector<std::pair<Stage *, int> >::iterator mCurrentStage;
-            int mCurrentStep;
-            int mCurrentStepTotal;
-            int mTotalSteps;
-            int mOrdered;
-            bool mFinalAlways;
-            bool mError;
-            bool mConnected;
-            QTimer *mTimer;
-            bool mPrepared;
-            Message::Severity mDefaultSeverity;
+        Q_OBJECT
 
-            void prepareStages();
+        int mType;
+        std::vector<std::pair<Stage*, int>> mStages; // stage, number of steps
+        std::vector<std::pair<Stage*, int>>::iterator mCurrentStage;
+        int mCurrentStep;
+        int mCurrentStepTotal;
+        int mTotalSteps;
+        int mOrdered;
+        bool mFinalAlways;
+        bool mError;
+        bool mConnected;
+        QTimer* mTimer;
+        bool mPrepared;
+        Message::Severity mDefaultSeverity;
 
-        public:
+        void prepareStages();
 
-            Operation (int type, bool ordered, bool finalAlways = false);
-            ///< \param ordered Stages must be executed in the given order.
-            /// \param finalAlways Execute last stage even if an error occurred during earlier stages.
+    public:
+        Operation(int type, bool ordered, bool finalAlways = false);
+        ///< \param ordered Stages must be executed in the given order.
+        /// \param finalAlways Execute last stage even if an error occurred during earlier stages.
 
-            virtual ~Operation();
+        virtual ~Operation();
 
-            void appendStage (Stage *stage);
-            ///< The ownership of \a stage is transferred to *this.
-            ///
-            /// \attention Do no call this function while this Operation is running.
+        void appendStage(Stage* stage);
+        ///< The ownership of \a stage is transferred to *this.
+        ///
+        /// \attention Do no call this function while this Operation is running.
 
-            /// \attention Do no call this function while this Operation is running.
-            void setDefaultSeverity (Message::Severity severity);
+        /// \attention Do no call this function while this Operation is running.
+        void setDefaultSeverity(Message::Severity severity);
 
-            bool hasError() const;
+        bool hasError() const;
 
-        signals:
+    signals:
 
-            void progress (int current, int max, int type);
+        void progress(int current, int max, int type);
 
-            void reportMessage (const CSMDoc::Message& message, int type);
+        void reportMessage(const CSMDoc::Message& message, int type);
 
-            void done (int type, bool failed);
+        void done(int type, bool failed);
 
-        public slots:
+    public slots:
 
-            void abort();
+        void abort();
 
-            void run();
+        void run();
 
-        private slots:
+    private slots:
 
-            void executeStage();
+        void executeStage();
 
-        protected slots:
+    protected slots:
 
-            virtual void operationDone();
+        virtual void operationDone();
     };
 }
 
diff --git a/apps/opencs/model/doc/operationholder.cpp b/apps/opencs/model/doc/operationholder.cpp
index a392a6d73c..6beab1fd99 100644
--- a/apps/opencs/model/doc/operationholder.cpp
+++ b/apps/opencs/model/doc/operationholder.cpp
@@ -2,31 +2,28 @@
 
 #include "operation.hpp"
 
-CSMDoc::OperationHolder::OperationHolder (Operation *operation)
+CSMDoc::OperationHolder::OperationHolder(Operation* operation)
     : mOperation(nullptr)
-    , mRunning (false)
+    , mRunning(false)
 {
     if (operation)
-        setOperation (operation);
+        setOperation(operation);
 }
 
-void CSMDoc::OperationHolder::setOperation (Operation *operation)
+void CSMDoc::OperationHolder::setOperation(Operation* operation)
 {
     mOperation = operation;
-    mOperation->moveToThread (&mThread);
+    mOperation->moveToThread(&mThread);
 
-    connect (mOperation, &Operation::progress,
-        this, &OperationHolder::progress);
+    connect(mOperation, &Operation::progress, this, &OperationHolder::progress);
 
-    connect (mOperation, &Operation::reportMessage,
-        this, &OperationHolder::reportMessage);
+    connect(mOperation, &Operation::reportMessage, this, &OperationHolder::reportMessage);
 
-    connect (mOperation, &Operation::done,
-        this, &OperationHolder::doneSlot);
+    connect(mOperation, &Operation::done, this, &OperationHolder::doneSlot);
 
-    connect (this, &OperationHolder::abortSignal, mOperation, &Operation::abort);
+    connect(this, &OperationHolder::abortSignal, mOperation, &Operation::abort);
 
-    connect (&mThread, &QThread::started, mOperation, &Operation::run);
+    connect(&mThread, &QThread::started, mOperation, &Operation::run);
 }
 
 bool CSMDoc::OperationHolder::isRunning() const
@@ -55,9 +52,9 @@ void CSMDoc::OperationHolder::abortAndWait()
     }
 }
 
-void CSMDoc::OperationHolder::doneSlot (int type, bool failed)
+void CSMDoc::OperationHolder::doneSlot(int type, bool failed)
 {
     mRunning = false;
     mThread.quit();
-    emit done (type, failed);
+    emit done(type, failed);
 }
diff --git a/apps/opencs/model/doc/operationholder.hpp b/apps/opencs/model/doc/operationholder.hpp
index 69af6ed66c..c5b4d23b9a 100644
--- a/apps/opencs/model/doc/operationholder.hpp
+++ b/apps/opencs/model/doc/operationholder.hpp
@@ -17,40 +17,39 @@ namespace CSMDoc
 
     class OperationHolder : public QObject
     {
-            Q_OBJECT
-            
-            QThread mThread;
-            Operation *mOperation;
-            bool mRunning;
+        Q_OBJECT
 
-        public:
+        QThread mThread;
+        Operation* mOperation;
+        bool mRunning;
 
-            OperationHolder (Operation *operation = nullptr);
+    public:
+        OperationHolder(Operation* operation = nullptr);
 
-            void setOperation (Operation *operation);
+        void setOperation(Operation* operation);
 
-            bool isRunning() const;
+        bool isRunning() const;
 
-            void start();
+        void start();
 
-            void abort();
+        void abort();
 
-            // Abort and wait until thread has finished.
-            void abortAndWait();
+        // Abort and wait until thread has finished.
+        void abortAndWait();
 
-        private slots:
+    private slots:
 
-            void doneSlot (int type, bool failed);
-            
-        signals:
+        void doneSlot(int type, bool failed);
 
-            void progress (int current, int max, int type);
+    signals:
 
-            void reportMessage (const CSMDoc::Message& message, int type);
+        void progress(int current, int max, int type);
 
-            void done (int type, bool failed);
+        void reportMessage(const CSMDoc::Message& message, int type);
 
-            void abortSignal();
+        void done(int type, bool failed);
+
+        void abortSignal();
     };
 }
 
diff --git a/apps/opencs/model/doc/runner.cpp b/apps/opencs/model/doc/runner.cpp
index 435a32d920..8590939d97 100644
--- a/apps/opencs/model/doc/runner.cpp
+++ b/apps/opencs/model/doc/runner.cpp
@@ -2,26 +2,26 @@
 
 #include <utility>
 
+#include <QCoreApplication>
 #include <QDir>
 #include <QTemporaryFile>
 #include <QTextStream>
-#include <QCoreApplication>
 
 #include <components/files/conversion.hpp>
 #include <components/files/qtconversion.hpp>
 
 #include "operationholder.hpp"
 
-CSMDoc::Runner::Runner (std::filesystem::path  projectPath)
-: mRunning (false), mStartup (nullptr), mProjectPath (std::move(projectPath))
+CSMDoc::Runner::Runner(std::filesystem::path projectPath)
+    : mRunning(false)
+    , mStartup(nullptr)
+    , mProjectPath(std::move(projectPath))
 {
-    connect (&mProcess, qOverload<int, QProcess::ExitStatus>(&QProcess::finished),
-        this, &Runner::finished);
+    connect(&mProcess, qOverload<int, QProcess::ExitStatus>(&QProcess::finished), this, &Runner::finished);
 
-    connect (&mProcess, &QProcess::readyReadStandardOutput,
-        this, &Runner::readyReadStandardOutput);
+    connect(&mProcess, &QProcess::readyReadStandardOutput, this, &Runner::readyReadStandardOutput);
 
-    mProcess.setProcessChannelMode (QProcess::MergedChannels);
+    mProcess.setProcessChannelMode(QProcess::MergedChannels);
 
     mProfile.blank();
 }
@@ -30,13 +30,13 @@ CSMDoc::Runner::~Runner()
 {
     if (mRunning)
     {
-        disconnect (&mProcess, nullptr, this, nullptr);
+        disconnect(&mProcess, nullptr, this, nullptr);
         mProcess.kill();
         mProcess.waitForFinished();
     }
 }
 
-void CSMDoc::Runner::start (bool delayed)
+void CSMDoc::Runner::start(bool delayed)
 {
     if (mStartup)
     {
@@ -61,16 +61,16 @@ void CSMDoc::Runner::start (bool delayed)
         path.prepend(QString("./"));
 #endif
 
-        mStartup = new QTemporaryFile (this);
+        mStartup = new QTemporaryFile(this);
         mStartup->open();
 
         {
-            QTextStream stream (mStartup);
+            QTextStream stream(mStartup);
 
             if (!mStartupInstruction.empty())
-                stream << QString::fromUtf8 (mStartupInstruction.c_str()) << '\n';
+                stream << QString::fromUtf8(mStartupInstruction.c_str()) << '\n';
 
-            stream << QString::fromUtf8 (mProfile.mScriptText.c_str());
+            stream << QString::fromUtf8(mProfile.mScriptText.c_str());
         }
 
         mStartup->close();
@@ -94,8 +94,7 @@ void CSMDoc::Runner::start (bool delayed)
             arguments << "--content=" + Files::pathToQString(mContentFile);
         }
 
-        arguments
-            << "--content=" + Files::pathToQString(mProjectPath.filename());
+        arguments << "--content=" + Files::pathToQString(mProjectPath.filename());
 
         mProcess.start(path, arguments);
     }
@@ -109,7 +108,7 @@ void CSMDoc::Runner::stop()
     delete mStartup;
     mStartup = nullptr;
 
-    if (mProcess.state()==QProcess::NotRunning)
+    if (mProcess.state() == QProcess::NotRunning)
     {
         mRunning = false;
         emit runStateChanged();
@@ -123,39 +122,38 @@ bool CSMDoc::Runner::isRunning() const
     return mRunning;
 }
 
-void CSMDoc::Runner::configure (const ESM::DebugProfile& profile,
-    const std::vector<std::filesystem::path> &contentFiles, const std::string& startupInstruction)
+void CSMDoc::Runner::configure(const ESM::DebugProfile& profile, const std::vector<std::filesystem::path>& contentFiles,
+    const std::string& startupInstruction)
 {
     mProfile = profile;
     mContentFiles = contentFiles;
     mStartupInstruction = startupInstruction;
 }
 
-void CSMDoc::Runner::finished (int exitCode, QProcess::ExitStatus exitStatus)
+void CSMDoc::Runner::finished(int exitCode, QProcess::ExitStatus exitStatus)
 {
     mRunning = false;
     emit runStateChanged();
 }
 
-QTextDocument *CSMDoc::Runner::getLog()
+QTextDocument* CSMDoc::Runner::getLog()
 {
     return &mLog;
 }
 
 void CSMDoc::Runner::readyReadStandardOutput()
 {
-    mLog.setPlainText (
-        mLog.toPlainText() + QString::fromUtf8 (mProcess.readAllStandardOutput()));
+    mLog.setPlainText(mLog.toPlainText() + QString::fromUtf8(mProcess.readAllStandardOutput()));
 }
 
-
-CSMDoc::SaveWatcher::SaveWatcher (Runner *runner, OperationHolder *operation)
-: QObject (runner), mRunner (runner)
+CSMDoc::SaveWatcher::SaveWatcher(Runner* runner, OperationHolder* operation)
+    : QObject(runner)
+    , mRunner(runner)
 {
-    connect (operation, &OperationHolder::done, this, &SaveWatcher::saveDone);
+    connect(operation, &OperationHolder::done, this, &SaveWatcher::saveDone);
 }
 
-void CSMDoc::SaveWatcher::saveDone (int type, bool failed)
+void CSMDoc::SaveWatcher::saveDone(int type, bool failed)
 {
     if (failed)
         mRunner->stop();
diff --git a/apps/opencs/model/doc/runner.hpp b/apps/opencs/model/doc/runner.hpp
index c3ef4477c3..170779772b 100644
--- a/apps/opencs/model/doc/runner.hpp
+++ b/apps/opencs/model/doc/runner.hpp
@@ -1,8 +1,8 @@
 #ifndef CSM_DOC_RUNNER_H
 #define CSM_DOC_RUNNER_H
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <QObject>
 #include <QProcess>
@@ -17,51 +17,49 @@ class QTemporaryFile;
 namespace CSMDoc
 {
     class OperationHolder;
-    
+
     class Runner : public QObject
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            QProcess mProcess;
-            bool mRunning;
-            ESM::DebugProfile mProfile;
-            std::vector<std::filesystem::path> mContentFiles;
-            std::string mStartupInstruction;
-            QTemporaryFile *mStartup;
-            QTextDocument mLog;
-            std::filesystem::path mProjectPath;
+        QProcess mProcess;
+        bool mRunning;
+        ESM::DebugProfile mProfile;
+        std::vector<std::filesystem::path> mContentFiles;
+        std::string mStartupInstruction;
+        QTemporaryFile* mStartup;
+        QTextDocument mLog;
+        std::filesystem::path mProjectPath;
 
-        public:
+    public:
+        Runner(std::filesystem::path projectPath);
 
-            Runner (std::filesystem::path  projectPath);
+        ~Runner();
 
-            ~Runner();
+        /// \param delayed Flag as running but do not start the OpenMW process yet (the
+        /// process must be started by another call of start with delayed==false)
+        void start(bool delayed = false);
 
-            /// \param delayed Flag as running but do not start the OpenMW process yet (the
-            /// process must be started by another call of start with delayed==false)
-            void start (bool delayed = false);
+        void stop();
 
-            void stop();
+        /// \note Running state is entered when the start function is called. This
+        /// is not necessarily identical to the moment the child process is started.
+        bool isRunning() const;
 
-            /// \note Running state is entered when the start function is called. This
-            /// is not necessarily identical to the moment the child process is started.
-            bool isRunning() const;
+        void configure(const ESM::DebugProfile& profile, const std::vector<std::filesystem::path>& contentFiles,
+            const std::string& startupInstruction);
 
-            void configure (const ESM::DebugProfile& profile,
-                const std::vector<std::filesystem::path> &contentFiles,
-                const std::string& startupInstruction);
+        QTextDocument* getLog();
 
-            QTextDocument *getLog();
+    signals:
 
-        signals:
+        void runStateChanged();
 
-            void runStateChanged();
+    private slots:
 
-        private slots:
+        void finished(int exitCode, QProcess::ExitStatus exitStatus);
 
-            void finished (int exitCode, QProcess::ExitStatus exitStatus);
-
-            void readyReadStandardOutput();
+        void readyReadStandardOutput();
     };
 
     class Operation;
@@ -69,18 +67,17 @@ namespace CSMDoc
     /// \brief Watch for end of save operation and restart or stop runner
     class SaveWatcher : public QObject
     {
-            Q_OBJECT
-
-            Runner *mRunner;
+        Q_OBJECT
 
-        public:
+        Runner* mRunner;
 
-            /// *this attaches itself to runner
-            SaveWatcher (Runner *runner, OperationHolder *operation);
+    public:
+        /// *this attaches itself to runner
+        SaveWatcher(Runner* runner, OperationHolder* operation);
 
-        private slots:
+    private slots:
 
-            void saveDone (int type, bool failed);
+        void saveDone(int type, bool failed);
     };
 }
 
diff --git a/apps/opencs/model/doc/saving.cpp b/apps/opencs/model/doc/saving.cpp
index ec9589ceb4..fb5aaca48d 100644
--- a/apps/opencs/model/doc/saving.cpp
+++ b/apps/opencs/model/doc/saving.cpp
@@ -3,104 +3,100 @@
 #include "../world/data.hpp"
 #include "../world/idcollection.hpp"
 
-#include "state.hpp"
-#include "savingstages.hpp"
 #include "document.hpp"
+#include "savingstages.hpp"
+#include "state.hpp"
 
-CSMDoc::Saving::Saving (Document& document, const std::filesystem::path& projectPath,
-    ToUTF8::FromType encoding)
-: Operation (State_Saving, true, true), mDocument (document), mState (*this, projectPath, encoding)
+CSMDoc::Saving::Saving(Document& document, const std::filesystem::path& projectPath, ToUTF8::FromType encoding)
+    : Operation(State_Saving, true, true)
+    , mDocument(document)
+    , mState(*this, projectPath, encoding)
 {
     // save project file
-    appendStage (new OpenSaveStage (mDocument, mState, true));
+    appendStage(new OpenSaveStage(mDocument, mState, true));
 
-    appendStage (new WriteHeaderStage (mDocument, mState, true));
+    appendStage(new WriteHeaderStage(mDocument, mState, true));
 
-    appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::Filter> > (
+    appendStage(new WriteCollectionStage<CSMWorld::IdCollection<ESM::Filter>>(
         mDocument.getData().getFilters(), mState, CSMWorld::Scope_Project));
 
-    appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::DebugProfile> > (
+    appendStage(new WriteCollectionStage<CSMWorld::IdCollection<ESM::DebugProfile>>(
         mDocument.getData().getDebugProfiles(), mState, CSMWorld::Scope_Project));
 
-    appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::Script> > (
+    appendStage(new WriteCollectionStage<CSMWorld::IdCollection<ESM::Script>>(
         mDocument.getData().getScripts(), mState, CSMWorld::Scope_Project));
 
-    appendStage (new CloseSaveStage (mState));
+    appendStage(new CloseSaveStage(mState));
 
     // save content file
-    appendStage (new OpenSaveStage (mDocument, mState, false));
+    appendStage(new OpenSaveStage(mDocument, mState, false));
 
-    appendStage (new WriteHeaderStage (mDocument, mState, false));
+    appendStage(new WriteHeaderStage(mDocument, mState, false));
 
-    appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::Global> >
-        (mDocument.getData().getGlobals(), mState));
+    appendStage(
+        new WriteCollectionStage<CSMWorld::IdCollection<ESM::Global>>(mDocument.getData().getGlobals(), mState));
 
-    appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::GameSetting> >
-        (mDocument.getData().getGmsts(), mState));
+    appendStage(
+        new WriteCollectionStage<CSMWorld::IdCollection<ESM::GameSetting>>(mDocument.getData().getGmsts(), mState));
 
-    appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::Skill> >
-        (mDocument.getData().getSkills(), mState));
+    appendStage(new WriteCollectionStage<CSMWorld::IdCollection<ESM::Skill>>(mDocument.getData().getSkills(), mState));
 
-    appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::Class> >
-        (mDocument.getData().getClasses(), mState));
+    appendStage(new WriteCollectionStage<CSMWorld::IdCollection<ESM::Class>>(mDocument.getData().getClasses(), mState));
 
-    appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::Faction> >
-        (mDocument.getData().getFactions(), mState));
+    appendStage(
+        new WriteCollectionStage<CSMWorld::IdCollection<ESM::Faction>>(mDocument.getData().getFactions(), mState));
 
-    appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::Race> >
-        (mDocument.getData().getRaces(), mState));
+    appendStage(new WriteCollectionStage<CSMWorld::IdCollection<ESM::Race>>(mDocument.getData().getRaces(), mState));
 
-    appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::Sound> >
-        (mDocument.getData().getSounds(), mState));
+    appendStage(new WriteCollectionStage<CSMWorld::IdCollection<ESM::Sound>>(mDocument.getData().getSounds(), mState));
 
-    appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::Script> >
-        (mDocument.getData().getScripts(), mState));
+    appendStage(
+        new WriteCollectionStage<CSMWorld::IdCollection<ESM::Script>>(mDocument.getData().getScripts(), mState));
 
-    appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::Region> >
-        (mDocument.getData().getRegions(), mState));
+    appendStage(
+        new WriteCollectionStage<CSMWorld::IdCollection<ESM::Region>>(mDocument.getData().getRegions(), mState));
 
-    appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::BirthSign> >
-        (mDocument.getData().getBirthsigns(), mState));
+    appendStage(
+        new WriteCollectionStage<CSMWorld::IdCollection<ESM::BirthSign>>(mDocument.getData().getBirthsigns(), mState));
 
-    appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::Spell> >
-        (mDocument.getData().getSpells(), mState));
+    appendStage(new WriteCollectionStage<CSMWorld::IdCollection<ESM::Spell>>(mDocument.getData().getSpells(), mState));
 
-    appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::Enchantment> >
-        (mDocument.getData().getEnchantments(), mState));
+    appendStage(new WriteCollectionStage<CSMWorld::IdCollection<ESM::Enchantment>>(
+        mDocument.getData().getEnchantments(), mState));
 
-    appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::BodyPart> >
-        (mDocument.getData().getBodyParts(), mState));
+    appendStage(
+        new WriteCollectionStage<CSMWorld::IdCollection<ESM::BodyPart>>(mDocument.getData().getBodyParts(), mState));
 
-    appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::SoundGenerator> >
-        (mDocument.getData().getSoundGens(), mState));
+    appendStage(new WriteCollectionStage<CSMWorld::IdCollection<ESM::SoundGenerator>>(
+        mDocument.getData().getSoundGens(), mState));
 
-    appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::MagicEffect> >
-        (mDocument.getData().getMagicEffects(), mState));
+    appendStage(new WriteCollectionStage<CSMWorld::IdCollection<ESM::MagicEffect>>(
+        mDocument.getData().getMagicEffects(), mState));
 
-    appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::StartScript> >
-        (mDocument.getData().getStartScripts(), mState));
+    appendStage(new WriteCollectionStage<CSMWorld::IdCollection<ESM::StartScript>>(
+        mDocument.getData().getStartScripts(), mState));
 
-    appendStage (new WriteRefIdCollectionStage (mDocument, mState));
+    appendStage(new WriteRefIdCollectionStage(mDocument, mState));
 
-    appendStage (new CollectionReferencesStage (mDocument, mState));
+    appendStage(new CollectionReferencesStage(mDocument, mState));
 
-    appendStage (new WriteCellCollectionStage (mDocument, mState));
+    appendStage(new WriteCellCollectionStage(mDocument, mState));
 
     // Dialogue can reference objects and cells so must be written after these records for vanilla-compatible files
 
-    appendStage (new WriteDialogueCollectionStage (mDocument, mState, false));
+    appendStage(new WriteDialogueCollectionStage(mDocument, mState, false));
 
-    appendStage (new WriteDialogueCollectionStage (mDocument, mState, true));
+    appendStage(new WriteDialogueCollectionStage(mDocument, mState, true));
 
-    appendStage (new WritePathgridCollectionStage (mDocument, mState));
+    appendStage(new WritePathgridCollectionStage(mDocument, mState));
 
-    appendStage (new WriteLandTextureCollectionStage (mDocument, mState));
+    appendStage(new WriteLandTextureCollectionStage(mDocument, mState));
 
     // references Land Textures
-    appendStage (new WriteLandCollectionStage (mDocument, mState));
+    appendStage(new WriteLandCollectionStage(mDocument, mState));
 
     // close file and clean up
-    appendStage (new CloseSaveStage (mState));
+    appendStage(new CloseSaveStage(mState));
 
-    appendStage (new FinalSavingStage (mDocument, mState));
+    appendStage(new FinalSavingStage(mDocument, mState));
 }
diff --git a/apps/opencs/model/doc/saving.hpp b/apps/opencs/model/doc/saving.hpp
index 0ec68dd942..cb22c4a62a 100644
--- a/apps/opencs/model/doc/saving.hpp
+++ b/apps/opencs/model/doc/saving.hpp
@@ -12,16 +12,13 @@ namespace CSMDoc
 
     class Saving : public Operation
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            Document& mDocument;
-            SavingState mState;
-
-        public:
-
-            Saving (Document& document, const std::filesystem::path& projectPath,
-                ToUTF8::FromType encoding);
+        Document& mDocument;
+        SavingState mState;
 
+    public:
+        Saving(Document& document, const std::filesystem::path& projectPath, ToUTF8::FromType encoding);
     };
 }
 
diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index 841c930cf0..6f040b0ca3 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -1,48 +1,51 @@
 #include "savingstages.hpp"
 
-#include <sstream>
 #include <filesystem>
+#include <sstream>
 
 #include <components/esm3/loaddial.hpp>
 #include <components/files/conversion.hpp>
 
-#include "../world/infocollection.hpp"
 #include "../world/cellcoordinates.hpp"
+#include "../world/infocollection.hpp"
 
 #include "document.hpp"
 
-CSMDoc::OpenSaveStage::OpenSaveStage (Document& document, SavingState& state, bool projectFile)
-: mDocument (document), mState (state), mProjectFile (projectFile)
-{}
+CSMDoc::OpenSaveStage::OpenSaveStage(Document& document, SavingState& state, bool projectFile)
+    : mDocument(document)
+    , mState(state)
+    , mProjectFile(projectFile)
+{
+}
 
 int CSMDoc::OpenSaveStage::setup()
 {
     return 1;
 }
 
-void CSMDoc::OpenSaveStage::perform (int stage, Messages& messages)
+void CSMDoc::OpenSaveStage::perform(int stage, Messages& messages)
 {
-    mState.start (mDocument, mProjectFile);
+    mState.start(mDocument, mProjectFile);
 
-    mState.getStream().open (
-        mProjectFile ? mState.getPath() : mState.getTmpPath(),
-        std::ios::binary);
+    mState.getStream().open(mProjectFile ? mState.getPath() : mState.getTmpPath(), std::ios::binary);
 
     if (!mState.getStream().is_open())
-        throw std::runtime_error ("failed to open stream for saving");
+        throw std::runtime_error("failed to open stream for saving");
 }
 
-
-CSMDoc::WriteHeaderStage::WriteHeaderStage (Document& document, SavingState& state, bool simple)
-: mDocument (document), mState (state), mSimple (simple)
-{}
+CSMDoc::WriteHeaderStage::WriteHeaderStage(Document& document, SavingState& state, bool simple)
+    : mDocument(document)
+    , mState(state)
+    , mSimple(simple)
+{
+}
 
 int CSMDoc::WriteHeaderStage::setup()
 {
     return 1;
 }
 
-void CSMDoc::WriteHeaderStage::perform (int stage, Messages& messages)
+void CSMDoc::WriteHeaderStage::perform(int stage, Messages& messages)
 {
     mState.getWriter().setVersion();
 
@@ -50,9 +53,9 @@ void CSMDoc::WriteHeaderStage::perform (int stage, Messages& messages)
 
     if (mSimple)
     {
-        mState.getWriter().setAuthor ("");
-        mState.getWriter().setDescription ("");
-        mState.getWriter().setRecordCount (0);
+        mState.getWriter().setAuthor("");
+        mState.getWriter().setDescription("");
+        mState.getWriter().setRecordCount(0);
 
         // ESM::Header::CurrentFormat is `1` but since new records are not yet used in opencs
         // we use the format `0` for compatibility with old versions.
@@ -60,46 +63,43 @@ void CSMDoc::WriteHeaderStage::perform (int stage, Messages& messages)
     }
     else
     {
-        mDocument.getData().getMetaData().save (mState.getWriter());
-        mState.getWriter().setRecordCount (
-            mDocument.getData().count (CSMWorld::RecordBase::State_Modified) +
-            mDocument.getData().count (CSMWorld::RecordBase::State_ModifiedOnly) +
-            mDocument.getData().count (CSMWorld::RecordBase::State_Deleted));
+        mDocument.getData().getMetaData().save(mState.getWriter());
+        mState.getWriter().setRecordCount(mDocument.getData().count(CSMWorld::RecordBase::State_Modified)
+            + mDocument.getData().count(CSMWorld::RecordBase::State_ModifiedOnly)
+            + mDocument.getData().count(CSMWorld::RecordBase::State_Deleted));
 
         /// \todo refine dependency list (at least remove redundant dependencies)
         std::vector<std::filesystem::path> dependencies = mDocument.getContentFiles();
-        std::vector<std::filesystem::path>::const_iterator end (--dependencies.end());
+        std::vector<std::filesystem::path>::const_iterator end(--dependencies.end());
 
-        for (std::vector<std::filesystem::path>::const_iterator iter (dependencies.begin());
-            iter!=end; ++iter)
+        for (std::vector<std::filesystem::path>::const_iterator iter(dependencies.begin()); iter != end; ++iter)
         {
             auto name = Files::pathToUnicodeString(iter->filename());
-            auto size = std::filesystem::file_size (*iter);
+            auto size = std::filesystem::file_size(*iter);
 
-            mState.getWriter().addMaster (name, size);
+            mState.getWriter().addMaster(name, size);
         }
     }
 
-    mState.getWriter().save (mState.getStream());
+    mState.getWriter().save(mState.getStream());
 }
 
-
-CSMDoc::WriteDialogueCollectionStage::WriteDialogueCollectionStage (Document& document,
-    SavingState& state, bool journal)
-: mState (state),
-  mTopics (journal ? document.getData().getJournals() : document.getData().getTopics()),
-  mInfos (journal ? document.getData().getJournalInfos() : document.getData().getTopicInfos())
-{}
+CSMDoc::WriteDialogueCollectionStage::WriteDialogueCollectionStage(Document& document, SavingState& state, bool journal)
+    : mState(state)
+    , mTopics(journal ? document.getData().getJournals() : document.getData().getTopics())
+    , mInfos(journal ? document.getData().getJournalInfos() : document.getData().getTopicInfos())
+{
+}
 
 int CSMDoc::WriteDialogueCollectionStage::setup()
 {
     return mTopics.getSize();
 }
 
-void CSMDoc::WriteDialogueCollectionStage::perform (int stage, Messages& messages)
+void CSMDoc::WriteDialogueCollectionStage::perform(int stage, Messages& messages)
 {
     ESM::ESMWriter& writer = mState.getWriter();
-    const CSMWorld::Record<ESM::Dialogue>& topic = mTopics.getRecord (stage);
+    const CSMWorld::Record<ESM::Dialogue>& topic = mTopics.getRecord(stage);
 
     if (topic.mState == CSMWorld::RecordBase::State_Deleted)
     {
@@ -113,9 +113,9 @@ void CSMDoc::WriteDialogueCollectionStage::perform (int stage, Messages& message
 
     // Test, if we need to save anything associated info records.
     bool infoModified = false;
-    CSMWorld::InfoCollection::Range range = mInfos.getTopicRange (topic.get().mId);
+    CSMWorld::InfoCollection::Range range = mInfos.getTopicRange(topic.get().mId);
 
-    for (CSMWorld::InfoCollection::RecordConstIterator iter (range.first); iter!=range.second; ++iter)
+    for (CSMWorld::InfoCollection::RecordConstIterator iter(range.first); iter != range.second; ++iter)
     {
         if ((*iter)->isModified() || (*iter)->mState == CSMWorld::RecordBase::State_Deleted)
         {
@@ -127,73 +127,74 @@ void CSMDoc::WriteDialogueCollectionStage::perform (int stage, Messages& message
     if (topic.isModified() || infoModified)
     {
         if (infoModified && topic.mState != CSMWorld::RecordBase::State_Modified
-                         && topic.mState != CSMWorld::RecordBase::State_ModifiedOnly)
+            && topic.mState != CSMWorld::RecordBase::State_ModifiedOnly)
         {
-            mState.getWriter().startRecord (topic.mBase.sRecordId);
-            topic.mBase.save (mState.getWriter(), topic.mState == CSMWorld::RecordBase::State_Deleted);
-            mState.getWriter().endRecord (topic.mBase.sRecordId);
+            mState.getWriter().startRecord(topic.mBase.sRecordId);
+            topic.mBase.save(mState.getWriter(), topic.mState == CSMWorld::RecordBase::State_Deleted);
+            mState.getWriter().endRecord(topic.mBase.sRecordId);
         }
         else
         {
-            mState.getWriter().startRecord (topic.mModified.sRecordId);
-            topic.mModified.save (mState.getWriter(), topic.mState == CSMWorld::RecordBase::State_Deleted);
-            mState.getWriter().endRecord (topic.mModified.sRecordId);
+            mState.getWriter().startRecord(topic.mModified.sRecordId);
+            topic.mModified.save(mState.getWriter(), topic.mState == CSMWorld::RecordBase::State_Deleted);
+            mState.getWriter().endRecord(topic.mModified.sRecordId);
         }
 
         // write modified selected info records
-        for (CSMWorld::InfoCollection::RecordConstIterator iter (range.first); iter!=range.second; ++iter)
+        for (CSMWorld::InfoCollection::RecordConstIterator iter(range.first); iter != range.second; ++iter)
         {
             if ((*iter)->isModified() || (*iter)->mState == CSMWorld::RecordBase::State_Deleted)
             {
                 ESM::DialInfo info = (*iter)->get();
-                info.mId = info.mId.substr (info.mId.find_last_of ('#')+1);
+                info.mId = info.mId.substr(info.mId.find_last_of('#') + 1);
 
                 info.mPrev.clear();
-                if (iter!=range.first)
+                if (iter != range.first)
                 {
                     CSMWorld::InfoCollection::RecordConstIterator prev = iter;
                     --prev;
 
-                    info.mPrev = (*prev)->get().mId.substr ((*prev)->get().mId.find_last_of ('#')+1);
+                    info.mPrev = (*prev)->get().mId.substr((*prev)->get().mId.find_last_of('#') + 1);
                 }
 
                 CSMWorld::InfoCollection::RecordConstIterator next = iter;
                 ++next;
 
                 info.mNext.clear();
-                if (next!=range.second)
+                if (next != range.second)
                 {
-                    info.mNext = (*next)->get().mId.substr ((*next)->get().mId.find_last_of ('#')+1);
+                    info.mNext = (*next)->get().mId.substr((*next)->get().mId.find_last_of('#') + 1);
                 }
 
-                writer.startRecord (info.sRecordId);
-                info.save (writer, (*iter)->mState == CSMWorld::RecordBase::State_Deleted);
-                writer.endRecord (info.sRecordId);
+                writer.startRecord(info.sRecordId);
+                info.save(writer, (*iter)->mState == CSMWorld::RecordBase::State_Deleted);
+                writer.endRecord(info.sRecordId);
             }
         }
     }
 }
 
-
-CSMDoc::WriteRefIdCollectionStage::WriteRefIdCollectionStage (Document& document, SavingState& state)
-: mDocument (document), mState (state)
-{}
+CSMDoc::WriteRefIdCollectionStage::WriteRefIdCollectionStage(Document& document, SavingState& state)
+    : mDocument(document)
+    , mState(state)
+{
+}
 
 int CSMDoc::WriteRefIdCollectionStage::setup()
 {
     return mDocument.getData().getReferenceables().getSize();
 }
 
-void CSMDoc::WriteRefIdCollectionStage::perform (int stage, Messages& messages)
+void CSMDoc::WriteRefIdCollectionStage::perform(int stage, Messages& messages)
 {
-    mDocument.getData().getReferenceables().save (stage, mState.getWriter());
+    mDocument.getData().getReferenceables().save(stage, mState.getWriter());
 }
 
-
-CSMDoc::CollectionReferencesStage::CollectionReferencesStage (Document& document,
-    SavingState& state)
-: mDocument (document), mState (state)
-{}
+CSMDoc::CollectionReferencesStage::CollectionReferencesStage(Document& document, SavingState& state)
+    : mDocument(document)
+    , mState(state)
+{
+}
 
 int CSMDoc::CollectionReferencesStage::setup()
 {
@@ -201,31 +202,29 @@ int CSMDoc::CollectionReferencesStage::setup()
 
     int size = mDocument.getData().getReferences().getSize();
 
-    int steps = size/100;
-    if (size%100) ++steps;
+    int steps = size / 100;
+    if (size % 100)
+        ++steps;
 
     return steps;
 }
 
-void CSMDoc::CollectionReferencesStage::perform (int stage, Messages& messages)
+void CSMDoc::CollectionReferencesStage::perform(int stage, Messages& messages)
 {
     int size = mDocument.getData().getReferences().getSize();
 
-    for (int i=stage*100; i<stage*100+100 && i<size; ++i)
+    for (int i = stage * 100; i < stage * 100 + 100 && i < size; ++i)
     {
-        const CSMWorld::Record<CSMWorld::CellRef>& record =
-            mDocument.getData().getReferences().getRecord (i);
+        const CSMWorld::Record<CSMWorld::CellRef>& record = mDocument.getData().getReferences().getRecord(i);
 
         if (record.isModified() || record.mState == CSMWorld::RecordBase::State_Deleted)
         {
-            std::string cellId = record.get().mOriginalCell.empty() ?
-                record.get().mCell : record.get().mOriginalCell;
+            std::string cellId = record.get().mOriginalCell.empty() ? record.get().mCell : record.get().mOriginalCell;
 
-            std::deque<int>& indices =
-                mState.getSubRecords()[Misc::StringUtils::lowerCase (cellId)];
+            std::deque<int>& indices = mState.getSubRecords()[Misc::StringUtils::lowerCase(cellId)];
 
             // collect moved references at the end of the container
-            bool interior = cellId.substr (0, 1)!="#";
+            bool interior = cellId.substr(0, 1) != "#";
             std::ostringstream stream;
             if (!interior)
             {
@@ -236,35 +235,34 @@ void CSMDoc::CollectionReferencesStage::perform (int stage, Messages& messages)
 
             // An empty mOriginalCell is meant to indicate that it is the same as
             // the current cell.  It is possible that a moved ref is moved again.
-            if ((record.get().mOriginalCell.empty() ?
-                    record.get().mCell : record.get().mOriginalCell) != stream.str() && !interior && record.mState!=CSMWorld::RecordBase::State_ModifiedOnly && !record.get().mNew)
-                indices.push_back (i);
+            if ((record.get().mOriginalCell.empty() ? record.get().mCell : record.get().mOriginalCell) != stream.str()
+                && !interior && record.mState != CSMWorld::RecordBase::State_ModifiedOnly && !record.get().mNew)
+                indices.push_back(i);
             else
-                indices.push_front (i);
+                indices.push_front(i);
         }
     }
 }
 
-
-CSMDoc::WriteCellCollectionStage::WriteCellCollectionStage (Document& document,
-    SavingState& state)
-: mDocument (document), mState (state)
-{}
+CSMDoc::WriteCellCollectionStage::WriteCellCollectionStage(Document& document, SavingState& state)
+    : mDocument(document)
+    , mState(state)
+{
+}
 
 int CSMDoc::WriteCellCollectionStage::setup()
 {
     return mDocument.getData().getCells().getSize();
 }
 
-void CSMDoc::WriteCellCollectionStage::writeReferences (const std::deque<int>& references, bool interior, unsigned int& newRefNum)
+void CSMDoc::WriteCellCollectionStage::writeReferences(
+    const std::deque<int>& references, bool interior, unsigned int& newRefNum)
 {
     ESM::ESMWriter& writer = mState.getWriter();
 
-    for (std::deque<int>::const_iterator iter (references.begin());
-        iter!=references.end(); ++iter)
+    for (std::deque<int>::const_iterator iter(references.begin()); iter != references.end(); ++iter)
     {
-        const CSMWorld::Record<CSMWorld::CellRef>& ref =
-            mDocument.getData().getReferences().getRecord (*iter);
+        const CSMWorld::Record<CSMWorld::CellRef>& ref = mDocument.getData().getReferences().getRecord(*iter);
 
         if (ref.isModified() || ref.mState == CSMWorld::RecordBase::State_Deleted)
         {
@@ -282,14 +280,14 @@ void CSMDoc::WriteCellCollectionStage::writeReferences (const std::deque<int>& r
                 stream << "#" << index.first << " " << index.second;
             }
 
-            if (refRecord.mNew || refRecord.mRefNum.mIndex == 0 ||
-                (!interior && ref.mState==CSMWorld::RecordBase::State_ModifiedOnly &&
-                refRecord.mCell!=stream.str()))
+            if (refRecord.mNew || refRecord.mRefNum.mIndex == 0
+                || (!interior && ref.mState == CSMWorld::RecordBase::State_ModifiedOnly
+                    && refRecord.mCell != stream.str()))
             {
                 refRecord.mRefNum.mIndex = newRefNum++;
             }
-            else if ((refRecord.mOriginalCell.empty() ? refRecord.mCell : refRecord.mOriginalCell)
-                    != stream.str() && !interior)
+            else if ((refRecord.mOriginalCell.empty() ? refRecord.mCell : refRecord.mOriginalCell) != stream.str()
+                && !interior)
             {
                 // An empty mOriginalCell is meant to indicate that it is the same as
                 // the current cell.  It is possible that a moved ref is moved again.
@@ -298,57 +296,54 @@ void CSMDoc::WriteCellCollectionStage::writeReferences (const std::deque<int>& r
                 moved.mRefNum = refRecord.mRefNum;
 
                 // Need to fill mTarget with the ref's new position.
-                std::istringstream istream (stream.str().c_str());
+                std::istringstream istream(stream.str().c_str());
 
                 char ignore;
                 istream >> ignore >> moved.mTarget[0] >> moved.mTarget[1];
 
-                refRecord.mRefNum.save (writer, false, "MVRF");
-                writer.writeHNT ("CNDT", moved.mTarget);
+                refRecord.mRefNum.save(writer, false, "MVRF");
+                writer.writeHNT("CNDT", moved.mTarget);
             }
 
-            refRecord.save (writer, false, false, ref.mState == CSMWorld::RecordBase::State_Deleted);
+            refRecord.save(writer, false, false, ref.mState == CSMWorld::RecordBase::State_Deleted);
         }
     }
 }
 
-void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
+void CSMDoc::WriteCellCollectionStage::perform(int stage, Messages& messages)
 {
     ESM::ESMWriter& writer = mState.getWriter();
-    const CSMWorld::Record<CSMWorld::Cell>& cell = mDocument.getData().getCells().getRecord (stage);
+    const CSMWorld::Record<CSMWorld::Cell>& cell = mDocument.getData().getCells().getRecord(stage);
     const CSMWorld::RefIdCollection& referenceables = mDocument.getData().getReferenceables();
     const CSMWorld::RefIdData& refIdData = referenceables.getDataSet();
 
     std::deque<int> tempRefs;
     std::deque<int> persistentRefs;
 
-    std::map<std::string, std::deque<int> >::const_iterator references =
-        mState.getSubRecords().find (Misc::StringUtils::lowerCase (cell.get().mId));
+    std::map<std::string, std::deque<int>>::const_iterator references
+        = mState.getSubRecords().find(Misc::StringUtils::lowerCase(cell.get().mId));
 
-    if (cell.isModified() ||
-        cell.mState == CSMWorld::RecordBase::State_Deleted ||
-        references!=mState.getSubRecords().end())
+    if (cell.isModified() || cell.mState == CSMWorld::RecordBase::State_Deleted
+        || references != mState.getSubRecords().end())
     {
         CSMWorld::Cell cellRecord = cell.get();
-        bool interior = cellRecord.mId.substr (0, 1)!="#";
+        bool interior = cellRecord.mId.substr(0, 1) != "#";
 
         // count new references and adjust RefNumCount accordingsly
         unsigned int newRefNum = cellRecord.mRefNumCounter;
 
-        if (references!=mState.getSubRecords().end())
+        if (references != mState.getSubRecords().end())
         {
-            for (std::deque<int>::const_iterator iter (references->second.begin());
-                iter!=references->second.end(); ++iter)
+            for (std::deque<int>::const_iterator iter(references->second.begin()); iter != references->second.end();
+                 ++iter)
             {
-                const CSMWorld::Record<CSMWorld::CellRef>& ref =
-                    mDocument.getData().getReferences().getRecord (*iter);
+                const CSMWorld::Record<CSMWorld::CellRef>& ref = mDocument.getData().getReferences().getRecord(*iter);
 
                 CSMWorld::CellRef refRecord = ref.get();
 
                 CSMWorld::RefIdData::LocalIndex localIndex = refIdData.searchId(refRecord.mRefID);
                 unsigned int recordFlags = refIdData.getRecordFlags(refRecord.mRefID);
-                bool isPersistent = ((recordFlags & ESM::FLAG_Persistent) != 0)
-                    || refRecord.mTeleport
+                bool isPersistent = ((recordFlags & ESM::FLAG_Persistent) != 0) || refRecord.mTeleport
                     || localIndex.second == CSMWorld::UniversalId::Type_Creature
                     || localIndex.second == CSMWorld::UniversalId::Type_Npc;
 
@@ -357,10 +352,10 @@ void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
                 else
                     tempRefs.push_back(*iter);
 
-                if (refRecord.mNew ||
-                    (!interior && ref.mState==CSMWorld::RecordBase::State_ModifiedOnly &&
-                    /// \todo consider worldspace
-                    CSMWorld::CellCoordinates (refRecord.getCellIndex()).getId("") != refRecord.mCell))
+                if (refRecord.mNew
+                    || (!interior && ref.mState == CSMWorld::RecordBase::State_ModifiedOnly &&
+                        /// \todo consider worldspace
+                        CSMWorld::CellCoordinates(refRecord.getCellIndex()).getId("") != refRecord.mCell))
                     ++cellRecord.mRefNumCounter;
 
                 if (refRecord.mRefNum.mIndex >= newRefNum)
@@ -369,7 +364,7 @@ void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
         }
 
         // write cell data
-        writer.startRecord (cellRecord.sRecordId);
+        writer.startRecord(cellRecord.sRecordId);
 
         if (interior)
             cellRecord.mData.mFlags |= ESM::Cell::Interior;
@@ -377,157 +372,155 @@ void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
         {
             cellRecord.mData.mFlags &= ~ESM::Cell::Interior;
 
-            std::istringstream stream (cellRecord.mId.c_str());
+            std::istringstream stream(cellRecord.mId.c_str());
             char ignore;
             stream >> ignore >> cellRecord.mData.mX >> cellRecord.mData.mY;
         }
 
-        cellRecord.save (writer, cell.mState == CSMWorld::RecordBase::State_Deleted);
+        cellRecord.save(writer, cell.mState == CSMWorld::RecordBase::State_Deleted);
 
         // write references
-        if (references!=mState.getSubRecords().end())
+        if (references != mState.getSubRecords().end())
         {
             writeReferences(persistentRefs, interior, newRefNum);
             cellRecord.saveTempMarker(writer, int(references->second.size()) - persistentRefs.size());
             writeReferences(tempRefs, interior, newRefNum);
         }
 
-        writer.endRecord (cellRecord.sRecordId);
+        writer.endRecord(cellRecord.sRecordId);
     }
 }
 
-
-CSMDoc::WritePathgridCollectionStage::WritePathgridCollectionStage (Document& document,
-    SavingState& state)
-: mDocument (document), mState (state)
-{}
+CSMDoc::WritePathgridCollectionStage::WritePathgridCollectionStage(Document& document, SavingState& state)
+    : mDocument(document)
+    , mState(state)
+{
+}
 
 int CSMDoc::WritePathgridCollectionStage::setup()
 {
     return mDocument.getData().getPathgrids().getSize();
 }
 
-void CSMDoc::WritePathgridCollectionStage::perform (int stage, Messages& messages)
+void CSMDoc::WritePathgridCollectionStage::perform(int stage, Messages& messages)
 {
     ESM::ESMWriter& writer = mState.getWriter();
-    const CSMWorld::Record<CSMWorld::Pathgrid>& pathgrid =
-        mDocument.getData().getPathgrids().getRecord (stage);
+    const CSMWorld::Record<CSMWorld::Pathgrid>& pathgrid = mDocument.getData().getPathgrids().getRecord(stage);
 
     if (pathgrid.isModified() || pathgrid.mState == CSMWorld::RecordBase::State_Deleted)
     {
         CSMWorld::Pathgrid record = pathgrid.get();
 
-        if (record.mId.substr (0, 1)=="#")
+        if (record.mId.substr(0, 1) == "#")
         {
-            std::istringstream stream (record.mId.c_str());
+            std::istringstream stream(record.mId.c_str());
             char ignore;
             stream >> ignore >> record.mData.mX >> record.mData.mY;
         }
         else
             record.mCell = record.mId;
 
-        writer.startRecord (record.sRecordId);
-        record.save (writer, pathgrid.mState == CSMWorld::RecordBase::State_Deleted);
-        writer.endRecord (record.sRecordId);
+        writer.startRecord(record.sRecordId);
+        record.save(writer, pathgrid.mState == CSMWorld::RecordBase::State_Deleted);
+        writer.endRecord(record.sRecordId);
     }
 }
 
-
-CSMDoc::WriteLandCollectionStage::WriteLandCollectionStage (Document& document,
-    SavingState& state)
-: mDocument (document), mState (state)
-{}
+CSMDoc::WriteLandCollectionStage::WriteLandCollectionStage(Document& document, SavingState& state)
+    : mDocument(document)
+    , mState(state)
+{
+}
 
 int CSMDoc::WriteLandCollectionStage::setup()
 {
     return mDocument.getData().getLand().getSize();
 }
 
-void CSMDoc::WriteLandCollectionStage::perform (int stage, Messages& messages)
+void CSMDoc::WriteLandCollectionStage::perform(int stage, Messages& messages)
 {
     ESM::ESMWriter& writer = mState.getWriter();
-    const CSMWorld::Record<CSMWorld::Land>& land =
-        mDocument.getData().getLand().getRecord (stage);
+    const CSMWorld::Record<CSMWorld::Land>& land = mDocument.getData().getLand().getRecord(stage);
 
     if (land.isModified() || land.mState == CSMWorld::RecordBase::State_Deleted)
     {
         CSMWorld::Land record = land.get();
-        writer.startRecord (record.sRecordId);
-        record.save (writer, land.mState == CSMWorld::RecordBase::State_Deleted);
-        writer.endRecord (record.sRecordId);
+        writer.startRecord(record.sRecordId);
+        record.save(writer, land.mState == CSMWorld::RecordBase::State_Deleted);
+        writer.endRecord(record.sRecordId);
     }
 }
 
-
-CSMDoc::WriteLandTextureCollectionStage::WriteLandTextureCollectionStage (Document& document,
-    SavingState& state)
-: mDocument (document), mState (state)
-{}
+CSMDoc::WriteLandTextureCollectionStage::WriteLandTextureCollectionStage(Document& document, SavingState& state)
+    : mDocument(document)
+    , mState(state)
+{
+}
 
 int CSMDoc::WriteLandTextureCollectionStage::setup()
 {
     return mDocument.getData().getLandTextures().getSize();
 }
 
-void CSMDoc::WriteLandTextureCollectionStage::perform (int stage, Messages& messages)
+void CSMDoc::WriteLandTextureCollectionStage::perform(int stage, Messages& messages)
 {
     ESM::ESMWriter& writer = mState.getWriter();
-    const CSMWorld::Record<CSMWorld::LandTexture>& landTexture =
-        mDocument.getData().getLandTextures().getRecord (stage);
+    const CSMWorld::Record<CSMWorld::LandTexture>& landTexture = mDocument.getData().getLandTextures().getRecord(stage);
 
     if (landTexture.isModified() || landTexture.mState == CSMWorld::RecordBase::State_Deleted)
     {
         CSMWorld::LandTexture record = landTexture.get();
-        writer.startRecord (record.sRecordId);
-        record.save (writer, landTexture.mState == CSMWorld::RecordBase::State_Deleted);
-        writer.endRecord (record.sRecordId);
+        writer.startRecord(record.sRecordId);
+        record.save(writer, landTexture.mState == CSMWorld::RecordBase::State_Deleted);
+        writer.endRecord(record.sRecordId);
     }
 }
 
-
-CSMDoc::CloseSaveStage::CloseSaveStage (SavingState& state)
-: mState (state)
-{}
+CSMDoc::CloseSaveStage::CloseSaveStage(SavingState& state)
+    : mState(state)
+{
+}
 
 int CSMDoc::CloseSaveStage::setup()
 {
     return 1;
 }
 
-void CSMDoc::CloseSaveStage::perform (int stage, Messages& messages)
+void CSMDoc::CloseSaveStage::perform(int stage, Messages& messages)
 {
     mState.getStream().close();
 
     if (!mState.getStream())
-        throw std::runtime_error ("saving failed");
+        throw std::runtime_error("saving failed");
 }
 
-
-CSMDoc::FinalSavingStage::FinalSavingStage (Document& document, SavingState& state)
-: mDocument (document), mState (state)
-{}
+CSMDoc::FinalSavingStage::FinalSavingStage(Document& document, SavingState& state)
+    : mDocument(document)
+    , mState(state)
+{
+}
 
 int CSMDoc::FinalSavingStage::setup()
 {
     return 1;
 }
 
-void CSMDoc::FinalSavingStage::perform (int stage, Messages& messages)
+void CSMDoc::FinalSavingStage::perform(int stage, Messages& messages)
 {
     if (mState.hasError())
     {
         mState.getWriter().close();
         mState.getStream().close();
 
-        if (std::filesystem::exists (mState.getTmpPath()))
-            std::filesystem::remove (mState.getTmpPath());
+        if (std::filesystem::exists(mState.getTmpPath()))
+            std::filesystem::remove(mState.getTmpPath());
     }
     else if (!mState.isProjectFile())
     {
-        if (std::filesystem::exists (mState.getPath()))
-            std::filesystem::remove (mState.getPath());
+        if (std::filesystem::exists(mState.getPath()))
+            std::filesystem::remove(mState.getPath());
 
-        std::filesystem::rename (mState.getTmpPath(), mState.getPath());
+        std::filesystem::rename(mState.getTmpPath(), mState.getPath());
 
         mDocument.getUndoStack().setClean();
     }
diff --git a/apps/opencs/model/doc/savingstages.hpp b/apps/opencs/model/doc/savingstages.hpp
index 9ccd1772e1..90ada3d502 100644
--- a/apps/opencs/model/doc/savingstages.hpp
+++ b/apps/opencs/model/doc/savingstages.hpp
@@ -3,8 +3,8 @@
 
 #include "stage.hpp"
 
-#include "../world/record.hpp"
 #include "../world/idcollection.hpp"
+#include "../world/record.hpp"
 #include "../world/scope.hpp"
 
 #include <components/esm/defs.hpp>
@@ -28,242 +28,225 @@ namespace CSMDoc
 
     class OpenSaveStage : public Stage
     {
-            Document& mDocument;
-            SavingState& mState;
-            bool mProjectFile;
-
-        public:
+        Document& mDocument;
+        SavingState& mState;
+        bool mProjectFile;
 
-            OpenSaveStage (Document& document, SavingState& state, bool projectFile);
-            ///< \param projectFile Saving the project file instead of the content file.
+    public:
+        OpenSaveStage(Document& document, SavingState& state, bool projectFile);
+        ///< \param projectFile Saving the project file instead of the content file.
 
-            int setup() override;
-            ///< \return number of steps
+        int setup() override;
+        ///< \return number of steps
 
-            void perform (int stage, Messages& messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 
     class WriteHeaderStage : public Stage
     {
-            Document& mDocument;
-            SavingState& mState;
-            bool mSimple;
+        Document& mDocument;
+        SavingState& mState;
+        bool mSimple;
 
-        public:
+    public:
+        WriteHeaderStage(Document& document, SavingState& state, bool simple);
+        ///< \param simple Simplified header (used for project files).
 
-            WriteHeaderStage (Document& document, SavingState& state, bool simple);
-            ///< \param simple Simplified header (used for project files).
+        int setup() override;
+        ///< \return number of steps
 
-            int setup() override;
-            ///< \return number of steps
-
-            void perform (int stage, Messages& messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 
-
-    template<class CollectionT>
+    template <class CollectionT>
     class WriteCollectionStage : public Stage
     {
-            const CollectionT& mCollection;
-            SavingState& mState;
-            CSMWorld::Scope mScope;
-
-        public:
+        const CollectionT& mCollection;
+        SavingState& mState;
+        CSMWorld::Scope mScope;
 
-            WriteCollectionStage (const CollectionT& collection, SavingState& state,
-                CSMWorld::Scope scope = CSMWorld::Scope_Content);
+    public:
+        WriteCollectionStage(
+            const CollectionT& collection, SavingState& state, CSMWorld::Scope scope = CSMWorld::Scope_Content);
 
-            int setup() override;
-            ///< \return number of steps
+        int setup() override;
+        ///< \return number of steps
 
-            void perform (int stage, Messages& messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 
-    template<class CollectionT>
-    WriteCollectionStage<CollectionT>::WriteCollectionStage (const CollectionT& collection,
-        SavingState& state, CSMWorld::Scope scope)
-    : mCollection (collection), mState (state), mScope (scope)
-    {}
+    template <class CollectionT>
+    WriteCollectionStage<CollectionT>::WriteCollectionStage(
+        const CollectionT& collection, SavingState& state, CSMWorld::Scope scope)
+        : mCollection(collection)
+        , mState(state)
+        , mScope(scope)
+    {
+    }
 
-    template<class CollectionT>
+    template <class CollectionT>
     int WriteCollectionStage<CollectionT>::setup()
     {
         return mCollection.getSize();
     }
 
-    template<class CollectionT>
-    void WriteCollectionStage<CollectionT>::perform (int stage, Messages& messages)
+    template <class CollectionT>
+    void WriteCollectionStage<CollectionT>::perform(int stage, Messages& messages)
     {
-        if (CSMWorld::getScopeFromId (mCollection.getRecord (stage).get().mId)!=mScope)
+        if (CSMWorld::getScopeFromId(mCollection.getRecord(stage).get().mId) != mScope)
             return;
 
         ESM::ESMWriter& writer = mState.getWriter();
-        CSMWorld::RecordBase::State state = mCollection.getRecord (stage).mState;
-        typename CollectionT::ESXRecord record = mCollection.getRecord (stage).get();
+        CSMWorld::RecordBase::State state = mCollection.getRecord(stage).mState;
+        typename CollectionT::ESXRecord record = mCollection.getRecord(stage).get();
 
-        if (state == CSMWorld::RecordBase::State_Modified ||
-            state == CSMWorld::RecordBase::State_ModifiedOnly ||
-            state == CSMWorld::RecordBase::State_Deleted)
+        if (state == CSMWorld::RecordBase::State_Modified || state == CSMWorld::RecordBase::State_ModifiedOnly
+            || state == CSMWorld::RecordBase::State_Deleted)
         {
-            writer.startRecord (record.sRecordId, record.mRecordFlags);
-            record.save (writer, state == CSMWorld::RecordBase::State_Deleted);
-            writer.endRecord (record.sRecordId);
+            writer.startRecord(record.sRecordId, record.mRecordFlags);
+            record.save(writer, state == CSMWorld::RecordBase::State_Deleted);
+            writer.endRecord(record.sRecordId);
         }
     }
 
-
     class WriteDialogueCollectionStage : public Stage
     {
-            SavingState& mState;
-            const CSMWorld::IdCollection<ESM::Dialogue>& mTopics;
-            CSMWorld::InfoCollection& mInfos;
+        SavingState& mState;
+        const CSMWorld::IdCollection<ESM::Dialogue>& mTopics;
+        CSMWorld::InfoCollection& mInfos;
 
-        public:
+    public:
+        WriteDialogueCollectionStage(Document& document, SavingState& state, bool journal);
 
-            WriteDialogueCollectionStage (Document& document, SavingState& state, bool journal);
+        int setup() override;
+        ///< \return number of steps
 
-            int setup() override;
-            ///< \return number of steps
-
-            void perform (int stage, Messages& messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 
-
     class WriteRefIdCollectionStage : public Stage
     {
-            Document& mDocument;
-            SavingState& mState;
-
-        public:
+        Document& mDocument;
+        SavingState& mState;
 
-            WriteRefIdCollectionStage (Document& document, SavingState& state);
+    public:
+        WriteRefIdCollectionStage(Document& document, SavingState& state);
 
-            int setup() override;
-            ///< \return number of steps
+        int setup() override;
+        ///< \return number of steps
 
-            void perform (int stage, Messages& messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 
-
     class CollectionReferencesStage : public Stage
     {
-            Document& mDocument;
-            SavingState& mState;
-
-        public:
+        Document& mDocument;
+        SavingState& mState;
 
-            CollectionReferencesStage (Document& document, SavingState& state);
+    public:
+        CollectionReferencesStage(Document& document, SavingState& state);
 
-            int setup() override;
-            ///< \return number of steps
+        int setup() override;
+        ///< \return number of steps
 
-            void perform (int stage, Messages& messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 
     class WriteCellCollectionStage : public Stage
     {
-            Document& mDocument;
-            SavingState& mState;
-
-            void writeReferences (const std::deque<int>& references, bool interior, unsigned int& newRefNum);
+        Document& mDocument;
+        SavingState& mState;
 
-        public:
+        void writeReferences(const std::deque<int>& references, bool interior, unsigned int& newRefNum);
 
-            WriteCellCollectionStage (Document& document, SavingState& state);
+    public:
+        WriteCellCollectionStage(Document& document, SavingState& state);
 
-            int setup() override;
-            ///< \return number of steps
+        int setup() override;
+        ///< \return number of steps
 
-            void perform (int stage, Messages& messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 
-
     class WritePathgridCollectionStage : public Stage
     {
-            Document& mDocument;
-            SavingState& mState;
-
-        public:
+        Document& mDocument;
+        SavingState& mState;
 
-            WritePathgridCollectionStage (Document& document, SavingState& state);
+    public:
+        WritePathgridCollectionStage(Document& document, SavingState& state);
 
-            int setup() override;
-            ///< \return number of steps
+        int setup() override;
+        ///< \return number of steps
 
-            void perform (int stage, Messages& messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 
-
     class WriteLandCollectionStage : public Stage
     {
-            Document& mDocument;
-            SavingState& mState;
+        Document& mDocument;
+        SavingState& mState;
 
-        public:
+    public:
+        WriteLandCollectionStage(Document& document, SavingState& state);
 
-            WriteLandCollectionStage (Document& document, SavingState& state);
+        int setup() override;
+        ///< \return number of steps
 
-            int setup() override;
-            ///< \return number of steps
-
-            void perform (int stage, Messages& messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 
-
     class WriteLandTextureCollectionStage : public Stage
     {
-            Document& mDocument;
-            SavingState& mState;
-
-        public:
+        Document& mDocument;
+        SavingState& mState;
 
-            WriteLandTextureCollectionStage (Document& document, SavingState& state);
+    public:
+        WriteLandTextureCollectionStage(Document& document, SavingState& state);
 
-            int setup() override;
-            ///< \return number of steps
+        int setup() override;
+        ///< \return number of steps
 
-            void perform (int stage, Messages& messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 
     class CloseSaveStage : public Stage
     {
-            SavingState& mState;
+        SavingState& mState;
 
-        public:
+    public:
+        CloseSaveStage(SavingState& state);
 
-            CloseSaveStage (SavingState& state);
+        int setup() override;
+        ///< \return number of steps
 
-            int setup() override;
-            ///< \return number of steps
-
-            void perform (int stage, Messages& messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 
     class FinalSavingStage : public Stage
     {
-            Document& mDocument;
-            SavingState& mState;
-
-        public:
+        Document& mDocument;
+        SavingState& mState;
 
-            FinalSavingStage (Document& document, SavingState& state);
+    public:
+        FinalSavingStage(Document& document, SavingState& state);
 
-            int setup() override;
-            ///< \return number of steps
+        int setup() override;
+        ///< \return number of steps
 
-            void perform (int stage, Messages& messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 }
 
diff --git a/apps/opencs/model/doc/savingstate.cpp b/apps/opencs/model/doc/savingstate.cpp
index e9a2b55385..283f624242 100644
--- a/apps/opencs/model/doc/savingstate.cpp
+++ b/apps/opencs/model/doc/savingstate.cpp
@@ -3,14 +3,16 @@
 #include <filesystem>
 #include <utility>
 
-#include "operation.hpp"
 #include "document.hpp"
+#include "operation.hpp"
 
-CSMDoc::SavingState::SavingState (Operation& operation, std::filesystem::path  projectPath,
-    ToUTF8::FromType encoding)
-: mOperation (operation), mEncoder (encoding),  mProjectPath (std::move(projectPath)), mProjectFile (false)
+CSMDoc::SavingState::SavingState(Operation& operation, std::filesystem::path projectPath, ToUTF8::FromType encoding)
+    : mOperation(operation)
+    , mEncoder(encoding)
+    , mProjectPath(std::move(projectPath))
+    , mProjectFile(false)
 {
-    mWriter.setEncoder (&mEncoder);
+    mWriter.setEncoder(&mEncoder);
 }
 
 bool CSMDoc::SavingState::hasError() const
@@ -18,7 +20,7 @@ bool CSMDoc::SavingState::hasError() const
     return mOperation.hasError();
 }
 
-void CSMDoc::SavingState::start (Document& document, bool project)
+void CSMDoc::SavingState::start(Document& document, bool project)
 {
     mProjectFile = project;
 
@@ -34,7 +36,7 @@ void CSMDoc::SavingState::start (Document& document, bool project)
     else
         mPath = document.getSavePath();
 
-    std::filesystem::path file (mPath.filename().u8string() + u8".tmp");
+    std::filesystem::path file(mPath.filename().u8string() + u8".tmp");
 
     mTmpPath = mPath.parent_path();
 
@@ -66,7 +68,7 @@ bool CSMDoc::SavingState::isProjectFile() const
     return mProjectFile;
 }
 
-std::map<std::string, std::deque<int> >& CSMDoc::SavingState::getSubRecords()
+std::map<std::string, std::deque<int>>& CSMDoc::SavingState::getSubRecords()
 {
     return mSubRecords;
 }
diff --git a/apps/opencs/model/doc/savingstate.hpp b/apps/opencs/model/doc/savingstate.hpp
index d05c6d504c..2ddc782a4b 100644
--- a/apps/opencs/model/doc/savingstate.hpp
+++ b/apps/opencs/model/doc/savingstate.hpp
@@ -1,10 +1,10 @@
 #ifndef CSM_DOC_SAVINGSTATE_H
 #define CSM_DOC_SAVINGSTATE_H
 
-#include <fstream>
-#include <map>
 #include <deque>
 #include <filesystem>
+#include <fstream>
+#include <map>
 
 #include <components/esm3/esmwriter.hpp>
 
@@ -17,41 +17,38 @@ namespace CSMDoc
 
     class SavingState
     {
-            Operation& mOperation;
-            std::filesystem::path mPath;
-            std::filesystem::path mTmpPath;
-            ToUTF8::Utf8Encoder mEncoder;
-            std::ofstream mStream;
-            ESM::ESMWriter mWriter;
-            std::filesystem::path mProjectPath;
-            bool mProjectFile;
-            std::map<std::string, std::deque<int> > mSubRecords; // record ID, list of subrecords
-
-        public:
+        Operation& mOperation;
+        std::filesystem::path mPath;
+        std::filesystem::path mTmpPath;
+        ToUTF8::Utf8Encoder mEncoder;
+        std::ofstream mStream;
+        ESM::ESMWriter mWriter;
+        std::filesystem::path mProjectPath;
+        bool mProjectFile;
+        std::map<std::string, std::deque<int>> mSubRecords; // record ID, list of subrecords
 
-            SavingState (Operation& operation, std::filesystem::path  projectPath,
-                ToUTF8::FromType encoding);
+    public:
+        SavingState(Operation& operation, std::filesystem::path projectPath, ToUTF8::FromType encoding);
 
-            bool hasError() const;
+        bool hasError() const;
 
-            void start (Document& document, bool project);
-            ///< \param project Save project file instead of content file.
+        void start(Document& document, bool project);
+        ///< \param project Save project file instead of content file.
 
-            const std::filesystem::path& getPath() const;
+        const std::filesystem::path& getPath() const;
 
-            const std::filesystem::path& getTmpPath() const;
+        const std::filesystem::path& getTmpPath() const;
 
-            std::ofstream& getStream();
+        std::ofstream& getStream();
 
-            ESM::ESMWriter& getWriter();
+        ESM::ESMWriter& getWriter();
 
-            bool isProjectFile() const;
-            ///< Currently saving project file? (instead of content file)
+        bool isProjectFile() const;
+        ///< Currently saving project file? (instead of content file)
 
-            std::map<std::string, std::deque<int> >& getSubRecords();
+        std::map<std::string, std::deque<int>>& getSubRecords();
     };
 
-
 }
 
 #endif
diff --git a/apps/opencs/model/doc/stage.hpp b/apps/opencs/model/doc/stage.hpp
index 950019ce9a..d8f8a77c43 100644
--- a/apps/opencs/model/doc/stage.hpp
+++ b/apps/opencs/model/doc/stage.hpp
@@ -1,8 +1,8 @@
 #ifndef CSM_DOC_STAGE_H
 #define CSM_DOC_STAGE_H
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "messages.hpp"
 
@@ -12,15 +12,14 @@ namespace CSMDoc
 {
     class Stage
     {
-        public:
-
-            virtual ~Stage();
+    public:
+        virtual ~Stage();
 
-            virtual int setup() = 0;
-            ///< \return number of steps
+        virtual int setup() = 0;
+        ///< \return number of steps
 
-            virtual void perform (int stage, Messages& messages) = 0;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        virtual void perform(int stage, Messages& messages) = 0;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 }
 
diff --git a/apps/opencs/model/doc/state.hpp b/apps/opencs/model/doc/state.hpp
index 7352b4b999..9d53fa816b 100644
--- a/apps/opencs/model/doc/state.hpp
+++ b/apps/opencs/model/doc/state.hpp
@@ -14,7 +14,7 @@ namespace CSMDoc
         State_Verifying = 32,
         State_Merging = 64,
         State_Searching = 128,
-        State_Loading = 256   // pseudo-state; can not be encountered in a loaded document
+        State_Loading = 256 // pseudo-state; can not be encountered in a loaded document
     };
 }
 
diff --git a/apps/opencs/model/filter/andnode.cpp b/apps/opencs/model/filter/andnode.cpp
index 508202edfc..c2fd79a7bd 100644
--- a/apps/opencs/model/filter/andnode.cpp
+++ b/apps/opencs/model/filter/andnode.cpp
@@ -1,16 +1,16 @@
 #include "andnode.hpp"
 
-CSMFilter::AndNode::AndNode (const std::vector<std::shared_ptr<Node> >& nodes)
-: NAryNode (nodes, "and")
-{}
+CSMFilter::AndNode::AndNode(const std::vector<std::shared_ptr<Node>>& nodes)
+    : NAryNode(nodes, "and")
+{
+}
 
-bool CSMFilter::AndNode::test (const CSMWorld::IdTableBase& table, int row,
-    const std::map<int, int>& columns) const
+bool CSMFilter::AndNode::test(const CSMWorld::IdTableBase& table, int row, const std::map<int, int>& columns) const
 {
     int size = getSize();
 
-    for (int i=0; i<size; ++i)
-        if (!(*this)[i].test (table, row, columns))
+    for (int i = 0; i < size; ++i)
+        if (!(*this)[i].test(table, row, columns))
             return false;
 
     return true;
diff --git a/apps/opencs/model/filter/andnode.hpp b/apps/opencs/model/filter/andnode.hpp
index ab2c3ea992..763e03db11 100644
--- a/apps/opencs/model/filter/andnode.hpp
+++ b/apps/opencs/model/filter/andnode.hpp
@@ -7,14 +7,12 @@ namespace CSMFilter
 {
     class AndNode : public NAryNode
     {
-        public:
+    public:
+        AndNode(const std::vector<std::shared_ptr<Node>>& nodes);
 
-            AndNode (const std::vector<std::shared_ptr<Node> >& nodes);
-
-            bool test (const CSMWorld::IdTableBase& table, int row,
-                const std::map<int, int>& columns) const override;
-            ///< \return Can the specified table row pass through to filter?
-            /// \param columns column ID to column index mapping
+        bool test(const CSMWorld::IdTableBase& table, int row, const std::map<int, int>& columns) const override;
+        ///< \return Can the specified table row pass through to filter?
+        /// \param columns column ID to column index mapping
     };
 }
 
diff --git a/apps/opencs/model/filter/booleannode.cpp b/apps/opencs/model/filter/booleannode.cpp
index ee7ddc1c05..da8470ee7e 100644
--- a/apps/opencs/model/filter/booleannode.cpp
+++ b/apps/opencs/model/filter/booleannode.cpp
@@ -1,14 +1,16 @@
 #include "booleannode.hpp"
 
-CSMFilter::BooleanNode::BooleanNode (bool true_) : mTrue (true_) {}
+CSMFilter::BooleanNode::BooleanNode(bool true_)
+    : mTrue(true_)
+{
+}
 
-bool CSMFilter::BooleanNode::test (const CSMWorld::IdTableBase& table, int row,
-    const std::map<int, int>& columns) const
+bool CSMFilter::BooleanNode::test(const CSMWorld::IdTableBase& table, int row, const std::map<int, int>& columns) const
 {
     return mTrue;
 }
 
-std::string CSMFilter::BooleanNode::toString (bool numericColumns) const
+std::string CSMFilter::BooleanNode::toString(bool numericColumns) const
 {
     return mTrue ? "true" : "false";
 }
diff --git a/apps/opencs/model/filter/booleannode.hpp b/apps/opencs/model/filter/booleannode.hpp
index bed6cbeb0c..c1bf3bd644 100644
--- a/apps/opencs/model/filter/booleannode.hpp
+++ b/apps/opencs/model/filter/booleannode.hpp
@@ -7,22 +7,19 @@ namespace CSMFilter
 {
     class BooleanNode : public LeafNode
     {
-            bool mTrue;
+        bool mTrue;
 
-        public:
+    public:
+        BooleanNode(bool true_);
 
-            BooleanNode (bool true_);
-
-            bool test (const CSMWorld::IdTableBase& table, int row,
-                const std::map<int, int>& columns) const override;
-            ///< \return Can the specified table row pass through to filter?
-            /// \param columns column ID to column index mapping
-
-            std::string toString (bool numericColumns) const override;
-            ///< Return a string that represents this node.
-            ///
-            /// \param numericColumns Use numeric IDs instead of string to represent columns.
+        bool test(const CSMWorld::IdTableBase& table, int row, const std::map<int, int>& columns) const override;
+        ///< \return Can the specified table row pass through to filter?
+        /// \param columns column ID to column index mapping
 
+        std::string toString(bool numericColumns) const override;
+        ///< Return a string that represents this node.
+        ///
+        /// \param numericColumns Use numeric IDs instead of string to represent columns.
     };
 }
 
diff --git a/apps/opencs/model/filter/leafnode.cpp b/apps/opencs/model/filter/leafnode.cpp
index 6745e165ec..fd37c6cb64 100644
--- a/apps/opencs/model/filter/leafnode.cpp
+++ b/apps/opencs/model/filter/leafnode.cpp
@@ -4,4 +4,3 @@ std::vector<int> CSMFilter::LeafNode::getReferencedColumns() const
 {
     return std::vector<int>();
 }
-
diff --git a/apps/opencs/model/filter/leafnode.hpp b/apps/opencs/model/filter/leafnode.hpp
index d27bdcfe84..afaad32a70 100644
--- a/apps/opencs/model/filter/leafnode.hpp
+++ b/apps/opencs/model/filter/leafnode.hpp
@@ -9,11 +9,10 @@ namespace CSMFilter
 {
     class LeafNode : public Node
     {
-        public:
-
-            std::vector<int> getReferencedColumns() const override;
-            ///< Return a list of the IDs of the columns referenced by this node. The column mapping
-            /// passed into test as columns must contain all columns listed here.
+    public:
+        std::vector<int> getReferencedColumns() const override;
+        ///< Return a list of the IDs of the columns referenced by this node. The column mapping
+        /// passed into test as columns must contain all columns listed here.
     };
 }
 
diff --git a/apps/opencs/model/filter/narynode.cpp b/apps/opencs/model/filter/narynode.cpp
index 9415f1daff..622e57182b 100644
--- a/apps/opencs/model/filter/narynode.cpp
+++ b/apps/opencs/model/filter/narynode.cpp
@@ -2,37 +2,37 @@
 
 #include <sstream>
 
-CSMFilter::NAryNode::NAryNode (const std::vector<std::shared_ptr<Node> >& nodes,
-    const std::string& name)
-: mNodes (nodes), mName (name)
-{}
+CSMFilter::NAryNode::NAryNode(const std::vector<std::shared_ptr<Node>>& nodes, const std::string& name)
+    : mNodes(nodes)
+    , mName(name)
+{
+}
 
 int CSMFilter::NAryNode::getSize() const
 {
     return static_cast<int>(mNodes.size());
 }
 
-const CSMFilter::Node& CSMFilter::NAryNode::operator[] (int index) const
+const CSMFilter::Node& CSMFilter::NAryNode::operator[](int index) const
 {
-    return *mNodes.at (index);
+    return *mNodes.at(index);
 }
 
 std::vector<int> CSMFilter::NAryNode::getReferencedColumns() const
 {
     std::vector<int> columns;
 
-    for (std::vector<std::shared_ptr<Node> >::const_iterator iter (mNodes.begin());
-         iter!=mNodes.end(); ++iter)
+    for (std::vector<std::shared_ptr<Node>>::const_iterator iter(mNodes.begin()); iter != mNodes.end(); ++iter)
     {
         std::vector<int> columns2 = (*iter)->getReferencedColumns();
 
-        columns.insert (columns.end(), columns2.begin(), columns2.end());
+        columns.insert(columns.end(), columns2.begin(), columns2.end());
     }
 
     return columns;
 }
 
-std::string CSMFilter::NAryNode::toString (bool numericColumns) const
+std::string CSMFilter::NAryNode::toString(bool numericColumns) const
 {
     std::ostringstream stream;
 
@@ -41,19 +41,17 @@ std::string CSMFilter::NAryNode::toString (bool numericColumns) const
     bool first = true;
     int size = getSize();
 
-    for (int i=0; i<size; ++i)
+    for (int i = 0; i < size; ++i)
     {
         if (first)
             first = false;
         else
             stream << ", ";
 
-        stream << (*this)[i].toString (numericColumns);
+        stream << (*this)[i].toString(numericColumns);
     }
 
     stream << ")";
 
     return stream.str();
 }
-
-
diff --git a/apps/opencs/model/filter/narynode.hpp b/apps/opencs/model/filter/narynode.hpp
index 231e38e13e..8df0c68835 100644
--- a/apps/opencs/model/filter/narynode.hpp
+++ b/apps/opencs/model/filter/narynode.hpp
@@ -1,8 +1,8 @@
 #ifndef CSM_FILTER_NARYNODE_H
 #define CSM_FILTER_NARYNODE_H
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "node.hpp"
 
@@ -10,25 +10,24 @@ namespace CSMFilter
 {
     class NAryNode : public Node
     {
-            std::vector<std::shared_ptr<Node> > mNodes;
-            std::string mName;
-
-        public:
+        std::vector<std::shared_ptr<Node>> mNodes;
+        std::string mName;
 
-            NAryNode (const std::vector<std::shared_ptr<Node> >& nodes, const std::string& name);
+    public:
+        NAryNode(const std::vector<std::shared_ptr<Node>>& nodes, const std::string& name);
 
-            int getSize() const;
+        int getSize() const;
 
-            const Node& operator[] (int index) const;
+        const Node& operator[](int index) const;
 
-            std::vector<int> getReferencedColumns() const override;
-            ///< Return a list of the IDs of the columns referenced by this node. The column mapping
-            /// passed into test as columns must contain all columns listed here.
+        std::vector<int> getReferencedColumns() const override;
+        ///< Return a list of the IDs of the columns referenced by this node. The column mapping
+        /// passed into test as columns must contain all columns listed here.
 
-            std::string toString (bool numericColumns) const override;
-            ///< Return a string that represents this node.
-            ///
-            /// \param numericColumns Use numeric IDs instead of string to represent columns.
+        std::string toString(bool numericColumns) const override;
+        ///< Return a string that represents this node.
+        ///
+        /// \param numericColumns Use numeric IDs instead of string to represent columns.
     };
 }
 
diff --git a/apps/opencs/model/filter/node.hpp b/apps/opencs/model/filter/node.hpp
index 7295b9018a..c0ef855360 100644
--- a/apps/opencs/model/filter/node.hpp
+++ b/apps/opencs/model/filter/node.hpp
@@ -1,9 +1,9 @@
 #ifndef CSM_FILTER_NODE_H
 #define CSM_FILTER_NODE_H
 
-#include <string>
 #include <map>
 #include <memory>
+#include <string>
 #include <vector>
 
 #include <QMetaType>
@@ -21,32 +21,30 @@ namespace CSMFilter
     /// interpreted as "the node and all its children".
     class Node
     {
-            // not implemented
-            Node (const Node&);
-            Node& operator= (const Node&);
-
-        public:
+        // not implemented
+        Node(const Node&);
+        Node& operator=(const Node&);
 
-            Node();
+    public:
+        Node();
 
-            virtual ~Node();
+        virtual ~Node();
 
-            virtual bool test (const CSMWorld::IdTableBase& table, int row,
-                const std::map<int, int>& columns) const = 0;
-            ///< \return Can the specified table row pass through to filter?
-            /// \param columns column ID to column index mapping
+        virtual bool test(const CSMWorld::IdTableBase& table, int row, const std::map<int, int>& columns) const = 0;
+        ///< \return Can the specified table row pass through to filter?
+        /// \param columns column ID to column index mapping
 
-            virtual std::vector<int> getReferencedColumns() const = 0;
-            ///< Return a list of the IDs of the columns referenced by this node. The column mapping
-            /// passed into test as columns must contain all columns listed here.
+        virtual std::vector<int> getReferencedColumns() const = 0;
+        ///< Return a list of the IDs of the columns referenced by this node. The column mapping
+        /// passed into test as columns must contain all columns listed here.
 
-            virtual std::string toString (bool numericColumns) const = 0;
-            ///< Return a string that represents this node.
-            ///
-            /// \param numericColumns Use numeric IDs instead of string to represent columns.
+        virtual std::string toString(bool numericColumns) const = 0;
+        ///< Return a string that represents this node.
+        ///
+        /// \param numericColumns Use numeric IDs instead of string to represent columns.
     };
 }
 
-Q_DECLARE_METATYPE (std::shared_ptr<CSMFilter::Node>)
+Q_DECLARE_METATYPE(std::shared_ptr<CSMFilter::Node>)
 
 #endif
diff --git a/apps/opencs/model/filter/notnode.cpp b/apps/opencs/model/filter/notnode.cpp
index 81588c7547..c9074843b8 100644
--- a/apps/opencs/model/filter/notnode.cpp
+++ b/apps/opencs/model/filter/notnode.cpp
@@ -1,9 +1,11 @@
 #include "notnode.hpp"
 
-CSMFilter::NotNode::NotNode (std::shared_ptr<Node> child) : UnaryNode (child, "not") {}
+CSMFilter::NotNode::NotNode(std::shared_ptr<Node> child)
+    : UnaryNode(child, "not")
+{
+}
 
-bool CSMFilter::NotNode::test (const CSMWorld::IdTableBase& table, int row,
-    const std::map<int, int>& columns) const
+bool CSMFilter::NotNode::test(const CSMWorld::IdTableBase& table, int row, const std::map<int, int>& columns) const
 {
-    return !getChild().test (table, row, columns);
+    return !getChild().test(table, row, columns);
 }
diff --git a/apps/opencs/model/filter/notnode.hpp b/apps/opencs/model/filter/notnode.hpp
index 5b15163d97..34a277d5a0 100644
--- a/apps/opencs/model/filter/notnode.hpp
+++ b/apps/opencs/model/filter/notnode.hpp
@@ -7,14 +7,12 @@ namespace CSMFilter
 {
     class NotNode : public UnaryNode
     {
-        public:
+    public:
+        NotNode(std::shared_ptr<Node> child);
 
-            NotNode (std::shared_ptr<Node> child);
-
-            bool test (const CSMWorld::IdTableBase& table, int row,
-                const std::map<int, int>& columns) const override;
-            ///< \return Can the specified table row pass through to filter?
-            /// \param columns column ID to column index mapping
+        bool test(const CSMWorld::IdTableBase& table, int row, const std::map<int, int>& columns) const override;
+        ///< \return Can the specified table row pass through to filter?
+        /// \param columns column ID to column index mapping
     };
 }
 
diff --git a/apps/opencs/model/filter/ornode.cpp b/apps/opencs/model/filter/ornode.cpp
index d6abaca40b..19e06f1aed 100644
--- a/apps/opencs/model/filter/ornode.cpp
+++ b/apps/opencs/model/filter/ornode.cpp
@@ -1,16 +1,16 @@
 #include "ornode.hpp"
 
-CSMFilter::OrNode::OrNode (const std::vector<std::shared_ptr<Node> >& nodes)
-: NAryNode (nodes, "or")
-{}
+CSMFilter::OrNode::OrNode(const std::vector<std::shared_ptr<Node>>& nodes)
+    : NAryNode(nodes, "or")
+{
+}
 
-bool CSMFilter::OrNode::test (const CSMWorld::IdTableBase& table, int row,
-    const std::map<int, int>& columns) const
+bool CSMFilter::OrNode::test(const CSMWorld::IdTableBase& table, int row, const std::map<int, int>& columns) const
 {
     int size = getSize();
 
-    for (int i=0; i<size; ++i)
-        if ((*this)[i].test (table, row, columns))
+    for (int i = 0; i < size; ++i)
+        if ((*this)[i].test(table, row, columns))
             return true;
 
     return false;
diff --git a/apps/opencs/model/filter/ornode.hpp b/apps/opencs/model/filter/ornode.hpp
index 61115b3d9d..80830cff4e 100644
--- a/apps/opencs/model/filter/ornode.hpp
+++ b/apps/opencs/model/filter/ornode.hpp
@@ -7,14 +7,12 @@ namespace CSMFilter
 {
     class OrNode : public NAryNode
     {
-        public:
+    public:
+        OrNode(const std::vector<std::shared_ptr<Node>>& nodes);
 
-            OrNode (const std::vector<std::shared_ptr<Node> >& nodes);
-
-            bool test (const CSMWorld::IdTableBase& table, int row,
-                const std::map<int, int>& columns) const override;
-            ///< \return Can the specified table row pass through to filter?
-            /// \param columns column ID to column index mapping
+        bool test(const CSMWorld::IdTableBase& table, int row, const std::map<int, int>& columns) const override;
+        ///< \return Can the specified table row pass through to filter?
+        /// \param columns column ID to column index mapping
     };
 }
 
diff --git a/apps/opencs/model/filter/parser.cpp b/apps/opencs/model/filter/parser.cpp
index d8b8a441c3..dc7a359680 100644
--- a/apps/opencs/model/filter/parser.cpp
+++ b/apps/opencs/model/filter/parser.cpp
@@ -1,8 +1,8 @@
 #include "parser.hpp"
 
 #include <cctype>
-#include <stdexcept>
 #include <sstream>
+#include <stdexcept>
 
 #include <components/misc/strings/lower.hpp>
 
@@ -10,10 +10,10 @@
 #include "../world/data.hpp"
 #include "../world/idcollection.hpp"
 
-#include "booleannode.hpp"
-#include "ornode.hpp"
 #include "andnode.hpp"
+#include "booleannode.hpp"
 #include "notnode.hpp"
+#include "ornode.hpp"
 #include "textnode.hpp"
 #include "valuenode.hpp"
 
@@ -59,49 +59,70 @@ namespace CSMFilter
         std::string mString;
         double mNumber;
 
-        Token (Type type = Type_None);
+        Token(Type type = Type_None);
 
-        Token (Type type, const std::string& string);
+        Token(Type type, const std::string& string);
         ///< Non-string type that can also be interpreted as a string.
 
-        Token (const std::string& string);
+        Token(const std::string& string);
 
-        Token (double number);
+        Token(double number);
 
         operator bool() const;
 
         bool isString() const;
     };
 
-    Token::Token (Type type) : mType (type), mNumber(0.0) {}
+    Token::Token(Type type)
+        : mType(type)
+        , mNumber(0.0)
+    {
+    }
 
-    Token::Token (Type type, const std::string& string) : mType (type), mString (string), mNumber(0.0) {}
+    Token::Token(Type type, const std::string& string)
+        : mType(type)
+        , mString(string)
+        , mNumber(0.0)
+    {
+    }
 
-    Token::Token (const std::string& string) : mType (Type_String), mString (string), mNumber(0.0) {}
+    Token::Token(const std::string& string)
+        : mType(Type_String)
+        , mString(string)
+        , mNumber(0.0)
+    {
+    }
 
-    Token::Token (double number) : mType (Type_Number), mNumber (number) {}
+    Token::Token(double number)
+        : mType(Type_Number)
+        , mNumber(number)
+    {
+    }
 
     bool Token::isString() const
     {
-        return mType==Type_String || mType>=Type_Keyword_True;
+        return mType == Type_String || mType >= Type_Keyword_True;
     }
 
     Token::operator bool() const
     {
-        return mType!=Type_None;
+        return mType != Type_None;
     }
 
-    bool operator== (const Token& left, const Token& right)
+    bool operator==(const Token& left, const Token& right)
     {
-        if (left.mType!=right.mType)
+        if (left.mType != right.mType)
             return false;
 
         switch (left.mType)
         {
-            case Token::Type_String: return left.mString==right.mString;
-            case Token::Type_Number: return left.mNumber==right.mNumber;
+            case Token::Type_String:
+                return left.mString == right.mString;
+            case Token::Type_Number:
+                return left.mNumber == right.mNumber;
 
-            default: return true;
+            default:
+                return true;
         }
     }
 }
@@ -110,19 +131,19 @@ CSMFilter::Token CSMFilter::Parser::getStringToken()
 {
     std::string string;
 
-    int size = static_cast<int> (mInput.size());
+    int size = static_cast<int>(mInput.size());
 
-    for (; mIndex<size; ++mIndex)
+    for (; mIndex < size; ++mIndex)
     {
         char c = mInput[mIndex];
 
-        if (isAlpha(c) || c==':' || c=='_' || (!string.empty() && isDigit(c)) || c=='"' ||
-            (!string.empty() && string[0]=='"'))
+        if (isAlpha(c) || c == ':' || c == '_' || (!string.empty() && isDigit(c)) || c == '"'
+            || (!string.empty() && string[0] == '"'))
             string += c;
         else
             break;
 
-        if (c=='"' && string.size()>1)
+        if (c == '"' && string.size() > 1)
         {
             ++mIndex;
             break;
@@ -131,35 +152,35 @@ CSMFilter::Token CSMFilter::Parser::getStringToken()
 
     if (!string.empty())
     {
-        if (string[0]=='"' && (string[string.size()-1]!='"' || string.size()<2) )
+        if (string[0] == '"' && (string[string.size() - 1] != '"' || string.size() < 2))
         {
             error();
-            return Token (Token::Type_None);
+            return Token(Token::Type_None);
         }
 
-        if (string[0]!='"' && string[string.size()-1]=='"')
+        if (string[0] != '"' && string[string.size() - 1] == '"')
         {
             error();
-            return Token (Token::Type_None);
+            return Token(Token::Type_None);
         }
 
-        if (string[0]=='"')
-            return string.substr (1, string.size()-2);
+        if (string[0] == '"')
+            return string.substr(1, string.size() - 2);
     }
 
-    return checkKeywords (string);
+    return checkKeywords(string);
 }
 
 CSMFilter::Token CSMFilter::Parser::getNumberToken()
 {
     std::string string;
 
-    int size = static_cast<int> (mInput.size());
+    int size = static_cast<int>(mInput.size());
 
     bool hasDecimalPoint = false;
     bool hasDigit = false;
 
-    for (; mIndex<size; ++mIndex)
+    for (; mIndex < size; ++mIndex)
     {
         char c = mInput[mIndex];
 
@@ -168,12 +189,12 @@ CSMFilter::Token CSMFilter::Parser::getNumberToken()
             string += c;
             hasDigit = true;
         }
-        else if (c=='.' && !hasDecimalPoint)
+        else if (c == '.' && !hasDecimalPoint)
         {
             string += c;
             hasDecimalPoint = true;
         }
-        else if (string.empty() && c=='-')
+        else if (string.empty() && c == '-')
             string += c;
         else
             break;
@@ -182,77 +203,92 @@ CSMFilter::Token CSMFilter::Parser::getNumberToken()
     if (!hasDigit)
     {
         error();
-        return Token (Token::Type_None);
+        return Token(Token::Type_None);
     }
 
     float value;
-    std::istringstream stream (string.c_str());
+    std::istringstream stream(string.c_str());
     stream >> value;
 
     return value;
 }
 
-CSMFilter::Token CSMFilter::Parser::checkKeywords (const Token& token)
+CSMFilter::Token CSMFilter::Parser::checkKeywords(const Token& token)
 {
-    static const char *sKeywords[] =
-    {
-        "true", "false",
-        "and", "or", "not",
-        "string", "value",
+    static const char* sKeywords[] = {
+        "true",
+        "false",
+        "and",
+        "or",
+        "not",
+        "string",
+        "value",
         nullptr,
     };
 
-    std::string string = Misc::StringUtils::lowerCase (token.mString);
+    std::string string = Misc::StringUtils::lowerCase(token.mString);
 
-    for (int i=0; sKeywords[i]; ++i)
-        if (sKeywords[i]==string || (string.size()==1 && sKeywords[i][0]==string[0]))
-            return Token (static_cast<Token::Type> (i+Token::Type_Keyword_True), token.mString);
+    for (int i = 0; sKeywords[i]; ++i)
+        if (sKeywords[i] == string || (string.size() == 1 && sKeywords[i][0] == string[0]))
+            return Token(static_cast<Token::Type>(i + Token::Type_Keyword_True), token.mString);
 
     return token;
 }
 
 CSMFilter::Token CSMFilter::Parser::getNextToken()
 {
-    int size = static_cast<int> (mInput.size());
+    int size = static_cast<int>(mInput.size());
 
     char c = 0;
 
-    for (; mIndex<size; ++mIndex)
+    for (; mIndex < size; ++mIndex)
     {
         c = mInput[mIndex];
 
-        if (c!=' ')
+        if (c != ' ')
             break;
     }
 
-    if (mIndex>=size)
-        return Token (Token::Type_EOS);
+    if (mIndex >= size)
+        return Token(Token::Type_EOS);
 
     switch (c)
     {
-        case '(': ++mIndex; return Token (Token::Type_Open);
-        case ')': ++mIndex; return Token (Token::Type_Close);
-        case '[': ++mIndex; return Token (Token::Type_OpenSquare);
-        case ']': ++mIndex; return Token (Token::Type_CloseSquare);
-        case ',': ++mIndex; return Token (Token::Type_Comma);
-        case '!': ++mIndex; return Token (Token::Type_OneShot);
+        case '(':
+            ++mIndex;
+            return Token(Token::Type_Open);
+        case ')':
+            ++mIndex;
+            return Token(Token::Type_Close);
+        case '[':
+            ++mIndex;
+            return Token(Token::Type_OpenSquare);
+        case ']':
+            ++mIndex;
+            return Token(Token::Type_CloseSquare);
+        case ',':
+            ++mIndex;
+            return Token(Token::Type_Comma);
+        case '!':
+            ++mIndex;
+            return Token(Token::Type_OneShot);
     }
 
-    if (c=='"' || c=='_' || isAlpha(c) || c==':')
+    if (c == '"' || c == '_' || isAlpha(c) || c == ':')
         return getStringToken();
 
-    if (c=='-' || c=='.' || isDigit(c))
+    if (c == '-' || c == '.' || isDigit(c))
         return getNumberToken();
 
     error();
-    return Token (Token::Type_None);
+    return Token(Token::Type_None);
 }
 
-std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseImp (bool allowEmpty, bool ignoreOneShot)
+std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseImp(bool allowEmpty, bool ignoreOneShot)
 {
     if (Token token = getNextToken())
     {
-        if (token==Token (Token::Type_OneShot))
+        if (token == Token(Token::Type_OneShot))
             token = getNextToken();
 
         if (token)
@@ -269,7 +305,7 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseImp (bool allowEmpty, b
                 case Token::Type_Keyword_And:
                 case Token::Type_Keyword_Or:
 
-                    return parseNAry (token);
+                    return parseNAry(token);
 
                 case Token::Type_Keyword_Not:
                 {
@@ -305,13 +341,13 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseImp (bool allowEmpty, b
     return std::shared_ptr<Node>();
 }
 
-std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseNAry (const Token& keyword)
+std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseNAry(const Token& keyword)
 {
-    std::vector<std::shared_ptr<Node> > nodes;
+    std::vector<std::shared_ptr<Node>> nodes;
 
     Token token = getNextToken();
 
-    if (token.mType!=Token::Type_Open)
+    if (token.mType != Token::Type_Open)
     {
         error();
         return std::shared_ptr<Node>();
@@ -324,25 +360,29 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseNAry (const Token& keyw
         if (mError)
             return std::shared_ptr<Node>();
 
-        nodes.push_back (node);
+        nodes.push_back(node);
 
         token = getNextToken();
 
-        if (!token || (token.mType!=Token::Type_Close && token.mType!=Token::Type_Comma))
+        if (!token || (token.mType != Token::Type_Close && token.mType != Token::Type_Comma))
         {
             error();
             return std::shared_ptr<Node>();
         }
 
-        if (token.mType==Token::Type_Close)
+        if (token.mType == Token::Type_Close)
             break;
     }
 
     switch (keyword.mType)
     {
-        case Token::Type_Keyword_And: return std::make_shared<AndNode>(nodes);
-        case Token::Type_Keyword_Or: return std::make_shared<OrNode>(nodes);
-        default: error(); return std::shared_ptr<Node>();
+        case Token::Type_Keyword_And:
+            return std::make_shared<AndNode>(nodes);
+        case Token::Type_Keyword_Or:
+            return std::make_shared<OrNode>(nodes);
+        default:
+            error();
+            return std::shared_ptr<Node>();
     }
 }
 
@@ -350,7 +390,7 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseText()
 {
     Token token = getNextToken();
 
-    if (token.mType!=Token::Type_Open)
+    if (token.mType != Token::Type_Open)
     {
         error();
         return std::shared_ptr<Node>();
@@ -364,17 +404,17 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseText()
     // parse column ID
     int columnId = -1;
 
-    if (token.mType==Token::Type_Number)
+    if (token.mType == Token::Type_Number)
     {
-        if (static_cast<int> (token.mNumber)==token.mNumber)
-            columnId = static_cast<int> (token.mNumber);
+        if (static_cast<int>(token.mNumber) == token.mNumber)
+            columnId = static_cast<int>(token.mNumber);
     }
     else if (token.isString())
     {
-        columnId = CSMWorld::Columns::getId (token.mString);
+        columnId = CSMWorld::Columns::getId(token.mString);
     }
 
-    if (columnId<0)
+    if (columnId < 0)
     {
         error();
         return std::shared_ptr<Node>();
@@ -382,7 +422,7 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseText()
 
     token = getNextToken();
 
-    if (token.mType!=Token::Type_Comma)
+    if (token.mType != Token::Type_Comma)
     {
         error();
         return std::shared_ptr<Node>();
@@ -401,7 +441,7 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseText()
 
     token = getNextToken();
 
-    if (token.mType!=Token::Type_Close)
+    if (token.mType != Token::Type_Close)
     {
         error();
         return std::shared_ptr<Node>();
@@ -414,7 +454,7 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseValue()
 {
     Token token = getNextToken();
 
-    if (token.mType!=Token::Type_Open)
+    if (token.mType != Token::Type_Open)
     {
         error();
         return std::shared_ptr<Node>();
@@ -428,17 +468,17 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseValue()
     // parse column ID
     int columnId = -1;
 
-    if (token.mType==Token::Type_Number)
+    if (token.mType == Token::Type_Number)
     {
-        if (static_cast<int> (token.mNumber)==token.mNumber)
-            columnId = static_cast<int> (token.mNumber);
+        if (static_cast<int>(token.mNumber) == token.mNumber)
+            columnId = static_cast<int>(token.mNumber);
     }
     else if (token.isString())
     {
-        columnId = CSMWorld::Columns::getId (token.mString);
+        columnId = CSMWorld::Columns::getId(token.mString);
     }
 
-    if (columnId<0)
+    if (columnId < 0)
     {
         error();
         return std::shared_ptr<Node>();
@@ -446,7 +486,7 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseValue()
 
     token = getNextToken();
 
-    if (token.mType!=Token::Type_Comma)
+    if (token.mType != Token::Type_Comma)
     {
         error();
         return std::shared_ptr<Node>();
@@ -460,7 +500,7 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseValue()
 
     token = getNextToken();
 
-    if (token.mType==Token::Type_Number)
+    if (token.mType == Token::Type_Number)
     {
         // single value
         lower = upper = token.mNumber;
@@ -469,9 +509,9 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseValue()
     else
     {
         // interval
-        if (token.mType==Token::Type_OpenSquare)
+        if (token.mType == Token::Type_OpenSquare)
             lowerType = ValueNode::Type_Closed;
-        else if (token.mType!=Token::Type_CloseSquare && token.mType!=Token::Type_Open)
+        else if (token.mType != Token::Type_CloseSquare && token.mType != Token::Type_Open)
         {
             error();
             return std::shared_ptr<Node>();
@@ -479,19 +519,19 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseValue()
 
         token = getNextToken();
 
-        if (token.mType==Token::Type_Number)
+        if (token.mType == Token::Type_Number)
         {
             lower = token.mNumber;
 
             token = getNextToken();
 
-            if (token.mType!=Token::Type_Comma)
+            if (token.mType != Token::Type_Comma)
             {
                 error();
                 return std::shared_ptr<Node>();
             }
         }
-        else if (token.mType==Token::Type_Comma)
+        else if (token.mType == Token::Type_Comma)
         {
             lowerType = ValueNode::Type_Infinite;
         }
@@ -503,7 +543,7 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseValue()
 
         token = getNextToken();
 
-        if (token.mType==Token::Type_Number)
+        if (token.mType == Token::Type_Number)
         {
             upper = token.mNumber;
 
@@ -512,12 +552,12 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseValue()
         else
             upperType = ValueNode::Type_Infinite;
 
-        if (token.mType==Token::Type_CloseSquare)
+        if (token.mType == Token::Type_CloseSquare)
         {
-            if (upperType!=ValueNode::Type_Infinite)
+            if (upperType != ValueNode::Type_Infinite)
                 upperType = ValueNode::Type_Closed;
         }
-        else if (token.mType!=Token::Type_OpenSquare && token.mType!=Token::Type_Close)
+        else if (token.mType != Token::Type_OpenSquare && token.mType != Token::Type_Close)
         {
             error();
             return std::shared_ptr<Node>();
@@ -526,7 +566,7 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseValue()
 
     token = getNextToken();
 
-    if (token.mType!=Token::Type_Close)
+    if (token.mType != Token::Type_Close)
     {
         error();
         return std::shared_ptr<Node>();
@@ -540,10 +580,14 @@ void CSMFilter::Parser::error()
     mError = true;
 }
 
-CSMFilter::Parser::Parser (const CSMWorld::Data& data)
-: mIndex (0), mError (false), mData (data) {}
+CSMFilter::Parser::Parser(const CSMWorld::Data& data)
+    : mIndex(0)
+    , mError(false)
+    , mData(data)
+{
+}
 
-bool CSMFilter::Parser::parse (const std::string& filter, bool allowPredefined)
+bool CSMFilter::Parser::parse(const std::string& filter, bool allowPredefined)
 {
     // reset
     mFilter.reset();
@@ -556,19 +600,19 @@ bool CSMFilter::Parser::parse (const std::string& filter, bool allowPredefined)
     if (allowPredefined)
         token = getNextToken();
 
-    if (allowPredefined && token==Token (Token::Type_EOS))
+    if (allowPredefined && token == Token(Token::Type_EOS))
     {
         mFilter.reset();
         return true;
     }
-    else if (!allowPredefined || token==Token (Token::Type_OneShot))
+    else if (!allowPredefined || token == Token(Token::Type_OneShot))
     {
-        std::shared_ptr<Node> node = parseImp (true, token!=Token (Token::Type_OneShot));
+        std::shared_ptr<Node> node = parseImp(true, token != Token(Token::Type_OneShot));
 
         if (mError)
             return false;
 
-        if (getNextToken()!=Token (Token::Type_EOS))
+        if (getNextToken() != Token(Token::Type_EOS))
         {
             error();
             return false;
@@ -586,23 +630,23 @@ bool CSMFilter::Parser::parse (const std::string& filter, bool allowPredefined)
     }
     // We do not use isString() here, because there could be a pre-defined filter with an ID that is
     // equal a filter keyword.
-    else if (token.mType==Token::Type_String)
+    else if (token.mType == Token::Type_String)
     {
-        if (getNextToken()!=Token (Token::Type_EOS))
+        if (getNextToken() != Token(Token::Type_EOS))
         {
             error();
             return false;
         }
 
-        int index = mData.getFilters().searchId (token.mString);
+        int index = mData.getFilters().searchId(token.mString);
 
-        if (index==-1)
+        if (index == -1)
         {
             error();
             return false;
         }
 
-        const CSMWorld::Record<ESM::Filter>& record = mData.getFilters().getRecord (index);
+        const CSMWorld::Record<ESM::Filter>& record = mData.getFilters().getRecord(index);
 
         if (record.isDeleted())
         {
@@ -610,7 +654,7 @@ bool CSMFilter::Parser::parse (const std::string& filter, bool allowPredefined)
             return false;
         }
 
-        return parse (record.get().mFilter, false);
+        return parse(record.get().mFilter, false);
     }
     else
     {
@@ -622,7 +666,7 @@ bool CSMFilter::Parser::parse (const std::string& filter, bool allowPredefined)
 std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::getFilter() const
 {
     if (mError)
-        throw std::logic_error ("No filter available");
+        throw std::logic_error("No filter available");
 
     return mFilter;
 }
diff --git a/apps/opencs/model/filter/parser.hpp b/apps/opencs/model/filter/parser.hpp
index 344c552eff..660fd7d4fd 100644
--- a/apps/opencs/model/filter/parser.hpp
+++ b/apps/opencs/model/filter/parser.hpp
@@ -14,43 +14,42 @@ namespace CSMFilter
 
     class Parser
     {
-            std::shared_ptr<Node> mFilter;
-            std::string mInput;
-            int mIndex;
-            bool mError;
-            const CSMWorld::Data& mData;
+        std::shared_ptr<Node> mFilter;
+        std::string mInput;
+        int mIndex;
+        bool mError;
+        const CSMWorld::Data& mData;
 
-            Token getStringToken();
+        Token getStringToken();
 
-            Token getNumberToken();
+        Token getNumberToken();
 
-            Token getNextToken();
+        Token getNextToken();
 
-            Token checkKeywords (const Token& token);
-            ///< Turn string token into keyword token, if possible.
+        Token checkKeywords(const Token& token);
+        ///< Turn string token into keyword token, if possible.
 
-            std::shared_ptr<Node> parseImp (bool allowEmpty = false, bool ignoreOneShot = false);
-            ///< Will return a null-pointer, if there is nothing more to parse.
+        std::shared_ptr<Node> parseImp(bool allowEmpty = false, bool ignoreOneShot = false);
+        ///< Will return a null-pointer, if there is nothing more to parse.
 
-            std::shared_ptr<Node> parseNAry (const Token& keyword);
+        std::shared_ptr<Node> parseNAry(const Token& keyword);
 
-            std::shared_ptr<Node> parseText();
+        std::shared_ptr<Node> parseText();
 
-            std::shared_ptr<Node> parseValue();
+        std::shared_ptr<Node> parseValue();
 
-            void error();
+        void error();
 
-        public:
+    public:
+        Parser(const CSMWorld::Data& data);
 
-            Parser (const CSMWorld::Data& data);
+        bool parse(const std::string& filter, bool allowPredefined = true);
+        ///< Discards any previous calls to parse
+        ///
+        /// \return Success?
 
-            bool parse (const std::string& filter, bool allowPredefined = true);
-            ///< Discards any previous calls to parse
-            ///
-            /// \return Success?
-
-            std::shared_ptr<Node> getFilter() const;
-            ///< Throws an exception if the last call to parse did not return true.
+        std::shared_ptr<Node> getFilter() const;
+        ///< Throws an exception if the last call to parse did not return true.
     };
 }
 
diff --git a/apps/opencs/model/filter/textnode.cpp b/apps/opencs/model/filter/textnode.cpp
index 808090dc37..9bef2c2745 100644
--- a/apps/opencs/model/filter/textnode.cpp
+++ b/apps/opencs/model/filter/textnode.cpp
@@ -8,43 +8,44 @@
 #include "../world/columns.hpp"
 #include "../world/idtablebase.hpp"
 
-CSMFilter::TextNode::TextNode (int columnId, const std::string& text)
-: mColumnId (columnId), mText (text)
-{}
+CSMFilter::TextNode::TextNode(int columnId, const std::string& text)
+    : mColumnId(columnId)
+    , mText(text)
+{
+}
 
-bool CSMFilter::TextNode::test (const CSMWorld::IdTableBase& table, int row,
-    const std::map<int, int>& columns) const
+bool CSMFilter::TextNode::test(const CSMWorld::IdTableBase& table, int row, const std::map<int, int>& columns) const
 {
-    const std::map<int, int>::const_iterator iter = columns.find (mColumnId);
+    const std::map<int, int>::const_iterator iter = columns.find(mColumnId);
 
-    if (iter==columns.end())
-        throw std::logic_error ("invalid column in text node test");
+    if (iter == columns.end())
+        throw std::logic_error("invalid column in text node test");
 
-    if (iter->second==-1)
+    if (iter->second == -1)
         return true;
 
-    QModelIndex index = table.index (row, iter->second);
+    QModelIndex index = table.index(row, iter->second);
 
-    QVariant data = table.data (index);
+    QVariant data = table.data(index);
 
     QString string;
 
-    if (data.type()==QVariant::String)
+    if (data.type() == QVariant::String)
     {
         string = data.toString();
     }
-    else if ((data.type()==QVariant::Int || data.type()==QVariant::UInt) &&
-        CSMWorld::Columns::hasEnums (static_cast<CSMWorld::Columns::ColumnId> (mColumnId)))
+    else if ((data.type() == QVariant::Int || data.type() == QVariant::UInt)
+        && CSMWorld::Columns::hasEnums(static_cast<CSMWorld::Columns::ColumnId>(mColumnId)))
     {
         int value = data.toInt();
 
-        std::vector<std::pair<int,std::string>> enums =
-            CSMWorld::Columns::getEnums (static_cast<CSMWorld::Columns::ColumnId> (mColumnId));
+        std::vector<std::pair<int, std::string>> enums
+            = CSMWorld::Columns::getEnums(static_cast<CSMWorld::Columns::ColumnId>(mColumnId));
 
-        if (value>=0 && value<static_cast<int> (enums.size()))
-            string = QString::fromUtf8 (enums[value].second.c_str());
+        if (value >= 0 && value < static_cast<int>(enums.size()))
+            string = QString::fromUtf8(enums[value].second.c_str());
     }
-    else if (data.type()==QVariant::Bool)
+    else if (data.type() == QVariant::Bool)
     {
         string = data.toBool() ? "true" : "false";
     }
@@ -54,17 +55,17 @@ bool CSMFilter::TextNode::test (const CSMWorld::IdTableBase& table, int row,
         return false;
 
     /// \todo make pattern syntax configurable
-    QRegExp regExp (QString::fromUtf8 (mText.c_str()), Qt::CaseInsensitive);
+    QRegExp regExp(QString::fromUtf8(mText.c_str()), Qt::CaseInsensitive);
 
-    return regExp.exactMatch (string);
+    return regExp.exactMatch(string);
 }
 
 std::vector<int> CSMFilter::TextNode::getReferencedColumns() const
 {
-    return std::vector<int> (1, mColumnId);
+    return std::vector<int>(1, mColumnId);
 }
 
-std::string CSMFilter::TextNode::toString (bool numericColumns) const
+std::string CSMFilter::TextNode::toString(bool numericColumns) const
 {
     std::ostringstream stream;
 
@@ -73,10 +74,7 @@ std::string CSMFilter::TextNode::toString (bool numericColumns) const
     if (numericColumns)
         stream << mColumnId;
     else
-        stream
-            << "\""
-            << CSMWorld::Columns::getName (static_cast<CSMWorld::Columns::ColumnId> (mColumnId))
-            << "\"";
+        stream << "\"" << CSMWorld::Columns::getName(static_cast<CSMWorld::Columns::ColumnId>(mColumnId)) << "\"";
 
     stream << ", \"" << mText << "\")";
 
diff --git a/apps/opencs/model/filter/textnode.hpp b/apps/opencs/model/filter/textnode.hpp
index 0e7a0e4f5e..03b2a473d3 100644
--- a/apps/opencs/model/filter/textnode.hpp
+++ b/apps/opencs/model/filter/textnode.hpp
@@ -7,26 +7,24 @@ namespace CSMFilter
 {
     class TextNode : public LeafNode
     {
-            int mColumnId;
-            std::string mText;
+        int mColumnId;
+        std::string mText;
 
-        public:
+    public:
+        TextNode(int columnId, const std::string& text);
 
-            TextNode (int columnId, const std::string& text);
+        bool test(const CSMWorld::IdTableBase& table, int row, const std::map<int, int>& columns) const override;
+        ///< \return Can the specified table row pass through to filter?
+        /// \param columns column ID to column index mapping
 
-            bool test (const CSMWorld::IdTableBase& table, int row,
-                const std::map<int, int>& columns) const override;
-            ///< \return Can the specified table row pass through to filter?
-            /// \param columns column ID to column index mapping
+        std::vector<int> getReferencedColumns() const override;
+        ///< Return a list of the IDs of the columns referenced by this node. The column mapping
+        /// passed into test as columns must contain all columns listed here.
 
-            std::vector<int> getReferencedColumns() const override;
-            ///< Return a list of the IDs of the columns referenced by this node. The column mapping
-            /// passed into test as columns must contain all columns listed here.
-
-            std::string toString (bool numericColumns) const override;
-            ///< Return a string that represents this node.
-            ///
-            /// \param numericColumns Use numeric IDs instead of string to represent columns.
+        std::string toString(bool numericColumns) const override;
+        ///< Return a string that represents this node.
+        ///
+        /// \param numericColumns Use numeric IDs instead of string to represent columns.
     };
 }
 
diff --git a/apps/opencs/model/filter/unarynode.cpp b/apps/opencs/model/filter/unarynode.cpp
index 7211f78b0a..9581361f46 100644
--- a/apps/opencs/model/filter/unarynode.cpp
+++ b/apps/opencs/model/filter/unarynode.cpp
@@ -1,8 +1,10 @@
 #include "unarynode.hpp"
 
-CSMFilter::UnaryNode::UnaryNode (std::shared_ptr<Node> child, const std::string& name)
-: mChild (child), mName (name)
-{}
+CSMFilter::UnaryNode::UnaryNode(std::shared_ptr<Node> child, const std::string& name)
+    : mChild(child)
+    , mName(name)
+{
+}
 
 const CSMFilter::Node& CSMFilter::UnaryNode::getChild() const
 {
@@ -19,7 +21,7 @@ std::vector<int> CSMFilter::UnaryNode::getReferencedColumns() const
     return mChild->getReferencedColumns();
 }
 
-std::string CSMFilter::UnaryNode::toString (bool numericColumns) const
+std::string CSMFilter::UnaryNode::toString(bool numericColumns) const
 {
-    return mName + " " + mChild->toString (numericColumns);
+    return mName + " " + mChild->toString(numericColumns);
 }
diff --git a/apps/opencs/model/filter/unarynode.hpp b/apps/opencs/model/filter/unarynode.hpp
index 39326d1672..cb3fbdd925 100644
--- a/apps/opencs/model/filter/unarynode.hpp
+++ b/apps/opencs/model/filter/unarynode.hpp
@@ -7,25 +7,24 @@ namespace CSMFilter
 {
     class UnaryNode : public Node
     {
-            std::shared_ptr<Node> mChild;
-            std::string mName;
+        std::shared_ptr<Node> mChild;
+        std::string mName;
 
-        public:
+    public:
+        UnaryNode(std::shared_ptr<Node> child, const std::string& name);
 
-            UnaryNode (std::shared_ptr<Node> child, const std::string& name);
+        const Node& getChild() const;
 
-            const Node& getChild() const;
+        Node& getChild();
 
-            Node& getChild();
+        std::vector<int> getReferencedColumns() const override;
+        ///< Return a list of the IDs of the columns referenced by this node. The column mapping
+        /// passed into test as columns must contain all columns listed here.
 
-            std::vector<int> getReferencedColumns() const override;
-            ///< Return a list of the IDs of the columns referenced by this node. The column mapping
-            /// passed into test as columns must contain all columns listed here.
-
-            std::string toString (bool numericColumns) const override;
-            ///< Return a string that represents this node.
-            ///
-            /// \param numericColumns Use numeric IDs instead of string to represent columns.
+        std::string toString(bool numericColumns) const override;
+        ///< Return a string that represents this node.
+        ///
+        /// \param numericColumns Use numeric IDs instead of string to represent columns.
     };
 }
 
diff --git a/apps/opencs/model/filter/valuenode.cpp b/apps/opencs/model/filter/valuenode.cpp
index 85c5a8e27f..eb3d03f00a 100644
--- a/apps/opencs/model/filter/valuenode.cpp
+++ b/apps/opencs/model/filter/valuenode.cpp
@@ -6,43 +6,61 @@
 #include "../world/columns.hpp"
 #include "../world/idtablebase.hpp"
 
-CSMFilter::ValueNode::ValueNode (int columnId, Type lowerType, Type upperType,
-    double lower, double upper)
-: mColumnId (columnId), mLower (lower), mUpper (upper), mLowerType (lowerType), mUpperType (upperType){}
+CSMFilter::ValueNode::ValueNode(int columnId, Type lowerType, Type upperType, double lower, double upper)
+    : mColumnId(columnId)
+    , mLower(lower)
+    , mUpper(upper)
+    , mLowerType(lowerType)
+    , mUpperType(upperType)
+{
+}
 
-bool CSMFilter::ValueNode::test (const CSMWorld::IdTableBase& table, int row,
-    const std::map<int, int>& columns) const
+bool CSMFilter::ValueNode::test(const CSMWorld::IdTableBase& table, int row, const std::map<int, int>& columns) const
 {
-    const std::map<int, int>::const_iterator iter = columns.find (mColumnId);
+    const std::map<int, int>::const_iterator iter = columns.find(mColumnId);
 
-    if (iter==columns.end())
-        throw std::logic_error ("invalid column in value node test");
+    if (iter == columns.end())
+        throw std::logic_error("invalid column in value node test");
 
-    if (iter->second==-1)
+    if (iter->second == -1)
         return true;
 
-    QModelIndex index = table.index (row, iter->second);
+    QModelIndex index = table.index(row, iter->second);
 
-    QVariant data = table.data (index);
+    QVariant data = table.data(index);
 
-    if (data.type()!=QVariant::Double && data.type()!=QVariant::Bool && data.type()!=QVariant::Int &&
-        data.type()!=QVariant::UInt && data.type()!=static_cast<QVariant::Type> (QMetaType::Float))
+    if (data.type() != QVariant::Double && data.type() != QVariant::Bool && data.type() != QVariant::Int
+        && data.type() != QVariant::UInt && data.type() != static_cast<QVariant::Type>(QMetaType::Float))
         return false;
 
     double value = data.toDouble();
 
     switch (mLowerType)
     {
-        case Type_Closed: if (value<mLower) return false; break;
-        case Type_Open: if (value<=mLower) return false; break;
-        case Type_Infinite: break;
+        case Type_Closed:
+            if (value < mLower)
+                return false;
+            break;
+        case Type_Open:
+            if (value <= mLower)
+                return false;
+            break;
+        case Type_Infinite:
+            break;
     }
 
     switch (mUpperType)
     {
-        case Type_Closed: if (value>mUpper) return false; break;
-        case Type_Open: if (value>=mUpper) return false; break;
-        case Type_Infinite: break;
+        case Type_Closed:
+            if (value > mUpper)
+                return false;
+            break;
+        case Type_Open:
+            if (value >= mUpper)
+                return false;
+            break;
+        case Type_Infinite:
+            break;
     }
 
     return true;
@@ -50,10 +68,10 @@ bool CSMFilter::ValueNode::test (const CSMWorld::IdTableBase& table, int row,
 
 std::vector<int> CSMFilter::ValueNode::getReferencedColumns() const
 {
-    return std::vector<int> (1, mColumnId);
+    return std::vector<int>(1, mColumnId);
 }
 
-std::string CSMFilter::ValueNode::toString (bool numericColumns) const
+std::string CSMFilter::ValueNode::toString(bool numericColumns) const
 {
     std::ostringstream stream;
 
@@ -62,31 +80,40 @@ std::string CSMFilter::ValueNode::toString (bool numericColumns) const
     if (numericColumns)
         stream << mColumnId;
     else
-        stream
-            << "\""
-            << CSMWorld::Columns::getName (static_cast<CSMWorld::Columns::ColumnId> (mColumnId))
-            << "\"";
+        stream << "\"" << CSMWorld::Columns::getName(static_cast<CSMWorld::Columns::ColumnId>(mColumnId)) << "\"";
 
     stream << ", ";
 
-    if (mLower==mUpper && mLowerType!=Type_Infinite && mUpperType!=Type_Infinite)
+    if (mLower == mUpper && mLowerType != Type_Infinite && mUpperType != Type_Infinite)
         stream << mLower;
     else
     {
         switch (mLowerType)
         {
-            case Type_Closed: stream << "[" << mLower; break;
-            case Type_Open: stream << "(" << mLower; break;
-            case Type_Infinite: stream << "("; break;
+            case Type_Closed:
+                stream << "[" << mLower;
+                break;
+            case Type_Open:
+                stream << "(" << mLower;
+                break;
+            case Type_Infinite:
+                stream << "(";
+                break;
         }
 
         stream << ", ";
 
         switch (mUpperType)
         {
-            case Type_Closed: stream << mUpper << "]"; break;
-            case Type_Open: stream << mUpper << ")"; break;
-            case Type_Infinite: stream << ")"; break;
+            case Type_Closed:
+                stream << mUpper << "]";
+                break;
+            case Type_Open:
+                stream << mUpper << ")";
+                break;
+            case Type_Infinite:
+                stream << ")";
+                break;
         }
     }
 
diff --git a/apps/opencs/model/filter/valuenode.hpp b/apps/opencs/model/filter/valuenode.hpp
index 339e4948a6..ffdf85a05f 100644
--- a/apps/opencs/model/filter/valuenode.hpp
+++ b/apps/opencs/model/filter/valuenode.hpp
@@ -7,39 +7,37 @@ namespace CSMFilter
 {
     class ValueNode : public LeafNode
     {
-        public:
-
-            enum Type
-            {
-                Type_Closed, Type_Open, Type_Infinite
-            };
-
-        private:
-
-            int mColumnId;
-            std::string mText;
-            double mLower;
-            double mUpper;
-            Type mLowerType;
-            Type mUpperType;
-
-        public:
-
-            ValueNode (int columnId, Type lowerType, Type upperType, double lower, double upper);
-
-            bool test (const CSMWorld::IdTableBase& table, int row,
-                const std::map<int, int>& columns) const override;
-            ///< \return Can the specified table row pass through to filter?
-            /// \param columns column ID to column index mapping
-
-            std::vector<int> getReferencedColumns() const override;
-            ///< Return a list of the IDs of the columns referenced by this node. The column mapping
-            /// passed into test as columns must contain all columns listed here.
-
-            std::string toString (bool numericColumns) const override;
-            ///< Return a string that represents this node.
-            ///
-            /// \param numericColumns Use numeric IDs instead of string to represent columns.
+    public:
+        enum Type
+        {
+            Type_Closed,
+            Type_Open,
+            Type_Infinite
+        };
+
+    private:
+        int mColumnId;
+        std::string mText;
+        double mLower;
+        double mUpper;
+        Type mLowerType;
+        Type mUpperType;
+
+    public:
+        ValueNode(int columnId, Type lowerType, Type upperType, double lower, double upper);
+
+        bool test(const CSMWorld::IdTableBase& table, int row, const std::map<int, int>& columns) const override;
+        ///< \return Can the specified table row pass through to filter?
+        /// \param columns column ID to column index mapping
+
+        std::vector<int> getReferencedColumns() const override;
+        ///< Return a list of the IDs of the columns referenced by this node. The column mapping
+        /// passed into test as columns must contain all columns listed here.
+
+        std::string toString(bool numericColumns) const override;
+        ///< Return a string that represents this node.
+        ///
+        /// \param numericColumns Use numeric IDs instead of string to represent columns.
     };
 }
 
diff --git a/apps/opencs/model/prefs/boolsetting.cpp b/apps/opencs/model/prefs/boolsetting.cpp
index afd80be99d..9b557406a5 100644
--- a/apps/opencs/model/prefs/boolsetting.cpp
+++ b/apps/opencs/model/prefs/boolsetting.cpp
@@ -8,49 +8,51 @@
 #include "category.hpp"
 #include "state.hpp"
 
-CSMPrefs::BoolSetting::BoolSetting (Category *parent,
-  QMutex *mutex, const std::string& key, const std::string& label, bool default_)
-: Setting (parent, mutex, key, label),  mDefault (default_), mWidget(nullptr)
-{}
+CSMPrefs::BoolSetting::BoolSetting(
+    Category* parent, QMutex* mutex, const std::string& key, const std::string& label, bool default_)
+    : Setting(parent, mutex, key, label)
+    , mDefault(default_)
+    , mWidget(nullptr)
+{
+}
 
-CSMPrefs::BoolSetting& CSMPrefs::BoolSetting::setTooltip (const std::string& tooltip)
+CSMPrefs::BoolSetting& CSMPrefs::BoolSetting::setTooltip(const std::string& tooltip)
 {
     mTooltip = tooltip;
     return *this;
 }
 
-std::pair<QWidget *, QWidget *> CSMPrefs::BoolSetting::makeWidgets (QWidget *parent)
+std::pair<QWidget*, QWidget*> CSMPrefs::BoolSetting::makeWidgets(QWidget* parent)
 {
-    mWidget = new QCheckBox (QString::fromUtf8 (getLabel().c_str()), parent);
-    mWidget->setCheckState (mDefault ? Qt::Checked : Qt::Unchecked);
+    mWidget = new QCheckBox(QString::fromUtf8(getLabel().c_str()), parent);
+    mWidget->setCheckState(mDefault ? Qt::Checked : Qt::Unchecked);
 
     if (!mTooltip.empty())
     {
-        QString tooltip = QString::fromUtf8 (mTooltip.c_str());
-        mWidget->setToolTip (tooltip);
+        QString tooltip = QString::fromUtf8(mTooltip.c_str());
+        mWidget->setToolTip(tooltip);
     }
 
-    connect (mWidget, &QCheckBox::stateChanged, this, &BoolSetting::valueChanged);
+    connect(mWidget, &QCheckBox::stateChanged, this, &BoolSetting::valueChanged);
 
-    return std::make_pair (static_cast<QWidget *> (nullptr), mWidget);
+    return std::make_pair(static_cast<QWidget*>(nullptr), mWidget);
 }
 
 void CSMPrefs::BoolSetting::updateWidget()
 {
     if (mWidget)
     {
-        mWidget->setCheckState(Settings::Manager::getBool(getKey(), getParent()->getKey())
-            ? Qt::Checked
-            : Qt::Unchecked);
+        mWidget->setCheckState(
+            Settings::Manager::getBool(getKey(), getParent()->getKey()) ? Qt::Checked : Qt::Unchecked);
     }
 }
 
-void CSMPrefs::BoolSetting::valueChanged (int value)
+void CSMPrefs::BoolSetting::valueChanged(int value)
 {
     {
-        QMutexLocker lock (getMutex());
-        Settings::Manager::setBool (getKey(), getParent()->getKey(), value);
+        QMutexLocker lock(getMutex());
+        Settings::Manager::setBool(getKey(), getParent()->getKey(), value);
     }
 
-    getParent()->getState()->update (*this);
+    getParent()->getState()->update(*this);
 }
diff --git a/apps/opencs/model/prefs/boolsetting.hpp b/apps/opencs/model/prefs/boolsetting.hpp
index 4bfd7df47a..a7fdf5c8ef 100644
--- a/apps/opencs/model/prefs/boolsetting.hpp
+++ b/apps/opencs/model/prefs/boolsetting.hpp
@@ -9,27 +9,25 @@ namespace CSMPrefs
 {
     class BoolSetting : public Setting
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            std::string mTooltip;
-            bool mDefault;
-            QCheckBox* mWidget;
+        std::string mTooltip;
+        bool mDefault;
+        QCheckBox* mWidget;
 
-        public:
+    public:
+        BoolSetting(Category* parent, QMutex* mutex, const std::string& key, const std::string& label, bool default_);
 
-            BoolSetting (Category *parent,
-                QMutex *mutex, const std::string& key, const std::string& label, bool default_);
+        BoolSetting& setTooltip(const std::string& tooltip);
 
-            BoolSetting& setTooltip (const std::string& tooltip);
+        /// Return label, input widget.
+        std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent) override;
 
-            /// Return label, input widget.
-            std::pair<QWidget *, QWidget *> makeWidgets (QWidget *parent) override;
+        void updateWidget() override;
 
-            void updateWidget() override;
+    private slots:
 
-        private slots:
-
-            void valueChanged (int value);
+        void valueChanged(int value);
     };
 }
 
diff --git a/apps/opencs/model/prefs/category.cpp b/apps/opencs/model/prefs/category.cpp
index 6af0ac645b..5a82be08fc 100644
--- a/apps/opencs/model/prefs/category.cpp
+++ b/apps/opencs/model/prefs/category.cpp
@@ -6,23 +6,25 @@
 #include "setting.hpp"
 #include "state.hpp"
 
-CSMPrefs::Category::Category (State *parent, const std::string& key)
-: mParent (parent), mKey (key)
-{}
+CSMPrefs::Category::Category(State* parent, const std::string& key)
+    : mParent(parent)
+    , mKey(key)
+{
+}
 
 const std::string& CSMPrefs::Category::getKey() const
 {
     return mKey;
 }
 
-CSMPrefs::State *CSMPrefs::Category::getState() const
+CSMPrefs::State* CSMPrefs::Category::getState() const
 {
     return mParent;
 }
 
-void CSMPrefs::Category::addSetting (Setting *setting)
+void CSMPrefs::Category::addSetting(Setting* setting)
 {
-    mSettings.push_back (setting);
+    mSettings.push_back(setting);
 }
 
 CSMPrefs::Category::Iterator CSMPrefs::Category::begin()
@@ -35,17 +37,17 @@ CSMPrefs::Category::Iterator CSMPrefs::Category::end()
     return mSettings.end();
 }
 
-CSMPrefs::Setting& CSMPrefs::Category::operator[] (const std::string& key)
+CSMPrefs::Setting& CSMPrefs::Category::operator[](const std::string& key)
 {
-    for (Iterator iter = mSettings.begin(); iter!=mSettings.end(); ++iter)
-        if ((*iter)->getKey()==key)
+    for (Iterator iter = mSettings.begin(); iter != mSettings.end(); ++iter)
+        if ((*iter)->getKey() == key)
             return **iter;
 
-    throw std::logic_error ("Invalid user setting: " + key);
+    throw std::logic_error("Invalid user setting: " + key);
 }
 
 void CSMPrefs::Category::update()
 {
-    for (Iterator iter = mSettings.begin(); iter!=mSettings.end(); ++iter)
-        mParent->update (**iter);
+    for (Iterator iter = mSettings.begin(); iter != mSettings.end(); ++iter)
+        mParent->update(**iter);
 }
diff --git a/apps/opencs/model/prefs/category.hpp b/apps/opencs/model/prefs/category.hpp
index b70716aa0e..3f98e9fbb3 100644
--- a/apps/opencs/model/prefs/category.hpp
+++ b/apps/opencs/model/prefs/category.hpp
@@ -11,34 +11,31 @@ namespace CSMPrefs
 
     class Category
     {
-        public:
+    public:
+        typedef std::vector<Setting*> Container;
+        typedef Container::iterator Iterator;
 
-            typedef std::vector<Setting *> Container;
-            typedef Container::iterator Iterator;
+    private:
+        State* mParent;
+        std::string mKey;
+        Container mSettings;
 
-        private:
+    public:
+        Category(State* parent, const std::string& key);
 
-            State *mParent;
-            std::string mKey;
-            Container mSettings;
+        const std::string& getKey() const;
 
-        public:
+        State* getState() const;
 
-            Category (State *parent, const std::string& key);
+        void addSetting(Setting* setting);
 
-            const std::string& getKey() const;
+        Iterator begin();
 
-            State *getState() const;
+        Iterator end();
 
-            void addSetting (Setting *setting);
+        Setting& operator[](const std::string& key);
 
-            Iterator begin();
-
-            Iterator end();
-
-            Setting& operator[] (const std::string& key);
-
-            void update();
+        void update();
     };
 }
 
diff --git a/apps/opencs/model/prefs/coloursetting.cpp b/apps/opencs/model/prefs/coloursetting.cpp
index 6849d51aad..b8df0e459e 100644
--- a/apps/opencs/model/prefs/coloursetting.cpp
+++ b/apps/opencs/model/prefs/coloursetting.cpp
@@ -11,51 +11,53 @@
 #include "category.hpp"
 #include "state.hpp"
 
-CSMPrefs::ColourSetting::ColourSetting (Category *parent,
-  QMutex *mutex, const std::string& key, const std::string& label, QColor default_)
-: Setting (parent, mutex, key, label), mDefault (default_), mWidget(nullptr)
-{}
+CSMPrefs::ColourSetting::ColourSetting(
+    Category* parent, QMutex* mutex, const std::string& key, const std::string& label, QColor default_)
+    : Setting(parent, mutex, key, label)
+    , mDefault(default_)
+    , mWidget(nullptr)
+{
+}
 
-CSMPrefs::ColourSetting& CSMPrefs::ColourSetting::setTooltip (const std::string& tooltip)
+CSMPrefs::ColourSetting& CSMPrefs::ColourSetting::setTooltip(const std::string& tooltip)
 {
     mTooltip = tooltip;
     return *this;
 }
 
-std::pair<QWidget *, QWidget *> CSMPrefs::ColourSetting::makeWidgets (QWidget *parent)
+std::pair<QWidget*, QWidget*> CSMPrefs::ColourSetting::makeWidgets(QWidget* parent)
 {
-    QLabel *label = new QLabel (QString::fromUtf8 (getLabel().c_str()), parent);
+    QLabel* label = new QLabel(QString::fromUtf8(getLabel().c_str()), parent);
 
-    mWidget = new CSVWidget::ColorEditor (mDefault, parent);
+    mWidget = new CSVWidget::ColorEditor(mDefault, parent);
 
     if (!mTooltip.empty())
     {
-        QString tooltip = QString::fromUtf8 (mTooltip.c_str());
-        label->setToolTip (tooltip);
-        mWidget->setToolTip (tooltip);
+        QString tooltip = QString::fromUtf8(mTooltip.c_str());
+        label->setToolTip(tooltip);
+        mWidget->setToolTip(tooltip);
     }
 
-    connect (mWidget, &CSVWidget::ColorEditor::pickingFinished, this, &ColourSetting::valueChanged);
+    connect(mWidget, &CSVWidget::ColorEditor::pickingFinished, this, &ColourSetting::valueChanged);
 
-    return std::make_pair (label, mWidget);
+    return std::make_pair(label, mWidget);
 }
 
 void CSMPrefs::ColourSetting::updateWidget()
 {
     if (mWidget)
     {
-        mWidget->setColor(QString::fromStdString
-            (Settings::Manager::getString(getKey(), getParent()->getKey())));
+        mWidget->setColor(QString::fromStdString(Settings::Manager::getString(getKey(), getParent()->getKey())));
     }
 }
 
 void CSMPrefs::ColourSetting::valueChanged()
 {
-    CSVWidget::ColorEditor& widget = dynamic_cast<CSVWidget::ColorEditor&> (*sender());
+    CSVWidget::ColorEditor& widget = dynamic_cast<CSVWidget::ColorEditor&>(*sender());
     {
-        QMutexLocker lock (getMutex());
-        Settings::Manager::setString (getKey(), getParent()->getKey(), widget.color().name().toUtf8().data());
+        QMutexLocker lock(getMutex());
+        Settings::Manager::setString(getKey(), getParent()->getKey(), widget.color().name().toUtf8().data());
     }
 
-    getParent()->getState()->update (*this);
+    getParent()->getState()->update(*this);
 }
diff --git a/apps/opencs/model/prefs/coloursetting.hpp b/apps/opencs/model/prefs/coloursetting.hpp
index 097eec4313..7365dd51b1 100644
--- a/apps/opencs/model/prefs/coloursetting.hpp
+++ b/apps/opencs/model/prefs/coloursetting.hpp
@@ -14,28 +14,26 @@ namespace CSMPrefs
 {
     class ColourSetting : public Setting
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            std::string mTooltip;
-            QColor mDefault;
-            CSVWidget::ColorEditor* mWidget;
+        std::string mTooltip;
+        QColor mDefault;
+        CSVWidget::ColorEditor* mWidget;
 
-        public:
+    public:
+        ColourSetting(
+            Category* parent, QMutex* mutex, const std::string& key, const std::string& label, QColor default_);
 
-            ColourSetting (Category *parent,
-                QMutex *mutex, const std::string& key, const std::string& label,
-                QColor default_);
+        ColourSetting& setTooltip(const std::string& tooltip);
 
-            ColourSetting& setTooltip (const std::string& tooltip);
+        /// Return label, input widget.
+        std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent) override;
 
-            /// Return label, input widget.
-            std::pair<QWidget *, QWidget *> makeWidgets (QWidget *parent) override;
+        void updateWidget() override;
 
-            void updateWidget() override;
+    private slots:
 
-        private slots:
-
-            void valueChanged();
+        void valueChanged();
     };
 }
 
diff --git a/apps/opencs/model/prefs/doublesetting.cpp b/apps/opencs/model/prefs/doublesetting.cpp
index 64e961eb9b..43f7963429 100644
--- a/apps/opencs/model/prefs/doublesetting.cpp
+++ b/apps/opencs/model/prefs/doublesetting.cpp
@@ -3,8 +3,8 @@
 
 #include <limits>
 
-#include <QLabel>
 #include <QDoubleSpinBox>
+#include <QLabel>
 #include <QMutexLocker>
 
 #include <components/settings/settings.hpp>
@@ -12,12 +12,16 @@
 #include "category.hpp"
 #include "state.hpp"
 
-CSMPrefs::DoubleSetting::DoubleSetting (Category *parent,
-  QMutex *mutex, const std::string& key, const std::string& label, double default_)
-: Setting (parent, mutex, key, label),
-  mPrecision(2), mMin (0), mMax (std::numeric_limits<double>::max()),
-  mDefault (default_), mWidget(nullptr)
-{}
+CSMPrefs::DoubleSetting::DoubleSetting(
+    Category* parent, QMutex* mutex, const std::string& key, const std::string& label, double default_)
+    : Setting(parent, mutex, key, label)
+    , mPrecision(2)
+    , mMin(0)
+    , mMax(std::numeric_limits<double>::max())
+    , mDefault(default_)
+    , mWidget(nullptr)
+{
+}
 
 CSMPrefs::DoubleSetting& CSMPrefs::DoubleSetting::setPrecision(int precision)
 {
@@ -25,50 +29,50 @@ CSMPrefs::DoubleSetting& CSMPrefs::DoubleSetting::setPrecision(int precision)
     return *this;
 }
 
-CSMPrefs::DoubleSetting& CSMPrefs::DoubleSetting::setRange (double min, double max)
+CSMPrefs::DoubleSetting& CSMPrefs::DoubleSetting::setRange(double min, double max)
 {
     mMin = min;
     mMax = max;
     return *this;
 }
 
-CSMPrefs::DoubleSetting& CSMPrefs::DoubleSetting::setMin (double min)
+CSMPrefs::DoubleSetting& CSMPrefs::DoubleSetting::setMin(double min)
 {
     mMin = min;
     return *this;
 }
 
-CSMPrefs::DoubleSetting& CSMPrefs::DoubleSetting::setMax (double max)
+CSMPrefs::DoubleSetting& CSMPrefs::DoubleSetting::setMax(double max)
 {
     mMax = max;
     return *this;
 }
 
-CSMPrefs::DoubleSetting& CSMPrefs::DoubleSetting::setTooltip (const std::string& tooltip)
+CSMPrefs::DoubleSetting& CSMPrefs::DoubleSetting::setTooltip(const std::string& tooltip)
 {
     mTooltip = tooltip;
     return *this;
 }
 
-std::pair<QWidget *, QWidget *> CSMPrefs::DoubleSetting::makeWidgets (QWidget *parent)
+std::pair<QWidget*, QWidget*> CSMPrefs::DoubleSetting::makeWidgets(QWidget* parent)
 {
-    QLabel *label = new QLabel (QString::fromUtf8 (getLabel().c_str()), parent);
+    QLabel* label = new QLabel(QString::fromUtf8(getLabel().c_str()), parent);
 
-    mWidget = new QDoubleSpinBox (parent);
+    mWidget = new QDoubleSpinBox(parent);
     mWidget->setDecimals(mPrecision);
-    mWidget->setRange (mMin, mMax);
-    mWidget->setValue (mDefault);
+    mWidget->setRange(mMin, mMax);
+    mWidget->setValue(mDefault);
 
     if (!mTooltip.empty())
     {
-        QString tooltip = QString::fromUtf8 (mTooltip.c_str());
-        label->setToolTip (tooltip);
-        mWidget->setToolTip (tooltip);
+        QString tooltip = QString::fromUtf8(mTooltip.c_str());
+        label->setToolTip(tooltip);
+        mWidget->setToolTip(tooltip);
     }
 
-    connect (mWidget, qOverload<double>(&QDoubleSpinBox::valueChanged), this, &DoubleSetting::valueChanged);
+    connect(mWidget, qOverload<double>(&QDoubleSpinBox::valueChanged), this, &DoubleSetting::valueChanged);
 
-    return std::make_pair (label, mWidget);
+    return std::make_pair(label, mWidget);
 }
 
 void CSMPrefs::DoubleSetting::updateWidget()
@@ -79,12 +83,12 @@ void CSMPrefs::DoubleSetting::updateWidget()
     }
 }
 
-void CSMPrefs::DoubleSetting::valueChanged (double value)
+void CSMPrefs::DoubleSetting::valueChanged(double value)
 {
     {
-        QMutexLocker lock (getMutex());
-        Settings::Manager::setFloat (getKey(), getParent()->getKey(), value);
+        QMutexLocker lock(getMutex());
+        Settings::Manager::setFloat(getKey(), getParent()->getKey(), value);
     }
 
-    getParent()->getState()->update (*this);
+    getParent()->getState()->update(*this);
 }
diff --git a/apps/opencs/model/prefs/doublesetting.hpp b/apps/opencs/model/prefs/doublesetting.hpp
index f65a776351..433d7ac8ca 100644
--- a/apps/opencs/model/prefs/doublesetting.hpp
+++ b/apps/opencs/model/prefs/doublesetting.hpp
@@ -9,40 +9,38 @@ namespace CSMPrefs
 {
     class DoubleSetting : public Setting
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            int mPrecision;
-            double mMin;
-            double mMax;
-            std::string mTooltip;
-            double mDefault;
-            QDoubleSpinBox* mWidget;
+        int mPrecision;
+        double mMin;
+        double mMax;
+        std::string mTooltip;
+        double mDefault;
+        QDoubleSpinBox* mWidget;
 
-        public:
+    public:
+        DoubleSetting(
+            Category* parent, QMutex* mutex, const std::string& key, const std::string& label, double default_);
 
-            DoubleSetting (Category *parent,
-                QMutex *mutex, const std::string& key, const std::string& label,
-                double default_);
+        DoubleSetting& setPrecision(int precision);
 
-            DoubleSetting& setPrecision (int precision);
+        // defaults to [0, std::numeric_limits<double>::max()]
+        DoubleSetting& setRange(double min, double max);
 
-            // defaults to [0, std::numeric_limits<double>::max()]
-            DoubleSetting& setRange (double min, double max);
+        DoubleSetting& setMin(double min);
 
-            DoubleSetting& setMin (double min);
+        DoubleSetting& setMax(double max);
 
-            DoubleSetting& setMax (double max);
+        DoubleSetting& setTooltip(const std::string& tooltip);
 
-            DoubleSetting& setTooltip (const std::string& tooltip);
+        /// Return label, input widget.
+        std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent) override;
 
-            /// Return label, input widget.
-            std::pair<QWidget *, QWidget *> makeWidgets (QWidget *parent) override;
+        void updateWidget() override;
 
-            void updateWidget() override;
+    private slots:
 
-        private slots:
-
-            void valueChanged (double value);
+        void valueChanged(double value);
     };
 }
 
diff --git a/apps/opencs/model/prefs/enumsetting.cpp b/apps/opencs/model/prefs/enumsetting.cpp
index a11f84a993..7d64e31112 100644
--- a/apps/opencs/model/prefs/enumsetting.cpp
+++ b/apps/opencs/model/prefs/enumsetting.cpp
@@ -1,8 +1,8 @@
 
 #include "enumsetting.hpp"
 
-#include <QLabel>
 #include <QComboBox>
+#include <QLabel>
 #include <QMutexLocker>
 #include <QString>
 
@@ -11,114 +11,116 @@
 #include "category.hpp"
 #include "state.hpp"
 
+CSMPrefs::EnumValue::EnumValue(const std::string& value, const std::string& tooltip)
+    : mValue(value)
+    , mTooltip(tooltip)
+{
+}
 
-CSMPrefs::EnumValue::EnumValue (const std::string& value, const std::string& tooltip)
-: mValue (value), mTooltip (tooltip)
-{}
-
-CSMPrefs::EnumValue::EnumValue (const char *value)
-: mValue (value)
-{}
-
+CSMPrefs::EnumValue::EnumValue(const char* value)
+    : mValue(value)
+{
+}
 
-CSMPrefs::EnumValues& CSMPrefs::EnumValues::add (const EnumValues& values)
+CSMPrefs::EnumValues& CSMPrefs::EnumValues::add(const EnumValues& values)
 {
-    mValues.insert (mValues.end(), values.mValues.begin(), values.mValues.end());
+    mValues.insert(mValues.end(), values.mValues.begin(), values.mValues.end());
     return *this;
 }
 
-CSMPrefs::EnumValues& CSMPrefs::EnumValues::add (const EnumValue& value)
+CSMPrefs::EnumValues& CSMPrefs::EnumValues::add(const EnumValue& value)
 {
-    mValues.push_back (value);
+    mValues.push_back(value);
     return *this;
 }
 
-CSMPrefs::EnumValues& CSMPrefs::EnumValues::add (const std::string& value, const std::string& tooltip)
+CSMPrefs::EnumValues& CSMPrefs::EnumValues::add(const std::string& value, const std::string& tooltip)
 {
     mValues.emplace_back(value, tooltip);
     return *this;
 }
 
+CSMPrefs::EnumSetting::EnumSetting(
+    Category* parent, QMutex* mutex, const std::string& key, const std::string& label, const EnumValue& default_)
+    : Setting(parent, mutex, key, label)
+    , mDefault(default_)
+    , mWidget(nullptr)
+{
+}
 
-CSMPrefs::EnumSetting::EnumSetting (Category *parent,
-  QMutex *mutex, const std::string& key, const std::string& label, const EnumValue& default_)
-: Setting (parent, mutex, key, label), mDefault (default_), mWidget(nullptr)
-{}
-
-CSMPrefs::EnumSetting& CSMPrefs::EnumSetting::setTooltip (const std::string& tooltip)
+CSMPrefs::EnumSetting& CSMPrefs::EnumSetting::setTooltip(const std::string& tooltip)
 {
     mTooltip = tooltip;
     return *this;
 }
 
-CSMPrefs::EnumSetting& CSMPrefs::EnumSetting::addValues (const EnumValues& values)
+CSMPrefs::EnumSetting& CSMPrefs::EnumSetting::addValues(const EnumValues& values)
 {
-    mValues.add (values);
+    mValues.add(values);
     return *this;
 }
 
-CSMPrefs::EnumSetting& CSMPrefs::EnumSetting::addValue (const EnumValue& value)
+CSMPrefs::EnumSetting& CSMPrefs::EnumSetting::addValue(const EnumValue& value)
 {
-    mValues.add (value);
+    mValues.add(value);
     return *this;
 }
 
-CSMPrefs::EnumSetting& CSMPrefs::EnumSetting::addValue (const std::string& value, const std::string& tooltip)
+CSMPrefs::EnumSetting& CSMPrefs::EnumSetting::addValue(const std::string& value, const std::string& tooltip)
 {
-    mValues.add (value, tooltip);
+    mValues.add(value, tooltip);
     return *this;
 }
 
-std::pair<QWidget *, QWidget *> CSMPrefs::EnumSetting::makeWidgets (QWidget *parent)
+std::pair<QWidget*, QWidget*> CSMPrefs::EnumSetting::makeWidgets(QWidget* parent)
 {
-    QLabel *label = new QLabel (QString::fromUtf8 (getLabel().c_str()), parent);
+    QLabel* label = new QLabel(QString::fromUtf8(getLabel().c_str()), parent);
 
-    mWidget = new QComboBox (parent);
+    mWidget = new QComboBox(parent);
 
     int index = 0;
 
-    for (int i=0; i<static_cast<int> (mValues.mValues.size()); ++i)
+    for (int i = 0; i < static_cast<int>(mValues.mValues.size()); ++i)
     {
-        if (mDefault.mValue==mValues.mValues[i].mValue)
+        if (mDefault.mValue == mValues.mValues[i].mValue)
             index = i;
 
-        mWidget->addItem (QString::fromUtf8 (mValues.mValues[i].mValue.c_str()));
+        mWidget->addItem(QString::fromUtf8(mValues.mValues[i].mValue.c_str()));
 
         if (!mValues.mValues[i].mTooltip.empty())
-            mWidget->setItemData (i, QString::fromUtf8 (mValues.mValues[i].mTooltip.c_str()),
-                Qt::ToolTipRole);
+            mWidget->setItemData(i, QString::fromUtf8(mValues.mValues[i].mTooltip.c_str()), Qt::ToolTipRole);
     }
 
-    mWidget->setCurrentIndex (index);
+    mWidget->setCurrentIndex(index);
 
     if (!mTooltip.empty())
     {
-        QString tooltip = QString::fromUtf8 (mTooltip.c_str());
-        label->setToolTip (tooltip);
+        QString tooltip = QString::fromUtf8(mTooltip.c_str());
+        label->setToolTip(tooltip);
     }
 
-    connect (mWidget, qOverload<int>(&QComboBox::currentIndexChanged), this, &EnumSetting::valueChanged);
+    connect(mWidget, qOverload<int>(&QComboBox::currentIndexChanged), this, &EnumSetting::valueChanged);
 
-    return std::make_pair (label, mWidget);
+    return std::make_pair(label, mWidget);
 }
 
 void CSMPrefs::EnumSetting::updateWidget()
 {
     if (mWidget)
     {
-        int index = mWidget->findText(QString::fromStdString
-            (Settings::Manager::getString(getKey(), getParent()->getKey())));
+        int index
+            = mWidget->findText(QString::fromStdString(Settings::Manager::getString(getKey(), getParent()->getKey())));
 
         mWidget->setCurrentIndex(index);
     }
 }
 
-void CSMPrefs::EnumSetting::valueChanged (int value)
+void CSMPrefs::EnumSetting::valueChanged(int value)
 {
     {
-        QMutexLocker lock (getMutex());
-        Settings::Manager::setString (getKey(), getParent()->getKey(), mValues.mValues.at (value).mValue);
+        QMutexLocker lock(getMutex());
+        Settings::Manager::setString(getKey(), getParent()->getKey(), mValues.mValues.at(value).mValue);
     }
 
-    getParent()->getState()->update (*this);
+    getParent()->getState()->update(*this);
 }
diff --git a/apps/opencs/model/prefs/enumsetting.hpp b/apps/opencs/model/prefs/enumsetting.hpp
index d0467b0639..9acece98e8 100644
--- a/apps/opencs/model/prefs/enumsetting.hpp
+++ b/apps/opencs/model/prefs/enumsetting.hpp
@@ -14,53 +14,51 @@ namespace CSMPrefs
         std::string mValue;
         std::string mTooltip;
 
-        EnumValue (const std::string& value, const std::string& tooltip = "");
+        EnumValue(const std::string& value, const std::string& tooltip = "");
 
-        EnumValue (const char *value);
+        EnumValue(const char* value);
     };
 
     struct EnumValues
     {
         std::vector<EnumValue> mValues;
 
-        EnumValues& add (const EnumValues& values);
+        EnumValues& add(const EnumValues& values);
 
-        EnumValues& add (const EnumValue& value);
+        EnumValues& add(const EnumValue& value);
 
-        EnumValues& add (const std::string& value, const std::string& tooltip);
+        EnumValues& add(const std::string& value, const std::string& tooltip);
     };
 
     class EnumSetting : public Setting
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            std::string mTooltip;
-            EnumValue mDefault;
-            EnumValues mValues;
-            QComboBox* mWidget;
-
-        public:
+        std::string mTooltip;
+        EnumValue mDefault;
+        EnumValues mValues;
+        QComboBox* mWidget;
 
-            EnumSetting (Category *parent,
-                QMutex *mutex, const std::string& key, const std::string& label,
-                const EnumValue& default_);
+    public:
+        EnumSetting(Category* parent, QMutex* mutex, const std::string& key, const std::string& label,
+            const EnumValue& default_);
 
-            EnumSetting& setTooltip (const std::string& tooltip);
+        EnumSetting& setTooltip(const std::string& tooltip);
 
-            EnumSetting& addValues (const EnumValues& values);
+        EnumSetting& addValues(const EnumValues& values);
 
-            EnumSetting& addValue (const EnumValue& value);
+        EnumSetting& addValue(const EnumValue& value);
 
-            EnumSetting& addValue (const std::string& value, const std::string& tooltip);
+        EnumSetting& addValue(const std::string& value, const std::string& tooltip);
 
-            /// Return label, input widget.
-            std::pair<QWidget *, QWidget *> makeWidgets (QWidget *parent) override;
+        /// Return label, input widget.
+        std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent) override;
 
-            void updateWidget() override;
+        void updateWidget() override;
 
-        private slots:
+    private slots:
 
-            void valueChanged (int value);
+        void valueChanged(int value);
     };
 }
 
diff --git a/apps/opencs/model/prefs/intsetting.cpp b/apps/opencs/model/prefs/intsetting.cpp
index efc1d954ef..36a45bf04e 100644
--- a/apps/opencs/model/prefs/intsetting.cpp
+++ b/apps/opencs/model/prefs/intsetting.cpp
@@ -4,63 +4,67 @@
 #include <limits>
 
 #include <QLabel>
-#include <QSpinBox>
 #include <QMutexLocker>
+#include <QSpinBox>
 
 #include <components/settings/settings.hpp>
 
 #include "category.hpp"
 #include "state.hpp"
 
-CSMPrefs::IntSetting::IntSetting (Category *parent,
-  QMutex *mutex, const std::string& key, const std::string& label, int default_)
-: Setting (parent, mutex, key, label), mMin (0), mMax (std::numeric_limits<int>::max()),
-  mDefault (default_), mWidget(nullptr)
-{}
+CSMPrefs::IntSetting::IntSetting(
+    Category* parent, QMutex* mutex, const std::string& key, const std::string& label, int default_)
+    : Setting(parent, mutex, key, label)
+    , mMin(0)
+    , mMax(std::numeric_limits<int>::max())
+    , mDefault(default_)
+    , mWidget(nullptr)
+{
+}
 
-CSMPrefs::IntSetting& CSMPrefs::IntSetting::setRange (int min, int max)
+CSMPrefs::IntSetting& CSMPrefs::IntSetting::setRange(int min, int max)
 {
     mMin = min;
     mMax = max;
     return *this;
 }
 
-CSMPrefs::IntSetting& CSMPrefs::IntSetting::setMin (int min)
+CSMPrefs::IntSetting& CSMPrefs::IntSetting::setMin(int min)
 {
     mMin = min;
     return *this;
 }
 
-CSMPrefs::IntSetting& CSMPrefs::IntSetting::setMax (int max)
+CSMPrefs::IntSetting& CSMPrefs::IntSetting::setMax(int max)
 {
     mMax = max;
     return *this;
 }
 
-CSMPrefs::IntSetting& CSMPrefs::IntSetting::setTooltip (const std::string& tooltip)
+CSMPrefs::IntSetting& CSMPrefs::IntSetting::setTooltip(const std::string& tooltip)
 {
     mTooltip = tooltip;
     return *this;
 }
 
-std::pair<QWidget *, QWidget *> CSMPrefs::IntSetting::makeWidgets (QWidget *parent)
+std::pair<QWidget*, QWidget*> CSMPrefs::IntSetting::makeWidgets(QWidget* parent)
 {
-    QLabel *label = new QLabel (QString::fromUtf8 (getLabel().c_str()), parent);
+    QLabel* label = new QLabel(QString::fromUtf8(getLabel().c_str()), parent);
 
-    mWidget = new QSpinBox (parent);
-    mWidget->setRange (mMin, mMax);
-    mWidget->setValue (mDefault);
+    mWidget = new QSpinBox(parent);
+    mWidget->setRange(mMin, mMax);
+    mWidget->setValue(mDefault);
 
     if (!mTooltip.empty())
     {
-        QString tooltip = QString::fromUtf8 (mTooltip.c_str());
-        label->setToolTip (tooltip);
-        mWidget->setToolTip (tooltip);
+        QString tooltip = QString::fromUtf8(mTooltip.c_str());
+        label->setToolTip(tooltip);
+        mWidget->setToolTip(tooltip);
     }
 
-    connect (mWidget, qOverload<int>(&QSpinBox::valueChanged), this, &IntSetting::valueChanged);
+    connect(mWidget, qOverload<int>(&QSpinBox::valueChanged), this, &IntSetting::valueChanged);
 
-    return std::make_pair (label, mWidget);
+    return std::make_pair(label, mWidget);
 }
 
 void CSMPrefs::IntSetting::updateWidget()
@@ -71,12 +75,12 @@ void CSMPrefs::IntSetting::updateWidget()
     }
 }
 
-void CSMPrefs::IntSetting::valueChanged (int value)
+void CSMPrefs::IntSetting::valueChanged(int value)
 {
     {
-        QMutexLocker lock (getMutex());
-        Settings::Manager::setInt (getKey(), getParent()->getKey(), value);
+        QMutexLocker lock(getMutex());
+        Settings::Manager::setInt(getKey(), getParent()->getKey(), value);
     }
 
-    getParent()->getState()->update (*this);
+    getParent()->getState()->update(*this);
 }
diff --git a/apps/opencs/model/prefs/intsetting.hpp b/apps/opencs/model/prefs/intsetting.hpp
index c03e010ad7..8ef811c8fc 100644
--- a/apps/opencs/model/prefs/intsetting.hpp
+++ b/apps/opencs/model/prefs/intsetting.hpp
@@ -9,36 +9,34 @@ namespace CSMPrefs
 {
     class IntSetting : public Setting
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            int mMin;
-            int mMax;
-            std::string mTooltip;
-            int mDefault;
-            QSpinBox* mWidget;
+        int mMin;
+        int mMax;
+        std::string mTooltip;
+        int mDefault;
+        QSpinBox* mWidget;
 
-        public:
+    public:
+        IntSetting(Category* parent, QMutex* mutex, const std::string& key, const std::string& label, int default_);
 
-            IntSetting (Category *parent,
-                QMutex *mutex, const std::string& key, const std::string& label, int default_);
+        // defaults to [0, std::numeric_limits<int>::max()]
+        IntSetting& setRange(int min, int max);
 
-            // defaults to [0, std::numeric_limits<int>::max()]
-            IntSetting& setRange (int min, int max);
+        IntSetting& setMin(int min);
 
-            IntSetting& setMin (int min);
+        IntSetting& setMax(int max);
 
-            IntSetting& setMax (int max);
+        IntSetting& setTooltip(const std::string& tooltip);
 
-            IntSetting& setTooltip (const std::string& tooltip);
+        /// Return label, input widget.
+        std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent) override;
 
-            /// Return label, input widget.
-            std::pair<QWidget *, QWidget *> makeWidgets (QWidget *parent) override;
+        void updateWidget() override;
 
-            void updateWidget() override;
+    private slots:
 
-        private slots:
-
-            void valueChanged (int value);
+        void valueChanged(int value);
     };
 }
 
diff --git a/apps/opencs/model/prefs/modifiersetting.cpp b/apps/opencs/model/prefs/modifiersetting.cpp
index 1e4d29f1b6..d65367abaf 100644
--- a/apps/opencs/model/prefs/modifiersetting.cpp
+++ b/apps/opencs/model/prefs/modifiersetting.cpp
@@ -9,13 +9,12 @@
 
 #include <components/settings/settings.hpp>
 
-#include "state.hpp"
 #include "shortcutmanager.hpp"
+#include "state.hpp"
 
 namespace CSMPrefs
 {
-    ModifierSetting::ModifierSetting(Category* parent, QMutex* mutex, const std::string& key,
-        const std::string& label)
+    ModifierSetting::ModifierSetting(Category* parent, QMutex* mutex, const std::string& key, const std::string& label)
         : Setting(parent, mutex, key, label)
         , mButton(nullptr)
         , mEditorActive(false)
@@ -40,7 +39,7 @@ namespace CSMPrefs
 
         mButton = widget;
 
-        connect (widget, &QPushButton::toggled, this, &ModifierSetting::buttonToggled);
+        connect(widget, &QPushButton::toggled, this, &ModifierSetting::buttonToggled);
 
         return std::make_pair(label, widget);
     }
@@ -90,10 +89,7 @@ namespace CSMPrefs
     bool ModifierSetting::handleEvent(QObject* target, int mod, int value)
     {
         // For potential future exceptions
-        const int Blacklist[] =
-        {
-            0
-        };
+        const int Blacklist[] = { 0 };
 
         const size_t BlacklistSize = sizeof(Blacklist) / sizeof(int);
 
@@ -118,7 +114,6 @@ namespace CSMPrefs
                 return true;
         }
 
-
         // Update modifier
         int modifier = value;
         storeValue(modifier);
diff --git a/apps/opencs/model/prefs/modifiersetting.hpp b/apps/opencs/model/prefs/modifiersetting.hpp
index d1af9d25c6..4aa8848759 100644
--- a/apps/opencs/model/prefs/modifiersetting.hpp
+++ b/apps/opencs/model/prefs/modifiersetting.hpp
@@ -12,33 +12,30 @@ namespace CSMPrefs
 {
     class ModifierSetting : public Setting
     {
-            Q_OBJECT
+        Q_OBJECT
 
-        public:
+    public:
+        ModifierSetting(Category* parent, QMutex* mutex, const std::string& key, const std::string& label);
 
-            ModifierSetting(Category* parent,  QMutex* mutex, const std::string& key, const std::string& label);
+        std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent) override;
 
-            std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent) override;
+        void updateWidget() override;
 
-            void updateWidget() override;
+    protected:
+        bool eventFilter(QObject* target, QEvent* event) override;
 
-        protected:
+    private:
+        bool handleEvent(QObject* target, int mod, int value);
 
-            bool eventFilter(QObject* target, QEvent* event) override;
+        void storeValue(int modifier);
+        void resetState();
 
-        private:
+        QPushButton* mButton;
+        bool mEditorActive;
 
-            bool handleEvent(QObject* target, int mod, int value);
+    private slots:
 
-            void storeValue(int modifier);
-            void resetState();
-
-            QPushButton* mButton;
-            bool mEditorActive;
-
-        private slots:
-
-            void buttonToggled(bool checked);
+        void buttonToggled(bool checked);
     };
 }
 
diff --git a/apps/opencs/model/prefs/setting.cpp b/apps/opencs/model/prefs/setting.cpp
index 524938bcc7..4468fffaf3 100644
--- a/apps/opencs/model/prefs/setting.cpp
+++ b/apps/opencs/model/prefs/setting.cpp
@@ -9,28 +9,30 @@
 #include "category.hpp"
 #include "state.hpp"
 
-QMutex *CSMPrefs::Setting::getMutex()
+QMutex* CSMPrefs::Setting::getMutex()
 {
     return mMutex;
 }
 
-CSMPrefs::Setting::Setting (Category *parent, QMutex *mutex,
-    const std::string& key, const std::string& label)
-: QObject (parent->getState()), mParent (parent), mMutex (mutex), mKey (key), mLabel (label)
-{}
-
-CSMPrefs::Setting:: ~Setting() {}
-
-std::pair<QWidget *, QWidget *> CSMPrefs::Setting::makeWidgets (QWidget *parent)
+CSMPrefs::Setting::Setting(Category* parent, QMutex* mutex, const std::string& key, const std::string& label)
+    : QObject(parent->getState())
+    , mParent(parent)
+    , mMutex(mutex)
+    , mKey(key)
+    , mLabel(label)
 {
-    return std::pair<QWidget *, QWidget *> (0, 0);
 }
 
-void CSMPrefs::Setting::updateWidget()
+CSMPrefs::Setting::~Setting() {}
+
+std::pair<QWidget*, QWidget*> CSMPrefs::Setting::makeWidgets(QWidget* parent)
 {
+    return std::pair<QWidget*, QWidget*>(0, 0);
 }
 
-const CSMPrefs::Category *CSMPrefs::Setting::getParent() const
+void CSMPrefs::Setting::updateWidget() {}
+
+const CSMPrefs::Category* CSMPrefs::Setting::getParent() const
 {
     return mParent;
 }
@@ -47,51 +49,51 @@ const std::string& CSMPrefs::Setting::getLabel() const
 
 int CSMPrefs::Setting::toInt() const
 {
-    QMutexLocker lock (mMutex);
-    return Settings::Manager::getInt (mKey, mParent->getKey());
+    QMutexLocker lock(mMutex);
+    return Settings::Manager::getInt(mKey, mParent->getKey());
 }
 
 double CSMPrefs::Setting::toDouble() const
 {
-    QMutexLocker lock (mMutex);
-    return Settings::Manager::getFloat (mKey, mParent->getKey());
+    QMutexLocker lock(mMutex);
+    return Settings::Manager::getFloat(mKey, mParent->getKey());
 }
 
 std::string CSMPrefs::Setting::toString() const
 {
-    QMutexLocker lock (mMutex);
-    return Settings::Manager::getString (mKey, mParent->getKey());
+    QMutexLocker lock(mMutex);
+    return Settings::Manager::getString(mKey, mParent->getKey());
 }
 
 bool CSMPrefs::Setting::isTrue() const
 {
-    QMutexLocker lock (mMutex);
-    return Settings::Manager::getBool (mKey, mParent->getKey());
+    QMutexLocker lock(mMutex);
+    return Settings::Manager::getBool(mKey, mParent->getKey());
 }
 
 QColor CSMPrefs::Setting::toColor() const
 {
     // toString() handles lock
-    return QColor (QString::fromUtf8 (toString().c_str()));
+    return QColor(QString::fromUtf8(toString().c_str()));
 }
 
-bool CSMPrefs::operator== (const Setting& setting, const std::string& key)
+bool CSMPrefs::operator==(const Setting& setting, const std::string& key)
 {
     std::string fullKey = setting.getParent()->getKey() + "/" + setting.getKey();
-    return fullKey==key;
+    return fullKey == key;
 }
 
-bool CSMPrefs::operator== (const std::string& key, const Setting& setting)
+bool CSMPrefs::operator==(const std::string& key, const Setting& setting)
 {
-    return setting==key;
+    return setting == key;
 }
 
-bool CSMPrefs::operator!= (const Setting& setting, const std::string& key)
+bool CSMPrefs::operator!=(const Setting& setting, const std::string& key)
 {
-    return !(setting==key);
+    return !(setting == key);
 }
 
-bool CSMPrefs::operator!= (const std::string& key, const Setting& setting)
+bool CSMPrefs::operator!=(const std::string& key, const Setting& setting)
 {
-    return !(key==setting);
+    return !(key == setting);
 }
diff --git a/apps/opencs/model/prefs/setting.hpp b/apps/opencs/model/prefs/setting.hpp
index fcf70c26cd..86e80fb107 100644
--- a/apps/opencs/model/prefs/setting.hpp
+++ b/apps/opencs/model/prefs/setting.hpp
@@ -16,56 +16,54 @@ namespace CSMPrefs
 
     class Setting : public QObject
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            Category *mParent;
-            QMutex *mMutex;
-            std::string mKey;
-            std::string mLabel;
+        Category* mParent;
+        QMutex* mMutex;
+        std::string mKey;
+        std::string mLabel;
 
-        protected:
+    protected:
+        QMutex* getMutex();
 
-            QMutex *getMutex();
+    public:
+        Setting(Category* parent, QMutex* mutex, const std::string& key, const std::string& label);
 
-        public:
+        virtual ~Setting();
 
-            Setting (Category *parent, QMutex *mutex, const std::string& key, const std::string& label);
+        /// Return label, input widget.
+        ///
+        /// \note first can be a 0-pointer, which means that the label is part of the input
+        /// widget.
+        virtual std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent);
 
-            virtual ~Setting();
+        /// Updates the widget returned by makeWidgets() to the current setting.
+        ///
+        /// \note If make_widgets() has not been called yet then nothing happens.
+        virtual void updateWidget();
 
-            /// Return label, input widget.
-            ///
-            /// \note first can be a 0-pointer, which means that the label is part of the input
-            /// widget.
-            virtual std::pair<QWidget *, QWidget *> makeWidgets (QWidget *parent);
+        const Category* getParent() const;
 
-            /// Updates the widget returned by makeWidgets() to the current setting.
-            ///
-            /// \note If make_widgets() has not been called yet then nothing happens.
-            virtual void updateWidget();
+        const std::string& getKey() const;
 
-            const Category *getParent() const;
+        const std::string& getLabel() const;
 
-            const std::string& getKey() const;
+        int toInt() const;
 
-            const std::string& getLabel() const;
+        double toDouble() const;
 
-            int toInt() const;
+        std::string toString() const;
 
-            double toDouble() const;
+        bool isTrue() const;
 
-            std::string toString() const;
-
-            bool isTrue() const;
-
-            QColor toColor() const;
+        QColor toColor() const;
     };
 
     // note: fullKeys have the format categoryKey/settingKey
-    bool operator== (const Setting& setting, const std::string& fullKey);
-    bool operator== (const std::string& fullKey, const Setting& setting);
-    bool operator!= (const Setting& setting, const std::string& fullKey);
-    bool operator!= (const std::string& fullKey, const Setting& setting);
+    bool operator==(const Setting& setting, const std::string& fullKey);
+    bool operator==(const std::string& fullKey, const Setting& setting);
+    bool operator!=(const Setting& setting, const std::string& fullKey);
+    bool operator!=(const std::string& fullKey, const Setting& setting);
 }
 
 #endif
diff --git a/apps/opencs/model/prefs/shortcut.cpp b/apps/opencs/model/prefs/shortcut.cpp
index 130553a0f2..ae52df5912 100644
--- a/apps/opencs/model/prefs/shortcut.cpp
+++ b/apps/opencs/model/prefs/shortcut.cpp
@@ -7,8 +7,8 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include "state.hpp"
 #include "shortcutmanager.hpp"
+#include "state.hpp"
 
 namespace CSMPrefs
 {
@@ -25,7 +25,7 @@ namespace CSMPrefs
         , mModifierStatus(false)
         , mAction(nullptr)
     {
-        assert (parent);
+        assert(parent);
 
         State::get().getShortcutManager().addShortcut(this);
         State::get().getShortcutManager().getSequence(name, mSequence);
@@ -44,7 +44,7 @@ namespace CSMPrefs
         , mModifierStatus(false)
         , mAction(nullptr)
     {
-        assert (parent);
+        assert(parent);
 
         State::get().getShortcutManager().addShortcut(this);
         State::get().getShortcutManager().getSequence(name, mSequence);
@@ -64,7 +64,7 @@ namespace CSMPrefs
         , mModifierStatus(false)
         , mAction(nullptr)
     {
-        assert (parent);
+        assert(parent);
 
         State::get().getShortcutManager().addShortcut(this);
         State::get().getShortcutManager().getSequence(name, mSequence);
@@ -77,7 +77,7 @@ namespace CSMPrefs
         {
             State::get().getShortcutManager().removeShortcut(this);
         }
-        catch(const std::exception& e)
+        catch (const std::exception& e)
         {
             Log(Debug::Error) << "Error in the destructor: " << e.what();
         }
diff --git a/apps/opencs/model/prefs/shortcut.hpp b/apps/opencs/model/prefs/shortcut.hpp
index 4fa6f8a1a1..b2a17b8cb2 100644
--- a/apps/opencs/model/prefs/shortcut.hpp
+++ b/apps/opencs/model/prefs/shortcut.hpp
@@ -15,107 +15,105 @@ namespace CSMPrefs
     /// A class similar in purpose to QShortcut, but with the ability to use mouse buttons
     class Shortcut : public QObject
     {
-            Q_OBJECT
+        Q_OBJECT
 
-        public:
+    public:
+        enum ActivationStatus
+        {
+            AS_Regular,
+            AS_Secondary,
+            AS_Inactive
+        };
 
-            enum ActivationStatus
-            {
-                AS_Regular,
-                AS_Secondary,
-                AS_Inactive
-            };
+        enum SecondaryMode
+        {
+            SM_Replace, ///< The secondary signal replaces the regular signal when the modifier is active
+            SM_Detach, ///< The secondary signal is emitted independent of the regular signal, even if not active
+            SM_Ignore ///< The secondary signal will not ever be emitted
+        };
 
-            enum SecondaryMode
-            {
-                SM_Replace, ///< The secondary signal replaces the regular signal when the modifier is active
-                SM_Detach,  ///< The secondary signal is emitted independent of the regular signal, even if not active
-                SM_Ignore   ///< The secondary signal will not ever be emitted
-            };
+        Shortcut(const std::string& name, QWidget* parent);
+        Shortcut(const std::string& name, const std::string& modName, QWidget* parent);
+        Shortcut(const std::string& name, const std::string& modName, SecondaryMode secMode, QWidget* parent);
 
-            Shortcut(const std::string& name, QWidget* parent);
-            Shortcut(const std::string& name, const std::string& modName, QWidget* parent);
-            Shortcut(const std::string& name, const std::string& modName, SecondaryMode secMode, QWidget* parent);
+        ~Shortcut();
 
-            ~Shortcut();
+        bool isEnabled() const;
 
-            bool isEnabled() const;
+        const std::string& getName() const;
+        const std::string& getModifierName() const;
 
-            const std::string& getName() const;
-            const std::string& getModifierName() const;
+        SecondaryMode getSecondaryMode() const;
 
-            SecondaryMode getSecondaryMode() const;
+        const QKeySequence& getSequence() const;
+        int getModifier() const;
 
-            const QKeySequence& getSequence() const;
-            int getModifier() const;
+        /// The position in the sequence
+        int getPosition() const;
+        /// The position in the sequence
+        int getLastPosition() const;
 
-            /// The position in the sequence
-            int getPosition() const;
-            /// The position in the sequence
-            int getLastPosition() const;
+        ActivationStatus getActivationStatus() const;
+        bool getModifierStatus() const;
 
-            ActivationStatus getActivationStatus() const;
-            bool getModifierStatus() const;
+        void enable(bool state);
 
-            void enable(bool state);
+        void setSequence(const QKeySequence& sequence);
+        void setModifier(int modifier);
 
-            void setSequence(const QKeySequence& sequence);
-            void setModifier(int modifier);
+        /// The position in the sequence
+        void setPosition(int pos);
 
-            /// The position in the sequence
-            void setPosition(int pos);
+        void setActivationStatus(ActivationStatus status);
+        void setModifierStatus(bool status);
 
-            void setActivationStatus(ActivationStatus status);
-            void setModifierStatus(bool status);
+        /// Appends the sequence to the QAction text, also keeps it up to date
+        void associateAction(QAction* action);
 
-            /// Appends the sequence to the QAction text, also keeps it up to date
-            void associateAction(QAction* action);
+        // Workaround for Qt4 signals being "protected"
+        void signalActivated(bool state);
+        void signalActivated();
 
-            // Workaround for Qt4 signals being "protected"
-            void signalActivated(bool state);
-            void signalActivated();
+        void signalSecondary(bool state);
+        void signalSecondary();
 
-            void signalSecondary(bool state);
-            void signalSecondary();
+        QString toString() const;
 
-            QString toString() const;
+    private:
+        bool mEnabled;
 
-        private:
+        std::string mName;
+        std::string mModName;
+        SecondaryMode mSecondaryMode;
+        QKeySequence mSequence;
+        int mModifier;
 
-            bool mEnabled;
+        int mCurrentPos;
+        int mLastPos;
 
-            std::string mName;
-            std::string mModName;
-            SecondaryMode mSecondaryMode;
-            QKeySequence mSequence;
-            int mModifier;
+        ActivationStatus mActivationStatus;
+        bool mModifierStatus;
 
-            int mCurrentPos;
-            int mLastPos;
+        QAction* mAction;
+        QString mActionText;
 
-            ActivationStatus mActivationStatus;
-            bool mModifierStatus;
+    private slots:
 
-            QAction* mAction;
-            QString mActionText;
+        void actionDeleted();
 
-        private slots:
+    signals:
 
-            void actionDeleted();
+        /// Triggered when the shortcut is activated or deactivated; can be determined from \p state
+        void activated(bool state);
 
-        signals:
+        /// Convenience signal.
+        void activated();
 
-            /// Triggered when the shortcut is activated or deactivated; can be determined from \p state
-            void activated(bool state);
+        /// Triggered depending on SecondaryMode
+        void secondary(bool state);
 
-            /// Convenience signal.
-            void activated();
-
-            /// Triggered depending on SecondaryMode
-            void secondary(bool state);
-
-            /// Convenience signal.
-            void secondary();
+        /// Convenience signal.
+        void secondary();
     };
 }
 
diff --git a/apps/opencs/model/prefs/shortcuteventhandler.cpp b/apps/opencs/model/prefs/shortcuteventhandler.cpp
index 50fd336e8a..aedd9b52ee 100644
--- a/apps/opencs/model/prefs/shortcuteventhandler.cpp
+++ b/apps/opencs/model/prefs/shortcuteventhandler.cpp
@@ -49,7 +49,9 @@ namespace CSMPrefs
         ShortcutMap::iterator shortcutListIt = mWidgetShortcuts.find(widget);
         if (shortcutListIt != mWidgetShortcuts.end())
         {
-            shortcutListIt->second.erase(std::remove(shortcutListIt->second.begin(), shortcutListIt->second.end(), shortcut), shortcutListIt->second.end());
+            shortcutListIt->second.erase(
+                std::remove(shortcutListIt->second.begin(), shortcutListIt->second.end(), shortcut),
+                shortcutListIt->second.end());
         }
     }
 
@@ -60,8 +62,8 @@ namespace CSMPrefs
         {
             QWidget* widget = static_cast<QWidget*>(watched);
             QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
-            unsigned int mod = (unsigned int) keyEvent->modifiers();
-            unsigned int key = (unsigned int) keyEvent->key();
+            unsigned int mod = (unsigned int)keyEvent->modifiers();
+            unsigned int key = (unsigned int)keyEvent->key();
 
             if (!keyEvent->isAutoRepeat())
                 return activate(widget, mod, key);
@@ -70,8 +72,8 @@ namespace CSMPrefs
         {
             QWidget* widget = static_cast<QWidget*>(watched);
             QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
-            unsigned int mod = (unsigned int) keyEvent->modifiers();
-            unsigned int key = (unsigned int) keyEvent->key();
+            unsigned int mod = (unsigned int)keyEvent->modifiers();
+            unsigned int key = (unsigned int)keyEvent->key();
 
             if (!keyEvent->isAutoRepeat())
                 return deactivate(widget, mod, key);
@@ -80,8 +82,8 @@ namespace CSMPrefs
         {
             QWidget* widget = static_cast<QWidget*>(watched);
             QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
-            unsigned int mod = (unsigned int) mouseEvent->modifiers();
-            unsigned int button = (unsigned int) mouseEvent->button();
+            unsigned int mod = (unsigned int)mouseEvent->modifiers();
+            unsigned int button = (unsigned int)mouseEvent->button();
 
             return activate(widget, mod, button);
         }
@@ -89,8 +91,8 @@ namespace CSMPrefs
         {
             QWidget* widget = static_cast<QWidget*>(watched);
             QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
-            unsigned int mod = (unsigned int) mouseEvent->modifiers();
-            unsigned int button = (unsigned int) mouseEvent->button();
+            unsigned int mod = (unsigned int)mouseEvent->modifiers();
+            unsigned int button = (unsigned int)mouseEvent->button();
 
             return deactivate(widget, mod, button);
         }
@@ -148,7 +150,7 @@ namespace CSMPrefs
 
     bool ShortcutEventHandler::activate(QWidget* widget, unsigned int mod, unsigned int button)
     {
-        std::vector<std::pair<MatchResult, Shortcut*> > potentials;
+        std::vector<std::pair<MatchResult, Shortcut*>> potentials;
         bool used = false;
 
         while (widget)
@@ -178,7 +180,7 @@ namespace CSMPrefs
                 {
                     if (pos < lastPos && (result == Matches_WithMod || pos > 0))
                     {
-                        shortcut->setPosition(pos+1);
+                        shortcut->setPosition(pos + 1);
                     }
                     else if (pos == lastPos)
                     {
@@ -267,8 +269,8 @@ namespace CSMPrefs
 
     bool ShortcutEventHandler::checkModifier(unsigned int mod, unsigned int button, Shortcut* shortcut, bool activate)
     {
-        if (!shortcut->isEnabled() || !shortcut->getModifier() || shortcut->getSecondaryMode() == Shortcut::SM_Ignore ||
-            shortcut->getModifierStatus() == activate)
+        if (!shortcut->isEnabled() || !shortcut->getModifier() || shortcut->getSecondaryMode() == Shortcut::SM_Ignore
+            || shortcut->getModifierStatus() == activate)
             return false;
 
         MatchResult result = match(mod, button, shortcut->getModifier());
@@ -302,8 +304,8 @@ namespace CSMPrefs
         return used;
     }
 
-    ShortcutEventHandler::MatchResult ShortcutEventHandler::match(unsigned int mod, unsigned int button,
-        unsigned int value)
+    ShortcutEventHandler::MatchResult ShortcutEventHandler::match(
+        unsigned int mod, unsigned int button, unsigned int value)
     {
         if ((mod | button) == value)
         {
@@ -319,8 +321,8 @@ namespace CSMPrefs
         }
     }
 
-    bool ShortcutEventHandler::sort(const std::pair<MatchResult, Shortcut*>& left,
-        const std::pair<MatchResult, Shortcut*>& right)
+    bool ShortcutEventHandler::sort(
+        const std::pair<MatchResult, Shortcut*>& left, const std::pair<MatchResult, Shortcut*>& right)
     {
         if (left.first == Matches_WithMod && right.first == Matches_NoMod)
             return true;
diff --git a/apps/opencs/model/prefs/shortcuteventhandler.hpp b/apps/opencs/model/prefs/shortcuteventhandler.hpp
index 700b977fd3..2093e259e9 100644
--- a/apps/opencs/model/prefs/shortcuteventhandler.hpp
+++ b/apps/opencs/model/prefs/shortcuteventhandler.hpp
@@ -16,53 +16,49 @@ namespace CSMPrefs
     /// Users of this class should install it as an event handler
     class ShortcutEventHandler : public QObject
     {
-            Q_OBJECT
+        Q_OBJECT
 
-        public:
+    public:
+        ShortcutEventHandler(QObject* parent);
 
-            ShortcutEventHandler(QObject* parent);
+        void addShortcut(Shortcut* shortcut);
+        void removeShortcut(Shortcut* shortcut);
 
-            void addShortcut(Shortcut* shortcut);
-            void removeShortcut(Shortcut* shortcut);
+    protected:
+        bool eventFilter(QObject* watched, QEvent* event) override;
 
-        protected:
+    private:
+        typedef std::vector<Shortcut*> ShortcutList;
+        // Child, Parent
+        typedef std::map<QWidget*, QWidget*> WidgetMap;
+        typedef std::map<QWidget*, ShortcutList> ShortcutMap;
 
-            bool eventFilter(QObject* watched, QEvent* event) override;
+        enum MatchResult
+        {
+            Matches_WithMod,
+            Matches_NoMod,
+            Matches_Not
+        };
 
-        private:
+        void updateParent(QWidget* widget);
 
-            typedef std::vector<Shortcut*> ShortcutList;
-            // Child, Parent
-            typedef std::map<QWidget*, QWidget*> WidgetMap;
-            typedef std::map<QWidget*, ShortcutList> ShortcutMap;
+        bool activate(QWidget* widget, unsigned int mod, unsigned int button);
 
-            enum MatchResult
-            {
-                Matches_WithMod,
-                Matches_NoMod,
-                Matches_Not
-            };
+        bool deactivate(QWidget* widget, unsigned int mod, unsigned int button);
 
-            void updateParent(QWidget* widget);
+        bool checkModifier(unsigned int mod, unsigned int button, Shortcut* shortcut, bool activate);
 
-            bool activate(QWidget* widget, unsigned int mod, unsigned int button);
+        MatchResult match(unsigned int mod, unsigned int button, unsigned int value);
 
-            bool deactivate(QWidget* widget, unsigned int mod, unsigned int button);
+        // Prefers Matches_WithMod and a larger number of buttons
+        static bool sort(const std::pair<MatchResult, Shortcut*>& left, const std::pair<MatchResult, Shortcut*>& right);
 
-            bool checkModifier(unsigned int mod, unsigned int button, Shortcut* shortcut, bool activate);
+        WidgetMap mChildParentRelations;
+        ShortcutMap mWidgetShortcuts;
 
-            MatchResult match(unsigned int mod, unsigned int button, unsigned int value);
+    private slots:
 
-            // Prefers Matches_WithMod and a larger number of buttons
-            static bool sort(const std::pair<MatchResult, Shortcut*>& left,
-                const std::pair<MatchResult, Shortcut*>& right);
-
-            WidgetMap mChildParentRelations;
-            ShortcutMap mWidgetShortcuts;
-
-        private slots:
-
-            void widgetDestroyed();
+        void widgetDestroyed();
     };
 }
 
diff --git a/apps/opencs/model/prefs/shortcutmanager.cpp b/apps/opencs/model/prefs/shortcutmanager.cpp
index 25f295cd37..dfba28bd70 100644
--- a/apps/opencs/model/prefs/shortcutmanager.cpp
+++ b/apps/opencs/model/prefs/shortcutmanager.cpp
@@ -341,446 +341,445 @@ namespace CSMPrefs
         return substrings.join("");
     }
 
-    const std::pair<int, const char*> ShortcutManager::QtKeys[] =
-    {
-        std::make_pair((int)Qt::Key_Space                  , "Space"),
-        std::make_pair((int)Qt::Key_Exclam                 , "Exclam"),
-        std::make_pair((int)Qt::Key_QuoteDbl               , "QuoteDbl"),
-        std::make_pair((int)Qt::Key_NumberSign             , "NumberSign"),
-        std::make_pair((int)Qt::Key_Dollar                 , "Dollar"),
-        std::make_pair((int)Qt::Key_Percent                , "Percent"),
-        std::make_pair((int)Qt::Key_Ampersand              , "Ampersand"),
-        std::make_pair((int)Qt::Key_Apostrophe             , "Apostrophe"),
-        std::make_pair((int)Qt::Key_ParenLeft              , "ParenLeft"),
-        std::make_pair((int)Qt::Key_ParenRight             , "ParenRight"),
-        std::make_pair((int)Qt::Key_Asterisk               , "Asterisk"),
-        std::make_pair((int)Qt::Key_Plus                   , "Plus"),
-        std::make_pair((int)Qt::Key_Comma                  , "Comma"),
-        std::make_pair((int)Qt::Key_Minus                  , "Minus"),
-        std::make_pair((int)Qt::Key_Period                 , "Period"),
-        std::make_pair((int)Qt::Key_Slash                  , "Slash"),
-        std::make_pair((int)Qt::Key_0                      , "0"),
-        std::make_pair((int)Qt::Key_1                      , "1"),
-        std::make_pair((int)Qt::Key_2                      , "2"),
-        std::make_pair((int)Qt::Key_3                      , "3"),
-        std::make_pair((int)Qt::Key_4                      , "4"),
-        std::make_pair((int)Qt::Key_5                      , "5"),
-        std::make_pair((int)Qt::Key_6                      , "6"),
-        std::make_pair((int)Qt::Key_7                      , "7"),
-        std::make_pair((int)Qt::Key_8                      , "8"),
-        std::make_pair((int)Qt::Key_9                      , "9"),
-        std::make_pair((int)Qt::Key_Colon                  , "Colon"),
-        std::make_pair((int)Qt::Key_Semicolon              , "Semicolon"),
-        std::make_pair((int)Qt::Key_Less                   , "Less"),
-        std::make_pair((int)Qt::Key_Equal                  , "Equal"),
-        std::make_pair((int)Qt::Key_Greater                , "Greater"),
-        std::make_pair((int)Qt::Key_Question               , "Question"),
-        std::make_pair((int)Qt::Key_At                     , "At"),
-        std::make_pair((int)Qt::Key_A                      , "A"),
-        std::make_pair((int)Qt::Key_B                      , "B"),
-        std::make_pair((int)Qt::Key_C                      , "C"),
-        std::make_pair((int)Qt::Key_D                      , "D"),
-        std::make_pair((int)Qt::Key_E                      , "E"),
-        std::make_pair((int)Qt::Key_F                      , "F"),
-        std::make_pair((int)Qt::Key_G                      , "G"),
-        std::make_pair((int)Qt::Key_H                      , "H"),
-        std::make_pair((int)Qt::Key_I                      , "I"),
-        std::make_pair((int)Qt::Key_J                      , "J"),
-        std::make_pair((int)Qt::Key_K                      , "K"),
-        std::make_pair((int)Qt::Key_L                      , "L"),
-        std::make_pair((int)Qt::Key_M                      , "M"),
-        std::make_pair((int)Qt::Key_N                      , "N"),
-        std::make_pair((int)Qt::Key_O                      , "O"),
-        std::make_pair((int)Qt::Key_P                      , "P"),
-        std::make_pair((int)Qt::Key_Q                      , "Q"),
-        std::make_pair((int)Qt::Key_R                      , "R"),
-        std::make_pair((int)Qt::Key_S                      , "S"),
-        std::make_pair((int)Qt::Key_T                      , "T"),
-        std::make_pair((int)Qt::Key_U                      , "U"),
-        std::make_pair((int)Qt::Key_V                      , "V"),
-        std::make_pair((int)Qt::Key_W                      , "W"),
-        std::make_pair((int)Qt::Key_X                      , "X"),
-        std::make_pair((int)Qt::Key_Y                      , "Y"),
-        std::make_pair((int)Qt::Key_Z                      , "Z"),
-        std::make_pair((int)Qt::Key_BracketLeft            , "BracketLeft"),
-        std::make_pair((int)Qt::Key_Backslash              , "Backslash"),
-        std::make_pair((int)Qt::Key_BracketRight           , "BracketRight"),
-        std::make_pair((int)Qt::Key_AsciiCircum            , "AsciiCircum"),
-        std::make_pair((int)Qt::Key_Underscore             , "Underscore"),
-        std::make_pair((int)Qt::Key_QuoteLeft              , "QuoteLeft"),
-        std::make_pair((int)Qt::Key_BraceLeft              , "BraceLeft"),
-        std::make_pair((int)Qt::Key_Bar                    , "Bar"),
-        std::make_pair((int)Qt::Key_BraceRight             , "BraceRight"),
-        std::make_pair((int)Qt::Key_AsciiTilde             , "AsciiTilde"),
-        std::make_pair((int)Qt::Key_nobreakspace           , "nobreakspace"),
-        std::make_pair((int)Qt::Key_exclamdown             , "exclamdown"),
-        std::make_pair((int)Qt::Key_cent                   , "cent"),
-        std::make_pair((int)Qt::Key_sterling               , "sterling"),
-        std::make_pair((int)Qt::Key_currency               , "currency"),
-        std::make_pair((int)Qt::Key_yen                    , "yen"),
-        std::make_pair((int)Qt::Key_brokenbar              , "brokenbar"),
-        std::make_pair((int)Qt::Key_section                , "section"),
-        std::make_pair((int)Qt::Key_diaeresis              , "diaeresis"),
-        std::make_pair((int)Qt::Key_copyright              , "copyright"),
-        std::make_pair((int)Qt::Key_ordfeminine            , "ordfeminine"),
-        std::make_pair((int)Qt::Key_guillemotleft          , "guillemotleft"),
-        std::make_pair((int)Qt::Key_notsign                , "notsign"),
-        std::make_pair((int)Qt::Key_hyphen                 , "hyphen"),
-        std::make_pair((int)Qt::Key_registered             , "registered"),
-        std::make_pair((int)Qt::Key_macron                 , "macron"),
-        std::make_pair((int)Qt::Key_degree                 , "degree"),
-        std::make_pair((int)Qt::Key_plusminus              , "plusminus"),
-        std::make_pair((int)Qt::Key_twosuperior            , "twosuperior"),
-        std::make_pair((int)Qt::Key_threesuperior          , "threesuperior"),
-        std::make_pair((int)Qt::Key_acute                  , "acute"),
-        std::make_pair((int)Qt::Key_mu                     , "mu"),
-        std::make_pair((int)Qt::Key_paragraph              , "paragraph"),
-        std::make_pair((int)Qt::Key_periodcentered         , "periodcentered"),
-        std::make_pair((int)Qt::Key_cedilla                , "cedilla"),
-        std::make_pair((int)Qt::Key_onesuperior            , "onesuperior"),
-        std::make_pair((int)Qt::Key_masculine              , "masculine"),
-        std::make_pair((int)Qt::Key_guillemotright         , "guillemotright"),
-        std::make_pair((int)Qt::Key_onequarter             , "onequarter"),
-        std::make_pair((int)Qt::Key_onehalf                , "onehalf"),
-        std::make_pair((int)Qt::Key_threequarters          , "threequarters"),
-        std::make_pair((int)Qt::Key_questiondown           , "questiondown"),
-        std::make_pair((int)Qt::Key_Agrave                 , "Agrave"),
-        std::make_pair((int)Qt::Key_Aacute                 , "Aacute"),
-        std::make_pair((int)Qt::Key_Acircumflex            , "Acircumflex"),
-        std::make_pair((int)Qt::Key_Atilde                 , "Atilde"),
-        std::make_pair((int)Qt::Key_Adiaeresis             , "Adiaeresis"),
-        std::make_pair((int)Qt::Key_Aring                  , "Aring"),
-        std::make_pair((int)Qt::Key_AE                     , "AE"),
-        std::make_pair((int)Qt::Key_Ccedilla               , "Ccedilla"),
-        std::make_pair((int)Qt::Key_Egrave                 , "Egrave"),
-        std::make_pair((int)Qt::Key_Eacute                 , "Eacute"),
-        std::make_pair((int)Qt::Key_Ecircumflex            , "Ecircumflex"),
-        std::make_pair((int)Qt::Key_Ediaeresis             , "Ediaeresis"),
-        std::make_pair((int)Qt::Key_Igrave                 , "Igrave"),
-        std::make_pair((int)Qt::Key_Iacute                 , "Iacute"),
-        std::make_pair((int)Qt::Key_Icircumflex            , "Icircumflex"),
-        std::make_pair((int)Qt::Key_Idiaeresis             , "Idiaeresis"),
-        std::make_pair((int)Qt::Key_ETH                    , "ETH"),
-        std::make_pair((int)Qt::Key_Ntilde                 , "Ntilde"),
-        std::make_pair((int)Qt::Key_Ograve                 , "Ograve"),
-        std::make_pair((int)Qt::Key_Oacute                 , "Oacute"),
-        std::make_pair((int)Qt::Key_Ocircumflex            , "Ocircumflex"),
-        std::make_pair((int)Qt::Key_Otilde                 , "Otilde"),
-        std::make_pair((int)Qt::Key_Odiaeresis             , "Odiaeresis"),
-        std::make_pair((int)Qt::Key_multiply               , "multiply"),
-        std::make_pair((int)Qt::Key_Ooblique               , "Ooblique"),
-        std::make_pair((int)Qt::Key_Ugrave                 , "Ugrave"),
-        std::make_pair((int)Qt::Key_Uacute                 , "Uacute"),
-        std::make_pair((int)Qt::Key_Ucircumflex            , "Ucircumflex"),
-        std::make_pair((int)Qt::Key_Udiaeresis             , "Udiaeresis"),
-        std::make_pair((int)Qt::Key_Yacute                 , "Yacute"),
-        std::make_pair((int)Qt::Key_THORN                  , "THORN"),
-        std::make_pair((int)Qt::Key_ssharp                 , "ssharp"),
-        std::make_pair((int)Qt::Key_division               , "division"),
-        std::make_pair((int)Qt::Key_ydiaeresis             , "ydiaeresis"),
-        std::make_pair((int)Qt::Key_Escape                 , "Escape"),
-        std::make_pair((int)Qt::Key_Tab                    , "Tab"),
-        std::make_pair((int)Qt::Key_Backtab                , "Backtab"),
-        std::make_pair((int)Qt::Key_Backspace              , "Backspace"),
-        std::make_pair((int)Qt::Key_Return                 , "Return"),
-        std::make_pair((int)Qt::Key_Enter                  , "Enter"),
-        std::make_pair((int)Qt::Key_Insert                 , "Insert"),
-        std::make_pair((int)Qt::Key_Delete                 , "Delete"),
-        std::make_pair((int)Qt::Key_Pause                  , "Pause"),
-        std::make_pair((int)Qt::Key_Print                  , "Print"),
-        std::make_pair((int)Qt::Key_SysReq                 , "SysReq"),
-        std::make_pair((int)Qt::Key_Clear                  , "Clear"),
-        std::make_pair((int)Qt::Key_Home                   , "Home"),
-        std::make_pair((int)Qt::Key_End                    , "End"),
-        std::make_pair((int)Qt::Key_Left                   , "Left"),
-        std::make_pair((int)Qt::Key_Up                     , "Up"),
-        std::make_pair((int)Qt::Key_Right                  , "Right"),
-        std::make_pair((int)Qt::Key_Down                   , "Down"),
-        std::make_pair((int)Qt::Key_PageUp                 , "PageUp"),
-        std::make_pair((int)Qt::Key_PageDown               , "PageDown"),
-        std::make_pair((int)Qt::Key_Shift                  , "Shift"),
-        std::make_pair((int)Qt::Key_Control                , "Control"),
-        std::make_pair((int)Qt::Key_Meta                   , "Meta"),
-        std::make_pair((int)Qt::Key_Alt                    , "Alt"),
-        std::make_pair((int)Qt::Key_CapsLock               , "CapsLock"),
-        std::make_pair((int)Qt::Key_NumLock                , "NumLock"),
-        std::make_pair((int)Qt::Key_ScrollLock             , "ScrollLock"),
-        std::make_pair((int)Qt::Key_F1                     , "F1"),
-        std::make_pair((int)Qt::Key_F2                     , "F2"),
-        std::make_pair((int)Qt::Key_F3                     , "F3"),
-        std::make_pair((int)Qt::Key_F4                     , "F4"),
-        std::make_pair((int)Qt::Key_F5                     , "F5"),
-        std::make_pair((int)Qt::Key_F6                     , "F6"),
-        std::make_pair((int)Qt::Key_F7                     , "F7"),
-        std::make_pair((int)Qt::Key_F8                     , "F8"),
-        std::make_pair((int)Qt::Key_F9                     , "F9"),
-        std::make_pair((int)Qt::Key_F10                    , "F10"),
-        std::make_pair((int)Qt::Key_F11                    , "F11"),
-        std::make_pair((int)Qt::Key_F12                    , "F12"),
-        std::make_pair((int)Qt::Key_F13                    , "F13"),
-        std::make_pair((int)Qt::Key_F14                    , "F14"),
-        std::make_pair((int)Qt::Key_F15                    , "F15"),
-        std::make_pair((int)Qt::Key_F16                    , "F16"),
-        std::make_pair((int)Qt::Key_F17                    , "F17"),
-        std::make_pair((int)Qt::Key_F18                    , "F18"),
-        std::make_pair((int)Qt::Key_F19                    , "F19"),
-        std::make_pair((int)Qt::Key_F20                    , "F20"),
-        std::make_pair((int)Qt::Key_F21                    , "F21"),
-        std::make_pair((int)Qt::Key_F22                    , "F22"),
-        std::make_pair((int)Qt::Key_F23                    , "F23"),
-        std::make_pair((int)Qt::Key_F24                    , "F24"),
-        std::make_pair((int)Qt::Key_F25                    , "F25"),
-        std::make_pair((int)Qt::Key_F26                    , "F26"),
-        std::make_pair((int)Qt::Key_F27                    , "F27"),
-        std::make_pair((int)Qt::Key_F28                    , "F28"),
-        std::make_pair((int)Qt::Key_F29                    , "F29"),
-        std::make_pair((int)Qt::Key_F30                    , "F30"),
-        std::make_pair((int)Qt::Key_F31                    , "F31"),
-        std::make_pair((int)Qt::Key_F32                    , "F32"),
-        std::make_pair((int)Qt::Key_F33                    , "F33"),
-        std::make_pair((int)Qt::Key_F34                    , "F34"),
-        std::make_pair((int)Qt::Key_F35                    , "F35"),
-        std::make_pair((int)Qt::Key_Super_L                , "Super_L"),
-        std::make_pair((int)Qt::Key_Super_R                , "Super_R"),
-        std::make_pair((int)Qt::Key_Menu                   , "Menu"),
-        std::make_pair((int)Qt::Key_Hyper_L                , "Hyper_L"),
-        std::make_pair((int)Qt::Key_Hyper_R                , "Hyper_R"),
-        std::make_pair((int)Qt::Key_Help                   , "Help"),
-        std::make_pair((int)Qt::Key_Direction_L            , "Direction_L"),
-        std::make_pair((int)Qt::Key_Direction_R            , "Direction_R"),
-        std::make_pair((int)Qt::Key_Back                   , "Back"),
-        std::make_pair((int)Qt::Key_Forward                , "Forward"),
-        std::make_pair((int)Qt::Key_Stop                   , "Stop"),
-        std::make_pair((int)Qt::Key_Refresh                , "Refresh"),
-        std::make_pair((int)Qt::Key_VolumeDown             , "VolumeDown"),
-        std::make_pair((int)Qt::Key_VolumeMute             , "VolumeMute"),
-        std::make_pair((int)Qt::Key_VolumeUp               , "VolumeUp"),
-        std::make_pair((int)Qt::Key_BassBoost              , "BassBoost"),
-        std::make_pair((int)Qt::Key_BassUp                 , "BassUp"),
-        std::make_pair((int)Qt::Key_BassDown               , "BassDown"),
-        std::make_pair((int)Qt::Key_TrebleUp               , "TrebleUp"),
-        std::make_pair((int)Qt::Key_TrebleDown             , "TrebleDown"),
-        std::make_pair((int)Qt::Key_MediaPlay              , "MediaPlay"),
-        std::make_pair((int)Qt::Key_MediaStop              , "MediaStop"),
-        std::make_pair((int)Qt::Key_MediaPrevious          , "MediaPrevious"),
-        std::make_pair((int)Qt::Key_MediaNext              , "MediaNext"),
-        std::make_pair((int)Qt::Key_MediaRecord            , "MediaRecord"),
-        std::make_pair((int)Qt::Key_MediaPause             , "MediaPause"),
-        std::make_pair((int)Qt::Key_MediaTogglePlayPause   , "MediaTogglePlayPause"),
-        std::make_pair((int)Qt::Key_HomePage               , "HomePage"),
-        std::make_pair((int)Qt::Key_Favorites              , "Favorites"),
-        std::make_pair((int)Qt::Key_Search                 , "Search"),
-        std::make_pair((int)Qt::Key_Standby                , "Standby"),
-        std::make_pair((int)Qt::Key_OpenUrl                , "OpenUrl"),
-        std::make_pair((int)Qt::Key_LaunchMail             , "LaunchMail"),
-        std::make_pair((int)Qt::Key_LaunchMedia            , "LaunchMedia"),
-        std::make_pair((int)Qt::Key_Launch0                , "Launch0"),
-        std::make_pair((int)Qt::Key_Launch1                , "Launch1"),
-        std::make_pair((int)Qt::Key_Launch2                , "Launch2"),
-        std::make_pair((int)Qt::Key_Launch3                , "Launch3"),
-        std::make_pair((int)Qt::Key_Launch4                , "Launch4"),
-        std::make_pair((int)Qt::Key_Launch5                , "Launch5"),
-        std::make_pair((int)Qt::Key_Launch6                , "Launch6"),
-        std::make_pair((int)Qt::Key_Launch7                , "Launch7"),
-        std::make_pair((int)Qt::Key_Launch8                , "Launch8"),
-        std::make_pair((int)Qt::Key_Launch9                , "Launch9"),
-        std::make_pair((int)Qt::Key_LaunchA                , "LaunchA"),
-        std::make_pair((int)Qt::Key_LaunchB                , "LaunchB"),
-        std::make_pair((int)Qt::Key_LaunchC                , "LaunchC"),
-        std::make_pair((int)Qt::Key_LaunchD                , "LaunchD"),
-        std::make_pair((int)Qt::Key_LaunchE                , "LaunchE"),
-        std::make_pair((int)Qt::Key_LaunchF                , "LaunchF"),
-        std::make_pair((int)Qt::Key_MonBrightnessUp        , "MonBrightnessUp"),
-        std::make_pair((int)Qt::Key_MonBrightnessDown      , "MonBrightnessDown"),
-        std::make_pair((int)Qt::Key_KeyboardLightOnOff     , "KeyboardLightOnOff"),
-        std::make_pair((int)Qt::Key_KeyboardBrightnessUp   , "KeyboardBrightnessUp"),
-        std::make_pair((int)Qt::Key_KeyboardBrightnessDown , "KeyboardBrightnessDown"),
-        std::make_pair((int)Qt::Key_PowerOff               , "PowerOff"),
-        std::make_pair((int)Qt::Key_WakeUp                 , "WakeUp"),
-        std::make_pair((int)Qt::Key_Eject                  , "Eject"),
-        std::make_pair((int)Qt::Key_ScreenSaver            , "ScreenSaver"),
-        std::make_pair((int)Qt::Key_WWW                    , "WWW"),
-        std::make_pair((int)Qt::Key_Memo                   , "Memo"),
-        std::make_pair((int)Qt::Key_LightBulb              , "LightBulb"),
-        std::make_pair((int)Qt::Key_Shop                   , "Shop"),
-        std::make_pair((int)Qt::Key_History                , "History"),
-        std::make_pair((int)Qt::Key_AddFavorite            , "AddFavorite"),
-        std::make_pair((int)Qt::Key_HotLinks               , "HotLinks"),
-        std::make_pair((int)Qt::Key_BrightnessAdjust       , "BrightnessAdjust"),
-        std::make_pair((int)Qt::Key_Finance                , "Finance"),
-        std::make_pair((int)Qt::Key_Community              , "Community"),
-        std::make_pair((int)Qt::Key_AudioRewind            , "AudioRewind"),
-        std::make_pair((int)Qt::Key_BackForward            , "BackForward"),
-        std::make_pair((int)Qt::Key_ApplicationLeft        , "ApplicationLeft"),
-        std::make_pair((int)Qt::Key_ApplicationRight       , "ApplicationRight"),
-        std::make_pair((int)Qt::Key_Book                   , "Book"),
-        std::make_pair((int)Qt::Key_CD                     , "CD"),
-        std::make_pair((int)Qt::Key_Calculator             , "Calculator"),
-        std::make_pair((int)Qt::Key_ToDoList               , "ToDoList"),
-        std::make_pair((int)Qt::Key_ClearGrab              , "ClearGrab"),
-        std::make_pair((int)Qt::Key_Close                  , "Close"),
-        std::make_pair((int)Qt::Key_Copy                   , "Copy"),
-        std::make_pair((int)Qt::Key_Cut                    , "Cut"),
-        std::make_pair((int)Qt::Key_Display                , "Display"),
-        std::make_pair((int)Qt::Key_DOS                    , "DOS"),
-        std::make_pair((int)Qt::Key_Documents              , "Documents"),
-        std::make_pair((int)Qt::Key_Excel                  , "Excel"),
-        std::make_pair((int)Qt::Key_Explorer               , "Explorer"),
-        std::make_pair((int)Qt::Key_Game                   , "Game"),
-        std::make_pair((int)Qt::Key_Go                     , "Go"),
-        std::make_pair((int)Qt::Key_iTouch                 , "iTouch"),
-        std::make_pair((int)Qt::Key_LogOff                 , "LogOff"),
-        std::make_pair((int)Qt::Key_Market                 , "Market"),
-        std::make_pair((int)Qt::Key_Meeting                , "Meeting"),
-        std::make_pair((int)Qt::Key_MenuKB                 , "MenuKB"),
-        std::make_pair((int)Qt::Key_MenuPB                 , "MenuPB"),
-        std::make_pair((int)Qt::Key_MySites                , "MySites"),
-        std::make_pair((int)Qt::Key_News                   , "News"),
-        std::make_pair((int)Qt::Key_OfficeHome             , "OfficeHome"),
-        std::make_pair((int)Qt::Key_Option                 , "Option"),
-        std::make_pair((int)Qt::Key_Paste                  , "Paste"),
-        std::make_pair((int)Qt::Key_Phone                  , "Phone"),
-        std::make_pair((int)Qt::Key_Calendar               , "Calendar"),
-        std::make_pair((int)Qt::Key_Reply                  , "Reply"),
-        std::make_pair((int)Qt::Key_Reload                 , "Reload"),
-        std::make_pair((int)Qt::Key_RotateWindows          , "RotateWindows"),
-        std::make_pair((int)Qt::Key_RotationPB             , "RotationPB"),
-        std::make_pair((int)Qt::Key_RotationKB             , "RotationKB"),
-        std::make_pair((int)Qt::Key_Save                   , "Save"),
-        std::make_pair((int)Qt::Key_Send                   , "Send"),
-        std::make_pair((int)Qt::Key_Spell                  , "Spell"),
-        std::make_pair((int)Qt::Key_SplitScreen            , "SplitScreen"),
-        std::make_pair((int)Qt::Key_Support                , "Support"),
-        std::make_pair((int)Qt::Key_TaskPane               , "TaskPane"),
-        std::make_pair((int)Qt::Key_Terminal               , "Terminal"),
-        std::make_pair((int)Qt::Key_Tools                  , "Tools"),
-        std::make_pair((int)Qt::Key_Travel                 , "Travel"),
-        std::make_pair((int)Qt::Key_Video                  , "Video"),
-        std::make_pair((int)Qt::Key_Word                   , "Word"),
-        std::make_pair((int)Qt::Key_Xfer                   , "Xfer"),
-        std::make_pair((int)Qt::Key_ZoomIn                 , "ZoomIn"),
-        std::make_pair((int)Qt::Key_ZoomOut                , "ZoomOut"),
-        std::make_pair((int)Qt::Key_Away                   , "Away"),
-        std::make_pair((int)Qt::Key_Messenger              , "Messenger"),
-        std::make_pair((int)Qt::Key_WebCam                 , "WebCam"),
-        std::make_pair((int)Qt::Key_MailForward            , "MailForward"),
-        std::make_pair((int)Qt::Key_Pictures               , "Pictures"),
-        std::make_pair((int)Qt::Key_Music                  , "Music"),
-        std::make_pair((int)Qt::Key_Battery                , "Battery"),
-        std::make_pair((int)Qt::Key_Bluetooth              , "Bluetooth"),
-        std::make_pair((int)Qt::Key_WLAN                   , "WLAN"),
-        std::make_pair((int)Qt::Key_UWB                    , "UWB"),
-        std::make_pair((int)Qt::Key_AudioForward           , "AudioForward"),
-        std::make_pair((int)Qt::Key_AudioRepeat            , "AudioRepeat"),
-        std::make_pair((int)Qt::Key_AudioRandomPlay        , "AudioRandomPlay"),
-        std::make_pair((int)Qt::Key_Subtitle               , "Subtitle"),
-        std::make_pair((int)Qt::Key_AudioCycleTrack        , "AudioCycleTrack"),
-        std::make_pair((int)Qt::Key_Time                   , "Time"),
-        std::make_pair((int)Qt::Key_Hibernate              , "Hibernate"),
-        std::make_pair((int)Qt::Key_View                   , "View"),
-        std::make_pair((int)Qt::Key_TopMenu                , "TopMenu"),
-        std::make_pair((int)Qt::Key_PowerDown              , "PowerDown"),
-        std::make_pair((int)Qt::Key_Suspend                , "Suspend"),
-        std::make_pair((int)Qt::Key_ContrastAdjust         , "ContrastAdjust"),
-        std::make_pair((int)Qt::Key_LaunchG                , "LaunchG"),
-        std::make_pair((int)Qt::Key_LaunchH                , "LaunchH"),
-        std::make_pair((int)Qt::Key_TouchpadToggle         , "TouchpadToggle"),
-        std::make_pair((int)Qt::Key_TouchpadOn             , "TouchpadOn"),
-        std::make_pair((int)Qt::Key_TouchpadOff            , "TouchpadOff"),
-        std::make_pair((int)Qt::Key_MicMute                , "MicMute"),
-        std::make_pair((int)Qt::Key_Red                    , "Red"),
-        std::make_pair((int)Qt::Key_Green                  , "Green"),
-        std::make_pair((int)Qt::Key_Yellow                 , "Yellow"),
-        std::make_pair((int)Qt::Key_Blue                   , "Blue"),
-        std::make_pair((int)Qt::Key_ChannelUp              , "ChannelUp"),
-        std::make_pair((int)Qt::Key_ChannelDown            , "ChannelDown"),
-        std::make_pair((int)Qt::Key_Guide                  , "Guide"),
-        std::make_pair((int)Qt::Key_Info                   , "Info"),
-        std::make_pair((int)Qt::Key_Settings               , "Settings"),
-        std::make_pair((int)Qt::Key_MicVolumeUp            , "MicVolumeUp"),
-        std::make_pair((int)Qt::Key_MicVolumeDown          , "MicVolumeDown"),
-        std::make_pair((int)Qt::Key_New                    , "New"),
-        std::make_pair((int)Qt::Key_Open                   , "Open"),
-        std::make_pair((int)Qt::Key_Find                   , "Find"),
-        std::make_pair((int)Qt::Key_Undo                   , "Undo"),
-        std::make_pair((int)Qt::Key_Redo                   , "Redo"),
-        std::make_pair((int)Qt::Key_AltGr                  , "AltGr"),
-        std::make_pair((int)Qt::Key_Multi_key              , "Multi_key"),
-        std::make_pair((int)Qt::Key_Kanji                  , "Kanji"),
-        std::make_pair((int)Qt::Key_Muhenkan               , "Muhenkan"),
-        std::make_pair((int)Qt::Key_Henkan                 , "Henkan"),
-        std::make_pair((int)Qt::Key_Romaji                 , "Romaji"),
-        std::make_pair((int)Qt::Key_Hiragana               , "Hiragana"),
-        std::make_pair((int)Qt::Key_Katakana               , "Katakana"),
-        std::make_pair((int)Qt::Key_Hiragana_Katakana      , "Hiragana_Katakana"),
-        std::make_pair((int)Qt::Key_Zenkaku                , "Zenkaku"),
-        std::make_pair((int)Qt::Key_Hankaku                , "Hankaku"),
-        std::make_pair((int)Qt::Key_Zenkaku_Hankaku        , "Zenkaku_Hankaku"),
-        std::make_pair((int)Qt::Key_Touroku                , "Touroku"),
-        std::make_pair((int)Qt::Key_Massyo                 , "Massyo"),
-        std::make_pair((int)Qt::Key_Kana_Lock              , "Kana_Lock"),
-        std::make_pair((int)Qt::Key_Kana_Shift             , "Kana_Shift"),
-        std::make_pair((int)Qt::Key_Eisu_Shift             , "Eisu_Shift"),
-        std::make_pair((int)Qt::Key_Eisu_toggle            , "Eisu_toggle"),
-        std::make_pair((int)Qt::Key_Hangul                 , "Hangul"),
-        std::make_pair((int)Qt::Key_Hangul_Start           , "Hangul_Start"),
-        std::make_pair((int)Qt::Key_Hangul_End             , "Hangul_End"),
-        std::make_pair((int)Qt::Key_Hangul_Hanja           , "Hangul_Hanja"),
-        std::make_pair((int)Qt::Key_Hangul_Jamo            , "Hangul_Jamo"),
-        std::make_pair((int)Qt::Key_Hangul_Romaja          , "Hangul_Romaja"),
-        std::make_pair((int)Qt::Key_Codeinput              , "Codeinput"),
-        std::make_pair((int)Qt::Key_Hangul_Jeonja          , "Hangul_Jeonja"),
-        std::make_pair((int)Qt::Key_Hangul_Banja           , "Hangul_Banja"),
-        std::make_pair((int)Qt::Key_Hangul_PreHanja        , "Hangul_PreHanja"),
-        std::make_pair((int)Qt::Key_Hangul_PostHanja       , "Hangul_PostHanja"),
-        std::make_pair((int)Qt::Key_SingleCandidate        , "SingleCandidate"),
-        std::make_pair((int)Qt::Key_MultipleCandidate      , "MultipleCandidate"),
-        std::make_pair((int)Qt::Key_PreviousCandidate      , "PreviousCandidate"),
-        std::make_pair((int)Qt::Key_Hangul_Special         , "Hangul_Special"),
-        std::make_pair((int)Qt::Key_Mode_switch            , "Mode_switch"),
-        std::make_pair((int)Qt::Key_Dead_Grave             , "Dead_Grave"),
-        std::make_pair((int)Qt::Key_Dead_Acute             , "Dead_Acute"),
-        std::make_pair((int)Qt::Key_Dead_Circumflex        , "Dead_Circumflex"),
-        std::make_pair((int)Qt::Key_Dead_Tilde             , "Dead_Tilde"),
-        std::make_pair((int)Qt::Key_Dead_Macron            , "Dead_Macron"),
-        std::make_pair((int)Qt::Key_Dead_Breve             , "Dead_Breve"),
-        std::make_pair((int)Qt::Key_Dead_Abovedot          , "Dead_Abovedot"),
-        std::make_pair((int)Qt::Key_Dead_Diaeresis         , "Dead_Diaeresis"),
-        std::make_pair((int)Qt::Key_Dead_Abovering         , "Dead_Abovering"),
-        std::make_pair((int)Qt::Key_Dead_Doubleacute       , "Dead_Doubleacute"),
-        std::make_pair((int)Qt::Key_Dead_Caron             , "Dead_Caron"),
-        std::make_pair((int)Qt::Key_Dead_Cedilla           , "Dead_Cedilla"),
-        std::make_pair((int)Qt::Key_Dead_Ogonek            , "Dead_Ogonek"),
-        std::make_pair((int)Qt::Key_Dead_Iota              , "Dead_Iota"),
-        std::make_pair((int)Qt::Key_Dead_Voiced_Sound      , "Dead_Voiced_Sound"),
-        std::make_pair((int)Qt::Key_Dead_Semivoiced_Sound  , "Dead_Semivoiced_Sound"),
-        std::make_pair((int)Qt::Key_Dead_Belowdot          , "Dead_Belowdot"),
-        std::make_pair((int)Qt::Key_Dead_Hook              , "Dead_Hook"),
-        std::make_pair((int)Qt::Key_Dead_Horn              , "Dead_Horn"),
-        std::make_pair((int)Qt::Key_MediaLast              , "MediaLast"),
-        std::make_pair((int)Qt::Key_Select                 , "Select"),
-        std::make_pair((int)Qt::Key_Yes                    , "Yes"),
-        std::make_pair((int)Qt::Key_No                     , "No"),
-        std::make_pair((int)Qt::Key_Cancel                 , "Cancel"),
-        std::make_pair((int)Qt::Key_Printer                , "Printer"),
-        std::make_pair((int)Qt::Key_Execute                , "Execute"),
-        std::make_pair((int)Qt::Key_Sleep                  , "Sleep"),
-        std::make_pair((int)Qt::Key_Play                   , "Play"),
-        std::make_pair((int)Qt::Key_Zoom                   , "Zoom"),
-        std::make_pair((int)Qt::Key_Exit                   , "Exit"),
-        std::make_pair((int)Qt::Key_Context1               , "Context1"),
-        std::make_pair((int)Qt::Key_Context2               , "Context2"),
-        std::make_pair((int)Qt::Key_Context3               , "Context3"),
-        std::make_pair((int)Qt::Key_Context4               , "Context4"),
-        std::make_pair((int)Qt::Key_Call                   , "Call"),
-        std::make_pair((int)Qt::Key_Hangup                 , "Hangup"),
-        std::make_pair((int)Qt::Key_Flip                   , "Flip"),
-        std::make_pair((int)Qt::Key_ToggleCallHangup       , "ToggleCallHangup"),
-        std::make_pair((int)Qt::Key_VoiceDial              , "VoiceDial"),
-        std::make_pair((int)Qt::Key_LastNumberRedial       , "LastNumberRedial"),
-        std::make_pair((int)Qt::Key_Camera                 , "Camera"),
-        std::make_pair((int)Qt::Key_CameraFocus            , "CameraFocus"),
-        std::make_pair(0                                   , static_cast<const char*>(nullptr)),
+    const std::pair<int, const char*> ShortcutManager::QtKeys[] = {
+        std::make_pair((int)Qt::Key_Space, "Space"),
+        std::make_pair((int)Qt::Key_Exclam, "Exclam"),
+        std::make_pair((int)Qt::Key_QuoteDbl, "QuoteDbl"),
+        std::make_pair((int)Qt::Key_NumberSign, "NumberSign"),
+        std::make_pair((int)Qt::Key_Dollar, "Dollar"),
+        std::make_pair((int)Qt::Key_Percent, "Percent"),
+        std::make_pair((int)Qt::Key_Ampersand, "Ampersand"),
+        std::make_pair((int)Qt::Key_Apostrophe, "Apostrophe"),
+        std::make_pair((int)Qt::Key_ParenLeft, "ParenLeft"),
+        std::make_pair((int)Qt::Key_ParenRight, "ParenRight"),
+        std::make_pair((int)Qt::Key_Asterisk, "Asterisk"),
+        std::make_pair((int)Qt::Key_Plus, "Plus"),
+        std::make_pair((int)Qt::Key_Comma, "Comma"),
+        std::make_pair((int)Qt::Key_Minus, "Minus"),
+        std::make_pair((int)Qt::Key_Period, "Period"),
+        std::make_pair((int)Qt::Key_Slash, "Slash"),
+        std::make_pair((int)Qt::Key_0, "0"),
+        std::make_pair((int)Qt::Key_1, "1"),
+        std::make_pair((int)Qt::Key_2, "2"),
+        std::make_pair((int)Qt::Key_3, "3"),
+        std::make_pair((int)Qt::Key_4, "4"),
+        std::make_pair((int)Qt::Key_5, "5"),
+        std::make_pair((int)Qt::Key_6, "6"),
+        std::make_pair((int)Qt::Key_7, "7"),
+        std::make_pair((int)Qt::Key_8, "8"),
+        std::make_pair((int)Qt::Key_9, "9"),
+        std::make_pair((int)Qt::Key_Colon, "Colon"),
+        std::make_pair((int)Qt::Key_Semicolon, "Semicolon"),
+        std::make_pair((int)Qt::Key_Less, "Less"),
+        std::make_pair((int)Qt::Key_Equal, "Equal"),
+        std::make_pair((int)Qt::Key_Greater, "Greater"),
+        std::make_pair((int)Qt::Key_Question, "Question"),
+        std::make_pair((int)Qt::Key_At, "At"),
+        std::make_pair((int)Qt::Key_A, "A"),
+        std::make_pair((int)Qt::Key_B, "B"),
+        std::make_pair((int)Qt::Key_C, "C"),
+        std::make_pair((int)Qt::Key_D, "D"),
+        std::make_pair((int)Qt::Key_E, "E"),
+        std::make_pair((int)Qt::Key_F, "F"),
+        std::make_pair((int)Qt::Key_G, "G"),
+        std::make_pair((int)Qt::Key_H, "H"),
+        std::make_pair((int)Qt::Key_I, "I"),
+        std::make_pair((int)Qt::Key_J, "J"),
+        std::make_pair((int)Qt::Key_K, "K"),
+        std::make_pair((int)Qt::Key_L, "L"),
+        std::make_pair((int)Qt::Key_M, "M"),
+        std::make_pair((int)Qt::Key_N, "N"),
+        std::make_pair((int)Qt::Key_O, "O"),
+        std::make_pair((int)Qt::Key_P, "P"),
+        std::make_pair((int)Qt::Key_Q, "Q"),
+        std::make_pair((int)Qt::Key_R, "R"),
+        std::make_pair((int)Qt::Key_S, "S"),
+        std::make_pair((int)Qt::Key_T, "T"),
+        std::make_pair((int)Qt::Key_U, "U"),
+        std::make_pair((int)Qt::Key_V, "V"),
+        std::make_pair((int)Qt::Key_W, "W"),
+        std::make_pair((int)Qt::Key_X, "X"),
+        std::make_pair((int)Qt::Key_Y, "Y"),
+        std::make_pair((int)Qt::Key_Z, "Z"),
+        std::make_pair((int)Qt::Key_BracketLeft, "BracketLeft"),
+        std::make_pair((int)Qt::Key_Backslash, "Backslash"),
+        std::make_pair((int)Qt::Key_BracketRight, "BracketRight"),
+        std::make_pair((int)Qt::Key_AsciiCircum, "AsciiCircum"),
+        std::make_pair((int)Qt::Key_Underscore, "Underscore"),
+        std::make_pair((int)Qt::Key_QuoteLeft, "QuoteLeft"),
+        std::make_pair((int)Qt::Key_BraceLeft, "BraceLeft"),
+        std::make_pair((int)Qt::Key_Bar, "Bar"),
+        std::make_pair((int)Qt::Key_BraceRight, "BraceRight"),
+        std::make_pair((int)Qt::Key_AsciiTilde, "AsciiTilde"),
+        std::make_pair((int)Qt::Key_nobreakspace, "nobreakspace"),
+        std::make_pair((int)Qt::Key_exclamdown, "exclamdown"),
+        std::make_pair((int)Qt::Key_cent, "cent"),
+        std::make_pair((int)Qt::Key_sterling, "sterling"),
+        std::make_pair((int)Qt::Key_currency, "currency"),
+        std::make_pair((int)Qt::Key_yen, "yen"),
+        std::make_pair((int)Qt::Key_brokenbar, "brokenbar"),
+        std::make_pair((int)Qt::Key_section, "section"),
+        std::make_pair((int)Qt::Key_diaeresis, "diaeresis"),
+        std::make_pair((int)Qt::Key_copyright, "copyright"),
+        std::make_pair((int)Qt::Key_ordfeminine, "ordfeminine"),
+        std::make_pair((int)Qt::Key_guillemotleft, "guillemotleft"),
+        std::make_pair((int)Qt::Key_notsign, "notsign"),
+        std::make_pair((int)Qt::Key_hyphen, "hyphen"),
+        std::make_pair((int)Qt::Key_registered, "registered"),
+        std::make_pair((int)Qt::Key_macron, "macron"),
+        std::make_pair((int)Qt::Key_degree, "degree"),
+        std::make_pair((int)Qt::Key_plusminus, "plusminus"),
+        std::make_pair((int)Qt::Key_twosuperior, "twosuperior"),
+        std::make_pair((int)Qt::Key_threesuperior, "threesuperior"),
+        std::make_pair((int)Qt::Key_acute, "acute"),
+        std::make_pair((int)Qt::Key_mu, "mu"),
+        std::make_pair((int)Qt::Key_paragraph, "paragraph"),
+        std::make_pair((int)Qt::Key_periodcentered, "periodcentered"),
+        std::make_pair((int)Qt::Key_cedilla, "cedilla"),
+        std::make_pair((int)Qt::Key_onesuperior, "onesuperior"),
+        std::make_pair((int)Qt::Key_masculine, "masculine"),
+        std::make_pair((int)Qt::Key_guillemotright, "guillemotright"),
+        std::make_pair((int)Qt::Key_onequarter, "onequarter"),
+        std::make_pair((int)Qt::Key_onehalf, "onehalf"),
+        std::make_pair((int)Qt::Key_threequarters, "threequarters"),
+        std::make_pair((int)Qt::Key_questiondown, "questiondown"),
+        std::make_pair((int)Qt::Key_Agrave, "Agrave"),
+        std::make_pair((int)Qt::Key_Aacute, "Aacute"),
+        std::make_pair((int)Qt::Key_Acircumflex, "Acircumflex"),
+        std::make_pair((int)Qt::Key_Atilde, "Atilde"),
+        std::make_pair((int)Qt::Key_Adiaeresis, "Adiaeresis"),
+        std::make_pair((int)Qt::Key_Aring, "Aring"),
+        std::make_pair((int)Qt::Key_AE, "AE"),
+        std::make_pair((int)Qt::Key_Ccedilla, "Ccedilla"),
+        std::make_pair((int)Qt::Key_Egrave, "Egrave"),
+        std::make_pair((int)Qt::Key_Eacute, "Eacute"),
+        std::make_pair((int)Qt::Key_Ecircumflex, "Ecircumflex"),
+        std::make_pair((int)Qt::Key_Ediaeresis, "Ediaeresis"),
+        std::make_pair((int)Qt::Key_Igrave, "Igrave"),
+        std::make_pair((int)Qt::Key_Iacute, "Iacute"),
+        std::make_pair((int)Qt::Key_Icircumflex, "Icircumflex"),
+        std::make_pair((int)Qt::Key_Idiaeresis, "Idiaeresis"),
+        std::make_pair((int)Qt::Key_ETH, "ETH"),
+        std::make_pair((int)Qt::Key_Ntilde, "Ntilde"),
+        std::make_pair((int)Qt::Key_Ograve, "Ograve"),
+        std::make_pair((int)Qt::Key_Oacute, "Oacute"),
+        std::make_pair((int)Qt::Key_Ocircumflex, "Ocircumflex"),
+        std::make_pair((int)Qt::Key_Otilde, "Otilde"),
+        std::make_pair((int)Qt::Key_Odiaeresis, "Odiaeresis"),
+        std::make_pair((int)Qt::Key_multiply, "multiply"),
+        std::make_pair((int)Qt::Key_Ooblique, "Ooblique"),
+        std::make_pair((int)Qt::Key_Ugrave, "Ugrave"),
+        std::make_pair((int)Qt::Key_Uacute, "Uacute"),
+        std::make_pair((int)Qt::Key_Ucircumflex, "Ucircumflex"),
+        std::make_pair((int)Qt::Key_Udiaeresis, "Udiaeresis"),
+        std::make_pair((int)Qt::Key_Yacute, "Yacute"),
+        std::make_pair((int)Qt::Key_THORN, "THORN"),
+        std::make_pair((int)Qt::Key_ssharp, "ssharp"),
+        std::make_pair((int)Qt::Key_division, "division"),
+        std::make_pair((int)Qt::Key_ydiaeresis, "ydiaeresis"),
+        std::make_pair((int)Qt::Key_Escape, "Escape"),
+        std::make_pair((int)Qt::Key_Tab, "Tab"),
+        std::make_pair((int)Qt::Key_Backtab, "Backtab"),
+        std::make_pair((int)Qt::Key_Backspace, "Backspace"),
+        std::make_pair((int)Qt::Key_Return, "Return"),
+        std::make_pair((int)Qt::Key_Enter, "Enter"),
+        std::make_pair((int)Qt::Key_Insert, "Insert"),
+        std::make_pair((int)Qt::Key_Delete, "Delete"),
+        std::make_pair((int)Qt::Key_Pause, "Pause"),
+        std::make_pair((int)Qt::Key_Print, "Print"),
+        std::make_pair((int)Qt::Key_SysReq, "SysReq"),
+        std::make_pair((int)Qt::Key_Clear, "Clear"),
+        std::make_pair((int)Qt::Key_Home, "Home"),
+        std::make_pair((int)Qt::Key_End, "End"),
+        std::make_pair((int)Qt::Key_Left, "Left"),
+        std::make_pair((int)Qt::Key_Up, "Up"),
+        std::make_pair((int)Qt::Key_Right, "Right"),
+        std::make_pair((int)Qt::Key_Down, "Down"),
+        std::make_pair((int)Qt::Key_PageUp, "PageUp"),
+        std::make_pair((int)Qt::Key_PageDown, "PageDown"),
+        std::make_pair((int)Qt::Key_Shift, "Shift"),
+        std::make_pair((int)Qt::Key_Control, "Control"),
+        std::make_pair((int)Qt::Key_Meta, "Meta"),
+        std::make_pair((int)Qt::Key_Alt, "Alt"),
+        std::make_pair((int)Qt::Key_CapsLock, "CapsLock"),
+        std::make_pair((int)Qt::Key_NumLock, "NumLock"),
+        std::make_pair((int)Qt::Key_ScrollLock, "ScrollLock"),
+        std::make_pair((int)Qt::Key_F1, "F1"),
+        std::make_pair((int)Qt::Key_F2, "F2"),
+        std::make_pair((int)Qt::Key_F3, "F3"),
+        std::make_pair((int)Qt::Key_F4, "F4"),
+        std::make_pair((int)Qt::Key_F5, "F5"),
+        std::make_pair((int)Qt::Key_F6, "F6"),
+        std::make_pair((int)Qt::Key_F7, "F7"),
+        std::make_pair((int)Qt::Key_F8, "F8"),
+        std::make_pair((int)Qt::Key_F9, "F9"),
+        std::make_pair((int)Qt::Key_F10, "F10"),
+        std::make_pair((int)Qt::Key_F11, "F11"),
+        std::make_pair((int)Qt::Key_F12, "F12"),
+        std::make_pair((int)Qt::Key_F13, "F13"),
+        std::make_pair((int)Qt::Key_F14, "F14"),
+        std::make_pair((int)Qt::Key_F15, "F15"),
+        std::make_pair((int)Qt::Key_F16, "F16"),
+        std::make_pair((int)Qt::Key_F17, "F17"),
+        std::make_pair((int)Qt::Key_F18, "F18"),
+        std::make_pair((int)Qt::Key_F19, "F19"),
+        std::make_pair((int)Qt::Key_F20, "F20"),
+        std::make_pair((int)Qt::Key_F21, "F21"),
+        std::make_pair((int)Qt::Key_F22, "F22"),
+        std::make_pair((int)Qt::Key_F23, "F23"),
+        std::make_pair((int)Qt::Key_F24, "F24"),
+        std::make_pair((int)Qt::Key_F25, "F25"),
+        std::make_pair((int)Qt::Key_F26, "F26"),
+        std::make_pair((int)Qt::Key_F27, "F27"),
+        std::make_pair((int)Qt::Key_F28, "F28"),
+        std::make_pair((int)Qt::Key_F29, "F29"),
+        std::make_pair((int)Qt::Key_F30, "F30"),
+        std::make_pair((int)Qt::Key_F31, "F31"),
+        std::make_pair((int)Qt::Key_F32, "F32"),
+        std::make_pair((int)Qt::Key_F33, "F33"),
+        std::make_pair((int)Qt::Key_F34, "F34"),
+        std::make_pair((int)Qt::Key_F35, "F35"),
+        std::make_pair((int)Qt::Key_Super_L, "Super_L"),
+        std::make_pair((int)Qt::Key_Super_R, "Super_R"),
+        std::make_pair((int)Qt::Key_Menu, "Menu"),
+        std::make_pair((int)Qt::Key_Hyper_L, "Hyper_L"),
+        std::make_pair((int)Qt::Key_Hyper_R, "Hyper_R"),
+        std::make_pair((int)Qt::Key_Help, "Help"),
+        std::make_pair((int)Qt::Key_Direction_L, "Direction_L"),
+        std::make_pair((int)Qt::Key_Direction_R, "Direction_R"),
+        std::make_pair((int)Qt::Key_Back, "Back"),
+        std::make_pair((int)Qt::Key_Forward, "Forward"),
+        std::make_pair((int)Qt::Key_Stop, "Stop"),
+        std::make_pair((int)Qt::Key_Refresh, "Refresh"),
+        std::make_pair((int)Qt::Key_VolumeDown, "VolumeDown"),
+        std::make_pair((int)Qt::Key_VolumeMute, "VolumeMute"),
+        std::make_pair((int)Qt::Key_VolumeUp, "VolumeUp"),
+        std::make_pair((int)Qt::Key_BassBoost, "BassBoost"),
+        std::make_pair((int)Qt::Key_BassUp, "BassUp"),
+        std::make_pair((int)Qt::Key_BassDown, "BassDown"),
+        std::make_pair((int)Qt::Key_TrebleUp, "TrebleUp"),
+        std::make_pair((int)Qt::Key_TrebleDown, "TrebleDown"),
+        std::make_pair((int)Qt::Key_MediaPlay, "MediaPlay"),
+        std::make_pair((int)Qt::Key_MediaStop, "MediaStop"),
+        std::make_pair((int)Qt::Key_MediaPrevious, "MediaPrevious"),
+        std::make_pair((int)Qt::Key_MediaNext, "MediaNext"),
+        std::make_pair((int)Qt::Key_MediaRecord, "MediaRecord"),
+        std::make_pair((int)Qt::Key_MediaPause, "MediaPause"),
+        std::make_pair((int)Qt::Key_MediaTogglePlayPause, "MediaTogglePlayPause"),
+        std::make_pair((int)Qt::Key_HomePage, "HomePage"),
+        std::make_pair((int)Qt::Key_Favorites, "Favorites"),
+        std::make_pair((int)Qt::Key_Search, "Search"),
+        std::make_pair((int)Qt::Key_Standby, "Standby"),
+        std::make_pair((int)Qt::Key_OpenUrl, "OpenUrl"),
+        std::make_pair((int)Qt::Key_LaunchMail, "LaunchMail"),
+        std::make_pair((int)Qt::Key_LaunchMedia, "LaunchMedia"),
+        std::make_pair((int)Qt::Key_Launch0, "Launch0"),
+        std::make_pair((int)Qt::Key_Launch1, "Launch1"),
+        std::make_pair((int)Qt::Key_Launch2, "Launch2"),
+        std::make_pair((int)Qt::Key_Launch3, "Launch3"),
+        std::make_pair((int)Qt::Key_Launch4, "Launch4"),
+        std::make_pair((int)Qt::Key_Launch5, "Launch5"),
+        std::make_pair((int)Qt::Key_Launch6, "Launch6"),
+        std::make_pair((int)Qt::Key_Launch7, "Launch7"),
+        std::make_pair((int)Qt::Key_Launch8, "Launch8"),
+        std::make_pair((int)Qt::Key_Launch9, "Launch9"),
+        std::make_pair((int)Qt::Key_LaunchA, "LaunchA"),
+        std::make_pair((int)Qt::Key_LaunchB, "LaunchB"),
+        std::make_pair((int)Qt::Key_LaunchC, "LaunchC"),
+        std::make_pair((int)Qt::Key_LaunchD, "LaunchD"),
+        std::make_pair((int)Qt::Key_LaunchE, "LaunchE"),
+        std::make_pair((int)Qt::Key_LaunchF, "LaunchF"),
+        std::make_pair((int)Qt::Key_MonBrightnessUp, "MonBrightnessUp"),
+        std::make_pair((int)Qt::Key_MonBrightnessDown, "MonBrightnessDown"),
+        std::make_pair((int)Qt::Key_KeyboardLightOnOff, "KeyboardLightOnOff"),
+        std::make_pair((int)Qt::Key_KeyboardBrightnessUp, "KeyboardBrightnessUp"),
+        std::make_pair((int)Qt::Key_KeyboardBrightnessDown, "KeyboardBrightnessDown"),
+        std::make_pair((int)Qt::Key_PowerOff, "PowerOff"),
+        std::make_pair((int)Qt::Key_WakeUp, "WakeUp"),
+        std::make_pair((int)Qt::Key_Eject, "Eject"),
+        std::make_pair((int)Qt::Key_ScreenSaver, "ScreenSaver"),
+        std::make_pair((int)Qt::Key_WWW, "WWW"),
+        std::make_pair((int)Qt::Key_Memo, "Memo"),
+        std::make_pair((int)Qt::Key_LightBulb, "LightBulb"),
+        std::make_pair((int)Qt::Key_Shop, "Shop"),
+        std::make_pair((int)Qt::Key_History, "History"),
+        std::make_pair((int)Qt::Key_AddFavorite, "AddFavorite"),
+        std::make_pair((int)Qt::Key_HotLinks, "HotLinks"),
+        std::make_pair((int)Qt::Key_BrightnessAdjust, "BrightnessAdjust"),
+        std::make_pair((int)Qt::Key_Finance, "Finance"),
+        std::make_pair((int)Qt::Key_Community, "Community"),
+        std::make_pair((int)Qt::Key_AudioRewind, "AudioRewind"),
+        std::make_pair((int)Qt::Key_BackForward, "BackForward"),
+        std::make_pair((int)Qt::Key_ApplicationLeft, "ApplicationLeft"),
+        std::make_pair((int)Qt::Key_ApplicationRight, "ApplicationRight"),
+        std::make_pair((int)Qt::Key_Book, "Book"),
+        std::make_pair((int)Qt::Key_CD, "CD"),
+        std::make_pair((int)Qt::Key_Calculator, "Calculator"),
+        std::make_pair((int)Qt::Key_ToDoList, "ToDoList"),
+        std::make_pair((int)Qt::Key_ClearGrab, "ClearGrab"),
+        std::make_pair((int)Qt::Key_Close, "Close"),
+        std::make_pair((int)Qt::Key_Copy, "Copy"),
+        std::make_pair((int)Qt::Key_Cut, "Cut"),
+        std::make_pair((int)Qt::Key_Display, "Display"),
+        std::make_pair((int)Qt::Key_DOS, "DOS"),
+        std::make_pair((int)Qt::Key_Documents, "Documents"),
+        std::make_pair((int)Qt::Key_Excel, "Excel"),
+        std::make_pair((int)Qt::Key_Explorer, "Explorer"),
+        std::make_pair((int)Qt::Key_Game, "Game"),
+        std::make_pair((int)Qt::Key_Go, "Go"),
+        std::make_pair((int)Qt::Key_iTouch, "iTouch"),
+        std::make_pair((int)Qt::Key_LogOff, "LogOff"),
+        std::make_pair((int)Qt::Key_Market, "Market"),
+        std::make_pair((int)Qt::Key_Meeting, "Meeting"),
+        std::make_pair((int)Qt::Key_MenuKB, "MenuKB"),
+        std::make_pair((int)Qt::Key_MenuPB, "MenuPB"),
+        std::make_pair((int)Qt::Key_MySites, "MySites"),
+        std::make_pair((int)Qt::Key_News, "News"),
+        std::make_pair((int)Qt::Key_OfficeHome, "OfficeHome"),
+        std::make_pair((int)Qt::Key_Option, "Option"),
+        std::make_pair((int)Qt::Key_Paste, "Paste"),
+        std::make_pair((int)Qt::Key_Phone, "Phone"),
+        std::make_pair((int)Qt::Key_Calendar, "Calendar"),
+        std::make_pair((int)Qt::Key_Reply, "Reply"),
+        std::make_pair((int)Qt::Key_Reload, "Reload"),
+        std::make_pair((int)Qt::Key_RotateWindows, "RotateWindows"),
+        std::make_pair((int)Qt::Key_RotationPB, "RotationPB"),
+        std::make_pair((int)Qt::Key_RotationKB, "RotationKB"),
+        std::make_pair((int)Qt::Key_Save, "Save"),
+        std::make_pair((int)Qt::Key_Send, "Send"),
+        std::make_pair((int)Qt::Key_Spell, "Spell"),
+        std::make_pair((int)Qt::Key_SplitScreen, "SplitScreen"),
+        std::make_pair((int)Qt::Key_Support, "Support"),
+        std::make_pair((int)Qt::Key_TaskPane, "TaskPane"),
+        std::make_pair((int)Qt::Key_Terminal, "Terminal"),
+        std::make_pair((int)Qt::Key_Tools, "Tools"),
+        std::make_pair((int)Qt::Key_Travel, "Travel"),
+        std::make_pair((int)Qt::Key_Video, "Video"),
+        std::make_pair((int)Qt::Key_Word, "Word"),
+        std::make_pair((int)Qt::Key_Xfer, "Xfer"),
+        std::make_pair((int)Qt::Key_ZoomIn, "ZoomIn"),
+        std::make_pair((int)Qt::Key_ZoomOut, "ZoomOut"),
+        std::make_pair((int)Qt::Key_Away, "Away"),
+        std::make_pair((int)Qt::Key_Messenger, "Messenger"),
+        std::make_pair((int)Qt::Key_WebCam, "WebCam"),
+        std::make_pair((int)Qt::Key_MailForward, "MailForward"),
+        std::make_pair((int)Qt::Key_Pictures, "Pictures"),
+        std::make_pair((int)Qt::Key_Music, "Music"),
+        std::make_pair((int)Qt::Key_Battery, "Battery"),
+        std::make_pair((int)Qt::Key_Bluetooth, "Bluetooth"),
+        std::make_pair((int)Qt::Key_WLAN, "WLAN"),
+        std::make_pair((int)Qt::Key_UWB, "UWB"),
+        std::make_pair((int)Qt::Key_AudioForward, "AudioForward"),
+        std::make_pair((int)Qt::Key_AudioRepeat, "AudioRepeat"),
+        std::make_pair((int)Qt::Key_AudioRandomPlay, "AudioRandomPlay"),
+        std::make_pair((int)Qt::Key_Subtitle, "Subtitle"),
+        std::make_pair((int)Qt::Key_AudioCycleTrack, "AudioCycleTrack"),
+        std::make_pair((int)Qt::Key_Time, "Time"),
+        std::make_pair((int)Qt::Key_Hibernate, "Hibernate"),
+        std::make_pair((int)Qt::Key_View, "View"),
+        std::make_pair((int)Qt::Key_TopMenu, "TopMenu"),
+        std::make_pair((int)Qt::Key_PowerDown, "PowerDown"),
+        std::make_pair((int)Qt::Key_Suspend, "Suspend"),
+        std::make_pair((int)Qt::Key_ContrastAdjust, "ContrastAdjust"),
+        std::make_pair((int)Qt::Key_LaunchG, "LaunchG"),
+        std::make_pair((int)Qt::Key_LaunchH, "LaunchH"),
+        std::make_pair((int)Qt::Key_TouchpadToggle, "TouchpadToggle"),
+        std::make_pair((int)Qt::Key_TouchpadOn, "TouchpadOn"),
+        std::make_pair((int)Qt::Key_TouchpadOff, "TouchpadOff"),
+        std::make_pair((int)Qt::Key_MicMute, "MicMute"),
+        std::make_pair((int)Qt::Key_Red, "Red"),
+        std::make_pair((int)Qt::Key_Green, "Green"),
+        std::make_pair((int)Qt::Key_Yellow, "Yellow"),
+        std::make_pair((int)Qt::Key_Blue, "Blue"),
+        std::make_pair((int)Qt::Key_ChannelUp, "ChannelUp"),
+        std::make_pair((int)Qt::Key_ChannelDown, "ChannelDown"),
+        std::make_pair((int)Qt::Key_Guide, "Guide"),
+        std::make_pair((int)Qt::Key_Info, "Info"),
+        std::make_pair((int)Qt::Key_Settings, "Settings"),
+        std::make_pair((int)Qt::Key_MicVolumeUp, "MicVolumeUp"),
+        std::make_pair((int)Qt::Key_MicVolumeDown, "MicVolumeDown"),
+        std::make_pair((int)Qt::Key_New, "New"),
+        std::make_pair((int)Qt::Key_Open, "Open"),
+        std::make_pair((int)Qt::Key_Find, "Find"),
+        std::make_pair((int)Qt::Key_Undo, "Undo"),
+        std::make_pair((int)Qt::Key_Redo, "Redo"),
+        std::make_pair((int)Qt::Key_AltGr, "AltGr"),
+        std::make_pair((int)Qt::Key_Multi_key, "Multi_key"),
+        std::make_pair((int)Qt::Key_Kanji, "Kanji"),
+        std::make_pair((int)Qt::Key_Muhenkan, "Muhenkan"),
+        std::make_pair((int)Qt::Key_Henkan, "Henkan"),
+        std::make_pair((int)Qt::Key_Romaji, "Romaji"),
+        std::make_pair((int)Qt::Key_Hiragana, "Hiragana"),
+        std::make_pair((int)Qt::Key_Katakana, "Katakana"),
+        std::make_pair((int)Qt::Key_Hiragana_Katakana, "Hiragana_Katakana"),
+        std::make_pair((int)Qt::Key_Zenkaku, "Zenkaku"),
+        std::make_pair((int)Qt::Key_Hankaku, "Hankaku"),
+        std::make_pair((int)Qt::Key_Zenkaku_Hankaku, "Zenkaku_Hankaku"),
+        std::make_pair((int)Qt::Key_Touroku, "Touroku"),
+        std::make_pair((int)Qt::Key_Massyo, "Massyo"),
+        std::make_pair((int)Qt::Key_Kana_Lock, "Kana_Lock"),
+        std::make_pair((int)Qt::Key_Kana_Shift, "Kana_Shift"),
+        std::make_pair((int)Qt::Key_Eisu_Shift, "Eisu_Shift"),
+        std::make_pair((int)Qt::Key_Eisu_toggle, "Eisu_toggle"),
+        std::make_pair((int)Qt::Key_Hangul, "Hangul"),
+        std::make_pair((int)Qt::Key_Hangul_Start, "Hangul_Start"),
+        std::make_pair((int)Qt::Key_Hangul_End, "Hangul_End"),
+        std::make_pair((int)Qt::Key_Hangul_Hanja, "Hangul_Hanja"),
+        std::make_pair((int)Qt::Key_Hangul_Jamo, "Hangul_Jamo"),
+        std::make_pair((int)Qt::Key_Hangul_Romaja, "Hangul_Romaja"),
+        std::make_pair((int)Qt::Key_Codeinput, "Codeinput"),
+        std::make_pair((int)Qt::Key_Hangul_Jeonja, "Hangul_Jeonja"),
+        std::make_pair((int)Qt::Key_Hangul_Banja, "Hangul_Banja"),
+        std::make_pair((int)Qt::Key_Hangul_PreHanja, "Hangul_PreHanja"),
+        std::make_pair((int)Qt::Key_Hangul_PostHanja, "Hangul_PostHanja"),
+        std::make_pair((int)Qt::Key_SingleCandidate, "SingleCandidate"),
+        std::make_pair((int)Qt::Key_MultipleCandidate, "MultipleCandidate"),
+        std::make_pair((int)Qt::Key_PreviousCandidate, "PreviousCandidate"),
+        std::make_pair((int)Qt::Key_Hangul_Special, "Hangul_Special"),
+        std::make_pair((int)Qt::Key_Mode_switch, "Mode_switch"),
+        std::make_pair((int)Qt::Key_Dead_Grave, "Dead_Grave"),
+        std::make_pair((int)Qt::Key_Dead_Acute, "Dead_Acute"),
+        std::make_pair((int)Qt::Key_Dead_Circumflex, "Dead_Circumflex"),
+        std::make_pair((int)Qt::Key_Dead_Tilde, "Dead_Tilde"),
+        std::make_pair((int)Qt::Key_Dead_Macron, "Dead_Macron"),
+        std::make_pair((int)Qt::Key_Dead_Breve, "Dead_Breve"),
+        std::make_pair((int)Qt::Key_Dead_Abovedot, "Dead_Abovedot"),
+        std::make_pair((int)Qt::Key_Dead_Diaeresis, "Dead_Diaeresis"),
+        std::make_pair((int)Qt::Key_Dead_Abovering, "Dead_Abovering"),
+        std::make_pair((int)Qt::Key_Dead_Doubleacute, "Dead_Doubleacute"),
+        std::make_pair((int)Qt::Key_Dead_Caron, "Dead_Caron"),
+        std::make_pair((int)Qt::Key_Dead_Cedilla, "Dead_Cedilla"),
+        std::make_pair((int)Qt::Key_Dead_Ogonek, "Dead_Ogonek"),
+        std::make_pair((int)Qt::Key_Dead_Iota, "Dead_Iota"),
+        std::make_pair((int)Qt::Key_Dead_Voiced_Sound, "Dead_Voiced_Sound"),
+        std::make_pair((int)Qt::Key_Dead_Semivoiced_Sound, "Dead_Semivoiced_Sound"),
+        std::make_pair((int)Qt::Key_Dead_Belowdot, "Dead_Belowdot"),
+        std::make_pair((int)Qt::Key_Dead_Hook, "Dead_Hook"),
+        std::make_pair((int)Qt::Key_Dead_Horn, "Dead_Horn"),
+        std::make_pair((int)Qt::Key_MediaLast, "MediaLast"),
+        std::make_pair((int)Qt::Key_Select, "Select"),
+        std::make_pair((int)Qt::Key_Yes, "Yes"),
+        std::make_pair((int)Qt::Key_No, "No"),
+        std::make_pair((int)Qt::Key_Cancel, "Cancel"),
+        std::make_pair((int)Qt::Key_Printer, "Printer"),
+        std::make_pair((int)Qt::Key_Execute, "Execute"),
+        std::make_pair((int)Qt::Key_Sleep, "Sleep"),
+        std::make_pair((int)Qt::Key_Play, "Play"),
+        std::make_pair((int)Qt::Key_Zoom, "Zoom"),
+        std::make_pair((int)Qt::Key_Exit, "Exit"),
+        std::make_pair((int)Qt::Key_Context1, "Context1"),
+        std::make_pair((int)Qt::Key_Context2, "Context2"),
+        std::make_pair((int)Qt::Key_Context3, "Context3"),
+        std::make_pair((int)Qt::Key_Context4, "Context4"),
+        std::make_pair((int)Qt::Key_Call, "Call"),
+        std::make_pair((int)Qt::Key_Hangup, "Hangup"),
+        std::make_pair((int)Qt::Key_Flip, "Flip"),
+        std::make_pair((int)Qt::Key_ToggleCallHangup, "ToggleCallHangup"),
+        std::make_pair((int)Qt::Key_VoiceDial, "VoiceDial"),
+        std::make_pair((int)Qt::Key_LastNumberRedial, "LastNumberRedial"),
+        std::make_pair((int)Qt::Key_Camera, "Camera"),
+        std::make_pair((int)Qt::Key_CameraFocus, "CameraFocus"),
+        std::make_pair(0, static_cast<const char*>(nullptr)),
     };
 
 }
diff --git a/apps/opencs/model/prefs/shortcutmanager.hpp b/apps/opencs/model/prefs/shortcutmanager.hpp
index 99f01a5dff..3fe3853f03 100644
--- a/apps/opencs/model/prefs/shortcutmanager.hpp
+++ b/apps/opencs/model/prefs/shortcutmanager.hpp
@@ -15,58 +15,56 @@ namespace CSMPrefs
     /// Class used to track and update shortcuts/sequences
     class ShortcutManager : public QObject
     {
-            Q_OBJECT
+        Q_OBJECT
 
-        public:
+    public:
+        ShortcutManager();
 
-            ShortcutManager();
+        /// The shortcut class will do this automatically
+        void addShortcut(Shortcut* shortcut);
 
-            /// The shortcut class will do this automatically
-            void addShortcut(Shortcut* shortcut);
+        /// The shortcut class will do this automatically
+        void removeShortcut(Shortcut* shortcut);
 
-            /// The shortcut class will do this automatically
-            void removeShortcut(Shortcut* shortcut);
+        bool getSequence(const std::string& name, QKeySequence& sequence) const;
+        void setSequence(const std::string& name, const QKeySequence& sequence);
 
-            bool getSequence(const std::string& name, QKeySequence& sequence) const;
-            void setSequence(const std::string& name, const QKeySequence& sequence);
+        bool getModifier(const std::string& name, int& modifier) const;
+        void setModifier(const std::string& name, int modifier);
 
-            bool getModifier(const std::string& name, int& modifier) const;
-            void setModifier(const std::string& name, int modifier);
+        std::string convertToString(const QKeySequence& sequence) const;
+        std::string convertToString(int modifier) const;
 
-            std::string convertToString(const QKeySequence& sequence) const;
-            std::string convertToString(int modifier) const;
+        std::string convertToString(const QKeySequence& sequence, int modifier) const;
 
-            std::string convertToString(const QKeySequence& sequence, int modifier) const;
+        void convertFromString(const std::string& data, QKeySequence& sequence) const;
+        void convertFromString(const std::string& data, int& modifier) const;
 
-            void convertFromString(const std::string& data, QKeySequence& sequence) const;
-            void convertFromString(const std::string& data, int& modifier) const;
+        void convertFromString(const std::string& data, QKeySequence& sequence, int& modifier) const;
 
-            void convertFromString(const std::string& data, QKeySequence& sequence, int& modifier) const;
+        /// Replaces "{sequence-name}" or "{modifier-name}" with the appropriate text
+        QString processToolTip(const QString& toolTip) const;
 
-            /// Replaces "{sequence-name}" or "{modifier-name}" with the appropriate text
-            QString processToolTip(const QString& toolTip) const;
+    private:
+        // Need a multimap in case multiple shortcuts share the same name
+        typedef std::multimap<std::string, Shortcut*> ShortcutMap;
+        typedef std::map<std::string, QKeySequence> SequenceMap;
+        typedef std::map<std::string, int> ModifierMap;
+        typedef std::map<int, std::string> NameMap;
+        typedef std::map<std::string, int> KeyMap;
 
-        private:
+        ShortcutMap mShortcuts;
+        SequenceMap mSequences;
+        ModifierMap mModifiers;
 
-            // Need a multimap in case multiple shortcuts share the same name
-            typedef std::multimap<std::string, Shortcut*> ShortcutMap;
-            typedef std::map<std::string, QKeySequence> SequenceMap;
-            typedef std::map<std::string, int> ModifierMap;
-            typedef std::map<int, std::string> NameMap;
-            typedef std::map<std::string, int> KeyMap;
+        NameMap mNames;
+        KeyMap mKeys;
 
-            ShortcutMap mShortcuts;
-            SequenceMap mSequences;
-            ModifierMap mModifiers;
+        ShortcutEventHandler* mEventHandler;
 
-            NameMap mNames;
-            KeyMap mKeys;
+        void createLookupTables();
 
-            ShortcutEventHandler* mEventHandler;
-
-            void createLookupTables();
-
-            static const std::pair<int, const char*> QtKeys[];
+        static const std::pair<int, const char*> QtKeys[];
     };
 }
 
diff --git a/apps/opencs/model/prefs/shortcutsetting.cpp b/apps/opencs/model/prefs/shortcutsetting.cpp
index 44260b8cb0..eb1e398ecd 100644
--- a/apps/opencs/model/prefs/shortcutsetting.cpp
+++ b/apps/opencs/model/prefs/shortcutsetting.cpp
@@ -5,18 +5,17 @@
 #include <QLabel>
 #include <QMouseEvent>
 #include <QPushButton>
-#include <QWidget>
 #include <QString>
+#include <QWidget>
 
 #include <components/settings/settings.hpp>
 
-#include "state.hpp"
 #include "shortcutmanager.hpp"
+#include "state.hpp"
 
 namespace CSMPrefs
 {
-    ShortcutSetting::ShortcutSetting(Category* parent, QMutex* mutex, const std::string& key,
-        const std::string& label)
+    ShortcutSetting::ShortcutSetting(Category* parent, QMutex* mutex, const std::string& key, const std::string& label)
         : Setting(parent, mutex, key, label)
         , mButton(nullptr)
         , mEditorActive(false)
@@ -115,14 +114,7 @@ namespace CSMPrefs
     bool ShortcutSetting::handleEvent(QObject* target, int mod, int value, bool active)
     {
         // Modifiers are handled differently
-        const int Blacklist[] =
-        {
-            Qt::Key_Shift,
-            Qt::Key_Control,
-            Qt::Key_Meta,
-            Qt::Key_Alt,
-            Qt::Key_AltGr
-        };
+        const int Blacklist[] = { Qt::Key_Shift, Qt::Key_Control, Qt::Key_Meta, Qt::Key_Alt, Qt::Key_AltGr };
 
         const size_t BlacklistSize = sizeof(Blacklist) / sizeof(int);
 
diff --git a/apps/opencs/model/prefs/shortcutsetting.hpp b/apps/opencs/model/prefs/shortcutsetting.hpp
index cc1394b47e..f620ae3556 100644
--- a/apps/opencs/model/prefs/shortcutsetting.hpp
+++ b/apps/opencs/model/prefs/shortcutsetting.hpp
@@ -12,39 +12,35 @@ namespace CSMPrefs
 {
     class ShortcutSetting : public Setting
     {
-            Q_OBJECT
+        Q_OBJECT
 
-        public:
+    public:
+        ShortcutSetting(Category* parent, QMutex* mutex, const std::string& key, const std::string& label);
 
-            ShortcutSetting(Category* parent, QMutex* mutex, const std::string& key,
-                const std::string& label);
+        std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent) override;
 
-            std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent) override;
+        void updateWidget() override;
 
-            void updateWidget() override;
+    protected:
+        bool eventFilter(QObject* target, QEvent* event) override;
 
-        protected:
+    private:
+        bool handleEvent(QObject* target, int mod, int value, bool active);
 
-            bool eventFilter(QObject* target, QEvent* event) override;
+        void storeValue(const QKeySequence& sequence);
+        void resetState();
 
-        private:
+        static constexpr int MaxKeys = 4;
 
-            bool handleEvent(QObject* target, int mod, int value, bool active);
+        QPushButton* mButton;
 
-            void storeValue(const QKeySequence& sequence);
-            void resetState();
+        bool mEditorActive;
+        int mEditorPos;
+        int mEditorKeys[MaxKeys];
 
-            static constexpr int MaxKeys = 4;
+    private slots:
 
-            QPushButton* mButton;
-
-            bool mEditorActive;
-            int mEditorPos;
-            int mEditorKeys[MaxKeys];
-
-        private slots:
-
-            void buttonToggled(bool checked);
+        void buttonToggled(bool checked);
     };
 }
 
diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index bce4130c94..b3805670c3 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -1,640 +1,643 @@
 
 #include "state.hpp"
 
-#include <stdexcept>
 #include <algorithm>
 #include <sstream>
+#include <stdexcept>
 
 #include <components/settings/settings.hpp>
 
-#include "intsetting.hpp"
-#include "doublesetting.hpp"
 #include "boolsetting.hpp"
 #include "coloursetting.hpp"
-#include "shortcutsetting.hpp"
+#include "doublesetting.hpp"
+#include "intsetting.hpp"
 #include "modifiersetting.hpp"
+#include "shortcutsetting.hpp"
 
-CSMPrefs::State *CSMPrefs::State::sThis = nullptr;
+CSMPrefs::State* CSMPrefs::State::sThis = nullptr;
 
 void CSMPrefs::State::declare()
 {
-    declareCategory ("Windows");
-    declareInt ("default-width", "Default window width", 800).
-        setTooltip ("Newly opened top-level windows will open with this width.").
-        setMin (80);
-    declareInt ("default-height", "Default window height", 600).
-        setTooltip ("Newly opened top-level windows will open with this height.").
-        setMin (80);
-    declareBool ("show-statusbar", "Show Status Bar", true).
-        setTooltip ("If a newly open top level window is showing status bars or not. "
-        " Note that this does not affect existing windows.");
+    declareCategory("Windows");
+    declareInt("default-width", "Default window width", 800)
+        .setTooltip("Newly opened top-level windows will open with this width.")
+        .setMin(80);
+    declareInt("default-height", "Default window height", 600)
+        .setTooltip("Newly opened top-level windows will open with this height.")
+        .setMin(80);
+    declareBool("show-statusbar", "Show Status Bar", true)
+        .setTooltip(
+            "If a newly open top level window is showing status bars or not. "
+            " Note that this does not affect existing windows.");
     declareSeparator();
-    declareBool ("reuse", "Reuse Subviews", true).
-        setTooltip ("When a new subview is requested and a matching subview already "
-        " exist, do not open a new subview and use the existing one instead.");
-    declareInt ("max-subviews", "Maximum number of subviews per top-level window", 256).
-        setTooltip ("If the maximum number is reached and a new subview is opened "
-            "it will be placed into a new top-level window.").
-        setRange (1, 256);
-    declareBool ("hide-subview", "Hide single subview", false).
-        setTooltip ("When a view contains only a single subview, hide the subview title "
-        "bar and if this subview is closed also close the view (unless it is the last "
-        "view for this document)");
-    declareInt ("minimum-width", "Minimum subview width", 325).
-        setTooltip ("Minimum width of subviews.").
-        setRange (50, 10000);
+    declareBool("reuse", "Reuse Subviews", true)
+        .setTooltip(
+            "When a new subview is requested and a matching subview already "
+            " exist, do not open a new subview and use the existing one instead.");
+    declareInt("max-subviews", "Maximum number of subviews per top-level window", 256)
+        .setTooltip(
+            "If the maximum number is reached and a new subview is opened "
+            "it will be placed into a new top-level window.")
+        .setRange(1, 256);
+    declareBool("hide-subview", "Hide single subview", false)
+        .setTooltip(
+            "When a view contains only a single subview, hide the subview title "
+            "bar and if this subview is closed also close the view (unless it is the last "
+            "view for this document)");
+    declareInt("minimum-width", "Minimum subview width", 325)
+        .setTooltip("Minimum width of subviews.")
+        .setRange(50, 10000);
     declareSeparator();
-    EnumValue scrollbarOnly ("Scrollbar Only", "Simple addition of scrollbars, the view window "
+    EnumValue scrollbarOnly("Scrollbar Only",
+        "Simple addition of scrollbars, the view window "
         "does not grow automatically.");
-    declareEnum ("mainwindow-scrollbar", "Horizontal scrollbar mode for main window.", scrollbarOnly).
-        addValue (scrollbarOnly).
-        addValue ("Grow Only", "The view window grows as subviews are added. No scrollbars.").
-        addValue ("Grow then Scroll", "The view window grows. The scrollbar appears once it cannot grow any further.");
-    declareBool ("grow-limit", "Grow Limit Screen", false).
-        setTooltip ("When \"Grow then Scroll\" option is selected, the window size grows to"
-        " the width of the virtual desktop. \nIf this option is selected the the window growth"
-        "is limited to the current screen.");
-
-    declareCategory ("Records");
-    EnumValue iconAndText ("Icon and Text");
+    declareEnum("mainwindow-scrollbar", "Horizontal scrollbar mode for main window.", scrollbarOnly)
+        .addValue(scrollbarOnly)
+        .addValue("Grow Only", "The view window grows as subviews are added. No scrollbars.")
+        .addValue("Grow then Scroll", "The view window grows. The scrollbar appears once it cannot grow any further.");
+    declareBool("grow-limit", "Grow Limit Screen", false)
+        .setTooltip(
+            "When \"Grow then Scroll\" option is selected, the window size grows to"
+            " the width of the virtual desktop. \nIf this option is selected the the window growth"
+            "is limited to the current screen.");
+
+    declareCategory("Records");
+    EnumValue iconAndText("Icon and Text");
     EnumValues recordValues;
-    recordValues.add (iconAndText).add ("Icon Only").add ("Text Only");
-    declareEnum ("status-format", "Modification status display format", iconAndText).
-        addValues (recordValues);
-    declareEnum ("type-format", "ID type display format", iconAndText).
-        addValues (recordValues);
-
-    declareCategory ("ID Tables");
-    EnumValue inPlaceEdit ("Edit in Place", "Edit the clicked cell");
-    EnumValue editRecord ("Edit Record", "Open a dialogue subview for the clicked record");
-    EnumValue view ("View", "Open a scene subview for the clicked record (not available everywhere)");
-    EnumValue editRecordAndClose ("Edit Record and Close");
+    recordValues.add(iconAndText).add("Icon Only").add("Text Only");
+    declareEnum("status-format", "Modification status display format", iconAndText).addValues(recordValues);
+    declareEnum("type-format", "ID type display format", iconAndText).addValues(recordValues);
+
+    declareCategory("ID Tables");
+    EnumValue inPlaceEdit("Edit in Place", "Edit the clicked cell");
+    EnumValue editRecord("Edit Record", "Open a dialogue subview for the clicked record");
+    EnumValue view("View", "Open a scene subview for the clicked record (not available everywhere)");
+    EnumValue editRecordAndClose("Edit Record and Close");
     EnumValues doubleClickValues;
-    doubleClickValues.add (inPlaceEdit).add (editRecord).add (view).add ("Revert").
-        add ("Delete").add (editRecordAndClose).
-        add ("View and Close", "Open a scene subview for the clicked record and close the table subview");
-    declareEnum ("double", "Double Click", inPlaceEdit).addValues (doubleClickValues);
-    declareEnum ("double-s", "Shift Double Click", editRecord).addValues (doubleClickValues);
-    declareEnum ("double-c", "Control Double Click", view).addValues (doubleClickValues);
-    declareEnum ("double-sc", "Shift Control Double Click", editRecordAndClose).addValues (doubleClickValues);
+    doubleClickValues.add(inPlaceEdit)
+        .add(editRecord)
+        .add(view)
+        .add("Revert")
+        .add("Delete")
+        .add(editRecordAndClose)
+        .add("View and Close", "Open a scene subview for the clicked record and close the table subview");
+    declareEnum("double", "Double Click", inPlaceEdit).addValues(doubleClickValues);
+    declareEnum("double-s", "Shift Double Click", editRecord).addValues(doubleClickValues);
+    declareEnum("double-c", "Control Double Click", view).addValues(doubleClickValues);
+    declareEnum("double-sc", "Shift Control Double Click", editRecordAndClose).addValues(doubleClickValues);
     declareSeparator();
-    EnumValue jumpAndSelect ("Jump and Select", "Scroll new record into view and make it the selection");
-    declareEnum ("jump-to-added", "Action on adding or cloning a record", jumpAndSelect).
-        addValue (jumpAndSelect).
-        addValue ("Jump Only", "Scroll new record into view").
-        addValue ("No Jump", "No special action");
-    declareBool ("extended-config",
-        "Manually specify affected record types for an extended delete/revert", false).
-        setTooltip ("Delete and revert commands have an extended form that also affects "
-        "associated records.\n\n"
-        "If this option is enabled, types of affected records are selected "
-        "manually before a command execution.\nOtherwise, all associated "
-        "records are deleted/reverted immediately.");
-    declareBool ("subview-new-window", "Open Record in new window", false)
-        .setTooltip("When editing a record, open the view in a new window,"
-        " rather than docked in the main view.");
-
-    declareCategory ("ID Dialogues");
-    declareBool ("toolbar", "Show toolbar", true);
-
-    declareCategory ("Reports");
-    EnumValue actionNone ("None");
-    EnumValue actionEdit ("Edit", "Open a table or dialogue suitable for addressing the listed report");
-    EnumValue actionRemove ("Remove", "Remove the report from the report table");
-    EnumValue actionEditAndRemove ("Edit And Remove", "Open a table or dialogue suitable for addressing the listed report, then remove the report from the report table");
+    EnumValue jumpAndSelect("Jump and Select", "Scroll new record into view and make it the selection");
+    declareEnum("jump-to-added", "Action on adding or cloning a record", jumpAndSelect)
+        .addValue(jumpAndSelect)
+        .addValue("Jump Only", "Scroll new record into view")
+        .addValue("No Jump", "No special action");
+    declareBool("extended-config", "Manually specify affected record types for an extended delete/revert", false)
+        .setTooltip(
+            "Delete and revert commands have an extended form that also affects "
+            "associated records.\n\n"
+            "If this option is enabled, types of affected records are selected "
+            "manually before a command execution.\nOtherwise, all associated "
+            "records are deleted/reverted immediately.");
+    declareBool("subview-new-window", "Open Record in new window", false)
+        .setTooltip(
+            "When editing a record, open the view in a new window,"
+            " rather than docked in the main view.");
+
+    declareCategory("ID Dialogues");
+    declareBool("toolbar", "Show toolbar", true);
+
+    declareCategory("Reports");
+    EnumValue actionNone("None");
+    EnumValue actionEdit("Edit", "Open a table or dialogue suitable for addressing the listed report");
+    EnumValue actionRemove("Remove", "Remove the report from the report table");
+    EnumValue actionEditAndRemove("Edit And Remove",
+        "Open a table or dialogue suitable for addressing the listed report, then remove the report from the report "
+        "table");
     EnumValues reportValues;
-    reportValues.add (actionNone).add (actionEdit).add (actionRemove).add (actionEditAndRemove);
-    declareEnum ("double", "Double Click", actionEdit).addValues (reportValues);
-    declareEnum ("double-s", "Shift Double Click", actionRemove).addValues (reportValues);
-    declareEnum ("double-c", "Control Double Click", actionEditAndRemove).addValues (reportValues);
-    declareEnum ("double-sc", "Shift Control Double Click", actionNone).addValues (reportValues);
+    reportValues.add(actionNone).add(actionEdit).add(actionRemove).add(actionEditAndRemove);
+    declareEnum("double", "Double Click", actionEdit).addValues(reportValues);
+    declareEnum("double-s", "Shift Double Click", actionRemove).addValues(reportValues);
+    declareEnum("double-c", "Control Double Click", actionEditAndRemove).addValues(reportValues);
+    declareEnum("double-sc", "Shift Control Double Click", actionNone).addValues(reportValues);
     declareBool("ignore-base-records", "Ignore base records in verifier", false);
 
-    declareCategory ("Search & Replace");
-    declareInt ("char-before", "Characters before search string", 10).
-        setTooltip ("Maximum number of character to display in search result before the searched text");
-    declareInt ("char-after", "Characters after search string", 10).
-        setTooltip ("Maximum number of character to display in search result after the searched text");
-    declareBool ("auto-delete", "Delete row from result table after a successful replace", true);
-
-    declareCategory ("Scripts");
-    declareBool ("show-linenum", "Show Line Numbers", true).
-        setTooltip ("Show line numbers to the left of the script editor window."
-        "The current row and column numbers of the text cursor are shown at the bottom.");
-    declareBool ("wrap-lines", "Wrap Lines", false).
-        setTooltip ("Wrap lines longer than width of script editor.");
-    declareBool ("mono-font", "Use monospace font", true);
-    declareInt ("tab-width", "Tab Width", 4).
-        setTooltip ("Number of characters for tab width").
-        setRange (1, 10);
-    EnumValue warningsNormal ("Normal", "Report warnings as warning");
-    declareEnum ("warnings", "Warning Mode", warningsNormal).
-        addValue ("Ignore", "Do not report warning").
-        addValue (warningsNormal).
-        addValue ("Strict", "Promote warning to an error");
-    declareBool ("toolbar", "Show toolbar", true);
-    declareInt ("compile-delay", "Delay between updating of source errors", 100).
-        setTooltip ("Delay in milliseconds").
-        setRange (0, 10000);
-    declareInt ("error-height", "Initial height of the error panel", 100).
-        setRange (100, 10000);
-    declareBool ("highlight-occurrences", "Highlight other occurrences of selected names", true);
-    declareColour ("colour-highlight", "Colour of highlighted occurrences", QColor("lightcyan"));
+    declareCategory("Search & Replace");
+    declareInt("char-before", "Characters before search string", 10)
+        .setTooltip("Maximum number of character to display in search result before the searched text");
+    declareInt("char-after", "Characters after search string", 10)
+        .setTooltip("Maximum number of character to display in search result after the searched text");
+    declareBool("auto-delete", "Delete row from result table after a successful replace", true);
+
+    declareCategory("Scripts");
+    declareBool("show-linenum", "Show Line Numbers", true)
+        .setTooltip(
+            "Show line numbers to the left of the script editor window."
+            "The current row and column numbers of the text cursor are shown at the bottom.");
+    declareBool("wrap-lines", "Wrap Lines", false).setTooltip("Wrap lines longer than width of script editor.");
+    declareBool("mono-font", "Use monospace font", true);
+    declareInt("tab-width", "Tab Width", 4).setTooltip("Number of characters for tab width").setRange(1, 10);
+    EnumValue warningsNormal("Normal", "Report warnings as warning");
+    declareEnum("warnings", "Warning Mode", warningsNormal)
+        .addValue("Ignore", "Do not report warning")
+        .addValue(warningsNormal)
+        .addValue("Strict", "Promote warning to an error");
+    declareBool("toolbar", "Show toolbar", true);
+    declareInt("compile-delay", "Delay between updating of source errors", 100)
+        .setTooltip("Delay in milliseconds")
+        .setRange(0, 10000);
+    declareInt("error-height", "Initial height of the error panel", 100).setRange(100, 10000);
+    declareBool("highlight-occurrences", "Highlight other occurrences of selected names", true);
+    declareColour("colour-highlight", "Colour of highlighted occurrences", QColor("lightcyan"));
     declareSeparator();
-    declareColour ("colour-int", "Highlight Colour: Integer Literals", QColor ("darkmagenta"));
-    declareColour ("colour-float", "Highlight Colour: Float Literals", QColor ("magenta"));
-    declareColour ("colour-name", "Highlight Colour: Names", QColor ("grey"));
-    declareColour ("colour-keyword", "Highlight Colour: Keywords", QColor ("red"));
-    declareColour ("colour-special", "Highlight Colour: Special Characters", QColor ("darkorange"));
-    declareColour ("colour-comment", "Highlight Colour: Comments", QColor ("green"));
-    declareColour ("colour-id", "Highlight Colour: IDs", QColor ("blue"));
-
-    declareCategory ("General Input");
-    declareBool ("cycle", "Cyclic next/previous", false).
-        setTooltip ("When using next/previous functions at the last/first item of a "
-        "list go to the first/last item");
-
-    declareCategory ("3D Scene Input");
-
-    declareDouble ("navi-wheel-factor", "Camera Zoom Sensitivity", 8).setRange(-100.0, 100.0);
-    declareDouble ("s-navi-sensitivity", "Secondary Camera Movement Sensitivity", 50.0).setRange(-1000.0, 1000.0);
+    declareColour("colour-int", "Highlight Colour: Integer Literals", QColor("darkmagenta"));
+    declareColour("colour-float", "Highlight Colour: Float Literals", QColor("magenta"));
+    declareColour("colour-name", "Highlight Colour: Names", QColor("grey"));
+    declareColour("colour-keyword", "Highlight Colour: Keywords", QColor("red"));
+    declareColour("colour-special", "Highlight Colour: Special Characters", QColor("darkorange"));
+    declareColour("colour-comment", "Highlight Colour: Comments", QColor("green"));
+    declareColour("colour-id", "Highlight Colour: IDs", QColor("blue"));
+
+    declareCategory("General Input");
+    declareBool("cycle", "Cyclic next/previous", false)
+        .setTooltip(
+            "When using next/previous functions at the last/first item of a "
+            "list go to the first/last item");
+
+    declareCategory("3D Scene Input");
+
+    declareDouble("navi-wheel-factor", "Camera Zoom Sensitivity", 8).setRange(-100.0, 100.0);
+    declareDouble("s-navi-sensitivity", "Secondary Camera Movement Sensitivity", 50.0).setRange(-1000.0, 1000.0);
     declareSeparator();
 
-    declareDouble ("p-navi-free-sensitivity", "Free Camera Sensitivity", 1/650.).setPrecision(5).setRange(0.0, 1.0);
-    declareBool ("p-navi-free-invert", "Invert Free Camera Mouse Input", false);
-    declareDouble ("navi-free-lin-speed", "Free Camera Linear Speed", 1000.0).setRange(1.0, 10000.0);
-    declareDouble ("navi-free-rot-speed", "Free Camera Rotational Speed", 3.14 / 2).setRange(0.001, 6.28);
-    declareDouble ("navi-free-speed-mult", "Free Camera Speed Multiplier (from Modifier)", 8).setRange(0.001, 1000.0);
+    declareDouble("p-navi-free-sensitivity", "Free Camera Sensitivity", 1 / 650.).setPrecision(5).setRange(0.0, 1.0);
+    declareBool("p-navi-free-invert", "Invert Free Camera Mouse Input", false);
+    declareDouble("navi-free-lin-speed", "Free Camera Linear Speed", 1000.0).setRange(1.0, 10000.0);
+    declareDouble("navi-free-rot-speed", "Free Camera Rotational Speed", 3.14 / 2).setRange(0.001, 6.28);
+    declareDouble("navi-free-speed-mult", "Free Camera Speed Multiplier (from Modifier)", 8).setRange(0.001, 1000.0);
     declareSeparator();
 
-    declareDouble ("p-navi-orbit-sensitivity", "Orbit Camera Sensitivity", 1/650.).setPrecision(5).setRange(0.0, 1.0);
-    declareBool ("p-navi-orbit-invert", "Invert Orbit Camera Mouse Input", false);
-    declareDouble ("navi-orbit-rot-speed", "Orbital Camera Rotational Speed", 3.14 / 4).setRange(0.001, 6.28);
-    declareDouble ("navi-orbit-speed-mult", "Orbital Camera Speed Multiplier (from Modifier)", 4).setRange(0.001, 1000.0);
-    declareBool ("navi-orbit-const-roll", "Keep camera roll constant for orbital camera", true);
+    declareDouble("p-navi-orbit-sensitivity", "Orbit Camera Sensitivity", 1 / 650.).setPrecision(5).setRange(0.0, 1.0);
+    declareBool("p-navi-orbit-invert", "Invert Orbit Camera Mouse Input", false);
+    declareDouble("navi-orbit-rot-speed", "Orbital Camera Rotational Speed", 3.14 / 4).setRange(0.001, 6.28);
+    declareDouble("navi-orbit-speed-mult", "Orbital Camera Speed Multiplier (from Modifier)", 4)
+        .setRange(0.001, 1000.0);
+    declareBool("navi-orbit-const-roll", "Keep camera roll constant for orbital camera", true);
     declareSeparator();
 
-    declareBool ("context-select", "Context Sensitive Selection", false);
-    declareDouble ("drag-factor", "Mouse sensitivity during drag operations", 1.0).
-        setRange (0.001, 100.0);
-    declareDouble ("drag-wheel-factor", "Mouse wheel sensitivity during drag operations", 1.0).
-        setRange (0.001, 100.0);
-    declareDouble ("drag-shift-factor",
-            "Shift-acceleration factor during drag operations", 4.0).
-        setTooltip ("Acceleration factor during drag operations while holding down shift").
-        setRange (0.001, 100.0);
-    declareDouble ("rotate-factor", "Free rotation factor", 0.007).setPrecision(4).setRange(0.0001, 0.1);
-
-    declareCategory ("Rendering");
-    declareInt ("framerate-limit", "FPS limit", 60).
-        setTooltip("Framerate limit in 3D preview windows. Zero value means \"unlimited\".").
-        setRange(0, 10000);
-    declareInt ("camera-fov", "Camera FOV", 90).setRange(10, 170);
-    declareBool ("camera-ortho", "Orthographic projection for camera", false);
-    declareInt ("camera-ortho-size", "Orthographic projection size parameter", 100).
-        setTooltip("Size of the orthographic frustum, greater value will allow the camera to see more of the world.").
-        setRange(10, 10000);
-    declareDouble ("object-marker-alpha", "Object Marker Transparency", 0.5).setPrecision(2).setRange(0,1);
+    declareBool("context-select", "Context Sensitive Selection", false);
+    declareDouble("drag-factor", "Mouse sensitivity during drag operations", 1.0).setRange(0.001, 100.0);
+    declareDouble("drag-wheel-factor", "Mouse wheel sensitivity during drag operations", 1.0).setRange(0.001, 100.0);
+    declareDouble("drag-shift-factor", "Shift-acceleration factor during drag operations", 4.0)
+        .setTooltip("Acceleration factor during drag operations while holding down shift")
+        .setRange(0.001, 100.0);
+    declareDouble("rotate-factor", "Free rotation factor", 0.007).setPrecision(4).setRange(0.0001, 0.1);
+
+    declareCategory("Rendering");
+    declareInt("framerate-limit", "FPS limit", 60)
+        .setTooltip("Framerate limit in 3D preview windows. Zero value means \"unlimited\".")
+        .setRange(0, 10000);
+    declareInt("camera-fov", "Camera FOV", 90).setRange(10, 170);
+    declareBool("camera-ortho", "Orthographic projection for camera", false);
+    declareInt("camera-ortho-size", "Orthographic projection size parameter", 100)
+        .setTooltip("Size of the orthographic frustum, greater value will allow the camera to see more of the world.")
+        .setRange(10, 10000);
+    declareDouble("object-marker-alpha", "Object Marker Transparency", 0.5).setPrecision(2).setRange(0, 1);
     declareBool("scene-use-gradient", "Use Gradient Background", true);
-    declareColour ("scene-day-background-colour", "Day Background Colour", QColor (110, 120, 128, 255));
-    declareColour ("scene-day-gradient-colour", "Day Gradient  Colour", QColor (47, 51, 51, 255)).
-        setTooltip("Sets the gradient color to use in conjunction with the day background color. Ignored if "
-                   "the gradient option is disabled.");
-    declareColour ("scene-bright-background-colour", "Scene Bright Background Colour", QColor (79, 87, 92, 255));
-    declareColour ("scene-bright-gradient-colour", "Scene Bright Gradient Colour", QColor (47, 51, 51, 255)).
-        setTooltip("Sets the gradient color to use in conjunction with the bright background color. Ignored if "
+    declareColour("scene-day-background-colour", "Day Background Colour", QColor(110, 120, 128, 255));
+    declareColour("scene-day-gradient-colour", "Day Gradient  Colour", QColor(47, 51, 51, 255))
+        .setTooltip(
+            "Sets the gradient color to use in conjunction with the day background color. Ignored if "
             "the gradient option is disabled.");
-    declareColour ("scene-night-background-colour", "Scene Night Background Colour", QColor (64, 77, 79, 255));
-    declareColour ("scene-night-gradient-colour", "Scene Night Gradient Colour", QColor (47, 51, 51, 255)).
-        setTooltip("Sets the gradient color to use in conjunction with the night background color. Ignored if "
+    declareColour("scene-bright-background-colour", "Scene Bright Background Colour", QColor(79, 87, 92, 255));
+    declareColour("scene-bright-gradient-colour", "Scene Bright Gradient Colour", QColor(47, 51, 51, 255))
+        .setTooltip(
+            "Sets the gradient color to use in conjunction with the bright background color. Ignored if "
+            "the gradient option is disabled.");
+    declareColour("scene-night-background-colour", "Scene Night Background Colour", QColor(64, 77, 79, 255));
+    declareColour("scene-night-gradient-colour", "Scene Night Gradient Colour", QColor(47, 51, 51, 255))
+        .setTooltip(
+            "Sets the gradient color to use in conjunction with the night background color. Ignored if "
             "the gradient option is disabled.");
     declareBool("scene-day-night-switch-nodes", "Use Day/Night Switch Nodes", true);
 
-    declareCategory ("Tooltips");
-    declareBool ("scene", "Show Tooltips in 3D scenes", true);
-    declareBool ("scene-hide-basic", "Hide basic  3D scenes tooltips", false);
-    declareInt ("scene-delay", "Tooltip delay in milliseconds", 500).
-        setMin (1);
+    declareCategory("Tooltips");
+    declareBool("scene", "Show Tooltips in 3D scenes", true);
+    declareBool("scene-hide-basic", "Hide basic  3D scenes tooltips", false);
+    declareInt("scene-delay", "Tooltip delay in milliseconds", 500).setMin(1);
 
-    EnumValue createAndInsert ("Create cell and insert");
-    EnumValue showAndInsert ("Show cell and insert");
-    EnumValue dontInsert ("Discard");
-    EnumValue insertAnyway ("Insert anyway");
+    EnumValue createAndInsert("Create cell and insert");
+    EnumValue showAndInsert("Show cell and insert");
+    EnumValue dontInsert("Discard");
+    EnumValue insertAnyway("Insert anyway");
     EnumValues insertOutsideCell;
-    insertOutsideCell.add (createAndInsert).add (dontInsert).add (insertAnyway);
+    insertOutsideCell.add(createAndInsert).add(dontInsert).add(insertAnyway);
     EnumValues insertOutsideVisibleCell;
-    insertOutsideVisibleCell.add (showAndInsert).add (dontInsert).add (insertAnyway);
+    insertOutsideVisibleCell.add(showAndInsert).add(dontInsert).add(insertAnyway);
 
-    EnumValue createAndLandEdit ("Create cell and land, then edit");
-    EnumValue showAndLandEdit ("Show cell and edit");
-    EnumValue dontLandEdit ("Discard");
+    EnumValue createAndLandEdit("Create cell and land, then edit");
+    EnumValue showAndLandEdit("Show cell and edit");
+    EnumValue dontLandEdit("Discard");
     EnumValues landeditOutsideCell;
-    landeditOutsideCell.add (createAndLandEdit).add (dontLandEdit);
+    landeditOutsideCell.add(createAndLandEdit).add(dontLandEdit);
     EnumValues landeditOutsideVisibleCell;
-    landeditOutsideVisibleCell.add (showAndLandEdit).add (dontLandEdit);
+    landeditOutsideVisibleCell.add(showAndLandEdit).add(dontLandEdit);
 
-    EnumValue SelectOnly ("Select only");
-    EnumValue SelectAdd ("Add to selection");
-    EnumValue SelectRemove ("Remove from selection");
-    EnumValue selectInvert ("Invert selection");
+    EnumValue SelectOnly("Select only");
+    EnumValue SelectAdd("Add to selection");
+    EnumValue SelectRemove("Remove from selection");
+    EnumValue selectInvert("Invert selection");
     EnumValues primarySelectAction;
-    primarySelectAction.add (SelectOnly).add (SelectAdd).add (SelectRemove).add (selectInvert);
+    primarySelectAction.add(SelectOnly).add(SelectAdd).add(SelectRemove).add(selectInvert);
     EnumValues secondarySelectAction;
-    secondarySelectAction.add (SelectOnly).add (SelectAdd).add (SelectRemove).add (selectInvert);
+    secondarySelectAction.add(SelectOnly).add(SelectAdd).add(SelectRemove).add(selectInvert);
 
-    declareCategory ("3D Scene Editing");
+    declareCategory("3D Scene Editing");
     declareDouble("gridsnap-movement", "Grid snap size", 16);
     declareDouble("gridsnap-rotation", "Angle snap size", 15);
     declareDouble("gridsnap-scale", "Scale snap size", 0.25);
-    declareInt ("distance", "Drop Distance", 50).
-        setTooltip ("If an instance drop can not be placed against another object at the "
+    declareInt("distance", "Drop Distance", 50)
+        .setTooltip(
+            "If an instance drop can not be placed against another object at the "
             "insert point, it will be placed by this distance from the insert point instead");
-    declareEnum ("outside-drop", "Handling drops outside of cells", createAndInsert).
-        addValues (insertOutsideCell);
-    declareEnum ("outside-visible-drop", "Handling drops outside of visible cells", showAndInsert).
-        addValues (insertOutsideVisibleCell);
-    declareEnum ("outside-landedit", "Handling terrain edit outside of cells", createAndLandEdit).
-        setTooltip("Behavior of terrain editing, if land editing brush reaches an area without cell record.").
-        addValues (landeditOutsideCell);
-    declareEnum ("outside-visible-landedit", "Handling terrain edit outside of visible cells", showAndLandEdit).
-        setTooltip("Behavior of terrain editing, if land editing brush reaches an area that is not currently visible.").
-        addValues (landeditOutsideVisibleCell);
-    declareInt ("texturebrush-maximumsize", "Maximum texture brush size", 50).
-        setMin (1);
-    declareInt ("shapebrush-maximumsize", "Maximum height edit brush size", 100).
-        setTooltip("Setting for the slider range of brush size in terrain height editing.").
-        setMin (1);
-    declareBool ("landedit-post-smoothpainting", "Smooth land after painting height", false).
-        setTooltip("Raise and lower tools will leave bumpy finish without this option");
-    declareDouble ("landedit-post-smoothstrength", "Smoothing strength (post-edit)", 0.25).
-        setTooltip("If smoothing land after painting height is used, this is the percentage of smooth applied afterwards. "
-        "Negative values may be used to roughen instead of smooth.").
-        setMin (-1).
-        setMax (1);
-    declareBool ("open-list-view", "Open displays list view", false).
-        setTooltip ("When opening a reference from the scene view, it will open the"
-        " instance list view instead of the individual instance record view.");
-    declareEnum ("primary-select-action", "Action for primary select", SelectOnly).
-        setTooltip("Selection can be chosen between select only, add to selection, remove from selection and invert selection.").
-        addValues (primarySelectAction);
-    declareEnum ("secondary-select-action", "Action for secondary select", SelectAdd).
-        setTooltip("Selection can be chosen between select only, add to selection, remove from selection and invert selection.").
-        addValues (secondarySelectAction);
-
-    declareCategory ("Key Bindings");
-
-    declareSubcategory ("Document");
-    declareShortcut ("document-file-newgame", "New Game", QKeySequence(Qt::ControlModifier | Qt::Key_N));
-    declareShortcut ("document-file-newaddon", "New Addon", QKeySequence());
-    declareShortcut ("document-file-open", "Open", QKeySequence(Qt::ControlModifier | Qt::Key_O));
-    declareShortcut ("document-file-save", "Save", QKeySequence(Qt::ControlModifier | Qt::Key_S));
-    declareShortcut ("document-help-help", "Help", QKeySequence(Qt::Key_F1));
-    declareShortcut ("document-help-tutorial", "Tutorial", QKeySequence());
-    declareShortcut ("document-file-verify", "Verify", QKeySequence());
-    declareShortcut ("document-file-merge", "Merge", QKeySequence());
-    declareShortcut ("document-file-errorlog", "Open Load Error Log", QKeySequence());
-    declareShortcut ("document-file-metadata", "Meta Data", QKeySequence());
-    declareShortcut ("document-file-close", "Close Document", QKeySequence(Qt::ControlModifier | Qt::Key_W));
-    declareShortcut ("document-file-exit", "Exit Application", QKeySequence(Qt::ControlModifier | Qt::Key_Q));
-    declareShortcut ("document-edit-undo", "Undo", QKeySequence(Qt::ControlModifier | Qt::Key_Z));
-    declareShortcut ("document-edit-redo", "Redo", QKeySequence(Qt::ControlModifier | Qt::ShiftModifier | Qt::Key_Z));
-    declareShortcut ("document-edit-preferences", "Open Preferences", QKeySequence());
-    declareShortcut ("document-edit-search", "Search", QKeySequence(Qt::ControlModifier | Qt::Key_F));
-    declareShortcut ("document-view-newview", "New View", QKeySequence());
-    declareShortcut ("document-view-statusbar", "Toggle Status Bar", QKeySequence());
-    declareShortcut ("document-view-filters", "Open Filter List", QKeySequence());
-    declareShortcut ("document-world-regions", "Open Region List", QKeySequence());
-    declareShortcut ("document-world-cells", "Open Cell List", QKeySequence());
-    declareShortcut ("document-world-referencables", "Open Object List", QKeySequence());
-    declareShortcut ("document-world-references", "Open Instance List", QKeySequence());
-    declareShortcut ("document-world-lands", "Open Lands List", QKeySequence());
-    declareShortcut ("document-world-landtextures", "Open Land Textures List", QKeySequence());
-    declareShortcut ("document-world-pathgrid", "Open Pathgrid List", QKeySequence());
-    declareShortcut ("document-world-regionmap", "Open Region Map", QKeySequence());
-    declareShortcut ("document-mechanics-globals", "Open Global List", QKeySequence());
-    declareShortcut ("document-mechanics-gamesettings", "Open Game Settings", QKeySequence());
-    declareShortcut ("document-mechanics-scripts", "Open Script List", QKeySequence());
-    declareShortcut ("document-mechanics-spells", "Open Spell List", QKeySequence());
-    declareShortcut ("document-mechanics-enchantments", "Open Enchantment List", QKeySequence());
-    declareShortcut ("document-mechanics-magiceffects", "Open Magic Effect List", QKeySequence());
-    declareShortcut ("document-mechanics-startscripts", "Open Start Script List", QKeySequence());
-    declareShortcut ("document-character-skills", "Open Skill List", QKeySequence());
-    declareShortcut ("document-character-classes", "Open Class List", QKeySequence());
-    declareShortcut ("document-character-factions", "Open Faction List", QKeySequence());
-    declareShortcut ("document-character-races", "Open Race List", QKeySequence());
-    declareShortcut ("document-character-birthsigns", "Open Birthsign List", QKeySequence());
-    declareShortcut ("document-character-topics", "Open Topic List", QKeySequence());
-    declareShortcut ("document-character-journals", "Open Journal List", QKeySequence());
-    declareShortcut ("document-character-topicinfos", "Open Topic Info List", QKeySequence());
-    declareShortcut ("document-character-journalinfos", "Open Journal Info List", QKeySequence());
-    declareShortcut ("document-character-bodyparts", "Open Body Part List", QKeySequence());
-    declareShortcut ("document-assets-reload", "Reload Assets", QKeySequence(Qt::Key_F5));
-    declareShortcut ("document-assets-sounds", "Open Sound Asset List", QKeySequence());
-    declareShortcut ("document-assets-soundgens", "Open Sound Generator List", QKeySequence());
-    declareShortcut ("document-assets-meshes", "Open Mesh Asset List", QKeySequence());
-    declareShortcut ("document-assets-icons", "Open Icon Asset List", QKeySequence());
-    declareShortcut ("document-assets-music", "Open Music Asset List", QKeySequence());
-    declareShortcut ("document-assets-soundres", "Open Sound File List", QKeySequence());
-    declareShortcut ("document-assets-textures", "Open Texture Asset List", QKeySequence());
-    declareShortcut ("document-assets-videos", "Open Video Asset List", QKeySequence());
-    declareShortcut ("document-debug-run", "Run Debug", QKeySequence());
-    declareShortcut ("document-debug-shutdown", "Stop Debug", QKeySequence());
-    declareShortcut ("document-debug-profiles", "Debug Profiles", QKeySequence());
-    declareShortcut ("document-debug-runlog", "Open Run Log", QKeySequence());
-
-    declareSubcategory ("Table");
-    declareShortcut ("table-edit", "Edit Record", QKeySequence());
-    declareShortcut ("table-add", "Add Row/Record", QKeySequence(Qt::ShiftModifier | Qt::Key_A));
-    declareShortcut ("table-clone", "Clone Record", QKeySequence(Qt::ShiftModifier | Qt::Key_D));
-    declareShortcut ("touch-record", "Touch Record", QKeySequence());
-    declareShortcut ("table-revert", "Revert Record", QKeySequence());
-    declareShortcut ("table-remove", "Remove Row/Record", QKeySequence(Qt::Key_Delete));
-    declareShortcut ("table-moveup", "Move Record Up", QKeySequence());
-    declareShortcut ("table-movedown", "Move Record Down", QKeySequence());
-    declareShortcut ("table-view", "View Record", QKeySequence(Qt::ShiftModifier | Qt::Key_C));
-    declareShortcut ("table-preview", "Preview Record", QKeySequence(Qt::ShiftModifier | Qt::Key_V));
-    declareShortcut ("table-extendeddelete", "Extended Record Deletion", QKeySequence());
-    declareShortcut ("table-extendedrevert", "Extended Record Revertion", QKeySequence());
-
-    declareSubcategory ("Report Table");
-    declareShortcut ("reporttable-show", "Show Report", QKeySequence());
-    declareShortcut ("reporttable-remove", "Remove Report", QKeySequence(Qt::Key_Delete));
-    declareShortcut ("reporttable-replace", "Replace Report", QKeySequence());
-    declareShortcut ("reporttable-refresh", "Refresh Report", QKeySequence());
-
-    declareSubcategory ("Scene");
-    declareShortcut ("scene-navi-primary", "Camera Rotation From Mouse Movement", QKeySequence(Qt::LeftButton));
-    declareShortcut ("scene-navi-secondary", "Camera Translation From Mouse Movement",
+    declareEnum("outside-drop", "Handling drops outside of cells", createAndInsert).addValues(insertOutsideCell);
+    declareEnum("outside-visible-drop", "Handling drops outside of visible cells", showAndInsert)
+        .addValues(insertOutsideVisibleCell);
+    declareEnum("outside-landedit", "Handling terrain edit outside of cells", createAndLandEdit)
+        .setTooltip("Behavior of terrain editing, if land editing brush reaches an area without cell record.")
+        .addValues(landeditOutsideCell);
+    declareEnum("outside-visible-landedit", "Handling terrain edit outside of visible cells", showAndLandEdit)
+        .setTooltip("Behavior of terrain editing, if land editing brush reaches an area that is not currently visible.")
+        .addValues(landeditOutsideVisibleCell);
+    declareInt("texturebrush-maximumsize", "Maximum texture brush size", 50).setMin(1);
+    declareInt("shapebrush-maximumsize", "Maximum height edit brush size", 100)
+        .setTooltip("Setting for the slider range of brush size in terrain height editing.")
+        .setMin(1);
+    declareBool("landedit-post-smoothpainting", "Smooth land after painting height", false)
+        .setTooltip("Raise and lower tools will leave bumpy finish without this option");
+    declareDouble("landedit-post-smoothstrength", "Smoothing strength (post-edit)", 0.25)
+        .setTooltip(
+            "If smoothing land after painting height is used, this is the percentage of smooth applied afterwards. "
+            "Negative values may be used to roughen instead of smooth.")
+        .setMin(-1)
+        .setMax(1);
+    declareBool("open-list-view", "Open displays list view", false)
+        .setTooltip(
+            "When opening a reference from the scene view, it will open the"
+            " instance list view instead of the individual instance record view.");
+    declareEnum("primary-select-action", "Action for primary select", SelectOnly)
+        .setTooltip(
+            "Selection can be chosen between select only, add to selection, remove from selection and invert "
+            "selection.")
+        .addValues(primarySelectAction);
+    declareEnum("secondary-select-action", "Action for secondary select", SelectAdd)
+        .setTooltip(
+            "Selection can be chosen between select only, add to selection, remove from selection and invert "
+            "selection.")
+        .addValues(secondarySelectAction);
+
+    declareCategory("Key Bindings");
+
+    declareSubcategory("Document");
+    declareShortcut("document-file-newgame", "New Game", QKeySequence(Qt::ControlModifier | Qt::Key_N));
+    declareShortcut("document-file-newaddon", "New Addon", QKeySequence());
+    declareShortcut("document-file-open", "Open", QKeySequence(Qt::ControlModifier | Qt::Key_O));
+    declareShortcut("document-file-save", "Save", QKeySequence(Qt::ControlModifier | Qt::Key_S));
+    declareShortcut("document-help-help", "Help", QKeySequence(Qt::Key_F1));
+    declareShortcut("document-help-tutorial", "Tutorial", QKeySequence());
+    declareShortcut("document-file-verify", "Verify", QKeySequence());
+    declareShortcut("document-file-merge", "Merge", QKeySequence());
+    declareShortcut("document-file-errorlog", "Open Load Error Log", QKeySequence());
+    declareShortcut("document-file-metadata", "Meta Data", QKeySequence());
+    declareShortcut("document-file-close", "Close Document", QKeySequence(Qt::ControlModifier | Qt::Key_W));
+    declareShortcut("document-file-exit", "Exit Application", QKeySequence(Qt::ControlModifier | Qt::Key_Q));
+    declareShortcut("document-edit-undo", "Undo", QKeySequence(Qt::ControlModifier | Qt::Key_Z));
+    declareShortcut("document-edit-redo", "Redo", QKeySequence(Qt::ControlModifier | Qt::ShiftModifier | Qt::Key_Z));
+    declareShortcut("document-edit-preferences", "Open Preferences", QKeySequence());
+    declareShortcut("document-edit-search", "Search", QKeySequence(Qt::ControlModifier | Qt::Key_F));
+    declareShortcut("document-view-newview", "New View", QKeySequence());
+    declareShortcut("document-view-statusbar", "Toggle Status Bar", QKeySequence());
+    declareShortcut("document-view-filters", "Open Filter List", QKeySequence());
+    declareShortcut("document-world-regions", "Open Region List", QKeySequence());
+    declareShortcut("document-world-cells", "Open Cell List", QKeySequence());
+    declareShortcut("document-world-referencables", "Open Object List", QKeySequence());
+    declareShortcut("document-world-references", "Open Instance List", QKeySequence());
+    declareShortcut("document-world-lands", "Open Lands List", QKeySequence());
+    declareShortcut("document-world-landtextures", "Open Land Textures List", QKeySequence());
+    declareShortcut("document-world-pathgrid", "Open Pathgrid List", QKeySequence());
+    declareShortcut("document-world-regionmap", "Open Region Map", QKeySequence());
+    declareShortcut("document-mechanics-globals", "Open Global List", QKeySequence());
+    declareShortcut("document-mechanics-gamesettings", "Open Game Settings", QKeySequence());
+    declareShortcut("document-mechanics-scripts", "Open Script List", QKeySequence());
+    declareShortcut("document-mechanics-spells", "Open Spell List", QKeySequence());
+    declareShortcut("document-mechanics-enchantments", "Open Enchantment List", QKeySequence());
+    declareShortcut("document-mechanics-magiceffects", "Open Magic Effect List", QKeySequence());
+    declareShortcut("document-mechanics-startscripts", "Open Start Script List", QKeySequence());
+    declareShortcut("document-character-skills", "Open Skill List", QKeySequence());
+    declareShortcut("document-character-classes", "Open Class List", QKeySequence());
+    declareShortcut("document-character-factions", "Open Faction List", QKeySequence());
+    declareShortcut("document-character-races", "Open Race List", QKeySequence());
+    declareShortcut("document-character-birthsigns", "Open Birthsign List", QKeySequence());
+    declareShortcut("document-character-topics", "Open Topic List", QKeySequence());
+    declareShortcut("document-character-journals", "Open Journal List", QKeySequence());
+    declareShortcut("document-character-topicinfos", "Open Topic Info List", QKeySequence());
+    declareShortcut("document-character-journalinfos", "Open Journal Info List", QKeySequence());
+    declareShortcut("document-character-bodyparts", "Open Body Part List", QKeySequence());
+    declareShortcut("document-assets-reload", "Reload Assets", QKeySequence(Qt::Key_F5));
+    declareShortcut("document-assets-sounds", "Open Sound Asset List", QKeySequence());
+    declareShortcut("document-assets-soundgens", "Open Sound Generator List", QKeySequence());
+    declareShortcut("document-assets-meshes", "Open Mesh Asset List", QKeySequence());
+    declareShortcut("document-assets-icons", "Open Icon Asset List", QKeySequence());
+    declareShortcut("document-assets-music", "Open Music Asset List", QKeySequence());
+    declareShortcut("document-assets-soundres", "Open Sound File List", QKeySequence());
+    declareShortcut("document-assets-textures", "Open Texture Asset List", QKeySequence());
+    declareShortcut("document-assets-videos", "Open Video Asset List", QKeySequence());
+    declareShortcut("document-debug-run", "Run Debug", QKeySequence());
+    declareShortcut("document-debug-shutdown", "Stop Debug", QKeySequence());
+    declareShortcut("document-debug-profiles", "Debug Profiles", QKeySequence());
+    declareShortcut("document-debug-runlog", "Open Run Log", QKeySequence());
+
+    declareSubcategory("Table");
+    declareShortcut("table-edit", "Edit Record", QKeySequence());
+    declareShortcut("table-add", "Add Row/Record", QKeySequence(Qt::ShiftModifier | Qt::Key_A));
+    declareShortcut("table-clone", "Clone Record", QKeySequence(Qt::ShiftModifier | Qt::Key_D));
+    declareShortcut("touch-record", "Touch Record", QKeySequence());
+    declareShortcut("table-revert", "Revert Record", QKeySequence());
+    declareShortcut("table-remove", "Remove Row/Record", QKeySequence(Qt::Key_Delete));
+    declareShortcut("table-moveup", "Move Record Up", QKeySequence());
+    declareShortcut("table-movedown", "Move Record Down", QKeySequence());
+    declareShortcut("table-view", "View Record", QKeySequence(Qt::ShiftModifier | Qt::Key_C));
+    declareShortcut("table-preview", "Preview Record", QKeySequence(Qt::ShiftModifier | Qt::Key_V));
+    declareShortcut("table-extendeddelete", "Extended Record Deletion", QKeySequence());
+    declareShortcut("table-extendedrevert", "Extended Record Revertion", QKeySequence());
+
+    declareSubcategory("Report Table");
+    declareShortcut("reporttable-show", "Show Report", QKeySequence());
+    declareShortcut("reporttable-remove", "Remove Report", QKeySequence(Qt::Key_Delete));
+    declareShortcut("reporttable-replace", "Replace Report", QKeySequence());
+    declareShortcut("reporttable-refresh", "Refresh Report", QKeySequence());
+
+    declareSubcategory("Scene");
+    declareShortcut("scene-navi-primary", "Camera Rotation From Mouse Movement", QKeySequence(Qt::LeftButton));
+    declareShortcut("scene-navi-secondary", "Camera Translation From Mouse Movement",
         QKeySequence(Qt::ControlModifier | (int)Qt::LeftButton));
-    declareShortcut ("scene-open-primary", "Primary Open", QKeySequence(Qt::ShiftModifier | (int)Qt::LeftButton));
-    declareShortcut ("scene-edit-primary", "Primary Edit", QKeySequence(Qt::RightButton));
-    declareShortcut ("scene-edit-secondary", "Secondary Edit",
-        QKeySequence(Qt::ControlModifier | (int)Qt::RightButton));
-    declareShortcut ("scene-select-primary", "Primary Select", QKeySequence(Qt::MiddleButton));
-    declareShortcut ("scene-select-secondary", "Secondary Select",
-        QKeySequence(Qt::ControlModifier | (int)Qt::MiddleButton));
-    declareModifier ("scene-speed-modifier", "Speed Modifier", Qt::Key_Shift);
-    declareShortcut ("scene-delete", "Delete Instance", QKeySequence(Qt::Key_Delete));
-    declareShortcut ("scene-instance-drop-terrain", "Drop to terrain level", QKeySequence(Qt::Key_G));
-    declareShortcut ("scene-instance-drop-collision", "Drop to collision", QKeySequence(Qt::Key_H));
-    declareShortcut ("scene-instance-drop-terrain-separately", "Drop to terrain level separately", QKeySequence());
-    declareShortcut ("scene-instance-drop-collision-separately", "Drop to collision separately", QKeySequence());
-    declareShortcut ("scene-load-cam-cell", "Load Camera Cell", QKeySequence(Qt::KeypadModifier | Qt::Key_5));
-    declareShortcut ("scene-load-cam-eastcell", "Load East Cell", QKeySequence(Qt::KeypadModifier | Qt::Key_6));
-    declareShortcut ("scene-load-cam-northcell", "Load North Cell", QKeySequence(Qt::KeypadModifier | Qt::Key_8));
-    declareShortcut ("scene-load-cam-westcell", "Load West Cell", QKeySequence(Qt::KeypadModifier | Qt::Key_4));
-    declareShortcut ("scene-load-cam-southcell", "Load South Cell", QKeySequence(Qt::KeypadModifier | Qt::Key_2));
-    declareShortcut ("scene-edit-abort", "Abort", QKeySequence(Qt::Key_Escape));
-    declareShortcut ("scene-focus-toolbar", "Toggle Toolbar Focus", QKeySequence(Qt::Key_T));
-    declareShortcut ("scene-render-stats", "Debug Rendering Stats", QKeySequence(Qt::Key_F3));
-
-    declareSubcategory ("1st/Free Camera");
-    declareShortcut ("free-forward", "Forward", QKeySequence(Qt::Key_W));
-    declareShortcut ("free-backward", "Backward", QKeySequence(Qt::Key_S));
-    declareShortcut ("free-left", "Left", QKeySequence(Qt::Key_A));
-    declareShortcut ("free-right", "Right", QKeySequence(Qt::Key_D));
-    declareShortcut ("free-roll-left", "Roll Left", QKeySequence(Qt::Key_Q));
-    declareShortcut ("free-roll-right", "Roll Right", QKeySequence(Qt::Key_E));
-    declareShortcut ("free-speed-mode", "Toggle Speed Mode", QKeySequence(Qt::Key_F));
-
-    declareSubcategory ("Orbit Camera");
-    declareShortcut ("orbit-up", "Up", QKeySequence(Qt::Key_W));
-    declareShortcut ("orbit-down", "Down", QKeySequence(Qt::Key_S));
-    declareShortcut ("orbit-left", "Left", QKeySequence(Qt::Key_A));
-    declareShortcut ("orbit-right", "Right", QKeySequence(Qt::Key_D));
-    declareShortcut ("orbit-roll-left", "Roll Left", QKeySequence(Qt::Key_Q));
-    declareShortcut ("orbit-roll-right", "Roll Right", QKeySequence(Qt::Key_E));
-    declareShortcut ("orbit-speed-mode", "Toggle Speed Mode", QKeySequence(Qt::Key_F));
-    declareShortcut ("orbit-center-selection", "Center On Selected", QKeySequence(Qt::Key_C));
-
-    declareSubcategory ("Script Editor");
-    declareShortcut ("script-editor-comment", "Comment Selection", QKeySequence());
-    declareShortcut ("script-editor-uncomment", "Uncomment Selection", QKeySequence());
-
-    declareCategory ("Models");
-    declareString ("baseanim", "base animations", "meshes/base_anim.nif").
-        setTooltip("3rd person base model with textkeys-data");
-    declareString ("baseanimkna", "base animations, kna", "meshes/base_animkna.nif").
-        setTooltip("3rd person beast race base model with textkeys-data");
-    declareString ("baseanimfemale", "base animations, female", "meshes/base_anim_female.nif").
-        setTooltip("3rd person female base model with textkeys-data");
-    declareString ("wolfskin", "base animations, wolf", "meshes/wolf/skin.nif").
-        setTooltip("3rd person werewolf skin");
+    declareShortcut("scene-open-primary", "Primary Open", QKeySequence(Qt::ShiftModifier | (int)Qt::LeftButton));
+    declareShortcut("scene-edit-primary", "Primary Edit", QKeySequence(Qt::RightButton));
+    declareShortcut("scene-edit-secondary", "Secondary Edit", QKeySequence(Qt::ControlModifier | (int)Qt::RightButton));
+    declareShortcut("scene-select-primary", "Primary Select", QKeySequence(Qt::MiddleButton));
+    declareShortcut(
+        "scene-select-secondary", "Secondary Select", QKeySequence(Qt::ControlModifier | (int)Qt::MiddleButton));
+    declareModifier("scene-speed-modifier", "Speed Modifier", Qt::Key_Shift);
+    declareShortcut("scene-delete", "Delete Instance", QKeySequence(Qt::Key_Delete));
+    declareShortcut("scene-instance-drop-terrain", "Drop to terrain level", QKeySequence(Qt::Key_G));
+    declareShortcut("scene-instance-drop-collision", "Drop to collision", QKeySequence(Qt::Key_H));
+    declareShortcut("scene-instance-drop-terrain-separately", "Drop to terrain level separately", QKeySequence());
+    declareShortcut("scene-instance-drop-collision-separately", "Drop to collision separately", QKeySequence());
+    declareShortcut("scene-load-cam-cell", "Load Camera Cell", QKeySequence(Qt::KeypadModifier | Qt::Key_5));
+    declareShortcut("scene-load-cam-eastcell", "Load East Cell", QKeySequence(Qt::KeypadModifier | Qt::Key_6));
+    declareShortcut("scene-load-cam-northcell", "Load North Cell", QKeySequence(Qt::KeypadModifier | Qt::Key_8));
+    declareShortcut("scene-load-cam-westcell", "Load West Cell", QKeySequence(Qt::KeypadModifier | Qt::Key_4));
+    declareShortcut("scene-load-cam-southcell", "Load South Cell", QKeySequence(Qt::KeypadModifier | Qt::Key_2));
+    declareShortcut("scene-edit-abort", "Abort", QKeySequence(Qt::Key_Escape));
+    declareShortcut("scene-focus-toolbar", "Toggle Toolbar Focus", QKeySequence(Qt::Key_T));
+    declareShortcut("scene-render-stats", "Debug Rendering Stats", QKeySequence(Qt::Key_F3));
+
+    declareSubcategory("1st/Free Camera");
+    declareShortcut("free-forward", "Forward", QKeySequence(Qt::Key_W));
+    declareShortcut("free-backward", "Backward", QKeySequence(Qt::Key_S));
+    declareShortcut("free-left", "Left", QKeySequence(Qt::Key_A));
+    declareShortcut("free-right", "Right", QKeySequence(Qt::Key_D));
+    declareShortcut("free-roll-left", "Roll Left", QKeySequence(Qt::Key_Q));
+    declareShortcut("free-roll-right", "Roll Right", QKeySequence(Qt::Key_E));
+    declareShortcut("free-speed-mode", "Toggle Speed Mode", QKeySequence(Qt::Key_F));
+
+    declareSubcategory("Orbit Camera");
+    declareShortcut("orbit-up", "Up", QKeySequence(Qt::Key_W));
+    declareShortcut("orbit-down", "Down", QKeySequence(Qt::Key_S));
+    declareShortcut("orbit-left", "Left", QKeySequence(Qt::Key_A));
+    declareShortcut("orbit-right", "Right", QKeySequence(Qt::Key_D));
+    declareShortcut("orbit-roll-left", "Roll Left", QKeySequence(Qt::Key_Q));
+    declareShortcut("orbit-roll-right", "Roll Right", QKeySequence(Qt::Key_E));
+    declareShortcut("orbit-speed-mode", "Toggle Speed Mode", QKeySequence(Qt::Key_F));
+    declareShortcut("orbit-center-selection", "Center On Selected", QKeySequence(Qt::Key_C));
+
+    declareSubcategory("Script Editor");
+    declareShortcut("script-editor-comment", "Comment Selection", QKeySequence());
+    declareShortcut("script-editor-uncomment", "Uncomment Selection", QKeySequence());
+
+    declareCategory("Models");
+    declareString("baseanim", "base animations", "meshes/base_anim.nif")
+        .setTooltip("3rd person base model with textkeys-data");
+    declareString("baseanimkna", "base animations, kna", "meshes/base_animkna.nif")
+        .setTooltip("3rd person beast race base model with textkeys-data");
+    declareString("baseanimfemale", "base animations, female", "meshes/base_anim_female.nif")
+        .setTooltip("3rd person female base model with textkeys-data");
+    declareString("wolfskin", "base animations, wolf", "meshes/wolf/skin.nif").setTooltip("3rd person werewolf skin");
 }
 
-void CSMPrefs::State::declareCategory (const std::string& key)
+void CSMPrefs::State::declareCategory(const std::string& key)
 {
-    std::map<std::string, Category>::iterator iter = mCategories.find (key);
+    std::map<std::string, Category>::iterator iter = mCategories.find(key);
 
-    if (iter!=mCategories.end())
+    if (iter != mCategories.end())
     {
         mCurrentCategory = iter;
     }
     else
     {
-        mCurrentCategory =
-            mCategories.insert (std::make_pair (key, Category (this, key))).first;
+        mCurrentCategory = mCategories.insert(std::make_pair(key, Category(this, key))).first;
     }
 }
 
-CSMPrefs::IntSetting& CSMPrefs::State::declareInt (const std::string& key,
-    const std::string& label, int default_)
+CSMPrefs::IntSetting& CSMPrefs::State::declareInt(const std::string& key, const std::string& label, int default_)
 {
-    if (mCurrentCategory==mCategories.end())
-        throw std::logic_error ("no category for setting");
+    if (mCurrentCategory == mCategories.end())
+        throw std::logic_error("no category for setting");
 
     setDefault(key, std::to_string(default_));
 
-    default_ = Settings::Manager::getInt (key, mCurrentCategory->second.getKey());
+    default_ = Settings::Manager::getInt(key, mCurrentCategory->second.getKey());
 
-    CSMPrefs::IntSetting *setting =
-        new CSMPrefs::IntSetting (&mCurrentCategory->second, &mMutex, key, label,
-        default_);
+    CSMPrefs::IntSetting* setting = new CSMPrefs::IntSetting(&mCurrentCategory->second, &mMutex, key, label, default_);
 
-    mCurrentCategory->second.addSetting (setting);
+    mCurrentCategory->second.addSetting(setting);
 
     return *setting;
 }
 
-CSMPrefs::DoubleSetting& CSMPrefs::State::declareDouble (const std::string& key,
-    const std::string& label, double default_)
+CSMPrefs::DoubleSetting& CSMPrefs::State::declareDouble(
+    const std::string& key, const std::string& label, double default_)
 {
-    if (mCurrentCategory==mCategories.end())
-        throw std::logic_error ("no category for setting");
+    if (mCurrentCategory == mCategories.end())
+        throw std::logic_error("no category for setting");
 
     std::ostringstream stream;
     stream << default_;
     setDefault(key, stream.str());
 
-    default_ = Settings::Manager::getFloat (key, mCurrentCategory->second.getKey());
+    default_ = Settings::Manager::getFloat(key, mCurrentCategory->second.getKey());
 
-    CSMPrefs::DoubleSetting *setting =
-        new CSMPrefs::DoubleSetting (&mCurrentCategory->second, &mMutex,
-        key, label, default_);
+    CSMPrefs::DoubleSetting* setting
+        = new CSMPrefs::DoubleSetting(&mCurrentCategory->second, &mMutex, key, label, default_);
 
-    mCurrentCategory->second.addSetting (setting);
+    mCurrentCategory->second.addSetting(setting);
 
     return *setting;
 }
 
-CSMPrefs::BoolSetting& CSMPrefs::State::declareBool (const std::string& key,
-    const std::string& label, bool default_)
+CSMPrefs::BoolSetting& CSMPrefs::State::declareBool(const std::string& key, const std::string& label, bool default_)
 {
-    if (mCurrentCategory==mCategories.end())
-        throw std::logic_error ("no category for setting");
+    if (mCurrentCategory == mCategories.end())
+        throw std::logic_error("no category for setting");
 
-    setDefault (key, default_ ? "true" : "false");
+    setDefault(key, default_ ? "true" : "false");
 
-    default_ = Settings::Manager::getBool (key, mCurrentCategory->second.getKey());
+    default_ = Settings::Manager::getBool(key, mCurrentCategory->second.getKey());
 
-    CSMPrefs::BoolSetting *setting =
-        new CSMPrefs::BoolSetting (&mCurrentCategory->second, &mMutex, key, label,
-        default_);
+    CSMPrefs::BoolSetting* setting
+        = new CSMPrefs::BoolSetting(&mCurrentCategory->second, &mMutex, key, label, default_);
 
-    mCurrentCategory->second.addSetting (setting);
+    mCurrentCategory->second.addSetting(setting);
 
     return *setting;
 }
 
-CSMPrefs::EnumSetting& CSMPrefs::State::declareEnum (const std::string& key,
-    const std::string& label, EnumValue default_)
+CSMPrefs::EnumSetting& CSMPrefs::State::declareEnum(
+    const std::string& key, const std::string& label, EnumValue default_)
 {
-    if (mCurrentCategory==mCategories.end())
-        throw std::logic_error ("no category for setting");
+    if (mCurrentCategory == mCategories.end())
+        throw std::logic_error("no category for setting");
 
-    setDefault (key, default_.mValue);
+    setDefault(key, default_.mValue);
 
-    default_.mValue = Settings::Manager::getString (key, mCurrentCategory->second.getKey());
+    default_.mValue = Settings::Manager::getString(key, mCurrentCategory->second.getKey());
 
-    CSMPrefs::EnumSetting *setting =
-        new CSMPrefs::EnumSetting (&mCurrentCategory->second, &mMutex, key, label,
-        default_);
+    CSMPrefs::EnumSetting* setting
+        = new CSMPrefs::EnumSetting(&mCurrentCategory->second, &mMutex, key, label, default_);
 
-    mCurrentCategory->second.addSetting (setting);
+    mCurrentCategory->second.addSetting(setting);
 
     return *setting;
 }
 
-CSMPrefs::ColourSetting& CSMPrefs::State::declareColour (const std::string& key,
-    const std::string& label, QColor default_)
+CSMPrefs::ColourSetting& CSMPrefs::State::declareColour(
+    const std::string& key, const std::string& label, QColor default_)
 {
-    if (mCurrentCategory==mCategories.end())
-        throw std::logic_error ("no category for setting");
+    if (mCurrentCategory == mCategories.end())
+        throw std::logic_error("no category for setting");
 
-    setDefault (key, default_.name().toUtf8().data());
+    setDefault(key, default_.name().toUtf8().data());
 
-    default_.setNamedColor (QString::fromUtf8 (Settings::Manager::getString (key, mCurrentCategory->second.getKey()).c_str()));
+    default_.setNamedColor(
+        QString::fromUtf8(Settings::Manager::getString(key, mCurrentCategory->second.getKey()).c_str()));
 
-    CSMPrefs::ColourSetting *setting =
-        new CSMPrefs::ColourSetting (&mCurrentCategory->second, &mMutex, key, label,
-        default_);
+    CSMPrefs::ColourSetting* setting
+        = new CSMPrefs::ColourSetting(&mCurrentCategory->second, &mMutex, key, label, default_);
 
-    mCurrentCategory->second.addSetting (setting);
+    mCurrentCategory->second.addSetting(setting);
 
     return *setting;
 }
 
-CSMPrefs::ShortcutSetting& CSMPrefs::State::declareShortcut (const std::string& key, const std::string& label,
-    const QKeySequence& default_)
+CSMPrefs::ShortcutSetting& CSMPrefs::State::declareShortcut(
+    const std::string& key, const std::string& label, const QKeySequence& default_)
 {
-    if (mCurrentCategory==mCategories.end())
-        throw std::logic_error ("no category for setting");
+    if (mCurrentCategory == mCategories.end())
+        throw std::logic_error("no category for setting");
 
     std::string seqStr = getShortcutManager().convertToString(default_);
-    setDefault (key, seqStr);
+    setDefault(key, seqStr);
 
     // Setup with actual data
     QKeySequence sequence;
 
-    getShortcutManager().convertFromString(Settings::Manager::getString(key, mCurrentCategory->second.getKey()), sequence);
+    getShortcutManager().convertFromString(
+        Settings::Manager::getString(key, mCurrentCategory->second.getKey()), sequence);
     getShortcutManager().setSequence(key, sequence);
 
-    CSMPrefs::ShortcutSetting *setting = new CSMPrefs::ShortcutSetting (&mCurrentCategory->second, &mMutex,
-        key, label);
-    mCurrentCategory->second.addSetting (setting);
+    CSMPrefs::ShortcutSetting* setting = new CSMPrefs::ShortcutSetting(&mCurrentCategory->second, &mMutex, key, label);
+    mCurrentCategory->second.addSetting(setting);
 
     return *setting;
 }
 
-CSMPrefs::StringSetting& CSMPrefs::State::declareString (const std::string& key, const std::string& label, std::string default_)
+CSMPrefs::StringSetting& CSMPrefs::State::declareString(
+    const std::string& key, const std::string& label, std::string default_)
 {
-    if (mCurrentCategory==mCategories.end())
-        throw std::logic_error ("no category for setting");
+    if (mCurrentCategory == mCategories.end())
+        throw std::logic_error("no category for setting");
 
-    setDefault (key, default_);
+    setDefault(key, default_);
 
-    default_ = Settings::Manager::getString (key, mCurrentCategory->second.getKey());
+    default_ = Settings::Manager::getString(key, mCurrentCategory->second.getKey());
 
-    CSMPrefs::StringSetting *setting =
-        new CSMPrefs::StringSetting (&mCurrentCategory->second, &mMutex, key, label,
-        default_);
+    CSMPrefs::StringSetting* setting
+        = new CSMPrefs::StringSetting(&mCurrentCategory->second, &mMutex, key, label, default_);
 
-    mCurrentCategory->second.addSetting (setting);
+    mCurrentCategory->second.addSetting(setting);
 
     return *setting;
 }
 
-CSMPrefs::ModifierSetting& CSMPrefs::State::declareModifier(const std::string& key, const std::string& label,
-    int default_)
+CSMPrefs::ModifierSetting& CSMPrefs::State::declareModifier(
+    const std::string& key, const std::string& label, int default_)
 {
-    if (mCurrentCategory==mCategories.end())
-        throw std::logic_error ("no category for setting");
+    if (mCurrentCategory == mCategories.end())
+        throw std::logic_error("no category for setting");
 
     std::string modStr = getShortcutManager().convertToString(default_);
-    setDefault (key, modStr);
+    setDefault(key, modStr);
 
     // Setup with actual data
     int modifier;
 
-    getShortcutManager().convertFromString(Settings::Manager::getString(key, mCurrentCategory->second.getKey()), modifier);
+    getShortcutManager().convertFromString(
+        Settings::Manager::getString(key, mCurrentCategory->second.getKey()), modifier);
     getShortcutManager().setModifier(key, modifier);
 
-    CSMPrefs::ModifierSetting *setting = new CSMPrefs::ModifierSetting (&mCurrentCategory->second, &mMutex,
-        key, label);
-    mCurrentCategory->second.addSetting (setting);
+    CSMPrefs::ModifierSetting* setting = new CSMPrefs::ModifierSetting(&mCurrentCategory->second, &mMutex, key, label);
+    mCurrentCategory->second.addSetting(setting);
 
     return *setting;
 }
 
 void CSMPrefs::State::declareSeparator()
 {
-    if (mCurrentCategory==mCategories.end())
-        throw std::logic_error ("no category for setting");
+    if (mCurrentCategory == mCategories.end())
+        throw std::logic_error("no category for setting");
 
-    CSMPrefs::Setting *setting =
-        new CSMPrefs::Setting (&mCurrentCategory->second, &mMutex, "", "");
+    CSMPrefs::Setting* setting = new CSMPrefs::Setting(&mCurrentCategory->second, &mMutex, "", "");
 
-    mCurrentCategory->second.addSetting (setting);
+    mCurrentCategory->second.addSetting(setting);
 }
 
 void CSMPrefs::State::declareSubcategory(const std::string& label)
 {
-    if (mCurrentCategory==mCategories.end())
-        throw std::logic_error ("no category for setting");
+    if (mCurrentCategory == mCategories.end())
+        throw std::logic_error("no category for setting");
 
-    CSMPrefs::Setting *setting =
-        new CSMPrefs::Setting (&mCurrentCategory->second, &mMutex, "", label);
+    CSMPrefs::Setting* setting = new CSMPrefs::Setting(&mCurrentCategory->second, &mMutex, "", label);
 
-    mCurrentCategory->second.addSetting (setting);
+    mCurrentCategory->second.addSetting(setting);
 }
 
-void CSMPrefs::State::setDefault (const std::string& key, const std::string& default_)
+void CSMPrefs::State::setDefault(const std::string& key, const std::string& default_)
 {
-    Settings::CategorySetting fullKey (mCurrentCategory->second.getKey(), key);
+    Settings::CategorySetting fullKey(mCurrentCategory->second.getKey(), key);
 
-    Settings::CategorySettingValueMap::iterator iter =
-        Settings::Manager::mDefaultSettings.find (fullKey);
+    Settings::CategorySettingValueMap::iterator iter = Settings::Manager::mDefaultSettings.find(fullKey);
 
-    if (iter==Settings::Manager::mDefaultSettings.end())
-        Settings::Manager::mDefaultSettings.insert (std::make_pair (fullKey, default_));
+    if (iter == Settings::Manager::mDefaultSettings.end())
+        Settings::Manager::mDefaultSettings.insert(std::make_pair(fullKey, default_));
 }
 
-CSMPrefs::State::State (const Files::ConfigurationManager& configurationManager)
-: mConfigFile ("openmw-cs.cfg"), mDefaultConfigFile("defaults-cs.bin"), mConfigurationManager (configurationManager),
-  mCurrentCategory (mCategories.end())
+CSMPrefs::State::State(const Files::ConfigurationManager& configurationManager)
+    : mConfigFile("openmw-cs.cfg")
+    , mDefaultConfigFile("defaults-cs.bin")
+    , mConfigurationManager(configurationManager)
+    , mCurrentCategory(mCategories.end())
 {
     if (sThis)
-        throw std::logic_error ("An instance of CSMPRefs::State already exists");
+        throw std::logic_error("An instance of CSMPRefs::State already exists");
 
     sThis = this;
 
@@ -648,7 +651,7 @@ CSMPrefs::State::~State()
 
 void CSMPrefs::State::save()
 {
-    Settings::Manager::saveUser (mConfigurationManager.getUserConfigPath() / mConfigFile);
+    Settings::Manager::saveUser(mConfigurationManager.getUserConfigPath() / mConfigFile);
 }
 
 CSMPrefs::State::Iterator CSMPrefs::State::begin()
@@ -666,17 +669,17 @@ CSMPrefs::ShortcutManager& CSMPrefs::State::getShortcutManager()
     return mShortcutManager;
 }
 
-CSMPrefs::Category& CSMPrefs::State::operator[] (const std::string& key)
+CSMPrefs::Category& CSMPrefs::State::operator[](const std::string& key)
 {
-    Iterator iter = mCategories.find (key);
+    Iterator iter = mCategories.find(key);
 
-    if (iter==mCategories.end())
-        throw std::logic_error ("Invalid user settings category: " + key);
+    if (iter == mCategories.end())
+        throw std::logic_error("Invalid user settings category: " + key);
 
     return iter->second;
 }
 
-void CSMPrefs::State::update (const Setting& setting)
+void CSMPrefs::State::update(const Setting& setting)
 {
     emit settingChanged(&setting);
 }
@@ -684,7 +687,7 @@ void CSMPrefs::State::update (const Setting& setting)
 CSMPrefs::State& CSMPrefs::State::get()
 {
     if (!sThis)
-        throw std::logic_error ("No instance of CSMPrefs::State");
+        throw std::logic_error("No instance of CSMPrefs::State");
 
     return *sThis;
 }
@@ -724,7 +727,6 @@ void CSMPrefs::State::resetAll()
     }
 }
 
-
 CSMPrefs::State& CSMPrefs::get()
 {
     return State::get();
diff --git a/apps/opencs/model/prefs/state.hpp b/apps/opencs/model/prefs/state.hpp
index f464013644..5f330b7651 100644
--- a/apps/opencs/model/prefs/state.hpp
+++ b/apps/opencs/model/prefs/state.hpp
@@ -4,18 +4,18 @@
 #include <map>
 #include <string>
 
-#include <QObject>
 #include <QMutex>
+#include <QObject>
 
 #ifndef Q_MOC_RUN
 #include <components/files/configurationmanager.hpp>
 #endif
 
 #include "category.hpp"
-#include "setting.hpp"
 #include "enumsetting.hpp"
-#include "stringsetting.hpp"
+#include "setting.hpp"
 #include "shortcutmanager.hpp"
+#include "stringsetting.hpp"
 
 class QColor;
 
@@ -34,84 +34,80 @@ namespace CSMPrefs
     /// been completed.
     class State : public QObject
     {
-            Q_OBJECT
-
-            static State *sThis;
-
-        public:
-
-            typedef std::map<std::string, Category> Collection;
-            typedef Collection::iterator Iterator;
-
-        private:
+        Q_OBJECT
 
-            const std::string mConfigFile;
-            const std::string mDefaultConfigFile;
-            const Files::ConfigurationManager& mConfigurationManager;
-            ShortcutManager mShortcutManager;
-            Collection mCategories;
-            Iterator mCurrentCategory;
-            QMutex mMutex;
+        static State* sThis;
 
-            // not implemented
-            State (const State&);
-            State& operator= (const State&);
+    public:
+        typedef std::map<std::string, Category> Collection;
+        typedef Collection::iterator Iterator;
 
-        private:
+    private:
+        const std::string mConfigFile;
+        const std::string mDefaultConfigFile;
+        const Files::ConfigurationManager& mConfigurationManager;
+        ShortcutManager mShortcutManager;
+        Collection mCategories;
+        Iterator mCurrentCategory;
+        QMutex mMutex;
 
-            void declare();
+        // not implemented
+        State(const State&);
+        State& operator=(const State&);
 
-            void declareCategory (const std::string& key);
+    private:
+        void declare();
 
-            IntSetting& declareInt (const std::string& key, const std::string& label, int default_);
-            DoubleSetting& declareDouble (const std::string& key, const std::string& label, double default_);
+        void declareCategory(const std::string& key);
 
-            BoolSetting& declareBool (const std::string& key, const std::string& label, bool default_);
+        IntSetting& declareInt(const std::string& key, const std::string& label, int default_);
+        DoubleSetting& declareDouble(const std::string& key, const std::string& label, double default_);
 
-            EnumSetting& declareEnum (const std::string& key, const std::string& label, EnumValue default_);
+        BoolSetting& declareBool(const std::string& key, const std::string& label, bool default_);
 
-            ColourSetting& declareColour (const std::string& key, const std::string& label, QColor default_);
+        EnumSetting& declareEnum(const std::string& key, const std::string& label, EnumValue default_);
 
-            ShortcutSetting& declareShortcut (const std::string& key, const std::string& label,
-                const QKeySequence& default_);
+        ColourSetting& declareColour(const std::string& key, const std::string& label, QColor default_);
 
-            StringSetting& declareString (const std::string& key, const std::string& label, std::string default_);
+        ShortcutSetting& declareShortcut(
+            const std::string& key, const std::string& label, const QKeySequence& default_);
 
-            ModifierSetting& declareModifier(const std::string& key, const std::string& label, int modifier_);
+        StringSetting& declareString(const std::string& key, const std::string& label, std::string default_);
 
-            void declareSeparator();
+        ModifierSetting& declareModifier(const std::string& key, const std::string& label, int modifier_);
 
-            void declareSubcategory(const std::string& label);
+        void declareSeparator();
 
-            void setDefault (const std::string& key, const std::string& default_);
+        void declareSubcategory(const std::string& label);
 
-        public:
+        void setDefault(const std::string& key, const std::string& default_);
 
-            State (const Files::ConfigurationManager& configurationManager);
+    public:
+        State(const Files::ConfigurationManager& configurationManager);
 
-            ~State();
+        ~State();
 
-            void save();
+        void save();
 
-            Iterator begin();
+        Iterator begin();
 
-            Iterator end();
+        Iterator end();
 
-            ShortcutManager& getShortcutManager();
+        ShortcutManager& getShortcutManager();
 
-            Category& operator[](const std::string& key);
+        Category& operator[](const std::string& key);
 
-            void update (const Setting& setting);
+        void update(const Setting& setting);
 
-            static State& get();
+        static State& get();
 
-            void resetCategory(const std::string& category);
+        void resetCategory(const std::string& category);
 
-            void resetAll();
+        void resetAll();
 
-        signals:
+    signals:
 
-            void settingChanged (const CSMPrefs::Setting *setting);
+        void settingChanged(const CSMPrefs::Setting* setting);
     };
 
     // convenience function
diff --git a/apps/opencs/model/prefs/stringsetting.cpp b/apps/opencs/model/prefs/stringsetting.cpp
index 4b3b943904..2f8bf089cd 100644
--- a/apps/opencs/model/prefs/stringsetting.cpp
+++ b/apps/opencs/model/prefs/stringsetting.cpp
@@ -9,30 +9,33 @@
 #include "category.hpp"
 #include "state.hpp"
 
-CSMPrefs::StringSetting::StringSetting (Category *parent,
-  QMutex *mutex, const std::string& key, const std::string& label, std::string default_)
-: Setting (parent, mutex, key, label),  mDefault (default_), mWidget(nullptr)
-{}
+CSMPrefs::StringSetting::StringSetting(
+    Category* parent, QMutex* mutex, const std::string& key, const std::string& label, std::string default_)
+    : Setting(parent, mutex, key, label)
+    , mDefault(default_)
+    , mWidget(nullptr)
+{
+}
 
-CSMPrefs::StringSetting& CSMPrefs::StringSetting::setTooltip (const std::string& tooltip)
+CSMPrefs::StringSetting& CSMPrefs::StringSetting::setTooltip(const std::string& tooltip)
 {
     mTooltip = tooltip;
     return *this;
 }
 
-std::pair<QWidget *, QWidget *> CSMPrefs::StringSetting::makeWidgets (QWidget *parent)
+std::pair<QWidget*, QWidget*> CSMPrefs::StringSetting::makeWidgets(QWidget* parent)
 {
-    mWidget = new QLineEdit (QString::fromUtf8 (mDefault.c_str()), parent);
+    mWidget = new QLineEdit(QString::fromUtf8(mDefault.c_str()), parent);
 
     if (!mTooltip.empty())
     {
-        QString tooltip = QString::fromUtf8 (mTooltip.c_str());
-        mWidget->setToolTip (tooltip);
+        QString tooltip = QString::fromUtf8(mTooltip.c_str());
+        mWidget->setToolTip(tooltip);
     }
 
-    connect (mWidget, &QLineEdit::textChanged, this, &StringSetting::textChanged);
+    connect(mWidget, &QLineEdit::textChanged, this, &StringSetting::textChanged);
 
-    return std::make_pair (static_cast<QWidget *> (nullptr), mWidget);
+    return std::make_pair(static_cast<QWidget*>(nullptr), mWidget);
 }
 
 void CSMPrefs::StringSetting::updateWidget()
@@ -43,12 +46,12 @@ void CSMPrefs::StringSetting::updateWidget()
     }
 }
 
-void CSMPrefs::StringSetting::textChanged (const QString& text)
+void CSMPrefs::StringSetting::textChanged(const QString& text)
 {
     {
-        QMutexLocker lock (getMutex());
-        Settings::Manager::setString (getKey(), getParent()->getKey(), text.toStdString());
+        QMutexLocker lock(getMutex());
+        Settings::Manager::setString(getKey(), getParent()->getKey(), text.toStdString());
     }
 
-    getParent()->getState()->update (*this);
+    getParent()->getState()->update(*this);
 }
diff --git a/apps/opencs/model/prefs/stringsetting.hpp b/apps/opencs/model/prefs/stringsetting.hpp
index d4203bce8f..275dfde3c6 100644
--- a/apps/opencs/model/prefs/stringsetting.hpp
+++ b/apps/opencs/model/prefs/stringsetting.hpp
@@ -9,27 +9,26 @@ namespace CSMPrefs
 {
     class StringSetting : public Setting
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            std::string mTooltip;
-            std::string mDefault;
-            QLineEdit* mWidget;
+        std::string mTooltip;
+        std::string mDefault;
+        QLineEdit* mWidget;
 
-        public:
+    public:
+        StringSetting(
+            Category* parent, QMutex* mutex, const std::string& key, const std::string& label, std::string default_);
 
-            StringSetting (Category *parent,
-                QMutex *mutex, const std::string& key, const std::string& label, std::string default_);
+        StringSetting& setTooltip(const std::string& tooltip);
 
-            StringSetting& setTooltip (const std::string& tooltip);
+        /// Return label, input widget.
+        std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent) override;
 
-            /// Return label, input widget.
-            std::pair<QWidget *, QWidget *> makeWidgets (QWidget *parent) override;
+        void updateWidget() override;
 
-            void updateWidget() override;
+    private slots:
 
-        private slots:
-
-            void textChanged (const QString& text);
+        void textChanged(const QString& text);
     };
 }
 
diff --git a/apps/opencs/model/tools/birthsigncheck.cpp b/apps/opencs/model/tools/birthsigncheck.cpp
index f91fc22f60..e7408ab2f8 100644
--- a/apps/opencs/model/tools/birthsigncheck.cpp
+++ b/apps/opencs/model/tools/birthsigncheck.cpp
@@ -6,10 +6,10 @@
 
 #include "../world/universalid.hpp"
 
-CSMTools::BirthsignCheckStage::BirthsignCheckStage (const CSMWorld::IdCollection<ESM::BirthSign>& birthsigns,
-                                                    const CSMWorld::Resources &textures)
-: mBirthsigns(birthsigns),
-  mTextures(textures)
+CSMTools::BirthsignCheckStage::BirthsignCheckStage(
+    const CSMWorld::IdCollection<ESM::BirthSign>& birthsigns, const CSMWorld::Resources& textures)
+    : mBirthsigns(birthsigns)
+    , mTextures(textures)
 {
     mIgnoreBaseRecords = false;
 }
@@ -21,9 +21,9 @@ int CSMTools::BirthsignCheckStage::setup()
     return mBirthsigns.getSize();
 }
 
-void CSMTools::BirthsignCheckStage::perform (int stage, CSMDoc::Messages& messages)
+void CSMTools::BirthsignCheckStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    const CSMWorld::Record<ESM::BirthSign>& record = mBirthsigns.getRecord (stage);
+    const CSMWorld::Record<ESM::BirthSign>& record = mBirthsigns.getRecord(stage);
 
     // Skip "Base" records (setting!) and "Deleted" records
     if ((mIgnoreBaseRecords && record.mState == CSMWorld::RecordBase::State_BaseOnly) || record.isDeleted())
@@ -31,7 +31,7 @@ void CSMTools::BirthsignCheckStage::perform (int stage, CSMDoc::Messages& messag
 
     const ESM::BirthSign& birthsign = record.get();
 
-    CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Birthsign, birthsign.mId);
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Birthsign, birthsign.mId);
 
     if (birthsign.mName.empty())
         messages.add(id, "Name is missing", "", CSMDoc::Message::Severity_Error);
@@ -45,7 +45,7 @@ void CSMTools::BirthsignCheckStage::perform (int stage, CSMDoc::Messages& messag
     {
         std::string ddsTexture = birthsign.mTexture;
         if (!(Misc::ResourceHelpers::changeExtensionToDds(ddsTexture) && mTextures.searchId(ddsTexture) != -1))
-            messages.add(id,  "Image '" + birthsign.mTexture + "' does not exist", "", CSMDoc::Message::Severity_Error);
+            messages.add(id, "Image '" + birthsign.mTexture + "' does not exist", "", CSMDoc::Message::Severity_Error);
     }
 
     /// \todo check data members that can't be edited in the table view
diff --git a/apps/opencs/model/tools/birthsigncheck.hpp b/apps/opencs/model/tools/birthsigncheck.hpp
index 1d88673adc..01f12cb5f1 100644
--- a/apps/opencs/model/tools/birthsigncheck.hpp
+++ b/apps/opencs/model/tools/birthsigncheck.hpp
@@ -13,20 +13,19 @@ namespace CSMTools
     /// \brief VerifyStage: make sure that birthsign records are internally consistent
     class BirthsignCheckStage : public CSMDoc::Stage
     {
-            const CSMWorld::IdCollection<ESM::BirthSign> &mBirthsigns;
-            const CSMWorld::Resources &mTextures;
-            bool mIgnoreBaseRecords;
+        const CSMWorld::IdCollection<ESM::BirthSign>& mBirthsigns;
+        const CSMWorld::Resources& mTextures;
+        bool mIgnoreBaseRecords;
 
-        public:
+    public:
+        BirthsignCheckStage(
+            const CSMWorld::IdCollection<ESM::BirthSign>& birthsigns, const CSMWorld::Resources& textures);
 
-            BirthsignCheckStage (const CSMWorld::IdCollection<ESM::BirthSign> &birthsigns,
-                                 const CSMWorld::Resources &textures);
+        int setup() override;
+        ///< \return number of steps
 
-            int setup() override;
-            ///< \return number of steps
-
-            void perform (int stage, CSMDoc::Messages& messages) override;
-            ///< Messages resulting from this tage will be appended to \a messages.
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
 
diff --git a/apps/opencs/model/tools/bodypartcheck.cpp b/apps/opencs/model/tools/bodypartcheck.cpp
index 1490a81039..b441f5c544 100644
--- a/apps/opencs/model/tools/bodypartcheck.cpp
+++ b/apps/opencs/model/tools/bodypartcheck.cpp
@@ -2,13 +2,11 @@
 
 #include "../prefs/state.hpp"
 
-CSMTools::BodyPartCheckStage::BodyPartCheckStage(
-        const CSMWorld::IdCollection<ESM::BodyPart> &bodyParts,
-        const CSMWorld::Resources                   &meshes,
-        const CSMWorld::IdCollection<ESM::Race>     &races ) :
-    mBodyParts(bodyParts),
-    mMeshes(meshes),
-    mRaces(races)
+CSMTools::BodyPartCheckStage::BodyPartCheckStage(const CSMWorld::IdCollection<ESM::BodyPart>& bodyParts,
+    const CSMWorld::Resources& meshes, const CSMWorld::IdCollection<ESM::Race>& races)
+    : mBodyParts(bodyParts)
+    , mMeshes(meshes)
+    , mRaces(races)
 {
     mIgnoreBaseRecords = false;
 }
@@ -20,37 +18,37 @@ int CSMTools::BodyPartCheckStage::setup()
     return mBodyParts.getSize();
 }
 
-void CSMTools::BodyPartCheckStage::perform (int stage, CSMDoc::Messages &messages)
+void CSMTools::BodyPartCheckStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    const CSMWorld::Record<ESM::BodyPart> &record = mBodyParts.getRecord(stage);
+    const CSMWorld::Record<ESM::BodyPart>& record = mBodyParts.getRecord(stage);
 
     // Skip "Base" records (setting!) and "Deleted" records
     if ((mIgnoreBaseRecords && record.mState == CSMWorld::RecordBase::State_BaseOnly) || record.isDeleted())
         return;
 
-    const ESM::BodyPart &bodyPart = record.get();
+    const ESM::BodyPart& bodyPart = record.get();
 
-    CSMWorld::UniversalId id( CSMWorld::UniversalId::Type_BodyPart, bodyPart.mId );
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_BodyPart, bodyPart.mId);
 
     // Check BYDT
-    if (bodyPart.mData.mPart >= ESM::BodyPart::MP_Count )
+    if (bodyPart.mData.mPart >= ESM::BodyPart::MP_Count)
         messages.add(id, "Invalid part", "", CSMDoc::Message::Severity_Error);
 
-    if (bodyPart.mData.mType > ESM::BodyPart::MT_Armor )
+    if (bodyPart.mData.mType > ESM::BodyPart::MT_Armor)
         messages.add(id, "Invalid type", "", CSMDoc::Message::Severity_Error);
 
     // Check MODL
-    if ( bodyPart.mModel.empty() )
+    if (bodyPart.mModel.empty())
         messages.add(id, "Model is missing", "", CSMDoc::Message::Severity_Error);
-    else if ( mMeshes.searchId( bodyPart.mModel ) == -1 )
+    else if (mMeshes.searchId(bodyPart.mModel) == -1)
         messages.add(id, "Model '" + bodyPart.mModel + "' does not exist", "", CSMDoc::Message::Severity_Error);
 
     // Check FNAM for skin body parts (for non-skin body parts it's meaningless)
-    if ( bodyPart.mData.mType == ESM::BodyPart::MT_Skin )
+    if (bodyPart.mData.mType == ESM::BodyPart::MT_Skin)
     {
-        if ( bodyPart.mRace.empty() )
+        if (bodyPart.mRace.empty())
             messages.add(id, "Race is missing", "", CSMDoc::Message::Severity_Error);
-        else if ( mRaces.searchId( bodyPart.mRace ) == -1 )
+        else if (mRaces.searchId(bodyPart.mRace) == -1)
             messages.add(id, "Race '" + bodyPart.mRace + "' does not exist", "", CSMDoc::Message::Severity_Error);
     }
 }
diff --git a/apps/opencs/model/tools/bodypartcheck.hpp b/apps/opencs/model/tools/bodypartcheck.hpp
index 2eba75c495..7829fd0e6c 100644
--- a/apps/opencs/model/tools/bodypartcheck.hpp
+++ b/apps/opencs/model/tools/bodypartcheck.hpp
@@ -4,8 +4,8 @@
 #include <components/esm3/loadbody.hpp>
 #include <components/esm3/loadrace.hpp>
 
-#include "../world/resources.hpp"
 #include "../world/idcollection.hpp"
+#include "../world/resources.hpp"
 
 #include "../doc/stage.hpp"
 
@@ -14,21 +14,19 @@ namespace CSMTools
     /// \brief VerifyStage: make sure that body part records are internally consistent
     class BodyPartCheckStage : public CSMDoc::Stage
     {
-        const CSMWorld::IdCollection<ESM::BodyPart> &mBodyParts;
-        const CSMWorld::Resources                   &mMeshes;
-        const CSMWorld::IdCollection<ESM::Race>     &mRaces;
-        bool                                        mIgnoreBaseRecords;
+        const CSMWorld::IdCollection<ESM::BodyPart>& mBodyParts;
+        const CSMWorld::Resources& mMeshes;
+        const CSMWorld::IdCollection<ESM::Race>& mRaces;
+        bool mIgnoreBaseRecords;
 
     public:
-        BodyPartCheckStage(
-            const CSMWorld::IdCollection<ESM::BodyPart> &bodyParts,
-            const CSMWorld::Resources                   &meshes,
-            const CSMWorld::IdCollection<ESM::Race>     &races );
+        BodyPartCheckStage(const CSMWorld::IdCollection<ESM::BodyPart>& bodyParts, const CSMWorld::Resources& meshes,
+            const CSMWorld::IdCollection<ESM::Race>& races);
 
         int setup() override;
         ///< \return number of steps
 
-        void perform(int stage, CSMDoc::Messages &messages) override;
+        void perform(int stage, CSMDoc::Messages& messages) override;
         ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
diff --git a/apps/opencs/model/tools/classcheck.cpp b/apps/opencs/model/tools/classcheck.cpp
index aa64805e5d..d650e0b192 100644
--- a/apps/opencs/model/tools/classcheck.cpp
+++ b/apps/opencs/model/tools/classcheck.cpp
@@ -7,9 +7,8 @@
 
 #include "../prefs/state.hpp"
 
-
-CSMTools::ClassCheckStage::ClassCheckStage (const CSMWorld::IdCollection<ESM::Class>& classes)
-: mClasses (classes)
+CSMTools::ClassCheckStage::ClassCheckStage(const CSMWorld::IdCollection<ESM::Class>& classes)
+    : mClasses(classes)
 {
     mIgnoreBaseRecords = false;
 }
@@ -21,9 +20,9 @@ int CSMTools::ClassCheckStage::setup()
     return mClasses.getSize();
 }
 
-void CSMTools::ClassCheckStage::perform (int stage, CSMDoc::Messages& messages)
+void CSMTools::ClassCheckStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    const CSMWorld::Record<ESM::Class>& record = mClasses.getRecord (stage);
+    const CSMWorld::Record<ESM::Class>& record = mClasses.getRecord(stage);
 
     // Skip "Base" records (setting!) and "Deleted" records
     if ((mIgnoreBaseRecords && record.mState == CSMWorld::RecordBase::State_BaseOnly) || record.isDeleted())
@@ -31,7 +30,7 @@ void CSMTools::ClassCheckStage::perform (int stage, CSMDoc::Messages& messages)
 
     const ESM::Class& class_ = record.get();
 
-    CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Class, class_.mId);
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Class, class_.mId);
 
     // A class should have a name
     if (class_.mName.empty())
@@ -42,13 +41,13 @@ void CSMTools::ClassCheckStage::perform (int stage, CSMDoc::Messages& messages)
         messages.add(id, "Description of a playable class is missing", "", CSMDoc::Message::Severity_Warning);
 
     // test for invalid attributes
-    for (int i=0; i<2; ++i)
-        if (class_.mData.mAttribute[i]==-1)
+    for (int i = 0; i < 2; ++i)
+        if (class_.mData.mAttribute[i] == -1)
         {
             messages.add(id, "Attribute #" + std::to_string(i) + " is not set", "", CSMDoc::Message::Severity_Error);
         }
 
-    if (class_.mData.mAttribute[0]==class_.mData.mAttribute[1] && class_.mData.mAttribute[0]!=-1)
+    if (class_.mData.mAttribute[0] == class_.mData.mAttribute[1] && class_.mData.mAttribute[0] != -1)
     {
         messages.add(id, "Same attribute is listed twice", "", CSMDoc::Message::Severity_Error);
     }
@@ -56,13 +55,14 @@ void CSMTools::ClassCheckStage::perform (int stage, CSMDoc::Messages& messages)
     // test for non-unique skill
     std::map<int, int> skills; // ID, number of occurrences
 
-    for (int i=0; i<5; ++i)
-        for (int i2=0; i2<2; ++i2)
+    for (int i = 0; i < 5; ++i)
+        for (int i2 = 0; i2 < 2; ++i2)
             ++skills[class_.mData.mSkills[i][i2]];
 
-    for (auto &skill : skills)
-        if (skill.second>1)
+    for (auto& skill : skills)
+        if (skill.second > 1)
         {
-            messages.add(id, "Skill " + ESM::Skill::indexToId (skill.first) + " is listed more than once", "", CSMDoc::Message::Severity_Error);
+            messages.add(id, "Skill " + ESM::Skill::indexToId(skill.first) + " is listed more than once", "",
+                CSMDoc::Message::Severity_Error);
         }
 }
diff --git a/apps/opencs/model/tools/classcheck.hpp b/apps/opencs/model/tools/classcheck.hpp
index 9d66336d43..1947fa3072 100644
--- a/apps/opencs/model/tools/classcheck.hpp
+++ b/apps/opencs/model/tools/classcheck.hpp
@@ -12,18 +12,17 @@ namespace CSMTools
     /// \brief VerifyStage: make sure that class records are internally consistent
     class ClassCheckStage : public CSMDoc::Stage
     {
-            const CSMWorld::IdCollection<ESM::Class>& mClasses;
-            bool mIgnoreBaseRecords;
+        const CSMWorld::IdCollection<ESM::Class>& mClasses;
+        bool mIgnoreBaseRecords;
 
-        public:
+    public:
+        ClassCheckStage(const CSMWorld::IdCollection<ESM::Class>& classes);
 
-            ClassCheckStage (const CSMWorld::IdCollection<ESM::Class>& classes);
+        int setup() override;
+        ///< \return number of steps
 
-            int setup() override;
-            ///< \return number of steps
-
-            void perform (int stage, CSMDoc::Messages& messages) override;
-            ///< Messages resulting from this tage will be appended to \a messages.
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
 
diff --git a/apps/opencs/model/tools/enchantmentcheck.cpp b/apps/opencs/model/tools/enchantmentcheck.cpp
index 28f2b32cb9..6dc82ef9aa 100644
--- a/apps/opencs/model/tools/enchantmentcheck.cpp
+++ b/apps/opencs/model/tools/enchantmentcheck.cpp
@@ -4,8 +4,8 @@
 
 #include "../world/universalid.hpp"
 
-CSMTools::EnchantmentCheckStage::EnchantmentCheckStage (const CSMWorld::IdCollection<ESM::Enchantment>& enchantments)
-    : mEnchantments (enchantments)
+CSMTools::EnchantmentCheckStage::EnchantmentCheckStage(const CSMWorld::IdCollection<ESM::Enchantment>& enchantments)
+    : mEnchantments(enchantments)
 {
     mIgnoreBaseRecords = false;
 }
@@ -17,9 +17,9 @@ int CSMTools::EnchantmentCheckStage::setup()
     return mEnchantments.getSize();
 }
 
-void CSMTools::EnchantmentCheckStage::perform (int stage, CSMDoc::Messages& messages)
+void CSMTools::EnchantmentCheckStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    const CSMWorld::Record<ESM::Enchantment>& record = mEnchantments.getRecord (stage);
+    const CSMWorld::Record<ESM::Enchantment>& record = mEnchantments.getRecord(stage);
 
     // Skip "Base" records (setting!) and "Deleted" records
     if ((mIgnoreBaseRecords && record.mState == CSMWorld::RecordBase::State_BaseOnly) || record.isDeleted())
@@ -27,7 +27,7 @@ void CSMTools::EnchantmentCheckStage::perform (int stage, CSMDoc::Messages& mess
 
     const ESM::Enchantment& enchantment = record.get();
 
-    CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Enchantment, enchantment.mId);
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Enchantment, enchantment.mId);
 
     if (enchantment.mData.mType < 0 || enchantment.mData.mType > 3)
         messages.add(id, "Invalid type", "", CSMDoc::Message::Severity_Error);
@@ -61,9 +61,11 @@ void CSMTools::EnchantmentCheckStage::perform (int stage, CSMDoc::Messages& mess
             }
 
             if (effect->mSkill < -1 || effect->mSkill > 26)
-                messages.add(id, "Effect #" + number + " affected skill is invalid", "", CSMDoc::Message::Severity_Error);
+                messages.add(
+                    id, "Effect #" + number + " affected skill is invalid", "", CSMDoc::Message::Severity_Error);
             if (effect->mAttribute < -1 || effect->mAttribute > 7)
-                messages.add(id, "Effect #" + number + " affected attribute is invalid", "", CSMDoc::Message::Severity_Error);
+                messages.add(
+                    id, "Effect #" + number + " affected attribute is invalid", "", CSMDoc::Message::Severity_Error);
             if (effect->mRange < 0 || effect->mRange > 2)
                 messages.add(id, "Effect #" + number + " range is invalid", "", CSMDoc::Message::Severity_Error);
             if (effect->mArea < 0)
@@ -71,11 +73,14 @@ void CSMTools::EnchantmentCheckStage::perform (int stage, CSMDoc::Messages& mess
             if (effect->mDuration < 0)
                 messages.add(id, "Effect #" + number + " duration is negative", "", CSMDoc::Message::Severity_Error);
             if (effect->mMagnMin < 0)
-                messages.add(id, "Effect #" + number + " minimum magnitude is negative", "", CSMDoc::Message::Severity_Error);
+                messages.add(
+                    id, "Effect #" + number + " minimum magnitude is negative", "", CSMDoc::Message::Severity_Error);
             if (effect->mMagnMax < 0)
-                messages.add(id, "Effect #" + number + " maximum magnitude is negative", "", CSMDoc::Message::Severity_Error);
+                messages.add(
+                    id, "Effect #" + number + " maximum magnitude is negative", "", CSMDoc::Message::Severity_Error);
             if (effect->mMagnMin > effect->mMagnMax)
-                messages.add(id, "Effect #" + number + " minimum magnitude is higher than maximum magnitude", "", CSMDoc::Message::Severity_Error);
+                messages.add(id, "Effect #" + number + " minimum magnitude is higher than maximum magnitude", "",
+                    CSMDoc::Message::Severity_Error);
             ++effect;
         }
     }
diff --git a/apps/opencs/model/tools/enchantmentcheck.hpp b/apps/opencs/model/tools/enchantmentcheck.hpp
index 8ee71ad7cb..0d5e31f0b1 100644
--- a/apps/opencs/model/tools/enchantmentcheck.hpp
+++ b/apps/opencs/model/tools/enchantmentcheck.hpp
@@ -12,19 +12,17 @@ namespace CSMTools
     /// \brief Make sure that enchantment records are correct
     class EnchantmentCheckStage : public CSMDoc::Stage
     {
-            const CSMWorld::IdCollection<ESM::Enchantment>& mEnchantments;
-            bool mIgnoreBaseRecords;
+        const CSMWorld::IdCollection<ESM::Enchantment>& mEnchantments;
+        bool mIgnoreBaseRecords;
 
-        public:
+    public:
+        EnchantmentCheckStage(const CSMWorld::IdCollection<ESM::Enchantment>& enchantments);
 
-            EnchantmentCheckStage (const CSMWorld::IdCollection<ESM::Enchantment>& enchantments);
-
-            int setup() override;
-            ///< \return number of steps
-
-            void perform (int stage, CSMDoc::Messages& messages) override;
-            ///< Messages resulting from this tage will be appended to \a messages.
+        int setup() override;
+        ///< \return number of steps
 
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
 
diff --git a/apps/opencs/model/tools/factioncheck.cpp b/apps/opencs/model/tools/factioncheck.cpp
index 2be59c2f9d..35fe3bd4a4 100644
--- a/apps/opencs/model/tools/factioncheck.cpp
+++ b/apps/opencs/model/tools/factioncheck.cpp
@@ -6,9 +6,8 @@
 
 #include "../prefs/state.hpp"
 
-
-CSMTools::FactionCheckStage::FactionCheckStage (const CSMWorld::IdCollection<ESM::Faction>& factions)
-: mFactions (factions)
+CSMTools::FactionCheckStage::FactionCheckStage(const CSMWorld::IdCollection<ESM::Faction>& factions)
+    : mFactions(factions)
 {
     mIgnoreBaseRecords = false;
 }
@@ -20,9 +19,9 @@ int CSMTools::FactionCheckStage::setup()
     return mFactions.getSize();
 }
 
-void CSMTools::FactionCheckStage::perform (int stage, CSMDoc::Messages& messages)
+void CSMTools::FactionCheckStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    const CSMWorld::Record<ESM::Faction>& record = mFactions.getRecord (stage);
+    const CSMWorld::Record<ESM::Faction>& record = mFactions.getRecord(stage);
 
     // Skip "Base" records (setting!) and "Deleted" records
     if ((mIgnoreBaseRecords && record.mState == CSMWorld::RecordBase::State_BaseOnly) || record.isDeleted())
@@ -30,14 +29,14 @@ void CSMTools::FactionCheckStage::perform (int stage, CSMDoc::Messages& messages
 
     const ESM::Faction& faction = record.get();
 
-    CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Faction, faction.mId);
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Faction, faction.mId);
 
     // test for empty name
     if (faction.mName.empty())
         messages.add(id, "Name is missing", "", CSMDoc::Message::Severity_Error);
 
     // test for invalid attributes
-    if (faction.mData.mAttribute[0]==faction.mData.mAttribute[1] && faction.mData.mAttribute[0]!=-1)
+    if (faction.mData.mAttribute[0] == faction.mData.mAttribute[1] && faction.mData.mAttribute[0] != -1)
     {
         messages.add(id, "Same attribute is listed twice", "", CSMDoc::Message::Severity_Error);
     }
@@ -45,14 +44,15 @@ void CSMTools::FactionCheckStage::perform (int stage, CSMDoc::Messages& messages
     // test for non-unique skill
     std::map<int, int> skills; // ID, number of occurrences
 
-    for (int i=0; i<7; ++i)
-        if (faction.mData.mSkills[i]!=-1)
+    for (int i = 0; i < 7; ++i)
+        if (faction.mData.mSkills[i] != -1)
             ++skills[faction.mData.mSkills[i]];
 
-    for (auto &skill : skills)
-        if (skill.second>1)
+    for (auto& skill : skills)
+        if (skill.second > 1)
         {
-            messages.add(id, "Skill " + ESM::Skill::indexToId (skill.first) + " is listed more than once", "", CSMDoc::Message::Severity_Error);
+            messages.add(id, "Skill " + ESM::Skill::indexToId(skill.first) + " is listed more than once", "",
+                CSMDoc::Message::Severity_Error);
         }
 
     /// \todo check data members that can't be edited in the table view
diff --git a/apps/opencs/model/tools/factioncheck.hpp b/apps/opencs/model/tools/factioncheck.hpp
index a6a6815976..bc324fc4c2 100644
--- a/apps/opencs/model/tools/factioncheck.hpp
+++ b/apps/opencs/model/tools/factioncheck.hpp
@@ -12,18 +12,17 @@ namespace CSMTools
     /// \brief VerifyStage: make sure that faction records are internally consistent
     class FactionCheckStage : public CSMDoc::Stage
     {
-            const CSMWorld::IdCollection<ESM::Faction>& mFactions;
-            bool mIgnoreBaseRecords;
+        const CSMWorld::IdCollection<ESM::Faction>& mFactions;
+        bool mIgnoreBaseRecords;
 
-        public:
+    public:
+        FactionCheckStage(const CSMWorld::IdCollection<ESM::Faction>& factions);
 
-            FactionCheckStage (const CSMWorld::IdCollection<ESM::Faction>& factions);
+        int setup() override;
+        ///< \return number of steps
 
-            int setup() override;
-            ///< \return number of steps
-
-            void perform (int stage, CSMDoc::Messages& messages) override;
-            ///< Messages resulting from this tage will be appended to \a messages.
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
 
diff --git a/apps/opencs/model/tools/gmstcheck.cpp b/apps/opencs/model/tools/gmstcheck.cpp
index 7cd13e5c23..cbce4f35b1 100644
--- a/apps/opencs/model/tools/gmstcheck.cpp
+++ b/apps/opencs/model/tools/gmstcheck.cpp
@@ -21,20 +21,20 @@ int CSMTools::GmstCheckStage::setup()
 
 void CSMTools::GmstCheckStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    const CSMWorld::Record<ESM::GameSetting>& record = mGameSettings.getRecord (stage);
-    
+    const CSMWorld::Record<ESM::GameSetting>& record = mGameSettings.getRecord(stage);
+
     // Skip "Base" records (setting!) and "Deleted" records
     if ((mIgnoreBaseRecords && record.mState == CSMWorld::RecordBase::State_BaseOnly) || record.isDeleted())
         return;
-    
+
     const ESM::GameSetting& gmst = record.get();
-    
-    CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Gmst, gmst.mId);
-    
+
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Gmst, gmst.mId);
+
     // Test for empty string
     if (gmst.mValue.getType() == ESM::VT_String && gmst.mValue.getString().empty())
         messages.add(id, gmst.mId + " is an empty string", "", CSMDoc::Message::Severity_Warning);
-    
+
     // Checking type and limits
     // optimization - compare it to lists based on naming convention (f-float,i-int,s-string)
     if (gmst.mId[0] == 'f')
@@ -47,19 +47,19 @@ void CSMTools::GmstCheckStage::perform(int stage, CSMDoc::Messages& messages)
                 {
                     std::ostringstream stream;
                     stream << "Expected float type for " << gmst.mId << " but found "
-                        << varTypeToString(gmst.mValue.getType()) << " type";
-                    
+                           << varTypeToString(gmst.mValue.getType()) << " type";
+
                     messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
                 }
-                
-                if (gmst.mValue.getFloat() < CSMWorld::DefaultGmsts::FloatLimits[i*2])
-                    messages.add(id, gmst.mId + " is less than the suggested range", "",
-                                 CSMDoc::Message::Severity_Warning);
-                
-                if (gmst.mValue.getFloat() > CSMWorld::DefaultGmsts::FloatLimits[i*2+1])
-                    messages.add(id, gmst.mId + " is more than the suggested range", "",
-                                 CSMDoc::Message::Severity_Warning);
-                
+
+                if (gmst.mValue.getFloat() < CSMWorld::DefaultGmsts::FloatLimits[i * 2])
+                    messages.add(
+                        id, gmst.mId + " is less than the suggested range", "", CSMDoc::Message::Severity_Warning);
+
+                if (gmst.mValue.getFloat() > CSMWorld::DefaultGmsts::FloatLimits[i * 2 + 1])
+                    messages.add(
+                        id, gmst.mId + " is more than the suggested range", "", CSMDoc::Message::Severity_Warning);
+
                 break; // for loop
             }
         }
@@ -67,26 +67,26 @@ void CSMTools::GmstCheckStage::perform(int stage, CSMDoc::Messages& messages)
     else if (gmst.mId[0] == 'i')
     {
         for (size_t i = 0; i < CSMWorld::DefaultGmsts::IntCount; ++i)
-        {   
+        {
             if (gmst.mId == CSMWorld::DefaultGmsts::Ints[i])
             {
                 if (gmst.mValue.getType() != ESM::VT_Int)
                 {
                     std::ostringstream stream;
                     stream << "Expected int type for " << gmst.mId << " but found "
-                        << varTypeToString(gmst.mValue.getType()) << " type";
-                    
+                           << varTypeToString(gmst.mValue.getType()) << " type";
+
                     messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
                 }
-                
-                if (gmst.mValue.getInteger() < CSMWorld::DefaultGmsts::IntLimits[i*2])
-                    messages.add(id, gmst.mId + " is less than the suggested range", "",
-                                 CSMDoc::Message::Severity_Warning);
-                
-                if (gmst.mValue.getInteger() > CSMWorld::DefaultGmsts::IntLimits[i*2+1])
-                    messages.add(id, gmst.mId + " is more than the suggested range", "",
-                                 CSMDoc::Message::Severity_Warning);
-                
+
+                if (gmst.mValue.getInteger() < CSMWorld::DefaultGmsts::IntLimits[i * 2])
+                    messages.add(
+                        id, gmst.mId + " is less than the suggested range", "", CSMDoc::Message::Severity_Warning);
+
+                if (gmst.mValue.getInteger() > CSMWorld::DefaultGmsts::IntLimits[i * 2 + 1])
+                    messages.add(
+                        id, gmst.mId + " is more than the suggested range", "", CSMDoc::Message::Severity_Warning);
+
                 break; // for loop
             }
         }
@@ -98,16 +98,16 @@ void CSMTools::GmstCheckStage::perform(int stage, CSMDoc::Messages& messages)
             if (gmst.mId == CSMWorld::DefaultGmsts::Strings[i])
             {
                 ESM::VarType type = gmst.mValue.getType();
-                
+
                 if (type != ESM::VT_String && type != ESM::VT_None)
                 {
                     std::ostringstream stream;
                     stream << "Expected string or none type for " << gmst.mId << " but found "
-                        << varTypeToString(gmst.mValue.getType()) << " type";
-                    
+                           << varTypeToString(gmst.mValue.getType()) << " type";
+
                     messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
                 }
-                
+
                 break; // for loop
             }
         }
@@ -118,13 +118,21 @@ std::string CSMTools::GmstCheckStage::varTypeToString(ESM::VarType type)
 {
     switch (type)
     {
-        case ESM::VT_Unknown: return "unknown";
-        case ESM::VT_None: return "none";
-        case ESM::VT_Short: return "short";
-        case ESM::VT_Int: return "int";
-        case ESM::VT_Long: return "long";
-        case ESM::VT_Float: return "float";
-        case ESM::VT_String: return "string";
-        default: return "unhandled";
+        case ESM::VT_Unknown:
+            return "unknown";
+        case ESM::VT_None:
+            return "none";
+        case ESM::VT_Short:
+            return "short";
+        case ESM::VT_Int:
+            return "int";
+        case ESM::VT_Long:
+            return "long";
+        case ESM::VT_Float:
+            return "float";
+        case ESM::VT_String:
+            return "string";
+        default:
+            return "unhandled";
     }
 }
diff --git a/apps/opencs/model/tools/gmstcheck.hpp b/apps/opencs/model/tools/gmstcheck.hpp
index c57f6a088b..45e8d0e0d3 100644
--- a/apps/opencs/model/tools/gmstcheck.hpp
+++ b/apps/opencs/model/tools/gmstcheck.hpp
@@ -13,22 +13,19 @@ namespace CSMTools
     class GmstCheckStage : public CSMDoc::Stage
     {
     public:
-        
         GmstCheckStage(const CSMWorld::IdCollection<ESM::GameSetting>& gameSettings);
-        
+
         int setup() override;
         ///< \return number of steps
 
         void perform(int stage, CSMDoc::Messages& messages) override;
         ///< Messages resulting from this stage will be appended to \a messages
-        
+
     private:
-        
         const CSMWorld::IdCollection<ESM::GameSetting>& mGameSettings;
         bool mIgnoreBaseRecords;
-        
+
         std::string varTypeToString(ESM::VarType);
-        
     };
 }
 
diff --git a/apps/opencs/model/tools/journalcheck.cpp b/apps/opencs/model/tools/journalcheck.cpp
index 5959cdf54b..c7f0c0df6f 100644
--- a/apps/opencs/model/tools/journalcheck.cpp
+++ b/apps/opencs/model/tools/journalcheck.cpp
@@ -4,9 +4,10 @@
 
 #include "../prefs/state.hpp"
 
-CSMTools::JournalCheckStage::JournalCheckStage(const CSMWorld::IdCollection<ESM::Dialogue> &journals,
-    const CSMWorld::InfoCollection& journalInfos)
-    : mJournals(journals), mJournalInfos(journalInfos)
+CSMTools::JournalCheckStage::JournalCheckStage(
+    const CSMWorld::IdCollection<ESM::Dialogue>& journals, const CSMWorld::InfoCollection& journalInfos)
+    : mJournals(journals)
+    , mJournalInfos(journalInfos)
 {
     mIgnoreBaseRecords = false;
 }
@@ -20,13 +21,14 @@ int CSMTools::JournalCheckStage::setup()
 
 void CSMTools::JournalCheckStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    const CSMWorld::Record<ESM::Dialogue> &journalRecord = mJournals.getRecord(stage);
+    const CSMWorld::Record<ESM::Dialogue>& journalRecord = mJournals.getRecord(stage);
 
     // Skip "Base" records (setting!) and "Deleted" records
-    if ((mIgnoreBaseRecords && journalRecord.mState == CSMWorld::RecordBase::State_BaseOnly) || journalRecord.isDeleted())
+    if ((mIgnoreBaseRecords && journalRecord.mState == CSMWorld::RecordBase::State_BaseOnly)
+        || journalRecord.isDeleted())
         return;
 
-    const ESM::Dialogue &journal = journalRecord.get();
+    const ESM::Dialogue& journal = journalRecord.get();
     int statusNamedCount = 0;
     int totalInfoCount = 0;
     std::set<int> questIndices;
@@ -65,7 +67,8 @@ void CSMTools::JournalCheckStage::perform(int stage, CSMDoc::Messages& messages)
         if (!result.second)
         {
             CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_JournalInfo, journalInfo.mId);
-            messages.add(id, "Duplicated quest index " + std::to_string(journalInfo.mData.mJournalIndex), "", CSMDoc::Message::Severity_Error);
+            messages.add(id, "Duplicated quest index " + std::to_string(journalInfo.mData.mJournalIndex), "",
+                CSMDoc::Message::Severity_Error);
         }
     }
 
diff --git a/apps/opencs/model/tools/journalcheck.hpp b/apps/opencs/model/tools/journalcheck.hpp
index 65ce8b85df..855d23092d 100644
--- a/apps/opencs/model/tools/journalcheck.hpp
+++ b/apps/opencs/model/tools/journalcheck.hpp
@@ -14,9 +14,8 @@ namespace CSMTools
     class JournalCheckStage : public CSMDoc::Stage
     {
     public:
-
-        JournalCheckStage(const CSMWorld::IdCollection<ESM::Dialogue>& journals,
-            const CSMWorld::InfoCollection& journalInfos);
+        JournalCheckStage(
+            const CSMWorld::IdCollection<ESM::Dialogue>& journals, const CSMWorld::InfoCollection& journalInfos);
 
         int setup() override;
         ///< \return number of steps
@@ -25,11 +24,9 @@ namespace CSMTools
         ///< Messages resulting from this stage will be appended to \a messages
 
     private:
-
         const CSMWorld::IdCollection<ESM::Dialogue>& mJournals;
         const CSMWorld::InfoCollection& mJournalInfos;
         bool mIgnoreBaseRecords;
-
     };
 }
 
diff --git a/apps/opencs/model/tools/magiceffectcheck.cpp b/apps/opencs/model/tools/magiceffectcheck.cpp
index f55fb14eea..4af4636073 100644
--- a/apps/opencs/model/tools/magiceffectcheck.cpp
+++ b/apps/opencs/model/tools/magiceffectcheck.cpp
@@ -4,28 +4,25 @@
 
 #include "../prefs/state.hpp"
 
-std::string CSMTools::MagicEffectCheckStage::checkObject(const std::string &id, 
-                                                                const CSMWorld::UniversalId &type, 
-                                                                const std::string &column) const
+std::string CSMTools::MagicEffectCheckStage::checkObject(
+    const std::string& id, const CSMWorld::UniversalId& type, const std::string& column) const
 {
     CSMWorld::RefIdData::LocalIndex index = mObjects.getDataSet().searchId(id);
-    if (index.first == -1) 
+    if (index.first == -1)
         return (column + " '" + id + "' does not exist");
-    else if (index.second != type.getType()) 
+    else if (index.second != type.getType())
         return (column + " '" + id + "' does not have " + type.getTypeName() + " type");
     return std::string();
 }
 
-CSMTools::MagicEffectCheckStage::MagicEffectCheckStage(const CSMWorld::IdCollection<ESM::MagicEffect> &effects,
-                                                       const CSMWorld::IdCollection<ESM::Sound> &sounds,
-                                                       const CSMWorld::RefIdCollection &objects,
-                                                       const CSMWorld::Resources &icons,
-                                                       const CSMWorld::Resources &textures)
-    : mMagicEffects(effects),
-      mSounds(sounds),
-      mObjects(objects),
-      mIcons(icons),
-      mTextures(textures)
+CSMTools::MagicEffectCheckStage::MagicEffectCheckStage(const CSMWorld::IdCollection<ESM::MagicEffect>& effects,
+    const CSMWorld::IdCollection<ESM::Sound>& sounds, const CSMWorld::RefIdCollection& objects,
+    const CSMWorld::Resources& icons, const CSMWorld::Resources& textures)
+    : mMagicEffects(effects)
+    , mSounds(sounds)
+    , mObjects(objects)
+    , mIcons(icons)
+    , mTextures(textures)
 {
     mIgnoreBaseRecords = false;
 }
@@ -37,9 +34,9 @@ int CSMTools::MagicEffectCheckStage::setup()
     return mMagicEffects.getSize();
 }
 
-void CSMTools::MagicEffectCheckStage::perform(int stage, CSMDoc::Messages &messages)
+void CSMTools::MagicEffectCheckStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    const CSMWorld::Record<ESM::MagicEffect> &record = mMagicEffects.getRecord(stage);
+    const CSMWorld::Record<ESM::MagicEffect>& record = mMagicEffects.getRecord(stage);
 
     // Skip "Base" records (setting!) and "Deleted" records
     if ((mIgnoreBaseRecords && record.mState == CSMWorld::RecordBase::State_BaseOnly) || record.isDeleted())
@@ -78,7 +75,8 @@ void CSMTools::MagicEffectCheckStage::perform(int stage, CSMDoc::Messages &messa
         {
             std::string ddsParticle = effect.mParticle;
             if (!(Misc::ResourceHelpers::changeExtensionToDds(ddsParticle) && mTextures.searchId(ddsParticle) != -1))
-                messages.add(id, "Particle texture '" + effect.mParticle + "' does not exist", "", CSMDoc::Message::Severity_Error);
+                messages.add(id, "Particle texture '" + effect.mParticle + "' does not exist", "",
+                    CSMDoc::Message::Severity_Error);
         }
     }
 
@@ -111,7 +109,8 @@ void CSMTools::MagicEffectCheckStage::perform(int stage, CSMDoc::Messages &messa
     }
 
     if (!effect.mCastSound.empty() && mSounds.searchId(effect.mCastSound) == -1)
-        messages.add(id, "Casting sound '" + effect.mCastSound + "' does not exist", "", CSMDoc::Message::Severity_Error);
+        messages.add(
+            id, "Casting sound '" + effect.mCastSound + "' does not exist", "", CSMDoc::Message::Severity_Error);
     if (!effect.mHitSound.empty() && mSounds.searchId(effect.mHitSound) == -1)
         messages.add(id, "Hit sound '" + effect.mHitSound + "' does not exist", "", CSMDoc::Message::Severity_Error);
     if (!effect.mAreaSound.empty() && mSounds.searchId(effect.mAreaSound) == -1)
diff --git a/apps/opencs/model/tools/magiceffectcheck.hpp b/apps/opencs/model/tools/magiceffectcheck.hpp
index e264683d04..154a15dc62 100644
--- a/apps/opencs/model/tools/magiceffectcheck.hpp
+++ b/apps/opencs/model/tools/magiceffectcheck.hpp
@@ -15,27 +15,26 @@ namespace CSMTools
     /// \brief VerifyStage: make sure that magic effect records are internally consistent
     class MagicEffectCheckStage : public CSMDoc::Stage
     {
-            const CSMWorld::IdCollection<ESM::MagicEffect> &mMagicEffects;
-            const CSMWorld::IdCollection<ESM::Sound> &mSounds;
-            const CSMWorld::RefIdCollection &mObjects;
-            const CSMWorld::Resources &mIcons;
-            const CSMWorld::Resources &mTextures;
-            bool mIgnoreBaseRecords;
-
-        private:
-            std::string checkObject(const std::string &id, const CSMWorld::UniversalId &type, const std::string &column) const;
-
-        public:
-            MagicEffectCheckStage(const CSMWorld::IdCollection<ESM::MagicEffect> &effects,
-                                  const CSMWorld::IdCollection<ESM::Sound> &sounds,
-                                  const CSMWorld::RefIdCollection &objects,
-                                  const CSMWorld::Resources &icons,
-                                  const CSMWorld::Resources &textures);
-
-            int setup() override;
-            ///< \return number of steps
-            void perform (int stage, CSMDoc::Messages &messages) override;
-            ///< Messages resulting from this tage will be appended to \a messages.
+        const CSMWorld::IdCollection<ESM::MagicEffect>& mMagicEffects;
+        const CSMWorld::IdCollection<ESM::Sound>& mSounds;
+        const CSMWorld::RefIdCollection& mObjects;
+        const CSMWorld::Resources& mIcons;
+        const CSMWorld::Resources& mTextures;
+        bool mIgnoreBaseRecords;
+
+    private:
+        std::string checkObject(
+            const std::string& id, const CSMWorld::UniversalId& type, const std::string& column) const;
+
+    public:
+        MagicEffectCheckStage(const CSMWorld::IdCollection<ESM::MagicEffect>& effects,
+            const CSMWorld::IdCollection<ESM::Sound>& sounds, const CSMWorld::RefIdCollection& objects,
+            const CSMWorld::Resources& icons, const CSMWorld::Resources& textures);
+
+        int setup() override;
+        ///< \return number of steps
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
 
diff --git a/apps/opencs/model/tools/mandatoryid.cpp b/apps/opencs/model/tools/mandatoryid.cpp
index d0d9cc0b9d..75bea2014d 100644
--- a/apps/opencs/model/tools/mandatoryid.cpp
+++ b/apps/opencs/model/tools/mandatoryid.cpp
@@ -4,19 +4,21 @@
 
 #include "../world/record.hpp"
 
-CSMTools::MandatoryIdStage::MandatoryIdStage (const CSMWorld::CollectionBase& idCollection,
+CSMTools::MandatoryIdStage::MandatoryIdStage(const CSMWorld::CollectionBase& idCollection,
     const CSMWorld::UniversalId& collectionId, const std::vector<std::string>& ids)
-: mIdCollection (idCollection), mCollectionId (collectionId), mIds (ids)
-{}
+    : mIdCollection(idCollection)
+    , mCollectionId(collectionId)
+    , mIds(ids)
+{
+}
 
 int CSMTools::MandatoryIdStage::setup()
 {
     return static_cast<int>(mIds.size());
 }
 
-void CSMTools::MandatoryIdStage::perform (int stage, CSMDoc::Messages& messages)
+void CSMTools::MandatoryIdStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    if (mIdCollection.searchId (mIds.at (stage))==-1 ||
-        mIdCollection.getRecord (mIds.at (stage)).isDeleted())
-        messages.add (mCollectionId, "Missing mandatory record: " + mIds.at (stage));
+    if (mIdCollection.searchId(mIds.at(stage)) == -1 || mIdCollection.getRecord(mIds.at(stage)).isDeleted())
+        messages.add(mCollectionId, "Missing mandatory record: " + mIds.at(stage));
 }
diff --git a/apps/opencs/model/tools/mandatoryid.hpp b/apps/opencs/model/tools/mandatoryid.hpp
index 9d069a2da8..77de77626c 100644
--- a/apps/opencs/model/tools/mandatoryid.hpp
+++ b/apps/opencs/model/tools/mandatoryid.hpp
@@ -18,20 +18,19 @@ namespace CSMTools
     /// \brief Verify stage: make sure that records with specific IDs exist.
     class MandatoryIdStage : public CSMDoc::Stage
     {
-            const CSMWorld::CollectionBase& mIdCollection;
-            CSMWorld::UniversalId mCollectionId;
-            std::vector<std::string> mIds;
+        const CSMWorld::CollectionBase& mIdCollection;
+        CSMWorld::UniversalId mCollectionId;
+        std::vector<std::string> mIds;
 
-        public:
+    public:
+        MandatoryIdStage(const CSMWorld::CollectionBase& idCollection, const CSMWorld::UniversalId& collectionId,
+            const std::vector<std::string>& ids);
 
-            MandatoryIdStage (const CSMWorld::CollectionBase& idCollection, const CSMWorld::UniversalId& collectionId,
-                const std::vector<std::string>& ids);
+        int setup() override;
+        ///< \return number of steps
 
-            int setup() override;
-            ///< \return number of steps
-
-            void perform (int stage, CSMDoc::Messages& messages) override;
-            ///< Messages resulting from this tage will be appended to \a messages.
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
 
diff --git a/apps/opencs/model/tools/mergeoperation.cpp b/apps/opencs/model/tools/mergeoperation.cpp
index b15b4b83f1..8fd1232edf 100644
--- a/apps/opencs/model/tools/mergeoperation.cpp
+++ b/apps/opencs/model/tools/mergeoperation.cpp
@@ -1,52 +1,56 @@
 
 #include "mergeoperation.hpp"
 
-#include "../doc/state.hpp"
 #include "../doc/document.hpp"
+#include "../doc/state.hpp"
 
 #include "mergestages.hpp"
 
-CSMTools::MergeOperation::MergeOperation (CSMDoc::Document& document, ToUTF8::FromType encoding)
-: CSMDoc::Operation (CSMDoc::State_Merging, true), mState (document)
+CSMTools::MergeOperation::MergeOperation(CSMDoc::Document& document, ToUTF8::FromType encoding)
+    : CSMDoc::Operation(CSMDoc::State_Merging, true)
+    , mState(document)
 {
-    appendStage (new StartMergeStage (mState));
-
-    appendStage (new MergeIdCollectionStage<ESM::Global> (mState, &CSMWorld::Data::getGlobals));
-    appendStage (new MergeIdCollectionStage<ESM::GameSetting> (mState, &CSMWorld::Data::getGmsts));
-    appendStage (new MergeIdCollectionStage<ESM::Skill> (mState, &CSMWorld::Data::getSkills));
-    appendStage (new MergeIdCollectionStage<ESM::Class> (mState, &CSMWorld::Data::getClasses));
-    appendStage (new MergeIdCollectionStage<ESM::Faction> (mState, &CSMWorld::Data::getFactions));
-    appendStage (new MergeIdCollectionStage<ESM::Race> (mState, &CSMWorld::Data::getRaces));
-    appendStage (new MergeIdCollectionStage<ESM::Sound> (mState, &CSMWorld::Data::getSounds));
-    appendStage (new MergeIdCollectionStage<ESM::Script> (mState, &CSMWorld::Data::getScripts));
-    appendStage (new MergeIdCollectionStage<ESM::Region> (mState, &CSMWorld::Data::getRegions));
-    appendStage (new MergeIdCollectionStage<ESM::BirthSign> (mState, &CSMWorld::Data::getBirthsigns));
-    appendStage (new MergeIdCollectionStage<ESM::Spell> (mState, &CSMWorld::Data::getSpells));
-    appendStage (new MergeIdCollectionStage<ESM::Dialogue> (mState, &CSMWorld::Data::getTopics));
-    appendStage (new MergeIdCollectionStage<ESM::Dialogue> (mState, &CSMWorld::Data::getJournals));
-    appendStage (new MergeIdCollectionStage<CSMWorld::Cell> (mState, &CSMWorld::Data::getCells));
-    appendStage (new MergeIdCollectionStage<ESM::Filter> (mState, &CSMWorld::Data::getFilters));
-    appendStage (new MergeIdCollectionStage<ESM::Enchantment> (mState, &CSMWorld::Data::getEnchantments));
-    appendStage (new MergeIdCollectionStage<ESM::BodyPart> (mState, &CSMWorld::Data::getBodyParts));
-    appendStage (new MergeIdCollectionStage<ESM::DebugProfile> (mState, &CSMWorld::Data::getDebugProfiles));
-    appendStage (new MergeIdCollectionStage<ESM::SoundGenerator> (mState, &CSMWorld::Data::getSoundGens));
-    appendStage (new MergeIdCollectionStage<ESM::MagicEffect> (mState, &CSMWorld::Data::getMagicEffects));
-    appendStage (new MergeIdCollectionStage<ESM::StartScript> (mState, &CSMWorld::Data::getStartScripts));
-    appendStage (new MergeIdCollectionStage<CSMWorld::Pathgrid, CSMWorld::SubCellCollection<CSMWorld::Pathgrid> > (mState, &CSMWorld::Data::getPathgrids));
-    appendStage (new MergeIdCollectionStage<CSMWorld::Info, CSMWorld::InfoCollection> (mState, &CSMWorld::Data::getTopicInfos));
-    appendStage (new MergeIdCollectionStage<CSMWorld::Info, CSMWorld::InfoCollection> (mState, &CSMWorld::Data::getJournalInfos));
-    appendStage (new MergeRefIdsStage (mState));
-    appendStage (new MergeReferencesStage (mState));
-    appendStage (new MergeReferencesStage (mState));
-    appendStage (new PopulateLandTexturesMergeStage (mState));
-    appendStage (new MergeLandStage (mState));
-    appendStage (new FixLandsAndLandTexturesMergeStage (mState));
-    appendStage (new CleanupLandTexturesMergeStage (mState));
-
-    appendStage (new FinishMergedDocumentStage (mState, encoding));
+    appendStage(new StartMergeStage(mState));
+
+    appendStage(new MergeIdCollectionStage<ESM::Global>(mState, &CSMWorld::Data::getGlobals));
+    appendStage(new MergeIdCollectionStage<ESM::GameSetting>(mState, &CSMWorld::Data::getGmsts));
+    appendStage(new MergeIdCollectionStage<ESM::Skill>(mState, &CSMWorld::Data::getSkills));
+    appendStage(new MergeIdCollectionStage<ESM::Class>(mState, &CSMWorld::Data::getClasses));
+    appendStage(new MergeIdCollectionStage<ESM::Faction>(mState, &CSMWorld::Data::getFactions));
+    appendStage(new MergeIdCollectionStage<ESM::Race>(mState, &CSMWorld::Data::getRaces));
+    appendStage(new MergeIdCollectionStage<ESM::Sound>(mState, &CSMWorld::Data::getSounds));
+    appendStage(new MergeIdCollectionStage<ESM::Script>(mState, &CSMWorld::Data::getScripts));
+    appendStage(new MergeIdCollectionStage<ESM::Region>(mState, &CSMWorld::Data::getRegions));
+    appendStage(new MergeIdCollectionStage<ESM::BirthSign>(mState, &CSMWorld::Data::getBirthsigns));
+    appendStage(new MergeIdCollectionStage<ESM::Spell>(mState, &CSMWorld::Data::getSpells));
+    appendStage(new MergeIdCollectionStage<ESM::Dialogue>(mState, &CSMWorld::Data::getTopics));
+    appendStage(new MergeIdCollectionStage<ESM::Dialogue>(mState, &CSMWorld::Data::getJournals));
+    appendStage(new MergeIdCollectionStage<CSMWorld::Cell>(mState, &CSMWorld::Data::getCells));
+    appendStage(new MergeIdCollectionStage<ESM::Filter>(mState, &CSMWorld::Data::getFilters));
+    appendStage(new MergeIdCollectionStage<ESM::Enchantment>(mState, &CSMWorld::Data::getEnchantments));
+    appendStage(new MergeIdCollectionStage<ESM::BodyPart>(mState, &CSMWorld::Data::getBodyParts));
+    appendStage(new MergeIdCollectionStage<ESM::DebugProfile>(mState, &CSMWorld::Data::getDebugProfiles));
+    appendStage(new MergeIdCollectionStage<ESM::SoundGenerator>(mState, &CSMWorld::Data::getSoundGens));
+    appendStage(new MergeIdCollectionStage<ESM::MagicEffect>(mState, &CSMWorld::Data::getMagicEffects));
+    appendStage(new MergeIdCollectionStage<ESM::StartScript>(mState, &CSMWorld::Data::getStartScripts));
+    appendStage(new MergeIdCollectionStage<CSMWorld::Pathgrid, CSMWorld::SubCellCollection<CSMWorld::Pathgrid>>(
+        mState, &CSMWorld::Data::getPathgrids));
+    appendStage(
+        new MergeIdCollectionStage<CSMWorld::Info, CSMWorld::InfoCollection>(mState, &CSMWorld::Data::getTopicInfos));
+    appendStage(
+        new MergeIdCollectionStage<CSMWorld::Info, CSMWorld::InfoCollection>(mState, &CSMWorld::Data::getJournalInfos));
+    appendStage(new MergeRefIdsStage(mState));
+    appendStage(new MergeReferencesStage(mState));
+    appendStage(new MergeReferencesStage(mState));
+    appendStage(new PopulateLandTexturesMergeStage(mState));
+    appendStage(new MergeLandStage(mState));
+    appendStage(new FixLandsAndLandTexturesMergeStage(mState));
+    appendStage(new CleanupLandTexturesMergeStage(mState));
+
+    appendStage(new FinishMergedDocumentStage(mState, encoding));
 }
 
-void CSMTools::MergeOperation::setTarget (std::unique_ptr<CSMDoc::Document> document)
+void CSMTools::MergeOperation::setTarget(std::unique_ptr<CSMDoc::Document> document)
 {
     mState.mTarget = std::move(document);
 }
@@ -56,5 +60,5 @@ void CSMTools::MergeOperation::operationDone()
     CSMDoc::Operation::operationDone();
 
     if (mState.mCompleted)
-        emit mergeDone (mState.mTarget.release());
+        emit mergeDone(mState.mTarget.release());
 }
diff --git a/apps/opencs/model/tools/mergeoperation.hpp b/apps/opencs/model/tools/mergeoperation.hpp
index 427967190c..be06de47fa 100644
--- a/apps/opencs/model/tools/mergeoperation.hpp
+++ b/apps/opencs/model/tools/mergeoperation.hpp
@@ -18,27 +18,25 @@ namespace CSMTools
 {
     class MergeOperation : public CSMDoc::Operation
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            MergeState mState;
+        MergeState mState;
 
-        public:
+    public:
+        MergeOperation(CSMDoc::Document& document, ToUTF8::FromType encoding);
 
-            MergeOperation (CSMDoc::Document& document, ToUTF8::FromType encoding);
+        /// \attention Do not call this function while a merge is running.
+        void setTarget(std::unique_ptr<CSMDoc::Document> document);
 
-            /// \attention Do not call this function while a merge is running.
-            void setTarget (std::unique_ptr<CSMDoc::Document> document);
+    protected slots:
 
-        protected slots:
+        void operationDone() override;
 
-            void operationDone() override;
-
-        signals:
-
-            /// \attention When this signal is emitted, *this hands over the ownership of the
-            /// document. This signal must be handled to avoid a leak.
-            void mergeDone (CSMDoc::Document *document);
+    signals:
 
+        /// \attention When this signal is emitted, *this hands over the ownership of the
+        /// document. This signal must be handled to avoid a leak.
+        void mergeDone(CSMDoc::Document* document);
     };
 }
 
diff --git a/apps/opencs/model/tools/mergestages.cpp b/apps/opencs/model/tools/mergestages.cpp
index 09a0db4078..ce52ab9608 100644
--- a/apps/opencs/model/tools/mergestages.cpp
+++ b/apps/opencs/model/tools/mergestages.cpp
@@ -9,33 +9,34 @@
 #include "../world/data.hpp"
 #include "../world/idtable.hpp"
 
-
-CSMTools::StartMergeStage::StartMergeStage (MergeState& state)
-: mState (state)
-{}
+CSMTools::StartMergeStage::StartMergeStage(MergeState& state)
+    : mState(state)
+{
+}
 
 int CSMTools::StartMergeStage::setup()
 {
     return 1;
 }
 
-void CSMTools::StartMergeStage::perform (int stage, CSMDoc::Messages& messages)
+void CSMTools::StartMergeStage::perform(int stage, CSMDoc::Messages& messages)
 {
     mState.mCompleted = false;
     mState.mTextureIndices.clear();
 }
 
-
-CSMTools::FinishMergedDocumentStage::FinishMergedDocumentStage (MergeState& state, ToUTF8::FromType encoding)
-: mState (state), mEncoder (encoding)
-{}
+CSMTools::FinishMergedDocumentStage::FinishMergedDocumentStage(MergeState& state, ToUTF8::FromType encoding)
+    : mState(state)
+    , mEncoder(encoding)
+{
+}
 
 int CSMTools::FinishMergedDocumentStage::setup()
 {
     return 1;
 }
 
-void CSMTools::FinishMergedDocumentStage::perform (int stage, CSMDoc::Messages& messages)
+void CSMTools::FinishMergedDocumentStage::perform(int stage, CSMDoc::Messages& messages)
 {
     // We know that the content file list contains at least two entries and that the first one
     // does exist on disc (otherwise it would have been impossible to initiate a merge on that
@@ -43,41 +44,42 @@ void CSMTools::FinishMergedDocumentStage::perform (int stage, CSMDoc::Messages&
     std::filesystem::path path = mState.mSource.getContentFiles()[0];
 
     ESM::ESMReader reader;
-    reader.setEncoder (&mEncoder);
-    reader.open (path);
+    reader.setEncoder(&mEncoder);
+    reader.open(path);
 
     CSMWorld::MetaData source;
     source.mId = "sys::meta";
-    source.load (reader);
+    source.load(reader);
 
     CSMWorld::MetaData target = mState.mTarget->getData().getMetaData();
 
     target.mAuthor = source.mAuthor;
     target.mDescription = source.mDescription;
 
-    mState.mTarget->getData().setMetaData (target);
+    mState.mTarget->getData().setMetaData(target);
 
     mState.mCompleted = true;
 }
 
-
-CSMTools::MergeRefIdsStage::MergeRefIdsStage (MergeState& state) : mState (state) {}
+CSMTools::MergeRefIdsStage::MergeRefIdsStage(MergeState& state)
+    : mState(state)
+{
+}
 
 int CSMTools::MergeRefIdsStage::setup()
 {
     return mState.mSource.getData().getReferenceables().getSize();
 }
 
-void CSMTools::MergeRefIdsStage::perform (int stage, CSMDoc::Messages& messages)
+void CSMTools::MergeRefIdsStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    mState.mSource.getData().getReferenceables().copyTo (
-        stage, mState.mTarget->getData().getReferenceables());
+    mState.mSource.getData().getReferenceables().copyTo(stage, mState.mTarget->getData().getReferenceables());
 }
 
-
-CSMTools::MergeReferencesStage::MergeReferencesStage (MergeState& state)
-: mState (state)
-{}
+CSMTools::MergeReferencesStage::MergeReferencesStage(MergeState& state)
+    : mState(state)
+{
+}
 
 int CSMTools::MergeReferencesStage::setup()
 {
@@ -85,10 +87,9 @@ int CSMTools::MergeReferencesStage::setup()
     return mState.mSource.getData().getReferences().getSize();
 }
 
-void CSMTools::MergeReferencesStage::perform (int stage, CSMDoc::Messages& messages)
+void CSMTools::MergeReferencesStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    const CSMWorld::Record<CSMWorld::CellRef>& record =
-        mState.mSource.getData().getReferences().getRecord (stage);
+    const CSMWorld::Record<CSMWorld::CellRef>& record = mState.mSource.getData().getReferences().getRecord(stage);
 
     if (!record.isDeleted())
     {
@@ -96,19 +97,17 @@ void CSMTools::MergeReferencesStage::perform (int stage, CSMDoc::Messages& messa
 
         ref.mOriginalCell = ref.mCell;
 
-        ref.mRefNum.mIndex = mIndex[Misc::StringUtils::lowerCase (ref.mCell)]++;
+        ref.mRefNum.mIndex = mIndex[Misc::StringUtils::lowerCase(ref.mCell)]++;
         ref.mRefNum.mContentFile = 0;
         ref.mNew = false;
 
-        mState.mTarget->getData().getReferences().appendRecord (
-                std::make_unique<CSMWorld::Record<CSMWorld::CellRef> >(
-                    CSMWorld::Record<CSMWorld::CellRef>(CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &ref)));
+        mState.mTarget->getData().getReferences().appendRecord(std::make_unique<CSMWorld::Record<CSMWorld::CellRef>>(
+            CSMWorld::Record<CSMWorld::CellRef>(CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &ref)));
     }
 }
 
-
-CSMTools::PopulateLandTexturesMergeStage::PopulateLandTexturesMergeStage (MergeState& state)
-    : mState (state)
+CSMTools::PopulateLandTexturesMergeStage::PopulateLandTexturesMergeStage(MergeState& state)
+    : mState(state)
 {
 }
 
@@ -117,22 +116,20 @@ int CSMTools::PopulateLandTexturesMergeStage::setup()
     return mState.mSource.getData().getLandTextures().getSize();
 }
 
-void CSMTools::PopulateLandTexturesMergeStage::perform (int stage, CSMDoc::Messages& messages)
+void CSMTools::PopulateLandTexturesMergeStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    const CSMWorld::Record<CSMWorld::LandTexture>& record =
-        mState.mSource.getData().getLandTextures().getRecord (stage);
+    const CSMWorld::Record<CSMWorld::LandTexture>& record = mState.mSource.getData().getLandTextures().getRecord(stage);
 
     if (!record.isDeleted())
     {
         mState.mTarget->getData().getLandTextures().appendRecord(
-            std::make_unique<CSMWorld::Record<CSMWorld::LandTexture> >(
-                CSMWorld::Record<CSMWorld::LandTexture>(CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &record.get())));
+            std::make_unique<CSMWorld::Record<CSMWorld::LandTexture>>(CSMWorld::Record<CSMWorld::LandTexture>(
+                CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &record.get())));
     }
 }
 
-
-CSMTools::MergeLandStage::MergeLandStage (MergeState& state)
-    : mState (state)
+CSMTools::MergeLandStage::MergeLandStage(MergeState& state)
+    : mState(state)
 {
 }
 
@@ -141,22 +138,19 @@ int CSMTools::MergeLandStage::setup()
     return mState.mSource.getData().getLand().getSize();
 }
 
-void CSMTools::MergeLandStage::perform (int stage, CSMDoc::Messages& messages)
+void CSMTools::MergeLandStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    const CSMWorld::Record<CSMWorld::Land>& record =
-        mState.mSource.getData().getLand().getRecord (stage);
+    const CSMWorld::Record<CSMWorld::Land>& record = mState.mSource.getData().getLand().getRecord(stage);
 
     if (!record.isDeleted())
     {
-        mState.mTarget->getData().getLand().appendRecord (
-            std::make_unique<CSMWorld::Record<CSMWorld::Land> >(
-                CSMWorld::Record<CSMWorld::Land>(CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &record.get())));
+        mState.mTarget->getData().getLand().appendRecord(std::make_unique<CSMWorld::Record<CSMWorld::Land>>(
+            CSMWorld::Record<CSMWorld::Land>(CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &record.get())));
     }
 }
 
-
-CSMTools::FixLandsAndLandTexturesMergeStage::FixLandsAndLandTexturesMergeStage (MergeState& state)
-    : mState (state)
+CSMTools::FixLandsAndLandTexturesMergeStage::FixLandsAndLandTexturesMergeStage(MergeState& state)
+    : mState(state)
 {
 }
 
@@ -166,7 +160,7 @@ int CSMTools::FixLandsAndLandTexturesMergeStage::setup()
     return mState.mSource.getData().getLand().getSize();
 }
 
-void CSMTools::FixLandsAndLandTexturesMergeStage::perform (int stage, CSMDoc::Messages& messages)
+void CSMTools::FixLandsAndLandTexturesMergeStage::perform(int stage, CSMDoc::Messages& messages)
 {
     if (stage < mState.mTarget->getData().getLand().getSize())
     {
@@ -182,17 +176,16 @@ void CSMTools::FixLandsAndLandTexturesMergeStage::perform (int stage, CSMDoc::Me
         cmd.redo();
 
         // Get rid of base data
-        const CSMWorld::Record<CSMWorld::Land>& oldRecord =
-            mState.mTarget->getData().getLand().getRecord (stage);
+        const CSMWorld::Record<CSMWorld::Land>& oldRecord = mState.mTarget->getData().getLand().getRecord(stage);
 
-          mState.mTarget->getData().getLand().setRecord (stage,
-                std::make_unique<CSMWorld::Record<CSMWorld::Land> >(
-                    CSMWorld::Record<CSMWorld::Land>(CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &oldRecord.get())));
+        mState.mTarget->getData().getLand().setRecord(stage,
+            std::make_unique<CSMWorld::Record<CSMWorld::Land>>(
+                CSMWorld::Record<CSMWorld::Land>(CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &oldRecord.get())));
     }
 }
 
-CSMTools::CleanupLandTexturesMergeStage::CleanupLandTexturesMergeStage (MergeState& state)
-    : mState (state)
+CSMTools::CleanupLandTexturesMergeStage::CleanupLandTexturesMergeStage(MergeState& state)
+    : mState(state)
 {
 }
 
@@ -201,10 +194,10 @@ int CSMTools::CleanupLandTexturesMergeStage::setup()
     return 1;
 }
 
-void CSMTools::CleanupLandTexturesMergeStage::perform (int stage, CSMDoc::Messages& messages)
+void CSMTools::CleanupLandTexturesMergeStage::perform(int stage, CSMDoc::Messages& messages)
 {
     auto& landTextures = mState.mTarget->getData().getLandTextures();
-    for (int i = 0; i < landTextures.getSize(); )
+    for (int i = 0; i < landTextures.getSize();)
     {
         if (!landTextures.getRecord(i).isModified())
             landTextures.removeRows(i, 1);
diff --git a/apps/opencs/model/tools/mergestages.hpp b/apps/opencs/model/tools/mergestages.hpp
index 778bea7c68..13a9de2bfe 100644
--- a/apps/opencs/model/tools/mergestages.hpp
+++ b/apps/opencs/model/tools/mergestages.hpp
@@ -17,170 +17,164 @@ namespace CSMTools
 {
     class StartMergeStage : public CSMDoc::Stage
     {
-            MergeState& mState;
+        MergeState& mState;
 
-        public:
+    public:
+        StartMergeStage(MergeState& state);
 
-            StartMergeStage (MergeState& state);
+        int setup() override;
+        ///< \return number of steps
 
-            int setup() override;
-            ///< \return number of steps
-
-            void perform (int stage, CSMDoc::Messages& messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 
     class FinishMergedDocumentStage : public CSMDoc::Stage
     {
-            MergeState& mState;
-            ToUTF8::Utf8Encoder mEncoder;
-
-        public:
+        MergeState& mState;
+        ToUTF8::Utf8Encoder mEncoder;
 
-            FinishMergedDocumentStage (MergeState& state, ToUTF8::FromType encoding);
+    public:
+        FinishMergedDocumentStage(MergeState& state, ToUTF8::FromType encoding);
 
-            int setup() override;
-            ///< \return number of steps
+        int setup() override;
+        ///< \return number of steps
 
-            void perform (int stage, CSMDoc::Messages& messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 
-    template<typename RecordType, typename Collection = CSMWorld::IdCollection<RecordType> >
+    template <typename RecordType, typename Collection = CSMWorld::IdCollection<RecordType>>
     class MergeIdCollectionStage : public CSMDoc::Stage
     {
-            MergeState& mState;
-            Collection& (CSMWorld::Data::*mAccessor)();
-
-        public:
+        MergeState& mState;
+        Collection& (CSMWorld::Data::*mAccessor)();
 
-            MergeIdCollectionStage (MergeState& state, Collection& (CSMWorld::Data::*accessor)());
+    public:
+        MergeIdCollectionStage(MergeState& state, Collection& (CSMWorld::Data::*accessor)());
 
-            int setup() override;
-            ///< \return number of steps
+        int setup() override;
+        ///< \return number of steps
 
-            void perform (int stage, CSMDoc::Messages& messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 
-    template<typename RecordType, typename Collection>
-    MergeIdCollectionStage<RecordType, Collection>::MergeIdCollectionStage (MergeState& state, Collection& (CSMWorld::Data::*accessor)())
-    : mState (state), mAccessor (accessor)
-    {}
+    template <typename RecordType, typename Collection>
+    MergeIdCollectionStage<RecordType, Collection>::MergeIdCollectionStage(
+        MergeState& state, Collection& (CSMWorld::Data::*accessor)())
+        : mState(state)
+        , mAccessor(accessor)
+    {
+    }
 
-    template<typename RecordType, typename Collection>
+    template <typename RecordType, typename Collection>
     int MergeIdCollectionStage<RecordType, Collection>::setup()
     {
         return (mState.mSource.getData().*mAccessor)().getSize();
     }
 
-    template<typename RecordType, typename Collection>
-    void MergeIdCollectionStage<RecordType, Collection>::perform (int stage, CSMDoc::Messages& messages)
+    template <typename RecordType, typename Collection>
+    void MergeIdCollectionStage<RecordType, Collection>::perform(int stage, CSMDoc::Messages& messages)
     {
         const Collection& source = (mState.mSource.getData().*mAccessor)();
         Collection& target = (mState.mTarget->getData().*mAccessor)();
 
-        const CSMWorld::Record<RecordType>& record = source.getRecord (stage);
+        const CSMWorld::Record<RecordType>& record = source.getRecord(stage);
 
         if (!record.isDeleted())
-            target.appendRecord (std::make_unique<CSMWorld::Record<RecordType> >(
-                    CSMWorld::Record<RecordType>(CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &record.get())));
+            target.appendRecord(std::make_unique<CSMWorld::Record<RecordType>>(
+                CSMWorld::Record<RecordType>(CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &record.get())));
     }
 
     class MergeRefIdsStage : public CSMDoc::Stage
     {
-            MergeState& mState;
-
-        public:
+        MergeState& mState;
 
-            MergeRefIdsStage (MergeState& state);
+    public:
+        MergeRefIdsStage(MergeState& state);
 
-            int setup() override;
-            ///< \return number of steps
+        int setup() override;
+        ///< \return number of steps
 
-            void perform (int stage, CSMDoc::Messages& messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 
     class MergeReferencesStage : public CSMDoc::Stage
     {
-            MergeState& mState;
-            std::map<std::string, int> mIndex;
+        MergeState& mState;
+        std::map<std::string, int> mIndex;
 
-        public:
+    public:
+        MergeReferencesStage(MergeState& state);
 
-            MergeReferencesStage (MergeState& state);
+        int setup() override;
+        ///< \return number of steps
 
-            int setup() override;
-            ///< \return number of steps
-
-            void perform (int stage, CSMDoc::Messages& messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 
     /// Adds all land texture records that could potentially be referenced when merging
     class PopulateLandTexturesMergeStage : public CSMDoc::Stage
     {
-            MergeState& mState;
-
-        public:
+        MergeState& mState;
 
-            PopulateLandTexturesMergeStage (MergeState& state);
+    public:
+        PopulateLandTexturesMergeStage(MergeState& state);
 
-            int setup() override;
-            ///< \return number of steps
+        int setup() override;
+        ///< \return number of steps
 
-            void perform (int stage, CSMDoc::Messages& messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 
     class MergeLandStage : public CSMDoc::Stage
     {
-            MergeState& mState;
-
-        public:
+        MergeState& mState;
 
-            MergeLandStage (MergeState& state);
+    public:
+        MergeLandStage(MergeState& state);
 
-            int setup() override;
-            ///< \return number of steps
+        int setup() override;
+        ///< \return number of steps
 
-            void perform (int stage, CSMDoc::Messages& messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 
     /// During this stage, the complex process of combining LandTextures from
     /// potentially multiple plugins is undertaken.
     class FixLandsAndLandTexturesMergeStage : public CSMDoc::Stage
     {
-            MergeState& mState;
+        MergeState& mState;
 
-        public:
+    public:
+        FixLandsAndLandTexturesMergeStage(MergeState& state);
 
-            FixLandsAndLandTexturesMergeStage (MergeState& state);
+        int setup() override;
+        ///< \return number of steps
 
-            int setup() override;
-            ///< \return number of steps
-
-            void perform (int stage, CSMDoc::Messages& messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 
     /// Removes base LandTexture records. This gets rid of the base records previously
     /// needed in FixLandsAndLandTexturesMergeStage.
     class CleanupLandTexturesMergeStage : public CSMDoc::Stage
     {
-            MergeState& mState;
-
-        public:
+        MergeState& mState;
 
-            CleanupLandTexturesMergeStage (MergeState& state);
+    public:
+        CleanupLandTexturesMergeStage(MergeState& state);
 
-            int setup() override;
-            ///< \return number of steps
+        int setup() override;
+        ///< \return number of steps
 
-            void perform (int stage, CSMDoc::Messages& messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 }
 
diff --git a/apps/opencs/model/tools/mergestate.hpp b/apps/opencs/model/tools/mergestate.hpp
index a100d7a2e0..9174854be0 100644
--- a/apps/opencs/model/tools/mergestate.hpp
+++ b/apps/opencs/model/tools/mergestate.hpp
@@ -3,8 +3,8 @@
 
 #include <cstdint>
 
-#include <memory>
 #include <map>
+#include <memory>
 
 #include "../doc/document.hpp"
 
@@ -17,7 +17,11 @@ namespace CSMTools
         bool mCompleted;
         std::map<std::pair<uint16_t, int>, int> mTextureIndices; // (texture, content file) -> new texture
 
-        MergeState (CSMDoc::Document& source) : mSource (source), mCompleted (false) {}
+        MergeState(CSMDoc::Document& source)
+            : mSource(source)
+            , mCompleted(false)
+        {
+        }
     };
 }
 
diff --git a/apps/opencs/model/tools/pathgridcheck.cpp b/apps/opencs/model/tools/pathgridcheck.cpp
index febb79c641..fa5af03d21 100644
--- a/apps/opencs/model/tools/pathgridcheck.cpp
+++ b/apps/opencs/model/tools/pathgridcheck.cpp
@@ -1,17 +1,17 @@
 #include "pathgridcheck.hpp"
 
-#include <sstream>
 #include <algorithm>
+#include <sstream>
 
 #include "../prefs/state.hpp"
 
-#include "../world/universalid.hpp"
 #include "../world/idcollection.hpp"
-#include "../world/subcellcollection.hpp"
 #include "../world/pathgrid.hpp"
+#include "../world/subcellcollection.hpp"
+#include "../world/universalid.hpp"
 
-CSMTools::PathgridCheckStage::PathgridCheckStage (const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids)
-: mPathgrids (pathgrids)
+CSMTools::PathgridCheckStage::PathgridCheckStage(const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids)
+    : mPathgrids(pathgrids)
 {
     mIgnoreBaseRecords = false;
 }
@@ -23,9 +23,9 @@ int CSMTools::PathgridCheckStage::setup()
     return mPathgrids.getSize();
 }
 
-void CSMTools::PathgridCheckStage::perform (int stage, CSMDoc::Messages& messages)
+void CSMTools::PathgridCheckStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    const CSMWorld::Record<CSMWorld::Pathgrid>& record = mPathgrids.getRecord (stage);
+    const CSMWorld::Record<CSMWorld::Pathgrid>& record = mPathgrids.getRecord(stage);
 
     // Skip "Base" records (setting!) and "Deleted" records
     if ((mIgnoreBaseRecords && record.mState == CSMWorld::RecordBase::State_BaseOnly) || record.isDeleted())
@@ -33,13 +33,13 @@ void CSMTools::PathgridCheckStage::perform (int stage, CSMDoc::Messages& message
 
     const CSMWorld::Pathgrid& pathgrid = record.get();
 
-    CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Pathgrid, pathgrid.mId);
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Pathgrid, pathgrid.mId);
 
     // check the number of pathgrid points
     if (pathgrid.mData.mS2 < static_cast<int>(pathgrid.mPoints.size()))
-        messages.add (id, "Less points than expected", "", CSMDoc::Message::Severity_Error);
+        messages.add(id, "Less points than expected", "", CSMDoc::Message::Severity_Error);
     else if (pathgrid.mData.mS2 > static_cast<int>(pathgrid.mPoints.size()))
-        messages.add (id, "More points than expected", "", CSMDoc::Message::Severity_Error);
+        messages.add(id, "More points than expected", "", CSMDoc::Message::Severity_Error);
 
     std::vector<CSMTools::Point> pointList(pathgrid.mPoints.size());
     std::vector<int> duplList;
@@ -56,8 +56,9 @@ void CSMTools::PathgridCheckStage::perform (int stage, CSMDoc::Messages& message
                 if (pointList[pathgrid.mEdges[i].mV0].mOtherIndex[j] == pathgrid.mEdges[i].mV1)
                 {
                     std::ostringstream ss;
-                    ss << "Duplicate edge between points #" << pathgrid.mEdges[i].mV0 << " and #" << pathgrid.mEdges[i].mV1;
-                    messages.add (id, ss.str(), "", CSMDoc::Message::Severity_Error);
+                    ss << "Duplicate edge between points #" << pathgrid.mEdges[i].mV0 << " and #"
+                       << pathgrid.mEdges[i].mV1;
+                    messages.add(id, ss.str(), "", CSMDoc::Message::Severity_Error);
                     break;
                 }
             }
@@ -70,7 +71,7 @@ void CSMTools::PathgridCheckStage::perform (int stage, CSMDoc::Messages& message
         {
             std::ostringstream ss;
             ss << "An edge is connected to a non-existent point #" << pathgrid.mEdges[i].mV0;
-            messages.add (id, ss.str(), "", CSMDoc::Message::Severity_Error);
+            messages.add(id, ss.str(), "", CSMDoc::Message::Severity_Error);
         }
     }
 
@@ -93,7 +94,7 @@ void CSMTools::PathgridCheckStage::perform (int stage, CSMDoc::Messages& message
             {
                 std::ostringstream ss;
                 ss << "Missing edge between points #" << i << " and #" << pointList[i].mOtherIndex[j];
-                messages.add (id, ss.str(), "", CSMDoc::Message::Severity_Error);
+                messages.add(id, ss.str(), "", CSMDoc::Message::Severity_Error);
             }
         }
 
@@ -101,17 +102,16 @@ void CSMTools::PathgridCheckStage::perform (int stage, CSMDoc::Messages& message
         // FIXME: how to do this efficiently?
         for (unsigned int j = 0; j != i; ++j)
         {
-            if (pathgrid.mPoints[i].mX == pathgrid.mPoints[j].mX &&
-                pathgrid.mPoints[i].mY == pathgrid.mPoints[j].mY &&
-                pathgrid.mPoints[i].mZ == pathgrid.mPoints[j].mZ)
+            if (pathgrid.mPoints[i].mX == pathgrid.mPoints[j].mX && pathgrid.mPoints[i].mY == pathgrid.mPoints[j].mY
+                && pathgrid.mPoints[i].mZ == pathgrid.mPoints[j].mZ)
             {
                 std::vector<int>::const_iterator it = find(duplList.begin(), duplList.end(), static_cast<int>(i));
                 if (it == duplList.end())
                 {
                     std::ostringstream ss;
-                    ss << "Point #" << i << " duplicates point #" << j
-                    << " (" << pathgrid.mPoints[i].mX << ", " << pathgrid.mPoints[i].mY << ", " << pathgrid.mPoints[i].mZ << ")";
-                    messages.add (id, ss.str(), "", CSMDoc::Message::Severity_Warning);
+                    ss << "Point #" << i << " duplicates point #" << j << " (" << pathgrid.mPoints[i].mX << ", "
+                       << pathgrid.mPoints[i].mY << ", " << pathgrid.mPoints[i].mZ << ")";
+                    messages.add(id, ss.str(), "", CSMDoc::Message::Severity_Warning);
 
                     duplList.push_back(i);
                     break;
@@ -126,11 +126,9 @@ void CSMTools::PathgridCheckStage::perform (int stage, CSMDoc::Messages& message
         if (pointList[i].mConnectionNum == 0)
         {
             std::ostringstream ss;
-            ss << "Point #" << i << " ("
-            << pathgrid.mPoints[i].mX << ", "
-            << pathgrid.mPoints[i].mY << ", "
-            << pathgrid.mPoints[i].mZ << ") is disconnected from other points";
-            messages.add (id, ss.str(), "", CSMDoc::Message::Severity_Warning);
+            ss << "Point #" << i << " (" << pathgrid.mPoints[i].mX << ", " << pathgrid.mPoints[i].mY << ", "
+               << pathgrid.mPoints[i].mZ << ") is disconnected from other points";
+            messages.add(id, ss.str(), "", CSMDoc::Message::Severity_Warning);
         }
     }
 
diff --git a/apps/opencs/model/tools/pathgridcheck.hpp b/apps/opencs/model/tools/pathgridcheck.hpp
index 212637fd42..f7b280fe5b 100644
--- a/apps/opencs/model/tools/pathgridcheck.hpp
+++ b/apps/opencs/model/tools/pathgridcheck.hpp
@@ -8,7 +8,7 @@
 namespace CSMWorld
 {
     struct Pathgrid;
-    template<typename T, typename AT>
+    template <typename T, typename AT>
     class SubCellCollection;
 }
 
@@ -18,23 +18,25 @@ namespace CSMTools
     {
         unsigned char mConnectionNum;
         std::vector<int> mOtherIndex;
-        Point() : mConnectionNum(0), mOtherIndex(0) {}
+        Point()
+            : mConnectionNum(0)
+            , mOtherIndex(0)
+        {
+        }
     };
 
     class PathgridCheckStage : public CSMDoc::Stage
     {
-        const CSMWorld::SubCellCollection<CSMWorld::Pathgrid,
-              CSMWorld::IdAccessor<CSMWorld::Pathgrid> >& mPathgrids;
+        const CSMWorld::SubCellCollection<CSMWorld::Pathgrid, CSMWorld::IdAccessor<CSMWorld::Pathgrid>>& mPathgrids;
         bool mIgnoreBaseRecords;
 
     public:
-
-        PathgridCheckStage (const CSMWorld::SubCellCollection<CSMWorld::Pathgrid,
-            CSMWorld::IdAccessor<CSMWorld::Pathgrid> >& pathgrids);
+        PathgridCheckStage(
+            const CSMWorld::SubCellCollection<CSMWorld::Pathgrid, CSMWorld::IdAccessor<CSMWorld::Pathgrid>>& pathgrids);
 
         int setup() override;
 
-        void perform (int stage, CSMDoc::Messages& messages) override;
+        void perform(int stage, CSMDoc::Messages& messages) override;
     };
 }
 
diff --git a/apps/opencs/model/tools/racecheck.cpp b/apps/opencs/model/tools/racecheck.cpp
index 6585a31ccb..5fceeaa2e4 100644
--- a/apps/opencs/model/tools/racecheck.cpp
+++ b/apps/opencs/model/tools/racecheck.cpp
@@ -4,9 +4,9 @@
 
 #include "../world/universalid.hpp"
 
-void CSMTools::RaceCheckStage::performPerRecord (int stage, CSMDoc::Messages& messages)
+void CSMTools::RaceCheckStage::performPerRecord(int stage, CSMDoc::Messages& messages)
 {
-    const CSMWorld::Record<ESM::Race>& record = mRaces.getRecord (stage);
+    const CSMWorld::Record<ESM::Race>& record = mRaces.getRecord(stage);
 
     if (record.isDeleted())
         return;
@@ -21,42 +21,44 @@ void CSMTools::RaceCheckStage::performPerRecord (int stage, CSMDoc::Messages& me
     if (mIgnoreBaseRecords && record.mState == CSMWorld::RecordBase::State_BaseOnly)
         return;
 
-    CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Race, race.mId);
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Race, race.mId);
 
     // test for empty name and description
     if (race.mName.empty())
-        messages.add(id, "Name is missing", "", (race.mData.mFlags & 0x1) ? CSMDoc::Message::Severity_Error : CSMDoc::Message::Severity_Warning);
+        messages.add(id, "Name is missing", "",
+            (race.mData.mFlags & 0x1) ? CSMDoc::Message::Severity_Error : CSMDoc::Message::Severity_Warning);
 
     if (race.mDescription.empty())
         messages.add(id, "Description is missing", "", CSMDoc::Message::Severity_Warning);
 
     // test for positive height
-    if (race.mData.mHeight.mMale<=0)
+    if (race.mData.mHeight.mMale <= 0)
         messages.add(id, "Male height is non-positive", "", CSMDoc::Message::Severity_Error);
 
-    if (race.mData.mHeight.mFemale<=0)
+    if (race.mData.mHeight.mFemale <= 0)
         messages.add(id, "Female height is non-positive", "", CSMDoc::Message::Severity_Error);
 
     // test for non-negative weight
-    if (race.mData.mWeight.mMale<0)
+    if (race.mData.mWeight.mMale < 0)
         messages.add(id, "Male weight is negative", "", CSMDoc::Message::Severity_Error);
 
-    if (race.mData.mWeight.mFemale<0)
+    if (race.mData.mWeight.mFemale < 0)
         messages.add(id, "Female weight is negative", "", CSMDoc::Message::Severity_Error);
 
     /// \todo check data members that can't be edited in the table view
 }
 
-void CSMTools::RaceCheckStage::performFinal (CSMDoc::Messages& messages)
+void CSMTools::RaceCheckStage::performFinal(CSMDoc::Messages& messages)
 {
-    CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Races);
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Races);
 
     if (!mPlayable)
         messages.add(id, "No playable race", "", CSMDoc::Message::Severity_SeriousError);
 }
 
-CSMTools::RaceCheckStage::RaceCheckStage (const CSMWorld::IdCollection<ESM::Race>& races)
-: mRaces (races), mPlayable (false)
+CSMTools::RaceCheckStage::RaceCheckStage(const CSMWorld::IdCollection<ESM::Race>& races)
+    : mRaces(races)
+    , mPlayable(false)
 {
     mIgnoreBaseRecords = false;
 }
@@ -66,13 +68,13 @@ int CSMTools::RaceCheckStage::setup()
     mPlayable = false;
     mIgnoreBaseRecords = CSMPrefs::get()["Reports"]["ignore-base-records"].isTrue();
 
-    return mRaces.getSize()+1;
+    return mRaces.getSize() + 1;
 }
 
-void CSMTools::RaceCheckStage::perform (int stage, CSMDoc::Messages& messages)
+void CSMTools::RaceCheckStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    if (stage==mRaces.getSize())
-        performFinal (messages);
+    if (stage == mRaces.getSize())
+        performFinal(messages);
     else
-        performPerRecord (stage, messages);
+        performPerRecord(stage, messages);
 }
diff --git a/apps/opencs/model/tools/racecheck.hpp b/apps/opencs/model/tools/racecheck.hpp
index fe08f4bb67..e80f7c12d5 100644
--- a/apps/opencs/model/tools/racecheck.hpp
+++ b/apps/opencs/model/tools/racecheck.hpp
@@ -12,23 +12,22 @@ namespace CSMTools
     /// \brief VerifyStage: make sure that race records are internally consistent
     class RaceCheckStage : public CSMDoc::Stage
     {
-            const CSMWorld::IdCollection<ESM::Race>& mRaces;
-            bool mPlayable;
-            bool mIgnoreBaseRecords;
+        const CSMWorld::IdCollection<ESM::Race>& mRaces;
+        bool mPlayable;
+        bool mIgnoreBaseRecords;
 
-            void performPerRecord (int stage, CSMDoc::Messages& messages);
+        void performPerRecord(int stage, CSMDoc::Messages& messages);
 
-            void performFinal (CSMDoc::Messages& messages);
+        void performFinal(CSMDoc::Messages& messages);
 
-        public:
+    public:
+        RaceCheckStage(const CSMWorld::IdCollection<ESM::Race>& races);
 
-            RaceCheckStage (const CSMWorld::IdCollection<ESM::Race>& races);
+        int setup() override;
+        ///< \return number of steps
 
-            int setup() override;
-            ///< \return number of steps
-
-            void perform (int stage, CSMDoc::Messages& messages) override;
-            ///< Messages resulting from this tage will be appended to \a messages.
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
 
diff --git a/apps/opencs/model/tools/referenceablecheck.cpp b/apps/opencs/model/tools/referenceablecheck.cpp
index 3816d1a0a4..d95357bc5a 100644
--- a/apps/opencs/model/tools/referenceablecheck.cpp
+++ b/apps/opencs/model/tools/referenceablecheck.cpp
@@ -1,37 +1,34 @@
 #include "referenceablecheck.hpp"
 
-#include <components/misc/strings/algorithm.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/misc/strings/algorithm.hpp>
 
 #include "../prefs/state.hpp"
 
 #include "../world/record.hpp"
 #include "../world/universalid.hpp"
 
-CSMTools::ReferenceableCheckStage::ReferenceableCheckStage(
-    const CSMWorld::RefIdData& referenceable, const CSMWorld::IdCollection<ESM::Race >& races,
-    const CSMWorld::IdCollection<ESM::Class>& classes,
-    const CSMWorld::IdCollection<ESM::Faction>& faction,
-    const CSMWorld::IdCollection<ESM::Script>& scripts,
-    const CSMWorld::Resources& models,
-    const CSMWorld::Resources& icons,
+CSMTools::ReferenceableCheckStage::ReferenceableCheckStage(const CSMWorld::RefIdData& referenceable,
+    const CSMWorld::IdCollection<ESM::Race>& races, const CSMWorld::IdCollection<ESM::Class>& classes,
+    const CSMWorld::IdCollection<ESM::Faction>& faction, const CSMWorld::IdCollection<ESM::Script>& scripts,
+    const CSMWorld::Resources& models, const CSMWorld::Resources& icons,
     const CSMWorld::IdCollection<ESM::BodyPart>& bodyparts)
-   :mReferencables(referenceable),
-    mRaces(races),
-    mClasses(classes),
-    mFactions(faction),
-    mScripts(scripts),
-    mModels(models),
-    mIcons(icons),
-    mBodyParts(bodyparts),
-    mPlayerPresent(false)
+    : mReferencables(referenceable)
+    , mRaces(races)
+    , mClasses(classes)
+    , mFactions(faction)
+    , mScripts(scripts)
+    , mModels(models)
+    , mIcons(icons)
+    , mBodyParts(bodyparts)
+    , mPlayerPresent(false)
 {
     mIgnoreBaseRecords = false;
 }
 
-void CSMTools::ReferenceableCheckStage::perform (int stage, CSMDoc::Messages& messages)
+void CSMTools::ReferenceableCheckStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    //Checks for books, than, when stage is above mBooksSize goes to other checks, with (stage - PrevSum) as stage.
+    // Checks for books, than, when stage is above mBooksSize goes to other checks, with (stage - PrevSum) as stage.
     const int bookSize(mReferencables.getBooks().getSize());
 
     if (stage < bookSize)
@@ -229,7 +226,7 @@ void CSMTools::ReferenceableCheckStage::perform (int stage, CSMDoc::Messages& me
         creatureCheck(stage, mReferencables.getCreatures(), messages);
         return;
     }
-// if we come that far, we are about to perform our last, final check.
+    // if we come that far, we are about to perform our last, final check.
     finalCheck(messages);
     return;
 }
@@ -243,9 +240,7 @@ int CSMTools::ReferenceableCheckStage::setup()
 }
 
 void CSMTools::ReferenceableCheckStage::bookCheck(
-    int stage,
-    const CSMWorld::RefIdDataContainer< ESM::Book >& records,
-    CSMDoc::Messages& messages)
+    int stage, const CSMWorld::RefIdDataContainer<ESM::Book>& records, CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -253,7 +248,7 @@ void CSMTools::ReferenceableCheckStage::bookCheck(
     if ((mIgnoreBaseRecords && baseRecord.mState == CSMWorld::RecordBase::State_BaseOnly) || baseRecord.isDeleted())
         return;
 
-    const ESM::Book& book = (dynamic_cast<const CSMWorld::Record<ESM::Book>& >(baseRecord)).get();
+    const ESM::Book& book = (dynamic_cast<const CSMWorld::Record<ESM::Book>&>(baseRecord)).get();
     CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Book, book.mId);
 
     inventoryItemCheck<ESM::Book>(book, messages, id.toString(), true);
@@ -263,9 +258,7 @@ void CSMTools::ReferenceableCheckStage::bookCheck(
 }
 
 void CSMTools::ReferenceableCheckStage::activatorCheck(
-    int stage,
-    const CSMWorld::RefIdDataContainer< ESM::Activator >& records,
-    CSMDoc::Messages& messages)
+    int stage, const CSMWorld::RefIdDataContainer<ESM::Activator>& records, CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -273,7 +266,7 @@ void CSMTools::ReferenceableCheckStage::activatorCheck(
     if ((mIgnoreBaseRecords && baseRecord.mState == CSMWorld::RecordBase::State_BaseOnly) || baseRecord.isDeleted())
         return;
 
-    const ESM::Activator& activator = (dynamic_cast<const CSMWorld::Record<ESM::Activator>& >(baseRecord)).get();
+    const ESM::Activator& activator = (dynamic_cast<const CSMWorld::Record<ESM::Activator>&>(baseRecord)).get();
     CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Activator, activator.mId);
 
     if (activator.mModel.empty())
@@ -286,9 +279,7 @@ void CSMTools::ReferenceableCheckStage::activatorCheck(
 }
 
 void CSMTools::ReferenceableCheckStage::potionCheck(
-    int stage,
-    const CSMWorld::RefIdDataContainer< ESM::Potion >& records,
-    CSMDoc::Messages& messages)
+    int stage, const CSMWorld::RefIdDataContainer<ESM::Potion>& records, CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -296,7 +287,7 @@ void CSMTools::ReferenceableCheckStage::potionCheck(
     if ((mIgnoreBaseRecords && baseRecord.mState == CSMWorld::RecordBase::State_BaseOnly) || baseRecord.isDeleted())
         return;
 
-    const ESM::Potion& potion = (dynamic_cast<const CSMWorld::Record<ESM::Potion>& >(baseRecord)).get();
+    const ESM::Potion& potion = (dynamic_cast<const CSMWorld::Record<ESM::Potion>&>(baseRecord)).get();
     CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Potion, potion.mId);
 
     inventoryItemCheck<ESM::Potion>(potion, messages, id.toString());
@@ -306,11 +297,8 @@ void CSMTools::ReferenceableCheckStage::potionCheck(
     scriptCheck<ESM::Potion>(potion, messages, id.toString());
 }
 
-
 void CSMTools::ReferenceableCheckStage::apparatusCheck(
-    int stage,
-    const CSMWorld::RefIdDataContainer< ESM::Apparatus >& records,
-    CSMDoc::Messages& messages)
+    int stage, const CSMWorld::RefIdDataContainer<ESM::Apparatus>& records, CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -318,7 +306,7 @@ void CSMTools::ReferenceableCheckStage::apparatusCheck(
     if ((mIgnoreBaseRecords && baseRecord.mState == CSMWorld::RecordBase::State_BaseOnly) || baseRecord.isDeleted())
         return;
 
-    const ESM::Apparatus& apparatus = (dynamic_cast<const CSMWorld::Record<ESM::Apparatus>& >(baseRecord)).get();
+    const ESM::Apparatus& apparatus = (dynamic_cast<const CSMWorld::Record<ESM::Apparatus>&>(baseRecord)).get();
     CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Apparatus, apparatus.mId);
 
     inventoryItemCheck<ESM::Apparatus>(apparatus, messages, id.toString());
@@ -330,9 +318,7 @@ void CSMTools::ReferenceableCheckStage::apparatusCheck(
 }
 
 void CSMTools::ReferenceableCheckStage::armorCheck(
-    int stage,
-    const CSMWorld::RefIdDataContainer< ESM::Armor >& records,
-    CSMDoc::Messages& messages)
+    int stage, const CSMWorld::RefIdDataContainer<ESM::Armor>& records, CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -340,7 +326,7 @@ void CSMTools::ReferenceableCheckStage::armorCheck(
     if ((mIgnoreBaseRecords && baseRecord.mState == CSMWorld::RecordBase::State_BaseOnly) || baseRecord.isDeleted())
         return;
 
-    const ESM::Armor& armor = (dynamic_cast<const CSMWorld::Record<ESM::Armor>& >(baseRecord)).get();
+    const ESM::Armor& armor = (dynamic_cast<const CSMWorld::Record<ESM::Armor>&>(baseRecord)).get();
     CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Armor, armor.mId);
 
     inventoryItemCheck<ESM::Armor>(armor, messages, id.toString(), true);
@@ -358,9 +344,7 @@ void CSMTools::ReferenceableCheckStage::armorCheck(
 }
 
 void CSMTools::ReferenceableCheckStage::clothingCheck(
-    int stage,
-    const CSMWorld::RefIdDataContainer< ESM::Clothing >& records,
-    CSMDoc::Messages& messages)
+    int stage, const CSMWorld::RefIdDataContainer<ESM::Clothing>& records, CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -368,7 +352,7 @@ void CSMTools::ReferenceableCheckStage::clothingCheck(
     if ((mIgnoreBaseRecords && baseRecord.mState == CSMWorld::RecordBase::State_BaseOnly) || baseRecord.isDeleted())
         return;
 
-    const ESM::Clothing& clothing = (dynamic_cast<const CSMWorld::Record<ESM::Clothing>& >(baseRecord)).get();
+    const ESM::Clothing& clothing = (dynamic_cast<const CSMWorld::Record<ESM::Clothing>&>(baseRecord)).get();
     CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Clothing, clothing.mId);
     inventoryItemCheck<ESM::Clothing>(clothing, messages, id.toString(), true);
 
@@ -377,9 +361,7 @@ void CSMTools::ReferenceableCheckStage::clothingCheck(
 }
 
 void CSMTools::ReferenceableCheckStage::containerCheck(
-    int stage,
-    const CSMWorld::RefIdDataContainer< ESM::Container >& records,
-    CSMDoc::Messages& messages)
+    int stage, const CSMWorld::RefIdDataContainer<ESM::Container>& records, CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -387,33 +369,32 @@ void CSMTools::ReferenceableCheckStage::containerCheck(
     if ((mIgnoreBaseRecords && baseRecord.mState == CSMWorld::RecordBase::State_BaseOnly) || baseRecord.isDeleted())
         return;
 
-    const ESM::Container& container = (dynamic_cast<const CSMWorld::Record<ESM::Container>& >(baseRecord)).get();
+    const ESM::Container& container = (dynamic_cast<const CSMWorld::Record<ESM::Container>&>(baseRecord)).get();
     CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Container, container.mId);
 
-    //checking for name
+    // checking for name
     if (container.mName.empty())
         messages.add(id, "Name is missing", "", CSMDoc::Message::Severity_Error);
 
-    //Checking for model
+    // Checking for model
     if (container.mModel.empty())
         messages.add(id, "Model is missing", "", CSMDoc::Message::Severity_Error);
     else if (mModels.searchId(container.mModel) == -1)
         messages.add(id, "Model '" + container.mModel + "' does not exist", "", CSMDoc::Message::Severity_Error);
 
-    //Checking for capacity (weight)
-    if (container.mWeight < 0) //0 is allowed
+    // Checking for capacity (weight)
+    if (container.mWeight < 0) // 0 is allowed
         messages.add(id, "Capacity is negative", "", CSMDoc::Message::Severity_Error);
-    
-    //checking contained items
+
+    // checking contained items
     inventoryListCheck(container.mInventory.mList, messages, id.toString());
 
     // Check that mentioned scripts exist
     scriptCheck<ESM::Container>(container, messages, id.toString());
 }
 
-void CSMTools::ReferenceableCheckStage::creatureCheck (
-    int stage, const CSMWorld::RefIdDataContainer< ESM::Creature >& records,
-    CSMDoc::Messages& messages)
+void CSMTools::ReferenceableCheckStage::creatureCheck(
+    int stage, const CSMWorld::RefIdDataContainer<ESM::Creature>& records, CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -432,7 +413,7 @@ void CSMTools::ReferenceableCheckStage::creatureCheck (
     else if (mModels.searchId(creature.mModel) == -1)
         messages.add(id, "Model '" + creature.mModel + "' does not exist", "", CSMDoc::Message::Severity_Error);
 
-    //stats checks
+    // stats checks
     if (creature.mData.mLevel <= 0)
         messages.add(id, "Level is non-positive", "", CSMDoc::Message::Severity_Warning);
 
@@ -480,9 +461,13 @@ void CSMTools::ReferenceableCheckStage::creatureCheck (
     for (int i = 0; i < 6; ++i)
     {
         if (creature.mData.mAttack[i] < 0)
-            messages.add(id, "Attack " + std::to_string(i/2 + 1) + " has negative" + (i % 2 == 0 ? " minimum " : " maximum ") + "damage", "", CSMDoc::Message::Severity_Error);
-        if (i % 2 == 0 && creature.mData.mAttack[i] > creature.mData.mAttack[i+1])
-            messages.add(id, "Attack " + std::to_string(i/2 + 1) + " has minimum damage higher than maximum damage", "", CSMDoc::Message::Severity_Error);
+            messages.add(id,
+                "Attack " + std::to_string(i / 2 + 1) + " has negative" + (i % 2 == 0 ? " minimum " : " maximum ")
+                    + "damage",
+                "", CSMDoc::Message::Severity_Error);
+        if (i % 2 == 0 && creature.mData.mAttack[i] > creature.mData.mAttack[i + 1])
+            messages.add(id, "Attack " + std::to_string(i / 2 + 1) + " has minimum damage higher than maximum damage",
+                "", CSMDoc::Message::Severity_Error);
     }
 
     if (creature.mData.mGold < 0)
@@ -495,22 +480,22 @@ void CSMTools::ReferenceableCheckStage::creatureCheck (
     {
         CSMWorld::RefIdData::LocalIndex index = mReferencables.searchId(creature.mOriginal);
         if (index.first == -1)
-            messages.add(id, "Parent creature '" + creature.mOriginal + "' does not exist", "", CSMDoc::Message::Severity_Error);
+            messages.add(
+                id, "Parent creature '" + creature.mOriginal + "' does not exist", "", CSMDoc::Message::Severity_Error);
         else if (index.second != CSMWorld::UniversalId::Type_Creature)
             messages.add(id, "'" + creature.mOriginal + "' is not a creature", "", CSMDoc::Message::Severity_Error);
     }
 
     // Check inventory
     inventoryListCheck(creature.mInventory.mList, messages, id.toString());
- 
+
     // Check that mentioned scripts exist
     scriptCheck<ESM::Creature>(creature, messages, id.toString());
     /// \todo Check spells, teleport table, AI data and AI packages for validity
 }
 
 void CSMTools::ReferenceableCheckStage::doorCheck(
-    int stage, const CSMWorld::RefIdDataContainer< ESM::Door >& records,
-    CSMDoc::Messages& messages)
+    int stage, const CSMWorld::RefIdDataContainer<ESM::Door>& records, CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -521,7 +506,7 @@ void CSMTools::ReferenceableCheckStage::doorCheck(
     const ESM::Door& door = (dynamic_cast<const CSMWorld::Record<ESM::Door>&>(baseRecord)).get();
     CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Door, door.mId);
 
-    //usual, name or model
+    // usual, name or model
     if (door.mName.empty())
         messages.add(id, "Name is missing", "", CSMDoc::Message::Severity_Error);
 
@@ -535,9 +520,7 @@ void CSMTools::ReferenceableCheckStage::doorCheck(
 }
 
 void CSMTools::ReferenceableCheckStage::ingredientCheck(
-    int stage,
-    const CSMWorld::RefIdDataContainer< ESM::Ingredient >& records,
-    CSMDoc::Messages& messages)
+    int stage, const CSMWorld::RefIdDataContainer<ESM::Ingredient>& records, CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -545,7 +528,7 @@ void CSMTools::ReferenceableCheckStage::ingredientCheck(
     if ((mIgnoreBaseRecords && baseRecord.mState == CSMWorld::RecordBase::State_BaseOnly) || baseRecord.isDeleted())
         return;
 
-    const ESM::Ingredient& ingredient = (dynamic_cast<const CSMWorld::Record<ESM::Ingredient>& >(baseRecord)).get();
+    const ESM::Ingredient& ingredient = (dynamic_cast<const CSMWorld::Record<ESM::Ingredient>&>(baseRecord)).get();
     CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Ingredient, ingredient.mId);
 
     inventoryItemCheck<ESM::Ingredient>(ingredient, messages, id.toString());
@@ -555,9 +538,7 @@ void CSMTools::ReferenceableCheckStage::ingredientCheck(
 }
 
 void CSMTools::ReferenceableCheckStage::creaturesLevListCheck(
-    int stage,
-    const CSMWorld::RefIdDataContainer< ESM::CreatureLevList >& records,
-    CSMDoc::Messages& messages)
+    int stage, const CSMWorld::RefIdDataContainer<ESM::CreatureLevList>& records, CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -565,16 +546,16 @@ void CSMTools::ReferenceableCheckStage::creaturesLevListCheck(
     if ((mIgnoreBaseRecords && baseRecord.mState == CSMWorld::RecordBase::State_BaseOnly) || baseRecord.isDeleted())
         return;
 
-    const ESM::CreatureLevList& CreatureLevList = (dynamic_cast<const CSMWorld::Record<ESM::CreatureLevList>& >(baseRecord)).get();
-    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_CreatureLevelledList, CreatureLevList.mId); //CreatureLevList but Type_CreatureLevelledList :/
+    const ESM::CreatureLevList& CreatureLevList
+        = (dynamic_cast<const CSMWorld::Record<ESM::CreatureLevList>&>(baseRecord)).get();
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_CreatureLevelledList,
+        CreatureLevList.mId); // CreatureLevList but Type_CreatureLevelledList :/
 
     listCheck<ESM::CreatureLevList>(CreatureLevList, messages, id.toString());
 }
 
 void CSMTools::ReferenceableCheckStage::itemLevelledListCheck(
-    int stage,
-    const CSMWorld::RefIdDataContainer< ESM::ItemLevList >& records,
-    CSMDoc::Messages& messages)
+    int stage, const CSMWorld::RefIdDataContainer<ESM::ItemLevList>& records, CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -582,15 +563,14 @@ void CSMTools::ReferenceableCheckStage::itemLevelledListCheck(
     if ((mIgnoreBaseRecords && baseRecord.mState == CSMWorld::RecordBase::State_BaseOnly) || baseRecord.isDeleted())
         return;
 
-    const ESM::ItemLevList& ItemLevList = (dynamic_cast<const CSMWorld::Record<ESM::ItemLevList>& >(baseRecord)).get();
+    const ESM::ItemLevList& ItemLevList = (dynamic_cast<const CSMWorld::Record<ESM::ItemLevList>&>(baseRecord)).get();
     CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_ItemLevelledList, ItemLevList.mId);
 
     listCheck<ESM::ItemLevList>(ItemLevList, messages, id.toString());
 }
 
 void CSMTools::ReferenceableCheckStage::lightCheck(
-    int stage, const CSMWorld::RefIdDataContainer< ESM::Light >& records,
-    CSMDoc::Messages& messages)
+    int stage, const CSMWorld::RefIdDataContainer<ESM::Light>& records, CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -598,7 +578,7 @@ void CSMTools::ReferenceableCheckStage::lightCheck(
     if ((mIgnoreBaseRecords && baseRecord.mState == CSMWorld::RecordBase::State_BaseOnly) || baseRecord.isDeleted())
         return;
 
-    const ESM::Light& light = (dynamic_cast<const CSMWorld::Record<ESM::Light>& >(baseRecord)).get();
+    const ESM::Light& light = (dynamic_cast<const CSMWorld::Record<ESM::Light>&>(baseRecord)).get();
     CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Light, light.mId);
 
     if (light.mData.mRadius < 0)
@@ -612,9 +592,7 @@ void CSMTools::ReferenceableCheckStage::lightCheck(
 }
 
 void CSMTools::ReferenceableCheckStage::lockpickCheck(
-    int stage,
-    const CSMWorld::RefIdDataContainer< ESM::Lockpick >& records,
-    CSMDoc::Messages& messages)
+    int stage, const CSMWorld::RefIdDataContainer<ESM::Lockpick>& records, CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -622,7 +600,7 @@ void CSMTools::ReferenceableCheckStage::lockpickCheck(
     if ((mIgnoreBaseRecords && baseRecord.mState == CSMWorld::RecordBase::State_BaseOnly) || baseRecord.isDeleted())
         return;
 
-    const ESM::Lockpick& lockpick = (dynamic_cast<const CSMWorld::Record<ESM::Lockpick>& >(baseRecord)).get();
+    const ESM::Lockpick& lockpick = (dynamic_cast<const CSMWorld::Record<ESM::Lockpick>&>(baseRecord)).get();
     CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Lockpick, lockpick.mId);
 
     inventoryItemCheck<ESM::Lockpick>(lockpick, messages, id.toString());
@@ -634,9 +612,7 @@ void CSMTools::ReferenceableCheckStage::lockpickCheck(
 }
 
 void CSMTools::ReferenceableCheckStage::miscCheck(
-    int stage,
-    const CSMWorld::RefIdDataContainer< ESM::Miscellaneous >& records,
-    CSMDoc::Messages& messages)
+    int stage, const CSMWorld::RefIdDataContainer<ESM::Miscellaneous>& records, CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -644,7 +620,8 @@ void CSMTools::ReferenceableCheckStage::miscCheck(
     if ((mIgnoreBaseRecords && baseRecord.mState == CSMWorld::RecordBase::State_BaseOnly) || baseRecord.isDeleted())
         return;
 
-    const ESM::Miscellaneous& miscellaneous = (dynamic_cast<const CSMWorld::Record<ESM::Miscellaneous>& >(baseRecord)).get();
+    const ESM::Miscellaneous& miscellaneous
+        = (dynamic_cast<const CSMWorld::Record<ESM::Miscellaneous>&>(baseRecord)).get();
     CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Miscellaneous, miscellaneous.mId);
 
     inventoryItemCheck<ESM::Miscellaneous>(miscellaneous, messages, id.toString());
@@ -653,20 +630,19 @@ void CSMTools::ReferenceableCheckStage::miscCheck(
     scriptCheck<ESM::Miscellaneous>(miscellaneous, messages, id.toString());
 }
 
-void CSMTools::ReferenceableCheckStage::npcCheck (
-    int stage, const CSMWorld::RefIdDataContainer< ESM::NPC >& records,
-    CSMDoc::Messages& messages)
+void CSMTools::ReferenceableCheckStage::npcCheck(
+    int stage, const CSMWorld::RefIdDataContainer<ESM::NPC>& records, CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
     if (baseRecord.isDeleted())
         return;
 
-    const ESM::NPC& npc = (dynamic_cast<const CSMWorld::Record<ESM::NPC>& >(baseRecord)).get();
-    CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Npc, npc.mId);
+    const ESM::NPC& npc = (dynamic_cast<const CSMWorld::Record<ESM::NPC>&>(baseRecord)).get();
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Npc, npc.mId);
 
-    //Detect if player is present
-    if (Misc::StringUtils::ciEqual(npc.mId, "player")) //Happy now, scrawl?
+    // Detect if player is present
+    if (Misc::StringUtils::ciEqual(npc.mId, "player")) // Happy now, scrawl?
         mPlayerPresent = true;
 
     // Skip "Base" records (setting!)
@@ -676,11 +652,12 @@ void CSMTools::ReferenceableCheckStage::npcCheck (
     short level(npc.mNpdt.mLevel);
     int gold(npc.mNpdt.mGold);
 
-    if (npc.mNpdtType == ESM::NPC::NPC_WITH_AUTOCALCULATED_STATS) //12 = autocalculated
+    if (npc.mNpdtType == ESM::NPC::NPC_WITH_AUTOCALCULATED_STATS) // 12 = autocalculated
     {
-        if ((npc.mFlags & ESM::NPC::Autocalc) == 0) //0x0010 = autocalculated flag
+        if ((npc.mFlags & ESM::NPC::Autocalc) == 0) // 0x0010 = autocalculated flag
         {
-            messages.add(id, "NPC with autocalculated stats doesn't have autocalc flag turned on", "", CSMDoc::Message::Severity_Error); //should not happen?
+            messages.add(id, "NPC with autocalculated stats doesn't have autocalc flag turned on", "",
+                CSMDoc::Message::Severity_Error); // should not happen?
             return;
         }
     }
@@ -722,12 +699,12 @@ void CSMTools::ReferenceableCheckStage::npcCheck (
 
     if (npc.mClass.empty())
         messages.add(id, "Class is missing", "", CSMDoc::Message::Severity_Error);
-    else if (mClasses.searchId (npc.mClass) == -1)
+    else if (mClasses.searchId(npc.mClass) == -1)
         messages.add(id, "Class '" + npc.mClass + "' does not exist", "", CSMDoc::Message::Severity_Error);
 
     if (npc.mRace.empty())
         messages.add(id, "Race is missing", "", CSMDoc::Message::Severity_Error);
-    else if (mRaces.searchId (npc.mRace) == -1)
+    else if (mRaces.searchId(npc.mRace) == -1)
         messages.add(id, "Race '" + npc.mRace + "' does not exist", "", CSMDoc::Message::Severity_Error);
 
     if (!npc.mFaction.empty() && mFactions.searchId(npc.mFaction) == -1)
@@ -753,60 +730,43 @@ void CSMTools::ReferenceableCheckStage::npcCheck (
 
     // Check inventory
     inventoryListCheck(npc.mInventory.mList, messages, id.toString());
- 
+
     // Check that mentioned scripts exist
     scriptCheck<ESM::NPC>(npc, messages, id.toString());
 }
 
 void CSMTools::ReferenceableCheckStage::weaponCheck(
-    int stage, const CSMWorld::RefIdDataContainer< ESM::Weapon >& records,
-    CSMDoc::Messages& messages)
+    int stage, const CSMWorld::RefIdDataContainer<ESM::Weapon>& records, CSMDoc::Messages& messages)
 {
-    const CSMWorld::RecordBase& baseRecord = records.getRecord (stage);
+    const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
     // Skip "Base" records (setting!) and "Deleted" records
     if ((mIgnoreBaseRecords && baseRecord.mState == CSMWorld::RecordBase::State_BaseOnly) || baseRecord.isDeleted())
         return;
 
-    const ESM::Weapon& weapon = (dynamic_cast<const CSMWorld::Record<ESM::Weapon>& >(baseRecord)).get();
-    CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Weapon, weapon.mId);
-
-    //TODO, It seems that this stuff for spellcasting is obligatory and In fact We should check if records are present
-    if
-    (   //THOSE ARE HARDCODED!
-        !(weapon.mId == "VFX_Hands" ||
-          weapon.mId == "VFX_Absorb" ||
-          weapon.mId == "VFX_Reflect" ||
-          weapon.mId == "VFX_DefaultBolt" ||
-          //TODO I don't know how to get full list of effects :/
-          //DANGER!, ACHTUNG! FIXME! The following is the list of the magical bolts, valid for Morrowind.esm. However those are not hardcoded.
-          weapon.mId == "magic_bolt" ||
-          weapon.mId == "shock_bolt" ||
-          weapon.mId == "shield_bolt" ||
-          weapon.mId == "VFX_DestructBolt" ||
-          weapon.mId == "VFX_PoisonBolt" ||
-          weapon.mId == "VFX_RestoreBolt" ||
-          weapon.mId == "VFX_AlterationBolt" ||
-          weapon.mId == "VFX_ConjureBolt" ||
-          weapon.mId == "VFX_FrostBolt" ||
-          weapon.mId == "VFX_MysticismBolt" ||
-          weapon.mId == "VFX_IllusionBolt" ||
-          weapon.mId == "VFX_Multiple2" ||
-          weapon.mId == "VFX_Multiple3" ||
-          weapon.mId == "VFX_Multiple4" ||
-          weapon.mId == "VFX_Multiple5" ||
-          weapon.mId == "VFX_Multiple6" ||
-          weapon.mId == "VFX_Multiple7" ||
-          weapon.mId == "VFX_Multiple8" ||
-          weapon.mId == "VFX_Multiple9"))
+    const ESM::Weapon& weapon = (dynamic_cast<const CSMWorld::Record<ESM::Weapon>&>(baseRecord)).get();
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Weapon, weapon.mId);
+
+    // TODO, It seems that this stuff for spellcasting is obligatory and In fact We should check if records are present
+    if ( // THOSE ARE HARDCODED!
+        !(weapon.mId == "VFX_Hands" || weapon.mId == "VFX_Absorb" || weapon.mId == "VFX_Reflect"
+            || weapon.mId == "VFX_DefaultBolt" ||
+            // TODO I don't know how to get full list of effects :/
+            // DANGER!, ACHTUNG! FIXME! The following is the list of the magical bolts, valid for Morrowind.esm. However
+            // those are not hardcoded.
+            weapon.mId == "magic_bolt" || weapon.mId == "shock_bolt" || weapon.mId == "shield_bolt"
+            || weapon.mId == "VFX_DestructBolt" || weapon.mId == "VFX_PoisonBolt" || weapon.mId == "VFX_RestoreBolt"
+            || weapon.mId == "VFX_AlterationBolt" || weapon.mId == "VFX_ConjureBolt" || weapon.mId == "VFX_FrostBolt"
+            || weapon.mId == "VFX_MysticismBolt" || weapon.mId == "VFX_IllusionBolt" || weapon.mId == "VFX_Multiple2"
+            || weapon.mId == "VFX_Multiple3" || weapon.mId == "VFX_Multiple4" || weapon.mId == "VFX_Multiple5"
+            || weapon.mId == "VFX_Multiple6" || weapon.mId == "VFX_Multiple7" || weapon.mId == "VFX_Multiple8"
+            || weapon.mId == "VFX_Multiple9"))
     {
         inventoryItemCheck<ESM::Weapon>(weapon, messages, id.toString(), true);
 
-        if (!(weapon.mData.mType == ESM::Weapon::MarksmanBow ||
-                weapon.mData.mType == ESM::Weapon::MarksmanCrossbow ||
-                weapon.mData.mType == ESM::Weapon::MarksmanThrown ||
-                weapon.mData.mType == ESM::Weapon::Arrow ||
-                weapon.mData.mType == ESM::Weapon::Bolt))
+        if (!(weapon.mData.mType == ESM::Weapon::MarksmanBow || weapon.mData.mType == ESM::Weapon::MarksmanCrossbow
+                || weapon.mData.mType == ESM::Weapon::MarksmanThrown || weapon.mData.mType == ESM::Weapon::Arrow
+                || weapon.mData.mType == ESM::Weapon::Bolt))
         {
             if (weapon.mData.mSlash[0] > weapon.mData.mSlash[1])
                 messages.add(id, "Minimum slash damage higher than maximum", "", CSMDoc::Message::Severity_Warning);
@@ -818,11 +778,10 @@ void CSMTools::ReferenceableCheckStage::weaponCheck(
         if (weapon.mData.mChop[0] > weapon.mData.mChop[1])
             messages.add(id, "Minimum chop damage higher than maximum", "", CSMDoc::Message::Severity_Warning);
 
-        if (!(weapon.mData.mType == ESM::Weapon::Arrow ||
-                weapon.mData.mType == ESM::Weapon::Bolt ||
-                weapon.mData.mType == ESM::Weapon::MarksmanThrown))
+        if (!(weapon.mData.mType == ESM::Weapon::Arrow || weapon.mData.mType == ESM::Weapon::Bolt
+                || weapon.mData.mType == ESM::Weapon::MarksmanThrown))
         {
-            //checking of health
+            // checking of health
             if (weapon.mData.mHealth == 0)
                 messages.add(id, "Durability is equal to zero", "", CSMDoc::Message::Severity_Warning);
 
@@ -836,9 +795,7 @@ void CSMTools::ReferenceableCheckStage::weaponCheck(
 }
 
 void CSMTools::ReferenceableCheckStage::probeCheck(
-    int stage,
-    const CSMWorld::RefIdDataContainer< ESM::Probe >& records,
-    CSMDoc::Messages& messages)
+    int stage, const CSMWorld::RefIdDataContainer<ESM::Probe>& records, CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -846,7 +803,7 @@ void CSMTools::ReferenceableCheckStage::probeCheck(
     if ((mIgnoreBaseRecords && baseRecord.mState == CSMWorld::RecordBase::State_BaseOnly) || baseRecord.isDeleted())
         return;
 
-    const ESM::Probe& probe = (dynamic_cast<const CSMWorld::Record<ESM::Probe>& >(baseRecord)).get();
+    const ESM::Probe& probe = (dynamic_cast<const CSMWorld::Record<ESM::Probe>&>(baseRecord)).get();
     CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Probe, probe.mId);
 
     inventoryItemCheck<ESM::Probe>(probe, messages, id.toString());
@@ -856,38 +813,36 @@ void CSMTools::ReferenceableCheckStage::probeCheck(
     scriptCheck<ESM::Probe>(probe, messages, id.toString());
 }
 
-void CSMTools::ReferenceableCheckStage::repairCheck (
-    int stage, const CSMWorld::RefIdDataContainer< ESM::Repair >& records,
-    CSMDoc::Messages& messages)
+void CSMTools::ReferenceableCheckStage::repairCheck(
+    int stage, const CSMWorld::RefIdDataContainer<ESM::Repair>& records, CSMDoc::Messages& messages)
 {
-    const CSMWorld::RecordBase& baseRecord = records.getRecord (stage);
+    const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
     // Skip "Base" records (setting!) and "Deleted" records
     if ((mIgnoreBaseRecords && baseRecord.mState == CSMWorld::RecordBase::State_BaseOnly) || baseRecord.isDeleted())
         return;
 
-    const ESM::Repair& repair = (dynamic_cast<const CSMWorld::Record<ESM::Repair>& >(baseRecord)).get();
-    CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Repair, repair.mId);
+    const ESM::Repair& repair = (dynamic_cast<const CSMWorld::Record<ESM::Repair>&>(baseRecord)).get();
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Repair, repair.mId);
 
-    inventoryItemCheck<ESM::Repair> (repair, messages, id.toString());
-    toolCheck<ESM::Repair> (repair, messages, id.toString(), true);
+    inventoryItemCheck<ESM::Repair>(repair, messages, id.toString());
+    toolCheck<ESM::Repair>(repair, messages, id.toString(), true);
 
     // Check that mentioned scripts exist
     scriptCheck<ESM::Repair>(repair, messages, id.toString());
 }
 
-void CSMTools::ReferenceableCheckStage::staticCheck (
-    int stage, const CSMWorld::RefIdDataContainer< ESM::Static >& records,
-    CSMDoc::Messages& messages)
+void CSMTools::ReferenceableCheckStage::staticCheck(
+    int stage, const CSMWorld::RefIdDataContainer<ESM::Static>& records, CSMDoc::Messages& messages)
 {
-    const CSMWorld::RecordBase& baseRecord = records.getRecord (stage);
+    const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
     // Skip "Base" records (setting!) and "Deleted" records
     if ((mIgnoreBaseRecords && baseRecord.mState == CSMWorld::RecordBase::State_BaseOnly) || baseRecord.isDeleted())
         return;
 
-    const ESM::Static& staticElement = (dynamic_cast<const CSMWorld::Record<ESM::Static>& >(baseRecord)).get();
-    CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Static, staticElement.mId);
+    const ESM::Static& staticElement = (dynamic_cast<const CSMWorld::Record<ESM::Static>&>(baseRecord)).get();
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Static, staticElement.mId);
 
     if (staticElement.mModel.empty())
         messages.add(id, "Model is missing", "", CSMDoc::Message::Severity_Error);
@@ -895,18 +850,17 @@ void CSMTools::ReferenceableCheckStage::staticCheck (
         messages.add(id, "Model '" + staticElement.mModel + "' does not exist", "", CSMDoc::Message::Severity_Error);
 }
 
-//final check
+// final check
 
-void CSMTools::ReferenceableCheckStage::finalCheck (CSMDoc::Messages& messages)
+void CSMTools::ReferenceableCheckStage::finalCheck(CSMDoc::Messages& messages)
 {
     if (!mPlayerPresent)
-        messages.add(CSMWorld::UniversalId::Type_Referenceables, "Player record is missing", "", CSMDoc::Message::Severity_SeriousError);
+        messages.add(CSMWorld::UniversalId::Type_Referenceables, "Player record is missing", "",
+            CSMDoc::Message::Severity_SeriousError);
 }
 
 void CSMTools::ReferenceableCheckStage::inventoryListCheck(
-    const std::vector<ESM::ContItem>& itemList, 
-    CSMDoc::Messages& messages, 
-    const std::string& id)
+    const std::vector<ESM::ContItem>& itemList, CSMDoc::Messages& messages, const std::string& id)
 {
     for (size_t i = 0; i < itemList.size(); ++i)
     {
@@ -920,50 +874,51 @@ void CSMTools::ReferenceableCheckStage::inventoryListCheck(
             // Needs to accommodate containers, creatures, and NPCs
             switch (localIndex.second)
             {
-            case CSMWorld::UniversalId::Type_Potion:
-            case CSMWorld::UniversalId::Type_Apparatus:
-            case CSMWorld::UniversalId::Type_Armor:
-            case CSMWorld::UniversalId::Type_Book:
-            case CSMWorld::UniversalId::Type_Clothing:
-            case CSMWorld::UniversalId::Type_Ingredient:
-            case CSMWorld::UniversalId::Type_Light:
-            case CSMWorld::UniversalId::Type_Lockpick:
-            case CSMWorld::UniversalId::Type_Miscellaneous:
-            case CSMWorld::UniversalId::Type_Probe:
-            case CSMWorld::UniversalId::Type_Repair:
-            case CSMWorld::UniversalId::Type_Weapon:
-            case CSMWorld::UniversalId::Type_ItemLevelledList:
-                break;
-            default:
-                messages.add(id, "'" + itemName + "' is not an item", "", CSMDoc::Message::Severity_Error);
+                case CSMWorld::UniversalId::Type_Potion:
+                case CSMWorld::UniversalId::Type_Apparatus:
+                case CSMWorld::UniversalId::Type_Armor:
+                case CSMWorld::UniversalId::Type_Book:
+                case CSMWorld::UniversalId::Type_Clothing:
+                case CSMWorld::UniversalId::Type_Ingredient:
+                case CSMWorld::UniversalId::Type_Light:
+                case CSMWorld::UniversalId::Type_Lockpick:
+                case CSMWorld::UniversalId::Type_Miscellaneous:
+                case CSMWorld::UniversalId::Type_Probe:
+                case CSMWorld::UniversalId::Type_Repair:
+                case CSMWorld::UniversalId::Type_Weapon:
+                case CSMWorld::UniversalId::Type_ItemLevelledList:
+                    break;
+                default:
+                    messages.add(id, "'" + itemName + "' is not an item", "", CSMDoc::Message::Severity_Error);
             }
         }
     }
 }
 
-//Templates begins here
+// Templates begins here
 
-template<typename Item> void CSMTools::ReferenceableCheckStage::inventoryItemCheck (
+template <typename Item>
+void CSMTools::ReferenceableCheckStage::inventoryItemCheck(
     const Item& someItem, CSMDoc::Messages& messages, const std::string& someID, bool enchantable)
 {
     if (someItem.mName.empty())
         messages.add(someID, "Name is missing", "", CSMDoc::Message::Severity_Error);
 
-    //Checking for weight
+    // Checking for weight
     if (someItem.mData.mWeight < 0)
         messages.add(someID, "Weight is negative", "", CSMDoc::Message::Severity_Error);
 
-    //Checking for value
+    // Checking for value
     if (someItem.mData.mValue < 0)
         messages.add(someID, "Value is negative", "", CSMDoc::Message::Severity_Error);
 
-    //checking for model
+    // checking for model
     if (someItem.mModel.empty())
         messages.add(someID, "Model is missing", "", CSMDoc::Message::Severity_Error);
     else if (mModels.searchId(someItem.mModel) == -1)
         messages.add(someID, "Model '" + someItem.mModel + "' does not exist", "", CSMDoc::Message::Severity_Error);
 
-    //checking for icon
+    // checking for icon
     if (someItem.mIcon.empty())
         messages.add(someID, "Icon is missing", "", CSMDoc::Message::Severity_Error);
     else if (mIcons.searchId(someItem.mIcon) == -1)
@@ -977,27 +932,28 @@ template<typename Item> void CSMTools::ReferenceableCheckStage::inventoryItemChe
         messages.add(someID, "Enchantment points number is negative", "", CSMDoc::Message::Severity_Error);
 }
 
-template<typename Item> void CSMTools::ReferenceableCheckStage::inventoryItemCheck (
+template <typename Item>
+void CSMTools::ReferenceableCheckStage::inventoryItemCheck(
     const Item& someItem, CSMDoc::Messages& messages, const std::string& someID)
 {
     if (someItem.mName.empty())
         messages.add(someID, "Name is missing", "", CSMDoc::Message::Severity_Error);
 
-    //Checking for weight
+    // Checking for weight
     if (someItem.mData.mWeight < 0)
         messages.add(someID, "Weight is negative", "", CSMDoc::Message::Severity_Error);
 
-    //Checking for value
+    // Checking for value
     if (someItem.mData.mValue < 0)
         messages.add(someID, "Value is negative", "", CSMDoc::Message::Severity_Error);
 
-    //checking for model
+    // checking for model
     if (someItem.mModel.empty())
         messages.add(someID, "Model is missing", "", CSMDoc::Message::Severity_Error);
     else if (mModels.searchId(someItem.mModel) == -1)
         messages.add(someID, "Model '" + someItem.mModel + "' does not exist", "", CSMDoc::Message::Severity_Error);
 
-    //checking for icon
+    // checking for icon
     if (someItem.mIcon.empty())
         messages.add(someID, "Icon is missing", "", CSMDoc::Message::Severity_Error);
     else if (mIcons.searchId(someItem.mIcon) == -1)
@@ -1008,47 +964,55 @@ template<typename Item> void CSMTools::ReferenceableCheckStage::inventoryItemChe
     }
 }
 
-template<typename Tool> void CSMTools::ReferenceableCheckStage::toolCheck (
+template <typename Tool>
+void CSMTools::ReferenceableCheckStage::toolCheck(
     const Tool& someTool, CSMDoc::Messages& messages, const std::string& someID, bool canBeBroken)
 {
     if (someTool.mData.mQuality <= 0)
         messages.add(someID, "Quality is non-positive", "", CSMDoc::Message::Severity_Error);
 
-    if (canBeBroken && someTool.mData.mUses<=0)
+    if (canBeBroken && someTool.mData.mUses <= 0)
         messages.add(someID, "Number of uses is non-positive", "", CSMDoc::Message::Severity_Error);
 }
 
-template<typename Tool> void CSMTools::ReferenceableCheckStage::toolCheck (
+template <typename Tool>
+void CSMTools::ReferenceableCheckStage::toolCheck(
     const Tool& someTool, CSMDoc::Messages& messages, const std::string& someID)
 {
     if (someTool.mData.mQuality <= 0)
         messages.add(someID, "Quality is non-positive", "", CSMDoc::Message::Severity_Error);
 }
 
-template<typename List> void CSMTools::ReferenceableCheckStage::listCheck (
+template <typename List>
+void CSMTools::ReferenceableCheckStage::listCheck(
     const List& someList, CSMDoc::Messages& messages, const std::string& someID)
 {
     if (someList.mChanceNone > 100)
     {
-        messages.add(someID, "Chance that no object is used is over 100 percent", "", CSMDoc::Message::Severity_Warning);
+        messages.add(
+            someID, "Chance that no object is used is over 100 percent", "", CSMDoc::Message::Severity_Warning);
     }
 
     for (unsigned i = 0; i < someList.mList.size(); ++i)
     {
         if (mReferencables.searchId(someList.mList[i].mId).first == -1)
-            messages.add(someID, "Object '" + someList.mList[i].mId + "' does not exist", "", CSMDoc::Message::Severity_Error);
+            messages.add(
+                someID, "Object '" + someList.mList[i].mId + "' does not exist", "", CSMDoc::Message::Severity_Error);
 
         if (someList.mList[i].mLevel < 1)
-            messages.add(someID, "Level of item '" + someList.mList[i].mId + "' is non-positive", "", CSMDoc::Message::Severity_Error);
+            messages.add(someID, "Level of item '" + someList.mList[i].mId + "' is non-positive", "",
+                CSMDoc::Message::Severity_Error);
     }
 }
 
-template<typename Tool> void CSMTools::ReferenceableCheckStage::scriptCheck (
+template <typename Tool>
+void CSMTools::ReferenceableCheckStage::scriptCheck(
     const Tool& someTool, CSMDoc::Messages& messages, const std::string& someID)
 {
     if (!someTool.mScript.empty())
     {
         if (mScripts.searchId(someTool.mScript) == -1)
-            messages.add(someID, "Script '" + someTool.mScript + "' does not exist", "", CSMDoc::Message::Severity_Error);
+            messages.add(
+                someID, "Script '" + someTool.mScript + "' does not exist", "", CSMDoc::Message::Severity_Error);
     }
 }
diff --git a/apps/opencs/model/tools/referenceablecheck.hpp b/apps/opencs/model/tools/referenceablecheck.hpp
index c927087721..2be0070648 100644
--- a/apps/opencs/model/tools/referenceablecheck.hpp
+++ b/apps/opencs/model/tools/referenceablecheck.hpp
@@ -3,97 +3,108 @@
 
 #include "../doc/stage.hpp"
 
+#include "../world/idcollection.hpp"
 #include "../world/refiddata.hpp"
 #include "../world/resources.hpp"
-#include "../world/idcollection.hpp"
 
-#include <components/esm3/loadfact.hpp>
+#include <components/esm3/loadbody.hpp>
 #include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadfact.hpp>
 #include <components/esm3/loadrace.hpp>
-#include <components/esm3/loadbody.hpp>
 #include <components/esm3/loadscpt.hpp>
 
 namespace CSMTools
 {
     class ReferenceableCheckStage : public CSMDoc::Stage
     {
-        public:
-
-            ReferenceableCheckStage (const CSMWorld::RefIdData& referenceable,
-                const CSMWorld::IdCollection<ESM::Race>& races,
-                const CSMWorld::IdCollection<ESM::Class>& classes,
-                const CSMWorld::IdCollection<ESM::Faction>& factions,
-                const CSMWorld::IdCollection<ESM::Script>& scripts,
-                const CSMWorld::Resources& models,
-                const CSMWorld::Resources& icons,
-                const CSMWorld::IdCollection<ESM::BodyPart>& bodyparts);
-
-            void perform(int stage, CSMDoc::Messages& messages) override;
-            int setup() override;
-
-        private:
-            //CONCRETE CHECKS
-            void bookCheck(int stage, const CSMWorld::RefIdDataContainer< ESM::Book >& records, CSMDoc::Messages& messages);
-            void activatorCheck(int stage, const CSMWorld::RefIdDataContainer< ESM::Activator >& records, CSMDoc::Messages& messages);
-            void potionCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Potion>& records, CSMDoc::Messages& messages);
-            void apparatusCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Apparatus>& records, CSMDoc::Messages& messages);
-            void armorCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Armor>& records, CSMDoc::Messages& messages);
-            void clothingCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Clothing>& records, CSMDoc::Messages& messages);
-            void containerCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Container>& records, CSMDoc::Messages& messages);
-            void creatureCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Creature>& records, CSMDoc::Messages& messages);
-            void doorCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Door>& records, CSMDoc::Messages& messages);
-            void ingredientCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Ingredient>& records, CSMDoc::Messages& messages);
-            void creaturesLevListCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::CreatureLevList>& records, CSMDoc::Messages& messages);
-            void itemLevelledListCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::ItemLevList>& records, CSMDoc::Messages& messages);
-            void lightCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Light>& records, CSMDoc::Messages& messages);
-            void lockpickCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Lockpick>& records, CSMDoc::Messages& messages);
-            void miscCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Miscellaneous>& records, CSMDoc::Messages& messages);
-            void npcCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::NPC>& records, CSMDoc::Messages& messages);
-            void weaponCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Weapon>& records, CSMDoc::Messages& messages);
-            void probeCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Probe>& records, CSMDoc::Messages& messages);
-            void repairCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Repair>& records, CSMDoc::Messages& messages);
-            void staticCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Static>& records, CSMDoc::Messages& messages);
-
-            //FINAL CHECK
-            void finalCheck (CSMDoc::Messages& messages);
-
-            //Convenience functions
-            void inventoryListCheck(const std::vector<ESM::ContItem>& itemList, CSMDoc::Messages& messages, const std::string& id);
-
-            /// for all enchantable items.
-            template <typename Item>
-            inline void inventoryItemCheck(const Item& someItem, CSMDoc::Messages& messages, const std::string& someID,
-                bool enchantable);
-
-            /// for non-enchantable items.
-            template <typename Item>
-            inline void inventoryItemCheck(const Item& someItem, CSMDoc::Messages& messages, const std::string& someID);
-
-            /// for tools with uses.
-            template <typename Tool>
-            inline void toolCheck(const Tool& someTool, CSMDoc::Messages& messages, const std::string& someID,
-                bool canbebroken);
-
-            /// for tools without uses.
-            template <typename Tool>
-            inline void toolCheck(const Tool& someTool, CSMDoc::Messages& messages, const std::string& someID);
-
-            template <typename List>
-            inline void listCheck(const List& someList, CSMDoc::Messages& messages, const std::string& someID);
-
-            template <typename Tool>
-            inline void scriptCheck(const Tool& someTool, CSMDoc::Messages& messages, const std::string& someID);
-
-            const CSMWorld::RefIdData& mReferencables;
-            const CSMWorld::IdCollection<ESM::Race>& mRaces;
-            const CSMWorld::IdCollection<ESM::Class>& mClasses;
-            const CSMWorld::IdCollection<ESM::Faction>& mFactions;
-            const CSMWorld::IdCollection<ESM::Script>& mScripts;
-            const CSMWorld::Resources& mModels;
-            const CSMWorld::Resources& mIcons;
-            const CSMWorld::IdCollection<ESM::BodyPart>& mBodyParts;
-            bool mPlayerPresent;
-            bool mIgnoreBaseRecords;
+    public:
+        ReferenceableCheckStage(const CSMWorld::RefIdData& referenceable,
+            const CSMWorld::IdCollection<ESM::Race>& races, const CSMWorld::IdCollection<ESM::Class>& classes,
+            const CSMWorld::IdCollection<ESM::Faction>& factions, const CSMWorld::IdCollection<ESM::Script>& scripts,
+            const CSMWorld::Resources& models, const CSMWorld::Resources& icons,
+            const CSMWorld::IdCollection<ESM::BodyPart>& bodyparts);
+
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        int setup() override;
+
+    private:
+        // CONCRETE CHECKS
+        void bookCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Book>& records, CSMDoc::Messages& messages);
+        void activatorCheck(
+            int stage, const CSMWorld::RefIdDataContainer<ESM::Activator>& records, CSMDoc::Messages& messages);
+        void potionCheck(
+            int stage, const CSMWorld::RefIdDataContainer<ESM::Potion>& records, CSMDoc::Messages& messages);
+        void apparatusCheck(
+            int stage, const CSMWorld::RefIdDataContainer<ESM::Apparatus>& records, CSMDoc::Messages& messages);
+        void armorCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Armor>& records, CSMDoc::Messages& messages);
+        void clothingCheck(
+            int stage, const CSMWorld::RefIdDataContainer<ESM::Clothing>& records, CSMDoc::Messages& messages);
+        void containerCheck(
+            int stage, const CSMWorld::RefIdDataContainer<ESM::Container>& records, CSMDoc::Messages& messages);
+        void creatureCheck(
+            int stage, const CSMWorld::RefIdDataContainer<ESM::Creature>& records, CSMDoc::Messages& messages);
+        void doorCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Door>& records, CSMDoc::Messages& messages);
+        void ingredientCheck(
+            int stage, const CSMWorld::RefIdDataContainer<ESM::Ingredient>& records, CSMDoc::Messages& messages);
+        void creaturesLevListCheck(
+            int stage, const CSMWorld::RefIdDataContainer<ESM::CreatureLevList>& records, CSMDoc::Messages& messages);
+        void itemLevelledListCheck(
+            int stage, const CSMWorld::RefIdDataContainer<ESM::ItemLevList>& records, CSMDoc::Messages& messages);
+        void lightCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Light>& records, CSMDoc::Messages& messages);
+        void lockpickCheck(
+            int stage, const CSMWorld::RefIdDataContainer<ESM::Lockpick>& records, CSMDoc::Messages& messages);
+        void miscCheck(
+            int stage, const CSMWorld::RefIdDataContainer<ESM::Miscellaneous>& records, CSMDoc::Messages& messages);
+        void npcCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::NPC>& records, CSMDoc::Messages& messages);
+        void weaponCheck(
+            int stage, const CSMWorld::RefIdDataContainer<ESM::Weapon>& records, CSMDoc::Messages& messages);
+        void probeCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Probe>& records, CSMDoc::Messages& messages);
+        void repairCheck(
+            int stage, const CSMWorld::RefIdDataContainer<ESM::Repair>& records, CSMDoc::Messages& messages);
+        void staticCheck(
+            int stage, const CSMWorld::RefIdDataContainer<ESM::Static>& records, CSMDoc::Messages& messages);
+
+        // FINAL CHECK
+        void finalCheck(CSMDoc::Messages& messages);
+
+        // Convenience functions
+        void inventoryListCheck(
+            const std::vector<ESM::ContItem>& itemList, CSMDoc::Messages& messages, const std::string& id);
+
+        /// for all enchantable items.
+        template <typename Item>
+        inline void inventoryItemCheck(
+            const Item& someItem, CSMDoc::Messages& messages, const std::string& someID, bool enchantable);
+
+        /// for non-enchantable items.
+        template <typename Item>
+        inline void inventoryItemCheck(const Item& someItem, CSMDoc::Messages& messages, const std::string& someID);
+
+        /// for tools with uses.
+        template <typename Tool>
+        inline void toolCheck(
+            const Tool& someTool, CSMDoc::Messages& messages, const std::string& someID, bool canbebroken);
+
+        /// for tools without uses.
+        template <typename Tool>
+        inline void toolCheck(const Tool& someTool, CSMDoc::Messages& messages, const std::string& someID);
+
+        template <typename List>
+        inline void listCheck(const List& someList, CSMDoc::Messages& messages, const std::string& someID);
+
+        template <typename Tool>
+        inline void scriptCheck(const Tool& someTool, CSMDoc::Messages& messages, const std::string& someID);
+
+        const CSMWorld::RefIdData& mReferencables;
+        const CSMWorld::IdCollection<ESM::Race>& mRaces;
+        const CSMWorld::IdCollection<ESM::Class>& mClasses;
+        const CSMWorld::IdCollection<ESM::Faction>& mFactions;
+        const CSMWorld::IdCollection<ESM::Script>& mScripts;
+        const CSMWorld::Resources& mModels;
+        const CSMWorld::Resources& mIcons;
+        const CSMWorld::IdCollection<ESM::BodyPart>& mBodyParts;
+        bool mPlayerPresent;
+        bool mIgnoreBaseRecords;
     };
 }
 #endif // REFERENCEABLECHECKSTAGE_H
diff --git a/apps/opencs/model/tools/referencecheck.cpp b/apps/opencs/model/tools/referencecheck.cpp
index 8baf47c6c5..b1ae8441bd 100644
--- a/apps/opencs/model/tools/referencecheck.cpp
+++ b/apps/opencs/model/tools/referencecheck.cpp
@@ -6,22 +6,19 @@
 
 #include <components/esm3/loadfact.hpp>
 
-CSMTools::ReferenceCheckStage::ReferenceCheckStage(
-    const CSMWorld::RefCollection& references,
-    const CSMWorld::RefIdCollection& referencables,
-    const CSMWorld::IdCollection<CSMWorld::Cell>& cells,
+CSMTools::ReferenceCheckStage::ReferenceCheckStage(const CSMWorld::RefCollection& references,
+    const CSMWorld::RefIdCollection& referencables, const CSMWorld::IdCollection<CSMWorld::Cell>& cells,
     const CSMWorld::IdCollection<ESM::Faction>& factions)
-    :
-    mReferences(references),
-    mObjects(referencables),
-    mDataSet(referencables.getDataSet()),
-    mCells(cells),
-    mFactions(factions)
+    : mReferences(references)
+    , mObjects(referencables)
+    , mDataSet(referencables.getDataSet())
+    , mCells(cells)
+    , mFactions(factions)
 {
     mIgnoreBaseRecords = false;
 }
 
-void CSMTools::ReferenceCheckStage::perform(int stage, CSMDoc::Messages &messages)
+void CSMTools::ReferenceCheckStage::perform(int stage, CSMDoc::Messages& messages)
 {
     const CSMWorld::Record<CSMWorld::CellRef>& record = mReferences.getRecord(stage);
 
@@ -35,12 +32,13 @@ void CSMTools::ReferenceCheckStage::perform(int stage, CSMDoc::Messages &message
     // Check reference id
     if (cellRef.mRefID.empty())
         messages.add(id, "Instance is not based on an object", "", CSMDoc::Message::Severity_Error);
-    else 
+    else
     {
         // Check for non existing referenced object
         if (mObjects.searchId(cellRef.mRefID) == -1)
-            messages.add(id, "Instance of a non-existent object '" + cellRef.mRefID + "'", "", CSMDoc::Message::Severity_Error);
-        else 
+            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);
@@ -57,7 +55,8 @@ void CSMTools::ReferenceCheckStage::perform(int stage, CSMDoc::Messages &message
     // If object have creature soul trapped, check if that creature reference is valid
     if (!cellRef.mSoul.empty())
         if (mObjects.searchId(cellRef.mSoul) == -1)
-            messages.add(id, "Trapped soul object '" + cellRef.mSoul + "' does not exist", "", CSMDoc::Message::Severity_Error);
+            messages.add(
+                id, "Trapped soul object '" + cellRef.mSoul + "' does not exist", "", CSMDoc::Message::Severity_Error);
 
     if (cellRef.mFaction.empty())
     {
@@ -73,7 +72,8 @@ void CSMTools::ReferenceCheckStage::perform(int stage, CSMDoc::Messages &message
     }
 
     if (!cellRef.mDestCell.empty() && mCells.searchId(cellRef.mDestCell) == -1)
-        messages.add(id, "Destination cell '" + cellRef.mDestCell + "' does not exist", "", CSMDoc::Message::Severity_Error);
+        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);
diff --git a/apps/opencs/model/tools/referencecheck.hpp b/apps/opencs/model/tools/referencecheck.hpp
index a1e024dda3..e09df29434 100644
--- a/apps/opencs/model/tools/referencecheck.hpp
+++ b/apps/opencs/model/tools/referencecheck.hpp
@@ -2,9 +2,9 @@
 #define CSM_TOOLS_REFERENCECHECK_H
 
 #include "../world/idcollection.hpp"
-#include "../world/refiddata.hpp"
-#include "../world/refidcollection.hpp"
 #include "../world/refcollection.hpp"
+#include "../world/refidcollection.hpp"
+#include "../world/refiddata.hpp"
 
 #include "../doc/stage.hpp"
 
@@ -17,22 +17,20 @@ namespace CSMTools
 {
     class ReferenceCheckStage : public CSMDoc::Stage
     {
-        public:
-            ReferenceCheckStage (const CSMWorld::RefCollection& references,
-                const CSMWorld::RefIdCollection& referencables,
-                const CSMWorld::IdCollection<CSMWorld::Cell>& cells,
-                const CSMWorld::IdCollection<ESM::Faction>& factions);
+    public:
+        ReferenceCheckStage(const CSMWorld::RefCollection& references, const CSMWorld::RefIdCollection& referencables,
+            const CSMWorld::IdCollection<CSMWorld::Cell>& cells, const CSMWorld::IdCollection<ESM::Faction>& factions);
 
-            void perform(int stage, CSMDoc::Messages& messages) override;
-            int setup() override;
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        int setup() override;
 
-        private:
-            const CSMWorld::RefCollection& mReferences;
-            const CSMWorld::RefIdCollection& mObjects;
-            const CSMWorld::RefIdData& mDataSet;
-            const CSMWorld::IdCollection<CSMWorld::Cell>& mCells;
-            const CSMWorld::IdCollection<ESM::Faction>& mFactions;
-            bool mIgnoreBaseRecords;
+    private:
+        const CSMWorld::RefCollection& mReferences;
+        const CSMWorld::RefIdCollection& mObjects;
+        const CSMWorld::RefIdData& mDataSet;
+        const CSMWorld::IdCollection<CSMWorld::Cell>& mCells;
+        const CSMWorld::IdCollection<ESM::Faction>& mFactions;
+        bool mIgnoreBaseRecords;
     };
 }
 
diff --git a/apps/opencs/model/tools/regioncheck.cpp b/apps/opencs/model/tools/regioncheck.cpp
index 127281f5d9..754905c677 100644
--- a/apps/opencs/model/tools/regioncheck.cpp
+++ b/apps/opencs/model/tools/regioncheck.cpp
@@ -4,8 +4,8 @@
 
 #include "../world/universalid.hpp"
 
-CSMTools::RegionCheckStage::RegionCheckStage (const CSMWorld::IdCollection<ESM::Region>& regions)
-: mRegions (regions)
+CSMTools::RegionCheckStage::RegionCheckStage(const CSMWorld::IdCollection<ESM::Region>& regions)
+    : mRegions(regions)
 {
     mIgnoreBaseRecords = false;
 }
@@ -17,9 +17,9 @@ int CSMTools::RegionCheckStage::setup()
     return mRegions.getSize();
 }
 
-void CSMTools::RegionCheckStage::perform (int stage, CSMDoc::Messages& messages)
+void CSMTools::RegionCheckStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    const CSMWorld::Record<ESM::Region>& record = mRegions.getRecord (stage);
+    const CSMWorld::Record<ESM::Region>& record = mRegions.getRecord(stage);
 
     // Skip "Base" records (setting!) and "Deleted" records
     if ((mIgnoreBaseRecords && record.mState == CSMWorld::RecordBase::State_BaseOnly) || record.isDeleted())
@@ -27,7 +27,7 @@ void CSMTools::RegionCheckStage::perform (int stage, CSMDoc::Messages& messages)
 
     const ESM::Region& region = record.get();
 
-    CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Region, region.mId);
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Region, region.mId);
 
     // test for empty name
     if (region.mName.empty())
@@ -36,16 +36,17 @@ void CSMTools::RegionCheckStage::perform (int stage, CSMDoc::Messages& messages)
     /// \todo test that the ID in mSleeplist exists
 
     // test that chances add up to 100
-    int chances = region.mData.mClear + region.mData.mCloudy + region.mData.mFoggy + region.mData.mOvercast +
-        region.mData.mRain + region.mData.mThunder + region.mData.mAsh + region.mData.mBlight +
-        region.mData.mSnow + region.mData.mBlizzard;
+    int chances = region.mData.mClear + region.mData.mCloudy + region.mData.mFoggy + region.mData.mOvercast
+        + region.mData.mRain + region.mData.mThunder + region.mData.mAsh + region.mData.mBlight + region.mData.mSnow
+        + region.mData.mBlizzard;
     if (chances != 100)
         messages.add(id, "Weather chances do not add up to 100", "", CSMDoc::Message::Severity_Error);
 
     for (const ESM::Region::SoundRef& sound : region.mSoundList)
     {
         if (sound.mChance > 100)
-            messages.add(id, "Chance of '" + sound.mSound + "' sound to play is over 100 percent", "", CSMDoc::Message::Severity_Warning);
+            messages.add(id, "Chance of '" + sound.mSound + "' sound to play is over 100 percent", "",
+                CSMDoc::Message::Severity_Warning);
     }
 
     /// \todo check data members that can't be edited in the table view
diff --git a/apps/opencs/model/tools/regioncheck.hpp b/apps/opencs/model/tools/regioncheck.hpp
index 71893c6c5d..b9e0fb04f6 100644
--- a/apps/opencs/model/tools/regioncheck.hpp
+++ b/apps/opencs/model/tools/regioncheck.hpp
@@ -12,18 +12,17 @@ namespace CSMTools
     /// \brief VerifyStage: make sure that region records are internally consistent
     class RegionCheckStage : public CSMDoc::Stage
     {
-            const CSMWorld::IdCollection<ESM::Region>& mRegions;
-            bool mIgnoreBaseRecords;
+        const CSMWorld::IdCollection<ESM::Region>& mRegions;
+        bool mIgnoreBaseRecords;
 
-        public:
+    public:
+        RegionCheckStage(const CSMWorld::IdCollection<ESM::Region>& regions);
 
-            RegionCheckStage (const CSMWorld::IdCollection<ESM::Region>& regions);
+        int setup() override;
+        ///< \return number of steps
 
-            int setup() override;
-            ///< \return number of steps
-
-            void perform (int stage, CSMDoc::Messages& messages) override;
-            ///< Messages resulting from this tage will be appended to \a messages.
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
 
diff --git a/apps/opencs/model/tools/reportmodel.cpp b/apps/opencs/model/tools/reportmodel.cpp
index a2901a6630..e6afbe486b 100644
--- a/apps/opencs/model/tools/reportmodel.cpp
+++ b/apps/opencs/model/tools/reportmodel.cpp
@@ -1,12 +1,13 @@
 #include "reportmodel.hpp"
 
-#include <stdexcept>
 #include <sstream>
+#include <stdexcept>
 
 #include "../world/columns.hpp"
 
-CSMTools::ReportModel::ReportModel (bool fieldColumn, bool severityColumn)
-: mColumnField (-1), mColumnSeverity (-1)
+CSMTools::ReportModel::ReportModel(bool fieldColumn, bool severityColumn)
+    : mColumnField(-1)
+    , mColumnSeverity(-1)
 {
     int index = 3;
 
@@ -19,7 +20,7 @@ CSMTools::ReportModel::ReportModel (bool fieldColumn, bool severityColumn)
     mColumnDescription = index;
 }
 
-int CSMTools::ReportModel::rowCount (const QModelIndex & parent) const
+int CSMTools::ReportModel::rowCount(const QModelIndex& parent) const
 {
     if (parent.isValid())
         return 0;
@@ -27,110 +28,109 @@ int CSMTools::ReportModel::rowCount (const QModelIndex & parent) const
     return static_cast<int>(mRows.size());
 }
 
-int CSMTools::ReportModel::columnCount (const QModelIndex & parent) const
+int CSMTools::ReportModel::columnCount(const QModelIndex& parent) const
 {
     if (parent.isValid())
         return 0;
 
-    return mColumnDescription+1;
+    return mColumnDescription + 1;
 }
 
-QVariant CSMTools::ReportModel::data (const QModelIndex & index, int role) const
+QVariant CSMTools::ReportModel::data(const QModelIndex& index, int role) const
 {
-    if (role!=Qt::DisplayRole && role!=Qt::UserRole)
+    if (role != Qt::DisplayRole && role != Qt::UserRole)
         return QVariant();
 
     switch (index.column())
     {
         case Column_Type:
 
-            if(role == Qt::UserRole)
-                return QString::fromUtf8 (
-                    mRows.at (index.row()).mId.getTypeName().c_str());
+            if (role == Qt::UserRole)
+                return QString::fromUtf8(mRows.at(index.row()).mId.getTypeName().c_str());
             else
-                return static_cast<int> (mRows.at (index.row()).mId.getType());
+                return static_cast<int>(mRows.at(index.row()).mId.getType());
 
         case Column_Id:
         {
-            CSMWorld::UniversalId id = mRows.at (index.row()).mId;
+            CSMWorld::UniversalId id = mRows.at(index.row()).mId;
 
-            if (id.getArgumentType()==CSMWorld::UniversalId::ArgumentType_Id)
-                return QString::fromUtf8 (id.getId().c_str());
+            if (id.getArgumentType() == CSMWorld::UniversalId::ArgumentType_Id)
+                return QString::fromUtf8(id.getId().c_str());
 
-            return QString ("-");
+            return QString("-");
         }
 
         case Column_Hint:
 
-            return QString::fromUtf8 (mRows.at (index.row()).mHint.c_str());
+            return QString::fromUtf8(mRows.at(index.row()).mHint.c_str());
     }
 
-    if (index.column()==mColumnDescription)
-        return QString::fromUtf8 (mRows.at (index.row()).mMessage.c_str());
+    if (index.column() == mColumnDescription)
+        return QString::fromUtf8(mRows.at(index.row()).mMessage.c_str());
 
-    if (index.column()==mColumnField)
+    if (index.column() == mColumnField)
     {
         std::string field;
 
-        std::istringstream stream (mRows.at (index.row()).mHint);
+        std::istringstream stream(mRows.at(index.row()).mHint);
 
         char type, ignore;
         int fieldIndex;
 
-        if ((stream >> type >> ignore >> fieldIndex) && (type=='r' || type=='R'))
+        if ((stream >> type >> ignore >> fieldIndex) && (type == 'r' || type == 'R'))
         {
-            field = CSMWorld::Columns::getName (
-                static_cast<CSMWorld::Columns::ColumnId> (fieldIndex));
+            field = CSMWorld::Columns::getName(static_cast<CSMWorld::Columns::ColumnId>(fieldIndex));
         }
 
-        return QString::fromUtf8 (field.c_str());
+        return QString::fromUtf8(field.c_str());
     }
 
-    if (index.column()==mColumnSeverity)
+    if (index.column() == mColumnSeverity)
     {
-        return QString::fromUtf8 (
-            CSMDoc::Message::toString (mRows.at (index.row()).mSeverity).c_str());
+        return QString::fromUtf8(CSMDoc::Message::toString(mRows.at(index.row()).mSeverity).c_str());
     }
 
     return QVariant();
 }
 
-QVariant CSMTools::ReportModel::headerData (int section, Qt::Orientation orientation, int role) const
+QVariant CSMTools::ReportModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
-    if (role!=Qt::DisplayRole)
+    if (role != Qt::DisplayRole)
         return QVariant();
 
-    if (orientation==Qt::Vertical)
+    if (orientation == Qt::Vertical)
         return QVariant();
 
     switch (section)
     {
-        case Column_Type: return "Type";
-        case Column_Id: return "ID";
+        case Column_Type:
+            return "Type";
+        case Column_Id:
+            return "ID";
     }
 
-    if (section==mColumnDescription)
+    if (section == mColumnDescription)
         return "Description";
 
-    if (section==mColumnField)
+    if (section == mColumnField)
         return "Field";
 
-    if (section==mColumnSeverity)
+    if (section == mColumnSeverity)
         return "Severity";
 
     return "-";
 }
 
-bool CSMTools::ReportModel::removeRows (int row, int count, const QModelIndex& parent)
+bool CSMTools::ReportModel::removeRows(int row, int count, const QModelIndex& parent)
 {
     if (parent.isValid())
         return false;
 
-    if (count>0)
+    if (count > 0)
     {
-        beginRemoveRows (parent, row, row+count-1);
+        beginRemoveRows(parent, row, row + count - 1);
 
-        mRows.erase (mRows.begin()+row, mRows.begin()+row+count);
+        mRows.erase(mRows.begin() + row, mRows.begin() + row + count);
 
         endRemoveRows();
     }
@@ -138,45 +138,45 @@ bool CSMTools::ReportModel::removeRows (int row, int count, const QModelIndex& p
     return true;
 }
 
-void CSMTools::ReportModel::add (const CSMDoc::Message& message)
+void CSMTools::ReportModel::add(const CSMDoc::Message& message)
 {
-    beginInsertRows (QModelIndex(), static_cast<int>(mRows.size()), static_cast<int>(mRows.size()));
+    beginInsertRows(QModelIndex(), static_cast<int>(mRows.size()), static_cast<int>(mRows.size()));
 
-    mRows.push_back (message);
+    mRows.push_back(message);
 
     endInsertRows();
 }
 
-void CSMTools::ReportModel::flagAsReplaced (int index)
+void CSMTools::ReportModel::flagAsReplaced(int index)
 {
-    CSMDoc::Message& line = mRows.at (index);
+    CSMDoc::Message& line = mRows.at(index);
     std::string hint = line.mHint;
 
-    if (hint.empty() || hint[0]!='R')
-        throw std::logic_error ("trying to flag message as replaced that is not replaceable");
+    if (hint.empty() || hint[0] != 'R')
+        throw std::logic_error("trying to flag message as replaced that is not replaceable");
 
     hint[0] = 'r';
 
     line.mHint = hint;
 
-    emit dataChanged (this->index (index, 0), this->index (index, columnCount()));
+    emit dataChanged(this->index(index, 0), this->index(index, columnCount()));
 }
 
-const CSMWorld::UniversalId& CSMTools::ReportModel::getUniversalId (int row) const
+const CSMWorld::UniversalId& CSMTools::ReportModel::getUniversalId(int row) const
 {
-    return mRows.at (row).mId;
+    return mRows.at(row).mId;
 }
 
-std::string CSMTools::ReportModel::getHint (int row) const
+std::string CSMTools::ReportModel::getHint(int row) const
 {
-    return mRows.at (row).mHint;
+    return mRows.at(row).mHint;
 }
 
 void CSMTools::ReportModel::clear()
 {
     if (!mRows.empty())
     {
-        beginRemoveRows (QModelIndex(), 0, static_cast<int>(mRows.size())-1);
+        beginRemoveRows(QModelIndex(), 0, static_cast<int>(mRows.size()) - 1);
         mRows.clear();
         endRemoveRows();
     }
@@ -186,10 +186,9 @@ int CSMTools::ReportModel::countErrors() const
 {
     int count = 0;
 
-    for (std::vector<CSMDoc::Message>::const_iterator iter (mRows.begin());
-        iter!=mRows.end(); ++iter)
-        if (iter->mSeverity==CSMDoc::Message::Severity_Error ||
-            iter->mSeverity==CSMDoc::Message::Severity_SeriousError)
+    for (std::vector<CSMDoc::Message>::const_iterator iter(mRows.begin()); iter != mRows.end(); ++iter)
+        if (iter->mSeverity == CSMDoc::Message::Severity_Error
+            || iter->mSeverity == CSMDoc::Message::Severity_SeriousError)
             ++count;
 
     return count;
diff --git a/apps/opencs/model/tools/reportmodel.hpp b/apps/opencs/model/tools/reportmodel.hpp
index 809dfcc3e8..b862e5c647 100644
--- a/apps/opencs/model/tools/reportmodel.hpp
+++ b/apps/opencs/model/tools/reportmodel.hpp
@@ -1,8 +1,8 @@
 #ifndef CSM_TOOLS_REPORTMODEL_H
 #define CSM_TOOLS_REPORTMODEL_H
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <QAbstractTableModel>
 
@@ -14,47 +14,48 @@ namespace CSMTools
 {
     class ReportModel : public QAbstractTableModel
     {
-            Q_OBJECT
+        Q_OBJECT
+
+        std::vector<CSMDoc::Message> mRows;
+
+        // Fixed columns
+        enum Columns
+        {
+            Column_Type = 0,
+            Column_Id = 1,
+            Column_Hint = 2
+        };
 
-            std::vector<CSMDoc::Message> mRows;
+        // Configurable columns
+        int mColumnDescription;
+        int mColumnField;
+        int mColumnSeverity;
 
-            // Fixed columns
-            enum Columns
-            {
-                Column_Type = 0, Column_Id = 1, Column_Hint = 2
-            };
+    public:
+        ReportModel(bool fieldColumn = false, bool severityColumn = true);
 
-            // Configurable columns
-            int mColumnDescription;
-            int mColumnField;
-            int mColumnSeverity;
+        int rowCount(const QModelIndex& parent = QModelIndex()) const override;
 
-        public:
+        int columnCount(const QModelIndex& parent = QModelIndex()) const override;
 
-            ReportModel (bool fieldColumn = false, bool severityColumn = true);
-        
-            int rowCount (const QModelIndex & parent = QModelIndex()) const override;
+        QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
 
-            int columnCount (const QModelIndex & parent = QModelIndex()) const override;
+        QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
 
-            QVariant data (const QModelIndex & index, int role = Qt::DisplayRole) const override;
+        bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
 
-            QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+        void add(const CSMDoc::Message& message);
 
-            bool removeRows (int row, int count, const QModelIndex& parent = QModelIndex()) override;
-            
-            void add (const CSMDoc::Message& message);
+        void flagAsReplaced(int index);
 
-            void flagAsReplaced (int index);
-                
-            const CSMWorld::UniversalId& getUniversalId (int row) const;
+        const CSMWorld::UniversalId& getUniversalId(int row) const;
 
-            std::string getHint (int row) const;
+        std::string getHint(int row) const;
 
-            void clear();
+        void clear();
 
-            // Return number of messages with Error or SeriousError severity.
-            int countErrors() const;
+        // Return number of messages with Error or SeriousError severity.
+        int countErrors() const;
     };
 }
 
diff --git a/apps/opencs/model/tools/scriptcheck.cpp b/apps/opencs/model/tools/scriptcheck.cpp
index 6fa2dfcfc9..9a78db03c0 100644
--- a/apps/opencs/model/tools/scriptcheck.cpp
+++ b/apps/opencs/model/tools/scriptcheck.cpp
@@ -2,11 +2,11 @@
 
 #include <sstream>
 
-#include <components/compiler/tokenloc.hpp>
-#include <components/compiler/scanner.hpp>
-#include <components/compiler/fileparser.hpp>
 #include <components/compiler/exception.hpp>
 #include <components/compiler/extensions0.hpp>
+#include <components/compiler/fileparser.hpp>
+#include <components/compiler/scanner.hpp>
+#include <components/compiler/tokenloc.hpp>
 
 #include "../doc/document.hpp"
 
@@ -14,51 +14,56 @@
 
 #include "../prefs/state.hpp"
 
-CSMDoc::Message::Severity CSMTools::ScriptCheckStage::getSeverity (Type type)
+CSMDoc::Message::Severity CSMTools::ScriptCheckStage::getSeverity(Type type)
 {
     switch (type)
     {
-        case WarningMessage: return CSMDoc::Message::Severity_Warning;
-        case ErrorMessage: return CSMDoc::Message::Severity_Error;
+        case WarningMessage:
+            return CSMDoc::Message::Severity_Warning;
+        case ErrorMessage:
+            return CSMDoc::Message::Severity_Error;
     }
 
     return CSMDoc::Message::Severity_SeriousError;
 }
 
-void CSMTools::ScriptCheckStage::report (const std::string& message, const Compiler::TokenLoc& loc,
-    Type type)
+void CSMTools::ScriptCheckStage::report(const std::string& message, const Compiler::TokenLoc& loc, Type type)
 {
     std::ostringstream stream;
 
-    CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Script, mId);
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Script, mId);
 
-    stream << message << " (" << loc.mLiteral  << ")" << " @ line " << loc.mLine+1 << ", column " << loc.mColumn;
+    stream << message << " (" << loc.mLiteral << ")"
+           << " @ line " << loc.mLine + 1 << ", column " << loc.mColumn;
 
     std::ostringstream hintStream;
 
-    hintStream << "l:" << loc.mLine+1 << " " << loc.mColumn;
+    hintStream << "l:" << loc.mLine + 1 << " " << loc.mColumn;
 
-    mMessages->add (id, stream.str(), hintStream.str(), getSeverity (type));
+    mMessages->add(id, stream.str(), hintStream.str(), getSeverity(type));
 }
 
-void CSMTools::ScriptCheckStage::report (const std::string& message, Type type)
+void CSMTools::ScriptCheckStage::report(const std::string& message, Type type)
 {
-    CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Script, mId);
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Script, mId);
 
     std::ostringstream stream;
     stream << message;
 
-    mMessages->add (id, stream.str(), "", getSeverity (type));
+    mMessages->add(id, stream.str(), "", getSeverity(type));
 }
 
-CSMTools::ScriptCheckStage::ScriptCheckStage (const CSMDoc::Document& document)
-: mDocument (document), mContext (document.getData()), mMessages (nullptr), mWarningMode (Mode_Ignore)
+CSMTools::ScriptCheckStage::ScriptCheckStage(const CSMDoc::Document& document)
+    : mDocument(document)
+    , mContext(document.getData())
+    , mMessages(nullptr)
+    , mWarningMode(Mode_Ignore)
 {
     /// \todo add an option to configure warning mode
-    setWarningsMode (0);
+    setWarningsMode(0);
 
-    Compiler::registerExtensions (mExtensions);
-    mContext.setExtensions (&mExtensions);
+    Compiler::registerExtensions(mExtensions);
+    mContext.setExtensions(&mExtensions);
 
     mIgnoreBaseRecords = false;
 }
@@ -67,11 +72,11 @@ int CSMTools::ScriptCheckStage::setup()
 {
     std::string warnings = CSMPrefs::get()["Scripts"]["warnings"].toString();
 
-    if (warnings=="Ignore")
+    if (warnings == "Ignore")
         mWarningMode = Mode_Ignore;
-    else if (warnings=="Normal")
+    else if (warnings == "Normal")
         mWarningMode = Mode_Normal;
-    else if (warnings=="Strict")
+    else if (warnings == "Strict")
         mWarningMode = Mode_Strict;
 
     mContext.clear();
@@ -84,14 +89,13 @@ int CSMTools::ScriptCheckStage::setup()
     return mDocument.getData().getScripts().getSize();
 }
 
-void CSMTools::ScriptCheckStage::perform (int stage, CSMDoc::Messages& messages)
+void CSMTools::ScriptCheckStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    const CSMWorld::Record<ESM::Script> &record = mDocument.getData().getScripts().getRecord(stage);
+    const CSMWorld::Record<ESM::Script>& record = mDocument.getData().getScripts().getRecord(stage);
 
-    mId = mDocument.getData().getScripts().getId (stage);
+    mId = mDocument.getData().getScripts().getId(stage);
 
-    if (mDocument.isBlacklisted (
-        CSMWorld::UniversalId (CSMWorld::UniversalId::Type_Script, mId)))
+    if (mDocument.isBlacklisted(CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Script, mId)))
         return;
 
     // Skip "Base" records (setting!) and "Deleted" records
@@ -102,21 +106,27 @@ void CSMTools::ScriptCheckStage::perform (int stage, CSMDoc::Messages& messages)
 
     switch (mWarningMode)
     {
-        case Mode_Ignore: setWarningsMode (0); break;
-        case Mode_Normal: setWarningsMode (1); break;
-        case Mode_Strict: setWarningsMode (2); break;
+        case Mode_Ignore:
+            setWarningsMode(0);
+            break;
+        case Mode_Normal:
+            setWarningsMode(1);
+            break;
+        case Mode_Strict:
+            setWarningsMode(2);
+            break;
     }
 
     try
     {
         mFile = record.get().mId;
-        std::istringstream input (record.get().mScriptText);
+        std::istringstream input(record.get().mScriptText);
 
-        Compiler::Scanner scanner (*this, input, mContext.getExtensions());
+        Compiler::Scanner scanner(*this, input, mContext.getExtensions());
 
-        Compiler::FileParser parser (*this, mContext);
+        Compiler::FileParser parser(*this, mContext);
 
-        scanner.scan (parser);
+        scanner.scan(parser);
     }
     catch (const Compiler::SourceException&)
     {
@@ -124,12 +134,12 @@ void CSMTools::ScriptCheckStage::perform (int stage, CSMDoc::Messages& messages)
     }
     catch (const std::exception& error)
     {
-        CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Script, mId);
+        CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Script, mId);
 
         std::ostringstream stream;
         stream << error.what();
 
-        messages.add (id, stream.str(), "", CSMDoc::Message::Severity_SeriousError);
+        messages.add(id, stream.str(), "", CSMDoc::Message::Severity_SeriousError);
     }
 
     mMessages = nullptr;
diff --git a/apps/opencs/model/tools/scriptcheck.hpp b/apps/opencs/model/tools/scriptcheck.hpp
index d975e02da5..d8d4d45d3a 100644
--- a/apps/opencs/model/tools/scriptcheck.hpp
+++ b/apps/opencs/model/tools/scriptcheck.hpp
@@ -18,39 +18,38 @@ namespace CSMTools
     /// \brief VerifyStage: make sure that scripts compile
     class ScriptCheckStage : public CSMDoc::Stage, private Compiler::ErrorHandler
     {
-            enum WarningMode
-            {
-                Mode_Ignore,
-                Mode_Normal,
-                Mode_Strict
-            };
-
-            const CSMDoc::Document& mDocument;
-            Compiler::Extensions mExtensions;
-            CSMWorld::ScriptContext mContext;
-            std::string mId;
-            std::string mFile;
-            CSMDoc::Messages *mMessages;
-            WarningMode mWarningMode;
-            bool mIgnoreBaseRecords;
-
-            CSMDoc::Message::Severity getSeverity (Type type);
-
-            void report (const std::string& message, const Compiler::TokenLoc& loc, Type type) override;
-            ///< Report error to the user.
-
-            void report (const std::string& message, Type type) override;
-            ///< Report a file related error
-
-        public:
-
-            ScriptCheckStage (const CSMDoc::Document& document);
-
-            int setup() override;
-            ///< \return number of steps
-
-            void perform (int stage, CSMDoc::Messages& messages) override;
-            ///< Messages resulting from this tage will be appended to \a messages.
+        enum WarningMode
+        {
+            Mode_Ignore,
+            Mode_Normal,
+            Mode_Strict
+        };
+
+        const CSMDoc::Document& mDocument;
+        Compiler::Extensions mExtensions;
+        CSMWorld::ScriptContext mContext;
+        std::string mId;
+        std::string mFile;
+        CSMDoc::Messages* mMessages;
+        WarningMode mWarningMode;
+        bool mIgnoreBaseRecords;
+
+        CSMDoc::Message::Severity getSeverity(Type type);
+
+        void report(const std::string& message, const Compiler::TokenLoc& loc, Type type) override;
+        ///< Report error to the user.
+
+        void report(const std::string& message, Type type) override;
+        ///< Report a file related error
+
+    public:
+        ScriptCheckStage(const CSMDoc::Document& document);
+
+        int setup() override;
+        ///< \return number of steps
+
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
 
diff --git a/apps/opencs/model/tools/search.cpp b/apps/opencs/model/tools/search.cpp
index 7005480d11..f7f5ff56e9 100644
--- a/apps/opencs/model/tools/search.cpp
+++ b/apps/opencs/model/tools/search.cpp
@@ -1,157 +1,172 @@
 #include "search.hpp"
 
-#include <stdexcept>
 #include <sstream>
+#include <stdexcept>
 
-#include "../doc/messages.hpp"
 #include "../doc/document.hpp"
+#include "../doc/messages.hpp"
 
-#include "../world/idtablebase.hpp"
 #include "../world/columnbase.hpp"
-#include "../world/universalid.hpp"
 #include "../world/commands.hpp"
+#include "../world/idtablebase.hpp"
+#include "../world/universalid.hpp"
 
-void CSMTools::Search::searchTextCell (const CSMWorld::IdTableBase *model,
-    const QModelIndex& index, const CSMWorld::UniversalId& id, bool writable,
-    CSMDoc::Messages& messages) const
+void CSMTools::Search::searchTextCell(const CSMWorld::IdTableBase* model, const QModelIndex& index,
+    const CSMWorld::UniversalId& id, bool writable, CSMDoc::Messages& messages) const
 {
     // using QString here for easier handling of case folding.
-    
-    QString search = QString::fromUtf8 (mText.c_str());
-    QString text = model->data (index).toString();
+
+    QString search = QString::fromUtf8(mText.c_str());
+    QString text = model->data(index).toString();
 
     int pos = 0;
 
     Qt::CaseSensitivity caseSensitivity = mCase ? Qt::CaseSensitive : Qt::CaseInsensitive;
-    while ((pos = text.indexOf (search, pos, caseSensitivity))!=-1)
+    while ((pos = text.indexOf(search, pos, caseSensitivity)) != -1)
     {
         std::ostringstream hint;
-        hint
-            << (writable ? 'R' : 'r')
-            <<": "
-            << model->getColumnId (index.column())
-            << " " << pos
-            << " " << search.length();
-        
-        messages.add (id, formatDescription (text, pos, search.length()).toUtf8().data(), hint.str());
+        hint << (writable ? 'R' : 'r') << ": " << model->getColumnId(index.column()) << " " << pos << " "
+             << search.length();
+
+        messages.add(id, formatDescription(text, pos, search.length()).toUtf8().data(), hint.str());
 
         pos += search.length();
     }
 }
 
-void CSMTools::Search::searchRegExCell (const CSMWorld::IdTableBase *model,
-    const QModelIndex& index, const CSMWorld::UniversalId& id, bool writable,
-    CSMDoc::Messages& messages) const
+void CSMTools::Search::searchRegExCell(const CSMWorld::IdTableBase* model, const QModelIndex& index,
+    const CSMWorld::UniversalId& id, bool writable, CSMDoc::Messages& messages) const
 {
-    QString text = model->data (index).toString();
+    QString text = model->data(index).toString();
 
     int pos = 0;
 
-    while ((pos = mRegExp.indexIn (text, pos))!=-1)
+    while ((pos = mRegExp.indexIn(text, pos)) != -1)
     {
         int length = mRegExp.matchedLength();
-        
+
         std::ostringstream hint;
-        hint
-            << (writable ? 'R' : 'r')
-            <<": "
-            << model->getColumnId (index.column())
-            << " " << pos
-            << " " << length;
-        
-        messages.add (id, formatDescription (text, pos, length).toUtf8().data(), hint.str());
+        hint << (writable ? 'R' : 'r') << ": " << model->getColumnId(index.column()) << " " << pos << " " << length;
+
+        messages.add(id, formatDescription(text, pos, length).toUtf8().data(), hint.str());
 
         pos += length;
     }
 }
 
-void CSMTools::Search::searchRecordStateCell (const CSMWorld::IdTableBase *model,
-    const QModelIndex& index, const CSMWorld::UniversalId& id, bool writable, CSMDoc::Messages& messages) const
+void CSMTools::Search::searchRecordStateCell(const CSMWorld::IdTableBase* model, const QModelIndex& index,
+    const CSMWorld::UniversalId& id, bool writable, CSMDoc::Messages& messages) const
 {
     if (writable)
-        throw std::logic_error ("Record state can not be modified by search and replace");
-        
-    int data = model->data (index).toInt();
+        throw std::logic_error("Record state can not be modified by search and replace");
+
+    int data = model->data(index).toInt();
 
-    if (data==mValue)
+    if (data == mValue)
     {
-        std::vector<std::pair<int,std::string>> states =
-            CSMWorld::Columns::getEnums (CSMWorld::Columns::ColumnId_Modification);
+        std::vector<std::pair<int, std::string>> states
+            = CSMWorld::Columns::getEnums(CSMWorld::Columns::ColumnId_Modification);
 
         const std::string hint = "r: " + std::to_string(model->getColumnId(index.column()));
-        messages.add (id, states.at(data).second, hint);
+        messages.add(id, states.at(data).second, hint);
     }
 }
 
-QString CSMTools::Search::formatDescription (const QString& description, int pos, int length) const
+QString CSMTools::Search::formatDescription(const QString& description, int pos, int length) const
 {
-    QString text (description);
+    QString text(description);
 
     // split
-    QString highlight = flatten (text.mid (pos, length));
-    QString before = flatten (mPaddingBefore>=pos ?
-        text.mid (0, pos) : text.mid (pos-mPaddingBefore, mPaddingBefore));
-    QString after = flatten (text.mid (pos+length, mPaddingAfter));
+    QString highlight = flatten(text.mid(pos, length));
+    QString before = flatten(mPaddingBefore >= pos ? text.mid(0, pos) : text.mid(pos - mPaddingBefore, mPaddingBefore));
+    QString after = flatten(text.mid(pos + length, mPaddingAfter));
 
     // compensate for Windows nonsense
-    text.remove ('\r');
+    text.remove('\r');
 
     // join
     text = before + "<b>" + highlight + "</b>" + after;
 
     // improve layout for single line display
-    text.replace ("\n", "&lt;CR>");
-    text.replace ('\t', ' ');
-    
-    return text; 
+    text.replace("\n", "&lt;CR>");
+    text.replace('\t', ' ');
+
+    return text;
 }
 
-QString CSMTools::Search::flatten (const QString& text) const
+QString CSMTools::Search::flatten(const QString& text) const
 {
-    QString flat (text);
+    QString flat(text);
 
-    flat.replace ("&", "&amp;");
-    flat.replace ("<", "&lt;");
+    flat.replace("&", "&amp;");
+    flat.replace("<", "&lt;");
 
     return flat;
 }
 
-CSMTools::Search::Search() : mType (Type_None), mValue (0), mCase (false), mIdColumn (0), mTypeColumn (0),
-    mPaddingBefore (10), mPaddingAfter (10) {}
+CSMTools::Search::Search()
+    : mType(Type_None)
+    , mValue(0)
+    , mCase(false)
+    , mIdColumn(0)
+    , mTypeColumn(0)
+    , mPaddingBefore(10)
+    , mPaddingAfter(10)
+{
+}
 
-CSMTools::Search::Search (Type type, bool caseSensitive, const std::string& value)
-: mType (type), mText (value), mValue (0), mCase (caseSensitive), mIdColumn (0), mTypeColumn (0), mPaddingBefore (10), mPaddingAfter (10)
+CSMTools::Search::Search(Type type, bool caseSensitive, const std::string& value)
+    : mType(type)
+    , mText(value)
+    , mValue(0)
+    , mCase(caseSensitive)
+    , mIdColumn(0)
+    , mTypeColumn(0)
+    , mPaddingBefore(10)
+    , mPaddingAfter(10)
 {
-    if (type!=Type_Text && type!=Type_Id)
-        throw std::logic_error ("Invalid search parameter (string)");
+    if (type != Type_Text && type != Type_Id)
+        throw std::logic_error("Invalid search parameter (string)");
 }
 
-CSMTools::Search::Search (Type type, bool caseSensitive, const QRegExp& value)
-: mType (type), mRegExp (value), mValue (0), mCase (caseSensitive), mIdColumn (0), mTypeColumn (0), mPaddingBefore (10), mPaddingAfter (10)
+CSMTools::Search::Search(Type type, bool caseSensitive, const QRegExp& value)
+    : mType(type)
+    , mRegExp(value)
+    , mValue(0)
+    , mCase(caseSensitive)
+    , mIdColumn(0)
+    , mTypeColumn(0)
+    , mPaddingBefore(10)
+    , mPaddingAfter(10)
 {
     mRegExp.setCaseSensitivity(mCase ? Qt::CaseSensitive : Qt::CaseInsensitive);
-    if (type!=Type_TextRegEx && type!=Type_IdRegEx)
-        throw std::logic_error ("Invalid search parameter (RegExp)");
+    if (type != Type_TextRegEx && type != Type_IdRegEx)
+        throw std::logic_error("Invalid search parameter (RegExp)");
 }
 
-CSMTools::Search::Search (Type type, bool caseSensitive, int value)
-: mType (type), mValue (value), mCase (caseSensitive), mIdColumn (0), mTypeColumn (0), mPaddingBefore (10), mPaddingAfter (10)
+CSMTools::Search::Search(Type type, bool caseSensitive, int value)
+    : mType(type)
+    , mValue(value)
+    , mCase(caseSensitive)
+    , mIdColumn(0)
+    , mTypeColumn(0)
+    , mPaddingBefore(10)
+    , mPaddingAfter(10)
 {
-    if (type!=Type_RecordState)
-        throw std::logic_error ("invalid search parameter (int)");
+    if (type != Type_RecordState)
+        throw std::logic_error("invalid search parameter (int)");
 }
 
-void CSMTools::Search::configure (const CSMWorld::IdTableBase *model)
+void CSMTools::Search::configure(const CSMWorld::IdTableBase* model)
 {
     mColumns.clear();
 
     int columns = model->columnCount();
 
-    for (int i=0; i<columns; ++i)
+    for (int i = 0; i < columns; ++i)
     {
-        CSMWorld::ColumnBase::Display display = static_cast<CSMWorld::ColumnBase::Display> (
-            model->headerData (
-            i,  Qt::Horizontal, static_cast<int> (CSMWorld::ColumnBase::Role_Display)).toInt());
+        CSMWorld::ColumnBase::Display display = static_cast<CSMWorld::ColumnBase::Display>(
+            model->headerData(i, Qt::Horizontal, static_cast<int>(CSMWorld::ColumnBase::Role_Display)).toInt());
 
         bool consider = false;
 
@@ -160,28 +175,26 @@ void CSMTools::Search::configure (const CSMWorld::IdTableBase *model)
             case Type_Text:
             case Type_TextRegEx:
 
-                if (CSMWorld::ColumnBase::isText (display) ||
-                    CSMWorld::ColumnBase::isScript (display))
+                if (CSMWorld::ColumnBase::isText(display) || CSMWorld::ColumnBase::isScript(display))
                 {
                     consider = true;
                 }
 
                 break;
-                
+
             case Type_Id:
             case Type_IdRegEx:
 
-                if (CSMWorld::ColumnBase::isId (display) ||
-                    CSMWorld::ColumnBase::isScript (display))
+                if (CSMWorld::ColumnBase::isId(display) || CSMWorld::ColumnBase::isScript(display))
                 {
                     consider = true;
                 }
 
                 break;
-            
+
             case Type_RecordState:
 
-                if (display==CSMWorld::ColumnBase::Display_RecordState)
+                if (display == CSMWorld::ColumnBase::Display_RecordState)
                     consider = true;
 
                 break;
@@ -192,45 +205,43 @@ void CSMTools::Search::configure (const CSMWorld::IdTableBase *model)
         }
 
         if (consider)
-            mColumns.insert (i);
+            mColumns.insert(i);
     }
 
-    mIdColumn = model->findColumnIndex (CSMWorld::Columns::ColumnId_Id);
-    mTypeColumn = model->findColumnIndex (CSMWorld::Columns::ColumnId_RecordType);
+    mIdColumn = model->findColumnIndex(CSMWorld::Columns::ColumnId_Id);
+    mTypeColumn = model->findColumnIndex(CSMWorld::Columns::ColumnId_RecordType);
 }
 
-void CSMTools::Search::searchRow (const CSMWorld::IdTableBase *model, int row,
-    CSMDoc::Messages& messages) const
+void CSMTools::Search::searchRow(const CSMWorld::IdTableBase* model, int row, CSMDoc::Messages& messages) const
 {
-    for (std::set<int>::const_iterator iter (mColumns.begin()); iter!=mColumns.end(); ++iter)
+    for (std::set<int>::const_iterator iter(mColumns.begin()); iter != mColumns.end(); ++iter)
     {
-        QModelIndex index = model->index (row, *iter);
+        QModelIndex index = model->index(row, *iter);
+
+        CSMWorld::UniversalId::Type type
+            = static_cast<CSMWorld::UniversalId::Type>(model->data(model->index(row, mTypeColumn)).toInt());
 
-        CSMWorld::UniversalId::Type type = static_cast<CSMWorld::UniversalId::Type> (
-            model->data (model->index (row, mTypeColumn)).toInt());
-        
-        CSMWorld::UniversalId id (
-            type, model->data (model->index (row, mIdColumn)).toString().toUtf8().data());
+        CSMWorld::UniversalId id(type, model->data(model->index(row, mIdColumn)).toString().toUtf8().data());
+
+        bool writable = model->flags(index) & Qt::ItemIsEditable;
 
-        bool writable = model->flags (index) & Qt::ItemIsEditable;
-            
         switch (mType)
         {
             case Type_Text:
             case Type_Id:
 
-                searchTextCell (model, index, id, writable, messages);
+                searchTextCell(model, index, id, writable, messages);
                 break;
-            
+
             case Type_TextRegEx:
             case Type_IdRegEx:
 
-                searchRegExCell (model, index, id, writable, messages);
+                searchRegExCell(model, index, id, writable, messages);
                 break;
-            
+
             case Type_RecordState:
 
-                searchRecordStateCell (model, index, id, writable, messages);
+                searchRecordStateCell(model, index, id, writable, messages);
                 break;
 
             case Type_None:
@@ -240,54 +251,49 @@ void CSMTools::Search::searchRow (const CSMWorld::IdTableBase *model, int row,
     }
 }
 
-void CSMTools::Search::setPadding (int before, int after)
+void CSMTools::Search::setPadding(int before, int after)
 {
     mPaddingBefore = before;
     mPaddingAfter = after;
 }
 
-void CSMTools::Search::replace (CSMDoc::Document& document, CSMWorld::IdTableBase *model,
-    const CSMWorld::UniversalId& id, const std::string& messageHint,
-    const std::string& replaceText) const
+void CSMTools::Search::replace(CSMDoc::Document& document, CSMWorld::IdTableBase* model,
+    const CSMWorld::UniversalId& id, const std::string& messageHint, const std::string& replaceText) const
 {
-    std::istringstream stream (messageHint.c_str());
+    std::istringstream stream(messageHint.c_str());
 
     char hint, ignore;
     int columnId, pos, length;
 
     if (stream >> hint >> ignore >> columnId >> pos >> length)
     {
-        int column =
-            model->findColumnIndex (static_cast<CSMWorld::Columns::ColumnId> (columnId));
-            
-        QModelIndex index = model->getModelIndex (id.getId(), column);
+        int column = model->findColumnIndex(static_cast<CSMWorld::Columns::ColumnId>(columnId));
 
-        std::string text = model->data (index).toString().toUtf8().constData();
+        QModelIndex index = model->getModelIndex(id.getId(), column);
 
-        std::string before = text.substr (0, pos);
-        std::string after = text.substr (pos+length);
+        std::string text = model->data(index).toString().toUtf8().constData();
+
+        std::string before = text.substr(0, pos);
+        std::string after = text.substr(pos + length);
 
         std::string newText = before + replaceText + after;
-        
-        document.getUndoStack().push (
-            new CSMWorld::ModifyCommand (*model, index, QString::fromUtf8 (newText.c_str())));
+
+        document.getUndoStack().push(new CSMWorld::ModifyCommand(*model, index, QString::fromUtf8(newText.c_str())));
     }
 }
 
-bool CSMTools::Search::verify (CSMDoc::Document& document, CSMWorld::IdTableBase *model,
-    const CSMWorld::UniversalId& id, const std::string& messageHint) const
+bool CSMTools::Search::verify(CSMDoc::Document& document, CSMWorld::IdTableBase* model, const CSMWorld::UniversalId& id,
+    const std::string& messageHint) const
 {
-    CSMDoc::Messages messages (CSMDoc::Message::Severity_Info);
+    CSMDoc::Messages messages(CSMDoc::Message::Severity_Info);
+
+    int row = model->getModelIndex(id.getId(), model->findColumnIndex(CSMWorld::Columns::ColumnId_Id)).row();
 
-    int row = model->getModelIndex (id.getId(),
-        model->findColumnIndex (CSMWorld::Columns::ColumnId_Id)).row();
-    
-    searchRow (model, row, messages);
+    searchRow(model, row, messages);
 
-    for (CSMDoc::Messages::Iterator iter (messages.begin()); iter!=messages.end(); ++iter)
-        if (iter->mHint==messageHint)
+    for (CSMDoc::Messages::Iterator iter(messages.begin()); iter != messages.end(); ++iter)
+        if (iter->mHint == messageHint)
             return true;
 
     return false;
 }
-                
diff --git a/apps/opencs/model/tools/search.hpp b/apps/opencs/model/tools/search.hpp
index 35cfa64025..70f27cad1d 100644
--- a/apps/opencs/model/tools/search.hpp
+++ b/apps/opencs/model/tools/search.hpp
@@ -1,11 +1,11 @@
 #ifndef CSM_TOOLS_SEARCH_H
 #define CSM_TOOLS_SEARCH_H
 
-#include <string>
 #include <set>
+#include <string>
 
-#include <QRegExp>
 #include <QMetaType>
+#include <QRegExp>
 
 class QModelIndex;
 
@@ -25,77 +25,71 @@ namespace CSMTools
 {
     class Search
     {
-        public:
-
-            enum Type
-            {
-                Type_Text = 0,
-                Type_TextRegEx = 1,
-                Type_Id = 2,
-                Type_IdRegEx = 3,
-                Type_RecordState = 4,
-                Type_None
-            };
-
-        private:
-
-            Type mType;
-            std::string mText;
-            QRegExp mRegExp;
-            int mValue;
-            bool mCase;
-            std::set<int> mColumns;
-            int mIdColumn;
-            int mTypeColumn;
-            int mPaddingBefore;
-            int mPaddingAfter;
-
-            void searchTextCell (const CSMWorld::IdTableBase *model, const QModelIndex& index,
-                const CSMWorld::UniversalId& id, bool writable, CSMDoc::Messages& messages) const;
-
-            void searchRegExCell (const CSMWorld::IdTableBase *model, const QModelIndex& index,
-                const CSMWorld::UniversalId& id, bool writable, CSMDoc::Messages& messages) const;
-
-            void searchRecordStateCell (const CSMWorld::IdTableBase *model,
-                const QModelIndex& index, const CSMWorld::UniversalId& id, bool writable,
-                CSMDoc::Messages& messages) const;
-
-            QString formatDescription (const QString& description, int pos, int length) const;
-
-            QString flatten (const QString& text) const;
-            
-        public:
-
-            Search();
-        
-            Search (Type type, bool caseSensitive, const std::string& value);
-
-            Search (Type type, bool caseSensitive, const QRegExp& value);
-
-            Search (Type type, bool caseSensitive, int value);
-
-            // Configure search for the specified model.
-            void configure (const CSMWorld::IdTableBase *model);
-
-            // Search row in \a model and store results in \a messages.
-            //
-            // \attention *this needs to be configured for \a model.
-            void searchRow (const CSMWorld::IdTableBase *model, int row,
-                CSMDoc::Messages& messages) const;
-
-            void setPadding (int before, int after);
-
-            // Configuring *this for the model is not necessary when calling this function.
-            void replace (CSMDoc::Document& document, CSMWorld::IdTableBase *model,
-                const CSMWorld::UniversalId& id, const std::string& messageHint,
-                const std::string& replaceText) const;
-
-            // Check if model still matches search results.
-            bool verify (CSMDoc::Document& document, CSMWorld::IdTableBase *model,
-                const CSMWorld::UniversalId& id, const std::string& messageHint) const;
+    public:
+        enum Type
+        {
+            Type_Text = 0,
+            Type_TextRegEx = 1,
+            Type_Id = 2,
+            Type_IdRegEx = 3,
+            Type_RecordState = 4,
+            Type_None
+        };
+
+    private:
+        Type mType;
+        std::string mText;
+        QRegExp mRegExp;
+        int mValue;
+        bool mCase;
+        std::set<int> mColumns;
+        int mIdColumn;
+        int mTypeColumn;
+        int mPaddingBefore;
+        int mPaddingAfter;
+
+        void searchTextCell(const CSMWorld::IdTableBase* model, const QModelIndex& index,
+            const CSMWorld::UniversalId& id, bool writable, CSMDoc::Messages& messages) const;
+
+        void searchRegExCell(const CSMWorld::IdTableBase* model, const QModelIndex& index,
+            const CSMWorld::UniversalId& id, bool writable, CSMDoc::Messages& messages) const;
+
+        void searchRecordStateCell(const CSMWorld::IdTableBase* model, const QModelIndex& index,
+            const CSMWorld::UniversalId& id, bool writable, CSMDoc::Messages& messages) const;
+
+        QString formatDescription(const QString& description, int pos, int length) const;
+
+        QString flatten(const QString& text) const;
+
+    public:
+        Search();
+
+        Search(Type type, bool caseSensitive, const std::string& value);
+
+        Search(Type type, bool caseSensitive, const QRegExp& value);
+
+        Search(Type type, bool caseSensitive, int value);
+
+        // Configure search for the specified model.
+        void configure(const CSMWorld::IdTableBase* model);
+
+        // Search row in \a model and store results in \a messages.
+        //
+        // \attention *this needs to be configured for \a model.
+        void searchRow(const CSMWorld::IdTableBase* model, int row, CSMDoc::Messages& messages) const;
+
+        void setPadding(int before, int after);
+
+        // Configuring *this for the model is not necessary when calling this function.
+        void replace(CSMDoc::Document& document, CSMWorld::IdTableBase* model, const CSMWorld::UniversalId& id,
+            const std::string& messageHint, const std::string& replaceText) const;
+
+        // Check if model still matches search results.
+        bool verify(CSMDoc::Document& document, CSMWorld::IdTableBase* model, const CSMWorld::UniversalId& id,
+            const std::string& messageHint) const;
     };
 }
 
-Q_DECLARE_METATYPE (CSMTools::Search)
+Q_DECLARE_METATYPE(CSMTools::Search)
 
 #endif
diff --git a/apps/opencs/model/tools/searchoperation.cpp b/apps/opencs/model/tools/searchoperation.cpp
index 8fba1cc1ef..48247481d6 100644
--- a/apps/opencs/model/tools/searchoperation.cpp
+++ b/apps/opencs/model/tools/searchoperation.cpp
@@ -1,38 +1,34 @@
 #include "searchoperation.hpp"
 
-#include "../doc/state.hpp"
 #include "../doc/document.hpp"
+#include "../doc/state.hpp"
 
 #include "../world/data.hpp"
 #include "../world/idtablebase.hpp"
 
 #include "searchstage.hpp"
 
-CSMTools::SearchOperation::SearchOperation (CSMDoc::Document& document)
-: CSMDoc::Operation (CSMDoc::State_Searching, false)
+CSMTools::SearchOperation::SearchOperation(CSMDoc::Document& document)
+    : CSMDoc::Operation(CSMDoc::State_Searching, false)
 {
-    std::vector<CSMWorld::UniversalId::Type> types = CSMWorld::UniversalId::listTypes (
-        CSMWorld::UniversalId::Class_RecordList |
-        CSMWorld::UniversalId::Class_ResourceList
-        );
+    std::vector<CSMWorld::UniversalId::Type> types = CSMWorld::UniversalId::listTypes(
+        CSMWorld::UniversalId::Class_RecordList | CSMWorld::UniversalId::Class_ResourceList);
 
-    for (std::vector<CSMWorld::UniversalId::Type>::const_iterator iter (types.begin());
-        iter!=types.end(); ++iter)
-        appendStage (new SearchStage (&dynamic_cast<CSMWorld::IdTableBase&> (
-            *document.getData().getTableModel (*iter))));
+    for (std::vector<CSMWorld::UniversalId::Type>::const_iterator iter(types.begin()); iter != types.end(); ++iter)
+        appendStage(new SearchStage(&dynamic_cast<CSMWorld::IdTableBase&>(*document.getData().getTableModel(*iter))));
 
-    setDefaultSeverity (CSMDoc::Message::Severity_Info);
+    setDefaultSeverity(CSMDoc::Message::Severity_Info);
 }
 
-void CSMTools::SearchOperation::configure (const Search& search)
+void CSMTools::SearchOperation::configure(const Search& search)
 {
     mSearch = search;
 }
 
-void CSMTools::SearchOperation::appendStage (SearchStage *stage)
+void CSMTools::SearchOperation::appendStage(SearchStage* stage)
 {
-    CSMDoc::Operation::appendStage (stage);
-    stage->setOperation (this);
+    CSMDoc::Operation::appendStage(stage);
+    stage->setOperation(this);
 }
 
 const CSMTools::Search& CSMTools::SearchOperation::getSearch() const
diff --git a/apps/opencs/model/tools/searchoperation.hpp b/apps/opencs/model/tools/searchoperation.hpp
index fbbb388981..87a046d09e 100644
--- a/apps/opencs/model/tools/searchoperation.hpp
+++ b/apps/opencs/model/tools/searchoperation.hpp
@@ -13,25 +13,23 @@ namespace CSMDoc
 namespace CSMTools
 {
     class SearchStage;
-    
+
     class SearchOperation : public CSMDoc::Operation
     {
-            Search mSearch;
-            
-        public:
+        Search mSearch;
 
-            SearchOperation (CSMDoc::Document& document);
+    public:
+        SearchOperation(CSMDoc::Document& document);
 
-            /// \attention Do not call this function while a search is running.
-            void configure (const Search& search);
+        /// \attention Do not call this function while a search is running.
+        void configure(const Search& search);
 
-            void appendStage (SearchStage *stage);
-            ///< The ownership of \a stage is transferred to *this.
-            ///
-            /// \attention Do no call this function while this Operation is running.
+        void appendStage(SearchStage* stage);
+        ///< The ownership of \a stage is transferred to *this.
+        ///
+        /// \attention Do no call this function while this Operation is running.
 
-            const Search& getSearch() const;
-            
+        const Search& getSearch() const;
     };
 }
 
diff --git a/apps/opencs/model/tools/searchstage.cpp b/apps/opencs/model/tools/searchstage.cpp
index 7cd3f49243..074a846871 100644
--- a/apps/opencs/model/tools/searchstage.cpp
+++ b/apps/opencs/model/tools/searchstage.cpp
@@ -4,26 +4,28 @@
 
 #include "searchoperation.hpp"
 
-CSMTools::SearchStage::SearchStage (const CSMWorld::IdTableBase *model)
-: mModel (model), mOperation (nullptr)
-{}
+CSMTools::SearchStage::SearchStage(const CSMWorld::IdTableBase* model)
+    : mModel(model)
+    , mOperation(nullptr)
+{
+}
 
 int CSMTools::SearchStage::setup()
 {
     if (mOperation)
         mSearch = mOperation->getSearch();
 
-    mSearch.configure (mModel);
-        
+    mSearch.configure(mModel);
+
     return mModel->rowCount();
 }
 
-void CSMTools::SearchStage::perform (int stage, CSMDoc::Messages& messages)
+void CSMTools::SearchStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    mSearch.searchRow (mModel, stage, messages);
+    mSearch.searchRow(mModel, stage, messages);
 }
 
-void CSMTools::SearchStage::setOperation (const SearchOperation *operation)
+void CSMTools::SearchStage::setOperation(const SearchOperation* operation)
 {
     mOperation = operation;
 }
diff --git a/apps/opencs/model/tools/searchstage.hpp b/apps/opencs/model/tools/searchstage.hpp
index 86abf31a34..6ce98c84f2 100644
--- a/apps/opencs/model/tools/searchstage.hpp
+++ b/apps/opencs/model/tools/searchstage.hpp
@@ -13,24 +13,23 @@ namespace CSMWorld
 namespace CSMTools
 {
     class SearchOperation;
-    
+
     class SearchStage : public CSMDoc::Stage
     {
-            const CSMWorld::IdTableBase *mModel;
-            Search mSearch;
-            const SearchOperation *mOperation;
-
-        public:
+        const CSMWorld::IdTableBase* mModel;
+        Search mSearch;
+        const SearchOperation* mOperation;
 
-            SearchStage (const CSMWorld::IdTableBase *model);
+    public:
+        SearchStage(const CSMWorld::IdTableBase* model);
 
-            int setup() override;
-            ///< \return number of steps
+        int setup() override;
+        ///< \return number of steps
 
-            void perform (int stage, CSMDoc::Messages& messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
 
-            void setOperation (const SearchOperation *operation);
+        void setOperation(const SearchOperation* operation);
     };
 }
 
diff --git a/apps/opencs/model/tools/skillcheck.cpp b/apps/opencs/model/tools/skillcheck.cpp
index c5b38dc1e0..8fd1f5f664 100644
--- a/apps/opencs/model/tools/skillcheck.cpp
+++ b/apps/opencs/model/tools/skillcheck.cpp
@@ -4,8 +4,8 @@
 
 #include "../world/universalid.hpp"
 
-CSMTools::SkillCheckStage::SkillCheckStage (const CSMWorld::IdCollection<ESM::Skill>& skills)
-: mSkills (skills)
+CSMTools::SkillCheckStage::SkillCheckStage(const CSMWorld::IdCollection<ESM::Skill>& skills)
+    : mSkills(skills)
 {
     mIgnoreBaseRecords = false;
 }
@@ -17,9 +17,9 @@ int CSMTools::SkillCheckStage::setup()
     return mSkills.getSize();
 }
 
-void CSMTools::SkillCheckStage::perform (int stage, CSMDoc::Messages& messages)
+void CSMTools::SkillCheckStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    const CSMWorld::Record<ESM::Skill>& record = mSkills.getRecord (stage);
+    const CSMWorld::Record<ESM::Skill>& record = mSkills.getRecord(stage);
 
     // Skip "Base" records (setting!) and "Deleted" records
     if ((mIgnoreBaseRecords && record.mState == CSMWorld::RecordBase::State_BaseOnly) || record.isDeleted())
@@ -27,13 +27,13 @@ void CSMTools::SkillCheckStage::perform (int stage, CSMDoc::Messages& messages)
 
     const ESM::Skill& skill = record.get();
 
-    CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Skill, skill.mId);
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Skill, skill.mId);
 
     if (skill.mDescription.empty())
         messages.add(id, "Description is missing", "", CSMDoc::Message::Severity_Warning);
 
-    for (int i=0; i<4; ++i)
-        if (skill.mData.mUseValue[i]<0)
+    for (int i = 0; i < 4; ++i)
+        if (skill.mData.mUseValue[i] < 0)
         {
             messages.add(id, "Use value #" + std::to_string(i) + " is negative", "", CSMDoc::Message::Severity_Error);
         }
diff --git a/apps/opencs/model/tools/skillcheck.hpp b/apps/opencs/model/tools/skillcheck.hpp
index f13a5b7a29..c88f7e3715 100644
--- a/apps/opencs/model/tools/skillcheck.hpp
+++ b/apps/opencs/model/tools/skillcheck.hpp
@@ -12,18 +12,17 @@ namespace CSMTools
     /// \brief VerifyStage: make sure that skill records are internally consistent
     class SkillCheckStage : public CSMDoc::Stage
     {
-            const CSMWorld::IdCollection<ESM::Skill>& mSkills;
-            bool mIgnoreBaseRecords;
+        const CSMWorld::IdCollection<ESM::Skill>& mSkills;
+        bool mIgnoreBaseRecords;
 
-        public:
+    public:
+        SkillCheckStage(const CSMWorld::IdCollection<ESM::Skill>& skills);
 
-            SkillCheckStage (const CSMWorld::IdCollection<ESM::Skill>& skills);
+        int setup() override;
+        ///< \return number of steps
 
-            int setup() override;
-            ///< \return number of steps
-
-            void perform (int stage, CSMDoc::Messages& messages) override;
-            ///< Messages resulting from this tage will be appended to \a messages.
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
 
diff --git a/apps/opencs/model/tools/soundcheck.cpp b/apps/opencs/model/tools/soundcheck.cpp
index c0d893f1a1..cc57eb6017 100644
--- a/apps/opencs/model/tools/soundcheck.cpp
+++ b/apps/opencs/model/tools/soundcheck.cpp
@@ -4,10 +4,10 @@
 
 #include "../world/universalid.hpp"
 
-CSMTools::SoundCheckStage::SoundCheckStage (const CSMWorld::IdCollection<ESM::Sound> &sounds,
-                                            const CSMWorld::Resources &soundfiles)
-    : mSounds (sounds),
-      mSoundFiles (soundfiles)
+CSMTools::SoundCheckStage::SoundCheckStage(
+    const CSMWorld::IdCollection<ESM::Sound>& sounds, const CSMWorld::Resources& soundfiles)
+    : mSounds(sounds)
+    , mSoundFiles(soundfiles)
 {
     mIgnoreBaseRecords = false;
 }
@@ -19,9 +19,9 @@ int CSMTools::SoundCheckStage::setup()
     return mSounds.getSize();
 }
 
-void CSMTools::SoundCheckStage::perform (int stage, CSMDoc::Messages& messages)
+void CSMTools::SoundCheckStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    const CSMWorld::Record<ESM::Sound>& record = mSounds.getRecord (stage);
+    const CSMWorld::Record<ESM::Sound>& record = mSounds.getRecord(stage);
 
     // Skip "Base" records (setting!) and "Deleted" records
     if ((mIgnoreBaseRecords && record.mState == CSMWorld::RecordBase::State_BaseOnly) || record.isDeleted())
@@ -29,9 +29,9 @@ void CSMTools::SoundCheckStage::perform (int stage, CSMDoc::Messages& messages)
 
     const ESM::Sound& sound = record.get();
 
-    CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Sound, sound.mId);
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Sound, sound.mId);
 
-    if (sound.mData.mMinRange>sound.mData.mMaxRange)
+    if (sound.mData.mMinRange > sound.mData.mMaxRange)
     {
         messages.add(id, "Minimum range is larger than maximum range", "", CSMDoc::Message::Severity_Warning);
     }
diff --git a/apps/opencs/model/tools/soundcheck.hpp b/apps/opencs/model/tools/soundcheck.hpp
index fc3255c538..d97ffe9ab4 100644
--- a/apps/opencs/model/tools/soundcheck.hpp
+++ b/apps/opencs/model/tools/soundcheck.hpp
@@ -3,8 +3,8 @@
 
 #include <components/esm3/loadsoun.hpp>
 
-#include "../world/resources.hpp"
 #include "../world/idcollection.hpp"
+#include "../world/resources.hpp"
 
 #include "../doc/stage.hpp"
 
@@ -13,20 +13,18 @@ namespace CSMTools
     /// \brief VerifyStage: make sure that sound records are internally consistent
     class SoundCheckStage : public CSMDoc::Stage
     {
-            const CSMWorld::IdCollection<ESM::Sound>& mSounds;
-            const CSMWorld::Resources &mSoundFiles;
-            bool mIgnoreBaseRecords;
-
-        public:
+        const CSMWorld::IdCollection<ESM::Sound>& mSounds;
+        const CSMWorld::Resources& mSoundFiles;
+        bool mIgnoreBaseRecords;
 
-            SoundCheckStage (const CSMWorld::IdCollection<ESM::Sound>& sounds,
-                             const CSMWorld::Resources &soundfiles);
+    public:
+        SoundCheckStage(const CSMWorld::IdCollection<ESM::Sound>& sounds, const CSMWorld::Resources& soundfiles);
 
-            int setup() override;
-            ///< \return number of steps
+        int setup() override;
+        ///< \return number of steps
 
-            void perform (int stage, CSMDoc::Messages& messages) override;
-            ///< Messages resulting from this tage will be appended to \a messages.
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
 
diff --git a/apps/opencs/model/tools/soundgencheck.cpp b/apps/opencs/model/tools/soundgencheck.cpp
index ef6c211fb3..5168931fc1 100644
--- a/apps/opencs/model/tools/soundgencheck.cpp
+++ b/apps/opencs/model/tools/soundgencheck.cpp
@@ -5,15 +5,14 @@
 #include "../world/refiddata.hpp"
 #include "../world/universalid.hpp"
 
-#include <components/esm3/loadsoun.hpp>
 #include <components/esm3/loadsndg.hpp>
+#include <components/esm3/loadsoun.hpp>
 
-CSMTools::SoundGenCheckStage::SoundGenCheckStage(const CSMWorld::IdCollection<ESM::SoundGenerator> &soundGens,
-                                                 const CSMWorld::IdCollection<ESM::Sound> &sounds,
-                                                 const CSMWorld::RefIdCollection &objects)
-    : mSoundGens(soundGens),
-      mSounds(sounds),
-      mObjects(objects)
+CSMTools::SoundGenCheckStage::SoundGenCheckStage(const CSMWorld::IdCollection<ESM::SoundGenerator>& soundGens,
+    const CSMWorld::IdCollection<ESM::Sound>& sounds, const CSMWorld::RefIdCollection& objects)
+    : mSoundGens(soundGens)
+    , mSounds(sounds)
+    , mObjects(objects)
 {
     mIgnoreBaseRecords = false;
 }
@@ -25,10 +24,10 @@ int CSMTools::SoundGenCheckStage::setup()
     return mSoundGens.getSize();
 }
 
-void CSMTools::SoundGenCheckStage::perform(int stage, CSMDoc::Messages &messages)
+void CSMTools::SoundGenCheckStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    const CSMWorld::Record<ESM::SoundGenerator> &record = mSoundGens.getRecord(stage);
-    
+    const CSMWorld::Record<ESM::SoundGenerator>& record = mSoundGens.getRecord(stage);
+
     // Skip "Base" records (setting!) and "Deleted" records
     if ((mIgnoreBaseRecords && record.mState == CSMWorld::RecordBase::State_BaseOnly) || record.isDeleted())
         return;
@@ -41,7 +40,8 @@ void CSMTools::SoundGenCheckStage::perform(int stage, CSMDoc::Messages &messages
         CSMWorld::RefIdData::LocalIndex creatureIndex = mObjects.getDataSet().searchId(soundGen.mCreature);
         if (creatureIndex.first == -1)
         {
-            messages.add(id, "Creature '" + soundGen.mCreature + "' doesn't exist", "", CSMDoc::Message::Severity_Error);
+            messages.add(
+                id, "Creature '" + soundGen.mCreature + "' doesn't exist", "", CSMDoc::Message::Severity_Error);
         }
         else if (creatureIndex.second != CSMWorld::UniversalId::Type_Creature)
         {
diff --git a/apps/opencs/model/tools/soundgencheck.hpp b/apps/opencs/model/tools/soundgencheck.hpp
index 1a34db5694..a557f0b7d2 100644
--- a/apps/opencs/model/tools/soundgencheck.hpp
+++ b/apps/opencs/model/tools/soundgencheck.hpp
@@ -17,21 +17,20 @@ namespace CSMTools
     /// \brief VerifyStage: make sure that sound gen records are internally consistent
     class SoundGenCheckStage : public CSMDoc::Stage
     {
-            const CSMWorld::IdCollection<ESM::SoundGenerator> &mSoundGens;
-            const CSMWorld::IdCollection<ESM::Sound> &mSounds;
-            const CSMWorld::RefIdCollection &mObjects;
-            bool mIgnoreBaseRecords;
+        const CSMWorld::IdCollection<ESM::SoundGenerator>& mSoundGens;
+        const CSMWorld::IdCollection<ESM::Sound>& mSounds;
+        const CSMWorld::RefIdCollection& mObjects;
+        bool mIgnoreBaseRecords;
 
-        public:
-            SoundGenCheckStage(const CSMWorld::IdCollection<ESM::SoundGenerator> &soundGens,
-                               const CSMWorld::IdCollection<ESM::Sound> &sounds,
-                               const CSMWorld::RefIdCollection &objects);
+    public:
+        SoundGenCheckStage(const CSMWorld::IdCollection<ESM::SoundGenerator>& soundGens,
+            const CSMWorld::IdCollection<ESM::Sound>& sounds, const CSMWorld::RefIdCollection& objects);
 
-            int setup() override;
-            ///< \return number of steps
+        int setup() override;
+        ///< \return number of steps
 
-            void perform(int stage, CSMDoc::Messages &messages) override;
-            ///< Messages resulting from this stage will be appended to \a messages.
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this stage will be appended to \a messages.
     };
 }
 
diff --git a/apps/opencs/model/tools/spellcheck.cpp b/apps/opencs/model/tools/spellcheck.cpp
index eb2302aa70..066b50b744 100644
--- a/apps/opencs/model/tools/spellcheck.cpp
+++ b/apps/opencs/model/tools/spellcheck.cpp
@@ -4,9 +4,8 @@
 
 #include "../prefs/state.hpp"
 
-
-CSMTools::SpellCheckStage::SpellCheckStage (const CSMWorld::IdCollection<ESM::Spell>& spells)
-: mSpells (spells)
+CSMTools::SpellCheckStage::SpellCheckStage(const CSMWorld::IdCollection<ESM::Spell>& spells)
+    : mSpells(spells)
 {
     mIgnoreBaseRecords = false;
 }
@@ -18,9 +17,9 @@ int CSMTools::SpellCheckStage::setup()
     return mSpells.getSize();
 }
 
-void CSMTools::SpellCheckStage::perform (int stage, CSMDoc::Messages& messages)
+void CSMTools::SpellCheckStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    const CSMWorld::Record<ESM::Spell>& record = mSpells.getRecord (stage);
+    const CSMWorld::Record<ESM::Spell>& record = mSpells.getRecord(stage);
 
     // Skip "Base" records (setting!) and "Deleted" records
     if ((mIgnoreBaseRecords && record.mState == CSMWorld::RecordBase::State_BaseOnly) || record.isDeleted())
@@ -28,14 +27,14 @@ void CSMTools::SpellCheckStage::perform (int stage, CSMDoc::Messages& messages)
 
     const ESM::Spell& spell = record.get();
 
-    CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Spell, spell.mId);
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Spell, spell.mId);
 
     // test for empty name
     if (spell.mName.empty())
         messages.add(id, "Name is missing", "", CSMDoc::Message::Severity_Error);
 
     // test for invalid cost values
-    if (spell.mData.mCost<0)
+    if (spell.mData.mCost < 0)
         messages.add(id, "Spell cost is negative", "", CSMDoc::Message::Severity_Error);
 
     /// \todo check data members that can't be edited in the table view
diff --git a/apps/opencs/model/tools/spellcheck.hpp b/apps/opencs/model/tools/spellcheck.hpp
index 1a8d3d0237..02eabe6f9f 100644
--- a/apps/opencs/model/tools/spellcheck.hpp
+++ b/apps/opencs/model/tools/spellcheck.hpp
@@ -12,18 +12,17 @@ namespace CSMTools
     /// \brief VerifyStage: make sure that spell records are internally consistent
     class SpellCheckStage : public CSMDoc::Stage
     {
-            const CSMWorld::IdCollection<ESM::Spell>& mSpells;
-            bool mIgnoreBaseRecords;
+        const CSMWorld::IdCollection<ESM::Spell>& mSpells;
+        bool mIgnoreBaseRecords;
 
-        public:
+    public:
+        SpellCheckStage(const CSMWorld::IdCollection<ESM::Spell>& spells);
 
-            SpellCheckStage (const CSMWorld::IdCollection<ESM::Spell>& spells);
+        int setup() override;
+        ///< \return number of steps
 
-            int setup() override;
-            ///< \return number of steps
-
-            void perform (int stage, CSMDoc::Messages& messages) override;
-            ///< Messages resulting from this tage will be appended to \a messages.
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
 
diff --git a/apps/opencs/model/tools/startscriptcheck.cpp b/apps/opencs/model/tools/startscriptcheck.cpp
index 0dc8f9771d..f41598c43f 100644
--- a/apps/opencs/model/tools/startscriptcheck.cpp
+++ b/apps/opencs/model/tools/startscriptcheck.cpp
@@ -4,17 +4,17 @@
 
 #include <components/misc/strings/lower.hpp>
 
-CSMTools::StartScriptCheckStage::StartScriptCheckStage (
-    const CSMWorld::IdCollection<ESM::StartScript>& startScripts,
-    const CSMWorld::IdCollection<ESM::Script>& scripts)
-: mStartScripts (startScripts), mScripts (scripts)
+CSMTools::StartScriptCheckStage::StartScriptCheckStage(
+    const CSMWorld::IdCollection<ESM::StartScript>& startScripts, const CSMWorld::IdCollection<ESM::Script>& scripts)
+    : mStartScripts(startScripts)
+    , mScripts(scripts)
 {
     mIgnoreBaseRecords = false;
 }
 
 void CSMTools::StartScriptCheckStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    const CSMWorld::Record<ESM::StartScript>& record = mStartScripts.getRecord (stage);
+    const CSMWorld::Record<ESM::StartScript>& record = mStartScripts.getRecord(stage);
 
     // Skip "Base" records (setting!) and "Deleted" records
     if ((mIgnoreBaseRecords && record.mState == CSMWorld::RecordBase::State_BaseOnly) || record.isDeleted())
@@ -22,9 +22,9 @@ void CSMTools::StartScriptCheckStage::perform(int stage, CSMDoc::Messages& messa
 
     std::string scriptId = record.get().mId;
 
-    CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_StartScript, scriptId);
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_StartScript, scriptId);
 
-    if (mScripts.searchId (Misc::StringUtils::lowerCase (scriptId))==-1)
+    if (mScripts.searchId(Misc::StringUtils::lowerCase(scriptId)) == -1)
         messages.add(id, "Start script " + scriptId + " does not exist", "", CSMDoc::Message::Severity_Error);
 }
 
diff --git a/apps/opencs/model/tools/startscriptcheck.hpp b/apps/opencs/model/tools/startscriptcheck.hpp
index 4113090793..6283ecfeff 100644
--- a/apps/opencs/model/tools/startscriptcheck.hpp
+++ b/apps/opencs/model/tools/startscriptcheck.hpp
@@ -1,8 +1,8 @@
 #ifndef CSM_TOOLS_STARTSCRIPTCHECK_H
 #define CSM_TOOLS_STARTSCRIPTCHECK_H
 
-#include <components/esm3/loadsscr.hpp>
 #include <components/esm3/loadscpt.hpp>
+#include <components/esm3/loadsscr.hpp>
 
 #include "../doc/stage.hpp"
 
@@ -12,17 +12,16 @@ namespace CSMTools
 {
     class StartScriptCheckStage : public CSMDoc::Stage
     {
-            const CSMWorld::IdCollection<ESM::StartScript>& mStartScripts;
-            const CSMWorld::IdCollection<ESM::Script>& mScripts;
-            bool mIgnoreBaseRecords;
-
-        public:
+        const CSMWorld::IdCollection<ESM::StartScript>& mStartScripts;
+        const CSMWorld::IdCollection<ESM::Script>& mScripts;
+        bool mIgnoreBaseRecords;
 
-            StartScriptCheckStage (const CSMWorld::IdCollection<ESM::StartScript>& startScripts,
-                const CSMWorld::IdCollection<ESM::Script>& scripts);
+    public:
+        StartScriptCheckStage(const CSMWorld::IdCollection<ESM::StartScript>& startScripts,
+            const CSMWorld::IdCollection<ESM::Script>& scripts);
 
-            void perform(int stage, CSMDoc::Messages& messages) override;
-            int setup() override;
+        void perform(int stage, CSMDoc::Messages& messages) override;
+        int setup() override;
     };
 }
 
diff --git a/apps/opencs/model/tools/tools.cpp b/apps/opencs/model/tools/tools.cpp
index 5c2b822f3b..e7fc1bf2e1 100644
--- a/apps/opencs/model/tools/tools.cpp
+++ b/apps/opencs/model/tools/tools.cpp
@@ -1,155 +1,150 @@
 #include "tools.hpp"
 
-#include "../doc/state.hpp"
-#include "../doc/operation.hpp"
 #include "../doc/document.hpp"
+#include "../doc/operation.hpp"
+#include "../doc/state.hpp"
 
 #include "../world/data.hpp"
 #include "../world/universalid.hpp"
 
-#include "reportmodel.hpp"
-#include "mandatoryid.hpp"
-#include "skillcheck.hpp"
+#include "birthsigncheck.hpp"
+#include "bodypartcheck.hpp"
 #include "classcheck.hpp"
+#include "enchantmentcheck.hpp"
 #include "factioncheck.hpp"
+#include "gmstcheck.hpp"
+#include "journalcheck.hpp"
+#include "magiceffectcheck.hpp"
+#include "mandatoryid.hpp"
+#include "mergeoperation.hpp"
+#include "pathgridcheck.hpp"
 #include "racecheck.hpp"
-#include "soundcheck.hpp"
-#include "regioncheck.hpp"
-#include "birthsigncheck.hpp"
-#include "spellcheck.hpp"
 #include "referenceablecheck.hpp"
-#include "scriptcheck.hpp"
-#include "bodypartcheck.hpp"
 #include "referencecheck.hpp"
-#include "startscriptcheck.hpp"
+#include "regioncheck.hpp"
+#include "reportmodel.hpp"
+#include "scriptcheck.hpp"
 #include "searchoperation.hpp"
-#include "pathgridcheck.hpp"
+#include "skillcheck.hpp"
+#include "soundcheck.hpp"
 #include "soundgencheck.hpp"
-#include "magiceffectcheck.hpp"
-#include "mergeoperation.hpp"
-#include "gmstcheck.hpp"
+#include "spellcheck.hpp"
+#include "startscriptcheck.hpp"
 #include "topicinfocheck.hpp"
-#include "journalcheck.hpp"
-#include "enchantmentcheck.hpp"
 
-CSMDoc::OperationHolder *CSMTools::Tools::get (int type)
+CSMDoc::OperationHolder* CSMTools::Tools::get(int type)
 {
     switch (type)
     {
-        case CSMDoc::State_Verifying: return &mVerifier;
-        case CSMDoc::State_Searching: return &mSearch;
-        case CSMDoc::State_Merging: return &mMerge;
+        case CSMDoc::State_Verifying:
+            return &mVerifier;
+        case CSMDoc::State_Searching:
+            return &mSearch;
+        case CSMDoc::State_Merging:
+            return &mMerge;
     }
 
     return nullptr;
 }
 
-const CSMDoc::OperationHolder *CSMTools::Tools::get (int type) const
+const CSMDoc::OperationHolder* CSMTools::Tools::get(int type) const
 {
-    return const_cast<Tools *> (this)->get (type);
+    return const_cast<Tools*>(this)->get(type);
 }
 
-CSMDoc::OperationHolder *CSMTools::Tools::getVerifier()
+CSMDoc::OperationHolder* CSMTools::Tools::getVerifier()
 {
     if (!mVerifierOperation)
     {
-        mVerifierOperation = new CSMDoc::Operation (CSMDoc::State_Verifying, false);
+        mVerifierOperation = new CSMDoc::Operation(CSMDoc::State_Verifying, false);
 
-        connect (&mVerifier, &CSMDoc::OperationHolder::progress, this, &Tools::progress);
-        connect (&mVerifier, &CSMDoc::OperationHolder::done, this, &Tools::done);
-        connect (&mVerifier, &CSMDoc::OperationHolder::reportMessage,
-            this, &Tools::verifierMessage);
+        connect(&mVerifier, &CSMDoc::OperationHolder::progress, this, &Tools::progress);
+        connect(&mVerifier, &CSMDoc::OperationHolder::done, this, &Tools::done);
+        connect(&mVerifier, &CSMDoc::OperationHolder::reportMessage, this, &Tools::verifierMessage);
 
-        std::vector<std::string> mandatoryIds {"Day", "DaysPassed", "GameHour", "Month", "PCRace"};
+        std::vector<std::string> mandatoryIds{ "Day", "DaysPassed", "GameHour", "Month", "PCRace" };
 
-        mVerifierOperation->appendStage (new MandatoryIdStage (mData.getGlobals(),
-            CSMWorld::UniversalId (CSMWorld::UniversalId::Type_Globals), mandatoryIds));
+        mVerifierOperation->appendStage(new MandatoryIdStage(
+            mData.getGlobals(), CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Globals), mandatoryIds));
 
-        mVerifierOperation->appendStage (new SkillCheckStage (mData.getSkills()));
+        mVerifierOperation->appendStage(new SkillCheckStage(mData.getSkills()));
 
-        mVerifierOperation->appendStage (new ClassCheckStage (mData.getClasses()));
+        mVerifierOperation->appendStage(new ClassCheckStage(mData.getClasses()));
 
-        mVerifierOperation->appendStage (new FactionCheckStage (mData.getFactions()));
+        mVerifierOperation->appendStage(new FactionCheckStage(mData.getFactions()));
 
-        mVerifierOperation->appendStage (new RaceCheckStage (mData.getRaces()));
+        mVerifierOperation->appendStage(new RaceCheckStage(mData.getRaces()));
 
-        mVerifierOperation->appendStage (new SoundCheckStage (mData.getSounds(), mData.getResources (CSMWorld::UniversalId::Type_SoundsRes)));
+        mVerifierOperation->appendStage(
+            new SoundCheckStage(mData.getSounds(), mData.getResources(CSMWorld::UniversalId::Type_SoundsRes)));
+
+        mVerifierOperation->appendStage(new RegionCheckStage(mData.getRegions()));
+
+        mVerifierOperation->appendStage(
+            new BirthsignCheckStage(mData.getBirthsigns(), mData.getResources(CSMWorld::UniversalId::Type_Textures)));
 
-        mVerifierOperation->appendStage (new RegionCheckStage (mData.getRegions()));
+        mVerifierOperation->appendStage(new SpellCheckStage(mData.getSpells()));
 
-        mVerifierOperation->appendStage (new BirthsignCheckStage (mData.getBirthsigns(), mData.getResources (CSMWorld::UniversalId::Type_Textures)));
+        mVerifierOperation->appendStage(
+            new ReferenceableCheckStage(mData.getReferenceables().getDataSet(), mData.getRaces(), mData.getClasses(),
+                mData.getFactions(), mData.getScripts(), mData.getResources(CSMWorld::UniversalId::Type_Meshes),
+                mData.getResources(CSMWorld::UniversalId::Type_Icons), mData.getBodyParts()));
 
-        mVerifierOperation->appendStage (new SpellCheckStage (mData.getSpells()));
+        mVerifierOperation->appendStage(new ReferenceCheckStage(
+            mData.getReferences(), mData.getReferenceables(), mData.getCells(), mData.getFactions()));
 
-        mVerifierOperation->appendStage (new ReferenceableCheckStage (mData.getReferenceables().getDataSet(), mData.getRaces(), mData.getClasses(), mData.getFactions(), mData.getScripts(), 
-                                                                      mData.getResources (CSMWorld::UniversalId::Type_Meshes), mData.getResources (CSMWorld::UniversalId::Type_Icons),
-                                                                      mData.getBodyParts()));
+        mVerifierOperation->appendStage(new ScriptCheckStage(mDocument));
 
-        mVerifierOperation->appendStage (new ReferenceCheckStage(mData.getReferences(), mData.getReferenceables(), mData.getCells(), mData.getFactions()));
+        mVerifierOperation->appendStage(new StartScriptCheckStage(mData.getStartScripts(), mData.getScripts()));
 
-        mVerifierOperation->appendStage (new ScriptCheckStage (mDocument));
+        mVerifierOperation->appendStage(new BodyPartCheckStage(mData.getBodyParts(),
+            mData.getResources(CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Meshes)), mData.getRaces()));
 
-        mVerifierOperation->appendStage (new StartScriptCheckStage (mData.getStartScripts(), mData.getScripts()));
+        mVerifierOperation->appendStage(new PathgridCheckStage(mData.getPathgrids()));
 
         mVerifierOperation->appendStage(
-            new BodyPartCheckStage(
-                mData.getBodyParts(),
-                mData.getResources(
-                    CSMWorld::UniversalId( CSMWorld::UniversalId::Type_Meshes )),
-                mData.getRaces() ));
-
-        mVerifierOperation->appendStage (new PathgridCheckStage (mData.getPathgrids()));
-
-        mVerifierOperation->appendStage (new SoundGenCheckStage (mData.getSoundGens(),
-                                                                 mData.getSounds(),
-                                                                 mData.getReferenceables()));
-
-        mVerifierOperation->appendStage (new MagicEffectCheckStage (mData.getMagicEffects(),
-                                                                    mData.getSounds(),
-                                                                    mData.getReferenceables(),
-                                                                    mData.getResources (CSMWorld::UniversalId::Type_Icons),
-                                                                    mData.getResources (CSMWorld::UniversalId::Type_Textures)));
-
-        mVerifierOperation->appendStage (new GmstCheckStage (mData.getGmsts()));
-
-        mVerifierOperation->appendStage (new TopicInfoCheckStage (mData.getTopicInfos(),
-                                                                  mData.getCells(),
-                                                                  mData.getClasses(),
-                                                                  mData.getFactions(),
-                                                                  mData.getGmsts(),
-                                                                  mData.getGlobals(),
-                                                                  mData.getJournals(),
-                                                                  mData.getRaces(),
-                                                                  mData.getRegions(),
-                                                                  mData.getTopics(),
-                                                                  mData.getReferenceables().getDataSet(),
-                                                                  mData.getResources (CSMWorld::UniversalId::Type_SoundsRes)));
-
-        mVerifierOperation->appendStage (new JournalCheckStage(mData.getJournals(), mData.getJournalInfos()));
-
-        mVerifierOperation->appendStage (new EnchantmentCheckStage(mData.getEnchantments()));
-
-        mVerifier.setOperation (mVerifierOperation);
+            new SoundGenCheckStage(mData.getSoundGens(), mData.getSounds(), mData.getReferenceables()));
+
+        mVerifierOperation->appendStage(new MagicEffectCheckStage(mData.getMagicEffects(), mData.getSounds(),
+            mData.getReferenceables(), mData.getResources(CSMWorld::UniversalId::Type_Icons),
+            mData.getResources(CSMWorld::UniversalId::Type_Textures)));
+
+        mVerifierOperation->appendStage(new GmstCheckStage(mData.getGmsts()));
+
+        mVerifierOperation->appendStage(new TopicInfoCheckStage(mData.getTopicInfos(), mData.getCells(),
+            mData.getClasses(), mData.getFactions(), mData.getGmsts(), mData.getGlobals(), mData.getJournals(),
+            mData.getRaces(), mData.getRegions(), mData.getTopics(), mData.getReferenceables().getDataSet(),
+            mData.getResources(CSMWorld::UniversalId::Type_SoundsRes)));
+
+        mVerifierOperation->appendStage(new JournalCheckStage(mData.getJournals(), mData.getJournalInfos()));
+
+        mVerifierOperation->appendStage(new EnchantmentCheckStage(mData.getEnchantments()));
+
+        mVerifier.setOperation(mVerifierOperation);
     }
 
     return &mVerifier;
 }
 
-CSMTools::Tools::Tools (CSMDoc::Document& document, ToUTF8::FromType encoding)
-: mDocument (document), mData (document.getData()), mVerifierOperation (nullptr),
-  mSearchOperation (nullptr), mMergeOperation (nullptr), mNextReportNumber (0), mEncoding (encoding)
+CSMTools::Tools::Tools(CSMDoc::Document& document, ToUTF8::FromType encoding)
+    : mDocument(document)
+    , mData(document.getData())
+    , mVerifierOperation(nullptr)
+    , mSearchOperation(nullptr)
+    , mMergeOperation(nullptr)
+    , mNextReportNumber(0)
+    , mEncoding(encoding)
 {
     // index 0: load error log
-    mReports.insert (std::make_pair (mNextReportNumber++, new ReportModel));
-    mActiveReports.insert (std::make_pair (CSMDoc::State_Loading, 0));
+    mReports.insert(std::make_pair(mNextReportNumber++, new ReportModel));
+    mActiveReports.insert(std::make_pair(CSMDoc::State_Loading, 0));
 
-    connect (&mSearch, &CSMDoc::OperationHolder::progress, this, &Tools::progress);
-    connect (&mSearch, &CSMDoc::OperationHolder::done, this, &Tools::done);
-    connect (&mSearch, &CSMDoc::OperationHolder::reportMessage,
-        this, &Tools::verifierMessage);
+    connect(&mSearch, &CSMDoc::OperationHolder::progress, this, &Tools::progress);
+    connect(&mSearch, &CSMDoc::OperationHolder::done, this, &Tools::done);
+    connect(&mSearch, &CSMDoc::OperationHolder::reportMessage, this, &Tools::verifierMessage);
 
-    connect (&mMerge, &CSMDoc::OperationHolder::progress, this, &Tools::progress);
-    connect (&mMerge, &CSMDoc::OperationHolder::done, this, &Tools::done);
+    connect(&mMerge, &CSMDoc::OperationHolder::progress, this, &Tools::progress);
+    connect(&mMerge, &CSMDoc::OperationHolder::done, this, &Tools::done);
     // don't need to connect report message, since there are no messages for merge
 }
 
@@ -173,105 +168,104 @@ CSMTools::Tools::~Tools()
         delete mMergeOperation;
     }
 
-    for (std::map<int, ReportModel *>::iterator iter (mReports.begin()); iter!=mReports.end(); ++iter)
+    for (std::map<int, ReportModel*>::iterator iter(mReports.begin()); iter != mReports.end(); ++iter)
         delete iter->second;
 }
 
-CSMWorld::UniversalId CSMTools::Tools::runVerifier (const CSMWorld::UniversalId& reportId)
+CSMWorld::UniversalId CSMTools::Tools::runVerifier(const CSMWorld::UniversalId& reportId)
 {
-    int reportNumber = reportId.getType()==CSMWorld::UniversalId::Type_VerificationResults ?
-        reportId.getIndex() : mNextReportNumber++;
+    int reportNumber = reportId.getType() == CSMWorld::UniversalId::Type_VerificationResults ? reportId.getIndex()
+                                                                                             : mNextReportNumber++;
 
-    if (mReports.find (reportNumber)==mReports.end())
-        mReports.insert (std::make_pair (reportNumber, new ReportModel));
+    if (mReports.find(reportNumber) == mReports.end())
+        mReports.insert(std::make_pair(reportNumber, new ReportModel));
 
     mActiveReports[CSMDoc::State_Verifying] = reportNumber;
 
     getVerifier()->start();
 
-    return CSMWorld::UniversalId (CSMWorld::UniversalId::Type_VerificationResults, reportNumber);
+    return CSMWorld::UniversalId(CSMWorld::UniversalId::Type_VerificationResults, reportNumber);
 }
 
 CSMWorld::UniversalId CSMTools::Tools::newSearch()
 {
-    mReports.insert (std::make_pair (mNextReportNumber++, new ReportModel (true, false)));
+    mReports.insert(std::make_pair(mNextReportNumber++, new ReportModel(true, false)));
 
-    return CSMWorld::UniversalId (CSMWorld::UniversalId::Type_Search, mNextReportNumber-1);
+    return CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Search, mNextReportNumber - 1);
 }
 
-void CSMTools::Tools::runSearch (const CSMWorld::UniversalId& searchId, const Search& search)
+void CSMTools::Tools::runSearch(const CSMWorld::UniversalId& searchId, const Search& search)
 {
     mActiveReports[CSMDoc::State_Searching] = searchId.getIndex();
 
     if (!mSearchOperation)
     {
-        mSearchOperation = new SearchOperation (mDocument);
-        mSearch.setOperation (mSearchOperation);
+        mSearchOperation = new SearchOperation(mDocument);
+        mSearch.setOperation(mSearchOperation);
     }
 
-    mSearchOperation->configure (search);
+    mSearchOperation->configure(search);
 
     mSearch.start();
 }
 
-void CSMTools::Tools::runMerge (std::unique_ptr<CSMDoc::Document> target)
+void CSMTools::Tools::runMerge(std::unique_ptr<CSMDoc::Document> target)
 {
     // not setting an active report, because merge does not produce messages
 
     if (!mMergeOperation)
     {
-        mMergeOperation = new MergeOperation (mDocument, mEncoding);
-        mMerge.setOperation (mMergeOperation);
-        connect (mMergeOperation, &MergeOperation::mergeDone, this, &Tools::mergeDone);
+        mMergeOperation = new MergeOperation(mDocument, mEncoding);
+        mMerge.setOperation(mMergeOperation);
+        connect(mMergeOperation, &MergeOperation::mergeDone, this, &Tools::mergeDone);
     }
 
     target->flagAsDirty();
 
-    mMergeOperation->setTarget (std::move(target));
+    mMergeOperation->setTarget(std::move(target));
 
     mMerge.start();
 }
 
-void CSMTools::Tools::abortOperation (int type)
+void CSMTools::Tools::abortOperation(int type)
 {
-    if (CSMDoc::OperationHolder *operation = get (type))
+    if (CSMDoc::OperationHolder* operation = get(type))
         operation->abort();
 }
 
 int CSMTools::Tools::getRunningOperations() const
 {
-    static const int sOperations[] =
-    {
-       CSMDoc::State_Verifying,
-       CSMDoc::State_Searching,
-       CSMDoc::State_Merging,
+    static const int sOperations[] = {
+        CSMDoc::State_Verifying,
+        CSMDoc::State_Searching,
+        CSMDoc::State_Merging,
         -1,
     };
 
     int result = 0;
 
-    for (int i=0; sOperations[i]!=-1; ++i)
-        if (const CSMDoc::OperationHolder *operation = get (sOperations[i]))
+    for (int i = 0; sOperations[i] != -1; ++i)
+        if (const CSMDoc::OperationHolder* operation = get(sOperations[i]))
             if (operation->isRunning())
                 result |= sOperations[i];
 
     return result;
 }
 
-CSMTools::ReportModel *CSMTools::Tools::getReport (const CSMWorld::UniversalId& id)
+CSMTools::ReportModel* CSMTools::Tools::getReport(const CSMWorld::UniversalId& id)
 {
-    if (id.getType()!=CSMWorld::UniversalId::Type_VerificationResults &&
-        id.getType()!=CSMWorld::UniversalId::Type_LoadErrorLog &&
-        id.getType()!=CSMWorld::UniversalId::Type_Search)
-        throw std::logic_error ("invalid request for report model: " + id.toString());
+    if (id.getType() != CSMWorld::UniversalId::Type_VerificationResults
+        && id.getType() != CSMWorld::UniversalId::Type_LoadErrorLog
+        && id.getType() != CSMWorld::UniversalId::Type_Search)
+        throw std::logic_error("invalid request for report model: " + id.toString());
 
-    return mReports.at (id.getIndex());
+    return mReports.at(id.getIndex());
 }
 
-void CSMTools::Tools::verifierMessage (const CSMDoc::Message& message, int type)
+void CSMTools::Tools::verifierMessage(const CSMDoc::Message& message, int type)
 {
-    std::map<int, int>::iterator iter = mActiveReports.find (type);
+    std::map<int, int>::iterator iter = mActiveReports.find(type);
 
-    if (iter!=mActiveReports.end())
-        mReports[iter->second]->add (message);
+    if (iter != mActiveReports.end())
+        mReports[iter->second]->add(message);
 }
diff --git a/apps/opencs/model/tools/tools.hpp b/apps/opencs/model/tools/tools.hpp
index 93ab9b174d..8481b58735 100644
--- a/apps/opencs/model/tools/tools.hpp
+++ b/apps/opencs/model/tools/tools.hpp
@@ -1,8 +1,8 @@
 #ifndef CSM_TOOLS_TOOLS_H
 #define CSM_TOOLS_TOOLS_H
 
-#include <memory>
 #include <map>
+#include <memory>
 
 #include <components/to_utf8/to_utf8.hpp>
 
@@ -31,73 +31,72 @@ namespace CSMTools
 
     class Tools : public QObject
     {
-            Q_OBJECT
-
-            CSMDoc::Document& mDocument;
-            CSMWorld::Data& mData;
-            CSMDoc::Operation *mVerifierOperation;
-            CSMDoc::OperationHolder mVerifier;
-            SearchOperation *mSearchOperation;
-            CSMDoc::OperationHolder mSearch;
-            MergeOperation *mMergeOperation;
-            CSMDoc::OperationHolder mMerge;
-            std::map<int, ReportModel *> mReports;
-            int mNextReportNumber;
-            std::map<int, int> mActiveReports; // type, report number
-            ToUTF8::FromType mEncoding;
+        Q_OBJECT
 
-            // not implemented
-            Tools (const Tools&);
-            Tools& operator= (const Tools&);
+        CSMDoc::Document& mDocument;
+        CSMWorld::Data& mData;
+        CSMDoc::Operation* mVerifierOperation;
+        CSMDoc::OperationHolder mVerifier;
+        SearchOperation* mSearchOperation;
+        CSMDoc::OperationHolder mSearch;
+        MergeOperation* mMergeOperation;
+        CSMDoc::OperationHolder mMerge;
+        std::map<int, ReportModel*> mReports;
+        int mNextReportNumber;
+        std::map<int, int> mActiveReports; // type, report number
+        ToUTF8::FromType mEncoding;
 
-            CSMDoc::OperationHolder *getVerifier();
+        // not implemented
+        Tools(const Tools&);
+        Tools& operator=(const Tools&);
 
-            CSMDoc::OperationHolder *get (int type);
-            ///< Returns a 0-pointer, if operation hasn't been used yet.
+        CSMDoc::OperationHolder* getVerifier();
 
-            const CSMDoc::OperationHolder *get (int type) const;
-            ///< Returns a 0-pointer, if operation hasn't been used yet.
+        CSMDoc::OperationHolder* get(int type);
+        ///< Returns a 0-pointer, if operation hasn't been used yet.
 
-        public:
+        const CSMDoc::OperationHolder* get(int type) const;
+        ///< Returns a 0-pointer, if operation hasn't been used yet.
 
-            Tools (CSMDoc::Document& document, ToUTF8::FromType encoding);
+    public:
+        Tools(CSMDoc::Document& document, ToUTF8::FromType encoding);
 
-            virtual ~Tools();
+        virtual ~Tools();
 
-            /// \param reportId If a valid VerificationResults ID, run verifier for the
-            /// specified report instead of creating a new one.
-            ///
-            /// \return ID of the report for this verification run
-            CSMWorld::UniversalId runVerifier (const CSMWorld::UniversalId& reportId = CSMWorld::UniversalId());
+        /// \param reportId If a valid VerificationResults ID, run verifier for the
+        /// specified report instead of creating a new one.
+        ///
+        /// \return ID of the report for this verification run
+        CSMWorld::UniversalId runVerifier(const CSMWorld::UniversalId& reportId = CSMWorld::UniversalId());
 
-            /// Return ID of the report for this search.
-            CSMWorld::UniversalId newSearch();
+        /// Return ID of the report for this search.
+        CSMWorld::UniversalId newSearch();
 
-            void runSearch (const CSMWorld::UniversalId& searchId, const Search& search);
+        void runSearch(const CSMWorld::UniversalId& searchId, const Search& search);
 
-            void runMerge (std::unique_ptr<CSMDoc::Document> target);
+        void runMerge(std::unique_ptr<CSMDoc::Document> target);
 
-            void abortOperation (int type);
-            ///< \attention The operation is not aborted immediately.
+        void abortOperation(int type);
+        ///< \attention The operation is not aborted immediately.
 
-            int getRunningOperations() const;
+        int getRunningOperations() const;
 
-            ReportModel *getReport (const CSMWorld::UniversalId& id);
-            ///< The ownership of the returned report is not transferred.
+        ReportModel* getReport(const CSMWorld::UniversalId& id);
+        ///< The ownership of the returned report is not transferred.
 
-        private slots:
+    private slots:
 
-            void verifierMessage (const CSMDoc::Message& message, int type);
+        void verifierMessage(const CSMDoc::Message& message, int type);
 
-        signals:
+    signals:
 
-            void progress (int current, int max, int type);
+        void progress(int current, int max, int type);
 
-            void done (int type, bool failed);
+        void done(int type, bool failed);
 
-            /// \attention When this signal is emitted, *this hands over the ownership of the
-            /// document. This signal must be handled to avoid a leak.
-            void mergeDone (CSMDoc::Document *document);
+        /// \attention When this signal is emitted, *this hands over the ownership of the
+        /// document. This signal must be handled to avoid a leak.
+        void mergeDone(CSMDoc::Document* document);
     };
 }
 
diff --git a/apps/opencs/model/tools/topicinfocheck.cpp b/apps/opencs/model/tools/topicinfocheck.cpp
index 74643a46ee..2577ba1baf 100644
--- a/apps/opencs/model/tools/topicinfocheck.cpp
+++ b/apps/opencs/model/tools/topicinfocheck.cpp
@@ -6,31 +6,25 @@
 
 #include "../world/infoselectwrapper.hpp"
 
-CSMTools::TopicInfoCheckStage::TopicInfoCheckStage(
-    const CSMWorld::InfoCollection& topicInfos,
-    const CSMWorld::IdCollection<CSMWorld::Cell>& cells,
-    const CSMWorld::IdCollection<ESM::Class>& classes,
-    const CSMWorld::IdCollection<ESM::Faction>& factions,
-    const CSMWorld::IdCollection<ESM::GameSetting>& gmsts,
-    const CSMWorld::IdCollection<ESM::Global>& globals,
-    const CSMWorld::IdCollection<ESM::Dialogue>& journals,
-    const CSMWorld::IdCollection<ESM::Race>& races,
-    const CSMWorld::IdCollection<ESM::Region>& regions,
-    const CSMWorld::IdCollection<ESM::Dialogue> &topics,
-    const CSMWorld::RefIdData& referencables,
+CSMTools::TopicInfoCheckStage::TopicInfoCheckStage(const CSMWorld::InfoCollection& topicInfos,
+    const CSMWorld::IdCollection<CSMWorld::Cell>& cells, const CSMWorld::IdCollection<ESM::Class>& classes,
+    const CSMWorld::IdCollection<ESM::Faction>& factions, const CSMWorld::IdCollection<ESM::GameSetting>& gmsts,
+    const CSMWorld::IdCollection<ESM::Global>& globals, const CSMWorld::IdCollection<ESM::Dialogue>& journals,
+    const CSMWorld::IdCollection<ESM::Race>& races, const CSMWorld::IdCollection<ESM::Region>& regions,
+    const CSMWorld::IdCollection<ESM::Dialogue>& topics, const CSMWorld::RefIdData& referencables,
     const CSMWorld::Resources& soundFiles)
-    : mTopicInfos(topicInfos),
-      mCells(cells),
-      mClasses(classes),
-      mFactions(factions),
-      mGameSettings(gmsts),
-      mGlobals(globals),
-      mJournals(journals),
-      mRaces(races),
-      mRegions(regions),
-      mTopics(topics),
-      mReferencables(referencables),
-      mSoundFiles(soundFiles)
+    : mTopicInfos(topicInfos)
+    , mCells(cells)
+    , mClasses(classes)
+    , mFactions(factions)
+    , mGameSettings(gmsts)
+    , mGlobals(globals)
+    , mJournals(journals)
+    , mRaces(races)
+    , mRegions(regions)
+    , mTopics(topics)
+    , mReferencables(referencables)
+    , mSoundFiles(soundFiles)
 {
     mIgnoreBaseRecords = false;
 }
@@ -162,8 +156,8 @@ void CSMTools::TopicInfoCheckStage::perform(int stage, CSMDoc::Messages& message
 
 // Verification functions
 
-bool CSMTools::TopicInfoCheckStage::verifyActor(const std::string& actor, const CSMWorld::UniversalId& id,
-    CSMDoc::Messages& messages)
+bool CSMTools::TopicInfoCheckStage::verifyActor(
+    const std::string& actor, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages)
 {
     CSMWorld::RefIdData::LocalIndex index = mReferencables.searchId(actor);
 
@@ -181,7 +175,8 @@ bool CSMTools::TopicInfoCheckStage::verifyActor(const std::string& actor, const
     {
         CSMWorld::UniversalId tempId(index.second, actor);
         std::ostringstream stream;
-        stream << "Object '" << actor << "' has invalid type " << tempId.getTypeName() << " (an actor must be an NPC or a creature)"; 
+        stream << "Object '" << actor << "' has invalid type " << tempId.getTypeName()
+               << " (an actor must be an NPC or a creature)";
         messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
         return false;
     }
@@ -189,8 +184,8 @@ bool CSMTools::TopicInfoCheckStage::verifyActor(const std::string& actor, const
     return true;
 }
 
-bool CSMTools::TopicInfoCheckStage::verifyCell(const std::string& cell, const CSMWorld::UniversalId& id,
-    CSMDoc::Messages& messages)
+bool CSMTools::TopicInfoCheckStage::verifyCell(
+    const std::string& cell, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages)
 {
     if (mCellNames.find(cell) == mCellNames.end())
     {
@@ -201,8 +196,8 @@ bool CSMTools::TopicInfoCheckStage::verifyCell(const std::string& cell, const CS
     return true;
 }
 
-bool CSMTools::TopicInfoCheckStage::verifyFactionRank(const std::string& factionName, int rank, const CSMWorld::UniversalId& id,
-    CSMDoc::Messages& messages)
+bool CSMTools::TopicInfoCheckStage::verifyFactionRank(
+    const std::string& factionName, int rank, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages)
 {
     if (rank < -1)
     {
@@ -214,7 +209,7 @@ bool CSMTools::TopicInfoCheckStage::verifyFactionRank(const std::string& faction
 
     int index = mFactions.searchId(factionName);
 
-    const ESM::Faction &faction = mFactions.getRecord(index).get();
+    const ESM::Faction& faction = mFactions.getRecord(index).get();
 
     int limit = 0;
     for (; limit < 10; ++limit)
@@ -236,8 +231,8 @@ bool CSMTools::TopicInfoCheckStage::verifyFactionRank(const std::string& faction
     return true;
 }
 
-bool CSMTools::TopicInfoCheckStage::verifyItem(const std::string& item, const CSMWorld::UniversalId& id,
-    CSMDoc::Messages& messages)
+bool CSMTools::TopicInfoCheckStage::verifyItem(
+    const std::string& item, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages)
 {
     CSMWorld::RefIdData::LocalIndex index = mReferencables.searchId(item);
 
@@ -274,7 +269,8 @@ bool CSMTools::TopicInfoCheckStage::verifyItem(const std::string& item, const CS
             {
                 CSMWorld::UniversalId tempId(index.second, item);
                 std::ostringstream stream;
-                stream << "Object '" << item << "' has invalid type " << tempId.getTypeName() << " (an item can be a potion, an armor piece, a book and so on)"; 
+                stream << "Object '" << item << "' has invalid type " << tempId.getTypeName()
+                       << " (an item can be a potion, an armor piece, a book and so on)";
                 messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
                 return false;
             }
@@ -284,8 +280,8 @@ bool CSMTools::TopicInfoCheckStage::verifyItem(const std::string& item, const CS
     return true;
 }
 
-bool CSMTools::TopicInfoCheckStage::verifySelectStruct(const ESM::DialInfo::SelectStruct& select,
-    const CSMWorld::UniversalId& id, CSMDoc::Messages& messages)
+bool CSMTools::TopicInfoCheckStage::verifySelectStruct(
+    const ESM::DialInfo::SelectStruct& select, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages)
 {
     CSMWorld::ConstInfoSelectWrapper infoCondition(select);
 
@@ -301,13 +297,27 @@ bool CSMTools::TopicInfoCheckStage::verifySelectStruct(const ESM::DialInfo::Sele
 
         switch (select.mValue.getType())
         {
-            case ESM::VT_None:   stream << "None"; break;
-            case ESM::VT_Short:  stream << "Short"; break;
-            case ESM::VT_Int:    stream << "Int"; break;
-            case ESM::VT_Long:   stream << "Long"; break;
-            case ESM::VT_Float:  stream << "Float"; break;
-            case ESM::VT_String: stream << "String"; break;
-            default:             stream << "unknown"; break;
+            case ESM::VT_None:
+                stream << "None";
+                break;
+            case ESM::VT_Short:
+                stream << "Short";
+                break;
+            case ESM::VT_Int:
+                stream << "Int";
+                break;
+            case ESM::VT_Long:
+                stream << "Long";
+                break;
+            case ESM::VT_Float:
+                stream << "Float";
+                break;
+            case ESM::VT_String:
+                stream << "String";
+                break;
+            default:
+                stream << "unknown";
+                break;
         }
         stream << " type";
 
@@ -316,58 +326,60 @@ bool CSMTools::TopicInfoCheckStage::verifySelectStruct(const ESM::DialInfo::Sele
     }
     else if (infoCondition.conditionIsAlwaysTrue())
     {
-        messages.add(id, "Condition '" + infoCondition.toString() + "' is always true", "", CSMDoc::Message::Severity_Warning);
+        messages.add(
+            id, "Condition '" + infoCondition.toString() + "' is always true", "", CSMDoc::Message::Severity_Warning);
         return false;
     }
     else if (infoCondition.conditionIsNeverTrue())
     {
-        messages.add(id, "Condition '" + infoCondition.toString() + "' is never true", "", CSMDoc::Message::Severity_Warning);
+        messages.add(
+            id, "Condition '" + infoCondition.toString() + "' is never true", "", CSMDoc::Message::Severity_Warning);
         return false;
     }
 
     // Id checks
-    if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_Global &&
-        !verifyId(infoCondition.getVariableName(), mGlobals, id, messages))
+    if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_Global
+        && !verifyId(infoCondition.getVariableName(), mGlobals, id, messages))
     {
         return false;
     }
-    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_Journal &&
-        !verifyId(infoCondition.getVariableName(), mJournals, id, messages))
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_Journal
+        && !verifyId(infoCondition.getVariableName(), mJournals, id, messages))
     {
         return false;
     }
-    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_Item &&
-        !verifyItem(infoCondition.getVariableName(), id, messages))
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_Item
+        && !verifyItem(infoCondition.getVariableName(), id, messages))
     {
         return false;
     }
-    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_Dead &&
-        !verifyActor(infoCondition.getVariableName(), id, messages))
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_Dead
+        && !verifyActor(infoCondition.getVariableName(), id, messages))
     {
         return false;
     }
-    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotId &&
-        !verifyActor(infoCondition.getVariableName(), id, messages))
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotId
+        && !verifyActor(infoCondition.getVariableName(), id, messages))
     {
         return false;
     }
-    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotFaction &&
-        !verifyId(infoCondition.getVariableName(), mFactions, id, messages))
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotFaction
+        && !verifyId(infoCondition.getVariableName(), mFactions, id, messages))
     {
         return false;
     }
-    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotClass &&
-        !verifyId(infoCondition.getVariableName(), mClasses, id, messages))
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotClass
+        && !verifyId(infoCondition.getVariableName(), mClasses, id, messages))
     {
         return false;
     }
-    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotRace &&
-        !verifyId(infoCondition.getVariableName(), mRaces, id, messages))
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotRace
+        && !verifyId(infoCondition.getVariableName(), mRaces, id, messages))
     {
         return false;
     }
-    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotCell &&
-        !verifyCell(infoCondition.getVariableName(), id, messages))
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotCell
+        && !verifyCell(infoCondition.getVariableName(), id, messages))
     {
         return false;
     }
@@ -375,8 +387,8 @@ bool CSMTools::TopicInfoCheckStage::verifySelectStruct(const ESM::DialInfo::Sele
     return true;
 }
 
-bool CSMTools::TopicInfoCheckStage::verifySound(const std::string& sound, const CSMWorld::UniversalId& id,
-    CSMDoc::Messages& messages)
+bool CSMTools::TopicInfoCheckStage::verifySound(
+    const std::string& sound, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages)
 {
     if (mSoundFiles.searchId(sound) == -1)
     {
@@ -395,12 +407,14 @@ bool CSMTools::TopicInfoCheckStage::verifyId(const std::string& name, const CSMW
 
     if (index == -1)
     {
-        messages.add(id, std::string(T::getRecordType()) + " '" + name + "' does not exist", "", CSMDoc::Message::Severity_Error);
+        messages.add(id, std::string(T::getRecordType()) + " '" + name + "' does not exist", "",
+            CSMDoc::Message::Severity_Error);
         return false;
     }
     else if (collection.getRecord(index).isDeleted())
     {
-        messages.add(id, "Deleted " + std::string(T::getRecordType()) + " record '" + name + "' is being referenced", "", CSMDoc::Message::Severity_Error);
+        messages.add(id, "Deleted " + std::string(T::getRecordType()) + " record '" + name + "' is being referenced",
+            "", CSMDoc::Message::Severity_Error);
         return false;
     }
 
diff --git a/apps/opencs/model/tools/topicinfocheck.hpp b/apps/opencs/model/tools/topicinfocheck.hpp
index de3fa82ae3..864bca61d2 100644
--- a/apps/opencs/model/tools/topicinfocheck.hpp
+++ b/apps/opencs/model/tools/topicinfocheck.hpp
@@ -25,19 +25,12 @@ namespace CSMTools
     class TopicInfoCheckStage : public CSMDoc::Stage
     {
     public:
-
-        TopicInfoCheckStage(
-            const CSMWorld::InfoCollection& topicInfos,
-            const CSMWorld::IdCollection<CSMWorld::Cell>& cells,
-            const CSMWorld::IdCollection<ESM::Class>& classes,
-            const CSMWorld::IdCollection<ESM::Faction>& factions,
-            const CSMWorld::IdCollection<ESM::GameSetting>& gmsts,
-            const CSMWorld::IdCollection<ESM::Global>& globals,
-            const CSMWorld::IdCollection<ESM::Dialogue>& journals,
-            const CSMWorld::IdCollection<ESM::Race>& races,
-            const CSMWorld::IdCollection<ESM::Region>& regions,
-            const CSMWorld::IdCollection<ESM::Dialogue>& topics,
-            const CSMWorld::RefIdData& referencables,
+        TopicInfoCheckStage(const CSMWorld::InfoCollection& topicInfos,
+            const CSMWorld::IdCollection<CSMWorld::Cell>& cells, const CSMWorld::IdCollection<ESM::Class>& classes,
+            const CSMWorld::IdCollection<ESM::Faction>& factions, const CSMWorld::IdCollection<ESM::GameSetting>& gmsts,
+            const CSMWorld::IdCollection<ESM::Global>& globals, const CSMWorld::IdCollection<ESM::Dialogue>& journals,
+            const CSMWorld::IdCollection<ESM::Race>& races, const CSMWorld::IdCollection<ESM::Region>& regions,
+            const CSMWorld::IdCollection<ESM::Dialogue>& topics, const CSMWorld::RefIdData& referencables,
             const CSMWorld::Resources& soundFiles);
 
         int setup() override;
@@ -47,7 +40,6 @@ namespace CSMTools
         ///< Messages resulting from this stage will be appended to \a messages
 
     private:
-
         const CSMWorld::InfoCollection& mTopicInfos;
 
         const CSMWorld::IdCollection<CSMWorld::Cell>& mCells;
@@ -70,11 +62,11 @@ namespace CSMTools
         // These return false when not successful and write an error
         bool verifyActor(const std::string& name, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
         bool verifyCell(const std::string& name, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
-        bool verifyFactionRank(const std::string& name, int rank, const CSMWorld::UniversalId& id,
-            CSMDoc::Messages& messages);
+        bool verifyFactionRank(
+            const std::string& name, int rank, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
         bool verifyItem(const std::string& name, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
-        bool verifySelectStruct(const ESM::DialInfo::SelectStruct& select, const CSMWorld::UniversalId& id,
-            CSMDoc::Messages& messages);
+        bool verifySelectStruct(
+            const ESM::DialInfo::SelectStruct& select, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
         bool verifySound(const std::string& name, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
 
         template <typename T>
diff --git a/apps/opencs/model/world/actoradapter.cpp b/apps/opencs/model/world/actoradapter.cpp
index e1c457943d..2e40aa1607 100644
--- a/apps/opencs/model/world/actoradapter.cpp
+++ b/apps/opencs/model/world/actoradapter.cpp
@@ -73,7 +73,8 @@ namespace CSMWorld
 
     void ActorAdapter::RaceData::addOtherDependency(const std::string& id)
     {
-        if (!id.empty()) mDependencies.emplace(id);
+        if (!id.empty())
+            mDependencies.emplace(id);
     }
 
     void ActorAdapter::RaceData::reset_data(const std::string& id, bool isBeast)
@@ -90,7 +91,6 @@ namespace CSMWorld
         addOtherDependency(id);
     }
 
-
     ActorAdapter::ActorData::ActorData()
     {
         mCreature = false;
@@ -168,10 +168,12 @@ namespace CSMWorld
 
     void ActorAdapter::ActorData::addOtherDependency(const std::string& id)
     {
-        if (!id.empty()) mDependencies.emplace(id);
+        if (!id.empty())
+            mDependencies.emplace(id);
     }
 
-    void ActorAdapter::ActorData::reset_data(const std::string& id, const std::string& skeleton, bool isCreature, bool isFemale, RaceDataPtr raceData)
+    void ActorAdapter::ActorData::reset_data(
+        const std::string& id, const std::string& skeleton, bool isCreature, bool isFemale, RaceDataPtr raceData)
     {
         mId = id;
         mCreature = isCreature;
@@ -183,10 +185,10 @@ namespace CSMWorld
 
         // Mark self and race as a dependency
         addOtherDependency(id);
-        if (raceData) addOtherDependency(raceData->getId());
+        if (raceData)
+            addOtherDependency(raceData->getId());
     }
 
-
     ActorAdapter::ActorAdapter(Data& data)
         : mReferenceables(data.getReferenceables())
         , mRaces(data.getRaces())
@@ -194,28 +196,21 @@ namespace CSMWorld
     {
         // Setup qt slots and signals
         QAbstractItemModel* refModel = data.getTableModel(UniversalId::Type_Referenceable);
-        connect(refModel, &QAbstractItemModel::rowsInserted,
-                this, &ActorAdapter::handleReferenceablesInserted);
-        connect(refModel, &QAbstractItemModel::dataChanged,
-                this, &ActorAdapter::handleReferenceableChanged);
-        connect(refModel, &QAbstractItemModel::rowsAboutToBeRemoved,
-                this, &ActorAdapter::handleReferenceablesAboutToBeRemoved);
+        connect(refModel, &QAbstractItemModel::rowsInserted, this, &ActorAdapter::handleReferenceablesInserted);
+        connect(refModel, &QAbstractItemModel::dataChanged, this, &ActorAdapter::handleReferenceableChanged);
+        connect(refModel, &QAbstractItemModel::rowsAboutToBeRemoved, this,
+            &ActorAdapter::handleReferenceablesAboutToBeRemoved);
 
         QAbstractItemModel* raceModel = data.getTableModel(UniversalId::Type_Race);
-        connect(raceModel, &QAbstractItemModel::rowsInserted,
-                this, &ActorAdapter::handleRacesAboutToBeRemoved);
-        connect(raceModel, &QAbstractItemModel::dataChanged,
-                this, &ActorAdapter::handleRaceChanged);
-        connect(raceModel, &QAbstractItemModel::rowsAboutToBeRemoved,
-                this, &ActorAdapter::handleRacesAboutToBeRemoved);
+        connect(raceModel, &QAbstractItemModel::rowsInserted, this, &ActorAdapter::handleRacesAboutToBeRemoved);
+        connect(raceModel, &QAbstractItemModel::dataChanged, this, &ActorAdapter::handleRaceChanged);
+        connect(raceModel, &QAbstractItemModel::rowsAboutToBeRemoved, this, &ActorAdapter::handleRacesAboutToBeRemoved);
 
         QAbstractItemModel* partModel = data.getTableModel(UniversalId::Type_BodyPart);
-        connect(partModel, &QAbstractItemModel::rowsInserted,
-                this, &ActorAdapter::handleBodyPartsInserted);
-        connect(partModel, &QAbstractItemModel::dataChanged,
-                this, &ActorAdapter::handleBodyPartChanged);
-        connect(partModel, &QAbstractItemModel::rowsAboutToBeRemoved,
-                this, &ActorAdapter::handleBodyPartsAboutToBeRemoved);
+        connect(partModel, &QAbstractItemModel::rowsInserted, this, &ActorAdapter::handleBodyPartsInserted);
+        connect(partModel, &QAbstractItemModel::dataChanged, this, &ActorAdapter::handleBodyPartChanged);
+        connect(
+            partModel, &QAbstractItemModel::rowsAboutToBeRemoved, this, &ActorAdapter::handleBodyPartsAboutToBeRemoved);
     }
 
     ActorAdapter::ActorDataPtr ActorAdapter::getActorData(const std::string& id)
@@ -428,7 +423,8 @@ namespace CSMWorld
     {
         // Return cached race data if it exists
         RaceDataPtr data = mCachedRaces.get(id);
-        if (data) return data;
+        if (data)
+            return data;
 
         // Create the race data
         data = std::make_shared<RaceData>();
@@ -515,10 +511,12 @@ namespace CSMWorld
             auto& part = partRecord.get();
             if (part.mRace == id && part.mData.mType == ESM::BodyPart::MT_Skin && !is1stPersonPart(part.mId))
             {
-                auto type = (ESM::BodyPart::MeshPart) part.mData.mPart;
+                auto type = (ESM::BodyPart::MeshPart)part.mData.mPart;
                 bool female = part.mData.mFlags & ESM::BodyPart::BPF_Female;
-                if (female) data->setFemalePart(type, part.mId);
-                else data->setMalePart(type, part.mId);
+                if (female)
+                    data->setFemalePart(type, part.mId);
+                else
+                    data->setMalePart(type, part.mId);
             }
         }
     }
@@ -539,7 +537,8 @@ namespace CSMWorld
         // Add inventory items
         for (auto& item : npc.mInventory.mList)
         {
-            if (item.mCount <= 0) continue;
+            if (item.mCount <= 0)
+                continue;
             std::string itemId = item.mItem;
             addNpcItem(itemId, data);
         }
@@ -568,7 +567,7 @@ namespace CSMWorld
             for (auto& part : list)
             {
                 std::string partId;
-                auto partType = (ESM::PartReferenceType) part.mPart;
+                auto partType = (ESM::PartReferenceType)part.mPart;
 
                 if (data->isFemale())
                     partId = part.mFemale;
@@ -600,15 +599,13 @@ namespace CSMWorld
             std::vector<ESM::PartReferenceType> parts;
             if (clothing.mData.mType == ESM::Clothing::Robe)
             {
-                parts = {
-                    ESM::PRT_Groin, ESM::PRT_Skirt, ESM::PRT_RLeg, ESM::PRT_LLeg,
-                    ESM::PRT_RUpperarm, ESM::PRT_LUpperarm, ESM::PRT_RKnee, ESM::PRT_LKnee,
-                    ESM::PRT_RForearm, ESM::PRT_LForearm, ESM::PRT_Cuirass
-                };
+                parts = { ESM::PRT_Groin, ESM::PRT_Skirt, ESM::PRT_RLeg, ESM::PRT_LLeg, ESM::PRT_RUpperarm,
+                    ESM::PRT_LUpperarm, ESM::PRT_RKnee, ESM::PRT_LKnee, ESM::PRT_RForearm, ESM::PRT_LForearm,
+                    ESM::PRT_Cuirass };
             }
             else if (clothing.mData.mType == ESM::Clothing::Skirt)
             {
-                parts = {ESM::PRT_Groin, ESM::PRT_RLeg, ESM::PRT_LLeg};
+                parts = { ESM::PRT_Groin, ESM::PRT_RLeg, ESM::PRT_LLeg };
             }
 
             std::vector<ESM::PartReference> reservedList;
diff --git a/apps/opencs/model/world/actoradapter.hpp b/apps/opencs/model/world/actoradapter.hpp
index d50eacaba0..c144eb7ff4 100644
--- a/apps/opencs/model/world/actoradapter.hpp
+++ b/apps/opencs/model/world/actoradapter.hpp
@@ -3,12 +3,12 @@
 
 #include <array>
 #include <map>
-#include <unordered_set>
 #include <string>
 #include <string_view>
+#include <unordered_set>
 
-#include <QObject>
 #include <QModelIndex>
+#include <QObject>
 
 #include <components/esm3/loadarmo.hpp>
 #include <components/esm3/loadbody.hpp>
@@ -32,7 +32,6 @@ namespace CSMWorld
     {
         Q_OBJECT
     public:
-
         /// A list indexed by ESM::PartReferenceType
         using ActorPartList = std::map<ESM::PartReferenceType, std::pair<std::string, int>>;
         /// A list indexed by ESM::BodyPart::MeshPart
@@ -40,7 +39,6 @@ namespace CSMWorld
         /// Tracks unique strings
         using StringSet = std::unordered_set<std::string>;
 
-
         /// Contains base race data shared between actors
         class RaceData
         {
@@ -67,7 +65,7 @@ namespace CSMWorld
             /// Marks an additional dependency
             void addOtherDependency(const std::string& id);
             /// Clears parts and dependencies
-            void reset_data(const std::string& raceId, bool isBeast=false);
+            void reset_data(const std::string& raceId, bool isBeast = false);
 
         private:
             bool handles(ESM::PartReferenceType type) const;
@@ -104,7 +102,8 @@ namespace CSMWorld
             /// Marks an additional dependency for the actor
             void addOtherDependency(const std::string& id);
             /// Clears race, parts, and dependencies
-            void reset_data(const std::string& actorId, const std::string& skeleton="", bool isCreature=false, bool female=true, RaceDataPtr raceData=nullptr);
+            void reset_data(const std::string& actorId, const std::string& skeleton = "", bool isCreature = false,
+                bool female = true, RaceDataPtr raceData = nullptr);
 
         private:
             std::string mId;
@@ -117,7 +116,6 @@ namespace CSMWorld
         };
         using ActorDataPtr = std::shared_ptr<ActorData>;
 
-
         ActorAdapter(Data& data);
 
         /// Obtains the shared data for a given actor
@@ -145,7 +143,6 @@ namespace CSMWorld
         void handleBodyPartsRemoved(const QModelIndex&, int, int);
 
     private:
-
         ActorAdapter(const ActorAdapter&) = delete;
         ActorAdapter& operator=(const ActorAdapter&) = delete;
 
diff --git a/apps/opencs/model/world/cell.cpp b/apps/opencs/model/world/cell.cpp
index 93f3c500d7..dff09aac61 100644
--- a/apps/opencs/model/world/cell.cpp
+++ b/apps/opencs/model/world/cell.cpp
@@ -2,9 +2,9 @@
 
 #include <sstream>
 
-void CSMWorld::Cell::load (ESM::ESMReader &esm, bool &isDeleted)
+void CSMWorld::Cell::load(ESM::ESMReader& esm, bool& isDeleted)
 {
-    ESM::Cell::load (esm, isDeleted, false);
+    ESM::Cell::load(esm, isDeleted, false);
 
     mId = mName;
     if (isExterior())
diff --git a/apps/opencs/model/world/cell.hpp b/apps/opencs/model/world/cell.hpp
index 9f87451a46..c68a701e1a 100644
--- a/apps/opencs/model/world/cell.hpp
+++ b/apps/opencs/model/world/cell.hpp
@@ -15,8 +15,7 @@ namespace CSMWorld
     {
         std::string mId;
 
-        void load (ESM::ESMReader &esm, bool &isDeleted);
-
+        void load(ESM::ESMReader& esm, bool& isDeleted);
     };
 }
 
diff --git a/apps/opencs/model/world/cellcoordinates.cpp b/apps/opencs/model/world/cellcoordinates.cpp
index d1ac528fa7..14dcadddda 100644
--- a/apps/opencs/model/world/cellcoordinates.cpp
+++ b/apps/opencs/model/world/cellcoordinates.cpp
@@ -10,12 +10,23 @@
 #include <components/esm3/loadland.hpp>
 #include <components/misc/constants.hpp>
 
-CSMWorld::CellCoordinates::CellCoordinates() : mX (0), mY (0) {}
+CSMWorld::CellCoordinates::CellCoordinates()
+    : mX(0)
+    , mY(0)
+{
+}
 
-CSMWorld::CellCoordinates::CellCoordinates (int x, int y) : mX (x), mY (y) {}
+CSMWorld::CellCoordinates::CellCoordinates(int x, int y)
+    : mX(x)
+    , mY(y)
+{
+}
 
-CSMWorld::CellCoordinates::CellCoordinates (const std::pair<int, int>& coordinates)
-: mX (coordinates.first), mY (coordinates.second) {}
+CSMWorld::CellCoordinates::CellCoordinates(const std::pair<int, int>& coordinates)
+    : mX(coordinates.first)
+    , mY(coordinates.second)
+{
+}
 
 int CSMWorld::CellCoordinates::getX() const
 {
@@ -27,30 +38,29 @@ int CSMWorld::CellCoordinates::getY() const
     return mY;
 }
 
-CSMWorld::CellCoordinates CSMWorld::CellCoordinates::move (int x, int y) const
+CSMWorld::CellCoordinates CSMWorld::CellCoordinates::move(int x, int y) const
 {
-    return CellCoordinates (mX + x, mY + y);
+    return CellCoordinates(mX + x, mY + y);
 }
 
-std::string CSMWorld::CellCoordinates::getId (const std::string& worldspace) const
+std::string CSMWorld::CellCoordinates::getId(const std::string& worldspace) const
 {
     // we ignore the worldspace for now, since there is only one (will change in 1.1)
     return generateId(mX, mY);
 }
 
-std::string CSMWorld::CellCoordinates::generateId (int x, int y)
+std::string CSMWorld::CellCoordinates::generateId(int x, int y)
 {
     std::string cellId = "#" + std::to_string(x) + " " + std::to_string(y);
     return cellId;
 }
 
-bool CSMWorld::CellCoordinates::isExteriorCell (const std::string& id)
+bool CSMWorld::CellCoordinates::isExteriorCell(const std::string& id)
 {
-    return (!id.empty() && id[0]=='#');
+    return (!id.empty() && id[0] == '#');
 }
 
-std::pair<CSMWorld::CellCoordinates, bool> CSMWorld::CellCoordinates::fromId (
-    const std::string& id)
+std::pair<CSMWorld::CellCoordinates, bool> CSMWorld::CellCoordinates::fromId(const std::string& id)
 {
     // no worldspace for now, needs to be changed for 1.1
     if (isExteriorCell(id))
@@ -58,17 +68,17 @@ std::pair<CSMWorld::CellCoordinates, bool> CSMWorld::CellCoordinates::fromId (
         int x, y;
         char ignore;
 
-        std::istringstream stream (id);
+        std::istringstream stream(id);
         if (stream >> ignore >> x >> y)
-            return std::make_pair (CellCoordinates (x, y), true);
+            return std::make_pair(CellCoordinates(x, y), true);
     }
 
-    return std::make_pair (CellCoordinates(), false);
+    return std::make_pair(CellCoordinates(), false);
 }
 
-std::pair<int, int> CSMWorld::CellCoordinates::coordinatesToCellIndex (float x, float y)
+std::pair<int, int> CSMWorld::CellCoordinates::coordinatesToCellIndex(float x, float y)
 {
-    return std::make_pair (std::floor (x / Constants::CellSizeInUnits), std::floor (y / Constants::CellSizeInUnits));
+    return std::make_pair(std::floor(x / Constants::CellSizeInUnits), std::floor(y / Constants::CellSizeInUnits));
 }
 
 std::pair<int, int> CSMWorld::CellCoordinates::toTextureCoords(const osg::Vec3d& worldPos)
@@ -110,7 +120,8 @@ float CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(int vertexGlobal)
 
 int CSMWorld::CellCoordinates::vertexGlobalToInCellCoords(int vertexGlobal)
 {
-    return static_cast<int>(vertexGlobal - std::floor(static_cast<float>(vertexGlobal) / (ESM::Land::LAND_SIZE - 1)) * (ESM::Land::LAND_SIZE - 1));
+    return static_cast<int>(vertexGlobal
+        - std::floor(static_cast<float>(vertexGlobal) / (ESM::Land::LAND_SIZE - 1)) * (ESM::Land::LAND_SIZE - 1));
 }
 
 std::string CSMWorld::CellCoordinates::textureGlobalToCellId(const std::pair<int, int>& textureGlobal)
@@ -127,28 +138,28 @@ std::string CSMWorld::CellCoordinates::vertexGlobalToCellId(const std::pair<int,
     return generateId(x, y);
 }
 
-bool CSMWorld::operator== (const CellCoordinates& left, const CellCoordinates& right)
+bool CSMWorld::operator==(const CellCoordinates& left, const CellCoordinates& right)
 {
-    return left.getX()==right.getX() && left.getY()==right.getY();
+    return left.getX() == right.getX() && left.getY() == right.getY();
 }
 
-bool CSMWorld::operator!= (const CellCoordinates& left, const CellCoordinates& right)
+bool CSMWorld::operator!=(const CellCoordinates& left, const CellCoordinates& right)
 {
-    return !(left==right);
+    return !(left == right);
 }
 
-bool CSMWorld::operator< (const CellCoordinates& left, const CellCoordinates& right)
+bool CSMWorld::operator<(const CellCoordinates& left, const CellCoordinates& right)
 {
-    if (left.getX()<right.getX())
+    if (left.getX() < right.getX())
         return true;
 
-    if (left.getX()>right.getX())
+    if (left.getX() > right.getX())
         return false;
 
-    return left.getY()<right.getY();
+    return left.getY() < right.getY();
 }
 
-std::ostream& CSMWorld::operator<< (std::ostream& stream, const CellCoordinates& coordiantes)
+std::ostream& CSMWorld::operator<<(std::ostream& stream, const CellCoordinates& coordiantes)
 {
     return stream << coordiantes.getX() << ", " << coordiantes.getY();
 }
diff --git a/apps/opencs/model/world/cellcoordinates.hpp b/apps/opencs/model/world/cellcoordinates.hpp
index 8c131d932f..0be856e7f0 100644
--- a/apps/opencs/model/world/cellcoordinates.hpp
+++ b/apps/opencs/model/world/cellcoordinates.hpp
@@ -16,73 +16,72 @@ namespace CSMWorld
 {
     class CellCoordinates
     {
-            int mX;
-            int mY;
+        int mX;
+        int mY;
 
-        public:
+    public:
+        CellCoordinates();
 
-            CellCoordinates();
+        CellCoordinates(int x, int y);
 
-            CellCoordinates (int x, int y);
+        CellCoordinates(const std::pair<int, int>& coordinates);
 
-            CellCoordinates (const std::pair<int, int>& coordinates);
+        int getX() const;
 
-            int getX() const;
+        int getY() const;
 
-            int getY() const;
+        CellCoordinates move(int x, int y) const;
+        ///< Return a copy of *this, moved by the given offset.
 
-            CellCoordinates move (int x, int y) const;
-            ///< Return a copy of *this, moved by the given offset.
+        /// Generate cell id string from x and y coordinates
+        static std::string generateId(int x, int y);
 
-            ///Generate cell id string from x and y coordinates
-            static std::string generateId (int x, int y);
+        std::string getId(const std::string& worldspace) const;
+        ///< Return the ID for the cell at these coordinates.
 
-            std::string getId (const std::string& worldspace) const;
-            ///< Return the ID for the cell at these coordinates.
+        static bool isExteriorCell(const std::string& id);
 
-            static bool isExteriorCell (const std::string& id);
+        /// \return first: CellCoordinates (or 0, 0 if cell does not have coordinates),
+        /// second: is cell paged?
+        ///
+        /// \note The worldspace part of \a id is ignored
+        static std::pair<CellCoordinates, bool> fromId(const std::string& id);
 
-            /// \return first: CellCoordinates (or 0, 0 if cell does not have coordinates),
-            /// second: is cell paged?
-            ///
-            /// \note The worldspace part of \a id is ignored
-            static std::pair<CellCoordinates, bool> fromId (const std::string& id);
+        /// \return cell coordinates such that given world coordinates are in it.
+        static std::pair<int, int> coordinatesToCellIndex(float x, float y);
 
-            /// \return cell coordinates such that given world coordinates are in it.
-            static std::pair<int, int> coordinatesToCellIndex (float x, float y);
+        /// Converts worldspace coordinates to global texture selection, taking in account the texture offset.
+        static std::pair<int, int> toTextureCoords(const osg::Vec3d& worldPos);
 
-            ///Converts worldspace coordinates to global texture selection, taking in account the texture offset.
-            static std::pair<int, int> toTextureCoords(const osg::Vec3d& worldPos);
+        /// Converts worldspace coordinates to global vertex selection.
+        static std::pair<int, int> toVertexCoords(const osg::Vec3d& worldPos);
 
-            ///Converts worldspace coordinates to global vertex selection.
-            static std::pair<int, int> toVertexCoords(const osg::Vec3d& worldPos);
+        /// Converts global texture coordinate X to worldspace coordinate, offset by 0.25f.
+        static float textureGlobalXToWorldCoords(int textureGlobal);
 
-            ///Converts global texture coordinate X to worldspace coordinate, offset by 0.25f.
-            static float textureGlobalXToWorldCoords(int textureGlobal);
+        /// Converts global texture coordinate Y to worldspace coordinate, offset by 0.25f.
+        static float textureGlobalYToWorldCoords(int textureGlobal);
 
-            ///Converts global texture coordinate Y to worldspace coordinate, offset by 0.25f.
-            static float textureGlobalYToWorldCoords(int textureGlobal);
+        /// Converts global vertex coordinate to worldspace coordinate
+        static float vertexGlobalToWorldCoords(int vertexGlobal);
 
-            ///Converts global vertex coordinate to worldspace coordinate
-            static float vertexGlobalToWorldCoords(int vertexGlobal);
+        /// Converts global vertex coordinate to local cell's heightmap coordinates
+        static int vertexGlobalToInCellCoords(int vertexGlobal);
 
-            ///Converts global vertex coordinate to local cell's heightmap coordinates
-            static int vertexGlobalToInCellCoords(int vertexGlobal);
+        /// Converts global texture coordinates to cell id
+        static std::string textureGlobalToCellId(const std::pair<int, int>& textureGlobal);
 
-            ///Converts global texture coordinates to cell id
-            static std::string textureGlobalToCellId(const std::pair<int, int>& textureGlobal);
-
-            ///Converts global vertex coordinates to cell id
-            static std::string vertexGlobalToCellId(const std::pair<int, int>& vertexGlobal);
+        /// Converts global vertex coordinates to cell id
+        static std::string vertexGlobalToCellId(const std::pair<int, int>& vertexGlobal);
     };
 
-    bool operator== (const CellCoordinates& left, const CellCoordinates& right);
-    bool operator!= (const CellCoordinates& left, const CellCoordinates& right);
-    bool operator< (const CellCoordinates& left, const CellCoordinates& right);
+    bool operator==(const CellCoordinates& left, const CellCoordinates& right);
+    bool operator!=(const CellCoordinates& left, const CellCoordinates& right);
+    bool operator<(const CellCoordinates& left, const CellCoordinates& right);
 
-    std::ostream& operator<< (std::ostream& stream, const CellCoordinates& coordiantes);
+    std::ostream& operator<<(std::ostream& stream, const CellCoordinates& coordiantes);
 }
 
-Q_DECLARE_METATYPE (CSMWorld::CellCoordinates)
+Q_DECLARE_METATYPE(CSMWorld::CellCoordinates)
 
 #endif
diff --git a/apps/opencs/model/world/cellselection.cpp b/apps/opencs/model/world/cellselection.cpp
index 2e12a728b8..7ba2aa3129 100644
--- a/apps/opencs/model/world/cellselection.cpp
+++ b/apps/opencs/model/world/cellselection.cpp
@@ -3,8 +3,8 @@
 #include "cellcoordinates.hpp"
 
 #include <cmath>
-#include <stdexcept>
 #include <limits>
+#include <stdexcept>
 
 CSMWorld::CellSelection::Iterator CSMWorld::CellSelection::begin() const
 {
@@ -16,19 +16,19 @@ CSMWorld::CellSelection::Iterator CSMWorld::CellSelection::end() const
     return mCells.end();
 }
 
-bool CSMWorld::CellSelection::add (const CellCoordinates& coordinates)
+bool CSMWorld::CellSelection::add(const CellCoordinates& coordinates)
 {
-    return mCells.insert (coordinates).second;
+    return mCells.insert(coordinates).second;
 }
 
-void CSMWorld::CellSelection::remove (const CellCoordinates& coordinates)
+void CSMWorld::CellSelection::remove(const CellCoordinates& coordinates)
 {
-    mCells.erase (coordinates);
+    mCells.erase(coordinates);
 }
 
-bool CSMWorld::CellSelection::has (const CellCoordinates& coordinates) const
+bool CSMWorld::CellSelection::has(const CellCoordinates& coordinates) const
 {
-    return mCells.find (coordinates)!=end();
+    return mCells.find(coordinates) != end();
 }
 
 int CSMWorld::CellSelection::getSize() const
@@ -39,12 +39,12 @@ int CSMWorld::CellSelection::getSize() const
 CSMWorld::CellCoordinates CSMWorld::CellSelection::getCentre() const
 {
     if (mCells.empty())
-        throw std::logic_error ("call of getCentre on empty cell selection");
+        throw std::logic_error("call of getCentre on empty cell selection");
 
     double x = 0;
     double y = 0;
 
-    for (Iterator iter = begin(); iter!=end(); ++iter)
+    for (Iterator iter = begin(); iter != end(); ++iter)
     {
         x += iter->getX();
         y += iter->getY();
@@ -56,14 +56,14 @@ CSMWorld::CellCoordinates CSMWorld::CellSelection::getCentre() const
     Iterator closest = begin();
     double distance = std::numeric_limits<double>::max();
 
-    for (Iterator iter (begin()); iter!=end(); ++iter)
+    for (Iterator iter(begin()); iter != end(); ++iter)
     {
         double deltaX = x - iter->getX();
         double deltaY = y - iter->getY();
 
-        double delta = std::sqrt (deltaX * deltaX + deltaY * deltaY);
+        double delta = std::sqrt(deltaX * deltaX + deltaY * deltaY);
 
-        if (delta<distance)
+        if (delta < distance)
         {
             distance = delta;
             closest = iter;
@@ -73,12 +73,12 @@ CSMWorld::CellCoordinates CSMWorld::CellSelection::getCentre() const
     return *closest;
 }
 
-void CSMWorld::CellSelection::move (int x, int y)
+void CSMWorld::CellSelection::move(int x, int y)
 {
     Container moved;
 
-    for (Iterator iter = begin(); iter!=end(); ++iter)
-        moved.insert (iter->move (x, y));
+    for (Iterator iter = begin(); iter != end(); ++iter)
+        moved.insert(iter->move(x, y));
 
-    mCells.swap (moved);
+    mCells.swap(moved);
 }
diff --git a/apps/opencs/model/world/cellselection.hpp b/apps/opencs/model/world/cellselection.hpp
index b4616bfb34..3119886bd9 100644
--- a/apps/opencs/model/world/cellselection.hpp
+++ b/apps/opencs/model/world/cellselection.hpp
@@ -14,44 +14,41 @@ namespace CSMWorld
     /// \note The CellSelection does not specify the worldspace it applies to.
     class CellSelection
     {
-        public:
+    public:
+        typedef std::set<CellCoordinates> Container;
+        typedef Container::const_iterator Iterator;
 
-            typedef std::set<CellCoordinates> Container;
-            typedef Container::const_iterator Iterator;
+    private:
+        Container mCells;
 
-        private:
+    public:
+        Iterator begin() const;
 
-            Container mCells;
+        Iterator end() const;
 
-        public:
+        bool add(const CellCoordinates& coordinates);
+        ///< Ignored if the cell specified by \a coordinates is already part of the selection.
+        ///
+        /// \return Was a cell added to the collection?
 
-            Iterator begin() const;
+        void remove(const CellCoordinates& coordinates);
+        ///< ignored if the cell specified by \a coordinates is not part of the selection.
 
-            Iterator end() const;
+        bool has(const CellCoordinates& coordinates) const;
+        ///< \return Is the cell specified by \a coordinates part of the selection?
 
-            bool add (const CellCoordinates& coordinates);
-            ///< Ignored if the cell specified by \a coordinates is already part of the selection.
-            ///
-            /// \return Was a cell added to the collection?
+        int getSize() const;
+        ///< Return number of cells.
 
-            void remove (const CellCoordinates& coordinates);
-            ///< ignored if the cell specified by \a coordinates is not part of the selection.
+        CellCoordinates getCentre() const;
+        ///< Return the selected cell that is closest to the geometric centre of the selection.
+        ///
+        /// \attention This function must not be called on selections that are empty.
 
-            bool has (const CellCoordinates& coordinates) const;
-            ///< \return Is the cell specified by \a coordinates part of the selection?
-
-            int getSize() const;
-            ///< Return number of cells.
-
-            CellCoordinates getCentre() const;
-            ///< Return the selected cell that is closest to the geometric centre of the selection.
-            ///
-            /// \attention This function must not be called on selections that are empty.
-
-            void move (int x, int y);
+        void move(int x, int y);
     };
 }
 
-Q_DECLARE_METATYPE (CSMWorld::CellSelection)
+Q_DECLARE_METATYPE(CSMWorld::CellSelection)
 
 #endif
diff --git a/apps/opencs/model/world/collection.hpp b/apps/opencs/model/world/collection.hpp
index 7901655245..8a8cb48dfa 100644
--- a/apps/opencs/model/world/collection.hpp
+++ b/apps/opencs/model/world/collection.hpp
@@ -1,22 +1,22 @@
 #ifndef CSM_WOLRD_COLLECTION_H
 #define CSM_WOLRD_COLLECTION_H
 
-#include <vector>
-#include <map>
 #include <algorithm>
 #include <cctype>
-#include <stdexcept>
-#include <string>
 #include <functional>
+#include <map>
 #include <memory>
+#include <stdexcept>
+#include <string>
 #include <string_view>
+#include <vector>
 
 #include <QVariant>
 
 #include <components/misc/strings/lower.hpp>
 
-#include "columnbase.hpp"
 #include "collectionbase.hpp"
+#include "columnbase.hpp"
 #include "land.hpp"
 #include "landtexture.hpp"
 #include "ref.hpp"
@@ -24,37 +24,37 @@
 namespace CSMWorld
 {
     /// \brief Access to ID field in records
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct IdAccessor
     {
         void setId(ESXRecordT& record, const std::string& id) const;
-        const std::string getId (const ESXRecordT& record) const;
+        const std::string getId(const ESXRecordT& record) const;
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     void IdAccessor<ESXRecordT>::setId(ESXRecordT& record, const std::string& id) const
     {
         record.mId = id;
     }
 
-    template<typename ESXRecordT>
-    const std::string IdAccessor<ESXRecordT>::getId (const ESXRecordT& record) const
+    template <typename ESXRecordT>
+    const std::string IdAccessor<ESXRecordT>::getId(const ESXRecordT& record) const
     {
         return record.mId;
     }
 
-    template<>
-    inline void IdAccessor<Land>::setId (Land& record, const std::string& id) const
+    template <>
+    inline void IdAccessor<Land>::setId(Land& record, const std::string& id) const
     {
-        int x=0, y=0;
+        int x = 0, y = 0;
 
         Land::parseUniqueRecordId(id, x, y);
         record.mX = x;
         record.mY = y;
     }
 
-    template<>
-    inline void IdAccessor<LandTexture>::setId (LandTexture& record, const std::string& id) const
+    template <>
+    inline void IdAccessor<LandTexture>::setId(LandTexture& record, const std::string& id) const
     {
         int plugin = 0;
         int index = 0;
@@ -64,191 +64,180 @@ namespace CSMWorld
         record.mIndex = index;
     }
 
-    template<>
-    inline const std::string IdAccessor<Land>::getId (const Land& record) const
+    template <>
+    inline const std::string IdAccessor<Land>::getId(const Land& record) const
     {
         return Land::createUniqueRecordId(record.mX, record.mY);
     }
 
-    template<>
-    inline const std::string IdAccessor<LandTexture>::getId (const LandTexture& record) const
+    template <>
+    inline const std::string IdAccessor<LandTexture>::getId(const LandTexture& record) const
     {
         return LandTexture::createUniqueRecordId(record.mPluginIndex, record.mIndex);
     }
 
     /// \brief Single-type record collection
-    template<typename ESXRecordT, typename IdAccessorT = IdAccessor<ESXRecordT> >
+    template <typename ESXRecordT, typename IdAccessorT = IdAccessor<ESXRecordT>>
     class Collection : public CollectionBase
     {
-        public:
-
-            typedef ESXRecordT ESXRecord;
-
-        private:
-
-            std::vector<std::unique_ptr<Record<ESXRecordT> > > mRecords;
-            std::map<std::string, int> mIndex;
-            std::vector<Column<ESXRecordT> *> mColumns;
+    public:
+        typedef ESXRecordT ESXRecord;
 
-            // not implemented
-            Collection (const Collection&);
-            Collection& operator= (const Collection&);
+    private:
+        std::vector<std::unique_ptr<Record<ESXRecordT>>> mRecords;
+        std::map<std::string, int> mIndex;
+        std::vector<Column<ESXRecordT>*> mColumns;
 
-        protected:
+        // not implemented
+        Collection(const Collection&);
+        Collection& operator=(const Collection&);
 
-            const std::vector<std::unique_ptr<Record<ESXRecordT> > >& getRecords() const;
+    protected:
+        const std::vector<std::unique_ptr<Record<ESXRecordT>>>& getRecords() const;
 
-            bool reorderRowsImp (int baseIndex, const std::vector<int>& newOrder);
-            ///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices
-            /// given in \a newOrder (baseIndex+newOrder[0] specifies the new index of row baseIndex).
-            ///
-            /// \return Success?
+        bool reorderRowsImp(int baseIndex, const std::vector<int>& newOrder);
+        ///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices
+        /// given in \a newOrder (baseIndex+newOrder[0] specifies the new index of row baseIndex).
+        ///
+        /// \return Success?
 
-            int cloneRecordImp (const std::string& origin, const std::string& dest,
-                UniversalId::Type type);
-            ///< Returns the index of the clone.
+        int cloneRecordImp(const std::string& origin, const std::string& dest, UniversalId::Type type);
+        ///< Returns the index of the clone.
 
-            int touchRecordImp (const std::string& id);
-            ///< Returns the index of the record on success, -1 on failure.
+        int touchRecordImp(const std::string& id);
+        ///< Returns the index of the record on success, -1 on failure.
 
-        public:
+    public:
+        Collection();
 
-            Collection();
+        virtual ~Collection();
 
-            virtual ~Collection();
+        void add(const ESXRecordT& record);
+        ///< Add a new record (modified)
 
-            void add (const ESXRecordT& record);
-            ///< Add a new record (modified)
+        int getSize() const override;
 
-            int getSize() const override;
+        std::string getId(int index) const override;
 
-            std::string getId (int index) const override;
+        int getIndex(const std::string& id) const override;
 
-            int getIndex (const std::string& id) const override;
+        int getColumns() const override;
 
-            int getColumns() const override;
+        QVariant getData(int index, int column) const override;
 
-            QVariant getData (int index, int column) const override;
+        void setData(int index, int column, const QVariant& data) override;
 
-            void setData (int index, int column, const QVariant& data) override;
+        const ColumnBase& getColumn(int column) const override;
 
-            const ColumnBase& getColumn (int column) const override;
+        virtual void merge();
+        ///< Merge modified into base.
 
-            virtual void merge();
-            ///< Merge modified into base.
+        virtual void purge();
+        ///< Remove records that are flagged as erased.
 
-            virtual void purge();
-            ///< Remove records that are flagged as erased.
+        void removeRows(int index, int count) override;
 
-            void removeRows (int index, int count) override;
+        void appendBlankRecord(const std::string& id, UniversalId::Type type = UniversalId::Type_None) override;
+        ///< \param type Will be ignored, unless the collection supports multiple record types
 
-            void appendBlankRecord (const std::string& id,
-                UniversalId::Type type = UniversalId::Type_None) override;
-            ///< \param type Will be ignored, unless the collection supports multiple record types
+        void cloneRecord(
+            const std::string& origin, const std::string& destination, const UniversalId::Type type) override;
 
-            void cloneRecord(const std::string& origin,
-                                     const std::string& destination,
-                                     const UniversalId::Type type) override;
+        bool touchRecord(const std::string& id) override;
+        ///< Change the state of a record from base to modified, if it is not already.
+        ///  \return True if the record was changed.
 
-            bool touchRecord(const std::string& id) override;
-            ///< Change the state of a record from base to modified, if it is not already.
-            ///  \return True if the record was changed.
+        int searchId(std::string_view id) const override;
+        ////< Search record with \a id.
+        /// \return index of record (if found) or -1 (not found)
 
-            int searchId(std::string_view id) const override;
-            ////< Search record with \a id.
-            /// \return index of record (if found) or -1 (not found)
+        void replace(int index, std::unique_ptr<RecordBase> record) override;
+        ///< If the record type does not match, an exception is thrown.
+        ///
+        /// \attention \a record must not change the ID.
 
-            void replace (int index, std::unique_ptr<RecordBase> record) override;
-            ///< If the record type does not match, an exception is thrown.
-            ///
-            /// \attention \a record must not change the ID.
+        void appendRecord(std::unique_ptr<RecordBase> record, UniversalId::Type type = UniversalId::Type_None) override;
+        ///< If the record type does not match, an exception is thrown.
+        ///< \param type Will be ignored, unless the collection supports multiple record types
 
-            void appendRecord (std::unique_ptr<RecordBase> record,
-                UniversalId::Type type = UniversalId::Type_None) override;
-            ///< If the record type does not match, an exception is thrown.
-            ///< \param type Will be ignored, unless the collection supports multiple record types
+        const Record<ESXRecordT>& getRecord(const std::string& id) const override;
 
-            const Record<ESXRecordT>& getRecord (const std::string& id) const override;
+        const Record<ESXRecordT>& getRecord(int index) const override;
 
-            const Record<ESXRecordT>& getRecord (int index) const override;
+        int getAppendIndex(const std::string& id, UniversalId::Type type = UniversalId::Type_None) const override;
+        ///< \param type Will be ignored, unless the collection supports multiple record types
 
-            int getAppendIndex (const std::string& id,
-                UniversalId::Type type = UniversalId::Type_None) const override;
-            ///< \param type Will be ignored, unless the collection supports multiple record types
+        std::vector<std::string> getIds(bool listDeleted = true) const override;
+        ///< Return a sorted collection of all IDs
+        ///
+        /// \param listDeleted include deleted record in the list
 
-            std::vector<std::string> getIds (bool listDeleted = true) const override;
-            ///< Return a sorted collection of all IDs
-            ///
-            /// \param listDeleted include deleted record in the list
+        virtual void insertRecord(
+            std::unique_ptr<RecordBase> record, int index, UniversalId::Type type = UniversalId::Type_None);
+        ///< Insert record before index.
+        ///
+        /// If the record type does not match, an exception is thrown.
+        ///
+        /// If the index is invalid either generally (by being out of range) or for the particular
+        /// record, an exception is thrown.
 
-            virtual void insertRecord (std::unique_ptr<RecordBase> record, int index,
-                UniversalId::Type type = UniversalId::Type_None);
-            ///< Insert record before index.
-            ///
-            /// If the record type does not match, an exception is thrown.
-            ///
-            /// If the index is invalid either generally (by being out of range) or for the particular
-            /// record, an exception is thrown.
+        bool reorderRows(int baseIndex, const std::vector<int>& newOrder) override;
+        ///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices
+        /// given in \a newOrder (baseIndex+newOrder[0] specifies the new index of row baseIndex).
+        ///
+        /// \return Success?
 
-            bool reorderRows (int baseIndex, const std::vector<int>& newOrder) override;
-            ///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices
-            /// given in \a newOrder (baseIndex+newOrder[0] specifies the new index of row baseIndex).
-            ///
-            /// \return Success?
+        void addColumn(Column<ESXRecordT>* column);
 
-            void addColumn (Column<ESXRecordT> *column);
+        void setRecord(int index, std::unique_ptr<Record<ESXRecordT>> record);
+        ///< \attention This function must not change the ID.
 
-            void setRecord (int index, std::unique_ptr<Record<ESXRecordT> > record);
-            ///< \attention This function must not change the ID.
-
-            NestableColumn *getNestableColumn (int column) const;
+        NestableColumn* getNestableColumn(int column) const;
     };
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    const std::vector<std::unique_ptr<Record<ESXRecordT> > >& Collection<ESXRecordT, IdAccessorT>::getRecords() const
+    template <typename ESXRecordT, typename IdAccessorT>
+    const std::vector<std::unique_ptr<Record<ESXRecordT>>>& Collection<ESXRecordT, IdAccessorT>::getRecords() const
     {
         return mRecords;
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    bool Collection<ESXRecordT, IdAccessorT>::reorderRowsImp (int baseIndex,
-        const std::vector<int>& newOrder)
+    template <typename ESXRecordT, typename IdAccessorT>
+    bool Collection<ESXRecordT, IdAccessorT>::reorderRowsImp(int baseIndex, const std::vector<int>& newOrder)
     {
         if (!newOrder.empty())
         {
-            int size = static_cast<int> (newOrder.size());
+            int size = static_cast<int>(newOrder.size());
 
             // check that all indices are present
-            std::vector<int> test (newOrder);
-            std::sort (test.begin(), test.end());
-            if (*test.begin()!=0 || *--test.end()!=size-1)
+            std::vector<int> test(newOrder);
+            std::sort(test.begin(), test.end());
+            if (*test.begin() != 0 || *--test.end() != size - 1)
                 return false;
 
             // reorder records
-            std::vector<std::unique_ptr<Record<ESXRecordT> > > buffer (size);
+            std::vector<std::unique_ptr<Record<ESXRecordT>>> buffer(size);
 
-            for (int i=0; i<size; ++i)
+            for (int i = 0; i < size; ++i)
             {
-                buffer[newOrder[i]] = std::move(mRecords [baseIndex+i]);
+                buffer[newOrder[i]] = std::move(mRecords[baseIndex + i]);
                 if (buffer[newOrder[i]])
-                    buffer[newOrder[i]]->setModified (buffer[newOrder[i]]->get());
+                    buffer[newOrder[i]]->setModified(buffer[newOrder[i]]->get());
             }
 
-            std::move (buffer.begin(), buffer.end(), mRecords.begin()+baseIndex);
+            std::move(buffer.begin(), buffer.end(), mRecords.begin() + baseIndex);
 
             // adjust index
-            for (std::map<std::string, int>::iterator iter (mIndex.begin()); iter!=mIndex.end();
-                 ++iter)
-                if (iter->second>=baseIndex && iter->second<baseIndex+size)
-                    iter->second = newOrder.at (iter->second-baseIndex)+baseIndex;
+            for (std::map<std::string, int>::iterator iter(mIndex.begin()); iter != mIndex.end(); ++iter)
+                if (iter->second >= baseIndex && iter->second < baseIndex + size)
+                    iter->second = newOrder.at(iter->second - baseIndex) + baseIndex;
         }
 
         return true;
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    int Collection<ESXRecordT, IdAccessorT>::cloneRecordImp(const std::string& origin,
-        const std::string& destination, UniversalId::Type type)
+    template <typename ESXRecordT, typename IdAccessorT>
+    int Collection<ESXRecordT, IdAccessorT>::cloneRecordImp(
+        const std::string& origin, const std::string& destination, UniversalId::Type type)
     {
         auto copy = std::make_unique<Record<ESXRecordT>>();
         copy->mModified = getRecord(origin).get();
@@ -257,7 +246,7 @@ namespace CSMWorld
 
         if (type == UniversalId::Type_Reference)
         {
-            CSMWorld::CellRef* ptr = (CSMWorld::CellRef*) &copy->mModified;
+            CSMWorld::CellRef* ptr = (CSMWorld::CellRef*)&copy->mModified;
             ptr->mRefNum.mIndex = 0;
         }
 
@@ -267,7 +256,7 @@ namespace CSMWorld
         return index;
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
+    template <typename ESXRecordT, typename IdAccessorT>
     int Collection<ESXRecordT, IdAccessorT>::touchRecordImp(const std::string& id)
     {
         int index = getIndex(id);
@@ -286,29 +275,29 @@ namespace CSMWorld
         return -1;
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    void Collection<ESXRecordT, IdAccessorT>::cloneRecord(const std::string& origin,
-        const std::string& destination, const UniversalId::Type type)
+    template <typename ESXRecordT, typename IdAccessorT>
+    void Collection<ESXRecordT, IdAccessorT>::cloneRecord(
+        const std::string& origin, const std::string& destination, const UniversalId::Type type)
     {
         cloneRecordImp(origin, destination, type);
     }
 
-    template<>
-    inline void Collection<Land, IdAccessor<Land> >::cloneRecord(const std::string& origin,
-        const std::string& destination, const UniversalId::Type type)
+    template <>
+    inline void Collection<Land, IdAccessor<Land>>::cloneRecord(
+        const std::string& origin, const std::string& destination, const UniversalId::Type type)
     {
         int index = cloneRecordImp(origin, destination, type);
         mRecords.at(index)->get().setPlugin(0);
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
+    template <typename ESXRecordT, typename IdAccessorT>
     bool Collection<ESXRecordT, IdAccessorT>::touchRecord(const std::string& id)
     {
         return touchRecordImp(id) != -1;
     }
 
-    template<>
-    inline bool Collection<Land, IdAccessor<Land> >::touchRecord(const std::string& id)
+    template <>
+    inline bool Collection<Land, IdAccessor<Land>>::touchRecord(const std::string& id)
     {
         int index = touchRecordImp(id);
         if (index >= 0)
@@ -320,142 +309,144 @@ namespace CSMWorld
         return false;
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
+    template <typename ESXRecordT, typename IdAccessorT>
     Collection<ESXRecordT, IdAccessorT>::Collection()
-    {}
+    {
+    }
 
-    template<typename ESXRecordT, typename IdAccessorT>
+    template <typename ESXRecordT, typename IdAccessorT>
     Collection<ESXRecordT, IdAccessorT>::~Collection()
     {
-        for (typename std::vector<Column<ESXRecordT> *>::iterator iter (mColumns.begin()); iter!=mColumns.end(); ++iter)
+        for (typename std::vector<Column<ESXRecordT>*>::iterator iter(mColumns.begin()); iter != mColumns.end(); ++iter)
             delete *iter;
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    void Collection<ESXRecordT, IdAccessorT>::add (const ESXRecordT& record)
+    template <typename ESXRecordT, typename IdAccessorT>
+    void Collection<ESXRecordT, IdAccessorT>::add(const ESXRecordT& record)
     {
-        std::string id = Misc::StringUtils::lowerCase (IdAccessorT().getId (record));
+        std::string id = Misc::StringUtils::lowerCase(IdAccessorT().getId(record));
 
-        std::map<std::string, int>::iterator iter = mIndex.find (id);
+        std::map<std::string, int>::iterator iter = mIndex.find(id);
 
-        if (iter==mIndex.end())
+        if (iter == mIndex.end())
         {
             auto record2 = std::make_unique<Record<ESXRecordT>>();
             record2->mState = Record<ESXRecordT>::State_ModifiedOnly;
             record2->mModified = record;
 
-            insertRecord (std::move(record2), getAppendIndex (id));
+            insertRecord(std::move(record2), getAppendIndex(id));
         }
         else
         {
-            mRecords[iter->second]->setModified (record);
+            mRecords[iter->second]->setModified(record);
         }
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
+    template <typename ESXRecordT, typename IdAccessorT>
     int Collection<ESXRecordT, IdAccessorT>::getSize() const
     {
         return mRecords.size();
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    std::string Collection<ESXRecordT, IdAccessorT>::getId (int index) const
+    template <typename ESXRecordT, typename IdAccessorT>
+    std::string Collection<ESXRecordT, IdAccessorT>::getId(int index) const
     {
-        return IdAccessorT().getId (mRecords.at (index)->get());
+        return IdAccessorT().getId(mRecords.at(index)->get());
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    int  Collection<ESXRecordT, IdAccessorT>::getIndex (const std::string& id) const
+    template <typename ESXRecordT, typename IdAccessorT>
+    int Collection<ESXRecordT, IdAccessorT>::getIndex(const std::string& id) const
     {
-        int index = searchId (id);
+        int index = searchId(id);
 
-        if (index==-1)
-            throw std::runtime_error ("invalid ID: " + id);
+        if (index == -1)
+            throw std::runtime_error("invalid ID: " + id);
 
         return index;
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
+    template <typename ESXRecordT, typename IdAccessorT>
     int Collection<ESXRecordT, IdAccessorT>::getColumns() const
     {
         return mColumns.size();
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    QVariant Collection<ESXRecordT, IdAccessorT>::getData (int index, int column) const
+    template <typename ESXRecordT, typename IdAccessorT>
+    QVariant Collection<ESXRecordT, IdAccessorT>::getData(int index, int column) const
     {
-        return mColumns.at (column)->get (*mRecords.at (index));
+        return mColumns.at(column)->get(*mRecords.at(index));
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    void Collection<ESXRecordT, IdAccessorT>::setData (int index, int column, const QVariant& data)
+    template <typename ESXRecordT, typename IdAccessorT>
+    void Collection<ESXRecordT, IdAccessorT>::setData(int index, int column, const QVariant& data)
     {
-        return mColumns.at (column)->set (*mRecords.at (index), data);
+        return mColumns.at(column)->set(*mRecords.at(index), data);
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    const ColumnBase& Collection<ESXRecordT, IdAccessorT>::getColumn (int column) const
+    template <typename ESXRecordT, typename IdAccessorT>
+    const ColumnBase& Collection<ESXRecordT, IdAccessorT>::getColumn(int column) const
     {
-        return *mColumns.at (column);
+        return *mColumns.at(column);
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    NestableColumn *Collection<ESXRecordT, IdAccessorT>::getNestableColumn (int column) const
+    template <typename ESXRecordT, typename IdAccessorT>
+    NestableColumn* Collection<ESXRecordT, IdAccessorT>::getNestableColumn(int column) const
     {
         if (column < 0 || column >= static_cast<int>(mColumns.size()))
             throw std::runtime_error("column index out of range");
 
-        return mColumns.at (column);
+        return mColumns.at(column);
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    void Collection<ESXRecordT, IdAccessorT>::addColumn (Column<ESXRecordT> *column)
+    template <typename ESXRecordT, typename IdAccessorT>
+    void Collection<ESXRecordT, IdAccessorT>::addColumn(Column<ESXRecordT>* column)
     {
-        mColumns.push_back (column);
+        mColumns.push_back(column);
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
+    template <typename ESXRecordT, typename IdAccessorT>
     void Collection<ESXRecordT, IdAccessorT>::merge()
     {
-        for (typename std::vector<std::unique_ptr<Record<ESXRecordT> > >::iterator iter (mRecords.begin()); iter!=mRecords.end(); ++iter)
+        for (typename std::vector<std::unique_ptr<Record<ESXRecordT>>>::iterator iter(mRecords.begin());
+             iter != mRecords.end(); ++iter)
             (*iter)->merge();
 
         purge();
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    void  Collection<ESXRecordT, IdAccessorT>::purge()
+    template <typename ESXRecordT, typename IdAccessorT>
+    void Collection<ESXRecordT, IdAccessorT>::purge()
     {
         int i = 0;
 
-        while (i<static_cast<int> (mRecords.size()))
+        while (i < static_cast<int>(mRecords.size()))
         {
             if (mRecords[i]->isErased())
-                removeRows (i, 1);
+                removeRows(i, 1);
             else
                 ++i;
         }
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    void Collection<ESXRecordT, IdAccessorT>::removeRows (int index, int count)
+    template <typename ESXRecordT, typename IdAccessorT>
+    void Collection<ESXRecordT, IdAccessorT>::removeRows(int index, int count)
     {
-        mRecords.erase (mRecords.begin()+index, mRecords.begin()+index+count);
+        mRecords.erase(mRecords.begin() + index, mRecords.begin() + index + count);
 
         typename std::map<std::string, int>::iterator iter = mIndex.begin();
 
-        while (iter!=mIndex.end())
+        while (iter != mIndex.end())
         {
-            if (iter->second>=index)
+            if (iter->second >= index)
             {
-                if (iter->second>=index+count)
+                if (iter->second >= index + count)
                 {
                     iter->second -= count;
                     ++iter;
                 }
                 else
                 {
-                    mIndex.erase (iter++);
+                    mIndex.erase(iter++);
                 }
             }
             else
@@ -463,9 +454,8 @@ namespace CSMWorld
         }
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    void  Collection<ESXRecordT, IdAccessorT>::appendBlankRecord (const std::string& id,
-        UniversalId::Type type)
+    template <typename ESXRecordT, typename IdAccessorT>
+    void Collection<ESXRecordT, IdAccessorT>::appendBlankRecord(const std::string& id, UniversalId::Type type)
     {
         ESXRecordT record;
         IdAccessorT().setId(record, id);
@@ -475,114 +465,109 @@ namespace CSMWorld
         record2->mState = Record<ESXRecordT>::State_ModifiedOnly;
         record2->mModified = record;
 
-        insertRecord (std::move(record2), getAppendIndex (id, type), type);
+        insertRecord(std::move(record2), getAppendIndex(id, type), type);
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
+    template <typename ESXRecordT, typename IdAccessorT>
     int Collection<ESXRecordT, IdAccessorT>::searchId(std::string_view id) const
     {
         std::string id2 = Misc::StringUtils::lowerCase(id);
 
-        std::map<std::string, int>::const_iterator iter = mIndex.find (id2);
+        std::map<std::string, int>::const_iterator iter = mIndex.find(id2);
 
-        if (iter==mIndex.end())
+        if (iter == mIndex.end())
             return -1;
 
         return iter->second;
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    void Collection<ESXRecordT, IdAccessorT>::replace (int index, std::unique_ptr<RecordBase> record)
+    template <typename ESXRecordT, typename IdAccessorT>
+    void Collection<ESXRecordT, IdAccessorT>::replace(int index, std::unique_ptr<RecordBase> record)
     {
-        std::unique_ptr<Record<ESXRecordT> > tmp(static_cast<Record<ESXRecordT>*>(record.release()));
-        mRecords.at (index) = std::move(tmp);
+        std::unique_ptr<Record<ESXRecordT>> tmp(static_cast<Record<ESXRecordT>*>(record.release()));
+        mRecords.at(index) = std::move(tmp);
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    void Collection<ESXRecordT, IdAccessorT>::appendRecord (std::unique_ptr<RecordBase> record,
-        UniversalId::Type type)
+    template <typename ESXRecordT, typename IdAccessorT>
+    void Collection<ESXRecordT, IdAccessorT>::appendRecord(std::unique_ptr<RecordBase> record, UniversalId::Type type)
     {
-        int index =
-            getAppendIndex(IdAccessorT().getId(static_cast<Record<ESXRecordT>*>(record.get())->get()), type);
-        insertRecord (std::move(record), index, type);
+        int index = getAppendIndex(IdAccessorT().getId(static_cast<Record<ESXRecordT>*>(record.get())->get()), type);
+        insertRecord(std::move(record), index, type);
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    int Collection<ESXRecordT, IdAccessorT>::getAppendIndex (const std::string& id,
-        UniversalId::Type type) const
+    template <typename ESXRecordT, typename IdAccessorT>
+    int Collection<ESXRecordT, IdAccessorT>::getAppendIndex(const std::string& id, UniversalId::Type type) const
     {
-        return static_cast<int> (mRecords.size());
+        return static_cast<int>(mRecords.size());
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    std::vector<std::string> Collection<ESXRecordT, IdAccessorT>::getIds (bool listDeleted) const
+    template <typename ESXRecordT, typename IdAccessorT>
+    std::vector<std::string> Collection<ESXRecordT, IdAccessorT>::getIds(bool listDeleted) const
     {
         std::vector<std::string> ids;
 
-        for (typename std::map<std::string, int>::const_iterator iter = mIndex.begin();
-            iter!=mIndex.end(); ++iter)
+        for (typename std::map<std::string, int>::const_iterator iter = mIndex.begin(); iter != mIndex.end(); ++iter)
         {
             if (listDeleted || !mRecords[iter->second]->isDeleted())
-                ids.push_back (IdAccessorT().getId (mRecords[iter->second]->get()));
+                ids.push_back(IdAccessorT().getId(mRecords[iter->second]->get()));
         }
 
         return ids;
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    const Record<ESXRecordT>& Collection<ESXRecordT, IdAccessorT>::getRecord (const std::string& id) const
+    template <typename ESXRecordT, typename IdAccessorT>
+    const Record<ESXRecordT>& Collection<ESXRecordT, IdAccessorT>::getRecord(const std::string& id) const
     {
-        int index = getIndex (id);
-        return *mRecords.at (index);
+        int index = getIndex(id);
+        return *mRecords.at(index);
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    const Record<ESXRecordT>& Collection<ESXRecordT, IdAccessorT>::getRecord (int index) const
+    template <typename ESXRecordT, typename IdAccessorT>
+    const Record<ESXRecordT>& Collection<ESXRecordT, IdAccessorT>::getRecord(int index) const
     {
-        return *mRecords.at (index);
+        return *mRecords.at(index);
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    void Collection<ESXRecordT, IdAccessorT>::insertRecord (std::unique_ptr<RecordBase> record, int index,
-        UniversalId::Type type)
+    template <typename ESXRecordT, typename IdAccessorT>
+    void Collection<ESXRecordT, IdAccessorT>::insertRecord(
+        std::unique_ptr<RecordBase> record, int index, UniversalId::Type type)
     {
         int size = static_cast<int>(mRecords.size());
         if (index < 0 || index > size)
-            throw std::runtime_error ("index out of range");
+            throw std::runtime_error("index out of range");
 
-        std::unique_ptr<Record<ESXRecordT> > record2(static_cast<Record<ESXRecordT>*>(record.release()));
+        std::unique_ptr<Record<ESXRecordT>> record2(static_cast<Record<ESXRecordT>*>(record.release()));
         std::string lowerId = Misc::StringUtils::lowerCase(IdAccessorT().getId(record2->get()));
 
         if (index == size)
-            mRecords.push_back (std::move(record2));
+            mRecords.push_back(std::move(record2));
         else
-            mRecords.insert (mRecords.begin()+index, std::move(record2));
+            mRecords.insert(mRecords.begin() + index, std::move(record2));
 
-        if (index < size-1)
+        if (index < size - 1)
         {
-            for (std::map<std::string, int>::iterator iter (mIndex.begin()); iter!=mIndex.end(); ++iter)
+            for (std::map<std::string, int>::iterator iter(mIndex.begin()); iter != mIndex.end(); ++iter)
             {
                 if (iter->second >= index)
                     ++(iter->second);
             }
         }
 
-        mIndex.insert (std::make_pair (lowerId, index));
+        mIndex.insert(std::make_pair(lowerId, index));
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    void Collection<ESXRecordT, IdAccessorT>::setRecord (int index,
-            std::unique_ptr<Record<ESXRecordT> > record)
+    template <typename ESXRecordT, typename IdAccessorT>
+    void Collection<ESXRecordT, IdAccessorT>::setRecord(int index, std::unique_ptr<Record<ESXRecordT>> record)
     {
-        if (Misc::StringUtils::lowerCase (IdAccessorT().getId (mRecords.at (index)->get())) !=
-            Misc::StringUtils::lowerCase (IdAccessorT().getId (record->get())))
-            throw std::runtime_error ("attempt to change the ID of a record");
+        if (Misc::StringUtils::lowerCase(IdAccessorT().getId(mRecords.at(index)->get()))
+            != Misc::StringUtils::lowerCase(IdAccessorT().getId(record->get())))
+            throw std::runtime_error("attempt to change the ID of a record");
 
-        mRecords.at (index) = std::move(record);
+        mRecords.at(index) = std::move(record);
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    bool Collection<ESXRecordT, IdAccessorT>::reorderRows (int baseIndex, const std::vector<int>& newOrder)
+    template <typename ESXRecordT, typename IdAccessorT>
+    bool Collection<ESXRecordT, IdAccessorT>::reorderRows(int baseIndex, const std::vector<int>& newOrder)
     {
         return false;
     }
diff --git a/apps/opencs/model/world/collectionbase.cpp b/apps/opencs/model/world/collectionbase.cpp
index f20fc643e2..394400e6ed 100644
--- a/apps/opencs/model/world/collectionbase.cpp
+++ b/apps/opencs/model/world/collectionbase.cpp
@@ -8,28 +8,28 @@ CSMWorld::CollectionBase::CollectionBase() {}
 
 CSMWorld::CollectionBase::~CollectionBase() {}
 
-int CSMWorld::CollectionBase::getInsertIndex (const std::string& id, UniversalId::Type type, RecordBase *record) const
+int CSMWorld::CollectionBase::getInsertIndex(const std::string& id, UniversalId::Type type, RecordBase* record) const
 {
     return getAppendIndex(id, type);
 }
 
-int CSMWorld::CollectionBase::searchColumnIndex (Columns::ColumnId id) const
+int CSMWorld::CollectionBase::searchColumnIndex(Columns::ColumnId id) const
 {
     int columns = getColumns();
 
-    for (int i=0; i<columns; ++i)
-        if (getColumn (i).mColumnId==id)
+    for (int i = 0; i < columns; ++i)
+        if (getColumn(i).mColumnId == id)
             return i;
 
     return -1;
 }
 
-int CSMWorld::CollectionBase::findColumnIndex (Columns::ColumnId id) const
+int CSMWorld::CollectionBase::findColumnIndex(Columns::ColumnId id) const
 {
-    int index = searchColumnIndex (id);
+    int index = searchColumnIndex(id);
 
-    if (index==-1)
-        throw std::logic_error ("invalid column index");
+    if (index == -1)
+        throw std::logic_error("invalid column index");
 
     return index;
 }
diff --git a/apps/opencs/model/world/collectionbase.hpp b/apps/opencs/model/world/collectionbase.hpp
index be6131ee52..8ac918612e 100644
--- a/apps/opencs/model/world/collectionbase.hpp
+++ b/apps/opencs/model/world/collectionbase.hpp
@@ -1,13 +1,13 @@
 #ifndef CSM_WOLRD_COLLECTIONBASE_H
 #define CSM_WOLRD_COLLECTIONBASE_H
 
-#include <string>
-#include <vector>
 #include <memory>
+#include <string>
 #include <string_view>
+#include <vector>
 
-#include "universalid.hpp"
 #include "columns.hpp"
+#include "universalid.hpp"
 
 class QVariant;
 
@@ -24,95 +24,91 @@ namespace CSMWorld
     /// manually.
     class CollectionBase
     {
-            // not implemented
-            CollectionBase (const CollectionBase&);
-            CollectionBase& operator= (const CollectionBase&);
-
-        public:
+        // not implemented
+        CollectionBase(const CollectionBase&);
+        CollectionBase& operator=(const CollectionBase&);
 
-            CollectionBase();
+    public:
+        CollectionBase();
 
-            virtual ~CollectionBase();
+        virtual ~CollectionBase();
 
-            virtual int getSize() const = 0;
+        virtual int getSize() const = 0;
 
-            virtual std::string getId (int index) const = 0;
+        virtual std::string getId(int index) const = 0;
 
-            virtual int getIndex (const std::string& id) const = 0;
+        virtual int getIndex(const std::string& id) const = 0;
 
-            virtual int getColumns() const = 0;
+        virtual int getColumns() const = 0;
 
-            virtual const ColumnBase& getColumn (int column) const = 0;
+        virtual const ColumnBase& getColumn(int column) const = 0;
 
-            virtual QVariant getData (int index, int column) const = 0;
+        virtual QVariant getData(int index, int column) const = 0;
 
-            virtual void setData (int index, int column, const QVariant& data) = 0;
+        virtual void setData(int index, int column, const QVariant& data) = 0;
 
-// Not in use. Temporarily removed so that the implementation of RefIdCollection can continue without
-// these functions for now.
-//            virtual void merge() = 0;
-            ///< Merge modified into base.
+        // Not in use. Temporarily removed so that the implementation of RefIdCollection can continue without
+        // these functions for now.
+        //            virtual void merge() = 0;
+        ///< Merge modified into base.
 
-//            virtual void purge() = 0;
-            ///< Remove records that are flagged as erased.
+        //            virtual void purge() = 0;
+        ///< Remove records that are flagged as erased.
 
-            virtual void removeRows (int index, int count) = 0;
+        virtual void removeRows(int index, int count) = 0;
 
-            virtual void appendBlankRecord (const std::string& id,
-                UniversalId::Type type = UniversalId::Type_None) = 0;
-            ///< \param type Will be ignored, unless the collection supports multiple record types
+        virtual void appendBlankRecord(const std::string& id, UniversalId::Type type = UniversalId::Type_None) = 0;
+        ///< \param type Will be ignored, unless the collection supports multiple record types
 
-            virtual int searchId(std::string_view id) const = 0;
-            ////< Search record with \a id.
-            /// \return index of record (if found) or -1 (not found)
+        virtual int searchId(std::string_view id) const = 0;
+        ////< Search record with \a id.
+        /// \return index of record (if found) or -1 (not found)
 
-            virtual void replace (int index, std::unique_ptr<RecordBase> record) = 0;
-            ///< If the record type does not match, an exception is thrown.
-            ///
-            /// \attention \a record must not change the ID.
-            ///< \param type Will be ignored, unless the collection supports multiple record types
+        virtual void replace(int index, std::unique_ptr<RecordBase> record) = 0;
+        ///< If the record type does not match, an exception is thrown.
+        ///
+        /// \attention \a record must not change the ID.
+        ///< \param type Will be ignored, unless the collection supports multiple record types
 
-            virtual void appendRecord (std::unique_ptr<RecordBase> record,
-                UniversalId::Type type = UniversalId::Type_None) = 0;
-            ///< If the record type does not match, an exception is thrown.
+        virtual void appendRecord(std::unique_ptr<RecordBase> record, UniversalId::Type type = UniversalId::Type_None)
+            = 0;
+        ///< If the record type does not match, an exception is thrown.
 
-            virtual void cloneRecord(const std::string& origin,
-                                     const std::string& destination,
-                                     const UniversalId::Type type) = 0;
+        virtual void cloneRecord(
+            const std::string& origin, const std::string& destination, const UniversalId::Type type)
+            = 0;
 
-            virtual bool touchRecord(const std::string& id) = 0;
+        virtual bool touchRecord(const std::string& id) = 0;
 
-            virtual const RecordBase& getRecord (const std::string& id) const = 0;
+        virtual const RecordBase& getRecord(const std::string& id) const = 0;
 
-            virtual const RecordBase& getRecord (int index) const = 0;
+        virtual const RecordBase& getRecord(int index) const = 0;
 
-            virtual int getAppendIndex (const std::string& id,
-                UniversalId::Type type = UniversalId::Type_None) const = 0;
-            ///< \param type Will be ignored, unless the collection supports multiple record types
+        virtual int getAppendIndex(const std::string& id, UniversalId::Type type = UniversalId::Type_None) const = 0;
+        ///< \param type Will be ignored, unless the collection supports multiple record types
 
-            virtual std::vector<std::string> getIds (bool listDeleted = true) const = 0;
-            ///< Return a sorted collection of all IDs
-            ///
-            /// \param listDeleted include deleted record in the list
+        virtual std::vector<std::string> getIds(bool listDeleted = true) const = 0;
+        ///< Return a sorted collection of all IDs
+        ///
+        /// \param listDeleted include deleted record in the list
 
-            virtual bool reorderRows (int baseIndex, const std::vector<int>& newOrder) = 0;
-            ///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices
-            /// given in \a newOrder (baseIndex+newOrder[0] specifies the new index of row baseIndex).
-            ///
-            /// \return Success?
+        virtual bool reorderRows(int baseIndex, const std::vector<int>& newOrder) = 0;
+        ///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices
+        /// given in \a newOrder (baseIndex+newOrder[0] specifies the new index of row baseIndex).
+        ///
+        /// \return Success?
 
-            virtual int getInsertIndex (const std::string& id,
-                UniversalId::Type type = UniversalId::Type_None,
-                RecordBase *record = nullptr) const;
-            ///< Works like getAppendIndex unless an overloaded method uses the record pointer
-            /// to get additional info about the record that results in an alternative index.
+        virtual int getInsertIndex(
+            const std::string& id, UniversalId::Type type = UniversalId::Type_None, RecordBase* record = nullptr) const;
+        ///< Works like getAppendIndex unless an overloaded method uses the record pointer
+        /// to get additional info about the record that results in an alternative index.
 
-            int searchColumnIndex (Columns::ColumnId id) const;
-            ///< Return index of column with the given \a id. If no such column exists, -1 is returned.
+        int searchColumnIndex(Columns::ColumnId id) const;
+        ///< Return index of column with the given \a id. If no such column exists, -1 is returned.
 
-            int findColumnIndex (Columns::ColumnId id) const;
-            ///< Return index of column with the given \a id. If no such column exists, an exception is
-            /// thrown.
+        int findColumnIndex(Columns::ColumnId id) const;
+        ///< Return index of column with the given \a id. If no such column exists, an exception is
+        /// thrown.
     };
 }
 
diff --git a/apps/opencs/model/world/columnbase.cpp b/apps/opencs/model/world/columnbase.cpp
index eed4202bd6..f9ad35dc3d 100644
--- a/apps/opencs/model/world/columnbase.cpp
+++ b/apps/opencs/model/world/columnbase.cpp
@@ -2,9 +2,12 @@
 
 #include "columns.hpp"
 
-CSMWorld::ColumnBase::ColumnBase (int columnId, Display displayType, int flags)
-    : mColumnId (columnId), mFlags (flags), mDisplayType (displayType)
-{}
+CSMWorld::ColumnBase::ColumnBase(int columnId, Display displayType, int flags)
+    : mColumnId(columnId)
+    , mFlags(flags)
+    , mDisplayType(displayType)
+{
+}
 
 CSMWorld::ColumnBase::~ColumnBase() {}
 
@@ -15,18 +18,17 @@ bool CSMWorld::ColumnBase::isUserEditable() const
 
 std::string CSMWorld::ColumnBase::getTitle() const
 {
-    return Columns::getName (static_cast<Columns::ColumnId> (mColumnId));
+    return Columns::getName(static_cast<Columns::ColumnId>(mColumnId));
 }
 
-int  CSMWorld::ColumnBase::getId() const
+int CSMWorld::ColumnBase::getId() const
 {
     return mColumnId;
 }
 
-bool CSMWorld::ColumnBase::isId (Display display)
+bool CSMWorld::ColumnBase::isId(Display display)
 {
-    static const Display ids[] =
-    {
+    static const Display ids[] = {
         Display_Skill,
         Display_Class,
         Display_Faction,
@@ -94,26 +96,25 @@ bool CSMWorld::ColumnBase::isId (Display display)
         Display_None,
     };
 
-    for (int i=0; ids[i]!=Display_None; ++i)
-        if (ids[i]==display)
+    for (int i = 0; ids[i] != Display_None; ++i)
+        if (ids[i] == display)
             return true;
 
     return false;
 }
 
-bool CSMWorld::ColumnBase::isText (Display display)
+bool CSMWorld::ColumnBase::isText(Display display)
 {
-    return display==Display_String || display==Display_LongString ||
-        display==Display_String32 || display==Display_String64 ||
-        display==Display_LongString256;
+    return display == Display_String || display == Display_LongString || display == Display_String32
+        || display == Display_String64 || display == Display_LongString256;
 }
 
-bool CSMWorld::ColumnBase::isScript (Display display)
+bool CSMWorld::ColumnBase::isScript(Display display)
 {
-    return display==Display_ScriptFile || display==Display_ScriptLines;
+    return display == Display_ScriptFile || display == Display_ScriptLines;
 }
 
-void CSMWorld::NestableColumn::addColumn(CSMWorld::NestableColumn *column)
+void CSMWorld::NestableColumn::addColumn(CSMWorld::NestableColumn* column)
 {
     mNestedColumns.push_back(column);
 }
@@ -126,10 +127,10 @@ const CSMWorld::ColumnBase& CSMWorld::NestableColumn::nestedColumn(int subColumn
     return *mNestedColumns.at(subColumn);
 }
 
-CSMWorld::NestableColumn::NestableColumn(int columnId, CSMWorld::ColumnBase::Display displayType,
-    int flag)
+CSMWorld::NestableColumn::NestableColumn(int columnId, CSMWorld::ColumnBase::Display displayType, int flag)
     : CSMWorld::ColumnBase(columnId, displayType, flag)
-{}
+{
+}
 
 CSMWorld::NestableColumn::~NestableColumn()
 {
@@ -144,12 +145,14 @@ bool CSMWorld::NestableColumn::hasChildren() const
     return !mNestedColumns.empty();
 }
 
-CSMWorld::NestedChildColumn::NestedChildColumn (int id,
-    CSMWorld::ColumnBase::Display display, int flags, bool isEditable)
-    : NestableColumn (id, display, flags) , mIsEditable(isEditable)
-{}
+CSMWorld::NestedChildColumn::NestedChildColumn(
+    int id, CSMWorld::ColumnBase::Display display, int flags, bool isEditable)
+    : NestableColumn(id, display, flags)
+    , mIsEditable(isEditable)
+{
+}
 
-bool CSMWorld::NestedChildColumn::isEditable () const
+bool CSMWorld::NestedChildColumn::isEditable() const
 {
     return mIsEditable;
 }
diff --git a/apps/opencs/model/world/columnbase.hpp b/apps/opencs/model/world/columnbase.hpp
index 688cdffb74..4f0b25c14a 100644
--- a/apps/opencs/model/world/columnbase.hpp
+++ b/apps/opencs/model/world/columnbase.hpp
@@ -1,9 +1,9 @@
 #ifndef CSM_WOLRD_COLUMNBASE_H
 #define CSM_WOLRD_COLUMNBASE_H
 
+#include <stdexcept>
 #include <string>
 #include <vector>
-#include <stdexcept>
 
 #include <QVariant>
 
@@ -15,16 +15,16 @@ namespace CSMWorld
     {
         enum TableEditModes
         {
-            TableEdit_None,      // no editing
-            TableEdit_Full,      // edit cells and add/remove rows
-            TableEdit_FixedRows  // edit cells only
+            TableEdit_None, // no editing
+            TableEdit_Full, // edit cells and add/remove rows
+            TableEdit_FixedRows // edit cells only
         };
 
         enum Roles
         {
             Role_Flags = Qt::UserRole,
-            Role_Display = Qt::UserRole+1,
-            Role_ColumnId = Qt::UserRole+2
+            Role_Display = Qt::UserRole + 1,
+            Role_ColumnId = Qt::UserRole + 2
         };
 
         enum Flags
@@ -37,11 +37,11 @@ namespace CSMWorld
 
         enum Display
         {
-            Display_None, //Do not use
+            Display_None, // Do not use
             Display_String,
             Display_LongString,
 
-            //CONCRETE TYPES STARTS HERE (for drag and drop)
+            // CONCRETE TYPES STARTS HERE (for drag and drop)
             Display_Skill,
             Display_Class,
             Display_Faction,
@@ -83,7 +83,7 @@ namespace CSMWorld
             Display_GlobalVariable,
             Display_BodyPart,
             Display_Enchantment,
-            //CONCRETE TYPES ENDS HERE
+            // CONCRETE TYPES ENDS HERE
 
             Display_SignedInteger8,
             Display_SignedInteger16,
@@ -140,12 +140,12 @@ namespace CSMWorld
             Display_BloodType,
             Display_EmitterType,
 
-            Display_EffectSkill,     // must display at least one, unlike Display_Skill
+            Display_EffectSkill, // must display at least one, unlike Display_Skill
             Display_EffectAttribute, // must display at least one, unlike Display_Attribute
-            Display_IngredEffectId,  // display none allowed, unlike Display_EffectId
-            Display_GenderNpc,       // must display at least one, unlike Display_Gender
+            Display_IngredEffectId, // display none allowed, unlike Display_EffectId
+            Display_GenderNpc, // must display at least one, unlike Display_Gender
 
-            //top level columns that nest other columns
+            // top level columns that nest other columns
             Display_NestedHeader
         };
 
@@ -153,7 +153,7 @@ namespace CSMWorld
         int mFlags;
         Display mDisplayType;
 
-        ColumnBase (int columnId, Display displayType, int flag);
+        ColumnBase(int columnId, Display displayType, int flag);
 
         virtual ~ColumnBase();
 
@@ -166,58 +166,61 @@ namespace CSMWorld
 
         virtual int getId() const;
 
-        static bool isId (Display display);
+        static bool isId(Display display);
 
-        static bool isText (Display display);
+        static bool isText(Display display);
 
-        static bool isScript (Display display);
+        static bool isScript(Display display);
     };
 
     class NestableColumn : public ColumnBase
     {
-        std::vector<NestableColumn *> mNestedColumns;
+        std::vector<NestableColumn*> mNestedColumns;
 
     public:
-
         NestableColumn(int columnId, Display displayType, int flag);
 
         ~NestableColumn();
 
-        void addColumn(CSMWorld::NestableColumn *column);
+        void addColumn(CSMWorld::NestableColumn* column);
 
         const ColumnBase& nestedColumn(int subColumn) const;
 
         bool hasChildren() const;
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct Column : public NestableColumn
     {
-        Column (int columnId, Display displayType, int flags = Flag_Table | Flag_Dialogue)
-        : NestableColumn (columnId, displayType, flags) {}
+        Column(int columnId, Display displayType, int flags = Flag_Table | Flag_Dialogue)
+            : NestableColumn(columnId, displayType, flags)
+        {
+        }
 
-        virtual QVariant get (const Record<ESXRecordT>& record) const = 0;
+        virtual QVariant get(const Record<ESXRecordT>& record) const = 0;
 
-        virtual void set (Record<ESXRecordT>& record, const QVariant& data)
+        virtual void set(Record<ESXRecordT>& record, const QVariant& data)
         {
-            throw std::logic_error ("Column " + getTitle() + " is not editable");
+            throw std::logic_error("Column " + getTitle() + " is not editable");
         }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct NestedParentColumn : public Column<ESXRecordT>
     {
-        NestedParentColumn (int id, int flags = ColumnBase::Flag_Dialogue, bool fixedRows = false)
-            : Column<ESXRecordT> (id, ColumnBase::Display_NestedHeader, flags), mFixedRows(fixedRows)
-        {}
+        NestedParentColumn(int id, int flags = ColumnBase::Flag_Dialogue, bool fixedRows = false)
+            : Column<ESXRecordT>(id, ColumnBase::Display_NestedHeader, flags)
+            , mFixedRows(fixedRows)
+        {
+        }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             // There is nothing to do here.
             // This prevents exceptions from parent's implementation
         }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
             // by default editable; also see IdTree::hasChildren()
             if (mFixedRows)
@@ -226,10 +229,7 @@ namespace CSMWorld
                 return QVariant::fromValue(ColumnBase::TableEdit_Full);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
 
     private:
         bool mFixedRows;
@@ -237,8 +237,7 @@ namespace CSMWorld
 
     struct NestedChildColumn : public NestableColumn
     {
-        NestedChildColumn (int id,
-                Display display, int flags = ColumnBase::Flag_Dialogue, bool isEditable = true);
+        NestedChildColumn(int id, Display display, int flags = ColumnBase::Flag_Dialogue, bool isEditable = true);
 
         bool isEditable() const override;
 
diff --git a/apps/opencs/model/world/columnimp.cpp b/apps/opencs/model/world/columnimp.cpp
index 78c7bc02d5..090c19b679 100644
--- a/apps/opencs/model/world/columnimp.cpp
+++ b/apps/opencs/model/world/columnimp.cpp
@@ -264,11 +264,12 @@ namespace CSMWorld
     }
 
     /* BodyPartRaceColumn */
-    BodyPartRaceColumn::BodyPartRaceColumn(const MeshTypeColumn<ESM::BodyPart> *meshType)
+    BodyPartRaceColumn::BodyPartRaceColumn(const MeshTypeColumn<ESM::BodyPart>* meshType)
         : mMeshType(meshType)
-    {}
+    {
+    }
 
-    QVariant BodyPartRaceColumn::get(const Record<ESM::BodyPart> &record) const
+    QVariant BodyPartRaceColumn::get(const Record<ESM::BodyPart>& record) const
     {
         if (mMeshType != nullptr && mMeshType->get(record) == ESM::BodyPart::MT_Skin)
         {
@@ -277,7 +278,7 @@ namespace CSMWorld
         return QVariant(QVariant::UserType);
     }
 
-    void BodyPartRaceColumn::set(Record<ESM::BodyPart> &record, const QVariant &data)
+    void BodyPartRaceColumn::set(Record<ESM::BodyPart>& record, const QVariant& data)
     {
         ESM::BodyPart record2 = record.get();
 
diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp
index 2d69c664d4..436b379b52 100644
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@@ -9,8 +9,8 @@
 #include <QVector>
 
 #include <components/esm3/loadbody.hpp>
-#include <components/esm3/loadskil.hpp>
 #include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include "columnbase.hpp"
 #include "columns.hpp"
@@ -22,153 +22,141 @@
 namespace CSMWorld
 {
     /// \note Shares ID with VarValueColumn. A table can not have both.
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct FloatValueColumn : public Column<ESXRecordT>
     {
-        FloatValueColumn() : Column<ESXRecordT> (Columns::ColumnId_Value, ColumnBase::Display_Float) {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+        FloatValueColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_Value, ColumnBase::Display_Float)
         {
-            return record.get().mValue.getFloat();
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mValue.getFloat(); }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
-            record2.mValue.setFloat (data.toFloat());
-            record.setModified (record2);
+            record2.mValue.setFloat(data.toFloat());
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct StringIdColumn : public Column<ESXRecordT>
     {
-        StringIdColumn (bool hidden = false)
-        : Column<ESXRecordT> (Columns::ColumnId_Id, ColumnBase::Display_Id,
-            hidden ? 0 : ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+        StringIdColumn(bool hidden = false)
+            : Column<ESXRecordT>(Columns::ColumnId_Id, ColumnBase::Display_Id,
+                hidden ? 0 : ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue)
         {
-            return QString::fromUtf8 (record.get().mId.c_str());
         }
 
-        bool isEditable() const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return false;
+            return QString::fromUtf8(record.get().mId.c_str());
         }
+
+        bool isEditable() const override { return false; }
     };
 
-    template<>
+    template <>
     inline QVariant StringIdColumn<Land>::get(const Record<Land>& record) const
     {
         const Land& land = record.get();
         return QString::fromUtf8(Land::createUniqueRecordId(land.mX, land.mY).c_str());
     }
 
-    template<>
+    template <>
     inline QVariant StringIdColumn<LandTexture>::get(const Record<LandTexture>& record) const
     {
         const LandTexture& ltex = record.get();
         return QString::fromUtf8(LandTexture::createUniqueRecordId(ltex.mPluginIndex, ltex.mIndex).c_str());
     }
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct RecordStateColumn : public Column<ESXRecordT>
     {
         RecordStateColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_Modification, ColumnBase::Display_RecordState)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+            : Column<ESXRecordT>(Columns::ColumnId_Modification, ColumnBase::Display_RecordState)
         {
-            if (record.mState==Record<ESXRecordT>::State_Erased)
-                return static_cast<int> (Record<ESXRecordT>::State_Deleted);
-
-            return static_cast<int> (record.mState);
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            record.mState = static_cast<RecordBase::State> (data.toInt());
-        }
+            if (record.mState == Record<ESXRecordT>::State_Erased)
+                return static_cast<int>(Record<ESXRecordT>::State_Deleted);
 
-        bool isEditable() const override
-        {
-            return true;
+            return static_cast<int>(record.mState);
         }
 
-        bool isUserEditable() const override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
-            return false;
+            record.mState = static_cast<RecordBase::State>(data.toInt());
         }
+
+        bool isEditable() const override { return true; }
+
+        bool isUserEditable() const override { return false; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct FixedRecordTypeColumn : public Column<ESXRecordT>
     {
         int mType;
 
-        FixedRecordTypeColumn (int type)
-        : Column<ESXRecordT> (Columns::ColumnId_RecordType, ColumnBase::Display_Integer, 0),
-          mType (type)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+        FixedRecordTypeColumn(int type)
+            : Column<ESXRecordT>(Columns::ColumnId_RecordType, ColumnBase::Display_Integer, 0)
+            , mType(type)
         {
-            return mType;
         }
 
-        bool isEditable() const override
-        {
-            return false;
-        }
+        QVariant get(const Record<ESXRecordT>& record) const override { return mType; }
+
+        bool isEditable() const override { return false; }
     };
 
     /// \attention A var type column must be immediately followed by a suitable value column.
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct VarTypeColumn : public Column<ESXRecordT>
     {
-        VarTypeColumn (ColumnBase::Display display)
-            : Column<ESXRecordT> (Columns::ColumnId_ValueType, display, ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_Refresh)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+        VarTypeColumn(ColumnBase::Display display)
+            : Column<ESXRecordT>(Columns::ColumnId_ValueType, display,
+                ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_Refresh)
         {
-            return static_cast<int> (record.get().mValue.getType());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            ESXRecordT record2 = record.get();
-            record2.mValue.setType (static_cast<ESM::VarType> (data.toInt()));
-            record.setModified (record2);
+            return static_cast<int>(record.get().mValue.getType());
         }
 
-        bool isEditable() const override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
-            return true;
+            ESXRecordT record2 = record.get();
+            record2.mValue.setType(static_cast<ESM::VarType>(data.toInt()));
+            record.setModified(record2);
         }
+
+        bool isEditable() const override { return true; }
     };
 
     /// \note Shares ID with FloatValueColumn. A table can not have both.
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct VarValueColumn : public Column<ESXRecordT>
     {
-        VarValueColumn() : Column<ESXRecordT> (Columns::ColumnId_Value, ColumnBase::Display_Var, ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_Refresh) {}
+        VarValueColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_Value, ColumnBase::Display_Var,
+                ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_Refresh)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
             switch (record.get().mValue.getType())
             {
                 case ESM::VT_String:
 
-                    return QString::fromUtf8 (record.get().mValue.getString().c_str());
+                    return QString::fromUtf8(record.get().mValue.getString().c_str());
 
                 case ESM::VT_Int:
                 case ESM::VT_Short:
@@ -180,11 +168,12 @@ namespace CSMWorld
 
                     return record.get().mValue.getFloat();
 
-                default: return QVariant();
+                default:
+                    return QVariant();
             }
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
@@ -192,311 +181,281 @@ namespace CSMWorld
             {
                 case ESM::VT_String:
 
-                    record2.mValue.setString (data.toString().toUtf8().constData());
+                    record2.mValue.setString(data.toString().toUtf8().constData());
                     break;
 
                 case ESM::VT_Int:
                 case ESM::VT_Short:
                 case ESM::VT_Long:
 
-                    record2.mValue.setInteger (data.toInt());
+                    record2.mValue.setInteger(data.toInt());
                     break;
 
                 case ESM::VT_Float:
 
-                    record2.mValue.setFloat (data.toFloat());
+                    record2.mValue.setFloat(data.toFloat());
                     break;
 
-                default: break;
+                default:
+                    break;
             }
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct DescriptionColumn : public Column<ESXRecordT>
     {
         DescriptionColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_Description, ColumnBase::Display_LongString)
-        {}
+            : Column<ESXRecordT>(Columns::ColumnId_Description, ColumnBase::Display_LongString)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mDescription.c_str());
+            return QString::fromUtf8(record.get().mDescription.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mDescription = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct SpecialisationColumn : public Column<ESXRecordT>
     {
         SpecialisationColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_Specialisation, ColumnBase::Display_Specialisation)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+            : Column<ESXRecordT>(Columns::ColumnId_Specialisation, ColumnBase::Display_Specialisation)
         {
-            return record.get().mData.mSpecialization;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mData.mSpecialization; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mData.mSpecialization = data.toInt();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct UseValueColumn : public Column<ESXRecordT>
     {
         int mIndex;
 
-        UseValueColumn (int index)
-        : Column<ESXRecordT> (Columns::ColumnId_UseValue1 + index,  ColumnBase::Display_Float),
-          mIndex (index)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+        UseValueColumn(int index)
+            : Column<ESXRecordT>(Columns::ColumnId_UseValue1 + index, ColumnBase::Display_Float)
+            , mIndex(index)
         {
-            return record.get().mData.mUseValue[mIndex];
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mData.mUseValue[mIndex]; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mData.mUseValue[mIndex] = data.toFloat();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct AttributeColumn : public Column<ESXRecordT>
     {
         AttributeColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_Attribute, ColumnBase::Display_Attribute)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+            : Column<ESXRecordT>(Columns::ColumnId_Attribute, ColumnBase::Display_Attribute)
         {
-            return record.get().mData.mAttribute;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mData.mAttribute; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mData.mAttribute = data.toInt();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct NameColumn : public Column<ESXRecordT>
     {
         NameColumn(ColumnBase::Display display = ColumnBase::Display_String)
-        : Column<ESXRecordT> (Columns::ColumnId_Name, display) {}
+            : Column<ESXRecordT>(Columns::ColumnId_Name, display)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mName.c_str());
+            return QString::fromUtf8(record.get().mName.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mName = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct AttributesColumn : public Column<ESXRecordT>
     {
         int mIndex;
 
-        AttributesColumn (int index)
-        : Column<ESXRecordT> (Columns::ColumnId_Attribute1 + index, ColumnBase::Display_Attribute),
-          mIndex (index)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+        AttributesColumn(int index)
+            : Column<ESXRecordT>(Columns::ColumnId_Attribute1 + index, ColumnBase::Display_Attribute)
+            , mIndex(index)
         {
-            return record.get().mData.mAttribute[mIndex];
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mData.mAttribute[mIndex]; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mData.mAttribute[mIndex] = data.toInt();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct SkillsColumn : public Column<ESXRecordT>
     {
         int mIndex;
         bool mMajor;
 
-        SkillsColumn (int index, bool typePrefix = false, bool major = false)
-        : Column<ESXRecordT> ((typePrefix ? (
-            major ? Columns::ColumnId_MajorSkill1 : Columns::ColumnId_MinorSkill1) :
-            Columns::ColumnId_Skill1) + index, ColumnBase::Display_Skill),
-            mIndex (index), mMajor (major)
-        {}
+        SkillsColumn(int index, bool typePrefix = false, bool major = false)
+            : Column<ESXRecordT>((typePrefix ? (major ? Columns::ColumnId_MajorSkill1 : Columns::ColumnId_MinorSkill1)
+                                             : Columns::ColumnId_Skill1)
+                    + index,
+                ColumnBase::Display_Skill)
+            , mIndex(index)
+            , mMajor(major)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            int skill = record.get().mData.getSkill (mIndex, mMajor);
+            int skill = record.get().mData.getSkill(mIndex, mMajor);
 
-            return QString::fromUtf8 (ESM::Skill::indexToId (skill).c_str());
+            return QString::fromUtf8(ESM::Skill::indexToId(skill).c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
-            std::istringstream stream (data.toString().toUtf8().constData());
+            std::istringstream stream(data.toString().toUtf8().constData());
 
             int index = -1;
             char c;
 
             stream >> c >> index;
 
-            if (index!=-1)
+            if (index != -1)
             {
                 ESXRecordT record2 = record.get();
 
-                record2.mData.getSkill (mIndex, mMajor) = index;
+                record2.mData.getSkill(mIndex, mMajor) = index;
 
-                record.setModified (record2);
+                record.setModified(record2);
             }
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct PlayableColumn : public Column<ESXRecordT>
     {
-        PlayableColumn() : Column<ESXRecordT> (Columns::ColumnId_Playable, ColumnBase::Display_Boolean)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+        PlayableColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_Playable, ColumnBase::Display_Boolean)
         {
-            return record.get().mData.mIsPlayable!=0;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mData.mIsPlayable != 0; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mData.mIsPlayable = data.toInt();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct HiddenColumn : public Column<ESXRecordT>
     {
-        HiddenColumn() : Column<ESXRecordT> (Columns::ColumnId_Hidden, ColumnBase::Display_Boolean) {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+        HiddenColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_Hidden, ColumnBase::Display_Boolean)
         {
-            return record.get().mData.mIsHidden!=0;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mData.mIsHidden != 0; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mData.mIsHidden = data.toInt();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct FlagColumn : public Column<ESXRecordT>
     {
         int mMask;
         bool mInverted;
 
-        FlagColumn (int columnId, int mask,
-                int flags = ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue, bool inverted = false)
-        : Column<ESXRecordT> (columnId, ColumnBase::Display_Boolean, flags), mMask (mask),
-          mInverted (inverted)
-        {}
+        FlagColumn(int columnId, int mask, int flags = ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue,
+            bool inverted = false)
+            : Column<ESXRecordT>(columnId, ColumnBase::Display_Boolean, flags)
+            , mMask(mask)
+            , mInverted(inverted)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            bool flag = (record.get().mData.mFlags & mMask)!=0;
+            bool flag = (record.get().mData.mFlags & mMask) != 0;
 
             if (mInverted)
                 flag = !flag;
@@ -504,40 +463,39 @@ namespace CSMWorld
             return flag;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             int flags = record2.mData.mFlags & ~mMask;
 
-            if ((data.toInt()!=0)!=mInverted)
+            if ((data.toInt() != 0) != mInverted)
                 flags |= mMask;
 
             record2.mData.mFlags = flags;
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct FlagColumn2 : public Column<ESXRecordT>
     {
         int mMask;
         bool mInverted;
 
-        FlagColumn2 (int columnId, int mask, bool inverted = false)
-        : Column<ESXRecordT> (columnId, ColumnBase::Display_Boolean), mMask (mask),
-          mInverted (inverted)
-        {}
+        FlagColumn2(int columnId, int mask, bool inverted = false)
+            : Column<ESXRecordT>(columnId, ColumnBase::Display_Boolean)
+            , mMask(mask)
+            , mInverted(inverted)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            bool flag = (record.get().mFlags & mMask)!=0;
+            bool flag = (record.get().mFlags & mMask) != 0;
 
             if (mInverted)
                 flag = !flag;
@@ -545,67 +503,60 @@ namespace CSMWorld
             return flag;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             int flags = record2.mFlags & ~mMask;
 
-            if ((data.toInt()!=0)!=mInverted)
+            if ((data.toInt() != 0) != mInverted)
                 flags |= mMask;
 
             record2.mFlags = flags;
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct WeightHeightColumn : public Column<ESXRecordT>
     {
         bool mMale;
         bool mWeight;
 
-        WeightHeightColumn (bool male, bool weight)
-        : Column<ESXRecordT> (male ?
-          (weight ? Columns::ColumnId_MaleWeight : Columns::ColumnId_MaleHeight) :
-          (weight ? Columns::ColumnId_FemaleWeight : Columns::ColumnId_FemaleHeight),
-          ColumnBase::Display_Float),
-          mMale (male), mWeight (weight)
-        {}
+        WeightHeightColumn(bool male, bool weight)
+            : Column<ESXRecordT>(male ? (weight ? Columns::ColumnId_MaleWeight : Columns::ColumnId_MaleHeight)
+                                      : (weight ? Columns::ColumnId_FemaleWeight : Columns::ColumnId_FemaleHeight),
+                ColumnBase::Display_Float)
+            , mMale(male)
+            , mWeight(weight)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            const ESM::Race::MaleFemaleF& value =
-                mWeight ? record.get().mData.mWeight : record.get().mData.mHeight;
+            const ESM::Race::MaleFemaleF& value = mWeight ? record.get().mData.mWeight : record.get().mData.mHeight;
 
             return mMale ? value.mMale : value.mFemale;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
-            ESM::Race::MaleFemaleF& value =
-                mWeight ? record2.mData.mWeight : record2.mData.mHeight;
+            ESM::Race::MaleFemaleF& value = mWeight ? record2.mData.mWeight : record2.mData.mHeight;
 
             (mMale ? value.mMale : value.mFemale) = data.toFloat();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct SoundParamColumn : public Column<ESXRecordT>
     {
         enum Type
@@ -617,209 +568,203 @@ namespace CSMWorld
 
         Type mType;
 
-        SoundParamColumn (Type type)
-        : Column<ESXRecordT> (type==Type_Volume ? Columns::ColumnId_Volume :
-          (type==Type_MinRange ? Columns::ColumnId_MinRange : Columns::ColumnId_MaxRange),
-          ColumnBase::Display_Integer),
-          mType (type)
-        {}
+        SoundParamColumn(Type type)
+            : Column<ESXRecordT>(type == Type_Volume
+                    ? Columns::ColumnId_Volume
+                    : (type == Type_MinRange ? Columns::ColumnId_MinRange : Columns::ColumnId_MaxRange),
+                ColumnBase::Display_Integer)
+            , mType(type)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
             int value = 0;
 
             switch (mType)
             {
-                case Type_Volume: value = record.get().mData.mVolume; break;
-                case Type_MinRange: value = record.get().mData.mMinRange; break;
-                case Type_MaxRange: value = record.get().mData.mMaxRange; break;
+                case Type_Volume:
+                    value = record.get().mData.mVolume;
+                    break;
+                case Type_MinRange:
+                    value = record.get().mData.mMinRange;
+                    break;
+                case Type_MaxRange:
+                    value = record.get().mData.mMaxRange;
+                    break;
             }
 
             return value;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             int value = data.toInt();
 
-            if (value<0)
+            if (value < 0)
                 value = 0;
-            else if (value>255)
+            else if (value > 255)
                 value = 255;
 
             ESXRecordT record2 = record.get();
 
             switch (mType)
             {
-                case Type_Volume: record2.mData.mVolume = static_cast<unsigned char> (value); break;
-                case Type_MinRange: record2.mData.mMinRange = static_cast<unsigned char> (value); break;
-                case Type_MaxRange: record2.mData.mMaxRange = static_cast<unsigned char> (value); break;
+                case Type_Volume:
+                    record2.mData.mVolume = static_cast<unsigned char>(value);
+                    break;
+                case Type_MinRange:
+                    record2.mData.mMinRange = static_cast<unsigned char>(value);
+                    break;
+                case Type_MaxRange:
+                    record2.mData.mMaxRange = static_cast<unsigned char>(value);
+                    break;
             }
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct SoundFileColumn : public Column<ESXRecordT>
     {
         SoundFileColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_SoundFile, ColumnBase::Display_SoundRes)
-        {}
+            : Column<ESXRecordT>(Columns::ColumnId_SoundFile, ColumnBase::Display_SoundRes)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mSound.c_str());
+            return QString::fromUtf8(record.get().mSound.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mSound = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct MapColourColumn : public Column<ESXRecordT>
     {
         MapColourColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_MapColour, ColumnBase::Display_Colour)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+            : Column<ESXRecordT>(Columns::ColumnId_MapColour, ColumnBase::Display_Colour)
         {
-            return record.get().mMapColor;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mMapColor; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT copy = record.get();
             copy.mMapColor = data.toInt();
-            record.setModified (copy);
+            record.setModified(copy);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct SleepListColumn : public Column<ESXRecordT>
     {
         SleepListColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_SleepEncounter, ColumnBase::Display_CreatureLevelledList)
-        {}
+            : Column<ESXRecordT>(Columns::ColumnId_SleepEncounter, ColumnBase::Display_CreatureLevelledList)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mSleepList.c_str());
+            return QString::fromUtf8(record.get().mSleepList.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mSleepList = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct TextureColumn : public Column<ESXRecordT>
     {
-        TextureColumn() : Column<ESXRecordT> (Columns::ColumnId_Texture, ColumnBase::Display_Texture) {}
+        TextureColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_Texture, ColumnBase::Display_Texture)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mTexture.c_str());
+            return QString::fromUtf8(record.get().mTexture.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mTexture = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct SpellTypeColumn : public Column<ESXRecordT>
     {
         SpellTypeColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_SpellType, ColumnBase::Display_SpellType)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+            : Column<ESXRecordT>(Columns::ColumnId_SpellType, ColumnBase::Display_SpellType)
         {
-            return record.get().mData.mType;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mData.mType; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mData.mType = data.toInt();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct CostColumn : public Column<ESXRecordT>
     {
-        CostColumn() : Column<ESXRecordT> (Columns::ColumnId_Cost, ColumnBase::Display_Integer) {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+        CostColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_Cost, ColumnBase::Display_Integer)
         {
-            return record.get().mData.mCost;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mData.mCost; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
             record2.mData.mCost = data.toInt();
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct ScriptColumn : public Column<ESXRecordT>
     {
         enum Type
@@ -829,523 +774,478 @@ namespace CSMWorld
             Type_Info // dialogue context (not implemented yet)
         };
 
-        ScriptColumn (Type type)
-        : Column<ESXRecordT> (Columns::ColumnId_ScriptText,
-            type==Type_File ? ColumnBase::Display_ScriptFile : ColumnBase::Display_ScriptLines,
-            type==Type_File ? 0 : ColumnBase::Flag_Dialogue)
-        {}
+        ScriptColumn(Type type)
+            : Column<ESXRecordT>(Columns::ColumnId_ScriptText,
+                type == Type_File ? ColumnBase::Display_ScriptFile : ColumnBase::Display_ScriptLines,
+                type == Type_File ? 0 : ColumnBase::Flag_Dialogue)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mScriptText.c_str());
+            return QString::fromUtf8(record.get().mScriptText.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mScriptText = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct RegionColumn : public Column<ESXRecordT>
     {
-        RegionColumn() : Column<ESXRecordT> (Columns::ColumnId_Region, ColumnBase::Display_Region) {}
+        RegionColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_Region, ColumnBase::Display_Region)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mRegion.c_str());
+            return QString::fromUtf8(record.get().mRegion.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mRegion = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct CellColumn : public Column<ESXRecordT>
     {
         bool mBlocked;
 
         /// \param blocked Do not allow user-modification
-        CellColumn (bool blocked = false)
-        : Column<ESXRecordT> (Columns::ColumnId_Cell, ColumnBase::Display_Cell),
-          mBlocked (blocked)
-        {}
+        CellColumn(bool blocked = false)
+            : Column<ESXRecordT>(Columns::ColumnId_Cell, ColumnBase::Display_Cell)
+            , mBlocked(blocked)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mCell.c_str());
+            return QString::fromUtf8(record.get().mCell.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mCell = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
 
-        bool isUserEditable() const override
-        {
-            return !mBlocked;
-        }
+        bool isUserEditable() const override { return !mBlocked; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct OriginalCellColumn : public Column<ESXRecordT>
     {
         OriginalCellColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_OriginalCell, ColumnBase::Display_Cell)
-        {}
+            : Column<ESXRecordT>(Columns::ColumnId_OriginalCell, ColumnBase::Display_Cell)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mOriginalCell.c_str());
+            return QString::fromUtf8(record.get().mOriginalCell.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mOriginalCell = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
 
-        bool isUserEditable() const override
-        {
-            return false;
-        }
+        bool isUserEditable() const override { return false; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct IdColumn : public Column<ESXRecordT>
     {
-        IdColumn() : Column<ESXRecordT> (Columns::ColumnId_ReferenceableId,
-            ColumnBase::Display_Referenceable) {}
+        IdColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_ReferenceableId, ColumnBase::Display_Referenceable)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mRefID.c_str());
+            return QString::fromUtf8(record.get().mRefID.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mRefID = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct ScaleColumn : public Column<ESXRecordT>
     {
-        ScaleColumn() : Column<ESXRecordT> (Columns::ColumnId_Scale, ColumnBase::Display_Float) {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+        ScaleColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_Scale, ColumnBase::Display_Float)
         {
-            return record.get().mScale;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mScale; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
             record2.mScale = data.toFloat();
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct OwnerColumn : public Column<ESXRecordT>
     {
-        OwnerColumn() : Column<ESXRecordT> (Columns::ColumnId_Owner, ColumnBase::Display_Npc) {}
+        OwnerColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_Owner, ColumnBase::Display_Npc)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mOwner.c_str());
+            return QString::fromUtf8(record.get().mOwner.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mOwner = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct SoulColumn : public Column<ESXRecordT>
     {
-        SoulColumn() : Column<ESXRecordT> (Columns::ColumnId_Soul, ColumnBase::Display_Creature) {}
+        SoulColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_Soul, ColumnBase::Display_Creature)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mSoul.c_str());
+            return QString::fromUtf8(record.get().mSoul.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mSoul = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct FactionColumn : public Column<ESXRecordT>
     {
-        FactionColumn() : Column<ESXRecordT> (Columns::ColumnId_Faction, ColumnBase::Display_Faction) {}
+        FactionColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_Faction, ColumnBase::Display_Faction)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mFaction.c_str());
+            return QString::fromUtf8(record.get().mFaction.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mFaction = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct FactionIndexColumn : public Column<ESXRecordT>
     {
         FactionIndexColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_FactionIndex, ColumnBase::Display_Integer)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+            : Column<ESXRecordT>(Columns::ColumnId_FactionIndex, ColumnBase::Display_Integer)
         {
-            return record.get().mFactionRank;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mFactionRank; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
             record2.mFactionRank = data.toInt();
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct ChargesColumn : public Column<ESXRecordT>
     {
-        ChargesColumn() : Column<ESXRecordT> (Columns::ColumnId_Charges, ColumnBase::Display_Integer) {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+        ChargesColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_Charges, ColumnBase::Display_Integer)
         {
-            return record.get().mChargeInt;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mChargeInt; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
             record2.mChargeInt = data.toInt();
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct EnchantmentChargesColumn : public Column<ESXRecordT>
     {
         EnchantmentChargesColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_Enchantment, ColumnBase::Display_Float)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+            : Column<ESXRecordT>(Columns::ColumnId_Enchantment, ColumnBase::Display_Float)
         {
-            return record.get().mEnchantmentCharge;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mEnchantmentCharge; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
             record2.mEnchantmentCharge = data.toFloat();
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct GoldValueColumn : public Column<ESXRecordT>
     {
         GoldValueColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_CoinValue, ColumnBase::Display_Integer) {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+            : Column<ESXRecordT>(Columns::ColumnId_CoinValue, ColumnBase::Display_Integer)
         {
-            return record.get().mGoldValue;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mGoldValue; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
             record2.mGoldValue = data.toInt();
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct TeleportColumn : public Column<ESXRecordT>
     {
         TeleportColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_Teleport, ColumnBase::Display_Boolean)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+            : Column<ESXRecordT>(Columns::ColumnId_Teleport, ColumnBase::Display_Boolean)
         {
-            return record.get().mTeleport;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mTeleport; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mTeleport = data.toInt();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct TeleportCellColumn : public Column<ESXRecordT>
     {
         TeleportCellColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_TeleportCell, ColumnBase::Display_Cell)
-        {}
+            : Column<ESXRecordT>(Columns::ColumnId_TeleportCell, ColumnBase::Display_Cell)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mDestCell.c_str());
+            return QString::fromUtf8(record.get().mDestCell.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mDestCell = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
 
-        bool isUserEditable() const override
-        {
-            return true;
-        }
+        bool isUserEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct LockLevelColumn : public Column<ESXRecordT>
     {
         LockLevelColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_LockLevel, ColumnBase::Display_Integer)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+            : Column<ESXRecordT>(Columns::ColumnId_LockLevel, ColumnBase::Display_Integer)
         {
-            return record.get().mLockLevel;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mLockLevel; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
             record2.mLockLevel = data.toInt();
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct KeyColumn : public Column<ESXRecordT>
     {
-        KeyColumn() : Column<ESXRecordT> (Columns::ColumnId_Key, ColumnBase::Display_Miscellaneous) {}
+        KeyColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_Key, ColumnBase::Display_Miscellaneous)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mKey.c_str());
+            return QString::fromUtf8(record.get().mKey.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mKey = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct TrapColumn : public Column<ESXRecordT>
     {
-        TrapColumn() : Column<ESXRecordT> (Columns::ColumnId_Trap, ColumnBase::Display_Spell) {}
+        TrapColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_Trap, ColumnBase::Display_Spell)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mTrap.c_str());
+            return QString::fromUtf8(record.get().mTrap.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mTrap = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct FilterColumn : public Column<ESXRecordT>
     {
-        FilterColumn() : Column<ESXRecordT> (Columns::ColumnId_Filter, ColumnBase::Display_Filter) {}
+        FilterColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_Filter, ColumnBase::Display_Filter)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mFilter.c_str());
+            return QString::fromUtf8(record.get().mFilter.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mFilter = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct PosColumn : public Column<ESXRecordT>
     {
-        ESM::Position ESXRecordT::* mPosition;
+        ESM::Position ESXRecordT::*mPosition;
         int mIndex;
 
-        PosColumn (ESM::Position ESXRecordT::* position, int index, bool door)
-        : Column<ESXRecordT> (
-          (door ? Columns::ColumnId_DoorPositionXPos : Columns::ColumnId_PositionXPos)+index,
-          ColumnBase::Display_Float), mPosition (position), mIndex (index) {}
+        PosColumn(ESM::Position ESXRecordT::*position, int index, bool door)
+            : Column<ESXRecordT>((door ? Columns::ColumnId_DoorPositionXPos : Columns::ColumnId_PositionXPos) + index,
+                ColumnBase::Display_Float)
+            , mPosition(position)
+            , mIndex(index)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
             const ESM::Position& position = record.get().*mPosition;
             return position.pos[mIndex];
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
@@ -1353,33 +1253,33 @@ namespace CSMWorld
 
             position.pos[mIndex] = data.toFloat();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct RotColumn : public Column<ESXRecordT>
     {
-        ESM::Position ESXRecordT::* mPosition;
+        ESM::Position ESXRecordT::*mPosition;
         int mIndex;
 
-        RotColumn (ESM::Position ESXRecordT::* position, int index, bool door)
-        : Column<ESXRecordT> (
-          (door ? Columns::ColumnId_DoorPositionXRot : Columns::ColumnId_PositionXRot)+index,
-          ColumnBase::Display_Double), mPosition (position), mIndex (index) {}
+        RotColumn(ESM::Position ESXRecordT::*position, int index, bool door)
+            : Column<ESXRecordT>((door ? Columns::ColumnId_DoorPositionXRot : Columns::ColumnId_PositionXRot) + index,
+                ColumnBase::Display_Double)
+            , mPosition(position)
+            , mIndex(index)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
             const ESM::Position& position = record.get().*mPosition;
             return osg::RadiansToDegrees(position.rot[mIndex]);
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
@@ -1387,391 +1287,358 @@ namespace CSMWorld
 
             position.rot[mIndex] = osg::DegreesToRadians(data.toFloat());
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct DialogueTypeColumn : public Column<ESXRecordT>
     {
-        DialogueTypeColumn (bool hidden = false)
-        : Column<ESXRecordT> (Columns::ColumnId_DialogueType, ColumnBase::Display_DialogueType,
-            hidden ? 0 : ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+        DialogueTypeColumn(bool hidden = false)
+            : Column<ESXRecordT>(Columns::ColumnId_DialogueType, ColumnBase::Display_DialogueType,
+                hidden ? 0 : ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue)
         {
-            return static_cast<int> (record.get().mType);
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return static_cast<int>(record.get().mType); }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mType = data.toInt();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
 
-        bool isUserEditable() const override
-        {
-            return false;
-        }
+        bool isUserEditable() const override { return false; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct QuestStatusTypeColumn : public Column<ESXRecordT>
     {
         QuestStatusTypeColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_QuestStatusType, ColumnBase::Display_QuestStatusType)
-        {}
+            : Column<ESXRecordT>(Columns::ColumnId_QuestStatusType, ColumnBase::Display_QuestStatusType)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return static_cast<int> (record.get().mQuestStatus);
+            return static_cast<int>(record.get().mQuestStatus);
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
-            record2.mQuestStatus = static_cast<Info::QuestStatus> (data.toInt());
+            record2.mQuestStatus = static_cast<Info::QuestStatus>(data.toInt());
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct QuestDescriptionColumn : public Column<ESXRecordT>
     {
-        QuestDescriptionColumn() : Column<ESXRecordT> (Columns::ColumnId_QuestDescription, ColumnBase::Display_LongString) {}
+        QuestDescriptionColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_QuestDescription, ColumnBase::Display_LongString)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mResponse.c_str());
+            return QString::fromUtf8(record.get().mResponse.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mResponse = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct QuestIndexColumn : public Column<ESXRecordT>
     {
         QuestIndexColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_QuestIndex, ColumnBase::Display_Integer)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+            : Column<ESXRecordT>(Columns::ColumnId_QuestIndex, ColumnBase::Display_Integer)
         {
-            return record.get().mData.mDisposition;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mData.mDisposition; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
             record2.mData.mDisposition = data.toInt();
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct TopicColumn : public Column<ESXRecordT>
     {
-        TopicColumn (bool journal)
-        : Column<ESXRecordT> (journal ? Columns::ColumnId_Journal : Columns::ColumnId_Topic,
-                              journal ? ColumnBase::Display_Journal : ColumnBase::Display_Topic)
-        {}
+        TopicColumn(bool journal)
+            : Column<ESXRecordT>(journal ? Columns::ColumnId_Journal : Columns::ColumnId_Topic,
+                journal ? ColumnBase::Display_Journal : ColumnBase::Display_Topic)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mTopicId.c_str());
+            return QString::fromUtf8(record.get().mTopicId.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mTopicId = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
 
-        bool isUserEditable() const override
-        {
-            return false;
-        }
+        bool isUserEditable() const override { return false; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct ActorColumn : public Column<ESXRecordT>
     {
-        ActorColumn() : Column<ESXRecordT> (Columns::ColumnId_Actor, ColumnBase::Display_Npc) {}
+        ActorColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_Actor, ColumnBase::Display_Npc)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mActor.c_str());
+            return QString::fromUtf8(record.get().mActor.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mActor = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct RaceColumn : public Column<ESXRecordT>
     {
-        RaceColumn() : Column<ESXRecordT> (Columns::ColumnId_Race, ColumnBase::Display_Race) {}
+        RaceColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_Race, ColumnBase::Display_Race)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mRace.c_str());
+            return QString::fromUtf8(record.get().mRace.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mRace = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct ClassColumn : public Column<ESXRecordT>
     {
-        ClassColumn() : Column<ESXRecordT> (Columns::ColumnId_Class, ColumnBase::Display_Class) {}
+        ClassColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_Class, ColumnBase::Display_Class)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mClass.c_str());
+            return QString::fromUtf8(record.get().mClass.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mClass = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct PcFactionColumn : public Column<ESXRecordT>
     {
-        PcFactionColumn() : Column<ESXRecordT> (Columns::ColumnId_PcFaction, ColumnBase::Display_Faction) {}
+        PcFactionColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_PcFaction, ColumnBase::Display_Faction)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mPcFaction.c_str());
+            return QString::fromUtf8(record.get().mPcFaction.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mPcFaction = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct ResponseColumn : public Column<ESXRecordT>
     {
-        ResponseColumn() : Column<ESXRecordT> (Columns::ColumnId_Response, ColumnBase::Display_LongString) {}
+        ResponseColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_Response, ColumnBase::Display_LongString)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mResponse.c_str());
+            return QString::fromUtf8(record.get().mResponse.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mResponse = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct DispositionColumn : public Column<ESXRecordT>
     {
         DispositionColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_Disposition, ColumnBase::Display_Integer)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+            : Column<ESXRecordT>(Columns::ColumnId_Disposition, ColumnBase::Display_Integer)
         {
-            return record.get().mData.mDisposition;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mData.mDisposition; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
             record2.mData.mDisposition = data.toInt();
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct RankColumn : public Column<ESXRecordT>
     {
         RankColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_Rank, ColumnBase::Display_Integer)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+            : Column<ESXRecordT>(Columns::ColumnId_Rank, ColumnBase::Display_Integer)
         {
-            return static_cast<int> (record.get().mData.mRank);
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            ESXRecordT record2 = record.get();
-            record2.mData.mRank = static_cast<signed char> (data.toInt());
-            record.setModified (record2);
+            return static_cast<int>(record.get().mData.mRank);
         }
 
-        bool isEditable() const override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
-            return true;
+            ESXRecordT record2 = record.get();
+            record2.mData.mRank = static_cast<signed char>(data.toInt());
+            record.setModified(record2);
         }
+
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct PcRankColumn : public Column<ESXRecordT>
     {
         PcRankColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_PcRank, ColumnBase::Display_Integer)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+            : Column<ESXRecordT>(Columns::ColumnId_PcRank, ColumnBase::Display_Integer)
         {
-            return static_cast<int> (record.get().mData.mPCrank);
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            ESXRecordT record2 = record.get();
-            record2.mData.mPCrank = static_cast<signed char> (data.toInt());
-            record.setModified (record2);
+            return static_cast<int>(record.get().mData.mPCrank);
         }
 
-        bool isEditable() const override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
-            return true;
+            ESXRecordT record2 = record.get();
+            record2.mData.mPCrank = static_cast<signed char>(data.toInt());
+            record.setModified(record2);
         }
+
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct GenderColumn : public Column<ESXRecordT>
     {
         GenderColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_Gender, ColumnBase::Display_Gender)
-        {}
+            : Column<ESXRecordT>(Columns::ColumnId_Gender, ColumnBase::Display_Gender)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return static_cast<int> (record.get().mData.mGender);
+            return static_cast<int>(record.get().mData.mGender);
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mData.mGender = data.toInt();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct GenderNpcColumn : public Column<ESXRecordT>
     {
         GenderNpcColumn()
             : Column<ESXRecordT>(Columns::ColumnId_Gender, ColumnBase::Display_GenderNpc)
-        {}
+        {
+        }
 
         QVariant get(const Record<ESXRecordT>& record) const override
         {
@@ -1795,637 +1662,595 @@ namespace CSMWorld
             record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct EnchantmentTypeColumn : public Column<ESXRecordT>
     {
         EnchantmentTypeColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_EnchantmentType, ColumnBase::Display_EnchantmentType)
-        {}
+            : Column<ESXRecordT>(Columns::ColumnId_EnchantmentType, ColumnBase::Display_EnchantmentType)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return static_cast<int> (record.get().mData.mType);
+            return static_cast<int>(record.get().mData.mType);
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mData.mType = data.toInt();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct ChargesColumn2 : public Column<ESXRecordT>
     {
-        ChargesColumn2() : Column<ESXRecordT> (Columns::ColumnId_Charges, ColumnBase::Display_Integer) {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+        ChargesColumn2()
+            : Column<ESXRecordT>(Columns::ColumnId_Charges, ColumnBase::Display_Integer)
         {
-            return record.get().mData.mCharge;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mData.mCharge; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
             record2.mData.mCharge = data.toInt();
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct AutoCalcColumn : public Column<ESXRecordT>
     {
-        AutoCalcColumn() : Column<ESXRecordT> (Columns::ColumnId_AutoCalc, ColumnBase::Display_Boolean)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+        AutoCalcColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_AutoCalc, ColumnBase::Display_Boolean)
         {
-            return record.get().mData.mAutocalc!=0;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mData.mAutocalc != 0; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mData.mAutocalc = data.toInt();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct ModelColumn : public Column<ESXRecordT>
     {
-        ModelColumn() : Column<ESXRecordT> (Columns::ColumnId_Model, ColumnBase::Display_Mesh) {}
+        ModelColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_Model, ColumnBase::Display_Mesh)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mModel.c_str());
+            return QString::fromUtf8(record.get().mModel.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mModel = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct VampireColumn : public Column<ESXRecordT>
     {
-        VampireColumn() : Column<ESXRecordT> (Columns::ColumnId_Vampire, ColumnBase::Display_Boolean)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+        VampireColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_Vampire, ColumnBase::Display_Boolean)
         {
-            return record.get().mData.mVampire!=0;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mData.mVampire != 0; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mData.mVampire = data.toInt();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct BodyPartTypeColumn : public Column<ESXRecordT>
     {
         BodyPartTypeColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_BodyPartType, ColumnBase::Display_BodyPartType)
-        {}
+            : Column<ESXRecordT>(Columns::ColumnId_BodyPartType, ColumnBase::Display_BodyPartType)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return static_cast<int> (record.get().mData.mPart);
+            return static_cast<int>(record.get().mData.mPart);
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mData.mPart = data.toInt();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct MeshTypeColumn : public Column<ESXRecordT>
     {
         MeshTypeColumn(int flags = ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue)
-        : Column<ESXRecordT> (Columns::ColumnId_MeshType, ColumnBase::Display_MeshType, flags)
-        {}
+            : Column<ESXRecordT>(Columns::ColumnId_MeshType, ColumnBase::Display_MeshType, flags)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return static_cast<int> (record.get().mData.mType);
+            return static_cast<int>(record.get().mData.mType);
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mData.mType = data.toInt();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct OwnerGlobalColumn : public Column<ESXRecordT>
     {
         OwnerGlobalColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_OwnerGlobal, ColumnBase::Display_GlobalVariable)
-        {}
+            : Column<ESXRecordT>(Columns::ColumnId_OwnerGlobal, ColumnBase::Display_GlobalVariable)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mGlobalVariable.c_str());
+            return QString::fromUtf8(record.get().mGlobalVariable.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mGlobalVariable = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct RefNumCounterColumn : public Column<ESXRecordT>
     {
         RefNumCounterColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_RefNumCounter, ColumnBase::Display_Integer, 0)
-        {}
+            : Column<ESXRecordT>(Columns::ColumnId_RefNumCounter, ColumnBase::Display_Integer, 0)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return static_cast<int> (record.get().mRefNumCounter);
+            return static_cast<int>(record.get().mRefNumCounter);
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mRefNumCounter = data.toInt();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
 
-        bool isUserEditable() const override
-        {
-            return false;
-        }
+        bool isUserEditable() const override { return false; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct RefNumColumn : public Column<ESXRecordT>
     {
         RefNumColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_RefNum, ColumnBase::Display_Integer, 0)
-        {}
+            : Column<ESXRecordT>(Columns::ColumnId_RefNum, ColumnBase::Display_Integer, 0)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return static_cast<int> (record.get().mRefNum.mIndex);
+            return static_cast<int>(record.get().mRefNum.mIndex);
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mRefNum.mIndex = data.toInt();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
 
-        bool isUserEditable() const override
-        {
-            return false;
-        }
+        bool isUserEditable() const override { return false; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct SoundColumn : public Column<ESXRecordT>
     {
         SoundColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_Sound, ColumnBase::Display_Sound)
-        {}
+            : Column<ESXRecordT>(Columns::ColumnId_Sound, ColumnBase::Display_Sound)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mSound.c_str());
+            return QString::fromUtf8(record.get().mSound.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mSound = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct CreatureColumn : public Column<ESXRecordT>
     {
         CreatureColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_Creature, ColumnBase::Display_Creature)
-        {}
+            : Column<ESXRecordT>(Columns::ColumnId_Creature, ColumnBase::Display_Creature)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mCreature.c_str());
+            return QString::fromUtf8(record.get().mCreature.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mCreature = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct SoundGeneratorTypeColumn : public Column<ESXRecordT>
     {
         SoundGeneratorTypeColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_SoundGeneratorType, ColumnBase::Display_SoundGeneratorType)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+            : Column<ESXRecordT>(Columns::ColumnId_SoundGeneratorType, ColumnBase::Display_SoundGeneratorType)
         {
-            return static_cast<int> (record.get().mType);
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return static_cast<int>(record.get().mType); }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mType = data.toInt();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct BaseCostColumn : public Column<ESXRecordT>
     {
-        BaseCostColumn() : Column<ESXRecordT> (Columns::ColumnId_BaseCost, ColumnBase::Display_Float) {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+        BaseCostColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_BaseCost, ColumnBase::Display_Float)
         {
-            return record.get().mData.mBaseCost;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mData.mBaseCost; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
             record2.mData.mBaseCost = data.toFloat();
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct SchoolColumn : public Column<ESXRecordT>
     {
         SchoolColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_School, ColumnBase::Display_School)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+            : Column<ESXRecordT>(Columns::ColumnId_School, ColumnBase::Display_School)
         {
-            return record.get().mData.mSchool;
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mData.mSchool; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mData.mSchool = data.toInt();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct EffectTextureColumn : public Column<ESXRecordT>
     {
-        EffectTextureColumn (Columns::ColumnId columnId)
-        : Column<ESXRecordT> (columnId,
-                              columnId == Columns::ColumnId_Particle ? ColumnBase::Display_Texture
-                                                                     : ColumnBase::Display_Icon)
+        EffectTextureColumn(Columns::ColumnId columnId)
+            : Column<ESXRecordT>(columnId,
+                columnId == Columns::ColumnId_Particle ? ColumnBase::Display_Texture : ColumnBase::Display_Icon)
         {
-            assert (this->mColumnId==Columns::ColumnId_Icon ||
-                this->mColumnId==Columns::ColumnId_Particle);
+            assert(this->mColumnId == Columns::ColumnId_Icon || this->mColumnId == Columns::ColumnId_Particle);
         }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (
-                (this->mColumnId==Columns::ColumnId_Icon ?
-                record.get().mIcon : record.get().mParticle).c_str());
+            return QString::fromUtf8(
+                (this->mColumnId == Columns::ColumnId_Icon ? record.get().mIcon : record.get().mParticle).c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
-            (this->mColumnId==Columns::ColumnId_Icon ?
-                record2.mIcon : record2.mParticle)
+            (this->mColumnId == Columns::ColumnId_Icon ? record2.mIcon : record2.mParticle)
                 = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct EffectObjectColumn : public Column<ESXRecordT>
     {
-        EffectObjectColumn (Columns::ColumnId columnId)
-        : Column<ESXRecordT> (columnId, columnId==Columns::ColumnId_BoltObject ? ColumnBase::Display_Weapon : ColumnBase::Display_Static)
+        EffectObjectColumn(Columns::ColumnId columnId)
+            : Column<ESXRecordT>(columnId,
+                columnId == Columns::ColumnId_BoltObject ? ColumnBase::Display_Weapon : ColumnBase::Display_Static)
         {
-            assert (this->mColumnId==Columns::ColumnId_CastingObject ||
-                this->mColumnId==Columns::ColumnId_HitObject ||
-                this->mColumnId==Columns::ColumnId_AreaObject ||
-                this->mColumnId==Columns::ColumnId_BoltObject);
+            assert(this->mColumnId == Columns::ColumnId_CastingObject || this->mColumnId == Columns::ColumnId_HitObject
+                || this->mColumnId == Columns::ColumnId_AreaObject || this->mColumnId == Columns::ColumnId_BoltObject);
         }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            const std::string *string = nullptr;
+            const std::string* string = nullptr;
 
             switch (this->mColumnId)
             {
-                case Columns::ColumnId_CastingObject: string = &record.get().mCasting; break;
-                case Columns::ColumnId_HitObject: string = &record.get().mHit; break;
-                case Columns::ColumnId_AreaObject: string = &record.get().mArea; break;
-                case Columns::ColumnId_BoltObject: string = &record.get().mBolt; break;
+                case Columns::ColumnId_CastingObject:
+                    string = &record.get().mCasting;
+                    break;
+                case Columns::ColumnId_HitObject:
+                    string = &record.get().mHit;
+                    break;
+                case Columns::ColumnId_AreaObject:
+                    string = &record.get().mArea;
+                    break;
+                case Columns::ColumnId_BoltObject:
+                    string = &record.get().mBolt;
+                    break;
             }
 
             if (!string)
-                throw std::logic_error ("Unsupported column ID");
+                throw std::logic_error("Unsupported column ID");
 
-            return QString::fromUtf8 (string->c_str());
+            return QString::fromUtf8(string->c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
-            std::string *string = nullptr;
+            std::string* string = nullptr;
 
             ESXRecordT record2 = record.get();
 
             switch (this->mColumnId)
             {
-                case Columns::ColumnId_CastingObject: string = &record2.mCasting; break;
-                case Columns::ColumnId_HitObject: string = &record2.mHit; break;
-                case Columns::ColumnId_AreaObject: string = &record2.mArea; break;
-                case Columns::ColumnId_BoltObject: string = &record2.mBolt; break;
+                case Columns::ColumnId_CastingObject:
+                    string = &record2.mCasting;
+                    break;
+                case Columns::ColumnId_HitObject:
+                    string = &record2.mHit;
+                    break;
+                case Columns::ColumnId_AreaObject:
+                    string = &record2.mArea;
+                    break;
+                case Columns::ColumnId_BoltObject:
+                    string = &record2.mBolt;
+                    break;
             }
 
             if (!string)
-                throw std::logic_error ("Unsupported column ID");
+                throw std::logic_error("Unsupported column ID");
 
             *string = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct EffectSoundColumn : public Column<ESXRecordT>
     {
-        EffectSoundColumn (Columns::ColumnId columnId)
-        : Column<ESXRecordT> (columnId, ColumnBase::Display_Sound)
+        EffectSoundColumn(Columns::ColumnId columnId)
+            : Column<ESXRecordT>(columnId, ColumnBase::Display_Sound)
         {
-            assert (this->mColumnId==Columns::ColumnId_CastingSound ||
-                this->mColumnId==Columns::ColumnId_HitSound ||
-                this->mColumnId==Columns::ColumnId_AreaSound ||
-                this->mColumnId==Columns::ColumnId_BoltSound);
+            assert(this->mColumnId == Columns::ColumnId_CastingSound || this->mColumnId == Columns::ColumnId_HitSound
+                || this->mColumnId == Columns::ColumnId_AreaSound || this->mColumnId == Columns::ColumnId_BoltSound);
         }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            const std::string *string = nullptr;
+            const std::string* string = nullptr;
 
             switch (this->mColumnId)
             {
-                case Columns::ColumnId_CastingSound: string = &record.get().mCastSound; break;
-                case Columns::ColumnId_HitSound: string = &record.get().mHitSound; break;
-                case Columns::ColumnId_AreaSound: string = &record.get().mAreaSound; break;
-                case Columns::ColumnId_BoltSound: string = &record.get().mBoltSound; break;
+                case Columns::ColumnId_CastingSound:
+                    string = &record.get().mCastSound;
+                    break;
+                case Columns::ColumnId_HitSound:
+                    string = &record.get().mHitSound;
+                    break;
+                case Columns::ColumnId_AreaSound:
+                    string = &record.get().mAreaSound;
+                    break;
+                case Columns::ColumnId_BoltSound:
+                    string = &record.get().mBoltSound;
+                    break;
             }
 
             if (!string)
-                throw std::logic_error ("Unsupported column ID");
+                throw std::logic_error("Unsupported column ID");
 
-            return QString::fromUtf8 (string->c_str());
+            return QString::fromUtf8(string->c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
-            std::string *string = nullptr;
+            std::string* string = nullptr;
 
             ESXRecordT record2 = record.get();
 
             switch (this->mColumnId)
             {
-                case Columns::ColumnId_CastingSound: string = &record2.mCastSound; break;
-                case Columns::ColumnId_HitSound: string = &record2.mHitSound; break;
-                case Columns::ColumnId_AreaSound: string = &record2.mAreaSound; break;
-                case Columns::ColumnId_BoltSound: string = &record2.mBoltSound; break;
+                case Columns::ColumnId_CastingSound:
+                    string = &record2.mCastSound;
+                    break;
+                case Columns::ColumnId_HitSound:
+                    string = &record2.mHitSound;
+                    break;
+                case Columns::ColumnId_AreaSound:
+                    string = &record2.mAreaSound;
+                    break;
+                case Columns::ColumnId_BoltSound:
+                    string = &record2.mBoltSound;
+                    break;
             }
 
             if (!string)
-                throw std::logic_error ("Unsupported column ID");
+                throw std::logic_error("Unsupported column ID");
 
             *string = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct FormatColumn : public Column<ESXRecordT>
     {
         FormatColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_FileFormat, ColumnBase::Display_Integer)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
+            : Column<ESXRecordT>(Columns::ColumnId_FileFormat, ColumnBase::Display_Integer)
         {
-            return record.get().mFormat;
         }
 
-        bool isEditable() const override
-        {
-            return false;
-        }
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mFormat; }
+
+        bool isEditable() const override { return false; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct AuthorColumn : public Column<ESXRecordT>
     {
         AuthorColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_Author, ColumnBase::Display_String32)
-        {}
+            : Column<ESXRecordT>(Columns::ColumnId_Author, ColumnBase::Display_String32)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mAuthor.c_str());
+            return QString::fromUtf8(record.get().mAuthor.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mAuthor = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct FileDescriptionColumn : public Column<ESXRecordT>
     {
         FileDescriptionColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_FileDescription, ColumnBase::Display_LongString256)
-        {}
+            : Column<ESXRecordT>(Columns::ColumnId_FileDescription, ColumnBase::Display_LongString256)
+        {
+        }
 
-        QVariant get (const Record<ESXRecordT>& record) const override
+        QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8 (record.get().mDescription.c_str());
+            return QString::fromUtf8(record.get().mDescription.c_str());
         }
 
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
             record2.mDescription = data.toString().toUtf8().constData();
 
-            record.setModified (record2);
+            record.setModified(record2);
         }
 
-        bool isEditable() const override
-        {
-            return true;
-        }
+        bool isEditable() const override { return true; }
     };
 
     struct LandTextureNicknameColumn : public Column<LandTexture>
@@ -2507,12 +2332,12 @@ namespace CSMWorld
 
     struct BodyPartRaceColumn : public RaceColumn<ESM::BodyPart>
     {
-        const MeshTypeColumn<ESM::BodyPart> *mMeshType;
+        const MeshTypeColumn<ESM::BodyPart>* mMeshType;
 
-        BodyPartRaceColumn(const MeshTypeColumn<ESM::BodyPart> *meshType);
+        BodyPartRaceColumn(const MeshTypeColumn<ESM::BodyPart>* meshType);
 
-        QVariant get(const Record<ESM::BodyPart> &record) const override;
-        void set(Record<ESM::BodyPart> &record, const QVariant &data) override;
+        QVariant get(const Record<ESM::BodyPart>& record) const override;
+        void set(Record<ESM::BodyPart>& record, const QVariant& data) override;
         bool isEditable() const override;
     };
 }
diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index 83d8f05959..517080ce68 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -3,8 +3,8 @@
 #include <components/fallback/fallback.hpp>
 #include <components/misc/strings/algorithm.hpp>
 
-#include "universalid.hpp"
 #include "infoselectwrapper.hpp"
+#include "universalid.hpp"
 
 namespace CSMWorld
 {
@@ -13,11 +13,10 @@ namespace CSMWorld
         struct ColumnDesc
         {
             int mId;
-            const char *mName;
+            const char* mName;
         };
 
-        const ColumnDesc sNames[] =
-        {
+        const ColumnDesc sNames[] = {
             { ColumnId_Value, "Value" },
             { ColumnId_Id, "ID" },
             { ColumnId_Modification, "Modified" },
@@ -175,7 +174,7 @@ namespace CSMWorld
 
             { ColumnId_ContainerContent, "Content" },
             { ColumnId_ItemCount, "Count" },
-            { ColumnId_InventoryItemId, "Item ID"},
+            { ColumnId_InventoryItemId, "Item ID" },
 
             { ColumnId_CombatState, "Combat" },
             { ColumnId_MagicState, "Magic" },
@@ -187,16 +186,16 @@ namespace CSMWorld
 
             { ColumnId_ActorInventory, "Inventory" },
             { ColumnId_SpellList, "Spells" },
-            { ColumnId_SpellId, "Spell ID"},
+            { ColumnId_SpellId, "Spell ID" },
 
             { ColumnId_NpcDestinations, "Destinations" },
-            { ColumnId_DestinationCell, "Dest Cell"},
-            { ColumnId_PosX, "Dest X"},
-            { ColumnId_PosY, "Dest Y"},
-            { ColumnId_PosZ, "Dest Z"},
-            { ColumnId_RotX, "Rotation X"},
-            { ColumnId_RotY, "Rotation Y"},
-            { ColumnId_RotZ, "Rotation Z"},
+            { ColumnId_DestinationCell, "Dest Cell" },
+            { ColumnId_PosX, "Dest X" },
+            { ColumnId_PosY, "Dest Y" },
+            { ColumnId_PosZ, "Dest Z" },
+            { ColumnId_RotX, "Rotation X" },
+            { ColumnId_RotY, "Rotation Y" },
+            { ColumnId_RotZ, "Rotation Z" },
 
             { ColumnId_OwnerGlobal, "Owner Global" },
             { ColumnId_DefaultProfile, "Default Profile" },
@@ -265,9 +264,9 @@ namespace CSMWorld
             { ColumnId_PartRefMale, "Male Part" },
             { ColumnId_PartRefFemale, "Female Part" },
 
-            { ColumnId_LevelledList,"Levelled List" },
-            { ColumnId_LevelledItemId,"Levelled Item" },
-            { ColumnId_LevelledItemLevel,"PC Level" },
+            { ColumnId_LevelledList, "Levelled List" },
+            { ColumnId_LevelledItemId, "Levelled Item" },
+            { ColumnId_LevelledItemLevel, "PC Level" },
             { ColumnId_LevelledItemType, "Calculate all levels <= player" },
             { ColumnId_LevelledItemTypeEach, "Select a new item for each instance" },
             { ColumnId_LevelledItemChanceNone, "Chance None" },
@@ -373,7 +372,7 @@ namespace CSMWorld
             { ColumnId_Persistent, "Persistent" },
             { ColumnId_Blocked, "Blocked" },
 
-            { ColumnId_LevelledCreatureId,"Levelled Creature" },
+            { ColumnId_LevelledCreatureId, "Levelled Creature" },
 
             // end marker
             { -1, 0 },
@@ -381,18 +380,18 @@ namespace CSMWorld
     }
 }
 
-std::string CSMWorld::Columns::getName (ColumnId column)
+std::string CSMWorld::Columns::getName(ColumnId column)
 {
-    for (int i=0; sNames[i].mName; ++i)
-        if (column==sNames[i].mId)
+    for (int i = 0; sNames[i].mName; ++i)
+        if (column == sNames[i].mId)
             return sNames[i].mName;
 
     return "";
 }
 
-int CSMWorld::Columns::getId (const std::string& name)
+int CSMWorld::Columns::getId(const std::string& name)
 {
-    for (int i=0; sNames[i].mName; ++i)
+    for (int i = 0; sNames[i].mName; ++i)
         if (Misc::StringUtils::ciEqual(std::string_view(sNames[i].mName), name))
             return sNames[i].mId;
 
@@ -401,246 +400,191 @@ int CSMWorld::Columns::getId (const std::string& name)
 
 namespace
 {
-    static const char *sSpecialisations[] =
-    {
-        "Combat", "Magic", "Stealth", 0
-    };
+    static const char* sSpecialisations[] = { "Combat", "Magic", "Stealth", 0 };
 
     // see ESM::Attribute::AttributeID in <component/esm3/attr.hpp>
-    static const char *sAttributes[] =
-    {
-        "Strength", "Intelligence", "Willpower", "Agility", "Speed", "Endurance", "Personality",
-        "Luck", 0
-    };
+    static const char* sAttributes[]
+        = { "Strength", "Intelligence", "Willpower", "Agility", "Speed", "Endurance", "Personality", "Luck", 0 };
 
-    static const char *sSpellTypes[] =
-    {
-        "Spell", "Ability", "Blight", "Disease", "Curse", "Power", 0
-    };
+    static const char* sSpellTypes[] = { "Spell", "Ability", "Blight", "Disease", "Curse", "Power", 0 };
 
-    static const char *sApparatusTypes[] =
-    {
-        "Mortar & Pestle", "Alembic", "Calcinator", "Retort", 0
-    };
+    static const char* sApparatusTypes[] = { "Mortar & Pestle", "Alembic", "Calcinator", "Retort", 0 };
 
-    static const char *sArmorTypes[] =
-    {
-        "Helmet", "Cuirass", "Left Pauldron", "Right Pauldron", "Greaves", "Boots", "Left Gauntlet",
-        "Right Gauntlet", "Shield", "Left Bracer", "Right Bracer", 0
-    };
+    static const char* sArmorTypes[] = { "Helmet", "Cuirass", "Left Pauldron", "Right Pauldron", "Greaves", "Boots",
+        "Left Gauntlet", "Right Gauntlet", "Shield", "Left Bracer", "Right Bracer", 0 };
 
-    static const char *sClothingTypes[] =
-    {
-        "Pants", "Shoes", "Shirt", "Belt", "Robe", "Right Glove", "Left Glove", "Skirt", "Ring",
-        "Amulet", 0
-    };
+    static const char* sClothingTypes[]
+        = { "Pants", "Shoes", "Shirt", "Belt", "Robe", "Right Glove", "Left Glove", "Skirt", "Ring", "Amulet", 0 };
 
-    static const char *sCreatureTypes[] =
-    {
-        "Creature", "Daedra", "Undead", "Humanoid", 0
-    };
+    static const char* sCreatureTypes[] = { "Creature", "Daedra", "Undead", "Humanoid", 0 };
 
-    static const char *sWeaponTypes[] =
-    {
-        "Short Blade 1H", "Long Blade 1H", "Long Blade 2H", "Blunt 1H", "Blunt 2H Close",
-        "Blunt 2H Wide", "Spear 2H", "Axe 1H", "Axe 2H", "Bow", "Crossbow", "Thrown", "Arrow",
-        "Bolt", 0
-    };
+    static const char* sWeaponTypes[]
+        = { "Short Blade 1H", "Long Blade 1H", "Long Blade 2H", "Blunt 1H", "Blunt 2H Close", "Blunt 2H Wide",
+              "Spear 2H", "Axe 1H", "Axe 2H", "Bow", "Crossbow", "Thrown", "Arrow", "Bolt", 0 };
 
-    static const char *sModificationEnums[] =
-    {
-        "Base", "Modified", "Added", "Deleted", "Deleted", 0
-    };
+    static const char* sModificationEnums[] = { "Base", "Modified", "Added", "Deleted", "Deleted", 0 };
 
-    static const char *sVarTypeEnums[] =
-    {
-        "unknown", "none", "short", "integer", "long", "float", "string", 0
-    };
+    static const char* sVarTypeEnums[] = { "unknown", "none", "short", "integer", "long", "float", "string", 0 };
 
-    static const char *sDialogueTypeEnums[] =
-    {
-        "Topic", "Voice", "Greeting", "Persuasion", 0
-    };
+    static const char* sDialogueTypeEnums[] = { "Topic", "Voice", "Greeting", "Persuasion", 0 };
 
-    static const char *sQuestStatusTypes[] =
-    {
-        "None", "Name", "Finished", "Restart", 0
-    };
+    static const char* sQuestStatusTypes[] = { "None", "Name", "Finished", "Restart", 0 };
 
-    static const char *sGenderEnums[] =
-    {
-        "Male", "Female", 0
-    };
+    static const char* sGenderEnums[] = { "Male", "Female", 0 };
 
-    static const char *sEnchantmentTypes[] =
-    {
-        "Cast Once", "When Strikes", "When Used", "Constant Effect", 0
-    };
+    static const char* sEnchantmentTypes[] = { "Cast Once", "When Strikes", "When Used", "Constant Effect", 0 };
 
-    static const char *sBodyPartTypes[] =
-    {
-        "Head", "Hair", "Neck", "Chest", "Groin", "Hand", "Wrist", "Forearm", "Upper Arm",
-        "Foot", "Ankle", "Knee", "Upper Leg", "Clavicle", "Tail", 0
-    };
+    static const char* sBodyPartTypes[] = { "Head", "Hair", "Neck", "Chest", "Groin", "Hand", "Wrist", "Forearm",
+        "Upper Arm", "Foot", "Ankle", "Knee", "Upper Leg", "Clavicle", "Tail", 0 };
 
-    static const char *sMeshTypes[] =
-    {
-        "Skin", "Clothing", "Armour", 0
-    };
+    static const char* sMeshTypes[] = { "Skin", "Clothing", "Armour", 0 };
 
-    static const char *sSoundGeneratorType[] =
-    {
-        "Left Foot", "Right Foot", "Swim Left", "Swim Right", "Moan", "Roar", "Scream",
-        "Land", 0
-    };
+    static const char* sSoundGeneratorType[]
+        = { "Left Foot", "Right Foot", "Swim Left", "Swim Right", "Moan", "Roar", "Scream", "Land", 0 };
 
-    static const char *sSchools[] =
-    {
-        "Alteration", "Conjuration", "Destruction", "Illusion", "Mysticism", "Restoration", 0
-    };
+    static const char* sSchools[]
+        = { "Alteration", "Conjuration", "Destruction", "Illusion", "Mysticism", "Restoration", 0 };
 
     // impact from magic effects, see ESM::Skill::SkillEnum in <component/esm3/loadskil.hpp>
-    static const char *sSkills[] =
-    {
-        "Block", "Armorer", "MediumArmor", "HeavyArmor", "BluntWeapon",
-        "LongBlade", "Axe", "Spear", "Athletics", "Enchant",
-        "Destruction", "Alteration", "Illusion", "Conjuration", "Mysticism",
-        "Restoration", "Alchemy", "Unarmored", "Security", "Sneak",
-        "Acrobatics", "LightArmor", "ShortBlade", "Marksman", "Mercantile",
-        "Speechcraft", "HandToHand", 0
-    };
+    static const char* sSkills[] = { "Block", "Armorer", "MediumArmor", "HeavyArmor", "BluntWeapon", "LongBlade", "Axe",
+        "Spear", "Athletics", "Enchant", "Destruction", "Alteration", "Illusion", "Conjuration", "Mysticism",
+        "Restoration", "Alchemy", "Unarmored", "Security", "Sneak", "Acrobatics", "LightArmor", "ShortBlade",
+        "Marksman", "Mercantile", "Speechcraft", "HandToHand", 0 };
 
     // range of magic effects, see ESM::RangeType in <component/esm3/defs.hpp>
-    static const char *sEffectRange[] =
-    {
-        "Self", "Touch", "Target", 0
-    };
+    static const char* sEffectRange[] = { "Self", "Touch", "Target", 0 };
 
     // magic effect names, see ESM::MagicEffect::Effects in <component/esm3/loadmgef.hpp>
-    static const char *sEffectId[] =
-    {
-        "WaterBreathing", "SwiftSwim", "WaterWalking", "Shield", "FireShield",
-        "LightningShield", "FrostShield", "Burden", "Feather", "Jump",
-        "Levitate", "SlowFall", "Lock", "Open", "FireDamage",
-        "ShockDamage", "FrostDamage", "DrainAttribute", "DrainHealth", "DrainMagicka",
-        "DrainFatigue", "DrainSkill", "DamageAttribute", "DamageHealth", "DamageMagicka",
-        "DamageFatigue", "DamageSkill", "Poison", "WeaknessToFire", "WeaknessToFrost",
-        "WeaknessToShock", "WeaknessToMagicka", "WeaknessToCommonDisease", "WeaknessToBlightDisease", "WeaknessToCorprusDisease",
-        "WeaknessToPoison", "WeaknessToNormalWeapons", "DisintegrateWeapon", "DisintegrateArmor", "Invisibility",
-        "Chameleon", "Light", "Sanctuary", "NightEye", "Charm",
-        "Paralyze", "Silence", "Blind", "Sound", "CalmHumanoid",
-        "CalmCreature", "FrenzyHumanoid", "FrenzyCreature", "DemoralizeHumanoid", "DemoralizeCreature",
-        "RallyHumanoid", "RallyCreature", "Dispel", "Soultrap", "Telekinesis",
-        "Mark", "Recall", "DivineIntervention", "AlmsiviIntervention", "DetectAnimal",
-        "DetectEnchantment", "DetectKey", "SpellAbsorption", "Reflect", "CureCommonDisease",
-        "CureBlightDisease", "CureCorprusDisease", "CurePoison", "CureParalyzation", "RestoreAttribute",
-        "RestoreHealth", "RestoreMagicka", "RestoreFatigue", "RestoreSkill", "FortifyAttribute",
-        "FortifyHealth", "FortifyMagicka", "FortifyFatigue", "FortifySkill", "FortifyMaximumMagicka",
-        "AbsorbAttribute", "AbsorbHealth", "AbsorbMagicka", "AbsorbFatigue", "AbsorbSkill",
-        "ResistFire", "ResistFrost", "ResistShock", "ResistMagicka", "ResistCommonDisease",
+    static const char* sEffectId[] = { "WaterBreathing", "SwiftSwim", "WaterWalking", "Shield", "FireShield",
+        "LightningShield", "FrostShield", "Burden", "Feather", "Jump", "Levitate", "SlowFall", "Lock", "Open",
+        "FireDamage", "ShockDamage", "FrostDamage", "DrainAttribute", "DrainHealth", "DrainMagicka", "DrainFatigue",
+        "DrainSkill", "DamageAttribute", "DamageHealth", "DamageMagicka", "DamageFatigue", "DamageSkill", "Poison",
+        "WeaknessToFire", "WeaknessToFrost", "WeaknessToShock", "WeaknessToMagicka", "WeaknessToCommonDisease",
+        "WeaknessToBlightDisease", "WeaknessToCorprusDisease", "WeaknessToPoison", "WeaknessToNormalWeapons",
+        "DisintegrateWeapon", "DisintegrateArmor", "Invisibility", "Chameleon", "Light", "Sanctuary", "NightEye",
+        "Charm", "Paralyze", "Silence", "Blind", "Sound", "CalmHumanoid", "CalmCreature", "FrenzyHumanoid",
+        "FrenzyCreature", "DemoralizeHumanoid", "DemoralizeCreature", "RallyHumanoid", "RallyCreature", "Dispel",
+        "Soultrap", "Telekinesis", "Mark", "Recall", "DivineIntervention", "AlmsiviIntervention", "DetectAnimal",
+        "DetectEnchantment", "DetectKey", "SpellAbsorption", "Reflect", "CureCommonDisease", "CureBlightDisease",
+        "CureCorprusDisease", "CurePoison", "CureParalyzation", "RestoreAttribute", "RestoreHealth", "RestoreMagicka",
+        "RestoreFatigue", "RestoreSkill", "FortifyAttribute", "FortifyHealth", "FortifyMagicka", "FortifyFatigue",
+        "FortifySkill", "FortifyMaximumMagicka", "AbsorbAttribute", "AbsorbHealth", "AbsorbMagicka", "AbsorbFatigue",
+        "AbsorbSkill", "ResistFire", "ResistFrost", "ResistShock", "ResistMagicka", "ResistCommonDisease",
         "ResistBlightDisease", "ResistCorprusDisease", "ResistPoison", "ResistNormalWeapons", "ResistParalysis",
-        "RemoveCurse", "TurnUndead", "SummonScamp", "SummonClannfear", "SummonDaedroth",
-        "SummonDremora", "SummonAncestralGhost", "SummonSkeletalMinion", "SummonBonewalker", "SummonGreaterBonewalker",
-        "SummonBonelord", "SummonWingedTwilight", "SummonHunger", "SummonGoldenSaint", "SummonFlameAtronach",
-        "SummonFrostAtronach", "SummonStormAtronach", "FortifyAttack", "CommandCreature", "CommandHumanoid",
-        "BoundDagger", "BoundLongsword", "BoundMace", "BoundBattleAxe", "BoundSpear",
-        "BoundLongbow", "ExtraSpell", "BoundCuirass", "BoundHelm", "BoundBoots",
-        "BoundShield", "BoundGloves", "Corprus", "Vampirism", "SummonCenturionSphere",
-        "SunDamage", "StuntedMagicka", "SummonFabricant", "SummonWolf", "SummonBear",
-        "SummonBonewolf", "SummonCreature04", "SummonCreature05", 0
-    };
+        "RemoveCurse", "TurnUndead", "SummonScamp", "SummonClannfear", "SummonDaedroth", "SummonDremora",
+        "SummonAncestralGhost", "SummonSkeletalMinion", "SummonBonewalker", "SummonGreaterBonewalker", "SummonBonelord",
+        "SummonWingedTwilight", "SummonHunger", "SummonGoldenSaint", "SummonFlameAtronach", "SummonFrostAtronach",
+        "SummonStormAtronach", "FortifyAttack", "CommandCreature", "CommandHumanoid", "BoundDagger", "BoundLongsword",
+        "BoundMace", "BoundBattleAxe", "BoundSpear", "BoundLongbow", "ExtraSpell", "BoundCuirass", "BoundHelm",
+        "BoundBoots", "BoundShield", "BoundGloves", "Corprus", "Vampirism", "SummonCenturionSphere", "SunDamage",
+        "StuntedMagicka", "SummonFabricant", "SummonWolf", "SummonBear", "SummonBonewolf", "SummonCreature04",
+        "SummonCreature05", 0 };
 
     // see ESM::PartReferenceType in <component/esm3/loadarmo.hpp>
-    static const char *sPartRefType[] =
-    {
-        "Head", "Hair", "Neck", "Cuirass", "Groin",
-        "Skirt", "Right Hand", "Left Hand", "Right Wrist", "Left Wrist",
-        "Shield", "Right Forearm", "Left Forearm", "Right Upperarm", "Left Upperarm",
-        "Right Foot", "Left Foot", "Right Ankle", "Left Ankle", "Right Knee",
-        "Left Knee", "Right Leg", "Left Leg", "Right Pauldron", "Left Pauldron",
-        "Weapon", "Tail", 0
-    };
+    static const char* sPartRefType[] = { "Head", "Hair", "Neck", "Cuirass", "Groin", "Skirt", "Right Hand",
+        "Left Hand", "Right Wrist", "Left Wrist", "Shield", "Right Forearm", "Left Forearm", "Right Upperarm",
+        "Left Upperarm", "Right Foot", "Left Foot", "Right Ankle", "Left Ankle", "Right Knee", "Left Knee", "Right Leg",
+        "Left Leg", "Right Pauldron", "Left Pauldron", "Weapon", "Tail", 0 };
 
     // see the enums in <component/esm3/aipackage.hpp>
-    static const char *sAiPackageType[] =
-    {
-        "AI Wander", "AI Travel", "AI Follow", "AI Escort", "AI Activate", 0
-    };
+    static const char* sAiPackageType[] = { "AI Wander", "AI Travel", "AI Follow", "AI Escort", "AI Activate", 0 };
 
-    static const char *sBookType[] =
-    {
-        "Book", "Scroll", 0
-    };
+    static const char* sBookType[] = { "Book", "Scroll", 0 };
 
-    static const char *sEmitterType[] =
-    {
-        "<None>", "Flickering", "Flickering (Slow)", "Pulsing", "Pulsing (Slow)", 0
-    };
+    static const char* sEmitterType[] = { "<None>", "Flickering", "Flickering (Slow)", "Pulsing", "Pulsing (Slow)", 0 };
 
-    const char **getEnumNames (CSMWorld::Columns::ColumnId column)
+    const char** getEnumNames(CSMWorld::Columns::ColumnId column)
     {
         switch (column)
         {
-            case CSMWorld::Columns::ColumnId_Specialisation: return sSpecialisations;
-            case CSMWorld::Columns::ColumnId_Attribute: return sAttributes;
-            case CSMWorld::Columns::ColumnId_SpellType: return sSpellTypes;
-            case CSMWorld::Columns::ColumnId_ApparatusType: return sApparatusTypes;
-            case CSMWorld::Columns::ColumnId_ArmorType: return sArmorTypes;
-            case CSMWorld::Columns::ColumnId_ClothingType: return sClothingTypes;
-            case CSMWorld::Columns::ColumnId_CreatureType: return sCreatureTypes;
-            case CSMWorld::Columns::ColumnId_WeaponType: return sWeaponTypes;
-            case CSMWorld::Columns::ColumnId_Modification: return sModificationEnums;
-            case CSMWorld::Columns::ColumnId_ValueType: return sVarTypeEnums;
-            case CSMWorld::Columns::ColumnId_DialogueType: return sDialogueTypeEnums;
-            case CSMWorld::Columns::ColumnId_QuestStatusType: return sQuestStatusTypes;
-            case CSMWorld::Columns::ColumnId_Gender: return sGenderEnums;
-            case CSMWorld::Columns::ColumnId_EnchantmentType: return sEnchantmentTypes;
-            case CSMWorld::Columns::ColumnId_BodyPartType: return sBodyPartTypes;
-            case CSMWorld::Columns::ColumnId_MeshType: return sMeshTypes;
-            case CSMWorld::Columns::ColumnId_SoundGeneratorType: return sSoundGeneratorType;
-            case CSMWorld::Columns::ColumnId_School: return sSchools;
-            case CSMWorld::Columns::ColumnId_Skill: return sSkills;
-            case CSMWorld::Columns::ColumnId_EffectRange: return sEffectRange;
-            case CSMWorld::Columns::ColumnId_EffectId: return sEffectId;
-            case CSMWorld::Columns::ColumnId_PartRefType: return sPartRefType;
-            case CSMWorld::Columns::ColumnId_AiPackageType: return sAiPackageType;
-            case CSMWorld::Columns::ColumnId_InfoCondFunc: return CSMWorld::ConstInfoSelectWrapper::FunctionEnumStrings;
-            case CSMWorld::Columns::ColumnId_InfoCondComp: return CSMWorld::ConstInfoSelectWrapper::RelationEnumStrings;
-            case CSMWorld::Columns::ColumnId_BookType: return sBookType;
-            case CSMWorld::Columns::ColumnId_EmitterType: return sEmitterType;
-
-            default: return 0;
+            case CSMWorld::Columns::ColumnId_Specialisation:
+                return sSpecialisations;
+            case CSMWorld::Columns::ColumnId_Attribute:
+                return sAttributes;
+            case CSMWorld::Columns::ColumnId_SpellType:
+                return sSpellTypes;
+            case CSMWorld::Columns::ColumnId_ApparatusType:
+                return sApparatusTypes;
+            case CSMWorld::Columns::ColumnId_ArmorType:
+                return sArmorTypes;
+            case CSMWorld::Columns::ColumnId_ClothingType:
+                return sClothingTypes;
+            case CSMWorld::Columns::ColumnId_CreatureType:
+                return sCreatureTypes;
+            case CSMWorld::Columns::ColumnId_WeaponType:
+                return sWeaponTypes;
+            case CSMWorld::Columns::ColumnId_Modification:
+                return sModificationEnums;
+            case CSMWorld::Columns::ColumnId_ValueType:
+                return sVarTypeEnums;
+            case CSMWorld::Columns::ColumnId_DialogueType:
+                return sDialogueTypeEnums;
+            case CSMWorld::Columns::ColumnId_QuestStatusType:
+                return sQuestStatusTypes;
+            case CSMWorld::Columns::ColumnId_Gender:
+                return sGenderEnums;
+            case CSMWorld::Columns::ColumnId_EnchantmentType:
+                return sEnchantmentTypes;
+            case CSMWorld::Columns::ColumnId_BodyPartType:
+                return sBodyPartTypes;
+            case CSMWorld::Columns::ColumnId_MeshType:
+                return sMeshTypes;
+            case CSMWorld::Columns::ColumnId_SoundGeneratorType:
+                return sSoundGeneratorType;
+            case CSMWorld::Columns::ColumnId_School:
+                return sSchools;
+            case CSMWorld::Columns::ColumnId_Skill:
+                return sSkills;
+            case CSMWorld::Columns::ColumnId_EffectRange:
+                return sEffectRange;
+            case CSMWorld::Columns::ColumnId_EffectId:
+                return sEffectId;
+            case CSMWorld::Columns::ColumnId_PartRefType:
+                return sPartRefType;
+            case CSMWorld::Columns::ColumnId_AiPackageType:
+                return sAiPackageType;
+            case CSMWorld::Columns::ColumnId_InfoCondFunc:
+                return CSMWorld::ConstInfoSelectWrapper::FunctionEnumStrings;
+            case CSMWorld::Columns::ColumnId_InfoCondComp:
+                return CSMWorld::ConstInfoSelectWrapper::RelationEnumStrings;
+            case CSMWorld::Columns::ColumnId_BookType:
+                return sBookType;
+            case CSMWorld::Columns::ColumnId_EmitterType:
+                return sEmitterType;
+
+            default:
+                return 0;
         }
     }
 }
 
-bool CSMWorld::Columns::hasEnums (ColumnId column)
+bool CSMWorld::Columns::hasEnums(ColumnId column)
 {
-    return getEnumNames (column)!=0 || column==ColumnId_RecordType;
+    return getEnumNames(column) != 0 || column == ColumnId_RecordType;
 }
 
-std::vector<std::pair<int,std::string>>CSMWorld::Columns::getEnums (ColumnId column)
+std::vector<std::pair<int, std::string>> CSMWorld::Columns::getEnums(ColumnId column)
 {
-    std::vector<std::pair<int,std::string>> enums;
+    std::vector<std::pair<int, std::string>> enums;
 
-    if (const char **table = getEnumNames (column))
-        for (int i=0; table[i]; ++i)
+    if (const char** table = getEnumNames(column))
+        for (int i = 0; table[i]; ++i)
             enums.emplace_back(i, table[i]);
-    else if (column==ColumnId_BloodType)
+    else if (column == ColumnId_BloodType)
     {
-        for (int i=0; i<8; i++)
+        for (int i = 0; i < 8; i++)
         {
             std::string_view bloodName = Fallback::Map::getString("Blood_Texture_Name_" + std::to_string(i));
             if (!bloodName.empty())
                 enums.emplace_back(i, bloodName);
         }
     }
-    else if (column==ColumnId_RecordType)
+    else if (column == ColumnId_RecordType)
     {
         enums.emplace_back(UniversalId::Type_None, ""); // none
 
-        for (int i=UniversalId::Type_None+1; i<UniversalId::NumberOfTypes; ++i)
-            enums.emplace_back (i, UniversalId (static_cast<UniversalId::Type> (i)).getTypeName());
+        for (int i = UniversalId::Type_None + 1; i < UniversalId::NumberOfTypes; ++i)
+            enums.emplace_back(i, UniversalId(static_cast<UniversalId::Type>(i)).getTypeName());
     }
 
     return enums;
diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp
index 5e43a4d561..acb7c9b2b7 100644
--- a/apps/opencs/model/world/columns.hpp
+++ b/apps/opencs/model/world/columns.hpp
@@ -383,14 +383,14 @@ namespace CSMWorld
             ColumnId_Skill7 = 0x50006
         };
 
-        std::string getName (ColumnId column);
+        std::string getName(ColumnId column);
 
-        int getId (const std::string& name);
+        int getId(const std::string& name);
         ///< Will return -1 for an invalid name.
 
-        bool hasEnums (ColumnId column);
+        bool hasEnums(ColumnId column);
 
-        std::vector<std::pair<int,std::string>> getEnums (ColumnId column);
+        std::vector<std::pair<int, std::string>> getEnums(ColumnId column);
         ///< Returns an empty vector, if \a column isn't an enum type column.
     }
 }
diff --git a/apps/opencs/model/world/commanddispatcher.cpp b/apps/opencs/model/world/commanddispatcher.cpp
index 00d949f450..e8adb5f3a7 100644
--- a/apps/opencs/model/world/commanddispatcher.cpp
+++ b/apps/opencs/model/world/commanddispatcher.cpp
@@ -3,49 +3,48 @@
 #include <algorithm>
 #include <memory>
 
-#include <components/misc/strings/lower.hpp>
 #include <components/misc/constants.hpp>
+#include <components/misc/strings/lower.hpp>
 
 #include "../doc/document.hpp"
 
-#include "idtable.hpp"
-#include "record.hpp"
+#include "commandmacro.hpp"
 #include "commands.hpp"
+#include "idtable.hpp"
 #include "idtableproxymodel.hpp"
-#include "commandmacro.hpp"
+#include "record.hpp"
 
 std::vector<std::string> CSMWorld::CommandDispatcher::getDeletableRecords() const
 {
     std::vector<std::string> result;
 
-    IdTable& model = dynamic_cast<IdTable&> (*mDocument.getData().getTableModel (mId));
+    IdTable& model = dynamic_cast<IdTable&>(*mDocument.getData().getTableModel(mId));
 
-    int stateColumnIndex = model.findColumnIndex (Columns::ColumnId_Modification);
+    int stateColumnIndex = model.findColumnIndex(Columns::ColumnId_Modification);
 
-    for (std::vector<std::string>::const_iterator iter (mSelection.begin());
-        iter!=mSelection.end(); ++iter)
+    for (std::vector<std::string>::const_iterator iter(mSelection.begin()); iter != mSelection.end(); ++iter)
     {
-        int row = model.getModelIndex (*iter, 0).row();
+        int row = model.getModelIndex(*iter, 0).row();
 
         // check record state
-        RecordBase::State state = static_cast<RecordBase::State> (
-            model.data (model.index (row, stateColumnIndex)).toInt());
+        RecordBase::State state
+            = static_cast<RecordBase::State>(model.data(model.index(row, stateColumnIndex)).toInt());
 
-        if (state==RecordBase::State_Deleted)
+        if (state == RecordBase::State_Deleted)
             continue;
 
         // check other columns (only relevant for a subset of the tables)
-        int dialogueTypeIndex = model.searchColumnIndex (Columns::ColumnId_DialogueType);
+        int dialogueTypeIndex = model.searchColumnIndex(Columns::ColumnId_DialogueType);
 
-        if (dialogueTypeIndex!=-1)
+        if (dialogueTypeIndex != -1)
         {
-            int type = model.data (model.index (row, dialogueTypeIndex)).toInt();
+            int type = model.data(model.index(row, dialogueTypeIndex)).toInt();
 
-            if (type!=ESM::Dialogue::Topic && type!=ESM::Dialogue::Journal)
+            if (type != ESM::Dialogue::Topic && type != ESM::Dialogue::Journal)
                 continue;
         }
 
-        result.push_back (*iter);
+        result.push_back(*iter);
     }
 
     return result;
@@ -55,53 +54,57 @@ std::vector<std::string> CSMWorld::CommandDispatcher::getRevertableRecords() con
 {
     std::vector<std::string> result;
 
-    IdTable& model = dynamic_cast<IdTable&> (*mDocument.getData().getTableModel (mId));
+    IdTable& model = dynamic_cast<IdTable&>(*mDocument.getData().getTableModel(mId));
 
     /// \todo Reverting temporarily disabled on tables that support reordering, because
     /// revert logic currently can not handle reordering.
     if (model.getFeatures() & IdTable::Feature_ReorderWithinTopic)
         return result;
 
-    int stateColumnIndex = model.findColumnIndex (Columns::ColumnId_Modification);
+    int stateColumnIndex = model.findColumnIndex(Columns::ColumnId_Modification);
 
-    for (std::vector<std::string>::const_iterator iter (mSelection.begin());
-        iter!=mSelection.end(); ++iter)
+    for (std::vector<std::string>::const_iterator iter(mSelection.begin()); iter != mSelection.end(); ++iter)
     {
-        int row = model.getModelIndex (*iter, 0).row();
+        int row = model.getModelIndex(*iter, 0).row();
 
         // check record state
-        RecordBase::State state = static_cast<RecordBase::State> (
-            model.data (model.index (row, stateColumnIndex)).toInt());
+        RecordBase::State state
+            = static_cast<RecordBase::State>(model.data(model.index(row, stateColumnIndex)).toInt());
 
-        if (state==RecordBase::State_BaseOnly)
+        if (state == RecordBase::State_BaseOnly)
             continue;
 
-        result.push_back (*iter);
+        result.push_back(*iter);
     }
 
     return result;
 }
 
-CSMWorld::CommandDispatcher::CommandDispatcher (CSMDoc::Document& document,
-    const CSMWorld::UniversalId& id, QObject *parent)
-: QObject (parent), mLocked (false), mDocument (document), mId (id)
-{}
+CSMWorld::CommandDispatcher::CommandDispatcher(
+    CSMDoc::Document& document, const CSMWorld::UniversalId& id, QObject* parent)
+    : QObject(parent)
+    , mLocked(false)
+    , mDocument(document)
+    , mId(id)
+{
+}
 
-void CSMWorld::CommandDispatcher::setEditLock (bool locked)
+void CSMWorld::CommandDispatcher::setEditLock(bool locked)
 {
     mLocked = locked;
 }
 
-void CSMWorld::CommandDispatcher::setSelection (const std::vector<std::string>& selection)
+void CSMWorld::CommandDispatcher::setSelection(const std::vector<std::string>& selection)
 {
     mSelection = selection;
-    for (auto& sel : mSelection) {
+    for (auto& sel : mSelection)
+    {
         Misc::StringUtils::lowerCaseInPlace(sel);
     }
-    std::sort (mSelection.begin(), mSelection.end());
+    std::sort(mSelection.begin(), mSelection.end());
 }
 
-void CSMWorld::CommandDispatcher::setExtendedTypes (const std::vector<UniversalId>& types)
+void CSMWorld::CommandDispatcher::setExtendedTypes(const std::vector<UniversalId>& types)
 {
     mExtendedTypes = types;
 }
@@ -111,7 +114,7 @@ bool CSMWorld::CommandDispatcher::canDelete() const
     if (mLocked)
         return false;
 
-    return getDeletableRecords().size()!=0;
+    return getDeletableRecords().size() != 0;
 }
 
 bool CSMWorld::CommandDispatcher::canRevert() const
@@ -119,16 +122,16 @@ bool CSMWorld::CommandDispatcher::canRevert() const
     if (mLocked)
         return false;
 
-    return getRevertableRecords().size()!=0;
+    return getRevertableRecords().size() != 0;
 }
 
 std::vector<CSMWorld::UniversalId> CSMWorld::CommandDispatcher::getExtendedTypes() const
 {
     std::vector<CSMWorld::UniversalId> tables;
 
-    if (mId==UniversalId::Type_Cells)
+    if (mId == UniversalId::Type_Cells)
     {
-        tables.push_back (mId);
+        tables.push_back(mId);
         tables.emplace_back(UniversalId::Type_References);
         /// \todo add other cell-specific types
     }
@@ -136,40 +139,41 @@ std::vector<CSMWorld::UniversalId> CSMWorld::CommandDispatcher::getExtendedTypes
     return tables;
 }
 
-void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, const QModelIndex& index, const QVariant& new_)
+void CSMWorld::CommandDispatcher::executeModify(
+    QAbstractItemModel* model, const QModelIndex& index, const QVariant& new_)
 {
     if (mLocked)
         return;
 
     std::unique_ptr<CSMWorld::UpdateCellCommand> modifyCell;
 
+    int columnId = model->data(index, ColumnBase::Role_ColumnId).toInt();
 
-    int columnId = model->data (index, ColumnBase::Role_ColumnId).toInt();
-
-    if (columnId==Columns::ColumnId_PositionXPos || columnId==Columns::ColumnId_PositionYPos)
+    if (columnId == Columns::ColumnId_PositionXPos || columnId == Columns::ColumnId_PositionYPos)
     {
-        const float oldPosition = model->data (index).toFloat();
+        const float oldPosition = model->data(index).toFloat();
 
         // Modulate by cell size, update cell id if reference has been moved to a new cell
         if (std::abs(std::fmod(oldPosition, Constants::CellSizeInUnits))
-            - std::abs(std::fmod(new_.toFloat(), Constants::CellSizeInUnits)) >= 0.5f)
+                - std::abs(std::fmod(new_.toFloat(), Constants::CellSizeInUnits))
+            >= 0.5f)
         {
-            IdTableProxyModel *proxy = dynamic_cast<IdTableProxyModel *> (model);
+            IdTableProxyModel* proxy = dynamic_cast<IdTableProxyModel*>(model);
 
-            int row = proxy ? proxy->mapToSource (index).row() : index.row();
+            int row = proxy ? proxy->mapToSource(index).row() : index.row();
 
             // This is not guaranteed to be the same as \a model, since a proxy could be used.
-            IdTable& model2 = dynamic_cast<IdTable&> (*mDocument.getData().getTableModel (mId));
+            IdTable& model2 = dynamic_cast<IdTable&>(*mDocument.getData().getTableModel(mId));
 
-            int cellColumn = model2.searchColumnIndex (Columns::ColumnId_Cell);
+            int cellColumn = model2.searchColumnIndex(Columns::ColumnId_Cell);
 
-            if (cellColumn!=-1)
+            if (cellColumn != -1)
             {
-                QModelIndex cellIndex = model2.index (row, cellColumn);
+                QModelIndex cellIndex = model2.index(row, cellColumn);
 
-                std::string cellId = model2.data (cellIndex).toString().toUtf8().data();
+                std::string cellId = model2.data(cellIndex).toString().toUtf8().data();
 
-                if (cellId.find ('#')!=std::string::npos)
+                if (cellId.find('#') != std::string::npos)
                 {
                     // Need to recalculate the cell
                     modifyCell = std::make_unique<UpdateCellCommand>(model2, row);
@@ -182,12 +186,12 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, cons
 
     if (modifyCell.get())
     {
-        CommandMacro macro (mDocument.getUndoStack());
-        macro.push (modifyData.release());
-        macro.push (modifyCell.release());
+        CommandMacro macro(mDocument.getUndoStack());
+        macro.push(modifyData.release());
+        macro.push(modifyCell.release());
     }
     else
-        mDocument.getUndoStack().push (modifyData.release());
+        mDocument.getUndoStack().push(modifyData.release());
 }
 
 void CSMWorld::CommandDispatcher::executeDelete()
@@ -200,25 +204,26 @@ void CSMWorld::CommandDispatcher::executeDelete()
     if (rows.empty())
         return;
 
-    IdTable& model = dynamic_cast<IdTable&> (*mDocument.getData().getTableModel (mId));
+    IdTable& model = dynamic_cast<IdTable&>(*mDocument.getData().getTableModel(mId));
 
-    int columnIndex = model.findColumnIndex (Columns::ColumnId_Id);
+    int columnIndex = model.findColumnIndex(Columns::ColumnId_Id);
 
-    CommandMacro macro (mDocument.getUndoStack(), rows.size()>1 ? "Delete multiple records" : "");
-    for (std::vector<std::string>::const_iterator iter (rows.begin()); iter!=rows.end(); ++iter)
+    CommandMacro macro(mDocument.getUndoStack(), rows.size() > 1 ? "Delete multiple records" : "");
+    for (std::vector<std::string>::const_iterator iter(rows.begin()); iter != rows.end(); ++iter)
     {
-        std::string id = model.data (model.getModelIndex (*iter, columnIndex)).
-            toString().toUtf8().constData();
+        std::string id = model.data(model.getModelIndex(*iter, columnIndex)).toString().toUtf8().constData();
 
         if (mId.getType() == UniversalId::Type_Referenceables)
         {
-            macro.push (new CSMWorld::DeleteCommand (model, id,
-                static_cast<CSMWorld::UniversalId::Type>(model.data (model.index (
-                    model.getModelIndex (id, columnIndex).row(),
-                    model.findColumnIndex (CSMWorld::Columns::ColumnId_RecordType))).toInt())));
+            macro.push(new CSMWorld::DeleteCommand(model, id,
+                static_cast<CSMWorld::UniversalId::Type>(
+                    model
+                        .data(model.index(model.getModelIndex(id, columnIndex).row(),
+                            model.findColumnIndex(CSMWorld::Columns::ColumnId_RecordType)))
+                        .toInt())));
         }
         else
-            mDocument.getUndoStack().push (new CSMWorld::DeleteCommand (model, id));
+            mDocument.getUndoStack().push(new CSMWorld::DeleteCommand(model, id));
     }
 }
 
@@ -232,50 +237,48 @@ void CSMWorld::CommandDispatcher::executeRevert()
     if (rows.empty())
         return;
 
-    IdTable& model = dynamic_cast<IdTable&> (*mDocument.getData().getTableModel (mId));
+    IdTable& model = dynamic_cast<IdTable&>(*mDocument.getData().getTableModel(mId));
 
-    int columnIndex = model.findColumnIndex (Columns::ColumnId_Id);
+    int columnIndex = model.findColumnIndex(Columns::ColumnId_Id);
 
-    CommandMacro macro (mDocument.getUndoStack(), rows.size()>1 ? "Revert multiple records" : "");
-    for (std::vector<std::string>::const_iterator iter (rows.begin()); iter!=rows.end(); ++iter)
+    CommandMacro macro(mDocument.getUndoStack(), rows.size() > 1 ? "Revert multiple records" : "");
+    for (std::vector<std::string>::const_iterator iter(rows.begin()); iter != rows.end(); ++iter)
     {
-        std::string id = model.data (model.getModelIndex (*iter, columnIndex)).
-            toString().toUtf8().constData();
+        std::string id = model.data(model.getModelIndex(*iter, columnIndex)).toString().toUtf8().constData();
 
-        macro.push (new CSMWorld::RevertCommand (model, id));
+        macro.push(new CSMWorld::RevertCommand(model, id));
     }
 }
 
 void CSMWorld::CommandDispatcher::executeExtendedDelete()
 {
-    CommandMacro macro (mDocument.getUndoStack(), mExtendedTypes.size()>1 ? tr ("Extended delete of multiple records") : "");
+    CommandMacro macro(
+        mDocument.getUndoStack(), mExtendedTypes.size() > 1 ? tr("Extended delete of multiple records") : "");
 
-    for (std::vector<UniversalId>::const_iterator iter (mExtendedTypes.begin());
-        iter!=mExtendedTypes.end(); ++iter)
+    for (std::vector<UniversalId>::const_iterator iter(mExtendedTypes.begin()); iter != mExtendedTypes.end(); ++iter)
     {
-        if (*iter==mId)
+        if (*iter == mId)
             executeDelete();
-        else if (*iter==UniversalId::Type_References)
+        else if (*iter == UniversalId::Type_References)
         {
-            IdTable& model = dynamic_cast<IdTable&> (
-                *mDocument.getData().getTableModel (*iter));
+            IdTable& model = dynamic_cast<IdTable&>(*mDocument.getData().getTableModel(*iter));
 
             const RefCollection& collection = mDocument.getData().getReferences();
 
             int size = collection.getSize();
 
-            for (int i=size-1; i>=0; --i)
+            for (int i = size - 1; i >= 0; --i)
             {
-                const Record<CellRef>& record = collection.getRecord (i);
+                const Record<CellRef>& record = collection.getRecord(i);
 
-                if (record.mState==RecordBase::State_Deleted)
+                if (record.mState == RecordBase::State_Deleted)
                     continue;
 
-                if (!std::binary_search (mSelection.begin(), mSelection.end(),
-                    Misc::StringUtils::lowerCase (record.get().mCell)))
+                if (!std::binary_search(
+                        mSelection.begin(), mSelection.end(), Misc::StringUtils::lowerCase(record.get().mCell)))
                     continue;
 
-                macro.push (new CSMWorld::DeleteCommand (model, record.get().mId));
+                macro.push(new CSMWorld::DeleteCommand(model, record.get().mId));
             }
         }
     }
@@ -283,31 +286,30 @@ void CSMWorld::CommandDispatcher::executeExtendedDelete()
 
 void CSMWorld::CommandDispatcher::executeExtendedRevert()
 {
-    CommandMacro macro (mDocument.getUndoStack(), mExtendedTypes.size()>1 ? tr ("Extended revert of multiple records") : "");
+    CommandMacro macro(
+        mDocument.getUndoStack(), mExtendedTypes.size() > 1 ? tr("Extended revert of multiple records") : "");
 
-    for (std::vector<UniversalId>::const_iterator iter (mExtendedTypes.begin());
-        iter!=mExtendedTypes.end(); ++iter)
+    for (std::vector<UniversalId>::const_iterator iter(mExtendedTypes.begin()); iter != mExtendedTypes.end(); ++iter)
     {
-        if (*iter==mId)
+        if (*iter == mId)
             executeRevert();
-        else if (*iter==UniversalId::Type_References)
+        else if (*iter == UniversalId::Type_References)
         {
-            IdTable& model = dynamic_cast<IdTable&> (
-                *mDocument.getData().getTableModel (*iter));
+            IdTable& model = dynamic_cast<IdTable&>(*mDocument.getData().getTableModel(*iter));
 
             const RefCollection& collection = mDocument.getData().getReferences();
 
             int size = collection.getSize();
 
-            for (int i=size-1; i>=0; --i)
+            for (int i = size - 1; i >= 0; --i)
             {
-                const Record<CellRef>& record = collection.getRecord (i);
+                const Record<CellRef>& record = collection.getRecord(i);
 
-                if (!std::binary_search (mSelection.begin(), mSelection.end(),
-                    Misc::StringUtils::lowerCase (record.get().mCell)))
+                if (!std::binary_search(
+                        mSelection.begin(), mSelection.end(), Misc::StringUtils::lowerCase(record.get().mCell)))
                     continue;
 
-                macro.push (new CSMWorld::RevertCommand (model, record.get().mId));
+                macro.push(new CSMWorld::RevertCommand(model, record.get().mId));
             }
         }
     }
diff --git a/apps/opencs/model/world/commanddispatcher.hpp b/apps/opencs/model/world/commanddispatcher.hpp
index 538fd7f188..7d931acbca 100644
--- a/apps/opencs/model/world/commanddispatcher.hpp
+++ b/apps/opencs/model/world/commanddispatcher.hpp
@@ -19,59 +19,56 @@ namespace CSMWorld
 {
     class CommandDispatcher : public QObject
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            bool mLocked;
-            CSMDoc::Document& mDocument;
-            UniversalId mId;
-            std::vector<std::string> mSelection;
-            std::vector<UniversalId> mExtendedTypes;
+        bool mLocked;
+        CSMDoc::Document& mDocument;
+        UniversalId mId;
+        std::vector<std::string> mSelection;
+        std::vector<UniversalId> mExtendedTypes;
 
-            std::vector<std::string> getDeletableRecords() const;
+        std::vector<std::string> getDeletableRecords() const;
 
-            std::vector<std::string> getRevertableRecords() const;
+        std::vector<std::string> getRevertableRecords() const;
 
-        public:
+    public:
+        CommandDispatcher(CSMDoc::Document& document, const CSMWorld::UniversalId& id, QObject* parent = nullptr);
+        ///< \param id ID of the table the commands should operate on primarily.
 
-            CommandDispatcher (CSMDoc::Document& document, const CSMWorld::UniversalId& id,
-                QObject *parent = nullptr);
-            ///< \param id ID of the table the commands should operate on primarily.
+        void setEditLock(bool locked);
 
-            void setEditLock (bool locked);
+        void setSelection(const std::vector<std::string>& selection);
 
-            void setSelection (const std::vector<std::string>& selection);
+        void setExtendedTypes(const std::vector<UniversalId>& types);
+        ///< Set record lists selected by the user for extended operations.
 
-            void setExtendedTypes (const std::vector<UniversalId>& types);
-            ///< Set record lists selected by the user for extended operations.
+        bool canDelete() const;
 
-            bool canDelete() const;
+        bool canRevert() const;
 
-            bool canRevert() const;
+        /// Return IDs of the record collection that can also be affected when
+        /// operating on the record collection this dispatcher is used for.
+        ///
+        /// \note The returned collection contains the ID of the record collection this
+        /// dispatcher is used for. However if that record collection does not support
+        /// the extended mode, the returned vector will be empty instead.
+        std::vector<UniversalId> getExtendedTypes() const;
 
-            /// Return IDs of the record collection that can also be affected when
-            /// operating on the record collection this dispatcher is used for.
-            ///
-            /// \note The returned collection contains the ID of the record collection this
-            /// dispatcher is used for. However if that record collection does not support
-            /// the extended mode, the returned vector will be empty instead.
-            std::vector<UniversalId> getExtendedTypes() const;
+        /// Add a modify command to the undo stack.
+        ///
+        /// \attention model must either be a model for the table operated on by this
+        /// dispatcher or a proxy of it.
+        void executeModify(QAbstractItemModel* model, const QModelIndex& index, const QVariant& new_);
 
-            /// Add a modify command to the undo stack.
-            ///
-            /// \attention model must either be a model for the table operated on by this
-            /// dispatcher or a proxy of it.
-            void executeModify (QAbstractItemModel *model, const QModelIndex& index, const QVariant& new_);
+    public slots:
 
-        public slots:
+        void executeDelete();
 
-            void executeDelete();
+        void executeRevert();
 
-            void executeRevert();
-
-            void executeExtendedDelete();
-
-            void executeExtendedRevert();
+        void executeExtendedDelete();
 
+        void executeExtendedRevert();
     };
 }
 
diff --git a/apps/opencs/model/world/commandmacro.cpp b/apps/opencs/model/world/commandmacro.cpp
index 0bd74cbe21..2c3b7e1726 100644
--- a/apps/opencs/model/world/commandmacro.cpp
+++ b/apps/opencs/model/world/commandmacro.cpp
@@ -1,12 +1,15 @@
 
 #include "commandmacro.hpp"
 
-#include <QUndoStack>
 #include <QUndoCommand>
+#include <QUndoStack>
 
-CSMWorld::CommandMacro::CommandMacro (QUndoStack& undoStack, const QString& description)
-: mUndoStack (undoStack), mDescription (description), mStarted (false)
-{}
+CSMWorld::CommandMacro::CommandMacro(QUndoStack& undoStack, const QString& description)
+    : mUndoStack(undoStack)
+    , mDescription(description)
+    , mStarted(false)
+{
+}
 
 CSMWorld::CommandMacro::~CommandMacro()
 {
@@ -14,13 +17,13 @@ CSMWorld::CommandMacro::~CommandMacro()
         mUndoStack.endMacro();
 }
 
-void CSMWorld::CommandMacro::push (QUndoCommand *command)
+void CSMWorld::CommandMacro::push(QUndoCommand* command)
 {
     if (!mStarted)
     {
-        mUndoStack.beginMacro (mDescription.isEmpty() ? command->text() : mDescription);
+        mUndoStack.beginMacro(mDescription.isEmpty() ? command->text() : mDescription);
         mStarted = true;
     }
 
-    mUndoStack.push (command);
+    mUndoStack.push(command);
 }
diff --git a/apps/opencs/model/world/commandmacro.hpp b/apps/opencs/model/world/commandmacro.hpp
index b1f6301d9a..bc21e935c0 100644
--- a/apps/opencs/model/world/commandmacro.hpp
+++ b/apps/opencs/model/world/commandmacro.hpp
@@ -10,24 +10,23 @@ namespace CSMWorld
 {
     class CommandMacro
     {
-            QUndoStack& mUndoStack;
-            QString mDescription;
-            bool mStarted;
+        QUndoStack& mUndoStack;
+        QString mDescription;
+        bool mStarted;
 
-            /// not implemented
-            CommandMacro (const CommandMacro&);
+        /// not implemented
+        CommandMacro(const CommandMacro&);
 
-            /// not implemented
-            CommandMacro& operator= (const CommandMacro&);
+        /// not implemented
+        CommandMacro& operator=(const CommandMacro&);
 
-        public:
+    public:
+        /// If \a description is empty, the description of the first command is used.
+        CommandMacro(QUndoStack& undoStack, const QString& description = "");
 
-            /// If \a description is empty, the description of the first command is used.
-            CommandMacro (QUndoStack& undoStack, const QString& description = "");
+        ~CommandMacro();
 
-            ~CommandMacro();
-
-            void push (QUndoCommand *command);
+        void push(QUndoCommand* command);
     };
 }
 
diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index cbb637e8cb..52e746cd23 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -39,8 +39,8 @@ void CSMWorld::TouchCommand::undo()
     }
 }
 
-CSMWorld::ImportLandTexturesCommand::ImportLandTexturesCommand(IdTable& landTable,
-    IdTable& ltexTable, QUndoCommand* parent)
+CSMWorld::ImportLandTexturesCommand::ImportLandTexturesCommand(
+    IdTable& landTable, IdTable& ltexTable, QUndoCommand* parent)
     : QUndoCommand(parent)
     , mLands(landTable)
     , mLtexs(ltexTable)
@@ -131,8 +131,8 @@ void CSMWorld::ImportLandTexturesCommand::undo()
     mCreatedTextures.clear();
 }
 
-CSMWorld::CopyLandTexturesCommand::CopyLandTexturesCommand(IdTable& landTable, IdTable& ltexTable,
-    const std::string& origin, const std::string& dest, QUndoCommand* parent)
+CSMWorld::CopyLandTexturesCommand::CopyLandTexturesCommand(
+    IdTable& landTable, IdTable& ltexTable, const std::string& origin, const std::string& dest, QUndoCommand* parent)
     : ImportLandTexturesCommand(landTable, ltexTable, parent)
     , mOriginId(origin)
     , mDestId(dest)
@@ -149,8 +149,8 @@ const std::string& CSMWorld::CopyLandTexturesCommand::getDestinationId() const
     return mDestId;
 }
 
-CSMWorld::TouchLandCommand::TouchLandCommand(IdTable& landTable, IdTable& ltexTable,
-    const std::string& id, QUndoCommand* parent)
+CSMWorld::TouchLandCommand::TouchLandCommand(
+    IdTable& landTable, IdTable& ltexTable, const std::string& id, QUndoCommand* parent)
     : ImportLandTexturesCommand(landTable, ltexTable, parent)
     , mId(id)
     , mOld(nullptr)
@@ -172,7 +172,8 @@ const std::string& CSMWorld::TouchLandCommand::getDestinationId() const
 void CSMWorld::TouchLandCommand::onRedo()
 {
     mChanged = mLands.touchRecord(mId);
-    if (mChanged) mOld.reset(mLands.getRecord(mId).clone().get());
+    if (mChanged)
+        mOld.reset(mLands.getRecord(mId).clone().get());
 }
 
 void CSMWorld::TouchLandCommand::onUndo()
@@ -184,14 +185,19 @@ void CSMWorld::TouchLandCommand::onUndo()
     }
 }
 
-CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelIndex& index,
-                                        const QVariant& new_, QUndoCommand* parent)
-    : QUndoCommand (parent), mModel (&model), mIndex (index), mNew (new_), mHasRecordState(false), mOldRecordState(CSMWorld::RecordBase::State_BaseOnly)
+CSMWorld::ModifyCommand::ModifyCommand(
+    QAbstractItemModel& model, const QModelIndex& index, const QVariant& new_, QUndoCommand* parent)
+    : QUndoCommand(parent)
+    , mModel(&model)
+    , mIndex(index)
+    , mNew(new_)
+    , mHasRecordState(false)
+    , mOldRecordState(CSMWorld::RecordBase::State_BaseOnly)
 {
-    if (QAbstractProxyModel *proxy = dynamic_cast<QAbstractProxyModel *> (mModel))
+    if (QAbstractProxyModel* proxy = dynamic_cast<QAbstractProxyModel*>(mModel))
     {
         // Replace proxy with actual model
-        mIndex = proxy->mapToSource (mIndex);
+        mIndex = proxy->mapToSource(mIndex);
         mModel = proxy->sourceModel();
     }
 }
@@ -201,16 +207,17 @@ void CSMWorld::ModifyCommand::redo()
     if (mIndex.parent().isValid())
     {
         CSMWorld::IdTree* tree = &dynamic_cast<CSMWorld::IdTree&>(*mModel);
-        setText ("Modify " + tree->nestedHeaderData (
-                    mIndex.parent().column(), mIndex.column(), Qt::Horizontal, Qt::DisplayRole).toString());
+        setText("Modify "
+            + tree->nestedHeaderData(mIndex.parent().column(), mIndex.column(), Qt::Horizontal, Qt::DisplayRole)
+                  .toString());
     }
     else
     {
-        setText ("Modify " + mModel->headerData (mIndex.column(), Qt::Horizontal, Qt::DisplayRole).toString());
+        setText("Modify " + mModel->headerData(mIndex.column(), Qt::Horizontal, Qt::DisplayRole).toString());
     }
 
     // Remember record state before the modification
-    if (CSMWorld::IdTable *table = dynamic_cast<IdTable *>(mModel))
+    if (CSMWorld::IdTable* table = dynamic_cast<IdTable*>(mModel))
     {
         mHasRecordState = true;
         int stateColumnIndex = table->findColumnIndex(Columns::ColumnId_Modification);
@@ -225,184 +232,186 @@ void CSMWorld::ModifyCommand::redo()
         mOldRecordState = static_cast<CSMWorld::RecordBase::State>(table->data(mRecordStateIndex).toInt());
     }
 
-    mOld = mModel->data (mIndex, Qt::EditRole);
-    mModel->setData (mIndex, mNew);
+    mOld = mModel->data(mIndex, Qt::EditRole);
+    mModel->setData(mIndex, mNew);
 }
 
 void CSMWorld::ModifyCommand::undo()
 {
-    mModel->setData (mIndex, mOld);
+    mModel->setData(mIndex, mOld);
     if (mHasRecordState)
     {
         mModel->setData(mRecordStateIndex, mOldRecordState);
     }
 }
 
-
 void CSMWorld::CreateCommand::applyModifications()
 {
     if (!mNestedValues.empty())
     {
         CSMWorld::IdTree* tree = &dynamic_cast<CSMWorld::IdTree&>(mModel);
-        std::map<int, std::pair<int, QVariant> >::const_iterator current = mNestedValues.begin();
-        std::map<int, std::pair<int, QVariant> >::const_iterator end = mNestedValues.end();
+        std::map<int, std::pair<int, QVariant>>::const_iterator current = mNestedValues.begin();
+        std::map<int, std::pair<int, QVariant>>::const_iterator end = mNestedValues.end();
         for (; current != end; ++current)
         {
-            QModelIndex index = tree->index(0,
-                                            current->second.first,
-                                            tree->getNestedModelIndex(mId, current->first));
+            QModelIndex index = tree->index(0, current->second.first, tree->getNestedModelIndex(mId, current->first));
             tree->setData(index, current->second.second);
         }
     }
 }
 
-CSMWorld::CreateCommand::CreateCommand (IdTable& model, const std::string& id, QUndoCommand* parent)
-: QUndoCommand (parent), mModel (model), mId (id), mType (UniversalId::Type_None)
+CSMWorld::CreateCommand::CreateCommand(IdTable& model, const std::string& id, QUndoCommand* parent)
+    : QUndoCommand(parent)
+    , mModel(model)
+    , mId(id)
+    , mType(UniversalId::Type_None)
 {
-    setText (("Create record " + id).c_str());
+    setText(("Create record " + id).c_str());
 }
 
-void CSMWorld::CreateCommand::addValue (int column, const QVariant& value)
+void CSMWorld::CreateCommand::addValue(int column, const QVariant& value)
 {
     mValues[column] = value;
 }
 
-void CSMWorld::CreateCommand::addNestedValue(int parentColumn, int nestedColumn, const QVariant &value)
+void CSMWorld::CreateCommand::addNestedValue(int parentColumn, int nestedColumn, const QVariant& value)
 {
     mNestedValues[parentColumn] = std::make_pair(nestedColumn, value);
 }
 
-void CSMWorld::CreateCommand::setType (UniversalId::Type type)
+void CSMWorld::CreateCommand::setType(UniversalId::Type type)
 {
     mType = type;
 }
 
 void CSMWorld::CreateCommand::redo()
 {
-    mModel.addRecordWithData (mId, mValues, mType);
+    mModel.addRecordWithData(mId, mValues, mType);
     applyModifications();
 }
 
 void CSMWorld::CreateCommand::undo()
 {
-    mModel.removeRow (mModel.getModelIndex (mId, 0).row());
+    mModel.removeRow(mModel.getModelIndex(mId, 0).row());
 }
 
-CSMWorld::RevertCommand::RevertCommand (IdTable& model, const std::string& id, QUndoCommand* parent)
-: QUndoCommand (parent), mModel (model), mId (id), mOld(nullptr)
+CSMWorld::RevertCommand::RevertCommand(IdTable& model, const std::string& id, QUndoCommand* parent)
+    : QUndoCommand(parent)
+    , mModel(model)
+    , mId(id)
+    , mOld(nullptr)
 {
-    setText (("Revert record " + id).c_str());
+    setText(("Revert record " + id).c_str());
 }
 
-CSMWorld::RevertCommand::~RevertCommand()
-{
-}
+CSMWorld::RevertCommand::~RevertCommand() {}
 
 void CSMWorld::RevertCommand::redo()
 {
-    mOld = mModel.getRecord (mId).clone();
+    mOld = mModel.getRecord(mId).clone();
 
-    int column = mModel.findColumnIndex (Columns::ColumnId_Modification);
+    int column = mModel.findColumnIndex(Columns::ColumnId_Modification);
 
-    QModelIndex index = mModel.getModelIndex (mId, column);
-    RecordBase::State state = static_cast<RecordBase::State> (mModel.data (index).toInt());
+    QModelIndex index = mModel.getModelIndex(mId, column);
+    RecordBase::State state = static_cast<RecordBase::State>(mModel.data(index).toInt());
 
-    if (state==RecordBase::State_ModifiedOnly)
+    if (state == RecordBase::State_ModifiedOnly)
     {
-        mModel.removeRows (index.row(), 1);
+        mModel.removeRows(index.row(), 1);
     }
     else
     {
-        mModel.setData (index, static_cast<int> (RecordBase::State_BaseOnly));
+        mModel.setData(index, static_cast<int>(RecordBase::State_BaseOnly));
     }
 }
 
 void CSMWorld::RevertCommand::undo()
 {
-    mModel.setRecord (mId, std::move(mOld));
+    mModel.setRecord(mId, std::move(mOld));
 }
 
-CSMWorld::DeleteCommand::DeleteCommand (IdTable& model,
-        const std::string& id, CSMWorld::UniversalId::Type type, QUndoCommand* parent)
-: QUndoCommand (parent), mModel (model), mId (id), mOld(nullptr), mType(type)
+CSMWorld::DeleteCommand::DeleteCommand(
+    IdTable& model, const std::string& id, CSMWorld::UniversalId::Type type, QUndoCommand* parent)
+    : QUndoCommand(parent)
+    , mModel(model)
+    , mId(id)
+    , mOld(nullptr)
+    , mType(type)
 {
-    setText (("Delete record " + id).c_str());
+    setText(("Delete record " + id).c_str());
 }
 
-CSMWorld::DeleteCommand::~DeleteCommand()
-{
-}
+CSMWorld::DeleteCommand::~DeleteCommand() {}
 
 void CSMWorld::DeleteCommand::redo()
 {
-    mOld = mModel.getRecord (mId).clone();
+    mOld = mModel.getRecord(mId).clone();
 
-    int column = mModel.findColumnIndex (Columns::ColumnId_Modification);
+    int column = mModel.findColumnIndex(Columns::ColumnId_Modification);
 
-    QModelIndex index = mModel.getModelIndex (mId, column);
-    RecordBase::State state = static_cast<RecordBase::State> (mModel.data (index).toInt());
+    QModelIndex index = mModel.getModelIndex(mId, column);
+    RecordBase::State state = static_cast<RecordBase::State>(mModel.data(index).toInt());
 
-    if (state==RecordBase::State_ModifiedOnly)
+    if (state == RecordBase::State_ModifiedOnly)
     {
-        mModel.removeRows (index.row(), 1);
+        mModel.removeRows(index.row(), 1);
     }
     else
     {
-        mModel.setData (index, static_cast<int> (RecordBase::State_Deleted));
+        mModel.setData(index, static_cast<int>(RecordBase::State_Deleted));
     }
 }
 
 void CSMWorld::DeleteCommand::undo()
 {
-    mModel.setRecord (mId, std::move(mOld), mType);
+    mModel.setRecord(mId, std::move(mOld), mType);
 }
 
-
-CSMWorld::ReorderRowsCommand::ReorderRowsCommand (IdTable& model, int baseIndex,
-        const std::vector<int>& newOrder)
-: mModel (model), mBaseIndex (baseIndex), mNewOrder (newOrder)
-{}
+CSMWorld::ReorderRowsCommand::ReorderRowsCommand(IdTable& model, int baseIndex, const std::vector<int>& newOrder)
+    : mModel(model)
+    , mBaseIndex(baseIndex)
+    , mNewOrder(newOrder)
+{
+}
 
 void CSMWorld::ReorderRowsCommand::redo()
 {
-    mModel.reorderRows (mBaseIndex, mNewOrder);
+    mModel.reorderRows(mBaseIndex, mNewOrder);
 }
 
 void CSMWorld::ReorderRowsCommand::undo()
 {
-    int size = static_cast<int> (mNewOrder.size());
-    std::vector<int> reverse (size);
+    int size = static_cast<int>(mNewOrder.size());
+    std::vector<int> reverse(size);
 
-    for (int i=0; i< size; ++i)
-        reverse.at (mNewOrder[i]) = i;
+    for (int i = 0; i < size; ++i)
+        reverse.at(mNewOrder[i]) = i;
 
-    mModel.reorderRows (mBaseIndex, reverse);
+    mModel.reorderRows(mBaseIndex, reverse);
 }
 
-CSMWorld::CloneCommand::CloneCommand (CSMWorld::IdTable& model,
-                                      const std::string& idOrigin,
-                                      const std::string& idDestination,
-                                      const CSMWorld::UniversalId::Type type,
-                                      QUndoCommand* parent)
-: CreateCommand (model, idDestination, parent), mIdOrigin (idOrigin)
+CSMWorld::CloneCommand::CloneCommand(CSMWorld::IdTable& model, const std::string& idOrigin,
+    const std::string& idDestination, const CSMWorld::UniversalId::Type type, QUndoCommand* parent)
+    : CreateCommand(model, idDestination, parent)
+    , mIdOrigin(idOrigin)
 {
-    setType (type);
-    setText ( ("Clone record " + idOrigin + " to the " + idDestination).c_str());
+    setType(type);
+    setText(("Clone record " + idOrigin + " to the " + idDestination).c_str());
 }
 
 void CSMWorld::CloneCommand::redo()
 {
-    mModel.cloneRecord (mIdOrigin, mId, mType);
+    mModel.cloneRecord(mIdOrigin, mId, mType);
     applyModifications();
     for (auto& value : mOverrideValues)
     {
-        mModel.setData(mModel.getModelIndex (mId, value.first), value.second);
+        mModel.setData(mModel.getModelIndex(mId, value.first), value.second);
     }
 }
 
 void CSMWorld::CloneCommand::undo()
 {
-    mModel.removeRow (mModel.getModelIndex (mId, 0).row());
+    mModel.removeRow(mModel.getModelIndex(mId, 0).row());
 }
 
 void CSMWorld::CloneCommand::setOverrideValue(int column, QVariant value)
@@ -410,7 +419,7 @@ void CSMWorld::CloneCommand::setOverrideValue(int column, QVariant value)
     mOverrideValues.emplace_back(std::make_pair(column, value));
 }
 
-CSMWorld::CreatePathgridCommand::CreatePathgridCommand(IdTable& model, const std::string& id, QUndoCommand *parent)
+CSMWorld::CreatePathgridCommand::CreatePathgridCommand(IdTable& model, const std::string& id, QUndoCommand* parent)
     : CreateCommand(model, id, parent)
 {
     setType(UniversalId::Type_Pathgrid);
@@ -420,8 +429,8 @@ void CSMWorld::CreatePathgridCommand::redo()
 {
     CreateCommand::redo();
 
-    std::unique_ptr<Record<Pathgrid> > record
-        = std::make_unique<Record<Pathgrid> >(static_cast<const Record<Pathgrid>& >(mModel.getRecord(mId)));
+    std::unique_ptr<Record<Pathgrid>> record
+        = std::make_unique<Record<Pathgrid>>(static_cast<const Record<Pathgrid>&>(mModel.getRecord(mId)));
     record->get().blank();
     record->get().mCell = mId;
 
@@ -435,59 +444,54 @@ void CSMWorld::CreatePathgridCommand::redo()
     mModel.setRecord(mId, std::move(record), mType);
 }
 
-CSMWorld::UpdateCellCommand::UpdateCellCommand (IdTable& model, int row, QUndoCommand *parent)
-: QUndoCommand (parent), mModel (model), mRow (row)
+CSMWorld::UpdateCellCommand::UpdateCellCommand(IdTable& model, int row, QUndoCommand* parent)
+    : QUndoCommand(parent)
+    , mModel(model)
+    , mRow(row)
 {
-    setText ("Update cell ID");
+    setText("Update cell ID");
 }
 
 void CSMWorld::UpdateCellCommand::redo()
 {
     if (!mNew.isValid())
     {
-        int cellColumn = mModel.searchColumnIndex (Columns::ColumnId_Cell);
-        mIndex = mModel.index (mRow, cellColumn);
+        int cellColumn = mModel.searchColumnIndex(Columns::ColumnId_Cell);
+        mIndex = mModel.index(mRow, cellColumn);
 
-        QModelIndex xIndex = mModel.index (
-            mRow, mModel.findColumnIndex (Columns::ColumnId_PositionXPos));
+        QModelIndex xIndex = mModel.index(mRow, mModel.findColumnIndex(Columns::ColumnId_PositionXPos));
 
-        QModelIndex yIndex = mModel.index (
-            mRow, mModel.findColumnIndex (Columns::ColumnId_PositionYPos));
+        QModelIndex yIndex = mModel.index(mRow, mModel.findColumnIndex(Columns::ColumnId_PositionYPos));
 
-        int x = std::floor (mModel.data (xIndex).toFloat() / Constants::CellSizeInUnits);
-        int y = std::floor (mModel.data (yIndex).toFloat() / Constants::CellSizeInUnits);
+        int x = std::floor(mModel.data(xIndex).toFloat() / Constants::CellSizeInUnits);
+        int y = std::floor(mModel.data(yIndex).toFloat() / Constants::CellSizeInUnits);
 
         std::ostringstream stream;
 
         stream << "#" << x << " " << y;
 
-        mNew = QString::fromUtf8 (stream.str().c_str());
+        mNew = QString::fromUtf8(stream.str().c_str());
     }
 
-    mModel.setData (mIndex, mNew);
+    mModel.setData(mIndex, mNew);
 }
 
 void CSMWorld::UpdateCellCommand::undo()
 {
-    mModel.setData (mIndex, mOld);
+    mModel.setData(mIndex, mOld);
 }
 
-
-CSMWorld::DeleteNestedCommand::DeleteNestedCommand (IdTree& model,
-                                                    const std::string& id,
-                                                    int nestedRow,
-                                                    int parentColumn,
-                                                    QUndoCommand* parent) :
-    QUndoCommand(parent),
-    NestedTableStoring(model, id, parentColumn),
-    mModel(model),
-    mId(id),
-    mParentColumn(parentColumn),
-    mNestedRow(nestedRow)
+CSMWorld::DeleteNestedCommand::DeleteNestedCommand(
+    IdTree& model, const std::string& id, int nestedRow, int parentColumn, QUndoCommand* parent)
+    : QUndoCommand(parent)
+    , NestedTableStoring(model, id, parentColumn)
+    , mModel(model)
+    , mId(id)
+    , mParentColumn(parentColumn)
+    , mNestedRow(nestedRow)
 {
-    std::string title =
-        model.headerData(parentColumn, Qt::Horizontal, Qt::DisplayRole).toString().toUtf8().constData();
-    setText (("Delete row in " + title + " sub-table of " + mId).c_str());
+    std::string title = model.headerData(parentColumn, Qt::Horizontal, Qt::DisplayRole).toString().toUtf8().constData();
+    setText(("Delete row in " + title + " sub-table of " + mId).c_str());
 
     QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
     mModifyParentCommand = new ModifyCommand(mModel, parentIndex, parentIndex.data(Qt::EditRole), this);
@@ -497,10 +501,9 @@ void CSMWorld::DeleteNestedCommand::redo()
 {
     QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
     mModifyParentCommand->redo();
-    mModel.removeRows (mNestedRow, 1, parentIndex);
+    mModel.removeRows(mNestedRow, 1, parentIndex);
 }
 
-
 void CSMWorld::DeleteNestedCommand::undo()
 {
     QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
@@ -508,17 +511,17 @@ void CSMWorld::DeleteNestedCommand::undo()
     mModifyParentCommand->undo();
 }
 
-CSMWorld::AddNestedCommand::AddNestedCommand(IdTree& model, const std::string& id, int nestedRow, int parentColumn, QUndoCommand* parent)
-    : QUndoCommand(parent),
-      NestedTableStoring(model, id, parentColumn),
-      mModel(model),
-      mId(id),
-      mNewRow(nestedRow),
-      mParentColumn(parentColumn)
+CSMWorld::AddNestedCommand::AddNestedCommand(
+    IdTree& model, const std::string& id, int nestedRow, int parentColumn, QUndoCommand* parent)
+    : QUndoCommand(parent)
+    , NestedTableStoring(model, id, parentColumn)
+    , mModel(model)
+    , mId(id)
+    , mNewRow(nestedRow)
+    , mParentColumn(parentColumn)
 {
-    std::string title =
-        model.headerData(parentColumn, Qt::Horizontal, Qt::DisplayRole).toString().toUtf8().constData();
-    setText (("Add row in " + title + " sub-table of " + mId).c_str());
+    std::string title = model.headerData(parentColumn, Qt::Horizontal, Qt::DisplayRole).toString().toUtf8().constData();
+    setText(("Add row in " + title + " sub-table of " + mId).c_str());
 
     QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
     mModifyParentCommand = new ModifyCommand(mModel, parentIndex, parentIndex.data(Qt::EditRole), this);
@@ -528,7 +531,7 @@ void CSMWorld::AddNestedCommand::redo()
 {
     QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
     mModifyParentCommand->redo();
-    mModel.addNestedRow (parentIndex, mNewRow);
+    mModel.addNestedRow(parentIndex, mNewRow);
 }
 
 void CSMWorld::AddNestedCommand::undo()
@@ -539,7 +542,9 @@ void CSMWorld::AddNestedCommand::undo()
 }
 
 CSMWorld::NestedTableStoring::NestedTableStoring(const IdTree& model, const std::string& id, int parentColumn)
-    : mOld(model.nestedTable(model.getModelIndex(id, parentColumn))) {}
+    : mOld(model.nestedTable(model.getModelIndex(id, parentColumn)))
+{
+}
 
 CSMWorld::NestedTableStoring::~NestedTableStoring()
 {
diff --git a/apps/opencs/model/world/commands.hpp b/apps/opencs/model/world/commands.hpp
index 4b619d11ed..2a22252514 100644
--- a/apps/opencs/model/world/commands.hpp
+++ b/apps/opencs/model/world/commands.hpp
@@ -3,18 +3,18 @@
 
 #include "record.hpp"
 
-#include <string>
 #include <map>
 #include <memory>
+#include <string>
 #include <vector>
 
-#include <QVariant>
-#include <QUndoCommand>
 #include <QModelIndex>
+#include <QUndoCommand>
+#include <QVariant>
 
 #include "columnimp.hpp"
-#include "universalid.hpp"
 #include "nestedtablewrapper.hpp"
+#include "universalid.hpp"
 
 class QAbstractItemModel;
 
@@ -27,20 +27,18 @@ namespace CSMWorld
 
     class TouchCommand : public QUndoCommand
     {
-        public:
-
-            TouchCommand(IdTable& model, const std::string& id, QUndoCommand* parent=nullptr);
-
-            void redo() override;
-            void undo() override;
+    public:
+        TouchCommand(IdTable& model, const std::string& id, QUndoCommand* parent = nullptr);
 
-        private:
+        void redo() override;
+        void undo() override;
 
-            IdTable& mTable;
-            std::string mId;
-            std::unique_ptr<RecordBase> mOld;
+    private:
+        IdTable& mTable;
+        std::string mId;
+        std::unique_ptr<RecordBase> mOld;
 
-            bool mChanged;
+        bool mChanged;
     };
 
     /// \brief Adds LandTexture records and modifies texture indices as needed.
@@ -54,29 +52,26 @@ namespace CSMWorld
     /// LandRecord and within the Land record.
     class ImportLandTexturesCommand : public QUndoCommand
     {
-        public:
-
-            ImportLandTexturesCommand(IdTable& landTable, IdTable& ltexTable,
-                QUndoCommand* parent);
-
-            void redo() override;
-            void undo() override;
+    public:
+        ImportLandTexturesCommand(IdTable& landTable, IdTable& ltexTable, QUndoCommand* parent);
 
-        protected:
+        void redo() override;
+        void undo() override;
 
-            using DataType = LandTexturesColumn::DataType;
+    protected:
+        using DataType = LandTexturesColumn::DataType;
 
-            virtual const std::string& getOriginId() const = 0;
-            virtual const std::string& getDestinationId() const = 0;
+        virtual const std::string& getOriginId() const = 0;
+        virtual const std::string& getDestinationId() const = 0;
 
-            virtual void onRedo() = 0;
-            virtual void onUndo() = 0;
+        virtual void onRedo() = 0;
+        virtual void onUndo() = 0;
 
-            IdTable& mLands;
-            IdTable& mLtexs;
-            DataType mOld;
-            int mOldState;
-            std::vector<std::string> mCreatedTextures;
+        IdTable& mLands;
+        IdTable& mLtexs;
+        DataType mOld;
+        int mOldState;
+        std::vector<std::string> mCreatedTextures;
     };
 
     /// \brief This command is used to fix LandTexture records and texture
@@ -84,21 +79,19 @@ namespace CSMWorld
     ///     details.
     class CopyLandTexturesCommand : public ImportLandTexturesCommand
     {
-        public:
-
-            CopyLandTexturesCommand(IdTable& landTable, IdTable& ltexTable, const std::string& origin,
-                const std::string& dest, QUndoCommand* parent = nullptr);
-
-        private:
+    public:
+        CopyLandTexturesCommand(IdTable& landTable, IdTable& ltexTable, const std::string& origin,
+            const std::string& dest, QUndoCommand* parent = nullptr);
 
-            const std::string& getOriginId() const override;
-            const std::string& getDestinationId() const override;
+    private:
+        const std::string& getOriginId() const override;
+        const std::string& getDestinationId() const override;
 
-            void onRedo() override {}
-            void onUndo() override {}
+        void onRedo() override {}
+        void onUndo() override {}
 
-            std::string mOriginId;
-            std::string mDestId;
+        std::string mOriginId;
+        std::string mDestId;
     };
 
     /// \brief This command brings a land record into the current plugin, adding
@@ -106,164 +99,150 @@ namespace CSMWorld
     /// \note See ImportLandTextures for more details.
     class TouchLandCommand : public ImportLandTexturesCommand
     {
-        public:
-
-            TouchLandCommand(IdTable& landTable, IdTable& ltexTable,
-                const std::string& id, QUndoCommand* parent = nullptr);
-
-        private:
+    public:
+        TouchLandCommand(IdTable& landTable, IdTable& ltexTable, const std::string& id, QUndoCommand* parent = nullptr);
 
-            const std::string& getOriginId() const override;
-            const std::string& getDestinationId() const override;
+    private:
+        const std::string& getOriginId() const override;
+        const std::string& getDestinationId() const override;
 
-            void onRedo() override;
-            void onUndo() override;
+        void onRedo() override;
+        void onUndo() override;
 
-            std::string mId;
-            std::unique_ptr<RecordBase> mOld;
+        std::string mId;
+        std::unique_ptr<RecordBase> mOld;
 
-            bool mChanged;
+        bool mChanged;
     };
 
     class ModifyCommand : public QUndoCommand
     {
-            QAbstractItemModel *mModel;
-            QModelIndex mIndex;
-            QVariant mNew;
-            QVariant mOld;
+        QAbstractItemModel* mModel;
+        QModelIndex mIndex;
+        QVariant mNew;
+        QVariant mOld;
 
-            bool mHasRecordState;
-            QModelIndex mRecordStateIndex;
-            CSMWorld::RecordBase::State mOldRecordState;
+        bool mHasRecordState;
+        QModelIndex mRecordStateIndex;
+        CSMWorld::RecordBase::State mOldRecordState;
 
-        public:
-
-            ModifyCommand (QAbstractItemModel& model, const QModelIndex& index, const QVariant& new_,
-                QUndoCommand *parent = nullptr);
+    public:
+        ModifyCommand(
+            QAbstractItemModel& model, const QModelIndex& index, const QVariant& new_, QUndoCommand* parent = nullptr);
 
-            void redo() override;
+        void redo() override;
 
-            void undo() override;
+        void undo() override;
     };
 
     class CreateCommand : public QUndoCommand
     {
-            std::map<int, QVariant> mValues;
-            std::map<int, std::pair<int, QVariant> > mNestedValues;
-            ///< Parameter order: a parent column, a nested column, a data.
-            ///< A nested row has index of 0.
-
-        protected:
+        std::map<int, QVariant> mValues;
+        std::map<int, std::pair<int, QVariant>> mNestedValues;
+        ///< Parameter order: a parent column, a nested column, a data.
+        ///< A nested row has index of 0.
 
-            IdTable& mModel;
-            std::string mId;
-            UniversalId::Type mType;
-
-        protected:
-
-            /// Apply modifications set via addValue.
-            void applyModifications();
+    protected:
+        IdTable& mModel;
+        std::string mId;
+        UniversalId::Type mType;
 
-        public:
+    protected:
+        /// Apply modifications set via addValue.
+        void applyModifications();
 
-            CreateCommand (IdTable& model, const std::string& id, QUndoCommand *parent = nullptr);
+    public:
+        CreateCommand(IdTable& model, const std::string& id, QUndoCommand* parent = nullptr);
 
-            void setType (UniversalId::Type type);
+        void setType(UniversalId::Type type);
 
-            void addValue (int column, const QVariant& value);
+        void addValue(int column, const QVariant& value);
 
-            void addNestedValue(int parentColumn, int nestedColumn, const QVariant &value);
+        void addNestedValue(int parentColumn, int nestedColumn, const QVariant& value);
 
-            void redo() override;
+        void redo() override;
 
-            void undo() override;
+        void undo() override;
     };
 
     class CloneCommand : public CreateCommand
     {
-            std::string mIdOrigin;
-            std::vector<std::pair<int, QVariant>> mOverrideValues;
-
-        public:
+        std::string mIdOrigin;
+        std::vector<std::pair<int, QVariant>> mOverrideValues;
 
-            CloneCommand (IdTable& model, const std::string& idOrigin,
-                          const std::string& IdDestination,
-                          const UniversalId::Type type,
-                          QUndoCommand* parent = nullptr);
+    public:
+        CloneCommand(IdTable& model, const std::string& idOrigin, const std::string& IdDestination,
+            const UniversalId::Type type, QUndoCommand* parent = nullptr);
 
-            void redo() override;
+        void redo() override;
 
-            void undo() override;
+        void undo() override;
 
-            void setOverrideValue(int column, QVariant value);
+        void setOverrideValue(int column, QVariant value);
     };
 
     class RevertCommand : public QUndoCommand
     {
-            IdTable& mModel;
-            std::string mId;
-            std::unique_ptr<RecordBase> mOld;
-
-            // not implemented
-            RevertCommand (const RevertCommand&);
-            RevertCommand& operator= (const RevertCommand&);
+        IdTable& mModel;
+        std::string mId;
+        std::unique_ptr<RecordBase> mOld;
 
-        public:
+        // not implemented
+        RevertCommand(const RevertCommand&);
+        RevertCommand& operator=(const RevertCommand&);
 
-            RevertCommand (IdTable& model, const std::string& id, QUndoCommand *parent = nullptr);
+    public:
+        RevertCommand(IdTable& model, const std::string& id, QUndoCommand* parent = nullptr);
 
-            virtual ~RevertCommand();
+        virtual ~RevertCommand();
 
-            void redo() override;
+        void redo() override;
 
-            void undo() override;
+        void undo() override;
     };
 
     class DeleteCommand : public QUndoCommand
     {
-            IdTable& mModel;
-            std::string mId;
-            std::unique_ptr<RecordBase> mOld;
-            UniversalId::Type mType;
+        IdTable& mModel;
+        std::string mId;
+        std::unique_ptr<RecordBase> mOld;
+        UniversalId::Type mType;
 
-            // not implemented
-            DeleteCommand (const DeleteCommand&);
-            DeleteCommand& operator= (const DeleteCommand&);
+        // not implemented
+        DeleteCommand(const DeleteCommand&);
+        DeleteCommand& operator=(const DeleteCommand&);
 
-        public:
-
-            DeleteCommand (IdTable& model, const std::string& id,
-                    UniversalId::Type type = UniversalId::Type_None, QUndoCommand *parent = nullptr);
+    public:
+        DeleteCommand(IdTable& model, const std::string& id, UniversalId::Type type = UniversalId::Type_None,
+            QUndoCommand* parent = nullptr);
 
-            virtual ~DeleteCommand();
+        virtual ~DeleteCommand();
 
-            void redo() override;
+        void redo() override;
 
-            void undo() override;
+        void undo() override;
     };
 
     class ReorderRowsCommand : public QUndoCommand
     {
-            IdTable& mModel;
-            int mBaseIndex;
-            std::vector<int> mNewOrder;
-
-        public:
+        IdTable& mModel;
+        int mBaseIndex;
+        std::vector<int> mNewOrder;
 
-            ReorderRowsCommand (IdTable& model, int baseIndex, const std::vector<int>& newOrder);
+    public:
+        ReorderRowsCommand(IdTable& model, int baseIndex, const std::vector<int>& newOrder);
 
-            void redo() override;
+        void redo() override;
 
-            void undo() override;
+        void undo() override;
     };
 
     class CreatePathgridCommand : public CreateCommand
     {
-        public:
-
-            CreatePathgridCommand(IdTable& model, const std::string& id, QUndoCommand *parent = nullptr);
+    public:
+        CreatePathgridCommand(IdTable& model, const std::string& id, QUndoCommand* parent = nullptr);
 
-            void redo() override;
+        void redo() override;
     };
 
     /// \brief Update cell ID according to x/y-coordinates
@@ -273,22 +252,20 @@ namespace CSMWorld
     /// in a macro.
     class UpdateCellCommand : public QUndoCommand
     {
-            IdTable& mModel;
-            int mRow;
-            QModelIndex mIndex;
-            QVariant mNew; // invalid, if new cell ID has not been calculated yet
-            QVariant mOld;
+        IdTable& mModel;
+        int mRow;
+        QModelIndex mIndex;
+        QVariant mNew; // invalid, if new cell ID has not been calculated yet
+        QVariant mOld;
 
-        public:
-
-            UpdateCellCommand (IdTable& model, int row, QUndoCommand *parent = nullptr);
+    public:
+        UpdateCellCommand(IdTable& model, int row, QUndoCommand* parent = nullptr);
 
-            void redo() override;
+        void redo() override;
 
-            void undo() override;
+        void undo() override;
     };
 
-
     class NestedTableStoring
     {
         NestedTableWrapperBase* mOld;
@@ -299,52 +276,51 @@ namespace CSMWorld
         ~NestedTableStoring();
 
     protected:
-
         const NestedTableWrapperBase& getOld() const;
     };
 
     class DeleteNestedCommand : public QUndoCommand, private NestedTableStoring
     {
-            IdTree& mModel;
-
-            std::string mId;
+        IdTree& mModel;
 
-            int mParentColumn;
+        std::string mId;
 
-            int mNestedRow;
+        int mParentColumn;
 
-            // The command to redo/undo the Modified status of a record
-            ModifyCommand *mModifyParentCommand;
+        int mNestedRow;
 
-        public:
+        // The command to redo/undo the Modified status of a record
+        ModifyCommand* mModifyParentCommand;
 
-            DeleteNestedCommand (IdTree& model, const std::string& id, int nestedRow, int parentColumn, QUndoCommand* parent = nullptr);
+    public:
+        DeleteNestedCommand(
+            IdTree& model, const std::string& id, int nestedRow, int parentColumn, QUndoCommand* parent = nullptr);
 
-            void redo() override;
+        void redo() override;
 
-            void undo() override;
+        void undo() override;
     };
 
     class AddNestedCommand : public QUndoCommand, private NestedTableStoring
     {
-            IdTree& mModel;
+        IdTree& mModel;
 
-            std::string mId;
+        std::string mId;
 
-            int mNewRow;
+        int mNewRow;
 
-            int mParentColumn;
+        int mParentColumn;
 
-            // The command to redo/undo the Modified status of a record
-            ModifyCommand *mModifyParentCommand;
+        // The command to redo/undo the Modified status of a record
+        ModifyCommand* mModifyParentCommand;
 
-        public:
-
-            AddNestedCommand(IdTree& model, const std::string& id, int nestedRow, int parentColumn, QUndoCommand* parent = nullptr);
+    public:
+        AddNestedCommand(
+            IdTree& model, const std::string& id, int nestedRow, int parentColumn, QUndoCommand* parent = nullptr);
 
-            void redo() override;
+        void redo() override;
 
-            void undo() override;
+        void undo() override;
     };
 }
 
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 3ac499b4f4..bc1d7abe8a 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -1,12 +1,12 @@
 #include "data.hpp"
 
-#include <stdexcept>
 #include <algorithm>
+#include <stdexcept>
 
 #include <QAbstractItemModel>
 
-#include <components/esm3/esmreader.hpp>
 #include <components/esm/defs.hpp>
+#include <components/esm3/esmreader.hpp>
 #include <components/esm3/loadglob.hpp>
 
 #include <components/resource/scenemanager.hpp>
@@ -17,57 +17,62 @@
 
 #include "../doc/messages.hpp"
 
+#include "columnimp.hpp"
+#include "columns.hpp"
 #include "idtable.hpp"
 #include "idtree.hpp"
-#include "columnimp.hpp"
+#include "nestedcoladapterimp.hpp"
 #include "regionmap.hpp"
-#include "columns.hpp"
 #include "resourcesmanager.hpp"
 #include "resourcetable.hpp"
-#include "nestedcoladapterimp.hpp"
 
-void CSMWorld::Data::addModel (QAbstractItemModel *model, UniversalId::Type type, bool update)
+void CSMWorld::Data::addModel(QAbstractItemModel* model, UniversalId::Type type, bool update)
 {
-    mModels.push_back (model);
-    mModelIndex.insert (std::make_pair (type, model));
+    mModels.push_back(model);
+    mModelIndex.insert(std::make_pair(type, model));
 
-    UniversalId::Type type2 = UniversalId::getParentType (type);
+    UniversalId::Type type2 = UniversalId::getParentType(type);
 
-    if (type2!=UniversalId::Type_None)
-        mModelIndex.insert (std::make_pair (type2, model));
+    if (type2 != UniversalId::Type_None)
+        mModelIndex.insert(std::make_pair(type2, model));
 
     if (update)
     {
-        connect (model, &QAbstractItemModel::dataChanged, this, &Data::dataChanged);
-        connect (model, &QAbstractItemModel::rowsInserted, this, &Data::rowsChanged);
-        connect (model, &QAbstractItemModel::rowsRemoved, this, &Data::rowsChanged);
+        connect(model, &QAbstractItemModel::dataChanged, this, &Data::dataChanged);
+        connect(model, &QAbstractItemModel::rowsInserted, this, &Data::rowsChanged);
+        connect(model, &QAbstractItemModel::rowsRemoved, this, &Data::rowsChanged);
     }
 }
 
-void CSMWorld::Data::appendIds (std::vector<std::string>& ids, const CollectionBase& collection,
-    bool listDeleted)
+void CSMWorld::Data::appendIds(std::vector<std::string>& ids, const CollectionBase& collection, bool listDeleted)
 {
-    std::vector<std::string> ids2 = collection.getIds (listDeleted);
+    std::vector<std::string> ids2 = collection.getIds(listDeleted);
 
-    ids.insert (ids.end(), ids2.begin(), ids2.end());
+    ids.insert(ids.end(), ids2.begin(), ids2.end());
 }
 
-int CSMWorld::Data::count (RecordBase::State state, const CollectionBase& collection)
+int CSMWorld::Data::count(RecordBase::State state, const CollectionBase& collection)
 {
     int number = 0;
 
-    for (int i=0; i<collection.getSize(); ++i)
-        if (collection.getRecord (i).mState==state)
+    for (int i = 0; i < collection.getSize(); ++i)
+        if (collection.getRecord(i).mState == state)
             ++number;
 
     return number;
 }
 
-CSMWorld::Data::Data (ToUTF8::FromType encoding, bool fsStrict, const Files::PathContainer& dataPaths,
+CSMWorld::Data::Data(ToUTF8::FromType encoding, bool fsStrict, const Files::PathContainer& dataPaths,
     const std::vector<std::string>& archives, const std::filesystem::path& resDir)
-: mEncoder (encoding), mPathgrids (mCells), mRefs (mCells),
-  mReader (nullptr), mDialogue (nullptr), mReaderIndex(1),
-  mFsStrict(fsStrict), mDataPaths(dataPaths), mArchives(archives)
+    : mEncoder(encoding)
+    , mPathgrids(mCells)
+    , mRefs(mCells)
+    , mReader(nullptr)
+    , mDialogue(nullptr)
+    , mReaderIndex(1)
+    , mFsStrict(fsStrict)
+    , mDataPaths(dataPaths)
+    , mArchives(archives)
 {
     mVFS = std::make_unique<VFS::Manager>(mFsStrict);
     VFS::registerArchives(mVFS.get(), Files::Collections(mDataPaths, !mFsStrict), mArchives, true);
@@ -75,7 +80,8 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, bool fsStrict, const Files::Pat
     mResourcesManager.setVFS(mVFS.get());
     mResourceSystem = std::make_unique<Resource::ResourceSystem>(mVFS.get());
 
-    Shader::ShaderManager::DefineMap defines = mResourceSystem->getSceneManager()->getShaderManager().getGlobalDefines();
+    Shader::ShaderManager::DefineMap defines
+        = mResourceSystem->getSceneManager()->getShaderManager().getGlobalDefines();
     Shader::ShaderManager::DefineMap shadowDefines = SceneUtil::ShadowManager::getShadowsDisabledDefines();
     defines["forcePPL"] = "0"; // Don't force per-pixel lighting
     defines["clamp"] = "1"; // Clamp lighting
@@ -92,514 +98,501 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, bool fsStrict, const Files::Pat
 
     int index = 0;
 
-    mGlobals.addColumn (new StringIdColumn<ESM::Global>);
-    mGlobals.addColumn (new RecordStateColumn<ESM::Global>);
-    mGlobals.addColumn (new FixedRecordTypeColumn<ESM::Global> (UniversalId::Type_Global));
-    mGlobals.addColumn (new VarTypeColumn<ESM::Global> (ColumnBase::Display_GlobalVarType));
-    mGlobals.addColumn (new VarValueColumn<ESM::Global>);
-
-    mGmsts.addColumn (new StringIdColumn<ESM::GameSetting>);
-    mGmsts.addColumn (new RecordStateColumn<ESM::GameSetting>);
-    mGmsts.addColumn (new FixedRecordTypeColumn<ESM::GameSetting> (UniversalId::Type_Gmst));
-    mGmsts.addColumn (new VarTypeColumn<ESM::GameSetting> (ColumnBase::Display_GmstVarType));
-    mGmsts.addColumn (new VarValueColumn<ESM::GameSetting>);
-
-    mSkills.addColumn (new StringIdColumn<ESM::Skill>);
-    mSkills.addColumn (new RecordStateColumn<ESM::Skill>);
-    mSkills.addColumn (new FixedRecordTypeColumn<ESM::Skill> (UniversalId::Type_Skill));
-    mSkills.addColumn (new AttributeColumn<ESM::Skill>);
-    mSkills.addColumn (new SpecialisationColumn<ESM::Skill>);
-    for (int i=0; i<4; ++i)
-        mSkills.addColumn (new UseValueColumn<ESM::Skill> (i));
-    mSkills.addColumn (new DescriptionColumn<ESM::Skill>);
-
-    mClasses.addColumn (new StringIdColumn<ESM::Class>);
-    mClasses.addColumn (new RecordStateColumn<ESM::Class>);
-    mClasses.addColumn (new FixedRecordTypeColumn<ESM::Class> (UniversalId::Type_Class));
-    mClasses.addColumn (new NameColumn<ESM::Class>);
-    mClasses.addColumn (new AttributesColumn<ESM::Class> (0));
-    mClasses.addColumn (new AttributesColumn<ESM::Class> (1));
-    mClasses.addColumn (new SpecialisationColumn<ESM::Class>);
-    for (int i=0; i<5; ++i)
-        mClasses.addColumn (new SkillsColumn<ESM::Class> (i, true, true));
-    for (int i=0; i<5; ++i)
-        mClasses.addColumn (new SkillsColumn<ESM::Class> (i, true, false));
-    mClasses.addColumn (new PlayableColumn<ESM::Class>);
-    mClasses.addColumn (new DescriptionColumn<ESM::Class>);
-
-    mFactions.addColumn (new StringIdColumn<ESM::Faction>);
-    mFactions.addColumn (new RecordStateColumn<ESM::Faction>);
-    mFactions.addColumn (new FixedRecordTypeColumn<ESM::Faction> (UniversalId::Type_Faction));
-    mFactions.addColumn (new NameColumn<ESM::Faction>(ColumnBase::Display_String32));
-    mFactions.addColumn (new AttributesColumn<ESM::Faction> (0));
-    mFactions.addColumn (new AttributesColumn<ESM::Faction> (1));
-    mFactions.addColumn (new HiddenColumn<ESM::Faction>);
-    for (int i=0; i<7; ++i)
-        mFactions.addColumn (new SkillsColumn<ESM::Faction> (i));
+    mGlobals.addColumn(new StringIdColumn<ESM::Global>);
+    mGlobals.addColumn(new RecordStateColumn<ESM::Global>);
+    mGlobals.addColumn(new FixedRecordTypeColumn<ESM::Global>(UniversalId::Type_Global));
+    mGlobals.addColumn(new VarTypeColumn<ESM::Global>(ColumnBase::Display_GlobalVarType));
+    mGlobals.addColumn(new VarValueColumn<ESM::Global>);
+
+    mGmsts.addColumn(new StringIdColumn<ESM::GameSetting>);
+    mGmsts.addColumn(new RecordStateColumn<ESM::GameSetting>);
+    mGmsts.addColumn(new FixedRecordTypeColumn<ESM::GameSetting>(UniversalId::Type_Gmst));
+    mGmsts.addColumn(new VarTypeColumn<ESM::GameSetting>(ColumnBase::Display_GmstVarType));
+    mGmsts.addColumn(new VarValueColumn<ESM::GameSetting>);
+
+    mSkills.addColumn(new StringIdColumn<ESM::Skill>);
+    mSkills.addColumn(new RecordStateColumn<ESM::Skill>);
+    mSkills.addColumn(new FixedRecordTypeColumn<ESM::Skill>(UniversalId::Type_Skill));
+    mSkills.addColumn(new AttributeColumn<ESM::Skill>);
+    mSkills.addColumn(new SpecialisationColumn<ESM::Skill>);
+    for (int i = 0; i < 4; ++i)
+        mSkills.addColumn(new UseValueColumn<ESM::Skill>(i));
+    mSkills.addColumn(new DescriptionColumn<ESM::Skill>);
+
+    mClasses.addColumn(new StringIdColumn<ESM::Class>);
+    mClasses.addColumn(new RecordStateColumn<ESM::Class>);
+    mClasses.addColumn(new FixedRecordTypeColumn<ESM::Class>(UniversalId::Type_Class));
+    mClasses.addColumn(new NameColumn<ESM::Class>);
+    mClasses.addColumn(new AttributesColumn<ESM::Class>(0));
+    mClasses.addColumn(new AttributesColumn<ESM::Class>(1));
+    mClasses.addColumn(new SpecialisationColumn<ESM::Class>);
+    for (int i = 0; i < 5; ++i)
+        mClasses.addColumn(new SkillsColumn<ESM::Class>(i, true, true));
+    for (int i = 0; i < 5; ++i)
+        mClasses.addColumn(new SkillsColumn<ESM::Class>(i, true, false));
+    mClasses.addColumn(new PlayableColumn<ESM::Class>);
+    mClasses.addColumn(new DescriptionColumn<ESM::Class>);
+
+    mFactions.addColumn(new StringIdColumn<ESM::Faction>);
+    mFactions.addColumn(new RecordStateColumn<ESM::Faction>);
+    mFactions.addColumn(new FixedRecordTypeColumn<ESM::Faction>(UniversalId::Type_Faction));
+    mFactions.addColumn(new NameColumn<ESM::Faction>(ColumnBase::Display_String32));
+    mFactions.addColumn(new AttributesColumn<ESM::Faction>(0));
+    mFactions.addColumn(new AttributesColumn<ESM::Faction>(1));
+    mFactions.addColumn(new HiddenColumn<ESM::Faction>);
+    for (int i = 0; i < 7; ++i)
+        mFactions.addColumn(new SkillsColumn<ESM::Faction>(i));
     // Faction Reactions
-    mFactions.addColumn (new NestedParentColumn<ESM::Faction> (Columns::ColumnId_FactionReactions));
-    index = mFactions.getColumns()-1;
-    mFactions.addAdapter (std::make_pair(&mFactions.getColumn(index), new FactionReactionsAdapter ()));
+    mFactions.addColumn(new NestedParentColumn<ESM::Faction>(Columns::ColumnId_FactionReactions));
+    index = mFactions.getColumns() - 1;
+    mFactions.addAdapter(std::make_pair(&mFactions.getColumn(index), new FactionReactionsAdapter()));
     mFactions.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_Faction, ColumnBase::Display_Faction));
+        new NestedChildColumn(Columns::ColumnId_Faction, ColumnBase::Display_Faction));
     mFactions.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_FactionReaction, ColumnBase::Display_Integer));
+        new NestedChildColumn(Columns::ColumnId_FactionReaction, ColumnBase::Display_Integer));
 
     // Faction Ranks
-    mFactions.addColumn (new NestedParentColumn<ESM::Faction> (Columns::ColumnId_FactionRanks));
-    index = mFactions.getColumns()-1;
-    mFactions.addAdapter (std::make_pair(&mFactions.getColumn(index), new FactionRanksAdapter ()));
+    mFactions.addColumn(new NestedParentColumn<ESM::Faction>(Columns::ColumnId_FactionRanks));
+    index = mFactions.getColumns() - 1;
+    mFactions.addAdapter(std::make_pair(&mFactions.getColumn(index), new FactionRanksAdapter()));
     mFactions.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_RankName, ColumnBase::Display_Rank));
+        new NestedChildColumn(Columns::ColumnId_RankName, ColumnBase::Display_Rank));
     mFactions.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_FactionAttrib1, ColumnBase::Display_Integer));
+        new NestedChildColumn(Columns::ColumnId_FactionAttrib1, ColumnBase::Display_Integer));
     mFactions.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_FactionAttrib2, ColumnBase::Display_Integer));
+        new NestedChildColumn(Columns::ColumnId_FactionAttrib2, ColumnBase::Display_Integer));
     mFactions.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_FactionPrimSkill, ColumnBase::Display_Integer));
+        new NestedChildColumn(Columns::ColumnId_FactionPrimSkill, ColumnBase::Display_Integer));
     mFactions.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_FactionFavSkill, ColumnBase::Display_Integer));
+        new NestedChildColumn(Columns::ColumnId_FactionFavSkill, ColumnBase::Display_Integer));
     mFactions.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_FactionRep, ColumnBase::Display_Integer));
-
-    mRaces.addColumn (new StringIdColumn<ESM::Race>);
-    mRaces.addColumn (new RecordStateColumn<ESM::Race>);
-    mRaces.addColumn (new FixedRecordTypeColumn<ESM::Race> (UniversalId::Type_Race));
-    mRaces.addColumn (new NameColumn<ESM::Race>);
-    mRaces.addColumn (new DescriptionColumn<ESM::Race>);
-    mRaces.addColumn (new FlagColumn<ESM::Race> (Columns::ColumnId_Playable, 0x1));
-    mRaces.addColumn (new FlagColumn<ESM::Race> (Columns::ColumnId_BeastRace, 0x2));
-    mRaces.addColumn (new WeightHeightColumn<ESM::Race> (true, true));
-    mRaces.addColumn (new WeightHeightColumn<ESM::Race> (true, false));
-    mRaces.addColumn (new WeightHeightColumn<ESM::Race> (false, true));
-    mRaces.addColumn (new WeightHeightColumn<ESM::Race> (false, false));
+        new NestedChildColumn(Columns::ColumnId_FactionRep, ColumnBase::Display_Integer));
+
+    mRaces.addColumn(new StringIdColumn<ESM::Race>);
+    mRaces.addColumn(new RecordStateColumn<ESM::Race>);
+    mRaces.addColumn(new FixedRecordTypeColumn<ESM::Race>(UniversalId::Type_Race));
+    mRaces.addColumn(new NameColumn<ESM::Race>);
+    mRaces.addColumn(new DescriptionColumn<ESM::Race>);
+    mRaces.addColumn(new FlagColumn<ESM::Race>(Columns::ColumnId_Playable, 0x1));
+    mRaces.addColumn(new FlagColumn<ESM::Race>(Columns::ColumnId_BeastRace, 0x2));
+    mRaces.addColumn(new WeightHeightColumn<ESM::Race>(true, true));
+    mRaces.addColumn(new WeightHeightColumn<ESM::Race>(true, false));
+    mRaces.addColumn(new WeightHeightColumn<ESM::Race>(false, true));
+    mRaces.addColumn(new WeightHeightColumn<ESM::Race>(false, false));
     // Race spells
-    mRaces.addColumn (new NestedParentColumn<ESM::Race> (Columns::ColumnId_PowerList));
-    index = mRaces.getColumns()-1;
-    mRaces.addAdapter (std::make_pair(&mRaces.getColumn(index), new SpellListAdapter<ESM::Race> ()));
+    mRaces.addColumn(new NestedParentColumn<ESM::Race>(Columns::ColumnId_PowerList));
+    index = mRaces.getColumns() - 1;
+    mRaces.addAdapter(std::make_pair(&mRaces.getColumn(index), new SpellListAdapter<ESM::Race>()));
     mRaces.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_SpellId, ColumnBase::Display_Spell));
+        new NestedChildColumn(Columns::ColumnId_SpellId, ColumnBase::Display_Spell));
     // Race attributes
-    mRaces.addColumn (new NestedParentColumn<ESM::Race> (Columns::ColumnId_RaceAttributes,
-        ColumnBase::Flag_Dialogue, true)); // fixed rows table
-    index = mRaces.getColumns()-1;
-    mRaces.addAdapter (std::make_pair(&mRaces.getColumn(index), new RaceAttributeAdapter()));
+    mRaces.addColumn(new NestedParentColumn<ESM::Race>(
+        Columns::ColumnId_RaceAttributes, ColumnBase::Flag_Dialogue, true)); // fixed rows table
+    index = mRaces.getColumns() - 1;
+    mRaces.addAdapter(std::make_pair(&mRaces.getColumn(index), new RaceAttributeAdapter()));
+    mRaces.getNestableColumn(index)->addColumn(new NestedChildColumn(
+        Columns::ColumnId_Attribute, ColumnBase::Display_Attribute, ColumnBase::Flag_Dialogue, false));
     mRaces.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_Attribute, ColumnBase::Display_Attribute,
-            ColumnBase::Flag_Dialogue, false));
+        new NestedChildColumn(Columns::ColumnId_Male, ColumnBase::Display_Integer));
     mRaces.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_Male, ColumnBase::Display_Integer));
-    mRaces.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_Female, ColumnBase::Display_Integer));
+        new NestedChildColumn(Columns::ColumnId_Female, ColumnBase::Display_Integer));
     // Race skill bonus
-    mRaces.addColumn (new NestedParentColumn<ESM::Race> (Columns::ColumnId_RaceSkillBonus,
-        ColumnBase::Flag_Dialogue, true)); // fixed rows table
-    index = mRaces.getColumns()-1;
-    mRaces.addAdapter (std::make_pair(&mRaces.getColumn(index), new RaceSkillsBonusAdapter()));
+    mRaces.addColumn(new NestedParentColumn<ESM::Race>(
+        Columns::ColumnId_RaceSkillBonus, ColumnBase::Flag_Dialogue, true)); // fixed rows table
+    index = mRaces.getColumns() - 1;
+    mRaces.addAdapter(std::make_pair(&mRaces.getColumn(index), new RaceSkillsBonusAdapter()));
     mRaces.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_Skill, ColumnBase::Display_SkillId));
+        new NestedChildColumn(Columns::ColumnId_Skill, ColumnBase::Display_SkillId));
     mRaces.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_RaceBonus, ColumnBase::Display_Integer));
-
-    mSounds.addColumn (new StringIdColumn<ESM::Sound>);
-    mSounds.addColumn (new RecordStateColumn<ESM::Sound>);
-    mSounds.addColumn (new FixedRecordTypeColumn<ESM::Sound> (UniversalId::Type_Sound));
-    mSounds.addColumn (new SoundParamColumn<ESM::Sound> (SoundParamColumn<ESM::Sound>::Type_Volume));
-    mSounds.addColumn (new SoundParamColumn<ESM::Sound> (SoundParamColumn<ESM::Sound>::Type_MinRange));
-    mSounds.addColumn (new SoundParamColumn<ESM::Sound> (SoundParamColumn<ESM::Sound>::Type_MaxRange));
-    mSounds.addColumn (new SoundFileColumn<ESM::Sound>);
-
-    mScripts.addColumn (new StringIdColumn<ESM::Script>);
-    mScripts.addColumn (new RecordStateColumn<ESM::Script>);
-    mScripts.addColumn (new FixedRecordTypeColumn<ESM::Script> (UniversalId::Type_Script));
-    mScripts.addColumn (new ScriptColumn<ESM::Script> (ScriptColumn<ESM::Script>::Type_File));
-
-    mRegions.addColumn (new StringIdColumn<ESM::Region>);
-    mRegions.addColumn (new RecordStateColumn<ESM::Region>);
-    mRegions.addColumn (new FixedRecordTypeColumn<ESM::Region> (UniversalId::Type_Region));
-    mRegions.addColumn (new NameColumn<ESM::Region>);
-    mRegions.addColumn (new MapColourColumn<ESM::Region>);
-    mRegions.addColumn (new SleepListColumn<ESM::Region>);
+        new NestedChildColumn(Columns::ColumnId_RaceBonus, ColumnBase::Display_Integer));
+
+    mSounds.addColumn(new StringIdColumn<ESM::Sound>);
+    mSounds.addColumn(new RecordStateColumn<ESM::Sound>);
+    mSounds.addColumn(new FixedRecordTypeColumn<ESM::Sound>(UniversalId::Type_Sound));
+    mSounds.addColumn(new SoundParamColumn<ESM::Sound>(SoundParamColumn<ESM::Sound>::Type_Volume));
+    mSounds.addColumn(new SoundParamColumn<ESM::Sound>(SoundParamColumn<ESM::Sound>::Type_MinRange));
+    mSounds.addColumn(new SoundParamColumn<ESM::Sound>(SoundParamColumn<ESM::Sound>::Type_MaxRange));
+    mSounds.addColumn(new SoundFileColumn<ESM::Sound>);
+
+    mScripts.addColumn(new StringIdColumn<ESM::Script>);
+    mScripts.addColumn(new RecordStateColumn<ESM::Script>);
+    mScripts.addColumn(new FixedRecordTypeColumn<ESM::Script>(UniversalId::Type_Script));
+    mScripts.addColumn(new ScriptColumn<ESM::Script>(ScriptColumn<ESM::Script>::Type_File));
+
+    mRegions.addColumn(new StringIdColumn<ESM::Region>);
+    mRegions.addColumn(new RecordStateColumn<ESM::Region>);
+    mRegions.addColumn(new FixedRecordTypeColumn<ESM::Region>(UniversalId::Type_Region));
+    mRegions.addColumn(new NameColumn<ESM::Region>);
+    mRegions.addColumn(new MapColourColumn<ESM::Region>);
+    mRegions.addColumn(new SleepListColumn<ESM::Region>);
     // Region Weather
-    mRegions.addColumn (new NestedParentColumn<ESM::Region> (Columns::ColumnId_RegionWeather));
-    index = mRegions.getColumns()-1;
-    mRegions.addAdapter (std::make_pair(&mRegions.getColumn(index), new RegionWeatherAdapter ()));
+    mRegions.addColumn(new NestedParentColumn<ESM::Region>(Columns::ColumnId_RegionWeather));
+    index = mRegions.getColumns() - 1;
+    mRegions.addAdapter(std::make_pair(&mRegions.getColumn(index), new RegionWeatherAdapter()));
     mRegions.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_WeatherName, ColumnBase::Display_String, false));
+        new NestedChildColumn(Columns::ColumnId_WeatherName, ColumnBase::Display_String, false));
     mRegions.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_WeatherChance, ColumnBase::Display_UnsignedInteger8));
+        new NestedChildColumn(Columns::ColumnId_WeatherChance, ColumnBase::Display_UnsignedInteger8));
     // Region Sounds
-    mRegions.addColumn (new NestedParentColumn<ESM::Region> (Columns::ColumnId_RegionSounds));
-    index = mRegions.getColumns()-1;
-    mRegions.addAdapter (std::make_pair(&mRegions.getColumn(index), new RegionSoundListAdapter ()));
+    mRegions.addColumn(new NestedParentColumn<ESM::Region>(Columns::ColumnId_RegionSounds));
+    index = mRegions.getColumns() - 1;
+    mRegions.addAdapter(std::make_pair(&mRegions.getColumn(index), new RegionSoundListAdapter()));
     mRegions.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_SoundName, ColumnBase::Display_Sound));
+        new NestedChildColumn(Columns::ColumnId_SoundName, ColumnBase::Display_Sound));
     mRegions.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_SoundChance, ColumnBase::Display_UnsignedInteger8));
-
-    mBirthsigns.addColumn (new StringIdColumn<ESM::BirthSign>);
-    mBirthsigns.addColumn (new RecordStateColumn<ESM::BirthSign>);
-    mBirthsigns.addColumn (new FixedRecordTypeColumn<ESM::BirthSign> (UniversalId::Type_Birthsign));
-    mBirthsigns.addColumn (new NameColumn<ESM::BirthSign>);
-    mBirthsigns.addColumn (new TextureColumn<ESM::BirthSign>);
-    mBirthsigns.addColumn (new DescriptionColumn<ESM::BirthSign>);
+        new NestedChildColumn(Columns::ColumnId_SoundChance, ColumnBase::Display_UnsignedInteger8));
+
+    mBirthsigns.addColumn(new StringIdColumn<ESM::BirthSign>);
+    mBirthsigns.addColumn(new RecordStateColumn<ESM::BirthSign>);
+    mBirthsigns.addColumn(new FixedRecordTypeColumn<ESM::BirthSign>(UniversalId::Type_Birthsign));
+    mBirthsigns.addColumn(new NameColumn<ESM::BirthSign>);
+    mBirthsigns.addColumn(new TextureColumn<ESM::BirthSign>);
+    mBirthsigns.addColumn(new DescriptionColumn<ESM::BirthSign>);
     // Birthsign spells
-    mBirthsigns.addColumn (new NestedParentColumn<ESM::BirthSign> (Columns::ColumnId_PowerList));
-    index = mBirthsigns.getColumns()-1;
-    mBirthsigns.addAdapter (std::make_pair(&mBirthsigns.getColumn(index),
-        new SpellListAdapter<ESM::BirthSign> ()));
+    mBirthsigns.addColumn(new NestedParentColumn<ESM::BirthSign>(Columns::ColumnId_PowerList));
+    index = mBirthsigns.getColumns() - 1;
+    mBirthsigns.addAdapter(std::make_pair(&mBirthsigns.getColumn(index), new SpellListAdapter<ESM::BirthSign>()));
     mBirthsigns.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_SpellId, ColumnBase::Display_Spell));
-
-    mSpells.addColumn (new StringIdColumn<ESM::Spell>);
-    mSpells.addColumn (new RecordStateColumn<ESM::Spell>);
-    mSpells.addColumn (new FixedRecordTypeColumn<ESM::Spell> (UniversalId::Type_Spell));
-    mSpells.addColumn (new NameColumn<ESM::Spell>);
-    mSpells.addColumn (new SpellTypeColumn<ESM::Spell>);
-    mSpells.addColumn (new CostColumn<ESM::Spell>);
-    mSpells.addColumn (new FlagColumn<ESM::Spell> (Columns::ColumnId_AutoCalc, 0x1));
-    mSpells.addColumn (new FlagColumn<ESM::Spell> (Columns::ColumnId_StarterSpell, 0x2));
-    mSpells.addColumn (new FlagColumn<ESM::Spell> (Columns::ColumnId_AlwaysSucceeds, 0x4));
+        new NestedChildColumn(Columns::ColumnId_SpellId, ColumnBase::Display_Spell));
+
+    mSpells.addColumn(new StringIdColumn<ESM::Spell>);
+    mSpells.addColumn(new RecordStateColumn<ESM::Spell>);
+    mSpells.addColumn(new FixedRecordTypeColumn<ESM::Spell>(UniversalId::Type_Spell));
+    mSpells.addColumn(new NameColumn<ESM::Spell>);
+    mSpells.addColumn(new SpellTypeColumn<ESM::Spell>);
+    mSpells.addColumn(new CostColumn<ESM::Spell>);
+    mSpells.addColumn(new FlagColumn<ESM::Spell>(Columns::ColumnId_AutoCalc, 0x1));
+    mSpells.addColumn(new FlagColumn<ESM::Spell>(Columns::ColumnId_StarterSpell, 0x2));
+    mSpells.addColumn(new FlagColumn<ESM::Spell>(Columns::ColumnId_AlwaysSucceeds, 0x4));
     // Spell effects
-    mSpells.addColumn (new NestedParentColumn<ESM::Spell> (Columns::ColumnId_EffectList));
-    index = mSpells.getColumns()-1;
-    mSpells.addAdapter (std::make_pair(&mSpells.getColumn(index), new EffectsListAdapter<ESM::Spell> ()));
+    mSpells.addColumn(new NestedParentColumn<ESM::Spell>(Columns::ColumnId_EffectList));
+    index = mSpells.getColumns() - 1;
+    mSpells.addAdapter(std::make_pair(&mSpells.getColumn(index), new EffectsListAdapter<ESM::Spell>()));
     mSpells.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_EffectId, ColumnBase::Display_EffectId));
+        new NestedChildColumn(Columns::ColumnId_EffectId, ColumnBase::Display_EffectId));
     mSpells.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_Skill, ColumnBase::Display_EffectSkill));
+        new NestedChildColumn(Columns::ColumnId_Skill, ColumnBase::Display_EffectSkill));
     mSpells.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_Attribute, ColumnBase::Display_EffectAttribute));
+        new NestedChildColumn(Columns::ColumnId_Attribute, ColumnBase::Display_EffectAttribute));
     mSpells.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_EffectRange, ColumnBase::Display_EffectRange));
+        new NestedChildColumn(Columns::ColumnId_EffectRange, ColumnBase::Display_EffectRange));
     mSpells.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_EffectArea, ColumnBase::Display_String));
+        new NestedChildColumn(Columns::ColumnId_EffectArea, ColumnBase::Display_String));
     mSpells.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_Duration, ColumnBase::Display_Integer)); // reuse from light
+        new NestedChildColumn(Columns::ColumnId_Duration, ColumnBase::Display_Integer)); // reuse from light
     mSpells.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_MinMagnitude, ColumnBase::Display_Integer));
+        new NestedChildColumn(Columns::ColumnId_MinMagnitude, ColumnBase::Display_Integer));
     mSpells.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_MaxMagnitude, ColumnBase::Display_Integer));
-
-    mTopics.addColumn (new StringIdColumn<ESM::Dialogue>);
-    mTopics.addColumn (new RecordStateColumn<ESM::Dialogue>);
-    mTopics.addColumn (new FixedRecordTypeColumn<ESM::Dialogue> (UniversalId::Type_Topic));
-    mTopics.addColumn (new DialogueTypeColumn<ESM::Dialogue>);
-
-    mJournals.addColumn (new StringIdColumn<ESM::Dialogue>);
-    mJournals.addColumn (new RecordStateColumn<ESM::Dialogue>);
-    mJournals.addColumn (new FixedRecordTypeColumn<ESM::Dialogue> (UniversalId::Type_Journal));
-    mJournals.addColumn (new DialogueTypeColumn<ESM::Dialogue> (true));
-
-    mTopicInfos.addColumn (new StringIdColumn<Info> (true));
-    mTopicInfos.addColumn (new RecordStateColumn<Info>);
-    mTopicInfos.addColumn (new FixedRecordTypeColumn<Info> (UniversalId::Type_TopicInfo));
-    mTopicInfos.addColumn (new TopicColumn<Info> (false));
-    mTopicInfos.addColumn (new ActorColumn<Info>);
-    mTopicInfos.addColumn (new RaceColumn<Info>);
-    mTopicInfos.addColumn (new ClassColumn<Info>);
-    mTopicInfos.addColumn (new FactionColumn<Info>);
-    mTopicInfos.addColumn (new CellColumn<Info>);
-    mTopicInfos.addColumn (new DispositionColumn<Info>);
-    mTopicInfos.addColumn (new RankColumn<Info>);
-    mTopicInfos.addColumn (new GenderColumn<Info>);
-    mTopicInfos.addColumn (new PcFactionColumn<Info>);
-    mTopicInfos.addColumn (new PcRankColumn<Info>);
-    mTopicInfos.addColumn (new SoundFileColumn<Info>);
-    mTopicInfos.addColumn (new ResponseColumn<Info>);
+        new NestedChildColumn(Columns::ColumnId_MaxMagnitude, ColumnBase::Display_Integer));
+
+    mTopics.addColumn(new StringIdColumn<ESM::Dialogue>);
+    mTopics.addColumn(new RecordStateColumn<ESM::Dialogue>);
+    mTopics.addColumn(new FixedRecordTypeColumn<ESM::Dialogue>(UniversalId::Type_Topic));
+    mTopics.addColumn(new DialogueTypeColumn<ESM::Dialogue>);
+
+    mJournals.addColumn(new StringIdColumn<ESM::Dialogue>);
+    mJournals.addColumn(new RecordStateColumn<ESM::Dialogue>);
+    mJournals.addColumn(new FixedRecordTypeColumn<ESM::Dialogue>(UniversalId::Type_Journal));
+    mJournals.addColumn(new DialogueTypeColumn<ESM::Dialogue>(true));
+
+    mTopicInfos.addColumn(new StringIdColumn<Info>(true));
+    mTopicInfos.addColumn(new RecordStateColumn<Info>);
+    mTopicInfos.addColumn(new FixedRecordTypeColumn<Info>(UniversalId::Type_TopicInfo));
+    mTopicInfos.addColumn(new TopicColumn<Info>(false));
+    mTopicInfos.addColumn(new ActorColumn<Info>);
+    mTopicInfos.addColumn(new RaceColumn<Info>);
+    mTopicInfos.addColumn(new ClassColumn<Info>);
+    mTopicInfos.addColumn(new FactionColumn<Info>);
+    mTopicInfos.addColumn(new CellColumn<Info>);
+    mTopicInfos.addColumn(new DispositionColumn<Info>);
+    mTopicInfos.addColumn(new RankColumn<Info>);
+    mTopicInfos.addColumn(new GenderColumn<Info>);
+    mTopicInfos.addColumn(new PcFactionColumn<Info>);
+    mTopicInfos.addColumn(new PcRankColumn<Info>);
+    mTopicInfos.addColumn(new SoundFileColumn<Info>);
+    mTopicInfos.addColumn(new ResponseColumn<Info>);
     // Result script
-    mTopicInfos.addColumn (new NestedParentColumn<Info> (Columns::ColumnId_InfoList,
-        ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_List));
-    index = mTopicInfos.getColumns()-1;
-    mTopicInfos.addAdapter (std::make_pair(&mTopicInfos.getColumn(index), new InfoListAdapter ()));
+    mTopicInfos.addColumn(new NestedParentColumn<Info>(
+        Columns::ColumnId_InfoList, ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_List));
+    index = mTopicInfos.getColumns() - 1;
+    mTopicInfos.addAdapter(std::make_pair(&mTopicInfos.getColumn(index), new InfoListAdapter()));
     mTopicInfos.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_ScriptText, ColumnBase::Display_ScriptLines));
+        new NestedChildColumn(Columns::ColumnId_ScriptText, ColumnBase::Display_ScriptLines));
     // Special conditions
-    mTopicInfos.addColumn (new NestedParentColumn<Info> (Columns::ColumnId_InfoCondition));
-    index = mTopicInfos.getColumns()-1;
-    mTopicInfos.addAdapter (std::make_pair(&mTopicInfos.getColumn(index), new InfoConditionAdapter ()));
+    mTopicInfos.addColumn(new NestedParentColumn<Info>(Columns::ColumnId_InfoCondition));
+    index = mTopicInfos.getColumns() - 1;
+    mTopicInfos.addAdapter(std::make_pair(&mTopicInfos.getColumn(index), new InfoConditionAdapter()));
     mTopicInfos.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_InfoCondFunc, ColumnBase::Display_InfoCondFunc));
+        new NestedChildColumn(Columns::ColumnId_InfoCondFunc, ColumnBase::Display_InfoCondFunc));
     // FIXME: don't have dynamic value enum delegate, use Display_String for now
     mTopicInfos.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_InfoCondVar, ColumnBase::Display_InfoCondVar));
+        new NestedChildColumn(Columns::ColumnId_InfoCondVar, ColumnBase::Display_InfoCondVar));
     mTopicInfos.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_InfoCondComp, ColumnBase::Display_InfoCondComp));
+        new NestedChildColumn(Columns::ColumnId_InfoCondComp, ColumnBase::Display_InfoCondComp));
     mTopicInfos.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_Value, ColumnBase::Display_Var));
-
-    mJournalInfos.addColumn (new StringIdColumn<Info> (true));
-    mJournalInfos.addColumn (new RecordStateColumn<Info>);
-    mJournalInfos.addColumn (new FixedRecordTypeColumn<Info> (UniversalId::Type_JournalInfo));
-    mJournalInfos.addColumn (new TopicColumn<Info> (true));
-    mJournalInfos.addColumn (new QuestStatusTypeColumn<Info>);
-    mJournalInfos.addColumn (new QuestIndexColumn<Info>);
-    mJournalInfos.addColumn (new QuestDescriptionColumn<Info>);
-
-    mCells.addColumn (new StringIdColumn<Cell>);
-    mCells.addColumn (new RecordStateColumn<Cell>);
-    mCells.addColumn (new FixedRecordTypeColumn<Cell> (UniversalId::Type_Cell));
-    mCells.addColumn (new NameColumn<Cell>(ColumnBase::Display_String64));
-    mCells.addColumn (new FlagColumn<Cell> (Columns::ColumnId_SleepForbidden, ESM::Cell::NoSleep));
-    mCells.addColumn (new FlagColumn<Cell> (Columns::ColumnId_InteriorWater, ESM::Cell::HasWater,
+        new NestedChildColumn(Columns::ColumnId_Value, ColumnBase::Display_Var));
+
+    mJournalInfos.addColumn(new StringIdColumn<Info>(true));
+    mJournalInfos.addColumn(new RecordStateColumn<Info>);
+    mJournalInfos.addColumn(new FixedRecordTypeColumn<Info>(UniversalId::Type_JournalInfo));
+    mJournalInfos.addColumn(new TopicColumn<Info>(true));
+    mJournalInfos.addColumn(new QuestStatusTypeColumn<Info>);
+    mJournalInfos.addColumn(new QuestIndexColumn<Info>);
+    mJournalInfos.addColumn(new QuestDescriptionColumn<Info>);
+
+    mCells.addColumn(new StringIdColumn<Cell>);
+    mCells.addColumn(new RecordStateColumn<Cell>);
+    mCells.addColumn(new FixedRecordTypeColumn<Cell>(UniversalId::Type_Cell));
+    mCells.addColumn(new NameColumn<Cell>(ColumnBase::Display_String64));
+    mCells.addColumn(new FlagColumn<Cell>(Columns::ColumnId_SleepForbidden, ESM::Cell::NoSleep));
+    mCells.addColumn(new FlagColumn<Cell>(Columns::ColumnId_InteriorWater, ESM::Cell::HasWater,
         ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_Refresh));
-    mCells.addColumn (new FlagColumn<Cell> (Columns::ColumnId_InteriorSky, ESM::Cell::QuasiEx,
+    mCells.addColumn(new FlagColumn<Cell>(Columns::ColumnId_InteriorSky, ESM::Cell::QuasiEx,
         ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_Refresh));
-    mCells.addColumn (new RegionColumn<Cell>);
-    mCells.addColumn (new RefNumCounterColumn<Cell>);
+    mCells.addColumn(new RegionColumn<Cell>);
+    mCells.addColumn(new RefNumCounterColumn<Cell>);
     // Misc Cell data
-    mCells.addColumn (new NestedParentColumn<Cell> (Columns::ColumnId_Cell,
-        ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_List));
-    index = mCells.getColumns()-1;
-    mCells.addAdapter (std::make_pair(&mCells.getColumn(index), new CellListAdapter ()));
+    mCells.addColumn(new NestedParentColumn<Cell>(
+        Columns::ColumnId_Cell, ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_List));
+    index = mCells.getColumns() - 1;
+    mCells.addAdapter(std::make_pair(&mCells.getColumn(index), new CellListAdapter()));
     mCells.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_Interior, ColumnBase::Display_Boolean,
-        ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_Refresh));
+        new NestedChildColumn(Columns::ColumnId_Interior, ColumnBase::Display_Boolean,
+            ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_Refresh));
     mCells.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_Ambient, ColumnBase::Display_Colour));
+        new NestedChildColumn(Columns::ColumnId_Ambient, ColumnBase::Display_Colour));
     mCells.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_Sunlight, ColumnBase::Display_Colour));
+        new NestedChildColumn(Columns::ColumnId_Sunlight, ColumnBase::Display_Colour));
     mCells.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_Fog, ColumnBase::Display_Colour));
+        new NestedChildColumn(Columns::ColumnId_Fog, ColumnBase::Display_Colour));
     mCells.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_FogDensity, ColumnBase::Display_Float));
+        new NestedChildColumn(Columns::ColumnId_FogDensity, ColumnBase::Display_Float));
     mCells.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_WaterLevel, ColumnBase::Display_Float));
+        new NestedChildColumn(Columns::ColumnId_WaterLevel, ColumnBase::Display_Float));
     mCells.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_MapColor, ColumnBase::Display_Colour));
-
-    mEnchantments.addColumn (new StringIdColumn<ESM::Enchantment>);
-    mEnchantments.addColumn (new RecordStateColumn<ESM::Enchantment>);
-    mEnchantments.addColumn (new FixedRecordTypeColumn<ESM::Enchantment> (UniversalId::Type_Enchantment));
-    mEnchantments.addColumn (new EnchantmentTypeColumn<ESM::Enchantment>);
-    mEnchantments.addColumn (new CostColumn<ESM::Enchantment>);
-    mEnchantments.addColumn (new ChargesColumn2<ESM::Enchantment>);
-    mEnchantments.addColumn (new FlagColumn<ESM::Enchantment> (Columns::ColumnId_AutoCalc, ESM::Enchantment::Autocalc));
+        new NestedChildColumn(Columns::ColumnId_MapColor, ColumnBase::Display_Colour));
+
+    mEnchantments.addColumn(new StringIdColumn<ESM::Enchantment>);
+    mEnchantments.addColumn(new RecordStateColumn<ESM::Enchantment>);
+    mEnchantments.addColumn(new FixedRecordTypeColumn<ESM::Enchantment>(UniversalId::Type_Enchantment));
+    mEnchantments.addColumn(new EnchantmentTypeColumn<ESM::Enchantment>);
+    mEnchantments.addColumn(new CostColumn<ESM::Enchantment>);
+    mEnchantments.addColumn(new ChargesColumn2<ESM::Enchantment>);
+    mEnchantments.addColumn(new FlagColumn<ESM::Enchantment>(Columns::ColumnId_AutoCalc, ESM::Enchantment::Autocalc));
     // Enchantment effects
-    mEnchantments.addColumn (new NestedParentColumn<ESM::Enchantment> (Columns::ColumnId_EffectList));
-    index = mEnchantments.getColumns()-1;
-    mEnchantments.addAdapter (std::make_pair(&mEnchantments.getColumn(index),
-        new EffectsListAdapter<ESM::Enchantment> ()));
+    mEnchantments.addColumn(new NestedParentColumn<ESM::Enchantment>(Columns::ColumnId_EffectList));
+    index = mEnchantments.getColumns() - 1;
+    mEnchantments.addAdapter(
+        std::make_pair(&mEnchantments.getColumn(index), new EffectsListAdapter<ESM::Enchantment>()));
     mEnchantments.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_EffectId, ColumnBase::Display_EffectId));
+        new NestedChildColumn(Columns::ColumnId_EffectId, ColumnBase::Display_EffectId));
     mEnchantments.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_Skill, ColumnBase::Display_EffectSkill));
+        new NestedChildColumn(Columns::ColumnId_Skill, ColumnBase::Display_EffectSkill));
     mEnchantments.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_Attribute, ColumnBase::Display_EffectAttribute));
+        new NestedChildColumn(Columns::ColumnId_Attribute, ColumnBase::Display_EffectAttribute));
     mEnchantments.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_EffectRange, ColumnBase::Display_EffectRange));
+        new NestedChildColumn(Columns::ColumnId_EffectRange, ColumnBase::Display_EffectRange));
     mEnchantments.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_EffectArea, ColumnBase::Display_String));
+        new NestedChildColumn(Columns::ColumnId_EffectArea, ColumnBase::Display_String));
     mEnchantments.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_Duration, ColumnBase::Display_Integer)); // reuse from light
+        new NestedChildColumn(Columns::ColumnId_Duration, ColumnBase::Display_Integer)); // reuse from light
     mEnchantments.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_MinMagnitude, ColumnBase::Display_Integer));
+        new NestedChildColumn(Columns::ColumnId_MinMagnitude, ColumnBase::Display_Integer));
     mEnchantments.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_MaxMagnitude, ColumnBase::Display_Integer));
+        new NestedChildColumn(Columns::ColumnId_MaxMagnitude, ColumnBase::Display_Integer));
 
-    mBodyParts.addColumn (new StringIdColumn<ESM::BodyPart>);
-    mBodyParts.addColumn (new RecordStateColumn<ESM::BodyPart>);
-    mBodyParts.addColumn (new FixedRecordTypeColumn<ESM::BodyPart> (UniversalId::Type_BodyPart));
-    mBodyParts.addColumn (new BodyPartTypeColumn<ESM::BodyPart>);
-    mBodyParts.addColumn (new VampireColumn<ESM::BodyPart>);
+    mBodyParts.addColumn(new StringIdColumn<ESM::BodyPart>);
+    mBodyParts.addColumn(new RecordStateColumn<ESM::BodyPart>);
+    mBodyParts.addColumn(new FixedRecordTypeColumn<ESM::BodyPart>(UniversalId::Type_BodyPart));
+    mBodyParts.addColumn(new BodyPartTypeColumn<ESM::BodyPart>);
+    mBodyParts.addColumn(new VampireColumn<ESM::BodyPart>);
     mBodyParts.addColumn(new GenderNpcColumn<ESM::BodyPart>);
-    mBodyParts.addColumn (new FlagColumn<ESM::BodyPart> (Columns::ColumnId_Playable,
-        ESM::BodyPart::BPF_NotPlayable, ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue, true));
+    mBodyParts.addColumn(new FlagColumn<ESM::BodyPart>(Columns::ColumnId_Playable, ESM::BodyPart::BPF_NotPlayable,
+        ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue, true));
 
     int meshTypeFlags = ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_Refresh;
-    MeshTypeColumn<ESM::BodyPart> *meshTypeColumn = new MeshTypeColumn<ESM::BodyPart>(meshTypeFlags);
-    mBodyParts.addColumn (meshTypeColumn);
-    mBodyParts.addColumn (new ModelColumn<ESM::BodyPart>);
-    mBodyParts.addColumn (new BodyPartRaceColumn(meshTypeColumn));
-
-    mSoundGens.addColumn (new StringIdColumn<ESM::SoundGenerator>);
-    mSoundGens.addColumn (new RecordStateColumn<ESM::SoundGenerator>);
-    mSoundGens.addColumn (new FixedRecordTypeColumn<ESM::SoundGenerator> (UniversalId::Type_SoundGen));
-    mSoundGens.addColumn (new CreatureColumn<ESM::SoundGenerator>);
-    mSoundGens.addColumn (new SoundColumn<ESM::SoundGenerator>);
-    mSoundGens.addColumn (new SoundGeneratorTypeColumn<ESM::SoundGenerator>);
-
-    mMagicEffects.addColumn (new StringIdColumn<ESM::MagicEffect>);
-    mMagicEffects.addColumn (new RecordStateColumn<ESM::MagicEffect>);
-    mMagicEffects.addColumn (new FixedRecordTypeColumn<ESM::MagicEffect> (UniversalId::Type_MagicEffect));
-    mMagicEffects.addColumn (new SchoolColumn<ESM::MagicEffect>);
-    mMagicEffects.addColumn (new BaseCostColumn<ESM::MagicEffect>);
-    mMagicEffects.addColumn (new EffectTextureColumn<ESM::MagicEffect> (Columns::ColumnId_Icon));
-    mMagicEffects.addColumn (new EffectTextureColumn<ESM::MagicEffect> (Columns::ColumnId_Particle));
-    mMagicEffects.addColumn (new EffectObjectColumn<ESM::MagicEffect> (Columns::ColumnId_CastingObject));
-    mMagicEffects.addColumn (new EffectObjectColumn<ESM::MagicEffect> (Columns::ColumnId_HitObject));
-    mMagicEffects.addColumn (new EffectObjectColumn<ESM::MagicEffect> (Columns::ColumnId_AreaObject));
-    mMagicEffects.addColumn (new EffectObjectColumn<ESM::MagicEffect> (Columns::ColumnId_BoltObject));
-    mMagicEffects.addColumn (new EffectSoundColumn<ESM::MagicEffect> (Columns::ColumnId_CastingSound));
-    mMagicEffects.addColumn (new EffectSoundColumn<ESM::MagicEffect> (Columns::ColumnId_HitSound));
-    mMagicEffects.addColumn (new EffectSoundColumn<ESM::MagicEffect> (Columns::ColumnId_AreaSound));
-    mMagicEffects.addColumn (new EffectSoundColumn<ESM::MagicEffect> (Columns::ColumnId_BoltSound));
-    mMagicEffects.addColumn (new FlagColumn<ESM::MagicEffect> (
-        Columns::ColumnId_AllowSpellmaking, ESM::MagicEffect::AllowSpellmaking));
-    mMagicEffects.addColumn (new FlagColumn<ESM::MagicEffect> (
-        Columns::ColumnId_AllowEnchanting, ESM::MagicEffect::AllowEnchanting));
-    mMagicEffects.addColumn (new FlagColumn<ESM::MagicEffect> (
-        Columns::ColumnId_NegativeLight, ESM::MagicEffect::NegativeLight));
-    mMagicEffects.addColumn (new DescriptionColumn<ESM::MagicEffect>);
-
-    mLand.addColumn (new StringIdColumn<Land>);
-    mLand.addColumn (new RecordStateColumn<Land>);
-    mLand.addColumn (new FixedRecordTypeColumn<Land>(UniversalId::Type_Land));
-    mLand.addColumn (new LandPluginIndexColumn);
-    mLand.addColumn (new LandNormalsColumn);
-    mLand.addColumn (new LandHeightsColumn);
-    mLand.addColumn (new LandColoursColumn);
-    mLand.addColumn (new LandTexturesColumn);
-
-    mLandTextures.addColumn (new StringIdColumn<LandTexture>(true));
-    mLandTextures.addColumn (new RecordStateColumn<LandTexture>);
-    mLandTextures.addColumn (new FixedRecordTypeColumn<LandTexture>(UniversalId::Type_LandTexture));
-    mLandTextures.addColumn (new LandTextureNicknameColumn);
-    mLandTextures.addColumn (new LandTexturePluginIndexColumn);
-    mLandTextures.addColumn (new LandTextureIndexColumn);
-    mLandTextures.addColumn (new TextureColumn<LandTexture>);
-
-    mPathgrids.addColumn (new StringIdColumn<Pathgrid>);
-    mPathgrids.addColumn (new RecordStateColumn<Pathgrid>);
-    mPathgrids.addColumn (new FixedRecordTypeColumn<Pathgrid> (UniversalId::Type_Pathgrid));
+    MeshTypeColumn<ESM::BodyPart>* meshTypeColumn = new MeshTypeColumn<ESM::BodyPart>(meshTypeFlags);
+    mBodyParts.addColumn(meshTypeColumn);
+    mBodyParts.addColumn(new ModelColumn<ESM::BodyPart>);
+    mBodyParts.addColumn(new BodyPartRaceColumn(meshTypeColumn));
+
+    mSoundGens.addColumn(new StringIdColumn<ESM::SoundGenerator>);
+    mSoundGens.addColumn(new RecordStateColumn<ESM::SoundGenerator>);
+    mSoundGens.addColumn(new FixedRecordTypeColumn<ESM::SoundGenerator>(UniversalId::Type_SoundGen));
+    mSoundGens.addColumn(new CreatureColumn<ESM::SoundGenerator>);
+    mSoundGens.addColumn(new SoundColumn<ESM::SoundGenerator>);
+    mSoundGens.addColumn(new SoundGeneratorTypeColumn<ESM::SoundGenerator>);
+
+    mMagicEffects.addColumn(new StringIdColumn<ESM::MagicEffect>);
+    mMagicEffects.addColumn(new RecordStateColumn<ESM::MagicEffect>);
+    mMagicEffects.addColumn(new FixedRecordTypeColumn<ESM::MagicEffect>(UniversalId::Type_MagicEffect));
+    mMagicEffects.addColumn(new SchoolColumn<ESM::MagicEffect>);
+    mMagicEffects.addColumn(new BaseCostColumn<ESM::MagicEffect>);
+    mMagicEffects.addColumn(new EffectTextureColumn<ESM::MagicEffect>(Columns::ColumnId_Icon));
+    mMagicEffects.addColumn(new EffectTextureColumn<ESM::MagicEffect>(Columns::ColumnId_Particle));
+    mMagicEffects.addColumn(new EffectObjectColumn<ESM::MagicEffect>(Columns::ColumnId_CastingObject));
+    mMagicEffects.addColumn(new EffectObjectColumn<ESM::MagicEffect>(Columns::ColumnId_HitObject));
+    mMagicEffects.addColumn(new EffectObjectColumn<ESM::MagicEffect>(Columns::ColumnId_AreaObject));
+    mMagicEffects.addColumn(new EffectObjectColumn<ESM::MagicEffect>(Columns::ColumnId_BoltObject));
+    mMagicEffects.addColumn(new EffectSoundColumn<ESM::MagicEffect>(Columns::ColumnId_CastingSound));
+    mMagicEffects.addColumn(new EffectSoundColumn<ESM::MagicEffect>(Columns::ColumnId_HitSound));
+    mMagicEffects.addColumn(new EffectSoundColumn<ESM::MagicEffect>(Columns::ColumnId_AreaSound));
+    mMagicEffects.addColumn(new EffectSoundColumn<ESM::MagicEffect>(Columns::ColumnId_BoltSound));
+    mMagicEffects.addColumn(
+        new FlagColumn<ESM::MagicEffect>(Columns::ColumnId_AllowSpellmaking, ESM::MagicEffect::AllowSpellmaking));
+    mMagicEffects.addColumn(
+        new FlagColumn<ESM::MagicEffect>(Columns::ColumnId_AllowEnchanting, ESM::MagicEffect::AllowEnchanting));
+    mMagicEffects.addColumn(
+        new FlagColumn<ESM::MagicEffect>(Columns::ColumnId_NegativeLight, ESM::MagicEffect::NegativeLight));
+    mMagicEffects.addColumn(new DescriptionColumn<ESM::MagicEffect>);
+
+    mLand.addColumn(new StringIdColumn<Land>);
+    mLand.addColumn(new RecordStateColumn<Land>);
+    mLand.addColumn(new FixedRecordTypeColumn<Land>(UniversalId::Type_Land));
+    mLand.addColumn(new LandPluginIndexColumn);
+    mLand.addColumn(new LandNormalsColumn);
+    mLand.addColumn(new LandHeightsColumn);
+    mLand.addColumn(new LandColoursColumn);
+    mLand.addColumn(new LandTexturesColumn);
+
+    mLandTextures.addColumn(new StringIdColumn<LandTexture>(true));
+    mLandTextures.addColumn(new RecordStateColumn<LandTexture>);
+    mLandTextures.addColumn(new FixedRecordTypeColumn<LandTexture>(UniversalId::Type_LandTexture));
+    mLandTextures.addColumn(new LandTextureNicknameColumn);
+    mLandTextures.addColumn(new LandTexturePluginIndexColumn);
+    mLandTextures.addColumn(new LandTextureIndexColumn);
+    mLandTextures.addColumn(new TextureColumn<LandTexture>);
+
+    mPathgrids.addColumn(new StringIdColumn<Pathgrid>);
+    mPathgrids.addColumn(new RecordStateColumn<Pathgrid>);
+    mPathgrids.addColumn(new FixedRecordTypeColumn<Pathgrid>(UniversalId::Type_Pathgrid));
 
     // new object deleted in dtor of Collection<T,A>
-    mPathgrids.addColumn (new NestedParentColumn<Pathgrid> (Columns::ColumnId_PathgridPoints));
-    index = mPathgrids.getColumns()-1;
+    mPathgrids.addColumn(new NestedParentColumn<Pathgrid>(Columns::ColumnId_PathgridPoints));
+    index = mPathgrids.getColumns() - 1;
     // new object deleted in dtor of NestedCollection<T,A>
-    mPathgrids.addAdapter (std::make_pair(&mPathgrids.getColumn(index), new PathgridPointListAdapter ()));
+    mPathgrids.addAdapter(std::make_pair(&mPathgrids.getColumn(index), new PathgridPointListAdapter()));
     // new objects deleted in dtor of NestableColumn
     // WARNING: The order of the columns below are assumed in PathgridPointListAdapter
+    mPathgrids.getNestableColumn(index)->addColumn(new NestedChildColumn(
+        Columns::ColumnId_PathgridIndex, ColumnBase::Display_Integer, ColumnBase::Flag_Dialogue, false));
     mPathgrids.getNestableColumn(index)->addColumn(
-            new NestedChildColumn (Columns::ColumnId_PathgridIndex, ColumnBase::Display_Integer,
-                ColumnBase::Flag_Dialogue, false));
+        new NestedChildColumn(Columns::ColumnId_PathgridPosX, ColumnBase::Display_Integer));
     mPathgrids.getNestableColumn(index)->addColumn(
-            new NestedChildColumn (Columns::ColumnId_PathgridPosX, ColumnBase::Display_Integer));
+        new NestedChildColumn(Columns::ColumnId_PathgridPosY, ColumnBase::Display_Integer));
     mPathgrids.getNestableColumn(index)->addColumn(
-            new NestedChildColumn (Columns::ColumnId_PathgridPosY, ColumnBase::Display_Integer));
-    mPathgrids.getNestableColumn(index)->addColumn(
-            new NestedChildColumn (Columns::ColumnId_PathgridPosZ, ColumnBase::Display_Integer));
+        new NestedChildColumn(Columns::ColumnId_PathgridPosZ, ColumnBase::Display_Integer));
 
-    mPathgrids.addColumn (new NestedParentColumn<Pathgrid> (Columns::ColumnId_PathgridEdges));
-    index = mPathgrids.getColumns()-1;
-    mPathgrids.addAdapter (std::make_pair(&mPathgrids.getColumn(index), new PathgridEdgeListAdapter ()));
-    mPathgrids.getNestableColumn(index)->addColumn(
-            new NestedChildColumn (Columns::ColumnId_PathgridEdgeIndex, ColumnBase::Display_Integer,
-                ColumnBase::Flag_Dialogue, false));
+    mPathgrids.addColumn(new NestedParentColumn<Pathgrid>(Columns::ColumnId_PathgridEdges));
+    index = mPathgrids.getColumns() - 1;
+    mPathgrids.addAdapter(std::make_pair(&mPathgrids.getColumn(index), new PathgridEdgeListAdapter()));
+    mPathgrids.getNestableColumn(index)->addColumn(new NestedChildColumn(
+        Columns::ColumnId_PathgridEdgeIndex, ColumnBase::Display_Integer, ColumnBase::Flag_Dialogue, false));
     mPathgrids.getNestableColumn(index)->addColumn(
-            new NestedChildColumn (Columns::ColumnId_PathgridEdge0, ColumnBase::Display_Integer));
+        new NestedChildColumn(Columns::ColumnId_PathgridEdge0, ColumnBase::Display_Integer));
     mPathgrids.getNestableColumn(index)->addColumn(
-            new NestedChildColumn (Columns::ColumnId_PathgridEdge1, ColumnBase::Display_Integer));
-
-    mStartScripts.addColumn (new StringIdColumn<ESM::StartScript>);
-    mStartScripts.addColumn (new RecordStateColumn<ESM::StartScript>);
-    mStartScripts.addColumn (new FixedRecordTypeColumn<ESM::StartScript> (UniversalId::Type_StartScript));
-
-    mRefs.addColumn (new StringIdColumn<CellRef> (true));
-    mRefs.addColumn (new RecordStateColumn<CellRef>);
-    mRefs.addColumn (new FixedRecordTypeColumn<CellRef> (UniversalId::Type_Reference));
-    mRefs.addColumn (new CellColumn<CellRef> (true));
-    mRefs.addColumn (new OriginalCellColumn<CellRef>);
-    mRefs.addColumn (new IdColumn<CellRef>);
-    mRefs.addColumn (new PosColumn<CellRef> (&CellRef::mPos, 0, false));
-    mRefs.addColumn (new PosColumn<CellRef> (&CellRef::mPos, 1, false));
-    mRefs.addColumn (new PosColumn<CellRef> (&CellRef::mPos, 2, false));
-    mRefs.addColumn (new RotColumn<CellRef> (&CellRef::mPos, 0, false));
-    mRefs.addColumn (new RotColumn<CellRef> (&CellRef::mPos, 1, false));
-    mRefs.addColumn (new RotColumn<CellRef> (&CellRef::mPos, 2, false));
-    mRefs.addColumn (new ScaleColumn<CellRef>);
-    mRefs.addColumn (new OwnerColumn<CellRef>);
-    mRefs.addColumn (new SoulColumn<CellRef>);
-    mRefs.addColumn (new FactionColumn<CellRef>);
-    mRefs.addColumn (new FactionIndexColumn<CellRef>);
-    mRefs.addColumn (new ChargesColumn<CellRef>);
-    mRefs.addColumn (new EnchantmentChargesColumn<CellRef>);
-    mRefs.addColumn (new GoldValueColumn<CellRef>);
-    mRefs.addColumn (new TeleportColumn<CellRef>);
-    mRefs.addColumn (new TeleportCellColumn<CellRef>);
-    mRefs.addColumn (new PosColumn<CellRef> (&CellRef::mDoorDest, 0, true));
-    mRefs.addColumn (new PosColumn<CellRef> (&CellRef::mDoorDest, 1, true));
-    mRefs.addColumn (new PosColumn<CellRef> (&CellRef::mDoorDest, 2, true));
-    mRefs.addColumn (new RotColumn<CellRef> (&CellRef::mDoorDest, 0, true));
-    mRefs.addColumn (new RotColumn<CellRef> (&CellRef::mDoorDest, 1, true));
-    mRefs.addColumn (new RotColumn<CellRef> (&CellRef::mDoorDest, 2, true));
-    mRefs.addColumn (new LockLevelColumn<CellRef>);
-    mRefs.addColumn (new KeyColumn<CellRef>);
-    mRefs.addColumn (new TrapColumn<CellRef>);
-    mRefs.addColumn (new OwnerGlobalColumn<CellRef>);
-    mRefs.addColumn (new RefNumColumn<CellRef>);
-
-    mFilters.addColumn (new StringIdColumn<ESM::Filter>);
-    mFilters.addColumn (new RecordStateColumn<ESM::Filter>);
-    mFilters.addColumn (new FixedRecordTypeColumn<ESM::Filter> (UniversalId::Type_Filter));
-    mFilters.addColumn (new FilterColumn<ESM::Filter>);
-    mFilters.addColumn (new DescriptionColumn<ESM::Filter>);
-
-    mDebugProfiles.addColumn (new StringIdColumn<ESM::DebugProfile>);
-    mDebugProfiles.addColumn (new RecordStateColumn<ESM::DebugProfile>);
-    mDebugProfiles.addColumn (new FixedRecordTypeColumn<ESM::DebugProfile> (UniversalId::Type_DebugProfile));
-    mDebugProfiles.addColumn (new FlagColumn2<ESM::DebugProfile> (
-        Columns::ColumnId_DefaultProfile, ESM::DebugProfile::Flag_Default));
-    mDebugProfiles.addColumn (new FlagColumn2<ESM::DebugProfile> (
-        Columns::ColumnId_BypassNewGame, ESM::DebugProfile::Flag_BypassNewGame));
-    mDebugProfiles.addColumn (new FlagColumn2<ESM::DebugProfile> (
-        Columns::ColumnId_GlobalProfile, ESM::DebugProfile::Flag_Global));
-    mDebugProfiles.addColumn (new DescriptionColumn<ESM::DebugProfile>);
-    mDebugProfiles.addColumn (new ScriptColumn<ESM::DebugProfile> (
-        ScriptColumn<ESM::DebugProfile>::Type_Lines));
-
-    mMetaData.appendBlankRecord ("sys::meta");
-
-    mMetaData.addColumn (new StringIdColumn<MetaData> (true));
-    mMetaData.addColumn (new RecordStateColumn<MetaData>);
-    mMetaData.addColumn (new FixedRecordTypeColumn<MetaData> (UniversalId::Type_MetaData));
-    mMetaData.addColumn (new FormatColumn<MetaData>);
-    mMetaData.addColumn (new AuthorColumn<MetaData>);
-    mMetaData.addColumn (new FileDescriptionColumn<MetaData>);
-
-    addModel (new IdTable (&mGlobals), UniversalId::Type_Global);
-    addModel (new IdTable (&mGmsts), UniversalId::Type_Gmst);
-    addModel (new IdTable (&mSkills), UniversalId::Type_Skill);
-    addModel (new IdTable (&mClasses), UniversalId::Type_Class);
-    addModel (new IdTree (&mFactions, &mFactions), UniversalId::Type_Faction);
-    addModel (new IdTree (&mRaces, &mRaces), UniversalId::Type_Race);
-    addModel (new IdTable (&mSounds), UniversalId::Type_Sound);
-    addModel (new IdTable (&mScripts), UniversalId::Type_Script);
-    addModel (new IdTree (&mRegions, &mRegions), UniversalId::Type_Region);
-    addModel (new IdTree (&mBirthsigns, &mBirthsigns), UniversalId::Type_Birthsign);
-    addModel (new IdTree (&mSpells, &mSpells), UniversalId::Type_Spell);
-    addModel (new IdTable (&mTopics), UniversalId::Type_Topic);
-    addModel (new IdTable (&mJournals), UniversalId::Type_Journal);
-    addModel (new IdTree (&mTopicInfos, &mTopicInfos, IdTable::Feature_ReorderWithinTopic),
-        UniversalId::Type_TopicInfo);
-    addModel (new IdTable (&mJournalInfos, IdTable::Feature_ReorderWithinTopic), UniversalId::Type_JournalInfo);
-    addModel (new IdTree (&mCells, &mCells, IdTable::Feature_ViewId), UniversalId::Type_Cell);
-    addModel (new IdTree (&mEnchantments, &mEnchantments), UniversalId::Type_Enchantment);
-    addModel (new IdTable (&mBodyParts), UniversalId::Type_BodyPart);
-    addModel (new IdTable (&mSoundGens), UniversalId::Type_SoundGen);
-    addModel (new IdTable (&mMagicEffects), UniversalId::Type_MagicEffect);
-    addModel (new IdTable (&mLand, IdTable::Feature_AllowTouch), UniversalId::Type_Land);
-    addModel (new LandTextureIdTable (&mLandTextures), UniversalId::Type_LandTexture);
-    addModel (new IdTree (&mPathgrids, &mPathgrids), UniversalId::Type_Pathgrid);
-    addModel (new IdTable (&mStartScripts), UniversalId::Type_StartScript);
-    addModel (new IdTree (&mReferenceables, &mReferenceables, IdTable::Feature_Preview),
-        UniversalId::Type_Referenceable);
-    addModel (new IdTable (&mRefs, IdTable::Feature_ViewCell | IdTable::Feature_Preview), UniversalId::Type_Reference);
-    addModel (new IdTable (&mFilters), UniversalId::Type_Filter);
-    addModel (new IdTable (&mDebugProfiles), UniversalId::Type_DebugProfile);
-    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_Meshes)),
-        UniversalId::Type_Mesh);
-    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_Icons)),
-        UniversalId::Type_Icon);
-    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_Musics)),
-        UniversalId::Type_Music);
-    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_SoundsRes)),
-        UniversalId::Type_SoundRes);
-    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_Textures)),
-        UniversalId::Type_Texture);
-    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_Videos)),
-        UniversalId::Type_Video);
-    addModel (new IdTable (&mMetaData), UniversalId::Type_MetaData);
+        new NestedChildColumn(Columns::ColumnId_PathgridEdge1, ColumnBase::Display_Integer));
+
+    mStartScripts.addColumn(new StringIdColumn<ESM::StartScript>);
+    mStartScripts.addColumn(new RecordStateColumn<ESM::StartScript>);
+    mStartScripts.addColumn(new FixedRecordTypeColumn<ESM::StartScript>(UniversalId::Type_StartScript));
+
+    mRefs.addColumn(new StringIdColumn<CellRef>(true));
+    mRefs.addColumn(new RecordStateColumn<CellRef>);
+    mRefs.addColumn(new FixedRecordTypeColumn<CellRef>(UniversalId::Type_Reference));
+    mRefs.addColumn(new CellColumn<CellRef>(true));
+    mRefs.addColumn(new OriginalCellColumn<CellRef>);
+    mRefs.addColumn(new IdColumn<CellRef>);
+    mRefs.addColumn(new PosColumn<CellRef>(&CellRef::mPos, 0, false));
+    mRefs.addColumn(new PosColumn<CellRef>(&CellRef::mPos, 1, false));
+    mRefs.addColumn(new PosColumn<CellRef>(&CellRef::mPos, 2, false));
+    mRefs.addColumn(new RotColumn<CellRef>(&CellRef::mPos, 0, false));
+    mRefs.addColumn(new RotColumn<CellRef>(&CellRef::mPos, 1, false));
+    mRefs.addColumn(new RotColumn<CellRef>(&CellRef::mPos, 2, false));
+    mRefs.addColumn(new ScaleColumn<CellRef>);
+    mRefs.addColumn(new OwnerColumn<CellRef>);
+    mRefs.addColumn(new SoulColumn<CellRef>);
+    mRefs.addColumn(new FactionColumn<CellRef>);
+    mRefs.addColumn(new FactionIndexColumn<CellRef>);
+    mRefs.addColumn(new ChargesColumn<CellRef>);
+    mRefs.addColumn(new EnchantmentChargesColumn<CellRef>);
+    mRefs.addColumn(new GoldValueColumn<CellRef>);
+    mRefs.addColumn(new TeleportColumn<CellRef>);
+    mRefs.addColumn(new TeleportCellColumn<CellRef>);
+    mRefs.addColumn(new PosColumn<CellRef>(&CellRef::mDoorDest, 0, true));
+    mRefs.addColumn(new PosColumn<CellRef>(&CellRef::mDoorDest, 1, true));
+    mRefs.addColumn(new PosColumn<CellRef>(&CellRef::mDoorDest, 2, true));
+    mRefs.addColumn(new RotColumn<CellRef>(&CellRef::mDoorDest, 0, true));
+    mRefs.addColumn(new RotColumn<CellRef>(&CellRef::mDoorDest, 1, true));
+    mRefs.addColumn(new RotColumn<CellRef>(&CellRef::mDoorDest, 2, true));
+    mRefs.addColumn(new LockLevelColumn<CellRef>);
+    mRefs.addColumn(new KeyColumn<CellRef>);
+    mRefs.addColumn(new TrapColumn<CellRef>);
+    mRefs.addColumn(new OwnerGlobalColumn<CellRef>);
+    mRefs.addColumn(new RefNumColumn<CellRef>);
+
+    mFilters.addColumn(new StringIdColumn<ESM::Filter>);
+    mFilters.addColumn(new RecordStateColumn<ESM::Filter>);
+    mFilters.addColumn(new FixedRecordTypeColumn<ESM::Filter>(UniversalId::Type_Filter));
+    mFilters.addColumn(new FilterColumn<ESM::Filter>);
+    mFilters.addColumn(new DescriptionColumn<ESM::Filter>);
+
+    mDebugProfiles.addColumn(new StringIdColumn<ESM::DebugProfile>);
+    mDebugProfiles.addColumn(new RecordStateColumn<ESM::DebugProfile>);
+    mDebugProfiles.addColumn(new FixedRecordTypeColumn<ESM::DebugProfile>(UniversalId::Type_DebugProfile));
+    mDebugProfiles.addColumn(
+        new FlagColumn2<ESM::DebugProfile>(Columns::ColumnId_DefaultProfile, ESM::DebugProfile::Flag_Default));
+    mDebugProfiles.addColumn(
+        new FlagColumn2<ESM::DebugProfile>(Columns::ColumnId_BypassNewGame, ESM::DebugProfile::Flag_BypassNewGame));
+    mDebugProfiles.addColumn(
+        new FlagColumn2<ESM::DebugProfile>(Columns::ColumnId_GlobalProfile, ESM::DebugProfile::Flag_Global));
+    mDebugProfiles.addColumn(new DescriptionColumn<ESM::DebugProfile>);
+    mDebugProfiles.addColumn(new ScriptColumn<ESM::DebugProfile>(ScriptColumn<ESM::DebugProfile>::Type_Lines));
+
+    mMetaData.appendBlankRecord("sys::meta");
+
+    mMetaData.addColumn(new StringIdColumn<MetaData>(true));
+    mMetaData.addColumn(new RecordStateColumn<MetaData>);
+    mMetaData.addColumn(new FixedRecordTypeColumn<MetaData>(UniversalId::Type_MetaData));
+    mMetaData.addColumn(new FormatColumn<MetaData>);
+    mMetaData.addColumn(new AuthorColumn<MetaData>);
+    mMetaData.addColumn(new FileDescriptionColumn<MetaData>);
+
+    addModel(new IdTable(&mGlobals), UniversalId::Type_Global);
+    addModel(new IdTable(&mGmsts), UniversalId::Type_Gmst);
+    addModel(new IdTable(&mSkills), UniversalId::Type_Skill);
+    addModel(new IdTable(&mClasses), UniversalId::Type_Class);
+    addModel(new IdTree(&mFactions, &mFactions), UniversalId::Type_Faction);
+    addModel(new IdTree(&mRaces, &mRaces), UniversalId::Type_Race);
+    addModel(new IdTable(&mSounds), UniversalId::Type_Sound);
+    addModel(new IdTable(&mScripts), UniversalId::Type_Script);
+    addModel(new IdTree(&mRegions, &mRegions), UniversalId::Type_Region);
+    addModel(new IdTree(&mBirthsigns, &mBirthsigns), UniversalId::Type_Birthsign);
+    addModel(new IdTree(&mSpells, &mSpells), UniversalId::Type_Spell);
+    addModel(new IdTable(&mTopics), UniversalId::Type_Topic);
+    addModel(new IdTable(&mJournals), UniversalId::Type_Journal);
+    addModel(new IdTree(&mTopicInfos, &mTopicInfos, IdTable::Feature_ReorderWithinTopic), UniversalId::Type_TopicInfo);
+    addModel(new IdTable(&mJournalInfos, IdTable::Feature_ReorderWithinTopic), UniversalId::Type_JournalInfo);
+    addModel(new IdTree(&mCells, &mCells, IdTable::Feature_ViewId), UniversalId::Type_Cell);
+    addModel(new IdTree(&mEnchantments, &mEnchantments), UniversalId::Type_Enchantment);
+    addModel(new IdTable(&mBodyParts), UniversalId::Type_BodyPart);
+    addModel(new IdTable(&mSoundGens), UniversalId::Type_SoundGen);
+    addModel(new IdTable(&mMagicEffects), UniversalId::Type_MagicEffect);
+    addModel(new IdTable(&mLand, IdTable::Feature_AllowTouch), UniversalId::Type_Land);
+    addModel(new LandTextureIdTable(&mLandTextures), UniversalId::Type_LandTexture);
+    addModel(new IdTree(&mPathgrids, &mPathgrids), UniversalId::Type_Pathgrid);
+    addModel(new IdTable(&mStartScripts), UniversalId::Type_StartScript);
+    addModel(new IdTree(&mReferenceables, &mReferenceables, IdTable::Feature_Preview), UniversalId::Type_Referenceable);
+    addModel(new IdTable(&mRefs, IdTable::Feature_ViewCell | IdTable::Feature_Preview), UniversalId::Type_Reference);
+    addModel(new IdTable(&mFilters), UniversalId::Type_Filter);
+    addModel(new IdTable(&mDebugProfiles), UniversalId::Type_DebugProfile);
+    addModel(new ResourceTable(&mResourcesManager.get(UniversalId::Type_Meshes)), UniversalId::Type_Mesh);
+    addModel(new ResourceTable(&mResourcesManager.get(UniversalId::Type_Icons)), UniversalId::Type_Icon);
+    addModel(new ResourceTable(&mResourcesManager.get(UniversalId::Type_Musics)), UniversalId::Type_Music);
+    addModel(new ResourceTable(&mResourcesManager.get(UniversalId::Type_SoundsRes)), UniversalId::Type_SoundRes);
+    addModel(new ResourceTable(&mResourcesManager.get(UniversalId::Type_Textures)), UniversalId::Type_Texture);
+    addModel(new ResourceTable(&mResourcesManager.get(UniversalId::Type_Videos)), UniversalId::Type_Video);
+    addModel(new IdTable(&mMetaData), UniversalId::Type_MetaData);
 
     mActorAdapter = std::make_unique<ActorAdapter>(*this);
 
@@ -608,7 +601,7 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, bool fsStrict, const Files::Pat
 
 CSMWorld::Data::~Data()
 {
-    for (std::vector<QAbstractItemModel *>::iterator iter (mModels.begin()); iter!=mModels.end(); ++iter)
+    for (std::vector<QAbstractItemModel*>::iterator iter(mModels.begin()); iter != mModels.end(); ++iter)
         delete *iter;
 
     delete mReader;
@@ -734,7 +727,6 @@ CSMWorld::IdCollection<ESM::Spell>& CSMWorld::Data::getSpells()
     return mSpells;
 }
 
-
 const CSMWorld::IdCollection<ESM::Dialogue>& CSMWorld::Data::getTopics() const
 {
     return mTopics;
@@ -905,39 +897,39 @@ CSMWorld::IdCollection<ESM::StartScript>& CSMWorld::Data::getStartScripts()
     return mStartScripts;
 }
 
-const CSMWorld::Resources& CSMWorld::Data::getResources (const UniversalId& id) const
+const CSMWorld::Resources& CSMWorld::Data::getResources(const UniversalId& id) const
 {
-    return mResourcesManager.get (id.getType());
+    return mResourcesManager.get(id.getType());
 }
 
 const CSMWorld::MetaData& CSMWorld::Data::getMetaData() const
 {
-    return mMetaData.getRecord (0).get();
+    return mMetaData.getRecord(0).get();
 }
 
-void CSMWorld::Data::setMetaData (const MetaData& metaData)
+void CSMWorld::Data::setMetaData(const MetaData& metaData)
 {
-    mMetaData.setRecord (0, std::make_unique<Record<MetaData> >(
-            Record<MetaData>(RecordBase::State_ModifiedOnly, nullptr, &metaData)));
+    mMetaData.setRecord(
+        0, std::make_unique<Record<MetaData>>(Record<MetaData>(RecordBase::State_ModifiedOnly, nullptr, &metaData)));
 }
 
-QAbstractItemModel *CSMWorld::Data::getTableModel (const CSMWorld::UniversalId& id)
+QAbstractItemModel* CSMWorld::Data::getTableModel(const CSMWorld::UniversalId& id)
 {
-    std::map<UniversalId::Type, QAbstractItemModel *>::iterator iter = mModelIndex.find (id.getType());
+    std::map<UniversalId::Type, QAbstractItemModel*>::iterator iter = mModelIndex.find(id.getType());
 
-    if (iter==mModelIndex.end())
+    if (iter == mModelIndex.end())
     {
         // try creating missing (secondary) tables on the fly
         //
         // Note: We create these tables here so we don't have to deal with them during load/initial
         // construction of the ESX data where no update signals are available.
-        if (id.getType()==UniversalId::Type_RegionMap)
+        if (id.getType() == UniversalId::Type_RegionMap)
         {
-            RegionMap *table = nullptr;
-            addModel (table = new RegionMap (*this), UniversalId::Type_RegionMap, false);
+            RegionMap* table = nullptr;
+            addModel(table = new RegionMap(*this), UniversalId::Type_RegionMap, false);
             return table;
         }
-        throw std::logic_error ("No table model available for " + id.toString());
+        throw std::logic_error("No table model available for " + id.toString());
     }
 
     return iter->second;
@@ -958,7 +950,7 @@ void CSMWorld::Data::merge()
     mGlobals.merge();
 }
 
-int CSMWorld::Data::getTotalRecords (const std::vector<std::filesystem::path>& files)
+int CSMWorld::Data::getTotalRecords(const std::vector<std::filesystem::path>& files)
 {
     int records = 0;
 
@@ -977,7 +969,7 @@ int CSMWorld::Data::getTotalRecords (const std::vector<std::filesystem::path>& f
     return records;
 }
 
-int CSMWorld::Data::startLoading (const std::filesystem::path& path, bool base, bool project)
+int CSMWorld::Data::startLoading(const std::filesystem::path& path, bool base, bool project)
 {
     // Don't delete the Reader yet. Some record types store a reference to the Reader to handle on-demand loading
     std::shared_ptr<ESM::ESMReader> ptr(mReader);
@@ -987,9 +979,9 @@ int CSMWorld::Data::startLoading (const std::filesystem::path& path, bool base,
     mDialogue = nullptr;
 
     mReader = new ESM::ESMReader;
-    mReader->setEncoder (&mEncoder);
+    mReader->setEncoder(&mEncoder);
     mReader->setIndex((project || !base) ? 0 : mReaderIndex++);
-    mReader->open (path);
+    mReader->open(path);
 
     mBase = base;
     mProject = project;
@@ -998,10 +990,10 @@ int CSMWorld::Data::startLoading (const std::filesystem::path& path, bool base,
     {
         MetaData metaData;
         metaData.mId = "sys::meta";
-        metaData.load (*mReader);
+        metaData.load(*mReader);
 
-        mMetaData.setRecord (0, std::make_unique<Record<MetaData> >(
-                    Record<MetaData> (RecordBase::State_ModifiedOnly, nullptr, &metaData)));
+        mMetaData.setRecord(0,
+            std::make_unique<Record<MetaData>>(Record<MetaData>(RecordBase::State_ModifiedOnly, nullptr, &metaData)));
     }
 
     return mReader->getRecordCount();
@@ -1010,21 +1002,15 @@ int CSMWorld::Data::startLoading (const std::filesystem::path& path, bool base,
 void CSMWorld::Data::loadFallbackEntries()
 {
     // Load default marker definitions, if game files do not have them for some reason
-    std::pair<std::string, std::string> staticMarkers[] = {
-        std::make_pair("DivineMarker", "marker_divine.nif"),
-        std::make_pair("DoorMarker", "marker_arrow.nif"),
-        std::make_pair("NorthMarker", "marker_north.nif"),
-        std::make_pair("TempleMarker", "marker_temple.nif"),
-        std::make_pair("TravelMarker", "marker_travel.nif")
-    };
-
-    std::pair<std::string, std::string> doorMarkers[] = {
-        std::make_pair("PrisonMarker", "marker_prison.nif")
-    };
-
-    for (const auto &marker : staticMarkers)
+    std::pair<std::string, std::string> staticMarkers[] = { std::make_pair("DivineMarker", "marker_divine.nif"),
+        std::make_pair("DoorMarker", "marker_arrow.nif"), std::make_pair("NorthMarker", "marker_north.nif"),
+        std::make_pair("TempleMarker", "marker_temple.nif"), std::make_pair("TravelMarker", "marker_travel.nif") };
+
+    std::pair<std::string, std::string> doorMarkers[] = { std::make_pair("PrisonMarker", "marker_prison.nif") };
+
+    for (const auto& marker : staticMarkers)
     {
-        if (mReferenceables.searchId (marker.first)==-1)
+        if (mReferenceables.searchId(marker.first) == -1)
         {
             ESM::Static newMarker;
             newMarker.mId = marker.first;
@@ -1033,13 +1019,13 @@ void CSMWorld::Data::loadFallbackEntries()
             auto record = std::make_unique<CSMWorld::Record<ESM::Static>>();
             record->mBase = newMarker;
             record->mState = CSMWorld::RecordBase::State_BaseOnly;
-            mReferenceables.appendRecord (std::move(record), CSMWorld::UniversalId::Type_Static);
+            mReferenceables.appendRecord(std::move(record), CSMWorld::UniversalId::Type_Static);
         }
     }
 
-    for (const auto &marker : doorMarkers)
+    for (const auto& marker : doorMarkers)
     {
-        if (mReferenceables.searchId (marker.first)==-1)
+        if (mReferenceables.searchId(marker.first) == -1)
         {
             ESM::Door newMarker;
             newMarker.mId = marker.first;
@@ -1048,23 +1034,23 @@ void CSMWorld::Data::loadFallbackEntries()
             auto record = std::make_unique<CSMWorld::Record<ESM::Door>>();
             record->mBase = newMarker;
             record->mState = CSMWorld::RecordBase::State_BaseOnly;
-            mReferenceables.appendRecord (std::move(record), CSMWorld::UniversalId::Type_Door);
+            mReferenceables.appendRecord(std::move(record), CSMWorld::UniversalId::Type_Door);
         }
     }
 }
 
-bool CSMWorld::Data::continueLoading (CSMDoc::Messages& messages)
+bool CSMWorld::Data::continueLoading(CSMDoc::Messages& messages)
 {
     if (!mReader)
-        throw std::logic_error ("can't continue loading, because no load has been started");
+        throw std::logic_error("can't continue loading, because no load has been started");
 
     if (!mReader->hasMoreRecs())
     {
         if (mBase)
         {
-            // Don't delete the Reader yet. Some record types store a reference to the Reader to handle on-demand loading.
-            // We don't store non-base reader, because everything going into modified will be
-            // fully loaded during the initial loading process.
+            // Don't delete the Reader yet. Some record types store a reference to the Reader to handle on-demand
+            // loading. We don't store non-base reader, because everything going into modified will be fully loaded
+            // during the initial loading process.
             std::shared_ptr<ESM::ESMReader> ptr(mReader);
             mReaders.push_back(ptr);
         }
@@ -1087,105 +1073,180 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Messages& messages)
 
     switch (n.toInt())
     {
-        case ESM::REC_GLOB: mGlobals.load (*mReader, mBase); break;
-        case ESM::REC_GMST: mGmsts.load (*mReader, mBase); break;
-        case ESM::REC_SKIL: mSkills.load (*mReader, mBase); break;
-        case ESM::REC_CLAS: mClasses.load (*mReader, mBase); break;
-        case ESM::REC_FACT: mFactions.load (*mReader, mBase); break;
-        case ESM::REC_RACE: mRaces.load (*mReader, mBase); break;
-        case ESM::REC_SOUN: mSounds.load (*mReader, mBase); break;
-        case ESM::REC_SCPT: mScripts.load (*mReader, mBase); break;
-        case ESM::REC_REGN: mRegions.load (*mReader, mBase); break;
-        case ESM::REC_BSGN: mBirthsigns.load (*mReader, mBase); break;
-        case ESM::REC_SPEL: mSpells.load (*mReader, mBase); break;
-        case ESM::REC_ENCH: mEnchantments.load (*mReader, mBase); break;
-        case ESM::REC_BODY: mBodyParts.load (*mReader, mBase); break;
-        case ESM::REC_SNDG: mSoundGens.load (*mReader, mBase); break;
-        case ESM::REC_MGEF: mMagicEffects.load (*mReader, mBase); break;
-        case ESM::REC_PGRD: mPathgrids.load (*mReader, mBase); break;
-        case ESM::REC_SSCR: mStartScripts.load (*mReader, mBase); break;
-
-        case ESM::REC_LTEX: mLandTextures.load (*mReader, mBase); break;
-
-        case ESM::REC_LAND: mLand.load(*mReader, mBase); break;
+        case ESM::REC_GLOB:
+            mGlobals.load(*mReader, mBase);
+            break;
+        case ESM::REC_GMST:
+            mGmsts.load(*mReader, mBase);
+            break;
+        case ESM::REC_SKIL:
+            mSkills.load(*mReader, mBase);
+            break;
+        case ESM::REC_CLAS:
+            mClasses.load(*mReader, mBase);
+            break;
+        case ESM::REC_FACT:
+            mFactions.load(*mReader, mBase);
+            break;
+        case ESM::REC_RACE:
+            mRaces.load(*mReader, mBase);
+            break;
+        case ESM::REC_SOUN:
+            mSounds.load(*mReader, mBase);
+            break;
+        case ESM::REC_SCPT:
+            mScripts.load(*mReader, mBase);
+            break;
+        case ESM::REC_REGN:
+            mRegions.load(*mReader, mBase);
+            break;
+        case ESM::REC_BSGN:
+            mBirthsigns.load(*mReader, mBase);
+            break;
+        case ESM::REC_SPEL:
+            mSpells.load(*mReader, mBase);
+            break;
+        case ESM::REC_ENCH:
+            mEnchantments.load(*mReader, mBase);
+            break;
+        case ESM::REC_BODY:
+            mBodyParts.load(*mReader, mBase);
+            break;
+        case ESM::REC_SNDG:
+            mSoundGens.load(*mReader, mBase);
+            break;
+        case ESM::REC_MGEF:
+            mMagicEffects.load(*mReader, mBase);
+            break;
+        case ESM::REC_PGRD:
+            mPathgrids.load(*mReader, mBase);
+            break;
+        case ESM::REC_SSCR:
+            mStartScripts.load(*mReader, mBase);
+            break;
+
+        case ESM::REC_LTEX:
+            mLandTextures.load(*mReader, mBase);
+            break;
+
+        case ESM::REC_LAND:
+            mLand.load(*mReader, mBase);
+            break;
 
         case ESM::REC_CELL:
         {
-            int index = mCells.load (*mReader, mBase);
+            int index = mCells.load(*mReader, mBase);
             if (index < 0 || index >= mCells.getSize())
             {
                 // log an error and continue loading the refs to the last loaded cell
-                CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_None);
-                messages.add (id, "Logic error: cell index out of bounds", "", CSMDoc::Message::Severity_Error);
-                index = mCells.getSize()-1;
+                CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_None);
+                messages.add(id, "Logic error: cell index out of bounds", "", CSMDoc::Message::Severity_Error);
+                index = mCells.getSize() - 1;
             }
-            std::string cellId = Misc::StringUtils::lowerCase (mCells.getId (index));
-            mRefs.load (*mReader, index, mBase, mRefLoadCache[cellId], messages);
+            std::string cellId = Misc::StringUtils::lowerCase(mCells.getId(index));
+            mRefs.load(*mReader, index, mBase, mRefLoadCache[cellId], messages);
             break;
         }
 
-        case ESM::REC_ACTI: mReferenceables.load (*mReader, mBase, UniversalId::Type_Activator); break;
-        case ESM::REC_ALCH: mReferenceables.load (*mReader, mBase, UniversalId::Type_Potion); break;
-        case ESM::REC_APPA: mReferenceables.load (*mReader, mBase, UniversalId::Type_Apparatus); break;
-        case ESM::REC_ARMO: mReferenceables.load (*mReader, mBase, UniversalId::Type_Armor); break;
-        case ESM::REC_BOOK: mReferenceables.load (*mReader, mBase, UniversalId::Type_Book); break;
-        case ESM::REC_CLOT: mReferenceables.load (*mReader, mBase, UniversalId::Type_Clothing); break;
-        case ESM::REC_CONT: mReferenceables.load (*mReader, mBase, UniversalId::Type_Container); break;
-        case ESM::REC_CREA: mReferenceables.load (*mReader, mBase, UniversalId::Type_Creature); break;
-        case ESM::REC_DOOR: mReferenceables.load (*mReader, mBase, UniversalId::Type_Door); break;
-        case ESM::REC_INGR: mReferenceables.load (*mReader, mBase, UniversalId::Type_Ingredient); break;
+        case ESM::REC_ACTI:
+            mReferenceables.load(*mReader, mBase, UniversalId::Type_Activator);
+            break;
+        case ESM::REC_ALCH:
+            mReferenceables.load(*mReader, mBase, UniversalId::Type_Potion);
+            break;
+        case ESM::REC_APPA:
+            mReferenceables.load(*mReader, mBase, UniversalId::Type_Apparatus);
+            break;
+        case ESM::REC_ARMO:
+            mReferenceables.load(*mReader, mBase, UniversalId::Type_Armor);
+            break;
+        case ESM::REC_BOOK:
+            mReferenceables.load(*mReader, mBase, UniversalId::Type_Book);
+            break;
+        case ESM::REC_CLOT:
+            mReferenceables.load(*mReader, mBase, UniversalId::Type_Clothing);
+            break;
+        case ESM::REC_CONT:
+            mReferenceables.load(*mReader, mBase, UniversalId::Type_Container);
+            break;
+        case ESM::REC_CREA:
+            mReferenceables.load(*mReader, mBase, UniversalId::Type_Creature);
+            break;
+        case ESM::REC_DOOR:
+            mReferenceables.load(*mReader, mBase, UniversalId::Type_Door);
+            break;
+        case ESM::REC_INGR:
+            mReferenceables.load(*mReader, mBase, UniversalId::Type_Ingredient);
+            break;
         case ESM::REC_LEVC:
-            mReferenceables.load (*mReader, mBase, UniversalId::Type_CreatureLevelledList); break;
+            mReferenceables.load(*mReader, mBase, UniversalId::Type_CreatureLevelledList);
+            break;
         case ESM::REC_LEVI:
-            mReferenceables.load (*mReader, mBase, UniversalId::Type_ItemLevelledList); break;
-        case ESM::REC_LIGH: mReferenceables.load (*mReader, mBase, UniversalId::Type_Light); break;
-        case ESM::REC_LOCK: mReferenceables.load (*mReader, mBase, UniversalId::Type_Lockpick); break;
+            mReferenceables.load(*mReader, mBase, UniversalId::Type_ItemLevelledList);
+            break;
+        case ESM::REC_LIGH:
+            mReferenceables.load(*mReader, mBase, UniversalId::Type_Light);
+            break;
+        case ESM::REC_LOCK:
+            mReferenceables.load(*mReader, mBase, UniversalId::Type_Lockpick);
+            break;
         case ESM::REC_MISC:
-            mReferenceables.load (*mReader, mBase, UniversalId::Type_Miscellaneous); break;
-        case ESM::REC_NPC_: mReferenceables.load (*mReader, mBase, UniversalId::Type_Npc); break;
-        case ESM::REC_PROB: mReferenceables.load (*mReader, mBase, UniversalId::Type_Probe); break;
-        case ESM::REC_REPA: mReferenceables.load (*mReader, mBase, UniversalId::Type_Repair); break;
-        case ESM::REC_STAT: mReferenceables.load (*mReader, mBase, UniversalId::Type_Static); break;
-        case ESM::REC_WEAP: mReferenceables.load (*mReader, mBase, UniversalId::Type_Weapon); break;
+            mReferenceables.load(*mReader, mBase, UniversalId::Type_Miscellaneous);
+            break;
+        case ESM::REC_NPC_:
+            mReferenceables.load(*mReader, mBase, UniversalId::Type_Npc);
+            break;
+        case ESM::REC_PROB:
+            mReferenceables.load(*mReader, mBase, UniversalId::Type_Probe);
+            break;
+        case ESM::REC_REPA:
+            mReferenceables.load(*mReader, mBase, UniversalId::Type_Repair);
+            break;
+        case ESM::REC_STAT:
+            mReferenceables.load(*mReader, mBase, UniversalId::Type_Static);
+            break;
+        case ESM::REC_WEAP:
+            mReferenceables.load(*mReader, mBase, UniversalId::Type_Weapon);
+            break;
 
         case ESM::REC_DIAL:
         {
             ESM::Dialogue record;
             bool isDeleted = false;
 
-            record.load (*mReader, isDeleted);
+            record.load(*mReader, isDeleted);
 
             if (isDeleted)
             {
                 // record vector can be shuffled around which would make pointer to record invalid
                 mDialogue = nullptr;
 
-                if (mJournals.tryDelete (record.mId))
+                if (mJournals.tryDelete(record.mId))
                 {
                     mJournalInfos.removeDialogueInfos(record.mId);
                 }
-                else if (mTopics.tryDelete (record.mId))
+                else if (mTopics.tryDelete(record.mId))
                 {
                     mTopicInfos.removeDialogueInfos(record.mId);
                 }
                 else
                 {
-                    messages.add (UniversalId::Type_None,
-                        "Trying to delete dialogue record " + record.mId + " which does not exist",
-                        "", CSMDoc::Message::Severity_Warning);
+                    messages.add(UniversalId::Type_None,
+                        "Trying to delete dialogue record " + record.mId + " which does not exist", "",
+                        CSMDoc::Message::Severity_Warning);
                 }
             }
             else
             {
                 if (record.mType == ESM::Dialogue::Journal)
                 {
-                    mJournals.load (record, mBase);
-                    mDialogue = &mJournals.getRecord (record.mId).get();
+                    mJournals.load(record, mBase);
+                    mDialogue = &mJournals.getRecord(record.mId).get();
                 }
                 else
                 {
-                    mTopics.load (record, mBase);
-                    mDialogue = &mTopics.getRecord (record.mId).get();
+                    mTopics.load(record, mBase);
+                    mDialogue = &mTopics.getRecord(record.mId).get();
                 }
             }
 
@@ -1196,17 +1257,17 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Messages& messages)
         {
             if (!mDialogue)
             {
-                messages.add (UniversalId::Type_None,
-                    "Found info record not following a dialogue record", "", CSMDoc::Message::Severity_Error);
+                messages.add(UniversalId::Type_None, "Found info record not following a dialogue record", "",
+                    CSMDoc::Message::Severity_Error);
 
                 mReader->skipRecord();
                 break;
             }
 
-            if (mDialogue->mType==ESM::Dialogue::Journal)
-                mJournalInfos.load (*mReader, mBase, *mDialogue);
+            if (mDialogue->mType == ESM::Dialogue::Journal)
+                mJournalInfos.load(*mReader, mBase, *mDialogue);
             else
-                mTopicInfos.load (*mReader, mBase, *mDialogue);
+                mTopicInfos.load(*mReader, mBase, *mDialogue);
 
             break;
         }
@@ -1219,7 +1280,7 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Messages& messages)
                 break;
             }
 
-            mFilters.load (*mReader, mBase);
+            mFilters.load(*mReader, mBase);
             break;
 
         case ESM::REC_DBGP:
@@ -1230,7 +1291,7 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Messages& messages)
                 break;
             }
 
-            mDebugProfiles.load (*mReader, mBase);
+            mDebugProfiles.load(*mReader, mBase);
             break;
 
         default:
@@ -1240,8 +1301,8 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Messages& messages)
 
     if (unhandledRecord)
     {
-        messages.add (UniversalId::Type_None, "Unsupported record type: " + n.toString(), "",
-            CSMDoc::Message::Severity_Error);
+        messages.add(
+            UniversalId::Type_None, "Unsupported record type: " + n.toString(), "", CSMDoc::Message::Severity_Error);
 
         mReader->skipRecord();
     }
@@ -1249,79 +1310,51 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Messages& messages)
     return false;
 }
 
-bool CSMWorld::Data::hasId (const std::string& id) const
-{
-    return
-        getGlobals().searchId (id)!=-1 ||
-        getGmsts().searchId (id)!=-1 ||
-        getSkills().searchId (id)!=-1 ||
-        getClasses().searchId (id)!=-1 ||
-        getFactions().searchId (id)!=-1 ||
-        getRaces().searchId (id)!=-1 ||
-        getSounds().searchId (id)!=-1 ||
-        getScripts().searchId (id)!=-1 ||
-        getRegions().searchId (id)!=-1 ||
-        getBirthsigns().searchId (id)!=-1 ||
-        getSpells().searchId (id)!=-1 ||
-        getTopics().searchId (id)!=-1 ||
-        getJournals().searchId (id)!=-1 ||
-        getCells().searchId (id)!=-1 ||
-        getEnchantments().searchId (id)!=-1 ||
-        getBodyParts().searchId (id)!=-1 ||
-        getSoundGens().searchId (id)!=-1 ||
-        getMagicEffects().searchId (id)!=-1 ||
-        getReferenceables().searchId (id)!=-1;
-}
-
-int CSMWorld::Data::count (RecordBase::State state) const
-{
-    return
-        count (state, mGlobals) +
-        count (state, mGmsts) +
-        count (state, mSkills) +
-        count (state, mClasses) +
-        count (state, mFactions) +
-        count (state, mRaces) +
-        count (state, mSounds) +
-        count (state, mScripts) +
-        count (state, mRegions) +
-        count (state, mBirthsigns) +
-        count (state, mSpells) +
-        count (state, mCells) +
-        count (state, mEnchantments) +
-        count (state, mBodyParts) +
-        count (state, mLand) +
-        count (state, mLandTextures) +
-        count (state, mSoundGens) +
-        count (state, mMagicEffects) +
-        count (state, mReferenceables) +
-        count (state, mPathgrids);
-}
-
-std::vector<std::string> CSMWorld::Data::getIds (bool listDeleted) const
+bool CSMWorld::Data::hasId(const std::string& id) const
+{
+    return getGlobals().searchId(id) != -1 || getGmsts().searchId(id) != -1 || getSkills().searchId(id) != -1
+        || getClasses().searchId(id) != -1 || getFactions().searchId(id) != -1 || getRaces().searchId(id) != -1
+        || getSounds().searchId(id) != -1 || getScripts().searchId(id) != -1 || getRegions().searchId(id) != -1
+        || getBirthsigns().searchId(id) != -1 || getSpells().searchId(id) != -1 || getTopics().searchId(id) != -1
+        || getJournals().searchId(id) != -1 || getCells().searchId(id) != -1 || getEnchantments().searchId(id) != -1
+        || getBodyParts().searchId(id) != -1 || getSoundGens().searchId(id) != -1
+        || getMagicEffects().searchId(id) != -1 || getReferenceables().searchId(id) != -1;
+}
+
+int CSMWorld::Data::count(RecordBase::State state) const
+{
+    return count(state, mGlobals) + count(state, mGmsts) + count(state, mSkills) + count(state, mClasses)
+        + count(state, mFactions) + count(state, mRaces) + count(state, mSounds) + count(state, mScripts)
+        + count(state, mRegions) + count(state, mBirthsigns) + count(state, mSpells) + count(state, mCells)
+        + count(state, mEnchantments) + count(state, mBodyParts) + count(state, mLand) + count(state, mLandTextures)
+        + count(state, mSoundGens) + count(state, mMagicEffects) + count(state, mReferenceables)
+        + count(state, mPathgrids);
+}
+
+std::vector<std::string> CSMWorld::Data::getIds(bool listDeleted) const
 {
     std::vector<std::string> ids;
 
-    appendIds (ids, mGlobals, listDeleted);
-    appendIds (ids, mGmsts, listDeleted);
-    appendIds (ids, mClasses, listDeleted);
-    appendIds (ids, mFactions, listDeleted);
-    appendIds (ids, mRaces, listDeleted);
-    appendIds (ids, mSounds, listDeleted);
-    appendIds (ids, mScripts, listDeleted);
-    appendIds (ids, mRegions, listDeleted);
-    appendIds (ids, mBirthsigns, listDeleted);
-    appendIds (ids, mSpells, listDeleted);
-    appendIds (ids, mTopics, listDeleted);
-    appendIds (ids, mJournals, listDeleted);
-    appendIds (ids, mCells, listDeleted);
-    appendIds (ids, mEnchantments, listDeleted);
-    appendIds (ids, mBodyParts, listDeleted);
-    appendIds (ids, mSoundGens, listDeleted);
-    appendIds (ids, mMagicEffects, listDeleted);
-    appendIds (ids, mReferenceables, listDeleted);
-
-    std::sort (ids.begin(), ids.end());
+    appendIds(ids, mGlobals, listDeleted);
+    appendIds(ids, mGmsts, listDeleted);
+    appendIds(ids, mClasses, listDeleted);
+    appendIds(ids, mFactions, listDeleted);
+    appendIds(ids, mRaces, listDeleted);
+    appendIds(ids, mSounds, listDeleted);
+    appendIds(ids, mScripts, listDeleted);
+    appendIds(ids, mRegions, listDeleted);
+    appendIds(ids, mBirthsigns, listDeleted);
+    appendIds(ids, mSpells, listDeleted);
+    appendIds(ids, mTopics, listDeleted);
+    appendIds(ids, mJournals, listDeleted);
+    appendIds(ids, mCells, listDeleted);
+    appendIds(ids, mEnchantments, listDeleted);
+    appendIds(ids, mBodyParts, listDeleted);
+    appendIds(ids, mSoundGens, listDeleted);
+    appendIds(ids, mMagicEffects, listDeleted);
+    appendIds(ids, mReferenceables, listDeleted);
+
+    std::sort(ids.begin(), ids.end());
 
     return ids;
 }
@@ -1331,14 +1364,8 @@ void CSMWorld::Data::assetsChanged()
     mVFS.get()->reset();
     VFS::registerArchives(mVFS.get(), Files::Collections(mDataPaths, !mFsStrict), mArchives, true);
 
-    const UniversalId assetTableIds[] = {
-        UniversalId::Type_Meshes,
-        UniversalId::Type_Icons,
-        UniversalId::Type_Musics,
-        UniversalId::Type_SoundsRes,
-        UniversalId::Type_Textures,
-        UniversalId::Type_Videos
-    };
+    const UniversalId assetTableIds[] = { UniversalId::Type_Meshes, UniversalId::Type_Icons, UniversalId::Type_Musics,
+        UniversalId::Type_SoundsRes, UniversalId::Type_Textures, UniversalId::Type_Videos };
 
     size_t numAssetTables = sizeof(assetTableIds) / sizeof(UniversalId);
 
@@ -1363,13 +1390,13 @@ void CSMWorld::Data::assetsChanged()
     emit assetTablesChanged();
 }
 
-void CSMWorld::Data::dataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight)
+void CSMWorld::Data::dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
-    if (topLeft.column()<=0)
+    if (topLeft.column() <= 0)
         emit idListChanged();
 }
 
-void CSMWorld::Data::rowsChanged (const QModelIndex& parent, int start, int end)
+void CSMWorld::Data::rowsChanged(const QModelIndex& parent, int start, int end)
 {
     emit idListChanged();
 }
diff --git a/apps/opencs/model/world/data.hpp b/apps/opencs/model/world/data.hpp
index 112ac1b239..ce6b4df053 100644
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@@ -4,28 +4,28 @@
 #include <map>
 #include <vector>
 
-#include <QObject>
 #include <QModelIndex>
+#include <QObject>
 
-#include <components/esm3/loadglob.hpp>
-#include <components/esm3/loadgmst.hpp>
-#include <components/esm3/loadskil.hpp>
+#include <components/esm3/debugprofile.hpp>
+#include <components/esm3/filter.hpp>
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadbsgn.hpp>
 #include <components/esm3/loadclas.hpp>
+#include <components/esm3/loaddial.hpp>
+#include <components/esm3/loadench.hpp>
 #include <components/esm3/loadfact.hpp>
+#include <components/esm3/loadglob.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadrace.hpp>
-#include <components/esm3/loadsoun.hpp>
-#include <components/esm3/loadscpt.hpp>
 #include <components/esm3/loadregn.hpp>
-#include <components/esm3/loadbsgn.hpp>
-#include <components/esm3/loadspel.hpp>
-#include <components/esm3/loaddial.hpp>
-#include <components/esm3/loadench.hpp>
-#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadscpt.hpp>
+#include <components/esm3/loadskil.hpp>
 #include <components/esm3/loadsndg.hpp>
-#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadsoun.hpp>
+#include <components/esm3/loadspel.hpp>
 #include <components/esm3/loadsscr.hpp>
-#include <components/esm3/debugprofile.hpp>
-#include <components/esm3/filter.hpp>
 
 #include <components/resource/resourcesystem.hpp>
 
@@ -33,19 +33,19 @@
 #include <components/to_utf8/to_utf8.hpp>
 
 #include "actoradapter.hpp"
-#include "idcollection.hpp"
-#include "nestedidcollection.hpp"
-#include "universalid.hpp"
 #include "cell.hpp"
+#include "idcollection.hpp"
+#include "infocollection.hpp"
 #include "land.hpp"
 #include "landtexture.hpp"
-#include "refidcollection.hpp"
-#include "refcollection.hpp"
-#include "infocollection.hpp"
+#include "metadata.hpp"
+#include "nestedidcollection.hpp"
 #include "nestedinfocollection.hpp"
 #include "pathgrid.hpp"
+#include "refcollection.hpp"
+#include "refidcollection.hpp"
 #include "resourcesmanager.hpp"
-#include "metadata.hpp"
+#include "universalid.hpp"
 #ifndef Q_MOC_RUN
 #include "subcellcollection.hpp"
 #endif
@@ -75,254 +75,251 @@ namespace CSMWorld
 
     class Data : public QObject
     {
-            Q_OBJECT
-
-            ToUTF8::Utf8Encoder mEncoder;
-            IdCollection<ESM::Global> mGlobals;
-            IdCollection<ESM::GameSetting> mGmsts;
-            IdCollection<ESM::Skill> mSkills;
-            IdCollection<ESM::Class> mClasses;
-            NestedIdCollection<ESM::Faction> mFactions;
-            NestedIdCollection<ESM::Race> mRaces;
-            IdCollection<ESM::Sound> mSounds;
-            IdCollection<ESM::Script> mScripts;
-            NestedIdCollection<ESM::Region> mRegions;
-            NestedIdCollection<ESM::BirthSign> mBirthsigns;
-            NestedIdCollection<ESM::Spell> mSpells;
-            IdCollection<ESM::Dialogue> mTopics;
-            IdCollection<ESM::Dialogue> mJournals;
-            NestedIdCollection<ESM::Enchantment> mEnchantments;
-            IdCollection<ESM::BodyPart> mBodyParts;
-            IdCollection<ESM::MagicEffect> mMagicEffects;
-            IdCollection<ESM::DebugProfile> mDebugProfiles;
-            IdCollection<ESM::SoundGenerator> mSoundGens;
-            IdCollection<ESM::StartScript> mStartScripts;
-            NestedInfoCollection mTopicInfos;
-            InfoCollection mJournalInfos;
-            NestedIdCollection<Cell> mCells;
-            SubCellCollection<Pathgrid> mPathgrids;
-            IdCollection<LandTexture> mLandTextures;
-            IdCollection<Land> mLand;
-            RefIdCollection mReferenceables;
-            RefCollection mRefs;
-            IdCollection<ESM::Filter> mFilters;
-            Collection<MetaData> mMetaData;
-            std::unique_ptr<ActorAdapter> mActorAdapter;
-            std::vector<QAbstractItemModel *> mModels;
-            std::map<UniversalId::Type, QAbstractItemModel *> mModelIndex;
-            ESM::ESMReader *mReader;
-            const ESM::Dialogue *mDialogue; // last loaded dialogue
-            bool mBase;
-            bool mProject;
-            std::map<std::string, std::map<unsigned int, unsigned int> > mRefLoadCache;
-            int mReaderIndex;
+        Q_OBJECT
 
-            bool mFsStrict;
-            Files::PathContainer mDataPaths;
-            std::vector<std::string> mArchives;
-            std::unique_ptr<VFS::Manager> mVFS;
-            ResourcesManager mResourcesManager;
-            std::shared_ptr<Resource::ResourceSystem> mResourceSystem;
+        ToUTF8::Utf8Encoder mEncoder;
+        IdCollection<ESM::Global> mGlobals;
+        IdCollection<ESM::GameSetting> mGmsts;
+        IdCollection<ESM::Skill> mSkills;
+        IdCollection<ESM::Class> mClasses;
+        NestedIdCollection<ESM::Faction> mFactions;
+        NestedIdCollection<ESM::Race> mRaces;
+        IdCollection<ESM::Sound> mSounds;
+        IdCollection<ESM::Script> mScripts;
+        NestedIdCollection<ESM::Region> mRegions;
+        NestedIdCollection<ESM::BirthSign> mBirthsigns;
+        NestedIdCollection<ESM::Spell> mSpells;
+        IdCollection<ESM::Dialogue> mTopics;
+        IdCollection<ESM::Dialogue> mJournals;
+        NestedIdCollection<ESM::Enchantment> mEnchantments;
+        IdCollection<ESM::BodyPart> mBodyParts;
+        IdCollection<ESM::MagicEffect> mMagicEffects;
+        IdCollection<ESM::DebugProfile> mDebugProfiles;
+        IdCollection<ESM::SoundGenerator> mSoundGens;
+        IdCollection<ESM::StartScript> mStartScripts;
+        NestedInfoCollection mTopicInfos;
+        InfoCollection mJournalInfos;
+        NestedIdCollection<Cell> mCells;
+        SubCellCollection<Pathgrid> mPathgrids;
+        IdCollection<LandTexture> mLandTextures;
+        IdCollection<Land> mLand;
+        RefIdCollection mReferenceables;
+        RefCollection mRefs;
+        IdCollection<ESM::Filter> mFilters;
+        Collection<MetaData> mMetaData;
+        std::unique_ptr<ActorAdapter> mActorAdapter;
+        std::vector<QAbstractItemModel*> mModels;
+        std::map<UniversalId::Type, QAbstractItemModel*> mModelIndex;
+        ESM::ESMReader* mReader;
+        const ESM::Dialogue* mDialogue; // last loaded dialogue
+        bool mBase;
+        bool mProject;
+        std::map<std::string, std::map<unsigned int, unsigned int>> mRefLoadCache;
+        int mReaderIndex;
 
-            std::vector<std::shared_ptr<ESM::ESMReader> > mReaders;
+        bool mFsStrict;
+        Files::PathContainer mDataPaths;
+        std::vector<std::string> mArchives;
+        std::unique_ptr<VFS::Manager> mVFS;
+        ResourcesManager mResourcesManager;
+        std::shared_ptr<Resource::ResourceSystem> mResourceSystem;
 
-            // not implemented
-            Data (const Data&);
-            Data& operator= (const Data&);
+        std::vector<std::shared_ptr<ESM::ESMReader>> mReaders;
 
-            void addModel (QAbstractItemModel *model, UniversalId::Type type,
-                bool update = true);
+        // not implemented
+        Data(const Data&);
+        Data& operator=(const Data&);
 
-            static void appendIds (std::vector<std::string>& ids, const CollectionBase& collection,
-                bool listDeleted);
-            ///< Append all IDs from collection to \a ids.
+        void addModel(QAbstractItemModel* model, UniversalId::Type type, bool update = true);
 
-            static int count (RecordBase::State state, const CollectionBase& collection);
+        static void appendIds(std::vector<std::string>& ids, const CollectionBase& collection, bool listDeleted);
+        ///< Append all IDs from collection to \a ids.
 
-            void loadFallbackEntries();
+        static int count(RecordBase::State state, const CollectionBase& collection);
 
-        public:
+        void loadFallbackEntries();
 
-            Data (ToUTF8::FromType encoding, bool fsStrict, const Files::PathContainer& dataPaths,
-                const std::vector<std::string>& archives, const std::filesystem::path& resDir);
+    public:
+        Data(ToUTF8::FromType encoding, bool fsStrict, const Files::PathContainer& dataPaths,
+            const std::vector<std::string>& archives, const std::filesystem::path& resDir);
 
-            ~Data() override;
+        ~Data() override;
 
-            const VFS::Manager* getVFS() const;
+        const VFS::Manager* getVFS() const;
 
-            std::shared_ptr<Resource::ResourceSystem> getResourceSystem();
+        std::shared_ptr<Resource::ResourceSystem> getResourceSystem();
 
-            std::shared_ptr<const Resource::ResourceSystem> getResourceSystem() const;
+        std::shared_ptr<const Resource::ResourceSystem> getResourceSystem() const;
 
-            const IdCollection<ESM::Global>& getGlobals() const;
+        const IdCollection<ESM::Global>& getGlobals() const;
 
-            IdCollection<ESM::Global>& getGlobals();
+        IdCollection<ESM::Global>& getGlobals();
 
-            const IdCollection<ESM::GameSetting>& getGmsts() const;
+        const IdCollection<ESM::GameSetting>& getGmsts() const;
 
-            IdCollection<ESM::GameSetting>& getGmsts();
+        IdCollection<ESM::GameSetting>& getGmsts();
 
-            const IdCollection<ESM::Skill>& getSkills() const;
+        const IdCollection<ESM::Skill>& getSkills() const;
 
-            IdCollection<ESM::Skill>& getSkills();
+        IdCollection<ESM::Skill>& getSkills();
 
-            const IdCollection<ESM::Class>& getClasses() const;
+        const IdCollection<ESM::Class>& getClasses() const;
 
-            IdCollection<ESM::Class>& getClasses();
+        IdCollection<ESM::Class>& getClasses();
 
-            const IdCollection<ESM::Faction>& getFactions() const;
+        const IdCollection<ESM::Faction>& getFactions() const;
 
-            IdCollection<ESM::Faction>& getFactions();
+        IdCollection<ESM::Faction>& getFactions();
 
-            const IdCollection<ESM::Race>& getRaces() const;
+        const IdCollection<ESM::Race>& getRaces() const;
 
-            IdCollection<ESM::Race>& getRaces();
+        IdCollection<ESM::Race>& getRaces();
 
-            const IdCollection<ESM::Sound>& getSounds() const;
+        const IdCollection<ESM::Sound>& getSounds() const;
 
-            IdCollection<ESM::Sound>& getSounds();
+        IdCollection<ESM::Sound>& getSounds();
 
-            const IdCollection<ESM::Script>& getScripts() const;
+        const IdCollection<ESM::Script>& getScripts() const;
 
-            IdCollection<ESM::Script>& getScripts();
+        IdCollection<ESM::Script>& getScripts();
 
-            const IdCollection<ESM::Region>& getRegions() const;
+        const IdCollection<ESM::Region>& getRegions() const;
 
-            IdCollection<ESM::Region>& getRegions();
+        IdCollection<ESM::Region>& getRegions();
 
-            const IdCollection<ESM::BirthSign>& getBirthsigns() const;
+        const IdCollection<ESM::BirthSign>& getBirthsigns() const;
 
-            IdCollection<ESM::BirthSign>& getBirthsigns();
+        IdCollection<ESM::BirthSign>& getBirthsigns();
 
-            const IdCollection<ESM::Spell>& getSpells() const;
+        const IdCollection<ESM::Spell>& getSpells() const;
 
-            IdCollection<ESM::Spell>& getSpells();
+        IdCollection<ESM::Spell>& getSpells();
 
-            const IdCollection<ESM::Dialogue>& getTopics() const;
+        const IdCollection<ESM::Dialogue>& getTopics() const;
 
-            IdCollection<ESM::Dialogue>& getTopics();
+        IdCollection<ESM::Dialogue>& getTopics();
 
-            const IdCollection<ESM::Dialogue>& getJournals() const;
+        const IdCollection<ESM::Dialogue>& getJournals() const;
 
-            IdCollection<ESM::Dialogue>& getJournals();
+        IdCollection<ESM::Dialogue>& getJournals();
 
-            const InfoCollection& getTopicInfos() const;
+        const InfoCollection& getTopicInfos() const;
 
-            InfoCollection& getTopicInfos();
+        InfoCollection& getTopicInfos();
 
-            const InfoCollection& getJournalInfos() const;
+        const InfoCollection& getJournalInfos() const;
 
-            InfoCollection& getJournalInfos();
+        InfoCollection& getJournalInfos();
 
-            const IdCollection<Cell>& getCells() const;
+        const IdCollection<Cell>& getCells() const;
 
-            IdCollection<Cell>& getCells();
+        IdCollection<Cell>& getCells();
 
-            const RefIdCollection& getReferenceables() const;
+        const RefIdCollection& getReferenceables() const;
 
-            RefIdCollection& getReferenceables();
+        RefIdCollection& getReferenceables();
 
-            const RefCollection& getReferences() const;
+        const RefCollection& getReferences() const;
 
-            RefCollection& getReferences();
+        RefCollection& getReferences();
 
-            const IdCollection<ESM::Filter>& getFilters() const;
+        const IdCollection<ESM::Filter>& getFilters() const;
 
-            IdCollection<ESM::Filter>& getFilters();
+        IdCollection<ESM::Filter>& getFilters();
 
-            const IdCollection<ESM::Enchantment>& getEnchantments() const;
+        const IdCollection<ESM::Enchantment>& getEnchantments() const;
 
-            IdCollection<ESM::Enchantment>& getEnchantments();
+        IdCollection<ESM::Enchantment>& getEnchantments();
 
-            const IdCollection<ESM::BodyPart>& getBodyParts() const;
+        const IdCollection<ESM::BodyPart>& getBodyParts() const;
 
-            IdCollection<ESM::BodyPart>& getBodyParts();
+        IdCollection<ESM::BodyPart>& getBodyParts();
 
-            const IdCollection<ESM::DebugProfile>& getDebugProfiles() const;
+        const IdCollection<ESM::DebugProfile>& getDebugProfiles() const;
 
-            IdCollection<ESM::DebugProfile>& getDebugProfiles();
+        IdCollection<ESM::DebugProfile>& getDebugProfiles();
 
-            const IdCollection<CSMWorld::Land>& getLand() const;
+        const IdCollection<CSMWorld::Land>& getLand() const;
 
-            IdCollection<CSMWorld::Land>& getLand();
+        IdCollection<CSMWorld::Land>& getLand();
 
-            const IdCollection<CSMWorld::LandTexture>& getLandTextures() const;
+        const IdCollection<CSMWorld::LandTexture>& getLandTextures() const;
 
-            IdCollection<CSMWorld::LandTexture>& getLandTextures();
+        IdCollection<CSMWorld::LandTexture>& getLandTextures();
 
-            const IdCollection<ESM::SoundGenerator>& getSoundGens() const;
+        const IdCollection<ESM::SoundGenerator>& getSoundGens() const;
 
-            IdCollection<ESM::SoundGenerator>& getSoundGens();
+        IdCollection<ESM::SoundGenerator>& getSoundGens();
 
-            const IdCollection<ESM::MagicEffect>& getMagicEffects() const;
+        const IdCollection<ESM::MagicEffect>& getMagicEffects() const;
 
-            IdCollection<ESM::MagicEffect>& getMagicEffects();
+        IdCollection<ESM::MagicEffect>& getMagicEffects();
 
-            const SubCellCollection<Pathgrid>& getPathgrids() const;
+        const SubCellCollection<Pathgrid>& getPathgrids() const;
 
-            SubCellCollection<Pathgrid>& getPathgrids();
+        SubCellCollection<Pathgrid>& getPathgrids();
 
-            const IdCollection<ESM::StartScript>& getStartScripts() const;
+        const IdCollection<ESM::StartScript>& getStartScripts() const;
 
-            IdCollection<ESM::StartScript>& getStartScripts();
+        IdCollection<ESM::StartScript>& getStartScripts();
 
-            /// Throws an exception, if \a id does not match a resources list.
-            const Resources& getResources (const UniversalId& id) const;
+        /// Throws an exception, if \a id does not match a resources list.
+        const Resources& getResources(const UniversalId& id) const;
 
-            const MetaData& getMetaData() const;
+        const MetaData& getMetaData() const;
 
-            void setMetaData (const MetaData& metaData);
+        void setMetaData(const MetaData& metaData);
 
-            QAbstractItemModel *getTableModel (const UniversalId& id);
-            ///< If no table model is available for \a id, an exception is thrown.
-            ///
-            /// \note The returned table may either be the model for the ID itself or the model that
-            /// contains the record specified by the ID.
+        QAbstractItemModel* getTableModel(const UniversalId& id);
+        ///< If no table model is available for \a id, an exception is thrown.
+        ///
+        /// \note The returned table may either be the model for the ID itself or the model that
+        /// contains the record specified by the ID.
 
-            const ActorAdapter* getActorAdapter() const;
+        const ActorAdapter* getActorAdapter() const;
 
-            ActorAdapter* getActorAdapter();
+        ActorAdapter* getActorAdapter();
 
-            void merge();
-            ///< Merge modified into base.
+        void merge();
+        ///< Merge modified into base.
 
-            int getTotalRecords (const std::vector<std::filesystem::path>& files); // for better loading bar
+        int getTotalRecords(const std::vector<std::filesystem::path>& files); // for better loading bar
 
-            int startLoading (const std::filesystem::path& path, bool base, bool project);
-            ///< Begin merging content of a file into base or modified.
-            ///
-            /// \param project load project file instead of content file
-            ///
-            ///< \return estimated number of records
+        int startLoading(const std::filesystem::path& path, bool base, bool project);
+        ///< Begin merging content of a file into base or modified.
+        ///
+        /// \param project load project file instead of content file
+        ///
+        ///< \return estimated number of records
 
-            bool continueLoading (CSMDoc::Messages& messages);
-            ///< \return Finished?
+        bool continueLoading(CSMDoc::Messages& messages);
+        ///< \return Finished?
 
-            bool hasId (const std::string& id) const;
+        bool hasId(const std::string& id) const;
 
-            std::vector<std::string> getIds (bool listDeleted = true) const;
-            ///< Return a sorted collection of all IDs that are not internal to the editor.
-            ///
-            /// \param listDeleted include deleted record in the list
+        std::vector<std::string> getIds(bool listDeleted = true) const;
+        ///< Return a sorted collection of all IDs that are not internal to the editor.
+        ///
+        /// \param listDeleted include deleted record in the list
 
-            int count (RecordBase::State state) const;
-            ///< Return number of top-level records with the given \a state.
+        int count(RecordBase::State state) const;
+        ///< Return number of top-level records with the given \a state.
 
-        signals:
+    signals:
 
-            void idListChanged();
+        void idListChanged();
 
-            void assetTablesChanged();
+        void assetTablesChanged();
 
-        public slots:
+    public slots:
 
-            void assetsChanged();
+        void assetsChanged();
 
-        private slots:
+    private slots:
 
-            void dataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
+        void dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
-            void rowsChanged (const QModelIndex& parent, int start, int end);
+        void rowsChanged(const QModelIndex& parent, int start, int end);
     };
 }
 
diff --git a/apps/opencs/model/world/defaultgmsts.cpp b/apps/opencs/model/world/defaultgmsts.cpp
index 98ea9ebc1d..2c9a8a66e0 100644
--- a/apps/opencs/model/world/defaultgmsts.cpp
+++ b/apps/opencs/model/world/defaultgmsts.cpp
@@ -8,8 +8,7 @@ const float FEps = std::numeric_limits<float>::epsilon();
 const int IMax = std::numeric_limits<int>::max();
 const int IMin = std::numeric_limits<int>::min();
 
-const char* CSMWorld::DefaultGmsts::Floats[CSMWorld::DefaultGmsts::FloatCount] =
-{
+const char* CSMWorld::DefaultGmsts::Floats[CSMWorld::DefaultGmsts::FloatCount] = {
     "fAIFleeFleeMult",
     "fAIFleeHealthMult",
     "fAIMagicSpellMult",
@@ -270,8 +269,7 @@ const char* CSMWorld::DefaultGmsts::Floats[CSMWorld::DefaultGmsts::FloatCount] =
     "fWortChanceValue",
 };
 
-const char * CSMWorld::DefaultGmsts::Ints[CSMWorld::DefaultGmsts::IntCount] =
-{
+const char* CSMWorld::DefaultGmsts::Ints[CSMWorld::DefaultGmsts::IntCount] = {
     "i1stPersonSneakDelta",
     "iAlarmAttack",
     "iAlarmKilling",
@@ -363,8 +361,7 @@ const char * CSMWorld::DefaultGmsts::Ints[CSMWorld::DefaultGmsts::IntCount] =
     "iWereWolfLevelToAttack",
 };
 
-const char * CSMWorld::DefaultGmsts::Strings[CSMWorld::DefaultGmsts::StringCount] =
-{
+const char* CSMWorld::DefaultGmsts::Strings[CSMWorld::DefaultGmsts::StringCount] = {
     "s3dAudio",
     "s3dHardware",
     "s3dSoftware",
@@ -1541,8 +1538,7 @@ const char * CSMWorld::DefaultGmsts::Strings[CSMWorld::DefaultGmsts::StringCount
     "sYourGold",
 };
 
-const char * CSMWorld::DefaultGmsts::OptionalFloats[CSMWorld::DefaultGmsts::OptionalFloatCount] =
-{
+const char* CSMWorld::DefaultGmsts::OptionalFloats[CSMWorld::DefaultGmsts::OptionalFloatCount] = {
     "fCombatDistanceWerewolfMod",
     "fFleeDistance",
     "fWereWolfAcrobatics",
@@ -1587,16 +1583,14 @@ const char * CSMWorld::DefaultGmsts::OptionalFloats[CSMWorld::DefaultGmsts::Opti
     "fWereWolfWillPower",
 };
 
-const char * CSMWorld::DefaultGmsts::OptionalInts[CSMWorld::DefaultGmsts::OptionalIntCount] =
-{
+const char* CSMWorld::DefaultGmsts::OptionalInts[CSMWorld::DefaultGmsts::OptionalIntCount] = {
     "iWereWolfBounty",
     "iWereWolfFightMod",
     "iWereWolfFleeMod",
     "iWereWolfLevelToAttack",
 };
 
-const char * CSMWorld::DefaultGmsts::OptionalStrings[CSMWorld::DefaultGmsts::OptionalStringCount] =
-{
+const char* CSMWorld::DefaultGmsts::OptionalStrings[CSMWorld::DefaultGmsts::OptionalStringCount] = {
     "sCompanionShare",
     "sCompanionWarningButtonOne",
     "sCompanionWarningButtonTwo",
@@ -1625,712 +1619,708 @@ const char * CSMWorld::DefaultGmsts::OptionalStrings[CSMWorld::DefaultGmsts::Opt
     "sWerewolfRestMessage",
 };
 
-const float CSMWorld::DefaultGmsts::FloatsDefaultValues[CSMWorld::DefaultGmsts::FloatCount] =
-{
-    0.3f,    // fAIFleeFleeMult
-    7.0f,    // fAIFleeHealthMult
-    3.0f,    // fAIMagicSpellMult
-    1.0f,    // fAIMeleeArmorMult
-    1.0f,    // fAIMeleeSummWeaponMult
-    2.0f,    // fAIMeleeWeaponMult
-    5.0f,    // fAIRangeMagicSpellMult
-    5.0f,    // fAIRangeMeleeWeaponMult
+const float CSMWorld::DefaultGmsts::FloatsDefaultValues[CSMWorld::DefaultGmsts::FloatCount] = {
+    0.3f, // fAIFleeFleeMult
+    7.0f, // fAIFleeHealthMult
+    3.0f, // fAIMagicSpellMult
+    1.0f, // fAIMeleeArmorMult
+    1.0f, // fAIMeleeSummWeaponMult
+    2.0f, // fAIMeleeWeaponMult
+    5.0f, // fAIRangeMagicSpellMult
+    5.0f, // fAIRangeMeleeWeaponMult
     2000.0f, // fAlarmRadius
-    1.0f,    // fAthleticsRunBonus
-    40.0f,   // fAudioDefaultMaxDistance
-    5.0f,    // fAudioDefaultMinDistance
-    50.0f,   // fAudioMaxDistanceMult
-    20.0f,   // fAudioMinDistanceMult
-    60.0f,   // fAudioVoiceDefaultMaxDistance
-    10.0f,   // fAudioVoiceDefaultMinDistance
-    50.0f,   // fAutoPCSpellChance
-    80.0f,   // fAutoSpellChance
-    50.0f,   // fBargainOfferBase
-    -4.0f,   // fBargainOfferMulti
-    24.0f,   // fBarterGoldResetDelay
-    1.75f,   // fBaseRunMultiplier
-    1.25f,   // fBlockStillBonus
-    150.0f,  // fBribe1000Mod
-    75.0f,   // fBribe100Mod
-    35.0f,   // fBribe10Mod
-    60.0f,   // fCombatAngleXY
-    60.0f,   // fCombatAngleZ
-    0.25f,   // fCombatArmorMinMult
-    -90.0f,  // fCombatBlockLeftAngle
-    30.0f,   // fCombatBlockRightAngle
-    4.0f,    // fCombatCriticalStrikeMult
-    0.1f,    // fCombatDelayCreature
-    0.1f,    // fCombatDelayNPC
-    128.0f,  // fCombatDistance
-    0.3f,    // fCombatDistanceWerewolfMod
-    30.0f,   // fCombatForceSideAngle
-    0.2f,    // fCombatInvisoMult
-    1.5f,    // fCombatKODamageMult
-    45.0f,   // fCombatTorsoSideAngle
-    0.3f,    // fCombatTorsoStartPercent
-    0.8f,    // fCombatTorsoStopPercent
-    15.0f,   // fConstantEffectMult
-    72.0f,   // fCorpseClearDelay
-    72.0f,   // fCorpseRespawnDelay
-    0.5f,    // fCrimeGoldDiscountMult
-    0.9f,    // fCrimeGoldTurnInMult
-    1.0f,    // fCrimeStealing
-    0.5f,    // fDamageStrengthBase
-    0.1f,    // fDamageStrengthMult
-    5.0f,    // fDifficultyMult
-    2.5f,    // fDiseaseXferChance
-    -10.0f,  // fDispAttacking
-    -1.0f,   // fDispBargainFailMod
-    1.0f,    // fDispBargainSuccessMod
-    0.0f,    // fDispCrimeMod
-    -10.0f,  // fDispDiseaseMod
-    3.0f,    // fDispFactionMod
-    1.0f,    // fDispFactionRankBase
-    0.5f,    // fDispFactionRankMult
-    1.0f,    // fDispositionMod
-    50.0f,   // fDispPersonalityBase
-    0.5f,    // fDispPersonalityMult
-    -25.0f,  // fDispPickPocketMod
-    5.0f,    // fDispRaceMod
-    -0.5f,   // fDispStealing
-    -5.0f,   // fDispWeaponDrawn
-    0.5f,    // fEffectCostMult
-    0.1f,    // fElementalShieldMult
-    3.0f,    // fEnchantmentChanceMult
-    0.5f,    // fEnchantmentConstantChanceMult
-    100.0f,  // fEnchantmentConstantDurationMult
-    0.1f,    // fEnchantmentMult
+    1.0f, // fAthleticsRunBonus
+    40.0f, // fAudioDefaultMaxDistance
+    5.0f, // fAudioDefaultMinDistance
+    50.0f, // fAudioMaxDistanceMult
+    20.0f, // fAudioMinDistanceMult
+    60.0f, // fAudioVoiceDefaultMaxDistance
+    10.0f, // fAudioVoiceDefaultMinDistance
+    50.0f, // fAutoPCSpellChance
+    80.0f, // fAutoSpellChance
+    50.0f, // fBargainOfferBase
+    -4.0f, // fBargainOfferMulti
+    24.0f, // fBarterGoldResetDelay
+    1.75f, // fBaseRunMultiplier
+    1.25f, // fBlockStillBonus
+    150.0f, // fBribe1000Mod
+    75.0f, // fBribe100Mod
+    35.0f, // fBribe10Mod
+    60.0f, // fCombatAngleXY
+    60.0f, // fCombatAngleZ
+    0.25f, // fCombatArmorMinMult
+    -90.0f, // fCombatBlockLeftAngle
+    30.0f, // fCombatBlockRightAngle
+    4.0f, // fCombatCriticalStrikeMult
+    0.1f, // fCombatDelayCreature
+    0.1f, // fCombatDelayNPC
+    128.0f, // fCombatDistance
+    0.3f, // fCombatDistanceWerewolfMod
+    30.0f, // fCombatForceSideAngle
+    0.2f, // fCombatInvisoMult
+    1.5f, // fCombatKODamageMult
+    45.0f, // fCombatTorsoSideAngle
+    0.3f, // fCombatTorsoStartPercent
+    0.8f, // fCombatTorsoStopPercent
+    15.0f, // fConstantEffectMult
+    72.0f, // fCorpseClearDelay
+    72.0f, // fCorpseRespawnDelay
+    0.5f, // fCrimeGoldDiscountMult
+    0.9f, // fCrimeGoldTurnInMult
+    1.0f, // fCrimeStealing
+    0.5f, // fDamageStrengthBase
+    0.1f, // fDamageStrengthMult
+    5.0f, // fDifficultyMult
+    2.5f, // fDiseaseXferChance
+    -10.0f, // fDispAttacking
+    -1.0f, // fDispBargainFailMod
+    1.0f, // fDispBargainSuccessMod
+    0.0f, // fDispCrimeMod
+    -10.0f, // fDispDiseaseMod
+    3.0f, // fDispFactionMod
+    1.0f, // fDispFactionRankBase
+    0.5f, // fDispFactionRankMult
+    1.0f, // fDispositionMod
+    50.0f, // fDispPersonalityBase
+    0.5f, // fDispPersonalityMult
+    -25.0f, // fDispPickPocketMod
+    5.0f, // fDispRaceMod
+    -0.5f, // fDispStealing
+    -5.0f, // fDispWeaponDrawn
+    0.5f, // fEffectCostMult
+    0.1f, // fElementalShieldMult
+    3.0f, // fEnchantmentChanceMult
+    0.5f, // fEnchantmentConstantChanceMult
+    100.0f, // fEnchantmentConstantDurationMult
+    0.1f, // fEnchantmentMult
     1000.0f, // fEnchantmentValueMult
-    0.3f,    // fEncumberedMoveEffect
-    5.0f,    // fEncumbranceStrMult
-    0.04f,   // fEndFatigueMult
-    0.25f,   // fFallAcroBase
-    0.01f,   // fFallAcroMult
-    400.0f,  // fFallDamageDistanceMin
-    0.0f,    // fFallDistanceBase
-    0.07f,   // fFallDistanceMult
-    2.0f,    // fFatigueAttackBase
-    0.0f,    // fFatigueAttackMult
-    1.25f,   // fFatigueBase
-    4.0f,    // fFatigueBlockBase
-    0.0f,    // fFatigueBlockMult
-    5.0f,    // fFatigueJumpBase
-    0.0f,    // fFatigueJumpMult
-    0.5f,    // fFatigueMult
-    2.5f,    // fFatigueReturnBase
-    0.02f,   // fFatigueReturnMult
-    5.0f,    // fFatigueRunBase
-    2.0f,    // fFatigueRunMult
-    1.5f,    // fFatigueSneakBase
-    1.5f,    // fFatigueSneakMult
-    0.0f,    // fFatigueSpellBase
-    0.0f,    // fFatigueSpellCostMult
-    0.0f,    // fFatigueSpellMult
-    7.0f,    // fFatigueSwimRunBase
-    0.0f,    // fFatigueSwimRunMult
-    2.5f,    // fFatigueSwimWalkBase
-    0.0f,    // fFatigueSwimWalkMult
-    0.2f,    // fFightDispMult
-    0.005f,  // fFightDistanceMultiplier
-    50.0f,   // fFightStealing
+    0.3f, // fEncumberedMoveEffect
+    5.0f, // fEncumbranceStrMult
+    0.04f, // fEndFatigueMult
+    0.25f, // fFallAcroBase
+    0.01f, // fFallAcroMult
+    400.0f, // fFallDamageDistanceMin
+    0.0f, // fFallDistanceBase
+    0.07f, // fFallDistanceMult
+    2.0f, // fFatigueAttackBase
+    0.0f, // fFatigueAttackMult
+    1.25f, // fFatigueBase
+    4.0f, // fFatigueBlockBase
+    0.0f, // fFatigueBlockMult
+    5.0f, // fFatigueJumpBase
+    0.0f, // fFatigueJumpMult
+    0.5f, // fFatigueMult
+    2.5f, // fFatigueReturnBase
+    0.02f, // fFatigueReturnMult
+    5.0f, // fFatigueRunBase
+    2.0f, // fFatigueRunMult
+    1.5f, // fFatigueSneakBase
+    1.5f, // fFatigueSneakMult
+    0.0f, // fFatigueSpellBase
+    0.0f, // fFatigueSpellCostMult
+    0.0f, // fFatigueSpellMult
+    7.0f, // fFatigueSwimRunBase
+    0.0f, // fFatigueSwimRunMult
+    2.5f, // fFatigueSwimWalkBase
+    0.0f, // fFatigueSwimWalkMult
+    0.2f, // fFightDispMult
+    0.005f, // fFightDistanceMultiplier
+    50.0f, // fFightStealing
     3000.0f, // fFleeDistance
-    512.0f,  // fGreetDistanceReset
-    0.1f,    // fHandtoHandHealthPer
-    1.0f,    // fHandToHandReach
-    0.5f,    // fHoldBreathEndMult
-    20.0f,   // fHoldBreathTime
-    0.75f,   // fIdleChanceMultiplier
-    1.0f,    // fIngredientMult
-    0.5f,    // fInteriorHeadTrackMult
-    128.0f,  // fJumpAcrobaticsBase
-    4.0f,    // fJumpAcroMultiplier
-    0.5f,    // fJumpEncumbranceBase
-    1.0f,    // fJumpEncumbranceMultiplier
-    0.5f,    // fJumpMoveBase
-    0.5f,    // fJumpMoveMult
-    1.0f,    // fJumpRunMultiplier
-    0.5f,    // fKnockDownMult
-    5.0f,    // fLevelMod
-    0.1f,    // fLevelUpHealthEndMult
-    0.6f,    // fLightMaxMod
-    10.0f,   // fLuckMod
-    10.0f,   // fMagesGuildTravel
-    1.5f,    // fMagicCreatureCastDelay
+    512.0f, // fGreetDistanceReset
+    0.1f, // fHandtoHandHealthPer
+    1.0f, // fHandToHandReach
+    0.5f, // fHoldBreathEndMult
+    20.0f, // fHoldBreathTime
+    0.75f, // fIdleChanceMultiplier
+    1.0f, // fIngredientMult
+    0.5f, // fInteriorHeadTrackMult
+    128.0f, // fJumpAcrobaticsBase
+    4.0f, // fJumpAcroMultiplier
+    0.5f, // fJumpEncumbranceBase
+    1.0f, // fJumpEncumbranceMultiplier
+    0.5f, // fJumpMoveBase
+    0.5f, // fJumpMoveMult
+    1.0f, // fJumpRunMultiplier
+    0.5f, // fKnockDownMult
+    5.0f, // fLevelMod
+    0.1f, // fLevelUpHealthEndMult
+    0.6f, // fLightMaxMod
+    10.0f, // fLuckMod
+    10.0f, // fMagesGuildTravel
+    1.5f, // fMagicCreatureCastDelay
     0.0167f, // fMagicDetectRefreshRate
-    1.0f,    // fMagicItemConstantMult
-    1.0f,    // fMagicItemCostMult
-    1.0f,    // fMagicItemOnceMult
-    1.0f,    // fMagicItemPriceMult
-    0.05f,   // fMagicItemRechargePerSecond
-    1.0f,    // fMagicItemStrikeMult
-    1.0f,    // fMagicItemUsedMult
-    3.0f,    // fMagicStartIconBlink
-    0.5f,    // fMagicSunBlockedMult
-    0.75f,   // fMajorSkillBonus
-    300.0f,  // fMaxFlySpeed
-    0.5f,    // fMaxHandToHandMult
-    400.0f,  // fMaxHeadTrackDistance
-    200.0f,  // fMaxWalkSpeed
-    300.0f,  // fMaxWalkSpeedCreature
-    0.9f,    // fMedMaxMod
-    0.1f,    // fMessageTimePerChar
-    5.0f,    // fMinFlySpeed
-    0.1f,    // fMinHandToHandMult
-    1.0f,    // fMinorSkillBonus
-    100.0f,  // fMinWalkSpeed
-    5.0f,    // fMinWalkSpeedCreature
-    1.25f,   // fMiscSkillBonus
-    2.0f,    // fNPCbaseMagickaMult
-    0.5f,    // fNPCHealthBarFade
-    3.0f,    // fNPCHealthBarTime
-    1.0f,    // fPCbaseMagickaMult
-    0.3f,    // fPerDieRollMult
-    5.0f,    // fPersonalityMod
-    1.0f,    // fPerTempMult
-    -1.0f,   // fPickLockMult
-    0.3f,    // fPickPocketMod
-    20.0f,   // fPotionMinUsefulDuration
-    0.5f,    // fPotionStrengthMult
-    0.5f,    // fPotionT1DurMult
-    1.5f,    // fPotionT1MagMult
-    20.0f,   // fPotionT4BaseStrengthMult
-    12.0f,   // fPotionT4EquipStrengthMult
+    1.0f, // fMagicItemConstantMult
+    1.0f, // fMagicItemCostMult
+    1.0f, // fMagicItemOnceMult
+    1.0f, // fMagicItemPriceMult
+    0.05f, // fMagicItemRechargePerSecond
+    1.0f, // fMagicItemStrikeMult
+    1.0f, // fMagicItemUsedMult
+    3.0f, // fMagicStartIconBlink
+    0.5f, // fMagicSunBlockedMult
+    0.75f, // fMajorSkillBonus
+    300.0f, // fMaxFlySpeed
+    0.5f, // fMaxHandToHandMult
+    400.0f, // fMaxHeadTrackDistance
+    200.0f, // fMaxWalkSpeed
+    300.0f, // fMaxWalkSpeedCreature
+    0.9f, // fMedMaxMod
+    0.1f, // fMessageTimePerChar
+    5.0f, // fMinFlySpeed
+    0.1f, // fMinHandToHandMult
+    1.0f, // fMinorSkillBonus
+    100.0f, // fMinWalkSpeed
+    5.0f, // fMinWalkSpeedCreature
+    1.25f, // fMiscSkillBonus
+    2.0f, // fNPCbaseMagickaMult
+    0.5f, // fNPCHealthBarFade
+    3.0f, // fNPCHealthBarTime
+    1.0f, // fPCbaseMagickaMult
+    0.3f, // fPerDieRollMult
+    5.0f, // fPersonalityMod
+    1.0f, // fPerTempMult
+    -1.0f, // fPickLockMult
+    0.3f, // fPickPocketMod
+    20.0f, // fPotionMinUsefulDuration
+    0.5f, // fPotionStrengthMult
+    0.5f, // fPotionT1DurMult
+    1.5f, // fPotionT1MagMult
+    20.0f, // fPotionT4BaseStrengthMult
+    12.0f, // fPotionT4EquipStrengthMult
     3000.0f, // fProjectileMaxSpeed
-    400.0f,  // fProjectileMinSpeed
-    25.0f,   // fProjectileThrownStoreChance
-    3.0f,    // fRepairAmountMult
-    1.0f,    // fRepairMult
-    1.0f,    // fReputationMod
-    0.15f,   // fRestMagicMult
-    0.0f,    // fSeriousWoundMult
-    0.25f,   // fSleepRandMod
-    0.3f,    // fSleepRestMod
-    -1.0f,   // fSneakBootMult
-    0.5f,    // fSneakDistanceBase
-    0.002f,  // fSneakDistanceMultiplier
-    0.5f,    // fSneakNoViewMult
-    1.0f,    // fSneakSkillMult
-    0.75f,   // fSneakSpeedMultiplier
-    1.0f,    // fSneakUseDelay
-    500.0f,  // fSneakUseDist
-    1.5f,    // fSneakViewMult
-    3.0f,    // fSoulGemMult
-    0.8f,    // fSpecialSkillBonus
-    7.0f,    // fSpellMakingValueMult
-    2.0f,    // fSpellPriceMult
-    10.0f,   // fSpellValueMult
-    0.25f,   // fStromWalkMult
-    0.7f,    // fStromWindSpeed
-    3.0f,    // fSuffocationDamage
-    0.9f,    // fSwimHeightScale
-    0.1f,    // fSwimRunAthleticsMult
-    0.5f,    // fSwimRunBase
-    0.02f,   // fSwimWalkAthleticsMult
-    0.5f,    // fSwimWalkBase
-    1.0f,    // fSwingBlockBase
-    1.0f,    // fSwingBlockMult
+    400.0f, // fProjectileMinSpeed
+    25.0f, // fProjectileThrownStoreChance
+    3.0f, // fRepairAmountMult
+    1.0f, // fRepairMult
+    1.0f, // fReputationMod
+    0.15f, // fRestMagicMult
+    0.0f, // fSeriousWoundMult
+    0.25f, // fSleepRandMod
+    0.3f, // fSleepRestMod
+    -1.0f, // fSneakBootMult
+    0.5f, // fSneakDistanceBase
+    0.002f, // fSneakDistanceMultiplier
+    0.5f, // fSneakNoViewMult
+    1.0f, // fSneakSkillMult
+    0.75f, // fSneakSpeedMultiplier
+    1.0f, // fSneakUseDelay
+    500.0f, // fSneakUseDist
+    1.5f, // fSneakViewMult
+    3.0f, // fSoulGemMult
+    0.8f, // fSpecialSkillBonus
+    7.0f, // fSpellMakingValueMult
+    2.0f, // fSpellPriceMult
+    10.0f, // fSpellValueMult
+    0.25f, // fStromWalkMult
+    0.7f, // fStromWindSpeed
+    3.0f, // fSuffocationDamage
+    0.9f, // fSwimHeightScale
+    0.1f, // fSwimRunAthleticsMult
+    0.5f, // fSwimRunBase
+    0.02f, // fSwimWalkAthleticsMult
+    0.5f, // fSwimWalkBase
+    1.0f, // fSwingBlockBase
+    1.0f, // fSwingBlockMult
     1000.0f, // fTargetSpellMaxSpeed
     1000.0f, // fThrownWeaponMaxSpeed
-    300.0f,  // fThrownWeaponMinSpeed
-    0.0f,    // fTrapCostMult
+    300.0f, // fThrownWeaponMinSpeed
+    0.0f, // fTrapCostMult
     4000.0f, // fTravelMult
-    16000.0f,// fTravelTimeMult
-    0.1f,    // fUnarmoredBase1
-    0.065f,  // fUnarmoredBase2
-    30.0f,   // fVanityDelay
-    10.0f,   // fVoiceIdleOdds
-    0.0f,    // fWaterReflectUpdateAlways
-    10.0f,   // fWaterReflectUpdateSeldom
-    0.1f,    // fWeaponDamageMult
-    1.0f,    // fWeaponFatigueBlockMult
-    0.25f,   // fWeaponFatigueMult
-    150.0f,  // fWereWolfAcrobatics
-    150.0f,  // fWereWolfAgility
-    1.0f,    // fWereWolfAlchemy
-    1.0f,    // fWereWolfAlteration
-    1.0f,    // fWereWolfArmorer
-    150.0f,  // fWereWolfAthletics
-    1.0f,    // fWereWolfAxe
-    1.0f,    // fWereWolfBlock
-    1.0f,    // fWereWolfBluntWeapon
-    1.0f,    // fWereWolfConjuration
-    1.0f,    // fWereWolfDestruction
-    1.0f,    // fWereWolfEnchant
-    150.0f,  // fWereWolfEndurance
-    400.0f,  // fWereWolfFatigue
-    100.0f,  // fWereWolfHandtoHand
-    2.0f,    // fWereWolfHealth
-    1.0f,    // fWereWolfHeavyArmor
-    1.0f,    // fWereWolfIllusion
-    1.0f,    // fWereWolfIntellegence
-    1.0f,    // fWereWolfLightArmor
-    1.0f,    // fWereWolfLongBlade
-    1.0f,    // fWereWolfLuck
-    100.0f,  // fWereWolfMagicka
-    1.0f,    // fWereWolfMarksman
-    1.0f,    // fWereWolfMediumArmor
-    1.0f,    // fWereWolfMerchantile
-    1.0f,    // fWereWolfMysticism
-    1.0f,    // fWereWolfPersonality
-    1.0f,    // fWereWolfRestoration
-    1.5f,    // fWereWolfRunMult
-    1.0f,    // fWereWolfSecurity
-    1.0f,    // fWereWolfShortBlade
-    1.5f,    // fWereWolfSilverWeaponDamageMult
-    1.0f,    // fWereWolfSneak
-    1.0f,    // fWereWolfSpear
-    1.0f,    // fWereWolfSpeechcraft
-    150.0f,  // fWereWolfSpeed
-    150.0f,  // fWereWolfStrength
-    100.0f,  // fWereWolfUnarmored
-    1.0f,    // fWereWolfWillPower
-    15.0f,   // fWortChanceValue
+    16000.0f, // fTravelTimeMult
+    0.1f, // fUnarmoredBase1
+    0.065f, // fUnarmoredBase2
+    30.0f, // fVanityDelay
+    10.0f, // fVoiceIdleOdds
+    0.0f, // fWaterReflectUpdateAlways
+    10.0f, // fWaterReflectUpdateSeldom
+    0.1f, // fWeaponDamageMult
+    1.0f, // fWeaponFatigueBlockMult
+    0.25f, // fWeaponFatigueMult
+    150.0f, // fWereWolfAcrobatics
+    150.0f, // fWereWolfAgility
+    1.0f, // fWereWolfAlchemy
+    1.0f, // fWereWolfAlteration
+    1.0f, // fWereWolfArmorer
+    150.0f, // fWereWolfAthletics
+    1.0f, // fWereWolfAxe
+    1.0f, // fWereWolfBlock
+    1.0f, // fWereWolfBluntWeapon
+    1.0f, // fWereWolfConjuration
+    1.0f, // fWereWolfDestruction
+    1.0f, // fWereWolfEnchant
+    150.0f, // fWereWolfEndurance
+    400.0f, // fWereWolfFatigue
+    100.0f, // fWereWolfHandtoHand
+    2.0f, // fWereWolfHealth
+    1.0f, // fWereWolfHeavyArmor
+    1.0f, // fWereWolfIllusion
+    1.0f, // fWereWolfIntellegence
+    1.0f, // fWereWolfLightArmor
+    1.0f, // fWereWolfLongBlade
+    1.0f, // fWereWolfLuck
+    100.0f, // fWereWolfMagicka
+    1.0f, // fWereWolfMarksman
+    1.0f, // fWereWolfMediumArmor
+    1.0f, // fWereWolfMerchantile
+    1.0f, // fWereWolfMysticism
+    1.0f, // fWereWolfPersonality
+    1.0f, // fWereWolfRestoration
+    1.5f, // fWereWolfRunMult
+    1.0f, // fWereWolfSecurity
+    1.0f, // fWereWolfShortBlade
+    1.5f, // fWereWolfSilverWeaponDamageMult
+    1.0f, // fWereWolfSneak
+    1.0f, // fWereWolfSpear
+    1.0f, // fWereWolfSpeechcraft
+    150.0f, // fWereWolfSpeed
+    150.0f, // fWereWolfStrength
+    100.0f, // fWereWolfUnarmored
+    1.0f, // fWereWolfWillPower
+    15.0f, // fWortChanceValue
 };
 
-const int CSMWorld::DefaultGmsts::IntsDefaultValues[CSMWorld::DefaultGmsts::IntCount] =
-{
-    10,     // i1stPersonSneakDelta
-    50,     // iAlarmAttack
-    90,     // iAlarmKilling
-    20,     // iAlarmPickPocket
-    1,      // iAlarmStealing
-    5,      // iAlarmTresspass
-    2,      // iAlchemyMod
-    100,    // iAutoPCSpellMax
-    2,      // iAutoRepFacMod
-    0,      // iAutoRepLevMod
-    5,      // iAutoSpellAlterationMax
-    70,     // iAutoSpellAttSkillMin
-    2,      // iAutoSpellConjurationMax
-    5,      // iAutoSpellDestructionMax
-    5,      // iAutoSpellIllusionMax
-    5,      // iAutoSpellMysticismMax
-    5,      // iAutoSpellRestorationMax
-    3,      // iAutoSpellTimesCanCast
-    -1,     // iBarterFailDisposition
-    1,      // iBarterSuccessDisposition
-    30,     // iBaseArmorSkill
-    50,     // iBlockMaxChance
-    10,     // iBlockMinChance
-    20,     // iBootsWeight
-    40,     // iCrimeAttack
-    1000,   // iCrimeKilling
-    25,     // iCrimePickPocket
-    1000,   // iCrimeThreshold
-    10,     // iCrimeThresholdMultiplier
-    5,      // iCrimeTresspass
-    30,     // iCuirassWeight
-    100,    // iDaysinPrisonMod
-    -50,    // iDispAttackMod
-    -50,    // iDispKilling
-    -20,    // iDispTresspass
-    1,      // iFightAlarmMult
-    100,    // iFightAttack
-    50,     // iFightAttacking
-    20,     // iFightDistanceBase
-    50,     // iFightKilling
-    25,     // iFightPickpocket
-    25,     // iFightTrespass
-    0,      // iFlee
-    5,      // iGauntletWeight
-    15,     // iGreavesWeight
-    6,      // iGreetDistanceMultiplier
-    4,      // iGreetDuration
-    5,      // iHelmWeight
-    50,     // iKnockDownOddsBase
-    50,     // iKnockDownOddsMult
-    2,      // iLevelUp01Mult
-    2,      // iLevelUp02Mult
-    2,      // iLevelUp03Mult
-    2,      // iLevelUp04Mult
-    3,      // iLevelUp05Mult
-    3,      // iLevelUp06Mult
-    3,      // iLevelUp07Mult
-    4,      // iLevelUp08Mult
-    4,      // iLevelUp09Mult
-    5,      // iLevelUp10Mult
-    1,      // iLevelupMajorMult
-    1,      // iLevelupMajorMultAttribute
-    1,      // iLevelupMinorMult
-    1,      // iLevelupMinorMultAttribute
-    1,      // iLevelupMiscMultAttriubte
-    1,      // iLevelupSpecialization
-    10,     // iLevelupTotal
-    10,     // iMagicItemChargeConst
-    1,      // iMagicItemChargeOnce
-    10,     // iMagicItemChargeStrike
-    5,      // iMagicItemChargeUse
-    192,    // iMaxActivateDist
-    192,    // iMaxInfoDist
-    4,      // iMonthsToRespawn
-    1,      // iNumberCreatures
-    10,     // iPauldronWeight
-    5,      // iPerMinChance
-    10,     // iPerMinChange
-    75,     // iPickMaxChance
-    5,      // iPickMinChance
-    15,     // iShieldWeight
-    400,    // iSoulAmountForConstantEffect
-    10,     // iTrainingMod
-    10,     // iVoiceAttackOdds
-    30,     // iVoiceHitOdds
-    10000,  // iWereWolfBounty
-    100,    // iWereWolfFightMod
-    100,    // iWereWolfFleeMod
-    20,     // iWereWolfLevelToAttack
+const int CSMWorld::DefaultGmsts::IntsDefaultValues[CSMWorld::DefaultGmsts::IntCount] = {
+    10, // i1stPersonSneakDelta
+    50, // iAlarmAttack
+    90, // iAlarmKilling
+    20, // iAlarmPickPocket
+    1, // iAlarmStealing
+    5, // iAlarmTresspass
+    2, // iAlchemyMod
+    100, // iAutoPCSpellMax
+    2, // iAutoRepFacMod
+    0, // iAutoRepLevMod
+    5, // iAutoSpellAlterationMax
+    70, // iAutoSpellAttSkillMin
+    2, // iAutoSpellConjurationMax
+    5, // iAutoSpellDestructionMax
+    5, // iAutoSpellIllusionMax
+    5, // iAutoSpellMysticismMax
+    5, // iAutoSpellRestorationMax
+    3, // iAutoSpellTimesCanCast
+    -1, // iBarterFailDisposition
+    1, // iBarterSuccessDisposition
+    30, // iBaseArmorSkill
+    50, // iBlockMaxChance
+    10, // iBlockMinChance
+    20, // iBootsWeight
+    40, // iCrimeAttack
+    1000, // iCrimeKilling
+    25, // iCrimePickPocket
+    1000, // iCrimeThreshold
+    10, // iCrimeThresholdMultiplier
+    5, // iCrimeTresspass
+    30, // iCuirassWeight
+    100, // iDaysinPrisonMod
+    -50, // iDispAttackMod
+    -50, // iDispKilling
+    -20, // iDispTresspass
+    1, // iFightAlarmMult
+    100, // iFightAttack
+    50, // iFightAttacking
+    20, // iFightDistanceBase
+    50, // iFightKilling
+    25, // iFightPickpocket
+    25, // iFightTrespass
+    0, // iFlee
+    5, // iGauntletWeight
+    15, // iGreavesWeight
+    6, // iGreetDistanceMultiplier
+    4, // iGreetDuration
+    5, // iHelmWeight
+    50, // iKnockDownOddsBase
+    50, // iKnockDownOddsMult
+    2, // iLevelUp01Mult
+    2, // iLevelUp02Mult
+    2, // iLevelUp03Mult
+    2, // iLevelUp04Mult
+    3, // iLevelUp05Mult
+    3, // iLevelUp06Mult
+    3, // iLevelUp07Mult
+    4, // iLevelUp08Mult
+    4, // iLevelUp09Mult
+    5, // iLevelUp10Mult
+    1, // iLevelupMajorMult
+    1, // iLevelupMajorMultAttribute
+    1, // iLevelupMinorMult
+    1, // iLevelupMinorMultAttribute
+    1, // iLevelupMiscMultAttriubte
+    1, // iLevelupSpecialization
+    10, // iLevelupTotal
+    10, // iMagicItemChargeConst
+    1, // iMagicItemChargeOnce
+    10, // iMagicItemChargeStrike
+    5, // iMagicItemChargeUse
+    192, // iMaxActivateDist
+    192, // iMaxInfoDist
+    4, // iMonthsToRespawn
+    1, // iNumberCreatures
+    10, // iPauldronWeight
+    5, // iPerMinChance
+    10, // iPerMinChange
+    75, // iPickMaxChance
+    5, // iPickMinChance
+    15, // iShieldWeight
+    400, // iSoulAmountForConstantEffect
+    10, // iTrainingMod
+    10, // iVoiceAttackOdds
+    30, // iVoiceHitOdds
+    10000, // iWereWolfBounty
+    100, // iWereWolfFightMod
+    100, // iWereWolfFleeMod
+    20, // iWereWolfLevelToAttack
 };
 
-const float CSMWorld::DefaultGmsts::FloatLimits[CSMWorld::DefaultGmsts::FloatCount * 2] =
-{
-    -FInf,      FInf,       // fAIFleeFleeMult
-    -FInf,      FInf,       // fAIFleeHealthMult
-    -FInf,      FInf,       // fAIMagicSpellMult
-    -FInf,      FInf,       // fAIMeleeArmorMult
-    -FInf,      FInf,       // fAIMeleeSummWeaponMult
-    -FInf,      FInf,       // fAIMeleeWeaponMult
-    -FInf,      FInf,       // fAIRangeMagicSpellMult
-    -FInf,      FInf,       // fAIRangeMeleeWeaponMult
-    0,          FInf,       // fAlarmRadius
-    -FInf,      FInf,       // fAthleticsRunBonus
-    0,          FInf,       // fAudioDefaultMaxDistance
-    0,          FInf,       // fAudioDefaultMinDistance
-    0,          FInf,       // fAudioMaxDistanceMult
-    0,          FInf,       // fAudioMinDistanceMult
-    0,          FInf,       // fAudioVoiceDefaultMaxDistance
-    0,          FInf,       // fAudioVoiceDefaultMinDistance
-    0,          FInf,       // fAutoPCSpellChance
-    0,          FInf,       // fAutoSpellChance
-    -FInf,      FInf,       // fBargainOfferBase
-    -FInf,      0,          // fBargainOfferMulti
-    -FInf,      FInf,       // fBarterGoldResetDelay
-    0,          FInf,       // fBaseRunMultiplier
-    -FInf,      FInf,       // fBlockStillBonus
-    0,          FInf,       // fBribe1000Mod
-    0,          FInf,       // fBribe100Mod
-    0,          FInf,       // fBribe10Mod
-    0,          FInf,       // fCombatAngleXY
-    0,          FInf,       // fCombatAngleZ
-    0,          1,          // fCombatArmorMinMult
-    -180,       0,          // fCombatBlockLeftAngle
-    0,          180,        // fCombatBlockRightAngle
-    0,          FInf,       // fCombatCriticalStrikeMult
-    0,          FInf,       // fCombatDelayCreature
-    0,          FInf,       // fCombatDelayNPC
-    0,          FInf,       // fCombatDistance
-    -FInf,      FInf,       // fCombatDistanceWerewolfMod
-    -FInf,      FInf,       // fCombatForceSideAngle
-    0,          FInf,       // fCombatInvisoMult
-    0,          FInf,       // fCombatKODamageMult
-    -FInf,      FInf,       // fCombatTorsoSideAngle
-    -FInf,      FInf,       // fCombatTorsoStartPercent
-    -FInf,      FInf,       // fCombatTorsoStopPercent
-    -FInf,      FInf,       // fConstantEffectMult
-    -FInf,      FInf,       // fCorpseClearDelay
-    -FInf,      FInf,       // fCorpseRespawnDelay
-    0,          1,          // fCrimeGoldDiscountMult
-    0,          FInf,       // fCrimeGoldTurnInMult
-    0,          FInf,       // fCrimeStealing
-    0,          FInf,       // fDamageStrengthBase
-    0,          FInf,       // fDamageStrengthMult
-    -FInf,      FInf,       // fDifficultyMult
-    0,          FInf,       // fDiseaseXferChance
-    -FInf,      0,          // fDispAttacking
-    -FInf,      FInf,       // fDispBargainFailMod
-    -FInf,      FInf,       // fDispBargainSuccessMod
-    -FInf,      0,          // fDispCrimeMod
-    -FInf,      0,          // fDispDiseaseMod
-    0,          FInf,       // fDispFactionMod
-    0,          FInf,       // fDispFactionRankBase
-    0,          FInf,       // fDispFactionRankMult
-    0,          FInf,       // fDispositionMod
-    0,          FInf,       // fDispPersonalityBase
-    0,          FInf,       // fDispPersonalityMult
-    -FInf,      0,          // fDispPickPocketMod
-    0,          FInf,       // fDispRaceMod
-    -FInf,      0,          // fDispStealing
-    -FInf,      0,          // fDispWeaponDrawn
-    0,          FInf,       // fEffectCostMult
-    0,          FInf,       // fElementalShieldMult
-    FEps,       FInf,       // fEnchantmentChanceMult
-    0,          FInf,       // fEnchantmentConstantChanceMult
-    0,          FInf,       // fEnchantmentConstantDurationMult
-    0,          FInf,       // fEnchantmentMult
-    0,          FInf,       // fEnchantmentValueMult
-    0,          FInf,       // fEncumberedMoveEffect
-    0,          FInf,       // fEncumbranceStrMult
-    0,          FInf,       // fEndFatigueMult
-    -FInf,      FInf,       // fFallAcroBase
-    0,          FInf,       // fFallAcroMult
-    0,          FInf,       // fFallDamageDistanceMin
-    -FInf,      FInf,       // fFallDistanceBase
-    0,          FInf,       // fFallDistanceMult
-    -FInf,      FInf,       // fFatigueAttackBase
-    0,          FInf,       // fFatigueAttackMult
-    0,          FInf,       // fFatigueBase
-    0,          FInf,       // fFatigueBlockBase
-    0,          FInf,       // fFatigueBlockMult
-    0,          FInf,       // fFatigueJumpBase
-    0,          FInf,       // fFatigueJumpMult
-    0,          FInf,       // fFatigueMult
-    -FInf,      FInf,       // fFatigueReturnBase
-    0,          FInf,       // fFatigueReturnMult
-    -FInf,      FInf,       // fFatigueRunBase
-    0,          FInf,       // fFatigueRunMult
-    -FInf,      FInf,       // fFatigueSneakBase
-    0,          FInf,       // fFatigueSneakMult
-    -FInf,      FInf,       // fFatigueSpellBase
-    -FInf,      FInf,       // fFatigueSpellCostMult
-    0,          FInf,       // fFatigueSpellMult
-    -FInf,      FInf,       // fFatigueSwimRunBase
-    0,          FInf,       // fFatigueSwimRunMult
-    -FInf,      FInf,       // fFatigueSwimWalkBase
-    0,          FInf,       // fFatigueSwimWalkMult
-    -FInf,      FInf,       // fFightDispMult
-    -FInf,      FInf,       // fFightDistanceMultiplier
-    -FInf,      FInf,       // fFightStealing
-    -FInf,      FInf,       // fFleeDistance
-    -FInf,      FInf,       // fGreetDistanceReset
-    0,          FInf,       // fHandtoHandHealthPer
-    0,          FInf,       // fHandToHandReach
-    -FInf,      FInf,       // fHoldBreathEndMult
-    0,          FInf,       // fHoldBreathTime
-    0,          FInf,       // fIdleChanceMultiplier
-    -FInf,      FInf,       // fIngredientMult
-    0,          FInf,       // fInteriorHeadTrackMult
-    -FInf,      FInf,       // fJumpAcrobaticsBase
-    0,          FInf,       // fJumpAcroMultiplier
-    -FInf,      FInf,       // fJumpEncumbranceBase
-    0,          FInf,       // fJumpEncumbranceMultiplier
-    -FInf,      FInf,       // fJumpMoveBase
-    0,          FInf,       // fJumpMoveMult
-    0,          FInf,       // fJumpRunMultiplier
-    -FInf,      FInf,       // fKnockDownMult
-    0,          FInf,       // fLevelMod
-    0,          FInf,       // fLevelUpHealthEndMult
-    0,          FInf,       // fLightMaxMod
-    0,          FInf,       // fLuckMod
-    0,          FInf,       // fMagesGuildTravel
-    -FInf,      FInf,       // fMagicCreatureCastDelay
-    -FInf,      FInf,       // fMagicDetectRefreshRate
-    -FInf,      FInf,       // fMagicItemConstantMult
-    -FInf,      FInf,       // fMagicItemCostMult
-    -FInf,      FInf,       // fMagicItemOnceMult
-    -FInf,      FInf,       // fMagicItemPriceMult
-    0,          FInf,       // fMagicItemRechargePerSecond
-    -FInf,      FInf,       // fMagicItemStrikeMult
-    -FInf,      FInf,       // fMagicItemUsedMult
-    0,          FInf,       // fMagicStartIconBlink
-    0,          FInf,       // fMagicSunBlockedMult
-    FEps,       FInf,       // fMajorSkillBonus
-    0,          FInf,       // fMaxFlySpeed
-    0,          FInf,       // fMaxHandToHandMult
-    0,          FInf,       // fMaxHeadTrackDistance
-    0,          FInf,       // fMaxWalkSpeed
-    0,          FInf,       // fMaxWalkSpeedCreature
-    0,          FInf,       // fMedMaxMod
-    0,          FInf,       // fMessageTimePerChar
-    0,          FInf,       // fMinFlySpeed
-    0,          FInf,       // fMinHandToHandMult
-    FEps,       FInf,       // fMinorSkillBonus
-    0,          FInf,       // fMinWalkSpeed
-    0,          FInf,       // fMinWalkSpeedCreature
-    FEps,       FInf,       // fMiscSkillBonus
-    0,          FInf,       // fNPCbaseMagickaMult
-    0,          FInf,       // fNPCHealthBarFade
-    0,          FInf,       // fNPCHealthBarTime
-    0,          FInf,       // fPCbaseMagickaMult
-    0,          FInf,       // fPerDieRollMult
-    0,          FInf,       // fPersonalityMod
-    0,          FInf,       // fPerTempMult
-    -FInf,      0,          // fPickLockMult
-    0,          FInf,       // fPickPocketMod
-    -FInf,      FInf,       // fPotionMinUsefulDuration
-    0,          FInf,       // fPotionStrengthMult
-    FEps,       FInf,       // fPotionT1DurMult
-    FEps,       FInf,       // fPotionT1MagMult
-    -FInf,      FInf,       // fPotionT4BaseStrengthMult
-    -FInf,      FInf,       // fPotionT4EquipStrengthMult
-    0,          FInf,       // fProjectileMaxSpeed
-    0,          FInf,       // fProjectileMinSpeed
-    0,          FInf,       // fProjectileThrownStoreChance
-    0,          FInf,       // fRepairAmountMult
-    0,          FInf,       // fRepairMult
-    0,          FInf,       // fReputationMod
-    0,          FInf,       // fRestMagicMult
-    -FInf,      FInf,       // fSeriousWoundMult
-    0,          FInf,       // fSleepRandMod
-    0,          FInf,       // fSleepRestMod
-    -FInf,      0,          // fSneakBootMult
-    -FInf,      FInf,       // fSneakDistanceBase
-    0,          FInf,       // fSneakDistanceMultiplier
-    0,          FInf,       // fSneakNoViewMult
-    0,          FInf,       // fSneakSkillMult
-    0,          FInf,       // fSneakSpeedMultiplier
-    0,          FInf,       // fSneakUseDelay
-    0,          FInf,       // fSneakUseDist
-    0,          FInf,       // fSneakViewMult
-    0,          FInf,       // fSoulGemMult
-    0,          FInf,       // fSpecialSkillBonus
-    0,          FInf,       // fSpellMakingValueMult
-    -FInf,      FInf,       // fSpellPriceMult
-    0,          FInf,       // fSpellValueMult
-    0,          FInf,       // fStromWalkMult
-    0,          FInf,       // fStromWindSpeed
-    0,          FInf,       // fSuffocationDamage
-    0,          FInf,       // fSwimHeightScale
-    0,          FInf,       // fSwimRunAthleticsMult
-    0,          FInf,       // fSwimRunBase
-    -FInf,      FInf,       // fSwimWalkAthleticsMult
-    -FInf,      FInf,       // fSwimWalkBase
-    0,          FInf,       // fSwingBlockBase
-    0,          FInf,       // fSwingBlockMult
-    0,          FInf,       // fTargetSpellMaxSpeed
-    0,          FInf,       // fThrownWeaponMaxSpeed
-    0,          FInf,       // fThrownWeaponMinSpeed
-    0,          FInf,       // fTrapCostMult
-    0,          FInf,       // fTravelMult
-    0,          FInf,       // fTravelTimeMult
-    0,          FInf,       // fUnarmoredBase1
-    0,          FInf,       // fUnarmoredBase2
-    0,          FInf,       // fVanityDelay
-    0,          FInf,       // fVoiceIdleOdds
-    -FInf,      FInf,       // fWaterReflectUpdateAlways
-    -FInf,      FInf,       // fWaterReflectUpdateSeldom
-    0,          FInf,       // fWeaponDamageMult
-    0,          FInf,       // fWeaponFatigueBlockMult
-    0,          FInf,       // fWeaponFatigueMult
-    0,          FInf,       // fWereWolfAcrobatics
-    -FInf,      FInf,       // fWereWolfAgility
-    -FInf,      FInf,       // fWereWolfAlchemy
-    -FInf,      FInf,       // fWereWolfAlteration
-    -FInf,      FInf,       // fWereWolfArmorer
-    -FInf,      FInf,       // fWereWolfAthletics
-    -FInf,      FInf,       // fWereWolfAxe
-    -FInf,      FInf,       // fWereWolfBlock
-    -FInf,      FInf,       // fWereWolfBluntWeapon
-    -FInf,      FInf,       // fWereWolfConjuration
-    -FInf,      FInf,       // fWereWolfDestruction
-    -FInf,      FInf,       // fWereWolfEnchant
-    -FInf,      FInf,       // fWereWolfEndurance
-    -FInf,      FInf,       // fWereWolfFatigue
-    -FInf,      FInf,       // fWereWolfHandtoHand
-    -FInf,      FInf,       // fWereWolfHealth
-    -FInf,      FInf,       // fWereWolfHeavyArmor
-    -FInf,      FInf,       // fWereWolfIllusion
-    -FInf,      FInf,       // fWereWolfIntellegence
-    -FInf,      FInf,       // fWereWolfLightArmor
-    -FInf,      FInf,       // fWereWolfLongBlade
-    -FInf,      FInf,       // fWereWolfLuck
-    -FInf,      FInf,       // fWereWolfMagicka
-    -FInf,      FInf,       // fWereWolfMarksman
-    -FInf,      FInf,       // fWereWolfMediumArmor
-    -FInf,      FInf,       // fWereWolfMerchantile
-    -FInf,      FInf,       // fWereWolfMysticism
-    -FInf,      FInf,       // fWereWolfPersonality
-    -FInf,      FInf,       // fWereWolfRestoration
-    0,          FInf,       // fWereWolfRunMult
-    -FInf,      FInf,       // fWereWolfSecurity
-    -FInf,      FInf,       // fWereWolfShortBlade
-    -FInf,      FInf,       // fWereWolfSilverWeaponDamageMult
-    -FInf,      FInf,       // fWereWolfSneak
-    -FInf,      FInf,       // fWereWolfSpear
-    -FInf,      FInf,       // fWereWolfSpeechcraft
-    -FInf,      FInf,       // fWereWolfSpeed
-    -FInf,      FInf,       // fWereWolfStrength
-    -FInf,      FInf,       // fWereWolfUnarmored
-    -FInf,      FInf,       // fWereWolfWillPower
-    0,          FInf,       // fWortChanceValue
+const float CSMWorld::DefaultGmsts::FloatLimits[CSMWorld::DefaultGmsts::FloatCount * 2] = {
+    -FInf, FInf, // fAIFleeFleeMult
+    -FInf, FInf, // fAIFleeHealthMult
+    -FInf, FInf, // fAIMagicSpellMult
+    -FInf, FInf, // fAIMeleeArmorMult
+    -FInf, FInf, // fAIMeleeSummWeaponMult
+    -FInf, FInf, // fAIMeleeWeaponMult
+    -FInf, FInf, // fAIRangeMagicSpellMult
+    -FInf, FInf, // fAIRangeMeleeWeaponMult
+    0, FInf, // fAlarmRadius
+    -FInf, FInf, // fAthleticsRunBonus
+    0, FInf, // fAudioDefaultMaxDistance
+    0, FInf, // fAudioDefaultMinDistance
+    0, FInf, // fAudioMaxDistanceMult
+    0, FInf, // fAudioMinDistanceMult
+    0, FInf, // fAudioVoiceDefaultMaxDistance
+    0, FInf, // fAudioVoiceDefaultMinDistance
+    0, FInf, // fAutoPCSpellChance
+    0, FInf, // fAutoSpellChance
+    -FInf, FInf, // fBargainOfferBase
+    -FInf, 0, // fBargainOfferMulti
+    -FInf, FInf, // fBarterGoldResetDelay
+    0, FInf, // fBaseRunMultiplier
+    -FInf, FInf, // fBlockStillBonus
+    0, FInf, // fBribe1000Mod
+    0, FInf, // fBribe100Mod
+    0, FInf, // fBribe10Mod
+    0, FInf, // fCombatAngleXY
+    0, FInf, // fCombatAngleZ
+    0, 1, // fCombatArmorMinMult
+    -180, 0, // fCombatBlockLeftAngle
+    0, 180, // fCombatBlockRightAngle
+    0, FInf, // fCombatCriticalStrikeMult
+    0, FInf, // fCombatDelayCreature
+    0, FInf, // fCombatDelayNPC
+    0, FInf, // fCombatDistance
+    -FInf, FInf, // fCombatDistanceWerewolfMod
+    -FInf, FInf, // fCombatForceSideAngle
+    0, FInf, // fCombatInvisoMult
+    0, FInf, // fCombatKODamageMult
+    -FInf, FInf, // fCombatTorsoSideAngle
+    -FInf, FInf, // fCombatTorsoStartPercent
+    -FInf, FInf, // fCombatTorsoStopPercent
+    -FInf, FInf, // fConstantEffectMult
+    -FInf, FInf, // fCorpseClearDelay
+    -FInf, FInf, // fCorpseRespawnDelay
+    0, 1, // fCrimeGoldDiscountMult
+    0, FInf, // fCrimeGoldTurnInMult
+    0, FInf, // fCrimeStealing
+    0, FInf, // fDamageStrengthBase
+    0, FInf, // fDamageStrengthMult
+    -FInf, FInf, // fDifficultyMult
+    0, FInf, // fDiseaseXferChance
+    -FInf, 0, // fDispAttacking
+    -FInf, FInf, // fDispBargainFailMod
+    -FInf, FInf, // fDispBargainSuccessMod
+    -FInf, 0, // fDispCrimeMod
+    -FInf, 0, // fDispDiseaseMod
+    0, FInf, // fDispFactionMod
+    0, FInf, // fDispFactionRankBase
+    0, FInf, // fDispFactionRankMult
+    0, FInf, // fDispositionMod
+    0, FInf, // fDispPersonalityBase
+    0, FInf, // fDispPersonalityMult
+    -FInf, 0, // fDispPickPocketMod
+    0, FInf, // fDispRaceMod
+    -FInf, 0, // fDispStealing
+    -FInf, 0, // fDispWeaponDrawn
+    0, FInf, // fEffectCostMult
+    0, FInf, // fElementalShieldMult
+    FEps, FInf, // fEnchantmentChanceMult
+    0, FInf, // fEnchantmentConstantChanceMult
+    0, FInf, // fEnchantmentConstantDurationMult
+    0, FInf, // fEnchantmentMult
+    0, FInf, // fEnchantmentValueMult
+    0, FInf, // fEncumberedMoveEffect
+    0, FInf, // fEncumbranceStrMult
+    0, FInf, // fEndFatigueMult
+    -FInf, FInf, // fFallAcroBase
+    0, FInf, // fFallAcroMult
+    0, FInf, // fFallDamageDistanceMin
+    -FInf, FInf, // fFallDistanceBase
+    0, FInf, // fFallDistanceMult
+    -FInf, FInf, // fFatigueAttackBase
+    0, FInf, // fFatigueAttackMult
+    0, FInf, // fFatigueBase
+    0, FInf, // fFatigueBlockBase
+    0, FInf, // fFatigueBlockMult
+    0, FInf, // fFatigueJumpBase
+    0, FInf, // fFatigueJumpMult
+    0, FInf, // fFatigueMult
+    -FInf, FInf, // fFatigueReturnBase
+    0, FInf, // fFatigueReturnMult
+    -FInf, FInf, // fFatigueRunBase
+    0, FInf, // fFatigueRunMult
+    -FInf, FInf, // fFatigueSneakBase
+    0, FInf, // fFatigueSneakMult
+    -FInf, FInf, // fFatigueSpellBase
+    -FInf, FInf, // fFatigueSpellCostMult
+    0, FInf, // fFatigueSpellMult
+    -FInf, FInf, // fFatigueSwimRunBase
+    0, FInf, // fFatigueSwimRunMult
+    -FInf, FInf, // fFatigueSwimWalkBase
+    0, FInf, // fFatigueSwimWalkMult
+    -FInf, FInf, // fFightDispMult
+    -FInf, FInf, // fFightDistanceMultiplier
+    -FInf, FInf, // fFightStealing
+    -FInf, FInf, // fFleeDistance
+    -FInf, FInf, // fGreetDistanceReset
+    0, FInf, // fHandtoHandHealthPer
+    0, FInf, // fHandToHandReach
+    -FInf, FInf, // fHoldBreathEndMult
+    0, FInf, // fHoldBreathTime
+    0, FInf, // fIdleChanceMultiplier
+    -FInf, FInf, // fIngredientMult
+    0, FInf, // fInteriorHeadTrackMult
+    -FInf, FInf, // fJumpAcrobaticsBase
+    0, FInf, // fJumpAcroMultiplier
+    -FInf, FInf, // fJumpEncumbranceBase
+    0, FInf, // fJumpEncumbranceMultiplier
+    -FInf, FInf, // fJumpMoveBase
+    0, FInf, // fJumpMoveMult
+    0, FInf, // fJumpRunMultiplier
+    -FInf, FInf, // fKnockDownMult
+    0, FInf, // fLevelMod
+    0, FInf, // fLevelUpHealthEndMult
+    0, FInf, // fLightMaxMod
+    0, FInf, // fLuckMod
+    0, FInf, // fMagesGuildTravel
+    -FInf, FInf, // fMagicCreatureCastDelay
+    -FInf, FInf, // fMagicDetectRefreshRate
+    -FInf, FInf, // fMagicItemConstantMult
+    -FInf, FInf, // fMagicItemCostMult
+    -FInf, FInf, // fMagicItemOnceMult
+    -FInf, FInf, // fMagicItemPriceMult
+    0, FInf, // fMagicItemRechargePerSecond
+    -FInf, FInf, // fMagicItemStrikeMult
+    -FInf, FInf, // fMagicItemUsedMult
+    0, FInf, // fMagicStartIconBlink
+    0, FInf, // fMagicSunBlockedMult
+    FEps, FInf, // fMajorSkillBonus
+    0, FInf, // fMaxFlySpeed
+    0, FInf, // fMaxHandToHandMult
+    0, FInf, // fMaxHeadTrackDistance
+    0, FInf, // fMaxWalkSpeed
+    0, FInf, // fMaxWalkSpeedCreature
+    0, FInf, // fMedMaxMod
+    0, FInf, // fMessageTimePerChar
+    0, FInf, // fMinFlySpeed
+    0, FInf, // fMinHandToHandMult
+    FEps, FInf, // fMinorSkillBonus
+    0, FInf, // fMinWalkSpeed
+    0, FInf, // fMinWalkSpeedCreature
+    FEps, FInf, // fMiscSkillBonus
+    0, FInf, // fNPCbaseMagickaMult
+    0, FInf, // fNPCHealthBarFade
+    0, FInf, // fNPCHealthBarTime
+    0, FInf, // fPCbaseMagickaMult
+    0, FInf, // fPerDieRollMult
+    0, FInf, // fPersonalityMod
+    0, FInf, // fPerTempMult
+    -FInf, 0, // fPickLockMult
+    0, FInf, // fPickPocketMod
+    -FInf, FInf, // fPotionMinUsefulDuration
+    0, FInf, // fPotionStrengthMult
+    FEps, FInf, // fPotionT1DurMult
+    FEps, FInf, // fPotionT1MagMult
+    -FInf, FInf, // fPotionT4BaseStrengthMult
+    -FInf, FInf, // fPotionT4EquipStrengthMult
+    0, FInf, // fProjectileMaxSpeed
+    0, FInf, // fProjectileMinSpeed
+    0, FInf, // fProjectileThrownStoreChance
+    0, FInf, // fRepairAmountMult
+    0, FInf, // fRepairMult
+    0, FInf, // fReputationMod
+    0, FInf, // fRestMagicMult
+    -FInf, FInf, // fSeriousWoundMult
+    0, FInf, // fSleepRandMod
+    0, FInf, // fSleepRestMod
+    -FInf, 0, // fSneakBootMult
+    -FInf, FInf, // fSneakDistanceBase
+    0, FInf, // fSneakDistanceMultiplier
+    0, FInf, // fSneakNoViewMult
+    0, FInf, // fSneakSkillMult
+    0, FInf, // fSneakSpeedMultiplier
+    0, FInf, // fSneakUseDelay
+    0, FInf, // fSneakUseDist
+    0, FInf, // fSneakViewMult
+    0, FInf, // fSoulGemMult
+    0, FInf, // fSpecialSkillBonus
+    0, FInf, // fSpellMakingValueMult
+    -FInf, FInf, // fSpellPriceMult
+    0, FInf, // fSpellValueMult
+    0, FInf, // fStromWalkMult
+    0, FInf, // fStromWindSpeed
+    0, FInf, // fSuffocationDamage
+    0, FInf, // fSwimHeightScale
+    0, FInf, // fSwimRunAthleticsMult
+    0, FInf, // fSwimRunBase
+    -FInf, FInf, // fSwimWalkAthleticsMult
+    -FInf, FInf, // fSwimWalkBase
+    0, FInf, // fSwingBlockBase
+    0, FInf, // fSwingBlockMult
+    0, FInf, // fTargetSpellMaxSpeed
+    0, FInf, // fThrownWeaponMaxSpeed
+    0, FInf, // fThrownWeaponMinSpeed
+    0, FInf, // fTrapCostMult
+    0, FInf, // fTravelMult
+    0, FInf, // fTravelTimeMult
+    0, FInf, // fUnarmoredBase1
+    0, FInf, // fUnarmoredBase2
+    0, FInf, // fVanityDelay
+    0, FInf, // fVoiceIdleOdds
+    -FInf, FInf, // fWaterReflectUpdateAlways
+    -FInf, FInf, // fWaterReflectUpdateSeldom
+    0, FInf, // fWeaponDamageMult
+    0, FInf, // fWeaponFatigueBlockMult
+    0, FInf, // fWeaponFatigueMult
+    0, FInf, // fWereWolfAcrobatics
+    -FInf, FInf, // fWereWolfAgility
+    -FInf, FInf, // fWereWolfAlchemy
+    -FInf, FInf, // fWereWolfAlteration
+    -FInf, FInf, // fWereWolfArmorer
+    -FInf, FInf, // fWereWolfAthletics
+    -FInf, FInf, // fWereWolfAxe
+    -FInf, FInf, // fWereWolfBlock
+    -FInf, FInf, // fWereWolfBluntWeapon
+    -FInf, FInf, // fWereWolfConjuration
+    -FInf, FInf, // fWereWolfDestruction
+    -FInf, FInf, // fWereWolfEnchant
+    -FInf, FInf, // fWereWolfEndurance
+    -FInf, FInf, // fWereWolfFatigue
+    -FInf, FInf, // fWereWolfHandtoHand
+    -FInf, FInf, // fWereWolfHealth
+    -FInf, FInf, // fWereWolfHeavyArmor
+    -FInf, FInf, // fWereWolfIllusion
+    -FInf, FInf, // fWereWolfIntellegence
+    -FInf, FInf, // fWereWolfLightArmor
+    -FInf, FInf, // fWereWolfLongBlade
+    -FInf, FInf, // fWereWolfLuck
+    -FInf, FInf, // fWereWolfMagicka
+    -FInf, FInf, // fWereWolfMarksman
+    -FInf, FInf, // fWereWolfMediumArmor
+    -FInf, FInf, // fWereWolfMerchantile
+    -FInf, FInf, // fWereWolfMysticism
+    -FInf, FInf, // fWereWolfPersonality
+    -FInf, FInf, // fWereWolfRestoration
+    0, FInf, // fWereWolfRunMult
+    -FInf, FInf, // fWereWolfSecurity
+    -FInf, FInf, // fWereWolfShortBlade
+    -FInf, FInf, // fWereWolfSilverWeaponDamageMult
+    -FInf, FInf, // fWereWolfSneak
+    -FInf, FInf, // fWereWolfSpear
+    -FInf, FInf, // fWereWolfSpeechcraft
+    -FInf, FInf, // fWereWolfSpeed
+    -FInf, FInf, // fWereWolfStrength
+    -FInf, FInf, // fWereWolfUnarmored
+    -FInf, FInf, // fWereWolfWillPower
+    0, FInf, // fWortChanceValue
 };
 
-const int CSMWorld::DefaultGmsts::IntLimits[CSMWorld::DefaultGmsts::IntCount * 2] =
-{
-    IMin,    IMax,  // i1stPersonSneakDelta
-    IMin,    IMax,  // iAlarmAttack
-    IMin,    IMax,  // iAlarmKilling
-    IMin,    IMax,  // iAlarmPickPocket
-    IMin,    IMax,  // iAlarmStealing
-    IMin,    IMax,  // iAlarmTresspass
-    IMin,    IMax,  // iAlchemyMod
-    0,       IMax,  // iAutoPCSpellMax
-    IMin,    IMax,  // iAutoRepFacMod
-    IMin,    IMax,  // iAutoRepLevMod
-    IMin,    IMax,  // iAutoSpellAlterationMax
-    0,       IMax,  // iAutoSpellAttSkillMin
-    IMin,    IMax,  // iAutoSpellConjurationMax
-    IMin,    IMax,  // iAutoSpellDestructionMax
-    IMin,    IMax,  // iAutoSpellIllusionMax
-    IMin,    IMax,  // iAutoSpellMysticismMax
-    IMin,    IMax,  // iAutoSpellRestorationMax
-    0,       IMax,  // iAutoSpellTimesCanCast
-    IMin,    0,     // iBarterFailDisposition
-    0,       IMax,  // iBarterSuccessDisposition
-    1,       IMax,  // iBaseArmorSkill
-    0,       IMax,  // iBlockMaxChance
-    0,       IMax,  // iBlockMinChance
-    0,       IMax,  // iBootsWeight
-    IMin,    IMax,  // iCrimeAttack
-    IMin,    IMax,  // iCrimeKilling
-    IMin,    IMax,  // iCrimePickPocket
-    0,       IMax,  // iCrimeThreshold
-    0,       IMax,  // iCrimeThresholdMultiplier
-    IMin,    IMax,  // iCrimeTresspass
-    0,       IMax,  // iCuirassWeight
-    1,       IMax,  // iDaysinPrisonMod
-    IMin,    0,     // iDispAttackMod
-    IMin,    0,     // iDispKilling
-    IMin,    0,     // iDispTresspass
-    IMin,    IMax,  // iFightAlarmMult
-    IMin,    IMax,  // iFightAttack
-    IMin,    IMax,  // iFightAttacking
-    0,       IMax,  // iFightDistanceBase
-    IMin,    IMax,  // iFightKilling
-    IMin,    IMax,  // iFightPickpocket
-    IMin,    IMax,  // iFightTrespass
-    IMin,    IMax,  // iFlee
-    0,       IMax,  // iGauntletWeight
-    0,       IMax,  // iGreavesWeight
-    0,       IMax,  // iGreetDistanceMultiplier
-    0,       IMax,  // iGreetDuration
-    0,       IMax,  // iHelmWeight
-    IMin,    IMax,  // iKnockDownOddsBase
-    IMin,    IMax,  // iKnockDownOddsMult
-    IMin,    IMax,  // iLevelUp01Mult
-    IMin,    IMax,  // iLevelUp02Mult
-    IMin,    IMax,  // iLevelUp03Mult
-    IMin,    IMax,  // iLevelUp04Mult
-    IMin,    IMax,  // iLevelUp05Mult
-    IMin,    IMax,  // iLevelUp06Mult
-    IMin,    IMax,  // iLevelUp07Mult
-    IMin,    IMax,  // iLevelUp08Mult
-    IMin,    IMax,  // iLevelUp09Mult
-    IMin,    IMax,  // iLevelUp10Mult
-    IMin,    IMax,  // iLevelupMajorMult
-    IMin,    IMax,  // iLevelupMajorMultAttribute
-    IMin,    IMax,  // iLevelupMinorMult
-    IMin,    IMax,  // iLevelupMinorMultAttribute
-    IMin,    IMax,  // iLevelupMiscMultAttriubte
-    IMin,    IMax,  // iLevelupSpecialization
-    IMin,    IMax,  // iLevelupTotal
-    IMin,    IMax,  // iMagicItemChargeConst
-    IMin,    IMax,  // iMagicItemChargeOnce
-    IMin,    IMax,  // iMagicItemChargeStrike
-    IMin,    IMax,  // iMagicItemChargeUse
-    IMin,    IMax,  // iMaxActivateDist
-    IMin,    IMax,  // iMaxInfoDist
-    0,       IMax,  // iMonthsToRespawn
-    0,       IMax,  // iNumberCreatures
-    0,       IMax,  // iPauldronWeight
-    0,       IMax,  // iPerMinChance
-    0,       IMax,  // iPerMinChange
-    0,       IMax,  // iPickMaxChance
-    0,       IMax,  // iPickMinChance
-    0,       IMax,  // iShieldWeight
-    0,       IMax,  // iSoulAmountForConstantEffect
-    0,       IMax,  // iTrainingMod
-    0,       IMax,  // iVoiceAttackOdds
-    0,       IMax,  // iVoiceHitOdds
-    IMin,    IMax,  // iWereWolfBounty
-    IMin,    IMax,  // iWereWolfFightMod
-    IMin,    IMax,  // iWereWolfFleeMod
-    IMin,    IMax,  // iWereWolfLevelToAttack
+const int CSMWorld::DefaultGmsts::IntLimits[CSMWorld::DefaultGmsts::IntCount * 2] = {
+    IMin, IMax, // i1stPersonSneakDelta
+    IMin, IMax, // iAlarmAttack
+    IMin, IMax, // iAlarmKilling
+    IMin, IMax, // iAlarmPickPocket
+    IMin, IMax, // iAlarmStealing
+    IMin, IMax, // iAlarmTresspass
+    IMin, IMax, // iAlchemyMod
+    0, IMax, // iAutoPCSpellMax
+    IMin, IMax, // iAutoRepFacMod
+    IMin, IMax, // iAutoRepLevMod
+    IMin, IMax, // iAutoSpellAlterationMax
+    0, IMax, // iAutoSpellAttSkillMin
+    IMin, IMax, // iAutoSpellConjurationMax
+    IMin, IMax, // iAutoSpellDestructionMax
+    IMin, IMax, // iAutoSpellIllusionMax
+    IMin, IMax, // iAutoSpellMysticismMax
+    IMin, IMax, // iAutoSpellRestorationMax
+    0, IMax, // iAutoSpellTimesCanCast
+    IMin, 0, // iBarterFailDisposition
+    0, IMax, // iBarterSuccessDisposition
+    1, IMax, // iBaseArmorSkill
+    0, IMax, // iBlockMaxChance
+    0, IMax, // iBlockMinChance
+    0, IMax, // iBootsWeight
+    IMin, IMax, // iCrimeAttack
+    IMin, IMax, // iCrimeKilling
+    IMin, IMax, // iCrimePickPocket
+    0, IMax, // iCrimeThreshold
+    0, IMax, // iCrimeThresholdMultiplier
+    IMin, IMax, // iCrimeTresspass
+    0, IMax, // iCuirassWeight
+    1, IMax, // iDaysinPrisonMod
+    IMin, 0, // iDispAttackMod
+    IMin, 0, // iDispKilling
+    IMin, 0, // iDispTresspass
+    IMin, IMax, // iFightAlarmMult
+    IMin, IMax, // iFightAttack
+    IMin, IMax, // iFightAttacking
+    0, IMax, // iFightDistanceBase
+    IMin, IMax, // iFightKilling
+    IMin, IMax, // iFightPickpocket
+    IMin, IMax, // iFightTrespass
+    IMin, IMax, // iFlee
+    0, IMax, // iGauntletWeight
+    0, IMax, // iGreavesWeight
+    0, IMax, // iGreetDistanceMultiplier
+    0, IMax, // iGreetDuration
+    0, IMax, // iHelmWeight
+    IMin, IMax, // iKnockDownOddsBase
+    IMin, IMax, // iKnockDownOddsMult
+    IMin, IMax, // iLevelUp01Mult
+    IMin, IMax, // iLevelUp02Mult
+    IMin, IMax, // iLevelUp03Mult
+    IMin, IMax, // iLevelUp04Mult
+    IMin, IMax, // iLevelUp05Mult
+    IMin, IMax, // iLevelUp06Mult
+    IMin, IMax, // iLevelUp07Mult
+    IMin, IMax, // iLevelUp08Mult
+    IMin, IMax, // iLevelUp09Mult
+    IMin, IMax, // iLevelUp10Mult
+    IMin, IMax, // iLevelupMajorMult
+    IMin, IMax, // iLevelupMajorMultAttribute
+    IMin, IMax, // iLevelupMinorMult
+    IMin, IMax, // iLevelupMinorMultAttribute
+    IMin, IMax, // iLevelupMiscMultAttriubte
+    IMin, IMax, // iLevelupSpecialization
+    IMin, IMax, // iLevelupTotal
+    IMin, IMax, // iMagicItemChargeConst
+    IMin, IMax, // iMagicItemChargeOnce
+    IMin, IMax, // iMagicItemChargeStrike
+    IMin, IMax, // iMagicItemChargeUse
+    IMin, IMax, // iMaxActivateDist
+    IMin, IMax, // iMaxInfoDist
+    0, IMax, // iMonthsToRespawn
+    0, IMax, // iNumberCreatures
+    0, IMax, // iPauldronWeight
+    0, IMax, // iPerMinChance
+    0, IMax, // iPerMinChange
+    0, IMax, // iPickMaxChance
+    0, IMax, // iPickMinChance
+    0, IMax, // iShieldWeight
+    0, IMax, // iSoulAmountForConstantEffect
+    0, IMax, // iTrainingMod
+    0, IMax, // iVoiceAttackOdds
+    0, IMax, // iVoiceHitOdds
+    IMin, IMax, // iWereWolfBounty
+    IMin, IMax, // iWereWolfFightMod
+    IMin, IMax, // iWereWolfFleeMod
+    IMin, IMax, // iWereWolfLevelToAttack
 };
diff --git a/apps/opencs/model/world/defaultgmsts.hpp b/apps/opencs/model/world/defaultgmsts.hpp
index a2888ed6ac..baee7d66a9 100644
--- a/apps/opencs/model/world/defaultgmsts.hpp
+++ b/apps/opencs/model/world/defaultgmsts.hpp
@@ -3,24 +3,26 @@
 
 #include <cstddef>
 
-namespace CSMWorld {
-    namespace DefaultGmsts {
-        
+namespace CSMWorld
+{
+    namespace DefaultGmsts
+    {
+
         const size_t FloatCount = 258;
         const size_t IntCount = 89;
         const size_t StringCount = 1174;
-        
+
         const size_t OptionalFloatCount = 42;
         const size_t OptionalIntCount = 4;
         const size_t OptionalStringCount = 26;
-        
+
         extern const char* Floats[];
-        extern const char * Ints[];
-        extern const char * Strings[];
-        
-        extern const char * OptionalFloats[];
-        extern const char * OptionalInts[];
-        extern const char * OptionalStrings[];
+        extern const char* Ints[];
+        extern const char* Strings[];
+
+        extern const char* OptionalFloats[];
+        extern const char* OptionalInts[];
+        extern const char* OptionalStrings[];
 
         extern const float FloatsDefaultValues[];
         extern const int IntsDefaultValues[];
diff --git a/apps/opencs/model/world/idcollection.cpp b/apps/opencs/model/world/idcollection.cpp
index 802ffe2487..13877be3d1 100644
--- a/apps/opencs/model/world/idcollection.cpp
+++ b/apps/opencs/model/world/idcollection.cpp
@@ -2,23 +2,23 @@
 
 namespace CSMWorld
 {
-    template<>
-    int IdCollection<Pathgrid, IdAccessor<Pathgrid> >::load (ESM::ESMReader& reader, bool base)
+    template <>
+    int IdCollection<Pathgrid, IdAccessor<Pathgrid>>::load(ESM::ESMReader& reader, bool base)
     {
         Pathgrid record;
         bool isDeleted = false;
 
-        loadRecord (record, reader, isDeleted);
+        loadRecord(record, reader, isDeleted);
 
-        std::string id = IdAccessor<Pathgrid>().getId (record);
-        int index = this->searchId (id);
+        std::string id = IdAccessor<Pathgrid>().getId(record);
+        int index = this->searchId(id);
 
         if (record.mPoints.empty() || record.mEdges.empty())
             isDeleted = true;
 
         if (isDeleted)
         {
-            if (index==-1)
+            if (index == -1)
             {
                 // deleting a record that does not exist
                 // ignore it for now
@@ -28,7 +28,7 @@ namespace CSMWorld
 
             if (base)
             {
-                this->removeRows (index, 1);
+                this->removeRows(index, 1);
                 return -1;
             }
 
@@ -38,6 +38,6 @@ namespace CSMWorld
             return index;
         }
 
-        return load (record, base, index);
+        return load(record, base, index);
     }
 }
diff --git a/apps/opencs/model/world/idcollection.hpp b/apps/opencs/model/world/idcollection.hpp
index d246dc6852..f40ead044b 100644
--- a/apps/opencs/model/world/idcollection.hpp
+++ b/apps/opencs/model/world/idcollection.hpp
@@ -10,67 +10,62 @@
 namespace CSMWorld
 {
     /// \brief Single type collection of top level records
-    template<typename ESXRecordT, typename IdAccessorT = IdAccessor<ESXRecordT> >
+    template <typename ESXRecordT, typename IdAccessorT = IdAccessor<ESXRecordT>>
     class IdCollection : public Collection<ESXRecordT, IdAccessorT>
     {
-            virtual void loadRecord (ESXRecordT& record, ESM::ESMReader& reader, bool& isDeleted);
-
-        public:
-
-            /// \return Index of loaded record (-1 if no record was loaded)
-            int load (ESM::ESMReader& reader, bool base);
-
-            /// \param index Index at which the record can be found.
-            /// Special values: -2 index unknown, -1 record does not exist yet and therefore
-            /// does not have an index
-            ///
-            /// \return index
-            int load (const ESXRecordT& record, bool base, int index = -2);
-
-            bool tryDelete (const std::string& id);
-            ///< Try deleting \a id. If the id does not exist or can't be deleted the call is ignored.
-            ///
-            /// \return Has the ID been deleted?
+        virtual void loadRecord(ESXRecordT& record, ESM::ESMReader& reader, bool& isDeleted);
+
+    public:
+        /// \return Index of loaded record (-1 if no record was loaded)
+        int load(ESM::ESMReader& reader, bool base);
+
+        /// \param index Index at which the record can be found.
+        /// Special values: -2 index unknown, -1 record does not exist yet and therefore
+        /// does not have an index
+        ///
+        /// \return index
+        int load(const ESXRecordT& record, bool base, int index = -2);
+
+        bool tryDelete(const std::string& id);
+        ///< Try deleting \a id. If the id does not exist or can't be deleted the call is ignored.
+        ///
+        /// \return Has the ID been deleted?
     };
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    void IdCollection<ESXRecordT, IdAccessorT>::loadRecord (ESXRecordT& record,
-                                                            ESM::ESMReader& reader,
-                                                            bool& isDeleted)
+    template <typename ESXRecordT, typename IdAccessorT>
+    void IdCollection<ESXRecordT, IdAccessorT>::loadRecord(ESXRecordT& record, ESM::ESMReader& reader, bool& isDeleted)
     {
-        record.load (reader, isDeleted);
+        record.load(reader, isDeleted);
     }
 
-    template<>
-    inline void IdCollection<Land, IdAccessor<Land> >::loadRecord (Land& record,
-        ESM::ESMReader& reader, bool& isDeleted)
+    template <>
+    inline void IdCollection<Land, IdAccessor<Land>>::loadRecord(Land& record, ESM::ESMReader& reader, bool& isDeleted)
     {
-        record.load (reader, isDeleted);
+        record.load(reader, isDeleted);
 
         // Load all land data for now. A future optimisation may only load non-base data
         // if a suitable mechanism for avoiding race conditions can be established.
-        int flags = ESM::Land::DATA_VHGT | ESM::Land::DATA_VNML |
-            ESM::Land::DATA_VCLR | ESM::Land::DATA_VTEX;
-        record.loadData (flags);
+        int flags = ESM::Land::DATA_VHGT | ESM::Land::DATA_VNML | ESM::Land::DATA_VCLR | ESM::Land::DATA_VTEX;
+        record.loadData(flags);
 
         // Prevent data from being reloaded.
         record.mContext.filename.clear();
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    int IdCollection<ESXRecordT, IdAccessorT>::load (ESM::ESMReader& reader, bool base)
+    template <typename ESXRecordT, typename IdAccessorT>
+    int IdCollection<ESXRecordT, IdAccessorT>::load(ESM::ESMReader& reader, bool base)
     {
         ESXRecordT record;
         bool isDeleted = false;
 
-        loadRecord (record, reader, isDeleted);
+        loadRecord(record, reader, isDeleted);
 
-        std::string id = IdAccessorT().getId (record);
-        int index = this->searchId (id);
+        std::string id = IdAccessorT().getId(record);
+        int index = this->searchId(id);
 
         if (isDeleted)
         {
-            if (index==-1)
+            if (index == -1)
             {
                 // deleting a record that does not exist
                 // ignore it for now
@@ -80,7 +75,7 @@ namespace CSMWorld
 
             if (base)
             {
-                this->removeRows (index, 1);
+                this->removeRows(index, 1);
                 return -1;
             }
 
@@ -90,17 +85,16 @@ namespace CSMWorld
             return index;
         }
 
-        return load (record, base, index);
+        return load(record, base, index);
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    int IdCollection<ESXRecordT, IdAccessorT>::load (const ESXRecordT& record, bool base,
-        int index)
+    template <typename ESXRecordT, typename IdAccessorT>
+    int IdCollection<ESXRecordT, IdAccessorT>::load(const ESXRecordT& record, bool base, int index)
     {
-        if (index==-2) // index unknown
-            index = this->searchId (IdAccessorT().getId (record));
+        if (index == -2) // index unknown
+            index = this->searchId(IdAccessorT().getId(record));
 
-        if (index==-1)
+        if (index == -1)
         {
             // new record
             auto record2 = std::make_unique<Record<ESXRecordT>>();
@@ -126,22 +120,22 @@ namespace CSMWorld
         return index;
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    bool IdCollection<ESXRecordT, IdAccessorT>::tryDelete (const std::string& id)
+    template <typename ESXRecordT, typename IdAccessorT>
+    bool IdCollection<ESXRecordT, IdAccessorT>::tryDelete(const std::string& id)
     {
-        int index = this->searchId (id);
+        int index = this->searchId(id);
 
-        if (index==-1)
+        if (index == -1)
             return false;
 
-        const Record<ESXRecordT>& record = Collection<ESXRecordT, IdAccessorT>::getRecord (index);
+        const Record<ESXRecordT>& record = Collection<ESXRecordT, IdAccessorT>::getRecord(index);
 
         if (record.isDeleted())
             return false;
 
-        if (record.mState==RecordBase::State_ModifiedOnly)
+        if (record.mState == RecordBase::State_ModifiedOnly)
         {
-            Collection<ESXRecordT, IdAccessorT>::removeRows (index, 1);
+            Collection<ESXRecordT, IdAccessorT>::removeRows(index, 1);
         }
         else
         {
@@ -153,8 +147,8 @@ namespace CSMWorld
         return true;
     }
 
-    template<>
-    int IdCollection<Pathgrid, IdAccessor<Pathgrid> >::load(ESM::ESMReader& reader, bool base);
+    template <>
+    int IdCollection<Pathgrid, IdAccessor<Pathgrid>>::load(ESM::ESMReader& reader, bool base);
 }
 
 #endif
diff --git a/apps/opencs/model/world/idcompletionmanager.cpp b/apps/opencs/model/world/idcompletionmanager.cpp
index 649a960387..722463681a 100644
--- a/apps/opencs/model/world/idcompletionmanager.cpp
+++ b/apps/opencs/model/world/idcompletionmanager.cpp
@@ -13,37 +13,36 @@ namespace
     {
         std::map<CSMWorld::ColumnBase::Display, CSMWorld::UniversalId::Type> types;
 
-        types[CSMWorld::ColumnBase::Display_BodyPart            ] = CSMWorld::UniversalId::Type_BodyPart;
-        types[CSMWorld::ColumnBase::Display_Cell                ] = CSMWorld::UniversalId::Type_Cell;
-        types[CSMWorld::ColumnBase::Display_Class               ] = CSMWorld::UniversalId::Type_Class;
+        types[CSMWorld::ColumnBase::Display_BodyPart] = CSMWorld::UniversalId::Type_BodyPart;
+        types[CSMWorld::ColumnBase::Display_Cell] = CSMWorld::UniversalId::Type_Cell;
+        types[CSMWorld::ColumnBase::Display_Class] = CSMWorld::UniversalId::Type_Class;
         types[CSMWorld::ColumnBase::Display_CreatureLevelledList] = CSMWorld::UniversalId::Type_Referenceable;
-        types[CSMWorld::ColumnBase::Display_Creature            ] = CSMWorld::UniversalId::Type_Referenceable;
-        types[CSMWorld::ColumnBase::Display_Enchantment         ] = CSMWorld::UniversalId::Type_Enchantment;
-        types[CSMWorld::ColumnBase::Display_Faction             ] = CSMWorld::UniversalId::Type_Faction;
-        types[CSMWorld::ColumnBase::Display_GlobalVariable      ] = CSMWorld::UniversalId::Type_Global;
-        types[CSMWorld::ColumnBase::Display_Icon                ] = CSMWorld::UniversalId::Type_Icon;
-        types[CSMWorld::ColumnBase::Display_Journal             ] = CSMWorld::UniversalId::Type_Journal;
-        types[CSMWorld::ColumnBase::Display_Mesh                ] = CSMWorld::UniversalId::Type_Mesh;
-        types[CSMWorld::ColumnBase::Display_Miscellaneous       ] = CSMWorld::UniversalId::Type_Referenceable;
-        types[CSMWorld::ColumnBase::Display_Npc                 ] = CSMWorld::UniversalId::Type_Referenceable;
-        types[CSMWorld::ColumnBase::Display_Race                ] = CSMWorld::UniversalId::Type_Race;
-        types[CSMWorld::ColumnBase::Display_Region              ] = CSMWorld::UniversalId::Type_Region;
-        types[CSMWorld::ColumnBase::Display_Referenceable       ] = CSMWorld::UniversalId::Type_Referenceable;
-        types[CSMWorld::ColumnBase::Display_Script              ] = CSMWorld::UniversalId::Type_Script;
-        types[CSMWorld::ColumnBase::Display_Skill               ] = CSMWorld::UniversalId::Type_Skill;
-        types[CSMWorld::ColumnBase::Display_Sound               ] = CSMWorld::UniversalId::Type_Sound;
-        types[CSMWorld::ColumnBase::Display_SoundRes            ] = CSMWorld::UniversalId::Type_SoundRes;
-        types[CSMWorld::ColumnBase::Display_Spell               ] = CSMWorld::UniversalId::Type_Spell;
-        types[CSMWorld::ColumnBase::Display_Static              ] = CSMWorld::UniversalId::Type_Referenceable;
-        types[CSMWorld::ColumnBase::Display_Texture             ] = CSMWorld::UniversalId::Type_Texture;
-        types[CSMWorld::ColumnBase::Display_Topic               ] = CSMWorld::UniversalId::Type_Topic;
-        types[CSMWorld::ColumnBase::Display_Weapon              ] = CSMWorld::UniversalId::Type_Referenceable;
+        types[CSMWorld::ColumnBase::Display_Creature] = CSMWorld::UniversalId::Type_Referenceable;
+        types[CSMWorld::ColumnBase::Display_Enchantment] = CSMWorld::UniversalId::Type_Enchantment;
+        types[CSMWorld::ColumnBase::Display_Faction] = CSMWorld::UniversalId::Type_Faction;
+        types[CSMWorld::ColumnBase::Display_GlobalVariable] = CSMWorld::UniversalId::Type_Global;
+        types[CSMWorld::ColumnBase::Display_Icon] = CSMWorld::UniversalId::Type_Icon;
+        types[CSMWorld::ColumnBase::Display_Journal] = CSMWorld::UniversalId::Type_Journal;
+        types[CSMWorld::ColumnBase::Display_Mesh] = CSMWorld::UniversalId::Type_Mesh;
+        types[CSMWorld::ColumnBase::Display_Miscellaneous] = CSMWorld::UniversalId::Type_Referenceable;
+        types[CSMWorld::ColumnBase::Display_Npc] = CSMWorld::UniversalId::Type_Referenceable;
+        types[CSMWorld::ColumnBase::Display_Race] = CSMWorld::UniversalId::Type_Race;
+        types[CSMWorld::ColumnBase::Display_Region] = CSMWorld::UniversalId::Type_Region;
+        types[CSMWorld::ColumnBase::Display_Referenceable] = CSMWorld::UniversalId::Type_Referenceable;
+        types[CSMWorld::ColumnBase::Display_Script] = CSMWorld::UniversalId::Type_Script;
+        types[CSMWorld::ColumnBase::Display_Skill] = CSMWorld::UniversalId::Type_Skill;
+        types[CSMWorld::ColumnBase::Display_Sound] = CSMWorld::UniversalId::Type_Sound;
+        types[CSMWorld::ColumnBase::Display_SoundRes] = CSMWorld::UniversalId::Type_SoundRes;
+        types[CSMWorld::ColumnBase::Display_Spell] = CSMWorld::UniversalId::Type_Spell;
+        types[CSMWorld::ColumnBase::Display_Static] = CSMWorld::UniversalId::Type_Referenceable;
+        types[CSMWorld::ColumnBase::Display_Texture] = CSMWorld::UniversalId::Type_Texture;
+        types[CSMWorld::ColumnBase::Display_Topic] = CSMWorld::UniversalId::Type_Topic;
+        types[CSMWorld::ColumnBase::Display_Weapon] = CSMWorld::UniversalId::Type_Referenceable;
 
         return types;
     }
 
-    typedef std::map<CSMWorld::ColumnBase::Display, 
-                     CSMWorld::UniversalId::Type>::const_iterator ModelTypeConstIterator;
+    typedef std::map<CSMWorld::ColumnBase::Display, CSMWorld::UniversalId::Type>::const_iterator ModelTypeConstIterator;
 }
 
 const std::map<CSMWorld::ColumnBase::Display, CSMWorld::UniversalId::Type>
@@ -65,7 +64,7 @@ std::vector<CSMWorld::ColumnBase::Display> CSMWorld::IdCompletionManager::getDis
     return types;
 }
 
-CSMWorld::IdCompletionManager::IdCompletionManager(CSMWorld::Data &data)
+CSMWorld::IdCompletionManager::IdCompletionManager(CSMWorld::Data& data)
 {
     generateCompleters(data);
 }
@@ -84,14 +83,14 @@ std::shared_ptr<QCompleter> CSMWorld::IdCompletionManager::getCompleter(CSMWorld
     return mCompleters[display];
 }
 
-void CSMWorld::IdCompletionManager::generateCompleters(CSMWorld::Data &data)
+void CSMWorld::IdCompletionManager::generateCompleters(CSMWorld::Data& data)
 {
     ModelTypeConstIterator current = sCompleterModelTypes.begin();
     ModelTypeConstIterator end = sCompleterModelTypes.end();
     for (; current != end; ++current)
     {
-        QAbstractItemModel *model = data.getTableModel(current->second);
-        CSMWorld::IdTableBase *table = dynamic_cast<CSMWorld::IdTableBase *>(model);
+        QAbstractItemModel* model = data.getTableModel(current->second);
+        CSMWorld::IdTableBase* table = dynamic_cast<CSMWorld::IdTableBase*>(model);
         if (table != nullptr)
         {
             int idColumn = table->searchColumnIndex(CSMWorld::Columns::ColumnId_Id);
@@ -103,7 +102,7 @@ void CSMWorld::IdCompletionManager::generateCompleters(CSMWorld::Data &data)
                 completer->setCompletionRole(Qt::DisplayRole);
                 completer->setCaseSensitivity(Qt::CaseInsensitive);
 
-                QAbstractItemView *popup = new CSVWidget::CompleterPopup();
+                QAbstractItemView* popup = new CSVWidget::CompleterPopup();
                 completer->setPopup(popup); // The completer takes ownership of the popup
                 completer->setMaxVisibleItems(10);
 
diff --git a/apps/opencs/model/world/idcompletionmanager.hpp b/apps/opencs/model/world/idcompletionmanager.hpp
index e48360432a..b1e9f732fd 100644
--- a/apps/opencs/model/world/idcompletionmanager.hpp
+++ b/apps/opencs/model/world/idcompletionmanager.hpp
@@ -1,9 +1,9 @@
 #ifndef CSM_WORLD_IDCOMPLETIONMANAGER_HPP
 #define CSM_WORLD_IDCOMPLETIONMANAGER_HPP
 
-#include <vector>
 #include <map>
 #include <memory>
+#include <vector>
 
 #include "columnbase.hpp"
 #include "universalid.hpp"
@@ -17,23 +17,23 @@ namespace CSMWorld
     /// \brief Creates and stores all ID completers
     class IdCompletionManager
     {
-            static const std::map<ColumnBase::Display, UniversalId::Type> sCompleterModelTypes;
+        static const std::map<ColumnBase::Display, UniversalId::Type> sCompleterModelTypes;
 
-            std::map<ColumnBase::Display, std::shared_ptr<QCompleter> > mCompleters;
+        std::map<ColumnBase::Display, std::shared_ptr<QCompleter>> mCompleters;
 
-            // Don't allow copying
-            IdCompletionManager(const IdCompletionManager &);
-            IdCompletionManager &operator = (const IdCompletionManager &);
+        // Don't allow copying
+        IdCompletionManager(const IdCompletionManager&);
+        IdCompletionManager& operator=(const IdCompletionManager&);
 
-            void generateCompleters(Data &data);
+        void generateCompleters(Data& data);
 
-        public:
-            static std::vector<ColumnBase::Display> getDisplayTypes();
+    public:
+        static std::vector<ColumnBase::Display> getDisplayTypes();
 
-            IdCompletionManager(Data &data);
+        IdCompletionManager(Data& data);
 
-            bool hasCompleterFor(ColumnBase::Display display) const;
-            std::shared_ptr<QCompleter> getCompleter(ColumnBase::Display display);
+        bool hasCompleterFor(ColumnBase::Display display) const;
+        std::shared_ptr<QCompleter> getCompleter(ColumnBase::Display display);
     };
 }
 
diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index 61315459ac..531d3404bf 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -13,14 +13,15 @@
 #include "columnbase.hpp"
 #include "landtexture.hpp"
 
-CSMWorld::IdTable::IdTable (CollectionBase *idCollection, unsigned int features)
-: IdTableBase (features), mIdCollection (idCollection)
-{}
+CSMWorld::IdTable::IdTable(CollectionBase* idCollection, unsigned int features)
+    : IdTableBase(features)
+    , mIdCollection(idCollection)
+{
+}
 
-CSMWorld::IdTable::~IdTable()
-{}
+CSMWorld::IdTable::~IdTable() {}
 
-int CSMWorld::IdTable::rowCount (const QModelIndex & parent) const
+int CSMWorld::IdTable::rowCount(const QModelIndex& parent) const
 {
     if (parent.isValid())
         return 0;
@@ -28,7 +29,7 @@ int CSMWorld::IdTable::rowCount (const QModelIndex & parent) const
     return mIdCollection->getSize();
 }
 
-int CSMWorld::IdTable::columnCount (const QModelIndex & parent) const
+int CSMWorld::IdTable::columnCount(const QModelIndex& parent) const
 {
     if (parent.isValid())
         return 0;
@@ -36,54 +37,54 @@ int CSMWorld::IdTable::columnCount (const QModelIndex & parent) const
     return mIdCollection->getColumns();
 }
 
-QVariant CSMWorld::IdTable::data (const QModelIndex & index, int role) const
+QVariant CSMWorld::IdTable::data(const QModelIndex& index, int role) const
 {
     if (index.row() < 0 || index.column() < 0)
         return QVariant();
 
-    if (role==ColumnBase::Role_Display)
+    if (role == ColumnBase::Role_Display)
         return QVariant(mIdCollection->getColumn(index.column()).mDisplayType);
 
-    if (role==ColumnBase::Role_ColumnId)
-        return QVariant (getColumnId (index.column()));
+    if (role == ColumnBase::Role_ColumnId)
+        return QVariant(getColumnId(index.column()));
 
-    if ((role!=Qt::DisplayRole && role!=Qt::EditRole))
+    if ((role != Qt::DisplayRole && role != Qt::EditRole))
         return QVariant();
 
-    if (role==Qt::EditRole && !mIdCollection->getColumn (index.column()).isEditable())
+    if (role == Qt::EditRole && !mIdCollection->getColumn(index.column()).isEditable())
         return QVariant();
 
-    return mIdCollection->getData (index.row(), index.column());
+    return mIdCollection->getData(index.row(), index.column());
 }
 
-QVariant CSMWorld::IdTable::headerData (int section, Qt::Orientation orientation, int role) const
+QVariant CSMWorld::IdTable::headerData(int section, Qt::Orientation orientation, int role) const
 {
-    if (orientation==Qt::Vertical)
+    if (orientation == Qt::Vertical)
         return QVariant();
 
     if (orientation != Qt::Horizontal)
         throw std::logic_error("Unknown header orientation specified");
 
-    if (role==Qt::DisplayRole)
-        return tr (mIdCollection->getColumn (section).getTitle().c_str());
+    if (role == Qt::DisplayRole)
+        return tr(mIdCollection->getColumn(section).getTitle().c_str());
 
-    if (role==ColumnBase::Role_Flags)
-        return mIdCollection->getColumn (section).mFlags;
+    if (role == ColumnBase::Role_Flags)
+        return mIdCollection->getColumn(section).mFlags;
 
-    if (role==ColumnBase::Role_Display)
-        return mIdCollection->getColumn (section).mDisplayType;
+    if (role == ColumnBase::Role_Display)
+        return mIdCollection->getColumn(section).mDisplayType;
 
-    if (role==ColumnBase::Role_ColumnId)
-        return getColumnId (section);
+    if (role == ColumnBase::Role_ColumnId)
+        return getColumnId(section);
 
     return QVariant();
 }
 
-bool CSMWorld::IdTable::setData (const QModelIndex &index, const QVariant &value, int role)
+bool CSMWorld::IdTable::setData(const QModelIndex& index, const QVariant& value, int role)
 {
-    if (mIdCollection->getColumn (index.column()).isEditable() && role==Qt::EditRole)
+    if (mIdCollection->getColumn(index.column()).isEditable() && role == Qt::EditRole)
     {
-        mIdCollection->setData (index.row(), index.column(), value);
+        mIdCollection->setData(index.row(), index.column(), value);
 
         int stateColumn = searchColumnIndex(Columns::ColumnId_Modification);
         if (stateColumn != -1)
@@ -93,10 +94,10 @@ bool CSMWorld::IdTable::setData (const QModelIndex &index, const QVariant &value
                 // modifying the state column can modify other values. we need to tell
                 // views that the whole row has changed.
 
-                emit dataChanged(this->index(index.row(), 0),
-                                 this->index(index.row(), columnCount(index.parent()) - 1));
-
-            } else
+                emit dataChanged(
+                    this->index(index.row(), 0), this->index(index.row(), columnCount(index.parent()) - 1));
+            }
+            else
             {
                 emit dataChanged(index, index);
 
@@ -104,7 +105,8 @@ bool CSMWorld::IdTable::setData (const QModelIndex &index, const QVariant &value
                 QModelIndex stateIndex = this->index(index.row(), stateColumn);
                 emit dataChanged(stateIndex, stateIndex);
             }
-        } else
+        }
+        else
             emit dataChanged(index, index);
 
         return true;
@@ -113,14 +115,14 @@ bool CSMWorld::IdTable::setData (const QModelIndex &index, const QVariant &value
     return false;
 }
 
-Qt::ItemFlags CSMWorld::IdTable::flags (const QModelIndex & index) const
+Qt::ItemFlags CSMWorld::IdTable::flags(const QModelIndex& index) const
 {
     if (!index.isValid())
         return Qt::ItemFlags();
 
     Qt::ItemFlags flags = Qt::ItemIsSelectable | Qt::ItemIsEnabled;
 
-    if (mIdCollection->getColumn (index.column()).isUserEditable())
+    if (mIdCollection->getColumn(index.column()).isUserEditable())
         flags |= Qt::ItemIsEditable;
 
     int blockedColumn = searchColumnIndex(Columns::ColumnId_Blocked);
@@ -134,60 +136,60 @@ Qt::ItemFlags CSMWorld::IdTable::flags (const QModelIndex & index) const
     return flags;
 }
 
-bool CSMWorld::IdTable::removeRows (int row, int count, const QModelIndex& parent)
+bool CSMWorld::IdTable::removeRows(int row, int count, const QModelIndex& parent)
 {
     if (parent.isValid())
         return false;
 
-    beginRemoveRows (parent, row, row+count-1);
+    beginRemoveRows(parent, row, row + count - 1);
 
-    mIdCollection->removeRows (row, count);
+    mIdCollection->removeRows(row, count);
 
     endRemoveRows();
 
     return true;
 }
 
-QModelIndex CSMWorld::IdTable::index (int row, int column, const QModelIndex& parent) const
+QModelIndex CSMWorld::IdTable::index(int row, int column, const QModelIndex& parent) const
 {
     if (parent.isValid())
         return QModelIndex();
 
-    if (row<0 || row>=mIdCollection->getSize())
+    if (row < 0 || row >= mIdCollection->getSize())
         return QModelIndex();
 
-    if (column<0 || column>=mIdCollection->getColumns())
+    if (column < 0 || column >= mIdCollection->getColumns())
         return QModelIndex();
 
-    return createIndex (row, column);
+    return createIndex(row, column);
 }
 
-QModelIndex CSMWorld::IdTable::parent (const QModelIndex& index) const
+QModelIndex CSMWorld::IdTable::parent(const QModelIndex& index) const
 {
     return QModelIndex();
 }
 
-void CSMWorld::IdTable::addRecord (const std::string& id, UniversalId::Type type)
+void CSMWorld::IdTable::addRecord(const std::string& id, UniversalId::Type type)
 {
-    int index = mIdCollection->getAppendIndex (id, type);
+    int index = mIdCollection->getAppendIndex(id, type);
 
-    beginInsertRows (QModelIndex(), index, index);
+    beginInsertRows(QModelIndex(), index, index);
 
-    mIdCollection->appendBlankRecord (id, type);
+    mIdCollection->appendBlankRecord(id, type);
 
     endInsertRows();
 }
 
-void CSMWorld::IdTable::addRecordWithData (const std::string& id,
-    const std::map<int, QVariant>& data, UniversalId::Type type)
+void CSMWorld::IdTable::addRecordWithData(
+    const std::string& id, const std::map<int, QVariant>& data, UniversalId::Type type)
 {
-    int index = mIdCollection->getAppendIndex (id, type);
+    int index = mIdCollection->getAppendIndex(id, type);
 
-    beginInsertRows (QModelIndex(), index, index);
+    beginInsertRows(QModelIndex(), index, index);
 
-    mIdCollection->appendBlankRecord (id, type);
+    mIdCollection->appendBlankRecord(id, type);
 
-    for (std::map<int, QVariant>::const_iterator iter (data.begin()); iter!=data.end(); ++iter)
+    for (std::map<int, QVariant>::const_iterator iter(data.begin()); iter != data.end(); ++iter)
     {
         mIdCollection->setData(index, iter->first, iter->second);
     }
@@ -195,13 +197,12 @@ void CSMWorld::IdTable::addRecordWithData (const std::string& id,
     endInsertRows();
 }
 
-void CSMWorld::IdTable::cloneRecord(const std::string& origin,
-                                    const std::string& destination,
-                                    CSMWorld::UniversalId::Type type)
+void CSMWorld::IdTable::cloneRecord(
+    const std::string& origin, const std::string& destination, CSMWorld::UniversalId::Type type)
 {
-    int index = mIdCollection->getAppendIndex (destination, type);
+    int index = mIdCollection->getAppendIndex(destination, type);
 
-    beginInsertRows (QModelIndex(), index, index);
+    beginInsertRows(QModelIndex(), index, index);
     mIdCollection->cloneRecord(origin, destination, type);
     endInsertRows();
 }
@@ -226,22 +227,22 @@ std::string CSMWorld::IdTable::getId(int row) const
     return mIdCollection->getId(row);
 }
 
-///This method can return only indexes to the top level table cells
-QModelIndex CSMWorld::IdTable::getModelIndex (const std::string& id, int column) const
+/// This method can return only indexes to the top level table cells
+QModelIndex CSMWorld::IdTable::getModelIndex(const std::string& id, int column) const
 {
-    int row = mIdCollection->searchId (id);
+    int row = mIdCollection->searchId(id);
     if (row != -1)
         return index(row, column);
 
     return QModelIndex();
 }
 
-void CSMWorld::IdTable::setRecord (const std::string& id,
-        std::unique_ptr<RecordBase> record, CSMWorld::UniversalId::Type type)
+void CSMWorld::IdTable::setRecord(
+    const std::string& id, std::unique_ptr<RecordBase> record, CSMWorld::UniversalId::Type type)
 {
-    int index = mIdCollection->searchId (id);
+    int index = mIdCollection->searchId(id);
 
-    if (index==-1)
+    if (index == -1)
     {
         // For info records, appendRecord may use a different index than the one returned by
         // getAppendIndex (because of prev/next links).  This can result in the display not
@@ -249,85 +250,85 @@ void CSMWorld::IdTable::setRecord (const std::string& id,
         //
         // Use an alternative method to get the correct index.  For non-Info records the
         // record pointer is ignored and internally calls getAppendIndex.
-        int index2 = mIdCollection->getInsertIndex (id, type, record.get());
+        int index2 = mIdCollection->getInsertIndex(id, type, record.get());
 
-        beginInsertRows (QModelIndex(), index2, index2);
+        beginInsertRows(QModelIndex(), index2, index2);
 
-        mIdCollection->appendRecord (std::move(record), type);
+        mIdCollection->appendRecord(std::move(record), type);
 
         endInsertRows();
     }
     else
     {
-        mIdCollection->replace (index, std::move(record));
-        emit dataChanged (CSMWorld::IdTable::index (index, 0),
-            CSMWorld::IdTable::index (index, mIdCollection->getColumns()-1));
+        mIdCollection->replace(index, std::move(record));
+        emit dataChanged(
+            CSMWorld::IdTable::index(index, 0), CSMWorld::IdTable::index(index, mIdCollection->getColumns() - 1));
     }
 }
 
-const CSMWorld::RecordBase& CSMWorld::IdTable::getRecord (const std::string& id) const
+const CSMWorld::RecordBase& CSMWorld::IdTable::getRecord(const std::string& id) const
 {
-    return mIdCollection->getRecord (id);
+    return mIdCollection->getRecord(id);
 }
 
-int CSMWorld::IdTable::searchColumnIndex (Columns::ColumnId id) const
+int CSMWorld::IdTable::searchColumnIndex(Columns::ColumnId id) const
 {
-    return mIdCollection->searchColumnIndex (id);
+    return mIdCollection->searchColumnIndex(id);
 }
 
-int CSMWorld::IdTable::findColumnIndex (Columns::ColumnId id) const
+int CSMWorld::IdTable::findColumnIndex(Columns::ColumnId id) const
 {
-    return mIdCollection->findColumnIndex (id);
+    return mIdCollection->findColumnIndex(id);
 }
 
-void CSMWorld::IdTable::reorderRows (int baseIndex, const std::vector<int>& newOrder)
+void CSMWorld::IdTable::reorderRows(int baseIndex, const std::vector<int>& newOrder)
 {
     if (!newOrder.empty())
-        if (mIdCollection->reorderRows (baseIndex, newOrder))
-            emit dataChanged (index (baseIndex, 0),
-                index (baseIndex+static_cast<int>(newOrder.size())-1, mIdCollection->getColumns()-1));
+        if (mIdCollection->reorderRows(baseIndex, newOrder))
+            emit dataChanged(index(baseIndex, 0),
+                index(baseIndex + static_cast<int>(newOrder.size()) - 1, mIdCollection->getColumns() - 1));
 }
 
-std::pair<CSMWorld::UniversalId, std::string> CSMWorld::IdTable::view (int row) const
+std::pair<CSMWorld::UniversalId, std::string> CSMWorld::IdTable::view(int row) const
 {
     std::string id;
     std::string hint;
 
     if (getFeatures() & Feature_ViewCell)
     {
-        int cellColumn = mIdCollection->searchColumnIndex (Columns::ColumnId_Cell);
-        int idColumn = mIdCollection->searchColumnIndex (Columns::ColumnId_Id);
+        int cellColumn = mIdCollection->searchColumnIndex(Columns::ColumnId_Cell);
+        int idColumn = mIdCollection->searchColumnIndex(Columns::ColumnId_Id);
 
-        if (cellColumn!=-1 && idColumn!=-1)
+        if (cellColumn != -1 && idColumn != -1)
         {
-            id = mIdCollection->getData (row, cellColumn).toString().toUtf8().constData();
-            hint = "r:" + std::string (mIdCollection->getData (row, idColumn).toString().toUtf8().constData());
+            id = mIdCollection->getData(row, cellColumn).toString().toUtf8().constData();
+            hint = "r:" + std::string(mIdCollection->getData(row, idColumn).toString().toUtf8().constData());
         }
     }
     else if (getFeatures() & Feature_ViewId)
     {
-        int column = mIdCollection->searchColumnIndex (Columns::ColumnId_Id);
+        int column = mIdCollection->searchColumnIndex(Columns::ColumnId_Id);
 
-        if (column!=-1)
+        if (column != -1)
         {
-            id = mIdCollection->getData (row, column).toString().toUtf8().constData();
+            id = mIdCollection->getData(row, column).toString().toUtf8().constData();
             hint = "c:" + id;
         }
     }
 
     if (id.empty())
-        return std::make_pair (UniversalId::Type_None, "");
+        return std::make_pair(UniversalId::Type_None, "");
 
-    if (id[0]=='#')
+    if (id[0] == '#')
         id = ESM::CellId::sDefaultWorldspace;
 
-    return std::make_pair (UniversalId (UniversalId::Type_Scene, id), hint);
+    return std::make_pair(UniversalId(UniversalId::Type_Scene, id), hint);
 }
 
-///For top level data/columns
-bool CSMWorld::IdTable::isDeleted (const std::string& id) const
+/// For top level data/columns
+bool CSMWorld::IdTable::isDeleted(const std::string& id) const
 {
-    return getRecord (id).isDeleted();
+    return getRecord(id).isDeleted();
 }
 
 int CSMWorld::IdTable::getColumnId(int column) const
@@ -335,7 +336,7 @@ int CSMWorld::IdTable::getColumnId(int column) const
     return mIdCollection->getColumn(column).getId();
 }
 
-CSMWorld::CollectionBase *CSMWorld::IdTable::idCollection() const
+CSMWorld::CollectionBase* CSMWorld::IdTable::idCollection() const
 {
     return mIdCollection;
 }
@@ -345,7 +346,8 @@ CSMWorld::LandTextureIdTable::LandTextureIdTable(CollectionBase* idCollection, u
 {
 }
 
-CSMWorld::LandTextureIdTable::ImportResults CSMWorld::LandTextureIdTable::importTextures(const std::vector<std::string>& ids)
+CSMWorld::LandTextureIdTable::ImportResults CSMWorld::LandTextureIdTable::importTextures(
+    const std::vector<std::string>& ids)
 {
     ImportResults results;
 
@@ -384,7 +386,8 @@ CSMWorld::LandTextureIdTable::ImportResults CSMWorld::LandTextureIdTable::import
 
         // Iterate until an unused index or found, or the index has completely wrapped around.
         int startIndex = index;
-        do {
+        do
+        {
             std::string newId = LandTexture::createUniqueRecordId(0, index);
             int newRow = idCollection()->searchId(newId);
 
diff --git a/apps/opencs/model/world/idtable.hpp b/apps/opencs/model/world/idtable.hpp
index c38e1b5f9c..71cf42f605 100644
--- a/apps/opencs/model/world/idtable.hpp
+++ b/apps/opencs/model/world/idtable.hpp
@@ -1,12 +1,12 @@
 #ifndef CSM_WOLRD_IDTABLE_H
 #define CSM_WOLRD_IDTABLE_H
 
-#include <vector>
 #include <memory>
+#include <vector>
 
+#include "columns.hpp"
 #include "idtablebase.hpp"
 #include "universalid.hpp"
-#include "columns.hpp"
 
 namespace CSMWorld
 {
@@ -15,88 +15,84 @@ namespace CSMWorld
 
     class IdTable : public IdTableBase
     {
-            Q_OBJECT
+        Q_OBJECT
 
-        private:
+    private:
+        CollectionBase* mIdCollection;
 
-            CollectionBase *mIdCollection;
+        // not implemented
+        IdTable(const IdTable&);
+        IdTable& operator=(const IdTable&);
 
-            // not implemented
-            IdTable (const IdTable&);
-            IdTable& operator= (const IdTable&);
+    public:
+        IdTable(CollectionBase* idCollection, unsigned int features = 0);
+        ///< The ownership of \a idCollection is not transferred.
 
-        public:
+        virtual ~IdTable();
 
-            IdTable (CollectionBase *idCollection, unsigned int features = 0);
-            ///< The ownership of \a idCollection is not transferred.
+        int rowCount(const QModelIndex& parent = QModelIndex()) const override;
 
-            virtual ~IdTable();
+        int columnCount(const QModelIndex& parent = QModelIndex()) const override;
 
-            int rowCount (const QModelIndex & parent = QModelIndex()) const override;
+        QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
 
-            int columnCount (const QModelIndex & parent = QModelIndex()) const override;
+        QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
 
-            QVariant data  (const QModelIndex & index, int role = Qt::DisplayRole) const override;
+        bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
 
-            QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+        Qt::ItemFlags flags(const QModelIndex& index) const override;
 
-            bool setData ( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
+        bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
 
-            Qt::ItemFlags flags (const QModelIndex & index) const override;
+        QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
 
-            bool removeRows (int row, int count, const QModelIndex& parent = QModelIndex()) override;
+        QModelIndex parent(const QModelIndex& index) const override;
 
-            QModelIndex index (int row, int column, const QModelIndex& parent = QModelIndex()) const override;
+        void addRecord(const std::string& id, UniversalId::Type type = UniversalId::Type_None);
+        ///< \param type Will be ignored, unless the collection supports multiple record types
 
-            QModelIndex parent (const QModelIndex& index) const override;
+        void addRecordWithData(const std::string& id, const std::map<int, QVariant>& data,
+            UniversalId::Type type = UniversalId::Type_None);
+        ///< \param type Will be ignored, unless the collection supports multiple record types
 
-            void addRecord (const std::string& id, UniversalId::Type type = UniversalId::Type_None);
-            ///< \param type Will be ignored, unless the collection supports multiple record types
+        void cloneRecord(
+            const std::string& origin, const std::string& destination, UniversalId::Type type = UniversalId::Type_None);
 
-            void addRecordWithData (const std::string& id, const std::map<int, QVariant>& data,
-                UniversalId::Type type = UniversalId::Type_None);
-            ///< \param type Will be ignored, unless the collection supports multiple record types
+        bool touchRecord(const std::string& id);
+        ///< Will change the record state to modified, if it is not already.
 
-            void cloneRecord(const std::string& origin,
-                             const std::string& destination,
-                             UniversalId::Type type = UniversalId::Type_None);
+        std::string getId(int row) const;
 
-            bool touchRecord(const std::string& id);
-            ///< Will change the record state to modified, if it is not already.
+        QModelIndex getModelIndex(const std::string& id, int column) const override;
 
-            std::string getId(int row) const;
+        void setRecord(
+            const std::string& id, std::unique_ptr<RecordBase> record, UniversalId::Type type = UniversalId::Type_None);
+        ///< Add record or overwrite existing record.
 
-            QModelIndex getModelIndex (const std::string& id, int column) const override;
+        const RecordBase& getRecord(const std::string& id) const;
 
-            void setRecord (const std::string& id, std::unique_ptr<RecordBase> record,
-                    UniversalId::Type type = UniversalId::Type_None);
-            ///< Add record or overwrite existing record.
+        int searchColumnIndex(Columns::ColumnId id) const override;
+        ///< Return index of column with the given \a id. If no such column exists, -1 is returned.
 
-            const RecordBase& getRecord (const std::string& id) const;
+        int findColumnIndex(Columns::ColumnId id) const override;
+        ///< Return index of column with the given \a id. If no such column exists, an exception is
+        /// thrown.
 
-            int searchColumnIndex (Columns::ColumnId id) const override;
-            ///< Return index of column with the given \a id. If no such column exists, -1 is returned.
+        void reorderRows(int baseIndex, const std::vector<int>& newOrder);
+        ///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices
+        /// given in \a newOrder (baseIndex+newOrder[0] specifies the new index of row baseIndex).
 
-            int findColumnIndex (Columns::ColumnId id) const override;
-            ///< Return index of column with the given \a id. If no such column exists, an exception is
-            /// thrown.
+        std::pair<UniversalId, std::string> view(int row) const override;
+        ///< Return the UniversalId and the hint for viewing \a row. If viewing is not
+        /// supported by this table, return (UniversalId::Type_None, "").
 
-            void reorderRows (int baseIndex, const std::vector<int>& newOrder);
-            ///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices
-            /// given in \a newOrder (baseIndex+newOrder[0] specifies the new index of row baseIndex).
+        /// Is \a id flagged as deleted?
+        bool isDeleted(const std::string& id) const override;
 
-            std::pair<UniversalId, std::string> view (int row) const override;
-            ///< Return the UniversalId and the hint for viewing \a row. If viewing is not
-            /// supported by this table, return (UniversalId::Type_None, "").
+        int getColumnId(int column) const override;
 
-            /// Is \a id flagged as deleted?
-            bool isDeleted (const std::string& id) const override;
-
-            int getColumnId(int column) const override;
-
-        protected:
-
-            virtual CollectionBase *idCollection() const;
+    protected:
+        virtual CollectionBase* idCollection() const;
     };
 
     /// An IdTable customized to handle the more unique needs of LandTextureId's which behave
@@ -104,22 +100,21 @@ namespace CSMWorld
     /// modified.
     class LandTextureIdTable : public IdTable
     {
-        public:
-
-            struct ImportResults
-            {
-                using StringPair = std::pair<std::string,std::string>;
+    public:
+        struct ImportResults
+        {
+            using StringPair = std::pair<std::string, std::string>;
 
-                /// The newly added records
-                std::vector<std::string> createdRecords;
-                /// The 1st string is the original id, the 2nd is the mapped id
-                std::vector<StringPair> recordMapping;
-            };
+            /// The newly added records
+            std::vector<std::string> createdRecords;
+            /// The 1st string is the original id, the 2nd is the mapped id
+            std::vector<StringPair> recordMapping;
+        };
 
-            LandTextureIdTable(CollectionBase* idCollection, unsigned int features=0);
+        LandTextureIdTable(CollectionBase* idCollection, unsigned int features = 0);
 
-            /// Finds and maps/recreates the specified ids.
-            ImportResults importTextures(const std::vector<std::string>& ids);
+        /// Finds and maps/recreates the specified ids.
+        ImportResults importTextures(const std::vector<std::string>& ids);
     };
 }
 
diff --git a/apps/opencs/model/world/idtablebase.cpp b/apps/opencs/model/world/idtablebase.cpp
index 274446b796..fd523d1ec7 100644
--- a/apps/opencs/model/world/idtablebase.cpp
+++ b/apps/opencs/model/world/idtablebase.cpp
@@ -1,6 +1,9 @@
 #include "idtablebase.hpp"
 
-CSMWorld::IdTableBase::IdTableBase (unsigned int features) : mFeatures (features) {}
+CSMWorld::IdTableBase::IdTableBase(unsigned int features)
+    : mFeatures(features)
+{
+}
 
 unsigned int CSMWorld::IdTableBase::getFeatures() const
 {
diff --git a/apps/opencs/model/world/idtablebase.hpp b/apps/opencs/model/world/idtablebase.hpp
index 8b82f984b9..d4ef5d7770 100644
--- a/apps/opencs/model/world/idtablebase.hpp
+++ b/apps/opencs/model/world/idtablebase.hpp
@@ -11,60 +11,57 @@ namespace CSMWorld
 
     class IdTableBase : public QAbstractItemModel
     {
-            Q_OBJECT
+        Q_OBJECT
 
-        public:
+    public:
+        enum Features
+        {
+            Feature_ReorderWithinTopic = 1,
 
-            enum Features
-            {
-                Feature_ReorderWithinTopic = 1,
+            /// Use ID column to generate view request (ID is transformed into
+            /// worldspace and original ID is passed as hint with c: prefix).
+            Feature_ViewId = 2,
 
-                /// Use ID column to generate view request (ID is transformed into
-                /// worldspace and original ID is passed as hint with c: prefix).
-                Feature_ViewId = 2,
+            /// Use cell column to generate view request (cell ID is transformed
+            /// into worldspace and record ID is passed as hint with r: prefix).
+            Feature_ViewCell = 4,
 
-                /// Use cell column to generate view request (cell ID is transformed
-                /// into worldspace and record ID is passed as hint with r: prefix).
-                Feature_ViewCell = 4,
+            Feature_View = Feature_ViewId | Feature_ViewCell,
 
-                Feature_View = Feature_ViewId | Feature_ViewCell,
+            Feature_Preview = 8,
 
-                Feature_Preview = 8,
+            /// Table can not be modified through ordinary means.
+            Feature_Constant = 16,
 
-                /// Table can not be modified through ordinary means.
-                Feature_Constant = 16,
+            Feature_AllowTouch = 32
+        };
 
-                Feature_AllowTouch = 32
-            };
+    private:
+        unsigned int mFeatures;
 
-        private:
+    public:
+        IdTableBase(unsigned int features);
 
-            unsigned int mFeatures;
+        virtual QModelIndex getModelIndex(const std::string& id, int column) const = 0;
 
-        public:
+        /// Return index of column with the given \a id. If no such column exists, -1 is
+        /// returned.
+        virtual int searchColumnIndex(Columns::ColumnId id) const = 0;
 
-            IdTableBase (unsigned int features);
+        /// Return index of column with the given \a id. If no such column exists, an
+        /// exception is thrown.
+        virtual int findColumnIndex(Columns::ColumnId id) const = 0;
 
-            virtual QModelIndex getModelIndex (const std::string& id, int column) const = 0;
+        /// Return the UniversalId and the hint for viewing \a row. If viewing is not
+        /// supported by this table, return (UniversalId::Type_None, "").
+        virtual std::pair<UniversalId, std::string> view(int row) const = 0;
 
-            /// Return index of column with the given \a id. If no such column exists, -1 is
-            /// returned.
-            virtual int searchColumnIndex (Columns::ColumnId id) const = 0;
+        /// Is \a id flagged as deleted?
+        virtual bool isDeleted(const std::string& id) const = 0;
 
-            /// Return index of column with the given \a id. If no such column exists, an
-            /// exception is thrown.
-            virtual int findColumnIndex (Columns::ColumnId id) const = 0;
+        virtual int getColumnId(int column) const = 0;
 
-            /// Return the UniversalId and the hint for viewing \a row. If viewing is not
-            /// supported by this table, return (UniversalId::Type_None, "").
-            virtual std::pair<UniversalId, std::string> view (int row) const = 0;
-
-            /// Is \a id flagged as deleted?
-            virtual bool isDeleted (const std::string& id) const = 0;
-
-            virtual int getColumnId (int column) const = 0;
-
-            unsigned int getFeatures() const;
+        unsigned int getFeatures() const;
     };
 }
 
diff --git a/apps/opencs/model/world/idtableproxymodel.cpp b/apps/opencs/model/world/idtableproxymodel.cpp
index d0e7bd8a59..4d68c03ce2 100644
--- a/apps/opencs/model/world/idtableproxymodel.cpp
+++ b/apps/opencs/model/world/idtableproxymodel.cpp
@@ -2,12 +2,12 @@
 
 #include <vector>
 
-#include "idtablebase.hpp"
 #include "columnbase.hpp"
+#include "idtablebase.hpp"
 
 namespace
 {
-    std::string getEnumValue(const std::vector<std::pair<int,std::string>> &values, int index)
+    std::string getEnumValue(const std::vector<std::pair<int, std::string>>& values, int index)
     {
         if (index < 0 || index >= static_cast<int>(values.size()))
         {
@@ -25,14 +25,13 @@ void CSMWorld::IdTableProxyModel::updateColumnMap()
     if (mFilter)
     {
         std::vector<int> columns = mFilter->getReferencedColumns();
-        for (std::vector<int>::const_iterator iter (columns.begin()); iter!=columns.end(); ++iter)
-            mColumnMap.insert (std::make_pair (*iter,
-                mSourceModel->searchColumnIndex (static_cast<CSMWorld::Columns::ColumnId> (*iter))));
+        for (std::vector<int>::const_iterator iter(columns.begin()); iter != columns.end(); ++iter)
+            mColumnMap.insert(std::make_pair(
+                *iter, mSourceModel->searchColumnIndex(static_cast<CSMWorld::Columns::ColumnId>(*iter))));
     }
 }
 
-bool CSMWorld::IdTableProxyModel::filterAcceptsRow (int sourceRow, const QModelIndex& sourceParent)
-    const
+bool CSMWorld::IdTableProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const
 {
     Q_ASSERT(mSourceModel != nullptr);
 
@@ -47,37 +46,34 @@ bool CSMWorld::IdTableProxyModel::filterAcceptsRow (int sourceRow, const QModelI
     if (!mFilter)
         return true;
 
-    return mFilter->test (*mSourceModel, sourceRow, mColumnMap);
+    return mFilter->test(*mSourceModel, sourceRow, mColumnMap);
 }
 
-CSMWorld::IdTableProxyModel::IdTableProxyModel (QObject *parent)
-    : QSortFilterProxyModel (parent),
-      mSourceModel(nullptr)
+CSMWorld::IdTableProxyModel::IdTableProxyModel(QObject* parent)
+    : QSortFilterProxyModel(parent)
+    , mSourceModel(nullptr)
 {
-    setSortCaseSensitivity (Qt::CaseInsensitive);
+    setSortCaseSensitivity(Qt::CaseInsensitive);
 }
 
-QModelIndex CSMWorld::IdTableProxyModel::getModelIndex (const std::string& id, int column) const
+QModelIndex CSMWorld::IdTableProxyModel::getModelIndex(const std::string& id, int column) const
 {
     Q_ASSERT(mSourceModel != nullptr);
 
-    return mapFromSource(mSourceModel->getModelIndex (id, column));
+    return mapFromSource(mSourceModel->getModelIndex(id, column));
 }
 
-void CSMWorld::IdTableProxyModel::setSourceModel(QAbstractItemModel *model)
+void CSMWorld::IdTableProxyModel::setSourceModel(QAbstractItemModel* model)
 {
     QSortFilterProxyModel::setSourceModel(model);
 
-    mSourceModel = dynamic_cast<IdTableBase *>(sourceModel());
-    connect(mSourceModel, &IdTableBase::rowsInserted,
-            this, &IdTableProxyModel::sourceRowsInserted);
-    connect(mSourceModel, &IdTableBase::rowsRemoved,
-            this, &IdTableProxyModel::sourceRowsRemoved);
-    connect(mSourceModel, &IdTableBase::dataChanged,
-            this, &IdTableProxyModel::sourceDataChanged);
+    mSourceModel = dynamic_cast<IdTableBase*>(sourceModel());
+    connect(mSourceModel, &IdTableBase::rowsInserted, this, &IdTableProxyModel::sourceRowsInserted);
+    connect(mSourceModel, &IdTableBase::rowsRemoved, this, &IdTableProxyModel::sourceRowsRemoved);
+    connect(mSourceModel, &IdTableBase::dataChanged, this, &IdTableProxyModel::sourceDataChanged);
 }
 
-void CSMWorld::IdTableProxyModel::setFilter (const std::shared_ptr<CSMFilter::Node>& filter)
+void CSMWorld::IdTableProxyModel::setFilter(const std::shared_ptr<CSMFilter::Node>& filter)
 {
     beginResetModel();
     mFilter = filter;
@@ -85,7 +81,7 @@ void CSMWorld::IdTableProxyModel::setFilter (const std::shared_ptr<CSMFilter::No
     endResetModel();
 }
 
-bool CSMWorld::IdTableProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
+bool CSMWorld::IdTableProxyModel::lessThan(const QModelIndex& left, const QModelIndex& right) const
 {
     Columns::ColumnId id = static_cast<Columns::ColumnId>(left.data(ColumnBase::Role_ColumnId).toInt());
     EnumColumnCache::const_iterator valuesIt = mEnumColumnCache.find(id);
@@ -123,7 +119,7 @@ void CSMWorld::IdTableProxyModel::refreshFilter()
     }
 }
 
-void CSMWorld::IdTableProxyModel::sourceRowsInserted(const QModelIndex &parent, int /*start*/, int end)
+void CSMWorld::IdTableProxyModel::sourceRowsInserted(const QModelIndex& parent, int /*start*/, int end)
 {
     refreshFilter();
     if (!parent.isValid())
@@ -132,12 +128,12 @@ void CSMWorld::IdTableProxyModel::sourceRowsInserted(const QModelIndex &parent,
     }
 }
 
-void CSMWorld::IdTableProxyModel::sourceRowsRemoved(const QModelIndex &/*parent*/, int /*start*/, int /*end*/)
+void CSMWorld::IdTableProxyModel::sourceRowsRemoved(const QModelIndex& /*parent*/, int /*start*/, int /*end*/)
 {
     refreshFilter();
 }
 
-void CSMWorld::IdTableProxyModel::sourceDataChanged(const QModelIndex &/*topLeft*/, const QModelIndex &/*bottomRight*/)
+void CSMWorld::IdTableProxyModel::sourceDataChanged(const QModelIndex& /*topLeft*/, const QModelIndex& /*bottomRight*/)
 {
     refreshFilter();
 }
diff --git a/apps/opencs/model/world/idtableproxymodel.hpp b/apps/opencs/model/world/idtableproxymodel.hpp
index 7e0563834a..2af94f4ccf 100644
--- a/apps/opencs/model/world/idtableproxymodel.hpp
+++ b/apps/opencs/model/world/idtableproxymodel.hpp
@@ -15,55 +15,51 @@ namespace CSMWorld
 {
     class IdTableProxyModel : public QSortFilterProxyModel
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            std::shared_ptr<CSMFilter::Node> mFilter;
-            std::map<int, int> mColumnMap; // column ID, column index in this model (or -1)
+        std::shared_ptr<CSMFilter::Node> mFilter;
+        std::map<int, int> mColumnMap; // column ID, column index in this model (or -1)
 
-            // Cache of enum values for enum columns (e.g. Modified, Record Type).
-            // Used to speed up comparisons during the sort by such columns.
-            typedef std::map<Columns::ColumnId, std::vector<std::pair<int,std::string>> > EnumColumnCache;
-            mutable EnumColumnCache mEnumColumnCache;
+        // Cache of enum values for enum columns (e.g. Modified, Record Type).
+        // Used to speed up comparisons during the sort by such columns.
+        typedef std::map<Columns::ColumnId, std::vector<std::pair<int, std::string>>> EnumColumnCache;
+        mutable EnumColumnCache mEnumColumnCache;
 
-        protected:
+    protected:
+        IdTableBase* mSourceModel;
 
-            IdTableBase *mSourceModel;
+    private:
+        void updateColumnMap();
 
-        private:
+    public:
+        IdTableProxyModel(QObject* parent = nullptr);
 
-            void updateColumnMap();
+        virtual QModelIndex getModelIndex(const std::string& id, int column) const;
 
-        public:
+        void setSourceModel(QAbstractItemModel* model) override;
 
-            IdTableProxyModel (QObject *parent = nullptr);
+        void setFilter(const std::shared_ptr<CSMFilter::Node>& filter);
 
-            virtual QModelIndex getModelIndex (const std::string& id, int column) const;
+        void refreshFilter();
 
-            void setSourceModel(QAbstractItemModel *model) override;
+    protected:
+        bool lessThan(const QModelIndex& left, const QModelIndex& right) const override;
 
-            void setFilter (const std::shared_ptr<CSMFilter::Node>& filter);
+        bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override;
 
-            void refreshFilter();
+        QString getRecordId(int sourceRow) const;
 
-        protected:
+    protected slots:
 
-            bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
+        virtual void sourceRowsInserted(const QModelIndex& parent, int start, int end);
 
-            bool filterAcceptsRow (int sourceRow, const QModelIndex& sourceParent) const override;
+        virtual void sourceRowsRemoved(const QModelIndex& parent, int start, int end);
 
-            QString getRecordId(int sourceRow) const;
+        virtual void sourceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
-        protected slots:
+    signals:
 
-            virtual void sourceRowsInserted(const QModelIndex &parent, int start, int end);
-
-            virtual void sourceRowsRemoved(const QModelIndex &parent, int start, int end);
-
-            virtual void sourceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
-
-        signals:
-
-            void rowAdded(const std::string &id);
+        void rowAdded(const std::string& id);
     };
 }
 
diff --git a/apps/opencs/model/world/idtree.cpp b/apps/opencs/model/world/idtree.cpp
index 1e3398bbb2..35792ad532 100644
--- a/apps/opencs/model/world/idtree.cpp
+++ b/apps/opencs/model/world/idtree.cpp
@@ -3,18 +3,19 @@
 #include "nestedtablewrapper.hpp"
 
 #include "collectionbase.hpp"
-#include "nestedcollection.hpp"
 #include "columnbase.hpp"
+#include "nestedcollection.hpp"
 
 // NOTE: parent class still needs idCollection
-CSMWorld::IdTree::IdTree (NestedCollection *nestedCollection, CollectionBase *idCollection, unsigned int features)
-: IdTable (idCollection, features), mNestedCollection (nestedCollection)
-{}
+CSMWorld::IdTree::IdTree(NestedCollection* nestedCollection, CollectionBase* idCollection, unsigned int features)
+    : IdTable(idCollection, features)
+    , mNestedCollection(nestedCollection)
+{
+}
 
-CSMWorld::IdTree::~IdTree()
-{}
+CSMWorld::IdTree::~IdTree() {}
 
-int CSMWorld::IdTree::rowCount (const QModelIndex & parent) const
+int CSMWorld::IdTree::rowCount(const QModelIndex& parent) const
 {
     if (hasChildren(parent))
         return mNestedCollection->getNestedRowsCount(parent.row(), parent.column());
@@ -22,7 +23,7 @@ int CSMWorld::IdTree::rowCount (const QModelIndex & parent) const
     return IdTable::rowCount(parent);
 }
 
-int CSMWorld::IdTree::columnCount (const QModelIndex & parent) const
+int CSMWorld::IdTree::columnCount(const QModelIndex& parent) const
 {
     if (hasChildren(parent))
         return mNestedCollection->getNestedColumnsCount(parent.row(), parent.column());
@@ -30,15 +31,15 @@ int CSMWorld::IdTree::columnCount (const QModelIndex & parent) const
     return IdTable::columnCount(parent);
 }
 
-QVariant CSMWorld::IdTree::data  (const QModelIndex & index, int role) const
+QVariant CSMWorld::IdTree::data(const QModelIndex& index, int role) const
 {
-     if (!index.isValid())
-          return QVariant();
+    if (!index.isValid())
+        return QVariant();
 
     if (index.internalId() != 0)
     {
         std::pair<int, int> parentAddress(unfoldIndexAddress(index.internalId()));
-        const NestableColumn *parentColumn = mNestedCollection->getNestableColumn(parentAddress.second);
+        const NestableColumn* parentColumn = mNestedCollection->getNestableColumn(parentAddress.second);
 
         if (role == ColumnBase::Role_Display)
             return parentColumn->nestedColumn(index.column()).mDisplayType;
@@ -52,8 +53,7 @@ QVariant CSMWorld::IdTree::data  (const QModelIndex & index, int role) const
         if (role != Qt::DisplayRole && role != Qt::EditRole)
             return QVariant();
 
-        return mNestedCollection->getNestedData(parentAddress.first,
-                                            parentAddress.second, index.row(), index.column());
+        return mNestedCollection->getNestedData(parentAddress.first, parentAddress.second, index.row(), index.column());
     }
     else
     {
@@ -66,35 +66,36 @@ QVariant CSMWorld::IdTree::nestedHeaderData(int section, int subSection, Qt::Ori
     if (section < 0 || section >= idCollection()->getColumns())
         return QVariant();
 
-    const NestableColumn *parentColumn = mNestedCollection->getNestableColumn(section);
+    const NestableColumn* parentColumn = mNestedCollection->getNestableColumn(section);
 
-    if (orientation==Qt::Vertical)
+    if (orientation == Qt::Vertical)
         return QVariant();
 
-    if (role==Qt::DisplayRole)
+    if (role == Qt::DisplayRole)
         return tr(parentColumn->nestedColumn(subSection).getTitle().c_str());
 
-    if (role==ColumnBase::Role_Flags)
+    if (role == ColumnBase::Role_Flags)
         return parentColumn->nestedColumn(subSection).mFlags;
 
-    if (role==ColumnBase::Role_Display)
+    if (role == ColumnBase::Role_Display)
         return parentColumn->nestedColumn(subSection).mDisplayType;
 
-    if (role==ColumnBase::Role_ColumnId)
+    if (role == ColumnBase::Role_ColumnId)
         return parentColumn->nestedColumn(subSection).mColumnId;
 
     return QVariant();
 }
 
-bool CSMWorld::IdTree::setData (const QModelIndex &index, const QVariant &value, int role)
+bool CSMWorld::IdTree::setData(const QModelIndex& index, const QVariant& value, int role)
 {
     if (index.internalId() != 0)
     {
-        if (idCollection()->getColumn(parent(index).column()).isEditable() && role==Qt::EditRole)
+        if (idCollection()->getColumn(parent(index).column()).isEditable() && role == Qt::EditRole)
         {
             const std::pair<int, int>& parentAddress(unfoldIndexAddress(index.internalId()));
 
-            mNestedCollection->setNestedData(parentAddress.first, parentAddress.second, value, index.row(), index.column());
+            mNestedCollection->setNestedData(
+                parentAddress.first, parentAddress.second, value, index.row(), index.column());
             emit dataChanged(index, index);
 
             // Modifying a value can also change the Modified status of a record.
@@ -113,7 +114,7 @@ bool CSMWorld::IdTree::setData (const QModelIndex &index, const QVariant &value,
     return IdTable::setData(index, value, role);
 }
 
-Qt::ItemFlags CSMWorld::IdTree::flags (const QModelIndex & index) const
+Qt::ItemFlags CSMWorld::IdTree::flags(const QModelIndex& index) const
 {
     if (!index.isValid())
         return Qt::ItemFlags();
@@ -133,21 +134,21 @@ Qt::ItemFlags CSMWorld::IdTree::flags (const QModelIndex & index) const
         return IdTable::flags(index);
 }
 
-bool CSMWorld::IdTree::removeRows (int row, int count, const QModelIndex& parent)
+bool CSMWorld::IdTree::removeRows(int row, int count, const QModelIndex& parent)
 {
     if (parent.isValid())
     {
-        beginRemoveRows (parent, row, row+count-1);
+        beginRemoveRows(parent, row, row + count - 1);
 
         for (int i = 0; i < count; ++i)
         {
-            mNestedCollection->removeNestedRows(parent.row(), parent.column(), row+i);
+            mNestedCollection->removeNestedRows(parent.row(), parent.column(), row + i);
         }
 
         endRemoveRows();
 
-        emit dataChanged (CSMWorld::IdTree::index (parent.row(), 0),
-                          CSMWorld::IdTree::index (parent.row(), idCollection()->getColumns()-1));
+        emit dataChanged(CSMWorld::IdTree::index(parent.row(), 0),
+            CSMWorld::IdTree::index(parent.row(), idCollection()->getColumns() - 1));
 
         return true;
     }
@@ -166,11 +167,10 @@ void CSMWorld::IdTree::addNestedRow(const QModelIndex& parent, int position)
     mNestedCollection->addNestedRow(row, parent.column(), position);
     endInsertRows();
 
-    emit dataChanged (CSMWorld::IdTree::index (row, 0),
-                      CSMWorld::IdTree::index (row, idCollection()->getColumns()-1));
+    emit dataChanged(CSMWorld::IdTree::index(row, 0), CSMWorld::IdTree::index(row, idCollection()->getColumns() - 1));
 }
 
-QModelIndex CSMWorld::IdTree::index (int row, int column, const QModelIndex& parent) const
+QModelIndex CSMWorld::IdTree::index(int row, int column, const QModelIndex& parent) const
 {
     unsigned int encodedId = 0;
     if (parent.isValid())
@@ -187,12 +187,12 @@ QModelIndex CSMWorld::IdTree::index (int row, int column, const QModelIndex& par
     return createIndex(row, column, encodedId); // store internal id
 }
 
-QModelIndex CSMWorld::IdTree::getNestedModelIndex (const std::string& id, int column) const
+QModelIndex CSMWorld::IdTree::getNestedModelIndex(const std::string& id, int column) const
 {
-    return CSMWorld::IdTable::index(idCollection()->getIndex (id), column);
+    return CSMWorld::IdTable::index(idCollection()->getIndex(id), column);
 }
 
-QModelIndex CSMWorld::IdTree::parent (const QModelIndex& index) const
+QModelIndex CSMWorld::IdTree::parent(const QModelIndex& index) const
 {
     if (index.internalId() == 0) // 0 is used for indexs with invalid parent (top level data)
         return QModelIndex();
@@ -206,14 +206,14 @@ QModelIndex CSMWorld::IdTree::parent (const QModelIndex& index) const
     return createIndex(address.first, address.second);
 }
 
-unsigned int CSMWorld::IdTree::foldIndexAddress (const QModelIndex& index) const
+unsigned int CSMWorld::IdTree::foldIndexAddress(const QModelIndex& index) const
 {
     unsigned int out = index.row() * this->columnCount();
     out += index.column();
     return ++out;
 }
 
-std::pair< int, int > CSMWorld::IdTree::unfoldIndexAddress (unsigned int id) const
+std::pair<int, int> CSMWorld::IdTree::unfoldIndexAddress(unsigned int id) const
 {
     if (id == 0)
         throw std::runtime_error("Attempt to unfold index id of the top level data cell");
@@ -221,7 +221,7 @@ std::pair< int, int > CSMWorld::IdTree::unfoldIndexAddress (unsigned int id) con
     --id;
     int row = id / this->columnCount();
     int column = id - row * this->columnCount();
-    return std::make_pair (row, column);
+    return std::make_pair(row, column);
 }
 
 // FIXME: Not sure why this check is also needed?
@@ -232,10 +232,8 @@ std::pair< int, int > CSMWorld::IdTree::unfoldIndexAddress (unsigned int id) con
 // Also see comments in refidadapter.hpp and refidadapterimp.hpp.
 bool CSMWorld::IdTree::hasChildren(const QModelIndex& index) const
 {
-    return (index.isValid() &&
-            index.internalId() == 0 &&
-            mNestedCollection->getNestableColumn(index.column())->hasChildren() &&
-            index.data().isValid());
+    return (index.isValid() && index.internalId() == 0
+        && mNestedCollection->getNestableColumn(index.column())->hasChildren() && index.data().isValid());
 }
 
 void CSMWorld::IdTree::setNestedTable(const QModelIndex& index, const CSMWorld::NestedTableWrapperBase& nestedTable)
@@ -252,8 +250,8 @@ void CSMWorld::IdTree::setNestedTable(const QModelIndex& index, const CSMWorld::
 
     mNestedCollection->setNestedTable(index.row(), index.column(), nestedTable);
 
-    emit dataChanged (CSMWorld::IdTree::index (index.row(), 0),
-                      CSMWorld::IdTree::index (index.row(), idCollection()->getColumns()-1));
+    emit dataChanged(CSMWorld::IdTree::index(index.row(), 0),
+        CSMWorld::IdTree::index(index.row(), idCollection()->getColumns() - 1));
 
     if (removeRowsMode)
     {
diff --git a/apps/opencs/model/world/idtree.hpp b/apps/opencs/model/world/idtree.hpp
index 2793aac62d..1da219ecdf 100644
--- a/apps/opencs/model/world/idtree.hpp
+++ b/apps/opencs/model/world/idtree.hpp
@@ -1,8 +1,8 @@
 #ifndef CSM_WOLRD_IDTREE_H
 #define CSM_WOLRD_IDTREE_H
 
-#include "idtable.hpp"
 #include "columns.hpp"
+#include "idtable.hpp"
 
 /*! \brief
  * Class for holding the model. Uses typical qt table abstraction/interface for granting access
@@ -23,59 +23,58 @@ namespace CSMWorld
 
     class IdTree : public IdTable
     {
-            Q_OBJECT
-
-        private:
-
-            NestedCollection *mNestedCollection;
+        Q_OBJECT
 
-            // not implemented
-            IdTree (const IdTree&);
-            IdTree& operator= (const IdTree&);
+    private:
+        NestedCollection* mNestedCollection;
 
-            unsigned int foldIndexAddress(const QModelIndex& index) const;
-            std::pair<int, int> unfoldIndexAddress(unsigned int id) const;
+        // not implemented
+        IdTree(const IdTree&);
+        IdTree& operator=(const IdTree&);
 
-        public:
+        unsigned int foldIndexAddress(const QModelIndex& index) const;
+        std::pair<int, int> unfoldIndexAddress(unsigned int id) const;
 
-            IdTree (NestedCollection *nestedCollection, CollectionBase *idCollection, unsigned int features = 0);
-            ///< The ownerships of \a nestedCollecton and \a idCollection are not transferred.
+    public:
+        IdTree(NestedCollection* nestedCollection, CollectionBase* idCollection, unsigned int features = 0);
+        ///< The ownerships of \a nestedCollecton and \a idCollection are not transferred.
 
-            ~IdTree() override;
+        ~IdTree() override;
 
-            int rowCount (const QModelIndex & parent = QModelIndex()) const override;
+        int rowCount(const QModelIndex& parent = QModelIndex()) const override;
 
-            int columnCount (const QModelIndex & parent = QModelIndex()) const override;
+        int columnCount(const QModelIndex& parent = QModelIndex()) const override;
 
-            QVariant data  (const QModelIndex & index, int role = Qt::DisplayRole) const override;
+        QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
 
-            bool setData ( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
+        bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
 
-            Qt::ItemFlags flags (const QModelIndex & index) const override;
+        Qt::ItemFlags flags(const QModelIndex& index) const override;
 
-            bool removeRows (int row, int count, const QModelIndex& parent = QModelIndex()) override;
+        bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
 
-            QModelIndex index (int row, int column, const QModelIndex& parent = QModelIndex()) const override;
+        QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
 
-            QModelIndex parent (const QModelIndex& index) const override;
+        QModelIndex parent(const QModelIndex& index) const override;
 
-            QModelIndex getNestedModelIndex (const std::string& id, int column) const;
+        QModelIndex getNestedModelIndex(const std::string& id, int column) const;
 
-            QVariant nestedHeaderData(int section, int subSection, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+        QVariant nestedHeaderData(
+            int section, int subSection, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
 
-            NestedTableWrapperBase* nestedTable(const QModelIndex &index) const;
+        NestedTableWrapperBase* nestedTable(const QModelIndex& index) const;
 
-            void setNestedTable(const QModelIndex &index, const NestedTableWrapperBase& nestedTable);
+        void setNestedTable(const QModelIndex& index, const NestedTableWrapperBase& nestedTable);
 
-            void addNestedRow (const QModelIndex& parent, int position);
+        void addNestedRow(const QModelIndex& parent, int position);
 
-            bool hasChildren (const QModelIndex& index) const override;
+        bool hasChildren(const QModelIndex& index) const override;
 
-            virtual int searchNestedColumnIndex(int parentColumn, Columns::ColumnId id);
-            ///< \return the column index or -1 if the requested column wasn't found.
+        virtual int searchNestedColumnIndex(int parentColumn, Columns::ColumnId id);
+        ///< \return the column index or -1 if the requested column wasn't found.
 
-            virtual int findNestedColumnIndex(int parentColumn, Columns::ColumnId id);
-            ///< \return the column index or throws an exception if the requested column wasn't found.
+        virtual int findNestedColumnIndex(int parentColumn, Columns::ColumnId id);
+        ///< \return the column index or throws an exception if the requested column wasn't found.
 
     signals:
 
diff --git a/apps/opencs/model/world/infocollection.cpp b/apps/opencs/model/world/infocollection.cpp
index 0fc572e46f..a136b7c402 100644
--- a/apps/opencs/model/world/infocollection.cpp
+++ b/apps/opencs/model/world/infocollection.cpp
@@ -1,8 +1,8 @@
 #include "infocollection.hpp"
 
-#include <stdexcept>
-#include <iterator>
 #include <cassert>
+#include <iterator>
+#include <stdexcept>
 
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/loaddial.hpp>
@@ -11,35 +11,34 @@
 
 namespace CSMWorld
 {
-    template<>
-    void Collection<Info, IdAccessor<Info> >::removeRows (int index, int count)
+    template <>
+    void Collection<Info, IdAccessor<Info>>::removeRows(int index, int count)
     {
-        mRecords.erase(mRecords.begin()+index, mRecords.begin()+index+count);
+        mRecords.erase(mRecords.begin() + index, mRecords.begin() + index + count);
 
         // index map is updated in InfoCollection::removeRows()
     }
 
-    template<>
-    void Collection<Info, IdAccessor<Info> >::insertRecord (std::unique_ptr<RecordBase> record,
-        int index, UniversalId::Type type)
+    template <>
+    void Collection<Info, IdAccessor<Info>>::insertRecord(
+        std::unique_ptr<RecordBase> record, int index, UniversalId::Type type)
     {
         int size = static_cast<int>(mRecords.size());
         if (index < 0 || index > size)
             throw std::runtime_error("index out of range");
 
-        std::unique_ptr<Record<Info> > record2(static_cast<Record<Info>*>(record.release()));
+        std::unique_ptr<Record<Info>> record2(static_cast<Record<Info>*>(record.release()));
 
         if (index == size)
             mRecords.push_back(std::move(record2));
         else
-            mRecords.insert(mRecords.begin()+index, std::move(record2));
+            mRecords.insert(mRecords.begin() + index, std::move(record2));
 
         // index map is updated in InfoCollection::insertRecord()
     }
 
-    template<>
-    bool Collection<Info, IdAccessor<Info> >::reorderRowsImp (int baseIndex,
-        const std::vector<int>& newOrder)
+    template <>
+    bool Collection<Info, IdAccessor<Info>>::reorderRowsImp(int baseIndex, const std::vector<int>& newOrder)
     {
         if (!newOrder.empty())
         {
@@ -48,21 +47,21 @@ namespace CSMWorld
             // check that all indices are present
             std::vector<int> test(newOrder);
             std::sort(test.begin(), test.end());
-            if (*test.begin() != 0 || *--test.end() != size-1)
+            if (*test.begin() != 0 || *--test.end() != size - 1)
                 return false;
 
             // reorder records
-            std::vector<std::unique_ptr<Record<Info> > > buffer(size);
+            std::vector<std::unique_ptr<Record<Info>>> buffer(size);
 
             // FIXME: BUG: undo does not remove modified flag
             for (int i = 0; i < size; ++i)
             {
-                buffer[newOrder[i]] = std::move(mRecords[baseIndex+i]);
+                buffer[newOrder[i]] = std::move(mRecords[baseIndex + i]);
                 if (buffer[newOrder[i]])
                     buffer[newOrder[i]]->setModified(buffer[newOrder[i]]->get());
             }
 
-            std::move(buffer.begin(), buffer.end(), mRecords.begin()+baseIndex);
+            std::move(buffer.begin(), buffer.end(), mRecords.begin() + baseIndex);
 
             // index map is updated in InfoCollection::reorderRows()
         }
@@ -71,11 +70,11 @@ namespace CSMWorld
     }
 }
 
-void CSMWorld::InfoCollection::load (const Info& record, bool base)
+void CSMWorld::InfoCollection::load(const Info& record, bool base)
 {
-    int index = searchId (record.mId);
+    int index = searchId(record.mId);
 
-    if (index==-1)
+    if (index == -1)
     {
         // new record
         auto record2 = std::make_unique<Record<Info>>();
@@ -92,24 +91,24 @@ void CSMWorld::InfoCollection::load (const Info& record, bool base)
         if (base)
             record2->mBase = record;
         else
-            record2->setModified (record);
+            record2->setModified(record);
 
-        setRecord (index, std::move(record2));
+        setRecord(index, std::move(record2));
     }
 }
 
 int CSMWorld::InfoCollection::getInfoIndex(std::string_view id, std::string_view topic) const
 {
     // find the topic first
-    std::unordered_map<std::string, std::vector<std::pair<std::string, int> > >::const_iterator iter
+    std::unordered_map<std::string, std::vector<std::pair<std::string, int>>>::const_iterator iter
         = mInfoIndex.find(Misc::StringUtils::lowerCase(topic));
 
     if (iter == mInfoIndex.end())
         return -1;
 
     // brute force loop
-    for (std::vector<std::pair<std::string, int> >::const_iterator it = iter->second.begin();
-            it != iter->second.end(); ++it)
+    for (std::vector<std::pair<std::string, int>>::const_iterator it = iter->second.begin(); it != iter->second.end();
+         ++it)
     {
         if (Misc::StringUtils::ciEqual(it->first, id))
             return it->second;
@@ -120,8 +119,7 @@ int CSMWorld::InfoCollection::getInfoIndex(std::string_view id, std::string_view
 
 // Calling insertRecord() using index from getInsertIndex() needs to take into account of
 // prev/next records; an example is deleting a record then undo
-int CSMWorld::InfoCollection::getInsertIndex (const std::string& id,
-        UniversalId::Type type, RecordBase *record) const
+int CSMWorld::InfoCollection::getInsertIndex(const std::string& id, UniversalId::Type type, RecordBase* record) const
 {
     if (record == nullptr)
     {
@@ -133,7 +131,7 @@ int CSMWorld::InfoCollection::getInsertIndex (const std::string& id,
         std::pair<RecordConstIterator, RecordConstIterator> range = getTopicRange(id.substr(0, separator));
 
         if (range.first == range.second)
-            return Collection<Info, IdAccessor<Info> >::getAppendIndex(id, type);
+            return Collection<Info, IdAccessor<Info>>::getAppendIndex(id, type);
 
         return std::distance(getRecords().begin(), range.second);
     }
@@ -170,21 +168,20 @@ int CSMWorld::InfoCollection::getInsertIndex (const std::string& id,
     return index;
 }
 
-bool CSMWorld::InfoCollection::reorderRows (int baseIndex, const std::vector<int>& newOrder)
+bool CSMWorld::InfoCollection::reorderRows(int baseIndex, const std::vector<int>& newOrder)
 {
     // check if the range is valid
-    int lastIndex = baseIndex + newOrder.size() -1;
+    int lastIndex = baseIndex + newOrder.size() - 1;
 
-    if (lastIndex>=getSize())
+    if (lastIndex >= getSize())
         return false;
 
     // Check that topics match
-    if (!Misc::StringUtils::ciEqual(getRecord(baseIndex).get().mTopicId,
-                                    getRecord(lastIndex).get().mTopicId))
+    if (!Misc::StringUtils::ciEqual(getRecord(baseIndex).get().mTopicId, getRecord(lastIndex).get().mTopicId))
         return false;
 
     // reorder
-    if (!Collection<Info, IdAccessor<Info> >::reorderRowsImp(baseIndex, newOrder))
+    if (!Collection<Info, IdAccessor<Info>>::reorderRowsImp(baseIndex, newOrder))
         return false;
 
     // adjust index
@@ -197,19 +194,19 @@ bool CSMWorld::InfoCollection::reorderRows (int baseIndex, const std::vector<int
     return true;
 }
 
-void CSMWorld::InfoCollection::load (ESM::ESMReader& reader, bool base, const ESM::Dialogue& dialogue)
+void CSMWorld::InfoCollection::load(ESM::ESMReader& reader, bool base, const ESM::Dialogue& dialogue)
 {
     Info info;
     bool isDeleted = false;
 
-    info.load (reader, isDeleted);
-    std::string id = Misc::StringUtils::lowerCase (dialogue.mId) + "#" + info.mId;
+    info.load(reader, isDeleted);
+    std::string id = Misc::StringUtils::lowerCase(dialogue.mId) + "#" + info.mId;
 
     if (isDeleted)
     {
-        int index = searchId (id);
+        int index = searchId(id);
 
-        if (index==-1)
+        if (index == -1)
         {
             // deleting a record that does not exist
             // ignore it for now
@@ -217,39 +214,38 @@ void CSMWorld::InfoCollection::load (ESM::ESMReader& reader, bool base, const ES
         }
         else if (base)
         {
-            removeRows (index, 1);
+            removeRows(index, 1);
         }
         else
         {
             auto record = std::make_unique<Record<Info>>(getRecord(index));
             record->mState = RecordBase::State_Deleted;
-            setRecord (index, std::move(record));
+            setRecord(index, std::move(record));
         }
     }
     else
     {
         info.mTopicId = dialogue.mId;
         info.mId = id;
-        load (info, base);
+        load(info, base);
     }
 }
 
-CSMWorld::InfoCollection::Range CSMWorld::InfoCollection::getTopicRange (const std::string& topic)
-    const
+CSMWorld::InfoCollection::Range CSMWorld::InfoCollection::getTopicRange(const std::string& topic) const
 {
-    std::string lowerTopic = Misc::StringUtils::lowerCase (topic);
+    std::string lowerTopic = Misc::StringUtils::lowerCase(topic);
 
     // find the topic
-    std::unordered_map<std::string, std::vector<std::pair<std::string, int> > >::const_iterator iter
+    std::unordered_map<std::string, std::vector<std::pair<std::string, int>>>::const_iterator iter
         = mInfoIndex.find(lowerTopic);
 
     if (iter == mInfoIndex.end())
-        return Range (getRecords().end(), getRecords().end());
+        return Range(getRecords().end(), getRecords().end());
 
     // topic found, find the starting index
     int low = INT_MAX;
-    for (std::vector<std::pair<std::string, int> >::const_iterator it = iter->second.begin();
-            it != iter->second.end(); ++it)
+    for (std::vector<std::pair<std::string, int>>::const_iterator it = iter->second.begin(); it != iter->second.end();
+         ++it)
     {
         low = std::min(low, it->second);
     }
@@ -261,7 +257,7 @@ CSMWorld::InfoCollection::Range CSMWorld::InfoCollection::getTopicRange (const s
 
     assert(static_cast<size_t>(std::distance(begin, end)) == iter->second.size());
 
-    return Range (begin, end);
+    return Range(begin, end);
 }
 
 void CSMWorld::InfoCollection::removeDialogueInfos(const std::string& dialogueId)
@@ -302,19 +298,18 @@ void CSMWorld::InfoCollection::removeDialogueInfos(const std::string& dialogueId
 
 // FIXME: removing a record should adjust prev/next and mark those records as modified
 // accordingly (also consider undo)
-void CSMWorld::InfoCollection::removeRows (int index, int count)
+void CSMWorld::InfoCollection::removeRows(int index, int count)
 {
-    Collection<Info, IdAccessor<Info> >::removeRows(index, count); // erase records only
+    Collection<Info, IdAccessor<Info>>::removeRows(index, count); // erase records only
 
-    for (std::unordered_map<std::string, std::vector<std::pair<std::string, int> > >::iterator iter
-        = mInfoIndex.begin(); iter != mInfoIndex.end();)
+    for (std::unordered_map<std::string, std::vector<std::pair<std::string, int>>>::iterator iter = mInfoIndex.begin();
+         iter != mInfoIndex.end();)
     {
-        for (std::vector<std::pair<std::string, int> >::iterator it = iter->second.begin();
-                it != iter->second.end();)
+        for (std::vector<std::pair<std::string, int>>::iterator it = iter->second.begin(); it != iter->second.end();)
         {
             if (it->second >= index)
             {
-                if (it->second >= index+count)
+                if (it->second >= index + count)
                 {
                     it->second -= count;
                     ++it;
@@ -334,7 +329,7 @@ void CSMWorld::InfoCollection::removeRows (int index, int count)
     }
 }
 
-void  CSMWorld::InfoCollection::appendBlankRecord (const std::string& id, UniversalId::Type type)
+void CSMWorld::InfoCollection::appendBlankRecord(const std::string& id, UniversalId::Type type)
 {
     auto record2 = std::make_unique<Record<Info>>();
 
@@ -353,18 +348,17 @@ int CSMWorld::InfoCollection::searchId(std::string_view id) const
     if (separator == std::string::npos)
         throw std::runtime_error("invalid info ID: " + std::string(id));
 
-    return getInfoIndex(id.substr(separator+1), id.substr(0, separator));
+    return getInfoIndex(id.substr(separator + 1), id.substr(0, separator));
 }
 
-void CSMWorld::InfoCollection::appendRecord (std::unique_ptr<RecordBase> record, UniversalId::Type type)
+void CSMWorld::InfoCollection::appendRecord(std::unique_ptr<RecordBase> record, UniversalId::Type type)
 {
     int index = getInsertIndex(static_cast<Record<Info>*>(record.get())->get().mId, type, record.get());
 
     insertRecord(std::move(record), index, type);
 }
 
-void CSMWorld::InfoCollection::insertRecord (std::unique_ptr<RecordBase> record, int index,
-    UniversalId::Type type)
+void CSMWorld::InfoCollection::insertRecord(std::unique_ptr<RecordBase> record, int index, UniversalId::Type type)
 {
     int size = static_cast<int>(getRecords().size());
 
@@ -374,16 +368,17 @@ void CSMWorld::InfoCollection::insertRecord (std::unique_ptr<RecordBase> record,
     if (separator == std::string::npos)
         throw std::runtime_error("invalid info ID: " + id);
 
-    Collection<Info, IdAccessor<Info> >::insertRecord(std::move(record), index, type); // add records only
+    Collection<Info, IdAccessor<Info>>::insertRecord(std::move(record), index, type); // add records only
 
     // adjust index
-    if (index < size-1)
+    if (index < size - 1)
     {
-        for (std::unordered_map<std::string, std::vector<std::pair<std::string, int> > >::iterator iter
-            = mInfoIndex.begin(); iter != mInfoIndex.end(); ++iter)
+        for (std::unordered_map<std::string, std::vector<std::pair<std::string, int>>>::iterator iter
+             = mInfoIndex.begin();
+             iter != mInfoIndex.end(); ++iter)
         {
-            for (std::vector<std::pair<std::string, int> >::iterator it = iter->second.begin();
-                    it != iter->second.end(); ++it)
+            for (std::vector<std::pair<std::string, int>>::iterator it = iter->second.begin(); it != iter->second.end();
+                 ++it)
             {
                 if (it->second >= index)
                     ++(it->second);
@@ -393,11 +388,10 @@ void CSMWorld::InfoCollection::insertRecord (std::unique_ptr<RecordBase> record,
 
     // get iterator for existing topic or a new topic
     std::string lowerId = Misc::StringUtils::lowerCase(id);
-    std::pair<std::unordered_map<std::string, std::vector<std::pair<std::string, int> > >::iterator, bool> res
+    std::pair<std::unordered_map<std::string, std::vector<std::pair<std::string, int>>>::iterator, bool> res
         = mInfoIndex.insert(
-                std::make_pair(lowerId.substr(0, separator),
-                               std::vector<std::pair<std::string, int> >())); // empty vector
+            std::make_pair(lowerId.substr(0, separator), std::vector<std::pair<std::string, int>>())); // empty vector
 
     // insert info and index
-    res.first->second.push_back(std::make_pair(lowerId.substr(separator+1), index));
+    res.first->second.push_back(std::make_pair(lowerId.substr(separator + 1), index));
 }
diff --git a/apps/opencs/model/world/infocollection.hpp b/apps/opencs/model/world/infocollection.hpp
index 96061fb03c..cfd74afd10 100644
--- a/apps/opencs/model/world/infocollection.hpp
+++ b/apps/opencs/model/world/infocollection.hpp
@@ -1,8 +1,8 @@
 #ifndef CSM_WOLRD_INFOCOLLECTION_H
 #define CSM_WOLRD_INFOCOLLECTION_H
 
-#include <unordered_map>
 #include <string_view>
+#include <unordered_map>
 
 #include "collection.hpp"
 #include "info.hpp"
@@ -14,80 +14,72 @@ namespace ESM
 
 namespace CSMWorld
 {
-    template<>
-    void Collection<Info, IdAccessor<Info> >::removeRows (int index, int count);
+    template <>
+    void Collection<Info, IdAccessor<Info>>::removeRows(int index, int count);
 
-    template<>
-    void Collection<Info, IdAccessor<Info> >::insertRecord (std::unique_ptr<RecordBase> record,
-        int index, UniversalId::Type type);
+    template <>
+    void Collection<Info, IdAccessor<Info>>::insertRecord(
+        std::unique_ptr<RecordBase> record, int index, UniversalId::Type type);
 
-    template<>
-    bool Collection<Info, IdAccessor<Info> >::reorderRowsImp (int baseIndex,
-        const std::vector<int>& newOrder);
+    template <>
+    bool Collection<Info, IdAccessor<Info>>::reorderRowsImp(int baseIndex, const std::vector<int>& newOrder);
 
-    class InfoCollection : public Collection<Info, IdAccessor<Info> >
+    class InfoCollection : public Collection<Info, IdAccessor<Info>>
     {
-        public:
-
-            typedef std::vector<std::unique_ptr<Record<Info> > >::const_iterator RecordConstIterator;
-            typedef std::pair<RecordConstIterator, RecordConstIterator> Range;
-
-        private:
-
-            // The general strategy is to keep the records in Collection kept in order (within
-            // a topic group) while the index lookup maps are not ordered.  It is assumed that
-            // each topic has a small number of infos, which allows the use of vectors for
-            // iterating through them without too much penalty.
-            //
-            // NOTE: topic string as well as id string are stored in lower case.
-            std::unordered_map<std::string, std::vector<std::pair<std::string, int> > > mInfoIndex;
+    public:
+        typedef std::vector<std::unique_ptr<Record<Info>>>::const_iterator RecordConstIterator;
+        typedef std::pair<RecordConstIterator, RecordConstIterator> Range;
 
-            void load (const Info& record, bool base);
+    private:
+        // The general strategy is to keep the records in Collection kept in order (within
+        // a topic group) while the index lookup maps are not ordered.  It is assumed that
+        // each topic has a small number of infos, which allows the use of vectors for
+        // iterating through them without too much penalty.
+        //
+        // NOTE: topic string as well as id string are stored in lower case.
+        std::unordered_map<std::string, std::vector<std::pair<std::string, int>>> mInfoIndex;
 
-            int getInfoIndex(std::string_view id, std::string_view topic) const;
-            ///< Return index for record \a id or -1 (if not present; deleted records are considered)
-            ///
-            /// \param id info ID without topic prefix
-            //
-            /// \attention id and topic are assumed to be in lower case
+        void load(const Info& record, bool base);
 
-        public:
+        int getInfoIndex(std::string_view id, std::string_view topic) const;
+        ///< Return index for record \a id or -1 (if not present; deleted records are considered)
+        ///
+        /// \param id info ID without topic prefix
+        //
+        /// \attention id and topic are assumed to be in lower case
 
-            int getInsertIndex (const std::string& id,
-                UniversalId::Type type = UniversalId::Type_None,
-                RecordBase *record = nullptr) const override;
-            ///< \param type Will be ignored, unless the collection supports multiple record types
-            ///
-            /// Works like getAppendIndex unless an overloaded method uses the record pointer
-            /// to get additional info about the record that results in an alternative index.
+    public:
+        int getInsertIndex(const std::string& id, UniversalId::Type type = UniversalId::Type_None,
+            RecordBase* record = nullptr) const override;
+        ///< \param type Will be ignored, unless the collection supports multiple record types
+        ///
+        /// Works like getAppendIndex unless an overloaded method uses the record pointer
+        /// to get additional info about the record that results in an alternative index.
 
-            bool reorderRows (int baseIndex, const std::vector<int>& newOrder) override;
-            ///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices
-            /// given in \a newOrder (baseIndex+newOrder[0] specifies the new index of row baseIndex).
-            ///
-            /// \return Success?
+        bool reorderRows(int baseIndex, const std::vector<int>& newOrder) override;
+        ///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices
+        /// given in \a newOrder (baseIndex+newOrder[0] specifies the new index of row baseIndex).
+        ///
+        /// \return Success?
 
-            void load (ESM::ESMReader& reader, bool base, const ESM::Dialogue& dialogue);
+        void load(ESM::ESMReader& reader, bool base, const ESM::Dialogue& dialogue);
 
-            Range getTopicRange (const std::string& topic) const;
-            ///< Return iterators that point to the beginning and past the end of the range for
-            /// the given topic.
+        Range getTopicRange(const std::string& topic) const;
+        ///< Return iterators that point to the beginning and past the end of the range for
+        /// the given topic.
 
-            void removeDialogueInfos(const std::string& dialogueId);
+        void removeDialogueInfos(const std::string& dialogueId);
 
-            void removeRows (int index, int count) override;
+        void removeRows(int index, int count) override;
 
-            void appendBlankRecord (const std::string& id,
-                                            UniversalId::Type type = UniversalId::Type_None) override;
+        void appendBlankRecord(const std::string& id, UniversalId::Type type = UniversalId::Type_None) override;
 
-            int searchId(std::string_view id) const override;
+        int searchId(std::string_view id) const override;
 
-            void appendRecord (std::unique_ptr<RecordBase> record,
-                UniversalId::Type type = UniversalId::Type_None) override;
+        void appendRecord(std::unique_ptr<RecordBase> record, UniversalId::Type type = UniversalId::Type_None) override;
 
-            void insertRecord (std::unique_ptr<RecordBase> record,
-                                       int index,
-                                       UniversalId::Type type = UniversalId::Type_None) override;
+        void insertRecord(
+            std::unique_ptr<RecordBase> record, int index, UniversalId::Type type = UniversalId::Type_None) override;
     };
 }
 
diff --git a/apps/opencs/model/world/infoselectwrapper.cpp b/apps/opencs/model/world/infoselectwrapper.cpp
index dc1b336f03..1fdff35dfe 100644
--- a/apps/opencs/model/world/infoselectwrapper.cpp
+++ b/apps/opencs/model/world/infoselectwrapper.cpp
@@ -11,8 +11,7 @@ const size_t CSMWorld::ConstInfoSelectWrapper::FunctionIndexOffset = 2;
 const size_t CSMWorld::ConstInfoSelectWrapper::RelationIndexOffset = 4;
 const size_t CSMWorld::ConstInfoSelectWrapper::VarNameOffset = 5;
 
-const char* CSMWorld::ConstInfoSelectWrapper::FunctionEnumStrings[] =
-{
+const char* CSMWorld::ConstInfoSelectWrapper::FunctionEnumStrings[] = {
     "Rank Low",
     "Rank High",
     "Rank Requirement",
@@ -101,8 +100,7 @@ const char* CSMWorld::ConstInfoSelectWrapper::FunctionEnumStrings[] =
     nullptr,
 };
 
-const char* CSMWorld::ConstInfoSelectWrapper::RelationEnumStrings[] =
-{
+const char* CSMWorld::ConstInfoSelectWrapper::RelationEnumStrings[] = {
     "=",
     "!=",
     ">",
@@ -112,8 +110,7 @@ const char* CSMWorld::ConstInfoSelectWrapper::RelationEnumStrings[] =
     nullptr,
 };
 
-const char* CSMWorld::ConstInfoSelectWrapper::ComparisonEnumStrings[] =
-{
+const char* CSMWorld::ConstInfoSelectWrapper::ComparisonEnumStrings[] = {
     "Boolean",
     "Integer",
     "Numeric",
@@ -298,18 +295,42 @@ void CSMWorld::ConstInfoSelectWrapper::readFunctionName()
                 mFunctionName = Function_None;
             break;
 
-        case '2': mFunctionName = Function_Global; break;
-        case '3': mFunctionName = Function_Local; break;
-        case '4': mFunctionName = Function_Journal; break;
-        case '5': mFunctionName = Function_Item; break;
-        case '6': mFunctionName = Function_Dead; break;
-        case '7': mFunctionName = Function_NotId; break;
-        case '8': mFunctionName = Function_NotFaction; break;
-        case '9': mFunctionName = Function_NotClass; break;
-        case 'A': mFunctionName = Function_NotRace; break;
-        case 'B': mFunctionName = Function_NotCell; break;
-        case 'C': mFunctionName = Function_NotLocal; break;
-        default:  mFunctionName = Function_None; break;
+        case '2':
+            mFunctionName = Function_Global;
+            break;
+        case '3':
+            mFunctionName = Function_Local;
+            break;
+        case '4':
+            mFunctionName = Function_Journal;
+            break;
+        case '5':
+            mFunctionName = Function_Item;
+            break;
+        case '6':
+            mFunctionName = Function_Dead;
+            break;
+        case '7':
+            mFunctionName = Function_NotId;
+            break;
+        case '8':
+            mFunctionName = Function_NotFaction;
+            break;
+        case '9':
+            mFunctionName = Function_NotClass;
+            break;
+        case 'A':
+            mFunctionName = Function_NotRace;
+            break;
+        case 'B':
+            mFunctionName = Function_NotCell;
+            break;
+        case 'C':
+            mFunctionName = Function_NotLocal;
+            break;
+        default:
+            mFunctionName = Function_None;
+            break;
     }
 }
 
@@ -319,13 +340,26 @@ void CSMWorld::ConstInfoSelectWrapper::readRelationType()
 
     switch (relationIndex)
     {
-        case '0': mRelationType = Relation_Equal; break;
-        case '1': mRelationType = Relation_NotEqual; break;
-        case '2': mRelationType = Relation_Greater; break;
-        case '3': mRelationType = Relation_GreaterOrEqual; break;
-        case '4': mRelationType = Relation_Less; break;
-        case '5': mRelationType = Relation_LessOrEqual; break;
-        default:  mRelationType = Relation_None;
+        case '0':
+            mRelationType = Relation_Equal;
+            break;
+        case '1':
+            mRelationType = Relation_NotEqual;
+            break;
+        case '2':
+            mRelationType = Relation_Greater;
+            break;
+        case '3':
+            mRelationType = Relation_GreaterOrEqual;
+            break;
+        case '4':
+            mRelationType = Relation_Less;
+            break;
+        case '5':
+            mRelationType = Relation_LessOrEqual;
+            break;
+        default:
+            mRelationType = Relation_None;
     }
 }
 
@@ -700,38 +734,37 @@ std::pair<float, float> CSMWorld::ConstInfoSelectWrapper::getValidFloatRange() c
 }
 
 template <typename T1, typename T2>
-bool CSMWorld::ConstInfoSelectWrapper::rangeContains(T1 value, std::pair<T2,T2> range) const
+bool CSMWorld::ConstInfoSelectWrapper::rangeContains(T1 value, std::pair<T2, T2> range) const
 {
     return (value >= range.first && value <= range.second);
 }
 
 template <typename T1, typename T2>
-bool CSMWorld::ConstInfoSelectWrapper::rangeFullyContains(std::pair<T1,T1> containingRange,
-    std::pair<T2,T2> testRange) const
+bool CSMWorld::ConstInfoSelectWrapper::rangeFullyContains(
+    std::pair<T1, T1> containingRange, std::pair<T2, T2> testRange) const
 {
     return (containingRange.first <= testRange.first) && (testRange.second <= containingRange.second);
 }
 
 template <typename T1, typename T2>
-bool CSMWorld::ConstInfoSelectWrapper::rangesOverlap(std::pair<T1,T1> range1, std::pair<T2,T2> range2) const
+bool CSMWorld::ConstInfoSelectWrapper::rangesOverlap(std::pair<T1, T1> range1, std::pair<T2, T2> range2) const
 {
     // One of the bounds of either range should fall within the other range
-    return
-        (range1.first <= range2.first  && range2.first  <= range1.second) ||
-        (range1.first <= range2.second && range2.second <= range1.second) ||
-        (range2.first <= range1.first  && range1.first  <= range2.second) ||
-        (range2.first <= range1.second && range1.second <= range2.second);
+    return (range1.first <= range2.first && range2.first <= range1.second)
+        || (range1.first <= range2.second && range2.second <= range1.second)
+        || (range2.first <= range1.first && range1.first <= range2.second)
+        || (range2.first <= range1.second && range1.second <= range2.second);
 }
 
 template <typename T1, typename T2>
-bool CSMWorld::ConstInfoSelectWrapper::rangesMatch(std::pair<T1,T1> range1, std::pair<T2,T2> range2) const
+bool CSMWorld::ConstInfoSelectWrapper::rangesMatch(std::pair<T1, T1> range1, std::pair<T2, T2> range2) const
 {
-    return (range1.first == range2.first  && range1.second == range2.second);
+    return (range1.first == range2.first && range1.second == range2.second);
 }
 
 template <typename T1, typename T2>
-bool CSMWorld::ConstInfoSelectWrapper::conditionIsAlwaysTrue(std::pair<T1,T1> conditionRange,
-    std::pair<T2,T2> validRange) const
+bool CSMWorld::ConstInfoSelectWrapper::conditionIsAlwaysTrue(
+    std::pair<T1, T1> conditionRange, std::pair<T2, T2> validRange) const
 {
     switch (mRelationType)
     {
@@ -757,8 +790,8 @@ bool CSMWorld::ConstInfoSelectWrapper::conditionIsAlwaysTrue(std::pair<T1,T1> co
 }
 
 template <typename T1, typename T2>
-bool CSMWorld::ConstInfoSelectWrapper::conditionIsNeverTrue(std::pair<T1,T1> conditionRange,
-    std::pair<T2,T2> validRange) const
+bool CSMWorld::ConstInfoSelectWrapper::conditionIsNeverTrue(
+    std::pair<T1, T1> conditionRange, std::pair<T2, T2> validRange) const
 {
     switch (mRelationType)
     {
@@ -785,7 +818,8 @@ bool CSMWorld::ConstInfoSelectWrapper::conditionIsNeverTrue(std::pair<T1,T1> con
 // InfoSelectWrapper
 
 CSMWorld::InfoSelectWrapper::InfoSelectWrapper(ESM::DialInfo::SelectStruct& select)
-    : CSMWorld::ConstInfoSelectWrapper(select), mSelect(select)
+    : CSMWorld::ConstInfoSelectWrapper(select)
+    , mSelect(select)
 {
 }
 
@@ -846,19 +880,46 @@ void CSMWorld::InfoSelectWrapper::update()
 
     switch (mFunctionName)
     {
-        case Function_None:         stream << '0'; break;
-        case Function_Global:       stream << '2'; break;
-        case Function_Local:        stream << '3'; break;
-        case Function_Journal:      stream << '4'; break;
-        case Function_Item:         stream << '5'; break;
-        case Function_Dead:         stream << '6'; break;
-        case Function_NotId:        stream << '7'; break;
-        case Function_NotFaction:   stream << '8'; break;
-        case Function_NotClass:     stream << '9'; break;
-        case Function_NotRace:      stream << 'A'; break;
-        case Function_NotCell:      stream << 'B'; break;
-        case Function_NotLocal:     stream << 'C'; break;
-        default:                    stream << '1'; writeIndex = true; break;
+        case Function_None:
+            stream << '0';
+            break;
+        case Function_Global:
+            stream << '2';
+            break;
+        case Function_Local:
+            stream << '3';
+            break;
+        case Function_Journal:
+            stream << '4';
+            break;
+        case Function_Item:
+            stream << '5';
+            break;
+        case Function_Dead:
+            stream << '6';
+            break;
+        case Function_NotId:
+            stream << '7';
+            break;
+        case Function_NotFaction:
+            stream << '8';
+            break;
+        case Function_NotClass:
+            stream << '9';
+            break;
+        case Function_NotRace:
+            stream << 'A';
+            break;
+        case Function_NotCell:
+            stream << 'B';
+            break;
+        case Function_NotLocal:
+            stream << 'C';
+            break;
+        default:
+            stream << '1';
+            writeIndex = true;
+            break;
     }
 
     if (writeIndex && functionIndex < 10) // leading 0
@@ -871,13 +932,27 @@ void CSMWorld::InfoSelectWrapper::update()
     // Write Relation
     switch (mRelationType)
     {
-        case Relation_Equal:            stream << '0'; break;
-        case Relation_NotEqual:         stream << '1'; break;
-        case Relation_Greater:          stream << '2'; break;
-        case Relation_GreaterOrEqual:   stream << '3'; break;
-        case Relation_Less:             stream << '4'; break;
-        case Relation_LessOrEqual:      stream << '5'; break;
-        default:                        stream << '0'; break;
+        case Relation_Equal:
+            stream << '0';
+            break;
+        case Relation_NotEqual:
+            stream << '1';
+            break;
+        case Relation_Greater:
+            stream << '2';
+            break;
+        case Relation_GreaterOrEqual:
+            stream << '3';
+            break;
+        case Relation_Less:
+            stream << '4';
+            break;
+        case Relation_LessOrEqual:
+            stream << '5';
+            break;
+        default:
+            stream << '0';
+            break;
     }
 
     if (mHasVariable)
diff --git a/apps/opencs/model/world/infoselectwrapper.hpp b/apps/opencs/model/world/infoselectwrapper.hpp
index 7c7a839fa6..6df763c345 100644
--- a/apps/opencs/model/world/infoselectwrapper.hpp
+++ b/apps/opencs/model/world/infoselectwrapper.hpp
@@ -20,11 +20,10 @@ namespace CSMWorld
     class ConstInfoSelectWrapper
     {
     public:
-
         // Order matters
         enum FunctionName
         {
-            Function_RankLow=0,
+            Function_RankLow = 0,
             Function_RankHigh,
             Function_RankRequirement,
             Function_Reputation,
@@ -97,7 +96,7 @@ namespace CSMWorld
             Function_Flee,
             Function_ShouldAttack,
             Function_Werewolf,
-            Function_PcWerewolfKills=73,
+            Function_PcWerewolfKills = 73,
 
             Function_Global,
             Function_Local,
@@ -168,7 +167,6 @@ namespace CSMWorld
         std::string toString() const;
 
     protected:
-
         void readRule();
         void readFunctionName();
         void readRelationType();
@@ -183,22 +181,22 @@ namespace CSMWorld
         std::pair<float, float> getValidFloatRange() const;
 
         template <typename Type1, typename Type2>
-        bool rangeContains(Type1 value, std::pair<Type2,Type2> range) const;
+        bool rangeContains(Type1 value, std::pair<Type2, Type2> range) const;
 
         template <typename Type1, typename Type2>
-        bool rangesOverlap(std::pair<Type1,Type1> range1, std::pair<Type2,Type2> range2) const;
+        bool rangesOverlap(std::pair<Type1, Type1> range1, std::pair<Type2, Type2> range2) const;
 
         template <typename Type1, typename Type2>
-        bool rangeFullyContains(std::pair<Type1,Type1> containing, std::pair<Type2,Type2> test) const;
+        bool rangeFullyContains(std::pair<Type1, Type1> containing, std::pair<Type2, Type2> test) const;
 
         template <typename Type1, typename Type2>
-        bool rangesMatch(std::pair<Type1,Type1> range1, std::pair<Type2,Type2> range2) const;
+        bool rangesMatch(std::pair<Type1, Type1> range1, std::pair<Type2, Type2> range2) const;
 
         template <typename Type1, typename Type2>
-        bool conditionIsAlwaysTrue(std::pair<Type1,Type1> conditionRange, std::pair<Type2,Type2> validRange) const;
+        bool conditionIsAlwaysTrue(std::pair<Type1, Type1> conditionRange, std::pair<Type2, Type2> validRange) const;
 
         template <typename Type1, typename Type2>
-        bool conditionIsNeverTrue(std::pair<Type1,Type1> conditionRange, std::pair<Type2,Type2> validRange) const;
+        bool conditionIsNeverTrue(std::pair<Type1, Type1> conditionRange, std::pair<Type2, Type2> validRange) const;
 
         FunctionName mFunctionName;
         RelationType mRelationType;
@@ -208,7 +206,6 @@ namespace CSMWorld
         std::string mVariableName;
 
     private:
-
         const ESM::DialInfo::SelectStruct& mConstSelect;
     };
 
@@ -216,7 +213,6 @@ namespace CSMWorld
     class InfoSelectWrapper : public ConstInfoSelectWrapper
     {
     public:
-
         InfoSelectWrapper(ESM::DialInfo::SelectStruct& select);
 
         // Wrapped SelectStruct will not be modified until update() is called
@@ -233,7 +229,6 @@ namespace CSMWorld
         ESM::Variant& getVariant();
 
     private:
-
         ESM::DialInfo::SelectStruct& mSelect;
 
         void writeRule();
diff --git a/apps/opencs/model/world/infotableproxymodel.cpp b/apps/opencs/model/world/infotableproxymodel.cpp
index e6d024311e..9446ba6b86 100644
--- a/apps/opencs/model/world/infotableproxymodel.cpp
+++ b/apps/opencs/model/world/infotableproxymodel.cpp
@@ -2,29 +2,28 @@
 
 #include <components/misc/strings/lower.hpp>
 
-#include "idtablebase.hpp"
 #include "columns.hpp"
+#include "idtablebase.hpp"
 
 namespace
 {
-    QString toLower(const QString &str)
+    QString toLower(const QString& str)
     {
         return QString::fromUtf8(Misc::StringUtils::lowerCase(str.toUtf8().constData()).c_str());
     }
 }
 
-CSMWorld::InfoTableProxyModel::InfoTableProxyModel(CSMWorld::UniversalId::Type type, QObject *parent)
-    : IdTableProxyModel(parent),
-      mType(type),
-      mInfoColumnId(type == UniversalId::Type_TopicInfos ? Columns::ColumnId_Topic :
-                                                           Columns::ColumnId_Journal),
-      mInfoColumnIndex(-1),
-      mLastAddedSourceRow(-1)
+CSMWorld::InfoTableProxyModel::InfoTableProxyModel(CSMWorld::UniversalId::Type type, QObject* parent)
+    : IdTableProxyModel(parent)
+    , mType(type)
+    , mInfoColumnId(type == UniversalId::Type_TopicInfos ? Columns::ColumnId_Topic : Columns::ColumnId_Journal)
+    , mInfoColumnIndex(-1)
+    , mLastAddedSourceRow(-1)
 {
     Q_ASSERT(type == UniversalId::Type_TopicInfos || type == UniversalId::Type_JournalInfos);
 }
 
-void CSMWorld::InfoTableProxyModel::setSourceModel(QAbstractItemModel *sourceModel)
+void CSMWorld::InfoTableProxyModel::setSourceModel(QAbstractItemModel* sourceModel)
 {
     IdTableProxyModel::setSourceModel(sourceModel);
 
@@ -35,7 +34,7 @@ void CSMWorld::InfoTableProxyModel::setSourceModel(QAbstractItemModel *sourceMod
     }
 }
 
-bool CSMWorld::InfoTableProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
+bool CSMWorld::InfoTableProxyModel::lessThan(const QModelIndex& left, const QModelIndex& right) const
 {
     Q_ASSERT(mSourceModel != nullptr);
 
@@ -63,21 +62,21 @@ int CSMWorld::InfoTableProxyModel::getFirstInfoRow(int currentRow) const
         return mFirstRowCache[info];
     }
 
-    while (--row >= 0 && 
-           toLower(mSourceModel->data(mSourceModel->index(row, column)).toString()) == info);
+    while (--row >= 0 && toLower(mSourceModel->data(mSourceModel->index(row, column)).toString()) == info)
+        ;
     ++row;
 
     mFirstRowCache[info] = row;
     return row;
 }
 
-void CSMWorld::InfoTableProxyModel::sourceRowsRemoved(const QModelIndex &/*parent*/, int /*start*/, int /*end*/)
+void CSMWorld::InfoTableProxyModel::sourceRowsRemoved(const QModelIndex& /*parent*/, int /*start*/, int /*end*/)
 {
     refreshFilter();
     mFirstRowCache.clear();
 }
 
-void CSMWorld::InfoTableProxyModel::sourceRowsInserted(const QModelIndex &parent, int /*start*/, int end)
+void CSMWorld::InfoTableProxyModel::sourceRowsInserted(const QModelIndex& parent, int /*start*/, int end)
 {
     refreshFilter();
 
@@ -90,19 +89,18 @@ void CSMWorld::InfoTableProxyModel::sourceRowsInserted(const QModelIndex &parent
     }
 }
 
-void CSMWorld::InfoTableProxyModel::sourceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
+void CSMWorld::InfoTableProxyModel::sourceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     refreshFilter();
 
-    if (mLastAddedSourceRow != -1 && 
-        topLeft.row() <= mLastAddedSourceRow && bottomRight.row() >= mLastAddedSourceRow)
+    if (mLastAddedSourceRow != -1 && topLeft.row() <= mLastAddedSourceRow && bottomRight.row() >= mLastAddedSourceRow)
     {
-        // Now the topic of the last added row is set, 
+        // Now the topic of the last added row is set,
         // so we can re-sort the model to ensure the corrent position of this row
         int column = sortColumn();
         Qt::SortOrder order = sortOrder();
         sort(mInfoColumnIndex); // Restore the correct position of an added row
-        sort(column, order);    // Restore the original sort order
+        sort(column, order); // Restore the original sort order
         emit rowAdded(getRecordId(mLastAddedSourceRow).toUtf8().constData());
 
         // Make sure that we perform a re-sorting only in the first dataChanged() after a row insertion
diff --git a/apps/opencs/model/world/infotableproxymodel.hpp b/apps/opencs/model/world/infotableproxymodel.hpp
index 92afdabdc5..5bf0c86039 100644
--- a/apps/opencs/model/world/infotableproxymodel.hpp
+++ b/apps/opencs/model/world/infotableproxymodel.hpp
@@ -3,8 +3,8 @@
 
 #include <QHash>
 
-#include "idtableproxymodel.hpp"
 #include "columns.hpp"
+#include "idtableproxymodel.hpp"
 #include "universalid.hpp"
 
 namespace CSMWorld
@@ -13,32 +13,32 @@ namespace CSMWorld
 
     class InfoTableProxyModel : public IdTableProxyModel
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            UniversalId::Type mType;
-            Columns::ColumnId mInfoColumnId;
-            ///< Contains ID for Topic or Journal ID
-            int mInfoColumnIndex;
-            int mLastAddedSourceRow;
+        UniversalId::Type mType;
+        Columns::ColumnId mInfoColumnId;
+        ///< Contains ID for Topic or Journal ID
+        int mInfoColumnIndex;
+        int mLastAddedSourceRow;
 
-            mutable QHash<QString, int> mFirstRowCache;
+        mutable QHash<QString, int> mFirstRowCache;
 
-            int getFirstInfoRow(int currentRow) const;
-            ///< Finds the first row with the same topic (journal entry) as in \a currentRow
-            ///< \a currentRow is a row of the source model.
+        int getFirstInfoRow(int currentRow) const;
+        ///< Finds the first row with the same topic (journal entry) as in \a currentRow
+        ///< \a currentRow is a row of the source model.
 
-        public:
-            InfoTableProxyModel(UniversalId::Type type, QObject *parent = nullptr);
+    public:
+        InfoTableProxyModel(UniversalId::Type type, QObject* parent = nullptr);
 
-            void setSourceModel(QAbstractItemModel *sourceModel) override;
+        void setSourceModel(QAbstractItemModel* sourceModel) override;
 
-        protected:
-            bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
+    protected:
+        bool lessThan(const QModelIndex& left, const QModelIndex& right) const override;
 
-        protected slots:
-            void sourceRowsInserted(const QModelIndex &parent, int start, int end) override;
-            void sourceRowsRemoved(const QModelIndex &parent, int start, int end) override;
-            void sourceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override;
+    protected slots:
+        void sourceRowsInserted(const QModelIndex& parent, int start, int end) override;
+        void sourceRowsRemoved(const QModelIndex& parent, int start, int end) override;
+        void sourceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight) override;
     };
 }
 
diff --git a/apps/opencs/model/world/land.cpp b/apps/opencs/model/world/land.cpp
index bfa927444e..e5264039e7 100644
--- a/apps/opencs/model/world/land.cpp
+++ b/apps/opencs/model/world/land.cpp
@@ -5,7 +5,7 @@
 
 namespace CSMWorld
 {
-    void Land::load(ESM::ESMReader &esm, bool &isDeleted)
+    void Land::load(ESM::ESMReader& esm, bool& isDeleted)
     {
         ESM::Land::load(esm, isDeleted);
     }
diff --git a/apps/opencs/model/world/land.hpp b/apps/opencs/model/world/land.hpp
index 99da5cfac0..67261066f4 100644
--- a/apps/opencs/model/world/land.hpp
+++ b/apps/opencs/model/world/land.hpp
@@ -13,7 +13,7 @@ namespace CSMWorld
     struct Land : public ESM::Land
     {
         /// Loads the metadata and ID
-        void load (ESM::ESMReader &esm, bool &isDeleted);
+        void load(ESM::ESMReader& esm, bool& isDeleted);
 
         static std::string createUniqueRecordId(int x, int y);
         static void parseUniqueRecordId(const std::string& id, int& x, int& y);
diff --git a/apps/opencs/model/world/landtexture.cpp b/apps/opencs/model/world/landtexture.cpp
index c8ac8369ed..9b11b348fc 100644
--- a/apps/opencs/model/world/landtexture.cpp
+++ b/apps/opencs/model/world/landtexture.cpp
@@ -7,7 +7,7 @@
 
 namespace CSMWorld
 {
-    void LandTexture::load(ESM::ESMReader &esm, bool &isDeleted)
+    void LandTexture::load(ESM::ESMReader& esm, bool& isDeleted)
     {
         ESM::LandTexture::load(esm, isDeleted);
 
@@ -28,7 +28,7 @@ namespace CSMWorld
         if (middle == std::string::npos || id[0] != 'L')
             throw std::runtime_error("Invalid LandTexture ID");
 
-        plugin = std::stoi(id.substr(1,middle-1));
-        index = std::stoi(id.substr(middle+1));
+        plugin = std::stoi(id.substr(1, middle - 1));
+        index = std::stoi(id.substr(middle + 1));
     }
 }
diff --git a/apps/opencs/model/world/landtexture.hpp b/apps/opencs/model/world/landtexture.hpp
index 601d4b79c9..27e9d0d4f1 100644
--- a/apps/opencs/model/world/landtexture.hpp
+++ b/apps/opencs/model/world/landtexture.hpp
@@ -12,7 +12,7 @@ namespace CSMWorld
     {
         int mPluginIndex;
 
-        void load (ESM::ESMReader &esm, bool &isDeleted);
+        void load(ESM::ESMReader& esm, bool& isDeleted);
 
         /// Returns a string identifier that will be unique to any LandTexture.
         static std::string createUniqueRecordId(int plugin, int index);
diff --git a/apps/opencs/model/world/landtexturetableproxymodel.cpp b/apps/opencs/model/world/landtexturetableproxymodel.cpp
index e064bbe8aa..b1249c5580 100644
--- a/apps/opencs/model/world/landtexturetableproxymodel.cpp
+++ b/apps/opencs/model/world/landtexturetableproxymodel.cpp
@@ -9,7 +9,7 @@ namespace CSMWorld
     {
     }
 
-    bool LandTextureTableProxyModel::filterAcceptsRow (int sourceRow, const QModelIndex& sourceParent) const
+    bool LandTextureTableProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const
     {
         return IdTableProxyModel::filterAcceptsRow(sourceRow, sourceParent);
     }
diff --git a/apps/opencs/model/world/landtexturetableproxymodel.hpp b/apps/opencs/model/world/landtexturetableproxymodel.hpp
index bbedecb538..8609381585 100644
--- a/apps/opencs/model/world/landtexturetableproxymodel.hpp
+++ b/apps/opencs/model/world/landtexturetableproxymodel.hpp
@@ -8,14 +8,12 @@ namespace CSMWorld
     /// \brief Removes base records from filtered results.
     class LandTextureTableProxyModel : public IdTableProxyModel
     {
-            Q_OBJECT
-        public:
+        Q_OBJECT
+    public:
+        LandTextureTableProxyModel(QObject* parent = nullptr);
 
-            LandTextureTableProxyModel(QObject* parent = nullptr);
-
-        protected:
-
-            bool filterAcceptsRow (int sourceRow, const QModelIndex& sourceParent) const override;
+    protected:
+        bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override;
     };
 }
 
diff --git a/apps/opencs/model/world/metadata.cpp b/apps/opencs/model/world/metadata.cpp
index e7d6c8900c..d747515c86 100644
--- a/apps/opencs/model/world/metadata.cpp
+++ b/apps/opencs/model/world/metadata.cpp
@@ -1,8 +1,8 @@
 #include "metadata.hpp"
 
-#include <components/esm3/loadtes3.hpp>
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/esmwriter.hpp>
+#include <components/esm3/loadtes3.hpp>
 
 void CSMWorld::MetaData::blank()
 {
@@ -13,16 +13,16 @@ void CSMWorld::MetaData::blank()
     mDescription.clear();
 }
 
-void CSMWorld::MetaData::load (ESM::ESMReader& esm)
+void CSMWorld::MetaData::load(ESM::ESMReader& esm)
 {
     mFormat = esm.getHeader().mFormat;
     mAuthor = esm.getHeader().mData.author;
     mDescription = esm.getHeader().mData.desc;
 }
 
-void CSMWorld::MetaData::save (ESM::ESMWriter& esm) const
+void CSMWorld::MetaData::save(ESM::ESMWriter& esm) const
 {
-    esm.setFormat (mFormat);
-    esm.setAuthor (mAuthor);
-    esm.setDescription (mDescription);
+    esm.setFormat(mFormat);
+    esm.setAuthor(mAuthor);
+    esm.setDescription(mDescription);
 }
diff --git a/apps/opencs/model/world/metadata.hpp b/apps/opencs/model/world/metadata.hpp
index f8df2690ec..330551b1e2 100644
--- a/apps/opencs/model/world/metadata.hpp
+++ b/apps/opencs/model/world/metadata.hpp
@@ -21,8 +21,8 @@ namespace CSMWorld
 
         void blank();
 
-        void load (ESM::ESMReader& esm);
-        void save (ESM::ESMWriter& esm) const;
+        void load(ESM::ESMReader& esm);
+        void save(ESM::ESMWriter& esm) const;
     };
 }
 
diff --git a/apps/opencs/model/world/nestedcoladapterimp.cpp b/apps/opencs/model/world/nestedcoladapterimp.cpp
index 131c71d5a0..8951a97c1e 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.cpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.cpp
@@ -1,16 +1,16 @@
 #include "nestedcoladapterimp.hpp"
 
-#include <components/esm3/loadregn.hpp>
 #include <components/esm3/loadfact.hpp>
+#include <components/esm3/loadregn.hpp>
 
 #include "idcollection.hpp"
-#include "pathgrid.hpp"
 #include "info.hpp"
 #include "infoselectwrapper.hpp"
+#include "pathgrid.hpp"
 
 namespace CSMWorld
 {
-    PathgridPointListAdapter::PathgridPointListAdapter () {}
+    PathgridPointListAdapter::PathgridPointListAdapter() {}
 
     void PathgridPointListAdapter::addRow(Record<Pathgrid>& record, int position) const
     {
@@ -27,10 +27,10 @@ namespace CSMWorld
         point.mConnectionNum = 0;
         point.mUnknown = 0;
 
-        points.insert(points.begin()+position, point);
+        points.insert(points.begin() + position, point);
         pathgrid.mData.mS2 = pathgrid.mPoints.size();
 
-        record.setModified (pathgrid);
+        record.setModified(pathgrid);
     }
 
     void PathgridPointListAdapter::removeRow(Record<Pathgrid>& record, int rowToRemove) const
@@ -39,25 +39,24 @@ namespace CSMWorld
 
         ESM::Pathgrid::PointList& points = pathgrid.mPoints;
 
-        if (rowToRemove < 0 || rowToRemove >= static_cast<int> (points.size()))
-            throw std::runtime_error ("index out of range");
+        if (rowToRemove < 0 || rowToRemove >= static_cast<int>(points.size()))
+            throw std::runtime_error("index out of range");
 
         // Do not remove dangling edges, does not work with current undo mechanism
         // Do not automatically adjust indices, what would be done with dangling edges?
-        points.erase(points.begin()+rowToRemove);
+        points.erase(points.begin() + rowToRemove);
         pathgrid.mData.mS2 = pathgrid.mPoints.size();
 
-        record.setModified (pathgrid);
+        record.setModified(pathgrid);
     }
 
-    void PathgridPointListAdapter::setTable(Record<Pathgrid>& record,
-            const NestedTableWrapperBase& nestedTable) const
+    void PathgridPointListAdapter::setTable(Record<Pathgrid>& record, const NestedTableWrapperBase& nestedTable) const
     {
         Pathgrid pathgrid = record.get();
-        pathgrid.mPoints = static_cast<const NestedTableWrapper<ESM::Pathgrid::PointList> &>(nestedTable).mNestedTable;
+        pathgrid.mPoints = static_cast<const NestedTableWrapper<ESM::Pathgrid::PointList>&>(nestedTable).mNestedTable;
         pathgrid.mData.mS2 = pathgrid.mPoints.size();
 
-        record.setModified (pathgrid);
+        record.setModified(pathgrid);
     }
 
     NestedTableWrapperBase* PathgridPointListAdapter::table(const Record<Pathgrid>& record) const
@@ -66,37 +65,49 @@ namespace CSMWorld
         return new NestedTableWrapper<ESM::Pathgrid::PointList>(record.get().mPoints);
     }
 
-    QVariant PathgridPointListAdapter::getData(const Record<Pathgrid>& record,
-            int subRowIndex, int subColIndex) const
+    QVariant PathgridPointListAdapter::getData(const Record<Pathgrid>& record, int subRowIndex, int subColIndex) const
     {
         ESM::Pathgrid::Point point = record.get().mPoints[subRowIndex];
         switch (subColIndex)
         {
-            case 0: return subRowIndex;
-            case 1: return point.mX;
-            case 2: return point.mY;
-            case 3: return point.mZ;
-            default: throw std::runtime_error("Pathgrid point subcolumn index out of range");
+            case 0:
+                return subRowIndex;
+            case 1:
+                return point.mX;
+            case 2:
+                return point.mY;
+            case 3:
+                return point.mZ;
+            default:
+                throw std::runtime_error("Pathgrid point subcolumn index out of range");
         }
     }
 
-    void PathgridPointListAdapter::setData(Record<Pathgrid>& record,
-            const QVariant& value, int subRowIndex, int subColIndex) const
+    void PathgridPointListAdapter::setData(
+        Record<Pathgrid>& record, const QVariant& value, int subRowIndex, int subColIndex) const
     {
         Pathgrid pathgrid = record.get();
         ESM::Pathgrid::Point point = pathgrid.mPoints[subRowIndex];
         switch (subColIndex)
         {
-            case 0: return; // return without saving
-            case 1: point.mX = value.toInt(); break;
-            case 2: point.mY = value.toInt(); break;
-            case 3: point.mZ = value.toInt(); break;
-            default: throw std::runtime_error("Pathgrid point subcolumn index out of range");
+            case 0:
+                return; // return without saving
+            case 1:
+                point.mX = value.toInt();
+                break;
+            case 2:
+                point.mY = value.toInt();
+                break;
+            case 3:
+                point.mZ = value.toInt();
+                break;
+            default:
+                throw std::runtime_error("Pathgrid point subcolumn index out of range");
         }
 
         pathgrid.mPoints[subRowIndex] = point;
 
-        record.setModified (pathgrid);
+        record.setModified(pathgrid);
     }
 
     int PathgridPointListAdapter::getColumnsCount(const Record<Pathgrid>& record) const
@@ -109,7 +120,7 @@ namespace CSMWorld
         return static_cast<int>(record.get().mPoints.size());
     }
 
-    PathgridEdgeListAdapter::PathgridEdgeListAdapter () {}
+    PathgridEdgeListAdapter::PathgridEdgeListAdapter() {}
 
     void PathgridEdgeListAdapter::addRow(Record<Pathgrid>& record, int position) const
     {
@@ -127,9 +138,9 @@ namespace CSMWorld
         //
         // Currently the code assumes that the end user to know what he/she is doing.
         // e.g. Edges come in pairs, from points a->b and b->a
-        edges.insert(edges.begin()+position, edge);
+        edges.insert(edges.begin() + position, edge);
 
-        record.setModified (pathgrid);
+        record.setModified(pathgrid);
     }
 
     void PathgridEdgeListAdapter::removeRow(Record<Pathgrid>& record, int rowToRemove) const
@@ -138,23 +149,21 @@ namespace CSMWorld
 
         ESM::Pathgrid::EdgeList& edges = pathgrid.mEdges;
 
-        if (rowToRemove < 0 || rowToRemove >= static_cast<int> (edges.size()))
-            throw std::runtime_error ("index out of range");
+        if (rowToRemove < 0 || rowToRemove >= static_cast<int>(edges.size()))
+            throw std::runtime_error("index out of range");
 
-        edges.erase(edges.begin()+rowToRemove);
+        edges.erase(edges.begin() + rowToRemove);
 
-        record.setModified (pathgrid);
+        record.setModified(pathgrid);
     }
 
-    void PathgridEdgeListAdapter::setTable(Record<Pathgrid>& record,
-            const NestedTableWrapperBase& nestedTable) const
+    void PathgridEdgeListAdapter::setTable(Record<Pathgrid>& record, const NestedTableWrapperBase& nestedTable) const
     {
         Pathgrid pathgrid = record.get();
 
-        pathgrid.mEdges =
-            static_cast<const NestedTableWrapper<ESM::Pathgrid::EdgeList> &>(nestedTable).mNestedTable;
+        pathgrid.mEdges = static_cast<const NestedTableWrapper<ESM::Pathgrid::EdgeList>&>(nestedTable).mNestedTable;
 
-        record.setModified (pathgrid);
+        record.setModified(pathgrid);
     }
 
     NestedTableWrapperBase* PathgridEdgeListAdapter::table(const Record<Pathgrid>& record) const
@@ -163,44 +172,53 @@ namespace CSMWorld
         return new NestedTableWrapper<ESM::Pathgrid::EdgeList>(record.get().mEdges);
     }
 
-    QVariant PathgridEdgeListAdapter::getData(const Record<Pathgrid>& record,
-            int subRowIndex, int subColIndex) const
+    QVariant PathgridEdgeListAdapter::getData(const Record<Pathgrid>& record, int subRowIndex, int subColIndex) const
     {
         Pathgrid pathgrid = record.get();
 
-        if (subRowIndex < 0 || subRowIndex >= static_cast<int> (pathgrid.mEdges.size()))
-            throw std::runtime_error ("index out of range");
+        if (subRowIndex < 0 || subRowIndex >= static_cast<int>(pathgrid.mEdges.size()))
+            throw std::runtime_error("index out of range");
 
         ESM::Pathgrid::Edge edge = pathgrid.mEdges[subRowIndex];
         switch (subColIndex)
         {
-            case 0: return subRowIndex;
-            case 1: return edge.mV0;
-            case 2: return edge.mV1;
-            default: throw std::runtime_error("Pathgrid edge subcolumn index out of range");
+            case 0:
+                return subRowIndex;
+            case 1:
+                return edge.mV0;
+            case 2:
+                return edge.mV1;
+            default:
+                throw std::runtime_error("Pathgrid edge subcolumn index out of range");
         }
     }
 
-    void PathgridEdgeListAdapter::setData(Record<Pathgrid>& record,
-            const QVariant& value, int subRowIndex, int subColIndex) const
+    void PathgridEdgeListAdapter::setData(
+        Record<Pathgrid>& record, const QVariant& value, int subRowIndex, int subColIndex) const
     {
         Pathgrid pathgrid = record.get();
 
-        if (subRowIndex < 0 || subRowIndex >= static_cast<int> (pathgrid.mEdges.size()))
-            throw std::runtime_error ("index out of range");
+        if (subRowIndex < 0 || subRowIndex >= static_cast<int>(pathgrid.mEdges.size()))
+            throw std::runtime_error("index out of range");
 
         ESM::Pathgrid::Edge edge = pathgrid.mEdges[subRowIndex];
         switch (subColIndex)
         {
-            case 0: return; // return without saving
-            case 1: edge.mV0 = value.toInt(); break;
-            case 2: edge.mV1 = value.toInt(); break;
-            default: throw std::runtime_error("Pathgrid edge subcolumn index out of range");
+            case 0:
+                return; // return without saving
+            case 1:
+                edge.mV0 = value.toInt();
+                break;
+            case 2:
+                edge.mV1 = value.toInt();
+                break;
+            default:
+                throw std::runtime_error("Pathgrid edge subcolumn index out of range");
         }
 
         pathgrid.mEdges[subRowIndex] = edge;
 
-        record.setModified (pathgrid);
+        record.setModified(pathgrid);
     }
 
     int PathgridEdgeListAdapter::getColumnsCount(const Record<Pathgrid>& record) const
@@ -213,7 +231,7 @@ namespace CSMWorld
         return static_cast<int>(record.get().mEdges.size());
     }
 
-    FactionReactionsAdapter::FactionReactionsAdapter () {}
+    FactionReactionsAdapter::FactionReactionsAdapter() {}
 
     void FactionReactionsAdapter::addRow(Record<ESM::Faction>& record, int position) const
     {
@@ -224,7 +242,7 @@ namespace CSMWorld
         // blank row
         reactions.insert(std::make_pair("", 0));
 
-        record.setModified (faction);
+        record.setModified(faction);
     }
 
     void FactionReactionsAdapter::removeRow(Record<ESM::Faction>& record, int rowToRemove) const
@@ -233,73 +251,76 @@ namespace CSMWorld
 
         std::map<std::string, int>& reactions = faction.mReactions;
 
-        if (rowToRemove < 0 || rowToRemove >= static_cast<int> (reactions.size()))
-            throw std::runtime_error ("index out of range");
+        if (rowToRemove < 0 || rowToRemove >= static_cast<int>(reactions.size()))
+            throw std::runtime_error("index out of range");
 
         // FIXME: how to ensure that the map entries correspond to table indicies?
         // WARNING: Assumed that the table view has the same order as std::map
         std::map<std::string, int>::iterator iter = reactions.begin();
-        for(int i = 0; i < rowToRemove; ++i)
+        for (int i = 0; i < rowToRemove; ++i)
             ++iter;
         reactions.erase(iter);
 
-        record.setModified (faction);
+        record.setModified(faction);
     }
 
-    void FactionReactionsAdapter::setTable(Record<ESM::Faction>& record,
-            const NestedTableWrapperBase& nestedTable) const
+    void FactionReactionsAdapter::setTable(
+        Record<ESM::Faction>& record, const NestedTableWrapperBase& nestedTable) const
     {
         ESM::Faction faction = record.get();
 
-        faction.mReactions =
-            static_cast<const NestedTableWrapper<std::map<std::string, int> >&>(nestedTable).mNestedTable;
+        faction.mReactions
+            = static_cast<const NestedTableWrapper<std::map<std::string, int>>&>(nestedTable).mNestedTable;
 
-        record.setModified (faction);
+        record.setModified(faction);
     }
 
     NestedTableWrapperBase* FactionReactionsAdapter::table(const Record<ESM::Faction>& record) const
     {
         // deleted by dtor of NestedTableStoring
-        return new NestedTableWrapper<std::map<std::string, int> >(record.get().mReactions);
+        return new NestedTableWrapper<std::map<std::string, int>>(record.get().mReactions);
     }
 
-    QVariant FactionReactionsAdapter::getData(const Record<ESM::Faction>& record,
-            int subRowIndex, int subColIndex) const
+    QVariant FactionReactionsAdapter::getData(
+        const Record<ESM::Faction>& record, int subRowIndex, int subColIndex) const
     {
         ESM::Faction faction = record.get();
 
         std::map<std::string, int>& reactions = faction.mReactions;
 
-        if (subRowIndex < 0 || subRowIndex >= static_cast<int> (reactions.size()))
-            throw std::runtime_error ("index out of range");
+        if (subRowIndex < 0 || subRowIndex >= static_cast<int>(reactions.size()))
+            throw std::runtime_error("index out of range");
 
         // FIXME: how to ensure that the map entries correspond to table indicies?
         // WARNING: Assumed that the table view has the same order as std::map
         std::map<std::string, int>::const_iterator iter = reactions.begin();
-        for(int i = 0; i < subRowIndex; ++i)
+        for (int i = 0; i < subRowIndex; ++i)
             ++iter;
         switch (subColIndex)
         {
-            case 0: return QString((*iter).first.c_str());
-            case 1: return (*iter).second;
-            default: throw std::runtime_error("Faction reactions subcolumn index out of range");
+            case 0:
+                return QString((*iter).first.c_str());
+            case 1:
+                return (*iter).second;
+            default:
+                throw std::runtime_error("Faction reactions subcolumn index out of range");
         }
     }
 
-    void FactionReactionsAdapter::setData(Record<ESM::Faction>& record,
-            const QVariant& value, int subRowIndex, int subColIndex) const
+    void FactionReactionsAdapter::setData(
+        Record<ESM::Faction>& record, const QVariant& value, int subRowIndex, int subColIndex) const
     {
         ESM::Faction faction = record.get();
 
         std::map<std::string, int>& reactions = faction.mReactions;
 
-        if (subRowIndex < 0 || subRowIndex >= static_cast<int> (reactions.size()))
-            throw std::runtime_error ("index out of range");
+        if (subRowIndex < 0 || subRowIndex >= static_cast<int>(reactions.size()))
+            throw std::runtime_error("index out of range");
 
         // FIXME: how to ensure that the map entries correspond to table indicies?
         // WARNING: Assumed that the table view has the same order as std::map
         std::map<std::string, int>::iterator iter = reactions.begin();
-        for(int i = 0; i < subRowIndex; ++i)
+        for (int i = 0; i < subRowIndex; ++i)
             ++iter;
 
         std::string factionId = (*iter).first;
@@ -318,10 +339,11 @@ namespace CSMWorld
                 reactions[factionId] = value.toInt();
                 break;
             }
-            default: throw std::runtime_error("Faction reactions subcolumn index out of range");
+            default:
+                throw std::runtime_error("Faction reactions subcolumn index out of range");
         }
 
-        record.setModified (faction);
+        record.setModified(faction);
     }
 
     int FactionReactionsAdapter::getColumnsCount(const Record<ESM::Faction>& record) const
@@ -334,7 +356,7 @@ namespace CSMWorld
         return static_cast<int>(record.get().mReactions.size());
     }
 
-    RegionSoundListAdapter::RegionSoundListAdapter () {}
+    RegionSoundListAdapter::RegionSoundListAdapter() {}
 
     void RegionSoundListAdapter::addRow(Record<ESM::Region>& record, int position) const
     {
@@ -347,9 +369,9 @@ namespace CSMWorld
         soundRef.mSound.assign("");
         soundRef.mChance = 0;
 
-        soundList.insert(soundList.begin()+position, soundRef);
+        soundList.insert(soundList.begin() + position, soundRef);
 
-        record.setModified (region);
+        record.setModified(region);
     }
 
     void RegionSoundListAdapter::removeRow(Record<ESM::Region>& record, int rowToRemove) const
@@ -358,71 +380,77 @@ namespace CSMWorld
 
         std::vector<ESM::Region::SoundRef>& soundList = region.mSoundList;
 
-        if (rowToRemove < 0 || rowToRemove >= static_cast<int> (soundList.size()))
-            throw std::runtime_error ("index out of range");
+        if (rowToRemove < 0 || rowToRemove >= static_cast<int>(soundList.size()))
+            throw std::runtime_error("index out of range");
 
-        soundList.erase(soundList.begin()+rowToRemove);
+        soundList.erase(soundList.begin() + rowToRemove);
 
-        record.setModified (region);
+        record.setModified(region);
     }
 
-    void RegionSoundListAdapter::setTable(Record<ESM::Region>& record,
-            const NestedTableWrapperBase& nestedTable) const
+    void RegionSoundListAdapter::setTable(Record<ESM::Region>& record, const NestedTableWrapperBase& nestedTable) const
     {
         ESM::Region region = record.get();
 
-        region.mSoundList =
-            static_cast<const NestedTableWrapper<std::vector<ESM::Region::SoundRef> >&>(nestedTable).mNestedTable;
+        region.mSoundList
+            = static_cast<const NestedTableWrapper<std::vector<ESM::Region::SoundRef>>&>(nestedTable).mNestedTable;
 
-        record.setModified (region);
+        record.setModified(region);
     }
 
     NestedTableWrapperBase* RegionSoundListAdapter::table(const Record<ESM::Region>& record) const
     {
         // deleted by dtor of NestedTableStoring
-        return new NestedTableWrapper<std::vector<ESM::Region::SoundRef> >(record.get().mSoundList);
+        return new NestedTableWrapper<std::vector<ESM::Region::SoundRef>>(record.get().mSoundList);
     }
 
-    QVariant RegionSoundListAdapter::getData(const Record<ESM::Region>& record,
-            int subRowIndex, int subColIndex) const
+    QVariant RegionSoundListAdapter::getData(const Record<ESM::Region>& record, int subRowIndex, int subColIndex) const
     {
         ESM::Region region = record.get();
 
         std::vector<ESM::Region::SoundRef>& soundList = region.mSoundList;
 
-        if (subRowIndex < 0 || subRowIndex >= static_cast<int> (soundList.size()))
-            throw std::runtime_error ("index out of range");
+        if (subRowIndex < 0 || subRowIndex >= static_cast<int>(soundList.size()))
+            throw std::runtime_error("index out of range");
 
         ESM::Region::SoundRef soundRef = soundList[subRowIndex];
         switch (subColIndex)
         {
-            case 0: return QString(soundRef.mSound.c_str());
-            case 1: return soundRef.mChance;
-            default: throw std::runtime_error("Region sounds subcolumn index out of range");
+            case 0:
+                return QString(soundRef.mSound.c_str());
+            case 1:
+                return soundRef.mChance;
+            default:
+                throw std::runtime_error("Region sounds subcolumn index out of range");
         }
     }
 
-    void RegionSoundListAdapter::setData(Record<ESM::Region>& record,
-            const QVariant& value, int subRowIndex, int subColIndex) const
+    void RegionSoundListAdapter::setData(
+        Record<ESM::Region>& record, const QVariant& value, int subRowIndex, int subColIndex) const
     {
         ESM::Region region = record.get();
 
         std::vector<ESM::Region::SoundRef>& soundList = region.mSoundList;
 
-        if (subRowIndex < 0 || subRowIndex >= static_cast<int> (soundList.size()))
-            throw std::runtime_error ("index out of range");
+        if (subRowIndex < 0 || subRowIndex >= static_cast<int>(soundList.size()))
+            throw std::runtime_error("index out of range");
 
         ESM::Region::SoundRef soundRef = soundList[subRowIndex];
         switch (subColIndex)
         {
-            case 0: soundRef.mSound.assign(value.toString().toUtf8().constData()); break;
-            case 1: soundRef.mChance = static_cast<unsigned char>(value.toInt()); break;
-            default: throw std::runtime_error("Region sounds subcolumn index out of range");
+            case 0:
+                soundRef.mSound.assign(value.toString().toUtf8().constData());
+                break;
+            case 1:
+                soundRef.mChance = static_cast<unsigned char>(value.toInt());
+                break;
+            default:
+                throw std::runtime_error("Region sounds subcolumn index out of range");
         }
 
         region.mSoundList[subRowIndex] = soundRef;
 
-        record.setModified (region);
+        record.setModified(region);
     }
 
     int RegionSoundListAdapter::getColumnsCount(const Record<ESM::Region>& record) const
@@ -435,31 +463,29 @@ namespace CSMWorld
         return static_cast<int>(record.get().mSoundList.size());
     }
 
-    InfoListAdapter::InfoListAdapter () {}
+    InfoListAdapter::InfoListAdapter() {}
 
     void InfoListAdapter::addRow(Record<Info>& record, int position) const
     {
-        throw std::logic_error ("cannot add a row to a fixed table");
+        throw std::logic_error("cannot add a row to a fixed table");
     }
 
     void InfoListAdapter::removeRow(Record<Info>& record, int rowToRemove) const
     {
-        throw std::logic_error ("cannot remove a row to a fixed table");
+        throw std::logic_error("cannot remove a row to a fixed table");
     }
 
-    void InfoListAdapter::setTable(Record<Info>& record,
-            const NestedTableWrapperBase& nestedTable) const
+    void InfoListAdapter::setTable(Record<Info>& record, const NestedTableWrapperBase& nestedTable) const
     {
-        throw std::logic_error ("table operation not supported");
+        throw std::logic_error("table operation not supported");
     }
 
     NestedTableWrapperBase* InfoListAdapter::table(const Record<Info>& record) const
     {
-        throw std::logic_error ("table operation not supported");
+        throw std::logic_error("table operation not supported");
     }
 
-    QVariant InfoListAdapter::getData(const Record<Info>& record,
-            int subRowIndex, int subColIndex) const
+    QVariant InfoListAdapter::getData(const Record<Info>& record, int subRowIndex, int subColIndex) const
     {
         Info info = record.get();
 
@@ -469,8 +495,7 @@ namespace CSMWorld
             throw std::runtime_error("Trying to access non-existing column in the nested table!");
     }
 
-    void InfoListAdapter::setData(Record<Info>& record,
-            const QVariant& value, int subRowIndex, int subColIndex) const
+    void InfoListAdapter::setData(Record<Info>& record, const QVariant& value, int subRowIndex, int subColIndex) const
     {
         Info info = record.get();
 
@@ -479,7 +504,7 @@ namespace CSMWorld
         else
             throw std::runtime_error("Trying to access non-existing column in the nested table!");
 
-        record.setModified (info);
+        record.setModified(info);
     }
 
     int InfoListAdapter::getColumnsCount(const Record<Info>& record) const
@@ -492,7 +517,7 @@ namespace CSMWorld
         return 1; // fixed at size 1
     }
 
-    InfoConditionAdapter::InfoConditionAdapter () {}
+    InfoConditionAdapter::InfoConditionAdapter() {}
 
     void InfoConditionAdapter::addRow(Record<Info>& record, int position) const
     {
@@ -506,9 +531,9 @@ namespace CSMWorld
         condStruct.mValue = ESM::Variant();
         condStruct.mValue.setType(ESM::VT_Int);
 
-        conditions.insert(conditions.begin()+position, condStruct);
+        conditions.insert(conditions.begin() + position, condStruct);
 
-        record.setModified (info);
+        record.setModified(info);
     }
 
     void InfoConditionAdapter::removeRow(Record<Info>& record, int rowToRemove) const
@@ -517,40 +542,38 @@ namespace CSMWorld
 
         std::vector<ESM::DialInfo::SelectStruct>& conditions = info.mSelects;
 
-        if (rowToRemove < 0 || rowToRemove >= static_cast<int> (conditions.size()))
-            throw std::runtime_error ("index out of range");
+        if (rowToRemove < 0 || rowToRemove >= static_cast<int>(conditions.size()))
+            throw std::runtime_error("index out of range");
 
-        conditions.erase(conditions.begin()+rowToRemove);
+        conditions.erase(conditions.begin() + rowToRemove);
 
-        record.setModified (info);
+        record.setModified(info);
     }
 
-    void InfoConditionAdapter::setTable(Record<Info>& record,
-            const NestedTableWrapperBase& nestedTable) const
+    void InfoConditionAdapter::setTable(Record<Info>& record, const NestedTableWrapperBase& nestedTable) const
     {
         Info info = record.get();
 
-        info.mSelects =
-            static_cast<const NestedTableWrapper<std::vector<ESM::DialInfo::SelectStruct> >&>(nestedTable).mNestedTable;
+        info.mSelects = static_cast<const NestedTableWrapper<std::vector<ESM::DialInfo::SelectStruct>>&>(nestedTable)
+                            .mNestedTable;
 
-        record.setModified (info);
+        record.setModified(info);
     }
 
     NestedTableWrapperBase* InfoConditionAdapter::table(const Record<Info>& record) const
     {
         // deleted by dtor of NestedTableStoring
-        return new NestedTableWrapper<std::vector<ESM::DialInfo::SelectStruct> >(record.get().mSelects);
+        return new NestedTableWrapper<std::vector<ESM::DialInfo::SelectStruct>>(record.get().mSelects);
     }
 
-    QVariant InfoConditionAdapter::getData(const Record<Info>& record,
-            int subRowIndex, int subColIndex) const
+    QVariant InfoConditionAdapter::getData(const Record<Info>& record, int subRowIndex, int subColIndex) const
     {
         Info info = record.get();
 
         std::vector<ESM::DialInfo::SelectStruct>& conditions = info.mSelects;
 
-        if (subRowIndex < 0 || subRowIndex >= static_cast<int> (conditions.size()))
-            throw std::runtime_error ("index out of range");
+        if (subRowIndex < 0 || subRowIndex >= static_cast<int>(conditions.size()))
+            throw std::runtime_error("index out of range");
 
         ConstInfoSelectWrapper infoSelectWrapper(conditions[subRowIndex]);
 
@@ -583,22 +606,24 @@ namespace CSMWorld
                     {
                         return infoSelectWrapper.getVariant().getFloat();
                     }
-                    default: return QVariant();
+                    default:
+                        return QVariant();
                 }
             }
-            default: throw std::runtime_error("Info condition subcolumn index out of range");
+            default:
+                throw std::runtime_error("Info condition subcolumn index out of range");
         }
     }
 
-    void InfoConditionAdapter::setData(Record<Info>& record,
-            const QVariant& value, int subRowIndex, int subColIndex) const
+    void InfoConditionAdapter::setData(
+        Record<Info>& record, const QVariant& value, int subRowIndex, int subColIndex) const
     {
         Info info = record.get();
 
         std::vector<ESM::DialInfo::SelectStruct>& conditions = info.mSelects;
 
-        if (subRowIndex < 0 || subRowIndex >= static_cast<int> (conditions.size()))
-            throw std::runtime_error ("index out of range");
+        if (subRowIndex < 0 || subRowIndex >= static_cast<int>(conditions.size()))
+            throw std::runtime_error("index out of range");
 
         InfoSelectWrapper infoSelectWrapper(conditions[subRowIndex]);
         bool conversionResult = false;
@@ -609,8 +634,8 @@ namespace CSMWorld
             {
                 infoSelectWrapper.setFunctionName(static_cast<ConstInfoSelectWrapper::FunctionName>(value.toInt()));
 
-                if (infoSelectWrapper.getComparisonType() != ConstInfoSelectWrapper::Comparison_Numeric &&
-                    infoSelectWrapper.getVariant().getType() != ESM::VT_Int)
+                if (infoSelectWrapper.getComparisonType() != ConstInfoSelectWrapper::Comparison_Numeric
+                    && infoSelectWrapper.getVariant().getType() != ESM::VT_Int)
                 {
                     infoSelectWrapper.getVariant().setType(ESM::VT_Int);
                 }
@@ -659,14 +684,16 @@ namespace CSMWorld
                         }
                         break;
                     }
-                    default: break;
+                    default:
+                        break;
                 }
                 break;
             }
-            default: throw std::runtime_error("Info condition subcolumn index out of range");
+            default:
+                throw std::runtime_error("Info condition subcolumn index out of range");
         }
 
-        record.setModified (info);
+        record.setModified(info);
     }
 
     int InfoConditionAdapter::getColumnsCount(const Record<Info>& record) const
@@ -679,7 +706,7 @@ namespace CSMWorld
         return static_cast<int>(record.get().mSelects.size());
     }
 
-    RaceAttributeAdapter::RaceAttributeAdapter () {}
+    RaceAttributeAdapter::RaceAttributeAdapter() {}
 
     void RaceAttributeAdapter::addRow(Record<ESM::Race>& record, int position) const
     {
@@ -691,15 +718,14 @@ namespace CSMWorld
         // Do nothing, this table cannot be changed by the user
     }
 
-    void RaceAttributeAdapter::setTable(Record<ESM::Race>& record,
-            const NestedTableWrapperBase& nestedTable) const
+    void RaceAttributeAdapter::setTable(Record<ESM::Race>& record, const NestedTableWrapperBase& nestedTable) const
     {
         ESM::Race race = record.get();
 
-        race.mData =
-            static_cast<const NestedTableWrapper<std::vector<ESM::Race::RADTstruct> >&>(nestedTable).mNestedTable.at(0);
+        race.mData = static_cast<const NestedTableWrapper<std::vector<ESM::Race::RADTstruct>>&>(nestedTable)
+                         .mNestedTable.at(0);
 
-        record.setModified (race);
+        record.setModified(race);
     }
 
     NestedTableWrapperBase* RaceAttributeAdapter::table(const Record<ESM::Race>& record) const
@@ -707,43 +733,52 @@ namespace CSMWorld
         std::vector<ESM::Race::RADTstruct> wrap;
         wrap.push_back(record.get().mData);
         // deleted by dtor of NestedTableStoring
-        return new NestedTableWrapper<std::vector<ESM::Race::RADTstruct> >(wrap);
+        return new NestedTableWrapper<std::vector<ESM::Race::RADTstruct>>(wrap);
     }
 
-    QVariant RaceAttributeAdapter::getData(const Record<ESM::Race>& record,
-            int subRowIndex, int subColIndex) const
+    QVariant RaceAttributeAdapter::getData(const Record<ESM::Race>& record, int subRowIndex, int subColIndex) const
     {
         ESM::Race race = record.get();
 
         if (subRowIndex < 0 || subRowIndex >= ESM::Attribute::Length)
-            throw std::runtime_error ("index out of range");
+            throw std::runtime_error("index out of range");
 
         switch (subColIndex)
         {
-            case 0: return subRowIndex;
-            case 1: return race.mData.mAttributeValues[subRowIndex].mMale;
-            case 2: return race.mData.mAttributeValues[subRowIndex].mFemale;
-            default: throw std::runtime_error("Race Attribute subcolumn index out of range");
+            case 0:
+                return subRowIndex;
+            case 1:
+                return race.mData.mAttributeValues[subRowIndex].mMale;
+            case 2:
+                return race.mData.mAttributeValues[subRowIndex].mFemale;
+            default:
+                throw std::runtime_error("Race Attribute subcolumn index out of range");
         }
     }
 
-    void RaceAttributeAdapter::setData(Record<ESM::Race>& record,
-            const QVariant& value, int subRowIndex, int subColIndex) const
+    void RaceAttributeAdapter::setData(
+        Record<ESM::Race>& record, const QVariant& value, int subRowIndex, int subColIndex) const
     {
         ESM::Race race = record.get();
 
         if (subRowIndex < 0 || subRowIndex >= ESM::Attribute::Length)
-            throw std::runtime_error ("index out of range");
+            throw std::runtime_error("index out of range");
 
         switch (subColIndex)
         {
-            case 0: return; // throw an exception here?
-            case 1: race.mData.mAttributeValues[subRowIndex].mMale = value.toInt(); break;
-            case 2: race.mData.mAttributeValues[subRowIndex].mFemale = value.toInt(); break;
-            default: throw std::runtime_error("Race Attribute subcolumn index out of range");
+            case 0:
+                return; // throw an exception here?
+            case 1:
+                race.mData.mAttributeValues[subRowIndex].mMale = value.toInt();
+                break;
+            case 2:
+                race.mData.mAttributeValues[subRowIndex].mFemale = value.toInt();
+                break;
+            default:
+                throw std::runtime_error("Race Attribute subcolumn index out of range");
         }
 
-        record.setModified (race);
+        record.setModified(race);
     }
 
     int RaceAttributeAdapter::getColumnsCount(const Record<ESM::Race>& record) const
@@ -756,7 +791,7 @@ namespace CSMWorld
         return ESM::Attribute::Length; // there are 8 attributes
     }
 
-    RaceSkillsBonusAdapter::RaceSkillsBonusAdapter () {}
+    RaceSkillsBonusAdapter::RaceSkillsBonusAdapter() {}
 
     void RaceSkillsBonusAdapter::addRow(Record<ESM::Race>& record, int position) const
     {
@@ -768,15 +803,14 @@ namespace CSMWorld
         // Do nothing, this table cannot be changed by the user
     }
 
-    void RaceSkillsBonusAdapter::setTable(Record<ESM::Race>& record,
-            const NestedTableWrapperBase& nestedTable) const
+    void RaceSkillsBonusAdapter::setTable(Record<ESM::Race>& record, const NestedTableWrapperBase& nestedTable) const
     {
         ESM::Race race = record.get();
 
-        race.mData =
-            static_cast<const NestedTableWrapper<std::vector<ESM::Race::RADTstruct> >&>(nestedTable).mNestedTable.at(0);
+        race.mData = static_cast<const NestedTableWrapper<std::vector<ESM::Race::RADTstruct>>&>(nestedTable)
+                         .mNestedTable.at(0);
 
-        record.setModified (race);
+        record.setModified(race);
     }
 
     NestedTableWrapperBase* RaceSkillsBonusAdapter::table(const Record<ESM::Race>& record) const
@@ -784,41 +818,50 @@ namespace CSMWorld
         std::vector<ESM::Race::RADTstruct> wrap;
         wrap.push_back(record.get().mData);
         // deleted by dtor of NestedTableStoring
-        return new NestedTableWrapper<std::vector<ESM::Race::RADTstruct> >(wrap);
+        return new NestedTableWrapper<std::vector<ESM::Race::RADTstruct>>(wrap);
     }
 
-    QVariant RaceSkillsBonusAdapter::getData(const Record<ESM::Race>& record,
-            int subRowIndex, int subColIndex) const
+    QVariant RaceSkillsBonusAdapter::getData(const Record<ESM::Race>& record, int subRowIndex, int subColIndex) const
     {
         ESM::Race race = record.get();
 
-        if (subRowIndex < 0 || subRowIndex >= static_cast<int>(sizeof(race.mData.mBonus)/sizeof(race.mData.mBonus[0])))
-            throw std::runtime_error ("index out of range");
+        if (subRowIndex < 0
+            || subRowIndex >= static_cast<int>(sizeof(race.mData.mBonus) / sizeof(race.mData.mBonus[0])))
+            throw std::runtime_error("index out of range");
 
         switch (subColIndex)
         {
-            case 0: return race.mData.mBonus[subRowIndex].mSkill; // can be -1
-            case 1: return race.mData.mBonus[subRowIndex].mBonus;
-            default: throw std::runtime_error("Race skill bonus subcolumn index out of range");
+            case 0:
+                return race.mData.mBonus[subRowIndex].mSkill; // can be -1
+            case 1:
+                return race.mData.mBonus[subRowIndex].mBonus;
+            default:
+                throw std::runtime_error("Race skill bonus subcolumn index out of range");
         }
     }
 
-    void RaceSkillsBonusAdapter::setData(Record<ESM::Race>& record,
-            const QVariant& value, int subRowIndex, int subColIndex) const
+    void RaceSkillsBonusAdapter::setData(
+        Record<ESM::Race>& record, const QVariant& value, int subRowIndex, int subColIndex) const
     {
         ESM::Race race = record.get();
 
-        if (subRowIndex < 0 || subRowIndex >= static_cast<int>(sizeof(race.mData.mBonus)/sizeof(race.mData.mBonus[0])))
-            throw std::runtime_error ("index out of range");
+        if (subRowIndex < 0
+            || subRowIndex >= static_cast<int>(sizeof(race.mData.mBonus) / sizeof(race.mData.mBonus[0])))
+            throw std::runtime_error("index out of range");
 
         switch (subColIndex)
         {
-            case 0: race.mData.mBonus[subRowIndex].mSkill = value.toInt(); break; // can be -1
-            case 1: race.mData.mBonus[subRowIndex].mBonus = value.toInt(); break;
-            default: throw std::runtime_error("Race skill bonus subcolumn index out of range");
+            case 0:
+                race.mData.mBonus[subRowIndex].mSkill = value.toInt();
+                break; // can be -1
+            case 1:
+                race.mData.mBonus[subRowIndex].mBonus = value.toInt();
+                break;
+            default:
+                throw std::runtime_error("Race skill bonus subcolumn index out of range");
         }
 
-        record.setModified (race);
+        record.setModified(race);
     }
 
     int RaceSkillsBonusAdapter::getColumnsCount(const Record<ESM::Race>& record) const
@@ -829,34 +872,32 @@ namespace CSMWorld
     int RaceSkillsBonusAdapter::getRowsCount(const Record<ESM::Race>& record) const
     {
         // there are 7 skill bonuses
-        return static_cast<int>(sizeof(record.get().mData.mBonus)/sizeof(record.get().mData.mBonus[0]));
+        return static_cast<int>(sizeof(record.get().mData.mBonus) / sizeof(record.get().mData.mBonus[0]));
     }
 
-    CellListAdapter::CellListAdapter () {}
+    CellListAdapter::CellListAdapter() {}
 
     void CellListAdapter::addRow(Record<CSMWorld::Cell>& record, int position) const
     {
-        throw std::logic_error ("cannot add a row to a fixed table");
+        throw std::logic_error("cannot add a row to a fixed table");
     }
 
     void CellListAdapter::removeRow(Record<CSMWorld::Cell>& record, int rowToRemove) const
     {
-        throw std::logic_error ("cannot remove a row to a fixed table");
+        throw std::logic_error("cannot remove a row to a fixed table");
     }
 
-    void CellListAdapter::setTable(Record<CSMWorld::Cell>& record,
-            const NestedTableWrapperBase& nestedTable) const
+    void CellListAdapter::setTable(Record<CSMWorld::Cell>& record, const NestedTableWrapperBase& nestedTable) const
     {
-        throw std::logic_error ("table operation not supported");
+        throw std::logic_error("table operation not supported");
     }
 
     NestedTableWrapperBase* CellListAdapter::table(const Record<CSMWorld::Cell>& record) const
     {
-        throw std::logic_error ("table operation not supported");
+        throw std::logic_error("table operation not supported");
     }
 
-    QVariant CellListAdapter::getData(const Record<CSMWorld::Cell>& record,
-            int subRowIndex, int subColIndex) const
+    QVariant CellListAdapter::getData(const Record<CSMWorld::Cell>& record, int subRowIndex, int subColIndex) const
     {
         CSMWorld::Cell cell = record.get();
 
@@ -866,17 +907,18 @@ namespace CSMWorld
 
         switch (subColIndex)
         {
-            case 0: return isInterior;
+            case 0:
+                return isInterior;
             // While the ambient information is not necessarily valid if the subrecord wasn't loaded,
             // the user should still be allowed to edit it
-            case 1: return (isInterior && !behaveLikeExterior) ?
-                    cell.mAmbi.mAmbient : QVariant(QVariant::UserType);
-            case 2: return (isInterior && !behaveLikeExterior) ?
-                    cell.mAmbi.mSunlight : QVariant(QVariant::UserType);
-            case 3: return (isInterior && !behaveLikeExterior) ?
-                    cell.mAmbi.mFog : QVariant(QVariant::UserType);
-            case 4: return (isInterior && !behaveLikeExterior) ?
-                    cell.mAmbi.mFogDensity : QVariant(QVariant::UserType);
+            case 1:
+                return (isInterior && !behaveLikeExterior) ? cell.mAmbi.mAmbient : QVariant(QVariant::UserType);
+            case 2:
+                return (isInterior && !behaveLikeExterior) ? cell.mAmbi.mSunlight : QVariant(QVariant::UserType);
+            case 3:
+                return (isInterior && !behaveLikeExterior) ? cell.mAmbi.mFog : QVariant(QVariant::UserType);
+            case 4:
+                return (isInterior && !behaveLikeExterior) ? cell.mAmbi.mFogDensity : QVariant(QVariant::UserType);
             case 5:
             {
                 if (isInterior && interiorWater)
@@ -884,16 +926,17 @@ namespace CSMWorld
                 else
                     return QVariant(QVariant::UserType);
             }
-            case 6: return isInterior ?
-                    QVariant(QVariant::UserType) : cell.mMapColor; // TODO: how to select?
-            //case 7: return isInterior ?
-                    //behaveLikeExterior : QVariant(QVariant::UserType);
-            default: throw std::runtime_error("Cell subcolumn index out of range");
+            case 6:
+                return isInterior ? QVariant(QVariant::UserType) : cell.mMapColor; // TODO: how to select?
+            // case 7: return isInterior ?
+            // behaveLikeExterior : QVariant(QVariant::UserType);
+            default:
+                throw std::runtime_error("Cell subcolumn index out of range");
         }
     }
 
-    void CellListAdapter::setData(Record<CSMWorld::Cell>& record,
-            const QVariant& value, int subRowIndex, int subColIndex) const
+    void CellListAdapter::setData(
+        Record<CSMWorld::Cell>& record, const QVariant& value, int subRowIndex, int subColIndex) const
     {
         CSMWorld::Cell cell = record.get();
 
@@ -988,10 +1031,11 @@ namespace CSMWorld
                 break;
             }
 #endif
-            default: throw std::runtime_error("Cell subcolumn index out of range");
+            default:
+                throw std::runtime_error("Cell subcolumn index out of range");
         }
 
-        record.setModified (cell);
+        record.setModified(cell);
     }
 
     int CellListAdapter::getColumnsCount(const Record<CSMWorld::Cell>& record) const
@@ -1004,42 +1048,32 @@ namespace CSMWorld
         return 1; // fixed at size 1
     }
 
-    RegionWeatherAdapter::RegionWeatherAdapter () {}
+    RegionWeatherAdapter::RegionWeatherAdapter() {}
 
     void RegionWeatherAdapter::addRow(Record<ESM::Region>& record, int position) const
     {
-        throw std::logic_error ("cannot add a row to a fixed table");
+        throw std::logic_error("cannot add a row to a fixed table");
     }
 
     void RegionWeatherAdapter::removeRow(Record<ESM::Region>& record, int rowToRemove) const
     {
-        throw std::logic_error ("cannot remove a row from a fixed table");
+        throw std::logic_error("cannot remove a row from a fixed table");
     }
 
     void RegionWeatherAdapter::setTable(Record<ESM::Region>& record, const NestedTableWrapperBase& nestedTable) const
     {
-        throw std::logic_error ("table operation not supported");
+        throw std::logic_error("table operation not supported");
     }
 
     NestedTableWrapperBase* RegionWeatherAdapter::table(const Record<ESM::Region>& record) const
     {
-        throw std::logic_error ("table operation not supported");
+        throw std::logic_error("table operation not supported");
     }
 
     QVariant RegionWeatherAdapter::getData(const Record<ESM::Region>& record, int subRowIndex, int subColIndex) const
     {
-        const char* WeatherNames[] = {
-            "Clear",
-            "Cloudy",
-            "Fog",
-            "Overcast",
-            "Rain",
-            "Thunder",
-            "Ash",
-            "Blight",
-            "Snow",
-            "Blizzard"
-        };
+        const char* WeatherNames[]
+            = { "Clear", "Cloudy", "Fog", "Overcast", "Rain", "Thunder", "Ash", "Blight", "Snow", "Blizzard" };
 
         const ESM::Region& region = record.get();
 
@@ -1051,25 +1085,36 @@ namespace CSMWorld
         {
             switch (subRowIndex)
             {
-                case 0: return region.mData.mClear;
-                case 1: return region.mData.mCloudy;
-                case 2: return region.mData.mFoggy;
-                case 3: return region.mData.mOvercast;
-                case 4: return region.mData.mRain;
-                case 5: return region.mData.mThunder;
-                case 6: return region.mData.mAsh;
-                case 7: return region.mData.mBlight;
-                case 8: return region.mData.mSnow;
-                case 9: return region.mData.mBlizzard;
-                default: break;
+                case 0:
+                    return region.mData.mClear;
+                case 1:
+                    return region.mData.mCloudy;
+                case 2:
+                    return region.mData.mFoggy;
+                case 3:
+                    return region.mData.mOvercast;
+                case 4:
+                    return region.mData.mRain;
+                case 5:
+                    return region.mData.mThunder;
+                case 6:
+                    return region.mData.mAsh;
+                case 7:
+                    return region.mData.mBlight;
+                case 8:
+                    return region.mData.mSnow;
+                case 9:
+                    return region.mData.mBlizzard;
+                default:
+                    break;
             }
         }
 
         throw std::runtime_error("index out of range");
     }
 
-    void RegionWeatherAdapter::setData(Record<ESM::Region>& record, const QVariant& value, int subRowIndex,
-        int subColIndex) const
+    void RegionWeatherAdapter::setData(
+        Record<ESM::Region>& record, const QVariant& value, int subRowIndex, int subColIndex) const
     {
         ESM::Region region = record.get();
         unsigned char chance = static_cast<unsigned char>(value.toInt());
@@ -1078,20 +1123,41 @@ namespace CSMWorld
         {
             switch (subRowIndex)
             {
-                case 0: region.mData.mClear = chance; break;
-                case 1: region.mData.mCloudy = chance; break;
-                case 2: region.mData.mFoggy = chance; break;
-                case 3: region.mData.mOvercast = chance; break;
-                case 4: region.mData.mRain = chance; break;
-                case 5: region.mData.mThunder = chance; break;
-                case 6: region.mData.mAsh = chance; break;
-                case 7: region.mData.mBlight = chance; break;
-                case 8: region.mData.mSnow = chance; break;
-                case 9: region.mData.mBlizzard = chance; break;
-                default: throw std::runtime_error("index out of range");
+                case 0:
+                    region.mData.mClear = chance;
+                    break;
+                case 1:
+                    region.mData.mCloudy = chance;
+                    break;
+                case 2:
+                    region.mData.mFoggy = chance;
+                    break;
+                case 3:
+                    region.mData.mOvercast = chance;
+                    break;
+                case 4:
+                    region.mData.mRain = chance;
+                    break;
+                case 5:
+                    region.mData.mThunder = chance;
+                    break;
+                case 6:
+                    region.mData.mAsh = chance;
+                    break;
+                case 7:
+                    region.mData.mBlight = chance;
+                    break;
+                case 8:
+                    region.mData.mSnow = chance;
+                    break;
+                case 9:
+                    region.mData.mBlizzard = chance;
+                    break;
+                default:
+                    throw std::runtime_error("index out of range");
             }
 
-            record.setModified (region);
+            record.setModified(region);
         }
     }
 
@@ -1105,73 +1171,93 @@ namespace CSMWorld
         return 10;
     }
 
-    FactionRanksAdapter::FactionRanksAdapter () {}
+    FactionRanksAdapter::FactionRanksAdapter() {}
 
     void FactionRanksAdapter::addRow(Record<ESM::Faction>& record, int position) const
     {
-        throw std::logic_error ("cannot add a row to a fixed table");
+        throw std::logic_error("cannot add a row to a fixed table");
     }
 
     void FactionRanksAdapter::removeRow(Record<ESM::Faction>& record, int rowToRemove) const
     {
-        throw std::logic_error ("cannot remove a row from a fixed table");
+        throw std::logic_error("cannot remove a row from a fixed table");
     }
 
-    void FactionRanksAdapter::setTable(Record<ESM::Faction>& record,
-            const NestedTableWrapperBase& nestedTable) const
+    void FactionRanksAdapter::setTable(Record<ESM::Faction>& record, const NestedTableWrapperBase& nestedTable) const
     {
-        throw std::logic_error ("table operation not supported");
+        throw std::logic_error("table operation not supported");
     }
 
     NestedTableWrapperBase* FactionRanksAdapter::table(const Record<ESM::Faction>& record) const
     {
-        throw std::logic_error ("table operation not supported");
+        throw std::logic_error("table operation not supported");
     }
 
-    QVariant FactionRanksAdapter::getData(const Record<ESM::Faction>& record,
-            int subRowIndex, int subColIndex) const
+    QVariant FactionRanksAdapter::getData(const Record<ESM::Faction>& record, int subRowIndex, int subColIndex) const
     {
         ESM::Faction faction = record.get();
 
-        if (subRowIndex < 0 || subRowIndex >= static_cast<int>(sizeof(faction.mData.mRankData)/sizeof(faction.mData.mRankData[0])))
-            throw std::runtime_error ("index out of range");
+        if (subRowIndex < 0
+            || subRowIndex >= static_cast<int>(sizeof(faction.mData.mRankData) / sizeof(faction.mData.mRankData[0])))
+            throw std::runtime_error("index out of range");
 
         auto& rankData = faction.mData.mRankData[subRowIndex];
 
         switch (subColIndex)
         {
-            case 0: return QString(faction.mRanks[subRowIndex].c_str());
-            case 1: return rankData.mAttribute1;
-            case 2: return rankData.mAttribute2;
-            case 3: return rankData.mPrimarySkill;
-            case 4: return rankData.mFavouredSkill;
-            case 5: return rankData.mFactReaction;
-            default: throw std::runtime_error("Rank subcolumn index out of range");
+            case 0:
+                return QString(faction.mRanks[subRowIndex].c_str());
+            case 1:
+                return rankData.mAttribute1;
+            case 2:
+                return rankData.mAttribute2;
+            case 3:
+                return rankData.mPrimarySkill;
+            case 4:
+                return rankData.mFavouredSkill;
+            case 5:
+                return rankData.mFactReaction;
+            default:
+                throw std::runtime_error("Rank subcolumn index out of range");
         }
     }
 
-    void FactionRanksAdapter::setData(Record<ESM::Faction>& record,
-            const QVariant& value, int subRowIndex, int subColIndex) const
+    void FactionRanksAdapter::setData(
+        Record<ESM::Faction>& record, const QVariant& value, int subRowIndex, int subColIndex) const
     {
         ESM::Faction faction = record.get();
 
-        if (subRowIndex < 0 || subRowIndex >= static_cast<int>(sizeof(faction.mData.mRankData)/sizeof(faction.mData.mRankData[0])))
-            throw std::runtime_error ("index out of range");
+        if (subRowIndex < 0
+            || subRowIndex >= static_cast<int>(sizeof(faction.mData.mRankData) / sizeof(faction.mData.mRankData[0])))
+            throw std::runtime_error("index out of range");
 
         auto& rankData = faction.mData.mRankData[subRowIndex];
 
         switch (subColIndex)
         {
-            case 0: faction.mRanks[subRowIndex] = value.toString().toUtf8().constData(); break;
-            case 1: rankData.mAttribute1 = value.toInt(); break;
-            case 2: rankData.mAttribute2 = value.toInt(); break;
-            case 3: rankData.mPrimarySkill = value.toInt(); break;
-            case 4: rankData.mFavouredSkill = value.toInt(); break;
-            case 5: rankData.mFactReaction = value.toInt(); break;
-            default: throw std::runtime_error("Rank index out of range");
+            case 0:
+                faction.mRanks[subRowIndex] = value.toString().toUtf8().constData();
+                break;
+            case 1:
+                rankData.mAttribute1 = value.toInt();
+                break;
+            case 2:
+                rankData.mAttribute2 = value.toInt();
+                break;
+            case 3:
+                rankData.mPrimarySkill = value.toInt();
+                break;
+            case 4:
+                rankData.mFavouredSkill = value.toInt();
+                break;
+            case 5:
+                rankData.mFactReaction = value.toInt();
+                break;
+            default:
+                throw std::runtime_error("Rank index out of range");
         }
 
-        record.setModified (faction);
+        record.setModified(faction);
     }
 
     int FactionRanksAdapter::getColumnsCount(const Record<ESM::Faction>& record) const
diff --git a/apps/opencs/model/world/nestedcoladapterimp.hpp b/apps/opencs/model/world/nestedcoladapterimp.hpp
index b1785cc919..a5d2d34eb4 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.hpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.hpp
@@ -3,16 +3,16 @@
 
 #include <QVariant>
 
-#include <components/esm3/loadpgrd.hpp>
+#include <components/esm/attr.hpp> // for converting attributes
 #include <components/esm3/effectlist.hpp>
 #include <components/esm3/loadmgef.hpp> // for converting magic effect id to string & back
-#include <components/esm3/loadskil.hpp> // for converting skill names
-#include <components/esm/attr.hpp>     // for converting attributes
+#include <components/esm3/loadpgrd.hpp>
 #include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadskil.hpp> // for converting skill names
 
+#include "cell.hpp"
 #include "nestedcolumnadapter.hpp"
 #include "nestedtablewrapper.hpp"
-#include "cell.hpp"
 
 namespace ESM
 {
@@ -28,22 +28,19 @@ namespace CSMWorld
     class PathgridPointListAdapter : public NestedColumnAdapter<Pathgrid>
     {
     public:
-        PathgridPointListAdapter ();
+        PathgridPointListAdapter();
 
         void addRow(Record<Pathgrid>& record, int position) const override;
 
         void removeRow(Record<Pathgrid>& record, int rowToRemove) const override;
 
-        void setTable(Record<Pathgrid>& record,
-                const NestedTableWrapperBase& nestedTable) const override;
+        void setTable(Record<Pathgrid>& record, const NestedTableWrapperBase& nestedTable) const override;
 
         NestedTableWrapperBase* table(const Record<Pathgrid>& record) const override;
 
-        QVariant getData(const Record<Pathgrid>& record,
-                int subRowIndex, int subColIndex) const override;
+        QVariant getData(const Record<Pathgrid>& record, int subRowIndex, int subColIndex) const override;
 
-        void setData(Record<Pathgrid>& record,
-                const QVariant& value, int subRowIndex, int subColIndex) const override;
+        void setData(Record<Pathgrid>& record, const QVariant& value, int subRowIndex, int subColIndex) const override;
 
         int getColumnsCount(const Record<Pathgrid>& record) const override;
 
@@ -53,22 +50,19 @@ namespace CSMWorld
     class PathgridEdgeListAdapter : public NestedColumnAdapter<Pathgrid>
     {
     public:
-        PathgridEdgeListAdapter ();
+        PathgridEdgeListAdapter();
 
         void addRow(Record<Pathgrid>& record, int position) const override;
 
         void removeRow(Record<Pathgrid>& record, int rowToRemove) const override;
 
-        void setTable(Record<Pathgrid>& record,
-                const NestedTableWrapperBase& nestedTable) const override;
+        void setTable(Record<Pathgrid>& record, const NestedTableWrapperBase& nestedTable) const override;
 
         NestedTableWrapperBase* table(const Record<Pathgrid>& record) const override;
 
-        QVariant getData(const Record<Pathgrid>& record,
-                int subRowIndex, int subColIndex) const override;
+        QVariant getData(const Record<Pathgrid>& record, int subRowIndex, int subColIndex) const override;
 
-        void setData(Record<Pathgrid>& record,
-                const QVariant& value, int subRowIndex, int subColIndex) const override;
+        void setData(Record<Pathgrid>& record, const QVariant& value, int subRowIndex, int subColIndex) const override;
 
         int getColumnsCount(const Record<Pathgrid>& record) const override;
 
@@ -78,22 +72,20 @@ namespace CSMWorld
     class FactionReactionsAdapter : public NestedColumnAdapter<ESM::Faction>
     {
     public:
-        FactionReactionsAdapter ();
+        FactionReactionsAdapter();
 
         void addRow(Record<ESM::Faction>& record, int position) const override;
 
         void removeRow(Record<ESM::Faction>& record, int rowToRemove) const override;
 
-        void setTable(Record<ESM::Faction>& record,
-                const NestedTableWrapperBase& nestedTable) const override;
+        void setTable(Record<ESM::Faction>& record, const NestedTableWrapperBase& nestedTable) const override;
 
         NestedTableWrapperBase* table(const Record<ESM::Faction>& record) const override;
 
-        QVariant getData(const Record<ESM::Faction>& record,
-                int subRowIndex, int subColIndex) const override;
+        QVariant getData(const Record<ESM::Faction>& record, int subRowIndex, int subColIndex) const override;
 
-        void setData(Record<ESM::Faction>& record,
-                const QVariant& value, int subRowIndex, int subColIndex) const override;
+        void setData(
+            Record<ESM::Faction>& record, const QVariant& value, int subRowIndex, int subColIndex) const override;
 
         int getColumnsCount(const Record<ESM::Faction>& record) const override;
 
@@ -103,22 +95,20 @@ namespace CSMWorld
     class FactionRanksAdapter : public NestedColumnAdapter<ESM::Faction>
     {
     public:
-        FactionRanksAdapter ();
+        FactionRanksAdapter();
 
         void addRow(Record<ESM::Faction>& record, int position) const override;
 
         void removeRow(Record<ESM::Faction>& record, int rowToRemove) const override;
 
-        void setTable(Record<ESM::Faction>& record,
-                const NestedTableWrapperBase& nestedTable) const override;
+        void setTable(Record<ESM::Faction>& record, const NestedTableWrapperBase& nestedTable) const override;
 
         NestedTableWrapperBase* table(const Record<ESM::Faction>& record) const override;
 
-        QVariant getData(const Record<ESM::Faction>& record,
-                int subRowIndex, int subColIndex) const override;
+        QVariant getData(const Record<ESM::Faction>& record, int subRowIndex, int subColIndex) const override;
 
-        void setData(Record<ESM::Faction>& record,
-                const QVariant& value, int subRowIndex, int subColIndex) const override;
+        void setData(
+            Record<ESM::Faction>& record, const QVariant& value, int subRowIndex, int subColIndex) const override;
 
         int getColumnsCount(const Record<ESM::Faction>& record) const override;
 
@@ -128,33 +118,31 @@ namespace CSMWorld
     class RegionSoundListAdapter : public NestedColumnAdapter<ESM::Region>
     {
     public:
-        RegionSoundListAdapter ();
+        RegionSoundListAdapter();
 
         void addRow(Record<ESM::Region>& record, int position) const override;
 
         void removeRow(Record<ESM::Region>& record, int rowToRemove) const override;
 
-        void setTable(Record<ESM::Region>& record,
-                const NestedTableWrapperBase& nestedTable) const override;
+        void setTable(Record<ESM::Region>& record, const NestedTableWrapperBase& nestedTable) const override;
 
         NestedTableWrapperBase* table(const Record<ESM::Region>& record) const override;
 
-        QVariant getData(const Record<ESM::Region>& record,
-                int subRowIndex, int subColIndex) const override;
+        QVariant getData(const Record<ESM::Region>& record, int subRowIndex, int subColIndex) const override;
 
-        void setData(Record<ESM::Region>& record,
-                const QVariant& value, int subRowIndex, int subColIndex) const override;
+        void setData(
+            Record<ESM::Region>& record, const QVariant& value, int subRowIndex, int subColIndex) const override;
 
         int getColumnsCount(const Record<ESM::Region>& record) const override;
 
         int getRowsCount(const Record<ESM::Region>& record) const override;
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     class SpellListAdapter : public NestedColumnAdapter<ESXRecordT>
     {
     public:
-        SpellListAdapter () {}
+        SpellListAdapter() {}
 
         void addRow(Record<ESXRecordT>& record, int position) const override
         {
@@ -165,9 +153,9 @@ namespace CSMWorld
             // blank row
             std::string spell;
 
-            spells.insert(spells.begin()+position, spell);
+            spells.insert(spells.begin() + position, spell);
 
-            record.setModified (raceOrBthSgn);
+            record.setModified(raceOrBthSgn);
         }
 
         void removeRow(Record<ESXRecordT>& record, int rowToRemove) const override
@@ -176,28 +164,28 @@ namespace CSMWorld
 
             std::vector<std::string>& spells = raceOrBthSgn.mPowers.mList;
 
-            if (rowToRemove < 0 || rowToRemove >= static_cast<int> (spells.size()))
-                throw std::runtime_error ("index out of range");
+            if (rowToRemove < 0 || rowToRemove >= static_cast<int>(spells.size()))
+                throw std::runtime_error("index out of range");
 
-            spells.erase(spells.begin()+rowToRemove);
+            spells.erase(spells.begin() + rowToRemove);
 
-            record.setModified (raceOrBthSgn);
+            record.setModified(raceOrBthSgn);
         }
 
         void setTable(Record<ESXRecordT>& record, const NestedTableWrapperBase& nestedTable) const override
         {
             ESXRecordT raceOrBthSgn = record.get();
 
-            raceOrBthSgn.mPowers.mList =
-                static_cast<const NestedTableWrapper<std::vector<std::string> >&>(nestedTable).mNestedTable;
+            raceOrBthSgn.mPowers.mList
+                = static_cast<const NestedTableWrapper<std::vector<std::string>>&>(nestedTable).mNestedTable;
 
-            record.setModified (raceOrBthSgn);
+            record.setModified(raceOrBthSgn);
         }
 
         NestedTableWrapperBase* table(const Record<ESXRecordT>& record) const override
         {
             // deleted by dtor of NestedTableStoring
-            return new NestedTableWrapper<std::vector<std::string> >(record.get().mPowers.mList);
+            return new NestedTableWrapper<std::vector<std::string>>(record.get().mPowers.mList);
         }
 
         QVariant getData(const Record<ESXRecordT>& record, int subRowIndex, int subColIndex) const override
@@ -206,43 +194,44 @@ namespace CSMWorld
 
             std::vector<std::string>& spells = raceOrBthSgn.mPowers.mList;
 
-            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (spells.size()))
-                throw std::runtime_error ("index out of range");
+            if (subRowIndex < 0 || subRowIndex >= static_cast<int>(spells.size()))
+                throw std::runtime_error("index out of range");
 
             std::string spell = spells[subRowIndex];
             switch (subColIndex)
             {
-                case 0: return QString(spell.c_str());
-                default: throw std::runtime_error("Spells subcolumn index out of range");
+                case 0:
+                    return QString(spell.c_str());
+                default:
+                    throw std::runtime_error("Spells subcolumn index out of range");
             }
         }
 
-        void setData(Record<ESXRecordT>& record, const QVariant& value,
-                                    int subRowIndex, int subColIndex) const override
+        void setData(Record<ESXRecordT>& record, const QVariant& value, int subRowIndex, int subColIndex) const override
         {
             ESXRecordT raceOrBthSgn = record.get();
 
             std::vector<std::string>& spells = raceOrBthSgn.mPowers.mList;
 
-            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (spells.size()))
-                throw std::runtime_error ("index out of range");
+            if (subRowIndex < 0 || subRowIndex >= static_cast<int>(spells.size()))
+                throw std::runtime_error("index out of range");
 
             std::string spell = spells[subRowIndex];
             switch (subColIndex)
             {
-                case 0: spell = value.toString().toUtf8().constData(); break;
-                default: throw std::runtime_error("Spells subcolumn index out of range");
+                case 0:
+                    spell = value.toString().toUtf8().constData();
+                    break;
+                default:
+                    throw std::runtime_error("Spells subcolumn index out of range");
             }
 
             raceOrBthSgn.mPowers.mList[subRowIndex] = spell;
 
-            record.setModified (raceOrBthSgn);
+            record.setModified(raceOrBthSgn);
         }
 
-        int getColumnsCount(const Record<ESXRecordT>& record) const override
-        {
-            return 1;
-        }
+        int getColumnsCount(const Record<ESXRecordT>& record) const override { return 1; }
 
         int getRowsCount(const Record<ESXRecordT>& record) const override
         {
@@ -250,11 +239,11 @@ namespace CSMWorld
         }
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     class EffectsListAdapter : public NestedColumnAdapter<ESXRecordT>
     {
     public:
-        EffectsListAdapter () {}
+        EffectsListAdapter() {}
 
         void addRow(Record<ESXRecordT>& record, int position) const override
         {
@@ -273,9 +262,9 @@ namespace CSMWorld
             effect.mMagnMin = 0;
             effect.mMagnMax = 0;
 
-            effectsList.insert(effectsList.begin()+position, effect);
+            effectsList.insert(effectsList.begin() + position, effect);
 
-            record.setModified (magic);
+            record.setModified(magic);
         }
 
         void removeRow(Record<ESXRecordT>& record, int rowToRemove) const override
@@ -284,28 +273,28 @@ namespace CSMWorld
 
             std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
 
-            if (rowToRemove < 0 || rowToRemove >= static_cast<int> (effectsList.size()))
-                throw std::runtime_error ("index out of range");
+            if (rowToRemove < 0 || rowToRemove >= static_cast<int>(effectsList.size()))
+                throw std::runtime_error("index out of range");
 
-            effectsList.erase(effectsList.begin()+rowToRemove);
+            effectsList.erase(effectsList.begin() + rowToRemove);
 
-            record.setModified (magic);
+            record.setModified(magic);
         }
 
         void setTable(Record<ESXRecordT>& record, const NestedTableWrapperBase& nestedTable) const override
         {
             ESXRecordT magic = record.get();
 
-            magic.mEffects.mList =
-                static_cast<const NestedTableWrapper<std::vector<ESM::ENAMstruct> >&>(nestedTable).mNestedTable;
+            magic.mEffects.mList
+                = static_cast<const NestedTableWrapper<std::vector<ESM::ENAMstruct>>&>(nestedTable).mNestedTable;
 
-            record.setModified (magic);
+            record.setModified(magic);
         }
 
         NestedTableWrapperBase* table(const Record<ESXRecordT>& record) const override
         {
             // deleted by dtor of NestedTableStoring
-            return new NestedTableWrapper<std::vector<ESM::ENAMstruct> >(record.get().mEffects.mList);
+            return new NestedTableWrapper<std::vector<ESM::ENAMstruct>>(record.get().mEffects.mList);
         }
 
         QVariant getData(const Record<ESXRecordT>& record, int subRowIndex, int subColIndex) const override
@@ -314,15 +303,15 @@ namespace CSMWorld
 
             std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
 
-            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (effectsList.size()))
-                throw std::runtime_error ("index out of range");
+            if (subRowIndex < 0 || subRowIndex >= static_cast<int>(effectsList.size()))
+                throw std::runtime_error("index out of range");
 
             ESM::ENAMstruct effect = effectsList[subRowIndex];
             switch (subColIndex)
             {
                 case 0:
                 {
-                    if (effect.mEffectID >=0 && effect.mEffectID < ESM::MagicEffect::Length)
+                    if (effect.mEffectID >= 0 && effect.mEffectID < ESM::MagicEffect::Length)
                         return effect.mEffectID;
                     else
                         throw std::runtime_error("Magic effects ID unexpected value");
@@ -336,7 +325,7 @@ namespace CSMWorld
                         case ESM::MagicEffect::RestoreSkill:
                         case ESM::MagicEffect::FortifySkill:
                         case ESM::MagicEffect::AbsorbSkill:
-                             return effect.mSkill;
+                            return effect.mSkill;
                         default:
                             return QVariant();
                     }
@@ -350,35 +339,39 @@ namespace CSMWorld
                         case ESM::MagicEffect::RestoreAttribute:
                         case ESM::MagicEffect::FortifyAttribute:
                         case ESM::MagicEffect::AbsorbAttribute:
-                             return effect.mAttribute;
+                            return effect.mAttribute;
                         default:
                             return QVariant();
                     }
                 }
                 case 3:
                 {
-                    if (effect.mRange >=0 && effect.mRange <=2)
+                    if (effect.mRange >= 0 && effect.mRange <= 2)
                         return effect.mRange;
                     else
                         throw std::runtime_error("Magic effects range unexpected value");
                 }
-                case 4: return effect.mArea;
-                case 5: return effect.mDuration;
-                case 6: return effect.mMagnMin;
-                case 7: return effect.mMagnMax;
-                default: throw std::runtime_error("Magic Effects subcolumn index out of range");
+                case 4:
+                    return effect.mArea;
+                case 5:
+                    return effect.mDuration;
+                case 6:
+                    return effect.mMagnMin;
+                case 7:
+                    return effect.mMagnMax;
+                default:
+                    throw std::runtime_error("Magic Effects subcolumn index out of range");
             }
         }
 
-        void setData(Record<ESXRecordT>& record, const QVariant& value,
-                                    int subRowIndex, int subColIndex) const override
+        void setData(Record<ESXRecordT>& record, const QVariant& value, int subRowIndex, int subColIndex) const override
         {
             ESXRecordT magic = record.get();
 
             std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
 
-            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (effectsList.size()))
-                throw std::runtime_error ("index out of range");
+            if (subRowIndex < 0 || subRowIndex >= static_cast<int>(effectsList.size()))
+                throw std::runtime_error("index out of range");
 
             ESM::ENAMstruct effect = effectsList[subRowIndex];
             switch (subColIndex)
@@ -403,22 +396,28 @@ namespace CSMWorld
                     effect.mRange = value.toInt();
                     break;
                 }
-                case 4: effect.mArea = value.toInt(); break;
-                case 5: effect.mDuration = value.toInt(); break;
-                case 6: effect.mMagnMin = value.toInt(); break;
-                case 7: effect.mMagnMax = value.toInt(); break;
-                default: throw std::runtime_error("Magic Effects subcolumn index out of range");
+                case 4:
+                    effect.mArea = value.toInt();
+                    break;
+                case 5:
+                    effect.mDuration = value.toInt();
+                    break;
+                case 6:
+                    effect.mMagnMin = value.toInt();
+                    break;
+                case 7:
+                    effect.mMagnMax = value.toInt();
+                    break;
+                default:
+                    throw std::runtime_error("Magic Effects subcolumn index out of range");
             }
 
             magic.mEffects.mList[subRowIndex] = effect;
 
-            record.setModified (magic);
+            record.setModified(magic);
         }
 
-        int getColumnsCount(const Record<ESXRecordT>& record) const override
-        {
-            return 8;
-        }
+        int getColumnsCount(const Record<ESXRecordT>& record) const override { return 8; }
 
         int getRowsCount(const Record<ESXRecordT>& record) const override
         {
@@ -429,22 +428,19 @@ namespace CSMWorld
     class InfoListAdapter : public NestedColumnAdapter<Info>
     {
     public:
-        InfoListAdapter ();
+        InfoListAdapter();
 
         void addRow(Record<Info>& record, int position) const override;
 
         void removeRow(Record<Info>& record, int rowToRemove) const override;
 
-        void setTable(Record<Info>& record,
-                const NestedTableWrapperBase& nestedTable) const override;
+        void setTable(Record<Info>& record, const NestedTableWrapperBase& nestedTable) const override;
 
         NestedTableWrapperBase* table(const Record<Info>& record) const override;
 
-        QVariant getData(const Record<Info>& record,
-                int subRowIndex, int subColIndex) const override;
+        QVariant getData(const Record<Info>& record, int subRowIndex, int subColIndex) const override;
 
-        void setData(Record<Info>& record,
-                const QVariant& value, int subRowIndex, int subColIndex) const override;
+        void setData(Record<Info>& record, const QVariant& value, int subRowIndex, int subColIndex) const override;
 
         int getColumnsCount(const Record<Info>& record) const override;
 
@@ -454,22 +450,19 @@ namespace CSMWorld
     class InfoConditionAdapter : public NestedColumnAdapter<Info>
     {
     public:
-        InfoConditionAdapter ();
+        InfoConditionAdapter();
 
         void addRow(Record<Info>& record, int position) const override;
 
         void removeRow(Record<Info>& record, int rowToRemove) const override;
 
-        void setTable(Record<Info>& record,
-                const NestedTableWrapperBase& nestedTable) const override;
+        void setTable(Record<Info>& record, const NestedTableWrapperBase& nestedTable) const override;
 
         NestedTableWrapperBase* table(const Record<Info>& record) const override;
 
-        QVariant getData(const Record<Info>& record,
-                int subRowIndex, int subColIndex) const override;
+        QVariant getData(const Record<Info>& record, int subRowIndex, int subColIndex) const override;
 
-        void setData(Record<Info>& record,
-                const QVariant& value, int subRowIndex, int subColIndex) const override;
+        void setData(Record<Info>& record, const QVariant& value, int subRowIndex, int subColIndex) const override;
 
         int getColumnsCount(const Record<Info>& record) const override;
 
@@ -479,22 +472,19 @@ namespace CSMWorld
     class RaceAttributeAdapter : public NestedColumnAdapter<ESM::Race>
     {
     public:
-        RaceAttributeAdapter ();
+        RaceAttributeAdapter();
 
         void addRow(Record<ESM::Race>& record, int position) const override;
 
         void removeRow(Record<ESM::Race>& record, int rowToRemove) const override;
 
-        void setTable(Record<ESM::Race>& record,
-                const NestedTableWrapperBase& nestedTable) const override;
+        void setTable(Record<ESM::Race>& record, const NestedTableWrapperBase& nestedTable) const override;
 
         NestedTableWrapperBase* table(const Record<ESM::Race>& record) const override;
 
-        QVariant getData(const Record<ESM::Race>& record,
-                int subRowIndex, int subColIndex) const override;
+        QVariant getData(const Record<ESM::Race>& record, int subRowIndex, int subColIndex) const override;
 
-        void setData(Record<ESM::Race>& record,
-                const QVariant& value, int subRowIndex, int subColIndex) const override;
+        void setData(Record<ESM::Race>& record, const QVariant& value, int subRowIndex, int subColIndex) const override;
 
         int getColumnsCount(const Record<ESM::Race>& record) const override;
 
@@ -504,22 +494,19 @@ namespace CSMWorld
     class RaceSkillsBonusAdapter : public NestedColumnAdapter<ESM::Race>
     {
     public:
-        RaceSkillsBonusAdapter ();
+        RaceSkillsBonusAdapter();
 
         void addRow(Record<ESM::Race>& record, int position) const override;
 
         void removeRow(Record<ESM::Race>& record, int rowToRemove) const override;
 
-        void setTable(Record<ESM::Race>& record,
-                const NestedTableWrapperBase& nestedTable) const override;
+        void setTable(Record<ESM::Race>& record, const NestedTableWrapperBase& nestedTable) const override;
 
         NestedTableWrapperBase* table(const Record<ESM::Race>& record) const override;
 
-        QVariant getData(const Record<ESM::Race>& record,
-                int subRowIndex, int subColIndex) const override;
+        QVariant getData(const Record<ESM::Race>& record, int subRowIndex, int subColIndex) const override;
 
-        void setData(Record<ESM::Race>& record,
-                const QVariant& value, int subRowIndex, int subColIndex) const override;
+        void setData(Record<ESM::Race>& record, const QVariant& value, int subRowIndex, int subColIndex) const override;
 
         int getColumnsCount(const Record<ESM::Race>& record) const override;
 
@@ -529,22 +516,20 @@ namespace CSMWorld
     class CellListAdapter : public NestedColumnAdapter<CSMWorld::Cell>
     {
     public:
-        CellListAdapter ();
+        CellListAdapter();
 
         void addRow(Record<CSMWorld::Cell>& record, int position) const override;
 
         void removeRow(Record<CSMWorld::Cell>& record, int rowToRemove) const override;
 
-        void setTable(Record<CSMWorld::Cell>& record,
-                const NestedTableWrapperBase& nestedTable) const override;
+        void setTable(Record<CSMWorld::Cell>& record, const NestedTableWrapperBase& nestedTable) const override;
 
         NestedTableWrapperBase* table(const Record<CSMWorld::Cell>& record) const override;
 
-        QVariant getData(const Record<CSMWorld::Cell>& record,
-                int subRowIndex, int subColIndex) const override;
+        QVariant getData(const Record<CSMWorld::Cell>& record, int subRowIndex, int subColIndex) const override;
 
-        void setData(Record<CSMWorld::Cell>& record,
-                const QVariant& value, int subRowIndex, int subColIndex) const override;
+        void setData(
+            Record<CSMWorld::Cell>& record, const QVariant& value, int subRowIndex, int subColIndex) const override;
 
         int getColumnsCount(const Record<CSMWorld::Cell>& record) const override;
 
@@ -554,22 +539,20 @@ namespace CSMWorld
     class RegionWeatherAdapter : public NestedColumnAdapter<ESM::Region>
     {
     public:
-        RegionWeatherAdapter ();
+        RegionWeatherAdapter();
 
         void addRow(Record<ESM::Region>& record, int position) const override;
 
         void removeRow(Record<ESM::Region>& record, int rowToRemove) const override;
 
-        void setTable(Record<ESM::Region>& record,
-                const NestedTableWrapperBase& nestedTable) const override;
+        void setTable(Record<ESM::Region>& record, const NestedTableWrapperBase& nestedTable) const override;
 
         NestedTableWrapperBase* table(const Record<ESM::Region>& record) const override;
 
-        QVariant getData(const Record<ESM::Region>& record,
-                int subRowIndex, int subColIndex) const override;
+        QVariant getData(const Record<ESM::Region>& record, int subRowIndex, int subColIndex) const override;
 
-        void setData(Record<ESM::Region>& record,
-                const QVariant& value, int subRowIndex, int subColIndex) const override;
+        void setData(
+            Record<ESM::Region>& record, const QVariant& value, int subRowIndex, int subColIndex) const override;
 
         int getColumnsCount(const Record<ESM::Region>& record) const override;
 
diff --git a/apps/opencs/model/world/nestedcollection.cpp b/apps/opencs/model/world/nestedcollection.cpp
index 6d4a2579c7..c114dacaa3 100644
--- a/apps/opencs/model/world/nestedcollection.cpp
+++ b/apps/opencs/model/world/nestedcollection.cpp
@@ -2,11 +2,9 @@
 
 #include "columnbase.hpp"
 
-CSMWorld::NestedCollection::NestedCollection()
-{}
+CSMWorld::NestedCollection::NestedCollection() {}
 
-CSMWorld::NestedCollection::~NestedCollection()
-{}
+CSMWorld::NestedCollection::~NestedCollection() {}
 
 int CSMWorld::NestedCollection::getNestedRowsCount(int row, int column) const
 {
@@ -21,7 +19,7 @@ int CSMWorld::NestedCollection::getNestedColumnsCount(int row, int column) const
 int CSMWorld::NestedCollection::searchNestedColumnIndex(int parentColumn, Columns::ColumnId id)
 {
     // Assumed that the parentColumn is always a valid index
-    const NestableColumn *parent = getNestableColumn(parentColumn);
+    const NestableColumn* parent = getNestableColumn(parentColumn);
     int nestedColumnCount = getNestedColumnsCount(0, parentColumn);
     for (int i = 0; i < nestedColumnCount; ++i)
     {
diff --git a/apps/opencs/model/world/nestedcollection.hpp b/apps/opencs/model/world/nestedcollection.hpp
index 4548cfb2b9..3e90bde9cc 100644
--- a/apps/opencs/model/world/nestedcollection.hpp
+++ b/apps/opencs/model/world/nestedcollection.hpp
@@ -14,7 +14,6 @@ namespace CSMWorld
     {
 
     public:
-
         NestedCollection();
         virtual ~NestedCollection();
 
@@ -34,7 +33,7 @@ namespace CSMWorld
 
         virtual int getNestedColumnsCount(int row, int column) const;
 
-        virtual NestableColumn *getNestableColumn(int column) = 0;
+        virtual NestableColumn* getNestableColumn(int column) = 0;
 
         virtual int searchNestedColumnIndex(int parentColumn, Columns::ColumnId id);
         ///< \return the column index or -1 if the requested column wasn't found.
diff --git a/apps/opencs/model/world/nestedcolumnadapter.hpp b/apps/opencs/model/world/nestedcolumnadapter.hpp
index 462b5a5ab1..198cc9b18e 100644
--- a/apps/opencs/model/world/nestedcolumnadapter.hpp
+++ b/apps/opencs/model/world/nestedcolumnadapter.hpp
@@ -10,11 +10,10 @@ namespace CSMWorld
     template <typename ESXRecordT>
     struct Record;
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     class NestedColumnAdapter
     {
     public:
-
         NestedColumnAdapter() {}
 
         virtual ~NestedColumnAdapter() {}
@@ -29,7 +28,8 @@ namespace CSMWorld
 
         virtual QVariant getData(const Record<ESXRecordT>& record, int subRowIndex, int subColIndex) const = 0;
 
-        virtual void setData(Record<ESXRecordT>& record, const QVariant& value, int subRowIndex, int subColIndex) const = 0;
+        virtual void setData(
+            Record<ESXRecordT>& record, const QVariant& value, int subRowIndex, int subColIndex) const = 0;
 
         virtual int getColumnsCount(const Record<ESXRecordT>& record) const = 0;
 
diff --git a/apps/opencs/model/world/nestedidcollection.hpp b/apps/opencs/model/world/nestedidcollection.hpp
index 76402821f5..0f334a3015 100644
--- a/apps/opencs/model/world/nestedidcollection.hpp
+++ b/apps/opencs/model/world/nestedidcollection.hpp
@@ -2,11 +2,11 @@
 #define CSM_WOLRD_NESTEDIDCOLLECTION_H
 
 #include <map>
-#include <stdexcept>
 #include <memory>
+#include <stdexcept>
 
-#include "nestedcollection.hpp"
 #include "collection.hpp"
+#include "nestedcollection.hpp"
 #include "nestedcolumnadapter.hpp"
 
 namespace ESM
@@ -29,74 +29,75 @@ namespace CSMWorld
     template <typename ESXRecordT>
     class NestedColumnAdapter;
 
-    template<typename ESXRecordT, typename IdAccessorT = IdAccessor<ESXRecordT> >
+    template <typename ESXRecordT, typename IdAccessorT = IdAccessor<ESXRecordT>>
     class NestedIdCollection : public IdCollection<ESXRecordT, IdAccessorT>, public NestedCollection
     {
-            std::map<const ColumnBase*, NestedColumnAdapter<ESXRecordT>* > mAdapters;
-
-            const NestedColumnAdapter<ESXRecordT>& getAdapter(const ColumnBase &column) const;
+        std::map<const ColumnBase*, NestedColumnAdapter<ESXRecordT>*> mAdapters;
 
-        public:
+        const NestedColumnAdapter<ESXRecordT>& getAdapter(const ColumnBase& column) const;
 
-            NestedIdCollection ();
-            ~NestedIdCollection() override;
+    public:
+        NestedIdCollection();
+        ~NestedIdCollection() override;
 
-            void addNestedRow(int row, int column, int position) override;
+        void addNestedRow(int row, int column, int position) override;
 
-            void removeNestedRows(int row, int column, int subRow) override;
+        void removeNestedRows(int row, int column, int subRow) override;
 
-            QVariant getNestedData(int row, int column, int subRow, int subColumn) const override;
+        QVariant getNestedData(int row, int column, int subRow, int subColumn) const override;
 
-            void setNestedData(int row, int column, const QVariant& data, int subRow, int subColumn) override;
+        void setNestedData(int row, int column, const QVariant& data, int subRow, int subColumn) override;
 
-            NestedTableWrapperBase* nestedTable(int row, int column) const override;
+        NestedTableWrapperBase* nestedTable(int row, int column) const override;
 
-            void setNestedTable(int row, int column, const NestedTableWrapperBase& nestedTable) override;
+        void setNestedTable(int row, int column, const NestedTableWrapperBase& nestedTable) override;
 
-            int getNestedRowsCount(int row, int column) const override;
+        int getNestedRowsCount(int row, int column) const override;
 
-            int getNestedColumnsCount(int row, int column) const override;
+        int getNestedColumnsCount(int row, int column) const override;
 
-            // this method is inherited from NestedCollection, not from Collection<ESXRecordT>
-            NestableColumn *getNestableColumn(int column) override;
+        // this method is inherited from NestedCollection, not from Collection<ESXRecordT>
+        NestableColumn* getNestableColumn(int column) override;
 
-            void addAdapter(std::pair<const ColumnBase*, NestedColumnAdapter<ESXRecordT>* > adapter);
+        void addAdapter(std::pair<const ColumnBase*, NestedColumnAdapter<ESXRecordT>*> adapter);
     };
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    NestedIdCollection<ESXRecordT, IdAccessorT>::NestedIdCollection ()
-    {}
+    template <typename ESXRecordT, typename IdAccessorT>
+    NestedIdCollection<ESXRecordT, IdAccessorT>::NestedIdCollection()
+    {
+    }
 
-    template<typename ESXRecordT, typename IdAccessorT>
+    template <typename ESXRecordT, typename IdAccessorT>
     NestedIdCollection<ESXRecordT, IdAccessorT>::~NestedIdCollection()
     {
-        for (typename std::map<const ColumnBase *, NestedColumnAdapter<ESXRecordT>* >::iterator
-                iter (mAdapters.begin()); iter!=mAdapters.end(); ++iter)
+        for (typename std::map<const ColumnBase*, NestedColumnAdapter<ESXRecordT>*>::iterator iter(mAdapters.begin());
+             iter != mAdapters.end(); ++iter)
         {
             delete (*iter).second;
         }
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    void NestedIdCollection<ESXRecordT, IdAccessorT>::addAdapter(std::pair<const ColumnBase*,
-            NestedColumnAdapter<ESXRecordT>* > adapter)
+    template <typename ESXRecordT, typename IdAccessorT>
+    void NestedIdCollection<ESXRecordT, IdAccessorT>::addAdapter(
+        std::pair<const ColumnBase*, NestedColumnAdapter<ESXRecordT>*> adapter)
     {
         mAdapters.insert(adapter);
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    const NestedColumnAdapter<ESXRecordT>& NestedIdCollection<ESXRecordT, IdAccessorT>::getAdapter(const ColumnBase &column) const
+    template <typename ESXRecordT, typename IdAccessorT>
+    const NestedColumnAdapter<ESXRecordT>& NestedIdCollection<ESXRecordT, IdAccessorT>::getAdapter(
+        const ColumnBase& column) const
     {
-        typename std::map<const ColumnBase *, NestedColumnAdapter<ESXRecordT>* >::const_iterator iter =
-            mAdapters.find (&column);
+        typename std::map<const ColumnBase*, NestedColumnAdapter<ESXRecordT>*>::const_iterator iter
+            = mAdapters.find(&column);
 
-        if (iter==mAdapters.end())
+        if (iter == mAdapters.end())
             throw std::logic_error("No such column in the nestedidadapter");
 
         return *iter->second;
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
+    template <typename ESXRecordT, typename IdAccessorT>
     void NestedIdCollection<ESXRecordT, IdAccessorT>::addNestedRow(int row, int column, int position)
     {
         auto record = std::make_unique<Record<ESXRecordT>>();
@@ -107,7 +108,7 @@ namespace CSMWorld
         Collection<ESXRecordT, IdAccessorT>::setRecord(row, std::move(record));
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
+    template <typename ESXRecordT, typename IdAccessorT>
     void NestedIdCollection<ESXRecordT, IdAccessorT>::removeNestedRows(int row, int column, int subRow)
     {
         auto record = std::make_unique<Record<ESXRecordT>>();
@@ -118,59 +119,57 @@ namespace CSMWorld
         Collection<ESXRecordT, IdAccessorT>::setRecord(row, std::move(record));
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    QVariant NestedIdCollection<ESXRecordT, IdAccessorT>::getNestedData (int row,
-            int column, int subRow, int subColumn) const
+    template <typename ESXRecordT, typename IdAccessorT>
+    QVariant NestedIdCollection<ESXRecordT, IdAccessorT>::getNestedData(
+        int row, int column, int subRow, int subColumn) const
     {
-        return getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column)).getData(
-                Collection<ESXRecordT, IdAccessorT>::getRecord(row), subRow, subColumn);
+        return getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column))
+            .getData(Collection<ESXRecordT, IdAccessorT>::getRecord(row), subRow, subColumn);
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    void NestedIdCollection<ESXRecordT, IdAccessorT>::setNestedData(int row,
-            int column, const QVariant& data, int subRow, int subColumn)
+    template <typename ESXRecordT, typename IdAccessorT>
+    void NestedIdCollection<ESXRecordT, IdAccessorT>::setNestedData(
+        int row, int column, const QVariant& data, int subRow, int subColumn)
     {
         auto record = std::make_unique<Record<ESXRecordT>>();
         record->assign(Collection<ESXRecordT, IdAccessorT>::getRecord(row));
 
-        getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column)).setData(
-                *record, data, subRow, subColumn);
+        getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column)).setData(*record, data, subRow, subColumn);
 
         Collection<ESXRecordT, IdAccessorT>::setRecord(row, std::move(record));
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    CSMWorld::NestedTableWrapperBase* NestedIdCollection<ESXRecordT, IdAccessorT>::nestedTable(int row,
-            int column) const
+    template <typename ESXRecordT, typename IdAccessorT>
+    CSMWorld::NestedTableWrapperBase* NestedIdCollection<ESXRecordT, IdAccessorT>::nestedTable(
+        int row, int column) const
     {
-        return getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column)).table(
-                Collection<ESXRecordT, IdAccessorT>::getRecord(row));
+        return getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column))
+            .table(Collection<ESXRecordT, IdAccessorT>::getRecord(row));
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    void NestedIdCollection<ESXRecordT, IdAccessorT>::setNestedTable(int row,
-            int column, const CSMWorld::NestedTableWrapperBase& nestedTable)
+    template <typename ESXRecordT, typename IdAccessorT>
+    void NestedIdCollection<ESXRecordT, IdAccessorT>::setNestedTable(
+        int row, int column, const CSMWorld::NestedTableWrapperBase& nestedTable)
     {
         auto record = std::make_unique<Record<ESXRecordT>>();
         record->assign(Collection<ESXRecordT, IdAccessorT>::getRecord(row));
 
-        getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column)).setTable(
-                *record, nestedTable);
+        getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column)).setTable(*record, nestedTable);
 
         Collection<ESXRecordT, IdAccessorT>::setRecord(row, std::move(record));
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
+    template <typename ESXRecordT, typename IdAccessorT>
     int NestedIdCollection<ESXRecordT, IdAccessorT>::getNestedRowsCount(int row, int column) const
     {
-        return getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column)).getRowsCount(
-                Collection<ESXRecordT, IdAccessorT>::getRecord(row));
+        return getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column))
+            .getRowsCount(Collection<ESXRecordT, IdAccessorT>::getRecord(row));
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
+    template <typename ESXRecordT, typename IdAccessorT>
     int NestedIdCollection<ESXRecordT, IdAccessorT>::getNestedColumnsCount(int row, int column) const
     {
-        const ColumnBase &nestedColumn = Collection<ESXRecordT, IdAccessorT>::getColumn(column);
+        const ColumnBase& nestedColumn = Collection<ESXRecordT, IdAccessorT>::getColumn(column);
         int numRecords = Collection<ESXRecordT, IdAccessorT>::getSize();
         if (row >= 0 && row < numRecords)
         {
@@ -185,8 +184,8 @@ namespace CSMWorld
         }
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    CSMWorld::NestableColumn *NestedIdCollection<ESXRecordT, IdAccessorT>::getNestableColumn(int column)
+    template <typename ESXRecordT, typename IdAccessorT>
+    CSMWorld::NestableColumn* NestedIdCollection<ESXRecordT, IdAccessorT>::getNestableColumn(int column)
     {
         return Collection<ESXRecordT, IdAccessorT>::getNestableColumn(column);
     }
diff --git a/apps/opencs/model/world/nestedinfocollection.cpp b/apps/opencs/model/world/nestedinfocollection.cpp
index e2e90c49d1..e8fe5da1c1 100644
--- a/apps/opencs/model/world/nestedinfocollection.cpp
+++ b/apps/opencs/model/world/nestedinfocollection.cpp
@@ -4,30 +4,27 @@
 
 namespace CSMWorld
 {
-    NestedInfoCollection::NestedInfoCollection ()
-    {}
+    NestedInfoCollection::NestedInfoCollection() {}
 
     NestedInfoCollection::~NestedInfoCollection()
     {
-        for (std::map<const ColumnBase *, NestedColumnAdapter<Info>* >::iterator
-                iter (mAdapters.begin()); iter!=mAdapters.end(); ++iter)
+        for (std::map<const ColumnBase*, NestedColumnAdapter<Info>*>::iterator iter(mAdapters.begin());
+             iter != mAdapters.end(); ++iter)
         {
             delete (*iter).second;
         }
     }
 
-    void NestedInfoCollection::addAdapter(std::pair<const ColumnBase*,
-            NestedColumnAdapter<Info>* > adapter)
+    void NestedInfoCollection::addAdapter(std::pair<const ColumnBase*, NestedColumnAdapter<Info>*> adapter)
     {
         mAdapters.insert(adapter);
     }
 
-    const NestedColumnAdapter<Info>& NestedInfoCollection::getAdapter(const ColumnBase &column) const
+    const NestedColumnAdapter<Info>& NestedInfoCollection::getAdapter(const ColumnBase& column) const
     {
-        std::map<const ColumnBase *, NestedColumnAdapter<Info>* >::const_iterator iter =
-            mAdapters.find (&column);
+        std::map<const ColumnBase*, NestedColumnAdapter<Info>*>::const_iterator iter = mAdapters.find(&column);
 
-        if (iter==mAdapters.end())
+        if (iter == mAdapters.end())
             throw std::logic_error("No such column in the nestedidadapter");
 
         return *iter->second;
@@ -36,75 +33,69 @@ namespace CSMWorld
     void NestedInfoCollection::addNestedRow(int row, int column, int position)
     {
         auto record = std::make_unique<Record<Info>>();
-        record->assign(Collection<Info, IdAccessor<Info> >::getRecord(row));
+        record->assign(Collection<Info, IdAccessor<Info>>::getRecord(row));
 
-        getAdapter(Collection<Info, IdAccessor<Info> >::getColumn(column)).addRow(*record, position);
+        getAdapter(Collection<Info, IdAccessor<Info>>::getColumn(column)).addRow(*record, position);
 
-        Collection<Info, IdAccessor<Info> >::setRecord(row, std::move(record));
+        Collection<Info, IdAccessor<Info>>::setRecord(row, std::move(record));
     }
 
     void NestedInfoCollection::removeNestedRows(int row, int column, int subRow)
     {
         auto record = std::make_unique<Record<Info>>();
-        record->assign(Collection<Info, IdAccessor<Info> >::getRecord(row));
+        record->assign(Collection<Info, IdAccessor<Info>>::getRecord(row));
 
-        getAdapter(Collection<Info, IdAccessor<Info> >::getColumn(column)).removeRow(*record, subRow);
+        getAdapter(Collection<Info, IdAccessor<Info>>::getColumn(column)).removeRow(*record, subRow);
 
-        Collection<Info, IdAccessor<Info> >::setRecord(row, std::move(record));
+        Collection<Info, IdAccessor<Info>>::setRecord(row, std::move(record));
     }
 
-    QVariant NestedInfoCollection::getNestedData (int row,
-            int column, int subRow, int subColumn) const
+    QVariant NestedInfoCollection::getNestedData(int row, int column, int subRow, int subColumn) const
     {
-        return getAdapter(Collection<Info, IdAccessor<Info> >::getColumn(column)).getData(
-                Collection<Info, IdAccessor<Info> >::getRecord(row), subRow, subColumn);
+        return getAdapter(Collection<Info, IdAccessor<Info>>::getColumn(column))
+            .getData(Collection<Info, IdAccessor<Info>>::getRecord(row), subRow, subColumn);
     }
 
-    void NestedInfoCollection::setNestedData(int row,
-            int column, const QVariant& data, int subRow, int subColumn)
+    void NestedInfoCollection::setNestedData(int row, int column, const QVariant& data, int subRow, int subColumn)
     {
         auto record = std::make_unique<Record<Info>>();
-        record->assign(Collection<Info, IdAccessor<Info> >::getRecord(row));
+        record->assign(Collection<Info, IdAccessor<Info>>::getRecord(row));
 
-        getAdapter(Collection<Info, IdAccessor<Info> >::getColumn(column)).setData(
-                *record, data, subRow, subColumn);
+        getAdapter(Collection<Info, IdAccessor<Info>>::getColumn(column)).setData(*record, data, subRow, subColumn);
 
-        Collection<Info, IdAccessor<Info> >::setRecord(row, std::move(record));
+        Collection<Info, IdAccessor<Info>>::setRecord(row, std::move(record));
     }
 
-    CSMWorld::NestedTableWrapperBase* NestedInfoCollection::nestedTable(int row,
-            int column) const
+    CSMWorld::NestedTableWrapperBase* NestedInfoCollection::nestedTable(int row, int column) const
     {
-        return getAdapter(Collection<Info, IdAccessor<Info> >::getColumn(column)).table(
-                Collection<Info, IdAccessor<Info> >::getRecord(row));
+        return getAdapter(Collection<Info, IdAccessor<Info>>::getColumn(column))
+            .table(Collection<Info, IdAccessor<Info>>::getRecord(row));
     }
 
-    void NestedInfoCollection::setNestedTable(int row,
-            int column, const CSMWorld::NestedTableWrapperBase& nestedTable)
+    void NestedInfoCollection::setNestedTable(int row, int column, const CSMWorld::NestedTableWrapperBase& nestedTable)
     {
         auto record = std::make_unique<Record<Info>>();
-        record->assign(Collection<Info, IdAccessor<Info> >::getRecord(row));
+        record->assign(Collection<Info, IdAccessor<Info>>::getRecord(row));
 
-        getAdapter(Collection<Info, IdAccessor<Info> >::getColumn(column)).setTable(
-                *record, nestedTable);
+        getAdapter(Collection<Info, IdAccessor<Info>>::getColumn(column)).setTable(*record, nestedTable);
 
-        Collection<Info, IdAccessor<Info> >::setRecord(row, std::move(record));
+        Collection<Info, IdAccessor<Info>>::setRecord(row, std::move(record));
     }
 
     int NestedInfoCollection::getNestedRowsCount(int row, int column) const
     {
-        return getAdapter(Collection<Info, IdAccessor<Info> >::getColumn(column)).getRowsCount(
-                Collection<Info, IdAccessor<Info> >::getRecord(row));
+        return getAdapter(Collection<Info, IdAccessor<Info>>::getColumn(column))
+            .getRowsCount(Collection<Info, IdAccessor<Info>>::getRecord(row));
     }
 
     int NestedInfoCollection::getNestedColumnsCount(int row, int column) const
     {
-        return getAdapter(Collection<Info, IdAccessor<Info> >::getColumn(column)).getColumnsCount(
-                Collection<Info, IdAccessor<Info> >::getRecord(row));
+        return getAdapter(Collection<Info, IdAccessor<Info>>::getColumn(column))
+            .getColumnsCount(Collection<Info, IdAccessor<Info>>::getRecord(row));
     }
 
-    CSMWorld::NestableColumn *NestedInfoCollection::getNestableColumn(int column)
+    CSMWorld::NestableColumn* NestedInfoCollection::getNestableColumn(int column)
     {
-        return Collection<Info, IdAccessor<Info> >::getNestableColumn(column);
+        return Collection<Info, IdAccessor<Info>>::getNestableColumn(column);
     }
 }
diff --git a/apps/opencs/model/world/nestedinfocollection.hpp b/apps/opencs/model/world/nestedinfocollection.hpp
index bb747efadf..76db3a1186 100644
--- a/apps/opencs/model/world/nestedinfocollection.hpp
+++ b/apps/opencs/model/world/nestedinfocollection.hpp
@@ -10,40 +10,39 @@ namespace CSMWorld
 {
     struct NestedTableWrapperBase;
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     class NestedColumnAdapter;
 
     class NestedInfoCollection : public InfoCollection, public NestedCollection
     {
-            std::map<const ColumnBase*, NestedColumnAdapter<Info>* > mAdapters;
+        std::map<const ColumnBase*, NestedColumnAdapter<Info>*> mAdapters;
 
-            const NestedColumnAdapter<Info>& getAdapter(const ColumnBase &column) const;
+        const NestedColumnAdapter<Info>& getAdapter(const ColumnBase& column) const;
 
-        public:
+    public:
+        NestedInfoCollection();
+        ~NestedInfoCollection() override;
 
-            NestedInfoCollection ();
-            ~NestedInfoCollection() override;
+        void addNestedRow(int row, int column, int position) override;
 
-            void addNestedRow(int row, int column, int position) override;
+        void removeNestedRows(int row, int column, int subRow) override;
 
-            void removeNestedRows(int row, int column, int subRow) override;
+        QVariant getNestedData(int row, int column, int subRow, int subColumn) const override;
 
-            QVariant getNestedData(int row, int column, int subRow, int subColumn) const override;
+        void setNestedData(int row, int column, const QVariant& data, int subRow, int subColumn) override;
 
-            void setNestedData(int row, int column, const QVariant& data, int subRow, int subColumn) override;
+        NestedTableWrapperBase* nestedTable(int row, int column) const override;
 
-            NestedTableWrapperBase* nestedTable(int row, int column) const override;
+        void setNestedTable(int row, int column, const NestedTableWrapperBase& nestedTable) override;
 
-            void setNestedTable(int row, int column, const NestedTableWrapperBase& nestedTable) override;
+        int getNestedRowsCount(int row, int column) const override;
 
-            int getNestedRowsCount(int row, int column) const override;
+        int getNestedColumnsCount(int row, int column) const override;
 
-            int getNestedColumnsCount(int row, int column) const override;
+        // this method is inherited from NestedCollection, not from Collection<Info, IdAccessor<Info> >
+        NestableColumn* getNestableColumn(int column) override;
 
-            // this method is inherited from NestedCollection, not from Collection<Info, IdAccessor<Info> >
-            NestableColumn *getNestableColumn(int column) override;
-
-            void addAdapter(std::pair<const ColumnBase*, NestedColumnAdapter<Info>* > adapter);
+        void addAdapter(std::pair<const ColumnBase*, NestedColumnAdapter<Info>*> adapter);
     };
 }
 
diff --git a/apps/opencs/model/world/nestedtableproxymodel.cpp b/apps/opencs/model/world/nestedtableproxymodel.cpp
index bb918ee685..ef89a13af7 100644
--- a/apps/opencs/model/world/nestedtableproxymodel.cpp
+++ b/apps/opencs/model/world/nestedtableproxymodel.cpp
@@ -1,13 +1,12 @@
 #include "nestedtableproxymodel.hpp"
 
-#include <cassert>
 #include "idtree.hpp"
+#include <cassert>
 
-CSMWorld::NestedTableProxyModel::NestedTableProxyModel(const QModelIndex& parent,
-                                             ColumnBase::Display columnId,
-                                             CSMWorld::IdTree* parentModel)
-    : mParentColumn(parent.column()),
-      mMainModel(parentModel)
+CSMWorld::NestedTableProxyModel::NestedTableProxyModel(
+    const QModelIndex& parent, ColumnBase::Display columnId, CSMWorld::IdTree* parentModel)
+    : mParentColumn(parent.column())
+    , mMainModel(parentModel)
 {
     const int parentRow = parent.row();
 
@@ -15,32 +14,25 @@ CSMWorld::NestedTableProxyModel::NestedTableProxyModel(const QModelIndex& parent
 
     QAbstractProxyModel::setSourceModel(parentModel);
 
-    connect(mMainModel, &IdTree::rowsAboutToBeInserted,
-            this, &NestedTableProxyModel::forwardRowsAboutToInserted);
+    connect(mMainModel, &IdTree::rowsAboutToBeInserted, this, &NestedTableProxyModel::forwardRowsAboutToInserted);
 
-    connect(mMainModel, &IdTree::rowsInserted,
-            this, &NestedTableProxyModel::forwardRowsInserted);
+    connect(mMainModel, &IdTree::rowsInserted, this, &NestedTableProxyModel::forwardRowsInserted);
 
-    connect(mMainModel, &IdTree::rowsAboutToBeRemoved,
-            this, &NestedTableProxyModel::forwardRowsAboutToRemoved);
+    connect(mMainModel, &IdTree::rowsAboutToBeRemoved, this, &NestedTableProxyModel::forwardRowsAboutToRemoved);
 
-    connect(mMainModel, &IdTree::rowsRemoved,
-            this, &NestedTableProxyModel::forwardRowsRemoved);
+    connect(mMainModel, &IdTree::rowsRemoved, this, &NestedTableProxyModel::forwardRowsRemoved);
 
-    connect(mMainModel, &IdTree::resetStart,
-            this, &NestedTableProxyModel::forwardResetStart);
+    connect(mMainModel, &IdTree::resetStart, this, &NestedTableProxyModel::forwardResetStart);
 
-    connect(mMainModel, &IdTree::resetEnd,
-            this, &NestedTableProxyModel::forwardResetEnd);
+    connect(mMainModel, &IdTree::resetEnd, this, &NestedTableProxyModel::forwardResetEnd);
 
-    connect(mMainModel, &IdTree::dataChanged,
-            this, &NestedTableProxyModel::forwardDataChanged);
+    connect(mMainModel, &IdTree::dataChanged, this, &NestedTableProxyModel::forwardDataChanged);
 }
 
 QModelIndex CSMWorld::NestedTableProxyModel::mapFromSource(const QModelIndex& sourceIndex) const
 {
     const QModelIndex& testedParent = mMainModel->parent(sourceIndex);
-    const QModelIndex& parent = mMainModel->getNestedModelIndex (mId, mParentColumn);
+    const QModelIndex& parent = mMainModel->getNestedModelIndex(mId, mParentColumn);
     if (testedParent == parent)
     {
         return createIndex(sourceIndex.row(), sourceIndex.column());
@@ -53,27 +45,27 @@ QModelIndex CSMWorld::NestedTableProxyModel::mapFromSource(const QModelIndex& so
 
 QModelIndex CSMWorld::NestedTableProxyModel::mapToSource(const QModelIndex& proxyIndex) const
 {
-    const QModelIndex& parent = mMainModel->getNestedModelIndex (mId, mParentColumn);
+    const QModelIndex& parent = mMainModel->getNestedModelIndex(mId, mParentColumn);
     return mMainModel->index(proxyIndex.row(), proxyIndex.column(), parent);
 }
 
 int CSMWorld::NestedTableProxyModel::rowCount(const QModelIndex& index) const
 {
-    assert (!index.isValid());
+    assert(!index.isValid());
 
     return mMainModel->rowCount(mMainModel->getModelIndex(mId, mParentColumn));
 }
 
 int CSMWorld::NestedTableProxyModel::columnCount(const QModelIndex& parent) const
 {
-    assert (!parent.isValid());
+    assert(!parent.isValid());
 
     return mMainModel->columnCount(mMainModel->getModelIndex(mId, mParentColumn));
 }
 
 QModelIndex CSMWorld::NestedTableProxyModel::index(int row, int column, const QModelIndex& parent) const
 {
-    assert (!parent.isValid());
+    assert(!parent.isValid());
 
     int numRows = rowCount(parent);
     int numColumns = columnCount(parent);
@@ -89,9 +81,7 @@ QModelIndex CSMWorld::NestedTableProxyModel::parent(const QModelIndex& index) co
     return QModelIndex();
 }
 
-QVariant CSMWorld::NestedTableProxyModel::headerData(int section,
-                                                Qt::Orientation orientation,
-                                                int role) const
+QVariant CSMWorld::NestedTableProxyModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
     return mMainModel->nestedHeaderData(mParentColumn, section, orientation, role);
 }
@@ -104,7 +94,7 @@ QVariant CSMWorld::NestedTableProxyModel::data(const QModelIndex& index, int rol
 // NOTE: Due to mapToSouce(index) the dataChanged() signal resulting from setData() will have the
 // source model's index values.  The indicies need to be converted to the proxy space values.
 // See forwardDataChanged()
-bool CSMWorld::NestedTableProxyModel::setData (const QModelIndex & index, const QVariant & value, int role)
+bool CSMWorld::NestedTableProxyModel::setData(const QModelIndex& index, const QVariant& value, int role)
 {
     return mMainModel->setData(mapToSource(index), value, role);
 }
@@ -129,8 +119,7 @@ CSMWorld::IdTree* CSMWorld::NestedTableProxyModel::model() const
     return mMainModel;
 }
 
-void CSMWorld::NestedTableProxyModel::forwardRowsAboutToInserted(const QModelIndex& parent,
-        int first, int last)
+void CSMWorld::NestedTableProxyModel::forwardRowsAboutToInserted(const QModelIndex& parent, int first, int last)
 {
     if (indexIsParent(parent))
     {
@@ -148,13 +137,11 @@ void CSMWorld::NestedTableProxyModel::forwardRowsInserted(const QModelIndex& par
 
 bool CSMWorld::NestedTableProxyModel::indexIsParent(const QModelIndex& index)
 {
-    return (index.isValid() &&
-            index.column() == mParentColumn &&
-            mMainModel->data(mMainModel->index(index.row(), 0)).toString().toUtf8().constData() == mId);
+    return (index.isValid() && index.column() == mParentColumn
+        && mMainModel->data(mMainModel->index(index.row(), 0)).toString().toUtf8().constData() == mId);
 }
 
-void CSMWorld::NestedTableProxyModel::forwardRowsAboutToRemoved(const QModelIndex& parent,
-        int first, int last)
+void CSMWorld::NestedTableProxyModel::forwardRowsAboutToRemoved(const QModelIndex& parent, int first, int last)
 {
     if (indexIsParent(parent))
     {
@@ -182,15 +169,13 @@ void CSMWorld::NestedTableProxyModel::forwardResetEnd(const QString& id)
         endResetModel();
 }
 
-void CSMWorld::NestedTableProxyModel::forwardDataChanged (const QModelIndex& topLeft,
-        const QModelIndex& bottomRight)
+void CSMWorld::NestedTableProxyModel::forwardDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
-    const QModelIndex& parent = mMainModel->getNestedModelIndex (mId, mParentColumn);
+    const QModelIndex& parent = mMainModel->getNestedModelIndex(mId, mParentColumn);
 
     if (topLeft.column() <= parent.column() && bottomRight.column() >= parent.column())
     {
-        emit dataChanged(index(0,0),
-                index(mMainModel->rowCount(parent)-1, mMainModel->columnCount(parent)-1));
+        emit dataChanged(index(0, 0), index(mMainModel->rowCount(parent) - 1, mMainModel->columnCount(parent) - 1));
     }
     else if (topLeft.parent() == parent && bottomRight.parent() == parent)
     {
diff --git a/apps/opencs/model/world/nestedtableproxymodel.hpp b/apps/opencs/model/world/nestedtableproxymodel.hpp
index 4f44cd7df6..bac6b7ebdc 100644
--- a/apps/opencs/model/world/nestedtableproxymodel.hpp
+++ b/apps/opencs/model/world/nestedtableproxymodel.hpp
@@ -26,10 +26,8 @@ namespace CSMWorld
         std::string mId;
 
     public:
-        NestedTableProxyModel(const QModelIndex& parent,
-                         ColumnBase::Display displayType,
-                         IdTree* parentModel);
-        //parent is the parent of columns to work with. Columnid provides information about the column
+        NestedTableProxyModel(const QModelIndex& parent, ColumnBase::Display displayType, IdTree* parentModel);
+        // parent is the parent of columns to work with. Columnid provides information about the column
 
         std::string getParentId() const;
 
@@ -49,11 +47,11 @@ namespace CSMWorld
 
         QModelIndex parent(const QModelIndex& index) const override;
 
-        QVariant headerData (int section, Qt::Orientation orientation, int role) const override;
+        QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
 
-        QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override;
+        QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
 
-        bool setData (const QModelIndex & index, const QVariant & value, int role = Qt::EditRole) override;
+        bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
 
         Qt::ItemFlags flags(const QModelIndex& index) const override;
 
@@ -63,19 +61,19 @@ namespace CSMWorld
         bool indexIsParent(const QModelIndex& index);
 
     private slots:
-        void forwardRowsAboutToInserted(const QModelIndex & parent, int first, int last);
+        void forwardRowsAboutToInserted(const QModelIndex& parent, int first, int last);
 
-        void forwardRowsInserted(const QModelIndex & parent, int first, int last);
+        void forwardRowsInserted(const QModelIndex& parent, int first, int last);
 
-        void forwardRowsAboutToRemoved(const QModelIndex & parent, int first, int last);
+        void forwardRowsAboutToRemoved(const QModelIndex& parent, int first, int last);
 
-        void forwardRowsRemoved(const QModelIndex & parent, int first, int last);
+        void forwardRowsRemoved(const QModelIndex& parent, int first, int last);
 
         void forwardResetStart(const QString& id);
 
         void forwardResetEnd(const QString& id);
 
-        void forwardDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
+        void forwardDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
     };
 }
 
diff --git a/apps/opencs/model/world/nestedtablewrapper.cpp b/apps/opencs/model/world/nestedtablewrapper.cpp
index 3966dbc575..480f6aab3e 100644
--- a/apps/opencs/model/world/nestedtablewrapper.cpp
+++ b/apps/opencs/model/world/nestedtablewrapper.cpp
@@ -1,10 +1,8 @@
 #include "nestedtablewrapper.hpp"
 
-CSMWorld::NestedTableWrapperBase::NestedTableWrapperBase()
-{}
+CSMWorld::NestedTableWrapperBase::NestedTableWrapperBase() {}
 
-CSMWorld::NestedTableWrapperBase::~NestedTableWrapperBase()
-{}
+CSMWorld::NestedTableWrapperBase::~NestedTableWrapperBase() {}
 
 int CSMWorld::NestedTableWrapperBase::size() const
 {
diff --git a/apps/opencs/model/world/nestedtablewrapper.hpp b/apps/opencs/model/world/nestedtablewrapper.hpp
index 1b652683a4..0779988c1d 100644
--- a/apps/opencs/model/world/nestedtablewrapper.hpp
+++ b/apps/opencs/model/world/nestedtablewrapper.hpp
@@ -6,25 +6,27 @@ namespace CSMWorld
     struct NestedTableWrapperBase
     {
         virtual ~NestedTableWrapperBase();
-        
+
         virtual int size() const;
-        
+
         NestedTableWrapperBase();
     };
-    
-    template<typename NestedTable>
+
+    template <typename NestedTable>
     struct NestedTableWrapper : public NestedTableWrapperBase
     {
         NestedTable mNestedTable;
 
         NestedTableWrapper(const NestedTable& nestedTable)
-            : mNestedTable(nestedTable) {}
+            : mNestedTable(nestedTable)
+        {
+        }
 
         ~NestedTableWrapper() override {}
 
         int size() const override
         {
-            return mNestedTable.size(); //i hope that this will be enough
+            return mNestedTable.size(); // i hope that this will be enough
         }
     };
 }
diff --git a/apps/opencs/model/world/pathgrid.cpp b/apps/opencs/model/world/pathgrid.cpp
index c995bd8f09..0852ad46fa 100644
--- a/apps/opencs/model/world/pathgrid.cpp
+++ b/apps/opencs/model/world/pathgrid.cpp
@@ -1,15 +1,15 @@
+#include "pathgrid.hpp"
 #include "cell.hpp"
 #include "idcollection.hpp"
-#include "pathgrid.hpp"
 
 #include <sstream>
 
-void CSMWorld::Pathgrid::load (ESM::ESMReader &esm, bool &isDeleted, const IdCollection<Cell>& cells)
+void CSMWorld::Pathgrid::load(ESM::ESMReader& esm, bool& isDeleted, const IdCollection<Cell>& cells)
 {
-    load (esm, isDeleted);
+    load(esm, isDeleted);
 
     // correct ID
-    if (!mId.empty() && mId[0]!='#' && cells.searchId (mId)==-1)
+    if (!mId.empty() && mId[0] != '#' && cells.searchId(mId) == -1)
     {
         std::ostringstream stream;
         stream << "#" << mData.mX << " " << mData.mY;
@@ -17,9 +17,9 @@ void CSMWorld::Pathgrid::load (ESM::ESMReader &esm, bool &isDeleted, const IdCol
     }
 }
 
-void CSMWorld::Pathgrid::load (ESM::ESMReader &esm, bool &isDeleted)
+void CSMWorld::Pathgrid::load(ESM::ESMReader& esm, bool& isDeleted)
 {
-    ESM::Pathgrid::load (esm, isDeleted);
+    ESM::Pathgrid::load(esm, isDeleted);
 
     mId = mCell;
     if (mCell.empty())
diff --git a/apps/opencs/model/world/pathgrid.hpp b/apps/opencs/model/world/pathgrid.hpp
index ad89918fbf..6317e2fd9e 100644
--- a/apps/opencs/model/world/pathgrid.hpp
+++ b/apps/opencs/model/world/pathgrid.hpp
@@ -1,18 +1,18 @@
 #ifndef CSM_WOLRD_PATHGRID_H
 #define CSM_WOLRD_PATHGRID_H
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <components/esm3/loadpgrd.hpp>
 
 namespace CSMWorld
 {
     struct Cell;
-    template<typename T, typename AT>
+    template <typename T, typename AT>
     class IdCollection;
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     struct IdAccessor;
 
     /// \brief Wrapper for Pathgrid record
@@ -23,8 +23,8 @@ namespace CSMWorld
     {
         std::string mId;
 
-        void load (ESM::ESMReader &esm, bool &isDeleted, const IdCollection<Cell, IdAccessor<Cell> >& cells);
-        void load (ESM::ESMReader &esm, bool &isDeleted);
+        void load(ESM::ESMReader& esm, bool& isDeleted, const IdCollection<Cell, IdAccessor<Cell>>& cells);
+        void load(ESM::ESMReader& esm, bool& isDeleted);
     };
 }
 
diff --git a/apps/opencs/model/world/record.cpp b/apps/opencs/model/world/record.cpp
index da1651f2b5..27f52c73a1 100644
--- a/apps/opencs/model/world/record.cpp
+++ b/apps/opencs/model/world/record.cpp
@@ -4,17 +4,15 @@ CSMWorld::RecordBase::~RecordBase() {}
 
 bool CSMWorld::RecordBase::isDeleted() const
 {
-    return mState==State_Deleted || mState==State_Erased;
+    return mState == State_Deleted || mState == State_Erased;
 }
 
-
 bool CSMWorld::RecordBase::isErased() const
 {
-    return mState==State_Erased;
+    return mState == State_Erased;
 }
 
-
 bool CSMWorld::RecordBase::isModified() const
 {
-    return mState==State_Modified || mState==State_ModifiedOnly;
+    return mState == State_Modified || mState == State_ModifiedOnly;
 }
\ No newline at end of file
diff --git a/apps/opencs/model/world/record.hpp b/apps/opencs/model/world/record.hpp
index bb43612e5e..8fc69cfdae 100644
--- a/apps/opencs/model/world/record.hpp
+++ b/apps/opencs/model/world/record.hpp
@@ -25,7 +25,7 @@ namespace CSMWorld
 
         virtual std::unique_ptr<RecordBase> modifiedCopy() const = 0;
 
-        virtual void assign (const RecordBase& record) = 0;
+        virtual void assign(const RecordBase& record) = 0;
         ///< Will throw an exception if the types don't match.
 
         bool isDeleted() const;
@@ -43,14 +43,13 @@ namespace CSMWorld
 
         Record();
 
-        Record(State state,
-                const ESXRecordT *base = 0, const ESXRecordT *modified = 0);
+        Record(State state, const ESXRecordT* base = 0, const ESXRecordT* modified = 0);
 
         std::unique_ptr<RecordBase> clone() const override;
 
         std::unique_ptr<RecordBase> modifiedCopy() const override;
 
-        void assign (const RecordBase& record) override;
+        void assign(const RecordBase& record) override;
 
         const ESXRecordT& get() const;
         ///< Throws an exception, if the record is deleted.
@@ -61,7 +60,7 @@ namespace CSMWorld
         const ESXRecordT& getBase() const;
         ///< Throws an exception, if the record is deleted. Returns modified, if there is no base.
 
-        void setModified (const ESXRecordT& modified);
+        void setModified(const ESXRecordT& modified);
         ///< Throws an exception, if the record is deleted.
 
         void merge();
@@ -70,16 +69,18 @@ namespace CSMWorld
 
     template <typename ESXRecordT>
     Record<ESXRecordT>::Record()
-    : mBase(), mModified()
-    { }
+        : mBase()
+        , mModified()
+    {
+    }
 
     template <typename ESXRecordT>
-    Record<ESXRecordT>::Record(State state, const ESXRecordT *base, const ESXRecordT *modified)
+    Record<ESXRecordT>::Record(State state, const ESXRecordT* base, const ESXRecordT* modified)
     {
-        if(base)
+        if (base)
             mBase = *base;
 
-        if(modified)
+        if (modified)
             mModified = *modified;
 
         this->mState = state;
@@ -88,58 +89,57 @@ namespace CSMWorld
     template <typename ESXRecordT>
     std::unique_ptr<RecordBase> Record<ESXRecordT>::modifiedCopy() const
     {
-        return std::make_unique<Record<ESXRecordT> >(
-                Record<ESXRecordT>(State_ModifiedOnly, nullptr, &(this->get())));
+        return std::make_unique<Record<ESXRecordT>>(Record<ESXRecordT>(State_ModifiedOnly, nullptr, &(this->get())));
     }
 
     template <typename ESXRecordT>
     std::unique_ptr<RecordBase> Record<ESXRecordT>::clone() const
     {
-        return std::make_unique<Record<ESXRecordT> >(Record<ESXRecordT>(*this));
+        return std::make_unique<Record<ESXRecordT>>(Record<ESXRecordT>(*this));
     }
 
     template <typename ESXRecordT>
-    void Record<ESXRecordT>::assign (const RecordBase& record)
+    void Record<ESXRecordT>::assign(const RecordBase& record)
     {
-        *this = dynamic_cast<const Record<ESXRecordT>& > (record);
+        *this = dynamic_cast<const Record<ESXRecordT>&>(record);
     }
 
     template <typename ESXRecordT>
     const ESXRecordT& Record<ESXRecordT>::get() const
     {
-        if (mState==State_Erased)
-            throw std::logic_error ("attempt to access a deleted record");
+        if (mState == State_Erased)
+            throw std::logic_error("attempt to access a deleted record");
 
-        return mState==State_BaseOnly || mState==State_Deleted ? mBase : mModified;
+        return mState == State_BaseOnly || mState == State_Deleted ? mBase : mModified;
     }
 
     template <typename ESXRecordT>
     ESXRecordT& Record<ESXRecordT>::get()
     {
-        if (mState==State_Erased)
-            throw std::logic_error ("attempt to access a deleted record");
+        if (mState == State_Erased)
+            throw std::logic_error("attempt to access a deleted record");
 
-        return mState==State_BaseOnly || mState==State_Deleted ? mBase : mModified;
+        return mState == State_BaseOnly || mState == State_Deleted ? mBase : mModified;
     }
 
     template <typename ESXRecordT>
     const ESXRecordT& Record<ESXRecordT>::getBase() const
     {
-        if (mState==State_Erased)
-            throw std::logic_error ("attempt to access a deleted record");
+        if (mState == State_Erased)
+            throw std::logic_error("attempt to access a deleted record");
 
-        return mState==State_ModifiedOnly ? mModified : mBase;
+        return mState == State_ModifiedOnly ? mModified : mBase;
     }
 
     template <typename ESXRecordT>
-    void Record<ESXRecordT>::setModified (const ESXRecordT& modified)
+    void Record<ESXRecordT>::setModified(const ESXRecordT& modified)
     {
-        if (mState==State_Erased)
-            throw std::logic_error ("attempt to modify a deleted record");
+        if (mState == State_Erased)
+            throw std::logic_error("attempt to modify a deleted record");
 
         mModified = modified;
 
-        if (mState!=State_ModifiedOnly)
+        if (mState != State_ModifiedOnly)
             mState = State_Modified;
     }
 
@@ -151,7 +151,7 @@ namespace CSMWorld
             mBase = mModified;
             mState = State_BaseOnly;
         }
-        else if (mState==State_Deleted)
+        else if (mState == State_Deleted)
         {
             mState = State_Erased;
         }
diff --git a/apps/opencs/model/world/ref.cpp b/apps/opencs/model/world/ref.cpp
index 0b07b484ca..00957bb3ed 100644
--- a/apps/opencs/model/world/ref.cpp
+++ b/apps/opencs/model/world/ref.cpp
@@ -2,7 +2,9 @@
 
 #include "cellcoordinates.hpp"
 
-CSMWorld::CellRef::CellRef() : mNew (true), mIdNum(0)
+CSMWorld::CellRef::CellRef()
+    : mNew(true)
+    , mIdNum(0)
 {
     mRefNum.mIndex = 0;
     mRefNum.mContentFile = 0;
@@ -10,5 +12,5 @@ CSMWorld::CellRef::CellRef() : mNew (true), mIdNum(0)
 
 std::pair<int, int> CSMWorld::CellRef::getCellIndex() const
 {
-    return CellCoordinates::coordinatesToCellIndex (mPos.pos[0], mPos.pos[1]);
+    return CellCoordinates::coordinatesToCellIndex(mPos.pos[0], mPos.pos[1]);
 }
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index 49abbbbf16..0fb199b68f 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -2,10 +2,10 @@
 
 #include <components/esm3/loadcell.hpp>
 
-#include "ref.hpp"
 #include "cell.hpp"
-#include "universalid.hpp"
 #include "record.hpp"
+#include "ref.hpp"
+#include "universalid.hpp"
 
 #include "../doc/messages.hpp"
 
@@ -13,37 +13,37 @@
 
 namespace CSMWorld
 {
-    template<>
-    void Collection<CellRef, IdAccessor<CellRef> >::removeRows (int index, int count)
+    template <>
+    void Collection<CellRef, IdAccessor<CellRef>>::removeRows(int index, int count)
     {
-        mRecords.erase(mRecords.begin()+index, mRecords.begin()+index+count);
+        mRecords.erase(mRecords.begin() + index, mRecords.begin() + index + count);
 
         // index map is updated in RefCollection::removeRows()
     }
 
-    template<>
-    void Collection<CellRef, IdAccessor<CellRef> >::insertRecord (std::unique_ptr<RecordBase> record, int index,
-        UniversalId::Type type)
+    template <>
+    void Collection<CellRef, IdAccessor<CellRef>>::insertRecord(
+        std::unique_ptr<RecordBase> record, int index, UniversalId::Type type)
     {
         int size = static_cast<int>(mRecords.size());
         if (index < 0 || index > size)
             throw std::runtime_error("index out of range");
 
-        std::unique_ptr<Record<CellRef> > record2(static_cast<Record<CellRef>*>(record.release()));
+        std::unique_ptr<Record<CellRef>> record2(static_cast<Record<CellRef>*>(record.release()));
 
         if (index == size)
             mRecords.push_back(std::move(record2));
         else
-            mRecords.insert(mRecords.begin()+index, std::move(record2));
+            mRecords.insert(mRecords.begin() + index, std::move(record2));
 
         // index map is updated in RefCollection::insertRecord()
     }
 }
 
-void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool base,
+void CSMWorld::RefCollection::load(ESM::ESMReader& reader, int cellIndex, bool base,
     std::map<unsigned int, unsigned int>& cache, CSMDoc::Messages& messages)
 {
-    Record<Cell> cell = mCells.getRecord (cellIndex);
+    Record<Cell> cell = mCells.getRecord(cellIndex);
 
     Cell& cell2 = base ? cell.mBase : cell.mModified;
 
@@ -83,7 +83,7 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
                     std::string indexCell = ref.mCell;
                     ref.mCell = "#" + std::to_string(mref.mTarget[0]) + " " + std::to_string(mref.mTarget[1]);
 
-                    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Cell, mCells.getId (cellIndex));
+                    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Cell, mCells.getId(cellIndex));
                     messages.add(id, "The position of the moved reference " + ref.mRefID + " (cell " + indexCell + ")"
                                      " does not match the target cell (" + ref.mCell + ")",
                                      std::string(), CSMDoc::Message::Severity_Warning);
@@ -99,8 +99,8 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
             ref.mRefNum.mIndex &= 0x00ffffff;
         }
 
-        unsigned int  refNum = (ref.mRefNum.mIndex & 0x00ffffff) |
-            (ref.mRefNum.hasContentFile() ? ref.mRefNum.mContentFile : 0xff) << 24;
+        unsigned int refNum = (ref.mRefNum.mIndex & 0x00ffffff)
+            | (ref.mRefNum.hasContentFile() ? ref.mRefNum.mContentFile : 0xff) << 24;
 
         std::map<unsigned int, unsigned int>::iterator iter = cache.find(refNum);
 
@@ -108,14 +108,12 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
         {
             if (iter == cache.end())
             {
-                CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Cell,
-                    mCells.getId(cellIndex));
+                CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Cell, mCells.getId(cellIndex));
 
-                messages.add(id, "Attempt to move a non-existent reference - RefNum index "
-                    + std::to_string(ref.mRefNum.mIndex) + ", refID " + ref.mRefID + ", content file index "
-                    + std::to_string(ref.mRefNum.mContentFile),
-                    /*hint*/"",
-                    CSMDoc::Message::Severity_Warning);
+                messages.add(id,
+                    "Attempt to move a non-existent reference - RefNum index " + std::to_string(ref.mRefNum.mIndex)
+                        + ", refID " + ref.mRefID + ", content file index " + std::to_string(ref.mRefNum.mContentFile),
+                    /*hint*/ "", CSMDoc::Message::Severity_Warning);
                 continue;
             }
 
@@ -138,25 +136,23 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
 
         if (isDeleted)
         {
-            if (iter==cache.end())
+            if (iter == cache.end())
             {
-                CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Cell,
-                    mCells.getId (cellIndex));
-
-                messages.add (id, "Attempt to delete a non-existent reference - RefNum index "
-                        + std::to_string(ref.mRefNum.mIndex) + ", refID " + ref.mRefID + ", content file index "
-                        + std::to_string(ref.mRefNum.mContentFile),
-                        /*hint*/"",
-                        CSMDoc::Message::Severity_Warning);
+                CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Cell, mCells.getId(cellIndex));
+
+                messages.add(id,
+                    "Attempt to delete a non-existent reference - RefNum index " + std::to_string(ref.mRefNum.mIndex)
+                        + ", refID " + ref.mRefID + ", content file index " + std::to_string(ref.mRefNum.mContentFile),
+                    /*hint*/ "", CSMDoc::Message::Severity_Warning);
                 continue;
             }
 
-            int index = getIntIndex (iter->second);
+            int index = getIntIndex(iter->second);
 
             if (base)
             {
-                removeRows (index, 1);
-                cache.erase (iter);
+                removeRows(index, 1);
+                cache.erase(iter);
             }
             else
             {
@@ -168,7 +164,7 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
             continue;
         }
 
-        if (iter==cache.end())
+        if (iter == cache.end())
         {
             // new reference
             ref.mIdNum = mNextId; // FIXME: fragile
@@ -228,10 +224,10 @@ unsigned int CSMWorld::RefCollection::extractIdNum(std::string_view id) const
     if (separator == std::string::npos)
         throw std::runtime_error("invalid ref ID: " + std::string(id));
 
-    return static_cast<unsigned int>(std::stoi(std::string(id.substr(separator+1))));
+    return static_cast<unsigned int>(std::stoi(std::string(id.substr(separator + 1))));
 }
 
-int CSMWorld::RefCollection::getIntIndex (unsigned int id) const
+int CSMWorld::RefCollection::getIntIndex(unsigned int id) const
 {
     int index = searchId(id);
 
@@ -241,7 +237,7 @@ int CSMWorld::RefCollection::getIntIndex (unsigned int id) const
     return index;
 }
 
-int CSMWorld::RefCollection::searchId (unsigned int id) const
+int CSMWorld::RefCollection::searchId(unsigned int id) const
 {
     std::map<unsigned int, int>::const_iterator iter = mRefIndex.find(id);
 
@@ -251,16 +247,16 @@ int CSMWorld::RefCollection::searchId (unsigned int id) const
     return iter->second;
 }
 
-void CSMWorld::RefCollection::removeRows (int index, int count)
+void CSMWorld::RefCollection::removeRows(int index, int count)
 {
-    Collection<CellRef, IdAccessor<CellRef> >::removeRows(index, count); // erase records only
+    Collection<CellRef, IdAccessor<CellRef>>::removeRows(index, count); // erase records only
 
     std::map<unsigned int, int>::iterator iter = mRefIndex.begin();
     while (iter != mRefIndex.end())
     {
-        if (iter->second>=index)
+        if (iter->second >= index)
         {
-            if (iter->second >= index+count)
+            if (iter->second >= index + count)
             {
                 iter->second -= count;
                 ++iter;
@@ -273,7 +269,7 @@ void CSMWorld::RefCollection::removeRows (int index, int count)
     }
 }
 
-void  CSMWorld::RefCollection::appendBlankRecord (const std::string& id, UniversalId::Type type)
+void CSMWorld::RefCollection::appendBlankRecord(const std::string& id, UniversalId::Type type)
 {
     auto record = std::make_unique<Record<CellRef>>();
 
@@ -283,12 +279,11 @@ void  CSMWorld::RefCollection::appendBlankRecord (const std::string& id, Univers
     record->get().mId = id;
     record->get().mIdNum = extractIdNum(id);
 
-    Collection<CellRef, IdAccessor<CellRef> >::appendRecord(std::move(record));
+    Collection<CellRef, IdAccessor<CellRef>>::appendRecord(std::move(record));
 }
 
-void CSMWorld::RefCollection::cloneRecord (const std::string& origin,
-                                           const std::string& destination,
-                                           const UniversalId::Type type)
+void CSMWorld::RefCollection::cloneRecord(
+    const std::string& origin, const std::string& destination, const UniversalId::Type type)
 {
     auto copy = std::make_unique<Record<CellRef>>();
 
@@ -306,24 +301,23 @@ int CSMWorld::RefCollection::searchId(std::string_view id) const
     return searchId(extractIdNum(id));
 }
 
-void CSMWorld::RefCollection::appendRecord (std::unique_ptr<RecordBase> record, UniversalId::Type type)
+void CSMWorld::RefCollection::appendRecord(std::unique_ptr<RecordBase> record, UniversalId::Type type)
 {
-    int index = getAppendIndex(/*id*/"", type); // for CellRef records id is ignored
+    int index = getAppendIndex(/*id*/ "", type); // for CellRef records id is ignored
 
     mRefIndex.insert(std::make_pair(static_cast<Record<CellRef>*>(record.get())->get().mIdNum, index));
 
-    Collection<CellRef, IdAccessor<CellRef> >::insertRecord(std::move(record), index, type); // add records only
+    Collection<CellRef, IdAccessor<CellRef>>::insertRecord(std::move(record), index, type); // add records only
 }
 
-void CSMWorld::RefCollection::insertRecord (std::unique_ptr<RecordBase> record, int index,
-    UniversalId::Type type)
+void CSMWorld::RefCollection::insertRecord(std::unique_ptr<RecordBase> record, int index, UniversalId::Type type)
 {
-    int size = getAppendIndex(/*id*/"", type); // for CellRef records id is ignored
+    int size = getAppendIndex(/*id*/ "", type); // for CellRef records id is ignored
     unsigned int idNum = static_cast<Record<CellRef>*>(record.get())->get().mIdNum;
 
-    Collection<CellRef, IdAccessor<CellRef> >::insertRecord(std::move(record), index, type); // add records only
+    Collection<CellRef, IdAccessor<CellRef>>::insertRecord(std::move(record), index, type); // add records only
 
-    if (index < size-1)
+    if (index < size - 1)
     {
         for (std::map<unsigned int, int>::iterator iter(mRefIndex.begin()); iter != mRefIndex.end(); ++iter)
         {
diff --git a/apps/opencs/model/world/refcollection.hpp b/apps/opencs/model/world/refcollection.hpp
index 87688c162a..749b5167f6 100644
--- a/apps/opencs/model/world/refcollection.hpp
+++ b/apps/opencs/model/world/refcollection.hpp
@@ -5,8 +5,8 @@
 #include <string_view>
 
 #include "collection.hpp"
-#include "ref.hpp"
 #include "record.hpp"
+#include "ref.hpp"
 
 namespace CSMDoc
 {
@@ -18,56 +18,54 @@ namespace CSMWorld
     struct Cell;
     class UniversalId;
 
-    template<>
-    void Collection<CellRef, IdAccessor<CellRef> >::removeRows (int index, int count);
+    template <>
+    void Collection<CellRef, IdAccessor<CellRef>>::removeRows(int index, int count);
 
-    template<>
-    void Collection<CellRef, IdAccessor<CellRef> >::insertRecord (std::unique_ptr<RecordBase> record, int index,
-        UniversalId::Type type);
+    template <>
+    void Collection<CellRef, IdAccessor<CellRef>>::insertRecord(
+        std::unique_ptr<RecordBase> record, int index, UniversalId::Type type);
 
     /// \brief References in cells
     class RefCollection : public Collection<CellRef>
     {
-            Collection<Cell>& mCells;
-            std::map<unsigned int, int> mRefIndex; // CellRef index keyed by CSMWorld::CellRef::mIdNum
+        Collection<Cell>& mCells;
+        std::map<unsigned int, int> mRefIndex; // CellRef index keyed by CSMWorld::CellRef::mIdNum
 
-            int mNextId;
+        int mNextId;
 
-            unsigned int extractIdNum(std::string_view id) const;
+        unsigned int extractIdNum(std::string_view id) const;
 
-            int getIntIndex (unsigned int id) const;
+        int getIntIndex(unsigned int id) const;
 
-            int searchId (unsigned int id) const;
+        int searchId(unsigned int id) const;
 
-        public:
-            // MSVC needs the constructor for a class inheriting a template to be defined in header
-            RefCollection (Collection<Cell>& cells)
-              : mCells (cells), mNextId (0)
-            {}
+    public:
+        // MSVC needs the constructor for a class inheriting a template to be defined in header
+        RefCollection(Collection<Cell>& cells)
+            : mCells(cells)
+            , mNextId(0)
+        {
+        }
 
-            void load (ESM::ESMReader& reader, int cellIndex, bool base,
-                std::map<unsigned int, unsigned int>& cache, CSMDoc::Messages& messages);
-            ///< Load a sequence of references.
+        void load(ESM::ESMReader& reader, int cellIndex, bool base, std::map<unsigned int, unsigned int>& cache,
+            CSMDoc::Messages& messages);
+        ///< Load a sequence of references.
 
-            std::string getNewId();
+        std::string getNewId();
 
-            virtual void removeRows (int index, int count);
+        virtual void removeRows(int index, int count);
 
-            virtual void appendBlankRecord (const std::string& id,
-                                            UniversalId::Type type = UniversalId::Type_None);
+        virtual void appendBlankRecord(const std::string& id, UniversalId::Type type = UniversalId::Type_None);
 
-            virtual void cloneRecord (const std::string& origin,
-                                      const std::string& destination,
-                                      const UniversalId::Type type);
+        virtual void cloneRecord(
+            const std::string& origin, const std::string& destination, const UniversalId::Type type);
 
-            virtual int searchId(std::string_view id) const;
+        virtual int searchId(std::string_view id) const;
 
-            virtual void appendRecord (std::unique_ptr<RecordBase> record,
-                                       UniversalId::Type type = UniversalId::Type_None);
+        virtual void appendRecord(std::unique_ptr<RecordBase> record, UniversalId::Type type = UniversalId::Type_None);
 
-            virtual void insertRecord (std::unique_ptr<RecordBase> record,
-                                       int index,
-                                       UniversalId::Type type = UniversalId::Type_None);
+        virtual void insertRecord(
+            std::unique_ptr<RecordBase> record, int index, UniversalId::Type type = UniversalId::Type_None);
     };
 }
 
diff --git a/apps/opencs/model/world/refidadapter.hpp b/apps/opencs/model/world/refidadapter.hpp
index 116adb69a7..c98090e7ee 100644
--- a/apps/opencs/model/world/refidadapter.hpp
+++ b/apps/opencs/model/world/refidadapter.hpp
@@ -5,10 +5,12 @@
 #include <vector>
 
 /*! \brief
- * Adapters acts as indirection layer, abstracting details of the record types (in the wrappers) from the higher levels of model.
- * Please notice that nested adaptor uses helper classes for actually performing any actions. Different record types require different helpers (needs to be created in the subclass and then fetched via member function).
+ * Adapters acts as indirection layer, abstracting details of the record types (in the wrappers) from the higher levels
+ * of model. Please notice that nested adaptor uses helper classes for actually performing any actions. Different record
+ * types require different helpers (needs to be created in the subclass and then fetched via member function).
  *
- * Important point: don't forget to make sure that getData on the nestedColumn returns true (otherwise code will not treat the index pointing to the column as having children!
+ * Important point: don't forget to make sure that getData on the nestedColumn returns true (otherwise code will not
+ * treat the index pointing to the column as having children!
  */
 
 class QVariant;
@@ -23,57 +25,52 @@ namespace CSMWorld
 
     class RefIdAdapter
     {
-            // not implemented
-            RefIdAdapter (const RefIdAdapter&);
-            RefIdAdapter& operator= (const RefIdAdapter&);
+        // not implemented
+        RefIdAdapter(const RefIdAdapter&);
+        RefIdAdapter& operator=(const RefIdAdapter&);
 
-        public:
+    public:
+        RefIdAdapter();
 
-            RefIdAdapter();
+        virtual ~RefIdAdapter();
 
-            virtual ~RefIdAdapter();
+        virtual QVariant getData(const RefIdColumn* column, const RefIdData& data, int idnex) const = 0;
+        ///< If called on the nest column, should return QVariant(true).
 
-            virtual QVariant getData (const RefIdColumn *column, const RefIdData& data, int idnex)
-                const = 0;
-            ///< If called on the nest column, should return QVariant(true).
+        virtual void setData(const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const = 0;
+        ///< If the data type does not match an exception is thrown.
 
-            virtual void setData (const RefIdColumn *column, RefIdData& data, int index,
-                const QVariant& value) const = 0;
-            ///< If the data type does not match an exception is thrown.
+        virtual std::string getId(const RecordBase& record) const = 0;
 
-            virtual std::string getId (const RecordBase& record) const = 0;
-
-            virtual void setId(RecordBase& record, const std::string& id) = 0; // used by RefIdCollection::cloneRecord()
+        virtual void setId(RecordBase& record, const std::string& id) = 0; // used by RefIdCollection::cloneRecord()
     };
 
     class NestedRefIdAdapterBase
     {
-        public:
-            NestedRefIdAdapterBase();
+    public:
+        NestedRefIdAdapterBase();
 
-            virtual ~NestedRefIdAdapterBase();
+        virtual ~NestedRefIdAdapterBase();
 
-            virtual void setNestedData (const RefIdColumn *column,
-                    RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const = 0;
+        virtual void setNestedData(const RefIdColumn* column, RefIdData& data, int row, const QVariant& value,
+            int subRowIndex, int subColIndex) const = 0;
 
-            virtual QVariant getNestedData (const RefIdColumn *column,
-                    const RefIdData& data, int index, int subRowIndex, int subColIndex) const = 0;
+        virtual QVariant getNestedData(
+            const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex, int subColIndex) const = 0;
 
-            virtual int getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const = 0;
+        virtual int getNestedColumnsCount(const RefIdColumn* column, const RefIdData& data) const = 0;
 
-            virtual int getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const = 0;
+        virtual int getNestedRowsCount(const RefIdColumn* column, const RefIdData& data, int index) const = 0;
 
-            virtual void removeNestedRow (const RefIdColumn *column,
-                    RefIdData& data, int index, int rowToRemove) const = 0;
+        virtual void removeNestedRow(const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const = 0;
 
-            virtual void addNestedRow (const RefIdColumn *column,
-                    RefIdData& data, int index, int position) const = 0;
+        virtual void addNestedRow(const RefIdColumn* column, RefIdData& data, int index, int position) const = 0;
 
-            virtual void setNestedTable (const RefIdColumn* column,
-                    RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const = 0;
+        virtual void setNestedTable(
+            const RefIdColumn* column, RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const = 0;
 
-            virtual NestedTableWrapperBase* nestedTable (const RefIdColumn* column,
-                    const RefIdData& data, int index) const = 0;
+        virtual NestedTableWrapperBase* nestedTable(
+            const RefIdColumn* column, const RefIdData& data, int index) const = 0;
     };
 }
 
diff --git a/apps/opencs/model/world/refidadapterimp.cpp b/apps/opencs/model/world/refidadapterimp.cpp
index a30dcadd0b..54917fd0d9 100644
--- a/apps/opencs/model/world/refidadapterimp.cpp
+++ b/apps/opencs/model/world/refidadapterimp.cpp
@@ -7,44 +7,47 @@
 
 #include "nestedtablewrapper.hpp"
 
-CSMWorld::PotionColumns::PotionColumns (const InventoryColumns& columns)
-: InventoryColumns (columns), mEffects(nullptr) {}
+CSMWorld::PotionColumns::PotionColumns(const InventoryColumns& columns)
+    : InventoryColumns(columns)
+    , mEffects(nullptr)
+{
+}
 
-CSMWorld::PotionRefIdAdapter::PotionRefIdAdapter (const PotionColumns& columns,
-    const RefIdColumn *autoCalc)
-: InventoryRefIdAdapter<ESM::Potion> (UniversalId::Type_Potion, columns),
-  mColumns(columns), mAutoCalc (autoCalc)
-{}
+CSMWorld::PotionRefIdAdapter::PotionRefIdAdapter(const PotionColumns& columns, const RefIdColumn* autoCalc)
+    : InventoryRefIdAdapter<ESM::Potion>(UniversalId::Type_Potion, columns)
+    , mColumns(columns)
+    , mAutoCalc(autoCalc)
+{
+}
 
-QVariant CSMWorld::PotionRefIdAdapter::getData (const RefIdColumn *column, const RefIdData& data,
-    int index) const
+QVariant CSMWorld::PotionRefIdAdapter::getData(const RefIdColumn* column, const RefIdData& data, int index) const
 {
-    const Record<ESM::Potion>& record = static_cast<const Record<ESM::Potion>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Potion)));
+    const Record<ESM::Potion>& record = static_cast<const Record<ESM::Potion>&>(
+        data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Potion)));
 
-    if (column==mAutoCalc)
-        return record.get().mData.mAutoCalc!=0;
+    if (column == mAutoCalc)
+        return record.get().mData.mAutoCalc != 0;
 
     // to show nested tables in dialogue subview, see IdTree::hasChildren()
-    if (column==mColumns.mEffects)
+    if (column == mColumns.mEffects)
         return QVariant::fromValue(ColumnBase::TableEdit_Full);
 
-    return InventoryRefIdAdapter<ESM::Potion>::getData (column, data, index);
+    return InventoryRefIdAdapter<ESM::Potion>::getData(column, data, index);
 }
 
-void CSMWorld::PotionRefIdAdapter::setData (const RefIdColumn *column, RefIdData& data, int index,
-    const QVariant& value) const
+void CSMWorld::PotionRefIdAdapter::setData(
+    const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const
 {
-    Record<ESM::Potion>& record = static_cast<Record<ESM::Potion>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Potion)));
+    Record<ESM::Potion>& record
+        = static_cast<Record<ESM::Potion>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Potion)));
 
     ESM::Potion potion = record.get();
 
-    if (column==mAutoCalc)
+    if (column == mAutoCalc)
         potion.mData.mAutoCalc = value.toInt();
     else
     {
-        InventoryRefIdAdapter<ESM::Potion>::setData (column, data, index, value);
+        InventoryRefIdAdapter<ESM::Potion>::setData(column, data, index, value);
 
         return;
     }
@@ -52,93 +55,93 @@ void CSMWorld::PotionRefIdAdapter::setData (const RefIdColumn *column, RefIdData
     record.setModified(potion);
 }
 
+CSMWorld::IngredientColumns::IngredientColumns(const InventoryColumns& columns)
+    : InventoryColumns(columns)
+    , mEffects(nullptr)
+{
+}
 
-CSMWorld::IngredientColumns::IngredientColumns (const InventoryColumns& columns)
-: InventoryColumns (columns)
-, mEffects(nullptr)
-{}
-
-CSMWorld::IngredientRefIdAdapter::IngredientRefIdAdapter (const IngredientColumns& columns)
-: InventoryRefIdAdapter<ESM::Ingredient> (UniversalId::Type_Ingredient, columns),
-  mColumns(columns)
-{}
+CSMWorld::IngredientRefIdAdapter::IngredientRefIdAdapter(const IngredientColumns& columns)
+    : InventoryRefIdAdapter<ESM::Ingredient>(UniversalId::Type_Ingredient, columns)
+    , mColumns(columns)
+{
+}
 
-QVariant CSMWorld::IngredientRefIdAdapter::getData (const RefIdColumn *column, const RefIdData& data,
-    int index) const
+QVariant CSMWorld::IngredientRefIdAdapter::getData(const RefIdColumn* column, const RefIdData& data, int index) const
 {
-    if (column==mColumns.mEffects)
+    if (column == mColumns.mEffects)
         return QVariant::fromValue(ColumnBase::TableEdit_FixedRows);
 
-    return InventoryRefIdAdapter<ESM::Ingredient>::getData (column, data, index);
+    return InventoryRefIdAdapter<ESM::Ingredient>::getData(column, data, index);
 }
 
-void CSMWorld::IngredientRefIdAdapter::setData (const RefIdColumn *column, RefIdData& data, int index,
-    const QVariant& value) const
+void CSMWorld::IngredientRefIdAdapter::setData(
+    const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const
 {
-    InventoryRefIdAdapter<ESM::Ingredient>::setData (column, data, index, value);
+    InventoryRefIdAdapter<ESM::Ingredient>::setData(column, data, index, value);
 
     return;
 }
 
-
 CSMWorld::IngredEffectRefIdAdapter::IngredEffectRefIdAdapter()
-: mType(UniversalId::Type_Ingredient)
-{}
+    : mType(UniversalId::Type_Ingredient)
+{
+}
 
-CSMWorld::IngredEffectRefIdAdapter::~IngredEffectRefIdAdapter()
-{}
+CSMWorld::IngredEffectRefIdAdapter::~IngredEffectRefIdAdapter() {}
 
-void CSMWorld::IngredEffectRefIdAdapter::addNestedRow (const RefIdColumn *column,
-        RefIdData& data, int index, int position) const
+void CSMWorld::IngredEffectRefIdAdapter::addNestedRow(
+    const RefIdColumn* column, RefIdData& data, int index, int position) const
 {
     // Do nothing, this table cannot be changed by the user
 }
 
-void CSMWorld::IngredEffectRefIdAdapter::removeNestedRow (const RefIdColumn *column,
-        RefIdData& data, int index, int rowToRemove) const
+void CSMWorld::IngredEffectRefIdAdapter::removeNestedRow(
+    const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const
 {
     // Do nothing, this table cannot be changed by the user
 }
 
-void CSMWorld::IngredEffectRefIdAdapter::setNestedTable (const RefIdColumn* column,
-        RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const
+void CSMWorld::IngredEffectRefIdAdapter::setNestedTable(
+    const RefIdColumn* column, RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const
 {
-    Record<ESM::Ingredient>& record =
-        static_cast<Record<ESM::Ingredient>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+    Record<ESM::Ingredient>& record
+        = static_cast<Record<ESM::Ingredient>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
     ESM::Ingredient ingredient = record.get();
 
-    ingredient.mData =
-        static_cast<const NestedTableWrapper<std::vector<ESM::Ingredient::IRDTstruct> >&>(nestedTable).mNestedTable.at(0);
+    ingredient.mData = static_cast<const NestedTableWrapper<std::vector<ESM::Ingredient::IRDTstruct>>&>(nestedTable)
+                           .mNestedTable.at(0);
 
-    record.setModified (ingredient);
+    record.setModified(ingredient);
 }
 
-CSMWorld::NestedTableWrapperBase* CSMWorld::IngredEffectRefIdAdapter::nestedTable (const RefIdColumn* column,
-        const RefIdData& data, int index) const
+CSMWorld::NestedTableWrapperBase* CSMWorld::IngredEffectRefIdAdapter::nestedTable(
+    const RefIdColumn* column, const RefIdData& data, int index) const
 {
-    const Record<ESM::Ingredient>& record =
-        static_cast<const Record<ESM::Ingredient>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+    const Record<ESM::Ingredient>& record
+        = static_cast<const Record<ESM::Ingredient>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
     // return the whole struct
     std::vector<ESM::Ingredient::IRDTstruct> wrap;
     wrap.push_back(record.get().mData);
 
     // deleted by dtor of NestedTableStoring
-    return new NestedTableWrapper<std::vector<ESM::Ingredient::IRDTstruct> >(wrap);
+    return new NestedTableWrapper<std::vector<ESM::Ingredient::IRDTstruct>>(wrap);
 }
 
-QVariant CSMWorld::IngredEffectRefIdAdapter::getNestedData (const RefIdColumn *column,
-        const RefIdData& data, int index, int subRowIndex, int subColIndex) const
+QVariant CSMWorld::IngredEffectRefIdAdapter::getNestedData(
+    const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex, int subColIndex) const
 {
-    const Record<ESM::Ingredient>& record =
-        static_cast<const Record<ESM::Ingredient>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+    const Record<ESM::Ingredient>& record
+        = static_cast<const Record<ESM::Ingredient>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
     if (subRowIndex < 0 || subRowIndex >= 4)
-        throw std::runtime_error ("index out of range");
+        throw std::runtime_error("index out of range");
 
     switch (subColIndex)
     {
-        case 0: return record.get().mData.mEffectID[subRowIndex];
+        case 0:
+            return record.get().mData.mEffectID[subRowIndex];
         case 1:
         {
             switch (record.get().mData.mEffectID[subRowIndex])
@@ -172,127 +175,135 @@ QVariant CSMWorld::IngredEffectRefIdAdapter::getNestedData (const RefIdColumn *c
     }
 }
 
-void CSMWorld::IngredEffectRefIdAdapter::setNestedData (const RefIdColumn *column,
-        RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const
+void CSMWorld::IngredEffectRefIdAdapter::setNestedData(
+    const RefIdColumn* column, RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const
 {
-    Record<ESM::Ingredient>& record =
-        static_cast<Record<ESM::Ingredient>&> (data.getRecord (RefIdData::LocalIndex (row, mType)));
+    Record<ESM::Ingredient>& record
+        = static_cast<Record<ESM::Ingredient>&>(data.getRecord(RefIdData::LocalIndex(row, mType)));
     ESM::Ingredient ingredient = record.get();
 
     if (subRowIndex < 0 || subRowIndex >= 4)
-        throw std::runtime_error ("index out of range");
+        throw std::runtime_error("index out of range");
 
-    switch(subColIndex)
+    switch (subColIndex)
     {
-        case 0: ingredient.mData.mEffectID[subRowIndex] = value.toInt(); break;
-        case 1: ingredient.mData.mSkills[subRowIndex] = value.toInt(); break;
-        case 2: ingredient.mData.mAttributes[subRowIndex] = value.toInt(); break;
+        case 0:
+            ingredient.mData.mEffectID[subRowIndex] = value.toInt();
+            break;
+        case 1:
+            ingredient.mData.mSkills[subRowIndex] = value.toInt();
+            break;
+        case 2:
+            ingredient.mData.mAttributes[subRowIndex] = value.toInt();
+            break;
         default:
             throw std::runtime_error("Trying to access non-existing column in the nested table!");
     }
 
-    record.setModified (ingredient);
+    record.setModified(ingredient);
 }
 
-int CSMWorld::IngredEffectRefIdAdapter::getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const
+int CSMWorld::IngredEffectRefIdAdapter::getNestedColumnsCount(const RefIdColumn* column, const RefIdData& data) const
 {
     return 3; // effect, skill, attribute
 }
 
-int CSMWorld::IngredEffectRefIdAdapter::getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const
+int CSMWorld::IngredEffectRefIdAdapter::getNestedRowsCount(
+    const RefIdColumn* column, const RefIdData& data, int index) const
 {
     return 4; // up to 4 effects
 }
 
+CSMWorld::ApparatusRefIdAdapter::ApparatusRefIdAdapter(
+    const InventoryColumns& columns, const RefIdColumn* type, const RefIdColumn* quality)
+    : InventoryRefIdAdapter<ESM::Apparatus>(UniversalId::Type_Apparatus, columns)
+    , mType(type)
+    , mQuality(quality)
+{
+}
 
-CSMWorld::ApparatusRefIdAdapter::ApparatusRefIdAdapter (const InventoryColumns& columns,
-    const RefIdColumn *type, const RefIdColumn *quality)
-: InventoryRefIdAdapter<ESM::Apparatus> (UniversalId::Type_Apparatus, columns),
-    mType (type), mQuality (quality)
-{}
-
-QVariant CSMWorld::ApparatusRefIdAdapter::getData (const RefIdColumn *column,
-    const RefIdData& data, int index) const
+QVariant CSMWorld::ApparatusRefIdAdapter::getData(const RefIdColumn* column, const RefIdData& data, int index) const
 {
-    const Record<ESM::Apparatus>& record = static_cast<const Record<ESM::Apparatus>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Apparatus)));
+    const Record<ESM::Apparatus>& record = static_cast<const Record<ESM::Apparatus>&>(
+        data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Apparatus)));
 
-    if (column==mType)
+    if (column == mType)
         return record.get().mData.mType;
 
-    if (column==mQuality)
+    if (column == mQuality)
         return record.get().mData.mQuality;
 
-    return InventoryRefIdAdapter<ESM::Apparatus>::getData (column, data, index);
+    return InventoryRefIdAdapter<ESM::Apparatus>::getData(column, data, index);
 }
 
-void CSMWorld::ApparatusRefIdAdapter::setData (const RefIdColumn *column, RefIdData& data, int index,
-    const QVariant& value) const
+void CSMWorld::ApparatusRefIdAdapter::setData(
+    const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const
 {
-    Record<ESM::Apparatus>& record = static_cast<Record<ESM::Apparatus>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Apparatus)));
+    Record<ESM::Apparatus>& record = static_cast<Record<ESM::Apparatus>&>(
+        data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Apparatus)));
 
     ESM::Apparatus apparatus = record.get();
 
-    if (column==mType)
+    if (column == mType)
         apparatus.mData.mType = value.toInt();
-    else if (column==mQuality)
+    else if (column == mQuality)
         apparatus.mData.mQuality = value.toFloat();
     else
     {
-        InventoryRefIdAdapter<ESM::Apparatus>::setData (column, data, index, value);
+        InventoryRefIdAdapter<ESM::Apparatus>::setData(column, data, index, value);
 
         return;
     }
     record.setModified(apparatus);
 }
 
+CSMWorld::ArmorRefIdAdapter::ArmorRefIdAdapter(const EnchantableColumns& columns, const RefIdColumn* type,
+    const RefIdColumn* health, const RefIdColumn* armor, const RefIdColumn* partRef)
+    : EnchantableRefIdAdapter<ESM::Armor>(UniversalId::Type_Armor, columns)
+    , mType(type)
+    , mHealth(health)
+    , mArmor(armor)
+    , mPartRef(partRef)
+{
+}
 
-CSMWorld::ArmorRefIdAdapter::ArmorRefIdAdapter (const EnchantableColumns& columns,
-    const RefIdColumn *type, const RefIdColumn *health, const RefIdColumn *armor,
-    const RefIdColumn *partRef)
-: EnchantableRefIdAdapter<ESM::Armor> (UniversalId::Type_Armor, columns),
-    mType (type), mHealth (health), mArmor (armor), mPartRef(partRef)
-{}
-
-QVariant CSMWorld::ArmorRefIdAdapter::getData (const RefIdColumn *column,
-    const RefIdData& data, int index) const
+QVariant CSMWorld::ArmorRefIdAdapter::getData(const RefIdColumn* column, const RefIdData& data, int index) const
 {
-    const Record<ESM::Armor>& record = static_cast<const Record<ESM::Armor>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Armor)));
+    const Record<ESM::Armor>& record
+        = static_cast<const Record<ESM::Armor>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Armor)));
 
-    if (column==mType)
+    if (column == mType)
         return record.get().mData.mType;
 
-    if (column==mHealth)
+    if (column == mHealth)
         return record.get().mData.mHealth;
 
-    if (column==mArmor)
+    if (column == mArmor)
         return record.get().mData.mArmor;
 
-    if (column==mPartRef)
+    if (column == mPartRef)
         return QVariant::fromValue(ColumnBase::TableEdit_Full);
 
-    return EnchantableRefIdAdapter<ESM::Armor>::getData (column, data, index);
+    return EnchantableRefIdAdapter<ESM::Armor>::getData(column, data, index);
 }
 
-void CSMWorld::ArmorRefIdAdapter::setData (const RefIdColumn *column, RefIdData& data, int index,
-    const QVariant& value) const
+void CSMWorld::ArmorRefIdAdapter::setData(
+    const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const
 {
-    Record<ESM::Armor>& record = static_cast<Record<ESM::Armor>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Armor)));
+    Record<ESM::Armor>& record
+        = static_cast<Record<ESM::Armor>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Armor)));
 
     ESM::Armor armor = record.get();
 
-    if (column==mType)
+    if (column == mType)
         armor.mData.mType = value.toInt();
-    else if (column==mHealth)
+    else if (column == mHealth)
         armor.mData.mHealth = value.toInt();
-    else if (column==mArmor)
+    else if (column == mArmor)
         armor.mData.mArmor = value.toInt();
     else
     {
-        EnchantableRefIdAdapter<ESM::Armor>::setData (column, data, index, value);
+        EnchantableRefIdAdapter<ESM::Armor>::setData(column, data, index, value);
 
         return;
     }
@@ -300,47 +311,49 @@ void CSMWorld::ArmorRefIdAdapter::setData (const RefIdColumn *column, RefIdData&
     record.setModified(armor);
 }
 
-CSMWorld::BookRefIdAdapter::BookRefIdAdapter (const EnchantableColumns& columns,
-    const RefIdColumn *bookType, const RefIdColumn *skill, const RefIdColumn *text)
-: EnchantableRefIdAdapter<ESM::Book> (UniversalId::Type_Book, columns),
-    mBookType (bookType), mSkill (skill), mText (text)
-{}
+CSMWorld::BookRefIdAdapter::BookRefIdAdapter(
+    const EnchantableColumns& columns, const RefIdColumn* bookType, const RefIdColumn* skill, const RefIdColumn* text)
+    : EnchantableRefIdAdapter<ESM::Book>(UniversalId::Type_Book, columns)
+    , mBookType(bookType)
+    , mSkill(skill)
+    , mText(text)
+{
+}
 
-QVariant CSMWorld::BookRefIdAdapter::getData (const RefIdColumn *column,
-    const RefIdData& data, int index) const
+QVariant CSMWorld::BookRefIdAdapter::getData(const RefIdColumn* column, const RefIdData& data, int index) const
 {
-    const Record<ESM::Book>& record = static_cast<const Record<ESM::Book>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Book)));
+    const Record<ESM::Book>& record
+        = static_cast<const Record<ESM::Book>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Book)));
 
-    if (column==mBookType)
+    if (column == mBookType)
         return record.get().mData.mIsScroll;
 
-    if (column==mSkill)
+    if (column == mSkill)
         return record.get().mData.mSkillId;
 
-    if (column==mText)
-        return QString::fromUtf8 (record.get().mText.c_str());
+    if (column == mText)
+        return QString::fromUtf8(record.get().mText.c_str());
 
-    return EnchantableRefIdAdapter<ESM::Book>::getData (column, data, index);
+    return EnchantableRefIdAdapter<ESM::Book>::getData(column, data, index);
 }
 
-void CSMWorld::BookRefIdAdapter::setData (const RefIdColumn *column, RefIdData& data, int index,
-    const QVariant& value) const
+void CSMWorld::BookRefIdAdapter::setData(
+    const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const
 {
-    Record<ESM::Book>& record = static_cast<Record<ESM::Book>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Book)));
+    Record<ESM::Book>& record
+        = static_cast<Record<ESM::Book>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Book)));
 
     ESM::Book book = record.get();
 
-    if (column==mBookType)
+    if (column == mBookType)
         book.mData.mIsScroll = value.toInt();
-    else if (column==mSkill)
+    else if (column == mSkill)
         book.mData.mSkillId = value.toInt();
-    else if (column==mText)
+    else if (column == mText)
         book.mText = value.toString().toUtf8().data();
     else
     {
-        EnchantableRefIdAdapter<ESM::Book>::setData (column, data, index, value);
+        EnchantableRefIdAdapter<ESM::Book>::setData(column, data, index, value);
 
         return;
     }
@@ -348,40 +361,41 @@ void CSMWorld::BookRefIdAdapter::setData (const RefIdColumn *column, RefIdData&
     record.setModified(book);
 }
 
-CSMWorld::ClothingRefIdAdapter::ClothingRefIdAdapter (const EnchantableColumns& columns,
-    const RefIdColumn *type, const RefIdColumn *partRef)
-: EnchantableRefIdAdapter<ESM::Clothing> (UniversalId::Type_Clothing, columns), mType (type),
-  mPartRef(partRef)
-{}
+CSMWorld::ClothingRefIdAdapter::ClothingRefIdAdapter(
+    const EnchantableColumns& columns, const RefIdColumn* type, const RefIdColumn* partRef)
+    : EnchantableRefIdAdapter<ESM::Clothing>(UniversalId::Type_Clothing, columns)
+    , mType(type)
+    , mPartRef(partRef)
+{
+}
 
-QVariant CSMWorld::ClothingRefIdAdapter::getData (const RefIdColumn *column,
-    const RefIdData& data, int index) const
+QVariant CSMWorld::ClothingRefIdAdapter::getData(const RefIdColumn* column, const RefIdData& data, int index) const
 {
-    const Record<ESM::Clothing>& record = static_cast<const Record<ESM::Clothing>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Clothing)));
+    const Record<ESM::Clothing>& record = static_cast<const Record<ESM::Clothing>&>(
+        data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Clothing)));
 
-    if (column==mType)
+    if (column == mType)
         return record.get().mData.mType;
 
-    if (column==mPartRef)
+    if (column == mPartRef)
         return QVariant::fromValue(ColumnBase::TableEdit_Full);
 
-    return EnchantableRefIdAdapter<ESM::Clothing>::getData (column, data, index);
+    return EnchantableRefIdAdapter<ESM::Clothing>::getData(column, data, index);
 }
 
-void CSMWorld::ClothingRefIdAdapter::setData (const RefIdColumn *column, RefIdData& data, int index,
-    const QVariant& value) const
+void CSMWorld::ClothingRefIdAdapter::setData(
+    const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const
 {
-    Record<ESM::Clothing>& record = static_cast<Record<ESM::Clothing>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Clothing)));
+    Record<ESM::Clothing>& record
+        = static_cast<Record<ESM::Clothing>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Clothing)));
 
     ESM::Clothing clothing = record.get();
 
-    if (column==mType)
+    if (column == mType)
         clothing.mData.mType = value.toInt();
     else
     {
-        EnchantableRefIdAdapter<ESM::Clothing>::setData (column, data, index, value);
+        EnchantableRefIdAdapter<ESM::Clothing>::setData(column, data, index, value);
 
         return;
     }
@@ -389,52 +403,54 @@ void CSMWorld::ClothingRefIdAdapter::setData (const RefIdColumn *column, RefIdDa
     record.setModified(clothing);
 }
 
-CSMWorld::ContainerRefIdAdapter::ContainerRefIdAdapter (const NameColumns& columns,
-    const RefIdColumn *weight, const RefIdColumn *organic, const RefIdColumn *respawn, const RefIdColumn *content)
-: NameRefIdAdapter<ESM::Container> (UniversalId::Type_Container, columns), mWeight (weight),
-  mOrganic (organic), mRespawn (respawn), mContent(content)
-{}
+CSMWorld::ContainerRefIdAdapter::ContainerRefIdAdapter(const NameColumns& columns, const RefIdColumn* weight,
+    const RefIdColumn* organic, const RefIdColumn* respawn, const RefIdColumn* content)
+    : NameRefIdAdapter<ESM::Container>(UniversalId::Type_Container, columns)
+    , mWeight(weight)
+    , mOrganic(organic)
+    , mRespawn(respawn)
+    , mContent(content)
+{
+}
 
-QVariant CSMWorld::ContainerRefIdAdapter::getData (const RefIdColumn *column,
-                                                   const RefIdData& data,
-                                                   int index) const
+QVariant CSMWorld::ContainerRefIdAdapter::getData(const RefIdColumn* column, const RefIdData& data, int index) const
 {
-    const Record<ESM::Container>& record = static_cast<const Record<ESM::Container>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Container)));
+    const Record<ESM::Container>& record = static_cast<const Record<ESM::Container>&>(
+        data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Container)));
 
-    if (column==mWeight)
+    if (column == mWeight)
         return record.get().mWeight;
 
-    if (column==mOrganic)
-        return (record.get().mFlags & ESM::Container::Organic)!=0;
+    if (column == mOrganic)
+        return (record.get().mFlags & ESM::Container::Organic) != 0;
 
-    if (column==mRespawn)
-        return (record.get().mFlags & ESM::Container::Respawn)!=0;
+    if (column == mRespawn)
+        return (record.get().mFlags & ESM::Container::Respawn) != 0;
 
-    if (column==mContent)
+    if (column == mContent)
         return QVariant::fromValue(ColumnBase::TableEdit_Full);
 
-    return NameRefIdAdapter<ESM::Container>::getData (column, data, index);
+    return NameRefIdAdapter<ESM::Container>::getData(column, data, index);
 }
 
-void CSMWorld::ContainerRefIdAdapter::setData (const RefIdColumn *column, RefIdData& data, int index,
-    const QVariant& value) const
+void CSMWorld::ContainerRefIdAdapter::setData(
+    const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const
 {
-    Record<ESM::Container>& record = static_cast<Record<ESM::Container>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Container)));
+    Record<ESM::Container>& record = static_cast<Record<ESM::Container>&>(
+        data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Container)));
 
     ESM::Container container = record.get();
 
-    if (column==mWeight)
+    if (column == mWeight)
         container.mWeight = value.toFloat();
-    else if (column==mOrganic)
+    else if (column == mOrganic)
     {
         if (value.toInt())
             container.mFlags |= ESM::Container::Organic;
         else
             container.mFlags &= ~ESM::Container::Organic;
     }
-    else if (column==mRespawn)
+    else if (column == mRespawn)
     {
         if (value.toInt())
             container.mFlags |= ESM::Container::Respawn;
@@ -443,7 +459,7 @@ void CSMWorld::ContainerRefIdAdapter::setData (const RefIdColumn *column, RefIdD
     }
     else
     {
-        NameRefIdAdapter<ESM::Container>::setData (column, data, index, value);
+        NameRefIdAdapter<ESM::Container>::setData(column, data, index, value);
 
         return;
     }
@@ -451,88 +467,88 @@ void CSMWorld::ContainerRefIdAdapter::setData (const RefIdColumn *column, RefIdD
     record.setModified(container);
 }
 
-CSMWorld::CreatureColumns::CreatureColumns (const ActorColumns& actorColumns)
-: ActorColumns (actorColumns),
-  mType(nullptr),
-  mScale(nullptr),
-  mOriginal(nullptr),
-  mAttributes(nullptr),
-  mAttacks(nullptr),
-  mMisc(nullptr),
-  mBloodType(nullptr)
-{}
+CSMWorld::CreatureColumns::CreatureColumns(const ActorColumns& actorColumns)
+    : ActorColumns(actorColumns)
+    , mType(nullptr)
+    , mScale(nullptr)
+    , mOriginal(nullptr)
+    , mAttributes(nullptr)
+    , mAttacks(nullptr)
+    , mMisc(nullptr)
+    , mBloodType(nullptr)
+{
+}
 
-CSMWorld::CreatureRefIdAdapter::CreatureRefIdAdapter (const CreatureColumns& columns)
-: ActorRefIdAdapter<ESM::Creature> (UniversalId::Type_Creature, columns), mColumns (columns)
-{}
+CSMWorld::CreatureRefIdAdapter::CreatureRefIdAdapter(const CreatureColumns& columns)
+    : ActorRefIdAdapter<ESM::Creature>(UniversalId::Type_Creature, columns)
+    , mColumns(columns)
+{
+}
 
-QVariant CSMWorld::CreatureRefIdAdapter::getData (const RefIdColumn *column, const RefIdData& data,
-    int index) const
+QVariant CSMWorld::CreatureRefIdAdapter::getData(const RefIdColumn* column, const RefIdData& data, int index) const
 {
-    const Record<ESM::Creature>& record = static_cast<const Record<ESM::Creature>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Creature)));
+    const Record<ESM::Creature>& record = static_cast<const Record<ESM::Creature>&>(
+        data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Creature)));
 
-    if (column==mColumns.mType)
+    if (column == mColumns.mType)
         return record.get().mData.mType;
 
-    if (column==mColumns.mScale)
+    if (column == mColumns.mScale)
         return record.get().mScale;
 
-    if (column==mColumns.mOriginal)
-        return QString::fromUtf8 (record.get().mOriginal.c_str());
+    if (column == mColumns.mOriginal)
+        return QString::fromUtf8(record.get().mOriginal.c_str());
 
-    if (column==mColumns.mAttributes)
+    if (column == mColumns.mAttributes)
         return QVariant::fromValue(ColumnBase::TableEdit_FixedRows);
 
-    if (column==mColumns.mAttacks)
+    if (column == mColumns.mAttacks)
         return QVariant::fromValue(ColumnBase::TableEdit_FixedRows);
 
-    if (column==mColumns.mMisc)
+    if (column == mColumns.mMisc)
         return QVariant::fromValue(ColumnBase::TableEdit_Full);
 
     if (column == mColumns.mBloodType)
         return record.get().mBloodType;
 
-    std::map<const RefIdColumn *, unsigned int>::const_iterator iter =
-        mColumns.mFlags.find (column);
+    std::map<const RefIdColumn*, unsigned int>::const_iterator iter = mColumns.mFlags.find(column);
 
-    if (iter!=mColumns.mFlags.end())
-        return (record.get().mFlags & iter->second)!=0;
+    if (iter != mColumns.mFlags.end())
+        return (record.get().mFlags & iter->second) != 0;
 
-    return ActorRefIdAdapter<ESM::Creature>::getData (column, data, index);
+    return ActorRefIdAdapter<ESM::Creature>::getData(column, data, index);
 }
 
-void CSMWorld::CreatureRefIdAdapter::setData (const RefIdColumn *column, RefIdData& data, int index,
-    const QVariant& value) const
+void CSMWorld::CreatureRefIdAdapter::setData(
+    const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const
 {
-    Record<ESM::Creature>& record = static_cast<Record<ESM::Creature>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Creature)));
+    Record<ESM::Creature>& record
+        = static_cast<Record<ESM::Creature>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Creature)));
 
     ESM::Creature creature = record.get();
 
-    if (column==mColumns.mType)
+    if (column == mColumns.mType)
         creature.mData.mType = value.toInt();
-    else if (column==mColumns.mScale)
+    else if (column == mColumns.mScale)
         creature.mScale = value.toFloat();
-    else if (column==mColumns.mOriginal)
+    else if (column == mColumns.mOriginal)
         creature.mOriginal = value.toString().toUtf8().constData();
     else if (column == mColumns.mBloodType)
         creature.mBloodType = value.toInt();
     else
     {
-        std::map<const RefIdColumn *, unsigned int>::const_iterator iter =
-            mColumns.mFlags.find (column);
+        std::map<const RefIdColumn*, unsigned int>::const_iterator iter = mColumns.mFlags.find(column);
 
-        if (iter!=mColumns.mFlags.end())
+        if (iter != mColumns.mFlags.end())
         {
-            if (value.toInt()!=0)
+            if (value.toInt() != 0)
                 creature.mFlags |= iter->second;
             else
                 creature.mFlags &= ~iter->second;
         }
         else
         {
-            ActorRefIdAdapter<ESM::Creature>::setData (column, data, index, value);
+            ActorRefIdAdapter<ESM::Creature>::setData(column, data, index, value);
 
             return;
         }
@@ -541,42 +557,43 @@ void CSMWorld::CreatureRefIdAdapter::setData (const RefIdColumn *column, RefIdDa
     record.setModified(creature);
 }
 
-CSMWorld::DoorRefIdAdapter::DoorRefIdAdapter (const NameColumns& columns,
-    const RefIdColumn *openSound, const RefIdColumn *closeSound)
-: NameRefIdAdapter<ESM::Door> (UniversalId::Type_Door, columns), mOpenSound (openSound),
-  mCloseSound (closeSound)
-{}
+CSMWorld::DoorRefIdAdapter::DoorRefIdAdapter(
+    const NameColumns& columns, const RefIdColumn* openSound, const RefIdColumn* closeSound)
+    : NameRefIdAdapter<ESM::Door>(UniversalId::Type_Door, columns)
+    , mOpenSound(openSound)
+    , mCloseSound(closeSound)
+{
+}
 
-QVariant CSMWorld::DoorRefIdAdapter::getData (const RefIdColumn *column, const RefIdData& data,
-    int index) const
+QVariant CSMWorld::DoorRefIdAdapter::getData(const RefIdColumn* column, const RefIdData& data, int index) const
 {
-    const Record<ESM::Door>& record = static_cast<const Record<ESM::Door>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Door)));
+    const Record<ESM::Door>& record
+        = static_cast<const Record<ESM::Door>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Door)));
 
-    if (column==mOpenSound)
-        return QString::fromUtf8 (record.get().mOpenSound.c_str());
+    if (column == mOpenSound)
+        return QString::fromUtf8(record.get().mOpenSound.c_str());
 
-    if (column==mCloseSound)
-        return QString::fromUtf8 (record.get().mCloseSound.c_str());
+    if (column == mCloseSound)
+        return QString::fromUtf8(record.get().mCloseSound.c_str());
 
-    return NameRefIdAdapter<ESM::Door>::getData (column, data, index);
+    return NameRefIdAdapter<ESM::Door>::getData(column, data, index);
 }
 
-void CSMWorld::DoorRefIdAdapter::setData (const RefIdColumn *column, RefIdData& data, int index,
-    const QVariant& value) const
+void CSMWorld::DoorRefIdAdapter::setData(
+    const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const
 {
-    Record<ESM::Door>& record = static_cast<Record<ESM::Door>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Door)));
+    Record<ESM::Door>& record
+        = static_cast<Record<ESM::Door>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Door)));
 
     ESM::Door door = record.get();
 
-    if (column==mOpenSound)
+    if (column == mOpenSound)
         door.mOpenSound = value.toString().toUtf8().constData();
-    else if (column==mCloseSound)
+    else if (column == mCloseSound)
         door.mCloseSound = value.toString().toUtf8().constData();
     else
     {
-        NameRefIdAdapter<ESM::Door>::setData (column, data, index, value);
+        NameRefIdAdapter<ESM::Door>::setData(column, data, index, value);
 
         return;
     }
@@ -584,36 +601,38 @@ void CSMWorld::DoorRefIdAdapter::setData (const RefIdColumn *column, RefIdData&
     record.setModified(door);
 }
 
-CSMWorld::LightColumns::LightColumns (const InventoryColumns& columns)
-: InventoryColumns (columns)
-, mTime(nullptr)
-, mRadius(nullptr)
-, mColor(nullptr)
-, mSound(nullptr)
-, mEmitterType(nullptr)
-{}
+CSMWorld::LightColumns::LightColumns(const InventoryColumns& columns)
+    : InventoryColumns(columns)
+    , mTime(nullptr)
+    , mRadius(nullptr)
+    , mColor(nullptr)
+    , mSound(nullptr)
+    , mEmitterType(nullptr)
+{
+}
 
-CSMWorld::LightRefIdAdapter::LightRefIdAdapter (const LightColumns& columns)
-: InventoryRefIdAdapter<ESM::Light> (UniversalId::Type_Light, columns), mColumns (columns)
-{}
+CSMWorld::LightRefIdAdapter::LightRefIdAdapter(const LightColumns& columns)
+    : InventoryRefIdAdapter<ESM::Light>(UniversalId::Type_Light, columns)
+    , mColumns(columns)
+{
+}
 
-QVariant CSMWorld::LightRefIdAdapter::getData (const RefIdColumn *column, const RefIdData& data,
-    int index) const
+QVariant CSMWorld::LightRefIdAdapter::getData(const RefIdColumn* column, const RefIdData& data, int index) const
 {
-    const Record<ESM::Light>& record = static_cast<const Record<ESM::Light>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Light)));
+    const Record<ESM::Light>& record
+        = static_cast<const Record<ESM::Light>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Light)));
 
-    if (column==mColumns.mTime)
+    if (column == mColumns.mTime)
         return record.get().mData.mTime;
 
-    if (column==mColumns.mRadius)
+    if (column == mColumns.mRadius)
         return record.get().mData.mRadius;
 
-    if (column==mColumns.mColor)
+    if (column == mColumns.mColor)
         return record.get().mData.mColor;
 
-    if (column==mColumns.mSound)
-        return QString::fromUtf8 (record.get().mSound.c_str());
+    if (column == mColumns.mSound)
+        return QString::fromUtf8(record.get().mSound.c_str());
 
     if (column == mColumns.mEmitterType)
     {
@@ -634,30 +653,29 @@ QVariant CSMWorld::LightRefIdAdapter::getData (const RefIdColumn *column, const
         return 0;
     }
 
-    std::map<const RefIdColumn *, unsigned int>::const_iterator iter =
-        mColumns.mFlags.find (column);
+    std::map<const RefIdColumn*, unsigned int>::const_iterator iter = mColumns.mFlags.find(column);
 
-    if (iter!=mColumns.mFlags.end())
-        return (record.get().mData.mFlags & iter->second)!=0;
+    if (iter != mColumns.mFlags.end())
+        return (record.get().mData.mFlags & iter->second) != 0;
 
-    return InventoryRefIdAdapter<ESM::Light>::getData (column, data, index);
+    return InventoryRefIdAdapter<ESM::Light>::getData(column, data, index);
 }
 
-void CSMWorld::LightRefIdAdapter::setData (const RefIdColumn *column, RefIdData& data, int index,
-    const QVariant& value) const
+void CSMWorld::LightRefIdAdapter::setData(
+    const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const
 {
-    Record<ESM::Light>& record = static_cast<Record<ESM::Light>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Light)));
+    Record<ESM::Light>& record
+        = static_cast<Record<ESM::Light>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Light)));
 
     ESM::Light light = record.get();
 
-    if (column==mColumns.mTime)
+    if (column == mColumns.mTime)
         light.mData.mTime = value.toInt();
-    else if (column==mColumns.mRadius)
+    else if (column == mColumns.mRadius)
         light.mData.mRadius = value.toInt();
-    else if (column==mColumns.mColor)
+    else if (column == mColumns.mColor)
         light.mData.mColor = value.toInt();
-    else if (column==mColumns.mSound)
+    else if (column == mColumns.mSound)
         light.mSound = value.toString().toUtf8().constData();
     else if (column == mColumns.mEmitterType)
     {
@@ -676,56 +694,56 @@ void CSMWorld::LightRefIdAdapter::setData (const RefIdColumn *column, RefIdData&
     }
     else
     {
-        std::map<const RefIdColumn *, unsigned int>::const_iterator iter =
-            mColumns.mFlags.find (column);
+        std::map<const RefIdColumn*, unsigned int>::const_iterator iter = mColumns.mFlags.find(column);
 
-        if (iter!=mColumns.mFlags.end())
+        if (iter != mColumns.mFlags.end())
         {
-            if (value.toInt()!=0)
+            if (value.toInt() != 0)
                 light.mData.mFlags |= iter->second;
             else
                 light.mData.mFlags &= ~iter->second;
         }
         else
         {
-            InventoryRefIdAdapter<ESM::Light>::setData (column, data, index, value);
+            InventoryRefIdAdapter<ESM::Light>::setData(column, data, index, value);
 
             return;
         }
     }
 
-    record.setModified (light);
+    record.setModified(light);
 }
 
-CSMWorld::MiscRefIdAdapter::MiscRefIdAdapter (const InventoryColumns& columns, const RefIdColumn *key)
-: InventoryRefIdAdapter<ESM::Miscellaneous> (UniversalId::Type_Miscellaneous, columns), mKey (key)
-{}
+CSMWorld::MiscRefIdAdapter::MiscRefIdAdapter(const InventoryColumns& columns, const RefIdColumn* key)
+    : InventoryRefIdAdapter<ESM::Miscellaneous>(UniversalId::Type_Miscellaneous, columns)
+    , mKey(key)
+{
+}
 
-QVariant CSMWorld::MiscRefIdAdapter::getData (const RefIdColumn *column, const RefIdData& data,
-    int index) const
+QVariant CSMWorld::MiscRefIdAdapter::getData(const RefIdColumn* column, const RefIdData& data, int index) const
 {
-    const Record<ESM::Miscellaneous>& record = static_cast<const Record<ESM::Miscellaneous>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Miscellaneous)));
+    const Record<ESM::Miscellaneous>& record = static_cast<const Record<ESM::Miscellaneous>&>(
+        data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Miscellaneous)));
 
-    if (column==mKey)
-        return record.get().mData.mIsKey!=0;
+    if (column == mKey)
+        return record.get().mData.mIsKey != 0;
 
-    return InventoryRefIdAdapter<ESM::Miscellaneous>::getData (column, data, index);
+    return InventoryRefIdAdapter<ESM::Miscellaneous>::getData(column, data, index);
 }
 
-void CSMWorld::MiscRefIdAdapter::setData (const RefIdColumn *column, RefIdData& data, int index,
-    const QVariant& value) const
+void CSMWorld::MiscRefIdAdapter::setData(
+    const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const
 {
-    Record<ESM::Miscellaneous>& record = static_cast<Record<ESM::Miscellaneous>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Miscellaneous)));
+    Record<ESM::Miscellaneous>& record = static_cast<Record<ESM::Miscellaneous>&>(
+        data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Miscellaneous)));
 
     ESM::Miscellaneous misc = record.get();
 
-    if (column==mKey)
+    if (column == mKey)
         misc.mData.mIsKey = value.toInt();
     else
     {
-        InventoryRefIdAdapter<ESM::Miscellaneous>::setData (column, data, index, value);
+        InventoryRefIdAdapter<ESM::Miscellaneous>::setData(column, data, index, value);
 
         return;
     }
@@ -733,46 +751,48 @@ void CSMWorld::MiscRefIdAdapter::setData (const RefIdColumn *column, RefIdData&
     record.setModified(misc);
 }
 
-CSMWorld::NpcColumns::NpcColumns (const ActorColumns& actorColumns)
-: ActorColumns (actorColumns),
-  mRace(nullptr),
-  mClass(nullptr),
-  mFaction(nullptr),
-  mHair(nullptr),
-  mHead(nullptr),
-  mAttributes(nullptr),
-  mSkills(nullptr),
-  mMisc(nullptr),
-  mBloodType(nullptr),
-  mGender(nullptr)
-{}
+CSMWorld::NpcColumns::NpcColumns(const ActorColumns& actorColumns)
+    : ActorColumns(actorColumns)
+    , mRace(nullptr)
+    , mClass(nullptr)
+    , mFaction(nullptr)
+    , mHair(nullptr)
+    , mHead(nullptr)
+    , mAttributes(nullptr)
+    , mSkills(nullptr)
+    , mMisc(nullptr)
+    , mBloodType(nullptr)
+    , mGender(nullptr)
+{
+}
 
-CSMWorld::NpcRefIdAdapter::NpcRefIdAdapter (const NpcColumns& columns)
-: ActorRefIdAdapter<ESM::NPC> (UniversalId::Type_Npc, columns), mColumns (columns)
-{}
+CSMWorld::NpcRefIdAdapter::NpcRefIdAdapter(const NpcColumns& columns)
+    : ActorRefIdAdapter<ESM::NPC>(UniversalId::Type_Npc, columns)
+    , mColumns(columns)
+{
+}
 
-QVariant CSMWorld::NpcRefIdAdapter::getData (const RefIdColumn *column, const RefIdData& data, int index)
-    const
+QVariant CSMWorld::NpcRefIdAdapter::getData(const RefIdColumn* column, const RefIdData& data, int index) const
 {
-    const Record<ESM::NPC>& record = static_cast<const Record<ESM::NPC>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Npc)));
+    const Record<ESM::NPC>& record
+        = static_cast<const Record<ESM::NPC>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Npc)));
 
-    if (column==mColumns.mRace)
-        return QString::fromUtf8 (record.get().mRace.c_str());
+    if (column == mColumns.mRace)
+        return QString::fromUtf8(record.get().mRace.c_str());
 
-    if (column==mColumns.mClass)
-        return QString::fromUtf8 (record.get().mClass.c_str());
+    if (column == mColumns.mClass)
+        return QString::fromUtf8(record.get().mClass.c_str());
 
-    if (column==mColumns.mFaction)
-        return QString::fromUtf8 (record.get().mFaction.c_str());
+    if (column == mColumns.mFaction)
+        return QString::fromUtf8(record.get().mFaction.c_str());
 
-    if (column==mColumns.mHair)
-        return QString::fromUtf8 (record.get().mHair.c_str());
+    if (column == mColumns.mHair)
+        return QString::fromUtf8(record.get().mHair.c_str());
 
-    if (column==mColumns.mHead)
-        return QString::fromUtf8 (record.get().mHead.c_str());
+    if (column == mColumns.mHead)
+        return QString::fromUtf8(record.get().mHead.c_str());
 
-    if (column==mColumns.mAttributes || column==mColumns.mSkills)
+    if (column == mColumns.mAttributes || column == mColumns.mSkills)
     {
         if ((record.get().mFlags & ESM::NPC::Autocalc) != 0)
             return QVariant::fromValue(ColumnBase::TableEdit_None);
@@ -780,7 +800,7 @@ QVariant CSMWorld::NpcRefIdAdapter::getData (const RefIdColumn *column, const Re
             return QVariant::fromValue(ColumnBase::TableEdit_FixedRows);
     }
 
-    if (column==mColumns.mMisc)
+    if (column == mColumns.mMisc)
         return QVariant::fromValue(ColumnBase::TableEdit_Full);
 
     if (column == mColumns.mBloodType)
@@ -795,32 +815,31 @@ QVariant CSMWorld::NpcRefIdAdapter::getData (const RefIdColumn *column, const Re
         return 0;
     }
 
-    std::map<const RefIdColumn *, unsigned int>::const_iterator iter =
-        mColumns.mFlags.find (column);
+    std::map<const RefIdColumn*, unsigned int>::const_iterator iter = mColumns.mFlags.find(column);
 
-    if (iter!=mColumns.mFlags.end())
-        return (record.get().mFlags & iter->second)!=0;
+    if (iter != mColumns.mFlags.end())
+        return (record.get().mFlags & iter->second) != 0;
 
-    return ActorRefIdAdapter<ESM::NPC>::getData (column, data, index);
+    return ActorRefIdAdapter<ESM::NPC>::getData(column, data, index);
 }
 
-void CSMWorld::NpcRefIdAdapter::setData (const RefIdColumn *column, RefIdData& data, int index,
-    const QVariant& value) const
+void CSMWorld::NpcRefIdAdapter::setData(
+    const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const
 {
-    Record<ESM::NPC>& record = static_cast<Record<ESM::NPC>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Npc)));
+    Record<ESM::NPC>& record
+        = static_cast<Record<ESM::NPC>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Npc)));
 
     ESM::NPC npc = record.get();
 
-    if (column==mColumns.mRace)
+    if (column == mColumns.mRace)
         npc.mRace = value.toString().toUtf8().constData();
-    else if (column==mColumns.mClass)
+    else if (column == mColumns.mClass)
         npc.mClass = value.toString().toUtf8().constData();
-    else if (column==mColumns.mFaction)
+    else if (column == mColumns.mFaction)
         npc.mFaction = value.toString().toUtf8().constData();
-    else if (column==mColumns.mHair)
+    else if (column == mColumns.mHair)
         npc.mHair = value.toString().toUtf8().constData();
-    else if (column==mColumns.mHead)
+    else if (column == mColumns.mHead)
         npc.mHead = value.toString().toUtf8().constData();
     else if (column == mColumns.mBloodType)
         npc.mBloodType = value.toInt();
@@ -834,78 +853,75 @@ void CSMWorld::NpcRefIdAdapter::setData (const RefIdColumn *column, RefIdData& d
     }
     else
     {
-        std::map<const RefIdColumn *, unsigned int>::const_iterator iter =
-            mColumns.mFlags.find (column);
+        std::map<const RefIdColumn*, unsigned int>::const_iterator iter = mColumns.mFlags.find(column);
 
-        if (iter!=mColumns.mFlags.end())
+        if (iter != mColumns.mFlags.end())
         {
-            if (value.toInt()!=0)
+            if (value.toInt() != 0)
                 npc.mFlags |= iter->second;
             else
                 npc.mFlags &= ~iter->second;
 
             if (iter->second == ESM::NPC::Autocalc)
-                npc.mNpdtType = (value.toInt() != 0) ? ESM::NPC::NPC_WITH_AUTOCALCULATED_STATS
-                                                     : ESM::NPC::NPC_DEFAULT;
+                npc.mNpdtType = (value.toInt() != 0) ? ESM::NPC::NPC_WITH_AUTOCALCULATED_STATS : ESM::NPC::NPC_DEFAULT;
         }
         else
         {
-            ActorRefIdAdapter<ESM::NPC>::setData (column, data, index, value);
+            ActorRefIdAdapter<ESM::NPC>::setData(column, data, index, value);
 
             return;
         }
     }
 
-    record.setModified (npc);
+    record.setModified(npc);
 }
 
-CSMWorld::NpcAttributesRefIdAdapter::NpcAttributesRefIdAdapter ()
-{}
+CSMWorld::NpcAttributesRefIdAdapter::NpcAttributesRefIdAdapter() {}
 
-void CSMWorld::NpcAttributesRefIdAdapter::addNestedRow (const RefIdColumn *column,
-        RefIdData& data, int index, int position) const
+void CSMWorld::NpcAttributesRefIdAdapter::addNestedRow(
+    const RefIdColumn* column, RefIdData& data, int index, int position) const
 {
     // Do nothing, this table cannot be changed by the user
 }
 
-void CSMWorld::NpcAttributesRefIdAdapter::removeNestedRow (const RefIdColumn *column,
-        RefIdData& data, int index, int rowToRemove) const
+void CSMWorld::NpcAttributesRefIdAdapter::removeNestedRow(
+    const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const
 {
     // Do nothing, this table cannot be changed by the user
 }
 
-void CSMWorld::NpcAttributesRefIdAdapter::setNestedTable (const RefIdColumn* column,
-        RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const
+void CSMWorld::NpcAttributesRefIdAdapter::setNestedTable(
+    const RefIdColumn* column, RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const
 {
-    Record<ESM::NPC>& record =
-        static_cast<Record<ESM::NPC>&> (data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Npc)));
+    Record<ESM::NPC>& record
+        = static_cast<Record<ESM::NPC>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Npc)));
     ESM::NPC npc = record.get();
 
     // store the whole struct
-    npc.mNpdt =
-        static_cast<const NestedTableWrapper<std::vector<ESM::NPC::NPDTstruct52> > &>(nestedTable).mNestedTable.at(0);
+    npc.mNpdt
+        = static_cast<const NestedTableWrapper<std::vector<ESM::NPC::NPDTstruct52>>&>(nestedTable).mNestedTable.at(0);
 
-    record.setModified (npc);
+    record.setModified(npc);
 }
 
-CSMWorld::NestedTableWrapperBase* CSMWorld::NpcAttributesRefIdAdapter::nestedTable (const RefIdColumn* column,
-        const RefIdData& data, int index) const
+CSMWorld::NestedTableWrapperBase* CSMWorld::NpcAttributesRefIdAdapter::nestedTable(
+    const RefIdColumn* column, const RefIdData& data, int index) const
 {
-    const Record<ESM::NPC>& record =
-        static_cast<const Record<ESM::NPC>&> (data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Npc)));
+    const Record<ESM::NPC>& record
+        = static_cast<const Record<ESM::NPC>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Npc)));
 
     // return the whole struct
     std::vector<ESM::NPC::NPDTstruct52> wrap;
     wrap.push_back(record.get().mNpdt);
     // deleted by dtor of NestedTableStoring
-    return new NestedTableWrapper<std::vector<ESM::NPC::NPDTstruct52> >(wrap);
+    return new NestedTableWrapper<std::vector<ESM::NPC::NPDTstruct52>>(wrap);
 }
 
-QVariant CSMWorld::NpcAttributesRefIdAdapter::getNestedData (const RefIdColumn *column,
-        const RefIdData& data, int index, int subRowIndex, int subColIndex) const
+QVariant CSMWorld::NpcAttributesRefIdAdapter::getNestedData(
+    const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex, int subColIndex) const
 {
-    const Record<ESM::NPC>& record =
-        static_cast<const Record<ESM::NPC>&> (data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Npc)));
+    const Record<ESM::NPC>& record
+        = static_cast<const Record<ESM::NPC>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Npc)));
 
     const ESM::NPC::NPDTstruct52& npcStruct = record.get().mNpdt;
 
@@ -914,110 +930,136 @@ QVariant CSMWorld::NpcAttributesRefIdAdapter::getNestedData (const RefIdColumn *
     else if (subColIndex == 1)
         switch (subRowIndex)
         {
-            case 0: return static_cast<int>(npcStruct.mStrength);
-            case 1: return static_cast<int>(npcStruct.mIntelligence);
-            case 2: return static_cast<int>(npcStruct.mWillpower);
-            case 3: return static_cast<int>(npcStruct.mAgility);
-            case 4: return static_cast<int>(npcStruct.mSpeed);
-            case 5: return static_cast<int>(npcStruct.mEndurance);
-            case 6: return static_cast<int>(npcStruct.mPersonality);
-            case 7: return static_cast<int>(npcStruct.mLuck);
-            default: return QVariant(); // throw an exception here?
+            case 0:
+                return static_cast<int>(npcStruct.mStrength);
+            case 1:
+                return static_cast<int>(npcStruct.mIntelligence);
+            case 2:
+                return static_cast<int>(npcStruct.mWillpower);
+            case 3:
+                return static_cast<int>(npcStruct.mAgility);
+            case 4:
+                return static_cast<int>(npcStruct.mSpeed);
+            case 5:
+                return static_cast<int>(npcStruct.mEndurance);
+            case 6:
+                return static_cast<int>(npcStruct.mPersonality);
+            case 7:
+                return static_cast<int>(npcStruct.mLuck);
+            default:
+                return QVariant(); // throw an exception here?
         }
     else
         return QVariant(); // throw an exception here?
 }
 
-void CSMWorld::NpcAttributesRefIdAdapter::setNestedData (const RefIdColumn *column,
-        RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const
+void CSMWorld::NpcAttributesRefIdAdapter::setNestedData(
+    const RefIdColumn* column, RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const
 {
-    Record<ESM::NPC>& record =
-        static_cast<Record<ESM::NPC>&> (data.getRecord (RefIdData::LocalIndex (row, UniversalId::Type_Npc)));
+    Record<ESM::NPC>& record
+        = static_cast<Record<ESM::NPC>&>(data.getRecord(RefIdData::LocalIndex(row, UniversalId::Type_Npc)));
     ESM::NPC npc = record.get();
     ESM::NPC::NPDTstruct52& npcStruct = npc.mNpdt;
 
     if (subColIndex == 1)
-        switch(subRowIndex)
+        switch (subRowIndex)
         {
-            case 0: npcStruct.mStrength = static_cast<unsigned char>(value.toInt()); break;
-            case 1: npcStruct.mIntelligence = static_cast<unsigned char>(value.toInt()); break;
-            case 2: npcStruct.mWillpower = static_cast<unsigned char>(value.toInt()); break;
-            case 3: npcStruct.mAgility = static_cast<unsigned char>(value.toInt()); break;
-            case 4: npcStruct.mSpeed = static_cast<unsigned char>(value.toInt()); break;
-            case 5: npcStruct.mEndurance = static_cast<unsigned char>(value.toInt()); break;
-            case 6: npcStruct.mPersonality = static_cast<unsigned char>(value.toInt()); break;
-            case 7: npcStruct.mLuck = static_cast<unsigned char>(value.toInt()); break;
-            default: return; // throw an exception here?
+            case 0:
+                npcStruct.mStrength = static_cast<unsigned char>(value.toInt());
+                break;
+            case 1:
+                npcStruct.mIntelligence = static_cast<unsigned char>(value.toInt());
+                break;
+            case 2:
+                npcStruct.mWillpower = static_cast<unsigned char>(value.toInt());
+                break;
+            case 3:
+                npcStruct.mAgility = static_cast<unsigned char>(value.toInt());
+                break;
+            case 4:
+                npcStruct.mSpeed = static_cast<unsigned char>(value.toInt());
+                break;
+            case 5:
+                npcStruct.mEndurance = static_cast<unsigned char>(value.toInt());
+                break;
+            case 6:
+                npcStruct.mPersonality = static_cast<unsigned char>(value.toInt());
+                break;
+            case 7:
+                npcStruct.mLuck = static_cast<unsigned char>(value.toInt());
+                break;
+            default:
+                return; // throw an exception here?
         }
     else
         return; // throw an exception here?
 
-    record.setModified (npc);
+    record.setModified(npc);
 }
 
-int CSMWorld::NpcAttributesRefIdAdapter::getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const
+int CSMWorld::NpcAttributesRefIdAdapter::getNestedColumnsCount(const RefIdColumn* column, const RefIdData& data) const
 {
     return 2;
 }
 
-int CSMWorld::NpcAttributesRefIdAdapter::getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const
+int CSMWorld::NpcAttributesRefIdAdapter::getNestedRowsCount(
+    const RefIdColumn* column, const RefIdData& data, int index) const
 {
     // There are 8 attributes
     return 8;
 }
 
-CSMWorld::NpcSkillsRefIdAdapter::NpcSkillsRefIdAdapter ()
-{}
+CSMWorld::NpcSkillsRefIdAdapter::NpcSkillsRefIdAdapter() {}
 
-void CSMWorld::NpcSkillsRefIdAdapter::addNestedRow (const RefIdColumn *column,
-        RefIdData& data, int index, int position) const
+void CSMWorld::NpcSkillsRefIdAdapter::addNestedRow(
+    const RefIdColumn* column, RefIdData& data, int index, int position) const
 {
     // Do nothing, this table cannot be changed by the user
 }
 
-void CSMWorld::NpcSkillsRefIdAdapter::removeNestedRow (const RefIdColumn *column,
-        RefIdData& data, int index, int rowToRemove) const
+void CSMWorld::NpcSkillsRefIdAdapter::removeNestedRow(
+    const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const
 {
     // Do nothing, this table cannot be changed by the user
 }
 
-void CSMWorld::NpcSkillsRefIdAdapter::setNestedTable (const RefIdColumn* column,
-        RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const
+void CSMWorld::NpcSkillsRefIdAdapter::setNestedTable(
+    const RefIdColumn* column, RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const
 {
-    Record<ESM::NPC>& record =
-        static_cast<Record<ESM::NPC>&> (data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Npc)));
+    Record<ESM::NPC>& record
+        = static_cast<Record<ESM::NPC>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Npc)));
     ESM::NPC npc = record.get();
 
     // store the whole struct
-    npc.mNpdt =
-        static_cast<const NestedTableWrapper<std::vector<ESM::NPC::NPDTstruct52> > &>(nestedTable).mNestedTable.at(0);
+    npc.mNpdt
+        = static_cast<const NestedTableWrapper<std::vector<ESM::NPC::NPDTstruct52>>&>(nestedTable).mNestedTable.at(0);
 
-    record.setModified (npc);
+    record.setModified(npc);
 }
 
-CSMWorld::NestedTableWrapperBase* CSMWorld::NpcSkillsRefIdAdapter::nestedTable (const RefIdColumn* column,
-        const RefIdData& data, int index) const
+CSMWorld::NestedTableWrapperBase* CSMWorld::NpcSkillsRefIdAdapter::nestedTable(
+    const RefIdColumn* column, const RefIdData& data, int index) const
 {
-    const Record<ESM::NPC>& record =
-        static_cast<const Record<ESM::NPC>&> (data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Npc)));
+    const Record<ESM::NPC>& record
+        = static_cast<const Record<ESM::NPC>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Npc)));
 
     // return the whole struct
     std::vector<ESM::NPC::NPDTstruct52> wrap;
     wrap.push_back(record.get().mNpdt);
     // deleted by dtor of NestedTableStoring
-    return new NestedTableWrapper<std::vector<ESM::NPC::NPDTstruct52> >(wrap);
+    return new NestedTableWrapper<std::vector<ESM::NPC::NPDTstruct52>>(wrap);
 }
 
-QVariant CSMWorld::NpcSkillsRefIdAdapter::getNestedData (const RefIdColumn *column,
-        const RefIdData& data, int index, int subRowIndex, int subColIndex) const
+QVariant CSMWorld::NpcSkillsRefIdAdapter::getNestedData(
+    const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex, int subColIndex) const
 {
-    const Record<ESM::NPC>& record =
-        static_cast<const Record<ESM::NPC>&> (data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Npc)));
+    const Record<ESM::NPC>& record
+        = static_cast<const Record<ESM::NPC>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Npc)));
 
     const ESM::NPC::NPDTstruct52& npcStruct = record.get().mNpdt;
 
     if (subRowIndex < 0 || subRowIndex >= ESM::Skill::Length)
-        throw std::runtime_error ("index out of range");
+        throw std::runtime_error("index out of range");
 
     if (subColIndex == 0)
         return subRowIndex;
@@ -1027,198 +1069,245 @@ QVariant CSMWorld::NpcSkillsRefIdAdapter::getNestedData (const RefIdColumn *colu
         return QVariant(); // throw an exception here?
 }
 
-void CSMWorld::NpcSkillsRefIdAdapter::setNestedData (const RefIdColumn *column,
-        RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const
+void CSMWorld::NpcSkillsRefIdAdapter::setNestedData(
+    const RefIdColumn* column, RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const
 {
-    Record<ESM::NPC>& record =
-        static_cast<Record<ESM::NPC>&> (data.getRecord (RefIdData::LocalIndex (row, UniversalId::Type_Npc)));
+    Record<ESM::NPC>& record
+        = static_cast<Record<ESM::NPC>&>(data.getRecord(RefIdData::LocalIndex(row, UniversalId::Type_Npc)));
     ESM::NPC npc = record.get();
     ESM::NPC::NPDTstruct52& npcStruct = npc.mNpdt;
 
     if (subRowIndex < 0 || subRowIndex >= ESM::Skill::Length)
-        throw std::runtime_error ("index out of range");
+        throw std::runtime_error("index out of range");
 
     if (subColIndex == 1)
         npcStruct.mSkills[subRowIndex] = static_cast<unsigned char>(value.toInt());
     else
         return; // throw an exception here?
 
-    record.setModified (npc);
+    record.setModified(npc);
 }
 
-int CSMWorld::NpcSkillsRefIdAdapter::getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const
+int CSMWorld::NpcSkillsRefIdAdapter::getNestedColumnsCount(const RefIdColumn* column, const RefIdData& data) const
 {
     return 2;
 }
 
-int CSMWorld::NpcSkillsRefIdAdapter::getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const
+int CSMWorld::NpcSkillsRefIdAdapter::getNestedRowsCount(
+    const RefIdColumn* column, const RefIdData& data, int index) const
 {
     // There are 27 skills
     return ESM::Skill::Length;
 }
 
-CSMWorld::NpcMiscRefIdAdapter::NpcMiscRefIdAdapter ()
-{}
+CSMWorld::NpcMiscRefIdAdapter::NpcMiscRefIdAdapter() {}
 
-CSMWorld::NpcMiscRefIdAdapter::~NpcMiscRefIdAdapter()
-{}
+CSMWorld::NpcMiscRefIdAdapter::~NpcMiscRefIdAdapter() {}
 
-void CSMWorld::NpcMiscRefIdAdapter::addNestedRow (const RefIdColumn *column,
-        RefIdData& data, int index, int position) const
+void CSMWorld::NpcMiscRefIdAdapter::addNestedRow(
+    const RefIdColumn* column, RefIdData& data, int index, int position) const
 {
-    throw std::logic_error ("cannot add a row to a fixed table");
+    throw std::logic_error("cannot add a row to a fixed table");
 }
 
-void CSMWorld::NpcMiscRefIdAdapter::removeNestedRow (const RefIdColumn *column,
-        RefIdData& data, int index, int rowToRemove) const
+void CSMWorld::NpcMiscRefIdAdapter::removeNestedRow(
+    const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const
 {
-    throw std::logic_error ("cannot remove a row to a fixed table");
+    throw std::logic_error("cannot remove a row to a fixed table");
 }
 
-void CSMWorld::NpcMiscRefIdAdapter::setNestedTable (const RefIdColumn* column,
-        RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const
+void CSMWorld::NpcMiscRefIdAdapter::setNestedTable(
+    const RefIdColumn* column, RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const
 {
-    throw std::logic_error ("table operation not supported");
+    throw std::logic_error("table operation not supported");
 }
 
-CSMWorld::NestedTableWrapperBase* CSMWorld::NpcMiscRefIdAdapter::nestedTable (const RefIdColumn* column,
-        const RefIdData& data, int index) const
+CSMWorld::NestedTableWrapperBase* CSMWorld::NpcMiscRefIdAdapter::nestedTable(
+    const RefIdColumn* column, const RefIdData& data, int index) const
 {
-    throw std::logic_error ("table operation not supported");
+    throw std::logic_error("table operation not supported");
 }
 
-QVariant CSMWorld::NpcMiscRefIdAdapter::getNestedData (const RefIdColumn *column,
-        const RefIdData& data, int index, int subRowIndex, int subColIndex) const
+QVariant CSMWorld::NpcMiscRefIdAdapter::getNestedData(
+    const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex, int subColIndex) const
 {
-    const Record<ESM::NPC>& record =
-        static_cast<const Record<ESM::NPC>&> (data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Npc)));
+    const Record<ESM::NPC>& record
+        = static_cast<const Record<ESM::NPC>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Npc)));
 
     bool autoCalc = (record.get().mFlags & ESM::NPC::Autocalc) != 0;
 
     if (autoCalc)
         switch (subColIndex)
         {
-            case 0: return static_cast<int>(record.get().mNpdt.mLevel);
-            case 1: return QVariant(QVariant::UserType);
-            case 2: return QVariant(QVariant::UserType);
-            case 3: return QVariant(QVariant::UserType);
-            case 4: return static_cast<int>(record.get().mNpdt.mDisposition);
-            case 5: return static_cast<int>(record.get().mNpdt.mReputation);
-            case 6: return static_cast<int>(record.get().mNpdt.mRank);
-            case 7: return record.get().mNpdt.mGold;
-            default: return QVariant(); // throw an exception here?
+            case 0:
+                return static_cast<int>(record.get().mNpdt.mLevel);
+            case 1:
+                return QVariant(QVariant::UserType);
+            case 2:
+                return QVariant(QVariant::UserType);
+            case 3:
+                return QVariant(QVariant::UserType);
+            case 4:
+                return static_cast<int>(record.get().mNpdt.mDisposition);
+            case 5:
+                return static_cast<int>(record.get().mNpdt.mReputation);
+            case 6:
+                return static_cast<int>(record.get().mNpdt.mRank);
+            case 7:
+                return record.get().mNpdt.mGold;
+            default:
+                return QVariant(); // throw an exception here?
         }
     else
         switch (subColIndex)
         {
-            case 0: return static_cast<int>(record.get().mNpdt.mLevel);
-            case 1: return static_cast<int>(record.get().mNpdt.mHealth);
-            case 2: return static_cast<int>(record.get().mNpdt.mMana);
-            case 3: return static_cast<int>(record.get().mNpdt.mFatigue);
-            case 4: return static_cast<int>(record.get().mNpdt.mDisposition);
-            case 5: return static_cast<int>(record.get().mNpdt.mReputation);
-            case 6: return static_cast<int>(record.get().mNpdt.mRank);
-            case 7: return record.get().mNpdt.mGold;
-            default: return QVariant(); // throw an exception here?
+            case 0:
+                return static_cast<int>(record.get().mNpdt.mLevel);
+            case 1:
+                return static_cast<int>(record.get().mNpdt.mHealth);
+            case 2:
+                return static_cast<int>(record.get().mNpdt.mMana);
+            case 3:
+                return static_cast<int>(record.get().mNpdt.mFatigue);
+            case 4:
+                return static_cast<int>(record.get().mNpdt.mDisposition);
+            case 5:
+                return static_cast<int>(record.get().mNpdt.mReputation);
+            case 6:
+                return static_cast<int>(record.get().mNpdt.mRank);
+            case 7:
+                return record.get().mNpdt.mGold;
+            default:
+                return QVariant(); // throw an exception here?
         }
 }
 
-void CSMWorld::NpcMiscRefIdAdapter::setNestedData (const RefIdColumn *column,
-        RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const
+void CSMWorld::NpcMiscRefIdAdapter::setNestedData(
+    const RefIdColumn* column, RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const
 {
-    Record<ESM::NPC>& record =
-        static_cast<Record<ESM::NPC>&> (data.getRecord (RefIdData::LocalIndex (row, UniversalId::Type_Npc)));
+    Record<ESM::NPC>& record
+        = static_cast<Record<ESM::NPC>&>(data.getRecord(RefIdData::LocalIndex(row, UniversalId::Type_Npc)));
     ESM::NPC npc = record.get();
 
     bool autoCalc = (record.get().mFlags & ESM::NPC::Autocalc) != 0;
 
     if (autoCalc)
-        switch(subColIndex)
+        switch (subColIndex)
         {
-            case 0: npc.mNpdt.mLevel = static_cast<short>(value.toInt()); break;
-            case 1: return;
-            case 2: return;
-            case 3: return;
-            case 4: npc.mNpdt.mDisposition = static_cast<signed char>(value.toInt()); break;
-            case 5: npc.mNpdt.mReputation = static_cast<signed char>(value.toInt()); break;
-            case 6: npc.mNpdt.mRank = static_cast<signed char>(value.toInt()); break;
-            case 7: npc.mNpdt.mGold = value.toInt(); break;
-            default: return; // throw an exception here?
+            case 0:
+                npc.mNpdt.mLevel = static_cast<short>(value.toInt());
+                break;
+            case 1:
+                return;
+            case 2:
+                return;
+            case 3:
+                return;
+            case 4:
+                npc.mNpdt.mDisposition = static_cast<signed char>(value.toInt());
+                break;
+            case 5:
+                npc.mNpdt.mReputation = static_cast<signed char>(value.toInt());
+                break;
+            case 6:
+                npc.mNpdt.mRank = static_cast<signed char>(value.toInt());
+                break;
+            case 7:
+                npc.mNpdt.mGold = value.toInt();
+                break;
+            default:
+                return; // throw an exception here?
         }
     else
-        switch(subColIndex)
+        switch (subColIndex)
         {
-            case 0: npc.mNpdt.mLevel = static_cast<short>(value.toInt()); break;
-            case 1: npc.mNpdt.mHealth = static_cast<unsigned short>(value.toInt()); break;
-            case 2: npc.mNpdt.mMana = static_cast<unsigned short>(value.toInt()); break;
-            case 3: npc.mNpdt.mFatigue = static_cast<unsigned short>(value.toInt()); break;
-            case 4: npc.mNpdt.mDisposition = static_cast<signed char>(value.toInt()); break;
-            case 5: npc.mNpdt.mReputation = static_cast<signed char>(value.toInt()); break;
-            case 6: npc.mNpdt.mRank = static_cast<signed char>(value.toInt()); break;
-            case 7: npc.mNpdt.mGold = value.toInt(); break;
-            default: return; // throw an exception here?
+            case 0:
+                npc.mNpdt.mLevel = static_cast<short>(value.toInt());
+                break;
+            case 1:
+                npc.mNpdt.mHealth = static_cast<unsigned short>(value.toInt());
+                break;
+            case 2:
+                npc.mNpdt.mMana = static_cast<unsigned short>(value.toInt());
+                break;
+            case 3:
+                npc.mNpdt.mFatigue = static_cast<unsigned short>(value.toInt());
+                break;
+            case 4:
+                npc.mNpdt.mDisposition = static_cast<signed char>(value.toInt());
+                break;
+            case 5:
+                npc.mNpdt.mReputation = static_cast<signed char>(value.toInt());
+                break;
+            case 6:
+                npc.mNpdt.mRank = static_cast<signed char>(value.toInt());
+                break;
+            case 7:
+                npc.mNpdt.mGold = value.toInt();
+                break;
+            default:
+                return; // throw an exception here?
         }
 
-    record.setModified (npc);
+    record.setModified(npc);
 }
 
-int CSMWorld::NpcMiscRefIdAdapter::getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const
+int CSMWorld::NpcMiscRefIdAdapter::getNestedColumnsCount(const RefIdColumn* column, const RefIdData& data) const
 {
     return 8; // Level, Health, Mana, Fatigue, Disposition, Reputation, Rank, Gold
 }
 
-int CSMWorld::NpcMiscRefIdAdapter::getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const
+int CSMWorld::NpcMiscRefIdAdapter::getNestedRowsCount(const RefIdColumn* column, const RefIdData& data, int index) const
 {
     return 1; // fixed at size 1
 }
 
-CSMWorld::CreatureAttributesRefIdAdapter::CreatureAttributesRefIdAdapter()
-{}
+CSMWorld::CreatureAttributesRefIdAdapter::CreatureAttributesRefIdAdapter() {}
 
-void CSMWorld::CreatureAttributesRefIdAdapter::addNestedRow (const RefIdColumn *column,
-        RefIdData& data, int index, int position) const
+void CSMWorld::CreatureAttributesRefIdAdapter::addNestedRow(
+    const RefIdColumn* column, RefIdData& data, int index, int position) const
 {
     // Do nothing, this table cannot be changed by the user
 }
 
-void CSMWorld::CreatureAttributesRefIdAdapter::removeNestedRow (const RefIdColumn *column,
-        RefIdData& data, int index, int rowToRemove) const
+void CSMWorld::CreatureAttributesRefIdAdapter::removeNestedRow(
+    const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const
 {
     // Do nothing, this table cannot be changed by the user
 }
 
-void CSMWorld::CreatureAttributesRefIdAdapter::setNestedTable (const RefIdColumn* column,
-        RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const
+void CSMWorld::CreatureAttributesRefIdAdapter::setNestedTable(
+    const RefIdColumn* column, RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const
 {
-    Record<ESM::Creature>& record =
-        static_cast<Record<ESM::Creature>&> (data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Creature)));
+    Record<ESM::Creature>& record
+        = static_cast<Record<ESM::Creature>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Creature)));
     ESM::Creature creature = record.get();
 
     // store the whole struct
-    creature.mData =
-        static_cast<const NestedTableWrapper<std::vector<ESM::Creature::NPDTstruct> > &>(nestedTable).mNestedTable.at(0);
+    creature.mData = static_cast<const NestedTableWrapper<std::vector<ESM::Creature::NPDTstruct>>&>(nestedTable)
+                         .mNestedTable.at(0);
 
-    record.setModified (creature);
+    record.setModified(creature);
 }
 
-CSMWorld::NestedTableWrapperBase* CSMWorld::CreatureAttributesRefIdAdapter::nestedTable (const RefIdColumn* column,
-        const RefIdData& data, int index) const
+CSMWorld::NestedTableWrapperBase* CSMWorld::CreatureAttributesRefIdAdapter::nestedTable(
+    const RefIdColumn* column, const RefIdData& data, int index) const
 {
-    const Record<ESM::Creature>& record =
-        static_cast<const Record<ESM::Creature>&> (data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Creature)));
+    const Record<ESM::Creature>& record = static_cast<const Record<ESM::Creature>&>(
+        data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Creature)));
 
     // return the whole struct
     std::vector<ESM::Creature::NPDTstruct> wrap;
     wrap.push_back(record.get().mData);
     // deleted by dtor of NestedTableStoring
-    return new NestedTableWrapper<std::vector<ESM::Creature::NPDTstruct> >(wrap);
+    return new NestedTableWrapper<std::vector<ESM::Creature::NPDTstruct>>(wrap);
 }
 
-QVariant CSMWorld::CreatureAttributesRefIdAdapter::getNestedData (const RefIdColumn *column,
-        const RefIdData& data, int index, int subRowIndex, int subColIndex) const
+QVariant CSMWorld::CreatureAttributesRefIdAdapter::getNestedData(
+    const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex, int subColIndex) const
 {
-    const Record<ESM::Creature>& record =
-        static_cast<const Record<ESM::Creature>&> (data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Creature)));
+    const Record<ESM::Creature>& record = static_cast<const Record<ESM::Creature>&>(
+        data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Creature)));
 
     const ESM::Creature& creature = record.get();
 
@@ -1227,331 +1316,387 @@ QVariant CSMWorld::CreatureAttributesRefIdAdapter::getNestedData (const RefIdCol
     else if (subColIndex == 1)
         switch (subRowIndex)
         {
-            case 0: return creature.mData.mStrength;
-            case 1: return creature.mData.mIntelligence;
-            case 2: return creature.mData.mWillpower;
-            case 3: return creature.mData.mAgility;
-            case 4: return creature.mData.mSpeed;
-            case 5: return creature.mData.mEndurance;
-            case 6: return creature.mData.mPersonality;
-            case 7: return creature.mData.mLuck;
-            default: return QVariant(); // throw an exception here?
+            case 0:
+                return creature.mData.mStrength;
+            case 1:
+                return creature.mData.mIntelligence;
+            case 2:
+                return creature.mData.mWillpower;
+            case 3:
+                return creature.mData.mAgility;
+            case 4:
+                return creature.mData.mSpeed;
+            case 5:
+                return creature.mData.mEndurance;
+            case 6:
+                return creature.mData.mPersonality;
+            case 7:
+                return creature.mData.mLuck;
+            default:
+                return QVariant(); // throw an exception here?
         }
     else
         return QVariant(); // throw an exception here?
 }
 
-void CSMWorld::CreatureAttributesRefIdAdapter::setNestedData (const RefIdColumn *column,
-        RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const
+void CSMWorld::CreatureAttributesRefIdAdapter::setNestedData(
+    const RefIdColumn* column, RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const
 {
-    Record<ESM::Creature>& record =
-        static_cast<Record<ESM::Creature>&> (data.getRecord (RefIdData::LocalIndex (row, UniversalId::Type_Creature)));
+    Record<ESM::Creature>& record
+        = static_cast<Record<ESM::Creature>&>(data.getRecord(RefIdData::LocalIndex(row, UniversalId::Type_Creature)));
     ESM::Creature creature = record.get();
 
     if (subColIndex == 1)
-        switch(subRowIndex)
+        switch (subRowIndex)
         {
-            case 0: creature.mData.mStrength = value.toInt(); break;
-            case 1: creature.mData.mIntelligence = value.toInt(); break;
-            case 2: creature.mData.mWillpower = value.toInt(); break;
-            case 3: creature.mData.mAgility = value.toInt(); break;
-            case 4: creature.mData.mSpeed = value.toInt(); break;
-            case 5: creature.mData.mEndurance = value.toInt(); break;
-            case 6: creature.mData.mPersonality = value.toInt(); break;
-            case 7: creature.mData.mLuck = value.toInt(); break;
-            default: return; // throw an exception here?
+            case 0:
+                creature.mData.mStrength = value.toInt();
+                break;
+            case 1:
+                creature.mData.mIntelligence = value.toInt();
+                break;
+            case 2:
+                creature.mData.mWillpower = value.toInt();
+                break;
+            case 3:
+                creature.mData.mAgility = value.toInt();
+                break;
+            case 4:
+                creature.mData.mSpeed = value.toInt();
+                break;
+            case 5:
+                creature.mData.mEndurance = value.toInt();
+                break;
+            case 6:
+                creature.mData.mPersonality = value.toInt();
+                break;
+            case 7:
+                creature.mData.mLuck = value.toInt();
+                break;
+            default:
+                return; // throw an exception here?
         }
     else
         return; // throw an exception here?
 
-    record.setModified (creature);
+    record.setModified(creature);
 }
 
-int CSMWorld::CreatureAttributesRefIdAdapter::getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const
+int CSMWorld::CreatureAttributesRefIdAdapter::getNestedColumnsCount(
+    const RefIdColumn* column, const RefIdData& data) const
 {
     return 2;
 }
 
-int CSMWorld::CreatureAttributesRefIdAdapter::getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const
+int CSMWorld::CreatureAttributesRefIdAdapter::getNestedRowsCount(
+    const RefIdColumn* column, const RefIdData& data, int index) const
 {
     // There are 8 attributes
     return 8;
 }
 
-CSMWorld::CreatureAttackRefIdAdapter::CreatureAttackRefIdAdapter()
-{}
+CSMWorld::CreatureAttackRefIdAdapter::CreatureAttackRefIdAdapter() {}
 
-void CSMWorld::CreatureAttackRefIdAdapter::addNestedRow (const RefIdColumn *column,
-        RefIdData& data, int index, int position) const
+void CSMWorld::CreatureAttackRefIdAdapter::addNestedRow(
+    const RefIdColumn* column, RefIdData& data, int index, int position) const
 {
     // Do nothing, this table cannot be changed by the user
 }
 
-void CSMWorld::CreatureAttackRefIdAdapter::removeNestedRow (const RefIdColumn *column,
-        RefIdData& data, int index, int rowToRemove) const
+void CSMWorld::CreatureAttackRefIdAdapter::removeNestedRow(
+    const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const
 {
     // Do nothing, this table cannot be changed by the user
 }
 
-void CSMWorld::CreatureAttackRefIdAdapter::setNestedTable (const RefIdColumn* column,
-        RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const
+void CSMWorld::CreatureAttackRefIdAdapter::setNestedTable(
+    const RefIdColumn* column, RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const
 {
-    Record<ESM::Creature>& record =
-        static_cast<Record<ESM::Creature>&> (data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Creature)));
+    Record<ESM::Creature>& record
+        = static_cast<Record<ESM::Creature>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Creature)));
     ESM::Creature creature = record.get();
 
     // store the whole struct
-    creature.mData =
-        static_cast<const NestedTableWrapper<std::vector<ESM::Creature::NPDTstruct> > &>(nestedTable).mNestedTable.at(0);
+    creature.mData = static_cast<const NestedTableWrapper<std::vector<ESM::Creature::NPDTstruct>>&>(nestedTable)
+                         .mNestedTable.at(0);
 
-    record.setModified (creature);
+    record.setModified(creature);
 }
 
-CSMWorld::NestedTableWrapperBase* CSMWorld::CreatureAttackRefIdAdapter::nestedTable (const RefIdColumn* column,
-        const RefIdData& data, int index) const
+CSMWorld::NestedTableWrapperBase* CSMWorld::CreatureAttackRefIdAdapter::nestedTable(
+    const RefIdColumn* column, const RefIdData& data, int index) const
 {
-    const Record<ESM::Creature>& record =
-        static_cast<const Record<ESM::Creature>&> (data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Creature)));
+    const Record<ESM::Creature>& record = static_cast<const Record<ESM::Creature>&>(
+        data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Creature)));
 
     // return the whole struct
     std::vector<ESM::Creature::NPDTstruct> wrap;
     wrap.push_back(record.get().mData);
     // deleted by dtor of NestedTableStoring
-    return new NestedTableWrapper<std::vector<ESM::Creature::NPDTstruct> >(wrap);
+    return new NestedTableWrapper<std::vector<ESM::Creature::NPDTstruct>>(wrap);
 }
 
-QVariant CSMWorld::CreatureAttackRefIdAdapter::getNestedData (const RefIdColumn *column,
-        const RefIdData& data, int index, int subRowIndex, int subColIndex) const
+QVariant CSMWorld::CreatureAttackRefIdAdapter::getNestedData(
+    const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex, int subColIndex) const
 {
-    const Record<ESM::Creature>& record =
-        static_cast<const Record<ESM::Creature>&> (data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Creature)));
+    const Record<ESM::Creature>& record = static_cast<const Record<ESM::Creature>&>(
+        data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Creature)));
 
     const ESM::Creature& creature = record.get();
 
     if (subRowIndex < 0 || subRowIndex > 2)
-        throw std::runtime_error ("index out of range");
+        throw std::runtime_error("index out of range");
 
     if (subColIndex == 0)
         return subRowIndex + 1;
     else if (subColIndex == 1 || subColIndex == 2)
         return creature.mData.mAttack[(subRowIndex * 2) + (subColIndex - 1)];
     else
-        throw std::runtime_error ("index out of range");
+        throw std::runtime_error("index out of range");
 }
 
-void CSMWorld::CreatureAttackRefIdAdapter::setNestedData (const RefIdColumn *column,
-        RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const
+void CSMWorld::CreatureAttackRefIdAdapter::setNestedData(
+    const RefIdColumn* column, RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const
 {
-    Record<ESM::Creature>& record =
-        static_cast<Record<ESM::Creature>&> (data.getRecord (RefIdData::LocalIndex (row, UniversalId::Type_Creature)));
+    Record<ESM::Creature>& record
+        = static_cast<Record<ESM::Creature>&>(data.getRecord(RefIdData::LocalIndex(row, UniversalId::Type_Creature)));
     ESM::Creature creature = record.get();
 
     if (subRowIndex < 0 || subRowIndex > 2)
-        throw std::runtime_error ("index out of range");
+        throw std::runtime_error("index out of range");
 
     if (subColIndex == 1 || subColIndex == 2)
         creature.mData.mAttack[(subRowIndex * 2) + (subColIndex - 1)] = value.toInt();
     else
         return; // throw an exception here?
 
-    record.setModified (creature);
+    record.setModified(creature);
 }
 
-int CSMWorld::CreatureAttackRefIdAdapter::getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const
+int CSMWorld::CreatureAttackRefIdAdapter::getNestedColumnsCount(const RefIdColumn* column, const RefIdData& data) const
 {
     return 3;
 }
 
-int CSMWorld::CreatureAttackRefIdAdapter::getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const
+int CSMWorld::CreatureAttackRefIdAdapter::getNestedRowsCount(
+    const RefIdColumn* column, const RefIdData& data, int index) const
 {
     // There are 3 attacks
     return 3;
 }
 
-CSMWorld::CreatureMiscRefIdAdapter::CreatureMiscRefIdAdapter()
-{}
+CSMWorld::CreatureMiscRefIdAdapter::CreatureMiscRefIdAdapter() {}
 
-CSMWorld::CreatureMiscRefIdAdapter::~CreatureMiscRefIdAdapter()
-{}
+CSMWorld::CreatureMiscRefIdAdapter::~CreatureMiscRefIdAdapter() {}
 
-void CSMWorld::CreatureMiscRefIdAdapter::addNestedRow (const RefIdColumn *column,
-        RefIdData& data, int index, int position) const
+void CSMWorld::CreatureMiscRefIdAdapter::addNestedRow(
+    const RefIdColumn* column, RefIdData& data, int index, int position) const
 {
-    throw std::logic_error ("cannot add a row to a fixed table");
+    throw std::logic_error("cannot add a row to a fixed table");
 }
 
-void CSMWorld::CreatureMiscRefIdAdapter::removeNestedRow (const RefIdColumn *column,
-        RefIdData& data, int index, int rowToRemove) const
+void CSMWorld::CreatureMiscRefIdAdapter::removeNestedRow(
+    const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const
 {
-    throw std::logic_error ("cannot remove a row to a fixed table");
+    throw std::logic_error("cannot remove a row to a fixed table");
 }
 
-void CSMWorld::CreatureMiscRefIdAdapter::setNestedTable (const RefIdColumn* column,
-        RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const
+void CSMWorld::CreatureMiscRefIdAdapter::setNestedTable(
+    const RefIdColumn* column, RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const
 {
-    throw std::logic_error ("table operation not supported");
+    throw std::logic_error("table operation not supported");
 }
 
-CSMWorld::NestedTableWrapperBase* CSMWorld::CreatureMiscRefIdAdapter::nestedTable (const RefIdColumn* column,
-        const RefIdData& data, int index) const
+CSMWorld::NestedTableWrapperBase* CSMWorld::CreatureMiscRefIdAdapter::nestedTable(
+    const RefIdColumn* column, const RefIdData& data, int index) const
 {
-    throw std::logic_error ("table operation not supported");
+    throw std::logic_error("table operation not supported");
 }
 
-QVariant CSMWorld::CreatureMiscRefIdAdapter::getNestedData (const RefIdColumn *column,
-        const RefIdData& data, int index, int subRowIndex, int subColIndex) const
+QVariant CSMWorld::CreatureMiscRefIdAdapter::getNestedData(
+    const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex, int subColIndex) const
 {
-    const Record<ESM::Creature>& record =
-        static_cast<const Record<ESM::Creature>&> (data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Creature)));
+    const Record<ESM::Creature>& record = static_cast<const Record<ESM::Creature>&>(
+        data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Creature)));
 
     const ESM::Creature& creature = record.get();
 
     switch (subColIndex)
     {
-        case 0: return creature.mData.mLevel;
-        case 1: return creature.mData.mHealth;
-        case 2: return creature.mData.mMana;
-        case 3: return creature.mData.mFatigue;
-        case 4: return creature.mData.mSoul;
-        case 5: return creature.mData.mCombat;
-        case 6: return creature.mData.mMagic;
-        case 7: return creature.mData.mStealth;
-        case 8: return creature.mData.mGold;
-        default: return QVariant(); // throw an exception here?
+        case 0:
+            return creature.mData.mLevel;
+        case 1:
+            return creature.mData.mHealth;
+        case 2:
+            return creature.mData.mMana;
+        case 3:
+            return creature.mData.mFatigue;
+        case 4:
+            return creature.mData.mSoul;
+        case 5:
+            return creature.mData.mCombat;
+        case 6:
+            return creature.mData.mMagic;
+        case 7:
+            return creature.mData.mStealth;
+        case 8:
+            return creature.mData.mGold;
+        default:
+            return QVariant(); // throw an exception here?
     }
 }
 
-void CSMWorld::CreatureMiscRefIdAdapter::setNestedData (const RefIdColumn *column,
-        RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const
+void CSMWorld::CreatureMiscRefIdAdapter::setNestedData(
+    const RefIdColumn* column, RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const
 {
-    Record<ESM::Creature>& record =
-        static_cast<Record<ESM::Creature>&> (data.getRecord (RefIdData::LocalIndex (row, UniversalId::Type_Creature)));
+    Record<ESM::Creature>& record
+        = static_cast<Record<ESM::Creature>&>(data.getRecord(RefIdData::LocalIndex(row, UniversalId::Type_Creature)));
     ESM::Creature creature = record.get();
 
-    switch(subColIndex)
+    switch (subColIndex)
     {
-        case 0: creature.mData.mLevel   = value.toInt(); break;
-        case 1: creature.mData.mHealth  = value.toInt(); break;
-        case 2: creature.mData.mMana    = value.toInt(); break;
-        case 3: creature.mData.mFatigue = value.toInt(); break;
-        case 4: creature.mData.mSoul    = value.toInt(); break;
-        case 5: creature.mData.mCombat  = value.toInt(); break;
-        case 6: creature.mData.mMagic   = value.toInt(); break;
-        case 7: creature.mData.mStealth = value.toInt(); break;
-        case 8: creature.mData.mGold    = value.toInt(); break;
-        default: return; // throw an exception here?
+        case 0:
+            creature.mData.mLevel = value.toInt();
+            break;
+        case 1:
+            creature.mData.mHealth = value.toInt();
+            break;
+        case 2:
+            creature.mData.mMana = value.toInt();
+            break;
+        case 3:
+            creature.mData.mFatigue = value.toInt();
+            break;
+        case 4:
+            creature.mData.mSoul = value.toInt();
+            break;
+        case 5:
+            creature.mData.mCombat = value.toInt();
+            break;
+        case 6:
+            creature.mData.mMagic = value.toInt();
+            break;
+        case 7:
+            creature.mData.mStealth = value.toInt();
+            break;
+        case 8:
+            creature.mData.mGold = value.toInt();
+            break;
+        default:
+            return; // throw an exception here?
     }
 
-    record.setModified (creature);
+    record.setModified(creature);
 }
 
-int CSMWorld::CreatureMiscRefIdAdapter::getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const
+int CSMWorld::CreatureMiscRefIdAdapter::getNestedColumnsCount(const RefIdColumn* column, const RefIdData& data) const
 {
     return 9; // Level, Health, Mana, Fatigue, Soul, Combat, Magic, Steath, Gold
 }
 
-int CSMWorld::CreatureMiscRefIdAdapter::getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const
+int CSMWorld::CreatureMiscRefIdAdapter::getNestedRowsCount(
+    const RefIdColumn* column, const RefIdData& data, int index) const
 {
     return 1; // fixed at size 1
 }
 
-CSMWorld::WeaponColumns::WeaponColumns (const EnchantableColumns& columns)
-: EnchantableColumns (columns)
-, mType(nullptr)
-, mHealth(nullptr)
-, mSpeed(nullptr)
-, mReach(nullptr)
-, mChop{nullptr}
-, mSlash{nullptr}
-, mThrust{nullptr}
-{}
+CSMWorld::WeaponColumns::WeaponColumns(const EnchantableColumns& columns)
+    : EnchantableColumns(columns)
+    , mType(nullptr)
+    , mHealth(nullptr)
+    , mSpeed(nullptr)
+    , mReach(nullptr)
+    , mChop{ nullptr }
+    , mSlash{ nullptr }
+    , mThrust{ nullptr }
+{
+}
 
-CSMWorld::WeaponRefIdAdapter::WeaponRefIdAdapter (const WeaponColumns& columns)
-: EnchantableRefIdAdapter<ESM::Weapon> (UniversalId::Type_Weapon, columns), mColumns (columns)
-{}
+CSMWorld::WeaponRefIdAdapter::WeaponRefIdAdapter(const WeaponColumns& columns)
+    : EnchantableRefIdAdapter<ESM::Weapon>(UniversalId::Type_Weapon, columns)
+    , mColumns(columns)
+{
+}
 
-QVariant CSMWorld::WeaponRefIdAdapter::getData (const RefIdColumn *column, const RefIdData& data,
-    int index) const
+QVariant CSMWorld::WeaponRefIdAdapter::getData(const RefIdColumn* column, const RefIdData& data, int index) const
 {
-    const Record<ESM::Weapon>& record = static_cast<const Record<ESM::Weapon>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Weapon)));
+    const Record<ESM::Weapon>& record = static_cast<const Record<ESM::Weapon>&>(
+        data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Weapon)));
 
-    if (column==mColumns.mType)
+    if (column == mColumns.mType)
         return record.get().mData.mType;
 
-    if (column==mColumns.mHealth)
+    if (column == mColumns.mHealth)
         return record.get().mData.mHealth;
 
-    if (column==mColumns.mSpeed)
+    if (column == mColumns.mSpeed)
         return record.get().mData.mSpeed;
 
-    if (column==mColumns.mReach)
+    if (column == mColumns.mReach)
         return record.get().mData.mReach;
 
-    for (int i=0; i<2; ++i)
+    for (int i = 0; i < 2; ++i)
     {
-        if (column==mColumns.mChop[i])
+        if (column == mColumns.mChop[i])
             return record.get().mData.mChop[i];
 
-        if (column==mColumns.mSlash[i])
+        if (column == mColumns.mSlash[i])
             return record.get().mData.mSlash[i];
 
-        if (column==mColumns.mThrust[i])
+        if (column == mColumns.mThrust[i])
             return record.get().mData.mThrust[i];
     }
 
-    std::map<const RefIdColumn *, unsigned int>::const_iterator iter =
-        mColumns.mFlags.find (column);
+    std::map<const RefIdColumn*, unsigned int>::const_iterator iter = mColumns.mFlags.find(column);
 
-    if (iter!=mColumns.mFlags.end())
-        return (record.get().mData.mFlags & iter->second)!=0;
+    if (iter != mColumns.mFlags.end())
+        return (record.get().mData.mFlags & iter->second) != 0;
 
-    return EnchantableRefIdAdapter<ESM::Weapon>::getData (column, data, index);
+    return EnchantableRefIdAdapter<ESM::Weapon>::getData(column, data, index);
 }
 
-void CSMWorld::WeaponRefIdAdapter::setData (const RefIdColumn *column, RefIdData& data, int index,
-    const QVariant& value) const
+void CSMWorld::WeaponRefIdAdapter::setData(
+    const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const
 {
-    Record<ESM::Weapon>& record = static_cast<Record<ESM::Weapon>&> (
-        data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Weapon)));
+    Record<ESM::Weapon>& record
+        = static_cast<Record<ESM::Weapon>&>(data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Weapon)));
 
     ESM::Weapon weapon = record.get();
 
-    if (column==mColumns.mType)
+    if (column == mColumns.mType)
         weapon.mData.mType = value.toInt();
-    else if (column==mColumns.mHealth)
+    else if (column == mColumns.mHealth)
         weapon.mData.mHealth = value.toInt();
-    else if (column==mColumns.mSpeed)
+    else if (column == mColumns.mSpeed)
         weapon.mData.mSpeed = value.toFloat();
-    else if (column==mColumns.mReach)
+    else if (column == mColumns.mReach)
         weapon.mData.mReach = value.toFloat();
-    else if (column==mColumns.mChop[0])
+    else if (column == mColumns.mChop[0])
         weapon.mData.mChop[0] = value.toInt();
-    else if (column==mColumns.mChop[1])
+    else if (column == mColumns.mChop[1])
         weapon.mData.mChop[1] = value.toInt();
-    else if (column==mColumns.mSlash[0])
+    else if (column == mColumns.mSlash[0])
         weapon.mData.mSlash[0] = value.toInt();
-    else if (column==mColumns.mSlash[1])
+    else if (column == mColumns.mSlash[1])
         weapon.mData.mSlash[1] = value.toInt();
-    else if (column==mColumns.mThrust[0])
+    else if (column == mColumns.mThrust[0])
         weapon.mData.mThrust[0] = value.toInt();
-    else if (column==mColumns.mThrust[1])
+    else if (column == mColumns.mThrust[1])
         weapon.mData.mThrust[1] = value.toInt();
     else
     {
-        std::map<const RefIdColumn *, unsigned int>::const_iterator iter =
-            mColumns.mFlags.find (column);
+        std::map<const RefIdColumn*, unsigned int>::const_iterator iter = mColumns.mFlags.find(column);
 
-        if (iter!=mColumns.mFlags.end())
+        if (iter != mColumns.mFlags.end())
         {
-            if (value.toInt()!=0)
+            if (value.toInt() != 0)
                 weapon.mData.mFlags |= iter->second;
             else
                 weapon.mData.mFlags &= ~iter->second;
         }
         else
         {
-            EnchantableRefIdAdapter<ESM::Weapon>::setData (column, data, index, value);
+            EnchantableRefIdAdapter<ESM::Weapon>::setData(column, data, index, value);
             return; // Don't overwrite changes made by base class
         }
     }
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index ab25c87607..6d154a0437 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -6,112 +6,113 @@
 #include <QVariant>
 
 #include <components/esm3/loadalch.hpp>
-#include <components/esm3/loadench.hpp>
 #include <components/esm3/loadappa.hpp>
-#include <components/esm3/loadnpc.hpp>
 #include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadnpc.hpp>
 
 #include "columnbase.hpp"
+#include "nestedtablewrapper.hpp"
 #include "record.hpp"
+#include "refidadapter.hpp"
 #include "refiddata.hpp"
 #include "universalid.hpp"
-#include "refidadapter.hpp"
-#include "nestedtablewrapper.hpp"
 
 namespace CSMWorld
 {
     struct BaseColumns
     {
-        const RefIdColumn *mId;
-        const RefIdColumn *mModified;
-        const RefIdColumn *mType;
-        const RefIdColumn *mBlocked;
+        const RefIdColumn* mId;
+        const RefIdColumn* mModified;
+        const RefIdColumn* mType;
+        const RefIdColumn* mBlocked;
 
-        BaseColumns () : mId(nullptr)
-        , mModified(nullptr)
-        , mType(nullptr)
-        , mBlocked(nullptr) {}
+        BaseColumns()
+            : mId(nullptr)
+            , mModified(nullptr)
+            , mType(nullptr)
+            , mBlocked(nullptr)
+        {
+        }
     };
 
     /// \brief Base adapter for all refereceable record types
     /// Adapters that can handle nested tables, needs to return valid qvariant for parent columns
-    template<typename RecordT>
+    template <typename RecordT>
     class BaseRefIdAdapter : public RefIdAdapter
     {
-            UniversalId::Type mType;
-            BaseColumns mBase;
-
-        public:
+        UniversalId::Type mType;
+        BaseColumns mBase;
 
-            BaseRefIdAdapter (UniversalId::Type type, const BaseColumns& base);
+    public:
+        BaseRefIdAdapter(UniversalId::Type type, const BaseColumns& base);
 
-            std::string getId (const RecordBase& record) const override;
+        std::string getId(const RecordBase& record) const override;
 
-            void setId (RecordBase& record, const std::string& id) override;
+        void setId(RecordBase& record, const std::string& id) override;
 
-            QVariant getData (const RefIdColumn *column, const RefIdData& data, int index) const override;
+        QVariant getData(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-            void setData (const RefIdColumn *column, RefIdData& data, int index,
-                const QVariant& value) const override;
-            ///< If the data type does not match an exception is thrown.
+        void setData(const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const override;
+        ///< If the data type does not match an exception is thrown.
 
-            UniversalId::Type getType() const;
+        UniversalId::Type getType() const;
     };
 
-    template<typename RecordT>
-    BaseRefIdAdapter<RecordT>::BaseRefIdAdapter (UniversalId::Type type, const BaseColumns& base)
-    : mType (type), mBase (base)
-    {}
+    template <typename RecordT>
+    BaseRefIdAdapter<RecordT>::BaseRefIdAdapter(UniversalId::Type type, const BaseColumns& base)
+        : mType(type)
+        , mBase(base)
+    {
+    }
 
-    template<typename RecordT>
-    void BaseRefIdAdapter<RecordT>::setId (RecordBase& record, const std::string& id)
+    template <typename RecordT>
+    void BaseRefIdAdapter<RecordT>::setId(RecordBase& record, const std::string& id)
     {
-        (dynamic_cast<Record<RecordT>&> (record).get().mId) = id;
+        (dynamic_cast<Record<RecordT>&>(record).get().mId) = id;
     }
 
-    template<typename RecordT>
-    std::string BaseRefIdAdapter<RecordT>::getId (const RecordBase& record) const
+    template <typename RecordT>
+    std::string BaseRefIdAdapter<RecordT>::getId(const RecordBase& record) const
     {
-        return dynamic_cast<const Record<RecordT>&> (record).get().mId;
+        return dynamic_cast<const Record<RecordT>&>(record).get().mId;
     }
 
-    template<typename RecordT>
-    QVariant BaseRefIdAdapter<RecordT>::getData (const RefIdColumn *column, const RefIdData& data,
-        int index) const
+    template <typename RecordT>
+    QVariant BaseRefIdAdapter<RecordT>::getData(const RefIdColumn* column, const RefIdData& data, int index) const
     {
-        const Record<RecordT>& record = static_cast<const Record<RecordT>&> (
-            data.getRecord (RefIdData::LocalIndex (index, mType)));
+        const Record<RecordT>& record
+            = static_cast<const Record<RecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
-        if (column==mBase.mId)
-            return QString::fromUtf8 (record.get().mId.c_str());
+        if (column == mBase.mId)
+            return QString::fromUtf8(record.get().mId.c_str());
 
-        if (column==mBase.mModified)
+        if (column == mBase.mModified)
         {
-            if (record.mState==Record<RecordT>::State_Erased)
-                return static_cast<int> (Record<RecordT>::State_Deleted);
+            if (record.mState == Record<RecordT>::State_Erased)
+                return static_cast<int>(Record<RecordT>::State_Deleted);
 
-            return static_cast<int> (record.mState);
+            return static_cast<int>(record.mState);
         }
 
-        if (column==mBase.mType)
-            return static_cast<int> (mType);
+        if (column == mBase.mType)
+            return static_cast<int>(mType);
 
-        if (column==mBase.mBlocked)
+        if (column == mBase.mBlocked)
             return (record.get().mRecordFlags & ESM::FLAG_Blocked) != 0;
 
         return QVariant();
     }
 
-    template<typename RecordT>
-    void BaseRefIdAdapter<RecordT>::setData (const RefIdColumn *column, RefIdData& data, int index,
-        const QVariant& value) const
+    template <typename RecordT>
+    void BaseRefIdAdapter<RecordT>::setData(
+        const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const
     {
-        Record<RecordT>& record = static_cast<Record<RecordT>&> (
-            data.getRecord (RefIdData::LocalIndex (index, mType)));
+        Record<RecordT>& record = static_cast<Record<RecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
-        if (column==mBase.mModified)
-            record.mState = static_cast<RecordBase::State> (value.toInt());
-        else if (column==mBase.mBlocked)
+        if (column == mBase.mModified)
+            record.mState = static_cast<RecordBase::State>(value.toInt());
+        else if (column == mBase.mBlocked)
         {
             RecordT record2 = record.get();
 
@@ -124,7 +125,7 @@ namespace CSMWorld
         }
     }
 
-    template<typename RecordT>
+    template <typename RecordT>
     UniversalId::Type BaseRefIdAdapter<RecordT>::getType() const
     {
         return mType;
@@ -141,62 +142,65 @@ namespace CSMWorld
 
     struct ModelColumns : public BaseColumns
     {
-        const RefIdColumn *mModel;
-        const RefIdColumn *mPersistence;
+        const RefIdColumn* mModel;
+        const RefIdColumn* mPersistence;
 
-        ModelColumns (const BaseColumns& base) : BaseColumns (base), mModel(nullptr), mPersistence(nullptr) {}
+        ModelColumns(const BaseColumns& base)
+            : BaseColumns(base)
+            , mModel(nullptr)
+            , mPersistence(nullptr)
+        {
+        }
     };
 
     /// \brief Adapter for IDs with models (all but levelled lists)
-    template<typename RecordT>
+    template <typename RecordT>
     class ModelRefIdAdapter : public BaseRefIdAdapter<RecordT>
     {
-            ModelColumns mModel;
-
-        public:
+        ModelColumns mModel;
 
-            ModelRefIdAdapter (UniversalId::Type type, const ModelColumns& columns);
+    public:
+        ModelRefIdAdapter(UniversalId::Type type, const ModelColumns& columns);
 
-            QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
-                const override;
+        QVariant getData(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-            void setData (const RefIdColumn *column, RefIdData& data, int index,
-                const QVariant& value) const override;
-            ///< If the data type does not match an exception is thrown.
+        void setData(const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const override;
+        ///< If the data type does not match an exception is thrown.
     };
 
-    template<typename RecordT>
-    ModelRefIdAdapter<RecordT>::ModelRefIdAdapter (UniversalId::Type type, const ModelColumns& columns)
-    : BaseRefIdAdapter<RecordT> (type, columns), mModel (columns)
-    {}
+    template <typename RecordT>
+    ModelRefIdAdapter<RecordT>::ModelRefIdAdapter(UniversalId::Type type, const ModelColumns& columns)
+        : BaseRefIdAdapter<RecordT>(type, columns)
+        , mModel(columns)
+    {
+    }
 
-    template<typename RecordT>
-    QVariant ModelRefIdAdapter<RecordT>::getData (const RefIdColumn *column, const RefIdData& data,
-        int index) const
+    template <typename RecordT>
+    QVariant ModelRefIdAdapter<RecordT>::getData(const RefIdColumn* column, const RefIdData& data, int index) const
     {
-        const Record<RecordT>& record = static_cast<const Record<RecordT>&> (
-            data.getRecord (RefIdData::LocalIndex (index, BaseRefIdAdapter<RecordT>::getType())));
+        const Record<RecordT>& record = static_cast<const Record<RecordT>&>(
+            data.getRecord(RefIdData::LocalIndex(index, BaseRefIdAdapter<RecordT>::getType())));
 
-        if (column==mModel.mModel)
-            return QString::fromUtf8 (record.get().mModel.c_str());
+        if (column == mModel.mModel)
+            return QString::fromUtf8(record.get().mModel.c_str());
 
-        if (column==mModel.mPersistence)
+        if (column == mModel.mPersistence)
             return (record.get().mRecordFlags & ESM::FLAG_Persistent) != 0;
 
-        return BaseRefIdAdapter<RecordT>::getData (column, data, index);
+        return BaseRefIdAdapter<RecordT>::getData(column, data, index);
     }
 
-    template<typename RecordT>
-    void ModelRefIdAdapter<RecordT>::setData (const RefIdColumn *column, RefIdData& data, int index,
-        const QVariant& value) const
+    template <typename RecordT>
+    void ModelRefIdAdapter<RecordT>::setData(
+        const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const
     {
-        Record<RecordT>& record = static_cast<Record<RecordT>&> (
-            data.getRecord (RefIdData::LocalIndex (index, BaseRefIdAdapter<RecordT>::getType())));
+        Record<RecordT>& record = static_cast<Record<RecordT>&>(
+            data.getRecord(RefIdData::LocalIndex(index, BaseRefIdAdapter<RecordT>::getType())));
 
         RecordT record2 = record.get();
-        if (column==mModel.mModel)
+        if (column == mModel.mModel)
             record2.mModel = value.toString().toUtf8().constData();
-        else if (column==mModel.mPersistence)
+        else if (column == mModel.mPersistence)
         {
             if (value.toInt() != 0)
                 record2.mRecordFlags |= ESM::FLAG_Persistent;
@@ -205,7 +209,7 @@ namespace CSMWorld
         }
         else
         {
-            BaseRefIdAdapter<RecordT>::setData (column, data, index, value);
+            BaseRefIdAdapter<RecordT>::setData(column, data, index, value);
             return;
         }
 
@@ -214,70 +218,69 @@ namespace CSMWorld
 
     struct NameColumns : public ModelColumns
     {
-        const RefIdColumn *mName;
-        const RefIdColumn *mScript;
+        const RefIdColumn* mName;
+        const RefIdColumn* mScript;
 
-        NameColumns (const ModelColumns& base)
-        : ModelColumns (base)
-        , mName(nullptr)
-        , mScript(nullptr)
-        {}
+        NameColumns(const ModelColumns& base)
+            : ModelColumns(base)
+            , mName(nullptr)
+            , mScript(nullptr)
+        {
+        }
     };
 
     /// \brief Adapter for IDs with names (all but levelled lists and statics)
-    template<typename RecordT>
+    template <typename RecordT>
     class NameRefIdAdapter : public ModelRefIdAdapter<RecordT>
     {
-            NameColumns mName;
-
-        public:
+        NameColumns mName;
 
-            NameRefIdAdapter (UniversalId::Type type, const NameColumns& columns);
+    public:
+        NameRefIdAdapter(UniversalId::Type type, const NameColumns& columns);
 
-            QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
-                const override;
+        QVariant getData(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-            void setData (const RefIdColumn *column, RefIdData& data, int index,
-                const QVariant& value) const override;
-            ///< If the data type does not match an exception is thrown.
+        void setData(const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const override;
+        ///< If the data type does not match an exception is thrown.
     };
 
-    template<typename RecordT>
-    NameRefIdAdapter<RecordT>::NameRefIdAdapter (UniversalId::Type type, const NameColumns& columns)
-    : ModelRefIdAdapter<RecordT> (type, columns), mName (columns)
-    {}
+    template <typename RecordT>
+    NameRefIdAdapter<RecordT>::NameRefIdAdapter(UniversalId::Type type, const NameColumns& columns)
+        : ModelRefIdAdapter<RecordT>(type, columns)
+        , mName(columns)
+    {
+    }
 
-    template<typename RecordT>
-    QVariant NameRefIdAdapter<RecordT>::getData (const RefIdColumn *column, const RefIdData& data,
-        int index) const
+    template <typename RecordT>
+    QVariant NameRefIdAdapter<RecordT>::getData(const RefIdColumn* column, const RefIdData& data, int index) const
     {
-        const Record<RecordT>& record = static_cast<const Record<RecordT>&> (
-            data.getRecord (RefIdData::LocalIndex (index, BaseRefIdAdapter<RecordT>::getType())));
+        const Record<RecordT>& record = static_cast<const Record<RecordT>&>(
+            data.getRecord(RefIdData::LocalIndex(index, BaseRefIdAdapter<RecordT>::getType())));
 
-        if (column==mName.mName)
-            return QString::fromUtf8 (record.get().mName.c_str());
+        if (column == mName.mName)
+            return QString::fromUtf8(record.get().mName.c_str());
 
-        if (column==mName.mScript)
-            return QString::fromUtf8 (record.get().mScript.c_str());
+        if (column == mName.mScript)
+            return QString::fromUtf8(record.get().mScript.c_str());
 
-        return ModelRefIdAdapter<RecordT>::getData (column, data, index);
+        return ModelRefIdAdapter<RecordT>::getData(column, data, index);
     }
 
-    template<typename RecordT>
-    void NameRefIdAdapter<RecordT>::setData (const RefIdColumn *column, RefIdData& data, int index,
-        const QVariant& value) const
+    template <typename RecordT>
+    void NameRefIdAdapter<RecordT>::setData(
+        const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const
     {
-        Record<RecordT>& record = static_cast<Record<RecordT>&> (
-            data.getRecord (RefIdData::LocalIndex (index, BaseRefIdAdapter<RecordT>::getType())));
+        Record<RecordT>& record = static_cast<Record<RecordT>&>(
+            data.getRecord(RefIdData::LocalIndex(index, BaseRefIdAdapter<RecordT>::getType())));
 
         RecordT record2 = record.get();
-        if (column==mName.mName)
+        if (column == mName.mName)
             record2.mName = value.toString().toUtf8().constData();
-        else if (column==mName.mScript)
+        else if (column == mName.mScript)
             record2.mScript = value.toString().toUtf8().constData();
         else
         {
-            ModelRefIdAdapter<RecordT>::setData (column, data, index, value);
+            ModelRefIdAdapter<RecordT>::setData(column, data, index, value);
             return;
         }
 
@@ -286,78 +289,76 @@ namespace CSMWorld
 
     struct InventoryColumns : public NameColumns
     {
-        const RefIdColumn *mIcon;
-        const RefIdColumn *mWeight;
-        const RefIdColumn *mValue;
+        const RefIdColumn* mIcon;
+        const RefIdColumn* mWeight;
+        const RefIdColumn* mValue;
 
-        InventoryColumns (const NameColumns& base)
-        : NameColumns (base)
-        , mIcon(nullptr)
-        , mWeight(nullptr)
-        , mValue(nullptr)
-        {}
+        InventoryColumns(const NameColumns& base)
+            : NameColumns(base)
+            , mIcon(nullptr)
+            , mWeight(nullptr)
+            , mValue(nullptr)
+        {
+        }
     };
 
     /// \brief Adapter for IDs that can go into an inventory
-    template<typename RecordT>
+    template <typename RecordT>
     class InventoryRefIdAdapter : public NameRefIdAdapter<RecordT>
     {
-            InventoryColumns mInventory;
-
-        public:
+        InventoryColumns mInventory;
 
-            InventoryRefIdAdapter (UniversalId::Type type, const InventoryColumns& columns);
+    public:
+        InventoryRefIdAdapter(UniversalId::Type type, const InventoryColumns& columns);
 
-            QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
-                const override;
+        QVariant getData(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-            void setData (const RefIdColumn *column, RefIdData& data, int index,
-                const QVariant& value) const override;
-            ///< If the data type does not match an exception is thrown.
+        void setData(const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const override;
+        ///< If the data type does not match an exception is thrown.
     };
 
-    template<typename RecordT>
-    InventoryRefIdAdapter<RecordT>::InventoryRefIdAdapter (UniversalId::Type type,
-        const InventoryColumns& columns)
-    : NameRefIdAdapter<RecordT> (type, columns), mInventory (columns)
-    {}
+    template <typename RecordT>
+    InventoryRefIdAdapter<RecordT>::InventoryRefIdAdapter(UniversalId::Type type, const InventoryColumns& columns)
+        : NameRefIdAdapter<RecordT>(type, columns)
+        , mInventory(columns)
+    {
+    }
 
-    template<typename RecordT>
-    QVariant InventoryRefIdAdapter<RecordT>::getData (const RefIdColumn *column, const RefIdData& data,
-        int index) const
+    template <typename RecordT>
+    QVariant InventoryRefIdAdapter<RecordT>::getData(const RefIdColumn* column, const RefIdData& data, int index) const
     {
-        const Record<RecordT>& record = static_cast<const Record<RecordT>&> (
-            data.getRecord (RefIdData::LocalIndex (index, BaseRefIdAdapter<RecordT>::getType())));
+        const Record<RecordT>& record = static_cast<const Record<RecordT>&>(
+            data.getRecord(RefIdData::LocalIndex(index, BaseRefIdAdapter<RecordT>::getType())));
 
-        if (column==mInventory.mIcon)
-            return QString::fromUtf8 (record.get().mIcon.c_str());
+        if (column == mInventory.mIcon)
+            return QString::fromUtf8(record.get().mIcon.c_str());
 
-        if (column==mInventory.mWeight)
+        if (column == mInventory.mWeight)
             return record.get().mData.mWeight;
 
-        if (column==mInventory.mValue)
+        if (column == mInventory.mValue)
             return record.get().mData.mValue;
 
-        return NameRefIdAdapter<RecordT>::getData (column, data, index);
+        return NameRefIdAdapter<RecordT>::getData(column, data, index);
     }
 
-    template<typename RecordT>
-    void InventoryRefIdAdapter<RecordT>::setData (const RefIdColumn *column, RefIdData& data, int index,
-        const QVariant& value) const
+    template <typename RecordT>
+    void InventoryRefIdAdapter<RecordT>::setData(
+        const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const
     {
-        Record<RecordT>& record = static_cast<Record<RecordT>&> (
-            data.getRecord (RefIdData::LocalIndex (index, BaseRefIdAdapter<RecordT>::getType())));
+        Record<RecordT>& record = static_cast<Record<RecordT>&>(
+            data.getRecord(RefIdData::LocalIndex(index, BaseRefIdAdapter<RecordT>::getType())));
 
         RecordT record2 = record.get();
-        if (column==mInventory.mIcon)
+        if (column == mInventory.mIcon)
             record2.mIcon = value.toString().toUtf8().constData();
-        else if (column==mInventory.mWeight)
+        else if (column == mInventory.mWeight)
             record2.mData.mWeight = value.toFloat();
-        else if (column==mInventory.mValue)
+        else if (column == mInventory.mValue)
             record2.mData.mValue = value.toInt();
         else
         {
-            NameRefIdAdapter<RecordT>::setData (column, data, index, value);
+            NameRefIdAdapter<RecordT>::setData(column, data, index, value);
             return;
         }
 
@@ -366,49 +367,43 @@ namespace CSMWorld
 
     struct PotionColumns : public InventoryColumns
     {
-        const RefIdColumn *mEffects;
+        const RefIdColumn* mEffects;
 
-        PotionColumns (const InventoryColumns& columns);
+        PotionColumns(const InventoryColumns& columns);
     };
 
     class PotionRefIdAdapter : public InventoryRefIdAdapter<ESM::Potion>
     {
-            PotionColumns mColumns;
-            const RefIdColumn *mAutoCalc;
+        PotionColumns mColumns;
+        const RefIdColumn* mAutoCalc;
 
-        public:
-
-            PotionRefIdAdapter (const PotionColumns& columns, const RefIdColumn *autoCalc);
+    public:
+        PotionRefIdAdapter(const PotionColumns& columns, const RefIdColumn* autoCalc);
 
-            QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
-                const override;
+        QVariant getData(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-            void setData (const RefIdColumn *column, RefIdData& data, int index,
-                const QVariant& value) const override;
-            ///< If the data type does not match an exception is thrown.
+        void setData(const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const override;
+        ///< If the data type does not match an exception is thrown.
     };
 
     struct IngredientColumns : public InventoryColumns
     {
-        const RefIdColumn *mEffects;
+        const RefIdColumn* mEffects;
 
-        IngredientColumns (const InventoryColumns& columns);
+        IngredientColumns(const InventoryColumns& columns);
     };
 
     class IngredientRefIdAdapter : public InventoryRefIdAdapter<ESM::Ingredient>
     {
-            IngredientColumns mColumns;
-
-        public:
+        IngredientColumns mColumns;
 
-            IngredientRefIdAdapter (const IngredientColumns& columns);
+    public:
+        IngredientRefIdAdapter(const IngredientColumns& columns);
 
-            QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
-                const override;
+        QVariant getData(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-            void setData (const RefIdColumn *column, RefIdData& data, int index,
-                const QVariant& value) const override;
-            ///< If the data type does not match an exception is thrown.
+        void setData(const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const override;
+        ///< If the data type does not match an exception is thrown.
     };
 
     class IngredEffectRefIdAdapter : public NestedRefIdAdapterBase
@@ -416,105 +411,100 @@ namespace CSMWorld
         UniversalId::Type mType;
 
         // not implemented
-        IngredEffectRefIdAdapter (const IngredEffectRefIdAdapter&);
-        IngredEffectRefIdAdapter& operator= (const IngredEffectRefIdAdapter&);
+        IngredEffectRefIdAdapter(const IngredEffectRefIdAdapter&);
+        IngredEffectRefIdAdapter& operator=(const IngredEffectRefIdAdapter&);
 
     public:
-
         IngredEffectRefIdAdapter();
 
         ~IngredEffectRefIdAdapter() override;
 
-        void addNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int position) const override;
+        void addNestedRow(const RefIdColumn* column, RefIdData& data, int index, int position) const override;
 
-        void removeNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int rowToRemove) const override;
+        void removeNestedRow(const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const override;
 
-        void setNestedTable (const RefIdColumn* column,
-                RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const override;
+        void setNestedTable(const RefIdColumn* column, RefIdData& data, int index,
+            const NestedTableWrapperBase& nestedTable) const override;
 
-        NestedTableWrapperBase* nestedTable (const RefIdColumn* column,
-                const RefIdData& data, int index) const override;
+        NestedTableWrapperBase* nestedTable(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-        QVariant getNestedData (const RefIdColumn *column,
-                const RefIdData& data, int index, int subRowIndex, int subColIndex) const override;
+        QVariant getNestedData(const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex,
+            int subColIndex) const override;
 
-        void setNestedData (const RefIdColumn *column,
-                RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const override;
+        void setNestedData(const RefIdColumn* column, RefIdData& data, int row, const QVariant& value, int subRowIndex,
+            int subColIndex) const override;
 
-        int getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const override;
+        int getNestedColumnsCount(const RefIdColumn* column, const RefIdData& data) const override;
 
-        int getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const override;
+        int getNestedRowsCount(const RefIdColumn* column, const RefIdData& data, int index) const override;
     };
 
     struct EnchantableColumns : public InventoryColumns
     {
-        const RefIdColumn *mEnchantment;
-        const RefIdColumn *mEnchantmentPoints;
+        const RefIdColumn* mEnchantment;
+        const RefIdColumn* mEnchantmentPoints;
 
-        EnchantableColumns (const InventoryColumns& base)
-        : InventoryColumns (base)
-        , mEnchantment(nullptr)
-        , mEnchantmentPoints(nullptr)
-        {}
+        EnchantableColumns(const InventoryColumns& base)
+            : InventoryColumns(base)
+            , mEnchantment(nullptr)
+            , mEnchantmentPoints(nullptr)
+        {
+        }
     };
 
     /// \brief Adapter for enchantable IDs
-    template<typename RecordT>
+    template <typename RecordT>
     class EnchantableRefIdAdapter : public InventoryRefIdAdapter<RecordT>
     {
-            EnchantableColumns mEnchantable;
-
-        public:
+        EnchantableColumns mEnchantable;
 
-            EnchantableRefIdAdapter (UniversalId::Type type, const EnchantableColumns& columns);
+    public:
+        EnchantableRefIdAdapter(UniversalId::Type type, const EnchantableColumns& columns);
 
-            QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
-                const override;
+        QVariant getData(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-            void setData (const RefIdColumn *column, RefIdData& data, int index,
-                const QVariant& value) const override;
-            ///< If the data type does not match an exception is thrown.
+        void setData(const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const override;
+        ///< If the data type does not match an exception is thrown.
     };
 
-    template<typename RecordT>
-    EnchantableRefIdAdapter<RecordT>::EnchantableRefIdAdapter (UniversalId::Type type,
-        const EnchantableColumns& columns)
-    : InventoryRefIdAdapter<RecordT> (type, columns), mEnchantable (columns)
-    {}
+    template <typename RecordT>
+    EnchantableRefIdAdapter<RecordT>::EnchantableRefIdAdapter(UniversalId::Type type, const EnchantableColumns& columns)
+        : InventoryRefIdAdapter<RecordT>(type, columns)
+        , mEnchantable(columns)
+    {
+    }
 
-    template<typename RecordT>
-    QVariant EnchantableRefIdAdapter<RecordT>::getData (const RefIdColumn *column, const RefIdData& data,
-        int index) const
+    template <typename RecordT>
+    QVariant EnchantableRefIdAdapter<RecordT>::getData(
+        const RefIdColumn* column, const RefIdData& data, int index) const
     {
-        const Record<RecordT>& record = static_cast<const Record<RecordT>&> (
-            data.getRecord (RefIdData::LocalIndex (index, BaseRefIdAdapter<RecordT>::getType())));
+        const Record<RecordT>& record = static_cast<const Record<RecordT>&>(
+            data.getRecord(RefIdData::LocalIndex(index, BaseRefIdAdapter<RecordT>::getType())));
 
-        if (column==mEnchantable.mEnchantment)
-            return QString::fromUtf8 (record.get().mEnchant.c_str());
+        if (column == mEnchantable.mEnchantment)
+            return QString::fromUtf8(record.get().mEnchant.c_str());
 
-        if (column==mEnchantable.mEnchantmentPoints)
-            return static_cast<int> (record.get().mData.mEnchant);
+        if (column == mEnchantable.mEnchantmentPoints)
+            return static_cast<int>(record.get().mData.mEnchant);
 
-        return InventoryRefIdAdapter<RecordT>::getData (column, data, index);
+        return InventoryRefIdAdapter<RecordT>::getData(column, data, index);
     }
 
-    template<typename RecordT>
-    void EnchantableRefIdAdapter<RecordT>::setData (const RefIdColumn *column, RefIdData& data,
-        int index, const QVariant& value) const
+    template <typename RecordT>
+    void EnchantableRefIdAdapter<RecordT>::setData(
+        const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const
     {
-        Record<RecordT>& record = static_cast<Record<RecordT>&> (
-            data.getRecord (RefIdData::LocalIndex (index, BaseRefIdAdapter<RecordT>::getType())));
+        Record<RecordT>& record = static_cast<Record<RecordT>&>(
+            data.getRecord(RefIdData::LocalIndex(index, BaseRefIdAdapter<RecordT>::getType())));
 
         RecordT record2 = record.get();
-        if (column==mEnchantable.mEnchantment)
+        if (column == mEnchantable.mEnchantment)
             record2.mEnchant = value.toString().toUtf8().constData();
-        else if (column==mEnchantable.mEnchantmentPoints)
+        else if (column == mEnchantable.mEnchantmentPoints)
             record2.mData.mEnchant = value.toInt();
         else
         {
-            InventoryRefIdAdapter<RecordT>::setData (column, data, index, value);
+            InventoryRefIdAdapter<RecordT>::setData(column, data, index, value);
             return;
         }
 
@@ -523,70 +513,69 @@ namespace CSMWorld
 
     struct ToolColumns : public InventoryColumns
     {
-        const RefIdColumn *mQuality;
-        const RefIdColumn *mUses;
+        const RefIdColumn* mQuality;
+        const RefIdColumn* mUses;
 
-        ToolColumns (const InventoryColumns& base)
-        : InventoryColumns (base)
-        , mQuality(nullptr)
-        , mUses(nullptr)
-        {}
+        ToolColumns(const InventoryColumns& base)
+            : InventoryColumns(base)
+            , mQuality(nullptr)
+            , mUses(nullptr)
+        {
+        }
     };
 
     /// \brief Adapter for tools with limited uses IDs (lockpick, repair, probes)
-    template<typename RecordT>
+    template <typename RecordT>
     class ToolRefIdAdapter : public InventoryRefIdAdapter<RecordT>
     {
-            ToolColumns mTools;
-
-        public:
+        ToolColumns mTools;
 
-            ToolRefIdAdapter (UniversalId::Type type, const ToolColumns& columns);
+    public:
+        ToolRefIdAdapter(UniversalId::Type type, const ToolColumns& columns);
 
-            QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
-                const override;
+        QVariant getData(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-            void setData (const RefIdColumn *column, RefIdData& data, int index,
-                const QVariant& value) const override;
-            ///< If the data type does not match an exception is thrown.
+        void setData(const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const override;
+        ///< If the data type does not match an exception is thrown.
     };
 
-    template<typename RecordT>
-    ToolRefIdAdapter<RecordT>::ToolRefIdAdapter (UniversalId::Type type, const ToolColumns& columns)
-    : InventoryRefIdAdapter<RecordT> (type, columns), mTools (columns)
-    {}
+    template <typename RecordT>
+    ToolRefIdAdapter<RecordT>::ToolRefIdAdapter(UniversalId::Type type, const ToolColumns& columns)
+        : InventoryRefIdAdapter<RecordT>(type, columns)
+        , mTools(columns)
+    {
+    }
 
-    template<typename RecordT>
-    QVariant ToolRefIdAdapter<RecordT>::getData (const RefIdColumn *column, const RefIdData& data,
-        int index) const
+    template <typename RecordT>
+    QVariant ToolRefIdAdapter<RecordT>::getData(const RefIdColumn* column, const RefIdData& data, int index) const
     {
-        const Record<RecordT>& record = static_cast<const Record<RecordT>&> (
-            data.getRecord (RefIdData::LocalIndex (index, BaseRefIdAdapter<RecordT>::getType())));
+        const Record<RecordT>& record = static_cast<const Record<RecordT>&>(
+            data.getRecord(RefIdData::LocalIndex(index, BaseRefIdAdapter<RecordT>::getType())));
 
-        if (column==mTools.mQuality)
+        if (column == mTools.mQuality)
             return record.get().mData.mQuality;
 
-        if (column==mTools.mUses)
+        if (column == mTools.mUses)
             return record.get().mData.mUses;
 
-        return InventoryRefIdAdapter<RecordT>::getData (column, data, index);
+        return InventoryRefIdAdapter<RecordT>::getData(column, data, index);
     }
 
-    template<typename RecordT>
-    void ToolRefIdAdapter<RecordT>::setData (const RefIdColumn *column, RefIdData& data,
-        int index, const QVariant& value) const
+    template <typename RecordT>
+    void ToolRefIdAdapter<RecordT>::setData(
+        const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const
     {
-        Record<RecordT>& record = static_cast<Record<RecordT>&> (
-            data.getRecord (RefIdData::LocalIndex (index, BaseRefIdAdapter<RecordT>::getType())));
+        Record<RecordT>& record = static_cast<Record<RecordT>&>(
+            data.getRecord(RefIdData::LocalIndex(index, BaseRefIdAdapter<RecordT>::getType())));
 
         RecordT record2 = record.get();
-        if (column==mTools.mQuality)
+        if (column == mTools.mQuality)
             record2.mData.mQuality = value.toFloat();
-        else if (column==mTools.mUses)
+        else if (column == mTools.mUses)
             record2.mData.mUses = value.toInt();
         else
         {
-            InventoryRefIdAdapter<RecordT>::setData (column, data, index, value);
+            InventoryRefIdAdapter<RecordT>::setData(column, data, index, value);
             return;
         }
 
@@ -595,18 +584,18 @@ namespace CSMWorld
 
     struct ActorColumns : public NameColumns
     {
-        const RefIdColumn *mHello;
-        const RefIdColumn *mFlee;
-        const RefIdColumn *mFight;
-        const RefIdColumn *mAlarm;
-        const RefIdColumn *mInventory;
-        const RefIdColumn *mSpells;
-        const RefIdColumn *mDestinations;
-        const RefIdColumn *mAiPackages;
-        std::map<const RefIdColumn *, unsigned int> mServices;
-
-        ActorColumns (const NameColumns& base)
-            : NameColumns (base)
+        const RefIdColumn* mHello;
+        const RefIdColumn* mFlee;
+        const RefIdColumn* mFight;
+        const RefIdColumn* mAlarm;
+        const RefIdColumn* mInventory;
+        const RefIdColumn* mSpells;
+        const RefIdColumn* mDestinations;
+        const RefIdColumn* mAiPackages;
+        std::map<const RefIdColumn*, unsigned int> mServices;
+
+        ActorColumns(const NameColumns& base)
+            : NameColumns(base)
             , mHello(nullptr)
             , mFlee(nullptr)
             , mFight(nullptr)
@@ -615,103 +604,99 @@ namespace CSMWorld
             , mSpells(nullptr)
             , mDestinations(nullptr)
             , mAiPackages(nullptr)
-            {}
+        {
+        }
     };
 
     /// \brief Adapter for actor IDs (handles common AI functionality)
-    template<typename RecordT>
+    template <typename RecordT>
     class ActorRefIdAdapter : public NameRefIdAdapter<RecordT>
     {
-            ActorColumns mActors;
-
-        public:
+        ActorColumns mActors;
 
-            ActorRefIdAdapter (UniversalId::Type type, const ActorColumns& columns);
+    public:
+        ActorRefIdAdapter(UniversalId::Type type, const ActorColumns& columns);
 
-            QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
-                const override;
+        QVariant getData(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-            void setData (const RefIdColumn *column, RefIdData& data, int index,
-                const QVariant& value) const override;
-            ///< If the data type does not match an exception is thrown.
+        void setData(const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const override;
+        ///< If the data type does not match an exception is thrown.
     };
 
-    template<typename RecordT>
-    ActorRefIdAdapter<RecordT>::ActorRefIdAdapter (UniversalId::Type type,
-        const ActorColumns& columns)
-    : NameRefIdAdapter<RecordT> (type, columns), mActors (columns)
-    {}
+    template <typename RecordT>
+    ActorRefIdAdapter<RecordT>::ActorRefIdAdapter(UniversalId::Type type, const ActorColumns& columns)
+        : NameRefIdAdapter<RecordT>(type, columns)
+        , mActors(columns)
+    {
+    }
 
-    template<typename RecordT>
-    QVariant ActorRefIdAdapter<RecordT>::getData (const RefIdColumn *column, const RefIdData& data,
-        int index) const
+    template <typename RecordT>
+    QVariant ActorRefIdAdapter<RecordT>::getData(const RefIdColumn* column, const RefIdData& data, int index) const
     {
-        const Record<RecordT>& record = static_cast<const Record<RecordT>&> (
-            data.getRecord (RefIdData::LocalIndex (index, BaseRefIdAdapter<RecordT>::getType())));
+        const Record<RecordT>& record = static_cast<const Record<RecordT>&>(
+            data.getRecord(RefIdData::LocalIndex(index, BaseRefIdAdapter<RecordT>::getType())));
 
-        if (column==mActors.mHello)
+        if (column == mActors.mHello)
             return record.get().mAiData.mHello;
 
-        if (column==mActors.mFlee)
+        if (column == mActors.mFlee)
             return record.get().mAiData.mFlee;
 
-        if (column==mActors.mFight)
+        if (column == mActors.mFight)
             return record.get().mAiData.mFight;
 
-        if (column==mActors.mAlarm)
+        if (column == mActors.mAlarm)
             return record.get().mAiData.mAlarm;
 
-        if (column==mActors.mInventory)
+        if (column == mActors.mInventory)
             return QVariant::fromValue(ColumnBase::TableEdit_Full);
 
-        if (column==mActors.mSpells)
+        if (column == mActors.mSpells)
             return QVariant::fromValue(ColumnBase::TableEdit_Full);
 
-        if (column==mActors.mDestinations)
+        if (column == mActors.mDestinations)
             return QVariant::fromValue(ColumnBase::TableEdit_Full);
 
-        if (column==mActors.mAiPackages)
+        if (column == mActors.mAiPackages)
             return QVariant::fromValue(ColumnBase::TableEdit_Full);
 
-        std::map<const RefIdColumn *, unsigned int>::const_iterator iter =
-            mActors.mServices.find (column);
+        std::map<const RefIdColumn*, unsigned int>::const_iterator iter = mActors.mServices.find(column);
 
-        if (iter!=mActors.mServices.end())
-            return (record.get().mAiData.mServices & iter->second)!=0;
+        if (iter != mActors.mServices.end())
+            return (record.get().mAiData.mServices & iter->second) != 0;
 
-        return NameRefIdAdapter<RecordT>::getData (column, data, index);
+        return NameRefIdAdapter<RecordT>::getData(column, data, index);
     }
 
-    template<typename RecordT>
-    void ActorRefIdAdapter<RecordT>::setData (const RefIdColumn *column, RefIdData& data, int index,
-        const QVariant& value) const
+    template <typename RecordT>
+    void ActorRefIdAdapter<RecordT>::setData(
+        const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const
     {
-        Record<RecordT>& record = static_cast<Record<RecordT>&> (
-            data.getRecord (RefIdData::LocalIndex (index, BaseRefIdAdapter<RecordT>::getType())));
+        Record<RecordT>& record = static_cast<Record<RecordT>&>(
+            data.getRecord(RefIdData::LocalIndex(index, BaseRefIdAdapter<RecordT>::getType())));
 
         RecordT record2 = record.get();
-        if (column==mActors.mHello)
+        if (column == mActors.mHello)
             record2.mAiData.mHello = value.toInt();
-        else if (column==mActors.mFlee) // Flee, Fight and Alarm ratings are probabilities.
+        else if (column == mActors.mFlee) // Flee, Fight and Alarm ratings are probabilities.
             record2.mAiData.mFlee = std::min(100, value.toInt());
-        else if (column==mActors.mFight)
+        else if (column == mActors.mFight)
             record2.mAiData.mFight = std::min(100, value.toInt());
-        else if (column==mActors.mAlarm)
+        else if (column == mActors.mAlarm)
             record2.mAiData.mAlarm = std::min(100, value.toInt());
         else
         {
-            typename std::map<const RefIdColumn *, unsigned int>::const_iterator iter =
-                mActors.mServices.find (column);
-            if (iter!=mActors.mServices.end())
+            typename std::map<const RefIdColumn*, unsigned int>::const_iterator iter = mActors.mServices.find(column);
+            if (iter != mActors.mServices.end())
             {
-                if (value.toInt()!=0)
+                if (value.toInt() != 0)
                     record2.mAiData.mServices |= iter->second;
                 else
                     record2.mAiData.mServices &= ~iter->second;
             }
             else
             {
-                NameRefIdAdapter<RecordT>::setData (column, data, index, value);
+                NameRefIdAdapter<RecordT>::setData(column, data, index, value);
                 return;
             }
         }
@@ -721,514 +706,453 @@ namespace CSMWorld
 
     class ApparatusRefIdAdapter : public InventoryRefIdAdapter<ESM::Apparatus>
     {
-            const RefIdColumn *mType;
-            const RefIdColumn *mQuality;
-
-        public:
+        const RefIdColumn* mType;
+        const RefIdColumn* mQuality;
 
-            ApparatusRefIdAdapter (const InventoryColumns& columns, const RefIdColumn *type,
-                const RefIdColumn *quality);
+    public:
+        ApparatusRefIdAdapter(const InventoryColumns& columns, const RefIdColumn* type, const RefIdColumn* quality);
 
-            QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
-                const override;
+        QVariant getData(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-            void setData (const RefIdColumn *column, RefIdData& data, int index,
-                const QVariant& value) const override;
-            ///< If the data type does not match an exception is thrown.
+        void setData(const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const override;
+        ///< If the data type does not match an exception is thrown.
     };
 
     class ArmorRefIdAdapter : public EnchantableRefIdAdapter<ESM::Armor>
     {
-            const RefIdColumn *mType;
-            const RefIdColumn *mHealth;
-            const RefIdColumn *mArmor;
-            const RefIdColumn *mPartRef;
-
-        public:
+        const RefIdColumn* mType;
+        const RefIdColumn* mHealth;
+        const RefIdColumn* mArmor;
+        const RefIdColumn* mPartRef;
 
-            ArmorRefIdAdapter (const EnchantableColumns& columns, const RefIdColumn *type,
-                const RefIdColumn *health, const RefIdColumn *armor, const RefIdColumn *partRef);
+    public:
+        ArmorRefIdAdapter(const EnchantableColumns& columns, const RefIdColumn* type, const RefIdColumn* health,
+            const RefIdColumn* armor, const RefIdColumn* partRef);
 
-            QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
-                const override;
+        QVariant getData(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-            void setData (const RefIdColumn *column, RefIdData& data, int index,
-                const QVariant& value) const override;
-            ///< If the data type does not match an exception is thrown.
+        void setData(const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const override;
+        ///< If the data type does not match an exception is thrown.
     };
 
     class BookRefIdAdapter : public EnchantableRefIdAdapter<ESM::Book>
     {
-            const RefIdColumn *mBookType;
-            const RefIdColumn *mSkill;
-            const RefIdColumn *mText;
+        const RefIdColumn* mBookType;
+        const RefIdColumn* mSkill;
+        const RefIdColumn* mText;
 
-        public:
-
-            BookRefIdAdapter (const EnchantableColumns& columns, const RefIdColumn *bookType,
-                const RefIdColumn *skill, const RefIdColumn *text);
+    public:
+        BookRefIdAdapter(const EnchantableColumns& columns, const RefIdColumn* bookType, const RefIdColumn* skill,
+            const RefIdColumn* text);
 
-            QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
-                const override;
+        QVariant getData(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-            void setData (const RefIdColumn *column, RefIdData& data, int index,
-                const QVariant& value) const override;
-            ///< If the data type does not match an exception is thrown.
+        void setData(const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const override;
+        ///< If the data type does not match an exception is thrown.
     };
 
     class ClothingRefIdAdapter : public EnchantableRefIdAdapter<ESM::Clothing>
     {
-            const RefIdColumn *mType;
-            const RefIdColumn *mPartRef;
-
-        public:
+        const RefIdColumn* mType;
+        const RefIdColumn* mPartRef;
 
-            ClothingRefIdAdapter (const EnchantableColumns& columns,
-                    const RefIdColumn *type, const RefIdColumn *partRef);
+    public:
+        ClothingRefIdAdapter(const EnchantableColumns& columns, const RefIdColumn* type, const RefIdColumn* partRef);
 
-            QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
-                const override;
+        QVariant getData(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-            void setData (const RefIdColumn *column, RefIdData& data, int index,
-                const QVariant& value) const override;
-            ///< If the data type does not match an exception is thrown.
+        void setData(const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const override;
+        ///< If the data type does not match an exception is thrown.
     };
 
     class ContainerRefIdAdapter : public NameRefIdAdapter<ESM::Container>
     {
-            const RefIdColumn *mWeight;
-            const RefIdColumn *mOrganic;
-            const RefIdColumn *mRespawn;
-            const RefIdColumn *mContent;
-
-        public:
+        const RefIdColumn* mWeight;
+        const RefIdColumn* mOrganic;
+        const RefIdColumn* mRespawn;
+        const RefIdColumn* mContent;
 
-            ContainerRefIdAdapter (const NameColumns& columns, const RefIdColumn *weight,
-                                   const RefIdColumn *organic, const RefIdColumn *respawn, const RefIdColumn *content);
+    public:
+        ContainerRefIdAdapter(const NameColumns& columns, const RefIdColumn* weight, const RefIdColumn* organic,
+            const RefIdColumn* respawn, const RefIdColumn* content);
 
-            QVariant getData (const RefIdColumn *column, const RefIdData& data, int index) const override;
+        QVariant getData(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-            void setData (const RefIdColumn *column, RefIdData& data, int index,
-                                  const QVariant& value) const override;
-            ///< If the data type does not match an exception is thrown.
+        void setData(const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const override;
+        ///< If the data type does not match an exception is thrown.
     };
 
     struct CreatureColumns : public ActorColumns
     {
-        std::map<const RefIdColumn *, unsigned int> mFlags;
-        const RefIdColumn *mType;
-        const RefIdColumn *mScale;
-        const RefIdColumn *mOriginal;
-        const RefIdColumn *mAttributes;
-        const RefIdColumn *mAttacks;
-        const RefIdColumn *mMisc;
-        const RefIdColumn *mBloodType;
+        std::map<const RefIdColumn*, unsigned int> mFlags;
+        const RefIdColumn* mType;
+        const RefIdColumn* mScale;
+        const RefIdColumn* mOriginal;
+        const RefIdColumn* mAttributes;
+        const RefIdColumn* mAttacks;
+        const RefIdColumn* mMisc;
+        const RefIdColumn* mBloodType;
 
-        CreatureColumns (const ActorColumns& actorColumns);
+        CreatureColumns(const ActorColumns& actorColumns);
     };
 
     class CreatureRefIdAdapter : public ActorRefIdAdapter<ESM::Creature>
     {
-            CreatureColumns mColumns;
+        CreatureColumns mColumns;
 
-        public:
-
-            CreatureRefIdAdapter (const CreatureColumns& columns);
+    public:
+        CreatureRefIdAdapter(const CreatureColumns& columns);
 
-            QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
-                const override;
+        QVariant getData(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-            void setData (const RefIdColumn *column, RefIdData& data, int index,
-                const QVariant& value) const override;
-            ///< If the data type does not match an exception is thrown.
+        void setData(const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const override;
+        ///< If the data type does not match an exception is thrown.
     };
 
     class DoorRefIdAdapter : public NameRefIdAdapter<ESM::Door>
     {
-            const RefIdColumn *mOpenSound;
-            const RefIdColumn *mCloseSound;
-
-        public:
+        const RefIdColumn* mOpenSound;
+        const RefIdColumn* mCloseSound;
 
-            DoorRefIdAdapter (const NameColumns& columns, const RefIdColumn *openSound,
-                const RefIdColumn *closeSound);
+    public:
+        DoorRefIdAdapter(const NameColumns& columns, const RefIdColumn* openSound, const RefIdColumn* closeSound);
 
-            QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
-                const override;
+        QVariant getData(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-            void setData (const RefIdColumn *column, RefIdData& data, int index,
-                const QVariant& value) const override;
-            ///< If the data type does not match an exception is thrown.
+        void setData(const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const override;
+        ///< If the data type does not match an exception is thrown.
     };
 
     struct LightColumns : public InventoryColumns
     {
-        const RefIdColumn *mTime;
-        const RefIdColumn *mRadius;
-        const RefIdColumn *mColor;
-        const RefIdColumn *mSound;
-        const RefIdColumn *mEmitterType;
-        std::map<const RefIdColumn *, unsigned int> mFlags;
+        const RefIdColumn* mTime;
+        const RefIdColumn* mRadius;
+        const RefIdColumn* mColor;
+        const RefIdColumn* mSound;
+        const RefIdColumn* mEmitterType;
+        std::map<const RefIdColumn*, unsigned int> mFlags;
 
-        LightColumns (const InventoryColumns& columns);
+        LightColumns(const InventoryColumns& columns);
     };
 
     class LightRefIdAdapter : public InventoryRefIdAdapter<ESM::Light>
     {
-            LightColumns mColumns;
-
-        public:
+        LightColumns mColumns;
 
-            LightRefIdAdapter (const LightColumns& columns);
+    public:
+        LightRefIdAdapter(const LightColumns& columns);
 
-            QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
-                const override;
+        QVariant getData(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-            void setData (const RefIdColumn *column, RefIdData& data, int index,
-                const QVariant& value) const override;
-            ///< If the data type does not match an exception is thrown.
+        void setData(const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const override;
+        ///< If the data type does not match an exception is thrown.
     };
 
     class MiscRefIdAdapter : public InventoryRefIdAdapter<ESM::Miscellaneous>
     {
-            const RefIdColumn *mKey;
+        const RefIdColumn* mKey;
 
-        public:
-
-            MiscRefIdAdapter (const InventoryColumns& columns, const RefIdColumn *key);
+    public:
+        MiscRefIdAdapter(const InventoryColumns& columns, const RefIdColumn* key);
 
-            QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
-                const override;
+        QVariant getData(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-            void setData (const RefIdColumn *column, RefIdData& data, int index,
-                const QVariant& value) const override;
-            ///< If the data type does not match an exception is thrown.
+        void setData(const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const override;
+        ///< If the data type does not match an exception is thrown.
     };
 
     struct NpcColumns : public ActorColumns
     {
-        std::map<const RefIdColumn *, unsigned int> mFlags;
-        const RefIdColumn *mRace;
-        const RefIdColumn *mClass;
-        const RefIdColumn *mFaction;
-        const RefIdColumn *mHair;
-        const RefIdColumn *mHead;
-        const RefIdColumn *mAttributes; // depends on npc type
-        const RefIdColumn *mSkills;     // depends on npc type
-        const RefIdColumn *mMisc;       // may depend on npc type, e.g. FactionID
-        const RefIdColumn *mBloodType;
-        const RefIdColumn *mGender;
-
-        NpcColumns (const ActorColumns& actorColumns);
+        std::map<const RefIdColumn*, unsigned int> mFlags;
+        const RefIdColumn* mRace;
+        const RefIdColumn* mClass;
+        const RefIdColumn* mFaction;
+        const RefIdColumn* mHair;
+        const RefIdColumn* mHead;
+        const RefIdColumn* mAttributes; // depends on npc type
+        const RefIdColumn* mSkills; // depends on npc type
+        const RefIdColumn* mMisc; // may depend on npc type, e.g. FactionID
+        const RefIdColumn* mBloodType;
+        const RefIdColumn* mGender;
+
+        NpcColumns(const ActorColumns& actorColumns);
     };
 
     class NpcRefIdAdapter : public ActorRefIdAdapter<ESM::NPC>
     {
-            NpcColumns mColumns;
-
-        public:
+        NpcColumns mColumns;
 
-            NpcRefIdAdapter (const NpcColumns& columns);
+    public:
+        NpcRefIdAdapter(const NpcColumns& columns);
 
-            QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
-                const override;
+        QVariant getData(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-            void setData (const RefIdColumn *column, RefIdData& data, int index,
-                const QVariant& value) const override;
-            ///< If the data type does not match an exception is thrown.
+        void setData(const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const override;
+        ///< If the data type does not match an exception is thrown.
     };
 
     struct WeaponColumns : public EnchantableColumns
     {
-        const RefIdColumn *mType;
-        const RefIdColumn *mHealth;
-        const RefIdColumn *mSpeed;
-        const RefIdColumn *mReach;
-        const RefIdColumn *mChop[2];
-        const RefIdColumn *mSlash[2];
-        const RefIdColumn *mThrust[2];
-        std::map<const RefIdColumn *, unsigned int> mFlags;
+        const RefIdColumn* mType;
+        const RefIdColumn* mHealth;
+        const RefIdColumn* mSpeed;
+        const RefIdColumn* mReach;
+        const RefIdColumn* mChop[2];
+        const RefIdColumn* mSlash[2];
+        const RefIdColumn* mThrust[2];
+        std::map<const RefIdColumn*, unsigned int> mFlags;
 
-        WeaponColumns (const EnchantableColumns& columns);
+        WeaponColumns(const EnchantableColumns& columns);
     };
 
     class WeaponRefIdAdapter : public EnchantableRefIdAdapter<ESM::Weapon>
     {
-            WeaponColumns mColumns;
-
-        public:
+        WeaponColumns mColumns;
 
-            WeaponRefIdAdapter (const WeaponColumns& columns);
+    public:
+        WeaponRefIdAdapter(const WeaponColumns& columns);
 
-            QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
-                const override;
+        QVariant getData(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-            void setData (const RefIdColumn *column, RefIdData& data, int index,
-                const QVariant& value) const override;
-            ///< If the data type does not match an exception is thrown.
+        void setData(const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const override;
+        ///< If the data type does not match an exception is thrown.
     };
 
-
     class NestedRefIdAdapterBase;
 
     class NpcAttributesRefIdAdapter : public NestedRefIdAdapterBase
     {
     public:
+        NpcAttributesRefIdAdapter();
 
-        NpcAttributesRefIdAdapter ();
-
-        void addNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int position) const override;
+        void addNestedRow(const RefIdColumn* column, RefIdData& data, int index, int position) const override;
 
-        void removeNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int rowToRemove) const override;
+        void removeNestedRow(const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const override;
 
-        void setNestedTable (const RefIdColumn* column,
-                RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const override;
+        void setNestedTable(const RefIdColumn* column, RefIdData& data, int index,
+            const NestedTableWrapperBase& nestedTable) const override;
 
-        NestedTableWrapperBase* nestedTable (const RefIdColumn* column,
-                const RefIdData& data, int index) const override;
+        NestedTableWrapperBase* nestedTable(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-        QVariant getNestedData (const RefIdColumn *column,
-                const RefIdData& data, int index, int subRowIndex, int subColIndex) const override;
+        QVariant getNestedData(const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex,
+            int subColIndex) const override;
 
-        void setNestedData (const RefIdColumn *column,
-                RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const override;
+        void setNestedData(const RefIdColumn* column, RefIdData& data, int row, const QVariant& value, int subRowIndex,
+            int subColIndex) const override;
 
-        int getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const override;
+        int getNestedColumnsCount(const RefIdColumn* column, const RefIdData& data) const override;
 
-        int getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const override;
+        int getNestedRowsCount(const RefIdColumn* column, const RefIdData& data, int index) const override;
     };
 
     class NpcSkillsRefIdAdapter : public NestedRefIdAdapterBase
     {
     public:
+        NpcSkillsRefIdAdapter();
 
-        NpcSkillsRefIdAdapter ();
-
-        void addNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int position) const override;
+        void addNestedRow(const RefIdColumn* column, RefIdData& data, int index, int position) const override;
 
-        void removeNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int rowToRemove) const override;
+        void removeNestedRow(const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const override;
 
-        void setNestedTable (const RefIdColumn* column,
-                RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const override;
+        void setNestedTable(const RefIdColumn* column, RefIdData& data, int index,
+            const NestedTableWrapperBase& nestedTable) const override;
 
-        NestedTableWrapperBase* nestedTable (const RefIdColumn* column,
-                const RefIdData& data, int index) const override;
+        NestedTableWrapperBase* nestedTable(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-        QVariant getNestedData (const RefIdColumn *column,
-                const RefIdData& data, int index, int subRowIndex, int subColIndex) const override;
+        QVariant getNestedData(const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex,
+            int subColIndex) const override;
 
-        void setNestedData (const RefIdColumn *column,
-                RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const override;
+        void setNestedData(const RefIdColumn* column, RefIdData& data, int row, const QVariant& value, int subRowIndex,
+            int subColIndex) const override;
 
-        int getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const override;
+        int getNestedColumnsCount(const RefIdColumn* column, const RefIdData& data) const override;
 
-        int getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const override;
+        int getNestedRowsCount(const RefIdColumn* column, const RefIdData& data, int index) const override;
     };
 
     class NpcMiscRefIdAdapter : public NestedRefIdAdapterBase
     {
-        NpcMiscRefIdAdapter (const NpcMiscRefIdAdapter&);
-        NpcMiscRefIdAdapter& operator= (const NpcMiscRefIdAdapter&);
+        NpcMiscRefIdAdapter(const NpcMiscRefIdAdapter&);
+        NpcMiscRefIdAdapter& operator=(const NpcMiscRefIdAdapter&);
 
     public:
-
-        NpcMiscRefIdAdapter ();
+        NpcMiscRefIdAdapter();
         ~NpcMiscRefIdAdapter() override;
 
-        void addNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int position) const override;
+        void addNestedRow(const RefIdColumn* column, RefIdData& data, int index, int position) const override;
 
-        void removeNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int rowToRemove) const override;
+        void removeNestedRow(const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const override;
 
-        void setNestedTable (const RefIdColumn* column,
-                RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const override;
+        void setNestedTable(const RefIdColumn* column, RefIdData& data, int index,
+            const NestedTableWrapperBase& nestedTable) const override;
 
-        NestedTableWrapperBase* nestedTable (const RefIdColumn* column,
-                const RefIdData& data, int index) const override;
+        NestedTableWrapperBase* nestedTable(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-        QVariant getNestedData (const RefIdColumn *column,
-                const RefIdData& data, int index, int subRowIndex, int subColIndex) const override;
+        QVariant getNestedData(const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex,
+            int subColIndex) const override;
 
-        void setNestedData (const RefIdColumn *column,
-                RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const override;
+        void setNestedData(const RefIdColumn* column, RefIdData& data, int row, const QVariant& value, int subRowIndex,
+            int subColIndex) const override;
 
-        int getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const override;
+        int getNestedColumnsCount(const RefIdColumn* column, const RefIdData& data) const override;
 
-        int getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const override;
+        int getNestedRowsCount(const RefIdColumn* column, const RefIdData& data, int index) const override;
     };
 
     class CreatureAttributesRefIdAdapter : public NestedRefIdAdapterBase
     {
     public:
+        CreatureAttributesRefIdAdapter();
 
-        CreatureAttributesRefIdAdapter ();
-
-        void addNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int position) const override;
+        void addNestedRow(const RefIdColumn* column, RefIdData& data, int index, int position) const override;
 
-        void removeNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int rowToRemove) const override;
+        void removeNestedRow(const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const override;
 
-        void setNestedTable (const RefIdColumn* column,
-                RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const override;
+        void setNestedTable(const RefIdColumn* column, RefIdData& data, int index,
+            const NestedTableWrapperBase& nestedTable) const override;
 
-        NestedTableWrapperBase* nestedTable (const RefIdColumn* column,
-                const RefIdData& data, int index) const override;
+        NestedTableWrapperBase* nestedTable(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-        QVariant getNestedData (const RefIdColumn *column,
-                const RefIdData& data, int index, int subRowIndex, int subColIndex) const override;
+        QVariant getNestedData(const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex,
+            int subColIndex) const override;
 
-        void setNestedData (const RefIdColumn *column,
-                RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const override;
+        void setNestedData(const RefIdColumn* column, RefIdData& data, int row, const QVariant& value, int subRowIndex,
+            int subColIndex) const override;
 
-        int getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const override;
+        int getNestedColumnsCount(const RefIdColumn* column, const RefIdData& data) const override;
 
-        int getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const override;
+        int getNestedRowsCount(const RefIdColumn* column, const RefIdData& data, int index) const override;
     };
 
     class CreatureAttackRefIdAdapter : public NestedRefIdAdapterBase
     {
     public:
+        CreatureAttackRefIdAdapter();
 
-        CreatureAttackRefIdAdapter ();
-
-        void addNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int position) const override;
+        void addNestedRow(const RefIdColumn* column, RefIdData& data, int index, int position) const override;
 
-        void removeNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int rowToRemove) const override;
+        void removeNestedRow(const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const override;
 
-        void setNestedTable (const RefIdColumn* column,
-                RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const override;
+        void setNestedTable(const RefIdColumn* column, RefIdData& data, int index,
+            const NestedTableWrapperBase& nestedTable) const override;
 
-        NestedTableWrapperBase* nestedTable (const RefIdColumn* column,
-                const RefIdData& data, int index) const override;
+        NestedTableWrapperBase* nestedTable(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-        QVariant getNestedData (const RefIdColumn *column,
-                const RefIdData& data, int index, int subRowIndex, int subColIndex) const override;
+        QVariant getNestedData(const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex,
+            int subColIndex) const override;
 
-        void setNestedData (const RefIdColumn *column,
-                RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const override;
+        void setNestedData(const RefIdColumn* column, RefIdData& data, int row, const QVariant& value, int subRowIndex,
+            int subColIndex) const override;
 
-        int getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const override;
+        int getNestedColumnsCount(const RefIdColumn* column, const RefIdData& data) const override;
 
-        int getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const override;
+        int getNestedRowsCount(const RefIdColumn* column, const RefIdData& data, int index) const override;
     };
 
     class CreatureMiscRefIdAdapter : public NestedRefIdAdapterBase
     {
-        CreatureMiscRefIdAdapter (const CreatureMiscRefIdAdapter&);
-        CreatureMiscRefIdAdapter& operator= (const CreatureMiscRefIdAdapter&);
+        CreatureMiscRefIdAdapter(const CreatureMiscRefIdAdapter&);
+        CreatureMiscRefIdAdapter& operator=(const CreatureMiscRefIdAdapter&);
 
     public:
-
-        CreatureMiscRefIdAdapter ();
+        CreatureMiscRefIdAdapter();
         ~CreatureMiscRefIdAdapter() override;
 
-        void addNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int position) const override;
+        void addNestedRow(const RefIdColumn* column, RefIdData& data, int index, int position) const override;
 
-        void removeNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int rowToRemove) const override;
+        void removeNestedRow(const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const override;
 
-        void setNestedTable (const RefIdColumn* column,
-                RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const override;
+        void setNestedTable(const RefIdColumn* column, RefIdData& data, int index,
+            const NestedTableWrapperBase& nestedTable) const override;
 
-        NestedTableWrapperBase* nestedTable (const RefIdColumn* column,
-                const RefIdData& data, int index) const override;
+        NestedTableWrapperBase* nestedTable(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-        QVariant getNestedData (const RefIdColumn *column,
-                const RefIdData& data, int index, int subRowIndex, int subColIndex) const override;
+        QVariant getNestedData(const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex,
+            int subColIndex) const override;
 
-        void setNestedData (const RefIdColumn *column,
-                RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const override;
+        void setNestedData(const RefIdColumn* column, RefIdData& data, int row, const QVariant& value, int subRowIndex,
+            int subColIndex) const override;
 
-        int getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const override;
+        int getNestedColumnsCount(const RefIdColumn* column, const RefIdData& data) const override;
 
-        int getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const override;
+        int getNestedRowsCount(const RefIdColumn* column, const RefIdData& data, int index) const override;
     };
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     class EffectsListAdapter;
 
-    template<typename ESXRecordT>
+    template <typename ESXRecordT>
     class EffectsRefIdAdapter : public EffectsListAdapter<ESXRecordT>, public NestedRefIdAdapterBase
     {
         UniversalId::Type mType;
 
         // not implemented
-        EffectsRefIdAdapter (const EffectsRefIdAdapter&);
-        EffectsRefIdAdapter& operator= (const EffectsRefIdAdapter&);
+        EffectsRefIdAdapter(const EffectsRefIdAdapter&);
+        EffectsRefIdAdapter& operator=(const EffectsRefIdAdapter&);
 
     public:
-
-        EffectsRefIdAdapter(UniversalId::Type type) :mType(type) {}
+        EffectsRefIdAdapter(UniversalId::Type type)
+            : mType(type)
+        {
+        }
 
         virtual ~EffectsRefIdAdapter() {}
 
-        void addNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int position) const override
+        void addNestedRow(const RefIdColumn* column, RefIdData& data, int index, int position) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             EffectsListAdapter<ESXRecordT>::addRow(record, position);
         }
 
-        void removeNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int rowToRemove) const override
+        void removeNestedRow(const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             EffectsListAdapter<ESXRecordT>::removeRow(record, rowToRemove);
         }
 
-        void setNestedTable (const RefIdColumn* column,
-                RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const override
+        void setNestedTable(const RefIdColumn* column, RefIdData& data, int index,
+            const NestedTableWrapperBase& nestedTable) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             EffectsListAdapter<ESXRecordT>::setTable(record, nestedTable);
         }
 
-        NestedTableWrapperBase* nestedTable (const RefIdColumn* column,
-                const RefIdData& data, int index) const override
+        NestedTableWrapperBase* nestedTable(const RefIdColumn* column, const RefIdData& data, int index) const override
         {
-            const Record<ESXRecordT>& record =
-                static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            const Record<ESXRecordT>& record
+                = static_cast<const Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             return EffectsListAdapter<ESXRecordT>::table(record);
         }
 
-        QVariant getNestedData (const RefIdColumn *column,
-                const RefIdData& data, int index, int subRowIndex, int subColIndex) const override
+        QVariant getNestedData(const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex,
+            int subColIndex) const override
         {
-            const Record<ESXRecordT>& record =
-                static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            const Record<ESXRecordT>& record
+                = static_cast<const Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             return EffectsListAdapter<ESXRecordT>::getData(record, subRowIndex, subColIndex);
         }
 
-        void setNestedData (const RefIdColumn *column,
-                RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const override
+        void setNestedData(const RefIdColumn* column, RefIdData& data, int row, const QVariant& value, int subRowIndex,
+            int subColIndex) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (row, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(row, mType)));
             EffectsListAdapter<ESXRecordT>::setData(record, value, subRowIndex, subColIndex);
         }
 
-        int getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const override
+        int getNestedColumnsCount(const RefIdColumn* column, const RefIdData& data) const override
         {
             const Record<ESXRecordT> record; // not used, just a dummy
             return EffectsListAdapter<ESXRecordT>::getColumnsCount(record);
         }
 
-        int getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const override
+        int getNestedRowsCount(const RefIdColumn* column, const RefIdData& data, int index) const override
         {
-            const Record<ESXRecordT>& record =
-                static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            const Record<ESXRecordT>& record
+                = static_cast<const Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             return EffectsListAdapter<ESXRecordT>::getRowsCount(record);
         }
     };
@@ -1239,20 +1163,21 @@ namespace CSMWorld
         UniversalId::Type mType;
 
         // not implemented
-        NestedInventoryRefIdAdapter (const NestedInventoryRefIdAdapter&);
-        NestedInventoryRefIdAdapter& operator= (const NestedInventoryRefIdAdapter&);
+        NestedInventoryRefIdAdapter(const NestedInventoryRefIdAdapter&);
+        NestedInventoryRefIdAdapter& operator=(const NestedInventoryRefIdAdapter&);
 
     public:
-
-        NestedInventoryRefIdAdapter(UniversalId::Type type) :mType(type) {}
+        NestedInventoryRefIdAdapter(UniversalId::Type type)
+            : mType(type)
+        {
+        }
 
         virtual ~NestedInventoryRefIdAdapter() {}
 
-        void addNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int position) const override
+        void addNestedRow(const RefIdColumn* column, RefIdData& data, int index, int position) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             ESXRecordT container = record.get();
 
             std::vector<ESM::ContItem>& list = container.mInventory.mList;
@@ -1262,85 +1187,85 @@ namespace CSMWorld
             if (position >= (int)list.size())
                 list.push_back(newRow);
             else
-                list.insert(list.begin()+position, newRow);
+                list.insert(list.begin() + position, newRow);
 
-            record.setModified (container);
+            record.setModified(container);
         }
 
-        void removeNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int rowToRemove) const override
+        void removeNestedRow(const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             ESXRecordT container = record.get();
 
             std::vector<ESM::ContItem>& list = container.mInventory.mList;
 
-            if (rowToRemove < 0 || rowToRemove >= static_cast<int> (list.size()))
-                throw std::runtime_error ("index out of range");
+            if (rowToRemove < 0 || rowToRemove >= static_cast<int>(list.size()))
+                throw std::runtime_error("index out of range");
 
-            list.erase (list.begin () + rowToRemove);
+            list.erase(list.begin() + rowToRemove);
 
-            record.setModified (container);
+            record.setModified(container);
         }
 
-        void setNestedTable (const RefIdColumn* column,
-                RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const override
+        void setNestedTable(const RefIdColumn* column, RefIdData& data, int index,
+            const NestedTableWrapperBase& nestedTable) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             ESXRecordT container = record.get();
 
-            container.mInventory.mList =
-                static_cast<const NestedTableWrapper<std::vector<typename ESM::ContItem> >&>(nestedTable).mNestedTable;
+            container.mInventory.mList
+                = static_cast<const NestedTableWrapper<std::vector<typename ESM::ContItem>>&>(nestedTable).mNestedTable;
 
-            record.setModified (container);
+            record.setModified(container);
         }
 
-        NestedTableWrapperBase* nestedTable (const RefIdColumn* column,
-                const RefIdData& data, int index) const override
+        NestedTableWrapperBase* nestedTable(const RefIdColumn* column, const RefIdData& data, int index) const override
         {
-            const Record<ESXRecordT>& record =
-                static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            const Record<ESXRecordT>& record
+                = static_cast<const Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
             // deleted by dtor of NestedTableStoring
-            return new NestedTableWrapper<std::vector<typename ESM::ContItem> >(record.get().mInventory.mList);
+            return new NestedTableWrapper<std::vector<typename ESM::ContItem>>(record.get().mInventory.mList);
         }
 
-        QVariant getNestedData (const RefIdColumn *column,
-                const RefIdData& data, int index, int subRowIndex, int subColIndex) const override
+        QVariant getNestedData(const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex,
+            int subColIndex) const override
         {
-            const Record<ESXRecordT>& record =
-                static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            const Record<ESXRecordT>& record
+                = static_cast<const Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
             const std::vector<ESM::ContItem>& list = record.get().mInventory.mList;
 
-            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (list.size()))
-                throw std::runtime_error ("index out of range");
+            if (subRowIndex < 0 || subRowIndex >= static_cast<int>(list.size()))
+                throw std::runtime_error("index out of range");
 
             const ESM::ContItem& content = list.at(subRowIndex);
 
             switch (subColIndex)
             {
-                case 0: return QString::fromUtf8(content.mItem.c_str());
-                case 1: return content.mCount;
+                case 0:
+                    return QString::fromUtf8(content.mItem.c_str());
+                case 1:
+                    return content.mCount;
                 default:
                     throw std::runtime_error("Trying to access non-existing column in the nested table!");
             }
         }
 
-        void setNestedData (const RefIdColumn *column,
-                RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const override
+        void setNestedData(const RefIdColumn* column, RefIdData& data, int row, const QVariant& value, int subRowIndex,
+            int subColIndex) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (row, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(row, mType)));
             ESXRecordT container = record.get();
             std::vector<ESM::ContItem>& list = container.mInventory.mList;
 
-            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (list.size()))
-                throw std::runtime_error ("index out of range");
+            if (subRowIndex < 0 || subRowIndex >= static_cast<int>(list.size()))
+                throw std::runtime_error("index out of range");
 
-            switch(subColIndex)
+            switch (subColIndex)
             {
                 case 0:
                     list.at(subRowIndex).mItem.assign(std::string(value.toString().toUtf8().constData()));
@@ -1354,18 +1279,15 @@ namespace CSMWorld
                     throw std::runtime_error("Trying to access non-existing column in the nested table!");
             }
 
-            record.setModified (container);
+            record.setModified(container);
         }
 
-        int getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const override
-        {
-            return 2;
-        }
+        int getNestedColumnsCount(const RefIdColumn* column, const RefIdData& data) const override { return 2; }
 
-        int getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const override
+        int getNestedRowsCount(const RefIdColumn* column, const RefIdData& data, int index) const override
         {
-            const Record<ESXRecordT>& record =
-                static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            const Record<ESXRecordT>& record
+                = static_cast<const Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
             return static_cast<int>(record.get().mInventory.mList.size());
         }
@@ -1377,20 +1299,21 @@ namespace CSMWorld
         UniversalId::Type mType;
 
         // not implemented
-        NestedSpellRefIdAdapter (const NestedSpellRefIdAdapter&);
-        NestedSpellRefIdAdapter& operator= (const NestedSpellRefIdAdapter&);
+        NestedSpellRefIdAdapter(const NestedSpellRefIdAdapter&);
+        NestedSpellRefIdAdapter& operator=(const NestedSpellRefIdAdapter&);
 
     public:
-
-        NestedSpellRefIdAdapter(UniversalId::Type type) :mType(type) {}
+        NestedSpellRefIdAdapter(UniversalId::Type type)
+            : mType(type)
+        {
+        }
 
         virtual ~NestedSpellRefIdAdapter() {}
 
-        void addNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int position) const override
+        void addNestedRow(const RefIdColumn* column, RefIdData& data, int index, int position) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             ESXRecordT caster = record.get();
 
             std::vector<std::string>& list = caster.mSpells.mList;
@@ -1400,61 +1323,59 @@ namespace CSMWorld
             if (position >= (int)list.size())
                 list.push_back(newString);
             else
-                list.insert(list.begin()+position, newString);
+                list.insert(list.begin() + position, newString);
 
-            record.setModified (caster);
+            record.setModified(caster);
         }
 
-        void removeNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int rowToRemove) const override
+        void removeNestedRow(const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             ESXRecordT caster = record.get();
 
             std::vector<std::string>& list = caster.mSpells.mList;
 
-            if (rowToRemove < 0 || rowToRemove >= static_cast<int> (list.size()))
-                throw std::runtime_error ("index out of range");
+            if (rowToRemove < 0 || rowToRemove >= static_cast<int>(list.size()))
+                throw std::runtime_error("index out of range");
 
-            list.erase (list.begin () + rowToRemove);
+            list.erase(list.begin() + rowToRemove);
 
-            record.setModified (caster);
+            record.setModified(caster);
         }
 
-        void setNestedTable (const RefIdColumn* column,
-                RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const override
+        void setNestedTable(const RefIdColumn* column, RefIdData& data, int index,
+            const NestedTableWrapperBase& nestedTable) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             ESXRecordT caster = record.get();
 
-            caster.mSpells.mList =
-                static_cast<const NestedTableWrapper<std::vector<typename std::string> >&>(nestedTable).mNestedTable;
+            caster.mSpells.mList
+                = static_cast<const NestedTableWrapper<std::vector<typename std::string>>&>(nestedTable).mNestedTable;
 
-            record.setModified (caster);
+            record.setModified(caster);
         }
 
-        NestedTableWrapperBase* nestedTable (const RefIdColumn* column,
-                const RefIdData& data, int index) const override
+        NestedTableWrapperBase* nestedTable(const RefIdColumn* column, const RefIdData& data, int index) const override
         {
-            const Record<ESXRecordT>& record =
-                static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            const Record<ESXRecordT>& record
+                = static_cast<const Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
             // deleted by dtor of NestedTableStoring
-            return new NestedTableWrapper<std::vector<typename std::string> >(record.get().mSpells.mList);
+            return new NestedTableWrapper<std::vector<typename std::string>>(record.get().mSpells.mList);
         }
 
-        QVariant getNestedData (const RefIdColumn *column,
-                const RefIdData& data, int index, int subRowIndex, int subColIndex) const override
+        QVariant getNestedData(const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex,
+            int subColIndex) const override
         {
-            const Record<ESXRecordT>& record =
-                static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            const Record<ESXRecordT>& record
+                = static_cast<const Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
             const std::vector<std::string>& list = record.get().mSpells.mList;
 
-            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (list.size()))
-                throw std::runtime_error ("index out of range");
+            if (subRowIndex < 0 || subRowIndex >= static_cast<int>(list.size()))
+                throw std::runtime_error("index out of range");
 
             const std::string& content = list.at(subRowIndex);
 
@@ -1464,34 +1385,31 @@ namespace CSMWorld
                 throw std::runtime_error("Trying to access non-existing column in the nested table!");
         }
 
-        void setNestedData (const RefIdColumn *column,
-                RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const override
+        void setNestedData(const RefIdColumn* column, RefIdData& data, int row, const QVariant& value, int subRowIndex,
+            int subColIndex) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (row, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(row, mType)));
             ESXRecordT caster = record.get();
             std::vector<std::string>& list = caster.mSpells.mList;
 
-            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (list.size()))
-                throw std::runtime_error ("index out of range");
+            if (subRowIndex < 0 || subRowIndex >= static_cast<int>(list.size()))
+                throw std::runtime_error("index out of range");
 
             if (subColIndex == 0)
                 list.at(subRowIndex) = std::string(value.toString().toUtf8());
             else
                 throw std::runtime_error("Trying to access non-existing column in the nested table!");
 
-            record.setModified (caster);
+            record.setModified(caster);
         }
 
-        int getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const override
-        {
-            return 1;
-        }
+        int getNestedColumnsCount(const RefIdColumn* column, const RefIdData& data) const override { return 1; }
 
-        int getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const override
+        int getNestedRowsCount(const RefIdColumn* column, const RefIdData& data, int index) const override
         {
-            const Record<ESXRecordT>& record =
-                static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            const Record<ESXRecordT>& record
+                = static_cast<const Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
             return static_cast<int>(record.get().mSpells.mList.size());
         }
@@ -1503,20 +1421,21 @@ namespace CSMWorld
         UniversalId::Type mType;
 
         // not implemented
-        NestedTravelRefIdAdapter (const NestedTravelRefIdAdapter&);
-        NestedTravelRefIdAdapter& operator= (const NestedTravelRefIdAdapter&);
+        NestedTravelRefIdAdapter(const NestedTravelRefIdAdapter&);
+        NestedTravelRefIdAdapter& operator=(const NestedTravelRefIdAdapter&);
 
     public:
-
-        NestedTravelRefIdAdapter(UniversalId::Type type) :mType(type) {}
+        NestedTravelRefIdAdapter(UniversalId::Type type)
+            : mType(type)
+        {
+        }
 
         virtual ~NestedTravelRefIdAdapter() {}
 
-        void addNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int position) const override
+        void addNestedRow(const RefIdColumn* column, RefIdData& data, int index, int position) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             ESXRecordT traveller = record.get();
 
             std::vector<ESM::Transport::Dest>& list = traveller.mTransport.mList;
@@ -1535,114 +1454,131 @@ namespace CSMWorld
             if (position >= (int)list.size())
                 list.push_back(newRow);
             else
-                list.insert(list.begin()+position, newRow);
+                list.insert(list.begin() + position, newRow);
 
-            record.setModified (traveller);
+            record.setModified(traveller);
         }
 
-        void removeNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int rowToRemove) const override
+        void removeNestedRow(const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             ESXRecordT traveller = record.get();
 
             std::vector<ESM::Transport::Dest>& list = traveller.mTransport.mList;
 
-            if (rowToRemove < 0 || rowToRemove >= static_cast<int> (list.size()))
-                throw std::runtime_error ("index out of range");
+            if (rowToRemove < 0 || rowToRemove >= static_cast<int>(list.size()))
+                throw std::runtime_error("index out of range");
 
-            list.erase (list.begin () + rowToRemove);
+            list.erase(list.begin() + rowToRemove);
 
-            record.setModified (traveller);
+            record.setModified(traveller);
         }
 
-        void setNestedTable (const RefIdColumn* column,
-                RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const override
+        void setNestedTable(const RefIdColumn* column, RefIdData& data, int index,
+            const NestedTableWrapperBase& nestedTable) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             ESXRecordT traveller = record.get();
 
-            traveller.mTransport.mList =
-                static_cast<const NestedTableWrapper<std::vector<typename ESM::Transport::Dest> >&>(nestedTable).mNestedTable;
+            traveller.mTransport.mList
+                = static_cast<const NestedTableWrapper<std::vector<typename ESM::Transport::Dest>>&>(nestedTable)
+                      .mNestedTable;
 
-            record.setModified (traveller);
+            record.setModified(traveller);
         }
 
-        NestedTableWrapperBase* nestedTable (const RefIdColumn* column,
-                const RefIdData& data, int index) const override
+        NestedTableWrapperBase* nestedTable(const RefIdColumn* column, const RefIdData& data, int index) const override
         {
-            const Record<ESXRecordT>& record =
-                static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            const Record<ESXRecordT>& record
+                = static_cast<const Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
             // deleted by dtor of NestedTableStoring
-            return new NestedTableWrapper<std::vector<typename ESM::Transport::Dest> >(record.get().mTransport.mList);
+            return new NestedTableWrapper<std::vector<typename ESM::Transport::Dest>>(record.get().mTransport.mList);
         }
 
-        QVariant getNestedData (const RefIdColumn *column,
-                const RefIdData& data, int index, int subRowIndex, int subColIndex) const override
+        QVariant getNestedData(const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex,
+            int subColIndex) const override
         {
-            const Record<ESXRecordT>& record =
-                static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            const Record<ESXRecordT>& record
+                = static_cast<const Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
             const std::vector<ESM::Transport::Dest>& list = record.get().mTransport.mList;
 
-            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (list.size()))
-                throw std::runtime_error ("index out of range");
+            if (subRowIndex < 0 || subRowIndex >= static_cast<int>(list.size()))
+                throw std::runtime_error("index out of range");
 
             const ESM::Transport::Dest& content = list.at(subRowIndex);
 
             switch (subColIndex)
             {
-                case 0: return QString::fromUtf8(content.mCellName.c_str());
-                case 1: return content.mPos.pos[0];
-                case 2: return content.mPos.pos[1];
-                case 3: return content.mPos.pos[2];
-                case 4: return content.mPos.rot[0];
-                case 5: return content.mPos.rot[1];
-                case 6: return content.mPos.rot[2];
+                case 0:
+                    return QString::fromUtf8(content.mCellName.c_str());
+                case 1:
+                    return content.mPos.pos[0];
+                case 2:
+                    return content.mPos.pos[1];
+                case 3:
+                    return content.mPos.pos[2];
+                case 4:
+                    return content.mPos.rot[0];
+                case 5:
+                    return content.mPos.rot[1];
+                case 6:
+                    return content.mPos.rot[2];
                 default:
                     throw std::runtime_error("Trying to access non-existing column in the nested table!");
             }
         }
 
-        void setNestedData (const RefIdColumn *column,
-                RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const override
+        void setNestedData(const RefIdColumn* column, RefIdData& data, int row, const QVariant& value, int subRowIndex,
+            int subColIndex) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (row, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(row, mType)));
             ESXRecordT traveller = record.get();
             std::vector<ESM::Transport::Dest>& list = traveller.mTransport.mList;
 
-            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (list.size()))
-                throw std::runtime_error ("index out of range");
+            if (subRowIndex < 0 || subRowIndex >= static_cast<int>(list.size()))
+                throw std::runtime_error("index out of range");
 
-            switch(subColIndex)
+            switch (subColIndex)
             {
-                case 0: list.at(subRowIndex).mCellName = std::string(value.toString().toUtf8().constData()); break;
-                case 1: list.at(subRowIndex).mPos.pos[0] = value.toFloat(); break;
-                case 2: list.at(subRowIndex).mPos.pos[1] = value.toFloat(); break;
-                case 3: list.at(subRowIndex).mPos.pos[2] = value.toFloat(); break;
-                case 4: list.at(subRowIndex).mPos.rot[0] = value.toFloat(); break;
-                case 5: list.at(subRowIndex).mPos.rot[1] = value.toFloat(); break;
-                case 6: list.at(subRowIndex).mPos.rot[2] = value.toFloat(); break;
+                case 0:
+                    list.at(subRowIndex).mCellName = std::string(value.toString().toUtf8().constData());
+                    break;
+                case 1:
+                    list.at(subRowIndex).mPos.pos[0] = value.toFloat();
+                    break;
+                case 2:
+                    list.at(subRowIndex).mPos.pos[1] = value.toFloat();
+                    break;
+                case 3:
+                    list.at(subRowIndex).mPos.pos[2] = value.toFloat();
+                    break;
+                case 4:
+                    list.at(subRowIndex).mPos.rot[0] = value.toFloat();
+                    break;
+                case 5:
+                    list.at(subRowIndex).mPos.rot[1] = value.toFloat();
+                    break;
+                case 6:
+                    list.at(subRowIndex).mPos.rot[2] = value.toFloat();
+                    break;
                 default:
                     throw std::runtime_error("Trying to access non-existing column in the nested table!");
             }
 
-            record.setModified (traveller);
+            record.setModified(traveller);
         }
 
-        int getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const override
-        {
-            return 7;
-        }
+        int getNestedColumnsCount(const RefIdColumn* column, const RefIdData& data) const override { return 7; }
 
-        int getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const override
+        int getNestedRowsCount(const RefIdColumn* column, const RefIdData& data, int index) const override
         {
-            const Record<ESXRecordT>& record =
-                static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            const Record<ESXRecordT>& record
+                = static_cast<const Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
             return static_cast<int>(record.get().mTransport.mList.size());
         }
@@ -1654,22 +1590,23 @@ namespace CSMWorld
         UniversalId::Type mType;
 
         // not implemented
-        ActorAiRefIdAdapter (const ActorAiRefIdAdapter&);
-        ActorAiRefIdAdapter& operator= (const ActorAiRefIdAdapter&);
+        ActorAiRefIdAdapter(const ActorAiRefIdAdapter&);
+        ActorAiRefIdAdapter& operator=(const ActorAiRefIdAdapter&);
 
     public:
-
-        ActorAiRefIdAdapter(UniversalId::Type type) :mType(type) {}
+        ActorAiRefIdAdapter(UniversalId::Type type)
+            : mType(type)
+        {
+        }
 
         virtual ~ActorAiRefIdAdapter() {}
 
         // FIXME: should check if the AI package type is already in the list and use a default
         //        that wasn't used already (in extreme case do not add anything at all?
-        void addNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int position) const override
+        void addNestedRow(const RefIdColumn* column, RefIdData& data, int index, int position) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             ESXRecordT actor = record.get();
 
             std::vector<ESM::AIPackage>& list = actor.mAiPackage.mList;
@@ -1687,61 +1624,60 @@ namespace CSMWorld
             if (position >= (int)list.size())
                 list.push_back(newRow);
             else
-                list.insert(list.begin()+position, newRow);
+                list.insert(list.begin() + position, newRow);
 
-            record.setModified (actor);
+            record.setModified(actor);
         }
 
-        void removeNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int rowToRemove) const override
+        void removeNestedRow(const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             ESXRecordT actor = record.get();
 
             std::vector<ESM::AIPackage>& list = actor.mAiPackage.mList;
 
-            if (rowToRemove < 0 || rowToRemove >= static_cast<int> (list.size()))
-                throw std::runtime_error ("index out of range");
+            if (rowToRemove < 0 || rowToRemove >= static_cast<int>(list.size()))
+                throw std::runtime_error("index out of range");
 
-            list.erase (list.begin () + rowToRemove);
+            list.erase(list.begin() + rowToRemove);
 
-            record.setModified (actor);
+            record.setModified(actor);
         }
 
-        void setNestedTable (const RefIdColumn* column,
-                RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const override
+        void setNestedTable(const RefIdColumn* column, RefIdData& data, int index,
+            const NestedTableWrapperBase& nestedTable) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             ESXRecordT actor = record.get();
 
-            actor.mAiPackage.mList =
-                static_cast<const NestedTableWrapper<std::vector<typename ESM::AIPackage> >&>(nestedTable).mNestedTable;
+            actor.mAiPackage.mList
+                = static_cast<const NestedTableWrapper<std::vector<typename ESM::AIPackage>>&>(nestedTable)
+                      .mNestedTable;
 
-            record.setModified (actor);
+            record.setModified(actor);
         }
 
-        NestedTableWrapperBase* nestedTable (const RefIdColumn* column,
-                const RefIdData& data, int index) const override
+        NestedTableWrapperBase* nestedTable(const RefIdColumn* column, const RefIdData& data, int index) const override
         {
-            const Record<ESXRecordT>& record =
-                static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            const Record<ESXRecordT>& record
+                = static_cast<const Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
             // deleted by dtor of NestedTableStoring
-            return new NestedTableWrapper<std::vector<typename ESM::AIPackage> >(record.get().mAiPackage.mList);
+            return new NestedTableWrapper<std::vector<typename ESM::AIPackage>>(record.get().mAiPackage.mList);
         }
 
-        QVariant getNestedData (const RefIdColumn *column,
-                const RefIdData& data, int index, int subRowIndex, int subColIndex) const override
+        QVariant getNestedData(const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex,
+            int subColIndex) const override
         {
-            const Record<ESXRecordT>& record =
-                static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            const Record<ESXRecordT>& record
+                = static_cast<const Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
             const std::vector<ESM::AIPackage>& list = record.get().mAiPackage.mList;
 
-            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (list.size()))
-                throw std::runtime_error ("index out of range");
+            if (subRowIndex < 0 || subRowIndex >= static_cast<int>(list.size()))
+                throw std::runtime_error("index out of range");
 
             const ESM::AIPackage& content = list.at(subRowIndex);
 
@@ -1751,12 +1687,18 @@ namespace CSMWorld
                     // FIXME: should more than one AI package type be allowed?  Check vanilla
                     switch (content.mType)
                     {
-                        case ESM::AI_Wander: return 0;
-                        case ESM::AI_Travel: return 1;
-                        case ESM::AI_Follow: return 2;
-                        case ESM::AI_Escort: return 3;
-                        case ESM::AI_Activate: return 4;
-                        default: return QVariant();
+                        case ESM::AI_Wander:
+                            return 0;
+                        case ESM::AI_Travel:
+                            return 1;
+                        case ESM::AI_Follow:
+                            return 2;
+                        case ESM::AI_Escort:
+                            return 3;
+                        case ESM::AI_Activate:
+                            return 4;
+                        default:
+                            return QVariant();
                     }
                 case 1: // wander dist
                     if (content.mType == ESM::AI_Wander)
@@ -1784,7 +1726,7 @@ namespace CSMWorld
                 case 10:
                 case 11:
                     if (content.mType == ESM::AI_Wander)
-                        return static_cast<int>(content.mWander.mIdle[subColIndex-4]);
+                        return static_cast<int>(content.mWander.mIdle[subColIndex - 4]);
                     else
                         return QVariant();
                 case 12: // repeat
@@ -1839,30 +1781,41 @@ namespace CSMWorld
             }
         }
 
-        void setNestedData (const RefIdColumn *column,
-                RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const override
+        void setNestedData(const RefIdColumn* column, RefIdData& data, int row, const QVariant& value, int subRowIndex,
+            int subColIndex) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (row, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(row, mType)));
             ESXRecordT actor = record.get();
             std::vector<ESM::AIPackage>& list = actor.mAiPackage.mList;
 
-            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (list.size()))
-                throw std::runtime_error ("index out of range");
+            if (subRowIndex < 0 || subRowIndex >= static_cast<int>(list.size()))
+                throw std::runtime_error("index out of range");
 
             ESM::AIPackage& content = list.at(subRowIndex);
 
-            switch(subColIndex)
+            switch (subColIndex)
             {
                 case 0: // ai package type
                     switch (value.toInt())
                     {
-                        case 0: content.mType = ESM::AI_Wander; break;
-                        case 1: content.mType = ESM::AI_Travel; break;
-                        case 2: content.mType = ESM::AI_Follow; break;
-                        case 3: content.mType = ESM::AI_Escort; break;
-                        case 4: content.mType = ESM::AI_Activate; break;
-                        default: return; // return without saving
+                        case 0:
+                            content.mType = ESM::AI_Wander;
+                            break;
+                        case 1:
+                            content.mType = ESM::AI_Travel;
+                            break;
+                        case 2:
+                            content.mType = ESM::AI_Follow;
+                            break;
+                        case 3:
+                            content.mType = ESM::AI_Escort;
+                            break;
+                        case 4:
+                            content.mType = ESM::AI_Activate;
+                            break;
+                        default:
+                            return; // return without saving
                     }
                     break; // always save
 
@@ -1897,7 +1850,7 @@ namespace CSMWorld
                 case 10:
                 case 11:
                     if (content.mType == ESM::AI_Wander)
-                        content.mWander.mIdle[subColIndex-4] = static_cast<unsigned char>(value.toInt());
+                        content.mWander.mIdle[subColIndex - 4] = static_cast<unsigned char>(value.toInt());
                     else
                         return; // return without saving
 
@@ -1973,44 +1926,41 @@ namespace CSMWorld
                     throw std::runtime_error("Trying to access non-existing column in the nested table!");
             }
 
-            record.setModified (actor);
+            record.setModified(actor);
         }
 
-        int getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const override
-        {
-            return 19;
-        }
+        int getNestedColumnsCount(const RefIdColumn* column, const RefIdData& data) const override { return 19; }
 
-        int getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const override
+        int getNestedRowsCount(const RefIdColumn* column, const RefIdData& data, int index) const override
         {
-            const Record<ESXRecordT>& record =
-                static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            const Record<ESXRecordT>& record
+                = static_cast<const Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
             return static_cast<int>(record.get().mAiPackage.mList.size());
         }
     };
 
-
     template <typename ESXRecordT>
     class BodyPartRefIdAdapter : public NestedRefIdAdapterBase
     {
         UniversalId::Type mType;
 
         // not implemented
-        BodyPartRefIdAdapter (const BodyPartRefIdAdapter&);
-        BodyPartRefIdAdapter& operator= (const BodyPartRefIdAdapter&);
+        BodyPartRefIdAdapter(const BodyPartRefIdAdapter&);
+        BodyPartRefIdAdapter& operator=(const BodyPartRefIdAdapter&);
 
     public:
-
-        BodyPartRefIdAdapter(UniversalId::Type type) :mType(type) {}
+        BodyPartRefIdAdapter(UniversalId::Type type)
+            : mType(type)
+        {
+        }
 
         virtual ~BodyPartRefIdAdapter() {}
 
-        void addNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int position) const override
+        void addNestedRow(const RefIdColumn* column, RefIdData& data, int index, int position) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             ESXRecordT apparel = record.get();
 
             std::vector<ESM::PartReference>& list = apparel.mParts.mParts;
@@ -2023,61 +1973,60 @@ namespace CSMWorld
             if (position >= (int)list.size())
                 list.push_back(newPart);
             else
-                list.insert(list.begin()+position, newPart);
+                list.insert(list.begin() + position, newPart);
 
-            record.setModified (apparel);
+            record.setModified(apparel);
         }
 
-        void removeNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int rowToRemove) const override
+        void removeNestedRow(const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             ESXRecordT apparel = record.get();
 
             std::vector<ESM::PartReference>& list = apparel.mParts.mParts;
 
-            if (rowToRemove < 0 || rowToRemove >= static_cast<int> (list.size()))
-                throw std::runtime_error ("index out of range");
+            if (rowToRemove < 0 || rowToRemove >= static_cast<int>(list.size()))
+                throw std::runtime_error("index out of range");
 
-            list.erase (list.begin () + rowToRemove);
+            list.erase(list.begin() + rowToRemove);
 
-            record.setModified (apparel);
+            record.setModified(apparel);
         }
 
-        void setNestedTable (const RefIdColumn* column,
-                RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const override
+        void setNestedTable(const RefIdColumn* column, RefIdData& data, int index,
+            const NestedTableWrapperBase& nestedTable) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             ESXRecordT apparel = record.get();
 
-            apparel.mParts.mParts =
-                static_cast<const NestedTableWrapper<std::vector<typename ESM::PartReference> >&>(nestedTable).mNestedTable;
+            apparel.mParts.mParts
+                = static_cast<const NestedTableWrapper<std::vector<typename ESM::PartReference>>&>(nestedTable)
+                      .mNestedTable;
 
-            record.setModified (apparel);
+            record.setModified(apparel);
         }
 
-        NestedTableWrapperBase* nestedTable (const RefIdColumn* column,
-                const RefIdData& data, int index) const override
+        NestedTableWrapperBase* nestedTable(const RefIdColumn* column, const RefIdData& data, int index) const override
         {
-            const Record<ESXRecordT>& record =
-                static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            const Record<ESXRecordT>& record
+                = static_cast<const Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
             // deleted by dtor of NestedTableStoring
-            return new NestedTableWrapper<std::vector<typename ESM::PartReference> >(record.get().mParts.mParts);
+            return new NestedTableWrapper<std::vector<typename ESM::PartReference>>(record.get().mParts.mParts);
         }
 
-        QVariant getNestedData (const RefIdColumn *column,
-                const RefIdData& data, int index, int subRowIndex, int subColIndex) const override
+        QVariant getNestedData(const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex,
+            int subColIndex) const override
         {
-            const Record<ESXRecordT>& record =
-                static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            const Record<ESXRecordT>& record
+                = static_cast<const Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
             const std::vector<ESM::PartReference>& list = record.get().mParts.mParts;
 
-            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (list.size()))
-                throw std::runtime_error ("index out of range");
+            if (subRowIndex < 0 || subRowIndex >= static_cast<int>(list.size()))
+                throw std::runtime_error("index out of range");
 
             const ESM::PartReference& content = list.at(subRowIndex);
 
@@ -2090,105 +2039,107 @@ namespace CSMWorld
                     else
                         throw std::runtime_error("Part Reference Type unexpected value");
                 }
-                case 1: return QString(content.mMale.c_str());
-                case 2: return QString(content.mFemale.c_str());
+                case 1:
+                    return QString(content.mMale.c_str());
+                case 2:
+                    return QString(content.mFemale.c_str());
                 default:
                     throw std::runtime_error("Trying to access non-existing column in the nested table!");
             }
         }
 
-        void setNestedData (const RefIdColumn *column,
-                RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const override
+        void setNestedData(const RefIdColumn* column, RefIdData& data, int row, const QVariant& value, int subRowIndex,
+            int subColIndex) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (row, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(row, mType)));
             ESXRecordT apparel = record.get();
             std::vector<ESM::PartReference>& list = apparel.mParts.mParts;
 
-            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (list.size()))
-                throw std::runtime_error ("index out of range");
+            if (subRowIndex < 0 || subRowIndex >= static_cast<int>(list.size()))
+                throw std::runtime_error("index out of range");
 
-            switch(subColIndex)
+            switch (subColIndex)
             {
-                case 0: list.at(subRowIndex).mPart = static_cast<unsigned char>(value.toInt()); break;
-                case 1: list.at(subRowIndex).mMale = value.toString().toStdString(); break;
-                case 2: list.at(subRowIndex).mFemale = value.toString().toStdString(); break;
+                case 0:
+                    list.at(subRowIndex).mPart = static_cast<unsigned char>(value.toInt());
+                    break;
+                case 1:
+                    list.at(subRowIndex).mMale = value.toString().toStdString();
+                    break;
+                case 2:
+                    list.at(subRowIndex).mFemale = value.toString().toStdString();
+                    break;
                 default:
                     throw std::runtime_error("Trying to access non-existing column in the nested table!");
             }
 
-            record.setModified (apparel);
+            record.setModified(apparel);
         }
 
-        int getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const override
-        {
-            return 3;
-        }
+        int getNestedColumnsCount(const RefIdColumn* column, const RefIdData& data) const override { return 3; }
 
-        int getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const override
+        int getNestedRowsCount(const RefIdColumn* column, const RefIdData& data, int index) const override
         {
-            const Record<ESXRecordT>& record =
-                static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            const Record<ESXRecordT>& record
+                = static_cast<const Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
             return static_cast<int>(record.get().mParts.mParts.size());
         }
     };
 
-
     struct LevListColumns : public BaseColumns
     {
-        const RefIdColumn *mLevList;
-        const RefIdColumn *mNestedListLevList;
+        const RefIdColumn* mLevList;
+        const RefIdColumn* mNestedListLevList;
 
-        LevListColumns (const BaseColumns& base)
-        : BaseColumns (base)
-        , mLevList(nullptr)
-        , mNestedListLevList(nullptr)
-        {}
+        LevListColumns(const BaseColumns& base)
+            : BaseColumns(base)
+            , mLevList(nullptr)
+            , mNestedListLevList(nullptr)
+        {
+        }
     };
 
-    template<typename RecordT>
+    template <typename RecordT>
     class LevelledListRefIdAdapter : public BaseRefIdAdapter<RecordT>
     {
-            LevListColumns mLevList;
-
-        public:
+        LevListColumns mLevList;
 
-            LevelledListRefIdAdapter (UniversalId::Type type, const LevListColumns &columns);
+    public:
+        LevelledListRefIdAdapter(UniversalId::Type type, const LevListColumns& columns);
 
-            QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
-                const override;
+        QVariant getData(const RefIdColumn* column, const RefIdData& data, int index) const override;
 
-            void setData (const RefIdColumn *column, RefIdData& data, int index,
-                const QVariant& value) const override;
-            ///< If the data type does not match an exception is thrown.
+        void setData(const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const override;
+        ///< If the data type does not match an exception is thrown.
     };
 
-    template<typename RecordT>
-    LevelledListRefIdAdapter<RecordT>::LevelledListRefIdAdapter (UniversalId::Type type,
-            const LevListColumns &columns)
-    : BaseRefIdAdapter<RecordT> (type, columns), mLevList (columns)
-    {}
+    template <typename RecordT>
+    LevelledListRefIdAdapter<RecordT>::LevelledListRefIdAdapter(UniversalId::Type type, const LevListColumns& columns)
+        : BaseRefIdAdapter<RecordT>(type, columns)
+        , mLevList(columns)
+    {
+    }
 
-    template<typename RecordT>
-    QVariant LevelledListRefIdAdapter<RecordT>::getData (const RefIdColumn *column, const RefIdData& data,
-        int index) const
+    template <typename RecordT>
+    QVariant LevelledListRefIdAdapter<RecordT>::getData(
+        const RefIdColumn* column, const RefIdData& data, int index) const
     {
-        if (column==mLevList.mLevList || column == mLevList.mNestedListLevList)
+        if (column == mLevList.mLevList || column == mLevList.mNestedListLevList)
             return QVariant::fromValue(ColumnBase::TableEdit_Full);
 
-        return BaseRefIdAdapter<RecordT>::getData (column, data, index);
+        return BaseRefIdAdapter<RecordT>::getData(column, data, index);
     }
 
-    template<typename RecordT>
-    void LevelledListRefIdAdapter<RecordT>::setData (const RefIdColumn *column, RefIdData& data, int index,
-        const QVariant& value) const
+    template <typename RecordT>
+    void LevelledListRefIdAdapter<RecordT>::setData(
+        const RefIdColumn* column, RefIdData& data, int index, const QVariant& value) const
     {
-        BaseRefIdAdapter<RecordT>::setData (column, data, index, value);
+        BaseRefIdAdapter<RecordT>::setData(column, data, index, value);
         return;
     }
 
-
     // for non-tables
     template <typename ESXRecordT>
     class NestedListLevListRefIdAdapter : public NestedRefIdAdapterBase
@@ -2196,53 +2147,54 @@ namespace CSMWorld
         UniversalId::Type mType;
 
         // not implemented
-        NestedListLevListRefIdAdapter (const NestedListLevListRefIdAdapter&);
-        NestedListLevListRefIdAdapter& operator= (const NestedListLevListRefIdAdapter&);
+        NestedListLevListRefIdAdapter(const NestedListLevListRefIdAdapter&);
+        NestedListLevListRefIdAdapter& operator=(const NestedListLevListRefIdAdapter&);
 
     public:
-
         NestedListLevListRefIdAdapter(UniversalId::Type type)
-                :mType(type) {}
+            : mType(type)
+        {
+        }
 
         virtual ~NestedListLevListRefIdAdapter() {}
 
-        void addNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int position) const override
+        void addNestedRow(const RefIdColumn* column, RefIdData& data, int index, int position) const override
         {
-            throw std::logic_error ("cannot add a row to a fixed table");
+            throw std::logic_error("cannot add a row to a fixed table");
         }
 
-        void removeNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int rowToRemove) const override
+        void removeNestedRow(const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const override
         {
-            throw std::logic_error ("cannot remove a row to a fixed table");
+            throw std::logic_error("cannot remove a row to a fixed table");
         }
 
-        void setNestedTable (const RefIdColumn* column,
-                RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const override
+        void setNestedTable(const RefIdColumn* column, RefIdData& data, int index,
+            const NestedTableWrapperBase& nestedTable) const override
         {
-            throw std::logic_error ("table operation not supported");
+            throw std::logic_error("table operation not supported");
         }
 
-        NestedTableWrapperBase* nestedTable (const RefIdColumn* column,
-                const RefIdData& data, int index) const override
+        NestedTableWrapperBase* nestedTable(const RefIdColumn* column, const RefIdData& data, int index) const override
         {
-            throw std::logic_error ("table operation not supported");
+            throw std::logic_error("table operation not supported");
         }
 
-        QVariant getNestedData (const RefIdColumn *column,
-                const RefIdData& data, int index, int subRowIndex, int subColIndex) const override
+        QVariant getNestedData(const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex,
+            int subColIndex) const override
         {
-            const Record<ESXRecordT>& record =
-                static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            const Record<ESXRecordT>& record
+                = static_cast<const Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
             if (mType == UniversalId::Type_CreatureLevelledList)
             {
                 switch (subColIndex)
                 {
-                    case 0: return QVariant(); // disable the checkbox editor
-                    case 1: return record.get().mFlags & ESM::CreatureLevList::AllLevels;
-                    case 2: return static_cast<int> (record.get().mChanceNone);
+                    case 0:
+                        return QVariant(); // disable the checkbox editor
+                    case 1:
+                        return record.get().mFlags & ESM::CreatureLevList::AllLevels;
+                    case 2:
+                        return static_cast<int>(record.get().mChanceNone);
                     default:
                         throw std::runtime_error("Trying to access non-existing column in levelled creatues!");
                 }
@@ -2251,30 +2203,34 @@ namespace CSMWorld
             {
                 switch (subColIndex)
                 {
-                    case 0: return record.get().mFlags & ESM::ItemLevList::Each;
-                    case 1: return record.get().mFlags & ESM::ItemLevList::AllLevels;
-                    case 2: return static_cast<int> (record.get().mChanceNone);
+                    case 0:
+                        return record.get().mFlags & ESM::ItemLevList::Each;
+                    case 1:
+                        return record.get().mFlags & ESM::ItemLevList::AllLevels;
+                    case 2:
+                        return static_cast<int>(record.get().mChanceNone);
                     default:
                         throw std::runtime_error("Trying to access non-existing column in levelled items!");
                 }
             }
         }
 
-        void setNestedData (const RefIdColumn *column,
-                RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const override
+        void setNestedData(const RefIdColumn* column, RefIdData& data, int row, const QVariant& value, int subRowIndex,
+            int subColIndex) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (row, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(row, mType)));
             ESXRecordT leveled = record.get();
 
             if (mType == UniversalId::Type_CreatureLevelledList)
             {
-                switch(subColIndex)
+                switch (subColIndex)
                 {
-                    case 0: return; // return without saving
+                    case 0:
+                        return; // return without saving
                     case 1:
                     {
-                        if(value.toBool())
+                        if (value.toBool())
                         {
                             leveled.mFlags |= ESM::CreatureLevList::AllLevels;
                             break;
@@ -2285,18 +2241,20 @@ namespace CSMWorld
                             break;
                         }
                     }
-                    case 2: leveled.mChanceNone = static_cast<unsigned char>(value.toInt()); break;
+                    case 2:
+                        leveled.mChanceNone = static_cast<unsigned char>(value.toInt());
+                        break;
                     default:
                         throw std::runtime_error("Trying to set non-existing column in levelled creatures!");
                 }
             }
             else
             {
-                switch(subColIndex)
+                switch (subColIndex)
                 {
                     case 0:
                     {
-                        if(value.toBool())
+                        if (value.toBool())
                         {
                             leveled.mFlags |= ESM::ItemLevList::Each;
                             break;
@@ -2309,7 +2267,7 @@ namespace CSMWorld
                     }
                     case 1:
                     {
-                        if(value.toBool())
+                        if (value.toBool())
                         {
                             leveled.mFlags |= ESM::ItemLevList::AllLevels;
                             break;
@@ -2320,21 +2278,20 @@ namespace CSMWorld
                             break;
                         }
                     }
-                    case 2: leveled.mChanceNone = static_cast<unsigned char>(value.toInt()); break;
+                    case 2:
+                        leveled.mChanceNone = static_cast<unsigned char>(value.toInt());
+                        break;
                     default:
                         throw std::runtime_error("Trying to set non-existing column in levelled items!");
                 }
             }
 
-            record.setModified (leveled);
+            record.setModified(leveled);
         }
 
-        int getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const override
-        {
-            return 3;
-        }
+        int getNestedColumnsCount(const RefIdColumn* column, const RefIdData& data) const override { return 3; }
 
-        int getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const override
+        int getNestedRowsCount(const RefIdColumn* column, const RefIdData& data, int index) const override
         {
             return 1; // fixed at size 1
         }
@@ -2347,20 +2304,21 @@ namespace CSMWorld
         UniversalId::Type mType;
 
         // not implemented
-        NestedLevListRefIdAdapter (const NestedLevListRefIdAdapter&);
-        NestedLevListRefIdAdapter& operator= (const NestedLevListRefIdAdapter&);
+        NestedLevListRefIdAdapter(const NestedLevListRefIdAdapter&);
+        NestedLevListRefIdAdapter& operator=(const NestedLevListRefIdAdapter&);
 
     public:
-
-        NestedLevListRefIdAdapter(UniversalId::Type type) :mType(type) {}
+        NestedLevListRefIdAdapter(UniversalId::Type type)
+            : mType(type)
+        {
+        }
 
         virtual ~NestedLevListRefIdAdapter() {}
 
-        void addNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int position) const override
+        void addNestedRow(const RefIdColumn* column, RefIdData& data, int index, int position) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             ESXRecordT leveled = record.get();
 
             std::vector<ESM::LevelledListBase::LevelItem>& list = leveled.mList;
@@ -2372,104 +2330,107 @@ namespace CSMWorld
             if (position >= (int)list.size())
                 list.push_back(newItem);
             else
-                list.insert(list.begin()+position, newItem);
+                list.insert(list.begin() + position, newItem);
 
-            record.setModified (leveled);
+            record.setModified(leveled);
         }
 
-        void removeNestedRow (const RefIdColumn *column,
-                RefIdData& data, int index, int rowToRemove) const override
+        void removeNestedRow(const RefIdColumn* column, RefIdData& data, int index, int rowToRemove) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             ESXRecordT leveled = record.get();
 
             std::vector<ESM::LevelledListBase::LevelItem>& list = leveled.mList;
 
-            if (rowToRemove < 0 || rowToRemove >= static_cast<int> (list.size()))
-                throw std::runtime_error ("index out of range");
+            if (rowToRemove < 0 || rowToRemove >= static_cast<int>(list.size()))
+                throw std::runtime_error("index out of range");
 
-            list.erase (list.begin () + rowToRemove);
+            list.erase(list.begin() + rowToRemove);
 
-            record.setModified (leveled);
+            record.setModified(leveled);
         }
 
-        void setNestedTable (const RefIdColumn* column,
-                RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const override
+        void setNestedTable(const RefIdColumn* column, RefIdData& data, int index,
+            const NestedTableWrapperBase& nestedTable) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
             ESXRecordT leveled = record.get();
 
-            leveled.mList =
-                static_cast<const NestedTableWrapper<std::vector<typename ESM::LevelledListBase::LevelItem> >&>(nestedTable).mNestedTable;
+            leveled.mList
+                = static_cast<const NestedTableWrapper<std::vector<typename ESM::LevelledListBase::LevelItem>>&>(
+                    nestedTable)
+                      .mNestedTable;
 
-            record.setModified (leveled);
+            record.setModified(leveled);
         }
 
-        NestedTableWrapperBase* nestedTable (const RefIdColumn* column,
-                const RefIdData& data, int index) const override
+        NestedTableWrapperBase* nestedTable(const RefIdColumn* column, const RefIdData& data, int index) const override
         {
-            const Record<ESXRecordT>& record =
-                static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            const Record<ESXRecordT>& record
+                = static_cast<const Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
             // deleted by dtor of NestedTableStoring
-            return new NestedTableWrapper<std::vector<typename ESM::LevelledListBase::LevelItem> >(record.get().mList);
+            return new NestedTableWrapper<std::vector<typename ESM::LevelledListBase::LevelItem>>(record.get().mList);
         }
 
-        QVariant getNestedData (const RefIdColumn *column,
-                const RefIdData& data, int index, int subRowIndex, int subColIndex) const override
+        QVariant getNestedData(const RefIdColumn* column, const RefIdData& data, int index, int subRowIndex,
+            int subColIndex) const override
         {
-            const Record<ESXRecordT>& record =
-                static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            const Record<ESXRecordT>& record
+                = static_cast<const Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
             const std::vector<ESM::LevelledListBase::LevelItem>& list = record.get().mList;
 
-            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (list.size()))
-                throw std::runtime_error ("index out of range");
+            if (subRowIndex < 0 || subRowIndex >= static_cast<int>(list.size()))
+                throw std::runtime_error("index out of range");
 
             const ESM::LevelledListBase::LevelItem& content = list.at(subRowIndex);
 
             switch (subColIndex)
             {
-                case 0: return QString(content.mId.c_str());
-                case 1: return content.mLevel;
+                case 0:
+                    return QString(content.mId.c_str());
+                case 1:
+                    return content.mLevel;
                 default:
                     throw std::runtime_error("Trying to access non-existing column in the nested table!");
             }
         }
 
-        void setNestedData (const RefIdColumn *column,
-                RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const override
+        void setNestedData(const RefIdColumn* column, RefIdData& data, int row, const QVariant& value, int subRowIndex,
+            int subColIndex) const override
         {
-            Record<ESXRecordT>& record =
-                static_cast<Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (row, mType)));
+            Record<ESXRecordT>& record
+                = static_cast<Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(row, mType)));
             ESXRecordT leveled = record.get();
             std::vector<ESM::LevelledListBase::LevelItem>& list = leveled.mList;
 
-            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (list.size()))
-                throw std::runtime_error ("index out of range");
+            if (subRowIndex < 0 || subRowIndex >= static_cast<int>(list.size()))
+                throw std::runtime_error("index out of range");
 
-            switch(subColIndex)
+            switch (subColIndex)
             {
-                case 0: list.at(subRowIndex).mId = value.toString().toStdString(); break;
-                case 1: list.at(subRowIndex).mLevel = static_cast<short>(value.toInt()); break;
+                case 0:
+                    list.at(subRowIndex).mId = value.toString().toStdString();
+                    break;
+                case 1:
+                    list.at(subRowIndex).mLevel = static_cast<short>(value.toInt());
+                    break;
                 default:
                     throw std::runtime_error("Trying to access non-existing column in the nested table!");
             }
 
-            record.setModified (leveled);
+            record.setModified(leveled);
         }
 
-        int getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const override
-        {
-            return 2;
-        }
+        int getNestedColumnsCount(const RefIdColumn* column, const RefIdData& data) const override { return 2; }
 
-        int getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const override
+        int getNestedRowsCount(const RefIdColumn* column, const RefIdData& data, int index) const override
         {
-            const Record<ESXRecordT>& record =
-                static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
+            const Record<ESXRecordT>& record
+                = static_cast<const Record<ESXRecordT>&>(data.getRecord(RefIdData::LocalIndex(index, mType)));
 
             return static_cast<int>(record.get().mList.size());
         }
diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp
index b5f887e3e6..818dc6a644 100644
--- a/apps/opencs/model/world/refidcollection.cpp
+++ b/apps/opencs/model/world/refidcollection.cpp
@@ -1,21 +1,23 @@
 #include "refidcollection.hpp"
 
-#include <stdexcept>
 #include <memory>
+#include <stdexcept>
 #include <string_view>
 
 #include <components/esm3/esmreader.hpp>
 
-#include "refidadapter.hpp"
-#include "refidadapterimp.hpp"
 #include "columns.hpp"
-#include "nestedtablewrapper.hpp"
 #include "nestedcoladapterimp.hpp"
+#include "nestedtablewrapper.hpp"
+#include "refidadapter.hpp"
+#include "refidadapterimp.hpp"
 
-CSMWorld::RefIdColumn::RefIdColumn (int columnId, Display displayType, int flag,
-    bool editable, bool userEditable)
-    : NestableColumn (columnId, displayType, flag), mEditable (editable), mUserEditable (userEditable)
-{}
+CSMWorld::RefIdColumn::RefIdColumn(int columnId, Display displayType, int flag, bool editable, bool userEditable)
+    : NestableColumn(columnId, displayType, flag)
+    , mEditable(editable)
+    , mUserEditable(userEditable)
+{
+}
 
 bool CSMWorld::RefIdColumn::isEditable() const
 {
@@ -27,12 +29,12 @@ bool CSMWorld::RefIdColumn::isUserEditable() const
     return mUserEditable;
 }
 
-const CSMWorld::RefIdAdapter& CSMWorld::RefIdCollection::findAdapter (UniversalId::Type type) const
+const CSMWorld::RefIdAdapter& CSMWorld::RefIdCollection::findAdapter(UniversalId::Type type) const
 {
-    std::map<UniversalId::Type, RefIdAdapter *>::const_iterator iter = mAdapters.find (type);
+    std::map<UniversalId::Type, RefIdAdapter*>::const_iterator iter = mAdapters.find(type);
 
-    if (iter==mAdapters.end())
-        throw std::logic_error ("unsupported type in RefIdCollection");
+    if (iter == mAdapters.end())
+        throw std::logic_error("unsupported type in RefIdCollection");
 
     return *iter->second;
 }
@@ -41,8 +43,8 @@ CSMWorld::RefIdCollection::RefIdCollection()
 {
     BaseColumns baseColumns;
 
-    mColumns.emplace_back(Columns::ColumnId_Id, ColumnBase::Display_Id,
-        ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue, false, false);
+    mColumns.emplace_back(
+        Columns::ColumnId_Id, ColumnBase::Display_Id, ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue, false, false);
     baseColumns.mId = &mColumns.back();
     mColumns.emplace_back(Columns::ColumnId_Modification, ColumnBase::Display_RecordState,
         ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue, true, false);
@@ -51,17 +53,17 @@ CSMWorld::RefIdCollection::RefIdCollection()
         ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue, false, false);
     baseColumns.mType = &mColumns.back();
     mColumns.emplace_back(Columns::ColumnId_Blocked, ColumnBase::Display_Boolean,
-            ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_Refresh);
+        ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_Refresh);
     baseColumns.mBlocked = &mColumns.back();
 
-    ModelColumns modelColumns (baseColumns);
+    ModelColumns modelColumns(baseColumns);
 
     mColumns.emplace_back(Columns::ColumnId_Persistent, ColumnBase::Display_Boolean);
     modelColumns.mPersistence = &mColumns.back();
     mColumns.emplace_back(Columns::ColumnId_Model, ColumnBase::Display_Mesh);
     modelColumns.mModel = &mColumns.back();
 
-    NameColumns nameColumns (modelColumns);
+    NameColumns nameColumns(modelColumns);
 
     // Only items that can be placed in a container have the 32 character limit, but enforce
     // that for all referenceable types for now.
@@ -70,7 +72,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mColumns.emplace_back(Columns::ColumnId_Script, ColumnBase::Display_Script);
     nameColumns.mScript = &mColumns.back();
 
-    InventoryColumns inventoryColumns (nameColumns);
+    InventoryColumns inventoryColumns(nameColumns);
 
     mColumns.emplace_back(Columns::ColumnId_Icon, ColumnBase::Display_Icon);
     inventoryColumns.mIcon = &mColumns.back();
@@ -79,62 +81,49 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mColumns.emplace_back(Columns::ColumnId_CoinValue, ColumnBase::Display_Integer);
     inventoryColumns.mValue = &mColumns.back();
 
-    IngredientColumns ingredientColumns (inventoryColumns);
-    mColumns.emplace_back(Columns::ColumnId_EffectList,
-        ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
+    IngredientColumns ingredientColumns(inventoryColumns);
+    mColumns.emplace_back(Columns::ColumnId_EffectList, ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
     ingredientColumns.mEffects = &mColumns.back();
     std::map<UniversalId::Type, NestedRefIdAdapterBase*> ingredientEffectsMap;
-    ingredientEffectsMap.insert(std::make_pair(UniversalId::Type_Ingredient,
-        new IngredEffectRefIdAdapter ()));
+    ingredientEffectsMap.insert(std::make_pair(UniversalId::Type_Ingredient, new IngredEffectRefIdAdapter()));
     mNestedAdapters.emplace_back(&mColumns.back(), ingredientEffectsMap);
-    mColumns.back().addColumn(
-        new NestedChildColumn (Columns::ColumnId_EffectId, ColumnBase::Display_IngredEffectId));
-    mColumns.back().addColumn(
-        new NestedChildColumn (Columns::ColumnId_Skill, ColumnBase::Display_EffectSkill));
-    mColumns.back().addColumn(
-        new NestedChildColumn (Columns::ColumnId_Attribute, ColumnBase::Display_EffectAttribute));
+    mColumns.back().addColumn(new NestedChildColumn(Columns::ColumnId_EffectId, ColumnBase::Display_IngredEffectId));
+    mColumns.back().addColumn(new NestedChildColumn(Columns::ColumnId_Skill, ColumnBase::Display_EffectSkill));
+    mColumns.back().addColumn(new NestedChildColumn(Columns::ColumnId_Attribute, ColumnBase::Display_EffectAttribute));
 
     // nested table
-    PotionColumns potionColumns (inventoryColumns);
-    mColumns.emplace_back(Columns::ColumnId_EffectList,
-        ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
+    PotionColumns potionColumns(inventoryColumns);
+    mColumns.emplace_back(Columns::ColumnId_EffectList, ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
     potionColumns.mEffects = &mColumns.back(); // see refidadapterimp.hpp
     std::map<UniversalId::Type, NestedRefIdAdapterBase*> effectsMap;
-    effectsMap.insert(std::make_pair(UniversalId::Type_Potion,
-        new EffectsRefIdAdapter<ESM::Potion> (UniversalId::Type_Potion)));
+    effectsMap.insert(
+        std::make_pair(UniversalId::Type_Potion, new EffectsRefIdAdapter<ESM::Potion>(UniversalId::Type_Potion)));
     mNestedAdapters.emplace_back(&mColumns.back(), effectsMap);
+    mColumns.back().addColumn(new NestedChildColumn(Columns::ColumnId_EffectId, ColumnBase::Display_EffectId));
+    mColumns.back().addColumn(new NestedChildColumn(Columns::ColumnId_Skill, ColumnBase::Display_EffectSkill));
+    mColumns.back().addColumn(new NestedChildColumn(Columns::ColumnId_Attribute, ColumnBase::Display_EffectAttribute));
+    mColumns.back().addColumn(new NestedChildColumn(Columns::ColumnId_EffectRange, ColumnBase::Display_EffectRange));
+    mColumns.back().addColumn(new NestedChildColumn(Columns::ColumnId_EffectArea, ColumnBase::Display_String));
     mColumns.back().addColumn(
-        new NestedChildColumn (Columns::ColumnId_EffectId, ColumnBase::Display_EffectId));
-    mColumns.back().addColumn(
-        new NestedChildColumn (Columns::ColumnId_Skill, ColumnBase::Display_EffectSkill));
-    mColumns.back().addColumn(
-        new NestedChildColumn (Columns::ColumnId_Attribute, ColumnBase::Display_EffectAttribute));
-    mColumns.back().addColumn(
-        new NestedChildColumn (Columns::ColumnId_EffectRange, ColumnBase::Display_EffectRange));
-    mColumns.back().addColumn(
-        new NestedChildColumn (Columns::ColumnId_EffectArea, ColumnBase::Display_String));
-    mColumns.back().addColumn(
-        new NestedChildColumn (Columns::ColumnId_Duration, ColumnBase::Display_Integer)); // reuse from light
-    mColumns.back().addColumn(
-        new NestedChildColumn (Columns::ColumnId_MinMagnitude, ColumnBase::Display_Integer));
-    mColumns.back().addColumn(
-        new NestedChildColumn (Columns::ColumnId_MaxMagnitude, ColumnBase::Display_Integer));
+        new NestedChildColumn(Columns::ColumnId_Duration, ColumnBase::Display_Integer)); // reuse from light
+    mColumns.back().addColumn(new NestedChildColumn(Columns::ColumnId_MinMagnitude, ColumnBase::Display_Integer));
+    mColumns.back().addColumn(new NestedChildColumn(Columns::ColumnId_MaxMagnitude, ColumnBase::Display_Integer));
 
-    EnchantableColumns enchantableColumns (inventoryColumns);
+    EnchantableColumns enchantableColumns(inventoryColumns);
 
     mColumns.emplace_back(Columns::ColumnId_Enchantment, ColumnBase::Display_Enchantment);
     enchantableColumns.mEnchantment = &mColumns.back();
     mColumns.emplace_back(Columns::ColumnId_EnchantmentPoints, ColumnBase::Display_Integer);
     enchantableColumns.mEnchantmentPoints = &mColumns.back();
 
-    ToolColumns toolsColumns (inventoryColumns);
+    ToolColumns toolsColumns(inventoryColumns);
 
     mColumns.emplace_back(Columns::ColumnId_Quality, ColumnBase::Display_Float);
     toolsColumns.mQuality = &mColumns.back();
     mColumns.emplace_back(Columns::ColumnId_Charges, ColumnBase::Display_Integer);
     toolsColumns.mUses = &mColumns.back();
 
-    ActorColumns actorsColumns (nameColumns);
+    ActorColumns actorsColumns(nameColumns);
 
     mColumns.emplace_back(Columns::ColumnId_AiHello, ColumnBase::Display_UnsignedInteger16);
     actorsColumns.mHello = &mColumns.back();
@@ -146,194 +135,152 @@ CSMWorld::RefIdCollection::RefIdCollection()
     actorsColumns.mAlarm = &mColumns.back();
 
     // Nested table
-    mColumns.emplace_back(Columns::ColumnId_ActorInventory,
-            ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
+    mColumns.emplace_back(
+        Columns::ColumnId_ActorInventory, ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
     actorsColumns.mInventory = &mColumns.back();
     std::map<UniversalId::Type, NestedRefIdAdapterBase*> inventoryMap;
-    inventoryMap.insert(std::make_pair(UniversalId::Type_Npc,
-            new NestedInventoryRefIdAdapter<ESM::NPC> (UniversalId::Type_Npc)));
-    inventoryMap.insert(std::make_pair(UniversalId::Type_Creature,
-            new NestedInventoryRefIdAdapter<ESM::Creature> (UniversalId::Type_Creature)));
+    inventoryMap.insert(
+        std::make_pair(UniversalId::Type_Npc, new NestedInventoryRefIdAdapter<ESM::NPC>(UniversalId::Type_Npc)));
+    inventoryMap.insert(std::make_pair(
+        UniversalId::Type_Creature, new NestedInventoryRefIdAdapter<ESM::Creature>(UniversalId::Type_Creature)));
     mNestedAdapters.emplace_back(&mColumns.back(), inventoryMap);
     mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_InventoryItemId, CSMWorld::ColumnBase::Display_Referenceable));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_ItemCount, CSMWorld::ColumnBase::Display_Integer));
+        new RefIdColumn(Columns::ColumnId_InventoryItemId, CSMWorld::ColumnBase::Display_Referenceable));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_ItemCount, CSMWorld::ColumnBase::Display_Integer));
 
     // Nested table
-    mColumns.emplace_back(Columns::ColumnId_SpellList,
-            ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
+    mColumns.emplace_back(Columns::ColumnId_SpellList, ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
     actorsColumns.mSpells = &mColumns.back();
     std::map<UniversalId::Type, NestedRefIdAdapterBase*> spellsMap;
-    spellsMap.insert(std::make_pair(UniversalId::Type_Npc,
-            new NestedSpellRefIdAdapter<ESM::NPC> (UniversalId::Type_Npc)));
-    spellsMap.insert(std::make_pair(UniversalId::Type_Creature,
-            new NestedSpellRefIdAdapter<ESM::Creature> (UniversalId::Type_Creature)));
+    spellsMap.insert(
+        std::make_pair(UniversalId::Type_Npc, new NestedSpellRefIdAdapter<ESM::NPC>(UniversalId::Type_Npc)));
+    spellsMap.insert(std::make_pair(
+        UniversalId::Type_Creature, new NestedSpellRefIdAdapter<ESM::Creature>(UniversalId::Type_Creature)));
     mNestedAdapters.emplace_back(&mColumns.back(), spellsMap);
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_SpellId, CSMWorld::ColumnBase::Display_Spell));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_SpellId, CSMWorld::ColumnBase::Display_Spell));
 
     // Nested table
-    mColumns.emplace_back(Columns::ColumnId_NpcDestinations,
-            ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
+    mColumns.emplace_back(
+        Columns::ColumnId_NpcDestinations, ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
     actorsColumns.mDestinations = &mColumns.back();
     std::map<UniversalId::Type, NestedRefIdAdapterBase*> destMap;
-    destMap.insert(std::make_pair(UniversalId::Type_Npc,
-            new NestedTravelRefIdAdapter<ESM::NPC> (UniversalId::Type_Npc)));
-    destMap.insert(std::make_pair(UniversalId::Type_Creature,
-            new NestedTravelRefIdAdapter<ESM::Creature> (UniversalId::Type_Creature)));
+    destMap.insert(
+        std::make_pair(UniversalId::Type_Npc, new NestedTravelRefIdAdapter<ESM::NPC>(UniversalId::Type_Npc)));
+    destMap.insert(std::make_pair(
+        UniversalId::Type_Creature, new NestedTravelRefIdAdapter<ESM::Creature>(UniversalId::Type_Creature)));
     mNestedAdapters.emplace_back(&mColumns.back(), destMap);
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_DestinationCell, CSMWorld::ColumnBase::Display_Cell));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_PosX, CSMWorld::ColumnBase::Display_Float));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_PosY, CSMWorld::ColumnBase::Display_Float));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_PosZ, CSMWorld::ColumnBase::Display_Float));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_RotX, CSMWorld::ColumnBase::Display_Double));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_RotY, CSMWorld::ColumnBase::Display_Double));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_RotZ, CSMWorld::ColumnBase::Display_Double));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_DestinationCell, CSMWorld::ColumnBase::Display_Cell));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_PosX, CSMWorld::ColumnBase::Display_Float));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_PosY, CSMWorld::ColumnBase::Display_Float));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_PosZ, CSMWorld::ColumnBase::Display_Float));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_RotX, CSMWorld::ColumnBase::Display_Double));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_RotY, CSMWorld::ColumnBase::Display_Double));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_RotZ, CSMWorld::ColumnBase::Display_Double));
 
     // Nested table
-    mColumns.emplace_back(Columns::ColumnId_AiPackageList,
-            ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
+    mColumns.emplace_back(Columns::ColumnId_AiPackageList, ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
     actorsColumns.mAiPackages = &mColumns.back();
     std::map<UniversalId::Type, NestedRefIdAdapterBase*> aiMap;
-    aiMap.insert(std::make_pair(UniversalId::Type_Npc,
-            new ActorAiRefIdAdapter<ESM::NPC> (UniversalId::Type_Npc)));
-    aiMap.insert(std::make_pair(UniversalId::Type_Creature,
-            new ActorAiRefIdAdapter<ESM::Creature> (UniversalId::Type_Creature)));
+    aiMap.insert(std::make_pair(UniversalId::Type_Npc, new ActorAiRefIdAdapter<ESM::NPC>(UniversalId::Type_Npc)));
+    aiMap.insert(
+        std::make_pair(UniversalId::Type_Creature, new ActorAiRefIdAdapter<ESM::Creature>(UniversalId::Type_Creature)));
     mNestedAdapters.emplace_back(&mColumns.back(), aiMap);
     mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_AiPackageType, CSMWorld::ColumnBase::Display_AiPackageType));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_AiWanderDist, CSMWorld::ColumnBase::Display_Integer));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_AiDuration, CSMWorld::ColumnBase::Display_Integer));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_AiWanderToD, CSMWorld::ColumnBase::Display_Integer));
-
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_Idle1, CSMWorld::ColumnBase::Display_Integer));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_Idle2, CSMWorld::ColumnBase::Display_Integer));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_Idle3, CSMWorld::ColumnBase::Display_Integer));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_Idle4, CSMWorld::ColumnBase::Display_Integer));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_Idle5, CSMWorld::ColumnBase::Display_Integer));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_Idle6, CSMWorld::ColumnBase::Display_Integer));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_Idle7, CSMWorld::ColumnBase::Display_Integer));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_Idle8, CSMWorld::ColumnBase::Display_Integer));
-
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_AiWanderRepeat, CSMWorld::ColumnBase::Display_Boolean));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_AiActivateName, CSMWorld::ColumnBase::Display_String32));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_AiTargetId, CSMWorld::ColumnBase::Display_String32));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_AiTargetCell, CSMWorld::ColumnBase::Display_String));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_PosX, CSMWorld::ColumnBase::Display_Float));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_PosY, CSMWorld::ColumnBase::Display_Float));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_PosZ, CSMWorld::ColumnBase::Display_Float));
+        new RefIdColumn(Columns::ColumnId_AiPackageType, CSMWorld::ColumnBase::Display_AiPackageType));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_AiWanderDist, CSMWorld::ColumnBase::Display_Integer));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_AiDuration, CSMWorld::ColumnBase::Display_Integer));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_AiWanderToD, CSMWorld::ColumnBase::Display_Integer));
+
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle1, CSMWorld::ColumnBase::Display_Integer));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle2, CSMWorld::ColumnBase::Display_Integer));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle3, CSMWorld::ColumnBase::Display_Integer));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle4, CSMWorld::ColumnBase::Display_Integer));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle5, CSMWorld::ColumnBase::Display_Integer));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle6, CSMWorld::ColumnBase::Display_Integer));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle7, CSMWorld::ColumnBase::Display_Integer));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle8, CSMWorld::ColumnBase::Display_Integer));
+
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_AiWanderRepeat, CSMWorld::ColumnBase::Display_Boolean));
+    mColumns.back().addColumn(
+        new RefIdColumn(Columns::ColumnId_AiActivateName, CSMWorld::ColumnBase::Display_String32));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_AiTargetId, CSMWorld::ColumnBase::Display_String32));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_AiTargetCell, CSMWorld::ColumnBase::Display_String));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_PosX, CSMWorld::ColumnBase::Display_Float));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_PosY, CSMWorld::ColumnBase::Display_Float));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_PosZ, CSMWorld::ColumnBase::Display_Float));
 
     static const struct
     {
         int mName;
         unsigned int mFlag;
-    } sServiceTable[] =
-    {
-        { Columns::ColumnId_BuysWeapons, ESM::NPC::Weapon},
-        { Columns::ColumnId_BuysArmor, ESM::NPC::Armor},
-        { Columns::ColumnId_BuysClothing, ESM::NPC::Clothing},
-        { Columns::ColumnId_BuysBooks, ESM::NPC::Books},
-        { Columns::ColumnId_BuysIngredients, ESM::NPC::Ingredients},
-        { Columns::ColumnId_BuysLockpicks, ESM::NPC::Picks},
-        { Columns::ColumnId_BuysProbes, ESM::NPC::Probes},
-        { Columns::ColumnId_BuysLights, ESM::NPC::Lights},
-        { Columns::ColumnId_BuysApparati, ESM::NPC::Apparatus},
-        { Columns::ColumnId_BuysRepairItems, ESM::NPC::RepairItem},
-        { Columns::ColumnId_BuysMiscItems, ESM::NPC::Misc},
-        { Columns::ColumnId_BuysPotions, ESM::NPC::Potions},
-        { Columns::ColumnId_BuysMagicItems, ESM::NPC::MagicItems},
-        { Columns::ColumnId_SellsSpells, ESM::NPC::Spells},
-        { Columns::ColumnId_Trainer, ESM::NPC::Training},
-        { Columns::ColumnId_Spellmaking, ESM::NPC::Spellmaking},
-        { Columns::ColumnId_EnchantingService, ESM::NPC::Enchanting},
-        { Columns::ColumnId_RepairService, ESM::NPC::Repair},
-        { -1, 0 }
-    };
-
-    for (int i=0; sServiceTable[i].mName!=-1; ++i)
+    } sServiceTable[] = { { Columns::ColumnId_BuysWeapons, ESM::NPC::Weapon },
+        { Columns::ColumnId_BuysArmor, ESM::NPC::Armor }, { Columns::ColumnId_BuysClothing, ESM::NPC::Clothing },
+        { Columns::ColumnId_BuysBooks, ESM::NPC::Books }, { Columns::ColumnId_BuysIngredients, ESM::NPC::Ingredients },
+        { Columns::ColumnId_BuysLockpicks, ESM::NPC::Picks }, { Columns::ColumnId_BuysProbes, ESM::NPC::Probes },
+        { Columns::ColumnId_BuysLights, ESM::NPC::Lights }, { Columns::ColumnId_BuysApparati, ESM::NPC::Apparatus },
+        { Columns::ColumnId_BuysRepairItems, ESM::NPC::RepairItem },
+        { Columns::ColumnId_BuysMiscItems, ESM::NPC::Misc }, { Columns::ColumnId_BuysPotions, ESM::NPC::Potions },
+        { Columns::ColumnId_BuysMagicItems, ESM::NPC::MagicItems }, { Columns::ColumnId_SellsSpells, ESM::NPC::Spells },
+        { Columns::ColumnId_Trainer, ESM::NPC::Training }, { Columns::ColumnId_Spellmaking, ESM::NPC::Spellmaking },
+        { Columns::ColumnId_EnchantingService, ESM::NPC::Enchanting },
+        { Columns::ColumnId_RepairService, ESM::NPC::Repair }, { -1, 0 } };
+
+    for (int i = 0; sServiceTable[i].mName != -1; ++i)
     {
         mColumns.emplace_back(sServiceTable[i].mName, ColumnBase::Display_Boolean);
-        actorsColumns.mServices.insert (std::make_pair (&mColumns.back(), sServiceTable[i].mFlag));
+        actorsColumns.mServices.insert(std::make_pair(&mColumns.back(), sServiceTable[i].mFlag));
     }
 
     mColumns.emplace_back(Columns::ColumnId_AutoCalc, ColumnBase::Display_Boolean,
-            ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_Refresh);
-    const RefIdColumn *autoCalc = &mColumns.back();
+        ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_Refresh);
+    const RefIdColumn* autoCalc = &mColumns.back();
 
-    mColumns.emplace_back(Columns::ColumnId_ApparatusType,
-        ColumnBase::Display_ApparatusType);
-    const RefIdColumn *apparatusType = &mColumns.back();
+    mColumns.emplace_back(Columns::ColumnId_ApparatusType, ColumnBase::Display_ApparatusType);
+    const RefIdColumn* apparatusType = &mColumns.back();
 
     mColumns.emplace_back(Columns::ColumnId_ArmorType, ColumnBase::Display_ArmorType);
-    const RefIdColumn *armorType = &mColumns.back();
+    const RefIdColumn* armorType = &mColumns.back();
 
     mColumns.emplace_back(Columns::ColumnId_Health, ColumnBase::Display_Integer);
-    const RefIdColumn *health = &mColumns.back();
+    const RefIdColumn* health = &mColumns.back();
 
     mColumns.emplace_back(Columns::ColumnId_ArmorValue, ColumnBase::Display_Integer);
-    const RefIdColumn *armor = &mColumns.back();
+    const RefIdColumn* armor = &mColumns.back();
 
     mColumns.emplace_back(Columns::ColumnId_BookType, ColumnBase::Display_BookType);
-    const RefIdColumn *bookType = &mColumns.back();
+    const RefIdColumn* bookType = &mColumns.back();
 
     mColumns.emplace_back(Columns::ColumnId_Skill, ColumnBase::Display_SkillId);
-    const RefIdColumn *skill = &mColumns.back();
+    const RefIdColumn* skill = &mColumns.back();
 
     mColumns.emplace_back(Columns::ColumnId_Text, ColumnBase::Display_LongString);
-    const RefIdColumn *text = &mColumns.back();
+    const RefIdColumn* text = &mColumns.back();
 
     mColumns.emplace_back(Columns::ColumnId_ClothingType, ColumnBase::Display_ClothingType);
-    const RefIdColumn *clothingType = &mColumns.back();
+    const RefIdColumn* clothingType = &mColumns.back();
 
     mColumns.emplace_back(Columns::ColumnId_WeightCapacity, ColumnBase::Display_Float);
-    const RefIdColumn *weightCapacity = &mColumns.back();
+    const RefIdColumn* weightCapacity = &mColumns.back();
 
     mColumns.emplace_back(Columns::ColumnId_OrganicContainer, ColumnBase::Display_Boolean);
-    const RefIdColumn *organic = &mColumns.back();
+    const RefIdColumn* organic = &mColumns.back();
 
     mColumns.emplace_back(Columns::ColumnId_Respawn, ColumnBase::Display_Boolean);
-    const RefIdColumn *respawn = &mColumns.back();
+    const RefIdColumn* respawn = &mColumns.back();
 
     // Nested table
-    mColumns.emplace_back(Columns::ColumnId_ContainerContent,
-            ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
-    const RefIdColumn *content = &mColumns.back();
+    mColumns.emplace_back(
+        Columns::ColumnId_ContainerContent, ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
+    const RefIdColumn* content = &mColumns.back();
     std::map<UniversalId::Type, NestedRefIdAdapterBase*> contMap;
-    contMap.insert(std::make_pair(UniversalId::Type_Container,
-            new NestedInventoryRefIdAdapter<ESM::Container> (UniversalId::Type_Container)));
+    contMap.insert(std::make_pair(
+        UniversalId::Type_Container, new NestedInventoryRefIdAdapter<ESM::Container>(UniversalId::Type_Container)));
     mNestedAdapters.emplace_back(&mColumns.back(), contMap);
     mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_InventoryItemId, CSMWorld::ColumnBase::Display_Referenceable));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_ItemCount, CSMWorld::ColumnBase::Display_Integer));
+        new RefIdColumn(Columns::ColumnId_InventoryItemId, CSMWorld::ColumnBase::Display_Referenceable));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_ItemCount, CSMWorld::ColumnBase::Display_Integer));
 
-    CreatureColumns creatureColumns (actorsColumns);
+    CreatureColumns creatureColumns(actorsColumns);
 
     mColumns.emplace_back(Columns::ColumnId_CreatureType, ColumnBase::Display_CreatureType);
     creatureColumns.mType = &mColumns.back();
@@ -346,98 +293,82 @@ CSMWorld::RefIdCollection::RefIdCollection()
     {
         int mName;
         unsigned int mFlag;
-    } sCreatureFlagTable[] =
-    {
-        { Columns::ColumnId_Biped, ESM::Creature::Bipedal },
-        { Columns::ColumnId_HasWeapon, ESM::Creature::Weapon },
-        { Columns::ColumnId_Swims, ESM::Creature::Swims },
-        { Columns::ColumnId_Flies, ESM::Creature::Flies },
-        { Columns::ColumnId_Walks, ESM::Creature::Walks },
-        { Columns::ColumnId_Essential, ESM::Creature::Essential },
-        { -1, 0 }
-    };
+    } sCreatureFlagTable[] = { { Columns::ColumnId_Biped, ESM::Creature::Bipedal },
+        { Columns::ColumnId_HasWeapon, ESM::Creature::Weapon }, { Columns::ColumnId_Swims, ESM::Creature::Swims },
+        { Columns::ColumnId_Flies, ESM::Creature::Flies }, { Columns::ColumnId_Walks, ESM::Creature::Walks },
+        { Columns::ColumnId_Essential, ESM::Creature::Essential }, { -1, 0 } };
 
     // for re-use in NPC records
-    const RefIdColumn *essential = nullptr;
+    const RefIdColumn* essential = nullptr;
 
-    for (int i=0; sCreatureFlagTable[i].mName!=-1; ++i)
+    for (int i = 0; sCreatureFlagTable[i].mName != -1; ++i)
     {
         mColumns.emplace_back(sCreatureFlagTable[i].mName, ColumnBase::Display_Boolean);
-        creatureColumns.mFlags.insert (std::make_pair (&mColumns.back(), sCreatureFlagTable[i].mFlag));
+        creatureColumns.mFlags.insert(std::make_pair(&mColumns.back(), sCreatureFlagTable[i].mFlag));
 
         switch (sCreatureFlagTable[i].mFlag)
         {
-            case ESM::Creature::Essential: essential = &mColumns.back(); break;
+            case ESM::Creature::Essential:
+                essential = &mColumns.back();
+                break;
         }
     }
 
     mColumns.emplace_back(Columns::ColumnId_BloodType, ColumnBase::Display_BloodType);
     // For re-use in NPC records.
-    const RefIdColumn *bloodType = &mColumns.back();
+    const RefIdColumn* bloodType = &mColumns.back();
     creatureColumns.mBloodType = bloodType;
 
-    creatureColumns.mFlags.insert (std::make_pair (respawn, ESM::Creature::Respawn));
+    creatureColumns.mFlags.insert(std::make_pair(respawn, ESM::Creature::Respawn));
 
     // Nested table
-    mColumns.emplace_back(Columns::ColumnId_CreatureAttributes,
-            ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
+    mColumns.emplace_back(
+        Columns::ColumnId_CreatureAttributes, ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
     creatureColumns.mAttributes = &mColumns.back();
     std::map<UniversalId::Type, NestedRefIdAdapterBase*> creaAttrMap;
     creaAttrMap.insert(std::make_pair(UniversalId::Type_Creature, new CreatureAttributesRefIdAdapter()));
     mNestedAdapters.emplace_back(&mColumns.back(), creaAttrMap);
     mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_Attribute, CSMWorld::ColumnBase::Display_Attribute, false, false));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_AttributeValue, CSMWorld::ColumnBase::Display_Integer));
+        new RefIdColumn(Columns::ColumnId_Attribute, CSMWorld::ColumnBase::Display_Attribute, false, false));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_AttributeValue, CSMWorld::ColumnBase::Display_Integer));
 
     // Nested table
-    mColumns.emplace_back(Columns::ColumnId_CreatureAttack,
-            ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
+    mColumns.emplace_back(
+        Columns::ColumnId_CreatureAttack, ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
     creatureColumns.mAttacks = &mColumns.back();
     std::map<UniversalId::Type, NestedRefIdAdapterBase*> attackMap;
     attackMap.insert(std::make_pair(UniversalId::Type_Creature, new CreatureAttackRefIdAdapter()));
     mNestedAdapters.emplace_back(&mColumns.back(), attackMap);
     mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_CreatureAttack, CSMWorld::ColumnBase::Display_Integer, false, false));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_MinAttack, CSMWorld::ColumnBase::Display_Integer));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_MaxAttack, CSMWorld::ColumnBase::Display_Integer));
+        new RefIdColumn(Columns::ColumnId_CreatureAttack, CSMWorld::ColumnBase::Display_Integer, false, false));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_MinAttack, CSMWorld::ColumnBase::Display_Integer));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_MaxAttack, CSMWorld::ColumnBase::Display_Integer));
 
     // Nested list
-    mColumns.emplace_back(Columns::ColumnId_CreatureMisc,
-        ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_List);
+    mColumns.emplace_back(Columns::ColumnId_CreatureMisc, ColumnBase::Display_NestedHeader,
+        ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_List);
     creatureColumns.mMisc = &mColumns.back();
     std::map<UniversalId::Type, NestedRefIdAdapterBase*> creaMiscMap;
     creaMiscMap.insert(std::make_pair(UniversalId::Type_Creature, new CreatureMiscRefIdAdapter()));
     mNestedAdapters.emplace_back(&mColumns.back(), creaMiscMap);
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_Level, CSMWorld::ColumnBase::Display_Integer,
-            ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_Refresh));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_Health, CSMWorld::ColumnBase::Display_Integer));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_Mana, CSMWorld::ColumnBase::Display_Integer));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_Fatigue, CSMWorld::ColumnBase::Display_Integer));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_SoulPoints, CSMWorld::ColumnBase::Display_Integer));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_CombatState, CSMWorld::ColumnBase::Display_Integer));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_MagicState, CSMWorld::ColumnBase::Display_Integer));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_StealthState, CSMWorld::ColumnBase::Display_Integer));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_Gold, CSMWorld::ColumnBase::Display_Integer));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Level, CSMWorld::ColumnBase::Display_Integer,
+        ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_Refresh));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Health, CSMWorld::ColumnBase::Display_Integer));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Mana, CSMWorld::ColumnBase::Display_Integer));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Fatigue, CSMWorld::ColumnBase::Display_Integer));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_SoulPoints, CSMWorld::ColumnBase::Display_Integer));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_CombatState, CSMWorld::ColumnBase::Display_Integer));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_MagicState, CSMWorld::ColumnBase::Display_Integer));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_StealthState, CSMWorld::ColumnBase::Display_Integer));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Gold, CSMWorld::ColumnBase::Display_Integer));
 
     mColumns.emplace_back(Columns::ColumnId_OpenSound, ColumnBase::Display_Sound);
-    const RefIdColumn *openSound = &mColumns.back();
+    const RefIdColumn* openSound = &mColumns.back();
 
     mColumns.emplace_back(Columns::ColumnId_CloseSound, ColumnBase::Display_Sound);
-    const RefIdColumn *closeSound = &mColumns.back();
+    const RefIdColumn* closeSound = &mColumns.back();
 
-    LightColumns lightColumns (inventoryColumns);
+    LightColumns lightColumns(inventoryColumns);
 
     mColumns.emplace_back(Columns::ColumnId_Duration, ColumnBase::Display_Integer);
     lightColumns.mTime = &mColumns.back();
@@ -458,26 +389,21 @@ CSMWorld::RefIdCollection::RefIdCollection()
     {
         int mName;
         unsigned int mFlag;
-    } sLightFlagTable[] =
-    {
-        { Columns::ColumnId_Dynamic, ESM::Light::Dynamic },
-        { Columns::ColumnId_Portable, ESM::Light::Carry },
-        { Columns::ColumnId_NegativeLight, ESM::Light::Negative },
-        { Columns::ColumnId_Fire, ESM::Light::Fire },
-        { Columns::ColumnId_OffByDefault, ESM::Light::OffDefault },
-        { -1, 0 }
-    };
-
-    for (int i=0; sLightFlagTable[i].mName!=-1; ++i)
+    } sLightFlagTable[]
+        = { { Columns::ColumnId_Dynamic, ESM::Light::Dynamic }, { Columns::ColumnId_Portable, ESM::Light::Carry },
+              { Columns::ColumnId_NegativeLight, ESM::Light::Negative }, { Columns::ColumnId_Fire, ESM::Light::Fire },
+              { Columns::ColumnId_OffByDefault, ESM::Light::OffDefault }, { -1, 0 } };
+
+    for (int i = 0; sLightFlagTable[i].mName != -1; ++i)
     {
         mColumns.emplace_back(sLightFlagTable[i].mName, ColumnBase::Display_Boolean);
-        lightColumns.mFlags.insert (std::make_pair (&mColumns.back(), sLightFlagTable[i].mFlag));
+        lightColumns.mFlags.insert(std::make_pair(&mColumns.back(), sLightFlagTable[i].mFlag));
     }
 
     mColumns.emplace_back(Columns::ColumnId_IsKey, ColumnBase::Display_Boolean);
-    const RefIdColumn *key = &mColumns.back();
+    const RefIdColumn* key = &mColumns.back();
 
-    NpcColumns npcColumns (actorsColumns);
+    NpcColumns npcColumns(actorsColumns);
 
     mColumns.emplace_back(Columns::ColumnId_Race, ColumnBase::Display_Race);
     npcColumns.mRace = &mColumns.back();
@@ -498,11 +424,11 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mColumns.emplace_back(Columns::ColumnId_Gender, ColumnBase::Display_GenderNpc);
     npcColumns.mGender = &mColumns.back();
 
-    npcColumns.mFlags.insert (std::make_pair (essential, ESM::NPC::Essential));
+    npcColumns.mFlags.insert(std::make_pair(essential, ESM::NPC::Essential));
 
-    npcColumns.mFlags.insert (std::make_pair (respawn, ESM::NPC::Respawn));
+    npcColumns.mFlags.insert(std::make_pair(respawn, ESM::NPC::Respawn));
 
-    npcColumns.mFlags.insert (std::make_pair (autoCalc, ESM::NPC::Autocalc));
+    npcColumns.mFlags.insert(std::make_pair(autoCalc, ESM::NPC::Autocalc));
 
     // Re-used from Creature records.
     npcColumns.mBloodType = bloodType;
@@ -512,54 +438,47 @@ CSMWorld::RefIdCollection::RefIdCollection()
     // These needs to be driven from the autocalculated setting.
 
     // Nested table
-    mColumns.emplace_back(Columns::ColumnId_NpcAttributes,
-            ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
+    mColumns.emplace_back(Columns::ColumnId_NpcAttributes, ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
     npcColumns.mAttributes = &mColumns.back();
     std::map<UniversalId::Type, NestedRefIdAdapterBase*> attrMap;
     attrMap.insert(std::make_pair(UniversalId::Type_Npc, new NpcAttributesRefIdAdapter()));
     mNestedAdapters.emplace_back(&mColumns.back(), attrMap);
     mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_Attribute, CSMWorld::ColumnBase::Display_Attribute, false, false));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_UChar, CSMWorld::ColumnBase::Display_UnsignedInteger8));
+        new RefIdColumn(Columns::ColumnId_Attribute, CSMWorld::ColumnBase::Display_Attribute, false, false));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_UChar, CSMWorld::ColumnBase::Display_UnsignedInteger8));
 
     // Nested table
-    mColumns.emplace_back(Columns::ColumnId_NpcSkills,
-            ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
+    mColumns.emplace_back(Columns::ColumnId_NpcSkills, ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
     npcColumns.mSkills = &mColumns.back();
     std::map<UniversalId::Type, NestedRefIdAdapterBase*> skillsMap;
     skillsMap.insert(std::make_pair(UniversalId::Type_Npc, new NpcSkillsRefIdAdapter()));
     mNestedAdapters.emplace_back(&mColumns.back(), skillsMap);
     mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_Skill, CSMWorld::ColumnBase::Display_SkillId, false, false));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_UChar, CSMWorld::ColumnBase::Display_UnsignedInteger8));
+        new RefIdColumn(Columns::ColumnId_Skill, CSMWorld::ColumnBase::Display_SkillId, false, false));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_UChar, CSMWorld::ColumnBase::Display_UnsignedInteger8));
 
     // Nested list
-    mColumns.emplace_back(Columns::ColumnId_NpcMisc,
-        ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_List);
+    mColumns.emplace_back(Columns::ColumnId_NpcMisc, ColumnBase::Display_NestedHeader,
+        ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_List);
     npcColumns.mMisc = &mColumns.back();
     std::map<UniversalId::Type, NestedRefIdAdapterBase*> miscMap;
     miscMap.insert(std::make_pair(UniversalId::Type_Npc, new NpcMiscRefIdAdapter()));
     mNestedAdapters.emplace_back(&mColumns.back(), miscMap);
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Level, CSMWorld::ColumnBase::Display_SignedInteger16));
     mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_Level, CSMWorld::ColumnBase::Display_SignedInteger16));
+        new RefIdColumn(Columns::ColumnId_Health, CSMWorld::ColumnBase::Display_UnsignedInteger16));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Mana, CSMWorld::ColumnBase::Display_UnsignedInteger16));
     mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_Health, CSMWorld::ColumnBase::Display_UnsignedInteger16));
+        new RefIdColumn(Columns::ColumnId_Fatigue, CSMWorld::ColumnBase::Display_UnsignedInteger16));
     mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_Mana, CSMWorld::ColumnBase::Display_UnsignedInteger16));
+        new RefIdColumn(Columns::ColumnId_NpcDisposition, CSMWorld::ColumnBase::Display_UnsignedInteger8));
     mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_Fatigue, CSMWorld::ColumnBase::Display_UnsignedInteger16));
+        new RefIdColumn(Columns::ColumnId_NpcReputation, CSMWorld::ColumnBase::Display_UnsignedInteger8));
     mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_NpcDisposition, CSMWorld::ColumnBase::Display_UnsignedInteger8));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_NpcReputation, CSMWorld::ColumnBase::Display_UnsignedInteger8));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_NpcRank, CSMWorld::ColumnBase::Display_UnsignedInteger8));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_Gold, CSMWorld::ColumnBase::Display_Integer));
+        new RefIdColumn(Columns::ColumnId_NpcRank, CSMWorld::ColumnBase::Display_UnsignedInteger8));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Gold, CSMWorld::ColumnBase::Display_Integer));
 
-    WeaponColumns weaponColumns (enchantableColumns);
+    WeaponColumns weaponColumns(enchantableColumns);
 
     mColumns.emplace_back(Columns::ColumnId_WeaponType, ColumnBase::Display_WeaponType);
     weaponColumns.mType = &mColumns.back();
@@ -572,14 +491,14 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mColumns.emplace_back(Columns::ColumnId_WeaponReach, ColumnBase::Display_Float);
     weaponColumns.mReach = &mColumns.back();
 
-    for (int i=0; i<3; ++i)
+    for (int i = 0; i < 3; ++i)
     {
-        const RefIdColumn **column =
-            i==0 ? weaponColumns.mChop : (i==1 ? weaponColumns.mSlash : weaponColumns.mThrust);
+        const RefIdColumn** column
+            = i == 0 ? weaponColumns.mChop : (i == 1 ? weaponColumns.mSlash : weaponColumns.mThrust);
 
-        for (int j=0; j<2; ++j)
+        for (int j = 0; j < 2; ++j)
         {
-            mColumns.emplace_back(Columns::ColumnId_MinChop+i*2+j, ColumnBase::Display_Integer);
+            mColumns.emplace_back(Columns::ColumnId_MinChop + i * 2 + j, ColumnBase::Display_Integer);
             column[j] = &mColumns.back();
         }
     }
@@ -588,135 +507,119 @@ CSMWorld::RefIdCollection::RefIdCollection()
     {
         int mName;
         unsigned int mFlag;
-    } sWeaponFlagTable[] =
-    {
-        { Columns::ColumnId_Magical, ESM::Weapon::Magical },
-        { Columns::ColumnId_Silver, ESM::Weapon::Silver },
-        { -1, 0 }
-    };
+    } sWeaponFlagTable[] = { { Columns::ColumnId_Magical, ESM::Weapon::Magical },
+        { Columns::ColumnId_Silver, ESM::Weapon::Silver }, { -1, 0 } };
 
-    for (int i=0; sWeaponFlagTable[i].mName!=-1; ++i)
+    for (int i = 0; sWeaponFlagTable[i].mName != -1; ++i)
     {
         mColumns.emplace_back(sWeaponFlagTable[i].mName, ColumnBase::Display_Boolean);
-        weaponColumns.mFlags.insert (std::make_pair (&mColumns.back(), sWeaponFlagTable[i].mFlag));
+        weaponColumns.mFlags.insert(std::make_pair(&mColumns.back(), sWeaponFlagTable[i].mFlag));
     }
 
     // Nested table
     mColumns.emplace_back(Columns::ColumnId_PartRefList, ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
-    const RefIdColumn *partRef = &mColumns.back();
+    const RefIdColumn* partRef = &mColumns.back();
     std::map<UniversalId::Type, NestedRefIdAdapterBase*> partMap;
-    partMap.insert(std::make_pair(UniversalId::Type_Armor,
-        new BodyPartRefIdAdapter<ESM::Armor> (UniversalId::Type_Armor)));
-    partMap.insert(std::make_pair(UniversalId::Type_Clothing,
-        new BodyPartRefIdAdapter<ESM::Clothing> (UniversalId::Type_Clothing)));
+    partMap.insert(
+        std::make_pair(UniversalId::Type_Armor, new BodyPartRefIdAdapter<ESM::Armor>(UniversalId::Type_Armor)));
+    partMap.insert(std::make_pair(
+        UniversalId::Type_Clothing, new BodyPartRefIdAdapter<ESM::Clothing>(UniversalId::Type_Clothing)));
     mNestedAdapters.emplace_back(&mColumns.back(), partMap);
     mColumns.back().addColumn(
-        new RefIdColumn (Columns::ColumnId_PartRefType, CSMWorld::ColumnBase::Display_PartRefType));
-    mColumns.back().addColumn(
-        new RefIdColumn (Columns::ColumnId_PartRefMale, CSMWorld::ColumnBase::Display_BodyPart));
-    mColumns.back().addColumn(
-        new RefIdColumn (Columns::ColumnId_PartRefFemale, CSMWorld::ColumnBase::Display_BodyPart));
+        new RefIdColumn(Columns::ColumnId_PartRefType, CSMWorld::ColumnBase::Display_PartRefType));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_PartRefMale, CSMWorld::ColumnBase::Display_BodyPart));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_PartRefFemale, CSMWorld::ColumnBase::Display_BodyPart));
 
-    LevListColumns creatureLevListColumns (baseColumns);
-    LevListColumns itemLevListColumns (baseColumns);
+    LevListColumns creatureLevListColumns(baseColumns);
+    LevListColumns itemLevListColumns(baseColumns);
     std::map<UniversalId::Type, NestedRefIdAdapterBase*> creatureLevListMap, itemLevListMap;
     creatureLevListMap.insert(std::make_pair(UniversalId::Type_CreatureLevelledList,
-        new NestedLevListRefIdAdapter<ESM::CreatureLevList> (UniversalId::Type_CreatureLevelledList)));
+        new NestedLevListRefIdAdapter<ESM::CreatureLevList>(UniversalId::Type_CreatureLevelledList)));
     itemLevListMap.insert(std::make_pair(UniversalId::Type_ItemLevelledList,
-        new NestedLevListRefIdAdapter<ESM::ItemLevList> (UniversalId::Type_ItemLevelledList)));
+        new NestedLevListRefIdAdapter<ESM::ItemLevList>(UniversalId::Type_ItemLevelledList)));
 
     // Levelled creature nested table
-    mColumns.emplace_back(Columns::ColumnId_LevelledList,
-        ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
+    mColumns.emplace_back(Columns::ColumnId_LevelledList, ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
     creatureLevListColumns.mLevList = &mColumns.back();
     mNestedAdapters.emplace_back(&mColumns.back(), creatureLevListMap);
     mColumns.back().addColumn(
-        new RefIdColumn (Columns::ColumnId_LevelledCreatureId, CSMWorld::ColumnBase::Display_Referenceable));
+        new RefIdColumn(Columns::ColumnId_LevelledCreatureId, CSMWorld::ColumnBase::Display_Referenceable));
     mColumns.back().addColumn(
-        new RefIdColumn (Columns::ColumnId_LevelledItemLevel, CSMWorld::ColumnBase::Display_Integer));
+        new RefIdColumn(Columns::ColumnId_LevelledItemLevel, CSMWorld::ColumnBase::Display_Integer));
 
     // Levelled item nested table
-    mColumns.emplace_back(Columns::ColumnId_LevelledList,
-        ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
+    mColumns.emplace_back(Columns::ColumnId_LevelledList, ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue);
     itemLevListColumns.mLevList = &mColumns.back();
     mNestedAdapters.emplace_back(&mColumns.back(), itemLevListMap);
     mColumns.back().addColumn(
-        new RefIdColumn (Columns::ColumnId_LevelledItemId, CSMWorld::ColumnBase::Display_Referenceable));
+        new RefIdColumn(Columns::ColumnId_LevelledItemId, CSMWorld::ColumnBase::Display_Referenceable));
     mColumns.back().addColumn(
-        new RefIdColumn (Columns::ColumnId_LevelledItemLevel, CSMWorld::ColumnBase::Display_Integer));
+        new RefIdColumn(Columns::ColumnId_LevelledItemLevel, CSMWorld::ColumnBase::Display_Integer));
 
     // Shared levelled list nested list
-    mColumns.emplace_back(Columns::ColumnId_LevelledList,
-        ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_List);
+    mColumns.emplace_back(Columns::ColumnId_LevelledList, ColumnBase::Display_NestedHeader,
+        ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_List);
     creatureLevListColumns.mNestedListLevList = &mColumns.back();
     itemLevListColumns.mNestedListLevList = &mColumns.back();
     std::map<UniversalId::Type, NestedRefIdAdapterBase*> nestedListLevListMap;
     nestedListLevListMap.insert(std::make_pair(UniversalId::Type_CreatureLevelledList,
-        new NestedListLevListRefIdAdapter<ESM::CreatureLevList> (UniversalId::Type_CreatureLevelledList)));
+        new NestedListLevListRefIdAdapter<ESM::CreatureLevList>(UniversalId::Type_CreatureLevelledList)));
     nestedListLevListMap.insert(std::make_pair(UniversalId::Type_ItemLevelledList,
-        new NestedListLevListRefIdAdapter<ESM::ItemLevList> (UniversalId::Type_ItemLevelledList)));
+        new NestedListLevListRefIdAdapter<ESM::ItemLevList>(UniversalId::Type_ItemLevelledList)));
     mNestedAdapters.emplace_back(&mColumns.back(), nestedListLevListMap);
     mColumns.back().addColumn(
-        new RefIdColumn (Columns::ColumnId_LevelledItemTypeEach, CSMWorld::ColumnBase::Display_Boolean));
-    mColumns.back().addColumn(
-        new RefIdColumn (Columns::ColumnId_LevelledItemType, CSMWorld::ColumnBase::Display_Boolean));
-    mColumns.back().addColumn(
-        new RefIdColumn (Columns::ColumnId_LevelledItemChanceNone, CSMWorld::ColumnBase::Display_UnsignedInteger8));
-
-    mAdapters.insert (std::make_pair (UniversalId::Type_Activator,
-        new NameRefIdAdapter<ESM::Activator> (UniversalId::Type_Activator, nameColumns)));
-    mAdapters.insert (std::make_pair (UniversalId::Type_Potion,
-        new PotionRefIdAdapter (potionColumns, autoCalc)));
-    mAdapters.insert (std::make_pair (UniversalId::Type_Apparatus,
-        new ApparatusRefIdAdapter (inventoryColumns, apparatusType, toolsColumns.mQuality)));
-    mAdapters.insert (std::make_pair (UniversalId::Type_Armor,
-        new ArmorRefIdAdapter (enchantableColumns, armorType, health, armor, partRef)));
-    mAdapters.insert (std::make_pair (UniversalId::Type_Book,
-        new BookRefIdAdapter (enchantableColumns, bookType, skill, text)));
-    mAdapters.insert (std::make_pair (UniversalId::Type_Clothing,
-        new ClothingRefIdAdapter (enchantableColumns, clothingType, partRef)));
-    mAdapters.insert (std::make_pair (UniversalId::Type_Container,
-        new ContainerRefIdAdapter (nameColumns, weightCapacity, organic, respawn, content)));
-    mAdapters.insert (std::make_pair (UniversalId::Type_Creature,
-        new CreatureRefIdAdapter (creatureColumns)));
-    mAdapters.insert (std::make_pair (UniversalId::Type_Door,
-        new DoorRefIdAdapter (nameColumns, openSound, closeSound)));
-    mAdapters.insert (std::make_pair (UniversalId::Type_Ingredient,
-        new IngredientRefIdAdapter (ingredientColumns)));
-    mAdapters.insert (std::make_pair (UniversalId::Type_CreatureLevelledList,
-        new LevelledListRefIdAdapter<ESM::CreatureLevList> (
-        UniversalId::Type_CreatureLevelledList, creatureLevListColumns)));
-    mAdapters.insert (std::make_pair (UniversalId::Type_ItemLevelledList,
-        new LevelledListRefIdAdapter<ESM::ItemLevList> (UniversalId::Type_ItemLevelledList, itemLevListColumns)));
-    mAdapters.insert (std::make_pair (UniversalId::Type_Light,
-        new LightRefIdAdapter (lightColumns)));
-    mAdapters.insert (std::make_pair (UniversalId::Type_Lockpick,
-        new ToolRefIdAdapter<ESM::Lockpick> (UniversalId::Type_Lockpick, toolsColumns)));
-    mAdapters.insert (std::make_pair (UniversalId::Type_Miscellaneous,
-        new MiscRefIdAdapter (inventoryColumns, key)));
-    mAdapters.insert (std::make_pair (UniversalId::Type_Npc,
-        new NpcRefIdAdapter (npcColumns)));
-    mAdapters.insert (std::make_pair (UniversalId::Type_Probe,
-        new ToolRefIdAdapter<ESM::Probe> (UniversalId::Type_Probe, toolsColumns)));
-    mAdapters.insert (std::make_pair (UniversalId::Type_Repair,
-        new ToolRefIdAdapter<ESM::Repair> (UniversalId::Type_Repair, toolsColumns)));
-    mAdapters.insert (std::make_pair (UniversalId::Type_Static,
-        new ModelRefIdAdapter<ESM::Static> (UniversalId::Type_Static, modelColumns)));
-    mAdapters.insert (std::make_pair (UniversalId::Type_Weapon,
-        new WeaponRefIdAdapter (weaponColumns)));
+        new RefIdColumn(Columns::ColumnId_LevelledItemTypeEach, CSMWorld::ColumnBase::Display_Boolean));
+    mColumns.back().addColumn(
+        new RefIdColumn(Columns::ColumnId_LevelledItemType, CSMWorld::ColumnBase::Display_Boolean));
+    mColumns.back().addColumn(
+        new RefIdColumn(Columns::ColumnId_LevelledItemChanceNone, CSMWorld::ColumnBase::Display_UnsignedInteger8));
+
+    mAdapters.insert(std::make_pair(
+        UniversalId::Type_Activator, new NameRefIdAdapter<ESM::Activator>(UniversalId::Type_Activator, nameColumns)));
+    mAdapters.insert(std::make_pair(UniversalId::Type_Potion, new PotionRefIdAdapter(potionColumns, autoCalc)));
+    mAdapters.insert(std::make_pair(UniversalId::Type_Apparatus,
+        new ApparatusRefIdAdapter(inventoryColumns, apparatusType, toolsColumns.mQuality)));
+    mAdapters.insert(std::make_pair(
+        UniversalId::Type_Armor, new ArmorRefIdAdapter(enchantableColumns, armorType, health, armor, partRef)));
+    mAdapters.insert(
+        std::make_pair(UniversalId::Type_Book, new BookRefIdAdapter(enchantableColumns, bookType, skill, text)));
+    mAdapters.insert(std::make_pair(
+        UniversalId::Type_Clothing, new ClothingRefIdAdapter(enchantableColumns, clothingType, partRef)));
+    mAdapters.insert(std::make_pair(UniversalId::Type_Container,
+        new ContainerRefIdAdapter(nameColumns, weightCapacity, organic, respawn, content)));
+    mAdapters.insert(std::make_pair(UniversalId::Type_Creature, new CreatureRefIdAdapter(creatureColumns)));
+    mAdapters.insert(std::make_pair(UniversalId::Type_Door, new DoorRefIdAdapter(nameColumns, openSound, closeSound)));
+    mAdapters.insert(std::make_pair(UniversalId::Type_Ingredient, new IngredientRefIdAdapter(ingredientColumns)));
+    mAdapters.insert(std::make_pair(UniversalId::Type_CreatureLevelledList,
+        new LevelledListRefIdAdapter<ESM::CreatureLevList>(
+            UniversalId::Type_CreatureLevelledList, creatureLevListColumns)));
+    mAdapters.insert(std::make_pair(UniversalId::Type_ItemLevelledList,
+        new LevelledListRefIdAdapter<ESM::ItemLevList>(UniversalId::Type_ItemLevelledList, itemLevListColumns)));
+    mAdapters.insert(std::make_pair(UniversalId::Type_Light, new LightRefIdAdapter(lightColumns)));
+    mAdapters.insert(std::make_pair(
+        UniversalId::Type_Lockpick, new ToolRefIdAdapter<ESM::Lockpick>(UniversalId::Type_Lockpick, toolsColumns)));
+    mAdapters.insert(std::make_pair(UniversalId::Type_Miscellaneous, new MiscRefIdAdapter(inventoryColumns, key)));
+    mAdapters.insert(std::make_pair(UniversalId::Type_Npc, new NpcRefIdAdapter(npcColumns)));
+    mAdapters.insert(std::make_pair(
+        UniversalId::Type_Probe, new ToolRefIdAdapter<ESM::Probe>(UniversalId::Type_Probe, toolsColumns)));
+    mAdapters.insert(std::make_pair(
+        UniversalId::Type_Repair, new ToolRefIdAdapter<ESM::Repair>(UniversalId::Type_Repair, toolsColumns)));
+    mAdapters.insert(std::make_pair(
+        UniversalId::Type_Static, new ModelRefIdAdapter<ESM::Static>(UniversalId::Type_Static, modelColumns)));
+    mAdapters.insert(std::make_pair(UniversalId::Type_Weapon, new WeaponRefIdAdapter(weaponColumns)));
 }
 
 CSMWorld::RefIdCollection::~RefIdCollection()
 {
-    for (std::map<UniversalId::Type, RefIdAdapter *>::iterator iter (mAdapters.begin());
-         iter!=mAdapters.end(); ++iter)
-         delete iter->second;
+    for (std::map<UniversalId::Type, RefIdAdapter*>::iterator iter(mAdapters.begin()); iter != mAdapters.end(); ++iter)
+        delete iter->second;
 
-    for (std::vector<std::pair<const ColumnBase*, std::map<UniversalId::Type, NestedRefIdAdapterBase*> > >::iterator iter (mNestedAdapters.begin());
-         iter!=mNestedAdapters.end(); ++iter)
+    for (std::vector<std::pair<const ColumnBase*, std::map<UniversalId::Type, NestedRefIdAdapterBase*>>>::iterator iter(
+             mNestedAdapters.begin());
+         iter != mNestedAdapters.end(); ++iter)
     {
-        for (std::map<UniversalId::Type, NestedRefIdAdapterBase *>::iterator it ((iter->second).begin());
-            it!=(iter->second).end(); ++it)
+        for (std::map<UniversalId::Type, NestedRefIdAdapterBase*>::iterator it((iter->second).begin());
+             it != (iter->second).end(); ++it)
             delete it->second;
     }
 }
@@ -726,17 +629,17 @@ int CSMWorld::RefIdCollection::getSize() const
     return mData.getSize();
 }
 
-std::string CSMWorld::RefIdCollection::getId (int index) const
+std::string CSMWorld::RefIdCollection::getId(int index) const
 {
-    return getData (index, 0).toString().toUtf8().constData();
+    return getData(index, 0).toString().toUtf8().constData();
 }
 
-int CSMWorld::RefIdCollection::getIndex (const std::string& id) const
+int CSMWorld::RefIdCollection::getIndex(const std::string& id) const
 {
-    int index = searchId (id);
+    int index = searchId(id);
 
-    if (index==-1)
-        throw std::runtime_error ("invalid ID: " + id);
+    if (index == -1)
+        throw std::runtime_error("invalid ID: " + id);
 
     return index;
 }
@@ -746,85 +649,84 @@ int CSMWorld::RefIdCollection::getColumns() const
     return mColumns.size();
 }
 
-const CSMWorld::ColumnBase& CSMWorld::RefIdCollection::getColumn (int column) const
+const CSMWorld::ColumnBase& CSMWorld::RefIdCollection::getColumn(int column) const
 {
-    return mColumns.at (column);
+    return mColumns.at(column);
 }
 
-QVariant CSMWorld::RefIdCollection::getData (int index, int column) const
+QVariant CSMWorld::RefIdCollection::getData(int index, int column) const
 {
-    RefIdData::LocalIndex localIndex = mData.globalToLocalIndex (index);
+    RefIdData::LocalIndex localIndex = mData.globalToLocalIndex(index);
 
-    const RefIdAdapter& adaptor = findAdapter (localIndex.second);
+    const RefIdAdapter& adaptor = findAdapter(localIndex.second);
 
-    return adaptor.getData (&mColumns.at (column), mData, localIndex.first);
+    return adaptor.getData(&mColumns.at(column), mData, localIndex.first);
 }
 
-QVariant CSMWorld::RefIdCollection::getNestedData (int row, int column, int subRow, int subColumn) const
+QVariant CSMWorld::RefIdCollection::getNestedData(int row, int column, int subRow, int subColumn) const
 {
     RefIdData::LocalIndex localIndex = mData.globalToLocalIndex(row);
     const CSMWorld::NestedRefIdAdapterBase& nestedAdapter = getNestedAdapter(mColumns.at(column), localIndex.second);
 
-    return nestedAdapter.getNestedData(&mColumns.at (column), mData, localIndex.first, subRow, subColumn);
+    return nestedAdapter.getNestedData(&mColumns.at(column), mData, localIndex.first, subRow, subColumn);
 }
 
-void CSMWorld::RefIdCollection::setData (int index, int column, const QVariant& data)
+void CSMWorld::RefIdCollection::setData(int index, int column, const QVariant& data)
 {
-    RefIdData::LocalIndex localIndex = mData.globalToLocalIndex (index);
+    RefIdData::LocalIndex localIndex = mData.globalToLocalIndex(index);
 
-    const RefIdAdapter& adaptor = findAdapter (localIndex.second);
+    const RefIdAdapter& adaptor = findAdapter(localIndex.second);
 
-    adaptor.setData (&mColumns.at (column), mData, localIndex.first, data);
+    adaptor.setData(&mColumns.at(column), mData, localIndex.first, data);
 }
 
 void CSMWorld::RefIdCollection::setNestedData(int row, int column, const QVariant& data, int subRow, int subColumn)
 {
-    RefIdData::LocalIndex localIndex = mData.globalToLocalIndex (row);
+    RefIdData::LocalIndex localIndex = mData.globalToLocalIndex(row);
     const CSMWorld::NestedRefIdAdapterBase& nestedAdapter = getNestedAdapter(mColumns.at(column), localIndex.second);
 
-    nestedAdapter.setNestedData(&mColumns.at (column), mData, localIndex.first, data, subRow, subColumn);
+    nestedAdapter.setNestedData(&mColumns.at(column), mData, localIndex.first, data, subRow, subColumn);
 }
 
-void CSMWorld::RefIdCollection::removeRows (int index, int count)
+void CSMWorld::RefIdCollection::removeRows(int index, int count)
 {
-    mData.erase (index, count);
+    mData.erase(index, count);
 }
 
 void CSMWorld::RefIdCollection::removeNestedRows(int row, int column, int subRow)
 {
-    RefIdData::LocalIndex localIndex = mData.globalToLocalIndex (row);
+    RefIdData::LocalIndex localIndex = mData.globalToLocalIndex(row);
     const CSMWorld::NestedRefIdAdapterBase& nestedAdapter = getNestedAdapter(mColumns.at(column), localIndex.second);
 
-    nestedAdapter.removeNestedRow(&mColumns.at (column), mData, localIndex.first, subRow);
+    nestedAdapter.removeNestedRow(&mColumns.at(column), mData, localIndex.first, subRow);
 }
 
-void CSMWorld::RefIdCollection::appendBlankRecord (const std::string& id, UniversalId::Type type)
+void CSMWorld::RefIdCollection::appendBlankRecord(const std::string& id, UniversalId::Type type)
 {
-    mData.appendRecord (type, id, false);
+    mData.appendRecord(type, id, false);
 }
 
 int CSMWorld::RefIdCollection::searchId(std::string_view id) const
 {
-    RefIdData::LocalIndex localIndex = mData.searchId (id);
+    RefIdData::LocalIndex localIndex = mData.searchId(id);
 
-    if (localIndex.first==-1)
+    if (localIndex.first == -1)
         return -1;
 
-    return mData.localToGlobalIndex (localIndex);
+    return mData.localToGlobalIndex(localIndex);
 }
 
-void CSMWorld::RefIdCollection::replace (int index, std::unique_ptr<RecordBase> record)
+void CSMWorld::RefIdCollection::replace(int index, std::unique_ptr<RecordBase> record)
 {
-    mData.getRecord (mData.globalToLocalIndex (index)).assign (*record.release());
+    mData.getRecord(mData.globalToLocalIndex(index)).assign(*record.release());
 }
 
-void CSMWorld::RefIdCollection::cloneRecord(const std::string& origin,
-                                     const std::string& destination,
-                                     const CSMWorld::UniversalId::Type type)
+void CSMWorld::RefIdCollection::cloneRecord(
+    const std::string& origin, const std::string& destination, const CSMWorld::UniversalId::Type type)
 {
-        std::unique_ptr<RecordBase> newRecord = mData.getRecord(mData.searchId(origin)).modifiedCopy();
-        mAdapters.find(type)->second->setId(*newRecord, destination);
-        mData.insertRecord(std::move(newRecord), type, destination);
+    std::unique_ptr<RecordBase> newRecord = mData.getRecord(mData.searchId(origin)).modifiedCopy();
+    mAdapters.find(type)->second->setId(*newRecord, destination);
+    mData.insertRecord(std::move(newRecord), type, destination);
 }
 
 bool CSMWorld::RefIdCollection::touchRecord(const std::string& id)
@@ -833,51 +735,50 @@ bool CSMWorld::RefIdCollection::touchRecord(const std::string& id)
     return false;
 }
 
-void CSMWorld::RefIdCollection::appendRecord (std::unique_ptr<RecordBase> record,
-    UniversalId::Type type)
+void CSMWorld::RefIdCollection::appendRecord(std::unique_ptr<RecordBase> record, UniversalId::Type type)
 {
-    std::string id = findAdapter (type).getId (*record.get());
+    std::string id = findAdapter(type).getId(*record.get());
 
-    int index = mData.getAppendIndex (type);
+    int index = mData.getAppendIndex(type);
 
-    mData.appendRecord (type, id, false);
+    mData.appendRecord(type, id, false);
 
-    mData.getRecord (mData.globalToLocalIndex (index)).assign (*record.release());
+    mData.getRecord(mData.globalToLocalIndex(index)).assign(*record.release());
 }
 
-const CSMWorld::RecordBase& CSMWorld::RefIdCollection::getRecord (const std::string& id) const
+const CSMWorld::RecordBase& CSMWorld::RefIdCollection::getRecord(const std::string& id) const
 {
-    return mData.getRecord (mData.searchId (id));
+    return mData.getRecord(mData.searchId(id));
 }
 
-const CSMWorld::RecordBase& CSMWorld::RefIdCollection::getRecord (int index) const
+const CSMWorld::RecordBase& CSMWorld::RefIdCollection::getRecord(int index) const
 {
-    return mData.getRecord (mData.globalToLocalIndex (index));
+    return mData.getRecord(mData.globalToLocalIndex(index));
 }
 
-void CSMWorld::RefIdCollection::load (ESM::ESMReader& reader, bool base, UniversalId::Type type)
+void CSMWorld::RefIdCollection::load(ESM::ESMReader& reader, bool base, UniversalId::Type type)
 {
     mData.load(reader, base, type);
 }
 
-int CSMWorld::RefIdCollection::getAppendIndex (const std::string& id, UniversalId::Type type) const
+int CSMWorld::RefIdCollection::getAppendIndex(const std::string& id, UniversalId::Type type) const
 {
-    return mData.getAppendIndex (type);
+    return mData.getAppendIndex(type);
 }
 
-std::vector<std::string> CSMWorld::RefIdCollection::getIds (bool listDeleted) const
+std::vector<std::string> CSMWorld::RefIdCollection::getIds(bool listDeleted) const
 {
-    return mData.getIds (listDeleted);
+    return mData.getIds(listDeleted);
 }
 
-bool CSMWorld::RefIdCollection::reorderRows (int baseIndex, const std::vector<int>& newOrder)
+bool CSMWorld::RefIdCollection::reorderRows(int baseIndex, const std::vector<int>& newOrder)
 {
     return false;
 }
 
-void CSMWorld::RefIdCollection::save (int index, ESM::ESMWriter& writer) const
+void CSMWorld::RefIdCollection::save(int index, ESM::ESMWriter& writer) const
 {
-    mData.save (index, writer);
+    mData.save(index, writer);
 }
 
 const CSMWorld::RefIdData& CSMWorld::RefIdCollection::getDataSet() const
@@ -887,7 +788,7 @@ const CSMWorld::RefIdData& CSMWorld::RefIdCollection::getDataSet() const
 
 int CSMWorld::RefIdCollection::getNestedRowsCount(int row, int column) const
 {
-    RefIdData::LocalIndex localIndex = mData.globalToLocalIndex (row);
+    RefIdData::LocalIndex localIndex = mData.globalToLocalIndex(row);
     const CSMWorld::NestedRefIdAdapterBase& nestedAdapter = getNestedAdapter(mColumns.at(column), localIndex.second);
 
     return nestedAdapter.getNestedRowsCount(&mColumns.at(column), mData, localIndex.first);
@@ -895,20 +796,20 @@ int CSMWorld::RefIdCollection::getNestedRowsCount(int row, int column) const
 
 int CSMWorld::RefIdCollection::getNestedColumnsCount(int row, int column) const
 {
-    RefIdData::LocalIndex localIndex = mData.globalToLocalIndex (row);
+    RefIdData::LocalIndex localIndex = mData.globalToLocalIndex(row);
     const CSMWorld::NestedRefIdAdapterBase& nestedAdapter = getNestedAdapter(mColumns.at(column), localIndex.second);
 
     return nestedAdapter.getNestedColumnsCount(&mColumns.at(column), mData);
 }
 
-CSMWorld::NestableColumn *CSMWorld::RefIdCollection::getNestableColumn(int column)
+CSMWorld::NestableColumn* CSMWorld::RefIdCollection::getNestableColumn(int column)
 {
     return &mColumns.at(column);
 }
 
 void CSMWorld::RefIdCollection::addNestedRow(int row, int col, int position)
 {
-    RefIdData::LocalIndex localIndex = mData.globalToLocalIndex (row);
+    RefIdData::LocalIndex localIndex = mData.globalToLocalIndex(row);
     const CSMWorld::NestedRefIdAdapterBase& nestedAdapter = getNestedAdapter(mColumns.at(col), localIndex.second);
 
     nestedAdapter.addNestedRow(&mColumns.at(col), mData, localIndex.first, position);
@@ -916,7 +817,7 @@ void CSMWorld::RefIdCollection::addNestedRow(int row, int col, int position)
 
 void CSMWorld::RefIdCollection::setNestedTable(int row, int column, const CSMWorld::NestedTableWrapperBase& nestedTable)
 {
-    RefIdData::LocalIndex localIndex = mData.globalToLocalIndex (row);
+    RefIdData::LocalIndex localIndex = mData.globalToLocalIndex(row);
     const CSMWorld::NestedRefIdAdapterBase& nestedAdapter = getNestedAdapter(mColumns.at(column), localIndex.second);
 
     nestedAdapter.setNestedTable(&mColumns.at(column), mData, localIndex.first, nestedTable);
@@ -924,21 +825,22 @@ void CSMWorld::RefIdCollection::setNestedTable(int row, int column, const CSMWor
 
 CSMWorld::NestedTableWrapperBase* CSMWorld::RefIdCollection::nestedTable(int row, int column) const
 {
-    RefIdData::LocalIndex localIndex = mData.globalToLocalIndex (row);
+    RefIdData::LocalIndex localIndex = mData.globalToLocalIndex(row);
     const CSMWorld::NestedRefIdAdapterBase& nestedAdapter = getNestedAdapter(mColumns.at(column), localIndex.second);
 
     return nestedAdapter.nestedTable(&mColumns.at(column), mData, localIndex.first);
 }
 
-const CSMWorld::NestedRefIdAdapterBase& CSMWorld::RefIdCollection::getNestedAdapter(const CSMWorld::ColumnBase &column, UniversalId::Type type) const
+const CSMWorld::NestedRefIdAdapterBase& CSMWorld::RefIdCollection::getNestedAdapter(
+    const CSMWorld::ColumnBase& column, UniversalId::Type type) const
 {
-    for (std::vector<std::pair<const ColumnBase*, std::map<UniversalId::Type, NestedRefIdAdapterBase*> > >::const_iterator iter (mNestedAdapters.begin());
-         iter!=mNestedAdapters.end(); ++iter)
+    for (std::vector<std::pair<const ColumnBase*, std::map<UniversalId::Type, NestedRefIdAdapterBase*>>>::const_iterator
+             iter(mNestedAdapters.begin());
+         iter != mNestedAdapters.end(); ++iter)
     {
         if ((iter->first) == &column)
         {
-            std::map<UniversalId::Type, NestedRefIdAdapterBase*>::const_iterator it =
-                (iter->second).find(type);
+            std::map<UniversalId::Type, NestedRefIdAdapterBase*>::const_iterator it = (iter->second).find(type);
 
             if (it == (iter->second).end())
                 throw std::runtime_error("No such type in the nestedadapters");
@@ -949,7 +851,7 @@ const CSMWorld::NestedRefIdAdapterBase& CSMWorld::RefIdCollection::getNestedAdap
     throw std::runtime_error("No such column in the nestedadapters");
 }
 
-void CSMWorld::RefIdCollection::copyTo (int index, RefIdCollection& target) const
+void CSMWorld::RefIdCollection::copyTo(int index, RefIdCollection& target) const
 {
-    mData.copyTo (index, target.mData);
+    mData.copyTo(index, target.mData);
 }
diff --git a/apps/opencs/model/world/refidcollection.hpp b/apps/opencs/model/world/refidcollection.hpp
index ee17bb3214..63271db77f 100644
--- a/apps/opencs/model/world/refidcollection.hpp
+++ b/apps/opencs/model/world/refidcollection.hpp
@@ -1,13 +1,13 @@
 #ifndef CSM_WOLRD_REFIDCOLLECTION_H
 #define CSM_WOLRD_REFIDCOLLECTION_H
 
-#include <vector>
-#include <map>
 #include <deque>
+#include <map>
 #include <string_view>
+#include <vector>
 
-#include "columnbase.hpp"
 #include "collectionbase.hpp"
+#include "columnbase.hpp"
 #include "nestedcollection.hpp"
 #include "refiddata.hpp"
 
@@ -24,124 +24,118 @@ namespace CSMWorld
 
     class RefIdColumn : public NestableColumn
     {
-            bool mEditable;
-            bool mUserEditable;
-
-        public:
+        bool mEditable;
+        bool mUserEditable;
 
-            RefIdColumn (int columnId, Display displayType,
-                         int flag = Flag_Table | Flag_Dialogue, bool editable = true,
-                         bool userEditable = true);
+    public:
+        RefIdColumn(int columnId, Display displayType, int flag = Flag_Table | Flag_Dialogue, bool editable = true,
+            bool userEditable = true);
 
-            bool isEditable() const override;
+        bool isEditable() const override;
 
-            bool isUserEditable() const override;
+        bool isUserEditable() const override;
     };
 
     class RefIdCollection : public CollectionBase, public NestedCollection
     {
-        private:
-
-            RefIdData mData;
-            std::deque<RefIdColumn> mColumns;
-            std::map<UniversalId::Type, RefIdAdapter *> mAdapters;
-
-            std::vector<std::pair<const ColumnBase*, std::map<UniversalId::Type, NestedRefIdAdapterBase*> > > mNestedAdapters;
-
-        private:
+    private:
+        RefIdData mData;
+        std::deque<RefIdColumn> mColumns;
+        std::map<UniversalId::Type, RefIdAdapter*> mAdapters;
 
-            const RefIdAdapter& findAdapter (UniversalId::Type) const;
-            ///< Throws an exception if no adaptor for \a Type can be found.
+        std::vector<std::pair<const ColumnBase*, std::map<UniversalId::Type, NestedRefIdAdapterBase*>>> mNestedAdapters;
 
-            const NestedRefIdAdapterBase& getNestedAdapter(const ColumnBase &column, UniversalId::Type type) const;
+    private:
+        const RefIdAdapter& findAdapter(UniversalId::Type) const;
+        ///< Throws an exception if no adaptor for \a Type can be found.
 
-        public:
+        const NestedRefIdAdapterBase& getNestedAdapter(const ColumnBase& column, UniversalId::Type type) const;
 
-            RefIdCollection();
+    public:
+        RefIdCollection();
 
-            ~RefIdCollection() override;
+        ~RefIdCollection() override;
 
-            int getSize() const override;
+        int getSize() const override;
 
-            std::string getId (int index) const override;
+        std::string getId(int index) const override;
 
-            int getIndex (const std::string& id) const override;
+        int getIndex(const std::string& id) const override;
 
-            int getColumns() const override;
+        int getColumns() const override;
 
-            const ColumnBase& getColumn (int column) const override;
+        const ColumnBase& getColumn(int column) const override;
 
-            QVariant getData (int index, int column) const override;
+        QVariant getData(int index, int column) const override;
 
-            void setData (int index, int column, const QVariant& data) override;
+        void setData(int index, int column, const QVariant& data) override;
 
-            void removeRows (int index, int count) override;
+        void removeRows(int index, int count) override;
 
-            void cloneRecord(const std::string& origin,
-                                     const std::string& destination,
-                                     const UniversalId::Type type) override;
+        void cloneRecord(
+            const std::string& origin, const std::string& destination, const UniversalId::Type type) override;
 
-            bool touchRecord(const std::string& id) override;
+        bool touchRecord(const std::string& id) override;
 
-            void appendBlankRecord (const std::string& id, UniversalId::Type type) override;
-            ///< \param type Will be ignored, unless the collection supports multiple record types
+        void appendBlankRecord(const std::string& id, UniversalId::Type type) override;
+        ///< \param type Will be ignored, unless the collection supports multiple record types
 
-            int searchId(std::string_view id) const override;
-            ////< Search record with \a id.
-            /// \return index of record (if found) or -1 (not found)
+        int searchId(std::string_view id) const override;
+        ////< Search record with \a id.
+        /// \return index of record (if found) or -1 (not found)
 
-            void replace (int index, std::unique_ptr<RecordBase> record) override;
-            ///< If the record type does not match, an exception is thrown.
-            ///
-            /// \attention \a record must not change the ID.
+        void replace(int index, std::unique_ptr<RecordBase> record) override;
+        ///< If the record type does not match, an exception is thrown.
+        ///
+        /// \attention \a record must not change the ID.
 
-            void appendRecord (std::unique_ptr<RecordBase> record, UniversalId::Type type) override;
-            ///< If the record type does not match, an exception is thrown.
-            ///
-            ///< \param type Will be ignored, unless the collection supports multiple record types
+        void appendRecord(std::unique_ptr<RecordBase> record, UniversalId::Type type) override;
+        ///< If the record type does not match, an exception is thrown.
+        ///
+        ///< \param type Will be ignored, unless the collection supports multiple record types
 
-            const RecordBase& getRecord (const std::string& id) const override;
+        const RecordBase& getRecord(const std::string& id) const override;
 
-            const RecordBase& getRecord (int index) const override;
+        const RecordBase& getRecord(int index) const override;
 
-            void load (ESM::ESMReader& reader, bool base, UniversalId::Type type);
+        void load(ESM::ESMReader& reader, bool base, UniversalId::Type type);
 
-            int getAppendIndex (const std::string& id, UniversalId::Type type) const override;
-            ///< \param type Will be ignored, unless the collection supports multiple record types
+        int getAppendIndex(const std::string& id, UniversalId::Type type) const override;
+        ///< \param type Will be ignored, unless the collection supports multiple record types
 
-            std::vector<std::string> getIds (bool listDeleted) const override;
-            ///< Return a sorted collection of all IDs
-            ///
-            /// \param listDeleted include deleted record in the list
+        std::vector<std::string> getIds(bool listDeleted) const override;
+        ///< Return a sorted collection of all IDs
+        ///
+        /// \param listDeleted include deleted record in the list
 
-            bool reorderRows (int baseIndex, const std::vector<int>& newOrder) override;
-            ///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices
-            /// given in \a newOrder (baseIndex+newOrder[0] specifies the new index of row baseIndex).
-            ///
-            /// \return Success?
+        bool reorderRows(int baseIndex, const std::vector<int>& newOrder) override;
+        ///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices
+        /// given in \a newOrder (baseIndex+newOrder[0] specifies the new index of row baseIndex).
+        ///
+        /// \return Success?
 
-            QVariant getNestedData(int row, int column, int subRow, int subColumn) const override;
+        QVariant getNestedData(int row, int column, int subRow, int subColumn) const override;
 
-            NestedTableWrapperBase* nestedTable(int row, int column) const override;
+        NestedTableWrapperBase* nestedTable(int row, int column) const override;
 
-            void setNestedTable(int row, int column, const NestedTableWrapperBase& nestedTable) override;
+        void setNestedTable(int row, int column, const NestedTableWrapperBase& nestedTable) override;
 
-            int getNestedRowsCount(int row, int column) const override;
+        int getNestedRowsCount(int row, int column) const override;
 
-            int getNestedColumnsCount(int row, int column) const override;
+        int getNestedColumnsCount(int row, int column) const override;
 
-            NestableColumn *getNestableColumn(int column) override;
+        NestableColumn* getNestableColumn(int column) override;
 
-            void setNestedData(int row, int column, const QVariant& data, int subRow, int subColumn) override;
+        void setNestedData(int row, int column, const QVariant& data, int subRow, int subColumn) override;
 
-            void removeNestedRows(int row, int column, int subRow) override;
+        void removeNestedRows(int row, int column, int subRow) override;
 
-            void addNestedRow(int row, int col, int position) override;
+        void addNestedRow(int row, int col, int position) override;
 
-            void save (int index, ESM::ESMWriter& writer) const;
+        void save(int index, ESM::ESMWriter& writer) const;
 
-            const RefIdData& getDataSet() const; //I can't figure out a better name for this one :(
-            void copyTo (int index, RefIdCollection& target) const;
+        const RefIdData& getDataSet() const; // I can't figure out a better name for this one :(
+        void copyTo(int index, RefIdCollection& target) const;
     };
 }
 
diff --git a/apps/opencs/model/world/refiddata.cpp b/apps/opencs/model/world/refiddata.cpp
index 009e43706f..5f453ed1c6 100644
--- a/apps/opencs/model/world/refiddata.cpp
+++ b/apps/opencs/model/world/refiddata.cpp
@@ -8,70 +8,65 @@
 
 CSMWorld::RefIdDataContainerBase::~RefIdDataContainerBase() {}
 
-
-std::string CSMWorld::RefIdData::getRecordId(const CSMWorld::RefIdData::LocalIndex &index) const
+std::string CSMWorld::RefIdData::getRecordId(const CSMWorld::RefIdData::LocalIndex& index) const
 {
-    std::map<UniversalId::Type, RefIdDataContainerBase *>::const_iterator found =
-        mRecordContainers.find (index.second);
+    std::map<UniversalId::Type, RefIdDataContainerBase*>::const_iterator found = mRecordContainers.find(index.second);
 
     if (found == mRecordContainers.end())
-        throw std::logic_error ("invalid local index type");
+        throw std::logic_error("invalid local index type");
 
     return found->second->getId(index.first);
 }
 
 CSMWorld::RefIdData::RefIdData()
 {
-    mRecordContainers.insert (std::make_pair (UniversalId::Type_Activator, &mActivators));
-    mRecordContainers.insert (std::make_pair (UniversalId::Type_Potion, &mPotions));
-    mRecordContainers.insert (std::make_pair (UniversalId::Type_Apparatus, &mApparati));
-    mRecordContainers.insert (std::make_pair (UniversalId::Type_Armor, &mArmors));
-    mRecordContainers.insert (std::make_pair (UniversalId::Type_Book, &mBooks));
-    mRecordContainers.insert (std::make_pair (UniversalId::Type_Clothing, &mClothing));
-    mRecordContainers.insert (std::make_pair (UniversalId::Type_Container, &mContainers));
-    mRecordContainers.insert (std::make_pair (UniversalId::Type_Creature, &mCreatures));
-    mRecordContainers.insert (std::make_pair (UniversalId::Type_Door, &mDoors));
-    mRecordContainers.insert (std::make_pair (UniversalId::Type_Ingredient, &mIngredients));
-    mRecordContainers.insert (std::make_pair (UniversalId::Type_CreatureLevelledList,
-        &mCreatureLevelledLists));
-    mRecordContainers.insert (std::make_pair (UniversalId::Type_ItemLevelledList, &mItemLevelledLists));
-    mRecordContainers.insert (std::make_pair (UniversalId::Type_Light, &mLights));
-    mRecordContainers.insert (std::make_pair (UniversalId::Type_Lockpick, &mLockpicks));
-    mRecordContainers.insert (std::make_pair (UniversalId::Type_Miscellaneous, &mMiscellaneous));
-    mRecordContainers.insert (std::make_pair (UniversalId::Type_Npc, &mNpcs));
-    mRecordContainers.insert (std::make_pair (UniversalId::Type_Probe, &mProbes));
-    mRecordContainers.insert (std::make_pair (UniversalId::Type_Repair, &mRepairs));
-    mRecordContainers.insert (std::make_pair (UniversalId::Type_Static, &mStatics));
-    mRecordContainers.insert (std::make_pair (UniversalId::Type_Weapon, &mWeapons));
-}
-
-CSMWorld::RefIdData::LocalIndex CSMWorld::RefIdData::globalToLocalIndex (int index) const
-{
-    for (std::map<UniversalId::Type, RefIdDataContainerBase *>::const_iterator iter (
-        mRecordContainers.begin()); iter!=mRecordContainers.end(); ++iter)
+    mRecordContainers.insert(std::make_pair(UniversalId::Type_Activator, &mActivators));
+    mRecordContainers.insert(std::make_pair(UniversalId::Type_Potion, &mPotions));
+    mRecordContainers.insert(std::make_pair(UniversalId::Type_Apparatus, &mApparati));
+    mRecordContainers.insert(std::make_pair(UniversalId::Type_Armor, &mArmors));
+    mRecordContainers.insert(std::make_pair(UniversalId::Type_Book, &mBooks));
+    mRecordContainers.insert(std::make_pair(UniversalId::Type_Clothing, &mClothing));
+    mRecordContainers.insert(std::make_pair(UniversalId::Type_Container, &mContainers));
+    mRecordContainers.insert(std::make_pair(UniversalId::Type_Creature, &mCreatures));
+    mRecordContainers.insert(std::make_pair(UniversalId::Type_Door, &mDoors));
+    mRecordContainers.insert(std::make_pair(UniversalId::Type_Ingredient, &mIngredients));
+    mRecordContainers.insert(std::make_pair(UniversalId::Type_CreatureLevelledList, &mCreatureLevelledLists));
+    mRecordContainers.insert(std::make_pair(UniversalId::Type_ItemLevelledList, &mItemLevelledLists));
+    mRecordContainers.insert(std::make_pair(UniversalId::Type_Light, &mLights));
+    mRecordContainers.insert(std::make_pair(UniversalId::Type_Lockpick, &mLockpicks));
+    mRecordContainers.insert(std::make_pair(UniversalId::Type_Miscellaneous, &mMiscellaneous));
+    mRecordContainers.insert(std::make_pair(UniversalId::Type_Npc, &mNpcs));
+    mRecordContainers.insert(std::make_pair(UniversalId::Type_Probe, &mProbes));
+    mRecordContainers.insert(std::make_pair(UniversalId::Type_Repair, &mRepairs));
+    mRecordContainers.insert(std::make_pair(UniversalId::Type_Static, &mStatics));
+    mRecordContainers.insert(std::make_pair(UniversalId::Type_Weapon, &mWeapons));
+}
+
+CSMWorld::RefIdData::LocalIndex CSMWorld::RefIdData::globalToLocalIndex(int index) const
+{
+    for (std::map<UniversalId::Type, RefIdDataContainerBase*>::const_iterator iter(mRecordContainers.begin());
+         iter != mRecordContainers.end(); ++iter)
     {
-        if (index<iter->second->getSize())
-            return LocalIndex (index, iter->first);
+        if (index < iter->second->getSize())
+            return LocalIndex(index, iter->first);
 
         index -= iter->second->getSize();
     }
 
-    throw std::runtime_error ("RefIdData index out of range");
+    throw std::runtime_error("RefIdData index out of range");
 }
 
-int CSMWorld::RefIdData::localToGlobalIndex (const LocalIndex& index)
-    const
+int CSMWorld::RefIdData::localToGlobalIndex(const LocalIndex& index) const
 {
-    std::map<UniversalId::Type, RefIdDataContainerBase *>::const_iterator end =
-        mRecordContainers.find (index.second);
+    std::map<UniversalId::Type, RefIdDataContainerBase*>::const_iterator end = mRecordContainers.find(index.second);
 
-    if (end==mRecordContainers.end())
-        throw std::logic_error ("invalid local index type");
+    if (end == mRecordContainers.end())
+        throw std::logic_error("invalid local index type");
 
     int globalIndex = index.first;
 
-    for (std::map<UniversalId::Type, RefIdDataContainerBase *>::const_iterator iter (
-        mRecordContainers.begin()); iter!=end; ++iter)
+    for (std::map<UniversalId::Type, RefIdDataContainerBase*>::const_iterator iter(mRecordContainers.begin());
+         iter != end; ++iter)
         globalIndex += iter->second->getSize();
 
     return globalIndex;
@@ -79,42 +74,62 @@ int CSMWorld::RefIdData::localToGlobalIndex (const LocalIndex& index)
 
 CSMWorld::RefIdData::LocalIndex CSMWorld::RefIdData::searchId(std::string_view id) const
 {
-    std::string id2 = Misc::StringUtils::lowerCase (id);
+    std::string id2 = Misc::StringUtils::lowerCase(id);
 
-    std::map<std::string, std::pair<int, UniversalId::Type> >::const_iterator iter = mIndex.find (id2);
+    std::map<std::string, std::pair<int, UniversalId::Type>>::const_iterator iter = mIndex.find(id2);
 
-    if (iter==mIndex.end())
-        return std::make_pair (-1, CSMWorld::UniversalId::Type_None);
+    if (iter == mIndex.end())
+        return std::make_pair(-1, CSMWorld::UniversalId::Type_None);
 
     return iter->second;
 }
 
-unsigned int CSMWorld::RefIdData::getRecordFlags (const std::string& id) const
+unsigned int CSMWorld::RefIdData::getRecordFlags(const std::string& id) const
 {
-    LocalIndex localIndex = searchId (id);
+    LocalIndex localIndex = searchId(id);
 
     switch (localIndex.second)
     {
-        case UniversalId::Type_Activator: return mActivators.getRecordFlags(localIndex.first);
-        case UniversalId::Type_Potion:    return mPotions.getRecordFlags(localIndex.first);
-        case UniversalId::Type_Apparatus: return mApparati.getRecordFlags(localIndex.first);
-        case UniversalId::Type_Armor:     return mArmors.getRecordFlags(localIndex.first);
-        case UniversalId::Type_Book:      return mBooks.getRecordFlags(localIndex.first);
-        case UniversalId::Type_Clothing:  return mClothing.getRecordFlags(localIndex.first);
-        case UniversalId::Type_Container: return mContainers.getRecordFlags(localIndex.first);
-        case UniversalId::Type_Creature:  return mCreatures.getRecordFlags(localIndex.first);
-        case UniversalId::Type_Door:      return mDoors.getRecordFlags(localIndex.first);
-        case UniversalId::Type_Ingredient: return mIngredients.getRecordFlags(localIndex.first);
-        case UniversalId::Type_CreatureLevelledList: return mCreatureLevelledLists.getRecordFlags(localIndex.first);
-        case UniversalId::Type_ItemLevelledList: return mItemLevelledLists.getRecordFlags(localIndex.first);
-        case UniversalId::Type_Light:     return mLights.getRecordFlags(localIndex.first);
-        case UniversalId::Type_Lockpick:  return mLockpicks.getRecordFlags(localIndex.first);
-        case UniversalId::Type_Miscellaneous: return mMiscellaneous.getRecordFlags(localIndex.first);
-        case UniversalId::Type_Npc:       return mNpcs.getRecordFlags(localIndex.first);
-        case UniversalId::Type_Probe:     return mProbes.getRecordFlags(localIndex.first);
-        case UniversalId::Type_Repair:    return mRepairs.getRecordFlags(localIndex.first);
-        case UniversalId::Type_Static:    return mStatics.getRecordFlags(localIndex.first);
-        case UniversalId::Type_Weapon:    return mWeapons.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Activator:
+            return mActivators.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Potion:
+            return mPotions.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Apparatus:
+            return mApparati.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Armor:
+            return mArmors.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Book:
+            return mBooks.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Clothing:
+            return mClothing.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Container:
+            return mContainers.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Creature:
+            return mCreatures.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Door:
+            return mDoors.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Ingredient:
+            return mIngredients.getRecordFlags(localIndex.first);
+        case UniversalId::Type_CreatureLevelledList:
+            return mCreatureLevelledLists.getRecordFlags(localIndex.first);
+        case UniversalId::Type_ItemLevelledList:
+            return mItemLevelledLists.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Light:
+            return mLights.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Lockpick:
+            return mLockpicks.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Miscellaneous:
+            return mMiscellaneous.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Npc:
+            return mNpcs.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Probe:
+            return mProbes.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Repair:
+            return mRepairs.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Static:
+            return mStatics.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Weapon:
+            return mWeapons.getRecordFlags(localIndex.first);
         default:
             break;
     }
@@ -122,97 +137,92 @@ unsigned int CSMWorld::RefIdData::getRecordFlags (const std::string& id) const
     return 0;
 }
 
-void CSMWorld::RefIdData::erase (int index, int count)
+void CSMWorld::RefIdData::erase(int index, int count)
 {
-    LocalIndex localIndex = globalToLocalIndex (index);
+    LocalIndex localIndex = globalToLocalIndex(index);
 
-    std::map<UniversalId::Type, RefIdDataContainerBase *>::const_iterator iter =
-        mRecordContainers.find (localIndex.second);
+    std::map<UniversalId::Type, RefIdDataContainerBase*>::const_iterator iter
+        = mRecordContainers.find(localIndex.second);
 
-    while (count>0 && iter!=mRecordContainers.end())
+    while (count > 0 && iter != mRecordContainers.end())
     {
         int size = iter->second->getSize();
 
-        if (localIndex.first+count>size)
+        if (localIndex.first + count > size)
         {
-            erase (localIndex, size-localIndex.first);
-            count -= size-localIndex.first;
+            erase(localIndex, size - localIndex.first);
+            count -= size - localIndex.first;
 
             ++iter;
 
-            if (iter==mRecordContainers.end())
-                throw std::runtime_error ("invalid count value for erase operation");
+            if (iter == mRecordContainers.end())
+                throw std::runtime_error("invalid count value for erase operation");
 
             localIndex.first = 0;
             localIndex.second = iter->first;
         }
         else
         {
-            erase (localIndex, count);
+            erase(localIndex, count);
             count = 0;
         }
     }
 }
 
-const CSMWorld::RecordBase& CSMWorld::RefIdData::getRecord (const LocalIndex& index) const
+const CSMWorld::RecordBase& CSMWorld::RefIdData::getRecord(const LocalIndex& index) const
 {
-    std::map<UniversalId::Type, RefIdDataContainerBase *>::const_iterator iter =
-        mRecordContainers.find (index.second);
+    std::map<UniversalId::Type, RefIdDataContainerBase*>::const_iterator iter = mRecordContainers.find(index.second);
 
-    if (iter==mRecordContainers.end())
-        throw std::logic_error ("invalid local index type");
+    if (iter == mRecordContainers.end())
+        throw std::logic_error("invalid local index type");
 
-    return iter->second->getRecord (index.first);
+    return iter->second->getRecord(index.first);
 }
 
-CSMWorld::RecordBase& CSMWorld::RefIdData::getRecord (const LocalIndex& index)
+CSMWorld::RecordBase& CSMWorld::RefIdData::getRecord(const LocalIndex& index)
 {
-    std::map<UniversalId::Type, RefIdDataContainerBase *>::iterator iter =
-        mRecordContainers.find (index.second);
+    std::map<UniversalId::Type, RefIdDataContainerBase*>::iterator iter = mRecordContainers.find(index.second);
 
-    if (iter==mRecordContainers.end())
-        throw std::logic_error ("invalid local index type");
+    if (iter == mRecordContainers.end())
+        throw std::logic_error("invalid local index type");
 
-    return iter->second->getRecord (index.first);
+    return iter->second->getRecord(index.first);
 }
 
-void CSMWorld::RefIdData::appendRecord (UniversalId::Type type, const std::string& id, bool base)
+void CSMWorld::RefIdData::appendRecord(UniversalId::Type type, const std::string& id, bool base)
 {
-    std::map<UniversalId::Type, RefIdDataContainerBase *>::iterator iter =
-        mRecordContainers.find (type);
+    std::map<UniversalId::Type, RefIdDataContainerBase*>::iterator iter = mRecordContainers.find(type);
 
-    if (iter==mRecordContainers.end())
-        throw std::logic_error ("invalid local index type");
+    if (iter == mRecordContainers.end())
+        throw std::logic_error("invalid local index type");
 
-    iter->second->appendRecord (id, base);
+    iter->second->appendRecord(id, base);
 
-    mIndex.insert (std::make_pair (Misc::StringUtils::lowerCase (id),
-        LocalIndex (iter->second->getSize()-1, type)));
+    mIndex.insert(std::make_pair(Misc::StringUtils::lowerCase(id), LocalIndex(iter->second->getSize() - 1, type)));
 }
 
-int CSMWorld::RefIdData::getAppendIndex (UniversalId::Type type) const
+int CSMWorld::RefIdData::getAppendIndex(UniversalId::Type type) const
 {
     int index = 0;
 
-    for (std::map<UniversalId::Type, RefIdDataContainerBase *>::const_iterator iter (
-        mRecordContainers.begin()); iter!=mRecordContainers.end(); ++iter)
+    for (std::map<UniversalId::Type, RefIdDataContainerBase*>::const_iterator iter(mRecordContainers.begin());
+         iter != mRecordContainers.end(); ++iter)
     {
         index += iter->second->getSize();
 
-        if (type==iter->first)
+        if (type == iter->first)
             break;
     }
 
     return index;
 }
 
-void CSMWorld::RefIdData::load (ESM::ESMReader& reader, bool base, CSMWorld::UniversalId::Type type)
+void CSMWorld::RefIdData::load(ESM::ESMReader& reader, bool base, CSMWorld::UniversalId::Type type)
 {
-    std::map<UniversalId::Type, RefIdDataContainerBase *>::iterator found =
-        mRecordContainers.find (type);
+    std::map<UniversalId::Type, RefIdDataContainerBase*>::iterator found = mRecordContainers.find(type);
 
     if (found == mRecordContainers.end())
-        throw std::logic_error ("Invalid Referenceable ID type");
+        throw std::logic_error("Invalid Referenceable ID type");
 
     int index = found->second->load(reader, base);
     if (index != -1)
@@ -229,20 +239,19 @@ void CSMWorld::RefIdData::load (ESM::ESMReader& reader, bool base, CSMWorld::Uni
     }
 }
 
-void CSMWorld::RefIdData::erase (const LocalIndex& index, int count)
+void CSMWorld::RefIdData::erase(const LocalIndex& index, int count)
 {
-    std::map<UniversalId::Type, RefIdDataContainerBase *>::iterator iter =
-        mRecordContainers.find (index.second);
-    if (iter==mRecordContainers.end())
-        throw std::logic_error ("invalid local index type");
+    std::map<UniversalId::Type, RefIdDataContainerBase*>::iterator iter = mRecordContainers.find(index.second);
+    if (iter == mRecordContainers.end())
+        throw std::logic_error("invalid local index type");
 
-    for (int i=index.first; i<index.first+count; ++i)
+    for (int i = index.first; i < index.first + count; ++i)
     {
-        std::map<std::string, LocalIndex>::iterator result =
-            mIndex.find (Misc::StringUtils::lowerCase (iter->second->getId (i)));
+        std::map<std::string, LocalIndex>::iterator result
+            = mIndex.find(Misc::StringUtils::lowerCase(iter->second->getId(i)));
 
-        if (result!=mIndex.end())
-            mIndex.erase (result);
+        if (result != mIndex.end())
+            mIndex.erase(result);
     }
 
     // Adjust the local indexes to avoid gaps between them after removal of records
@@ -250,8 +259,8 @@ void CSMWorld::RefIdData::erase (const LocalIndex& index, int count)
     int recordCount = iter->second->getSize();
     while (recordIndex < recordCount)
     {
-        std::map<std::string, LocalIndex>::iterator recordIndexFound =
-            mIndex.find(Misc::StringUtils::lowerCase(iter->second->getId(recordIndex)));
+        std::map<std::string, LocalIndex>::iterator recordIndexFound
+            = mIndex.find(Misc::StringUtils::lowerCase(iter->second->getId(recordIndex)));
         if (recordIndexFound != mIndex.end())
         {
             recordIndexFound->second.first -= count;
@@ -259,7 +268,7 @@ void CSMWorld::RefIdData::erase (const LocalIndex& index, int count)
         ++recordIndex;
     }
 
-    iter->second->erase (index.first, count);
+    iter->second->erase(index.first, count);
 }
 
 int CSMWorld::RefIdData::getSize() const
@@ -267,162 +276,159 @@ int CSMWorld::RefIdData::getSize() const
     return mIndex.size();
 }
 
-std::vector<std::string> CSMWorld::RefIdData::getIds (bool listDeleted) const
+std::vector<std::string> CSMWorld::RefIdData::getIds(bool listDeleted) const
 {
     std::vector<std::string> ids;
 
-    for (std::map<std::string, LocalIndex>::const_iterator iter (mIndex.begin()); iter!=mIndex.end();
-         ++iter)
+    for (std::map<std::string, LocalIndex>::const_iterator iter(mIndex.begin()); iter != mIndex.end(); ++iter)
     {
-        if (listDeleted || !getRecord (iter->second).isDeleted())
+        if (listDeleted || !getRecord(iter->second).isDeleted())
         {
-            std::map<UniversalId::Type, RefIdDataContainerBase *>::const_iterator container =
-                mRecordContainers.find (iter->second.second);
+            std::map<UniversalId::Type, RefIdDataContainerBase*>::const_iterator container
+                = mRecordContainers.find(iter->second.second);
 
-            if (container==mRecordContainers.end())
-                throw std::logic_error ("Invalid referenceable ID type");
+            if (container == mRecordContainers.end())
+                throw std::logic_error("Invalid referenceable ID type");
 
-            ids.push_back (container->second->getId (iter->second.first));
+            ids.push_back(container->second->getId(iter->second.first));
         }
     }
 
     return ids;
 }
 
-void CSMWorld::RefIdData::save (int index, ESM::ESMWriter& writer) const
+void CSMWorld::RefIdData::save(int index, ESM::ESMWriter& writer) const
 {
-    LocalIndex localIndex = globalToLocalIndex (index);
+    LocalIndex localIndex = globalToLocalIndex(index);
 
-    std::map<UniversalId::Type, RefIdDataContainerBase *>::const_iterator iter =
-        mRecordContainers.find (localIndex.second);
+    std::map<UniversalId::Type, RefIdDataContainerBase*>::const_iterator iter
+        = mRecordContainers.find(localIndex.second);
 
-    if (iter==mRecordContainers.end())
-        throw std::logic_error ("invalid local index type");
+    if (iter == mRecordContainers.end())
+        throw std::logic_error("invalid local index type");
 
-    iter->second->save (localIndex.first, writer);
+    iter->second->save(localIndex.first, writer);
 }
 
-const CSMWorld::RefIdDataContainer< ESM::Book >& CSMWorld::RefIdData::getBooks() const
+const CSMWorld::RefIdDataContainer<ESM::Book>& CSMWorld::RefIdData::getBooks() const
 {
     return mBooks;
 }
 
-const CSMWorld::RefIdDataContainer< ESM::Activator >& CSMWorld::RefIdData::getActivators() const
+const CSMWorld::RefIdDataContainer<ESM::Activator>& CSMWorld::RefIdData::getActivators() const
 {
     return mActivators;
 }
 
-const CSMWorld::RefIdDataContainer< ESM::Potion >& CSMWorld::RefIdData::getPotions() const
+const CSMWorld::RefIdDataContainer<ESM::Potion>& CSMWorld::RefIdData::getPotions() const
 {
     return mPotions;
 }
 
-const CSMWorld::RefIdDataContainer< ESM::Apparatus >& CSMWorld::RefIdData::getApparati() const
+const CSMWorld::RefIdDataContainer<ESM::Apparatus>& CSMWorld::RefIdData::getApparati() const
 {
     return mApparati;
 }
 
-const CSMWorld::RefIdDataContainer< ESM::Armor >& CSMWorld::RefIdData::getArmors() const
+const CSMWorld::RefIdDataContainer<ESM::Armor>& CSMWorld::RefIdData::getArmors() const
 {
     return mArmors;
 }
 
-const CSMWorld::RefIdDataContainer< ESM::Clothing >& CSMWorld::RefIdData::getClothing() const
+const CSMWorld::RefIdDataContainer<ESM::Clothing>& CSMWorld::RefIdData::getClothing() const
 {
     return mClothing;
 }
 
-const CSMWorld::RefIdDataContainer< ESM::Container >& CSMWorld::RefIdData::getContainers() const
+const CSMWorld::RefIdDataContainer<ESM::Container>& CSMWorld::RefIdData::getContainers() const
 {
     return mContainers;
 }
 
-const CSMWorld::RefIdDataContainer< ESM::Creature >& CSMWorld::RefIdData::getCreatures() const
+const CSMWorld::RefIdDataContainer<ESM::Creature>& CSMWorld::RefIdData::getCreatures() const
 {
     return mCreatures;
 }
 
-const CSMWorld::RefIdDataContainer< ESM::Door >& CSMWorld::RefIdData::getDoors() const
+const CSMWorld::RefIdDataContainer<ESM::Door>& CSMWorld::RefIdData::getDoors() const
 {
     return mDoors;
 }
 
-const CSMWorld::RefIdDataContainer< ESM::Ingredient >& CSMWorld::RefIdData::getIngredients() const
+const CSMWorld::RefIdDataContainer<ESM::Ingredient>& CSMWorld::RefIdData::getIngredients() const
 {
     return mIngredients;
 }
 
-const CSMWorld::RefIdDataContainer< ESM::CreatureLevList >& CSMWorld::RefIdData::getCreatureLevelledLists() const
+const CSMWorld::RefIdDataContainer<ESM::CreatureLevList>& CSMWorld::RefIdData::getCreatureLevelledLists() const
 {
     return mCreatureLevelledLists;
 }
 
-const CSMWorld::RefIdDataContainer< ESM::ItemLevList >& CSMWorld::RefIdData::getItemLevelledList() const
+const CSMWorld::RefIdDataContainer<ESM::ItemLevList>& CSMWorld::RefIdData::getItemLevelledList() const
 {
     return mItemLevelledLists;
 }
 
-const CSMWorld::RefIdDataContainer< ESM::Light >& CSMWorld::RefIdData::getLights() const
+const CSMWorld::RefIdDataContainer<ESM::Light>& CSMWorld::RefIdData::getLights() const
 {
     return mLights;
 }
 
-const CSMWorld::RefIdDataContainer< ESM::Lockpick >& CSMWorld::RefIdData::getLocpicks() const
+const CSMWorld::RefIdDataContainer<ESM::Lockpick>& CSMWorld::RefIdData::getLocpicks() const
 {
     return mLockpicks;
 }
 
-const CSMWorld::RefIdDataContainer< ESM::Miscellaneous >& CSMWorld::RefIdData::getMiscellaneous() const
+const CSMWorld::RefIdDataContainer<ESM::Miscellaneous>& CSMWorld::RefIdData::getMiscellaneous() const
 {
     return mMiscellaneous;
 }
 
-const CSMWorld::RefIdDataContainer< ESM::NPC >& CSMWorld::RefIdData::getNPCs() const
+const CSMWorld::RefIdDataContainer<ESM::NPC>& CSMWorld::RefIdData::getNPCs() const
 {
     return mNpcs;
 }
 
-const CSMWorld::RefIdDataContainer< ESM::Weapon >& CSMWorld::RefIdData::getWeapons() const
+const CSMWorld::RefIdDataContainer<ESM::Weapon>& CSMWorld::RefIdData::getWeapons() const
 {
     return mWeapons;
 }
 
-const CSMWorld::RefIdDataContainer< ESM::Probe >& CSMWorld::RefIdData::getProbes() const
+const CSMWorld::RefIdDataContainer<ESM::Probe>& CSMWorld::RefIdData::getProbes() const
 {
     return mProbes;
 }
 
-const CSMWorld::RefIdDataContainer< ESM::Repair >& CSMWorld::RefIdData::getRepairs() const
+const CSMWorld::RefIdDataContainer<ESM::Repair>& CSMWorld::RefIdData::getRepairs() const
 {
     return mRepairs;
 }
 
-const CSMWorld::RefIdDataContainer< ESM::Static >& CSMWorld::RefIdData::getStatics() const
+const CSMWorld::RefIdDataContainer<ESM::Static>& CSMWorld::RefIdData::getStatics() const
 {
     return mStatics;
 }
 
-void CSMWorld::RefIdData::insertRecord (std::unique_ptr<CSMWorld::RecordBase> record, CSMWorld::UniversalId::Type type, const std::string& id)
+void CSMWorld::RefIdData::insertRecord(
+    std::unique_ptr<CSMWorld::RecordBase> record, CSMWorld::UniversalId::Type type, const std::string& id)
 {
-  std::map<UniversalId::Type, RefIdDataContainerBase *>::iterator iter =
-        mRecordContainers.find (type);
+    std::map<UniversalId::Type, RefIdDataContainerBase*>::iterator iter = mRecordContainers.find(type);
 
-    if (iter==mRecordContainers.end())
-        throw std::logic_error ("invalid local index type");
+    if (iter == mRecordContainers.end())
+        throw std::logic_error("invalid local index type");
 
     iter->second->insertRecord(std::move(record));
 
-    mIndex.insert (std::make_pair (Misc::StringUtils::lowerCase (id),
-        LocalIndex (iter->second->getSize()-1, type)));
+    mIndex.insert(std::make_pair(Misc::StringUtils::lowerCase(id), LocalIndex(iter->second->getSize() - 1, type)));
 }
 
-void CSMWorld::RefIdData::copyTo (int index, RefIdData& target) const
+void CSMWorld::RefIdData::copyTo(int index, RefIdData& target) const
 {
-    LocalIndex localIndex = globalToLocalIndex (index);
+    LocalIndex localIndex = globalToLocalIndex(index);
 
-    RefIdDataContainerBase *source = mRecordContainers.find (localIndex.second)->second;
+    RefIdDataContainerBase* source = mRecordContainers.find(localIndex.second)->second;
 
-    target.insertRecord(source->getRecord(localIndex.first).modifiedCopy(),
-                        localIndex.second,
-                        source->getId(localIndex.first));
+    target.insertRecord(
+        source->getRecord(localIndex.first).modifiedCopy(), localIndex.second, source->getId(localIndex.first));
 }
diff --git a/apps/opencs/model/world/refiddata.hpp b/apps/opencs/model/world/refiddata.hpp
index 85889f8d81..0df62a8041 100644
--- a/apps/opencs/model/world/refiddata.hpp
+++ b/apps/opencs/model/world/refiddata.hpp
@@ -1,12 +1,13 @@
 #ifndef CSM_WOLRD_REFIDDATA_H
 #define CSM_WOLRD_REFIDDATA_H
 
-#include <vector>
+#include <cassert>
 #include <map>
 #include <memory>
-#include <cassert>
 #include <string_view>
+#include <vector>
 
+#include <components/esm3/esmwriter.hpp>
 #include <components/esm3/loadacti.hpp>
 #include <components/esm3/loadalch.hpp>
 #include <components/esm3/loadappa.hpp>
@@ -20,13 +21,12 @@
 #include <components/esm3/loadlevlist.hpp>
 #include <components/esm3/loadligh.hpp>
 #include <components/esm3/loadlock.hpp>
+#include <components/esm3/loadmisc.hpp>
+#include <components/esm3/loadnpc.hpp>
 #include <components/esm3/loadprob.hpp>
 #include <components/esm3/loadrepa.hpp>
 #include <components/esm3/loadstat.hpp>
 #include <components/esm3/loadweap.hpp>
-#include <components/esm3/loadnpc.hpp>
-#include <components/esm3/loadmisc.hpp>
-#include <components/esm3/esmwriter.hpp>
 
 #include <components/misc/strings/algorithm.hpp>
 
@@ -46,54 +46,54 @@ namespace CSMWorld
 
         virtual int getSize() const = 0;
 
-        virtual const RecordBase& getRecord (int index) const = 0;
+        virtual const RecordBase& getRecord(int index) const = 0;
 
-        virtual RecordBase& getRecord (int index)= 0;
+        virtual RecordBase& getRecord(int index) = 0;
 
-        virtual unsigned int getRecordFlags (int index) const = 0;
+        virtual unsigned int getRecordFlags(int index) const = 0;
 
-        virtual void appendRecord (const std::string& id, bool base) = 0;
+        virtual void appendRecord(const std::string& id, bool base) = 0;
 
-        virtual void insertRecord (std::unique_ptr<RecordBase> record) = 0;
+        virtual void insertRecord(std::unique_ptr<RecordBase> record) = 0;
 
-        virtual int load (ESM::ESMReader& reader, bool base) = 0;
+        virtual int load(ESM::ESMReader& reader, bool base) = 0;
         ///< \return index of a loaded record or -1 if no record was loaded
 
-        virtual void erase (int index, int count) = 0;
+        virtual void erase(int index, int count) = 0;
 
-        virtual std::string getId (int index) const = 0;
+        virtual std::string getId(int index) const = 0;
 
-        virtual void save (int index, ESM::ESMWriter& writer) const = 0;
+        virtual void save(int index, ESM::ESMWriter& writer) const = 0;
     };
 
-    template<typename RecordT>
+    template <typename RecordT>
     struct RefIdDataContainer : public RefIdDataContainerBase
     {
-        std::vector<std::unique_ptr<Record<RecordT> > > mContainer;
+        std::vector<std::unique_ptr<Record<RecordT>>> mContainer;
 
         int getSize() const override;
 
-        const RecordBase& getRecord (int index) const override;
+        const RecordBase& getRecord(int index) const override;
 
-        RecordBase& getRecord (int index) override;
+        RecordBase& getRecord(int index) override;
 
-        unsigned int getRecordFlags (int index) const override;
+        unsigned int getRecordFlags(int index) const override;
 
-        void appendRecord (const std::string& id, bool base) override;
+        void appendRecord(const std::string& id, bool base) override;
 
-        void insertRecord (std::unique_ptr<RecordBase> record) override;
+        void insertRecord(std::unique_ptr<RecordBase> record) override;
 
-        int load (ESM::ESMReader& reader, bool base) override;
+        int load(ESM::ESMReader& reader, bool base) override;
         ///< \return index of a loaded record or -1 if no record was loaded
 
-        void erase (int index, int count) override;
+        void erase(int index, int count) override;
 
-        std::string getId (int index) const override;
+        std::string getId(int index) const override;
 
-        void save (int index, ESM::ESMWriter& writer) const override;
+        void save(int index, ESM::ESMWriter& writer) const override;
     };
 
-    template<typename RecordT>
+    template <typename RecordT>
     void RefIdDataContainer<RecordT>::insertRecord(std::unique_ptr<RecordBase> record)
     {
         assert(record != nullptr);
@@ -103,32 +103,32 @@ namespace CSMWorld
         mContainer.push_back(std::move(typedRecord));
     }
 
-    template<typename RecordT>
+    template <typename RecordT>
     int RefIdDataContainer<RecordT>::getSize() const
     {
-        return static_cast<int> (mContainer.size());
+        return static_cast<int>(mContainer.size());
     }
 
-    template<typename RecordT>
-    const RecordBase& RefIdDataContainer<RecordT>::getRecord (int index) const
+    template <typename RecordT>
+    const RecordBase& RefIdDataContainer<RecordT>::getRecord(int index) const
     {
-        return *mContainer.at (index);
+        return *mContainer.at(index);
     }
 
-    template<typename RecordT>
-    RecordBase& RefIdDataContainer<RecordT>::getRecord (int index)
+    template <typename RecordT>
+    RecordBase& RefIdDataContainer<RecordT>::getRecord(int index)
     {
-        return *mContainer.at (index);
+        return *mContainer.at(index);
     }
 
-    template<typename RecordT>
-    unsigned int RefIdDataContainer<RecordT>::getRecordFlags (int index) const
+    template <typename RecordT>
+    unsigned int RefIdDataContainer<RecordT>::getRecordFlags(int index) const
     {
-        return mContainer.at (index)->get().mRecordFlags;
+        return mContainer.at(index)->get().mRecordFlags;
     }
 
-    template<typename RecordT>
-    void RefIdDataContainer<RecordT>::appendRecord (const std::string& id, bool base)
+    template <typename RecordT>
+    void RefIdDataContainer<RecordT>::appendRecord(const std::string& id, bool base)
     {
         auto record = std::make_unique<Record<RecordT>>();
 
@@ -138,11 +138,11 @@ namespace CSMWorld
         record->mModified.mId = id;
         (base ? record->mBase : record->mModified).blank();
 
-        mContainer.push_back (std::move(record));
+        mContainer.push_back(std::move(record));
     }
 
-    template<typename RecordT>
-    int RefIdDataContainer<RecordT>::load (ESM::ESMReader& reader, bool base)
+    template <typename RecordT>
+    int RefIdDataContainer<RecordT>::load(ESM::ESMReader& reader, bool base)
     {
         RecordT record;
         bool isDeleted = false;
@@ -202,23 +202,23 @@ namespace CSMWorld
         return index;
     }
 
-    template<typename RecordT>
-    void RefIdDataContainer<RecordT>::erase (int index, int count)
+    template <typename RecordT>
+    void RefIdDataContainer<RecordT>::erase(int index, int count)
     {
-        if (index<0 || index+count>getSize())
-            throw std::runtime_error ("invalid RefIdDataContainer index");
+        if (index < 0 || index + count > getSize())
+            throw std::runtime_error("invalid RefIdDataContainer index");
 
-        mContainer.erase (mContainer.begin()+index, mContainer.begin()+index+count);
+        mContainer.erase(mContainer.begin() + index, mContainer.begin() + index + count);
     }
 
-    template<typename RecordT>
-    std::string RefIdDataContainer<RecordT>::getId (int index) const
+    template <typename RecordT>
+    std::string RefIdDataContainer<RecordT>::getId(int index) const
     {
-        return mContainer.at (index)->get().mId;
+        return mContainer.at(index)->get().mId;
     }
 
-    template<typename RecordT>
-    void RefIdDataContainer<RecordT>::save (int index, ESM::ESMWriter& writer) const
+    template <typename RecordT>
+    void RefIdDataContainer<RecordT>::save(int index, ESM::ESMWriter& writer) const
     {
         const Record<RecordT>& record = *mContainer.at(index);
 
@@ -231,104 +231,99 @@ namespace CSMWorld
         }
     }
 
-
     class RefIdData
     {
-        public:
-
-            typedef std::pair<int, UniversalId::Type> LocalIndex;
-
-        private:
-
-            RefIdDataContainer<ESM::Activator> mActivators;
-            RefIdDataContainer<ESM::Potion> mPotions;
-            RefIdDataContainer<ESM::Apparatus> mApparati;
-            RefIdDataContainer<ESM::Armor> mArmors;
-            RefIdDataContainer<ESM::Book> mBooks;
-            RefIdDataContainer<ESM::Clothing> mClothing;
-            RefIdDataContainer<ESM::Container> mContainers;
-            RefIdDataContainer<ESM::Creature> mCreatures;
-            RefIdDataContainer<ESM::Door> mDoors;
-            RefIdDataContainer<ESM::Ingredient> mIngredients;
-            RefIdDataContainer<ESM::CreatureLevList> mCreatureLevelledLists;
-            RefIdDataContainer<ESM::ItemLevList> mItemLevelledLists;
-            RefIdDataContainer<ESM::Light> mLights;
-            RefIdDataContainer<ESM::Lockpick> mLockpicks;
-            RefIdDataContainer<ESM::Miscellaneous> mMiscellaneous;
-            RefIdDataContainer<ESM::NPC> mNpcs;
-            RefIdDataContainer<ESM::Probe> mProbes;
-            RefIdDataContainer<ESM::Repair> mRepairs;
-            RefIdDataContainer<ESM::Static> mStatics;
-            RefIdDataContainer<ESM::Weapon> mWeapons;
+    public:
+        typedef std::pair<int, UniversalId::Type> LocalIndex;
 
-            std::map<std::string, LocalIndex> mIndex;
+    private:
+        RefIdDataContainer<ESM::Activator> mActivators;
+        RefIdDataContainer<ESM::Potion> mPotions;
+        RefIdDataContainer<ESM::Apparatus> mApparati;
+        RefIdDataContainer<ESM::Armor> mArmors;
+        RefIdDataContainer<ESM::Book> mBooks;
+        RefIdDataContainer<ESM::Clothing> mClothing;
+        RefIdDataContainer<ESM::Container> mContainers;
+        RefIdDataContainer<ESM::Creature> mCreatures;
+        RefIdDataContainer<ESM::Door> mDoors;
+        RefIdDataContainer<ESM::Ingredient> mIngredients;
+        RefIdDataContainer<ESM::CreatureLevList> mCreatureLevelledLists;
+        RefIdDataContainer<ESM::ItemLevList> mItemLevelledLists;
+        RefIdDataContainer<ESM::Light> mLights;
+        RefIdDataContainer<ESM::Lockpick> mLockpicks;
+        RefIdDataContainer<ESM::Miscellaneous> mMiscellaneous;
+        RefIdDataContainer<ESM::NPC> mNpcs;
+        RefIdDataContainer<ESM::Probe> mProbes;
+        RefIdDataContainer<ESM::Repair> mRepairs;
+        RefIdDataContainer<ESM::Static> mStatics;
+        RefIdDataContainer<ESM::Weapon> mWeapons;
 
-            std::map<UniversalId::Type, RefIdDataContainerBase *> mRecordContainers;
+        std::map<std::string, LocalIndex> mIndex;
 
-            void erase (const LocalIndex& index, int count);
-            ///< Must not spill over into another type.
+        std::map<UniversalId::Type, RefIdDataContainerBase*> mRecordContainers;
 
-            std::string getRecordId(const LocalIndex &index) const;
+        void erase(const LocalIndex& index, int count);
+        ///< Must not spill over into another type.
 
-        public:
+        std::string getRecordId(const LocalIndex& index) const;
 
-            RefIdData();
+    public:
+        RefIdData();
 
-            LocalIndex globalToLocalIndex (int index) const;
+        LocalIndex globalToLocalIndex(int index) const;
 
-            int localToGlobalIndex (const LocalIndex& index) const;
+        int localToGlobalIndex(const LocalIndex& index) const;
 
-            LocalIndex searchId(std::string_view id) const;
+        LocalIndex searchId(std::string_view id) const;
 
-            void erase (int index, int count);
+        void erase(int index, int count);
 
-            void insertRecord (std::unique_ptr<RecordBase> record, CSMWorld::UniversalId::Type type,
-                const std::string& id);
+        void insertRecord(std::unique_ptr<RecordBase> record, CSMWorld::UniversalId::Type type, const std::string& id);
 
-            const RecordBase& getRecord (const LocalIndex& index) const;
+        const RecordBase& getRecord(const LocalIndex& index) const;
 
-            RecordBase& getRecord (const LocalIndex& index);
+        RecordBase& getRecord(const LocalIndex& index);
 
-            unsigned int getRecordFlags(const std::string& id) const;
+        unsigned int getRecordFlags(const std::string& id) const;
 
-            void appendRecord (UniversalId::Type type, const std::string& id, bool base);
+        void appendRecord(UniversalId::Type type, const std::string& id, bool base);
 
-            int getAppendIndex (UniversalId::Type type) const;
+        int getAppendIndex(UniversalId::Type type) const;
 
-            void load (ESM::ESMReader& reader, bool base, UniversalId::Type type);
+        void load(ESM::ESMReader& reader, bool base, UniversalId::Type type);
 
-            int getSize() const;
+        int getSize() const;
 
-            std::vector<std::string> getIds (bool listDeleted = true) const;
-            ///< Return a sorted collection of all IDs
-            ///
-            /// \param listDeleted include deleted record in the list
+        std::vector<std::string> getIds(bool listDeleted = true) const;
+        ///< Return a sorted collection of all IDs
+        ///
+        /// \param listDeleted include deleted record in the list
 
-            void save (int index, ESM::ESMWriter& writer) const;
+        void save(int index, ESM::ESMWriter& writer) const;
 
-            //RECORD CONTAINERS ACCESS METHODS
-            const RefIdDataContainer<ESM::Book>& getBooks() const;
-            const RefIdDataContainer<ESM::Activator>& getActivators() const;
-            const RefIdDataContainer<ESM::Potion>& getPotions() const;
-            const RefIdDataContainer<ESM::Apparatus>& getApparati() const;
-            const RefIdDataContainer<ESM::Armor>& getArmors() const;
-            const RefIdDataContainer<ESM::Clothing>& getClothing() const;
-            const RefIdDataContainer<ESM::Container>& getContainers() const;
-            const RefIdDataContainer<ESM::Creature>& getCreatures() const;
-            const RefIdDataContainer<ESM::Door>& getDoors() const;
-            const RefIdDataContainer<ESM::Ingredient>& getIngredients() const;
-            const RefIdDataContainer<ESM::CreatureLevList>& getCreatureLevelledLists() const;
-            const RefIdDataContainer<ESM::ItemLevList>& getItemLevelledList() const;
-            const RefIdDataContainer<ESM::Light>& getLights() const;
-            const RefIdDataContainer<ESM::Lockpick>& getLocpicks() const;
-            const RefIdDataContainer<ESM::Miscellaneous>& getMiscellaneous() const;
-            const RefIdDataContainer<ESM::NPC>& getNPCs() const;
-            const RefIdDataContainer<ESM::Weapon >& getWeapons() const;
-            const RefIdDataContainer<ESM::Probe >& getProbes() const;
-            const RefIdDataContainer<ESM::Repair>& getRepairs() const;
-            const RefIdDataContainer<ESM::Static>& getStatics() const;
+        // RECORD CONTAINERS ACCESS METHODS
+        const RefIdDataContainer<ESM::Book>& getBooks() const;
+        const RefIdDataContainer<ESM::Activator>& getActivators() const;
+        const RefIdDataContainer<ESM::Potion>& getPotions() const;
+        const RefIdDataContainer<ESM::Apparatus>& getApparati() const;
+        const RefIdDataContainer<ESM::Armor>& getArmors() const;
+        const RefIdDataContainer<ESM::Clothing>& getClothing() const;
+        const RefIdDataContainer<ESM::Container>& getContainers() const;
+        const RefIdDataContainer<ESM::Creature>& getCreatures() const;
+        const RefIdDataContainer<ESM::Door>& getDoors() const;
+        const RefIdDataContainer<ESM::Ingredient>& getIngredients() const;
+        const RefIdDataContainer<ESM::CreatureLevList>& getCreatureLevelledLists() const;
+        const RefIdDataContainer<ESM::ItemLevList>& getItemLevelledList() const;
+        const RefIdDataContainer<ESM::Light>& getLights() const;
+        const RefIdDataContainer<ESM::Lockpick>& getLocpicks() const;
+        const RefIdDataContainer<ESM::Miscellaneous>& getMiscellaneous() const;
+        const RefIdDataContainer<ESM::NPC>& getNPCs() const;
+        const RefIdDataContainer<ESM::Weapon>& getWeapons() const;
+        const RefIdDataContainer<ESM::Probe>& getProbes() const;
+        const RefIdDataContainer<ESM::Repair>& getRepairs() const;
+        const RefIdDataContainer<ESM::Static>& getStatics() const;
 
-            void copyTo (int index, RefIdData& target) const;
+        void copyTo(int index, RefIdData& target) const;
     };
 }
 
diff --git a/apps/opencs/model/world/regionmap.cpp b/apps/opencs/model/world/regionmap.cpp
index 910572af91..383394bece 100644
--- a/apps/opencs/model/world/regionmap.cpp
+++ b/apps/opencs/model/world/regionmap.cpp
@@ -1,7 +1,7 @@
 #include "regionmap.hpp"
 
-#include <cmath>
 #include <algorithm>
+#include <cmath>
 #include <sstream>
 
 #include <QBrush>
@@ -11,14 +11,17 @@
 #include "data.hpp"
 #include "universalid.hpp"
 
-CSMWorld::RegionMap::CellDescription::CellDescription() : mDeleted (false) {}
+CSMWorld::RegionMap::CellDescription::CellDescription()
+    : mDeleted(false)
+{
+}
 
-CSMWorld::RegionMap::CellDescription::CellDescription (const Record<Cell>& cell)
+CSMWorld::RegionMap::CellDescription::CellDescription(const Record<Cell>& cell)
 {
     const Cell& cell2 = cell.get();
 
     if (!cell2.isExterior())
-        throw std::logic_error ("Interior cell in region map");
+        throw std::logic_error("Interior cell in region map");
 
     mDeleted = cell.isDeleted();
 
@@ -26,28 +29,28 @@ CSMWorld::RegionMap::CellDescription::CellDescription (const Record<Cell>& cell)
     mName = cell2.mName;
 }
 
-CSMWorld::CellCoordinates CSMWorld::RegionMap::getIndex (const QModelIndex& index) const
+CSMWorld::CellCoordinates CSMWorld::RegionMap::getIndex(const QModelIndex& index) const
 {
-    return mMin.move (index.column(), mMax.getY()-mMin.getY() - index.row()-1);
+    return mMin.move(index.column(), mMax.getY() - mMin.getY() - index.row() - 1);
 }
 
-QModelIndex CSMWorld::RegionMap::getIndex (const CellCoordinates& index) const
+QModelIndex CSMWorld::RegionMap::getIndex(const CellCoordinates& index) const
 {
     // I hate you, Qt API naming scheme!
-    return QAbstractTableModel::index (mMax.getY()-mMin.getY() - (index.getY()-mMin.getY())-1,
-        index.getX()-mMin.getX());
+    return QAbstractTableModel::index(
+        mMax.getY() - mMin.getY() - (index.getY() - mMin.getY()) - 1, index.getX() - mMin.getX());
 }
 
-CSMWorld::CellCoordinates CSMWorld::RegionMap::getIndex (const Cell& cell) const
+CSMWorld::CellCoordinates CSMWorld::RegionMap::getIndex(const Cell& cell) const
 {
-    std::istringstream stream (cell.mId);
+    std::istringstream stream(cell.mId);
 
     char ignore;
     int x = 0;
     int y = 0;
     stream >> ignore >> x >> y;
 
-    return CellCoordinates (x, y);
+    return CellCoordinates(x, y);
 }
 
 void CSMWorld::RegionMap::buildRegions()
@@ -56,13 +59,12 @@ void CSMWorld::RegionMap::buildRegions()
 
     int size = regions.getSize();
 
-    for (int i=0; i<size; ++i)
+    for (int i = 0; i < size; ++i)
     {
-        const Record<ESM::Region>& region = regions.getRecord (i);
+        const Record<ESM::Region>& region = regions.getRecord(i);
 
         if (!region.isDeleted())
-            mColours.insert (std::make_pair (Misc::StringUtils::lowerCase (region.get().mId),
-                region.get().mMapColor));
+            mColours.insert(std::make_pair(Misc::StringUtils::lowerCase(region.get().mId), region.get().mMapColor));
     }
 }
 
@@ -72,19 +74,19 @@ void CSMWorld::RegionMap::buildMap()
 
     int size = cells.getSize();
 
-    for (int i=0; i<size; ++i)
+    for (int i = 0; i < size; ++i)
     {
-        const Record<Cell>& cell = cells.getRecord (i);
+        const Record<Cell>& cell = cells.getRecord(i);
 
         const Cell& cell2 = cell.get();
 
         if (cell2.isExterior())
         {
-            CellDescription description (cell);
+            CellDescription description(cell);
 
-            CellCoordinates index = getIndex (cell2);
+            CellCoordinates index = getIndex(cell2);
 
-            mMap.insert (std::make_pair (index, description));
+            mMap.insert(std::make_pair(index, description));
         }
     }
 
@@ -94,11 +96,11 @@ void CSMWorld::RegionMap::buildMap()
     mMax = mapSize.second;
 }
 
-void CSMWorld::RegionMap::addCell (const CellCoordinates& index, const CellDescription& description)
+void CSMWorld::RegionMap::addCell(const CellCoordinates& index, const CellDescription& description)
 {
-    std::map<CellCoordinates, CellDescription>::iterator cell = mMap.find (index);
+    std::map<CellCoordinates, CellDescription>::iterator cell = mMap.find(index);
 
-    if (cell!=mMap.end())
+    if (cell != mMap.end())
     {
         cell->second = description;
     }
@@ -106,84 +108,83 @@ void CSMWorld::RegionMap::addCell (const CellCoordinates& index, const CellDescr
     {
         updateSize();
 
-        mMap.insert (std::make_pair (index, description));
+        mMap.insert(std::make_pair(index, description));
     }
 
-    QModelIndex index2 = getIndex (index);
+    QModelIndex index2 = getIndex(index);
 
-    dataChanged (index2, index2);
+    dataChanged(index2, index2);
 }
 
-void CSMWorld::RegionMap::addCells (int start, int end)
+void CSMWorld::RegionMap::addCells(int start, int end)
 {
     const IdCollection<Cell>& cells = mData.getCells();
 
-    for (int i=start; i<=end; ++i)
+    for (int i = start; i <= end; ++i)
     {
-        const Record<Cell>& cell = cells.getRecord (i);
+        const Record<Cell>& cell = cells.getRecord(i);
 
         const Cell& cell2 = cell.get();
 
         if (cell2.isExterior())
         {
-            CellCoordinates index = getIndex (cell2);
+            CellCoordinates index = getIndex(cell2);
 
-            CellDescription description (cell);
+            CellDescription description(cell);
 
-            addCell (index, description);
+            addCell(index, description);
         }
     }
 }
 
-void CSMWorld::RegionMap::removeCell (const CellCoordinates& index)
+void CSMWorld::RegionMap::removeCell(const CellCoordinates& index)
 {
-    std::map<CellCoordinates, CellDescription>::iterator cell = mMap.find (index);
+    std::map<CellCoordinates, CellDescription>::iterator cell = mMap.find(index);
 
-    if (cell!=mMap.end())
+    if (cell != mMap.end())
     {
-        mMap.erase (cell);
+        mMap.erase(cell);
 
-        QModelIndex index2 = getIndex (index);
+        QModelIndex index2 = getIndex(index);
 
-        dataChanged (index2, index2);
+        dataChanged(index2, index2);
 
         updateSize();
     }
 }
 
-void CSMWorld::RegionMap::addRegion (const std::string& region, unsigned int colour)
+void CSMWorld::RegionMap::addRegion(const std::string& region, unsigned int colour)
 {
-    mColours[Misc::StringUtils::lowerCase (region)] = colour;
+    mColours[Misc::StringUtils::lowerCase(region)] = colour;
 }
 
-void CSMWorld::RegionMap::removeRegion (const std::string& region)
+void CSMWorld::RegionMap::removeRegion(const std::string& region)
 {
-    std::map<std::string, unsigned int>::iterator iter (
-        mColours.find (Misc::StringUtils::lowerCase (region)));
+    std::map<std::string, unsigned int>::iterator iter(mColours.find(Misc::StringUtils::lowerCase(region)));
 
-    if (iter!=mColours.end())
-        mColours.erase (iter);
+    if (iter != mColours.end())
+        mColours.erase(iter);
 }
 
-void CSMWorld::RegionMap::updateRegions (const std::vector<std::string>& regions)
+void CSMWorld::RegionMap::updateRegions(const std::vector<std::string>& regions)
 {
-    std::vector<std::string> regions2 (regions);
+    std::vector<std::string> regions2(regions);
 
-    for (auto& region2 : regions2) {
+    for (auto& region2 : regions2)
+    {
         Misc::StringUtils::lowerCaseInPlace(region2);
     }
-    std::sort (regions2.begin(), regions2.end());
+    std::sort(regions2.begin(), regions2.end());
 
-    for (std::map<CellCoordinates, CellDescription>::const_iterator iter (mMap.begin());
-         iter!=mMap.end(); ++iter)
+    for (std::map<CellCoordinates, CellDescription>::const_iterator iter(mMap.begin()); iter != mMap.end(); ++iter)
     {
-        if (!iter->second.mRegion.empty() &&
-            std::find (regions2.begin(), regions2.end(),
-            Misc::StringUtils::lowerCase (iter->second.mRegion))!=regions2.end())
+        if (!iter->second.mRegion.empty()
+            && std::find(regions2.begin(), regions2.end(), Misc::StringUtils::lowerCase(iter->second.mRegion))
+                != regions2.end())
         {
-            QModelIndex index = getIndex (iter->first);
+            QModelIndex index = getIndex(iter->first);
 
-            dataChanged (index, index);
+            dataChanged(index, index);
         }
     }
 }
@@ -194,15 +195,15 @@ void CSMWorld::RegionMap::updateSize()
 
     if (int diff = size.first.getX() - mMin.getX())
     {
-        beginInsertColumns (QModelIndex(), 0, std::abs (diff)-1);
-        mMin = CellCoordinates (size.first.getX(), mMin.getY());
+        beginInsertColumns(QModelIndex(), 0, std::abs(diff) - 1);
+        mMin = CellCoordinates(size.first.getX(), mMin.getY());
         endInsertColumns();
     }
 
     if (int diff = size.first.getY() - mMin.getY())
     {
-        beginInsertRows (QModelIndex(), 0, std::abs (diff)-1);
-        mMin = CellCoordinates (mMin.getX(), size.first.getY());
+        beginInsertRows(QModelIndex(), 0, std::abs(diff) - 1);
+        mMin = CellCoordinates(mMin.getX(), size.first.getY());
         endInsertRows();
     }
 
@@ -210,12 +211,12 @@ void CSMWorld::RegionMap::updateSize()
     {
         int columns = columnCount();
 
-        if (diff>0)
-            beginInsertColumns (QModelIndex(), columns, columns+diff-1);
+        if (diff > 0)
+            beginInsertColumns(QModelIndex(), columns, columns + diff - 1);
         else
-            beginRemoveColumns (QModelIndex(), columns+diff, columns-1);
+            beginRemoveColumns(QModelIndex(), columns + diff, columns - 1);
 
-        mMax = CellCoordinates (size.second.getX(), mMax.getY());
+        mMax = CellCoordinates(size.second.getX(), mMax.getY());
         endInsertColumns();
     }
 
@@ -223,12 +224,12 @@ void CSMWorld::RegionMap::updateSize()
     {
         int rows = rowCount();
 
-        if (diff>0)
-            beginInsertRows (QModelIndex(), rows, rows+diff-1);
+        if (diff > 0)
+            beginInsertRows(QModelIndex(), rows, rows + diff - 1);
         else
-            beginRemoveRows (QModelIndex(), rows+diff, rows-1);
+            beginRemoveRows(QModelIndex(), rows + diff, rows - 1);
 
-        mMax = CellCoordinates (mMax.getX(), size.second.getY());
+        mMax = CellCoordinates(mMax.getX(), size.second.getY());
         endInsertRows();
     }
 }
@@ -239,128 +240,119 @@ std::pair<CSMWorld::CellCoordinates, CSMWorld::CellCoordinates> CSMWorld::Region
 
     int size = cells.getSize();
 
-    CellCoordinates min (0, 0);
-    CellCoordinates max (0, 0);
+    CellCoordinates min(0, 0);
+    CellCoordinates max(0, 0);
 
-    for (int i=0; i<size; ++i)
+    for (int i = 0; i < size; ++i)
     {
-        const Record<Cell>& cell = cells.getRecord (i);
+        const Record<Cell>& cell = cells.getRecord(i);
 
         const Cell& cell2 = cell.get();
 
         if (cell2.isExterior())
         {
-            CellCoordinates index = getIndex (cell2);
+            CellCoordinates index = getIndex(cell2);
 
-            if (min==max)
+            if (min == max)
             {
                 min = index;
-                max = min.move (1, 1);
+                max = min.move(1, 1);
             }
             else
             {
-                if (index.getX()<min.getX())
-                    min = CellCoordinates (index.getX(), min.getY());
-                else if (index.getX()>=max.getX())
-                    max = CellCoordinates (index.getX()+1, max.getY());
-
-                if (index.getY()<min.getY())
-                    min = CellCoordinates (min.getX(), index.getY());
-                else if (index.getY()>=max.getY())
-                    max = CellCoordinates (max.getX(), index.getY() + 1);
+                if (index.getX() < min.getX())
+                    min = CellCoordinates(index.getX(), min.getY());
+                else if (index.getX() >= max.getX())
+                    max = CellCoordinates(index.getX() + 1, max.getY());
+
+                if (index.getY() < min.getY())
+                    min = CellCoordinates(min.getX(), index.getY());
+                else if (index.getY() >= max.getY())
+                    max = CellCoordinates(max.getX(), index.getY() + 1);
             }
         }
     }
 
-    return std::make_pair (min, max);
+    return std::make_pair(min, max);
 }
 
-CSMWorld::RegionMap::RegionMap (Data& data) : mData (data)
+CSMWorld::RegionMap::RegionMap(Data& data)
+    : mData(data)
 {
     buildRegions();
     buildMap();
 
-    QAbstractItemModel *regions = data.getTableModel (UniversalId (UniversalId::Type_Regions));
+    QAbstractItemModel* regions = data.getTableModel(UniversalId(UniversalId::Type_Regions));
 
-    connect (regions, &QAbstractItemModel::rowsAboutToBeRemoved,
-        this, &RegionMap::regionsAboutToBeRemoved);
-    connect (regions, &QAbstractItemModel::rowsInserted,
-        this, &RegionMap::regionsInserted);
-    connect (regions, &QAbstractItemModel::dataChanged,
-        this, &RegionMap::regionsChanged);
+    connect(regions, &QAbstractItemModel::rowsAboutToBeRemoved, this, &RegionMap::regionsAboutToBeRemoved);
+    connect(regions, &QAbstractItemModel::rowsInserted, this, &RegionMap::regionsInserted);
+    connect(regions, &QAbstractItemModel::dataChanged, this, &RegionMap::regionsChanged);
 
-    QAbstractItemModel *cells = data.getTableModel (UniversalId (UniversalId::Type_Cells));
+    QAbstractItemModel* cells = data.getTableModel(UniversalId(UniversalId::Type_Cells));
 
-    connect (cells, &QAbstractItemModel::rowsAboutToBeRemoved,
-        this, &RegionMap::cellsAboutToBeRemoved);
-    connect (cells, &QAbstractItemModel::rowsInserted,
-        this, &RegionMap::cellsInserted);
-    connect (cells, &QAbstractItemModel::dataChanged,
-        this, &RegionMap::cellsChanged);
+    connect(cells, &QAbstractItemModel::rowsAboutToBeRemoved, this, &RegionMap::cellsAboutToBeRemoved);
+    connect(cells, &QAbstractItemModel::rowsInserted, this, &RegionMap::cellsInserted);
+    connect(cells, &QAbstractItemModel::dataChanged, this, &RegionMap::cellsChanged);
 }
 
-int CSMWorld::RegionMap::rowCount (const QModelIndex& parent) const
+int CSMWorld::RegionMap::rowCount(const QModelIndex& parent) const
 {
     if (parent.isValid())
         return 0;
 
-    return mMax.getY()-mMin.getY();
+    return mMax.getY() - mMin.getY();
 }
 
-int CSMWorld::RegionMap::columnCount (const QModelIndex& parent) const
+int CSMWorld::RegionMap::columnCount(const QModelIndex& parent) const
 {
     if (parent.isValid())
         return 0;
 
-    return mMax.getX()-mMin.getX();
+    return mMax.getX() - mMin.getX();
 }
 
-QVariant CSMWorld::RegionMap::data (const QModelIndex& index, int role) const
+QVariant CSMWorld::RegionMap::data(const QModelIndex& index, int role) const
 {
-    if (role==Qt::SizeHintRole)
-        return QSize (16, 16);
+    if (role == Qt::SizeHintRole)
+        return QSize(16, 16);
 
-    if (role==Qt::BackgroundRole)
+    if (role == Qt::BackgroundRole)
     {
         /// \todo GUI class in non-GUI code. Needs to be addressed eventually.
 
-        std::map<CellCoordinates, CellDescription>::const_iterator cell =
-            mMap.find (getIndex (index));
+        std::map<CellCoordinates, CellDescription>::const_iterator cell = mMap.find(getIndex(index));
 
-        if (cell!=mMap.end())
+        if (cell != mMap.end())
         {
             if (cell->second.mDeleted)
-                return QBrush (Qt::red, Qt::DiagCrossPattern);
+                return QBrush(Qt::red, Qt::DiagCrossPattern);
 
-            std::map<std::string, unsigned int>::const_iterator iter =
-                mColours.find (Misc::StringUtils::lowerCase (cell->second.mRegion));
+            std::map<std::string, unsigned int>::const_iterator iter
+                = mColours.find(Misc::StringUtils::lowerCase(cell->second.mRegion));
 
-            if (iter!=mColours.end())
-                return QBrush (QColor (iter->second & 0xff, 
-                                       (iter->second >> 8) & 0xff, 
-                                       (iter->second >> 16) & 0xff));
+            if (iter != mColours.end())
+                return QBrush(QColor(iter->second & 0xff, (iter->second >> 8) & 0xff, (iter->second >> 16) & 0xff));
 
             if (cell->second.mRegion.empty())
-                return QBrush (Qt::Dense6Pattern); // no region
+                return QBrush(Qt::Dense6Pattern); // no region
 
-            return QBrush (Qt::red, Qt::Dense6Pattern); // invalid region
+            return QBrush(Qt::red, Qt::Dense6Pattern); // invalid region
         }
 
-        return QBrush (Qt::DiagCrossPattern);
+        return QBrush(Qt::DiagCrossPattern);
     }
 
-    if (role==Qt::ToolTipRole)
+    if (role == Qt::ToolTipRole)
     {
-        CellCoordinates cellIndex = getIndex (index);
+        CellCoordinates cellIndex = getIndex(index);
 
         std::ostringstream stream;
 
         stream << cellIndex;
 
-        std::map<CellCoordinates, CellDescription>::const_iterator cell =
-            mMap.find (cellIndex);
+        std::map<CellCoordinates, CellDescription>::const_iterator cell = mMap.find(cellIndex);
 
-        if (cell!=mMap.end())
+        if (cell != mMap.end())
         {
             if (!cell->second.mName.empty())
                 stream << " " << cell->second.mName;
@@ -372,10 +364,10 @@ QVariant CSMWorld::RegionMap::data (const QModelIndex& index, int role) const
             {
                 stream << "<br>";
 
-                std::map<std::string, unsigned int>::const_iterator iter =
-                    mColours.find (Misc::StringUtils::lowerCase (cell->second.mRegion));
+                std::map<std::string, unsigned int>::const_iterator iter
+                    = mColours.find(Misc::StringUtils::lowerCase(cell->second.mRegion));
 
-                if (iter!=mColours.end())
+                if (iter != mColours.end())
                     stream << cell->second.mRegion;
                 else
                     stream << "<font color=red>" << cell->second.mRegion << "</font>";
@@ -384,78 +376,77 @@ QVariant CSMWorld::RegionMap::data (const QModelIndex& index, int role) const
         else
             stream << " (no cell)";
 
-        return QString::fromUtf8 (stream.str().c_str());
+        return QString::fromUtf8(stream.str().c_str());
     }
 
-    if (role==Role_Region)
+    if (role == Role_Region)
     {
-        CellCoordinates cellIndex = getIndex (index);
+        CellCoordinates cellIndex = getIndex(index);
 
-        std::map<CellCoordinates, CellDescription>::const_iterator cell =
-            mMap.find (cellIndex);
+        std::map<CellCoordinates, CellDescription>::const_iterator cell = mMap.find(cellIndex);
 
-        if (cell!=mMap.end() && !cell->second.mRegion.empty())
-            return QString::fromUtf8 (Misc::StringUtils::lowerCase (cell->second.mRegion).c_str());
+        if (cell != mMap.end() && !cell->second.mRegion.empty())
+            return QString::fromUtf8(Misc::StringUtils::lowerCase(cell->second.mRegion).c_str());
     }
 
-    if (role==Role_CellId)
+    if (role == Role_CellId)
     {
-        CellCoordinates cellIndex = getIndex (index);
+        CellCoordinates cellIndex = getIndex(index);
 
         std::ostringstream stream;
         stream << "#" << cellIndex.getX() << " " << cellIndex.getY();
 
-        return QString::fromUtf8 (stream.str().c_str());
+        return QString::fromUtf8(stream.str().c_str());
     }
 
     return QVariant();
 }
 
-Qt::ItemFlags CSMWorld::RegionMap::flags (const QModelIndex& index) const
+Qt::ItemFlags CSMWorld::RegionMap::flags(const QModelIndex& index) const
 {
     return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
 }
 
-void CSMWorld::RegionMap::regionsAboutToBeRemoved (const QModelIndex& parent, int start, int end)
+void CSMWorld::RegionMap::regionsAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
     std::vector<std::string> update;
 
     const IdCollection<ESM::Region>& regions = mData.getRegions();
 
-    for (int i=start; i<=end; ++i)
+    for (int i = start; i <= end; ++i)
     {
-        const Record<ESM::Region>& region = regions.getRecord (i);
+        const Record<ESM::Region>& region = regions.getRecord(i);
 
-        update.push_back (region.get().mId);
+        update.push_back(region.get().mId);
 
-        removeRegion (region.get().mId);
+        removeRegion(region.get().mId);
     }
 
-    updateRegions (update);
+    updateRegions(update);
 }
 
-void CSMWorld::RegionMap::regionsInserted (const QModelIndex& parent, int start, int end)
+void CSMWorld::RegionMap::regionsInserted(const QModelIndex& parent, int start, int end)
 {
     std::vector<std::string> update;
 
     const IdCollection<ESM::Region>& regions = mData.getRegions();
 
-    for (int i=start; i<=end; ++i)
+    for (int i = start; i <= end; ++i)
     {
-        const Record<ESM::Region>& region = regions.getRecord (i);
+        const Record<ESM::Region>& region = regions.getRecord(i);
 
         if (!region.isDeleted())
         {
-            update.push_back (region.get().mId);
+            update.push_back(region.get().mId);
 
-            addRegion (region.get().mId, region.get().mMapColor);
+            addRegion(region.get().mId, region.get().mMapColor);
         }
     }
 
-    updateRegions (update);
+    updateRegions(update);
 }
 
-void CSMWorld::RegionMap::regionsChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight)
+void CSMWorld::RegionMap::regionsChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     // Note: At this point an additional check could be inserted to see if there is any change to the
     // columns we are interested in. If not we can exit the function here and avoid all updating.
@@ -464,45 +455,45 @@ void CSMWorld::RegionMap::regionsChanged (const QModelIndex& topLeft, const QMod
 
     const IdCollection<ESM::Region>& regions = mData.getRegions();
 
-    for (int i=topLeft.row(); i<=bottomRight.column(); ++i)
+    for (int i = topLeft.row(); i <= bottomRight.column(); ++i)
     {
-        const Record<ESM::Region>& region = regions.getRecord (i);
+        const Record<ESM::Region>& region = regions.getRecord(i);
 
-        update.push_back (region.get().mId);
+        update.push_back(region.get().mId);
 
         if (!region.isDeleted())
-            addRegion (region.get().mId, region.get().mMapColor);
+            addRegion(region.get().mId, region.get().mMapColor);
         else
-            removeRegion (region.get().mId);
+            removeRegion(region.get().mId);
     }
 
-    updateRegions (update);
+    updateRegions(update);
 }
 
-void CSMWorld::RegionMap::cellsAboutToBeRemoved (const QModelIndex& parent, int start, int end)
+void CSMWorld::RegionMap::cellsAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
     const IdCollection<Cell>& cells = mData.getCells();
 
-    for (int i=start; i<=end; ++i)
+    for (int i = start; i <= end; ++i)
     {
-        const Record<Cell>& cell = cells.getRecord (i);
+        const Record<Cell>& cell = cells.getRecord(i);
 
         const Cell& cell2 = cell.get();
 
         if (cell2.isExterior())
-            removeCell (getIndex (cell2));
+            removeCell(getIndex(cell2));
     }
 }
 
-void CSMWorld::RegionMap::cellsInserted (const QModelIndex& parent, int start, int end)
+void CSMWorld::RegionMap::cellsInserted(const QModelIndex& parent, int start, int end)
 {
-    addCells (start, end);
+    addCells(start, end);
 }
 
-void CSMWorld::RegionMap::cellsChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight)
+void CSMWorld::RegionMap::cellsChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     // Note: At this point an additional check could be inserted to see if there is any change to the
     // columns we are interested in. If not we can exit the function here and avoid all updating.
 
-    addCells (topLeft.row(), bottomRight.row());
+    addCells(topLeft.row(), bottomRight.row());
 }
diff --git a/apps/opencs/model/world/regionmap.hpp b/apps/opencs/model/world/regionmap.hpp
index 1de7f1cdb9..5ccda4956c 100644
--- a/apps/opencs/model/world/regionmap.hpp
+++ b/apps/opencs/model/world/regionmap.hpp
@@ -7,9 +7,9 @@
 
 #include <QAbstractTableModel>
 
-#include "record.hpp"
 #include "cell.hpp"
 #include "cellcoordinates.hpp"
+#include "record.hpp"
 
 namespace CSMWorld
 {
@@ -20,100 +20,97 @@ namespace CSMWorld
     /// This class does not holds any record data (other than for the purpose of buffering).
     class RegionMap : public QAbstractTableModel
     {
-            Q_OBJECT
-
-        public:
-
-            enum Role
-            {
-                Role_Region = Qt::UserRole,
-                Role_CellId = Qt::UserRole+1
-            };
-
-        private:
+        Q_OBJECT
 
-            struct CellDescription
-            {
-                bool mDeleted;
-                std::string mRegion;
-                std::string mName;
+    public:
+        enum Role
+        {
+            Role_Region = Qt::UserRole,
+            Role_CellId = Qt::UserRole + 1
+        };
 
-                CellDescription();
+    private:
+        struct CellDescription
+        {
+            bool mDeleted;
+            std::string mRegion;
+            std::string mName;
 
-                CellDescription (const Record<Cell>& cell);
-            };
+            CellDescription();
 
-            Data& mData;
-            std::map<CellCoordinates, CellDescription> mMap;
-            CellCoordinates mMin; ///< inclusive
-            CellCoordinates mMax; ///< exclusive
-            std::map<std::string, unsigned int> mColours; ///< region ID, colour (RGBA)
+            CellDescription(const Record<Cell>& cell);
+        };
 
-            CellCoordinates getIndex (const QModelIndex& index) const;
-            ///< Translates a Qt model index into a cell index (which can contain negative components)
+        Data& mData;
+        std::map<CellCoordinates, CellDescription> mMap;
+        CellCoordinates mMin; ///< inclusive
+        CellCoordinates mMax; ///< exclusive
+        std::map<std::string, unsigned int> mColours; ///< region ID, colour (RGBA)
 
-            QModelIndex getIndex (const CellCoordinates& index) const;
+        CellCoordinates getIndex(const QModelIndex& index) const;
+        ///< Translates a Qt model index into a cell index (which can contain negative components)
 
-            CellCoordinates getIndex (const Cell& cell) const;
+        QModelIndex getIndex(const CellCoordinates& index) const;
 
-            void buildRegions();
+        CellCoordinates getIndex(const Cell& cell) const;
 
-            void buildMap();
+        void buildRegions();
 
-            void addCell (const CellCoordinates& index, const CellDescription& description);
-            ///< May be called on a cell that is already in the map (in which case an update is
-            // performed)
+        void buildMap();
 
-            void addCells (int start, int end);
+        void addCell(const CellCoordinates& index, const CellDescription& description);
+        ///< May be called on a cell that is already in the map (in which case an update is
+        // performed)
 
-            void removeCell (const CellCoordinates& index);
-            ///< May be called on a cell that is not in the map (in which case the call is ignored)
+        void addCells(int start, int end);
 
-            void addRegion (const std::string& region, unsigned int colour);
-            ///< May be called on a region that is already listed (in which case an update is
-            /// performed)
-            ///
-            /// \note This function does not update the region map.
+        void removeCell(const CellCoordinates& index);
+        ///< May be called on a cell that is not in the map (in which case the call is ignored)
 
-            void removeRegion (const std::string& region);
-            ///< May be called on a region that is not listed (in which case the call is ignored)
-            ///
-            /// \note This function does not update the region map.
+        void addRegion(const std::string& region, unsigned int colour);
+        ///< May be called on a region that is already listed (in which case an update is
+        /// performed)
+        ///
+        /// \note This function does not update the region map.
 
-            void updateRegions (const std::vector<std::string>& regions);
-            ///< Update cells affected by the listed regions
+        void removeRegion(const std::string& region);
+        ///< May be called on a region that is not listed (in which case the call is ignored)
+        ///
+        /// \note This function does not update the region map.
 
-            void updateSize();
+        void updateRegions(const std::vector<std::string>& regions);
+        ///< Update cells affected by the listed regions
 
-            std::pair<CellCoordinates, CellCoordinates> getSize() const;
+        void updateSize();
 
-        public:
+        std::pair<CellCoordinates, CellCoordinates> getSize() const;
 
-            RegionMap (Data& data);
+    public:
+        RegionMap(Data& data);
 
-            int rowCount (const QModelIndex& parent = QModelIndex()) const override;
+        int rowCount(const QModelIndex& parent = QModelIndex()) const override;
 
-            int columnCount (const QModelIndex& parent = QModelIndex()) const override;
+        int columnCount(const QModelIndex& parent = QModelIndex()) const override;
 
-            QVariant data (const QModelIndex& index, int role = Qt::DisplayRole) const override;
-            ///< \note Calling this function with role==Role_CellId may return the ID of a cell
-            /// that does not exist.
+        QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+        ///< \note Calling this function with role==Role_CellId may return the ID of a cell
+        /// that does not exist.
 
-            Qt::ItemFlags flags (const QModelIndex& index) const override;
+        Qt::ItemFlags flags(const QModelIndex& index) const override;
 
-        private slots:
+    private slots:
 
-            void regionsAboutToBeRemoved (const QModelIndex& parent, int start, int end);
+        void regionsAboutToBeRemoved(const QModelIndex& parent, int start, int end);
 
-            void regionsInserted (const QModelIndex& parent, int start, int end);
+        void regionsInserted(const QModelIndex& parent, int start, int end);
 
-            void regionsChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
+        void regionsChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
-            void cellsAboutToBeRemoved (const QModelIndex& parent, int start, int end);
+        void cellsAboutToBeRemoved(const QModelIndex& parent, int start, int end);
 
-            void cellsInserted (const QModelIndex& parent, int start, int end);
+        void cellsInserted(const QModelIndex& parent, int start, int end);
 
-            void cellsChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
+        void cellsChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
     };
 }
 
diff --git a/apps/opencs/model/world/resources.cpp b/apps/opencs/model/world/resources.cpp
index 71ee997413..4a600f5d32 100644
--- a/apps/opencs/model/world/resources.cpp
+++ b/apps/opencs/model/world/resources.cpp
@@ -1,22 +1,23 @@
 #include "resources.hpp"
 
+#include <algorithm>
 #include <sstream>
 #include <stdexcept>
-#include <algorithm>
 #include <string_view>
 
 #include <components/vfs/manager.hpp>
 
 #include <components/misc/strings/lower.hpp>
 
-CSMWorld::Resources::Resources (const VFS::Manager* vfs, const std::string& baseDirectory, UniversalId::Type type,
-    const char * const *extensions)
-: mBaseDirectory (baseDirectory), mType (type)
+CSMWorld::Resources::Resources(
+    const VFS::Manager* vfs, const std::string& baseDirectory, UniversalId::Type type, const char* const* extensions)
+    : mBaseDirectory(baseDirectory)
+    , mType(type)
 {
     recreate(vfs, extensions);
 }
 
-void CSMWorld::Resources::recreate(const VFS::Manager* vfs, const char * const *extensions)
+void CSMWorld::Resources::recreate(const VFS::Manager* vfs, const char* const* extensions)
 {
     mFiles.clear();
     mIndex.clear();
@@ -25,35 +26,33 @@ void CSMWorld::Resources::recreate(const VFS::Manager* vfs, const char * const *
 
     for (const auto& filepath : vfs->getRecursiveDirectoryIterator(""))
     {
-        if (filepath.size()<baseSize+1 ||
-            filepath.substr (0, baseSize)!=mBaseDirectory ||
-            (filepath[baseSize]!='/' && filepath[baseSize]!='\\'))
+        if (filepath.size() < baseSize + 1 || filepath.substr(0, baseSize) != mBaseDirectory
+            || (filepath[baseSize] != '/' && filepath[baseSize] != '\\'))
             continue;
 
         if (extensions)
         {
-            std::string::size_type extensionIndex = filepath.find_last_of ('.');
+            std::string::size_type extensionIndex = filepath.find_last_of('.');
 
-            if (extensionIndex==std::string::npos)
+            if (extensionIndex == std::string::npos)
                 continue;
 
-            std::string extension = filepath.substr (extensionIndex+1);
+            std::string extension = filepath.substr(extensionIndex + 1);
 
             int i = 0;
 
             for (; extensions[i]; ++i)
-                if (extensions[i]==extension)
+                if (extensions[i] == extension)
                     break;
 
             if (!extensions[i])
                 continue;
         }
 
-        std::string file = filepath.substr (baseSize+1);
-        mFiles.push_back (file);
-        std::replace (file.begin(), file.end(), '\\', '/');
-        mIndex.insert (std::make_pair (
-            Misc::StringUtils::lowerCase (file), static_cast<int> (mFiles.size())-1));
+        std::string file = filepath.substr(baseSize + 1);
+        mFiles.push_back(file);
+        std::replace(file.begin(), file.end(), '\\', '/');
+        mIndex.insert(std::make_pair(Misc::StringUtils::lowerCase(file), static_cast<int>(mFiles.size()) - 1));
     }
 }
 
@@ -62,21 +61,21 @@ int CSMWorld::Resources::getSize() const
     return static_cast<int>(mFiles.size());
 }
 
-std::string CSMWorld::Resources::getId (int index) const
+std::string CSMWorld::Resources::getId(int index) const
 {
-    return mFiles.at (index);
+    return mFiles.at(index);
 }
 
-int CSMWorld::Resources::getIndex (const std::string& id) const
+int CSMWorld::Resources::getIndex(const std::string& id) const
 {
-    int index = searchId (id);
+    int index = searchId(id);
 
-    if (index==-1)
+    if (index == -1)
     {
         std::ostringstream stream;
         stream << "Invalid resource: " << mBaseDirectory << '/' << id;
 
-        throw std::runtime_error (stream.str());
+        throw std::runtime_error(stream.str());
     }
 
     return index;
@@ -84,13 +83,13 @@ int CSMWorld::Resources::getIndex (const std::string& id) const
 
 int CSMWorld::Resources::searchId(std::string_view id) const
 {
-    std::string id2 = Misc::StringUtils::lowerCase (id);
+    std::string id2 = Misc::StringUtils::lowerCase(id);
 
-    std::replace (id2.begin(), id2.end(), '\\', '/');
+    std::replace(id2.begin(), id2.end(), '\\', '/');
 
-    std::map<std::string, int>::const_iterator iter = mIndex.find (id2);
+    std::map<std::string, int>::const_iterator iter = mIndex.find(id2);
 
-    if (iter==mIndex.end())
+    if (iter == mIndex.end())
         return -1;
 
     return iter->second;
diff --git a/apps/opencs/model/world/resources.hpp b/apps/opencs/model/world/resources.hpp
index 2de13a259e..9a3152daa1 100644
--- a/apps/opencs/model/world/resources.hpp
+++ b/apps/opencs/model/world/resources.hpp
@@ -1,10 +1,10 @@
 #ifndef CSM_WOLRD_RESOURCES_H
 #define CSM_WOLRD_RESOURCES_H
 
-#include <string>
 #include <map>
-#include <vector>
+#include <string>
 #include <string_view>
+#include <vector>
 
 #include "universalid.hpp"
 
@@ -17,28 +17,27 @@ namespace CSMWorld
 {
     class Resources
     {
-            std::map<std::string, int> mIndex;
-            std::vector<std::string> mFiles;
-            std::string mBaseDirectory;
-            UniversalId::Type mType;
-
-        public:
+        std::map<std::string, int> mIndex;
+        std::vector<std::string> mFiles;
+        std::string mBaseDirectory;
+        UniversalId::Type mType;
 
-            /// \param type Type of resources in this table.
-            Resources (const VFS::Manager* vfs, const std::string& baseDirectory, UniversalId::Type type,
-                const char * const *extensions = nullptr);
+    public:
+        /// \param type Type of resources in this table.
+        Resources(const VFS::Manager* vfs, const std::string& baseDirectory, UniversalId::Type type,
+            const char* const* extensions = nullptr);
 
-            void recreate(const VFS::Manager* vfs, const char * const *extensions = nullptr);
+        void recreate(const VFS::Manager* vfs, const char* const* extensions = nullptr);
 
-            int getSize() const;
+        int getSize() const;
 
-            std::string getId (int index) const;
+        std::string getId(int index) const;
 
-            int getIndex (const std::string& id) const;
+        int getIndex(const std::string& id) const;
 
-            int searchId(std::string_view id) const;
+        int searchId(std::string_view id) const;
 
-            UniversalId::Type getType() const;
+        UniversalId::Type getType() const;
     };
 }
 
diff --git a/apps/opencs/model/world/resourcesmanager.cpp b/apps/opencs/model/world/resourcesmanager.cpp
index 67774e79a3..f35557c995 100644
--- a/apps/opencs/model/world/resourcesmanager.cpp
+++ b/apps/opencs/model/world/resourcesmanager.cpp
@@ -11,31 +11,30 @@ CSMWorld::ResourcesManager::ResourcesManager()
 
 CSMWorld::ResourcesManager::~ResourcesManager() = default;
 
-void CSMWorld::ResourcesManager::addResources (const Resources& resources)
+void CSMWorld::ResourcesManager::addResources(const Resources& resources)
 {
-    mResources.insert (std::make_pair (resources.getType(), resources));
-    mResources.insert (std::make_pair (UniversalId::getParentType (resources.getType()),
-        resources));
+    mResources.insert(std::make_pair(resources.getType(), resources));
+    mResources.insert(std::make_pair(UniversalId::getParentType(resources.getType()), resources));
 }
 
-const char * const * CSMWorld::ResourcesManager::getMeshExtensions()
+const char* const* CSMWorld::ResourcesManager::getMeshExtensions()
 {
     // maybe we could go over the osgDB::Registry to list all supported node formats
-    static const char * const sMeshTypes[] = { "nif", "osg", "osgt", "osgb", "osgx", "osg2", "dae", 0 };
+    static const char* const sMeshTypes[] = { "nif", "osg", "osgt", "osgb", "osgx", "osg2", "dae", 0 };
     return sMeshTypes;
 }
 
-void CSMWorld::ResourcesManager::setVFS(const VFS::Manager *vfs)
+void CSMWorld::ResourcesManager::setVFS(const VFS::Manager* vfs)
 {
     mVFS = vfs;
     mResources.clear();
 
-    addResources (Resources (vfs, "meshes", UniversalId::Type_Mesh, getMeshExtensions()));
-    addResources (Resources (vfs, "icons", UniversalId::Type_Icon));
-    addResources (Resources (vfs, "music", UniversalId::Type_Music));
-    addResources (Resources (vfs, "sound", UniversalId::Type_SoundRes));
-    addResources (Resources (vfs, "textures", UniversalId::Type_Texture));
-    addResources (Resources (vfs, "video", UniversalId::Type_Video));
+    addResources(Resources(vfs, "meshes", UniversalId::Type_Mesh, getMeshExtensions()));
+    addResources(Resources(vfs, "icons", UniversalId::Type_Icon));
+    addResources(Resources(vfs, "music", UniversalId::Type_Music));
+    addResources(Resources(vfs, "sound", UniversalId::Type_SoundRes));
+    addResources(Resources(vfs, "textures", UniversalId::Type_Texture));
+    addResources(Resources(vfs, "video", UniversalId::Type_Video));
 }
 
 const VFS::Manager* CSMWorld::ResourcesManager::getVFS() const
@@ -46,7 +45,7 @@ const VFS::Manager* CSMWorld::ResourcesManager::getVFS() const
 void CSMWorld::ResourcesManager::recreateResources()
 {
     std::map<UniversalId::Type, Resources>::iterator it = mResources.begin();
-    for ( ; it != mResources.end(); ++it)
+    for (; it != mResources.end(); ++it)
     {
         if (it->first == UniversalId::Type_Mesh)
             it->second.recreate(mVFS, getMeshExtensions());
@@ -55,12 +54,12 @@ void CSMWorld::ResourcesManager::recreateResources()
     }
 }
 
-const CSMWorld::Resources& CSMWorld::ResourcesManager::get (UniversalId::Type type) const
+const CSMWorld::Resources& CSMWorld::ResourcesManager::get(UniversalId::Type type) const
 {
-    std::map<UniversalId::Type, Resources>::const_iterator iter = mResources.find (type);
+    std::map<UniversalId::Type, Resources>::const_iterator iter = mResources.find(type);
 
-    if (iter==mResources.end())
-        throw std::logic_error ("Unknown resource type");
+    if (iter == mResources.end())
+        throw std::logic_error("Unknown resource type");
 
     return iter->second;
 }
diff --git a/apps/opencs/model/world/resourcesmanager.hpp b/apps/opencs/model/world/resourcesmanager.hpp
index 4b6857f63d..f6e04d4d03 100644
--- a/apps/opencs/model/world/resourcesmanager.hpp
+++ b/apps/opencs/model/world/resourcesmanager.hpp
@@ -16,27 +16,25 @@ namespace CSMWorld
 
     class ResourcesManager
     {
-            std::map<UniversalId::Type, Resources> mResources;
-            const VFS::Manager* mVFS;
+        std::map<UniversalId::Type, Resources> mResources;
+        const VFS::Manager* mVFS;
 
-        private:
+    private:
+        void addResources(const Resources& resources);
 
-            void addResources (const Resources& resources);
+        const char* const* getMeshExtensions();
 
-            const char * const * getMeshExtensions();
+    public:
+        ResourcesManager();
+        ~ResourcesManager();
 
-        public:
+        const VFS::Manager* getVFS() const;
 
-            ResourcesManager();
-            ~ResourcesManager();
+        void setVFS(const VFS::Manager* vfs);
 
-            const VFS::Manager* getVFS() const;
+        void recreateResources();
 
-            void setVFS(const VFS::Manager* vfs);
-
-            void recreateResources();
-
-            const Resources& get (UniversalId::Type type) const;
+        const Resources& get(UniversalId::Type type) const;
     };
 }
 
diff --git a/apps/opencs/model/world/resourcetable.cpp b/apps/opencs/model/world/resourcetable.cpp
index 0e7864e48e..f6fae9275d 100644
--- a/apps/opencs/model/world/resourcetable.cpp
+++ b/apps/opencs/model/world/resourcetable.cpp
@@ -2,17 +2,19 @@
 
 #include <stdexcept>
 
-#include "resources.hpp"
 #include "columnbase.hpp"
+#include "resources.hpp"
 #include "universalid.hpp"
 
-CSMWorld::ResourceTable::ResourceTable (const Resources *resources, unsigned int features)
-: IdTableBase (features | Feature_Constant), mResources (resources)
-{}
+CSMWorld::ResourceTable::ResourceTable(const Resources* resources, unsigned int features)
+    : IdTableBase(features | Feature_Constant)
+    , mResources(resources)
+{
+}
 
 CSMWorld::ResourceTable::~ResourceTable() {}
 
-int CSMWorld::ResourceTable::rowCount (const QModelIndex & parent) const
+int CSMWorld::ResourceTable::rowCount(const QModelIndex& parent) const
 {
     if (parent.isValid())
         return 0;
@@ -20,7 +22,7 @@ int CSMWorld::ResourceTable::rowCount (const QModelIndex & parent) const
     return mResources->getSize();
 }
 
-int CSMWorld::ResourceTable::columnCount (const QModelIndex & parent) const
+int CSMWorld::ResourceTable::columnCount(const QModelIndex& parent) const
 {
     if (parent.isValid())
         return 0;
@@ -28,47 +30,46 @@ int CSMWorld::ResourceTable::columnCount (const QModelIndex & parent) const
     return 2; // ID, type
 }
 
-QVariant CSMWorld::ResourceTable::data  (const QModelIndex & index, int role) const
+QVariant CSMWorld::ResourceTable::data(const QModelIndex& index, int role) const
 {
-    if (role!=Qt::DisplayRole)
+    if (role != Qt::DisplayRole)
         return QVariant();
 
-    if (index.column()==0)
-        return QString::fromUtf8 (mResources->getId (index.row()).c_str());
+    if (index.column() == 0)
+        return QString::fromUtf8(mResources->getId(index.row()).c_str());
 
-    if (index.column()==1)
-        return static_cast<int> (mResources->getType());
+    if (index.column() == 1)
+        return static_cast<int>(mResources->getType());
 
-    throw std::logic_error ("Invalid column in resource table");
+    throw std::logic_error("Invalid column in resource table");
 }
 
-QVariant CSMWorld::ResourceTable::headerData (int section, Qt::Orientation orientation,
-    int role ) const
+QVariant CSMWorld::ResourceTable::headerData(int section, Qt::Orientation orientation, int role) const
 {
-    if (orientation==Qt::Vertical)
+    if (orientation == Qt::Vertical)
         return QVariant();
 
-    if (role==ColumnBase::Role_Flags)
-        return section==0 ? ColumnBase::Flag_Table : 0;
+    if (role == ColumnBase::Role_Flags)
+        return section == 0 ? ColumnBase::Flag_Table : 0;
 
     switch (section)
     {
         case 0:
 
-            if (role==Qt::DisplayRole)
-                return Columns::getName (Columns::ColumnId_Id).c_str();
+            if (role == Qt::DisplayRole)
+                return Columns::getName(Columns::ColumnId_Id).c_str();
 
-            if (role==ColumnBase::Role_Display)
+            if (role == ColumnBase::Role_Display)
                 return ColumnBase::Display_Id;
 
             break;
 
         case 1:
 
-            if (role==Qt::DisplayRole)
-                return Columns::getName (Columns::ColumnId_RecordType).c_str();
+            if (role == Qt::DisplayRole)
+                return Columns::getName(Columns::ColumnId_RecordType).c_str();
 
-            if (role==ColumnBase::Role_Display)
+            if (role == ColumnBase::Role_Display)
                 return ColumnBase::Display_Integer;
 
             break;
@@ -77,83 +78,83 @@ QVariant CSMWorld::ResourceTable::headerData (int section, Qt::Orientation orien
     return QVariant();
 }
 
-bool CSMWorld::ResourceTable::setData ( const QModelIndex &index, const QVariant &value,
-    int role)
+bool CSMWorld::ResourceTable::setData(const QModelIndex& index, const QVariant& value, int role)
 {
     return false;
 }
 
-Qt::ItemFlags CSMWorld::ResourceTable::flags (const QModelIndex & index) const
+Qt::ItemFlags CSMWorld::ResourceTable::flags(const QModelIndex& index) const
 {
     return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
 }
 
-QModelIndex CSMWorld::ResourceTable::index (int row, int column, const QModelIndex& parent)
-    const
+QModelIndex CSMWorld::ResourceTable::index(int row, int column, const QModelIndex& parent) const
 {
     if (parent.isValid())
         return QModelIndex();
 
-    if (row<0 || row>=mResources->getSize())
+    if (row < 0 || row >= mResources->getSize())
         return QModelIndex();
 
-    if (column<0 || column>1)
+    if (column < 0 || column > 1)
         return QModelIndex();
 
-    return createIndex (row, column);
+    return createIndex(row, column);
 }
 
-QModelIndex CSMWorld::ResourceTable::parent (const QModelIndex& index) const
+QModelIndex CSMWorld::ResourceTable::parent(const QModelIndex& index) const
 {
     return QModelIndex();
 }
 
-QModelIndex CSMWorld::ResourceTable::getModelIndex (const std::string& id, int column) const
+QModelIndex CSMWorld::ResourceTable::getModelIndex(const std::string& id, int column) const
 {
     int row = mResources->searchId(id);
     if (row != -1)
-        return index (row, column);
+        return index(row, column);
 
     return QModelIndex();
 }
 
-int CSMWorld::ResourceTable::searchColumnIndex (Columns::ColumnId id) const
+int CSMWorld::ResourceTable::searchColumnIndex(Columns::ColumnId id) const
 {
-    if (id==Columns::ColumnId_Id)
+    if (id == Columns::ColumnId_Id)
         return 0;
 
-    if (id==Columns::ColumnId_RecordType)
+    if (id == Columns::ColumnId_RecordType)
         return 1;
 
     return -1;
 }
 
-int CSMWorld::ResourceTable::findColumnIndex (Columns::ColumnId id) const
+int CSMWorld::ResourceTable::findColumnIndex(Columns::ColumnId id) const
 {
-    int index = searchColumnIndex (id);
+    int index = searchColumnIndex(id);
 
-    if (index==-1)
-        throw std::logic_error ("invalid column index");
+    if (index == -1)
+        throw std::logic_error("invalid column index");
 
     return index;
 }
 
-std::pair<CSMWorld::UniversalId, std::string> CSMWorld::ResourceTable::view (int row) const
+std::pair<CSMWorld::UniversalId, std::string> CSMWorld::ResourceTable::view(int row) const
 {
-    return std::make_pair (UniversalId::Type_None, "");
+    return std::make_pair(UniversalId::Type_None, "");
 }
 
-bool CSMWorld::ResourceTable::isDeleted (const std::string& id) const
+bool CSMWorld::ResourceTable::isDeleted(const std::string& id) const
 {
     return false;
 }
 
-int CSMWorld::ResourceTable::getColumnId (int column) const
+int CSMWorld::ResourceTable::getColumnId(int column) const
 {
     switch (column)
     {
-        case 0: return Columns::ColumnId_Id;
-        case 1: return Columns::ColumnId_RecordType;
+        case 0:
+            return Columns::ColumnId_Id;
+        case 1:
+            return Columns::ColumnId_RecordType;
     }
 
     return -1;
diff --git a/apps/opencs/model/world/resourcetable.hpp b/apps/opencs/model/world/resourcetable.hpp
index 34d8298d9a..eea3d5c711 100644
--- a/apps/opencs/model/world/resourcetable.hpp
+++ b/apps/opencs/model/world/resourcetable.hpp
@@ -9,54 +9,53 @@ namespace CSMWorld
 
     class ResourceTable : public IdTableBase
     {
-            const Resources *mResources;
+        const Resources* mResources;
 
-        public:
+    public:
+        /// \note The feature Feature_Constant will be added implicitly.
+        ResourceTable(const Resources* resources, unsigned int features = 0);
 
-            /// \note The feature Feature_Constant will be added implicitly.
-            ResourceTable (const Resources *resources, unsigned int features = 0);
+        ~ResourceTable() override;
 
-            ~ResourceTable() override;
+        int rowCount(const QModelIndex& parent = QModelIndex()) const override;
 
-            int rowCount (const QModelIndex & parent = QModelIndex()) const override;
+        int columnCount(const QModelIndex& parent = QModelIndex()) const override;
 
-            int columnCount (const QModelIndex & parent = QModelIndex()) const override;
+        QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
 
-            QVariant data  (const QModelIndex & index, int role = Qt::DisplayRole) const override;
+        QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
 
-            QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+        bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
 
-            bool setData ( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
+        Qt::ItemFlags flags(const QModelIndex& index) const override;
 
-            Qt::ItemFlags flags (const QModelIndex & index) const override;
+        QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
 
-            QModelIndex index (int row, int column, const QModelIndex& parent = QModelIndex()) const override;
+        QModelIndex parent(const QModelIndex& index) const override;
 
-            QModelIndex parent (const QModelIndex& index) const override;
+        QModelIndex getModelIndex(const std::string& id, int column) const override;
 
-            QModelIndex getModelIndex (const std::string& id, int column) const override;
+        /// Return index of column with the given \a id. If no such column exists, -1 is
+        /// returned.
+        int searchColumnIndex(Columns::ColumnId id) const override;
 
-            /// Return index of column with the given \a id. If no such column exists, -1 is
-            /// returned.
-            int searchColumnIndex (Columns::ColumnId id) const override;
+        /// Return index of column with the given \a id. If no such column exists, an
+        /// exception is thrown.
+        int findColumnIndex(Columns::ColumnId id) const override;
 
-            /// Return index of column with the given \a id. If no such column exists, an
-            /// exception is thrown.
-            int findColumnIndex (Columns::ColumnId id) const override;
+        /// Return the UniversalId and the hint for viewing \a row. If viewing is not
+        /// supported by this table, return (UniversalId::Type_None, "").
+        std::pair<UniversalId, std::string> view(int row) const override;
 
-            /// Return the UniversalId and the hint for viewing \a row. If viewing is not
-            /// supported by this table, return (UniversalId::Type_None, "").
-            std::pair<UniversalId, std::string> view (int row) const override;
+        /// Is \a id flagged as deleted?
+        bool isDeleted(const std::string& id) const override;
 
-            /// Is \a id flagged as deleted?
-            bool isDeleted (const std::string& id) const override;
+        int getColumnId(int column) const override;
 
-            int getColumnId (int column) const override;
-
-            /// Signal Qt that the data is about to change.
-            void beginReset();
-            /// Signal Qt that the data has been changed.
-            void endReset();
+        /// Signal Qt that the data is about to change.
+        void beginReset();
+        /// Signal Qt that the data has been changed.
+        void endReset();
     };
 }
 
diff --git a/apps/opencs/model/world/scope.cpp b/apps/opencs/model/world/scope.cpp
index 136b85e6b3..0cf522a392 100644
--- a/apps/opencs/model/world/scope.cpp
+++ b/apps/opencs/model/world/scope.cpp
@@ -4,20 +4,20 @@
 
 #include <components/misc/strings/lower.hpp>
 
-CSMWorld::Scope CSMWorld::getScopeFromId (const std::string& id)
+CSMWorld::Scope CSMWorld::getScopeFromId(const std::string& id)
 {
     // get root namespace
     std::string namespace_;
 
-    std::string::size_type i = id.find ("::");
+    std::string::size_type i = id.find("::");
 
-    if (i!=std::string::npos)
+    if (i != std::string::npos)
         namespace_ = Misc::StringUtils::lowerCase(std::string_view(id).substr(0, i));
 
-    if (namespace_=="project")
+    if (namespace_ == "project")
         return Scope_Project;
 
-    if (namespace_=="session")
+    if (namespace_ == "session")
         return Scope_Session;
 
     return Scope_Content;
diff --git a/apps/opencs/model/world/scope.hpp b/apps/opencs/model/world/scope.hpp
index 3983d91f50..dc00987858 100644
--- a/apps/opencs/model/world/scope.hpp
+++ b/apps/opencs/model/world/scope.hpp
@@ -17,7 +17,7 @@ namespace CSMWorld
         Scope_Session = 4
     };
 
-    Scope getScopeFromId (const std::string& id);
+    Scope getScopeFromId(const std::string& id);
 }
 
 #endif
diff --git a/apps/opencs/model/world/scriptcontext.cpp b/apps/opencs/model/world/scriptcontext.cpp
index 1088a58a00..392052b051 100644
--- a/apps/opencs/model/world/scriptcontext.cpp
+++ b/apps/opencs/model/world/scriptcontext.cpp
@@ -5,104 +5,112 @@
 
 #include <components/misc/strings/lower.hpp>
 
-#include <components/compiler/quickfileparser.hpp>
 #include <components/compiler/nullerrorhandler.hpp>
+#include <components/compiler/quickfileparser.hpp>
 #include <components/compiler/scanner.hpp>
 
 #include "data.hpp"
 
-CSMWorld::ScriptContext::ScriptContext (const Data& data) : mData (data), mIdsUpdated (false) {}
+CSMWorld::ScriptContext::ScriptContext(const Data& data)
+    : mData(data)
+    , mIdsUpdated(false)
+{
+}
 
 bool CSMWorld::ScriptContext::canDeclareLocals() const
 {
     return true;
 }
 
-char CSMWorld::ScriptContext::getGlobalType (const std::string& name) const
+char CSMWorld::ScriptContext::getGlobalType(const std::string& name) const
 {
-    int index = mData.getGlobals().searchId (name);
+    int index = mData.getGlobals().searchId(name);
 
-    if (index!=-1)
+    if (index != -1)
     {
-        switch (mData.getGlobals().getRecord (index).get().mValue.getType())
+        switch (mData.getGlobals().getRecord(index).get().mValue.getType())
         {
-            case ESM::VT_Short: return 's';
-            case ESM::VT_Long: return 'l';
-            case ESM::VT_Float: return 'f';
-
-            default: return ' ';
+            case ESM::VT_Short:
+                return 's';
+            case ESM::VT_Long:
+                return 'l';
+            case ESM::VT_Float:
+                return 'f';
+
+            default:
+                return ' ';
         }
     }
 
     return ' ';
 }
 
-std::pair<char, bool> CSMWorld::ScriptContext::getMemberType (const std::string& name,
-    const std::string& id) const
+std::pair<char, bool> CSMWorld::ScriptContext::getMemberType(const std::string& name, const std::string& id) const
 {
-    std::string id2 = Misc::StringUtils::lowerCase (id);
+    std::string id2 = Misc::StringUtils::lowerCase(id);
 
-    int index = mData.getScripts().searchId (id2);
+    int index = mData.getScripts().searchId(id2);
     bool reference = false;
 
-    if (index==-1)
+    if (index == -1)
     {
         // ID is not a script ID. Search for a matching referenceable instead.
-        index = mData.getReferenceables().searchId (id2);
+        index = mData.getReferenceables().searchId(id2);
 
-        if (index!=-1)
+        if (index != -1)
         {
             // Referenceable found.
-            int columnIndex = mData.getReferenceables().findColumnIndex (Columns::ColumnId_Script);
+            int columnIndex = mData.getReferenceables().findColumnIndex(Columns::ColumnId_Script);
 
-            id2 = Misc::StringUtils::lowerCase (mData.getReferenceables().
-                getData (index, columnIndex).toString().toUtf8().constData());
+            id2 = Misc::StringUtils::lowerCase(
+                mData.getReferenceables().getData(index, columnIndex).toString().toUtf8().constData());
 
             if (!id2.empty())
             {
                 // Referenceable has a script -> use it.
-                index = mData.getScripts().searchId (id2);
+                index = mData.getScripts().searchId(id2);
                 reference = true;
             }
         }
     }
 
-    if (index==-1)
-        return std::make_pair (' ', false);
+    if (index == -1)
+        return std::make_pair(' ', false);
 
-    std::map<std::string, Compiler::Locals>::iterator iter = mLocals.find (id2);
+    std::map<std::string, Compiler::Locals>::iterator iter = mLocals.find(id2);
 
-    if (iter==mLocals.end())
+    if (iter == mLocals.end())
     {
         Compiler::Locals locals;
 
         Compiler::NullErrorHandler errorHandler;
-        std::istringstream stream (mData.getScripts().getRecord (index).get().mScriptText);
-        Compiler::QuickFileParser parser (errorHandler, *this, locals);
-        Compiler::Scanner scanner (errorHandler, stream, getExtensions());
-        scanner.scan (parser);
+        std::istringstream stream(mData.getScripts().getRecord(index).get().mScriptText);
+        Compiler::QuickFileParser parser(errorHandler, *this, locals);
+        Compiler::Scanner scanner(errorHandler, stream, getExtensions());
+        scanner.scan(parser);
 
-        iter = mLocals.insert (std::make_pair (id2, locals)).first;
+        iter = mLocals.insert(std::make_pair(id2, locals)).first;
     }
 
-    return std::make_pair (iter->second.getType (Misc::StringUtils::lowerCase (name)), reference);
+    return std::make_pair(iter->second.getType(Misc::StringUtils::lowerCase(name)), reference);
 }
 
-bool CSMWorld::ScriptContext::isId (const std::string& name) const
+bool CSMWorld::ScriptContext::isId(const std::string& name) const
 {
     if (!mIdsUpdated)
     {
         mIds = mData.getIds();
 
-        for (auto& id : mIds) {
+        for (auto& id : mIds)
+        {
             Misc::StringUtils::lowerCaseInPlace(id);
         }
-        std::sort (mIds.begin(), mIds.end());
+        std::sort(mIds.begin(), mIds.end());
 
         mIdsUpdated = true;
     }
 
-    return std::binary_search (mIds.begin(), mIds.end(), Misc::StringUtils::lowerCase (name));
+    return std::binary_search(mIds.begin(), mIds.end(), Misc::StringUtils::lowerCase(name));
 }
 
 void CSMWorld::ScriptContext::invalidateIds()
@@ -117,14 +125,13 @@ void CSMWorld::ScriptContext::clear()
     mLocals.clear();
 }
 
-bool CSMWorld::ScriptContext::clearLocals (const std::string& script)
+bool CSMWorld::ScriptContext::clearLocals(const std::string& script)
 {
-    std::map<std::string, Compiler::Locals>::iterator iter =
-        mLocals.find (Misc::StringUtils::lowerCase (script));
+    std::map<std::string, Compiler::Locals>::iterator iter = mLocals.find(Misc::StringUtils::lowerCase(script));
 
-    if (iter!=mLocals.end())
+    if (iter != mLocals.end())
     {
-        mLocals.erase (iter);
+        mLocals.erase(iter);
         mIdsUpdated = false;
         return true;
     }
diff --git a/apps/opencs/model/world/scriptcontext.hpp b/apps/opencs/model/world/scriptcontext.hpp
index cb08fc70bd..a1ad54882a 100644
--- a/apps/opencs/model/world/scriptcontext.hpp
+++ b/apps/opencs/model/world/scriptcontext.hpp
@@ -1,9 +1,9 @@
 #ifndef CSM_WORLD_SCRIPTCONTEXT_H
 #define CSM_WORLD_SCRIPTCONTEXT_H
 
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
 
 #include <components/compiler/context.hpp>
 #include <components/compiler/locals.hpp>
@@ -14,38 +14,36 @@ namespace CSMWorld
 
     class ScriptContext : public Compiler::Context
     {
-            const Data& mData;
-            mutable std::vector<std::string> mIds;
-            mutable bool mIdsUpdated;
-            mutable std::map<std::string, Compiler::Locals> mLocals;
-
-        public:
+        const Data& mData;
+        mutable std::vector<std::string> mIds;
+        mutable bool mIdsUpdated;
+        mutable std::map<std::string, Compiler::Locals> mLocals;
 
-            ScriptContext (const Data& data);
+    public:
+        ScriptContext(const Data& data);
 
-            bool canDeclareLocals() const override;
-            ///< Is the compiler allowed to declare local variables?
+        bool canDeclareLocals() const override;
+        ///< Is the compiler allowed to declare local variables?
 
-            char getGlobalType (const std::string& name) const override;
-            ///< 'l: long, 's': short, 'f': float, ' ': does not exist.
+        char getGlobalType(const std::string& name) const override;
+        ///< 'l: long, 's': short, 'f': float, ' ': does not exist.
 
-            std::pair<char, bool> getMemberType (const std::string& name,
-                const std::string& id) const override;
-            ///< Return type of member variable \a name in script \a id or in script of reference of
-            /// \a id
-            /// \return first: 'l: long, 's': short, 'f': float, ' ': does not exist.
-            /// second: true: script of reference
+        std::pair<char, bool> getMemberType(const std::string& name, const std::string& id) const override;
+        ///< Return type of member variable \a name in script \a id or in script of reference of
+        /// \a id
+        /// \return first: 'l: long, 's': short, 'f': float, ' ': does not exist.
+        /// second: true: script of reference
 
-            bool isId (const std::string& name) const override;
-            ///< Does \a name match an ID, that can be referenced?
+        bool isId(const std::string& name) const override;
+        ///< Does \a name match an ID, that can be referenced?
 
-            void invalidateIds();
+        void invalidateIds();
 
-            void clear();
-            ///< Remove all cached data.
+        void clear();
+        ///< Remove all cached data.
 
-            /// \return Were there any locals that needed clearing?
-            bool clearLocals (const std::string& script);
+        /// \return Were there any locals that needed clearing?
+        bool clearLocals(const std::string& script);
     };
 }
 
diff --git a/apps/opencs/model/world/subcellcollection.hpp b/apps/opencs/model/world/subcellcollection.hpp
index a792e11457..6f9d1eda8f 100644
--- a/apps/opencs/model/world/subcellcollection.hpp
+++ b/apps/opencs/model/world/subcellcollection.hpp
@@ -13,30 +13,29 @@ namespace CSMWorld
     struct Cell;
 
     /// \brief Single type collection of top level records that are associated with cells
-    template<typename ESXRecordT, typename IdAccessorT = IdAccessor<ESXRecordT> >
+    template <typename ESXRecordT, typename IdAccessorT = IdAccessor<ESXRecordT>>
     class SubCellCollection : public NestedIdCollection<ESXRecordT, IdAccessorT>
     {
-            const IdCollection<Cell, IdAccessor<Cell>>& mCells;
+        const IdCollection<Cell, IdAccessor<Cell>>& mCells;
 
-            void loadRecord (ESXRecordT& record, ESM::ESMReader& reader, bool& isDeleted) override;
+        void loadRecord(ESXRecordT& record, ESM::ESMReader& reader, bool& isDeleted) override;
 
-        public:
-            SubCellCollection(const IdCollection<Cell, IdAccessor<Cell>>& cells);
+    public:
+        SubCellCollection(const IdCollection<Cell, IdAccessor<Cell>>& cells);
     };
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    void SubCellCollection<ESXRecordT, IdAccessorT>::loadRecord (ESXRecordT& record,
-                                                                 ESM::ESMReader& reader,
-                                                                 bool& isDeleted)
+    template <typename ESXRecordT, typename IdAccessorT>
+    void SubCellCollection<ESXRecordT, IdAccessorT>::loadRecord(
+        ESXRecordT& record, ESM::ESMReader& reader, bool& isDeleted)
     {
-        record.load (reader, isDeleted, mCells);
+        record.load(reader, isDeleted, mCells);
     }
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    SubCellCollection<ESXRecordT, IdAccessorT>::SubCellCollection (
-        const IdCollection<Cell, IdAccessor<Cell>>& cells)
-    : mCells (cells)
-    {}
+    template <typename ESXRecordT, typename IdAccessorT>
+    SubCellCollection<ESXRecordT, IdAccessorT>::SubCellCollection(const IdCollection<Cell, IdAccessor<Cell>>& cells)
+        : mCells(cells)
+    {
+    }
 }
 
 #endif
diff --git a/apps/opencs/model/world/tablemimedata.cpp b/apps/opencs/model/world/tablemimedata.cpp
index 1268a7389d..bbede2175c 100644
--- a/apps/opencs/model/world/tablemimedata.cpp
+++ b/apps/opencs/model/world/tablemimedata.cpp
@@ -4,22 +4,23 @@
 
 #include <QDebug>
 
-#include "universalid.hpp"
 #include "columnbase.hpp"
+#include "universalid.hpp"
 
-CSMWorld::TableMimeData::TableMimeData (UniversalId id, const CSMDoc::Document& document) :
-mDocument(document)
+CSMWorld::TableMimeData::TableMimeData(UniversalId id, const CSMDoc::Document& document)
+    : mDocument(document)
 {
-    mUniversalId.push_back (id);
-    mObjectsFormats << QString::fromUtf8 (("tabledata/" + id.getTypeName()).c_str());
+    mUniversalId.push_back(id);
+    mObjectsFormats << QString::fromUtf8(("tabledata/" + id.getTypeName()).c_str());
 }
 
-CSMWorld::TableMimeData::TableMimeData (const std::vector< CSMWorld::UniversalId >& id, const CSMDoc::Document& document) :
-    mUniversalId (id), mDocument(document)
+CSMWorld::TableMimeData::TableMimeData(const std::vector<CSMWorld::UniversalId>& id, const CSMDoc::Document& document)
+    : mUniversalId(id)
+    , mDocument(document)
 {
-    for (std::vector<UniversalId>::iterator it (mUniversalId.begin()); it != mUniversalId.end(); ++it)
+    for (std::vector<UniversalId>::iterator it(mUniversalId.begin()); it != mUniversalId.end(); ++it)
     {
-        mObjectsFormats << QString::fromUtf8 (("tabledata/" + it->getTypeName()).c_str());
+        mObjectsFormats << QString::fromUtf8(("tabledata/" + it->getTypeName()).c_str());
     }
 }
 
@@ -28,16 +29,15 @@ QStringList CSMWorld::TableMimeData::formats() const
     return mObjectsFormats;
 }
 
-CSMWorld::TableMimeData::~TableMimeData()
-{
-}
+CSMWorld::TableMimeData::~TableMimeData() {}
 
 std::string CSMWorld::TableMimeData::getIcon() const
 {
     if (mUniversalId.empty())
     {
-        qDebug()<<"TableMimeData object does not hold any records!"; //because throwing in the event loop tends to be problematic
-        throw std::runtime_error ("TableMimeData object does not hold any records!");
+        qDebug() << "TableMimeData object does not hold any records!"; // because throwing in the event loop tends to be
+                                                                       // problematic
+        throw std::runtime_error("TableMimeData object does not hold any records!");
     }
 
     std::string tmpIcon;
@@ -54,68 +54,50 @@ std::string CSMWorld::TableMimeData::getIcon() const
 
         if (tmpIcon != mUniversalId[i].getIcon())
         {
-            return ":/multitype.png"; //icon stolen from gnome TODO: get new icon
+            return ":/multitype.png"; // icon stolen from gnome TODO: get new icon
         }
 
         tmpIcon = mUniversalId[i].getIcon();
     }
 
-    return mUniversalId.begin()->getIcon(); //All objects are of the same type;
+    return mUniversalId.begin()->getIcon(); // All objects are of the same type;
 }
 
-std::vector< CSMWorld::UniversalId > CSMWorld::TableMimeData::getData() const
+std::vector<CSMWorld::UniversalId> CSMWorld::TableMimeData::getData() const
 {
     return mUniversalId;
 }
 
 bool CSMWorld::TableMimeData::isReferencable(CSMWorld::ColumnBase::Display type) const
 {
-return (  type == CSMWorld::ColumnBase::Display_Activator
-       || type == CSMWorld::ColumnBase::Display_Potion
-       || type == CSMWorld::ColumnBase::Display_Apparatus
-       || type == CSMWorld::ColumnBase::Display_Armor
-       || type == CSMWorld::ColumnBase::Display_Book
-       || type == CSMWorld::ColumnBase::Display_Clothing
-       || type == CSMWorld::ColumnBase::Display_Container
-       || type == CSMWorld::ColumnBase::Display_Creature
-       || type == CSMWorld::ColumnBase::Display_Door
-       || type == CSMWorld::ColumnBase::Display_Ingredient
-       || type == CSMWorld::ColumnBase::Display_CreatureLevelledList
-       || type == CSMWorld::ColumnBase::Display_ItemLevelledList
-       || type == CSMWorld::ColumnBase::Display_Light
-       || type == CSMWorld::ColumnBase::Display_Lockpick
-       || type == CSMWorld::ColumnBase::Display_Miscellaneous
-       || type == CSMWorld::ColumnBase::Display_Npc
-       || type == CSMWorld::ColumnBase::Display_Probe
-       || type == CSMWorld::ColumnBase::Display_Repair
-       || type == CSMWorld::ColumnBase::Display_Static
-       || type == CSMWorld::ColumnBase::Display_Weapon);
+    return (type == CSMWorld::ColumnBase::Display_Activator || type == CSMWorld::ColumnBase::Display_Potion
+        || type == CSMWorld::ColumnBase::Display_Apparatus || type == CSMWorld::ColumnBase::Display_Armor
+        || type == CSMWorld::ColumnBase::Display_Book || type == CSMWorld::ColumnBase::Display_Clothing
+        || type == CSMWorld::ColumnBase::Display_Container || type == CSMWorld::ColumnBase::Display_Creature
+        || type == CSMWorld::ColumnBase::Display_Door || type == CSMWorld::ColumnBase::Display_Ingredient
+        || type == CSMWorld::ColumnBase::Display_CreatureLevelledList
+        || type == CSMWorld::ColumnBase::Display_ItemLevelledList || type == CSMWorld::ColumnBase::Display_Light
+        || type == CSMWorld::ColumnBase::Display_Lockpick || type == CSMWorld::ColumnBase::Display_Miscellaneous
+        || type == CSMWorld::ColumnBase::Display_Npc || type == CSMWorld::ColumnBase::Display_Probe
+        || type == CSMWorld::ColumnBase::Display_Repair || type == CSMWorld::ColumnBase::Display_Static
+        || type == CSMWorld::ColumnBase::Display_Weapon);
 }
 bool CSMWorld::TableMimeData::isReferencable(CSMWorld::UniversalId::Type type)
 {
-     return (  type == CSMWorld::UniversalId::Type_Activator
-            || type == CSMWorld::UniversalId::Type_Potion
-            || type == CSMWorld::UniversalId::Type_Apparatus
-            || type == CSMWorld::UniversalId::Type_Armor
-            || type == CSMWorld::UniversalId::Type_Book
-            || type == CSMWorld::UniversalId::Type_Clothing
-            || type == CSMWorld::UniversalId::Type_Container
-            || type == CSMWorld::UniversalId::Type_Creature
-            || type == CSMWorld::UniversalId::Type_Door
-            || type == CSMWorld::UniversalId::Type_Ingredient
-            || type == CSMWorld::UniversalId::Type_CreatureLevelledList
-            || type == CSMWorld::UniversalId::Type_ItemLevelledList
-            || type == CSMWorld::UniversalId::Type_Light
-            || type == CSMWorld::UniversalId::Type_Lockpick
-            || type == CSMWorld::UniversalId::Type_Miscellaneous
-            || type == CSMWorld::UniversalId::Type_Npc
-            || type == CSMWorld::UniversalId::Type_Probe
-            || type == CSMWorld::UniversalId::Type_Repair
-            || type == CSMWorld::UniversalId::Type_Static
-            || type == CSMWorld::UniversalId::Type_Weapon);
+    return (type == CSMWorld::UniversalId::Type_Activator || type == CSMWorld::UniversalId::Type_Potion
+        || type == CSMWorld::UniversalId::Type_Apparatus || type == CSMWorld::UniversalId::Type_Armor
+        || type == CSMWorld::UniversalId::Type_Book || type == CSMWorld::UniversalId::Type_Clothing
+        || type == CSMWorld::UniversalId::Type_Container || type == CSMWorld::UniversalId::Type_Creature
+        || type == CSMWorld::UniversalId::Type_Door || type == CSMWorld::UniversalId::Type_Ingredient
+        || type == CSMWorld::UniversalId::Type_CreatureLevelledList
+        || type == CSMWorld::UniversalId::Type_ItemLevelledList || type == CSMWorld::UniversalId::Type_Light
+        || type == CSMWorld::UniversalId::Type_Lockpick || type == CSMWorld::UniversalId::Type_Miscellaneous
+        || type == CSMWorld::UniversalId::Type_Npc || type == CSMWorld::UniversalId::Type_Probe
+        || type == CSMWorld::UniversalId::Type_Repair || type == CSMWorld::UniversalId::Type_Static
+        || type == CSMWorld::UniversalId::Type_Weapon);
 }
 
-bool CSMWorld::TableMimeData::holdsType (CSMWorld::UniversalId::Type type) const
+bool CSMWorld::TableMimeData::holdsType(CSMWorld::UniversalId::Type type) const
 {
     bool referencable = (type == CSMWorld::UniversalId::Type_Referenceable);
     for (std::vector<UniversalId>::const_iterator it = mUniversalId.begin(); it != mUniversalId.end(); ++it)
@@ -126,8 +108,10 @@ bool CSMWorld::TableMimeData::holdsType (CSMWorld::UniversalId::Type type) const
             {
                 return true;
             }
-        } else {
-        if (it->getType() == type)
+        }
+        else
+        {
+            if (it->getType() == type)
             {
                 return true;
             }
@@ -137,7 +121,7 @@ bool CSMWorld::TableMimeData::holdsType (CSMWorld::UniversalId::Type type) const
     return false;
 }
 
-bool CSMWorld::TableMimeData::holdsType (CSMWorld::ColumnBase::Display type) const
+bool CSMWorld::TableMimeData::holdsType(CSMWorld::ColumnBase::Display type) const
 {
     bool referencable = (type == CSMWorld::ColumnBase::Display_Referenceable);
     for (std::vector<UniversalId>::const_iterator it = mUniversalId.begin(); it != mUniversalId.end(); ++it)
@@ -148,8 +132,10 @@ bool CSMWorld::TableMimeData::holdsType (CSMWorld::ColumnBase::Display type) con
             {
                 return true;
             }
-        } else {
-        if (it->getType() == convertEnums (type))
+        }
+        else
+        {
+            if (it->getType() == convertEnums(type))
             {
                 return true;
             }
@@ -159,7 +145,7 @@ bool CSMWorld::TableMimeData::holdsType (CSMWorld::ColumnBase::Display type) con
     return false;
 }
 
-CSMWorld::UniversalId CSMWorld::TableMimeData::returnMatching (CSMWorld::UniversalId::Type type) const
+CSMWorld::UniversalId CSMWorld::TableMimeData::returnMatching(CSMWorld::UniversalId::Type type) const
 {
     bool referencable = (type == CSMWorld::UniversalId::Type_Referenceable);
     for (std::vector<UniversalId>::const_iterator it = mUniversalId.begin(); it != mUniversalId.end(); ++it)
@@ -170,7 +156,8 @@ CSMWorld::UniversalId CSMWorld::TableMimeData::returnMatching (CSMWorld::Univers
             {
                 return *it;
             }
-        } else
+        }
+        else
         {
             if (it->getType() == type)
             {
@@ -179,10 +166,10 @@ CSMWorld::UniversalId CSMWorld::TableMimeData::returnMatching (CSMWorld::Univers
         }
     }
 
-    throw std::runtime_error ("TableMimeData object does not hold object of the sought type");
+    throw std::runtime_error("TableMimeData object does not hold object of the sought type");
 }
 
-CSMWorld::UniversalId CSMWorld::TableMimeData::returnMatching (CSMWorld::ColumnBase::Display type) const
+CSMWorld::UniversalId CSMWorld::TableMimeData::returnMatching(CSMWorld::ColumnBase::Display type) const
 {
     bool referencable = (type == CSMWorld::ColumnBase::Display_Referenceable);
     for (std::vector<UniversalId>::const_iterator it = mUniversalId.begin(); it != mUniversalId.end(); ++it)
@@ -193,18 +180,20 @@ CSMWorld::UniversalId CSMWorld::TableMimeData::returnMatching (CSMWorld::ColumnB
             {
                 return *it;
             }
-        } else {
-            if (it->getType() == convertEnums (type))
+        }
+        else
+        {
+            if (it->getType() == convertEnums(type))
             {
                 return *it;
             }
         }
     }
 
-    throw std::runtime_error ("TableMimeData object does not hold object of the sought type");
+    throw std::runtime_error("TableMimeData object does not hold object of the sought type");
 }
 
-bool CSMWorld::TableMimeData::fromDocument (const CSMDoc::Document& document) const
+bool CSMWorld::TableMimeData::fromDocument(const CSMDoc::Document& document) const
 {
     return &document == &mDocument;
 }
@@ -217,8 +206,7 @@ namespace
         CSMWorld::ColumnBase::Display mDisplayType;
     };
 
-    const Mapping mapping[] =
-    {
+    const Mapping mapping[] = {
         { CSMWorld::UniversalId::Type_Race, CSMWorld::ColumnBase::Display_Race },
         { CSMWorld::UniversalId::Type_Skill, CSMWorld::ColumnBase::Display_Skill },
         { CSMWorld::UniversalId::Type_Class, CSMWorld::ColumnBase::Display_Class },
@@ -271,19 +259,19 @@ namespace
     };
 }
 
-CSMWorld::UniversalId::Type CSMWorld::TableMimeData::convertEnums (ColumnBase::Display type)
+CSMWorld::UniversalId::Type CSMWorld::TableMimeData::convertEnums(ColumnBase::Display type)
 {
-    for (int i=0; mapping[i].mUniversalIdType!=CSMWorld::UniversalId::Type_None; ++i)
-        if (mapping[i].mDisplayType==type)
+    for (int i = 0; mapping[i].mUniversalIdType != CSMWorld::UniversalId::Type_None; ++i)
+        if (mapping[i].mDisplayType == type)
             return mapping[i].mUniversalIdType;
 
     return CSMWorld::UniversalId::Type_None;
 }
 
-CSMWorld::ColumnBase::Display CSMWorld::TableMimeData::convertEnums (UniversalId::Type type)
+CSMWorld::ColumnBase::Display CSMWorld::TableMimeData::convertEnums(UniversalId::Type type)
 {
-    for (int i=0; mapping[i].mUniversalIdType!=CSMWorld::UniversalId::Type_None; ++i)
-        if (mapping[i].mUniversalIdType==type)
+    for (int i = 0; mapping[i].mUniversalIdType != CSMWorld::UniversalId::Type_None; ++i)
+        if (mapping[i].mUniversalIdType == type)
             return mapping[i].mDisplayType;
 
     return CSMWorld::ColumnBase::Display_None;
diff --git a/apps/opencs/model/world/tablemimedata.hpp b/apps/opencs/model/world/tablemimedata.hpp
index 2345249122..e76dd930d7 100644
--- a/apps/opencs/model/world/tablemimedata.hpp
+++ b/apps/opencs/model/world/tablemimedata.hpp
@@ -3,11 +3,11 @@
 
 #include <vector>
 
-#include <QtCore/QMimeData>
 #include <QStringList>
+#include <QtCore/QMimeData>
 
-#include "universalid.hpp"
 #include "columnbase.hpp"
+#include "universalid.hpp"
 
 namespace CSMDoc
 {
@@ -17,51 +17,52 @@ namespace CSMDoc
 namespace CSMWorld
 {
 
-/// \brief Subclass of QmimeData, augmented to contain and transport UniversalIds.
-///
-/// This class provides way to construct mimedata object holding the universalid copy
-/// Universalid is used in the majority of the tables to store type, id, argument types.
-/// This way universalid grants a way to retrieve record from the concrete table.
-/// Please note, that tablemimedata object can hold multiple universalIds in the vector.
+    /// \brief Subclass of QmimeData, augmented to contain and transport UniversalIds.
+    ///
+    /// This class provides way to construct mimedata object holding the universalid copy
+    /// Universalid is used in the majority of the tables to store type, id, argument types.
+    /// This way universalid grants a way to retrieve record from the concrete table.
+    /// Please note, that tablemimedata object can hold multiple universalIds in the vector.
 
     class TableMimeData : public QMimeData
     {
-            std::vector<UniversalId> mUniversalId;
-            QStringList mObjectsFormats;
-            const CSMDoc::Document& mDocument;
-        public:
-            TableMimeData(UniversalId id, const CSMDoc::Document& document);
+        std::vector<UniversalId> mUniversalId;
+        QStringList mObjectsFormats;
+        const CSMDoc::Document& mDocument;
+
+    public:
+        TableMimeData(UniversalId id, const CSMDoc::Document& document);
 
-            TableMimeData(const std::vector<UniversalId>& id, const CSMDoc::Document& document);
+        TableMimeData(const std::vector<UniversalId>& id, const CSMDoc::Document& document);
 
-            ~TableMimeData();
+        ~TableMimeData();
 
-            QStringList formats() const override;
+        QStringList formats() const override;
 
-            std::string getIcon() const;
+        std::string getIcon() const;
 
-            std::vector<UniversalId> getData() const;
+        std::vector<UniversalId> getData() const;
 
-            bool holdsType(UniversalId::Type type) const;
+        bool holdsType(UniversalId::Type type) const;
 
-            bool holdsType(CSMWorld::ColumnBase::Display type) const;
+        bool holdsType(CSMWorld::ColumnBase::Display type) const;
 
-            bool fromDocument(const CSMDoc::Document& document) const;
+        bool fromDocument(const CSMDoc::Document& document) const;
 
-            UniversalId returnMatching(UniversalId::Type type) const;
+        UniversalId returnMatching(UniversalId::Type type) const;
 
-            const CSMDoc::Document* getDocumentPtr() const;
+        const CSMDoc::Document* getDocumentPtr() const;
 
-            UniversalId returnMatching(CSMWorld::ColumnBase::Display type) const;
+        UniversalId returnMatching(CSMWorld::ColumnBase::Display type) const;
 
-            static CSMWorld::UniversalId::Type convertEnums(CSMWorld::ColumnBase::Display type);
+        static CSMWorld::UniversalId::Type convertEnums(CSMWorld::ColumnBase::Display type);
 
-            static CSMWorld::ColumnBase::Display convertEnums(CSMWorld::UniversalId::Type type);
+        static CSMWorld::ColumnBase::Display convertEnums(CSMWorld::UniversalId::Type type);
 
-            static bool isReferencable(CSMWorld::UniversalId::Type type);
-        private:
-            bool isReferencable(CSMWorld::ColumnBase::Display type) const;
+        static bool isReferencable(CSMWorld::UniversalId::Type type);
 
+    private:
+        bool isReferencable(CSMWorld::ColumnBase::Display type) const;
     };
 }
 #endif // TABLEMIMEDATA_H
diff --git a/apps/opencs/model/world/universalid.cpp b/apps/opencs/model/world/universalid.cpp
index 0c2910ce53..95da6aaa38 100644
--- a/apps/opencs/model/world/universalid.cpp
+++ b/apps/opencs/model/world/universalid.cpp
@@ -1,23 +1,23 @@
 #include "universalid.hpp"
 
-#include <stdexcept>
-#include <sstream>
 #include <iostream>
+#include <sstream>
+#include <stdexcept>
 
 namespace
 {
     struct TypeData
     {
-            CSMWorld::UniversalId::Class mClass;
-            CSMWorld::UniversalId::Type mType;
-            const char *mName;
-            const char *mIcon;
+        CSMWorld::UniversalId::Class mClass;
+        CSMWorld::UniversalId::Type mType;
+        const char* mName;
+        const char* mIcon;
     };
 
-    static const TypeData sNoArg[] =
-    {
+    static const TypeData sNoArg[] = {
         { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, "-", 0 },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Globals, "Global Variables", ":./global-variable.png" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Globals, "Global Variables",
+            ":./global-variable.png" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Gmsts, "Game Settings", ":./gmst.png" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Skills, "Skills", ":./skill.png" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Classes, "Classes", ":./class.png" },
@@ -26,41 +26,64 @@ namespace
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Sounds, "Sounds", ":./sound.png" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Scripts, "Scripts", ":./script.png" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Regions, "Regions", ":./region.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Birthsigns, "Birthsigns", ":./birthsign.png" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Birthsigns, "Birthsigns",
+            ":./birthsign.png" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Spells, "Spells", ":./spell.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Topics, "Topics", ":./dialogue-topics.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Journals, "Journals", ":./journal-topics.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_TopicInfos, "Topic Infos", ":./dialogue-topic-infos.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_JournalInfos, "Journal Infos", ":./journal-topic-infos.png" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Topics, "Topics",
+            ":./dialogue-topics.png" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Journals, "Journals",
+            ":./journal-topics.png" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_TopicInfos, "Topic Infos",
+            ":./dialogue-topic-infos.png" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_JournalInfos, "Journal Infos",
+            ":./journal-topic-infos.png" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Cells, "Cells", ":./cell.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Enchantments, "Enchantments", ":./enchantment.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_BodyParts, "Body Parts", ":./body-part.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Referenceables, "Objects", ":./object.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_References, "Instances", ":./instance.png" },
-        { CSMWorld::UniversalId::Class_NonRecord, CSMWorld::UniversalId::Type_RegionMap, "Region Map", ":./region-map.png" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Enchantments, "Enchantments",
+            ":./enchantment.png" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_BodyParts, "Body Parts",
+            ":./body-part.png" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Referenceables, "Objects",
+            ":./object.png" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_References, "Instances",
+            ":./instance.png" },
+        { CSMWorld::UniversalId::Class_NonRecord, CSMWorld::UniversalId::Type_RegionMap, "Region Map",
+            ":./region-map.png" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Filters, "Filters", ":./filter.png" },
-        { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_Meshes, "Meshes", ":./resources-mesh" },
+        { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_Meshes, "Meshes",
+            ":./resources-mesh" },
         { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_Icons, "Icons", ":./resources-icon" },
-        { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_Musics, "Music Files", ":./resources-music" },
-        { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_SoundsRes, "Sound Files", ":resources-sound" },
-        { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_Textures, "Textures", ":./resources-texture" },
-        { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_Videos, "Videos", ":./resources-video" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_DebugProfiles, "Debug Profiles", ":./debug-profile.png" },
+        { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_Musics, "Music Files",
+            ":./resources-music" },
+        { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_SoundsRes, "Sound Files",
+            ":resources-sound" },
+        { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_Textures, "Textures",
+            ":./resources-texture" },
+        { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_Videos, "Videos",
+            ":./resources-video" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_DebugProfiles, "Debug Profiles",
+            ":./debug-profile.png" },
         { CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_RunLog, "Run Log", ":./run-log.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_SoundGens, "Sound Generators", ":./sound-generator.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_MagicEffects, "Magic Effects", ":./magic-effect.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Lands, "Lands", ":./land-heightmap.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_LandTextures, "Land Textures", ":./land-texture.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Pathgrids, "Pathgrids", ":./pathgrid.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_StartScripts, "Start Scripts", ":./start-script.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_MetaDatas, "Metadata", ":./metadata.png" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_SoundGens, "Sound Generators",
+            ":./sound-generator.png" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_MagicEffects, "Magic Effects",
+            ":./magic-effect.png" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Lands, "Lands",
+            ":./land-heightmap.png" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_LandTextures, "Land Textures",
+            ":./land-texture.png" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Pathgrids, "Pathgrids",
+            ":./pathgrid.png" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_StartScripts, "Start Scripts",
+            ":./start-script.png" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_MetaDatas, "Metadata",
+            ":./metadata.png" },
         // end marker
         { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0, 0 },
     };
 
-    static const TypeData sIdArg[] =
-    {
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Global, "Global Variable", ":./global-variable.png" },
+    static const TypeData sIdArg[] = {
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Global, "Global Variable",
+            ":./global-variable.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Gmst, "Game Setting", ":./gmst.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Skill, "Skill", ":./skill.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Class, "Class", ":./class.png" },
@@ -72,96 +95,115 @@ namespace
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Birthsign, "Birthsign", ":./birthsign.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Spell, "Spell", ":./spell.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Topic, "Topic", ":./dialogue-topics.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Journal, "Journal", ":./journal-topics.png" },
-        { CSMWorld::UniversalId::Class_SubRecord, CSMWorld::UniversalId::Type_TopicInfo, "TopicInfo", ":./dialogue-topic-infos.png" },
-        { CSMWorld::UniversalId::Class_SubRecord, CSMWorld::UniversalId::Type_JournalInfo, "JournalInfo", ":./journal-topic-infos.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Journal, "Journal",
+            ":./journal-topics.png" },
+        { CSMWorld::UniversalId::Class_SubRecord, CSMWorld::UniversalId::Type_TopicInfo, "TopicInfo",
+            ":./dialogue-topic-infos.png" },
+        { CSMWorld::UniversalId::Class_SubRecord, CSMWorld::UniversalId::Type_JournalInfo, "JournalInfo",
+            ":./journal-topic-infos.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Cell, "Cell", ":./cell.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Cell_Missing, "Cell", ":./cell.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Referenceable, "Object", ":./object.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Activator, "Activator", ":./activator.png" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Activator, "Activator",
+            ":./activator.png" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Potion, "Potion", ":./potion.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Apparatus, "Apparatus", ":./apparatus.png" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Apparatus, "Apparatus",
+            ":./apparatus.png" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Armor, "Armor", ":./armor.png" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Book, "Book", ":./book.png" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Clothing, "Clothing", ":./clothing.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Container, "Container", ":./container.png" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Container, "Container",
+            ":./container.png" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Creature, "Creature", ":./creature.png" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Door, "Door", ":./door.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Ingredient, "Ingredient", ":./ingredient.png" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Ingredient, "Ingredient",
+            ":./ingredient.png" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_CreatureLevelledList,
             "Creature Levelled List", ":./levelled-creature.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_ItemLevelledList,
-            "Item Levelled List", ":./levelled-item.png" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_ItemLevelledList, "Item Levelled List",
+            ":./levelled-item.png" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Light, "Light", ":./light.png" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Lockpick, "Lockpick", ":./lockpick.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Miscellaneous,
-            "Miscellaneous", ":./miscellaneous.png" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Miscellaneous, "Miscellaneous",
+            ":./miscellaneous.png" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Npc, "NPC", ":./npc.png" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Probe, "Probe", ":./probe.png" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Repair, "Repair", ":./repair.png" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Static, "Static", ":./static.png" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Weapon, "Weapon", ":./weapon.png" },
-        { CSMWorld::UniversalId::Class_SubRecord, CSMWorld::UniversalId::Type_Reference, "Instance", ":./instance.png" },
+        { CSMWorld::UniversalId::Class_SubRecord, CSMWorld::UniversalId::Type_Reference, "Instance",
+            ":./instance.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Filter, "Filter", ":./filter.png" },
         { CSMWorld::UniversalId::Class_Collection, CSMWorld::UniversalId::Type_Scene, "Scene", ":./scene.png" },
-        { CSMWorld::UniversalId::Class_Collection, CSMWorld::UniversalId::Type_Preview, "Preview", ":./record-preview.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Enchantment, "Enchantment", ":./enchantment.png" },
+        { CSMWorld::UniversalId::Class_Collection, CSMWorld::UniversalId::Type_Preview, "Preview",
+            ":./record-preview.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Enchantment, "Enchantment",
+            ":./enchantment.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_BodyPart, "Body Part", ":./body-part.png" },
-        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Mesh, "Mesh", ":./resources-mesh"},
-        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Icon, "Icon", ":./resources-icon"},
+        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Mesh, "Mesh", ":./resources-mesh" },
+        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Icon, "Icon", ":./resources-icon" },
         { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Music, "Music", ":./resources-music" },
-        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_SoundRes, "Sound File", ":./resources-sound" },
-        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Texture, "Texture", ":./resources-texture" },
+        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_SoundRes, "Sound File",
+            ":./resources-sound" },
+        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Texture, "Texture",
+            ":./resources-texture" },
         { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Video, "Video", ":./resources-video" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_DebugProfile, "Debug Profile", ":./debug-profile.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_SoundGen, "Sound Generator", ":./sound-generator.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_MagicEffect, "Magic Effect", ":./magic-effect.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_DebugProfile, "Debug Profile",
+            ":./debug-profile.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_SoundGen, "Sound Generator",
+            ":./sound-generator.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_MagicEffect, "Magic Effect",
+            ":./magic-effect.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Land, "Land", ":./land-heightmap.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_LandTexture, "Land Texture", ":./land-texture.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_LandTexture, "Land Texture",
+            ":./land-texture.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Pathgrid, "Pathgrid", ":./pathgrid.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_StartScript, "Start Script", ":./start-script.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_StartScript, "Start Script",
+            ":./start-script.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_MetaData, "Metadata", ":./metadata.png" },
         // end marker
         { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0, 0 },
     };
 
-    static const TypeData sIndexArg[] =
-    {
-        { CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_VerificationResults, "Verification Results", ":./menu-verify.png" },
-        { CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_LoadErrorLog, "Load Error Log", ":./error-log.png" },
-        { CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_Search, "Global Search", ":./menu-search.png" },
+    static const TypeData sIndexArg[] = {
+        { CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_VerificationResults,
+            "Verification Results", ":./menu-verify.png" },
+        { CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_LoadErrorLog, "Load Error Log",
+            ":./error-log.png" },
+        { CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_Search, "Global Search",
+            ":./menu-search.png" },
         // end marker
         { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0, 0 },
     };
 }
 
-CSMWorld::UniversalId::UniversalId (const std::string& universalId)
-: mIndex(0)
+CSMWorld::UniversalId::UniversalId(const std::string& universalId)
+    : mIndex(0)
 {
-    std::string::size_type index = universalId.find (':');
+    std::string::size_type index = universalId.find(':');
 
-    if (index!=std::string::npos)
+    if (index != std::string::npos)
     {
-        std::string type = universalId.substr (0, index);
+        std::string type = universalId.substr(0, index);
 
-        for (int i=0; sIdArg[i].mName; ++i)
-            if (type==sIdArg[i].mName)
+        for (int i = 0; sIdArg[i].mName; ++i)
+            if (type == sIdArg[i].mName)
             {
                 mArgumentType = ArgumentType_Id;
                 mType = sIdArg[i].mType;
                 mClass = sIdArg[i].mClass;
-                mId = universalId.substr (index+2);
+                mId = universalId.substr(index + 2);
                 return;
             }
 
-        for (int i=0; sIndexArg[i].mName; ++i)
-            if (type==sIndexArg[i].mName)
+        for (int i = 0; sIndexArg[i].mName; ++i)
+            if (type == sIndexArg[i].mName)
             {
                 mArgumentType = ArgumentType_Index;
                 mType = sIndexArg[i].mType;
                 mClass = sIndexArg[i].mClass;
 
-                std::istringstream stream (universalId.substr (index+2));
+                std::istringstream stream(universalId.substr(index + 2));
 
                 if (stream >> mIndex)
                     return;
@@ -171,8 +213,8 @@ CSMWorld::UniversalId::UniversalId (const std::string& universalId)
     }
     else
     {
-        for (int i=0; sNoArg[i].mName; ++i)
-            if (universalId==sNoArg[i].mName)
+        for (int i = 0; sNoArg[i].mName; ++i)
+            if (universalId == sNoArg[i].mName)
             {
                 mArgumentType = ArgumentType_None;
                 mType = sNoArg[i].mType;
@@ -181,60 +223,68 @@ CSMWorld::UniversalId::UniversalId (const std::string& universalId)
             }
     }
 
-    throw std::runtime_error ("invalid UniversalId: " + universalId);
+    throw std::runtime_error("invalid UniversalId: " + universalId);
 }
 
-CSMWorld::UniversalId::UniversalId (Type type) : mArgumentType (ArgumentType_None), mType (type), mIndex (0)
+CSMWorld::UniversalId::UniversalId(Type type)
+    : mArgumentType(ArgumentType_None)
+    , mType(type)
+    , mIndex(0)
 {
-    for (int i=0; sNoArg[i].mName; ++i)
-        if (type==sNoArg[i].mType)
+    for (int i = 0; sNoArg[i].mName; ++i)
+        if (type == sNoArg[i].mType)
         {
             mClass = sNoArg[i].mClass;
             return;
         }
 
-    for (int i=0; sIdArg[i].mName; ++i)
-        if (type==sIdArg[i].mType)
+    for (int i = 0; sIdArg[i].mName; ++i)
+        if (type == sIdArg[i].mType)
         {
             mArgumentType = ArgumentType_Id;
             mClass = sIdArg[i].mClass;
             return;
         }
 
-    for (int i=0; sIndexArg[i].mName; ++i)
-        if (type==sIndexArg[i].mType)
+    for (int i = 0; sIndexArg[i].mName; ++i)
+        if (type == sIndexArg[i].mType)
         {
             mArgumentType = ArgumentType_Index;
             mClass = sIndexArg[i].mClass;
             return;
         }
 
-    throw std::logic_error ("invalid argument-less UniversalId type");
+    throw std::logic_error("invalid argument-less UniversalId type");
 }
 
-CSMWorld::UniversalId::UniversalId (Type type, const std::string& id)
-: mArgumentType (ArgumentType_Id), mType (type), mId (id), mIndex (0)
+CSMWorld::UniversalId::UniversalId(Type type, const std::string& id)
+    : mArgumentType(ArgumentType_Id)
+    , mType(type)
+    , mId(id)
+    , mIndex(0)
 {
-    for (int i=0; sIdArg[i].mName; ++i)
-        if (type==sIdArg[i].mType)
+    for (int i = 0; sIdArg[i].mName; ++i)
+        if (type == sIdArg[i].mType)
         {
             mClass = sIdArg[i].mClass;
             return;
         }
-    throw std::logic_error ("invalid ID argument UniversalId type");
+    throw std::logic_error("invalid ID argument UniversalId type");
 }
 
-CSMWorld::UniversalId::UniversalId (Type type, int index)
-: mArgumentType (ArgumentType_Index), mType (type), mIndex (index)
+CSMWorld::UniversalId::UniversalId(Type type, int index)
+    : mArgumentType(ArgumentType_Index)
+    , mType(type)
+    , mIndex(index)
 {
-    for (int i=0; sIndexArg[i].mName; ++i)
-        if (type==sIndexArg[i].mType)
+    for (int i = 0; sIndexArg[i].mName; ++i)
+        if (type == sIndexArg[i].mType)
         {
             mClass = sIndexArg[i].mClass;
             return;
         }
 
-    throw std::logic_error ("invalid index argument UniversalId type");
+    throw std::logic_error("invalid index argument UniversalId type");
 }
 
 CSMWorld::UniversalId::Class CSMWorld::UniversalId::getClass() const
@@ -254,61 +304,67 @@ CSMWorld::UniversalId::Type CSMWorld::UniversalId::getType() const
 
 const std::string& CSMWorld::UniversalId::getId() const
 {
-    if (mArgumentType!=ArgumentType_Id)
-        throw std::logic_error ("invalid access to ID of non-ID UniversalId");
+    if (mArgumentType != ArgumentType_Id)
+        throw std::logic_error("invalid access to ID of non-ID UniversalId");
 
     return mId;
 }
 
 int CSMWorld::UniversalId::getIndex() const
 {
-    if (mArgumentType!=ArgumentType_Index)
-        throw std::logic_error ("invalid access to index of non-index UniversalId");
+    if (mArgumentType != ArgumentType_Index)
+        throw std::logic_error("invalid access to index of non-index UniversalId");
 
     return mIndex;
 }
 
-bool CSMWorld::UniversalId::isEqual (const UniversalId& universalId) const
+bool CSMWorld::UniversalId::isEqual(const UniversalId& universalId) const
 {
-    if (mClass!=universalId.mClass || mArgumentType!=universalId.mArgumentType || mType!=universalId.mType)
-            return false;
+    if (mClass != universalId.mClass || mArgumentType != universalId.mArgumentType || mType != universalId.mType)
+        return false;
 
     switch (mArgumentType)
     {
-        case ArgumentType_Id: return mId==universalId.mId;
-        case ArgumentType_Index: return mIndex==universalId.mIndex;
+        case ArgumentType_Id:
+            return mId == universalId.mId;
+        case ArgumentType_Index:
+            return mIndex == universalId.mIndex;
 
-        default: return true;
+        default:
+            return true;
     }
 }
 
-bool CSMWorld::UniversalId::isLess (const UniversalId& universalId) const
+bool CSMWorld::UniversalId::isLess(const UniversalId& universalId) const
 {
-    if (mType<universalId.mType)
+    if (mType < universalId.mType)
         return true;
 
-    if (mType>universalId.mType)
+    if (mType > universalId.mType)
         return false;
 
     switch (mArgumentType)
     {
-        case ArgumentType_Id: return mId<universalId.mId;
-        case ArgumentType_Index: return mIndex<universalId.mIndex;
+        case ArgumentType_Id:
+            return mId < universalId.mId;
+        case ArgumentType_Index:
+            return mIndex < universalId.mIndex;
 
-        default: return false;
+        default:
+            return false;
     }
 }
 
 std::string CSMWorld::UniversalId::getTypeName() const
 {
-    const TypeData *typeData = mArgumentType==ArgumentType_None ? sNoArg :
-        (mArgumentType==ArgumentType_Id ? sIdArg : sIndexArg);
+    const TypeData* typeData
+        = mArgumentType == ArgumentType_None ? sNoArg : (mArgumentType == ArgumentType_Id ? sIdArg : sIndexArg);
 
-    for (int i=0; typeData[i].mName; ++i)
-        if (typeData[i].mType==mType)
+    for (int i = 0; typeData[i].mName; ++i)
+        if (typeData[i].mType == mType)
             return typeData[i].mName;
 
-    throw std::logic_error ("failed to retrieve UniversalId type name");
+    throw std::logic_error("failed to retrieve UniversalId type name");
 }
 
 std::string CSMWorld::UniversalId::toString() const
@@ -319,9 +375,14 @@ std::string CSMWorld::UniversalId::toString() const
 
     switch (mArgumentType)
     {
-        case ArgumentType_None: break;
-        case ArgumentType_Id: stream << ": " << mId; break;
-        case ArgumentType_Index: stream << ": " << mIndex; break;
+        case ArgumentType_None:
+            break;
+        case ArgumentType_Id:
+            stream << ": " << mId;
+            break;
+        case ArgumentType_Index:
+            stream << ": " << mIndex;
+            break;
     }
 
     return stream.str();
@@ -329,61 +390,61 @@ std::string CSMWorld::UniversalId::toString() const
 
 std::string CSMWorld::UniversalId::getIcon() const
 {
-    const TypeData *typeData = mArgumentType==ArgumentType_None ? sNoArg :
-        (mArgumentType==ArgumentType_Id ? sIdArg : sIndexArg);
+    const TypeData* typeData
+        = mArgumentType == ArgumentType_None ? sNoArg : (mArgumentType == ArgumentType_Id ? sIdArg : sIndexArg);
 
-    for (int i=0; typeData[i].mName; ++i)
-        if (typeData[i].mType==mType)
+    for (int i = 0; typeData[i].mName; ++i)
+        if (typeData[i].mType == mType)
             return typeData[i].mIcon ? typeData[i].mIcon : ":placeholder";
 
-    throw std::logic_error ("failed to retrieve UniversalId type icon");
+    throw std::logic_error("failed to retrieve UniversalId type icon");
 }
 
 std::vector<CSMWorld::UniversalId::Type> CSMWorld::UniversalId::listReferenceableTypes()
 {
     std::vector<CSMWorld::UniversalId::Type> list;
 
-    for (int i=0; sIdArg[i].mName; ++i)
-        if (sIdArg[i].mClass==Class_RefRecord)
-            list.push_back (sIdArg[i].mType);
+    for (int i = 0; sIdArg[i].mName; ++i)
+        if (sIdArg[i].mClass == Class_RefRecord)
+            list.push_back(sIdArg[i].mType);
 
     return list;
 }
 
-std::vector<CSMWorld::UniversalId::Type> CSMWorld::UniversalId::listTypes (int classes)
+std::vector<CSMWorld::UniversalId::Type> CSMWorld::UniversalId::listTypes(int classes)
 {
     std::vector<CSMWorld::UniversalId::Type> list;
 
-    for (int i=0; sNoArg[i].mName; ++i)
+    for (int i = 0; sNoArg[i].mName; ++i)
         if (sNoArg[i].mClass & classes)
-            list.push_back (sNoArg[i].mType);
+            list.push_back(sNoArg[i].mType);
 
-    for (int i=0; sIdArg[i].mName; ++i)
+    for (int i = 0; sIdArg[i].mName; ++i)
         if (sIdArg[i].mClass & classes)
-            list.push_back (sIdArg[i].mType);
+            list.push_back(sIdArg[i].mType);
 
-    for (int i=0; sIndexArg[i].mName; ++i)
+    for (int i = 0; sIndexArg[i].mName; ++i)
         if (sIndexArg[i].mClass & classes)
-            list.push_back (sIndexArg[i].mType);
+            list.push_back(sIndexArg[i].mType);
 
     return list;
 }
 
-CSMWorld::UniversalId::Type CSMWorld::UniversalId::getParentType (Type type)
+CSMWorld::UniversalId::Type CSMWorld::UniversalId::getParentType(Type type)
 {
-    for (int i=0; sIdArg[i].mType; ++i)
-        if (type==sIdArg[i].mType)
+    for (int i = 0; sIdArg[i].mType; ++i)
+        if (type == sIdArg[i].mType)
         {
-            if (sIdArg[i].mClass==Class_RefRecord)
+            if (sIdArg[i].mClass == Class_RefRecord)
                 return Type_Referenceables;
 
-            if (sIdArg[i].mClass==Class_SubRecord || sIdArg[i].mClass==Class_Record ||
-                sIdArg[i].mClass==Class_Resource)
+            if (sIdArg[i].mClass == Class_SubRecord || sIdArg[i].mClass == Class_Record
+                || sIdArg[i].mClass == Class_Resource)
             {
-                if (type==Type_Cell_Missing)
+                if (type == Type_Cell_Missing)
                     return Type_Cells;
 
-                return static_cast<Type> (type-1);
+                return static_cast<Type>(type - 1);
             }
 
             break;
@@ -392,17 +453,17 @@ CSMWorld::UniversalId::Type CSMWorld::UniversalId::getParentType (Type type)
     return Type_None;
 }
 
-bool CSMWorld::operator== (const CSMWorld::UniversalId& left, const CSMWorld::UniversalId& right)
+bool CSMWorld::operator==(const CSMWorld::UniversalId& left, const CSMWorld::UniversalId& right)
 {
-    return left.isEqual (right);
+    return left.isEqual(right);
 }
 
-bool CSMWorld::operator!= (const CSMWorld::UniversalId& left, const CSMWorld::UniversalId& right)
+bool CSMWorld::operator!=(const CSMWorld::UniversalId& left, const CSMWorld::UniversalId& right)
 {
-    return !left.isEqual (right);
+    return !left.isEqual(right);
 }
 
-bool CSMWorld::operator< (const UniversalId& left, const UniversalId& right)
+bool CSMWorld::operator<(const UniversalId& left, const UniversalId& right)
 {
-    return left.isLess (right);
+    return left.isLess(right);
 }
diff --git a/apps/opencs/model/world/universalid.hpp b/apps/opencs/model/world/universalid.hpp
index 09fd8f3bb9..5db1f02f1e 100644
--- a/apps/opencs/model/world/universalid.hpp
+++ b/apps/opencs/model/world/universalid.hpp
@@ -10,196 +10,196 @@ namespace CSMWorld
 {
     class UniversalId
     {
-        public:
-
-            enum Class
-            {
-                Class_None = 0,
-                Class_Record = 1,
-                Class_RefRecord = 2, // referenceable record
-                Class_SubRecord = 4,
-                Class_RecordList = 8,
-                Class_Collection = 16, // multiple types of records combined
-                Class_Transient = 32, // not part of the world data or the project data
-                Class_NonRecord = 64, // record like data that is not part of the world
-                Class_Resource = 128, ///< \attention Resource IDs are unique only within the
-                                /// respective collection
-                Class_ResourceList = 256
-            };
-
-            enum ArgumentType
-            {
-                ArgumentType_None,
-                ArgumentType_Id,
-                ArgumentType_Index
-            };
-
-            /// \note A record list type must always be immediately followed by the matching
-            /// record type, if this type is of class SubRecord or Record.
-            enum Type
-            {
-                Type_None = 0,
-                Type_Globals,
-                Type_Global,
-                Type_VerificationResults,
-                Type_Gmsts,
-                Type_Gmst,
-                Type_Skills,
-                Type_Skill,
-                Type_Classes,
-                Type_Class,
-                Type_Factions,
-                Type_Faction,
-                Type_Races,
-                Type_Race,
-                Type_Sounds,
-                Type_Sound,
-                Type_Scripts,
-                Type_Script,
-                Type_Regions,
-                Type_Region,
-                Type_Birthsigns,
-                Type_Birthsign,
-                Type_Spells,
-                Type_Spell,
-                Type_Cells,
-                Type_Cell,
-                Type_Cell_Missing, //For cells that does not exist yet.
-                Type_Referenceables,
-                Type_Referenceable,
-                Type_Activator,
-                Type_Potion,
-                Type_Apparatus,
-                Type_Armor,
-                Type_Book,
-                Type_Clothing,
-                Type_Container,
-                Type_Creature,
-                Type_Door,
-                Type_Ingredient,
-                Type_CreatureLevelledList,
-                Type_ItemLevelledList,
-                Type_Light,
-                Type_Lockpick,
-                Type_Miscellaneous,
-                Type_Npc,
-                Type_Probe,
-                Type_Repair,
-                Type_Static,
-                Type_Weapon,
-                Type_References,
-                Type_Reference,
-                Type_RegionMap,
-                Type_Filters,
-                Type_Filter,
-                Type_Topics,
-                Type_Topic,
-                Type_Journals,
-                Type_Journal,
-                Type_TopicInfos,
-                Type_TopicInfo,
-                Type_JournalInfos,
-                Type_JournalInfo,
-                Type_Scene,
-                Type_Preview,
-                Type_LoadErrorLog,
-                Type_Enchantments,
-                Type_Enchantment,
-                Type_BodyParts,
-                Type_BodyPart,
-                Type_Meshes,
-                Type_Mesh,
-                Type_Icons,
-                Type_Icon,
-                Type_Musics,
-                Type_Music,
-                Type_SoundsRes,
-                Type_SoundRes,
-                Type_Textures,
-                Type_Texture,
-                Type_Videos,
-                Type_Video,
-                Type_DebugProfiles,
-                Type_DebugProfile,
-                Type_SoundGens,
-                Type_SoundGen,
-                Type_MagicEffects,
-                Type_MagicEffect,
-                Type_Lands,
-                Type_Land,
-                Type_LandTextures,
-                Type_LandTexture,
-                Type_Pathgrids,
-                Type_Pathgrid,
-                Type_StartScripts,
-                Type_StartScript,
-                Type_Search,
-                Type_MetaDatas,
-                Type_MetaData,
-                Type_RunLog
-            };
-
-            enum { NumberOfTypes = Type_RunLog+1 };
-
-        private:
-
-            Class mClass;
-            ArgumentType mArgumentType;
-            Type mType;
-            std::string mId;
-            int mIndex;
-
-        public:
-
-            UniversalId (const std::string& universalId);
-
-            UniversalId (Type type = Type_None);
-
-            UniversalId (Type type, const std::string& id);
-            ///< Using a type for a non-ID-argument UniversalId will throw an exception.
-
-            UniversalId (Type type, int index);
-            ///< Using a type for a non-index-argument UniversalId will throw an exception.
-
-            Class getClass() const;
-
-            ArgumentType getArgumentType() const;
-
-            Type getType() const;
-
-            const std::string& getId() const;
-            ///< Calling this function for a non-ID type will throw an exception.
-
-            int getIndex() const;
-            ///< Calling this function for a non-index type will throw an exception.
-
-            bool isEqual (const UniversalId& universalId) const;
-
-            bool isLess (const UniversalId& universalId) const;
-
-            std::string getTypeName() const;
-
-            std::string toString() const;
-
-            std::string getIcon() const;
-            ///< Will return an empty string, if no icon is available.
-
-            static std::vector<Type> listReferenceableTypes();
-
-            static std::vector<Type> listTypes (int classes);
-
-            /// If \a type is a SubRecord, RefRecord or Record type return the type of the table
-            /// that contains records of type \a type.
-            /// Otherwise return Type_None.
-            static Type getParentType (Type type);
+    public:
+        enum Class
+        {
+            Class_None = 0,
+            Class_Record = 1,
+            Class_RefRecord = 2, // referenceable record
+            Class_SubRecord = 4,
+            Class_RecordList = 8,
+            Class_Collection = 16, // multiple types of records combined
+            Class_Transient = 32, // not part of the world data or the project data
+            Class_NonRecord = 64, // record like data that is not part of the world
+            Class_Resource = 128, ///< \attention Resource IDs are unique only within the
+                                  /// respective collection
+            Class_ResourceList = 256
+        };
+
+        enum ArgumentType
+        {
+            ArgumentType_None,
+            ArgumentType_Id,
+            ArgumentType_Index
+        };
+
+        /// \note A record list type must always be immediately followed by the matching
+        /// record type, if this type is of class SubRecord or Record.
+        enum Type
+        {
+            Type_None = 0,
+            Type_Globals,
+            Type_Global,
+            Type_VerificationResults,
+            Type_Gmsts,
+            Type_Gmst,
+            Type_Skills,
+            Type_Skill,
+            Type_Classes,
+            Type_Class,
+            Type_Factions,
+            Type_Faction,
+            Type_Races,
+            Type_Race,
+            Type_Sounds,
+            Type_Sound,
+            Type_Scripts,
+            Type_Script,
+            Type_Regions,
+            Type_Region,
+            Type_Birthsigns,
+            Type_Birthsign,
+            Type_Spells,
+            Type_Spell,
+            Type_Cells,
+            Type_Cell,
+            Type_Cell_Missing, // For cells that does not exist yet.
+            Type_Referenceables,
+            Type_Referenceable,
+            Type_Activator,
+            Type_Potion,
+            Type_Apparatus,
+            Type_Armor,
+            Type_Book,
+            Type_Clothing,
+            Type_Container,
+            Type_Creature,
+            Type_Door,
+            Type_Ingredient,
+            Type_CreatureLevelledList,
+            Type_ItemLevelledList,
+            Type_Light,
+            Type_Lockpick,
+            Type_Miscellaneous,
+            Type_Npc,
+            Type_Probe,
+            Type_Repair,
+            Type_Static,
+            Type_Weapon,
+            Type_References,
+            Type_Reference,
+            Type_RegionMap,
+            Type_Filters,
+            Type_Filter,
+            Type_Topics,
+            Type_Topic,
+            Type_Journals,
+            Type_Journal,
+            Type_TopicInfos,
+            Type_TopicInfo,
+            Type_JournalInfos,
+            Type_JournalInfo,
+            Type_Scene,
+            Type_Preview,
+            Type_LoadErrorLog,
+            Type_Enchantments,
+            Type_Enchantment,
+            Type_BodyParts,
+            Type_BodyPart,
+            Type_Meshes,
+            Type_Mesh,
+            Type_Icons,
+            Type_Icon,
+            Type_Musics,
+            Type_Music,
+            Type_SoundsRes,
+            Type_SoundRes,
+            Type_Textures,
+            Type_Texture,
+            Type_Videos,
+            Type_Video,
+            Type_DebugProfiles,
+            Type_DebugProfile,
+            Type_SoundGens,
+            Type_SoundGen,
+            Type_MagicEffects,
+            Type_MagicEffect,
+            Type_Lands,
+            Type_Land,
+            Type_LandTextures,
+            Type_LandTexture,
+            Type_Pathgrids,
+            Type_Pathgrid,
+            Type_StartScripts,
+            Type_StartScript,
+            Type_Search,
+            Type_MetaDatas,
+            Type_MetaData,
+            Type_RunLog
+        };
+
+        enum
+        {
+            NumberOfTypes = Type_RunLog + 1
+        };
+
+    private:
+        Class mClass;
+        ArgumentType mArgumentType;
+        Type mType;
+        std::string mId;
+        int mIndex;
+
+    public:
+        UniversalId(const std::string& universalId);
+
+        UniversalId(Type type = Type_None);
+
+        UniversalId(Type type, const std::string& id);
+        ///< Using a type for a non-ID-argument UniversalId will throw an exception.
+
+        UniversalId(Type type, int index);
+        ///< Using a type for a non-index-argument UniversalId will throw an exception.
+
+        Class getClass() const;
+
+        ArgumentType getArgumentType() const;
+
+        Type getType() const;
+
+        const std::string& getId() const;
+        ///< Calling this function for a non-ID type will throw an exception.
+
+        int getIndex() const;
+        ///< Calling this function for a non-index type will throw an exception.
+
+        bool isEqual(const UniversalId& universalId) const;
+
+        bool isLess(const UniversalId& universalId) const;
+
+        std::string getTypeName() const;
+
+        std::string toString() const;
+
+        std::string getIcon() const;
+        ///< Will return an empty string, if no icon is available.
+
+        static std::vector<Type> listReferenceableTypes();
+
+        static std::vector<Type> listTypes(int classes);
+
+        /// If \a type is a SubRecord, RefRecord or Record type return the type of the table
+        /// that contains records of type \a type.
+        /// Otherwise return Type_None.
+        static Type getParentType(Type type);
     };
 
-    bool operator== (const UniversalId& left, const UniversalId& right);
-    bool operator!= (const UniversalId& left, const UniversalId& right);
+    bool operator==(const UniversalId& left, const UniversalId& right);
+    bool operator!=(const UniversalId& left, const UniversalId& right);
 
-    bool operator< (const UniversalId& left, const UniversalId& right);
+    bool operator<(const UniversalId& left, const UniversalId& right);
 }
 
-Q_DECLARE_METATYPE (CSMWorld::UniversalId)
+Q_DECLARE_METATYPE(CSMWorld::UniversalId)
 
 #endif
diff --git a/apps/opencs/view/doc/adjusterwidget.cpp b/apps/opencs/view/doc/adjusterwidget.cpp
index 6dfd6b9d3e..d3014c9f09 100644
--- a/apps/opencs/view/doc/adjusterwidget.cpp
+++ b/apps/opencs/view/doc/adjusterwidget.cpp
@@ -9,32 +9,34 @@
 #include <components/misc/strings/conversion.hpp>
 #include <components/misc/strings/lower.hpp>
 
-CSVDoc::AdjusterWidget::AdjusterWidget (QWidget *parent)
-    : QWidget (parent), mValid (false), mAction (ContentAction_Undefined)
+CSVDoc::AdjusterWidget::AdjusterWidget(QWidget* parent)
+    : QWidget(parent)
+    , mValid(false)
+    , mAction(ContentAction_Undefined)
 {
-    QHBoxLayout *layout = new QHBoxLayout (this);
+    QHBoxLayout* layout = new QHBoxLayout(this);
 
-    mIcon = new QLabel (this);
+    mIcon = new QLabel(this);
 
-    layout->addWidget (mIcon, 0);
+    layout->addWidget(mIcon, 0);
 
-    mMessage = new QLabel (this);
-    mMessage->setWordWrap (true);
-    mMessage->setSizePolicy (QSizePolicy (QSizePolicy::Minimum, QSizePolicy::Minimum));
+    mMessage = new QLabel(this);
+    mMessage->setWordWrap(true);
+    mMessage->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
 
-    layout->addWidget (mMessage, 1);
+    layout->addWidget(mMessage, 1);
 
-    setName ("", false);
+    setName("", false);
 
-    setLayout (layout);
+    setLayout(layout);
 }
 
-void CSVDoc::AdjusterWidget::setAction (ContentAction action)
+void CSVDoc::AdjusterWidget::setAction(ContentAction action)
 {
     mAction = action;
 }
 
-void CSVDoc::AdjusterWidget::setLocalData (const std::filesystem::path& localData)
+void CSVDoc::AdjusterWidget::setLocalData(const std::filesystem::path& localData)
 {
     mLocalData = localData;
 }
@@ -42,7 +44,7 @@ void CSVDoc::AdjusterWidget::setLocalData (const std::filesystem::path& localDat
 std::filesystem::path CSVDoc::AdjusterWidget::getPath() const
 {
     if (!mValid)
-        throw std::logic_error ("invalid content file path");
+        throw std::logic_error("invalid content file path");
 
     return mResultPath;
 }
@@ -52,12 +54,12 @@ bool CSVDoc::AdjusterWidget::isValid() const
     return mValid;
 }
 
-void CSVDoc::AdjusterWidget::setFilenameCheck (bool doCheck)
+void CSVDoc::AdjusterWidget::setFilenameCheck(bool doCheck)
 {
     mDoFilenameCheck = doCheck;
 }
 
-void CSVDoc::AdjusterWidget::setName (const QString& name, bool addon)
+void CSVDoc::AdjusterWidget::setName(const QString& name, bool addon)
 {
     QString message;
 
@@ -74,23 +76,22 @@ void CSVDoc::AdjusterWidget::setName (const QString& name, bool addon)
 
         const auto extension = Misc::StringUtils::lowerCase(path.extension().u8string());
 
-        bool isLegacyPath = (extension == u8".esm" ||
-                             extension == u8".esp");
+        bool isLegacyPath = (extension == u8".esm" || extension == u8".esp");
 
         bool isFilePathChanged = (path.parent_path() != mLocalData);
 
         if (isLegacyPath)
-            path.replace_extension (addon ? ".omwaddon" : ".omwgame");
+            path.replace_extension(addon ? ".omwaddon" : ".omwgame");
 
-        //if the file came from data-local and is not a legacy file to be converted,
-        //don't worry about doing a file check.
+        // if the file came from data-local and is not a legacy file to be converted,
+        // don't worry about doing a file check.
         if (!isFilePathChanged && !isLegacyPath)
         {
             // path already points to the local data directory
             message = "Will be saved as: " + Files::pathToQString(path);
             mResultPath = path;
         }
-        //in all other cases, ensure the path points to data-local and do an existing file check
+        // in all other cases, ensure the path points to data-local and do an existing file check
         else
         {
             // path points somewhere else or is a leaf name.
@@ -100,7 +101,7 @@ void CSVDoc::AdjusterWidget::setName (const QString& name, bool addon)
             message = "Will be saved as: " + Files::pathToQString(path);
             mResultPath = path;
 
-            if (std::filesystem::exists (path))
+            if (std::filesystem::exists(path))
             {
                 /// \todo add an user setting to make this an error.
                 message += "<p>A file with the same name already exists. If you continue, it will be overwritten.";
@@ -109,10 +110,12 @@ void CSVDoc::AdjusterWidget::setName (const QString& name, bool addon)
         }
     }
 
-    mMessage->setText (message);
-    mIcon->setPixmap (style()->standardIcon (
-        mValid ? (warning ? QStyle::SP_MessageBoxWarning : QStyle::SP_MessageBoxInformation) : QStyle::SP_MessageBoxCritical).
-        pixmap (QSize (16, 16)));
+    mMessage->setText(message);
+    mIcon->setPixmap(
+        style()
+            ->standardIcon(mValid ? (warning ? QStyle::SP_MessageBoxWarning : QStyle::SP_MessageBoxInformation)
+                                  : QStyle::SP_MessageBoxCritical)
+            .pixmap(QSize(16, 16)));
 
-    emit stateChanged (mValid);
+    emit stateChanged(mValid);
 }
diff --git a/apps/opencs/view/doc/adjusterwidget.hpp b/apps/opencs/view/doc/adjusterwidget.hpp
index 7e6330a652..53192d8414 100644
--- a/apps/opencs/view/doc/adjusterwidget.hpp
+++ b/apps/opencs/view/doc/adjusterwidget.hpp
@@ -1,7 +1,6 @@
 #ifndef CSV_DOC_ADJUSTERWIDGET_H
 #define CSV_DOC_ADJUSTERWIDGET_H
 
-
 #include <QWidget>
 
 #include <filesystem>
@@ -19,38 +18,36 @@ namespace CSVDoc
 
     class AdjusterWidget : public QWidget
     {
-            Q_OBJECT
-
-        public:
-
-            std::filesystem::path mLocalData;
-            QLabel *mMessage;
-            QLabel *mIcon;
-            bool mValid;
-            std::filesystem::path mResultPath;
-            ContentAction mAction;
-            bool mDoFilenameCheck;
+        Q_OBJECT
 
-        public:
+    public:
+        std::filesystem::path mLocalData;
+        QLabel* mMessage;
+        QLabel* mIcon;
+        bool mValid;
+        std::filesystem::path mResultPath;
+        ContentAction mAction;
+        bool mDoFilenameCheck;
 
-            AdjusterWidget (QWidget *parent = nullptr);
+    public:
+        AdjusterWidget(QWidget* parent = nullptr);
 
-            void setLocalData (const std::filesystem::path& localData);
-            void setAction (ContentAction action);
+        void setLocalData(const std::filesystem::path& localData);
+        void setAction(ContentAction action);
 
-            void setFilenameCheck (bool doCheck);
-            bool isValid() const;
+        void setFilenameCheck(bool doCheck);
+        bool isValid() const;
 
-            std::filesystem::path getPath() const;
-            ///< This function must not be called if there is no valid path.
+        std::filesystem::path getPath() const;
+        ///< This function must not be called if there is no valid path.
 
-        public slots:
+    public slots:
 
-            void setName (const QString& name, bool addon);
+        void setName(const QString& name, bool addon);
 
-        signals:
+    signals:
 
-            void stateChanged (bool valid);
+        void stateChanged(bool valid);
     };
 }
 
diff --git a/apps/opencs/view/doc/filedialog.cpp b/apps/opencs/view/doc/filedialog.cpp
index 5a7852b4db..ee52f153c7 100644
--- a/apps/opencs/view/doc/filedialog.cpp
+++ b/apps/opencs/view/doc/filedialog.cpp
@@ -1,23 +1,28 @@
 #include "filedialog.hpp"
 
-#include <QPushButton>
 #include <QDialogButtonBox>
+#include <QPushButton>
 
 #include "components/contentselector/model/esmfile.hpp"
 #include "components/contentselector/view/contentselector.hpp"
 
-#include "filewidget.hpp"
 #include "adjusterwidget.hpp"
+#include "filewidget.hpp"
 
-CSVDoc::FileDialog::FileDialog(QWidget *parent) :
-    QDialog(parent), mSelector (nullptr), mAction(ContentAction_Undefined), mFileWidget (nullptr), mAdjusterWidget (nullptr), mDialogBuilt(false)
+CSVDoc::FileDialog::FileDialog(QWidget* parent)
+    : QDialog(parent)
+    , mSelector(nullptr)
+    , mAction(ContentAction_Undefined)
+    , mFileWidget(nullptr)
+    , mAdjusterWidget(nullptr)
+    , mDialogBuilt(false)
 {
-    ui.setupUi (this);
+    ui.setupUi(this);
     resize(400, 400);
 
-    setObjectName ("FileDialog");
-    mSelector = new ContentSelectorView::ContentSelector (ui.contentSelectorWidget, /*showOMWScripts=*/false);
-    mAdjusterWidget = new AdjusterWidget (this);
+    setObjectName("FileDialog");
+    mSelector = new ContentSelectorView::ContentSelector(ui.contentSelectorWidget, /*showOMWScripts=*/false);
+    mAdjusterWidget = new AdjusterWidget(this);
 }
 
 void CSVDoc::FileDialog::addFiles(const std::vector<std::filesystem::path>& dataDirs)
@@ -30,7 +35,7 @@ void CSVDoc::FileDialog::addFiles(const std::vector<std::filesystem::path>& data
     mSelector->sortFiles();
 }
 
-void CSVDoc::FileDialog::setEncoding(const QString &encoding)
+void CSVDoc::FileDialog::setEncoding(const QString& encoding)
 {
     mSelector->setEncoding(encoding);
 }
@@ -44,46 +49,46 @@ QStringList CSVDoc::FileDialog::selectedFilePaths()
 {
     QStringList filePaths;
 
-    for (ContentSelectorModel::EsmFile *file : mSelector->selectedFiles() )
+    for (ContentSelectorModel::EsmFile* file : mSelector->selectedFiles())
         filePaths.append(file->filePath());
 
     return filePaths;
 }
 
-void CSVDoc::FileDialog::setLocalData (const std::filesystem::path& localData)
+void CSVDoc::FileDialog::setLocalData(const std::filesystem::path& localData)
 {
-    mAdjusterWidget->setLocalData (localData);
+    mAdjusterWidget->setLocalData(localData);
 }
 
-void CSVDoc::FileDialog::showDialog (ContentAction action)
+void CSVDoc::FileDialog::showDialog(ContentAction action)
 {
     mAction = action;
 
-    ui.projectGroupBoxLayout->insertWidget (0, mAdjusterWidget);
+    ui.projectGroupBoxLayout->insertWidget(0, mAdjusterWidget);
 
     switch (mAction)
     {
-    case ContentAction_New:
-        buildNewFileView();
-        break;
+        case ContentAction_New:
+            buildNewFileView();
+            break;
 
-    case ContentAction_Edit:
-        buildOpenFileView();
-        break;
+        case ContentAction_Edit:
+            buildOpenFileView();
+            break;
 
-    default:
-        break;
+        default:
+            break;
     }
 
-    mAdjusterWidget->setFilenameCheck (mAction == ContentAction_New);
+    mAdjusterWidget->setFilenameCheck(mAction == ContentAction_New);
 
-    if(!mDialogBuilt)
+    if (!mDialogBuilt)
     {
-        //connections common to both dialog view flavors
-        connect (mSelector, &ContentSelectorView::ContentSelector::signalCurrentGamefileIndexChanged,
-                 this, qOverload<int>(&FileDialog::slotUpdateAcceptButton));
+        // connections common to both dialog view flavors
+        connect(mSelector, &ContentSelectorView::ContentSelector::signalCurrentGamefileIndexChanged, this,
+            qOverload<int>(&FileDialog::slotUpdateAcceptButton));
 
-        connect (ui.projectButtonBox, &QDialogButtonBox::rejected, this, &FileDialog::slotRejected);
+        connect(ui.projectButtonBox, &QDialogButtonBox::rejected, this, &FileDialog::slotRejected);
         mDialogBuilt = true;
     }
 
@@ -96,48 +101,47 @@ void CSVDoc::FileDialog::buildNewFileView()
 {
     setWindowTitle(tr("Create a new addon"));
 
-    QPushButton* createButton = ui.projectButtonBox->button (QDialogButtonBox::Ok);
-    createButton->setText ("Create");
-    createButton->setEnabled (false);
+    QPushButton* createButton = ui.projectButtonBox->button(QDialogButtonBox::Ok);
+    createButton->setText("Create");
+    createButton->setEnabled(false);
 
-    if(!mFileWidget)
+    if (!mFileWidget)
     {
-        mFileWidget = new FileWidget (this);
+        mFileWidget = new FileWidget(this);
 
-        mFileWidget->setType (true);
+        mFileWidget->setType(true);
         mFileWidget->extensionLabelIsVisible(true);
 
-        connect (mFileWidget, &FileWidget::nameChanged,
-            mAdjusterWidget, &AdjusterWidget::setName);
+        connect(mFileWidget, &FileWidget::nameChanged, mAdjusterWidget, &AdjusterWidget::setName);
 
-        connect (mFileWidget, &FileWidget::nameChanged,
-                this, qOverload<const QString &, bool>(&FileDialog::slotUpdateAcceptButton));
+        connect(mFileWidget, &FileWidget::nameChanged, this,
+            qOverload<const QString&, bool>(&FileDialog::slotUpdateAcceptButton));
     }
 
-    ui.projectGroupBoxLayout->insertWidget (0, mFileWidget);
+    ui.projectGroupBoxLayout->insertWidget(0, mFileWidget);
 
-    connect (ui.projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotNewFile);
+    connect(ui.projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotNewFile);
 }
 
 void CSVDoc::FileDialog::buildOpenFileView()
 {
     setWindowTitle(tr("Open"));
-    ui.projectGroupBox->setTitle (QString(""));
-    ui.projectButtonBox->button(QDialogButtonBox::Ok)->setText ("Open");
-    if(mSelector->isGamefileSelected())
-        ui.projectButtonBox->button(QDialogButtonBox::Ok)->setEnabled (true);
+    ui.projectGroupBox->setTitle(QString(""));
+    ui.projectButtonBox->button(QDialogButtonBox::Ok)->setText("Open");
+    if (mSelector->isGamefileSelected())
+        ui.projectButtonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
     else
-        ui.projectButtonBox->button(QDialogButtonBox::Ok)->setEnabled (false);
+        ui.projectButtonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
 
-    if(!mDialogBuilt)
+    if (!mDialogBuilt)
     {
-        connect (mSelector, &ContentSelectorView::ContentSelector::signalAddonDataChanged,
-            this, &FileDialog::slotAddonDataChanged);
+        connect(mSelector, &ContentSelectorView::ContentSelector::signalAddonDataChanged, this,
+            &FileDialog::slotAddonDataChanged);
     }
-        connect (ui.projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotOpenFile);
+    connect(ui.projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotOpenFile);
 }
 
-void CSVDoc::FileDialog::slotAddonDataChanged(const QModelIndex &topleft, const QModelIndex &bottomright)
+void CSVDoc::FileDialog::slotAddonDataChanged(const QModelIndex& topleft, const QModelIndex& bottomright)
 {
     slotUpdateAcceptButton(0);
 }
@@ -149,10 +153,10 @@ void CSVDoc::FileDialog::slotUpdateAcceptButton(int)
     if (mFileWidget && mAction == ContentAction_New)
         name = mFileWidget->getName();
 
-    slotUpdateAcceptButton (name, true);
+    slotUpdateAcceptButton(name, true);
 }
 
-void CSVDoc::FileDialog::slotUpdateAcceptButton(const QString &name, bool)
+void CSVDoc::FileDialog::slotUpdateAcceptButton(const QString& name, bool)
 {
     bool success = !mSelector->selectedFiles().empty();
 
@@ -162,13 +166,13 @@ void CSVDoc::FileDialog::slotUpdateAcceptButton(const QString &name, bool)
         success = !name.isEmpty();
     else if (success)
     {
-        ContentSelectorModel::EsmFile *file = mSelector->selectedFiles().back();
-        mAdjusterWidget->setName (file->filePath(), !file->isGameFile());
+        ContentSelectorModel::EsmFile* file = mSelector->selectedFiles().back();
+        mAdjusterWidget->setName(file->filePath(), !file->isGameFile());
     }
     else
-        mAdjusterWidget->setName ("", true);
+        mAdjusterWidget->setName("", true);
 
-    ui.projectButtonBox->button (QDialogButtonBox::Ok)->setEnabled (success);
+    ui.projectButtonBox->button(QDialogButtonBox::Ok)->setEnabled(success);
 }
 
 QString CSVDoc::FileDialog::filename() const
@@ -182,9 +186,9 @@ QString CSVDoc::FileDialog::filename() const
 void CSVDoc::FileDialog::slotRejected()
 {
     emit rejected();
-    disconnect (ui.projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotNewFile);
-    disconnect (ui.projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotOpenFile);
-    if(mFileWidget)
+    disconnect(ui.projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotNewFile);
+    disconnect(ui.projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotOpenFile);
+    if (mFileWidget)
     {
         delete mFileWidget;
         mFileWidget = nullptr;
@@ -194,23 +198,23 @@ void CSVDoc::FileDialog::slotRejected()
 
 void CSVDoc::FileDialog::slotNewFile()
 {
-    emit signalCreateNewFile (mAdjusterWidget->getPath());
-    if(mFileWidget)
+    emit signalCreateNewFile(mAdjusterWidget->getPath());
+    if (mFileWidget)
     {
         delete mFileWidget;
         mFileWidget = nullptr;
     }
-    disconnect (ui.projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotNewFile);
+    disconnect(ui.projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotNewFile);
     close();
 }
 
 void CSVDoc::FileDialog::slotOpenFile()
 {
-    ContentSelectorModel::EsmFile *file = mSelector->selectedFiles().back();
+    ContentSelectorModel::EsmFile* file = mSelector->selectedFiles().back();
 
-    mAdjusterWidget->setName (file->filePath(), !file->isGameFile());
+    mAdjusterWidget->setName(file->filePath(), !file->isGameFile());
 
-    emit signalOpenFiles (mAdjusterWidget->getPath());
-    disconnect (ui.projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotOpenFile);
+    emit signalOpenFiles(mAdjusterWidget->getPath());
+    disconnect(ui.projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotOpenFile);
     close();
 }
diff --git a/apps/opencs/view/doc/filedialog.hpp b/apps/opencs/view/doc/filedialog.hpp
index 154efc14ea..4855297bf5 100644
--- a/apps/opencs/view/doc/filedialog.hpp
+++ b/apps/opencs/view/doc/filedialog.hpp
@@ -10,7 +10,7 @@
 
 #ifndef CS_QT_STD_FILESYSTEM_PATH_DECLARED
 #define CS_QT_STD_FILESYSTEM_PATH_DECLARED
-Q_DECLARE_METATYPE (std::filesystem::path)
+Q_DECLARE_METATYPE(std::filesystem::path)
 #endif
 
 #endif
@@ -31,46 +31,43 @@ namespace CSVDoc
         Q_OBJECT
 
     private:
-
-        ContentSelectorView::ContentSelector *mSelector;
+        ContentSelectorView::ContentSelector* mSelector;
         Ui::FileDialog ui;
         ContentAction mAction;
-        FileWidget *mFileWidget;
-        AdjusterWidget *mAdjusterWidget;
+        FileWidget* mFileWidget;
+        AdjusterWidget* mAdjusterWidget;
         bool mDialogBuilt;
 
     public:
-
-        explicit FileDialog(QWidget *parent = nullptr);
-        void showDialog (ContentAction action);
+        explicit FileDialog(QWidget* parent = nullptr);
+        void showDialog(ContentAction action);
 
         void addFiles(const std::vector<std::filesystem::path>& dataDirs);
-        void setEncoding (const QString &encoding);
-        void clearFiles ();
+        void setEncoding(const QString& encoding);
+        void clearFiles();
 
         QString filename() const;
         QStringList selectedFilePaths();
 
-        void setLocalData (const std::filesystem::path& localData);
+        void setLocalData(const std::filesystem::path& localData);
 
     private:
-
         void buildNewFileView();
         void buildOpenFileView();
 
     signals:
 
-        void signalOpenFiles (const std::filesystem::path &path);
-        void signalCreateNewFile (const std::filesystem::path &path);
+        void signalOpenFiles(const std::filesystem::path& path);
+        void signalCreateNewFile(const std::filesystem::path& path);
 
-        void signalUpdateAcceptButton (bool, int);
+        void signalUpdateAcceptButton(bool, int);
 
     private slots:
 
         void slotNewFile();
         void slotOpenFile();
-        void slotUpdateAcceptButton (int);
-        void slotUpdateAcceptButton (const QString &, bool);
+        void slotUpdateAcceptButton(int);
+        void slotUpdateAcceptButton(const QString&, bool);
         void slotRejected();
         void slotAddonDataChanged(const QModelIndex& topleft, const QModelIndex& bottomright);
     };
diff --git a/apps/opencs/view/doc/filewidget.cpp b/apps/opencs/view/doc/filewidget.cpp
index 45ce08daad..1048601790 100644
--- a/apps/opencs/view/doc/filewidget.cpp
+++ b/apps/opencs/view/doc/filewidget.cpp
@@ -1,38 +1,40 @@
 #include "filewidget.hpp"
 
 #include <QHBoxLayout>
-#include <QLineEdit>
 #include <QLabel>
-#include <QRegExpValidator>
+#include <QLineEdit>
 #include <QRegExp>
+#include <QRegExpValidator>
 
 QString CSVDoc::FileWidget::getExtension() const
 {
     return mAddon ? ".omwaddon" : ".omwgame";
 }
 
-CSVDoc::FileWidget::FileWidget (QWidget *parent) : QWidget (parent), mAddon (false)
+CSVDoc::FileWidget::FileWidget(QWidget* parent)
+    : QWidget(parent)
+    , mAddon(false)
 {
-    QHBoxLayout *layout = new QHBoxLayout (this);
+    QHBoxLayout* layout = new QHBoxLayout(this);
 
-    mInput = new QLineEdit (this);
+    mInput = new QLineEdit(this);
 
-    layout->addWidget (mInput, 1);
+    layout->addWidget(mInput, 1);
 
-    mType = new QLabel (this);
+    mType = new QLabel(this);
 
-    layout ->addWidget (mType);
+    layout->addWidget(mType);
 
-    connect (mInput, &QLineEdit::textChanged, this, &FileWidget::textChanged);
+    connect(mInput, &QLineEdit::textChanged, this, &FileWidget::textChanged);
 
-    setLayout (layout);
+    setLayout(layout);
 }
 
-void CSVDoc::FileWidget::setType (bool addon)
+void CSVDoc::FileWidget::setType(bool addon)
 {
     mAddon = addon;
 
-    mType->setText (getExtension());
+    mType->setText(getExtension());
 }
 
 QString CSVDoc::FileWidget::getName() const
@@ -45,9 +47,9 @@ QString CSVDoc::FileWidget::getName() const
     return text + getExtension();
 }
 
-void CSVDoc::FileWidget::textChanged (const QString& text)
+void CSVDoc::FileWidget::textChanged(const QString& text)
 {
-    emit nameChanged (getName(), mAddon);
+    emit nameChanged(getName(), mAddon);
 }
 
 void CSVDoc::FileWidget::extensionLabelIsVisible(bool visible)
@@ -55,10 +57,10 @@ void CSVDoc::FileWidget::extensionLabelIsVisible(bool visible)
     mType->setVisible(visible);
 }
 
-void CSVDoc::FileWidget::setName (const std::string& text)
+void CSVDoc::FileWidget::setName(const std::string& text)
 {
-    QString text2 = QString::fromUtf8 (text.c_str());
+    QString text2 = QString::fromUtf8(text.c_str());
 
-    mInput->setText (text2);
-    textChanged (text2);
+    mInput->setText(text2);
+    textChanged(text2);
 }
diff --git a/apps/opencs/view/doc/filewidget.hpp b/apps/opencs/view/doc/filewidget.hpp
index 626b8d77d8..e50d6f34e0 100644
--- a/apps/opencs/view/doc/filewidget.hpp
+++ b/apps/opencs/view/doc/filewidget.hpp
@@ -13,33 +13,32 @@ namespace CSVDoc
 {
     class FileWidget : public QWidget
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            bool mAddon;
-            QLineEdit *mInput;
-            QLabel *mType;
+        bool mAddon;
+        QLineEdit* mInput;
+        QLabel* mType;
 
-            QString getExtension() const;
+        QString getExtension() const;
 
-        public:
+    public:
+        FileWidget(QWidget* parent = nullptr);
 
-            FileWidget (QWidget *parent = nullptr);
+        void setType(bool addon);
 
-            void setType (bool addon);
+        QString getName() const;
 
-            QString getName() const;
+        void extensionLabelIsVisible(bool visible);
 
-            void extensionLabelIsVisible(bool visible);
+        void setName(const std::string& text);
 
-            void setName (const std::string& text);
+    private slots:
 
-        private slots:
+        void textChanged(const QString& text);
 
-            void textChanged (const QString& text);
+    signals:
 
-        signals:
-
-            void nameChanged (const QString& file, bool addon);
+        void nameChanged(const QString& file, bool addon);
     };
 }
 
diff --git a/apps/opencs/view/doc/globaldebugprofilemenu.cpp b/apps/opencs/view/doc/globaldebugprofilemenu.cpp
index 5990c179f3..7a91000c10 100644
--- a/apps/opencs/view/doc/globaldebugprofilemenu.cpp
+++ b/apps/opencs/view/doc/globaldebugprofilemenu.cpp
@@ -1,7 +1,7 @@
 #include "globaldebugprofilemenu.hpp"
 
-#include <vector>
 #include <algorithm>
+#include <vector>
 
 #include <QActionGroup>
 
@@ -15,78 +15,72 @@ void CSVDoc::GlobalDebugProfileMenu::rebuild()
     delete mActions;
     mActions = nullptr;
 
-    int idColumn = mDebugProfiles->findColumnIndex (CSMWorld::Columns::ColumnId_Id);
-    int stateColumn = mDebugProfiles->findColumnIndex (CSMWorld::Columns::ColumnId_Modification);
-    int globalColumn = mDebugProfiles->findColumnIndex (
-        CSMWorld::Columns::ColumnId_GlobalProfile);
+    int idColumn = mDebugProfiles->findColumnIndex(CSMWorld::Columns::ColumnId_Id);
+    int stateColumn = mDebugProfiles->findColumnIndex(CSMWorld::Columns::ColumnId_Modification);
+    int globalColumn = mDebugProfiles->findColumnIndex(CSMWorld::Columns::ColumnId_GlobalProfile);
 
     int size = mDebugProfiles->rowCount();
 
     std::vector<QString> ids;
 
-    for (int i=0; i<size; ++i)
+    for (int i = 0; i < size; ++i)
     {
-        int state = mDebugProfiles->data (mDebugProfiles->index (i, stateColumn)).toInt();
+        int state = mDebugProfiles->data(mDebugProfiles->index(i, stateColumn)).toInt();
 
-        bool global = mDebugProfiles->data (mDebugProfiles->index (i, globalColumn)).toInt();
+        bool global = mDebugProfiles->data(mDebugProfiles->index(i, globalColumn)).toInt();
 
-        if (state!=CSMWorld::RecordBase::State_Deleted && global)
-            ids.push_back (
-                mDebugProfiles->data (mDebugProfiles->index (i, idColumn)).toString());
+        if (state != CSMWorld::RecordBase::State_Deleted && global)
+            ids.push_back(mDebugProfiles->data(mDebugProfiles->index(i, idColumn)).toString());
     }
 
-    mActions = new QActionGroup (this);
-    connect (mActions, &QActionGroup::triggered, this, &GlobalDebugProfileMenu::actionTriggered);
+    mActions = new QActionGroup(this);
+    connect(mActions, &QActionGroup::triggered, this, &GlobalDebugProfileMenu::actionTriggered);
 
-    std::sort (ids.begin(), ids.end());
+    std::sort(ids.begin(), ids.end());
 
-    for (std::vector<QString>::const_iterator iter (ids.begin()); iter!=ids.end(); ++iter)
+    for (std::vector<QString>::const_iterator iter(ids.begin()); iter != ids.end(); ++iter)
     {
-        mActions->addAction (addAction (*iter));
+        mActions->addAction(addAction(*iter));
     }
 }
 
-CSVDoc::GlobalDebugProfileMenu::GlobalDebugProfileMenu (CSMWorld::IdTable *debugProfiles,
-    QWidget *parent)
-: QMenu (parent), mDebugProfiles (debugProfiles), mActions (nullptr)
+CSVDoc::GlobalDebugProfileMenu::GlobalDebugProfileMenu(CSMWorld::IdTable* debugProfiles, QWidget* parent)
+    : QMenu(parent)
+    , mDebugProfiles(debugProfiles)
+    , mActions(nullptr)
 {
     rebuild();
 
-    connect (mDebugProfiles, &CSMWorld::IdTable::rowsAboutToBeRemoved,
-        this, &GlobalDebugProfileMenu::profileAboutToBeRemoved);
+    connect(mDebugProfiles, &CSMWorld::IdTable::rowsAboutToBeRemoved, this,
+        &GlobalDebugProfileMenu::profileAboutToBeRemoved);
 
-    connect (mDebugProfiles, &CSMWorld::IdTable::rowsInserted,
-        this, &GlobalDebugProfileMenu::profileInserted);
+    connect(mDebugProfiles, &CSMWorld::IdTable::rowsInserted, this, &GlobalDebugProfileMenu::profileInserted);
 
-    connect (mDebugProfiles, &CSMWorld::IdTable::dataChanged,
-        this, &GlobalDebugProfileMenu::profileChanged);
+    connect(mDebugProfiles, &CSMWorld::IdTable::dataChanged, this, &GlobalDebugProfileMenu::profileChanged);
 }
 
-void CSVDoc::GlobalDebugProfileMenu::updateActions (bool running)
+void CSVDoc::GlobalDebugProfileMenu::updateActions(bool running)
 {
     if (mActions)
-        mActions->setEnabled (!running);
+        mActions->setEnabled(!running);
 }
 
-void CSVDoc::GlobalDebugProfileMenu::profileAboutToBeRemoved (const QModelIndex& parent,
-    int start, int end)
+void CSVDoc::GlobalDebugProfileMenu::profileAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
     rebuild();
 }
 
-void CSVDoc::GlobalDebugProfileMenu::profileInserted (const QModelIndex& parent, int start,
-    int end)
+void CSVDoc::GlobalDebugProfileMenu::profileInserted(const QModelIndex& parent, int start, int end)
 {
     rebuild();
 }
 
-void CSVDoc::GlobalDebugProfileMenu::profileChanged (const QModelIndex& topLeft,
-    const QModelIndex& bottomRight)
+void CSVDoc::GlobalDebugProfileMenu::profileChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     rebuild();
 }
 
-void CSVDoc::GlobalDebugProfileMenu::actionTriggered (QAction *action)
+void CSVDoc::GlobalDebugProfileMenu::actionTriggered(QAction* action)
 {
-    emit triggered (std::string (action->text().toUtf8().constData()));
+    emit triggered(std::string(action->text().toUtf8().constData()));
 }
diff --git a/apps/opencs/view/doc/globaldebugprofilemenu.hpp b/apps/opencs/view/doc/globaldebugprofilemenu.hpp
index e12ee306a1..02b26712de 100644
--- a/apps/opencs/view/doc/globaldebugprofilemenu.hpp
+++ b/apps/opencs/view/doc/globaldebugprofilemenu.hpp
@@ -15,34 +15,32 @@ namespace CSVDoc
 {
     class GlobalDebugProfileMenu : public QMenu
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            CSMWorld::IdTable *mDebugProfiles;
-            QActionGroup *mActions;
+        CSMWorld::IdTable* mDebugProfiles;
+        QActionGroup* mActions;
 
-        private:
+    private:
+        void rebuild();
 
-            void rebuild();
+    public:
+        GlobalDebugProfileMenu(CSMWorld::IdTable* debugProfiles, QWidget* parent = nullptr);
 
-        public:
+        void updateActions(bool running);
 
-            GlobalDebugProfileMenu (CSMWorld::IdTable *debugProfiles, QWidget *parent = nullptr);
+    private slots:
 
-            void updateActions (bool running);
+        void profileAboutToBeRemoved(const QModelIndex& parent, int start, int end);
 
-        private slots:
+        void profileInserted(const QModelIndex& parent, int start, int end);
 
-            void profileAboutToBeRemoved (const QModelIndex& parent, int start, int end);
+        void profileChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
-            void profileInserted (const QModelIndex& parent, int start, int end);
+        void actionTriggered(QAction* action);
 
-            void profileChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
+    signals:
 
-            void actionTriggered (QAction *action);
-
-        signals:
-
-            void triggered (const std::string& profile);
+        void triggered(const std::string& profile);
     };
 }
 
diff --git a/apps/opencs/view/doc/loader.cpp b/apps/opencs/view/doc/loader.cpp
index dd37176d76..44e056a5bf 100644
--- a/apps/opencs/view/doc/loader.cpp
+++ b/apps/opencs/view/doc/loader.cpp
@@ -1,93 +1,99 @@
 #include "loader.hpp"
 
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QProgressBar>
+#include <QCloseEvent>
 #include <QCursor>
 #include <QDialogButtonBox>
-#include <QCloseEvent>
+#include <QLabel>
 #include <QListWidget>
+#include <QProgressBar>
+#include <QVBoxLayout>
 
 #include <components/files/conversion.hpp>
 #include <components/files/qtconversion.hpp>
 
 #include "../../model/doc/document.hpp"
 
-void CSVDoc::LoadingDocument::closeEvent (QCloseEvent *event)
+void CSVDoc::LoadingDocument::closeEvent(QCloseEvent* event)
 {
     event->ignore();
     cancel();
 }
 
-CSVDoc::LoadingDocument::LoadingDocument (CSMDoc::Document *document)
-: mDocument (document), mTotalRecordsLabel (0), mRecordsLabel (0), mAborted (false), mMessages (nullptr), mRecords(0)
+CSVDoc::LoadingDocument::LoadingDocument(CSMDoc::Document* document)
+    : mDocument(document)
+    , mTotalRecordsLabel(0)
+    , mRecordsLabel(0)
+    , mAborted(false)
+    , mMessages(nullptr)
+    , mRecords(0)
 {
-    setWindowTitle ("Opening " + Files::pathToQString(document->getSavePath().filename()));
+    setWindowTitle("Opening " + Files::pathToQString(document->getSavePath().filename()));
 
-    setMinimumWidth (400);
+    setMinimumWidth(400);
 
-    mLayout = new QVBoxLayout (this);
+    mLayout = new QVBoxLayout(this);
 
     // total progress
-    mTotalRecordsLabel = new QLabel (this);
+    mTotalRecordsLabel = new QLabel(this);
 
-    mLayout->addWidget (mTotalRecordsLabel);
+    mLayout->addWidget(mTotalRecordsLabel);
 
-    mTotalProgress = new QProgressBar (this);
+    mTotalProgress = new QProgressBar(this);
 
-    mLayout->addWidget (mTotalProgress);
+    mLayout->addWidget(mTotalProgress);
 
-    mTotalProgress->setMinimum (0);
-    mTotalProgress->setMaximum (document->getData().getTotalRecords(document->getContentFiles()));
-    mTotalProgress->setTextVisible (true);
-    mTotalProgress->setValue (0);
+    mTotalProgress->setMinimum(0);
+    mTotalProgress->setMaximum(document->getData().getTotalRecords(document->getContentFiles()));
+    mTotalProgress->setTextVisible(true);
+    mTotalProgress->setValue(0);
     mTotalRecords = 0;
 
     mFilesLoaded = 0;
 
     // record progress
-    mLayout->addWidget (mRecordsLabel = new QLabel ("Records", this));
+    mLayout->addWidget(mRecordsLabel = new QLabel("Records", this));
 
-    mRecordProgress = new QProgressBar (this);
+    mRecordProgress = new QProgressBar(this);
 
-    mLayout->addWidget (mRecordProgress);
+    mLayout->addWidget(mRecordProgress);
 
-    mRecordProgress->setMinimum (0);
-    mRecordProgress->setTextVisible (true);
-    mRecordProgress->setValue (0);
+    mRecordProgress->setMinimum(0);
+    mRecordProgress->setTextVisible(true);
+    mRecordProgress->setValue(0);
 
     // error message
-    mError = new QLabel (this);
-    mError->setWordWrap (true);
+    mError = new QLabel(this);
+    mError->setWordWrap(true);
 
-    mLayout->addWidget (mError);
+    mLayout->addWidget(mError);
 
     // buttons
-    mButtons = new QDialogButtonBox (QDialogButtonBox::Cancel, Qt::Horizontal, this);
+    mButtons = new QDialogButtonBox(QDialogButtonBox::Cancel, Qt::Horizontal, this);
 
-    mLayout->addWidget (mButtons);
+    mLayout->addWidget(mButtons);
 
-    setLayout (mLayout);
+    setLayout(mLayout);
 
-    move (QCursor::pos());
+    move(QCursor::pos());
 
     show();
 
-    connect (mButtons, &QDialogButtonBox::rejected, this, qOverload<>(&LoadingDocument::cancel));
+    connect(mButtons, &QDialogButtonBox::rejected, this, qOverload<>(&LoadingDocument::cancel));
 }
 
-void CSVDoc::LoadingDocument::nextStage (const std::string& name, int fileRecords)
+void CSVDoc::LoadingDocument::nextStage(const std::string& name, int fileRecords)
 {
     ++mFilesLoaded;
     size_t numFiles = mDocument->getContentFiles().size();
 
-    mTotalRecordsLabel->setText (QString::fromUtf8 (("Loading: "+name
-                    +" ("+std::to_string(mFilesLoaded)+" of "+std::to_string((numFiles))+")").c_str()));
+    mTotalRecordsLabel->setText(QString::fromUtf8(
+        ("Loading: " + name + " (" + std::to_string(mFilesLoaded) + " of " + std::to_string((numFiles)) + ")")
+            .c_str()));
 
     mTotalRecords = mTotalProgress->value();
 
-    mRecordProgress->setValue (0);
-    mRecordProgress->setMaximum (fileRecords>0 ? fileRecords : 1);
+    mRecordProgress->setValue(0);
+    mRecordProgress->setMaximum(fileRecords > 0 ? fileRecords : 1);
 
     mRecords = fileRecords;
 }
@@ -100,107 +106,101 @@ void CSVDoc::LoadingDocument::nextRecord(int records)
 
         mRecordProgress->setValue(records);
 
-        mRecordsLabel->setText(
-            "Records: " + QString::number(records) + " of " + QString::number(mRecords));
+        mRecordsLabel->setText("Records: " + QString::number(records) + " of " + QString::number(mRecords));
     }
 }
 
-void CSVDoc::LoadingDocument::abort (const std::string& error)
+void CSVDoc::LoadingDocument::abort(const std::string& error)
 {
     mAborted = true;
-    mError->setText (QString::fromUtf8 (("<font color=red>Loading failed: " + error + "</font>").c_str()));
-    mButtons->setStandardButtons (QDialogButtonBox::Close);
+    mError->setText(QString::fromUtf8(("<font color=red>Loading failed: " + error + "</font>").c_str()));
+    mButtons->setStandardButtons(QDialogButtonBox::Close);
 }
 
-void CSVDoc::LoadingDocument::addMessage (const std::string& message)
+void CSVDoc::LoadingDocument::addMessage(const std::string& message)
 {
     if (!mMessages)
     {
-        mMessages = new QListWidget (this);
-        mLayout->insertWidget (4, mMessages);
+        mMessages = new QListWidget(this);
+        mLayout->insertWidget(4, mMessages);
     }
 
-    new QListWidgetItem (QString::fromUtf8 (message.c_str()), mMessages);
+    new QListWidgetItem(QString::fromUtf8(message.c_str()), mMessages);
 }
 
 void CSVDoc::LoadingDocument::cancel()
 {
     if (!mAborted)
-        emit cancel (mDocument);
+        emit cancel(mDocument);
     else
     {
-        emit close (mDocument);
+        emit close(mDocument);
         deleteLater();
     }
 }
 
-
 CSVDoc::Loader::Loader() {}
 
 CSVDoc::Loader::~Loader()
 {
-    for (std::map<CSMDoc::Document *, LoadingDocument *>::iterator iter (mDocuments.begin());
-        iter!=mDocuments.end(); ++iter)
+    for (std::map<CSMDoc::Document*, LoadingDocument*>::iterator iter(mDocuments.begin()); iter != mDocuments.end();
+         ++iter)
         delete iter->second;
 }
 
-void CSVDoc::Loader::add (CSMDoc::Document *document)
+void CSVDoc::Loader::add(CSMDoc::Document* document)
 {
-    LoadingDocument *loading = new LoadingDocument (document);
-    mDocuments.insert (std::make_pair (document, loading));
+    LoadingDocument* loading = new LoadingDocument(document);
+    mDocuments.insert(std::make_pair(document, loading));
 
-    connect (loading, qOverload<CSMDoc::Document *>(&LoadingDocument::cancel),
-        this, &Loader::cancel);
-    connect (loading, &LoadingDocument::close,
-        this, &Loader::close);
+    connect(loading, qOverload<CSMDoc::Document*>(&LoadingDocument::cancel), this, &Loader::cancel);
+    connect(loading, &LoadingDocument::close, this, &Loader::close);
 }
 
-void CSVDoc::Loader::loadingStopped (CSMDoc::Document *document, bool completed,
-    const std::string& error)
+void CSVDoc::Loader::loadingStopped(CSMDoc::Document* document, bool completed, const std::string& error)
 {
-    std::map<CSMDoc::Document *, LoadingDocument *>::iterator iter = mDocuments.begin();
+    std::map<CSMDoc::Document*, LoadingDocument*>::iterator iter = mDocuments.begin();
 
-    for (; iter!=mDocuments.end(); ++iter)
-        if (iter->first==document)
+    for (; iter != mDocuments.end(); ++iter)
+        if (iter->first == document)
             break;
 
-    if (iter==mDocuments.end())
+    if (iter == mDocuments.end())
         return;
 
     if (completed || error.empty())
     {
         delete iter->second;
-        mDocuments.erase (iter);
+        mDocuments.erase(iter);
     }
     else
     {
-        iter->second->abort (error);
+        iter->second->abort(error);
         // Leave the window open for now (wait for the user to close it)
-        mDocuments.erase (iter);
+        mDocuments.erase(iter);
     }
 }
 
-void CSVDoc::Loader::nextStage (CSMDoc::Document *document, const std::string& name,
-    int fileRecords)
+void CSVDoc::Loader::nextStage(CSMDoc::Document* document, const std::string& name, int fileRecords)
 {
-    std::map<CSMDoc::Document *, LoadingDocument *>::iterator iter = mDocuments.find (document);
+    std::map<CSMDoc::Document*, LoadingDocument*>::iterator iter = mDocuments.find(document);
 
-    if (iter!=mDocuments.end())
-        iter->second->nextStage (name, fileRecords);
+    if (iter != mDocuments.end())
+        iter->second->nextStage(name, fileRecords);
 }
 
-void CSVDoc::Loader::nextRecord (CSMDoc::Document *document, int records)
+void CSVDoc::Loader::nextRecord(CSMDoc::Document* document, int records)
 {
-    std::map<CSMDoc::Document *, LoadingDocument *>::iterator iter = mDocuments.find (document);
+    std::map<CSMDoc::Document*, LoadingDocument*>::iterator iter = mDocuments.find(document);
 
-    if (iter!=mDocuments.end())
-        iter->second->nextRecord (records);
+    if (iter != mDocuments.end())
+        iter->second->nextRecord(records);
 }
 
-void CSVDoc::Loader::loadMessage (CSMDoc::Document *document, const std::string& message)
+void CSVDoc::Loader::loadMessage(CSMDoc::Document* document, const std::string& message)
 {
-    std::map<CSMDoc::Document *, LoadingDocument *>::iterator iter = mDocuments.find (document);
+    std::map<CSMDoc::Document*, LoadingDocument*>::iterator iter = mDocuments.find(document);
 
-    if (iter!=mDocuments.end())
-        iter->second->addMessage (message);
+    if (iter != mDocuments.end())
+        iter->second->addMessage(message);
 }
diff --git a/apps/opencs/view/doc/loader.hpp b/apps/opencs/view/doc/loader.hpp
index 80d986283d..6cdac2be28 100644
--- a/apps/opencs/view/doc/loader.hpp
+++ b/apps/opencs/view/doc/loader.hpp
@@ -21,81 +21,77 @@ namespace CSVDoc
 {
     class LoadingDocument : public QWidget
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            CSMDoc::Document *mDocument;
-            QLabel *mTotalRecordsLabel;
-            QLabel *mRecordsLabel;
-            QProgressBar *mTotalProgress;
-            QProgressBar *mRecordProgress;
-            bool mAborted;
-            QDialogButtonBox *mButtons;
-            QLabel *mError;
-            QListWidget *mMessages;
-            QVBoxLayout *mLayout;
-            int mRecords;
-            int mTotalRecords;
-            int mFilesLoaded;
+        CSMDoc::Document* mDocument;
+        QLabel* mTotalRecordsLabel;
+        QLabel* mRecordsLabel;
+        QProgressBar* mTotalProgress;
+        QProgressBar* mRecordProgress;
+        bool mAborted;
+        QDialogButtonBox* mButtons;
+        QLabel* mError;
+        QListWidget* mMessages;
+        QVBoxLayout* mLayout;
+        int mRecords;
+        int mTotalRecords;
+        int mFilesLoaded;
 
-        private:
+    private:
+        void closeEvent(QCloseEvent* event) override;
 
-            void closeEvent (QCloseEvent *event) override;
+    public:
+        LoadingDocument(CSMDoc::Document* document);
 
-        public:
+        void nextStage(const std::string& name, int totalRecords);
 
-            LoadingDocument (CSMDoc::Document *document);
+        void nextRecord(int records);
 
-            void nextStage (const std::string& name, int totalRecords);
+        void abort(const std::string& error);
 
-            void nextRecord (int records);
+        void addMessage(const std::string& message);
 
-            void abort (const std::string& error);
+    private slots:
 
-            void addMessage (const std::string& message);
+        void cancel();
 
-        private slots:
+    signals:
 
-            void cancel();
+        void cancel(CSMDoc::Document* document);
+        ///< Stop loading process.
 
-        signals:
-
-            void cancel (CSMDoc::Document *document);
-            ///< Stop loading process.
-
-            void close (CSMDoc::Document *document);
-            ///< Close stopped loading process.
+        void close(CSMDoc::Document* document);
+        ///< Close stopped loading process.
     };
 
     class Loader : public QObject
     {
-            Q_OBJECT
-
-            std::map<CSMDoc::Document *, LoadingDocument *> mDocuments;
+        Q_OBJECT
 
-        public:
+        std::map<CSMDoc::Document*, LoadingDocument*> mDocuments;
 
-            Loader();
+    public:
+        Loader();
 
-            ~Loader() override;
+        ~Loader() override;
 
-        signals:
+    signals:
 
-            void cancel (CSMDoc::Document *document);
+        void cancel(CSMDoc::Document* document);
 
-            void close (CSMDoc::Document *document);
+        void close(CSMDoc::Document* document);
 
-        public slots:
+    public slots:
 
-            void add (CSMDoc::Document *document);
+        void add(CSMDoc::Document* document);
 
-            void loadingStopped (CSMDoc::Document *document, bool completed,
-                const std::string& error);
+        void loadingStopped(CSMDoc::Document* document, bool completed, const std::string& error);
 
-            void nextStage (CSMDoc::Document *document, const std::string& name, int totalRecords);
+        void nextStage(CSMDoc::Document* document, const std::string& name, int totalRecords);
 
-            void nextRecord (CSMDoc::Document *document, int records);
+        void nextRecord(CSMDoc::Document* document, int records);
 
-            void loadMessage (CSMDoc::Document *document, const std::string& message);
+        void loadMessage(CSMDoc::Document* document, const std::string& message);
     };
 }
 
diff --git a/apps/opencs/view/doc/newgame.cpp b/apps/opencs/view/doc/newgame.cpp
index 5fecf49134..99ee189e7d 100644
--- a/apps/opencs/view/doc/newgame.cpp
+++ b/apps/opencs/view/doc/newgame.cpp
@@ -1,72 +1,72 @@
 #include "newgame.hpp"
 
-#include <QGuiApplication>
-#include <QVBoxLayout>
 #include <QDialogButtonBox>
+#include <QGuiApplication>
 #include <QPushButton>
 #include <QScreen>
+#include <QVBoxLayout>
 
-#include "filewidget.hpp"
 #include "adjusterwidget.hpp"
+#include "filewidget.hpp"
 
 CSVDoc::NewGameDialogue::NewGameDialogue()
 {
-    setWindowTitle ("Create New Game");
+    setWindowTitle("Create New Game");
 
-    QVBoxLayout *layout = new QVBoxLayout (this);
+    QVBoxLayout* layout = new QVBoxLayout(this);
 
-    mFileWidget = new FileWidget (this);
-    mFileWidget->setType (false);
+    mFileWidget = new FileWidget(this);
+    mFileWidget->setType(false);
 
-    layout->addWidget (mFileWidget, 1);
+    layout->addWidget(mFileWidget, 1);
 
-    mAdjusterWidget = new AdjusterWidget (this);
+    mAdjusterWidget = new AdjusterWidget(this);
 
-    layout->addWidget (mAdjusterWidget, 1);
+    layout->addWidget(mAdjusterWidget, 1);
 
-    QDialogButtonBox *buttons = new QDialogButtonBox (this);
+    QDialogButtonBox* buttons = new QDialogButtonBox(this);
 
-    mCreate = new QPushButton ("Create", this);
-    mCreate->setDefault (true);
-    mCreate->setEnabled (false);
+    mCreate = new QPushButton("Create", this);
+    mCreate->setDefault(true);
+    mCreate->setEnabled(false);
 
-    buttons->addButton (mCreate, QDialogButtonBox::AcceptRole);
+    buttons->addButton(mCreate, QDialogButtonBox::AcceptRole);
 
-    QPushButton *cancel = new QPushButton ("Cancel", this);
+    QPushButton* cancel = new QPushButton("Cancel", this);
 
-    buttons->addButton (cancel, QDialogButtonBox::RejectRole);
+    buttons->addButton(cancel, QDialogButtonBox::RejectRole);
 
-    layout->addWidget (buttons);
+    layout->addWidget(buttons);
 
-    setLayout (layout);
+    setLayout(layout);
 
-    connect (mAdjusterWidget, &AdjusterWidget::stateChanged, this, &NewGameDialogue::stateChanged);
-    connect (mCreate, &QPushButton::clicked, this, &NewGameDialogue::create);
-    connect (cancel, &QPushButton::clicked, this, &NewGameDialogue::reject);
-    connect (mFileWidget, &FileWidget::nameChanged, mAdjusterWidget, &AdjusterWidget::setName);
+    connect(mAdjusterWidget, &AdjusterWidget::stateChanged, this, &NewGameDialogue::stateChanged);
+    connect(mCreate, &QPushButton::clicked, this, &NewGameDialogue::create);
+    connect(cancel, &QPushButton::clicked, this, &NewGameDialogue::reject);
+    connect(mFileWidget, &FileWidget::nameChanged, mAdjusterWidget, &AdjusterWidget::setName);
 
     QRect scr = QGuiApplication::primaryScreen()->geometry();
     QRect rect = geometry();
-    move (scr.center().x() - rect.center().x(), scr.center().y() - rect.center().y());
+    move(scr.center().x() - rect.center().x(), scr.center().y() - rect.center().y());
 }
 
-void CSVDoc::NewGameDialogue::setLocalData (const std::filesystem::path& localData)
+void CSVDoc::NewGameDialogue::setLocalData(const std::filesystem::path& localData)
 {
-    mAdjusterWidget->setLocalData (localData);
+    mAdjusterWidget->setLocalData(localData);
 }
 
-void CSVDoc::NewGameDialogue::stateChanged (bool valid)
+void CSVDoc::NewGameDialogue::stateChanged(bool valid)
 {
-    mCreate->setEnabled (valid);
+    mCreate->setEnabled(valid);
 }
 
 void CSVDoc::NewGameDialogue::create()
 {
-    emit createRequest (mAdjusterWidget->getPath());
+    emit createRequest(mAdjusterWidget->getPath());
 }
 
 void CSVDoc::NewGameDialogue::reject()
 {
-    emit cancelCreateGame ();
+    emit cancelCreateGame();
     QDialog::reject();
 }
diff --git a/apps/opencs/view/doc/newgame.hpp b/apps/opencs/view/doc/newgame.hpp
index f5eace0671..4e8154e22b 100644
--- a/apps/opencs/view/doc/newgame.hpp
+++ b/apps/opencs/view/doc/newgame.hpp
@@ -8,7 +8,7 @@
 
 #ifndef CS_QT_STD_FILESYSTEM_PATH_DECLARED
 #define CS_QT_STD_FILESYSTEM_PATH_DECLARED
-Q_DECLARE_METATYPE (std::filesystem::path)
+Q_DECLARE_METATYPE(std::filesystem::path)
 #endif
 
 class QPushButton;
@@ -20,31 +20,30 @@ namespace CSVDoc
 
     class NewGameDialogue : public QDialog
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            QPushButton *mCreate;
-            FileWidget *mFileWidget;
-            AdjusterWidget *mAdjusterWidget;
+        QPushButton* mCreate;
+        FileWidget* mFileWidget;
+        AdjusterWidget* mAdjusterWidget;
 
-        public:
+    public:
+        NewGameDialogue();
 
-            NewGameDialogue();
+        void setLocalData(const std::filesystem::path& localData);
 
-            void setLocalData (const std::filesystem::path& localData);
+    signals:
 
-        signals:
+        void createRequest(const std::filesystem::path& file);
 
-            void createRequest (const std::filesystem::path& file);
+        void cancelCreateGame();
 
-            void cancelCreateGame ();
+    private slots:
 
-        private slots:
+        void stateChanged(bool valid);
 
-            void stateChanged (bool valid);
+        void create();
 
-            void create();
-
-            void reject() override;
+        void reject() override;
     };
 }
 
diff --git a/apps/opencs/view/doc/operation.cpp b/apps/opencs/view/doc/operation.cpp
index 6b0165b475..8d8a389f0d 100644
--- a/apps/opencs/view/doc/operation.cpp
+++ b/apps/opencs/view/doc/operation.cpp
@@ -2,29 +2,37 @@
 
 #include <sstream>
 
+#include <QHBoxLayout>
 #include <QProgressBar>
 #include <QPushButton>
-#include <QHBoxLayout>
 
 #include "../../model/doc/state.hpp"
 
-void CSVDoc::Operation::updateLabel (int threads)
+void CSVDoc::Operation::updateLabel(int threads)
 {
-    if (threads==-1 || ((threads==0)!=mStalling))
+    if (threads == -1 || ((threads == 0) != mStalling))
     {
-        std::string name ("unknown operation");
+        std::string name("unknown operation");
 
         switch (mType)
         {
-            case CSMDoc::State_Saving: name = "saving"; break;
-            case CSMDoc::State_Verifying: name = "verifying"; break;
-            case CSMDoc::State_Searching: name = "searching"; break;
-            case CSMDoc::State_Merging: name = "merging"; break;
+            case CSMDoc::State_Saving:
+                name = "saving";
+                break;
+            case CSMDoc::State_Verifying:
+                name = "verifying";
+                break;
+            case CSMDoc::State_Searching:
+                name = "searching";
+                break;
+            case CSMDoc::State_Merging:
+                name = "merging";
+                break;
         }
 
         std::ostringstream stream;
 
-        if ((mStalling = (threads<=0)))
+        if ((mStalling = (threads <= 0)))
         {
             stream << name << " (waiting for a free worker thread)";
         }
@@ -33,15 +41,17 @@ void CSVDoc::Operation::updateLabel (int threads)
             stream << name << " (%p%)";
         }
 
-        mProgressBar->setFormat (stream.str().c_str());
+        mProgressBar->setFormat(stream.str().c_str());
     }
 }
 
-CSVDoc::Operation::Operation (int type, QWidget* parent) : mType (type), mStalling (false)
+CSVDoc::Operation::Operation(int type, QWidget* parent)
+    : mType(type)
+    , mStalling(false)
 {
     /// \todo Add a cancel button or a pop up menu with a cancel item
     initWidgets();
-    setBarColor( type);
+    setBarColor(type);
     updateLabel();
 
     /// \todo assign different progress bar colours to allow the user to distinguish easily between operation types
@@ -56,21 +66,21 @@ CSVDoc::Operation::~Operation()
 
 void CSVDoc::Operation::initWidgets()
 {
-    mProgressBar = new QProgressBar ();
+    mProgressBar = new QProgressBar();
     mAbortButton = new QPushButton("Abort");
     mLayout = new QHBoxLayout();
 
-    mLayout->addWidget (mProgressBar);
-    mLayout->addWidget (mAbortButton);
+    mLayout->addWidget(mProgressBar);
+    mLayout->addWidget(mAbortButton);
 
-    connect (mAbortButton, &QPushButton::clicked, this, qOverload<>(&Operation::abortOperation));
+    connect(mAbortButton, &QPushButton::clicked, this, qOverload<>(&Operation::abortOperation));
 }
 
-void CSVDoc::Operation::setProgress (int current, int max, int threads)
+void CSVDoc::Operation::setProgress(int current, int max, int threads)
 {
-    updateLabel (threads);
-    mProgressBar->setRange (0, max);
-    mProgressBar->setValue (current);
+    updateLabel(threads);
+    mProgressBar->setRange(0, max);
+    mProgressBar->setValue(current);
 }
 
 int CSVDoc::Operation::getType() const
@@ -78,76 +88,77 @@ int CSVDoc::Operation::getType() const
     return mType;
 }
 
-void CSVDoc::Operation::setBarColor (int type)
+void CSVDoc::Operation::setBarColor(int type)
 {
-    QString style ="QProgressBar {"
-            "text-align: center;"
-            "}"
+    QString style
+        = "QProgressBar {"
+          "text-align: center;"
+          "}"
           "QProgressBar::chunk {"
-            "background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 %1, stop:.50 %2 stop: .51 %3 stop:1 %4);"
-            "text-align: center;"
-            "margin: 2px 1px 1p 2px;"
+          "background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 %1, stop:.50 %2 stop: .51 %3 stop:1 %4);"
+          "text-align: center;"
+          "margin: 2px 1px 1p 2px;"
           "}";
 
     QString topColor = "#F2F6F8";
     QString bottomColor = "#E0EFF9";
     QString midTopColor = "#D8E1E7";
-    QString midBottomColor = "#B5C6D0";  // default gray gloss
+    QString midBottomColor = "#B5C6D0"; // default gray gloss
 
     // colors inspired by samples from:
     // http://www.colorzilla.com/gradient-editor/
 
     switch (type)
     {
-    case CSMDoc::State_Saving:
+        case CSMDoc::State_Saving:
 
-        topColor = "#FECCB1";
-        midTopColor = "#F17432";
-        midBottomColor = "#EA5507";
-        bottomColor = "#FB955E";  // red gloss #2
-        break;
+            topColor = "#FECCB1";
+            midTopColor = "#F17432";
+            midBottomColor = "#EA5507";
+            bottomColor = "#FB955E"; // red gloss #2
+            break;
 
-    case CSMDoc::State_Searching:
+        case CSMDoc::State_Searching:
 
-        topColor = "#EBF1F6";
-        midTopColor = "#ABD3EE";
-        midBottomColor = "#89C3EB";
-        bottomColor = "#D5EBFB"; //blue gloss #4
-        break;
+            topColor = "#EBF1F6";
+            midTopColor = "#ABD3EE";
+            midBottomColor = "#89C3EB";
+            bottomColor = "#D5EBFB"; // blue gloss #4
+            break;
 
-    case CSMDoc::State_Verifying:
+        case CSMDoc::State_Verifying:
 
-        topColor = "#BFD255";
-        midTopColor = "#8EB92A";
-        midBottomColor = "#72AA00";
-        bottomColor = "#9ECB2D";  //green gloss
-        break;
+            topColor = "#BFD255";
+            midTopColor = "#8EB92A";
+            midBottomColor = "#72AA00";
+            bottomColor = "#9ECB2D"; // green gloss
+            break;
 
-    case CSMDoc::State_Merging:
+        case CSMDoc::State_Merging:
 
-        topColor = "#F3E2C7";
-        midTopColor = "#C19E67";
-        midBottomColor = "#B68D4C";
-        bottomColor = "#E9D4B3";  //l Brown 3D
-        break;
+            topColor = "#F3E2C7";
+            midTopColor = "#C19E67";
+            midBottomColor = "#B68D4C";
+            bottomColor = "#E9D4B3"; // l Brown 3D
+            break;
 
-    default:
+        default:
 
-        topColor = "#F2F6F8";
-        bottomColor = "#E0EFF9";
-        midTopColor = "#D8E1E7";
-        midBottomColor = "#B5C6D0";  // gray gloss for undefined ops
+            topColor = "#F2F6F8";
+            bottomColor = "#E0EFF9";
+            midTopColor = "#D8E1E7";
+            midBottomColor = "#B5C6D0"; // gray gloss for undefined ops
     }
 
     mProgressBar->setStyleSheet(style.arg(topColor).arg(midTopColor).arg(midBottomColor).arg(bottomColor));
 }
 
-QHBoxLayout *CSVDoc::Operation::getLayout() const
+QHBoxLayout* CSVDoc::Operation::getLayout() const
 {
     return mLayout;
 }
 
 void CSVDoc::Operation::abortOperation()
 {
-    emit abortOperation (mType);
+    emit abortOperation(mType);
 }
diff --git a/apps/opencs/view/doc/operation.hpp b/apps/opencs/view/doc/operation.hpp
index 1d07464604..7f7f4f016e 100644
--- a/apps/opencs/view/doc/operation.hpp
+++ b/apps/opencs/view/doc/operation.hpp
@@ -11,42 +11,40 @@ namespace CSVDoc
 {
     class Operation : public QObject
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            int mType;
-            bool mStalling;
-            QProgressBar *mProgressBar;
-            QPushButton *mAbortButton;
-            QHBoxLayout *mLayout;
+        int mType;
+        bool mStalling;
+        QProgressBar* mProgressBar;
+        QPushButton* mAbortButton;
+        QHBoxLayout* mLayout;
 
-            // not implemented
-            Operation (const Operation&);
-            Operation& operator= (const Operation&);
+        // not implemented
+        Operation(const Operation&);
+        Operation& operator=(const Operation&);
 
-            void updateLabel (int threads = -1);
+        void updateLabel(int threads = -1);
 
-        public:
+    public:
+        Operation(int type, QWidget* parent);
+        ~Operation() override;
 
-            Operation (int type, QWidget *parent);
-            ~Operation() override;
+        void setProgress(int current, int max, int threads);
 
-            void setProgress (int current, int max, int threads);
+        int getType() const;
+        QHBoxLayout* getLayout() const;
 
-            int getType() const;
-            QHBoxLayout *getLayout() const;
+    private:
+        void setBarColor(int type);
+        void initWidgets();
 
-        private:
+    signals:
 
-            void setBarColor (int type);
-            void initWidgets();
+        void abortOperation(int type);
 
-        signals:
+    private slots:
 
-            void abortOperation (int type);
-
-        private slots:
-
-            void abortOperation();
+        void abortOperation();
     };
 }
 
diff --git a/apps/opencs/view/doc/operations.cpp b/apps/opencs/view/doc/operations.cpp
index 585184ae67..103acf5211 100644
--- a/apps/opencs/view/doc/operations.cpp
+++ b/apps/opencs/view/doc/operations.cpp
@@ -8,60 +8,60 @@ CSVDoc::Operations::Operations()
 {
     /// \todo make widget height fixed (exactly the height required to display all operations)
 
-    setFeatures (QDockWidget::NoDockWidgetFeatures);
+    setFeatures(QDockWidget::NoDockWidgetFeatures);
 
-    QWidget *widgetContainer = new QWidget (this);
+    QWidget* widgetContainer = new QWidget(this);
     mLayout = new QVBoxLayout;
 
-    widgetContainer->setLayout (mLayout);
-    setWidget (widgetContainer);
-    setVisible (false);
-    setFixedHeight (widgetContainer->height());
-    setTitleBarWidget (new QWidget (this));
+    widgetContainer->setLayout(mLayout);
+    setWidget(widgetContainer);
+    setVisible(false);
+    setFixedHeight(widgetContainer->height());
+    setTitleBarWidget(new QWidget(this));
 }
 
-void CSVDoc::Operations::setProgress (int current, int max, int type, int threads)
+void CSVDoc::Operations::setProgress(int current, int max, int type, int threads)
 {
-    for (std::vector<Operation *>::iterator iter (mOperations.begin()); iter!=mOperations.end(); ++iter)
-        if ((*iter)->getType()==type)
+    for (std::vector<Operation*>::iterator iter(mOperations.begin()); iter != mOperations.end(); ++iter)
+        if ((*iter)->getType() == type)
         {
-            (*iter)->setProgress (current, max, threads);
+            (*iter)->setProgress(current, max, threads);
             return;
         }
 
     int oldCount = static_cast<int>(mOperations.size());
     int newCount = oldCount + 1;
 
-    Operation *operation = new Operation (type, this);
-    connect (operation, qOverload<int>(&Operation::abortOperation), this, &Operations::abortOperation);
+    Operation* operation = new Operation(type, this);
+    connect(operation, qOverload<int>(&Operation::abortOperation), this, &Operations::abortOperation);
 
-    mLayout->addLayout (operation->getLayout());
-    mOperations.push_back (operation);
-    operation->setProgress (current, max, threads);
+    mLayout->addLayout(operation->getLayout());
+    mOperations.push_back(operation);
+    operation->setProgress(current, max, threads);
 
-    if ( oldCount > 0)
-        setFixedHeight (height()/oldCount * newCount);
+    if (oldCount > 0)
+        setFixedHeight(height() / oldCount * newCount);
 
-    setVisible (true);
+    setVisible(true);
 }
 
-void CSVDoc::Operations::quitOperation (int type)
+void CSVDoc::Operations::quitOperation(int type)
 {
-    for (std::vector<Operation *>::iterator iter (mOperations.begin()); iter!=mOperations.end(); ++iter)
-        if ((*iter)->getType()==type)
+    for (std::vector<Operation*>::iterator iter(mOperations.begin()); iter != mOperations.end(); ++iter)
+        if ((*iter)->getType() == type)
         {
             int oldCount = static_cast<int>(mOperations.size());
             int newCount = oldCount - 1;
 
-            mLayout->removeItem ((*iter)->getLayout());
+            mLayout->removeItem((*iter)->getLayout());
 
             (*iter)->deleteLater();
-            mOperations.erase (iter);
+            mOperations.erase(iter);
 
             if (oldCount > 1)
-                setFixedHeight (height() / oldCount * newCount);
+                setFixedHeight(height() / oldCount * newCount);
             else
-                setVisible (false);
+                setVisible(false);
 
             break;
         }
diff --git a/apps/opencs/view/doc/operations.hpp b/apps/opencs/view/doc/operations.hpp
index 71c595f66b..110ed3f728 100644
--- a/apps/opencs/view/doc/operations.hpp
+++ b/apps/opencs/view/doc/operations.hpp
@@ -13,28 +13,27 @@ namespace CSVDoc
 
     class Operations : public QDockWidget
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            QVBoxLayout *mLayout;
-            std::vector<Operation *> mOperations;
+        QVBoxLayout* mLayout;
+        std::vector<Operation*> mOperations;
 
-            // not implemented
-            Operations (const Operations&);
-            Operations& operator= (const Operations&);
+        // not implemented
+        Operations(const Operations&);
+        Operations& operator=(const Operations&);
 
-        public:
+    public:
+        Operations();
 
-            Operations();
+        void setProgress(int current, int max, int type, int threads);
+        ///< Implicitly starts the operation, if it is not running already.
 
-            void setProgress (int current, int max, int type, int threads);
-            ///< Implicitly starts the operation, if it is not running already.
+        void quitOperation(int type);
+        ///< Calling this function for an operation that is not running is a no-op.
 
-            void quitOperation (int type);
-            ///< Calling this function for an operation that is not running is a no-op.
+    signals:
 
-        signals:
-
-            void abortOperation (int type);
+        void abortOperation(int type);
     };
 }
 
diff --git a/apps/opencs/view/doc/runlogsubview.cpp b/apps/opencs/view/doc/runlogsubview.cpp
index 3a871ff103..ba7fa20a87 100644
--- a/apps/opencs/view/doc/runlogsubview.cpp
+++ b/apps/opencs/view/doc/runlogsubview.cpp
@@ -4,18 +4,17 @@
 
 #include <QTextEdit>
 
-CSVDoc::RunLogSubView::RunLogSubView (const CSMWorld::UniversalId& id,
-    CSMDoc::Document& document)
-: SubView (id)
+CSVDoc::RunLogSubView::RunLogSubView(const CSMWorld::UniversalId& id, CSMDoc::Document& document)
+    : SubView(id)
 {
-    QTextEdit *edit = new QTextEdit (this);
-    edit->setDocument (document.getRunLog());
-    edit->setReadOnly (true);
+    QTextEdit* edit = new QTextEdit(this);
+    edit->setDocument(document.getRunLog());
+    edit->setReadOnly(true);
 
-    setWidget (edit);
+    setWidget(edit);
 }
 
-void CSVDoc::RunLogSubView::setEditLock (bool locked)
+void CSVDoc::RunLogSubView::setEditLock(bool locked)
 {
     // ignored since this SubView does not have editing
 }
diff --git a/apps/opencs/view/doc/runlogsubview.hpp b/apps/opencs/view/doc/runlogsubview.hpp
index 31a390276c..3bc234a780 100644
--- a/apps/opencs/view/doc/runlogsubview.hpp
+++ b/apps/opencs/view/doc/runlogsubview.hpp
@@ -12,13 +12,12 @@ namespace CSVDoc
 {
     class RunLogSubView : public SubView
     {
-            Q_OBJECT
+        Q_OBJECT
 
-        public:
+    public:
+        RunLogSubView(const CSMWorld::UniversalId& id, CSMDoc::Document& document);
 
-            RunLogSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document);
-
-            void setEditLock (bool locked) override;
+        void setEditLock(bool locked) override;
     };
 }
 
diff --git a/apps/opencs/view/doc/sizehint.cpp b/apps/opencs/view/doc/sizehint.cpp
index 038bd9e4d1..4337835149 100644
--- a/apps/opencs/view/doc/sizehint.cpp
+++ b/apps/opencs/view/doc/sizehint.cpp
@@ -1,17 +1,18 @@
 #include "sizehint.hpp"
 
-CSVDoc::SizeHintWidget::SizeHintWidget(QWidget *parent) : QWidget(parent)
-{}
+CSVDoc::SizeHintWidget::SizeHintWidget(QWidget* parent)
+    : QWidget(parent)
+{
+}
 
-CSVDoc::SizeHintWidget::~SizeHintWidget()
-{}
+CSVDoc::SizeHintWidget::~SizeHintWidget() {}
 
 QSize CSVDoc::SizeHintWidget::sizeHint() const
 {
     return mSize;
 }
 
-void CSVDoc::SizeHintWidget::setSizeHint(const QSize &size)
+void CSVDoc::SizeHintWidget::setSizeHint(const QSize& size)
 {
     mSize = size;
 }
diff --git a/apps/opencs/view/doc/sizehint.hpp b/apps/opencs/view/doc/sizehint.hpp
index 949265e31a..7f43f28bb4 100644
--- a/apps/opencs/view/doc/sizehint.hpp
+++ b/apps/opencs/view/doc/sizehint.hpp
@@ -1,21 +1,21 @@
 #ifndef CSV_DOC_SIZEHINT_H
 #define CSV_DOC_SIZEHINT_H
 
-#include <QWidget>
 #include <QSize>
+#include <QWidget>
 
 namespace CSVDoc
 {
     class SizeHintWidget : public QWidget
     {
-            QSize mSize;
+        QSize mSize;
 
-        public:
-            SizeHintWidget(QWidget *parent = nullptr);
-            ~SizeHintWidget() override;
+    public:
+        SizeHintWidget(QWidget* parent = nullptr);
+        ~SizeHintWidget() override;
 
-            QSize sizeHint() const override;
-            void setSizeHint(const QSize &size);
+        QSize sizeHint() const override;
+        void setSizeHint(const QSize& size);
     };
 }
 
diff --git a/apps/opencs/view/doc/startup.cpp b/apps/opencs/view/doc/startup.cpp
index 4676284a17..27463b0456 100644
--- a/apps/opencs/view/doc/startup.cpp
+++ b/apps/opencs/view/doc/startup.cpp
@@ -1,125 +1,129 @@
 #include "startup.hpp"
 
+#include <QGridLayout>
 #include <QGuiApplication>
-#include <QVBoxLayout>
 #include <QHBoxLayout>
-#include <QRect>
-#include <QGridLayout>
-#include <QLabel>
 #include <QIcon>
+#include <QLabel>
 #include <QPushButton>
+#include <QRect>
 #include <QScreen>
+#include <QVBoxLayout>
 
-QPushButton *CSVDoc::StartupDialogue::addButton (const QString& label, const QIcon& icon)
+QPushButton* CSVDoc::StartupDialogue::addButton(const QString& label, const QIcon& icon)
 {
     int column = mColumn--;
 
-    QPushButton *button = new QPushButton (this);
+    QPushButton* button = new QPushButton(this);
 
-    button->setIcon (QIcon (icon));
+    button->setIcon(QIcon(icon));
 
-    button->setSizePolicy (QSizePolicy (QSizePolicy::Preferred, QSizePolicy::Preferred));
+    button->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
 
-    mLayout->addWidget (button, 0, column);
+    mLayout->addWidget(button, 0, column);
 
-    mLayout->addWidget (new QLabel (label, this), 1, column, Qt::AlignCenter);
+    mLayout->addWidget(new QLabel(label, this), 1, column, Qt::AlignCenter);
 
-    int width = mLayout->itemAtPosition (1, column)->widget()->sizeHint().width();
+    int width = mLayout->itemAtPosition(1, column)->widget()->sizeHint().width();
 
-    if (width>mWidth)
+    if (width > mWidth)
         mWidth = width;
 
     return button;
 }
 
-
-QWidget *CSVDoc::StartupDialogue::createButtons()
+QWidget* CSVDoc::StartupDialogue::createButtons()
 {
-    QWidget *widget = new QWidget (this);
+    QWidget* widget = new QWidget(this);
 
-    mLayout = new QGridLayout (widget);
+    mLayout = new QGridLayout(widget);
 
     /// \todo add icons
-    QPushButton *loadDocument = addButton ("Edit A Content File", QIcon (":startup/edit-content"));
-    connect (loadDocument, &QPushButton::clicked, this, &StartupDialogue::loadDocument);
+    QPushButton* loadDocument = addButton("Edit A Content File", QIcon(":startup/edit-content"));
+    connect(loadDocument, &QPushButton::clicked, this, &StartupDialogue::loadDocument);
 
-    QPushButton *createAddon = addButton ("Create A New Addon", QIcon (":startup/create-addon"));
-    connect (createAddon, &QPushButton::clicked, this, &StartupDialogue::createAddon);
+    QPushButton* createAddon = addButton("Create A New Addon", QIcon(":startup/create-addon"));
+    connect(createAddon, &QPushButton::clicked, this, &StartupDialogue::createAddon);
 
-    QPushButton *createGame = addButton ("Create A New Game", QIcon (":startup/create-game"));
-    connect (createGame, &QPushButton::clicked, this, &StartupDialogue::createGame);
+    QPushButton* createGame = addButton("Create A New Game", QIcon(":startup/create-game"));
+    connect(createGame, &QPushButton::clicked, this, &StartupDialogue::createGame);
 
-    for (int i=0; i<3; ++i)
-        mLayout->setColumnMinimumWidth (i, mWidth);
+    for (int i = 0; i < 3; ++i)
+        mLayout->setColumnMinimumWidth(i, mWidth);
 
-    mLayout->setRowMinimumHeight (0, mWidth);
+    mLayout->setRowMinimumHeight(0, mWidth);
 
-    mLayout->setSizeConstraint (QLayout::SetMinimumSize);
-    mLayout->setHorizontalSpacing (32);
+    mLayout->setSizeConstraint(QLayout::SetMinimumSize);
+    mLayout->setHorizontalSpacing(32);
 
-    mLayout->setContentsMargins (16, 16, 16, 8);
+    mLayout->setContentsMargins(16, 16, 16, 8);
 
-    loadDocument->setIconSize (QSize (mWidth, mWidth));
-    createGame->setIconSize (QSize (mWidth, mWidth));
-    createAddon->setIconSize (QSize (mWidth, mWidth));
+    loadDocument->setIconSize(QSize(mWidth, mWidth));
+    createGame->setIconSize(QSize(mWidth, mWidth));
+    createAddon->setIconSize(QSize(mWidth, mWidth));
 
-    widget->setLayout (mLayout);
+    widget->setLayout(mLayout);
 
     return widget;
 }
 
-QWidget *CSVDoc::StartupDialogue::createTools()
+QWidget* CSVDoc::StartupDialogue::createTools()
 {
-    QWidget *widget = new QWidget (this);
+    QWidget* widget = new QWidget(this);
 
-    QHBoxLayout *layout = new QHBoxLayout (widget);
-    layout->setDirection (QBoxLayout::RightToLeft);
-    layout->setContentsMargins (4, 4, 4, 4);
+    QHBoxLayout* layout = new QHBoxLayout(widget);
+    layout->setDirection(QBoxLayout::RightToLeft);
+    layout->setContentsMargins(4, 4, 4, 4);
 
-    QPushButton *config = new QPushButton (widget);
+    QPushButton* config = new QPushButton(widget);
 
-    config->setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed));
-    config->setIcon (QIcon (":startup/configure"));
-    config->setToolTip ("Open user settings");
+    config->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+    config->setIcon(QIcon(":startup/configure"));
+    config->setToolTip("Open user settings");
 
-    layout->addWidget (config);
+    layout->addWidget(config);
 
-    layout->addWidget (new QWidget, 1); // dummy widget; stops buttons from taking all the space
+    layout->addWidget(new QWidget, 1); // dummy widget; stops buttons from taking all the space
 
-    widget->setLayout (layout);
+    widget->setLayout(layout);
 
-    connect (config, &QPushButton::clicked, this, &StartupDialogue::editConfig);
+    connect(config, &QPushButton::clicked, this, &StartupDialogue::editConfig);
 
     return widget;
 }
 
-CSVDoc::StartupDialogue::StartupDialogue() : mWidth (0), mColumn (2)
+CSVDoc::StartupDialogue::StartupDialogue()
+    : mWidth(0)
+    , mColumn(2)
 {
-    setWindowTitle ("OpenMW-CS");
+    setWindowTitle("OpenMW-CS");
 
-    QVBoxLayout *layout = new QVBoxLayout (this);
+    QVBoxLayout* layout = new QVBoxLayout(this);
 
-    layout->setContentsMargins (0, 0, 0, 0);
+    layout->setContentsMargins(0, 0, 0, 0);
 
-    layout->addWidget (createButtons());
-    layout->addWidget (createTools());
+    layout->addWidget(createButtons());
+    layout->addWidget(createTools());
 
     /// \todo remove this label once we are feature complete and convinced that this thing is
     /// working properly.
-    QLabel *warning = new QLabel ("<font color=Red>WARNING: OpenMW-CS is in alpha stage.<p>The editor is not feature complete and not sufficiently tested.<br>In theory your data should be safe. But we strongly advise to make backups regularly if you are working with live data.</font color>");
+    QLabel* warning = new QLabel(
+        "<font color=Red>WARNING: OpenMW-CS is in alpha stage.<p>The editor is not feature complete and not "
+        "sufficiently tested.<br>In theory your data should be safe. But we strongly advise to make backups regularly "
+        "if you are working with live data.</font color>");
 
     QFont font;
-    font.setPointSize (12);
-    font.setBold (true);
+    font.setPointSize(12);
+    font.setBold(true);
 
-    warning->setFont (font);
-    warning->setWordWrap (true);
+    warning->setFont(font);
+    warning->setWordWrap(true);
 
-    layout->addWidget (warning, 1);
+    layout->addWidget(warning, 1);
 
-    setLayout (layout);
+    setLayout(layout);
 
     QRect scr = QGuiApplication::primaryScreen()->geometry();
     QRect rect = geometry();
-    move (scr.center().x() - rect.center().x(), scr.center().y() - rect.center().y());
+    move(scr.center().x() - rect.center().x(), scr.center().y() - rect.center().y());
 }
diff --git a/apps/opencs/view/doc/startup.hpp b/apps/opencs/view/doc/startup.hpp
index f059a44e5c..061b91b2d1 100644
--- a/apps/opencs/view/doc/startup.hpp
+++ b/apps/opencs/view/doc/startup.hpp
@@ -15,31 +15,29 @@ namespace CSVDoc
     {
         Q_OBJECT
 
-        private:
+    private:
+        int mWidth;
+        int mColumn;
+        QGridLayout* mLayout;
 
-            int mWidth;
-            int mColumn;
-            QGridLayout *mLayout;
+        QPushButton* addButton(const QString& label, const QIcon& icon);
 
-            QPushButton *addButton (const QString& label, const QIcon& icon);
+        QWidget* createButtons();
 
-            QWidget *createButtons();
+        QWidget* createTools();
 
-            QWidget *createTools();
+    public:
+        StartupDialogue();
 
-        public:
+    signals:
 
-            StartupDialogue();
+        void createGame();
 
-        signals:
+        void createAddon();
 
-            void createGame();
+        void loadDocument();
 
-            void createAddon();
-
-            void loadDocument();
-
-            void editConfig();
+        void editConfig();
     };
 }
 
diff --git a/apps/opencs/view/doc/subview.cpp b/apps/opencs/view/doc/subview.cpp
index a566a6e26f..30d9661ff2 100644
--- a/apps/opencs/view/doc/subview.cpp
+++ b/apps/opencs/view/doc/subview.cpp
@@ -5,26 +5,26 @@
 #include <QEvent>
 #include <QKeyEvent>
 
-bool CSVDoc::SubView::event (QEvent *event)
+bool CSVDoc::SubView::event(QEvent* event)
 {
-    if (event->type()==QEvent::ShortcutOverride)
+    if (event->type() == QEvent::ShortcutOverride)
     {
-        QKeyEvent *keyEvent = static_cast<QKeyEvent *> (event);
+        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
 
-        if (keyEvent->key()==Qt::Key_W && keyEvent->modifiers()==(Qt::ShiftModifier | Qt::ControlModifier))
+        if (keyEvent->key() == Qt::Key_W && keyEvent->modifiers() == (Qt::ShiftModifier | Qt::ControlModifier))
             emit closeRequest();
-            return true;
+        return true;
     }
 
-    return QDockWidget::event (event);
+    return QDockWidget::event(event);
 }
 
-CSVDoc::SubView::SubView (const CSMWorld::UniversalId& id)
- : mUniversalId (id)
+CSVDoc::SubView::SubView(const CSMWorld::UniversalId& id)
+    : mUniversalId(id)
 {
     /// \todo  add a button to the title bar that clones this sub view
 
-    setWindowTitle (QString::fromUtf8 (mUniversalId.toString().c_str()));
+    setWindowTitle(QString::fromUtf8(mUniversalId.toString().c_str()));
     setAttribute(Qt::WA_DeleteOnClose);
 }
 
@@ -33,20 +33,20 @@ CSMWorld::UniversalId CSVDoc::SubView::getUniversalId() const
     return mUniversalId;
 }
 
-void CSVDoc::SubView::setStatusBar (bool show) {}
+void CSVDoc::SubView::setStatusBar(bool show) {}
 
-void CSVDoc::SubView::useHint (const std::string& hint) {}
+void CSVDoc::SubView::useHint(const std::string& hint) {}
 
-void CSVDoc::SubView::setUniversalId (const CSMWorld::UniversalId& id)
+void CSVDoc::SubView::setUniversalId(const CSMWorld::UniversalId& id)
 {
     mUniversalId = id;
-    setWindowTitle (QString::fromUtf8(mUniversalId.toString().c_str()));
-    emit universalIdChanged (mUniversalId);
+    setWindowTitle(QString::fromUtf8(mUniversalId.toString().c_str()));
+    emit universalIdChanged(mUniversalId);
 }
 
-void CSVDoc::SubView::closeEvent (QCloseEvent *event)
+void CSVDoc::SubView::closeEvent(QCloseEvent* event)
 {
-    emit updateSubViewIndices (this);
+    emit updateSubViewIndices(this);
 }
 
 std::string CSVDoc::SubView::getTitle() const
@@ -56,5 +56,5 @@ std::string CSVDoc::SubView::getTitle() const
 
 void CSVDoc::SubView::closeRequest()
 {
-    emit closeRequest (this);
+    emit closeRequest(this);
 }
diff --git a/apps/opencs/view/doc/subview.hpp b/apps/opencs/view/doc/subview.hpp
index d61609da98..04950ab48a 100644
--- a/apps/opencs/view/doc/subview.hpp
+++ b/apps/opencs/view/doc/subview.hpp
@@ -18,55 +18,52 @@ namespace CSVDoc
 
     class SubView : public QDockWidget
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            CSMWorld::UniversalId mUniversalId;
+        CSMWorld::UniversalId mUniversalId;
 
-            // not implemented
-            SubView (const SubView&);
-            SubView& operator= (SubView&);
+        // not implemented
+        SubView(const SubView&);
+        SubView& operator=(SubView&);
 
-        protected:
+    protected:
+        void setUniversalId(const CSMWorld::UniversalId& id);
 
-            void setUniversalId(const CSMWorld::UniversalId& id);
+        bool event(QEvent* event) override;
 
-            bool event (QEvent *event) override;
+    public:
+        SubView(const CSMWorld::UniversalId& id);
 
-        public:
+        CSMWorld::UniversalId getUniversalId() const;
 
-            SubView (const CSMWorld::UniversalId& id);
+        virtual void setEditLock(bool locked) = 0;
 
-            CSMWorld::UniversalId getUniversalId() const;
+        virtual void setStatusBar(bool show);
+        ///< Default implementation: ignored
 
-            virtual void setEditLock (bool locked) = 0;
+        virtual void useHint(const std::string& hint);
+        ///< Default implementation: ignored
 
-            virtual void setStatusBar (bool show);
-            ///< Default implementation: ignored
+        virtual std::string getTitle() const;
 
-            virtual void useHint (const std::string& hint);
-            ///< Default implementation: ignored
+    private:
+        void closeEvent(QCloseEvent* event) override;
 
-            virtual std::string getTitle() const;
+    signals:
 
-        private:
+        void focusId(const CSMWorld::UniversalId& universalId, const std::string& hint);
 
-            void closeEvent (QCloseEvent *event) override;
+        void closeRequest(SubView* subView);
 
-        signals:
+        void updateTitle();
 
-            void focusId (const CSMWorld::UniversalId& universalId, const std::string& hint);
+        void updateSubViewIndices(SubView* view = nullptr);
 
-            void closeRequest (SubView *subView);
+        void universalIdChanged(const CSMWorld::UniversalId& universalId);
 
-            void updateTitle();
+    protected slots:
 
-            void updateSubViewIndices (SubView *view = nullptr);
-
-            void universalIdChanged (const CSMWorld::UniversalId& universalId);
-
-        protected slots:
-
-            void closeRequest();
+        void closeRequest();
     };
 }
 
diff --git a/apps/opencs/view/doc/subviewfactory.cpp b/apps/opencs/view/doc/subviewfactory.cpp
index 82a8aeb054..7ab16df5c2 100644
--- a/apps/opencs/view/doc/subviewfactory.cpp
+++ b/apps/opencs/view/doc/subviewfactory.cpp
@@ -8,30 +8,28 @@ CSVDoc::SubViewFactoryBase::SubViewFactoryBase() {}
 
 CSVDoc::SubViewFactoryBase::~SubViewFactoryBase() {}
 
-
 CSVDoc::SubViewFactoryManager::SubViewFactoryManager() {}
 
 CSVDoc::SubViewFactoryManager::~SubViewFactoryManager()
 {
-    for (std::map<CSMWorld::UniversalId::Type, SubViewFactoryBase *>::iterator iter (mSubViewFactories.begin());
-        iter!=mSubViewFactories.end(); ++iter)
+    for (std::map<CSMWorld::UniversalId::Type, SubViewFactoryBase*>::iterator iter(mSubViewFactories.begin());
+         iter != mSubViewFactories.end(); ++iter)
         delete iter->second;
 }
 
-void CSVDoc::SubViewFactoryManager::add (const CSMWorld::UniversalId::Type& id, SubViewFactoryBase *factory)
+void CSVDoc::SubViewFactoryManager::add(const CSMWorld::UniversalId::Type& id, SubViewFactoryBase* factory)
 {
-    assert (mSubViewFactories.find (id)==mSubViewFactories.end());
+    assert(mSubViewFactories.find(id) == mSubViewFactories.end());
 
-    mSubViewFactories.insert (std::make_pair (id, factory));
+    mSubViewFactories.insert(std::make_pair(id, factory));
 }
 
-CSVDoc::SubView *CSVDoc::SubViewFactoryManager::makeSubView (const CSMWorld::UniversalId& id,
-    CSMDoc::Document& document)
+CSVDoc::SubView* CSVDoc::SubViewFactoryManager::makeSubView(const CSMWorld::UniversalId& id, CSMDoc::Document& document)
 {
-    std::map<CSMWorld::UniversalId::Type, SubViewFactoryBase *>::iterator iter = mSubViewFactories.find (id.getType());
+    std::map<CSMWorld::UniversalId::Type, SubViewFactoryBase*>::iterator iter = mSubViewFactories.find(id.getType());
 
-    if (iter==mSubViewFactories.end())
-        throw std::runtime_error ("Failed to create a sub view for: " + id.toString());
+    if (iter == mSubViewFactories.end())
+        throw std::runtime_error("Failed to create a sub view for: " + id.toString());
 
-    return iter->second->makeSubView (id, document);
+    return iter->second->makeSubView(id, document);
 }
diff --git a/apps/opencs/view/doc/subviewfactory.hpp b/apps/opencs/view/doc/subviewfactory.hpp
index 1f7c154806..f4d95e7eaa 100644
--- a/apps/opencs/view/doc/subviewfactory.hpp
+++ b/apps/opencs/view/doc/subviewfactory.hpp
@@ -16,39 +16,37 @@ namespace CSVDoc
 
     class SubViewFactoryBase
     {
-            // not implemented
-            SubViewFactoryBase (const SubViewFactoryBase&);
-            SubViewFactoryBase& operator= (const SubViewFactoryBase&);
+        // not implemented
+        SubViewFactoryBase(const SubViewFactoryBase&);
+        SubViewFactoryBase& operator=(const SubViewFactoryBase&);
 
-        public:
+    public:
+        SubViewFactoryBase();
 
-            SubViewFactoryBase();
+        virtual ~SubViewFactoryBase();
 
-            virtual ~SubViewFactoryBase();
-
-            virtual SubView *makeSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document) = 0;
-            ///< The ownership of the returned sub view is not transferred.
+        virtual SubView* makeSubView(const CSMWorld::UniversalId& id, CSMDoc::Document& document) = 0;
+        ///< The ownership of the returned sub view is not transferred.
     };
 
     class SubViewFactoryManager
     {
-            std::map<CSMWorld::UniversalId::Type, SubViewFactoryBase *> mSubViewFactories;
-
-            // not implemented
-            SubViewFactoryManager (const SubViewFactoryManager&);
-            SubViewFactoryManager& operator= (const SubViewFactoryManager&);
+        std::map<CSMWorld::UniversalId::Type, SubViewFactoryBase*> mSubViewFactories;
 
-        public:
+        // not implemented
+        SubViewFactoryManager(const SubViewFactoryManager&);
+        SubViewFactoryManager& operator=(const SubViewFactoryManager&);
 
-            SubViewFactoryManager();
+    public:
+        SubViewFactoryManager();
 
-            ~SubViewFactoryManager();
+        ~SubViewFactoryManager();
 
-            void add (const CSMWorld::UniversalId::Type& id, SubViewFactoryBase *factory);
-            ///< The ownership of \a factory is transferred to this.
+        void add(const CSMWorld::UniversalId::Type& id, SubViewFactoryBase* factory);
+        ///< The ownership of \a factory is transferred to this.
 
-            SubView *makeSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document);
-            ///< The ownership of the returned sub view is not transferred.
+        SubView* makeSubView(const CSMWorld::UniversalId& id, CSMDoc::Document& document);
+        ///< The ownership of the returned sub view is not transferred.
     };
 }
 
diff --git a/apps/opencs/view/doc/subviewfactoryimp.hpp b/apps/opencs/view/doc/subviewfactoryimp.hpp
index 152b443a34..40990779a4 100644
--- a/apps/opencs/view/doc/subviewfactoryimp.hpp
+++ b/apps/opencs/view/doc/subviewfactoryimp.hpp
@@ -7,44 +7,41 @@
 
 namespace CSVDoc
 {
-    template<class SubViewT>
+    template <class SubViewT>
     class SubViewFactory : public SubViewFactoryBase
     {
-        public:
-
-            CSVDoc::SubView *makeSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document) override;
+    public:
+        CSVDoc::SubView* makeSubView(const CSMWorld::UniversalId& id, CSMDoc::Document& document) override;
     };
 
-    template<class SubViewT>
-    CSVDoc::SubView *SubViewFactory<SubViewT>::makeSubView (const CSMWorld::UniversalId& id,
-        CSMDoc::Document& document)
+    template <class SubViewT>
+    CSVDoc::SubView* SubViewFactory<SubViewT>::makeSubView(const CSMWorld::UniversalId& id, CSMDoc::Document& document)
     {
-        return new SubViewT (id, document);
+        return new SubViewT(id, document);
     }
 
-
-    template<class SubViewT, class CreatorFactoryT>
+    template <class SubViewT, class CreatorFactoryT>
     class SubViewFactoryWithCreator : public SubViewFactoryBase
     {
-            bool mSorting;
-
-        public:
+        bool mSorting;
 
-            SubViewFactoryWithCreator (bool sorting = true);
+    public:
+        SubViewFactoryWithCreator(bool sorting = true);
 
-            CSVDoc::SubView *makeSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document) override;
+        CSVDoc::SubView* makeSubView(const CSMWorld::UniversalId& id, CSMDoc::Document& document) override;
     };
 
-    template<class SubViewT, class CreatorFactoryT>
-    SubViewFactoryWithCreator<SubViewT, CreatorFactoryT>::SubViewFactoryWithCreator (bool sorting)
-    : mSorting (sorting)
-    {}
+    template <class SubViewT, class CreatorFactoryT>
+    SubViewFactoryWithCreator<SubViewT, CreatorFactoryT>::SubViewFactoryWithCreator(bool sorting)
+        : mSorting(sorting)
+    {
+    }
 
-    template<class SubViewT, class CreatorFactoryT>
-    CSVDoc::SubView *SubViewFactoryWithCreator<SubViewT, CreatorFactoryT>::makeSubView (
+    template <class SubViewT, class CreatorFactoryT>
+    CSVDoc::SubView* SubViewFactoryWithCreator<SubViewT, CreatorFactoryT>::makeSubView(
         const CSMWorld::UniversalId& id, CSMDoc::Document& document)
     {
-        return new SubViewT (id, document, CreatorFactoryT(), mSorting);
+        return new SubViewT(id, document, CreatorFactoryT(), mSorting);
     }
 }
 
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index 0d5dfd829b..8987112dfe 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -3,45 +3,45 @@
 #include <sstream>
 #include <stdexcept>
 
+#include <QApplication>
 #include <QCloseEvent>
+#include <QDesktopWidget>
 #include <QMenuBar>
 #include <QMessageBox>
-#include <QApplication>
-#include <QDesktopWidget>
+#include <QScreen>
 #include <QScrollArea>
 #include <QScrollBar>
-#include <QScreen>
 
 #include "../../model/doc/document.hpp"
 #include "../../model/doc/state.hpp"
 
-#include "../../model/prefs/state.hpp"
 #include "../../model/prefs/shortcut.hpp"
+#include "../../model/prefs/state.hpp"
 
 #include "../../model/world/idtable.hpp"
 
-#include "../world/subviews.hpp"
-#include "../world/scenesubview.hpp"
-#include "../world/tablesubview.hpp"
 #include "../world/dialoguesubview.hpp"
+#include "../world/scenesubview.hpp"
 #include "../world/scriptsubview.hpp"
+#include "../world/subviews.hpp"
+#include "../world/tablesubview.hpp"
 
 #include "../tools/subviews.hpp"
 
+#include <components/files/conversion.hpp>
 #include <components/misc/helpviewer.hpp>
 #include <components/version/version.hpp>
-#include <components/files/conversion.hpp>
 
-#include "viewmanager.hpp"
-#include "operations.hpp"
-#include "subview.hpp"
 #include "globaldebugprofilemenu.hpp"
+#include "operations.hpp"
 #include "runlogsubview.hpp"
+#include "subview.hpp"
 #include "subviewfactoryimp.hpp"
+#include "viewmanager.hpp"
 
-void CSVDoc::View::closeEvent (QCloseEvent *event)
+void CSVDoc::View::closeEvent(QCloseEvent* event)
 {
-    if (!mViewManager.closeRequest (this))
+    if (!mViewManager.closeRequest(this))
         event->ignore();
     else
     {
@@ -52,52 +52,52 @@ void CSVDoc::View::closeEvent (QCloseEvent *event)
 
 void CSVDoc::View::setupFileMenu()
 {
-    QMenu *file = menuBar()->addMenu (tr ("File"));
+    QMenu* file = menuBar()->addMenu(tr("File"));
 
     QAction* newGame = createMenuEntry("New Game", ":./menu-new-game.png", file, "document-file-newgame");
-    connect (newGame, &QAction::triggered, this, &View::newGameRequest);
+    connect(newGame, &QAction::triggered, this, &View::newGameRequest);
 
     QAction* newAddon = createMenuEntry("New Addon", ":./menu-new-addon.png", file, "document-file-newaddon");
-    connect (newAddon, &QAction::triggered, this, &View::newAddonRequest);
+    connect(newAddon, &QAction::triggered, this, &View::newAddonRequest);
 
     QAction* open = createMenuEntry("Open", ":./menu-open.png", file, "document-file-open");
-    connect (open, &QAction::triggered, this, &View::loadDocumentRequest);
+    connect(open, &QAction::triggered, this, &View::loadDocumentRequest);
 
     QAction* save = createMenuEntry("Save", ":./menu-save.png", file, "document-file-save");
-    connect (save, &QAction::triggered, this, &View::save);
+    connect(save, &QAction::triggered, this, &View::save);
     mSave = save;
 
     file->addSeparator();
 
     QAction* verify = createMenuEntry("Verify", ":./menu-verify.png", file, "document-file-verify");
-    connect (verify, &QAction::triggered, this, &View::verify);
+    connect(verify, &QAction::triggered, this, &View::verify);
     mVerify = verify;
 
     QAction* merge = createMenuEntry("Merge", ":./menu-merge.png", file, "document-file-merge");
-    connect (merge, &QAction::triggered, this, &View::merge);
+    connect(merge, &QAction::triggered, this, &View::merge);
     mMerge = merge;
 
     QAction* loadErrors = createMenuEntry("Error Log", ":./error-log.png", file, "document-file-errorlog");
-    connect (loadErrors, &QAction::triggered, this, &View::loadErrorLog);
+    connect(loadErrors, &QAction::triggered, this, &View::loadErrorLog);
 
     QAction* meta = createMenuEntry(CSMWorld::UniversalId::Type_MetaDatas, file, "document-file-metadata");
-    connect (meta, &QAction::triggered, this, &View::addMetaDataSubView);
+    connect(meta, &QAction::triggered, this, &View::addMetaDataSubView);
 
     file->addSeparator();
 
     QAction* close = createMenuEntry("Close", ":./menu-close.png", file, "document-file-close");
-    connect (close, &QAction::triggered, this, &View::close);
+    connect(close, &QAction::triggered, this, &View::close);
 
     QAction* exit = createMenuEntry("Exit", ":./menu-exit.png", file, "document-file-exit");
-    connect (exit, &QAction::triggered, this, &View::exit);
+    connect(exit, &QAction::triggered, this, &View::exit);
 
-    connect (this, &View::exitApplicationRequest, &mViewManager, &ViewManager::exitApplication);
+    connect(this, &View::exitApplicationRequest, &mViewManager, &ViewManager::exitApplication);
 }
 
 namespace
 {
 
-    void updateUndoRedoAction(QAction *action, const std::string &settingsKey)
+    void updateUndoRedoAction(QAction* action, const std::string& settingsKey)
     {
         QKeySequence seq;
         CSMPrefs::State::get().getShortcutManager().getSequence(settingsKey, seq);
@@ -118,249 +118,262 @@ void CSVDoc::View::redoActionChanged()
 
 void CSVDoc::View::setupEditMenu()
 {
-    QMenu *edit = menuBar()->addMenu (tr ("Edit"));
+    QMenu* edit = menuBar()->addMenu(tr("Edit"));
 
-    mUndo = mDocument->getUndoStack().createUndoAction (this, tr("Undo"));
+    mUndo = mDocument->getUndoStack().createUndoAction(this, tr("Undo"));
     setupShortcut("document-edit-undo", mUndo);
     connect(mUndo, &QAction::changed, this, &View::undoActionChanged);
     mUndo->setIcon(QIcon(QString::fromStdString(":./menu-undo.png")));
-    edit->addAction (mUndo);
+    edit->addAction(mUndo);
 
-    mRedo = mDocument->getUndoStack().createRedoAction (this, tr("Redo"));
+    mRedo = mDocument->getUndoStack().createRedoAction(this, tr("Redo"));
     connect(mRedo, &QAction::changed, this, &View::redoActionChanged);
     setupShortcut("document-edit-redo", mRedo);
     mRedo->setIcon(QIcon(QString::fromStdString(":./menu-redo.png")));
-    edit->addAction (mRedo);
+    edit->addAction(mRedo);
 
-    QAction* userSettings = createMenuEntry("Preferences", ":./menu-preferences.png", edit, "document-edit-preferences");
-    connect (userSettings, &QAction::triggered, this, &View::editSettingsRequest);
+    QAction* userSettings
+        = createMenuEntry("Preferences", ":./menu-preferences.png", edit, "document-edit-preferences");
+    connect(userSettings, &QAction::triggered, this, &View::editSettingsRequest);
 
     QAction* search = createMenuEntry(CSMWorld::UniversalId::Type_Search, edit, "document-edit-search");
-    connect (search, &QAction::triggered, this, &View::addSearchSubView);
+    connect(search, &QAction::triggered, this, &View::addSearchSubView);
 }
 
 void CSVDoc::View::setupViewMenu()
 {
-    QMenu *view = menuBar()->addMenu (tr ("View"));
+    QMenu* view = menuBar()->addMenu(tr("View"));
 
-    QAction *newWindow = createMenuEntry("New View", ":./menu-new-window.png", view, "document-view-newview");
-    connect (newWindow, &QAction::triggered, this, &View::newView);
+    QAction* newWindow = createMenuEntry("New View", ":./menu-new-window.png", view, "document-view-newview");
+    connect(newWindow, &QAction::triggered, this, &View::newView);
 
     mShowStatusBar = createMenuEntry("Toggle Status Bar", ":./menu-status-bar.png", view, "document-view-statusbar");
-    connect (mShowStatusBar, &QAction::toggled, this, &View::toggleShowStatusBar);
-    mShowStatusBar->setCheckable (true);
-    mShowStatusBar->setChecked (CSMPrefs::get()["Windows"]["show-statusbar"].isTrue());
+    connect(mShowStatusBar, &QAction::toggled, this, &View::toggleShowStatusBar);
+    mShowStatusBar->setCheckable(true);
+    mShowStatusBar->setChecked(CSMPrefs::get()["Windows"]["show-statusbar"].isTrue());
 
-    view->addAction (mShowStatusBar);
+    view->addAction(mShowStatusBar);
 
-    QAction *filters = createMenuEntry(CSMWorld::UniversalId::Type_Filters, view, "document-mechanics-filters");
-    connect (filters, &QAction::triggered, this, &View::addFiltersSubView);
+    QAction* filters = createMenuEntry(CSMWorld::UniversalId::Type_Filters, view, "document-mechanics-filters");
+    connect(filters, &QAction::triggered, this, &View::addFiltersSubView);
 }
 
 void CSVDoc::View::setupWorldMenu()
 {
-    QMenu *world = menuBar()->addMenu (tr ("World"));
+    QMenu* world = menuBar()->addMenu(tr("World"));
 
-    QAction* referenceables = createMenuEntry(CSMWorld::UniversalId::Type_Referenceables, world, "document-world-referencables");
-    connect (referenceables, &QAction::triggered, this, &View::addReferenceablesSubView);
+    QAction* referenceables
+        = createMenuEntry(CSMWorld::UniversalId::Type_Referenceables, world, "document-world-referencables");
+    connect(referenceables, &QAction::triggered, this, &View::addReferenceablesSubView);
 
     QAction* references = createMenuEntry(CSMWorld::UniversalId::Type_References, world, "document-world-references");
-    connect (references, &QAction::triggered, this, &View::addReferencesSubView);
+    connect(references, &QAction::triggered, this, &View::addReferencesSubView);
 
     world->addSeparator();
 
     QAction* cells = createMenuEntry(CSMWorld::UniversalId::Type_Cells, world, "document-world-cells");
-    connect (cells, &QAction::triggered, this, &View::addCellsSubView);
+    connect(cells, &QAction::triggered, this, &View::addCellsSubView);
 
-    QAction *lands = createMenuEntry(CSMWorld::UniversalId::Type_Lands, world, "document-world-lands");
-    connect (lands, &QAction::triggered, this, &View::addLandsSubView);
+    QAction* lands = createMenuEntry(CSMWorld::UniversalId::Type_Lands, world, "document-world-lands");
+    connect(lands, &QAction::triggered, this, &View::addLandsSubView);
 
-    QAction *landTextures = createMenuEntry(CSMWorld::UniversalId::Type_LandTextures, world, "document-world-landtextures");
-    connect (landTextures, &QAction::triggered, this, &View::addLandTexturesSubView);
+    QAction* landTextures
+        = createMenuEntry(CSMWorld::UniversalId::Type_LandTextures, world, "document-world-landtextures");
+    connect(landTextures, &QAction::triggered, this, &View::addLandTexturesSubView);
 
-    QAction *grid = createMenuEntry(CSMWorld::UniversalId::Type_Pathgrids, world, "document-world-pathgrid");
-    connect (grid, &QAction::triggered, this, &View::addPathgridSubView);
+    QAction* grid = createMenuEntry(CSMWorld::UniversalId::Type_Pathgrids, world, "document-world-pathgrid");
+    connect(grid, &QAction::triggered, this, &View::addPathgridSubView);
 
     world->addSeparator();
 
     QAction* regions = createMenuEntry(CSMWorld::UniversalId::Type_Regions, world, "document-world-regions");
-    connect (regions, &QAction::triggered, this, &View::addRegionsSubView);
+    connect(regions, &QAction::triggered, this, &View::addRegionsSubView);
 
-    QAction *regionMap = createMenuEntry(CSMWorld::UniversalId::Type_RegionMap, world, "document-world-regionmap");
-    connect (regionMap, &QAction::triggered, this, &View::addRegionMapSubView);
+    QAction* regionMap = createMenuEntry(CSMWorld::UniversalId::Type_RegionMap, world, "document-world-regionmap");
+    connect(regionMap, &QAction::triggered, this, &View::addRegionMapSubView);
 }
 
 void CSVDoc::View::setupMechanicsMenu()
 {
-    QMenu *mechanics = menuBar()->addMenu (tr ("Mechanics"));
+    QMenu* mechanics = menuBar()->addMenu(tr("Mechanics"));
 
     QAction* scripts = createMenuEntry(CSMWorld::UniversalId::Type_Scripts, mechanics, "document-mechanics-scripts");
-    connect (scripts, &QAction::triggered, this, &View::addScriptsSubView);
+    connect(scripts, &QAction::triggered, this, &View::addScriptsSubView);
 
-    QAction* startScripts = createMenuEntry(CSMWorld::UniversalId::Type_StartScripts, mechanics, "document-mechanics-startscripts");
-    connect (startScripts, &QAction::triggered, this, &View::addStartScriptsSubView);
+    QAction* startScripts
+        = createMenuEntry(CSMWorld::UniversalId::Type_StartScripts, mechanics, "document-mechanics-startscripts");
+    connect(startScripts, &QAction::triggered, this, &View::addStartScriptsSubView);
 
     QAction* globals = createMenuEntry(CSMWorld::UniversalId::Type_Globals, mechanics, "document-mechanics-globals");
-    connect (globals, &QAction::triggered, this, &View::addGlobalsSubView);
+    connect(globals, &QAction::triggered, this, &View::addGlobalsSubView);
 
     QAction* gmsts = createMenuEntry(CSMWorld::UniversalId::Type_Gmsts, mechanics, "document-mechanics-gamesettings");
-    connect (gmsts, &QAction::triggered, this, &View::addGmstsSubView);
+    connect(gmsts, &QAction::triggered, this, &View::addGmstsSubView);
 
     mechanics->addSeparator();
 
     QAction* spells = createMenuEntry(CSMWorld::UniversalId::Type_Spells, mechanics, "document-mechanics-spells");
-    connect (spells, &QAction::triggered, this, &View::addSpellsSubView);
+    connect(spells, &QAction::triggered, this, &View::addSpellsSubView);
 
-    QAction* enchantments = createMenuEntry(CSMWorld::UniversalId::Type_Enchantments, mechanics, "document-mechanics-enchantments");
-    connect (enchantments, &QAction::triggered, this, &View::addEnchantmentsSubView);
+    QAction* enchantments
+        = createMenuEntry(CSMWorld::UniversalId::Type_Enchantments, mechanics, "document-mechanics-enchantments");
+    connect(enchantments, &QAction::triggered, this, &View::addEnchantmentsSubView);
 
-    QAction* magicEffects = createMenuEntry(CSMWorld::UniversalId::Type_MagicEffects, mechanics, "document-mechanics-magiceffects");
-    connect (magicEffects, &QAction::triggered, this, &View::addMagicEffectsSubView);
+    QAction* magicEffects
+        = createMenuEntry(CSMWorld::UniversalId::Type_MagicEffects, mechanics, "document-mechanics-magiceffects");
+    connect(magicEffects, &QAction::triggered, this, &View::addMagicEffectsSubView);
 }
 
 void CSVDoc::View::setupCharacterMenu()
 {
-    QMenu *characters = menuBar()->addMenu (tr ("Characters"));
+    QMenu* characters = menuBar()->addMenu(tr("Characters"));
 
     QAction* skills = createMenuEntry(CSMWorld::UniversalId::Type_Skills, characters, "document-character-skills");
-    connect (skills, &QAction::triggered, this, &View::addSkillsSubView);
+    connect(skills, &QAction::triggered, this, &View::addSkillsSubView);
 
     QAction* classes = createMenuEntry(CSMWorld::UniversalId::Type_Classes, characters, "document-character-classes");
-    connect (classes, &QAction::triggered, this, &View::addClassesSubView);
+    connect(classes, &QAction::triggered, this, &View::addClassesSubView);
 
     QAction* factions = createMenuEntry(CSMWorld::UniversalId::Type_Faction, characters, "document-character-factions");
-    connect (factions, &QAction::triggered, this, &View::addFactionsSubView);
+    connect(factions, &QAction::triggered, this, &View::addFactionsSubView);
 
     QAction* races = createMenuEntry(CSMWorld::UniversalId::Type_Races, characters, "document-character-races");
-    connect (races, &QAction::triggered, this, &View::addRacesSubView);
+    connect(races, &QAction::triggered, this, &View::addRacesSubView);
 
-    QAction* birthsigns = createMenuEntry(CSMWorld::UniversalId::Type_Birthsigns, characters, "document-character-birthsigns");
-    connect (birthsigns, &QAction::triggered, this, &View::addBirthsignsSubView);
+    QAction* birthsigns
+        = createMenuEntry(CSMWorld::UniversalId::Type_Birthsigns, characters, "document-character-birthsigns");
+    connect(birthsigns, &QAction::triggered, this, &View::addBirthsignsSubView);
 
-    QAction* bodyParts = createMenuEntry(CSMWorld::UniversalId::Type_BodyParts, characters, "document-character-bodyparts");
-    connect (bodyParts, &QAction::triggered, this, &View::addBodyPartsSubView);
+    QAction* bodyParts
+        = createMenuEntry(CSMWorld::UniversalId::Type_BodyParts, characters, "document-character-bodyparts");
+    connect(bodyParts, &QAction::triggered, this, &View::addBodyPartsSubView);
 
     characters->addSeparator();
 
     QAction* topics = createMenuEntry(CSMWorld::UniversalId::Type_Topics, characters, "document-character-topics");
-    connect (topics, &QAction::triggered, this, &View::addTopicsSubView);
+    connect(topics, &QAction::triggered, this, &View::addTopicsSubView);
 
-    QAction* topicInfos = createMenuEntry(CSMWorld::UniversalId::Type_TopicInfos, characters, "document-character-topicinfos");
-    connect (topicInfos, &QAction::triggered, this, &View::addTopicInfosSubView);
+    QAction* topicInfos
+        = createMenuEntry(CSMWorld::UniversalId::Type_TopicInfos, characters, "document-character-topicinfos");
+    connect(topicInfos, &QAction::triggered, this, &View::addTopicInfosSubView);
 
     characters->addSeparator();
 
-    QAction* journals = createMenuEntry(CSMWorld::UniversalId::Type_Journals, characters, "document-character-journals");
-    connect (journals, &QAction::triggered, this, &View::addJournalsSubView);
+    QAction* journals
+        = createMenuEntry(CSMWorld::UniversalId::Type_Journals, characters, "document-character-journals");
+    connect(journals, &QAction::triggered, this, &View::addJournalsSubView);
 
-    QAction* journalInfos = createMenuEntry(CSMWorld::UniversalId::Type_JournalInfos, characters, "document-character-journalinfos");
-    connect (journalInfos, &QAction::triggered, this, &View::addJournalInfosSubView);
+    QAction* journalInfos
+        = createMenuEntry(CSMWorld::UniversalId::Type_JournalInfos, characters, "document-character-journalinfos");
+    connect(journalInfos, &QAction::triggered, this, &View::addJournalInfosSubView);
 }
 
 void CSVDoc::View::setupAssetsMenu()
 {
-    QMenu *assets = menuBar()->addMenu (tr ("Assets"));
+    QMenu* assets = menuBar()->addMenu(tr("Assets"));
 
     QAction* reload = createMenuEntry("Reload", ":./menu-reload.png", assets, "document-assets-reload");
-    connect (reload, &QAction::triggered, &mDocument->getData(), &CSMWorld::Data::assetsChanged);
+    connect(reload, &QAction::triggered, &mDocument->getData(), &CSMWorld::Data::assetsChanged);
 
     assets->addSeparator();
 
     QAction* sounds = createMenuEntry(CSMWorld::UniversalId::Type_Sounds, assets, "document-assets-sounds");
-    connect (sounds, &QAction::triggered, this, &View::addSoundsSubView);
+    connect(sounds, &QAction::triggered, this, &View::addSoundsSubView);
 
     QAction* soundGens = createMenuEntry(CSMWorld::UniversalId::Type_SoundGens, assets, "document-assets-soundgens");
-    connect (soundGens, &QAction::triggered, this, &View::addSoundGensSubView);
+    connect(soundGens, &QAction::triggered, this, &View::addSoundGensSubView);
 
     assets->addSeparator(); // resources follow here
 
     QAction* meshes = createMenuEntry(CSMWorld::UniversalId::Type_Meshes, assets, "document-assets-meshes");
-    connect (meshes, &QAction::triggered, this, &View::addMeshesSubView);
+    connect(meshes, &QAction::triggered, this, &View::addMeshesSubView);
 
     QAction* icons = createMenuEntry(CSMWorld::UniversalId::Type_Icons, assets, "document-assets-icons");
-    connect (icons, &QAction::triggered, this, &View::addIconsSubView);
+    connect(icons, &QAction::triggered, this, &View::addIconsSubView);
 
     QAction* musics = createMenuEntry(CSMWorld::UniversalId::Type_Musics, assets, "document-assets-musics");
-    connect (musics, &QAction::triggered, this, &View::addMusicsSubView);
+    connect(musics, &QAction::triggered, this, &View::addMusicsSubView);
 
     QAction* soundFiles = createMenuEntry(CSMWorld::UniversalId::Type_SoundsRes, assets, "document-assets-soundres");
-    connect (soundFiles, &QAction::triggered, this, &View::addSoundsResSubView);
+    connect(soundFiles, &QAction::triggered, this, &View::addSoundsResSubView);
 
     QAction* textures = createMenuEntry(CSMWorld::UniversalId::Type_Textures, assets, "document-assets-textures");
-    connect (textures, &QAction::triggered, this, &View::addTexturesSubView);
+    connect(textures, &QAction::triggered, this, &View::addTexturesSubView);
 
     QAction* videos = createMenuEntry(CSMWorld::UniversalId::Type_Videos, assets, "document-assets-videos");
-    connect (videos, &QAction::triggered, this, &View::addVideosSubView);
+    connect(videos, &QAction::triggered, this, &View::addVideosSubView);
 }
 
 void CSVDoc::View::setupDebugMenu()
 {
-    QMenu *debug = menuBar()->addMenu (tr ("Debug"));
+    QMenu* debug = menuBar()->addMenu(tr("Debug"));
 
     QAction* profiles = createMenuEntry(CSMWorld::UniversalId::Type_DebugProfiles, debug, "document-debug-profiles");
-    connect (profiles, &QAction::triggered, this, &View::addDebugProfilesSubView);
+    connect(profiles, &QAction::triggered, this, &View::addDebugProfilesSubView);
 
     debug->addSeparator();
 
-    mGlobalDebugProfileMenu = new GlobalDebugProfileMenu (
-        &dynamic_cast<CSMWorld::IdTable&> (*mDocument->getData().getTableModel (
-        CSMWorld::UniversalId::Type_DebugProfiles)), this);
+    mGlobalDebugProfileMenu = new GlobalDebugProfileMenu(
+        &dynamic_cast<CSMWorld::IdTable&>(
+            *mDocument->getData().getTableModel(CSMWorld::UniversalId::Type_DebugProfiles)),
+        this);
 
-    connect (mGlobalDebugProfileMenu, &GlobalDebugProfileMenu::triggered,
-        this, [this](const std::string &profile){ this->run(profile, ""); });
+    connect(mGlobalDebugProfileMenu, &GlobalDebugProfileMenu::triggered, this,
+        [this](const std::string& profile) { this->run(profile, ""); });
 
-    QAction *runDebug = debug->addMenu (mGlobalDebugProfileMenu);
-    runDebug->setText (tr ("Run OpenMW"));
+    QAction* runDebug = debug->addMenu(mGlobalDebugProfileMenu);
+    runDebug->setText(tr("Run OpenMW"));
     setupShortcut("document-debug-run", runDebug);
     runDebug->setIcon(QIcon(QString::fromStdString(":./run-openmw.png")));
 
     QAction* stopDebug = createMenuEntry("Stop OpenMW", ":./stop-openmw.png", debug, "document-debug-shutdown");
-    connect (stopDebug, &QAction::triggered, this, &View::stop);
+    connect(stopDebug, &QAction::triggered, this, &View::stop);
     mStopDebug = stopDebug;
 
     QAction* runLog = createMenuEntry(CSMWorld::UniversalId::Type_RunLog, debug, "document-debug-runlog");
-    connect (runLog, &QAction::triggered, this, &View::addRunLogSubView);
+    connect(runLog, &QAction::triggered, this, &View::addRunLogSubView);
 }
 
 void CSVDoc::View::setupHelpMenu()
 {
-    QMenu *help = menuBar()->addMenu (tr ("Help"));
+    QMenu* help = menuBar()->addMenu(tr("Help"));
 
     QAction* helpInfo = createMenuEntry("Help", ":/info.png", help, "document-help-help");
-    connect (helpInfo, &QAction::triggered, this, &View::openHelp);
+    connect(helpInfo, &QAction::triggered, this, &View::openHelp);
 
     QAction* tutorial = createMenuEntry("Tutorial", ":/info.png", help, "document-help-tutorial");
-    connect (tutorial, &QAction::triggered, this, &View::tutorial);
+    connect(tutorial, &QAction::triggered, this, &View::tutorial);
 
     QAction* about = createMenuEntry("About OpenMW-CS", ":./info.png", help, "document-help-about");
-    connect (about, &QAction::triggered, this, &View::infoAbout);
+    connect(about, &QAction::triggered, this, &View::infoAbout);
 
     QAction* aboutQt = createMenuEntry("About Qt", ":./qt.png", help, "document-help-qt");
-    connect (aboutQt, &QAction::triggered, this, &View::infoAboutQt);
+    connect(aboutQt, &QAction::triggered, this, &View::infoAboutQt);
 }
 
 QAction* CSVDoc::View::createMenuEntry(CSMWorld::UniversalId::Type type, QMenu* menu, const char* shortcutName)
 {
-    const std::string title = CSMWorld::UniversalId (type).getTypeName();
-    QAction *entry = new QAction(QString::fromStdString(title), this);
+    const std::string title = CSMWorld::UniversalId(type).getTypeName();
+    QAction* entry = new QAction(QString::fromStdString(title), this);
     setupShortcut(shortcutName, entry);
-    const std::string iconName = CSMWorld::UniversalId (type).getIcon();
+    const std::string iconName = CSMWorld::UniversalId(type).getIcon();
     if (!iconName.empty() && iconName != ":placeholder")
         entry->setIcon(QIcon(QString::fromStdString(iconName)));
 
-    menu->addAction (entry);
+    menu->addAction(entry);
 
     return entry;
 }
 
-QAction* CSVDoc::View::createMenuEntry(const std::string& title, const std::string& iconName, QMenu* menu, const char* shortcutName)
+QAction* CSVDoc::View::createMenuEntry(
+    const std::string& title, const std::string& iconName, QMenu* menu, const char* shortcutName)
 {
-    QAction *entry = new QAction(QString::fromStdString(title), this);
+    QAction* entry = new QAction(QString::fromStdString(title), this);
     setupShortcut(shortcutName, entry);
     if (!iconName.empty() && iconName != ":placeholder")
         entry->setIcon(QIcon(QString::fromStdString(iconName)));
 
-    menu->addAction (entry);
+    menu->addAction(entry);
 
     return entry;
 }
@@ -391,27 +404,26 @@ void CSVDoc::View::updateTitle()
     stream << Files::pathToUnicodeString(mDocument->getSavePath().filename());
 
     if (mDocument->getState() & CSMDoc::State_Modified)
-            stream << " *";
+        stream << " *";
 
-    if (mViewTotal>1)
-        stream << " [" << (mViewIndex+1) << "/" << mViewTotal << "]";
+    if (mViewTotal > 1)
+        stream << " [" << (mViewIndex + 1) << "/" << mViewTotal << "]";
 
     CSMPrefs::Category& windows = CSMPrefs::State::get()["Windows"];
 
-    bool hideTitle = windows["hide-subview"].isTrue() &&
-        mSubViews.size()==1 && !mSubViews.at (0)->isFloating();
+    bool hideTitle = windows["hide-subview"].isTrue() && mSubViews.size() == 1 && !mSubViews.at(0)->isFloating();
 
     if (hideTitle)
-        stream << " - " << mSubViews.at (0)->getTitle();
+        stream << " - " << mSubViews.at(0)->getTitle();
 
-    setWindowTitle (QString::fromUtf8(stream.str().c_str()));
+    setWindowTitle(QString::fromUtf8(stream.str().c_str()));
 }
 
-void CSVDoc::View::updateSubViewIndices(SubView *view)
+void CSVDoc::View::updateSubViewIndices(SubView* view)
 {
     CSMPrefs::Category& windows = CSMPrefs::State::get()["Windows"];
 
-    if(view && mSubViews.contains(view))
+    if (view && mSubViews.contains(view))
     {
         mSubViews.removeOne(view);
 
@@ -420,24 +432,23 @@ void CSVDoc::View::updateSubViewIndices(SubView *view)
             updateScrollbar();
     }
 
-    bool hideTitle = windows["hide-subview"].isTrue() &&
-        mSubViews.size()==1 && !mSubViews.at (0)->isFloating();
+    bool hideTitle = windows["hide-subview"].isTrue() && mSubViews.size() == 1 && !mSubViews.at(0)->isFloating();
 
     updateTitle();
 
-    for (SubView *subView : mSubViews)
+    for (SubView* subView : mSubViews)
     {
         if (!subView->isFloating())
         {
             if (hideTitle)
             {
-                subView->setTitleBarWidget (new QWidget (this));
-                subView->setWindowTitle (QString::fromUtf8 (subView->getTitle().c_str()));
+                subView->setTitleBarWidget(new QWidget(this));
+                subView->setWindowTitle(QString::fromUtf8(subView->getTitle().c_str()));
             }
             else
             {
                 delete subView->titleBarWidget();
-                subView->setTitleBarWidget (nullptr);
+                subView->setTitleBarWidget(nullptr);
             }
         }
     }
@@ -448,38 +459,41 @@ void CSVDoc::View::updateActions()
     bool editing = !(mDocument->getState() & CSMDoc::State_Locked);
     bool running = mDocument->getState() & CSMDoc::State_Running;
 
-    for (std::vector<QAction *>::iterator iter (mEditingActions.begin()); iter!=mEditingActions.end(); ++iter)
-        (*iter)->setEnabled (editing);
+    for (std::vector<QAction*>::iterator iter(mEditingActions.begin()); iter != mEditingActions.end(); ++iter)
+        (*iter)->setEnabled(editing);
 
-    mUndo->setEnabled (editing && mDocument->getUndoStack().canUndo());
-    mRedo->setEnabled (editing && mDocument->getUndoStack().canRedo());
+    mUndo->setEnabled(editing && mDocument->getUndoStack().canUndo());
+    mRedo->setEnabled(editing && mDocument->getUndoStack().canRedo());
 
-    mSave->setEnabled (!(mDocument->getState() & CSMDoc::State_Saving) && !running);
-    mVerify->setEnabled (!(mDocument->getState() & CSMDoc::State_Verifying));
+    mSave->setEnabled(!(mDocument->getState() & CSMDoc::State_Saving) && !running);
+    mVerify->setEnabled(!(mDocument->getState() & CSMDoc::State_Verifying));
 
-    mGlobalDebugProfileMenu->updateActions (running);
-    mStopDebug->setEnabled (running);
+    mGlobalDebugProfileMenu->updateActions(running);
+    mStopDebug->setEnabled(running);
 
-    mMerge->setEnabled (mDocument->getContentFiles().size()>1 &&
-        !(mDocument->getState() & CSMDoc::State_Merging));
+    mMerge->setEnabled(mDocument->getContentFiles().size() > 1 && !(mDocument->getState() & CSMDoc::State_Merging));
 }
 
-CSVDoc::View::View (ViewManager& viewManager, CSMDoc::Document *document, int totalViews)
-    : mViewManager (viewManager), mDocument (document), mViewIndex (totalViews-1),
-      mViewTotal (totalViews), mScroll(nullptr), mScrollbarOnly(false)
+CSVDoc::View::View(ViewManager& viewManager, CSMDoc::Document* document, int totalViews)
+    : mViewManager(viewManager)
+    , mDocument(document)
+    , mViewIndex(totalViews - 1)
+    , mViewTotal(totalViews)
+    , mScroll(nullptr)
+    , mScrollbarOnly(false)
 {
     CSMPrefs::Category& windows = CSMPrefs::State::get()["Windows"];
 
-    int width = std::max (windows["default-width"].toInt(), 300);
-    int height = std::max (windows["default-height"].toInt(), 300);
+    int width = std::max(windows["default-width"].toInt(), 300);
+    int height = std::max(windows["default-height"].toInt(), 300);
 
-    resize (width, height);
+    resize(width, height);
 
-    mSubViewWindow.setDockOptions (QMainWindow::AllowNestedDocks);
+    mSubViewWindow.setDockOptions(QMainWindow::AllowNestedDocks);
 
     if (windows["mainwindow-scrollbar"].toString() == "Grow Only")
     {
-        setCentralWidget (&mSubViewWindow);
+        setCentralWidget(&mSubViewWindow);
     }
     else
     {
@@ -487,7 +501,7 @@ CSVDoc::View::View (ViewManager& viewManager, CSMDoc::Document *document, int to
     }
 
     mOperations = new Operations;
-    addDockWidget (Qt::BottomDockWidgetArea, mOperations);
+    addDockWidget(Qt::BottomDockWidgetArea, mOperations);
 
     setContextMenuPolicy(Qt::NoContextMenu);
 
@@ -497,32 +511,29 @@ CSVDoc::View::View (ViewManager& viewManager, CSMDoc::Document *document, int to
 
     updateActions();
 
-    CSVWorld::addSubViewFactories (mSubViewFactory);
-    CSVTools::addSubViewFactories (mSubViewFactory);
+    CSVWorld::addSubViewFactories(mSubViewFactory);
+    CSVTools::addSubViewFactories(mSubViewFactory);
 
-    mSubViewFactory.add (CSMWorld::UniversalId::Type_RunLog, new SubViewFactory<RunLogSubView>);
+    mSubViewFactory.add(CSMWorld::UniversalId::Type_RunLog, new SubViewFactory<RunLogSubView>);
 
-    connect (mOperations, &Operations::abortOperation, this, &View::abortOperation);
+    connect(mOperations, &Operations::abortOperation, this, &View::abortOperation);
 
-    connect (&CSMPrefs::State::get(), &CSMPrefs::State::settingChanged,
-        this, &View::settingChanged);
+    connect(&CSMPrefs::State::get(), &CSMPrefs::State::settingChanged, this, &View::settingChanged);
 }
 
-CSVDoc::View::~View()
-{
-}
+CSVDoc::View::~View() {}
 
-const CSMDoc::Document *CSVDoc::View::getDocument() const
+const CSMDoc::Document* CSVDoc::View::getDocument() const
 {
-        return mDocument;
+    return mDocument;
 }
 
-CSMDoc::Document *CSVDoc::View::getDocument()
+CSMDoc::Document* CSVDoc::View::getDocument()
 {
-        return mDocument;
+    return mDocument;
 }
 
-void CSVDoc::View::setIndex (int viewIndex, int totalViews)
+void CSVDoc::View::setIndex(int viewIndex, int totalViews)
 {
     mViewIndex = viewIndex;
     mViewTotal = totalViews;
@@ -534,32 +545,33 @@ void CSVDoc::View::updateDocumentState()
     updateTitle();
     updateActions();
 
-    static const int operations[] =
-    {
-        CSMDoc::State_Saving, CSMDoc::State_Verifying, CSMDoc::State_Searching,
+    static const int operations[] = {
+        CSMDoc::State_Saving,
+        CSMDoc::State_Verifying,
+        CSMDoc::State_Searching,
         CSMDoc::State_Merging,
         // end marker
         -1,
     };
 
-    int state = mDocument->getState() ;
+    int state = mDocument->getState();
 
-    for (int i=0; operations[i]!=-1; ++i)
+    for (int i = 0; operations[i] != -1; ++i)
         if (!(state & operations[i]))
-           mOperations->quitOperation (operations[i]);
+            mOperations->quitOperation(operations[i]);
 
-    QList<CSVDoc::SubView *> subViews = findChildren<CSVDoc::SubView *>();
+    QList<CSVDoc::SubView*> subViews = findChildren<CSVDoc::SubView*>();
 
-    for (QList<CSVDoc::SubView *>::iterator iter (subViews.begin()); iter!=subViews.end(); ++iter)
-        (*iter)->setEditLock (state & CSMDoc::State_Locked);
+    for (QList<CSVDoc::SubView*>::iterator iter(subViews.begin()); iter != subViews.end(); ++iter)
+        (*iter)->setEditLock(state & CSMDoc::State_Locked);
 }
 
-void CSVDoc::View::updateProgress (int current, int max, int type, int threads)
+void CSVDoc::View::updateProgress(int current, int max, int type, int threads)
 {
-    mOperations->setProgress (current, max, type, threads);
+    mOperations->setProgress(current, max, type, threads);
 }
 
-void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::string& hint)
+void CSVDoc::View::addSubView(const CSMWorld::UniversalId& id, const std::string& hint)
 {
     CSMPrefs::Category& windows = CSMPrefs::State::get()["Windows"];
 
@@ -568,57 +580,55 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
     // User setting to reuse sub views (on a per top level view basis)
     if (windows["reuse"].isTrue())
     {
-        for (SubView *sb : mSubViews)
+        for (SubView* sb : mSubViews)
         {
-            bool isSubViewReferenceable =
-                sb->getUniversalId().getType() == CSMWorld::UniversalId::Type_Referenceable;
+            bool isSubViewReferenceable = sb->getUniversalId().getType() == CSMWorld::UniversalId::Type_Referenceable;
 
-            if((isReferenceable && isSubViewReferenceable && id.getId() == sb->getUniversalId().getId())
-               ||
-               (!isReferenceable && id == sb->getUniversalId()))
+            if ((isReferenceable && isSubViewReferenceable && id.getId() == sb->getUniversalId().getId())
+                || (!isReferenceable && id == sb->getUniversalId()))
             {
                 sb->setFocus();
                 if (!hint.empty())
-                    sb->useHint (hint);
+                    sb->useHint(hint);
                 return;
             }
         }
     }
 
     if (mScroll)
-        QObject::connect(mScroll->horizontalScrollBar(), &QScrollBar::rangeChanged,
-            this, &View::moveScrollBarToEnd);
+        QObject::connect(mScroll->horizontalScrollBar(), &QScrollBar::rangeChanged, this, &View::moveScrollBarToEnd);
 
     // User setting for limiting the number of sub views per top level view.
     // Automatically open a new top level view if this number is exceeded
     //
     // If the sub view limit setting is one, the sub view title bar is hidden and the
     // text in the main title bar is adjusted accordingly
-    if(mSubViews.size() >= windows["max-subviews"].toInt()) // create a new top level view
+    if (mSubViews.size() >= windows["max-subviews"].toInt()) // create a new top level view
     {
         mViewManager.addView(mDocument, id, hint);
 
         return;
     }
 
-    SubView *view = nullptr;
-    if(isReferenceable)
+    SubView* view = nullptr;
+    if (isReferenceable)
     {
-        view = mSubViewFactory.makeSubView (CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Referenceable, id.getId()), *mDocument);
+        view = mSubViewFactory.makeSubView(
+            CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Referenceable, id.getId()), *mDocument);
     }
     else
     {
-        view = mSubViewFactory.makeSubView (id, *mDocument);
+        view = mSubViewFactory.makeSubView(id, *mDocument);
     }
     assert(view);
     view->setParent(this);
-    view->setEditLock (mDocument->getState() & CSMDoc::State_Locked);
+    view->setEditLock(mDocument->getState() & CSMDoc::State_Locked);
     mSubViews.append(view); // only after assert
 
     int minWidth = windows["minimum-width"].toInt();
-    view->setMinimumWidth (minWidth);
+    view->setMinimumWidth(minWidth);
 
-    view->setStatusBar (mShowStatusBar->isChecked());
+    view->setStatusBar(mShowStatusBar->isChecked());
 
     // Work out how to deal with additional subviews
     //
@@ -635,31 +645,28 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
 
     updateWidth(windows["grow-limit"].isTrue(), minWidth);
 
-    mSubViewWindow.addDockWidget (Qt::TopDockWidgetArea, view);
+    mSubViewWindow.addDockWidget(Qt::TopDockWidgetArea, view);
 
     updateSubViewIndices();
 
-    connect (view, &SubView::focusId, this, &View::addSubView);
+    connect(view, &SubView::focusId, this, &View::addSubView);
 
-    connect (view, qOverload<SubView *>(&SubView::closeRequest),
-        this, &View::closeRequest);
+    connect(view, qOverload<SubView*>(&SubView::closeRequest), this, &View::closeRequest);
 
-    connect (view, &SubView::updateTitle, this, &View::updateTitle);
+    connect(view, &SubView::updateTitle, this, &View::updateTitle);
 
-    connect (view, &SubView::updateSubViewIndices, this, &View::updateSubViewIndices);
+    connect(view, &SubView::updateSubViewIndices, this, &View::updateSubViewIndices);
 
     CSVWorld::TableSubView* tableView = dynamic_cast<CSVWorld::TableSubView*>(view);
     if (tableView)
     {
-        connect (this, &View::requestFocus,
-            tableView, &CSVWorld::TableSubView::requestFocus);
+        connect(this, &View::requestFocus, tableView, &CSVWorld::TableSubView::requestFocus);
     }
 
     CSVWorld::SceneSubView* sceneView = dynamic_cast<CSVWorld::SceneSubView*>(view);
     if (sceneView)
     {
-        connect(sceneView, &CSVWorld::SceneSubView::requestFocus,
-                this, &View::onRequestFocus);
+        connect(sceneView, &CSVWorld::SceneSubView::requestFocus, this, &View::onRequestFocus);
     }
 
     if (CSMPrefs::State::get()["ID Tables"]["subview-new-window"].isTrue())
@@ -676,7 +683,7 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
     view->show();
 
     if (!hint.empty())
-        view->useHint (hint);
+        view->useHint(hint);
 }
 
 void CSVDoc::View::moveScrollBarToEnd(int min, int max)
@@ -685,22 +692,21 @@ void CSVDoc::View::moveScrollBarToEnd(int min, int max)
     {
         mScroll->horizontalScrollBar()->setValue(max);
 
-        QObject::disconnect(mScroll->horizontalScrollBar(), &QScrollBar::rangeChanged,
-            this, &View::moveScrollBarToEnd);
+        QObject::disconnect(mScroll->horizontalScrollBar(), &QScrollBar::rangeChanged, this, &View::moveScrollBarToEnd);
     }
 }
 
-void CSVDoc::View::settingChanged (const CSMPrefs::Setting *setting)
+void CSVDoc::View::settingChanged(const CSMPrefs::Setting* setting)
 {
-    if (*setting=="Windows/hide-subview")
-        updateSubViewIndices (nullptr);
-    else if (*setting=="Windows/mainwindow-scrollbar")
+    if (*setting == "Windows/hide-subview")
+        updateSubViewIndices(nullptr);
+    else if (*setting == "Windows/mainwindow-scrollbar")
     {
-        if (setting->toString()!="Grow Only")
+        if (setting->toString() != "Grow Only")
         {
             if (mScroll)
             {
-                if (setting->toString()=="Scrollbar Only")
+                if (setting->toString() == "Scrollbar Only")
                 {
                     mScrollbarOnly = true;
                     mSubViewWindow.setMinimumWidth(0);
@@ -716,10 +722,10 @@ void CSVDoc::View::settingChanged (const CSMPrefs::Setting *setting)
                 createScrollArea();
             }
         }
-        else  if (mScroll)
+        else if (mScroll)
         {
             mScroll->takeWidget();
-            setCentralWidget (&mSubViewWindow);
+            setCentralWidget(&mSubViewWindow);
             mScroll->deleteLater();
             mScroll = nullptr;
         }
@@ -728,7 +734,7 @@ void CSVDoc::View::settingChanged (const CSMPrefs::Setting *setting)
 
 void CSVDoc::View::newView()
 {
-    mViewManager.addView (mDocument);
+    mViewManager.addView(mDocument);
 }
 
 void CSVDoc::View::save()
@@ -749,11 +755,13 @@ void CSVDoc::View::tutorial()
 void CSVDoc::View::infoAbout()
 {
     // Get current OpenMW version
-    QString versionInfo = (Version::getOpenmwVersionDescription(mDocument->getResourceDir())+
+    QString versionInfo = (Version::getOpenmwVersionDescription(mDocument->getResourceDir()) +
 #if defined(__x86_64__) || defined(_M_X64)
-    " (64-bit)").c_str();
+        " (64-bit)")
+                              .c_str();
 #else
-    " (32-bit)").c_str();
+        " (32-bit)")
+                              .c_str();
 #endif
 
     // Get current year
@@ -764,25 +772,23 @@ void CSVDoc::View::infoAbout()
     strftime(copyrightInfo, sizeof(copyrightInfo), "Copyright © 2008-%Y OpenMW Team", &tstruct);
 
     QString aboutText = QString(
-    "<p style=\"white-space: pre-wrap;\">"
-    "<b><h2>OpenMW Construction Set</h2></b>"
-    "%1\n\n"
-    "%2\n\n"
-    "%3\n\n"
-    "<table>"
-    "<tr><td>%4</td><td><a href=\"https://openmw.org\">https://openmw.org</a></td></tr>"
-    "<tr><td>%5</td><td><a href=\"https://forum.openmw.org\">https://forum.openmw.org</a></td></tr>"
-    "<tr><td>%6</td><td><a href=\"https://gitlab.com/OpenMW/openmw/issues\">https://gitlab.com/OpenMW/openmw/issues</a></td></tr>"
-    "<tr><td>%7</td><td><a href=\"https://web.libera.chat/#openmw\">ircs://irc.libera.chat/#openmw</a></td></tr>"
-    "</table>"
-    "</p>")
-    .arg(versionInfo
-        , tr("OpenMW-CS is a content file editor for OpenMW, a modern, free and open source game engine.")
-        , tr(copyrightInfo)
-        , tr("Home Page:")
-        , tr("Forum:")
-        , tr("Bug Tracker:")
-        , tr("IRC:"));
+        "<p style=\"white-space: pre-wrap;\">"
+        "<b><h2>OpenMW Construction Set</h2></b>"
+        "%1\n\n"
+        "%2\n\n"
+        "%3\n\n"
+        "<table>"
+        "<tr><td>%4</td><td><a href=\"https://openmw.org\">https://openmw.org</a></td></tr>"
+        "<tr><td>%5</td><td><a href=\"https://forum.openmw.org\">https://forum.openmw.org</a></td></tr>"
+        "<tr><td>%6</td><td><a "
+        "href=\"https://gitlab.com/OpenMW/openmw/issues\">https://gitlab.com/OpenMW/openmw/issues</a></td></tr>"
+        "<tr><td>%7</td><td><a href=\"https://web.libera.chat/#openmw\">ircs://irc.libera.chat/#openmw</a></td></tr>"
+        "</table>"
+        "</p>")
+                            .arg(versionInfo,
+                                tr("OpenMW-CS is a content file editor for OpenMW, a modern, free and open source game "
+                                   "engine."),
+                                tr(copyrightInfo), tr("Home Page:"), tr("Forum:"), tr("Bug Tracker:"), tr("IRC:"));
 
     QMessageBox::about(this, "About OpenMW-CS", aboutText);
 }
@@ -794,233 +800,233 @@ void CSVDoc::View::infoAboutQt()
 
 void CSVDoc::View::verify()
 {
-    addSubView (mDocument->verify());
+    addSubView(mDocument->verify());
 }
 
 void CSVDoc::View::addGlobalsSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Globals);
+    addSubView(CSMWorld::UniversalId::Type_Globals);
 }
 
 void CSVDoc::View::addGmstsSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Gmsts);
+    addSubView(CSMWorld::UniversalId::Type_Gmsts);
 }
 
 void CSVDoc::View::addSkillsSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Skills);
+    addSubView(CSMWorld::UniversalId::Type_Skills);
 }
 
 void CSVDoc::View::addClassesSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Classes);
+    addSubView(CSMWorld::UniversalId::Type_Classes);
 }
 
 void CSVDoc::View::addFactionsSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Factions);
+    addSubView(CSMWorld::UniversalId::Type_Factions);
 }
 
 void CSVDoc::View::addRacesSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Races);
+    addSubView(CSMWorld::UniversalId::Type_Races);
 }
 
 void CSVDoc::View::addSoundsSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Sounds);
+    addSubView(CSMWorld::UniversalId::Type_Sounds);
 }
 
 void CSVDoc::View::addScriptsSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Scripts);
+    addSubView(CSMWorld::UniversalId::Type_Scripts);
 }
 
 void CSVDoc::View::addRegionsSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Regions);
+    addSubView(CSMWorld::UniversalId::Type_Regions);
 }
 
 void CSVDoc::View::addBirthsignsSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Birthsigns);
+    addSubView(CSMWorld::UniversalId::Type_Birthsigns);
 }
 
 void CSVDoc::View::addSpellsSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Spells);
+    addSubView(CSMWorld::UniversalId::Type_Spells);
 }
 
 void CSVDoc::View::addCellsSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Cells);
+    addSubView(CSMWorld::UniversalId::Type_Cells);
 }
 
 void CSVDoc::View::addReferenceablesSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Referenceables);
+    addSubView(CSMWorld::UniversalId::Type_Referenceables);
 }
 
 void CSVDoc::View::addReferencesSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_References);
+    addSubView(CSMWorld::UniversalId::Type_References);
 }
 
 void CSVDoc::View::addRegionMapSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_RegionMap);
+    addSubView(CSMWorld::UniversalId::Type_RegionMap);
 }
 
 void CSVDoc::View::addFiltersSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Filters);
+    addSubView(CSMWorld::UniversalId::Type_Filters);
 }
 
 void CSVDoc::View::addTopicsSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Topics);
+    addSubView(CSMWorld::UniversalId::Type_Topics);
 }
 
 void CSVDoc::View::addJournalsSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Journals);
+    addSubView(CSMWorld::UniversalId::Type_Journals);
 }
 
 void CSVDoc::View::addTopicInfosSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_TopicInfos);
+    addSubView(CSMWorld::UniversalId::Type_TopicInfos);
 }
 
 void CSVDoc::View::addJournalInfosSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_JournalInfos);
+    addSubView(CSMWorld::UniversalId::Type_JournalInfos);
 }
 
 void CSVDoc::View::addEnchantmentsSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Enchantments);
+    addSubView(CSMWorld::UniversalId::Type_Enchantments);
 }
 
 void CSVDoc::View::addBodyPartsSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_BodyParts);
+    addSubView(CSMWorld::UniversalId::Type_BodyParts);
 }
 
 void CSVDoc::View::addSoundGensSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_SoundGens);
+    addSubView(CSMWorld::UniversalId::Type_SoundGens);
 }
 
 void CSVDoc::View::addMeshesSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Meshes);
+    addSubView(CSMWorld::UniversalId::Type_Meshes);
 }
 
 void CSVDoc::View::addIconsSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Icons);
+    addSubView(CSMWorld::UniversalId::Type_Icons);
 }
 
 void CSVDoc::View::addMusicsSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Musics);
+    addSubView(CSMWorld::UniversalId::Type_Musics);
 }
 
 void CSVDoc::View::addSoundsResSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_SoundsRes);
+    addSubView(CSMWorld::UniversalId::Type_SoundsRes);
 }
 
 void CSVDoc::View::addMagicEffectsSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_MagicEffects);
+    addSubView(CSMWorld::UniversalId::Type_MagicEffects);
 }
 
 void CSVDoc::View::addTexturesSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Textures);
+    addSubView(CSMWorld::UniversalId::Type_Textures);
 }
 
 void CSVDoc::View::addVideosSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Videos);
+    addSubView(CSMWorld::UniversalId::Type_Videos);
 }
 
 void CSVDoc::View::addDebugProfilesSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_DebugProfiles);
+    addSubView(CSMWorld::UniversalId::Type_DebugProfiles);
 }
 
 void CSVDoc::View::addRunLogSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_RunLog);
+    addSubView(CSMWorld::UniversalId::Type_RunLog);
 }
 
 void CSVDoc::View::addLandsSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Lands);
+    addSubView(CSMWorld::UniversalId::Type_Lands);
 }
 
 void CSVDoc::View::addLandTexturesSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_LandTextures);
+    addSubView(CSMWorld::UniversalId::Type_LandTextures);
 }
 
 void CSVDoc::View::addPathgridSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_Pathgrids);
+    addSubView(CSMWorld::UniversalId::Type_Pathgrids);
 }
 
 void CSVDoc::View::addStartScriptsSubView()
 {
-    addSubView (CSMWorld::UniversalId::Type_StartScripts);
+    addSubView(CSMWorld::UniversalId::Type_StartScripts);
 }
 
 void CSVDoc::View::addSearchSubView()
 {
-    addSubView (mDocument->newSearch());
+    addSubView(mDocument->newSearch());
 }
 
 void CSVDoc::View::addMetaDataSubView()
 {
-    addSubView (CSMWorld::UniversalId (CSMWorld::UniversalId::Type_MetaData, "sys::meta"));
+    addSubView(CSMWorld::UniversalId(CSMWorld::UniversalId::Type_MetaData, "sys::meta"));
 }
 
-void CSVDoc::View::abortOperation (int type)
+void CSVDoc::View::abortOperation(int type)
 {
-    mDocument->abortOperation (type);
+    mDocument->abortOperation(type);
     updateActions();
 }
 
-CSVDoc::Operations *CSVDoc::View::getOperations() const
+CSVDoc::Operations* CSVDoc::View::getOperations() const
 {
     return mOperations;
 }
 
 void CSVDoc::View::exit()
 {
-    emit exitApplicationRequest (this);
+    emit exitApplicationRequest(this);
 }
 
-void CSVDoc::View::resizeViewWidth (int width)
+void CSVDoc::View::resizeViewWidth(int width)
 {
     if (width >= 0)
-        resize (width, geometry().height());
+        resize(width, geometry().height());
 }
 
-void CSVDoc::View::resizeViewHeight (int height)
+void CSVDoc::View::resizeViewHeight(int height)
 {
     if (height >= 0)
-        resize (geometry().width(), height);
+        resize(geometry().width(), height);
 }
 
-void CSVDoc::View::toggleShowStatusBar (bool show)
+void CSVDoc::View::toggleShowStatusBar(bool show)
 {
-    for (QObject *view : mSubViewWindow.children())
+    for (QObject* view : mSubViewWindow.children())
     {
-        if (CSVDoc::SubView *subView = dynamic_cast<CSVDoc::SubView *> (view))
-            subView->setStatusBar (show);
+        if (CSVDoc::SubView* subView = dynamic_cast<CSVDoc::SubView*>(view))
+            subView->setStatusBar(show);
     }
 }
 
@@ -1031,12 +1037,12 @@ void CSVDoc::View::toggleStatusBar(bool checked)
 
 void CSVDoc::View::loadErrorLog()
 {
-    addSubView (CSMWorld::UniversalId (CSMWorld::UniversalId::Type_LoadErrorLog, 0));
+    addSubView(CSMWorld::UniversalId(CSMWorld::UniversalId::Type_LoadErrorLog, 0));
 }
 
-void CSVDoc::View::run (const std::string& profile, const std::string& startupInstruction)
+void CSVDoc::View::run(const std::string& profile, const std::string& startupInstruction)
 {
-    mDocument->startRunning (profile, startupInstruction);
+    mDocument->startRunning(profile, startupInstruction);
 }
 
 void CSVDoc::View::stop()
@@ -1044,23 +1050,23 @@ void CSVDoc::View::stop()
     mDocument->stopRunning();
 }
 
-void CSVDoc::View::closeRequest (SubView *subView)
+void CSVDoc::View::closeRequest(SubView* subView)
 {
     CSMPrefs::Category& windows = CSMPrefs::State::get()["Windows"];
 
-    if (mSubViews.size()>1 || mViewTotal<=1 || !windows["hide-subview"].isTrue())
+    if (mSubViews.size() > 1 || mViewTotal <= 1 || !windows["hide-subview"].isTrue())
     {
         subView->deleteLater();
-        mSubViews.removeOne (subView);
+        mSubViews.removeOne(subView);
     }
-    else if (mViewManager.closeRequest (this))
-        mViewManager.removeDocAndView (mDocument);
+    else if (mViewManager.closeRequest(this))
+        mViewManager.removeDocAndView(mDocument);
 }
 
 void CSVDoc::View::updateScrollbar()
 {
     QRect rect;
-    QWidget *topLevel = QApplication::topLevelAt(pos());
+    QWidget* topLevel = QApplication::topLevelAt(pos());
     if (topLevel)
         rect = topLevel->rect();
     else
@@ -1074,7 +1080,7 @@ void CSVDoc::View::updateScrollbar()
 
     int frameWidth = frameGeometry().width() - width();
 
-    if ((newWidth+frameWidth) >= rect.width())
+    if ((newWidth + frameWidth) >= rect.width())
         mSubViewWindow.setMinimumWidth(newWidth);
     else
         mSubViewWindow.setMinimumWidth(0);
@@ -1082,12 +1088,12 @@ void CSVDoc::View::updateScrollbar()
 
 void CSVDoc::View::merge()
 {
-    emit mergeDocument (mDocument);
+    emit mergeDocument(mDocument);
 }
 
 void CSVDoc::View::updateWidth(bool isGrowLimit, int minSubViewWidth)
 {
-    QDesktopWidget *dw = QApplication::desktop();
+    QDesktopWidget* dw = QApplication::desktop();
     QRect rect;
     if (isGrowLimit)
         rect = dw->screenGeometry(this);
@@ -1096,20 +1102,20 @@ void CSVDoc::View::updateWidth(bool isGrowLimit, int minSubViewWidth)
 
     if (!mScrollbarOnly && mScroll && mSubViews.size() > 1)
     {
-        int newWidth = width()+minSubViewWidth;
+        int newWidth = width() + minSubViewWidth;
         int frameWidth = frameGeometry().width() - width();
-        if (newWidth+frameWidth <= rect.width())
+        if (newWidth + frameWidth <= rect.width())
         {
             resize(newWidth, height());
             // WARNING: below code assumes that new subviews are added to the right
-            if (x() > rect.width()-(newWidth+frameWidth))
-                move(rect.width()-(newWidth+frameWidth), y()); // shift left to stay within the screen
+            if (x() > rect.width() - (newWidth + frameWidth))
+                move(rect.width() - (newWidth + frameWidth), y()); // shift left to stay within the screen
         }
         else
         {
             // full width
-            resize(rect.width()-frameWidth, height());
-            mSubViewWindow.setMinimumWidth(mSubViewWindow.width()+minSubViewWidth);
+            resize(rect.width() - frameWidth, height());
+            mSubViewWindow.setMinimumWidth(mSubViewWindow.width() + minSubViewWidth);
             move(0, y());
         }
     }
@@ -1123,15 +1129,15 @@ void CSVDoc::View::createScrollArea()
     setCentralWidget(mScroll);
 }
 
-void CSVDoc::View::onRequestFocus (const std::string& id)
+void CSVDoc::View::onRequestFocus(const std::string& id)
 {
-    if(CSMPrefs::get()["3D Scene Editing"]["open-list-view"].isTrue())
+    if (CSMPrefs::get()["3D Scene Editing"]["open-list-view"].isTrue())
     {
         addReferencesSubView();
         emit requestFocus(id);
     }
     else
     {
-        addSubView(CSMWorld::UniversalId (CSMWorld::UniversalId::Type_Reference, id));
+        addSubView(CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Reference, id));
     }
 }
diff --git a/apps/opencs/view/doc/view.hpp b/apps/opencs/view/doc/view.hpp
index c0d036daae..5c1cc6d5e9 100644
--- a/apps/opencs/view/doc/view.hpp
+++ b/apps/opencs/view/doc/view.hpp
@@ -1,8 +1,8 @@
 #ifndef CSV_DOC_VIEW_H
 #define CSV_DOC_VIEW_H
 
-#include <vector>
 #include <map>
+#include <vector>
 
 #include <QMainWindow>
 
@@ -35,241 +35,240 @@ namespace CSVDoc
 
     class View : public QMainWindow
     {
-            Q_OBJECT
-
-            ViewManager& mViewManager;
-            CSMDoc::Document *mDocument;
-            int mViewIndex;
-            int mViewTotal;
-            QList<SubView *> mSubViews;
-            QAction *mUndo;
-            QAction *mRedo;
-            QAction *mSave;
-            QAction *mVerify;
-            QAction *mShowStatusBar;
-            QAction *mStopDebug;
-            QAction *mMerge;
-            std::vector<QAction *> mEditingActions;
-            Operations *mOperations;
-            SubViewFactoryManager mSubViewFactory;
-            QMainWindow mSubViewWindow;
-            GlobalDebugProfileMenu *mGlobalDebugProfileMenu;
-            QScrollArea *mScroll;
-            bool mScrollbarOnly;
-
+        Q_OBJECT
 
-            // not implemented
-            View (const View&);
-            View& operator= (const View&);
+        ViewManager& mViewManager;
+        CSMDoc::Document* mDocument;
+        int mViewIndex;
+        int mViewTotal;
+        QList<SubView*> mSubViews;
+        QAction* mUndo;
+        QAction* mRedo;
+        QAction* mSave;
+        QAction* mVerify;
+        QAction* mShowStatusBar;
+        QAction* mStopDebug;
+        QAction* mMerge;
+        std::vector<QAction*> mEditingActions;
+        Operations* mOperations;
+        SubViewFactoryManager mSubViewFactory;
+        QMainWindow mSubViewWindow;
+        GlobalDebugProfileMenu* mGlobalDebugProfileMenu;
+        QScrollArea* mScroll;
+        bool mScrollbarOnly;
 
-        private:
+        // not implemented
+        View(const View&);
+        View& operator=(const View&);
 
-            void closeEvent (QCloseEvent *event) override;
+    private:
+        void closeEvent(QCloseEvent* event) override;
 
-            QAction* createMenuEntry(CSMWorld::UniversalId::Type type, QMenu* menu, const char* shortcutName);
-            QAction* createMenuEntry(const std::string& title, const std::string& iconName, QMenu* menu, const char* shortcutName);
+        QAction* createMenuEntry(CSMWorld::UniversalId::Type type, QMenu* menu, const char* shortcutName);
+        QAction* createMenuEntry(
+            const std::string& title, const std::string& iconName, QMenu* menu, const char* shortcutName);
 
-            void setupFileMenu();
+        void setupFileMenu();
 
-            void setupEditMenu();
+        void setupEditMenu();
 
-            void setupViewMenu();
+        void setupViewMenu();
 
-            void setupWorldMenu();
+        void setupWorldMenu();
 
-            void setupMechanicsMenu();
+        void setupMechanicsMenu();
 
-            void setupCharacterMenu();
+        void setupCharacterMenu();
 
-            void setupAssetsMenu();
+        void setupAssetsMenu();
 
-            void setupDebugMenu();
+        void setupDebugMenu();
 
-            void setupHelpMenu();
+        void setupHelpMenu();
 
-            void setupUi();
+        void setupUi();
 
-            void setupShortcut(const char* name, QAction* action);
+        void setupShortcut(const char* name, QAction* action);
 
-            void updateActions();
+        void updateActions();
 
-            void exitApplication();
+        void exitApplication();
 
-            /// User preference function
-            void resizeViewWidth (int width);
+        /// User preference function
+        void resizeViewWidth(int width);
 
-            /// User preference function
-            void resizeViewHeight (int height);
+        /// User preference function
+        void resizeViewHeight(int height);
 
-            void updateScrollbar();
-            void updateWidth(bool isGrowLimit, int minSubViewWidth);
-            void createScrollArea();
-        public:
+        void updateScrollbar();
+        void updateWidth(bool isGrowLimit, int minSubViewWidth);
+        void createScrollArea();
 
-            View (ViewManager& viewManager, CSMDoc::Document *document, int totalViews);
+    public:
+        View(ViewManager& viewManager, CSMDoc::Document* document, int totalViews);
 
-            ///< The ownership of \a document is not transferred to *this.
+        ///< The ownership of \a document is not transferred to *this.
 
-            ~View() override;
+        ~View() override;
 
-            const CSMDoc::Document *getDocument() const;
+        const CSMDoc::Document* getDocument() const;
 
-            CSMDoc::Document *getDocument();
+        CSMDoc::Document* getDocument();
 
-            void setIndex (int viewIndex, int totalViews);
+        void setIndex(int viewIndex, int totalViews);
 
-            void updateDocumentState();
+        void updateDocumentState();
 
-            void updateProgress (int current, int max, int type, int threads);
+        void updateProgress(int current, int max, int type, int threads);
 
-            void toggleStatusBar(bool checked);
+        void toggleStatusBar(bool checked);
 
-            Operations *getOperations() const;
+        Operations* getOperations() const;
 
-        signals:
+    signals:
 
-            void newGameRequest();
+        void newGameRequest();
 
-            void newAddonRequest();
+        void newAddonRequest();
 
-            void loadDocumentRequest();
+        void loadDocumentRequest();
 
-            void exitApplicationRequest (CSVDoc::View *view);
+        void exitApplicationRequest(CSVDoc::View* view);
 
-            void editSettingsRequest();
+        void editSettingsRequest();
 
-            void mergeDocument (CSMDoc::Document *document);
+        void mergeDocument(CSMDoc::Document* document);
 
-            void requestFocus (const std::string& id);
+        void requestFocus(const std::string& id);
 
-        public slots:
+    public slots:
 
-            void addSubView (const CSMWorld::UniversalId& id, const std::string& hint = "");
-            ///< \param hint Suggested view point (e.g. coordinates in a 3D scene or a line number
-            /// in a script).
+        void addSubView(const CSMWorld::UniversalId& id, const std::string& hint = "");
+        ///< \param hint Suggested view point (e.g. coordinates in a 3D scene or a line number
+        /// in a script).
 
-            void abortOperation (int type);
+        void abortOperation(int type);
 
-            void updateTitle();
+        void updateTitle();
 
-            // called when subviews are added or removed
-            void updateSubViewIndices (SubView *view = nullptr);
+        // called when subviews are added or removed
+        void updateSubViewIndices(SubView* view = nullptr);
 
-        private slots:
+    private slots:
 
-            void settingChanged (const CSMPrefs::Setting *setting);
+        void settingChanged(const CSMPrefs::Setting* setting);
 
-            void undoActionChanged();
+        void undoActionChanged();
 
-            void redoActionChanged();
+        void redoActionChanged();
 
-            void newView();
+        void newView();
 
-            void save();
+        void save();
 
-            void exit();
+        void exit();
 
-            static void openHelp();
+        static void openHelp();
 
-            static void tutorial();
+        static void tutorial();
 
-            void infoAbout();
+        void infoAbout();
 
-            void infoAboutQt();
+        void infoAboutQt();
 
-            void verify();
+        void verify();
 
-            void addGlobalsSubView();
+        void addGlobalsSubView();
 
-            void addGmstsSubView();
+        void addGmstsSubView();
 
-            void addSkillsSubView();
+        void addSkillsSubView();
 
-            void addClassesSubView();
+        void addClassesSubView();
 
-            void addFactionsSubView();
+        void addFactionsSubView();
 
-            void addRacesSubView();
+        void addRacesSubView();
 
-            void addSoundsSubView();
+        void addSoundsSubView();
 
-            void addScriptsSubView();
+        void addScriptsSubView();
 
-            void addRegionsSubView();
+        void addRegionsSubView();
 
-            void addBirthsignsSubView();
+        void addBirthsignsSubView();
 
-            void addSpellsSubView();
+        void addSpellsSubView();
 
-            void addCellsSubView();
+        void addCellsSubView();
 
-            void addReferenceablesSubView();
+        void addReferenceablesSubView();
 
-            void addReferencesSubView();
+        void addReferencesSubView();
 
-            void addRegionMapSubView();
+        void addRegionMapSubView();
 
-            void addFiltersSubView();
+        void addFiltersSubView();
 
-            void addTopicsSubView();
+        void addTopicsSubView();
 
-            void addJournalsSubView();
+        void addJournalsSubView();
 
-            void addTopicInfosSubView();
+        void addTopicInfosSubView();
 
-            void addJournalInfosSubView();
+        void addJournalInfosSubView();
 
-            void addEnchantmentsSubView();
+        void addEnchantmentsSubView();
 
-            void addBodyPartsSubView();
+        void addBodyPartsSubView();
 
-            void addSoundGensSubView();
+        void addSoundGensSubView();
 
-            void addMagicEffectsSubView();
+        void addMagicEffectsSubView();
 
-            void addMeshesSubView();
+        void addMeshesSubView();
 
-            void addIconsSubView();
+        void addIconsSubView();
 
-            void addMusicsSubView();
+        void addMusicsSubView();
 
-            void addSoundsResSubView();
+        void addSoundsResSubView();
 
-            void addTexturesSubView();
+        void addTexturesSubView();
 
-            void addVideosSubView();
+        void addVideosSubView();
 
-            void addDebugProfilesSubView();
+        void addDebugProfilesSubView();
 
-            void addRunLogSubView();
+        void addRunLogSubView();
 
-            void addLandsSubView();
+        void addLandsSubView();
 
-            void addLandTexturesSubView();
+        void addLandTexturesSubView();
 
-            void addPathgridSubView();
+        void addPathgridSubView();
 
-            void addStartScriptsSubView();
+        void addStartScriptsSubView();
 
-            void addSearchSubView();
+        void addSearchSubView();
 
-            void addMetaDataSubView();
+        void addMetaDataSubView();
 
-            void toggleShowStatusBar (bool show);
+        void toggleShowStatusBar(bool show);
 
-            void loadErrorLog();
+        void loadErrorLog();
 
-            void run (const std::string& profile, const std::string& startupInstruction = "");
+        void run(const std::string& profile, const std::string& startupInstruction = "");
 
-            void stop();
+        void stop();
 
-            void closeRequest (SubView *subView);
+        void closeRequest(SubView* subView);
 
-            void moveScrollBarToEnd(int min, int max);
+        void moveScrollBarToEnd(int min, int max);
 
-            void merge();
+        void merge();
 
-            void onRequestFocus (const std::string& id);
+        void onRequestFocus(const std::string& id);
     };
 }
 
diff --git a/apps/opencs/view/doc/viewmanager.cpp b/apps/opencs/view/doc/viewmanager.cpp
index fc839a4c7b..b26952ee34 100644
--- a/apps/opencs/view/doc/viewmanager.cpp
+++ b/apps/opencs/view/doc/viewmanager.cpp
@@ -1,7 +1,7 @@
 #include "viewmanager.hpp"
 
-#include <vector>
 #include <map>
+#include <vector>
 
 #include <QApplication>
 #include <QMessageBox>
@@ -18,58 +18,56 @@
 
 #include "../../model/prefs/state.hpp"
 
-#include "../world/util.hpp"
+#include "../world/colordelegate.hpp"
 #include "../world/enumdelegate.hpp"
-#include "../world/vartypedelegate.hpp"
-#include "../world/recordstatusdelegate.hpp"
-#include "../world/idtypedelegate.hpp"
 #include "../world/idcompletiondelegate.hpp"
-#include "../world/colordelegate.hpp"
+#include "../world/idtypedelegate.hpp"
+#include "../world/recordstatusdelegate.hpp"
+#include "../world/util.hpp"
+#include "../world/vartypedelegate.hpp"
 
 #include "view.hpp"
 
 void CSVDoc::ViewManager::updateIndices()
 {
-    std::map<CSMDoc::Document *, std::pair<int, int> > documents;
+    std::map<CSMDoc::Document*, std::pair<int, int>> documents;
 
-    for (std::vector<View *>::const_iterator iter (mViews.begin()); iter!=mViews.end(); ++iter)
+    for (std::vector<View*>::const_iterator iter(mViews.begin()); iter != mViews.end(); ++iter)
     {
-        std::map<CSMDoc::Document *, std::pair<int, int> >::iterator document = documents.find ((*iter)->getDocument());
+        std::map<CSMDoc::Document*, std::pair<int, int>>::iterator document = documents.find((*iter)->getDocument());
 
-        if (document==documents.end())
-            document =
-                documents.insert (
-                    std::make_pair ((*iter)->getDocument(), std::make_pair (0, countViews ((*iter)->getDocument())))).
-                first;
+        if (document == documents.end())
+            document = documents
+                           .insert(std::make_pair(
+                               (*iter)->getDocument(), std::make_pair(0, countViews((*iter)->getDocument()))))
+                           .first;
 
-        (*iter)->setIndex (document->second.first++, document->second.second);
+        (*iter)->setIndex(document->second.first++, document->second.second);
     }
 }
 
-CSVDoc::ViewManager::ViewManager (CSMDoc::DocumentManager& documentManager)
-    : mDocumentManager (documentManager), mExitOnSaveStateChange(false), mUserWarned(false)
+CSVDoc::ViewManager::ViewManager(CSMDoc::DocumentManager& documentManager)
+    : mDocumentManager(documentManager)
+    , mExitOnSaveStateChange(false)
+    , mUserWarned(false)
 {
     mDelegateFactories = new CSVWorld::CommandDelegateFactoryCollection;
 
-    mDelegateFactories->add (CSMWorld::ColumnBase::Display_GmstVarType,
-        new CSVWorld::VarTypeDelegateFactory (ESM::VT_None, ESM::VT_String, ESM::VT_Int, ESM::VT_Float));
+    mDelegateFactories->add(CSMWorld::ColumnBase::Display_GmstVarType,
+        new CSVWorld::VarTypeDelegateFactory(ESM::VT_None, ESM::VT_String, ESM::VT_Int, ESM::VT_Float));
 
-    mDelegateFactories->add (CSMWorld::ColumnBase::Display_GlobalVarType,
-        new CSVWorld::VarTypeDelegateFactory (ESM::VT_Short, ESM::VT_Long, ESM::VT_Float));
+    mDelegateFactories->add(CSMWorld::ColumnBase::Display_GlobalVarType,
+        new CSVWorld::VarTypeDelegateFactory(ESM::VT_Short, ESM::VT_Long, ESM::VT_Float));
 
-    mDelegateFactories->add (CSMWorld::ColumnBase::Display_RecordState,
-        new CSVWorld::RecordStatusDelegateFactory());
+    mDelegateFactories->add(CSMWorld::ColumnBase::Display_RecordState, new CSVWorld::RecordStatusDelegateFactory());
 
-    mDelegateFactories->add (CSMWorld::ColumnBase::Display_RefRecordType,
-        new CSVWorld::IdTypeDelegateFactory());
+    mDelegateFactories->add(CSMWorld::ColumnBase::Display_RefRecordType, new CSVWorld::IdTypeDelegateFactory());
 
-    mDelegateFactories->add (CSMWorld::ColumnBase::Display_Colour,
-        new CSVWorld::ColorDelegateFactory());
+    mDelegateFactories->add(CSMWorld::ColumnBase::Display_Colour, new CSVWorld::ColorDelegateFactory());
 
     std::vector<CSMWorld::ColumnBase::Display> idCompletionColumns = CSMWorld::IdCompletionManager::getDisplayTypes();
     for (std::vector<CSMWorld::ColumnBase::Display>::const_iterator current = idCompletionColumns.begin();
-         current != idCompletionColumns.end();
-         ++current)
+         current != idCompletionColumns.end(); ++current)
     {
         mDelegateFactories->add(*current, new CSVWorld::IdCompletionDelegateFactory());
     }
@@ -81,8 +79,7 @@ CSVDoc::ViewManager::ViewManager (CSMDoc::DocumentManager& documentManager)
         bool mAllowNone;
     };
 
-    static const Mapping sMapping[] =
-    {
+    static const Mapping sMapping[] = {
         { CSMWorld::ColumnBase::Display_Specialisation, CSMWorld::Columns::ColumnId_Specialisation, false },
         { CSMWorld::ColumnBase::Display_Attribute, CSMWorld::Columns::ColumnId_Attribute, true },
         { CSMWorld::ColumnBase::Display_SpellType, CSMWorld::Columns::ColumnId_SpellType, false },
@@ -115,71 +112,65 @@ CSVDoc::ViewManager::ViewManager (CSMDoc::DocumentManager& documentManager)
         { CSMWorld::ColumnBase::Display_GenderNpc, CSMWorld::Columns::ColumnId_Gender, false },
     };
 
-    for (std::size_t i=0; i<sizeof (sMapping)/sizeof (Mapping); ++i)
-        mDelegateFactories->add (sMapping[i].mDisplay, new CSVWorld::EnumDelegateFactory (
-            CSMWorld::Columns::getEnums (sMapping[i].mColumnId), sMapping[i].mAllowNone));
+    for (std::size_t i = 0; i < sizeof(sMapping) / sizeof(Mapping); ++i)
+        mDelegateFactories->add(sMapping[i].mDisplay,
+            new CSVWorld::EnumDelegateFactory(
+                CSMWorld::Columns::getEnums(sMapping[i].mColumnId), sMapping[i].mAllowNone));
 
-    connect (&mDocumentManager, &CSMDoc::DocumentManager::loadRequest,
-        &mLoader, &Loader::add);
+    connect(&mDocumentManager, &CSMDoc::DocumentManager::loadRequest, &mLoader, &Loader::add);
 
-    connect (&mDocumentManager, &CSMDoc::DocumentManager::loadingStopped,
-        &mLoader, &Loader::loadingStopped);
+    connect(&mDocumentManager, &CSMDoc::DocumentManager::loadingStopped, &mLoader, &Loader::loadingStopped);
 
-    connect (&mDocumentManager, &CSMDoc::DocumentManager::nextStage,
-        &mLoader, &Loader::nextStage);
+    connect(&mDocumentManager, &CSMDoc::DocumentManager::nextStage, &mLoader, &Loader::nextStage);
 
-    connect (&mDocumentManager, &CSMDoc::DocumentManager::nextRecord,
-        &mLoader, &Loader::nextRecord);
+    connect(&mDocumentManager, &CSMDoc::DocumentManager::nextRecord, &mLoader, &Loader::nextRecord);
 
-    connect (&mDocumentManager, &CSMDoc::DocumentManager::loadMessage,
-        &mLoader, &Loader::loadMessage);
+    connect(&mDocumentManager, &CSMDoc::DocumentManager::loadMessage, &mLoader, &Loader::loadMessage);
 
-    connect (&mLoader, &Loader::cancel,
-        &mDocumentManager, &CSMDoc::DocumentManager::cancelLoading);
+    connect(&mLoader, &Loader::cancel, &mDocumentManager, &CSMDoc::DocumentManager::cancelLoading);
 
-    connect (&mLoader, &Loader::close,
-        &mDocumentManager, &CSMDoc::DocumentManager::removeDocument);
+    connect(&mLoader, &Loader::close, &mDocumentManager, &CSMDoc::DocumentManager::removeDocument);
 }
 
 CSVDoc::ViewManager::~ViewManager()
 {
     delete mDelegateFactories;
 
-    for (std::vector<View *>::iterator iter (mViews.begin()); iter!=mViews.end(); ++iter)
+    for (std::vector<View*>::iterator iter(mViews.begin()); iter != mViews.end(); ++iter)
         delete *iter;
 }
 
-CSVDoc::View *CSVDoc::ViewManager::addView (CSMDoc::Document *document)
+CSVDoc::View* CSVDoc::ViewManager::addView(CSMDoc::Document* document)
 {
-    if (countViews (document)==0)
+    if (countViews(document) == 0)
     {
         // new document
-        connect (document, &CSMDoc::Document::stateChanged,
-            this, &ViewManager::documentStateChanged);
+        connect(document, &CSMDoc::Document::stateChanged, this, &ViewManager::documentStateChanged);
 
-        connect (document, qOverload<int,int,int,int,CSMDoc::Document*>(&CSMDoc::Document::progress),
-            this, &ViewManager::progress);
+        connect(document, qOverload<int, int, int, int, CSMDoc::Document*>(&CSMDoc::Document::progress), this,
+            &ViewManager::progress);
     }
 
-    View *view = new View (*this, document, countViews (document)+1);
+    View* view = new View(*this, document, countViews(document) + 1);
 
-    mViews.push_back (view);
+    mViews.push_back(view);
 
-    view->toggleStatusBar (CSMPrefs::get()["Windows"]["show-statusbar"].isTrue());
+    view->toggleStatusBar(CSMPrefs::get()["Windows"]["show-statusbar"].isTrue());
     view->show();
 
-    connect (view, &View::newGameRequest, this, &ViewManager::newGameRequest);
-    connect (view, &View::newAddonRequest, this, &ViewManager::newAddonRequest);
-    connect (view, &View::loadDocumentRequest, this, &ViewManager::loadDocumentRequest);
-    connect (view, &View::editSettingsRequest, this, &ViewManager::editSettingsRequest);
-    connect (view, &View::mergeDocument, this, &ViewManager::mergeDocument);
+    connect(view, &View::newGameRequest, this, &ViewManager::newGameRequest);
+    connect(view, &View::newAddonRequest, this, &ViewManager::newAddonRequest);
+    connect(view, &View::loadDocumentRequest, this, &ViewManager::loadDocumentRequest);
+    connect(view, &View::editSettingsRequest, this, &ViewManager::editSettingsRequest);
+    connect(view, &View::mergeDocument, this, &ViewManager::mergeDocument);
 
     updateIndices();
 
     return view;
 }
 
-CSVDoc::View *CSVDoc::ViewManager::addView (CSMDoc::Document *document, const CSMWorld::UniversalId& id, const std::string& hint)
+CSVDoc::View* CSVDoc::ViewManager::addView(
+    CSMDoc::Document* document, const CSMWorld::UniversalId& id, const std::string& hint)
 {
     View* view = addView(document);
     view->addSubView(id, hint);
@@ -187,33 +178,33 @@ CSVDoc::View *CSVDoc::ViewManager::addView (CSMDoc::Document *document, const CS
     return view;
 }
 
-int CSVDoc::ViewManager::countViews (const CSMDoc::Document *document) const
+int CSVDoc::ViewManager::countViews(const CSMDoc::Document* document) const
 {
     int count = 0;
 
-    for (std::vector<View *>::const_iterator iter (mViews.begin()); iter!=mViews.end(); ++iter)
-        if ((*iter)->getDocument()==document)
+    for (std::vector<View*>::const_iterator iter(mViews.begin()); iter != mViews.end(); ++iter)
+        if ((*iter)->getDocument() == document)
             ++count;
 
     return count;
 }
 
-bool CSVDoc::ViewManager::closeRequest (View *view)
+bool CSVDoc::ViewManager::closeRequest(View* view)
 {
-    std::vector<View *>::iterator iter = std::find (mViews.begin(), mViews.end(), view);
+    std::vector<View*>::iterator iter = std::find(mViews.begin(), mViews.end(), view);
 
     bool continueWithClose = false;
 
-    if (iter!=mViews.end())
+    if (iter != mViews.end())
     {
-        bool last = countViews (view->getDocument())<=1;
+        bool last = countViews(view->getDocument()) <= 1;
 
         if (last)
-            continueWithClose = notifySaveOnClose (view);
+            continueWithClose = notifySaveOnClose(view);
         else
         {
             (*iter)->deleteLater();
-            mViews.erase (iter);
+            mViews.erase(iter);
 
             updateIndices();
         }
@@ -223,16 +214,16 @@ bool CSVDoc::ViewManager::closeRequest (View *view)
 }
 
 // NOTE: This method assumes that it is called only if the last document
-void CSVDoc::ViewManager::removeDocAndView (CSMDoc::Document *document)
+void CSVDoc::ViewManager::removeDocAndView(CSMDoc::Document* document)
 {
-    for (std::vector<View *>::iterator iter (mViews.begin()); iter!=mViews.end(); ++iter)
+    for (std::vector<View*>::iterator iter(mViews.begin()); iter != mViews.end(); ++iter)
     {
         // the first match should also be the only match
-        if((*iter)->getDocument() == document)
+        if ((*iter)->getDocument() == document)
         {
             mDocumentManager.removeDocument(document);
             (*iter)->deleteLater();
-            mViews.erase (iter);
+            mViews.erase(iter);
 
             updateIndices();
             return;
@@ -240,43 +231,43 @@ void CSVDoc::ViewManager::removeDocAndView (CSMDoc::Document *document)
     }
 }
 
-bool CSVDoc::ViewManager::notifySaveOnClose (CSVDoc::View *view)
+bool CSVDoc::ViewManager::notifySaveOnClose(CSVDoc::View* view)
 {
     bool result = true;
-    CSMDoc::Document *document = view->getDocument();
+    CSMDoc::Document* document = view->getDocument();
 
-    //notify user of saving in progress
-    if ( (document->getState() & CSMDoc::State_Saving) )
-        result = showSaveInProgressMessageBox (view);
+    // notify user of saving in progress
+    if ((document->getState() & CSMDoc::State_Saving))
+        result = showSaveInProgressMessageBox(view);
 
-    //notify user of unsaved changes and process response
-    else if ( document->getState() & CSMDoc::State_Modified)
-        result = showModifiedDocumentMessageBox (view);
+    // notify user of unsaved changes and process response
+    else if (document->getState() & CSMDoc::State_Modified)
+        result = showModifiedDocumentMessageBox(view);
 
     return result;
 }
 
-bool CSVDoc::ViewManager::showModifiedDocumentMessageBox (CSVDoc::View *view)
+bool CSVDoc::ViewManager::showModifiedDocumentMessageBox(CSVDoc::View* view)
 {
     emit closeMessageBox();
 
     QMessageBox messageBox(view);
-    CSMDoc::Document *document = view->getDocument();
-
-    messageBox.setWindowTitle (Files::pathToQString(document->getSavePath().filename()));
-    messageBox.setText ("The document has been modified.");
-    messageBox.setInformativeText ("Do you want to save your changes?");
-    messageBox.setStandardButtons (QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
-    messageBox.setDefaultButton (QMessageBox::Save);
-    messageBox.setWindowModality (Qt::NonModal);
+    CSMDoc::Document* document = view->getDocument();
+
+    messageBox.setWindowTitle(Files::pathToQString(document->getSavePath().filename()));
+    messageBox.setText("The document has been modified.");
+    messageBox.setInformativeText("Do you want to save your changes?");
+    messageBox.setStandardButtons(QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
+    messageBox.setDefaultButton(QMessageBox::Save);
+    messageBox.setWindowModality(Qt::NonModal);
     messageBox.hide();
     messageBox.show();
 
     bool retVal = true;
 
-    connect (this, &ViewManager::closeMessageBox, &messageBox, &QMessageBox::close);
+    connect(this, &ViewManager::closeMessageBox, &messageBox, &QMessageBox::close);
 
-    connect (document, &CSMDoc::Document::stateChanged, this, &ViewManager::onExitWarningHandler);
+    connect(document, &CSMDoc::Document::stateChanged, this, &ViewManager::onExitWarningHandler);
 
     mUserWarned = true;
     int response = messageBox.exec();
@@ -289,67 +280,64 @@ bool CSVDoc::ViewManager::showModifiedDocumentMessageBox (CSVDoc::View *view)
             document->save();
             mExitOnSaveStateChange = true;
             retVal = false;
-        break;
+            break;
 
         case QMessageBox::Discard:
 
-            disconnect (document, &CSMDoc::Document::stateChanged,
-                this, &ViewManager::onExitWarningHandler);
-        break;
+            disconnect(document, &CSMDoc::Document::stateChanged, this, &ViewManager::onExitWarningHandler);
+            break;
 
         case QMessageBox::Cancel:
 
-            //disconnect to prevent unintended view closures
-            disconnect (document, &CSMDoc::Document::stateChanged,
-                this, &ViewManager::onExitWarningHandler);
+            // disconnect to prevent unintended view closures
+            disconnect(document, &CSMDoc::Document::stateChanged, this, &ViewManager::onExitWarningHandler);
             retVal = false;
-        break;
+            break;
 
         default:
-        break;
-
+            break;
     }
 
     return retVal;
 }
 
-bool CSVDoc::ViewManager::showSaveInProgressMessageBox (CSVDoc::View *view)
+bool CSVDoc::ViewManager::showSaveInProgressMessageBox(CSVDoc::View* view)
 {
     QMessageBox messageBox;
-    CSMDoc::Document *document = view->getDocument();
+    CSMDoc::Document* document = view->getDocument();
 
-    messageBox.setText ("The document is currently being saved.");
+    messageBox.setText("The document is currently being saved.");
     messageBox.setInformativeText("Do you want to close now and abort saving, or wait until saving has completed?");
 
-    QPushButton* waitButton = messageBox.addButton (tr("Wait"), QMessageBox::YesRole);
-    QPushButton* closeButton = messageBox.addButton (tr("Close Now"), QMessageBox::RejectRole);
-    QPushButton* cancelButton = messageBox.addButton (tr("Cancel"), QMessageBox::NoRole);
+    QPushButton* waitButton = messageBox.addButton(tr("Wait"), QMessageBox::YesRole);
+    QPushButton* closeButton = messageBox.addButton(tr("Close Now"), QMessageBox::RejectRole);
+    QPushButton* cancelButton = messageBox.addButton(tr("Cancel"), QMessageBox::NoRole);
 
-    messageBox.setDefaultButton (waitButton);
+    messageBox.setDefaultButton(waitButton);
 
     bool retVal = true;
 
-    //Connections shut down message box if operation ends before user makes a decision.
-    connect (document, &CSMDoc::Document::stateChanged, this, &ViewManager::onExitWarningHandler);
-    connect (this, &ViewManager::closeMessageBox, &messageBox, &QMessageBox::close);
+    // Connections shut down message box if operation ends before user makes a decision.
+    connect(document, &CSMDoc::Document::stateChanged, this, &ViewManager::onExitWarningHandler);
+    connect(this, &ViewManager::closeMessageBox, &messageBox, &QMessageBox::close);
 
-    //set / clear the user warned flag to indicate whether or not the message box is currently active.
+    // set / clear the user warned flag to indicate whether or not the message box is currently active.
     mUserWarned = true;
     messageBox.exec();
     mUserWarned = false;
 
-    //if closed by the warning handler, defaults to the RejectRole button (closeButton)
+    // if closed by the warning handler, defaults to the RejectRole button (closeButton)
     if (messageBox.clickedButton() == waitButton)
     {
-        //save the View iterator for shutdown after the save operation ends
+        // save the View iterator for shutdown after the save operation ends
         mExitOnSaveStateChange = true;
         retVal = false;
     }
 
     else if (messageBox.clickedButton() == closeButton)
     {
-        //disconnect to avoid segmentation fault
-        disconnect (document, &CSMDoc::Document::stateChanged, this, &ViewManager::onExitWarningHandler);
+        // disconnect to avoid segmentation fault
+        disconnect(document, &CSMDoc::Document::stateChanged, this, &ViewManager::onExitWarningHandler);
 
         view->abortOperation(CSMDoc::State_Saving);
         mExitOnSaveStateChange = true;
@@ -357,59 +345,59 @@ bool CSVDoc::ViewManager::showSaveInProgressMessageBox (CSVDoc::View *view)
 
     else if (messageBox.clickedButton() == cancelButton)
     {
-        //abort shutdown, allow save to complete
-        //disconnection to prevent unintended view closures
+        // abort shutdown, allow save to complete
+        // disconnection to prevent unintended view closures
         mExitOnSaveStateChange = false;
-        disconnect (document, &CSMDoc::Document::stateChanged, this, &ViewManager::onExitWarningHandler);
+        disconnect(document, &CSMDoc::Document::stateChanged, this, &ViewManager::onExitWarningHandler);
         retVal = false;
     }
 
     return retVal;
 }
 
-void CSVDoc::ViewManager::documentStateChanged (int state, CSMDoc::Document *document)
+void CSVDoc::ViewManager::documentStateChanged(int state, CSMDoc::Document* document)
 {
-    for (std::vector<View *>::const_iterator iter (mViews.begin()); iter!=mViews.end(); ++iter)
-            if ((*iter)->getDocument()==document)
-                (*iter)->updateDocumentState();
+    for (std::vector<View*>::const_iterator iter(mViews.begin()); iter != mViews.end(); ++iter)
+        if ((*iter)->getDocument() == document)
+            (*iter)->updateDocumentState();
 }
 
-void CSVDoc::ViewManager::progress (int current, int max, int type, int threads, CSMDoc::Document *document)
+void CSVDoc::ViewManager::progress(int current, int max, int type, int threads, CSMDoc::Document* document)
 {
-    for (std::vector<View *>::const_iterator iter (mViews.begin()); iter!=mViews.end(); ++iter)
-            if ((*iter)->getDocument()==document)
-                (*iter)->updateProgress (current, max, type, threads);
+    for (std::vector<View*>::const_iterator iter(mViews.begin()); iter != mViews.end(); ++iter)
+        if ((*iter)->getDocument() == document)
+            (*iter)->updateProgress(current, max, type, threads);
 }
 
-void CSVDoc::ViewManager::onExitWarningHandler (int state, CSMDoc::Document *document)
+void CSVDoc::ViewManager::onExitWarningHandler(int state, CSMDoc::Document* document)
 {
-    if ( !(state & CSMDoc::State_Saving) )
+    if (!(state & CSMDoc::State_Saving))
     {
-        //if the user is being warned (message box is active), shut down the message box,
-        //as there is no save operation currently running
-        if ( mUserWarned )
+        // if the user is being warned (message box is active), shut down the message box,
+        // as there is no save operation currently running
+        if (mUserWarned)
             emit closeMessageBox();
 
-        //otherwise, the user has closed the message box before the save operation ended.
-        //exit the application
+        // otherwise, the user has closed the message box before the save operation ended.
+        // exit the application
         else if (mExitOnSaveStateChange)
             QApplication::instance()->exit();
     }
 }
 
-bool CSVDoc::ViewManager::removeDocument (CSVDoc::View *view)
+bool CSVDoc::ViewManager::removeDocument(CSVDoc::View* view)
 {
-    if(!notifySaveOnClose(view))
+    if (!notifySaveOnClose(view))
         return false;
     else
     {
         // don't bother closing views or updating indicies, but remove from mViews
-        CSMDoc::Document * document = view->getDocument();
-        std::vector<View *> remainingViews;
-        std::vector<View *>::const_iterator iter = mViews.begin();
-        for (; iter!=mViews.end(); ++iter)
+        CSMDoc::Document* document = view->getDocument();
+        std::vector<View*> remainingViews;
+        std::vector<View*>::const_iterator iter = mViews.begin();
+        for (; iter != mViews.end(); ++iter)
         {
-            if(document == (*iter)->getDocument())
+            if (document == (*iter)->getDocument())
                 (*iter)->setVisible(false);
             else
                 remainingViews.push_back(*iter);
@@ -420,16 +408,16 @@ bool CSVDoc::ViewManager::removeDocument (CSVDoc::View *view)
     return true;
 }
 
-void CSVDoc::ViewManager::exitApplication (CSVDoc::View *view)
+void CSVDoc::ViewManager::exitApplication(CSVDoc::View* view)
 {
-    if(!removeDocument(view)) // close the current document first
+    if (!removeDocument(view)) // close the current document first
         return;
 
-    while(!mViews.empty()) // attempt to close all other documents
+    while (!mViews.empty()) // attempt to close all other documents
     {
         mViews.back()->activateWindow();
         mViews.back()->raise(); // raise the window to alert the user
-        if(!removeDocument(mViews.back()))
+        if (!removeDocument(mViews.back()))
             return;
     }
     // Editor exits (via a signal) when the last document is deleted
diff --git a/apps/opencs/view/doc/viewmanager.hpp b/apps/opencs/view/doc/viewmanager.hpp
index fe136027ca..8034b99f29 100644
--- a/apps/opencs/view/doc/viewmanager.hpp
+++ b/apps/opencs/view/doc/viewmanager.hpp
@@ -29,67 +29,66 @@ namespace CSVDoc
 
     class ViewManager : public QObject
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            CSMDoc::DocumentManager& mDocumentManager;
-            std::vector<View *> mViews;
-            CSVWorld::CommandDelegateFactoryCollection *mDelegateFactories;
-            bool mExitOnSaveStateChange;
-            bool mUserWarned;
-            Loader mLoader;
+        CSMDoc::DocumentManager& mDocumentManager;
+        std::vector<View*> mViews;
+        CSVWorld::CommandDelegateFactoryCollection* mDelegateFactories;
+        bool mExitOnSaveStateChange;
+        bool mUserWarned;
+        Loader mLoader;
 
-            // not implemented
-            ViewManager (const ViewManager&);
-            ViewManager& operator= (const ViewManager&);
+        // not implemented
+        ViewManager(const ViewManager&);
+        ViewManager& operator=(const ViewManager&);
 
-            void updateIndices();
-            bool notifySaveOnClose (View *view = nullptr);
-            bool showModifiedDocumentMessageBox (View *view);
-            bool showSaveInProgressMessageBox (View *view);
-            bool removeDocument(View *view);
+        void updateIndices();
+        bool notifySaveOnClose(View* view = nullptr);
+        bool showModifiedDocumentMessageBox(View* view);
+        bool showSaveInProgressMessageBox(View* view);
+        bool removeDocument(View* view);
 
-        public:
+    public:
+        ViewManager(CSMDoc::DocumentManager& documentManager);
 
-            ViewManager (CSMDoc::DocumentManager& documentManager);
+        ~ViewManager() override;
 
-            ~ViewManager() override;
+        View* addView(CSMDoc::Document* document);
+        ///< The ownership of the returned view is not transferred.
 
-            View *addView (CSMDoc::Document *document);
-            ///< The ownership of the returned view is not transferred.
+        View* addView(CSMDoc::Document* document, const CSMWorld::UniversalId& id, const std::string& hint);
 
-            View *addView (CSMDoc::Document *document, const CSMWorld::UniversalId& id, const std::string& hint);
+        int countViews(const CSMDoc::Document* document) const;
+        ///< Return number of views for \a document.
 
-            int countViews (const CSMDoc::Document *document) const;
-            ///< Return number of views for \a document.
+        bool closeRequest(View* view);
+        void removeDocAndView(CSMDoc::Document* document);
 
-            bool closeRequest (View *view);
-            void removeDocAndView (CSMDoc::Document *document);
+    signals:
 
-        signals:
+        void newGameRequest();
 
-            void newGameRequest();
+        void newAddonRequest();
 
-            void newAddonRequest();
+        void loadDocumentRequest();
 
-            void loadDocumentRequest();
+        void closeMessageBox();
 
-            void closeMessageBox();
+        void editSettingsRequest();
 
-            void editSettingsRequest();
+        void mergeDocument(CSMDoc::Document* document);
 
-            void mergeDocument (CSMDoc::Document *document);
+    public slots:
 
-        public slots:
+        void exitApplication(CSVDoc::View* view);
 
-            void exitApplication (CSVDoc::View *view);
+    private slots:
 
-        private slots:
+        void documentStateChanged(int state, CSMDoc::Document* document);
 
-            void documentStateChanged (int state, CSMDoc::Document *document);
+        void progress(int current, int max, int type, int threads, CSMDoc::Document* document);
 
-            void progress (int current, int max, int type, int threads, CSMDoc::Document *document);
-
-            void onExitWarningHandler(int state, CSMDoc::Document* document);
+        void onExitWarningHandler(int state, CSMDoc::Document* document);
     };
 
 }
diff --git a/apps/opencs/view/filter/editwidget.cpp b/apps/opencs/view/filter/editwidget.cpp
index 7dc92c3dc4..b94d59083b 100644
--- a/apps/opencs/view/filter/editwidget.cpp
+++ b/apps/opencs/view/filter/editwidget.cpp
@@ -3,104 +3,104 @@
 #include <sstream>
 
 #include <QAction>
+#include <QApplication>
 #include <QContextMenuEvent>
 #include <QMenu>
 #include <QString>
-#include <QApplication>
 
 #include <components/misc/helpviewer.hpp>
 
+#include "../../model/prefs/shortcut.hpp"
+#include "../../model/world/columns.hpp"
 #include "../../model/world/data.hpp"
 #include "../../model/world/idtablebase.hpp"
-#include "../../model/world/columns.hpp"
-#include "../../model/prefs/shortcut.hpp"
 
-CSVFilter::EditWidget::EditWidget (CSMWorld::Data& data, QWidget *parent)
-: QLineEdit (parent), mParser (data), mIsEmpty(true)
+CSVFilter::EditWidget::EditWidget(CSMWorld::Data& data, QWidget* parent)
+    : QLineEdit(parent)
+    , mParser(data)
+    , mIsEmpty(true)
 {
     mPalette = palette();
-    connect (this, &QLineEdit::textChanged, this, &EditWidget::textChanged);
+    connect(this, &QLineEdit::textChanged, this, &EditWidget::textChanged);
 
-    const CSMWorld::IdTableBase *model =
-            static_cast<const CSMWorld::IdTableBase *> (data.getTableModel (CSMWorld::UniversalId::Type_Filters));
+    const CSMWorld::IdTableBase* model
+        = static_cast<const CSMWorld::IdTableBase*>(data.getTableModel(CSMWorld::UniversalId::Type_Filters));
 
-    connect (model, &CSMWorld::IdTableBase::dataChanged,
-        this, &EditWidget::filterDataChanged, Qt::QueuedConnection);
-    connect (model, &CSMWorld::IdTableBase::rowsRemoved,
-        this, &EditWidget::filterRowsRemoved, Qt::QueuedConnection);
-    connect (model, &CSMWorld::IdTableBase::rowsInserted,
-        this, &EditWidget::filterRowsInserted, Qt::QueuedConnection);
+    connect(model, &CSMWorld::IdTableBase::dataChanged, this, &EditWidget::filterDataChanged, Qt::QueuedConnection);
+    connect(model, &CSMWorld::IdTableBase::rowsRemoved, this, &EditWidget::filterRowsRemoved, Qt::QueuedConnection);
+    connect(model, &CSMWorld::IdTableBase::rowsInserted, this, &EditWidget::filterRowsInserted, Qt::QueuedConnection);
 
-    mStateColumnIndex   = model->findColumnIndex(CSMWorld::Columns::ColumnId_Modification);
-    mDescColumnIndex    = model->findColumnIndex(CSMWorld::Columns::ColumnId_Description);
+    mStateColumnIndex = model->findColumnIndex(CSMWorld::Columns::ColumnId_Modification);
+    mDescColumnIndex = model->findColumnIndex(CSMWorld::Columns::ColumnId_Description);
 
-    mHelpAction = new QAction (tr ("Help"), this);
-    connect (mHelpAction, &QAction::triggered, this, &EditWidget::openHelp);
+    mHelpAction = new QAction(tr("Help"), this);
+    connect(mHelpAction, &QAction::triggered, this, &EditWidget::openHelp);
     mHelpAction->setIcon(QIcon(":/info.png"));
-    addAction (mHelpAction);
+    addAction(mHelpAction);
     auto* openHelpShortcut = new CSMPrefs::Shortcut("help", this);
     openHelpShortcut->associateAction(mHelpAction);
 
     setText("!string(\"ID\", \".*\")");
 }
 
-void CSVFilter::EditWidget::textChanged (const QString& text)
+void CSVFilter::EditWidget::textChanged(const QString& text)
 {
-    //no need to parse and apply filter if it was empty and now is empty too.
-    //e.g. - we modifiing content of filter with already opened some other (big) tables.
-    if (text.length() == 0){
+    // no need to parse and apply filter if it was empty and now is empty too.
+    // e.g. - we modifiing content of filter with already opened some other (big) tables.
+    if (text.length() == 0)
+    {
         if (mIsEmpty)
             return;
         else
             mIsEmpty = true;
-    }else
+    }
+    else
         mIsEmpty = false;
 
-    if (mParser.parse (text.toUtf8().constData()))
+    if (mParser.parse(text.toUtf8().constData()))
     {
-        setPalette (mPalette);
-        emit filterChanged (mParser.getFilter());
+        setPalette(mPalette);
+        emit filterChanged(mParser.getFilter());
     }
     else
     {
-        QPalette palette (mPalette);
-        palette.setColor (QPalette::Text, Qt::red);
-        setPalette (palette);
+        QPalette palette(mPalette);
+        palette.setColor(QPalette::Text, Qt::red);
+        setPalette(palette);
 
         /// \todo improve error reporting; mark only the faulty part
     }
 }
 
-void CSVFilter::EditWidget::filterDataChanged (const QModelIndex& topLeft,
-    const QModelIndex& bottomRight)
+void CSVFilter::EditWidget::filterDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     for (int i = topLeft.column(); i <= bottomRight.column(); ++i)
         if (i != mStateColumnIndex && i != mDescColumnIndex)
-            textChanged (text());
+            textChanged(text());
 }
 
-void CSVFilter::EditWidget::filterRowsRemoved (const QModelIndex& parent, int start, int end)
+void CSVFilter::EditWidget::filterRowsRemoved(const QModelIndex& parent, int start, int end)
 {
-    textChanged (text());
+    textChanged(text());
 }
 
-void CSVFilter::EditWidget::filterRowsInserted (const QModelIndex& parent, int start, int end)
+void CSVFilter::EditWidget::filterRowsInserted(const QModelIndex& parent, int start, int end)
 {
-    textChanged (text());
+    textChanged(text());
 }
 
-void CSVFilter::EditWidget::createFilterRequest (std::vector< std::pair< std::string, std::vector< std::string > > >& filterSource,
-        Qt::DropAction action)
+void CSVFilter::EditWidget::createFilterRequest(
+    std::vector<std::pair<std::string, std::vector<std::string>>>& filterSource, Qt::DropAction action)
 {
     const unsigned count = filterSource.size();
     bool multipleElements = false;
 
-    switch (count) //setting multipleElements;
+    switch (count) // setting multipleElements;
     {
-        case 0: //empty
-            return; //nothing to do here
+        case 0: // empty
+            return; // nothing to do here
 
-        case 1: //only single
+        case 1: // only single
             multipleElements = false;
             break;
 
@@ -110,12 +110,12 @@ void CSVFilter::EditWidget::createFilterRequest (std::vector< std::pair< std::st
     }
 
     Qt::KeyboardModifiers key = QApplication::keyboardModifiers();
-    QString oldContent (text());
+    QString oldContent(text());
 
     bool replaceMode = false;
     std::string orAnd;
 
-    switch (key) //setting replaceMode and string used to glue expressions
+    switch (key) // setting replaceMode and string used to glue expressions
     {
         case Qt::ShiftModifier:
             orAnd = "!or(";
@@ -132,14 +132,16 @@ void CSVFilter::EditWidget::createFilterRequest (std::vector< std::pair< std::st
             break;
     }
 
-    if (oldContent.isEmpty() || !oldContent.contains (QRegExp ("^!.*$", Qt::CaseInsensitive))) //if line edit is empty or it does not contain one shot filter go into replace mode
+    if (oldContent.isEmpty()
+        || !oldContent.contains(QRegExp("^!.*$",
+            Qt::CaseInsensitive))) // if line edit is empty or it does not contain one shot filter go into replace mode
     {
         replaceMode = true;
     }
 
     if (!replaceMode)
     {
-        oldContent.remove ('!');
+        oldContent.remove('!');
     }
 
     std::stringstream ss;
@@ -148,86 +150,93 @@ void CSVFilter::EditWidget::createFilterRequest (std::vector< std::pair< std::st
     {
         if (replaceMode)
         {
-            ss<<"!or(";
-        } else {
+            ss << "!or(";
+        }
+        else
+        {
             ss << orAnd << oldContent.toUtf8().constData() << ',';
         }
 
         for (unsigned i = 0; i < count; ++i)
         {
-            ss<<generateFilter (filterSource[i]);
+            ss << generateFilter(filterSource[i]);
 
-            if (i+1 != count)
+            if (i + 1 != count)
             {
-                ss<<", ";
+                ss << ", ";
             }
         }
 
-        ss<<')';
-    } else {
+        ss << ')';
+    }
+    else
+    {
         if (!replaceMode)
         {
-            ss << orAnd << oldContent.toUtf8().constData() <<',';
-        } else {
-            ss<<'!';
+            ss << orAnd << oldContent.toUtf8().constData() << ',';
+        }
+        else
+        {
+            ss << '!';
         }
 
-        ss << generateFilter (filterSource[0]);
+        ss << generateFilter(filterSource[0]);
 
         if (!replaceMode)
         {
-            ss<<')';
+            ss << ')';
         }
-
     }
 
-    if (ss.str().length() >4)
+    if (ss.str().length() > 4)
     {
         clear();
-        insert (QString::fromUtf8(ss.str().c_str()));
+        insert(QString::fromUtf8(ss.str().c_str()));
     }
 }
 
-std::string CSVFilter::EditWidget::generateFilter (std::pair< std::string, std::vector< std::string > >& seekedString) const
+std::string CSVFilter::EditWidget::generateFilter(std::pair<std::string, std::vector<std::string>>& seekedString) const
 {
     const unsigned columns = seekedString.second.size();
 
     bool multipleColumns = false;
     switch (columns)
     {
-    case 0: //empty
-        return ""; //no column to filter
+        case 0: // empty
+            return ""; // no column to filter
 
-    case 1: //one column to look for
-        multipleColumns = false;
-        break;
+        case 1: // one column to look for
+            multipleColumns = false;
+            break;
 
-    default:
-        multipleColumns = true;
-        break;
+        default:
+            multipleColumns = true;
+            break;
     }
 
     std::stringstream ss;
     if (multipleColumns)
     {
-        ss<<"or(";
+        ss << "or(";
         for (unsigned i = 0; i < columns; ++i)
         {
-            ss<<"string("<<'"'<<seekedString.second[i]<<'"'<<','<<'"'<<seekedString.first<<'"'<<')';
-            if (i+1 != columns)
-                ss<<',';
+            ss << "string(" << '"' << seekedString.second[i] << '"' << ',' << '"' << seekedString.first << '"' << ')';
+            if (i + 1 != columns)
+                ss << ',';
         }
-        ss<<')';
-    } else {
-        ss<<"string"<<'('<<'"'<<seekedString.second[0]<<"\","<<'"'<<seekedString.first<<"\")";
+        ss << ')';
+    }
+    else
+    {
+        ss << "string" << '(' << '"' << seekedString.second[0] << "\"," << '"' << seekedString.first << "\")";
     }
 
     return ss.str();
 }
 
-void CSVFilter::EditWidget::contextMenuEvent(QContextMenuEvent *event)
+void CSVFilter::EditWidget::contextMenuEvent(QContextMenuEvent* event)
 {
-    QMenu *menu = createStandardContextMenu();
+    QMenu* menu = createStandardContextMenu();
     menu->addAction(mHelpAction);
     menu->exec(event->globalPos());
     delete menu;
@@ -237,4 +246,3 @@ void CSVFilter::EditWidget::openHelp()
 {
     Misc::HelpViewer::openHelp("manuals/openmw-cs/record-filters.html");
 }
-
diff --git a/apps/opencs/view/filter/editwidget.hpp b/apps/opencs/view/filter/editwidget.hpp
index c15e4ef913..af6ea2c8d6 100644
--- a/apps/opencs/view/filter/editwidget.hpp
+++ b/apps/opencs/view/filter/editwidget.hpp
@@ -4,8 +4,8 @@
 #include <QLineEdit>
 #include <QPalette>
 
-#include "../../model/filter/parser.hpp"
 #include "../../model/filter/node.hpp"
+#include "../../model/filter/parser.hpp"
 
 class QModelIndex;
 
@@ -18,43 +18,40 @@ namespace CSVFilter
 {
     class EditWidget : public QLineEdit
     {
-            Q_OBJECT
-
-            CSMFilter::Parser mParser;
-            QPalette mPalette;
-            bool mIsEmpty;
-            int mStateColumnIndex;
-            int mDescColumnIndex;
-            QAction *mHelpAction;
+        Q_OBJECT
 
-        public:
+        CSMFilter::Parser mParser;
+        QPalette mPalette;
+        bool mIsEmpty;
+        int mStateColumnIndex;
+        int mDescColumnIndex;
+        QAction* mHelpAction;
 
-            EditWidget (CSMWorld::Data& data, QWidget *parent = nullptr);
+    public:
+        EditWidget(CSMWorld::Data& data, QWidget* parent = nullptr);
 
-            void createFilterRequest(std::vector<std::pair<std::string, std::vector<std::string> > >& filterSource,
-                                     Qt::DropAction action);
+        void createFilterRequest(
+            std::vector<std::pair<std::string, std::vector<std::string>>>& filterSource, Qt::DropAction action);
 
-        signals:
+    signals:
 
-            void filterChanged (std::shared_ptr<CSMFilter::Node> filter);
+        void filterChanged(std::shared_ptr<CSMFilter::Node> filter);
 
     private:
-            std::string generateFilter(std::pair<std::string, std::vector<std::string> >& seekedString) const;
-            void contextMenuEvent (QContextMenuEvent *event) override;
-
-        private slots:
-
-            void textChanged (const QString& text);
+        std::string generateFilter(std::pair<std::string, std::vector<std::string>>& seekedString) const;
+        void contextMenuEvent(QContextMenuEvent* event) override;
 
-            void filterDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
+    private slots:
 
-            void filterRowsRemoved (const QModelIndex& parent, int start, int end);
+        void textChanged(const QString& text);
 
-            void filterRowsInserted (const QModelIndex& parent, int start, int end);
+        void filterDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
-            static void openHelp();
+        void filterRowsRemoved(const QModelIndex& parent, int start, int end);
 
+        void filterRowsInserted(const QModelIndex& parent, int start, int end);
 
+        static void openHelp();
     };
 }
 
diff --git a/apps/opencs/view/filter/filterbox.cpp b/apps/opencs/view/filter/filterbox.cpp
index 30c22c2f51..00edfe04ad 100644
--- a/apps/opencs/view/filter/filterbox.cpp
+++ b/apps/opencs/view/filter/filterbox.cpp
@@ -1,39 +1,38 @@
 #include "filterbox.hpp"
 
-#include <QHBoxLayout>
 #include <QDragEnterEvent>
+#include <QHBoxLayout>
 
 #include "recordfilterbox.hpp"
 
 #include <apps/opencs/model/world/tablemimedata.hpp>
 
-CSVFilter::FilterBox::FilterBox (CSMWorld::Data& data, QWidget *parent)
-: QWidget (parent)
+CSVFilter::FilterBox::FilterBox(CSMWorld::Data& data, QWidget* parent)
+    : QWidget(parent)
 {
-    QHBoxLayout *layout = new QHBoxLayout (this);
+    QHBoxLayout* layout = new QHBoxLayout(this);
 
-    layout->setContentsMargins (0, 0, 0, 0);
+    layout->setContentsMargins(0, 0, 0, 0);
 
-    mRecordFilterBox = new RecordFilterBox (data, this);
+    mRecordFilterBox = new RecordFilterBox(data, this);
 
-    layout->addWidget (mRecordFilterBox);
+    layout->addWidget(mRecordFilterBox);
 
-    setLayout (layout);
+    setLayout(layout);
 
-    connect (mRecordFilterBox, &RecordFilterBox::filterChanged,
-        this, &FilterBox::recordFilterChanged);
+    connect(mRecordFilterBox, &RecordFilterBox::filterChanged, this, &FilterBox::recordFilterChanged);
 
     setAcceptDrops(true);
 }
 
-void CSVFilter::FilterBox::setRecordFilter (const std::string& filter)
+void CSVFilter::FilterBox::setRecordFilter(const std::string& filter)
 {
-    mRecordFilterBox->setFilter (filter);
+    mRecordFilterBox->setFilter(filter);
 }
 
-void CSVFilter::FilterBox::dropEvent (QDropEvent* event)
+void CSVFilter::FilterBox::dropEvent(QDropEvent* event)
 {
-    const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*> (event->mimeData());
+    const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*>(event->mimeData());
     if (!mime) // May happen when non-records (e.g. plain text) are dragged and dropped
         return;
 
@@ -42,18 +41,18 @@ void CSVFilter::FilterBox::dropEvent (QDropEvent* event)
     emit recordDropped(universalIdData, event->proposedAction());
 }
 
-void CSVFilter::FilterBox::dragEnterEvent (QDragEnterEvent* event)
+void CSVFilter::FilterBox::dragEnterEvent(QDragEnterEvent* event)
 {
     event->acceptProposedAction();
 }
 
-void CSVFilter::FilterBox::dragMoveEvent (QDragMoveEvent* event)
+void CSVFilter::FilterBox::dragMoveEvent(QDragMoveEvent* event)
 {
     event->accept();
 }
 
-void CSVFilter::FilterBox::createFilterRequest (std::vector< std::pair< std::string, std::vector< std::string > > >& filterSource,
-                                                Qt::DropAction action)
+void CSVFilter::FilterBox::createFilterRequest(
+    std::vector<std::pair<std::string, std::vector<std::string>>>& filterSource, Qt::DropAction action)
 {
     mRecordFilterBox->createFilterRequest(filterSource, action);
 }
diff --git a/apps/opencs/view/filter/filterbox.hpp b/apps/opencs/view/filter/filterbox.hpp
index e01f77ce6b..1bd89fe3f8 100644
--- a/apps/opencs/view/filter/filterbox.hpp
+++ b/apps/opencs/view/filter/filterbox.hpp
@@ -19,32 +19,30 @@ namespace CSVFilter
 
     class FilterBox : public QWidget
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            RecordFilterBox *mRecordFilterBox;
+        RecordFilterBox* mRecordFilterBox;
 
-        public:
-            FilterBox (CSMWorld::Data& data, QWidget *parent = nullptr);
+    public:
+        FilterBox(CSMWorld::Data& data, QWidget* parent = nullptr);
 
-            void setRecordFilter (const std::string& filter);
+        void setRecordFilter(const std::string& filter);
 
-            void createFilterRequest(std::vector<std::pair<std::string, std::vector<std::string> > >& filterSource,
-                                     Qt::DropAction action);
+        void createFilterRequest(
+            std::vector<std::pair<std::string, std::vector<std::string>>>& filterSource, Qt::DropAction action);
 
+    private:
+        void dragEnterEvent(QDragEnterEvent* event) override;
 
-        private:
-            void dragEnterEvent (QDragEnterEvent* event) override;
+        void dropEvent(QDropEvent* event) override;
 
-            void dropEvent (QDropEvent* event) override;
+        void dragMoveEvent(QDragMoveEvent* event) override;
 
-            void dragMoveEvent(QDragMoveEvent *event) override;
-
-        signals:
-            void recordFilterChanged (std::shared_ptr<CSMFilter::Node> filter);
-            void recordDropped (std::vector<CSMWorld::UniversalId>& types, Qt::DropAction action);
+    signals:
+        void recordFilterChanged(std::shared_ptr<CSMFilter::Node> filter);
+        void recordDropped(std::vector<CSMWorld::UniversalId>& types, Qt::DropAction action);
     };
 
 }
 
 #endif
-
diff --git a/apps/opencs/view/filter/recordfilterbox.cpp b/apps/opencs/view/filter/recordfilterbox.cpp
index face275ef6..41c60f7d1f 100644
--- a/apps/opencs/view/filter/recordfilterbox.cpp
+++ b/apps/opencs/view/filter/recordfilterbox.cpp
@@ -5,35 +5,34 @@
 
 #include "editwidget.hpp"
 
-CSVFilter::RecordFilterBox::RecordFilterBox (CSMWorld::Data& data, QWidget *parent)
-: QWidget (parent)
+CSVFilter::RecordFilterBox::RecordFilterBox(CSMWorld::Data& data, QWidget* parent)
+    : QWidget(parent)
 {
-    QHBoxLayout *layout = new QHBoxLayout (this);
+    QHBoxLayout* layout = new QHBoxLayout(this);
 
-    layout->setContentsMargins (0, 6, 5, 0);
+    layout->setContentsMargins(0, 6, 5, 0);
 
-    QLabel *label = new QLabel("Record Filter", this);
+    QLabel* label = new QLabel("Record Filter", this);
     label->setIndent(2);
-    layout->addWidget (label);
+    layout->addWidget(label);
 
-    mEdit = new EditWidget (data, this);
+    mEdit = new EditWidget(data, this);
 
-    layout->addWidget (mEdit);
+    layout->addWidget(mEdit);
 
-    setLayout (layout);
+    setLayout(layout);
 
-    connect (mEdit, &EditWidget::filterChanged,
-        this, &RecordFilterBox::filterChanged);
+    connect(mEdit, &EditWidget::filterChanged, this, &RecordFilterBox::filterChanged);
 }
 
-void CSVFilter::RecordFilterBox::setFilter (const std::string& filter)
+void CSVFilter::RecordFilterBox::setFilter(const std::string& filter)
 {
     mEdit->clear();
-    mEdit->setText (QString::fromUtf8 (filter.c_str()));
+    mEdit->setText(QString::fromUtf8(filter.c_str()));
 }
 
-void CSVFilter::RecordFilterBox::createFilterRequest (std::vector< std::pair< std::string, std::vector< std::string > > >& filterSource,
-                                                      Qt::DropAction action)
+void CSVFilter::RecordFilterBox::createFilterRequest(
+    std::vector<std::pair<std::string, std::vector<std::string>>>& filterSource, Qt::DropAction action)
 {
     mEdit->createFilterRequest(filterSource, action);
 }
diff --git a/apps/opencs/view/filter/recordfilterbox.hpp b/apps/opencs/view/filter/recordfilterbox.hpp
index b6e04b2758..5583a8c873 100644
--- a/apps/opencs/view/filter/recordfilterbox.hpp
+++ b/apps/opencs/view/filter/recordfilterbox.hpp
@@ -16,24 +16,23 @@ namespace CSVFilter
 
     class RecordFilterBox : public QWidget
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            EditWidget *mEdit;
+        EditWidget* mEdit;
 
-        public:
+    public:
+        RecordFilterBox(CSMWorld::Data& data, QWidget* parent = nullptr);
 
-            RecordFilterBox (CSMWorld::Data& data, QWidget *parent = nullptr);
+        void setFilter(const std::string& filter);
 
-            void setFilter (const std::string& filter);
+        void useFilterRequest(const std::string& idOfFilter);
 
-            void useFilterRequest(const std::string& idOfFilter);
+        void createFilterRequest(
+            std::vector<std::pair<std::string, std::vector<std::string>>>& filterSource, Qt::DropAction action);
 
-            void createFilterRequest(std::vector<std::pair<std::string, std::vector<std::string> > >& filterSource,
-                                     Qt::DropAction action);
+    signals:
 
-        signals:
-
-            void filterChanged (std::shared_ptr<CSMFilter::Node> filter);
+        void filterChanged(std::shared_ptr<CSMFilter::Node> filter);
     };
 
 }
diff --git a/apps/opencs/view/prefs/contextmenulist.cpp b/apps/opencs/view/prefs/contextmenulist.cpp
index 8115c3ecc5..bf7a5f289f 100644
--- a/apps/opencs/view/prefs/contextmenulist.cpp
+++ b/apps/opencs/view/prefs/contextmenulist.cpp
@@ -1,13 +1,13 @@
 #include "contextmenulist.hpp"
 
-#include <QMenu>
 #include <QContextMenuEvent>
+#include <QMenu>
 #include <QMouseEvent>
 
 #include "../../model/prefs/state.hpp"
 
 CSVPrefs::ContextMenuList::ContextMenuList(QWidget* parent)
-    :QListWidget(parent)
+    : QListWidget(parent)
 {
 }
 
diff --git a/apps/opencs/view/prefs/contextmenulist.hpp b/apps/opencs/view/prefs/contextmenulist.hpp
index f527057d2f..42063cea18 100644
--- a/apps/opencs/view/prefs/contextmenulist.hpp
+++ b/apps/opencs/view/prefs/contextmenulist.hpp
@@ -10,24 +10,22 @@ namespace CSVPrefs
 {
     class ContextMenuList : public QListWidget
     {
-            Q_OBJECT
-    
-        public:
-    
-            ContextMenuList(QWidget* parent = nullptr);
-    
-        protected:
-    
-            void contextMenuEvent(QContextMenuEvent* e) override;
-
-            void mousePressEvent(QMouseEvent* e) override;
-    
-        private slots:
-    
-            void resetCategory();
-    
-            void resetAll();
-        };
+        Q_OBJECT
+
+    public:
+        ContextMenuList(QWidget* parent = nullptr);
+
+    protected:
+        void contextMenuEvent(QContextMenuEvent* e) override;
+
+        void mousePressEvent(QMouseEvent* e) override;
+
+    private slots:
+
+        void resetCategory();
+
+        void resetAll();
+    };
 }
 
 #endif
diff --git a/apps/opencs/view/prefs/dialogue.cpp b/apps/opencs/view/prefs/dialogue.cpp
index 369c23eb62..6be85cda0b 100644
--- a/apps/opencs/view/prefs/dialogue.cpp
+++ b/apps/opencs/view/prefs/dialogue.cpp
@@ -1,79 +1,77 @@
 #include "dialogue.hpp"
 
 #include <QApplication>
-#include <QSplitter>
-#include <QStackedWidget>
 #include <QListWidgetItem>
 #include <QScreen>
+#include <QSplitter>
+#include <QStackedWidget>
 
 #include <components/debug/debuglog.hpp>
 
 #include "../../model/prefs/state.hpp"
 
-#include "page.hpp"
-#include "keybindingpage.hpp"
 #include "contextmenulist.hpp"
+#include "keybindingpage.hpp"
+#include "page.hpp"
 
-void CSVPrefs::Dialogue::buildCategorySelector (QSplitter *main)
+void CSVPrefs::Dialogue::buildCategorySelector(QSplitter* main)
 {
-    CSVPrefs::ContextMenuList* list = new CSVPrefs::ContextMenuList (main);
-    list->setMinimumWidth (50);
-    list->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Expanding);
+    CSVPrefs::ContextMenuList* list = new CSVPrefs::ContextMenuList(main);
+    list->setMinimumWidth(50);
+    list->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
-    list->setSelectionBehavior (QAbstractItemView::SelectItems);
+    list->setSelectionBehavior(QAbstractItemView::SelectItems);
 
-    main->addWidget (list);
+    main->addWidget(list);
 
-    QFontMetrics metrics (QApplication::font(list));
+    QFontMetrics metrics(QApplication::font(list));
 
     int maxWidth = 1;
 
-    for (CSMPrefs::State::Iterator iter = CSMPrefs::get().begin(); iter!=CSMPrefs::get().end();
-        ++iter)
+    for (CSMPrefs::State::Iterator iter = CSMPrefs::get().begin(); iter != CSMPrefs::get().end(); ++iter)
     {
-        QString label = QString::fromUtf8 (iter->second.getKey().c_str());
+        QString label = QString::fromUtf8(iter->second.getKey().c_str());
 
-        maxWidth = std::max (maxWidth, metrics.horizontalAdvance (label));
+        maxWidth = std::max(maxWidth, metrics.horizontalAdvance(label));
 
-        list->addItem (label);
+        list->addItem(label);
     }
 
-    list->setMaximumWidth (maxWidth + 10);
+    list->setMaximumWidth(maxWidth + 10);
 
-    connect (list, &ContextMenuList::currentItemChanged,
-        this, &Dialogue::selectionChanged);
+    connect(list, &ContextMenuList::currentItemChanged, this, &Dialogue::selectionChanged);
 }
 
-void CSVPrefs::Dialogue::buildContentArea (QSplitter *main)
+void CSVPrefs::Dialogue::buildContentArea(QSplitter* main)
 {
-    mContent = new QStackedWidget (main);
-    mContent->setSizePolicy (QSizePolicy::Preferred, QSizePolicy::Expanding);
+    mContent = new QStackedWidget(main);
+    mContent->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
 
-    main->addWidget (mContent);
+    main->addWidget(mContent);
 }
 
-CSVPrefs::PageBase *CSVPrefs::Dialogue::makePage (const std::string& key)
+CSVPrefs::PageBase* CSVPrefs::Dialogue::makePage(const std::string& key)
 {
     // special case page code goes here
     if (key == "Key Bindings")
         return new KeyBindingPage(CSMPrefs::get()[key], mContent);
     else
-        return new Page (CSMPrefs::get()[key], mContent);
+        return new Page(CSMPrefs::get()[key], mContent);
 }
 
 CSVPrefs::Dialogue::Dialogue()
 {
-    setWindowTitle ("User Settings");
+    setWindowTitle("User Settings");
 
-    setSizePolicy (QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
 
-    setMinimumSize (600, 400);
+    setMinimumSize(600, 400);
 
-    QSplitter *main = new QSplitter (this);
+    QSplitter* main = new QSplitter(this);
 
-    setCentralWidget (main);
-    buildCategorySelector (main);
-    buildContentArea (main);
+    setCentralWidget(main);
+    buildCategorySelector(main);
+    buildContentArea(main);
 }
 
 CSVPrefs::Dialogue::~Dialogue()
@@ -83,26 +81,26 @@ CSVPrefs::Dialogue::~Dialogue()
         if (isVisible())
             CSMPrefs::State::get().save();
     }
-    catch(const std::exception& e)
+    catch (const std::exception& e)
     {
         Log(Debug::Error) << "Error in the destructor: " << e.what();
     }
 }
 
-void CSVPrefs::Dialogue::closeEvent (QCloseEvent *event)
+void CSVPrefs::Dialogue::closeEvent(QCloseEvent* event)
 {
-    QMainWindow::closeEvent (event);
+    QMainWindow::closeEvent(event);
     CSMPrefs::State::get().save();
 }
 
 void CSVPrefs::Dialogue::show()
 {
-    if (QWidget *active = QApplication::activeWindow())
+    if (QWidget* active = QApplication::activeWindow())
     {
         // place at the centre of the window with focus
         QSize size = active->size();
-        move (active->geometry().x()+(size.width() - frameGeometry().width())/2,
-            active->geometry().y()+(size.height() - frameGeometry().height())/2);
+        move(active->geometry().x() + (size.width() - frameGeometry().width()) / 2,
+            active->geometry().y() + (size.height() - frameGeometry().height()) / 2);
     }
     else
     {
@@ -111,30 +109,30 @@ void CSVPrefs::Dialogue::show()
         // otherwise place at the centre of the screen
         QPoint screenCenter = scr.center();
 
-        move (screenCenter - QPoint(frameGeometry().width()/2, frameGeometry().height()/2));
+        move(screenCenter - QPoint(frameGeometry().width() / 2, frameGeometry().height() / 2));
     }
 
     QWidget::show();
 }
 
-void CSVPrefs::Dialogue::selectionChanged (QListWidgetItem *current, QListWidgetItem *previous)
+void CSVPrefs::Dialogue::selectionChanged(QListWidgetItem* current, QListWidgetItem* previous)
 {
     if (current)
     {
         std::string key = current->text().toUtf8().data();
 
-        for (int i=0; i<mContent->count(); ++i)
+        for (int i = 0; i < mContent->count(); ++i)
         {
-            PageBase& page = dynamic_cast<PageBase&> (*mContent->widget (i));
+            PageBase& page = dynamic_cast<PageBase&>(*mContent->widget(i));
 
-            if (page.getCategory().getKey()==key)
+            if (page.getCategory().getKey() == key)
             {
-                mContent->setCurrentIndex (i);
+                mContent->setCurrentIndex(i);
                 return;
             }
         }
 
-        PageBase *page = makePage (key);
-        mContent->setCurrentIndex (mContent->addWidget (page));
+        PageBase* page = makePage(key);
+        mContent->setCurrentIndex(mContent->addWidget(page));
     }
 }
diff --git a/apps/opencs/view/prefs/dialogue.hpp b/apps/opencs/view/prefs/dialogue.hpp
index 00b2e10ec9..70ee40586c 100644
--- a/apps/opencs/view/prefs/dialogue.hpp
+++ b/apps/opencs/view/prefs/dialogue.hpp
@@ -14,35 +14,32 @@ namespace CSVPrefs
 
     class Dialogue : public QMainWindow
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            QStackedWidget *mContent;
+        QStackedWidget* mContent;
 
-        private:
+    private:
+        void buildCategorySelector(QSplitter* main);
 
-            void buildCategorySelector (QSplitter *main);
+        void buildContentArea(QSplitter* main);
 
-            void buildContentArea (QSplitter *main);
+        PageBase* makePage(const std::string& key);
 
-            PageBase *makePage (const std::string& key);
+    public:
+        Dialogue();
 
-        public:
+        ~Dialogue() override;
 
-            Dialogue();
+    protected:
+        void closeEvent(QCloseEvent* event) override;
 
-            ~Dialogue() override;
+    public slots:
 
-        protected:
+        void show();
 
-            void closeEvent (QCloseEvent *event) override;
+    private slots:
 
-        public slots:
-
-            void show();
-
-        private slots:
-
-            void selectionChanged (QListWidgetItem *current, QListWidgetItem *previous);
+        void selectionChanged(QListWidgetItem* current, QListWidgetItem* previous);
     };
 }
 
diff --git a/apps/opencs/view/prefs/keybindingpage.cpp b/apps/opencs/view/prefs/keybindingpage.cpp
index 37315d3fbc..8af2ff2ea4 100644
--- a/apps/opencs/view/prefs/keybindingpage.cpp
+++ b/apps/opencs/view/prefs/keybindingpage.cpp
@@ -8,8 +8,8 @@
 #include <QStackedLayout>
 #include <QVBoxLayout>
 
-#include "../../model/prefs/setting.hpp"
 #include "../../model/prefs/category.hpp"
+#include "../../model/prefs/setting.hpp"
 #include "../../model/prefs/state.hpp"
 
 namespace CSVPrefs
@@ -29,15 +29,15 @@ namespace CSVPrefs
         mStackedLayout = new QStackedLayout(stackedWidget);
 
         mPageSelector = new QComboBox();
-        connect(mPageSelector, qOverload<int>(&QComboBox::currentIndexChanged),
-                mStackedLayout, &QStackedLayout::setCurrentIndex);
+        connect(mPageSelector, qOverload<int>(&QComboBox::currentIndexChanged), mStackedLayout,
+            &QStackedLayout::setCurrentIndex);
 
         QFrame* lineSeparator = new QFrame(topWidget);
         lineSeparator->setFrameShape(QFrame::HLine);
         lineSeparator->setFrameShadow(QFrame::Sunken);
 
         // Reset key bindings button
-        QPushButton* resetButton = new QPushButton ("Reset to Defaults", topWidget);
+        QPushButton* resetButton = new QPushButton("Reset to Defaults", topWidget);
         connect(resetButton, &QPushButton::clicked, this, &KeyBindingPage::resetKeyBindings);
 
         topLayout->addWidget(mPageSelector);
@@ -47,16 +47,16 @@ namespace CSVPrefs
         topLayout->setSizeConstraint(QLayout::SetMinAndMaxSize);
 
         // Add each option
-        for (CSMPrefs::Category::Iterator iter = category.begin(); iter!=category.end(); ++iter)
-            addSetting (*iter);
+        for (CSMPrefs::Category::Iterator iter = category.begin(); iter != category.end(); ++iter)
+            addSetting(*iter);
 
         setWidgetResizable(true);
         setWidget(topWidget);
     }
 
-    void KeyBindingPage::addSetting(CSMPrefs::Setting *setting)
+    void KeyBindingPage::addSetting(CSMPrefs::Setting* setting)
     {
-        std::pair<QWidget*, QWidget*> widgets = setting->makeWidgets (this);
+        std::pair<QWidget*, QWidget*> widgets = setting->makeWidgets(this);
 
         if (widgets.first)
         {
diff --git a/apps/opencs/view/prefs/keybindingpage.hpp b/apps/opencs/view/prefs/keybindingpage.hpp
index 05c4b22dbc..ad8e125032 100644
--- a/apps/opencs/view/prefs/keybindingpage.hpp
+++ b/apps/opencs/view/prefs/keybindingpage.hpp
@@ -16,23 +16,21 @@ namespace CSVPrefs
 {
     class KeyBindingPage : public PageBase
     {
-            Q_OBJECT
+        Q_OBJECT
 
-        public:
+    public:
+        KeyBindingPage(CSMPrefs::Category& category, QWidget* parent);
 
-            KeyBindingPage(CSMPrefs::Category& category, QWidget* parent);
+        void addSetting(CSMPrefs::Setting* setting);
 
-            void addSetting(CSMPrefs::Setting* setting);
+    private:
+        QStackedLayout* mStackedLayout;
+        QGridLayout* mPageLayout;
+        QComboBox* mPageSelector;
 
-        private:
+    private slots:
 
-            QStackedLayout* mStackedLayout;
-            QGridLayout* mPageLayout;
-            QComboBox* mPageSelector;
-
-        private slots:
-
-            void resetKeyBindings();
+        void resetKeyBindings();
     };
 }
 
diff --git a/apps/opencs/view/prefs/page.cpp b/apps/opencs/view/prefs/page.cpp
index c23e9f64fe..e2fa057fc6 100644
--- a/apps/opencs/view/prefs/page.cpp
+++ b/apps/opencs/view/prefs/page.cpp
@@ -3,38 +3,38 @@
 
 #include <QGridLayout>
 
-#include "../../model/prefs/setting.hpp"
 #include "../../model/prefs/category.hpp"
+#include "../../model/prefs/setting.hpp"
 
-CSVPrefs::Page::Page (CSMPrefs::Category& category, QWidget *parent)
-: PageBase (category, parent)
+CSVPrefs::Page::Page(CSMPrefs::Category& category, QWidget* parent)
+    : PageBase(category, parent)
 {
-    QWidget *widget = new QWidget (parent);
-    mGrid = new QGridLayout (widget);
+    QWidget* widget = new QWidget(parent);
+    mGrid = new QGridLayout(widget);
 
-    for (CSMPrefs::Category::Iterator iter = category.begin(); iter!=category.end(); ++iter)
-        addSetting (*iter);
+    for (CSMPrefs::Category::Iterator iter = category.begin(); iter != category.end(); ++iter)
+        addSetting(*iter);
 
-    setWidget (widget);
+    setWidget(widget);
 }
 
-void CSVPrefs::Page::addSetting (CSMPrefs::Setting *setting)
+void CSVPrefs::Page::addSetting(CSMPrefs::Setting* setting)
 {
-    std::pair<QWidget *, QWidget *> widgets = setting->makeWidgets (this);
+    std::pair<QWidget*, QWidget*> widgets = setting->makeWidgets(this);
 
     int next = mGrid->rowCount();
 
     if (widgets.first)
     {
-        mGrid->addWidget (widgets.first, next, 0);
-        mGrid->addWidget (widgets.second, next, 1);
+        mGrid->addWidget(widgets.first, next, 0);
+        mGrid->addWidget(widgets.second, next, 1);
     }
     else if (widgets.second)
     {
-        mGrid->addWidget (widgets.second, next, 0, 1, 2);
+        mGrid->addWidget(widgets.second, next, 0, 1, 2);
     }
     else
     {
-        mGrid->addWidget (new QWidget (this), next, 0);
+        mGrid->addWidget(new QWidget(this), next, 0);
     }
 }
diff --git a/apps/opencs/view/prefs/page.hpp b/apps/opencs/view/prefs/page.hpp
index ce13e5d9b9..32b057071e 100644
--- a/apps/opencs/view/prefs/page.hpp
+++ b/apps/opencs/view/prefs/page.hpp
@@ -14,15 +14,14 @@ namespace CSVPrefs
 {
     class Page : public PageBase
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            QGridLayout *mGrid;
+        QGridLayout* mGrid;
 
-        public:
+    public:
+        Page(CSMPrefs::Category& category, QWidget* parent);
 
-            Page (CSMPrefs::Category& category, QWidget *parent);
-
-            void addSetting (CSMPrefs::Setting *setting);
+        void addSetting(CSMPrefs::Setting* setting);
     };
 }
 
diff --git a/apps/opencs/view/prefs/pagebase.cpp b/apps/opencs/view/prefs/pagebase.cpp
index 15535b785f..ea9af3256d 100644
--- a/apps/opencs/view/prefs/pagebase.cpp
+++ b/apps/opencs/view/prefs/pagebase.cpp
@@ -1,15 +1,17 @@
 
 #include "pagebase.hpp"
 
-#include <QMenu>
 #include <QContextMenuEvent>
+#include <QMenu>
 
 #include "../../model/prefs/category.hpp"
 #include "../../model/prefs/state.hpp"
 
-CSVPrefs::PageBase::PageBase (CSMPrefs::Category& category, QWidget *parent)
-: QScrollArea (parent), mCategory (category)
-{}
+CSVPrefs::PageBase::PageBase(CSMPrefs::Category& category, QWidget* parent)
+    : QScrollArea(parent)
+    , mCategory(category)
+{
+}
 
 CSMPrefs::Category& CSVPrefs::PageBase::getCategory()
 {
diff --git a/apps/opencs/view/prefs/pagebase.hpp b/apps/opencs/view/prefs/pagebase.hpp
index ce5b378b35..b5e0836dde 100644
--- a/apps/opencs/view/prefs/pagebase.hpp
+++ b/apps/opencs/view/prefs/pagebase.hpp
@@ -14,25 +14,23 @@ namespace CSVPrefs
 {
     class PageBase : public QScrollArea
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            CSMPrefs::Category& mCategory;
+        CSMPrefs::Category& mCategory;
 
-        public:
+    public:
+        PageBase(CSMPrefs::Category& category, QWidget* parent);
 
-            PageBase (CSMPrefs::Category& category, QWidget *parent);
+        CSMPrefs::Category& getCategory();
 
-            CSMPrefs::Category& getCategory();
+    protected:
+        void contextMenuEvent(QContextMenuEvent*) override;
 
-        protected:
+    private slots:
 
-            void contextMenuEvent(QContextMenuEvent*) override;
+        void resetCategory();
 
-        private slots:
-
-            void resetCategory();
-
-            void resetAll();
+        void resetAll();
     };
 }
 
diff --git a/apps/opencs/view/render/actor.cpp b/apps/opencs/view/render/actor.cpp
index 99b2b342ff..2ac5bdea80 100644
--- a/apps/opencs/view/render/actor.cpp
+++ b/apps/opencs/view/render/actor.cpp
@@ -23,8 +23,7 @@ namespace CSVRender
         , mSkeleton(nullptr)
     {
         mActorData = mData.getActorAdapter()->getActorData(mId);
-        connect(mData.getActorAdapter(), &CSMWorld::ActorAdapter::actorChanged,
-                this, &Actor::handleActorChanged);
+        connect(mData.getActorAdapter(), &CSMWorld::ActorAdapter::actorChanged, this, &Actor::handleActorChanged);
     }
 
     osg::Group* Actor::getBaseNode()
@@ -38,7 +37,8 @@ namespace CSVRender
 
         // Load skeleton
         std::string skeletonModel = mActorData->getSkeleton();
-        skeletonModel = Misc::ResourceHelpers::correctActorModelPath(skeletonModel, mData.getResourceSystem()->getVFS());
+        skeletonModel
+            = Misc::ResourceHelpers::correctActorModelPath(skeletonModel, mData.getResourceSystem()->getVFS());
         loadSkeleton(skeletonModel);
 
         if (!mActorData->isCreature())
@@ -88,14 +88,13 @@ namespace CSVRender
         mNodeMap.clear();
         SceneUtil::NodeMapVisitor nmVisitor(mNodeMap);
         mSkeleton->accept(nmVisitor);
-
     }
 
     void Actor::loadBodyParts()
     {
         for (int i = 0; i < ESM::PRT_Count; ++i)
         {
-            auto type = (ESM::PartReferenceType) i;
+            auto type = (ESM::PartReferenceType)i;
             const std::string_view partId = mActorData->getPart(type);
             attachBodyPart(type, getBodyPartMesh(partId));
         }
diff --git a/apps/opencs/view/render/brushdraw.cpp b/apps/opencs/view/render/brushdraw.cpp
index 6b33e336ea..c89cfe41a5 100644
--- a/apps/opencs/view/render/brushdraw.cpp
+++ b/apps/opencs/view/render/brushdraw.cpp
@@ -2,9 +2,9 @@
 
 #include <limits>
 
-#include <osg/Group>
-#include <osg/Geometry>
 #include <osg/Array>
+#include <osg/Geometry>
+#include <osg/Group>
 
 #include <osgUtil/LineSegmentIntersector>
 
@@ -12,8 +12,9 @@
 #include "../widget/brushshapes.hpp"
 #include "mask.hpp"
 
-CSVRender::BrushDraw::BrushDraw(osg::ref_ptr<osg::Group> parentNode, bool textureMode) :
-    mParentNode(parentNode), mTextureMode(textureMode)
+CSVRender::BrushDraw::BrushDraw(osg::ref_ptr<osg::Group> parentNode, bool textureMode)
+    : mParentNode(parentNode)
+    , mTextureMode(textureMode)
 {
     mBrushDrawNode = new osg::Group();
     mGeometry = new osg::Geometry();
@@ -33,7 +34,7 @@ CSVRender::BrushDraw::~BrushDraw()
     mParentNode->removeChild(mBrushDrawNode);
 }
 
-float CSVRender::BrushDraw::getIntersectionHeight (const osg::Vec3d& point)
+float CSVRender::BrushDraw::getIntersectionHeight(const osg::Vec3d& point)
 {
     osg::Vec3d start = point;
     osg::Vec3d end = point;
@@ -42,8 +43,8 @@ float CSVRender::BrushDraw::getIntersectionHeight (const osg::Vec3d& point)
     osg::Vec3d direction = end - start;
 
     // Get intersection
-    osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector (new osgUtil::LineSegmentIntersector(
-        osgUtil::Intersector::MODEL, start, end) );
+    osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector(
+        new osgUtil::LineSegmentIntersector(osgUtil::Intersector::MODEL, start, end));
     intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::NO_LIMIT);
     osgUtil::IntersectionVisitor visitor(intersector);
 
@@ -69,44 +70,28 @@ float CSVRender::BrushDraw::getIntersectionHeight (const osg::Vec3d& point)
 
 void CSVRender::BrushDraw::buildPointGeometry(const osg::Vec3d& point)
 {
-    osg::ref_ptr<osg::Geometry> geom (new osg::Geometry());
-    osg::ref_ptr<osg::Vec3Array> vertices (new osg::Vec3Array());
-    osg::ref_ptr<osg::Vec4Array> colors (new osg::Vec4Array());
-    const float brushOutlineHeight (1.0f);
-    const float crossHeadSize (8.0f);
+    osg::ref_ptr<osg::Geometry> geom(new osg::Geometry());
+    osg::ref_ptr<osg::Vec3Array> vertices(new osg::Vec3Array());
+    osg::ref_ptr<osg::Vec4Array> colors(new osg::Vec4Array());
+    const float brushOutlineHeight(1.0f);
+    const float crossHeadSize(8.0f);
     osg::Vec4f lineColor(1.0f, 1.0f, 1.0f, 0.6f);
 
-    vertices->push_back(osg::Vec3d(
-        point.x() - crossHeadSize,
-        point.y() - crossHeadSize,
-        getIntersectionHeight(osg::Vec3d(
-            point.x() - crossHeadSize,
-            point.y() - crossHeadSize,
-            point.z()) ) + brushOutlineHeight));
+    vertices->push_back(osg::Vec3d(point.x() - crossHeadSize, point.y() - crossHeadSize,
+        getIntersectionHeight(osg::Vec3d(point.x() - crossHeadSize, point.y() - crossHeadSize, point.z()))
+            + brushOutlineHeight));
     colors->push_back(lineColor);
-    vertices->push_back(osg::Vec3d(
-        point.x() + crossHeadSize,
-        point.y() + crossHeadSize,
-        getIntersectionHeight(osg::Vec3d(
-            point.x() + crossHeadSize,
-            point.y() + crossHeadSize,
-            point.z()) ) + brushOutlineHeight));
+    vertices->push_back(osg::Vec3d(point.x() + crossHeadSize, point.y() + crossHeadSize,
+        getIntersectionHeight(osg::Vec3d(point.x() + crossHeadSize, point.y() + crossHeadSize, point.z()))
+            + brushOutlineHeight));
     colors->push_back(lineColor);
-    vertices->push_back(osg::Vec3d(
-        point.x() + crossHeadSize,
-        point.y() - crossHeadSize,
-        getIntersectionHeight(osg::Vec3d(
-            point.x() + crossHeadSize,
-            point.y() - crossHeadSize,
-            point.z()) ) + brushOutlineHeight));
+    vertices->push_back(osg::Vec3d(point.x() + crossHeadSize, point.y() - crossHeadSize,
+        getIntersectionHeight(osg::Vec3d(point.x() + crossHeadSize, point.y() - crossHeadSize, point.z()))
+            + brushOutlineHeight));
     colors->push_back(lineColor);
-    vertices->push_back(osg::Vec3d(
-        point.x() - crossHeadSize,
-        point.y() + crossHeadSize,
-        getIntersectionHeight(osg::Vec3d(
-            point.x() - crossHeadSize,
-            point.y() + crossHeadSize,
-            point.z()) ) + brushOutlineHeight));
+    vertices->push_back(osg::Vec3d(point.x() - crossHeadSize, point.y() + crossHeadSize,
+        getIntersectionHeight(osg::Vec3d(point.x() - crossHeadSize, point.y() + crossHeadSize, point.z()))
+            + brushOutlineHeight));
     colors->push_back(lineColor);
 
     geom->setVertexArray(vertices);
@@ -117,14 +102,14 @@ void CSVRender::BrushDraw::buildPointGeometry(const osg::Vec3d& point)
 
 void CSVRender::BrushDraw::buildSquareGeometry(const float& radius, const osg::Vec3d& point)
 {
-    osg::ref_ptr<osg::Geometry> geom (new osg::Geometry());
-    osg::ref_ptr<osg::Vec3Array> vertices (new osg::Vec3Array());
-    osg::ref_ptr<osg::Vec4Array> colors (new osg::Vec4Array());
+    osg::ref_ptr<osg::Geometry> geom(new osg::Geometry());
+    osg::ref_ptr<osg::Vec3Array> vertices(new osg::Vec3Array());
+    osg::ref_ptr<osg::Vec4Array> colors(new osg::Vec4Array());
 
-    const float brushOutlineHeight (1.0f);
+    const float brushOutlineHeight(1.0f);
     float diameter = radius * 2;
-    int resolution = static_cast<int>(2.f * diameter / mLandSizeFactor); //half a vertex resolution
-    float resAdjustedLandSizeFactor = mLandSizeFactor / 2; //128
+    int resolution = static_cast<int>(2.f * diameter / mLandSizeFactor); // half a vertex resolution
+    float resAdjustedLandSizeFactor = mLandSizeFactor / 2; // 128
 
     if (resolution > 128) // limit accuracy for performance
     {
@@ -139,62 +124,30 @@ void CSVRender::BrushDraw::buildSquareGeometry(const float& radius, const osg::V
         int step = i * resAdjustedLandSizeFactor;
         int step2 = (i + 1) * resAdjustedLandSizeFactor;
 
-        osg::Vec3d upHorizontalLinePoint1(
-            point.x() - radius + step,
-            point.y() - radius,
-            getIntersectionHeight(osg::Vec3d(
-                point.x() - radius + step,
-                point.y() - radius,
-                point.z())) + brushOutlineHeight);
-        osg::Vec3d upHorizontalLinePoint2(
-            point.x() - radius + step2,
-            point.y() - radius,
-            getIntersectionHeight(osg::Vec3d(
-                point.x() - radius + step2,
-                point.y() - radius,
-                point.z())) + brushOutlineHeight);
-        osg::Vec3d upVerticalLinePoint1(
-            point.x() - radius,
-            point.y() - radius + step,
-            getIntersectionHeight(osg::Vec3d(
-                point.x() - radius,
-                point.y() - radius + step,
-                point.z())) + brushOutlineHeight);
-        osg::Vec3d upVerticalLinePoint2(
-            point.x() - radius,
-            point.y() - radius + step2,
-            getIntersectionHeight(osg::Vec3d(
-                point.x() - radius,
-                point.y() - radius + step2,
-                point.z())) + brushOutlineHeight);
-        osg::Vec3d downHorizontalLinePoint1(
-            point.x() + radius - step,
-            point.y() + radius,
-            getIntersectionHeight(osg::Vec3d(
-                point.x() + radius - step,
-                point.y() + radius,
-                point.z())) + brushOutlineHeight);
-        osg::Vec3d downHorizontalLinePoint2(
-            point.x() + radius - step2,
-            point.y() + radius,
-            getIntersectionHeight(osg::Vec3d(
-                point.x() + radius - step2,
-                point.y() + radius,
-                point.z())) + brushOutlineHeight);
-        osg::Vec3d downVerticalLinePoint1(
-            point.x() + radius,
-            point.y() + radius - step,
-            getIntersectionHeight(osg::Vec3d(
-                point.x() + radius,
-                point.y() + radius - step,
-                point.z())) + brushOutlineHeight);
-        osg::Vec3d downVerticalLinePoint2(
-            point.x() + radius,
-            point.y() + radius - step2,
-            getIntersectionHeight(osg::Vec3d(
-                point.x() + radius,
-                point.y() + radius - step2,
-                point.z())) + brushOutlineHeight);
+        osg::Vec3d upHorizontalLinePoint1(point.x() - radius + step, point.y() - radius,
+            getIntersectionHeight(osg::Vec3d(point.x() - radius + step, point.y() - radius, point.z()))
+                + brushOutlineHeight);
+        osg::Vec3d upHorizontalLinePoint2(point.x() - radius + step2, point.y() - radius,
+            getIntersectionHeight(osg::Vec3d(point.x() - radius + step2, point.y() - radius, point.z()))
+                + brushOutlineHeight);
+        osg::Vec3d upVerticalLinePoint1(point.x() - radius, point.y() - radius + step,
+            getIntersectionHeight(osg::Vec3d(point.x() - radius, point.y() - radius + step, point.z()))
+                + brushOutlineHeight);
+        osg::Vec3d upVerticalLinePoint2(point.x() - radius, point.y() - radius + step2,
+            getIntersectionHeight(osg::Vec3d(point.x() - radius, point.y() - radius + step2, point.z()))
+                + brushOutlineHeight);
+        osg::Vec3d downHorizontalLinePoint1(point.x() + radius - step, point.y() + radius,
+            getIntersectionHeight(osg::Vec3d(point.x() + radius - step, point.y() + radius, point.z()))
+                + brushOutlineHeight);
+        osg::Vec3d downHorizontalLinePoint2(point.x() + radius - step2, point.y() + radius,
+            getIntersectionHeight(osg::Vec3d(point.x() + radius - step2, point.y() + radius, point.z()))
+                + brushOutlineHeight);
+        osg::Vec3d downVerticalLinePoint1(point.x() + radius, point.y() + radius - step,
+            getIntersectionHeight(osg::Vec3d(point.x() + radius, point.y() + radius - step, point.z()))
+                + brushOutlineHeight);
+        osg::Vec3d downVerticalLinePoint2(point.x() + radius, point.y() + radius - step2,
+            getIntersectionHeight(osg::Vec3d(point.x() + radius, point.y() + radius - step2, point.z()))
+                + brushOutlineHeight);
         vertices->push_back(upHorizontalLinePoint1);
         colors->push_back(lineColor);
         vertices->push_back(upHorizontalLinePoint2);
@@ -221,34 +174,28 @@ void CSVRender::BrushDraw::buildSquareGeometry(const float& radius, const osg::V
 
 void CSVRender::BrushDraw::buildCircleGeometry(const float& radius, const osg::Vec3d& point)
 {
-    osg::ref_ptr<osg::Geometry> geom (new osg::Geometry());
-    osg::ref_ptr<osg::Vec3Array> vertices (new osg::Vec3Array());
-    osg::ref_ptr<osg::Vec4Array> colors (new osg::Vec4Array());
+    osg::ref_ptr<osg::Geometry> geom(new osg::Geometry());
+    osg::ref_ptr<osg::Vec3Array> vertices(new osg::Vec3Array());
+    osg::ref_ptr<osg::Vec4Array> colors(new osg::Vec4Array());
 
     const int amountOfPoints = 128;
-    const float step ((osg::PI * 2.0f) / static_cast<float>(amountOfPoints));
-    const float brushOutlineHeight (1.0f);
+    const float step((osg::PI * 2.0f) / static_cast<float>(amountOfPoints));
+    const float brushOutlineHeight(1.0f);
     osg::Vec4f lineColor(1.0f, 1.0f, 1.0f, 0.6f);
 
     for (int i = 0; i < amountOfPoints + 2; i++)
     {
-        float angle (i * step);
-        vertices->push_back(osg::Vec3d(
-            point.x() + radius * cosf(angle),
-            point.y() + radius * sinf(angle),
-            getIntersectionHeight(osg::Vec3d(
-                point.x() + radius * cosf(angle),
-                point.y() + radius * sinf(angle),
-                point.z()) ) + brushOutlineHeight));
+        float angle(i * step);
+        vertices->push_back(osg::Vec3d(point.x() + radius * cosf(angle), point.y() + radius * sinf(angle),
+            getIntersectionHeight(
+                osg::Vec3d(point.x() + radius * cosf(angle), point.y() + radius * sinf(angle), point.z()))
+                + brushOutlineHeight));
         colors->push_back(lineColor);
         angle = static_cast<float>(i + 1) * step;
-        vertices->push_back(osg::Vec3d(
-            point.x() + radius * cosf(angle),
-            point.y() + radius * sinf(angle),
-            getIntersectionHeight(osg::Vec3d(
-                point.x() + radius * cosf(angle),
-                point.y() + radius * sinf(angle),
-                point.z()) ) + brushOutlineHeight));
+        vertices->push_back(osg::Vec3d(point.x() + radius * cosf(angle), point.y() + radius * sinf(angle),
+            getIntersectionHeight(
+                osg::Vec3d(point.x() + radius * cosf(angle), point.y() + radius * sinf(angle), point.z()))
+                + brushOutlineHeight));
         colors->push_back(lineColor);
     }
 
@@ -272,36 +219,32 @@ void CSVRender::BrushDraw::update(osg::Vec3d point, int brushSize, CSVWidget::Br
     if (mTextureMode)
     {
         std::pair<int, int> snapToGridXY = CSMWorld::CellCoordinates::toTextureCoords(point);
-        float offsetToMiddle =  mLandSizeFactor * 0.5f;
+        float offsetToMiddle = mLandSizeFactor * 0.5f;
         snapToGridPoint = osg::Vec3d(
             CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(snapToGridXY.first) + offsetToMiddle,
-            CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(snapToGridXY.second) + offsetToMiddle,
-            point.z());
+            CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(snapToGridXY.second) + offsetToMiddle, point.z());
     }
     else
     {
         std::pair<int, int> snapToGridXY = CSMWorld::CellCoordinates::toVertexCoords(point);
-        snapToGridPoint = osg::Vec3d(
-            CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(snapToGridXY.first),
-            CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(snapToGridXY.second),
-            point.z());
+        snapToGridPoint = osg::Vec3d(CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(snapToGridXY.first),
+            CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(snapToGridXY.second), point.z());
     }
 
-
     switch (toolShape)
     {
-        case (CSVWidget::BrushShape_Point) :
+        case (CSVWidget::BrushShape_Point):
             buildPointGeometry(snapToGridPoint);
             break;
-        case (CSVWidget::BrushShape_Square) :
+        case (CSVWidget::BrushShape_Square):
             buildSquareGeometry(radius, snapToGridPoint);
             break;
-        case (CSVWidget::BrushShape_Circle) :
+        case (CSVWidget::BrushShape_Circle):
             buildCircleGeometry(radius, snapToGridPoint);
             break;
-        case (CSVWidget::BrushShape_Custom) :
+        case (CSVWidget::BrushShape_Custom):
             buildSquareGeometry(1, snapToGridPoint);
-            //buildCustomGeometry
+            // buildCustomGeometry
             break;
     }
 
diff --git a/apps/opencs/view/render/brushdraw.hpp b/apps/opencs/view/render/brushdraw.hpp
index f95a0c5a7c..64ded1c10b 100644
--- a/apps/opencs/view/render/brushdraw.hpp
+++ b/apps/opencs/view/render/brushdraw.hpp
@@ -1,35 +1,35 @@
 #ifndef CSV_RENDER_BRUSHDRAW_H
 #define CSV_RENDER_BRUSHDRAW_H
 
-#include <osg/Group>
 #include <osg/Geometry>
+#include <osg/Group>
 
-#include <components/esm3/loadland.hpp>
 #include "../widget/brushshapes.hpp"
+#include <components/esm3/loadland.hpp>
 
 namespace CSVRender
 {
     class BrushDraw
     {
-        public:
-            BrushDraw(osg::ref_ptr<osg::Group> parentNode, bool textureMode = false);
-            ~BrushDraw();
+    public:
+        BrushDraw(osg::ref_ptr<osg::Group> parentNode, bool textureMode = false);
+        ~BrushDraw();
 
-            void update(osg::Vec3d point, int brushSize, CSVWidget::BrushShape toolShape);
-            void hide();
+        void update(osg::Vec3d point, int brushSize, CSVWidget::BrushShape toolShape);
+        void hide();
 
-        private:
-            void buildPointGeometry(const osg::Vec3d& point);
-            void buildSquareGeometry(const float& radius, const osg::Vec3d& point);
-            void buildCircleGeometry(const float& radius, const osg::Vec3d& point);
-            void buildCustomGeometry(const float& radius, const osg::Vec3d& point);
-            float getIntersectionHeight (const osg::Vec3d& point);
+    private:
+        void buildPointGeometry(const osg::Vec3d& point);
+        void buildSquareGeometry(const float& radius, const osg::Vec3d& point);
+        void buildCircleGeometry(const float& radius, const osg::Vec3d& point);
+        void buildCustomGeometry(const float& radius, const osg::Vec3d& point);
+        float getIntersectionHeight(const osg::Vec3d& point);
 
-            osg::ref_ptr<osg::Group> mParentNode;
-            osg::ref_ptr<osg::Group> mBrushDrawNode;
-            osg::ref_ptr<osg::Geometry> mGeometry;
-            bool mTextureMode;
-            float mLandSizeFactor;
+        osg::ref_ptr<osg::Group> mParentNode;
+        osg::ref_ptr<osg::Group> mBrushDrawNode;
+        osg::ref_ptr<osg::Geometry> mGeometry;
+        bool mTextureMode;
+        float mLandSizeFactor;
     };
 }
 
diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index 32d0b4268a..87ba7e58f3 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -35,16 +35,14 @@ namespace CSVRender
         : QObject(parent)
         , mActive(false)
         , mInverted(false)
-        , mCameraSensitivity(1/650.f)
+        , mCameraSensitivity(1 / 650.f)
         , mSecondaryMoveMult(50)
         , mWheelMoveMult(8)
         , mCamera(nullptr)
     {
     }
 
-    CameraController::~CameraController()
-    {
-    }
+    CameraController::~CameraController() {}
 
     bool CameraController::isActive() const
     {
@@ -179,67 +177,63 @@ namespace CSVRender
     {
         CSMPrefs::Shortcut* naviPrimaryShortcut = new CSMPrefs::Shortcut("scene-navi-primary", widget);
         naviPrimaryShortcut->enable(false);
-        connect(naviPrimaryShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated),
-                this, &FreeCameraController::naviPrimary);
+        connect(naviPrimaryShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this,
+            &FreeCameraController::naviPrimary);
 
         addShortcut(naviPrimaryShortcut);
 
         CSMPrefs::Shortcut* naviSecondaryShortcut = new CSMPrefs::Shortcut("scene-navi-secondary", widget);
         naviSecondaryShortcut->enable(false);
-        connect(naviSecondaryShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated),
-                this, &FreeCameraController::naviSecondary);
+        connect(naviSecondaryShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this,
+            &FreeCameraController::naviSecondary);
 
         addShortcut(naviSecondaryShortcut);
 
-        CSMPrefs::Shortcut* forwardShortcut = new CSMPrefs::Shortcut("free-forward", "scene-speed-modifier",
-            CSMPrefs::Shortcut::SM_Detach, widget);
+        CSMPrefs::Shortcut* forwardShortcut
+            = new CSMPrefs::Shortcut("free-forward", "scene-speed-modifier", CSMPrefs::Shortcut::SM_Detach, widget);
         forwardShortcut->enable(false);
-        connect(forwardShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated),
-                this, &FreeCameraController::forward);
-        connect(forwardShortcut, qOverload<bool>(&CSMPrefs::Shortcut::secondary),
-                this, &FreeCameraController::alternateFast);
+        connect(forwardShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this, &FreeCameraController::forward);
+        connect(forwardShortcut, qOverload<bool>(&CSMPrefs::Shortcut::secondary), this,
+            &FreeCameraController::alternateFast);
 
         addShortcut(forwardShortcut);
 
         CSMPrefs::Shortcut* leftShortcut = new CSMPrefs::Shortcut("free-left", widget);
         leftShortcut->enable(false);
-        connect(leftShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated),
-                this, &FreeCameraController::left);
+        connect(leftShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this, &FreeCameraController::left);
 
         addShortcut(leftShortcut);
 
         CSMPrefs::Shortcut* backShortcut = new CSMPrefs::Shortcut("free-backward", widget);
         backShortcut->enable(false);
-        connect(backShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated),
-                this, &FreeCameraController::backward);
+        connect(backShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this, &FreeCameraController::backward);
 
         addShortcut(backShortcut);
 
         CSMPrefs::Shortcut* rightShortcut = new CSMPrefs::Shortcut("free-right", widget);
         rightShortcut->enable(false);
-        connect(rightShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated),
-                this, &FreeCameraController::right);
+        connect(rightShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this, &FreeCameraController::right);
 
         addShortcut(rightShortcut);
 
         CSMPrefs::Shortcut* rollLeftShortcut = new CSMPrefs::Shortcut("free-roll-left", widget);
         rollLeftShortcut->enable(false);
-        connect(rollLeftShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated),
-                this, &FreeCameraController::rollLeft);
+        connect(
+            rollLeftShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this, &FreeCameraController::rollLeft);
 
         addShortcut(rollLeftShortcut);
 
         CSMPrefs::Shortcut* rollRightShortcut = new CSMPrefs::Shortcut("free-roll-right", widget);
         rollRightShortcut->enable(false);
-        connect(rollRightShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated),
-                this, &FreeCameraController::rollRight);
+        connect(
+            rollRightShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this, &FreeCameraController::rollRight);
 
         addShortcut(rollRightShortcut);
 
         CSMPrefs::Shortcut* speedModeShortcut = new CSMPrefs::Shortcut("free-speed-mode", widget);
         speedModeShortcut->enable(false);
-        connect(speedModeShortcut, qOverload<>(&CSMPrefs::Shortcut::activated),
-                this, &FreeCameraController::swapSpeedMode);
+        connect(
+            speedModeShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), this, &FreeCameraController::swapSpeedMode);
 
         addShortcut(speedModeShortcut);
     }
@@ -342,7 +336,7 @@ namespace CSVRender
             if (mRollRight)
                 roll(rotDist);
         }
-        else if(mModified)
+        else if (mModified)
         {
             stabilize();
             mModified = false;
@@ -469,7 +463,7 @@ namespace CSVRender
         , mRollLeft(false)
         , mRollRight(false)
         , mPickingMask(~0u)
-        , mCenter(0,0,0)
+        , mCenter(0, 0, 0)
         , mDistance(0)
         , mOrbitSpeed(osg::PI / 4)
         , mOrbitSpeedMult(4)
@@ -477,67 +471,63 @@ namespace CSVRender
     {
         CSMPrefs::Shortcut* naviPrimaryShortcut = new CSMPrefs::Shortcut("scene-navi-primary", widget);
         naviPrimaryShortcut->enable(false);
-        connect(naviPrimaryShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated),
-                this, &OrbitCameraController::naviPrimary);
+        connect(naviPrimaryShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this,
+            &OrbitCameraController::naviPrimary);
 
         addShortcut(naviPrimaryShortcut);
 
         CSMPrefs::Shortcut* naviSecondaryShortcut = new CSMPrefs::Shortcut("scene-navi-secondary", widget);
         naviSecondaryShortcut->enable(false);
-        connect(naviSecondaryShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated),
-                this, &OrbitCameraController::naviSecondary);
+        connect(naviSecondaryShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this,
+            &OrbitCameraController::naviSecondary);
 
         addShortcut(naviSecondaryShortcut);
 
-        CSMPrefs::Shortcut* upShortcut = new CSMPrefs::Shortcut("orbit-up", "scene-speed-modifier",
-            CSMPrefs::Shortcut::SM_Detach, widget);
+        CSMPrefs::Shortcut* upShortcut
+            = new CSMPrefs::Shortcut("orbit-up", "scene-speed-modifier", CSMPrefs::Shortcut::SM_Detach, widget);
         upShortcut->enable(false);
-        connect(upShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated),
-                this, &OrbitCameraController::up);
-        connect(upShortcut, qOverload<bool>(&CSMPrefs::Shortcut::secondary),
-                this, &OrbitCameraController::alternateFast);
+        connect(upShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this, &OrbitCameraController::up);
+        connect(
+            upShortcut, qOverload<bool>(&CSMPrefs::Shortcut::secondary), this, &OrbitCameraController::alternateFast);
 
         addShortcut(upShortcut);
 
         CSMPrefs::Shortcut* leftShortcut = new CSMPrefs::Shortcut("orbit-left", widget);
         leftShortcut->enable(false);
-        connect(leftShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated),
-                this, &OrbitCameraController::left);
+        connect(leftShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this, &OrbitCameraController::left);
 
         addShortcut(leftShortcut);
 
         CSMPrefs::Shortcut* downShortcut = new CSMPrefs::Shortcut("orbit-down", widget);
         downShortcut->enable(false);
-        connect(downShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated),
-                this, &OrbitCameraController::down);
+        connect(downShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this, &OrbitCameraController::down);
 
         addShortcut(downShortcut);
 
         CSMPrefs::Shortcut* rightShortcut = new CSMPrefs::Shortcut("orbit-right", widget);
         rightShortcut->enable(false);
-        connect(rightShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated),
-                this, &OrbitCameraController::right);
+        connect(rightShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this, &OrbitCameraController::right);
 
         addShortcut(rightShortcut);
 
         CSMPrefs::Shortcut* rollLeftShortcut = new CSMPrefs::Shortcut("orbit-roll-left", widget);
         rollLeftShortcut->enable(false);
-        connect(rollLeftShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated),
-                this, &OrbitCameraController::rollLeft);
+        connect(
+            rollLeftShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this, &OrbitCameraController::rollLeft);
 
         addShortcut(rollLeftShortcut);
 
         CSMPrefs::Shortcut* rollRightShortcut = new CSMPrefs::Shortcut("orbit-roll-right", widget);
         rollRightShortcut->enable(false);
-        connect(rollRightShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated),
-                this, &OrbitCameraController::rollRight);
+        connect(rollRightShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this,
+            &OrbitCameraController::rollRight);
 
         addShortcut(rollRightShortcut);
 
         CSMPrefs::Shortcut* speedModeShortcut = new CSMPrefs::Shortcut("orbit-speed-mode", widget);
         speedModeShortcut->enable(false);
-        connect(speedModeShortcut, qOverload<>(&CSMPrefs::Shortcut::activated),
-                this, &OrbitCameraController::swapSpeedMode);
+        connect(speedModeShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), this,
+            &OrbitCameraController::swapSpeedMode);
 
         addShortcut(speedModeShortcut);
     }
@@ -663,8 +653,8 @@ namespace CSVRender
         static const int DefaultStartDistance = 10000.f;
 
         // Try to intelligently pick focus object
-        osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector (new osgUtil::LineSegmentIntersector(
-            osgUtil::Intersector::PROJECTION, osg::Vec3d(0, 0, 0), LocalForward));
+        osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector(
+            new osgUtil::LineSegmentIntersector(osgUtil::Intersector::PROJECTION, osg::Vec3d(0, 0, 0), LocalForward));
 
         intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::LIMIT_NEAREST);
         osgUtil::IntersectionVisitor visitor(intersector);
@@ -699,7 +689,7 @@ namespace CSVRender
     {
         osg::Vec3d eye, center, up;
         getCamera()->getViewMatrixAsLookAt(eye, center, up);
-        osg::Vec3d absoluteUp = osg::Vec3(0,0,1);
+        osg::Vec3d absoluteUp = osg::Vec3(0, 0, 1);
 
         osg::Quat rotation = osg::Quat(value, mConstRoll ? absoluteUp : up);
         osg::Vec3d oldOffset = eye - mCenter;
@@ -719,7 +709,7 @@ namespace CSVRender
         osg::Vec3d forward = center - eye;
         osg::Vec3d axis = up ^ forward;
 
-        osg::Quat rotation = osg::Quat(value,axis);
+        osg::Quat rotation = osg::Quat(value, axis);
         osg::Vec3d oldOffset = eye - mCenter;
         osg::Vec3d newOffset = rotation * oldOffset;
 
diff --git a/apps/opencs/view/render/cameracontroller.hpp b/apps/opencs/view/render/cameracontroller.hpp
index dff0f212e9..4ebca23930 100644
--- a/apps/opencs/view/render/cameracontroller.hpp
+++ b/apps/opencs/view/render/cameracontroller.hpp
@@ -6,8 +6,8 @@
 
 #include <QObject>
 
-#include <osg/ref_ptr>
 #include <osg/Vec3d>
+#include <osg/ref_ptr>
 
 namespace osg
 {
@@ -26,177 +26,170 @@ namespace CSVRender
 
     class CameraController : public QObject
     {
-            Q_OBJECT
-
-        public:
-
-            static const osg::Vec3d WorldUp;
-
-            static const osg::Vec3d LocalUp;
-            static const osg::Vec3d LocalLeft;
-            static const osg::Vec3d LocalForward;
+        Q_OBJECT
 
-            CameraController(QObject* parent);
-            virtual ~CameraController();
+    public:
+        static const osg::Vec3d WorldUp;
 
-            bool isActive() const;
+        static const osg::Vec3d LocalUp;
+        static const osg::Vec3d LocalLeft;
+        static const osg::Vec3d LocalForward;
 
-            osg::Camera* getCamera() const;
-            double getCameraSensitivity() const;
-            bool getInverted() const;
-            double getSecondaryMovementMultiplier() const;
-            double getWheelMovementMultiplier() const;
+        CameraController(QObject* parent);
+        virtual ~CameraController();
 
-            void setCamera(osg::Camera*);
-            void setCameraSensitivity(double value);
-            void setInverted(bool value);
-            void setSecondaryMovementMultiplier(double value);
-            void setWheelMovementMultiplier(double value);
+        bool isActive() const;
 
-            // moves the camera to an intelligent position
-            void setup(osg::Group* root, unsigned int mask, const osg::Vec3d& up);
+        osg::Camera* getCamera() const;
+        double getCameraSensitivity() const;
+        bool getInverted() const;
+        double getSecondaryMovementMultiplier() const;
+        double getWheelMovementMultiplier() const;
 
-            virtual void handleMouseMoveEvent(int x, int y) = 0;
-            virtual void handleMouseScrollEvent(int x) = 0;
+        void setCamera(osg::Camera*);
+        void setCameraSensitivity(double value);
+        void setInverted(bool value);
+        void setSecondaryMovementMultiplier(double value);
+        void setWheelMovementMultiplier(double value);
 
-            virtual void update(double dt) = 0;
+        // moves the camera to an intelligent position
+        void setup(osg::Group* root, unsigned int mask, const osg::Vec3d& up);
 
-        protected:
+        virtual void handleMouseMoveEvent(int x, int y) = 0;
+        virtual void handleMouseScrollEvent(int x) = 0;
 
-            void addShortcut(CSMPrefs::Shortcut* shortcut);
+        virtual void update(double dt) = 0;
 
-        private:
+    protected:
+        void addShortcut(CSMPrefs::Shortcut* shortcut);
 
-            bool mActive, mInverted;
-            double mCameraSensitivity;
-            double mSecondaryMoveMult;
-            double mWheelMoveMult;
+    private:
+        bool mActive, mInverted;
+        double mCameraSensitivity;
+        double mSecondaryMoveMult;
+        double mWheelMoveMult;
 
-            osg::Camera* mCamera;
+        osg::Camera* mCamera;
 
-            std::vector<CSMPrefs::Shortcut*> mShortcuts;
+        std::vector<CSMPrefs::Shortcut*> mShortcuts;
     };
 
     class FreeCameraController : public CameraController
     {
-            Q_OBJECT
+        Q_OBJECT
 
-        public:
+    public:
+        FreeCameraController(QWidget* parent);
 
-            FreeCameraController(QWidget* parent);
+        double getLinearSpeed() const;
+        double getRotationalSpeed() const;
+        double getSpeedMultiplier() const;
 
-            double getLinearSpeed() const;
-            double getRotationalSpeed() const;
-            double getSpeedMultiplier() const;
+        void setLinearSpeed(double value);
+        void setRotationalSpeed(double value);
+        void setSpeedMultiplier(double value);
 
-            void setLinearSpeed(double value);
-            void setRotationalSpeed(double value);
-            void setSpeedMultiplier(double value);
+        void fixUpAxis(const osg::Vec3d& up);
+        void unfixUpAxis();
 
-            void fixUpAxis(const osg::Vec3d& up);
-            void unfixUpAxis();
+        void handleMouseMoveEvent(int x, int y) override;
+        void handleMouseScrollEvent(int x) override;
 
-            void handleMouseMoveEvent(int x, int y) override;
-            void handleMouseScrollEvent(int x) override;
+        void update(double dt) override;
 
-            void update(double dt) override;
+    private:
+        void yaw(double value);
+        void pitch(double value);
+        void roll(double value);
+        void translate(const osg::Vec3d& offset);
 
-        private:
+        void stabilize();
 
-            void yaw(double value);
-            void pitch(double value);
-            void roll(double value);
-            void translate(const osg::Vec3d& offset);
+        bool mLockUpright, mModified;
+        bool mNaviPrimary, mNaviSecondary;
+        bool mFast, mFastAlternate;
+        bool mLeft, mRight, mForward, mBackward, mRollLeft, mRollRight;
+        osg::Vec3d mUp;
 
-            void stabilize();
+        double mLinSpeed;
+        double mRotSpeed;
+        double mSpeedMult;
 
-            bool mLockUpright, mModified;
-            bool mNaviPrimary, mNaviSecondary;
-            bool mFast, mFastAlternate;
-            bool mLeft, mRight, mForward, mBackward, mRollLeft, mRollRight;
-            osg::Vec3d mUp;
+    private slots:
 
-            double mLinSpeed;
-            double mRotSpeed;
-            double mSpeedMult;
-
-        private slots:
-
-            void naviPrimary(bool active);
-            void naviSecondary(bool active);
-            void forward(bool active);
-            void left(bool active);
-            void backward(bool active);
-            void right(bool active);
-            void rollLeft(bool active);
-            void rollRight(bool active);
-            void alternateFast(bool active);
-            void swapSpeedMode();
+        void naviPrimary(bool active);
+        void naviSecondary(bool active);
+        void forward(bool active);
+        void left(bool active);
+        void backward(bool active);
+        void right(bool active);
+        void rollLeft(bool active);
+        void rollRight(bool active);
+        void alternateFast(bool active);
+        void swapSpeedMode();
     };
 
     class OrbitCameraController : public CameraController
     {
-            Q_OBJECT
-
-        public:
-
-            OrbitCameraController(QWidget* parent);
+        Q_OBJECT
 
-            osg::Vec3d getCenter() const;
-            double getOrbitSpeed() const;
-            double getOrbitSpeedMultiplier() const;
-            unsigned int getPickingMask() const;
+    public:
+        OrbitCameraController(QWidget* parent);
 
-            void setCenter(const osg::Vec3d& center);
-            void setOrbitSpeed(double value);
-            void setOrbitSpeedMultiplier(double value);
-            void setPickingMask(unsigned int value);
+        osg::Vec3d getCenter() const;
+        double getOrbitSpeed() const;
+        double getOrbitSpeedMultiplier() const;
+        unsigned int getPickingMask() const;
 
-            void handleMouseMoveEvent(int x, int y) override;
-            void handleMouseScrollEvent(int x) override;
+        void setCenter(const osg::Vec3d& center);
+        void setOrbitSpeed(double value);
+        void setOrbitSpeedMultiplier(double value);
+        void setPickingMask(unsigned int value);
 
-            void update(double dt) override;
+        void handleMouseMoveEvent(int x, int y) override;
+        void handleMouseScrollEvent(int x) override;
 
-            /// \brief Flag controller to be re-initialized.
-            void reset();
+        void update(double dt) override;
 
-            void setConstRoll(bool enable);
+        /// \brief Flag controller to be re-initialized.
+        void reset();
 
-        private:
+        void setConstRoll(bool enable);
 
-            void initialize();
+    private:
+        void initialize();
 
-            void rotateHorizontal(double value);
-            void rotateVertical(double value);
-            void roll(double value);
-            void translate(const osg::Vec3d& offset);
-            void zoom(double value);
+        void rotateHorizontal(double value);
+        void rotateVertical(double value);
+        void roll(double value);
+        void translate(const osg::Vec3d& offset);
+        void zoom(double value);
 
-            bool mInitialized;
-            bool mNaviPrimary, mNaviSecondary;
-            bool mFast, mFastAlternate;
-            bool mLeft, mRight, mUp, mDown, mRollLeft, mRollRight;
-            unsigned int mPickingMask;
-            osg::Vec3d mCenter;
-            double mDistance;
+        bool mInitialized;
+        bool mNaviPrimary, mNaviSecondary;
+        bool mFast, mFastAlternate;
+        bool mLeft, mRight, mUp, mDown, mRollLeft, mRollRight;
+        unsigned int mPickingMask;
+        osg::Vec3d mCenter;
+        double mDistance;
 
-            double mOrbitSpeed;
-            double mOrbitSpeedMult;
+        double mOrbitSpeed;
+        double mOrbitSpeedMult;
 
-            bool mConstRoll;
+        bool mConstRoll;
 
-        private slots:
+    private slots:
 
-            void naviPrimary(bool active);
-            void naviSecondary(bool active);
-            void up(bool active);
-            void left(bool active);
-            void down(bool active);
-            void right(bool active);
-            void rollLeft(bool active);
-            void rollRight(bool active);
-            void alternateFast(bool active);
-            void swapSpeedMode();
+        void naviPrimary(bool active);
+        void naviSecondary(bool active);
+        void up(bool active);
+        void left(bool active);
+        void down(bool active);
+        void right(bool active);
+        void rollLeft(bool active);
+        void rollRight(bool active);
+        void alternateFast(bool active);
+        void swapSpeedMode();
     };
 }
 
diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 7f8974ba6c..6b6544b56e 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -1,95 +1,94 @@
 #include "cell.hpp"
 
-#include <osg/PositionAttitudeTransform>
 #include <osg/Group>
+#include <osg/PositionAttitudeTransform>
 
-#include <components/misc/strings/lower.hpp>
 #include <components/esm3/loadcell.hpp>
 #include <components/esm3/loadland.hpp>
+#include <components/misc/strings/lower.hpp>
 #include <components/terrain/terraingrid.hpp>
 
 #include "../../model/world/idtable.hpp"
 
-#include "cellwater.hpp"
-#include "cellborder.hpp"
 #include "cellarrow.hpp"
+#include "cellborder.hpp"
 #include "cellmarker.hpp"
+#include "cellwater.hpp"
+#include "instancedragmodes.hpp"
 #include "mask.hpp"
+#include "object.hpp"
 #include "pathgrid.hpp"
 #include "terrainstorage.hpp"
-#include "object.hpp"
-#include "instancedragmodes.hpp"
 
 namespace CSVRender
 {
     class CellNodeContainer : public osg::Referenced
     {
-        public:
-
-            CellNodeContainer(Cell* cell) : mCell(cell) {}
-
-            Cell* getCell(){ return mCell; }
+    public:
+        CellNodeContainer(Cell* cell)
+            : mCell(cell)
+        {
+        }
 
-        private:
+        Cell* getCell() { return mCell; }
 
-            Cell* mCell;
+    private:
+        Cell* mCell;
     };
 
     class CellNodeCallback : public osg::NodeCallback
     {
-        public:
-
-            void operator()(osg::Node* node, osg::NodeVisitor* nv) override
-            {
-                traverse(node, nv);
-                CellNodeContainer* container = static_cast<CellNodeContainer*>(node->getUserData());
-                container->getCell()->updateLand();
-            }
+    public:
+        void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+        {
+            traverse(node, nv);
+            CellNodeContainer* container = static_cast<CellNodeContainer*>(node->getUserData());
+            container->getCell()->updateLand();
+        }
     };
 }
 
-bool CSVRender::Cell::removeObject (const std::string& id)
+bool CSVRender::Cell::removeObject(const std::string& id)
 {
-    std::map<std::string, Object *>::iterator iter =
-        mObjects.find (Misc::StringUtils::lowerCase (id));
+    std::map<std::string, Object*>::iterator iter = mObjects.find(Misc::StringUtils::lowerCase(id));
 
-    if (iter==mObjects.end())
+    if (iter == mObjects.end())
         return false;
 
-    removeObject (iter);
+    removeObject(iter);
     return true;
 }
 
-std::map<std::string, CSVRender::Object *>::iterator CSVRender::Cell::removeObject (
-    std::map<std::string, Object *>::iterator iter)
+std::map<std::string, CSVRender::Object*>::iterator CSVRender::Cell::removeObject(
+    std::map<std::string, Object*>::iterator iter)
 {
     delete iter->second;
-    mObjects.erase (iter++);
+    mObjects.erase(iter++);
     return iter;
 }
 
-bool CSVRender::Cell::addObjects (int start, int end)
+bool CSVRender::Cell::addObjects(int start, int end)
 {
     bool modified = false;
 
     const CSMWorld::RefCollection& collection = mData.getReferences();
 
-    for (int i=start; i<=end; ++i)
+    for (int i = start; i <= end; ++i)
     {
-        std::string cell = Misc::StringUtils::lowerCase (collection.getRecord (i).get().mCell);
+        std::string cell = Misc::StringUtils::lowerCase(collection.getRecord(i).get().mCell);
 
-        CSMWorld::RecordBase::State state = collection.getRecord (i).mState;
+        CSMWorld::RecordBase::State state = collection.getRecord(i).mState;
 
-        if (cell==mId && state!=CSMWorld::RecordBase::State_Deleted)
+        if (cell == mId && state != CSMWorld::RecordBase::State_Deleted)
         {
-            std::string id = Misc::StringUtils::lowerCase (collection.getRecord (i).get().mId);
+            std::string id = Misc::StringUtils::lowerCase(collection.getRecord(i).get().mId);
 
             auto object = std::make_unique<Object>(mData, mCellNode, id, false);
 
             if (mSubModeElementMask & Mask_Reference)
-                object->setSubMode (mSubMode);
+                object->setSubMode(mSubMode);
 
-            mObjects.insert (std::make_pair (id, object.release()));
+            mObjects.insert(std::make_pair(id, object.release()));
             modified = true;
         }
     }
@@ -118,7 +117,7 @@ void CSVRender::Cell::updateLand()
     {
         const ESM::Land& esmLand = land.getRecord(mId).get();
 
-        if (esmLand.getLandData (ESM::Land::DATA_VHGT))
+        if (esmLand.getLandData(ESM::Land::DATA_VHGT))
         {
             if (mTerrain)
             {
@@ -127,8 +126,8 @@ void CSVRender::Cell::updateLand()
             }
             else
             {
-                mTerrain = std::make_unique<Terrain::TerrainGrid>(mCellNode, mCellNode,
-                    mData.getResourceSystem().get(), mTerrainStorage, Mask_Terrain);
+                mTerrain = std::make_unique<Terrain::TerrainGrid>(
+                    mCellNode, mCellNode, mData.getResourceSystem().get(), mTerrainStorage, Mask_Terrain);
             }
 
             mTerrain->loadCell(esmLand.mX, esmLand.mY);
@@ -146,7 +145,7 @@ void CSVRender::Cell::updateLand()
     unloadLand();
 }
 
-void  CSVRender::Cell::unloadLand()
+void CSVRender::Cell::unloadLand()
 {
     if (mTerrain)
         mTerrain->unloadCell(mCoordinates.getX(), mCoordinates.getY());
@@ -155,12 +154,16 @@ void  CSVRender::Cell::unloadLand()
         mCellBorder.reset();
 }
 
-CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::string& id,
-    bool deleted)
-: mData (data), mId (Misc::StringUtils::lowerCase (id)), mDeleted (deleted), mSubMode (0),
-  mSubModeElementMask (0), mUpdateLand(true), mLandDeleted(false)
+CSVRender::Cell::Cell(CSMWorld::Data& data, osg::Group* rootNode, const std::string& id, bool deleted)
+    : mData(data)
+    , mId(Misc::StringUtils::lowerCase(id))
+    , mDeleted(deleted)
+    , mSubMode(0)
+    , mSubModeElementMask(0)
+    , mUpdateLand(true)
+    , mLandDeleted(false)
 {
-    std::pair<CSMWorld::CellCoordinates, bool> result = CSMWorld::CellCoordinates::fromId (id);
+    std::pair<CSMWorld::CellCoordinates, bool> result = CSMWorld::CellCoordinates::fromId(id);
 
     mTerrainStorage = new TerrainStorage(mData);
 
@@ -176,12 +179,12 @@ CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::st
 
     if (!mDeleted)
     {
-        CSMWorld::IdTable& references = dynamic_cast<CSMWorld::IdTable&> (
-            *mData.getTableModel (CSMWorld::UniversalId::Type_References));
+        CSMWorld::IdTable& references
+            = dynamic_cast<CSMWorld::IdTable&>(*mData.getTableModel(CSMWorld::UniversalId::Type_References));
 
         int rows = references.rowCount();
 
-        addObjects (0, rows-1);
+        addObjects(0, rows - 1);
 
         updateLand();
 
@@ -192,8 +195,7 @@ CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::st
 
 CSVRender::Cell::~Cell()
 {
-    for (std::map<std::string, Object *>::iterator iter (mObjects.begin());
-        iter!=mObjects.end(); ++iter)
+    for (std::map<std::string, Object*>::iterator iter(mObjects.begin()); iter != mObjects.end(); ++iter)
         delete iter->second;
 
     mCellNode->getParent(0)->removeChild(mCellNode);
@@ -204,86 +206,81 @@ CSVRender::Pathgrid* CSVRender::Cell::getPathgrid() const
     return mPathgrid.get();
 }
 
-bool CSVRender::Cell::referenceableDataChanged (const QModelIndex& topLeft,
-    const QModelIndex& bottomRight)
+bool CSVRender::Cell::referenceableDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     bool modified = false;
 
-    for (std::map<std::string, Object *>::iterator iter (mObjects.begin());
-        iter!=mObjects.end(); ++iter)
-        if (iter->second->referenceableDataChanged (topLeft, bottomRight))
+    for (std::map<std::string, Object*>::iterator iter(mObjects.begin()); iter != mObjects.end(); ++iter)
+        if (iter->second->referenceableDataChanged(topLeft, bottomRight))
             modified = true;
 
     return modified;
 }
 
-bool CSVRender::Cell::referenceableAboutToBeRemoved (const QModelIndex& parent, int start,
-    int end)
+bool CSVRender::Cell::referenceableAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
     if (parent.isValid())
         return false;
 
     bool modified = false;
 
-    for (std::map<std::string, Object *>::iterator iter (mObjects.begin());
-        iter!=mObjects.end(); ++iter)
-        if (iter->second->referenceableAboutToBeRemoved (parent, start, end))
+    for (std::map<std::string, Object*>::iterator iter(mObjects.begin()); iter != mObjects.end(); ++iter)
+        if (iter->second->referenceableAboutToBeRemoved(parent, start, end))
             modified = true;
 
     return modified;
 }
 
-bool CSVRender::Cell::referenceDataChanged (const QModelIndex& topLeft,
-    const QModelIndex& bottomRight)
+bool CSVRender::Cell::referenceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     if (mDeleted)
         return false;
 
-    CSMWorld::IdTable& references = dynamic_cast<CSMWorld::IdTable&> (
-        *mData.getTableModel (CSMWorld::UniversalId::Type_References));
+    CSMWorld::IdTable& references
+        = dynamic_cast<CSMWorld::IdTable&>(*mData.getTableModel(CSMWorld::UniversalId::Type_References));
 
-    int idColumn = references.findColumnIndex (CSMWorld::Columns::ColumnId_Id);
-    int cellColumn = references.findColumnIndex (CSMWorld::Columns::ColumnId_Cell);
-    int stateColumn = references.findColumnIndex (CSMWorld::Columns::ColumnId_Modification);
+    int idColumn = references.findColumnIndex(CSMWorld::Columns::ColumnId_Id);
+    int cellColumn = references.findColumnIndex(CSMWorld::Columns::ColumnId_Cell);
+    int stateColumn = references.findColumnIndex(CSMWorld::Columns::ColumnId_Modification);
 
     // list IDs in cell
     std::map<std::string, bool> ids; // id, deleted state
 
-    for (int i=topLeft.row(); i<=bottomRight.row(); ++i)
+    for (int i = topLeft.row(); i <= bottomRight.row(); ++i)
     {
-        std::string cell = Misc::StringUtils::lowerCase (references.data (
-            references.index (i, cellColumn)).toString().toUtf8().constData());
+        std::string cell = Misc::StringUtils::lowerCase(
+            references.data(references.index(i, cellColumn)).toString().toUtf8().constData());
 
-        if (cell==mId)
+        if (cell == mId)
         {
-            std::string id = Misc::StringUtils::lowerCase (references.data (
-                references.index (i, idColumn)).toString().toUtf8().constData());
+            std::string id = Misc::StringUtils::lowerCase(
+                references.data(references.index(i, idColumn)).toString().toUtf8().constData());
 
-            int state = references.data (references.index (i, stateColumn)).toInt();
+            int state = references.data(references.index(i, stateColumn)).toInt();
 
-            ids.insert (std::make_pair (id, state==CSMWorld::RecordBase::State_Deleted));
+            ids.insert(std::make_pair(id, state == CSMWorld::RecordBase::State_Deleted));
         }
     }
 
     // perform update and remove where needed
     bool modified = false;
 
-    std::map<std::string, Object *>::iterator iter = mObjects.begin();
-    while (iter!=mObjects.end())
+    std::map<std::string, Object*>::iterator iter = mObjects.begin();
+    while (iter != mObjects.end())
     {
-        if (iter->second->referenceDataChanged (topLeft, bottomRight))
+        if (iter->second->referenceDataChanged(topLeft, bottomRight))
             modified = true;
 
-        std::map<std::string, bool>::iterator iter2 = ids.find (iter->first);
+        std::map<std::string, bool>::iterator iter2 = ids.find(iter->first);
 
-        if (iter2!=ids.end())
+        if (iter2 != ids.end())
         {
             bool deleted = iter2->second;
-            ids.erase (iter2);
+            ids.erase(iter2);
 
             if (deleted)
             {
-                iter = removeObject (iter);
+                iter = removeObject(iter);
                 modified = true;
                 continue;
             }
@@ -293,12 +290,11 @@ bool CSVRender::Cell::referenceDataChanged (const QModelIndex& topLeft,
     }
 
     // add new objects
-    for (std::map<std::string, bool>::iterator mapIter (ids.begin()); mapIter!=ids.end(); ++mapIter)
+    for (std::map<std::string, bool>::iterator mapIter(ids.begin()); mapIter != ids.end(); ++mapIter)
     {
         if (!mapIter->second)
         {
-            mObjects.insert (std::make_pair (
-                mapIter->first, new Object (mData, mCellNode, mapIter->first, false)));
+            mObjects.insert(std::make_pair(mapIter->first, new Object(mData, mCellNode, mapIter->first, false)));
 
             modified = true;
         }
@@ -307,8 +303,7 @@ bool CSVRender::Cell::referenceDataChanged (const QModelIndex& topLeft,
     return modified;
 }
 
-bool CSVRender::Cell::referenceAboutToBeRemoved (const QModelIndex& parent, int start,
-    int end)
+bool CSVRender::Cell::referenceAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
     if (parent.isValid())
         return false;
@@ -316,22 +311,21 @@ bool CSVRender::Cell::referenceAboutToBeRemoved (const QModelIndex& parent, int
     if (mDeleted)
         return false;
 
-    CSMWorld::IdTable& references = dynamic_cast<CSMWorld::IdTable&> (
-        *mData.getTableModel (CSMWorld::UniversalId::Type_References));
+    CSMWorld::IdTable& references
+        = dynamic_cast<CSMWorld::IdTable&>(*mData.getTableModel(CSMWorld::UniversalId::Type_References));
 
-    int idColumn = references.findColumnIndex (CSMWorld::Columns::ColumnId_Id);
+    int idColumn = references.findColumnIndex(CSMWorld::Columns::ColumnId_Id);
 
     bool modified = false;
 
-    for (int row = start; row<=end; ++row)
-        if (removeObject (references.data (
-            references.index (row, idColumn)).toString().toUtf8().constData()))
+    for (int row = start; row <= end; ++row)
+        if (removeObject(references.data(references.index(row, idColumn)).toString().toUtf8().constData()))
             modified = true;
 
     return modified;
 }
 
-bool CSVRender::Cell::referenceAdded (const QModelIndex& parent, int start, int end)
+bool CSVRender::Cell::referenceAdded(const QModelIndex& parent, int start, int end)
 {
     if (parent.isValid())
         return false;
@@ -339,7 +333,7 @@ bool CSVRender::Cell::referenceAdded (const QModelIndex& parent, int start, int
     if (mDeleted)
         return false;
 
-    return addObjects (start, end);
+    return addObjects(start, end);
 }
 
 void CSVRender::Cell::setAlteredHeight(int inCellX, int inCellY, float height)
@@ -376,42 +370,41 @@ void CSVRender::Cell::pathgridRemoved()
         mPathgrid->removeGeometry();
 }
 
-void CSVRender::Cell::landDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight)
+void CSVRender::Cell::landDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     mUpdateLand = true;
 }
 
-void CSVRender::Cell::landAboutToBeRemoved (const QModelIndex& parent, int start, int end)
+void CSVRender::Cell::landAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
     mLandDeleted = true;
     unloadLand();
 }
 
-void CSVRender::Cell::landAdded (const QModelIndex& parent, int start, int end)
+void CSVRender::Cell::landAdded(const QModelIndex& parent, int start, int end)
 {
     mUpdateLand = true;
     mLandDeleted = false;
 }
 
-void CSVRender::Cell::landTextureChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight)
+void CSVRender::Cell::landTextureChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     mUpdateLand = true;
 }
 
-void CSVRender::Cell::landTextureAboutToBeRemoved (const QModelIndex& parent, int start, int end)
+void CSVRender::Cell::landTextureAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
     mUpdateLand = true;
 }
 
-void CSVRender::Cell::landTextureAdded (const QModelIndex& parent, int start, int end)
+void CSVRender::Cell::landTextureAdded(const QModelIndex& parent, int start, int end)
 {
     mUpdateLand = true;
 }
 
 void CSVRender::Cell::reloadAssets()
 {
-    for (std::map<std::string, Object *>::const_iterator iter (mObjects.begin());
-        iter != mObjects.end(); ++iter)
+    for (std::map<std::string, Object*>::const_iterator iter(mObjects.begin()); iter != mObjects.end(); ++iter)
     {
         iter->second->reloadAssets();
     }
@@ -426,23 +419,28 @@ void CSVRender::Cell::reloadAssets()
         mCellWater->reloadAssets();
 }
 
-void CSVRender::Cell::setSelection (int elementMask, Selection mode)
+void CSVRender::Cell::setSelection(int elementMask, Selection mode)
 {
     if (elementMask & Mask_Reference)
     {
-        for (std::map<std::string, Object *>::const_iterator iter (mObjects.begin());
-            iter!=mObjects.end(); ++iter)
+        for (std::map<std::string, Object*>::const_iterator iter(mObjects.begin()); iter != mObjects.end(); ++iter)
         {
             bool selected = false;
 
             switch (mode)
             {
-                case Selection_Clear: selected = false; break;
-                case Selection_All: selected = true; break;
-                case Selection_Invert: selected = !iter->second->getSelected(); break;
+                case Selection_Clear:
+                    selected = false;
+                    break;
+                case Selection_All:
+                    selected = true;
+                    break;
+                case Selection_Invert:
+                    selected = !iter->second->getSelected();
+                    break;
             }
 
-            iter->second->setSelected (selected);
+            iter->second->setSelected(selected);
         }
     }
     if (mPathgrid && elementMask & Mask_Pathgrid)
@@ -468,24 +466,21 @@ void CSVRender::Cell::setSelection (int elementMask, Selection mode)
     }
 }
 
-void CSVRender::Cell::selectAllWithSameParentId (int elementMask)
+void CSVRender::Cell::selectAllWithSameParentId(int elementMask)
 {
     std::set<std::string> ids;
 
-    for (std::map<std::string, Object *>::const_iterator iter (mObjects.begin());
-        iter!=mObjects.end(); ++iter)
+    for (std::map<std::string, Object*>::const_iterator iter(mObjects.begin()); iter != mObjects.end(); ++iter)
     {
         if (iter->second->getSelected())
-            ids.insert (iter->second->getReferenceableId());
+            ids.insert(iter->second->getReferenceableId());
     }
 
-    for (std::map<std::string, Object *>::const_iterator iter (mObjects.begin());
-        iter!=mObjects.end(); ++iter)
+    for (std::map<std::string, Object*>::const_iterator iter(mObjects.begin()); iter != mObjects.end(); ++iter)
     {
-        if (!iter->second->getSelected() &&
-            ids.find (iter->second->getReferenceableId())!=ids.end())
+        if (!iter->second->getSelected() && ids.find(iter->second->getReferenceableId()) != ids.end())
         {
-            iter->second->setSelected (true);
+            iter->second->setSelected(true);
         }
     }
 }
@@ -499,26 +494,27 @@ void CSVRender::Cell::handleSelectDrag(Object* object, DragMode dragMode)
         object->setSelected(false);
 
     else if (dragMode == DragMode_Select_Invert)
-        object->setSelected (!object->getSelected());
+        object->setSelected(!object->getSelected());
 }
 
 void CSVRender::Cell::selectInsideCube(const osg::Vec3d& pointA, const osg::Vec3d& pointB, DragMode dragMode)
 {
     for (auto& object : mObjects)
     {
-        if (dragMode == DragMode_Select_Only) object.second->setSelected (false);
+        if (dragMode == DragMode_Select_Only)
+            object.second->setSelected(false);
 
-        if ( ( object.second->getPosition().pos[0] > pointA[0] && object.second->getPosition().pos[0] < pointB[0] ) ||
-             ( object.second->getPosition().pos[0] > pointB[0] && object.second->getPosition().pos[0] < pointA[0] ))
+        if ((object.second->getPosition().pos[0] > pointA[0] && object.second->getPosition().pos[0] < pointB[0])
+            || (object.second->getPosition().pos[0] > pointB[0] && object.second->getPosition().pos[0] < pointA[0]))
         {
-            if ( ( object.second->getPosition().pos[1] > pointA[1] && object.second->getPosition().pos[1] < pointB[1] ) ||
-                 ( object.second->getPosition().pos[1] > pointB[1] && object.second->getPosition().pos[1] < pointA[1] ))
+            if ((object.second->getPosition().pos[1] > pointA[1] && object.second->getPosition().pos[1] < pointB[1])
+                || (object.second->getPosition().pos[1] > pointB[1] && object.second->getPosition().pos[1] < pointA[1]))
             {
-                if ( ( object.second->getPosition().pos[2] > pointA[2] && object.second->getPosition().pos[2] < pointB[2] ) ||
-                     ( object.second->getPosition().pos[2] > pointB[2] && object.second->getPosition().pos[2] < pointA[2] ))
+                if ((object.second->getPosition().pos[2] > pointA[2] && object.second->getPosition().pos[2] < pointB[2])
+                    || (object.second->getPosition().pos[2] > pointB[2]
+                        && object.second->getPosition().pos[2] < pointA[2]))
                     handleSelectDrag(object.second, dragMode);
             }
-
         }
     }
 }
@@ -527,27 +523,29 @@ void CSVRender::Cell::selectWithinDistance(const osg::Vec3d& point, float distan
 {
     for (auto& object : mObjects)
     {
-        if (dragMode == DragMode_Select_Only) object.second->setSelected (false);
+        if (dragMode == DragMode_Select_Only)
+            object.second->setSelected(false);
 
         float distanceFromObject = (point - object.second->getPosition().asVec3()).length();
-        if (distanceFromObject < distance) handleSelectDrag(object.second, dragMode);
+        if (distanceFromObject < distance)
+            handleSelectDrag(object.second, dragMode);
     }
 }
 
-void CSVRender::Cell::setCellArrows (int mask)
+void CSVRender::Cell::setCellArrows(int mask)
 {
-    for (int i=0; i<4; ++i)
+    for (int i = 0; i < 4; ++i)
     {
-        CellArrow::Direction direction = static_cast<CellArrow::Direction> (1<<i);
+        CellArrow::Direction direction = static_cast<CellArrow::Direction>(1 << i);
 
         bool enable = mask & direction;
 
-        if (enable!=(mCellArrows[i].get()!=nullptr))
+        if (enable != (mCellArrows[i].get() != nullptr))
         {
             if (enable)
                 mCellArrows[i] = std::make_unique<CellArrow>(mCellNode, direction, mCoordinates);
             else
-                mCellArrows[i].reset (nullptr);
+                mCellArrows[i].reset(nullptr);
         }
     }
 }
@@ -565,7 +563,8 @@ void CSVRender::Cell::setCellMarker()
         isInteriorCell = cellRecord.get().mData.mFlags & ESM::Cell::Interior;
     }
 
-    if (!isInteriorCell) {
+    if (!isInteriorCell)
+    {
         mCellMarker = std::make_unique<CellMarker>(mCellNode, mCoordinates, cellExists);
     }
 }
@@ -580,15 +579,14 @@ bool CSVRender::Cell::isDeleted() const
     return mDeleted;
 }
 
-std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::Cell::getSelection (unsigned int elementMask) const
+std::vector<osg::ref_ptr<CSVRender::TagBase>> CSVRender::Cell::getSelection(unsigned int elementMask) const
 {
-    std::vector<osg::ref_ptr<TagBase> > result;
+    std::vector<osg::ref_ptr<TagBase>> result;
 
     if (elementMask & Mask_Reference)
-        for (std::map<std::string, Object *>::const_iterator iter (mObjects.begin());
-            iter!=mObjects.end(); ++iter)
+        for (std::map<std::string, Object*>::const_iterator iter(mObjects.begin()); iter != mObjects.end(); ++iter)
             if (iter->second->getSelected())
-                result.push_back (iter->second->getTag());
+                result.push_back(iter->second->getTag());
     if (mPathgrid && elementMask & Mask_Pathgrid)
         if (mPathgrid->isSelected())
             result.emplace_back(mPathgrid->getTag());
@@ -596,35 +594,32 @@ std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::Cell::getSelection (un
     return result;
 }
 
-std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::Cell::getEdited (unsigned int elementMask) const
+std::vector<osg::ref_ptr<CSVRender::TagBase>> CSVRender::Cell::getEdited(unsigned int elementMask) const
 {
-    std::vector<osg::ref_ptr<TagBase> > result;
+    std::vector<osg::ref_ptr<TagBase>> result;
 
     if (elementMask & Mask_Reference)
-        for (std::map<std::string, Object *>::const_iterator iter (mObjects.begin());
-            iter!=mObjects.end(); ++iter)
+        for (std::map<std::string, Object*>::const_iterator iter(mObjects.begin()); iter != mObjects.end(); ++iter)
             if (iter->second->isEdited())
-                result.push_back (iter->second->getTag());
+                result.push_back(iter->second->getTag());
 
     return result;
 }
 
-void CSVRender::Cell::setSubMode (int subMode, unsigned int elementMask)
+void CSVRender::Cell::setSubMode(int subMode, unsigned int elementMask)
 {
     mSubMode = subMode;
     mSubModeElementMask = elementMask;
 
     if (elementMask & Mask_Reference)
-        for (std::map<std::string, Object *>::const_iterator iter (mObjects.begin());
-            iter!=mObjects.end(); ++iter)
-                iter->second->setSubMode (subMode);
+        for (std::map<std::string, Object*>::const_iterator iter(mObjects.begin()); iter != mObjects.end(); ++iter)
+            iter->second->setSubMode(subMode);
 }
 
-void CSVRender::Cell::reset (unsigned int elementMask)
+void CSVRender::Cell::reset(unsigned int elementMask)
 {
     if (elementMask & Mask_Reference)
-        for (std::map<std::string, Object *>::const_iterator iter (mObjects.begin());
-            iter!=mObjects.end(); ++iter)
+        for (std::map<std::string, Object*>::const_iterator iter(mObjects.begin()); iter != mObjects.end(); ++iter)
             iter->second->reset();
     if (mPathgrid && elementMask & Mask_Pathgrid)
         mPathgrid->resetIndicators();
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index 12f6f0ccdb..42f61c0956 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -1,16 +1,16 @@
 #ifndef OPENCS_VIEW_CELL_H
 #define OPENCS_VIEW_CELL_H
 
-#include <string>
 #include <map>
 #include <memory>
+#include <string>
 #include <vector>
 
 #include <osg/ref_ptr>
 
 #include "../../model/world/cellcoordinates.hpp"
-#include "terrainstorage.hpp"
 #include "instancedragmodes.hpp"
+#include "terrainstorage.hpp"
 
 class QModelIndex;
 
@@ -44,141 +44,136 @@ namespace CSVRender
 
     class Cell
     {
-            CSMWorld::Data& mData;
-            std::string mId;
-            osg::ref_ptr<osg::Group> mCellNode;
-            std::map<std::string, Object *> mObjects;
-            std::unique_ptr<Terrain::TerrainGrid> mTerrain;
-            CSMWorld::CellCoordinates mCoordinates;
-            std::unique_ptr<CellArrow> mCellArrows[4];
-            std::unique_ptr<CellMarker> mCellMarker;
-            std::unique_ptr<CellBorder> mCellBorder;
-            std::unique_ptr<CellWater> mCellWater;
-            std::unique_ptr<Pathgrid> mPathgrid;
-            bool mDeleted;
-            int mSubMode;
-            unsigned int mSubModeElementMask;
-            bool mUpdateLand, mLandDeleted;
-            TerrainStorage *mTerrainStorage;
-
-            /// Ignored if cell does not have an object with the given ID.
-            ///
-            /// \return Was the object deleted?
-            bool removeObject (const std::string& id);
-
-            // Remove object and return iterator to next object.
-            std::map<std::string, Object *>::iterator removeObject (
-                std::map<std::string, Object *>::iterator iter);
+        CSMWorld::Data& mData;
+        std::string mId;
+        osg::ref_ptr<osg::Group> mCellNode;
+        std::map<std::string, Object*> mObjects;
+        std::unique_ptr<Terrain::TerrainGrid> mTerrain;
+        CSMWorld::CellCoordinates mCoordinates;
+        std::unique_ptr<CellArrow> mCellArrows[4];
+        std::unique_ptr<CellMarker> mCellMarker;
+        std::unique_ptr<CellBorder> mCellBorder;
+        std::unique_ptr<CellWater> mCellWater;
+        std::unique_ptr<Pathgrid> mPathgrid;
+        bool mDeleted;
+        int mSubMode;
+        unsigned int mSubModeElementMask;
+        bool mUpdateLand, mLandDeleted;
+        TerrainStorage* mTerrainStorage;
 
-            /// Add objects from reference table that are within this cell.
-            ///
-            /// \return Have any objects been added?
-            bool addObjects (int start, int end);
+        /// Ignored if cell does not have an object with the given ID.
+        ///
+        /// \return Was the object deleted?
+        bool removeObject(const std::string& id);
 
-            void updateLand();
-            void unloadLand();
+        // Remove object and return iterator to next object.
+        std::map<std::string, Object*>::iterator removeObject(std::map<std::string, Object*>::iterator iter);
 
-        public:
+        /// Add objects from reference table that are within this cell.
+        ///
+        /// \return Have any objects been added?
+        bool addObjects(int start, int end);
 
-            enum Selection
-            {
-                Selection_Clear,
-                Selection_All,
-                Selection_Invert
-            };
+        void updateLand();
+        void unloadLand();
 
-        public:
+    public:
+        enum Selection
+        {
+            Selection_Clear,
+            Selection_All,
+            Selection_Invert
+        };
 
-            /// \note Deleted covers both cells that are deleted and cells that don't exist in
-            /// the first place.
-            Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::string& id,
-                bool deleted = false);
+    public:
+        /// \note Deleted covers both cells that are deleted and cells that don't exist in
+        /// the first place.
+        Cell(CSMWorld::Data& data, osg::Group* rootNode, const std::string& id, bool deleted = false);
 
-            ~Cell();
+        ~Cell();
 
-            /// \note Returns the pathgrid representation which will exist as long as the cell exists
-            Pathgrid* getPathgrid() const;
+        /// \note Returns the pathgrid representation which will exist as long as the cell exists
+        Pathgrid* getPathgrid() const;
 
-            /// \return Did this call result in a modification of the visual representation of
-            /// this cell?
-            bool referenceableDataChanged (const QModelIndex& topLeft,
-                const QModelIndex& bottomRight);
+        /// \return Did this call result in a modification of the visual representation of
+        /// this cell?
+        bool referenceableDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
-            /// \return Did this call result in a modification of the visual representation of
-            /// this cell?
-            bool referenceableAboutToBeRemoved (const QModelIndex& parent, int start, int end);
+        /// \return Did this call result in a modification of the visual representation of
+        /// this cell?
+        bool referenceableAboutToBeRemoved(const QModelIndex& parent, int start, int end);
 
-            /// \return Did this call result in a modification of the visual representation of
-            /// this cell?
-            bool referenceDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
+        /// \return Did this call result in a modification of the visual representation of
+        /// this cell?
+        bool referenceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
-            /// \return Did this call result in a modification of the visual representation of
-            /// this cell?
-            bool referenceAboutToBeRemoved (const QModelIndex& parent, int start, int end);
+        /// \return Did this call result in a modification of the visual representation of
+        /// this cell?
+        bool referenceAboutToBeRemoved(const QModelIndex& parent, int start, int end);
 
-            /// \return Did this call result in a modification of the visual representation of
-            /// this cell?
-            bool referenceAdded (const QModelIndex& parent, int start, int end);
+        /// \return Did this call result in a modification of the visual representation of
+        /// this cell?
+        bool referenceAdded(const QModelIndex& parent, int start, int end);
 
-            void setAlteredHeight(int inCellX, int inCellY, float height);
+        void setAlteredHeight(int inCellX, int inCellY, float height);
 
-            float getSumOfAlteredAndTrueHeight(int cellX, int cellY, int inCellX, int inCellY);
+        float getSumOfAlteredAndTrueHeight(int cellX, int cellY, int inCellX, int inCellY);
 
-            float* getAlteredHeight(int inCellX, int inCellY);
+        float* getAlteredHeight(int inCellX, int inCellY);
 
-            void resetAlteredHeights();
+        void resetAlteredHeights();
 
-            void pathgridModified();
+        void pathgridModified();
 
-            void pathgridRemoved();
+        void pathgridRemoved();
 
-            void landDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
+        void landDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
-            void landAboutToBeRemoved (const QModelIndex& parent, int start, int end);
+        void landAboutToBeRemoved(const QModelIndex& parent, int start, int end);
 
-            void landAdded (const QModelIndex& parent, int start, int end);
+        void landAdded(const QModelIndex& parent, int start, int end);
 
-            void landTextureChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
+        void landTextureChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
-            void landTextureAboutToBeRemoved (const QModelIndex& parent, int start, int end);
+        void landTextureAboutToBeRemoved(const QModelIndex& parent, int start, int end);
 
-            void landTextureAdded (const QModelIndex& parent, int start, int end);
+        void landTextureAdded(const QModelIndex& parent, int start, int end);
 
-            void reloadAssets();
+        void reloadAssets();
 
-            void setSelection (int elementMask, Selection mode);
+        void setSelection(int elementMask, Selection mode);
 
-            // Select everything that references the same ID as at least one of the elements
-            // already selected
-            void selectAllWithSameParentId (int elementMask);
+        // Select everything that references the same ID as at least one of the elements
+        // already selected
+        void selectAllWithSameParentId(int elementMask);
 
-            void handleSelectDrag(Object* object, DragMode dragMode);
+        void handleSelectDrag(Object* object, DragMode dragMode);
 
-            void selectInsideCube(const osg::Vec3d& pointA, const osg::Vec3d& pointB, DragMode dragMode);
+        void selectInsideCube(const osg::Vec3d& pointA, const osg::Vec3d& pointB, DragMode dragMode);
 
-            void selectWithinDistance(const osg::Vec3d& pointA, float distance, DragMode dragMode);
+        void selectWithinDistance(const osg::Vec3d& pointA, float distance, DragMode dragMode);
 
-            void setCellArrows (int mask);
+        void setCellArrows(int mask);
 
-            /// \brief Set marker for this cell.
-            void setCellMarker();
+        /// \brief Set marker for this cell.
+        void setCellMarker();
 
-            /// Returns 0, 0 in case of an unpaged cell.
-            CSMWorld::CellCoordinates getCoordinates() const;
+        /// Returns 0, 0 in case of an unpaged cell.
+        CSMWorld::CellCoordinates getCoordinates() const;
 
-            bool isDeleted() const;
+        bool isDeleted() const;
 
-            std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask) const;
+        std::vector<osg::ref_ptr<TagBase>> getSelection(unsigned int elementMask) const;
 
-            std::vector<osg::ref_ptr<TagBase> > getEdited (unsigned int elementMask) const;
+        std::vector<osg::ref_ptr<TagBase>> getEdited(unsigned int elementMask) const;
 
-            void setSubMode (int subMode, unsigned int elementMask);
+        void setSubMode(int subMode, unsigned int elementMask);
 
-            /// Erase all overrides and restore the visual representation of the cell to its
-            /// true state.
-            void reset (unsigned int elementMask);
+        /// Erase all overrides and restore the visual representation of the cell to its
+        /// true state.
+        void reset(unsigned int elementMask);
 
-            friend class CellNodeCallback;
+        friend class CellNodeCallback;
     };
 }
 
diff --git a/apps/opencs/view/render/cellarrow.cpp b/apps/opencs/view/render/cellarrow.cpp
index 9ad4932698..62549a301b 100644
--- a/apps/opencs/view/render/cellarrow.cpp
+++ b/apps/opencs/view/render/cellarrow.cpp
@@ -1,8 +1,8 @@
 #include "cellarrow.hpp"
 
+#include <osg/Geometry>
 #include <osg/Group>
 #include <osg/PositionAttitudeTransform>
-#include <osg/Geometry>
 #include <osg/PrimitiveSet>
 
 #include "../../model/prefs/state.hpp"
@@ -11,25 +11,35 @@
 
 #include "mask.hpp"
 
-CSVRender::CellArrowTag::CellArrowTag (CellArrow *arrow)
-: TagBase (Mask_CellArrow), mArrow (arrow)
-{}
+CSVRender::CellArrowTag::CellArrowTag(CellArrow* arrow)
+    : TagBase(Mask_CellArrow)
+    , mArrow(arrow)
+{
+}
 
-CSVRender::CellArrow *CSVRender::CellArrowTag::getCellArrow() const
+CSVRender::CellArrow* CSVRender::CellArrowTag::getCellArrow() const
 {
     return mArrow;
 }
 
 QString CSVRender::CellArrowTag::getToolTip(bool hideBasics, const WorldspaceHitResult& /*hit*/) const
 {
-    QString text ("Direction: ");
+    QString text("Direction: ");
 
     switch (mArrow->getDirection())
     {
-        case CellArrow::Direction_North: text += "North"; break;
-        case CellArrow::Direction_West: text += "West"; break;
-        case CellArrow::Direction_South: text += "South"; break;
-        case CellArrow::Direction_East: text += "East"; break;
+        case CellArrow::Direction_North:
+            text += "North";
+            break;
+        case CellArrow::Direction_West:
+            text += "West";
+            break;
+        case CellArrow::Direction_South:
+            text += "South";
+            break;
+        case CellArrow::Direction_East:
+            text += "East";
+            break;
     }
 
     if (!hideBasics)
@@ -52,124 +62,138 @@ QString CSVRender::CellArrowTag::getToolTip(bool hideBasics, const WorldspaceHit
     return CSMPrefs::State::get().getShortcutManager().processToolTip(text);
 }
 
-
 void CSVRender::CellArrow::adjustTransform()
 {
     // position
     const int cellSize = Constants::CellSizeInUnits;
     const int offset = cellSize / 2 + 600;
 
-    int x = mCoordinates.getX()*cellSize + cellSize/2;
-    int y = mCoordinates.getY()*cellSize + cellSize/2;
+    int x = mCoordinates.getX() * cellSize + cellSize / 2;
+    int y = mCoordinates.getY() * cellSize + cellSize / 2;
 
     float xr = 0;
     float yr = 0;
     float zr = 0;
 
-    float angle = osg::DegreesToRadians (90.0f);
+    float angle = osg::DegreesToRadians(90.0f);
 
     switch (mDirection)
     {
-        case Direction_North: y += offset; xr = -angle; zr = angle; break;
-        case Direction_West: x -= offset; yr = -angle; break;
-        case Direction_South: y -= offset; xr = angle; zr = angle; break;
-        case Direction_East: x += offset; yr = angle; break;
+        case Direction_North:
+            y += offset;
+            xr = -angle;
+            zr = angle;
+            break;
+        case Direction_West:
+            x -= offset;
+            yr = -angle;
+            break;
+        case Direction_South:
+            y -= offset;
+            xr = angle;
+            zr = angle;
+            break;
+        case Direction_East:
+            x += offset;
+            yr = angle;
+            break;
     };
 
-    mBaseNode->setPosition (osg::Vec3f (x, y, 0));
+    mBaseNode->setPosition(osg::Vec3f(x, y, 0));
 
     // orientation
-    osg::Quat xr2 (xr, osg::Vec3f (1,0,0));
-    osg::Quat yr2 (yr, osg::Vec3f (0,1,0));
-    osg::Quat zr2 (zr, osg::Vec3f (0,0,1));
-    mBaseNode->setAttitude (zr2*yr2*xr2);
+    osg::Quat xr2(xr, osg::Vec3f(1, 0, 0));
+    osg::Quat yr2(yr, osg::Vec3f(0, 1, 0));
+    osg::Quat zr2(zr, osg::Vec3f(0, 0, 1));
+    mBaseNode->setAttitude(zr2 * yr2 * xr2);
 }
 
 void CSVRender::CellArrow::buildShape()
 {
-    osg::ref_ptr<osg::Geometry> geometry (new osg::Geometry);
+    osg::ref_ptr<osg::Geometry> geometry(new osg::Geometry);
 
     const int arrowWidth = 2700;
     const int arrowLength = 1350;
     const int arrowHeight = 300;
 
-    osg::Vec3Array *vertices = new osg::Vec3Array;
-    for (int i2=0; i2<2; ++i2)
-        for (int i=0; i<2; ++i)
+    osg::Vec3Array* vertices = new osg::Vec3Array;
+    for (int i2 = 0; i2 < 2; ++i2)
+        for (int i = 0; i < 2; ++i)
         {
-            float height = i ? -arrowHeight/2 : arrowHeight/2;
-            vertices->push_back (osg::Vec3f (height, -arrowWidth/2, 0));
-            vertices->push_back (osg::Vec3f (height, arrowWidth/2, 0));
-            vertices->push_back (osg::Vec3f (height, 0, arrowLength));
+            float height = i ? -arrowHeight / 2 : arrowHeight / 2;
+            vertices->push_back(osg::Vec3f(height, -arrowWidth / 2, 0));
+            vertices->push_back(osg::Vec3f(height, arrowWidth / 2, 0));
+            vertices->push_back(osg::Vec3f(height, 0, arrowLength));
         }
 
-    geometry->setVertexArray (vertices);
+    geometry->setVertexArray(vertices);
 
-    osg::DrawElementsUShort *primitives = new osg::DrawElementsUShort (osg::PrimitiveSet::TRIANGLES, 0);
+    osg::DrawElementsUShort* primitives = new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES, 0);
 
     // top
-    primitives->push_back (0);
-    primitives->push_back (1);
-    primitives->push_back (2);
+    primitives->push_back(0);
+    primitives->push_back(1);
+    primitives->push_back(2);
 
     // bottom
-    primitives->push_back (5);
-    primitives->push_back (4);
-    primitives->push_back (3);
+    primitives->push_back(5);
+    primitives->push_back(4);
+    primitives->push_back(3);
 
     // back
-    primitives->push_back (3+6);
-    primitives->push_back (4+6);
-    primitives->push_back (1+6);
+    primitives->push_back(3 + 6);
+    primitives->push_back(4 + 6);
+    primitives->push_back(1 + 6);
 
-    primitives->push_back (3+6);
-    primitives->push_back (1+6);
-    primitives->push_back (0+6);
+    primitives->push_back(3 + 6);
+    primitives->push_back(1 + 6);
+    primitives->push_back(0 + 6);
 
     // sides
-    primitives->push_back (0+6);
-    primitives->push_back (2+6);
-    primitives->push_back (5+6);
+    primitives->push_back(0 + 6);
+    primitives->push_back(2 + 6);
+    primitives->push_back(5 + 6);
 
-    primitives->push_back (0+6);
-    primitives->push_back (5+6);
-    primitives->push_back (3+6);
+    primitives->push_back(0 + 6);
+    primitives->push_back(5 + 6);
+    primitives->push_back(3 + 6);
 
-    primitives->push_back (4+6);
-    primitives->push_back (5+6);
-    primitives->push_back (2+6);
+    primitives->push_back(4 + 6);
+    primitives->push_back(5 + 6);
+    primitives->push_back(2 + 6);
 
-    primitives->push_back (4+6);
-    primitives->push_back (2+6);
-    primitives->push_back (1+6);
+    primitives->push_back(4 + 6);
+    primitives->push_back(2 + 6);
+    primitives->push_back(1 + 6);
 
-    geometry->addPrimitiveSet (primitives);
+    geometry->addPrimitiveSet(primitives);
 
-    osg::Vec4Array *colours = new osg::Vec4Array;
+    osg::Vec4Array* colours = new osg::Vec4Array;
 
-    for (int i=0; i<6; ++i)
-        colours->push_back (osg::Vec4f (0.11f, 0.6f, 0.95f, 1.0f));
-    for (int i=0; i<6; ++i)
-        colours->push_back (osg::Vec4f (0.08f, 0.44f, 0.7f, 1.0f));
+    for (int i = 0; i < 6; ++i)
+        colours->push_back(osg::Vec4f(0.11f, 0.6f, 0.95f, 1.0f));
+    for (int i = 0; i < 6; ++i)
+        colours->push_back(osg::Vec4f(0.08f, 0.44f, 0.7f, 1.0f));
 
-    geometry->setColorArray (colours, osg::Array::BIND_PER_VERTEX);
+    geometry->setColorArray(colours, osg::Array::BIND_PER_VERTEX);
 
-    geometry->getOrCreateStateSet()->setMode (GL_LIGHTING, osg::StateAttribute::OFF);
+    geometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
 
-    mBaseNode->addChild (geometry);
+    mBaseNode->addChild(geometry);
 }
 
-CSVRender::CellArrow::CellArrow (osg::Group *cellNode, Direction direction,
-    const CSMWorld::CellCoordinates& coordinates)
-: mDirection (direction), mParentNode (cellNode), mCoordinates (coordinates)
+CSVRender::CellArrow::CellArrow(osg::Group* cellNode, Direction direction, const CSMWorld::CellCoordinates& coordinates)
+    : mDirection(direction)
+    , mParentNode(cellNode)
+    , mCoordinates(coordinates)
 {
     mBaseNode = new osg::PositionAttitudeTransform;
 
-    mBaseNode->setUserData (new CellArrowTag (this));
+    mBaseNode->setUserData(new CellArrowTag(this));
 
-    mParentNode->addChild (mBaseNode);
+    mParentNode->addChild(mBaseNode);
 
-    mBaseNode->setNodeMask (Mask_CellArrow);
+    mBaseNode->setNodeMask(Mask_CellArrow);
 
     adjustTransform();
     buildShape();
@@ -177,7 +201,7 @@ CSVRender::CellArrow::CellArrow (osg::Group *cellNode, Direction direction,
 
 CSVRender::CellArrow::~CellArrow()
 {
-    mParentNode->removeChild (mBaseNode);
+    mParentNode->removeChild(mBaseNode);
 }
 
 CSMWorld::CellCoordinates CSVRender::CellArrow::getCoordinates() const
diff --git a/apps/opencs/view/render/cellarrow.hpp b/apps/opencs/view/render/cellarrow.hpp
index ed71410610..9bf66bdcd8 100644
--- a/apps/opencs/view/render/cellarrow.hpp
+++ b/apps/opencs/view/render/cellarrow.hpp
@@ -19,55 +19,49 @@ namespace CSVRender
 
     class CellArrowTag : public TagBase
     {
-            CellArrow *mArrow;
+        CellArrow* mArrow;
 
-        public:
+    public:
+        CellArrowTag(CellArrow* arrow);
 
-            CellArrowTag (CellArrow *arrow);
+        CellArrow* getCellArrow() const;
 
-            CellArrow *getCellArrow() const;
-
-            QString getToolTip(bool hideBasics, const WorldspaceHitResult& hit) const override;
+        QString getToolTip(bool hideBasics, const WorldspaceHitResult& hit) const override;
     };
 
-
     class CellArrow
     {
-        public:
-
-            enum Direction
-            {
-                Direction_North = 1,
-                Direction_West = 2,
-                Direction_South = 4,
-                Direction_East = 8
-            };
-
-        private:
-
-            // not implemented
-            CellArrow (const CellArrow&);
-            CellArrow& operator= (const CellArrow&);
+    public:
+        enum Direction
+        {
+            Direction_North = 1,
+            Direction_West = 2,
+            Direction_South = 4,
+            Direction_East = 8
+        };
 
-            Direction mDirection;
-            osg::Group* mParentNode;
-            osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
-            CSMWorld::CellCoordinates mCoordinates;
+    private:
+        // not implemented
+        CellArrow(const CellArrow&);
+        CellArrow& operator=(const CellArrow&);
 
-            void adjustTransform();
+        Direction mDirection;
+        osg::Group* mParentNode;
+        osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
+        CSMWorld::CellCoordinates mCoordinates;
 
-            void buildShape();
+        void adjustTransform();
 
-        public:
+        void buildShape();
 
-            CellArrow (osg::Group *cellNode, Direction direction,
-                const CSMWorld::CellCoordinates& coordinates);
+    public:
+        CellArrow(osg::Group* cellNode, Direction direction, const CSMWorld::CellCoordinates& coordinates);
 
-            ~CellArrow();
+        ~CellArrow();
 
-            CSMWorld::CellCoordinates getCoordinates() const;
+        CSMWorld::CellCoordinates getCoordinates() const;
 
-            Direction getDirection() const;
+        Direction getDirection() const;
     };
 }
 
diff --git a/apps/opencs/view/render/cellborder.cpp b/apps/opencs/view/render/cellborder.cpp
index b93b5d1fcf..67154adee3 100644
--- a/apps/opencs/view/render/cellborder.cpp
+++ b/apps/opencs/view/render/cellborder.cpp
@@ -1,8 +1,8 @@
 #include "cellborder.hpp"
 
+#include <osg/Geometry>
 #include <osg/Group>
 #include <osg/PositionAttitudeTransform>
-#include <osg/Geometry>
 #include <osg/PrimitiveSet>
 
 #include <components/esm3/loadland.hpp>
@@ -19,12 +19,11 @@ const int CSVRender::CellBorder::CellSize = ESM::Land::REAL_SIZE;
 */
 const int CSVRender::CellBorder::VertexCount = (ESM::Land::LAND_SIZE * 4) - 4;
 
-
 CSVRender::CellBorder::CellBorder(osg::Group* cellNode, const CSMWorld::CellCoordinates& coords)
     : mParentNode(cellNode)
 {
     mBorderGeometry = new osg::Geometry();
-    
+
     mBaseNode = new osg::PositionAttitudeTransform();
     mBaseNode->setNodeMask(Mask_CellBorder);
     mBaseNode->setPosition(osg::Vec3f(coords.getX() * CellSize, coords.getY() * CellSize, 10));
@@ -79,8 +78,8 @@ void CSVRender::CellBorder::buildShape(const ESM::Land& esmLand)
 
     mBorderGeometry->setColorArray(colors, osg::Array::BIND_PER_PRIMITIVE_SET);
 
-    osg::ref_ptr<osg::DrawElementsUShort> primitives =
-        new osg::DrawElementsUShort(osg::PrimitiveSet::LINE_STRIP, VertexCount + 1);
+    osg::ref_ptr<osg::DrawElementsUShort> primitives
+        = new osg::DrawElementsUShort(osg::PrimitiveSet::LINE_STRIP, VertexCount + 1);
 
     // Assign one primitive to each vertex.
     for (size_t i = 0; i < VertexCount; ++i)
diff --git a/apps/opencs/view/render/cellborder.hpp b/apps/opencs/view/render/cellborder.hpp
index be2e18eeee..e1201a1f39 100644
--- a/apps/opencs/view/render/cellborder.hpp
+++ b/apps/opencs/view/render/cellborder.hpp
@@ -28,14 +28,12 @@ namespace CSVRender
     class CellBorder
     {
     public:
-
         CellBorder(osg::Group* cellNode, const CSMWorld::CellCoordinates& coords);
         ~CellBorder();
 
         void buildShape(const ESM::Land& esmLand);
 
     private:
-
         static const int CellSize;
         static const int VertexCount;
 
diff --git a/apps/opencs/view/render/cellmarker.cpp b/apps/opencs/view/render/cellmarker.cpp
index ddd4f4caf3..692728a995 100644
--- a/apps/opencs/view/render/cellmarker.cpp
+++ b/apps/opencs/view/render/cellmarker.cpp
@@ -6,11 +6,13 @@
 
 #include <components/misc/constants.hpp>
 
-CSVRender::CellMarkerTag::CellMarkerTag(CellMarker *marker)
-: TagBase(Mask_CellMarker), mMarker(marker)
-{}
+CSVRender::CellMarkerTag::CellMarkerTag(CellMarker* marker)
+    : TagBase(Mask_CellMarker)
+    , mMarker(marker)
+{
+}
 
-CSVRender::CellMarker *CSVRender::CellMarkerTag::getCellMarker() const
+CSVRender::CellMarker* CSVRender::CellMarkerTag::getCellMarker() const
 {
     return mMarker;
 }
@@ -20,7 +22,7 @@ void CSVRender::CellMarker::buildMarker()
     const int characterSize = 20;
 
     // Set up attributes of marker text.
-    osg::ref_ptr<osgText::Text> markerText (new osgText::Text);
+    osg::ref_ptr<osgText::Text> markerText(new osgText::Text);
     markerText->setLayout(osgText::Text::LEFT_TO_RIGHT);
     markerText->setCharacterSize(characterSize);
     markerText->setAlignment(osgText::Text::CENTER_CENTER);
@@ -37,9 +39,7 @@ void CSVRender::CellMarker::buildMarker()
     }
 
     // Add text containing cell's coordinates.
-    std::string coordinatesText =
-        std::to_string(mCoordinates.getX()) + "," +
-        std::to_string(mCoordinates.getY());
+    std::string coordinatesText = std::to_string(mCoordinates.getX()) + "," + std::to_string(mCoordinates.getY());
     markerText->setText(coordinatesText);
 
     // Add text to marker node.
@@ -58,12 +58,10 @@ void CSVRender::CellMarker::positionMarker()
 }
 
 CSVRender::CellMarker::CellMarker(
-    osg::Group *cellNode,
-    const CSMWorld::CellCoordinates& coordinates,
-    const bool cellExists
-) : mCellNode(cellNode),
-    mCoordinates(coordinates),
-    mExists(cellExists)
+    osg::Group* cellNode, const CSMWorld::CellCoordinates& coordinates, const bool cellExists)
+    : mCellNode(cellNode)
+    , mCoordinates(coordinates)
+    , mExists(cellExists)
 {
     // Set up node for cell marker.
     mMarkerNode = new osg::AutoTransform();
diff --git a/apps/opencs/view/render/cellmarker.hpp b/apps/opencs/view/render/cellmarker.hpp
index 4246b20b8d..c623a29605 100644
--- a/apps/opencs/view/render/cellmarker.hpp
+++ b/apps/opencs/view/render/cellmarker.hpp
@@ -19,49 +19,42 @@ namespace CSVRender
 
     class CellMarkerTag : public TagBase
     {
-        private:
+    private:
+        CellMarker* mMarker;
 
-            CellMarker *mMarker;
+    public:
+        CellMarkerTag(CellMarker* marker);
 
-        public:
-
-            CellMarkerTag(CellMarker *marker);
-
-            CellMarker *getCellMarker() const;
+        CellMarker* getCellMarker() const;
     };
 
     /// \brief Marker to display cell coordinates.
     class CellMarker
     {
-        private:
-
-            osg::Group* mCellNode;
-            osg::ref_ptr<osg::AutoTransform> mMarkerNode;
-            CSMWorld::CellCoordinates mCoordinates;
-            bool mExists;
-
-            // Not implemented.
-            CellMarker(const CellMarker&);
-            CellMarker& operator=(const CellMarker&);
-
-            /// \brief Build marker containing cell's coordinates.
-            void buildMarker();
-
-            /// \brief Position marker at center of cell.
-            void positionMarker();
-
-        public:
-
-            /// \brief Constructor.
-            /// \param cellNode Cell to create marker for.
-            /// \param coordinates Coordinates of cell.
-            /// \param cellExists Whether or not cell exists.
-            CellMarker(
-                osg::Group *cellNode,
-                const CSMWorld::CellCoordinates& coordinates,
-                const bool cellExists);
-
-            ~CellMarker();
+    private:
+        osg::Group* mCellNode;
+        osg::ref_ptr<osg::AutoTransform> mMarkerNode;
+        CSMWorld::CellCoordinates mCoordinates;
+        bool mExists;
+
+        // Not implemented.
+        CellMarker(const CellMarker&);
+        CellMarker& operator=(const CellMarker&);
+
+        /// \brief Build marker containing cell's coordinates.
+        void buildMarker();
+
+        /// \brief Position marker at center of cell.
+        void positionMarker();
+
+    public:
+        /// \brief Constructor.
+        /// \param cellNode Cell to create marker for.
+        /// \param coordinates Coordinates of cell.
+        /// \param cellExists Whether or not cell exists.
+        CellMarker(osg::Group* cellNode, const CSMWorld::CellCoordinates& coordinates, const bool cellExists);
+
+        ~CellMarker();
     };
 }
 
diff --git a/apps/opencs/view/render/cellwater.cpp b/apps/opencs/view/render/cellwater.cpp
index 9681e5cdce..cb55e48daa 100644
--- a/apps/opencs/view/render/cellwater.cpp
+++ b/apps/opencs/view/render/cellwater.cpp
@@ -21,8 +21,8 @@ namespace CSVRender
 {
     const int CellWater::CellSize = ESM::Land::REAL_SIZE;
 
-    CellWater::CellWater(CSMWorld::Data& data, osg::Group* cellNode, const std::string& id,
-        const CSMWorld::CellCoordinates& cellCoords)
+    CellWater::CellWater(
+        CSMWorld::Data& data, osg::Group* cellNode, const std::string& id, const CSMWorld::CellCoordinates& cellCoords)
         : mData(data)
         , mId(id)
         , mParentNode(cellNode)
@@ -34,8 +34,8 @@ namespace CSVRender
         , mHasWater(false)
     {
         mWaterTransform = new osg::PositionAttitudeTransform();
-        mWaterTransform->setPosition(osg::Vec3f(cellCoords.getX() * CellSize + CellSize / 2.f,
-            cellCoords.getY() * CellSize + CellSize / 2.f, 0));
+        mWaterTransform->setPosition(osg::Vec3f(
+            cellCoords.getX() * CellSize + CellSize / 2.f, cellCoords.getY() * CellSize + CellSize / 2.f, 0));
 
         mWaterTransform->setNodeMask(Mask_Water);
         mParentNode->addChild(mWaterTransform);
@@ -175,7 +175,6 @@ namespace CSVRender
 
         mWaterGeometry->getStateSet()->setTextureAttributeAndModes(0, waterTexture, osg::StateAttribute::ON);
 
-
         mWaterGroup->addChild(mWaterGeometry);
     }
 }
diff --git a/apps/opencs/view/render/cellwater.hpp b/apps/opencs/view/render/cellwater.hpp
index be1786955b..8a965d743e 100644
--- a/apps/opencs/view/render/cellwater.hpp
+++ b/apps/opencs/view/render/cellwater.hpp
@@ -5,8 +5,8 @@
 
 #include <osg/ref_ptr>
 
-#include <QObject>
 #include <QModelIndex>
+#include <QObject>
 
 #include "../../model/world/record.hpp"
 
@@ -30,41 +30,39 @@ namespace CSVRender
     /// adds a large patch of water much larger than the typical size of a cell.
     class CellWater : public QObject
     {
-            Q_OBJECT
-
-        public:
-
-            CellWater(CSMWorld::Data& data, osg::Group* cellNode, const std::string& id,
-                const CSMWorld::CellCoordinates& cellCoords);
+        Q_OBJECT
 
-            ~CellWater();
+    public:
+        CellWater(CSMWorld::Data& data, osg::Group* cellNode, const std::string& id,
+            const CSMWorld::CellCoordinates& cellCoords);
 
-            void updateCellData(const CSMWorld::Record<CSMWorld::Cell>& cellRecord);
+        ~CellWater();
 
-            void reloadAssets();
+        void updateCellData(const CSMWorld::Record<CSMWorld::Cell>& cellRecord);
 
-        private slots:
+        void reloadAssets();
 
-            void cellDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
+    private slots:
 
-        private:
+        void cellDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
-            void recreate();
+    private:
+        void recreate();
 
-            static const int CellSize;
+        static const int CellSize;
 
-            CSMWorld::Data& mData;
-            std::string mId;
+        CSMWorld::Data& mData;
+        std::string mId;
 
-            osg::Group* mParentNode;
+        osg::Group* mParentNode;
 
-            osg::ref_ptr<osg::PositionAttitudeTransform> mWaterTransform;
-            osg::ref_ptr<osg::Group> mWaterGroup;
-            osg::ref_ptr<osg::Geometry> mWaterGeometry;
+        osg::ref_ptr<osg::PositionAttitudeTransform> mWaterTransform;
+        osg::ref_ptr<osg::Group> mWaterGroup;
+        osg::ref_ptr<osg::Geometry> mWaterGeometry;
 
-            bool mDeleted;
-            bool mExterior;
-            bool mHasWater;
+        bool mDeleted;
+        bool mExterior;
+        bool mHasWater;
     };
 }
 
diff --git a/apps/opencs/view/render/commands.cpp b/apps/opencs/view/render/commands.cpp
index 515948489e..cbc97e3d4b 100644
--- a/apps/opencs/view/render/commands.cpp
+++ b/apps/opencs/view/render/commands.cpp
@@ -5,9 +5,11 @@
 #include "terrainshapemode.hpp"
 #include "worldspacewidget.hpp"
 
-CSVRender::DrawTerrainSelectionCommand::DrawTerrainSelectionCommand(WorldspaceWidget* worldspaceWidget, QUndoCommand* parent)
+CSVRender::DrawTerrainSelectionCommand::DrawTerrainSelectionCommand(
+    WorldspaceWidget* worldspaceWidget, QUndoCommand* parent)
     : mWorldspaceWidget(worldspaceWidget)
-{ }
+{
+}
 
 void CSVRender::DrawTerrainSelectionCommand::redo()
 {
diff --git a/apps/opencs/view/render/editmode.cpp b/apps/opencs/view/render/editmode.cpp
index ca4aa0fd55..cdca3b1e46 100644
--- a/apps/opencs/view/render/editmode.cpp
+++ b/apps/opencs/view/render/editmode.cpp
@@ -8,72 +8,72 @@ CSVRender::WorldspaceWidget& CSVRender::EditMode::getWorldspaceWidget()
     return *mWorldspaceWidget;
 }
 
-CSVRender::EditMode::EditMode (WorldspaceWidget *worldspaceWidget, const QIcon& icon,
-    unsigned int mask, const QString& tooltip, QWidget *parent)
-: ModeButton (icon, tooltip, parent), mWorldspaceWidget (worldspaceWidget), mMask (mask)
-{}
+CSVRender::EditMode::EditMode(
+    WorldspaceWidget* worldspaceWidget, const QIcon& icon, unsigned int mask, const QString& tooltip, QWidget* parent)
+    : ModeButton(icon, tooltip, parent)
+    , mWorldspaceWidget(worldspaceWidget)
+    , mMask(mask)
+{
+}
 
 unsigned int CSVRender::EditMode::getInteractionMask() const
 {
     return mMask;
 }
 
-void CSVRender::EditMode::activate (CSVWidget::SceneToolbar *toolbar)
+void CSVRender::EditMode::activate(CSVWidget::SceneToolbar* toolbar)
 {
-    mWorldspaceWidget->setInteractionMask (mMask);
-    mWorldspaceWidget->clearSelection (~mMask);
+    mWorldspaceWidget->setInteractionMask(mMask);
+    mWorldspaceWidget->clearSelection(~mMask);
 }
 
-void CSVRender::EditMode::setEditLock (bool locked)
-{
-
-}
+void CSVRender::EditMode::setEditLock(bool locked) {}
 
-void CSVRender::EditMode::primaryOpenPressed (const WorldspaceHitResult& hit) {}
+void CSVRender::EditMode::primaryOpenPressed(const WorldspaceHitResult& hit) {}
 
-void CSVRender::EditMode::primaryEditPressed (const WorldspaceHitResult& hit) {}
+void CSVRender::EditMode::primaryEditPressed(const WorldspaceHitResult& hit) {}
 
-void CSVRender::EditMode::secondaryEditPressed (const WorldspaceHitResult& hit) {}
+void CSVRender::EditMode::secondaryEditPressed(const WorldspaceHitResult& hit) {}
 
-void CSVRender::EditMode::primarySelectPressed (const WorldspaceHitResult& hit) {}
+void CSVRender::EditMode::primarySelectPressed(const WorldspaceHitResult& hit) {}
 
-void CSVRender::EditMode::secondarySelectPressed (const WorldspaceHitResult& hit) {}
+void CSVRender::EditMode::secondarySelectPressed(const WorldspaceHitResult& hit) {}
 
-bool CSVRender::EditMode::primaryEditStartDrag (const QPoint& pos)
+bool CSVRender::EditMode::primaryEditStartDrag(const QPoint& pos)
 {
     return false;
 }
 
-bool CSVRender::EditMode::secondaryEditStartDrag (const QPoint& pos)
+bool CSVRender::EditMode::secondaryEditStartDrag(const QPoint& pos)
 {
     return false;
 }
 
-bool CSVRender::EditMode::primarySelectStartDrag (const QPoint& pos)
+bool CSVRender::EditMode::primarySelectStartDrag(const QPoint& pos)
 {
     return false;
 }
 
-bool CSVRender::EditMode::secondarySelectStartDrag (const QPoint& pos)
+bool CSVRender::EditMode::secondarySelectStartDrag(const QPoint& pos)
 {
     return false;
 }
 
-void CSVRender::EditMode::drag (const QPoint& pos, int diffX, int diffY, double speedFactor) {}
+void CSVRender::EditMode::drag(const QPoint& pos, int diffX, int diffY, double speedFactor) {}
 
 void CSVRender::EditMode::dragCompleted(const QPoint& pos) {}
 
 void CSVRender::EditMode::dragAborted() {}
 
-void CSVRender::EditMode::dragWheel (int diff, double speedFactor) {}
+void CSVRender::EditMode::dragWheel(int diff, double speedFactor) {}
 
-void CSVRender::EditMode::dragEnterEvent (QDragEnterEvent *event) {}
+void CSVRender::EditMode::dragEnterEvent(QDragEnterEvent* event) {}
 
-void CSVRender::EditMode::dropEvent (QDropEvent *event) {}
+void CSVRender::EditMode::dropEvent(QDropEvent* event) {}
 
-void CSVRender::EditMode::dragMoveEvent (QDragMoveEvent *event) {}
+void CSVRender::EditMode::dragMoveEvent(QDragMoveEvent* event) {}
 
-void CSVRender::EditMode::mouseMoveEvent (QMouseEvent *event) {}
+void CSVRender::EditMode::mouseMoveEvent(QMouseEvent* event) {}
 
 int CSVRender::EditMode::getSubMode() const
 {
diff --git a/apps/opencs/view/render/editmode.hpp b/apps/opencs/view/render/editmode.hpp
index 52c35811d2..3de1d26916 100644
--- a/apps/opencs/view/render/editmode.hpp
+++ b/apps/opencs/view/render/editmode.hpp
@@ -18,90 +18,88 @@ namespace CSVRender
 
     class EditMode : public CSVWidget::ModeButton
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            WorldspaceWidget *mWorldspaceWidget;
-            unsigned int mMask;
+        WorldspaceWidget* mWorldspaceWidget;
+        unsigned int mMask;
 
-        protected:
+    protected:
+        WorldspaceWidget& getWorldspaceWidget();
 
-            WorldspaceWidget& getWorldspaceWidget();
+    public:
+        EditMode(WorldspaceWidget* worldspaceWidget, const QIcon& icon, unsigned int mask, const QString& tooltip = "",
+            QWidget* parent = nullptr);
 
-        public:
+        unsigned int getInteractionMask() const;
 
-            EditMode (WorldspaceWidget *worldspaceWidget, const QIcon& icon, unsigned int mask,
-                const QString& tooltip = "", QWidget *parent = nullptr);
+        void activate(CSVWidget::SceneToolbar* toolbar) override;
 
-            unsigned int getInteractionMask() const;
+        /// Default-implementation: Ignored.
+        virtual void setEditLock(bool locked);
 
-            void activate (CSVWidget::SceneToolbar *toolbar) override;
+        /// Default-implementation: Ignored.
+        virtual void primaryOpenPressed(const WorldspaceHitResult& hit);
 
-            /// Default-implementation: Ignored.
-            virtual void setEditLock (bool locked);
+        /// Default-implementation: Ignored.
+        virtual void primaryEditPressed(const WorldspaceHitResult& hit);
 
-            /// Default-implementation: Ignored.
-            virtual void primaryOpenPressed (const WorldspaceHitResult& hit);
+        /// Default-implementation: Ignored.
+        virtual void secondaryEditPressed(const WorldspaceHitResult& hit);
 
-            /// Default-implementation: Ignored.
-            virtual void primaryEditPressed (const WorldspaceHitResult& hit);
+        /// Default-implementation: Ignored.
+        virtual void primarySelectPressed(const WorldspaceHitResult& hit);
 
-            /// Default-implementation: Ignored.
-            virtual void secondaryEditPressed (const WorldspaceHitResult& hit);
+        /// Default-implementation: Ignored.
+        virtual void secondarySelectPressed(const WorldspaceHitResult& hit);
 
-            /// Default-implementation: Ignored.
-            virtual void primarySelectPressed (const WorldspaceHitResult& hit);
+        /// Default-implementation: ignore and return false
+        ///
+        /// \return Drag accepted?
+        virtual bool primaryEditStartDrag(const QPoint& pos);
 
-            /// Default-implementation: Ignored.
-            virtual void secondarySelectPressed (const WorldspaceHitResult& hit);
+        /// Default-implementation: ignore and return false
+        ///
+        /// \return Drag accepted?
+        virtual bool secondaryEditStartDrag(const QPoint& pos);
 
-            /// Default-implementation: ignore and return false
-            ///
-            /// \return Drag accepted?
-            virtual bool primaryEditStartDrag (const QPoint& pos);
+        /// Default-implementation: ignore and return false
+        ///
+        /// \return Drag accepted?
+        virtual bool primarySelectStartDrag(const QPoint& pos);
 
-            /// Default-implementation: ignore and return false
-            ///
-            /// \return Drag accepted?
-            virtual bool secondaryEditStartDrag (const QPoint& pos);
+        /// Default-implementation: ignore and return false
+        ///
+        /// \return Drag accepted?
+        virtual bool secondarySelectStartDrag(const QPoint& pos);
 
-            /// Default-implementation: ignore and return false
-            ///
-            /// \return Drag accepted?
-            virtual bool primarySelectStartDrag (const QPoint& pos);
+        /// Default-implementation: ignored
+        virtual void drag(const QPoint& pos, int diffX, int diffY, double speedFactor);
 
-            /// Default-implementation: ignore and return false
-            ///
-            /// \return Drag accepted?
-            virtual bool secondarySelectStartDrag (const QPoint& pos);
+        /// Default-implementation: ignored
+        virtual void dragCompleted(const QPoint& pos);
 
-            /// Default-implementation: ignored
-            virtual void drag (const QPoint& pos, int diffX, int diffY, double speedFactor);
+        /// Default-implementation: ignored
+        ///
+        /// \note dragAborted will not be called, if the drag is aborted via changing
+        /// editing mode
+        virtual void dragAborted();
 
-            /// Default-implementation: ignored
-            virtual void dragCompleted(const QPoint& pos);
+        /// Default-implementation: ignored
+        virtual void dragWheel(int diff, double speedFactor);
 
-            /// Default-implementation: ignored
-            ///
-            /// \note dragAborted will not be called, if the drag is aborted via changing
-            /// editing mode
-            virtual void dragAborted();
+        /// Default-implementation: ignored
+        void dragEnterEvent(QDragEnterEvent* event) override;
 
-            /// Default-implementation: ignored
-            virtual void dragWheel (int diff, double speedFactor);
+        /// Default-implementation: ignored
+        void dropEvent(QDropEvent* event) override;
 
-            /// Default-implementation: ignored
-            void dragEnterEvent (QDragEnterEvent *event) override;
+        /// Default-implementation: ignored
+        void dragMoveEvent(QDragMoveEvent* event) override;
 
-            /// Default-implementation: ignored
-            void dropEvent (QDropEvent *event) override;
+        void mouseMoveEvent(QMouseEvent* event) override;
 
-            /// Default-implementation: ignored
-            void dragMoveEvent (QDragMoveEvent *event) override;
-
-            void mouseMoveEvent (QMouseEvent *event) override;
-
-            /// Default: return -1
-            virtual int getSubMode() const;
+        /// Default: return -1
+        virtual int getSubMode() const;
     };
 }
 
diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 0f5696b472..6b47e4b1e8 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -12,27 +12,27 @@
 #include <osg/Vec3d>
 #include <osgUtil/LineSegmentIntersector>
 
+#include "../../model/prefs/shortcut.hpp"
+#include "../../model/world/commandmacro.hpp"
+#include "../../model/world/commands.hpp"
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/idtree.hpp"
-#include "../../model/world/commands.hpp"
-#include "../../model/world/commandmacro.hpp"
 #include "../../model/world/tablemimedata.hpp"
-#include "../../model/prefs/shortcut.hpp"
 
 #include "../widget/scenetoolbar.hpp"
 #include "../widget/scenetoolmode.hpp"
 
 #include "mask.hpp"
 
+#include "instancemovemode.hpp"
+#include "instanceselectionmode.hpp"
 #include "object.hpp"
-#include "worldspacewidget.hpp"
 #include "pagedworldspacewidget.hpp"
-#include "instanceselectionmode.hpp"
-#include "instancemovemode.hpp"
+#include "worldspacewidget.hpp"
 
-int CSVRender::InstanceMode::getSubModeFromId (const std::string& id) const
+int CSVRender::InstanceMode::getSubModeFromId(const std::string& id) const
 {
-    return id=="move" ? 0 : (id=="rotate" ? 1 : 2);
+    return id == "move" ? 0 : (id == "rotate" ? 1 : 2);
 }
 
 osg::Vec3f CSVRender::InstanceMode::quatToEuler(const osg::Quat& rot) const
@@ -58,9 +58,9 @@ osg::Vec3f CSVRender::InstanceMode::quatToEuler(const osg::Quat& rot) const
 
 osg::Quat CSVRender::InstanceMode::eulerToQuat(const osg::Vec3f& euler) const
 {
-    osg::Quat xr = osg::Quat(-euler[0], osg::Vec3f(1,0,0));
-    osg::Quat yr = osg::Quat(-euler[1], osg::Vec3f(0,1,0));
-    osg::Quat zr = osg::Quat(-euler[2], osg::Vec3f(0,0,1));
+    osg::Quat xr = osg::Quat(-euler[0], osg::Vec3f(1, 0, 0));
+    osg::Quat yr = osg::Quat(-euler[1], osg::Vec3f(0, 1, 0));
+    osg::Quat zr = osg::Quat(-euler[2], osg::Vec3f(0, 0, 1));
 
     return zr * yr * xr;
 }
@@ -70,14 +70,14 @@ float CSVRender::InstanceMode::roundFloatToMult(const float val, const double mu
     return round(val / mult) * mult;
 }
 
-osg::Vec3f CSVRender::InstanceMode::getSelectionCenter(const std::vector<osg::ref_ptr<TagBase> >& selection) const
+osg::Vec3f CSVRender::InstanceMode::getSelectionCenter(const std::vector<osg::ref_ptr<TagBase>>& selection) const
 {
     osg::Vec3f center = osg::Vec3f(0, 0, 0);
     int objectCount = 0;
 
-    for (std::vector<osg::ref_ptr<TagBase> >::const_iterator iter (selection.begin()); iter!=selection.end(); ++iter)
+    for (std::vector<osg::ref_ptr<TagBase>>::const_iterator iter(selection.begin()); iter != selection.end(); ++iter)
     {
-        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (iter->get()))
+        if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(iter->get()))
         {
             const ESM::Position& position = objectTag->mObject->getPosition();
             center += osg::Vec3f(position.pos[0], position.pos[1], position.pos[2]);
@@ -129,95 +129,107 @@ osg::Vec3f CSVRender::InstanceMode::getMousePlaneCoords(const QPoint& point, con
     return mousePlanePoint;
 }
 
-CSVRender::InstanceMode::InstanceMode (WorldspaceWidget *worldspaceWidget,  osg::ref_ptr<osg::Group> parentNode,  QWidget *parent)
-: EditMode (worldspaceWidget, QIcon (":scenetoolbar/editing-instance"), Mask_Reference | Mask_Terrain, "Instance editing",
-  parent), mSubMode (nullptr), mSubModeId ("move"), mSelectionMode (nullptr), mDragMode (DragMode_None),
-  mDragAxis (-1), mLocked (false), mUnitScaleDist(1), mParentNode (parentNode)
+CSVRender::InstanceMode::InstanceMode(
+    WorldspaceWidget* worldspaceWidget, osg::ref_ptr<osg::Group> parentNode, QWidget* parent)
+    : EditMode(worldspaceWidget, QIcon(":scenetoolbar/editing-instance"), Mask_Reference | Mask_Terrain,
+        "Instance editing", parent)
+    , mSubMode(nullptr)
+    , mSubModeId("move")
+    , mSelectionMode(nullptr)
+    , mDragMode(DragMode_None)
+    , mDragAxis(-1)
+    , mLocked(false)
+    , mUnitScaleDist(1)
+    , mParentNode(parentNode)
 {
-    connect(this, &InstanceMode::requestFocus,
-            worldspaceWidget, &WorldspaceWidget::requestFocus);
+    connect(this, &InstanceMode::requestFocus, worldspaceWidget, &WorldspaceWidget::requestFocus);
 
     CSMPrefs::Shortcut* deleteShortcut = new CSMPrefs::Shortcut("scene-delete", worldspaceWidget);
-    connect(deleteShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), 
-            this, &InstanceMode::deleteSelectedInstances);
-
-    // Following classes could be simplified by using QSignalMapper, which is obsolete in Qt5.10, but not in Qt4.8 and Qt5.14
-    CSMPrefs::Shortcut* dropToCollisionShortcut = new CSMPrefs::Shortcut("scene-instance-drop-collision", worldspaceWidget);
-        connect(dropToCollisionShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), 
-                this, &InstanceMode::dropSelectedInstancesToCollision);
-    CSMPrefs::Shortcut* dropToTerrainLevelShortcut = new CSMPrefs::Shortcut("scene-instance-drop-terrain", worldspaceWidget);
-        connect(dropToTerrainLevelShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), 
-                this, &InstanceMode::dropSelectedInstancesToTerrain);
-    CSMPrefs::Shortcut* dropToCollisionShortcut2 = new CSMPrefs::Shortcut("scene-instance-drop-collision-separately", worldspaceWidget);
-        connect(dropToCollisionShortcut2, qOverload<>(&CSMPrefs::Shortcut::activated), 
-                this, &InstanceMode::dropSelectedInstancesToCollisionSeparately);
-    CSMPrefs::Shortcut* dropToTerrainLevelShortcut2 = new CSMPrefs::Shortcut("scene-instance-drop-terrain-separately", worldspaceWidget);
-        connect(dropToTerrainLevelShortcut2, qOverload<>(&CSMPrefs::Shortcut::activated), 
-                this, &InstanceMode::dropSelectedInstancesToTerrainSeparately);
+    connect(
+        deleteShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this, &InstanceMode::deleteSelectedInstances);
+
+    // Following classes could be simplified by using QSignalMapper, which is obsolete in Qt5.10, but not in Qt4.8 and
+    // Qt5.14
+    CSMPrefs::Shortcut* dropToCollisionShortcut
+        = new CSMPrefs::Shortcut("scene-instance-drop-collision", worldspaceWidget);
+    connect(dropToCollisionShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), this,
+        &InstanceMode::dropSelectedInstancesToCollision);
+    CSMPrefs::Shortcut* dropToTerrainLevelShortcut
+        = new CSMPrefs::Shortcut("scene-instance-drop-terrain", worldspaceWidget);
+    connect(dropToTerrainLevelShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), this,
+        &InstanceMode::dropSelectedInstancesToTerrain);
+    CSMPrefs::Shortcut* dropToCollisionShortcut2
+        = new CSMPrefs::Shortcut("scene-instance-drop-collision-separately", worldspaceWidget);
+    connect(dropToCollisionShortcut2, qOverload<>(&CSMPrefs::Shortcut::activated), this,
+        &InstanceMode::dropSelectedInstancesToCollisionSeparately);
+    CSMPrefs::Shortcut* dropToTerrainLevelShortcut2
+        = new CSMPrefs::Shortcut("scene-instance-drop-terrain-separately", worldspaceWidget);
+    connect(dropToTerrainLevelShortcut2, qOverload<>(&CSMPrefs::Shortcut::activated), this,
+        &InstanceMode::dropSelectedInstancesToTerrainSeparately);
 }
 
-void CSVRender::InstanceMode::activate (CSVWidget::SceneToolbar *toolbar)
+void CSVRender::InstanceMode::activate(CSVWidget::SceneToolbar* toolbar)
 {
     if (!mSubMode)
     {
-        mSubMode = new CSVWidget::SceneToolMode (toolbar, "Edit Sub-Mode");
-        mSubMode->addButton (new InstanceMoveMode (this), "move");
-        mSubMode->addButton (":scenetoolbar/transform-rotate", "rotate",
+        mSubMode = new CSVWidget::SceneToolMode(toolbar, "Edit Sub-Mode");
+        mSubMode->addButton(new InstanceMoveMode(this), "move");
+        mSubMode->addButton(":scenetoolbar/transform-rotate", "rotate",
             "Rotate selected instances"
             "<ul><li>Use {scene-edit-primary} to rotate instances freely</li>"
             "<li>Use {scene-edit-secondary} to rotate instances within the grid</li>"
             "<li>The center of the view acts as the axis of rotation</li>"
             "</ul>");
-        mSubMode->addButton (":scenetoolbar/transform-scale", "scale",
+        mSubMode->addButton(":scenetoolbar/transform-scale", "scale",
             "Scale selected instances"
             "<ul><li>Use {scene-edit-primary} to scale instances freely</li>"
             "<li>Use {scene-edit-secondary} to scale instances along the grid</li>"
             "<li>The scaling rate is based on how close the start of a drag is to the center of the screen</li>"
             "</ul>");
 
-        mSubMode->setButton (mSubModeId);
+        mSubMode->setButton(mSubModeId);
 
-        connect (mSubMode, &CSVWidget::SceneToolMode::modeChanged, this, &InstanceMode::subModeChanged);
+        connect(mSubMode, &CSVWidget::SceneToolMode::modeChanged, this, &InstanceMode::subModeChanged);
     }
 
     if (!mSelectionMode)
-        mSelectionMode = new InstanceSelectionMode (toolbar, getWorldspaceWidget(), mParentNode);
+        mSelectionMode = new InstanceSelectionMode(toolbar, getWorldspaceWidget(), mParentNode);
 
     mDragMode = DragMode_None;
 
-    EditMode::activate (toolbar);
+    EditMode::activate(toolbar);
 
-    toolbar->addTool (mSubMode);
-    toolbar->addTool (mSelectionMode);
+    toolbar->addTool(mSubMode);
+    toolbar->addTool(mSelectionMode);
 
     std::string subMode = mSubMode->getCurrentId();
 
-    getWorldspaceWidget().setSubMode (getSubModeFromId (subMode), Mask_Reference);
+    getWorldspaceWidget().setSubMode(getSubModeFromId(subMode), Mask_Reference);
 }
 
-void CSVRender::InstanceMode::deactivate (CSVWidget::SceneToolbar *toolbar)
+void CSVRender::InstanceMode::deactivate(CSVWidget::SceneToolbar* toolbar)
 {
     mDragMode = DragMode_None;
-    getWorldspaceWidget().reset (Mask_Reference);
+    getWorldspaceWidget().reset(Mask_Reference);
 
     if (mSelectionMode)
     {
-        toolbar->removeTool (mSelectionMode);
+        toolbar->removeTool(mSelectionMode);
         delete mSelectionMode;
         mSelectionMode = nullptr;
     }
 
     if (mSubMode)
     {
-        toolbar->removeTool (mSubMode);
+        toolbar->removeTool(mSubMode);
         delete mSubMode;
         mSubMode = nullptr;
     }
 
-    EditMode::deactivate (toolbar);
+    EditMode::deactivate(toolbar);
 }
 
-void CSVRender::InstanceMode::setEditLock (bool locked)
+void CSVRender::InstanceMode::setEditLock(bool locked)
 {
     mLocked = locked;
 
@@ -225,17 +237,17 @@ void CSVRender::InstanceMode::setEditLock (bool locked)
         getWorldspaceWidget().abortDrag();
 }
 
-void CSVRender::InstanceMode::primaryEditPressed (const WorldspaceHitResult& hit)
+void CSVRender::InstanceMode::primaryEditPressed(const WorldspaceHitResult& hit)
 {
     if (CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue())
-        primarySelectPressed (hit);
+        primarySelectPressed(hit);
 }
 
-void CSVRender::InstanceMode::primaryOpenPressed (const WorldspaceHitResult& hit)
+void CSVRender::InstanceMode::primaryOpenPressed(const WorldspaceHitResult& hit)
 {
-    if(hit.tag)
+    if (hit.tag)
     {
-        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (hit.tag.get()))
+        if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(hit.tag.get()))
         {
             const std::string refId = objectTag->mObject->getReferenceId();
             emit requestFocus(refId);
@@ -243,78 +255,77 @@ void CSVRender::InstanceMode::primaryOpenPressed (const WorldspaceHitResult& hit
     }
 }
 
-void CSVRender::InstanceMode::secondaryEditPressed (const WorldspaceHitResult& hit)
+void CSVRender::InstanceMode::secondaryEditPressed(const WorldspaceHitResult& hit)
 {
     if (CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue())
-        secondarySelectPressed (hit);
+        secondarySelectPressed(hit);
 }
 
-void CSVRender::InstanceMode::primarySelectPressed (const WorldspaceHitResult& hit)
+void CSVRender::InstanceMode::primarySelectPressed(const WorldspaceHitResult& hit)
 {
-    getWorldspaceWidget().clearSelection (Mask_Reference);
+    getWorldspaceWidget().clearSelection(Mask_Reference);
 
     if (hit.tag)
     {
-        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (hit.tag.get()))
+        if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(hit.tag.get()))
         {
             // hit an Object, select it
             CSVRender::Object* object = objectTag->mObject;
-            object->setSelected (true);
+            object->setSelected(true);
             return;
         }
     }
 }
 
-void CSVRender::InstanceMode::secondarySelectPressed (const WorldspaceHitResult& hit)
+void CSVRender::InstanceMode::secondarySelectPressed(const WorldspaceHitResult& hit)
 {
     if (hit.tag)
     {
-        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (hit.tag.get()))
+        if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(hit.tag.get()))
         {
             // hit an Object, toggle its selection state
             CSVRender::Object* object = objectTag->mObject;
-            object->setSelected (!object->getSelected());
+            object->setSelected(!object->getSelected());
             return;
         }
     }
 }
 
-bool CSVRender::InstanceMode::primaryEditStartDrag (const QPoint& pos)
+bool CSVRender::InstanceMode::primaryEditStartDrag(const QPoint& pos)
 {
-    if (mDragMode!=DragMode_None || mLocked)
+    if (mDragMode != DragMode_None || mLocked)
         return false;
 
-    WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
+    WorldspaceHitResult hit = getWorldspaceWidget().mousePick(pos, getWorldspaceWidget().getInteractionMask());
 
-    std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Reference);
+    std::vector<osg::ref_ptr<TagBase>> selection = getWorldspaceWidget().getSelection(Mask_Reference);
     if (selection.empty())
     {
         // Only change selection at the start of drag if no object is already selected
         if (hit.tag && CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue())
         {
-            getWorldspaceWidget().clearSelection (Mask_Reference);
-            if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (hit.tag.get()))
+            getWorldspaceWidget().clearSelection(Mask_Reference);
+            if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(hit.tag.get()))
             {
                 CSVRender::Object* object = objectTag->mObject;
-                object->setSelected (true);
+                object->setSelected(true);
             }
         }
 
-        selection = getWorldspaceWidget().getSelection (Mask_Reference);
+        selection = getWorldspaceWidget().getSelection(Mask_Reference);
         if (selection.empty())
             return false;
     }
 
     mObjectsAtDragStart.clear();
 
-    for (std::vector<osg::ref_ptr<TagBase> >::iterator iter (selection.begin());
-        iter!=selection.end(); ++iter)
+    for (std::vector<osg::ref_ptr<TagBase>>::iterator iter(selection.begin()); iter != selection.end(); ++iter)
     {
-        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (iter->get()))
+        if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(iter->get()))
         {
             if (mSubModeId == "move")
             {
-                objectTag->mObject->setEdited (Object::Override_Position);
+                objectTag->mObject->setEdited(Object::Override_Position);
                 float x = objectTag->mObject->getPosition().pos[0];
                 float y = objectTag->mObject->getPosition().pos[1];
                 float z = objectTag->mObject->getPosition().pos[2];
@@ -325,16 +336,16 @@ bool CSVRender::InstanceMode::primaryEditStartDrag (const QPoint& pos)
             }
             else if (mSubModeId == "rotate")
             {
-                objectTag->mObject->setEdited (Object::Override_Rotation);
+                objectTag->mObject->setEdited(Object::Override_Rotation);
                 mDragMode = DragMode_Rotate;
             }
             else if (mSubModeId == "scale")
             {
-                objectTag->mObject->setEdited (Object::Override_Scale);
+                objectTag->mObject->setEdited(Object::Override_Scale);
                 mDragMode = DragMode_Scale;
 
                 // Calculate scale factor
-                std::vector<osg::ref_ptr<TagBase> > editedSelection = getWorldspaceWidget().getEdited (Mask_Reference);
+                std::vector<osg::ref_ptr<TagBase>> editedSelection = getWorldspaceWidget().getEdited(Mask_Reference);
                 osg::Vec3f center = getScreenCoords(getSelectionCenter(editedSelection));
 
                 int widgetHeight = getWorldspaceWidget().height();
@@ -347,7 +358,7 @@ bool CSVRender::InstanceMode::primaryEditStartDrag (const QPoint& pos)
         }
     }
 
-    if (CSVRender::ObjectMarkerTag *objectTag = dynamic_cast<CSVRender::ObjectMarkerTag *> (hit.tag.get()))
+    if (CSVRender::ObjectMarkerTag* objectTag = dynamic_cast<CSVRender::ObjectMarkerTag*>(hit.tag.get()))
     {
         mDragAxis = objectTag->mAxis;
     }
@@ -357,21 +368,21 @@ bool CSVRender::InstanceMode::primaryEditStartDrag (const QPoint& pos)
     return true;
 }
 
-bool CSVRender::InstanceMode::secondaryEditStartDrag (const QPoint& pos)
+bool CSVRender::InstanceMode::secondaryEditStartDrag(const QPoint& pos)
 {
     if (mDragMode != DragMode_None || mLocked)
         return false;
 
     WorldspaceHitResult hit = getWorldspaceWidget().mousePick(pos, getWorldspaceWidget().getInteractionMask());
 
-    std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection(Mask_Reference);
+    std::vector<osg::ref_ptr<TagBase>> selection = getWorldspaceWidget().getSelection(Mask_Reference);
     if (selection.empty())
     {
         // Only change selection at the start of drag if no object is already selected
         if (hit.tag && CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue())
         {
             getWorldspaceWidget().clearSelection(Mask_Reference);
-            if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*> (hit.tag.get()))
+            if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(hit.tag.get()))
             {
                 CSVRender::Object* object = objectTag->mObject;
                 object->setSelected(true);
@@ -385,10 +396,9 @@ bool CSVRender::InstanceMode::secondaryEditStartDrag (const QPoint& pos)
 
     mObjectsAtDragStart.clear();
 
-    for (std::vector<osg::ref_ptr<TagBase> >::iterator iter(selection.begin());
-        iter != selection.end(); ++iter)
+    for (std::vector<osg::ref_ptr<TagBase>>::iterator iter(selection.begin()); iter != selection.end(); ++iter)
     {
-        if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*> (iter->get()))
+        if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(iter->get()))
         {
             if (mSubModeId == "move")
             {
@@ -413,7 +423,7 @@ bool CSVRender::InstanceMode::secondaryEditStartDrag (const QPoint& pos)
                 mDragMode = DragMode_Scale_Snap;
 
                 // Calculate scale factor
-                std::vector<osg::ref_ptr<TagBase> > editedSelection = getWorldspaceWidget().getEdited(Mask_Reference);
+                std::vector<osg::ref_ptr<TagBase>> editedSelection = getWorldspaceWidget().getEdited(Mask_Reference);
                 osg::Vec3f center = getScreenCoords(getSelectionCenter(editedSelection));
 
                 int widgetHeight = getWorldspaceWidget().height();
@@ -426,7 +436,7 @@ bool CSVRender::InstanceMode::secondaryEditStartDrag (const QPoint& pos)
         }
     }
 
-    if (CSVRender::ObjectMarkerTag* objectTag = dynamic_cast<CSVRender::ObjectMarkerTag*> (hit.tag.get()))
+    if (CSVRender::ObjectMarkerTag* objectTag = dynamic_cast<CSVRender::ObjectMarkerTag*>(hit.tag.get()))
     {
         mDragAxis = objectTag->mAxis;
     }
@@ -436,54 +446,64 @@ bool CSVRender::InstanceMode::secondaryEditStartDrag (const QPoint& pos)
     return true;
 }
 
-bool CSVRender::InstanceMode::primarySelectStartDrag (const QPoint& pos)
+bool CSVRender::InstanceMode::primarySelectStartDrag(const QPoint& pos)
 {
-    if (mDragMode!=DragMode_None || mLocked)
+    if (mDragMode != DragMode_None || mLocked)
         return false;
 
     std::string primarySelectAction = CSMPrefs::get()["3D Scene Editing"]["primary-select-action"].toString();
 
-    if ( primarySelectAction == "Select only" ) mDragMode = DragMode_Select_Only;
-    else if ( primarySelectAction == "Add to selection" ) mDragMode = DragMode_Select_Add;
-    else if ( primarySelectAction == "Remove from selection" ) mDragMode = DragMode_Select_Remove;
-    else if ( primarySelectAction == "Invert selection" ) mDragMode = DragMode_Select_Invert;
+    if (primarySelectAction == "Select only")
+        mDragMode = DragMode_Select_Only;
+    else if (primarySelectAction == "Add to selection")
+        mDragMode = DragMode_Select_Add;
+    else if (primarySelectAction == "Remove from selection")
+        mDragMode = DragMode_Select_Remove;
+    else if (primarySelectAction == "Invert selection")
+        mDragMode = DragMode_Select_Invert;
 
-    WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
+    WorldspaceHitResult hit = getWorldspaceWidget().mousePick(pos, getWorldspaceWidget().getInteractionMask());
     mSelectionMode->setDragStart(hit.worldPos);
 
     return true;
 }
 
-bool CSVRender::InstanceMode::secondarySelectStartDrag (const QPoint& pos)
+bool CSVRender::InstanceMode::secondarySelectStartDrag(const QPoint& pos)
 {
-    if (mDragMode!=DragMode_None || mLocked)
+    if (mDragMode != DragMode_None || mLocked)
         return false;
 
     std::string secondarySelectAction = CSMPrefs::get()["3D Scene Editing"]["secondary-select-action"].toString();
 
-    if ( secondarySelectAction == "Select only" ) mDragMode = DragMode_Select_Only;
-    else if ( secondarySelectAction == "Add to selection" ) mDragMode = DragMode_Select_Add;
-    else if ( secondarySelectAction == "Remove from selection" ) mDragMode = DragMode_Select_Remove;
-    else if ( secondarySelectAction == "Invert selection" ) mDragMode = DragMode_Select_Invert;
+    if (secondarySelectAction == "Select only")
+        mDragMode = DragMode_Select_Only;
+    else if (secondarySelectAction == "Add to selection")
+        mDragMode = DragMode_Select_Add;
+    else if (secondarySelectAction == "Remove from selection")
+        mDragMode = DragMode_Select_Remove;
+    else if (secondarySelectAction == "Invert selection")
+        mDragMode = DragMode_Select_Invert;
 
-    WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
+    WorldspaceHitResult hit = getWorldspaceWidget().mousePick(pos, getWorldspaceWidget().getInteractionMask());
     mSelectionMode->setDragStart(hit.worldPos);
 
     return true;
 }
 
-void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, double speedFactor)
+void CSVRender::InstanceMode::drag(const QPoint& pos, int diffX, int diffY, double speedFactor)
 {
     osg::Vec3f offset;
     osg::Quat rotation;
 
-    std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getEdited (Mask_Reference);
+    std::vector<osg::ref_ptr<TagBase>> selection = getWorldspaceWidget().getEdited(Mask_Reference);
 
-    if (mDragMode == DragMode_Move || mDragMode == DragMode_Move_Snap) {}
+    if (mDragMode == DragMode_Move || mDragMode == DragMode_Move_Snap)
+    {
+    }
     else if (mDragMode == DragMode_Rotate || mDragMode == DragMode_Rotate_Snap)
     {
         osg::Vec3f eye, centre, up;
-        getWorldspaceWidget().getCamera()->getViewMatrix().getLookAt (eye, centre, up);
+        getWorldspaceWidget().getCamera()->getViewMatrix().getLookAt(eye, centre, up);
 
         float angle;
         osg::Vec3f axis;
@@ -499,7 +519,7 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
             osg::Vec3f screenDir = cameraRotation * osg::Vec3f(diffX, diffY, 0);
             screenDir.normalize();
 
-            angle = std::sqrt(diffX*diffX + diffY*diffY) * rotationFactor;
+            angle = std::sqrt(diffX * diffX + diffY * diffY) * rotationFactor;
             axis = screenDir ^ camForward;
         }
         else
@@ -563,28 +583,28 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
     else if (mSelectionMode->getCurrentId() == "cube-centre")
     {
         osg::Vec3f mousePlanePoint = getMousePlaneCoords(pos, getProjectionSpaceCoords(mSelectionMode->getDragStart()));
-        mSelectionMode->drawSelectionCubeCentre (mousePlanePoint);
+        mSelectionMode->drawSelectionCubeCentre(mousePlanePoint);
         return;
     }
     else if (mSelectionMode->getCurrentId() == "cube-corner")
     {
         osg::Vec3f mousePlanePoint = getMousePlaneCoords(pos, getProjectionSpaceCoords(mSelectionMode->getDragStart()));
-        mSelectionMode->drawSelectionCubeCorner (mousePlanePoint);
+        mSelectionMode->drawSelectionCubeCorner(mousePlanePoint);
         return;
     }
     else if (mSelectionMode->getCurrentId() == "sphere")
     {
         osg::Vec3f mousePlanePoint = getMousePlaneCoords(pos, getProjectionSpaceCoords(mSelectionMode->getDragStart()));
-        mSelectionMode->drawSelectionSphere (mousePlanePoint);
+        mSelectionMode->drawSelectionSphere(mousePlanePoint);
         return;
     }
 
     int i = 0;
 
     // Apply
-    for (std::vector<osg::ref_ptr<TagBase> >::iterator iter (selection.begin()); iter!=selection.end(); ++iter, i++)
+    for (std::vector<osg::ref_ptr<TagBase>>::iterator iter(selection.begin()); iter != selection.end(); ++iter, i++)
     {
-        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (iter->get()))
+        if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(iter->get()))
         {
             if (mDragMode == DragMode_Move || mDragMode == DragMode_Move_Snap)
             {
@@ -597,7 +617,7 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
                 position.pos[1] = mObjectsAtDragStart[i].y() + addToY;
                 position.pos[2] = mObjectsAtDragStart[i].z() + addToZ;
 
-                if (mDragMode == DragMode_Move_Snap) 
+                if (mDragMode == DragMode_Move_Snap)
                 {
                     double snap = CSMPrefs::get()["3D Scene Editing"]["gridsnap-movement"].toDouble();
                     position.pos[0] = CSVRender::InstanceMode::roundFloatToMult(position.pos[0], snap);
@@ -646,10 +666,11 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
 
                 if (mDragMode == DragMode_Scale_Snap)
                 {
-                    scale = CSVRender::InstanceMode::roundFloatToMult(scale, CSMPrefs::get()["3D Scene Editing"]["gridsnap-scale"].toDouble());
+                    scale = CSVRender::InstanceMode::roundFloatToMult(
+                        scale, CSMPrefs::get()["3D Scene Editing"]["gridsnap-scale"].toDouble());
                 }
 
-                objectTag->mObject->setScale (scale);
+                objectTag->mObject->setScale(scale);
             }
         }
     }
@@ -657,8 +678,7 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
 
 void CSVRender::InstanceMode::dragCompleted(const QPoint& pos)
 {
-    std::vector<osg::ref_ptr<TagBase> > selection =
-        getWorldspaceWidget().getEdited (Mask_Reference);
+    std::vector<osg::ref_ptr<TagBase>> selection = getWorldspaceWidget().getEdited(Mask_Reference);
 
     QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
 
@@ -666,51 +686,65 @@ void CSVRender::InstanceMode::dragCompleted(const QPoint& pos)
 
     switch (mDragMode)
     {
-        case DragMode_Move: description = "Move Instances"; break;
-        case DragMode_Rotate: description = "Rotate Instances"; break;
-        case DragMode_Scale: description = "Scale Instances"; break;
-        case DragMode_Select_Only :
+        case DragMode_Move:
+            description = "Move Instances";
+            break;
+        case DragMode_Rotate:
+            description = "Rotate Instances";
+            break;
+        case DragMode_Scale:
+            description = "Scale Instances";
+            break;
+        case DragMode_Select_Only:
             handleSelectDrag(pos);
             return;
             break;
-        case DragMode_Select_Add :
+        case DragMode_Select_Add:
             handleSelectDrag(pos);
             return;
             break;
-        case DragMode_Select_Remove :
+        case DragMode_Select_Remove:
             handleSelectDrag(pos);
             return;
             break;
-        case DragMode_Select_Invert :
+        case DragMode_Select_Invert:
             handleSelectDrag(pos);
             return;
             break;
-        case DragMode_Move_Snap: description = "Move Instances"; break;
-        case DragMode_Rotate_Snap: description = "Rotate Instances"; break;
-        case DragMode_Scale_Snap: description = "Scale Instances"; break;
-        case DragMode_None: break;
+        case DragMode_Move_Snap:
+            description = "Move Instances";
+            break;
+        case DragMode_Rotate_Snap:
+            description = "Rotate Instances";
+            break;
+        case DragMode_Scale_Snap:
+            description = "Scale Instances";
+            break;
+        case DragMode_None:
+            break;
     }
 
+    CSMWorld::CommandMacro macro(undoStack, description);
 
-    CSMWorld::CommandMacro macro (undoStack, description);
-
-    for (std::vector<osg::ref_ptr<TagBase> >::iterator iter (selection.begin());
-        iter!=selection.end(); ++iter)
+    for (std::vector<osg::ref_ptr<TagBase>>::iterator iter(selection.begin()); iter != selection.end(); ++iter)
     {
-        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (iter->get()))
+        if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(iter->get()))
         {
             if (mDragMode == DragMode_Rotate_Snap)
             {
                 ESM::Position position = objectTag->mObject->getPosition();
                 double snap = CSMPrefs::get()["3D Scene Editing"]["gridsnap-rotation"].toDouble();
-                position.rot[0] = CSVRender::InstanceMode::roundFloatToMult(position.rot[0], osg::DegreesToRadians(snap));
-                position.rot[1] = CSVRender::InstanceMode::roundFloatToMult(position.rot[1], osg::DegreesToRadians(snap));
-                position.rot[2] = CSVRender::InstanceMode::roundFloatToMult(position.rot[2], osg::DegreesToRadians(snap));
+                position.rot[0]
+                    = CSVRender::InstanceMode::roundFloatToMult(position.rot[0], osg::DegreesToRadians(snap));
+                position.rot[1]
+                    = CSVRender::InstanceMode::roundFloatToMult(position.rot[1], osg::DegreesToRadians(snap));
+                position.rot[2]
+                    = CSVRender::InstanceMode::roundFloatToMult(position.rot[2], osg::DegreesToRadians(snap));
 
                 objectTag->mObject->setRotation(position.rot);
             }
 
-            objectTag->mObject->apply (macro);
+            objectTag->mObject->apply(macro);
         }
     }
 
@@ -720,36 +754,34 @@ void CSVRender::InstanceMode::dragCompleted(const QPoint& pos)
 
 void CSVRender::InstanceMode::dragAborted()
 {
-    getWorldspaceWidget().reset (Mask_Reference);
+    getWorldspaceWidget().reset(Mask_Reference);
     mDragMode = DragMode_None;
 }
 
-void CSVRender::InstanceMode::dragWheel (int diff, double speedFactor)
+void CSVRender::InstanceMode::dragWheel(int diff, double speedFactor)
 {
-    if (mDragMode==DragMode_Move || mDragMode==DragMode_Move_Snap)
+    if (mDragMode == DragMode_Move || mDragMode == DragMode_Move_Snap)
     {
         osg::Vec3f eye;
         osg::Vec3f centre;
         osg::Vec3f up;
 
-        getWorldspaceWidget().getCamera()->getViewMatrix().getLookAt (eye, centre, up);
+        getWorldspaceWidget().getCamera()->getViewMatrix().getLookAt(eye, centre, up);
 
         osg::Vec3f offset = centre - eye;
         offset.normalize();
         offset *= diff * speedFactor;
 
-        std::vector<osg::ref_ptr<TagBase> > selection =
-            getWorldspaceWidget().getEdited (Mask_Reference);
+        std::vector<osg::ref_ptr<TagBase>> selection = getWorldspaceWidget().getEdited(Mask_Reference);
 
         int j = 0;
 
-        for (std::vector<osg::ref_ptr<TagBase> >::iterator iter (selection.begin());
-            iter!=selection.end(); ++iter, j++)
+        for (std::vector<osg::ref_ptr<TagBase>>::iterator iter(selection.begin()); iter != selection.end(); ++iter, j++)
         {
-            if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (iter->get()))
+            if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(iter->get()))
             {
                 ESM::Position position = objectTag->mObject->getPosition();
-                for (int i=0; i<3; ++i)
+                for (int i = 0; i < 3; ++i)
                     position.pos[i] += offset[i];
 
                 if (mDragMode == DragMode_Move_Snap)
@@ -760,123 +792,120 @@ void CSVRender::InstanceMode::dragWheel (int diff, double speedFactor)
                     position.pos[2] = CSVRender::InstanceMode::roundFloatToMult(position.pos[2], snap);
                 }
 
-                objectTag->mObject->setPosition (position.pos);
+                objectTag->mObject->setPosition(position.pos);
                 osg::Vec3f thisPoint(position.pos[0], position.pos[1], position.pos[2]);
-                mDragStart = getMousePlaneCoords(getWorldspaceWidget().mapFromGlobal(QCursor::pos()), getProjectionSpaceCoords(thisPoint));
+                mDragStart = getMousePlaneCoords(
+                    getWorldspaceWidget().mapFromGlobal(QCursor::pos()), getProjectionSpaceCoords(thisPoint));
                 mObjectsAtDragStart[j] = thisPoint;
             }
         }
     }
 }
 
-void CSVRender::InstanceMode::dragEnterEvent (QDragEnterEvent *event)
+void CSVRender::InstanceMode::dragEnterEvent(QDragEnterEvent* event)
 {
-    if (const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*> (event->mimeData()))
+    if (const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*>(event->mimeData()))
     {
-        if (!mime->fromDocument (getWorldspaceWidget().getDocument()))
+        if (!mime->fromDocument(getWorldspaceWidget().getDocument()))
             return;
 
-        if (mime->holdsType (CSMWorld::UniversalId::Type_Referenceable))
+        if (mime->holdsType(CSMWorld::UniversalId::Type_Referenceable))
             event->accept();
     }
 }
 
-void CSVRender::InstanceMode::dropEvent (QDropEvent* event)
+void CSVRender::InstanceMode::dropEvent(QDropEvent* event)
 {
-    if (const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*> (event->mimeData()))
+    if (const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*>(event->mimeData()))
     {
         CSMDoc::Document& document = getWorldspaceWidget().getDocument();
 
-        if (!mime->fromDocument (document))
+        if (!mime->fromDocument(document))
             return;
 
-        WorldspaceHitResult hit = getWorldspaceWidget().mousePick (event->pos(), getWorldspaceWidget().getInteractionMask());
+        WorldspaceHitResult hit
+            = getWorldspaceWidget().mousePick(event->pos(), getWorldspaceWidget().getInteractionMask());
 
-        std::string cellId = getWorldspaceWidget().getCellId (hit.worldPos);
+        std::string cellId = getWorldspaceWidget().getCellId(hit.worldPos);
 
-        CSMWorld::IdTree& cellTable = dynamic_cast<CSMWorld::IdTree&> (
-            *document.getData().getTableModel (CSMWorld::UniversalId::Type_Cells));
+        CSMWorld::IdTree& cellTable
+            = dynamic_cast<CSMWorld::IdTree&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_Cells));
 
-        bool noCell = document.getData().getCells().searchId (cellId)==-1;
+        bool noCell = document.getData().getCells().searchId(cellId) == -1;
 
         if (noCell)
         {
             std::string mode = CSMPrefs::get()["3D Scene Editing"]["outside-drop"].toString();
 
             // target cell does not exist
-            if (mode=="Discard")
+            if (mode == "Discard")
                 return;
 
-            if (mode=="Create cell and insert")
+            if (mode == "Create cell and insert")
             {
-                std::unique_ptr<CSMWorld::CreateCommand> createCommand (
-                    new CSMWorld::CreateCommand (cellTable, cellId));
+                std::unique_ptr<CSMWorld::CreateCommand> createCommand(new CSMWorld::CreateCommand(cellTable, cellId));
 
-                int parentIndex = cellTable.findColumnIndex (CSMWorld::Columns::ColumnId_Cell);
-                int index = cellTable.findNestedColumnIndex (parentIndex, CSMWorld::Columns::ColumnId_Interior);
-                createCommand->addNestedValue (parentIndex, index, false);
+                int parentIndex = cellTable.findColumnIndex(CSMWorld::Columns::ColumnId_Cell);
+                int index = cellTable.findNestedColumnIndex(parentIndex, CSMWorld::Columns::ColumnId_Interior);
+                createCommand->addNestedValue(parentIndex, index, false);
 
-                document.getUndoStack().push (createCommand.release());
+                document.getUndoStack().push(createCommand.release());
 
-                if (CSVRender::PagedWorldspaceWidget *paged =
-                    dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget()))
+                if (CSVRender::PagedWorldspaceWidget* paged
+                    = dynamic_cast<CSVRender::PagedWorldspaceWidget*>(&getWorldspaceWidget()))
                 {
                     CSMWorld::CellSelection selection = paged->getCellSelection();
-                    selection.add (CSMWorld::CellCoordinates::fromId (cellId).first);
-                    paged->setCellSelection (selection);
+                    selection.add(CSMWorld::CellCoordinates::fromId(cellId).first);
+                    paged->setCellSelection(selection);
                 }
             }
         }
-        else if (CSVRender::PagedWorldspaceWidget *paged =
-            dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget()))
+        else if (CSVRender::PagedWorldspaceWidget* paged
+            = dynamic_cast<CSVRender::PagedWorldspaceWidget*>(&getWorldspaceWidget()))
         {
             CSMWorld::CellSelection selection = paged->getCellSelection();
-            if (!selection.has (CSMWorld::CellCoordinates::fromId (cellId).first))
+            if (!selection.has(CSMWorld::CellCoordinates::fromId(cellId).first))
             {
                 // target cell exists, but is not shown
-                std::string mode =
-                    CSMPrefs::get()["3D Scene Editing"]["outside-visible-drop"].toString();
+                std::string mode = CSMPrefs::get()["3D Scene Editing"]["outside-visible-drop"].toString();
 
-                if (mode=="Discard")
+                if (mode == "Discard")
                     return;
 
-                if (mode=="Show cell and insert")
+                if (mode == "Show cell and insert")
                 {
-                    selection.add (CSMWorld::CellCoordinates::fromId (cellId).first);
-                    paged->setCellSelection (selection);
+                    selection.add(CSMWorld::CellCoordinates::fromId(cellId).first);
+                    paged->setCellSelection(selection);
                 }
             }
         }
 
-        CSMWorld::IdTable& referencesTable = dynamic_cast<CSMWorld::IdTable&> (
-            *document.getData().getTableModel (CSMWorld::UniversalId::Type_References));
+        CSMWorld::IdTable& referencesTable = dynamic_cast<CSMWorld::IdTable&>(
+            *document.getData().getTableModel(CSMWorld::UniversalId::Type_References));
 
         bool dropped = false;
 
         std::vector<CSMWorld::UniversalId> ids = mime->getData();
 
-        for (std::vector<CSMWorld::UniversalId>::const_iterator iter (ids.begin());
-            iter!=ids.end(); ++iter)
-            if (mime->isReferencable (iter->getType()))
+        for (std::vector<CSMWorld::UniversalId>::const_iterator iter(ids.begin()); iter != ids.end(); ++iter)
+            if (mime->isReferencable(iter->getType()))
             {
                 // create reference
-                std::unique_ptr<CSMWorld::CreateCommand> createCommand (
-                    new CSMWorld::CreateCommand (
-                    referencesTable, document.getData().getReferences().getNewId()));
-
-                 createCommand->addValue (referencesTable.findColumnIndex (
-                     CSMWorld::Columns::ColumnId_Cell), QString::fromUtf8 (cellId.c_str()));
-                 createCommand->addValue (referencesTable.findColumnIndex (
-                     CSMWorld::Columns::ColumnId_PositionXPos), hit.worldPos.x());
-                 createCommand->addValue (referencesTable.findColumnIndex (
-                     CSMWorld::Columns::ColumnId_PositionYPos), hit.worldPos.y());
-                 createCommand->addValue (referencesTable.findColumnIndex (
-                     CSMWorld::Columns::ColumnId_PositionZPos), hit.worldPos.z());
-                 createCommand->addValue (referencesTable.findColumnIndex (
-                     CSMWorld::Columns::ColumnId_ReferenceableId),
-                     QString::fromUtf8 (iter->getId().c_str()));
-
-                document.getUndoStack().push (createCommand.release());
+                std::unique_ptr<CSMWorld::CreateCommand> createCommand(
+                    new CSMWorld::CreateCommand(referencesTable, document.getData().getReferences().getNewId()));
+
+                createCommand->addValue(referencesTable.findColumnIndex(CSMWorld::Columns::ColumnId_Cell),
+                    QString::fromUtf8(cellId.c_str()));
+                createCommand->addValue(
+                    referencesTable.findColumnIndex(CSMWorld::Columns::ColumnId_PositionXPos), hit.worldPos.x());
+                createCommand->addValue(
+                    referencesTable.findColumnIndex(CSMWorld::Columns::ColumnId_PositionYPos), hit.worldPos.y());
+                createCommand->addValue(
+                    referencesTable.findColumnIndex(CSMWorld::Columns::ColumnId_PositionZPos), hit.worldPos.z());
+                createCommand->addValue(referencesTable.findColumnIndex(CSMWorld::Columns::ColumnId_ReferenceableId),
+                    QString::fromUtf8(iter->getId().c_str()));
+
+                document.getUndoStack().push(createCommand.release());
 
                 dropped = true;
             }
@@ -888,39 +917,40 @@ void CSVRender::InstanceMode::dropEvent (QDropEvent* event)
 
 int CSVRender::InstanceMode::getSubMode() const
 {
-    return mSubMode ? getSubModeFromId (mSubMode->getCurrentId()) : 0;
+    return mSubMode ? getSubModeFromId(mSubMode->getCurrentId()) : 0;
 }
 
-void CSVRender::InstanceMode::subModeChanged (const std::string& id)
+void CSVRender::InstanceMode::subModeChanged(const std::string& id)
 {
     mSubModeId = id;
     getWorldspaceWidget().abortDrag();
-    getWorldspaceWidget().setSubMode (getSubModeFromId (id), Mask_Reference);
+    getWorldspaceWidget().setSubMode(getSubModeFromId(id), Mask_Reference);
 }
 
 void CSVRender::InstanceMode::handleSelectDrag(const QPoint& pos)
 {
     osg::Vec3f mousePlanePoint = getMousePlaneCoords(pos, getProjectionSpaceCoords(mSelectionMode->getDragStart()));
-    mSelectionMode->dragEnded (mousePlanePoint, mDragMode);
+    mSelectionMode->dragEnded(mousePlanePoint, mDragMode);
     mDragMode = DragMode_None;
 }
 
 void CSVRender::InstanceMode::deleteSelectedInstances(bool active)
 {
-    std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Reference);
-    if (selection.empty()) return;
+    std::vector<osg::ref_ptr<TagBase>> selection = getWorldspaceWidget().getSelection(Mask_Reference);
+    if (selection.empty())
+        return;
 
     CSMDoc::Document& document = getWorldspaceWidget().getDocument();
-    CSMWorld::IdTable& referencesTable = dynamic_cast<CSMWorld::IdTable&> (
-        *document.getData().getTableModel (CSMWorld::UniversalId::Type_References));
+    CSMWorld::IdTable& referencesTable
+        = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_References));
     QUndoStack& undoStack = document.getUndoStack();
 
-    CSMWorld::CommandMacro macro (undoStack, "Delete Instances");
-    for(osg::ref_ptr<TagBase> tag: selection)
-        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (tag.get()))
+    CSMWorld::CommandMacro macro(undoStack, "Delete Instances");
+    for (osg::ref_ptr<TagBase> tag : selection)
+        if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(tag.get()))
             macro.push(new CSMWorld::DeleteCommand(referencesTable, objectTag->mObject->getReferenceId()));
 
-    getWorldspaceWidget().clearSelection (Mask_Reference);
+    getWorldspaceWidget().clearSelection(Mask_Reference);
 }
 
 void CSVRender::InstanceMode::dropInstance(CSVRender::Object* object, float dropHeight)
@@ -940,8 +970,8 @@ float CSVRender::InstanceMode::calculateDropHeight(DropMode dropMode, CSVRender:
     osg::Vec3d end = point;
     end.z() = std::numeric_limits<float>::lowest();
 
-    osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector (new osgUtil::LineSegmentIntersector(
-        osgUtil::Intersector::MODEL, start, end) );
+    osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector(
+        new osgUtil::LineSegmentIntersector(osgUtil::Intersector::MODEL, start, end));
     intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::NO_LIMIT);
     osgUtil::IntersectionVisitor visitor(intersector);
 
@@ -985,18 +1015,18 @@ void CSVRender::InstanceMode::dropSelectedInstancesToTerrainSeparately()
 
 void CSVRender::InstanceMode::handleDropMethod(DropMode dropMode, QString commandMsg)
 {
-    std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Reference);
+    std::vector<osg::ref_ptr<TagBase>> selection = getWorldspaceWidget().getSelection(Mask_Reference);
     if (selection.empty())
         return;
 
     CSMDoc::Document& document = getWorldspaceWidget().getDocument();
     QUndoStack& undoStack = document.getUndoStack();
 
-    CSMWorld::CommandMacro macro (undoStack, commandMsg);
+    CSMWorld::CommandMacro macro(undoStack, commandMsg);
 
     DropObjectHeightHandler dropObjectDataHandler(&getWorldspaceWidget());
 
-    if(dropMode & Separate)
+    if (dropMode & Separate)
     {
         int counter = 0;
         for (osg::ref_ptr<TagBase> tag : selection)
@@ -1034,10 +1064,10 @@ void CSVRender::InstanceMode::handleDropMethod(DropMode dropMode, QString comman
 CSVRender::DropObjectHeightHandler::DropObjectHeightHandler(WorldspaceWidget* worldspacewidget)
     : mWorldspaceWidget(worldspacewidget)
 {
-    std::vector<osg::ref_ptr<TagBase> > selection = mWorldspaceWidget->getSelection (Mask_Reference);
-    for(osg::ref_ptr<TagBase> tag: selection)
+    std::vector<osg::ref_ptr<TagBase>> selection = mWorldspaceWidget->getSelection(Mask_Reference);
+    for (osg::ref_ptr<TagBase> tag : selection)
     {
-        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (tag.get()))
+        if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(tag.get()))
         {
             osg::ref_ptr<osg::Group> objectNodeWithGUI = objectTag->mObject->getRootNode();
             osg::ref_ptr<osg::Group> objectNodeWithoutGUI = objectTag->mObject->getBaseNode();
@@ -1060,11 +1090,11 @@ CSVRender::DropObjectHeightHandler::DropObjectHeightHandler(WorldspaceWidget* wo
 
 CSVRender::DropObjectHeightHandler::~DropObjectHeightHandler()
 {
-    std::vector<osg::ref_ptr<TagBase> > selection = mWorldspaceWidget->getSelection (Mask_Reference);
+    std::vector<osg::ref_ptr<TagBase>> selection = mWorldspaceWidget->getSelection(Mask_Reference);
     int counter = 0;
-    for(osg::ref_ptr<TagBase> tag: selection)
+    for (osg::ref_ptr<TagBase> tag : selection)
     {
-        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (tag.get()))
+        if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(tag.get()))
         {
             osg::ref_ptr<osg::Group> objectNodeWithGUI = objectTag->mObject->getRootNode();
             objectNodeWithGUI->setNodeMask(mOldMasks[counter]);
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index feb307807a..814afd2293 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -3,10 +3,10 @@
 
 #include <QString>
 
-#include <osg/ref_ptr>
 #include <osg/Group>
 #include <osg/Quat>
 #include <osg/Vec3f>
+#include <osg/ref_ptr>
 
 #include "editmode.hpp"
 #include "instancedragmodes.hpp"
@@ -24,115 +24,115 @@ namespace CSVRender
 
     class InstanceMode : public EditMode
     {
-            Q_OBJECT
-
-            enum DropMode
-            {
-                Separate = 0b1,
+        Q_OBJECT
 
-                Collision = 0b10,
-                Terrain = 0b100,
+        enum DropMode
+        {
+            Separate = 0b1,
 
-                CollisionSep = Collision | Separate,
-                TerrainSep = Terrain | Separate,
-            };
+            Collision = 0b10,
+            Terrain = 0b100,
 
-            CSVWidget::SceneToolMode *mSubMode;
-            std::string mSubModeId;
-            InstanceSelectionMode *mSelectionMode;
-            DragMode mDragMode;
-            int mDragAxis;
-            bool mLocked;
-            float mUnitScaleDist;
-            osg::ref_ptr<osg::Group> mParentNode;
-            osg::Vec3f mDragStart;
-            std::vector<osg::Vec3f> mObjectsAtDragStart;
+            CollisionSep = Collision | Separate,
+            TerrainSep = Terrain | Separate,
+        };
 
-            int getSubModeFromId (const std::string& id) const;
+        CSVWidget::SceneToolMode* mSubMode;
+        std::string mSubModeId;
+        InstanceSelectionMode* mSelectionMode;
+        DragMode mDragMode;
+        int mDragAxis;
+        bool mLocked;
+        float mUnitScaleDist;
+        osg::ref_ptr<osg::Group> mParentNode;
+        osg::Vec3f mDragStart;
+        std::vector<osg::Vec3f> mObjectsAtDragStart;
 
-            osg::Vec3f quatToEuler(const osg::Quat& quat) const;
-            osg::Quat eulerToQuat(const osg::Vec3f& euler) const;
+        int getSubModeFromId(const std::string& id) const;
 
-            float roundFloatToMult(const float val, const double mult) const;
+        osg::Vec3f quatToEuler(const osg::Quat& quat) const;
+        osg::Quat eulerToQuat(const osg::Vec3f& euler) const;
 
-            osg::Vec3f getSelectionCenter(const std::vector<osg::ref_ptr<TagBase> >& selection) const;
-            osg::Vec3f getScreenCoords(const osg::Vec3f& pos);
-            osg::Vec3f getProjectionSpaceCoords(const osg::Vec3f& pos);
-            osg::Vec3f getMousePlaneCoords(const QPoint& point, const osg::Vec3d& dragStart);
-            void handleSelectDrag(const QPoint& pos);
-            void dropInstance(CSVRender::Object* object, float dropHeight);
-            float calculateDropHeight(DropMode dropMode, CSVRender::Object* object, float objectHeight);
+        float roundFloatToMult(const float val, const double mult) const;
 
-        public:
+        osg::Vec3f getSelectionCenter(const std::vector<osg::ref_ptr<TagBase>>& selection) const;
+        osg::Vec3f getScreenCoords(const osg::Vec3f& pos);
+        osg::Vec3f getProjectionSpaceCoords(const osg::Vec3f& pos);
+        osg::Vec3f getMousePlaneCoords(const QPoint& point, const osg::Vec3d& dragStart);
+        void handleSelectDrag(const QPoint& pos);
+        void dropInstance(CSVRender::Object* object, float dropHeight);
+        float calculateDropHeight(DropMode dropMode, CSVRender::Object* object, float objectHeight);
 
-            InstanceMode (WorldspaceWidget *worldspaceWidget, osg::ref_ptr<osg::Group> parentNode, QWidget *parent = nullptr);
+    public:
+        InstanceMode(
+            WorldspaceWidget* worldspaceWidget, osg::ref_ptr<osg::Group> parentNode, QWidget* parent = nullptr);
 
-            void activate (CSVWidget::SceneToolbar *toolbar) override;
+        void activate(CSVWidget::SceneToolbar* toolbar) override;
 
-            void deactivate (CSVWidget::SceneToolbar *toolbar) override;
+        void deactivate(CSVWidget::SceneToolbar* toolbar) override;
 
-            void setEditLock (bool locked) override;
+        void setEditLock(bool locked) override;
 
-            void primaryOpenPressed (const WorldspaceHitResult& hit) override;
+        void primaryOpenPressed(const WorldspaceHitResult& hit) override;
 
-            void primaryEditPressed (const WorldspaceHitResult& hit) override;
+        void primaryEditPressed(const WorldspaceHitResult& hit) override;
 
-            void secondaryEditPressed (const WorldspaceHitResult& hit) override;
+        void secondaryEditPressed(const WorldspaceHitResult& hit) override;
 
-            void primarySelectPressed (const WorldspaceHitResult& hit) override;
+        void primarySelectPressed(const WorldspaceHitResult& hit) override;
 
-            void secondarySelectPressed (const WorldspaceHitResult& hit) override;
+        void secondarySelectPressed(const WorldspaceHitResult& hit) override;
 
-            bool primaryEditStartDrag (const QPoint& pos) override;
+        bool primaryEditStartDrag(const QPoint& pos) override;
 
-            bool secondaryEditStartDrag (const QPoint& pos) override;
+        bool secondaryEditStartDrag(const QPoint& pos) override;
 
-            bool primarySelectStartDrag(const QPoint& pos) override;
+        bool primarySelectStartDrag(const QPoint& pos) override;
 
-            bool secondarySelectStartDrag(const QPoint& pos) override;
+        bool secondarySelectStartDrag(const QPoint& pos) override;
 
-            void drag (const QPoint& pos, int diffX, int diffY, double speedFactor) override;
+        void drag(const QPoint& pos, int diffX, int diffY, double speedFactor) override;
 
-            void dragCompleted(const QPoint& pos) override;
+        void dragCompleted(const QPoint& pos) override;
 
-            /// \note dragAborted will not be called, if the drag is aborted via changing
-            /// editing mode
-            void dragAborted() override;
+        /// \note dragAborted will not be called, if the drag is aborted via changing
+        /// editing mode
+        void dragAborted() override;
 
-            void dragWheel (int diff, double speedFactor) override;
+        void dragWheel(int diff, double speedFactor) override;
 
-            void dragEnterEvent (QDragEnterEvent *event) override;
+        void dragEnterEvent(QDragEnterEvent* event) override;
 
-            void dropEvent (QDropEvent *event) override;
+        void dropEvent(QDropEvent* event) override;
 
-            int getSubMode() const override;
+        int getSubMode() const override;
 
-        signals:
+    signals:
 
-            void requestFocus (const std::string& id);
+        void requestFocus(const std::string& id);
 
-        private slots:
+    private slots:
 
-            void subModeChanged (const std::string& id);
-            void deleteSelectedInstances(bool active);
-            void dropSelectedInstancesToCollision();
-            void dropSelectedInstancesToTerrain();
-            void dropSelectedInstancesToCollisionSeparately();
-            void dropSelectedInstancesToTerrainSeparately();
-            void handleDropMethod(DropMode dropMode, QString commandMsg);
+        void subModeChanged(const std::string& id);
+        void deleteSelectedInstances(bool active);
+        void dropSelectedInstancesToCollision();
+        void dropSelectedInstancesToTerrain();
+        void dropSelectedInstancesToCollisionSeparately();
+        void dropSelectedInstancesToTerrainSeparately();
+        void handleDropMethod(DropMode dropMode, QString commandMsg);
     };
 
     /// \brief Helper class to handle object mask data in safe way
     class DropObjectHeightHandler
     {
-        public:
-            DropObjectHeightHandler(WorldspaceWidget* worldspacewidget);
-            ~DropObjectHeightHandler();
-            std::vector<float> mObjectHeights;
-
-        private:
-            WorldspaceWidget* mWorldspaceWidget;
-            std::vector<osg::Node::NodeMask> mOldMasks;
+    public:
+        DropObjectHeightHandler(WorldspaceWidget* worldspacewidget);
+        ~DropObjectHeightHandler();
+        std::vector<float> mObjectHeights;
+
+    private:
+        WorldspaceWidget* mWorldspaceWidget;
+        std::vector<osg::Node::NodeMask> mOldMasks;
     };
 }
 
diff --git a/apps/opencs/view/render/instancemovemode.cpp b/apps/opencs/view/render/instancemovemode.cpp
index 5591035492..a4582ec252 100644
--- a/apps/opencs/view/render/instancemovemode.cpp
+++ b/apps/opencs/view/render/instancemovemode.cpp
@@ -1,11 +1,12 @@
 
 #include "instancemovemode.hpp"
 
-CSVRender::InstanceMoveMode::InstanceMoveMode (QWidget *parent)
-: ModeButton (QIcon (QPixmap (":scenetoolbar/transform-move")),
-  "Move selected instances"
-  "<ul><li>Use {scene-edit-primary} to move instances around freely</li>"
-  "<li>Use {scene-edit-secondary} to move instances around within the grid</li>"
-  "</ul>",
-  parent)
-{}
+CSVRender::InstanceMoveMode::InstanceMoveMode(QWidget* parent)
+    : ModeButton(QIcon(QPixmap(":scenetoolbar/transform-move")),
+        "Move selected instances"
+        "<ul><li>Use {scene-edit-primary} to move instances around freely</li>"
+        "<li>Use {scene-edit-secondary} to move instances around within the grid</li>"
+        "</ul>",
+        parent)
+{
+}
diff --git a/apps/opencs/view/render/instancemovemode.hpp b/apps/opencs/view/render/instancemovemode.hpp
index 62e6b6a1f8..fd7ed9d3f8 100644
--- a/apps/opencs/view/render/instancemovemode.hpp
+++ b/apps/opencs/view/render/instancemovemode.hpp
@@ -7,11 +7,10 @@ namespace CSVRender
 {
     class InstanceMoveMode : public CSVWidget::ModeButton
     {
-            Q_OBJECT
+        Q_OBJECT
 
-        public:
-
-            InstanceMoveMode (QWidget *parent = nullptr);
+    public:
+        InstanceMoveMode(QWidget* parent = nullptr);
     };
 }
 
diff --git a/apps/opencs/view/render/instanceselectionmode.cpp b/apps/opencs/view/render/instanceselectionmode.cpp
index beabec7aad..8506646510 100644
--- a/apps/opencs/view/render/instanceselectionmode.cpp
+++ b/apps/opencs/view/render/instanceselectionmode.cpp
@@ -1,25 +1,27 @@
 #include "instanceselectionmode.hpp"
 
-#include <QMenu>
 #include <QAction>
+#include <QMenu>
 #include <QPoint>
 
 #include <osg/Group>
 #include <osg/PositionAttitudeTransform>
-#include <osg/ref_ptr>
 #include <osg/Vec3d>
+#include <osg/ref_ptr>
 
-#include "../../model/world/idtable.hpp"
 #include "../../model/world/commands.hpp"
+#include "../../model/world/idtable.hpp"
 
 #include "instancedragmodes.hpp"
-#include "worldspacewidget.hpp"
 #include "object.hpp"
+#include "worldspacewidget.hpp"
 
 namespace CSVRender
 {
-    InstanceSelectionMode::InstanceSelectionMode(CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget, osg::Group *cellNode)
-        : SelectionMode(parent, worldspaceWidget, Mask_Reference), mParentNode(cellNode)
+    InstanceSelectionMode::InstanceSelectionMode(
+        CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget, osg::Group* cellNode)
+        : SelectionMode(parent, worldspaceWidget, Mask_Reference)
+        , mParentNode(cellNode)
     {
         mSelectSame = new QAction("Extend selection to instances with same object ID", this);
         mDeleteSelection = new QAction("Delete selected instances", this);
@@ -46,7 +48,8 @@ namespace CSVRender
     void InstanceSelectionMode::dragEnded(const osg::Vec3d& dragEndPoint, DragMode dragMode)
     {
         float dragDistance = (mDragStart - dragEndPoint).length();
-        if (mBaseNode) mParentNode->removeChild (mBaseNode);
+        if (mBaseNode)
+            mParentNode->removeChild(mBaseNode);
         if (getCurrentId() == "cube-centre")
         {
             osg::Vec3d pointA(mDragStart[0] - dragDistance, mDragStart[1] - dragDistance, mDragStart[2] - dragDistance);
@@ -76,196 +79,198 @@ namespace CSVRender
 
     void InstanceSelectionMode::drawSelectionBox(const osg::Vec3d& pointA, const osg::Vec3d& pointB)
     {
-        if (mBaseNode) mParentNode->removeChild (mBaseNode);
+        if (mBaseNode)
+            mParentNode->removeChild(mBaseNode);
         mBaseNode = new osg::PositionAttitudeTransform;
         mBaseNode->setPosition(pointA);
 
-        osg::ref_ptr<osg::Geometry> geometry (new osg::Geometry);
+        osg::ref_ptr<osg::Geometry> geometry(new osg::Geometry);
 
-        osg::Vec3Array *vertices = new osg::Vec3Array;
-        vertices->push_back (osg::Vec3f (0.0f, 0.0f, 0.0f));
-        vertices->push_back (osg::Vec3f (0.0f, 0.0f, pointB[2] - pointA[2]));
-        vertices->push_back (osg::Vec3f (0.0f, pointB[1] - pointA[1], 0.0f));
-        vertices->push_back (osg::Vec3f (0.0f, pointB[1] - pointA[1], pointB[2] - pointA[2]));
+        osg::Vec3Array* vertices = new osg::Vec3Array;
+        vertices->push_back(osg::Vec3f(0.0f, 0.0f, 0.0f));
+        vertices->push_back(osg::Vec3f(0.0f, 0.0f, pointB[2] - pointA[2]));
+        vertices->push_back(osg::Vec3f(0.0f, pointB[1] - pointA[1], 0.0f));
+        vertices->push_back(osg::Vec3f(0.0f, pointB[1] - pointA[1], pointB[2] - pointA[2]));
 
-        vertices->push_back (osg::Vec3f (pointB[0] - pointA[0], 0.0f, 0.0f));
-        vertices->push_back (osg::Vec3f (pointB[0] - pointA[0], 0.0f, pointB[2] - pointA[2]));
-        vertices->push_back (osg::Vec3f (pointB[0] - pointA[0], pointB[1] - pointA[1], 0.0f));
-        vertices->push_back (osg::Vec3f (pointB[0] - pointA[0], pointB[1] - pointA[1], pointB[2] - pointA[2]));
+        vertices->push_back(osg::Vec3f(pointB[0] - pointA[0], 0.0f, 0.0f));
+        vertices->push_back(osg::Vec3f(pointB[0] - pointA[0], 0.0f, pointB[2] - pointA[2]));
+        vertices->push_back(osg::Vec3f(pointB[0] - pointA[0], pointB[1] - pointA[1], 0.0f));
+        vertices->push_back(osg::Vec3f(pointB[0] - pointA[0], pointB[1] - pointA[1], pointB[2] - pointA[2]));
 
-        geometry->setVertexArray (vertices);
+        geometry->setVertexArray(vertices);
 
-        osg::DrawElementsUShort *primitives = new osg::DrawElementsUShort (osg::PrimitiveSet::TRIANGLES, 0);
+        osg::DrawElementsUShort* primitives = new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES, 0);
 
         // top
-        primitives->push_back (2);
-        primitives->push_back (1);
-        primitives->push_back (0);
+        primitives->push_back(2);
+        primitives->push_back(1);
+        primitives->push_back(0);
 
-        primitives->push_back (3);
-        primitives->push_back (1);
-        primitives->push_back (2);
+        primitives->push_back(3);
+        primitives->push_back(1);
+        primitives->push_back(2);
 
         // bottom
-        primitives->push_back (4);
-        primitives->push_back (5);
-        primitives->push_back (6);
+        primitives->push_back(4);
+        primitives->push_back(5);
+        primitives->push_back(6);
 
-        primitives->push_back (6);
-        primitives->push_back (5);
-        primitives->push_back (7);
+        primitives->push_back(6);
+        primitives->push_back(5);
+        primitives->push_back(7);
 
         // sides
-        primitives->push_back (1);
-        primitives->push_back (4);
-        primitives->push_back (0);
+        primitives->push_back(1);
+        primitives->push_back(4);
+        primitives->push_back(0);
 
-        primitives->push_back (4);
-        primitives->push_back (1);
-        primitives->push_back (5);
+        primitives->push_back(4);
+        primitives->push_back(1);
+        primitives->push_back(5);
 
-        primitives->push_back (4);
-        primitives->push_back (2);
-        primitives->push_back (0);
+        primitives->push_back(4);
+        primitives->push_back(2);
+        primitives->push_back(0);
 
-        primitives->push_back (6);
-        primitives->push_back (2);
-        primitives->push_back (4);
+        primitives->push_back(6);
+        primitives->push_back(2);
+        primitives->push_back(4);
 
-        primitives->push_back (6);
-        primitives->push_back (3);
-        primitives->push_back (2);
+        primitives->push_back(6);
+        primitives->push_back(3);
+        primitives->push_back(2);
 
-        primitives->push_back (7);
-        primitives->push_back (3);
-        primitives->push_back (6);
+        primitives->push_back(7);
+        primitives->push_back(3);
+        primitives->push_back(6);
 
-        primitives->push_back (1);
-        primitives->push_back (3);
-        primitives->push_back (5);
+        primitives->push_back(1);
+        primitives->push_back(3);
+        primitives->push_back(5);
 
-        primitives->push_back (5);
-        primitives->push_back (3);
-        primitives->push_back (7);
+        primitives->push_back(5);
+        primitives->push_back(3);
+        primitives->push_back(7);
 
-        geometry->addPrimitiveSet (primitives);
+        geometry->addPrimitiveSet(primitives);
 
-        osg::Vec4Array *colours = new osg::Vec4Array;
+        osg::Vec4Array* colours = new osg::Vec4Array;
 
-        colours->push_back (osg::Vec4f (0.3f, 0.3f, 0.5f, 0.2f));
-        colours->push_back (osg::Vec4f (0.9f, 0.9f, 1.0f, 0.2f));
-        colours->push_back (osg::Vec4f (0.3f, 0.3f, 0.4f, 0.2f));
-        colours->push_back (osg::Vec4f (0.9f, 0.9f, 1.0f, 0.2f));
-        colours->push_back (osg::Vec4f (0.3f, 0.3f, 0.4f, 0.2f));
-        colours->push_back (osg::Vec4f (0.9f, 0.9f, 1.0f, 0.2f));
-        colours->push_back (osg::Vec4f (0.3f, 0.3f, 0.4f, 0.2f));
-        colours->push_back (osg::Vec4f (0.9f, 0.9f, 1.0f, 0.2f));
+        colours->push_back(osg::Vec4f(0.3f, 0.3f, 0.5f, 0.2f));
+        colours->push_back(osg::Vec4f(0.9f, 0.9f, 1.0f, 0.2f));
+        colours->push_back(osg::Vec4f(0.3f, 0.3f, 0.4f, 0.2f));
+        colours->push_back(osg::Vec4f(0.9f, 0.9f, 1.0f, 0.2f));
+        colours->push_back(osg::Vec4f(0.3f, 0.3f, 0.4f, 0.2f));
+        colours->push_back(osg::Vec4f(0.9f, 0.9f, 1.0f, 0.2f));
+        colours->push_back(osg::Vec4f(0.3f, 0.3f, 0.4f, 0.2f));
+        colours->push_back(osg::Vec4f(0.9f, 0.9f, 1.0f, 0.2f));
 
-        geometry->setColorArray (colours, osg::Array::BIND_PER_VERTEX);
+        geometry->setColorArray(colours, osg::Array::BIND_PER_VERTEX);
 
-        geometry->getOrCreateStateSet()->setMode (GL_LIGHTING, osg::StateAttribute::OFF);
-        geometry->getOrCreateStateSet()->setMode (GL_BLEND, osg::StateAttribute::ON);
+        geometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+        geometry->getOrCreateStateSet()->setMode(GL_BLEND, osg::StateAttribute::ON);
         geometry->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
         geometry->getOrCreateStateSet()->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
 
-        mBaseNode->addChild (geometry);
+        mBaseNode->addChild(geometry);
         mParentNode->addChild(mBaseNode);
     }
 
     void InstanceSelectionMode::drawSelectionCube(const osg::Vec3d& point, float radius)
     {
-        if (mBaseNode) mParentNode->removeChild (mBaseNode);
+        if (mBaseNode)
+            mParentNode->removeChild(mBaseNode);
         mBaseNode = new osg::PositionAttitudeTransform;
         mBaseNode->setPosition(point);
 
-        osg::ref_ptr<osg::Geometry> geometry (new osg::Geometry);
+        osg::ref_ptr<osg::Geometry> geometry(new osg::Geometry);
 
-        osg::Vec3Array *vertices = new osg::Vec3Array;
+        osg::Vec3Array* vertices = new osg::Vec3Array;
         for (int i = 0; i < 2; ++i)
         {
             float height = i ? -radius : radius;
-            vertices->push_back (osg::Vec3f (height, -radius, -radius));
-            vertices->push_back (osg::Vec3f (height, -radius,  radius));
-            vertices->push_back (osg::Vec3f (height,  radius, -radius));
-            vertices->push_back (osg::Vec3f (height,  radius,  radius));
+            vertices->push_back(osg::Vec3f(height, -radius, -radius));
+            vertices->push_back(osg::Vec3f(height, -radius, radius));
+            vertices->push_back(osg::Vec3f(height, radius, -radius));
+            vertices->push_back(osg::Vec3f(height, radius, radius));
         }
 
-        geometry->setVertexArray (vertices);
+        geometry->setVertexArray(vertices);
 
-        osg::DrawElementsUShort *primitives = new osg::DrawElementsUShort (osg::PrimitiveSet::TRIANGLES, 0);
+        osg::DrawElementsUShort* primitives = new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES, 0);
 
         // top
-        primitives->push_back (2);
-        primitives->push_back (1);
-        primitives->push_back (0);
+        primitives->push_back(2);
+        primitives->push_back(1);
+        primitives->push_back(0);
 
-        primitives->push_back (3);
-        primitives->push_back (1);
-        primitives->push_back (2);
+        primitives->push_back(3);
+        primitives->push_back(1);
+        primitives->push_back(2);
 
         // bottom
-        primitives->push_back (4);
-        primitives->push_back (5);
-        primitives->push_back (6);
+        primitives->push_back(4);
+        primitives->push_back(5);
+        primitives->push_back(6);
 
-        primitives->push_back (6);
-        primitives->push_back (5);
-        primitives->push_back (7);
+        primitives->push_back(6);
+        primitives->push_back(5);
+        primitives->push_back(7);
 
         // sides
-        primitives->push_back (1);
-        primitives->push_back (4);
-        primitives->push_back (0);
+        primitives->push_back(1);
+        primitives->push_back(4);
+        primitives->push_back(0);
 
-        primitives->push_back (4);
-        primitives->push_back (1);
-        primitives->push_back (5);
+        primitives->push_back(4);
+        primitives->push_back(1);
+        primitives->push_back(5);
 
-        primitives->push_back (4);
-        primitives->push_back (2);
-        primitives->push_back (0);
+        primitives->push_back(4);
+        primitives->push_back(2);
+        primitives->push_back(0);
 
-        primitives->push_back (6);
-        primitives->push_back (2);
-        primitives->push_back (4);
+        primitives->push_back(6);
+        primitives->push_back(2);
+        primitives->push_back(4);
 
-        primitives->push_back (6);
-        primitives->push_back (3);
-        primitives->push_back (2);
+        primitives->push_back(6);
+        primitives->push_back(3);
+        primitives->push_back(2);
 
-        primitives->push_back (7);
-        primitives->push_back (3);
-        primitives->push_back (6);
+        primitives->push_back(7);
+        primitives->push_back(3);
+        primitives->push_back(6);
 
-        primitives->push_back (1);
-        primitives->push_back (3);
-        primitives->push_back (5);
+        primitives->push_back(1);
+        primitives->push_back(3);
+        primitives->push_back(5);
 
-        primitives->push_back (5);
-        primitives->push_back (3);
-        primitives->push_back (7);
+        primitives->push_back(5);
+        primitives->push_back(3);
+        primitives->push_back(7);
 
-        geometry->addPrimitiveSet (primitives);
+        geometry->addPrimitiveSet(primitives);
 
-        osg::Vec4Array *colours = new osg::Vec4Array;
+        osg::Vec4Array* colours = new osg::Vec4Array;
 
-        colours->push_back (osg::Vec4f (0.3f, 0.3f, 0.5f, 0.2f));
-        colours->push_back (osg::Vec4f (0.9f, 0.9f, 1.0f, 0.2f));
-        colours->push_back (osg::Vec4f (0.3f, 0.3f, 0.4f, 0.2f));
-        colours->push_back (osg::Vec4f (0.9f, 0.9f, 1.0f, 0.2f));
-        colours->push_back (osg::Vec4f (0.3f, 0.3f, 0.4f, 0.2f));
-        colours->push_back (osg::Vec4f (0.9f, 0.9f, 1.0f, 0.2f));
-        colours->push_back (osg::Vec4f (0.3f, 0.3f, 0.4f, 0.2f));
-        colours->push_back (osg::Vec4f (0.9f, 0.9f, 1.0f, 0.2f));
+        colours->push_back(osg::Vec4f(0.3f, 0.3f, 0.5f, 0.2f));
+        colours->push_back(osg::Vec4f(0.9f, 0.9f, 1.0f, 0.2f));
+        colours->push_back(osg::Vec4f(0.3f, 0.3f, 0.4f, 0.2f));
+        colours->push_back(osg::Vec4f(0.9f, 0.9f, 1.0f, 0.2f));
+        colours->push_back(osg::Vec4f(0.3f, 0.3f, 0.4f, 0.2f));
+        colours->push_back(osg::Vec4f(0.9f, 0.9f, 1.0f, 0.2f));
+        colours->push_back(osg::Vec4f(0.3f, 0.3f, 0.4f, 0.2f));
+        colours->push_back(osg::Vec4f(0.9f, 0.9f, 1.0f, 0.2f));
 
-        geometry->setColorArray (colours, osg::Array::BIND_PER_VERTEX);
+        geometry->setColorArray(colours, osg::Array::BIND_PER_VERTEX);
 
-        geometry->getOrCreateStateSet()->setMode (GL_LIGHTING, osg::StateAttribute::OFF);
-        geometry->getOrCreateStateSet()->setMode (GL_BLEND, osg::StateAttribute::ON);
+        geometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+        geometry->getOrCreateStateSet()->setMode(GL_BLEND, osg::StateAttribute::ON);
         geometry->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
         geometry->getOrCreateStateSet()->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
 
-        mBaseNode->addChild (geometry);
+        mBaseNode->addChild(geometry);
         mParentNode->addChild(mBaseNode);
     }
 
@@ -277,32 +282,33 @@ namespace CSVRender
 
     void InstanceSelectionMode::drawSelectionSphere(const osg::Vec3d& point, float radius)
     {
-        if (mBaseNode) mParentNode->removeChild (mBaseNode);
+        if (mBaseNode)
+            mParentNode->removeChild(mBaseNode);
         mBaseNode = new osg::PositionAttitudeTransform;
         mBaseNode->setPosition(point);
 
-        osg::ref_ptr<osg::Geometry> geometry (new osg::Geometry);
+        osg::ref_ptr<osg::Geometry> geometry(new osg::Geometry);
 
-        osg::Vec3Array *vertices = new osg::Vec3Array;
+        osg::Vec3Array* vertices = new osg::Vec3Array;
         constexpr int resolution = 32;
         float radiusPerResolution = radius / resolution;
         float reciprocalResolution = 1.0f / resolution;
         float doubleReciprocalRes = reciprocalResolution * 2;
 
-        osg::Vec4Array *colours = new osg::Vec4Array;
+        osg::Vec4Array* colours = new osg::Vec4Array;
 
         for (int i = 0; i <= resolution; i += 2)
         {
             float iShifted = (static_cast<float>(i) - resolution / 2.0f); // i - 16 = -16 ... 16
             float xPercentile = iShifted * doubleReciprocalRes;
             float x = xPercentile * radius;
-            float thisRadius = sqrt (radius * radius - x * x);
+            float thisRadius = sqrt(radius * radius - x * x);
 
-            //the next row
+            // the next row
             float iShifted2 = (static_cast<float>(i + 1) - resolution / 2.0f);
             float xPercentile2 = iShifted2 * doubleReciprocalRes;
             float x2 = xPercentile2 * radius;
-            float thisRadius2 = sqrt (radius * radius - x2 * x2);
+            float thisRadius2 = sqrt(radius * radius - x2 * x2);
 
             for (int j = 0; j < resolution; ++j)
             {
@@ -310,57 +316,62 @@ namespace CSVRender
                 float vertexY = i * radiusPerResolution * 2 - radius;
                 float vertexZ = thisRadius * cos(j * reciprocalResolution * osg::PI * 2);
                 float heightPercentage = (vertexZ + radius) / (radius * 2);
-                vertices->push_back (osg::Vec3f (vertexX, vertexY, vertexZ));
-                colours->push_back (osg::Vec4f (heightPercentage, heightPercentage, heightPercentage, 0.3f));
+                vertices->push_back(osg::Vec3f(vertexX, vertexY, vertexZ));
+                colours->push_back(osg::Vec4f(heightPercentage, heightPercentage, heightPercentage, 0.3f));
 
                 float vertexNextRowX = thisRadius2 * sin(j * reciprocalResolution * osg::PI * 2);
                 float vertexNextRowY = (i + 1) * radiusPerResolution * 2 - radius;
                 float vertexNextRowZ = thisRadius2 * cos(j * reciprocalResolution * osg::PI * 2);
                 float heightPercentageNextRow = (vertexZ + radius) / (radius * 2);
-                vertices->push_back (osg::Vec3f (vertexNextRowX, vertexNextRowY, vertexNextRowZ));
-                colours->push_back (osg::Vec4f (heightPercentageNextRow, heightPercentageNextRow, heightPercentageNextRow, 0.3f));
+                vertices->push_back(osg::Vec3f(vertexNextRowX, vertexNextRowY, vertexNextRowZ));
+                colours->push_back(
+                    osg::Vec4f(heightPercentageNextRow, heightPercentageNextRow, heightPercentageNextRow, 0.3f));
             }
         }
 
-        geometry->setVertexArray (vertices);
+        geometry->setVertexArray(vertices);
 
-        osg::DrawElementsUShort *primitives = new osg::DrawElementsUShort (osg::PrimitiveSet::TRIANGLE_STRIP, 0);
+        osg::DrawElementsUShort* primitives = new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLE_STRIP, 0);
 
         for (int i = 0; i < resolution; ++i)
         {
-            //Even
+            // Even
             for (int j = 0; j < resolution * 2; ++j)
             {
-                if (i * resolution * 2 + j > static_cast<int>(vertices->size()) - 1) continue;
-                primitives->push_back (i * resolution * 2 + j);
+                if (i * resolution * 2 + j > static_cast<int>(vertices->size()) - 1)
+                    continue;
+                primitives->push_back(i * resolution * 2 + j);
             }
-            if (i * resolution * 2 > static_cast<int>(vertices->size()) - 1) continue;
-            primitives->push_back (i * resolution * 2);
-            primitives->push_back (i * resolution * 2 + 1);
+            if (i * resolution * 2 > static_cast<int>(vertices->size()) - 1)
+                continue;
+            primitives->push_back(i * resolution * 2);
+            primitives->push_back(i * resolution * 2 + 1);
 
-            //Odd
+            // Odd
             for (int j = 1; j < resolution * 2 - 2; j += 2)
             {
-                if ((i + 1) * resolution * 2 + j - 1 > static_cast<int>(vertices->size()) - 1) continue;
-                primitives->push_back ((i + 1) * resolution * 2 + j - 1);
-                primitives->push_back (i * resolution * 2 + j + 2);
+                if ((i + 1) * resolution * 2 + j - 1 > static_cast<int>(vertices->size()) - 1)
+                    continue;
+                primitives->push_back((i + 1) * resolution * 2 + j - 1);
+                primitives->push_back(i * resolution * 2 + j + 2);
             }
-            if ((i + 2) * resolution * 2 - 2 > static_cast<int>(vertices->size()) - 1) continue;
-            primitives->push_back ((i + 2) * resolution * 2 - 2);
-            primitives->push_back (i * resolution * 2 + 1);
-            primitives->push_back ((i + 1) * resolution * 2);
+            if ((i + 2) * resolution * 2 - 2 > static_cast<int>(vertices->size()) - 1)
+                continue;
+            primitives->push_back((i + 2) * resolution * 2 - 2);
+            primitives->push_back(i * resolution * 2 + 1);
+            primitives->push_back((i + 1) * resolution * 2);
         }
 
-        geometry->addPrimitiveSet (primitives);
+        geometry->addPrimitiveSet(primitives);
 
-        geometry->setColorArray (colours, osg::Array::BIND_PER_VERTEX);
+        geometry->setColorArray(colours, osg::Array::BIND_PER_VERTEX);
 
-        geometry->getOrCreateStateSet()->setMode (GL_LIGHTING, osg::StateAttribute::OFF);
-        geometry->getOrCreateStateSet()->setMode (GL_BLEND, osg::StateAttribute::ON);
+        geometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+        geometry->getOrCreateStateSet()->setMode(GL_BLEND, osg::StateAttribute::ON);
         geometry->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
         geometry->getOrCreateStateSet()->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
 
-        mBaseNode->addChild (geometry);
+        mBaseNode->addChild(geometry);
         mParentNode->addChild(mBaseNode);
     }
 
@@ -384,15 +395,15 @@ namespace CSVRender
 
     void InstanceSelectionMode::deleteSelection()
     {
-        std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection(Mask_Reference);
+        std::vector<osg::ref_ptr<TagBase>> selection = getWorldspaceWidget().getSelection(Mask_Reference);
 
         CSMWorld::IdTable& referencesTable = dynamic_cast<CSMWorld::IdTable&>(
             *getWorldspaceWidget().getDocument().getData().getTableModel(CSMWorld::UniversalId::Type_References));
 
-        for (std::vector<osg::ref_ptr<TagBase> >::iterator iter = selection.begin(); iter != selection.end(); ++iter)
+        for (std::vector<osg::ref_ptr<TagBase>>::iterator iter = selection.begin(); iter != selection.end(); ++iter)
         {
-            CSMWorld::DeleteCommand* command = new CSMWorld::DeleteCommand(referencesTable,
-                static_cast<ObjectTag*>(iter->get())->mObject->getReferenceId());
+            CSMWorld::DeleteCommand* command = new CSMWorld::DeleteCommand(
+                referencesTable, static_cast<ObjectTag*>(iter->get())->mObject->getReferenceId());
 
             getWorldspaceWidget().getDocument().getUndoStack().push(command);
         }
diff --git a/apps/opencs/view/render/instanceselectionmode.hpp b/apps/opencs/view/render/instanceselectionmode.hpp
index 81795d5d3e..cd5afd5d1a 100644
--- a/apps/opencs/view/render/instanceselectionmode.hpp
+++ b/apps/opencs/view/render/instanceselectionmode.hpp
@@ -6,62 +6,61 @@
 #include <osg/PositionAttitudeTransform>
 #include <osg/Vec3d>
 
-#include "selectionmode.hpp"
 #include "instancedragmodes.hpp"
+#include "selectionmode.hpp"
 
 namespace CSVRender
 {
     class InstanceSelectionMode : public SelectionMode
     {
-            Q_OBJECT
-
-        public:
-
-            InstanceSelectionMode(CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget, osg::Group *cellNode);
+        Q_OBJECT
 
-            ~InstanceSelectionMode();
+    public:
+        InstanceSelectionMode(
+            CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget, osg::Group* cellNode);
 
-            /// Store the worldspace-coordinate when drag begins
-            void setDragStart(const osg::Vec3d& dragStart);
+        ~InstanceSelectionMode();
 
-            /// Store the worldspace-coordinate when drag begins
-            const osg::Vec3d& getDragStart();
+        /// Store the worldspace-coordinate when drag begins
+        void setDragStart(const osg::Vec3d& dragStart);
 
-            /// Store the screen-coordinate when drag begins
-            void setScreenDragStart(const QPoint& dragStartPoint);
+        /// Store the worldspace-coordinate when drag begins
+        const osg::Vec3d& getDragStart();
 
-            /// Apply instance selection changes
-            void dragEnded(const osg::Vec3d& dragEndPoint, DragMode dragMode);
+        /// Store the screen-coordinate when drag begins
+        void setScreenDragStart(const QPoint& dragStartPoint);
 
-            void drawSelectionCubeCentre(const osg::Vec3f& mousePlanePoint );
-            void drawSelectionCubeCorner(const osg::Vec3f& mousePlanePoint );
-            void drawSelectionSphere(const osg::Vec3f& mousePlanePoint );
-        protected:
+        /// Apply instance selection changes
+        void dragEnded(const osg::Vec3d& dragEndPoint, DragMode dragMode);
 
-            /// Add context menu items to \a menu.
-            ///
-            /// \attention menu can be a 0-pointer
-            ///
-            /// \return Have there been any menu items to be added (if menu is 0 and there
-            /// items to be added, the function must return true anyway.
-            bool createContextMenu(QMenu* menu) override;
+        void drawSelectionCubeCentre(const osg::Vec3f& mousePlanePoint);
+        void drawSelectionCubeCorner(const osg::Vec3f& mousePlanePoint);
+        void drawSelectionSphere(const osg::Vec3f& mousePlanePoint);
 
-        private:
+    protected:
+        /// Add context menu items to \a menu.
+        ///
+        /// \attention menu can be a 0-pointer
+        ///
+        /// \return Have there been any menu items to be added (if menu is 0 and there
+        /// items to be added, the function must return true anyway.
+        bool createContextMenu(QMenu* menu) override;
 
-            void drawSelectionBox(const osg::Vec3d& pointA, const osg::Vec3d& pointB);
-            void drawSelectionCube(const osg::Vec3d& point, float radius);
-            void drawSelectionSphere(const osg::Vec3d& point, float radius);
+    private:
+        void drawSelectionBox(const osg::Vec3d& pointA, const osg::Vec3d& pointB);
+        void drawSelectionCube(const osg::Vec3d& point, float radius);
+        void drawSelectionSphere(const osg::Vec3d& point, float radius);
 
-            QAction* mDeleteSelection;
-            QAction* mSelectSame;
-            osg::Vec3d mDragStart;
-            osg::Group* mParentNode;
-            osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
+        QAction* mDeleteSelection;
+        QAction* mSelectSame;
+        osg::Vec3d mDragStart;
+        osg::Group* mParentNode;
+        osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
 
-        private slots:
+    private slots:
 
-            void deleteSelection();
-            void selectSame();
+        void deleteSelection();
+        void selectSame();
     };
 }
 
diff --git a/apps/opencs/view/render/lighting.cpp b/apps/opencs/view/render/lighting.cpp
index c7bee79289..93b343c2b7 100644
--- a/apps/opencs/view/render/lighting.cpp
+++ b/apps/opencs/view/render/lighting.cpp
@@ -15,9 +15,10 @@ public:
     DayNightSwitchVisitor(int index)
         : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
         , mIndex(index)
-    { }
+    {
+    }
 
-    void apply(osg::Switch &switchNode) override
+    void apply(osg::Switch& switchNode) override
     {
         constexpr int NoIndex = -1;
 
diff --git a/apps/opencs/view/render/lighting.hpp b/apps/opencs/view/render/lighting.hpp
index d9d90767f0..28747dd765 100644
--- a/apps/opencs/view/render/lighting.hpp
+++ b/apps/opencs/view/render/lighting.hpp
@@ -14,23 +14,24 @@ namespace CSVRender
 {
     class Lighting
     {
-        public:
+    public:
+        Lighting()
+            : mRootNode(nullptr)
+        {
+        }
+        virtual ~Lighting();
 
-            Lighting() : mRootNode(nullptr) {}
-            virtual ~Lighting();
+        virtual void activate(osg::Group* rootNode, bool isExterior) = 0;
 
-            virtual void activate (osg::Group* rootNode, bool isExterior) = 0;
+        virtual void deactivate() = 0;
 
-            virtual void deactivate() = 0;
+        virtual osg::Vec4f getAmbientColour(osg::Vec4f* defaultAmbient) = 0;
 
-            virtual osg::Vec4f getAmbientColour(osg::Vec4f* defaultAmbient) = 0;
+    protected:
+        void updateDayNightMode(int index);
 
-        protected:
-
-            void updateDayNightMode(int index);
-
-            osg::ref_ptr<osg::LightSource> mLightSource;
-            osg::Group* mRootNode;
+        osg::ref_ptr<osg::LightSource> mLightSource;
+        osg::Group* mRootNode;
     };
 }
 
diff --git a/apps/opencs/view/render/lightingbright.cpp b/apps/opencs/view/render/lightingbright.cpp
index d76823fb3c..f7649d42f5 100644
--- a/apps/opencs/view/render/lightingbright.cpp
+++ b/apps/opencs/view/render/lightingbright.cpp
@@ -4,13 +4,13 @@
 
 CSVRender::LightingBright::LightingBright() {}
 
-void CSVRender::LightingBright::activate (osg::Group* rootNode, bool /*isExterior*/)
+void CSVRender::LightingBright::activate(osg::Group* rootNode, bool /*isExterior*/)
 {
     mRootNode = rootNode;
 
     mLightSource = (new osg::LightSource);
 
-    osg::ref_ptr<osg::Light> light (new osg::Light);
+    osg::ref_ptr<osg::Light> light(new osg::Light);
     light->setAmbient(osg::Vec4f(0.f, 0.f, 0.f, 1.f));
     light->setPosition(osg::Vec4f(0.f, 0.f, 1.f, 0.f));
     light->setDiffuse(osg::Vec4f(1.f, 1.f, 1.f, 1.f));
diff --git a/apps/opencs/view/render/lightingbright.hpp b/apps/opencs/view/render/lightingbright.hpp
index aa14927524..0f7de195c1 100644
--- a/apps/opencs/view/render/lightingbright.hpp
+++ b/apps/opencs/view/render/lightingbright.hpp
@@ -13,15 +13,14 @@ namespace CSVRender
 {
     class LightingBright : public Lighting
     {
-        public:
+    public:
+        LightingBright();
 
-            LightingBright();
+        void activate(osg::Group* rootNode, bool /*isExterior*/) override;
 
-            void activate (osg::Group* rootNode, bool /*isExterior*/) override;
+        void deactivate() override;
 
-            void deactivate() override;
-
-            osg::Vec4f getAmbientColour(osg::Vec4f* defaultAmbient) override;
+        osg::Vec4f getAmbientColour(osg::Vec4f* defaultAmbient) override;
     };
 }
 
diff --git a/apps/opencs/view/render/lightingday.cpp b/apps/opencs/view/render/lightingday.cpp
index dc4592b21c..91b098c707 100644
--- a/apps/opencs/view/render/lightingday.cpp
+++ b/apps/opencs/view/render/lightingday.cpp
@@ -2,15 +2,15 @@
 
 #include <osg/LightSource>
 
-CSVRender::LightingDay::LightingDay(){}
+CSVRender::LightingDay::LightingDay() {}
 
-void CSVRender::LightingDay::activate (osg::Group* rootNode, bool /*isExterior*/)
+void CSVRender::LightingDay::activate(osg::Group* rootNode, bool /*isExterior*/)
 {
     mRootNode = rootNode;
 
     mLightSource = new osg::LightSource;
 
-    osg::ref_ptr<osg::Light> light (new osg::Light);
+    osg::ref_ptr<osg::Light> light(new osg::Light);
     light->setPosition(osg::Vec4f(0.f, 0.f, 1.f, 0.f));
     light->setAmbient(osg::Vec4f(0.f, 0.f, 0.f, 1.f));
     light->setDiffuse(osg::Vec4f(1.f, 1.f, 1.f, 1.f));
@@ -29,7 +29,7 @@ void CSVRender::LightingDay::deactivate()
         mRootNode->removeChild(mLightSource);
 }
 
-osg::Vec4f CSVRender::LightingDay::getAmbientColour(osg::Vec4f *defaultAmbient)
+osg::Vec4f CSVRender::LightingDay::getAmbientColour(osg::Vec4f* defaultAmbient)
 {
     if (defaultAmbient)
         return *defaultAmbient;
diff --git a/apps/opencs/view/render/lightingday.hpp b/apps/opencs/view/render/lightingday.hpp
index eafc6b8e81..fb7ff440b7 100644
--- a/apps/opencs/view/render/lightingday.hpp
+++ b/apps/opencs/view/render/lightingday.hpp
@@ -7,15 +7,14 @@ namespace CSVRender
 {
     class LightingDay : public Lighting
     {
-        public:
+    public:
+        LightingDay();
 
-            LightingDay();
+        void activate(osg::Group* rootNode, bool /*isExterior*/) override;
 
-            void activate (osg::Group* rootNode, bool /*isExterior*/) override;
+        void deactivate() override;
 
-            void deactivate() override;
-
-            osg::Vec4f getAmbientColour(osg::Vec4f *defaultAmbient) override;
+        osg::Vec4f getAmbientColour(osg::Vec4f* defaultAmbient) override;
     };
 }
 
diff --git a/apps/opencs/view/render/lightingnight.cpp b/apps/opencs/view/render/lightingnight.cpp
index fbebb46a11..80aac5b7f4 100644
--- a/apps/opencs/view/render/lightingnight.cpp
+++ b/apps/opencs/view/render/lightingnight.cpp
@@ -4,13 +4,13 @@
 
 CSVRender::LightingNight::LightingNight() {}
 
-void CSVRender::LightingNight::activate (osg::Group* rootNode, bool isExterior)
+void CSVRender::LightingNight::activate(osg::Group* rootNode, bool isExterior)
 {
     mRootNode = rootNode;
 
     mLightSource = new osg::LightSource;
 
-    osg::ref_ptr<osg::Light> light (new osg::Light);
+    osg::ref_ptr<osg::Light> light(new osg::Light);
     light->setPosition(osg::Vec4f(0.f, 0.f, 1.f, 0.f));
     light->setAmbient(osg::Vec4f(0.f, 0.f, 0.f, 1.f));
     light->setDiffuse(osg::Vec4f(0.2f, 0.2f, 0.2f, 1.f));
@@ -30,7 +30,7 @@ void CSVRender::LightingNight::deactivate()
         mRootNode->removeChild(mLightSource);
 }
 
-osg::Vec4f CSVRender::LightingNight::getAmbientColour(osg::Vec4f *defaultAmbient)
+osg::Vec4f CSVRender::LightingNight::getAmbientColour(osg::Vec4f* defaultAmbient)
 {
     if (defaultAmbient)
         return *defaultAmbient;
diff --git a/apps/opencs/view/render/lightingnight.hpp b/apps/opencs/view/render/lightingnight.hpp
index bfa94ce972..2a4e0f87ff 100644
--- a/apps/opencs/view/render/lightingnight.hpp
+++ b/apps/opencs/view/render/lightingnight.hpp
@@ -7,14 +7,13 @@ namespace CSVRender
 {
     class LightingNight : public Lighting
     {
-        public:
+    public:
+        LightingNight();
 
-            LightingNight();
+        void activate(osg::Group* rootNode, bool isExterior) override;
+        void deactivate() override;
 
-            void activate (osg::Group* rootNode, bool isExterior) override;
-            void deactivate() override;
-
-            osg::Vec4f getAmbientColour(osg::Vec4f *defaultAmbient) override;
+        osg::Vec4f getAmbientColour(osg::Vec4f* defaultAmbient) override;
     };
 }
 
diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index 6ab24928e6..3b2f26504b 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -7,79 +7,76 @@
 #include <osg/Group>
 #include <osg/PositionAttitudeTransform>
 
-#include <osg/ShapeDrawable>
-#include <osg/Shape>
 #include <osg/Geometry>
 #include <osg/PrimitiveSet>
+#include <osg/Shape>
+#include <osg/ShapeDrawable>
 
 #include <osgFX/Scribe>
 
-#include "../../model/world/data.hpp"
-#include "../../model/world/commands.hpp"
-#include "../../model/world/commandmacro.hpp"
-#include "../../model/world/cellcoordinates.hpp"
 #include "../../model/prefs/state.hpp"
+#include "../../model/world/cellcoordinates.hpp"
+#include "../../model/world/commandmacro.hpp"
+#include "../../model/world/commands.hpp"
+#include "../../model/world/data.hpp"
 
 #include <components/debug/debuglog.hpp>
 #include <components/resource/scenemanager.hpp>
-#include <components/sceneutil/lightutil.hpp>
 #include <components/sceneutil/lightmanager.hpp>
+#include <components/sceneutil/lightutil.hpp>
 
 #include "actor.hpp"
 #include "mask.hpp"
 
-
 const float CSVRender::Object::MarkerShaftWidth = 30;
 const float CSVRender::Object::MarkerShaftBaseLength = 70;
 const float CSVRender::Object::MarkerHeadWidth = 50;
 const float CSVRender::Object::MarkerHeadLength = 50;
 
-
 namespace
 {
 
     osg::ref_ptr<osg::Group> createErrorCube()
     {
-        osg::ref_ptr<osg::Box> shape(new osg::Box(osg::Vec3f(0,0,0), 50.f));
+        osg::ref_ptr<osg::Box> shape(new osg::Box(osg::Vec3f(0, 0, 0), 50.f));
         osg::ref_ptr<osg::ShapeDrawable> shapedrawable(new osg::ShapeDrawable);
         shapedrawable->setShape(shape);
 
-        osg::ref_ptr<osg::Group> group (new osg::Group);
+        osg::ref_ptr<osg::Group> group(new osg::Group);
         group->addChild(shapedrawable);
         return group;
     }
 
 }
 
-
-CSVRender::ObjectTag::ObjectTag (Object* object)
-: TagBase (Mask_Reference), mObject (object)
-{}
+CSVRender::ObjectTag::ObjectTag(Object* object)
+    : TagBase(Mask_Reference)
+    , mObject(object)
+{
+}
 
 QString CSVRender::ObjectTag::getToolTip(bool /*hideBasics*/, const WorldspaceHitResult& /*hit*/) const
 {
-    return QString::fromUtf8 (mObject->getReferenceableId().c_str());
+    return QString::fromUtf8(mObject->getReferenceableId().c_str());
 }
 
-
-CSVRender::ObjectMarkerTag::ObjectMarkerTag (Object* object, int axis)
-: ObjectTag (object), mAxis (axis)
-{}
-
-
-void CSVRender::Object::clear()
+CSVRender::ObjectMarkerTag::ObjectMarkerTag(Object* object, int axis)
+    : ObjectTag(object)
+    , mAxis(axis)
 {
 }
 
+void CSVRender::Object::clear() {}
+
 void CSVRender::Object::update()
 {
     clear();
 
     const CSMWorld::RefIdCollection& referenceables = mData.getReferenceables();
     const int TypeIndex = referenceables.findColumnIndex(CSMWorld::Columns::ColumnId_RecordType);
-    const int ModelIndex = referenceables.findColumnIndex (CSMWorld::Columns::ColumnId_Model);
+    const int ModelIndex = referenceables.findColumnIndex(CSMWorld::Columns::ColumnId_Model);
 
-    int index = referenceables.searchId (mReferenceableId);
+    int index = referenceables.searchId(mReferenceableId);
     const ESM::Light* light = nullptr;
 
     mBaseNode->removeChildren(0, mBaseNode->getNumChildren());
@@ -97,7 +94,7 @@ void CSVRender::Object::update()
 
     if (recordType == CSMWorld::UniversalId::Type_Light)
     {
-        light = &dynamic_cast<const CSMWorld::Record<ESM::Light>& >(referenceables.getRecord(index)).get();
+        light = &dynamic_cast<const CSMWorld::Record<ESM::Light>&>(referenceables.getRecord(index)).get();
         if (model.empty())
             model = "marker_light.nif";
     }
@@ -112,7 +109,8 @@ void CSVRender::Object::update()
     {
         if (recordType == CSMWorld::UniversalId::Type_Npc || recordType == CSMWorld::UniversalId::Type_Creature)
         {
-            if (!mActor) mActor = std::make_unique<Actor>(mReferenceableId, mData);
+            if (!mActor)
+                mActor = std::make_unique<Actor>(mReferenceableId, mData);
             mActor->update();
             mBaseNode->addChild(mActor->getBaseNode());
         }
@@ -147,13 +145,14 @@ void CSVRender::Object::adjustTransform()
     ESM::Position position = getPosition();
 
     // position
-    mRootNode->setPosition(mForceBaseToZero ? osg::Vec3() : osg::Vec3f(position.pos[0], position.pos[1], position.pos[2]));
+    mRootNode->setPosition(
+        mForceBaseToZero ? osg::Vec3() : osg::Vec3f(position.pos[0], position.pos[1], position.pos[2]));
 
     // orientation
-    osg::Quat xr (-position.rot[0], osg::Vec3f(1,0,0));
-    osg::Quat yr (-position.rot[1], osg::Vec3f(0,1,0));
-    osg::Quat zr (-position.rot[2], osg::Vec3f(0,0,1));
-    mBaseNode->setAttitude(zr*yr*xr);
+    osg::Quat xr(-position.rot[0], osg::Vec3f(1, 0, 0));
+    osg::Quat yr(-position.rot[1], osg::Vec3f(0, 1, 0));
+    osg::Quat zr(-position.rot[2], osg::Vec3f(0, 0, 1));
+    mBaseNode->setAttitude(zr * yr * xr);
 
     float scale = getScale();
 
@@ -163,141 +162,141 @@ void CSVRender::Object::adjustTransform()
 const CSMWorld::CellRef& CSVRender::Object::getReference() const
 {
     if (mReferenceId.empty())
-        throw std::logic_error ("object does not represent a reference");
+        throw std::logic_error("object does not represent a reference");
 
-    return mData.getReferences().getRecord (mReferenceId).get();
+    return mData.getReferences().getRecord(mReferenceId).get();
 }
 
 void CSVRender::Object::updateMarker()
 {
-    for (int i=0; i<3; ++i)
+    for (int i = 0; i < 3; ++i)
     {
         if (mMarker[i])
         {
-            mRootNode->removeChild (mMarker[i]);
+            mRootNode->removeChild(mMarker[i]);
             mMarker[i] = osg::ref_ptr<osg::Node>();
         }
 
         if (mSelected)
         {
-            if (mSubMode==0)
+            if (mSubMode == 0)
             {
-                mMarker[i] = makeMoveOrScaleMarker (i);
-                mMarker[i]->setUserData(new ObjectMarkerTag (this, i));
+                mMarker[i] = makeMoveOrScaleMarker(i);
+                mMarker[i]->setUserData(new ObjectMarkerTag(this, i));
 
-                mRootNode->addChild (mMarker[i]);
+                mRootNode->addChild(mMarker[i]);
             }
-            else if (mSubMode==1)
+            else if (mSubMode == 1)
             {
-                mMarker[i] = makeRotateMarker (i);
-                mMarker[i]->setUserData(new ObjectMarkerTag (this, i));
+                mMarker[i] = makeRotateMarker(i);
+                mMarker[i]->setUserData(new ObjectMarkerTag(this, i));
 
-                mRootNode->addChild (mMarker[i]);
+                mRootNode->addChild(mMarker[i]);
             }
-            else if (mSubMode==2)
+            else if (mSubMode == 2)
             {
-                mMarker[i] = makeMoveOrScaleMarker (i);
-                mMarker[i]->setUserData(new ObjectMarkerTag (this, i));
+                mMarker[i] = makeMoveOrScaleMarker(i);
+                mMarker[i]->setUserData(new ObjectMarkerTag(this, i));
 
-                mRootNode->addChild (mMarker[i]);
+                mRootNode->addChild(mMarker[i]);
             }
         }
     }
 }
 
-osg::ref_ptr<osg::Node> CSVRender::Object::makeMoveOrScaleMarker (int axis)
+osg::ref_ptr<osg::Node> CSVRender::Object::makeMoveOrScaleMarker(int axis)
 {
-    osg::ref_ptr<osg::Geometry> geometry (new osg::Geometry);
+    osg::ref_ptr<osg::Geometry> geometry(new osg::Geometry);
 
     float shaftLength = MarkerShaftBaseLength + mBaseNode->getBound().radius();
 
     // shaft
-    osg::Vec3Array *vertices = new osg::Vec3Array;
+    osg::Vec3Array* vertices = new osg::Vec3Array;
 
-    for (int i=0; i<2; ++i)
+    for (int i = 0; i < 2; ++i)
     {
         float length = i ? shaftLength : MarkerShaftWidth;
 
-        vertices->push_back (getMarkerPosition (-MarkerShaftWidth/2, -MarkerShaftWidth/2, length, axis));
-        vertices->push_back (getMarkerPosition (-MarkerShaftWidth/2, MarkerShaftWidth/2, length, axis));
-        vertices->push_back (getMarkerPosition (MarkerShaftWidth/2, MarkerShaftWidth/2, length, axis));
-        vertices->push_back (getMarkerPosition (MarkerShaftWidth/2, -MarkerShaftWidth/2, length, axis));
+        vertices->push_back(getMarkerPosition(-MarkerShaftWidth / 2, -MarkerShaftWidth / 2, length, axis));
+        vertices->push_back(getMarkerPosition(-MarkerShaftWidth / 2, MarkerShaftWidth / 2, length, axis));
+        vertices->push_back(getMarkerPosition(MarkerShaftWidth / 2, MarkerShaftWidth / 2, length, axis));
+        vertices->push_back(getMarkerPosition(MarkerShaftWidth / 2, -MarkerShaftWidth / 2, length, axis));
     }
 
     // head backside
-    vertices->push_back (getMarkerPosition (-MarkerHeadWidth/2, -MarkerHeadWidth/2, shaftLength, axis));
-    vertices->push_back (getMarkerPosition (-MarkerHeadWidth/2, MarkerHeadWidth/2, shaftLength, axis));
-    vertices->push_back (getMarkerPosition (MarkerHeadWidth/2, MarkerHeadWidth/2, shaftLength, axis));
-    vertices->push_back (getMarkerPosition (MarkerHeadWidth/2, -MarkerHeadWidth/2, shaftLength, axis));
+    vertices->push_back(getMarkerPosition(-MarkerHeadWidth / 2, -MarkerHeadWidth / 2, shaftLength, axis));
+    vertices->push_back(getMarkerPosition(-MarkerHeadWidth / 2, MarkerHeadWidth / 2, shaftLength, axis));
+    vertices->push_back(getMarkerPosition(MarkerHeadWidth / 2, MarkerHeadWidth / 2, shaftLength, axis));
+    vertices->push_back(getMarkerPosition(MarkerHeadWidth / 2, -MarkerHeadWidth / 2, shaftLength, axis));
 
     // head
-    vertices->push_back (getMarkerPosition (0, 0, shaftLength+MarkerHeadLength, axis));
+    vertices->push_back(getMarkerPosition(0, 0, shaftLength + MarkerHeadLength, axis));
 
-    geometry->setVertexArray (vertices);
+    geometry->setVertexArray(vertices);
 
-    osg::DrawElementsUShort *primitives = new osg::DrawElementsUShort (osg::PrimitiveSet::TRIANGLES, 0);
+    osg::DrawElementsUShort* primitives = new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES, 0);
 
     // shaft
-    for (int i=0; i<4; ++i)
+    for (int i = 0; i < 4; ++i)
     {
-        int i2 = i==3 ? 0 : i+1;
-        primitives->push_back (i);
-        primitives->push_back (4+i);
-        primitives->push_back (i2);
-
-        primitives->push_back (4+i);
-        primitives->push_back (4+i2);
-        primitives->push_back (i2);
+        int i2 = i == 3 ? 0 : i + 1;
+        primitives->push_back(i);
+        primitives->push_back(4 + i);
+        primitives->push_back(i2);
+
+        primitives->push_back(4 + i);
+        primitives->push_back(4 + i2);
+        primitives->push_back(i2);
     }
 
     // cap
-    primitives->push_back (0);
-    primitives->push_back (1);
-    primitives->push_back (2);
+    primitives->push_back(0);
+    primitives->push_back(1);
+    primitives->push_back(2);
 
-    primitives->push_back (2);
-    primitives->push_back (3);
-    primitives->push_back (0);
+    primitives->push_back(2);
+    primitives->push_back(3);
+    primitives->push_back(0);
 
     // head, backside
-    primitives->push_back (0+8);
-    primitives->push_back (1+8);
-    primitives->push_back (2+8);
+    primitives->push_back(0 + 8);
+    primitives->push_back(1 + 8);
+    primitives->push_back(2 + 8);
 
-    primitives->push_back (2+8);
-    primitives->push_back (3+8);
-    primitives->push_back (0+8);
+    primitives->push_back(2 + 8);
+    primitives->push_back(3 + 8);
+    primitives->push_back(0 + 8);
 
-    for (int i=0; i<4; ++i)
+    for (int i = 0; i < 4; ++i)
     {
-        primitives->push_back (12);
-        primitives->push_back (8+(i==3 ? 0 : i+1));
-        primitives->push_back (8+i);
+        primitives->push_back(12);
+        primitives->push_back(8 + (i == 3 ? 0 : i + 1));
+        primitives->push_back(8 + i);
     }
 
-    geometry->addPrimitiveSet (primitives);
+    geometry->addPrimitiveSet(primitives);
 
-    osg::Vec4Array *colours = new osg::Vec4Array;
+    osg::Vec4Array* colours = new osg::Vec4Array;
 
-    for (int i=0; i<8; ++i)
-        colours->push_back (osg::Vec4f (axis==0 ? 1.0f : 0.2f, axis==1 ? 1.0f : 0.2f,
-            axis==2 ? 1.0f : 0.2f, mMarkerTransparency));
+    for (int i = 0; i < 8; ++i)
+        colours->push_back(
+            osg::Vec4f(axis == 0 ? 1.0f : 0.2f, axis == 1 ? 1.0f : 0.2f, axis == 2 ? 1.0f : 0.2f, mMarkerTransparency));
 
-    for (int i=8; i<8+4+1; ++i)
-        colours->push_back (osg::Vec4f (axis==0 ? 1.0f : 0.0f, axis==1 ? 1.0f : 0.0f,
-            axis==2 ? 1.0f : 0.0f, mMarkerTransparency));
+    for (int i = 8; i < 8 + 4 + 1; ++i)
+        colours->push_back(
+            osg::Vec4f(axis == 0 ? 1.0f : 0.0f, axis == 1 ? 1.0f : 0.0f, axis == 2 ? 1.0f : 0.0f, mMarkerTransparency));
 
-    geometry->setColorArray (colours, osg::Array::BIND_PER_VERTEX);
+    geometry->setColorArray(colours, osg::Array::BIND_PER_VERTEX);
 
     setupCommonMarkerState(geometry);
 
-    osg::ref_ptr<osg::Group> group (new osg::Group);
+    osg::ref_ptr<osg::Group> group(new osg::Group);
     group->addChild(geometry);
 
     return group;
 }
 
-osg::ref_ptr<osg::Node> CSVRender::Object::makeRotateMarker (int axis)
+osg::ref_ptr<osg::Node> CSVRender::Object::makeRotateMarker(int axis)
 {
     const float InnerRadius = std::max(MarkerShaftBaseLength, mBaseNode->getBound().radius());
     const float OuterRadius = InnerRadius + MarkerShaftWidth;
@@ -312,24 +311,18 @@ osg::ref_ptr<osg::Node> CSVRender::Object::makeRotateMarker (int axis)
 
     const float Angle = 2 * osg::PI / SegmentCount;
 
-    const unsigned short IndexPattern[IndicesPerSegment] =
-    {
-        0, 4, 5, 0, 5, 1,
-        2, 6, 4, 2, 4, 0,
-        3, 7, 6, 3, 6, 2,
-        1, 5, 7, 1, 7, 3
-    };
-
+    const unsigned short IndexPattern[IndicesPerSegment]
+        = { 0, 4, 5, 0, 5, 1, 2, 6, 4, 2, 4, 0, 3, 7, 6, 3, 6, 2, 1, 5, 7, 1, 7, 3 };
 
     osg::ref_ptr<osg::Geometry> geometry = new osg::Geometry();
 
     osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array(VertexCount);
     osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array(1);
-    osg::ref_ptr<osg::DrawElementsUShort> primitives = new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES,
-        IndexCount);
+    osg::ref_ptr<osg::DrawElementsUShort> primitives
+        = new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES, IndexCount);
 
     // prevent some depth collision issues from overlaps
-    osg::Vec3f offset = getMarkerPosition(0, MarkerShaftWidth/4, 0, axis);
+    osg::Vec3f offset = getMarkerPosition(0, MarkerShaftWidth / 4, 0, axis);
 
     for (size_t i = 0; i < SegmentCount; ++i)
     {
@@ -341,17 +334,14 @@ osg::ref_ptr<osg::Node> CSVRender::Object::makeRotateMarker (int axis)
         float outerX = OuterRadius * std::cos(i * Angle);
         float outerY = OuterRadius * std::sin(i * Angle);
 
-        vertices->at(index++) = getMarkerPosition(innerX, innerY,  MarkerShaftWidth / 2, axis) + offset;
+        vertices->at(index++) = getMarkerPosition(innerX, innerY, MarkerShaftWidth / 2, axis) + offset;
         vertices->at(index++) = getMarkerPosition(innerX, innerY, -MarkerShaftWidth / 2, axis) + offset;
-        vertices->at(index++) = getMarkerPosition(outerX, outerY,  MarkerShaftWidth / 2, axis) + offset;
+        vertices->at(index++) = getMarkerPosition(outerX, outerY, MarkerShaftWidth / 2, axis) + offset;
         vertices->at(index++) = getMarkerPosition(outerX, outerY, -MarkerShaftWidth / 2, axis) + offset;
     }
 
-    colors->at(0) = osg::Vec4f (
-        axis==0 ? 1.0f : 0.2f,
-        axis==1 ? 1.0f : 0.2f,
-        axis==2 ? 1.0f : 0.2f,
-        mMarkerTransparency);
+    colors->at(0)
+        = osg::Vec4f(axis == 0 ? 1.0f : 0.2f, axis == 1 ? 1.0f : 0.2f, axis == 2 ? 1.0f : 0.2f, mMarkerTransparency);
 
     for (size_t i = 0; i < SegmentCount; ++i)
     {
@@ -392,24 +382,35 @@ void CSVRender::Object::setupCommonMarkerState(osg::ref_ptr<osg::Geometry> geome
     state->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
 }
 
-osg::Vec3f CSVRender::Object::getMarkerPosition (float x, float y, float z, int axis)
+osg::Vec3f CSVRender::Object::getMarkerPosition(float x, float y, float z, int axis)
 {
     switch (axis)
     {
-        case 2: return osg::Vec3f (x, y, z);
-        case 0: return osg::Vec3f (z, x, y);
-        case 1: return osg::Vec3f (y, z, x);
+        case 2:
+            return osg::Vec3f(x, y, z);
+        case 0:
+            return osg::Vec3f(z, x, y);
+        case 1:
+            return osg::Vec3f(y, z, x);
 
         default:
 
-            throw std::logic_error ("invalid axis for marker geometry");
+            throw std::logic_error("invalid axis for marker geometry");
     }
 }
 
-CSVRender::Object::Object (CSMWorld::Data& data, osg::Group* parentNode,
-    const std::string& id, bool referenceable, bool forceBaseToZero)
-: mData (data), mBaseNode(nullptr), mSelected(false), mParentNode(parentNode), mResourceSystem(data.getResourceSystem().get()), mForceBaseToZero (forceBaseToZero),
-  mScaleOverride (1), mOverrideFlags (0), mSubMode (-1), mMarkerTransparency(0.5f)
+CSVRender::Object::Object(
+    CSMWorld::Data& data, osg::Group* parentNode, const std::string& id, bool referenceable, bool forceBaseToZero)
+    : mData(data)
+    , mBaseNode(nullptr)
+    , mSelected(false)
+    , mParentNode(parentNode)
+    , mResourceSystem(data.getResourceSystem().get())
+    , mForceBaseToZero(forceBaseToZero)
+    , mScaleOverride(1)
+    , mOverrideFlags(0)
+    , mSubMode(-1)
+    , mMarkerTransparency(0.5f)
 {
     mRootNode = new osg::PositionAttitudeTransform;
 
@@ -420,9 +421,9 @@ CSVRender::Object::Object (CSMWorld::Data& data, osg::Group* parentNode,
 
     mBaseNode->setUserData(new ObjectTag(this));
 
-    mRootNode->addChild (mBaseNode);
+    mRootNode->addChild(mBaseNode);
 
-    parentNode->addChild (mRootNode);
+    parentNode->addChild(mRootNode);
 
     mRootNode->setNodeMask(Mask_Reference);
 
@@ -445,7 +446,7 @@ CSVRender::Object::~Object()
 {
     clear();
 
-    mParentNode->removeChild (mRootNode);
+    mParentNode->removeChild(mRootNode);
 }
 
 void CSVRender::Object::setSelected(bool selected)
@@ -482,14 +483,13 @@ osg::ref_ptr<osg::Group> CSVRender::Object::getBaseNode()
     return mBaseNode;
 }
 
-bool CSVRender::Object::referenceableDataChanged (const QModelIndex& topLeft,
-    const QModelIndex& bottomRight)
+bool CSVRender::Object::referenceableDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     const CSMWorld::RefIdCollection& referenceables = mData.getReferenceables();
 
-    int index = referenceables.searchId (mReferenceableId);
+    int index = referenceables.searchId(mReferenceableId);
 
-    if (index!=-1 && index>=topLeft.row() && index<=bottomRight.row())
+    if (index != -1 && index >= topLeft.row() && index <= bottomRight.row())
     {
         adjustTransform();
         update();
@@ -500,14 +500,13 @@ bool CSVRender::Object::referenceableDataChanged (const QModelIndex& topLeft,
     return false;
 }
 
-bool CSVRender::Object::referenceableAboutToBeRemoved (const QModelIndex& parent, int start,
-    int end)
+bool CSVRender::Object::referenceableAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
     const CSMWorld::RefIdCollection& referenceables = mData.getReferenceables();
 
-    int index = referenceables.searchId (mReferenceableId);
+    int index = referenceables.searchId(mReferenceableId);
 
-    if (index!=-1 && index>=start && index<=end)
+    if (index != -1 && index >= start && index <= end)
     {
         // Deletion of referenceable-type objects is handled outside of Object.
         if (!mReferenceId.empty())
@@ -521,27 +520,24 @@ bool CSVRender::Object::referenceableAboutToBeRemoved (const QModelIndex& parent
     return false;
 }
 
-bool CSVRender::Object::referenceDataChanged (const QModelIndex& topLeft,
-    const QModelIndex& bottomRight)
+bool CSVRender::Object::referenceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     if (mReferenceId.empty())
         return false;
 
     const CSMWorld::RefCollection& references = mData.getReferences();
 
-    int index = references.searchId (mReferenceId);
+    int index = references.searchId(mReferenceId);
 
-    if (index!=-1 && index>=topLeft.row() && index<=bottomRight.row())
+    if (index != -1 && index >= topLeft.row() && index <= bottomRight.row())
     {
-        int columnIndex =
-            references.findColumnIndex (CSMWorld::Columns::ColumnId_ReferenceableId);
+        int columnIndex = references.findColumnIndex(CSMWorld::Columns::ColumnId_ReferenceableId);
 
         adjustTransform();
 
-        if (columnIndex>=topLeft.column() && columnIndex<=bottomRight.row())
+        if (columnIndex >= topLeft.column() && columnIndex <= bottomRight.row())
         {
-            mReferenceableId =
-                references.getData (index, columnIndex).toString().toUtf8().constData();
+            mReferenceableId = references.getData(index, columnIndex).toString().toUtf8().constData();
 
             update();
             updateMarker();
@@ -571,7 +567,7 @@ std::string CSVRender::Object::getReferenceableId() const
 
 osg::ref_ptr<CSVRender::TagBase> CSVRender::Object::getTag() const
 {
-    return static_cast<CSVRender::TagBase *> (mBaseNode->getUserData());
+    return static_cast<CSVRender::TagBase*>(mBaseNode->getUserData());
 }
 
 bool CSVRender::Object::isEdited() const
@@ -579,7 +575,7 @@ bool CSVRender::Object::isEdited() const
     return mOverrideFlags;
 }
 
-void CSVRender::Object::setEdited (int flags)
+void CSVRender::Object::setEdited(int flags)
 {
     bool discard = mOverrideFlags & ~flags;
     int added = flags & ~mOverrideFlags;
@@ -587,11 +583,11 @@ void CSVRender::Object::setEdited (int flags)
     mOverrideFlags = flags;
 
     if (added & Override_Position)
-        for (int i=0; i<3; ++i)
+        for (int i = 0; i < 3; ++i)
             mPositionOverride.pos[i] = getReference().mPos.pos[i];
 
     if (added & Override_Rotation)
-        for (int i=0; i<3; ++i)
+        for (int i = 0; i < 3; ++i)
             mPositionOverride.rot[i] = getReference().mPos.rot[i];
 
     if (added & Override_Scale)
@@ -606,11 +602,11 @@ ESM::Position CSVRender::Object::getPosition() const
     ESM::Position position = getReference().mPos;
 
     if (mOverrideFlags & Override_Position)
-        for (int i=0; i<3; ++i)
+        for (int i = 0; i < 3; ++i)
             position.pos[i] = mPositionOverride.pos[i];
 
     if (mOverrideFlags & Override_Rotation)
-        for (int i=0; i<3; ++i)
+        for (int i = 0; i < 3; ++i)
             position.rot[i] = mPositionOverride.rot[i];
 
     return position;
@@ -621,27 +617,27 @@ float CSVRender::Object::getScale() const
     return (mOverrideFlags & Override_Scale) ? mScaleOverride : getReference().mScale;
 }
 
-void CSVRender::Object::setPosition (const float position[3])
+void CSVRender::Object::setPosition(const float position[3])
 {
     mOverrideFlags |= Override_Position;
 
-    for (int i=0; i<3; ++i)
+    for (int i = 0; i < 3; ++i)
         mPositionOverride.pos[i] = position[i];
 
     adjustTransform();
 }
 
-void CSVRender::Object::setRotation (const float rotation[3])
+void CSVRender::Object::setRotation(const float rotation[3])
 {
     mOverrideFlags |= Override_Rotation;
 
-    for (int i=0; i<3; ++i)
+    for (int i = 0; i < 3; ++i)
         mPositionOverride.rot[i] = rotation[i];
 
     adjustTransform();
 }
 
-void CSVRender::Object::setScale (float scale)
+void CSVRender::Object::setScale(float scale)
 {
     mOverrideFlags |= Override_Scale;
 
@@ -656,80 +652,79 @@ void CSVRender::Object::setMarkerTransparency(float value)
     updateMarker();
 }
 
-void CSVRender::Object::apply (CSMWorld::CommandMacro& commands)
+void CSVRender::Object::apply(CSMWorld::CommandMacro& commands)
 {
     const CSMWorld::RefCollection& collection = mData.getReferences();
-    QAbstractItemModel *model = mData.getTableModel (CSMWorld::UniversalId::Type_References);
+    QAbstractItemModel* model = mData.getTableModel(CSMWorld::UniversalId::Type_References);
 
-    int recordIndex = collection.getIndex (mReferenceId);
+    int recordIndex = collection.getIndex(mReferenceId);
 
     if (mOverrideFlags & Override_Position)
     {
-        //Do cell check first so positions can be compared
+        // Do cell check first so positions can be compared
         const CSMWorld::CellRef& ref = collection.getRecord(recordIndex).get();
 
         if (CSMWorld::CellCoordinates::isExteriorCell(ref.mCell))
         {
             // Find cell index at new position
-            std::pair<int, int> cellIndex = CSMWorld::CellCoordinates::coordinatesToCellIndex(
-                mPositionOverride.pos[0], mPositionOverride.pos[1]);
+            std::pair<int, int> cellIndex
+                = CSMWorld::CellCoordinates::coordinatesToCellIndex(mPositionOverride.pos[0], mPositionOverride.pos[1]);
             std::pair<int, int> originalIndex = ref.getCellIndex();
 
-            int cellColumn = collection.findColumnIndex (static_cast<CSMWorld::Columns::ColumnId> (
-                CSMWorld::Columns::ColumnId_Cell));
-            int origCellColumn = collection.findColumnIndex(static_cast<CSMWorld::Columns::ColumnId> (
-                CSMWorld::Columns::ColumnId_OriginalCell));
+            int cellColumn = collection.findColumnIndex(
+                static_cast<CSMWorld::Columns::ColumnId>(CSMWorld::Columns::ColumnId_Cell));
+            int origCellColumn = collection.findColumnIndex(
+                static_cast<CSMWorld::Columns::ColumnId>(CSMWorld::Columns::ColumnId_OriginalCell));
 
             if (cellIndex != originalIndex)
             {
                 /// \todo figure out worldspace (not important until multiple worldspaces are supported)
                 std::string origCellId = CSMWorld::CellCoordinates(originalIndex).getId("");
-                std::string cellId = CSMWorld::CellCoordinates (cellIndex).getId ("");
+                std::string cellId = CSMWorld::CellCoordinates(cellIndex).getId("");
 
-                commands.push (new CSMWorld::ModifyCommand (*model,
-                    model->index (recordIndex, origCellColumn), QString::fromUtf8 (origCellId.c_str())));
-                commands.push(new CSMWorld::ModifyCommand(*model,
-                    model->index(recordIndex, cellColumn), QString::fromUtf8(cellId.c_str())));
+                commands.push(new CSMWorld::ModifyCommand(
+                    *model, model->index(recordIndex, origCellColumn), QString::fromUtf8(origCellId.c_str())));
+                commands.push(new CSMWorld::ModifyCommand(
+                    *model, model->index(recordIndex, cellColumn), QString::fromUtf8(cellId.c_str())));
                 // NOTE: refnum is not modified for moving a reference to another cell
             }
         }
 
-        for (int i=0; i<3; ++i)
+        for (int i = 0; i < 3; ++i)
         {
-            int column = collection.findColumnIndex (static_cast<CSMWorld::Columns::ColumnId> (
-                CSMWorld::Columns::ColumnId_PositionXPos+i));
+            int column = collection.findColumnIndex(
+                static_cast<CSMWorld::Columns::ColumnId>(CSMWorld::Columns::ColumnId_PositionXPos + i));
 
-            commands.push (new CSMWorld::ModifyCommand (*model,
-                model->index (recordIndex, column), mPositionOverride.pos[i]));
+            commands.push(
+                new CSMWorld::ModifyCommand(*model, model->index(recordIndex, column), mPositionOverride.pos[i]));
         }
     }
 
     if (mOverrideFlags & Override_Rotation)
     {
-        for (int i=0; i<3; ++i)
+        for (int i = 0; i < 3; ++i)
         {
-            int column = collection.findColumnIndex (static_cast<CSMWorld::Columns::ColumnId> (
-                CSMWorld::Columns::ColumnId_PositionXRot+i));
+            int column = collection.findColumnIndex(
+                static_cast<CSMWorld::Columns::ColumnId>(CSMWorld::Columns::ColumnId_PositionXRot + i));
 
-            commands.push (new CSMWorld::ModifyCommand (*model,
-                model->index (recordIndex, column), osg::RadiansToDegrees(mPositionOverride.rot[i])));
+            commands.push(new CSMWorld::ModifyCommand(
+                *model, model->index(recordIndex, column), osg::RadiansToDegrees(mPositionOverride.rot[i])));
         }
     }
 
     if (mOverrideFlags & Override_Scale)
     {
-        int column = collection.findColumnIndex (CSMWorld::Columns::ColumnId_Scale);
+        int column = collection.findColumnIndex(CSMWorld::Columns::ColumnId_Scale);
 
-        commands.push (new CSMWorld::ModifyCommand (*model,
-            model->index (recordIndex, column), mScaleOverride));
+        commands.push(new CSMWorld::ModifyCommand(*model, model->index(recordIndex, column), mScaleOverride));
     }
 
     mOverrideFlags = 0;
 }
 
-void CSVRender::Object::setSubMode (int subMode)
+void CSVRender::Object::setSubMode(int subMode)
 {
-    if (subMode!=mSubMode)
+    if (subMode != mSubMode)
     {
         mSubMode = subMode;
         updateMarker();
diff --git a/apps/opencs/view/render/object.hpp b/apps/opencs/view/render/object.hpp
index 6c477b57d8..47bd09f657 100644
--- a/apps/opencs/view/render/object.hpp
+++ b/apps/opencs/view/render/object.hpp
@@ -4,9 +4,9 @@
 #include <memory>
 #include <string>
 
-#include <osg/ref_ptr>
 #include <osg/Geometry>
 #include <osg/Referenced>
+#include <osg/ref_ptr>
 
 #include <components/esm/defs.hpp>
 
@@ -44,164 +44,158 @@ namespace CSVRender
     class Actor;
     class Object;
 
-    // An object to attach as user data to the osg::Node, allows us to get an Object back from a Node when we are doing a ray query
+    // An object to attach as user data to the osg::Node, allows us to get an Object back from a Node when we are doing
+    // a ray query
     class ObjectTag : public TagBase
     {
-        public:
+    public:
+        ObjectTag(Object* object);
 
-            ObjectTag (Object* object);
+        Object* mObject;
 
-            Object* mObject;
-
-            QString getToolTip (bool hideBasics, const WorldspaceHitResult& hit) const override;
+        QString getToolTip(bool hideBasics, const WorldspaceHitResult& hit) const override;
     };
 
     class ObjectMarkerTag : public ObjectTag
     {
-        public:
-
-            ObjectMarkerTag (Object* object, int axis);
+    public:
+        ObjectMarkerTag(Object* object, int axis);
 
-            int mAxis;
+        int mAxis;
     };
 
     class Object
     {
-        public:
-
-            enum OverrideFlags
-            {
-                Override_Position = 1,
-                Override_Rotation = 2,
-                Override_Scale = 4
-            };
-
-        private:
-
-            static const float MarkerShaftWidth;
-            static const float MarkerShaftBaseLength;
-            static const float MarkerHeadWidth;
-            static const float MarkerHeadLength;
+    public:
+        enum OverrideFlags
+        {
+            Override_Position = 1,
+            Override_Rotation = 2,
+            Override_Scale = 4
+        };
 
-            CSMWorld::Data& mData;
-            std::string mReferenceId;
-            std::string mReferenceableId;
-            osg::ref_ptr<osg::PositionAttitudeTransform> mRootNode;
-            osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
-            osg::ref_ptr<osgFX::Scribe> mOutline;
-            bool mSelected;
-            osg::Group* mParentNode;
-            Resource::ResourceSystem* mResourceSystem;
-            bool mForceBaseToZero;
-            ESM::Position mPositionOverride;
-            float mScaleOverride;
-            int mOverrideFlags;
-            osg::ref_ptr<osg::Node> mMarker[3];
-            int mSubMode;
-            float mMarkerTransparency;
-            std::unique_ptr<Actor> mActor;
+    private:
+        static const float MarkerShaftWidth;
+        static const float MarkerShaftBaseLength;
+        static const float MarkerHeadWidth;
+        static const float MarkerHeadLength;
 
-            /// Not implemented
-            Object (const Object&);
+        CSMWorld::Data& mData;
+        std::string mReferenceId;
+        std::string mReferenceableId;
+        osg::ref_ptr<osg::PositionAttitudeTransform> mRootNode;
+        osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
+        osg::ref_ptr<osgFX::Scribe> mOutline;
+        bool mSelected;
+        osg::Group* mParentNode;
+        Resource::ResourceSystem* mResourceSystem;
+        bool mForceBaseToZero;
+        ESM::Position mPositionOverride;
+        float mScaleOverride;
+        int mOverrideFlags;
+        osg::ref_ptr<osg::Node> mMarker[3];
+        int mSubMode;
+        float mMarkerTransparency;
+        std::unique_ptr<Actor> mActor;
 
-            /// Not implemented
-            Object& operator= (const Object&);
+        /// Not implemented
+        Object(const Object&);
 
-            /// Remove object from node (includes deleting)
-            void clear();
+        /// Not implemented
+        Object& operator=(const Object&);
 
-            /// Update model
-            /// @note Make sure adjustTransform() was called first so world space particles get positioned correctly
-            void update();
+        /// Remove object from node (includes deleting)
+        void clear();
 
-            /// Adjust position, orientation and scale
-            void adjustTransform();
+        /// Update model
+        /// @note Make sure adjustTransform() was called first so world space particles get positioned correctly
+        void update();
 
-            /// Throws an exception if *this was constructed with referenceable
-            const CSMWorld::CellRef& getReference() const;
+        /// Adjust position, orientation and scale
+        void adjustTransform();
 
-            void updateMarker();
+        /// Throws an exception if *this was constructed with referenceable
+        const CSMWorld::CellRef& getReference() const;
 
-            osg::ref_ptr<osg::Node> makeMoveOrScaleMarker (int axis);
-            osg::ref_ptr<osg::Node> makeRotateMarker (int axis);
+        void updateMarker();
 
-            /// Sets up a stateset with properties common to all marker types.
-            void setupCommonMarkerState(osg::ref_ptr<osg::Geometry> geometry);
+        osg::ref_ptr<osg::Node> makeMoveOrScaleMarker(int axis);
+        osg::ref_ptr<osg::Node> makeRotateMarker(int axis);
 
-            osg::Vec3f getMarkerPosition (float x, float y, float z, int axis);
+        /// Sets up a stateset with properties common to all marker types.
+        void setupCommonMarkerState(osg::ref_ptr<osg::Geometry> geometry);
 
-        public:
+        osg::Vec3f getMarkerPosition(float x, float y, float z, int axis);
 
-            Object (CSMWorld::Data& data, osg::Group *cellNode,
-                const std::string& id, bool referenceable,
-                bool forceBaseToZero = false);
-            /// \param forceBaseToZero If this is a reference ignore the coordinates and place
-            /// it at 0, 0, 0 instead.
+    public:
+        Object(CSMWorld::Data& data, osg::Group* cellNode, const std::string& id, bool referenceable,
+            bool forceBaseToZero = false);
+        /// \param forceBaseToZero If this is a reference ignore the coordinates and place
+        /// it at 0, 0, 0 instead.
 
-            ~Object();
+        ~Object();
 
-            /// Mark the object as selected, selected objects show an outline effect
-            void setSelected(bool selected);
+        /// Mark the object as selected, selected objects show an outline effect
+        void setSelected(bool selected);
 
-            bool getSelected() const;
+        bool getSelected() const;
 
-            /// Get object node with GUI graphics
-            osg::ref_ptr<osg::Group> getRootNode();
+        /// Get object node with GUI graphics
+        osg::ref_ptr<osg::Group> getRootNode();
 
-            /// Get object node without GUI graphics
-            osg::ref_ptr<osg::Group> getBaseNode();
+        /// Get object node without GUI graphics
+        osg::ref_ptr<osg::Group> getBaseNode();
 
-            /// \return Did this call result in a modification of the visual representation of
-            /// this object?
-            bool referenceableDataChanged (const QModelIndex& topLeft,
-                const QModelIndex& bottomRight);
+        /// \return Did this call result in a modification of the visual representation of
+        /// this object?
+        bool referenceableDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
-            /// \return Did this call result in a modification of the visual representation of
-            /// this object?
-            bool referenceableAboutToBeRemoved (const QModelIndex& parent, int start, int end);
+        /// \return Did this call result in a modification of the visual representation of
+        /// this object?
+        bool referenceableAboutToBeRemoved(const QModelIndex& parent, int start, int end);
 
-            /// \return Did this call result in a modification of the visual representation of
-            /// this object?
-            bool referenceDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
+        /// \return Did this call result in a modification of the visual representation of
+        /// this object?
+        bool referenceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
-            /// Reloads the underlying asset
-            void reloadAssets();
+        /// Reloads the underlying asset
+        void reloadAssets();
 
-            /// Returns an empty string if this is a refereceable-type object.
-            std::string getReferenceId() const;
+        /// Returns an empty string if this is a refereceable-type object.
+        std::string getReferenceId() const;
 
-            std::string getReferenceableId() const;
+        std::string getReferenceableId() const;
 
-            osg::ref_ptr<TagBase> getTag() const;
+        osg::ref_ptr<TagBase> getTag() const;
 
-            /// Is there currently an editing operation running on this object?
-            bool isEdited() const;
+        /// Is there currently an editing operation running on this object?
+        bool isEdited() const;
 
-            void setEdited (int flags);
+        void setEdited(int flags);
 
-            ESM::Position getPosition() const;
+        ESM::Position getPosition() const;
 
-            float getScale() const;
+        float getScale() const;
 
-            /// Set override position.
-            void setPosition (const float position[3]);
+        /// Set override position.
+        void setPosition(const float position[3]);
 
-            /// Set override rotation
-            void setRotation (const float rotation[3]);
+        /// Set override rotation
+        void setRotation(const float rotation[3]);
 
-            /// Set override scale
-            void setScale (float scale);
+        /// Set override scale
+        void setScale(float scale);
 
-            void setMarkerTransparency(float value);
+        void setMarkerTransparency(float value);
 
-            /// Apply override changes via command and end edit mode
-            void apply (CSMWorld::CommandMacro& commands);
+        /// Apply override changes via command and end edit mode
+        void apply(CSMWorld::CommandMacro& commands);
 
-            void setSubMode (int subMode);
+        void setSubMode(int subMode);
 
-            /// Erase all overrides and restore the visual representation of the object to its
-            /// true state.
-            void reset();
+        /// Erase all overrides and restore the visual representation of the object to its
+        /// true state.
+        void reset();
     };
 }
 
diff --git a/apps/opencs/view/render/orbitcameramode.cpp b/apps/opencs/view/render/orbitcameramode.cpp
index 612efc3b01..670b4af8a1 100644
--- a/apps/opencs/view/render/orbitcameramode.cpp
+++ b/apps/opencs/view/render/orbitcameramode.cpp
@@ -8,21 +8,18 @@
 
 namespace CSVRender
 {
-    OrbitCameraMode::OrbitCameraMode(WorldspaceWidget* worldspaceWidget, const QIcon& icon, const QString& tooltip,
-        QWidget* parent)
+    OrbitCameraMode::OrbitCameraMode(
+        WorldspaceWidget* worldspaceWidget, const QIcon& icon, const QString& tooltip, QWidget* parent)
         : ModeButton(icon, tooltip, parent)
         , mWorldspaceWidget(worldspaceWidget)
         , mCenterOnSelection(nullptr)
     {
         mCenterShortcut = new CSMPrefs::Shortcut("orbit-center-selection", worldspaceWidget);
         mCenterShortcut->enable(false);
-        connect(mCenterShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), 
-                this, &OrbitCameraMode::centerSelection);
+        connect(mCenterShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), this, &OrbitCameraMode::centerSelection);
     }
 
-    OrbitCameraMode::~OrbitCameraMode()
-    {
-    }
+    OrbitCameraMode::~OrbitCameraMode() {}
 
     void OrbitCameraMode::activate(CSVWidget::SceneToolbar* toolbar)
     {
diff --git a/apps/opencs/view/render/orbitcameramode.hpp b/apps/opencs/view/render/orbitcameramode.hpp
index 10bc97b0f1..89fa93d3b8 100644
--- a/apps/opencs/view/render/orbitcameramode.hpp
+++ b/apps/opencs/view/render/orbitcameramode.hpp
@@ -16,27 +16,25 @@ namespace CSVRender
 
     class OrbitCameraMode : public CSVWidget::ModeButton
     {
-            Q_OBJECT
+        Q_OBJECT
 
-        public:
+    public:
+        OrbitCameraMode(WorldspaceWidget* worldspaceWidget, const QIcon& icon, const QString& tooltip = "",
+            QWidget* parent = nullptr);
+        ~OrbitCameraMode();
 
-            OrbitCameraMode(WorldspaceWidget* worldspaceWidget, const QIcon& icon, const QString& tooltip = "",
-                QWidget* parent = nullptr);
-            ~OrbitCameraMode();
+        void activate(CSVWidget::SceneToolbar* toolbar) override;
+        void deactivate(CSVWidget::SceneToolbar* toolbar) override;
+        bool createContextMenu(QMenu* menu) override;
 
-            void activate(CSVWidget::SceneToolbar* toolbar) override;
-            void deactivate(CSVWidget::SceneToolbar* toolbar) override;
-            bool createContextMenu(QMenu* menu) override;
+    private:
+        WorldspaceWidget* mWorldspaceWidget;
+        QAction* mCenterOnSelection;
+        CSMPrefs::Shortcut* mCenterShortcut;
 
-        private:
+    private slots:
 
-            WorldspaceWidget* mWorldspaceWidget;
-            QAction* mCenterOnSelection;
-            CSMPrefs::Shortcut* mCenterShortcut;
-
-        private slots:
-
-            void centerSelection();
+        void centerSelection();
     };
 }
 
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index 6e58af24da..97ff1a9788 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -4,22 +4,21 @@
 #include <sstream>
 #include <string>
 
-
 #include <components/misc/constants.hpp>
 
 #include "../../model/prefs/shortcut.hpp"
 
 #include "../../model/world/idtable.hpp"
 
-#include "../widget/scenetooltoggle2.hpp"
 #include "../widget/scenetoolmode.hpp"
+#include "../widget/scenetooltoggle2.hpp"
 
-#include "editmode.hpp"
-#include "mask.hpp"
 #include "cameracontroller.hpp"
 #include "cellarrow.hpp"
-#include "terraintexturemode.hpp"
+#include "editmode.hpp"
+#include "mask.hpp"
 #include "terrainshapemode.hpp"
+#include "terraintexturemode.hpp"
 
 bool CSVRender::PagedWorldspaceWidget::adjustCells()
 {
@@ -29,32 +28,31 @@ bool CSVRender::PagedWorldspaceWidget::adjustCells()
 
     {
         // remove/update
-        std::map<CSMWorld::CellCoordinates, Cell *>::iterator iter (mCells.begin());
+        std::map<CSMWorld::CellCoordinates, Cell*>::iterator iter(mCells.begin());
 
-        while (iter!=mCells.end())
+        while (iter != mCells.end())
         {
-            if (!mSelection.has (iter->first))
+            if (!mSelection.has(iter->first))
             {
                 // remove
                 delete iter->second;
-                mCells.erase (iter++);
+                mCells.erase(iter++);
 
                 modified = true;
             }
             else
             {
                 // update
-                int index = cells.searchId (iter->first.getId (mWorldspace));
+                int index = cells.searchId(iter->first.getId(mWorldspace));
 
-                bool deleted = index==-1 ||
-                    cells.getRecord (index).mState==CSMWorld::RecordBase::State_Deleted;
+                bool deleted = index == -1 || cells.getRecord(index).mState == CSMWorld::RecordBase::State_Deleted;
 
-                if (deleted!=iter->second->isDeleted())
+                if (deleted != iter->second->isDeleted())
                 {
                     modified = true;
 
-                    auto cell = std::make_unique<Cell>(mDocument.getData(), mRootNode,
-                        iter->first.getId (mWorldspace), deleted);
+                    auto cell = std::make_unique<Cell>(
+                        mDocument.getData(), mRootNode, iter->first.getId(mWorldspace), deleted);
 
                     delete iter->second;
                     iter->second = cell.release();
@@ -65,8 +63,8 @@ bool CSVRender::PagedWorldspaceWidget::adjustCells()
 
                     // TODO check if name or region field has changed (cell marker)
                     // FIXME: config setting
-                    //std::string name = cells.getRecord(index).get().mName;
-                    //std::string region = cells.getRecord(index).get().mRegion;
+                    // std::string name = cells.getRecord(index).get().mName;
+                    // std::string region = cells.getRecord(index).get().mRegion;
 
                     modified = true;
                 }
@@ -77,79 +75,79 @@ bool CSVRender::PagedWorldspaceWidget::adjustCells()
     }
 
     // add
-    for (CSMWorld::CellSelection::Iterator iter (mSelection.begin()); iter!=mSelection.end();
-        ++iter)
+    for (CSMWorld::CellSelection::Iterator iter(mSelection.begin()); iter != mSelection.end(); ++iter)
     {
-        if (mCells.find (*iter)==mCells.end())
+        if (mCells.find(*iter) == mCells.end())
         {
-            addCellToScene (*iter);
+            addCellToScene(*iter);
             modified = true;
         }
     }
 
     if (modified)
     {
-        for (std::map<CSMWorld::CellCoordinates, Cell *>::const_iterator iter (mCells.begin());
-            iter!=mCells.end(); ++iter)
+        for (std::map<CSMWorld::CellCoordinates, Cell*>::const_iterator iter(mCells.begin()); iter != mCells.end();
+             ++iter)
         {
             int mask = 0;
 
-            for (int i=CellArrow::Direction_North; i<=CellArrow::Direction_East; i *= 2)
+            for (int i = CellArrow::Direction_North; i <= CellArrow::Direction_East; i *= 2)
             {
-                CSMWorld::CellCoordinates coordinates (iter->second->getCoordinates());
+                CSMWorld::CellCoordinates coordinates(iter->second->getCoordinates());
 
                 switch (i)
                 {
-                    case CellArrow::Direction_North: coordinates = coordinates.move (0, 1); break;
-                    case CellArrow::Direction_West: coordinates = coordinates.move (-1, 0); break;
-                    case CellArrow::Direction_South: coordinates = coordinates.move (0, -1); break;
-                    case CellArrow::Direction_East: coordinates = coordinates.move (1, 0); break;
+                    case CellArrow::Direction_North:
+                        coordinates = coordinates.move(0, 1);
+                        break;
+                    case CellArrow::Direction_West:
+                        coordinates = coordinates.move(-1, 0);
+                        break;
+                    case CellArrow::Direction_South:
+                        coordinates = coordinates.move(0, -1);
+                        break;
+                    case CellArrow::Direction_East:
+                        coordinates = coordinates.move(1, 0);
+                        break;
                 }
 
-                if (!mSelection.has (coordinates))
+                if (!mSelection.has(coordinates))
                     mask |= i;
             }
 
-            iter->second->setCellArrows (mask);
+            iter->second->setCellArrows(mask);
         }
     }
 
     return modified;
 }
 
-void CSVRender::PagedWorldspaceWidget::addVisibilitySelectorButtons (
-    CSVWidget::SceneToolToggle2 *tool)
+void CSVRender::PagedWorldspaceWidget::addVisibilitySelectorButtons(CSVWidget::SceneToolToggle2* tool)
 {
-    WorldspaceWidget::addVisibilitySelectorButtons (tool);
-    tool->addButton (Button_Terrain, Mask_Terrain, "Terrain");
-    tool->addButton (Button_Fog, Mask_Fog, "Fog", "", true);
+    WorldspaceWidget::addVisibilitySelectorButtons(tool);
+    tool->addButton(Button_Terrain, Mask_Terrain, "Terrain");
+    tool->addButton(Button_Fog, Mask_Fog, "Fog", "", true);
 }
 
-void CSVRender::PagedWorldspaceWidget::addEditModeSelectorButtons (
-    CSVWidget::SceneToolMode *tool)
+void CSVRender::PagedWorldspaceWidget::addEditModeSelectorButtons(CSVWidget::SceneToolMode* tool)
 {
-    WorldspaceWidget::addEditModeSelectorButtons (tool);
+    WorldspaceWidget::addEditModeSelectorButtons(tool);
 
     /// \todo replace EditMode with suitable subclasses
-    tool->addButton (
-        new TerrainShapeMode (this, mRootNode, tool), "terrain-shape");
-    tool->addButton (
-        new TerrainTextureMode (this, mRootNode, tool), "terrain-texture");
-    tool->addButton (
-        new EditMode (this, QIcon (":placeholder"), Mask_Reference, "Terrain vertex paint editing"),
-        "terrain-vertex");
-    tool->addButton (
-        new EditMode (this, QIcon (":placeholder"), Mask_Reference, "Terrain movement"),
-        "terrain-move");
+    tool->addButton(new TerrainShapeMode(this, mRootNode, tool), "terrain-shape");
+    tool->addButton(new TerrainTextureMode(this, mRootNode, tool), "terrain-texture");
+    tool->addButton(
+        new EditMode(this, QIcon(":placeholder"), Mask_Reference, "Terrain vertex paint editing"), "terrain-vertex");
+    tool->addButton(new EditMode(this, QIcon(":placeholder"), Mask_Reference, "Terrain movement"), "terrain-move");
 }
 
-void CSVRender::PagedWorldspaceWidget::handleInteractionPress (const WorldspaceHitResult& hit, InteractionType type)
+void CSVRender::PagedWorldspaceWidget::handleInteractionPress(const WorldspaceHitResult& hit, InteractionType type)
 {
-    if (hit.tag && hit.tag->getMask()==Mask_CellArrow)
+    if (hit.tag && hit.tag->getMask() == Mask_CellArrow)
     {
-        if (CellArrowTag *cellArrowTag = dynamic_cast<CSVRender::CellArrowTag *> (hit.tag.get()))
+        if (CellArrowTag* cellArrowTag = dynamic_cast<CSVRender::CellArrowTag*>(hit.tag.get()))
         {
-            CellArrow *arrow = cellArrowTag->getCellArrow();
+            CellArrow* arrow = cellArrowTag->getCellArrow();
 
             CSMWorld::CellCoordinates coordinates = arrow->getCoordinates();
 
@@ -160,41 +158,49 @@ void CSVRender::PagedWorldspaceWidget::handleInteractionPress (const WorldspaceH
 
             switch (direction)
             {
-                case CellArrow::Direction_North: y = 1; break;
-                case CellArrow::Direction_West: x = -1; break;
-                case CellArrow::Direction_South: y = -1; break;
-                case CellArrow::Direction_East: x = 1; break;
+                case CellArrow::Direction_North:
+                    y = 1;
+                    break;
+                case CellArrow::Direction_West:
+                    x = -1;
+                    break;
+                case CellArrow::Direction_South:
+                    y = -1;
+                    break;
+                case CellArrow::Direction_East:
+                    x = 1;
+                    break;
             }
 
             bool modified = false;
 
             if (type == InteractionType_PrimarySelect)
             {
-                addCellSelection (x, y);
+                addCellSelection(x, y);
                 modified = true;
             }
             else if (type == InteractionType_SecondarySelect)
             {
-                moveCellSelection (x, y);
+                moveCellSelection(x, y);
                 modified = true;
             }
             else // Primary/SecondaryEdit
             {
-                CSMWorld::CellCoordinates newCoordinates = coordinates.move (x, y);
+                CSMWorld::CellCoordinates newCoordinates = coordinates.move(x, y);
 
-                if (mCells.find (newCoordinates)==mCells.end())
+                if (mCells.find(newCoordinates) == mCells.end())
                 {
-                    addCellToScene (newCoordinates);
-                    mSelection.add (newCoordinates);
+                    addCellToScene(newCoordinates);
+                    mSelection.add(newCoordinates);
                     modified = true;
                 }
 
                 if (type == InteractionType_SecondaryEdit)
                 {
-                    if (mCells.find (coordinates)!=mCells.end())
+                    if (mCells.find(coordinates) != mCells.end())
                     {
-                        removeCellFromScene (coordinates);
-                        mSelection.remove (coordinates);
+                        removeCellFromScene(coordinates);
+                        mSelection.remove(coordinates);
                         modified = true;
                     }
                 }
@@ -207,73 +213,61 @@ void CSVRender::PagedWorldspaceWidget::handleInteractionPress (const WorldspaceH
         }
     }
 
-    WorldspaceWidget::handleInteractionPress (hit, type);
+    WorldspaceWidget::handleInteractionPress(hit, type);
 }
 
-void CSVRender::PagedWorldspaceWidget::referenceableDataChanged (const QModelIndex& topLeft,
-    const QModelIndex& bottomRight)
+void CSVRender::PagedWorldspaceWidget::referenceableDataChanged(
+    const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
-    for (std::map<CSMWorld::CellCoordinates, Cell *>::iterator iter (mCells.begin());
-        iter!=mCells.end(); ++iter)
-        if (iter->second->referenceableDataChanged (topLeft, bottomRight))
+    for (std::map<CSMWorld::CellCoordinates, Cell*>::iterator iter(mCells.begin()); iter != mCells.end(); ++iter)
+        if (iter->second->referenceableDataChanged(topLeft, bottomRight))
             flagAsModified();
 }
 
-void CSVRender::PagedWorldspaceWidget::referenceableAboutToBeRemoved (
-    const QModelIndex& parent, int start, int end)
+void CSVRender::PagedWorldspaceWidget::referenceableAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
-    for (std::map<CSMWorld::CellCoordinates, Cell *>::iterator iter (mCells.begin());
-        iter!=mCells.end(); ++iter)
-        if (iter->second->referenceableAboutToBeRemoved (parent, start, end))
+    for (std::map<CSMWorld::CellCoordinates, Cell*>::iterator iter(mCells.begin()); iter != mCells.end(); ++iter)
+        if (iter->second->referenceableAboutToBeRemoved(parent, start, end))
             flagAsModified();
 }
 
-void CSVRender::PagedWorldspaceWidget::referenceableAdded (const QModelIndex& parent,
-    int start, int end)
+void CSVRender::PagedWorldspaceWidget::referenceableAdded(const QModelIndex& parent, int start, int end)
 {
-    CSMWorld::IdTable& referenceables = dynamic_cast<CSMWorld::IdTable&> (
-        *mDocument.getData().getTableModel (CSMWorld::UniversalId::Type_Referenceables));
+    CSMWorld::IdTable& referenceables = dynamic_cast<CSMWorld::IdTable&>(
+        *mDocument.getData().getTableModel(CSMWorld::UniversalId::Type_Referenceables));
 
-    for (std::map<CSMWorld::CellCoordinates, Cell *>::iterator iter (mCells.begin());
-        iter!=mCells.end(); ++iter)
+    for (std::map<CSMWorld::CellCoordinates, Cell*>::iterator iter(mCells.begin()); iter != mCells.end(); ++iter)
     {
-        QModelIndex topLeft = referenceables.index (start, 0);
-        QModelIndex bottomRight =
-            referenceables.index (end, referenceables.columnCount());
+        QModelIndex topLeft = referenceables.index(start, 0);
+        QModelIndex bottomRight = referenceables.index(end, referenceables.columnCount());
 
-        if (iter->second->referenceableDataChanged (topLeft, bottomRight))
+        if (iter->second->referenceableDataChanged(topLeft, bottomRight))
             flagAsModified();
     }
 }
 
-void CSVRender::PagedWorldspaceWidget::referenceDataChanged (const QModelIndex& topLeft,
-    const QModelIndex& bottomRight)
+void CSVRender::PagedWorldspaceWidget::referenceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
-    for (std::map<CSMWorld::CellCoordinates, Cell *>::iterator iter (mCells.begin());
-        iter!=mCells.end(); ++iter)
-        if (iter->second->referenceDataChanged (topLeft, bottomRight))
+    for (std::map<CSMWorld::CellCoordinates, Cell*>::iterator iter(mCells.begin()); iter != mCells.end(); ++iter)
+        if (iter->second->referenceDataChanged(topLeft, bottomRight))
             flagAsModified();
 }
 
-void CSVRender::PagedWorldspaceWidget::referenceAboutToBeRemoved (const QModelIndex& parent,
-    int start, int end)
+void CSVRender::PagedWorldspaceWidget::referenceAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
-    for (std::map<CSMWorld::CellCoordinates, Cell *>::iterator iter (mCells.begin());
-        iter!=mCells.end(); ++iter)
-        if (iter->second->referenceAboutToBeRemoved (parent, start, end))
+    for (std::map<CSMWorld::CellCoordinates, Cell*>::iterator iter(mCells.begin()); iter != mCells.end(); ++iter)
+        if (iter->second->referenceAboutToBeRemoved(parent, start, end))
             flagAsModified();
 }
 
-void CSVRender::PagedWorldspaceWidget::referenceAdded (const QModelIndex& parent, int start,
-    int end)
+void CSVRender::PagedWorldspaceWidget::referenceAdded(const QModelIndex& parent, int start, int end)
 {
-    for (std::map<CSMWorld::CellCoordinates, Cell *>::iterator iter (mCells.begin());
-        iter!=mCells.end(); ++iter)
-        if (iter->second->referenceAdded (parent, start, end))
+    for (std::map<CSMWorld::CellCoordinates, Cell*>::iterator iter(mCells.begin()); iter != mCells.end(); ++iter)
+        if (iter->second->referenceAdded(parent, start, end))
             flagAsModified();
 }
 
-void CSVRender::PagedWorldspaceWidget::pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight)
+void CSVRender::PagedWorldspaceWidget::pathgridDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
 
@@ -305,7 +299,7 @@ void CSVRender::PagedWorldspaceWidget::pathgridDataChanged (const QModelIndex& t
     }
 }
 
-void CSVRender::PagedWorldspaceWidget::pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end)
+void CSVRender::PagedWorldspaceWidget::pathgridAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
     const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
 
@@ -329,7 +323,7 @@ void CSVRender::PagedWorldspaceWidget::pathgridAboutToBeRemoved (const QModelInd
 
 void CSVRender::PagedWorldspaceWidget::pathgridAdded(const QModelIndex& parent, int start, int end)
 {
-   const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
 
     if (!parent.isValid())
     {
@@ -348,7 +342,7 @@ void CSVRender::PagedWorldspaceWidget::pathgridAdded(const QModelIndex& parent,
     }
 }
 
-void CSVRender::PagedWorldspaceWidget::landDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight)
+void CSVRender::PagedWorldspaceWidget::landDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     for (int r = topLeft.row(); r <= bottomRight.row(); ++r)
     {
@@ -363,7 +357,7 @@ void CSVRender::PagedWorldspaceWidget::landDataChanged (const QModelIndex& topLe
     }
 }
 
-void CSVRender::PagedWorldspaceWidget::landAboutToBeRemoved (const QModelIndex& parent, int start, int end)
+void CSVRender::PagedWorldspaceWidget::landAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
     for (int r = start; r <= end; ++r)
     {
@@ -378,7 +372,7 @@ void CSVRender::PagedWorldspaceWidget::landAboutToBeRemoved (const QModelIndex&
     }
 }
 
-void CSVRender::PagedWorldspaceWidget::landAdded (const QModelIndex& parent, int start, int end)
+void CSVRender::PagedWorldspaceWidget::landAdded(const QModelIndex& parent, int start, int end)
 {
     for (int r = start; r <= end; ++r)
     {
@@ -393,28 +387,28 @@ void CSVRender::PagedWorldspaceWidget::landAdded (const QModelIndex& parent, int
     }
 }
 
-void CSVRender::PagedWorldspaceWidget::landTextureDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight)
+void CSVRender::PagedWorldspaceWidget::landTextureDataChanged(
+    const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     for (auto cellIt : mCells)
         cellIt.second->landTextureChanged(topLeft, bottomRight);
     flagAsModified();
 }
 
-void CSVRender::PagedWorldspaceWidget::landTextureAboutToBeRemoved (const QModelIndex& parent, int start, int end)
+void CSVRender::PagedWorldspaceWidget::landTextureAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
     for (auto cellIt : mCells)
         cellIt.second->landTextureAboutToBeRemoved(parent, start, end);
     flagAsModified();
 }
 
-void CSVRender::PagedWorldspaceWidget::landTextureAdded (const QModelIndex& parent, int start, int end)
+void CSVRender::PagedWorldspaceWidget::landTextureAdded(const QModelIndex& parent, int start, int end)
 {
     for (auto cellIt : mCells)
         cellIt.second->landTextureAdded(parent, start, end);
     flagAsModified();
 }
 
-
 std::string CSVRender::PagedWorldspaceWidget::getStartupInstruction()
 {
     osg::Vec3d eye, center, up;
@@ -423,82 +417,73 @@ std::string CSVRender::PagedWorldspaceWidget::getStartupInstruction()
 
     std::ostringstream stream;
 
-    stream
-        << "player->position "
-        << position.x() << ", " << position.y() << ", " << position.z()
-        << ", 0";
+    stream << "player->position " << position.x() << ", " << position.y() << ", " << position.z() << ", 0";
 
     return stream.str();
 }
 
-void CSVRender::PagedWorldspaceWidget::addCellToScene (
-    const CSMWorld::CellCoordinates& coordinates)
+void CSVRender::PagedWorldspaceWidget::addCellToScene(const CSMWorld::CellCoordinates& coordinates)
 {
     const CSMWorld::IdCollection<CSMWorld::Cell>& cells = mDocument.getData().getCells();
 
-    int index = cells.searchId (coordinates.getId (mWorldspace));
+    int index = cells.searchId(coordinates.getId(mWorldspace));
 
-    bool deleted = index==-1 ||
-        cells.getRecord (index).mState==CSMWorld::RecordBase::State_Deleted;
+    bool deleted = index == -1 || cells.getRecord(index).mState == CSMWorld::RecordBase::State_Deleted;
 
-    auto cell = std::make_unique<Cell>(mDocument.getData(), mRootNode, coordinates.getId (mWorldspace), deleted);
-    EditMode *editMode = getEditMode();
-    cell->setSubMode (editMode->getSubMode(), editMode->getInteractionMask());
+    auto cell = std::make_unique<Cell>(mDocument.getData(), mRootNode, coordinates.getId(mWorldspace), deleted);
+    EditMode* editMode = getEditMode();
+    cell->setSubMode(editMode->getSubMode(), editMode->getInteractionMask());
 
-    mCells.insert (std::make_pair (coordinates, cell.release()));
+    mCells.insert(std::make_pair(coordinates, cell.release()));
 }
 
-void CSVRender::PagedWorldspaceWidget::removeCellFromScene (
-    const CSMWorld::CellCoordinates& coordinates)
+void CSVRender::PagedWorldspaceWidget::removeCellFromScene(const CSMWorld::CellCoordinates& coordinates)
 {
-    std::map<CSMWorld::CellCoordinates, Cell *>::iterator iter = mCells.find (coordinates);
+    std::map<CSMWorld::CellCoordinates, Cell*>::iterator iter = mCells.find(coordinates);
 
-    if (iter!=mCells.end())
+    if (iter != mCells.end())
     {
         delete iter->second;
-        mCells.erase (iter);
+        mCells.erase(iter);
     }
 }
 
-void CSVRender::PagedWorldspaceWidget::addCellSelection (int x, int y)
+void CSVRender::PagedWorldspaceWidget::addCellSelection(int x, int y)
 {
     CSMWorld::CellSelection newSelection = mSelection;
-    newSelection.move (x, y);
+    newSelection.move(x, y);
 
-    for (CSMWorld::CellSelection::Iterator iter (newSelection.begin()); iter!=newSelection.end();
-        ++iter)
+    for (CSMWorld::CellSelection::Iterator iter(newSelection.begin()); iter != newSelection.end(); ++iter)
     {
-        if (mCells.find (*iter)==mCells.end())
+        if (mCells.find(*iter) == mCells.end())
         {
-            addCellToScene (*iter);
-            mSelection.add (*iter);
+            addCellToScene(*iter);
+            mSelection.add(*iter);
         }
     }
 }
 
-void CSVRender::PagedWorldspaceWidget::moveCellSelection (int x, int y)
+void CSVRender::PagedWorldspaceWidget::moveCellSelection(int x, int y)
 {
     CSMWorld::CellSelection newSelection = mSelection;
-    newSelection.move (x, y);
+    newSelection.move(x, y);
 
-    for (CSMWorld::CellSelection::Iterator iter (mSelection.begin()); iter!=mSelection.end();
-        ++iter)
+    for (CSMWorld::CellSelection::Iterator iter(mSelection.begin()); iter != mSelection.end(); ++iter)
     {
-        if (!newSelection.has (*iter))
-            removeCellFromScene (*iter);
+        if (!newSelection.has(*iter))
+            removeCellFromScene(*iter);
     }
 
-    for (CSMWorld::CellSelection::Iterator iter (newSelection.begin()); iter!=newSelection.end();
-        ++iter)
+    for (CSMWorld::CellSelection::Iterator iter(newSelection.begin()); iter != newSelection.end(); ++iter)
     {
-        if (!mSelection.has (*iter))
-            addCellToScene (*iter);
+        if (!mSelection.has(*iter))
+            addCellToScene(*iter);
     }
 
     mSelection = newSelection;
 }
 
-void CSVRender::PagedWorldspaceWidget::addCellToSceneFromCamera (int offsetX, int offsetY)
+void CSVRender::PagedWorldspaceWidget::addCellToSceneFromCamera(int offsetX, int offsetY)
 {
     osg::Vec3f eye, center, up;
     getCamera()->getViewMatrixAsLookAt(eye, center, up);
@@ -517,84 +502,76 @@ void CSVRender::PagedWorldspaceWidget::addCellToSceneFromCamera (int offsetX, in
     }
 }
 
-CSVRender::PagedWorldspaceWidget::PagedWorldspaceWidget (QWidget* parent, CSMDoc::Document& document)
-: WorldspaceWidget (document, parent), mDocument (document), mWorldspace ("std::default"),
-  mControlElements(nullptr), mDisplayCellCoord(true)
+CSVRender::PagedWorldspaceWidget::PagedWorldspaceWidget(QWidget* parent, CSMDoc::Document& document)
+    : WorldspaceWidget(document, parent)
+    , mDocument(document)
+    , mWorldspace("std::default")
+    , mControlElements(nullptr)
+    , mDisplayCellCoord(true)
 {
-    QAbstractItemModel *cells =
-        document.getData().getTableModel (CSMWorld::UniversalId::Type_Cells);
+    QAbstractItemModel* cells = document.getData().getTableModel(CSMWorld::UniversalId::Type_Cells);
 
-    connect (cells, &QAbstractItemModel::dataChanged,
-        this, &PagedWorldspaceWidget::cellDataChanged);
-    connect (cells, &QAbstractItemModel::rowsRemoved,
-        this, &PagedWorldspaceWidget::cellRemoved);
-    connect (cells, &QAbstractItemModel::rowsInserted,
-        this, &PagedWorldspaceWidget::cellAdded);
+    connect(cells, &QAbstractItemModel::dataChanged, this, &PagedWorldspaceWidget::cellDataChanged);
+    connect(cells, &QAbstractItemModel::rowsRemoved, this, &PagedWorldspaceWidget::cellRemoved);
+    connect(cells, &QAbstractItemModel::rowsInserted, this, &PagedWorldspaceWidget::cellAdded);
 
-    connect (&document.getData(), &CSMWorld::Data::assetTablesChanged,
-        this, &PagedWorldspaceWidget::assetTablesChanged);
+    connect(&document.getData(), &CSMWorld::Data::assetTablesChanged, this, &PagedWorldspaceWidget::assetTablesChanged);
 
-    QAbstractItemModel *lands = document.getData().getTableModel (CSMWorld::UniversalId::Type_Lands);
+    QAbstractItemModel* lands = document.getData().getTableModel(CSMWorld::UniversalId::Type_Lands);
 
-    connect (lands, &QAbstractItemModel::dataChanged,
-        this, &PagedWorldspaceWidget::landDataChanged);
-    connect (lands, &QAbstractItemModel::rowsAboutToBeRemoved,
-        this, &PagedWorldspaceWidget::landAboutToBeRemoved);
-    connect (lands, &QAbstractItemModel::rowsInserted,
-        this, &PagedWorldspaceWidget::landAdded);
+    connect(lands, &QAbstractItemModel::dataChanged, this, &PagedWorldspaceWidget::landDataChanged);
+    connect(lands, &QAbstractItemModel::rowsAboutToBeRemoved, this, &PagedWorldspaceWidget::landAboutToBeRemoved);
+    connect(lands, &QAbstractItemModel::rowsInserted, this, &PagedWorldspaceWidget::landAdded);
 
-    QAbstractItemModel *ltexs = document.getData().getTableModel (CSMWorld::UniversalId::Type_LandTextures);
+    QAbstractItemModel* ltexs = document.getData().getTableModel(CSMWorld::UniversalId::Type_LandTextures);
 
-    connect (ltexs, &QAbstractItemModel::dataChanged,
-        this, &PagedWorldspaceWidget::landTextureDataChanged);
-    connect (ltexs, &QAbstractItemModel::rowsAboutToBeRemoved,
-        this, &PagedWorldspaceWidget::landTextureAboutToBeRemoved);
-    connect (ltexs, &QAbstractItemModel::rowsInserted,
-        this, &PagedWorldspaceWidget::landTextureAdded);
+    connect(ltexs, &QAbstractItemModel::dataChanged, this, &PagedWorldspaceWidget::landTextureDataChanged);
+    connect(
+        ltexs, &QAbstractItemModel::rowsAboutToBeRemoved, this, &PagedWorldspaceWidget::landTextureAboutToBeRemoved);
+    connect(ltexs, &QAbstractItemModel::rowsInserted, this, &PagedWorldspaceWidget::landTextureAdded);
 
     // Shortcuts
     CSMPrefs::Shortcut* loadCameraCellShortcut = new CSMPrefs::Shortcut("scene-load-cam-cell", this);
-    connect(loadCameraCellShortcut, qOverload<>(&CSMPrefs::Shortcut::activated),
-        this, &PagedWorldspaceWidget::loadCameraCell);
+    connect(loadCameraCellShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), this,
+        &PagedWorldspaceWidget::loadCameraCell);
 
     CSMPrefs::Shortcut* loadCameraEastCellShortcut = new CSMPrefs::Shortcut("scene-load-cam-eastcell", this);
-    connect(loadCameraEastCellShortcut, qOverload<>(&CSMPrefs::Shortcut::activated),
-        this, &PagedWorldspaceWidget::loadEastCell);
+    connect(loadCameraEastCellShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), this,
+        &PagedWorldspaceWidget::loadEastCell);
 
     CSMPrefs::Shortcut* loadCameraNorthCellShortcut = new CSMPrefs::Shortcut("scene-load-cam-northcell", this);
-    connect(loadCameraNorthCellShortcut, qOverload<>(&CSMPrefs::Shortcut::activated),
-        this, &PagedWorldspaceWidget::loadNorthCell);
+    connect(loadCameraNorthCellShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), this,
+        &PagedWorldspaceWidget::loadNorthCell);
 
     CSMPrefs::Shortcut* loadCameraWestCellShortcut = new CSMPrefs::Shortcut("scene-load-cam-westcell", this);
-    connect(loadCameraWestCellShortcut, qOverload<>(&CSMPrefs::Shortcut::activated),
-        this, &PagedWorldspaceWidget::loadWestCell);
+    connect(loadCameraWestCellShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), this,
+        &PagedWorldspaceWidget::loadWestCell);
 
     CSMPrefs::Shortcut* loadCameraSouthCellShortcut = new CSMPrefs::Shortcut("scene-load-cam-southcell", this);
-    connect(loadCameraSouthCellShortcut, qOverload<>(&CSMPrefs::Shortcut::activated),
-        this, &PagedWorldspaceWidget::loadSouthCell);
+    connect(loadCameraSouthCellShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), this,
+        &PagedWorldspaceWidget::loadSouthCell);
 }
 
 CSVRender::PagedWorldspaceWidget::~PagedWorldspaceWidget()
 {
-    for (std::map<CSMWorld::CellCoordinates, Cell *>::iterator iter (mCells.begin());
-        iter!=mCells.end(); ++iter)
+    for (std::map<CSMWorld::CellCoordinates, Cell*>::iterator iter(mCells.begin()); iter != mCells.end(); ++iter)
     {
         delete iter->second;
     }
 }
 
-void CSVRender::PagedWorldspaceWidget::useViewHint (const std::string& hint)
+void CSVRender::PagedWorldspaceWidget::useViewHint(const std::string& hint)
 {
     if (!hint.empty())
     {
         CSMWorld::CellSelection selection;
 
-        if (hint[0]=='c')
+        if (hint[0] == 'c')
         {
             // syntax: c:#x1 y1; #x2 y2 (number of coordinate pairs can be 0 or larger)
             char ignore;
 
-            std::istringstream stream (hint.c_str());
+            std::istringstream stream(hint.c_str());
             if (stream >> ignore)
             {
                 char ignore1; // : or ;
@@ -604,61 +581,63 @@ void CSVRender::PagedWorldspaceWidget::useViewHint (const std::string& hint)
 
                 // Loop through all the coordinates to add them to selection
                 while (stream >> ignore1 >> ignore2 >> x >> y)
-                    selection.add (CSMWorld::CellCoordinates (x, y));
+                    selection.add(CSMWorld::CellCoordinates(x, y));
 
                 // Mark that camera needs setup
-                mCamPositionSet=false;
+                mCamPositionSet = false;
             }
         }
-        else if (hint[0]=='r')
+        else if (hint[0] == 'r')
         {
             // syntax r:ref#number (e.g. r:ref#100)
             char ignore;
 
-            std::istringstream stream (hint.c_str());
+            std::istringstream stream(hint.c_str());
             if (stream >> ignore) // ignore r
             {
                 char ignore1; // : or ;
 
                 std::string refCode; // ref#number (e.g. ref#100)
 
-                while (stream >> ignore1 >> refCode) {}
+                while (stream >> ignore1 >> refCode)
+                {
+                }
 
-                //Find out cell coordinate
-                CSMWorld::IdTable& references = dynamic_cast<CSMWorld::IdTable&> (
-                    *mDocument.getData().getTableModel (CSMWorld::UniversalId::Type_References));
+                // Find out cell coordinate
+                CSMWorld::IdTable& references = dynamic_cast<CSMWorld::IdTable&>(
+                    *mDocument.getData().getTableModel(CSMWorld::UniversalId::Type_References));
                 int cellColumn = references.findColumnIndex(CSMWorld::Columns::ColumnId_Cell);
                 QVariant cell = references.data(references.getModelIndex(refCode, cellColumn)).value<QVariant>();
                 QString cellqs = cell.toString();
-                std::istringstream streamCellCoord (cellqs.toStdString().c_str());
+                std::istringstream streamCellCoord(cellqs.toStdString().c_str());
 
-                if (streamCellCoord >> ignore) //ignore #
+                if (streamCellCoord >> ignore) // ignore #
                 {
                     // Current coordinate
                     int x, y;
 
                     // Loop through all the coordinates to add them to selection
                     while (streamCellCoord >> x >> y)
-                        selection.add (CSMWorld::CellCoordinates (x, y));
+                        selection.add(CSMWorld::CellCoordinates(x, y));
 
                     // Mark that camera needs setup
-                    mCamPositionSet=false;
+                    mCamPositionSet = false;
                 }
             }
         }
 
-        setCellSelection (selection);
+        setCellSelection(selection);
     }
 }
 
-void CSVRender::PagedWorldspaceWidget::setCellSelection (const CSMWorld::CellSelection& selection)
+void CSVRender::PagedWorldspaceWidget::setCellSelection(const CSMWorld::CellSelection& selection)
 {
     mSelection = selection;
 
     if (adjustCells())
         flagAsModified();
 
-    emit cellSelectionChanged (mSelection);
+    emit cellSelectionChanged(mSelection);
 }
 
 const CSMWorld::CellSelection& CSVRender::PagedWorldspaceWidget::getCellSelection() const
@@ -666,22 +645,22 @@ const CSMWorld::CellSelection& CSVRender::PagedWorldspaceWidget::getCellSelectio
     return mSelection;
 }
 
-std::pair< int, int > CSVRender::PagedWorldspaceWidget::getCoordinatesFromId (const std::string& record) const
+std::pair<int, int> CSVRender::PagedWorldspaceWidget::getCoordinatesFromId(const std::string& record) const
 {
-    std::istringstream stream (record.c_str());
+    std::istringstream stream(record.c_str());
     char ignore;
     int x, y;
     stream >> ignore >> x >> y;
     return std::make_pair(x, y);
 }
 
-bool CSVRender::PagedWorldspaceWidget::handleDrop (
-    const std::vector< CSMWorld::UniversalId >& universalIdData, DropType type)
+bool CSVRender::PagedWorldspaceWidget::handleDrop(
+    const std::vector<CSMWorld::UniversalId>& universalIdData, DropType type)
 {
-    if (WorldspaceWidget::handleDrop (universalIdData, type))
+    if (WorldspaceWidget::handleDrop(universalIdData, type))
         return true;
 
-    if (type!=Type_CellsExterior)
+    if (type != Type_CellsExterior)
         return false;
 
     bool selectionChanged = false;
@@ -704,11 +683,12 @@ bool CSVRender::PagedWorldspaceWidget::handleDrop (
     return true;
 }
 
-CSVRender::WorldspaceWidget::dropRequirments CSVRender::PagedWorldspaceWidget::getDropRequirements (CSVRender::WorldspaceWidget::DropType type) const
+CSVRender::WorldspaceWidget::dropRequirments CSVRender::PagedWorldspaceWidget::getDropRequirements(
+    CSVRender::WorldspaceWidget::DropType type) const
 {
-    dropRequirments requirements = WorldspaceWidget::getDropRequirements (type);
+    dropRequirments requirements = WorldspaceWidget::getDropRequirements(type);
 
-    if (requirements!=ignored)
+    if (requirements != ignored)
         return requirements;
 
     switch (type)
@@ -729,47 +709,44 @@ unsigned int CSVRender::PagedWorldspaceWidget::getVisibilityMask() const
     return WorldspaceWidget::getVisibilityMask() | mControlElements->getSelectionMask();
 }
 
-void CSVRender::PagedWorldspaceWidget::clearSelection (int elementMask)
+void CSVRender::PagedWorldspaceWidget::clearSelection(int elementMask)
 {
-    for (std::map<CSMWorld::CellCoordinates, Cell *>::iterator iter = mCells.begin();
-        iter!=mCells.end(); ++iter)
-        iter->second->setSelection (elementMask, Cell::Selection_Clear);
+    for (std::map<CSMWorld::CellCoordinates, Cell*>::iterator iter = mCells.begin(); iter != mCells.end(); ++iter)
+        iter->second->setSelection(elementMask, Cell::Selection_Clear);
 
     flagAsModified();
 }
 
-void CSVRender::PagedWorldspaceWidget::invertSelection (int elementMask)
+void CSVRender::PagedWorldspaceWidget::invertSelection(int elementMask)
 {
-    for (std::map<CSMWorld::CellCoordinates, Cell *>::iterator iter = mCells.begin();
-        iter!=mCells.end(); ++iter)
-        iter->second->setSelection (elementMask, Cell::Selection_Invert);
+    for (std::map<CSMWorld::CellCoordinates, Cell*>::iterator iter = mCells.begin(); iter != mCells.end(); ++iter)
+        iter->second->setSelection(elementMask, Cell::Selection_Invert);
 
     flagAsModified();
 }
 
-void CSVRender::PagedWorldspaceWidget::selectAll (int elementMask)
+void CSVRender::PagedWorldspaceWidget::selectAll(int elementMask)
 {
-    for (std::map<CSMWorld::CellCoordinates, Cell *>::iterator iter = mCells.begin();
-        iter!=mCells.end(); ++iter)
-        iter->second->setSelection (elementMask, Cell::Selection_All);
+    for (std::map<CSMWorld::CellCoordinates, Cell*>::iterator iter = mCells.begin(); iter != mCells.end(); ++iter)
+        iter->second->setSelection(elementMask, Cell::Selection_All);
 
     flagAsModified();
 }
 
-void CSVRender::PagedWorldspaceWidget::selectAllWithSameParentId (int elementMask)
+void CSVRender::PagedWorldspaceWidget::selectAllWithSameParentId(int elementMask)
 {
-    for (std::map<CSMWorld::CellCoordinates, Cell *>::iterator iter = mCells.begin();
-        iter!=mCells.end(); ++iter)
-        iter->second->selectAllWithSameParentId (elementMask);
+    for (std::map<CSMWorld::CellCoordinates, Cell*>::iterator iter = mCells.begin(); iter != mCells.end(); ++iter)
+        iter->second->selectAllWithSameParentId(elementMask);
 
     flagAsModified();
 }
 
-void CSVRender::PagedWorldspaceWidget::selectInsideCube(const osg::Vec3d& pointA, const osg::Vec3d& pointB, DragMode dragMode)
+void CSVRender::PagedWorldspaceWidget::selectInsideCube(
+    const osg::Vec3d& pointA, const osg::Vec3d& pointB, DragMode dragMode)
 {
     for (auto& cell : mCells)
     {
-        cell.second->selectInsideCube (pointA, pointB, dragMode);
+        cell.second->selectInsideCube(pointA, pointB, dragMode);
     }
 }
 
@@ -777,24 +754,22 @@ void CSVRender::PagedWorldspaceWidget::selectWithinDistance(const osg::Vec3d& po
 {
     for (auto& cell : mCells)
     {
-        cell.second->selectWithinDistance (point, distance, dragMode);
+        cell.second->selectWithinDistance(point, distance, dragMode);
     }
 }
 
-std::string CSVRender::PagedWorldspaceWidget::getCellId (const osg::Vec3f& point) const
+std::string CSVRender::PagedWorldspaceWidget::getCellId(const osg::Vec3f& point) const
 {
-    CSMWorld::CellCoordinates cellCoordinates (
-        static_cast<int> (std::floor (point.x() / Constants::CellSizeInUnits)),
-        static_cast<int> (std::floor (point.y() / Constants::CellSizeInUnits)));
+    CSMWorld::CellCoordinates cellCoordinates(static_cast<int>(std::floor(point.x() / Constants::CellSizeInUnits)),
+        static_cast<int>(std::floor(point.y() / Constants::CellSizeInUnits)));
 
-    return cellCoordinates.getId (mWorldspace);
+    return cellCoordinates.getId(mWorldspace);
 }
 
 CSVRender::Cell* CSVRender::PagedWorldspaceWidget::getCell(const osg::Vec3d& point) const
 {
-    CSMWorld::CellCoordinates coords(
-        static_cast<int> (std::floor (point.x() / Constants::CellSizeInUnits)),
-        static_cast<int> (std::floor (point.y() / Constants::CellSizeInUnits)));
+    CSMWorld::CellCoordinates coords(static_cast<int>(std::floor(point.x() / Constants::CellSizeInUnits)),
+        static_cast<int>(std::floor(point.y() / Constants::CellSizeInUnits)));
 
     std::map<CSMWorld::CellCoordinates, Cell*>::const_iterator searchResult = mCells.find(coords);
     if (searchResult != mCells.end())
@@ -812,14 +787,16 @@ CSVRender::Cell* CSVRender::PagedWorldspaceWidget::getCell(const CSMWorld::CellC
         return nullptr;
 }
 
-void CSVRender::PagedWorldspaceWidget::setCellAlteredHeight(const CSMWorld::CellCoordinates& coords, int inCellX, int inCellY, float height)
+void CSVRender::PagedWorldspaceWidget::setCellAlteredHeight(
+    const CSMWorld::CellCoordinates& coords, int inCellX, int inCellY, float height)
 {
     std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
     if (searchResult != mCells.end())
         searchResult->second->setAlteredHeight(inCellX, inCellY, height);
 }
 
-float* CSVRender::PagedWorldspaceWidget::getCellAlteredHeight(const CSMWorld::CellCoordinates& coords, int inCellX, int inCellY)
+float* CSVRender::PagedWorldspaceWidget::getCellAlteredHeight(
+    const CSMWorld::CellCoordinates& coords, int inCellX, int inCellY)
 {
     std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
     if (searchResult != mCells.end())
@@ -833,89 +810,80 @@ void CSVRender::PagedWorldspaceWidget::resetAllAlteredHeights()
         cell.second->resetAlteredHeights();
 }
 
-std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::PagedWorldspaceWidget::getSelection (
+std::vector<osg::ref_ptr<CSVRender::TagBase>> CSVRender::PagedWorldspaceWidget::getSelection(
     unsigned int elementMask) const
 {
-    std::vector<osg::ref_ptr<CSVRender::TagBase> > result;
+    std::vector<osg::ref_ptr<CSVRender::TagBase>> result;
 
-    for (std::map<CSMWorld::CellCoordinates, Cell *>::const_iterator iter = mCells.begin();
-        iter!=mCells.end(); ++iter)
+    for (std::map<CSMWorld::CellCoordinates, Cell*>::const_iterator iter = mCells.begin(); iter != mCells.end(); ++iter)
     {
-        std::vector<osg::ref_ptr<CSVRender::TagBase> > cellResult =
-            iter->second->getSelection (elementMask);
+        std::vector<osg::ref_ptr<CSVRender::TagBase>> cellResult = iter->second->getSelection(elementMask);
 
-        result.insert (result.end(), cellResult.begin(), cellResult.end());
+        result.insert(result.end(), cellResult.begin(), cellResult.end());
     }
 
     return result;
 }
 
-std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::PagedWorldspaceWidget::getEdited (
+std::vector<osg::ref_ptr<CSVRender::TagBase>> CSVRender::PagedWorldspaceWidget::getEdited(
     unsigned int elementMask) const
 {
-    std::vector<osg::ref_ptr<CSVRender::TagBase> > result;
+    std::vector<osg::ref_ptr<CSVRender::TagBase>> result;
 
-    for (std::map<CSMWorld::CellCoordinates, Cell *>::const_iterator iter = mCells.begin();
-        iter!=mCells.end(); ++iter)
+    for (std::map<CSMWorld::CellCoordinates, Cell*>::const_iterator iter = mCells.begin(); iter != mCells.end(); ++iter)
     {
-        std::vector<osg::ref_ptr<CSVRender::TagBase> > cellResult =
-            iter->second->getEdited (elementMask);
+        std::vector<osg::ref_ptr<CSVRender::TagBase>> cellResult = iter->second->getEdited(elementMask);
 
-        result.insert (result.end(), cellResult.begin(), cellResult.end());
+        result.insert(result.end(), cellResult.begin(), cellResult.end());
     }
 
     return result;
 }
 
-void CSVRender::PagedWorldspaceWidget::setSubMode (int subMode, unsigned int elementMask)
+void CSVRender::PagedWorldspaceWidget::setSubMode(int subMode, unsigned int elementMask)
 {
-    for (std::map<CSMWorld::CellCoordinates, Cell *>::const_iterator iter = mCells.begin();
-        iter!=mCells.end(); ++iter)
-        iter->second->setSubMode (subMode, elementMask);
+    for (std::map<CSMWorld::CellCoordinates, Cell*>::const_iterator iter = mCells.begin(); iter != mCells.end(); ++iter)
+        iter->second->setSubMode(subMode, elementMask);
 }
 
-void CSVRender::PagedWorldspaceWidget::reset (unsigned int elementMask)
+void CSVRender::PagedWorldspaceWidget::reset(unsigned int elementMask)
 {
-    for (std::map<CSMWorld::CellCoordinates, Cell *>::const_iterator iter = mCells.begin();
-        iter!=mCells.end(); ++iter)
-        iter->second->reset (elementMask);
+    for (std::map<CSMWorld::CellCoordinates, Cell*>::const_iterator iter = mCells.begin(); iter != mCells.end(); ++iter)
+        iter->second->reset(elementMask);
 }
 
-CSVWidget::SceneToolToggle2 *CSVRender::PagedWorldspaceWidget::makeControlVisibilitySelector (
-    CSVWidget::SceneToolbar *parent)
+CSVWidget::SceneToolToggle2* CSVRender::PagedWorldspaceWidget::makeControlVisibilitySelector(
+    CSVWidget::SceneToolbar* parent)
 {
-    mControlElements = new CSVWidget::SceneToolToggle2 (parent,
-        "Controls & Guides Visibility", ":scenetoolbar/scene-view-marker-c", ":scenetoolbar/scene-view-marker-");
+    mControlElements = new CSVWidget::SceneToolToggle2(parent, "Controls & Guides Visibility",
+        ":scenetoolbar/scene-view-marker-c", ":scenetoolbar/scene-view-marker-");
 
-    mControlElements->addButton (1, Mask_CellMarker, "Cell Marker");
-    mControlElements->addButton (2, Mask_CellArrow, "Cell Arrows");
-    mControlElements->addButton (4, Mask_CellBorder, "Cell Border");
+    mControlElements->addButton(1, Mask_CellMarker, "Cell Marker");
+    mControlElements->addButton(2, Mask_CellArrow, "Cell Arrows");
+    mControlElements->addButton(4, Mask_CellBorder, "Cell Border");
 
-    mControlElements->setSelectionMask (0xffffffff);
+    mControlElements->setSelectionMask(0xffffffff);
 
-    connect (mControlElements, &CSVWidget::SceneToolToggle2::selectionChanged,
-        this, &PagedWorldspaceWidget::elementSelectionChanged);
+    connect(mControlElements, &CSVWidget::SceneToolToggle2::selectionChanged, this,
+        &PagedWorldspaceWidget::elementSelectionChanged);
 
     return mControlElements;
 }
 
-void CSVRender::PagedWorldspaceWidget::cellDataChanged (const QModelIndex& topLeft,
-    const QModelIndex& bottomRight)
+void CSVRender::PagedWorldspaceWidget::cellDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     /// \todo check if no selected cell is affected and do not update, if that is the case
     if (adjustCells())
         flagAsModified();
 }
 
-void CSVRender::PagedWorldspaceWidget::cellRemoved (const QModelIndex& parent, int start,
-    int end)
+void CSVRender::PagedWorldspaceWidget::cellRemoved(const QModelIndex& parent, int start, int end)
 {
     if (adjustCells())
         flagAsModified();
 }
 
-void CSVRender::PagedWorldspaceWidget::cellAdded (const QModelIndex& index, int start,
-    int end)
+void CSVRender::PagedWorldspaceWidget::cellAdded(const QModelIndex& index, int start, int end)
 {
     /// \todo check if no selected cell is affected and do not update, if that is the case
     if (adjustCells())
@@ -924,8 +892,8 @@ void CSVRender::PagedWorldspaceWidget::cellAdded (const QModelIndex& index, int
 
 void CSVRender::PagedWorldspaceWidget::assetTablesChanged()
 {
-    std::map<CSMWorld::CellCoordinates, Cell *>::iterator iter = mCells.begin();
-    for ( ; iter != mCells.end(); ++iter)
+    std::map<CSMWorld::CellCoordinates, Cell*>::iterator iter = mCells.begin();
+    for (; iter != mCells.end(); ++iter)
     {
         iter->second->reloadAssets();
     }
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index beab0c575b..697fbb62e4 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -5,14 +5,14 @@
 
 #include "../../model/world/cellselection.hpp"
 
-#include "worldspacewidget.hpp"
 #include "cell.hpp"
 #include "instancedragmodes.hpp"
+#include "worldspacewidget.hpp"
 
 namespace CSVWidget
 {
-   class SceneToolToggle;
-   class SceneToolToggle2;
+    class SceneToolToggle;
+    class SceneToolToggle2;
 }
 
 namespace CSVRender
@@ -22,172 +22,163 @@ namespace CSVRender
 
     class PagedWorldspaceWidget : public WorldspaceWidget
     {
-            Q_OBJECT
-
-            CSMDoc::Document& mDocument;
-            CSMWorld::CellSelection mSelection;
-            std::map<CSMWorld::CellCoordinates, Cell *> mCells;
-            std::string mWorldspace;
-            CSVWidget::SceneToolToggle2 *mControlElements;
-            bool mDisplayCellCoord;
-
-        private:
-
-            std::pair<int, int> getCoordinatesFromId(const std::string& record) const;
-
-            /// Bring mCells into sync with mSelection again.
-            ///
-            /// \return Any cells added or removed?
-            bool adjustCells();
+        Q_OBJECT
 
-            void referenceableDataChanged (const QModelIndex& topLeft,
-                const QModelIndex& bottomRight) override;
+        CSMDoc::Document& mDocument;
+        CSMWorld::CellSelection mSelection;
+        std::map<CSMWorld::CellCoordinates, Cell*> mCells;
+        std::string mWorldspace;
+        CSVWidget::SceneToolToggle2* mControlElements;
+        bool mDisplayCellCoord;
 
-            void referenceableAboutToBeRemoved (const QModelIndex& parent, int start, int end) override;
+    private:
+        std::pair<int, int> getCoordinatesFromId(const std::string& record) const;
 
-            void referenceableAdded (const QModelIndex& index, int start, int end) override;
+        /// Bring mCells into sync with mSelection again.
+        ///
+        /// \return Any cells added or removed?
+        bool adjustCells();
 
-            void referenceDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight) override;
+        void referenceableDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight) override;
 
-            void referenceAboutToBeRemoved (const QModelIndex& parent, int start, int end) override;
+        void referenceableAboutToBeRemoved(const QModelIndex& parent, int start, int end) override;
 
-            void referenceAdded (const QModelIndex& index, int start, int end) override;
+        void referenceableAdded(const QModelIndex& index, int start, int end) override;
 
-            void pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight) override;
+        void referenceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight) override;
 
-            void pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end) override;
+        void referenceAboutToBeRemoved(const QModelIndex& parent, int start, int end) override;
 
-            void pathgridAdded (const QModelIndex& parent, int start, int end) override;
+        void referenceAdded(const QModelIndex& index, int start, int end) override;
 
-            std::string getStartupInstruction() override;
+        void pathgridDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight) override;
 
-            /// \note Does not update the view or any cell marker
-            void addCellToScene (const CSMWorld::CellCoordinates& coordinates);
+        void pathgridAboutToBeRemoved(const QModelIndex& parent, int start, int end) override;
 
-            /// \note Does not update the view or any cell marker
-            ///
-            /// \note Calling this function for a cell that is not in the selection is a no-op.
-            void removeCellFromScene (const CSMWorld::CellCoordinates& coordinates);
+        void pathgridAdded(const QModelIndex& parent, int start, int end) override;
 
-            /// \note Does not update the view or any cell marker
-            void addCellSelection (int x, int y);
+        std::string getStartupInstruction() override;
 
-            /// \note Does not update the view or any cell marker
-            void moveCellSelection (int x, int y);
+        /// \note Does not update the view or any cell marker
+        void addCellToScene(const CSMWorld::CellCoordinates& coordinates);
 
-            void addCellToSceneFromCamera (int offsetX, int offsetY);
+        /// \note Does not update the view or any cell marker
+        ///
+        /// \note Calling this function for a cell that is not in the selection is a no-op.
+        void removeCellFromScene(const CSMWorld::CellCoordinates& coordinates);
 
-        public:
+        /// \note Does not update the view or any cell marker
+        void addCellSelection(int x, int y);
 
-            PagedWorldspaceWidget (QWidget *parent, CSMDoc::Document& document);
-            ///< \note Sets the cell area selection to an invalid value to indicate that currently
-            /// no cells are displayed. The cells to be displayed will be specified later through
-            /// hint system.
+        /// \note Does not update the view or any cell marker
+        void moveCellSelection(int x, int y);
 
-            virtual ~PagedWorldspaceWidget();
+        void addCellToSceneFromCamera(int offsetX, int offsetY);
 
-            /// Decodes the the hint string to set of cell that are rendered.
-            void useViewHint (const std::string& hint) override;
+    public:
+        PagedWorldspaceWidget(QWidget* parent, CSMDoc::Document& document);
+        ///< \note Sets the cell area selection to an invalid value to indicate that currently
+        /// no cells are displayed. The cells to be displayed will be specified later through
+        /// hint system.
 
-            void setCellSelection(const CSMWorld::CellSelection& selection);
+        virtual ~PagedWorldspaceWidget();
 
-            const CSMWorld::CellSelection& getCellSelection() const;
+        /// Decodes the the hint string to set of cell that are rendered.
+        void useViewHint(const std::string& hint) override;
 
-            /// \return Drop handled?
-            bool handleDrop (const std::vector<CSMWorld::UniversalId>& data,
-                DropType type) override;
+        void setCellSelection(const CSMWorld::CellSelection& selection);
 
-            dropRequirments getDropRequirements(DropType type) const override;
+        const CSMWorld::CellSelection& getCellSelection() const;
 
-            /// \attention The created tool is not added to the toolbar (via addTool). Doing
-            /// that is the responsibility of the calling function.
-            virtual CSVWidget::SceneToolToggle2 *makeControlVisibilitySelector (
-                CSVWidget::SceneToolbar *parent);
+        /// \return Drop handled?
+        bool handleDrop(const std::vector<CSMWorld::UniversalId>& data, DropType type) override;
 
-            unsigned int getVisibilityMask() const override;
+        dropRequirments getDropRequirements(DropType type) const override;
 
-            /// \param elementMask Elements to be affected by the clear operation
-            void clearSelection (int elementMask) override;
+        /// \attention The created tool is not added to the toolbar (via addTool). Doing
+        /// that is the responsibility of the calling function.
+        virtual CSVWidget::SceneToolToggle2* makeControlVisibilitySelector(CSVWidget::SceneToolbar* parent);
 
-            /// \param elementMask Elements to be affected by the select operation
-            void invertSelection (int elementMask) override;
+        unsigned int getVisibilityMask() const override;
 
-            /// \param elementMask Elements to be affected by the select operation
-            void selectAll (int elementMask) override;
+        /// \param elementMask Elements to be affected by the clear operation
+        void clearSelection(int elementMask) override;
 
-            // Select everything that references the same ID as at least one of the elements
-            // already selected
-            //
-            /// \param elementMask Elements to be affected by the select operation
-            void selectAllWithSameParentId (int elementMask) override;
+        /// \param elementMask Elements to be affected by the select operation
+        void invertSelection(int elementMask) override;
 
-            void selectInsideCube(const osg::Vec3d& pointA, const osg::Vec3d& pointB, DragMode dragMode) override;
+        /// \param elementMask Elements to be affected by the select operation
+        void selectAll(int elementMask) override;
 
-            void selectWithinDistance(const osg::Vec3d& point, float distance, DragMode dragMode) override;
+        // Select everything that references the same ID as at least one of the elements
+        // already selected
+        //
+        /// \param elementMask Elements to be affected by the select operation
+        void selectAllWithSameParentId(int elementMask) override;
 
-            std::string getCellId (const osg::Vec3f& point) const override;
+        void selectInsideCube(const osg::Vec3d& pointA, const osg::Vec3d& pointB, DragMode dragMode) override;
 
-            Cell* getCell(const osg::Vec3d& point) const override;
+        void selectWithinDistance(const osg::Vec3d& point, float distance, DragMode dragMode) override;
 
-            Cell* getCell(const CSMWorld::CellCoordinates& coords) const override;
+        std::string getCellId(const osg::Vec3f& point) const override;
 
-            void setCellAlteredHeight(const CSMWorld::CellCoordinates& coords, int inCellX, int inCellY, float height);
+        Cell* getCell(const osg::Vec3d& point) const override;
 
-            float* getCellAlteredHeight(const CSMWorld::CellCoordinates& coords, int inCellX, int inCellY);
+        Cell* getCell(const CSMWorld::CellCoordinates& coords) const override;
 
-            void resetAllAlteredHeights();
+        void setCellAlteredHeight(const CSMWorld::CellCoordinates& coords, int inCellX, int inCellY, float height);
 
-            std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask)
-                const override;
+        float* getCellAlteredHeight(const CSMWorld::CellCoordinates& coords, int inCellX, int inCellY);
 
-            std::vector<osg::ref_ptr<TagBase> > getEdited (unsigned int elementMask)
-                const override;
+        void resetAllAlteredHeights();
 
-            void setSubMode (int subMode, unsigned int elementMask) override;
+        std::vector<osg::ref_ptr<TagBase>> getSelection(unsigned int elementMask) const override;
 
-            /// Erase all overrides and restore the visual representation to its true state.
-            void reset (unsigned int elementMask) override;
+        std::vector<osg::ref_ptr<TagBase>> getEdited(unsigned int elementMask) const override;
 
-        protected:
+        void setSubMode(int subMode, unsigned int elementMask) override;
 
-            void addVisibilitySelectorButtons (CSVWidget::SceneToolToggle2 *tool) override;
+        /// Erase all overrides and restore the visual representation to its true state.
+        void reset(unsigned int elementMask) override;
 
-            void addEditModeSelectorButtons (CSVWidget::SceneToolMode *tool) override;
+    protected:
+        void addVisibilitySelectorButtons(CSVWidget::SceneToolToggle2* tool) override;
 
-            void handleInteractionPress (const WorldspaceHitResult& hit, InteractionType type) override;
+        void addEditModeSelectorButtons(CSVWidget::SceneToolMode* tool) override;
 
-        signals:
+        void handleInteractionPress(const WorldspaceHitResult& hit, InteractionType type) override;
 
-            void cellSelectionChanged (const CSMWorld::CellSelection& selection);
+    signals:
 
-        private slots:
+        void cellSelectionChanged(const CSMWorld::CellSelection& selection);
 
-            virtual void cellDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
+    private slots:
 
-            virtual void cellRemoved (const QModelIndex& parent, int start, int end);
+        virtual void cellDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
-            virtual void cellAdded (const QModelIndex& index, int start, int end);
+        virtual void cellRemoved(const QModelIndex& parent, int start, int end);
 
-            virtual void landDataChanged (const QModelIndex& topLeft, const QModelIndex& botomRight);
-            virtual void landAboutToBeRemoved (const QModelIndex& parent, int start, int end);
-            virtual void landAdded (const QModelIndex& parent, int start, int end);
+        virtual void cellAdded(const QModelIndex& index, int start, int end);
 
-            virtual void landTextureDataChanged (const QModelIndex& topLeft, const QModelIndex& botomRight);
-            virtual void landTextureAboutToBeRemoved (const QModelIndex& parent, int start, int end);
-            virtual void landTextureAdded (const QModelIndex& parent, int start, int end);
+        virtual void landDataChanged(const QModelIndex& topLeft, const QModelIndex& botomRight);
+        virtual void landAboutToBeRemoved(const QModelIndex& parent, int start, int end);
+        virtual void landAdded(const QModelIndex& parent, int start, int end);
 
-            void assetTablesChanged ();
+        virtual void landTextureDataChanged(const QModelIndex& topLeft, const QModelIndex& botomRight);
+        virtual void landTextureAboutToBeRemoved(const QModelIndex& parent, int start, int end);
+        virtual void landTextureAdded(const QModelIndex& parent, int start, int end);
 
-            void loadCameraCell();
+        void assetTablesChanged();
 
-            void loadEastCell();
+        void loadCameraCell();
 
-            void loadNorthCell();
+        void loadEastCell();
 
-            void loadWestCell();
+        void loadNorthCell();
 
-            void loadSouthCell();
+        void loadWestCell();
 
+        void loadSouthCell();
     };
 }
 
diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index a45a4b427e..6de471ba67 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -10,8 +10,8 @@
 
 #include <components/sceneutil/pathgridutil.hpp>
 
-#include "../../model/world/commands.hpp"
 #include "../../model/world/commandmacro.hpp"
+#include "../../model/world/commands.hpp"
 #include "../../model/world/data.hpp"
 #include "../../model/world/idtree.hpp"
 #include "worldspacewidget.hpp"
@@ -20,17 +20,17 @@ namespace CSVRender
 {
     class PathgridNodeCallback : public osg::NodeCallback
     {
-        public:
-
-            void operator()(osg::Node* node, osg::NodeVisitor* nv) override
-            {
-                PathgridTag* tag = static_cast<PathgridTag*>(node->getUserData());
-                tag->getPathgrid()->update();
-            }
+    public:
+        void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+        {
+            PathgridTag* tag = static_cast<PathgridTag*>(node->getUserData());
+            tag->getPathgrid()->update();
+        }
     };
 
     PathgridTag::PathgridTag(Pathgrid* pathgrid)
-        : TagBase(Mask_Pathgrid), mPathgrid(pathgrid)
+        : TagBase(Mask_Pathgrid)
+        , mPathgrid(pathgrid)
     {
     }
 
@@ -68,7 +68,7 @@ namespace CSVRender
     {
         const float CoordScalar = ESM::Land::REAL_SIZE;
 
-        mBaseNode = new osg::PositionAttitudeTransform ();
+        mBaseNode = new osg::PositionAttitudeTransform();
         mBaseNode->setPosition(osg::Vec3f(mCoords.getX() * CoordScalar, mCoords.getY() * CoordScalar, 0.f));
         mBaseNode->setUserData(mTag);
         mBaseNode->setUpdateCallback(new PathgridNodeCallback());
@@ -226,7 +226,8 @@ namespace CSVRender
 
     void Pathgrid::applyPoint(CSMWorld::CommandMacro& commands, const osg::Vec3d& worldPos)
     {
-        CSMWorld::IdTree* model = &dynamic_cast<CSMWorld::IdTree&>(*mData.getTableModel(CSMWorld::UniversalId::Type_Pathgrids));
+        CSMWorld::IdTree* model
+            = &dynamic_cast<CSMWorld::IdTree&>(*mData.getTableModel(CSMWorld::UniversalId::Type_Pathgrids));
 
         const CSMWorld::Pathgrid* source = getPathgridSource();
         if (source)
@@ -237,17 +238,17 @@ namespace CSVRender
             int posY = clampToCell(static_cast<int>(localCoords.y()));
             int posZ = clampToCell(static_cast<int>(localCoords.z()));
 
-            int recordIndex = mPathgridCollection.getIndex (mId);
+            int recordIndex = mPathgridCollection.getIndex(mId);
             int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
 
-            int posXColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
-                CSMWorld::Columns::ColumnId_PathgridPosX);
+            int posXColumn
+                = mPathgridCollection.searchNestedColumnIndex(parentColumn, CSMWorld::Columns::ColumnId_PathgridPosX);
 
-            int posYColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
-                CSMWorld::Columns::ColumnId_PathgridPosY);
+            int posYColumn
+                = mPathgridCollection.searchNestedColumnIndex(parentColumn, CSMWorld::Columns::ColumnId_PathgridPosY);
 
-            int posZColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
-                CSMWorld::Columns::ColumnId_PathgridPosZ);
+            int posZColumn
+                = mPathgridCollection.searchNestedColumnIndex(parentColumn, CSMWorld::Columns::ColumnId_PathgridPosZ);
 
             QModelIndex parent = model->index(recordIndex, parentColumn);
             int row = static_cast<int>(source->mPoints.size());
@@ -304,14 +305,14 @@ namespace CSVRender
             int recordIndex = mPathgridCollection.getIndex(mId);
             int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
 
-            int posXColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
-                CSMWorld::Columns::ColumnId_PathgridPosX);
+            int posXColumn
+                = mPathgridCollection.searchNestedColumnIndex(parentColumn, CSMWorld::Columns::ColumnId_PathgridPosX);
 
-            int posYColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
-                CSMWorld::Columns::ColumnId_PathgridPosY);
+            int posYColumn
+                = mPathgridCollection.searchNestedColumnIndex(parentColumn, CSMWorld::Columns::ColumnId_PathgridPosY);
 
-            int posZColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
-                CSMWorld::Columns::ColumnId_PathgridPosZ);
+            int posZColumn
+                = mPathgridCollection.searchNestedColumnIndex(parentColumn, CSMWorld::Columns::ColumnId_PathgridPosZ);
 
             QModelIndex parent = model->index(recordIndex, parentColumn);
 
@@ -320,14 +321,14 @@ namespace CSVRender
                 const CSMWorld::Pathgrid::Point& point = source->mPoints[mSelected[i]];
                 int row = static_cast<int>(mSelected[i]);
 
-                commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posXColumn, parent),
-                    clampToCell(point.mX + offsetX)));
+                commands.push(new CSMWorld::ModifyCommand(
+                    *model, model->index(row, posXColumn, parent), clampToCell(point.mX + offsetX)));
 
-                commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posYColumn, parent),
-                    clampToCell(point.mY + offsetY)));
+                commands.push(new CSMWorld::ModifyCommand(
+                    *model, model->index(row, posYColumn, parent), clampToCell(point.mY + offsetY)));
 
-                commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posZColumn, parent),
-                    clampToCell(point.mZ + offsetZ)));
+                commands.push(new CSMWorld::ModifyCommand(
+                    *model, model->index(row, posZColumn, parent), clampToCell(point.mZ + offsetZ)));
             }
         }
     }
@@ -358,7 +359,8 @@ namespace CSVRender
         const CSMWorld::Pathgrid* source = getPathgridSource();
         if (source)
         {
-            CSMWorld::IdTree* model = &dynamic_cast<CSMWorld::IdTree&>(*mData.getTableModel(CSMWorld::UniversalId::Type_Pathgrids));
+            CSMWorld::IdTree* model
+                = &dynamic_cast<CSMWorld::IdTree&>(*mData.getTableModel(CSMWorld::UniversalId::Type_Pathgrids));
 
             // Want to remove nodes from end of list first
             std::sort(mSelected.begin(), mSelected.end(), std::greater<int>());
@@ -372,15 +374,15 @@ namespace CSVRender
             }
 
             // Fix/remove edges
-            std::set<int, std::greater<int> > edgeRowsToRemove;
+            std::set<int, std::greater<int>> edgeRowsToRemove;
 
             parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridEdges);
 
-            int edge0Column = mPathgridCollection.searchNestedColumnIndex(parentColumn,
-                CSMWorld::Columns::ColumnId_PathgridEdge0);
+            int edge0Column
+                = mPathgridCollection.searchNestedColumnIndex(parentColumn, CSMWorld::Columns::ColumnId_PathgridEdge0);
 
-            int edge1Column = mPathgridCollection.searchNestedColumnIndex(parentColumn,
-                CSMWorld::Columns::ColumnId_PathgridEdge1);
+            int edge1Column
+                = mPathgridCollection.searchNestedColumnIndex(parentColumn, CSMWorld::Columns::ColumnId_PathgridEdge1);
 
             QModelIndex parent = model->index(recordIndex, parentColumn);
 
@@ -411,19 +413,19 @@ namespace CSVRender
                 if (adjustment0 != 0)
                 {
                     int adjustedEdge = source->mEdges[edge].mV0 + adjustment0;
-                    commands.push(new CSMWorld::ModifyCommand(*model, model->index(edge, edge0Column, parent),
-                        adjustedEdge));
+                    commands.push(
+                        new CSMWorld::ModifyCommand(*model, model->index(edge, edge0Column, parent), adjustedEdge));
                 }
 
                 if (adjustment1 != 0)
                 {
                     int adjustedEdge = source->mEdges[edge].mV1 + adjustment1;
-                    commands.push(new CSMWorld::ModifyCommand(*model, model->index(edge, edge1Column, parent),
-                        adjustedEdge));
+                    commands.push(
+                        new CSMWorld::ModifyCommand(*model, model->index(edge, edge1Column, parent), adjustedEdge));
                 }
             }
 
-            std::set<int, std::greater<int> >::iterator row;
+            std::set<int, std::greater<int>>::iterator row;
             for (row = edgeRowsToRemove.begin(); row != edgeRowsToRemove.end(); ++row)
             {
                 commands.push(new CSMWorld::DeleteNestedCommand(*model, mId, *row, parentColumn));
@@ -439,7 +441,7 @@ namespace CSVRender
         if (source)
         {
             // Want to remove from end of row first
-            std::set<int, std::greater<int> > rowsToRemove;
+            std::set<int, std::greater<int>> rowsToRemove;
             for (size_t i = 0; i <= mSelected.size(); ++i)
             {
                 for (size_t j = i + 1; j < mSelected.size(); ++j)
@@ -458,10 +460,11 @@ namespace CSVRender
                 }
             }
 
-            CSMWorld::IdTree* model = &dynamic_cast<CSMWorld::IdTree&>(*mData.getTableModel(CSMWorld::UniversalId::Type_Pathgrids));
+            CSMWorld::IdTree* model
+                = &dynamic_cast<CSMWorld::IdTree&>(*mData.getTableModel(CSMWorld::UniversalId::Type_Pathgrids));
             int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridEdges);
 
-            std::set<int, std::greater<int> >::iterator row;
+            std::set<int, std::greater<int>>::iterator row;
             for (row = rowsToRemove.begin(); row != rowsToRemove.end(); ++row)
             {
                 commands.push(new CSMWorld::DeleteNestedCommand(*model, mId, *row, parentColumn));
@@ -628,19 +631,20 @@ namespace CSVRender
         return -1;
     }
 
-    void Pathgrid::addEdge(CSMWorld::CommandMacro& commands, const CSMWorld::Pathgrid& source, unsigned short node1,
-        unsigned short node2)
+    void Pathgrid::addEdge(
+        CSMWorld::CommandMacro& commands, const CSMWorld::Pathgrid& source, unsigned short node1, unsigned short node2)
     {
-        CSMWorld::IdTree* model = &dynamic_cast<CSMWorld::IdTree&>(*mData.getTableModel(CSMWorld::UniversalId::Type_Pathgrids));
+        CSMWorld::IdTree* model
+            = &dynamic_cast<CSMWorld::IdTree&>(*mData.getTableModel(CSMWorld::UniversalId::Type_Pathgrids));
 
         int recordIndex = mPathgridCollection.getIndex(mId);
         int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridEdges);
 
-        int edge0Column = mPathgridCollection.searchNestedColumnIndex(parentColumn,
-            CSMWorld::Columns::ColumnId_PathgridEdge0);
+        int edge0Column
+            = mPathgridCollection.searchNestedColumnIndex(parentColumn, CSMWorld::Columns::ColumnId_PathgridEdge0);
 
-        int edge1Column = mPathgridCollection.searchNestedColumnIndex(parentColumn,
-            CSMWorld::Columns::ColumnId_PathgridEdge1);
+        int edge1Column
+            = mPathgridCollection.searchNestedColumnIndex(parentColumn, CSMWorld::Columns::ColumnId_PathgridEdge1);
 
         QModelIndex parent = model->index(recordIndex, parentColumn);
         int row = static_cast<int>(source.mEdges.size());
diff --git a/apps/opencs/view/render/pathgrid.hpp b/apps/opencs/view/render/pathgrid.hpp
index ea17942e81..1e3ce081cb 100644
--- a/apps/opencs/view/render/pathgrid.hpp
+++ b/apps/opencs/view/render/pathgrid.hpp
@@ -4,8 +4,8 @@
 #include <vector>
 
 #include <QString>
-#include <osg/ref_ptr>
 #include <osg/Vec3d>
+#include <osg/ref_ptr>
 
 #include "../../model/world/cellcoordinates.hpp"
 #include "../../model/world/subcellcollection.hpp"
@@ -32,103 +32,99 @@ namespace CSVRender
 
     class PathgridTag : public TagBase
     {
-        public:
-
-            PathgridTag (Pathgrid* pathgrid);
+    public:
+        PathgridTag(Pathgrid* pathgrid);
 
-            Pathgrid* getPathgrid () const;
+        Pathgrid* getPathgrid() const;
 
-            QString getToolTip (bool hideBasics, const WorldspaceHitResult& hit) const override;
+        QString getToolTip(bool hideBasics, const WorldspaceHitResult& hit) const override;
 
-        private:
-
-            Pathgrid* mPathgrid;
+    private:
+        Pathgrid* mPathgrid;
     };
 
     class Pathgrid
     {
-        public:
-
-            typedef std::vector<unsigned short> NodeList;
-
-            Pathgrid(CSMWorld::Data& data, osg::Group* parent, const std::string& pathgridId,
-                const CSMWorld::CellCoordinates& coordinates);
+    public:
+        typedef std::vector<unsigned short> NodeList;
 
-            ~Pathgrid();
+        Pathgrid(CSMWorld::Data& data, osg::Group* parent, const std::string& pathgridId,
+            const CSMWorld::CellCoordinates& coordinates);
 
-            const CSMWorld::CellCoordinates& getCoordinates() const;
-            const std::string& getId() const;
+        ~Pathgrid();
 
-            bool isSelected() const;
-            const NodeList& getSelected() const;
-            void selectAll();
-            void toggleSelected(unsigned short node); // Adds to end of vector
-            void invertSelected();
-            void clearSelected();
+        const CSMWorld::CellCoordinates& getCoordinates() const;
+        const std::string& getId() const;
 
-            void moveSelected(const osg::Vec3d& offset);
-            void setDragOrigin(unsigned short node);
-            void setDragEndpoint(unsigned short node);
-            void setDragEndpoint(const osg::Vec3d& pos);
+        bool isSelected() const;
+        const NodeList& getSelected() const;
+        void selectAll();
+        void toggleSelected(unsigned short node); // Adds to end of vector
+        void invertSelected();
+        void clearSelected();
 
-            void resetIndicators();
+        void moveSelected(const osg::Vec3d& offset);
+        void setDragOrigin(unsigned short node);
+        void setDragEndpoint(unsigned short node);
+        void setDragEndpoint(const osg::Vec3d& pos);
 
-            void applyPoint(CSMWorld::CommandMacro& commands, const osg::Vec3d& worldPos);
-            void applyPosition(CSMWorld::CommandMacro& commands);
-            void applyEdge(CSMWorld::CommandMacro& commands, unsigned short node1, unsigned short node2);
-            void applyEdges(CSMWorld::CommandMacro& commands, unsigned short node);
-            void applyRemoveNodes(CSMWorld::CommandMacro& commands);
-            void applyRemoveEdges(CSMWorld::CommandMacro& commands);
+        void resetIndicators();
 
-            osg::ref_ptr<PathgridTag> getTag() const;
+        void applyPoint(CSMWorld::CommandMacro& commands, const osg::Vec3d& worldPos);
+        void applyPosition(CSMWorld::CommandMacro& commands);
+        void applyEdge(CSMWorld::CommandMacro& commands, unsigned short node1, unsigned short node2);
+        void applyEdges(CSMWorld::CommandMacro& commands, unsigned short node);
+        void applyRemoveNodes(CSMWorld::CommandMacro& commands);
+        void applyRemoveEdges(CSMWorld::CommandMacro& commands);
 
-            void recreateGeometry();
-            void removeGeometry();
+        osg::ref_ptr<PathgridTag> getTag() const;
 
-            void update();
+        void recreateGeometry();
+        void removeGeometry();
 
-        private:
+        void update();
 
-            CSMWorld::Data& mData;
-            CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& mPathgridCollection;
-            std::string mId;
-            CSMWorld::CellCoordinates mCoords;
-            bool mInterior;
+    private:
+        CSMWorld::Data& mData;
+        CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& mPathgridCollection;
+        std::string mId;
+        CSMWorld::CellCoordinates mCoords;
+        bool mInterior;
 
-            NodeList mSelected;
-            osg::Vec3d mMoveOffset;
-            unsigned short mDragOrigin;
+        NodeList mSelected;
+        osg::Vec3d mMoveOffset;
+        unsigned short mDragOrigin;
 
-            bool mChangeGeometry;
-            bool mRemoveGeometry;
-            bool mUseOffset;
+        bool mChangeGeometry;
+        bool mRemoveGeometry;
+        bool mUseOffset;
 
-            osg::Group* mParent;
-            osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
-            osg::ref_ptr<osg::Group> mPathgridGroup;
-            osg::ref_ptr<osg::Geometry> mPathgridGeometry;
-            osg::ref_ptr<osg::Geometry> mSelectedGeometry;
-            osg::ref_ptr<osg::Geometry> mDragGeometry;
+        osg::Group* mParent;
+        osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
+        osg::ref_ptr<osg::Group> mPathgridGroup;
+        osg::ref_ptr<osg::Geometry> mPathgridGeometry;
+        osg::ref_ptr<osg::Geometry> mSelectedGeometry;
+        osg::ref_ptr<osg::Geometry> mDragGeometry;
 
-            osg::ref_ptr<PathgridTag> mTag;
+        osg::ref_ptr<PathgridTag> mTag;
 
-            void createGeometry();
-            void createSelectedGeometry();
-            void createSelectedGeometry(const CSMWorld::Pathgrid& source);
-            void removePathgridGeometry();
-            void removeSelectedGeometry();
+        void createGeometry();
+        void createSelectedGeometry();
+        void createSelectedGeometry(const CSMWorld::Pathgrid& source);
+        void removePathgridGeometry();
+        void removeSelectedGeometry();
 
-            void createDragGeometry(const osg::Vec3f& start, const osg::Vec3f& end, bool valid);
+        void createDragGeometry(const osg::Vec3f& start, const osg::Vec3f& end, bool valid);
 
-            const CSMWorld::Pathgrid* getPathgridSource();
+        const CSMWorld::Pathgrid* getPathgridSource();
 
-            int edgeExists(const CSMWorld::Pathgrid& source, unsigned short node1, unsigned short node2);
-            void addEdge(CSMWorld::CommandMacro& commands, const CSMWorld::Pathgrid& source, unsigned short node1,
-                unsigned short node2);
-            void removeEdge(CSMWorld::CommandMacro& commands, const CSMWorld::Pathgrid& source, unsigned short node1,
-                unsigned short node2);
+        int edgeExists(const CSMWorld::Pathgrid& source, unsigned short node1, unsigned short node2);
+        void addEdge(CSMWorld::CommandMacro& commands, const CSMWorld::Pathgrid& source, unsigned short node1,
+            unsigned short node2);
+        void removeEdge(CSMWorld::CommandMacro& commands, const CSMWorld::Pathgrid& source, unsigned short node1,
+            unsigned short node2);
 
-            int clampToCell(int v);
+        int clampToCell(int v);
     };
 }
 
diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index c267f5762d..b5a94fe0e4 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -6,8 +6,8 @@
 
 #include "../../model/prefs/state.hpp"
 
-#include "../../model/world/commands.hpp"
 #include "../../model/world/commandmacro.hpp"
+#include "../../model/world/commands.hpp"
 
 #include "../widget/scenetoolbar.hpp"
 
@@ -20,8 +20,8 @@
 namespace CSVRender
 {
     PathgridMode::PathgridMode(WorldspaceWidget* worldspaceWidget, QWidget* parent)
-        : EditMode(worldspaceWidget, QIcon(":placeholder"), Mask_Pathgrid | Mask_Terrain | Mask_Reference,
-            getTooltip(), parent)
+        : EditMode(worldspaceWidget, QIcon(":placeholder"), Mask_Pathgrid | Mask_Terrain | Mask_Reference, getTooltip(),
+            parent)
         , mDragMode(DragMode_None)
         , mFromNode(0)
         , mSelectionMode(nullptr)
@@ -54,24 +54,22 @@ namespace CSVRender
     {
         if (mSelectionMode)
         {
-            toolbar->removeTool (mSelectionMode);
+            toolbar->removeTool(mSelectionMode);
             delete mSelectionMode;
             mSelectionMode = nullptr;
         }
     }
 
-    void PathgridMode::primaryOpenPressed(const WorldspaceHitResult& hitResult)
-    {
-    }
+    void PathgridMode::primaryOpenPressed(const WorldspaceHitResult& hitResult) {}
 
     void PathgridMode::primaryEditPressed(const WorldspaceHitResult& hitResult)
     {
-        if (CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue() &&
-            dynamic_cast<PathgridTag*>(hitResult.tag.get()))
+        if (CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue()
+            && dynamic_cast<PathgridTag*>(hitResult.tag.get()))
         {
             primarySelectPressed(hitResult);
         }
-        else if (Cell* cell = getWorldspaceWidget().getCell (hitResult.worldPos))
+        else if (Cell* cell = getWorldspaceWidget().getCell(hitResult.worldPos))
         {
             if (cell->getPathgrid())
             {
@@ -144,16 +142,16 @@ namespace CSVRender
 
     bool PathgridMode::primaryEditStartDrag(const QPoint& pos)
     {
-        std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
+        std::vector<osg::ref_ptr<TagBase>> selection = getWorldspaceWidget().getSelection(Mask_Pathgrid);
 
         if (CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue())
         {
-            WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
+            WorldspaceHitResult hit = getWorldspaceWidget().mousePick(pos, getWorldspaceWidget().getInteractionMask());
 
             if (dynamic_cast<PathgridTag*>(hit.tag.get()))
             {
                 primarySelectPressed(hit);
-                selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
+                selection = getWorldspaceWidget().getSelection(Mask_Pathgrid);
             }
         }
 
@@ -168,7 +166,7 @@ namespace CSVRender
 
     bool PathgridMode::secondaryEditStartDrag(const QPoint& pos)
     {
-        WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
+        WorldspaceHitResult hit = getWorldspaceWidget().mousePick(pos, getWorldspaceWidget().getInteractionMask());
         if (hit.tag)
         {
             if (PathgridTag* tag = dynamic_cast<PathgridTag*>(hit.tag.get()))
@@ -189,14 +187,14 @@ namespace CSVRender
     {
         if (mDragMode == DragMode_Move)
         {
-            std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection(Mask_Pathgrid);
+            std::vector<osg::ref_ptr<TagBase>> selection = getWorldspaceWidget().getSelection(Mask_Pathgrid);
 
-            for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it != selection.end(); ++it)
+            for (std::vector<osg::ref_ptr<TagBase>>::iterator it = selection.begin(); it != selection.end(); ++it)
             {
                 if (PathgridTag* tag = dynamic_cast<PathgridTag*>(it->get()))
                 {
                     osg::Vec3d eye, center, up, offset;
-                    getWorldspaceWidget().getCamera()->getViewMatrix().getLookAt (eye, center, up);
+                    getWorldspaceWidget().getCamera()->getViewMatrix().getLookAt(eye, center, up);
 
                     offset = (up * diffY * speedFactor) + (((center - eye) ^ up) * diffX * speedFactor);
 
@@ -206,13 +204,14 @@ namespace CSVRender
         }
         else if (mDragMode == DragMode_Edge)
         {
-            WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
+            WorldspaceHitResult hit = getWorldspaceWidget().mousePick(pos, getWorldspaceWidget().getInteractionMask());
 
             Cell* cell = getWorldspaceWidget().getCell(hit.worldPos);
             if (cell && cell->getPathgrid())
             {
                 PathgridTag* tag = nullptr;
-                if (hit.tag && (tag = dynamic_cast<PathgridTag*>(hit.tag.get())) && tag->getPathgrid()->getId() == mEdgeId)
+                if (hit.tag && (tag = dynamic_cast<PathgridTag*>(hit.tag.get()))
+                    && tag->getPathgrid()->getId() == mEdgeId)
                 {
                     unsigned short node = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
                     cell->getPathgrid()->setDragEndpoint(node);
@@ -221,7 +220,6 @@ namespace CSVRender
                 {
                     cell->getPathgrid()->setDragEndpoint(hit.worldPos);
                 }
-
             }
         }
     }
@@ -230,8 +228,8 @@ namespace CSVRender
     {
         if (mDragMode == DragMode_Move)
         {
-            std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
-            for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it != selection.end(); ++it)
+            std::vector<osg::ref_ptr<TagBase>> selection = getWorldspaceWidget().getSelection(Mask_Pathgrid);
+            for (std::vector<osg::ref_ptr<TagBase>>::iterator it = selection.begin(); it != selection.end(); ++it)
             {
                 if (PathgridTag* tag = dynamic_cast<PathgridTag*>(it->get()))
                 {
diff --git a/apps/opencs/view/render/pathgridmode.hpp b/apps/opencs/view/render/pathgridmode.hpp
index cc61dfe9b0..5273838e5c 100644
--- a/apps/opencs/view/render/pathgridmode.hpp
+++ b/apps/opencs/view/render/pathgridmode.hpp
@@ -11,54 +11,52 @@ namespace CSVRender
 
     class PathgridMode : public EditMode
     {
-            Q_OBJECT
+        Q_OBJECT
 
-        public:
+    public:
+        PathgridMode(WorldspaceWidget* worldspace, QWidget* parent = nullptr);
 
-            PathgridMode(WorldspaceWidget* worldspace, QWidget* parent=nullptr);
+        void activate(CSVWidget::SceneToolbar* toolbar) override;
 
-            void activate(CSVWidget::SceneToolbar* toolbar) override;
+        void deactivate(CSVWidget::SceneToolbar* toolbar) override;
 
-            void deactivate(CSVWidget::SceneToolbar* toolbar) override;
+        void primaryOpenPressed(const WorldspaceHitResult& hit) override;
 
-            void primaryOpenPressed(const WorldspaceHitResult& hit) override;
+        void primaryEditPressed(const WorldspaceHitResult& hit) override;
 
-            void primaryEditPressed(const WorldspaceHitResult& hit) override;
+        void secondaryEditPressed(const WorldspaceHitResult& hit) override;
 
-            void secondaryEditPressed(const WorldspaceHitResult& hit) override;
+        void primarySelectPressed(const WorldspaceHitResult& hit) override;
 
-            void primarySelectPressed(const WorldspaceHitResult& hit) override;
+        void secondarySelectPressed(const WorldspaceHitResult& hit) override;
 
-            void secondarySelectPressed(const WorldspaceHitResult& hit) override;
+        bool primaryEditStartDrag(const QPoint& pos) override;
 
-            bool primaryEditStartDrag (const QPoint& pos) override;
+        bool secondaryEditStartDrag(const QPoint& pos) override;
 
-            bool secondaryEditStartDrag (const QPoint& pos) override;
+        void drag(const QPoint& pos, int diffX, int diffY, double speedFactor) override;
 
-            void drag (const QPoint& pos, int diffX, int diffY, double speedFactor) override;
+        void dragCompleted(const QPoint& pos) override;
 
-            void dragCompleted(const QPoint& pos) override;
+        /// \note dragAborted will not be called, if the drag is aborted via changing
+        /// editing mode
+        void dragAborted() override;
 
-            /// \note dragAborted will not be called, if the drag is aborted via changing
-            /// editing mode
-            void dragAborted() override;
+    private:
+        enum DragMode
+        {
+            DragMode_None,
+            DragMode_Move,
+            DragMode_Edge
+        };
 
-        private:
+        DragMode mDragMode;
+        std::string mLastId, mEdgeId;
+        unsigned short mFromNode;
 
-            enum DragMode
-            {
-                DragMode_None,
-                DragMode_Move,
-                DragMode_Edge
-            };
+        PathgridSelectionMode* mSelectionMode;
 
-            DragMode mDragMode;
-            std::string mLastId, mEdgeId;
-            unsigned short mFromNode;
-
-            PathgridSelectionMode* mSelectionMode;
-
-            QString getTooltip();
+        QString getTooltip();
     };
 }
 
diff --git a/apps/opencs/view/render/pathgridselectionmode.cpp b/apps/opencs/view/render/pathgridselectionmode.cpp
index 6f101add8a..77a232b4e8 100644
--- a/apps/opencs/view/render/pathgridselectionmode.cpp
+++ b/apps/opencs/view/render/pathgridselectionmode.cpp
@@ -1,14 +1,14 @@
 #include "pathgridselectionmode.hpp"
 
-#include <QMenu>
 #include <QAction>
+#include <QMenu>
 
-#include "../../model/world/idtable.hpp"
-#include "../../model/world/commands.hpp"
 #include "../../model/world/commandmacro.hpp"
+#include "../../model/world/commands.hpp"
+#include "../../model/world/idtable.hpp"
 
-#include "worldspacewidget.hpp"
 #include "pathgrid.hpp"
+#include "worldspacewidget.hpp"
 
 namespace CSVRender
 {
@@ -37,9 +37,9 @@ namespace CSVRender
 
     void PathgridSelectionMode::removeSelectedNodes()
     {
-        std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
+        std::vector<osg::ref_ptr<TagBase>> selection = getWorldspaceWidget().getSelection(Mask_Pathgrid);
 
-        for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it != selection.end(); ++it)
+        for (std::vector<osg::ref_ptr<TagBase>>::iterator it = selection.begin(); it != selection.end(); ++it)
         {
             if (PathgridTag* tag = dynamic_cast<PathgridTag*>(it->get()))
             {
@@ -54,9 +54,9 @@ namespace CSVRender
 
     void PathgridSelectionMode::removeSelectedEdges()
     {
-        std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
+        std::vector<osg::ref_ptr<TagBase>> selection = getWorldspaceWidget().getSelection(Mask_Pathgrid);
 
-        for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it != selection.end(); ++it)
+        for (std::vector<osg::ref_ptr<TagBase>>::iterator it = selection.begin(); it != selection.end(); ++it)
         {
             if (PathgridTag* tag = dynamic_cast<PathgridTag*>(it->get()))
             {
diff --git a/apps/opencs/view/render/pathgridselectionmode.hpp b/apps/opencs/view/render/pathgridselectionmode.hpp
index 19bfca803e..1227501ec8 100644
--- a/apps/opencs/view/render/pathgridselectionmode.hpp
+++ b/apps/opencs/view/render/pathgridselectionmode.hpp
@@ -7,31 +7,28 @@ namespace CSVRender
 {
     class PathgridSelectionMode : public SelectionMode
     {
-            Q_OBJECT
+        Q_OBJECT
 
-        public:
+    public:
+        PathgridSelectionMode(CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget);
 
-            PathgridSelectionMode(CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget);
+    protected:
+        /// Add context menu items to \a menu.
+        ///
+        /// \attention menu can be a 0-pointer
+        ///
+        /// \return Have there been any menu items to be added (if menu is 0 and there
+        /// items to be added, the function must return true anyway.
+        bool createContextMenu(QMenu* menu) override;
 
-        protected:
+    private:
+        QAction* mRemoveSelectedNodes;
+        QAction* mRemoveSelectedEdges;
 
-            /// Add context menu items to \a menu.
-            ///
-            /// \attention menu can be a 0-pointer
-            ///
-            /// \return Have there been any menu items to be added (if menu is 0 and there
-            /// items to be added, the function must return true anyway.
-            bool createContextMenu(QMenu* menu) override;
+    private slots:
 
-        private:
-
-            QAction* mRemoveSelectedNodes;
-            QAction* mRemoveSelectedEdges;
-
-        private slots:
-
-            void removeSelectedNodes();
-            void removeSelectedEdges();
+        void removeSelectedNodes();
+        void removeSelectedEdges();
     };
 }
 
diff --git a/apps/opencs/view/render/previewwidget.cpp b/apps/opencs/view/render/previewwidget.cpp
index ee1299dc66..ffc3be193a 100644
--- a/apps/opencs/view/render/previewwidget.cpp
+++ b/apps/opencs/view/render/previewwidget.cpp
@@ -3,71 +3,65 @@
 #include "../../model/world/data.hpp"
 #include "../../model/world/idtable.hpp"
 
-CSVRender::PreviewWidget::PreviewWidget (CSMWorld::Data& data,
-    const std::string& id, bool referenceable, QWidget *parent)
-: SceneWidget (data.getResourceSystem(), parent), mData (data), mObject(data, mRootNode, id, referenceable)
+CSVRender::PreviewWidget::PreviewWidget(
+    CSMWorld::Data& data, const std::string& id, bool referenceable, QWidget* parent)
+    : SceneWidget(data.getResourceSystem(), parent)
+    , mData(data)
+    , mObject(data, mRootNode, id, referenceable)
 {
     selectNavigationMode("orbit");
 
-    QAbstractItemModel *referenceables =
-        mData.getTableModel (CSMWorld::UniversalId::Type_Referenceables);
+    QAbstractItemModel* referenceables = mData.getTableModel(CSMWorld::UniversalId::Type_Referenceables);
 
-    connect (referenceables, &QAbstractItemModel::dataChanged,
-        this, &PreviewWidget::referenceableDataChanged);
-    connect (referenceables, &QAbstractItemModel::rowsAboutToBeRemoved,
-        this, &PreviewWidget::referenceableAboutToBeRemoved);
+    connect(referenceables, &QAbstractItemModel::dataChanged, this, &PreviewWidget::referenceableDataChanged);
+    connect(
+        referenceables, &QAbstractItemModel::rowsAboutToBeRemoved, this, &PreviewWidget::referenceableAboutToBeRemoved);
 
-    connect (&mData, &CSMWorld::Data::assetTablesChanged,
-        this, &PreviewWidget::assetTablesChanged);
+    connect(&mData, &CSMWorld::Data::assetTablesChanged, this, &PreviewWidget::assetTablesChanged);
 
     setExterior(false);
 
     if (!referenceable)
     {
-        QAbstractItemModel *references =
-            mData.getTableModel (CSMWorld::UniversalId::Type_References);
+        QAbstractItemModel* references = mData.getTableModel(CSMWorld::UniversalId::Type_References);
 
-        connect (references, &QAbstractItemModel::dataChanged,
-            this, &PreviewWidget::referenceDataChanged);
-        connect (references, &QAbstractItemModel::rowsAboutToBeRemoved,
-            this, &PreviewWidget::referenceAboutToBeRemoved);
+        connect(references, &QAbstractItemModel::dataChanged, this, &PreviewWidget::referenceDataChanged);
+        connect(references, &QAbstractItemModel::rowsAboutToBeRemoved, this, &PreviewWidget::referenceAboutToBeRemoved);
     }
 }
 
-void CSVRender::PreviewWidget::referenceableDataChanged (const QModelIndex& topLeft,
-    const QModelIndex& bottomRight)
+void CSVRender::PreviewWidget::referenceableDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
-    if (mObject.referenceableDataChanged (topLeft, bottomRight))
+    if (mObject.referenceableDataChanged(topLeft, bottomRight))
         flagAsModified();
 
     if (mObject.getReferenceId().empty())
     {
-        CSMWorld::IdTable& referenceables = dynamic_cast<CSMWorld::IdTable&> (
-            *mData.getTableModel (CSMWorld::UniversalId::Type_Referenceables));
+        CSMWorld::IdTable& referenceables
+            = dynamic_cast<CSMWorld::IdTable&>(*mData.getTableModel(CSMWorld::UniversalId::Type_Referenceables));
 
-        QModelIndex index = referenceables.getModelIndex (mObject.getReferenceableId(),
-            referenceables.findColumnIndex (CSMWorld::Columns::ColumnId_Modification));
+        QModelIndex index = referenceables.getModelIndex(
+            mObject.getReferenceableId(), referenceables.findColumnIndex(CSMWorld::Columns::ColumnId_Modification));
 
-        if (referenceables.data (index).toInt()==CSMWorld::RecordBase::State_Deleted)
+        if (referenceables.data(index).toInt() == CSMWorld::RecordBase::State_Deleted)
             emit closeRequest();
     }
 }
 
-void CSVRender::PreviewWidget::referenceableAboutToBeRemoved (const QModelIndex& parent, int start,
-    int end)
+void CSVRender::PreviewWidget::referenceableAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
-    if (mObject.referenceableAboutToBeRemoved (parent, start, end))
+    if (mObject.referenceableAboutToBeRemoved(parent, start, end))
         flagAsModified();
 
     if (mObject.getReferenceableId().empty())
         return;
 
-    CSMWorld::IdTable& referenceables = dynamic_cast<CSMWorld::IdTable&> (
-        *mData.getTableModel (CSMWorld::UniversalId::Type_Referenceables));
+    CSMWorld::IdTable& referenceables
+        = dynamic_cast<CSMWorld::IdTable&>(*mData.getTableModel(CSMWorld::UniversalId::Type_Referenceables));
 
-    QModelIndex index = referenceables.getModelIndex (mObject.getReferenceableId(), 0);
+    QModelIndex index = referenceables.getModelIndex(mObject.getReferenceableId(), 0);
 
-    if (index.row()>=start && index.row()<=end)
+    if (index.row() >= start && index.row() <= end)
     {
         if (mObject.getReferenceId().empty())
         {
@@ -77,55 +71,53 @@ void CSVRender::PreviewWidget::referenceableAboutToBeRemoved (const QModelIndex&
     }
 }
 
-void CSVRender::PreviewWidget::referenceDataChanged (const QModelIndex& topLeft,
-    const QModelIndex& bottomRight)
+void CSVRender::PreviewWidget::referenceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
-    if (mObject.referenceDataChanged (topLeft, bottomRight))
+    if (mObject.referenceDataChanged(topLeft, bottomRight))
         flagAsModified();
 
     if (mObject.getReferenceId().empty())
         return;
 
-    CSMWorld::IdTable& references = dynamic_cast<CSMWorld::IdTable&> (
-        *mData.getTableModel (CSMWorld::UniversalId::Type_References));
+    CSMWorld::IdTable& references
+        = dynamic_cast<CSMWorld::IdTable&>(*mData.getTableModel(CSMWorld::UniversalId::Type_References));
 
     // check for deleted state
     {
-        QModelIndex index = references.getModelIndex (mObject.getReferenceId(),
-            references.findColumnIndex (CSMWorld::Columns::ColumnId_Modification));
+        QModelIndex index = references.getModelIndex(
+            mObject.getReferenceId(), references.findColumnIndex(CSMWorld::Columns::ColumnId_Modification));
 
-        if (references.data (index).toInt()==CSMWorld::RecordBase::State_Deleted)
+        if (references.data(index).toInt() == CSMWorld::RecordBase::State_Deleted)
         {
             emit closeRequest();
             return;
         }
     }
 
-    int columnIndex = references.findColumnIndex (CSMWorld::Columns::ColumnId_ReferenceableId);
+    int columnIndex = references.findColumnIndex(CSMWorld::Columns::ColumnId_ReferenceableId);
 
-    QModelIndex index = references.getModelIndex (mObject.getReferenceId(), columnIndex);
+    QModelIndex index = references.getModelIndex(mObject.getReferenceId(), columnIndex);
 
-    if (index.row()>=topLeft.row() && index.row()<=bottomRight.row())
-        if (index.column()>=topLeft.column() && index.column()<=bottomRight.row())
-            emit referenceableIdChanged (mObject.getReferenceableId());
+    if (index.row() >= topLeft.row() && index.row() <= bottomRight.row())
+        if (index.column() >= topLeft.column() && index.column() <= bottomRight.row())
+            emit referenceableIdChanged(mObject.getReferenceableId());
 }
 
-void CSVRender::PreviewWidget::referenceAboutToBeRemoved (const QModelIndex& parent, int start,
-    int end)
+void CSVRender::PreviewWidget::referenceAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
     if (mObject.getReferenceId().empty())
         return;
 
-    CSMWorld::IdTable& references = dynamic_cast<CSMWorld::IdTable&> (
-        *mData.getTableModel (CSMWorld::UniversalId::Type_References));
+    CSMWorld::IdTable& references
+        = dynamic_cast<CSMWorld::IdTable&>(*mData.getTableModel(CSMWorld::UniversalId::Type_References));
 
-    QModelIndex index = references.getModelIndex (mObject.getReferenceId(), 0);
+    QModelIndex index = references.getModelIndex(mObject.getReferenceId(), 0);
 
-    if (index.row()>=start && index.row()<=end)
+    if (index.row() >= start && index.row() <= end)
         emit closeRequest();
 }
 
-void CSVRender::PreviewWidget::assetTablesChanged ()
+void CSVRender::PreviewWidget::assetTablesChanged()
 {
     mObject.reloadAssets();
 }
diff --git a/apps/opencs/view/render/previewwidget.hpp b/apps/opencs/view/render/previewwidget.hpp
index a8d73729a4..6851922e8d 100644
--- a/apps/opencs/view/render/previewwidget.hpp
+++ b/apps/opencs/view/render/previewwidget.hpp
@@ -21,34 +21,31 @@ namespace CSVRender
 {
     class PreviewWidget : public SceneWidget
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            CSMWorld::Data& mData;
-            CSVRender::Object mObject;
+        CSMWorld::Data& mData;
+        CSVRender::Object mObject;
 
-        public:
+    public:
+        PreviewWidget(CSMWorld::Data& data, const std::string& id, bool referenceable, QWidget* parent = nullptr);
 
-            PreviewWidget (CSMWorld::Data& data, const std::string& id, bool referenceable,
-                QWidget *parent = nullptr);
+    signals:
 
-        signals:
+        void closeRequest();
 
-            void closeRequest();
+        void referenceableIdChanged(const std::string& id);
 
-            void referenceableIdChanged (const std::string& id);
+    private slots:
 
-        private slots:
+        void referenceableDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
-            void referenceableDataChanged (const QModelIndex& topLeft,
-                const QModelIndex& bottomRight);
+        void referenceableAboutToBeRemoved(const QModelIndex& parent, int start, int end);
 
-            void referenceableAboutToBeRemoved (const QModelIndex& parent, int start, int end);
+        void referenceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
-            void referenceDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
+        void referenceAboutToBeRemoved(const QModelIndex& parent, int start, int end);
 
-            void referenceAboutToBeRemoved (const QModelIndex& parent, int start, int end);
-
-            void assetTablesChanged ();
+        void assetTablesChanged();
     };
 }
 
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 070259075a..7f8ea94da6 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -3,595 +3,586 @@
 #include <chrono>
 #include <thread>
 
-#include <QMouseEvent>
 #include <QLayout>
+#include <QMouseEvent>
 
 #include <extern/osgQt/GraphicsWindowQt>
 #include <osg/GraphicsContext>
-#include <osgViewer/CompositeViewer>
-#include <osgViewer/ViewerEventHandlers>
 #include <osg/LightModel>
 #include <osg/Material>
+#include <osgViewer/CompositeViewer>
+#include <osgViewer/ViewerEventHandlers>
 
 #include <components/debug/debuglog.hpp>
-#include <components/resource/scenemanager.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 
 #include "../widget/scenetoolmode.hpp"
 
-#include "../../model/prefs/state.hpp"
 #include "../../model/prefs/shortcut.hpp"
+#include "../../model/prefs/state.hpp"
 
+#include "cameracontroller.hpp"
 #include "lighting.hpp"
 #include "mask.hpp"
-#include "cameracontroller.hpp"
 
 namespace CSVRender
 {
 
-RenderWidget::RenderWidget(QWidget *parent, Qt::WindowFlags f)
-    : QWidget(parent, f)
-    , mRootNode(nullptr)
-{
-
-    osgViewer::CompositeViewer& viewer = CompositeViewer::get();
-
-    osg::DisplaySettings* ds = osg::DisplaySettings::instance().get();
-    //ds->setNumMultiSamples(8);
-
-    osg::ref_ptr<osg::GraphicsContext::Traits> traits = new osg::GraphicsContext::Traits;
-    traits->windowName.clear();
-    traits->windowDecoration = true;
-    traits->x = 0;
-    traits->y = 0;
-    traits->width = width();
-    traits->height = height();
-    traits->doubleBuffer = true;
-    traits->alpha = ds->getMinimumNumAlphaBits();
-    traits->stencil = ds->getMinimumNumStencilBits();
-    traits->sampleBuffers = ds->getMultiSamples();
-    traits->samples = ds->getNumMultiSamples();
-    // Doesn't make much sense as we're running on demand updates, and there seems to be a bug with the refresh rate when running multiple QGLWidgets
-    traits->vsync = false;
-
-    mView = new osgViewer::View;
-    updateCameraParameters( traits->width / static_cast<double>(traits->height) );
-
-    osg::ref_ptr<osgQt::GraphicsWindowQt> window = new osgQt::GraphicsWindowQt(traits.get());
-    QLayout* layout = new QHBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
-    layout->addWidget(window->getGLWidget());
-    setLayout(layout);
-
-    mView->getCamera()->setGraphicsContext(window);
-    mView->getCamera()->setViewport( new osg::Viewport(0, 0, traits->width, traits->height) );
-
-    SceneUtil::LightManager* lightMgr = new SceneUtil::LightManager;
-    lightMgr->setStartLight(1);
-    lightMgr->setLightingMask(Mask_Lighting);
-    mRootNode = lightMgr;
-
-    mView->getCamera()->getOrCreateStateSet()->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
-    mView->getCamera()->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::ON);
-    osg::ref_ptr<osg::Material> defaultMat (new osg::Material);
-    defaultMat->setColorMode(osg::Material::OFF);
-    defaultMat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
-    defaultMat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
-    defaultMat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
-    mView->getCamera()->getOrCreateStateSet()->setAttribute(defaultMat);
-
-    mView->setSceneData(mRootNode);
-
-    // Add ability to signal osg to show its statistics for debugging purposes
-    mView->addEventHandler(new osgViewer::StatsHandler);
-
-    viewer.addView(mView);
-    viewer.setDone(false);
-    viewer.realize();
-}
+    RenderWidget::RenderWidget(QWidget* parent, Qt::WindowFlags f)
+        : QWidget(parent, f)
+        , mRootNode(nullptr)
+    {
 
-RenderWidget::~RenderWidget()
-{
-    try
+        osgViewer::CompositeViewer& viewer = CompositeViewer::get();
+
+        osg::DisplaySettings* ds = osg::DisplaySettings::instance().get();
+        // ds->setNumMultiSamples(8);
+
+        osg::ref_ptr<osg::GraphicsContext::Traits> traits = new osg::GraphicsContext::Traits;
+        traits->windowName.clear();
+        traits->windowDecoration = true;
+        traits->x = 0;
+        traits->y = 0;
+        traits->width = width();
+        traits->height = height();
+        traits->doubleBuffer = true;
+        traits->alpha = ds->getMinimumNumAlphaBits();
+        traits->stencil = ds->getMinimumNumStencilBits();
+        traits->sampleBuffers = ds->getMultiSamples();
+        traits->samples = ds->getNumMultiSamples();
+        // Doesn't make much sense as we're running on demand updates, and there seems to be a bug with the refresh rate
+        // when running multiple QGLWidgets
+        traits->vsync = false;
+
+        mView = new osgViewer::View;
+        updateCameraParameters(traits->width / static_cast<double>(traits->height));
+
+        osg::ref_ptr<osgQt::GraphicsWindowQt> window = new osgQt::GraphicsWindowQt(traits.get());
+        QLayout* layout = new QHBoxLayout(this);
+        layout->setContentsMargins(0, 0, 0, 0);
+        layout->addWidget(window->getGLWidget());
+        setLayout(layout);
+
+        mView->getCamera()->setGraphicsContext(window);
+        mView->getCamera()->setViewport(new osg::Viewport(0, 0, traits->width, traits->height));
+
+        SceneUtil::LightManager* lightMgr = new SceneUtil::LightManager;
+        lightMgr->setStartLight(1);
+        lightMgr->setLightingMask(Mask_Lighting);
+        mRootNode = lightMgr;
+
+        mView->getCamera()->getOrCreateStateSet()->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
+        mView->getCamera()->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::ON);
+        osg::ref_ptr<osg::Material> defaultMat(new osg::Material);
+        defaultMat->setColorMode(osg::Material::OFF);
+        defaultMat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1, 1, 1, 1));
+        defaultMat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1, 1, 1, 1));
+        defaultMat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
+        mView->getCamera()->getOrCreateStateSet()->setAttribute(defaultMat);
+
+        mView->setSceneData(mRootNode);
+
+        // Add ability to signal osg to show its statistics for debugging purposes
+        mView->addEventHandler(new osgViewer::StatsHandler);
+
+        viewer.addView(mView);
+        viewer.setDone(false);
+        viewer.realize();
+    }
+
+    RenderWidget::~RenderWidget()
     {
-        CompositeViewer::get().removeView(mView);
+        try
+        {
+            CompositeViewer::get().removeView(mView);
+        }
+        catch (const std::exception& e)
+        {
+            Log(Debug::Error) << "Error in the destructor: " << e.what();
+        }
     }
-    catch(const std::exception& e)
+
+    void RenderWidget::flagAsModified()
     {
-        Log(Debug::Error) << "Error in the destructor: " << e.what();
+        mView->requestRedraw();
     }
-}
-
-void RenderWidget::flagAsModified()
-{
-    mView->requestRedraw();
-}
 
-void RenderWidget::setVisibilityMask(unsigned int mask)
-{
-    mView->getCamera()->setCullMask(mask | Mask_ParticleSystem | Mask_Lighting);
-}
-
-osg::Camera *RenderWidget::getCamera()
-{
-    return mView->getCamera();
-}
-
-void RenderWidget::toggleRenderStats()
-{
-    osgViewer::GraphicsWindow* window =
-        static_cast<osgViewer::GraphicsWindow*>(mView->getCamera()->getGraphicsContext());
-
-    window->getEventQueue()->keyPress(osgGA::GUIEventAdapter::KEY_S);
-    window->getEventQueue()->keyRelease(osgGA::GUIEventAdapter::KEY_S);
-}
-
-
-// --------------------------------------------------
+    void RenderWidget::setVisibilityMask(unsigned int mask)
+    {
+        mView->getCamera()->setCullMask(mask | Mask_ParticleSystem | Mask_Lighting);
+    }
 
-CompositeViewer::CompositeViewer()
-    : mSimulationTime(0.0)
-{
-    // TODO: Upgrade osgQt to support osgViewer::ViewerBase::DrawThreadPerContext
-    // https://gitlab.com/OpenMW/openmw/-/issues/5481
-    setThreadingModel(osgViewer::ViewerBase::SingleThreaded);
+    osg::Camera* RenderWidget::getCamera()
+    {
+        return mView->getCamera();
+    }
 
-    setUseConfigureAffinity(false);
+    void RenderWidget::toggleRenderStats()
+    {
+        osgViewer::GraphicsWindow* window
+            = static_cast<osgViewer::GraphicsWindow*>(mView->getCamera()->getGraphicsContext());
 
-    // disable the default setting of viewer.done() by pressing Escape.
-    setKeyEventSetsDone(0);
+        window->getEventQueue()->keyPress(osgGA::GUIEventAdapter::KEY_S);
+        window->getEventQueue()->keyRelease(osgGA::GUIEventAdapter::KEY_S);
+    }
 
-    // Only render when the camera position changed, or content flagged dirty
-    //setRunFrameScheme(osgViewer::ViewerBase::ON_DEMAND);
-    setRunFrameScheme(osgViewer::ViewerBase::CONTINUOUS);
+    // --------------------------------------------------
 
-    connect(&mTimer, &QTimer::timeout, this, &CompositeViewer::update);
-    mTimer.start( 10 );
+    CompositeViewer::CompositeViewer()
+        : mSimulationTime(0.0)
+    {
+        // TODO: Upgrade osgQt to support osgViewer::ViewerBase::DrawThreadPerContext
+        // https://gitlab.com/OpenMW/openmw/-/issues/5481
+        setThreadingModel(osgViewer::ViewerBase::SingleThreaded);
 
-    int frameRateLimit = CSMPrefs::get()["Rendering"]["framerate-limit"].toInt();
-    setRunMaxFrameRate(frameRateLimit);
-}
+        setUseConfigureAffinity(false);
 
-CompositeViewer &CompositeViewer::get()
-{
-    static CompositeViewer sThis;
-    return sThis;
-}
+        // disable the default setting of viewer.done() by pressing Escape.
+        setKeyEventSetsDone(0);
 
-void CompositeViewer::update()
-{
-    double dt = mFrameTimer.time_s();
-    mFrameTimer.setStartTick();
+        // Only render when the camera position changed, or content flagged dirty
+        // setRunFrameScheme(osgViewer::ViewerBase::ON_DEMAND);
+        setRunFrameScheme(osgViewer::ViewerBase::CONTINUOUS);
 
-    emit simulationUpdated(dt);
+        connect(&mTimer, &QTimer::timeout, this, &CompositeViewer::update);
+        mTimer.start(10);
 
-    mSimulationTime += dt;
-    frame(mSimulationTime);
+        int frameRateLimit = CSMPrefs::get()["Rendering"]["framerate-limit"].toInt();
+        setRunMaxFrameRate(frameRateLimit);
+    }
 
-    double minFrameTime = _runMaxFrameRate > 0.0 ? 1.0 / _runMaxFrameRate : 0.0;
-    if (dt < minFrameTime)
+    CompositeViewer& CompositeViewer::get()
     {
-        std::this_thread::sleep_for(std::chrono::duration<double>(minFrameTime - dt));
+        static CompositeViewer sThis;
+        return sThis;
     }
-}
-
-// ---------------------------------------------------
-
-SceneWidget::SceneWidget(std::shared_ptr<Resource::ResourceSystem> resourceSystem, QWidget *parent, Qt::WindowFlags f,
-    bool retrieveInput)
-    : RenderWidget(parent, f)
-    , mResourceSystem(resourceSystem)
-    , mLighting(nullptr)
-    , mHasDefaultAmbient(false)
-    , mIsExterior(true)
-    , mPrevMouseX(0)
-    , mPrevMouseY(0)
-    , mCamPositionSet(false)
-{
-    mFreeCamControl = new FreeCameraController(this);
-    mOrbitCamControl = new OrbitCameraController(this);
-    mCurrentCamControl = mFreeCamControl;
 
-    mOrbitCamControl->setPickingMask(Mask_Reference | Mask_Terrain);
-
-    mOrbitCamControl->setConstRoll( CSMPrefs::get()["3D Scene Input"]["navi-orbit-const-roll"].isTrue() );
+    void CompositeViewer::update()
+    {
+        double dt = mFrameTimer.time_s();
+        mFrameTimer.setStartTick();
 
-    // set up gradient view or configured clear color
-    QColor bgColour = CSMPrefs::get()["Rendering"]["scene-day-background-colour"].toColor();
+        emit simulationUpdated(dt);
 
-    if (CSMPrefs::get()["Rendering"]["scene-use-gradient"].isTrue()) {
-        QColor gradientColour = CSMPrefs::get()["Rendering"]["scene-day-gradient-colour"].toColor();
-        mGradientCamera = createGradientCamera(bgColour, gradientColour);
+        mSimulationTime += dt;
+        frame(mSimulationTime);
 
-        mView->getCamera()->setClearMask(0);
-        mView->getCamera()->addChild(mGradientCamera.get());
-    }
-    else {
-        mView->getCamera()->setClearColor(osg::Vec4(
-            bgColour.redF(),
-            bgColour.greenF(),
-            bgColour.blueF(),
-            1.0f
-        ));
+        double minFrameTime = _runMaxFrameRate > 0.0 ? 1.0 / _runMaxFrameRate : 0.0;
+        if (dt < minFrameTime)
+        {
+            std::this_thread::sleep_for(std::chrono::duration<double>(minFrameTime - dt));
+        }
     }
 
-    // we handle lighting manually
-    mView->setLightingMode(osgViewer::View::NO_LIGHT);
-
-    setLighting(&mLightingDay);
-
-    mResourceSystem->getSceneManager()->setParticleSystemMask(Mask_ParticleSystem);
+    // ---------------------------------------------------
 
-    // Recieve mouse move event even if mouse button is not pressed
-    setMouseTracking(true);
-    setFocusPolicy(Qt::ClickFocus);
+    SceneWidget::SceneWidget(std::shared_ptr<Resource::ResourceSystem> resourceSystem, QWidget* parent,
+        Qt::WindowFlags f, bool retrieveInput)
+        : RenderWidget(parent, f)
+        , mResourceSystem(resourceSystem)
+        , mLighting(nullptr)
+        , mHasDefaultAmbient(false)
+        , mIsExterior(true)
+        , mPrevMouseX(0)
+        , mPrevMouseY(0)
+        , mCamPositionSet(false)
+    {
+        mFreeCamControl = new FreeCameraController(this);
+        mOrbitCamControl = new OrbitCameraController(this);
+        mCurrentCamControl = mFreeCamControl;
 
-    connect (&CSMPrefs::State::get(), &CSMPrefs::State::settingChanged,
-        this, &SceneWidget::settingChanged);
+        mOrbitCamControl->setPickingMask(Mask_Reference | Mask_Terrain);
 
-    // TODO update this outside of the constructor where virtual methods can be used
-    if (retrieveInput)
-    {
-        CSMPrefs::get()["3D Scene Input"].update();
-        CSMPrefs::get()["Tooltips"].update();
-    }
+        mOrbitCamControl->setConstRoll(CSMPrefs::get()["3D Scene Input"]["navi-orbit-const-roll"].isTrue());
 
-    connect (&CompositeViewer::get(), &CompositeViewer::simulationUpdated, this, &SceneWidget::update);
+        // set up gradient view or configured clear color
+        QColor bgColour = CSMPrefs::get()["Rendering"]["scene-day-background-colour"].toColor();
 
-    // Shortcuts
-    CSMPrefs::Shortcut* focusToolbarShortcut = new CSMPrefs::Shortcut("scene-focus-toolbar", this);
-    connect(focusToolbarShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), 
-            this, &SceneWidget::focusToolbarRequest);
+        if (CSMPrefs::get()["Rendering"]["scene-use-gradient"].isTrue())
+        {
+            QColor gradientColour = CSMPrefs::get()["Rendering"]["scene-day-gradient-colour"].toColor();
+            mGradientCamera = createGradientCamera(bgColour, gradientColour);
 
-    CSMPrefs::Shortcut* renderStatsShortcut = new CSMPrefs::Shortcut("scene-render-stats", this);
-    connect(renderStatsShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), 
-            this, &SceneWidget::toggleRenderStats);
-}
+            mView->getCamera()->setClearMask(0);
+            mView->getCamera()->addChild(mGradientCamera.get());
+        }
+        else
+        {
+            mView->getCamera()->setClearColor(osg::Vec4(bgColour.redF(), bgColour.greenF(), bgColour.blueF(), 1.0f));
+        }
 
-SceneWidget::~SceneWidget()
-{
-    // Since we're holding on to the resources past the existence of this graphics context, we'll need to manually release the created objects
-    mResourceSystem->releaseGLObjects(mView->getCamera()->getGraphicsContext()->getState());
-}
+        // we handle lighting manually
+        mView->setLightingMode(osgViewer::View::NO_LIGHT);
 
+        setLighting(&mLightingDay);
 
-osg::ref_ptr<osg::Geometry> SceneWidget::createGradientRectangle(QColor bgColour, QColor gradientColour)
-{
-    osg::ref_ptr<osg::Geometry> geometry = new osg::Geometry;
+        mResourceSystem->getSceneManager()->setParticleSystemMask(Mask_ParticleSystem);
 
-    osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array;
+        // Recieve mouse move event even if mouse button is not pressed
+        setMouseTracking(true);
+        setFocusPolicy(Qt::ClickFocus);
 
-    vertices->push_back(osg::Vec3(0.0f, 0.0f, -1.0f));
-    vertices->push_back(osg::Vec3(1.0f, 0.0f, -1.0f));
-    vertices->push_back(osg::Vec3(0.0f, 1.0f, -1.0f));
-    vertices->push_back(osg::Vec3(1.0f, 1.0f, -1.0f));
+        connect(&CSMPrefs::State::get(), &CSMPrefs::State::settingChanged, this, &SceneWidget::settingChanged);
 
-    geometry->setVertexArray(vertices);
+        // TODO update this outside of the constructor where virtual methods can be used
+        if (retrieveInput)
+        {
+            CSMPrefs::get()["3D Scene Input"].update();
+            CSMPrefs::get()["Tooltips"].update();
+        }
 
-    osg::ref_ptr<osg::DrawElementsUShort> primitives = new osg::DrawElementsUShort (osg::PrimitiveSet::TRIANGLES, 0);
+        connect(&CompositeViewer::get(), &CompositeViewer::simulationUpdated, this, &SceneWidget::update);
 
-    // triangle 1
-    primitives->push_back (0);
-    primitives->push_back (1);
-    primitives->push_back (2);
+        // Shortcuts
+        CSMPrefs::Shortcut* focusToolbarShortcut = new CSMPrefs::Shortcut("scene-focus-toolbar", this);
+        connect(
+            focusToolbarShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), this, &SceneWidget::focusToolbarRequest);
 
-    // triangle 2
-    primitives->push_back (2);
-    primitives->push_back (1);
-    primitives->push_back (3);
+        CSMPrefs::Shortcut* renderStatsShortcut = new CSMPrefs::Shortcut("scene-render-stats", this);
+        connect(
+            renderStatsShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), this, &SceneWidget::toggleRenderStats);
+    }
 
-    geometry->addPrimitiveSet(primitives);
+    SceneWidget::~SceneWidget()
+    {
+        // Since we're holding on to the resources past the existence of this graphics context, we'll need to manually
+        // release the created objects
+        mResourceSystem->releaseGLObjects(mView->getCamera()->getGraphicsContext()->getState());
+    }
 
-    osg::ref_ptr <osg::Vec4ubArray> colours = new osg::Vec4ubArray;
-    colours->push_back(osg::Vec4ub(gradientColour.red(), gradientColour.green(), gradientColour.blue(), 1.0f));
-    colours->push_back(osg::Vec4ub(gradientColour.red(), gradientColour.green(), gradientColour.blue(), 1.0f));
-    colours->push_back(osg::Vec4ub(bgColour.red(), bgColour.green(), bgColour.blue(), 1.0f));
-    colours->push_back(osg::Vec4ub(bgColour.red(), bgColour.green(), bgColour.blue(), 1.0f));
+    osg::ref_ptr<osg::Geometry> SceneWidget::createGradientRectangle(QColor bgColour, QColor gradientColour)
+    {
+        osg::ref_ptr<osg::Geometry> geometry = new osg::Geometry;
 
-    geometry->setColorArray(colours, osg::Array::BIND_PER_VERTEX);
+        osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array;
 
-    geometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
-    geometry->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+        vertices->push_back(osg::Vec3(0.0f, 0.0f, -1.0f));
+        vertices->push_back(osg::Vec3(1.0f, 0.0f, -1.0f));
+        vertices->push_back(osg::Vec3(0.0f, 1.0f, -1.0f));
+        vertices->push_back(osg::Vec3(1.0f, 1.0f, -1.0f));
 
-    return geometry;
-}
+        geometry->setVertexArray(vertices);
 
+        osg::ref_ptr<osg::DrawElementsUShort> primitives = new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES, 0);
 
-osg::ref_ptr<osg::Camera> SceneWidget::createGradientCamera(QColor bgColour, QColor gradientColour)
-{
-    osg::ref_ptr<osg::Camera> camera = new osg::Camera();
-    camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
-    camera->setProjectionMatrix(osg::Matrix::ortho2D(0, 1.0f, 0, 1.0f));
-    camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
-    camera->setViewMatrix(osg::Matrix::identity());
+        // triangle 1
+        primitives->push_back(0);
+        primitives->push_back(1);
+        primitives->push_back(2);
 
-    camera->setClearMask(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
-    camera->setAllowEventFocus(false);
+        // triangle 2
+        primitives->push_back(2);
+        primitives->push_back(1);
+        primitives->push_back(3);
 
-    // draw subgraph before main camera view.
-    camera->setRenderOrder(osg::Camera::PRE_RENDER);
+        geometry->addPrimitiveSet(primitives);
 
-    camera->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+        osg::ref_ptr<osg::Vec4ubArray> colours = new osg::Vec4ubArray;
+        colours->push_back(osg::Vec4ub(gradientColour.red(), gradientColour.green(), gradientColour.blue(), 1.0f));
+        colours->push_back(osg::Vec4ub(gradientColour.red(), gradientColour.green(), gradientColour.blue(), 1.0f));
+        colours->push_back(osg::Vec4ub(bgColour.red(), bgColour.green(), bgColour.blue(), 1.0f));
+        colours->push_back(osg::Vec4ub(bgColour.red(), bgColour.green(), bgColour.blue(), 1.0f));
 
-    osg::ref_ptr<osg::Geometry> gradientQuad = createGradientRectangle(bgColour, gradientColour);
+        geometry->setColorArray(colours, osg::Array::BIND_PER_VERTEX);
 
-    camera->addChild(gradientQuad);
-    return camera;
-}
+        geometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+        geometry->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
 
+        return geometry;
+    }
 
-void SceneWidget::updateGradientCamera(QColor bgColour, QColor gradientColour)
-{
-    osg::ref_ptr<osg::Geometry> gradientRect = createGradientRectangle(bgColour, gradientColour);
-    // Replaces previous rectangle
-    mGradientCamera->setChild(0, gradientRect.get());
-}
+    osg::ref_ptr<osg::Camera> SceneWidget::createGradientCamera(QColor bgColour, QColor gradientColour)
+    {
+        osg::ref_ptr<osg::Camera> camera = new osg::Camera();
+        camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
+        camera->setProjectionMatrix(osg::Matrix::ortho2D(0, 1.0f, 0, 1.0f));
+        camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
+        camera->setViewMatrix(osg::Matrix::identity());
 
-void SceneWidget::setLighting(Lighting *lighting)
-{
-    if (mLighting)
-        mLighting->deactivate();
+        camera->setClearMask(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
+        camera->setAllowEventFocus(false);
 
-    mLighting = lighting;
-    mLighting->activate (mRootNode, mIsExterior);
+        // draw subgraph before main camera view.
+        camera->setRenderOrder(osg::Camera::PRE_RENDER);
 
-    osg::Vec4f ambient = mLighting->getAmbientColour(mHasDefaultAmbient ? &mDefaultAmbient : nullptr);
-    setAmbient(ambient);
+        camera->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
 
-    flagAsModified();
-}
+        osg::ref_ptr<osg::Geometry> gradientQuad = createGradientRectangle(bgColour, gradientColour);
 
-void SceneWidget::setAmbient(const osg::Vec4f& ambient)
-{
-    osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
-    osg::ref_ptr<osg::LightModel> lightmodel = new osg::LightModel;
-    lightmodel->setAmbientIntensity(ambient);
-    stateset->setMode(GL_LIGHTING, osg::StateAttribute::ON);
-    stateset->setMode(GL_LIGHT0, osg::StateAttribute::ON);
-    stateset->setAttributeAndModes(lightmodel, osg::StateAttribute::ON);
-    mRootNode->setStateSet(stateset);
-}
+        camera->addChild(gradientQuad);
+        return camera;
+    }
 
-void SceneWidget::selectLightingMode (const std::string& mode)
-{
-    QColor backgroundColour;
-    QColor gradientColour;
-    if (mode == "day")
+    void SceneWidget::updateGradientCamera(QColor bgColour, QColor gradientColour)
     {
-        backgroundColour = CSMPrefs::get()["Rendering"]["scene-day-background-colour"].toColor();
-        gradientColour = CSMPrefs::get()["Rendering"]["scene-day-gradient-colour"].toColor();
-        setLighting(&mLightingDay);
+        osg::ref_ptr<osg::Geometry> gradientRect = createGradientRectangle(bgColour, gradientColour);
+        // Replaces previous rectangle
+        mGradientCamera->setChild(0, gradientRect.get());
     }
-    else if (mode == "night")
+
+    void SceneWidget::setLighting(Lighting* lighting)
     {
-        backgroundColour = CSMPrefs::get()["Rendering"]["scene-night-background-colour"].toColor();
-        gradientColour = CSMPrefs::get()["Rendering"]["scene-night-gradient-colour"].toColor();
-        setLighting(&mLightingNight);
+        if (mLighting)
+            mLighting->deactivate();
+
+        mLighting = lighting;
+        mLighting->activate(mRootNode, mIsExterior);
+
+        osg::Vec4f ambient = mLighting->getAmbientColour(mHasDefaultAmbient ? &mDefaultAmbient : nullptr);
+        setAmbient(ambient);
+
+        flagAsModified();
     }
-    else if (mode == "bright")
+
+    void SceneWidget::setAmbient(const osg::Vec4f& ambient)
     {
-        backgroundColour = CSMPrefs::get()["Rendering"]["scene-bright-background-colour"].toColor();
-        gradientColour = CSMPrefs::get()["Rendering"]["scene-bright-gradient-colour"].toColor();
-        setLighting(&mLightingBright);
+        osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
+        osg::ref_ptr<osg::LightModel> lightmodel = new osg::LightModel;
+        lightmodel->setAmbientIntensity(ambient);
+        stateset->setMode(GL_LIGHTING, osg::StateAttribute::ON);
+        stateset->setMode(GL_LIGHT0, osg::StateAttribute::ON);
+        stateset->setAttributeAndModes(lightmodel, osg::StateAttribute::ON);
+        mRootNode->setStateSet(stateset);
     }
-    if (CSMPrefs::get()["Rendering"]["scene-use-gradient"].isTrue()) {
-        if (mGradientCamera.get() != nullptr) {
-            // we can go ahead and update since this camera still exists
-            updateGradientCamera(backgroundColour, gradientColour);
 
-            if (!mView->getCamera()->containsNode(mGradientCamera.get()))
+    void SceneWidget::selectLightingMode(const std::string& mode)
+    {
+        QColor backgroundColour;
+        QColor gradientColour;
+        if (mode == "day")
+        {
+            backgroundColour = CSMPrefs::get()["Rendering"]["scene-day-background-colour"].toColor();
+            gradientColour = CSMPrefs::get()["Rendering"]["scene-day-gradient-colour"].toColor();
+            setLighting(&mLightingDay);
+        }
+        else if (mode == "night")
+        {
+            backgroundColour = CSMPrefs::get()["Rendering"]["scene-night-background-colour"].toColor();
+            gradientColour = CSMPrefs::get()["Rendering"]["scene-night-gradient-colour"].toColor();
+            setLighting(&mLightingNight);
+        }
+        else if (mode == "bright")
+        {
+            backgroundColour = CSMPrefs::get()["Rendering"]["scene-bright-background-colour"].toColor();
+            gradientColour = CSMPrefs::get()["Rendering"]["scene-bright-gradient-colour"].toColor();
+            setLighting(&mLightingBright);
+        }
+        if (CSMPrefs::get()["Rendering"]["scene-use-gradient"].isTrue())
+        {
+            if (mGradientCamera.get() != nullptr)
             {
-                // need to re-attach the gradient camera
+                // we can go ahead and update since this camera still exists
+                updateGradientCamera(backgroundColour, gradientColour);
+
+                if (!mView->getCamera()->containsNode(mGradientCamera.get()))
+                {
+                    // need to re-attach the gradient camera
+                    mView->getCamera()->setClearMask(0);
+                    mView->getCamera()->addChild(mGradientCamera.get());
+                }
+            }
+            else
+            {
+                // need to create the gradient camera
+                mGradientCamera = createGradientCamera(backgroundColour, gradientColour);
                 mView->getCamera()->setClearMask(0);
                 mView->getCamera()->addChild(mGradientCamera.get());
             }
-        } 
-        else {
-            // need to create the gradient camera
-            mGradientCamera = createGradientCamera(backgroundColour, gradientColour);
-            mView->getCamera()->setClearMask(0);
-            mView->getCamera()->addChild(mGradientCamera.get());
         }
-    }
-    else {
-        // Fall back to using the clear color for the camera
-        mView->getCamera()->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-        mView->getCamera()->setClearColor(osg::Vec4(
-            backgroundColour.redF(),
-            backgroundColour.greenF(),
-            backgroundColour.blueF(),
-            1.0f
-        ));
-        if (mGradientCamera.get() != nullptr && mView->getCamera()->containsNode(mGradientCamera.get())) {
-            // Remove the child to prevent the gradient from rendering
-            mView->getCamera()->removeChild(mGradientCamera.get());
+        else
+        {
+            // Fall back to using the clear color for the camera
+            mView->getCamera()->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+            mView->getCamera()->setClearColor(
+                osg::Vec4(backgroundColour.redF(), backgroundColour.greenF(), backgroundColour.blueF(), 1.0f));
+            if (mGradientCamera.get() != nullptr && mView->getCamera()->containsNode(mGradientCamera.get()))
+            {
+                // Remove the child to prevent the gradient from rendering
+                mView->getCamera()->removeChild(mGradientCamera.get());
+            }
         }
     }
-}
-
-CSVWidget::SceneToolMode *SceneWidget::makeLightingSelector (CSVWidget::SceneToolbar *parent)
-{
-    CSVWidget::SceneToolMode *tool = new CSVWidget::SceneToolMode (parent, "Lighting Mode");
-
-    /// \todo replace icons
-    tool->addButton (":scenetoolbar/day", "day",
-        "Day"
-        "<ul><li>Cell specific ambient in interiors</li>"
-        "<li>Low ambient in exteriors</li>"
-        "<li>Strong directional light source</li>"
-        "<li>This mode closely resembles day time in-game</li></ul>");
-    tool->addButton (":scenetoolbar/night", "night",
-        "Night"
-        "<ul><li>Cell specific ambient in interiors</li>"
-        "<li>Low ambient in exteriors</li>"
-        "<li>Weak directional light source</li>"
-        "<li>This mode closely resembles night time in-game</li></ul>");
-    tool->addButton (":scenetoolbar/bright", "bright",
-        "Bright"
-        "<ul><li>Maximum ambient</li>"
-        "<li>Strong directional light source</li></ul>");
-
-    connect (tool, &CSVWidget::SceneToolMode::modeChanged, this, &SceneWidget::selectLightingMode);
-
-    return tool;
-}
-
-void SceneWidget::setDefaultAmbient (const osg::Vec4f& colour)
-{
-    mDefaultAmbient = colour;
-    mHasDefaultAmbient = true;
-
-    setAmbient(mLighting->getAmbientColour(&mDefaultAmbient));
-}
-
-void SceneWidget::setExterior (bool isExterior)
-{
-    mIsExterior = isExterior;
-}
-
-void SceneWidget::mouseMoveEvent (QMouseEvent *event)
-{
-    mCurrentCamControl->handleMouseMoveEvent(event->x() - mPrevMouseX, event->y() - mPrevMouseY);
-
-    mPrevMouseX = event->x();
-    mPrevMouseY = event->y();
-}
-
-void SceneWidget::wheelEvent(QWheelEvent *event)
-{
-    mCurrentCamControl->handleMouseScrollEvent(event->angleDelta().y());
-}
 
-void SceneWidget::update(double dt)
-{
-    if (mCamPositionSet)
+    CSVWidget::SceneToolMode* SceneWidget::makeLightingSelector(CSVWidget::SceneToolbar* parent)
     {
-        mCurrentCamControl->update(dt);
-    }
-    else
+        CSVWidget::SceneToolMode* tool = new CSVWidget::SceneToolMode(parent, "Lighting Mode");
+
+        /// \todo replace icons
+        tool->addButton(":scenetoolbar/day", "day",
+            "Day"
+            "<ul><li>Cell specific ambient in interiors</li>"
+            "<li>Low ambient in exteriors</li>"
+            "<li>Strong directional light source</li>"
+            "<li>This mode closely resembles day time in-game</li></ul>");
+        tool->addButton(":scenetoolbar/night", "night",
+            "Night"
+            "<ul><li>Cell specific ambient in interiors</li>"
+            "<li>Low ambient in exteriors</li>"
+            "<li>Weak directional light source</li>"
+            "<li>This mode closely resembles night time in-game</li></ul>");
+        tool->addButton(":scenetoolbar/bright", "bright",
+            "Bright"
+            "<ul><li>Maximum ambient</li>"
+            "<li>Strong directional light source</li></ul>");
+
+        connect(tool, &CSVWidget::SceneToolMode::modeChanged, this, &SceneWidget::selectLightingMode);
+
+        return tool;
+    }
+
+    void SceneWidget::setDefaultAmbient(const osg::Vec4f& colour)
     {
-        mCurrentCamControl->setup(mRootNode, Mask_Reference | Mask_Terrain, CameraController::WorldUp);
-        mCamPositionSet = true;
-    }
-}
+        mDefaultAmbient = colour;
+        mHasDefaultAmbient = true;
 
-void SceneWidget::settingChanged (const CSMPrefs::Setting *setting)
-{
-    if (*setting=="3D Scene Input/p-navi-free-sensitivity")
-    {
-        mFreeCamControl->setCameraSensitivity(setting->toDouble());
-    }
-    else if (*setting=="3D Scene Input/p-navi-orbit-sensitivity")
-    {
-        mOrbitCamControl->setCameraSensitivity(setting->toDouble());
-    }
-    else if (*setting=="3D Scene Input/p-navi-free-invert")
-    {
-        mFreeCamControl->setInverted(setting->isTrue());
-    }
-    else if (*setting=="3D Scene Input/p-navi-orbit-invert")
-    {
-        mOrbitCamControl->setInverted(setting->isTrue());
-    }
-    else if (*setting=="3D Scene Input/s-navi-sensitivity")
-    {
-        mFreeCamControl->setSecondaryMovementMultiplier(setting->toDouble());
-        mOrbitCamControl->setSecondaryMovementMultiplier(setting->toDouble());
-    }
-    else if (*setting=="3D Scene Input/navi-wheel-factor")
-    {
-        mFreeCamControl->setWheelMovementMultiplier(setting->toDouble());
-        mOrbitCamControl->setWheelMovementMultiplier(setting->toDouble());
-    }
-    else if (*setting=="3D Scene Input/navi-free-lin-speed")
-    {
-        mFreeCamControl->setLinearSpeed(setting->toDouble());
-    }
-    else if (*setting=="3D Scene Input/navi-free-rot-speed")
-    {
-        mFreeCamControl->setRotationalSpeed(setting->toDouble());
+        setAmbient(mLighting->getAmbientColour(&mDefaultAmbient));
     }
-    else if (*setting=="3D Scene Input/navi-free-speed-mult")
-    {
-        mFreeCamControl->setSpeedMultiplier(setting->toDouble());
-    }
-    else if (*setting=="3D Scene Input/navi-orbit-rot-speed")
-    {
-        mOrbitCamControl->setOrbitSpeed(setting->toDouble());
-    }
-    else if (*setting=="3D Scene Input/navi-orbit-speed-mult")
+
+    void SceneWidget::setExterior(bool isExterior)
     {
-        mOrbitCamControl->setOrbitSpeedMultiplier(setting->toDouble());
+        mIsExterior = isExterior;
     }
-    else if (*setting=="3D Scene Input/navi-orbit-const-roll")
+
+    void SceneWidget::mouseMoveEvent(QMouseEvent* event)
     {
-        mOrbitCamControl->setConstRoll(setting->isTrue());
+        mCurrentCamControl->handleMouseMoveEvent(event->x() - mPrevMouseX, event->y() - mPrevMouseY);
+
+        mPrevMouseX = event->x();
+        mPrevMouseY = event->y();
     }
-    else if (*setting=="Rendering/framerate-limit")
+
+    void SceneWidget::wheelEvent(QWheelEvent* event)
     {
-        CompositeViewer::get().setRunMaxFrameRate(setting->toInt());
+        mCurrentCamControl->handleMouseScrollEvent(event->angleDelta().y());
     }
-    else if (*setting=="Rendering/camera-fov" ||
-             *setting=="Rendering/camera-ortho" ||
-             *setting=="Rendering/camera-ortho-size")
+
+    void SceneWidget::update(double dt)
     {
-        updateCameraParameters();
+        if (mCamPositionSet)
+        {
+            mCurrentCamControl->update(dt);
+        }
+        else
+        {
+            mCurrentCamControl->setup(mRootNode, Mask_Reference | Mask_Terrain, CameraController::WorldUp);
+            mCamPositionSet = true;
+        }
     }
-    else if (*setting == "Rendering/scene-day-night-switch-nodes")
+
+    void SceneWidget::settingChanged(const CSMPrefs::Setting* setting)
     {
-        if (mLighting)
-            setLighting(mLighting);
+        if (*setting == "3D Scene Input/p-navi-free-sensitivity")
+        {
+            mFreeCamControl->setCameraSensitivity(setting->toDouble());
+        }
+        else if (*setting == "3D Scene Input/p-navi-orbit-sensitivity")
+        {
+            mOrbitCamControl->setCameraSensitivity(setting->toDouble());
+        }
+        else if (*setting == "3D Scene Input/p-navi-free-invert")
+        {
+            mFreeCamControl->setInverted(setting->isTrue());
+        }
+        else if (*setting == "3D Scene Input/p-navi-orbit-invert")
+        {
+            mOrbitCamControl->setInverted(setting->isTrue());
+        }
+        else if (*setting == "3D Scene Input/s-navi-sensitivity")
+        {
+            mFreeCamControl->setSecondaryMovementMultiplier(setting->toDouble());
+            mOrbitCamControl->setSecondaryMovementMultiplier(setting->toDouble());
+        }
+        else if (*setting == "3D Scene Input/navi-wheel-factor")
+        {
+            mFreeCamControl->setWheelMovementMultiplier(setting->toDouble());
+            mOrbitCamControl->setWheelMovementMultiplier(setting->toDouble());
+        }
+        else if (*setting == "3D Scene Input/navi-free-lin-speed")
+        {
+            mFreeCamControl->setLinearSpeed(setting->toDouble());
+        }
+        else if (*setting == "3D Scene Input/navi-free-rot-speed")
+        {
+            mFreeCamControl->setRotationalSpeed(setting->toDouble());
+        }
+        else if (*setting == "3D Scene Input/navi-free-speed-mult")
+        {
+            mFreeCamControl->setSpeedMultiplier(setting->toDouble());
+        }
+        else if (*setting == "3D Scene Input/navi-orbit-rot-speed")
+        {
+            mOrbitCamControl->setOrbitSpeed(setting->toDouble());
+        }
+        else if (*setting == "3D Scene Input/navi-orbit-speed-mult")
+        {
+            mOrbitCamControl->setOrbitSpeedMultiplier(setting->toDouble());
+        }
+        else if (*setting == "3D Scene Input/navi-orbit-const-roll")
+        {
+            mOrbitCamControl->setConstRoll(setting->isTrue());
+        }
+        else if (*setting == "Rendering/framerate-limit")
+        {
+            CompositeViewer::get().setRunMaxFrameRate(setting->toInt());
+        }
+        else if (*setting == "Rendering/camera-fov" || *setting == "Rendering/camera-ortho"
+            || *setting == "Rendering/camera-ortho-size")
+        {
+            updateCameraParameters();
+        }
+        else if (*setting == "Rendering/scene-day-night-switch-nodes")
+        {
+            if (mLighting)
+                setLighting(mLighting);
+        }
     }
-}
-
-void RenderWidget::updateCameraParameters(double overrideAspect)
-{
-    const float nearDist = 1.0;
-    const float farDist = 1000.0;
 
-    if (CSMPrefs::get()["Rendering"]["camera-ortho"].isTrue())
+    void RenderWidget::updateCameraParameters(double overrideAspect)
     {
-        const float size = CSMPrefs::get()["Rendering"]["camera-ortho-size"].toInt();
-        const float aspect = overrideAspect >= 0.0 ? overrideAspect : (width() / static_cast<double>(height()));
-        const float halfH = size * 10.0;
-        const float halfW = halfH * aspect;
+        const float nearDist = 1.0;
+        const float farDist = 1000.0;
 
-        mView->getCamera()->setProjectionMatrixAsOrtho(
-            -halfW, halfW, -halfH, halfH, nearDist, farDist);
-    }
-    else
-    { 
-        mView->getCamera()->setProjectionMatrixAsPerspective(
-            CSMPrefs::get()["Rendering"]["camera-fov"].toInt(),
-            static_cast<double>(width())/static_cast<double>(height()),
-            nearDist, farDist);
-    }
-}
+        if (CSMPrefs::get()["Rendering"]["camera-ortho"].isTrue())
+        {
+            const float size = CSMPrefs::get()["Rendering"]["camera-ortho-size"].toInt();
+            const float aspect = overrideAspect >= 0.0 ? overrideAspect : (width() / static_cast<double>(height()));
+            const float halfH = size * 10.0;
+            const float halfW = halfH * aspect;
 
-void SceneWidget::selectNavigationMode (const std::string& mode)
-{
-    if (mode=="1st")
-    {
-        mCurrentCamControl->setCamera(nullptr);
-        mCurrentCamControl = mFreeCamControl;
-        mFreeCamControl->setCamera(getCamera());
-        mFreeCamControl->fixUpAxis(CameraController::WorldUp);
-    }
-    else if (mode=="free")
-    {
-        mCurrentCamControl->setCamera(nullptr);
-        mCurrentCamControl = mFreeCamControl;
-        mFreeCamControl->setCamera(getCamera());
-        mFreeCamControl->unfixUpAxis();
+            mView->getCamera()->setProjectionMatrixAsOrtho(-halfW, halfW, -halfH, halfH, nearDist, farDist);
+        }
+        else
+        {
+            mView->getCamera()->setProjectionMatrixAsPerspective(CSMPrefs::get()["Rendering"]["camera-fov"].toInt(),
+                static_cast<double>(width()) / static_cast<double>(height()), nearDist, farDist);
+        }
     }
-    else if (mode=="orbit")
+
+    void SceneWidget::selectNavigationMode(const std::string& mode)
     {
-        mCurrentCamControl->setCamera(nullptr);
-        mCurrentCamControl = mOrbitCamControl;
-        mOrbitCamControl->setCamera(getCamera());
-        mOrbitCamControl->reset();
+        if (mode == "1st")
+        {
+            mCurrentCamControl->setCamera(nullptr);
+            mCurrentCamControl = mFreeCamControl;
+            mFreeCamControl->setCamera(getCamera());
+            mFreeCamControl->fixUpAxis(CameraController::WorldUp);
+        }
+        else if (mode == "free")
+        {
+            mCurrentCamControl->setCamera(nullptr);
+            mCurrentCamControl = mFreeCamControl;
+            mFreeCamControl->setCamera(getCamera());
+            mFreeCamControl->unfixUpAxis();
+        }
+        else if (mode == "orbit")
+        {
+            mCurrentCamControl->setCamera(nullptr);
+            mCurrentCamControl = mOrbitCamControl;
+            mOrbitCamControl->setCamera(getCamera());
+            mOrbitCamControl->reset();
+        }
     }
-}
 
 }
diff --git a/apps/opencs/view/render/scenewidget.hpp b/apps/opencs/view/render/scenewidget.hpp
index 922776e9fb..6d2230aa7e 100644
--- a/apps/opencs/view/render/scenewidget.hpp
+++ b/apps/opencs/view/render/scenewidget.hpp
@@ -4,16 +4,15 @@
 #include <map>
 #include <memory>
 
-#include <QWidget>
 #include <QTimer>
+#include <QWidget>
 
-#include <osgViewer/View>
 #include <osgViewer/CompositeViewer>
+#include <osgViewer/View>
 
+#include "lightingbright.hpp"
 #include "lightingday.hpp"
 #include "lightingnight.hpp"
-#include "lightingbright.hpp"
-
 
 namespace Resource
 {
@@ -46,124 +45,123 @@ namespace CSVRender
 
     class RenderWidget : public QWidget
     {
-            Q_OBJECT
-
-        public:
-            RenderWidget(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
-            virtual ~RenderWidget();
+        Q_OBJECT
 
-            /// Initiates a request to redraw the view
-            void flagAsModified();
+    public:
+        RenderWidget(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
+        virtual ~RenderWidget();
 
-            void setVisibilityMask(unsigned int mask);
+        /// Initiates a request to redraw the view
+        void flagAsModified();
 
-            osg::Camera *getCamera();
+        void setVisibilityMask(unsigned int mask);
 
-        protected:
+        osg::Camera* getCamera();
 
-            osg::ref_ptr<osgViewer::View> mView;
-            osg::ref_ptr<osg::Group> mRootNode;
+    protected:
+        osg::ref_ptr<osgViewer::View> mView;
+        osg::ref_ptr<osg::Group> mRootNode;
 
-            void updateCameraParameters(double overrideAspect = -1.0);
+        void updateCameraParameters(double overrideAspect = -1.0);
 
-            QTimer mTimer;
+        QTimer mTimer;
 
-        protected slots:
+    protected slots:
 
-            void toggleRenderStats();
+        void toggleRenderStats();
     };
 
     /// Extension of RenderWidget to support lighting mode selection & toolbar
     class SceneWidget : public RenderWidget
     {
-            Q_OBJECT
-        public:
-            SceneWidget(std::shared_ptr<Resource::ResourceSystem> resourceSystem, QWidget* parent = nullptr,
-                        Qt::WindowFlags f = Qt::WindowFlags(), bool retrieveInput = true);
-            virtual ~SceneWidget();
+        Q_OBJECT
+    public:
+        SceneWidget(std::shared_ptr<Resource::ResourceSystem> resourceSystem, QWidget* parent = nullptr,
+            Qt::WindowFlags f = Qt::WindowFlags(), bool retrieveInput = true);
+        virtual ~SceneWidget();
 
-            CSVWidget::SceneToolMode *makeLightingSelector (CSVWidget::SceneToolbar *parent);
-            ///< \attention The created tool is not added to the toolbar (via addTool). Doing that
-            /// is the responsibility of the calling function.
+        CSVWidget::SceneToolMode* makeLightingSelector(CSVWidget::SceneToolbar* parent);
+        ///< \attention The created tool is not added to the toolbar (via addTool). Doing that
+        /// is the responsibility of the calling function.
 
-            void setDefaultAmbient (const osg::Vec4f& colour);
-            ///< \note The actual ambient colour may differ based on lighting settings.
+        void setDefaultAmbient(const osg::Vec4f& colour);
+        ///< \note The actual ambient colour may differ based on lighting settings.
 
-            void setExterior (bool isExterior);
+        void setExterior(bool isExterior);
 
-        protected:
-            void setLighting (Lighting *lighting);
-            ///< \attention The ownership of \a lighting is not transferred to *this.
+    protected:
+        void setLighting(Lighting* lighting);
+        ///< \attention The ownership of \a lighting is not transferred to *this.
 
-            void setAmbient(const osg::Vec4f& ambient);
+        void setAmbient(const osg::Vec4f& ambient);
 
-            void mouseMoveEvent (QMouseEvent *event) override;
-            void wheelEvent (QWheelEvent *event) override;
+        void mouseMoveEvent(QMouseEvent* event) override;
+        void wheelEvent(QWheelEvent* event) override;
 
-            osg::ref_ptr<osg::Geometry> createGradientRectangle(QColor bgColour, QColor gradientColour);
-            osg::ref_ptr<osg::Camera> createGradientCamera(QColor bgColour, QColor gradientColour);
-            void updateGradientCamera(QColor bgColour, QColor gradientColour);
+        osg::ref_ptr<osg::Geometry> createGradientRectangle(QColor bgColour, QColor gradientColour);
+        osg::ref_ptr<osg::Camera> createGradientCamera(QColor bgColour, QColor gradientColour);
+        void updateGradientCamera(QColor bgColour, QColor gradientColour);
 
-            std::shared_ptr<Resource::ResourceSystem> mResourceSystem;
+        std::shared_ptr<Resource::ResourceSystem> mResourceSystem;
 
-            Lighting* mLighting;
-            
-            osg::ref_ptr<osg::Camera> mGradientCamera;
-            osg::Vec4f mDefaultAmbient;
-            bool mHasDefaultAmbient;
-            bool mIsExterior;
-            LightingDay mLightingDay;
-            LightingNight mLightingNight;
-            LightingBright mLightingBright;
+        Lighting* mLighting;
 
-            int mPrevMouseX, mPrevMouseY;
-            
-            /// Tells update that camera isn't set
-            bool mCamPositionSet;
+        osg::ref_ptr<osg::Camera> mGradientCamera;
+        osg::Vec4f mDefaultAmbient;
+        bool mHasDefaultAmbient;
+        bool mIsExterior;
+        LightingDay mLightingDay;
+        LightingNight mLightingNight;
+        LightingBright mLightingBright;
 
-            FreeCameraController* mFreeCamControl;
-            OrbitCameraController* mOrbitCamControl;
-            CameraController* mCurrentCamControl;
+        int mPrevMouseX, mPrevMouseY;
 
-        public slots:
-            void update(double dt);
+        /// Tells update that camera isn't set
+        bool mCamPositionSet;
 
-        protected slots:
+        FreeCameraController* mFreeCamControl;
+        OrbitCameraController* mOrbitCamControl;
+        CameraController* mCurrentCamControl;
 
-            virtual void settingChanged (const CSMPrefs::Setting *setting);
+    public slots:
+        void update(double dt);
 
-            void selectNavigationMode (const std::string& mode);
+    protected slots:
 
-        private slots:
+        virtual void settingChanged(const CSMPrefs::Setting* setting);
 
-            void selectLightingMode (const std::string& mode);
+        void selectNavigationMode(const std::string& mode);
 
-        signals:
+    private slots:
 
-            void focusToolbarRequest();
-    };
+        void selectLightingMode(const std::string& mode);
 
+    signals:
+
+        void focusToolbarRequest();
+    };
 
-    // There are rendering glitches when using multiple Viewer instances, work around using CompositeViewer with multiple views
+    // There are rendering glitches when using multiple Viewer instances, work around using CompositeViewer with
+    // multiple views
     class CompositeViewer : public QObject, public osgViewer::CompositeViewer
     {
-            Q_OBJECT
-        public:
-            CompositeViewer();
+        Q_OBJECT
+    public:
+        CompositeViewer();
 
-            static CompositeViewer& get();
+        static CompositeViewer& get();
 
-            QTimer mTimer;
+        QTimer mTimer;
 
-        private:
-            osg::Timer mFrameTimer;
-            double mSimulationTime;
+    private:
+        osg::Timer mFrameTimer;
+        double mSimulationTime;
 
-        public slots:
-            void update();
+    public slots:
+        void update();
 
-        signals:
-            void simulationUpdated(double dt);
+    signals:
+        void simulationUpdated(double dt);
     };
 
 }
diff --git a/apps/opencs/view/render/selectionmode.cpp b/apps/opencs/view/render/selectionmode.cpp
index 431181d5e7..23eb0cd75a 100644
--- a/apps/opencs/view/render/selectionmode.cpp
+++ b/apps/opencs/view/render/selectionmode.cpp
@@ -1,40 +1,43 @@
 #include "selectionmode.hpp"
 
-#include <QMenu>
 #include <QAction>
+#include <QMenu>
 
 #include "worldspacewidget.hpp"
 
 namespace CSVRender
 {
-    SelectionMode::SelectionMode(CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget,
-        unsigned int interactionMask)
+    SelectionMode::SelectionMode(
+        CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget, unsigned int interactionMask)
         : SceneToolMode(parent, "Selection mode")
         , mWorldspaceWidget(worldspaceWidget)
         , mInteractionMask(interactionMask)
     {
         addButton(":scenetoolbar/selection-mode-cube", "cube-centre",
             "Centred cube"
-            "<ul><li>Drag with {scene-select-primary} for primary select or {scene-select-secondary} for secondary select "
-                "from the centre of the selection cube outwards.</li>"
+            "<ul><li>Drag with {scene-select-primary} for primary select or {scene-select-secondary} for secondary "
+            "select "
+            "from the centre of the selection cube outwards.</li>"
             "<li>The selection cube is aligned to the word space axis</li>"
             "<li>If context selection mode is enabled, a drag with {scene-edit-primary} or {scene-edit-secondary} not "
-                "starting on an instance will have the same effect</li>"
+            "starting on an instance will have the same effect</li>"
             "</ul>");
         addButton(":scenetoolbar/selection-mode-cube-corner", "cube-corner",
             "Cube corner to corner"
-            "<ul><li>Drag with {scene-select-primary} for primary select or {scene-select-secondary} for secondary select "
-                "from one corner of the selection cube to the opposite corner</li>"
+            "<ul><li>Drag with {scene-select-primary} for primary select or {scene-select-secondary} for secondary "
+            "select "
+            "from one corner of the selection cube to the opposite corner</li>"
             "<li>The selection cube is aligned to the word space axis</li>"
             "<li>If context selection mode is enabled, a drag with {scene-edit-primary} or {scene-edit-secondary} not "
-                "starting on an instance will have the same effect</li>"
+            "starting on an instance will have the same effect</li>"
             "</ul>");
         addButton(":scenetoolbar/selection-mode-cube-sphere", "sphere",
             "Centred sphere"
-            "<ul><li>Drag with {scene-select-primary} for primary select or {scene-select-secondary} for secondary select  "
-                "from the centre of the selection sphere outwards</li>"
+            "<ul><li>Drag with {scene-select-primary} for primary select or {scene-select-secondary} for secondary "
+            "select  "
+            "from the centre of the selection sphere outwards</li>"
             "<li>If context selection mode is enabled, a drag with {scene-edit-primary} or {scene-edit-secondary} not "
-                "starting on an instance will have the same effect</li>"
+            "starting on an instance will have the same effect</li>"
             "</ul>");
 
         mSelectAll = new QAction("Select all", this);
@@ -51,7 +54,7 @@ namespace CSVRender
         return mWorldspaceWidget;
     }
 
-    bool SelectionMode::createContextMenu (QMenu* menu)
+    bool SelectionMode::createContextMenu(QMenu* menu)
     {
         if (menu)
         {
diff --git a/apps/opencs/view/render/selectionmode.hpp b/apps/opencs/view/render/selectionmode.hpp
index 28e44b85b1..8aa82f24b6 100644
--- a/apps/opencs/view/render/selectionmode.hpp
+++ b/apps/opencs/view/render/selectionmode.hpp
@@ -11,38 +11,35 @@ namespace CSVRender
 
     class SelectionMode : public CSVWidget::SceneToolMode
     {
-            Q_OBJECT
-
-        public:
-
-            SelectionMode(CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget,
-                unsigned int interactionMask);
-
-        protected:
-
-            WorldspaceWidget& getWorldspaceWidget();
-
-            /// Add context menu items to \a menu.
-            ///
-            /// \attention menu can be a 0-pointer
-            ///
-            /// \return Have there been any menu items to be added (if menu is 0 and there
-            /// items to be added, the function must return true anyway.
-            bool createContextMenu (QMenu* menu) override;
-
-        private:
-
-            WorldspaceWidget& mWorldspaceWidget;
-            unsigned int mInteractionMask;
-            QAction* mSelectAll;
-            QAction* mDeselectAll;
-            QAction* mInvertSelection;
-
-        protected slots:
-
-            virtual void selectAll();
-            virtual void clearSelection();
-            virtual void invertSelection();
+        Q_OBJECT
+
+    public:
+        SelectionMode(
+            CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget, unsigned int interactionMask);
+
+    protected:
+        WorldspaceWidget& getWorldspaceWidget();
+
+        /// Add context menu items to \a menu.
+        ///
+        /// \attention menu can be a 0-pointer
+        ///
+        /// \return Have there been any menu items to be added (if menu is 0 and there
+        /// items to be added, the function must return true anyway.
+        bool createContextMenu(QMenu* menu) override;
+
+    private:
+        WorldspaceWidget& mWorldspaceWidget;
+        unsigned int mInteractionMask;
+        QAction* mSelectAll;
+        QAction* mDeselectAll;
+        QAction* mInvertSelection;
+
+    protected slots:
+
+        virtual void selectAll();
+        virtual void clearSelection();
+        virtual void invertSelection();
     };
 }
 
diff --git a/apps/opencs/view/render/tagbase.cpp b/apps/opencs/view/render/tagbase.cpp
index 61a94215dd..bbbbc78390 100644
--- a/apps/opencs/view/render/tagbase.cpp
+++ b/apps/opencs/view/render/tagbase.cpp
@@ -1,14 +1,17 @@
 
 #include "tagbase.hpp"
 
-CSVRender::TagBase::TagBase (Mask mask) : mMask (mask) {}
+CSVRender::TagBase::TagBase(Mask mask)
+    : mMask(mask)
+{
+}
 
 CSVRender::Mask CSVRender::TagBase::getMask() const
 {
     return mMask;
 }
 
-QString CSVRender::TagBase::getToolTip (bool hideBasics, const WorldspaceHitResult& /*hit*/) const
+QString CSVRender::TagBase::getToolTip(bool hideBasics, const WorldspaceHitResult& /*hit*/) const
 {
     return "";
 }
diff --git a/apps/opencs/view/render/tagbase.hpp b/apps/opencs/view/render/tagbase.hpp
index 50295d508d..a93267b6f4 100644
--- a/apps/opencs/view/render/tagbase.hpp
+++ b/apps/opencs/view/render/tagbase.hpp
@@ -13,16 +13,14 @@ namespace CSVRender
 
     class TagBase : public osg::Referenced
     {
-            Mask mMask;
+        Mask mMask;
 
-        public:
+    public:
+        TagBase(Mask mask);
 
-            TagBase (Mask mask);
-
-            Mask getMask() const;
-
-            virtual QString getToolTip (bool hideBasics, const WorldspaceHitResult& hit) const;
+        Mask getMask() const;
 
+        virtual QString getToolTip(bool hideBasics, const WorldspaceHitResult& hit) const;
     };
 }
 
diff --git a/apps/opencs/view/render/terrainselection.cpp b/apps/opencs/view/render/terrainselection.cpp
index dc1886d57c..b8ef4bad0d 100644
--- a/apps/opencs/view/render/terrainselection.cpp
+++ b/apps/opencs/view/render/terrainselection.cpp
@@ -2,8 +2,8 @@
 
 #include <algorithm>
 
-#include <osg/Group>
 #include <osg/Geometry>
+#include <osg/Group>
 
 #include <components/esm3/loadland.hpp>
 
@@ -13,8 +13,11 @@
 #include "cell.hpp"
 #include "worldspacewidget.hpp"
 
-CSVRender::TerrainSelection::TerrainSelection(osg::Group* parentNode, WorldspaceWidget *worldspaceWidget, TerrainSelectionType type):
-mParentNode(parentNode), mWorldspaceWidget (worldspaceWidget), mSelectionType(type)
+CSVRender::TerrainSelection::TerrainSelection(
+    osg::Group* parentNode, WorldspaceWidget* worldspaceWidget, TerrainSelectionType type)
+    : mParentNode(parentNode)
+    , mWorldspaceWidget(worldspaceWidget)
+    , mSelectionType(type)
 {
     mGeometry = new osg::Geometry();
 
@@ -36,7 +39,7 @@ std::vector<std::pair<int, int>> CSVRender::TerrainSelection::getTerrainSelectio
     return mSelection;
 }
 
-void CSVRender::TerrainSelection::onlySelect(const std::vector<std::pair<int, int>> &localPositions)
+void CSVRender::TerrainSelection::onlySelect(const std::vector<std::pair<int, int>>& localPositions)
 {
     mSelection = localPositions;
 
@@ -65,7 +68,8 @@ void CSVRender::TerrainSelection::clearTemporarySelection()
 
 void CSVRender::TerrainSelection::activate()
 {
-    if (!mParentNode->containsNode(mSelectionNode)) mParentNode->addChild(mSelectionNode);
+    if (!mParentNode->containsNode(mSelectionNode))
+        mParentNode->addChild(mSelectionNode);
 }
 
 void CSVRender::TerrainSelection::deactivate()
@@ -78,20 +82,23 @@ void CSVRender::TerrainSelection::update()
     mSelectionNode->removeChild(mGeometry);
     mGeometry = new osg::Geometry();
 
-    const osg::ref_ptr<osg::Vec3Array> vertices (new osg::Vec3Array);
+    const osg::ref_ptr<osg::Vec3Array> vertices(new osg::Vec3Array);
 
     switch (mSelectionType)
     {
-        case TerrainSelectionType::Texture : drawTextureSelection(vertices);
-        break;
-        case TerrainSelectionType::Shape : drawShapeSelection(vertices);
-        break;
+        case TerrainSelectionType::Texture:
+            drawTextureSelection(vertices);
+            break;
+        case TerrainSelectionType::Shape:
+            drawShapeSelection(vertices);
+            break;
     }
 
     mGeometry->setVertexArray(vertices);
     osg::ref_ptr<osg::DrawArrays> drawArrays = new osg::DrawArrays(osg::PrimitiveSet::LINES);
     drawArrays->setCount(vertices->size());
-    if (vertices->size() != 0) mGeometry->addPrimitiveSet(drawArrays);
+    if (vertices->size() != 0)
+        mGeometry->addPrimitiveSet(drawArrays);
     mSelectionNode->addChild(mGeometry);
 }
 
@@ -99,10 +106,10 @@ void CSVRender::TerrainSelection::drawShapeSelection(const osg::ref_ptr<osg::Vec
 {
     if (!mSelection.empty())
     {
-        for (std::pair<int, int> &localPos : mSelection)
+        for (std::pair<int, int>& localPos : mSelection)
         {
-            int x (localPos.first);
-            int y (localPos.second);
+            int x(localPos.first);
+            int y(localPos.second);
 
             float xWorldCoord(CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(x));
             float yWorldCoord(CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(y));
@@ -110,13 +117,17 @@ void CSVRender::TerrainSelection::drawShapeSelection(const osg::ref_ptr<osg::Vec
             osg::Vec3f pointXY(xWorldCoord, yWorldCoord, calculateLandHeight(x, y));
 
             vertices->push_back(pointXY);
-            vertices->push_back(osg::Vec3f(xWorldCoord, CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(y - 1), calculateLandHeight(x, y - 1)));
+            vertices->push_back(osg::Vec3f(xWorldCoord, CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(y - 1),
+                calculateLandHeight(x, y - 1)));
             vertices->push_back(pointXY);
-            vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(x - 1), yWorldCoord, calculateLandHeight(x - 1, y)));
+            vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(x - 1), yWorldCoord,
+                calculateLandHeight(x - 1, y)));
             vertices->push_back(pointXY);
-            vertices->push_back(osg::Vec3f(xWorldCoord, CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(y + 1), calculateLandHeight(x, y + 1)));
+            vertices->push_back(osg::Vec3f(xWorldCoord, CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(y + 1),
+                calculateLandHeight(x, y + 1)));
             vertices->push_back(pointXY);
-            vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(x + 1), yWorldCoord, calculateLandHeight(x + 1, y)));
+            vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(x + 1), yWorldCoord,
+                calculateLandHeight(x + 1, y)));
         }
     }
 }
@@ -125,14 +136,15 @@ void CSVRender::TerrainSelection::drawTextureSelection(const osg::ref_ptr<osg::V
 {
     if (!mSelection.empty())
     {
-        const int landHeightsNudge = (ESM::Land::REAL_SIZE / ESM::Land::LAND_SIZE) / (ESM::Land::LAND_SIZE - 1); // Does this work with all land size configurations?
+        const int landHeightsNudge = (ESM::Land::REAL_SIZE / ESM::Land::LAND_SIZE)
+            / (ESM::Land::LAND_SIZE - 1); // Does this work with all land size configurations?
 
         const int textureSizeToLandSizeModifier = (ESM::Land::LAND_SIZE - 1) / ESM::Land::LAND_TEXTURE_SIZE;
 
-        for (std::pair<int, int> &localPos : mSelection)
+        for (std::pair<int, int>& localPos : mSelection)
         {
-            int x (localPos.first);
-            int y (localPos.second);
+            int x(localPos.first);
+            int y(localPos.second);
 
             // convert texture selection to global vertex coordinates at selection box corners
             int x1 = x * textureSizeToLandSizeModifier + landHeightsNudge;
@@ -145,55 +157,75 @@ void CSVRender::TerrainSelection::drawTextureSelection(const osg::ref_ptr<osg::V
             const auto north = std::find(mSelection.begin(), mSelection.end(), std::make_pair(x, y + 1));
             if (north == mSelection.end())
             {
-                for(int i = 1; i < (textureSizeToLandSizeModifier + 1); i++)
+                for (int i = 1; i < (textureSizeToLandSizeModifier + 1); i++)
                 {
-                    float drawPreviousX = CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x) + (i - 1) * (ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
-                    float drawCurrentX = CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x) + i * (ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
-                    vertices->push_back(osg::Vec3f(drawPreviousX, CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y + 1), calculateLandHeight(x1+(i-1), y2)));
-                    vertices->push_back(osg::Vec3f(drawCurrentX, CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y + 1), calculateLandHeight(x1+i, y2)));
+                    float drawPreviousX = CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x)
+                        + (i - 1) * (ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
+                    float drawCurrentX = CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x)
+                        + i * (ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
+                    vertices->push_back(
+                        osg::Vec3f(drawPreviousX, CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y + 1),
+                            calculateLandHeight(x1 + (i - 1), y2)));
+                    vertices->push_back(
+                        osg::Vec3f(drawCurrentX, CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y + 1),
+                            calculateLandHeight(x1 + i, y2)));
                 }
             }
 
             const auto south = std::find(mSelection.begin(), mSelection.end(), std::make_pair(x, y - 1));
             if (south == mSelection.end())
             {
-                for(int i = 1; i < (textureSizeToLandSizeModifier + 1); i++)
+                for (int i = 1; i < (textureSizeToLandSizeModifier + 1); i++)
                 {
-                    float drawPreviousX = CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x) + (i - 1) *(ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
-                    float drawCurrentX = CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x) + i * (ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
-                    vertices->push_back(osg::Vec3f(drawPreviousX, CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y), calculateLandHeight(x1+(i-1), y1)));
-                    vertices->push_back(osg::Vec3f(drawCurrentX, CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y), calculateLandHeight(x1+i, y1)));
+                    float drawPreviousX = CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x)
+                        + (i - 1) * (ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
+                    float drawCurrentX = CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x)
+                        + i * (ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
+                    vertices->push_back(
+                        osg::Vec3f(drawPreviousX, CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y),
+                            calculateLandHeight(x1 + (i - 1), y1)));
+                    vertices->push_back(osg::Vec3f(drawCurrentX,
+                        CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y), calculateLandHeight(x1 + i, y1)));
                 }
             }
 
             const auto east = std::find(mSelection.begin(), mSelection.end(), std::make_pair(x + 1, y));
             if (east == mSelection.end())
             {
-                for(int i = 1; i < (textureSizeToLandSizeModifier + 1); i++)
+                for (int i = 1; i < (textureSizeToLandSizeModifier + 1); i++)
                 {
-                    float drawPreviousY = CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y) + (i - 1) * (ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
-                    float drawCurrentY = CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y) + i * (ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
-                    vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x + 1), drawPreviousY, calculateLandHeight(x2, y1+(i-1))));
-                    vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x + 1), drawCurrentY, calculateLandHeight(x2, y1+i)));
+                    float drawPreviousY = CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y)
+                        + (i - 1) * (ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
+                    float drawCurrentY = CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y)
+                        + i * (ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
+                    vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x + 1),
+                        drawPreviousY, calculateLandHeight(x2, y1 + (i - 1))));
+                    vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x + 1),
+                        drawCurrentY, calculateLandHeight(x2, y1 + i)));
                 }
             }
 
             const auto west = std::find(mSelection.begin(), mSelection.end(), std::make_pair(x - 1, y));
             if (west == mSelection.end())
             {
-                for(int i = 1; i < (textureSizeToLandSizeModifier + 1); i++)
+                for (int i = 1; i < (textureSizeToLandSizeModifier + 1); i++)
                 {
-                    float drawPreviousY = CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y) + (i - 1) * (ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
-                    float drawCurrentY = CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y) + i * (ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
-                    vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x), drawPreviousY, calculateLandHeight(x1, y1+(i-1))));
-                    vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x), drawCurrentY, calculateLandHeight(x1, y1+i)));
+                    float drawPreviousY = CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y)
+                        + (i - 1) * (ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
+                    float drawCurrentY = CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y)
+                        + i * (ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
+                    vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x),
+                        drawPreviousY, calculateLandHeight(x1, y1 + (i - 1))));
+                    vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x),
+                        drawCurrentY, calculateLandHeight(x1, y1 + i)));
                 }
             }
         }
     }
 }
 
-void CSVRender::TerrainSelection::handleSelection(const std::vector<std::pair<int, int>>& localPositions, SelectionMethod selectionMethod)
+void CSVRender::TerrainSelection::handleSelection(
+    const std::vector<std::pair<int, int>>& localPositions, SelectionMethod selectionMethod)
 {
     for (auto const& localPos : localPositions)
     {
@@ -248,14 +280,14 @@ bool CSVRender::TerrainSelection::noCell(const std::string& cellId)
 {
     CSMDoc::Document& document = mWorldspaceWidget->getDocument();
     const CSMWorld::IdCollection<CSMWorld::Cell>& cellCollection = document.getData().getCells();
-    return cellCollection.searchId (cellId) == -1;
+    return cellCollection.searchId(cellId) == -1;
 }
 
 bool CSVRender::TerrainSelection::noLand(const std::string& cellId)
 {
     CSMDoc::Document& document = mWorldspaceWidget->getDocument();
     const CSMWorld::IdCollection<CSMWorld::Land>& landCollection = document.getData().getLand();
-    return landCollection.searchId (cellId) == -1;
+    return landCollection.searchId(cellId) == -1;
 }
 
 bool CSVRender::TerrainSelection::noLandLoaded(const std::string& cellId)
@@ -267,7 +299,8 @@ bool CSVRender::TerrainSelection::noLandLoaded(const std::string& cellId)
 
 bool CSVRender::TerrainSelection::isLandLoaded(const std::string& cellId)
 {
-    if (!noCell(cellId) && !noLand(cellId) && !noLandLoaded(cellId)) return true;
+    if (!noCell(cellId) && !noLand(cellId) && !noLandLoaded(cellId))
+        return true;
     return false;
 }
 
@@ -278,7 +311,7 @@ int CSVRender::TerrainSelection::calculateLandHeight(int x, int y) // global ver
     int localX = x - cellX * (ESM::Land::LAND_SIZE - 1);
     int localY = y - cellY * (ESM::Land::LAND_SIZE - 1);
 
-    CSMWorld::CellCoordinates coords (cellX, cellY);
+    CSMWorld::CellCoordinates coords(cellX, cellY);
 
     float landHeight = 0.f;
     if (CSVRender::Cell* cell = dynamic_cast<CSVRender::Cell*>(mWorldspaceWidget->getCell(coords)))
@@ -289,8 +322,9 @@ int CSVRender::TerrainSelection::calculateLandHeight(int x, int y) // global ver
     {
         CSMDoc::Document& document = mWorldspaceWidget->getDocument();
         std::string cellId = CSMWorld::CellCoordinates::generateId(cellX, cellY);
-        const ESM::Land::LandData* landData = document.getData().getLand().getRecord(cellId).get().getLandData(ESM::Land::DATA_VHGT);
-        return landData->mHeights[localY*ESM::Land::LAND_SIZE + localX];
+        const ESM::Land::LandData* landData
+            = document.getData().getLand().getRecord(cellId).get().getLandData(ESM::Land::DATA_VHGT);
+        return landData->mHeights[localY * ESM::Land::LAND_SIZE + localX];
     }
 
     return landHeight;
diff --git a/apps/opencs/view/render/terrainselection.hpp b/apps/opencs/view/render/terrainselection.hpp
index 864414ad34..e0fbbd28f3 100644
--- a/apps/opencs/view/render/terrainselection.hpp
+++ b/apps/opencs/view/render/terrainselection.hpp
@@ -4,9 +4,9 @@
 #include <utility>
 #include <vector>
 
+#include <osg/PositionAttitudeTransform>
 #include <osg/Vec3d>
 #include <osg/ref_ptr>
-#include <osg/PositionAttitudeTransform>
 
 #include <components/esm3/loadland.hpp>
 
@@ -37,51 +37,50 @@ namespace CSVRender
     /// \brief Class handling the terrain selection data and rendering
     class TerrainSelection
     {
-        public:
-
-            TerrainSelection(osg::Group* parentNode, WorldspaceWidget *worldspaceWidget, TerrainSelectionType type);
-            ~TerrainSelection();
-
-            void onlySelect(const std::vector<std::pair<int, int>> &localPositions);
-            void addSelect(const std::vector<std::pair<int, int>>& localPositions);
-            void removeSelect(const std::vector<std::pair<int, int>>& localPositions);
-            void toggleSelect(const std::vector<std::pair<int, int>> &localPositions);
-            void clearTemporarySelection();
-
-            void activate();
-            void deactivate();
+    public:
+        TerrainSelection(osg::Group* parentNode, WorldspaceWidget* worldspaceWidget, TerrainSelectionType type);
+        ~TerrainSelection();
 
-            std::vector<std::pair<int, int>> getTerrainSelection() const;
+        void onlySelect(const std::vector<std::pair<int, int>>& localPositions);
+        void addSelect(const std::vector<std::pair<int, int>>& localPositions);
+        void removeSelect(const std::vector<std::pair<int, int>>& localPositions);
+        void toggleSelect(const std::vector<std::pair<int, int>>& localPositions);
+        void clearTemporarySelection();
 
-            void update();
+        void activate();
+        void deactivate();
 
-        protected:
+        std::vector<std::pair<int, int>> getTerrainSelection() const;
 
-            void drawShapeSelection(const osg::ref_ptr<osg::Vec3Array> vertices);
-            void drawTextureSelection(const osg::ref_ptr<osg::Vec3Array> vertices);
+        void update();
 
-            int calculateLandHeight(int x, int y);
+    protected:
+        void drawShapeSelection(const osg::ref_ptr<osg::Vec3Array> vertices);
+        void drawTextureSelection(const osg::ref_ptr<osg::Vec3Array> vertices);
 
-        private:
+        int calculateLandHeight(int x, int y);
 
-            void handleSelection(const std::vector<std::pair<int, int>>& localPositions, SelectionMethod selectionMethod);
+    private:
+        void handleSelection(const std::vector<std::pair<int, int>>& localPositions, SelectionMethod selectionMethod);
 
-            bool noCell(const std::string& cellId);
+        bool noCell(const std::string& cellId);
 
-            bool noLand(const std::string& cellId);
+        bool noLand(const std::string& cellId);
 
-            bool noLandLoaded(const std::string& cellId);
+        bool noLandLoaded(const std::string& cellId);
 
-            bool isLandLoaded(const std::string& cellId);
+        bool isLandLoaded(const std::string& cellId);
 
-            osg::Group* mParentNode;
-            WorldspaceWidget *mWorldspaceWidget;
-            osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
-            osg::ref_ptr<osg::Geometry> mGeometry;
-            osg::ref_ptr<osg::Group> mSelectionNode;
-            std::vector<std::pair<int, int>> mSelection; // Global terrain selection coordinate in either vertex or texture units
-            std::vector<std::pair<int, int>> mTemporarySelection; // Used during toggle to compare the most recent drag operation
-            TerrainSelectionType mSelectionType;
+        osg::Group* mParentNode;
+        WorldspaceWidget* mWorldspaceWidget;
+        osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
+        osg::ref_ptr<osg::Geometry> mGeometry;
+        osg::ref_ptr<osg::Group> mSelectionNode;
+        std::vector<std::pair<int, int>>
+            mSelection; // Global terrain selection coordinate in either vertex or texture units
+        std::vector<std::pair<int, int>>
+            mTemporarySelection; // Used during toggle to compare the most recent drag operation
+        TerrainSelectionType mSelectionType;
     };
 }
 
diff --git a/apps/opencs/view/render/terrainshapemode.cpp b/apps/opencs/view/render/terrainshapemode.cpp
index af39d23cf5..be3ed672d8 100644
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@@ -1,39 +1,41 @@
 #include "terrainshapemode.hpp"
 
 #include <algorithm>
-#include <string>
 #include <memory>
+#include <string>
 
-#include <QWidget>
-#include <QIcon>
-#include <QEvent>
 #include <QDropEvent>
+#include <QEvent>
+#include <QIcon>
+#include <QWidget>
 
 #include <osg/Group>
 #include <osg/Vec3f>
 
-#include <components/esm3/loadland.hpp>
 #include <components/debug/debuglog.hpp>
+#include <components/esm3/loadland.hpp>
 
 #include "../widget/scenetoolbar.hpp"
 #include "../widget/scenetoolshapebrush.hpp"
 
 #include "../../model/prefs/state.hpp"
-#include "../../model/world/idtree.hpp"
 #include "../../model/world/commands.hpp"
+#include "../../model/world/idtree.hpp"
 
 #include "brushdraw.hpp"
 #include "commands.hpp"
 #include "editmode.hpp"
-#include "pagedworldspacewidget.hpp"
 #include "mask.hpp"
+#include "pagedworldspacewidget.hpp"
 #include "tagbase.hpp"
 #include "terrainselection.hpp"
 #include "worldspacewidget.hpp"
 
-CSVRender::TerrainShapeMode::TerrainShapeMode (WorldspaceWidget *worldspaceWidget, osg::Group* parentNode, QWidget *parent)
-: EditMode (worldspaceWidget, QIcon {":scenetoolbar/editing-terrain-shape"}, Mask_Terrain, "Terrain land editing", parent),
-    mParentNode(parentNode)
+CSVRender::TerrainShapeMode::TerrainShapeMode(
+    WorldspaceWidget* worldspaceWidget, osg::Group* parentNode, QWidget* parent)
+    : EditMode(
+        worldspaceWidget, QIcon{ ":scenetoolbar/editing-terrain-shape" }, Mask_Terrain, "Terrain land editing", parent)
+    , mParentNode(parentNode)
 {
 }
 
@@ -41,32 +43,40 @@ void CSVRender::TerrainShapeMode::activate(CSVWidget::SceneToolbar* toolbar)
 {
     if (!mTerrainShapeSelection)
     {
-        mTerrainShapeSelection = std::make_shared<TerrainSelection>(mParentNode, &getWorldspaceWidget(), TerrainSelectionType::Shape);
+        mTerrainShapeSelection
+            = std::make_shared<TerrainSelection>(mParentNode, &getWorldspaceWidget(), TerrainSelectionType::Shape);
     }
 
-    if(!mShapeBrushScenetool)
+    if (!mShapeBrushScenetool)
     {
-        mShapeBrushScenetool = new CSVWidget::SceneToolShapeBrush (toolbar, "scenetoolshapebrush", getWorldspaceWidget().getDocument());
-        connect(mShapeBrushScenetool, &CSVWidget::SceneTool::clicked, mShapeBrushScenetool, &CSVWidget::SceneToolShapeBrush::activate);
-        connect(mShapeBrushScenetool->mShapeBrushWindow, &CSVWidget::ShapeBrushWindow::passBrushSize, this, &TerrainShapeMode::setBrushSize);
-        connect(mShapeBrushScenetool->mShapeBrushWindow, &CSVWidget::ShapeBrushWindow::passBrushShape, this, &TerrainShapeMode::setBrushShape);
-        connect(mShapeBrushScenetool->mShapeBrushWindow->mSizeSliders->mBrushSizeSlider, &QSlider::valueChanged, this, &TerrainShapeMode::setBrushSize);
-        connect(mShapeBrushScenetool->mShapeBrushWindow->mToolSelector, qOverload<int>(&QComboBox::currentIndexChanged), this, &TerrainShapeMode::setShapeEditTool);
-        connect(mShapeBrushScenetool->mShapeBrushWindow->mToolStrengthSlider, &QSlider::valueChanged, this, &TerrainShapeMode::setShapeEditToolStrength);
+        mShapeBrushScenetool
+            = new CSVWidget::SceneToolShapeBrush(toolbar, "scenetoolshapebrush", getWorldspaceWidget().getDocument());
+        connect(mShapeBrushScenetool, &CSVWidget::SceneTool::clicked, mShapeBrushScenetool,
+            &CSVWidget::SceneToolShapeBrush::activate);
+        connect(mShapeBrushScenetool->mShapeBrushWindow, &CSVWidget::ShapeBrushWindow::passBrushSize, this,
+            &TerrainShapeMode::setBrushSize);
+        connect(mShapeBrushScenetool->mShapeBrushWindow, &CSVWidget::ShapeBrushWindow::passBrushShape, this,
+            &TerrainShapeMode::setBrushShape);
+        connect(mShapeBrushScenetool->mShapeBrushWindow->mSizeSliders->mBrushSizeSlider, &QSlider::valueChanged, this,
+            &TerrainShapeMode::setBrushSize);
+        connect(mShapeBrushScenetool->mShapeBrushWindow->mToolSelector, qOverload<int>(&QComboBox::currentIndexChanged),
+            this, &TerrainShapeMode::setShapeEditTool);
+        connect(mShapeBrushScenetool->mShapeBrushWindow->mToolStrengthSlider, &QSlider::valueChanged, this,
+            &TerrainShapeMode::setShapeEditToolStrength);
     }
 
     if (!mBrushDraw)
         mBrushDraw = std::make_unique<BrushDraw>(mParentNode);
 
     EditMode::activate(toolbar);
-    toolbar->addTool (mShapeBrushScenetool);
+    toolbar->addTool(mShapeBrushScenetool);
 }
 
 void CSVRender::TerrainShapeMode::deactivate(CSVWidget::SceneToolbar* toolbar)
 {
-    if(mShapeBrushScenetool)
+    if (mShapeBrushScenetool)
     {
-        toolbar->removeTool (mShapeBrushScenetool);
+        toolbar->removeTool(mShapeBrushScenetool);
     }
 
     if (mTerrainShapeSelection)
@@ -80,7 +90,7 @@ void CSVRender::TerrainShapeMode::deactivate(CSVWidget::SceneToolbar* toolbar)
     EditMode::deactivate(toolbar);
 }
 
-void CSVRender::TerrainShapeMode::primaryOpenPressed (const WorldspaceHitResult& hit) // Apply changes here
+void CSVRender::TerrainShapeMode::primaryOpenPressed(const WorldspaceHitResult& hit) // Apply changes here
 {
 }
 
@@ -101,7 +111,7 @@ void CSVRender::TerrainShapeMode::primaryEditPressed(const WorldspaceHitResult&
 
 void CSVRender::TerrainShapeMode::primarySelectPressed(const WorldspaceHitResult& hit)
 {
-    if(hit.hit && hit.tag == nullptr)
+    if (hit.hit && hit.tag == nullptr)
     {
         selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 0);
         mTerrainShapeSelection->clearTemporarySelection();
@@ -110,16 +120,16 @@ void CSVRender::TerrainShapeMode::primarySelectPressed(const WorldspaceHitResult
 
 void CSVRender::TerrainShapeMode::secondarySelectPressed(const WorldspaceHitResult& hit)
 {
-    if(hit.hit && hit.tag == nullptr)
+    if (hit.hit && hit.tag == nullptr)
     {
         selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 1);
         mTerrainShapeSelection->clearTemporarySelection();
     }
 }
 
-bool CSVRender::TerrainShapeMode::primaryEditStartDrag (const QPoint& pos)
+bool CSVRender::TerrainShapeMode::primaryEditStartDrag(const QPoint& pos)
 {
-    WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
+    WorldspaceHitResult hit = getWorldspaceWidget().mousePick(pos, getWorldspaceWidget().getInteractionMask());
 
     mDragMode = InteractionType_PrimaryEdit;
 
@@ -134,14 +144,14 @@ bool CSVRender::TerrainShapeMode::primaryEditStartDrag (const QPoint& pos)
     return true;
 }
 
-bool CSVRender::TerrainShapeMode::secondaryEditStartDrag (const QPoint& pos)
+bool CSVRender::TerrainShapeMode::secondaryEditStartDrag(const QPoint& pos)
 {
     return false;
 }
 
-bool CSVRender::TerrainShapeMode::primarySelectStartDrag (const QPoint& pos)
+bool CSVRender::TerrainShapeMode::primarySelectStartDrag(const QPoint& pos)
 {
-    WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
+    WorldspaceHitResult hit = getWorldspaceWidget().mousePick(pos, getWorldspaceWidget().getInteractionMask());
     mDragMode = InteractionType_PrimarySelect;
     if (!hit.hit || hit.tag != nullptr)
     {
@@ -152,9 +162,9 @@ bool CSVRender::TerrainShapeMode::primarySelectStartDrag (const QPoint& pos)
     return true;
 }
 
-bool CSVRender::TerrainShapeMode::secondarySelectStartDrag (const QPoint& pos)
+bool CSVRender::TerrainShapeMode::secondarySelectStartDrag(const QPoint& pos)
 {
-    WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
+    WorldspaceHitResult hit = getWorldspaceWidget().mousePick(pos, getWorldspaceWidget().getInteractionMask());
     mDragMode = InteractionType_SecondarySelect;
     if (!hit.hit || hit.tag != nullptr)
     {
@@ -165,29 +175,33 @@ bool CSVRender::TerrainShapeMode::secondarySelectStartDrag (const QPoint& pos)
     return true;
 }
 
-void CSVRender::TerrainShapeMode::drag (const QPoint& pos, int diffX, int diffY, double speedFactor)
+void CSVRender::TerrainShapeMode::drag(const QPoint& pos, int diffX, int diffY, double speedFactor)
 {
     if (mDragMode == InteractionType_PrimaryEdit)
     {
-        WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
+        WorldspaceHitResult hit = getWorldspaceWidget().mousePick(pos, getWorldspaceWidget().getInteractionMask());
         mTotalDiffY += diffY;
         if (mIsEditing)
         {
-            if (mShapeEditTool == ShapeEditTool_Drag) editTerrainShapeGrid(CSMWorld::CellCoordinates::toVertexCoords(mEditingPos), true);
-                else editTerrainShapeGrid(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), true);
+            if (mShapeEditTool == ShapeEditTool_Drag)
+                editTerrainShapeGrid(CSMWorld::CellCoordinates::toVertexCoords(mEditingPos), true);
+            else
+                editTerrainShapeGrid(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), true);
         }
     }
 
     if (mDragMode == InteractionType_PrimarySelect)
     {
-        WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
-        if (hit.hit && hit.tag == nullptr) selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 0);
+        WorldspaceHitResult hit = getWorldspaceWidget().mousePick(pos, getWorldspaceWidget().getInteractionMask());
+        if (hit.hit && hit.tag == nullptr)
+            selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 0);
     }
 
     if (mDragMode == InteractionType_SecondarySelect)
     {
-        WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
-        if (hit.hit && hit.tag == nullptr) selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 1);
+        WorldspaceHitResult hit = getWorldspaceWidget().mousePick(pos, getWorldspaceWidget().getInteractionMask());
+        if (hit.hit && hit.tag == nullptr)
+            selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 1);
     }
 }
 
@@ -204,16 +218,13 @@ void CSVRender::TerrainShapeMode::dragCompleted(const QPoint& pos)
     }
 }
 
-
 void CSVRender::TerrainShapeMode::dragAborted()
 {
-     clearTransientEdits();
-     mDragMode = InteractionType_None;
+    clearTransientEdits();
+    mDragMode = InteractionType_None;
 }
 
-void CSVRender::TerrainShapeMode::dragWheel (int diff, double speedFactor)
-{
-}
+void CSVRender::TerrainShapeMode::dragWheel(int diff, double speedFactor) {}
 
 void CSVRender::TerrainShapeMode::sortAndLimitAlteredCells()
 {
@@ -226,19 +237,23 @@ void CSVRender::TerrainShapeMode::sortAndLimitAlteredCells()
     while (!passing) // Multiple passes are needed when steepness problems arise for both x and y axis simultaneously
     {
         passing = true;
-        for(CSMWorld::CellCoordinates cellCoordinates: mAlteredCells)
+        for (CSMWorld::CellCoordinates cellCoordinates : mAlteredCells)
         {
             limitAlteredHeights(cellCoordinates);
         }
-        std::reverse(mAlteredCells.begin(), mAlteredCells.end()); //Instead of alphabetical order, this should be fixed to sort cells by cell coordinates
-        for(CSMWorld::CellCoordinates cellCoordinates: mAlteredCells)
+        std::reverse(mAlteredCells.begin(),
+            mAlteredCells
+                .end()); // Instead of alphabetical order, this should be fixed to sort cells by cell coordinates
+        for (CSMWorld::CellCoordinates cellCoordinates : mAlteredCells)
         {
-            if (!limitAlteredHeights(cellCoordinates, true)) passing = false;
+            if (!limitAlteredHeights(cellCoordinates, true))
+                passing = false;
         }
         ++passes;
         if (passes > 2)
         {
-            Log(Debug::Warning) << "Warning: User edit exceeds accepted slope steepness. Automatic limiting has failed, edit has been discarded.";
+            Log(Debug::Warning) << "Warning: User edit exceeds accepted slope steepness. Automatic limiting has "
+                                   "failed, edit has been discarded.";
             clearTransientEdits();
             return;
         }
@@ -250,7 +265,8 @@ void CSVRender::TerrainShapeMode::clearTransientEdits()
     mTotalDiffY = 0;
     mIsEditing = false;
     mAlteredCells.clear();
-    if (CSVRender::PagedWorldspaceWidget *paged = dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget()))
+    if (CSVRender::PagedWorldspaceWidget* paged
+        = dynamic_cast<CSVRender::PagedWorldspaceWidget*>(&getWorldspaceWidget()))
         paged->resetAllAlteredHeights();
     mTerrainShapeSelection->update();
 }
@@ -258,10 +274,10 @@ void CSVRender::TerrainShapeMode::clearTransientEdits()
 void CSVRender::TerrainShapeMode::applyTerrainEditChanges()
 {
     CSMDoc::Document& document = getWorldspaceWidget().getDocument();
-    CSMWorld::IdTable& landTable = dynamic_cast<CSMWorld::IdTable&> (
-        *document.getData().getTableModel (CSMWorld::UniversalId::Type_Land));
-    CSMWorld::IdTable& ltexTable = dynamic_cast<CSMWorld::IdTable&> (
-        *document.getData().getTableModel (CSMWorld::UniversalId::Type_LandTextures));
+    CSMWorld::IdTable& landTable
+        = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_Land));
+    CSMWorld::IdTable& ltexTable
+        = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_LandTextures));
 
     int landshapeColumn = landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandHeightsIndex);
     int landnormalsColumn = landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandNormalsIndex);
@@ -270,26 +286,30 @@ void CSVRender::TerrainShapeMode::applyTerrainEditChanges()
 
     sortAndLimitAlteredCells();
 
-    undoStack.beginMacro ("Edit shape and normal records");
+    undoStack.beginMacro("Edit shape and normal records");
 
     // One command at the beginning of the macro for redrawing the terrain-selection grid when undoing the changes.
     undoStack.push(new DrawTerrainSelectionCommand(&getWorldspaceWidget()));
 
-    for(CSMWorld::CellCoordinates cellCoordinates: mAlteredCells)
+    for (CSMWorld::CellCoordinates cellCoordinates : mAlteredCells)
     {
         std::string cellId = CSMWorld::CellCoordinates::generateId(cellCoordinates.getX(), cellCoordinates.getY());
-        undoStack.push (new CSMWorld::TouchLandCommand(landTable, ltexTable, cellId));
-        const CSMWorld::LandHeightsColumn::DataType landShapePointer = landTable.data(landTable.getModelIndex(cellId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
+        undoStack.push(new CSMWorld::TouchLandCommand(landTable, ltexTable, cellId));
+        const CSMWorld::LandHeightsColumn::DataType landShapePointer
+            = landTable.data(landTable.getModelIndex(cellId, landshapeColumn))
+                  .value<CSMWorld::LandHeightsColumn::DataType>();
         CSMWorld::LandHeightsColumn::DataType landShapeNew(landShapePointer);
-        CSVRender::PagedWorldspaceWidget *paged = dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget());
+        CSVRender::PagedWorldspaceWidget* paged
+            = dynamic_cast<CSVRender::PagedWorldspaceWidget*>(&getWorldspaceWidget());
 
         // Generate land height record
-        for(int i = 0; i < ESM::Land::LAND_SIZE; ++i)
+        for (int i = 0; i < ESM::Land::LAND_SIZE; ++i)
         {
-            for(int j = 0; j < ESM::Land::LAND_SIZE; ++j)
+            for (int j = 0; j < ESM::Land::LAND_SIZE; ++j)
             {
                 if (paged && paged->getCellAlteredHeight(cellCoordinates, i, j))
-                    landShapeNew[j * ESM::Land::LAND_SIZE + i] = landShapePointer[j * ESM::Land::LAND_SIZE + i] + *paged->getCellAlteredHeight(cellCoordinates, i, j);
+                    landShapeNew[j * ESM::Land::LAND_SIZE + i] = landShapePointer[j * ESM::Land::LAND_SIZE + i]
+                        + *paged->getCellAlteredHeight(cellCoordinates, i, j);
                 else
                     landShapeNew[j * ESM::Land::LAND_SIZE + i] = 0;
             }
@@ -298,37 +318,59 @@ void CSVRender::TerrainShapeMode::applyTerrainEditChanges()
         pushEditToCommand(landShapeNew, document, landTable, cellId);
     }
 
-    for(CSMWorld::CellCoordinates cellCoordinates: mAlteredCells)
+    for (CSMWorld::CellCoordinates cellCoordinates : mAlteredCells)
     {
         std::string cellId = CSMWorld::CellCoordinates::generateId(cellCoordinates.getX(), cellCoordinates.getY());
-        const CSMWorld::LandHeightsColumn::DataType landShapePointer = landTable.data(landTable.getModelIndex(cellId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
-        const CSMWorld::LandHeightsColumn::DataType landRightShapePointer = landTable.data(landTable.getModelIndex(CSMWorld::CellCoordinates::generateId(cellCoordinates.getX() + 1, cellCoordinates.getY()), landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
-        const CSMWorld::LandHeightsColumn::DataType landDownShapePointer = landTable.data(landTable.getModelIndex(CSMWorld::CellCoordinates::generateId(cellCoordinates.getX(), cellCoordinates.getY() + 1), landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
-        const CSMWorld::LandNormalsColumn::DataType landNormalsPointer = landTable.data(landTable.getModelIndex(cellId, landnormalsColumn)).value<CSMWorld::LandNormalsColumn::DataType>();
+        const CSMWorld::LandHeightsColumn::DataType landShapePointer
+            = landTable.data(landTable.getModelIndex(cellId, landshapeColumn))
+                  .value<CSMWorld::LandHeightsColumn::DataType>();
+        const CSMWorld::LandHeightsColumn::DataType landRightShapePointer
+            = landTable
+                  .data(landTable.getModelIndex(
+                      CSMWorld::CellCoordinates::generateId(cellCoordinates.getX() + 1, cellCoordinates.getY()),
+                      landshapeColumn))
+                  .value<CSMWorld::LandHeightsColumn::DataType>();
+        const CSMWorld::LandHeightsColumn::DataType landDownShapePointer
+            = landTable
+                  .data(landTable.getModelIndex(
+                      CSMWorld::CellCoordinates::generateId(cellCoordinates.getX(), cellCoordinates.getY() + 1),
+                      landshapeColumn))
+                  .value<CSMWorld::LandHeightsColumn::DataType>();
+        const CSMWorld::LandNormalsColumn::DataType landNormalsPointer
+            = landTable.data(landTable.getModelIndex(cellId, landnormalsColumn))
+                  .value<CSMWorld::LandNormalsColumn::DataType>();
         CSMWorld::LandNormalsColumn::DataType landNormalsNew(landNormalsPointer);
 
         // Generate land normals record
-        for(int i = 0; i < ESM::Land::LAND_SIZE; ++i)
+        for (int i = 0; i < ESM::Land::LAND_SIZE; ++i)
         {
-            for(int j = 0; j < ESM::Land::LAND_SIZE; ++j)
+            for (int j = 0; j < ESM::Land::LAND_SIZE; ++j)
             {
                 osg::Vec3f v1(128, 0, 0);
                 osg::Vec3f v2(0, 128, 0);
 
-                if (i < ESM::Land::LAND_SIZE - 1) v1.z() = landShapePointer[j * ESM::Land::LAND_SIZE + i + 1] - landShapePointer[j * ESM::Land::LAND_SIZE + i];
+                if (i < ESM::Land::LAND_SIZE - 1)
+                    v1.z() = landShapePointer[j * ESM::Land::LAND_SIZE + i + 1]
+                        - landShapePointer[j * ESM::Land::LAND_SIZE + i];
                 else
                 {
-                    std::string shiftedCellId = CSMWorld::CellCoordinates::generateId(cellCoordinates.getX() + 1, cellCoordinates.getY());
+                    std::string shiftedCellId
+                        = CSMWorld::CellCoordinates::generateId(cellCoordinates.getX() + 1, cellCoordinates.getY());
                     if (isLandLoaded(shiftedCellId))
-                        v1.z() = landRightShapePointer[j * ESM::Land::LAND_SIZE + 1] - landShapePointer[j * ESM::Land::LAND_SIZE + i];
+                        v1.z() = landRightShapePointer[j * ESM::Land::LAND_SIZE + 1]
+                            - landShapePointer[j * ESM::Land::LAND_SIZE + i];
                 }
 
-                if (j < ESM::Land::LAND_SIZE - 1) v2.z() = landShapePointer[(j + 1) * ESM::Land::LAND_SIZE + i] - landShapePointer[j * ESM::Land::LAND_SIZE + i];
+                if (j < ESM::Land::LAND_SIZE - 1)
+                    v2.z() = landShapePointer[(j + 1) * ESM::Land::LAND_SIZE + i]
+                        - landShapePointer[j * ESM::Land::LAND_SIZE + i];
                 else
                 {
-                    std::string shiftedCellId = CSMWorld::CellCoordinates::generateId(cellCoordinates.getX(), cellCoordinates.getY() + 1);
+                    std::string shiftedCellId
+                        = CSMWorld::CellCoordinates::generateId(cellCoordinates.getX(), cellCoordinates.getY() + 1);
                     if (isLandLoaded(shiftedCellId))
-                        v2.z() = landDownShapePointer[ESM::Land::LAND_SIZE + i] - landShapePointer[j * ESM::Land::LAND_SIZE + i];
+                        v2.z() = landDownShapePointer[ESM::Land::LAND_SIZE + i]
+                            - landShapePointer[j * ESM::Land::LAND_SIZE + i];
                 }
 
                 osg::Vec3f normal = v1 ^ v2;
@@ -353,18 +395,22 @@ void CSVRender::TerrainShapeMode::applyTerrainEditChanges()
 float CSVRender::TerrainShapeMode::calculateBumpShape(float distance, int radius, float height)
 {
     float distancePerRadius = distance / radius;
-    return height - height * (3 * distancePerRadius * distancePerRadius - 2 * distancePerRadius * distancePerRadius * distancePerRadius);
+    return height
+        - height
+        * (3 * distancePerRadius * distancePerRadius - 2 * distancePerRadius * distancePerRadius * distancePerRadius);
 }
 
 void CSVRender::TerrainShapeMode::editTerrainShapeGrid(const std::pair<int, int>& vertexCoords, bool dragOperation)
 {
     int r = mBrushSize / 2;
-    if (r == 0) r = 1; // Prevent division by zero later, which might happen when mBrushSize == 1
+    if (r == 0)
+        r = 1; // Prevent division by zero later, which might happen when mBrushSize == 1
 
-    if (CSVRender::PagedWorldspaceWidget *paged =
-        dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget()))
+    if (CSVRender::PagedWorldspaceWidget* paged
+        = dynamic_cast<CSVRender::PagedWorldspaceWidget*>(&getWorldspaceWidget()))
     {
-        if (mShapeEditTool == ShapeEditTool_Drag) paged->resetAllAlteredHeights();
+        if (mShapeEditTool == ShapeEditTool_Drag)
+            paged->resetAllAlteredHeights();
     }
 
     if (mBrushShape == CSVWidget::BrushShape_Point)
@@ -373,45 +419,55 @@ void CSVRender::TerrainShapeMode::editTerrainShapeGrid(const std::pair<int, int>
         CSMWorld::CellCoordinates cellCoords = CSMWorld::CellCoordinates::fromId(cellId).first;
         int x = CSMWorld::CellCoordinates::vertexGlobalToInCellCoords(vertexCoords.first);
         int y = CSMWorld::CellCoordinates::vertexGlobalToInCellCoords(vertexCoords.second);
-        if (mShapeEditTool == ShapeEditTool_Drag) alterHeight(cellCoords, x, y, mTotalDiffY);
+        if (mShapeEditTool == ShapeEditTool_Drag)
+            alterHeight(cellCoords, x, y, mTotalDiffY);
         if (mShapeEditTool == ShapeEditTool_PaintToRaise || mShapeEditTool == ShapeEditTool_PaintToLower)
         {
             alterHeight(cellCoords, x, y, mShapeEditToolStrength);
-            float smoothMultiplier = static_cast<float>(CSMPrefs::get()["3D Scene Editing"]["landedit-post-smoothstrength"].toDouble());
-            if (CSMPrefs::get()["3D Scene Editing"]["landedit-post-smoothpainting"].isTrue()) smoothHeight(cellCoords, x, y, mShapeEditToolStrength * smoothMultiplier);
+            float smoothMultiplier
+                = static_cast<float>(CSMPrefs::get()["3D Scene Editing"]["landedit-post-smoothstrength"].toDouble());
+            if (CSMPrefs::get()["3D Scene Editing"]["landedit-post-smoothpainting"].isTrue())
+                smoothHeight(cellCoords, x, y, mShapeEditToolStrength * smoothMultiplier);
         }
-        if (mShapeEditTool == ShapeEditTool_Smooth) smoothHeight(cellCoords, x, y, mShapeEditToolStrength);
-        if (mShapeEditTool == ShapeEditTool_Flatten) flattenHeight(cellCoords, x, y, mShapeEditToolStrength, mTargetHeight);
+        if (mShapeEditTool == ShapeEditTool_Smooth)
+            smoothHeight(cellCoords, x, y, mShapeEditToolStrength);
+        if (mShapeEditTool == ShapeEditTool_Flatten)
+            flattenHeight(cellCoords, x, y, mShapeEditToolStrength, mTargetHeight);
     }
 
     if (mBrushShape == CSVWidget::BrushShape_Square)
     {
-        for(int i = vertexCoords.first - r; i <= vertexCoords.first + r; ++i)
+        for (int i = vertexCoords.first - r; i <= vertexCoords.first + r; ++i)
         {
-            for(int j = vertexCoords.second - r; j <= vertexCoords.second + r; ++j)
+            for (int j = vertexCoords.second - r; j <= vertexCoords.second + r; ++j)
             {
                 std::string cellId = CSMWorld::CellCoordinates::vertexGlobalToCellId(std::make_pair(i, j));
                 CSMWorld::CellCoordinates cellCoords = CSMWorld::CellCoordinates::fromId(cellId).first;
                 int x = CSMWorld::CellCoordinates::vertexGlobalToInCellCoords(i);
                 int y = CSMWorld::CellCoordinates::vertexGlobalToInCellCoords(j);
-                if (mShapeEditTool == ShapeEditTool_Drag) alterHeight(cellCoords, x, y, mTotalDiffY);
+                if (mShapeEditTool == ShapeEditTool_Drag)
+                    alterHeight(cellCoords, x, y, mTotalDiffY);
                 if (mShapeEditTool == ShapeEditTool_PaintToRaise || mShapeEditTool == ShapeEditTool_PaintToLower)
                 {
                     alterHeight(cellCoords, x, y, mShapeEditToolStrength);
-                    float smoothMultiplier = static_cast<float>(CSMPrefs::get()["3D Scene Editing"]["landedit-post-smoothstrength"].toDouble());
-                    if (CSMPrefs::get()["3D Scene Editing"]["landedit-post-smoothpainting"].isTrue()) smoothHeight(cellCoords, x, y, mShapeEditToolStrength * smoothMultiplier);
+                    float smoothMultiplier = static_cast<float>(
+                        CSMPrefs::get()["3D Scene Editing"]["landedit-post-smoothstrength"].toDouble());
+                    if (CSMPrefs::get()["3D Scene Editing"]["landedit-post-smoothpainting"].isTrue())
+                        smoothHeight(cellCoords, x, y, mShapeEditToolStrength * smoothMultiplier);
                 }
-                if (mShapeEditTool == ShapeEditTool_Smooth) smoothHeight(cellCoords, x, y, mShapeEditToolStrength);
-                if (mShapeEditTool == ShapeEditTool_Flatten) flattenHeight(cellCoords, x, y, mShapeEditToolStrength, mTargetHeight);
+                if (mShapeEditTool == ShapeEditTool_Smooth)
+                    smoothHeight(cellCoords, x, y, mShapeEditToolStrength);
+                if (mShapeEditTool == ShapeEditTool_Flatten)
+                    flattenHeight(cellCoords, x, y, mShapeEditToolStrength, mTargetHeight);
             }
         }
     }
 
     if (mBrushShape == CSVWidget::BrushShape_Circle)
     {
-        for(int i = vertexCoords.first - r; i <= vertexCoords.first + r; ++i)
+        for (int i = vertexCoords.first - r; i <= vertexCoords.first + r; ++i)
         {
-            for(int j = vertexCoords.second - r; j <= vertexCoords.second + r; ++j)
+            for (int j = vertexCoords.second - r; j <= vertexCoords.second + r; ++j)
             {
                 std::string cellId = CSMWorld::CellCoordinates::vertexGlobalToCellId(std::make_pair(i, j));
                 CSMWorld::CellCoordinates cellCoords = CSMWorld::CellCoordinates::fromId(cellId).first;
@@ -419,46 +475,59 @@ void CSVRender::TerrainShapeMode::editTerrainShapeGrid(const std::pair<int, int>
                 int y = CSMWorld::CellCoordinates::vertexGlobalToInCellCoords(j);
                 int distanceX = abs(i - vertexCoords.first);
                 int distanceY = abs(j - vertexCoords.second);
-                float distance = sqrt(pow(distanceX, 2)+pow(distanceY, 2));
+                float distance = sqrt(pow(distanceX, 2) + pow(distanceY, 2));
                 float smoothedByDistance = 0.0f;
-                if (mShapeEditTool == ShapeEditTool_Drag) smoothedByDistance = calculateBumpShape(distance, r, mTotalDiffY);
-                if (mShapeEditTool == ShapeEditTool_PaintToRaise || mShapeEditTool == ShapeEditTool_PaintToLower) smoothedByDistance = calculateBumpShape(distance, r, r + mShapeEditToolStrength);
+                if (mShapeEditTool == ShapeEditTool_Drag)
+                    smoothedByDistance = calculateBumpShape(distance, r, mTotalDiffY);
+                if (mShapeEditTool == ShapeEditTool_PaintToRaise || mShapeEditTool == ShapeEditTool_PaintToLower)
+                    smoothedByDistance = calculateBumpShape(distance, r, r + mShapeEditToolStrength);
 
                 // Using floating-point radius here to prevent selecting too few vertices.
                 if (distance <= mBrushSize / 2.0f)
                 {
-                    if (mShapeEditTool == ShapeEditTool_Drag) alterHeight(cellCoords, x, y, smoothedByDistance);
+                    if (mShapeEditTool == ShapeEditTool_Drag)
+                        alterHeight(cellCoords, x, y, smoothedByDistance);
                     if (mShapeEditTool == ShapeEditTool_PaintToRaise || mShapeEditTool == ShapeEditTool_PaintToLower)
                     {
                         alterHeight(cellCoords, x, y, smoothedByDistance);
-                        float smoothMultiplier = static_cast<float>(CSMPrefs::get()["3D Scene Editing"]["landedit-post-smoothstrength"].toDouble());
-                        if (CSMPrefs::get()["3D Scene Editing"]["landedit-post-smoothpainting"].isTrue()) smoothHeight(cellCoords, x, y, mShapeEditToolStrength * smoothMultiplier);
+                        float smoothMultiplier = static_cast<float>(
+                            CSMPrefs::get()["3D Scene Editing"]["landedit-post-smoothstrength"].toDouble());
+                        if (CSMPrefs::get()["3D Scene Editing"]["landedit-post-smoothpainting"].isTrue())
+                            smoothHeight(cellCoords, x, y, mShapeEditToolStrength * smoothMultiplier);
                     }
-                    if (mShapeEditTool == ShapeEditTool_Smooth) smoothHeight(cellCoords, x, y, mShapeEditToolStrength);
-                    if (mShapeEditTool == ShapeEditTool_Flatten) flattenHeight(cellCoords, x, y, mShapeEditToolStrength, mTargetHeight);
+                    if (mShapeEditTool == ShapeEditTool_Smooth)
+                        smoothHeight(cellCoords, x, y, mShapeEditToolStrength);
+                    if (mShapeEditTool == ShapeEditTool_Flatten)
+                        flattenHeight(cellCoords, x, y, mShapeEditToolStrength, mTargetHeight);
                 }
             }
         }
     }
     if (mBrushShape == CSVWidget::BrushShape_Custom)
     {
-        if(!mCustomBrushShape.empty())
+        if (!mCustomBrushShape.empty())
         {
-            for(auto const& value: mCustomBrushShape)
+            for (auto const& value : mCustomBrushShape)
             {
-                std::string cellId = CSMWorld::CellCoordinates::vertexGlobalToCellId(std::make_pair(vertexCoords.first + value.first, vertexCoords.second + value.second));
+                std::string cellId = CSMWorld::CellCoordinates::vertexGlobalToCellId(
+                    std::make_pair(vertexCoords.first + value.first, vertexCoords.second + value.second));
                 CSMWorld::CellCoordinates cellCoords = CSMWorld::CellCoordinates::fromId(cellId).first;
                 int x = CSMWorld::CellCoordinates::vertexGlobalToInCellCoords(vertexCoords.first + value.first);
                 int y = CSMWorld::CellCoordinates::vertexGlobalToInCellCoords(vertexCoords.second + value.second);
-                if (mShapeEditTool == ShapeEditTool_Drag) alterHeight(cellCoords, x, y, mTotalDiffY);
+                if (mShapeEditTool == ShapeEditTool_Drag)
+                    alterHeight(cellCoords, x, y, mTotalDiffY);
                 if (mShapeEditTool == ShapeEditTool_PaintToRaise || mShapeEditTool == ShapeEditTool_PaintToLower)
                 {
                     alterHeight(cellCoords, x, y, mShapeEditToolStrength);
-                    float smoothMultiplier = static_cast<float>(CSMPrefs::get()["3D Scene Editing"]["landedit-post-smoothstrength"].toDouble());
-                    if (CSMPrefs::get()["3D Scene Editing"]["landedit-post-smoothpainting"].isTrue()) smoothHeight(cellCoords, x, y, mShapeEditToolStrength * smoothMultiplier);
+                    float smoothMultiplier = static_cast<float>(
+                        CSMPrefs::get()["3D Scene Editing"]["landedit-post-smoothstrength"].toDouble());
+                    if (CSMPrefs::get()["3D Scene Editing"]["landedit-post-smoothpainting"].isTrue())
+                        smoothHeight(cellCoords, x, y, mShapeEditToolStrength * smoothMultiplier);
                 }
-                if (mShapeEditTool == ShapeEditTool_Smooth) smoothHeight(cellCoords, x, y, mShapeEditToolStrength);
-                if (mShapeEditTool == ShapeEditTool_Flatten) flattenHeight(cellCoords, x, y, mShapeEditToolStrength, mTargetHeight);
+                if (mShapeEditTool == ShapeEditTool_Smooth)
+                    smoothHeight(cellCoords, x, y, mShapeEditToolStrength);
+                if (mShapeEditTool == ShapeEditTool_Flatten)
+                    flattenHeight(cellCoords, x, y, mShapeEditToolStrength, mTargetHeight);
             }
         }
     }
@@ -473,23 +542,24 @@ void CSVRender::TerrainShapeMode::setFlattenToolTargetHeight(const WorldspaceHit
     int inCellY = CSMWorld::CellCoordinates::vertexGlobalToInCellCoords(vertexCoords.second);
 
     CSMDoc::Document& document = getWorldspaceWidget().getDocument();
-    CSMWorld::IdTable& landTable = dynamic_cast<CSMWorld::IdTable&> (
-        *document.getData().getTableModel (CSMWorld::UniversalId::Type_Land));
+    CSMWorld::IdTable& landTable
+        = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_Land));
     int landshapeColumn = landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandHeightsIndex);
-    const CSMWorld::LandHeightsColumn::DataType landShapePointer =
-        landTable.data(landTable.getModelIndex(cellId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
+    const CSMWorld::LandHeightsColumn::DataType landShapePointer
+        = landTable.data(landTable.getModelIndex(cellId, landshapeColumn))
+              .value<CSMWorld::LandHeightsColumn::DataType>();
 
     mTargetHeight = landShapePointer[inCellY * ESM::Land::LAND_SIZE + inCellX];
 }
 
-
-void CSVRender::TerrainShapeMode::alterHeight(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, float alteredHeight, bool useTool)
+void CSVRender::TerrainShapeMode::alterHeight(
+    const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, float alteredHeight, bool useTool)
 {
     std::string cellId = CSMWorld::CellCoordinates::generateId(cellCoords.getX(), cellCoords.getY());
 
     if (!(allowLandShapeEditing(cellId, useTool) && (useTool || (isLandLoaded(cellId)))))
         return;
-    CSVRender::PagedWorldspaceWidget *paged = dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget());
+    CSVRender::PagedWorldspaceWidget* paged = dynamic_cast<CSVRender::PagedWorldspaceWidget*>(&getWorldspaceWidget());
     if (!paged)
         return;
 
@@ -513,75 +583,96 @@ void CSVRender::TerrainShapeMode::alterHeight(const CSMWorld::CellCoordinates& c
             osg::Vec3d distance = eye - mEditingPos;
             alteredHeight = alteredHeight * (distance.length() / 500);
         }
-        if (mShapeEditTool == ShapeEditTool_PaintToRaise) alteredHeight = *paged->getCellAlteredHeight(cellCoords, inCellX, inCellY) + alteredHeight;
-        if (mShapeEditTool == ShapeEditTool_PaintToLower) alteredHeight = *paged->getCellAlteredHeight(cellCoords, inCellX, inCellY) - alteredHeight;
-        if (mShapeEditTool == ShapeEditTool_Smooth) alteredHeight = *paged->getCellAlteredHeight(cellCoords, inCellX, inCellY) + alteredHeight;
+        if (mShapeEditTool == ShapeEditTool_PaintToRaise)
+            alteredHeight = *paged->getCellAlteredHeight(cellCoords, inCellX, inCellY) + alteredHeight;
+        if (mShapeEditTool == ShapeEditTool_PaintToLower)
+            alteredHeight = *paged->getCellAlteredHeight(cellCoords, inCellX, inCellY) - alteredHeight;
+        if (mShapeEditTool == ShapeEditTool_Smooth)
+            alteredHeight = *paged->getCellAlteredHeight(cellCoords, inCellX, inCellY) + alteredHeight;
     }
 
     if (inCellX != 0 && inCellY != 0 && inCellX != ESM::Land::LAND_SIZE - 1 && inCellY != ESM::Land::LAND_SIZE - 1)
-    paged->setCellAlteredHeight(cellCoords, inCellX, inCellY, alteredHeight);
+        paged->setCellAlteredHeight(cellCoords, inCellX, inCellY, alteredHeight);
 
     // Change values of cornering cells
     if ((inCellX == 0 && inCellY == 0) && (useTool || isLandLoaded(cellUpLeftId)))
     {
-        if(allowLandShapeEditing(cellUpLeftId, useTool) && allowLandShapeEditing(cellLeftId, useTool) && allowLandShapeEditing(cellUpId, useTool))
+        if (allowLandShapeEditing(cellUpLeftId, useTool) && allowLandShapeEditing(cellLeftId, useTool)
+            && allowLandShapeEditing(cellUpId, useTool))
         {
             CSMWorld::CellCoordinates cornerCellCoords = cellCoords.move(-1, -1);
-            if (useTool && std::find(mAlteredCells.begin(), mAlteredCells.end(), cornerCellCoords) == mAlteredCells.end())
-            mAlteredCells.emplace_back(cornerCellCoords);
-            paged->setCellAlteredHeight(cornerCellCoords, ESM::Land::LAND_SIZE - 1, ESM::Land::LAND_SIZE - 1, alteredHeight);
-        } else return;
+            if (useTool
+                && std::find(mAlteredCells.begin(), mAlteredCells.end(), cornerCellCoords) == mAlteredCells.end())
+                mAlteredCells.emplace_back(cornerCellCoords);
+            paged->setCellAlteredHeight(
+                cornerCellCoords, ESM::Land::LAND_SIZE - 1, ESM::Land::LAND_SIZE - 1, alteredHeight);
+        }
+        else
+            return;
     }
     else if ((inCellX == 0 && inCellY == ESM::Land::LAND_SIZE - 1) && (useTool || isLandLoaded(cellDownLeftId)))
     {
-        if (allowLandShapeEditing(cellDownLeftId, useTool) && allowLandShapeEditing(cellLeftId, useTool) && allowLandShapeEditing(cellDownId, useTool))
+        if (allowLandShapeEditing(cellDownLeftId, useTool) && allowLandShapeEditing(cellLeftId, useTool)
+            && allowLandShapeEditing(cellDownId, useTool))
         {
             CSMWorld::CellCoordinates cornerCellCoords = cellCoords.move(-1, 1);
-            if (useTool && std::find(mAlteredCells.begin(), mAlteredCells.end(), cornerCellCoords) == mAlteredCells.end())
-            mAlteredCells.emplace_back(cornerCellCoords);
+            if (useTool
+                && std::find(mAlteredCells.begin(), mAlteredCells.end(), cornerCellCoords) == mAlteredCells.end())
+                mAlteredCells.emplace_back(cornerCellCoords);
             paged->setCellAlteredHeight(cornerCellCoords, ESM::Land::LAND_SIZE - 1, 0, alteredHeight);
-        } else return;
+        }
+        else
+            return;
     }
     else if ((inCellX == ESM::Land::LAND_SIZE - 1 && inCellY == 0) && (useTool || isLandLoaded(cellUpRightId)))
     {
-        if (allowLandShapeEditing(cellUpRightId, useTool) && allowLandShapeEditing(cellRightId, useTool) && allowLandShapeEditing(cellUpId, useTool))
+        if (allowLandShapeEditing(cellUpRightId, useTool) && allowLandShapeEditing(cellRightId, useTool)
+            && allowLandShapeEditing(cellUpId, useTool))
         {
             CSMWorld::CellCoordinates cornerCellCoords = cellCoords.move(1, -1);
-            if (useTool && std::find(mAlteredCells.begin(), mAlteredCells.end(), cornerCellCoords) == mAlteredCells.end())
-            mAlteredCells.emplace_back(cornerCellCoords);
+            if (useTool
+                && std::find(mAlteredCells.begin(), mAlteredCells.end(), cornerCellCoords) == mAlteredCells.end())
+                mAlteredCells.emplace_back(cornerCellCoords);
             paged->setCellAlteredHeight(cornerCellCoords, 0, ESM::Land::LAND_SIZE - 1, alteredHeight);
-        } else return;
+        }
+        else
+            return;
     }
-    else if ((inCellX == ESM::Land::LAND_SIZE - 1 && inCellY == ESM::Land::LAND_SIZE - 1) && (useTool || isLandLoaded(cellDownRightId)))
+    else if ((inCellX == ESM::Land::LAND_SIZE - 1 && inCellY == ESM::Land::LAND_SIZE - 1)
+        && (useTool || isLandLoaded(cellDownRightId)))
     {
-        if(allowLandShapeEditing(cellDownRightId, useTool) && allowLandShapeEditing(cellRightId, useTool) && allowLandShapeEditing(cellDownId, useTool))
+        if (allowLandShapeEditing(cellDownRightId, useTool) && allowLandShapeEditing(cellRightId, useTool)
+            && allowLandShapeEditing(cellDownId, useTool))
         {
             CSMWorld::CellCoordinates cornerCellCoords = cellCoords.move(1, 1);
-            if (useTool && std::find(mAlteredCells.begin(), mAlteredCells.end(), cornerCellCoords) == mAlteredCells.end())
-            mAlteredCells.emplace_back(cornerCellCoords);
+            if (useTool
+                && std::find(mAlteredCells.begin(), mAlteredCells.end(), cornerCellCoords) == mAlteredCells.end())
+                mAlteredCells.emplace_back(cornerCellCoords);
             paged->setCellAlteredHeight(cornerCellCoords, 0, 0, alteredHeight);
-        } else return;
+        }
+        else
+            return;
     }
 
     // Change values of edging cells
     if ((inCellX == 0) && (useTool || isLandLoaded(cellLeftId)))
     {
-        if(allowLandShapeEditing(cellLeftId, useTool))
+        if (allowLandShapeEditing(cellLeftId, useTool))
         {
             CSMWorld::CellCoordinates edgeCellCoords = cellCoords.move(-1, 0);
             if (useTool && std::find(mAlteredCells.begin(), mAlteredCells.end(), edgeCellCoords) == mAlteredCells.end())
-            mAlteredCells.emplace_back(edgeCellCoords);
+                mAlteredCells.emplace_back(edgeCellCoords);
             paged->setCellAlteredHeight(cellCoords, inCellX, inCellY, alteredHeight);
             paged->setCellAlteredHeight(edgeCellCoords, ESM::Land::LAND_SIZE - 1, inCellY, alteredHeight);
         }
     }
     if ((inCellY == 0) && (useTool || isLandLoaded(cellUpId)))
     {
-        if(allowLandShapeEditing(cellUpId, useTool))
+        if (allowLandShapeEditing(cellUpId, useTool))
         {
             CSMWorld::CellCoordinates edgeCellCoords = cellCoords.move(0, -1);
             if (useTool && std::find(mAlteredCells.begin(), mAlteredCells.end(), edgeCellCoords) == mAlteredCells.end())
-            mAlteredCells.emplace_back(edgeCellCoords);
+                mAlteredCells.emplace_back(edgeCellCoords);
             paged->setCellAlteredHeight(cellCoords, inCellX, inCellY, alteredHeight);
             paged->setCellAlteredHeight(edgeCellCoords, inCellX, ESM::Land::LAND_SIZE - 1, alteredHeight);
         }
@@ -589,41 +680,43 @@ void CSVRender::TerrainShapeMode::alterHeight(const CSMWorld::CellCoordinates& c
 
     if ((inCellX == ESM::Land::LAND_SIZE - 1) && (useTool || isLandLoaded(cellRightId)))
     {
-        if(allowLandShapeEditing(cellRightId, useTool))
+        if (allowLandShapeEditing(cellRightId, useTool))
         {
             CSMWorld::CellCoordinates edgeCellCoords = cellCoords.move(1, 0);
             if (useTool && std::find(mAlteredCells.begin(), mAlteredCells.end(), edgeCellCoords) == mAlteredCells.end())
-            mAlteredCells.emplace_back(edgeCellCoords);
+                mAlteredCells.emplace_back(edgeCellCoords);
             paged->setCellAlteredHeight(cellCoords, inCellX, inCellY, alteredHeight);
             paged->setCellAlteredHeight(edgeCellCoords, 0, inCellY, alteredHeight);
         }
     }
     if ((inCellY == ESM::Land::LAND_SIZE - 1) && (useTool || isLandLoaded(cellDownId)))
     {
-        if(allowLandShapeEditing(cellDownId, useTool))
+        if (allowLandShapeEditing(cellDownId, useTool))
         {
             CSMWorld::CellCoordinates edgeCellCoords = cellCoords.move(0, 1);
             if (useTool && std::find(mAlteredCells.begin(), mAlteredCells.end(), edgeCellCoords) == mAlteredCells.end())
-            mAlteredCells.emplace_back(edgeCellCoords);
+                mAlteredCells.emplace_back(edgeCellCoords);
             paged->setCellAlteredHeight(cellCoords, inCellX, inCellY, alteredHeight);
             paged->setCellAlteredHeight(edgeCellCoords, inCellX, 0, alteredHeight);
         }
     }
-
 }
 
-void CSVRender::TerrainShapeMode::smoothHeight(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, int toolStrength)
+void CSVRender::TerrainShapeMode::smoothHeight(
+    const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, int toolStrength)
 {
-    if (CSVRender::PagedWorldspaceWidget *paged =
-        dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget()))
+    if (CSVRender::PagedWorldspaceWidget* paged
+        = dynamic_cast<CSVRender::PagedWorldspaceWidget*>(&getWorldspaceWidget()))
     {
         CSMDoc::Document& document = getWorldspaceWidget().getDocument();
-        CSMWorld::IdTable& landTable = dynamic_cast<CSMWorld::IdTable&> (
-            *document.getData().getTableModel (CSMWorld::UniversalId::Type_Land));
+        CSMWorld::IdTable& landTable
+            = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_Land));
         int landshapeColumn = landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandHeightsIndex);
 
         std::string cellId = CSMWorld::CellCoordinates::generateId(cellCoords.getX(), cellCoords.getY());
-        const CSMWorld::LandHeightsColumn::DataType landShapePointer = landTable.data(landTable.getModelIndex(cellId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
+        const CSMWorld::LandHeightsColumn::DataType landShapePointer
+            = landTable.data(landTable.getModelIndex(cellId, landshapeColumn))
+                  .value<CSMWorld::LandHeightsColumn::DataType>();
 
         // ### Variable naming key ###
         // Variables here hold either the real value, or the altered value of current edit.
@@ -643,24 +736,30 @@ void CSVRender::TerrainShapeMode::smoothHeight(const CSMWorld::CellCoordinates&
         float downAlteredHeight = 0.0f;
         float upHeight = 0.0f;
 
-        if(allowLandShapeEditing(cellId))
+        if (allowLandShapeEditing(cellId))
         {
-            //Get key values for calculating average, handle cell edges, check for null pointers
+            // Get key values for calculating average, handle cell edges, check for null pointers
             if (inCellX == 0)
             {
                 cellId = CSMWorld::CellCoordinates::generateId(cellCoords.getX() - 1, cellCoords.getY());
-                const CSMWorld::LandHeightsColumn::DataType landLeftShapePointer = landTable.data(landTable.getModelIndex(cellId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
+                const CSMWorld::LandHeightsColumn::DataType landLeftShapePointer
+                    = landTable.data(landTable.getModelIndex(cellId, landshapeColumn))
+                          .value<CSMWorld::LandHeightsColumn::DataType>();
                 leftHeight = landLeftShapePointer[inCellY * ESM::Land::LAND_SIZE + (ESM::Land::LAND_SIZE - 2)];
                 if (paged->getCellAlteredHeight(cellCoords.move(-1, 0), inCellX, ESM::Land::LAND_SIZE - 2))
-                    leftAlteredHeight = *paged->getCellAlteredHeight(cellCoords.move(-1, 0), ESM::Land::LAND_SIZE - 2, inCellY);
+                    leftAlteredHeight
+                        = *paged->getCellAlteredHeight(cellCoords.move(-1, 0), ESM::Land::LAND_SIZE - 2, inCellY);
             }
             if (inCellY == 0)
             {
                 cellId = CSMWorld::CellCoordinates::generateId(cellCoords.getX(), cellCoords.getY() - 1);
-                const CSMWorld::LandHeightsColumn::DataType landUpShapePointer = landTable.data(landTable.getModelIndex(cellId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
+                const CSMWorld::LandHeightsColumn::DataType landUpShapePointer
+                    = landTable.data(landTable.getModelIndex(cellId, landshapeColumn))
+                          .value<CSMWorld::LandHeightsColumn::DataType>();
                 upHeight = landUpShapePointer[(ESM::Land::LAND_SIZE - 2) * ESM::Land::LAND_SIZE + inCellX];
                 if (paged->getCellAlteredHeight(cellCoords.move(0, -1), inCellX, ESM::Land::LAND_SIZE - 2))
-                    upAlteredHeight = *paged->getCellAlteredHeight(cellCoords.move(0, -1), inCellX, ESM::Land::LAND_SIZE - 2);
+                    upAlteredHeight
+                        = *paged->getCellAlteredHeight(cellCoords.move(0, -1), inCellX, ESM::Land::LAND_SIZE - 2);
             }
             if (inCellX > 0)
             {
@@ -675,8 +774,9 @@ void CSVRender::TerrainShapeMode::smoothHeight(const CSMWorld::CellCoordinates&
             if (inCellX == ESM::Land::LAND_SIZE - 1)
             {
                 cellId = CSMWorld::CellCoordinates::generateId(cellCoords.getX() + 1, cellCoords.getY());
-                const CSMWorld::LandHeightsColumn::DataType landRightShapePointer =
-                    landTable.data(landTable.getModelIndex(cellId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
+                const CSMWorld::LandHeightsColumn::DataType landRightShapePointer
+                    = landTable.data(landTable.getModelIndex(cellId, landshapeColumn))
+                          .value<CSMWorld::LandHeightsColumn::DataType>();
                 rightHeight = landRightShapePointer[inCellY * ESM::Land::LAND_SIZE + 1];
                 if (paged->getCellAlteredHeight(cellCoords.move(1, 0), 1, inCellY))
                 {
@@ -686,8 +786,9 @@ void CSVRender::TerrainShapeMode::smoothHeight(const CSMWorld::CellCoordinates&
             if (inCellY == ESM::Land::LAND_SIZE - 1)
             {
                 cellId = CSMWorld::CellCoordinates::generateId(cellCoords.getX(), cellCoords.getY() + 1);
-                const CSMWorld::LandHeightsColumn::DataType landDownShapePointer =
-                    landTable.data(landTable.getModelIndex(cellId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
+                const CSMWorld::LandHeightsColumn::DataType landDownShapePointer
+                    = landTable.data(landTable.getModelIndex(cellId, landshapeColumn))
+                          .value<CSMWorld::LandHeightsColumn::DataType>();
                 downHeight = landDownShapePointer[1 * ESM::Land::LAND_SIZE + inCellX];
                 if (paged->getCellAlteredHeight(cellCoords.move(0, 1), inCellX, 1))
                 {
@@ -697,31 +798,37 @@ void CSVRender::TerrainShapeMode::smoothHeight(const CSMWorld::CellCoordinates&
             if (inCellX < ESM::Land::LAND_SIZE - 1)
             {
                 rightHeight = landShapePointer[inCellY * ESM::Land::LAND_SIZE + inCellX + 1];
-                if(paged->getCellAlteredHeight(cellCoords, inCellX + 1, inCellY))
+                if (paged->getCellAlteredHeight(cellCoords, inCellX + 1, inCellY))
                     rightAlteredHeight = *paged->getCellAlteredHeight(cellCoords, inCellX + 1, inCellY);
             }
             if (inCellY < ESM::Land::LAND_SIZE - 1)
             {
                 downHeight = landShapePointer[(inCellY + 1) * ESM::Land::LAND_SIZE + inCellX];
-                if(paged->getCellAlteredHeight(cellCoords, inCellX, inCellY + 1))
+                if (paged->getCellAlteredHeight(cellCoords, inCellX, inCellY + 1))
                     downAlteredHeight = *paged->getCellAlteredHeight(cellCoords, inCellX, inCellY + 1);
             }
 
-            float averageHeight = (upHeight + downHeight + rightHeight + leftHeight +
-                upAlteredHeight + downAlteredHeight + rightAlteredHeight + leftAlteredHeight) / 4;
-            if ((thisHeight + thisAlteredHeight) != averageHeight) mAlteredCells.emplace_back(cellCoords);
-            if (toolStrength > abs(thisHeight + thisAlteredHeight - averageHeight)) toolStrength = abs(thisHeight + thisAlteredHeight - averageHeight);
-            if (thisHeight + thisAlteredHeight > averageHeight) alterHeight(cellCoords, inCellX, inCellY, - toolStrength);
-            if (thisHeight + thisAlteredHeight < averageHeight) alterHeight(cellCoords, inCellX, inCellY, + toolStrength);
+            float averageHeight = (upHeight + downHeight + rightHeight + leftHeight + upAlteredHeight
+                                      + downAlteredHeight + rightAlteredHeight + leftAlteredHeight)
+                / 4;
+            if ((thisHeight + thisAlteredHeight) != averageHeight)
+                mAlteredCells.emplace_back(cellCoords);
+            if (toolStrength > abs(thisHeight + thisAlteredHeight - averageHeight))
+                toolStrength = abs(thisHeight + thisAlteredHeight - averageHeight);
+            if (thisHeight + thisAlteredHeight > averageHeight)
+                alterHeight(cellCoords, inCellX, inCellY, -toolStrength);
+            if (thisHeight + thisAlteredHeight < averageHeight)
+                alterHeight(cellCoords, inCellX, inCellY, +toolStrength);
         }
     }
 }
 
-void CSVRender::TerrainShapeMode::flattenHeight(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, int toolStrength, int targetHeight)
+void CSVRender::TerrainShapeMode::flattenHeight(
+    const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, int toolStrength, int targetHeight)
 {
     CSMDoc::Document& document = getWorldspaceWidget().getDocument();
-    CSMWorld::IdTable& landTable = dynamic_cast<CSMWorld::IdTable&> (
-        *document.getData().getTableModel (CSMWorld::UniversalId::Type_Land));
+    CSMWorld::IdTable& landTable
+        = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_Land));
     int landshapeColumn = landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandHeightsIndex);
 
     float thisHeight = 0.0f;
@@ -729,33 +836,37 @@ void CSVRender::TerrainShapeMode::flattenHeight(const CSMWorld::CellCoordinates&
 
     std::string cellId = CSMWorld::CellCoordinates::generateId(cellCoords.getX(), cellCoords.getY());
 
-    if (CSVRender::PagedWorldspaceWidget *paged =
-        dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget()))
+    if (CSVRender::PagedWorldspaceWidget* paged
+        = dynamic_cast<CSVRender::PagedWorldspaceWidget*>(&getWorldspaceWidget()))
     {
         if (!noCell(cellId) && !noLand(cellId))
         {
-            const CSMWorld::LandHeightsColumn::DataType landShapePointer =
-                landTable.data(landTable.getModelIndex(cellId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
+            const CSMWorld::LandHeightsColumn::DataType landShapePointer
+                = landTable.data(landTable.getModelIndex(cellId, landshapeColumn))
+                      .value<CSMWorld::LandHeightsColumn::DataType>();
 
-            if(paged->getCellAlteredHeight(cellCoords, inCellX, inCellY))
+            if (paged->getCellAlteredHeight(cellCoords, inCellX, inCellY))
                 thisAlteredHeight = *paged->getCellAlteredHeight(cellCoords, inCellX, inCellY);
             thisHeight = landShapePointer[inCellY * ESM::Land::LAND_SIZE + inCellX];
         }
     }
 
-    if (toolStrength > abs(thisHeight - targetHeight) && toolStrength > 8.0f) toolStrength =
-        abs(thisHeight - targetHeight); //Cut down excessive changes
-    if (thisHeight + thisAlteredHeight > targetHeight) alterHeight(cellCoords, inCellX, inCellY, thisAlteredHeight - toolStrength);
-    if (thisHeight + thisAlteredHeight < targetHeight) alterHeight(cellCoords, inCellX, inCellY, thisAlteredHeight + toolStrength);
+    if (toolStrength > abs(thisHeight - targetHeight) && toolStrength > 8.0f)
+        toolStrength = abs(thisHeight - targetHeight); // Cut down excessive changes
+    if (thisHeight + thisAlteredHeight > targetHeight)
+        alterHeight(cellCoords, inCellX, inCellY, thisAlteredHeight - toolStrength);
+    if (thisHeight + thisAlteredHeight < targetHeight)
+        alterHeight(cellCoords, inCellX, inCellY, thisAlteredHeight + toolStrength);
 }
 
-void CSVRender::TerrainShapeMode::updateKeyHeightValues(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, float* thisHeight,
-    float* thisAlteredHeight, float* leftHeight, float* leftAlteredHeight, float* upHeight, float* upAlteredHeight, float* rightHeight,
-    float* rightAlteredHeight, float* downHeight, float* downAlteredHeight)
+void CSVRender::TerrainShapeMode::updateKeyHeightValues(const CSMWorld::CellCoordinates& cellCoords, int inCellX,
+    int inCellY, float* thisHeight, float* thisAlteredHeight, float* leftHeight, float* leftAlteredHeight,
+    float* upHeight, float* upAlteredHeight, float* rightHeight, float* rightAlteredHeight, float* downHeight,
+    float* downAlteredHeight)
 {
     CSMDoc::Document& document = getWorldspaceWidget().getDocument();
-    CSMWorld::IdTable& landTable = dynamic_cast<CSMWorld::IdTable&> (
-        *document.getData().getTableModel (CSMWorld::UniversalId::Type_Land));
+    CSMWorld::IdTable& landTable
+        = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_Land));
     int landshapeColumn = landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandHeightsIndex);
 
     std::string cellId = CSMWorld::CellCoordinates::generateId(cellCoords.getX(), cellCoords.getY());
@@ -765,7 +876,7 @@ void CSVRender::TerrainShapeMode::updateKeyHeightValues(const CSMWorld::CellCoor
     std::string cellDownId = CSMWorld::CellCoordinates::generateId(cellCoords.getX(), cellCoords.getY() + 1);
 
     *thisHeight = 0.0f; // real + altered height
-    *thisAlteredHeight = 0.0f;  // only altered height
+    *thisAlteredHeight = 0.0f; // only altered height
     *leftHeight = 0.0f;
     *leftAlteredHeight = 0.0f;
     *upHeight = 0.0f;
@@ -775,60 +886,66 @@ void CSVRender::TerrainShapeMode::updateKeyHeightValues(const CSMWorld::CellCoor
     *downHeight = 0.0f;
     *downAlteredHeight = 0.0f;
 
-    if (CSVRender::PagedWorldspaceWidget *paged =
-        dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget()))
+    if (CSVRender::PagedWorldspaceWidget* paged
+        = dynamic_cast<CSVRender::PagedWorldspaceWidget*>(&getWorldspaceWidget()))
     {
         if (!noCell(cellId) && !noLand(cellId))
         {
-            const CSMWorld::LandHeightsColumn::DataType landShapePointer =
-                landTable.data(landTable.getModelIndex(cellId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
+            const CSMWorld::LandHeightsColumn::DataType landShapePointer
+                = landTable.data(landTable.getModelIndex(cellId, landshapeColumn))
+                      .value<CSMWorld::LandHeightsColumn::DataType>();
 
-            if(paged->getCellAlteredHeight(cellCoords, inCellX, inCellY))
+            if (paged->getCellAlteredHeight(cellCoords, inCellX, inCellY))
                 *thisAlteredHeight = *paged->getCellAlteredHeight(cellCoords, inCellX, inCellY);
             *thisHeight = landShapePointer[inCellY * ESM::Land::LAND_SIZE + inCellX] + *thisAlteredHeight;
 
-            // Default to the same value as thisHeight, which happens in the case of cell edge where next cell/land is not found,
-            // which is to prevent unnecessary action at limitHeightChange().
+            // Default to the same value as thisHeight, which happens in the case of cell edge where next cell/land is
+            // not found, which is to prevent unnecessary action at limitHeightChange().
             *leftHeight = *thisHeight;
             *upHeight = *thisHeight;
             *rightHeight = *thisHeight;
             *downHeight = *thisHeight;
 
-            //If at edge, get values from neighboring cell
+            // If at edge, get values from neighboring cell
             if (inCellX == 0)
             {
-                if(isLandLoaded(cellLeftId))
+                if (isLandLoaded(cellLeftId))
                 {
-                    const CSMWorld::LandHeightsColumn::DataType landLeftShapePointer =
-                        landTable.data(landTable.getModelIndex(cellLeftId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
+                    const CSMWorld::LandHeightsColumn::DataType landLeftShapePointer
+                        = landTable.data(landTable.getModelIndex(cellLeftId, landshapeColumn))
+                              .value<CSMWorld::LandHeightsColumn::DataType>();
                     *leftHeight = landLeftShapePointer[inCellY * ESM::Land::LAND_SIZE + (ESM::Land::LAND_SIZE - 2)];
                     if (paged->getCellAlteredHeight(cellCoords.move(-1, 0), ESM::Land::LAND_SIZE - 2, inCellY))
                     {
-                        *leftAlteredHeight = *paged->getCellAlteredHeight(cellCoords.move(-1, 0), ESM::Land::LAND_SIZE - 2, inCellY);
+                        *leftAlteredHeight
+                            = *paged->getCellAlteredHeight(cellCoords.move(-1, 0), ESM::Land::LAND_SIZE - 2, inCellY);
                         *leftHeight += *leftAlteredHeight;
                     }
                 }
             }
             if (inCellY == 0)
             {
-                if(isLandLoaded(cellUpId))
+                if (isLandLoaded(cellUpId))
                 {
-                    const CSMWorld::LandHeightsColumn::DataType landUpShapePointer =
-                        landTable.data(landTable.getModelIndex(cellUpId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
+                    const CSMWorld::LandHeightsColumn::DataType landUpShapePointer
+                        = landTable.data(landTable.getModelIndex(cellUpId, landshapeColumn))
+                              .value<CSMWorld::LandHeightsColumn::DataType>();
                     *upHeight = landUpShapePointer[(ESM::Land::LAND_SIZE - 2) * ESM::Land::LAND_SIZE + inCellX];
-                    if (paged->getCellAlteredHeight(cellCoords.move(0,-1), inCellX, ESM::Land::LAND_SIZE - 2))
+                    if (paged->getCellAlteredHeight(cellCoords.move(0, -1), inCellX, ESM::Land::LAND_SIZE - 2))
                     {
-                        *upAlteredHeight = *paged->getCellAlteredHeight(cellCoords.move(0, -1), inCellX, ESM::Land::LAND_SIZE - 2);
+                        *upAlteredHeight
+                            = *paged->getCellAlteredHeight(cellCoords.move(0, -1), inCellX, ESM::Land::LAND_SIZE - 2);
                         *upHeight += *upAlteredHeight;
                     }
                 }
             }
             if (inCellX == ESM::Land::LAND_SIZE - 1)
             {
-                if(isLandLoaded(cellRightId))
+                if (isLandLoaded(cellRightId))
                 {
-                    const CSMWorld::LandHeightsColumn::DataType landRightShapePointer =
-                        landTable.data(landTable.getModelIndex(cellRightId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
+                    const CSMWorld::LandHeightsColumn::DataType landRightShapePointer
+                        = landTable.data(landTable.getModelIndex(cellRightId, landshapeColumn))
+                              .value<CSMWorld::LandHeightsColumn::DataType>();
                     *rightHeight = landRightShapePointer[inCellY * ESM::Land::LAND_SIZE + 1];
                     if (paged->getCellAlteredHeight(cellCoords.move(1, 0), 1, inCellY))
                     {
@@ -839,10 +956,11 @@ void CSVRender::TerrainShapeMode::updateKeyHeightValues(const CSMWorld::CellCoor
             }
             if (inCellY == ESM::Land::LAND_SIZE - 1)
             {
-                if(isLandLoaded(cellDownId))
+                if (isLandLoaded(cellDownId))
                 {
-                    const CSMWorld::LandHeightsColumn::DataType landDownShapePointer =
-                        landTable.data(landTable.getModelIndex(cellDownId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
+                    const CSMWorld::LandHeightsColumn::DataType landDownShapePointer
+                        = landTable.data(landTable.getModelIndex(cellDownId, landshapeColumn))
+                              .value<CSMWorld::LandHeightsColumn::DataType>();
                     *downHeight = landDownShapePointer[ESM::Land::LAND_SIZE + inCellX];
                     if (paged->getCellAlteredHeight(cellCoords.move(0, 1), inCellX, 1))
                     {
@@ -852,7 +970,7 @@ void CSVRender::TerrainShapeMode::updateKeyHeightValues(const CSMWorld::CellCoor
                 }
             }
 
-           //If not at edge, get values from the same cell
+            // If not at edge, get values from the same cell
             if (inCellX != 0)
             {
                 *leftHeight = landShapePointer[inCellY * ESM::Land::LAND_SIZE + inCellX - 1];
@@ -881,18 +999,18 @@ void CSVRender::TerrainShapeMode::updateKeyHeightValues(const CSMWorld::CellCoor
                     *downAlteredHeight = *paged->getCellAlteredHeight(cellCoords, inCellX, inCellY + 1);
                 *downHeight += *downAlteredHeight;
             }
-
         }
     }
 }
 
-void CSVRender::TerrainShapeMode::compareAndLimit(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, float* limitedAlteredHeightXAxis, float* limitedAlteredHeightYAxis, bool* steepnessIsWithinLimits)
+void CSVRender::TerrainShapeMode::compareAndLimit(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY,
+    float* limitedAlteredHeightXAxis, float* limitedAlteredHeightYAxis, bool* steepnessIsWithinLimits)
 {
     if (limitedAlteredHeightXAxis)
     {
         if (limitedAlteredHeightYAxis)
         {
-            if(std::abs(*limitedAlteredHeightXAxis) >= std::abs(*limitedAlteredHeightYAxis))
+            if (std::abs(*limitedAlteredHeightXAxis) >= std::abs(*limitedAlteredHeightYAxis))
             {
                 alterHeight(cellCoords, inCellX, inCellY, *limitedAlteredHeightXAxis, false);
                 *steepnessIsWithinLimits = false;
@@ -919,7 +1037,8 @@ void CSVRender::TerrainShapeMode::compareAndLimit(const CSMWorld::CellCoordinate
 bool CSVRender::TerrainShapeMode::limitAlteredHeights(const CSMWorld::CellCoordinates& cellCoords, bool reverseMode)
 {
     CSMDoc::Document& document = getWorldspaceWidget().getDocument();
-    CSMWorld::IdTable& landTable = dynamic_cast<CSMWorld::IdTable&> (*document.getData().getTableModel(CSMWorld::UniversalId::Type_Land));
+    CSMWorld::IdTable& landTable
+        = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_Land));
     int landshapeColumn = landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandHeightsIndex);
 
     std::string cellId = CSMWorld::CellCoordinates::generateId(cellCoords.getX(), cellCoords.getY());
@@ -929,8 +1048,9 @@ bool CSVRender::TerrainShapeMode::limitAlteredHeights(const CSMWorld::CellCoordi
 
     if (isLandLoaded(cellId))
     {
-        const CSMWorld::LandHeightsColumn::DataType landShapePointer =
-            landTable.data(landTable.getModelIndex(cellId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
+        const CSMWorld::LandHeightsColumn::DataType landShapePointer
+            = landTable.data(landTable.getModelIndex(cellId, landshapeColumn))
+                  .value<CSMWorld::LandHeightsColumn::DataType>();
 
         float thisHeight = 0.0f;
         float thisAlteredHeight = 0.0f;
@@ -945,58 +1065,70 @@ bool CSVRender::TerrainShapeMode::limitAlteredHeights(const CSMWorld::CellCoordi
 
         if (!reverseMode)
         {
-            for(int inCellY = 0; inCellY < ESM::Land::LAND_SIZE; ++inCellY)
+            for (int inCellY = 0; inCellY < ESM::Land::LAND_SIZE; ++inCellY)
             {
-                for(int inCellX = 0; inCellX < ESM::Land::LAND_SIZE; ++inCellX)
+                for (int inCellX = 0; inCellX < ESM::Land::LAND_SIZE; ++inCellX)
                 {
                     std::unique_ptr<float> limitedAlteredHeightXAxis(nullptr);
                     std::unique_ptr<float> limitedAlteredHeightYAxis(nullptr);
-                    updateKeyHeightValues(cellCoords, inCellX, inCellY, &thisHeight, &thisAlteredHeight, &leftHeight, &leftAlteredHeight,
-                        &upHeight, &upAlteredHeight, &rightHeight, &rightAlteredHeight, &downHeight, &downAlteredHeight);
+                    updateKeyHeightValues(cellCoords, inCellX, inCellY, &thisHeight, &thisAlteredHeight, &leftHeight,
+                        &leftAlteredHeight, &upHeight, &upAlteredHeight, &rightHeight, &rightAlteredHeight, &downHeight,
+                        &downAlteredHeight);
 
                     // Check for height limits on x-axis
                     if (leftHeight - thisHeight > limitHeightChange)
-                        limitedAlteredHeightXAxis = std::make_unique<float>(leftHeight - limitHeightChange - (thisHeight - thisAlteredHeight));
+                        limitedAlteredHeightXAxis = std::make_unique<float>(
+                            leftHeight - limitHeightChange - (thisHeight - thisAlteredHeight));
                     else if (leftHeight - thisHeight < -limitHeightChange)
-                        limitedAlteredHeightXAxis = std::make_unique<float>(leftHeight + limitHeightChange - (thisHeight - thisAlteredHeight));
+                        limitedAlteredHeightXAxis = std::make_unique<float>(
+                            leftHeight + limitHeightChange - (thisHeight - thisAlteredHeight));
 
                     // Check for height limits on y-axis
                     if (upHeight - thisHeight > limitHeightChange)
-                        limitedAlteredHeightYAxis = std::make_unique<float>(upHeight - limitHeightChange - (thisHeight - thisAlteredHeight));
+                        limitedAlteredHeightYAxis
+                            = std::make_unique<float>(upHeight - limitHeightChange - (thisHeight - thisAlteredHeight));
                     else if (upHeight - thisHeight < -limitHeightChange)
-                        limitedAlteredHeightYAxis = std::make_unique<float>(upHeight + limitHeightChange - (thisHeight - thisAlteredHeight));
+                        limitedAlteredHeightYAxis
+                            = std::make_unique<float>(upHeight + limitHeightChange - (thisHeight - thisAlteredHeight));
 
                     // Limit altered height value based on x or y, whichever is the smallest
-                    compareAndLimit(cellCoords, inCellX, inCellY, limitedAlteredHeightXAxis.get(), limitedAlteredHeightYAxis.get(), &steepnessIsWithinLimits);
+                    compareAndLimit(cellCoords, inCellX, inCellY, limitedAlteredHeightXAxis.get(),
+                        limitedAlteredHeightYAxis.get(), &steepnessIsWithinLimits);
                 }
             }
         }
 
         if (reverseMode)
         {
-            for(int inCellY = ESM::Land::LAND_SIZE - 1; inCellY >= 0; --inCellY)
+            for (int inCellY = ESM::Land::LAND_SIZE - 1; inCellY >= 0; --inCellY)
             {
-                for(int inCellX = ESM::Land::LAND_SIZE - 1; inCellX >= 0; --inCellX)
+                for (int inCellX = ESM::Land::LAND_SIZE - 1; inCellX >= 0; --inCellX)
                 {
                     std::unique_ptr<float> limitedAlteredHeightXAxis(nullptr);
                     std::unique_ptr<float> limitedAlteredHeightYAxis(nullptr);
-                    updateKeyHeightValues(cellCoords, inCellX, inCellY, &thisHeight, &thisAlteredHeight, &leftHeight, &leftAlteredHeight,
-                        &upHeight, &upAlteredHeight, &rightHeight, &rightAlteredHeight, &downHeight, &downAlteredHeight);
+                    updateKeyHeightValues(cellCoords, inCellX, inCellY, &thisHeight, &thisAlteredHeight, &leftHeight,
+                        &leftAlteredHeight, &upHeight, &upAlteredHeight, &rightHeight, &rightAlteredHeight, &downHeight,
+                        &downAlteredHeight);
 
                     // Check for height limits on x-axis
                     if (rightHeight - thisHeight > limitHeightChange)
-                        limitedAlteredHeightXAxis = std::make_unique<float>(rightHeight - limitHeightChange - (thisHeight - thisAlteredHeight));
+                        limitedAlteredHeightXAxis = std::make_unique<float>(
+                            rightHeight - limitHeightChange - (thisHeight - thisAlteredHeight));
                     else if (rightHeight - thisHeight < -limitHeightChange)
-                        limitedAlteredHeightXAxis = std::make_unique<float>(rightHeight + limitHeightChange - (thisHeight - thisAlteredHeight));
+                        limitedAlteredHeightXAxis = std::make_unique<float>(
+                            rightHeight + limitHeightChange - (thisHeight - thisAlteredHeight));
 
                     // Check for height limits on y-axis
                     if (downHeight - thisHeight > limitHeightChange)
-                        limitedAlteredHeightYAxis = std::make_unique<float>(downHeight - limitHeightChange - (thisHeight - thisAlteredHeight));
+                        limitedAlteredHeightYAxis = std::make_unique<float>(
+                            downHeight - limitHeightChange - (thisHeight - thisAlteredHeight));
                     else if (downHeight - thisHeight < -limitHeightChange)
-                        limitedAlteredHeightYAxis = std::make_unique<float>(downHeight + limitHeightChange - (thisHeight - thisAlteredHeight));
+                        limitedAlteredHeightYAxis = std::make_unique<float>(
+                            downHeight + limitHeightChange - (thisHeight - thisAlteredHeight));
 
                     // Limit altered height value based on x or y, whichever is the smallest
-                    compareAndLimit(cellCoords, inCellX, inCellY, limitedAlteredHeightXAxis.get(), limitedAlteredHeightYAxis.get(), &steepnessIsWithinLimits);
+                    compareAndLimit(cellCoords, inCellX, inCellY, limitedAlteredHeightXAxis.get(),
+                        limitedAlteredHeightYAxis.get(), &steepnessIsWithinLimits);
                 }
             }
         }
@@ -1006,7 +1138,8 @@ bool CSVRender::TerrainShapeMode::limitAlteredHeights(const CSMWorld::CellCoordi
 
 bool CSVRender::TerrainShapeMode::isInCellSelection(int globalSelectionX, int globalSelectionY)
 {
-    if (CSVRender::PagedWorldspaceWidget *paged = dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget()))
+    if (CSVRender::PagedWorldspaceWidget* paged
+        = dynamic_cast<CSVRender::PagedWorldspaceWidget*>(&getWorldspaceWidget()))
     {
         std::pair<int, int> vertexCoords = std::make_pair(globalSelectionX, globalSelectionY);
         std::string cellId = CSMWorld::CellCoordinates::vertexGlobalToCellId(vertexCoords);
@@ -1015,9 +1148,11 @@ bool CSVRender::TerrainShapeMode::isInCellSelection(int globalSelectionX, int gl
     return false;
 }
 
-void CSVRender::TerrainShapeMode::handleSelection(int globalSelectionX, int globalSelectionY, std::vector<std::pair<int, int>>* selections)
+void CSVRender::TerrainShapeMode::handleSelection(
+    int globalSelectionX, int globalSelectionY, std::vector<std::pair<int, int>>* selections)
 {
-    if (isInCellSelection(globalSelectionX, globalSelectionY)) selections->emplace_back(globalSelectionX, globalSelectionY);
+    if (isInCellSelection(globalSelectionX, globalSelectionY))
+        selections->emplace_back(globalSelectionX, globalSelectionY);
     else
     {
         int moduloX = globalSelectionX % (ESM::Land::LAND_SIZE - 1);
@@ -1031,7 +1166,8 @@ void CSVRender::TerrainShapeMode::handleSelection(int globalSelectionX, int glob
 
         /*
             The northern and eastern edges don't belong to the current cell.
-            If the corresponding adjacent cell is not loaded, some special handling is necessary to select border vertices.
+            If the corresponding adjacent cell is not loaded, some special handling is necessary to select border
+           vertices.
         */
         if (xIsAtCellBorder && yIsAtCellBorder)
         {
@@ -1074,9 +1210,9 @@ void CSVRender::TerrainShapeMode::selectTerrainShapes(const std::pair<int, int>&
 
     if (mBrushShape == CSVWidget::BrushShape_Square)
     {
-        for(int i = vertexCoords.first - r; i <= vertexCoords.first + r; ++i)
+        for (int i = vertexCoords.first - r; i <= vertexCoords.first + r; ++i)
         {
-            for(int j = vertexCoords.second - r; j <= vertexCoords.second + r; ++j)
+            for (int j = vertexCoords.second - r; j <= vertexCoords.second + r; ++j)
             {
                 handleSelection(i, j, &selections);
             }
@@ -1085,13 +1221,13 @@ void CSVRender::TerrainShapeMode::selectTerrainShapes(const std::pair<int, int>&
 
     if (mBrushShape == CSVWidget::BrushShape_Circle)
     {
-        for(int i = vertexCoords.first - r; i <= vertexCoords.first + r; ++i)
+        for (int i = vertexCoords.first - r; i <= vertexCoords.first + r; ++i)
         {
-            for(int j = vertexCoords.second - r; j <= vertexCoords.second + r; ++j)
+            for (int j = vertexCoords.second - r; j <= vertexCoords.second + r; ++j)
             {
                 int distanceX = abs(i - vertexCoords.first);
                 int distanceY = abs(j - vertexCoords.second);
-                float distance = sqrt(pow(distanceX, 2)+pow(distanceY, 2));
+                float distance = sqrt(pow(distanceX, 2) + pow(distanceY, 2));
 
                 // Using floating-point radius here to prevent selecting too few vertices.
                 if (distance <= mBrushSize / 2.0f)
@@ -1102,11 +1238,12 @@ void CSVRender::TerrainShapeMode::selectTerrainShapes(const std::pair<int, int>&
 
     if (mBrushShape == CSVWidget::BrushShape_Custom)
     {
-        if(!mCustomBrushShape.empty())
+        if (!mCustomBrushShape.empty())
         {
-            for(auto const& value: mCustomBrushShape)
+            for (auto const& value : mCustomBrushShape)
             {
-                std::pair<int, int> localVertexCoords (vertexCoords.first + value.first, vertexCoords.second + value.second);
+                std::pair<int, int> localVertexCoords(
+                    vertexCoords.first + value.first, vertexCoords.second + value.second);
                 handleSelection(localVertexCoords.first, localVertexCoords.second, &selections);
             }
         }
@@ -1129,42 +1266,44 @@ void CSVRender::TerrainShapeMode::selectTerrainShapes(const std::pair<int, int>&
         mTerrainShapeSelection->toggleSelect(selections);
 }
 
-void CSVRender::TerrainShapeMode::pushEditToCommand(const CSMWorld::LandHeightsColumn::DataType& newLandGrid, CSMDoc::Document& document,
-    CSMWorld::IdTable& landTable, const std::string& cellId)
+void CSVRender::TerrainShapeMode::pushEditToCommand(const CSMWorld::LandHeightsColumn::DataType& newLandGrid,
+    CSMDoc::Document& document, CSMWorld::IdTable& landTable, const std::string& cellId)
 {
     QVariant changedLand;
     changedLand.setValue(newLandGrid);
 
-    QModelIndex index(landTable.getModelIndex (cellId, landTable.findColumnIndex (CSMWorld::Columns::ColumnId_LandHeightsIndex)));
+    QModelIndex index(
+        landTable.getModelIndex(cellId, landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandHeightsIndex)));
 
     QUndoStack& undoStack = document.getUndoStack();
-    undoStack.push (new CSMWorld::ModifyCommand(landTable, index, changedLand));
+    undoStack.push(new CSMWorld::ModifyCommand(landTable, index, changedLand));
 }
 
-void CSVRender::TerrainShapeMode::pushNormalsEditToCommand(const CSMWorld::LandNormalsColumn::DataType& newLandGrid, CSMDoc::Document& document,
-    CSMWorld::IdTable& landTable, const std::string& cellId)
+void CSVRender::TerrainShapeMode::pushNormalsEditToCommand(const CSMWorld::LandNormalsColumn::DataType& newLandGrid,
+    CSMDoc::Document& document, CSMWorld::IdTable& landTable, const std::string& cellId)
 {
     QVariant changedLand;
     changedLand.setValue(newLandGrid);
 
-    QModelIndex index(landTable.getModelIndex (cellId, landTable.findColumnIndex (CSMWorld::Columns::ColumnId_LandNormalsIndex)));
+    QModelIndex index(
+        landTable.getModelIndex(cellId, landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandNormalsIndex)));
 
     QUndoStack& undoStack = document.getUndoStack();
-    undoStack.push (new CSMWorld::ModifyCommand(landTable, index, changedLand));
+    undoStack.push(new CSMWorld::ModifyCommand(landTable, index, changedLand));
 }
 
 bool CSVRender::TerrainShapeMode::noCell(const std::string& cellId)
 {
     CSMDoc::Document& document = getWorldspaceWidget().getDocument();
     const CSMWorld::IdCollection<CSMWorld::Cell>& cellCollection = document.getData().getCells();
-    return cellCollection.searchId (cellId) == -1;
+    return cellCollection.searchId(cellId) == -1;
 }
 
 bool CSVRender::TerrainShapeMode::noLand(const std::string& cellId)
 {
     CSMDoc::Document& document = getWorldspaceWidget().getDocument();
     const CSMWorld::IdCollection<CSMWorld::Land>& landCollection = document.getData().getLand();
-    return landCollection.searchId (cellId) == -1;
+    return landCollection.searchId(cellId) == -1;
 }
 
 bool CSVRender::TerrainShapeMode::noLandLoaded(const std::string& cellId)
@@ -1176,17 +1315,18 @@ bool CSVRender::TerrainShapeMode::noLandLoaded(const std::string& cellId)
 
 bool CSVRender::TerrainShapeMode::isLandLoaded(const std::string& cellId)
 {
-    if (!noCell(cellId) && !noLand(cellId) && !noLandLoaded(cellId)) return true;
+    if (!noCell(cellId) && !noLand(cellId) && !noLandLoaded(cellId))
+        return true;
     return false;
 }
 
 void CSVRender::TerrainShapeMode::createNewLandData(const CSMWorld::CellCoordinates& cellCoords)
 {
     CSMDoc::Document& document = getWorldspaceWidget().getDocument();
-    CSMWorld::IdTable& landTable = dynamic_cast<CSMWorld::IdTable&> (
-        *document.getData().getTableModel (CSMWorld::UniversalId::Type_Land));
-    CSMWorld::IdTable& ltexTable = dynamic_cast<CSMWorld::IdTable&> (
-        *document.getData().getTableModel (CSMWorld::UniversalId::Type_LandTextures));
+    CSMWorld::IdTable& landTable
+        = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_Land));
+    CSMWorld::IdTable& ltexTable
+        = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_LandTextures));
     int landshapeColumn = landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandHeightsIndex);
     int landnormalsColumn = landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandNormalsIndex);
 
@@ -1208,60 +1348,74 @@ void CSVRender::TerrainShapeMode::createNewLandData(const CSMWorld::CellCoordina
     float upCellSampleHeight = 0.0f;
     float downCellSampleHeight = 0.0f;
 
-    const CSMWorld::LandHeightsColumn::DataType landShapePointer = landTable.data(landTable.getModelIndex(cellId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
-    const CSMWorld::LandNormalsColumn::DataType landNormalsPointer = landTable.data(landTable.getModelIndex(cellId, landnormalsColumn)).value<CSMWorld::LandNormalsColumn::DataType>();
+    const CSMWorld::LandHeightsColumn::DataType landShapePointer
+        = landTable.data(landTable.getModelIndex(cellId, landshapeColumn))
+              .value<CSMWorld::LandHeightsColumn::DataType>();
+    const CSMWorld::LandNormalsColumn::DataType landNormalsPointer
+        = landTable.data(landTable.getModelIndex(cellId, landnormalsColumn))
+              .value<CSMWorld::LandNormalsColumn::DataType>();
     CSMWorld::LandHeightsColumn::DataType landShapeNew(landShapePointer);
     CSMWorld::LandNormalsColumn::DataType landNormalsNew(landNormalsPointer);
 
-    if (CSVRender::PagedWorldspaceWidget *paged =
-        dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget()))
+    if (CSVRender::PagedWorldspaceWidget* paged
+        = dynamic_cast<CSVRender::PagedWorldspaceWidget*>(&getWorldspaceWidget()))
     {
         if (isLandLoaded(cellLeftId))
         {
-            const CSMWorld::LandHeightsColumn::DataType landLeftShapePointer =
-                landTable.data(landTable.getModelIndex(cellLeftId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
+            const CSMWorld::LandHeightsColumn::DataType landLeftShapePointer
+                = landTable.data(landTable.getModelIndex(cellLeftId, landshapeColumn))
+                      .value<CSMWorld::LandHeightsColumn::DataType>();
 
             ++averageDivider;
-            leftCellSampleHeight = landLeftShapePointer[(ESM::Land::LAND_SIZE / 2) * ESM::Land::LAND_SIZE + ESM::Land::LAND_SIZE - 1];
-            if(paged->getCellAlteredHeight(cellLeftCoords, ESM::Land::LAND_SIZE - 1, ESM::Land::LAND_SIZE / 2))
-                leftCellSampleHeight += *paged->getCellAlteredHeight(cellLeftCoords, ESM::Land::LAND_SIZE - 1, ESM::Land::LAND_SIZE / 2);
+            leftCellSampleHeight
+                = landLeftShapePointer[(ESM::Land::LAND_SIZE / 2) * ESM::Land::LAND_SIZE + ESM::Land::LAND_SIZE - 1];
+            if (paged->getCellAlteredHeight(cellLeftCoords, ESM::Land::LAND_SIZE - 1, ESM::Land::LAND_SIZE / 2))
+                leftCellSampleHeight
+                    += *paged->getCellAlteredHeight(cellLeftCoords, ESM::Land::LAND_SIZE - 1, ESM::Land::LAND_SIZE / 2);
         }
         if (isLandLoaded(cellRightId))
         {
-            const CSMWorld::LandHeightsColumn::DataType landRightShapePointer =
-                landTable.data(landTable.getModelIndex(cellRightId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
+            const CSMWorld::LandHeightsColumn::DataType landRightShapePointer
+                = landTable.data(landTable.getModelIndex(cellRightId, landshapeColumn))
+                      .value<CSMWorld::LandHeightsColumn::DataType>();
 
             ++averageDivider;
             rightCellSampleHeight = landRightShapePointer[(ESM::Land::LAND_SIZE / 2) * ESM::Land::LAND_SIZE];
-            if(paged->getCellAlteredHeight(cellRightCoords, 0, ESM::Land::LAND_SIZE / 2))
+            if (paged->getCellAlteredHeight(cellRightCoords, 0, ESM::Land::LAND_SIZE / 2))
                 rightCellSampleHeight += *paged->getCellAlteredHeight(cellRightCoords, 0, ESM::Land::LAND_SIZE / 2);
         }
         if (isLandLoaded(cellUpId))
         {
-            const CSMWorld::LandHeightsColumn::DataType landUpShapePointer =
-                landTable.data(landTable.getModelIndex(cellUpId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
+            const CSMWorld::LandHeightsColumn::DataType landUpShapePointer
+                = landTable.data(landTable.getModelIndex(cellUpId, landshapeColumn))
+                      .value<CSMWorld::LandHeightsColumn::DataType>();
 
             ++averageDivider;
-            upCellSampleHeight = landUpShapePointer[(ESM::Land::LAND_SIZE - 1) * ESM::Land::LAND_SIZE + (ESM::Land::LAND_SIZE / 2)];
-            if(paged->getCellAlteredHeight(cellUpCoords, ESM::Land::LAND_SIZE / 2, ESM::Land::LAND_SIZE - 1))
-                upCellSampleHeight += *paged->getCellAlteredHeight(cellUpCoords, ESM::Land::LAND_SIZE / 2, ESM::Land::LAND_SIZE - 1);
+            upCellSampleHeight
+                = landUpShapePointer[(ESM::Land::LAND_SIZE - 1) * ESM::Land::LAND_SIZE + (ESM::Land::LAND_SIZE / 2)];
+            if (paged->getCellAlteredHeight(cellUpCoords, ESM::Land::LAND_SIZE / 2, ESM::Land::LAND_SIZE - 1))
+                upCellSampleHeight
+                    += *paged->getCellAlteredHeight(cellUpCoords, ESM::Land::LAND_SIZE / 2, ESM::Land::LAND_SIZE - 1);
         }
         if (isLandLoaded(cellDownId))
         {
-            const CSMWorld::LandHeightsColumn::DataType landDownShapePointer =
-                landTable.data(landTable.getModelIndex(cellDownId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
+            const CSMWorld::LandHeightsColumn::DataType landDownShapePointer
+                = landTable.data(landTable.getModelIndex(cellDownId, landshapeColumn))
+                      .value<CSMWorld::LandHeightsColumn::DataType>();
 
             ++averageDivider;
             downCellSampleHeight = landDownShapePointer[ESM::Land::LAND_SIZE / 2];
-            if(paged->getCellAlteredHeight(cellDownCoords, ESM::Land::LAND_SIZE / 2, 0))
+            if (paged->getCellAlteredHeight(cellDownCoords, ESM::Land::LAND_SIZE / 2, 0))
                 downCellSampleHeight += *paged->getCellAlteredHeight(cellDownCoords, ESM::Land::LAND_SIZE / 2, 0);
         }
     }
-    if (averageDivider > 0) defaultHeight = (leftCellSampleHeight + rightCellSampleHeight + upCellSampleHeight + downCellSampleHeight) / averageDivider;
+    if (averageDivider > 0)
+        defaultHeight = (leftCellSampleHeight + rightCellSampleHeight + upCellSampleHeight + downCellSampleHeight)
+            / averageDivider;
 
-    for(int i = 0; i < ESM::Land::LAND_SIZE; ++i)
+    for (int i = 0; i < ESM::Land::LAND_SIZE; ++i)
     {
-        for(int j = 0; j < ESM::Land::LAND_SIZE; ++j)
+        for (int j = 0; j < ESM::Land::LAND_SIZE; ++j)
         {
             landShapeNew[j * ESM::Land::LAND_SIZE + i] = defaultHeight;
             landNormalsNew[(j * ESM::Land::LAND_SIZE + i) * 3 + 0] = 0;
@@ -1273,63 +1427,64 @@ void CSVRender::TerrainShapeMode::createNewLandData(const CSMWorld::CellCoordina
     changedShape.setValue(landShapeNew);
     QVariant changedNormals;
     changedNormals.setValue(landNormalsNew);
-    QModelIndex indexShape(landTable.getModelIndex (cellId, landTable.findColumnIndex (CSMWorld::Columns::ColumnId_LandHeightsIndex)));
-    QModelIndex indexNormal(landTable.getModelIndex (cellId, landTable.findColumnIndex (CSMWorld::Columns::ColumnId_LandNormalsIndex)));
-    document.getUndoStack().push (new CSMWorld::TouchLandCommand(landTable, ltexTable, cellId));
-    document.getUndoStack().push (new CSMWorld::ModifyCommand(landTable, indexShape, changedShape));
-    document.getUndoStack().push (new CSMWorld::ModifyCommand(landTable, indexNormal, changedNormals));
+    QModelIndex indexShape(
+        landTable.getModelIndex(cellId, landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandHeightsIndex)));
+    QModelIndex indexNormal(
+        landTable.getModelIndex(cellId, landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandNormalsIndex)));
+    document.getUndoStack().push(new CSMWorld::TouchLandCommand(landTable, ltexTable, cellId));
+    document.getUndoStack().push(new CSMWorld::ModifyCommand(landTable, indexShape, changedShape));
+    document.getUndoStack().push(new CSMWorld::ModifyCommand(landTable, indexNormal, changedNormals));
 }
 
 bool CSVRender::TerrainShapeMode::allowLandShapeEditing(const std::string& cellId, bool useTool)
 {
     CSMDoc::Document& document = getWorldspaceWidget().getDocument();
-    CSMWorld::IdTable& landTable = dynamic_cast<CSMWorld::IdTable&> (
-        *document.getData().getTableModel (CSMWorld::UniversalId::Type_Land));
-    CSMWorld::IdTree& cellTable = dynamic_cast<CSMWorld::IdTree&> (
-            *document.getData().getTableModel (CSMWorld::UniversalId::Type_Cells));
+    CSMWorld::IdTable& landTable
+        = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_Land));
+    CSMWorld::IdTree& cellTable
+        = dynamic_cast<CSMWorld::IdTree&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_Cells));
 
     if (noCell(cellId))
     {
         std::string mode = CSMPrefs::get()["3D Scene Editing"]["outside-landedit"].toString();
 
         // target cell does not exist
-        if (mode=="Discard")
+        if (mode == "Discard")
             return false;
 
-        if (mode=="Create cell and land, then edit" && useTool)
+        if (mode == "Create cell and land, then edit" && useTool)
         {
             auto createCommand = std::make_unique<CSMWorld::CreateCommand>(cellTable, cellId);
-            int parentIndex = cellTable.findColumnIndex (CSMWorld::Columns::ColumnId_Cell);
-            int index = cellTable.findNestedColumnIndex (parentIndex, CSMWorld::Columns::ColumnId_Interior);
-            createCommand->addNestedValue (parentIndex, index, false);
-            document.getUndoStack().push (createCommand.release());
+            int parentIndex = cellTable.findColumnIndex(CSMWorld::Columns::ColumnId_Cell);
+            int index = cellTable.findNestedColumnIndex(parentIndex, CSMWorld::Columns::ColumnId_Interior);
+            createCommand->addNestedValue(parentIndex, index, false);
+            document.getUndoStack().push(createCommand.release());
 
-            if (CSVRender::PagedWorldspaceWidget *paged =
-                dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget()))
+            if (CSVRender::PagedWorldspaceWidget* paged
+                = dynamic_cast<CSVRender::PagedWorldspaceWidget*>(&getWorldspaceWidget()))
             {
                 CSMWorld::CellSelection selection = paged->getCellSelection();
-                selection.add (CSMWorld::CellCoordinates::fromId (cellId).first);
-                paged->setCellSelection (selection);
+                selection.add(CSMWorld::CellCoordinates::fromId(cellId).first);
+                paged->setCellSelection(selection);
             }
         }
     }
-    else if (CSVRender::PagedWorldspaceWidget *paged =
-        dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget()))
+    else if (CSVRender::PagedWorldspaceWidget* paged
+        = dynamic_cast<CSVRender::PagedWorldspaceWidget*>(&getWorldspaceWidget()))
     {
         CSMWorld::CellSelection selection = paged->getCellSelection();
-        if (!selection.has (CSMWorld::CellCoordinates::fromId (cellId).first))
+        if (!selection.has(CSMWorld::CellCoordinates::fromId(cellId).first))
         {
             // target cell exists, but is not shown
-            std::string mode =
-                CSMPrefs::get()["3D Scene Editing"]["outside-visible-landedit"].toString();
+            std::string mode = CSMPrefs::get()["3D Scene Editing"]["outside-visible-landedit"].toString();
 
-            if (mode=="Discard")
+            if (mode == "Discard")
                 return false;
 
-            if (mode=="Show cell and edit" && useTool)
+            if (mode == "Show cell and edit" && useTool)
             {
-                selection.add (CSMWorld::CellCoordinates::fromId (cellId).first);
-                paged->setCellSelection (selection);
+                selection.add(CSMWorld::CellCoordinates::fromId(cellId).first);
+                paged->setCellSelection(selection);
             }
         }
     }
@@ -1339,12 +1494,12 @@ bool CSVRender::TerrainShapeMode::allowLandShapeEditing(const std::string& cellI
         std::string mode = CSMPrefs::get()["3D Scene Editing"]["outside-landedit"].toString();
 
         // target cell does not exist
-        if (mode=="Discard")
+        if (mode == "Discard")
             return false;
 
-        if (mode=="Create cell and land, then edit" && useTool)
+        if (mode == "Create cell and land, then edit" && useTool)
         {
-            document.getUndoStack().push (new CSMWorld::CreateCommand (landTable, cellId));
+            document.getUndoStack().push(new CSMWorld::CreateCommand(landTable, cellId));
             createNewLandData(CSMWorld::CellCoordinates::fromId(cellId).first);
             fixEdges(CSMWorld::CellCoordinates::fromId(cellId).first);
             sortAndLimitAlteredCells();
@@ -1354,10 +1509,10 @@ bool CSVRender::TerrainShapeMode::allowLandShapeEditing(const std::string& cellI
     {
         std::string mode = CSMPrefs::get()["3D Scene Editing"]["outside-landedit"].toString();
 
-        if (mode=="Discard")
+        if (mode == "Discard")
             return false;
 
-        if (mode=="Create cell and land, then edit" && useTool)
+        if (mode == "Create cell and land, then edit" && useTool)
         {
             createNewLandData(CSMWorld::CellCoordinates::fromId(cellId).first);
             fixEdges(CSMWorld::CellCoordinates::fromId(cellId).first);
@@ -1376,8 +1531,8 @@ bool CSVRender::TerrainShapeMode::allowLandShapeEditing(const std::string& cellI
 void CSVRender::TerrainShapeMode::fixEdges(CSMWorld::CellCoordinates cellCoords)
 {
     CSMDoc::Document& document = getWorldspaceWidget().getDocument();
-    CSMWorld::IdTable& landTable = dynamic_cast<CSMWorld::IdTable&> (
-        *document.getData().getTableModel (CSMWorld::UniversalId::Type_Land));
+    CSMWorld::IdTable& landTable
+        = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_Land));
     int landshapeColumn = landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandHeightsIndex);
     std::string cellId = CSMWorld::CellCoordinates::generateId(cellCoords.getX(), cellCoords.getY());
     std::string cellLeftId = CSMWorld::CellCoordinates::generateId(cellCoords.getX() - 1, cellCoords.getY());
@@ -1385,42 +1540,55 @@ void CSVRender::TerrainShapeMode::fixEdges(CSMWorld::CellCoordinates cellCoords)
     std::string cellUpId = CSMWorld::CellCoordinates::generateId(cellCoords.getX(), cellCoords.getY() - 1);
     std::string cellDownId = CSMWorld::CellCoordinates::generateId(cellCoords.getX(), cellCoords.getY() + 1);
 
-    const CSMWorld::LandHeightsColumn::DataType landShapePointer = landTable.data(landTable.getModelIndex(cellId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
-    const CSMWorld::LandHeightsColumn::DataType landLeftShapePointer = landTable.data(landTable.getModelIndex(cellLeftId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
-    const CSMWorld::LandHeightsColumn::DataType landRightShapePointer = landTable.data(landTable.getModelIndex(cellRightId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
-    const CSMWorld::LandHeightsColumn::DataType landUpShapePointer = landTable.data(landTable.getModelIndex(cellUpId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
-    const CSMWorld::LandHeightsColumn::DataType landDownShapePointer = landTable.data(landTable.getModelIndex(cellDownId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
+    const CSMWorld::LandHeightsColumn::DataType landShapePointer
+        = landTable.data(landTable.getModelIndex(cellId, landshapeColumn))
+              .value<CSMWorld::LandHeightsColumn::DataType>();
+    const CSMWorld::LandHeightsColumn::DataType landLeftShapePointer
+        = landTable.data(landTable.getModelIndex(cellLeftId, landshapeColumn))
+              .value<CSMWorld::LandHeightsColumn::DataType>();
+    const CSMWorld::LandHeightsColumn::DataType landRightShapePointer
+        = landTable.data(landTable.getModelIndex(cellRightId, landshapeColumn))
+              .value<CSMWorld::LandHeightsColumn::DataType>();
+    const CSMWorld::LandHeightsColumn::DataType landUpShapePointer
+        = landTable.data(landTable.getModelIndex(cellUpId, landshapeColumn))
+              .value<CSMWorld::LandHeightsColumn::DataType>();
+    const CSMWorld::LandHeightsColumn::DataType landDownShapePointer
+        = landTable.data(landTable.getModelIndex(cellDownId, landshapeColumn))
+              .value<CSMWorld::LandHeightsColumn::DataType>();
 
     CSMWorld::LandHeightsColumn::DataType landShapeNew(landShapePointer);
-    for(int i = 0; i < ESM::Land::LAND_SIZE; ++i)
+    for (int i = 0; i < ESM::Land::LAND_SIZE; ++i)
     {
-        if (isLandLoaded(cellLeftId) &&
-            landShapePointer[i * ESM::Land::LAND_SIZE] != landLeftShapePointer[i * ESM::Land::LAND_SIZE + ESM::Land::LAND_SIZE - 1])
-            landShapeNew[i * ESM::Land::LAND_SIZE] = landLeftShapePointer[i * ESM::Land::LAND_SIZE + ESM::Land::LAND_SIZE - 1];
-        if (isLandLoaded(cellRightId) &&
-            landShapePointer[i * ESM::Land::LAND_SIZE + ESM::Land::LAND_SIZE - 1] != landRightShapePointer[i * ESM::Land::LAND_SIZE])
-            landShapeNew[i * ESM::Land::LAND_SIZE + ESM::Land::LAND_SIZE - 1] = landRightShapePointer[i * ESM::Land::LAND_SIZE];
-        if (isLandLoaded(cellUpId) &&
-            landShapePointer[i] != landUpShapePointer[(ESM::Land::LAND_SIZE - 1) * ESM::Land::LAND_SIZE + i])
+        if (isLandLoaded(cellLeftId)
+            && landShapePointer[i * ESM::Land::LAND_SIZE]
+                != landLeftShapePointer[i * ESM::Land::LAND_SIZE + ESM::Land::LAND_SIZE - 1])
+            landShapeNew[i * ESM::Land::LAND_SIZE]
+                = landLeftShapePointer[i * ESM::Land::LAND_SIZE + ESM::Land::LAND_SIZE - 1];
+        if (isLandLoaded(cellRightId)
+            && landShapePointer[i * ESM::Land::LAND_SIZE + ESM::Land::LAND_SIZE - 1]
+                != landRightShapePointer[i * ESM::Land::LAND_SIZE])
+            landShapeNew[i * ESM::Land::LAND_SIZE + ESM::Land::LAND_SIZE - 1]
+                = landRightShapePointer[i * ESM::Land::LAND_SIZE];
+        if (isLandLoaded(cellUpId)
+            && landShapePointer[i] != landUpShapePointer[(ESM::Land::LAND_SIZE - 1) * ESM::Land::LAND_SIZE + i])
             landShapeNew[i] = landUpShapePointer[(ESM::Land::LAND_SIZE - 1) * ESM::Land::LAND_SIZE + i];
-        if (isLandLoaded(cellDownId) &&
-            landShapePointer[(ESM::Land::LAND_SIZE - 1) * ESM::Land::LAND_SIZE + i] != landDownShapePointer[i])
+        if (isLandLoaded(cellDownId)
+            && landShapePointer[(ESM::Land::LAND_SIZE - 1) * ESM::Land::LAND_SIZE + i] != landDownShapePointer[i])
             landShapeNew[(ESM::Land::LAND_SIZE - 1) * ESM::Land::LAND_SIZE + i] = landDownShapePointer[i];
     }
 
     QVariant changedLand;
     changedLand.setValue(landShapeNew);
 
-    QModelIndex index(landTable.getModelIndex (cellId, landTable.findColumnIndex (CSMWorld::Columns::ColumnId_LandHeightsIndex)));
+    QModelIndex index(
+        landTable.getModelIndex(cellId, landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandHeightsIndex)));
     QUndoStack& undoStack = document.getUndoStack();
-    undoStack.push (new CSMWorld::ModifyCommand(landTable, index, changedLand));
+    undoStack.push(new CSMWorld::ModifyCommand(landTable, index, changedLand));
 }
 
-void CSVRender::TerrainShapeMode::dragMoveEvent (QDragMoveEvent *event)
-{
-}
+void CSVRender::TerrainShapeMode::dragMoveEvent(QDragMoveEvent* event) {}
 
-void CSVRender::TerrainShapeMode::mouseMoveEvent (QMouseEvent *event)
+void CSVRender::TerrainShapeMode::mouseMoveEvent(QMouseEvent* event)
 {
     WorldspaceHitResult hit = getWorldspaceWidget().mousePick(event->pos(), getInteractionMask());
     if (hit.hit && mBrushDraw && !(mShapeEditTool == ShapeEditTool_Drag && mIsEditing))
@@ -1443,7 +1611,7 @@ void CSVRender::TerrainShapeMode::setBrushShape(CSVWidget::BrushShape brushShape
 {
     mBrushShape = brushShape;
 
-    //Set custom brush shape
+    // Set custom brush shape
     if (mBrushShape == CSVWidget::BrushShape_Custom && !mTerrainShapeSelection->getTerrainSelection().empty())
     {
         auto terrainSelection = mTerrainShapeSelection->getTerrainSelection();
@@ -1451,7 +1619,7 @@ void CSVRender::TerrainShapeMode::setBrushShape(CSVWidget::BrushShape brushShape
         int selectionCenterY = 0;
         int selectionAmount = 0;
 
-        for(auto const& value: terrainSelection)
+        for (auto const& value : terrainSelection)
         {
             selectionCenterX = selectionCenterX + value.first;
             selectionCenterY = selectionCenterY + value.second;
@@ -1465,8 +1633,8 @@ void CSVRender::TerrainShapeMode::setBrushShape(CSVWidget::BrushShape brushShape
         }
 
         mCustomBrushShape.clear();
-        std::pair<int, int> differentialPos {};
-        for(auto const& value: terrainSelection)
+        std::pair<int, int> differentialPos{};
+        for (auto const& value : terrainSelection)
         {
             differentialPos.first = value.first - selectionCenterX;
             differentialPos.second = value.second - selectionCenterY;
diff --git a/apps/opencs/view/render/terrainshapemode.hpp b/apps/opencs/view/render/terrainshapemode.hpp
index 0497f24da9..ed3cfa2f99 100644
--- a/apps/opencs/view/render/terrainshapemode.hpp
+++ b/apps/opencs/view/render/terrainshapemode.hpp
@@ -3,16 +3,16 @@
 
 #include "editmode.hpp"
 
-#include <string>
 #include <memory>
+#include <string>
 
-#include <QWidget>
 #include <QEvent>
+#include <QWidget>
 
 #ifndef Q_MOC_RUN
 #include "../../model/doc/document.hpp"
-#include "../../model/world/idtable.hpp"
 #include "../../model/world/columnimp.hpp"
+#include "../../model/world/idtable.hpp"
 #include "../widget/brushshapes.hpp"
 #endif
 
@@ -38,165 +38,168 @@ namespace CSVRender
     {
         Q_OBJECT
 
-        public:
-
-            enum InteractionType
-            {
-                InteractionType_PrimaryEdit,
-                InteractionType_PrimarySelect,
-                InteractionType_SecondaryEdit,
-                InteractionType_SecondarySelect,
-                InteractionType_None
-            };
+    public:
+        enum InteractionType
+        {
+            InteractionType_PrimaryEdit,
+            InteractionType_PrimarySelect,
+            InteractionType_SecondaryEdit,
+            InteractionType_SecondarySelect,
+            InteractionType_None
+        };
 
-            enum ShapeEditTool
-            {
-                ShapeEditTool_Drag = 0,
-                ShapeEditTool_PaintToRaise = 1,
-                ShapeEditTool_PaintToLower = 2,
-                ShapeEditTool_Smooth = 3,
-                ShapeEditTool_Flatten = 4
-            };
+        enum ShapeEditTool
+        {
+            ShapeEditTool_Drag = 0,
+            ShapeEditTool_PaintToRaise = 1,
+            ShapeEditTool_PaintToLower = 2,
+            ShapeEditTool_Smooth = 3,
+            ShapeEditTool_Flatten = 4
+        };
 
-            /// Editmode for terrain shape grid
-            TerrainShapeMode(WorldspaceWidget*, osg::Group* parentNode, QWidget* parent = nullptr);
+        /// Editmode for terrain shape grid
+        TerrainShapeMode(WorldspaceWidget*, osg::Group* parentNode, QWidget* parent = nullptr);
 
-            void primaryOpenPressed (const WorldspaceHitResult& hit) override;
+        void primaryOpenPressed(const WorldspaceHitResult& hit) override;
 
-            /// Create single command for one-click shape editing
-            void primaryEditPressed (const WorldspaceHitResult& hit) override;
+        /// Create single command for one-click shape editing
+        void primaryEditPressed(const WorldspaceHitResult& hit) override;
 
-            /// Open brush settings window
-            void primarySelectPressed(const WorldspaceHitResult&) override;
+        /// Open brush settings window
+        void primarySelectPressed(const WorldspaceHitResult&) override;
 
-            void secondarySelectPressed(const WorldspaceHitResult&) override;
+        void secondarySelectPressed(const WorldspaceHitResult&) override;
 
-            void activate(CSVWidget::SceneToolbar*) override;
-            void deactivate(CSVWidget::SceneToolbar*) override;
+        void activate(CSVWidget::SceneToolbar*) override;
+        void deactivate(CSVWidget::SceneToolbar*) override;
 
-            /// Start shape editing command macro
-            bool primaryEditStartDrag (const QPoint& pos) override;
+        /// Start shape editing command macro
+        bool primaryEditStartDrag(const QPoint& pos) override;
 
-            bool secondaryEditStartDrag (const QPoint& pos) override;
-            bool primarySelectStartDrag (const QPoint& pos) override;
-            bool secondarySelectStartDrag (const QPoint& pos) override;
+        bool secondaryEditStartDrag(const QPoint& pos) override;
+        bool primarySelectStartDrag(const QPoint& pos) override;
+        bool secondarySelectStartDrag(const QPoint& pos) override;
 
-            /// Handle shape edit behavior during dragging
-            void drag (const QPoint& pos, int diffX, int diffY, double speedFactor) override;
+        /// Handle shape edit behavior during dragging
+        void drag(const QPoint& pos, int diffX, int diffY, double speedFactor) override;
 
-            /// End shape editing command macro
-            void dragCompleted(const QPoint& pos) override;
+        /// End shape editing command macro
+        void dragCompleted(const QPoint& pos) override;
 
-            /// Cancel shape editing, and reset all pending changes
-            void dragAborted() override;
+        /// Cancel shape editing, and reset all pending changes
+        void dragAborted() override;
 
-            void dragWheel (int diff, double speedFactor) override;
-            void dragMoveEvent (QDragMoveEvent *event) override;
-            void mouseMoveEvent (QMouseEvent *event) override;
+        void dragWheel(int diff, double speedFactor) override;
+        void dragMoveEvent(QDragMoveEvent* event) override;
+        void mouseMoveEvent(QMouseEvent* event) override;
 
-            std::shared_ptr<TerrainSelection> getTerrainSelection();
+        std::shared_ptr<TerrainSelection> getTerrainSelection();
 
-        private:
+    private:
+        /// Remove duplicates and sort mAlteredCells, then limitAlteredHeights forward and reverse
+        void sortAndLimitAlteredCells();
 
-            /// Remove duplicates and sort mAlteredCells, then limitAlteredHeights forward and reverse
-            void sortAndLimitAlteredCells();
+        /// Reset everything in the current edit
+        void clearTransientEdits();
 
-            /// Reset everything in the current edit
-            void clearTransientEdits();
+        /// Move pending alteredHeights changes to omwgame/omwaddon -data
+        void applyTerrainEditChanges();
 
-            /// Move pending alteredHeights changes to omwgame/omwaddon -data
-            void applyTerrainEditChanges();
+        /// Handle brush mechanics for shape editing
+        void editTerrainShapeGrid(const std::pair<int, int>& vertexCoords, bool dragOperation);
 
-            /// Handle brush mechanics for shape editing
-            void editTerrainShapeGrid (const std::pair<int, int>& vertexCoords, bool dragOperation);
+        /// Calculate height, when aiming for bump-shaped terrain change
+        float calculateBumpShape(float distance, int radius, float height);
 
-            /// Calculate height, when aiming for bump-shaped terrain change
-            float calculateBumpShape(float distance, int radius, float height);
+        /// set the target height for flatten tool
+        void setFlattenToolTargetHeight(const WorldspaceHitResult& hit);
 
-            /// set the target height for flatten tool
-            void setFlattenToolTargetHeight(const WorldspaceHitResult& hit);
+        /// Do a single height alteration for transient shape edit map
+        void alterHeight(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, float alteredHeight,
+            bool useTool = true);
 
-            /// Do a single height alteration for transient shape edit map
-            void alterHeight(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, float alteredHeight, bool useTool = true);
+        /// Do a single smoothing height alteration for transient shape edit map
+        void smoothHeight(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, int toolStrength);
 
-            /// Do a single smoothing height alteration for transient shape edit map
-            void smoothHeight(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, int toolStrength);
+        /// Do a single flattening height alteration for transient shape edit map
+        void flattenHeight(
+            const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, int toolStrength, int targetHeight);
 
-            /// Do a single flattening height alteration for transient shape edit map
-            void flattenHeight(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, int toolStrength, int targetHeight);
+        /// Get altered height values around one vertex
+        void updateKeyHeightValues(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY,
+            float* thisHeight, float* thisAlteredHeight, float* leftHeight, float* leftAlteredHeight, float* upHeight,
+            float* upAlteredHeight, float* rightHeight, float* rightAlteredHeight, float* downHeight,
+            float* downAlteredHeight);
 
-            /// Get altered height values around one vertex
-            void updateKeyHeightValues(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, float* thisHeight,
-                float* thisAlteredHeight, float* leftHeight, float* leftAlteredHeight, float* upHeight, float* upAlteredHeight,
-                float* rightHeight, float* rightAlteredHeight, float* downHeight, float* downAlteredHeight);
+        /// Limit steepness based on either X or Y and return false if steepness is limited
+        void compareAndLimit(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY,
+            float* limitedAlteredHeightXAxis, float* limitedAlteredHeightYAxis, bool* steepnessIsWithinLimits);
 
-            ///Limit steepness based on either X or Y and return false if steepness is limited
-            void compareAndLimit(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, float* limitedAlteredHeightXAxis,
-                float* limitedAlteredHeightYAxis, bool* steepnessIsWithinLimits);
+        /// Check that the edit doesn't break save format limits, fix if necessary, return true if slope steepness is
+        /// within limits
+        bool limitAlteredHeights(const CSMWorld::CellCoordinates& cellCoords, bool reverseMode = false);
 
-            /// Check that the edit doesn't break save format limits, fix if necessary, return true if slope steepness is within limits
-            bool limitAlteredHeights(const CSMWorld::CellCoordinates& cellCoords, bool reverseMode = false);
+        /// Check if global selection coordinate belongs to cell in view
+        bool isInCellSelection(int globalSelectionX, int globalSelectionY);
 
-            /// Check if global selection coordinate belongs to cell in view
-            bool isInCellSelection(int globalSelectionX, int globalSelectionY);
+        /// Select vertex at global selection coordinate
+        void handleSelection(int globalSelectionX, int globalSelectionY, std::vector<std::pair<int, int>>* selections);
 
-            /// Select vertex at global selection coordinate
-            void handleSelection(int globalSelectionX, int globalSelectionY, std::vector<std::pair<int, int>>* selections);
+        /// Handle brush mechanics for terrain shape selection
+        void selectTerrainShapes(const std::pair<int, int>& vertexCoords, unsigned char selectMode);
 
-            /// Handle brush mechanics for terrain shape selection
-            void selectTerrainShapes (const std::pair<int, int>& vertexCoords, unsigned char selectMode);
+        /// Push terrain shape edits to command macro
+        void pushEditToCommand(const CSMWorld::LandHeightsColumn::DataType& newLandGrid, CSMDoc::Document& document,
+            CSMWorld::IdTable& landTable, const std::string& cellId);
 
-            /// Push terrain shape edits to command macro
-            void pushEditToCommand (const CSMWorld::LandHeightsColumn::DataType& newLandGrid, CSMDoc::Document& document,
-                CSMWorld::IdTable& landTable, const std::string& cellId);
+        /// Push land normals edits to command macro
+        void pushNormalsEditToCommand(const CSMWorld::LandNormalsColumn::DataType& newLandGrid,
+            CSMDoc::Document& document, CSMWorld::IdTable& landTable, const std::string& cellId);
 
-            /// Push land normals edits to command macro
-            void pushNormalsEditToCommand(const CSMWorld::LandNormalsColumn::DataType& newLandGrid, CSMDoc::Document& document,
-                CSMWorld::IdTable& landTable, const std::string& cellId);
+        bool noCell(const std::string& cellId);
 
-            bool noCell(const std::string& cellId);
+        bool noLand(const std::string& cellId);
 
-            bool noLand(const std::string& cellId);
+        bool noLandLoaded(const std::string& cellId);
 
-            bool noLandLoaded(const std::string& cellId);
+        bool isLandLoaded(const std::string& cellId);
 
-            bool isLandLoaded(const std::string& cellId);
+        /// Create new blank height record and new normals, if there are valid adjancent cell, take sample points and
+        /// set the average height based on that
+        void createNewLandData(const CSMWorld::CellCoordinates& cellCoords);
 
-            /// Create new blank height record and new normals, if there are valid adjancent cell, take sample points and set the average height based on that
-            void createNewLandData(const CSMWorld::CellCoordinates& cellCoords);
+        /// Create new cell and land if needed, only user tools may ask for opening new cells (useTool == false is for
+        /// automated land changes)
+        bool allowLandShapeEditing(const std::string& textureFileName, bool useTool = true);
 
-            /// Create new cell and land if needed, only user tools may ask for opening new cells (useTool == false is for automated land changes)
-            bool allowLandShapeEditing(const std::string& textureFileName, bool useTool = true);
+        /// Bind the edging vertice to the values of the adjancent cells
+        void fixEdges(CSMWorld::CellCoordinates cellCoords);
 
-            /// Bind the edging vertice to the values of the adjancent cells
-            void fixEdges(CSMWorld::CellCoordinates cellCoords);
+        std::string mBrushTexture;
+        int mBrushSize = 1;
+        CSVWidget::BrushShape mBrushShape = CSVWidget::BrushShape_Point;
+        std::unique_ptr<BrushDraw> mBrushDraw;
+        std::vector<std::pair<int, int>> mCustomBrushShape;
+        CSVWidget::SceneToolShapeBrush* mShapeBrushScenetool = nullptr;
+        int mDragMode = InteractionType_None;
+        osg::Group* mParentNode;
+        bool mIsEditing = false;
+        std::shared_ptr<TerrainSelection> mTerrainShapeSelection;
+        int mTotalDiffY = 0;
+        std::vector<CSMWorld::CellCoordinates> mAlteredCells;
+        osg::Vec3d mEditingPos;
+        int mShapeEditTool = ShapeEditTool_Drag;
+        int mShapeEditToolStrength = 8;
+        int mTargetHeight = 0;
 
-            std::string mBrushTexture;
-            int mBrushSize = 1;
-            CSVWidget::BrushShape mBrushShape = CSVWidget::BrushShape_Point;
-            std::unique_ptr<BrushDraw> mBrushDraw;
-            std::vector<std::pair<int, int>> mCustomBrushShape;
-            CSVWidget::SceneToolShapeBrush *mShapeBrushScenetool = nullptr;
-            int mDragMode = InteractionType_None;
-            osg::Group* mParentNode;
-            bool mIsEditing = false;
-            std::shared_ptr<TerrainSelection> mTerrainShapeSelection;
-            int mTotalDiffY = 0;
-            std::vector<CSMWorld::CellCoordinates> mAlteredCells;
-            osg::Vec3d mEditingPos;
-            int mShapeEditTool = ShapeEditTool_Drag;
-            int mShapeEditToolStrength = 8;
-            int mTargetHeight = 0;
+        PagedWorldspaceWidget& getPagedWorldspaceWidget();
 
-            PagedWorldspaceWidget& getPagedWorldspaceWidget();
-
-        public slots:
-            void setBrushSize(int brushSize);
-            void setBrushShape(CSVWidget::BrushShape brushShape);
-            void setShapeEditTool(int shapeEditTool);
-            void setShapeEditToolStrength(int shapeEditToolStrength);
+    public slots:
+        void setBrushSize(int brushSize);
+        void setBrushShape(CSVWidget::BrushShape brushShape);
+        void setShapeEditTool(int shapeEditTool);
+        void setShapeEditToolStrength(int shapeEditToolStrength);
     };
 }
 
-
 #endif
diff --git a/apps/opencs/view/render/terrainstorage.cpp b/apps/opencs/view/render/terrainstorage.cpp
index a3f1a91b62..a4da6754d0 100644
--- a/apps/opencs/view/render/terrainstorage.cpp
+++ b/apps/opencs/view/render/terrainstorage.cpp
@@ -2,10 +2,9 @@
 
 #include <components/esm3terrain/storage.hpp>
 
-
 namespace CSVRender
 {
-    TerrainStorage::TerrainStorage(const CSMWorld::Data &data)
+    TerrainStorage::TerrainStorage(const CSMWorld::Data& data)
         : ESMTerrain::Storage(data.getResourceSystem()->getVFS())
         , mData(data)
     {
@@ -21,7 +20,8 @@ namespace CSVRender
             return nullptr;
 
         const ESM::Land& land = mData.getLand().getRecord(index).get();
-        return new ESMTerrain::LandObject(&land, ESM::Land::DATA_VHGT | ESM::Land::DATA_VNML | ESM::Land::DATA_VCLR | ESM::Land::DATA_VTEX);
+        return new ESMTerrain::LandObject(
+            &land, ESM::Land::DATA_VHGT | ESM::Land::DATA_VNML | ESM::Land::DATA_VCLR | ESM::Land::DATA_VTEX);
     }
 
     const ESM::LandTexture* TerrainStorage::getLandTexture(int index, short plugin)
@@ -35,7 +35,8 @@ namespace CSVRender
 
     void TerrainStorage::setAlteredHeight(int inCellX, int inCellY, float height)
     {
-        mAlteredHeight[inCellY*ESM::Land::LAND_SIZE + inCellX] = height - fmod(height, 8); //Limit to divisible by 8 to avoid cell seam breakage
+        mAlteredHeight[inCellY * ESM::Land::LAND_SIZE + inCellX]
+            = height - fmod(height, 8); // Limit to divisible by 8 to avoid cell seam breakage
     }
 
     void TerrainStorage::resetHeights()
@@ -52,89 +53,92 @@ namespace CSVRender
             return height;
 
         const ESM::Land::LandData* landData = mData.getLand().getRecord(index).get().getLandData(ESM::Land::DATA_VHGT);
-        height = landData->mHeights[inCellY*ESM::Land::LAND_SIZE + inCellX];
-        return mAlteredHeight[inCellY*ESM::Land::LAND_SIZE + inCellX] + height;
+        height = landData->mHeights[inCellY * ESM::Land::LAND_SIZE + inCellX];
+        return mAlteredHeight[inCellY * ESM::Land::LAND_SIZE + inCellX] + height;
     }
 
     float* TerrainStorage::getAlteredHeight(int inCellX, int inCellY)
     {
-        return &mAlteredHeight[inCellY*ESM::Land::LAND_SIZE + inCellX];
+        return &mAlteredHeight[inCellY * ESM::Land::LAND_SIZE + inCellX];
     }
 
-    void TerrainStorage::getBounds(float &minX, float &maxX, float &minY, float &maxY)
+    void TerrainStorage::getBounds(float& minX, float& maxX, float& minY, float& maxY)
     {
         // not needed at the moment - this returns the bounds of the whole world, but we only edit individual cells
         throw std::runtime_error("getBounds not implemented");
     }
 
-    int TerrainStorage::getThisHeight(int col, int row, const ESM::Land::LandData *heightData) const
+    int TerrainStorage::getThisHeight(int col, int row, const ESM::Land::LandData* heightData) const
     {
-        return heightData->mHeights[col*ESM::Land::LAND_SIZE + row] +
-            mAlteredHeight[static_cast<unsigned int>(col*ESM::Land::LAND_SIZE + row)];
+        return heightData->mHeights[col * ESM::Land::LAND_SIZE + row]
+            + mAlteredHeight[static_cast<unsigned int>(col * ESM::Land::LAND_SIZE + row)];
     }
 
-    int TerrainStorage::getLeftHeight(int col, int row, const ESM::Land::LandData *heightData) const
+    int TerrainStorage::getLeftHeight(int col, int row, const ESM::Land::LandData* heightData) const
     {
-        return heightData->mHeights[(col)*ESM::Land::LAND_SIZE + row - 1] +
-            mAlteredHeight[static_cast<unsigned int>((col)*ESM::Land::LAND_SIZE + row - 1)];
+        return heightData->mHeights[(col)*ESM::Land::LAND_SIZE + row - 1]
+            + mAlteredHeight[static_cast<unsigned int>((col)*ESM::Land::LAND_SIZE + row - 1)];
     }
 
-    int TerrainStorage::getRightHeight(int col, int row, const ESM::Land::LandData *heightData) const
+    int TerrainStorage::getRightHeight(int col, int row, const ESM::Land::LandData* heightData) const
     {
-        return heightData->mHeights[col*ESM::Land::LAND_SIZE + row + 1] +
-            mAlteredHeight[static_cast<unsigned int>(col*ESM::Land::LAND_SIZE + row + 1)];
+        return heightData->mHeights[col * ESM::Land::LAND_SIZE + row + 1]
+            + mAlteredHeight[static_cast<unsigned int>(col * ESM::Land::LAND_SIZE + row + 1)];
     }
 
-    int TerrainStorage::getUpHeight(int col, int row, const ESM::Land::LandData *heightData) const
+    int TerrainStorage::getUpHeight(int col, int row, const ESM::Land::LandData* heightData) const
     {
-        return heightData->mHeights[(col - 1)*ESM::Land::LAND_SIZE + row] +
-            mAlteredHeight[static_cast<unsigned int>((col - 1)*ESM::Land::LAND_SIZE + row)];
+        return heightData->mHeights[(col - 1) * ESM::Land::LAND_SIZE + row]
+            + mAlteredHeight[static_cast<unsigned int>((col - 1) * ESM::Land::LAND_SIZE + row)];
     }
 
-    int TerrainStorage::getDownHeight(int col, int row, const ESM::Land::LandData *heightData) const
+    int TerrainStorage::getDownHeight(int col, int row, const ESM::Land::LandData* heightData) const
     {
-        return heightData->mHeights[(col + 1)*ESM::Land::LAND_SIZE + row] +
-            mAlteredHeight[static_cast<unsigned int>((col + 1)*ESM::Land::LAND_SIZE + row)];
+        return heightData->mHeights[(col + 1) * ESM::Land::LAND_SIZE + row]
+            + mAlteredHeight[static_cast<unsigned int>((col + 1) * ESM::Land::LAND_SIZE + row)];
     }
 
-    int TerrainStorage::getHeightDifferenceToLeft(int col, int row, const ESM::Land::LandData *heightData) const
+    int TerrainStorage::getHeightDifferenceToLeft(int col, int row, const ESM::Land::LandData* heightData) const
     {
         return abs(getThisHeight(col, row, heightData) - getLeftHeight(col, row, heightData));
     }
 
-    int TerrainStorage::getHeightDifferenceToRight(int col, int row, const ESM::Land::LandData *heightData) const
+    int TerrainStorage::getHeightDifferenceToRight(int col, int row, const ESM::Land::LandData* heightData) const
     {
         return abs(getThisHeight(col, row, heightData) - getRightHeight(col, row, heightData));
     }
 
-    int TerrainStorage::getHeightDifferenceToUp(int col, int row, const ESM::Land::LandData *heightData) const
+    int TerrainStorage::getHeightDifferenceToUp(int col, int row, const ESM::Land::LandData* heightData) const
     {
         return abs(getThisHeight(col, row, heightData) - getUpHeight(col, row, heightData));
     }
 
-    int TerrainStorage::getHeightDifferenceToDown(int col, int row, const ESM::Land::LandData *heightData) const
+    int TerrainStorage::getHeightDifferenceToDown(int col, int row, const ESM::Land::LandData* heightData) const
     {
         return abs(getThisHeight(col, row, heightData) - getDownHeight(col, row, heightData));
     }
 
-    bool TerrainStorage::leftOrUpIsOverTheLimit(int col, int row, int heightWarningLimit, const ESM::Land::LandData *heightData) const
+    bool TerrainStorage::leftOrUpIsOverTheLimit(
+        int col, int row, int heightWarningLimit, const ESM::Land::LandData* heightData) const
     {
-        return getHeightDifferenceToLeft(col, row, heightData) >= heightWarningLimit ||
-            getHeightDifferenceToUp(col, row, heightData) >= heightWarningLimit;
+        return getHeightDifferenceToLeft(col, row, heightData) >= heightWarningLimit
+            || getHeightDifferenceToUp(col, row, heightData) >= heightWarningLimit;
     }
 
-    bool TerrainStorage::rightOrDownIsOverTheLimit(int col, int row, int heightWarningLimit, const ESM::Land::LandData *heightData) const
+    bool TerrainStorage::rightOrDownIsOverTheLimit(
+        int col, int row, int heightWarningLimit, const ESM::Land::LandData* heightData) const
     {
-        return getHeightDifferenceToRight(col, row, heightData) >= heightWarningLimit ||
-            getHeightDifferenceToDown(col, row, heightData) >= heightWarningLimit;
+        return getHeightDifferenceToRight(col, row, heightData) >= heightWarningLimit
+            || getHeightDifferenceToDown(col, row, heightData) >= heightWarningLimit;
     }
 
-    void TerrainStorage::adjustColor(int col, int row, const ESM::Land::LandData *heightData, osg::Vec4ub& color) const
+    void TerrainStorage::adjustColor(int col, int row, const ESM::Land::LandData* heightData, osg::Vec4ub& color) const
     {
         // Highlight broken height changes
         int heightWarningLimit = 1024;
-        if (((col > 0 && row > 0) && leftOrUpIsOverTheLimit(col, row, heightWarningLimit, heightData)) ||
-            ((col < ESM::Land::LAND_SIZE - 1 && row < ESM::Land::LAND_SIZE - 1) && rightOrDownIsOverTheLimit(col, row, heightWarningLimit, heightData)))
+        if (((col > 0 && row > 0) && leftOrUpIsOverTheLimit(col, row, heightWarningLimit, heightData))
+            || ((col < ESM::Land::LAND_SIZE - 1 && row < ESM::Land::LAND_SIZE - 1)
+                && rightOrDownIsOverTheLimit(col, row, heightWarningLimit, heightData)))
         {
             color.r() = 255;
             color.g() = 0;
@@ -144,6 +148,6 @@ namespace CSVRender
 
     float TerrainStorage::getAlteredHeight(int col, int row) const
     {
-        return mAlteredHeight[static_cast<unsigned int>(col*ESM::Land::LAND_SIZE + row)];
+        return mAlteredHeight[static_cast<unsigned int>(col * ESM::Land::LAND_SIZE + row)];
     }
 }
diff --git a/apps/opencs/view/render/terrainstorage.hpp b/apps/opencs/view/render/terrainstorage.hpp
index dbb39a44ad..64c026b76d 100644
--- a/apps/opencs/view/render/terrainstorage.hpp
+++ b/apps/opencs/view/render/terrainstorage.hpp
@@ -27,24 +27,26 @@ namespace CSVRender
         const CSMWorld::Data& mData;
         std::array<float, ESM::Land::LAND_SIZE * ESM::Land::LAND_SIZE> mAlteredHeight;
 
-        osg::ref_ptr<const ESMTerrain::LandObject> getLand (int cellX, int cellY) override;
+        osg::ref_ptr<const ESMTerrain::LandObject> getLand(int cellX, int cellY) override;
         const ESM::LandTexture* getLandTexture(int index, short plugin) override;
 
         void getBounds(float& minX, float& maxX, float& minY, float& maxY) override;
 
-        int getThisHeight(int col, int row, const ESM::Land::LandData *heightData) const;
-        int getLeftHeight(int col, int row, const ESM::Land::LandData *heightData) const;
-        int getRightHeight(int col, int row, const ESM::Land::LandData *heightData) const;
-        int getUpHeight(int col, int row, const ESM::Land::LandData *heightData) const;
-        int getDownHeight(int col, int row, const ESM::Land::LandData *heightData) const;
-        int getHeightDifferenceToLeft(int col, int row, const ESM::Land::LandData *heightData) const;
-        int getHeightDifferenceToRight(int col, int row, const ESM::Land::LandData *heightData) const;
-        int getHeightDifferenceToUp(int col, int row, const ESM::Land::LandData *heightData) const;
-        int getHeightDifferenceToDown(int col, int row, const ESM::Land::LandData *heightData) const;
-        bool leftOrUpIsOverTheLimit(int col, int row, int heightWarningLimit, const ESM::Land::LandData *heightData) const;
-        bool rightOrDownIsOverTheLimit(int col, int row, int heightWarningLimit, const ESM::Land::LandData *heightData) const;
-
-        void adjustColor(int col, int row, const ESM::Land::LandData *heightData, osg::Vec4ub& color) const override;
+        int getThisHeight(int col, int row, const ESM::Land::LandData* heightData) const;
+        int getLeftHeight(int col, int row, const ESM::Land::LandData* heightData) const;
+        int getRightHeight(int col, int row, const ESM::Land::LandData* heightData) const;
+        int getUpHeight(int col, int row, const ESM::Land::LandData* heightData) const;
+        int getDownHeight(int col, int row, const ESM::Land::LandData* heightData) const;
+        int getHeightDifferenceToLeft(int col, int row, const ESM::Land::LandData* heightData) const;
+        int getHeightDifferenceToRight(int col, int row, const ESM::Land::LandData* heightData) const;
+        int getHeightDifferenceToUp(int col, int row, const ESM::Land::LandData* heightData) const;
+        int getHeightDifferenceToDown(int col, int row, const ESM::Land::LandData* heightData) const;
+        bool leftOrUpIsOverTheLimit(
+            int col, int row, int heightWarningLimit, const ESM::Land::LandData* heightData) const;
+        bool rightOrDownIsOverTheLimit(
+            int col, int row, int heightWarningLimit, const ESM::Land::LandData* heightData) const;
+
+        void adjustColor(int col, int row, const ESM::Land::LandData* heightData, osg::Vec4ub& color) const override;
         float getAlteredHeight(int col, int row) const override;
     };
 
diff --git a/apps/opencs/view/render/terraintexturemode.cpp b/apps/opencs/view/render/terraintexturemode.cpp
index 2494e4378c..9a7b76f110 100644
--- a/apps/opencs/view/render/terraintexturemode.cpp
+++ b/apps/opencs/view/render/terraintexturemode.cpp
@@ -2,9 +2,9 @@
 
 #include <string>
 
-#include <QWidget>
-#include <QIcon>
 #include <QDropEvent>
+#include <QIcon>
+#include <QWidget>
 
 #include <osg/Group>
 
@@ -25,57 +25,70 @@
 
 #include "brushdraw.hpp"
 #include "editmode.hpp"
-#include "pagedworldspacewidget.hpp"
 #include "mask.hpp"
 #include "object.hpp" // Something small needed regarding pointers from here ()
+#include "pagedworldspacewidget.hpp"
 #include "worldspacewidget.hpp"
 
-CSVRender::TerrainTextureMode::TerrainTextureMode (WorldspaceWidget *worldspaceWidget, osg::Group* parentNode, QWidget *parent)
-: EditMode (worldspaceWidget, QIcon {":scenetoolbar/editing-terrain-texture"}, Mask_Terrain | Mask_Reference, "Terrain texture editing", parent),
-    mBrushTexture("L0#0"),
-    mBrushSize(1),
-    mBrushShape(CSVWidget::BrushShape_Point),
-    mTextureBrushScenetool(nullptr),
-    mDragMode(InteractionType_None),
-    mParentNode(parentNode),
-    mIsEditing(false)
+CSVRender::TerrainTextureMode::TerrainTextureMode(
+    WorldspaceWidget* worldspaceWidget, osg::Group* parentNode, QWidget* parent)
+    : EditMode(worldspaceWidget, QIcon{ ":scenetoolbar/editing-terrain-texture" }, Mask_Terrain | Mask_Reference,
+        "Terrain texture editing", parent)
+    , mBrushTexture("L0#0")
+    , mBrushSize(1)
+    , mBrushShape(CSVWidget::BrushShape_Point)
+    , mTextureBrushScenetool(nullptr)
+    , mDragMode(InteractionType_None)
+    , mParentNode(parentNode)
+    , mIsEditing(false)
 {
 }
 
 void CSVRender::TerrainTextureMode::activate(CSVWidget::SceneToolbar* toolbar)
 {
-    if(!mTextureBrushScenetool)
+    if (!mTextureBrushScenetool)
     {
-        mTextureBrushScenetool = new CSVWidget::SceneToolTextureBrush (toolbar, "scenetooltexturebrush", getWorldspaceWidget().getDocument());
-        connect(mTextureBrushScenetool, &CSVWidget::SceneTool::clicked, mTextureBrushScenetool, &CSVWidget::SceneToolTextureBrush::activate);
-        connect(mTextureBrushScenetool->mTextureBrushWindow, &CSVWidget::TextureBrushWindow::passBrushSize, this, &TerrainTextureMode::setBrushSize);
-        connect(mTextureBrushScenetool->mTextureBrushWindow, &CSVWidget::TextureBrushWindow::passBrushShape, this, &TerrainTextureMode::setBrushShape);
-        connect(mTextureBrushScenetool->mTextureBrushWindow->mSizeSliders->mBrushSizeSlider, &QSlider::valueChanged, this, &TerrainTextureMode::setBrushSize);
-        connect(mTextureBrushScenetool, &CSVWidget::SceneToolTextureBrush::passTextureId, this, &TerrainTextureMode::setBrushTexture);
-        connect(mTextureBrushScenetool->mTextureBrushWindow, &CSVWidget::TextureBrushWindow::passTextureId, this, &TerrainTextureMode::setBrushTexture);
-
-        connect(mTextureBrushScenetool, qOverload<QDropEvent *>(&CSVWidget::SceneToolTextureBrush::passEvent), this, &TerrainTextureMode::handleDropEvent);
-        connect(this, &TerrainTextureMode::passBrushTexture, mTextureBrushScenetool->mTextureBrushWindow, &CSVWidget::TextureBrushWindow::setBrushTexture);
-        connect(this, &TerrainTextureMode::passBrushTexture, mTextureBrushScenetool, &CSVWidget::SceneToolTextureBrush::updateBrushHistory);
+        mTextureBrushScenetool = new CSVWidget::SceneToolTextureBrush(
+            toolbar, "scenetooltexturebrush", getWorldspaceWidget().getDocument());
+        connect(mTextureBrushScenetool, &CSVWidget::SceneTool::clicked, mTextureBrushScenetool,
+            &CSVWidget::SceneToolTextureBrush::activate);
+        connect(mTextureBrushScenetool->mTextureBrushWindow, &CSVWidget::TextureBrushWindow::passBrushSize, this,
+            &TerrainTextureMode::setBrushSize);
+        connect(mTextureBrushScenetool->mTextureBrushWindow, &CSVWidget::TextureBrushWindow::passBrushShape, this,
+            &TerrainTextureMode::setBrushShape);
+        connect(mTextureBrushScenetool->mTextureBrushWindow->mSizeSliders->mBrushSizeSlider, &QSlider::valueChanged,
+            this, &TerrainTextureMode::setBrushSize);
+        connect(mTextureBrushScenetool, &CSVWidget::SceneToolTextureBrush::passTextureId, this,
+            &TerrainTextureMode::setBrushTexture);
+        connect(mTextureBrushScenetool->mTextureBrushWindow, &CSVWidget::TextureBrushWindow::passTextureId, this,
+            &TerrainTextureMode::setBrushTexture);
+
+        connect(mTextureBrushScenetool, qOverload<QDropEvent*>(&CSVWidget::SceneToolTextureBrush::passEvent), this,
+            &TerrainTextureMode::handleDropEvent);
+        connect(this, &TerrainTextureMode::passBrushTexture, mTextureBrushScenetool->mTextureBrushWindow,
+            &CSVWidget::TextureBrushWindow::setBrushTexture);
+        connect(this, &TerrainTextureMode::passBrushTexture, mTextureBrushScenetool,
+            &CSVWidget::SceneToolTextureBrush::updateBrushHistory);
     }
 
     if (!mTerrainTextureSelection)
     {
-        mTerrainTextureSelection = std::make_shared<TerrainSelection>(mParentNode, &getWorldspaceWidget(), TerrainSelectionType::Texture);
+        mTerrainTextureSelection
+            = std::make_shared<TerrainSelection>(mParentNode, &getWorldspaceWidget(), TerrainSelectionType::Texture);
     }
 
     if (!mBrushDraw)
         mBrushDraw = std::make_unique<BrushDraw>(mParentNode, true);
 
     EditMode::activate(toolbar);
-    toolbar->addTool (mTextureBrushScenetool);
+    toolbar->addTool(mTextureBrushScenetool);
 }
 
 void CSVRender::TerrainTextureMode::deactivate(CSVWidget::SceneToolbar* toolbar)
 {
-    if(mTextureBrushScenetool)
+    if (mTextureBrushScenetool)
     {
-        toolbar->removeTool (mTextureBrushScenetool);
+        toolbar->removeTool(mTextureBrushScenetool);
         delete mTextureBrushScenetool;
         mTextureBrushScenetool = nullptr;
     }
@@ -98,12 +111,12 @@ void CSVRender::TerrainTextureMode::primaryOpenPressed(const WorldspaceHitResult
 void CSVRender::TerrainTextureMode::primaryEditPressed(const WorldspaceHitResult& hit) // Apply changes here
 {
     CSMDoc::Document& document = getWorldspaceWidget().getDocument();
-    CSMWorld::IdTable& landTable = dynamic_cast<CSMWorld::IdTable&> (
-        *document.getData().getTableModel (CSMWorld::UniversalId::Type_Land));
-    CSMWorld::IdTable& ltexTable = dynamic_cast<CSMWorld::IdTable&> (
-        *document.getData().getTableModel (CSMWorld::UniversalId::Type_LandTextures));
+    CSMWorld::IdTable& landTable
+        = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_Land));
+    CSMWorld::IdTable& ltexTable
+        = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_LandTextures));
 
-    mCellId = getWorldspaceWidget().getCellId (hit.worldPos);
+    mCellId = getWorldspaceWidget().getCellId(hit.worldPos);
 
     QUndoStack& undoStack = document.getUndoStack();
     CSMWorld::IdCollection<CSMWorld::LandTexture>& landtexturesCollection = document.getData().getLandTextures();
@@ -111,10 +124,10 @@ void CSVRender::TerrainTextureMode::primaryEditPressed(const WorldspaceHitResult
 
     if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted() && hit.hit && hit.tag == nullptr)
     {
-        undoStack.beginMacro ("Edit texture records");
-        if(allowLandTextureEditing(mCellId))
+        undoStack.beginMacro("Edit texture records");
+        if (allowLandTextureEditing(mCellId))
         {
-            undoStack.push (new CSMWorld::TouchLandCommand(landTable, ltexTable, mCellId));
+            undoStack.push(new CSMWorld::TouchLandCommand(landTable, ltexTable, mCellId));
             editTerrainTextureGrid(hit);
         }
         undoStack.endMacro();
@@ -123,7 +136,7 @@ void CSVRender::TerrainTextureMode::primaryEditPressed(const WorldspaceHitResult
 
 void CSVRender::TerrainTextureMode::primarySelectPressed(const WorldspaceHitResult& hit)
 {
-    if(hit.hit && hit.tag == nullptr)
+    if (hit.hit && hit.tag == nullptr)
     {
         selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 0);
         mTerrainTextureSelection->clearTemporarySelection();
@@ -132,24 +145,24 @@ void CSVRender::TerrainTextureMode::primarySelectPressed(const WorldspaceHitResu
 
 void CSVRender::TerrainTextureMode::secondarySelectPressed(const WorldspaceHitResult& hit)
 {
-    if(hit.hit && hit.tag == nullptr)
+    if (hit.hit && hit.tag == nullptr)
     {
         selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 1);
         mTerrainTextureSelection->clearTemporarySelection();
     }
 }
 
-bool CSVRender::TerrainTextureMode::primaryEditStartDrag (const QPoint& pos)
+bool CSVRender::TerrainTextureMode::primaryEditStartDrag(const QPoint& pos)
 {
-    WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
+    WorldspaceHitResult hit = getWorldspaceWidget().mousePick(pos, getWorldspaceWidget().getInteractionMask());
 
     CSMDoc::Document& document = getWorldspaceWidget().getDocument();
-    CSMWorld::IdTable& landTable = dynamic_cast<CSMWorld::IdTable&> (
-        *document.getData().getTableModel (CSMWorld::UniversalId::Type_Land));
-    CSMWorld::IdTable& ltexTable = dynamic_cast<CSMWorld::IdTable&> (
-        *document.getData().getTableModel (CSMWorld::UniversalId::Type_LandTextures));
+    CSMWorld::IdTable& landTable
+        = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_Land));
+    CSMWorld::IdTable& ltexTable
+        = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_LandTextures));
 
-    mCellId = getWorldspaceWidget().getCellId (hit.worldPos);
+    mCellId = getWorldspaceWidget().getCellId(hit.worldPos);
 
     QUndoStack& undoStack = document.getUndoStack();
 
@@ -160,11 +173,11 @@ bool CSVRender::TerrainTextureMode::primaryEditStartDrag (const QPoint& pos)
 
     if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted() && hit.hit && hit.tag == nullptr)
     {
-        undoStack.beginMacro ("Edit texture records");
+        undoStack.beginMacro("Edit texture records");
         mIsEditing = true;
-        if(allowLandTextureEditing(mCellId))
+        if (allowLandTextureEditing(mCellId))
         {
-            undoStack.push (new CSMWorld::TouchLandCommand(landTable, ltexTable, mCellId));
+            undoStack.push(new CSMWorld::TouchLandCommand(landTable, ltexTable, mCellId));
             editTerrainTextureGrid(hit);
         }
     }
@@ -172,14 +185,14 @@ bool CSVRender::TerrainTextureMode::primaryEditStartDrag (const QPoint& pos)
     return true;
 }
 
-bool CSVRender::TerrainTextureMode::secondaryEditStartDrag (const QPoint& pos)
+bool CSVRender::TerrainTextureMode::secondaryEditStartDrag(const QPoint& pos)
 {
     return false;
 }
 
-bool CSVRender::TerrainTextureMode::primarySelectStartDrag (const QPoint& pos)
+bool CSVRender::TerrainTextureMode::primarySelectStartDrag(const QPoint& pos)
 {
-    WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
+    WorldspaceHitResult hit = getWorldspaceWidget().mousePick(pos, getWorldspaceWidget().getInteractionMask());
     mDragMode = InteractionType_PrimarySelect;
     if (!hit.hit || hit.tag != nullptr)
     {
@@ -190,9 +203,9 @@ bool CSVRender::TerrainTextureMode::primarySelectStartDrag (const QPoint& pos)
     return true;
 }
 
-bool CSVRender::TerrainTextureMode::secondarySelectStartDrag (const QPoint& pos)
+bool CSVRender::TerrainTextureMode::secondarySelectStartDrag(const QPoint& pos)
 {
-    WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
+    WorldspaceHitResult hit = getWorldspaceWidget().mousePick(pos, getWorldspaceWidget().getInteractionMask());
     mDragMode = InteractionType_SecondarySelect;
     if (!hit.hit || hit.tag != nullptr)
     {
@@ -203,12 +216,12 @@ bool CSVRender::TerrainTextureMode::secondarySelectStartDrag (const QPoint& pos)
     return true;
 }
 
-void CSVRender::TerrainTextureMode::drag (const QPoint& pos, int diffX, int diffY, double speedFactor)
+void CSVRender::TerrainTextureMode::drag(const QPoint& pos, int diffX, int diffY, double speedFactor)
 {
     if (mDragMode == InteractionType_PrimaryEdit)
     {
-        WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
-        std::string cellId = getWorldspaceWidget().getCellId (hit.worldPos);
+        WorldspaceHitResult hit = getWorldspaceWidget().mousePick(pos, getWorldspaceWidget().getInteractionMask());
+        std::string cellId = getWorldspaceWidget().getCellId(hit.worldPos);
         CSMDoc::Document& document = getWorldspaceWidget().getDocument();
 
         CSMWorld::IdCollection<CSMWorld::LandTexture>& landtexturesCollection = document.getData().getLandTextures();
@@ -222,14 +235,16 @@ void CSVRender::TerrainTextureMode::drag (const QPoint& pos, int diffX, int diff
 
     if (mDragMode == InteractionType_PrimarySelect)
     {
-        WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
-        if (hit.hit && hit.tag == nullptr) selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 0);
+        WorldspaceHitResult hit = getWorldspaceWidget().mousePick(pos, getWorldspaceWidget().getInteractionMask());
+        if (hit.hit && hit.tag == nullptr)
+            selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 0);
     }
 
     if (mDragMode == InteractionType_SecondarySelect)
     {
-        WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
-        if (hit.hit && hit.tag == nullptr) selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 1);
+        WorldspaceHitResult hit = getWorldspaceWidget().mousePick(pos, getWorldspaceWidget().getInteractionMask());
+        if (hit.hit && hit.tag == nullptr)
+            selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 1);
     }
 }
 
@@ -245,69 +260,67 @@ void CSVRender::TerrainTextureMode::dragCompleted(const QPoint& pos)
 
         if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted())
         {
-             undoStack.endMacro();
-             mIsEditing = false;
+            undoStack.endMacro();
+            mIsEditing = false;
         }
     }
 
     mTerrainTextureSelection->clearTemporarySelection();
 }
 
-void CSVRender::TerrainTextureMode::dragAborted()
-{
-}
+void CSVRender::TerrainTextureMode::dragAborted() {}
 
-void CSVRender::TerrainTextureMode::dragWheel (int diff, double speedFactor)
-{
-}
+void CSVRender::TerrainTextureMode::dragWheel(int diff, double speedFactor) {}
 
-void CSVRender::TerrainTextureMode::handleDropEvent (QDropEvent *event)
+void CSVRender::TerrainTextureMode::handleDropEvent(QDropEvent* event)
 {
-  const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*> (event->mimeData());
-
-  if (!mime) // May happen when non-records (e.g. plain text) are dragged and dropped
-      return;
-
-  if (mime->holdsType (CSMWorld::UniversalId::Type_LandTexture))
-  {
-      const std::vector<CSMWorld::UniversalId> ids = mime->getData();
-
-      for (const CSMWorld::UniversalId& uid : ids)
-      {
-          mBrushTexture = uid.getId();
-          emit passBrushTexture(mBrushTexture);
-      }
-  }
-  if (mime->holdsType (CSMWorld::UniversalId::Type_Texture))
-  {
-      const std::vector<CSMWorld::UniversalId> ids = mime->getData();
-
-      for (const CSMWorld::UniversalId& uid : ids)
-      {
-          std::string textureFileName = uid.toString();
-          createTexture(textureFileName);
-          emit passBrushTexture(mBrushTexture);
-      }
-  }
+    const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*>(event->mimeData());
+
+    if (!mime) // May happen when non-records (e.g. plain text) are dragged and dropped
+        return;
+
+    if (mime->holdsType(CSMWorld::UniversalId::Type_LandTexture))
+    {
+        const std::vector<CSMWorld::UniversalId> ids = mime->getData();
+
+        for (const CSMWorld::UniversalId& uid : ids)
+        {
+            mBrushTexture = uid.getId();
+            emit passBrushTexture(mBrushTexture);
+        }
+    }
+    if (mime->holdsType(CSMWorld::UniversalId::Type_Texture))
+    {
+        const std::vector<CSMWorld::UniversalId> ids = mime->getData();
+
+        for (const CSMWorld::UniversalId& uid : ids)
+        {
+            std::string textureFileName = uid.toString();
+            createTexture(textureFileName);
+            emit passBrushTexture(mBrushTexture);
+        }
+    }
 }
 
 void CSVRender::TerrainTextureMode::editTerrainTextureGrid(const WorldspaceHitResult& hit)
 {
     CSMDoc::Document& document = getWorldspaceWidget().getDocument();
-    CSMWorld::IdTable& landTable = dynamic_cast<CSMWorld::IdTable&> (
-        *document.getData().getTableModel (CSMWorld::UniversalId::Type_Land));
+    CSMWorld::IdTable& landTable
+        = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_Land));
 
-    mCellId = getWorldspaceWidget().getCellId (hit.worldPos);
-    if(allowLandTextureEditing(mCellId)) {}
+    mCellId = getWorldspaceWidget().getCellId(hit.worldPos);
+    if (allowLandTextureEditing(mCellId))
+    {
+    }
 
-    std::pair<CSMWorld::CellCoordinates, bool> cellCoordinates_pair = CSMWorld::CellCoordinates::fromId (mCellId);
+    std::pair<CSMWorld::CellCoordinates, bool> cellCoordinates_pair = CSMWorld::CellCoordinates::fromId(mCellId);
 
     int cellX = cellCoordinates_pair.first.getX();
     int cellY = cellCoordinates_pair.first.getY();
 
     // The coordinates of hit in mCellId
-    int xHitInCell (float(((hit.worldPos.x() - (cellX* cellSize)) * landTextureSize / cellSize) - 0.25));
-    int yHitInCell (float(((hit.worldPos.y() - (cellY* cellSize)) * landTextureSize / cellSize) + 0.25));
+    int xHitInCell(float(((hit.worldPos.x() - (cellX * cellSize)) * landTextureSize / cellSize) - 0.25));
+    int yHitInCell(float(((hit.worldPos.y() - (cellY * cellSize)) * landTextureSize / cellSize) + 0.25));
     if (xHitInCell < 0)
     {
         xHitInCell = xHitInCell + landTextureSize;
@@ -320,71 +333,89 @@ void CSVRender::TerrainTextureMode::editTerrainTextureGrid(const WorldspaceHitRe
     }
 
     mCellId = CSMWorld::CellCoordinates::generateId(cellX, cellY);
-    if(allowLandTextureEditing(mCellId)) {}
+    if (allowLandTextureEditing(mCellId))
+    {
+    }
 
     std::string iteratedCellId;
 
     int textureColumn = landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandTexturesIndex);
 
     std::size_t hashlocation = mBrushTexture.find('#');
-    std::string mBrushTextureInt = mBrushTexture.substr (hashlocation+1);
-    int brushInt = stoi(mBrushTexture.substr (hashlocation+1))+1; // All indices are offset by +1
+    std::string mBrushTextureInt = mBrushTexture.substr(hashlocation + 1);
+    int brushInt = stoi(mBrushTexture.substr(hashlocation + 1)) + 1; // All indices are offset by +1
 
     int r = static_cast<float>(mBrushSize) / 2;
 
     if (mBrushShape == CSVWidget::BrushShape_Point)
     {
-        CSMWorld::LandTexturesColumn::DataType newTerrainPointer = landTable.data(landTable.getModelIndex(mCellId, textureColumn)).value<CSMWorld::LandTexturesColumn::DataType>();
+        CSMWorld::LandTexturesColumn::DataType newTerrainPointer
+            = landTable.data(landTable.getModelIndex(mCellId, textureColumn))
+                  .value<CSMWorld::LandTexturesColumn::DataType>();
         CSMWorld::LandTexturesColumn::DataType newTerrain(newTerrainPointer);
 
-        if(allowLandTextureEditing(mCellId))
+        if (allowLandTextureEditing(mCellId))
         {
-            newTerrain[yHitInCell*landTextureSize+xHitInCell] = brushInt;
+            newTerrain[yHitInCell * landTextureSize + xHitInCell] = brushInt;
             pushEditToCommand(newTerrain, document, landTable, mCellId);
         }
     }
 
     if (mBrushShape == CSVWidget::BrushShape_Square)
     {
-        int upperLeftCellX  = cellX - std::floor(r / landTextureSize);
-        int upperLeftCellY  = cellY - std::floor(r / landTextureSize);
-        if (xHitInCell - (r % landTextureSize) < 0) upperLeftCellX--;
-        if (yHitInCell - (r % landTextureSize) < 0) upperLeftCellY--;
+        int upperLeftCellX = cellX - std::floor(r / landTextureSize);
+        int upperLeftCellY = cellY - std::floor(r / landTextureSize);
+        if (xHitInCell - (r % landTextureSize) < 0)
+            upperLeftCellX--;
+        if (yHitInCell - (r % landTextureSize) < 0)
+            upperLeftCellY--;
 
         int lowerrightCellX = cellX + std::floor(r / landTextureSize);
         int lowerrightCellY = cellY + std::floor(r / landTextureSize);
-        if (xHitInCell + (r % landTextureSize) > landTextureSize - 1) lowerrightCellX++;
-        if (yHitInCell + (r % landTextureSize) > landTextureSize - 1) lowerrightCellY++;
+        if (xHitInCell + (r % landTextureSize) > landTextureSize - 1)
+            lowerrightCellX++;
+        if (yHitInCell + (r % landTextureSize) > landTextureSize - 1)
+            lowerrightCellY++;
 
-        for(int i_cell = upperLeftCellX; i_cell <= lowerrightCellX; i_cell++)
+        for (int i_cell = upperLeftCellX; i_cell <= lowerrightCellX; i_cell++)
         {
-            for(int j_cell = upperLeftCellY; j_cell <= lowerrightCellY; j_cell++)
+            for (int j_cell = upperLeftCellY; j_cell <= lowerrightCellY; j_cell++)
             {
                 iteratedCellId = CSMWorld::CellCoordinates::generateId(i_cell, j_cell);
-                if(allowLandTextureEditing(iteratedCellId))
+                if (allowLandTextureEditing(iteratedCellId))
                 {
-                    CSMWorld::LandTexturesColumn::DataType newTerrainPointer = landTable.data(landTable.getModelIndex(iteratedCellId, textureColumn)).value<CSMWorld::LandTexturesColumn::DataType>();
+                    CSMWorld::LandTexturesColumn::DataType newTerrainPointer
+                        = landTable.data(landTable.getModelIndex(iteratedCellId, textureColumn))
+                              .value<CSMWorld::LandTexturesColumn::DataType>();
                     CSMWorld::LandTexturesColumn::DataType newTerrain(newTerrainPointer);
-                    for(int i = 0; i < landTextureSize; i++)
+                    for (int i = 0; i < landTextureSize; i++)
                     {
-                        for(int j = 0; j < landTextureSize; j++)
+                        for (int j = 0; j < landTextureSize; j++)
                         {
 
-                            if (i_cell == cellX && j_cell == cellY && abs(i-xHitInCell) < r && abs(j-yHitInCell) < r)
+                            if (i_cell == cellX && j_cell == cellY && abs(i - xHitInCell) < r
+                                && abs(j - yHitInCell) < r)
                             {
-                                newTerrain[j*landTextureSize+i] = brushInt;
+                                newTerrain[j * landTextureSize + i] = brushInt;
                             }
                             else
                             {
                                 int distanceX(0);
                                 int distanceY(0);
-                                if (i_cell < cellX) distanceX = xHitInCell + landTextureSize * abs(i_cell-cellX) - i;
-                                if (j_cell < cellY) distanceY = yHitInCell + landTextureSize * abs(j_cell-cellY) - j;
-                                if (i_cell > cellX) distanceX = -xHitInCell + landTextureSize * abs(i_cell-cellX) + i;
-                                if (j_cell > cellY) distanceY = -yHitInCell + landTextureSize * abs(j_cell-cellY) + j;
-                                if (i_cell == cellX) distanceX = abs(i-xHitInCell);
-                                if (j_cell == cellY) distanceY = abs(j-yHitInCell);
-                                if (distanceX < r && distanceY < r) newTerrain[j*landTextureSize+i] = brushInt;
+                                if (i_cell < cellX)
+                                    distanceX = xHitInCell + landTextureSize * abs(i_cell - cellX) - i;
+                                if (j_cell < cellY)
+                                    distanceY = yHitInCell + landTextureSize * abs(j_cell - cellY) - j;
+                                if (i_cell > cellX)
+                                    distanceX = -xHitInCell + landTextureSize * abs(i_cell - cellX) + i;
+                                if (j_cell > cellY)
+                                    distanceY = -yHitInCell + landTextureSize * abs(j_cell - cellY) + j;
+                                if (i_cell == cellX)
+                                    distanceX = abs(i - xHitInCell);
+                                if (j_cell == cellY)
+                                    distanceY = abs(j - yHitInCell);
+                                if (distanceX < r && distanceY < r)
+                                    newTerrain[j * landTextureSize + i] = brushInt;
                             }
                         }
                     }
@@ -396,50 +427,65 @@ void CSVRender::TerrainTextureMode::editTerrainTextureGrid(const WorldspaceHitRe
 
     if (mBrushShape == CSVWidget::BrushShape_Circle)
     {
-        int upperLeftCellX  = cellX - std::floor(r / landTextureSize);
-        int upperLeftCellY  = cellY - std::floor(r / landTextureSize);
-        if (xHitInCell - (r % landTextureSize) < 0) upperLeftCellX--;
-        if (yHitInCell - (r % landTextureSize) < 0) upperLeftCellY--;
+        int upperLeftCellX = cellX - std::floor(r / landTextureSize);
+        int upperLeftCellY = cellY - std::floor(r / landTextureSize);
+        if (xHitInCell - (r % landTextureSize) < 0)
+            upperLeftCellX--;
+        if (yHitInCell - (r % landTextureSize) < 0)
+            upperLeftCellY--;
 
         int lowerrightCellX = cellX + std::floor(r / landTextureSize);
         int lowerrightCellY = cellY + std::floor(r / landTextureSize);
-        if (xHitInCell + (r % landTextureSize) > landTextureSize - 1) lowerrightCellX++;
-        if (yHitInCell + (r % landTextureSize) > landTextureSize - 1) lowerrightCellY++;
+        if (xHitInCell + (r % landTextureSize) > landTextureSize - 1)
+            lowerrightCellX++;
+        if (yHitInCell + (r % landTextureSize) > landTextureSize - 1)
+            lowerrightCellY++;
 
-        for(int i_cell = upperLeftCellX; i_cell <= lowerrightCellX; i_cell++)
+        for (int i_cell = upperLeftCellX; i_cell <= lowerrightCellX; i_cell++)
         {
-            for(int j_cell = upperLeftCellY; j_cell <= lowerrightCellY; j_cell++)
+            for (int j_cell = upperLeftCellY; j_cell <= lowerrightCellY; j_cell++)
             {
                 iteratedCellId = CSMWorld::CellCoordinates::generateId(i_cell, j_cell);
-                if(allowLandTextureEditing(iteratedCellId))
+                if (allowLandTextureEditing(iteratedCellId))
                 {
-                    CSMWorld::LandTexturesColumn::DataType newTerrainPointer = landTable.data(landTable.getModelIndex(iteratedCellId, textureColumn)).value<CSMWorld::LandTexturesColumn::DataType>();
+                    CSMWorld::LandTexturesColumn::DataType newTerrainPointer
+                        = landTable.data(landTable.getModelIndex(iteratedCellId, textureColumn))
+                              .value<CSMWorld::LandTexturesColumn::DataType>();
                     CSMWorld::LandTexturesColumn::DataType newTerrain(newTerrainPointer);
-                    for(int i = 0; i < landTextureSize; i++)
+                    for (int i = 0; i < landTextureSize; i++)
                     {
-                        for(int j = 0; j < landTextureSize; j++)
+                        for (int j = 0; j < landTextureSize; j++)
                         {
-                            if (i_cell == cellX && j_cell == cellY && abs(i-xHitInCell) < r && abs(j-yHitInCell) < r)
+                            if (i_cell == cellX && j_cell == cellY && abs(i - xHitInCell) < r
+                                && abs(j - yHitInCell) < r)
                             {
-                                int distanceX = abs(i-xHitInCell);
-                                int distanceY = abs(j-yHitInCell);
-                                float distance = std::round(sqrt(pow(distanceX, 2)+pow(distanceY, 2)));
+                                int distanceX = abs(i - xHitInCell);
+                                int distanceY = abs(j - yHitInCell);
+                                float distance = std::round(sqrt(pow(distanceX, 2) + pow(distanceY, 2)));
                                 float rf = static_cast<float>(mBrushSize) / 2;
-                                if (distance < rf) newTerrain[j*landTextureSize+i] = brushInt;
+                                if (distance < rf)
+                                    newTerrain[j * landTextureSize + i] = brushInt;
                             }
                             else
                             {
                                 int distanceX(0);
                                 int distanceY(0);
-                                if (i_cell < cellX) distanceX = xHitInCell + landTextureSize * abs(i_cell-cellX) - i;
-                                if (j_cell < cellY) distanceY = yHitInCell + landTextureSize * abs(j_cell-cellY) - j;
-                                if (i_cell > cellX) distanceX = -xHitInCell + landTextureSize * abs(i_cell-cellX) + i;
-                                if (j_cell > cellY) distanceY = -yHitInCell + landTextureSize * abs(j_cell-cellY) + j;
-                                if (i_cell == cellX) distanceX = abs(i-xHitInCell);
-                                if (j_cell == cellY) distanceY = abs(j-yHitInCell);
-                                float distance = std::round(sqrt(pow(distanceX, 2)+pow(distanceY, 2)));
+                                if (i_cell < cellX)
+                                    distanceX = xHitInCell + landTextureSize * abs(i_cell - cellX) - i;
+                                if (j_cell < cellY)
+                                    distanceY = yHitInCell + landTextureSize * abs(j_cell - cellY) - j;
+                                if (i_cell > cellX)
+                                    distanceX = -xHitInCell + landTextureSize * abs(i_cell - cellX) + i;
+                                if (j_cell > cellY)
+                                    distanceY = -yHitInCell + landTextureSize * abs(j_cell - cellY) + j;
+                                if (i_cell == cellX)
+                                    distanceX = abs(i - xHitInCell);
+                                if (j_cell == cellY)
+                                    distanceY = abs(j - yHitInCell);
+                                float distance = std::round(sqrt(pow(distanceX, 2) + pow(distanceY, 2)));
                                 float rf = static_cast<float>(mBrushSize) / 2;
-                                if (distance < rf) newTerrain[j*landTextureSize+i] = brushInt;
+                                if (distance < rf)
+                                    newTerrain[j * landTextureSize + i] = brushInt;
                             }
                         }
                     }
@@ -451,30 +497,36 @@ void CSVRender::TerrainTextureMode::editTerrainTextureGrid(const WorldspaceHitRe
 
     if (mBrushShape == CSVWidget::BrushShape_Custom)
     {
-        CSMWorld::LandTexturesColumn::DataType newTerrainPointer = landTable.data(landTable.getModelIndex(mCellId, textureColumn)).value<CSMWorld::LandTexturesColumn::DataType>();
+        CSMWorld::LandTexturesColumn::DataType newTerrainPointer
+            = landTable.data(landTable.getModelIndex(mCellId, textureColumn))
+                  .value<CSMWorld::LandTexturesColumn::DataType>();
         CSMWorld::LandTexturesColumn::DataType newTerrain(newTerrainPointer);
 
-        if(allowLandTextureEditing(mCellId) && !mCustomBrushShape.empty())
+        if (allowLandTextureEditing(mCellId) && !mCustomBrushShape.empty())
         {
-            for(auto const& value: mCustomBrushShape)
+            for (auto const& value : mCustomBrushShape)
             {
-                if(yHitInCell + value.second >= 0 && yHitInCell + value.second <= 15 && xHitInCell + value.first >= 0 && xHitInCell + value.first <= 15)
+                if (yHitInCell + value.second >= 0 && yHitInCell + value.second <= 15 && xHitInCell + value.first >= 0
+                    && xHitInCell + value.first <= 15)
                 {
-                    newTerrain[(yHitInCell+value.second)*landTextureSize+xHitInCell+value.first] = brushInt;
+                    newTerrain[(yHitInCell + value.second) * landTextureSize + xHitInCell + value.first] = brushInt;
                 }
                 else
                 {
-                    int cellXDifference = std::floor(1.0f*(xHitInCell + value.first)/landTextureSize);
-                    int cellYDifference = std::floor(1.0f*(yHitInCell + value.second)/landTextureSize);
+                    int cellXDifference = std::floor(1.0f * (xHitInCell + value.first) / landTextureSize);
+                    int cellYDifference = std::floor(1.0f * (yHitInCell + value.second) / landTextureSize);
                     int xInOtherCell = xHitInCell + value.first - cellXDifference * landTextureSize;
                     int yInOtherCell = yHitInCell + value.second - cellYDifference * landTextureSize;
 
-                    std::string cellId = CSMWorld::CellCoordinates::generateId(cellX+cellXDifference, cellY+cellYDifference);
+                    std::string cellId
+                        = CSMWorld::CellCoordinates::generateId(cellX + cellXDifference, cellY + cellYDifference);
                     if (allowLandTextureEditing(cellId))
                     {
-                        CSMWorld::LandTexturesColumn::DataType newTerrainPointerOtherCell = landTable.data(landTable.getModelIndex(cellId, textureColumn)).value<CSMWorld::LandTexturesColumn::DataType>();
+                        CSMWorld::LandTexturesColumn::DataType newTerrainPointerOtherCell
+                            = landTable.data(landTable.getModelIndex(cellId, textureColumn))
+                                  .value<CSMWorld::LandTexturesColumn::DataType>();
                         CSMWorld::LandTexturesColumn::DataType newTerrainOtherCell(newTerrainPointerOtherCell);
-                        newTerrainOtherCell[yInOtherCell*landTextureSize+xInOtherCell] = brushInt;
+                        newTerrainOtherCell[yInOtherCell * landTextureSize + xInOtherCell] = brushInt;
                         pushEditToCommand(newTerrainOtherCell, document, landTable, cellId);
                     }
                 }
@@ -486,7 +538,8 @@ void CSVRender::TerrainTextureMode::editTerrainTextureGrid(const WorldspaceHitRe
 
 bool CSVRender::TerrainTextureMode::isInCellSelection(int globalSelectionX, int globalSelectionY)
 {
-    if (CSVRender::PagedWorldspaceWidget *paged = dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget()))
+    if (CSVRender::PagedWorldspaceWidget* paged
+        = dynamic_cast<CSVRender::PagedWorldspaceWidget*>(&getWorldspaceWidget()))
     {
         std::pair<int, int> textureCoords = std::make_pair(globalSelectionX, globalSelectionY);
         std::string cellId = CSMWorld::CellCoordinates::textureGlobalToCellId(textureCoords);
@@ -495,15 +548,16 @@ bool CSVRender::TerrainTextureMode::isInCellSelection(int globalSelectionX, int
     return false;
 }
 
-
-void CSVRender::TerrainTextureMode::selectTerrainTextures(const std::pair<int, int>& texCoords, unsigned char selectMode)
+void CSVRender::TerrainTextureMode::selectTerrainTextures(
+    const std::pair<int, int>& texCoords, unsigned char selectMode)
 {
     int r = mBrushSize / 2;
     std::vector<std::pair<int, int>> selections;
 
     if (mBrushShape == CSVWidget::BrushShape_Point)
     {
-        if (isInCellSelection(texCoords.first, texCoords.second)) selections.emplace_back(texCoords);
+        if (isInCellSelection(texCoords.first, texCoords.second))
+            selections.emplace_back(texCoords);
     }
 
     if (mBrushShape == CSVWidget::BrushShape_Square)
@@ -528,7 +582,7 @@ void CSVRender::TerrainTextureMode::selectTerrainTextures(const std::pair<int, i
         {
             for (int j = -r; j <= r; j++)
             {
-                osg::Vec2f coords(i,j);
+                osg::Vec2f coords(i, j);
                 float rf = static_cast<float>(mBrushSize) / 2;
                 if (std::round(coords.length()) < rf)
                 {
@@ -545,9 +599,9 @@ void CSVRender::TerrainTextureMode::selectTerrainTextures(const std::pair<int, i
 
     if (mBrushShape == CSVWidget::BrushShape_Custom)
     {
-        if(!mCustomBrushShape.empty())
+        if (!mCustomBrushShape.empty())
         {
-            for(auto const& value: mCustomBrushShape)
+            for (auto const& value : mCustomBrushShape)
             {
                 int x = texCoords.first + value.first;
                 int y = texCoords.second + value.second;
@@ -576,34 +630,35 @@ void CSVRender::TerrainTextureMode::selectTerrainTextures(const std::pair<int, i
         mTerrainTextureSelection->toggleSelect(selections);
 }
 
-void CSVRender::TerrainTextureMode::pushEditToCommand(CSMWorld::LandTexturesColumn::DataType& newLandGrid, CSMDoc::Document& document,
-    CSMWorld::IdTable& landTable, std::string cellId)
+void CSVRender::TerrainTextureMode::pushEditToCommand(CSMWorld::LandTexturesColumn::DataType& newLandGrid,
+    CSMDoc::Document& document, CSMWorld::IdTable& landTable, std::string cellId)
 {
-    CSMWorld::IdTable& ltexTable = dynamic_cast<CSMWorld::IdTable&> (
-        *document.getData().getTableModel (CSMWorld::UniversalId::Type_LandTextures));
+    CSMWorld::IdTable& ltexTable
+        = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_LandTextures));
 
     QVariant changedLand;
     changedLand.setValue(newLandGrid);
 
-    QModelIndex index(landTable.getModelIndex (cellId, landTable.findColumnIndex (CSMWorld::Columns::ColumnId_LandTexturesIndex)));
+    QModelIndex index(
+        landTable.getModelIndex(cellId, landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandTexturesIndex)));
 
     QUndoStack& undoStack = document.getUndoStack();
-    undoStack.push (new CSMWorld::ModifyCommand(landTable, index, changedLand));
-    undoStack.push (new CSMWorld::TouchLandCommand(landTable, ltexTable, cellId));
+    undoStack.push(new CSMWorld::ModifyCommand(landTable, index, changedLand));
+    undoStack.push(new CSMWorld::TouchLandCommand(landTable, ltexTable, cellId));
 }
 
 void CSVRender::TerrainTextureMode::createTexture(std::string textureFileName)
 {
     CSMDoc::Document& document = getWorldspaceWidget().getDocument();
 
-    CSMWorld::IdTable& ltexTable = dynamic_cast<CSMWorld::IdTable&> (
-        *document.getData().getTableModel (CSMWorld::UniversalId::Type_LandTextures));
+    CSMWorld::IdTable& ltexTable
+        = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_LandTextures));
 
     QUndoStack& undoStack = document.getUndoStack();
 
     std::string newId;
 
-    int counter=0;
+    int counter = 0;
     bool freeIndexFound = false;
     do
     {
@@ -611,7 +666,8 @@ void CSVRender::TerrainTextureMode::createTexture(std::string textureFileName)
         try
         {
             newId = CSMWorld::LandTexture::createUniqueRecordId(0, counter);
-            if (ltexTable.getRecord(newId).isDeleted() == 0) counter = (counter + 1) % maxCounter;
+            if (ltexTable.getRecord(newId).isDeleted() == 0)
+                counter = (counter + 1) % maxCounter;
         }
         catch (const std::exception&)
         {
@@ -621,18 +677,18 @@ void CSVRender::TerrainTextureMode::createTexture(std::string textureFileName)
     } while (freeIndexFound == false);
 
     std::size_t idlocation = textureFileName.find("Texture: ");
-    textureFileName = textureFileName.substr (idlocation + 9);
+    textureFileName = textureFileName.substr(idlocation + 9);
 
     QVariant textureNameVariant;
 
     QVariant textureFileNameVariant;
     textureFileNameVariant.setValue(QString::fromStdString(textureFileName));
 
-    undoStack.beginMacro ("Add land texture record");
+    undoStack.beginMacro("Add land texture record");
 
-    undoStack.push (new CSMWorld::CreateCommand (ltexTable, newId));
-    QModelIndex index(ltexTable.getModelIndex (newId, ltexTable.findColumnIndex (CSMWorld::Columns::ColumnId_Texture)));
-    undoStack.push (new CSMWorld::ModifyCommand(ltexTable, index, textureFileNameVariant));
+    undoStack.push(new CSMWorld::CreateCommand(ltexTable, newId));
+    QModelIndex index(ltexTable.getModelIndex(newId, ltexTable.findColumnIndex(CSMWorld::Columns::ColumnId_Texture)));
+    undoStack.push(new CSMWorld::ModifyCommand(ltexTable, index, textureFileNameVariant));
     undoStack.endMacro();
     mBrushTexture = newId;
 }
@@ -640,56 +696,55 @@ void CSVRender::TerrainTextureMode::createTexture(std::string textureFileName)
 bool CSVRender::TerrainTextureMode::allowLandTextureEditing(std::string cellId)
 {
     CSMDoc::Document& document = getWorldspaceWidget().getDocument();
-    CSMWorld::IdTable& landTable = dynamic_cast<CSMWorld::IdTable&> (
-        *document.getData().getTableModel (CSMWorld::UniversalId::Type_Land));
-    CSMWorld::IdTree& cellTable = dynamic_cast<CSMWorld::IdTree&> (
-            *document.getData().getTableModel (CSMWorld::UniversalId::Type_Cells));
+    CSMWorld::IdTable& landTable
+        = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_Land));
+    CSMWorld::IdTree& cellTable
+        = dynamic_cast<CSMWorld::IdTree&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_Cells));
 
-    bool noCell = document.getData().getCells().searchId (cellId)==-1;
-    bool noLand = document.getData().getLand().searchId (cellId)==-1;
+    bool noCell = document.getData().getCells().searchId(cellId) == -1;
+    bool noLand = document.getData().getLand().searchId(cellId) == -1;
 
     if (noCell)
     {
         std::string mode = CSMPrefs::get()["3D Scene Editing"]["outside-landedit"].toString();
 
         // target cell does not exist
-        if (mode=="Discard")
+        if (mode == "Discard")
             return false;
 
-        if (mode=="Create cell and land, then edit")
+        if (mode == "Create cell and land, then edit")
         {
             auto createCommand = std::make_unique<CSMWorld::CreateCommand>(cellTable, cellId);
-            int parentIndex = cellTable.findColumnIndex (CSMWorld::Columns::ColumnId_Cell);
-            int index = cellTable.findNestedColumnIndex (parentIndex, CSMWorld::Columns::ColumnId_Interior);
-            createCommand->addNestedValue (parentIndex, index, false);
-            document.getUndoStack().push (createCommand.release());
+            int parentIndex = cellTable.findColumnIndex(CSMWorld::Columns::ColumnId_Cell);
+            int index = cellTable.findNestedColumnIndex(parentIndex, CSMWorld::Columns::ColumnId_Interior);
+            createCommand->addNestedValue(parentIndex, index, false);
+            document.getUndoStack().push(createCommand.release());
 
-            if (CSVRender::PagedWorldspaceWidget *paged =
-                dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget()))
+            if (CSVRender::PagedWorldspaceWidget* paged
+                = dynamic_cast<CSVRender::PagedWorldspaceWidget*>(&getWorldspaceWidget()))
             {
                 CSMWorld::CellSelection selection = paged->getCellSelection();
-                selection.add (CSMWorld::CellCoordinates::fromId (cellId).first);
-                paged->setCellSelection (selection);
+                selection.add(CSMWorld::CellCoordinates::fromId(cellId).first);
+                paged->setCellSelection(selection);
             }
         }
     }
-    else if (CSVRender::PagedWorldspaceWidget *paged =
-        dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget()))
+    else if (CSVRender::PagedWorldspaceWidget* paged
+        = dynamic_cast<CSVRender::PagedWorldspaceWidget*>(&getWorldspaceWidget()))
     {
         CSMWorld::CellSelection selection = paged->getCellSelection();
-        if (!selection.has (CSMWorld::CellCoordinates::fromId (cellId).first))
+        if (!selection.has(CSMWorld::CellCoordinates::fromId(cellId).first))
         {
             // target cell exists, but is not shown
-            std::string mode =
-                CSMPrefs::get()["3D Scene Editing"]["outside-visible-landedit"].toString();
+            std::string mode = CSMPrefs::get()["3D Scene Editing"]["outside-visible-landedit"].toString();
 
-            if (mode=="Discard")
+            if (mode == "Discard")
                 return false;
 
-            if (mode=="Show cell and edit")
+            if (mode == "Show cell and edit")
             {
-                selection.add (CSMWorld::CellCoordinates::fromId (cellId).first);
-                paged->setCellSelection (selection);
+                selection.add(CSMWorld::CellCoordinates::fromId(cellId).first);
+                paged->setCellSelection(selection);
             }
         }
     }
@@ -699,23 +754,21 @@ bool CSVRender::TerrainTextureMode::allowLandTextureEditing(std::string cellId)
         std::string mode = CSMPrefs::get()["3D Scene Editing"]["outside-landedit"].toString();
 
         // target cell does not exist
-        if (mode=="Discard")
+        if (mode == "Discard")
             return false;
 
-        if (mode=="Create cell and land, then edit")
+        if (mode == "Create cell and land, then edit")
         {
-            document.getUndoStack().push (new CSMWorld::CreateCommand (landTable, cellId));
+            document.getUndoStack().push(new CSMWorld::CreateCommand(landTable, cellId));
         }
     }
 
     return true;
 }
 
-void CSVRender::TerrainTextureMode::dragMoveEvent (QDragMoveEvent *event)
-{
-}
+void CSVRender::TerrainTextureMode::dragMoveEvent(QDragMoveEvent* event) {}
 
-void CSVRender::TerrainTextureMode::mouseMoveEvent (QMouseEvent *event)
+void CSVRender::TerrainTextureMode::mouseMoveEvent(QMouseEvent* event)
 {
     WorldspaceHitResult hit = getWorldspaceWidget().mousePick(event->pos(), getInteractionMask());
     if (hit.hit && mBrushDraw)
@@ -729,7 +782,6 @@ std::shared_ptr<CSVRender::TerrainSelection> CSVRender::TerrainTextureMode::getT
     return mTerrainTextureSelection;
 }
 
-
 void CSVRender::TerrainTextureMode::setBrushSize(int brushSize)
 {
     mBrushSize = brushSize;
@@ -739,7 +791,7 @@ void CSVRender::TerrainTextureMode::setBrushShape(CSVWidget::BrushShape brushSha
 {
     mBrushShape = brushShape;
 
-    //Set custom brush shape
+    // Set custom brush shape
     if (mBrushShape == CSVWidget::BrushShape_Custom && !mTerrainTextureSelection->getTerrainSelection().empty())
     {
         auto terrainSelection = mTerrainTextureSelection->getTerrainSelection();
@@ -747,7 +799,7 @@ void CSVRender::TerrainTextureMode::setBrushShape(CSVWidget::BrushShape brushSha
         int selectionCenterY = 0;
         int selectionAmount = 0;
 
-        for(auto const& value: terrainSelection)
+        for (auto const& value : terrainSelection)
         {
             selectionCenterX += value.first;
             selectionCenterY += value.second;
@@ -761,7 +813,7 @@ void CSVRender::TerrainTextureMode::setBrushShape(CSVWidget::BrushShape brushSha
         }
 
         mCustomBrushShape.clear();
-        for (auto const& value: terrainSelection)
+        for (auto const& value : terrainSelection)
             mCustomBrushShape.emplace_back(value.first - selectionCenterX, value.second - selectionCenterY);
     }
 }
diff --git a/apps/opencs/view/render/terraintexturemode.hpp b/apps/opencs/view/render/terraintexturemode.hpp
index e91a69342c..f3a44c09ed 100644
--- a/apps/opencs/view/render/terraintexturemode.hpp
+++ b/apps/opencs/view/render/terraintexturemode.hpp
@@ -3,16 +3,16 @@
 
 #include "editmode.hpp"
 
-#include <string>
 #include <memory>
+#include <string>
 
-#include <QWidget>
 #include <QEvent>
+#include <QWidget>
 
 #ifndef Q_MOC_RUN
 #include "../../model/doc/document.hpp"
-#include "../../model/world/idtable.hpp"
 #include "../../model/world/columnimp.hpp"
+#include "../../model/world/idtable.hpp"
 #include "../widget/brushshapes.hpp"
 #include "brushdraw.hpp"
 #endif
@@ -35,99 +35,97 @@ namespace CSVRender
     {
         Q_OBJECT
 
-        public:
+    public:
+        enum InteractionType
+        {
+            InteractionType_PrimaryEdit,
+            InteractionType_PrimarySelect,
+            InteractionType_SecondaryEdit,
+            InteractionType_SecondarySelect,
+            InteractionType_None
+        };
 
-            enum InteractionType
-            {
-                InteractionType_PrimaryEdit,
-                InteractionType_PrimarySelect,
-                InteractionType_SecondaryEdit,
-                InteractionType_SecondarySelect,
-                InteractionType_None
-            };
+        /// \brief Editmode for terrain texture grid
+        TerrainTextureMode(WorldspaceWidget*, osg::Group* parentNode, QWidget* parent = nullptr);
 
-            /// \brief Editmode for terrain texture grid
-            TerrainTextureMode(WorldspaceWidget*, osg::Group* parentNode, QWidget* parent = nullptr);
+        void primaryOpenPressed(const WorldspaceHitResult& hit) override;
 
-            void primaryOpenPressed (const WorldspaceHitResult& hit) override;
+        /// \brief Create single command for one-click texture editing
+        void primaryEditPressed(const WorldspaceHitResult& hit) override;
 
-            /// \brief Create single command for one-click texture editing
-            void primaryEditPressed (const WorldspaceHitResult& hit) override;
+        /// \brief Open brush settings window
+        void primarySelectPressed(const WorldspaceHitResult&) override;
 
-            /// \brief Open brush settings window
-            void primarySelectPressed(const WorldspaceHitResult&) override;
+        void secondarySelectPressed(const WorldspaceHitResult&) override;
 
-            void secondarySelectPressed(const WorldspaceHitResult&) override;
+        void activate(CSVWidget::SceneToolbar*) override;
+        void deactivate(CSVWidget::SceneToolbar*) override;
 
-            void activate(CSVWidget::SceneToolbar*) override;
-            void deactivate(CSVWidget::SceneToolbar*) override;
+        /// \brief Start texture editing command macro
+        bool primaryEditStartDrag(const QPoint& pos) override;
 
-            /// \brief Start texture editing command macro
-            bool primaryEditStartDrag (const QPoint& pos) override;
+        bool secondaryEditStartDrag(const QPoint& pos) override;
+        bool primarySelectStartDrag(const QPoint& pos) override;
+        bool secondarySelectStartDrag(const QPoint& pos) override;
 
-            bool secondaryEditStartDrag (const QPoint& pos) override;
-            bool primarySelectStartDrag (const QPoint& pos) override;
-            bool secondarySelectStartDrag (const QPoint& pos) override;
+        /// \brief Handle texture edit behavior during dragging
+        void drag(const QPoint& pos, int diffX, int diffY, double speedFactor) override;
 
-            /// \brief Handle texture edit behavior during dragging
-            void drag (const QPoint& pos, int diffX, int diffY, double speedFactor) override;
+        /// \brief End texture editing command macro
+        void dragCompleted(const QPoint& pos) override;
 
-            /// \brief End texture editing command macro
-            void dragCompleted(const QPoint& pos) override;
+        void dragAborted() override;
+        void dragWheel(int diff, double speedFactor) override;
+        void dragMoveEvent(QDragMoveEvent* event) override;
 
-            void dragAborted() override;
-            void dragWheel (int diff, double speedFactor) override;
-            void dragMoveEvent (QDragMoveEvent *event) override;
+        void mouseMoveEvent(QMouseEvent* event) override;
 
-            void mouseMoveEvent (QMouseEvent *event) override;
+        std::shared_ptr<TerrainSelection> getTerrainSelection();
 
-            std::shared_ptr<TerrainSelection> getTerrainSelection();
+    private:
+        /// \brief Handle brush mechanics, maths regarding worldspace hit etc.
+        void editTerrainTextureGrid(const WorldspaceHitResult& hit);
 
-        private:
-            /// \brief Handle brush mechanics, maths regarding worldspace hit etc.
-            void editTerrainTextureGrid (const WorldspaceHitResult& hit);
+        /// \brief Check if global selection coordinate belongs to cell in view
+        bool isInCellSelection(int globalSelectionX, int globalSelectionY);
 
-            /// \brief Check if global selection coordinate belongs to cell in view
-            bool isInCellSelection(int globalSelectionX, int globalSelectionY);
+        /// \brief Handle brush mechanics for texture selection
+        void selectTerrainTextures(const std::pair<int, int>& texCoords, unsigned char selectMode);
 
-            /// \brief Handle brush mechanics for texture selection
-            void selectTerrainTextures (const std::pair<int, int>& texCoords, unsigned char selectMode);
+        /// \brief Push texture edits to command macro
+        void pushEditToCommand(CSMWorld::LandTexturesColumn::DataType& newLandGrid, CSMDoc::Document& document,
+            CSMWorld::IdTable& landTable, std::string cellId);
 
-            /// \brief Push texture edits to command macro
-            void pushEditToCommand (CSMWorld::LandTexturesColumn::DataType& newLandGrid, CSMDoc::Document& document,
-                CSMWorld::IdTable& landTable, std::string cellId);
+        /// \brief Create new land texture record from texture asset
+        void createTexture(std::string textureFileName);
 
-            /// \brief Create new land texture record from texture asset
-            void createTexture(std::string textureFileName);
+        /// \brief Create new cell and land if needed
+        bool allowLandTextureEditing(std::string textureFileName);
 
-            /// \brief Create new cell and land if needed
-            bool allowLandTextureEditing(std::string textureFileName);
+        std::string mCellId;
+        std::string mBrushTexture;
+        int mBrushSize;
+        CSVWidget::BrushShape mBrushShape;
+        std::unique_ptr<BrushDraw> mBrushDraw;
+        std::vector<std::pair<int, int>> mCustomBrushShape;
+        CSVWidget::SceneToolTextureBrush* mTextureBrushScenetool;
+        int mDragMode;
+        osg::Group* mParentNode;
+        bool mIsEditing;
+        std::shared_ptr<TerrainSelection> mTerrainTextureSelection;
 
-            std::string mCellId;
-            std::string mBrushTexture;
-            int mBrushSize;
-            CSVWidget::BrushShape mBrushShape;
-            std::unique_ptr<BrushDraw> mBrushDraw;
-            std::vector<std::pair<int, int>> mCustomBrushShape;
-            CSVWidget::SceneToolTextureBrush *mTextureBrushScenetool;
-            int mDragMode;
-            osg::Group* mParentNode;
-            bool mIsEditing;
-            std::shared_ptr<TerrainSelection> mTerrainTextureSelection;
+        const int cellSize{ ESM::Land::REAL_SIZE };
+        const int landTextureSize{ ESM::Land::LAND_TEXTURE_SIZE };
 
-            const int cellSize {ESM::Land::REAL_SIZE};
-            const int landTextureSize {ESM::Land::LAND_TEXTURE_SIZE};
+    signals:
+        void passBrushTexture(std::string brushTexture);
 
-        signals:
-            void passBrushTexture(std::string brushTexture);
-
-        public slots:
-            void handleDropEvent(QDropEvent *event);
-            void setBrushSize(int brushSize);
-            void setBrushShape(CSVWidget::BrushShape brushShape);
-            void setBrushTexture(std::string brushShape);
+    public slots:
+        void handleDropEvent(QDropEvent* event);
+        void setBrushSize(int brushSize);
+        void setBrushShape(CSVWidget::BrushShape brushShape);
+        void setBrushTexture(std::string brushShape);
     };
 }
 
-
 #endif
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index eb0d5ce38d..98c8231cae 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -18,12 +18,12 @@
 
 void CSVRender::UnpagedWorldspaceWidget::update()
 {
-    const CSMWorld::Record<CSMWorld::Cell>& record =
-        dynamic_cast<const CSMWorld::Record<CSMWorld::Cell>&> (mCellsModel->getRecord (mCellId));
+    const CSMWorld::Record<CSMWorld::Cell>& record
+        = dynamic_cast<const CSMWorld::Record<CSMWorld::Cell>&>(mCellsModel->getRecord(mCellId));
 
     osg::Vec4f colour = SceneUtil::colourFromRGB(record.get().mAmbi.mAmbient);
 
-    setDefaultAmbient (colour);
+    setDefaultAmbient(colour);
 
     bool isInterior = (record.get().mData.mFlags & ESM::Cell::Interior) != 0;
     bool behaveLikeExterior = (record.get().mData.mFlags & ESM::Cell::QuasiEx) != 0;
@@ -35,37 +35,38 @@ void CSVRender::UnpagedWorldspaceWidget::update()
     flagAsModified();
 }
 
-CSVRender::UnpagedWorldspaceWidget::UnpagedWorldspaceWidget (const std::string& cellId, CSMDoc::Document& document, QWidget* parent)
-: WorldspaceWidget (document, parent), mDocument(document), mCellId (cellId)
+CSVRender::UnpagedWorldspaceWidget::UnpagedWorldspaceWidget(
+    const std::string& cellId, CSMDoc::Document& document, QWidget* parent)
+    : WorldspaceWidget(document, parent)
+    , mDocument(document)
+    , mCellId(cellId)
 {
-    mCellsModel = &dynamic_cast<CSMWorld::IdTable&> (
-        *document.getData().getTableModel (CSMWorld::UniversalId::Type_Cells));
+    mCellsModel
+        = &dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_Cells));
 
-    mReferenceablesModel = &dynamic_cast<CSMWorld::IdTable&> (
-        *document.getData().getTableModel (CSMWorld::UniversalId::Type_Referenceables));
+    mReferenceablesModel = &dynamic_cast<CSMWorld::IdTable&>(
+        *document.getData().getTableModel(CSMWorld::UniversalId::Type_Referenceables));
 
-    connect (mCellsModel, &CSMWorld::IdTable::dataChanged,
-        this, &UnpagedWorldspaceWidget::cellDataChanged);
-    connect (mCellsModel, &CSMWorld::IdTable::rowsAboutToBeRemoved,
-        this, &UnpagedWorldspaceWidget::cellRowsAboutToBeRemoved);
+    connect(mCellsModel, &CSMWorld::IdTable::dataChanged, this, &UnpagedWorldspaceWidget::cellDataChanged);
+    connect(mCellsModel, &CSMWorld::IdTable::rowsAboutToBeRemoved, this,
+        &UnpagedWorldspaceWidget::cellRowsAboutToBeRemoved);
 
-    connect (&document.getData(), &CSMWorld::Data::assetTablesChanged,
-        this, &UnpagedWorldspaceWidget::assetTablesChanged);
+    connect(
+        &document.getData(), &CSMWorld::Data::assetTablesChanged, this, &UnpagedWorldspaceWidget::assetTablesChanged);
 
     update();
 
     mCell = std::make_unique<Cell>(document.getData(), mRootNode, mCellId);
 }
 
-void CSVRender::UnpagedWorldspaceWidget::cellDataChanged (const QModelIndex& topLeft,
-    const QModelIndex& bottomRight)
+void CSVRender::UnpagedWorldspaceWidget::cellDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
-    int index = mCellsModel->findColumnIndex (CSMWorld::Columns::ColumnId_Modification);
-    QModelIndex cellIndex = mCellsModel->getModelIndex (mCellId, index);
+    int index = mCellsModel->findColumnIndex(CSMWorld::Columns::ColumnId_Modification);
+    QModelIndex cellIndex = mCellsModel->getModelIndex(mCellId, index);
 
-    if (cellIndex.row()>=topLeft.row() && cellIndex.row()<=bottomRight.row())
+    if (cellIndex.row() >= topLeft.row() && cellIndex.row() <= bottomRight.row())
     {
-        if (mCellsModel->data (cellIndex).toInt()==CSMWorld::RecordBase::State_Deleted)
+        if (mCellsModel->data(cellIndex).toInt() == CSMWorld::RecordBase::State_Deleted)
         {
             emit closeRequest();
         }
@@ -78,12 +79,11 @@ void CSVRender::UnpagedWorldspaceWidget::cellDataChanged (const QModelIndex& top
     }
 }
 
-void CSVRender::UnpagedWorldspaceWidget::cellRowsAboutToBeRemoved (const QModelIndex& parent,
-    int start, int end)
+void CSVRender::UnpagedWorldspaceWidget::cellRowsAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
-    QModelIndex cellIndex = mCellsModel->getModelIndex (mCellId, 0);
+    QModelIndex cellIndex = mCellsModel->getModelIndex(mCellId, 0);
 
-    if (cellIndex.row()>=start && cellIndex.row()<=end)
+    if (cellIndex.row() >= start && cellIndex.row() <= end)
         emit closeRequest();
 }
 
@@ -93,12 +93,13 @@ void CSVRender::UnpagedWorldspaceWidget::assetTablesChanged()
         mCell->reloadAssets();
 }
 
-bool CSVRender::UnpagedWorldspaceWidget::handleDrop (const std::vector<CSMWorld::UniversalId>& universalIdData, DropType type)
+bool CSVRender::UnpagedWorldspaceWidget::handleDrop(
+    const std::vector<CSMWorld::UniversalId>& universalIdData, DropType type)
 {
-    if (WorldspaceWidget::handleDrop (universalIdData, type))
+    if (WorldspaceWidget::handleDrop(universalIdData, type))
         return true;
 
-    if (type!=Type_CellsInterior)
+    if (type != Type_CellsInterior)
         return false;
 
     mCellId = universalIdData.begin()->getId();
@@ -113,41 +114,43 @@ bool CSVRender::UnpagedWorldspaceWidget::handleDrop (const std::vector<CSMWorld:
     return true;
 }
 
-void CSVRender::UnpagedWorldspaceWidget::clearSelection (int elementMask)
+void CSVRender::UnpagedWorldspaceWidget::clearSelection(int elementMask)
 {
-    mCell->setSelection (elementMask, Cell::Selection_Clear);
+    mCell->setSelection(elementMask, Cell::Selection_Clear);
     flagAsModified();
 }
 
-void CSVRender::UnpagedWorldspaceWidget::invertSelection (int elementMask)
+void CSVRender::UnpagedWorldspaceWidget::invertSelection(int elementMask)
 {
-    mCell->setSelection (elementMask, Cell::Selection_Invert);
+    mCell->setSelection(elementMask, Cell::Selection_Invert);
     flagAsModified();
 }
 
-void CSVRender::UnpagedWorldspaceWidget::selectAll (int elementMask)
+void CSVRender::UnpagedWorldspaceWidget::selectAll(int elementMask)
 {
-    mCell->setSelection (elementMask, Cell::Selection_All);
+    mCell->setSelection(elementMask, Cell::Selection_All);
     flagAsModified();
 }
 
-void CSVRender::UnpagedWorldspaceWidget::selectAllWithSameParentId (int elementMask)
+void CSVRender::UnpagedWorldspaceWidget::selectAllWithSameParentId(int elementMask)
 {
-    mCell->selectAllWithSameParentId (elementMask);
+    mCell->selectAllWithSameParentId(elementMask);
     flagAsModified();
 }
 
-void CSVRender::UnpagedWorldspaceWidget::selectInsideCube(const osg::Vec3d& pointA, const osg::Vec3d& pointB, DragMode dragMode)
+void CSVRender::UnpagedWorldspaceWidget::selectInsideCube(
+    const osg::Vec3d& pointA, const osg::Vec3d& pointB, DragMode dragMode)
 {
-    mCell->selectInsideCube (pointA, pointB, dragMode);
+    mCell->selectInsideCube(pointA, pointB, dragMode);
 }
 
-void CSVRender::UnpagedWorldspaceWidget::selectWithinDistance(const osg::Vec3d& point, float distance, DragMode dragMode)
+void CSVRender::UnpagedWorldspaceWidget::selectWithinDistance(
+    const osg::Vec3d& point, float distance, DragMode dragMode)
 {
-    mCell->selectWithinDistance (point, distance, dragMode);
+    mCell->selectWithinDistance(point, distance, dragMode);
 }
 
-std::string CSVRender::UnpagedWorldspaceWidget::getCellId (const osg::Vec3f& point) const
+std::string CSVRender::UnpagedWorldspaceWidget::getCellId(const osg::Vec3f& point) const
 {
     return mCellId;
 }
@@ -162,83 +165,78 @@ CSVRender::Cell* CSVRender::UnpagedWorldspaceWidget::getCell(const CSMWorld::Cel
     return mCell.get();
 }
 
-std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::UnpagedWorldspaceWidget::getSelection (
+std::vector<osg::ref_ptr<CSVRender::TagBase>> CSVRender::UnpagedWorldspaceWidget::getSelection(
     unsigned int elementMask) const
 {
-    return mCell->getSelection (elementMask);
+    return mCell->getSelection(elementMask);
 }
 
-std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::UnpagedWorldspaceWidget::getEdited (
+std::vector<osg::ref_ptr<CSVRender::TagBase>> CSVRender::UnpagedWorldspaceWidget::getEdited(
     unsigned int elementMask) const
 {
-    return mCell->getEdited (elementMask);
+    return mCell->getEdited(elementMask);
 }
 
-void  CSVRender::UnpagedWorldspaceWidget::setSubMode (int subMode, unsigned int elementMask)
+void CSVRender::UnpagedWorldspaceWidget::setSubMode(int subMode, unsigned int elementMask)
 {
-    mCell->setSubMode (subMode, elementMask);
+    mCell->setSubMode(subMode, elementMask);
 }
 
-void CSVRender::UnpagedWorldspaceWidget::reset (unsigned int elementMask)
+void CSVRender::UnpagedWorldspaceWidget::reset(unsigned int elementMask)
 {
-    mCell->reset (elementMask);
+    mCell->reset(elementMask);
 }
 
-void CSVRender::UnpagedWorldspaceWidget::referenceableDataChanged (const QModelIndex& topLeft,
-    const QModelIndex& bottomRight)
+void CSVRender::UnpagedWorldspaceWidget::referenceableDataChanged(
+    const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     if (mCell.get())
-        if (mCell.get()->referenceableDataChanged (topLeft, bottomRight))
+        if (mCell.get()->referenceableDataChanged(topLeft, bottomRight))
             flagAsModified();
 }
 
-void CSVRender::UnpagedWorldspaceWidget::referenceableAboutToBeRemoved (
-    const QModelIndex& parent, int start, int end)
+void CSVRender::UnpagedWorldspaceWidget::referenceableAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
     if (mCell.get())
-        if (mCell.get()->referenceableAboutToBeRemoved (parent, start, end))
+        if (mCell.get()->referenceableAboutToBeRemoved(parent, start, end))
             flagAsModified();
 }
 
-void CSVRender::UnpagedWorldspaceWidget::referenceableAdded (const QModelIndex& parent,
-    int start, int end)
+void CSVRender::UnpagedWorldspaceWidget::referenceableAdded(const QModelIndex& parent, int start, int end)
 {
     if (mCell.get())
     {
-        QModelIndex topLeft = mReferenceablesModel->index (start, 0);
-        QModelIndex bottomRight =
-            mReferenceablesModel->index (end, mReferenceablesModel->columnCount());
+        QModelIndex topLeft = mReferenceablesModel->index(start, 0);
+        QModelIndex bottomRight = mReferenceablesModel->index(end, mReferenceablesModel->columnCount());
 
-        if (mCell.get()->referenceableDataChanged (topLeft, bottomRight))
+        if (mCell.get()->referenceableDataChanged(topLeft, bottomRight))
             flagAsModified();
     }
 }
 
-void CSVRender::UnpagedWorldspaceWidget::referenceDataChanged (const QModelIndex& topLeft,
-    const QModelIndex& bottomRight)
+void CSVRender::UnpagedWorldspaceWidget::referenceDataChanged(
+    const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     if (mCell.get())
-        if (mCell.get()->referenceDataChanged (topLeft, bottomRight))
+        if (mCell.get()->referenceDataChanged(topLeft, bottomRight))
             flagAsModified();
 }
 
-void CSVRender::UnpagedWorldspaceWidget::referenceAboutToBeRemoved (const QModelIndex& parent,
-    int start, int end)
+void CSVRender::UnpagedWorldspaceWidget::referenceAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
     if (mCell.get())
-        if (mCell.get()->referenceAboutToBeRemoved (parent, start, end))
+        if (mCell.get()->referenceAboutToBeRemoved(parent, start, end))
             flagAsModified();
 }
 
-void CSVRender::UnpagedWorldspaceWidget::referenceAdded (const QModelIndex& parent, int start,
-    int end)
+void CSVRender::UnpagedWorldspaceWidget::referenceAdded(const QModelIndex& parent, int start, int end)
 {
     if (mCell.get())
-        if (mCell.get()->referenceAdded (parent, start, end))
+        if (mCell.get()->referenceAdded(parent, start, end))
             flagAsModified();
 }
 
-void CSVRender::UnpagedWorldspaceWidget::pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight)
+void CSVRender::UnpagedWorldspaceWidget::pathgridDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
 
@@ -268,7 +266,7 @@ void CSVRender::UnpagedWorldspaceWidget::pathgridDataChanged (const QModelIndex&
     }
 }
 
-void CSVRender::UnpagedWorldspaceWidget::pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end)
+void CSVRender::UnpagedWorldspaceWidget::pathgridAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
     const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
 
@@ -288,7 +286,7 @@ void CSVRender::UnpagedWorldspaceWidget::pathgridAboutToBeRemoved (const QModelI
     }
 }
 
-void CSVRender::UnpagedWorldspaceWidget::pathgridAdded (const QModelIndex& parent, int start, int end)
+void CSVRender::UnpagedWorldspaceWidget::pathgridAdded(const QModelIndex& parent, int start, int end)
 {
     const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
 
@@ -307,12 +305,11 @@ void CSVRender::UnpagedWorldspaceWidget::pathgridAdded (const QModelIndex& paren
     }
 }
 
-void CSVRender::UnpagedWorldspaceWidget::addVisibilitySelectorButtons (
-    CSVWidget::SceneToolToggle2 *tool)
+void CSVRender::UnpagedWorldspaceWidget::addVisibilitySelectorButtons(CSVWidget::SceneToolToggle2* tool)
 {
-    WorldspaceWidget::addVisibilitySelectorButtons (tool);
-    tool->addButton (Button_Terrain, Mask_Terrain, "Terrain", "", true);
-    tool->addButton (Button_Fog, Mask_Fog, "Fog");
+    WorldspaceWidget::addVisibilitySelectorButtons(tool);
+    tool->addButton(Button_Terrain, Mask_Terrain, "Terrain", "", true);
+    tool->addButton(Button_Fog, Mask_Fog, "Fog");
 }
 
 std::string CSVRender::UnpagedWorldspaceWidget::getStartupInstruction()
@@ -323,22 +320,21 @@ std::string CSVRender::UnpagedWorldspaceWidget::getStartupInstruction()
 
     std::ostringstream stream;
 
-    stream
-        << "player->positionCell "
-        << position.x() << ", " << position.y() << ", " << position.z()
-        << ", 0, \"" << mCellId << "\"";
+    stream << "player->positionCell " << position.x() << ", " << position.y() << ", " << position.z() << ", 0, \""
+           << mCellId << "\"";
 
     return stream.str();
 }
 
-CSVRender::WorldspaceWidget::dropRequirments CSVRender::UnpagedWorldspaceWidget::getDropRequirements (CSVRender::WorldspaceWidget::DropType type) const
+CSVRender::WorldspaceWidget::dropRequirments CSVRender::UnpagedWorldspaceWidget::getDropRequirements(
+    CSVRender::WorldspaceWidget::DropType type) const
 {
-    dropRequirments requirements = WorldspaceWidget::getDropRequirements (type);
+    dropRequirments requirements = WorldspaceWidget::getDropRequirements(type);
 
-    if (requirements!=ignored)
+    if (requirements != ignored)
         return requirements;
 
-    switch(type)
+    switch (type)
     {
         case Type_CellsInterior:
             return canHandle;
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.hpp b/apps/opencs/view/render/unpagedworldspacewidget.hpp
index 83233c3270..776dfae5f9 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.hpp
@@ -1,11 +1,11 @@
 #ifndef OPENCS_VIEW_UNPAGEDWORLDSPACEWIDGET_H
 #define OPENCS_VIEW_UNPAGEDWORLDSPACEWIDGET_H
 
-#include <string>
 #include <memory>
+#include <string>
 
-#include "worldspacewidget.hpp"
 #include "cell.hpp"
+#include "worldspacewidget.hpp"
 
 class QModelIndex;
 
@@ -24,101 +24,93 @@ namespace CSVRender
 {
     class UnpagedWorldspaceWidget : public WorldspaceWidget
     {
-            Q_OBJECT
-
-            CSMDoc::Document& mDocument;
-            std::string mCellId;
-            CSMWorld::IdTable *mCellsModel;
-            CSMWorld::IdTable *mReferenceablesModel;
-            std::unique_ptr<Cell> mCell;
-
-            void update();
-
-        public:
+        Q_OBJECT
 
-            UnpagedWorldspaceWidget (const std::string& cellId, CSMDoc::Document& document,
-                                     QWidget *parent);
+        CSMDoc::Document& mDocument;
+        std::string mCellId;
+        CSMWorld::IdTable* mCellsModel;
+        CSMWorld::IdTable* mReferenceablesModel;
+        std::unique_ptr<Cell> mCell;
 
-            dropRequirments getDropRequirements(DropType type) const override;
+        void update();
 
-            /// \return Drop handled?
-            bool handleDrop (const std::vector<CSMWorld::UniversalId>& data,
-                DropType type) override;
+    public:
+        UnpagedWorldspaceWidget(const std::string& cellId, CSMDoc::Document& document, QWidget* parent);
 
-            /// \param elementMask Elements to be affected by the clear operation
-            void clearSelection (int elementMask) override;
+        dropRequirments getDropRequirements(DropType type) const override;
 
-            /// \param elementMask Elements to be affected by the select operation
-            void invertSelection (int elementMask) override;
+        /// \return Drop handled?
+        bool handleDrop(const std::vector<CSMWorld::UniversalId>& data, DropType type) override;
 
-            /// \param elementMask Elements to be affected by the select operation
-            void selectAll (int elementMask) override;
+        /// \param elementMask Elements to be affected by the clear operation
+        void clearSelection(int elementMask) override;
 
-            // Select everything that references the same ID as at least one of the elements
-            // already selected
-            //
-            /// \param elementMask Elements to be affected by the select operation
-            void selectAllWithSameParentId (int elementMask) override;
+        /// \param elementMask Elements to be affected by the select operation
+        void invertSelection(int elementMask) override;
 
-            void selectInsideCube(const osg::Vec3d& pointA, const osg::Vec3d& pointB, DragMode dragMode) override;
+        /// \param elementMask Elements to be affected by the select operation
+        void selectAll(int elementMask) override;
 
-            void selectWithinDistance(const osg::Vec3d& point, float distance, DragMode dragMode) override;
+        // Select everything that references the same ID as at least one of the elements
+        // already selected
+        //
+        /// \param elementMask Elements to be affected by the select operation
+        void selectAllWithSameParentId(int elementMask) override;
 
-            std::string getCellId (const osg::Vec3f& point) const override;
+        void selectInsideCube(const osg::Vec3d& pointA, const osg::Vec3d& pointB, DragMode dragMode) override;
 
-            Cell* getCell(const osg::Vec3d& point) const override;
+        void selectWithinDistance(const osg::Vec3d& point, float distance, DragMode dragMode) override;
 
-            Cell* getCell(const CSMWorld::CellCoordinates& coords) const override;
+        std::string getCellId(const osg::Vec3f& point) const override;
 
-            std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask)
-                const override;
+        Cell* getCell(const osg::Vec3d& point) const override;
 
-            std::vector<osg::ref_ptr<TagBase> > getEdited (unsigned int elementMask)
-                const override;
+        Cell* getCell(const CSMWorld::CellCoordinates& coords) const override;
 
-            void setSubMode (int subMode, unsigned int elementMask) override;
+        std::vector<osg::ref_ptr<TagBase>> getSelection(unsigned int elementMask) const override;
 
-            /// Erase all overrides and restore the visual representation to its true state.
-            void reset (unsigned int elementMask) override;
+        std::vector<osg::ref_ptr<TagBase>> getEdited(unsigned int elementMask) const override;
 
-        private:
+        void setSubMode(int subMode, unsigned int elementMask) override;
 
-            void referenceableDataChanged (const QModelIndex& topLeft,
-                const QModelIndex& bottomRight) override;
+        /// Erase all overrides and restore the visual representation to its true state.
+        void reset(unsigned int elementMask) override;
 
-            void referenceableAboutToBeRemoved (const QModelIndex& parent, int start, int end) override;
+    private:
+        void referenceableDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight) override;
 
-            void referenceableAdded (const QModelIndex& index, int start, int end) override;
+        void referenceableAboutToBeRemoved(const QModelIndex& parent, int start, int end) override;
 
-            void referenceDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight) override;
+        void referenceableAdded(const QModelIndex& index, int start, int end) override;
 
-            void referenceAboutToBeRemoved (const QModelIndex& parent, int start, int end) override;
+        void referenceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight) override;
 
-            void referenceAdded (const QModelIndex& index, int start, int end) override;
+        void referenceAboutToBeRemoved(const QModelIndex& parent, int start, int end) override;
 
-            void pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight) override;
+        void referenceAdded(const QModelIndex& index, int start, int end) override;
 
-            void pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end) override;
+        void pathgridDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight) override;
 
-            void pathgridAdded (const QModelIndex& parent, int start, int end) override;
+        void pathgridAboutToBeRemoved(const QModelIndex& parent, int start, int end) override;
 
-            std::string getStartupInstruction()  override;
+        void pathgridAdded(const QModelIndex& parent, int start, int end) override;
 
-        protected:
+        std::string getStartupInstruction() override;
 
-            void addVisibilitySelectorButtons (CSVWidget::SceneToolToggle2 *tool) override;
+    protected:
+        void addVisibilitySelectorButtons(CSVWidget::SceneToolToggle2* tool) override;
 
-        private slots:
+    private slots:
 
-            void cellDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
+        void cellDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
-            void cellRowsAboutToBeRemoved (const QModelIndex& parent, int start, int end);
+        void cellRowsAboutToBeRemoved(const QModelIndex& parent, int start, int end);
 
-            void assetTablesChanged ();
+        void assetTablesChanged();
 
-        signals:
+    signals:
 
-            void cellChanged(const CSMWorld::UniversalId& id);
+        void cellChanged(const CSMWorld::UniversalId& id);
     };
 }
 
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 11fe7c6717..ccc884bdeb 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -10,9 +10,9 @@
 
 #include <osgUtil/LineSegmentIntersector>
 
-#include "../../model/world/universalid.hpp"
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/tablemimedata.hpp"
+#include "../../model/world/universalid.hpp"
 
 #include "../../model/prefs/shortcut.hpp"
 #include "../../model/prefs/state.hpp"
@@ -20,125 +20,107 @@
 #include "../render/orbitcameramode.hpp"
 
 #include "../widget/scenetoolmode.hpp"
-#include "../widget/scenetooltoggle2.hpp"
 #include "../widget/scenetoolrun.hpp"
+#include "../widget/scenetooltoggle2.hpp"
 
-#include "object.hpp"
-#include "mask.hpp"
+#include "cameracontroller.hpp"
 #include "instancemode.hpp"
+#include "mask.hpp"
+#include "object.hpp"
 #include "pathgridmode.hpp"
-#include "cameracontroller.hpp"
 
-CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidget* parent)
-    : SceneWidget (document.getData().getResourceSystem(), parent, Qt::WindowFlags(), false)
+CSVRender::WorldspaceWidget::WorldspaceWidget(CSMDoc::Document& document, QWidget* parent)
+    : SceneWidget(document.getData().getResourceSystem(), parent, Qt::WindowFlags(), false)
     , mSceneElements(nullptr)
     , mRun(nullptr)
     , mDocument(document)
-    , mInteractionMask (0)
-    , mEditMode (nullptr)
-    , mLocked (false)
+    , mInteractionMask(0)
+    , mEditMode(nullptr)
+    , mLocked(false)
     , mDragMode(InteractionType_None)
-    , mDragging (false)
+    , mDragging(false)
     , mDragX(0)
     , mDragY(0)
     , mSpeedMode(false)
     , mDragFactor(0)
     , mDragWheelFactor(0)
     , mDragShiftFactor(0)
-    , mToolTipPos (-1, -1)
+    , mToolTipPos(-1, -1)
     , mShowToolTips(false)
     , mToolTipDelay(0)
     , mInConstructor(true)
 {
     setAcceptDrops(true);
 
-    QAbstractItemModel *referenceables =
-        document.getData().getTableModel (CSMWorld::UniversalId::Type_Referenceables);
+    QAbstractItemModel* referenceables = document.getData().getTableModel(CSMWorld::UniversalId::Type_Referenceables);
 
-    connect (referenceables, &QAbstractItemModel::dataChanged,
-        this, &WorldspaceWidget::referenceableDataChanged);
-    connect (referenceables, &QAbstractItemModel::rowsAboutToBeRemoved,
-        this, &WorldspaceWidget::referenceableAboutToBeRemoved);
-    connect (referenceables, &QAbstractItemModel::rowsInserted,
-        this, &WorldspaceWidget::referenceableAdded);
+    connect(referenceables, &QAbstractItemModel::dataChanged, this, &WorldspaceWidget::referenceableDataChanged);
+    connect(referenceables, &QAbstractItemModel::rowsAboutToBeRemoved, this,
+        &WorldspaceWidget::referenceableAboutToBeRemoved);
+    connect(referenceables, &QAbstractItemModel::rowsInserted, this, &WorldspaceWidget::referenceableAdded);
 
-    QAbstractItemModel *references =
-        document.getData().getTableModel (CSMWorld::UniversalId::Type_References);
+    QAbstractItemModel* references = document.getData().getTableModel(CSMWorld::UniversalId::Type_References);
 
-    connect (references, &QAbstractItemModel::dataChanged,
-        this, &WorldspaceWidget::referenceDataChanged);
-    connect (references, &QAbstractItemModel::rowsAboutToBeRemoved,
-        this, &WorldspaceWidget::referenceAboutToBeRemoved);
-    connect (references, &QAbstractItemModel::rowsInserted,
-        this, &WorldspaceWidget::referenceAdded);
+    connect(references, &QAbstractItemModel::dataChanged, this, &WorldspaceWidget::referenceDataChanged);
+    connect(references, &QAbstractItemModel::rowsAboutToBeRemoved, this, &WorldspaceWidget::referenceAboutToBeRemoved);
+    connect(references, &QAbstractItemModel::rowsInserted, this, &WorldspaceWidget::referenceAdded);
 
-    QAbstractItemModel *pathgrids = document.getData().getTableModel (CSMWorld::UniversalId::Type_Pathgrids);
+    QAbstractItemModel* pathgrids = document.getData().getTableModel(CSMWorld::UniversalId::Type_Pathgrids);
 
-    connect (pathgrids, &QAbstractItemModel::dataChanged,
-        this, &WorldspaceWidget::pathgridDataChanged);
-    connect (pathgrids, &QAbstractItemModel::rowsAboutToBeRemoved,
-        this, &WorldspaceWidget::pathgridAboutToBeRemoved);
-    connect (pathgrids, &QAbstractItemModel::rowsInserted,
-        this, &WorldspaceWidget::pathgridAdded);
+    connect(pathgrids, &QAbstractItemModel::dataChanged, this, &WorldspaceWidget::pathgridDataChanged);
+    connect(pathgrids, &QAbstractItemModel::rowsAboutToBeRemoved, this, &WorldspaceWidget::pathgridAboutToBeRemoved);
+    connect(pathgrids, &QAbstractItemModel::rowsInserted, this, &WorldspaceWidget::pathgridAdded);
 
-    QAbstractItemModel *debugProfiles =
-        document.getData().getTableModel (CSMWorld::UniversalId::Type_DebugProfiles);
+    QAbstractItemModel* debugProfiles = document.getData().getTableModel(CSMWorld::UniversalId::Type_DebugProfiles);
 
-    connect (debugProfiles, &QAbstractItemModel::dataChanged,
-        this, &WorldspaceWidget::debugProfileDataChanged);
-    connect (debugProfiles, &QAbstractItemModel::rowsAboutToBeRemoved,
-        this, &WorldspaceWidget::debugProfileAboutToBeRemoved);
+    connect(debugProfiles, &QAbstractItemModel::dataChanged, this, &WorldspaceWidget::debugProfileDataChanged);
+    connect(debugProfiles, &QAbstractItemModel::rowsAboutToBeRemoved, this,
+        &WorldspaceWidget::debugProfileAboutToBeRemoved);
 
-    mToolTipDelayTimer.setSingleShot (true);
-    connect (&mToolTipDelayTimer, &QTimer::timeout, this, &WorldspaceWidget::showToolTip);
+    mToolTipDelayTimer.setSingleShot(true);
+    connect(&mToolTipDelayTimer, &QTimer::timeout, this, &WorldspaceWidget::showToolTip);
 
     CSMPrefs::get()["3D Scene Input"].update();
     CSMPrefs::get()["Tooltips"].update();
 
     // Shortcuts
-    CSMPrefs::Shortcut* primaryEditShortcut = new CSMPrefs::Shortcut("scene-edit-primary", "scene-speed-modifier",
-            CSMPrefs::Shortcut::SM_Detach, this);
+    CSMPrefs::Shortcut* primaryEditShortcut
+        = new CSMPrefs::Shortcut("scene-edit-primary", "scene-speed-modifier", CSMPrefs::Shortcut::SM_Detach, this);
     CSMPrefs::Shortcut* primaryOpenShortcut = new CSMPrefs::Shortcut("scene-open-primary", this);
 
-    connect(primaryOpenShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), 
-            this, &WorldspaceWidget::primaryOpen);
-    connect(primaryEditShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), 
-            this, &WorldspaceWidget::primaryEdit);
-    connect(primaryEditShortcut, qOverload<bool>(&CSMPrefs::Shortcut::secondary), 
-            this, &WorldspaceWidget::speedMode);
+    connect(primaryOpenShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this, &WorldspaceWidget::primaryOpen);
+    connect(primaryEditShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this, &WorldspaceWidget::primaryEdit);
+    connect(primaryEditShortcut, qOverload<bool>(&CSMPrefs::Shortcut::secondary), this, &WorldspaceWidget::speedMode);
 
     CSMPrefs::Shortcut* secondaryEditShortcut = new CSMPrefs::Shortcut("scene-edit-secondary", this);
-    connect(secondaryEditShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), 
-            this, &WorldspaceWidget::secondaryEdit);
+    connect(
+        secondaryEditShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this, &WorldspaceWidget::secondaryEdit);
 
     CSMPrefs::Shortcut* primarySelectShortcut = new CSMPrefs::Shortcut("scene-select-primary", this);
-    connect(primarySelectShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), 
-            this, &WorldspaceWidget::primarySelect);
+    connect(
+        primarySelectShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this, &WorldspaceWidget::primarySelect);
 
     CSMPrefs::Shortcut* secondarySelectShortcut = new CSMPrefs::Shortcut("scene-select-secondary", this);
-    connect(secondarySelectShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), 
-            this, &WorldspaceWidget::secondarySelect);
+    connect(secondarySelectShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this,
+        &WorldspaceWidget::secondarySelect);
 
     CSMPrefs::Shortcut* abortShortcut = new CSMPrefs::Shortcut("scene-edit-abort", this);
-    connect(abortShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), 
-            this, &WorldspaceWidget::abortDrag);
+    connect(abortShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), this, &WorldspaceWidget::abortDrag);
 
     mInConstructor = false;
 }
 
-CSVRender::WorldspaceWidget::~WorldspaceWidget ()
-{
-}
+CSVRender::WorldspaceWidget::~WorldspaceWidget() {}
 
-void CSVRender::WorldspaceWidget::settingChanged (const CSMPrefs::Setting *setting)
+void CSVRender::WorldspaceWidget::settingChanged(const CSMPrefs::Setting* setting)
 {
-    if (*setting=="3D Scene Input/drag-factor")
+    if (*setting == "3D Scene Input/drag-factor")
         mDragFactor = setting->toDouble();
-    else if (*setting=="3D Scene Input/drag-wheel-factor")
+    else if (*setting == "3D Scene Input/drag-wheel-factor")
         mDragWheelFactor = setting->toDouble();
-    else if (*setting=="3D Scene Input/drag-shift-factor")
+    else if (*setting == "3D Scene Input/drag-shift-factor")
         mDragShiftFactor = setting->toDouble();
-    else if (*setting=="Rendering/object-marker-alpha" && !mInConstructor)
+    else if (*setting == "Rendering/object-marker-alpha" && !mInConstructor)
     {
         float alpha = setting->toDouble();
         // getSelection is virtual, thus this can not be called from the constructor
@@ -149,16 +131,15 @@ void CSVRender::WorldspaceWidget::settingChanged (const CSMPrefs::Setting *setti
                 objTag->mObject->setMarkerTransparency(alpha);
         }
     }
-    else if (*setting=="Tooltips/scene-delay")
+    else if (*setting == "Tooltips/scene-delay")
         mToolTipDelay = setting->toInt();
-    else if (*setting=="Tooltips/scene")
+    else if (*setting == "Tooltips/scene")
         mShowToolTips = setting->isTrue();
     else
         SceneWidget::settingChanged(setting);
 }
 
-
-void CSVRender::WorldspaceWidget::useViewHint (const std::string& hint) {}
+void CSVRender::WorldspaceWidget::useViewHint(const std::string& hint) {}
 
 void CSVRender::WorldspaceWidget::selectDefaultNavigationMode()
 {
@@ -167,25 +148,24 @@ void CSVRender::WorldspaceWidget::selectDefaultNavigationMode()
 
 void CSVRender::WorldspaceWidget::centerOrbitCameraOnSelection()
 {
-    std::vector<osg::ref_ptr<TagBase> > selection = getSelection(~0u);
+    std::vector<osg::ref_ptr<TagBase>> selection = getSelection(~0u);
 
-    for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it!=selection.end(); ++it)
+    for (std::vector<osg::ref_ptr<TagBase>>::iterator it = selection.begin(); it != selection.end(); ++it)
     {
-        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag*> (it->get()))
+        if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(it->get()))
         {
             mOrbitCamControl->setCenter(objectTag->mObject->getPosition().asVec3());
         }
     }
 }
 
-CSVWidget::SceneToolMode *CSVRender::WorldspaceWidget::makeNavigationSelector (
-    CSVWidget::SceneToolbar *parent)
+CSVWidget::SceneToolMode* CSVRender::WorldspaceWidget::makeNavigationSelector(CSVWidget::SceneToolbar* parent)
 {
-    CSVWidget::SceneToolMode *tool = new CSVWidget::SceneToolMode (parent, "Camera Mode");
+    CSVWidget::SceneToolMode* tool = new CSVWidget::SceneToolMode(parent, "Camera Mode");
 
     /// \todo replace icons
     /// \todo consider user-defined button-mapping
-    tool->addButton (":scenetoolbar/1st-person", "1st",
+    tool->addButton(":scenetoolbar/1st-person", "1st",
         "First Person"
         "<ul><li>Camera is held upright</li>"
         "<li>Mouse-Look while holding {scene-navi-primary}</li>"
@@ -194,7 +174,7 @@ CSVWidget::SceneToolMode *CSVRender::WorldspaceWidget::makeNavigationSelector (
         "<li>Mouse wheel moves the camera forward/backward</li>"
         "<li>Hold {scene-speed-modifier} to speed up movement</li>"
         "</ul>");
-    tool->addButton (":scenetoolbar/free-camera", "free",
+    tool->addButton(":scenetoolbar/free-camera", "free",
         "Free Camera"
         "<ul><li>Mouse-Look while holding {scene-navi-primary}</li>"
         "<li>Movement keys: {free-forward}(forward), {free-left}(left), {free-backward}(back), {free-right}(right)</li>"
@@ -208,131 +188,123 @@ CSVWidget::SceneToolMode *CSVRender::WorldspaceWidget::makeNavigationSelector (
             "Orbiting Camera"
             "<ul><li>Always facing the centre point</li>"
             "<li>Rotate around the centre point via {orbit-up}, {orbit-left}, {orbit-down}, {orbit-right} or by moving "
-                "the mouse while holding {scene-navi-primary}</li>"
+            "the mouse while holding {scene-navi-primary}</li>"
             "<li>Roll camera with {orbit-roll-left} and {orbit-roll-right} keys</li>"
-            "<li>Strafing (also vertically) by holding {scene-navi-secondary} (includes relocation of the centre point)</li>"
+            "<li>Strafing (also vertically) by holding {scene-navi-secondary} (includes relocation of the centre "
+            "point)</li>"
             "<li>Mouse wheel moves camera away or towards centre point but can not pass through it</li>"
             "<li>Hold {scene-speed-modifier} to speed up movement</li>"
-            "</ul>", tool),
+            "</ul>",
+            tool),
         "orbit");
 
-    connect (tool, &CSVWidget::SceneToolMode::modeChanged, 
-        this, &WorldspaceWidget::selectNavigationMode);
+    connect(tool, &CSVWidget::SceneToolMode::modeChanged, this, &WorldspaceWidget::selectNavigationMode);
 
     return tool;
 }
 
-CSVWidget::SceneToolToggle2 *CSVRender::WorldspaceWidget::makeSceneVisibilitySelector (CSVWidget::SceneToolbar *parent)
+CSVWidget::SceneToolToggle2* CSVRender::WorldspaceWidget::makeSceneVisibilitySelector(CSVWidget::SceneToolbar* parent)
 {
-    mSceneElements = new CSVWidget::SceneToolToggle2 (parent,
-        "Scene Element Visibility", ":scenetoolbar/scene-view-c", ":scenetoolbar/scene-view-");
+    mSceneElements = new CSVWidget::SceneToolToggle2(
+        parent, "Scene Element Visibility", ":scenetoolbar/scene-view-c", ":scenetoolbar/scene-view-");
 
-    addVisibilitySelectorButtons (mSceneElements);
+    addVisibilitySelectorButtons(mSceneElements);
 
-    mSceneElements->setSelectionMask (0xffffffff);
+    mSceneElements->setSelectionMask(0xffffffff);
 
-    connect (mSceneElements, &CSVWidget::SceneToolToggle2::selectionChanged,
-        this, &WorldspaceWidget::elementSelectionChanged);
+    connect(mSceneElements, &CSVWidget::SceneToolToggle2::selectionChanged, this,
+        &WorldspaceWidget::elementSelectionChanged);
 
     return mSceneElements;
 }
 
-CSVWidget::SceneToolRun *CSVRender::WorldspaceWidget::makeRunTool (
-    CSVWidget::SceneToolbar *parent)
+CSVWidget::SceneToolRun* CSVRender::WorldspaceWidget::makeRunTool(CSVWidget::SceneToolbar* parent)
 {
-    CSMWorld::IdTable& debugProfiles = dynamic_cast<CSMWorld::IdTable&> (
-        *mDocument.getData().getTableModel (CSMWorld::UniversalId::Type_DebugProfiles));
+    CSMWorld::IdTable& debugProfiles = dynamic_cast<CSMWorld::IdTable&>(
+        *mDocument.getData().getTableModel(CSMWorld::UniversalId::Type_DebugProfiles));
 
     std::vector<std::string> profiles;
 
-    int idColumn = debugProfiles.findColumnIndex (CSMWorld::Columns::ColumnId_Id);
-    int stateColumn = debugProfiles.findColumnIndex (CSMWorld::Columns::ColumnId_Modification);
-    int defaultColumn = debugProfiles.findColumnIndex (
-        CSMWorld::Columns::ColumnId_DefaultProfile);
+    int idColumn = debugProfiles.findColumnIndex(CSMWorld::Columns::ColumnId_Id);
+    int stateColumn = debugProfiles.findColumnIndex(CSMWorld::Columns::ColumnId_Modification);
+    int defaultColumn = debugProfiles.findColumnIndex(CSMWorld::Columns::ColumnId_DefaultProfile);
 
     int size = debugProfiles.rowCount();
 
-    for (int i=0; i<size; ++i)
+    for (int i = 0; i < size; ++i)
     {
-        int state = debugProfiles.data (debugProfiles.index (i, stateColumn)).toInt();
+        int state = debugProfiles.data(debugProfiles.index(i, stateColumn)).toInt();
 
-        bool default_ = debugProfiles.data (debugProfiles.index (i, defaultColumn)).toInt();
+        bool default_ = debugProfiles.data(debugProfiles.index(i, defaultColumn)).toInt();
 
-        if (state!=CSMWorld::RecordBase::State_Deleted && default_)
-            profiles.emplace_back(debugProfiles.data (debugProfiles.index (i, idColumn)).
-                toString().toUtf8().constData());
+        if (state != CSMWorld::RecordBase::State_Deleted && default_)
+            profiles.emplace_back(debugProfiles.data(debugProfiles.index(i, idColumn)).toString().toUtf8().constData());
     }
 
-    std::sort (profiles.begin(), profiles.end());
+    std::sort(profiles.begin(), profiles.end());
 
-    mRun = new CSVWidget::SceneToolRun (parent, "Run OpenMW from the current camera position",
-        ":scenetoolbar/play", profiles);
+    mRun = new CSVWidget::SceneToolRun(
+        parent, "Run OpenMW from the current camera position", ":scenetoolbar/play", profiles);
 
-    connect (mRun, &CSVWidget::SceneToolRun::runRequest,
-        this, &WorldspaceWidget::runRequest);
+    connect(mRun, &CSVWidget::SceneToolRun::runRequest, this, &WorldspaceWidget::runRequest);
 
     return mRun;
 }
 
-CSVWidget::SceneToolMode *CSVRender::WorldspaceWidget::makeEditModeSelector (
-    CSVWidget::SceneToolbar *parent)
+CSVWidget::SceneToolMode* CSVRender::WorldspaceWidget::makeEditModeSelector(CSVWidget::SceneToolbar* parent)
 {
-    mEditMode = new CSVWidget::SceneToolMode (parent, "Edit Mode");
+    mEditMode = new CSVWidget::SceneToolMode(parent, "Edit Mode");
 
-    addEditModeSelectorButtons (mEditMode);
+    addEditModeSelectorButtons(mEditMode);
 
-    connect (mEditMode, &CSVWidget::SceneToolMode::modeChanged,
-        this, &WorldspaceWidget::editModeChanged);
+    connect(mEditMode, &CSVWidget::SceneToolMode::modeChanged, this, &WorldspaceWidget::editModeChanged);
 
     return mEditMode;
 }
 
-CSVRender::WorldspaceWidget::DropType CSVRender::WorldspaceWidget::getDropType (
-    const std::vector< CSMWorld::UniversalId >& data)
+CSVRender::WorldspaceWidget::DropType CSVRender::WorldspaceWidget::getDropType(
+    const std::vector<CSMWorld::UniversalId>& data)
 {
     DropType output = Type_Other;
 
-    for (std::vector<CSMWorld::UniversalId>::const_iterator iter (data.begin());
-        iter!=data.end(); ++iter)
+    for (std::vector<CSMWorld::UniversalId>::const_iterator iter(data.begin()); iter != data.end(); ++iter)
     {
         DropType type = Type_Other;
 
-        if (iter->getType()==CSMWorld::UniversalId::Type_Cell ||
-            iter->getType()==CSMWorld::UniversalId::Type_Cell_Missing)
+        if (iter->getType() == CSMWorld::UniversalId::Type_Cell
+            || iter->getType() == CSMWorld::UniversalId::Type_Cell_Missing)
         {
-            type = iter->getId().substr (0, 1)=="#" ? Type_CellsExterior : Type_CellsInterior;
+            type = iter->getId().substr(0, 1) == "#" ? Type_CellsExterior : Type_CellsInterior;
         }
-        else if (iter->getType()==CSMWorld::UniversalId::Type_DebugProfile)
+        else if (iter->getType() == CSMWorld::UniversalId::Type_DebugProfile)
             type = Type_DebugProfile;
 
-        if (iter==data.begin())
+        if (iter == data.begin())
             output = type;
-        else if  (output!=type) // mixed types -> ignore
+        else if (output != type) // mixed types -> ignore
             return Type_Other;
     }
 
     return output;
 }
 
-CSVRender::WorldspaceWidget::dropRequirments
-    CSVRender::WorldspaceWidget::getDropRequirements (DropType type) const
+CSVRender::WorldspaceWidget::dropRequirments CSVRender::WorldspaceWidget::getDropRequirements(DropType type) const
 {
-    if (type==Type_DebugProfile)
+    if (type == Type_DebugProfile)
         return canHandle;
 
     return ignored;
 }
 
-bool CSVRender::WorldspaceWidget::handleDrop (const std::vector<CSMWorld::UniversalId>& universalIdData,
-    DropType type)
+bool CSVRender::WorldspaceWidget::handleDrop(const std::vector<CSMWorld::UniversalId>& universalIdData, DropType type)
 {
-    if (type==Type_DebugProfile)
+    if (type == Type_DebugProfile)
     {
         if (mRun)
         {
-            for (std::vector<CSMWorld::UniversalId>::const_iterator iter (universalIdData.begin());
-                iter!=universalIdData.end(); ++iter)
-                mRun->addProfile (iter->getId());
+            for (std::vector<CSMWorld::UniversalId>::const_iterator iter(universalIdData.begin());
+                 iter != universalIdData.end(); ++iter)
+                mRun->addProfile(iter->getId());
         }
 
         return true;
@@ -346,7 +318,7 @@ unsigned int CSVRender::WorldspaceWidget::getVisibilityMask() const
     return mSceneElements->getSelectionMask();
 }
 
-void CSVRender::WorldspaceWidget::setInteractionMask (unsigned int mask)
+void CSVRender::WorldspaceWidget::setInteractionMask(unsigned int mask)
 {
     mInteractionMask = mask | Mask_CellMarker | Mask_CellArrow;
 }
@@ -356,24 +328,23 @@ unsigned int CSVRender::WorldspaceWidget::getInteractionMask() const
     return mInteractionMask & getVisibilityMask();
 }
 
-void CSVRender::WorldspaceWidget::setEditLock (bool locked)
+void CSVRender::WorldspaceWidget::setEditLock(bool locked)
 {
-    dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent()).setEditLock (locked);
+    dynamic_cast<CSVRender::EditMode&>(*mEditMode->getCurrent()).setEditLock(locked);
 }
 
-void CSVRender::WorldspaceWidget::addVisibilitySelectorButtons (
-    CSVWidget::SceneToolToggle2 *tool)
+void CSVRender::WorldspaceWidget::addVisibilitySelectorButtons(CSVWidget::SceneToolToggle2* tool)
 {
-    tool->addButton (Button_Reference, Mask_Reference, "Instances");
-    tool->addButton (Button_Water, Mask_Water, "Water");
-    tool->addButton (Button_Pathgrid, Mask_Pathgrid, "Pathgrid");
+    tool->addButton(Button_Reference, Mask_Reference, "Instances");
+    tool->addButton(Button_Water, Mask_Water, "Water");
+    tool->addButton(Button_Pathgrid, Mask_Pathgrid, "Pathgrid");
 }
 
-void CSVRender::WorldspaceWidget::addEditModeSelectorButtons (CSVWidget::SceneToolMode *tool)
+void CSVRender::WorldspaceWidget::addEditModeSelectorButtons(CSVWidget::SceneToolMode* tool)
 {
     /// \todo replace EditMode with suitable subclasses
-    tool->addButton (new InstanceMode (this, mRootNode, tool), "object");
-    tool->addButton (new PathgridMode (this, tool), "pathgrid");
+    tool->addButton(new InstanceMode(this, mRootNode, tool), "object");
+    tool->addButton(new PathgridMode(this, tool), "pathgrid");
 }
 
 CSMDoc::Document& CSVRender::WorldspaceWidget::getDocument()
@@ -381,8 +352,8 @@ CSMDoc::Document& CSVRender::WorldspaceWidget::getDocument()
     return mDocument;
 }
 
-CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPoint& localPos,
-    unsigned int interactionMask) const
+CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick(
+    const QPoint& localPos, unsigned int interactionMask) const
 {
     // (0,0) is considered the lower left corner of an OpenGL window
     int x = localPos.x();
@@ -390,18 +361,18 @@ CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPo
 
     // Convert from screen space to world space
     osg::Matrixd wpvMat;
-    wpvMat.preMult (mView->getCamera()->getViewport()->computeWindowMatrix());
-    wpvMat.preMult (mView->getCamera()->getProjectionMatrix());
-    wpvMat.preMult (mView->getCamera()->getViewMatrix());
-    wpvMat = osg::Matrixd::inverse (wpvMat);
+    wpvMat.preMult(mView->getCamera()->getViewport()->computeWindowMatrix());
+    wpvMat.preMult(mView->getCamera()->getProjectionMatrix());
+    wpvMat.preMult(mView->getCamera()->getViewMatrix());
+    wpvMat = osg::Matrixd::inverse(wpvMat);
 
-    osg::Vec3d start = wpvMat.preMult (osg::Vec3d(x, y, 0));
-    osg::Vec3d end = wpvMat.preMult (osg::Vec3d(x, y, 1));
+    osg::Vec3d start = wpvMat.preMult(osg::Vec3d(x, y, 0));
+    osg::Vec3d end = wpvMat.preMult(osg::Vec3d(x, y, 1));
     osg::Vec3d direction = end - start;
 
     // Get intersection
-    osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector (new osgUtil::LineSegmentIntersector(
-        osgUtil::Intersector::MODEL, start, end));
+    osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector(
+        new osgUtil::LineSegmentIntersector(osgUtil::Intersector::MODEL, start, end));
 
     intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::NO_LIMIT);
     osgUtil::IntersectionVisitor visitor(intersector);
@@ -422,10 +393,11 @@ CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPo
             continue;
         }
 
-        for (std::vector<osg::Node*>::iterator nodeIter = intersection.nodePath.begin(); nodeIter != intersection.nodePath.end(); ++nodeIter)
+        for (std::vector<osg::Node*>::iterator nodeIter = intersection.nodePath.begin();
+             nodeIter != intersection.nodePath.end(); ++nodeIter)
         {
             osg::Node* node = *nodeIter;
-            if (osg::ref_ptr<CSVRender::TagBase> tag = dynamic_cast<CSVRender::TagBase *>(node->getUserData()))
+            if (osg::ref_ptr<CSVRender::TagBase> tag = dynamic_cast<CSVRender::TagBase*>(node->getUserData()))
             {
                 WorldspaceHitResult hit = { true, tag, 0, 0, 0, intersection.getWorldIntersectPoint() };
                 if (intersection.indexList.size() >= 3)
@@ -457,114 +429,111 @@ CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPo
     return hit;
 }
 
-CSVRender::EditMode *CSVRender::WorldspaceWidget::getEditMode()
+CSVRender::EditMode* CSVRender::WorldspaceWidget::getEditMode()
 {
-    return dynamic_cast<CSVRender::EditMode *> (mEditMode->getCurrent());
+    return dynamic_cast<CSVRender::EditMode*>(mEditMode->getCurrent());
 }
 
 void CSVRender::WorldspaceWidget::abortDrag()
 {
     if (mDragging)
     {
-        EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
+        EditMode& editMode = dynamic_cast<CSVRender::EditMode&>(*mEditMode->getCurrent());
 
         editMode.dragAborted();
         mDragMode = InteractionType_None;
     }
 }
 
-void CSVRender::WorldspaceWidget::dragEnterEvent (QDragEnterEvent* event)
+void CSVRender::WorldspaceWidget::dragEnterEvent(QDragEnterEvent* event)
 {
-    const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*> (event->mimeData());
+    const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*>(event->mimeData());
     if (!mime) // May happen when non-records (e.g. plain text) are dragged and dropped
         return;
 
-    if (mime->fromDocument (mDocument))
+    if (mime->fromDocument(mDocument))
     {
-        if (mime->holdsType (CSMWorld::UniversalId::Type_Cell) ||
-            mime->holdsType (CSMWorld::UniversalId::Type_Cell_Missing) ||
-            mime->holdsType (CSMWorld::UniversalId::Type_DebugProfile))
+        if (mime->holdsType(CSMWorld::UniversalId::Type_Cell)
+            || mime->holdsType(CSMWorld::UniversalId::Type_Cell_Missing)
+            || mime->holdsType(CSMWorld::UniversalId::Type_DebugProfile))
         {
             // These drops are handled through the subview object.
             event->accept();
         }
         else
-            dynamic_cast<EditMode&> (*mEditMode->getCurrent()).dragEnterEvent (event);
+            dynamic_cast<EditMode&>(*mEditMode->getCurrent()).dragEnterEvent(event);
     }
 }
 
-void CSVRender::WorldspaceWidget::dragMoveEvent(QDragMoveEvent *event)
+void CSVRender::WorldspaceWidget::dragMoveEvent(QDragMoveEvent* event)
 {
-    const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*> (event->mimeData());
+    const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*>(event->mimeData());
     if (!mime) // May happen when non-records (e.g. plain text) are dragged and dropped
         return;
 
-    if (mime->fromDocument (mDocument))
+    if (mime->fromDocument(mDocument))
     {
-        if (mime->holdsType (CSMWorld::UniversalId::Type_Cell) ||
-            mime->holdsType (CSMWorld::UniversalId::Type_Cell_Missing) ||
-            mime->holdsType (CSMWorld::UniversalId::Type_DebugProfile))
+        if (mime->holdsType(CSMWorld::UniversalId::Type_Cell)
+            || mime->holdsType(CSMWorld::UniversalId::Type_Cell_Missing)
+            || mime->holdsType(CSMWorld::UniversalId::Type_DebugProfile))
         {
             // These drops are handled through the subview object.
             event->accept();
         }
         else
-            dynamic_cast<EditMode&> (*mEditMode->getCurrent()).dragMoveEvent (event);
+            dynamic_cast<EditMode&>(*mEditMode->getCurrent()).dragMoveEvent(event);
     }
 }
 
-void CSVRender::WorldspaceWidget::dropEvent (QDropEvent* event)
+void CSVRender::WorldspaceWidget::dropEvent(QDropEvent* event)
 {
-    const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*> (event->mimeData());
+    const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*>(event->mimeData());
     if (!mime) // May happen when non-records (e.g. plain text) are dragged and dropped
         return;
 
-    if (mime->fromDocument (mDocument))
+    if (mime->fromDocument(mDocument))
     {
-        if (mime->holdsType (CSMWorld::UniversalId::Type_Cell) ||
-            mime->holdsType (CSMWorld::UniversalId::Type_Cell_Missing) ||
-            mime->holdsType (CSMWorld::UniversalId::Type_DebugProfile))
+        if (mime->holdsType(CSMWorld::UniversalId::Type_Cell)
+            || mime->holdsType(CSMWorld::UniversalId::Type_Cell_Missing)
+            || mime->holdsType(CSMWorld::UniversalId::Type_DebugProfile))
         {
             emit dataDropped(mime->getData());
         }
         else
-            dynamic_cast<EditMode&> (*mEditMode->getCurrent()).dropEvent (event);
+            dynamic_cast<EditMode&>(*mEditMode->getCurrent()).dropEvent(event);
     }
 }
 
-void CSVRender::WorldspaceWidget::runRequest (const std::string& profile)
+void CSVRender::WorldspaceWidget::runRequest(const std::string& profile)
 {
-    mDocument.startRunning (profile, getStartupInstruction());
+    mDocument.startRunning(profile, getStartupInstruction());
 }
 
-void CSVRender::WorldspaceWidget::debugProfileDataChanged (const QModelIndex& topLeft,
-    const QModelIndex& bottomRight)
+void CSVRender::WorldspaceWidget::debugProfileDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     if (!mRun)
         return;
 
-    CSMWorld::IdTable& debugProfiles = dynamic_cast<CSMWorld::IdTable&> (
-        *mDocument.getData().getTableModel (CSMWorld::UniversalId::Type_DebugProfiles));
+    CSMWorld::IdTable& debugProfiles = dynamic_cast<CSMWorld::IdTable&>(
+        *mDocument.getData().getTableModel(CSMWorld::UniversalId::Type_DebugProfiles));
 
-    int idColumn = debugProfiles.findColumnIndex (CSMWorld::Columns::ColumnId_Id);
-    int stateColumn = debugProfiles.findColumnIndex (CSMWorld::Columns::ColumnId_Modification);
+    int idColumn = debugProfiles.findColumnIndex(CSMWorld::Columns::ColumnId_Id);
+    int stateColumn = debugProfiles.findColumnIndex(CSMWorld::Columns::ColumnId_Modification);
 
-    for (int i=topLeft.row(); i<=bottomRight.row(); ++i)
+    for (int i = topLeft.row(); i <= bottomRight.row(); ++i)
     {
-        int state = debugProfiles.data (debugProfiles.index (i, stateColumn)).toInt();
+        int state = debugProfiles.data(debugProfiles.index(i, stateColumn)).toInt();
 
         // As of version 0.33 this case can not happen because debug profiles exist only in
         // project or session scope, which means they will never be in deleted state. But we
         // are adding the code for the sake of completeness and to avoid surprises if debug
         // profile ever get extended to content scope.
-        if (state==CSMWorld::RecordBase::State_Deleted)
-            mRun->removeProfile (debugProfiles.data (
-                debugProfiles.index (i, idColumn)).toString().toUtf8().constData());
+        if (state == CSMWorld::RecordBase::State_Deleted)
+            mRun->removeProfile(debugProfiles.data(debugProfiles.index(i, idColumn)).toString().toUtf8().constData());
     }
 }
 
-void CSVRender::WorldspaceWidget::debugProfileAboutToBeRemoved (const QModelIndex& parent,
-    int start, int end)
+void CSVRender::WorldspaceWidget::debugProfileAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
     if (parent.isValid())
         return;
@@ -572,21 +541,20 @@ void CSVRender::WorldspaceWidget::debugProfileAboutToBeRemoved (const QModelInde
     if (!mRun)
         return;
 
-    CSMWorld::IdTable& debugProfiles = dynamic_cast<CSMWorld::IdTable&> (
-        *mDocument.getData().getTableModel (CSMWorld::UniversalId::Type_DebugProfiles));
+    CSMWorld::IdTable& debugProfiles = dynamic_cast<CSMWorld::IdTable&>(
+        *mDocument.getData().getTableModel(CSMWorld::UniversalId::Type_DebugProfiles));
 
-    int idColumn = debugProfiles.findColumnIndex (CSMWorld::Columns::ColumnId_Id);
+    int idColumn = debugProfiles.findColumnIndex(CSMWorld::Columns::ColumnId_Id);
 
-    for (int i=start; i<=end; ++i)
+    for (int i = start; i <= end; ++i)
     {
-        mRun->removeProfile (debugProfiles.data (
-            debugProfiles.index (i, idColumn)).toString().toUtf8().constData());
+        mRun->removeProfile(debugProfiles.data(debugProfiles.index(i, idColumn)).toString().toUtf8().constData());
     }
 }
 
-void CSVRender::WorldspaceWidget::editModeChanged (const std::string& id)
+void CSVRender::WorldspaceWidget::editModeChanged(const std::string& id)
 {
-    dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent()).setEditLock (mLocked);
+    dynamic_cast<CSVRender::EditMode&>(*mEditMode->getCurrent()).setEditLock(mLocked);
     mDragging = false;
     mDragMode = InteractionType_None;
 }
@@ -597,7 +565,7 @@ void CSVRender::WorldspaceWidget::showToolTip()
     {
         QPoint pos = QCursor::pos();
 
-        WorldspaceHitResult hit = mousePick (mapFromGlobal (pos), getInteractionMask());
+        WorldspaceHitResult hit = mousePick(mapFromGlobal(pos), getInteractionMask());
         if (hit.tag)
         {
             bool hideBasics = CSMPrefs::get()["Tooltips"]["scene-hide-basic"].isTrue();
@@ -608,18 +576,16 @@ void CSVRender::WorldspaceWidget::showToolTip()
 
 void CSVRender::WorldspaceWidget::elementSelectionChanged()
 {
-    setVisibilityMask (getVisibilityMask());
+    setVisibilityMask(getVisibilityMask());
     flagAsModified();
     updateOverlay();
 }
 
-void CSVRender::WorldspaceWidget::updateOverlay()
-{
-}
+void CSVRender::WorldspaceWidget::updateOverlay() {}
 
-void CSVRender::WorldspaceWidget::mouseMoveEvent (QMouseEvent *event)
+void CSVRender::WorldspaceWidget::mouseMoveEvent(QMouseEvent* event)
 {
-    dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent()).mouseMoveEvent (event);
+    dynamic_cast<CSVRender::EditMode&>(*mEditMode->getCurrent()).mouseMoveEvent(event);
 
     if (mDragging)
     {
@@ -634,22 +600,22 @@ void CSVRender::WorldspaceWidget::mouseMoveEvent (QMouseEvent *event)
         if (mSpeedMode)
             factor *= mDragShiftFactor;
 
-        EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
+        EditMode& editMode = dynamic_cast<CSVRender::EditMode&>(*mEditMode->getCurrent());
 
-        editMode.drag (event->pos(), diffX, diffY, factor);
+        editMode.drag(event->pos(), diffX, diffY, factor);
     }
     else if (mDragMode != InteractionType_None)
     {
-        EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
+        EditMode& editMode = dynamic_cast<CSVRender::EditMode&>(*mEditMode->getCurrent());
 
         if (mDragMode == InteractionType_PrimaryEdit)
-            mDragging = editMode.primaryEditStartDrag (event->pos());
+            mDragging = editMode.primaryEditStartDrag(event->pos());
         else if (mDragMode == InteractionType_SecondaryEdit)
-            mDragging = editMode.secondaryEditStartDrag (event->pos());
+            mDragging = editMode.secondaryEditStartDrag(event->pos());
         else if (mDragMode == InteractionType_PrimarySelect)
-            mDragging = editMode.primarySelectStartDrag (event->pos());
+            mDragging = editMode.primarySelectStartDrag(event->pos());
         else if (mDragMode == InteractionType_SecondarySelect)
-            mDragging = editMode.secondarySelectStartDrag (event->pos());
+            mDragging = editMode.secondarySelectStartDrag(event->pos());
 
         if (mDragging)
         {
@@ -659,14 +625,14 @@ void CSVRender::WorldspaceWidget::mouseMoveEvent (QMouseEvent *event)
     }
     else
     {
-        if (event->globalPos()!=mToolTipPos)
+        if (event->globalPos() != mToolTipPos)
         {
             mToolTipPos = event->globalPos();
 
             if (mShowToolTips)
             {
                 QToolTip::hideText();
-                mToolTipDelayTimer.start (mToolTipDelay);
+                mToolTipDelayTimer.start(mToolTipDelay);
             }
         }
 
@@ -674,7 +640,7 @@ void CSVRender::WorldspaceWidget::mouseMoveEvent (QMouseEvent *event)
     }
 }
 
-void CSVRender::WorldspaceWidget::wheelEvent (QWheelEvent *event)
+void CSVRender::WorldspaceWidget::wheelEvent(QWheelEvent* event)
 {
     if (mDragging)
     {
@@ -683,27 +649,27 @@ void CSVRender::WorldspaceWidget::wheelEvent (QWheelEvent *event)
         if (mSpeedMode)
             factor *= mDragShiftFactor;
 
-        EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
-        editMode.dragWheel (event->angleDelta().y(), factor);
+        EditMode& editMode = dynamic_cast<CSVRender::EditMode&>(*mEditMode->getCurrent());
+        editMode.dragWheel(event->angleDelta().y(), factor);
     }
     else
         SceneWidget::wheelEvent(event);
 }
 
-void CSVRender::WorldspaceWidget::handleInteractionPress (const WorldspaceHitResult& hit, InteractionType type)
+void CSVRender::WorldspaceWidget::handleInteractionPress(const WorldspaceHitResult& hit, InteractionType type)
 {
-    EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
+    EditMode& editMode = dynamic_cast<CSVRender::EditMode&>(*mEditMode->getCurrent());
 
     if (type == InteractionType_PrimaryEdit)
-        editMode.primaryEditPressed (hit);
+        editMode.primaryEditPressed(hit);
     else if (type == InteractionType_SecondaryEdit)
-        editMode.secondaryEditPressed (hit);
+        editMode.secondaryEditPressed(hit);
     else if (type == InteractionType_PrimarySelect)
-        editMode.primarySelectPressed (hit);
+        editMode.primarySelectPressed(hit);
     else if (type == InteractionType_SecondarySelect)
-        editMode.secondarySelectPressed (hit);
+        editMode.secondarySelectPressed(hit);
     else if (type == InteractionType_PrimaryOpen)
-        editMode.primaryOpenPressed (hit);
+        editMode.primaryOpenPressed(hit);
 }
 
 void CSVRender::WorldspaceWidget::primaryOpen(bool activate)
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index 6e12153394..9933c9d7ab 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -45,254 +45,244 @@ namespace CSVRender
 
     class WorldspaceWidget : public SceneWidget
     {
-            Q_OBJECT
-
-            CSVWidget::SceneToolToggle2 *mSceneElements;
-            CSVWidget::SceneToolRun *mRun;
-            CSMDoc::Document& mDocument;
-            unsigned int mInteractionMask;
-            CSVWidget::SceneToolMode *mEditMode;
-            bool mLocked;
-            int mDragMode;
-            bool mDragging;
-            int mDragX;
-            int mDragY;
-            bool mSpeedMode;
-            double mDragFactor;
-            double mDragWheelFactor;
-            double mDragShiftFactor;
-            QTimer mToolTipDelayTimer;
-            QPoint mToolTipPos;
-            bool mShowToolTips;
-            int mToolTipDelay;
-            bool mInConstructor;
-
-        public:
-
-            enum DropType
-            {
-                Type_CellsInterior,
-                Type_CellsExterior,
-                Type_Other,
-                Type_DebugProfile
-            };
-
-            enum dropRequirments
-            {
-                canHandle,
-                needPaged,
-                needUnpaged,
-                ignored //either mixed cells, or not cells
-            };
+        Q_OBJECT
+
+        CSVWidget::SceneToolToggle2* mSceneElements;
+        CSVWidget::SceneToolRun* mRun;
+        CSMDoc::Document& mDocument;
+        unsigned int mInteractionMask;
+        CSVWidget::SceneToolMode* mEditMode;
+        bool mLocked;
+        int mDragMode;
+        bool mDragging;
+        int mDragX;
+        int mDragY;
+        bool mSpeedMode;
+        double mDragFactor;
+        double mDragWheelFactor;
+        double mDragShiftFactor;
+        QTimer mToolTipDelayTimer;
+        QPoint mToolTipPos;
+        bool mShowToolTips;
+        int mToolTipDelay;
+        bool mInConstructor;
+
+    public:
+        enum DropType
+        {
+            Type_CellsInterior,
+            Type_CellsExterior,
+            Type_Other,
+            Type_DebugProfile
+        };
 
-            enum InteractionType
-            {
-                InteractionType_PrimaryEdit,
-                InteractionType_PrimarySelect,
-                InteractionType_SecondaryEdit,
-                InteractionType_SecondarySelect,
-                InteractionType_PrimaryOpen,
-                InteractionType_None
-            };
+        enum dropRequirments
+        {
+            canHandle,
+            needPaged,
+            needUnpaged,
+            ignored // either mixed cells, or not cells
+        };
 
-            WorldspaceWidget (CSMDoc::Document& document, QWidget *parent = nullptr);
-            ~WorldspaceWidget ();
+        enum InteractionType
+        {
+            InteractionType_PrimaryEdit,
+            InteractionType_PrimarySelect,
+            InteractionType_SecondaryEdit,
+            InteractionType_SecondarySelect,
+            InteractionType_PrimaryOpen,
+            InteractionType_None
+        };
+
+        WorldspaceWidget(CSMDoc::Document& document, QWidget* parent = nullptr);
+        ~WorldspaceWidget();
+
+        CSVWidget::SceneToolMode* makeNavigationSelector(CSVWidget::SceneToolbar* parent);
+        ///< \attention The created tool is not added to the toolbar (via addTool). Doing that
+        /// is the responsibility of the calling function.
 
-            CSVWidget::SceneToolMode *makeNavigationSelector (CSVWidget::SceneToolbar *parent);
-            ///< \attention The created tool is not added to the toolbar (via addTool). Doing that
-            /// is the responsibility of the calling function.
+        /// \attention The created tool is not added to the toolbar (via addTool). Doing
+        /// that is the responsibility of the calling function.
+        CSVWidget::SceneToolToggle2* makeSceneVisibilitySelector(CSVWidget::SceneToolbar* parent);
 
-            /// \attention The created tool is not added to the toolbar (via addTool). Doing
-            /// that is the responsibility of the calling function.
-            CSVWidget::SceneToolToggle2 *makeSceneVisibilitySelector (
-                CSVWidget::SceneToolbar *parent);
+        /// \attention The created tool is not added to the toolbar (via addTool). Doing
+        /// that is the responsibility of the calling function.
+        CSVWidget::SceneToolRun* makeRunTool(CSVWidget::SceneToolbar* parent);
 
-            /// \attention The created tool is not added to the toolbar (via addTool). Doing
-            /// that is the responsibility of the calling function.
-            CSVWidget::SceneToolRun *makeRunTool (CSVWidget::SceneToolbar *parent);
+        /// \attention The created tool is not added to the toolbar (via addTool). Doing
+        /// that is the responsibility of the calling function.
+        CSVWidget::SceneToolMode* makeEditModeSelector(CSVWidget::SceneToolbar* parent);
 
-            /// \attention The created tool is not added to the toolbar (via addTool). Doing
-            /// that is the responsibility of the calling function.
-            CSVWidget::SceneToolMode *makeEditModeSelector (CSVWidget::SceneToolbar *parent);
+        void selectDefaultNavigationMode();
 
-            void selectDefaultNavigationMode();
+        void centerOrbitCameraOnSelection();
 
-            void centerOrbitCameraOnSelection();
+        static DropType getDropType(const std::vector<CSMWorld::UniversalId>& data);
 
-            static DropType getDropType(const std::vector<CSMWorld::UniversalId>& data);
+        virtual dropRequirments getDropRequirements(DropType type) const;
 
-            virtual dropRequirments getDropRequirements(DropType type) const;
+        virtual void useViewHint(const std::string& hint);
+        ///< Default-implementation: ignored.
 
-            virtual void useViewHint (const std::string& hint);
-            ///< Default-implementation: ignored.
+        /// \return Drop handled?
+        virtual bool handleDrop(const std::vector<CSMWorld::UniversalId>& data, DropType type);
 
-            /// \return Drop handled?
-            virtual bool handleDrop (const std::vector<CSMWorld::UniversalId>& data,
-                DropType type);
+        virtual unsigned int getVisibilityMask() const;
 
-            virtual unsigned int getVisibilityMask() const;
+        /// \note This function will implicitly add elements that are independent of the
+        /// selected edit mode.
+        virtual void setInteractionMask(unsigned int mask);
 
-            /// \note This function will implicitly add elements that are independent of the
-            /// selected edit mode.
-            virtual void setInteractionMask (unsigned int mask);
+        /// \note This function will only return those elements that are both visible and
+        /// marked for interaction.
+        unsigned int getInteractionMask() const;
 
-            /// \note This function will only return those elements that are both visible and
-            /// marked for interaction.
-            unsigned int getInteractionMask() const;
+        virtual void setEditLock(bool locked);
 
-            virtual void setEditLock (bool locked);
+        CSMDoc::Document& getDocument();
 
-            CSMDoc::Document& getDocument();
+        /// \param elementMask Elements to be affected by the clear operation
+        virtual void clearSelection(int elementMask) = 0;
 
-            /// \param elementMask Elements to be affected by the clear operation
-            virtual void clearSelection (int elementMask) = 0;
+        /// \param elementMask Elements to be affected by the select operation
+        virtual void invertSelection(int elementMask) = 0;
 
-            /// \param elementMask Elements to be affected by the select operation
-            virtual void invertSelection (int elementMask) = 0;
+        /// \param elementMask Elements to be affected by the select operation
+        virtual void selectAll(int elementMask) = 0;
 
-            /// \param elementMask Elements to be affected by the select operation
-            virtual void selectAll (int elementMask) = 0;
+        // Select everything that references the same ID as at least one of the elements
+        // already selected
+        //
+        /// \param elementMask Elements to be affected by the select operation
+        virtual void selectAllWithSameParentId(int elementMask) = 0;
 
-            // Select everything that references the same ID as at least one of the elements
-            // already selected
-            //
-            /// \param elementMask Elements to be affected by the select operation
-            virtual void selectAllWithSameParentId (int elementMask) = 0;
+        virtual void selectInsideCube(const osg::Vec3d& pointA, const osg::Vec3d& pointB, DragMode dragMode) = 0;
 
-            virtual void selectInsideCube(const osg::Vec3d& pointA, const osg::Vec3d& pointB, DragMode dragMode) = 0;
+        virtual void selectWithinDistance(const osg::Vec3d& point, float distance, DragMode dragMode) = 0;
 
-            virtual void selectWithinDistance(const osg::Vec3d& point, float distance, DragMode dragMode) = 0;
+        /// Return the next intersection with scene elements matched by
+        /// \a interactionMask based on \a localPos and the camera vector.
+        /// If there is no such intersection, instead a point "in front" of \a localPos will be
+        /// returned.
+        WorldspaceHitResult mousePick(const QPoint& localPos, unsigned int interactionMask) const;
 
-            /// Return the next intersection with scene elements matched by
-            /// \a interactionMask based on \a localPos and the camera vector.
-            /// If there is no such intersection, instead a point "in front" of \a localPos will be
-            /// returned.
-            WorldspaceHitResult mousePick (const QPoint& localPos, unsigned int interactionMask) const;
+        virtual std::string getCellId(const osg::Vec3f& point) const = 0;
 
-            virtual std::string getCellId (const osg::Vec3f& point) const = 0;
+        /// \note Returns the cell if it exists, otherwise a null pointer
+        virtual Cell* getCell(const osg::Vec3d& point) const = 0;
 
-            /// \note Returns the cell if it exists, otherwise a null pointer
-            virtual Cell* getCell(const osg::Vec3d& point) const = 0;
+        virtual Cell* getCell(const CSMWorld::CellCoordinates& coords) const = 0;
 
-            virtual Cell* getCell(const CSMWorld::CellCoordinates& coords) const = 0;
+        virtual std::vector<osg::ref_ptr<TagBase>> getSelection(unsigned int elementMask) const = 0;
 
-            virtual std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask)
-                const = 0;
+        virtual std::vector<osg::ref_ptr<TagBase>> getEdited(unsigned int elementMask) const = 0;
 
-            virtual std::vector<osg::ref_ptr<TagBase> > getEdited (unsigned int elementMask)
-                const = 0;
+        virtual void setSubMode(int subMode, unsigned int elementMask) = 0;
 
-            virtual void setSubMode (int subMode, unsigned int elementMask) = 0;
+        /// Erase all overrides and restore the visual representation to its true state.
+        virtual void reset(unsigned int elementMask) = 0;
 
-            /// Erase all overrides and restore the visual representation to its true state.
-            virtual void reset (unsigned int elementMask) = 0;
+        EditMode* getEditMode();
 
-            EditMode *getEditMode();
+    protected:
+        /// Visual elements in a scene
+        /// @note do not change the enumeration values, they are used in pre-existing button file names!
+        enum ButtonId
+        {
+            Button_Reference = 0x1,
+            Button_Pathgrid = 0x2,
+            Button_Water = 0x4,
+            Button_Fog = 0x8,
+            Button_Terrain = 0x10
+        };
 
-        protected:
+        virtual void addVisibilitySelectorButtons(CSVWidget::SceneToolToggle2* tool);
 
-            /// Visual elements in a scene
-            /// @note do not change the enumeration values, they are used in pre-existing button file names!
-            enum ButtonId
-            {
-                Button_Reference = 0x1,
-                Button_Pathgrid = 0x2,
-                Button_Water = 0x4,
-                Button_Fog = 0x8,
-                Button_Terrain = 0x10
-            };
+        virtual void addEditModeSelectorButtons(CSVWidget::SceneToolMode* tool);
 
-            virtual void addVisibilitySelectorButtons (CSVWidget::SceneToolToggle2 *tool);
+        virtual void updateOverlay();
 
-            virtual void addEditModeSelectorButtons (CSVWidget::SceneToolMode *tool);
+        void mouseMoveEvent(QMouseEvent* event) override;
+        void wheelEvent(QWheelEvent* event) override;
 
-            virtual void updateOverlay();
+        virtual void handleInteractionPress(const WorldspaceHitResult& hit, InteractionType type);
 
-            void mouseMoveEvent (QMouseEvent *event) override;
-            void wheelEvent (QWheelEvent *event) override;
+        void settingChanged(const CSMPrefs::Setting* setting) override;
 
-            virtual void handleInteractionPress (const WorldspaceHitResult& hit, InteractionType type);
+        bool getSpeedMode();
 
-            void settingChanged (const CSMPrefs::Setting *setting) override;
+    private:
+        void dragEnterEvent(QDragEnterEvent* event) override;
 
-            bool getSpeedMode();
+        void dropEvent(QDropEvent* event) override;
 
-        private:
+        void dragMoveEvent(QDragMoveEvent* event) override;
 
-            void dragEnterEvent(QDragEnterEvent *event) override;
+        virtual std::string getStartupInstruction() = 0;
 
-            void dropEvent(QDropEvent* event) override;
+        void handleInteraction(InteractionType type, bool activate);
 
-            void dragMoveEvent(QDragMoveEvent *event) override;
+    public slots:
 
-            virtual std::string getStartupInstruction() = 0;
+        /// \note Drags will be automatically aborted when the aborting is triggered
+        /// (either explicitly or implicitly) from within this class. This function only
+        /// needs to be called, when the drag abort is triggered externally (e.g. from
+        /// an edit mode).
+        void abortDrag();
 
-            void handleInteraction(InteractionType type, bool activate);
+    private slots:
 
-        public slots:
+        virtual void referenceableDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight) = 0;
 
-            /// \note Drags will be automatically aborted when the aborting is triggered
-            /// (either explicitly or implicitly) from within this class. This function only
-            /// needs to be called, when the drag abort is triggered externally (e.g. from
-            /// an edit mode).
-            void abortDrag();
+        virtual void referenceableAboutToBeRemoved(const QModelIndex& parent, int start, int end) = 0;
 
-        private slots:
+        virtual void referenceableAdded(const QModelIndex& index, int start, int end) = 0;
 
-            virtual void referenceableDataChanged (const QModelIndex& topLeft,
-                const QModelIndex& bottomRight) = 0;
+        virtual void referenceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight) = 0;
 
-            virtual void referenceableAboutToBeRemoved (const QModelIndex& parent, int start, int end) = 0;
+        virtual void referenceAboutToBeRemoved(const QModelIndex& parent, int start, int end) = 0;
 
-            virtual void referenceableAdded (const QModelIndex& index, int start, int end) = 0;
+        virtual void referenceAdded(const QModelIndex& index, int start, int end) = 0;
 
-            virtual void referenceDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight) = 0;
+        virtual void pathgridDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight) = 0;
 
-            virtual void referenceAboutToBeRemoved (const QModelIndex& parent, int start, int end) = 0;
+        virtual void pathgridAboutToBeRemoved(const QModelIndex& parent, int start, int end) = 0;
 
-            virtual void referenceAdded (const QModelIndex& index, int start, int end) = 0;
+        virtual void pathgridAdded(const QModelIndex& parent, int start, int end) = 0;
 
-            virtual void pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight) = 0;
+        virtual void runRequest(const std::string& profile);
 
-            virtual void pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end) = 0;
+        void debugProfileDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
-            virtual void pathgridAdded (const QModelIndex& parent, int start, int end) = 0;
+        void debugProfileAboutToBeRemoved(const QModelIndex& parent, int start, int end);
 
+        void editModeChanged(const std::string& id);
 
-            virtual void runRequest (const std::string& profile);
+        void showToolTip();
 
-            void debugProfileDataChanged (const QModelIndex& topLeft,
-                const QModelIndex& bottomRight);
+        void primaryOpen(bool activate);
 
-            void debugProfileAboutToBeRemoved (const QModelIndex& parent, int start, int end);
+        void primaryEdit(bool activate);
 
-            void editModeChanged (const std::string& id);
+        void secondaryEdit(bool activate);
 
-            void showToolTip();
+        void primarySelect(bool activate);
 
-            void primaryOpen(bool activate);
+        void secondarySelect(bool activate);
 
-            void primaryEdit(bool activate);
+        void speedMode(bool activate);
 
-            void secondaryEdit(bool activate);
+    protected slots:
 
-            void primarySelect(bool activate);
+        void elementSelectionChanged();
 
-            void secondarySelect(bool activate);
+    signals:
 
-            void speedMode(bool activate);
+        void closeRequest();
 
-        protected slots:
+        void dataDropped(const std::vector<CSMWorld::UniversalId>& data);
 
-            void elementSelectionChanged();
-
-        signals:
-
-            void closeRequest();
-
-            void dataDropped(const std::vector<CSMWorld::UniversalId>& data);
-
-            void requestFocus (const std::string& id);
+        void requestFocus(const std::string& id);
 
         friend class MouseState;
     };
diff --git a/apps/opencs/view/tools/merge.cpp b/apps/opencs/view/tools/merge.cpp
index 35f4b6c1d0..43c182368e 100644
--- a/apps/opencs/view/tools/merge.cpp
+++ b/apps/opencs/view/tools/merge.cpp
@@ -16,104 +16,105 @@
 #include "../../model/doc/documentmanager.hpp"
 #include "../../model/doc/state.hpp"
 
-#include "../doc/filewidget.hpp"
 #include "../doc/adjusterwidget.hpp"
+#include "../doc/filewidget.hpp"
 
-void CSVTools::Merge::keyPressEvent (QKeyEvent *event)
+void CSVTools::Merge::keyPressEvent(QKeyEvent* event)
 {
-    if (event->key()==Qt::Key_Escape)
+    if (event->key() == Qt::Key_Escape)
     {
         event->accept();
         cancel();
     }
     else
-        QWidget::keyPressEvent (event);
+        QWidget::keyPressEvent(event);
 }
 
-CSVTools::Merge::Merge (CSMDoc::DocumentManager& documentManager, QWidget *parent)
-: QWidget (parent), mDocument (nullptr), mDocumentManager (documentManager)
+CSVTools::Merge::Merge(CSMDoc::DocumentManager& documentManager, QWidget* parent)
+    : QWidget(parent)
+    , mDocument(nullptr)
+    , mDocumentManager(documentManager)
 {
-    setWindowTitle ("Merge Content Files into a new Game File");
+    setWindowTitle("Merge Content Files into a new Game File");
 
-    QVBoxLayout *mainLayout = new QVBoxLayout;
-    setLayout (mainLayout);
+    QVBoxLayout* mainLayout = new QVBoxLayout;
+    setLayout(mainLayout);
 
-    QSplitter *splitter = new QSplitter (Qt::Horizontal, this);
+    QSplitter* splitter = new QSplitter(Qt::Horizontal, this);
 
-    mainLayout->addWidget (splitter, 1);
+    mainLayout->addWidget(splitter, 1);
 
     // left panel (files to be merged)
-    QWidget *left = new QWidget (this);
-    left->setContentsMargins (0, 0, 0, 0);
-    splitter->addWidget (left);
+    QWidget* left = new QWidget(this);
+    left->setContentsMargins(0, 0, 0, 0);
+    splitter->addWidget(left);
 
-    QVBoxLayout *leftLayout = new QVBoxLayout;
-    left->setLayout (leftLayout);
+    QVBoxLayout* leftLayout = new QVBoxLayout;
+    left->setLayout(leftLayout);
 
-    leftLayout->addWidget (new QLabel ("Files to be merged", this));
+    leftLayout->addWidget(new QLabel("Files to be merged", this));
 
-    mFiles = new QListWidget (this);
-    leftLayout->addWidget (mFiles, 1);
+    mFiles = new QListWidget(this);
+    leftLayout->addWidget(mFiles, 1);
 
     // right panel (new game file)
-    QWidget *right = new QWidget (this);
-    right->setContentsMargins (0, 0, 0, 0);
-    splitter->addWidget (right);
+    QWidget* right = new QWidget(this);
+    right->setContentsMargins(0, 0, 0, 0);
+    splitter->addWidget(right);
 
-    QVBoxLayout *rightLayout = new QVBoxLayout;
-    rightLayout->setAlignment (Qt::AlignTop);
-    right->setLayout (rightLayout);
+    QVBoxLayout* rightLayout = new QVBoxLayout;
+    rightLayout->setAlignment(Qt::AlignTop);
+    right->setLayout(rightLayout);
 
-    rightLayout->addWidget (new QLabel ("New game file", this));
+    rightLayout->addWidget(new QLabel("New game file", this));
 
-    mNewFile = new CSVDoc::FileWidget (this);
-    mNewFile->setType (false);
-    mNewFile->extensionLabelIsVisible (true);
-    rightLayout->addWidget (mNewFile);
+    mNewFile = new CSVDoc::FileWidget(this);
+    mNewFile->setType(false);
+    mNewFile->extensionLabelIsVisible(true);
+    rightLayout->addWidget(mNewFile);
 
-    mAdjuster = new CSVDoc::AdjusterWidget (this);
+    mAdjuster = new CSVDoc::AdjusterWidget(this);
 
-    rightLayout->addWidget (mAdjuster);
+    rightLayout->addWidget(mAdjuster);
 
-    connect (mNewFile, &CSVDoc::FileWidget::nameChanged, mAdjuster, &CSVDoc::AdjusterWidget::setName);
-    connect (mAdjuster,  &CSVDoc::AdjusterWidget::stateChanged, this, &Merge::stateChanged);
+    connect(mNewFile, &CSVDoc::FileWidget::nameChanged, mAdjuster, &CSVDoc::AdjusterWidget::setName);
+    connect(mAdjuster, &CSVDoc::AdjusterWidget::stateChanged, this, &Merge::stateChanged);
 
     // buttons
-    QDialogButtonBox *buttons = new QDialogButtonBox (QDialogButtonBox::Cancel, Qt::Horizontal, this);
+    QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Cancel, Qt::Horizontal, this);
 
-    connect (buttons->button(QDialogButtonBox::Cancel), &QPushButton::clicked, this, &Merge::cancel);
+    connect(buttons->button(QDialogButtonBox::Cancel), &QPushButton::clicked, this, &Merge::cancel);
 
-    mOkay = new QPushButton ("Merge", this);
-    connect (mOkay, &QPushButton::clicked, this, &Merge::accept);
-    mOkay->setDefault (true);
-    buttons->addButton (mOkay, QDialogButtonBox::AcceptRole);
+    mOkay = new QPushButton("Merge", this);
+    connect(mOkay, &QPushButton::clicked, this, &Merge::accept);
+    mOkay->setDefault(true);
+    buttons->addButton(mOkay, QDialogButtonBox::AcceptRole);
 
-    mainLayout->addWidget (buttons);
+    mainLayout->addWidget(buttons);
 }
 
-void CSVTools::Merge::configure (CSMDoc::Document *document)
+void CSVTools::Merge::configure(CSMDoc::Document* document)
 {
     mDocument = document;
 
-    mNewFile->setName ("");
+    mNewFile->setName("");
 
     // content files
     while (mFiles->count())
-        delete mFiles->takeItem (0);
+        delete mFiles->takeItem(0);
 
     std::vector<std::filesystem::path> files = document->getContentFiles();
 
-    for (std::vector<std::filesystem::path>::const_iterator iter (files.begin());
-        iter!=files.end(); ++iter)
-        mFiles->addItem (Files::pathToQString(iter->filename()));
+    for (std::vector<std::filesystem::path>::const_iterator iter(files.begin()); iter != files.end(); ++iter)
+        mFiles->addItem(Files::pathToQString(iter->filename()));
 }
 
-void CSVTools::Merge::setLocalData (const std::filesystem::path& localData)
+void CSVTools::Merge::setLocalData(const std::filesystem::path& localData)
 {
-    mAdjuster->setLocalData (localData);
+    mAdjuster->setLocalData(localData);
 }
 
-CSMDoc::Document *CSVTools::Merge::getDocument() const
+CSMDoc::Document* CSVTools::Merge::getDocument() const
 {
     return mDocument;
 }
@@ -126,20 +127,19 @@ void CSVTools::Merge::cancel()
 
 void CSVTools::Merge::accept()
 {
-    if ((mDocument->getState() & CSMDoc::State_Merging)==0)
+    if ((mDocument->getState() & CSMDoc::State_Merging) == 0)
     {
-        std::vector< std::filesystem::path > files { mAdjuster->getPath() };
+        std::vector<std::filesystem::path> files{ mAdjuster->getPath() };
 
-        std::unique_ptr<CSMDoc::Document> target (
-            mDocumentManager.makeDocument (files, files[0], true));
+        std::unique_ptr<CSMDoc::Document> target(mDocumentManager.makeDocument(files, files[0], true));
 
-        mDocument->runMerge (std::move(target));
+        mDocument->runMerge(std::move(target));
 
         hide();
     }
 }
 
-void CSVTools::Merge::stateChanged (bool valid)
+void CSVTools::Merge::stateChanged(bool valid)
 {
-    mOkay->setEnabled (valid);
+    mOkay->setEnabled(valid);
 }
diff --git a/apps/opencs/view/tools/merge.hpp b/apps/opencs/view/tools/merge.hpp
index 51633c5bb4..cfb36d2613 100644
--- a/apps/opencs/view/tools/merge.hpp
+++ b/apps/opencs/view/tools/merge.hpp
@@ -24,37 +24,36 @@ namespace CSVTools
 {
     class Merge : public QWidget
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            CSMDoc::Document *mDocument;
-            QPushButton *mOkay;
-            QListWidget *mFiles;
-            CSVDoc::FileWidget *mNewFile;
-            CSVDoc::AdjusterWidget *mAdjuster;
-            CSMDoc::DocumentManager& mDocumentManager;
+        CSMDoc::Document* mDocument;
+        QPushButton* mOkay;
+        QListWidget* mFiles;
+        CSVDoc::FileWidget* mNewFile;
+        CSVDoc::AdjusterWidget* mAdjuster;
+        CSMDoc::DocumentManager& mDocumentManager;
 
-            void keyPressEvent (QKeyEvent *event) override;
+        void keyPressEvent(QKeyEvent* event) override;
 
-        public:
+    public:
+        Merge(CSMDoc::DocumentManager& documentManager, QWidget* parent = nullptr);
 
-            Merge (CSMDoc::DocumentManager& documentManager, QWidget *parent = nullptr);
+        /// Configure dialogue for a new merge
+        void configure(CSMDoc::Document* document);
 
-            /// Configure dialogue for a new merge
-            void configure (CSMDoc::Document *document);
+        void setLocalData(const std::filesystem::path& localData);
 
-            void setLocalData (const std::filesystem::path& localData);
+        CSMDoc::Document* getDocument() const;
 
-            CSMDoc::Document *getDocument() const;
+    public slots:
 
-        public slots:
+        void cancel();
 
-            void cancel();
+    private slots:
 
-        private slots:
+        void accept();
 
-            void accept();
-
-            void stateChanged (bool valid);
+        void stateChanged(bool valid);
     };
 }
 
diff --git a/apps/opencs/view/tools/reportsubview.cpp b/apps/opencs/view/tools/reportsubview.cpp
index c505ce7e31..d55217bf8e 100644
--- a/apps/opencs/view/tools/reportsubview.cpp
+++ b/apps/opencs/view/tools/reportsubview.cpp
@@ -2,28 +2,30 @@
 
 #include "reporttable.hpp"
 
-#include "../../model/doc/state.hpp"
 #include "../../model/doc/document.hpp"
+#include "../../model/doc/state.hpp"
 
-CSVTools::ReportSubView::ReportSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
-: CSVDoc::SubView (id), mDocument (document), mRefreshState (0)
+CSVTools::ReportSubView::ReportSubView(const CSMWorld::UniversalId& id, CSMDoc::Document& document)
+    : CSVDoc::SubView(id)
+    , mDocument(document)
+    , mRefreshState(0)
 {
-    if (id.getType()==CSMWorld::UniversalId::Type_VerificationResults)
+    if (id.getType() == CSMWorld::UniversalId::Type_VerificationResults)
         mRefreshState = CSMDoc::State_Verifying;
 
-    setWidget (mTable = new ReportTable (document, id, false, mRefreshState, this));
+    setWidget(mTable = new ReportTable(document, id, false, mRefreshState, this));
+
+    connect(mTable, &ReportTable::editRequest, this, &ReportSubView::focusId);
 
-    connect (mTable, &ReportTable::editRequest, this, &ReportSubView::focusId);
-    
-    if (mRefreshState==CSMDoc::State_Verifying)
+    if (mRefreshState == CSMDoc::State_Verifying)
     {
-        connect (mTable, &ReportTable::refreshRequest, this, &ReportSubView::refreshRequest);
+        connect(mTable, &ReportTable::refreshRequest, this, &ReportSubView::refreshRequest);
 
-        connect (&document, &CSMDoc::Document::stateChanged, mTable, &ReportTable::stateChanged);
+        connect(&document, &CSMDoc::Document::stateChanged, mTable, &ReportTable::stateChanged);
     }
 }
 
-void CSVTools::ReportSubView::setEditLock (bool locked)
+void CSVTools::ReportSubView::setEditLock(bool locked)
 {
     // ignored. We don't change document state anyway.
 }
@@ -32,10 +34,10 @@ void CSVTools::ReportSubView::refreshRequest()
 {
     if (!(mDocument.getState() & mRefreshState))
     {
-        if (mRefreshState==CSMDoc::State_Verifying)
+        if (mRefreshState == CSMDoc::State_Verifying)
         {
             mTable->clear();
-            mDocument.verify (getUniversalId());
+            mDocument.verify(getUniversalId());
         }
     }
 }
diff --git a/apps/opencs/view/tools/reportsubview.hpp b/apps/opencs/view/tools/reportsubview.hpp
index 6d48690b43..ea07098fba 100644
--- a/apps/opencs/view/tools/reportsubview.hpp
+++ b/apps/opencs/view/tools/reportsubview.hpp
@@ -17,21 +17,20 @@ namespace CSVTools
 
     class ReportSubView : public CSVDoc::SubView
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            ReportTable *mTable;
-            CSMDoc::Document& mDocument;
-            int mRefreshState;
+        ReportTable* mTable;
+        CSMDoc::Document& mDocument;
+        int mRefreshState;
 
-        public:
+    public:
+        ReportSubView(const CSMWorld::UniversalId& id, CSMDoc::Document& document);
 
-            ReportSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document);
+        void setEditLock(bool locked) override;
 
-            void setEditLock (bool locked) override;
+    private slots:
 
-        private slots:
-
-            void refreshRequest();
+        void refreshRequest();
     };
 }
 
diff --git a/apps/opencs/view/tools/reporttable.cpp b/apps/opencs/view/tools/reporttable.cpp
index 4c61c574cd..25276bba62 100644
--- a/apps/opencs/view/tools/reporttable.cpp
+++ b/apps/opencs/view/tools/reporttable.cpp
@@ -2,20 +2,20 @@
 
 #include <algorithm>
 
-#include <QHeaderView>
 #include <QAction>
-#include <QMenu>
-#include <QStyledItemDelegate>
-#include <QTextDocument>
-#include <QPainter>
 #include <QContextMenuEvent>
+#include <QHeaderView>
+#include <QMenu>
 #include <QMouseEvent>
+#include <QPainter>
 #include <QSortFilterProxyModel>
+#include <QStyledItemDelegate>
+#include <QTextDocument>
 
 #include "../../model/tools/reportmodel.hpp"
 
-#include "../../model/prefs/state.hpp"
 #include "../../model/prefs/shortcut.hpp"
+#include "../../model/prefs/state.hpp"
 
 #include "../../view/world/idtypedelegate.hpp"
 
@@ -23,52 +23,50 @@ namespace CSVTools
 {
     class RichTextDelegate : public QStyledItemDelegate
     {
-        public:
+    public:
+        RichTextDelegate(QObject* parent = nullptr);
 
-            RichTextDelegate (QObject *parent = nullptr);
-
-            void paint(QPainter *painter, const QStyleOptionViewItem& option,
-                const QModelIndex& index) const override;
+        void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
     };
 }
 
-CSVTools::RichTextDelegate::RichTextDelegate (QObject *parent) : QStyledItemDelegate (parent)
-{}
+CSVTools::RichTextDelegate::RichTextDelegate(QObject* parent)
+    : QStyledItemDelegate(parent)
+{
+}
 
-void CSVTools::RichTextDelegate::paint(QPainter *painter, const QStyleOptionViewItem& option,
-    const QModelIndex& index) const
+void CSVTools::RichTextDelegate::paint(
+    QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
     QTextDocument document;
-    QVariant value = index.data (Qt::DisplayRole);
+    QVariant value = index.data(Qt::DisplayRole);
     if (value.isValid() && !value.isNull())
     {
-        document.setHtml (value.toString());
-        painter->translate (option.rect.topLeft());
-        document.drawContents (painter);
-        painter->translate (-option.rect.topLeft());
+        document.setHtml(value.toString());
+        painter->translate(option.rect.topLeft());
+        document.drawContents(painter);
+        painter->translate(-option.rect.topLeft());
     }
 }
 
-
-void CSVTools::ReportTable::contextMenuEvent (QContextMenuEvent *event)
+void CSVTools::ReportTable::contextMenuEvent(QContextMenuEvent* event)
 {
     QModelIndexList selectedRows = selectionModel()->selectedRows();
 
     // create context menu
-    QMenu menu (this);
+    QMenu menu(this);
 
     if (!selectedRows.empty())
     {
-        menu.addAction (mShowAction);
-        menu.addAction (mRemoveAction);
+        menu.addAction(mShowAction);
+        menu.addAction(mRemoveAction);
 
         bool found = false;
-        for (QModelIndexList::const_iterator iter (selectedRows.begin());
-            iter!=selectedRows.end(); ++iter)
+        for (QModelIndexList::const_iterator iter(selectedRows.begin()); iter != selectedRows.end(); ++iter)
         {
-            QString hint = mProxyModel->data (mProxyModel->index (iter->row(), 2)).toString();
+            QString hint = mProxyModel->data(mProxyModel->index(iter->row(), 2)).toString();
 
-            if (!hint.isEmpty() && hint[0]=='R')
+            if (!hint.isEmpty() && hint[0] == 'R')
             {
                 found = true;
                 break;
@@ -76,35 +74,33 @@ void CSVTools::ReportTable::contextMenuEvent (QContextMenuEvent *event)
         }
 
         if (found)
-            menu.addAction (mReplaceAction);
+            menu.addAction(mReplaceAction);
     }
 
     if (mRefreshAction)
-        menu.addAction (mRefreshAction);
+        menu.addAction(mRefreshAction);
 
-    menu.exec (event->globalPos());
+    menu.exec(event->globalPos());
 }
 
-void CSVTools::ReportTable::mouseMoveEvent (QMouseEvent *event)
+void CSVTools::ReportTable::mouseMoveEvent(QMouseEvent* event)
 {
     if (event->buttons() & Qt::LeftButton)
-        startDragFromTable (*this);
+        startDragFromTable(*this);
 }
 
-void CSVTools::ReportTable::mouseDoubleClickEvent (QMouseEvent *event)
+void CSVTools::ReportTable::mouseDoubleClickEvent(QMouseEvent* event)
 {
-    Qt::KeyboardModifiers modifiers =
-        event->modifiers() & (Qt::ShiftModifier | Qt::ControlModifier);
+    Qt::KeyboardModifiers modifiers = event->modifiers() & (Qt::ShiftModifier | Qt::ControlModifier);
 
     QModelIndex index = currentIndex();
 
-    selectionModel()->select (index,
-        QItemSelectionModel::Clear | QItemSelectionModel::Select | QItemSelectionModel::Rows);
+    selectionModel()->select(
+        index, QItemSelectionModel::Clear | QItemSelectionModel::Select | QItemSelectionModel::Rows);
 
-    std::map<Qt::KeyboardModifiers, DoubleClickAction>::iterator iter =
-        mDoubleClickActions.find (modifiers);
+    std::map<Qt::KeyboardModifiers, DoubleClickAction>::iterator iter = mDoubleClickActions.find(modifiers);
 
-    if (iter==mDoubleClickActions.end())
+    if (iter == mDoubleClickActions.end())
     {
         event->accept();
         return;
@@ -138,69 +134,68 @@ void CSVTools::ReportTable::mouseDoubleClickEvent (QMouseEvent *event)
     }
 }
 
-CSVTools::ReportTable::ReportTable (CSMDoc::Document& document,
-    const CSMWorld::UniversalId& id, bool richTextDescription, int refreshState,
-    QWidget *parent)
-: CSVWorld::DragRecordTable (document, parent), mModel (document.getReport (id)),
-  mRefreshAction (nullptr), mRefreshState (refreshState)
+CSVTools::ReportTable::ReportTable(CSMDoc::Document& document, const CSMWorld::UniversalId& id,
+    bool richTextDescription, int refreshState, QWidget* parent)
+    : CSVWorld::DragRecordTable(document, parent)
+    , mModel(document.getReport(id))
+    , mRefreshAction(nullptr)
+    , mRefreshState(refreshState)
 {
-    horizontalHeader()->setSectionResizeMode (QHeaderView::Interactive);
-    horizontalHeader()->setStretchLastSection (true);
+    horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
+    horizontalHeader()->setStretchLastSection(true);
     verticalHeader()->hide();
-    setSortingEnabled (true);
-    setSelectionBehavior (QAbstractItemView::SelectRows);
-    setSelectionMode (QAbstractItemView::ExtendedSelection);
+    setSortingEnabled(true);
+    setSelectionBehavior(QAbstractItemView::SelectRows);
+    setSelectionMode(QAbstractItemView::ExtendedSelection);
 
-    mProxyModel = new QSortFilterProxyModel (this);
+    mProxyModel = new QSortFilterProxyModel(this);
     mProxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
-    mProxyModel->setSourceModel (mModel);
+    mProxyModel->setSourceModel(mModel);
     mProxyModel->setSortRole(Qt::UserRole);
 
-    setModel (mProxyModel);
-    setColumnHidden (2, true);
+    setModel(mProxyModel);
+    setColumnHidden(2, true);
 
-    mIdTypeDelegate = CSVWorld::IdTypeDelegateFactory().makeDelegate (nullptr,
-        mDocument, this);
+    mIdTypeDelegate = CSVWorld::IdTypeDelegateFactory().makeDelegate(nullptr, mDocument, this);
 
-    setItemDelegateForColumn (0, mIdTypeDelegate);
+    setItemDelegateForColumn(0, mIdTypeDelegate);
 
     if (richTextDescription)
-        setItemDelegateForColumn (mModel->columnCount()-1, new RichTextDelegate (this));
+        setItemDelegateForColumn(mModel->columnCount() - 1, new RichTextDelegate(this));
 
-    mShowAction = new QAction (tr ("Show"), this);
-    connect (mShowAction, &QAction::triggered, this, &ReportTable::showSelection);
-    addAction (mShowAction);
+    mShowAction = new QAction(tr("Show"), this);
+    connect(mShowAction, &QAction::triggered, this, &ReportTable::showSelection);
+    addAction(mShowAction);
     CSMPrefs::Shortcut* showShortcut = new CSMPrefs::Shortcut("reporttable-show", this);
     showShortcut->associateAction(mShowAction);
 
-    mRemoveAction = new QAction (tr ("Remove from list"), this);
-    connect (mRemoveAction, &QAction::triggered, this, &ReportTable::removeSelection);
-    addAction (mRemoveAction);
+    mRemoveAction = new QAction(tr("Remove from list"), this);
+    connect(mRemoveAction, &QAction::triggered, this, &ReportTable::removeSelection);
+    addAction(mRemoveAction);
     CSMPrefs::Shortcut* removeShortcut = new CSMPrefs::Shortcut("reporttable-remove", this);
     removeShortcut->associateAction(mRemoveAction);
 
-    mReplaceAction = new QAction (tr ("Replace"), this);
-    connect (mReplaceAction, &QAction::triggered, this, &ReportTable::replaceRequest);
-    addAction (mReplaceAction);
+    mReplaceAction = new QAction(tr("Replace"), this);
+    connect(mReplaceAction, &QAction::triggered, this, &ReportTable::replaceRequest);
+    addAction(mReplaceAction);
     CSMPrefs::Shortcut* replaceShortcut = new CSMPrefs::Shortcut("reporttable-replace", this);
     replaceShortcut->associateAction(mReplaceAction);
 
     if (mRefreshState)
     {
-        mRefreshAction = new QAction (tr ("Refresh"), this);
-        mRefreshAction->setEnabled (!(mDocument.getState() & mRefreshState));
-        connect (mRefreshAction, &QAction::triggered, this, &ReportTable::refreshRequest);
-        addAction (mRefreshAction);
+        mRefreshAction = new QAction(tr("Refresh"), this);
+        mRefreshAction->setEnabled(!(mDocument.getState() & mRefreshState));
+        connect(mRefreshAction, &QAction::triggered, this, &ReportTable::refreshRequest);
+        addAction(mRefreshAction);
         CSMPrefs::Shortcut* refreshShortcut = new CSMPrefs::Shortcut("reporttable-refresh", this);
         refreshShortcut->associateAction(mRefreshAction);
     }
 
-    mDoubleClickActions.insert (std::make_pair (Qt::NoModifier, Action_Edit));
-    mDoubleClickActions.insert (std::make_pair (Qt::ShiftModifier, Action_Remove));
-    mDoubleClickActions.insert (std::make_pair (Qt::ControlModifier, Action_EditAndRemove));
+    mDoubleClickActions.insert(std::make_pair(Qt::NoModifier, Action_Edit));
+    mDoubleClickActions.insert(std::make_pair(Qt::ShiftModifier, Action_Remove));
+    mDoubleClickActions.insert(std::make_pair(Qt::ControlModifier, Action_EditAndRemove));
 
-    connect (&CSMPrefs::State::get(), &CSMPrefs::State::settingChanged, 
-        this, &ReportTable::settingChanged);
+    connect(&CSMPrefs::State::get(), &CSMPrefs::State::settingChanged, this, &ReportTable::settingChanged);
     CSMPrefs::get()["Reports"].update();
 }
 
@@ -210,16 +205,15 @@ std::vector<CSMWorld::UniversalId> CSVTools::ReportTable::getDraggedRecords() co
 
     QModelIndexList selectedRows = selectionModel()->selectedRows();
 
-    for (QModelIndexList::const_iterator iter (selectedRows.begin()); iter!=selectedRows.end();
-        ++iter)
+    for (QModelIndexList::const_iterator iter(selectedRows.begin()); iter != selectedRows.end(); ++iter)
     {
-        ids.push_back (mModel->getUniversalId (mProxyModel->mapToSource (*iter).row()));
+        ids.push_back(mModel->getUniversalId(mProxyModel->mapToSource(*iter).row()));
     }
 
     return ids;
 }
 
-std::vector<int> CSVTools::ReportTable::getReplaceIndices (bool selection) const
+std::vector<int> CSVTools::ReportTable::getReplaceIndices(bool selection) const
 {
     std::vector<int> indices;
 
@@ -229,68 +223,67 @@ std::vector<int> CSVTools::ReportTable::getReplaceIndices (bool selection) const
 
         std::vector<int> rows;
 
-        for (QModelIndexList::const_iterator iter (selectedRows.begin()); iter!=selectedRows.end();
-            ++iter)
+        for (QModelIndexList::const_iterator iter(selectedRows.begin()); iter != selectedRows.end(); ++iter)
         {
-            rows.push_back (mProxyModel->mapToSource (*iter).row());
+            rows.push_back(mProxyModel->mapToSource(*iter).row());
         }
 
-        std::sort (rows.begin(), rows.end());
+        std::sort(rows.begin(), rows.end());
 
-        for (std::vector<int>::const_iterator iter (rows.begin()); iter!=rows.end(); ++iter)
+        for (std::vector<int>::const_iterator iter(rows.begin()); iter != rows.end(); ++iter)
         {
-            QString hint = mModel->data (mModel->index (*iter, 2)).toString();
+            QString hint = mModel->data(mModel->index(*iter, 2)).toString();
 
-            if (!hint.isEmpty() && hint[0]=='R')
-                indices.push_back (*iter);
+            if (!hint.isEmpty() && hint[0] == 'R')
+                indices.push_back(*iter);
         }
     }
     else
     {
-        for (int i=0; i<mModel->rowCount(); ++i)
+        for (int i = 0; i < mModel->rowCount(); ++i)
         {
-            QString hint = mModel->data (mModel->index (i, 2)).toString();
+            QString hint = mModel->data(mModel->index(i, 2)).toString();
 
-            if (!hint.isEmpty() && hint[0]=='R')
-                indices.push_back (i);
+            if (!hint.isEmpty() && hint[0] == 'R')
+                indices.push_back(i);
         }
     }
 
     return indices;
 }
 
-void CSVTools::ReportTable::flagAsReplaced (int index)
+void CSVTools::ReportTable::flagAsReplaced(int index)
 {
-    mModel->flagAsReplaced (index);
+    mModel->flagAsReplaced(index);
 }
 
-void CSVTools::ReportTable::settingChanged (const CSMPrefs::Setting *setting)
+void CSVTools::ReportTable::settingChanged(const CSMPrefs::Setting* setting)
 {
-    if (setting->getParent()->getKey()=="Reports")
+    if (setting->getParent()->getKey() == "Reports")
     {
-        QString base ("double");
+        QString base("double");
         QString key = setting->getKey().c_str();
-        if (key.startsWith (base))
+        if (key.startsWith(base))
         {
-            QString modifierString = key.mid (base.size());
+            QString modifierString = key.mid(base.size());
             Qt::KeyboardModifiers modifiers;
 
-            if (modifierString=="-s")
+            if (modifierString == "-s")
                 modifiers = Qt::ShiftModifier;
-            else if (modifierString=="-c")
+            else if (modifierString == "-c")
                 modifiers = Qt::ControlModifier;
-            else if (modifierString=="-sc")
+            else if (modifierString == "-sc")
                 modifiers = Qt::ShiftModifier | Qt::ControlModifier;
 
             DoubleClickAction action = Action_None;
 
             std::string value = setting->toString();
 
-            if (value=="Edit")
+            if (value == "Edit")
                 action = Action_Edit;
-            else if (value=="Remove")
+            else if (value == "Remove")
                 action = Action_Remove;
-            else if (value=="Edit And Remove")
+            else if (value == "Edit And Remove")
                 action = Action_EditAndRemove;
 
             mDoubleClickActions[modifiers] = action;
@@ -298,19 +291,18 @@ void CSVTools::ReportTable::settingChanged (const CSMPrefs::Setting *setting)
             return;
         }
     }
-    else if (*setting=="Records/type-format")
-        mIdTypeDelegate->settingChanged (setting);
+    else if (*setting == "Records/type-format")
+        mIdTypeDelegate->settingChanged(setting);
 }
 
 void CSVTools::ReportTable::showSelection()
 {
     QModelIndexList selectedRows = selectionModel()->selectedRows();
 
-    for (QModelIndexList::const_iterator iter (selectedRows.begin()); iter!=selectedRows.end();
-        ++iter)
+    for (QModelIndexList::const_iterator iter(selectedRows.begin()); iter != selectedRows.end(); ++iter)
     {
-        int row = mProxyModel->mapToSource (*iter).row();
-        emit editRequest (mModel->getUniversalId (row), mModel->getHint (row));
+        int row = mProxyModel->mapToSource(*iter).row();
+        emit editRequest(mModel->getUniversalId(row), mModel->getHint(row));
     }
 }
 
@@ -320,16 +312,15 @@ void CSVTools::ReportTable::removeSelection()
 
     std::vector<int> rows;
 
-    for (QModelIndexList::iterator iter (selectedRows.begin()); iter!=selectedRows.end();
-        ++iter)
+    for (QModelIndexList::iterator iter(selectedRows.begin()); iter != selectedRows.end(); ++iter)
     {
-        rows.push_back (mProxyModel->mapToSource (*iter).row());
+        rows.push_back(mProxyModel->mapToSource(*iter).row());
     }
 
-    std::sort (rows.begin(), rows.end());
+    std::sort(rows.begin(), rows.end());
 
-    for (std::vector<int>::const_reverse_iterator iter (rows.rbegin()); iter!=rows.rend(); ++iter)
-        mProxyModel->removeRows (*iter, 1);
+    for (std::vector<int>::const_reverse_iterator iter(rows.rbegin()); iter != rows.rend(); ++iter)
+        mProxyModel->removeRows(*iter, 1);
 
     selectionModel()->clear();
 }
@@ -339,8 +330,8 @@ void CSVTools::ReportTable::clear()
     mModel->clear();
 }
 
-void CSVTools::ReportTable::stateChanged (int state, CSMDoc::Document *document)
+void CSVTools::ReportTable::stateChanged(int state, CSMDoc::Document* document)
 {
     if (mRefreshAction)
-        mRefreshAction->setEnabled (!(state & mRefreshState));
+        mRefreshAction->setEnabled(!(state & mRefreshState));
 }
diff --git a/apps/opencs/view/tools/reporttable.hpp b/apps/opencs/view/tools/reporttable.hpp
index f39dd6f857..a65d06456f 100644
--- a/apps/opencs/view/tools/reporttable.hpp
+++ b/apps/opencs/view/tools/reporttable.hpp
@@ -27,76 +27,74 @@ namespace CSVTools
 {
     class ReportTable : public CSVWorld::DragRecordTable
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            enum DoubleClickAction
-            {
-                Action_None,
-                Action_Edit,
-                Action_Remove,
-                Action_EditAndRemove
-            };
+        enum DoubleClickAction
+        {
+            Action_None,
+            Action_Edit,
+            Action_Remove,
+            Action_EditAndRemove
+        };
 
-            QSortFilterProxyModel *mProxyModel;
-            CSMTools::ReportModel *mModel;
-            CSVWorld::CommandDelegate *mIdTypeDelegate;
-            QAction *mShowAction;
-            QAction *mRemoveAction;
-            QAction *mReplaceAction;
-            QAction *mRefreshAction;
-            std::map<Qt::KeyboardModifiers, DoubleClickAction> mDoubleClickActions;
-            int mRefreshState;
+        QSortFilterProxyModel* mProxyModel;
+        CSMTools::ReportModel* mModel;
+        CSVWorld::CommandDelegate* mIdTypeDelegate;
+        QAction* mShowAction;
+        QAction* mRemoveAction;
+        QAction* mReplaceAction;
+        QAction* mRefreshAction;
+        std::map<Qt::KeyboardModifiers, DoubleClickAction> mDoubleClickActions;
+        int mRefreshState;
 
-        private:
+    private:
+        void contextMenuEvent(QContextMenuEvent* event) override;
 
-            void contextMenuEvent (QContextMenuEvent *event) override;
+        void mouseMoveEvent(QMouseEvent* event) override;
 
-            void mouseMoveEvent (QMouseEvent *event) override;
+        void mouseDoubleClickEvent(QMouseEvent* event) override;
 
-            void mouseDoubleClickEvent (QMouseEvent *event) override;
+    public:
+        /// \param richTextDescription Use rich text in the description column.
+        /// \param refreshState Document state to check for refresh function. If value is
+        /// 0 no refresh function exists. If the document current has the specified state
+        /// the refresh function is disabled.
+        ReportTable(CSMDoc::Document& document, const CSMWorld::UniversalId& id, bool richTextDescription,
+            int refreshState = 0, QWidget* parent = nullptr);
 
-        public:
+        std::vector<CSMWorld::UniversalId> getDraggedRecords() const override;
 
-            /// \param richTextDescription Use rich text in the description column.
-            /// \param refreshState Document state to check for refresh function. If value is
-            /// 0 no refresh function exists. If the document current has the specified state
-            /// the refresh function is disabled.
-            ReportTable (CSMDoc::Document& document, const CSMWorld::UniversalId& id,
-                bool richTextDescription, int refreshState = 0, QWidget *parent = nullptr);
+        void clear();
 
-            std::vector<CSMWorld::UniversalId> getDraggedRecords() const override;
+        /// Return indices of rows that are suitable for replacement.
+        ///
+        /// \param selection Only list selected rows.
+        ///
+        /// \return rows in the original model
+        std::vector<int> getReplaceIndices(bool selection) const;
 
-            void clear();
+        /// \param index row in the original model
+        void flagAsReplaced(int index);
 
-            /// Return indices of rows that are suitable for replacement.
-            ///
-            /// \param selection Only list selected rows.
-            ///
-            /// \return rows in the original model
-            std::vector<int> getReplaceIndices (bool selection) const;
+    private slots:
 
-            /// \param index row in the original model
-            void flagAsReplaced (int index);
+        void settingChanged(const CSMPrefs::Setting* setting);
 
-        private slots:
+        void showSelection();
 
-            void settingChanged (const CSMPrefs::Setting *setting);
+        void removeSelection();
 
-            void showSelection();
+    public slots:
 
-            void removeSelection();
+        void stateChanged(int state, CSMDoc::Document* document);
 
-        public slots:
+    signals:
 
-            void stateChanged (int state, CSMDoc::Document *document);
+        void editRequest(const CSMWorld::UniversalId& id, const std::string& hint);
 
-        signals:
+        void replaceRequest();
 
-            void editRequest (const CSMWorld::UniversalId& id, const std::string& hint);
-
-            void replaceRequest();
-
-            void refreshRequest();
+        void refreshRequest();
     };
 }
 
diff --git a/apps/opencs/view/tools/searchbox.cpp b/apps/opencs/view/tools/searchbox.cpp
index 880060ac25..0235d10b31 100644
--- a/apps/opencs/view/tools/searchbox.cpp
+++ b/apps/opencs/view/tools/searchbox.cpp
@@ -11,7 +11,7 @@
 void CSVTools::SearchBox::updateSearchButton()
 {
     if (!mSearchEnabled)
-        mSearch.setEnabled (false);
+        mSearch.setEnabled(false);
     else
     {
         switch (mMode.currentIndex())
@@ -21,75 +21,77 @@ void CSVTools::SearchBox::updateSearchButton()
             case 2:
             case 3:
 
-                mSearch.setEnabled (!mText.text().isEmpty());
+                mSearch.setEnabled(!mText.text().isEmpty());
                 break;
 
             case 4:
 
-                mSearch.setEnabled (true);
+                mSearch.setEnabled(true);
                 break;
         }
     }
 }
 
-CSVTools::SearchBox::SearchBox (QWidget *parent)
-: QWidget (parent), mSearch (tr("Search")), mSearchEnabled (false), mReplace (tr("Replace All"))
+CSVTools::SearchBox::SearchBox(QWidget* parent)
+    : QWidget(parent)
+    , mSearch(tr("Search"))
+    , mSearchEnabled(false)
+    , mReplace(tr("Replace All"))
 {
-    mLayout = new QGridLayout (this);
+    mLayout = new QGridLayout(this);
 
     // search panel
-    std::vector<std::pair<int,std::string>> states =
-        CSMWorld::Columns::getEnums (CSMWorld::Columns::ColumnId_Modification);
-    states.resize (states.size()-1); // ignore erased state
+    std::vector<std::pair<int, std::string>> states
+        = CSMWorld::Columns::getEnums(CSMWorld::Columns::ColumnId_Modification);
+    states.resize(states.size() - 1); // ignore erased state
 
-    for (std::vector<std::pair<int,std::string>>::const_iterator iter (states.begin()); iter!=states.end();
-        ++iter)
-        mRecordState.addItem (QString::fromUtf8 (iter->second.c_str()));
+    for (std::vector<std::pair<int, std::string>>::const_iterator iter(states.begin()); iter != states.end(); ++iter)
+        mRecordState.addItem(QString::fromUtf8(iter->second.c_str()));
 
-    mMode.addItem (tr("Text"));
-    mMode.addItem (tr("Text (RegEx)"));
-    mMode.addItem (tr("ID"));
-    mMode.addItem (tr("ID (RegEx)"));
-    mMode.addItem (tr("Record State"));
-    connect (&mMode, qOverload<int>(&QComboBox::activated), this, &SearchBox::modeSelected);
-    mLayout->addWidget (&mMode, 0, 0);
+    mMode.addItem(tr("Text"));
+    mMode.addItem(tr("Text (RegEx)"));
+    mMode.addItem(tr("ID"));
+    mMode.addItem(tr("ID (RegEx)"));
+    mMode.addItem(tr("Record State"));
+    connect(&mMode, qOverload<int>(&QComboBox::activated), this, &SearchBox::modeSelected);
+    mLayout->addWidget(&mMode, 0, 0);
 
-    connect (&mText, &QLineEdit::textChanged, this, &SearchBox::textChanged);
-    connect (&mText, &QLineEdit::returnPressed, this, [this](){ this->startSearch(false); });
-    mInput.insertWidget (0, &mText);
+    connect(&mText, &QLineEdit::textChanged, this, &SearchBox::textChanged);
+    connect(&mText, &QLineEdit::returnPressed, this, [this]() { this->startSearch(false); });
+    mInput.insertWidget(0, &mText);
 
-    mInput.insertWidget (1, &mRecordState);
-    mLayout->addWidget (&mInput, 0, 1);
+    mInput.insertWidget(1, &mRecordState);
+    mLayout->addWidget(&mInput, 0, 1);
 
-    mCaseSensitive.setText (tr ("Case"));
-    mLayout->addWidget (&mCaseSensitive, 0, 2);
+    mCaseSensitive.setText(tr("Case"));
+    mLayout->addWidget(&mCaseSensitive, 0, 2);
 
-    connect (&mSearch, &QPushButton::clicked, this, qOverload<bool>(&SearchBox::startSearch));
-    mLayout->addWidget (&mSearch, 0, 3);
+    connect(&mSearch, &QPushButton::clicked, this, qOverload<bool>(&SearchBox::startSearch));
+    mLayout->addWidget(&mSearch, 0, 3);
 
     // replace panel
-    mReplaceInput.insertWidget (0, &mReplaceText);
-    mReplaceInput.insertWidget (1, &mReplacePlaceholder);
+    mReplaceInput.insertWidget(0, &mReplaceText);
+    mReplaceInput.insertWidget(1, &mReplacePlaceholder);
 
-    mLayout->addWidget (&mReplaceInput, 1, 1);
+    mLayout->addWidget(&mReplaceInput, 1, 1);
 
-    mLayout->addWidget (&mReplace, 1, 3);
+    mLayout->addWidget(&mReplace, 1, 3);
 
     // layout adjustments
-    mLayout->setColumnMinimumWidth (2, 50);
-    mLayout->setColumnStretch (1, 1);
+    mLayout->setColumnMinimumWidth(2, 50);
+    mLayout->setColumnStretch(1, 1);
 
-    mLayout->setContentsMargins (0, 0, 0, 0);
+    mLayout->setContentsMargins(0, 0, 0, 0);
 
-    connect (&mReplace, &QPushButton::clicked, this, qOverload<bool>(&SearchBox::replaceAll));
+    connect(&mReplace, &QPushButton::clicked, this, qOverload<bool>(&SearchBox::replaceAll));
 
     // update
-    modeSelected (0);
+    modeSelected(0);
 
     updateSearchButton();
 }
 
-void CSVTools::SearchBox::setSearchMode (bool enabled)
+void CSVTools::SearchBox::setSearchMode(bool enabled)
 {
     mSearchEnabled = enabled;
     updateSearchButton();
@@ -97,7 +99,7 @@ void CSVTools::SearchBox::setSearchMode (bool enabled)
 
 CSMTools::Search CSVTools::SearchBox::getSearch() const
 {
-    CSMTools::Search::Type type = static_cast<CSMTools::Search::Type> (mMode.currentIndex());
+    CSMTools::Search::Type type = static_cast<CSMTools::Search::Type>(mMode.currentIndex());
     bool caseSensitive = mCaseSensitive.isChecked();
 
     switch (type)
@@ -105,28 +107,28 @@ CSMTools::Search CSVTools::SearchBox::getSearch() const
         case CSMTools::Search::Type_Text:
         case CSMTools::Search::Type_Id:
 
-            return CSMTools::Search (type, caseSensitive, std::string (mText.text().toUtf8().data()));
+            return CSMTools::Search(type, caseSensitive, std::string(mText.text().toUtf8().data()));
 
         case CSMTools::Search::Type_TextRegEx:
         case CSMTools::Search::Type_IdRegEx:
 
-            return CSMTools::Search (type, caseSensitive, QRegExp (mText.text().toUtf8().data(), Qt::CaseInsensitive));
+            return CSMTools::Search(type, caseSensitive, QRegExp(mText.text().toUtf8().data(), Qt::CaseInsensitive));
 
         case CSMTools::Search::Type_RecordState:
 
-            return CSMTools::Search (type, caseSensitive, mRecordState.currentIndex());
+            return CSMTools::Search(type, caseSensitive, mRecordState.currentIndex());
 
         case CSMTools::Search::Type_None:
 
             break;
     }
 
-    throw std::logic_error ("invalid search mode index");
+    throw std::logic_error("invalid search mode index");
 }
 
 std::string CSVTools::SearchBox::getReplaceText() const
 {
-    CSMTools::Search::Type type = static_cast<CSMTools::Search::Type> (mMode.currentIndex());
+    CSMTools::Search::Type type = static_cast<CSMTools::Search::Type>(mMode.currentIndex());
 
     switch (type)
     {
@@ -139,13 +141,13 @@ std::string CSVTools::SearchBox::getReplaceText() const
 
         default:
 
-            throw std::logic_error ("Invalid search mode for replace");
+            throw std::logic_error("Invalid search mode for replace");
     }
 }
 
-void CSVTools::SearchBox::setEditLock (bool locked)
+void CSVTools::SearchBox::setEditLock(bool locked)
 {
-    mReplace.setEnabled (!locked);
+    mReplace.setEnabled(!locked);
 }
 
 void CSVTools::SearchBox::focus()
@@ -153,7 +155,7 @@ void CSVTools::SearchBox::focus()
     mInput.currentWidget()->setFocus();
 }
 
-void CSVTools::SearchBox::modeSelected (int index)
+void CSVTools::SearchBox::modeSelected(int index)
 {
     switch (index)
     {
@@ -162,13 +164,13 @@ void CSVTools::SearchBox::modeSelected (int index)
         case CSMTools::Search::Type_Id:
         case CSMTools::Search::Type_IdRegEx:
 
-            mInput.setCurrentIndex (0);
-            mReplaceInput.setCurrentIndex (0);
+            mInput.setCurrentIndex(0);
+            mReplaceInput.setCurrentIndex(0);
             break;
 
         case CSMTools::Search::Type_RecordState:
-            mInput.setCurrentIndex (1);
-            mReplaceInput.setCurrentIndex (1);
+            mInput.setCurrentIndex(1);
+            mReplaceInput.setCurrentIndex(1);
             break;
     }
 
@@ -177,18 +179,18 @@ void CSVTools::SearchBox::modeSelected (int index)
     updateSearchButton();
 }
 
-void CSVTools::SearchBox::textChanged (const QString& text)
+void CSVTools::SearchBox::textChanged(const QString& text)
 {
     updateSearchButton();
 }
 
-void CSVTools::SearchBox::startSearch (bool checked)
+void CSVTools::SearchBox::startSearch(bool checked)
 {
     if (mSearch.isEnabled())
-        emit startSearch (getSearch());
+        emit startSearch(getSearch());
 }
 
-void CSVTools::SearchBox::replaceAll (bool checked)
+void CSVTools::SearchBox::replaceAll(bool checked)
 {
     emit replaceAll();
 }
diff --git a/apps/opencs/view/tools/searchbox.hpp b/apps/opencs/view/tools/searchbox.hpp
index cbeb150d8b..76712fee4b 100644
--- a/apps/opencs/view/tools/searchbox.hpp
+++ b/apps/opencs/view/tools/searchbox.hpp
@@ -1,13 +1,13 @@
 #ifndef CSV_TOOLS_SEARCHBOX_H
 #define CSV_TOOLS_SEARCHBOX_H
 
-#include <QWidget>
-#include <QLineEdit>
-#include <QComboBox>
 #include <QCheckBox>
-#include <QStackedWidget>
-#include <QPushButton>
+#include <QComboBox>
 #include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QStackedWidget>
+#include <QWidget>
 
 class QGridLayout;
 
@@ -20,54 +20,52 @@ namespace CSVTools
 {
     class SearchBox : public QWidget
     {
-            Q_OBJECT
-
-            QStackedWidget mInput;
-            QLineEdit mText;
-            QComboBox mRecordState;
-            QCheckBox mCaseSensitive;
-            QPushButton mSearch;
-            QGridLayout *mLayout;
-            QComboBox mMode;
-            bool mSearchEnabled;
-            QStackedWidget mReplaceInput;
-            QLineEdit mReplaceText;
-            QLabel mReplacePlaceholder;
-            QPushButton mReplace;
+        Q_OBJECT
 
-        private:
+        QStackedWidget mInput;
+        QLineEdit mText;
+        QComboBox mRecordState;
+        QCheckBox mCaseSensitive;
+        QPushButton mSearch;
+        QGridLayout* mLayout;
+        QComboBox mMode;
+        bool mSearchEnabled;
+        QStackedWidget mReplaceInput;
+        QLineEdit mReplaceText;
+        QLabel mReplacePlaceholder;
+        QPushButton mReplace;
 
-            void updateSearchButton();
-            
-        public:
+    private:
+        void updateSearchButton();
 
-            SearchBox (QWidget *parent = nullptr);
+    public:
+        SearchBox(QWidget* parent = nullptr);
 
-            void setSearchMode (bool enabled);
+        void setSearchMode(bool enabled);
 
-            CSMTools::Search getSearch() const;
+        CSMTools::Search getSearch() const;
 
-            std::string getReplaceText() const;
+        std::string getReplaceText() const;
 
-            void setEditLock (bool locked);
+        void setEditLock(bool locked);
 
-            void focus();
+        void focus();
 
-        private slots:
+    private slots:
 
-            void modeSelected (int index);
+        void modeSelected(int index);
 
-            void textChanged (const QString& text);
+        void textChanged(const QString& text);
 
-            void startSearch (bool checked = true);
+        void startSearch(bool checked = true);
 
-            void replaceAll (bool checked);
+        void replaceAll(bool checked);
 
-        signals:
+    signals:
 
-            void startSearch (const CSMTools::Search& search);
+        void startSearch(const CSMTools::Search& search);
 
-            void replaceAll();
+        void replaceAll();
     };
 }
 
diff --git a/apps/opencs/view/tools/searchsubview.cpp b/apps/opencs/view/tools/searchsubview.cpp
index 64e0e133d0..8567384e97 100644
--- a/apps/opencs/view/tools/searchsubview.cpp
+++ b/apps/opencs/view/tools/searchsubview.cpp
@@ -4,158 +4,153 @@
 
 #include "../../model/doc/document.hpp"
 #include "../../model/doc/state.hpp"
-#include "../../model/tools/search.hpp"
+#include "../../model/prefs/state.hpp"
 #include "../../model/tools/reportmodel.hpp"
+#include "../../model/tools/search.hpp"
 #include "../../model/world/idtablebase.hpp"
-#include "../../model/prefs/state.hpp"
 
-#include "../world/tablebottombox.hpp"
 #include "../world/creator.hpp"
+#include "../world/tablebottombox.hpp"
 
 #include "reporttable.hpp"
 #include "searchbox.hpp"
 
-void CSVTools::SearchSubView::replace (bool selection)
+void CSVTools::SearchSubView::replace(bool selection)
 {
     if (mLocked)
         return;
 
-    std::vector<int> indices = mTable->getReplaceIndices (selection);
+    std::vector<int> indices = mTable->getReplaceIndices(selection);
 
     std::string replace = mSearchBox.getReplaceText();
 
-    const CSMTools::ReportModel& model =
-        dynamic_cast<const CSMTools::ReportModel&> (*mTable->model());
+    const CSMTools::ReportModel& model = dynamic_cast<const CSMTools::ReportModel&>(*mTable->model());
 
     bool autoDelete = CSMPrefs::get()["Search & Replace"]["auto-delete"].isTrue();
 
-    CSMTools::Search search (mSearch);
-    CSMWorld::IdTableBase *currentTable = nullptr;
+    CSMTools::Search search(mSearch);
+    CSMWorld::IdTableBase* currentTable = nullptr;
 
     // We are running through the indices in reverse order to avoid messing up multiple results
     // in a single string.
-    for (std::vector<int>::const_reverse_iterator iter (indices.rbegin()); iter!=indices.rend(); ++iter)
+    for (std::vector<int>::const_reverse_iterator iter(indices.rbegin()); iter != indices.rend(); ++iter)
     {
-        const CSMWorld::UniversalId& id = model.getUniversalId (*iter);
+        const CSMWorld::UniversalId& id = model.getUniversalId(*iter);
 
-        CSMWorld::UniversalId::Type type = CSMWorld::UniversalId::getParentType (id.getType());
+        CSMWorld::UniversalId::Type type = CSMWorld::UniversalId::getParentType(id.getType());
 
-        CSMWorld::IdTableBase *table = &dynamic_cast<CSMWorld::IdTableBase&> (
-            *mDocument.getData().getTableModel (type));
+        CSMWorld::IdTableBase* table = &dynamic_cast<CSMWorld::IdTableBase&>(*mDocument.getData().getTableModel(type));
 
-        if (table!=currentTable)
+        if (table != currentTable)
         {
-            search.configure (table);
+            search.configure(table);
             currentTable = table;
         }
 
-        std::string hint = model.getHint (*iter);
+        std::string hint = model.getHint(*iter);
 
-        if (search.verify (mDocument, table, id, hint))
+        if (search.verify(mDocument, table, id, hint))
         {
-            search.replace (mDocument, table, id, hint, replace);
-            mTable->flagAsReplaced (*iter);
+            search.replace(mDocument, table, id, hint, replace);
+            mTable->flagAsReplaced(*iter);
 
             if (autoDelete)
-                mTable->model()->removeRows (*iter, 1);
+                mTable->model()->removeRows(*iter, 1);
         }
     }
 }
 
-void CSVTools::SearchSubView::showEvent (QShowEvent *event)
+void CSVTools::SearchSubView::showEvent(QShowEvent* event)
 {
-    CSVDoc::SubView::showEvent (event);
+    CSVDoc::SubView::showEvent(event);
     mSearchBox.focus();
 }
 
-CSVTools::SearchSubView::SearchSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
-: CSVDoc::SubView (id), mDocument (document), mLocked (false)
+CSVTools::SearchSubView::SearchSubView(const CSMWorld::UniversalId& id, CSMDoc::Document& document)
+    : CSVDoc::SubView(id)
+    , mDocument(document)
+    , mLocked(false)
 {
-    QVBoxLayout *layout = new QVBoxLayout;
+    QVBoxLayout* layout = new QVBoxLayout;
 
-    layout->addWidget (&mSearchBox);
+    layout->addWidget(&mSearchBox);
 
-    layout->addWidget (mTable = new ReportTable (document, id, true), 2);
+    layout->addWidget(mTable = new ReportTable(document, id, true), 2);
 
-    layout->addWidget (mBottom =
-        new CSVWorld::TableBottomBox (CSVWorld::NullCreatorFactory(), document, id, this), 0);
+    layout->addWidget(mBottom = new CSVWorld::TableBottomBox(CSVWorld::NullCreatorFactory(), document, id, this), 0);
 
-    QWidget *widget = new QWidget;
+    QWidget* widget = new QWidget;
 
-    widget->setLayout (layout);
+    widget->setLayout(layout);
 
-    setWidget (widget);
+    setWidget(widget);
 
-    stateChanged (document.getState(), &document);
+    stateChanged(document.getState(), &document);
 
-    connect (mTable, &ReportTable::editRequest, this, &SearchSubView::focusId);
+    connect(mTable, &ReportTable::editRequest, this, &SearchSubView::focusId);
 
-    connect (mTable, &ReportTable::replaceRequest, this, &SearchSubView::replaceRequest);
+    connect(mTable, &ReportTable::replaceRequest, this, &SearchSubView::replaceRequest);
 
-    connect (&document, &CSMDoc::Document::stateChanged, this, &SearchSubView::stateChanged);
+    connect(&document, &CSMDoc::Document::stateChanged, this, &SearchSubView::stateChanged);
 
-    connect (&mSearchBox, qOverload<const CSMTools::Search&>(&SearchBox::startSearch),
-        this, &SearchSubView::startSearch);
+    connect(
+        &mSearchBox, qOverload<const CSMTools::Search&>(&SearchBox::startSearch), this, &SearchSubView::startSearch);
 
-    connect (&mSearchBox, qOverload<>(&SearchBox::replaceAll), this,
-        &SearchSubView::replaceAllRequest);
+    connect(&mSearchBox, qOverload<>(&SearchBox::replaceAll), this, &SearchSubView::replaceAllRequest);
 
-    connect (document.getReport(id), &CSMTools::ReportModel::rowsRemoved,
-        this, &SearchSubView::tableSizeUpdate);
+    connect(document.getReport(id), &CSMTools::ReportModel::rowsRemoved, this, &SearchSubView::tableSizeUpdate);
 
-    connect (document.getReport(id), &CSMTools::ReportModel::rowsInserted,
-        this, &SearchSubView::tableSizeUpdate);
+    connect(document.getReport(id), &CSMTools::ReportModel::rowsInserted, this, &SearchSubView::tableSizeUpdate);
 
-    connect (&document, &CSMDoc::Document::operationDone, this, &SearchSubView::operationDone);
+    connect(&document, &CSMDoc::Document::operationDone, this, &SearchSubView::operationDone);
 }
 
-void CSVTools::SearchSubView::setEditLock (bool locked)
+void CSVTools::SearchSubView::setEditLock(bool locked)
 {
     mLocked = locked;
-    mSearchBox.setEditLock (locked);
+    mSearchBox.setEditLock(locked);
 }
 
-void CSVTools::SearchSubView::setStatusBar (bool show)
+void CSVTools::SearchSubView::setStatusBar(bool show)
 {
     mBottom->setStatusBar(show);
 }
 
-void CSVTools::SearchSubView::stateChanged (int state, CSMDoc::Document *document)
+void CSVTools::SearchSubView::stateChanged(int state, CSMDoc::Document* document)
 {
-    mSearchBox.setSearchMode (!(state & CSMDoc::State_Searching));
+    mSearchBox.setSearchMode(!(state & CSMDoc::State_Searching));
 }
 
-void CSVTools::SearchSubView::startSearch (const CSMTools::Search& search)
+void CSVTools::SearchSubView::startSearch(const CSMTools::Search& search)
 {
     CSMPrefs::Category& settings = CSMPrefs::get()["Search & Replace"];
 
     mSearch = search;
-    mSearch.setPadding (settings["char-before"].toInt(), settings["char-after"].toInt());
+    mSearch.setPadding(settings["char-before"].toInt(), settings["char-after"].toInt());
 
     mTable->clear();
-    mDocument.runSearch (getUniversalId(), mSearch);
+    mDocument.runSearch(getUniversalId(), mSearch);
 }
 
 void CSVTools::SearchSubView::replaceRequest()
 {
-    replace (true);
+    replace(true);
 }
 
 void CSVTools::SearchSubView::replaceAllRequest()
 {
-    replace (false);
+    replace(false);
 }
 
 void CSVTools::SearchSubView::tableSizeUpdate()
 {
-    mBottom->tableSizeChanged (mDocument.getReport (getUniversalId())->rowCount(), 0, 0);
+    mBottom->tableSizeChanged(mDocument.getReport(getUniversalId())->rowCount(), 0, 0);
 }
 
-void CSVTools::SearchSubView::operationDone (int type, bool failed)
+void CSVTools::SearchSubView::operationDone(int type, bool failed)
 {
-    if (type==CSMDoc::State_Searching && !failed &&
-        !mDocument.getReport (getUniversalId())->rowCount())
+    if (type == CSMDoc::State_Searching && !failed && !mDocument.getReport(getUniversalId())->rowCount())
     {
-        mBottom->setStatusMessage ("No Results");
+        mBottom->setStatusMessage("No Results");
     }
 }
diff --git a/apps/opencs/view/tools/searchsubview.hpp b/apps/opencs/view/tools/searchsubview.hpp
index cbcb01577e..2c895351f4 100644
--- a/apps/opencs/view/tools/searchsubview.hpp
+++ b/apps/opencs/view/tools/searchsubview.hpp
@@ -26,44 +26,41 @@ namespace CSVTools
 
     class SearchSubView : public CSVDoc::SubView
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            ReportTable *mTable;
-            SearchBox mSearchBox;
-            CSMDoc::Document& mDocument;
-            CSMTools::Search mSearch;
-            bool mLocked;
-            CSVWorld::TableBottomBox *mBottom;
+        ReportTable* mTable;
+        SearchBox mSearchBox;
+        CSMDoc::Document& mDocument;
+        CSMTools::Search mSearch;
+        bool mLocked;
+        CSVWorld::TableBottomBox* mBottom;
 
-        private:
+    private:
+        void replace(bool selection);
 
-            void replace (bool selection);
+    protected:
+        void showEvent(QShowEvent* event) override;
 
-        protected:
+    public:
+        SearchSubView(const CSMWorld::UniversalId& id, CSMDoc::Document& document);
 
-            void showEvent (QShowEvent *event) override;
+        void setEditLock(bool locked) override;
 
-        public:
+        void setStatusBar(bool show) override;
 
-            SearchSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document);
+    private slots:
 
-            void setEditLock (bool locked) override;
+        void stateChanged(int state, CSMDoc::Document* document);
 
-            void setStatusBar (bool show) override;
+        void startSearch(const CSMTools::Search& search);
 
-        private slots:
+        void replaceRequest();
 
-            void stateChanged (int state, CSMDoc::Document *document);
+        void replaceAllRequest();
 
-            void startSearch (const CSMTools::Search& search);
+        void tableSizeUpdate();
 
-            void replaceRequest();
-
-            void replaceAllRequest();
-
-            void tableSizeUpdate();
-
-            void operationDone (int type, bool failed);
+        void operationDone(int type, bool failed);
     };
 }
 
diff --git a/apps/opencs/view/tools/subviews.cpp b/apps/opencs/view/tools/subviews.cpp
index 8c3d6d50ea..d0f44e0033 100644
--- a/apps/opencs/view/tools/subviews.cpp
+++ b/apps/opencs/view/tools/subviews.cpp
@@ -5,12 +5,9 @@
 #include "reportsubview.hpp"
 #include "searchsubview.hpp"
 
-void CSVTools::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
+void CSVTools::addSubViewFactories(CSVDoc::SubViewFactoryManager& manager)
 {
-    manager.add (CSMWorld::UniversalId::Type_VerificationResults,
-        new CSVDoc::SubViewFactory<ReportSubView>);
-    manager.add (CSMWorld::UniversalId::Type_LoadErrorLog,
-        new CSVDoc::SubViewFactory<ReportSubView>);
-    manager.add (CSMWorld::UniversalId::Type_Search,
-        new CSVDoc::SubViewFactory<SearchSubView>);
+    manager.add(CSMWorld::UniversalId::Type_VerificationResults, new CSVDoc::SubViewFactory<ReportSubView>);
+    manager.add(CSMWorld::UniversalId::Type_LoadErrorLog, new CSVDoc::SubViewFactory<ReportSubView>);
+    manager.add(CSMWorld::UniversalId::Type_Search, new CSVDoc::SubViewFactory<SearchSubView>);
 }
diff --git a/apps/opencs/view/tools/subviews.hpp b/apps/opencs/view/tools/subviews.hpp
index 1bac322282..bd76ec0c71 100644
--- a/apps/opencs/view/tools/subviews.hpp
+++ b/apps/opencs/view/tools/subviews.hpp
@@ -8,7 +8,7 @@ namespace CSVDoc
 
 namespace CSVTools
 {
-    void addSubViewFactories (CSVDoc::SubViewFactoryManager& manager);
+    void addSubViewFactories(CSVDoc::SubViewFactoryManager& manager);
 }
 
 #endif
diff --git a/apps/opencs/view/widget/coloreditor.cpp b/apps/opencs/view/widget/coloreditor.cpp
index 460c3fc707..477c36c91f 100644
--- a/apps/opencs/view/widget/coloreditor.cpp
+++ b/apps/opencs/view/widget/coloreditor.cpp
@@ -2,48 +2,46 @@
 
 #include <QGuiApplication>
 #include <QPainter>
-#include <QShowEvent>
 #include <QScreen>
+#include <QShowEvent>
 
 #include "colorpickerpopup.hpp"
 
-CSVWidget::ColorEditor::ColorEditor(const QColor &color, QWidget *parent, const bool popupOnStart)
+CSVWidget::ColorEditor::ColorEditor(const QColor& color, QWidget* parent, const bool popupOnStart)
     : ColorEditor(parent, popupOnStart)
 {
     setColor(color);
 }
 
-CSVWidget::ColorEditor::ColorEditor(const int colorInt, QWidget *parent, const bool popupOnStart)
+CSVWidget::ColorEditor::ColorEditor(const int colorInt, QWidget* parent, const bool popupOnStart)
     : ColorEditor(parent, popupOnStart)
 {
     setColor(colorInt);
 }
 
-CSVWidget::ColorEditor::ColorEditor(QWidget *parent, const bool popupOnStart)
-    : QPushButton(parent),
-      mColorPicker(new ColorPickerPopup(this)),
-      mPopupOnStart(popupOnStart)
+CSVWidget::ColorEditor::ColorEditor(QWidget* parent, const bool popupOnStart)
+    : QPushButton(parent)
+    , mColorPicker(new ColorPickerPopup(this))
+    , mPopupOnStart(popupOnStart)
 {
     connect(this, &ColorEditor::clicked, this, &ColorEditor::showPicker);
     connect(mColorPicker, &ColorPickerPopup::colorChanged, this, &ColorEditor::pickerColorChanged);
 }
 
-void CSVWidget::ColorEditor::paintEvent(QPaintEvent *event)
+void CSVWidget::ColorEditor::paintEvent(QPaintEvent* event)
 {
     QPushButton::paintEvent(event);
 
     QRect buttonRect = rect();
     QRect coloredRect(buttonRect.x() + qRound(buttonRect.width() / 4.0),
-                      buttonRect.y() + qRound(buttonRect.height() / 4.0),
-                      buttonRect.width() / 2,
-                      buttonRect.height() / 2);
+        buttonRect.y() + qRound(buttonRect.height() / 4.0), buttonRect.width() / 2, buttonRect.height() / 2);
     QPainter painter(this);
     painter.fillRect(coloredRect, mColor);
     painter.setPen(Qt::black);
     painter.drawRect(coloredRect);
 }
 
-void CSVWidget::ColorEditor::showEvent(QShowEvent *event)
+void CSVWidget::ColorEditor::showEvent(QShowEvent* event)
 {
     QPushButton::showEvent(event);
     if (isVisible() && mPopupOnStart)
@@ -64,7 +62,7 @@ int CSVWidget::ColorEditor::colorInt() const
     return (mColor.blue() << 16) | (mColor.green() << 8) | (mColor.red());
 }
 
-void CSVWidget::ColorEditor::setColor(const QColor &color)
+void CSVWidget::ColorEditor::setColor(const QColor& color)
 {
     mColor = color;
     update();
@@ -84,7 +82,7 @@ void CSVWidget::ColorEditor::showPicker()
     emit pickingFinished();
 }
 
-void CSVWidget::ColorEditor::pickerColorChanged(const QColor &color)
+void CSVWidget::ColorEditor::pickerColorChanged(const QColor& color)
 {
     mColor = color;
     update();
diff --git a/apps/opencs/view/widget/coloreditor.hpp b/apps/opencs/view/widget/coloreditor.hpp
index aa746da682..284de9f6c6 100644
--- a/apps/opencs/view/widget/coloreditor.hpp
+++ b/apps/opencs/view/widget/coloreditor.hpp
@@ -13,42 +13,42 @@ namespace CSVWidget
 
     class ColorEditor : public QPushButton
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            QColor mColor;
-            ColorPickerPopup *mColorPicker;
-            bool mPopupOnStart;
+        QColor mColor;
+        ColorPickerPopup* mColorPicker;
+        bool mPopupOnStart;
 
-            QPoint calculatePopupPosition();
+        QPoint calculatePopupPosition();
 
-        public:
-            ColorEditor(const QColor &color, QWidget *parent = nullptr, const bool popupOnStart = false);
-            ColorEditor(const int colorInt, QWidget *parent = nullptr, const bool popupOnStart = false);
+    public:
+        ColorEditor(const QColor& color, QWidget* parent = nullptr, const bool popupOnStart = false);
+        ColorEditor(const int colorInt, QWidget* parent = nullptr, const bool popupOnStart = false);
 
-            QColor color() const;
+        QColor color() const;
 
-            /// \return Color RGB value encoded in an int.
-            int colorInt() const;
+        /// \return Color RGB value encoded in an int.
+        int colorInt() const;
 
-            void setColor(const QColor &color);
+        void setColor(const QColor& color);
 
-            /// \brief Set color using given int value.
-            /// \param colorInt RGB color value encoded as an integer.
-            void setColor(const int colorInt);
+        /// \brief Set color using given int value.
+        /// \param colorInt RGB color value encoded as an integer.
+        void setColor(const int colorInt);
 
-        protected:
-            void paintEvent(QPaintEvent *event) override;
-            void showEvent(QShowEvent *event) override;
+    protected:
+        void paintEvent(QPaintEvent* event) override;
+        void showEvent(QShowEvent* event) override;
 
-        private:
-            ColorEditor(QWidget *parent = nullptr, const bool popupOnStart = false);
+    private:
+        ColorEditor(QWidget* parent = nullptr, const bool popupOnStart = false);
 
-        private slots:
-            void showPicker();
-            void pickerColorChanged(const QColor &color);
+    private slots:
+        void showPicker();
+        void pickerColorChanged(const QColor& color);
 
-        signals:
-            void pickingFinished();
+    signals:
+        void pickingFinished();
     };
 }
 
diff --git a/apps/opencs/view/widget/colorpickerpopup.cpp b/apps/opencs/view/widget/colorpickerpopup.cpp
index 5a48b87f39..1a6842bb25 100644
--- a/apps/opencs/view/widget/colorpickerpopup.cpp
+++ b/apps/opencs/view/widget/colorpickerpopup.cpp
@@ -1,13 +1,13 @@
 #include "colorpickerpopup.hpp"
 
 #include <QColorDialog>
-#include <QPushButton>
 #include <QEvent>
 #include <QKeyEvent>
+#include <QPushButton>
 #include <QStyleOptionButton>
 #include <QVBoxLayout>
 
-CSVWidget::ColorPickerPopup::ColorPickerPopup(QWidget *parent) 
+CSVWidget::ColorPickerPopup::ColorPickerPopup(QWidget* parent)
     : QFrame(parent)
 {
     setWindowFlags(Qt::Popup);
@@ -18,10 +18,9 @@ CSVWidget::ColorPickerPopup::ColorPickerPopup(QWidget *parent)
     mColorPicker->setWindowFlags(Qt::Widget);
     mColorPicker->setOptions(QColorDialog::NoButtons | QColorDialog::DontUseNativeDialog);
     mColorPicker->installEventFilter(this);
-    connect(mColorPicker, &QColorDialog::currentColorChanged,
-            this, &ColorPickerPopup::colorChanged);
+    connect(mColorPicker, &QColorDialog::currentColorChanged, this, &ColorPickerPopup::colorChanged);
 
-    QVBoxLayout *layout = new QVBoxLayout(this);
+    QVBoxLayout* layout = new QVBoxLayout(this);
     layout->addWidget(mColorPicker);
     layout->setAlignment(Qt::AlignTop | Qt::AlignLeft);
     layout->setContentsMargins(0, 0, 0, 0);
@@ -29,7 +28,7 @@ CSVWidget::ColorPickerPopup::ColorPickerPopup(QWidget *parent)
     setFixedSize(mColorPicker->size());
 }
 
-void CSVWidget::ColorPickerPopup::showPicker(const QPoint &position, const QColor &initialColor)
+void CSVWidget::ColorPickerPopup::showPicker(const QPoint& position, const QColor& initialColor)
 {
     QRect geometry = this->geometry();
     geometry.moveTo(position);
@@ -41,9 +40,9 @@ void CSVWidget::ColorPickerPopup::showPicker(const QPoint &position, const QColo
         mColorPicker->setCurrentColor(color);
 }
 
-void CSVWidget::ColorPickerPopup::mousePressEvent(QMouseEvent *event)
+void CSVWidget::ColorPickerPopup::mousePressEvent(QMouseEvent* event)
 {
-    QPushButton *button = qobject_cast<QPushButton *>(parentWidget());
+    QPushButton* button = qobject_cast<QPushButton*>(parentWidget());
     if (button != nullptr)
     {
         QStyleOptionButton option;
@@ -61,11 +60,11 @@ void CSVWidget::ColorPickerPopup::mousePressEvent(QMouseEvent *event)
     QFrame::mousePressEvent(event);
 }
 
-bool CSVWidget::ColorPickerPopup::eventFilter(QObject *object, QEvent *event)
+bool CSVWidget::ColorPickerPopup::eventFilter(QObject* object, QEvent* event)
 {
     if (object == mColorPicker && event->type() == QEvent::KeyPress)
     {
-        QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
+        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
         // Prevent QColorDialog from closing when Escape is pressed.
         // Instead, hide the popup.
         if (keyEvent->key() == Qt::Key_Escape)
diff --git a/apps/opencs/view/widget/colorpickerpopup.hpp b/apps/opencs/view/widget/colorpickerpopup.hpp
index d653d68fbb..8a3eb030fb 100644
--- a/apps/opencs/view/widget/colorpickerpopup.hpp
+++ b/apps/opencs/view/widget/colorpickerpopup.hpp
@@ -11,19 +11,19 @@ namespace CSVWidget
     {
         Q_OBJECT
 
-        QColorDialog *mColorPicker;
+        QColorDialog* mColorPicker;
 
     public:
-        explicit ColorPickerPopup(QWidget *parent);
-    
-        void showPicker(const QPoint &position, const QColor &initialColor);
+        explicit ColorPickerPopup(QWidget* parent);
+
+        void showPicker(const QPoint& position, const QColor& initialColor);
 
     protected:
-        void mousePressEvent(QMouseEvent *event) override;
-        bool eventFilter(QObject *object, QEvent *event) override;
+        void mousePressEvent(QMouseEvent* event) override;
+        bool eventFilter(QObject* object, QEvent* event) override;
 
     signals:
-        void colorChanged(const QColor &color);
+        void colorChanged(const QColor& color);
     };
 }
 
diff --git a/apps/opencs/view/widget/completerpopup.cpp b/apps/opencs/view/widget/completerpopup.cpp
index be509bcb93..0a52295642 100644
--- a/apps/opencs/view/widget/completerpopup.cpp
+++ b/apps/opencs/view/widget/completerpopup.cpp
@@ -1,6 +1,6 @@
 #include "completerpopup.hpp"
 
-CSVWidget::CompleterPopup::CompleterPopup(QWidget *parent)
+CSVWidget::CompleterPopup::CompleterPopup(QWidget* parent)
     : QListView(parent)
 {
     setEditTriggers(QAbstractItemView::NoEditTriggers);
@@ -23,6 +23,6 @@ int CSVWidget::CompleterPopup::sizeHintForRow(int row) const
     ensurePolished();
     QModelIndex index = model()->index(row, modelColumn());
     QStyleOptionViewItem option = viewOptions();
-    QAbstractItemDelegate *delegate = itemDelegate(index);
+    QAbstractItemDelegate* delegate = itemDelegate(index);
     return delegate->sizeHint(option, index).height();
 }
diff --git a/apps/opencs/view/widget/completerpopup.hpp b/apps/opencs/view/widget/completerpopup.hpp
index 96675f56f4..673d288000 100644
--- a/apps/opencs/view/widget/completerpopup.hpp
+++ b/apps/opencs/view/widget/completerpopup.hpp
@@ -7,10 +7,10 @@ namespace CSVWidget
 {
     class CompleterPopup : public QListView
     {
-        public:
-            CompleterPopup(QWidget *parent = nullptr);
+    public:
+        CompleterPopup(QWidget* parent = nullptr);
 
-            int sizeHintForRow(int row) const override;
+        int sizeHintForRow(int row) const override;
     };
 }
 
diff --git a/apps/opencs/view/widget/droplineedit.cpp b/apps/opencs/view/widget/droplineedit.cpp
index 2ca3064613..3e429402c0 100644
--- a/apps/opencs/view/widget/droplineedit.cpp
+++ b/apps/opencs/view/widget/droplineedit.cpp
@@ -7,14 +7,14 @@
 
 #include "../world/dragdroputils.hpp"
 
-CSVWidget::DropLineEdit::DropLineEdit(CSMWorld::ColumnBase::Display type, QWidget *parent)
-    : QLineEdit(parent),
-      mDropType(type)
+CSVWidget::DropLineEdit::DropLineEdit(CSMWorld::ColumnBase::Display type, QWidget* parent)
+    : QLineEdit(parent)
+    , mDropType(type)
 {
     setAcceptDrops(true);
 }
 
-void CSVWidget::DropLineEdit::dragEnterEvent(QDragEnterEvent *event)
+void CSVWidget::DropLineEdit::dragEnterEvent(QDragEnterEvent* event)
 {
     if (CSVWorld::DragDropUtils::canAcceptData(*event, mDropType))
     {
@@ -22,7 +22,7 @@ void CSVWidget::DropLineEdit::dragEnterEvent(QDragEnterEvent *event)
     }
 }
 
-void CSVWidget::DropLineEdit::dragMoveEvent(QDragMoveEvent *event)
+void CSVWidget::DropLineEdit::dragMoveEvent(QDragMoveEvent* event)
 {
     if (CSVWorld::DragDropUtils::canAcceptData(*event, mDropType))
     {
@@ -30,7 +30,7 @@ void CSVWidget::DropLineEdit::dragMoveEvent(QDragMoveEvent *event)
     }
 }
 
-void CSVWidget::DropLineEdit::dropEvent(QDropEvent *event)
+void CSVWidget::DropLineEdit::dropEvent(QDropEvent* event)
 {
     if (CSVWorld::DragDropUtils::canAcceptData(*event, mDropType))
     {
diff --git a/apps/opencs/view/widget/droplineedit.hpp b/apps/opencs/view/widget/droplineedit.hpp
index 9110518736..5d6fd26227 100644
--- a/apps/opencs/view/widget/droplineedit.hpp
+++ b/apps/opencs/view/widget/droplineedit.hpp
@@ -20,21 +20,21 @@ namespace CSVWidget
 {
     class DropLineEdit : public QLineEdit
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            CSMWorld::ColumnBase::Display mDropType;
-            ///< The accepted Display type for this LineEdit.
+        CSMWorld::ColumnBase::Display mDropType;
+        ///< The accepted Display type for this LineEdit.
 
-        public:
-            DropLineEdit(CSMWorld::ColumnBase::Display type, QWidget *parent = nullptr);
+    public:
+        DropLineEdit(CSMWorld::ColumnBase::Display type, QWidget* parent = nullptr);
 
-        protected:
-            void dragEnterEvent(QDragEnterEvent *event) override;
-            void dragMoveEvent(QDragMoveEvent *event) override;
-            void dropEvent(QDropEvent *event) override;
+    protected:
+        void dragEnterEvent(QDragEnterEvent* event) override;
+        void dragMoveEvent(QDragMoveEvent* event) override;
+        void dropEvent(QDropEvent* event) override;
 
-        signals:
-            void tableMimeDataDropped(const CSMWorld::UniversalId &id, const CSMDoc::Document *document);
+    signals:
+        void tableMimeDataDropped(const CSMWorld::UniversalId& id, const CSMDoc::Document* document);
     };
 }
 
diff --git a/apps/opencs/view/widget/modebutton.cpp b/apps/opencs/view/widget/modebutton.cpp
index 88f0502479..042f845575 100644
--- a/apps/opencs/view/widget/modebutton.cpp
+++ b/apps/opencs/view/widget/modebutton.cpp
@@ -1,14 +1,15 @@
 #include "modebutton.hpp"
 
-CSVWidget::ModeButton::ModeButton (const QIcon& icon, const QString& tooltip, QWidget *parent)
-: PushButton (icon, Type_Mode, tooltip, parent)
-{}
+CSVWidget::ModeButton::ModeButton(const QIcon& icon, const QString& tooltip, QWidget* parent)
+    : PushButton(icon, Type_Mode, tooltip, parent)
+{
+}
 
-void CSVWidget::ModeButton::activate (SceneToolbar *toolbar) {}
+void CSVWidget::ModeButton::activate(SceneToolbar* toolbar) {}
 
-void CSVWidget::ModeButton::deactivate (SceneToolbar *toolbar) {}
+void CSVWidget::ModeButton::deactivate(SceneToolbar* toolbar) {}
 
-bool CSVWidget::ModeButton::createContextMenu (QMenu *menu)
+bool CSVWidget::ModeButton::createContextMenu(QMenu* menu)
 {
     return false;
 }
diff --git a/apps/opencs/view/widget/modebutton.hpp b/apps/opencs/view/widget/modebutton.hpp
index f595969231..75b05e28e3 100644
--- a/apps/opencs/view/widget/modebutton.hpp
+++ b/apps/opencs/view/widget/modebutton.hpp
@@ -12,26 +12,24 @@ namespace CSVWidget
     /// \brief Specialist PushButton of Type_Mode for use in SceneToolMode
     class ModeButton : public PushButton
     {
-            Q_OBJECT
+        Q_OBJECT
 
-        public:
+    public:
+        ModeButton(const QIcon& icon, const QString& tooltip = "", QWidget* parent = nullptr);
 
-            ModeButton (const QIcon& icon, const QString& tooltip = "",
-                QWidget *parent = nullptr);
+        /// Default-Implementation: do nothing
+        virtual void activate(SceneToolbar* toolbar);
 
-            /// Default-Implementation: do nothing
-            virtual void activate (SceneToolbar *toolbar);
+        /// Default-Implementation: do nothing
+        virtual void deactivate(SceneToolbar* toolbar);
 
-            /// Default-Implementation: do nothing
-            virtual void deactivate (SceneToolbar *toolbar);
-
-            /// Add context menu items to \a menu. Default-implementation: return false
-            ///
-            /// \attention menu can be a 0-pointer
-            ///
-            /// \return Have there been any menu items to be added (if menu is 0 and there
-            /// items to be added, the function must return true anyway.
-            virtual bool createContextMenu (QMenu *menu);
+        /// Add context menu items to \a menu. Default-implementation: return false
+        ///
+        /// \attention menu can be a 0-pointer
+        ///
+        /// \return Have there been any menu items to be added (if menu is 0 and there
+        /// items to be added, the function must return true anyway.
+        virtual bool createContextMenu(QMenu* menu);
     };
 }
 
diff --git a/apps/opencs/view/widget/pushbutton.cpp b/apps/opencs/view/widget/pushbutton.cpp
index 31fdf5a19f..c1c3f9d285 100644
--- a/apps/opencs/view/widget/pushbutton.cpp
+++ b/apps/opencs/view/widget/pushbutton.cpp
@@ -1,10 +1,10 @@
 #include "pushbutton.hpp"
 
-#include <QMouseEvent>
 #include <QKeyEvent>
+#include <QMouseEvent>
 
-#include "../../model/prefs/state.hpp"
 #include "../../model/prefs/shortcutmanager.hpp"
+#include "../../model/prefs/state.hpp"
 
 void CSVWidget::PushButton::processShortcuts()
 {
@@ -22,8 +22,7 @@ void CSVWidget::PushButton::setExtendedToolTip()
     {
         case Type_TopMode:
 
-            tooltip +=
-                "<p>(left click to change mode)";
+            tooltip += "<p>(left click to change mode)";
 
             break;
 
@@ -50,52 +49,56 @@ void CSVWidget::PushButton::setExtendedToolTip()
             break;
     }
 
-    setToolTip (tooltip);
+    setToolTip(tooltip);
 }
 
-void CSVWidget::PushButton::keyPressEvent (QKeyEvent *event)
+void CSVWidget::PushButton::keyPressEvent(QKeyEvent* event)
 {
-    if (event->key()!=Qt::Key_Shift)
+    if (event->key() != Qt::Key_Shift)
         mKeepOpen = false;
 
-    QPushButton::keyPressEvent (event);
+    QPushButton::keyPressEvent(event);
 }
 
-void CSVWidget::PushButton::keyReleaseEvent (QKeyEvent *event)
+void CSVWidget::PushButton::keyReleaseEvent(QKeyEvent* event)
 {
-    if (event->key()==Qt::Key_Space)
+    if (event->key() == Qt::Key_Space)
         mKeepOpen = event->modifiers() & Qt::ShiftModifier;
 
-    QPushButton::keyReleaseEvent (event);
+    QPushButton::keyReleaseEvent(event);
 }
 
-void CSVWidget::PushButton::mouseReleaseEvent (QMouseEvent *event)
+void CSVWidget::PushButton::mouseReleaseEvent(QMouseEvent* event)
 {
-    mKeepOpen = event->button()==Qt::LeftButton && (event->modifiers() & Qt::ShiftModifier);
-    QPushButton::mouseReleaseEvent (event);
+    mKeepOpen = event->button() == Qt::LeftButton && (event->modifiers() & Qt::ShiftModifier);
+    QPushButton::mouseReleaseEvent(event);
 }
 
-CSVWidget::PushButton::PushButton (const QIcon& icon, Type type, const QString& tooltip,
-    QWidget *parent)
-: QPushButton (icon, "", parent), mKeepOpen (false), mType (type), mToolTip (tooltip)
+CSVWidget::PushButton::PushButton(const QIcon& icon, Type type, const QString& tooltip, QWidget* parent)
+    : QPushButton(icon, "", parent)
+    , mKeepOpen(false)
+    , mType(type)
+    , mToolTip(tooltip)
 {
-    if (type==Type_Mode || type==Type_Toggle)
+    if (type == Type_Mode || type == Type_Toggle)
     {
-        setCheckable (true);
-        connect (this, &PushButton::toggled, this, &PushButton::checkedStateChanged);
+        setCheckable(true);
+        connect(this, &PushButton::toggled, this, &PushButton::checkedStateChanged);
     }
-    setCheckable (type==Type_Mode || type==Type_Toggle);
+    setCheckable(type == Type_Mode || type == Type_Toggle);
     processShortcuts();
     setExtendedToolTip();
 
-    connect (&CSMPrefs::State::get(), &CSMPrefs::State::settingChanged,
-        this, &PushButton::settingChanged);
+    connect(&CSMPrefs::State::get(), &CSMPrefs::State::settingChanged, this, &PushButton::settingChanged);
 }
 
-CSVWidget::PushButton::PushButton (Type type, const QString& tooltip, QWidget *parent)
-: QPushButton (parent), mKeepOpen (false), mType (type), mToolTip (tooltip)
+CSVWidget::PushButton::PushButton(Type type, const QString& tooltip, QWidget* parent)
+    : QPushButton(parent)
+    , mKeepOpen(false)
+    , mType(type)
+    , mToolTip(tooltip)
 {
-    setCheckable (type==Type_Mode || type==Type_Toggle);
+    setCheckable(type == Type_Mode || type == Type_Toggle);
     processShortcuts();
     setExtendedToolTip();
 }
@@ -115,12 +118,12 @@ CSVWidget::PushButton::Type CSVWidget::PushButton::getType() const
     return mType;
 }
 
-void CSVWidget::PushButton::checkedStateChanged (bool checked)
+void CSVWidget::PushButton::checkedStateChanged(bool checked)
 {
     setExtendedToolTip();
 }
 
-void CSVWidget::PushButton::settingChanged (const CSMPrefs::Setting *setting)
+void CSVWidget::PushButton::settingChanged(const CSMPrefs::Setting* setting)
 {
     if (setting->getParent()->getKey() == "Key Bindings")
     {
diff --git a/apps/opencs/view/widget/pushbutton.hpp b/apps/opencs/view/widget/pushbutton.hpp
index b3aaaebef2..b5a07173af 100644
--- a/apps/opencs/view/widget/pushbutton.hpp
+++ b/apps/opencs/view/widget/pushbutton.hpp
@@ -12,59 +12,52 @@ namespace CSVWidget
 {
     class PushButton : public QPushButton
     {
-            Q_OBJECT
+        Q_OBJECT
 
-        public:
+    public:
+        enum Type
+        {
+            Type_TopMode, // top level button for mode selector panel
+            Type_TopAction, // top level button that triggers an action
+            Type_Mode, // mode button
+            Type_Toggle
+        };
 
-            enum Type
-            {
-                Type_TopMode, // top level button for mode selector panel
-                Type_TopAction, // top level button that triggers an action
-                Type_Mode, // mode button
-                Type_Toggle
-            };
+    private:
+        bool mKeepOpen;
+        Type mType;
+        QString mToolTip;
+        QString mProcessedToolTip;
 
-        private:
+    private:
+        void processShortcuts();
+        void setExtendedToolTip();
 
-            bool mKeepOpen;
-            Type mType;
-            QString mToolTip;
-            QString mProcessedToolTip;
+    protected:
+        void keyPressEvent(QKeyEvent* event) override;
 
-        private:
+        void keyReleaseEvent(QKeyEvent* event) override;
 
-            void processShortcuts();
-            void setExtendedToolTip();
+        void mouseReleaseEvent(QMouseEvent* event) override;
 
-        protected:
+    public:
+        /// \param push Do not maintain a toggle state
+        PushButton(const QIcon& icon, Type type, const QString& tooltip = "", QWidget* parent = nullptr);
 
-            void keyPressEvent (QKeyEvent *event) override;
+        /// \param push Do not maintain a toggle state
+        PushButton(Type type, const QString& tooltip = "", QWidget* parent = nullptr);
 
-            void keyReleaseEvent (QKeyEvent *event) override;
+        bool hasKeepOpen() const;
 
-            void mouseReleaseEvent (QMouseEvent *event) override;
+        /// Return tooltip used at construction (without any button-specific modifications)
+        QString getBaseToolTip() const;
 
-        public:
+        Type getType() const;
 
-            /// \param push Do not maintain a toggle state
-            PushButton (const QIcon& icon, Type type, const QString& tooltip = "",
-                QWidget *parent = nullptr);
+    private slots:
 
-            /// \param push Do not maintain a toggle state
-            PushButton (Type type, const QString& tooltip = "",
-                QWidget *parent = nullptr);
-
-            bool hasKeepOpen() const;
-
-            /// Return tooltip used at construction (without any button-specific modifications)
-            QString getBaseToolTip() const;
-
-            Type getType() const;
-
-        private slots:
-
-            void checkedStateChanged (bool checked);
-            void settingChanged (const CSMPrefs::Setting *setting);
+        void checkedStateChanged(bool checked);
+        void settingChanged(const CSMPrefs::Setting* setting);
     };
 }
 
diff --git a/apps/opencs/view/widget/scenetool.cpp b/apps/opencs/view/widget/scenetool.cpp
index 9923c26e96..3eecf6d95d 100644
--- a/apps/opencs/view/widget/scenetool.cpp
+++ b/apps/opencs/view/widget/scenetool.cpp
@@ -4,30 +4,30 @@
 
 #include "scenetoolbar.hpp"
 
-CSVWidget::SceneTool::SceneTool (SceneToolbar *parent, Type type)
-: PushButton (type, "", parent)
+CSVWidget::SceneTool::SceneTool(SceneToolbar* parent, Type type)
+    : PushButton(type, "", parent)
 {
-    setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed));
-    setIconSize (QSize (parent->getIconSize(), parent->getIconSize()));
-    setFixedSize (parent->getButtonSize(), parent->getButtonSize());
+    setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+    setIconSize(QSize(parent->getIconSize(), parent->getIconSize()));
+    setFixedSize(parent->getButtonSize(), parent->getButtonSize());
 
-    connect (this, &SceneTool::clicked, this, &SceneTool::openRequest);
+    connect(this, &SceneTool::clicked, this, &SceneTool::openRequest);
 }
 
 void CSVWidget::SceneTool::activate() {}
 
-void CSVWidget::SceneTool::mouseReleaseEvent (QMouseEvent *event)
+void CSVWidget::SceneTool::mouseReleaseEvent(QMouseEvent* event)
 {
-    if (getType()==Type_TopAction && event->button()==Qt::RightButton)
-        showPanel (parentWidget()->mapToGlobal (pos()));
+    if (getType() == Type_TopAction && event->button() == Qt::RightButton)
+        showPanel(parentWidget()->mapToGlobal(pos()));
     else
-        PushButton::mouseReleaseEvent (event);
+        PushButton::mouseReleaseEvent(event);
 }
 
 void CSVWidget::SceneTool::openRequest()
 {
-    if (getType()==Type_TopAction)
+    if (getType() == Type_TopAction)
         activate();
     else
-        showPanel (parentWidget()->mapToGlobal (pos()));
+        showPanel(parentWidget()->mapToGlobal(pos()));
 }
diff --git a/apps/opencs/view/widget/scenetool.hpp b/apps/opencs/view/widget/scenetool.hpp
index 295375f26d..b4f7fbeb1b 100644
--- a/apps/opencs/view/widget/scenetool.hpp
+++ b/apps/opencs/view/widget/scenetool.hpp
@@ -10,25 +10,23 @@ namespace CSVWidget
     ///< \brief Tool base class
     class SceneTool : public PushButton
     {
-            Q_OBJECT
+        Q_OBJECT
 
-        public:
+    public:
+        SceneTool(SceneToolbar* parent, Type type = Type_TopMode);
 
-            SceneTool (SceneToolbar *parent, Type type = Type_TopMode);
+        virtual void showPanel(const QPoint& position) = 0;
 
-            virtual void showPanel (const QPoint& position) = 0;
+        /// This function will only called for buttons of type Type_TopAction. The default
+        /// implementation is empty.
+        virtual void activate();
 
-            /// This function will only called for buttons of type Type_TopAction. The default
-            /// implementation is empty.
-            virtual void activate();
+    protected:
+        void mouseReleaseEvent(QMouseEvent* event) override;
 
-        protected:
+    private slots:
 
-            void mouseReleaseEvent (QMouseEvent *event) override;
-
-        private slots:
-
-            void openRequest();
+        void openRequest();
     };
 }
 
diff --git a/apps/opencs/view/widget/scenetoolbar.cpp b/apps/opencs/view/widget/scenetoolbar.cpp
index 81155150b8..bd6ce827a0 100644
--- a/apps/opencs/view/widget/scenetoolbar.cpp
+++ b/apps/opencs/view/widget/scenetoolbar.cpp
@@ -6,45 +6,46 @@
 
 #include "scenetool.hpp"
 
-void CSVWidget::SceneToolbar::focusInEvent (QFocusEvent *event)
+void CSVWidget::SceneToolbar::focusInEvent(QFocusEvent* event)
 {
-    QWidget::focusInEvent (event);
+    QWidget::focusInEvent(event);
 
     if (mLayout->count())
-        dynamic_cast<QWidgetItem&> (*mLayout->itemAt (0)).widget()->setFocus();
+        dynamic_cast<QWidgetItem&>(*mLayout->itemAt(0)).widget()->setFocus();
 }
 
-CSVWidget::SceneToolbar::SceneToolbar (int buttonSize, QWidget *parent)
-: QWidget (parent), mButtonSize (buttonSize), mIconSize (buttonSize-6)
+CSVWidget::SceneToolbar::SceneToolbar(int buttonSize, QWidget* parent)
+    : QWidget(parent)
+    , mButtonSize(buttonSize)
+    , mIconSize(buttonSize - 6)
 {
-    setFixedWidth (mButtonSize);
+    setFixedWidth(mButtonSize);
 
-    mLayout = new QVBoxLayout (this);
-    mLayout->setAlignment (Qt::AlignTop);
+    mLayout = new QVBoxLayout(this);
+    mLayout->setAlignment(Qt::AlignTop);
 
-    mLayout->setContentsMargins (QMargins (0, 0, 0, 0));
+    mLayout->setContentsMargins(QMargins(0, 0, 0, 0));
 
-    setLayout (mLayout);
+    setLayout(mLayout);
 
     CSMPrefs::Shortcut* focusSceneShortcut = new CSMPrefs::Shortcut("scene-focus-toolbar", this);
-    connect(focusSceneShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), 
-            this, &SceneToolbar::focusSceneRequest);
+    connect(focusSceneShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), this, &SceneToolbar::focusSceneRequest);
 }
 
-void CSVWidget::SceneToolbar::addTool (SceneTool *tool, SceneTool *insertPoint)
+void CSVWidget::SceneToolbar::addTool(SceneTool* tool, SceneTool* insertPoint)
 {
     if (!insertPoint)
-        mLayout->addWidget (tool, 0, Qt::AlignTop);
+        mLayout->addWidget(tool, 0, Qt::AlignTop);
     else
     {
-        int index = mLayout->indexOf (insertPoint);
-        mLayout->insertWidget (index+1, tool, 0, Qt::AlignTop);
+        int index = mLayout->indexOf(insertPoint);
+        mLayout->insertWidget(index + 1, tool, 0, Qt::AlignTop);
     }
 }
 
-void CSVWidget::SceneToolbar::removeTool (SceneTool *tool)
+void CSVWidget::SceneToolbar::removeTool(SceneTool* tool)
 {
-    mLayout->removeWidget (tool);
+    mLayout->removeWidget(tool);
 }
 
 int CSVWidget::SceneToolbar::getButtonSize() const
diff --git a/apps/opencs/view/widget/scenetoolbar.hpp b/apps/opencs/view/widget/scenetoolbar.hpp
index 70f5807652..6b4e503bd2 100644
--- a/apps/opencs/view/widget/scenetoolbar.hpp
+++ b/apps/opencs/view/widget/scenetoolbar.hpp
@@ -11,33 +11,31 @@ namespace CSVWidget
 
     class SceneToolbar : public QWidget
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            QVBoxLayout *mLayout;
-            int mButtonSize;
-            int mIconSize;
+        QVBoxLayout* mLayout;
+        int mButtonSize;
+        int mIconSize;
 
-        protected:
+    protected:
+        void focusInEvent(QFocusEvent* event) override;
 
-            void focusInEvent (QFocusEvent *event) override;
+    public:
+        SceneToolbar(int buttonSize, QWidget* parent = nullptr);
 
-        public:
+        /// If insertPoint==0, insert \a tool at the end of the scrollbar. Otherwise
+        /// insert tool after \a insertPoint.
+        void addTool(SceneTool* tool, SceneTool* insertPoint = nullptr);
 
-            SceneToolbar (int buttonSize, QWidget *parent = nullptr);
+        void removeTool(SceneTool* tool);
 
-            /// If insertPoint==0, insert \a tool at the end of the scrollbar. Otherwise
-            /// insert tool after \a insertPoint.
-            void addTool (SceneTool *tool, SceneTool *insertPoint = nullptr);
+        int getButtonSize() const;
 
-            void removeTool (SceneTool *tool);
+        int getIconSize() const;
 
-            int getButtonSize() const;
+    signals:
 
-            int getIconSize() const;
-
-        signals:
-
-            void focusSceneRequest();
+        void focusSceneRequest();
     };
 }
 
diff --git a/apps/opencs/view/widget/scenetoolmode.cpp b/apps/opencs/view/widget/scenetoolmode.cpp
index 90b6c36e31..c415216978 100644
--- a/apps/opencs/view/widget/scenetoolmode.cpp
+++ b/apps/opencs/view/widget/scenetoolmode.cpp
@@ -1,30 +1,30 @@
 #include "scenetoolmode.hpp"
 
-#include <QHBoxLayout>
-#include <QFrame>
-#include <QMenu>
 #include <QContextMenuEvent>
 #include <QEvent>
+#include <QFrame>
+#include <QHBoxLayout>
+#include <QMenu>
 
-#include "scenetoolbar.hpp"
 #include "modebutton.hpp"
+#include "scenetoolbar.hpp"
 
-void CSVWidget::SceneToolMode::contextMenuEvent (QContextMenuEvent *event)
+void CSVWidget::SceneToolMode::contextMenuEvent(QContextMenuEvent* event)
 {
-    QMenu menu (this);
-    if (createContextMenu (&menu))
-        menu.exec (event->globalPos());
+    QMenu menu(this);
+    if (createContextMenu(&menu))
+        menu.exec(event->globalPos());
 }
 
-bool CSVWidget::SceneToolMode::createContextMenu (QMenu *menu)
+bool CSVWidget::SceneToolMode::createContextMenu(QMenu* menu)
 {
     if (mCurrent)
-        return mCurrent->createContextMenu (menu);
+        return mCurrent->createContextMenu(menu);
 
     return false;
 }
 
-void CSVWidget::SceneToolMode::adjustToolTip (const ModeButton *activeMode)
+void CSVWidget::SceneToolMode::adjustToolTip(const ModeButton* activeMode)
 {
     QString toolTip = mToolTip;
 
@@ -32,103 +32,105 @@ void CSVWidget::SceneToolMode::adjustToolTip (const ModeButton *activeMode)
 
     toolTip += "<p>(left click to change mode)";
 
-    if (createContextMenu (nullptr))
+    if (createContextMenu(nullptr))
         toolTip += "<br>(right click to access context menu)";
 
-    setToolTip (toolTip);
+    setToolTip(toolTip);
 }
 
-void CSVWidget::SceneToolMode::setButton (std::map<ModeButton *, std::string>::iterator iter)
+void CSVWidget::SceneToolMode::setButton(std::map<ModeButton*, std::string>::iterator iter)
 {
-    for (std::map<ModeButton *, std::string>::const_iterator iter2 = mButtons.begin();
-        iter2!=mButtons.end(); ++iter2)
-        iter2->first->setChecked (iter2==iter);
+    for (std::map<ModeButton*, std::string>::const_iterator iter2 = mButtons.begin(); iter2 != mButtons.end(); ++iter2)
+        iter2->first->setChecked(iter2 == iter);
 
-    setIcon (iter->first->icon());
-    adjustToolTip (iter->first);
+    setIcon(iter->first->icon());
+    adjustToolTip(iter->first);
 
-    if (mCurrent!=iter->first)
+    if (mCurrent != iter->first)
     {
         if (mCurrent)
-            mCurrent->deactivate (mToolbar);
+            mCurrent->deactivate(mToolbar);
 
         mCurrent = iter->first;
-        mCurrent->activate (mToolbar);
+        mCurrent->activate(mToolbar);
     }
 
-    emit modeChanged (iter->second);
+    emit modeChanged(iter->second);
 }
 
-CSVWidget::SceneToolMode::SceneToolMode (SceneToolbar *parent, const QString& toolTip)
-: SceneTool (parent), mButtonSize (parent->getButtonSize()), mIconSize (parent->getIconSize()),
-  mToolTip (toolTip), mFirst (nullptr), mCurrent (nullptr), mToolbar (parent)
+CSVWidget::SceneToolMode::SceneToolMode(SceneToolbar* parent, const QString& toolTip)
+    : SceneTool(parent)
+    , mButtonSize(parent->getButtonSize())
+    , mIconSize(parent->getIconSize())
+    , mToolTip(toolTip)
+    , mFirst(nullptr)
+    , mCurrent(nullptr)
+    , mToolbar(parent)
 {
-    mPanel = new QFrame (this, Qt::Popup);
+    mPanel = new QFrame(this, Qt::Popup);
 
-    mLayout = new QHBoxLayout (mPanel);
+    mLayout = new QHBoxLayout(mPanel);
 
-    mLayout->setContentsMargins (QMargins (0, 0, 0, 0));
+    mLayout->setContentsMargins(QMargins(0, 0, 0, 0));
 
-    mPanel->setLayout (mLayout);
+    mPanel->setLayout(mLayout);
 }
 
-void CSVWidget::SceneToolMode::showPanel (const QPoint& position)
+void CSVWidget::SceneToolMode::showPanel(const QPoint& position)
 {
-    mPanel->move (position);
+    mPanel->move(position);
     mPanel->show();
 
     if (mFirst)
-        mFirst->setFocus (Qt::OtherFocusReason);
+        mFirst->setFocus(Qt::OtherFocusReason);
 }
 
-void CSVWidget::SceneToolMode::addButton (const std::string& icon, const std::string& id,
-    const QString& tooltip)
+void CSVWidget::SceneToolMode::addButton(const std::string& icon, const std::string& id, const QString& tooltip)
 {
-    ModeButton *button = new ModeButton (QIcon (QPixmap (icon.c_str())), tooltip, mPanel);
-    addButton (button, id);
+    ModeButton* button = new ModeButton(QIcon(QPixmap(icon.c_str())), tooltip, mPanel);
+    addButton(button, id);
 }
 
-void CSVWidget::SceneToolMode::addButton (ModeButton *button, const std::string& id)
+void CSVWidget::SceneToolMode::addButton(ModeButton* button, const std::string& id)
 {
-    button->setParent (mPanel);
+    button->setParent(mPanel);
 
-    button->setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed));
-    button->setIconSize (QSize (mIconSize, mIconSize));
-    button->setFixedSize (mButtonSize, mButtonSize);
+    button->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+    button->setIconSize(QSize(mIconSize, mIconSize));
+    button->setFixedSize(mButtonSize, mButtonSize);
 
-    mLayout->addWidget (button);
+    mLayout->addWidget(button);
 
-    mButtons.insert (std::make_pair (button, id));
+    mButtons.insert(std::make_pair(button, id));
 
-    connect (button, &ModeButton::clicked, this, &SceneToolMode::selected);
+    connect(button, &ModeButton::clicked, this, &SceneToolMode::selected);
 
-    if (mButtons.size()==1)
+    if (mButtons.size() == 1)
     {
         mFirst = mCurrent = button;
-        setIcon (button->icon());
-        button->setChecked (true);
-        adjustToolTip (button);
-        mCurrent->activate (mToolbar);
+        setIcon(button->icon());
+        button->setChecked(true);
+        adjustToolTip(button);
+        mCurrent->activate(mToolbar);
     }
 }
 
-CSVWidget::ModeButton *CSVWidget::SceneToolMode::getCurrent()
+CSVWidget::ModeButton* CSVWidget::SceneToolMode::getCurrent()
 {
     return mCurrent;
 }
 
 std::string CSVWidget::SceneToolMode::getCurrentId() const
 {
-    return mButtons.find (mCurrent)->second;
+    return mButtons.find(mCurrent)->second;
 }
 
-void CSVWidget::SceneToolMode::setButton (const std::string& id)
+void CSVWidget::SceneToolMode::setButton(const std::string& id)
 {
-    for (std::map<ModeButton *, std::string>::iterator iter = mButtons.begin();
-        iter!=mButtons.end(); ++iter)
-        if (iter->second==id)
+    for (std::map<ModeButton*, std::string>::iterator iter = mButtons.begin(); iter != mButtons.end(); ++iter)
+        if (iter->second == id)
         {
-            setButton (iter);
+            setButton(iter);
             break;
         }
 }
@@ -145,14 +147,13 @@ bool CSVWidget::SceneToolMode::event(QEvent* event)
 
 void CSVWidget::SceneToolMode::selected()
 {
-    std::map<ModeButton *, std::string>::iterator iter =
-        mButtons.find (dynamic_cast<ModeButton *> (sender()));
+    std::map<ModeButton*, std::string>::iterator iter = mButtons.find(dynamic_cast<ModeButton*>(sender()));
 
-    if (iter!=mButtons.end())
+    if (iter != mButtons.end())
     {
         if (!iter->first->hasKeepOpen())
             mPanel->hide();
 
-        setButton (iter);
+        setButton(iter);
     }
 }
diff --git a/apps/opencs/view/widget/scenetoolmode.hpp b/apps/opencs/view/widget/scenetoolmode.hpp
index 896a6d9c66..ee19f678be 100644
--- a/apps/opencs/view/widget/scenetoolmode.hpp
+++ b/apps/opencs/view/widget/scenetoolmode.hpp
@@ -17,65 +17,62 @@ namespace CSVWidget
     ///< \brief Mode selector tool
     class SceneToolMode : public SceneTool
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            QWidget *mPanel;
-            QHBoxLayout *mLayout;
-            std::map<ModeButton *, std::string> mButtons; // widget, id
-            int mButtonSize;
-            int mIconSize;
-            QString mToolTip;
-            PushButton *mFirst;
-            ModeButton *mCurrent;
-            SceneToolbar *mToolbar;
+        QWidget* mPanel;
+        QHBoxLayout* mLayout;
+        std::map<ModeButton*, std::string> mButtons; // widget, id
+        int mButtonSize;
+        int mIconSize;
+        QString mToolTip;
+        PushButton* mFirst;
+        ModeButton* mCurrent;
+        SceneToolbar* mToolbar;
 
-            void adjustToolTip (const ModeButton *activeMode);
+        void adjustToolTip(const ModeButton* activeMode);
 
-            void contextMenuEvent (QContextMenuEvent *event) override;
+        void contextMenuEvent(QContextMenuEvent* event) override;
 
-            /// Add context menu items to \a menu. Default-implementation: Pass on request to
-            /// current mode button or return false, if there is no current mode button.
-            ///
-            /// \attention menu can be a 0-pointer
-            ///
-            /// \return Have there been any menu items to be added (if menu is 0 and there
-            /// items to be added, the function must return true anyway.
-            virtual bool createContextMenu (QMenu *menu);
+        /// Add context menu items to \a menu. Default-implementation: Pass on request to
+        /// current mode button or return false, if there is no current mode button.
+        ///
+        /// \attention menu can be a 0-pointer
+        ///
+        /// \return Have there been any menu items to be added (if menu is 0 and there
+        /// items to be added, the function must return true anyway.
+        virtual bool createContextMenu(QMenu* menu);
 
-            void setButton (std::map<ModeButton *, std::string>::iterator iter);
+        void setButton(std::map<ModeButton*, std::string>::iterator iter);
 
-        protected:
+    protected:
+        bool event(QEvent* event) override;
 
-            bool event(QEvent* event) override;
+    public:
+        SceneToolMode(SceneToolbar* parent, const QString& toolTip);
 
-        public:
+        void showPanel(const QPoint& position) override;
 
-            SceneToolMode (SceneToolbar *parent, const QString& toolTip);
+        void addButton(const std::string& icon, const std::string& id, const QString& tooltip = "");
 
-            void showPanel (const QPoint& position) override;
+        /// The ownership of \a button is transferred to *this.
+        void addButton(ModeButton* button, const std::string& id);
 
-            void addButton (const std::string& icon, const std::string& id,
-                const QString& tooltip = "");
+        /// Will return a 0-pointer only if the mode does not have any buttons yet.
+        ModeButton* getCurrent();
 
-            /// The ownership of \a button is transferred to *this.
-            void addButton (ModeButton *button, const std::string& id);
+        /// Must not be called if there aren't any buttons yet.
+        std::string getCurrentId() const;
 
-            /// Will return a 0-pointer only if the mode does not have any buttons yet.
-            ModeButton *getCurrent();
+        /// Manually change the current mode
+        void setButton(const std::string& id);
 
-            /// Must not be called if there aren't any buttons yet.
-            std::string getCurrentId() const;
+    signals:
 
-            /// Manually change the current mode
-            void setButton (const std::string& id);
+        void modeChanged(const std::string& id);
 
-        signals:
+    private slots:
 
-            void modeChanged (const std::string& id);
-
-        private slots:
-
-            void selected();
+        void selected();
     };
 }
 
diff --git a/apps/opencs/view/widget/scenetoolrun.cpp b/apps/opencs/view/widget/scenetoolrun.cpp
index 5dde1a2ccd..4b60e6845e 100644
--- a/apps/opencs/view/widget/scenetoolrun.cpp
+++ b/apps/opencs/view/widget/scenetoolrun.cpp
@@ -2,123 +2,124 @@
 
 #include <iterator>
 
+#include <QApplication>
 #include <QFrame>
-#include <QTableWidget>
 #include <QHBoxLayout>
 #include <QHeaderView>
-#include <QApplication>
+#include <QTableWidget>
 
 void CSVWidget::SceneToolRun::adjustToolTips()
 {
     QString toolTip = mToolTip;
 
-    if (mSelected==mProfiles.end())
+    if (mSelected == mProfiles.end())
         toolTip += "<p>No debug profile selected (function disabled)";
     else
     {
-        toolTip += "<p>Debug profile: " + QString::fromUtf8 (mSelected->c_str());
+        toolTip += "<p>Debug profile: " + QString::fromUtf8(mSelected->c_str());
         toolTip += "<p>(right click to switch to a different profile)";
     }
 
-    setToolTip (toolTip);
+    setToolTip(toolTip);
 }
 
 void CSVWidget::SceneToolRun::updateIcon()
 {
-    setDisabled (mSelected==mProfiles.end());
+    setDisabled(mSelected == mProfiles.end());
 }
 
 void CSVWidget::SceneToolRun::updatePanel()
 {
-    mTable->setRowCount (static_cast<int>(mProfiles.size()));
+    mTable->setRowCount(static_cast<int>(mProfiles.size()));
 
     int i = 0;
 
-    for (std::set<std::string>::const_iterator iter (mProfiles.begin()); iter!=mProfiles.end();
-        ++iter, ++i)
+    for (std::set<std::string>::const_iterator iter(mProfiles.begin()); iter != mProfiles.end(); ++iter, ++i)
     {
-        mTable->setItem (i, 0, new QTableWidgetItem (QString::fromUtf8 (iter->c_str())));
+        mTable->setItem(i, 0, new QTableWidgetItem(QString::fromUtf8(iter->c_str())));
 
-        mTable->setItem (i, 1, new QTableWidgetItem (
-            QApplication::style()->standardIcon (QStyle::SP_TitleBarCloseButton), ""));
+        mTable->setItem(
+            i, 1, new QTableWidgetItem(QApplication::style()->standardIcon(QStyle::SP_TitleBarCloseButton), ""));
     }
 }
 
-CSVWidget::SceneToolRun::SceneToolRun (SceneToolbar *parent, const QString& toolTip,
-    const QString& icon, const std::vector<std::string>& profiles)
-: SceneTool (parent, Type_TopAction), mProfiles (profiles.begin(), profiles.end()),
-  mSelected (mProfiles.begin()), mToolTip (toolTip)
+CSVWidget::SceneToolRun::SceneToolRun(
+    SceneToolbar* parent, const QString& toolTip, const QString& icon, const std::vector<std::string>& profiles)
+    : SceneTool(parent, Type_TopAction)
+    , mProfiles(profiles.begin(), profiles.end())
+    , mSelected(mProfiles.begin())
+    , mToolTip(toolTip)
 {
-    setIcon (QIcon (icon));
+    setIcon(QIcon(icon));
     updateIcon();
     adjustToolTips();
 
-    mPanel = new QFrame (this, Qt::Popup);
+    mPanel = new QFrame(this, Qt::Popup);
 
-    QHBoxLayout *layout = new QHBoxLayout (mPanel);
+    QHBoxLayout* layout = new QHBoxLayout(mPanel);
 
-    layout->setContentsMargins (QMargins (0, 0, 0, 0));
+    layout->setContentsMargins(QMargins(0, 0, 0, 0));
 
-    mTable = new QTableWidget (0, 2, this);
+    mTable = new QTableWidget(0, 2, this);
 
-    mTable->setShowGrid (false);
+    mTable->setShowGrid(false);
     mTable->verticalHeader()->hide();
     mTable->horizontalHeader()->hide();
-    mTable->horizontalHeader()->setSectionResizeMode (0, QHeaderView::Stretch);
-    mTable->horizontalHeader()->setSectionResizeMode (1, QHeaderView::ResizeToContents);
-    mTable->setSelectionMode (QAbstractItemView::NoSelection);
+    mTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
+    mTable->horizontalHeader()->setSectionResizeMode(1, QHeaderView::ResizeToContents);
+    mTable->setSelectionMode(QAbstractItemView::NoSelection);
 
-    layout->addWidget (mTable);
+    layout->addWidget(mTable);
 
-    connect (mTable, &QTableWidget::clicked, this, &SceneToolRun::clicked);
+    connect(mTable, &QTableWidget::clicked, this, &SceneToolRun::clicked);
 }
 
-void CSVWidget::SceneToolRun::showPanel (const QPoint& position)
+void CSVWidget::SceneToolRun::showPanel(const QPoint& position)
 {
     updatePanel();
 
-    mPanel->move (position);
+    mPanel->move(position);
     mPanel->show();
 }
 
 void CSVWidget::SceneToolRun::activate()
 {
-    if (mSelected!=mProfiles.end())
-        emit runRequest (*mSelected);
+    if (mSelected != mProfiles.end())
+        emit runRequest(*mSelected);
 }
 
-void CSVWidget::SceneToolRun::removeProfile (const std::string& profile)
+void CSVWidget::SceneToolRun::removeProfile(const std::string& profile)
 {
-    std::set<std::string>::iterator iter = mProfiles.find (profile);
+    std::set<std::string>::iterator iter = mProfiles.find(profile);
 
-    if (iter!=mProfiles.end())
+    if (iter != mProfiles.end())
     {
-        if (iter==mSelected)
+        if (iter == mSelected)
         {
-            if (iter!=mProfiles.begin())
+            if (iter != mProfiles.begin())
                 --mSelected;
             else
                 ++mSelected;
         }
 
-        mProfiles.erase (iter);
+        mProfiles.erase(iter);
 
-        if (mSelected==mProfiles.end())
+        if (mSelected == mProfiles.end())
             updateIcon();
 
         adjustToolTips();
     }
 }
 
-void CSVWidget::SceneToolRun::addProfile (const std::string& profile)
+void CSVWidget::SceneToolRun::addProfile(const std::string& profile)
 {
-    std::set<std::string>::iterator iter = mProfiles.find (profile);
+    std::set<std::string>::iterator iter = mProfiles.find(profile);
 
-    if (iter==mProfiles.end())
+    if (iter == mProfiles.end())
     {
-        mProfiles.insert (profile);
+        mProfiles.insert(profile);
 
-        if (mSelected==mProfiles.end())
+        if (mSelected == mProfiles.end())
         {
             mSelected = mProfiles.begin();
             updateIcon();
@@ -128,22 +129,22 @@ void CSVWidget::SceneToolRun::addProfile (const std::string& profile)
     }
 }
 
-void CSVWidget::SceneToolRun::clicked (const QModelIndex& index)
+void CSVWidget::SceneToolRun::clicked(const QModelIndex& index)
 {
-    if (index.column()==0)
+    if (index.column() == 0)
     {
         // select profile
         mSelected = mProfiles.begin();
-        std::advance (mSelected, index.row());
+        std::advance(mSelected, index.row());
         mPanel->hide();
         adjustToolTips();
     }
-    else if (index.column()==1)
+    else if (index.column() == 1)
     {
         // remove profile from list
         std::set<std::string>::iterator iter = mProfiles.begin();
-        std::advance (iter, index.row());
-        removeProfile (*iter);
+        std::advance(iter, index.row());
+        removeProfile(*iter);
         updatePanel();
     }
 }
diff --git a/apps/opencs/view/widget/scenetoolrun.hpp b/apps/opencs/view/widget/scenetoolrun.hpp
index 4a90aa7c06..83142bd1e6 100644
--- a/apps/opencs/view/widget/scenetoolrun.hpp
+++ b/apps/opencs/view/widget/scenetoolrun.hpp
@@ -14,48 +14,46 @@ namespace CSVWidget
 {
     class SceneToolRun : public SceneTool
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            std::set<std::string> mProfiles;
-            std::set<std::string>::iterator mSelected;
-            QString mToolTip;
-            QFrame *mPanel;
-            QTableWidget *mTable;
+        std::set<std::string> mProfiles;
+        std::set<std::string>::iterator mSelected;
+        QString mToolTip;
+        QFrame* mPanel;
+        QTableWidget* mTable;
 
-        private:
+    private:
+        void adjustToolTips();
 
-            void adjustToolTips();
+        void updateIcon();
 
-            void updateIcon();
+        void updatePanel();
 
-            void updatePanel();
+    public:
+        SceneToolRun(SceneToolbar* parent, const QString& toolTip, const QString& icon,
+            const std::vector<std::string>& profiles);
 
-        public:
+        void showPanel(const QPoint& position) override;
 
-            SceneToolRun (SceneToolbar *parent, const QString& toolTip, const QString& icon,
-                const std::vector<std::string>& profiles);
+        void activate() override;
 
-            void showPanel (const QPoint& position) override;
+        /// \attention This function does not remove the profile from the profile selection
+        /// panel.
+        void removeProfile(const std::string& profile);
 
-            void activate() override;
+        /// \attention This function doe not add the profile to the profile selection
+        /// panel. This only happens when the panel is re-opened.
+        ///
+        /// \note Adding profiles that are already listed is a no-op.
+        void addProfile(const std::string& profile);
 
-            /// \attention This function does not remove the profile from the profile selection
-            /// panel.
-            void removeProfile (const std::string& profile);
+    private slots:
 
-            /// \attention This function doe not add the profile to the profile selection
-            /// panel. This only happens when the panel is re-opened.
-            ///
-            /// \note Adding profiles that are already listed is a no-op.
-            void addProfile (const std::string& profile);
+        void clicked(const QModelIndex& index);
 
-        private slots:
+    signals:
 
-            void clicked (const QModelIndex& index);
-
-        signals:
-
-            void runRequest (const std::string& profile);
+        void runRequest(const std::string& profile);
     };
 }
 
diff --git a/apps/opencs/view/widget/scenetoolshapebrush.cpp b/apps/opencs/view/widget/scenetoolshapebrush.cpp
index 834f739e2f..8674cd1a0a 100644
--- a/apps/opencs/view/widget/scenetoolshapebrush.cpp
+++ b/apps/opencs/view/widget/scenetoolshapebrush.cpp
@@ -23,8 +23,7 @@
 #include "../../model/prefs/state.hpp"
 #include "../../model/world/commands.hpp"
 
-
-CSVWidget::ShapeBrushSizeControls::ShapeBrushSizeControls(const QString &title, QWidget *parent)
+CSVWidget::ShapeBrushSizeControls::ShapeBrushSizeControls(const QString& title, QWidget* parent)
     : QGroupBox(title, parent)
 {
     mBrushSizeSlider->setTickPosition(QSlider::TicksBothSides);
@@ -35,44 +34,44 @@ CSVWidget::ShapeBrushSizeControls::ShapeBrushSizeControls(const QString &title,
     mBrushSizeSpinBox->setRange(1, CSMPrefs::get()["3D Scene Editing"]["shapebrush-maximumsize"].toInt());
     mBrushSizeSpinBox->setSingleStep(1);
 
-    QHBoxLayout *layoutSliderSize = new QHBoxLayout;
+    QHBoxLayout* layoutSliderSize = new QHBoxLayout;
     layoutSliderSize->addWidget(mBrushSizeSlider);
     layoutSliderSize->addWidget(mBrushSizeSpinBox);
 
-    connect(mBrushSizeSlider, &QSlider::valueChanged, mBrushSizeSpinBox,  &QSpinBox::setValue);
+    connect(mBrushSizeSlider, &QSlider::valueChanged, mBrushSizeSpinBox, &QSpinBox::setValue);
     connect(mBrushSizeSpinBox, qOverload<int>(&QSpinBox::valueChanged), mBrushSizeSlider, &QSlider::setValue);
 
     setLayout(layoutSliderSize);
 }
 
-CSVWidget::ShapeBrushWindow::ShapeBrushWindow(CSMDoc::Document& document, QWidget *parent)
-    : QFrame(parent, Qt::Popup),
-    mDocument(document)
+CSVWidget::ShapeBrushWindow::ShapeBrushWindow(CSMDoc::Document& document, QWidget* parent)
+    : QFrame(parent, Qt::Popup)
+    , mDocument(document)
 {
-    mButtonPoint = new QPushButton(QIcon (QPixmap (":scenetoolbar/brush-point")), "", this);
-    mButtonSquare = new QPushButton(QIcon (QPixmap (":scenetoolbar/brush-square")), "", this);
-    mButtonCircle = new QPushButton(QIcon (QPixmap (":scenetoolbar/brush-circle")), "", this);
-    mButtonCustom = new QPushButton(QIcon (QPixmap (":scenetoolbar/brush-custom")), "", this);
+    mButtonPoint = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-point")), "", this);
+    mButtonSquare = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-square")), "", this);
+    mButtonCircle = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-circle")), "", this);
+    mButtonCustom = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-custom")), "", this);
 
     mSizeSliders = new ShapeBrushSizeControls("Brush size", this);
 
-    QVBoxLayout *layoutMain = new QVBoxLayout;
+    QVBoxLayout* layoutMain = new QVBoxLayout;
     layoutMain->setSpacing(0);
-    layoutMain->setContentsMargins(4,0,4,4);
+    layoutMain->setContentsMargins(4, 0, 4, 4);
 
-    QHBoxLayout *layoutHorizontal = new QHBoxLayout;
+    QHBoxLayout* layoutHorizontal = new QHBoxLayout;
     layoutHorizontal->setSpacing(0);
-    layoutHorizontal->setContentsMargins (QMargins (0, 0, 0, 0));
+    layoutHorizontal->setContentsMargins(QMargins(0, 0, 0, 0));
 
     configureButtonInitialSettings(mButtonPoint);
     configureButtonInitialSettings(mButtonSquare);
     configureButtonInitialSettings(mButtonCircle);
     configureButtonInitialSettings(mButtonCustom);
 
-    mButtonPoint->setToolTip (toolTipPoint);
-    mButtonSquare->setToolTip (toolTipSquare);
-    mButtonCircle->setToolTip (toolTipCircle);
-    mButtonCustom->setToolTip (toolTipCustom);
+    mButtonPoint->setToolTip(toolTipPoint);
+    mButtonSquare->setToolTip(toolTipSquare);
+    mButtonCircle->setToolTip(toolTipCircle);
+    mButtonCustom->setToolTip(toolTipCustom);
 
     QButtonGroup* brushButtonGroup = new QButtonGroup(this);
     brushButtonGroup->addButton(mButtonPoint);
@@ -97,7 +96,7 @@ CSVWidget::ShapeBrushWindow::ShapeBrushWindow(CSMDoc::Document& document, QWidge
     mToolSelector->addItem(tr("Smooth (paint)"));
     mToolSelector->addItem(tr("Flatten (paint)"));
 
-    QLabel *brushStrengthLabel = new QLabel(this);
+    QLabel* brushStrengthLabel = new QLabel(this);
     brushStrengthLabel->setText("Brush strength:");
 
     mToolStrengthSlider = new QSlider(Qt::Horizontal);
@@ -121,13 +120,13 @@ CSVWidget::ShapeBrushWindow::ShapeBrushWindow(CSMDoc::Document& document, QWidge
     connect(mButtonCustom, &QPushButton::clicked, this, &ShapeBrushWindow::setBrushShape);
 }
 
-void CSVWidget::ShapeBrushWindow::configureButtonInitialSettings(QPushButton *button)
+void CSVWidget::ShapeBrushWindow::configureButtonInitialSettings(QPushButton* button)
 {
-  button->setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed));
-  button->setContentsMargins (QMargins (0, 0, 0, 0));
-  button->setIconSize (QSize (48-6, 48-6));
-  button->setFixedSize (48, 48);
-  button->setCheckable(true);
+    button->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+    button->setContentsMargins(QMargins(0, 0, 0, 0));
+    button->setIconSize(QSize(48 - 6, 48 - 6));
+    button->setFixedSize(48, 48);
+    button->setCheckable(true);
 }
 
 void CSVWidget::ShapeBrushWindow::setBrushSize(int brushSize)
@@ -138,49 +137,51 @@ void CSVWidget::ShapeBrushWindow::setBrushSize(int brushSize)
 
 void CSVWidget::ShapeBrushWindow::setBrushShape()
 {
-    if(mButtonPoint->isChecked()) mBrushShape = BrushShape_Point;
-    if(mButtonSquare->isChecked()) mBrushShape = BrushShape_Square;
-    if(mButtonCircle->isChecked()) mBrushShape = BrushShape_Circle;
-    if(mButtonCustom->isChecked()) mBrushShape = BrushShape_Custom;
+    if (mButtonPoint->isChecked())
+        mBrushShape = BrushShape_Point;
+    if (mButtonSquare->isChecked())
+        mBrushShape = BrushShape_Square;
+    if (mButtonCircle->isChecked())
+        mBrushShape = BrushShape_Circle;
+    if (mButtonCustom->isChecked())
+        mBrushShape = BrushShape_Custom;
     emit passBrushShape(mBrushShape);
 }
 
-void CSVWidget::SceneToolShapeBrush::adjustToolTips()
-{
-}
+void CSVWidget::SceneToolShapeBrush::adjustToolTips() {}
 
-CSVWidget::SceneToolShapeBrush::SceneToolShapeBrush (SceneToolbar *parent, const QString& toolTip, CSMDoc::Document& document)
-: SceneTool (parent, Type_TopAction),
-    mToolTip (toolTip),
-    mDocument (document),
-    mShapeBrushWindow(new ShapeBrushWindow(document, this))
+CSVWidget::SceneToolShapeBrush::SceneToolShapeBrush(
+    SceneToolbar* parent, const QString& toolTip, CSMDoc::Document& document)
+    : SceneTool(parent, Type_TopAction)
+    , mToolTip(toolTip)
+    , mDocument(document)
+    , mShapeBrushWindow(new ShapeBrushWindow(document, this))
 {
     setAcceptDrops(true);
     connect(mShapeBrushWindow, &ShapeBrushWindow::passBrushShape, this, &SceneToolShapeBrush::setButtonIcon);
     setButtonIcon(mShapeBrushWindow->mBrushShape);
 
-    mPanel = new QFrame (this, Qt::Popup);
+    mPanel = new QFrame(this, Qt::Popup);
 
-    QHBoxLayout *layout = new QHBoxLayout (mPanel);
+    QHBoxLayout* layout = new QHBoxLayout(mPanel);
 
-    layout->setContentsMargins (QMargins (0, 0, 0, 0));
+    layout->setContentsMargins(QMargins(0, 0, 0, 0));
 
-    mTable = new QTableWidget (0, 2, this);
+    mTable = new QTableWidget(0, 2, this);
 
-    mTable->setShowGrid (true);
+    mTable->setShowGrid(true);
     mTable->verticalHeader()->hide();
     mTable->horizontalHeader()->hide();
-    mTable->horizontalHeader()->setSectionResizeMode (0, QHeaderView::Stretch);
-    mTable->horizontalHeader()->setSectionResizeMode (1, QHeaderView::Stretch);
-    mTable->setSelectionMode (QAbstractItemView::NoSelection);
+    mTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
+    mTable->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
+    mTable->setSelectionMode(QAbstractItemView::NoSelection);
 
-    layout->addWidget (mTable);
-
-    connect (mTable, &QTableWidget::clicked, this, &SceneToolShapeBrush::clicked);
+    layout->addWidget(mTable);
 
+    connect(mTable, &QTableWidget::clicked, this, &SceneToolShapeBrush::clicked);
 }
 
-void CSVWidget::SceneToolShapeBrush::setButtonIcon (CSVWidget::BrushShape brushShape)
+void CSVWidget::SceneToolShapeBrush::setButtonIcon(CSVWidget::BrushShape brushShape)
 {
     QString tooltip = "Change brush settings <p>Currently selected: ";
 
@@ -188,59 +189,55 @@ void CSVWidget::SceneToolShapeBrush::setButtonIcon (CSVWidget::BrushShape brushS
     {
         case BrushShape_Point:
 
-            setIcon (QIcon (QPixmap (":scenetoolbar/brush-point")));
+            setIcon(QIcon(QPixmap(":scenetoolbar/brush-point")));
             tooltip += mShapeBrushWindow->toolTipPoint;
             break;
 
         case BrushShape_Square:
 
-            setIcon (QIcon (QPixmap (":scenetoolbar/brush-square")));
+            setIcon(QIcon(QPixmap(":scenetoolbar/brush-square")));
             tooltip += mShapeBrushWindow->toolTipSquare;
             break;
 
         case BrushShape_Circle:
 
-            setIcon (QIcon (QPixmap (":scenetoolbar/brush-circle")));
+            setIcon(QIcon(QPixmap(":scenetoolbar/brush-circle")));
             tooltip += mShapeBrushWindow->toolTipCircle;
             break;
 
         case BrushShape_Custom:
 
-            setIcon (QIcon (QPixmap (":scenetoolbar/brush-custom")));
+            setIcon(QIcon(QPixmap(":scenetoolbar/brush-custom")));
             tooltip += mShapeBrushWindow->toolTipCustom;
             break;
     }
 
-    setToolTip (tooltip);
+    setToolTip(tooltip);
 }
 
-void CSVWidget::SceneToolShapeBrush::showPanel (const QPoint& position)
-{
-}
+void CSVWidget::SceneToolShapeBrush::showPanel(const QPoint& position) {}
 
-void CSVWidget::SceneToolShapeBrush::updatePanel ()
-{
-}
+void CSVWidget::SceneToolShapeBrush::updatePanel() {}
 
-void CSVWidget::SceneToolShapeBrush::clicked (const QModelIndex& index)
-{
-}
+void CSVWidget::SceneToolShapeBrush::clicked(const QModelIndex& index) {}
 
-void CSVWidget::SceneToolShapeBrush::activate ()
+void CSVWidget::SceneToolShapeBrush::activate()
 {
     QPoint position = QCursor::pos();
-    mShapeBrushWindow->mSizeSliders->mBrushSizeSlider->setRange(1, CSMPrefs::get()["3D Scene Editing"]["shapebrush-maximumsize"].toInt());
-    mShapeBrushWindow->mSizeSliders->mBrushSizeSpinBox->setRange(1, CSMPrefs::get()["3D Scene Editing"]["shapebrush-maximumsize"].toInt());
-    mShapeBrushWindow->move (position);
+    mShapeBrushWindow->mSizeSliders->mBrushSizeSlider->setRange(
+        1, CSMPrefs::get()["3D Scene Editing"]["shapebrush-maximumsize"].toInt());
+    mShapeBrushWindow->mSizeSliders->mBrushSizeSpinBox->setRange(
+        1, CSMPrefs::get()["3D Scene Editing"]["shapebrush-maximumsize"].toInt());
+    mShapeBrushWindow->move(position);
     mShapeBrushWindow->show();
 }
 
-void CSVWidget::SceneToolShapeBrush::dragEnterEvent (QDragEnterEvent *event)
+void CSVWidget::SceneToolShapeBrush::dragEnterEvent(QDragEnterEvent* event)
 {
     emit passEvent(event);
     event->accept();
 }
-void CSVWidget::SceneToolShapeBrush::dropEvent (QDropEvent *event)
+void CSVWidget::SceneToolShapeBrush::dropEvent(QDropEvent* event)
 {
     emit passEvent(event);
     event->accept();
diff --git a/apps/opencs/view/widget/scenetoolshapebrush.hpp b/apps/opencs/view/widget/scenetoolshapebrush.hpp
index e616e6958e..7dc4b2e6a6 100644
--- a/apps/opencs/view/widget/scenetoolshapebrush.hpp
+++ b/apps/opencs/view/widget/scenetoolshapebrush.hpp
@@ -4,12 +4,12 @@
 #include <QFrame>
 #include <QModelIndex>
 
-#include <QWidget>
 #include <QComboBox>
-#include <QSpinBox>
 #include <QGroupBox>
-#include <QSlider>
 #include <QPushButton>
+#include <QSlider>
+#include <QSpinBox>
+#include <QWidget>
 
 #ifndef Q_MOC_RUN
 #include "brushshapes.hpp"
@@ -32,12 +32,12 @@ namespace CSVWidget
     {
         Q_OBJECT
 
-        public:
-            ShapeBrushSizeControls(const QString &title, QWidget *parent);
+    public:
+        ShapeBrushSizeControls(const QString& title, QWidget* parent);
 
-        private:
-            QSlider *mBrushSizeSlider = new QSlider(Qt::Horizontal);
-            QSpinBox *mBrushSizeSpinBox = new QSpinBox;
+    private:
+        QSlider* mBrushSizeSlider = new QSlider(Qt::Horizontal);
+        QSpinBox* mBrushSizeSpinBox = new QSpinBox;
 
         friend class SceneToolShapeBrush;
         friend class CSVRender::TerrainShapeMode;
@@ -48,75 +48,72 @@ namespace CSVWidget
     {
         Q_OBJECT
 
-        public:
-
-            ShapeBrushWindow(CSMDoc::Document& document, QWidget *parent = nullptr);
-            void configureButtonInitialSettings(QPushButton *button);
-
-            const QString toolTipPoint = "Paint single point";
-            const QString toolTipSquare = "Paint with square brush";
-            const QString toolTipCircle = "Paint with circle brush";
-            const QString toolTipCustom = "Paint with custom brush, defined by terrain selection";
-
-        private:
-            CSVWidget::BrushShape mBrushShape = CSVWidget::BrushShape_Point;
-            int mBrushSize = 1;
-            CSMDoc::Document& mDocument;
-            QGroupBox *mHorizontalGroupBox;
-            QComboBox *mToolSelector;
-            QSlider *mToolStrengthSlider;
-            QPushButton *mButtonPoint;
-            QPushButton *mButtonSquare;
-            QPushButton *mButtonCircle;
-            QPushButton *mButtonCustom;
-            ShapeBrushSizeControls* mSizeSliders;
+    public:
+        ShapeBrushWindow(CSMDoc::Document& document, QWidget* parent = nullptr);
+        void configureButtonInitialSettings(QPushButton* button);
+
+        const QString toolTipPoint = "Paint single point";
+        const QString toolTipSquare = "Paint with square brush";
+        const QString toolTipCircle = "Paint with circle brush";
+        const QString toolTipCustom = "Paint with custom brush, defined by terrain selection";
+
+    private:
+        CSVWidget::BrushShape mBrushShape = CSVWidget::BrushShape_Point;
+        int mBrushSize = 1;
+        CSMDoc::Document& mDocument;
+        QGroupBox* mHorizontalGroupBox;
+        QComboBox* mToolSelector;
+        QSlider* mToolStrengthSlider;
+        QPushButton* mButtonPoint;
+        QPushButton* mButtonSquare;
+        QPushButton* mButtonCircle;
+        QPushButton* mButtonCustom;
+        ShapeBrushSizeControls* mSizeSliders;
 
         friend class SceneToolShapeBrush;
         friend class CSVRender::TerrainShapeMode;
 
-        public slots:
-            void setBrushShape();
-            void setBrushSize(int brushSize);
+    public slots:
+        void setBrushShape();
+        void setBrushSize(int brushSize);
 
-        signals:
-            void passBrushSize (int brushSize);
-            void passBrushShape(CSVWidget::BrushShape brushShape);
+    signals:
+        void passBrushSize(int brushSize);
+        void passBrushShape(CSVWidget::BrushShape brushShape);
     };
 
     class SceneToolShapeBrush : public SceneTool
     {
-            Q_OBJECT
-
-            QString mToolTip;
-            CSMDoc::Document& mDocument;
-            QFrame *mPanel;
-            QTableWidget *mTable;
-            ShapeBrushWindow *mShapeBrushWindow;
-
-        private:
+        Q_OBJECT
 
-            void adjustToolTips();
+        QString mToolTip;
+        CSMDoc::Document& mDocument;
+        QFrame* mPanel;
+        QTableWidget* mTable;
+        ShapeBrushWindow* mShapeBrushWindow;
 
-        public:
+    private:
+        void adjustToolTips();
 
-            SceneToolShapeBrush (SceneToolbar *parent, const QString& toolTip, CSMDoc::Document& document);
+    public:
+        SceneToolShapeBrush(SceneToolbar* parent, const QString& toolTip, CSMDoc::Document& document);
 
-            void showPanel (const QPoint& position) override;
-            void updatePanel ();
+        void showPanel(const QPoint& position) override;
+        void updatePanel();
 
-            void dropEvent (QDropEvent *event) override;
-            void dragEnterEvent (QDragEnterEvent *event) override;
+        void dropEvent(QDropEvent* event) override;
+        void dragEnterEvent(QDragEnterEvent* event) override;
 
         friend class CSVRender::TerrainShapeMode;
 
-        public slots:
-            void setButtonIcon(CSVWidget::BrushShape brushShape);
-            void clicked (const QModelIndex& index);
-            void activate() override;
+    public slots:
+        void setButtonIcon(CSVWidget::BrushShape brushShape);
+        void clicked(const QModelIndex& index);
+        void activate() override;
 
-        signals:
-            void passEvent(QDropEvent *event);
-            void passEvent(QDragEnterEvent *event);
+    signals:
+        void passEvent(QDropEvent* event);
+        void passEvent(QDragEnterEvent* event);
     };
 }
 
diff --git a/apps/opencs/view/widget/scenetooltexturebrush.cpp b/apps/opencs/view/widget/scenetooltexturebrush.cpp
index 2ba0d3bcb0..e3e47677c2 100644
--- a/apps/opencs/view/widget/scenetooltexturebrush.cpp
+++ b/apps/opencs/view/widget/scenetooltexturebrush.cpp
@@ -26,12 +26,11 @@
 #include "../../model/world/landtexture.hpp"
 #include "../../model/world/universalid.hpp"
 
-
-CSVWidget::BrushSizeControls::BrushSizeControls(const QString &title, QWidget *parent)
-    : QGroupBox(title, parent),
-    mLayoutSliderSize(new QHBoxLayout),
-    mBrushSizeSlider(new QSlider(Qt::Horizontal)),
-    mBrushSizeSpinBox(new QSpinBox)
+CSVWidget::BrushSizeControls::BrushSizeControls(const QString& title, QWidget* parent)
+    : QGroupBox(title, parent)
+    , mLayoutSliderSize(new QHBoxLayout)
+    , mBrushSizeSlider(new QSlider(Qt::Horizontal))
+    , mBrushSizeSpinBox(new QSpinBox)
 {
     mBrushSizeSlider->setTickPosition(QSlider::TicksBothSides);
     mBrushSizeSlider->setTickInterval(10);
@@ -44,15 +43,15 @@ CSVWidget::BrushSizeControls::BrushSizeControls(const QString &title, QWidget *p
     mLayoutSliderSize->addWidget(mBrushSizeSlider);
     mLayoutSliderSize->addWidget(mBrushSizeSpinBox);
 
-    connect(mBrushSizeSlider, &QSlider::valueChanged, mBrushSizeSpinBox,  &QSpinBox::setValue);
+    connect(mBrushSizeSlider, &QSlider::valueChanged, mBrushSizeSpinBox, &QSpinBox::setValue);
     connect(mBrushSizeSpinBox, qOverload<int>(&QSpinBox::valueChanged), mBrushSizeSlider, &QSlider::setValue);
 
     setLayout(mLayoutSliderSize);
 }
 
-CSVWidget::TextureBrushWindow::TextureBrushWindow(CSMDoc::Document& document, QWidget *parent)
-    : QFrame(parent, Qt::Popup),
-    mDocument(document)
+CSVWidget::TextureBrushWindow::TextureBrushWindow(CSMDoc::Document& document, QWidget* parent)
+    : QFrame(parent, Qt::Popup)
+    , mDocument(document)
 {
     mBrushTextureLabel = "Selected texture: " + mBrushTexture + " ";
 
@@ -63,37 +62,39 @@ CSVWidget::TextureBrushWindow::TextureBrushWindow(CSMDoc::Document& document, QW
 
     if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted())
     {
-        mSelectedBrush = new QLabel(QString::fromStdString(mBrushTextureLabel) + landtexturesCollection.getData(index, landTextureFilename).value<QString>());
-    } else
+        mSelectedBrush = new QLabel(QString::fromStdString(mBrushTextureLabel)
+            + landtexturesCollection.getData(index, landTextureFilename).value<QString>());
+    }
+    else
     {
         mBrushTextureLabel = "No selected texture or invalid texture";
         mSelectedBrush = new QLabel(QString::fromStdString(mBrushTextureLabel));
     }
 
-    mButtonPoint = new QPushButton(QIcon (QPixmap (":scenetoolbar/brush-point")), "", this);
-    mButtonSquare = new QPushButton(QIcon (QPixmap (":scenetoolbar/brush-square")), "", this);
-    mButtonCircle = new QPushButton(QIcon (QPixmap (":scenetoolbar/brush-circle")), "", this);
-    mButtonCustom = new QPushButton(QIcon (QPixmap (":scenetoolbar/brush-custom")), "", this);
+    mButtonPoint = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-point")), "", this);
+    mButtonSquare = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-square")), "", this);
+    mButtonCircle = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-circle")), "", this);
+    mButtonCustom = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-custom")), "", this);
 
     mSizeSliders = new BrushSizeControls("Brush size", this);
 
-    QVBoxLayout *layoutMain = new QVBoxLayout;
+    QVBoxLayout* layoutMain = new QVBoxLayout;
     layoutMain->setSpacing(0);
-    layoutMain->setContentsMargins(4,0,4,4);
+    layoutMain->setContentsMargins(4, 0, 4, 4);
 
-    QHBoxLayout *layoutHorizontal = new QHBoxLayout;
+    QHBoxLayout* layoutHorizontal = new QHBoxLayout;
     layoutHorizontal->setSpacing(0);
-    layoutHorizontal->setContentsMargins (QMargins (0, 0, 0, 0));
+    layoutHorizontal->setContentsMargins(QMargins(0, 0, 0, 0));
 
     configureButtonInitialSettings(mButtonPoint);
     configureButtonInitialSettings(mButtonSquare);
     configureButtonInitialSettings(mButtonCircle);
     configureButtonInitialSettings(mButtonCustom);
 
-    mButtonPoint->setToolTip (toolTipPoint);
-    mButtonSquare->setToolTip (toolTipSquare);
-    mButtonCircle->setToolTip (toolTipCircle);
-    mButtonCustom->setToolTip (toolTipCustom);
+    mButtonPoint->setToolTip(toolTipPoint);
+    mButtonSquare->setToolTip(toolTipSquare);
+    mButtonCircle->setToolTip(toolTipCircle);
+    mButtonCustom->setToolTip(toolTipCustom);
 
     QButtonGroup* brushButtonGroup = new QButtonGroup(this);
     brushButtonGroup->addButton(mButtonPoint);
@@ -123,19 +124,19 @@ CSVWidget::TextureBrushWindow::TextureBrushWindow(CSMDoc::Document& document, QW
     connect(mButtonCustom, &QPushButton::clicked, this, &TextureBrushWindow::setBrushShape);
 }
 
-void CSVWidget::TextureBrushWindow::configureButtonInitialSettings(QPushButton *button)
+void CSVWidget::TextureBrushWindow::configureButtonInitialSettings(QPushButton* button)
 {
-  button->setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed));
-  button->setContentsMargins (QMargins (0, 0, 0, 0));
-  button->setIconSize (QSize (48-6, 48-6));
-  button->setFixedSize (48, 48);
-  button->setCheckable(true);
+    button->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+    button->setContentsMargins(QMargins(0, 0, 0, 0));
+    button->setIconSize(QSize(48 - 6, 48 - 6));
+    button->setFixedSize(48, 48);
+    button->setCheckable(true);
 }
 
 void CSVWidget::TextureBrushWindow::setBrushTexture(std::string brushTexture)
 {
-    CSMWorld::IdTable& ltexTable = dynamic_cast<CSMWorld::IdTable&> (
-        *mDocument.getData().getTableModel (CSMWorld::UniversalId::Type_LandTextures));
+    CSMWorld::IdTable& ltexTable = dynamic_cast<CSMWorld::IdTable&>(
+        *mDocument.getData().getTableModel(CSMWorld::UniversalId::Type_LandTextures));
     QUndoStack& undoStack = mDocument.getUndoStack();
 
     CSMWorld::IdCollection<CSMWorld::LandTexture>& landtexturesCollection = mDocument.getData().getLandTextures();
@@ -155,30 +156,35 @@ void CSVWidget::TextureBrushWindow::setBrushTexture(std::string brushTexture)
     {
         if (rowInBase == -1)
         {
-            int counter=0;
+            int counter = 0;
             bool freeIndexFound = false;
             const int maxCounter = std::numeric_limits<uint16_t>::max() - 1;
-            do {
+            do
+            {
                 newBrushTextureId = CSMWorld::LandTexture::createUniqueRecordId(0, counter);
-                if (landtexturesCollection.searchId(brushTexture) != -1 &&
-                    landtexturesCollection.getRecord(brushTexture).isDeleted() == 0 &&
-                    landtexturesCollection.searchId(newBrushTextureId) != -1 &&
-                    landtexturesCollection.getRecord(newBrushTextureId).isDeleted() == 0)
-                        counter = (counter + 1) % maxCounter;
-                else freeIndexFound = true;
+                if (landtexturesCollection.searchId(brushTexture) != -1
+                    && landtexturesCollection.getRecord(brushTexture).isDeleted() == 0
+                    && landtexturesCollection.searchId(newBrushTextureId) != -1
+                    && landtexturesCollection.getRecord(newBrushTextureId).isDeleted() == 0)
+                    counter = (counter + 1) % maxCounter;
+                else
+                    freeIndexFound = true;
             } while (freeIndexFound == false || counter < maxCounter);
         }
 
-        undoStack.beginMacro ("Add land texture record");
-        undoStack.push (new CSMWorld::CloneCommand (ltexTable, brushTexture, newBrushTextureId, CSMWorld::UniversalId::Type_LandTexture));
+        undoStack.beginMacro("Add land texture record");
+        undoStack.push(new CSMWorld::CloneCommand(
+            ltexTable, brushTexture, newBrushTextureId, CSMWorld::UniversalId::Type_LandTexture));
         undoStack.endMacro();
     }
 
     if (index != -1 && !landtexturesCollection.getRecord(rowInNew).isDeleted())
     {
         mBrushTextureLabel = "Selected texture: " + newBrushTextureId + " ";
-        mSelectedBrush->setText(QString::fromStdString(mBrushTextureLabel) + landtexturesCollection.getData(rowInNew, landTextureFilename).value<QString>());
-    } else
+        mSelectedBrush->setText(QString::fromStdString(mBrushTextureLabel)
+            + landtexturesCollection.getData(rowInNew, landTextureFilename).value<QString>());
+    }
+    else
     {
         newBrushTextureId.clear();
         mBrushTextureLabel = "No selected texture or invalid texture";
@@ -210,15 +216,14 @@ void CSVWidget::TextureBrushWindow::setBrushShape()
     emit passBrushShape(mBrushShape);
 }
 
-void CSVWidget::SceneToolTextureBrush::adjustToolTips()
-{
-}
+void CSVWidget::SceneToolTextureBrush::adjustToolTips() {}
 
-CSVWidget::SceneToolTextureBrush::SceneToolTextureBrush (SceneToolbar *parent, const QString& toolTip, CSMDoc::Document& document)
-: SceneTool (parent, Type_TopAction),
-    mToolTip (toolTip),
-    mDocument (document),
-    mTextureBrushWindow(new TextureBrushWindow(document, this))
+CSVWidget::SceneToolTextureBrush::SceneToolTextureBrush(
+    SceneToolbar* parent, const QString& toolTip, CSMDoc::Document& document)
+    : SceneTool(parent, Type_TopAction)
+    , mToolTip(toolTip)
+    , mDocument(document)
+    , mTextureBrushWindow(new TextureBrushWindow(document, this))
 {
     mBrushHistory.resize(1);
     mBrushHistory[0] = "L0#0";
@@ -227,28 +232,27 @@ CSVWidget::SceneToolTextureBrush::SceneToolTextureBrush (SceneToolbar *parent, c
     connect(mTextureBrushWindow, &TextureBrushWindow::passBrushShape, this, &SceneToolTextureBrush::setButtonIcon);
     setButtonIcon(mTextureBrushWindow->mBrushShape);
 
-    mPanel = new QFrame (this, Qt::Popup);
+    mPanel = new QFrame(this, Qt::Popup);
 
-    QHBoxLayout *layout = new QHBoxLayout (mPanel);
+    QHBoxLayout* layout = new QHBoxLayout(mPanel);
 
-    layout->setContentsMargins (QMargins (0, 0, 0, 0));
+    layout->setContentsMargins(QMargins(0, 0, 0, 0));
 
-    mTable = new QTableWidget (0, 2, this);
+    mTable = new QTableWidget(0, 2, this);
 
-    mTable->setShowGrid (true);
+    mTable->setShowGrid(true);
     mTable->verticalHeader()->hide();
     mTable->horizontalHeader()->hide();
-    mTable->horizontalHeader()->setSectionResizeMode (0, QHeaderView::Stretch);
-    mTable->horizontalHeader()->setSectionResizeMode (1, QHeaderView::Stretch);
-    mTable->setSelectionMode (QAbstractItemView::NoSelection);
+    mTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
+    mTable->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
+    mTable->setSelectionMode(QAbstractItemView::NoSelection);
 
-    layout->addWidget (mTable);
-
-    connect (mTable, &QTableWidget::clicked, this, &SceneToolTextureBrush::clicked);
+    layout->addWidget(mTable);
 
+    connect(mTable, &QTableWidget::clicked, this, &SceneToolTextureBrush::clicked);
 }
 
-void CSVWidget::SceneToolTextureBrush::setButtonIcon (CSVWidget::BrushShape brushShape)
+void CSVWidget::SceneToolTextureBrush::setButtonIcon(CSVWidget::BrushShape brushShape)
 {
     QString tooltip = "Change brush settings <p>Currently selected: ";
 
@@ -256,32 +260,31 @@ void CSVWidget::SceneToolTextureBrush::setButtonIcon (CSVWidget::BrushShape brus
     {
         case BrushShape_Point:
 
-            setIcon (QIcon (QPixmap (":scenetoolbar/brush-point")));
+            setIcon(QIcon(QPixmap(":scenetoolbar/brush-point")));
             tooltip += mTextureBrushWindow->toolTipPoint;
             break;
 
         case BrushShape_Square:
 
-            setIcon (QIcon (QPixmap (":scenetoolbar/brush-square")));
+            setIcon(QIcon(QPixmap(":scenetoolbar/brush-square")));
             tooltip += mTextureBrushWindow->toolTipSquare;
             break;
 
         case BrushShape_Circle:
 
-            setIcon (QIcon (QPixmap (":scenetoolbar/brush-circle")));
+            setIcon(QIcon(QPixmap(":scenetoolbar/brush-circle")));
             tooltip += mTextureBrushWindow->toolTipCircle;
             break;
 
         case BrushShape_Custom:
 
-            setIcon (QIcon (QPixmap (":scenetoolbar/brush-custom")));
+            setIcon(QIcon(QPixmap(":scenetoolbar/brush-custom")));
             tooltip += mTextureBrushWindow->toolTipCustom;
             break;
     }
 
     tooltip += "<p>(right click to access of previously used brush settings)";
 
-
     CSMWorld::IdCollection<CSMWorld::LandTexture>& landtexturesCollection = mDocument.getData().getLandTextures();
 
     int landTextureFilename = landtexturesCollection.findColumnIndex(CSMWorld::Columns::ColumnId_Texture);
@@ -292,27 +295,28 @@ void CSVWidget::SceneToolTextureBrush::setButtonIcon (CSVWidget::BrushShape brus
         tooltip += "<p>Selected texture: " + QString::fromStdString(mTextureBrushWindow->mBrushTexture) + " ";
 
         tooltip += landtexturesCollection.getData(index, landTextureFilename).value<QString>();
-    } else
+    }
+    else
     {
         tooltip += "<p>No selected texture or invalid texture";
     }
 
     tooltip += "<br>(drop texture here to change)";
-    setToolTip (tooltip);
+    setToolTip(tooltip);
 }
 
-void CSVWidget::SceneToolTextureBrush::showPanel (const QPoint& position)
+void CSVWidget::SceneToolTextureBrush::showPanel(const QPoint& position)
 {
     updatePanel();
-    mPanel->move (position);
+    mPanel->move(position);
     mPanel->show();
 }
 
 void CSVWidget::SceneToolTextureBrush::updatePanel()
 {
-    mTable->setRowCount (mBrushHistory.size());
+    mTable->setRowCount(mBrushHistory.size());
 
-    for (int i = mBrushHistory.size()-1; i >= 0; --i)
+    for (int i = mBrushHistory.size() - 1; i >= 0; --i)
     {
         CSMWorld::IdCollection<CSMWorld::LandTexture>& landtexturesCollection = mDocument.getData().getLandTextures();
         int landTextureFilename = landtexturesCollection.findColumnIndex(CSMWorld::Columns::ColumnId_Texture);
@@ -320,25 +324,28 @@ void CSVWidget::SceneToolTextureBrush::updatePanel()
 
         if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted())
         {
-            mTable->setItem (i, 1, new QTableWidgetItem (landtexturesCollection.getData(index, landTextureFilename).value<QString>()));
-            mTable->setItem (i, 0, new QTableWidgetItem (QString::fromStdString(mBrushHistory[i])));
-        } else
+            mTable->setItem(i, 1,
+                new QTableWidgetItem(landtexturesCollection.getData(index, landTextureFilename).value<QString>()));
+            mTable->setItem(i, 0, new QTableWidgetItem(QString::fromStdString(mBrushHistory[i])));
+        }
+        else
         {
-            mTable->setItem (i, 1, new QTableWidgetItem ("Invalid/deleted texture"));
-            mTable->setItem (i, 0, new QTableWidgetItem (QString::fromStdString(mBrushHistory[i])));
+            mTable->setItem(i, 1, new QTableWidgetItem("Invalid/deleted texture"));
+            mTable->setItem(i, 0, new QTableWidgetItem(QString::fromStdString(mBrushHistory[i])));
         }
     }
 }
 
-void CSVWidget::SceneToolTextureBrush::updateBrushHistory (const std::string& brushTexture)
+void CSVWidget::SceneToolTextureBrush::updateBrushHistory(const std::string& brushTexture)
 {
     mBrushHistory.insert(mBrushHistory.begin(), brushTexture);
-    if(mBrushHistory.size() > 5) mBrushHistory.pop_back();
+    if (mBrushHistory.size() > 5)
+        mBrushHistory.pop_back();
 }
 
-void CSVWidget::SceneToolTextureBrush::clicked (const QModelIndex& index)
+void CSVWidget::SceneToolTextureBrush::clicked(const QModelIndex& index)
 {
-    if (index.column()==0 || index.column()==1)
+    if (index.column() == 0 || index.column() == 1)
     {
         std::string brushTexture = mBrushHistory[index.row()];
         std::swap(mBrushHistory[index.row()], mBrushHistory[0]);
@@ -349,21 +356,23 @@ void CSVWidget::SceneToolTextureBrush::clicked (const QModelIndex& index)
     }
 }
 
-void CSVWidget::SceneToolTextureBrush::activate ()
+void CSVWidget::SceneToolTextureBrush::activate()
 {
     QPoint position = QCursor::pos();
-    mTextureBrushWindow->mSizeSliders->mBrushSizeSlider->setRange(1, CSMPrefs::get()["3D Scene Editing"]["texturebrush-maximumsize"].toInt());
-    mTextureBrushWindow->mSizeSliders->mBrushSizeSpinBox->setRange(1, CSMPrefs::get()["3D Scene Editing"]["texturebrush-maximumsize"].toInt());
-    mTextureBrushWindow->move (position);
+    mTextureBrushWindow->mSizeSliders->mBrushSizeSlider->setRange(
+        1, CSMPrefs::get()["3D Scene Editing"]["texturebrush-maximumsize"].toInt());
+    mTextureBrushWindow->mSizeSliders->mBrushSizeSpinBox->setRange(
+        1, CSMPrefs::get()["3D Scene Editing"]["texturebrush-maximumsize"].toInt());
+    mTextureBrushWindow->move(position);
     mTextureBrushWindow->show();
 }
 
-void CSVWidget::SceneToolTextureBrush::dragEnterEvent (QDragEnterEvent *event)
+void CSVWidget::SceneToolTextureBrush::dragEnterEvent(QDragEnterEvent* event)
 {
     emit passEvent(event);
     event->accept();
 }
-void CSVWidget::SceneToolTextureBrush::dropEvent (QDropEvent *event)
+void CSVWidget::SceneToolTextureBrush::dropEvent(QDropEvent* event)
 {
     emit passEvent(event);
     event->accept();
diff --git a/apps/opencs/view/widget/scenetooltexturebrush.hpp b/apps/opencs/view/widget/scenetooltexturebrush.hpp
index 929ed1ebae..f08b1dcabe 100644
--- a/apps/opencs/view/widget/scenetooltexturebrush.hpp
+++ b/apps/opencs/view/widget/scenetooltexturebrush.hpp
@@ -34,13 +34,13 @@ namespace CSVWidget
     {
         Q_OBJECT
 
-        public:
-            BrushSizeControls(const QString &title, QWidget *parent);
+    public:
+        BrushSizeControls(const QString& title, QWidget* parent);
 
-        private:
-            QHBoxLayout *mLayoutSliderSize;
-            QSlider *mBrushSizeSlider;
-            QSpinBox *mBrushSizeSpinBox;
+    private:
+        QHBoxLayout* mLayoutSliderSize;
+        QSlider* mBrushSizeSlider;
+        QSpinBox* mBrushSizeSpinBox;
 
         friend class SceneToolTextureBrush;
         friend class CSVRender::TerrainTextureMode;
@@ -53,80 +53,78 @@ namespace CSVWidget
     {
         Q_OBJECT
 
-        public:
-            TextureBrushWindow(CSMDoc::Document& document, QWidget *parent = nullptr);
-            void configureButtonInitialSettings(QPushButton *button);
-
-            const QString toolTipPoint = "Paint single point";
-            const QString toolTipSquare = "Paint with square brush";
-            const QString toolTipCircle = "Paint with circle brush";
-            const QString toolTipCustom = "Paint custom selection (not implemented yet)";
-
-        private:
-            CSVWidget::BrushShape mBrushShape = CSVWidget::BrushShape_Point;
-            int mBrushSize = 1;
-            std::string mBrushTexture = "L0#0";
-            CSMDoc::Document& mDocument;
-            QLabel *mSelectedBrush;
-            QGroupBox *mHorizontalGroupBox;
-            std::string mBrushTextureLabel;
-            QPushButton *mButtonPoint;
-            QPushButton *mButtonSquare;
-            QPushButton *mButtonCircle;
-            QPushButton *mButtonCustom;
-            BrushSizeControls* mSizeSliders;
+    public:
+        TextureBrushWindow(CSMDoc::Document& document, QWidget* parent = nullptr);
+        void configureButtonInitialSettings(QPushButton* button);
+
+        const QString toolTipPoint = "Paint single point";
+        const QString toolTipSquare = "Paint with square brush";
+        const QString toolTipCircle = "Paint with circle brush";
+        const QString toolTipCustom = "Paint custom selection (not implemented yet)";
+
+    private:
+        CSVWidget::BrushShape mBrushShape = CSVWidget::BrushShape_Point;
+        int mBrushSize = 1;
+        std::string mBrushTexture = "L0#0";
+        CSMDoc::Document& mDocument;
+        QLabel* mSelectedBrush;
+        QGroupBox* mHorizontalGroupBox;
+        std::string mBrushTextureLabel;
+        QPushButton* mButtonPoint;
+        QPushButton* mButtonSquare;
+        QPushButton* mButtonCircle;
+        QPushButton* mButtonCustom;
+        BrushSizeControls* mSizeSliders;
 
         friend class SceneToolTextureBrush;
         friend class CSVRender::TerrainTextureMode;
 
-        public slots:
-            void setBrushTexture(std::string brushTexture);
-            void setBrushShape();
-            void setBrushSize(int brushSize);
+    public slots:
+        void setBrushTexture(std::string brushTexture);
+        void setBrushShape();
+        void setBrushSize(int brushSize);
 
-        signals:
-            void passBrushSize (int brushSize);
-            void passBrushShape(CSVWidget::BrushShape brushShape);
-            void passTextureId(std::string brushTexture);
+    signals:
+        void passBrushSize(int brushSize);
+        void passBrushShape(CSVWidget::BrushShape brushShape);
+        void passTextureId(std::string brushTexture);
     };
 
     class SceneToolTextureBrush : public SceneTool
     {
-            Q_OBJECT
-
-            QString mToolTip;
-            CSMDoc::Document& mDocument;
-            QFrame *mPanel;
-            QTableWidget *mTable;
-            std::vector<std::string> mBrushHistory;
-            TextureBrushWindow *mTextureBrushWindow;
-
-        private:
+        Q_OBJECT
 
-            void adjustToolTips();
+        QString mToolTip;
+        CSMDoc::Document& mDocument;
+        QFrame* mPanel;
+        QTableWidget* mTable;
+        std::vector<std::string> mBrushHistory;
+        TextureBrushWindow* mTextureBrushWindow;
 
-        public:
+    private:
+        void adjustToolTips();
 
-            SceneToolTextureBrush (SceneToolbar *parent, const QString& toolTip, CSMDoc::Document& document);
+    public:
+        SceneToolTextureBrush(SceneToolbar* parent, const QString& toolTip, CSMDoc::Document& document);
 
-            void showPanel (const QPoint& position) override;
-            void updatePanel ();
+        void showPanel(const QPoint& position) override;
+        void updatePanel();
 
-            void dropEvent (QDropEvent *event) override;
-            void dragEnterEvent (QDragEnterEvent *event) override;
+        void dropEvent(QDropEvent* event) override;
+        void dragEnterEvent(QDragEnterEvent* event) override;
 
         friend class CSVRender::TerrainTextureMode;
 
-        public slots:
-            void setButtonIcon(CSVWidget::BrushShape brushShape);
-            void updateBrushHistory (const std::string& mBrushTexture);
-            void clicked (const QModelIndex& index);
-            void activate() override;
+    public slots:
+        void setButtonIcon(CSVWidget::BrushShape brushShape);
+        void updateBrushHistory(const std::string& mBrushTexture);
+        void clicked(const QModelIndex& index);
+        void activate() override;
 
-        signals:
-            void passEvent(QDropEvent *event);
-            void passEvent(QDragEnterEvent *event);
-            void passTextureId(std::string brushTexture);
+    signals:
+        void passEvent(QDropEvent* event);
+        void passEvent(QDragEnterEvent* event);
+        void passTextureId(std::string brushTexture);
     };
 }
 
diff --git a/apps/opencs/view/widget/scenetooltoggle.cpp b/apps/opencs/view/widget/scenetooltoggle.cpp
index c9bdaba6db..01dfb7582e 100644
--- a/apps/opencs/view/widget/scenetooltoggle.cpp
+++ b/apps/opencs/view/widget/scenetooltoggle.cpp
@@ -2,13 +2,13 @@
 
 #include <stdexcept>
 
-#include <QHBoxLayout>
 #include <QFrame>
+#include <QHBoxLayout>
 #include <QIcon>
 #include <QPainter>
 
-#include "scenetoolbar.hpp"
 #include "pushbutton.hpp"
+#include "scenetoolbar.hpp"
 
 void CSVWidget::SceneToolToggle::adjustToolTip()
 {
@@ -18,8 +18,7 @@ void CSVWidget::SceneToolToggle::adjustToolTip()
 
     bool first = true;
 
-    for (std::map<PushButton *, ButtonDesc>::const_iterator iter (mButtons.begin());
-        iter!=mButtons.end(); ++iter)
+    for (std::map<PushButton*, ButtonDesc>::const_iterator iter(mButtons.begin()); iter != mButtons.end(); ++iter)
         if (iter->first->isChecked())
         {
             if (!first)
@@ -35,36 +34,36 @@ void CSVWidget::SceneToolToggle::adjustToolTip()
 
     toolTip += "<p>(left click to alter selection)";
 
-    setToolTip (toolTip);
+    setToolTip(toolTip);
 }
 
 void CSVWidget::SceneToolToggle::adjustIcon()
 {
     unsigned int selection = getSelectionMask();
     if (!selection)
-        setIcon (QIcon (QString::fromUtf8 (mEmptyIcon.c_str())));
+        setIcon(QIcon(QString::fromUtf8(mEmptyIcon.c_str())));
     else
     {
-        QPixmap pixmap (48, 48);
-        pixmap.fill (QColor (0, 0, 0, 0));
+        QPixmap pixmap(48, 48);
+        pixmap.fill(QColor(0, 0, 0, 0));
 
         {
-            QPainter painter (&pixmap);
+            QPainter painter(&pixmap);
 
-            for (std::map<PushButton *, ButtonDesc>::const_iterator iter (mButtons.begin());
-                iter!=mButtons.end(); ++iter)
+            for (std::map<PushButton*, ButtonDesc>::const_iterator iter(mButtons.begin()); iter != mButtons.end();
+                 ++iter)
                 if (iter->first->isChecked())
                 {
-                    painter.drawImage (getIconBox (iter->second.mIndex),
-                        QImage (QString::fromUtf8 (iter->second.mSmallIcon.c_str())));
+                    painter.drawImage(
+                        getIconBox(iter->second.mIndex), QImage(QString::fromUtf8(iter->second.mSmallIcon.c_str())));
                 }
         }
 
-        setIcon (pixmap);
+        setIcon(pixmap);
     }
 }
 
-QRect CSVWidget::SceneToolToggle::getIconBox (int index) const
+QRect CSVWidget::SceneToolToggle::getIconBox(int index) const
 {
     // layout for a 3x3 grid
     int xMax = 3;
@@ -74,27 +73,27 @@ QRect CSVWidget::SceneToolToggle::getIconBox (int index) const
     int xBorder = 1;
     int yBorder = 1;
 
-    int iconXSize = (mIconSize-xBorder*(xMax+1))/xMax;
-    int iconYSize = (mIconSize-yBorder*(yMax+1))/yMax;
+    int iconXSize = (mIconSize - xBorder * (xMax + 1)) / xMax;
+    int iconYSize = (mIconSize - yBorder * (yMax + 1)) / yMax;
 
     int y = index / xMax;
     int x = index % xMax;
 
     int total = static_cast<int>(mButtons.size());
 
-    int actualYIcons = total/xMax;
+    int actualYIcons = total / xMax;
 
     if (total % xMax)
         ++actualYIcons;
 
-    if (actualYIcons!=yMax)
+    if (actualYIcons != yMax)
     {
         // space out icons vertically, if there aren't enough to populate all rows
         int diff = yMax - actualYIcons;
-        yBorder += (diff*(yBorder+iconXSize)) / (actualYIcons+1);
+        yBorder += (diff * (yBorder + iconXSize)) / (actualYIcons + 1);
     }
 
-    if (y==actualYIcons-1)
+    if (y == actualYIcons - 1)
     {
         // generating the last row of icons
         int actualXIcons = total % xMax;
@@ -104,51 +103,53 @@ QRect CSVWidget::SceneToolToggle::getIconBox (int index) const
             // space out icons horizontally, if there aren't enough to fill the last row
             int diff = xMax - actualXIcons;
 
-            xBorder += (diff*(xBorder+iconXSize)) / (actualXIcons+1);
+            xBorder += (diff * (xBorder + iconXSize)) / (actualXIcons + 1);
         }
     }
 
-    return QRect ((iconXSize+xBorder)*x+xBorder, (iconYSize+yBorder)*y+yBorder,
-        iconXSize, iconYSize);
+    return QRect((iconXSize + xBorder) * x + xBorder, (iconYSize + yBorder) * y + yBorder, iconXSize, iconYSize);
 }
 
-CSVWidget::SceneToolToggle::SceneToolToggle (SceneToolbar *parent, const QString& toolTip,
-    const std::string& emptyIcon)
-: SceneTool (parent), mEmptyIcon (emptyIcon), mButtonSize (parent->getButtonSize()),
-  mIconSize (parent->getIconSize()), mToolTip (toolTip), mFirst (nullptr)
+CSVWidget::SceneToolToggle::SceneToolToggle(SceneToolbar* parent, const QString& toolTip, const std::string& emptyIcon)
+    : SceneTool(parent)
+    , mEmptyIcon(emptyIcon)
+    , mButtonSize(parent->getButtonSize())
+    , mIconSize(parent->getIconSize())
+    , mToolTip(toolTip)
+    , mFirst(nullptr)
 {
-    mPanel = new QFrame (this, Qt::Popup);
+    mPanel = new QFrame(this, Qt::Popup);
 
-    mLayout = new QHBoxLayout (mPanel);
+    mLayout = new QHBoxLayout(mPanel);
 
-    mLayout->setContentsMargins (QMargins (0, 0, 0, 0));
+    mLayout->setContentsMargins(QMargins(0, 0, 0, 0));
 
-    mPanel->setLayout (mLayout);
+    mPanel->setLayout(mLayout);
 }
 
-void CSVWidget::SceneToolToggle::showPanel (const QPoint& position)
+void CSVWidget::SceneToolToggle::showPanel(const QPoint& position)
 {
-    mPanel->move (position);
+    mPanel->move(position);
     mPanel->show();
 
     if (mFirst)
-        mFirst->setFocus (Qt::OtherFocusReason);
+        mFirst->setFocus(Qt::OtherFocusReason);
 }
 
-void CSVWidget::SceneToolToggle::addButton (const std::string& icon, unsigned int mask,
-    const std::string& smallIcon, const QString& name, const QString& tooltip)
+void CSVWidget::SceneToolToggle::addButton(const std::string& icon, unsigned int mask, const std::string& smallIcon,
+    const QString& name, const QString& tooltip)
 {
-    if (mButtons.size()>=9)
-        throw std::runtime_error ("Exceeded number of buttons in toggle type tool");
+    if (mButtons.size() >= 9)
+        throw std::runtime_error("Exceeded number of buttons in toggle type tool");
 
-    PushButton *button = new PushButton (QIcon (QPixmap (icon.c_str())),
-        PushButton::Type_Toggle, tooltip.isEmpty() ? name: tooltip, mPanel);
+    PushButton* button = new PushButton(
+        QIcon(QPixmap(icon.c_str())), PushButton::Type_Toggle, tooltip.isEmpty() ? name : tooltip, mPanel);
 
-    button->setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed));
-    button->setIconSize (QSize (mIconSize, mIconSize));
-    button->setFixedSize (mButtonSize, mButtonSize);
+    button->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+    button->setIconSize(QSize(mIconSize, mIconSize));
+    button->setFixedSize(mButtonSize, mButtonSize);
 
-    mLayout->addWidget (button);
+    mLayout->addWidget(button);
 
     ButtonDesc desc;
     desc.mMask = mask;
@@ -156,11 +157,11 @@ void CSVWidget::SceneToolToggle::addButton (const std::string& icon, unsigned in
     desc.mName = name;
     desc.mIndex = static_cast<int>(mButtons.size());
 
-    mButtons.insert (std::make_pair (button, desc));
+    mButtons.insert(std::make_pair(button, desc));
 
-    connect (button, &PushButton::clicked, this, &SceneToolToggle::selected);
+    connect(button, &PushButton::clicked, this, &SceneToolToggle::selected);
 
-    if (mButtons.size()==1)
+    if (mButtons.size() == 1)
         mFirst = button;
 }
 
@@ -168,19 +169,17 @@ unsigned int CSVWidget::SceneToolToggle::getSelectionMask() const
 {
     unsigned int selection = 0;
 
-    for (std::map<PushButton *, ButtonDesc>::const_iterator iter (mButtons.begin());
-        iter!=mButtons.end(); ++iter)
+    for (std::map<PushButton*, ButtonDesc>::const_iterator iter(mButtons.begin()); iter != mButtons.end(); ++iter)
         if (iter->first->isChecked())
             selection |= iter->second.mMask;
 
     return selection;
 }
 
-void CSVWidget::SceneToolToggle::setSelectionMask (unsigned int selection)
+void CSVWidget::SceneToolToggle::setSelectionMask(unsigned int selection)
 {
-    for (std::map<PushButton *, ButtonDesc>::iterator iter (mButtons.begin());
-        iter!=mButtons.end(); ++iter)
-        iter->first->setChecked (selection & iter->second.mMask);
+    for (std::map<PushButton*, ButtonDesc>::iterator iter(mButtons.begin()); iter != mButtons.end(); ++iter)
+        iter->first->setChecked(selection & iter->second.mMask);
 
     adjustToolTip();
     adjustIcon();
@@ -188,10 +187,9 @@ void CSVWidget::SceneToolToggle::setSelectionMask (unsigned int selection)
 
 void CSVWidget::SceneToolToggle::selected()
 {
-    std::map<PushButton *, ButtonDesc>::const_iterator iter =
-        mButtons.find (dynamic_cast<PushButton *> (sender()));
+    std::map<PushButton*, ButtonDesc>::const_iterator iter = mButtons.find(dynamic_cast<PushButton*>(sender()));
 
-    if (iter!=mButtons.end())
+    if (iter != mButtons.end())
     {
         if (!iter->first->hasKeepOpen())
             mPanel->hide();
diff --git a/apps/opencs/view/widget/scenetooltoggle.hpp b/apps/opencs/view/widget/scenetooltoggle.hpp
index f08d117fb2..039355e348 100644
--- a/apps/opencs/view/widget/scenetooltoggle.hpp
+++ b/apps/opencs/view/widget/scenetooltoggle.hpp
@@ -16,59 +16,57 @@ namespace CSVWidget
     ///< \brief Multi-Toggle tool
     class SceneToolToggle : public SceneTool
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            struct ButtonDesc
-            {
-                unsigned int mMask;
-                std::string mSmallIcon;
-                QString mName;
-                int mIndex;
-            };
+        struct ButtonDesc
+        {
+            unsigned int mMask;
+            std::string mSmallIcon;
+            QString mName;
+            int mIndex;
+        };
 
-            std::string mEmptyIcon;
-            QWidget *mPanel;
-            QHBoxLayout *mLayout;
-            std::map<PushButton *, ButtonDesc> mButtons; // widget, id
-            int mButtonSize;
-            int mIconSize;
-            QString mToolTip;
-            PushButton *mFirst;
+        std::string mEmptyIcon;
+        QWidget* mPanel;
+        QHBoxLayout* mLayout;
+        std::map<PushButton*, ButtonDesc> mButtons; // widget, id
+        int mButtonSize;
+        int mIconSize;
+        QString mToolTip;
+        PushButton* mFirst;
 
-            void adjustToolTip();
+        void adjustToolTip();
 
-            void adjustIcon();
+        void adjustIcon();
 
-            QRect getIconBox (int index) const;
+        QRect getIconBox(int index) const;
 
-        public:
+    public:
+        SceneToolToggle(SceneToolbar* parent, const QString& toolTip, const std::string& emptyIcon);
 
-            SceneToolToggle (SceneToolbar *parent, const QString& toolTip,
-                const std::string& emptyIcon);
+        void showPanel(const QPoint& position) override;
 
-            void showPanel (const QPoint& position) override;
+        /// \attention After the last button has been added, setSelection must be called at
+        /// least once to finalise the layout.
+        ///
+        /// \note The layout algorithm can not handle more than 9 buttons. To prevent this An
+        /// attempt to add more will result in an exception being thrown.
+        /// The small icons will be sized at (x-4)/3 (where x is the main icon size).
+        void addButton(const std::string& icon, unsigned int mask, const std::string& smallIcon, const QString& name,
+            const QString& tooltip = "");
 
-            /// \attention After the last button has been added, setSelection must be called at
-            /// least once to finalise the layout.
-            ///
-            /// \note The layout algorithm can not handle more than 9 buttons. To prevent this An
-            /// attempt to add more will result in an exception being thrown.
-            /// The small icons will be sized at (x-4)/3 (where x is the main icon size).
-            void addButton (const std::string& icon, unsigned int mask,
-                const std::string& smallIcon, const QString& name, const QString& tooltip = "");
+        unsigned int getSelectionMask() const;
 
-            unsigned int getSelectionMask() const;
+        /// \param or'ed button masks. buttons that do not exist will be ignored.
+        void setSelectionMask(unsigned int selection);
 
-            /// \param or'ed button masks. buttons that do not exist will be ignored.
-            void setSelectionMask (unsigned int selection);
+    signals:
 
-        signals:
+        void selectionChanged();
 
-            void selectionChanged();
+    private slots:
 
-        private slots:
-
-            void selected();
+        void selected();
     };
 }
 
diff --git a/apps/opencs/view/widget/scenetooltoggle2.cpp b/apps/opencs/view/widget/scenetooltoggle2.cpp
index 53f4ece105..558c7f9850 100644
--- a/apps/opencs/view/widget/scenetooltoggle2.cpp
+++ b/apps/opencs/view/widget/scenetooltoggle2.cpp
@@ -1,14 +1,14 @@
 #include "scenetooltoggle2.hpp"
 
-#include <stdexcept>
 #include <sstream>
+#include <stdexcept>
 
-#include <QHBoxLayout>
 #include <QFrame>
+#include <QHBoxLayout>
 #include <QIcon>
 
-#include "scenetoolbar.hpp"
 #include "pushbutton.hpp"
+#include "scenetoolbar.hpp"
 
 void CSVWidget::SceneToolToggle2::adjustToolTip()
 {
@@ -18,8 +18,7 @@ void CSVWidget::SceneToolToggle2::adjustToolTip()
 
     bool first = true;
 
-    for (std::map<PushButton *, ButtonDesc>::const_iterator iter (mButtons.begin());
-        iter!=mButtons.end(); ++iter)
+    for (std::map<PushButton*, ButtonDesc>::const_iterator iter(mButtons.begin()); iter != mButtons.end(); ++iter)
         if (iter->first->isChecked())
         {
             if (!first)
@@ -35,64 +34,67 @@ void CSVWidget::SceneToolToggle2::adjustToolTip()
 
     toolTip += "<p>(left click to alter selection)";
 
-    setToolTip (toolTip);
+    setToolTip(toolTip);
 }
 
 void CSVWidget::SceneToolToggle2::adjustIcon()
 {
     unsigned int buttonIds = 0;
 
-    for (std::map<PushButton *, ButtonDesc>::const_iterator iter (mButtons.begin());
-        iter!=mButtons.end(); ++iter)
+    for (std::map<PushButton*, ButtonDesc>::const_iterator iter(mButtons.begin()); iter != mButtons.end(); ++iter)
         if (iter->first->isChecked())
             buttonIds |= iter->second.mButtonId;
 
     std::ostringstream stream;
     stream << mCompositeIcon << buttonIds;
-    setIcon (QIcon (QString::fromUtf8 (stream.str().c_str())));
+    setIcon(QIcon(QString::fromUtf8(stream.str().c_str())));
 }
 
-CSVWidget::SceneToolToggle2::SceneToolToggle2 (SceneToolbar *parent, const QString& toolTip,
-    const std::string& compositeIcon, const std::string& singleIcon)
-: SceneTool (parent), mCompositeIcon (compositeIcon), mSingleIcon (singleIcon),
-  mButtonSize (parent->getButtonSize()), mIconSize (parent->getIconSize()), mToolTip (toolTip),
-  mFirst (nullptr)
+CSVWidget::SceneToolToggle2::SceneToolToggle2(
+    SceneToolbar* parent, const QString& toolTip, const std::string& compositeIcon, const std::string& singleIcon)
+    : SceneTool(parent)
+    , mCompositeIcon(compositeIcon)
+    , mSingleIcon(singleIcon)
+    , mButtonSize(parent->getButtonSize())
+    , mIconSize(parent->getIconSize())
+    , mToolTip(toolTip)
+    , mFirst(nullptr)
 {
-    mPanel = new QFrame (this, Qt::Popup);
+    mPanel = new QFrame(this, Qt::Popup);
 
-    mLayout = new QHBoxLayout (mPanel);
+    mLayout = new QHBoxLayout(mPanel);
 
-    mLayout->setContentsMargins (QMargins (0, 0, 0, 0));
+    mLayout->setContentsMargins(QMargins(0, 0, 0, 0));
 
-    mPanel->setLayout (mLayout);
+    mPanel->setLayout(mLayout);
 }
 
-void CSVWidget::SceneToolToggle2::showPanel (const QPoint& position)
+void CSVWidget::SceneToolToggle2::showPanel(const QPoint& position)
 {
-    mPanel->move (position);
+    mPanel->move(position);
     mPanel->show();
 
     if (mFirst)
-        mFirst->setFocus (Qt::OtherFocusReason);
+        mFirst->setFocus(Qt::OtherFocusReason);
 }
 
-void CSVWidget::SceneToolToggle2::addButton (unsigned int id, unsigned int mask,
-    const QString& name, const QString& tooltip, bool disabled)
+void CSVWidget::SceneToolToggle2::addButton(
+    unsigned int id, unsigned int mask, const QString& name, const QString& tooltip, bool disabled)
 {
     std::ostringstream stream;
     stream << mSingleIcon << id;
 
-    PushButton *button = new PushButton (QIcon (QPixmap (stream.str().c_str())),
-        PushButton::Type_Toggle, tooltip.isEmpty() ? name: tooltip, mPanel);
+    PushButton* button = new PushButton(
+        QIcon(QPixmap(stream.str().c_str())), PushButton::Type_Toggle, tooltip.isEmpty() ? name : tooltip, mPanel);
 
-    button->setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed));
-    button->setIconSize (QSize (mIconSize, mIconSize));
-    button->setFixedSize (mButtonSize, mButtonSize);
+    button->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+    button->setIconSize(QSize(mIconSize, mIconSize));
+    button->setFixedSize(mButtonSize, mButtonSize);
 
     if (disabled)
-        button->setDisabled (true);
+        button->setDisabled(true);
 
-    mLayout->addWidget (button);
+    mLayout->addWidget(button);
 
     ButtonDesc desc;
     desc.mButtonId = id;
@@ -100,11 +102,11 @@ void CSVWidget::SceneToolToggle2::addButton (unsigned int id, unsigned int mask,
     desc.mName = name;
     desc.mIndex = static_cast<int>(mButtons.size());
 
-    mButtons.insert (std::make_pair (button, desc));
+    mButtons.insert(std::make_pair(button, desc));
 
-    connect (button, &QPushButton::clicked, this, &SceneToolToggle2::selected);
+    connect(button, &QPushButton::clicked, this, &SceneToolToggle2::selected);
 
-    if (mButtons.size()==1 && !disabled)
+    if (mButtons.size() == 1 && !disabled)
         mFirst = button;
 }
 
@@ -112,19 +114,17 @@ unsigned int CSVWidget::SceneToolToggle2::getSelectionMask() const
 {
     unsigned int selection = 0;
 
-    for (std::map<PushButton *, ButtonDesc>::const_iterator iter (mButtons.begin());
-        iter!=mButtons.end(); ++iter)
+    for (std::map<PushButton*, ButtonDesc>::const_iterator iter(mButtons.begin()); iter != mButtons.end(); ++iter)
         if (iter->first->isChecked())
             selection |= iter->second.mMask;
 
     return selection;
 }
 
-void CSVWidget::SceneToolToggle2::setSelectionMask (unsigned int selection)
+void CSVWidget::SceneToolToggle2::setSelectionMask(unsigned int selection)
 {
-    for (std::map<PushButton *, ButtonDesc>::iterator iter (mButtons.begin());
-        iter!=mButtons.end(); ++iter)
-        iter->first->setChecked (selection & iter->second.mMask);
+    for (std::map<PushButton*, ButtonDesc>::iterator iter(mButtons.begin()); iter != mButtons.end(); ++iter)
+        iter->first->setChecked(selection & iter->second.mMask);
 
     adjustToolTip();
     adjustIcon();
@@ -132,10 +132,9 @@ void CSVWidget::SceneToolToggle2::setSelectionMask (unsigned int selection)
 
 void CSVWidget::SceneToolToggle2::selected()
 {
-    std::map<PushButton *, ButtonDesc>::const_iterator iter =
-        mButtons.find (dynamic_cast<PushButton *> (sender()));
+    std::map<PushButton*, ButtonDesc>::const_iterator iter = mButtons.find(dynamic_cast<PushButton*>(sender()));
 
-    if (iter!=mButtons.end())
+    if (iter != mButtons.end())
     {
         if (!iter->first->hasKeepOpen())
             mPanel->hide();
diff --git a/apps/opencs/view/widget/scenetooltoggle2.hpp b/apps/opencs/view/widget/scenetooltoggle2.hpp
index e250192984..c300243e1e 100644
--- a/apps/opencs/view/widget/scenetooltoggle2.hpp
+++ b/apps/opencs/view/widget/scenetooltoggle2.hpp
@@ -18,61 +18,60 @@ namespace CSVWidget
     /// Top level button is using predefined icons instead building a composite icon.
     class SceneToolToggle2 : public SceneTool
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            struct ButtonDesc
-            {
-                unsigned int mButtonId;
-                unsigned int mMask;
-                QString mName;
-                int mIndex;
-            };
+        struct ButtonDesc
+        {
+            unsigned int mButtonId;
+            unsigned int mMask;
+            QString mName;
+            int mIndex;
+        };
 
-            std::string mCompositeIcon;
-            std::string mSingleIcon;
-            QWidget *mPanel;
-            QHBoxLayout *mLayout;
-            std::map<PushButton *, ButtonDesc> mButtons; // widget, id
-            int mButtonSize;
-            int mIconSize;
-            QString mToolTip;
-            PushButton *mFirst;
+        std::string mCompositeIcon;
+        std::string mSingleIcon;
+        QWidget* mPanel;
+        QHBoxLayout* mLayout;
+        std::map<PushButton*, ButtonDesc> mButtons; // widget, id
+        int mButtonSize;
+        int mIconSize;
+        QString mToolTip;
+        PushButton* mFirst;
 
-            void adjustToolTip();
+        void adjustToolTip();
 
-            void adjustIcon();
+        void adjustIcon();
 
-        public:
+    public:
+        /// The top level icon is compositeIcon + sum of bitpatterns for active buttons (in
+        /// decimal)
+        ///
+        /// The icon for individual toggle buttons is signleIcon + bitmask for button (in
+        /// decimal)
+        SceneToolToggle2(SceneToolbar* parent, const QString& toolTip, const std::string& compositeIcon,
+            const std::string& singleIcon);
 
-            /// The top level icon is compositeIcon + sum of bitpatterns for active buttons (in
-            /// decimal)
-            ///
-            /// The icon for individual toggle buttons is signleIcon + bitmask for button (in
-            /// decimal)
-            SceneToolToggle2 (SceneToolbar *parent, const QString& toolTip,
-                const std::string& compositeIcon, const std::string& singleIcon);
+        void showPanel(const QPoint& position) override;
 
-            void showPanel (const QPoint& position) override;
+        /// \param buttonId used to compose the icon filename
+        /// \param mask used for the reported getSelectionMask() / setSelectionMask()
+        /// \attention After the last button has been added, setSelection must be called at
+        /// least once to finalise the layout.
+        void addButton(unsigned int buttonId, unsigned int mask, const QString& name, const QString& tooltip = "",
+            bool disabled = false);
 
-            /// \param buttonId used to compose the icon filename
-            /// \param mask used for the reported getSelectionMask() / setSelectionMask()
-            /// \attention After the last button has been added, setSelection must be called at
-            /// least once to finalise the layout.
-            void addButton (unsigned int buttonId, unsigned int mask,
-                const QString& name, const QString& tooltip = "", bool disabled = false);
+        unsigned int getSelectionMask() const;
 
-            unsigned int getSelectionMask() const;
+        /// \param or'ed button masks. buttons that do not exist will be ignored.
+        void setSelectionMask(unsigned int selection);
 
-            /// \param or'ed button masks. buttons that do not exist will be ignored.
-            void setSelectionMask (unsigned int selection);
+    signals:
 
-        signals:
+        void selectionChanged();
 
-            void selectionChanged();
+    private slots:
 
-        private slots:
-
-            void selected();
+        void selected();
     };
 }
 
diff --git a/apps/opencs/view/world/bodypartcreator.cpp b/apps/opencs/view/world/bodypartcreator.cpp
index 29061ae1dc..2df61bb7e4 100644
--- a/apps/opencs/view/world/bodypartcreator.cpp
+++ b/apps/opencs/view/world/bodypartcreator.cpp
@@ -17,11 +17,8 @@ std::string CSVWorld::BodyPartCreator::getId() const
     return id;
 }
 
-CSVWorld::BodyPartCreator::BodyPartCreator(
-    CSMWorld::Data& data,
-    QUndoStack& undoStack,
-    const CSMWorld::UniversalId& id
-) : GenericCreator(data, undoStack, id)
+CSVWorld::BodyPartCreator::BodyPartCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id)
+    : GenericCreator(data, undoStack, id)
 {
     mFirstPerson = new QCheckBox("First Person", this);
     insertBeforeButtons(mFirstPerson, false);
diff --git a/apps/opencs/view/world/bodypartcreator.hpp b/apps/opencs/view/world/bodypartcreator.hpp
index f526b7faeb..adb795eace 100644
--- a/apps/opencs/view/world/bodypartcreator.hpp
+++ b/apps/opencs/view/world/bodypartcreator.hpp
@@ -18,29 +18,24 @@ namespace CSVWorld
     {
         Q_OBJECT
 
-        QCheckBox *mFirstPerson;
+        QCheckBox* mFirstPerson;
 
-        private:
+    private:
+        /// \return ID entered by user.
+        std::string getId() const override;
 
-            /// \return ID entered by user.
-            std::string getId() const override;
+    public:
+        BodyPartCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id);
 
-        public:
+        /// \return Error description for current user input.
+        std::string getErrors() const override;
 
-            BodyPartCreator(
-                CSMWorld::Data& data,
-                QUndoStack& undoStack,
-                const CSMWorld::UniversalId& id);
+        /// \brief Clear ID and checkbox input widgets.
+        void reset() override;
 
-            /// \return Error description for current user input.
-            std::string getErrors() const override;
+    private slots:
 
-            /// \brief Clear ID and checkbox input widgets.
-            void reset() override;
-
-        private slots:
-
-            void checkboxClicked();
+        void checkboxClicked();
     };
 }
 
diff --git a/apps/opencs/view/world/cellcreator.cpp b/apps/opencs/view/world/cellcreator.cpp
index 9f721aa51d..808d28c79a 100644
--- a/apps/opencs/view/world/cellcreator.cpp
+++ b/apps/opencs/view/world/cellcreator.cpp
@@ -4,15 +4,15 @@
 #include <sstream>
 
 #include <QComboBox>
-#include <QSpinBox>
 #include <QLabel>
+#include <QSpinBox>
 
 #include "../../model/world/commands.hpp"
 #include "../../model/world/idtree.hpp"
 
 std::string CSVWorld::CellCreator::getId() const
 {
-    if (mType->currentIndex()==0)
+    if (mType->currentIndex() == 0)
         return GenericCreator::getId();
 
     std::ostringstream stream;
@@ -31,83 +31,83 @@ void CSVWorld::CellCreator::configureCreateCommand(CSMWorld::CreateCommand& comm
     command.addNestedValue(parentIndex, index, mType->currentIndex() == 0);
 }
 
-CSVWorld::CellCreator::CellCreator (CSMWorld::Data& data, QUndoStack& undoStack,
-    const CSMWorld::UniversalId& id)
-: GenericCreator (data, undoStack, id)
+CSVWorld::CellCreator::CellCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id)
+    : GenericCreator(data, undoStack, id)
 {
-    mY = new QSpinBox (this);
-    mY->setVisible (false);
-    mY->setMinimum (std::numeric_limits<int>::min());
-    mY->setMaximum (std::numeric_limits<int>::max());
-    connect (mY, qOverload<int>(&QSpinBox::valueChanged), this, &CellCreator::valueChanged);
-    insertAtBeginning (mY, true);
+    mY = new QSpinBox(this);
+    mY->setVisible(false);
+    mY->setMinimum(std::numeric_limits<int>::min());
+    mY->setMaximum(std::numeric_limits<int>::max());
+    connect(mY, qOverload<int>(&QSpinBox::valueChanged), this, &CellCreator::valueChanged);
+    insertAtBeginning(mY, true);
 
-    mYLabel = new QLabel ("Y", this);
-    mYLabel->setVisible (false);
-    insertAtBeginning (mYLabel, false);
+    mYLabel = new QLabel("Y", this);
+    mYLabel->setVisible(false);
+    insertAtBeginning(mYLabel, false);
 
-    mX = new QSpinBox (this);
-    mX->setVisible (false);
-    mX->setMinimum (std::numeric_limits<int>::min());
-    mX->setMaximum (std::numeric_limits<int>::max());
-    connect (mX, qOverload<int>(&QSpinBox::valueChanged), this, &CellCreator::valueChanged);
-    insertAtBeginning (mX, true);
+    mX = new QSpinBox(this);
+    mX->setVisible(false);
+    mX->setMinimum(std::numeric_limits<int>::min());
+    mX->setMaximum(std::numeric_limits<int>::max());
+    connect(mX, qOverload<int>(&QSpinBox::valueChanged), this, &CellCreator::valueChanged);
+    insertAtBeginning(mX, true);
 
-    mXLabel = new QLabel ("X", this);
-    mXLabel->setVisible (false);
-    insertAtBeginning (mXLabel, false);
+    mXLabel = new QLabel("X", this);
+    mXLabel->setVisible(false);
+    insertAtBeginning(mXLabel, false);
 
-    mType = new QComboBox (this);
+    mType = new QComboBox(this);
 
-    mType->addItem ("Interior Cell");
-    mType->addItem ("Exterior Cell");
+    mType->addItem("Interior Cell");
+    mType->addItem("Exterior Cell");
 
-    connect (mType, qOverload<int>(&QComboBox::currentIndexChanged), this, &CellCreator::setType);
+    connect(mType, qOverload<int>(&QComboBox::currentIndexChanged), this, &CellCreator::setType);
 
-    insertAtBeginning (mType, false);
+    insertAtBeginning(mType, false);
 }
 
 void CSVWorld::CellCreator::reset()
 {
-    mX->setValue (0);
-    mY->setValue (0);
-    mType->setCurrentIndex (0);
+    mX->setValue(0);
+    mY->setValue(0);
+    mType->setCurrentIndex(0);
     setType(0);
     GenericCreator::reset();
 }
 
-void CSVWorld::CellCreator::setType (int index)
+void CSVWorld::CellCreator::setType(int index)
 {
-    setManualEditing (index==0);
-    mXLabel->setVisible (index==1);
-    mX->setVisible (index==1);
-    mYLabel->setVisible (index==1);
-    mY->setVisible (index==1);
+    setManualEditing(index == 0);
+    mXLabel->setVisible(index == 1);
+    mX->setVisible(index == 1);
+    mYLabel->setVisible(index == 1);
+    mY->setVisible(index == 1);
 
     // The cell name is limited to 64 characters. (ESM::Header::GMDT::mCurrentCell)
     std::string text = mType->currentText().toStdString();
     if (text == "Interior Cell")
-        GenericCreator::setEditorMaxLength (64);
+        GenericCreator::setEditorMaxLength(64);
     else
-        GenericCreator::setEditorMaxLength (32767);
+        GenericCreator::setEditorMaxLength(32767);
 
     update();
 }
 
-void CSVWorld::CellCreator::valueChanged (int index)
+void CSVWorld::CellCreator::valueChanged(int index)
 {
     update();
 }
 
-void CSVWorld::CellCreator::cloneMode(const std::string& originId,
-                                      const CSMWorld::UniversalId::Type type)
+void CSVWorld::CellCreator::cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type)
 {
     CSVWorld::GenericCreator::cloneMode(originId, type);
-    if (*(originId.begin()) == '#') //if originid points to the exterior cell
+    if (*(originId.begin()) == '#') // if originid points to the exterior cell
     {
-        setType(1); //enable x and y controls
+        setType(1); // enable x and y controls
         mType->setCurrentIndex(1);
-    } else {
+    }
+    else
+    {
         setType(0);
         mType->setCurrentIndex(0);
     }
diff --git a/apps/opencs/view/world/cellcreator.hpp b/apps/opencs/view/world/cellcreator.hpp
index 032096aa24..4e68b1bf3e 100644
--- a/apps/opencs/view/world/cellcreator.hpp
+++ b/apps/opencs/view/world/cellcreator.hpp
@@ -11,39 +11,36 @@ namespace CSVWorld
 {
     class CellCreator : public GenericCreator
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            QComboBox *mType;
-            QLabel *mXLabel;
-            QSpinBox *mX;
-            QLabel *mYLabel;
-            QSpinBox *mY;
+        QComboBox* mType;
+        QLabel* mXLabel;
+        QSpinBox* mX;
+        QLabel* mYLabel;
+        QSpinBox* mY;
 
-        protected:
+    protected:
+        std::string getId() const override;
 
-            std::string getId() const override;
+        /// Allow subclasses to add additional data to \a command.
+        void configureCreateCommand(CSMWorld::CreateCommand& command) const override;
 
-            /// Allow subclasses to add additional data to \a command.
-            void configureCreateCommand(CSMWorld::CreateCommand& command) const override;
+    public:
+        CellCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id);
 
-        public:
+        void reset() override;
 
-            CellCreator (CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id);
+        void cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type) override;
 
-            void reset() override;
+        std::string getErrors() const override;
+        ///< Return formatted error descriptions for the current state of the creator. if an empty
+        /// string is returned, there is no error.
 
-            void cloneMode(const std::string& originId, 
-                                   const CSMWorld::UniversalId::Type type) override;
+    private slots:
 
-            std::string getErrors() const override;
-            ///< Return formatted error descriptions for the current state of the creator. if an empty
-            /// string is returned, there is no error.
+        void setType(int index);
 
-        private slots:
-
-            void setType (int index);
-
-            void valueChanged (int index);
+        void valueChanged(int index);
     };
 }
 
diff --git a/apps/opencs/view/world/colordelegate.cpp b/apps/opencs/view/world/colordelegate.cpp
index 8d5f5485df..cf2af1ae3a 100644
--- a/apps/opencs/view/world/colordelegate.cpp
+++ b/apps/opencs/view/world/colordelegate.cpp
@@ -2,23 +2,20 @@
 
 #include <QPainter>
 
-CSVWorld::ColorDelegate::ColorDelegate(CSMWorld::CommandDispatcher *dispatcher,
-                                       CSMDoc::Document& document,
-                                       QObject *parent)
+CSVWorld::ColorDelegate::ColorDelegate(
+    CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent)
     : CommandDelegate(dispatcher, document, parent)
-{}
+{
+}
 
-void CSVWorld::ColorDelegate::paint(QPainter *painter,
-                                    const QStyleOptionViewItem &option,
-                                    const QModelIndex &index) const
+void CSVWorld::ColorDelegate::paint(
+    QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
     int colorInt = index.data().toInt();
     QColor color(colorInt & 0xff, (colorInt >> 8) & 0xff, (colorInt >> 16) & 0xff);
 
     QRect coloredRect(option.rect.x() + qRound(option.rect.width() / 4.0),
-                      option.rect.y() + qRound(option.rect.height() / 4.0),
-                      option.rect.width() / 2,
-                      option.rect.height() / 2);
+        option.rect.y() + qRound(option.rect.height() / 4.0), option.rect.width() / 2, option.rect.height() / 2);
     painter->save();
     painter->fillRect(coloredRect, color);
     painter->setPen(Qt::black);
@@ -26,11 +23,8 @@ void CSVWorld::ColorDelegate::paint(QPainter *painter,
     painter->restore();
 }
 
-CSVWorld::CommandDelegate *CSVWorld::ColorDelegateFactory::makeDelegate(CSMWorld::CommandDispatcher *dispatcher,
-                                                                        CSMDoc::Document &document,
-                                                                        QObject *parent) const
+CSVWorld::CommandDelegate* CSVWorld::ColorDelegateFactory::makeDelegate(
+    CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent) const
 {
     return new ColorDelegate(dispatcher, document, parent);
 }
-
-
diff --git a/apps/opencs/view/world/colordelegate.hpp b/apps/opencs/view/world/colordelegate.hpp
index 041051d132..b1f2a7f00e 100644
--- a/apps/opencs/view/world/colordelegate.hpp
+++ b/apps/opencs/view/world/colordelegate.hpp
@@ -14,23 +14,18 @@ namespace CSVWorld
 {
     class ColorDelegate : public CommandDelegate
     {
-        public:
-            ColorDelegate(CSMWorld::CommandDispatcher *dispatcher, 
-                          CSMDoc::Document& document, 
-                          QObject *parent);
+    public:
+        ColorDelegate(CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent);
 
-            void paint(QPainter *painter, 
-                               const QStyleOptionViewItem &option,
-                               const QModelIndex &index) const override;
+        void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
     };
 
     class ColorDelegateFactory : public CommandDelegateFactory
     {
-        public:
-            CommandDelegate *makeDelegate(CSMWorld::CommandDispatcher *dispatcher, 
-                                                  CSMDoc::Document &document, 
-                                                  QObject *parent) const override;
-            ///< The ownership of the returned CommandDelegate is transferred to the caller.
+    public:
+        CommandDelegate* makeDelegate(
+            CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent) const override;
+        ///< The ownership of the returned CommandDelegate is transferred to the caller.
     };
 }
 
diff --git a/apps/opencs/view/world/creator.cpp b/apps/opencs/view/world/creator.cpp
index 53664c186a..04db050a09 100644
--- a/apps/opencs/view/world/creator.cpp
+++ b/apps/opencs/view/world/creator.cpp
@@ -4,18 +4,16 @@
 
 CSVWorld::Creator::~Creator() {}
 
-void CSVWorld::Creator::setScope (unsigned int scope)
+void CSVWorld::Creator::setScope(unsigned int scope)
 {
-    if (scope!=CSMWorld::Scope_Content)
-        throw std::logic_error ("Invalid scope in creator");
+    if (scope != CSMWorld::Scope_Content)
+        throw std::logic_error("Invalid scope in creator");
 }
 
-
 CSVWorld::CreatorFactoryBase::~CreatorFactoryBase() {}
 
-
-CSVWorld::Creator *CSVWorld::NullCreatorFactory::makeCreator (CSMDoc::Document& document, 
-                                                              const CSMWorld::UniversalId& id) const
+CSVWorld::Creator* CSVWorld::NullCreatorFactory::makeCreator(
+    CSMDoc::Document& document, const CSMWorld::UniversalId& id) const
 {
     return nullptr;
 }
diff --git a/apps/opencs/view/world/creator.hpp b/apps/opencs/view/world/creator.hpp
index 7c61c6e6be..67f68ee6fb 100644
--- a/apps/opencs/view/world/creator.hpp
+++ b/apps/opencs/view/world/creator.hpp
@@ -22,83 +22,78 @@ namespace CSVWorld
     /// \brief Record creator UI base class
     class Creator : public QWidget
     {
-            Q_OBJECT
+        Q_OBJECT
 
-        public:
+    public:
+        virtual ~Creator();
 
-            virtual ~Creator();
+        virtual void reset() = 0;
 
-            virtual void reset() = 0;
+        virtual void cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type) = 0;
 
-            virtual void cloneMode(const std::string& originId,
-                                   const CSMWorld::UniversalId::Type type) = 0;
+        /// Touches a record, if the creator supports it.
+        virtual void touch(const std::vector<CSMWorld::UniversalId>& ids) = 0;
 
-            /// Touches a record, if the creator supports it.
-            virtual void touch(const std::vector<CSMWorld::UniversalId>& ids) = 0;
+        virtual void setEditLock(bool locked) = 0;
 
-            virtual void setEditLock (bool locked) = 0;
+        virtual void toggleWidgets(bool active = true) = 0;
 
-            virtual void toggleWidgets(bool active = true) = 0;
+        /// Default implementation: Throw an exception if scope!=Scope_Content.
+        virtual void setScope(unsigned int scope);
 
-            /// Default implementation: Throw an exception if scope!=Scope_Content.
-            virtual void setScope (unsigned int scope);
+        /// Focus main input widget
+        virtual void focus() = 0;
 
-            /// Focus main input widget
-            virtual void focus() = 0;
+    signals:
 
-        signals:
+        void done();
 
-            void done();
-
-            void requestFocus (const std::string& id);
-            ///< Request owner of this creator to focus the just created \a id. The owner may
-            /// ignore this request.
+        void requestFocus(const std::string& id);
+        ///< Request owner of this creator to focus the just created \a id. The owner may
+        /// ignore this request.
     };
 
     /// \brief Base class for Creator factory
     class CreatorFactoryBase
     {
-        public:
-
-            virtual ~CreatorFactoryBase();
-
-            virtual Creator *makeCreator (CSMDoc::Document& document, const CSMWorld::UniversalId& id) const = 0;
-            ///< The ownership of the returned Creator is transferred to the caller.
-            ///
-            /// \note The function can return a 0-pointer, which means no UI for creating/deleting
-            /// records should be provided.
+    public:
+        virtual ~CreatorFactoryBase();
+
+        virtual Creator* makeCreator(CSMDoc::Document& document, const CSMWorld::UniversalId& id) const = 0;
+        ///< The ownership of the returned Creator is transferred to the caller.
+        ///
+        /// \note The function can return a 0-pointer, which means no UI for creating/deleting
+        /// records should be provided.
     };
 
     /// \brief Creator factory that does not produces any creator
     class NullCreatorFactory : public CreatorFactoryBase
     {
-        public:
-
-            Creator *makeCreator (CSMDoc::Document& document, const CSMWorld::UniversalId& id) const override;
-            ///< The ownership of the returned Creator is transferred to the caller.
-            ///
-            /// \note The function always returns 0.
+    public:
+        Creator* makeCreator(CSMDoc::Document& document, const CSMWorld::UniversalId& id) const override;
+        ///< The ownership of the returned Creator is transferred to the caller.
+        ///
+        /// \note The function always returns 0.
     };
 
-    template<class CreatorT, unsigned int scope = CSMWorld::Scope_Content>
+    template <class CreatorT, unsigned int scope = CSMWorld::Scope_Content>
     class CreatorFactory : public CreatorFactoryBase
     {
-        public:
-
-            Creator *makeCreator (CSMDoc::Document& document, const CSMWorld::UniversalId& id) const override;
-            ///< The ownership of the returned Creator is transferred to the caller.
-            ///
-            /// \note The function can return a 0-pointer, which means no UI for creating/deleting
-            /// records should be provided.
+    public:
+        Creator* makeCreator(CSMDoc::Document& document, const CSMWorld::UniversalId& id) const override;
+        ///< The ownership of the returned Creator is transferred to the caller.
+        ///
+        /// \note The function can return a 0-pointer, which means no UI for creating/deleting
+        /// records should be provided.
     };
 
-    template<class CreatorT, unsigned int scope>
-    Creator *CreatorFactory<CreatorT, scope>::makeCreator (CSMDoc::Document& document,
-                                                           const CSMWorld::UniversalId& id) const
+    template <class CreatorT, unsigned int scope>
+    Creator* CreatorFactory<CreatorT, scope>::makeCreator(
+        CSMDoc::Document& document, const CSMWorld::UniversalId& id) const
     {
         auto creator = std::make_unique<CreatorT>(document.getData(), document.getUndoStack(), id);
 
-        creator->setScope (scope);
+        creator->setScope(scope);
 
         return creator.release();
     }
diff --git a/apps/opencs/view/world/datadisplaydelegate.cpp b/apps/opencs/view/world/datadisplaydelegate.cpp
index 6da62d4089..bbf7cf863f 100644
--- a/apps/opencs/view/world/datadisplaydelegate.cpp
+++ b/apps/opencs/view/world/datadisplaydelegate.cpp
@@ -5,25 +5,24 @@
 #include <QApplication>
 #include <QPainter>
 
-CSVWorld::DataDisplayDelegate::DataDisplayDelegate(const ValueList &values,
-                                                   const IconList &icons,
-                                                   CSMWorld::CommandDispatcher *dispatcher,
-                                                   CSMDoc::Document& document,
-                                                   const std::string &pageName,
-                                                   const std::string &settingName,
-                                                   QObject *parent)
-    : EnumDelegate (values, dispatcher, document, parent), mDisplayMode (Mode_TextOnly),
-      mIcons (icons), mIconSize (QSize(16, 16)),
-      mHorizontalMargin(QApplication::style()->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1),
-      mTextLeftOffset(8), mSettingKey (pageName + '/' + settingName)
+CSVWorld::DataDisplayDelegate::DataDisplayDelegate(const ValueList& values, const IconList& icons,
+    CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, const std::string& pageName,
+    const std::string& settingName, QObject* parent)
+    : EnumDelegate(values, dispatcher, document, parent)
+    , mDisplayMode(Mode_TextOnly)
+    , mIcons(icons)
+    , mIconSize(QSize(16, 16))
+    , mHorizontalMargin(QApplication::style()->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1)
+    , mTextLeftOffset(8)
+    , mSettingKey(pageName + '/' + settingName)
 {
     buildPixmaps();
 
     if (!pageName.empty())
-        updateDisplayMode (CSMPrefs::get()[pageName][settingName].toString());
+        updateDisplayMode(CSMPrefs::get()[pageName][settingName].toString());
 }
 
-void CSVWorld::DataDisplayDelegate::buildPixmaps ()
+void CSVWorld::DataDisplayDelegate::buildPixmaps()
 {
     if (!mPixmaps.empty())
         mPixmaps.clear();
@@ -32,7 +31,7 @@ void CSVWorld::DataDisplayDelegate::buildPixmaps ()
 
     while (it != mIcons.end())
     {
-        mPixmaps.emplace_back (it->mValue, it->mIcon.pixmap (mIconSize) );
+        mPixmaps.emplace_back(it->mValue, it->mIcon.pixmap(mIconSize));
         ++it;
     }
 }
@@ -48,7 +47,7 @@ void CSVWorld::DataDisplayDelegate::setTextLeftOffset(int offset)
     mTextLeftOffset = offset;
 }
 
-QSize CSVWorld::DataDisplayDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
+QSize CSVWorld::DataDisplayDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
     QSize size = EnumDelegate::sizeHint(option, index);
 
@@ -72,11 +71,12 @@ QSize CSVWorld::DataDisplayDelegate::sizeHint(const QStyleOptionViewItem &option
     return size;
 }
 
-void CSVWorld::DataDisplayDelegate::paint (QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+void CSVWorld::DataDisplayDelegate::paint(
+    QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
     painter->save();
 
-    //default to enum delegate's paint method for text-only conditions
+    // default to enum delegate's paint method for text-only conditions
     if (mDisplayMode == Mode_TextOnly)
         EnumDelegate::paint(painter, option, index);
     else
@@ -91,7 +91,7 @@ void CSVWorld::DataDisplayDelegate::paint (QPainter *painter, const QStyleOption
     painter->restore();
 }
 
-void CSVWorld::DataDisplayDelegate::paintIcon (QPainter *painter, const QStyleOptionViewItem &option, int index) const
+void CSVWorld::DataDisplayDelegate::paintIcon(QPainter* painter, const QStyleOptionViewItem& option, int index) const
 {
     QRect iconRect = option.rect;
     QRect textRect = iconRect;
@@ -104,20 +104,14 @@ void CSVWorld::DataDisplayDelegate::paintIcon (QPainter *painter, const QStyleOp
         textRect.setLeft(iconRect.right() + mTextLeftOffset);
         textRect.setRight(option.rect.right() - mHorizontalMargin);
 
-        QString text = option.fontMetrics.elidedText(mValues.at(index).second,
-                                                     option.textElideMode,
-                                                     textRect.width());
-        QApplication::style()->drawItemText(painter,
-                                            textRect,
-                                            Qt::AlignLeft | Qt::AlignVCenter,
-                                            option.palette,
-                                            true,
-                                            text);
+        QString text = option.fontMetrics.elidedText(mValues.at(index).second, option.textElideMode, textRect.width());
+        QApplication::style()->drawItemText(
+            painter, textRect, Qt::AlignLeft | Qt::AlignVCenter, option.palette, true, text);
     }
     QApplication::style()->drawItemPixmap(painter, iconRect, Qt::AlignCenter, mPixmaps.at(index).second);
 }
 
-void CSVWorld::DataDisplayDelegate::updateDisplayMode (const std::string &mode)
+void CSVWorld::DataDisplayDelegate::updateDisplayMode(const std::string& mode)
 {
     if (mode == "Icon and Text")
         mDisplayMode = Mode_IconAndText;
@@ -129,18 +123,15 @@ void CSVWorld::DataDisplayDelegate::updateDisplayMode (const std::string &mode)
         mDisplayMode = Mode_TextOnly;
 }
 
-CSVWorld::DataDisplayDelegate::~DataDisplayDelegate()
-{
-}
+CSVWorld::DataDisplayDelegate::~DataDisplayDelegate() {}
 
-void CSVWorld::DataDisplayDelegate::settingChanged (const CSMPrefs::Setting *setting)
+void CSVWorld::DataDisplayDelegate::settingChanged(const CSMPrefs::Setting* setting)
 {
-    if (*setting==mSettingKey)
-        updateDisplayMode (setting->toString());
+    if (*setting == mSettingKey)
+        updateDisplayMode(setting->toString());
 }
 
-
-void CSVWorld::DataDisplayDelegateFactory::add (int enumValue, const QString& enumName, const QString& iconFilename)
+void CSVWorld::DataDisplayDelegateFactory::add(int enumValue, const QString& enumName, const QString& iconFilename)
 {
     EnumDelegateFactory::add(enumValue, enumName);
 
@@ -149,7 +140,7 @@ void CSVWorld::DataDisplayDelegateFactory::add (int enumValue, const QString& en
     icon.mName = enumName;
     icon.mIcon = QIcon(iconFilename);
 
-    for (auto it=mIcons.begin(); it!=mIcons.end(); ++it)
+    for (auto it = mIcons.begin(); it != mIcons.end(); ++it)
     {
         if (it->mName > enumName)
         {
@@ -161,8 +152,8 @@ void CSVWorld::DataDisplayDelegateFactory::add (int enumValue, const QString& en
     mIcons.push_back(icon);
 }
 
-CSVWorld::CommandDelegate *CSVWorld::DataDisplayDelegateFactory::makeDelegate (
-    CSMWorld::CommandDispatcher *dispatcher, CSMDoc::Document& document, QObject *parent) const
+CSVWorld::CommandDelegate* CSVWorld::DataDisplayDelegateFactory::makeDelegate(
+    CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent) const
 {
-    return new DataDisplayDelegate (mValues, mIcons, dispatcher, document, "", "", parent);
+    return new DataDisplayDelegate(mValues, mIcons, dispatcher, document, "", "", parent);
 }
diff --git a/apps/opencs/view/world/datadisplaydelegate.hpp b/apps/opencs/view/world/datadisplaydelegate.hpp
index 52e2294f03..e80760bb73 100755
--- a/apps/opencs/view/world/datadisplaydelegate.hpp
+++ b/apps/opencs/view/world/datadisplaydelegate.hpp
@@ -20,12 +20,10 @@ namespace CSVWorld
     class DataDisplayDelegate : public EnumDelegate
     {
     public:
-
         typedef std::vector<Icon> IconList;
-        typedef std::vector<std::pair<int, QString> > ValueList;
+        typedef std::vector<std::pair<int, QString>> ValueList;
 
     protected:
-
         enum DisplayMode
         {
             Mode_TextOnly,
@@ -37,8 +35,7 @@ namespace CSVWorld
         IconList mIcons;
 
     private:
-
-        std::vector <std::pair <int, QPixmap> > mPixmaps;
+        std::vector<std::pair<int, QPixmap>> mPixmaps;
         QSize mIconSize;
         int mHorizontalMargin;
         int mTextLeftOffset;
@@ -46,51 +43,46 @@ namespace CSVWorld
         std::string mSettingKey;
 
     public:
-        DataDisplayDelegate (const ValueList & values, const IconList & icons,
-            CSMWorld::CommandDispatcher *dispatcher, CSMDoc::Document& document,
-            const std::string& pageName, const std::string& settingName, QObject *parent);
+        DataDisplayDelegate(const ValueList& values, const IconList& icons, CSMWorld::CommandDispatcher* dispatcher,
+            CSMDoc::Document& document, const std::string& pageName, const std::string& settingName, QObject* parent);
 
         ~DataDisplayDelegate();
 
-        void paint (QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+        void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
 
-        QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+        QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override;
 
         /// pass a QSize defining height / width of icon. Default is QSize (16,16).
-        void setIconSize (const QSize& icon);
+        void setIconSize(const QSize& icon);
 
         /// offset the horizontal position of the text from the right edge of the icon.  Default is 8 pixels.
-        void setTextLeftOffset (int offset);
+        void setTextLeftOffset(int offset);
 
     private:
-
         /// update the display mode based on a passed string
-        void updateDisplayMode (const std::string &);
+        void updateDisplayMode(const std::string&);
 
         /// custom paint function for painting the icon.  Mode_IconAndText and Mode_Icon only.
-        void paintIcon (QPainter *painter, const QStyleOptionViewItem &option, int i) const;
+        void paintIcon(QPainter* painter, const QStyleOptionViewItem& option, int i) const;
 
         /// rebuild the list of pixmaps from the provided icons (called when icon size is changed)
         void buildPixmaps();
 
-        void settingChanged (const CSMPrefs::Setting *setting) override;
+        void settingChanged(const CSMPrefs::Setting* setting) override;
     };
 
     class DataDisplayDelegateFactory : public EnumDelegateFactory
     {
     protected:
-
         DataDisplayDelegate::IconList mIcons;
 
     public:
-
-        CommandDelegate *makeDelegate (CSMWorld::CommandDispatcher *dispatcher, CSMDoc::Document& document, QObject *parent) const override;
+        CommandDelegate* makeDelegate(
+            CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent) const override;
         ///< The ownership of the returned CommandDelegate is transferred to the caller.
 
     protected:
-
-       void add (int enumValue, const QString& enumName, const QString& iconFilename);
-
+        void add(int enumValue, const QString& enumName, const QString& iconFilename);
     };
 
 }
diff --git a/apps/opencs/view/world/dialoguecreator.cpp b/apps/opencs/view/world/dialoguecreator.cpp
index 9317aa95cd..9656e43d13 100644
--- a/apps/opencs/view/world/dialoguecreator.cpp
+++ b/apps/opencs/view/world/dialoguecreator.cpp
@@ -5,28 +5,29 @@
 #include "../../model/world/commands.hpp"
 #include "../../model/world/idtable.hpp"
 
-void CSVWorld::DialogueCreator::configureCreateCommand (CSMWorld::CreateCommand& command) const
+void CSVWorld::DialogueCreator::configureCreateCommand(CSMWorld::CreateCommand& command) const
 {
-    int index =
-        dynamic_cast<CSMWorld::IdTable&> (*getData().getTableModel (getCollectionId())).
-        findColumnIndex (CSMWorld::Columns::ColumnId_DialogueType);
+    int index = dynamic_cast<CSMWorld::IdTable&>(*getData().getTableModel(getCollectionId()))
+                    .findColumnIndex(CSMWorld::Columns::ColumnId_DialogueType);
 
-    command.addValue (index, mType);
+    command.addValue(index, mType);
 }
 
-CSVWorld::DialogueCreator::DialogueCreator (CSMWorld::Data& data, QUndoStack& undoStack,
-    const CSMWorld::UniversalId& id, int type)
-: GenericCreator (data, undoStack, id, true), mType (type)
-{}
+CSVWorld::DialogueCreator::DialogueCreator(
+    CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id, int type)
+    : GenericCreator(data, undoStack, id, true)
+    , mType(type)
+{
+}
 
-CSVWorld::Creator *CSVWorld::TopicCreatorFactory::makeCreator (CSMDoc::Document& document, 
-                                                               const CSMWorld::UniversalId& id) const
+CSVWorld::Creator* CSVWorld::TopicCreatorFactory::makeCreator(
+    CSMDoc::Document& document, const CSMWorld::UniversalId& id) const
 {
-    return new DialogueCreator (document.getData(), document.getUndoStack(), id, ESM::Dialogue::Topic);
+    return new DialogueCreator(document.getData(), document.getUndoStack(), id, ESM::Dialogue::Topic);
 }
 
-CSVWorld::Creator *CSVWorld::JournalCreatorFactory::makeCreator (CSMDoc::Document& document, 
-                                                                 const CSMWorld::UniversalId& id) const
+CSVWorld::Creator* CSVWorld::JournalCreatorFactory::makeCreator(
+    CSMDoc::Document& document, const CSMWorld::UniversalId& id) const
 {
-    return new DialogueCreator (document.getData(), document.getUndoStack(), id, ESM::Dialogue::Journal);
+    return new DialogueCreator(document.getData(), document.getUndoStack(), id, ESM::Dialogue::Journal);
 }
diff --git a/apps/opencs/view/world/dialoguecreator.hpp b/apps/opencs/view/world/dialoguecreator.hpp
index 0aef2f84df..74a1ab6b4f 100644
--- a/apps/opencs/view/world/dialoguecreator.hpp
+++ b/apps/opencs/view/world/dialoguecreator.hpp
@@ -7,32 +7,27 @@ namespace CSVWorld
 {
     class DialogueCreator : public GenericCreator
     {
-            int mType;
+        int mType;
 
-        protected:
+    protected:
+        void configureCreateCommand(CSMWorld::CreateCommand& command) const override;
 
-            void configureCreateCommand (CSMWorld::CreateCommand& command) const override;
-
-        public:
-
-            DialogueCreator (CSMWorld::Data& data, QUndoStack& undoStack,
-                const CSMWorld::UniversalId& id, int type);
+    public:
+        DialogueCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id, int type);
     };
 
     class TopicCreatorFactory : public CreatorFactoryBase
     {
-        public:
-
-            Creator *makeCreator (CSMDoc::Document& document, const CSMWorld::UniversalId& id) const override;
-            ///< The ownership of the returned Creator is transferred to the caller.
+    public:
+        Creator* makeCreator(CSMDoc::Document& document, const CSMWorld::UniversalId& id) const override;
+        ///< The ownership of the returned Creator is transferred to the caller.
     };
 
     class JournalCreatorFactory : public CreatorFactoryBase
     {
-        public:
-
-            Creator *makeCreator (CSMDoc::Document& document, const CSMWorld::UniversalId& id) const override;
-            ///< The ownership of the returned Creator is transferred to the caller.
+    public:
+        Creator* makeCreator(CSMDoc::Document& document, const CSMWorld::UniversalId& id) const override;
+        ///< The ownership of the returned Creator is transferred to the caller.
     };
 }
 
diff --git a/apps/opencs/view/world/dialoguespinbox.cpp b/apps/opencs/view/world/dialoguespinbox.cpp
index 1228ca0da9..25b15e51b6 100644
--- a/apps/opencs/view/world/dialoguespinbox.cpp
+++ b/apps/opencs/view/world/dialoguespinbox.cpp
@@ -2,24 +2,25 @@
 
 #include <QWheelEvent>
 
-CSVWorld::DialogueSpinBox::DialogueSpinBox(QWidget *parent) : QSpinBox(parent)
+CSVWorld::DialogueSpinBox::DialogueSpinBox(QWidget* parent)
+    : QSpinBox(parent)
 {
     setFocusPolicy(Qt::StrongFocus);
 }
 
-void CSVWorld::DialogueSpinBox::focusInEvent(QFocusEvent *event)
+void CSVWorld::DialogueSpinBox::focusInEvent(QFocusEvent* event)
 {
     setFocusPolicy(Qt::WheelFocus);
     QSpinBox::focusInEvent(event);
 }
 
-void CSVWorld::DialogueSpinBox::focusOutEvent(QFocusEvent *event)
+void CSVWorld::DialogueSpinBox::focusOutEvent(QFocusEvent* event)
 {
     setFocusPolicy(Qt::StrongFocus);
     QSpinBox::focusOutEvent(event);
 }
 
-void CSVWorld::DialogueSpinBox::wheelEvent(QWheelEvent *event)
+void CSVWorld::DialogueSpinBox::wheelEvent(QWheelEvent* event)
 {
     if (!hasFocus())
         event->ignore();
@@ -27,24 +28,25 @@ void CSVWorld::DialogueSpinBox::wheelEvent(QWheelEvent *event)
         QSpinBox::wheelEvent(event);
 }
 
-CSVWorld::DialogueDoubleSpinBox::DialogueDoubleSpinBox(QWidget *parent) : QDoubleSpinBox(parent)
+CSVWorld::DialogueDoubleSpinBox::DialogueDoubleSpinBox(QWidget* parent)
+    : QDoubleSpinBox(parent)
 {
     setFocusPolicy(Qt::StrongFocus);
 }
 
-void CSVWorld::DialogueDoubleSpinBox::focusInEvent(QFocusEvent *event)
+void CSVWorld::DialogueDoubleSpinBox::focusInEvent(QFocusEvent* event)
 {
     setFocusPolicy(Qt::WheelFocus);
     QDoubleSpinBox::focusInEvent(event);
 }
 
-void CSVWorld::DialogueDoubleSpinBox::focusOutEvent(QFocusEvent *event)
+void CSVWorld::DialogueDoubleSpinBox::focusOutEvent(QFocusEvent* event)
 {
     setFocusPolicy(Qt::StrongFocus);
     QDoubleSpinBox::focusOutEvent(event);
 }
 
-void CSVWorld::DialogueDoubleSpinBox::wheelEvent(QWheelEvent *event)
+void CSVWorld::DialogueDoubleSpinBox::wheelEvent(QWheelEvent* event)
 {
     if (!hasFocus())
         event->ignore();
diff --git a/apps/opencs/view/world/dialoguespinbox.hpp b/apps/opencs/view/world/dialoguespinbox.hpp
index 90fe8d20cd..beffb56562 100644
--- a/apps/opencs/view/world/dialoguespinbox.hpp
+++ b/apps/opencs/view/world/dialoguespinbox.hpp
@@ -1,8 +1,8 @@
 #ifndef CSV_WORLD_DIALOGUESPINBOX_H
 #define CSV_WORLD_DIALOGUESPINBOX_H
 
-#include <QSpinBox>
 #include <QDoubleSpinBox>
+#include <QSpinBox>
 
 namespace CSVWorld
 {
@@ -10,30 +10,26 @@ namespace CSVWorld
     {
         Q_OBJECT
 
-        public:
-
-            DialogueSpinBox (QWidget *parent = nullptr);
+    public:
+        DialogueSpinBox(QWidget* parent = nullptr);
 
-        protected:
-
-            void focusInEvent(QFocusEvent *event) override;
-            void focusOutEvent(QFocusEvent *event) override;
-            void wheelEvent(QWheelEvent *event) override;
+    protected:
+        void focusInEvent(QFocusEvent* event) override;
+        void focusOutEvent(QFocusEvent* event) override;
+        void wheelEvent(QWheelEvent* event) override;
     };
 
     class DialogueDoubleSpinBox : public QDoubleSpinBox
     {
         Q_OBJECT
 
-        public:
-
-            DialogueDoubleSpinBox (QWidget *parent = nullptr);
-
-        protected:
+    public:
+        DialogueDoubleSpinBox(QWidget* parent = nullptr);
 
-            void focusInEvent(QFocusEvent *event) override;
-            void focusOutEvent(QFocusEvent *event) override;
-            void wheelEvent(QWheelEvent *event) override;
+    protected:
+        void focusInEvent(QFocusEvent* event) override;
+        void focusOutEvent(QFocusEvent* event) override;
+        void wheelEvent(QWheelEvent* event) override;
     };
 }
 
diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp
index 8d7fa875f1..7e2b39571d 100644
--- a/apps/opencs/view/world/dialoguesubview.cpp
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@@ -1,8 +1,8 @@
 #include "dialoguesubview.hpp"
 
-#include <utility>
 #include <memory>
 #include <stdexcept>
+#include <utility>
 
 #include <QAbstractItemModel>
 #include <QCheckBox>
@@ -17,38 +17,39 @@
 #include <QScrollBar>
 #include <QSize>
 
-#include "../../model/world/nestedtableproxymodel.hpp"
+#include "../../model/doc/document.hpp"
 #include "../../model/world/columnbase.hpp"
+#include "../../model/world/columns.hpp"
+#include "../../model/world/commands.hpp"
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/idtree.hpp"
-#include "../../model/world/columns.hpp"
+#include "../../model/world/nestedtableproxymodel.hpp"
 #include "../../model/world/record.hpp"
 #include "../../model/world/tablemimedata.hpp"
-#include "../../model/world/commands.hpp"
-#include "../../model/doc/document.hpp"
 
 #include "../../model/prefs/state.hpp"
 
 #include "../widget/coloreditor.hpp"
 #include "../widget/droplineedit.hpp"
 
-#include "recordstatusdelegate.hpp"
-#include "util.hpp"
-#include "tablebottombox.hpp"
 #include "nestedtable.hpp"
 #include "recordbuttonbar.hpp"
+#include "recordstatusdelegate.hpp"
+#include "tablebottombox.hpp"
+#include "util.hpp"
 /*
 ==============================NotEditableSubDelegate==========================================
 */
-CSVWorld::NotEditableSubDelegate::NotEditableSubDelegate(const CSMWorld::IdTable* table, QObject * parent) :
-QAbstractItemDelegate(parent),
-mTable(table)
-{}
+CSVWorld::NotEditableSubDelegate::NotEditableSubDelegate(const CSMWorld::IdTable* table, QObject* parent)
+    : QAbstractItemDelegate(parent)
+    , mTable(table)
+{
+}
 
-void CSVWorld::NotEditableSubDelegate::setEditorData (QWidget* editor, const QModelIndex& index) const
+void CSVWorld::NotEditableSubDelegate::setEditorData(QWidget* editor, const QModelIndex& index) const
 {
     QLabel* label = qobject_cast<QLabel*>(editor);
-    if(!label)
+    if (!label)
         return;
 
     QVariant v = index.data(Qt::EditRole);
@@ -61,61 +62,64 @@ void CSVWorld::NotEditableSubDelegate::setEditorData (QWidget* editor, const QMo
         }
     }
 
-    CSMWorld::Columns::ColumnId columnId = static_cast<CSMWorld::Columns::ColumnId> (
-        mTable->getColumnId (index.column()));
+    CSMWorld::Columns::ColumnId columnId
+        = static_cast<CSMWorld::Columns::ColumnId>(mTable->getColumnId(index.column()));
 
     if (QVariant::String == v.type())
     {
         label->setText(v.toString());
     }
-    else if (CSMWorld::Columns::hasEnums (columnId))
+    else if (CSMWorld::Columns::hasEnums(columnId))
     {
         int data = v.toInt();
-        std::vector<std::pair<int,std::string>> enumNames (CSMWorld::Columns::getEnums (columnId));
+        std::vector<std::pair<int, std::string>> enumNames(CSMWorld::Columns::getEnums(columnId));
 
         label->setText(QString::fromUtf8(enumNames.at(data).second.c_str()));
     }
     else
     {
-        label->setText (v.toString());
+        label->setText(v.toString());
     }
 }
 
-void CSVWorld::NotEditableSubDelegate::setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const
+void CSVWorld::NotEditableSubDelegate::setModelData(
+    QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const
 {
-    //not editable widgets will not save model data
+    // not editable widgets will not save model data
 }
 
-void CSVWorld::NotEditableSubDelegate::paint (QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
+void CSVWorld::NotEditableSubDelegate::paint(
+    QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
-    //does nothing
+    // does nothing
 }
 
-QSize CSVWorld::NotEditableSubDelegate::sizeHint (const QStyleOptionViewItem& option, const QModelIndex& index) const
+QSize CSVWorld::NotEditableSubDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
     return QSize();
 }
 
-QWidget* CSVWorld::NotEditableSubDelegate::createEditor (QWidget *parent,
-                                const QStyleOptionViewItem& option,
-                                const QModelIndex& index) const
+QWidget* CSVWorld::NotEditableSubDelegate::createEditor(
+    QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
-    QLabel *label = new QLabel(parent);
-    label->setTextInteractionFlags (Qt::TextSelectableByMouse);
+    QLabel* label = new QLabel(parent);
+    label->setTextInteractionFlags(Qt::TextSelectableByMouse);
     return label;
 }
 
 /*
 ==============================DialogueDelegateDispatcherProxy==========================================
 */
-CSVWorld::DialogueDelegateDispatcherProxy::refWrapper::refWrapper(const QModelIndex& index) :
-mIndex(index)
-{}
+CSVWorld::DialogueDelegateDispatcherProxy::refWrapper::refWrapper(const QModelIndex& index)
+    : mIndex(index)
+{
+}
 
-CSVWorld::DialogueDelegateDispatcherProxy::DialogueDelegateDispatcherProxy(QWidget* editor, CSMWorld::ColumnBase::Display display) :
-mEditor(editor),
-mDisplay(display),
-mIndexWrapper(nullptr)
+CSVWorld::DialogueDelegateDispatcherProxy::DialogueDelegateDispatcherProxy(
+    QWidget* editor, CSMWorld::ColumnBase::Display display)
+    : mEditor(editor)
+    , mDisplay(display)
+    , mIndexWrapper(nullptr)
 {
 }
 
@@ -141,54 +145,58 @@ QWidget* CSVWorld::DialogueDelegateDispatcherProxy::getEditor() const
 ==============================DialogueDelegateDispatcher==========================================
 */
 
-CSVWorld::DialogueDelegateDispatcher::DialogueDelegateDispatcher(QObject* parent,
-        CSMWorld::IdTable* table, CSMWorld::CommandDispatcher& commandDispatcher,
-        CSMDoc::Document& document, QAbstractItemModel *model) :
-mParent(parent),
-mTable(model ? model : table),
-mCommandDispatcher (commandDispatcher), mDocument (document),
-mNotEditableDelegate(table, parent)
+CSVWorld::DialogueDelegateDispatcher::DialogueDelegateDispatcher(QObject* parent, CSMWorld::IdTable* table,
+    CSMWorld::CommandDispatcher& commandDispatcher, CSMDoc::Document& document, QAbstractItemModel* model)
+    : mParent(parent)
+    , mTable(model ? model : table)
+    , mCommandDispatcher(commandDispatcher)
+    , mDocument(document)
+    , mNotEditableDelegate(table, parent)
 {
 }
 
 CSVWorld::CommandDelegate* CSVWorld::DialogueDelegateDispatcher::makeDelegate(CSMWorld::ColumnBase::Display display)
 {
-    CommandDelegate *delegate = nullptr;
+    CommandDelegate* delegate = nullptr;
     std::map<int, CommandDelegate*>::const_iterator delegateIt(mDelegates.find(display));
     if (delegateIt == mDelegates.end())
     {
-        delegate = CommandDelegateFactoryCollection::get().makeDelegate (
-                                    display, &mCommandDispatcher, mDocument, mParent);
+        delegate
+            = CommandDelegateFactoryCollection::get().makeDelegate(display, &mCommandDispatcher, mDocument, mParent);
         mDelegates.insert(std::make_pair(display, delegate));
-    } else
+    }
+    else
     {
         delegate = delegateIt->second;
     }
     return delegate;
 }
 
-void CSVWorld::DialogueDelegateDispatcher::editorDataCommited(QWidget* editor,
-        const QModelIndex& index, CSMWorld::ColumnBase::Display display)
+void CSVWorld::DialogueDelegateDispatcher::editorDataCommited(
+    QWidget* editor, const QModelIndex& index, CSMWorld::ColumnBase::Display display)
 {
     setModelData(editor, mTable, index, display);
 }
 
-void CSVWorld::DialogueDelegateDispatcher::setEditorData (QWidget* editor, const QModelIndex& index) const
+void CSVWorld::DialogueDelegateDispatcher::setEditorData(QWidget* editor, const QModelIndex& index) const
 {
     CSMWorld::ColumnBase::Display display = CSMWorld::ColumnBase::Display_None;
     if (index.parent().isValid())
     {
-        display = static_cast<CSMWorld::ColumnBase::Display>
-        (static_cast<CSMWorld::IdTree *>(mTable)->nestedHeaderData (index.parent().column(), index.column(), Qt::Horizontal, CSMWorld::ColumnBase::Role_Display).toInt());
+        display
+            = static_cast<CSMWorld::ColumnBase::Display>(static_cast<CSMWorld::IdTree*>(mTable)
+                                                             ->nestedHeaderData(index.parent().column(), index.column(),
+                                                                 Qt::Horizontal, CSMWorld::ColumnBase::Role_Display)
+                                                             .toInt());
     }
     else
     {
-        display = static_cast<CSMWorld::ColumnBase::Display>
-        (mTable->headerData (index.column(), Qt::Horizontal, CSMWorld::ColumnBase::Role_Display).toInt());
+        display = static_cast<CSMWorld::ColumnBase::Display>(
+            mTable->headerData(index.column(), Qt::Horizontal, CSMWorld::ColumnBase::Role_Display).toInt());
     }
 
     QLabel* label = qobject_cast<QLabel*>(editor);
-    if(label)
+    if (label)
     {
         mNotEditableDelegate.setEditorData(label, index);
         return;
@@ -202,21 +210,21 @@ void CSVWorld::DialogueDelegateDispatcher::setEditorData (QWidget* editor, const
 
     for (unsigned i = 0; i < mProxys.size(); ++i)
     {
-       if (mProxys[i]->getEditor() == editor)
+        if (mProxys[i]->getEditor() == editor)
         {
             mProxys[i]->setIndex(index);
         }
     }
 }
 
-void CSVWorld::DialogueDelegateDispatcher::setModelData(QWidget* editor,
-        QAbstractItemModel* model, const QModelIndex& index) const
+void CSVWorld::DialogueDelegateDispatcher::setModelData(
+    QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const
 {
     setModelData(editor, model, index, CSMWorld::ColumnBase::Display_None);
 }
 
-void CSVWorld::DialogueDelegateDispatcher::setModelData(QWidget* editor,
-        QAbstractItemModel* model, const QModelIndex& index, CSMWorld::ColumnBase::Display display) const
+void CSVWorld::DialogueDelegateDispatcher::setModelData(
+    QWidget* editor, QAbstractItemModel* model, const QModelIndex& index, CSMWorld::ColumnBase::Display display) const
 {
     std::map<int, CommandDelegate*>::const_iterator delegateIt(mDelegates.find(display));
     if (delegateIt != mDelegates.end())
@@ -225,20 +233,19 @@ void CSVWorld::DialogueDelegateDispatcher::setModelData(QWidget* editor,
     }
 }
 
-void CSVWorld::DialogueDelegateDispatcher::paint (QPainter* painter,
-        const QStyleOptionViewItem& option, const QModelIndex& index) const
+void CSVWorld::DialogueDelegateDispatcher::paint(
+    QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
-    //Does nothing
+    // Does nothing
 }
 
-QSize CSVWorld::DialogueDelegateDispatcher::sizeHint (const QStyleOptionViewItem& option,
-        const QModelIndex& index) const
+QSize CSVWorld::DialogueDelegateDispatcher::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
-    return QSize(); //silencing warning, otherwise does nothing
+    return QSize(); // silencing warning, otherwise does nothing
 }
 
-QWidget* CSVWorld::DialogueDelegateDispatcher::makeEditor(CSMWorld::ColumnBase::Display display,
-        const QModelIndex& index)
+QWidget* CSVWorld::DialogueDelegateDispatcher::makeEditor(
+    CSMWorld::ColumnBase::Display display, const QModelIndex& index)
 {
     QVariant variant = index.data();
     if (!variant.isValid())
@@ -251,18 +258,17 @@ QWidget* CSVWorld::DialogueDelegateDispatcher::makeEditor(CSMWorld::ColumnBase::
     }
 
     QWidget* editor = nullptr;
-    if (! (mTable->flags (index) & Qt::ItemIsEditable))
+    if (!(mTable->flags(index) & Qt::ItemIsEditable))
     {
-        return mNotEditableDelegate.createEditor(qobject_cast<QWidget*>(mParent),
-                QStyleOptionViewItem(), index);
+        return mNotEditableDelegate.createEditor(qobject_cast<QWidget*>(mParent), QStyleOptionViewItem(), index);
     }
 
     std::map<int, CommandDelegate*>::iterator delegateIt(mDelegates.find(display));
 
     if (delegateIt != mDelegates.end())
     {
-        editor = delegateIt->second->createEditor(qobject_cast<QWidget*>(mParent),
-                QStyleOptionViewItem(), index, display);
+        editor
+            = delegateIt->second->createEditor(qobject_cast<QWidget*>(mParent), QStyleOptionViewItem(), index, display);
 
         DialogueDelegateDispatcherProxy* proxy = new DialogueDelegateDispatcherProxy(editor, display);
 
@@ -270,44 +276,46 @@ QWidget* CSVWorld::DialogueDelegateDispatcher::makeEditor(CSMWorld::ColumnBase::
         // is required here
         if (qobject_cast<CSVWidget::DropLineEdit*>(editor))
         {
-            connect(static_cast<CSVWidget::DropLineEdit*>(editor), &CSVWidget::DropLineEdit::editingFinished,
-                proxy, qOverload<>(&DialogueDelegateDispatcherProxy::editorDataCommited));
+            connect(static_cast<CSVWidget::DropLineEdit*>(editor), &CSVWidget::DropLineEdit::editingFinished, proxy,
+                qOverload<>(&DialogueDelegateDispatcherProxy::editorDataCommited));
 
             connect(static_cast<CSVWidget::DropLineEdit*>(editor), &CSVWidget::DropLineEdit::tableMimeDataDropped,
-                    proxy, qOverload<>(&DialogueDelegateDispatcherProxy::editorDataCommited));
+                proxy, qOverload<>(&DialogueDelegateDispatcherProxy::editorDataCommited));
         }
         else if (qobject_cast<QCheckBox*>(editor))
         {
-            connect(static_cast<QCheckBox*>(editor), &QCheckBox::stateChanged,
-                    proxy, qOverload<>(&DialogueDelegateDispatcherProxy::editorDataCommited));
+            connect(static_cast<QCheckBox*>(editor), &QCheckBox::stateChanged, proxy,
+                qOverload<>(&DialogueDelegateDispatcherProxy::editorDataCommited));
         }
         else if (qobject_cast<QPlainTextEdit*>(editor))
         {
             connect(static_cast<QPlainTextEdit*>(editor), &QPlainTextEdit::textChanged, proxy,
-                    qOverload<>(&DialogueDelegateDispatcherProxy::editorDataCommited));
+                qOverload<>(&DialogueDelegateDispatcherProxy::editorDataCommited));
         }
         else if (qobject_cast<QComboBox*>(editor))
         {
-            connect(static_cast<QComboBox*>(editor), qOverload<int>(&QComboBox::currentIndexChanged),
-                    proxy, qOverload<>(&DialogueDelegateDispatcherProxy::editorDataCommited));
+            connect(static_cast<QComboBox*>(editor), qOverload<int>(&QComboBox::currentIndexChanged), proxy,
+                qOverload<>(&DialogueDelegateDispatcherProxy::editorDataCommited));
         }
         else if (qobject_cast<QAbstractSpinBox*>(editor) || qobject_cast<QLineEdit*>(editor))
         {
-            connect(static_cast<QAbstractSpinBox*>(editor), &QAbstractSpinBox::editingFinished,
-                    proxy, qOverload<>(&DialogueDelegateDispatcherProxy::editorDataCommited));
+            connect(static_cast<QAbstractSpinBox*>(editor), &QAbstractSpinBox::editingFinished, proxy,
+                qOverload<>(&DialogueDelegateDispatcherProxy::editorDataCommited));
         }
-        else if (qobject_cast<CSVWidget::ColorEditor *>(editor))
+        else if (qobject_cast<CSVWidget::ColorEditor*>(editor))
         {
-            connect(static_cast<CSVWidget::ColorEditor*>(editor), &CSVWidget::ColorEditor::pickingFinished,
-                    proxy, qOverload<>(&DialogueDelegateDispatcherProxy::editorDataCommited));
+            connect(static_cast<CSVWidget::ColorEditor*>(editor), &CSVWidget::ColorEditor::pickingFinished, proxy,
+                qOverload<>(&DialogueDelegateDispatcherProxy::editorDataCommited));
         }
         else // throw an exception because this is a coding error
-            throw std::logic_error ("Dialogue editor type missing");
+            throw std::logic_error("Dialogue editor type missing");
 
-        connect(proxy, qOverload<QWidget*,const QModelIndex&,CSMWorld::ColumnBase::Display>(&DialogueDelegateDispatcherProxy::editorDataCommited),
-                this, &DialogueDelegateDispatcher::editorDataCommited);
+        connect(proxy,
+            qOverload<QWidget*, const QModelIndex&, CSMWorld::ColumnBase::Display>(
+                &DialogueDelegateDispatcherProxy::editorDataCommited),
+            this, &DialogueDelegateDispatcher::editorDataCommited);
 
-        mProxys.push_back(proxy); //deleted in the destructor
+        mProxys.push_back(proxy); // deleted in the destructor
     }
     return editor;
 }
@@ -316,29 +324,26 @@ CSVWorld::DialogueDelegateDispatcher::~DialogueDelegateDispatcher()
 {
     for (unsigned i = 0; i < mProxys.size(); ++i)
     {
-        delete mProxys[i]; //unique_ptr could be handy
+        delete mProxys[i]; // unique_ptr could be handy
     }
 }
 
-
-CSVWorld::IdContextMenu::IdContextMenu(QWidget *widget, CSMWorld::ColumnBase::Display display)
-    : QObject(widget),
-      mWidget(widget),
-      mIdType(CSMWorld::TableMimeData::convertEnums(display))
+CSVWorld::IdContextMenu::IdContextMenu(QWidget* widget, CSMWorld::ColumnBase::Display display)
+    : QObject(widget)
+    , mWidget(widget)
+    , mIdType(CSMWorld::TableMimeData::convertEnums(display))
 {
     Q_ASSERT(mWidget != nullptr);
     Q_ASSERT(CSMWorld::ColumnBase::isId(display));
     Q_ASSERT(mIdType != CSMWorld::UniversalId::Type_None);
 
     mWidget->setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(mWidget, &QWidget::customContextMenuRequested,
-            this, &IdContextMenu::showContextMenu);
+    connect(mWidget, &QWidget::customContextMenuRequested, this, &IdContextMenu::showContextMenu);
 
     mEditIdAction = new QAction(this);
-    connect(mEditIdAction, &QAction::triggered,
-            this, qOverload<>(&IdContextMenu::editIdRequest));
+    connect(mEditIdAction, &QAction::triggered, this, qOverload<>(&IdContextMenu::editIdRequest));
 
-    QLineEdit *lineEdit = qobject_cast<QLineEdit *>(mWidget);
+    QLineEdit* lineEdit = qobject_cast<QLineEdit*>(mWidget);
     if (lineEdit != nullptr)
     {
         mContextMenu = lineEdit->createStandardContextMenu();
@@ -349,15 +354,15 @@ CSVWorld::IdContextMenu::IdContextMenu(QWidget *widget, CSMWorld::ColumnBase::Di
     }
 }
 
-void CSVWorld::IdContextMenu::excludeId(const std::string &id)
+void CSVWorld::IdContextMenu::excludeId(const std::string& id)
 {
     mExcludedIds.insert(id);
 }
 
 QString CSVWorld::IdContextMenu::getWidgetValue() const
 {
-    QLineEdit *lineEdit = qobject_cast<QLineEdit *>(mWidget);
-    QLabel *label = qobject_cast<QLabel *>(mWidget);
+    QLineEdit* lineEdit = qobject_cast<QLineEdit*>(mWidget);
+    QLabel* label = qobject_cast<QLabel*>(mWidget);
 
     QString value = "";
     if (lineEdit != nullptr)
@@ -371,7 +376,7 @@ QString CSVWorld::IdContextMenu::getWidgetValue() const
     return value;
 }
 
-void CSVWorld::IdContextMenu::addEditIdActionToMenu(const QString &text)
+void CSVWorld::IdContextMenu::addEditIdActionToMenu(const QString& text)
 {
     mEditIdAction->setText(text);
     if (mContextMenu->actions().isEmpty())
@@ -380,7 +385,7 @@ void CSVWorld::IdContextMenu::addEditIdActionToMenu(const QString &text)
     }
     else if (mContextMenu->actions().first() != mEditIdAction)
     {
-        QAction *action = mContextMenu->actions().first();
+        QAction* action = mContextMenu->actions().first();
         mContextMenu->insertAction(action, mEditIdAction);
         mContextMenu->insertSeparator(action);
     }
@@ -403,7 +408,7 @@ void CSVWorld::IdContextMenu::removeEditIdActionFromMenu()
     }
 }
 
-void CSVWorld::IdContextMenu::showContextMenu(const QPoint &pos)
+void CSVWorld::IdContextMenu::showContextMenu(const QPoint& pos)
 {
     QString value = getWidgetValue();
     bool isExcludedId = mExcludedIds.find(value.toUtf8().constData()) != mExcludedIds.end();
@@ -432,23 +437,22 @@ void CSVWorld::IdContextMenu::editIdRequest()
 =============================================================EditWidget=====================================================
 */
 
-void CSVWorld::EditWidget::createEditorContextMenu(QWidget *editor,
-                                                   CSMWorld::ColumnBase::Display display,
-                                                   int currentRow) const
+void CSVWorld::EditWidget::createEditorContextMenu(
+    QWidget* editor, CSMWorld::ColumnBase::Display display, int currentRow) const
 {
     Q_ASSERT(editor != nullptr);
 
-    if (CSMWorld::ColumnBase::isId(display) &&
-        CSMWorld::TableMimeData::convertEnums(display) != CSMWorld::UniversalId::Type_None)
+    if (CSMWorld::ColumnBase::isId(display)
+        && CSMWorld::TableMimeData::convertEnums(display) != CSMWorld::UniversalId::Type_None)
     {
         int idColumn = mTable->findColumnIndex(CSMWorld::Columns::ColumnId_Id);
         QString id = mTable->data(mTable->index(currentRow, idColumn)).toString();
 
-        IdContextMenu *menu = new IdContextMenu(editor, display);
+        IdContextMenu* menu = new IdContextMenu(editor, display);
         // Current ID is already opened, so no need to create Edit 'ID' action for it
         menu->excludeId(id.toUtf8().constData());
-        connect(menu, qOverload<const CSMWorld::UniversalId &,const std::string &>(&IdContextMenu::editIdRequest),
-                this, &EditWidget::editIdRequest);
+        connect(menu, qOverload<const CSMWorld::UniversalId&, const std::string&>(&IdContextMenu::editIdRequest), this,
+            &EditWidget::editIdRequest);
     }
 }
 
@@ -464,30 +468,29 @@ CSVWorld::EditWidget::~EditWidget()
         delete mNestedTableDispatcher;
 }
 
-CSVWorld::EditWidget::EditWidget(QWidget *parent,
-        int row, CSMWorld::IdTable* table, CSMWorld::CommandDispatcher& commandDispatcher,
-        CSMDoc::Document& document, bool createAndDelete) :
-QScrollArea(parent),
-mWidgetMapper(nullptr),
-mNestedTableMapper(nullptr),
-mDispatcher(nullptr),
-mNestedTableDispatcher(nullptr),
-mMainWidget(nullptr),
-mTable(table),
-mCommandDispatcher (commandDispatcher),
-mDocument (document)
+CSVWorld::EditWidget::EditWidget(QWidget* parent, int row, CSMWorld::IdTable* table,
+    CSMWorld::CommandDispatcher& commandDispatcher, CSMDoc::Document& document, bool createAndDelete)
+    : QScrollArea(parent)
+    , mWidgetMapper(nullptr)
+    , mNestedTableMapper(nullptr)
+    , mDispatcher(nullptr)
+    , mNestedTableDispatcher(nullptr)
+    , mMainWidget(nullptr)
+    , mTable(table)
+    , mCommandDispatcher(commandDispatcher)
+    , mDocument(document)
 {
-    remake (row);
+    remake(row);
 }
 
 void CSVWorld::EditWidget::remake(int row)
 {
     if (mMainWidget)
     {
-        QWidget *del = this->takeWidget();
+        QWidget* del = this->takeWidget();
         del->deleteLater();
     }
-    mMainWidget = new QWidget (this);
+    mMainWidget = new QWidget(this);
 
     for (unsigned i = 0; i < mNestedModels.size(); ++i)
         delete mNestedModels[i];
@@ -496,23 +499,22 @@ void CSVWorld::EditWidget::remake(int row)
 
     if (mDispatcher)
         delete mDispatcher;
-    mDispatcher = new DialogueDelegateDispatcher(nullptr/*this*/, mTable, mCommandDispatcher, mDocument);
+    mDispatcher = new DialogueDelegateDispatcher(nullptr /*this*/, mTable, mCommandDispatcher, mDocument);
 
     if (mNestedTableDispatcher)
         delete mNestedTableDispatcher;
 
-    //not sure if widget mapper can handle deleting the widgets that were mapped
+    // not sure if widget mapper can handle deleting the widgets that were mapped
     if (mWidgetMapper)
         delete mWidgetMapper;
 
-    mWidgetMapper = new QDataWidgetMapper (this);
+    mWidgetMapper = new QDataWidgetMapper(this);
     mWidgetMapper->setModel(mTable);
     mWidgetMapper->setItemDelegate(mDispatcher);
 
     if (mNestedTableMapper)
         delete mNestedTableMapper;
 
-
     QFrame* line = new QFrame(mMainWidget);
     line->setObjectName(QString::fromUtf8("line"));
     line->setGeometry(QRect(320, 150, 118, 3));
@@ -525,10 +527,10 @@ void CSVWorld::EditWidget::remake(int row)
     line2->setFrameShape(QFrame::HLine);
     line2->setFrameShadow(QFrame::Sunken);
 
-    QVBoxLayout *mainLayout = new QVBoxLayout(mMainWidget);
-    QGridLayout *lockedLayout = new QGridLayout();
-    QGridLayout *unlockedLayout = new QGridLayout();
-    QVBoxLayout *tablesLayout = new QVBoxLayout();
+    QVBoxLayout* mainLayout = new QVBoxLayout(mMainWidget);
+    QGridLayout* lockedLayout = new QGridLayout();
+    QGridLayout* unlockedLayout = new QGridLayout();
+    QVBoxLayout* tablesLayout = new QVBoxLayout();
 
     mainLayout->addLayout(lockedLayout, QSizePolicy::Fixed);
     mainLayout->addWidget(line, 1);
@@ -544,46 +546,47 @@ void CSVWorld::EditWidget::remake(int row)
     int locked = 0;
     const int columns = mTable->columnCount();
 
-    for (int i=0; i<columns; ++i)
+    for (int i = 0; i < columns; ++i)
     {
-        int flags = mTable->headerData (i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Flags).toInt();
+        int flags = mTable->headerData(i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Flags).toInt();
 
         if (flags & CSMWorld::ColumnBase::Flag_Dialogue)
         {
-            CSMWorld::ColumnBase::Display display = static_cast<CSMWorld::ColumnBase::Display>
-                (mTable->headerData (i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Display).toInt());
+            CSMWorld::ColumnBase::Display display = static_cast<CSMWorld::ColumnBase::Display>(
+                mTable->headerData(i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Display).toInt());
 
-            if (mTable->hasChildren(mTable->index(row, i)) &&
-                    !(flags & CSMWorld::ColumnBase::Flag_Dialogue_List))
+            if (mTable->hasChildren(mTable->index(row, i)) && !(flags & CSMWorld::ColumnBase::Flag_Dialogue_List))
             {
                 CSMWorld::IdTree* innerTable = &dynamic_cast<CSMWorld::IdTree&>(*mTable);
-                mNestedModels.push_back(new CSMWorld::NestedTableProxyModel (mTable->index(row, i), display, innerTable));
+                mNestedModels.push_back(
+                    new CSMWorld::NestedTableProxyModel(mTable->index(row, i), display, innerTable));
 
-                int idColumn = mTable->findColumnIndex (CSMWorld::Columns::ColumnId_Id);
-                int typeColumn = mTable->findColumnIndex (CSMWorld::Columns::ColumnId_RecordType);
+                int idColumn = mTable->findColumnIndex(CSMWorld::Columns::ColumnId_Id);
+                int typeColumn = mTable->findColumnIndex(CSMWorld::Columns::ColumnId_RecordType);
 
                 CSMWorld::UniversalId id = CSMWorld::UniversalId(
-                    static_cast<CSMWorld::UniversalId::Type> (mTable->data (mTable->index (row, typeColumn)).toInt()),
-                    mTable->data (mTable->index (row, idColumn)).toString().toUtf8().constData());
+                    static_cast<CSMWorld::UniversalId::Type>(mTable->data(mTable->index(row, typeColumn)).toInt()),
+                    mTable->data(mTable->index(row, idColumn)).toString().toUtf8().constData());
 
                 bool editable = true;
                 bool fixedRows = false;
                 QVariant v = mTable->index(row, i).data();
                 if (v.canConvert<CSMWorld::ColumnBase::TableEditModes>())
                 {
-                    assert (QString(v.typeName()) == "CSMWorld::ColumnBase::TableEditModes");
+                    assert(QString(v.typeName()) == "CSMWorld::ColumnBase::TableEditModes");
 
                     if (v.value<CSMWorld::ColumnBase::TableEditModes>() == CSMWorld::ColumnBase::TableEdit_None)
                         editable = false;
-                    else if (v.value<CSMWorld::ColumnBase::TableEditModes>() == CSMWorld::ColumnBase::TableEdit_FixedRows)
+                    else if (v.value<CSMWorld::ColumnBase::TableEditModes>()
+                        == CSMWorld::ColumnBase::TableEdit_FixedRows)
                         fixedRows = true;
                 }
 
                 // Create and display nested table only if it's editable.
                 if (editable)
                 {
-                    NestedTable* table =
-                        new NestedTable(mDocument, id, mNestedModels.back(), this, editable, fixedRows);
+                    NestedTable* table
+                        = new NestedTable(mDocument, id, mNestedModels.back(), this, editable, fixedRows);
                     table->resizeColumnsToContents();
                     if (isBlocked)
                         table->setEditTriggers(QAbstractItemView::NoEditTriggers);
@@ -594,47 +597,46 @@ void CSVWorld::EditWidget::remake(int row)
                     int tableMaxHeight = (5 * rowHeight) + headerHeight + (2 * table->frameWidth());
                     table->setMinimumHeight(tableMaxHeight);
 
-                    QString headerText = mTable->headerData (i, Qt::Horizontal, Qt::DisplayRole).toString();
-                    QLabel* label = new QLabel (headerText, mMainWidget);
-                    label->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed);
+                    QString headerText = mTable->headerData(i, Qt::Horizontal, Qt::DisplayRole).toString();
+                    QLabel* label = new QLabel(headerText, mMainWidget);
+                    label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 
                     tablesLayout->addWidget(label);
                     tablesLayout->addWidget(table);
 
-                    connect(table, &NestedTable::editRequest,
-                            this, &EditWidget::editIdRequest);
+                    connect(table, &NestedTable::editRequest, this, &EditWidget::editIdRequest);
                 }
             }
             else if (!(flags & CSMWorld::ColumnBase::Flag_Dialogue_List))
             {
-                mDispatcher->makeDelegate (display);
-                QWidget* editor = mDispatcher->makeEditor (display, (mTable->index (row, i)));
+                mDispatcher->makeDelegate(display);
+                QWidget* editor = mDispatcher->makeEditor(display, (mTable->index(row, i)));
 
                 if (editor)
                 {
-                    mWidgetMapper->addMapping (editor, i);
+                    mWidgetMapper->addMapping(editor, i);
 
-                    QLabel* label = new QLabel (mTable->headerData (i, Qt::Horizontal).toString(), mMainWidget);
+                    QLabel* label = new QLabel(mTable->headerData(i, Qt::Horizontal).toString(), mMainWidget);
 
-                    label->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed);
-                    editor->setSizePolicy (QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+                    label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+                    editor->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
 
                     // HACK: the blocked checkbox needs to keep the same position
                     // FIXME: unfortunately blocked record displays a little differently to unblocked one
-                    if (!(mTable->flags (mTable->index (row, i)) & Qt::ItemIsEditable) || i == blockedColumn)
+                    if (!(mTable->flags(mTable->index(row, i)) & Qt::ItemIsEditable) || i == blockedColumn)
                     {
-                        lockedLayout->addWidget (label, locked, 0);
-                        lockedLayout->addWidget (editor, locked, 1);
+                        lockedLayout->addWidget(label, locked, 0);
+                        lockedLayout->addWidget(editor, locked, 1);
                         ++locked;
                     }
                     else
                     {
-                        unlockedLayout->addWidget (label, unlocked, 0);
-                        unlockedLayout->addWidget (editor, unlocked, 1);
+                        unlockedLayout->addWidget(label, unlocked, 0);
+                        unlockedLayout->addWidget(editor, unlocked, 1);
                         ++unlocked;
                     }
 
-                    if(mTable->index(row, i).data().type() == QVariant::UserType)
+                    if (mTable->index(row, i).data().type() == QVariant::UserType)
                     {
                         editor->setEnabled(false);
                         label->setEnabled(false);
@@ -645,46 +647,46 @@ void CSVWorld::EditWidget::remake(int row)
             }
             else // Flag_Dialogue_List
             {
-                CSMWorld::IdTree *tree = static_cast<CSMWorld::IdTree *>(mTable);
-                mNestedTableMapper = new QDataWidgetMapper (this);
+                CSMWorld::IdTree* tree = static_cast<CSMWorld::IdTree*>(mTable);
+                mNestedTableMapper = new QDataWidgetMapper(this);
 
                 mNestedTableMapper->setModel(tree);
                 // FIXME: lack MIME support?
-                mNestedTableDispatcher =
-                        new DialogueDelegateDispatcher (nullptr/*this*/, mTable, mCommandDispatcher, mDocument, tree);
-                mNestedTableMapper->setRootIndex (tree->index(row, i));
+                mNestedTableDispatcher
+                    = new DialogueDelegateDispatcher(nullptr /*this*/, mTable, mCommandDispatcher, mDocument, tree);
+                mNestedTableMapper->setRootIndex(tree->index(row, i));
                 mNestedTableMapper->setItemDelegate(mNestedTableDispatcher);
 
                 int columnCount = tree->columnCount(tree->index(row, i));
                 for (int col = 0; col < columnCount; ++col)
                 {
-                    int displayRole = tree->nestedHeaderData (i, col,
-                            Qt::Horizontal, CSMWorld::ColumnBase::Role_Display).toInt();
+                    int displayRole
+                        = tree->nestedHeaderData(i, col, Qt::Horizontal, CSMWorld::ColumnBase::Role_Display).toInt();
 
-                    display = static_cast<CSMWorld::ColumnBase::Display> (displayRole);
+                    display = static_cast<CSMWorld::ColumnBase::Display>(displayRole);
 
-                   mNestedTableDispatcher->makeDelegate (display);
+                    mNestedTableDispatcher->makeDelegate(display);
 
                     // FIXME: assumed all columns are editable
-                    QWidget* editor =
-                        mNestedTableDispatcher->makeEditor (display, tree->index (0, col, tree->index(row, i)));
+                    QWidget* editor
+                        = mNestedTableDispatcher->makeEditor(display, tree->index(0, col, tree->index(row, i)));
                     if (editor)
                     {
-                        mNestedTableMapper->addMapping (editor, col);
+                        mNestedTableMapper->addMapping(editor, col);
 
                         // Need to use Qt::DisplayRole in order to get the  correct string
                         // from CSMWorld::Columns
-                        QLabel* label = new QLabel (tree->nestedHeaderData (i, col,
-                                    Qt::Horizontal, Qt::DisplayRole).toString(), mMainWidget);
+                        QLabel* label = new QLabel(
+                            tree->nestedHeaderData(i, col, Qt::Horizontal, Qt::DisplayRole).toString(), mMainWidget);
 
-                        label->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed);
-                        editor->setSizePolicy (QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+                        label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+                        editor->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
 
-                        unlockedLayout->addWidget (label, unlocked, 0);
-                        unlockedLayout->addWidget (editor, unlocked, 1);
+                        unlockedLayout->addWidget(label, unlocked, 0);
+                        unlockedLayout->addWidget(editor, unlocked, 1);
                         ++unlocked;
 
-                        if(tree->index(0, col, tree->index(row, i)).data().type() == QVariant::UserType)
+                        if (tree->index(0, col, tree->index(row, i)).data().type() == QVariant::UserType)
                         {
                             editor->setEnabled(false);
                             label->setEnabled(false);
@@ -710,7 +712,6 @@ void CSVWorld::EditWidget::remake(int row)
     this->setWidgetResizable(true);
 }
 
-
 QVBoxLayout& CSVWorld::SimpleDialogueSubView::getMainLayout()
 {
     return *mMainLayout;
@@ -736,96 +737,96 @@ bool CSVWorld::SimpleDialogueSubView::isLocked() const
     return mLocked;
 }
 
-CSVWorld::SimpleDialogueSubView::SimpleDialogueSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document) :
-    SubView (id),
-    mEditWidget(nullptr),
-    mMainLayout(nullptr),
-    mTable(dynamic_cast<CSMWorld::IdTable*>(document.getData().getTableModel(id))),
-    mLocked(false),
-    mDocument(document),
-    mCommandDispatcher (document, CSMWorld::UniversalId::getParentType (id.getType()))
+CSVWorld::SimpleDialogueSubView::SimpleDialogueSubView(const CSMWorld::UniversalId& id, CSMDoc::Document& document)
+    : SubView(id)
+    , mEditWidget(nullptr)
+    , mMainLayout(nullptr)
+    , mTable(dynamic_cast<CSMWorld::IdTable*>(document.getData().getTableModel(id)))
+    , mLocked(false)
+    , mDocument(document)
+    , mCommandDispatcher(document, CSMWorld::UniversalId::getParentType(id.getType()))
 {
     connect(mTable, &CSMWorld::IdTable::dataChanged, this, &SimpleDialogueSubView::dataChanged);
     connect(mTable, &CSMWorld::IdTable::rowsAboutToBeRemoved, this, &SimpleDialogueSubView::rowsAboutToBeRemoved);
 
     updateCurrentId();
 
-    QWidget *mainWidget = new QWidget(this);
+    QWidget* mainWidget = new QWidget(this);
 
     mMainLayout = new QVBoxLayout(mainWidget);
-    setWidget (mainWidget);
+    setWidget(mainWidget);
 
-    int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
+    int idColumn = getTable().findColumnIndex(CSMWorld::Columns::ColumnId_Id);
 
-    mEditWidget = new EditWidget(mainWidget,
-            mTable->getModelIndex(getUniversalId().getId(), idColumn).row(), mTable, mCommandDispatcher, document, false);
+    mEditWidget = new EditWidget(mainWidget, mTable->getModelIndex(getUniversalId().getId(), idColumn).row(), mTable,
+        mCommandDispatcher, document, false);
 
     mMainLayout->addWidget(mEditWidget);
     mEditWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
 
-    dataChanged(mTable->getModelIndex (getUniversalId().getId(), idColumn));
+    dataChanged(mTable->getModelIndex(getUniversalId().getId(), idColumn));
 
-    connect(mEditWidget, &EditWidget::editIdRequest,
-            this, &SimpleDialogueSubView::focusId);
+    connect(mEditWidget, &EditWidget::editIdRequest, this, &SimpleDialogueSubView::focusId);
 }
 
-void CSVWorld::SimpleDialogueSubView::setEditLock (bool locked)
+void CSVWorld::SimpleDialogueSubView::setEditLock(bool locked)
 {
     if (!mEditWidget) // hack to indicate that getUniversalId().getId() is no longer valid
         return;
 
-    int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
+    int idColumn = getTable().findColumnIndex(CSMWorld::Columns::ColumnId_Id);
     mLocked = locked;
     QModelIndex currentIndex(mTable->getModelIndex(getUniversalId().getId(), idColumn));
 
     if (currentIndex.isValid())
     {
-        CSMWorld::RecordBase::State state = static_cast<CSMWorld::RecordBase::State>(mTable->data (mTable->index (currentIndex.row(), 1)).toInt());
+        CSMWorld::RecordBase::State state
+            = static_cast<CSMWorld::RecordBase::State>(mTable->data(mTable->index(currentIndex.row(), 1)).toInt());
 
-        mEditWidget->setDisabled (state==CSMWorld::RecordBase::State_Deleted || locked);
+        mEditWidget->setDisabled(state == CSMWorld::RecordBase::State_Deleted || locked);
 
-        mCommandDispatcher.setEditLock (locked);
+        mCommandDispatcher.setEditLock(locked);
     }
-
 }
 
-void CSVWorld::SimpleDialogueSubView::dataChanged (const QModelIndex & index)
+void CSVWorld::SimpleDialogueSubView::dataChanged(const QModelIndex& index)
 {
-    int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
+    int idColumn = getTable().findColumnIndex(CSMWorld::Columns::ColumnId_Id);
     QModelIndex currentIndex(mTable->getModelIndex(getUniversalId().getId(), idColumn));
 
-    if (currentIndex.isValid() &&
-            (index.parent().isValid() ? index.parent().row() : index.row()) == currentIndex.row())
+    if (currentIndex.isValid() && (index.parent().isValid() ? index.parent().row() : index.row()) == currentIndex.row())
     {
-        CSMWorld::RecordBase::State state = static_cast<CSMWorld::RecordBase::State>(mTable->data (mTable->index (currentIndex.row(), 1)).toInt());
+        CSMWorld::RecordBase::State state
+            = static_cast<CSMWorld::RecordBase::State>(mTable->data(mTable->index(currentIndex.row(), 1)).toInt());
 
-        mEditWidget->setDisabled (state==CSMWorld::RecordBase::State_Deleted || mLocked);
+        mEditWidget->setDisabled(state == CSMWorld::RecordBase::State_Deleted || mLocked);
 
         // Check if the changed data should force refresh (rebuild) the dialogue subview
         int flags = 0;
         if (index.parent().isValid()) // TODO: check that index is topLeft
         {
-            flags = static_cast<CSMWorld::IdTree *>(mTable)->nestedHeaderData (index.parent().column(),
-                    index.column(), Qt::Horizontal, CSMWorld::ColumnBase::Role_Flags).toInt();
+            flags = static_cast<CSMWorld::IdTree*>(mTable)
+                        ->nestedHeaderData(
+                            index.parent().column(), index.column(), Qt::Horizontal, CSMWorld::ColumnBase::Role_Flags)
+                        .toInt();
         }
         else
         {
-            flags = mTable->headerData (index.column(),
-                    Qt::Horizontal, CSMWorld::ColumnBase::Role_Flags).toInt();
+            flags = mTable->headerData(index.column(), Qt::Horizontal, CSMWorld::ColumnBase::Role_Flags).toInt();
         }
 
         if (flags & CSMWorld::ColumnBase::Flag_Dialogue_Refresh)
         {
             int y = mEditWidget->verticalScrollBar()->value();
-            mEditWidget->remake (index.parent().isValid() ? index.parent().row() : index.row());
+            mEditWidget->remake(index.parent().isValid() ? index.parent().row() : index.row());
             mEditWidget->verticalScrollBar()->setValue(y);
         }
     }
 }
 
-void CSVWorld::SimpleDialogueSubView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
+void CSVWorld::SimpleDialogueSubView::rowsAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
-    int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
+    int idColumn = getTable().findColumnIndex(CSMWorld::Columns::ColumnId_Id);
     QModelIndex currentIndex(mTable->getModelIndex(getUniversalId().getId(), idColumn));
 
     if (!currentIndex.isValid())
@@ -835,7 +836,7 @@ void CSVWorld::SimpleDialogueSubView::rowsAboutToBeRemoved(const QModelIndex &pa
 
     if (currentIndex.parent() == parent && currentIndex.row() >= start && currentIndex.row() <= end)
     {
-        if(mEditWidget)
+        if (mEditWidget)
         {
             delete mEditWidget;
             mEditWidget = nullptr;
@@ -847,58 +848,55 @@ void CSVWorld::SimpleDialogueSubView::rowsAboutToBeRemoved(const QModelIndex &pa
 void CSVWorld::SimpleDialogueSubView::updateCurrentId()
 {
     std::vector<std::string> selection;
-    selection.push_back (getUniversalId().getId());
+    selection.push_back(getUniversalId().getId());
     mCommandDispatcher.setSelection(selection);
 }
 
-
 void CSVWorld::DialogueSubView::addButtonBar()
 {
     if (mButtons)
         return;
 
-    mButtons = new RecordButtonBar (getUniversalId(), getTable(), mBottom,
-        &getCommandDispatcher(), this);
+    mButtons = new RecordButtonBar(getUniversalId(), getTable(), mBottom, &getCommandDispatcher(), this);
 
-    getMainLayout().insertWidget (1, mButtons);
+    getMainLayout().insertWidget(1, mButtons);
 
     // connections
-    connect (mButtons, &RecordButtonBar::showPreview, this, &DialogueSubView::showPreview);
-    connect (mButtons, &RecordButtonBar::viewRecord, this, &DialogueSubView::viewRecord);
-    connect (mButtons, &RecordButtonBar::switchToRow, this, &DialogueSubView::switchToRow);
+    connect(mButtons, &RecordButtonBar::showPreview, this, &DialogueSubView::showPreview);
+    connect(mButtons, &RecordButtonBar::viewRecord, this, &DialogueSubView::viewRecord);
+    connect(mButtons, &RecordButtonBar::switchToRow, this, &DialogueSubView::switchToRow);
 
-    connect (this, &DialogueSubView::universalIdChanged,
-        mButtons, &RecordButtonBar::universalIdChanged);
+    connect(this, &DialogueSubView::universalIdChanged, mButtons, &RecordButtonBar::universalIdChanged);
 }
 
-CSVWorld::DialogueSubView::DialogueSubView (const CSMWorld::UniversalId& id,
-    CSMDoc::Document& document, const CreatorFactoryBase& creatorFactory, bool sorting)
-: SimpleDialogueSubView (id, document), mButtons (nullptr)
+CSVWorld::DialogueSubView::DialogueSubView(
+    const CSMWorld::UniversalId& id, CSMDoc::Document& document, const CreatorFactoryBase& creatorFactory, bool sorting)
+    : SimpleDialogueSubView(id, document)
+    , mButtons(nullptr)
 {
     // bottom box
-    mBottom = new TableBottomBox (creatorFactory, document, id, this);
+    mBottom = new TableBottomBox(creatorFactory, document, id, this);
 
-    connect (mBottom, &TableBottomBox::requestFocus, this, &DialogueSubView::requestFocus);
+    connect(mBottom, &TableBottomBox::requestFocus, this, &DialogueSubView::requestFocus);
 
     // layout
-    getMainLayout().addWidget (mBottom);
+    getMainLayout().addWidget(mBottom);
 
-    connect (&CSMPrefs::State::get(), &CSMPrefs::State::settingChanged,
-        this, &DialogueSubView::settingChanged);
+    connect(&CSMPrefs::State::get(), &CSMPrefs::State::settingChanged, this, &DialogueSubView::settingChanged);
     CSMPrefs::get()["ID Dialogues"].update();
 }
 
-void CSVWorld::DialogueSubView::setEditLock (bool locked)
+void CSVWorld::DialogueSubView::setEditLock(bool locked)
 {
-    SimpleDialogueSubView::setEditLock (locked);
+    SimpleDialogueSubView::setEditLock(locked);
 
     if (mButtons)
-        mButtons->setEditLock (locked);
+        mButtons->setEditLock(locked);
 }
 
-void CSVWorld::DialogueSubView::settingChanged (const CSMPrefs::Setting *setting)
+void CSVWorld::DialogueSubView::settingChanged(const CSMPrefs::Setting* setting)
 {
-    if (*setting=="ID Dialogues/toolbar")
+    if (*setting == "ID Dialogues/toolbar")
     {
         if (setting->isTrue())
         {
@@ -906,67 +904,65 @@ void CSVWorld::DialogueSubView::settingChanged (const CSMPrefs::Setting *setting
         }
         else if (mButtons)
         {
-            getMainLayout().removeWidget (mButtons);
+            getMainLayout().removeWidget(mButtons);
             delete mButtons;
             mButtons = nullptr;
         }
     }
 }
 
-void CSVWorld::DialogueSubView::showPreview ()
+void CSVWorld::DialogueSubView::showPreview()
 {
-    int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
-    QModelIndex currentIndex (getTable().getModelIndex (getUniversalId().getId(), idColumn));
+    int idColumn = getTable().findColumnIndex(CSMWorld::Columns::ColumnId_Id);
+    QModelIndex currentIndex(getTable().getModelIndex(getUniversalId().getId(), idColumn));
 
-    if (currentIndex.isValid() &&
-        getTable().getFeatures() & CSMWorld::IdTable::Feature_Preview &&
-        currentIndex.row() < getTable().rowCount())
+    if (currentIndex.isValid() && getTable().getFeatures() & CSMWorld::IdTable::Feature_Preview
+        && currentIndex.row() < getTable().rowCount())
     {
         emit focusId(CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Preview, getUniversalId().getId()), "");
     }
 }
 
-void CSVWorld::DialogueSubView::viewRecord ()
+void CSVWorld::DialogueSubView::viewRecord()
 {
-    int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
-    QModelIndex currentIndex (getTable().getModelIndex (getUniversalId().getId(), idColumn));
+    int idColumn = getTable().findColumnIndex(CSMWorld::Columns::ColumnId_Id);
+    QModelIndex currentIndex(getTable().getModelIndex(getUniversalId().getId(), idColumn));
 
-    if (currentIndex.isValid() &&
-        currentIndex.row() < getTable().rowCount())
+    if (currentIndex.isValid() && currentIndex.row() < getTable().rowCount())
     {
-        std::pair<CSMWorld::UniversalId, std::string> params = getTable().view (currentIndex.row());
+        std::pair<CSMWorld::UniversalId, std::string> params = getTable().view(currentIndex.row());
 
-        if (params.first.getType()!=CSMWorld::UniversalId::Type_None)
-            emit focusId (params.first, params.second);
+        if (params.first.getType() != CSMWorld::UniversalId::Type_None)
+            emit focusId(params.first, params.second);
     }
 }
 
-void CSVWorld::DialogueSubView::switchToRow (int row)
+void CSVWorld::DialogueSubView::switchToRow(int row)
 {
-    int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
-    std::string id = getTable().data (getTable().index (row, idColumn)).toString().toUtf8().constData();
+    int idColumn = getTable().findColumnIndex(CSMWorld::Columns::ColumnId_Id);
+    std::string id = getTable().data(getTable().index(row, idColumn)).toString().toUtf8().constData();
 
-    int typeColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_RecordType);
-    CSMWorld::UniversalId::Type type = static_cast<CSMWorld::UniversalId::Type> (
-        getTable().data (getTable().index (row, typeColumn)).toInt());
+    int typeColumn = getTable().findColumnIndex(CSMWorld::Columns::ColumnId_RecordType);
+    CSMWorld::UniversalId::Type type
+        = static_cast<CSMWorld::UniversalId::Type>(getTable().data(getTable().index(row, typeColumn)).toInt());
 
-    setUniversalId (CSMWorld::UniversalId (type, id));
+    setUniversalId(CSMWorld::UniversalId(type, id));
     updateCurrentId();
 
-    getEditWidget().remake (row);
+    getEditWidget().remake(row);
 
-    int stateColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Modification);
-    CSMWorld::RecordBase::State state = static_cast<CSMWorld::RecordBase::State> (
-        getTable().data (getTable().index (row, stateColumn)).toInt());
+    int stateColumn = getTable().findColumnIndex(CSMWorld::Columns::ColumnId_Modification);
+    CSMWorld::RecordBase::State state
+        = static_cast<CSMWorld::RecordBase::State>(getTable().data(getTable().index(row, stateColumn)).toInt());
 
-    getEditWidget().setDisabled (isLocked() || state==CSMWorld::RecordBase::State_Deleted);
+    getEditWidget().setDisabled(isLocked() || state == CSMWorld::RecordBase::State_Deleted);
 }
 
-void CSVWorld::DialogueSubView::requestFocus (const std::string& id)
+void CSVWorld::DialogueSubView::requestFocus(const std::string& id)
 {
-    int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
-    QModelIndex index = getTable().getModelIndex (id, idColumn);
+    int idColumn = getTable().findColumnIndex(CSMWorld::Columns::ColumnId_Id);
+    QModelIndex index = getTable().getModelIndex(id, idColumn);
 
     if (index.isValid())
-        switchToRow (index.row());
+        switchToRow(index.row());
 }
diff --git a/apps/opencs/view/world/dialoguesubview.hpp b/apps/opencs/view/world/dialoguesubview.hpp
index 2cf05f711e..598f701f91 100644
--- a/apps/opencs/view/world/dialoguesubview.hpp
+++ b/apps/opencs/view/world/dialoguesubview.hpp
@@ -1,9 +1,9 @@
 #ifndef CSV_WORLD_DIALOGUESUBVIEW_H
 #define CSV_WORLD_DIALOGUESUBVIEW_H
 
-#include <set>
 #include <map>
 #include <memory>
+#include <set>
 
 #include <QAbstractItemDelegate>
 #include <QScrollArea>
@@ -48,29 +48,25 @@ namespace CSVWorld
     class NotEditableSubDelegate : public QAbstractItemDelegate
     {
         const CSMWorld::IdTable* mTable;
+
     public:
-        NotEditableSubDelegate(const CSMWorld::IdTable* table,
-                               QObject * parent = nullptr);
+        NotEditableSubDelegate(const CSMWorld::IdTable* table, QObject* parent = nullptr);
 
-        void setEditorData (QWidget* editor, const QModelIndex& index) const override;
+        void setEditorData(QWidget* editor, const QModelIndex& index) const override;
 
-        void setModelData (QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const override;
+        void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const override;
 
-        void paint (QPainter* painter,
-                            const QStyleOptionViewItem& option,
-                            const QModelIndex& index) const override;
+        void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
         ///< does nothing
 
-        QSize sizeHint (const QStyleOptionViewItem& option,
-                                const QModelIndex& index) const override;
+        QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override;
         ///< does nothing
 
-        QWidget *createEditor (QWidget *parent,
-                                const QStyleOptionViewItem& option,
-                                const QModelIndex& index) const override;
+        QWidget* createEditor(
+            QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
     };
 
-    //this can't be nested into the DialogueDelegateDispatcher, because it needs to emit signals
+    // this can't be nested into the DialogueDelegateDispatcher, because it needs to emit signals
     class DialogueDelegateDispatcherProxy : public QObject
     {
         Q_OBJECT
@@ -89,8 +85,7 @@ namespace CSVWorld
         std::unique_ptr<refWrapper> mIndexWrapper;
 
     public:
-        DialogueDelegateDispatcherProxy(QWidget* editor,
-                                        CSMWorld::ColumnBase::Display display);
+        DialogueDelegateDispatcherProxy(QWidget* editor, CSMWorld::ColumnBase::Display display);
         QWidget* getEditor() const;
 
     public slots:
@@ -98,10 +93,7 @@ namespace CSVWorld
         void setIndex(const QModelIndex& index);
 
     signals:
-        void editorDataCommited(QWidget* editor,
-                                const QModelIndex& index,
-                                CSMWorld::ColumnBase::Display display);
-
+        void editorDataCommited(QWidget* editor, const QModelIndex& index, CSMWorld::ColumnBase::Display display);
     };
 
     class DialogueDelegateDispatcher : public QAbstractItemDelegate
@@ -119,14 +111,12 @@ namespace CSVWorld
         NotEditableSubDelegate mNotEditableDelegate;
 
         std::vector<DialogueDelegateDispatcherProxy*> mProxys;
-        //once we move to the C++11 we should use unique_ptr
+        // once we move to the C++11 we should use unique_ptr
 
     public:
-        DialogueDelegateDispatcher(QObject* parent,
-                                   CSMWorld::IdTable* table,
-                                   CSMWorld::CommandDispatcher& commandDispatcher,
-                                   CSMDoc::Document& document,
-                                   QAbstractItemModel* model = nullptr);
+        DialogueDelegateDispatcher(QObject* parent, CSMWorld::IdTable* table,
+            CSMWorld::CommandDispatcher& commandDispatcher, CSMDoc::Document& document,
+            QAbstractItemModel* model = nullptr);
 
         ~DialogueDelegateDispatcher();
 
@@ -134,161 +124,148 @@ namespace CSVWorld
 
         QWidget* makeEditor(CSMWorld::ColumnBase::Display display, const QModelIndex& index);
         ///< will return null if delegate is not present, parent of the widget is
-        //same as for dispatcher itself
+        // same as for dispatcher itself
 
-        void setEditorData (QWidget* editor, const QModelIndex& index) const override;
+        void setEditorData(QWidget* editor, const QModelIndex& index) const override;
 
-        void setModelData (QWidget* editor, QAbstractItemModel* model,
-                                   const QModelIndex& index) const override;
+        void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const override;
 
-        virtual void setModelData (QWidget* editor,
-                                   QAbstractItemModel* model, const QModelIndex& index,
-                                   CSMWorld::ColumnBase::Display display) const;
+        virtual void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index,
+            CSMWorld::ColumnBase::Display display) const;
 
-        void paint (QPainter* painter,
-                            const QStyleOptionViewItem& option,
-                            const QModelIndex& index) const override;
+        void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
         ///< does nothing
 
-        QSize sizeHint (const QStyleOptionViewItem& option,
-                                const QModelIndex& index) const override;
+        QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override;
         ///< does nothing
 
     private slots:
-        void editorDataCommited(QWidget* editor, const QModelIndex& index,
-                                CSMWorld::ColumnBase::Display display);
+        void editorDataCommited(QWidget* editor, const QModelIndex& index, CSMWorld::ColumnBase::Display display);
     };
 
     /// A context menu with "Edit 'ID'" action for editors in the dialogue subview
     class IdContextMenu : public QObject
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            QWidget *mWidget;
-            CSMWorld::UniversalId::Type mIdType;
-            std::set<std::string> mExcludedIds;
-            ///< A list of IDs that should not have the Edit 'ID' action.
+        QWidget* mWidget;
+        CSMWorld::UniversalId::Type mIdType;
+        std::set<std::string> mExcludedIds;
+        ///< A list of IDs that should not have the Edit 'ID' action.
 
-            QMenu *mContextMenu;
-            QAction *mEditIdAction;
+        QMenu* mContextMenu;
+        QAction* mEditIdAction;
 
-            QString getWidgetValue() const;
-            void addEditIdActionToMenu(const QString &text);
-            void removeEditIdActionFromMenu();
+        QString getWidgetValue() const;
+        void addEditIdActionToMenu(const QString& text);
+        void removeEditIdActionFromMenu();
 
-        public:
-            IdContextMenu(QWidget *widget, CSMWorld::ColumnBase::Display display);
+    public:
+        IdContextMenu(QWidget* widget, CSMWorld::ColumnBase::Display display);
 
-            void excludeId(const std::string &id);
+        void excludeId(const std::string& id);
 
-        private slots:
-            void showContextMenu(const QPoint &pos);
-            void editIdRequest();
+    private slots:
+        void showContextMenu(const QPoint& pos);
+        void editIdRequest();
 
-        signals:
-            void editIdRequest(const CSMWorld::UniversalId &id, const std::string &hint);
+    signals:
+        void editIdRequest(const CSMWorld::UniversalId& id, const std::string& hint);
     };
 
     class EditWidget : public QScrollArea
     {
         Q_OBJECT
-            QDataWidgetMapper *mWidgetMapper;
-            QDataWidgetMapper *mNestedTableMapper;
-            DialogueDelegateDispatcher *mDispatcher;
-            DialogueDelegateDispatcher *mNestedTableDispatcher;
-            QWidget* mMainWidget;
-            CSMWorld::IdTable* mTable;
-            CSMWorld::CommandDispatcher& mCommandDispatcher;
-            CSMDoc::Document& mDocument;
-            std::vector<CSMWorld::NestedTableProxyModel*> mNestedModels; //Plain, raw C pointers, deleted in the dtor
-
-            void createEditorContextMenu(QWidget *editor,
-                                         CSMWorld::ColumnBase::Display display,
-                                         int currentRow) const;
-        public:
+        QDataWidgetMapper* mWidgetMapper;
+        QDataWidgetMapper* mNestedTableMapper;
+        DialogueDelegateDispatcher* mDispatcher;
+        DialogueDelegateDispatcher* mNestedTableDispatcher;
+        QWidget* mMainWidget;
+        CSMWorld::IdTable* mTable;
+        CSMWorld::CommandDispatcher& mCommandDispatcher;
+        CSMDoc::Document& mDocument;
+        std::vector<CSMWorld::NestedTableProxyModel*> mNestedModels; // Plain, raw C pointers, deleted in the dtor
+
+        void createEditorContextMenu(QWidget* editor, CSMWorld::ColumnBase::Display display, int currentRow) const;
 
-            EditWidget (QWidget *parent, int row, CSMWorld::IdTable* table,
-                        CSMWorld::CommandDispatcher& commandDispatcher,
-                        CSMDoc::Document& document, bool createAndDelete = false);
+    public:
+        EditWidget(QWidget* parent, int row, CSMWorld::IdTable* table, CSMWorld::CommandDispatcher& commandDispatcher,
+            CSMDoc::Document& document, bool createAndDelete = false);
 
-            virtual ~EditWidget();
+        virtual ~EditWidget();
 
-            void remake(int row);
+        void remake(int row);
 
-        signals:
-            void editIdRequest(const CSMWorld::UniversalId &id, const std::string &hint);
+    signals:
+        void editIdRequest(const CSMWorld::UniversalId& id, const std::string& hint);
     };
 
     class SimpleDialogueSubView : public CSVDoc::SubView
     {
-            Q_OBJECT
-
-            EditWidget* mEditWidget;
-            QVBoxLayout* mMainLayout;
-            CSMWorld::IdTable* mTable;
-            bool mLocked;
-            const CSMDoc::Document& mDocument;
-            CSMWorld::CommandDispatcher mCommandDispatcher;
+        Q_OBJECT
 
-        protected:
+        EditWidget* mEditWidget;
+        QVBoxLayout* mMainLayout;
+        CSMWorld::IdTable* mTable;
+        bool mLocked;
+        const CSMDoc::Document& mDocument;
+        CSMWorld::CommandDispatcher mCommandDispatcher;
 
-            QVBoxLayout& getMainLayout();
+    protected:
+        QVBoxLayout& getMainLayout();
 
-            CSMWorld::IdTable& getTable();
+        CSMWorld::IdTable& getTable();
 
-            CSMWorld::CommandDispatcher& getCommandDispatcher();
+        CSMWorld::CommandDispatcher& getCommandDispatcher();
 
-            EditWidget& getEditWidget();
+        EditWidget& getEditWidget();
 
-            void updateCurrentId();
+        void updateCurrentId();
 
-            bool isLocked() const;
+        bool isLocked() const;
 
-        public:
-
-            SimpleDialogueSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document);
+    public:
+        SimpleDialogueSubView(const CSMWorld::UniversalId& id, CSMDoc::Document& document);
 
-            void setEditLock (bool locked) override;
+        void setEditLock(bool locked) override;
 
-        private slots:
+    private slots:
 
-            void dataChanged(const QModelIndex & index);
-            ///\brief we need to care for deleting currently edited record
+        void dataChanged(const QModelIndex& index);
+        ///\brief we need to care for deleting currently edited record
 
-            void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end);
+        void rowsAboutToBeRemoved(const QModelIndex& parent, int start, int end);
     };
 
     class RecordButtonBar;
 
     class DialogueSubView : public SimpleDialogueSubView
     {
-            Q_OBJECT
-
-            TableBottomBox* mBottom;
-            RecordButtonBar *mButtons;
-
-        private:
+        Q_OBJECT
 
-            void addButtonBar();
+        TableBottomBox* mBottom;
+        RecordButtonBar* mButtons;
 
-        public:
+    private:
+        void addButtonBar();
 
-            DialogueSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document,
-                const CreatorFactoryBase& creatorFactory, bool sorting = false);
+    public:
+        DialogueSubView(const CSMWorld::UniversalId& id, CSMDoc::Document& document,
+            const CreatorFactoryBase& creatorFactory, bool sorting = false);
 
-            void setEditLock (bool locked) override;
+        void setEditLock(bool locked) override;
 
-        private slots:
+    private slots:
 
-            void settingChanged (const CSMPrefs::Setting *setting);
+        void settingChanged(const CSMPrefs::Setting* setting);
 
-            void showPreview();
+        void showPreview();
 
-            void viewRecord();
+        void viewRecord();
 
-            void switchToRow (int row);
+        void switchToRow(int row);
 
-            void requestFocus (const std::string& id);
+        void requestFocus(const std::string& id);
     };
 }
 
diff --git a/apps/opencs/view/world/dragdroputils.cpp b/apps/opencs/view/world/dragdroputils.cpp
index bb4d972737..819f6fadc3 100644
--- a/apps/opencs/view/world/dragdroputils.cpp
+++ b/apps/opencs/view/world/dragdroputils.cpp
@@ -4,31 +4,31 @@
 
 #include "../../model/world/tablemimedata.hpp"
 
-const CSMWorld::TableMimeData *CSVWorld::DragDropUtils::getTableMimeData(const QDropEvent &event)
+const CSMWorld::TableMimeData* CSVWorld::DragDropUtils::getTableMimeData(const QDropEvent& event)
 {
-    return dynamic_cast<const CSMWorld::TableMimeData *>(event.mimeData());
+    return dynamic_cast<const CSMWorld::TableMimeData*>(event.mimeData());
 }
 
-bool CSVWorld::DragDropUtils::canAcceptData(const QDropEvent &event, CSMWorld::ColumnBase::Display type)
+bool CSVWorld::DragDropUtils::canAcceptData(const QDropEvent& event, CSMWorld::ColumnBase::Display type)
 {
-    const CSMWorld::TableMimeData *data = getTableMimeData(event);
+    const CSMWorld::TableMimeData* data = getTableMimeData(event);
     return data != nullptr && data->holdsType(type);
 }
 
-bool CSVWorld::DragDropUtils::isInfo(const QDropEvent &event, CSMWorld::ColumnBase::Display type)
+bool CSVWorld::DragDropUtils::isInfo(const QDropEvent& event, CSMWorld::ColumnBase::Display type)
 {
-    const CSMWorld::TableMimeData *data = getTableMimeData(event);
-    return data != nullptr && (
-        data->holdsType(CSMWorld::UniversalId::Type_TopicInfo) ||
-        data->holdsType(CSMWorld::UniversalId::Type_JournalInfo) );
+    const CSMWorld::TableMimeData* data = getTableMimeData(event);
+    return data != nullptr
+        && (data->holdsType(CSMWorld::UniversalId::Type_TopicInfo)
+            || data->holdsType(CSMWorld::UniversalId::Type_JournalInfo));
 }
 
-CSMWorld::UniversalId CSVWorld::DragDropUtils::getAcceptedData(const QDropEvent &event,
-                                                               CSMWorld::ColumnBase::Display type)
+CSMWorld::UniversalId CSVWorld::DragDropUtils::getAcceptedData(
+    const QDropEvent& event, CSMWorld::ColumnBase::Display type)
 {
     if (canAcceptData(event, type))
     {
-        if (const CSMWorld::TableMimeData *data = getTableMimeData(event))
+        if (const CSMWorld::TableMimeData* data = getTableMimeData(event))
             return data->returnMatching(type);
     }
     return CSMWorld::UniversalId::Type_None;
diff --git a/apps/opencs/view/world/dragdroputils.hpp b/apps/opencs/view/world/dragdroputils.hpp
index 2181e7606b..ab27198f71 100644
--- a/apps/opencs/view/world/dragdroputils.hpp
+++ b/apps/opencs/view/world/dragdroputils.hpp
@@ -15,15 +15,15 @@ namespace CSVWorld
 {
     namespace DragDropUtils
     {
-        const CSMWorld::TableMimeData *getTableMimeData(const QDropEvent &event);
+        const CSMWorld::TableMimeData* getTableMimeData(const QDropEvent& event);
 
-        bool canAcceptData(const QDropEvent &event, CSMWorld::ColumnBase::Display type);
+        bool canAcceptData(const QDropEvent& event, CSMWorld::ColumnBase::Display type);
         ///< Checks whether the \a event contains a valid CSMWorld::TableMimeData that holds the \a type
 
-        bool isInfo(const QDropEvent &event, CSMWorld::ColumnBase::Display type);
+        bool isInfo(const QDropEvent& event, CSMWorld::ColumnBase::Display type);
         ///< Info types can be dragged to sort the info table
 
-        CSMWorld::UniversalId getAcceptedData(const QDropEvent &event, CSMWorld::ColumnBase::Display type);
+        CSMWorld::UniversalId getAcceptedData(const QDropEvent& event, CSMWorld::ColumnBase::Display type);
         ///< Gets the accepted data from the \a event using the \a type
         ///< \return Type_None if the \a event data doesn't holds the \a type
     }
diff --git a/apps/opencs/view/world/dragrecordtable.cpp b/apps/opencs/view/world/dragrecordtable.cpp
index 8466e88b17..50878af074 100644
--- a/apps/opencs/view/world/dragrecordtable.cpp
+++ b/apps/opencs/view/world/dragrecordtable.cpp
@@ -5,12 +5,12 @@
 
 #include "../../model/doc/document.hpp"
 
-#include "../../model/world/tablemimedata.hpp"
 #include "../../model/world/commands.hpp"
+#include "../../model/world/tablemimedata.hpp"
 
 #include "dragdroputils.hpp"
 
-void CSVWorld::DragRecordTable::startDragFromTable (const CSVWorld::DragRecordTable& table)
+void CSVWorld::DragRecordTable::startDragFromTable(const CSVWorld::DragRecordTable& table)
 {
     std::vector<CSMWorld::UniversalId> records = table.getDraggedRecords();
     if (records.empty())
@@ -18,36 +18,36 @@ void CSVWorld::DragRecordTable::startDragFromTable (const CSVWorld::DragRecordTa
         return;
     }
 
-    CSMWorld::TableMimeData* mime = new CSMWorld::TableMimeData (records, mDocument);
-    QDrag* drag = new QDrag (this);
-    drag->setMimeData (mime);
-    drag->setPixmap (QString::fromUtf8 (mime->getIcon().c_str()));
-    drag->exec (Qt::CopyAction);
+    CSMWorld::TableMimeData* mime = new CSMWorld::TableMimeData(records, mDocument);
+    QDrag* drag = new QDrag(this);
+    drag->setMimeData(mime);
+    drag->setPixmap(QString::fromUtf8(mime->getIcon().c_str()));
+    drag->exec(Qt::CopyAction);
 }
 
-CSVWorld::DragRecordTable::DragRecordTable (CSMDoc::Document& document, QWidget* parent) :
-QTableView(parent),
-mDocument(document),
-mEditLock(false)
+CSVWorld::DragRecordTable::DragRecordTable(CSMDoc::Document& document, QWidget* parent)
+    : QTableView(parent)
+    , mDocument(document)
+    , mEditLock(false)
 {
     setAcceptDrops(true);
 }
 
-void CSVWorld::DragRecordTable::setEditLock (bool locked)
+void CSVWorld::DragRecordTable::setEditLock(bool locked)
 {
     mEditLock = locked;
 }
 
-void CSVWorld::DragRecordTable::dragEnterEvent(QDragEnterEvent *event)
+void CSVWorld::DragRecordTable::dragEnterEvent(QDragEnterEvent* event)
 {
     event->acceptProposedAction();
 }
 
-void CSVWorld::DragRecordTable::dragMoveEvent(QDragMoveEvent *event)
+void CSVWorld::DragRecordTable::dragMoveEvent(QDragMoveEvent* event)
 {
     QModelIndex index = indexAt(event->pos());
-    if (CSVWorld::DragDropUtils::canAcceptData(*event, getIndexDisplayType(index)) ||
-        CSVWorld::DragDropUtils::isInfo(*event, getIndexDisplayType(index)) )
+    if (CSVWorld::DragDropUtils::canAcceptData(*event, getIndexDisplayType(index))
+        || CSVWorld::DragDropUtils::isInfo(*event, getIndexDisplayType(index)))
     {
         if (index.flags() & Qt::ItemIsEditable)
         {
@@ -58,13 +58,13 @@ void CSVWorld::DragRecordTable::dragMoveEvent(QDragMoveEvent *event)
     event->ignore();
 }
 
-void CSVWorld::DragRecordTable::dropEvent(QDropEvent *event)
+void CSVWorld::DragRecordTable::dropEvent(QDropEvent* event)
 {
     QModelIndex index = indexAt(event->pos());
     CSMWorld::ColumnBase::Display display = getIndexDisplayType(index);
     if (CSVWorld::DragDropUtils::canAcceptData(*event, display))
     {
-        const CSMWorld::TableMimeData *tableMimeData = CSVWorld::DragDropUtils::getTableMimeData(*event);
+        const CSMWorld::TableMimeData* tableMimeData = CSVWorld::DragDropUtils::getTableMimeData(*event);
         if (tableMimeData->fromDocument(mDocument))
         {
             CSMWorld::UniversalId id = CSVWorld::DragDropUtils::getAcceptedData(*event, display);
@@ -82,7 +82,7 @@ void CSVWorld::DragRecordTable::dropEvent(QDropEvent *event)
     }
 }
 
-CSMWorld::ColumnBase::Display CSVWorld::DragRecordTable::getIndexDisplayType(const QModelIndex &index) const
+CSMWorld::ColumnBase::Display CSVWorld::DragRecordTable::getIndexDisplayType(const QModelIndex& index) const
 {
     Q_ASSERT(model() != nullptr);
 
diff --git a/apps/opencs/view/world/dragrecordtable.hpp b/apps/opencs/view/world/dragrecordtable.hpp
index b8a108b143..361cc071cb 100644
--- a/apps/opencs/view/world/dragrecordtable.hpp
+++ b/apps/opencs/view/world/dragrecordtable.hpp
@@ -24,35 +24,34 @@ namespace CSVWorld
     {
         Q_OBJECT
 
-        protected:
-            CSMDoc::Document& mDocument;
-            bool mEditLock;
+    protected:
+        CSMDoc::Document& mDocument;
+        bool mEditLock;
 
-        public:
-            DragRecordTable(CSMDoc::Document& document, QWidget* parent = nullptr);
+    public:
+        DragRecordTable(CSMDoc::Document& document, QWidget* parent = nullptr);
 
-            virtual std::vector<CSMWorld::UniversalId> getDraggedRecords() const = 0;
+        virtual std::vector<CSMWorld::UniversalId> getDraggedRecords() const = 0;
 
-            void setEditLock(bool locked);
+        void setEditLock(bool locked);
 
-        protected:
-            void startDragFromTable(const DragRecordTable& table);
+    protected:
+        void startDragFromTable(const DragRecordTable& table);
 
-            void dragEnterEvent(QDragEnterEvent *event) override;
+        void dragEnterEvent(QDragEnterEvent* event) override;
 
-            void dragMoveEvent(QDragMoveEvent *event) override;
+        void dragMoveEvent(QDragMoveEvent* event) override;
 
-            void dropEvent(QDropEvent *event) override;
+        void dropEvent(QDropEvent* event) override;
 
-            int sizeHintForColumn(int column) const override;
+        int sizeHintForColumn(int column) const override;
 
-        private:
-            CSMWorld::ColumnBase::Display getIndexDisplayType(const QModelIndex &index) const;
+    private:
+        CSMWorld::ColumnBase::Display getIndexDisplayType(const QModelIndex& index) const;
 
-        signals:
-            void moveRecordsFromSameTable(QDropEvent *event);
+    signals:
+        void moveRecordsFromSameTable(QDropEvent* event);
     };
 }
 
 #endif
-
diff --git a/apps/opencs/view/world/enumdelegate.cpp b/apps/opencs/view/world/enumdelegate.cpp
index 6ec585381c..42ce0c5005 100644
--- a/apps/opencs/view/world/enumdelegate.cpp
+++ b/apps/opencs/view/world/enumdelegate.cpp
@@ -3,12 +3,12 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QComboBox>
 #include <QApplication>
+#include <QComboBox>
 
 #include "../../model/world/commands.hpp"
 
-int CSVWorld::EnumDelegate::getValueIndex(const QModelIndex &index, int role) const
+int CSVWorld::EnumDelegate::getValueIndex(const QModelIndex& index, int role) const
 {
     if (index.isValid() && index.data(role).isValid())
     {
@@ -26,66 +26,60 @@ int CSVWorld::EnumDelegate::getValueIndex(const QModelIndex &index, int role) co
     return -1;
 }
 
-void CSVWorld::EnumDelegate::setModelDataImp (QWidget *editor, QAbstractItemModel *model,
-    const QModelIndex& index) const
+void CSVWorld::EnumDelegate::setModelDataImp(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const
 {
-    if (QComboBox *comboBox = dynamic_cast<QComboBox *> (editor))
+    if (QComboBox* comboBox = dynamic_cast<QComboBox*>(editor))
     {
         QString value = comboBox->currentText();
 
-        for (std::vector<std::pair<int, QString> >::const_iterator iter (mValues.begin());
-            iter!=mValues.end(); ++iter)
-            if (iter->second==value)
+        for (std::vector<std::pair<int, QString>>::const_iterator iter(mValues.begin()); iter != mValues.end(); ++iter)
+            if (iter->second == value)
             {
                 // do nothing if the value has not changed
                 if (model->data(index).toInt() != iter->first)
-                    addCommands (model, index, iter->first);
+                    addCommands(model, index, iter->first);
                 break;
             }
     }
 }
 
-void CSVWorld::EnumDelegate::addCommands (QAbstractItemModel *model,
-    const QModelIndex& index, int type) const
+void CSVWorld::EnumDelegate::addCommands(QAbstractItemModel* model, const QModelIndex& index, int type) const
 {
-    getUndoStack().push (new CSMWorld::ModifyCommand (*model, index, type));
+    getUndoStack().push(new CSMWorld::ModifyCommand(*model, index, type));
 }
 
-
-CSVWorld::EnumDelegate::EnumDelegate (const std::vector<std::pair<int, QString> >& values,
-    CSMWorld::CommandDispatcher *dispatcher, CSMDoc::Document& document, QObject *parent)
-: CommandDelegate (dispatcher, document, parent), mValues (values)
+CSVWorld::EnumDelegate::EnumDelegate(const std::vector<std::pair<int, QString>>& values,
+    CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent)
+    : CommandDelegate(dispatcher, document, parent)
+    , mValues(values)
 {
-
 }
 
-QWidget *CSVWorld::EnumDelegate::createEditor(QWidget *parent,
-                                              const QStyleOptionViewItem& option,
-                                              const QModelIndex& index) const
+QWidget* CSVWorld::EnumDelegate::createEditor(
+    QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
     return createEditor(parent, option, index, CSMWorld::ColumnBase::Display_None);
 }
 
-QWidget *CSVWorld::EnumDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem& option,
+QWidget* CSVWorld::EnumDelegate::createEditor(QWidget* parent, const QStyleOptionViewItem& option,
     const QModelIndex& index, CSMWorld::ColumnBase::Display display) const
 {
     if (!index.data(Qt::EditRole).isValid() && !index.data(Qt::DisplayRole).isValid())
         return nullptr;
 
-    QComboBox *comboBox = new QComboBox (parent);
+    QComboBox* comboBox = new QComboBox(parent);
+
+    for (std::vector<std::pair<int, QString>>::const_iterator iter(mValues.begin()); iter != mValues.end(); ++iter)
+        comboBox->addItem(iter->second);
 
-    for (std::vector<std::pair<int, QString> >::const_iterator iter (mValues.begin());
-         iter!=mValues.end(); ++iter)
-         comboBox->addItem (iter->second);
-    
     comboBox->setMaxVisibleItems(20);
 
     return comboBox;
 }
 
-void CSVWorld::EnumDelegate::setEditorData (QWidget *editor, const QModelIndex& index, bool tryDisplay) const
+void CSVWorld::EnumDelegate::setEditorData(QWidget* editor, const QModelIndex& index, bool tryDisplay) const
 {
-    if (QComboBox *comboBox = dynamic_cast<QComboBox *>(editor))
+    if (QComboBox* comboBox = dynamic_cast<QComboBox*>(editor))
     {
         int role = Qt::EditRole;
         if (tryDisplay && !index.data(role).isValid())
@@ -105,8 +99,8 @@ void CSVWorld::EnumDelegate::setEditorData (QWidget *editor, const QModelIndex&
     }
 }
 
-void CSVWorld::EnumDelegate::paint (QPainter *painter, const QStyleOptionViewItem& option,
-    const QModelIndex& index) const
+void CSVWorld::EnumDelegate::paint(
+    QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
     int valueIndex = getValueIndex(index);
     if (valueIndex != -1)
@@ -117,7 +111,7 @@ void CSVWorld::EnumDelegate::paint (QPainter *painter, const QStyleOptionViewIte
     }
 }
 
-QSize CSVWorld::EnumDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
+QSize CSVWorld::EnumDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
     int valueIndex = getValueIndex(index);
     if (valueIndex != -1)
@@ -130,7 +124,7 @@ QSize CSVWorld::EnumDelegate::sizeHint(const QStyleOptionViewItem &option, const
         itemOption.rect = option.rect;
         itemOption.state = option.state;
 
-        const QString &valueText = mValues.at(valueIndex).second;
+        const QString& valueText = mValues.at(valueIndex).second;
         QSize valueSize = QSize(itemOption.fontMetrics.horizontalAdvance(valueText), itemOption.fontMetrics.height());
         itemOption.currentText = valueText;
         return QApplication::style()->sizeFromContents(QStyle::CT_ComboBox, &itemOption, valueSize);
@@ -140,40 +134,40 @@ QSize CSVWorld::EnumDelegate::sizeHint(const QStyleOptionViewItem &option, const
 
 CSVWorld::EnumDelegateFactory::EnumDelegateFactory() {}
 
-CSVWorld::EnumDelegateFactory::EnumDelegateFactory (const char **names, bool allowNone)
+CSVWorld::EnumDelegateFactory::EnumDelegateFactory(const char** names, bool allowNone)
 {
-    assert (names);
+    assert(names);
 
     if (allowNone)
-        add (-1, "");
+        add(-1, "");
 
-    for (int i=0; names[i]; ++i)
-        add (i, names[i]);
+    for (int i = 0; names[i]; ++i)
+        add(i, names[i]);
 }
 
-CSVWorld::EnumDelegateFactory::EnumDelegateFactory (const std::vector<std::pair<int,std::string>>& names,
-    bool allowNone)
+CSVWorld::EnumDelegateFactory::EnumDelegateFactory(
+    const std::vector<std::pair<int, std::string>>& names, bool allowNone)
 {
     if (allowNone)
-        add (-1, "");
+        add(-1, "");
 
-    int size = static_cast<int> (names.size());
+    int size = static_cast<int>(names.size());
 
-    for (int i=0; i<size; ++i)
-        add (names[i].first, names[i].second.c_str());
+    for (int i = 0; i < size; ++i)
+        add(names[i].first, names[i].second.c_str());
 }
 
-CSVWorld::CommandDelegate *CSVWorld::EnumDelegateFactory::makeDelegate (
-    CSMWorld::CommandDispatcher *dispatcher, CSMDoc::Document& document, QObject *parent) const
+CSVWorld::CommandDelegate* CSVWorld::EnumDelegateFactory::makeDelegate(
+    CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent) const
 {
-    return new EnumDelegate (mValues, dispatcher, document, parent);
+    return new EnumDelegate(mValues, dispatcher, document, parent);
 }
 
-void CSVWorld::EnumDelegateFactory::add (int value, const QString& name)
+void CSVWorld::EnumDelegateFactory::add(int value, const QString& name)
 {
-    auto pair = std::make_pair (value, name);
+    auto pair = std::make_pair(value, name);
 
-    for (auto it=mValues.begin(); it!=mValues.end(); ++it)
+    for (auto it = mValues.begin(); it != mValues.end(); ++it)
     {
         if (it->second > name)
         {
@@ -182,5 +176,5 @@ void CSVWorld::EnumDelegateFactory::add (int value, const QString& name)
         }
     }
 
-    mValues.emplace_back (value, name);
+    mValues.emplace_back(value, name);
 }
diff --git a/apps/opencs/view/world/enumdelegate.hpp b/apps/opencs/view/world/enumdelegate.hpp
index c5a851c9f8..6fcf746500 100644
--- a/apps/opencs/view/world/enumdelegate.hpp
+++ b/apps/opencs/view/world/enumdelegate.hpp
@@ -14,66 +14,55 @@ namespace CSVWorld
     /// \brief Integer value that represents an enum and is interacted with via a combobox
     class EnumDelegate : public CommandDelegate
     {
-        protected:
+    protected:
+        std::vector<std::pair<int, QString>> mValues;
 
-            std::vector<std::pair<int, QString> > mValues;
+        int getValueIndex(const QModelIndex& index, int role = Qt::DisplayRole) const;
 
-            int getValueIndex(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    private:
+        void setModelDataImp(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const override;
 
-        private:
+        virtual void addCommands(QAbstractItemModel* model, const QModelIndex& index, int type) const;
 
-            void setModelDataImp (QWidget *editor, QAbstractItemModel *model,
-                const QModelIndex& index) const override;
+    public:
+        EnumDelegate(const std::vector<std::pair<int, QString>>& values, CSMWorld::CommandDispatcher* dispatcher,
+            CSMDoc::Document& document, QObject* parent);
 
-            virtual void addCommands (QAbstractItemModel *model,
-                const QModelIndex& index, int type) const;
+        QWidget* createEditor(
+            QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
 
-        public:
+        QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index,
+            CSMWorld::ColumnBase::Display display = CSMWorld::ColumnBase::Display_None) const override;
 
-            EnumDelegate (const std::vector<std::pair<int, QString> >& values,
-                CSMWorld::CommandDispatcher *dispatcher, CSMDoc::Document& document, QObject *parent);
+        void setEditorData(QWidget* editor, const QModelIndex& index, bool tryDisplay = false) const override;
 
-            QWidget *createEditor(QWidget *parent,
-                                          const QStyleOptionViewItem& option,
-                                          const QModelIndex& index) const override;
-
-            QWidget *createEditor(QWidget *parent,
-                                          const QStyleOptionViewItem& option,
-                                          const QModelIndex& index,
-                                          CSMWorld::ColumnBase::Display display = CSMWorld::ColumnBase::Display_None) const override;
-
-            void setEditorData (QWidget *editor, const QModelIndex& index, bool tryDisplay = false) const override;
-
-            void paint (QPainter *painter, const QStyleOptionViewItem& option,
-                const QModelIndex& index) const override;
-
-            QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+        void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
 
+        QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override;
     };
 
     class EnumDelegateFactory : public CommandDelegateFactory
     {
-        protected:
-            std::vector<std::pair<int, QString> > mValues;
-
-        public:
+    protected:
+        std::vector<std::pair<int, QString>> mValues;
 
-            EnumDelegateFactory();
+    public:
+        EnumDelegateFactory();
 
-            EnumDelegateFactory (const char **names, bool allowNone = false);
-            ///< \param names Array of char pointer with a 0-pointer as end mark
-            /// \param allowNone Use value of -1 for "none selected" (empty string)
+        EnumDelegateFactory(const char** names, bool allowNone = false);
+        ///< \param names Array of char pointer with a 0-pointer as end mark
+        /// \param allowNone Use value of -1 for "none selected" (empty string)
 
-            EnumDelegateFactory (const std::vector<std::pair<int,std::string>>& names, bool allowNone = false);
-            /// \param allowNone Use value of -1 for "none selected" (empty string)
+        EnumDelegateFactory(const std::vector<std::pair<int, std::string>>& names, bool allowNone = false);
+        /// \param allowNone Use value of -1 for "none selected" (empty string)
 
-            CommandDelegate *makeDelegate (CSMWorld::CommandDispatcher *dispatcher, CSMDoc::Document& document, QObject *parent) const override;
-            ///< The ownership of the returned CommandDelegate is transferred to the caller.
+        CommandDelegate* makeDelegate(
+            CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent) const override;
+        ///< The ownership of the returned CommandDelegate is transferred to the caller.
 
-            void add (int value, const QString& name);
+        void add(int value, const QString& name);
     };
 
-
 }
 
 #endif
diff --git a/apps/opencs/view/world/extendedcommandconfigurator.cpp b/apps/opencs/view/world/extendedcommandconfigurator.cpp
index 10dd49781e..c0a1097ab7 100644
--- a/apps/opencs/view/world/extendedcommandconfigurator.cpp
+++ b/apps/opencs/view/world/extendedcommandconfigurator.cpp
@@ -2,25 +2,24 @@
 
 #include <algorithm>
 
-#include <QPushButton>
-#include <QGroupBox>
 #include <QCheckBox>
+#include <QGroupBox>
 #include <QLayout>
+#include <QPushButton>
 
 #include "../../model/doc/document.hpp"
 
 #include "../../model/world/commanddispatcher.hpp"
 #include "../../model/world/data.hpp"
 
-CSVWorld::ExtendedCommandConfigurator::ExtendedCommandConfigurator(CSMDoc::Document &document,
-                                                                   const CSMWorld::UniversalId &id,
-                                                                   QWidget *parent)
-    : QWidget(parent),
-      mNumUsedCheckBoxes(0),
-      mNumChecked(0),
-      mMode(Mode_None),
-      mData(document.getData()),
-      mEditLock(false)
+CSVWorld::ExtendedCommandConfigurator::ExtendedCommandConfigurator(
+    CSMDoc::Document& document, const CSMWorld::UniversalId& id, QWidget* parent)
+    : QWidget(parent)
+    , mNumUsedCheckBoxes(0)
+    , mNumChecked(0)
+    , mMode(Mode_None)
+    , mData(document.getData())
+    , mEditLock(false)
 {
     mCommandDispatcher = new CSMWorld::CommandDispatcher(document, id, this);
 
@@ -37,11 +36,11 @@ CSVWorld::ExtendedCommandConfigurator::ExtendedCommandConfigurator(CSMDoc::Docum
 
     mTypeGroup = new QGroupBox(this);
 
-    QGridLayout *groupLayout = new QGridLayout(mTypeGroup);
+    QGridLayout* groupLayout = new QGridLayout(mTypeGroup);
     groupLayout->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
     mTypeGroup->setLayout(groupLayout);
 
-    QHBoxLayout *mainLayout = new QHBoxLayout(this);
+    QHBoxLayout* mainLayout = new QHBoxLayout(this);
     mainLayout->setSizeConstraint(QLayout::SetNoConstraint);
     mainLayout->setContentsMargins(0, 0, 0, 0);
     mainLayout->addWidget(mTypeGroup);
@@ -49,8 +48,8 @@ CSVWorld::ExtendedCommandConfigurator::ExtendedCommandConfigurator(CSMDoc::Docum
     mainLayout->addWidget(mCancelButton);
 }
 
-void CSVWorld::ExtendedCommandConfigurator::configure(CSVWorld::ExtendedCommandConfigurator::Mode mode,
-                                                      const std::vector<std::string> &selectedIds)
+void CSVWorld::ExtendedCommandConfigurator::configure(
+    CSVWorld::ExtendedCommandConfigurator::Mode mode, const std::vector<std::string>& selectedIds)
 {
     mMode = mode;
     if (mMode != Mode_None)
@@ -74,7 +73,7 @@ void CSVWorld::ExtendedCommandConfigurator::setEditLock(bool locked)
     }
 }
 
-void CSVWorld::ExtendedCommandConfigurator::resizeEvent(QResizeEvent *event)
+void CSVWorld::ExtendedCommandConfigurator::resizeEvent(QResizeEvent* event)
 {
     QWidget::resizeEvent(event);
     setupGroupLayout();
@@ -88,7 +87,7 @@ void CSVWorld::ExtendedCommandConfigurator::setupGroupLayout()
     }
 
     int groupWidth = mTypeGroup->geometry().width();
-    QGridLayout *layout = qobject_cast<QGridLayout *>(mTypeGroup->layout());
+    QGridLayout* layout = qobject_cast<QGridLayout*>(mTypeGroup->layout());
 
     // Find the optimal number of rows to place the checkboxes within the available space
     int divider = 1;
@@ -114,20 +113,19 @@ void CSVWorld::ExtendedCommandConfigurator::setupGroupLayout()
             ++counter;
         }
         divider *= 2;
-    }
-    while (groupWidth < mTypeGroup->sizeHint().width() && divider <= mNumUsedCheckBoxes);
+    } while (groupWidth < mTypeGroup->sizeHint().width() && divider <= mNumUsedCheckBoxes);
 }
 
-void CSVWorld::ExtendedCommandConfigurator::setupCheckBoxes(const std::vector<CSMWorld::UniversalId> &types)
+void CSVWorld::ExtendedCommandConfigurator::setupCheckBoxes(const std::vector<CSMWorld::UniversalId>& types)
 {
     // Make sure that we have enough checkboxes
-    int numTypes =  static_cast<int>(types.size());
+    int numTypes = static_cast<int>(types.size());
     int numCheckBoxes = static_cast<int>(mTypeCheckBoxes.size());
     if (numTypes > numCheckBoxes)
     {
         for (int i = numTypes - numCheckBoxes; i > 0; --i)
         {
-            QCheckBox *checkBox = new QCheckBox(mTypeGroup);
+            QCheckBox* checkBox = new QCheckBox(mTypeGroup);
             connect(checkBox, &QCheckBox::stateChanged, this, &ExtendedCommandConfigurator::checkBoxStateChanged);
             mTypeCheckBoxes.insert(std::make_pair(checkBox, CSMWorld::UniversalId::Type_None));
         }
diff --git a/apps/opencs/view/world/extendedcommandconfigurator.hpp b/apps/opencs/view/world/extendedcommandconfigurator.hpp
index 85862ac49e..d3354a5e5d 100644
--- a/apps/opencs/view/world/extendedcommandconfigurator.hpp
+++ b/apps/opencs/view/world/extendedcommandconfigurator.hpp
@@ -28,50 +28,54 @@ namespace CSVWorld
 {
     class ExtendedCommandConfigurator : public QWidget
     {
-            Q_OBJECT
-
-        public:
-            enum Mode { Mode_None, Mode_Delete, Mode_Revert };
-        
-        private:
-            typedef std::map<QCheckBox *, CSMWorld::UniversalId> CheckBoxMap;
-
-            QPushButton *mPerformButton;
-            QPushButton *mCancelButton;
-            QGroupBox *mTypeGroup;
-            CheckBoxMap mTypeCheckBoxes;
-            int mNumUsedCheckBoxes;
-            int mNumChecked;
-
-            Mode mMode;
-            CSMWorld::CommandDispatcher *mCommandDispatcher;
-            CSMWorld::Data &mData;
-            std::vector<std::string> mSelectedIds;
-            
-            bool mEditLock;
-
-            void setupGroupLayout();
-            void setupCheckBoxes(const std::vector<CSMWorld::UniversalId> &types);
-            void lockWidgets(bool locked);
-
-        public:
-            ExtendedCommandConfigurator(CSMDoc::Document &document,
-                                        const CSMWorld::UniversalId &id,
-                                        QWidget *parent = nullptr);
-
-            void configure(Mode mode, const std::vector<std::string> &selectedIds);
-            void setEditLock(bool locked);
-
-        protected:
-            void resizeEvent(QResizeEvent *event) override;
-
-        private slots:
-            void performExtendedCommand();
-            void checkBoxStateChanged(int state);
-            void dataIdListChanged();
-
-        signals:
-            void done();
+        Q_OBJECT
+
+    public:
+        enum Mode
+        {
+            Mode_None,
+            Mode_Delete,
+            Mode_Revert
+        };
+
+    private:
+        typedef std::map<QCheckBox*, CSMWorld::UniversalId> CheckBoxMap;
+
+        QPushButton* mPerformButton;
+        QPushButton* mCancelButton;
+        QGroupBox* mTypeGroup;
+        CheckBoxMap mTypeCheckBoxes;
+        int mNumUsedCheckBoxes;
+        int mNumChecked;
+
+        Mode mMode;
+        CSMWorld::CommandDispatcher* mCommandDispatcher;
+        CSMWorld::Data& mData;
+        std::vector<std::string> mSelectedIds;
+
+        bool mEditLock;
+
+        void setupGroupLayout();
+        void setupCheckBoxes(const std::vector<CSMWorld::UniversalId>& types);
+        void lockWidgets(bool locked);
+
+    public:
+        ExtendedCommandConfigurator(
+            CSMDoc::Document& document, const CSMWorld::UniversalId& id, QWidget* parent = nullptr);
+
+        void configure(Mode mode, const std::vector<std::string>& selectedIds);
+        void setEditLock(bool locked);
+
+    protected:
+        void resizeEvent(QResizeEvent* event) override;
+
+    private slots:
+        void performExtendedCommand();
+        void checkBoxStateChanged(int state);
+        void dataIdListChanged();
+
+    signals:
+        void done();
     };
 }
 
diff --git a/apps/opencs/view/world/genericcreator.cpp b/apps/opencs/view/world/genericcreator.cpp
index 48a4aa445b..f12783e294 100644
--- a/apps/opencs/view/world/genericcreator.cpp
+++ b/apps/opencs/view/world/genericcreator.cpp
@@ -2,12 +2,12 @@
 
 #include <memory>
 
+#include <QComboBox>
 #include <QHBoxLayout>
-#include <QPushButton>
+#include <QLabel>
 #include <QLineEdit>
+#include <QPushButton>
 #include <QUndoStack>
-#include <QLabel>
-#include <QComboBox>
 
 #include <components/misc/strings/lower.hpp>
 
@@ -21,25 +21,25 @@ void CSVWorld::GenericCreator::update()
 {
     mErrors = getErrors();
 
-    mCreate->setToolTip (QString::fromUtf8 (mErrors.c_str()));
-    mId->setToolTip (QString::fromUtf8 (mErrors.c_str()));
+    mCreate->setToolTip(QString::fromUtf8(mErrors.c_str()));
+    mId->setToolTip(QString::fromUtf8(mErrors.c_str()));
 
-    mCreate->setEnabled (mErrors.empty() && !mLocked);
+    mCreate->setEnabled(mErrors.empty() && !mLocked);
 }
 
-void CSVWorld::GenericCreator::setManualEditing (bool enabled)
+void CSVWorld::GenericCreator::setManualEditing(bool enabled)
 {
-    mId->setVisible (enabled);
+    mId->setVisible(enabled);
 }
 
-void CSVWorld::GenericCreator::insertAtBeginning (QWidget *widget, bool stretched)
+void CSVWorld::GenericCreator::insertAtBeginning(QWidget* widget, bool stretched)
 {
-    mLayout->insertWidget (0, widget, stretched ? 1 : 0);
+    mLayout->insertWidget(0, widget, stretched ? 1 : 0);
 }
 
-void CSVWorld::GenericCreator::insertBeforeButtons (QWidget *widget, bool stretched)
+void CSVWorld::GenericCreator::insertBeforeButtons(QWidget* widget, bool stretched)
 {
-    mLayout->insertWidget (mLayout->count()-2, widget, stretched ? 1 : 0);
+    mLayout->insertWidget(mLayout->count() - 2, widget, stretched ? 1 : 0);
 
     // Reset tab order relative to buttons.
     setTabOrder(widget, mCreate);
@@ -66,12 +66,11 @@ std::string CSVWorld::GenericCreator::getIdValidatorResult() const
     return errors;
 }
 
-void CSVWorld::GenericCreator::configureCreateCommand (CSMWorld::CreateCommand& command) const {}
+void CSVWorld::GenericCreator::configureCreateCommand(CSMWorld::CreateCommand& command) const {}
 
-void CSVWorld::GenericCreator::pushCommand (std::unique_ptr<CSMWorld::CreateCommand> command,
-    const std::string& id)
+void CSVWorld::GenericCreator::pushCommand(std::unique_ptr<CSMWorld::CreateCommand> command, const std::string& id)
 {
-    mUndoStack.push (command.release());
+    mUndoStack.push(command.release());
 }
 
 CSMWorld::Data& CSVWorld::GenericCreator::getData() const
@@ -95,7 +94,7 @@ std::string CSVWorld::GenericCreator::getNamespace() const
 
     if (mScope)
     {
-        scope = static_cast<CSMWorld::Scope> (mScope->itemData (mScope->currentIndex()).toInt());
+        scope = static_cast<CSMWorld::Scope>(mScope->itemData(mScope->currentIndex()).toInt());
     }
     else
     {
@@ -107,9 +106,12 @@ std::string CSVWorld::GenericCreator::getNamespace() const
 
     switch (scope)
     {
-        case CSMWorld::Scope_Content: return "";
-        case CSMWorld::Scope_Project: return "project::";
-        case CSMWorld::Scope_Session: return "session::";
+        case CSMWorld::Scope_Content:
+            return "";
+        case CSMWorld::Scope_Project:
+            return "project::";
+        case CSMWorld::Scope_Session:
+            return "session::";
     }
 
     return "";
@@ -119,37 +121,41 @@ void CSVWorld::GenericCreator::updateNamespace()
 {
     std::string namespace_ = getNamespace();
 
-    mValidator->setNamespace (namespace_);
+    mValidator->setNamespace(namespace_);
 
-    int index = mId->text().indexOf ("::");
+    int index = mId->text().indexOf("::");
 
-    if (index==-1)
+    if (index == -1)
     {
         // no namespace in old text
-        mId->setText (QString::fromUtf8 (namespace_.c_str()) + mId->text());
+        mId->setText(QString::fromUtf8(namespace_.c_str()) + mId->text());
     }
     else
     {
-        std::string oldNamespace =
-            Misc::StringUtils::lowerCase (mId->text().left (index).toUtf8().constData());
+        std::string oldNamespace = Misc::StringUtils::lowerCase(mId->text().left(index).toUtf8().constData());
 
-        if (oldNamespace=="project" || oldNamespace=="session")
-            mId->setText (QString::fromUtf8 (namespace_.c_str()) + mId->text().mid (index+2));
+        if (oldNamespace == "project" || oldNamespace == "session")
+            mId->setText(QString::fromUtf8(namespace_.c_str()) + mId->text().mid(index + 2));
     }
 }
 
-void CSVWorld::GenericCreator::addScope (const QString& name, CSMWorld::Scope scope,
-    const QString& tooltip)
+void CSVWorld::GenericCreator::addScope(const QString& name, CSMWorld::Scope scope, const QString& tooltip)
 {
-    mScope->addItem (name, static_cast<int> (scope));
-    mScope->setItemData (mScope->count()-1, tooltip, Qt::ToolTipRole);
+    mScope->addItem(name, static_cast<int>(scope));
+    mScope->setItemData(mScope->count() - 1, tooltip, Qt::ToolTipRole);
 }
 
-CSVWorld::GenericCreator::GenericCreator (CSMWorld::Data& data, QUndoStack& undoStack,
-    const CSMWorld::UniversalId& id, bool relaxedIdRules)
-: mData (data), mUndoStack (undoStack), mListId (id), mLocked (false),
-  mClonedType (CSMWorld::UniversalId::Type_None), mScopes (CSMWorld::Scope_Content), mScope (nullptr),
-  mScopeLabel (nullptr), mCloneMode (false)
+CSVWorld::GenericCreator::GenericCreator(
+    CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id, bool relaxedIdRules)
+    : mData(data)
+    , mUndoStack(undoStack)
+    , mListId(id)
+    , mLocked(false)
+    , mClonedType(CSMWorld::UniversalId::Type_None)
+    , mScopes(CSMWorld::Scope_Content)
+    , mScope(nullptr)
+    , mScopeLabel(nullptr)
+    , mCloneMode(false)
 {
     // If the collection ID has a parent type, use it instead.
     // It will change IDs with Record/SubRecord class (used for creators in Dialogue subviews)
@@ -161,35 +167,35 @@ CSVWorld::GenericCreator::GenericCreator (CSMWorld::Data& data, QUndoStack& undo
     }
 
     mLayout = new QHBoxLayout;
-    mLayout->setContentsMargins (0, 0, 0, 0);
+    mLayout->setContentsMargins(0, 0, 0, 0);
 
     mId = new QLineEdit;
-    mId->setValidator (mValidator = new IdValidator (relaxedIdRules, this));
-    mLayout->addWidget (mId, 1);
+    mId->setValidator(mValidator = new IdValidator(relaxedIdRules, this));
+    mLayout->addWidget(mId, 1);
 
-    mCreate = new QPushButton ("Create");
-    mLayout->addWidget (mCreate);
+    mCreate = new QPushButton("Create");
+    mLayout->addWidget(mCreate);
 
     mCancel = new QPushButton("Cancel");
     mLayout->addWidget(mCancel);
 
-    setLayout (mLayout);
+    setLayout(mLayout);
 
-    connect (mCancel, &QPushButton::clicked, this, &GenericCreator::done);
-    connect (mCreate, &QPushButton::clicked, this, &GenericCreator::create);
+    connect(mCancel, &QPushButton::clicked, this, &GenericCreator::done);
+    connect(mCreate, &QPushButton::clicked, this, &GenericCreator::create);
 
-    connect (mId, &QLineEdit::textChanged, this, &GenericCreator::textChanged);
-    connect (mId, &QLineEdit::returnPressed, this, &GenericCreator::inputReturnPressed);
+    connect(mId, &QLineEdit::textChanged, this, &GenericCreator::textChanged);
+    connect(mId, &QLineEdit::returnPressed, this, &GenericCreator::inputReturnPressed);
 
-    connect (&mData, &CSMWorld::Data::idListChanged, this, &GenericCreator::dataIdListChanged);
+    connect(&mData, &CSMWorld::Data::idListChanged, this, &GenericCreator::dataIdListChanged);
 }
 
-void CSVWorld::GenericCreator::setEditorMaxLength (int length)
+void CSVWorld::GenericCreator::setEditorMaxLength(int length)
 {
-    mId->setMaxLength (length);
+    mId->setMaxLength(length);
 }
 
-void CSVWorld::GenericCreator::setEditLock (bool locked)
+void CSVWorld::GenericCreator::setEditLock(bool locked)
 {
     mLocked = locked;
     update();
@@ -198,7 +204,7 @@ void CSVWorld::GenericCreator::setEditLock (bool locked)
 void CSVWorld::GenericCreator::reset()
 {
     mCloneMode = false;
-    mId->setText ("");
+    mId->setText("");
     update();
     updateNamespace();
 }
@@ -209,13 +215,13 @@ std::string CSVWorld::GenericCreator::getErrors() const
 
     if (!mId->hasAcceptableInput())
         errors = mValidator->getError();
-    else if (mData.hasId (getId()))
+    else if (mData.hasId(getId()))
         errors = "ID is already in use";
 
     return errors;
 }
 
-void CSVWorld::GenericCreator::textChanged (const QString& text)
+void CSVWorld::GenericCreator::textChanged(const QString& text)
 {
     update();
 }
@@ -239,25 +245,23 @@ void CSVWorld::GenericCreator::create()
         if (mCloneMode)
         {
             command = std::make_unique<CSMWorld::CloneCommand>(
-                dynamic_cast<CSMWorld::IdTable&> (*mData.getTableModel(mListId)), mClonedId, id, mClonedType);
+                dynamic_cast<CSMWorld::IdTable&>(*mData.getTableModel(mListId)), mClonedId, id, mClonedType);
         }
         else
         {
             command = std::make_unique<CSMWorld::CreateCommand>(
-                dynamic_cast<CSMWorld::IdTable&> (*mData.getTableModel (mListId)), id);
-
+                dynamic_cast<CSMWorld::IdTable&>(*mData.getTableModel(mListId)), id);
         }
 
-        configureCreateCommand (*command);
-        pushCommand (std::move(command), id);
+        configureCreateCommand(*command);
+        pushCommand(std::move(command), id);
 
         emit done();
         emit requestFocus(id);
     }
 }
 
-void CSVWorld::GenericCreator::cloneMode(const std::string& originId,
-                                         const CSMWorld::UniversalId::Type type)
+void CSVWorld::GenericCreator::cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type)
 {
     mCloneMode = true;
     mClonedId = originId;
@@ -280,50 +284,46 @@ void CSVWorld::GenericCreator::touch(const std::vector<CSMWorld::UniversalId>& i
     mUndoStack.endMacro();
 }
 
-void CSVWorld::GenericCreator::toggleWidgets(bool active)
-{
-}
+void CSVWorld::GenericCreator::toggleWidgets(bool active) {}
 
 void CSVWorld::GenericCreator::focus()
 {
     mId->setFocus();
 }
 
-void CSVWorld::GenericCreator::setScope (unsigned int scope)
+void CSVWorld::GenericCreator::setScope(unsigned int scope)
 {
     mScopes = scope;
-    int count = (mScopes & CSMWorld::Scope_Content) + (mScopes & CSMWorld::Scope_Project) +
-        (mScopes & CSMWorld::Scope_Session);
+    int count = (mScopes & CSMWorld::Scope_Content) + (mScopes & CSMWorld::Scope_Project)
+        + (mScopes & CSMWorld::Scope_Session);
 
     // scope selector widget
-    if (count>1)
+    if (count > 1)
     {
-        mScope = new QComboBox (this);
-        insertAtBeginning (mScope, false);
+        mScope = new QComboBox(this);
+        insertAtBeginning(mScope, false);
 
         if (mScopes & CSMWorld::Scope_Content)
-            addScope ("Content", CSMWorld::Scope_Content,
-                "Record will be stored in the currently edited content file.");
+            addScope("Content", CSMWorld::Scope_Content, "Record will be stored in the currently edited content file.");
 
         if (mScopes & CSMWorld::Scope_Project)
-            addScope ("Project", CSMWorld::Scope_Project,
+            addScope("Project", CSMWorld::Scope_Project,
                 "Record will be stored in a local project file.<p>"
                 "Record will be created in the reserved namespace \"project\".<p>"
                 "Record is available when running OpenMW via OpenCS.");
 
         if (mScopes & CSMWorld::Scope_Session)
-            addScope ("Session", CSMWorld::Scope_Session,
+            addScope("Session", CSMWorld::Scope_Session,
                 "Record exists only for the duration of the current editing session.<p>"
                 "Record will be created in the reserved namespace \"session\".<p>"
                 "Record is not available when running OpenMW via OpenCS.");
 
-        connect (mScope, qOverload<int>(&QComboBox::currentIndexChanged),
-            this, &GenericCreator::scopeChanged);
+        connect(mScope, qOverload<int>(&QComboBox::currentIndexChanged), this, &GenericCreator::scopeChanged);
 
-        mScopeLabel = new QLabel ("Scope", this);
-        insertAtBeginning (mScopeLabel, false);
+        mScopeLabel = new QLabel("Scope", this);
+        insertAtBeginning(mScopeLabel, false);
 
-        mScope->setCurrentIndex (0);
+        mScope->setCurrentIndex(0);
     }
     else
     {
@@ -337,7 +337,7 @@ void CSVWorld::GenericCreator::setScope (unsigned int scope)
     updateNamespace();
 }
 
-void CSVWorld::GenericCreator::scopeChanged (int index)
+void CSVWorld::GenericCreator::scopeChanged(int index)
 {
     update();
     updateNamespace();
diff --git a/apps/opencs/view/world/genericcreator.hpp b/apps/opencs/view/world/genericcreator.hpp
index 9d394b9d13..5423bb96c5 100644
--- a/apps/opencs/view/world/genericcreator.hpp
+++ b/apps/opencs/view/world/genericcreator.hpp
@@ -27,111 +27,105 @@ namespace CSVWorld
 
     class GenericCreator : public Creator
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            CSMWorld::Data& mData;
-            QUndoStack& mUndoStack;
-            CSMWorld::UniversalId mListId;
-            QPushButton *mCreate;
-            QPushButton *mCancel;
-            QLineEdit *mId;
-            std::string mErrors;
-            QHBoxLayout *mLayout;
-            bool mLocked;
-            std::string mClonedId;
-            CSMWorld::UniversalId::Type mClonedType;
-            unsigned int mScopes;
-            QComboBox *mScope;
-            QLabel *mScopeLabel;
-            IdValidator *mValidator;
+        CSMWorld::Data& mData;
+        QUndoStack& mUndoStack;
+        CSMWorld::UniversalId mListId;
+        QPushButton* mCreate;
+        QPushButton* mCancel;
+        QLineEdit* mId;
+        std::string mErrors;
+        QHBoxLayout* mLayout;
+        bool mLocked;
+        std::string mClonedId;
+        CSMWorld::UniversalId::Type mClonedType;
+        unsigned int mScopes;
+        QComboBox* mScope;
+        QLabel* mScopeLabel;
+        IdValidator* mValidator;
 
-        protected:
-            bool mCloneMode;
+    protected:
+        bool mCloneMode;
 
-        protected:
+    protected:
+        void update();
 
-            void update();
+        virtual void setManualEditing(bool enabled);
+        ///< Enable/disable manual ID editing (enabled by default).
 
-            virtual void setManualEditing (bool enabled);
-            ///< Enable/disable manual ID editing (enabled by default).
+        void insertAtBeginning(QWidget* widget, bool stretched);
 
-            void insertAtBeginning (QWidget *widget, bool stretched);
+        /// \brief Insert given widget before Create and Cancel buttons.
+        /// \param widget Widget to add to layout.
+        /// \param stretched Whether widget should be streched or not.
+        void insertBeforeButtons(QWidget* widget, bool stretched);
 
-            /// \brief Insert given widget before Create and Cancel buttons.
-            /// \param widget Widget to add to layout.
-            /// \param stretched Whether widget should be streched or not.
-            void insertBeforeButtons (QWidget *widget, bool stretched);
+        virtual std::string getId() const;
 
-            virtual std::string getId() const;
+        std::string getClonedId() const;
 
-            std::string getClonedId() const;
+        virtual std::string getIdValidatorResult() const;
 
-            virtual std::string getIdValidatorResult() const;
+        /// Allow subclasses to add additional data to \a command.
+        virtual void configureCreateCommand(CSMWorld::CreateCommand& command) const;
 
-            /// Allow subclasses to add additional data to \a command.
-            virtual void configureCreateCommand (CSMWorld::CreateCommand& command) const;
+        /// Allow subclasses to wrap the create command together with additional commands
+        /// into a macro.
+        virtual void pushCommand(std::unique_ptr<CSMWorld::CreateCommand> command, const std::string& id);
 
-            /// Allow subclasses to wrap the create command together with additional commands
-            /// into a macro.
-            virtual void pushCommand (std::unique_ptr<CSMWorld::CreateCommand> command,
-                const std::string& id);
+        CSMWorld::Data& getData() const;
 
-            CSMWorld::Data& getData() const;
+        QUndoStack& getUndoStack();
 
-            QUndoStack& getUndoStack();
+        const CSMWorld::UniversalId& getCollectionId() const;
 
-            const CSMWorld::UniversalId& getCollectionId() const;
+        std::string getNamespace() const;
 
-            std::string getNamespace() const;
+        void setEditorMaxLength(int length);
 
-            void setEditorMaxLength(int length);
+    private:
+        void updateNamespace();
 
-        private:
+        void addScope(const QString& name, CSMWorld::Scope scope, const QString& tooltip);
 
-            void updateNamespace();
+    public:
+        GenericCreator(
+            CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id, bool relaxedIdRules = false);
 
-            void addScope (const QString& name, CSMWorld::Scope scope,
-                const QString& tooltip);
+        void setEditLock(bool locked) override;
 
-        public:
+        void reset() override;
 
-            GenericCreator (CSMWorld::Data& data, QUndoStack& undoStack,
-                const CSMWorld::UniversalId& id, bool relaxedIdRules = false);
+        void toggleWidgets(bool active = true) override;
 
-            void setEditLock (bool locked) override;
+        void cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type) override;
 
-            void reset() override;
+        void touch(const std::vector<CSMWorld::UniversalId>& ids) override;
 
-            void toggleWidgets (bool active = true) override;
+        virtual std::string getErrors() const;
+        ///< Return formatted error descriptions for the current state of the creator. if an empty
+        /// string is returned, there is no error.
 
-            void cloneMode(const std::string& originId,
-                                   const CSMWorld::UniversalId::Type type) override;
+        void setScope(unsigned int scope) override;
 
-            void touch(const std::vector<CSMWorld::UniversalId>& ids) override;
+        /// Focus main input widget
+        void focus() override;
 
-            virtual std::string getErrors() const;
-            ///< Return formatted error descriptions for the current state of the creator. if an empty
-            /// string is returned, there is no error.
+    protected slots:
 
-            void setScope (unsigned int scope) override;
+        /// \brief Create record if able to after Return key is pressed on input.
+        void inputReturnPressed();
 
-            /// Focus main input widget
-            void focus() override;
+    private slots:
 
-        protected slots:
+        void textChanged(const QString& text);
 
-            /// \brief Create record if able to after Return key is pressed on input.
-            void inputReturnPressed();
+        void create();
 
-        private slots:
+        void scopeChanged(int index);
 
-            void textChanged (const QString& text);
-
-            void create();
-
-            void scopeChanged (int index);
-
-            void dataIdListChanged();
+        void dataIdListChanged();
     };
 }
 
diff --git a/apps/opencs/view/world/globalcreator.cpp b/apps/opencs/view/world/globalcreator.cpp
index 6c5b75fb56..df4ac31c26 100644
--- a/apps/opencs/view/world/globalcreator.cpp
+++ b/apps/opencs/view/world/globalcreator.cpp
@@ -7,7 +7,7 @@
 
 namespace CSVWorld
 {
-    void GlobalCreator::configureCreateCommand (CSMWorld::CreateCommand& command) const
+    void GlobalCreator::configureCreateCommand(CSMWorld::CreateCommand& command) const
     {
         CSMWorld::IdTable* table = static_cast<CSMWorld::IdTable*>(getData().getTableModel(getCollectionId()));
 
@@ -18,7 +18,7 @@ namespace CSVWorld
     }
 
     GlobalCreator::GlobalCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id)
-        : GenericCreator (data, undoStack, id, true)
+        : GenericCreator(data, undoStack, id, true)
     {
     }
 }
diff --git a/apps/opencs/view/world/globalcreator.hpp b/apps/opencs/view/world/globalcreator.hpp
index 057798a4c2..09100d8cc8 100644
--- a/apps/opencs/view/world/globalcreator.hpp
+++ b/apps/opencs/view/world/globalcreator.hpp
@@ -7,15 +7,13 @@ namespace CSVWorld
 {
     class GlobalCreator : public GenericCreator
     {
-            Q_OBJECT
+        Q_OBJECT
 
-        public:
+    public:
+        GlobalCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id);
 
-            GlobalCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id);
-
-        protected:
-
-            void configureCreateCommand(CSMWorld::CreateCommand& command) const override;
+    protected:
+        void configureCreateCommand(CSMWorld::CreateCommand& command) const override;
     };
 }
 
diff --git a/apps/opencs/view/world/idcompletiondelegate.cpp b/apps/opencs/view/world/idcompletiondelegate.cpp
index 9ef04ec3ab..a4171241a7 100644
--- a/apps/opencs/view/world/idcompletiondelegate.cpp
+++ b/apps/opencs/view/world/idcompletiondelegate.cpp
@@ -5,23 +5,20 @@
 
 #include "../widget/droplineedit.hpp"
 
-CSVWorld::IdCompletionDelegate::IdCompletionDelegate(CSMWorld::CommandDispatcher *dispatcher,
-                                                     CSMDoc::Document& document,
-                                                     QObject *parent)
+CSVWorld::IdCompletionDelegate::IdCompletionDelegate(
+    CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent)
     : CommandDelegate(dispatcher, document, parent)
-{}
+{
+}
 
-QWidget *CSVWorld::IdCompletionDelegate::createEditor(QWidget *parent,
-                                                      const QStyleOptionViewItem &option,
-                                                      const QModelIndex &index) const
+QWidget* CSVWorld::IdCompletionDelegate::createEditor(
+    QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
     return createEditor(parent, option, index, getDisplayTypeFromIndex(index));
 }
 
-QWidget *CSVWorld::IdCompletionDelegate::createEditor(QWidget *parent,
-                                                      const QStyleOptionViewItem &option,
-                                                      const QModelIndex &index,
-                                                      CSMWorld::ColumnBase::Display display) const
+QWidget* CSVWorld::IdCompletionDelegate::createEditor(QWidget* parent, const QStyleOptionViewItem& option,
+    const QModelIndex& index, CSMWorld::ColumnBase::Display display) const
 {
     if (!index.data(Qt::EditRole).isValid() && !index.data(Qt::DisplayRole).isValid())
     {
@@ -38,72 +35,70 @@ QWidget *CSVWorld::IdCompletionDelegate::createEditor(QWidget *parent,
         {
             case CSMWorld::ConstInfoSelectWrapper::Function_Global:
             {
-                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_GlobalVariable);
+                return createEditor(parent, option, index, CSMWorld::ColumnBase::Display_GlobalVariable);
             }
             case CSMWorld::ConstInfoSelectWrapper::Function_Journal:
             {
-                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Journal);
+                return createEditor(parent, option, index, CSMWorld::ColumnBase::Display_Journal);
             }
             case CSMWorld::ConstInfoSelectWrapper::Function_Item:
             {
-                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Referenceable);
+                return createEditor(parent, option, index, CSMWorld::ColumnBase::Display_Referenceable);
             }
             case CSMWorld::ConstInfoSelectWrapper::Function_Dead:
             case CSMWorld::ConstInfoSelectWrapper::Function_NotId:
             {
-                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Referenceable);
+                return createEditor(parent, option, index, CSMWorld::ColumnBase::Display_Referenceable);
             }
             case CSMWorld::ConstInfoSelectWrapper::Function_NotFaction:
             {
-                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Faction);
+                return createEditor(parent, option, index, CSMWorld::ColumnBase::Display_Faction);
             }
             case CSMWorld::ConstInfoSelectWrapper::Function_NotClass:
             {
-                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Class);
+                return createEditor(parent, option, index, CSMWorld::ColumnBase::Display_Class);
             }
             case CSMWorld::ConstInfoSelectWrapper::Function_NotRace:
             {
-                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Race);
+                return createEditor(parent, option, index, CSMWorld::ColumnBase::Display_Race);
             }
             case CSMWorld::ConstInfoSelectWrapper::Function_NotCell:
             {
-                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Cell);
+                return createEditor(parent, option, index, CSMWorld::ColumnBase::Display_Cell);
             }
             case CSMWorld::ConstInfoSelectWrapper::Function_Local:
             case CSMWorld::ConstInfoSelectWrapper::Function_NotLocal:
             {
                 return new CSVWidget::DropLineEdit(display, parent);
             }
-            default: return nullptr; // The rest of them can't be edited anyway
+            default:
+                return nullptr; // The rest of them can't be edited anyway
         }
     }
 
-    CSMWorld::IdCompletionManager &completionManager = getDocument().getIdCompletionManager();
-    CSVWidget::DropLineEdit *editor = new CSVWidget::DropLineEdit(display, parent);
+    CSMWorld::IdCompletionManager& completionManager = getDocument().getIdCompletionManager();
+    CSVWidget::DropLineEdit* editor = new CSVWidget::DropLineEdit(display, parent);
     editor->setCompleter(completionManager.getCompleter(display).get());
 
     // The savegame format limits the player faction string to 32 characters.
     // The region sound name is limited to 32 characters. (ESM::Region::SoundRef::mSound)
     // The script name is limited to 32 characters. (ESM::Script::SCHD::mName)
     // The cell name is limited to 64 characters. (ESM::Header::GMDT::mCurrentCell)
-    if (display == CSMWorld::ColumnBase::Display_Faction ||
-        display == CSMWorld::ColumnBase::Display_Sound ||
-        display == CSMWorld::ColumnBase::Display_Script ||
-        display == CSMWorld::ColumnBase::Display_Referenceable)
+    if (display == CSMWorld::ColumnBase::Display_Faction || display == CSMWorld::ColumnBase::Display_Sound
+        || display == CSMWorld::ColumnBase::Display_Script || display == CSMWorld::ColumnBase::Display_Referenceable)
     {
-        editor->setMaxLength (32);
+        editor->setMaxLength(32);
     }
     else if (display == CSMWorld::ColumnBase::Display_Cell)
     {
-        editor->setMaxLength (64);
+        editor->setMaxLength(64);
     }
 
     return editor;
 }
 
-CSVWorld::CommandDelegate *CSVWorld::IdCompletionDelegateFactory::makeDelegate(CSMWorld::CommandDispatcher *dispatcher,
-                                                                               CSMDoc::Document& document, 
-                                                                               QObject *parent) const
+CSVWorld::CommandDelegate* CSVWorld::IdCompletionDelegateFactory::makeDelegate(
+    CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent) const
 {
     return new IdCompletionDelegate(dispatcher, document, parent);
 }
diff --git a/apps/opencs/view/world/idcompletiondelegate.hpp b/apps/opencs/view/world/idcompletiondelegate.hpp
index 57c2c11c43..680a9bd3f2 100644
--- a/apps/opencs/view/world/idcompletiondelegate.hpp
+++ b/apps/opencs/view/world/idcompletiondelegate.hpp
@@ -8,28 +8,22 @@ namespace CSVWorld
     /// \brief Enables the Id completion for a column
     class IdCompletionDelegate : public CommandDelegate
     {
-        public:
-            IdCompletionDelegate(CSMWorld::CommandDispatcher *dispatcher, 
-                                 CSMDoc::Document& document, 
-                                 QObject *parent);
+    public:
+        IdCompletionDelegate(CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent);
 
-            QWidget *createEditor (QWidget *parent,
-                                           const QStyleOptionViewItem &option,
-                                           const QModelIndex &index) const override;
+        QWidget* createEditor(
+            QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
 
-            QWidget *createEditor (QWidget *parent,
-                                           const QStyleOptionViewItem &option,
-                                           const QModelIndex &index,
-                                           CSMWorld::ColumnBase::Display display) const override;
+        QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index,
+            CSMWorld::ColumnBase::Display display) const override;
     };
 
     class IdCompletionDelegateFactory : public CommandDelegateFactory
     {
-        public:
-            CommandDelegate *makeDelegate(CSMWorld::CommandDispatcher *dispatcher, 
-                                                  CSMDoc::Document& document, 
-                                                  QObject *parent) const override;
-            ///< The ownership of the returned CommandDelegate is transferred to the caller.
+    public:
+        CommandDelegate* makeDelegate(
+            CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent) const override;
+        ///< The ownership of the returned CommandDelegate is transferred to the caller.
     };
 }
 
diff --git a/apps/opencs/view/world/idtypedelegate.cpp b/apps/opencs/view/world/idtypedelegate.cpp
index ee35e07d41..1a84b8c573 100755
--- a/apps/opencs/view/world/idtypedelegate.cpp
+++ b/apps/opencs/view/world/idtypedelegate.cpp
@@ -2,26 +2,25 @@
 
 #include "../../model/world/universalid.hpp"
 
-CSVWorld::IdTypeDelegate::IdTypeDelegate
-    (const ValueList &values, const IconList &icons, CSMWorld::CommandDispatcher *dispatcher, CSMDoc::Document& document, QObject *parent)
-    : DataDisplayDelegate (values, icons, dispatcher, document,
-                           "Records", "type-format",
-                           parent)
-{}
+CSVWorld::IdTypeDelegate::IdTypeDelegate(const ValueList& values, const IconList& icons,
+    CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent)
+    : DataDisplayDelegate(values, icons, dispatcher, document, "Records", "type-format", parent)
+{
+}
 
 CSVWorld::IdTypeDelegateFactory::IdTypeDelegateFactory()
 {
-    for (int i=0; i<CSMWorld::UniversalId::NumberOfTypes; ++i)
+    for (int i = 0; i < CSMWorld::UniversalId::NumberOfTypes; ++i)
     {
-        CSMWorld::UniversalId id (static_cast<CSMWorld::UniversalId::Type> (i));
+        CSMWorld::UniversalId id(static_cast<CSMWorld::UniversalId::Type>(i));
 
-        DataDisplayDelegateFactory::add (id.getType(), QString::fromUtf8 (id.getTypeName().c_str()),
-            QString::fromUtf8 (id.getIcon().c_str()));
+        DataDisplayDelegateFactory::add(
+            id.getType(), QString::fromUtf8(id.getTypeName().c_str()), QString::fromUtf8(id.getIcon().c_str()));
     }
 }
 
-CSVWorld::CommandDelegate *CSVWorld::IdTypeDelegateFactory::makeDelegate (
-    CSMWorld::CommandDispatcher *dispatcher, CSMDoc::Document& document, QObject *parent) const
+CSVWorld::CommandDelegate* CSVWorld::IdTypeDelegateFactory::makeDelegate(
+    CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent) const
 {
-    return new IdTypeDelegate (mValues, mIcons, dispatcher, document, parent);
+    return new IdTypeDelegate(mValues, mIcons, dispatcher, document, parent);
 }
diff --git a/apps/opencs/view/world/idtypedelegate.hpp b/apps/opencs/view/world/idtypedelegate.hpp
index 3371ce42c0..db7fb46b5c 100755
--- a/apps/opencs/view/world/idtypedelegate.hpp
+++ b/apps/opencs/view/world/idtypedelegate.hpp
@@ -1,25 +1,26 @@
 #ifndef IDTYPEDELEGATE_HPP
 #define IDTYPEDELEGATE_HPP
 
-#include "util.hpp"
 #include "datadisplaydelegate.hpp"
+#include "util.hpp"
 
 namespace CSVWorld
 {
     class IdTypeDelegate : public DataDisplayDelegate
     {
-        public:
-            IdTypeDelegate (const ValueList &mValues, const IconList &icons, CSMWorld::CommandDispatcher *dispatcher, CSMDoc::Document& document, QObject *parent);
+    public:
+        IdTypeDelegate(const ValueList& mValues, const IconList& icons, CSMWorld::CommandDispatcher* dispatcher,
+            CSMDoc::Document& document, QObject* parent);
     };
 
     class IdTypeDelegateFactory : public DataDisplayDelegateFactory
     {
-        public:
-
-            IdTypeDelegateFactory();
+    public:
+        IdTypeDelegateFactory();
 
-            CommandDelegate *makeDelegate (CSMWorld::CommandDispatcher *dispatcher, CSMDoc::Document& document, QObject *parent) const override;
-            ///< The ownership of the returned CommandDelegate is transferred to the caller.
+        CommandDelegate* makeDelegate(
+            CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent) const override;
+        ///< The ownership of the returned CommandDelegate is transferred to the caller.
     };
 }
 
diff --git a/apps/opencs/view/world/idvalidator.cpp b/apps/opencs/view/world/idvalidator.cpp
index efba4c5af9..6f790d20cb 100644
--- a/apps/opencs/view/world/idvalidator.cpp
+++ b/apps/opencs/view/world/idvalidator.cpp
@@ -2,28 +2,30 @@
 
 #include <components/misc/strings/lower.hpp>
 
-bool CSVWorld::IdValidator::isValid (const QChar& c, bool first) const
+bool CSVWorld::IdValidator::isValid(const QChar& c, bool first) const
 {
-    if (c.isLetter() || c=='_')
+    if (c.isLetter() || c == '_')
         return true;
 
-    if (!first && (c.isDigit()  || c.isSpace()))
+    if (!first && (c.isDigit() || c.isSpace()))
         return true;
 
     return false;
 }
 
-CSVWorld::IdValidator::IdValidator (bool relaxed, QObject *parent)
-: QValidator (parent), mRelaxed (relaxed)
-{}
+CSVWorld::IdValidator::IdValidator(bool relaxed, QObject* parent)
+    : QValidator(parent)
+    , mRelaxed(relaxed)
+{
+}
 
-QValidator::State CSVWorld::IdValidator::validate (QString& input, int& pos) const
+QValidator::State CSVWorld::IdValidator::validate(QString& input, int& pos) const
 {
     mError.clear();
 
     if (mRelaxed)
     {
-        if (input.indexOf ('"')!=-1 || input.indexOf ("::")!=-1 || input.indexOf ("#")!=-1)
+        if (input.indexOf('"') != -1 || input.indexOf("::") != -1 || input.indexOf("#") != -1)
             return QValidator::Invalid;
     }
     else
@@ -42,9 +44,9 @@ QValidator::State CSVWorld::IdValidator::validate (QString& input, int& pos) con
 
         if (!mNamespace.empty())
         {
-            std::string namespace_ = input.left (static_cast<int>(mNamespace.size())).toUtf8().constData();
+            std::string namespace_ = input.left(static_cast<int>(mNamespace.size())).toUtf8().constData();
 
-            if (Misc::StringUtils::lowerCase (namespace_)!=mNamespace)
+            if (Misc::StringUtils::lowerCase(namespace_) != mNamespace)
                 return QValidator::Invalid; // incorrect namespace
 
             iter += namespace_.size();
@@ -53,20 +55,20 @@ QValidator::State CSVWorld::IdValidator::validate (QString& input, int& pos) con
         }
         else
         {
-            int index = input.indexOf (":");
+            int index = input.indexOf(":");
 
-            if (index!=-1)
+            if (index != -1)
             {
-                QString namespace_ = input.left (index);
+                QString namespace_ = input.left(index);
 
-                if (namespace_=="project" || namespace_=="session")
+                if (namespace_ == "project" || namespace_ == "session")
                     return QValidator::Invalid; // reserved namespace
             }
         }
 
-        for (; iter!=input.end(); ++iter, first = false)
+        for (; iter != input.end(); ++iter, first = false)
         {
-            if (*iter==':')
+            if (*iter == ':')
             {
                 if (first)
                     return QValidator::Invalid; // scope operator at the beginning
@@ -90,7 +92,7 @@ QValidator::State CSVWorld::IdValidator::validate (QString& input, int& pos) con
             {
                 prevScope = false;
 
-                if (!isValid (*iter, first))
+                if (!isValid(*iter, first))
                     return QValidator::Invalid;
             }
         }
@@ -111,9 +113,9 @@ QValidator::State CSVWorld::IdValidator::validate (QString& input, int& pos) con
     return QValidator::Acceptable;
 }
 
-void CSVWorld::IdValidator::setNamespace (const std::string& namespace_)
+void CSVWorld::IdValidator::setNamespace(const std::string& namespace_)
 {
-    mNamespace = Misc::StringUtils::lowerCase (namespace_);
+    mNamespace = Misc::StringUtils::lowerCase(namespace_);
 }
 
 std::string CSVWorld::IdValidator::getError() const
diff --git a/apps/opencs/view/world/idvalidator.hpp b/apps/opencs/view/world/idvalidator.hpp
index 278335a65b..e831542961 100644
--- a/apps/opencs/view/world/idvalidator.hpp
+++ b/apps/opencs/view/world/idvalidator.hpp
@@ -9,29 +9,26 @@ namespace CSVWorld
 {
     class IdValidator : public QValidator
     {
-            bool mRelaxed;
-            std::string mNamespace;
-            mutable std::string mError;
+        bool mRelaxed;
+        std::string mNamespace;
+        mutable std::string mError;
 
-        private:
+    private:
+        bool isValid(const QChar& c, bool first) const;
 
-            bool isValid (const QChar& c, bool first) const;
+    public:
+        IdValidator(bool relaxed = false, QObject* parent = nullptr);
+        ///< \param relaxed Relaxed rules for IDs that also functino as user visible text
 
-        public:
+        State validate(QString& input, int& pos) const override;
 
-            IdValidator (bool relaxed = false, QObject *parent = nullptr);
-            ///< \param relaxed Relaxed rules for IDs that also functino as user visible text
-
-            State validate (QString& input, int& pos) const override;
-
-            void setNamespace (const std::string& namespace_);
-
-            /// Return a description of the error that resulted in the last call of validate
-            /// returning QValidator::Intermediate. If the last call to validate returned
-            /// a different value (or if there was no such call yet), an empty string is
-            /// returned.
-            std::string getError() const;
+        void setNamespace(const std::string& namespace_);
 
+        /// Return a description of the error that resulted in the last call of validate
+        /// returning QValidator::Intermediate. If the last call to validate returned
+        /// a different value (or if there was no such call yet), an empty string is
+        /// returned.
+        std::string getError() const;
     };
 }
 
diff --git a/apps/opencs/view/world/infocreator.cpp b/apps/opencs/view/world/infocreator.cpp
index 805e4111b9..b7d467e2f2 100644
--- a/apps/opencs/view/world/infocreator.cpp
+++ b/apps/opencs/view/world/infocreator.cpp
@@ -9,40 +9,40 @@
 
 #include "../../model/doc/document.hpp"
 
-#include "../../model/world/data.hpp"
-#include "../../model/world/commands.hpp"
 #include "../../model/world/columns.hpp"
-#include "../../model/world/idtable.hpp"
+#include "../../model/world/commands.hpp"
+#include "../../model/world/data.hpp"
 #include "../../model/world/idcompletionmanager.hpp"
+#include "../../model/world/idtable.hpp"
 
 #include "../widget/droplineedit.hpp"
 
 std::string CSVWorld::InfoCreator::getId() const
 {
-    std::string id = Misc::StringUtils::lowerCase (mTopic->text().toUtf8().constData());
+    std::string id = Misc::StringUtils::lowerCase(mTopic->text().toUtf8().constData());
 
     std::string unique = QUuid::createUuid().toByteArray().data();
 
-    unique.erase (std::remove (unique.begin(), unique.end(), '-'), unique.end());
+    unique.erase(std::remove(unique.begin(), unique.end(), '-'), unique.end());
 
-    unique = unique.substr (1, unique.size()-2);
+    unique = unique.substr(1, unique.size() - 2);
 
     return id + '#' + unique;
 }
 
-void CSVWorld::InfoCreator::configureCreateCommand (CSMWorld::CreateCommand& command) const
+void CSVWorld::InfoCreator::configureCreateCommand(CSMWorld::CreateCommand& command) const
 {
-    CSMWorld::IdTable& table = dynamic_cast<CSMWorld::IdTable&> (*getData().getTableModel (getCollectionId()));
+    CSMWorld::IdTable& table = dynamic_cast<CSMWorld::IdTable&>(*getData().getTableModel(getCollectionId()));
 
-    CSMWorld::CloneCommand* cloneCommand = dynamic_cast<CSMWorld::CloneCommand*> (&command);
+    CSMWorld::CloneCommand* cloneCommand = dynamic_cast<CSMWorld::CloneCommand*>(&command);
     if (getCollectionId() == CSMWorld::UniversalId::Type_TopicInfos)
     {
         if (!cloneCommand)
         {
-            command.addValue (table.findColumnIndex(CSMWorld::Columns::ColumnId_Topic), mTopic->text());
-            command.addValue (table.findColumnIndex(CSMWorld::Columns::ColumnId_Rank), -1);
-            command.addValue (table.findColumnIndex(CSMWorld::Columns::ColumnId_Gender), -1);
-            command.addValue (table.findColumnIndex(CSMWorld::Columns::ColumnId_PcRank), -1);
+            command.addValue(table.findColumnIndex(CSMWorld::Columns::ColumnId_Topic), mTopic->text());
+            command.addValue(table.findColumnIndex(CSMWorld::Columns::ColumnId_Rank), -1);
+            command.addValue(table.findColumnIndex(CSMWorld::Columns::ColumnId_Gender), -1);
+            command.addValue(table.findColumnIndex(CSMWorld::Columns::ColumnId_PcRank), -1);
         }
         else
         {
@@ -53,16 +53,16 @@ void CSVWorld::InfoCreator::configureCreateCommand (CSMWorld::CreateCommand& com
     {
         if (!cloneCommand)
         {
-            command.addValue (table.findColumnIndex(CSMWorld::Columns::ColumnId_Journal), mTopic->text());
+            command.addValue(table.findColumnIndex(CSMWorld::Columns::ColumnId_Journal), mTopic->text());
         }
         else
             cloneCommand->setOverrideValue(table.findColumnIndex(CSMWorld::Columns::ColumnId_Journal), mTopic->text());
     }
 }
 
-CSVWorld::InfoCreator::InfoCreator (CSMWorld::Data& data, QUndoStack& undoStack,
-    const CSMWorld::UniversalId& id, CSMWorld::IdCompletionManager& completionManager)
-: GenericCreator (data, undoStack, id)
+CSVWorld::InfoCreator::InfoCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id,
+    CSMWorld::IdCompletionManager& completionManager)
+    : GenericCreator(data, undoStack, id)
 {
     // Determine if we're dealing with topics or journals.
     CSMWorld::ColumnBase::Display displayType = CSMWorld::ColumnBase::Display_Topic;
@@ -73,40 +73,37 @@ CSVWorld::InfoCreator::InfoCreator (CSMWorld::Data& data, QUndoStack& undoStack,
         labelText = "Journal";
     }
 
-    QLabel *label = new QLabel (labelText, this);
-    insertBeforeButtons (label, false);
+    QLabel* label = new QLabel(labelText, this);
+    insertBeforeButtons(label, false);
 
     // Add topic/journal ID input with auto-completion.
     // Only existing topic/journal IDs are accepted so no ID validation is performed.
     mTopic = new CSVWidget::DropLineEdit(displayType, this);
     mTopic->setCompleter(completionManager.getCompleter(displayType).get());
-    insertBeforeButtons (mTopic, true);
+    insertBeforeButtons(mTopic, true);
 
-    setManualEditing (false);
+    setManualEditing(false);
 
-    connect (mTopic, &CSVWidget::DropLineEdit::textChanged, this, &InfoCreator::topicChanged);
-    connect (mTopic, &CSVWidget::DropLineEdit::returnPressed, this, &InfoCreator::inputReturnPressed);
+    connect(mTopic, &CSVWidget::DropLineEdit::textChanged, this, &InfoCreator::topicChanged);
+    connect(mTopic, &CSVWidget::DropLineEdit::returnPressed, this, &InfoCreator::inputReturnPressed);
 }
 
-void CSVWorld::InfoCreator::cloneMode (const std::string& originId,
-    const CSMWorld::UniversalId::Type type)
+void CSVWorld::InfoCreator::cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type)
 {
-    CSMWorld::IdTable& infoTable =
-        dynamic_cast<CSMWorld::IdTable&> (*getData().getTableModel (getCollectionId()));
+    CSMWorld::IdTable& infoTable = dynamic_cast<CSMWorld::IdTable&>(*getData().getTableModel(getCollectionId()));
 
-    int topicColumn = infoTable.findColumnIndex (
-        getCollectionId().getType()==CSMWorld::UniversalId::Type_TopicInfos ?
-        CSMWorld::Columns::ColumnId_Topic : CSMWorld::Columns::ColumnId_Journal);
+    int topicColumn = infoTable.findColumnIndex(getCollectionId().getType() == CSMWorld::UniversalId::Type_TopicInfos
+            ? CSMWorld::Columns::ColumnId_Topic
+            : CSMWorld::Columns::ColumnId_Journal);
 
-    mTopic->setText (
-        infoTable.data (infoTable.getModelIndex (originId, topicColumn)).toString());
+    mTopic->setText(infoTable.data(infoTable.getModelIndex(originId, topicColumn)).toString());
 
-    GenericCreator::cloneMode (originId, type);
+    GenericCreator::cloneMode(originId, type);
 }
 
 void CSVWorld::InfoCreator::reset()
 {
-    mTopic->setText ("");
+    mTopic->setText("");
     GenericCreator::reset();
 }
 
@@ -117,8 +114,10 @@ std::string CSVWorld::InfoCreator::getErrors() const
 
     std::string topic = mTopic->text().toUtf8().constData();
 
-    if ((getCollectionId().getType()==CSMWorld::UniversalId::Type_TopicInfos ?
-        getData().getTopics() : getData().getJournals()).searchId (topic)==-1)
+    if ((getCollectionId().getType() == CSMWorld::UniversalId::Type_TopicInfos ? getData().getTopics()
+                                                                               : getData().getJournals())
+            .searchId(topic)
+        == -1)
     {
         errors += "Invalid Topic ID";
     }
@@ -136,11 +135,8 @@ void CSVWorld::InfoCreator::topicChanged()
     update();
 }
 
-CSVWorld::Creator *CSVWorld::InfoCreatorFactory::makeCreator(CSMDoc::Document& document,
-                                                             const CSMWorld::UniversalId& id) const
+CSVWorld::Creator* CSVWorld::InfoCreatorFactory::makeCreator(
+    CSMDoc::Document& document, const CSMWorld::UniversalId& id) const
 {
-    return new InfoCreator(document.getData(),
-                           document.getUndoStack(),
-                           id,
-                           document.getIdCompletionManager());
+    return new InfoCreator(document.getData(), document.getUndoStack(), id, document.getIdCompletionManager());
 }
diff --git a/apps/opencs/view/world/infocreator.hpp b/apps/opencs/view/world/infocreator.hpp
index 404dcf3727..5288ddbd1b 100644
--- a/apps/opencs/view/world/infocreator.hpp
+++ b/apps/opencs/view/world/infocreator.hpp
@@ -18,42 +18,39 @@ namespace CSVWorld
 {
     class InfoCreator : public GenericCreator
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            CSVWidget::DropLineEdit *mTopic;
+        CSVWidget::DropLineEdit* mTopic;
 
-            std::string getId() const override;
+        std::string getId() const override;
 
-            void configureCreateCommand (CSMWorld::CreateCommand& command) const override;
+        void configureCreateCommand(CSMWorld::CreateCommand& command) const override;
 
-        public:
+    public:
+        InfoCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id,
+            CSMWorld::IdCompletionManager& completionManager);
 
-            InfoCreator (CSMWorld::Data& data, QUndoStack& undoStack,
-                const CSMWorld::UniversalId& id, CSMWorld::IdCompletionManager& completionManager);
+        void cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type) override;
 
-            void cloneMode (const std::string& originId,
-                const CSMWorld::UniversalId::Type type) override;
+        void reset() override;
 
-            void reset() override;
+        std::string getErrors() const override;
+        ///< Return formatted error descriptions for the current state of the creator. if an empty
+        /// string is returned, there is no error.
 
-            std::string getErrors() const override;
-            ///< Return formatted error descriptions for the current state of the creator. if an empty
-            /// string is returned, there is no error.
-            
-            /// Focus main input widget
-            void focus() override;
-            
-        private slots:
+        /// Focus main input widget
+        void focus() override;
 
-            void topicChanged();
+    private slots:
+
+        void topicChanged();
     };
 
     class InfoCreatorFactory : public CreatorFactoryBase
     {
-        public:
-
-            Creator *makeCreator (CSMDoc::Document& document, const CSMWorld::UniversalId& id) const override;
-            ///< The ownership of the returned Creator is transferred to the caller.
+    public:
+        Creator* makeCreator(CSMDoc::Document& document, const CSMWorld::UniversalId& id) const override;
+        ///< The ownership of the returned Creator is transferred to the caller.
     };
 }
 
diff --git a/apps/opencs/view/world/landcreator.cpp b/apps/opencs/view/world/landcreator.cpp
index 8d98f1b0a6..b229966ac7 100644
--- a/apps/opencs/view/world/landcreator.cpp
+++ b/apps/opencs/view/world/landcreator.cpp
@@ -37,8 +37,8 @@ namespace CSVWorld
         insertBeforeButtons(mYLabel, false);
         insertBeforeButtons(mY, true);
 
-        connect (mX, qOverload<int>(&QSpinBox::valueChanged), this, &LandCreator::coordChanged);
-        connect (mY, qOverload<int>(&QSpinBox::valueChanged), this, &LandCreator::coordChanged);
+        connect(mX, qOverload<int>(&QSpinBox::valueChanged), this, &LandCreator::coordChanged);
+        connect(mY, qOverload<int>(&QSpinBox::valueChanged), this, &LandCreator::coordChanged);
     }
 
     void LandCreator::cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type)
@@ -57,8 +57,10 @@ namespace CSVWorld
         // Combine multiple touch commands into one "macro" command
         getUndoStack().beginMacro("Touch records");
 
-        CSMWorld::IdTable& lands = dynamic_cast<CSMWorld::IdTable&>(*getData().getTableModel(CSMWorld::UniversalId::Type_Lands));
-        CSMWorld::IdTable& ltexs = dynamic_cast<CSMWorld::IdTable&>(*getData().getTableModel(CSMWorld::UniversalId::Type_LandTextures));
+        CSMWorld::IdTable& lands
+            = dynamic_cast<CSMWorld::IdTable&>(*getData().getTableModel(CSMWorld::UniversalId::Type_Lands));
+        CSMWorld::IdTable& ltexs
+            = dynamic_cast<CSMWorld::IdTable&>(*getData().getTableModel(CSMWorld::UniversalId::Type_LandTextures));
         for (const CSMWorld::UniversalId& uid : ids)
         {
             CSMWorld::TouchLandCommand* touchCmd = new CSMWorld::TouchLandCommand(lands, ltexs, uid.getId());
@@ -98,19 +100,22 @@ namespace CSVWorld
     {
         if (mCloneMode)
         {
-            CSMWorld::IdTable& lands = dynamic_cast<CSMWorld::IdTable&>(*getData().getTableModel(CSMWorld::UniversalId::Type_Lands));
-            CSMWorld::IdTable& ltexs = dynamic_cast<CSMWorld::IdTable&>(*getData().getTableModel(CSMWorld::UniversalId::Type_LandTextures));
+            CSMWorld::IdTable& lands
+                = dynamic_cast<CSMWorld::IdTable&>(*getData().getTableModel(CSMWorld::UniversalId::Type_Lands));
+            CSMWorld::IdTable& ltexs
+                = dynamic_cast<CSMWorld::IdTable&>(*getData().getTableModel(CSMWorld::UniversalId::Type_LandTextures));
 
             getUndoStack().beginMacro(("Clone " + id).c_str());
             getUndoStack().push(command.release());
 
-            CSMWorld::CopyLandTexturesCommand* ltexCopy = new CSMWorld::CopyLandTexturesCommand(lands, ltexs, getClonedId(), getId());
+            CSMWorld::CopyLandTexturesCommand* ltexCopy
+                = new CSMWorld::CopyLandTexturesCommand(lands, ltexs, getClonedId(), getId());
             getUndoStack().push(ltexCopy);
 
             getUndoStack().endMacro();
         }
         else
-            getUndoStack().push (command.release());
+            getUndoStack().push(command.release());
     }
 
     void LandCreator::coordChanged(int value)
diff --git a/apps/opencs/view/world/landcreator.hpp b/apps/opencs/view/world/landcreator.hpp
index e0c5577e42..0ba4633cf7 100644
--- a/apps/opencs/view/world/landcreator.hpp
+++ b/apps/opencs/view/world/landcreator.hpp
@@ -10,37 +10,34 @@ namespace CSVWorld
 {
     class LandCreator : public GenericCreator
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            QLabel* mXLabel;
-            QLabel* mYLabel;
-            QSpinBox* mX;
-            QSpinBox* mY;
+        QLabel* mXLabel;
+        QLabel* mYLabel;
+        QSpinBox* mX;
+        QSpinBox* mY;
 
-        public:
+    public:
+        LandCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id);
 
-            LandCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id);
+        void cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type) override;
 
-            void cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type) override;
+        void touch(const std::vector<CSMWorld::UniversalId>& ids) override;
 
-            void touch(const std::vector<CSMWorld::UniversalId>& ids) override;
+        void focus() override;
 
-            void focus() override;
+        void reset() override;
 
-            void reset() override;
+        std::string getErrors() const override;
 
-            std::string getErrors() const override;
+    protected:
+        std::string getId() const override;
 
-        protected:
+        void pushCommand(std::unique_ptr<CSMWorld::CreateCommand> command, const std::string& id) override;
 
-            std::string getId() const override;
+    private slots:
 
-            void pushCommand(std::unique_ptr<CSMWorld::CreateCommand> command,
-                const std::string& id) override;
-
-        private slots:
-
-            void coordChanged(int value);
+        void coordChanged(int value);
     };
 }
 
diff --git a/apps/opencs/view/world/landtexturecreator.cpp b/apps/opencs/view/world/landtexturecreator.cpp
index bc577378fe..ca21c449d4 100644
--- a/apps/opencs/view/world/landtexturecreator.cpp
+++ b/apps/opencs/view/world/landtexturecreator.cpp
@@ -36,8 +36,7 @@ namespace CSVWorld
         insertBeforeButtons(mIndexBox, true);
 
         connect(mNameEdit, &QLineEdit::textChanged, this, &LandTextureCreator::nameChanged);
-        connect(mIndexBox, qOverload<int>(&QSpinBox::valueChanged),
-                this, &LandTextureCreator::indexChanged);
+        connect(mIndexBox, qOverload<int>(&QSpinBox::valueChanged), this, &LandTextureCreator::indexChanged);
     }
 
     void LandTextureCreator::cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type)
diff --git a/apps/opencs/view/world/landtexturecreator.hpp b/apps/opencs/view/world/landtexturecreator.hpp
index b11c47758a..b71b05ba20 100644
--- a/apps/opencs/view/world/landtexturecreator.hpp
+++ b/apps/opencs/view/world/landtexturecreator.hpp
@@ -12,37 +12,34 @@ namespace CSVWorld
 {
     class LandTextureCreator : public GenericCreator
     {
-            Q_OBJECT
+        Q_OBJECT
 
-        public:
+    public:
+        LandTextureCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id);
 
-            LandTextureCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id);
+        void cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type) override;
 
-            void cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type) override;
+        void focus() override;
 
-            void focus() override;
+        void reset() override;
 
-            void reset() override;
+        std::string getErrors() const override;
 
-            std::string getErrors() const override;
+    protected:
+        void configureCreateCommand(CSMWorld::CreateCommand& command) const override;
 
-        protected:
+        std::string getId() const override;
 
-            void configureCreateCommand(CSMWorld::CreateCommand& command) const override;
+    private slots:
 
-            std::string getId() const override;
+        void nameChanged(const QString& val);
+        void indexChanged(int val);
 
-        private slots:
+    private:
+        QLineEdit* mNameEdit;
+        QSpinBox* mIndexBox;
 
-            void nameChanged(const QString& val);
-            void indexChanged(int val);
-
-        private:
-
-            QLineEdit* mNameEdit;
-            QSpinBox* mIndexBox;
-
-            std::string mName;
+        std::string mName;
     };
 }
 
diff --git a/apps/opencs/view/world/nestedtable.cpp b/apps/opencs/view/world/nestedtable.cpp
index 997dbc2927..d56204d652 100644
--- a/apps/opencs/view/world/nestedtable.cpp
+++ b/apps/opencs/view/world/nestedtable.cpp
@@ -1,51 +1,45 @@
 #include "nestedtable.hpp"
 
-#include <QHeaderView>
 #include <QContextMenuEvent>
+#include <QHeaderView>
 #include <QMenu>
 
 #include "../../model/prefs/shortcut.hpp"
 
-#include "../../model/world/nestedtableproxymodel.hpp"
-#include "../../model/world/universalid.hpp"
-#include "../../model/world/commands.hpp"
 #include "../../model/world/commanddispatcher.hpp"
 #include "../../model/world/commandmacro.hpp"
+#include "../../model/world/commands.hpp"
+#include "../../model/world/nestedtableproxymodel.hpp"
+#include "../../model/world/universalid.hpp"
 
 #include "tableeditidaction.hpp"
 #include "util.hpp"
 
-CSVWorld::NestedTable::NestedTable(CSMDoc::Document& document,
-                                   CSMWorld::UniversalId id,
-                                   CSMWorld::NestedTableProxyModel* model,
-                                   QWidget* parent,
-                                   bool editable,
-                                   bool fixedRows)
-    : DragRecordTable(document, parent),
-      mAddNewRowAction(nullptr),
-      mRemoveRowAction(nullptr),
-      mEditIdAction(nullptr),
-      mModel(model)
+CSVWorld::NestedTable::NestedTable(CSMDoc::Document& document, CSMWorld::UniversalId id,
+    CSMWorld::NestedTableProxyModel* model, QWidget* parent, bool editable, bool fixedRows)
+    : DragRecordTable(document, parent)
+    , mAddNewRowAction(nullptr)
+    , mRemoveRowAction(nullptr)
+    , mEditIdAction(nullptr)
+    , mModel(model)
 {
-    mDispatcher = new CSMWorld::CommandDispatcher (document, id, this);
+    mDispatcher = new CSMWorld::CommandDispatcher(document, id, this);
 
-    setSelectionBehavior (QAbstractItemView::SelectRows);
-    setSelectionMode (QAbstractItemView::ExtendedSelection);
+    setSelectionBehavior(QAbstractItemView::SelectRows);
+    setSelectionMode(QAbstractItemView::ExtendedSelection);
 
-    horizontalHeader()->setSectionResizeMode (QHeaderView::Interactive);
+    horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
     verticalHeader()->hide();
 
     int columns = model->columnCount(QModelIndex());
 
-    for(int i = 0 ; i < columns; ++i)
+    for (int i = 0; i < columns; ++i)
     {
-        CSMWorld::ColumnBase::Display display = static_cast<CSMWorld::ColumnBase::Display> (
-            model->headerData (i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Display).toInt());
+        CSMWorld::ColumnBase::Display display = static_cast<CSMWorld::ColumnBase::Display>(
+            model->headerData(i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Display).toInt());
 
-        CommandDelegate *delegate = CommandDelegateFactoryCollection::get().makeDelegate(display,
-                                                                                         mDispatcher,
-                                                                                         document,
-                                                                                         this);
+        CommandDelegate* delegate
+            = CommandDelegateFactoryCollection::get().makeDelegate(display, mDispatcher, document, this);
 
         setItemDelegateForColumn(i, delegate);
     }
@@ -56,15 +50,13 @@ CSVWorld::NestedTable::NestedTable(CSMDoc::Document& document,
     {
         if (!fixedRows)
         {
-            mAddNewRowAction = new QAction (tr ("Add new row"), this);
-            connect(mAddNewRowAction, &QAction::triggered,
-                    this, &NestedTable::addNewRowActionTriggered);
+            mAddNewRowAction = new QAction(tr("Add new row"), this);
+            connect(mAddNewRowAction, &QAction::triggered, this, &NestedTable::addNewRowActionTriggered);
             CSMPrefs::Shortcut* addRowShortcut = new CSMPrefs::Shortcut("table-add", this);
             addRowShortcut->associateAction(mAddNewRowAction);
 
-            mRemoveRowAction = new QAction (tr ("Remove rows"), this);
-            connect(mRemoveRowAction, &QAction::triggered,
-                    this, &NestedTable::removeRowActionTriggered);
+            mRemoveRowAction = new QAction(tr("Remove rows"), this);
+            connect(mRemoveRowAction, &QAction::triggered, this, &NestedTable::removeRowActionTriggered);
             CSMPrefs::Shortcut* removeRowShortcut = new CSMPrefs::Shortcut("table-remove", this);
             removeRowShortcut->associateAction(mRemoveRowAction);
         }
@@ -80,7 +72,7 @@ std::vector<CSMWorld::UniversalId> CSVWorld::NestedTable::getDraggedRecords() co
     return std::vector<CSMWorld::UniversalId>();
 }
 
-void CSVWorld::NestedTable::contextMenuEvent (QContextMenuEvent *event)
+void CSVWorld::NestedTable::contextMenuEvent(QContextMenuEvent* event)
 {
     if (!mEditIdAction)
         return;
@@ -104,13 +96,13 @@ void CSVWorld::NestedTable::contextMenuEvent (QContextMenuEvent *event)
         menu.addAction(mRemoveRowAction);
     }
 
-    menu.exec (event->globalPos());
+    menu.exec(event->globalPos());
 }
 
 void CSVWorld::NestedTable::removeRowActionTriggered()
 {
-    CSMWorld::CommandMacro macro(mDocument.getUndoStack(),
-        selectionModel()->selectedRows().size() > 1 ? tr("Remove rows") : "");
+    CSMWorld::CommandMacro macro(
+        mDocument.getUndoStack(), selectionModel()->selectedRows().size() > 1 ? tr("Remove rows") : "");
 
     // Remove rows in reverse order
     for (int i = selectionModel()->selectedRows().size() - 1; i >= 0; --i)
@@ -127,10 +119,8 @@ void CSVWorld::NestedTable::addNewRowActionTriggered()
     if (!selectionModel()->selectedRows().empty())
         row = selectionModel()->selectedRows().back().row() + 1;
 
-    mDocument.getUndoStack().push(new CSMWorld::AddNestedCommand(*(mModel->model()),
-                                                                 mModel->getParentId(),
-                                                                 row,
-                                                                 mModel->getParentColumn()));
+    mDocument.getUndoStack().push(
+        new CSMWorld::AddNestedCommand(*(mModel->model()), mModel->getParentId(), row, mModel->getParentColumn()));
 }
 
 void CSVWorld::NestedTable::editCell()
diff --git a/apps/opencs/view/world/nestedtable.hpp b/apps/opencs/view/world/nestedtable.hpp
index da4afe6420..e53bc31f94 100644
--- a/apps/opencs/view/world/nestedtable.hpp
+++ b/apps/opencs/view/world/nestedtable.hpp
@@ -26,24 +26,20 @@ namespace CSVWorld
     {
         Q_OBJECT
 
-        QAction *mAddNewRowAction;
-        QAction *mRemoveRowAction;
-        TableEditIdAction *mEditIdAction;
+        QAction* mAddNewRowAction;
+        QAction* mRemoveRowAction;
+        TableEditIdAction* mEditIdAction;
         CSMWorld::NestedTableProxyModel* mModel;
-        CSMWorld::CommandDispatcher *mDispatcher;
+        CSMWorld::CommandDispatcher* mDispatcher;
 
     public:
-        NestedTable(CSMDoc::Document& document,
-                    CSMWorld::UniversalId id,
-                    CSMWorld::NestedTableProxyModel* model,
-                    QWidget* parent = nullptr,
-                    bool editable = true,
-                    bool fixedRows = false);
+        NestedTable(CSMDoc::Document& document, CSMWorld::UniversalId id, CSMWorld::NestedTableProxyModel* model,
+            QWidget* parent = nullptr, bool editable = true, bool fixedRows = false);
 
         std::vector<CSMWorld::UniversalId> getDraggedRecords() const override;
 
     private:
-        void contextMenuEvent (QContextMenuEvent *event) override;
+        void contextMenuEvent(QContextMenuEvent* event) override;
 
     private slots:
         void removeRowActionTriggered();
@@ -53,7 +49,7 @@ namespace CSVWorld
         void editCell();
 
     signals:
-        void editRequest(const CSMWorld::UniversalId &id, const std::string &hint);
+        void editRequest(const CSMWorld::UniversalId& id, const std::string& hint);
     };
 }
 
diff --git a/apps/opencs/view/world/pathgridcreator.cpp b/apps/opencs/view/world/pathgridcreator.cpp
index a685fbb14c..9a8b51199d 100644
--- a/apps/opencs/view/world/pathgridcreator.cpp
+++ b/apps/opencs/view/world/pathgridcreator.cpp
@@ -18,21 +18,16 @@ std::string CSVWorld::PathgridCreator::getId() const
 
 CSMWorld::IdTable& CSVWorld::PathgridCreator::getPathgridsTable() const
 {
-    return dynamic_cast<CSMWorld::IdTable&> (
-        *getData().getTableModel(getCollectionId())
-    );
+    return dynamic_cast<CSMWorld::IdTable&>(*getData().getTableModel(getCollectionId()));
 }
 
-CSVWorld::PathgridCreator::PathgridCreator(
-    CSMWorld::Data& data,
-    QUndoStack& undoStack,
-    const CSMWorld::UniversalId& id,
-    CSMWorld::IdCompletionManager& completionManager
-) : GenericCreator(data, undoStack, id)
+CSVWorld::PathgridCreator::PathgridCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id,
+    CSMWorld::IdCompletionManager& completionManager)
+    : GenericCreator(data, undoStack, id)
 {
     setManualEditing(false);
 
-    QLabel *label = new QLabel("Cell", this);
+    QLabel* label = new QLabel("Cell", this);
     insertBeforeButtons(label, false);
 
     // Add cell ID input with auto-completion.
@@ -46,9 +41,7 @@ CSVWorld::PathgridCreator::PathgridCreator(
     connect(mCell, &CSVWidget::DropLineEdit::returnPressed, this, &PathgridCreator::inputReturnPressed);
 }
 
-void CSVWorld::PathgridCreator::cloneMode(
-    const std::string& originId,
-    const CSMWorld::UniversalId::Type type)
+void CSVWorld::PathgridCreator::cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type)
 {
     CSVWorld::GenericCreator::cloneMode(originId, type);
 
@@ -96,14 +89,8 @@ void CSVWorld::PathgridCreator::cellChanged()
     update();
 }
 
-CSVWorld::Creator *CSVWorld::PathgridCreatorFactory::makeCreator(
-    CSMDoc::Document& document,
-    const CSMWorld::UniversalId& id) const
+CSVWorld::Creator* CSVWorld::PathgridCreatorFactory::makeCreator(
+    CSMDoc::Document& document, const CSMWorld::UniversalId& id) const
 {
-    return new PathgridCreator(
-        document.getData(),
-        document.getUndoStack(),
-        id,
-        document.getIdCompletionManager()
-    );
+    return new PathgridCreator(document.getData(), document.getUndoStack(), id, document.getIdCompletionManager());
 }
diff --git a/apps/opencs/view/world/pathgridcreator.hpp b/apps/opencs/view/world/pathgridcreator.hpp
index 773735e25c..42a39cd504 100644
--- a/apps/opencs/view/world/pathgridcreator.hpp
+++ b/apps/opencs/view/world/pathgridcreator.hpp
@@ -28,54 +28,44 @@ namespace CSVWorld
     {
         Q_OBJECT
 
-        CSVWidget::DropLineEdit *mCell;
+        CSVWidget::DropLineEdit* mCell;
 
-        private:
+    private:
+        /// \return Cell ID entered by user.
+        std::string getId() const override;
 
-            /// \return Cell ID entered by user.
-            std::string getId() const override;
+        /// \return reference to table containing pathgrids.
+        CSMWorld::IdTable& getPathgridsTable() const;
 
-            /// \return reference to table containing pathgrids.
-            CSMWorld::IdTable& getPathgridsTable() const;
+    public:
+        PathgridCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id,
+            CSMWorld::IdCompletionManager& completionManager);
 
-        public:
+        /// \brief Set cell ID input widget to ID of record to be cloned.
+        /// \param originId Cell ID to be cloned.
+        /// \param type Type of record to be cloned.
+        void cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type) override;
 
-            PathgridCreator(
-                CSMWorld::Data& data,
-                QUndoStack& undoStack,
-                const CSMWorld::UniversalId& id,
-                CSMWorld::IdCompletionManager& completionManager);
+        /// \return Error description for current user input.
+        std::string getErrors() const override;
 
-            /// \brief Set cell ID input widget to ID of record to be cloned.
-            /// \param originId Cell ID to be cloned.
-            /// \param type Type of record to be cloned.
-            void cloneMode(
-                const std::string& originId,
-                const CSMWorld::UniversalId::Type type) override;
+        /// \brief Set focus to cell ID input widget.
+        void focus() override;
 
-            /// \return Error description for current user input.
-            std::string getErrors() const override;
+        /// \brief Clear cell ID input widget.
+        void reset() override;
 
-            /// \brief Set focus to cell ID input widget.
-            void focus() override;
+    private slots:
 
-            /// \brief Clear cell ID input widget.
-            void reset() override;
-
-        private slots:
-
-            /// \brief Check user input for errors.
-            void cellChanged();
+        /// \brief Check user input for errors.
+        void cellChanged();
     };
 
     /// \brief Creator factory for pathgrid record creator.
     class PathgridCreatorFactory : public CreatorFactoryBase
     {
-        public:
-
-            Creator *makeCreator(
-                CSMDoc::Document& document,
-                const CSMWorld::UniversalId& id) const override;
+    public:
+        Creator* makeCreator(CSMDoc::Document& document, const CSMWorld::UniversalId& id) const override;
     };
 }
 
diff --git a/apps/opencs/view/world/previewsubview.cpp b/apps/opencs/view/world/previewsubview.cpp
index 151824790a..075c786c2b 100644
--- a/apps/opencs/view/world/previewsubview.cpp
+++ b/apps/opencs/view/world/previewsubview.cpp
@@ -9,66 +9,63 @@
 
 #include "../../model/doc/document.hpp"
 
-CSVWorld::PreviewSubView::PreviewSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
-: SubView (id), mTitle (id.toString().c_str())
+CSVWorld::PreviewSubView::PreviewSubView(const CSMWorld::UniversalId& id, CSMDoc::Document& document)
+    : SubView(id)
+    , mTitle(id.toString().c_str())
 {
-    QHBoxLayout *layout = new QHBoxLayout;
+    QHBoxLayout* layout = new QHBoxLayout;
 
-    if (document.getData().getReferenceables().searchId (id.getId())==-1)
+    if (document.getData().getReferenceables().searchId(id.getId()) == -1)
     {
-        std::string referenceableId =
-            document.getData().getReferences().getRecord (id.getId()).get().mRefID;
+        std::string referenceableId = document.getData().getReferences().getRecord(id.getId()).get().mRefID;
 
-        referenceableIdChanged (referenceableId);
+        referenceableIdChanged(referenceableId);
 
-        mScene =
-            new CSVRender::PreviewWidget (document.getData(), id.getId(), false, this);
+        mScene = new CSVRender::PreviewWidget(document.getData(), id.getId(), false, this);
     }
     else
-        mScene = new CSVRender::PreviewWidget (document.getData(), id.getId(), true, this);
+        mScene = new CSVRender::PreviewWidget(document.getData(), id.getId(), true, this);
 
     mScene->setExterior(true);
 
-    CSVWidget::SceneToolbar *toolbar = new CSVWidget::SceneToolbar (48+6, this);
+    CSVWidget::SceneToolbar* toolbar = new CSVWidget::SceneToolbar(48 + 6, this);
 
-    CSVWidget::SceneToolMode *lightingTool = mScene->makeLightingSelector (toolbar);
-    toolbar->addTool (lightingTool);
+    CSVWidget::SceneToolMode* lightingTool = mScene->makeLightingSelector(toolbar);
+    toolbar->addTool(lightingTool);
 
-    layout->addWidget (toolbar, 0);
+    layout->addWidget(toolbar, 0);
 
-    layout->addWidget (mScene, 1);
+    layout->addWidget(mScene, 1);
 
-    QWidget *widget = new QWidget;
+    QWidget* widget = new QWidget;
 
-    widget->setLayout (layout);
+    widget->setLayout(layout);
 
-    setWidget (widget);
+    setWidget(widget);
 
-    connect (mScene, &CSVRender::PreviewWidget::closeRequest, 
-        this, qOverload<>(&PreviewSubView::closeRequest));
-    connect (mScene, &CSVRender::PreviewWidget::referenceableIdChanged,
-        this, &PreviewSubView::referenceableIdChanged);
-    connect (mScene, &CSVRender::PreviewWidget::focusToolbarRequest, 
-        toolbar, qOverload<>(&CSVWidget::SceneToolbar::setFocus));
-    connect (toolbar, &CSVWidget::SceneToolbar::focusSceneRequest, 
-        mScene, qOverload<>(&CSVRender::PreviewWidget::setFocus));
+    connect(mScene, &CSVRender::PreviewWidget::closeRequest, this, qOverload<>(&PreviewSubView::closeRequest));
+    connect(mScene, &CSVRender::PreviewWidget::referenceableIdChanged, this, &PreviewSubView::referenceableIdChanged);
+    connect(mScene, &CSVRender::PreviewWidget::focusToolbarRequest, toolbar,
+        qOverload<>(&CSVWidget::SceneToolbar::setFocus));
+    connect(
+        toolbar, &CSVWidget::SceneToolbar::focusSceneRequest, mScene, qOverload<>(&CSVRender::PreviewWidget::setFocus));
 }
 
-void CSVWorld::PreviewSubView::setEditLock (bool locked) {}
+void CSVWorld::PreviewSubView::setEditLock(bool locked) {}
 
 std::string CSVWorld::PreviewSubView::getTitle() const
 {
     return mTitle;
 }
 
-void CSVWorld::PreviewSubView::referenceableIdChanged (const std::string& id)
+void CSVWorld::PreviewSubView::referenceableIdChanged(const std::string& id)
 {
     if (id.empty())
         mTitle = "Preview: Reference to <nothing>";
     else
         mTitle = "Preview: Reference to " + id;
 
-    setWindowTitle (QString::fromUtf8 (mTitle.c_str()));
+    setWindowTitle(QString::fromUtf8(mTitle.c_str()));
 
     emit updateTitle();
 }
diff --git a/apps/opencs/view/world/previewsubview.hpp b/apps/opencs/view/world/previewsubview.hpp
index ed88d04887..a767cc3365 100644
--- a/apps/opencs/view/world/previewsubview.hpp
+++ b/apps/opencs/view/world/previewsubview.hpp
@@ -17,22 +17,21 @@ namespace CSVWorld
 {
     class PreviewSubView : public CSVDoc::SubView
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            CSVRender::PreviewWidget *mScene;
-            std::string mTitle;
+        CSVRender::PreviewWidget* mScene;
+        std::string mTitle;
 
-        public:
+    public:
+        PreviewSubView(const CSMWorld::UniversalId& id, CSMDoc::Document& document);
 
-            PreviewSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document);
+        void setEditLock(bool locked) override;
 
-            void setEditLock (bool locked) override;
+        std::string getTitle() const override;
 
-            std::string getTitle() const override;
+    private slots:
 
-        private slots:
-
-            void referenceableIdChanged (const std::string& id);
+        void referenceableIdChanged(const std::string& id);
     };
 }
 
diff --git a/apps/opencs/view/world/recordbuttonbar.cpp b/apps/opencs/view/world/recordbuttonbar.cpp
index 5df012144b..7e986877fa 100644
--- a/apps/opencs/view/world/recordbuttonbar.cpp
+++ b/apps/opencs/view/world/recordbuttonbar.cpp
@@ -3,8 +3,8 @@
 #include <QHBoxLayout>
 #include <QToolButton>
 
-#include "../../model/world/idtable.hpp"
 #include "../../model/world/commanddispatcher.hpp"
+#include "../../model/world/idtable.hpp"
 
 #include "../../model/prefs/state.hpp"
 
@@ -14,147 +14,145 @@ void CSVWorld::RecordButtonBar::updateModificationButtons()
 {
     bool createAndDeleteDisabled = !mBottom || !mBottom->canCreateAndDelete() || mLocked;
 
-    mCloneButton->setDisabled (createAndDeleteDisabled);
-    mAddButton->setDisabled (createAndDeleteDisabled);
+    mCloneButton->setDisabled(createAndDeleteDisabled);
+    mAddButton->setDisabled(createAndDeleteDisabled);
 
     bool commandDisabled = !mCommandDispatcher || mLocked;
 
-    mRevertButton->setDisabled (commandDisabled);
-    mDeleteButton->setDisabled (commandDisabled || createAndDeleteDisabled);
+    mRevertButton->setDisabled(commandDisabled);
+    mDeleteButton->setDisabled(commandDisabled || createAndDeleteDisabled);
 }
 
 void CSVWorld::RecordButtonBar::updatePrevNextButtons()
 {
     int rows = mTable.rowCount();
 
-    if (rows<=1)
+    if (rows <= 1)
     {
-        mPrevButton->setDisabled (true);
-        mNextButton->setDisabled (true);
+        mPrevButton->setDisabled(true);
+        mNextButton->setDisabled(true);
     }
     else if (CSMPrefs::get()["General Input"]["cycle"].isTrue())
     {
-        mPrevButton->setDisabled (false);
-        mNextButton->setDisabled (false);
+        mPrevButton->setDisabled(false);
+        mNextButton->setDisabled(false);
     }
     else
     {
-        int row = mTable.getModelIndex (mId.getId(), 0).row();
+        int row = mTable.getModelIndex(mId.getId(), 0).row();
 
-        mPrevButton->setDisabled (row<=0);
-        mNextButton->setDisabled (row>=rows-1);
+        mPrevButton->setDisabled(row <= 0);
+        mNextButton->setDisabled(row >= rows - 1);
     }
 }
 
-CSVWorld::RecordButtonBar::RecordButtonBar (const CSMWorld::UniversalId& id,
-    CSMWorld::IdTable& table, TableBottomBox *bottomBox,
-    CSMWorld::CommandDispatcher *commandDispatcher, QWidget *parent)
-: QWidget (parent), mId (id), mTable (table), mBottom (bottomBox),
-  mCommandDispatcher (commandDispatcher), mLocked (false)
+CSVWorld::RecordButtonBar::RecordButtonBar(const CSMWorld::UniversalId& id, CSMWorld::IdTable& table,
+    TableBottomBox* bottomBox, CSMWorld::CommandDispatcher* commandDispatcher, QWidget* parent)
+    : QWidget(parent)
+    , mId(id)
+    , mTable(table)
+    , mBottom(bottomBox)
+    , mCommandDispatcher(commandDispatcher)
+    , mLocked(false)
 {
-    QHBoxLayout *buttonsLayout = new QHBoxLayout;
-    buttonsLayout->setContentsMargins (0, 0, 0, 0);
+    QHBoxLayout* buttonsLayout = new QHBoxLayout;
+    buttonsLayout->setContentsMargins(0, 0, 0, 0);
 
     // left section
-    mPrevButton = new QToolButton (this);
+    mPrevButton = new QToolButton(this);
     mPrevButton->setIcon(QIcon(":record-previous"));
-    mPrevButton->setToolTip ("Switch to previous record");
-    buttonsLayout->addWidget (mPrevButton, 0);
+    mPrevButton->setToolTip("Switch to previous record");
+    buttonsLayout->addWidget(mPrevButton, 0);
 
-    mNextButton = new QToolButton (this);
+    mNextButton = new QToolButton(this);
     mNextButton->setIcon(QIcon(":/record-next"));
-    mNextButton->setToolTip ("Switch to next record");
-    buttonsLayout->addWidget (mNextButton, 1);
+    mNextButton->setToolTip("Switch to next record");
+    buttonsLayout->addWidget(mNextButton, 1);
 
     buttonsLayout->addStretch(2);
 
     // optional buttons of the right section
     if (mTable.getFeatures() & CSMWorld::IdTable::Feature_Preview)
     {
-        QToolButton* previewButton = new QToolButton (this);
+        QToolButton* previewButton = new QToolButton(this);
         previewButton->setIcon(QIcon(":edit-preview"));
-        previewButton->setToolTip ("Open a preview of this record");
+        previewButton->setToolTip("Open a preview of this record");
         buttonsLayout->addWidget(previewButton);
-        connect (previewButton, &QToolButton::clicked, this, &RecordButtonBar::showPreview);
+        connect(previewButton, &QToolButton::clicked, this, &RecordButtonBar::showPreview);
     }
 
     if (mTable.getFeatures() & CSMWorld::IdTable::Feature_View)
     {
-        QToolButton* viewButton = new QToolButton (this);
+        QToolButton* viewButton = new QToolButton(this);
         viewButton->setIcon(QIcon(":/cell.png"));
-        viewButton->setToolTip ("Open a scene view of the cell this record is located in");
+        viewButton->setToolTip("Open a scene view of the cell this record is located in");
         buttonsLayout->addWidget(viewButton);
-        connect (viewButton, &QToolButton::clicked, this, &RecordButtonBar::viewRecord);
+        connect(viewButton, &QToolButton::clicked, this, &RecordButtonBar::viewRecord);
     }
 
     // right section
-    mCloneButton = new QToolButton (this);
+    mCloneButton = new QToolButton(this);
     mCloneButton->setIcon(QIcon(":edit-clone"));
-    mCloneButton->setToolTip ("Clone record");
+    mCloneButton->setToolTip("Clone record");
     buttonsLayout->addWidget(mCloneButton);
 
-    mAddButton = new QToolButton (this);
+    mAddButton = new QToolButton(this);
     mAddButton->setIcon(QIcon(":edit-add"));
-    mAddButton->setToolTip ("Add new record");
+    mAddButton->setToolTip("Add new record");
     buttonsLayout->addWidget(mAddButton);
 
-    mDeleteButton = new QToolButton (this);
+    mDeleteButton = new QToolButton(this);
     mDeleteButton->setIcon(QIcon(":edit-delete"));
-    mDeleteButton->setToolTip ("Delete record");
+    mDeleteButton->setToolTip("Delete record");
     buttonsLayout->addWidget(mDeleteButton);
 
-    mRevertButton = new QToolButton (this);
+    mRevertButton = new QToolButton(this);
     mRevertButton->setIcon(QIcon(":edit-undo"));
-    mRevertButton->setToolTip ("Revert record");
+    mRevertButton->setToolTip("Revert record");
     buttonsLayout->addWidget(mRevertButton);
 
-    setLayout (buttonsLayout);
+    setLayout(buttonsLayout);
 
     // connections
-    if(mBottom && mBottom->canCreateAndDelete())
+    if (mBottom && mBottom->canCreateAndDelete())
     {
-        connect (mAddButton, &QToolButton::clicked, mBottom, &TableBottomBox::createRequest);
-        connect (mCloneButton, &QToolButton::clicked, this, &RecordButtonBar::cloneRequest);
+        connect(mAddButton, &QToolButton::clicked, mBottom, &TableBottomBox::createRequest);
+        connect(mCloneButton, &QToolButton::clicked, this, &RecordButtonBar::cloneRequest);
     }
 
-    connect (mNextButton, &QToolButton::clicked, this, &RecordButtonBar::nextId);
-    connect (mPrevButton, &QToolButton::clicked, this, &RecordButtonBar::prevId);
+    connect(mNextButton, &QToolButton::clicked, this, &RecordButtonBar::nextId);
+    connect(mPrevButton, &QToolButton::clicked, this, &RecordButtonBar::prevId);
 
     if (mCommandDispatcher)
     {
-        connect (mRevertButton, &QToolButton::clicked,
-            mCommandDispatcher, &CSMWorld::CommandDispatcher::executeRevert);
-        connect (mDeleteButton, &QToolButton::clicked,
-            mCommandDispatcher, &CSMWorld::CommandDispatcher::executeDelete);
+        connect(mRevertButton, &QToolButton::clicked, mCommandDispatcher, &CSMWorld::CommandDispatcher::executeRevert);
+        connect(mDeleteButton, &QToolButton::clicked, mCommandDispatcher, &CSMWorld::CommandDispatcher::executeDelete);
     }
 
-    connect (&mTable, &CSMWorld::IdTable::rowsInserted,
-        this, &RecordButtonBar::rowNumberChanged);
-    connect (&mTable, &CSMWorld::IdTable::rowsRemoved,
-        this, &RecordButtonBar::rowNumberChanged);
+    connect(&mTable, &CSMWorld::IdTable::rowsInserted, this, &RecordButtonBar::rowNumberChanged);
+    connect(&mTable, &CSMWorld::IdTable::rowsRemoved, this, &RecordButtonBar::rowNumberChanged);
 
-    connect (&CSMPrefs::State::get(), &CSMPrefs::State::settingChanged,
-        this, &RecordButtonBar::settingChanged);
+    connect(&CSMPrefs::State::get(), &CSMPrefs::State::settingChanged, this, &RecordButtonBar::settingChanged);
 
     updateModificationButtons();
     updatePrevNextButtons();
 }
 
-void CSVWorld::RecordButtonBar::setEditLock (bool locked)
+void CSVWorld::RecordButtonBar::setEditLock(bool locked)
 {
     mLocked = locked;
     updateModificationButtons();
 }
 
-void CSVWorld::RecordButtonBar::universalIdChanged (const CSMWorld::UniversalId& id)
+void CSVWorld::RecordButtonBar::universalIdChanged(const CSMWorld::UniversalId& id)
 {
     mId = id;
     updatePrevNextButtons();
 }
 
-void CSVWorld::RecordButtonBar::settingChanged (const CSMPrefs::Setting *setting)
+void CSVWorld::RecordButtonBar::settingChanged(const CSMPrefs::Setting* setting)
 {
-    if (*setting=="General Input/cycle")
+    if (*setting == "General Input/cycle")
         updatePrevNextButtons();
 }
 
@@ -162,19 +160,18 @@ void CSVWorld::RecordButtonBar::cloneRequest()
 {
     if (mBottom)
     {
-        int typeColumn = mTable.findColumnIndex (CSMWorld::Columns::ColumnId_RecordType);
+        int typeColumn = mTable.findColumnIndex(CSMWorld::Columns::ColumnId_RecordType);
 
-        QModelIndex typeIndex = mTable.getModelIndex (mId.getId(), typeColumn);
-        CSMWorld::UniversalId::Type type = static_cast<CSMWorld::UniversalId::Type> (
-            mTable.data (typeIndex).toInt());
+        QModelIndex typeIndex = mTable.getModelIndex(mId.getId(), typeColumn);
+        CSMWorld::UniversalId::Type type = static_cast<CSMWorld::UniversalId::Type>(mTable.data(typeIndex).toInt());
 
-        mBottom->cloneRequest (mId.getId(), type);
+        mBottom->cloneRequest(mId.getId(), type);
     }
 }
 
 void CSVWorld::RecordButtonBar::nextId()
 {
-    int newRow = mTable.getModelIndex (mId.getId(), 0).row() + 1;
+    int newRow = mTable.getModelIndex(mId.getId(), 0).row() + 1;
 
     if (newRow >= mTable.rowCount())
     {
@@ -184,25 +181,25 @@ void CSVWorld::RecordButtonBar::nextId()
             return;
     }
 
-    emit switchToRow (newRow);
+    emit switchToRow(newRow);
 }
 
 void CSVWorld::RecordButtonBar::prevId()
 {
-    int newRow = mTable.getModelIndex (mId.getId(), 0).row() - 1;
+    int newRow = mTable.getModelIndex(mId.getId(), 0).row() - 1;
 
     if (newRow < 0)
     {
         if (CSMPrefs::get()["General Input"]["cycle"].isTrue())
-            newRow = mTable.rowCount()-1;
+            newRow = mTable.rowCount() - 1;
         else
             return;
     }
 
-    emit switchToRow (newRow);
+    emit switchToRow(newRow);
 }
 
-void CSVWorld::RecordButtonBar::rowNumberChanged (const QModelIndex& parent, int start, int end)
+void CSVWorld::RecordButtonBar::rowNumberChanged(const QModelIndex& parent, int start, int end)
 {
     updatePrevNextButtons();
 }
diff --git a/apps/opencs/view/world/recordbuttonbar.hpp b/apps/opencs/view/world/recordbuttonbar.hpp
index aca3211f8a..605738670c 100644
--- a/apps/opencs/view/world/recordbuttonbar.hpp
+++ b/apps/opencs/view/world/recordbuttonbar.hpp
@@ -35,57 +35,54 @@ namespace CSVWorld
     /// - view (optional)
     class RecordButtonBar : public QWidget
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            CSMWorld::UniversalId mId;
-            CSMWorld::IdTable& mTable;
-            TableBottomBox *mBottom;
-            CSMWorld::CommandDispatcher *mCommandDispatcher;
-            QToolButton *mPrevButton;
-            QToolButton *mNextButton;
-            QToolButton *mCloneButton;
-            QToolButton *mAddButton;
-            QToolButton *mDeleteButton;
-            QToolButton *mRevertButton;
-            bool mLocked;
+        CSMWorld::UniversalId mId;
+        CSMWorld::IdTable& mTable;
+        TableBottomBox* mBottom;
+        CSMWorld::CommandDispatcher* mCommandDispatcher;
+        QToolButton* mPrevButton;
+        QToolButton* mNextButton;
+        QToolButton* mCloneButton;
+        QToolButton* mAddButton;
+        QToolButton* mDeleteButton;
+        QToolButton* mRevertButton;
+        bool mLocked;
 
-        private:
+    private:
+        void updateModificationButtons();
 
-            void updateModificationButtons();
+        void updatePrevNextButtons();
 
-            void updatePrevNextButtons();
+    public:
+        RecordButtonBar(const CSMWorld::UniversalId& id, CSMWorld::IdTable& table, TableBottomBox* bottomBox = nullptr,
+            CSMWorld::CommandDispatcher* commandDispatcher = nullptr, QWidget* parent = nullptr);
 
-        public:
+        void setEditLock(bool locked);
 
-            RecordButtonBar (const CSMWorld::UniversalId& id,
-                CSMWorld::IdTable& table, TableBottomBox *bottomBox = nullptr,
-                CSMWorld::CommandDispatcher *commandDispatcher = nullptr, QWidget *parent = nullptr);
+    public slots:
 
-            void setEditLock (bool locked);
+        void universalIdChanged(const CSMWorld::UniversalId& id);
 
-        public slots:
+    private slots:
 
-            void universalIdChanged (const CSMWorld::UniversalId& id);
+        void settingChanged(const CSMPrefs::Setting* setting);
 
-        private slots:
+        void cloneRequest();
 
-            void settingChanged (const CSMPrefs::Setting *setting);
+        void nextId();
 
-            void cloneRequest();
+        void prevId();
 
-            void nextId();
+        void rowNumberChanged(const QModelIndex& parent, int start, int end);
 
-            void prevId();
+    signals:
 
-            void rowNumberChanged (const QModelIndex& parent, int start, int end);
+        void showPreview();
 
-        signals:
+        void viewRecord();
 
-            void showPreview();
-
-            void viewRecord();
-
-            void switchToRow (int row);
+        void switchToRow(int row);
     };
 }
 
diff --git a/apps/opencs/view/world/recordstatusdelegate.cpp b/apps/opencs/view/world/recordstatusdelegate.cpp
index dd45baff0f..8804d8c177 100644
--- a/apps/opencs/view/world/recordstatusdelegate.cpp
+++ b/apps/opencs/view/world/recordstatusdelegate.cpp
@@ -2,33 +2,29 @@
 
 #include "../../model/world/columns.hpp"
 
-CSVWorld::RecordStatusDelegate::RecordStatusDelegate(const ValueList& values,
-                                                     const IconList & icons,
-                                                     CSMWorld::CommandDispatcher *dispatcher, CSMDoc::Document& document, QObject *parent)
-    : DataDisplayDelegate (values, icons, dispatcher, document,
-                           "Records", "status-format",
-                           parent)
-{}
+CSVWorld::RecordStatusDelegate::RecordStatusDelegate(const ValueList& values, const IconList& icons,
+    CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent)
+    : DataDisplayDelegate(values, icons, dispatcher, document, "Records", "status-format", parent)
+{
+}
 
-CSVWorld::CommandDelegate *CSVWorld::RecordStatusDelegateFactory::makeDelegate (
-    CSMWorld::CommandDispatcher *dispatcher, CSMDoc::Document& document, QObject *parent) const
+CSVWorld::CommandDelegate* CSVWorld::RecordStatusDelegateFactory::makeDelegate(
+    CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent) const
 {
-    return new RecordStatusDelegate (mValues, mIcons, dispatcher, document, parent);
+    return new RecordStatusDelegate(mValues, mIcons, dispatcher, document, parent);
 }
 
 CSVWorld::RecordStatusDelegateFactory::RecordStatusDelegateFactory()
 {
-    std::vector<std::pair<int,std::string>> enums =
-        CSMWorld::Columns::getEnums (CSMWorld::Columns::ColumnId_Modification);
+    std::vector<std::pair<int, std::string>> enums
+        = CSMWorld::Columns::getEnums(CSMWorld::Columns::ColumnId_Modification);
 
-    static const char *sIcons[] =
-    {
-        ":list-base", ":list-modified", ":list-added", ":list-removed", ":list-removed", 0
-    };
+    static const char* sIcons[]
+        = { ":list-base", ":list-modified", ":list-added", ":list-removed", ":list-removed", 0 };
 
-    for (int i=0; sIcons[i]; ++i)
+    for (int i = 0; sIcons[i]; ++i)
     {
         auto& enumPair = enums.at(i);
-        add (enumPair.first, enumPair.second.c_str(), sIcons[i]);
+        add(enumPair.first, enumPair.second.c_str(), sIcons[i]);
     }
 }
diff --git a/apps/opencs/view/world/recordstatusdelegate.hpp b/apps/opencs/view/world/recordstatusdelegate.hpp
index e70e1af26b..a3aa9f5d50 100644
--- a/apps/opencs/view/world/recordstatusdelegate.hpp
+++ b/apps/opencs/view/world/recordstatusdelegate.hpp
@@ -13,22 +13,18 @@ namespace CSVWorld
     class RecordStatusDelegate : public DataDisplayDelegate
     {
     public:
-
-        RecordStatusDelegate (const ValueList& values, const IconList& icons,
-            CSMWorld::CommandDispatcher *dispatcher, CSMDoc::Document& document,
-            QObject *parent = nullptr);
+        RecordStatusDelegate(const ValueList& values, const IconList& icons, CSMWorld::CommandDispatcher* dispatcher,
+            CSMDoc::Document& document, QObject* parent = nullptr);
     };
 
     class RecordStatusDelegateFactory : public DataDisplayDelegateFactory
     {
-        public:
-
-            RecordStatusDelegateFactory();
-
-            CommandDelegate *makeDelegate (CSMWorld::CommandDispatcher *dispatcher, CSMDoc::Document& document, QObject *parent) const override;
-            ///< The ownership of the returned CommandDelegate is transferred to the caller.
+    public:
+        RecordStatusDelegateFactory();
 
+        CommandDelegate* makeDelegate(
+            CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent) const override;
+        ///< The ownership of the returned CommandDelegate is transferred to the caller.
     };
 }
 #endif // RECORDSTATUSDELEGATE_HPP
-
diff --git a/apps/opencs/view/world/referenceablecreator.cpp b/apps/opencs/view/world/referenceablecreator.cpp
index eb699fd777..48227397a0 100644
--- a/apps/opencs/view/world/referenceablecreator.cpp
+++ b/apps/opencs/view/world/referenceablecreator.cpp
@@ -3,78 +3,64 @@
 #include <QComboBox>
 #include <QLabel>
 
-#include "../../model/world/universalid.hpp"
 #include "../../model/world/commands.hpp"
+#include "../../model/world/universalid.hpp"
 
-void CSVWorld::ReferenceableCreator::configureCreateCommand (CSMWorld::CreateCommand& command) const
+void CSVWorld::ReferenceableCreator::configureCreateCommand(CSMWorld::CreateCommand& command) const
 {
-    command.setType (
-        static_cast<CSMWorld::UniversalId::Type> (mType->itemData (mType->currentIndex()).toInt()));
+    command.setType(static_cast<CSMWorld::UniversalId::Type>(mType->itemData(mType->currentIndex()).toInt()));
 }
 
-CSVWorld::ReferenceableCreator::ReferenceableCreator (CSMWorld::Data& data, QUndoStack& undoStack,
-    const CSMWorld::UniversalId& id)
-: GenericCreator (data, undoStack, id)
+CSVWorld::ReferenceableCreator::ReferenceableCreator(
+    CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id)
+    : GenericCreator(data, undoStack, id)
 {
-    QLabel *label = new QLabel ("Type", this);
-    insertBeforeButtons (label, false);
+    QLabel* label = new QLabel("Type", this);
+    insertBeforeButtons(label, false);
 
     std::vector<CSMWorld::UniversalId::Type> types = CSMWorld::UniversalId::listReferenceableTypes();
 
-    mType = new QComboBox (this);
+    mType = new QComboBox(this);
     mType->setMaxVisibleItems(20);
 
-    for (std::vector<CSMWorld::UniversalId::Type>::const_iterator iter (types.begin());
-         iter!=types.end(); ++iter)
+    for (std::vector<CSMWorld::UniversalId::Type>::const_iterator iter(types.begin()); iter != types.end(); ++iter)
     {
-        CSMWorld::UniversalId id2 (*iter, "");
+        CSMWorld::UniversalId id2(*iter, "");
 
-        mType->addItem (QIcon (id2.getIcon().c_str()), id2.getTypeName().c_str(),
-            static_cast<int> (id2.getType()));
+        mType->addItem(QIcon(id2.getIcon().c_str()), id2.getTypeName().c_str(), static_cast<int>(id2.getType()));
     }
 
     mType->model()->sort(0);
 
-    insertBeforeButtons (mType, false);
+    insertBeforeButtons(mType, false);
 
-    connect (mType, qOverload<int>(&QComboBox::currentIndexChanged), this, &ReferenceableCreator::setType);
+    connect(mType, qOverload<int>(&QComboBox::currentIndexChanged), this, &ReferenceableCreator::setType);
 }
 
 void CSVWorld::ReferenceableCreator::reset()
 {
-    mType->setCurrentIndex (0);
+    mType->setCurrentIndex(0);
     GenericCreator::reset();
 }
 
-void CSVWorld::ReferenceableCreator::setType (int index)
+void CSVWorld::ReferenceableCreator::setType(int index)
 {
     // container items have name limit of 32 characters
     std::string text = mType->currentText().toStdString();
-    if (text == "Potion" ||
-        text == "Apparatus" ||
-        text == "Armor" ||
-        text == "Book" ||
-        text == "Clothing" ||
-        text == "Ingredient" ||
-        text == "ItemLevelledList" ||
-        text == "Light" ||
-        text == "Lockpick" ||
-        text == "Miscellaneous" ||
-        text == "Probe" ||
-        text == "Repair" ||
-        text == "Weapon")
+    if (text == "Potion" || text == "Apparatus" || text == "Armor" || text == "Book" || text == "Clothing"
+        || text == "Ingredient" || text == "ItemLevelledList" || text == "Light" || text == "Lockpick"
+        || text == "Miscellaneous" || text == "Probe" || text == "Repair" || text == "Weapon")
     {
-        GenericCreator::setEditorMaxLength (32);
+        GenericCreator::setEditorMaxLength(32);
     }
     else
-        GenericCreator::setEditorMaxLength (32767);
+        GenericCreator::setEditorMaxLength(32767);
 }
 
-void CSVWorld::ReferenceableCreator::cloneMode (const std::string& originId,
-    const CSMWorld::UniversalId::Type type)
+void CSVWorld::ReferenceableCreator::cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type)
 {
-    GenericCreator::cloneMode (originId, type);
-    mType->setCurrentIndex (mType->findData (static_cast<int> (type)));
+    GenericCreator::cloneMode(originId, type);
+    mType->setCurrentIndex(mType->findData(static_cast<int>(type)));
 }
 
 void CSVWorld::ReferenceableCreator::toggleWidgets(bool active)
diff --git a/apps/opencs/view/world/referenceablecreator.hpp b/apps/opencs/view/world/referenceablecreator.hpp
index 354347cc88..15ad4f6865 100644
--- a/apps/opencs/view/world/referenceablecreator.hpp
+++ b/apps/opencs/view/world/referenceablecreator.hpp
@@ -9,29 +9,25 @@ namespace CSVWorld
 {
     class ReferenceableCreator : public GenericCreator
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            QComboBox *mType;
+        QComboBox* mType;
 
-        private:
+    private:
+        void configureCreateCommand(CSMWorld::CreateCommand& command) const override;
 
-            void configureCreateCommand (CSMWorld::CreateCommand& command) const override;
+    public:
+        ReferenceableCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id);
 
-        public:
+        void reset() override;
 
-            ReferenceableCreator (CSMWorld::Data& data, QUndoStack& undoStack,
-                const CSMWorld::UniversalId& id);
+        void cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type) override;
 
-            void reset() override;
+        void toggleWidgets(bool active = true) override;
 
-            void cloneMode (const std::string& originId,
-                const CSMWorld::UniversalId::Type type) override;
+    private slots:
 
-            void toggleWidgets(bool active = true) override;
-
-        private slots:
-
-            void setType (int index);
+        void setType(int index);
     };
 }
 
diff --git a/apps/opencs/view/world/referencecreator.cpp b/apps/opencs/view/world/referencecreator.cpp
index 62035e9117..334f140fcc 100644
--- a/apps/opencs/view/world/referencecreator.cpp
+++ b/apps/opencs/view/world/referencecreator.cpp
@@ -4,12 +4,12 @@
 
 #include "../../model/doc/document.hpp"
 
-#include "../../model/world/data.hpp"
-#include "../../model/world/commands.hpp"
 #include "../../model/world/columns.hpp"
-#include "../../model/world/idtable.hpp"
-#include "../../model/world/idcompletionmanager.hpp"
 #include "../../model/world/commandmacro.hpp"
+#include "../../model/world/commands.hpp"
+#include "../../model/world/data.hpp"
+#include "../../model/world/idcompletionmanager.hpp"
+#include "../../model/world/idtable.hpp"
 
 #include "../widget/droplineedit.hpp"
 
@@ -18,39 +18,38 @@ std::string CSVWorld::ReferenceCreator::getId() const
     return mId;
 }
 
-void CSVWorld::ReferenceCreator::configureCreateCommand (CSMWorld::CreateCommand& command) const
+void CSVWorld::ReferenceCreator::configureCreateCommand(CSMWorld::CreateCommand& command) const
 {
     // Set cellID
-    int cellIdColumn =
-        dynamic_cast<CSMWorld::IdTable&> (*getData().getTableModel (getCollectionId())).
-        findColumnIndex (CSMWorld::Columns::ColumnId_Cell);
+    int cellIdColumn = dynamic_cast<CSMWorld::IdTable&>(*getData().getTableModel(getCollectionId()))
+                           .findColumnIndex(CSMWorld::Columns::ColumnId_Cell);
 
-    command.addValue (cellIdColumn, mCell->text());
+    command.addValue(cellIdColumn, mCell->text());
 }
 
-CSVWorld::ReferenceCreator::ReferenceCreator (CSMWorld::Data& data, QUndoStack& undoStack,
-    const CSMWorld::UniversalId& id, CSMWorld::IdCompletionManager &completionManager)
-: GenericCreator (data, undoStack, id)
+CSVWorld::ReferenceCreator::ReferenceCreator(CSMWorld::Data& data, QUndoStack& undoStack,
+    const CSMWorld::UniversalId& id, CSMWorld::IdCompletionManager& completionManager)
+    : GenericCreator(data, undoStack, id)
 {
-    QLabel *label = new QLabel ("Cell", this);
-    insertBeforeButtons (label, false);
+    QLabel* label = new QLabel("Cell", this);
+    insertBeforeButtons(label, false);
 
     // Add cell ID input with auto-completion.
     // Only existing cell IDs are accepted so no ID validation is performed.
     mCell = new CSVWidget::DropLineEdit(CSMWorld::ColumnBase::Display_Cell, this);
     mCell->setCompleter(completionManager.getCompleter(CSMWorld::ColumnBase::Display_Cell).get());
-    insertBeforeButtons (mCell, true);
+    insertBeforeButtons(mCell, true);
 
-    setManualEditing (false);
+    setManualEditing(false);
 
-    connect (mCell, &CSVWidget::DropLineEdit::textChanged, this, &ReferenceCreator::cellChanged);
-    connect (mCell, &CSVWidget::DropLineEdit::returnPressed, this, &ReferenceCreator::inputReturnPressed);
+    connect(mCell, &CSVWidget::DropLineEdit::textChanged, this, &ReferenceCreator::cellChanged);
+    connect(mCell, &CSVWidget::DropLineEdit::returnPressed, this, &ReferenceCreator::inputReturnPressed);
 }
 
 void CSVWorld::ReferenceCreator::reset()
 {
     GenericCreator::reset();
-    mCell->setText ("");
+    mCell->setText("");
     mId = getData().getReferences().getNewId();
 }
 
@@ -64,7 +63,7 @@ std::string CSVWorld::ReferenceCreator::getErrors() const
 
     if (cell.empty())
         errors += "Missing Cell ID";
-    else if (getData().getCells().searchId (cell)==-1)
+    else if (getData().getCells().searchId(cell) == -1)
         errors += "Invalid Cell ID";
 
     return errors;
@@ -80,26 +79,21 @@ void CSVWorld::ReferenceCreator::cellChanged()
     update();
 }
 
-void CSVWorld::ReferenceCreator::cloneMode(const std::string& originId,
-                                           const CSMWorld::UniversalId::Type type)
+void CSVWorld::ReferenceCreator::cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type)
 {
-    CSMWorld::IdTable& referenceTable = dynamic_cast<CSMWorld::IdTable&> (
-        *getData().getTableModel (CSMWorld::UniversalId::Type_References));
+    CSMWorld::IdTable& referenceTable
+        = dynamic_cast<CSMWorld::IdTable&>(*getData().getTableModel(CSMWorld::UniversalId::Type_References));
 
-    int cellIdColumn = referenceTable.findColumnIndex (CSMWorld::Columns::ColumnId_Cell);
+    int cellIdColumn = referenceTable.findColumnIndex(CSMWorld::Columns::ColumnId_Cell);
 
-    mCell->setText (
-        referenceTable.data (referenceTable.getModelIndex (originId, cellIdColumn)).toString());
+    mCell->setText(referenceTable.data(referenceTable.getModelIndex(originId, cellIdColumn)).toString());
 
     CSVWorld::GenericCreator::cloneMode(originId, type);
-    cellChanged(); //otherwise ok button will remain disabled
+    cellChanged(); // otherwise ok button will remain disabled
 }
 
-CSVWorld::Creator *CSVWorld::ReferenceCreatorFactory::makeCreator (CSMDoc::Document& document,
-                                                                   const CSMWorld::UniversalId& id) const
+CSVWorld::Creator* CSVWorld::ReferenceCreatorFactory::makeCreator(
+    CSMDoc::Document& document, const CSMWorld::UniversalId& id) const
 {
-    return new ReferenceCreator(document.getData(),
-                                document.getUndoStack(),
-                                id,
-                                document.getIdCompletionManager());
+    return new ReferenceCreator(document.getData(), document.getUndoStack(), id, document.getIdCompletionManager());
 }
diff --git a/apps/opencs/view/world/referencecreator.hpp b/apps/opencs/view/world/referencecreator.hpp
index 3903900ad2..29135d6eb2 100644
--- a/apps/opencs/view/world/referencecreator.hpp
+++ b/apps/opencs/view/world/referencecreator.hpp
@@ -18,45 +18,41 @@ namespace CSVWorld
 
     class ReferenceCreator : public GenericCreator
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            CSVWidget::DropLineEdit *mCell;
-            std::string mId;
+        CSVWidget::DropLineEdit* mCell;
+        std::string mId;
 
-        private:
+    private:
+        std::string getId() const override;
 
-            std::string getId() const override;
+        void configureCreateCommand(CSMWorld::CreateCommand& command) const override;
 
-            void configureCreateCommand (CSMWorld::CreateCommand& command) const override;
+    public:
+        ReferenceCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id,
+            CSMWorld::IdCompletionManager& completionManager);
 
-        public:
+        void cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type) override;
 
-            ReferenceCreator (CSMWorld::Data& data, QUndoStack& undoStack,
-                const CSMWorld::UniversalId& id, CSMWorld::IdCompletionManager &completionManager);
+        void reset() override;
 
-            void cloneMode(const std::string& originId,
-                                   const CSMWorld::UniversalId::Type type) override;
+        std::string getErrors() const override;
+        ///< Return formatted error descriptions for the current state of the creator. if an empty
+        /// string is returned, there is no error.
 
-            void reset() override;
+        /// Focus main input widget
+        void focus() override;
 
-            std::string getErrors() const override;
-            ///< Return formatted error descriptions for the current state of the creator. if an empty
-            /// string is returned, there is no error.
+    private slots:
 
-            /// Focus main input widget
-            void focus() override;
-
-        private slots:
-
-            void cellChanged();
+        void cellChanged();
     };
 
     class ReferenceCreatorFactory : public CreatorFactoryBase
     {
-        public:
-
-            Creator *makeCreator (CSMDoc::Document& document, const CSMWorld::UniversalId& id) const override;
-            ///< The ownership of the returned Creator is transferred to the caller.
+    public:
+        Creator* makeCreator(CSMDoc::Document& document, const CSMWorld::UniversalId& id) const override;
+        ///< The ownership of the returned Creator is transferred to the caller.
     };
 }
 
diff --git a/apps/opencs/view/world/regionmap.cpp b/apps/opencs/view/world/regionmap.cpp
index 143b291074..6fe8b20c02 100644
--- a/apps/opencs/view/world/regionmap.cpp
+++ b/apps/opencs/view/world/regionmap.cpp
@@ -4,113 +4,112 @@
 #include <set>
 #include <sstream>
 
-#include <QHeaderView>
 #include <QContextMenuEvent>
+#include <QHeaderView>
 #include <QMenu>
 
 #include "../../model/doc/document.hpp"
 
-#include "../../model/world/regionmap.hpp"
-#include "../../model/world/universalid.hpp"
+#include "../../model/world/columns.hpp"
+#include "../../model/world/commandmacro.hpp"
+#include "../../model/world/commands.hpp"
 #include "../../model/world/data.hpp"
 #include "../../model/world/idtable.hpp"
-#include "../../model/world/commands.hpp"
-#include "../../model/world/columns.hpp"
+#include "../../model/world/regionmap.hpp"
 #include "../../model/world/tablemimedata.hpp"
-#include "../../model/world/commandmacro.hpp"
+#include "../../model/world/universalid.hpp"
 
-void CSVWorld::RegionMap::contextMenuEvent (QContextMenuEvent *event)
+void CSVWorld::RegionMap::contextMenuEvent(QContextMenuEvent* event)
 {
-    QMenu menu (this);
+    QMenu menu(this);
 
-    if (getUnselectedCells().size()>0)
-        menu.addAction (mSelectAllAction);
+    if (getUnselectedCells().size() > 0)
+        menu.addAction(mSelectAllAction);
 
-    if (selectionModel()->selectedIndexes().size()>0)
-        menu.addAction (mClearSelectionAction);
+    if (selectionModel()->selectedIndexes().size() > 0)
+        menu.addAction(mClearSelectionAction);
 
-    if (getMissingRegionCells().size()>0)
-        menu.addAction (mSelectRegionsAction);
+    if (getMissingRegionCells().size() > 0)
+        menu.addAction(mSelectRegionsAction);
 
-    int selectedNonExistentCells = getSelectedCells (false, true).size();
+    int selectedNonExistentCells = getSelectedCells(false, true).size();
 
-    if (selectedNonExistentCells>0)
+    if (selectedNonExistentCells > 0)
     {
-        if (selectedNonExistentCells==1)
-            mCreateCellsAction->setText ("Create one Cell");
+        if (selectedNonExistentCells == 1)
+            mCreateCellsAction->setText("Create one Cell");
         else
         {
             std::ostringstream stream;
             stream << "Create " << selectedNonExistentCells << " cells";
-            mCreateCellsAction->setText (QString::fromUtf8 (stream.str().c_str()));
+            mCreateCellsAction->setText(QString::fromUtf8(stream.str().c_str()));
         }
 
-        menu.addAction (mCreateCellsAction);
+        menu.addAction(mCreateCellsAction);
     }
 
-    if (getSelectedCells().size()>0)
+    if (getSelectedCells().size() > 0)
     {
         if (!mRegionId.empty())
         {
-            mSetRegionAction->setText (QString::fromUtf8 (("Set Region to " + mRegionId).c_str()));
-            menu.addAction (mSetRegionAction);
+            mSetRegionAction->setText(QString::fromUtf8(("Set Region to " + mRegionId).c_str()));
+            menu.addAction(mSetRegionAction);
         }
 
-        menu.addAction (mUnsetRegionAction);
+        menu.addAction(mUnsetRegionAction);
 
-        menu.addAction (mViewInTableAction);
+        menu.addAction(mViewInTableAction);
     }
 
-    if (selectionModel()->selectedIndexes().size()>0)
-        menu.addAction (mViewAction);
+    if (selectionModel()->selectedIndexes().size() > 0)
+        menu.addAction(mViewAction);
 
-    menu.exec (event->globalPos());
+    menu.exec(event->globalPos());
 }
 
 QModelIndexList CSVWorld::RegionMap::getUnselectedCells() const
 {
-    const QAbstractItemModel *model = QTableView::model();
+    const QAbstractItemModel* model = QTableView::model();
 
     int rows = model->rowCount();
     int columns = model->columnCount();
 
     QModelIndexList selected = selectionModel()->selectedIndexes();
-    std::sort (selected.begin(), selected.end());
+    std::sort(selected.begin(), selected.end());
 
     QModelIndexList all;
 
-    for (int y=0; y<rows; ++y)
-        for (int x=0; x<columns; ++x)
+    for (int y = 0; y < rows; ++y)
+        for (int x = 0; x < columns; ++x)
         {
-            QModelIndex index = model->index (y, x);
-            if (model->data (index, Qt::BackgroundRole)!=QBrush (Qt::DiagCrossPattern))
-                all.push_back (index);
+            QModelIndex index = model->index(y, x);
+            if (model->data(index, Qt::BackgroundRole) != QBrush(Qt::DiagCrossPattern))
+                all.push_back(index);
         }
 
-    std::sort (all.begin(), all.end());
+    std::sort(all.begin(), all.end());
 
     QModelIndexList list;
 
-    std::set_difference (all.begin(), all.end(), selected.begin(), selected.end(),
-        std::back_inserter (list));
+    std::set_difference(all.begin(), all.end(), selected.begin(), selected.end(), std::back_inserter(list));
 
     return list;
 }
 
-QModelIndexList CSVWorld::RegionMap::getSelectedCells (bool existent, bool nonExistent) const
+QModelIndexList CSVWorld::RegionMap::getSelectedCells(bool existent, bool nonExistent) const
 {
-    const QAbstractItemModel *model = QTableView::model();
+    const QAbstractItemModel* model = QTableView::model();
 
     QModelIndexList selected = selectionModel()->selectedIndexes();
 
     QModelIndexList list;
 
-    for (QModelIndexList::const_iterator iter (selected.begin()); iter!=selected.end(); ++iter)
+    for (QModelIndexList::const_iterator iter(selected.begin()); iter != selected.end(); ++iter)
     {
-        bool exists = model->data (*iter, Qt::BackgroundRole)!=QBrush (Qt::DiagCrossPattern);
+        bool exists = model->data(*iter, Qt::BackgroundRole) != QBrush(Qt::DiagCrossPattern);
 
         if ((exists && existent) || (!exists && nonExistent))
-             list.push_back (*iter);
+            list.push_back(*iter);
     }
 
     return list;
@@ -118,107 +117,103 @@ QModelIndexList CSVWorld::RegionMap::getSelectedCells (bool existent, bool nonEx
 
 QModelIndexList CSVWorld::RegionMap::getMissingRegionCells() const
 {
-    const QAbstractItemModel *model = QTableView::model();
+    const QAbstractItemModel* model = QTableView::model();
 
     QModelIndexList selected = selectionModel()->selectedIndexes();
 
     std::set<std::string> regions;
 
-    for (QModelIndexList::const_iterator iter (selected.begin()); iter!=selected.end(); ++iter)
+    for (QModelIndexList::const_iterator iter(selected.begin()); iter != selected.end(); ++iter)
     {
-        std::string region =
-            model->data (*iter, CSMWorld::RegionMap::Role_Region).toString().toUtf8().constData();
+        std::string region = model->data(*iter, CSMWorld::RegionMap::Role_Region).toString().toUtf8().constData();
 
         if (!region.empty())
-            regions.insert (region);
+            regions.insert(region);
     }
 
     QModelIndexList list;
 
     QModelIndexList unselected = getUnselectedCells();
 
-    for (QModelIndexList::const_iterator iter (unselected.begin()); iter!=unselected.end(); ++iter)
+    for (QModelIndexList::const_iterator iter(unselected.begin()); iter != unselected.end(); ++iter)
     {
-        std::string region =
-            model->data (*iter, CSMWorld::RegionMap::Role_Region).toString().toUtf8().constData();
+        std::string region = model->data(*iter, CSMWorld::RegionMap::Role_Region).toString().toUtf8().constData();
 
-        if (!region.empty() && regions.find (region)!=regions.end())
-            list.push_back (*iter);
+        if (!region.empty() && regions.find(region) != regions.end())
+            list.push_back(*iter);
     }
 
     return list;
 }
 
-void CSVWorld::RegionMap::setRegion (const std::string& regionId)
+void CSVWorld::RegionMap::setRegion(const std::string& regionId)
 {
     QModelIndexList selected = getSelectedCells();
 
-    QAbstractItemModel *regionModel = model();
+    QAbstractItemModel* regionModel = model();
 
-    CSMWorld::IdTable *cellsModel = &dynamic_cast<CSMWorld::IdTable&> (*
-        mDocument.getData().getTableModel (CSMWorld::UniversalId::Type_Cells));
+    CSMWorld::IdTable* cellsModel
+        = &dynamic_cast<CSMWorld::IdTable&>(*mDocument.getData().getTableModel(CSMWorld::UniversalId::Type_Cells));
 
-    QString regionId2 = QString::fromUtf8 (regionId.c_str());
+    QString regionId2 = QString::fromUtf8(regionId.c_str());
 
-    CSMWorld::CommandMacro macro (mDocument.getUndoStack(), selected.size()>1 ? tr ("Set Region") : "");
+    CSMWorld::CommandMacro macro(mDocument.getUndoStack(), selected.size() > 1 ? tr("Set Region") : "");
 
-    for (QModelIndexList::const_iterator iter (selected.begin()); iter!=selected.end(); ++iter)
+    for (QModelIndexList::const_iterator iter(selected.begin()); iter != selected.end(); ++iter)
     {
-        std::string cellId = regionModel->data (*iter, CSMWorld::RegionMap::Role_CellId).
-            toString().toUtf8().constData();
+        std::string cellId = regionModel->data(*iter, CSMWorld::RegionMap::Role_CellId).toString().toUtf8().constData();
 
-        QModelIndex index = cellsModel->getModelIndex (cellId,
-            cellsModel->findColumnIndex (CSMWorld::Columns::ColumnId_Region));
+        QModelIndex index
+            = cellsModel->getModelIndex(cellId, cellsModel->findColumnIndex(CSMWorld::Columns::ColumnId_Region));
 
-        macro.push (new CSMWorld::ModifyCommand (*cellsModel, index, regionId2));
+        macro.push(new CSMWorld::ModifyCommand(*cellsModel, index, regionId2));
     }
 }
 
-CSVWorld::RegionMap::RegionMap (const CSMWorld::UniversalId& universalId,
-    CSMDoc::Document& document, QWidget *parent)
-:  DragRecordTable(document, parent)
+CSVWorld::RegionMap::RegionMap(const CSMWorld::UniversalId& universalId, CSMDoc::Document& document, QWidget* parent)
+    : DragRecordTable(document, parent)
 {
     verticalHeader()->hide();
     horizontalHeader()->hide();
 
-    setSelectionMode (QAbstractItemView::ExtendedSelection);
+    setSelectionMode(QAbstractItemView::ExtendedSelection);
 
-    setModel (document.getData().getTableModel (universalId));
+    setModel(document.getData().getTableModel(universalId));
 
     resizeColumnsToContents();
     resizeRowsToContents();
 
-    mSelectAllAction = new QAction (tr ("Select All"), this);
-    connect (mSelectAllAction, &QAction::triggered, this, &RegionMap::selectAll);
-    addAction (mSelectAllAction);
+    mSelectAllAction = new QAction(tr("Select All"), this);
+    connect(mSelectAllAction, &QAction::triggered, this, &RegionMap::selectAll);
+    addAction(mSelectAllAction);
 
-    mClearSelectionAction = new QAction (tr ("Clear Selection"), this);
-    connect (mClearSelectionAction, &QAction::triggered, this, &RegionMap::clearSelection);
-    addAction (mClearSelectionAction);
+    mClearSelectionAction = new QAction(tr("Clear Selection"), this);
+    connect(mClearSelectionAction, &QAction::triggered, this, &RegionMap::clearSelection);
+    addAction(mClearSelectionAction);
 
-    mSelectRegionsAction = new QAction (tr ("Select Regions"), this);
-    connect (mSelectRegionsAction, &QAction::triggered, this, &RegionMap::selectRegions);
-    addAction (mSelectRegionsAction);
+    mSelectRegionsAction = new QAction(tr("Select Regions"), this);
+    connect(mSelectRegionsAction, &QAction::triggered, this, &RegionMap::selectRegions);
+    addAction(mSelectRegionsAction);
 
-    mCreateCellsAction = new QAction (tr ("Create Cells Action"), this);
-    connect (mCreateCellsAction, &QAction::triggered, this, &RegionMap::createCells);
-    addAction (mCreateCellsAction);
+    mCreateCellsAction = new QAction(tr("Create Cells Action"), this);
+    connect(mCreateCellsAction, &QAction::triggered, this, &RegionMap::createCells);
+    addAction(mCreateCellsAction);
 
-    mSetRegionAction = new QAction (tr ("Set Region"), this);
-    connect (mSetRegionAction, &QAction::triggered, this, qOverload<>(&RegionMap::setRegion));
-    addAction (mSetRegionAction);
+    mSetRegionAction = new QAction(tr("Set Region"), this);
+    connect(mSetRegionAction, &QAction::triggered, this, qOverload<>(&RegionMap::setRegion));
+    addAction(mSetRegionAction);
 
-    mUnsetRegionAction = new QAction (tr ("Unset Region"), this);
-    connect (mUnsetRegionAction, &QAction::triggered, this, &RegionMap::unsetRegion);
-    addAction (mUnsetRegionAction);
+    mUnsetRegionAction = new QAction(tr("Unset Region"), this);
+    connect(mUnsetRegionAction, &QAction::triggered, this, &RegionMap::unsetRegion);
+    addAction(mUnsetRegionAction);
 
-    mViewAction = new QAction (tr ("View Cells"), this);
-    connect (mViewAction, &QAction::triggered, this, &RegionMap::view);
-    addAction (mViewAction);
+    mViewAction = new QAction(tr("View Cells"), this);
+    connect(mViewAction, &QAction::triggered, this, &RegionMap::view);
+    addAction(mViewAction);
 
-    mViewInTableAction = new QAction (tr ("View Cells in Table"), this);
-    connect (mViewInTableAction, &QAction::triggered, this, &RegionMap::viewInTable);
-    addAction (mViewInTableAction);
+    mViewInTableAction = new QAction(tr("View Cells in Table"), this);
+    connect(mViewInTableAction, &QAction::triggered, this, &RegionMap::viewInTable);
+    addAction(mViewInTableAction);
 
     setAcceptDrops(true);
 }
@@ -227,8 +222,8 @@ void CSVWorld::RegionMap::selectAll()
 {
     QModelIndexList unselected = getUnselectedCells();
 
-    for (QModelIndexList::const_iterator iter (unselected.begin()); iter!=unselected.end(); ++iter)
-        selectionModel()->select (*iter, QItemSelectionModel::Select);
+    for (QModelIndexList::const_iterator iter(unselected.begin()); iter != unselected.end(); ++iter)
+        selectionModel()->select(*iter, QItemSelectionModel::Select);
 }
 
 void CSVWorld::RegionMap::clearSelection()
@@ -240,8 +235,8 @@ void CSVWorld::RegionMap::selectRegions()
 {
     QModelIndexList unselected = getMissingRegionCells();
 
-    for (QModelIndexList::const_iterator iter (unselected.begin()); iter!=unselected.end(); ++iter)
-        selectionModel()->select (*iter, QItemSelectionModel::Select);
+    for (QModelIndexList::const_iterator iter(unselected.begin()); iter != unselected.end(); ++iter)
+        selectionModel()->select(*iter, QItemSelectionModel::Select);
 }
 
 void CSVWorld::RegionMap::createCells()
@@ -249,19 +244,18 @@ void CSVWorld::RegionMap::createCells()
     if (mEditLock)
         return;
 
-    QModelIndexList selected = getSelectedCells (false, true);
+    QModelIndexList selected = getSelectedCells(false, true);
 
-    CSMWorld::IdTable *cellsModel = &dynamic_cast<CSMWorld::IdTable&> (*
-        mDocument.getData().getTableModel (CSMWorld::UniversalId::Type_Cells));
+    CSMWorld::IdTable* cellsModel
+        = &dynamic_cast<CSMWorld::IdTable&>(*mDocument.getData().getTableModel(CSMWorld::UniversalId::Type_Cells));
 
-    CSMWorld::CommandMacro macro (mDocument.getUndoStack(), selected.size()>1 ? tr ("Create cells"): "");
+    CSMWorld::CommandMacro macro(mDocument.getUndoStack(), selected.size() > 1 ? tr("Create cells") : "");
 
-    for (QModelIndexList::const_iterator iter (selected.begin()); iter!=selected.end(); ++iter)
+    for (QModelIndexList::const_iterator iter(selected.begin()); iter != selected.end(); ++iter)
     {
-        std::string cellId = model()->data (*iter, CSMWorld::RegionMap::Role_CellId).
-            toString().toUtf8().constData();
+        std::string cellId = model()->data(*iter, CSMWorld::RegionMap::Role_CellId).toString().toUtf8().constData();
 
-        macro.push (new CSMWorld::CreateCommand (*cellsModel, cellId));
+        macro.push(new CSMWorld::CreateCommand(*cellsModel, cellId));
     }
 }
 
@@ -270,7 +264,7 @@ void CSVWorld::RegionMap::setRegion()
     if (mEditLock)
         return;
 
-    setRegion (mRegionId);
+    setRegion(mRegionId);
 }
 
 void CSVWorld::RegionMap::unsetRegion()
@@ -278,7 +272,7 @@ void CSVWorld::RegionMap::unsetRegion()
     if (mEditLock)
         return;
 
-    setRegion ("");
+    setRegion("");
 }
 
 void CSVWorld::RegionMap::view()
@@ -290,10 +284,9 @@ void CSVWorld::RegionMap::view()
 
     bool first = true;
 
-    for (QModelIndexList::const_iterator iter (selected.begin()); iter!=selected.end(); ++iter)
+    for (QModelIndexList::const_iterator iter(selected.begin()); iter != selected.end(); ++iter)
     {
-        std::string cellId = model()->data (*iter, CSMWorld::RegionMap::Role_CellId).
-            toString().toUtf8().constData();
+        std::string cellId = model()->data(*iter, CSMWorld::RegionMap::Role_CellId).toString().toUtf8().constData();
 
         if (first)
             first = false;
@@ -303,8 +296,8 @@ void CSVWorld::RegionMap::view()
         hint << cellId;
     }
 
-    emit editRequest (CSMWorld::UniversalId (CSMWorld::UniversalId::Type_Scene, ESM::CellId::sDefaultWorldspace),
-        hint.str());
+    emit editRequest(
+        CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Scene, ESM::CellId::sDefaultWorldspace), hint.str());
 }
 
 void CSVWorld::RegionMap::viewInTable()
@@ -316,10 +309,9 @@ void CSVWorld::RegionMap::viewInTable()
 
     bool first = true;
 
-    for (QModelIndexList::const_iterator iter (selected.begin()); iter!=selected.end(); ++iter)
+    for (QModelIndexList::const_iterator iter(selected.begin()); iter != selected.end(); ++iter)
     {
-        std::string cellId = model()->data (*iter, CSMWorld::RegionMap::Role_CellId).
-            toString().toUtf8().constData();
+        std::string cellId = model()->data(*iter, CSMWorld::RegionMap::Role_CellId).toString().toUtf8().constData();
 
         if (first)
             first = false;
@@ -331,66 +323,63 @@ void CSVWorld::RegionMap::viewInTable()
 
     hint << ")";
 
-    emit editRequest (CSMWorld::UniversalId::Type_Cells, hint.str());
+    emit editRequest(CSMWorld::UniversalId::Type_Cells, hint.str());
 }
 
-void CSVWorld::RegionMap::mouseMoveEvent (QMouseEvent* event)
+void CSVWorld::RegionMap::mouseMoveEvent(QMouseEvent* event)
 {
     startDragFromTable(*this);
 }
 
-std::vector< CSMWorld::UniversalId > CSVWorld::RegionMap::getDraggedRecords() const
+std::vector<CSMWorld::UniversalId> CSVWorld::RegionMap::getDraggedRecords() const
 {
     QModelIndexList selected(getSelectedCells(true, false));
     std::vector<CSMWorld::UniversalId> ids;
     for (const QModelIndex& it : selected)
     {
-        ids.emplace_back(
-                CSMWorld::UniversalId::Type_Cell,
-                model()->data(it, CSMWorld::RegionMap::Role_CellId).toString().toUtf8().constData());
+        ids.emplace_back(CSMWorld::UniversalId::Type_Cell,
+            model()->data(it, CSMWorld::RegionMap::Role_CellId).toString().toUtf8().constData());
     }
     selected = getSelectedCells(false, true);
     for (const QModelIndex& it : selected)
     {
-        ids.emplace_back(
-                CSMWorld::UniversalId::Type_Cell_Missing,
-                model()->data(it, CSMWorld::RegionMap::Role_CellId).toString().toUtf8().constData());
+        ids.emplace_back(CSMWorld::UniversalId::Type_Cell_Missing,
+            model()->data(it, CSMWorld::RegionMap::Role_CellId).toString().toUtf8().constData());
     }
     return ids;
 }
 
-void CSVWorld::RegionMap::dropEvent (QDropEvent* event)
+void CSVWorld::RegionMap::dropEvent(QDropEvent* event)
 {
-    QModelIndex index = indexAt (event->pos());
+    QModelIndex index = indexAt(event->pos());
 
-    bool exists = QTableView::model()->data(index, Qt::BackgroundRole)!=QBrush (Qt::DiagCrossPattern);
+    bool exists = QTableView::model()->data(index, Qt::BackgroundRole) != QBrush(Qt::DiagCrossPattern);
 
     if (!index.isValid() || !exists)
     {
         return;
     }
 
-    const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*> (event->mimeData());
+    const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*>(event->mimeData());
     if (!mime) // May happen when non-records (e.g. plain text) are dragged and dropped
         return;
 
     if (mime->fromDocument(mDocument) && mime->holdsType(CSMWorld::UniversalId::Type_Region))
     {
-        CSMWorld::UniversalId record (mime->returnMatching (CSMWorld::UniversalId::Type_Region));
+        CSMWorld::UniversalId record(mime->returnMatching(CSMWorld::UniversalId::Type_Region));
 
-        QAbstractItemModel *regionModel = model();
+        QAbstractItemModel* regionModel = model();
 
-        CSMWorld::IdTable *cellsModel = &dynamic_cast<CSMWorld::IdTable&> (*
-            mDocument.getData().getTableModel (CSMWorld::UniversalId::Type_Cells));
+        CSMWorld::IdTable* cellsModel
+            = &dynamic_cast<CSMWorld::IdTable&>(*mDocument.getData().getTableModel(CSMWorld::UniversalId::Type_Cells));
 
-        std::string cellId(regionModel->data (index, CSMWorld::RegionMap::Role_CellId).
-            toString().toUtf8().constData());
+        std::string cellId(regionModel->data(index, CSMWorld::RegionMap::Role_CellId).toString().toUtf8().constData());
 
-        QModelIndex index2(cellsModel->getModelIndex (cellId,
-            cellsModel->findColumnIndex (CSMWorld::Columns::ColumnId_Region)));
+        QModelIndex index2(
+            cellsModel->getModelIndex(cellId, cellsModel->findColumnIndex(CSMWorld::Columns::ColumnId_Region)));
 
-        mDocument.getUndoStack().push(new CSMWorld::ModifyCommand
-                                        (*cellsModel, index2, QString::fromUtf8(record.getId().c_str())));
+        mDocument.getUndoStack().push(
+            new CSMWorld::ModifyCommand(*cellsModel, index2, QString::fromUtf8(record.getId().c_str())));
 
         mRegionId = record.getId();
     }
diff --git a/apps/opencs/view/world/regionmap.hpp b/apps/opencs/view/world/regionmap.hpp
index fe88987848..356e86074f 100644
--- a/apps/opencs/view/world/regionmap.hpp
+++ b/apps/opencs/view/world/regionmap.hpp
@@ -22,67 +22,64 @@ namespace CSVWorld
 {
     class RegionMap : public DragRecordTable
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            QAction *mSelectAllAction;
-            QAction *mClearSelectionAction;
-            QAction *mSelectRegionsAction;
-            QAction *mCreateCellsAction;
-            QAction *mSetRegionAction;
-            QAction *mUnsetRegionAction;
-            QAction *mViewAction;
-            QAction *mViewInTableAction;
-            std::string mRegionId;
+        QAction* mSelectAllAction;
+        QAction* mClearSelectionAction;
+        QAction* mSelectRegionsAction;
+        QAction* mCreateCellsAction;
+        QAction* mSetRegionAction;
+        QAction* mUnsetRegionAction;
+        QAction* mViewAction;
+        QAction* mViewInTableAction;
+        std::string mRegionId;
 
-        private:
+    private:
+        void contextMenuEvent(QContextMenuEvent* event) override;
 
-            void contextMenuEvent (QContextMenuEvent *event) override;
+        QModelIndexList getUnselectedCells() const;
+        ///< \note Non-existent cells are not listed.
 
-            QModelIndexList getUnselectedCells() const;
-            ///< \note Non-existent cells are not listed.
+        QModelIndexList getSelectedCells(bool existent = true, bool nonExistent = false) const;
+        ///< \param existent Include existent cells.
+        /// \param nonExistent Include non-existent cells.
 
-            QModelIndexList getSelectedCells (bool existent = true, bool nonExistent = false) const;
-            ///< \param existent Include existent cells.
-            /// \param nonExistent Include non-existent cells.
+        QModelIndexList getMissingRegionCells() const;
+        ///< Unselected cells within all regions that have at least one selected cell.
 
-            QModelIndexList getMissingRegionCells() const;
-            ///< Unselected cells within all regions that have at least one selected cell.
+        void setRegion(const std::string& regionId);
+        ///< Set region Id of selected cells.
 
-            void setRegion (const std::string& regionId);
-            ///< Set region Id of selected cells.
+        void mouseMoveEvent(QMouseEvent* event) override;
 
-            void mouseMoveEvent(QMouseEvent *event) override;
+        void dropEvent(QDropEvent* event) override;
 
-            void dropEvent(QDropEvent* event) override;
+    public:
+        RegionMap(const CSMWorld::UniversalId& universalId, CSMDoc::Document& document, QWidget* parent = nullptr);
 
-        public:
+        std::vector<CSMWorld::UniversalId> getDraggedRecords() const override;
 
-            RegionMap (const CSMWorld::UniversalId& universalId, CSMDoc::Document& document,
-                QWidget *parent = nullptr);
+    signals:
 
-            std::vector<CSMWorld::UniversalId> getDraggedRecords() const override;
+        void editRequest(const CSMWorld::UniversalId& id, const std::string& hint);
 
-        signals:
+    private slots:
 
-            void editRequest (const CSMWorld::UniversalId& id, const std::string& hint);
+        void selectAll() override;
 
-        private slots:
+        void clearSelection();
 
-            void selectAll() override;
+        void selectRegions();
 
-            void clearSelection();
+        void createCells();
 
-            void selectRegions();
+        void setRegion();
 
-            void createCells();
+        void unsetRegion();
 
-            void setRegion();
+        void view();
 
-            void unsetRegion();
-
-            void view();
-
-            void viewInTable();
+        void viewInTable();
     };
 }
 
diff --git a/apps/opencs/view/world/regionmapsubview.cpp b/apps/opencs/view/world/regionmapsubview.cpp
index 659c7597f0..5d76c9459b 100644
--- a/apps/opencs/view/world/regionmapsubview.cpp
+++ b/apps/opencs/view/world/regionmapsubview.cpp
@@ -2,24 +2,22 @@
 
 #include "regionmap.hpp"
 
-CSVWorld::RegionMapSubView::RegionMapSubView (CSMWorld::UniversalId universalId,
-    CSMDoc::Document& document)
-: CSVDoc::SubView (universalId)
+CSVWorld::RegionMapSubView::RegionMapSubView(CSMWorld::UniversalId universalId, CSMDoc::Document& document)
+    : CSVDoc::SubView(universalId)
 {
-    mRegionMap = new RegionMap (universalId, document, this);
+    mRegionMap = new RegionMap(universalId, document, this);
 
-    setWidget (mRegionMap);
+    setWidget(mRegionMap);
 
-    connect (mRegionMap, &RegionMap::editRequest, this, &RegionMapSubView::editRequest);
+    connect(mRegionMap, &RegionMap::editRequest, this, &RegionMapSubView::editRequest);
 }
 
-void CSVWorld::RegionMapSubView::setEditLock (bool locked)
+void CSVWorld::RegionMapSubView::setEditLock(bool locked)
 {
-    mRegionMap->setEditLock (locked);
+    mRegionMap->setEditLock(locked);
 }
 
-void CSVWorld::RegionMapSubView::editRequest (const CSMWorld::UniversalId& id,
-    const std::string& hint)
+void CSVWorld::RegionMapSubView::editRequest(const CSMWorld::UniversalId& id, const std::string& hint)
 {
-    focusId (id, hint);
+    focusId(id, hint);
 }
diff --git a/apps/opencs/view/world/regionmapsubview.hpp b/apps/opencs/view/world/regionmapsubview.hpp
index 232d88fc64..1874236a30 100644
--- a/apps/opencs/view/world/regionmapsubview.hpp
+++ b/apps/opencs/view/world/regionmapsubview.hpp
@@ -16,19 +16,18 @@ namespace CSVWorld
 
     class RegionMapSubView : public CSVDoc::SubView
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            RegionMap *mRegionMap;
+        RegionMap* mRegionMap;
 
-        public:
+    public:
+        RegionMapSubView(CSMWorld::UniversalId universalId, CSMDoc::Document& document);
 
-            RegionMapSubView (CSMWorld::UniversalId universalId, CSMDoc::Document& document);
+        void setEditLock(bool locked) override;
 
-            void setEditLock (bool locked) override;
+    private slots:
 
-        private slots:
-
-            void editRequest (const CSMWorld::UniversalId& id, const std::string& hint);
+        void editRequest(const CSMWorld::UniversalId& id, const std::string& hint);
     };
 }
 
diff --git a/apps/opencs/view/world/scenesubview.cpp b/apps/opencs/view/world/scenesubview.cpp
index 414ab7183f..2316596675 100644
--- a/apps/opencs/view/world/scenesubview.cpp
+++ b/apps/opencs/view/world/scenesubview.cpp
@@ -2,9 +2,9 @@
 
 #include <sstream>
 
-#include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QVBoxLayout>
 #include <cassert>
 
 #include "../../model/doc/document.hpp"
@@ -18,30 +18,34 @@
 
 #include "../widget/scenetoolbar.hpp"
 #include "../widget/scenetoolmode.hpp"
+#include "../widget/scenetoolrun.hpp"
 #include "../widget/scenetooltoggle.hpp"
 #include "../widget/scenetooltoggle2.hpp"
-#include "../widget/scenetoolrun.hpp"
 
-#include "tablebottombox.hpp"
 #include "creator.hpp"
+#include "tablebottombox.hpp"
 
-CSVWorld::SceneSubView::SceneSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
-: SubView (id), mScene(nullptr), mLayout(new QHBoxLayout), mDocument(document), mToolbar(nullptr)
+CSVWorld::SceneSubView::SceneSubView(const CSMWorld::UniversalId& id, CSMDoc::Document& document)
+    : SubView(id)
+    , mScene(nullptr)
+    , mLayout(new QHBoxLayout)
+    , mDocument(document)
+    , mToolbar(nullptr)
 {
-    QVBoxLayout *layout = new QVBoxLayout;
+    QVBoxLayout* layout = new QVBoxLayout;
 
-    layout->addWidget (mBottom = new TableBottomBox (NullCreatorFactory(), document, id, this), 0);
+    layout->addWidget(mBottom = new TableBottomBox(NullCreatorFactory(), document, id, this), 0);
 
-    mLayout->setContentsMargins (QMargins (0, 0, 0, 0));
+    mLayout->setContentsMargins(QMargins(0, 0, 0, 0));
 
     CSVRender::WorldspaceWidget* worldspaceWidget = nullptr;
     widgetType whatWidget;
 
-    if (id.getId()==ESM::CellId::sDefaultWorldspace)
+    if (id.getId() == ESM::CellId::sDefaultWorldspace)
     {
         whatWidget = widget_Paged;
 
-        CSVRender::PagedWorldspaceWidget *newWidget = new CSVRender::PagedWorldspaceWidget (this, document);
+        CSVRender::PagedWorldspaceWidget* newWidget = new CSVRender::PagedWorldspaceWidget(this, document);
 
         worldspaceWidget = newWidget;
 
@@ -51,7 +55,8 @@ CSVWorld::SceneSubView::SceneSubView (const CSMWorld::UniversalId& id, CSMDoc::D
     {
         whatWidget = widget_Unpaged;
 
-        CSVRender::UnpagedWorldspaceWidget *newWidget = new CSVRender::UnpagedWorldspaceWidget (id.getId(), document, this);
+        CSVRender::UnpagedWorldspaceWidget* newWidget
+            = new CSVRender::UnpagedWorldspaceWidget(id.getId(), document, this);
 
         worldspaceWidget = newWidget;
 
@@ -60,93 +65,85 @@ CSVWorld::SceneSubView::SceneSubView (const CSMWorld::UniversalId& id, CSMDoc::D
 
     replaceToolbarAndWorldspace(worldspaceWidget, makeToolbar(worldspaceWidget, whatWidget));
 
-    layout->insertLayout (0, mLayout, 1);
+    layout->insertLayout(0, mLayout, 1);
 
-    CSVFilter::FilterBox *filterBox = new CSVFilter::FilterBox (document.getData(), this);
+    CSVFilter::FilterBox* filterBox = new CSVFilter::FilterBox(document.getData(), this);
 
-    layout->insertWidget (0, filterBox);
+    layout->insertWidget(0, filterBox);
 
-    QWidget *widget = new QWidget;
+    QWidget* widget = new QWidget;
 
-    widget->setLayout (layout);
+    widget->setLayout(layout);
 
-    setWidget (widget);
+    setWidget(widget);
 }
 
-void CSVWorld::SceneSubView::makeConnections (CSVRender::UnpagedWorldspaceWidget* widget)
+void CSVWorld::SceneSubView::makeConnections(CSVRender::UnpagedWorldspaceWidget* widget)
 {
-    connect(widget, &CSVRender::UnpagedWorldspaceWidget::closeRequest, 
-            this, qOverload<>(&SceneSubView::closeRequest));
+    connect(widget, &CSVRender::UnpagedWorldspaceWidget::closeRequest, this, qOverload<>(&SceneSubView::closeRequest));
 
-    connect(widget, &CSVRender::UnpagedWorldspaceWidget::dataDropped,
-            this, &SceneSubView::handleDrop);
+    connect(widget, &CSVRender::UnpagedWorldspaceWidget::dataDropped, this, &SceneSubView::handleDrop);
 
-    connect(widget, &CSVRender::UnpagedWorldspaceWidget::cellChanged,
-            this, qOverload<const CSMWorld::UniversalId&>(&SceneSubView::cellSelectionChanged));
+    connect(widget, &CSVRender::UnpagedWorldspaceWidget::cellChanged, this,
+        qOverload<const CSMWorld::UniversalId&>(&SceneSubView::cellSelectionChanged));
 
-    connect(widget, &CSVRender::UnpagedWorldspaceWidget::requestFocus,
-            this, &SceneSubView::requestFocus);
+    connect(widget, &CSVRender::UnpagedWorldspaceWidget::requestFocus, this, &SceneSubView::requestFocus);
 }
 
-void CSVWorld::SceneSubView::makeConnections (CSVRender::PagedWorldspaceWidget* widget)
+void CSVWorld::SceneSubView::makeConnections(CSVRender::PagedWorldspaceWidget* widget)
 {
-    connect(widget, &CSVRender::PagedWorldspaceWidget::closeRequest, 
-            this, qOverload<>(&SceneSubView::closeRequest));
+    connect(widget, &CSVRender::PagedWorldspaceWidget::closeRequest, this, qOverload<>(&SceneSubView::closeRequest));
 
-    connect(widget, &CSVRender::PagedWorldspaceWidget::dataDropped,
-            this, &SceneSubView::handleDrop);
+    connect(widget, &CSVRender::PagedWorldspaceWidget::dataDropped, this, &SceneSubView::handleDrop);
 
-    connect(widget, &CSVRender::PagedWorldspaceWidget::cellSelectionChanged,
-            this, qOverload<const CSMWorld::CellSelection&>(&SceneSubView::cellSelectionChanged));
+    connect(widget, &CSVRender::PagedWorldspaceWidget::cellSelectionChanged, this,
+        qOverload<const CSMWorld::CellSelection&>(&SceneSubView::cellSelectionChanged));
 
-    connect(widget, &CSVRender::PagedWorldspaceWidget::requestFocus,
-            this, &SceneSubView::requestFocus);
+    connect(widget, &CSVRender::PagedWorldspaceWidget::requestFocus, this, &SceneSubView::requestFocus);
 }
 
-CSVWidget::SceneToolbar* CSVWorld::SceneSubView::makeToolbar (CSVRender::WorldspaceWidget* widget, widgetType type)
+CSVWidget::SceneToolbar* CSVWorld::SceneSubView::makeToolbar(CSVRender::WorldspaceWidget* widget, widgetType type)
 {
-    CSVWidget::SceneToolbar* toolbar = new CSVWidget::SceneToolbar (48+6, this);
+    CSVWidget::SceneToolbar* toolbar = new CSVWidget::SceneToolbar(48 + 6, this);
 
-    CSVWidget::SceneToolMode *navigationTool = widget->makeNavigationSelector (toolbar);
-    toolbar->addTool (navigationTool);
+    CSVWidget::SceneToolMode* navigationTool = widget->makeNavigationSelector(toolbar);
+    toolbar->addTool(navigationTool);
 
-    CSVWidget::SceneToolMode *lightingTool = widget->makeLightingSelector (toolbar);
-    toolbar->addTool (lightingTool);
+    CSVWidget::SceneToolMode* lightingTool = widget->makeLightingSelector(toolbar);
+    toolbar->addTool(lightingTool);
 
-    CSVWidget::SceneToolToggle2 *sceneVisibilityTool =
-        widget->makeSceneVisibilitySelector (toolbar);
-    toolbar->addTool (sceneVisibilityTool);
+    CSVWidget::SceneToolToggle2* sceneVisibilityTool = widget->makeSceneVisibilitySelector(toolbar);
+    toolbar->addTool(sceneVisibilityTool);
 
-    if (type==widget_Paged)
+    if (type == widget_Paged)
     {
-        CSVWidget::SceneToolToggle2 *controlVisibilityTool =
-            dynamic_cast<CSVRender::PagedWorldspaceWidget&> (*widget).
-            makeControlVisibilitySelector (toolbar);
+        CSVWidget::SceneToolToggle2* controlVisibilityTool
+            = dynamic_cast<CSVRender::PagedWorldspaceWidget&>(*widget).makeControlVisibilitySelector(toolbar);
 
-        toolbar->addTool (controlVisibilityTool);
+        toolbar->addTool(controlVisibilityTool);
     }
 
-    CSVWidget::SceneToolRun *runTool = widget->makeRunTool (toolbar);
-    toolbar->addTool (runTool);
+    CSVWidget::SceneToolRun* runTool = widget->makeRunTool(toolbar);
+    toolbar->addTool(runTool);
 
-    toolbar->addTool (widget->makeEditModeSelector (toolbar), runTool);
+    toolbar->addTool(widget->makeEditModeSelector(toolbar), runTool);
 
     return toolbar;
 }
 
-void CSVWorld::SceneSubView::setEditLock (bool locked)
+void CSVWorld::SceneSubView::setEditLock(bool locked)
 {
-    mScene->setEditLock (locked);
+    mScene->setEditLock(locked);
 }
 
-void CSVWorld::SceneSubView::setStatusBar (bool show)
+void CSVWorld::SceneSubView::setStatusBar(bool show)
 {
-    mBottom->setStatusBar (show);
+    mBottom->setStatusBar(show);
 }
 
-void CSVWorld::SceneSubView::useHint (const std::string& hint)
+void CSVWorld::SceneSubView::useHint(const std::string& hint)
 {
-    mScene->useViewHint (hint);
+    mScene->useViewHint(hint);
 }
 
 std::string CSVWorld::SceneSubView::getTitle() const
@@ -154,16 +151,16 @@ std::string CSVWorld::SceneSubView::getTitle() const
     return mTitle;
 }
 
-void CSVWorld::SceneSubView::cellSelectionChanged (const CSMWorld::UniversalId& id)
+void CSVWorld::SceneSubView::cellSelectionChanged(const CSMWorld::UniversalId& id)
 {
     setUniversalId(id);
 
     mTitle = "Scene: " + getUniversalId().getId();
-    setWindowTitle (QString::fromUtf8 (mTitle.c_str()));
+    setWindowTitle(QString::fromUtf8(mTitle.c_str()));
     emit updateTitle();
 }
 
-void CSVWorld::SceneSubView::cellSelectionChanged (const CSMWorld::CellSelection& selection)
+void CSVWorld::SceneSubView::cellSelectionChanged(const CSMWorld::CellSelection& selection)
 {
     setUniversalId(CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Scene, ESM::CellId::sDefaultWorldspace));
     int size = selection.getSize();
@@ -171,39 +168,39 @@ void CSVWorld::SceneSubView::cellSelectionChanged (const CSMWorld::CellSelection
     std::ostringstream stream;
     stream << "Scene: " << getUniversalId().getId();
 
-    if (size==0)
+    if (size == 0)
         stream << " (empty)";
-    else if (size==1)
+    else if (size == 1)
     {
         stream << " (" << *selection.begin() << ")";
     }
     else
     {
-        stream << " (" << selection.getCentre() << " and " << size-1 << " more ";
+        stream << " (" << selection.getCentre() << " and " << size - 1 << " more ";
 
-        if (size>1)
+        if (size > 1)
             stream << "cells around it)";
         else
             stream << "cell around it)";
     }
 
     mTitle = stream.str();
-    setWindowTitle (QString::fromUtf8 (mTitle.c_str()));
+    setWindowTitle(QString::fromUtf8(mTitle.c_str()));
     emit updateTitle();
 }
 
-void CSVWorld::SceneSubView::handleDrop (const std::vector< CSMWorld::UniversalId >& universalIdData)
+void CSVWorld::SceneSubView::handleDrop(const std::vector<CSMWorld::UniversalId>& universalIdData)
 {
     CSVRender::PagedWorldspaceWidget* pagedNewWidget = nullptr;
     CSVRender::UnpagedWorldspaceWidget* unPagedNewWidget = nullptr;
     CSVWidget::SceneToolbar* toolbar = nullptr;
 
-    CSVRender::WorldspaceWidget::DropType type = CSVRender::WorldspaceWidget::getDropType (universalIdData);
+    CSVRender::WorldspaceWidget::DropType type = CSVRender::WorldspaceWidget::getDropType(universalIdData);
 
-    switch (mScene->getDropRequirements (type))
+    switch (mScene->getDropRequirements(type))
     {
         case CSVRender::WorldspaceWidget::canHandle:
-            mScene->handleDrop (universalIdData, type);
+            mScene->handleDrop(universalIdData, type);
             break;
 
         case CSVRender::WorldspaceWidget::needPaged:
@@ -211,11 +208,12 @@ void CSVWorld::SceneSubView::handleDrop (const std::vector< CSMWorld::UniversalI
             toolbar = makeToolbar(pagedNewWidget, widget_Paged);
             makeConnections(pagedNewWidget);
             replaceToolbarAndWorldspace(pagedNewWidget, toolbar);
-            mScene->handleDrop (universalIdData, type);
+            mScene->handleDrop(universalIdData, type);
             break;
 
         case CSVRender::WorldspaceWidget::needUnpaged:
-            unPagedNewWidget = new CSVRender::UnpagedWorldspaceWidget(universalIdData.begin()->getId(), mDocument, this);
+            unPagedNewWidget
+                = new CSVRender::UnpagedWorldspaceWidget(universalIdData.begin()->getId(), mDocument, this);
             toolbar = makeToolbar(unPagedNewWidget, widget_Unpaged);
             makeConnections(unPagedNewWidget);
             replaceToolbarAndWorldspace(unPagedNewWidget, toolbar);
@@ -227,7 +225,8 @@ void CSVWorld::SceneSubView::handleDrop (const std::vector< CSMWorld::UniversalI
     }
 }
 
-void CSVWorld::SceneSubView::replaceToolbarAndWorldspace (CSVRender::WorldspaceWidget* widget, CSVWidget::SceneToolbar* toolbar)
+void CSVWorld::SceneSubView::replaceToolbarAndWorldspace(
+    CSVRender::WorldspaceWidget* widget, CSVWidget::SceneToolbar* toolbar)
 {
     assert(mLayout);
 
@@ -246,14 +245,14 @@ void CSVWorld::SceneSubView::replaceToolbarAndWorldspace (CSVRender::WorldspaceW
     mScene = widget;
     mToolbar = toolbar;
 
-    connect (mScene, &CSVRender::WorldspaceWidget::focusToolbarRequest, 
-        mToolbar, qOverload<>(&CSVWidget::SceneToolbar::setFocus));
-    connect (mToolbar, &CSVWidget::SceneToolbar::focusSceneRequest, 
-        mScene, qOverload<>(&CSVRender::WorldspaceWidget::setFocus));
+    connect(mScene, &CSVRender::WorldspaceWidget::focusToolbarRequest, mToolbar,
+        qOverload<>(&CSVWidget::SceneToolbar::setFocus));
+    connect(mToolbar, &CSVWidget::SceneToolbar::focusSceneRequest, mScene,
+        qOverload<>(&CSVRender::WorldspaceWidget::setFocus));
 
-    mLayout->addWidget (mToolbar, 0);
-    mLayout->addWidget (mScene, 1);
+    mLayout->addWidget(mToolbar, 0);
+    mLayout->addWidget(mScene, 1);
 
     mScene->selectDefaultNavigationMode();
-    setFocusProxy (mScene);
+    setFocusProxy(mScene);
 }
diff --git a/apps/opencs/view/world/scenesubview.hpp b/apps/opencs/view/world/scenesubview.hpp
index 53cd54e7ac..446a7a5e89 100644
--- a/apps/opencs/view/world/scenesubview.hpp
+++ b/apps/opencs/view/world/scenesubview.hpp
@@ -37,54 +37,52 @@ namespace CSVWorld
 
     class SceneSubView : public CSVDoc::SubView
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            TableBottomBox *mBottom;
-            CSVRender::WorldspaceWidget *mScene;
-            QHBoxLayout* mLayout;
-            CSMDoc::Document& mDocument;
-            CSVWidget::SceneToolbar* mToolbar;
-            std::string mTitle;
+        TableBottomBox* mBottom;
+        CSVRender::WorldspaceWidget* mScene;
+        QHBoxLayout* mLayout;
+        CSMDoc::Document& mDocument;
+        CSVWidget::SceneToolbar* mToolbar;
+        std::string mTitle;
 
-        public:
+    public:
+        SceneSubView(const CSMWorld::UniversalId& id, CSMDoc::Document& document);
 
-            SceneSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document);
+        void setEditLock(bool locked) override;
 
-            void setEditLock (bool locked) override;
+        void setStatusBar(bool show) override;
 
-            void setStatusBar (bool show) override;
+        void useHint(const std::string& hint) override;
 
-            void useHint (const std::string& hint) override;
+        std::string getTitle() const override;
 
-            std::string getTitle() const override;
+    private:
+        void makeConnections(CSVRender::PagedWorldspaceWidget* widget);
 
-        private:
+        void makeConnections(CSVRender::UnpagedWorldspaceWidget* widget);
 
-            void makeConnections(CSVRender::PagedWorldspaceWidget* widget);
+        void replaceToolbarAndWorldspace(CSVRender::WorldspaceWidget* widget, CSVWidget::SceneToolbar* toolbar);
 
-            void makeConnections(CSVRender::UnpagedWorldspaceWidget* widget);
+        enum widgetType
+        {
+            widget_Paged,
+            widget_Unpaged
+        };
 
-            void replaceToolbarAndWorldspace(CSVRender::WorldspaceWidget* widget, CSVWidget::SceneToolbar* toolbar);
+        CSVWidget::SceneToolbar* makeToolbar(CSVRender::WorldspaceWidget* widget, widgetType type);
 
-            enum widgetType
-            {
-                widget_Paged,
-                widget_Unpaged
-            };
+    private slots:
 
-            CSVWidget::SceneToolbar* makeToolbar(CSVRender::WorldspaceWidget* widget, widgetType type);
+        void cellSelectionChanged(const CSMWorld::CellSelection& selection);
 
-        private slots:
+        void cellSelectionChanged(const CSMWorld::UniversalId& id);
 
-            void cellSelectionChanged (const CSMWorld::CellSelection& selection);
+        void handleDrop(const std::vector<CSMWorld::UniversalId>& data);
 
-            void cellSelectionChanged (const CSMWorld::UniversalId& id);
+    signals:
 
-            void handleDrop(const std::vector<CSMWorld::UniversalId>& data);
-
-        signals:
-
-            void requestFocus (const std::string& id);
+        void requestFocus(const std::string& id);
     };
 }
 
diff --git a/apps/opencs/view/world/scriptedit.cpp b/apps/opencs/view/world/scriptedit.cpp
index 547553dbf5..142e559a26 100644
--- a/apps/opencs/view/world/scriptedit.cpp
+++ b/apps/opencs/view/world/scriptedit.cpp
@@ -3,19 +3,20 @@
 #include <algorithm>
 
 #include <QDragEnterEvent>
-#include <QString>
+#include <QMenu>
 #include <QPainter>
+#include <QString>
 #include <QTextDocumentFragment>
-#include <QMenu>
 
 #include "../../model/doc/document.hpp"
 
-#include "../../model/world/universalid.hpp"
-#include "../../model/world/tablemimedata.hpp"
-#include "../../model/prefs/state.hpp"
 #include "../../model/prefs/shortcut.hpp"
+#include "../../model/prefs/state.hpp"
+#include "../../model/world/tablemimedata.hpp"
+#include "../../model/world/universalid.hpp"
 
-CSVWorld::ScriptEdit::ChangeLock::ChangeLock (ScriptEdit& edit) : mEdit (edit)
+CSVWorld::ScriptEdit::ChangeLock::ChangeLock(ScriptEdit& edit)
+    : mEdit(edit)
 {
     ++mEdit.mChangeLocked;
 }
@@ -25,95 +26,77 @@ CSVWorld::ScriptEdit::ChangeLock::~ChangeLock()
     --mEdit.mChangeLocked;
 }
 
-bool CSVWorld::ScriptEdit::event (QEvent *event)
+bool CSVWorld::ScriptEdit::event(QEvent* event)
 {
     // ignore undo and redo shortcuts
-    if (event->type()==QEvent::ShortcutOverride)
+    if (event->type() == QEvent::ShortcutOverride)
     {
-        QKeyEvent *keyEvent = static_cast<QKeyEvent *> (event);
+        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
 
-        if (keyEvent->matches (QKeySequence::Undo) || keyEvent->matches (QKeySequence::Redo))
+        if (keyEvent->matches(QKeySequence::Undo) || keyEvent->matches(QKeySequence::Redo))
             return true;
     }
 
-    return QPlainTextEdit::event (event);
+    return QPlainTextEdit::event(event);
 }
 
-CSVWorld::ScriptEdit::ScriptEdit(
-    const CSMDoc::Document& document,
-    ScriptHighlighter::Mode mode,
-    QWidget* parent
-) : QPlainTextEdit(parent),
-    mChangeLocked(0),
-    mShowLineNum(false),
-    mLineNumberArea(nullptr),
-    mDefaultFont(font()),
-    mMonoFont(QFont("Monospace")),
-    mTabCharCount(4),
-    mMarkOccurrences(true),
-    mDocument(document),
-    mWhiteListQoutes("^[a-z|_]{1}[a-z|0-9|_]{0,}$", Qt::CaseInsensitive)
+CSVWorld::ScriptEdit::ScriptEdit(const CSMDoc::Document& document, ScriptHighlighter::Mode mode, QWidget* parent)
+    : QPlainTextEdit(parent)
+    , mChangeLocked(0)
+    , mShowLineNum(false)
+    , mLineNumberArea(nullptr)
+    , mDefaultFont(font())
+    , mMonoFont(QFont("Monospace"))
+    , mTabCharCount(4)
+    , mMarkOccurrences(true)
+    , mDocument(document)
+    , mWhiteListQoutes("^[a-z|_]{1}[a-z|0-9|_]{0,}$", Qt::CaseInsensitive)
 {
     wrapLines(false);
     setTabWidth();
-    setUndoRedoEnabled (false); // we use OpenCS-wide undo/redo instead
-
-    mAllowedTypes <<CSMWorld::UniversalId::Type_Journal
-                  <<CSMWorld::UniversalId::Type_Global
-                  <<CSMWorld::UniversalId::Type_Topic
-                  <<CSMWorld::UniversalId::Type_Sound
-                  <<CSMWorld::UniversalId::Type_Spell
-                  <<CSMWorld::UniversalId::Type_Cell
-                  <<CSMWorld::UniversalId::Type_Referenceable
-                  <<CSMWorld::UniversalId::Type_Activator
-                  <<CSMWorld::UniversalId::Type_Potion
-                  <<CSMWorld::UniversalId::Type_Apparatus
-                  <<CSMWorld::UniversalId::Type_Armor
-                  <<CSMWorld::UniversalId::Type_Book
-                  <<CSMWorld::UniversalId::Type_Clothing
-                  <<CSMWorld::UniversalId::Type_Container
-                  <<CSMWorld::UniversalId::Type_Creature
-                  <<CSMWorld::UniversalId::Type_Door
-                  <<CSMWorld::UniversalId::Type_Ingredient
-                  <<CSMWorld::UniversalId::Type_CreatureLevelledList
-                  <<CSMWorld::UniversalId::Type_ItemLevelledList
-                  <<CSMWorld::UniversalId::Type_Light
-                  <<CSMWorld::UniversalId::Type_Lockpick
-                  <<CSMWorld::UniversalId::Type_Miscellaneous
-                  <<CSMWorld::UniversalId::Type_Npc
-                  <<CSMWorld::UniversalId::Type_Probe
-                  <<CSMWorld::UniversalId::Type_Repair
-                  <<CSMWorld::UniversalId::Type_Static
-                  <<CSMWorld::UniversalId::Type_Weapon
-                  <<CSMWorld::UniversalId::Type_Script
-                  <<CSMWorld::UniversalId::Type_Region;
-    
+    setUndoRedoEnabled(false); // we use OpenCS-wide undo/redo instead
+
+    mAllowedTypes << CSMWorld::UniversalId::Type_Journal << CSMWorld::UniversalId::Type_Global
+                  << CSMWorld::UniversalId::Type_Topic << CSMWorld::UniversalId::Type_Sound
+                  << CSMWorld::UniversalId::Type_Spell << CSMWorld::UniversalId::Type_Cell
+                  << CSMWorld::UniversalId::Type_Referenceable << CSMWorld::UniversalId::Type_Activator
+                  << CSMWorld::UniversalId::Type_Potion << CSMWorld::UniversalId::Type_Apparatus
+                  << CSMWorld::UniversalId::Type_Armor << CSMWorld::UniversalId::Type_Book
+                  << CSMWorld::UniversalId::Type_Clothing << CSMWorld::UniversalId::Type_Container
+                  << CSMWorld::UniversalId::Type_Creature << CSMWorld::UniversalId::Type_Door
+                  << CSMWorld::UniversalId::Type_Ingredient << CSMWorld::UniversalId::Type_CreatureLevelledList
+                  << CSMWorld::UniversalId::Type_ItemLevelledList << CSMWorld::UniversalId::Type_Light
+                  << CSMWorld::UniversalId::Type_Lockpick << CSMWorld::UniversalId::Type_Miscellaneous
+                  << CSMWorld::UniversalId::Type_Npc << CSMWorld::UniversalId::Type_Probe
+                  << CSMWorld::UniversalId::Type_Repair << CSMWorld::UniversalId::Type_Static
+                  << CSMWorld::UniversalId::Type_Weapon << CSMWorld::UniversalId::Type_Script
+                  << CSMWorld::UniversalId::Type_Region;
+
     connect(this, &ScriptEdit::cursorPositionChanged, this, &ScriptEdit::markOccurrences);
 
-    mCommentAction = new QAction (tr ("Comment Selection"), this);
+    mCommentAction = new QAction(tr("Comment Selection"), this);
     connect(mCommentAction, &QAction::triggered, this, &ScriptEdit::commentSelection);
-    CSMPrefs::Shortcut *commentShortcut = new CSMPrefs::Shortcut("script-editor-comment", this);
+    CSMPrefs::Shortcut* commentShortcut = new CSMPrefs::Shortcut("script-editor-comment", this);
     commentShortcut->associateAction(mCommentAction);
 
-    mUncommentAction = new QAction (tr ("Uncomment Selection"), this);
+    mUncommentAction = new QAction(tr("Uncomment Selection"), this);
     connect(mUncommentAction, &QAction::triggered, this, &ScriptEdit::uncommentSelection);
-    CSMPrefs::Shortcut *uncommentShortcut = new CSMPrefs::Shortcut("script-editor-uncomment", this);
+    CSMPrefs::Shortcut* uncommentShortcut = new CSMPrefs::Shortcut("script-editor-uncomment", this);
     uncommentShortcut->associateAction(mUncommentAction);
 
-    mHighlighter = new ScriptHighlighter (document.getData(), mode, ScriptEdit::document());
+    mHighlighter = new ScriptHighlighter(document.getData(), mode, ScriptEdit::document());
 
-    connect (&document.getData(), &CSMWorld::Data::idListChanged, this, &ScriptEdit::idListChanged);
+    connect(&document.getData(), &CSMWorld::Data::idListChanged, this, &ScriptEdit::idListChanged);
 
-    connect (&mUpdateTimer, &QTimer::timeout, this, &ScriptEdit::updateHighlighting);
+    connect(&mUpdateTimer, &QTimer::timeout, this, &ScriptEdit::updateHighlighting);
 
-    connect (&CSMPrefs::State::get(), &CSMPrefs::State::settingChanged,
-        this, &ScriptEdit::settingChanged);
+    connect(&CSMPrefs::State::get(), &CSMPrefs::State::settingChanged, this, &ScriptEdit::settingChanged);
     {
-        ChangeLock lock (*this);
+        ChangeLock lock(*this);
         CSMPrefs::get()["Scripts"].update();
     }
 
-    mUpdateTimer.setSingleShot (true);
+    mUpdateTimer.setSingleShot(true);
 
     // TODO: provide a font selector dialogue
     mMonoFont.setStyleHint(QFont::TypeWriter);
@@ -128,7 +111,7 @@ CSVWorld::ScriptEdit::ScriptEdit(
 
 void CSVWorld::ScriptEdit::showLineNum(bool show)
 {
-    if(show!=mShowLineNum)
+    if (show != mShowLineNum)
     {
         mShowLineNum = show;
         updateLineNumberAreaWidth(0);
@@ -137,67 +120,69 @@ void CSVWorld::ScriptEdit::showLineNum(bool show)
 
 bool CSVWorld::ScriptEdit::isChangeLocked() const
 {
-    return mChangeLocked!=0;
+    return mChangeLocked != 0;
 }
 
-void CSVWorld::ScriptEdit::dragEnterEvent (QDragEnterEvent* event)
+void CSVWorld::ScriptEdit::dragEnterEvent(QDragEnterEvent* event)
 {
-    const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*> (event->mimeData());
+    const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*>(event->mimeData());
     if (!mime)
         QPlainTextEdit::dragEnterEvent(event);
     else
     {
-        setTextCursor (cursorForPosition (event->pos()));
+        setTextCursor(cursorForPosition(event->pos()));
         event->acceptProposedAction();
     }
 }
 
-void CSVWorld::ScriptEdit::dragMoveEvent (QDragMoveEvent* event)
+void CSVWorld::ScriptEdit::dragMoveEvent(QDragMoveEvent* event)
 {
-    const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*> (event->mimeData());
+    const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*>(event->mimeData());
     if (!mime)
         QPlainTextEdit::dragMoveEvent(event);
     else
     {
-        setTextCursor (cursorForPosition (event->pos()));
+        setTextCursor(cursorForPosition(event->pos()));
         event->accept();
     }
 }
 
-void CSVWorld::ScriptEdit::dropEvent (QDropEvent* event)
+void CSVWorld::ScriptEdit::dropEvent(QDropEvent* event)
 {
-    const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*> (event->mimeData());
+    const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*>(event->mimeData());
     if (!mime) // May happen when non-records (e.g. plain text) are dragged and dropped
     {
         QPlainTextEdit::dropEvent(event);
         return;
     }
 
-    setTextCursor (cursorForPosition (event->pos()));
+    setTextCursor(cursorForPosition(event->pos()));
 
-    if (mime->fromDocument (mDocument))
+    if (mime->fromDocument(mDocument))
     {
-        std::vector<CSMWorld::UniversalId> records (mime->getData());
+        std::vector<CSMWorld::UniversalId> records(mime->getData());
 
         for (std::vector<CSMWorld::UniversalId>::iterator it = records.begin(); it != records.end(); ++it)
         {
-            if (mAllowedTypes.contains (it->getType()))
+            if (mAllowedTypes.contains(it->getType()))
             {
                 if (stringNeedsQuote(it->getId()))
                 {
-                    insertPlainText(QString::fromUtf8 (('"' + it->getId() + '"').c_str()));
-                } else {
-                    insertPlainText(QString::fromUtf8 (it->getId().c_str()));
+                    insertPlainText(QString::fromUtf8(('"' + it->getId() + '"').c_str()));
+                }
+                else
+                {
+                    insertPlainText(QString::fromUtf8(it->getId().c_str()));
                 }
             }
         }
     }
 }
 
-bool CSVWorld::ScriptEdit::stringNeedsQuote (const std::string& id) const
+bool CSVWorld::ScriptEdit::stringNeedsQuote(const std::string& id) const
 {
     const QString string(QString::fromUtf8(id.c_str())); //<regex> is only for c++11, so let's use qregexp for now.
-    //I'm not quite sure when do we need to put quotes. To be safe we will use quotes for anything other than…
+    // I'm not quite sure when do we need to put quotes. To be safe we will use quotes for anything other than…
     return !(string.contains(mWhiteListQoutes));
 }
 
@@ -219,7 +204,7 @@ void CSVWorld::ScriptEdit::wrapLines(bool wrap)
     }
 }
 
-void CSVWorld::ScriptEdit::settingChanged(const CSMPrefs::Setting *setting)
+void CSVWorld::ScriptEdit::settingChanged(const CSMPrefs::Setting* setting)
 {
     // Determine which setting was changed.
     if (mHighlighter->settingChanged(setting))
@@ -258,7 +243,7 @@ void CSVWorld::ScriptEdit::idListChanged()
     mHighlighter->invalidateIds();
 
     if (!mUpdateTimer.isActive())
-        mUpdateTimer.start (0);
+        mUpdateTimer.start(0);
 }
 
 void CSVWorld::ScriptEdit::updateHighlighting()
@@ -266,14 +251,14 @@ void CSVWorld::ScriptEdit::updateHighlighting()
     if (isChangeLocked())
         return;
 
-    ChangeLock lock (*this);
+    ChangeLock lock(*this);
 
     mHighlighter->rehighlight();
 }
 
 int CSVWorld::ScriptEdit::lineNumberAreaWidth()
 {
-    if(!mShowLineNum)
+    if (!mShowLineNum)
         return 0;
 
     int digits = 1;
@@ -293,7 +278,7 @@ void CSVWorld::ScriptEdit::updateLineNumberAreaWidth(int /* newBlockCount */)
     setViewportMargins(lineNumberAreaWidth(), 0, 0, 0);
 }
 
-void CSVWorld::ScriptEdit::updateLineNumberArea(const QRect &rect, int dy)
+void CSVWorld::ScriptEdit::updateLineNumberArea(const QRect& rect, int dy)
 {
     if (dy)
         mLineNumberArea->scroll(0, dy);
@@ -322,7 +307,7 @@ void CSVWorld::ScriptEdit::markOccurrences()
         mHighlighter->rehighlight();
     }
 }
-  
+
 void CSVWorld::ScriptEdit::commentSelection()
 {
     QTextCursor begin = textCursor();
@@ -355,7 +340,8 @@ void CSVWorld::ScriptEdit::uncommentSelection()
 
     begin.beginEditBlock();
 
-    for (; begin < end; begin.movePosition(QTextCursor::EndOfLine), begin.movePosition(QTextCursor::Right)) {
+    for (; begin < end; begin.movePosition(QTextCursor::EndOfLine), begin.movePosition(QTextCursor::Right))
+    {
         begin.select(QTextCursor::LineUnderCursor);
         QString line = begin.selectedText();
 
@@ -382,7 +368,7 @@ void CSVWorld::ScriptEdit::uncommentSelection()
     begin.endEditBlock();
 }
 
-void CSVWorld::ScriptEdit::resizeEvent(QResizeEvent *e)
+void CSVWorld::ScriptEdit::resizeEvent(QResizeEvent* e)
 {
     QPlainTextEdit::resizeEvent(e);
 
@@ -390,9 +376,9 @@ void CSVWorld::ScriptEdit::resizeEvent(QResizeEvent *e)
     mLineNumberArea->setGeometry(QRect(cr.left(), cr.top(), lineNumberAreaWidth(), cr.height()));
 }
 
-void CSVWorld::ScriptEdit::contextMenuEvent(QContextMenuEvent *event)
+void CSVWorld::ScriptEdit::contextMenuEvent(QContextMenuEvent* event)
 {
-    QMenu *menu = createStandardContextMenu();
+    QMenu* menu = createStandardContextMenu();
 
     // remove redo/undo since they are disabled
     QList<QAction*> menuActions = menu->actions();
@@ -410,22 +396,22 @@ void CSVWorld::ScriptEdit::contextMenuEvent(QContextMenuEvent *event)
     delete menu;
 }
 
-void CSVWorld::ScriptEdit::lineNumberAreaPaintEvent(QPaintEvent *event)
+void CSVWorld::ScriptEdit::lineNumberAreaPaintEvent(QPaintEvent* event)
 {
     QPainter painter(mLineNumberArea);
 
     QTextBlock block = firstVisibleBlock();
     int blockNumber = block.blockNumber();
-    int top = (int) blockBoundingGeometry(block).translated(contentOffset()).top();
-    int bottom = top + (int) blockBoundingRect(block).height();
+    int top = (int)blockBoundingGeometry(block).translated(contentOffset()).top();
+    int bottom = top + (int)blockBoundingRect(block).height();
 
     int startBlock = textCursor().blockNumber();
     int endBlock = textCursor().blockNumber();
-    if(textCursor().hasSelection())
+    if (textCursor().hasSelection())
     {
         QString str = textCursor().selection().toPlainText();
         int offset = str.count("\n");
-        if(textCursor().position() < textCursor().anchor())
+        if (textCursor().position() < textCursor().anchor())
             endBlock += offset;
         else
             startBlock -= offset;
@@ -440,7 +426,7 @@ void CSVWorld::ScriptEdit::lineNumberAreaPaintEvent(QPaintEvent *event)
         {
             QFont newFont = painter.font();
             QString number = QString::number(blockNumber + 1);
-            if(blockNumber >= startBlock && blockNumber <= endBlock)
+            if (blockNumber >= startBlock && blockNumber <= endBlock)
             {
                 painter.setBackground(Qt::cyan);
                 painter.setPen(Qt::darkMagenta);
@@ -452,27 +438,29 @@ void CSVWorld::ScriptEdit::lineNumberAreaPaintEvent(QPaintEvent *event)
                 painter.setPen(Qt::black);
             }
             painter.setFont(newFont);
-            painter.drawText(0, top, mLineNumberArea->width(), fontMetrics().height(),
-                             Qt::AlignRight, number);
+            painter.drawText(0, top, mLineNumberArea->width(), fontMetrics().height(), Qt::AlignRight, number);
             painter.setFont(font);
         }
 
         block = block.next();
         top = bottom;
-        bottom = top + (int) blockBoundingRect(block).height();
+        bottom = top + (int)blockBoundingRect(block).height();
         ++blockNumber;
     }
 }
 
-CSVWorld::LineNumberArea::LineNumberArea(ScriptEdit *editor) : QWidget(editor), mScriptEdit(editor)
-{}
+CSVWorld::LineNumberArea::LineNumberArea(ScriptEdit* editor)
+    : QWidget(editor)
+    , mScriptEdit(editor)
+{
+}
 
 QSize CSVWorld::LineNumberArea::sizeHint() const
 {
     return QSize(mScriptEdit->lineNumberAreaWidth(), 0);
 }
 
-void CSVWorld::LineNumberArea::paintEvent(QPaintEvent *event)
+void CSVWorld::LineNumberArea::paintEvent(QPaintEvent* event)
 {
     mScriptEdit->lineNumberAreaPaintEvent(event);
 }
diff --git a/apps/opencs/view/world/scriptedit.hpp b/apps/opencs/view/world/scriptedit.hpp
index 21fabee587..bb7018efd0 100644
--- a/apps/opencs/view/world/scriptedit.hpp
+++ b/apps/opencs/view/world/scriptedit.hpp
@@ -1,12 +1,12 @@
 #ifndef SCRIPTEDIT_H
 #define SCRIPTEDIT_H
 
+#include <QAction>
+#include <QFont>
 #include <QPlainTextEdit>
-#include <QWidget>
-#include <QVector>
 #include <QTimer>
-#include <QFont>
-#include <QAction>
+#include <QVector>
+#include <QWidget>
 
 #include "../../model/world/universalid.hpp"
 
@@ -26,118 +26,107 @@ namespace CSVWorld
     /// \brief Editor for scripts.
     class ScriptEdit : public QPlainTextEdit
     {
-            Q_OBJECT
-
-        public:
+        Q_OBJECT
 
-            class ChangeLock
-            {
-                    ScriptEdit& mEdit;
+    public:
+        class ChangeLock
+        {
+            ScriptEdit& mEdit;
 
-                    ChangeLock (const ChangeLock&);
-                    ChangeLock& operator= (const ChangeLock&);
+            ChangeLock(const ChangeLock&);
+            ChangeLock& operator=(const ChangeLock&);
 
-                public:
-
-                    ChangeLock (ScriptEdit& edit);
-                    ~ChangeLock();
-            };
-
-            friend class ChangeLock;
-
-        private:
-
-            int mChangeLocked;
-            ScriptHighlighter *mHighlighter;
-            QTimer mUpdateTimer;
-            bool mShowLineNum;
-            LineNumberArea *mLineNumberArea;
-            QFont mDefaultFont;
-            QFont mMonoFont;
-            int mTabCharCount;
-            bool mMarkOccurrences;
-            QAction *mCommentAction;
-            QAction *mUncommentAction;
-
-        protected:
+        public:
+            ChangeLock(ScriptEdit& edit);
+            ~ChangeLock();
+        };
 
-            bool event (QEvent *event) override;
+        friend class ChangeLock;
 
-        public:
+    private:
+        int mChangeLocked;
+        ScriptHighlighter* mHighlighter;
+        QTimer mUpdateTimer;
+        bool mShowLineNum;
+        LineNumberArea* mLineNumberArea;
+        QFont mDefaultFont;
+        QFont mMonoFont;
+        int mTabCharCount;
+        bool mMarkOccurrences;
+        QAction* mCommentAction;
+        QAction* mUncommentAction;
 
-            ScriptEdit (const CSMDoc::Document& document, ScriptHighlighter::Mode mode,
-                QWidget* parent);
+    protected:
+        bool event(QEvent* event) override;
 
-            /// Should changes to the data be ignored (i.e. not cause updated)?
-            ///
-            /// \note This mechanism is used to avoid infinite update recursions
-            bool isChangeLocked() const;
+    public:
+        ScriptEdit(const CSMDoc::Document& document, ScriptHighlighter::Mode mode, QWidget* parent);
 
-            void lineNumberAreaPaintEvent(QPaintEvent *event);
-            int lineNumberAreaWidth();
-            void showLineNum(bool show);
+        /// Should changes to the data be ignored (i.e. not cause updated)?
+        ///
+        /// \note This mechanism is used to avoid infinite update recursions
+        bool isChangeLocked() const;
 
-        protected:
+        void lineNumberAreaPaintEvent(QPaintEvent* event);
+        int lineNumberAreaWidth();
+        void showLineNum(bool show);
 
-            void resizeEvent(QResizeEvent *e) override;
+    protected:
+        void resizeEvent(QResizeEvent* e) override;
 
-            void contextMenuEvent(QContextMenuEvent *event) override;
+        void contextMenuEvent(QContextMenuEvent* event) override;
 
-        private:
+    private:
+        QVector<CSMWorld::UniversalId::Type> mAllowedTypes;
+        const CSMDoc::Document& mDocument;
+        const QRegExp mWhiteListQoutes;
 
-            QVector<CSMWorld::UniversalId::Type> mAllowedTypes;
-            const CSMDoc::Document& mDocument;
-            const QRegExp mWhiteListQoutes;
+        void dragEnterEvent(QDragEnterEvent* event) override;
 
-            void dragEnterEvent (QDragEnterEvent* event) override;
+        void dropEvent(QDropEvent* event) override;
 
-            void dropEvent (QDropEvent* event) override;
+        void dragMoveEvent(QDragMoveEvent* event) override;
 
-            void dragMoveEvent (QDragMoveEvent* event) override;
+        bool stringNeedsQuote(const std::string& id) const;
 
-            bool stringNeedsQuote(const std::string& id) const;
+        /// \brief Set tab width for script editor.
+        void setTabWidth();
 
-            /// \brief Set tab width for script editor.
-            void setTabWidth();
+        /// \brief Turn line wrapping in script editor on or off.
+        /// \param wrap Whether or not to wrap lines.
+        void wrapLines(bool wrap);
 
-            /// \brief Turn line wrapping in script editor on or off.
-            /// \param wrap Whether or not to wrap lines.
-            void wrapLines(bool wrap);
+    private slots:
 
-        private slots:
+        /// \brief Update editor when related setting is changed.
+        /// \param setting Setting that was changed.
+        void settingChanged(const CSMPrefs::Setting* setting);
 
-            /// \brief Update editor when related setting is changed.
-            /// \param setting Setting that was changed.
-            void settingChanged(const CSMPrefs::Setting *setting);
+        void idListChanged();
 
-            void idListChanged();
+        void updateHighlighting();
 
-            void updateHighlighting();
+        void updateLineNumberAreaWidth(int newBlockCount);
 
-            void updateLineNumberAreaWidth(int newBlockCount);
+        void updateLineNumberArea(const QRect&, int);
 
-            void updateLineNumberArea(const QRect &, int);
+        void markOccurrences();
 
-            void markOccurrences();
-            
-            void commentSelection();
+        void commentSelection();
 
-            void uncommentSelection();
-            
+        void uncommentSelection();
     };
 
     class LineNumberArea : public QWidget
     {
-            ScriptEdit *mScriptEdit;
-
-        public:
-
-            LineNumberArea(ScriptEdit *editor);
-            QSize sizeHint() const override;
+        ScriptEdit* mScriptEdit;
 
-        protected:
+    public:
+        LineNumberArea(ScriptEdit* editor);
+        QSize sizeHint() const override;
 
-            void paintEvent(QPaintEvent *event) override;
+    protected:
+        void paintEvent(QPaintEvent* event) override;
     };
 }
 #endif // SCRIPTEDIT_H
diff --git a/apps/opencs/view/world/scripterrortable.cpp b/apps/opencs/view/world/scripterrortable.cpp
index aefddd354b..6467913a7d 100644
--- a/apps/opencs/view/world/scripterrortable.cpp
+++ b/apps/opencs/view/world/scripterrortable.cpp
@@ -4,118 +4,122 @@
 
 #include <QHeaderView>
 
-#include <components/compiler/tokenloc.hpp>
-#include <components/compiler/scanner.hpp>
-#include <components/compiler/fileparser.hpp>
 #include <components/compiler/exception.hpp>
 #include <components/compiler/extensions0.hpp>
+#include <components/compiler/fileparser.hpp>
+#include <components/compiler/scanner.hpp>
+#include <components/compiler/tokenloc.hpp>
 
 #include "../../model/doc/document.hpp"
 
 #include "../../model/prefs/state.hpp"
 
-void CSVWorld::ScriptErrorTable::report (const std::string& message, const Compiler::TokenLoc& loc, Type type)
+void CSVWorld::ScriptErrorTable::report(const std::string& message, const Compiler::TokenLoc& loc, Type type)
 {
     std::ostringstream stream;
     stream << message << " (" << loc.mLiteral << ")";
 
-    addMessage (stream.str(), type==Compiler::ErrorHandler::WarningMessage ?
-        CSMDoc::Message::Severity_Warning : CSMDoc::Message::Severity_Error,
-        loc.mLine, loc.mColumn-loc.mLiteral.length());
+    addMessage(stream.str(),
+        type == Compiler::ErrorHandler::WarningMessage ? CSMDoc::Message::Severity_Warning
+                                                       : CSMDoc::Message::Severity_Error,
+        loc.mLine, loc.mColumn - loc.mLiteral.length());
 }
 
-void CSVWorld::ScriptErrorTable::report (const std::string& message, Type type)
+void CSVWorld::ScriptErrorTable::report(const std::string& message, Type type)
 {
-    addMessage (message, type==Compiler::ErrorHandler::WarningMessage ?
-        CSMDoc::Message::Severity_Warning : CSMDoc::Message::Severity_Error);
+    addMessage(message,
+        type == Compiler::ErrorHandler::WarningMessage ? CSMDoc::Message::Severity_Warning
+                                                       : CSMDoc::Message::Severity_Error);
 }
 
-void CSVWorld::ScriptErrorTable::addMessage (const std::string& message,
-    CSMDoc::Message::Severity severity, int line, int column)
+void CSVWorld::ScriptErrorTable::addMessage(
+    const std::string& message, CSMDoc::Message::Severity severity, int line, int column)
 {
     int row = rowCount();
 
-    setRowCount (row+1);
+    setRowCount(row + 1);
 
-    QTableWidgetItem *severityItem = new QTableWidgetItem (
-        QString::fromUtf8 (CSMDoc::Message::toString (severity).c_str()));
-    severityItem->setFlags (severityItem->flags() ^ Qt::ItemIsEditable);
-    setItem (row, 0, severityItem);
+    QTableWidgetItem* severityItem
+        = new QTableWidgetItem(QString::fromUtf8(CSMDoc::Message::toString(severity).c_str()));
+    severityItem->setFlags(severityItem->flags() ^ Qt::ItemIsEditable);
+    setItem(row, 0, severityItem);
 
-    if (line!=-1)
+    if (line != -1)
     {
-        QTableWidgetItem *lineItem = new QTableWidgetItem;
-        lineItem->setData (Qt::DisplayRole, line+1);
-        lineItem->setFlags (lineItem->flags() ^ Qt::ItemIsEditable);
-        setItem (row, 1, lineItem);
-
-        QTableWidgetItem *columnItem = new QTableWidgetItem;
-        columnItem->setData (Qt::DisplayRole, column);
-        columnItem->setFlags (columnItem->flags() ^ Qt::ItemIsEditable);
-        setItem (row, 3, columnItem);
+        QTableWidgetItem* lineItem = new QTableWidgetItem;
+        lineItem->setData(Qt::DisplayRole, line + 1);
+        lineItem->setFlags(lineItem->flags() ^ Qt::ItemIsEditable);
+        setItem(row, 1, lineItem);
+
+        QTableWidgetItem* columnItem = new QTableWidgetItem;
+        columnItem->setData(Qt::DisplayRole, column);
+        columnItem->setFlags(columnItem->flags() ^ Qt::ItemIsEditable);
+        setItem(row, 3, columnItem);
     }
     else
     {
-        QTableWidgetItem *lineItem = new QTableWidgetItem;
-        lineItem->setData (Qt::DisplayRole, "-");
-        lineItem->setFlags (lineItem->flags() ^ Qt::ItemIsEditable);
-        setItem (row, 1, lineItem);
+        QTableWidgetItem* lineItem = new QTableWidgetItem;
+        lineItem->setData(Qt::DisplayRole, "-");
+        lineItem->setFlags(lineItem->flags() ^ Qt::ItemIsEditable);
+        setItem(row, 1, lineItem);
     }
 
-    QTableWidgetItem *messageItem = new QTableWidgetItem (QString::fromUtf8 (message.c_str()));
-    messageItem->setFlags (messageItem->flags() ^ Qt::ItemIsEditable);
-    setItem (row, 2, messageItem);
+    QTableWidgetItem* messageItem = new QTableWidgetItem(QString::fromUtf8(message.c_str()));
+    messageItem->setFlags(messageItem->flags() ^ Qt::ItemIsEditable);
+    setItem(row, 2, messageItem);
 }
 
-void CSVWorld::ScriptErrorTable::setWarningsMode (const std::string& value)
+void CSVWorld::ScriptErrorTable::setWarningsMode(const std::string& value)
 {
-    if (value=="Ignore")
-        Compiler::ErrorHandler::setWarningsMode (0);
-    else if (value=="Normal")
-        Compiler::ErrorHandler::setWarningsMode (1);
-    else if (value=="Strict")
-        Compiler::ErrorHandler::setWarningsMode (2);
+    if (value == "Ignore")
+        Compiler::ErrorHandler::setWarningsMode(0);
+    else if (value == "Normal")
+        Compiler::ErrorHandler::setWarningsMode(1);
+    else if (value == "Strict")
+        Compiler::ErrorHandler::setWarningsMode(2);
 }
 
-CSVWorld::ScriptErrorTable::ScriptErrorTable (const CSMDoc::Document& document, QWidget *parent)
-: QTableWidget (parent), mContext (document.getData())
+CSVWorld::ScriptErrorTable::ScriptErrorTable(const CSMDoc::Document& document, QWidget* parent)
+    : QTableWidget(parent)
+    , mContext(document.getData())
 {
-    setColumnCount (4);
+    setColumnCount(4);
 
     QStringList headers;
-    headers << "Severity" << "Line" << "Description";
-    setHorizontalHeaderLabels (headers);
-    horizontalHeader()->setSectionResizeMode (0, QHeaderView::ResizeToContents);
-    horizontalHeader()->setSectionResizeMode (1, QHeaderView::ResizeToContents);
-    horizontalHeader()->setStretchLastSection (true);
+    headers << "Severity"
+            << "Line"
+            << "Description";
+    setHorizontalHeaderLabels(headers);
+    horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
+    horizontalHeader()->setSectionResizeMode(1, QHeaderView::ResizeToContents);
+    horizontalHeader()->setStretchLastSection(true);
     verticalHeader()->hide();
-    setColumnHidden (3, true);
+    setColumnHidden(3, true);
 
-    setSelectionMode (QAbstractItemView::NoSelection);
+    setSelectionMode(QAbstractItemView::NoSelection);
 
-    Compiler::registerExtensions (mExtensions);
-    mContext.setExtensions (&mExtensions);
+    Compiler::registerExtensions(mExtensions);
+    mContext.setExtensions(&mExtensions);
 
-    connect (&CSMPrefs::State::get(), &CSMPrefs::State::settingChanged,
-        this, &ScriptErrorTable::settingChanged);
+    connect(&CSMPrefs::State::get(), &CSMPrefs::State::settingChanged, this, &ScriptErrorTable::settingChanged);
     CSMPrefs::get()["Scripts"].update();
 
-    connect (this, &QTableWidget::cellClicked, this, &ScriptErrorTable::cellClicked);
+    connect(this, &QTableWidget::cellClicked, this, &ScriptErrorTable::cellClicked);
 }
 
-void CSVWorld::ScriptErrorTable::update (const std::string& source)
+void CSVWorld::ScriptErrorTable::update(const std::string& source)
 {
     clear();
 
     try
     {
-        std::istringstream input (source);
+        std::istringstream input(source);
 
-        Compiler::Scanner scanner (*this, input, mContext.getExtensions());
+        Compiler::Scanner scanner(*this, input, mContext.getExtensions());
 
-        Compiler::FileParser parser (*this, mContext);
+        Compiler::FileParser parser(*this, mContext);
 
-        scanner.scan (parser);
+        scanner.scan(parser);
     }
     catch (const Compiler::SourceException&)
     {
@@ -123,32 +127,32 @@ void CSVWorld::ScriptErrorTable::update (const std::string& source)
     }
     catch (const std::exception& error)
     {
-        addMessage (error.what(), CSMDoc::Message::Severity_SeriousError);
+        addMessage(error.what(), CSMDoc::Message::Severity_SeriousError);
     }
 }
 
 void CSVWorld::ScriptErrorTable::clear()
 {
-    setRowCount (0);
+    setRowCount(0);
 }
 
-bool CSVWorld::ScriptErrorTable::clearLocals (const std::string& script)
+bool CSVWorld::ScriptErrorTable::clearLocals(const std::string& script)
 {
-    return mContext.clearLocals (script);
+    return mContext.clearLocals(script);
 }
 
-void CSVWorld::ScriptErrorTable::settingChanged (const CSMPrefs::Setting *setting)
+void CSVWorld::ScriptErrorTable::settingChanged(const CSMPrefs::Setting* setting)
 {
-    if (*setting=="Scripts/warnings")
-        setWarningsMode (setting->toString());
+    if (*setting == "Scripts/warnings")
+        setWarningsMode(setting->toString());
 }
 
-void CSVWorld::ScriptErrorTable::cellClicked (int row, int column)
+void CSVWorld::ScriptErrorTable::cellClicked(int row, int column)
 {
-    if (item (row, 3))
+    if (item(row, 3))
     {
-        int scriptLine = item (row, 1)->data (Qt::DisplayRole).toInt();
-        int scriptColumn = item (row, 3)->data (Qt::DisplayRole).toInt();
-        emit highlightError (scriptLine-1, scriptColumn);
+        int scriptLine = item(row, 1)->data(Qt::DisplayRole).toInt();
+        int scriptColumn = item(row, 3)->data(Qt::DisplayRole).toInt();
+        emit highlightError(scriptLine - 1, scriptColumn);
     }
 }
diff --git a/apps/opencs/view/world/scripterrortable.hpp b/apps/opencs/view/world/scripterrortable.hpp
index 7165d0fc6a..c002d3c632 100644
--- a/apps/opencs/view/world/scripterrortable.hpp
+++ b/apps/opencs/view/world/scripterrortable.hpp
@@ -6,8 +6,8 @@
 #include <components/compiler/errorhandler.hpp>
 #include <components/compiler/extensions.hpp>
 
-#include "../../model/world/scriptcontext.hpp"
 #include "../../model/doc/messages.hpp"
+#include "../../model/world/scriptcontext.hpp"
 
 namespace CSMDoc
 {
@@ -23,44 +23,42 @@ namespace CSVWorld
 {
     class ScriptErrorTable : public QTableWidget, private Compiler::ErrorHandler
     {
-            Q_OBJECT
-
-            Compiler::Extensions mExtensions;
-            CSMWorld::ScriptContext mContext;
+        Q_OBJECT
 
-            void report (const std::string& message, const Compiler::TokenLoc& loc, Type type) override;
-            ///< Report error to the user.
+        Compiler::Extensions mExtensions;
+        CSMWorld::ScriptContext mContext;
 
-            void report (const std::string& message, Type type) override;
-            ///< Report a file related error
+        void report(const std::string& message, const Compiler::TokenLoc& loc, Type type) override;
+        ///< Report error to the user.
 
-            void addMessage (const std::string& message, CSMDoc::Message::Severity severity,
-                int line = -1, int column = -1);
+        void report(const std::string& message, Type type) override;
+        ///< Report a file related error
 
-            void setWarningsMode (const std::string& value);
+        void addMessage(const std::string& message, CSMDoc::Message::Severity severity, int line = -1, int column = -1);
 
-        public:
+        void setWarningsMode(const std::string& value);
 
-            ScriptErrorTable (const CSMDoc::Document& document, QWidget *parent = nullptr);
+    public:
+        ScriptErrorTable(const CSMDoc::Document& document, QWidget* parent = nullptr);
 
-            void update (const std::string& source);
+        void update(const std::string& source);
 
-            void clear();
+        void clear();
 
-            /// Clear local variable cache for \a script.
-            ///
-            /// \return Were there any locals that needed clearing?
-            bool clearLocals (const std::string& script);
+        /// Clear local variable cache for \a script.
+        ///
+        /// \return Were there any locals that needed clearing?
+        bool clearLocals(const std::string& script);
 
-        private slots:
+    private slots:
 
-            void settingChanged (const CSMPrefs::Setting *setting);
+        void settingChanged(const CSMPrefs::Setting* setting);
 
-            void cellClicked (int row, int column);
+        void cellClicked(int row, int column);
 
-        signals:
+    signals:
 
-            void highlightError (int line, int column);
+        void highlightError(int line, int column);
     };
 }
 
diff --git a/apps/opencs/view/world/scripthighlighter.cpp b/apps/opencs/view/world/scripthighlighter.cpp
index 147beb82a8..68f5faefdc 100644
--- a/apps/opencs/view/world/scripthighlighter.cpp
+++ b/apps/opencs/view/world/scripthighlighter.cpp
@@ -2,73 +2,69 @@
 
 #include <sstream>
 
-#include <components/compiler/scanner.hpp>
 #include <components/compiler/extensions0.hpp>
+#include <components/compiler/scanner.hpp>
 
-#include "../../model/prefs/setting.hpp"
 #include "../../model/prefs/category.hpp"
+#include "../../model/prefs/setting.hpp"
 
-bool CSVWorld::ScriptHighlighter::parseInt (int value, const Compiler::TokenLoc& loc,
-    Compiler::Scanner& scanner)
+bool CSVWorld::ScriptHighlighter::parseInt(int value, const Compiler::TokenLoc& loc, Compiler::Scanner& scanner)
 {
-    highlight (loc, Type_Int);
+    highlight(loc, Type_Int);
     return true;
 }
 
-bool CSVWorld::ScriptHighlighter::parseFloat (float value, const Compiler::TokenLoc& loc,
-    Compiler::Scanner& scanner)
+bool CSVWorld::ScriptHighlighter::parseFloat(float value, const Compiler::TokenLoc& loc, Compiler::Scanner& scanner)
 {
-    highlight (loc, Type_Float);
+    highlight(loc, Type_Float);
     return true;
 }
 
-bool CSVWorld::ScriptHighlighter::parseName (const std::string& name, const Compiler::TokenLoc& loc,
-    Compiler::Scanner& scanner)
+bool CSVWorld::ScriptHighlighter::parseName(
+    const std::string& name, const Compiler::TokenLoc& loc, Compiler::Scanner& scanner)
 {
-    highlight (loc, mContext.isId (name) ? Type_Id : Type_Name);
+    highlight(loc, mContext.isId(name) ? Type_Id : Type_Name);
     return true;
 }
 
-bool CSVWorld::ScriptHighlighter::parseKeyword (int keyword, const Compiler::TokenLoc& loc,
-    Compiler::Scanner& scanner)
+bool CSVWorld::ScriptHighlighter::parseKeyword(int keyword, const Compiler::TokenLoc& loc, Compiler::Scanner& scanner)
 {
-    if (((mMode==Mode_Console || mMode==Mode_Dialogue) &&
-        (keyword==Compiler::Scanner::K_begin || keyword==Compiler::Scanner::K_end ||
-        keyword==Compiler::Scanner::K_short || keyword==Compiler::Scanner::K_long ||
-        keyword==Compiler::Scanner::K_float))
-        || (mMode==Mode_Console && (keyword==Compiler::Scanner::K_if ||
-        keyword==Compiler::Scanner::K_endif || keyword==Compiler::Scanner::K_else ||
-        keyword==Compiler::Scanner::K_elseif || keyword==Compiler::Scanner::K_while ||
-        keyword==Compiler::Scanner::K_endwhile)))
-        return parseName (loc.mLiteral, loc, scanner);
-
-    highlight (loc, Type_Keyword);
+    if (((mMode == Mode_Console || mMode == Mode_Dialogue)
+            && (keyword == Compiler::Scanner::K_begin || keyword == Compiler::Scanner::K_end
+                || keyword == Compiler::Scanner::K_short || keyword == Compiler::Scanner::K_long
+                || keyword == Compiler::Scanner::K_float))
+        || (mMode == Mode_Console
+            && (keyword == Compiler::Scanner::K_if || keyword == Compiler::Scanner::K_endif
+                || keyword == Compiler::Scanner::K_else || keyword == Compiler::Scanner::K_elseif
+                || keyword == Compiler::Scanner::K_while || keyword == Compiler::Scanner::K_endwhile)))
+        return parseName(loc.mLiteral, loc, scanner);
+
+    highlight(loc, Type_Keyword);
     return true;
 }
 
-bool CSVWorld::ScriptHighlighter::parseSpecial (int code, const Compiler::TokenLoc& loc,
-    Compiler::Scanner& scanner)
+bool CSVWorld::ScriptHighlighter::parseSpecial(int code, const Compiler::TokenLoc& loc, Compiler::Scanner& scanner)
 {
-    highlight (loc, Type_Special);
+    highlight(loc, Type_Special);
     return true;
 }
 
-bool CSVWorld::ScriptHighlighter::parseComment (const std::string& comment,
-    const Compiler::TokenLoc& loc, Compiler::Scanner& scanner)
+bool CSVWorld::ScriptHighlighter::parseComment(
+    const std::string& comment, const Compiler::TokenLoc& loc, Compiler::Scanner& scanner)
 {
-    highlight (loc, Type_Comment);
+    highlight(loc, Type_Comment);
     return true;
 }
 
-void CSVWorld::ScriptHighlighter::parseEOF (Compiler::Scanner& scanner)
-{}
+void CSVWorld::ScriptHighlighter::parseEOF(Compiler::Scanner& scanner) {}
 
-void CSVWorld::ScriptHighlighter::highlight (const Compiler::TokenLoc& loc, Type type)
+void CSVWorld::ScriptHighlighter::highlight(const Compiler::TokenLoc& loc, Type type)
 {
     // We should take in account multibyte characters
     int length = 0;
     const char* token = loc.mLiteral.c_str();
-    while (*token) length += (*token++ & 0xc0) != 0x80;
+    while (*token)
+        length += (*token++ & 0xc0) != 0x80;
 
     int index = loc.mColumn;
 
@@ -79,40 +75,41 @@ void CSVWorld::ScriptHighlighter::highlight (const Compiler::TokenLoc& loc, Type
     if (mMarkOccurrences && type == Type_Name && loc.mLiteral == mMarkedWord)
         scheme.merge(mScheme[Type_Highlight]);
 
-    setFormat (index, length, scheme);
+    setFormat(index, length, scheme);
 }
 
-CSVWorld::ScriptHighlighter::ScriptHighlighter (const CSMWorld::Data& data, Mode mode,
-    QTextDocument *parent)
-    : QSyntaxHighlighter (parent)
-    , Compiler::Parser (mErrorHandler, mContext)
-    , mContext (data)
-    , mMode (mode)
-    , mMarkOccurrences (false)
+CSVWorld::ScriptHighlighter::ScriptHighlighter(const CSMWorld::Data& data, Mode mode, QTextDocument* parent)
+    : QSyntaxHighlighter(parent)
+    , Compiler::Parser(mErrorHandler, mContext)
+    , mContext(data)
+    , mMode(mode)
+    , mMarkOccurrences(false)
 {
-    QColor color ("black");
+    QColor color("black");
     QTextCharFormat format;
-    format.setForeground (color);
+    format.setForeground(color);
 
-    for (int i=0; i<=Type_Id; ++i)
-        mScheme.insert (std::make_pair (static_cast<Type> (i), format));
+    for (int i = 0; i <= Type_Id; ++i)
+        mScheme.insert(std::make_pair(static_cast<Type>(i), format));
 
     // configure compiler
-    Compiler::registerExtensions (mExtensions);
-    mContext.setExtensions (&mExtensions);
+    Compiler::registerExtensions(mExtensions);
+    mContext.setExtensions(&mExtensions);
 }
 
-void CSVWorld::ScriptHighlighter::highlightBlock (const QString& text)
+void CSVWorld::ScriptHighlighter::highlightBlock(const QString& text)
 {
-    std::istringstream stream (text.toUtf8().constData());
+    std::istringstream stream(text.toUtf8().constData());
 
-    Compiler::Scanner scanner (mErrorHandler, stream, mContext.getExtensions());
+    Compiler::Scanner scanner(mErrorHandler, stream, mContext.getExtensions());
 
     try
     {
-        scanner.scan (*this);
+        scanner.scan(*this);
     }
-    catch (...) {} // ignore syntax errors
+    catch (...)
+    {
+    } // ignore syntax errors
 }
 
 void CSVWorld::ScriptHighlighter::setMarkOccurrences(bool flag)
@@ -130,26 +127,22 @@ void CSVWorld::ScriptHighlighter::invalidateIds()
     mContext.invalidateIds();
 }
 
-bool CSVWorld::ScriptHighlighter::settingChanged (const CSMPrefs::Setting *setting)
+bool CSVWorld::ScriptHighlighter::settingChanged(const CSMPrefs::Setting* setting)
 {
-    if (setting->getParent()->getKey()=="Scripts")
+    if (setting->getParent()->getKey() == "Scripts")
     {
-        static const char *const colours[Type_Id+2] =
-        {
-            "colour-int", "colour-float", "colour-name", "colour-keyword",
-            "colour-special", "colour-comment", "colour-highlight", "colour-id",
-            0
-        };
-
-        for (int i=0; colours[i]; ++i)
-            if (setting->getKey()==colours[i])
+        static const char* const colours[Type_Id + 2] = { "colour-int", "colour-float", "colour-name", "colour-keyword",
+            "colour-special", "colour-comment", "colour-highlight", "colour-id", 0 };
+
+        for (int i = 0; colours[i]; ++i)
+            if (setting->getKey() == colours[i])
             {
                 QTextCharFormat format;
                 if (i == Type_Highlight)
-                    format.setBackground (setting->toColor());
+                    format.setBackground(setting->toColor());
                 else
-                    format.setForeground (setting->toColor());
-                mScheme[static_cast<Type> (i)] = format;
+                    format.setForeground(setting->toColor());
+                mScheme[static_cast<Type>(i)] = format;
                 return true;
             }
     }
diff --git a/apps/opencs/view/world/scripthighlighter.hpp b/apps/opencs/view/world/scripthighlighter.hpp
index 9b4a5b7be0..cefe7e1fef 100644
--- a/apps/opencs/view/world/scripthighlighter.hpp
+++ b/apps/opencs/view/world/scripthighlighter.hpp
@@ -6,9 +6,9 @@
 
 #include <QSyntaxHighlighter>
 
+#include <components/compiler/extensions.hpp>
 #include <components/compiler/nullerrorhandler.hpp>
 #include <components/compiler/parser.hpp>
-#include <components/compiler/extensions.hpp>
 
 #include "../../model/world/scriptcontext.hpp"
 
@@ -21,87 +21,78 @@ namespace CSVWorld
 {
     class ScriptHighlighter : public QSyntaxHighlighter, private Compiler::Parser
     {
-        public:
-
-            enum Type
-            {
-                Type_Int = 0,
-                Type_Float = 1,
-                Type_Name = 2,
-                Type_Keyword = 3,
-                Type_Special = 4,
-                Type_Comment = 5,
-                Type_Highlight = 6,
-                Type_Id = 7
-            };
-
-            enum Mode
-            {
-                Mode_General,
-                Mode_Console,
-                Mode_Dialogue
-            };
-
-        private:
-
-            Compiler::NullErrorHandler mErrorHandler;
-            Compiler::Extensions mExtensions;
-            CSMWorld::ScriptContext mContext;
-            std::map<Type, QTextCharFormat> mScheme;
-            Mode mMode;
-            bool mMarkOccurrences;
-            std::string mMarkedWord;
-
-        private:
-
-            bool parseInt (int value, const Compiler::TokenLoc& loc,
-                Compiler::Scanner& scanner) override;
-            ///< Handle an int token.
-            /// \return fetch another token?
-
-            bool parseFloat (float value, const Compiler::TokenLoc& loc,
-                Compiler::Scanner& scanner) override;
-            ///< Handle a float token.
-            /// \return fetch another token?
-
-            bool parseName (const std::string& name,
-                const Compiler::TokenLoc& loc, Compiler::Scanner& scanner) override;
-            ///< Handle a name token.
-            /// \return fetch another token?
-
-            bool parseKeyword (int keyword, const Compiler::TokenLoc& loc,
-                Compiler::Scanner& scanner) override;
-            ///< Handle a keyword token.
-            /// \return fetch another token?
-
-            bool parseSpecial (int code, const Compiler::TokenLoc& loc,
-                Compiler::Scanner& scanner) override;
-            ///< Handle a special character token.
-            /// \return fetch another token?
-
-            bool parseComment (const std::string& comment, const Compiler::TokenLoc& loc,
-                Compiler::Scanner& scanner) override;
-            ///< Handle comment token.
-            /// \return fetch another token?
-
-            void parseEOF (Compiler::Scanner& scanner) override;
-            ///< Handle EOF token.
-
-            void highlight (const Compiler::TokenLoc& loc, Type type);
-
-        public:
-
-            ScriptHighlighter (const CSMWorld::Data& data, Mode mode, QTextDocument *parent);
-
-            void highlightBlock (const QString& text) override;
-
-            void setMarkOccurrences(bool);
-
-            void setMarkedWord(const std::string& name);
-
-            void invalidateIds();
-
-            bool settingChanged (const CSMPrefs::Setting *setting);
+    public:
+        enum Type
+        {
+            Type_Int = 0,
+            Type_Float = 1,
+            Type_Name = 2,
+            Type_Keyword = 3,
+            Type_Special = 4,
+            Type_Comment = 5,
+            Type_Highlight = 6,
+            Type_Id = 7
+        };
+
+        enum Mode
+        {
+            Mode_General,
+            Mode_Console,
+            Mode_Dialogue
+        };
+
+    private:
+        Compiler::NullErrorHandler mErrorHandler;
+        Compiler::Extensions mExtensions;
+        CSMWorld::ScriptContext mContext;
+        std::map<Type, QTextCharFormat> mScheme;
+        Mode mMode;
+        bool mMarkOccurrences;
+        std::string mMarkedWord;
+
+    private:
+        bool parseInt(int value, const Compiler::TokenLoc& loc, Compiler::Scanner& scanner) override;
+        ///< Handle an int token.
+        /// \return fetch another token?
+
+        bool parseFloat(float value, const Compiler::TokenLoc& loc, Compiler::Scanner& scanner) override;
+        ///< Handle a float token.
+        /// \return fetch another token?
+
+        bool parseName(const std::string& name, const Compiler::TokenLoc& loc, Compiler::Scanner& scanner) override;
+        ///< Handle a name token.
+        /// \return fetch another token?
+
+        bool parseKeyword(int keyword, const Compiler::TokenLoc& loc, Compiler::Scanner& scanner) override;
+        ///< Handle a keyword token.
+        /// \return fetch another token?
+
+        bool parseSpecial(int code, const Compiler::TokenLoc& loc, Compiler::Scanner& scanner) override;
+        ///< Handle a special character token.
+        /// \return fetch another token?
+
+        bool parseComment(
+            const std::string& comment, const Compiler::TokenLoc& loc, Compiler::Scanner& scanner) override;
+        ///< Handle comment token.
+        /// \return fetch another token?
+
+        void parseEOF(Compiler::Scanner& scanner) override;
+        ///< Handle EOF token.
+
+        void highlight(const Compiler::TokenLoc& loc, Type type);
+
+    public:
+        ScriptHighlighter(const CSMWorld::Data& data, Mode mode, QTextDocument* parent);
+
+        void highlightBlock(const QString& text) override;
+
+        void setMarkOccurrences(bool);
+
+        void setMarkedWord(const std::string& name);
+
+        void invalidateIds();
+
+        bool settingChanged(const CSMPrefs::Setting* setting);
     };
 }
 
diff --git a/apps/opencs/view/world/scriptsubview.cpp b/apps/opencs/view/world/scriptsubview.cpp
index e4cc3dc86c..a9bccd394c 100644
--- a/apps/opencs/view/world/scriptsubview.cpp
+++ b/apps/opencs/view/world/scriptsubview.cpp
@@ -8,42 +8,42 @@
 #include <components/debug/debuglog.hpp>
 
 #include "../../model/doc/document.hpp"
-#include "../../model/world/universalid.hpp"
-#include "../../model/world/data.hpp"
+#include "../../model/prefs/state.hpp"
 #include "../../model/world/commands.hpp"
+#include "../../model/world/data.hpp"
 #include "../../model/world/idtable.hpp"
-#include "../../model/prefs/state.hpp"
+#include "../../model/world/universalid.hpp"
 
-#include "scriptedit.hpp"
-#include "recordbuttonbar.hpp"
-#include "tablebottombox.hpp"
 #include "genericcreator.hpp"
+#include "recordbuttonbar.hpp"
+#include "scriptedit.hpp"
 #include "scripterrortable.hpp"
+#include "tablebottombox.hpp"
 
 void CSVWorld::ScriptSubView::addButtonBar()
 {
     if (mButtons)
         return;
 
-    mButtons = new RecordButtonBar (getUniversalId(), *mModel, mBottom, &mCommandDispatcher, this);
+    mButtons = new RecordButtonBar(getUniversalId(), *mModel, mBottom, &mCommandDispatcher, this);
 
-    mLayout.insertWidget (1, mButtons);
+    mLayout.insertWidget(1, mButtons);
 
-    connect (mButtons, &RecordButtonBar::switchToRow, this, &ScriptSubView::switchToRow);
+    connect(mButtons, &RecordButtonBar::switchToRow, this, &ScriptSubView::switchToRow);
 
-    connect (this, &ScriptSubView::universalIdChanged, mButtons, &RecordButtonBar::universalIdChanged);
+    connect(this, &ScriptSubView::universalIdChanged, mButtons, &RecordButtonBar::universalIdChanged);
 }
 
 void CSVWorld::ScriptSubView::recompile()
 {
     if (!mCompileDelay->isActive() && !isDeleted())
-        mCompileDelay->start (CSMPrefs::get()["Scripts"]["compile-delay"].toInt());
+        mCompileDelay->start(CSMPrefs::get()["Scripts"]["compile-delay"].toInt());
 }
 
 bool CSVWorld::ScriptSubView::isDeleted() const
 {
-    return mModel->data (mModel->getModelIndex (getUniversalId().getId(), mStateColumn)).toInt()
-        ==CSMWorld::RecordBase::State_Deleted;
+    return mModel->data(mModel->getModelIndex(getUniversalId().getId(), mStateColumn)).toInt()
+        == CSMWorld::RecordBase::State_Deleted;
 }
 
 void CSVWorld::ScriptSubView::updateDeletedState()
@@ -52,11 +52,11 @@ void CSVWorld::ScriptSubView::updateDeletedState()
     {
         mErrors->clear();
         adjustSplitter();
-        mEditor->setEnabled (false);
+        mEditor->setEnabled(false);
     }
     else
     {
-        mEditor->setEnabled (true);
+        mEditor->setEnabled(true);
         recompile();
     }
 }
@@ -70,7 +70,7 @@ void CSVWorld::ScriptSubView::adjustSplitter()
         if (mErrors->height())
             return; // keep old height if the error panel was already open
 
-        sizes << (mMain->height()-mErrorHeight-mMain->handleWidth()) << mErrorHeight;
+        sizes << (mMain->height() - mErrorHeight - mMain->handleWidth()) << mErrorHeight;
     }
     else
     {
@@ -80,87 +80,88 @@ void CSVWorld::ScriptSubView::adjustSplitter()
         sizes << 1 << 0;
     }
 
-    mMain->setSizes (sizes);
+    mMain->setSizes(sizes);
 }
 
-CSVWorld::ScriptSubView::ScriptSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
-: SubView (id), mDocument (document), mColumn (-1), mBottom(nullptr), mButtons (nullptr),
-  mCommandDispatcher (document, CSMWorld::UniversalId::getParentType (id.getType())),
-  mErrorHeight (CSMPrefs::get()["Scripts"]["error-height"].toInt())
+CSVWorld::ScriptSubView::ScriptSubView(const CSMWorld::UniversalId& id, CSMDoc::Document& document)
+    : SubView(id)
+    , mDocument(document)
+    , mColumn(-1)
+    , mBottom(nullptr)
+    , mButtons(nullptr)
+    , mCommandDispatcher(document, CSMWorld::UniversalId::getParentType(id.getType()))
+    , mErrorHeight(CSMPrefs::get()["Scripts"]["error-height"].toInt())
 {
-    std::vector<std::string> selection (1, id.getId());
-    mCommandDispatcher.setSelection (selection);
+    std::vector<std::string> selection(1, id.getId());
+    mCommandDispatcher.setSelection(selection);
 
-    mMain = new QSplitter (this);
-    mMain->setOrientation (Qt::Vertical);
-    mLayout.addWidget (mMain, 2);
+    mMain = new QSplitter(this);
+    mMain->setOrientation(Qt::Vertical);
+    mLayout.addWidget(mMain, 2);
 
-    mEditor = new ScriptEdit (mDocument, ScriptHighlighter::Mode_General, this);
-    mMain->addWidget (mEditor);
-    mMain->setCollapsible (0, false);
+    mEditor = new ScriptEdit(mDocument, ScriptHighlighter::Mode_General, this);
+    mMain->addWidget(mEditor);
+    mMain->setCollapsible(0, false);
 
-    mErrors = new ScriptErrorTable (document, this);
-    mMain->addWidget (mErrors);
+    mErrors = new ScriptErrorTable(document, this);
+    mMain->addWidget(mErrors);
 
     QList<int> sizes;
     sizes << 1 << 0;
-    mMain->setSizes (sizes);
+    mMain->setSizes(sizes);
 
-    QWidget *widget = new QWidget (this);
-    widget->setLayout (&mLayout);
-    setWidget (widget);
+    QWidget* widget = new QWidget(this);
+    widget->setLayout(&mLayout);
+    setWidget(widget);
 
-    mModel = &dynamic_cast<CSMWorld::IdTable&> (
-        *document.getData().getTableModel (CSMWorld::UniversalId::Type_Scripts));
+    mModel = &dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_Scripts));
 
-    mColumn = mModel->findColumnIndex (CSMWorld::Columns::ColumnId_ScriptText);
-    mIdColumn = mModel->findColumnIndex (CSMWorld::Columns::ColumnId_Id);
-    mStateColumn = mModel->findColumnIndex (CSMWorld::Columns::ColumnId_Modification);
+    mColumn = mModel->findColumnIndex(CSMWorld::Columns::ColumnId_ScriptText);
+    mIdColumn = mModel->findColumnIndex(CSMWorld::Columns::ColumnId_Id);
+    mStateColumn = mModel->findColumnIndex(CSMWorld::Columns::ColumnId_Modification);
 
-    QString source = mModel->data (mModel->getModelIndex (id.getId(), mColumn)).toString();
+    QString source = mModel->data(mModel->getModelIndex(id.getId(), mColumn)).toString();
 
-    mEditor->setPlainText (source);
+    mEditor->setPlainText(source);
     // bottom box and buttons
-    mBottom = new TableBottomBox (CreatorFactory<GenericCreator>(), document, id, this);
+    mBottom = new TableBottomBox(CreatorFactory<GenericCreator>(), document, id, this);
 
-    connect (mBottom, &TableBottomBox::requestFocus, this, &ScriptSubView::switchToId);
+    connect(mBottom, &TableBottomBox::requestFocus, this, &ScriptSubView::switchToId);
 
-    mLayout.addWidget (mBottom);
+    mLayout.addWidget(mBottom);
 
     // signals
-    connect (mEditor, &ScriptEdit::textChanged, this, &ScriptSubView::textChanged);
+    connect(mEditor, &ScriptEdit::textChanged, this, &ScriptSubView::textChanged);
 
-    connect (mModel, &CSMWorld::IdTable::dataChanged, this, &ScriptSubView::dataChanged);
+    connect(mModel, &CSMWorld::IdTable::dataChanged, this, &ScriptSubView::dataChanged);
 
-    connect (mModel, &CSMWorld::IdTable::rowsAboutToBeRemoved,
-        this, &ScriptSubView::rowsAboutToBeRemoved);
+    connect(mModel, &CSMWorld::IdTable::rowsAboutToBeRemoved, this, &ScriptSubView::rowsAboutToBeRemoved);
 
     updateStatusBar();
     connect(mEditor, &ScriptEdit::cursorPositionChanged, this, &ScriptSubView::updateStatusBar);
 
-    mErrors->update (source.toUtf8().constData());
+    mErrors->update(source.toUtf8().constData());
 
-    connect (mErrors, &ScriptErrorTable::highlightError, this, &ScriptSubView::highlightError);
+    connect(mErrors, &ScriptErrorTable::highlightError, this, &ScriptSubView::highlightError);
 
-    mCompileDelay = new QTimer (this);
-    mCompileDelay->setSingleShot (true);
-    connect (mCompileDelay, &QTimer::timeout, this, &ScriptSubView::updateRequest);
+    mCompileDelay = new QTimer(this);
+    mCompileDelay->setSingleShot(true);
+    connect(mCompileDelay, &QTimer::timeout, this, &ScriptSubView::updateRequest);
 
     updateDeletedState();
 
-    connect (&CSMPrefs::State::get(), &CSMPrefs::State::settingChanged,
-        this, &ScriptSubView::settingChanged);
+    connect(&CSMPrefs::State::get(), &CSMPrefs::State::settingChanged, this, &ScriptSubView::settingChanged);
     CSMPrefs::get()["Scripts"].update();
 }
 
-void CSVWorld::ScriptSubView::setStatusBar (bool show)
+void CSVWorld::ScriptSubView::setStatusBar(bool show)
 {
-    mBottom->setStatusBar (show);
+    mBottom->setStatusBar(show);
 }
 
-void CSVWorld::ScriptSubView::settingChanged (const CSMPrefs::Setting *setting)
+void CSVWorld::ScriptSubView::settingChanged(const CSMPrefs::Setting* setting)
 {
-    if (*setting=="Scripts/toolbar")
+    if (*setting == "Scripts/toolbar")
     {
         if (setting->isTrue())
         {
@@ -168,58 +169,58 @@ void CSVWorld::ScriptSubView::settingChanged (const CSMPrefs::Setting *setting)
         }
         else if (mButtons)
         {
-            mLayout.removeWidget (mButtons);
+            mLayout.removeWidget(mButtons);
             delete mButtons;
             mButtons = nullptr;
         }
     }
-    else if (*setting=="Scripts/compile-delay")
+    else if (*setting == "Scripts/compile-delay")
     {
-        mCompileDelay->setInterval (setting->toInt());
+        mCompileDelay->setInterval(setting->toInt());
     }
-    else  if (*setting=="Scripts/warnings")
+    else if (*setting == "Scripts/warnings")
         recompile();
 }
 
-void CSVWorld::ScriptSubView::updateStatusBar ()
+void CSVWorld::ScriptSubView::updateStatusBar()
 {
-    mBottom->positionChanged (mEditor->textCursor().blockNumber() + 1,
-        mEditor->textCursor().columnNumber() + 1);
+    mBottom->positionChanged(mEditor->textCursor().blockNumber() + 1, mEditor->textCursor().columnNumber() + 1);
 }
 
-void CSVWorld::ScriptSubView::setEditLock (bool locked)
+void CSVWorld::ScriptSubView::setEditLock(bool locked)
 {
-    mEditor->setReadOnly (locked);
+    mEditor->setReadOnly(locked);
 
     if (mButtons)
-        mButtons->setEditLock (locked);
+        mButtons->setEditLock(locked);
 
-    mCommandDispatcher.setEditLock (locked);
+    mCommandDispatcher.setEditLock(locked);
 }
 
-void CSVWorld::ScriptSubView::useHint (const std::string& hint)
+void CSVWorld::ScriptSubView::useHint(const std::string& hint)
 {
     if (hint.empty())
         return;
 
     unsigned line = 0, column = 0;
     char c;
-    std::istringstream stream (hint.c_str()+1);
-    switch(hint[0])
+    std::istringstream stream(hint.c_str() + 1);
+    switch (hint[0])
     {
         case 'R':
         case 'r':
         {
-            QModelIndex index = mModel->getModelIndex (getUniversalId().getId(), mColumn);
-            QString source = mModel->data (index).toString();
+            QModelIndex index = mModel->getModelIndex(getUniversalId().getId(), mColumn);
+            QString source = mModel->data(index).toString();
             unsigned stringSize = source.length();
             unsigned pos, dummy;
-            if (!(stream >> c >> dummy >> pos) )
+            if (!(stream >> c >> dummy >> pos))
                 return;
 
             if (pos > stringSize)
             {
-                Log(Debug::Warning) << "CSVWorld::ScriptSubView: requested position is higher than actual string length";
+                Log(Debug::Warning)
+                    << "CSVWorld::ScriptSubView: requested position is higher than actual string length";
                 pos = stringSize;
             }
 
@@ -228,7 +229,7 @@ void CSVWorld::ScriptSubView::useHint (const std::string& hint)
                 if (source[i] == '\n')
                 {
                     ++line;
-                    column = i+1;
+                    column = i + 1;
                 }
             }
             column = pos - column;
@@ -241,12 +242,12 @@ void CSVWorld::ScriptSubView::useHint (const std::string& hint)
 
     QTextCursor cursor = mEditor->textCursor();
 
-    cursor.movePosition (QTextCursor::Start);
-    if (cursor.movePosition (QTextCursor::Down, QTextCursor::MoveAnchor, line))
-        cursor.movePosition (QTextCursor::Right, QTextCursor::MoveAnchor, column);
+    cursor.movePosition(QTextCursor::Start);
+    if (cursor.movePosition(QTextCursor::Down, QTextCursor::MoveAnchor, line))
+        cursor.movePosition(QTextCursor::Right, QTextCursor::MoveAnchor, column);
 
     mEditor->setFocus();
-    mEditor->setTextCursor (cursor);
+    mEditor->setTextCursor(cursor);
 }
 
 void CSVWorld::ScriptSubView::textChanged()
@@ -254,46 +255,46 @@ void CSVWorld::ScriptSubView::textChanged()
     if (mEditor->isChangeLocked())
         return;
 
-    ScriptEdit::ChangeLock lock (*mEditor);
+    ScriptEdit::ChangeLock lock(*mEditor);
 
     QString source = mEditor->toPlainText();
 
-    mDocument.getUndoStack().push (new CSMWorld::ModifyCommand (*mModel,
-        mModel->getModelIndex (getUniversalId().getId(), mColumn), source));
+    mDocument.getUndoStack().push(
+        new CSMWorld::ModifyCommand(*mModel, mModel->getModelIndex(getUniversalId().getId(), mColumn), source));
 
     recompile();
 }
 
-void CSVWorld::ScriptSubView::dataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight)
+void CSVWorld::ScriptSubView::dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     if (mEditor->isChangeLocked())
         return;
 
-    ScriptEdit::ChangeLock lock (*mEditor);
+    ScriptEdit::ChangeLock lock(*mEditor);
 
     bool updateRequired = false;
 
-    for (int i=topLeft.row(); i<=bottomRight.row(); ++i)
+    for (int i = topLeft.row(); i <= bottomRight.row(); ++i)
     {
-        std::string id = mModel->data (mModel->index (i, mIdColumn)).toString().toUtf8().constData();
-        if (mErrors->clearLocals (id))
+        std::string id = mModel->data(mModel->index(i, mIdColumn)).toString().toUtf8().constData();
+        if (mErrors->clearLocals(id))
             updateRequired = true;
     }
 
-    QModelIndex index = mModel->getModelIndex (getUniversalId().getId(), mColumn);
+    QModelIndex index = mModel->getModelIndex(getUniversalId().getId(), mColumn);
 
-    if (index.row()>=topLeft.row() && index.row()<=bottomRight.row())
+    if (index.row() >= topLeft.row() && index.row() <= bottomRight.row())
     {
-        if (mStateColumn>=topLeft.column() && mStateColumn<=bottomRight.column())
+        if (mStateColumn >= topLeft.column() && mStateColumn <= bottomRight.column())
             updateDeletedState();
 
-        if (mColumn>=topLeft.column() && mColumn<=bottomRight.column())
+        if (mColumn >= topLeft.column() && mColumn <= bottomRight.column())
         {
-            QString source = mModel->data (index).toString();
+            QString source = mModel->data(index).toString();
 
             QTextCursor cursor = mEditor->textCursor();
-            mEditor->setPlainText (source);
-            mEditor->setTextCursor (cursor);
+            mEditor->setPlainText(source);
+            mEditor->setTextCursor(cursor);
 
             updateRequired = true;
         }
@@ -303,66 +304,66 @@ void CSVWorld::ScriptSubView::dataChanged (const QModelIndex& topLeft, const QMo
         recompile();
 }
 
-void CSVWorld::ScriptSubView::rowsAboutToBeRemoved (const QModelIndex& parent, int start, int end)
+void CSVWorld::ScriptSubView::rowsAboutToBeRemoved(const QModelIndex& parent, int start, int end)
 {
     bool updateRequired = false;
 
-    for (int i=start; i<=end; ++i)
+    for (int i = start; i <= end; ++i)
     {
-        std::string id = mModel->data (mModel->index (i, mIdColumn)).toString().toUtf8().constData();
-        if (mErrors->clearLocals (id))
+        std::string id = mModel->data(mModel->index(i, mIdColumn)).toString().toUtf8().constData();
+        if (mErrors->clearLocals(id))
             updateRequired = true;
     }
 
     if (updateRequired)
         recompile();
 
-    QModelIndex index = mModel->getModelIndex (getUniversalId().getId(), mColumn);
+    QModelIndex index = mModel->getModelIndex(getUniversalId().getId(), mColumn);
 
-    if (!parent.isValid() && index.row()>=start && index.row()<=end)
+    if (!parent.isValid() && index.row() >= start && index.row() <= end)
         emit closeRequest();
 }
 
-void CSVWorld::ScriptSubView::switchToRow (int row)
+void CSVWorld::ScriptSubView::switchToRow(int row)
 {
-    int idColumn = mModel->findColumnIndex (CSMWorld::Columns::ColumnId_Id);
-    std::string id = mModel->data (mModel->index (row, idColumn)).toString().toUtf8().constData();
-    setUniversalId (CSMWorld::UniversalId (CSMWorld::UniversalId::Type_Script, id));
+    int idColumn = mModel->findColumnIndex(CSMWorld::Columns::ColumnId_Id);
+    std::string id = mModel->data(mModel->index(row, idColumn)).toString().toUtf8().constData();
+    setUniversalId(CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Script, id));
 
-    bool oldSignalsState =  mEditor->blockSignals( true );
-    mEditor->setPlainText( mModel->data(mModel->index(row, mColumn)).toString() );
-    mEditor->blockSignals( oldSignalsState );
+    bool oldSignalsState = mEditor->blockSignals(true);
+    mEditor->setPlainText(mModel->data(mModel->index(row, mColumn)).toString());
+    mEditor->blockSignals(oldSignalsState);
 
-    std::vector<std::string> selection (1, id);
-    mCommandDispatcher.setSelection (selection);
+    std::vector<std::string> selection(1, id);
+    mCommandDispatcher.setSelection(selection);
 
     updateDeletedState();
 }
 
-void CSVWorld::ScriptSubView::switchToId (const std::string& id)
+void CSVWorld::ScriptSubView::switchToId(const std::string& id)
 {
-    switchToRow (mModel->getModelIndex (id, 0).row());
+    switchToRow(mModel->getModelIndex(id, 0).row());
 }
 
-void CSVWorld::ScriptSubView::highlightError (int line, int column)
+void CSVWorld::ScriptSubView::highlightError(int line, int column)
 {
     QTextCursor cursor = mEditor->textCursor();
 
-    cursor.movePosition (QTextCursor::Start);
-    if (cursor.movePosition (QTextCursor::Down, QTextCursor::MoveAnchor, line))
-        cursor.movePosition (QTextCursor::Right, QTextCursor::MoveAnchor, column);
+    cursor.movePosition(QTextCursor::Start);
+    if (cursor.movePosition(QTextCursor::Down, QTextCursor::MoveAnchor, line))
+        cursor.movePosition(QTextCursor::Right, QTextCursor::MoveAnchor, column);
 
     mEditor->setFocus();
-    mEditor->setTextCursor (cursor);
+    mEditor->setTextCursor(cursor);
 }
 
 void CSVWorld::ScriptSubView::updateRequest()
 {
-    QModelIndex index = mModel->getModelIndex (getUniversalId().getId(), mColumn);
+    QModelIndex index = mModel->getModelIndex(getUniversalId().getId(), mColumn);
 
-    QString source = mModel->data (index).toString();
+    QString source = mModel->data(index).toString();
 
-    mErrors->update (source.toUtf8().constData());
+    mErrors->update(source.toUtf8().constData());
 
     adjustSplitter();
 }
diff --git a/apps/opencs/view/world/scriptsubview.hpp b/apps/opencs/view/world/scriptsubview.hpp
index a4171db6ee..3fe0b4dbe9 100644
--- a/apps/opencs/view/world/scriptsubview.hpp
+++ b/apps/opencs/view/world/scriptsubview.hpp
@@ -36,66 +36,64 @@ namespace CSVWorld
 
     class ScriptSubView : public CSVDoc::SubView
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            ScriptEdit *mEditor;
-            CSMDoc::Document& mDocument;
-            CSMWorld::IdTable *mModel;
-            int mColumn;
-            int mIdColumn;
-            int mStateColumn;
-            TableBottomBox *mBottom;
-            RecordButtonBar *mButtons;
-            CSMWorld::CommandDispatcher mCommandDispatcher;
-            QVBoxLayout mLayout;
-            QSplitter *mMain;
-            ScriptErrorTable *mErrors;
-            QTimer *mCompileDelay;
-            int mErrorHeight;
+        ScriptEdit* mEditor;
+        CSMDoc::Document& mDocument;
+        CSMWorld::IdTable* mModel;
+        int mColumn;
+        int mIdColumn;
+        int mStateColumn;
+        TableBottomBox* mBottom;
+        RecordButtonBar* mButtons;
+        CSMWorld::CommandDispatcher mCommandDispatcher;
+        QVBoxLayout mLayout;
+        QSplitter* mMain;
+        ScriptErrorTable* mErrors;
+        QTimer* mCompileDelay;
+        int mErrorHeight;
 
-        private:
+    private:
+        void addButtonBar();
 
-            void addButtonBar();
+        void recompile();
 
-            void recompile();
+        bool isDeleted() const;
 
-            bool isDeleted() const;
+        void updateDeletedState();
 
-            void updateDeletedState();
+        void adjustSplitter();
 
-            void adjustSplitter();
+    public:
+        ScriptSubView(const CSMWorld::UniversalId& id, CSMDoc::Document& document);
 
-        public:
+        void setEditLock(bool locked) override;
 
-            ScriptSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document);
+        void useHint(const std::string& hint) override;
 
-            void setEditLock (bool locked) override;
+        void setStatusBar(bool show) override;
 
-            void useHint (const std::string& hint) override;
+    public slots:
 
-            void setStatusBar (bool show) override;
+        void textChanged();
 
-        public slots:
+        void dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
-            void textChanged();
+        void rowsAboutToBeRemoved(const QModelIndex& parent, int start, int end);
 
-            void dataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
+    private slots:
 
-            void rowsAboutToBeRemoved (const QModelIndex& parent, int start, int end);
+        void settingChanged(const CSMPrefs::Setting* setting);
 
-        private slots:
+        void updateStatusBar();
 
-            void settingChanged (const CSMPrefs::Setting *setting);
+        void switchToRow(int row);
 
-            void updateStatusBar();
+        void switchToId(const std::string& id);
 
-            void switchToRow (int row);
+        void highlightError(int line, int column);
 
-            void switchToId (const std::string& id);
-
-            void highlightError (int line, int column);
-
-            void updateRequest();
+        void updateRequest();
     };
 }
 
diff --git a/apps/opencs/view/world/startscriptcreator.cpp b/apps/opencs/view/world/startscriptcreator.cpp
index 25b0301fb8..2bbb25933e 100644
--- a/apps/opencs/view/world/startscriptcreator.cpp
+++ b/apps/opencs/view/world/startscriptcreator.cpp
@@ -19,22 +19,17 @@ std::string CSVWorld::StartScriptCreator::getId() const
 
 CSMWorld::IdTable& CSVWorld::StartScriptCreator::getStartScriptsTable() const
 {
-    return dynamic_cast<CSMWorld::IdTable&> (
-        *getData().getTableModel(getCollectionId())
-    );
+    return dynamic_cast<CSMWorld::IdTable&>(*getData().getTableModel(getCollectionId()));
 }
 
-CSVWorld::StartScriptCreator::StartScriptCreator(
-    CSMWorld::Data &data,
-    QUndoStack &undoStack,
-    const CSMWorld::UniversalId &id,
-    CSMWorld::IdCompletionManager& completionManager
-) : GenericCreator(data, undoStack, id)
+CSVWorld::StartScriptCreator::StartScriptCreator(CSMWorld::Data& data, QUndoStack& undoStack,
+    const CSMWorld::UniversalId& id, CSMWorld::IdCompletionManager& completionManager)
+    : GenericCreator(data, undoStack, id)
 {
     setManualEditing(false);
 
     // Add script ID input label.
-    QLabel *label = new QLabel("Script", this);
+    QLabel* label = new QLabel("Script", this);
     insertBeforeButtons(label, false);
 
     // Add script ID input with auto-completion.
@@ -48,9 +43,7 @@ CSVWorld::StartScriptCreator::StartScriptCreator(
     connect(mScript, &CSVWidget::DropLineEdit::returnPressed, this, &StartScriptCreator::inputReturnPressed);
 }
 
-void CSVWorld::StartScriptCreator::cloneMode(
-    const std::string& originId,
-    const CSMWorld::UniversalId::Type type)
+void CSVWorld::StartScriptCreator::cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type)
 {
     CSVWorld::GenericCreator::cloneMode(originId, type);
 
@@ -98,14 +91,8 @@ void CSVWorld::StartScriptCreator::scriptChanged()
     update();
 }
 
-CSVWorld::Creator *CSVWorld::StartScriptCreatorFactory::makeCreator(
-    CSMDoc::Document& document,
-    const CSMWorld::UniversalId& id) const
+CSVWorld::Creator* CSVWorld::StartScriptCreatorFactory::makeCreator(
+    CSMDoc::Document& document, const CSMWorld::UniversalId& id) const
 {
-    return new StartScriptCreator(
-        document.getData(),
-        document.getUndoStack(),
-        id,
-        document.getIdCompletionManager()
-    );
+    return new StartScriptCreator(document.getData(), document.getUndoStack(), id, document.getIdCompletionManager());
 }
diff --git a/apps/opencs/view/world/startscriptcreator.hpp b/apps/opencs/view/world/startscriptcreator.hpp
index cb7f3f619c..f13cd1cec4 100644
--- a/apps/opencs/view/world/startscriptcreator.hpp
+++ b/apps/opencs/view/world/startscriptcreator.hpp
@@ -21,55 +21,45 @@ namespace CSVWorld
     {
         Q_OBJECT
 
-        CSVWidget::DropLineEdit *mScript;
+        CSVWidget::DropLineEdit* mScript;
 
-        private:
+    private:
+        /// \return script ID entered by user.
+        std::string getId() const override;
 
-            /// \return script ID entered by user.
-            std::string getId() const override;
+        /// \return reference to table containing start scripts.
+        CSMWorld::IdTable& getStartScriptsTable() const;
 
-            /// \return reference to table containing start scripts.
-            CSMWorld::IdTable& getStartScriptsTable() const;
+    public:
+        StartScriptCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id,
+            CSMWorld::IdCompletionManager& completionManager);
 
-        public:
+        /// \brief Set script ID input widget to ID of record to be cloned.
+        /// \param originId Script ID to be cloned.
+        /// \param type Type of record to be cloned.
+        void cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type) override;
 
-            StartScriptCreator(
-                CSMWorld::Data& data,
-                QUndoStack& undoStack,
-                const CSMWorld::UniversalId& id,
-                CSMWorld::IdCompletionManager& completionManager);
+        /// \return Error description for current user input.
+        std::string getErrors() const override;
 
-            /// \brief Set script ID input widget to ID of record to be cloned.
-            /// \param originId Script ID to be cloned.
-            /// \param type Type of record to be cloned.
-            void cloneMode(
-                const std::string& originId,
-                const CSMWorld::UniversalId::Type type) override;
+        /// \brief Set focus to script ID input widget.
+        void focus() override;
 
-            /// \return Error description for current user input.
-            std::string getErrors() const override;
+        /// \brief Clear script ID input widget.
+        void reset() override;
 
-            /// \brief Set focus to script ID input widget.
-            void focus() override;
+    private slots:
 
-            /// \brief Clear script ID input widget.
-            void reset() override;
+        /// \brief Check user input for any errors.
+        void scriptChanged();
+    };
 
-        private slots:
-
-            /// \brief Check user input for any errors.
-            void scriptChanged();
-     };
-
-     /// \brief Creator factory for start script record creator.
-     class StartScriptCreatorFactory : public CreatorFactoryBase
-     {
-        public:
-
-            Creator *makeCreator(
-                CSMDoc::Document& document,
-                const CSMWorld::UniversalId& id) const override;
-     };
+    /// \brief Creator factory for start script record creator.
+    class StartScriptCreatorFactory : public CreatorFactoryBase
+    {
+    public:
+        Creator* makeCreator(CSMDoc::Document& document, const CSMWorld::UniversalId& id) const override;
+    };
 }
 
 #endif // STARTSCRIPTCREATOR_HPP
diff --git a/apps/opencs/view/world/subviews.cpp b/apps/opencs/view/world/subviews.cpp
index e6bb13b6be..307ff0de51 100644
--- a/apps/opencs/view/world/subviews.cpp
+++ b/apps/opencs/view/world/subviews.cpp
@@ -2,40 +2,39 @@
 
 #include "../doc/subviewfactoryimp.hpp"
 
-#include "tablesubview.hpp"
+#include "bodypartcreator.hpp"
+#include "cellcreator.hpp"
+#include "dialoguecreator.hpp"
 #include "dialoguesubview.hpp"
-#include "scriptsubview.hpp"
-#include "regionmapsubview.hpp"
 #include "genericcreator.hpp"
 #include "globalcreator.hpp"
-#include "cellcreator.hpp"
-#include "referenceablecreator.hpp"
-#include "referencecreator.hpp"
-#include "startscriptcreator.hpp"
-#include "scenesubview.hpp"
-#include "dialoguecreator.hpp"
 #include "infocreator.hpp"
-#include "pathgridcreator.hpp"
-#include "previewsubview.hpp"
-#include "bodypartcreator.hpp"
 #include "landcreator.hpp"
 #include "landtexturecreator.hpp"
+#include "pathgridcreator.hpp"
+#include "previewsubview.hpp"
+#include "referenceablecreator.hpp"
+#include "referencecreator.hpp"
+#include "regionmapsubview.hpp"
+#include "scenesubview.hpp"
+#include "scriptsubview.hpp"
+#include "startscriptcreator.hpp"
+#include "tablesubview.hpp"
 
-void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
+void CSVWorld::addSubViewFactories(CSVDoc::SubViewFactoryManager& manager)
 {
     // Regular record tables (including references which are actually sub-records, but are promoted
     // to top-level records within the editor)
-    manager.add (CSMWorld::UniversalId::Type_Gmsts,
-        new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
+    manager.add(
+        CSMWorld::UniversalId::Type_Gmsts, new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
 
-    manager.add (CSMWorld::UniversalId::Type_Skills,
-        new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
+    manager.add(
+        CSMWorld::UniversalId::Type_Skills, new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
 
-    manager.add (CSMWorld::UniversalId::Type_MagicEffects,
+    manager.add(CSMWorld::UniversalId::Type_MagicEffects,
         new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
 
-    static const CSMWorld::UniversalId::Type sTableTypes[] =
-    {
+    static const CSMWorld::UniversalId::Type sTableTypes[] = {
         CSMWorld::UniversalId::Type_Classes,
         CSMWorld::UniversalId::Type_Factions,
         CSMWorld::UniversalId::Type_Races,
@@ -49,88 +48,86 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
         CSMWorld::UniversalId::Type_None,
     };
 
-    for (int i=0; sTableTypes[i]!=CSMWorld::UniversalId::Type_None; ++i)
-        manager.add (sTableTypes[i],
-            new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<GenericCreator> >);
+    for (int i = 0; sTableTypes[i] != CSMWorld::UniversalId::Type_None; ++i)
+        manager.add(
+            sTableTypes[i], new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<GenericCreator>>);
 
-    manager.add (CSMWorld::UniversalId::Type_BodyParts,
-        new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<BodyPartCreator> >);
+    manager.add(CSMWorld::UniversalId::Type_BodyParts,
+        new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<BodyPartCreator>>);
 
-    manager.add (CSMWorld::UniversalId::Type_StartScripts,
+    manager.add(CSMWorld::UniversalId::Type_StartScripts,
         new CSVDoc::SubViewFactoryWithCreator<TableSubView, StartScriptCreatorFactory>);
 
-    manager.add (CSMWorld::UniversalId::Type_Cells,
-        new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<CellCreator> >);
+    manager.add(CSMWorld::UniversalId::Type_Cells,
+        new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<CellCreator>>);
 
-    manager.add (CSMWorld::UniversalId::Type_Referenceables,
-        new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<ReferenceableCreator> >);
+    manager.add(CSMWorld::UniversalId::Type_Referenceables,
+        new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<ReferenceableCreator>>);
 
-    manager.add (CSMWorld::UniversalId::Type_References,
+    manager.add(CSMWorld::UniversalId::Type_References,
         new CSVDoc::SubViewFactoryWithCreator<TableSubView, ReferenceCreatorFactory>);
 
-    manager.add (CSMWorld::UniversalId::Type_Topics,
-        new CSVDoc::SubViewFactoryWithCreator<TableSubView, TopicCreatorFactory>);
+    manager.add(
+        CSMWorld::UniversalId::Type_Topics, new CSVDoc::SubViewFactoryWithCreator<TableSubView, TopicCreatorFactory>);
 
-    manager.add (CSMWorld::UniversalId::Type_Journals,
+    manager.add(CSMWorld::UniversalId::Type_Journals,
         new CSVDoc::SubViewFactoryWithCreator<TableSubView, JournalCreatorFactory>);
 
-    manager.add (CSMWorld::UniversalId::Type_TopicInfos,
+    manager.add(CSMWorld::UniversalId::Type_TopicInfos,
         new CSVDoc::SubViewFactoryWithCreator<TableSubView, InfoCreatorFactory>(false));
 
-    manager.add (CSMWorld::UniversalId::Type_JournalInfos,
+    manager.add(CSMWorld::UniversalId::Type_JournalInfos,
         new CSVDoc::SubViewFactoryWithCreator<TableSubView, InfoCreatorFactory>(false));
 
-    manager.add (CSMWorld::UniversalId::Type_Pathgrids,
+    manager.add(CSMWorld::UniversalId::Type_Pathgrids,
         new CSVDoc::SubViewFactoryWithCreator<TableSubView, PathgridCreatorFactory>);
 
-    manager.add (CSMWorld::UniversalId::Type_Lands,
-        new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<LandCreator> >);
+    manager.add(CSMWorld::UniversalId::Type_Lands,
+        new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<LandCreator>>);
 
-    manager.add (CSMWorld::UniversalId::Type_LandTextures,
-        new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<LandTextureCreator> >);
+    manager.add(CSMWorld::UniversalId::Type_LandTextures,
+        new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<LandTextureCreator>>);
 
-    manager.add (CSMWorld::UniversalId::Type_Globals,
-        new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<GlobalCreator> >);
+    manager.add(CSMWorld::UniversalId::Type_Globals,
+        new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<GlobalCreator>>);
 
     // Subviews for resources tables
-    manager.add (CSMWorld::UniversalId::Type_Meshes,
-        new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
-    manager.add (CSMWorld::UniversalId::Type_Icons,
-        new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
-    manager.add (CSMWorld::UniversalId::Type_Musics,
-        new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
-    manager.add (CSMWorld::UniversalId::Type_SoundsRes,
-        new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
-    manager.add (CSMWorld::UniversalId::Type_Textures,
-        new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
-    manager.add (CSMWorld::UniversalId::Type_Videos,
-        new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
-
+    manager.add(
+        CSMWorld::UniversalId::Type_Meshes, new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
+    manager.add(
+        CSMWorld::UniversalId::Type_Icons, new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
+    manager.add(
+        CSMWorld::UniversalId::Type_Musics, new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
+    manager.add(
+        CSMWorld::UniversalId::Type_SoundsRes, new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
+    manager.add(
+        CSMWorld::UniversalId::Type_Textures, new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
+    manager.add(
+        CSMWorld::UniversalId::Type_Videos, new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
 
     // Subviews for editing/viewing individual records
-    manager.add (CSMWorld::UniversalId::Type_Script, new CSVDoc::SubViewFactory<ScriptSubView>);
+    manager.add(CSMWorld::UniversalId::Type_Script, new CSVDoc::SubViewFactory<ScriptSubView>);
 
     // Other stuff (combined record tables)
-    manager.add (CSMWorld::UniversalId::Type_RegionMap, new CSVDoc::SubViewFactory<RegionMapSubView>);
+    manager.add(CSMWorld::UniversalId::Type_RegionMap, new CSVDoc::SubViewFactory<RegionMapSubView>);
 
-    manager.add (CSMWorld::UniversalId::Type_Scene, new CSVDoc::SubViewFactory<SceneSubView>);
+    manager.add(CSMWorld::UniversalId::Type_Scene, new CSVDoc::SubViewFactory<SceneSubView>);
 
     // More other stuff
-    manager.add (CSMWorld::UniversalId::Type_Filters,
+    manager.add(CSMWorld::UniversalId::Type_Filters,
         new CSVDoc::SubViewFactoryWithCreator<TableSubView,
-        CreatorFactory<GenericCreator, CSMWorld::Scope_Project | CSMWorld::Scope_Session> >);
+            CreatorFactory<GenericCreator, CSMWorld::Scope_Project | CSMWorld::Scope_Session>>);
 
-    manager.add (CSMWorld::UniversalId::Type_DebugProfiles,
+    manager.add(CSMWorld::UniversalId::Type_DebugProfiles,
         new CSVDoc::SubViewFactoryWithCreator<TableSubView,
-        CreatorFactory<GenericCreator, CSMWorld::Scope_Project | CSMWorld::Scope_Session> >);
+            CreatorFactory<GenericCreator, CSMWorld::Scope_Project | CSMWorld::Scope_Session>>);
 
-    manager.add (CSMWorld::UniversalId::Type_Scripts,
-        new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<GenericCreator,
-            CSMWorld::Scope_Project | CSMWorld::Scope_Content> >);
+    manager.add(CSMWorld::UniversalId::Type_Scripts,
+        new CSVDoc::SubViewFactoryWithCreator<TableSubView,
+            CreatorFactory<GenericCreator, CSMWorld::Scope_Project | CSMWorld::Scope_Content>>);
 
     // Dialogue subviews
-    static const CSMWorld::UniversalId::Type sTableTypes2[] =
-    {
+    static const CSMWorld::UniversalId::Type sTableTypes2[] = {
         CSMWorld::UniversalId::Type_Region,
         CSMWorld::UniversalId::Type_Spell,
         CSMWorld::UniversalId::Type_Birthsign,
@@ -145,65 +142,65 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
         CSMWorld::UniversalId::Type_None,
     };
 
-    for (int i=0; sTableTypes2[i]!=CSMWorld::UniversalId::Type_None; ++i)
-        manager.add (sTableTypes2[i],
-            new CSVDoc::SubViewFactoryWithCreator<DialogueSubView,
-            CreatorFactory<GenericCreator> > (false));
+    for (int i = 0; sTableTypes2[i] != CSMWorld::UniversalId::Type_None; ++i)
+        manager.add(sTableTypes2[i],
+            new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<GenericCreator>>(false));
 
-    manager.add (CSMWorld::UniversalId::Type_BodyPart,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<BodyPartCreator> > (false));
+    manager.add(CSMWorld::UniversalId::Type_BodyPart,
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<BodyPartCreator>>(false));
 
-    manager.add (CSMWorld::UniversalId::Type_StartScript,
+    manager.add(CSMWorld::UniversalId::Type_StartScript,
         new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, StartScriptCreatorFactory>(false));
 
-    manager.add (CSMWorld::UniversalId::Type_Skill,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, NullCreatorFactory > (false));
+    manager.add(CSMWorld::UniversalId::Type_Skill,
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, NullCreatorFactory>(false));
 
-    manager.add (CSMWorld::UniversalId::Type_MagicEffect,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, NullCreatorFactory > (false));
+    manager.add(CSMWorld::UniversalId::Type_MagicEffect,
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, NullCreatorFactory>(false));
 
-    manager.add (CSMWorld::UniversalId::Type_Gmst,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, NullCreatorFactory > (false));
+    manager.add(CSMWorld::UniversalId::Type_Gmst,
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, NullCreatorFactory>(false));
 
-    manager.add (CSMWorld::UniversalId::Type_Referenceable,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<ReferenceableCreator> > (false));
+    manager.add(CSMWorld::UniversalId::Type_Referenceable,
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<ReferenceableCreator>>(false));
 
-    manager.add (CSMWorld::UniversalId::Type_Reference,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, ReferenceCreatorFactory> (false));
+    manager.add(CSMWorld::UniversalId::Type_Reference,
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, ReferenceCreatorFactory>(false));
 
-    manager.add (CSMWorld::UniversalId::Type_Cell,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<CellCreator> > (false));
+    manager.add(CSMWorld::UniversalId::Type_Cell,
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<CellCreator>>(false));
 
-    manager.add (CSMWorld::UniversalId::Type_JournalInfo,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, InfoCreatorFactory> (false));
+    manager.add(CSMWorld::UniversalId::Type_JournalInfo,
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, InfoCreatorFactory>(false));
 
-    manager.add (CSMWorld::UniversalId::Type_TopicInfo,
+    manager.add(CSMWorld::UniversalId::Type_TopicInfo,
         new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, InfoCreatorFactory>(false));
 
-    manager.add (CSMWorld::UniversalId::Type_Topic,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, TopicCreatorFactory> (false));
+    manager.add(CSMWorld::UniversalId::Type_Topic,
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, TopicCreatorFactory>(false));
 
-    manager.add (CSMWorld::UniversalId::Type_Journal,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, JournalCreatorFactory> (false));
+    manager.add(CSMWorld::UniversalId::Type_Journal,
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, JournalCreatorFactory>(false));
 
-    manager.add (CSMWorld::UniversalId::Type_Pathgrid,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, PathgridCreatorFactory> (false));
+    manager.add(CSMWorld::UniversalId::Type_Pathgrid,
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, PathgridCreatorFactory>(false));
 
-    manager.add (CSMWorld::UniversalId::Type_Land,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<LandCreator> >(false));
+    manager.add(CSMWorld::UniversalId::Type_Land,
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<LandCreator>>(false));
 
-    manager.add (CSMWorld::UniversalId::Type_LandTexture,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<LandTextureCreator> >(false));
+    manager.add(CSMWorld::UniversalId::Type_LandTexture,
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<LandTextureCreator>>(false));
 
-    manager.add (CSMWorld::UniversalId::Type_DebugProfile,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<GenericCreator, CSMWorld::Scope_Project | CSMWorld::Scope_Session> > (false));
+    manager.add(CSMWorld::UniversalId::Type_DebugProfile,
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView,
+            CreatorFactory<GenericCreator, CSMWorld::Scope_Project | CSMWorld::Scope_Session>>(false));
 
-    manager.add (CSMWorld::UniversalId::Type_Filter,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<GenericCreator, CSMWorld::Scope_Project | CSMWorld::Scope_Session> > (false));
+    manager.add(CSMWorld::UniversalId::Type_Filter,
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView,
+            CreatorFactory<GenericCreator, CSMWorld::Scope_Project | CSMWorld::Scope_Session>>(false));
 
-    manager.add (CSMWorld::UniversalId::Type_MetaData,
-        new CSVDoc::SubViewFactory<SimpleDialogueSubView >);
+    manager.add(CSMWorld::UniversalId::Type_MetaData, new CSVDoc::SubViewFactory<SimpleDialogueSubView>);
 
-    //preview
-    manager.add (CSMWorld::UniversalId::Type_Preview, new CSVDoc::SubViewFactory<PreviewSubView>);
+    // preview
+    manager.add(CSMWorld::UniversalId::Type_Preview, new CSVDoc::SubViewFactory<PreviewSubView>);
 }
diff --git a/apps/opencs/view/world/subviews.hpp b/apps/opencs/view/world/subviews.hpp
index 51e4cb0830..cfa5a82139 100644
--- a/apps/opencs/view/world/subviews.hpp
+++ b/apps/opencs/view/world/subviews.hpp
@@ -8,7 +8,7 @@ namespace CSVDoc
 
 namespace CSVWorld
 {
-    void addSubViewFactories (CSVDoc::SubViewFactoryManager& manager);
+    void addSubViewFactories(CSVDoc::SubViewFactoryManager& manager);
 }
 
 #endif
diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index 228834f6b4..1c059ce490 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -1,11 +1,11 @@
 #include "table.hpp"
 
-#include <QHeaderView>
 #include <QAction>
-#include <QMenu>
 #include <QContextMenuEvent>
-#include <QString>
+#include <QHeaderView>
+#include <QMenu>
 #include <QMetaObject>
+#include <QString>
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/helpviewer.hpp>
@@ -13,32 +13,32 @@
 
 #include "../../model/doc/document.hpp"
 
+#include "../../model/world/commanddispatcher.hpp"
 #include "../../model/world/commands.hpp"
-#include "../../model/world/infotableproxymodel.hpp"
-#include "../../model/world/idtablebase.hpp"
 #include "../../model/world/idtable.hpp"
+#include "../../model/world/idtablebase.hpp"
+#include "../../model/world/infotableproxymodel.hpp"
 #include "../../model/world/landtexturetableproxymodel.hpp"
-#include "../../model/world/commanddispatcher.hpp"
 
-#include "../../model/prefs/state.hpp"
 #include "../../model/prefs/shortcut.hpp"
+#include "../../model/prefs/state.hpp"
 
 #include "tableeditidaction.hpp"
 #include "tableheadermouseeventhandler.hpp"
 #include "util.hpp"
 
-void CSVWorld::Table::contextMenuEvent (QContextMenuEvent *event)
+void CSVWorld::Table::contextMenuEvent(QContextMenuEvent* event)
 {
     // configure dispatcher
-    mDispatcher->setSelection (getSelectedIds());
+    mDispatcher->setSelection(getSelectedIds());
 
     std::vector<CSMWorld::UniversalId> extendedTypes = mDispatcher->getExtendedTypes();
 
-    mDispatcher->setExtendedTypes (extendedTypes);
+    mDispatcher->setExtendedTypes(extendedTypes);
 
     // create context menu
     QModelIndexList selectedRows = selectionModel()->selectedRows();
-    QMenu menu (this);
+    QMenu menu(this);
 
     ///  \todo add menu items for select all and clear selection
 
@@ -53,50 +53,49 @@ void CSVWorld::Table::contextMenuEvent (QContextMenuEvent *event)
 
     if (!mEditLock && !(mModel->getFeatures() & CSMWorld::IdTableBase::Feature_Constant))
     {
-        if (selectedRows.size()==1)
+        if (selectedRows.size() == 1)
         {
-            menu.addAction (mEditAction);
+            menu.addAction(mEditAction);
 
             if (mCreateAction)
                 menu.addAction(mCloneAction);
         }
 
         if (mTouchAction)
-            menu.addAction (mTouchAction);
+            menu.addAction(mTouchAction);
 
         if (mCreateAction)
-            menu.addAction (mCreateAction);
+            menu.addAction(mCreateAction);
 
         if (mDispatcher->canRevert())
         {
-            menu.addAction (mRevertAction);
+            menu.addAction(mRevertAction);
 
             if (!extendedTypes.empty())
-                menu.addAction (mExtendedRevertAction);
+                menu.addAction(mExtendedRevertAction);
         }
 
         if (mDispatcher->canDelete())
         {
-            menu.addAction (mDeleteAction);
+            menu.addAction(mDeleteAction);
 
             if (!extendedTypes.empty())
-                menu.addAction (mExtendedDeleteAction);
+                menu.addAction(mExtendedDeleteAction);
         }
 
         if (mModel->getFeatures() & CSMWorld::IdTableBase::Feature_ReorderWithinTopic)
         {
             /// \todo allow reordering of multiple rows
-            if (selectedRows.size()==1)
+            if (selectedRows.size() == 1)
             {
-                int column = mModel->searchColumnIndex (CSMWorld::Columns::ColumnId_Topic);
+                int column = mModel->searchColumnIndex(CSMWorld::Columns::ColumnId_Topic);
 
-                if (column==-1)
-                    column = mModel->searchColumnIndex (CSMWorld::Columns::ColumnId_Journal);
+                if (column == -1)
+                    column = mModel->searchColumnIndex(CSMWorld::Columns::ColumnId_Journal);
 
-                if (column!=-1)
+                if (column != -1)
                 {
-                    int row = mProxyModel->mapToSource (
-                        mProxyModel->index (selectedRows.begin()->row(), 0)).row();
+                    int row = mProxyModel->mapToSource(mProxyModel->index(selectedRows.begin()->row(), 0)).row();
                     QString curData = mModel->data(mModel->index(row, column)).toString();
 
                     if (row > 0)
@@ -121,22 +120,22 @@ void CSVWorld::Table::contextMenuEvent (QContextMenuEvent *event)
         }
     }
 
-    if (selectedRows.size()==1)
+    if (selectedRows.size() == 1)
     {
         int row = selectedRows.begin()->row();
 
-        row = mProxyModel->mapToSource (mProxyModel->index (row, 0)).row();
+        row = mProxyModel->mapToSource(mProxyModel->index(row, 0)).row();
 
         if (mModel->getFeatures() & CSMWorld::IdTableBase::Feature_View)
         {
-            CSMWorld::UniversalId id = mModel->view (row).first;
+            CSMWorld::UniversalId id = mModel->view(row).first;
 
-            int index = mDocument.getData().getCells().searchId (id.getId());
+            int index = mDocument.getData().getCells().searchId(id.getId());
             // index==-1: the ID references a worldspace instead of a cell (ignore for now and go
             // ahead)
 
-            if (index==-1 || !mDocument.getData().getCells().getRecord (index).isDeleted())
-                menu.addAction (mViewAction);
+            if (index == -1 || !mDocument.getData().getCells().getRecord(index).isDeleted())
+                menu.addAction(mViewAction);
         }
 
         if (mModel->getFeatures() & CSMWorld::IdTableBase::Feature_Preview)
@@ -144,37 +143,33 @@ void CSVWorld::Table::contextMenuEvent (QContextMenuEvent *event)
             const CSMWorld::UniversalId id = getUniversalId(currentRow);
             const CSMWorld::UniversalId::Type type = id.getType();
 
-            QModelIndex index = mModel->index (row,
-                mModel->findColumnIndex (CSMWorld::Columns::ColumnId_Modification));
+            QModelIndex index = mModel->index(row, mModel->findColumnIndex(CSMWorld::Columns::ColumnId_Modification));
 
-            CSMWorld::RecordBase::State state = static_cast<CSMWorld::RecordBase::State> (
-                mModel->data (index).toInt());
+            CSMWorld::RecordBase::State state = static_cast<CSMWorld::RecordBase::State>(mModel->data(index).toInt());
 
-            if (state!=CSMWorld::RecordBase::State_Deleted && type != CSMWorld::UniversalId::Type_ItemLevelledList)
-                menu.addAction (mPreviewAction);
+            if (state != CSMWorld::RecordBase::State_Deleted && type != CSMWorld::UniversalId::Type_ItemLevelledList)
+                menu.addAction(mPreviewAction);
         }
     }
 
     if (mHelpAction)
-        menu.addAction (mHelpAction);
+        menu.addAction(mHelpAction);
 
-    menu.exec (event->globalPos());
+    menu.exec(event->globalPos());
 }
 
-void CSVWorld::Table::mouseDoubleClickEvent (QMouseEvent *event)
+void CSVWorld::Table::mouseDoubleClickEvent(QMouseEvent* event)
 {
-    Qt::KeyboardModifiers modifiers =
-        event->modifiers() & (Qt::ShiftModifier | Qt::ControlModifier);
+    Qt::KeyboardModifiers modifiers = event->modifiers() & (Qt::ShiftModifier | Qt::ControlModifier);
 
     QModelIndex index = currentIndex();
 
-    selectionModel()->select (index,
-        QItemSelectionModel::Clear | QItemSelectionModel::Select | QItemSelectionModel::Rows);
+    selectionModel()->select(
+        index, QItemSelectionModel::Clear | QItemSelectionModel::Select | QItemSelectionModel::Rows);
 
-    std::map<Qt::KeyboardModifiers, DoubleClickAction>::iterator iter =
-        mDoubleClickActions.find (modifiers);
+    std::map<Qt::KeyboardModifiers, DoubleClickAction>::iterator iter = mDoubleClickActions.find(modifiers);
 
-    if (iter==mDoubleClickActions.end())
+    if (iter == mDoubleClickActions.end())
     {
         event->accept();
         return;
@@ -189,7 +184,7 @@ void CSVWorld::Table::mouseDoubleClickEvent (QMouseEvent *event)
 
         case Action_InPlaceEdit:
 
-            DragRecordTable::mouseDoubleClickEvent (event);
+            DragRecordTable::mouseDoubleClickEvent(event);
             break;
 
         case Action_EditRecord:
@@ -234,87 +229,92 @@ void CSVWorld::Table::mouseDoubleClickEvent (QMouseEvent *event)
     }
 }
 
-CSVWorld::Table::Table (const CSMWorld::UniversalId& id,
-    bool createAndDelete, bool sorting, CSMDoc::Document& document)
-    : DragRecordTable(document), mCreateAction (nullptr), mCloneAction(nullptr), mTouchAction(nullptr),
-    mRecordStatusDisplay (0), mJumpToAddedRecord(false), mUnselectAfterJump(false), mAutoJump (false)
+CSVWorld::Table::Table(const CSMWorld::UniversalId& id, bool createAndDelete, bool sorting, CSMDoc::Document& document)
+    : DragRecordTable(document)
+    , mCreateAction(nullptr)
+    , mCloneAction(nullptr)
+    , mTouchAction(nullptr)
+    , mRecordStatusDisplay(0)
+    , mJumpToAddedRecord(false)
+    , mUnselectAfterJump(false)
+    , mAutoJump(false)
 {
-    mModel = &dynamic_cast<CSMWorld::IdTableBase&> (*mDocument.getData().getTableModel (id));
+    mModel = &dynamic_cast<CSMWorld::IdTableBase&>(*mDocument.getData().getTableModel(id));
 
-    bool isInfoTable = id.getType() == CSMWorld::UniversalId::Type_TopicInfos ||
-                       id.getType() == CSMWorld::UniversalId::Type_JournalInfos;
+    bool isInfoTable = id.getType() == CSMWorld::UniversalId::Type_TopicInfos
+        || id.getType() == CSMWorld::UniversalId::Type_JournalInfos;
     bool isLtexTable = (id.getType() == CSMWorld::UniversalId::Type_LandTextures);
     if (isInfoTable)
     {
         mProxyModel = new CSMWorld::InfoTableProxyModel(id.getType(), this);
-        connect (this, &CSVWorld::DragRecordTable::moveRecordsFromSameTable, this, &CSVWorld::Table::moveRecords);
+        connect(this, &CSVWorld::DragRecordTable::moveRecordsFromSameTable, this, &CSVWorld::Table::moveRecords);
     }
     else if (isLtexTable)
     {
-        mProxyModel = new CSMWorld::LandTextureTableProxyModel (this);
+        mProxyModel = new CSMWorld::LandTextureTableProxyModel(this);
     }
     else
     {
-        mProxyModel = new CSMWorld::IdTableProxyModel (this);
+        mProxyModel = new CSMWorld::IdTableProxyModel(this);
     }
-    mProxyModel->setSourceModel (mModel);
+    mProxyModel->setSourceModel(mModel);
 
-    mDispatcher = new CSMWorld::CommandDispatcher (document, id, this);
+    mDispatcher = new CSMWorld::CommandDispatcher(document, id, this);
 
-    setModel (mProxyModel);
-    horizontalHeader()->setSectionResizeMode (QHeaderView::Interactive);
+    setModel(mProxyModel);
+    horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
     // The number is arbitrary but autoresize would be way too slow otherwise.
     constexpr int autoResizePrecision = 500;
     horizontalHeader()->setResizeContentsPrecision(autoResizePrecision);
     resizeColumnsToContents();
     verticalHeader()->hide();
-    setSelectionBehavior (QAbstractItemView::SelectRows);
-    setSelectionMode (QAbstractItemView::ExtendedSelection);
+    setSelectionBehavior(QAbstractItemView::SelectRows);
+    setSelectionMode(QAbstractItemView::ExtendedSelection);
 
     int columns = mModel->columnCount();
-    for (int i=0; i<columns; ++i)
+    for (int i = 0; i < columns; ++i)
     {
-        int flags = mModel->headerData (i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Flags).toInt();
+        int flags = mModel->headerData(i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Flags).toInt();
 
         if (flags & CSMWorld::ColumnBase::Flag_Table)
         {
-            CSMWorld::ColumnBase::Display display = static_cast<CSMWorld::ColumnBase::Display> (
-                mModel->headerData (i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Display).toInt());
+            CSMWorld::ColumnBase::Display display = static_cast<CSMWorld::ColumnBase::Display>(
+                mModel->headerData(i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Display).toInt());
 
-            CommandDelegate *delegate = CommandDelegateFactoryCollection::get().makeDelegate (display,
-                mDispatcher, document, this);
+            CommandDelegate* delegate
+                = CommandDelegateFactoryCollection::get().makeDelegate(display, mDispatcher, document, this);
 
-            mDelegates.push_back (delegate);
-            setItemDelegateForColumn (i, delegate);
+            mDelegates.push_back(delegate);
+            setItemDelegateForColumn(i, delegate);
         }
         else
-            hideColumn (i);
+            hideColumn(i);
     }
 
     if (sorting)
     {
         // FIXME: some tables (e.g. CellRef) have this column hidden, which makes it confusing
-        sortByColumn (mModel->findColumnIndex(CSMWorld::Columns::ColumnId_Id), Qt::AscendingOrder);
+        sortByColumn(mModel->findColumnIndex(CSMWorld::Columns::ColumnId_Id), Qt::AscendingOrder);
     }
-    setSortingEnabled (sorting);
+    setSortingEnabled(sorting);
 
-    mEditAction = new QAction (tr ("Edit Record"), this);
-    connect (mEditAction, &QAction::triggered, this, &Table::editRecord);
+    mEditAction = new QAction(tr("Edit Record"), this);
+    connect(mEditAction, &QAction::triggered, this, &Table::editRecord);
     mEditAction->setIcon(QIcon(":edit-edit"));
-    addAction (mEditAction);
+    addAction(mEditAction);
     CSMPrefs::Shortcut* editShortcut = new CSMPrefs::Shortcut("table-edit", this);
     editShortcut->associateAction(mEditAction);
 
     if (createAndDelete)
     {
-        mCreateAction = new QAction (tr ("Add Record"), this);
-        connect (mCreateAction, &QAction::triggered, this, &Table::createRequest);
+        mCreateAction = new QAction(tr("Add Record"), this);
+        connect(mCreateAction, &QAction::triggered, this, &Table::createRequest);
         mCreateAction->setIcon(QIcon(":edit-add"));
-        addAction (mCreateAction);
+        addAction(mCreateAction);
         CSMPrefs::Shortcut* createShortcut = new CSMPrefs::Shortcut("table-add", this);
         createShortcut->associateAction(mCreateAction);
 
-        mCloneAction = new QAction (tr ("Clone Record"), this);
+        mCloneAction = new QAction(tr("Clone Record"), this);
         connect(mCloneAction, &QAction::triggered, this, &Table::cloneRecord);
         mCloneAction->setIcon(QIcon(":edit-clone"));
         addAction(mCloneAction);
@@ -332,134 +332,127 @@ CSVWorld::Table::Table (const CSMWorld::UniversalId& id,
         touchShortcut->associateAction(mTouchAction);
     }
 
-    mRevertAction = new QAction (tr ("Revert Record"), this);
-    connect (mRevertAction, &QAction::triggered, mDispatcher, &CSMWorld::CommandDispatcher::executeRevert);
+    mRevertAction = new QAction(tr("Revert Record"), this);
+    connect(mRevertAction, &QAction::triggered, mDispatcher, &CSMWorld::CommandDispatcher::executeRevert);
     mRevertAction->setIcon(QIcon(":edit-undo"));
-    addAction (mRevertAction);
+    addAction(mRevertAction);
     CSMPrefs::Shortcut* revertShortcut = new CSMPrefs::Shortcut("table-revert", this);
     revertShortcut->associateAction(mRevertAction);
 
-    mDeleteAction = new QAction (tr ("Delete Record"), this);
-    connect (mDeleteAction, &QAction::triggered, mDispatcher, &CSMWorld::CommandDispatcher::executeDelete);
+    mDeleteAction = new QAction(tr("Delete Record"), this);
+    connect(mDeleteAction, &QAction::triggered, mDispatcher, &CSMWorld::CommandDispatcher::executeDelete);
     mDeleteAction->setIcon(QIcon(":edit-delete"));
-    addAction (mDeleteAction);
+    addAction(mDeleteAction);
     CSMPrefs::Shortcut* deleteShortcut = new CSMPrefs::Shortcut("table-remove", this);
     deleteShortcut->associateAction(mDeleteAction);
 
-    mMoveUpAction = new QAction (tr ("Move Up"), this);
-    connect (mMoveUpAction, &QAction::triggered, this, &Table::moveUpRecord);
+    mMoveUpAction = new QAction(tr("Move Up"), this);
+    connect(mMoveUpAction, &QAction::triggered, this, &Table::moveUpRecord);
     mMoveUpAction->setIcon(QIcon(":record-up"));
-    addAction (mMoveUpAction);
+    addAction(mMoveUpAction);
     CSMPrefs::Shortcut* moveUpShortcut = new CSMPrefs::Shortcut("table-moveup", this);
     moveUpShortcut->associateAction(mMoveUpAction);
 
-    mMoveDownAction = new QAction (tr ("Move Down"), this);
-    connect (mMoveDownAction, &QAction::triggered, this, &Table::moveDownRecord);
+    mMoveDownAction = new QAction(tr("Move Down"), this);
+    connect(mMoveDownAction, &QAction::triggered, this, &Table::moveDownRecord);
     mMoveDownAction->setIcon(QIcon(":record-down"));
-    addAction (mMoveDownAction);
+    addAction(mMoveDownAction);
     CSMPrefs::Shortcut* moveDownShortcut = new CSMPrefs::Shortcut("table-movedown", this);
     moveDownShortcut->associateAction(mMoveDownAction);
 
-    mViewAction = new QAction (tr ("View"), this);
-    connect (mViewAction, &QAction::triggered, this, &Table::viewRecord);
+    mViewAction = new QAction(tr("View"), this);
+    connect(mViewAction, &QAction::triggered, this, &Table::viewRecord);
     mViewAction->setIcon(QIcon(":/cell.png"));
-    addAction (mViewAction);
+    addAction(mViewAction);
     CSMPrefs::Shortcut* viewShortcut = new CSMPrefs::Shortcut("table-view", this);
     viewShortcut->associateAction(mViewAction);
 
-    mPreviewAction = new QAction (tr ("Preview"), this);
-    connect (mPreviewAction, &QAction::triggered, this, &Table::previewRecord);
+    mPreviewAction = new QAction(tr("Preview"), this);
+    connect(mPreviewAction, &QAction::triggered, this, &Table::previewRecord);
     mPreviewAction->setIcon(QIcon(":edit-preview"));
-    addAction (mPreviewAction);
+    addAction(mPreviewAction);
     CSMPrefs::Shortcut* previewShortcut = new CSMPrefs::Shortcut("table-preview", this);
     previewShortcut->associateAction(mPreviewAction);
 
-    mExtendedDeleteAction = new QAction (tr ("Extended Delete Record"), this);
-    connect (mExtendedDeleteAction, &QAction::triggered, this, &Table::executeExtendedDelete);
+    mExtendedDeleteAction = new QAction(tr("Extended Delete Record"), this);
+    connect(mExtendedDeleteAction, &QAction::triggered, this, &Table::executeExtendedDelete);
     mExtendedDeleteAction->setIcon(QIcon(":edit-delete"));
-    addAction (mExtendedDeleteAction);
+    addAction(mExtendedDeleteAction);
     CSMPrefs::Shortcut* extendedDeleteShortcut = new CSMPrefs::Shortcut("table-extendeddelete", this);
     extendedDeleteShortcut->associateAction(mExtendedDeleteAction);
 
-    mExtendedRevertAction = new QAction (tr ("Extended Revert Record"), this);
-    connect (mExtendedRevertAction, &QAction::triggered, this, &Table::executeExtendedRevert);
+    mExtendedRevertAction = new QAction(tr("Extended Revert Record"), this);
+    connect(mExtendedRevertAction, &QAction::triggered, this, &Table::executeExtendedRevert);
     mExtendedRevertAction->setIcon(QIcon(":edit-undo"));
-    addAction (mExtendedRevertAction);
+    addAction(mExtendedRevertAction);
     CSMPrefs::Shortcut* extendedRevertShortcut = new CSMPrefs::Shortcut("table-extendedrevert", this);
     extendedRevertShortcut->associateAction(mExtendedRevertAction);
 
-    mEditIdAction = new TableEditIdAction (*this, this);
-    connect (mEditIdAction, &QAction::triggered, this, &Table::editCell);
-    addAction (mEditIdAction);
+    mEditIdAction = new TableEditIdAction(*this, this);
+    connect(mEditIdAction, &QAction::triggered, this, &Table::editCell);
+    addAction(mEditIdAction);
 
-    mHelpAction = new QAction (tr ("Help"), this);
-    connect (mHelpAction, &QAction::triggered, this, &Table::openHelp);
+    mHelpAction = new QAction(tr("Help"), this);
+    connect(mHelpAction, &QAction::triggered, this, &Table::openHelp);
     mHelpAction->setIcon(QIcon(":/info.png"));
-    addAction (mHelpAction);
+    addAction(mHelpAction);
     CSMPrefs::Shortcut* openHelpShortcut = new CSMPrefs::Shortcut("help", this);
     openHelpShortcut->associateAction(mHelpAction);
 
-    connect (mProxyModel, &CSMWorld::IdTableProxyModel::rowsRemoved,
-        this, &Table::tableSizeUpdate);
+    connect(mProxyModel, &CSMWorld::IdTableProxyModel::rowsRemoved, this, &Table::tableSizeUpdate);
 
-    connect (mProxyModel, &CSMWorld::IdTableProxyModel::rowAdded,
-        this, &Table::rowAdded);
+    connect(mProxyModel, &CSMWorld::IdTableProxyModel::rowAdded, this, &Table::rowAdded);
 
     /// \note This signal could instead be connected to a slot that filters out changes not affecting
     /// the records status column (for permanence reasons)
-    connect (mProxyModel, &CSMWorld::IdTableProxyModel::dataChanged,
-        this, &Table::dataChangedEvent);
+    connect(mProxyModel, &CSMWorld::IdTableProxyModel::dataChanged, this, &Table::dataChangedEvent);
 
-    connect (selectionModel(), &QItemSelectionModel::selectionChanged,
-        this, &Table::selectionSizeUpdate);
+    connect(selectionModel(), &QItemSelectionModel::selectionChanged, this, &Table::selectionSizeUpdate);
 
     setAcceptDrops(true);
 
-    mDoubleClickActions.insert (std::make_pair (Qt::NoModifier, Action_InPlaceEdit));
-    mDoubleClickActions.insert (std::make_pair (Qt::ShiftModifier, Action_EditRecord));
-    mDoubleClickActions.insert (std::make_pair (Qt::ControlModifier, Action_View));
-    mDoubleClickActions.insert (std::make_pair (Qt::ShiftModifier | Qt::ControlModifier, Action_EditRecordAndClose));
+    mDoubleClickActions.insert(std::make_pair(Qt::NoModifier, Action_InPlaceEdit));
+    mDoubleClickActions.insert(std::make_pair(Qt::ShiftModifier, Action_EditRecord));
+    mDoubleClickActions.insert(std::make_pair(Qt::ControlModifier, Action_View));
+    mDoubleClickActions.insert(std::make_pair(Qt::ShiftModifier | Qt::ControlModifier, Action_EditRecordAndClose));
 
-    connect (&CSMPrefs::State::get(), &CSMPrefs::State::settingChanged,
-        this, &Table::settingChanged);
+    connect(&CSMPrefs::State::get(), &CSMPrefs::State::settingChanged, this, &Table::settingChanged);
     CSMPrefs::get()["ID Tables"].update();
 
     new TableHeaderMouseEventHandler(this);
 }
 
-void CSVWorld::Table::setEditLock (bool locked)
+void CSVWorld::Table::setEditLock(bool locked)
 {
-    for (std::vector<CommandDelegate *>::iterator iter (mDelegates.begin()); iter!=mDelegates.end(); ++iter)
-        (*iter)->setEditLock (locked);
+    for (std::vector<CommandDelegate*>::iterator iter(mDelegates.begin()); iter != mDelegates.end(); ++iter)
+        (*iter)->setEditLock(locked);
 
     DragRecordTable::setEditLock(locked);
-    mDispatcher->setEditLock (locked);
+    mDispatcher->setEditLock(locked);
 }
 
-CSMWorld::UniversalId CSVWorld::Table::getUniversalId (int row) const
+CSMWorld::UniversalId CSVWorld::Table::getUniversalId(int row) const
 {
-    row = mProxyModel->mapToSource (mProxyModel->index (row, 0)).row();
+    row = mProxyModel->mapToSource(mProxyModel->index(row, 0)).row();
 
-    int idColumn = mModel->findColumnIndex (CSMWorld::Columns::ColumnId_Id);
-    int typeColumn = mModel->findColumnIndex (CSMWorld::Columns::ColumnId_RecordType);
+    int idColumn = mModel->findColumnIndex(CSMWorld::Columns::ColumnId_Id);
+    int typeColumn = mModel->findColumnIndex(CSMWorld::Columns::ColumnId_RecordType);
 
-    return CSMWorld::UniversalId (
-        static_cast<CSMWorld::UniversalId::Type> (mModel->data (mModel->index (row, typeColumn)).toInt()),
-        mModel->data (mModel->index (row, idColumn)).toString().toUtf8().constData());
+    return CSMWorld::UniversalId(
+        static_cast<CSMWorld::UniversalId::Type>(mModel->data(mModel->index(row, typeColumn)).toInt()),
+        mModel->data(mModel->index(row, idColumn)).toString().toUtf8().constData());
 }
 
 std::vector<std::string> CSVWorld::Table::getSelectedIds() const
 {
     std::vector<std::string> ids;
     QModelIndexList selectedRows = selectionModel()->selectedRows();
-    int columnIndex = mModel->findColumnIndex (CSMWorld::Columns::ColumnId_Id);
+    int columnIndex = mModel->findColumnIndex(CSMWorld::Columns::ColumnId_Id);
 
-    for (QModelIndexList::const_iterator iter (selectedRows.begin());
-         iter != selectedRows.end();
-         ++iter)
+    for (QModelIndexList::const_iterator iter(selectedRows.begin()); iter != selectedRows.end(); ++iter)
     {
-        int row = mProxyModel->mapToSource (mProxyModel->index (iter->row(), 0)).row();
-        ids.emplace_back(mModel->data (mModel->index (row, columnIndex)).toString().toUtf8().constData());
+        int row = mProxyModel->mapToSource(mProxyModel->index(iter->row(), 0)).row();
+        ids.emplace_back(mModel->data(mModel->index(row, columnIndex)).toString().toUtf8().constData());
     }
     return ids;
 }
@@ -470,8 +463,8 @@ void CSVWorld::Table::editRecord()
     {
         QModelIndexList selectedRows = selectionModel()->selectedRows();
 
-        if (selectedRows.size()==1)
-            emit editRequest (getUniversalId (selectedRows.begin()->row()), "");
+        if (selectedRows.size() == 1)
+            emit editRequest(getUniversalId(selectedRows.begin()->row()), "");
     }
 }
 
@@ -483,7 +476,7 @@ void CSVWorld::Table::cloneRecord()
         const CSMWorld::UniversalId& toClone = getUniversalId(selectedRows.begin()->row());
         if (selectedRows.size() == 1)
         {
-            emit cloneRequest (toClone);
+            emit cloneRequest(toClone);
         }
     }
 }
@@ -511,28 +504,28 @@ void CSVWorld::Table::moveUpRecord()
 
     QModelIndexList selectedRows = selectionModel()->selectedRows();
 
-    if (selectedRows.size()==1)
+    if (selectedRows.size() == 1)
     {
-        int row2 =selectedRows.begin()->row();
+        int row2 = selectedRows.begin()->row();
 
-        if (row2>0)
+        if (row2 > 0)
         {
-            int row = row2-1;
+            int row = row2 - 1;
 
-            row = mProxyModel->mapToSource (mProxyModel->index (row, 0)).row();
-            row2 = mProxyModel->mapToSource (mProxyModel->index (row2, 0)).row();
+            row = mProxyModel->mapToSource(mProxyModel->index(row, 0)).row();
+            row2 = mProxyModel->mapToSource(mProxyModel->index(row2, 0)).row();
 
-            if (row2<=row)
-                throw std::runtime_error ("Inconsistent row order");
+            if (row2 <= row)
+                throw std::runtime_error("Inconsistent row order");
 
-            std::vector<int> newOrder (row2-row+1);
-            newOrder[0] = row2-row;
-            newOrder[row2-row] = 0;
-            for (int i=1; i<row2-row; ++i)
+            std::vector<int> newOrder(row2 - row + 1);
+            newOrder[0] = row2 - row;
+            newOrder[row2 - row] = 0;
+            for (int i = 1; i < row2 - row; ++i)
                 newOrder[i] = i;
 
-            mDocument.getUndoStack().push (new CSMWorld::ReorderRowsCommand (
-                dynamic_cast<CSMWorld::IdTable&> (*mModel), row, newOrder));
+            mDocument.getUndoStack().push(
+                new CSMWorld::ReorderRowsCommand(dynamic_cast<CSMWorld::IdTable&>(*mModel), row, newOrder));
         }
     }
 }
@@ -544,33 +537,33 @@ void CSVWorld::Table::moveDownRecord()
 
     QModelIndexList selectedRows = selectionModel()->selectedRows();
 
-    if (selectedRows.size()==1)
+    if (selectedRows.size() == 1)
     {
-        int row =selectedRows.begin()->row();
+        int row = selectedRows.begin()->row();
 
-        if (row<mProxyModel->rowCount()-1)
+        if (row < mProxyModel->rowCount() - 1)
         {
-            int row2 = row+1;
+            int row2 = row + 1;
 
-            row = mProxyModel->mapToSource (mProxyModel->index (row, 0)).row();
-            row2 = mProxyModel->mapToSource (mProxyModel->index (row2, 0)).row();
+            row = mProxyModel->mapToSource(mProxyModel->index(row, 0)).row();
+            row2 = mProxyModel->mapToSource(mProxyModel->index(row2, 0)).row();
 
-            if (row2<=row)
-                throw std::runtime_error ("Inconsistent row order");
+            if (row2 <= row)
+                throw std::runtime_error("Inconsistent row order");
 
-            std::vector<int> newOrder (row2-row+1);
-            newOrder[0] = row2-row;
-            newOrder[row2-row] = 0;
-            for (int i=1; i<row2-row; ++i)
+            std::vector<int> newOrder(row2 - row + 1);
+            newOrder[0] = row2 - row;
+            newOrder[row2 - row] = 0;
+            for (int i = 1; i < row2 - row; ++i)
                 newOrder[i] = i;
 
-            mDocument.getUndoStack().push (new CSMWorld::ReorderRowsCommand (
-                dynamic_cast<CSMWorld::IdTable&> (*mModel), row, newOrder));
+            mDocument.getUndoStack().push(
+                new CSMWorld::ReorderRowsCommand(dynamic_cast<CSMWorld::IdTable&>(*mModel), row, newOrder));
         }
     }
 }
 
-void CSVWorld::Table::moveRecords(QDropEvent *event)
+void CSVWorld::Table::moveRecords(QDropEvent* event)
 {
     if (mEditLock || (mModel->getFeatures() & CSMWorld::IdTableBase::Feature_Constant))
         return;
@@ -579,19 +572,21 @@ void CSVWorld::Table::moveRecords(QDropEvent *event)
 
     QModelIndexList selectedRows = selectionModel()->selectedRows();
     int targetRowRaw = targedIndex.row();
-    int targetRow = mProxyModel->mapToSource (mProxyModel->index (targetRowRaw, 0)).row();
+    int targetRow = mProxyModel->mapToSource(mProxyModel->index(targetRowRaw, 0)).row();
     int baseRowRaw = targedIndex.row() - 1;
-    int baseRow = mProxyModel->mapToSource (mProxyModel->index (baseRowRaw, 0)).row();
+    int baseRow = mProxyModel->mapToSource(mProxyModel->index(baseRowRaw, 0)).row();
     int highestDifference = 0;
 
     for (const auto& thisRowData : selectedRows)
     {
-        int thisRow = mProxyModel->mapToSource (mProxyModel->index (thisRowData.row(), 0)).row();
-        if (std::abs(targetRow - thisRow) > highestDifference) highestDifference = std::abs(targetRow - thisRow);
-        if (thisRow - 1 < baseRow) baseRow = thisRow - 1;
+        int thisRow = mProxyModel->mapToSource(mProxyModel->index(thisRowData.row(), 0)).row();
+        if (std::abs(targetRow - thisRow) > highestDifference)
+            highestDifference = std::abs(targetRow - thisRow);
+        if (thisRow - 1 < baseRow)
+            baseRow = thisRow - 1;
     }
 
-    std::vector<int> newOrder (highestDifference + 1);
+    std::vector<int> newOrder(highestDifference + 1);
 
     for (long unsigned int i = 0; i < newOrder.size(); ++i)
     {
@@ -616,9 +611,9 @@ void CSVWorld::Table::moveRecords(QDropEvent *event)
         */
 
         int originRowRaw = thisRowData.row();
-        int originRow = mProxyModel->mapToSource (mProxyModel->index (originRowRaw, 0)).row();
+        int originRow = mProxyModel->mapToSource(mProxyModel->index(originRowRaw, 0)).row();
 
-        newOrder.erase(newOrder.begin() +  originRow - baseRow - 1);
+        newOrder.erase(newOrder.begin() + originRow - baseRow - 1);
         newOrder.emplace(newOrder.begin() + originRow - baseRow - 1, targetRow - baseRow - 1);
 
         if (originRow > targetRow)
@@ -635,10 +630,9 @@ void CSVWorld::Table::moveRecords(QDropEvent *event)
                 --newOrder[i];
             }
         }
-
     }
-    mDocument.getUndoStack().push (new CSMWorld::ReorderRowsCommand (
-        dynamic_cast<CSMWorld::IdTable&> (*mModel), baseRow + 1, newOrder));
+    mDocument.getUndoStack().push(
+        new CSMWorld::ReorderRowsCommand(dynamic_cast<CSMWorld::IdTable&>(*mModel), baseRow + 1, newOrder));
 }
 
 void CSVWorld::Table::editCell()
@@ -658,16 +652,16 @@ void CSVWorld::Table::viewRecord()
 
     QModelIndexList selectedRows = selectionModel()->selectedRows();
 
-    if (selectedRows.size()==1)
+    if (selectedRows.size() == 1)
     {
         int row = selectedRows.begin()->row();
 
-        row = mProxyModel->mapToSource (mProxyModel->index (row, 0)).row();
+        row = mProxyModel->mapToSource(mProxyModel->index(row, 0)).row();
 
-        std::pair<CSMWorld::UniversalId, std::string> params = mModel->view (row);
+        std::pair<CSMWorld::UniversalId, std::string> params = mModel->view(row);
 
-        if (params.first.getType()!=CSMWorld::UniversalId::Type_None)
-            emit editRequest (params.first, params.second);
+        if (params.first.getType() != CSMWorld::UniversalId::Type_None)
+            emit editRequest(params.first, params.second);
     }
 }
 
@@ -675,16 +669,15 @@ void CSVWorld::Table::previewRecord()
 {
     QModelIndexList selectedRows = selectionModel()->selectedRows();
 
-    if (selectedRows.size()==1)
+    if (selectedRows.size() == 1)
     {
-        std::string id = getUniversalId (selectedRows.begin()->row()).getId();
+        std::string id = getUniversalId(selectedRows.begin()->row()).getId();
 
-        QModelIndex index = mModel->getModelIndex (id,
-            mModel->findColumnIndex (CSMWorld::Columns::ColumnId_Modification));
+        QModelIndex index
+            = mModel->getModelIndex(id, mModel->findColumnIndex(CSMWorld::Columns::ColumnId_Modification));
 
-        if (mModel->data (index)!=CSMWorld::RecordBase::State_Deleted)
-            emit editRequest (CSMWorld::UniversalId (CSMWorld::UniversalId::Type_Preview, id),
-                "");
+        if (mModel->data(index) != CSMWorld::RecordBase::State_Deleted)
+            emit editRequest(CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Preview, id), "");
     }
 }
 
@@ -712,16 +705,16 @@ void CSVWorld::Table::executeExtendedRevert()
     }
 }
 
-void CSVWorld::Table::settingChanged (const CSMPrefs::Setting *setting)
+void CSVWorld::Table::settingChanged(const CSMPrefs::Setting* setting)
 {
-    if (*setting=="ID Tables/jump-to-added")
+    if (*setting == "ID Tables/jump-to-added")
     {
-        if (setting->toString()=="Jump and Select")
+        if (setting->toString() == "Jump and Select")
         {
             mJumpToAddedRecord = true;
             mUnselectAfterJump = false;
         }
-        else if (setting->toString()=="Jump Only")
+        else if (setting->toString() == "Jump Only")
         {
             mJumpToAddedRecord = true;
             mUnselectAfterJump = true;
@@ -732,49 +725,47 @@ void CSVWorld::Table::settingChanged (const CSMPrefs::Setting *setting)
             mUnselectAfterJump = false;
         }
     }
-    else if (*setting=="Records/type-format" || *setting=="Records/status-format")
+    else if (*setting == "Records/type-format" || *setting == "Records/status-format")
     {
         int columns = mModel->columnCount();
 
-        for (int i=0; i<columns; ++i)
-            if (QAbstractItemDelegate *delegate = itemDelegateForColumn (i))
+        for (int i = 0; i < columns; ++i)
+            if (QAbstractItemDelegate* delegate = itemDelegateForColumn(i))
             {
-                dynamic_cast<CommandDelegate&> (*delegate).settingChanged (setting);
-                emit dataChanged (mModel->index (0, i),
-                    mModel->index (mModel->rowCount()-1, i));
+                dynamic_cast<CommandDelegate&>(*delegate).settingChanged(setting);
+                emit dataChanged(mModel->index(0, i), mModel->index(mModel->rowCount() - 1, i));
             }
     }
-    else if (setting->getParent()->getKey()=="ID Tables" &&
-        setting->getKey().substr (0, 6)=="double")
+    else if (setting->getParent()->getKey() == "ID Tables" && setting->getKey().substr(0, 6) == "double")
     {
-        std::string modifierString = setting->getKey().substr (6);
+        std::string modifierString = setting->getKey().substr(6);
 
         Qt::KeyboardModifiers modifiers;
 
-        if (modifierString=="-s")
+        if (modifierString == "-s")
             modifiers = Qt::ShiftModifier;
-        else if (modifierString=="-c")
+        else if (modifierString == "-c")
             modifiers = Qt::ControlModifier;
-        else if (modifierString=="-sc")
+        else if (modifierString == "-sc")
             modifiers = Qt::ShiftModifier | Qt::ControlModifier;
 
         DoubleClickAction action = Action_None;
 
         std::string value = setting->toString();
 
-        if (value=="Edit in Place")
+        if (value == "Edit in Place")
             action = Action_InPlaceEdit;
-        else if (value=="Edit Record")
+        else if (value == "Edit Record")
             action = Action_EditRecord;
-        else if (value=="View")
+        else if (value == "View")
             action = Action_View;
-        else if (value=="Revert")
+        else if (value == "Revert")
             action = Action_Revert;
-        else if (value=="Delete")
+        else if (value == "Delete")
             action = Action_Delete;
-        else if (value=="Edit Record and Close")
+        else if (value == "Edit Record and Close")
             action = Action_EditRecordAndClose;
-        else if (value=="View and Close")
+        else if (value == "View and Close")
             action = Action_ViewAndClose;
 
         mDoubleClickActions[modifiers] = action;
@@ -787,26 +778,37 @@ void CSVWorld::Table::tableSizeUpdate()
     int deleted = 0;
     int modified = 0;
 
-    if (mProxyModel->columnCount()>0)
+    if (mProxyModel->columnCount() > 0)
     {
         int rows = mProxyModel->rowCount();
 
-        int columnIndex = mModel->searchColumnIndex (CSMWorld::Columns::ColumnId_Modification);
+        int columnIndex = mModel->searchColumnIndex(CSMWorld::Columns::ColumnId_Modification);
 
-        if (columnIndex!=-1)
+        if (columnIndex != -1)
         {
-            for (int i=0; i<rows; ++i)
+            for (int i = 0; i < rows; ++i)
             {
-                QModelIndex index = mProxyModel->mapToSource (mProxyModel->index (i, 0));
+                QModelIndex index = mProxyModel->mapToSource(mProxyModel->index(i, 0));
 
-                int state = mModel->data (mModel->index (index.row(), columnIndex)).toInt();
+                int state = mModel->data(mModel->index(index.row(), columnIndex)).toInt();
 
                 switch (state)
                 {
-                    case CSMWorld::RecordBase::State_BaseOnly: ++size; break;
-                    case CSMWorld::RecordBase::State_Modified: ++size; ++modified; break;
-                    case CSMWorld::RecordBase::State_ModifiedOnly: ++size; ++modified; break;
-                    case CSMWorld::RecordBase::State_Deleted: ++deleted; ++modified; break;
+                    case CSMWorld::RecordBase::State_BaseOnly:
+                        ++size;
+                        break;
+                    case CSMWorld::RecordBase::State_Modified:
+                        ++size;
+                        ++modified;
+                        break;
+                    case CSMWorld::RecordBase::State_ModifiedOnly:
+                        ++size;
+                        ++modified;
+                        break;
+                    case CSMWorld::RecordBase::State_Deleted:
+                        ++deleted;
+                        ++modified;
+                        break;
                 }
             }
         }
@@ -814,35 +816,35 @@ void CSVWorld::Table::tableSizeUpdate()
             size = rows;
     }
 
-    emit tableSizeChanged (size, deleted, modified);
+    emit tableSizeChanged(size, deleted, modified);
 }
 
 void CSVWorld::Table::selectionSizeUpdate()
 {
-    emit selectionSizeChanged (selectionModel()->selectedRows().size());
+    emit selectionSizeChanged(selectionModel()->selectedRows().size());
 }
 
-void CSVWorld::Table::requestFocus (const std::string& id)
+void CSVWorld::Table::requestFocus(const std::string& id)
 {
-    QModelIndex index = mProxyModel->getModelIndex (id, 0);
+    QModelIndex index = mProxyModel->getModelIndex(id, 0);
 
     if (index.isValid())
     {
         // This will scroll to the row.
-        selectRow (index.row());
+        selectRow(index.row());
         // This will actually select it.
-        selectionModel()->select (index, QItemSelectionModel::Select | QItemSelectionModel::Rows);
+        selectionModel()->select(index, QItemSelectionModel::Select | QItemSelectionModel::Rows);
     }
 }
 
-void CSVWorld::Table::recordFilterChanged (std::shared_ptr<CSMFilter::Node> filter)
+void CSVWorld::Table::recordFilterChanged(std::shared_ptr<CSMFilter::Node> filter)
 {
-    mProxyModel->setFilter (filter);
+    mProxyModel->setFilter(filter);
     tableSizeUpdate();
     selectionSizeUpdate();
 }
 
-void CSVWorld::Table::mouseMoveEvent (QMouseEvent* event)
+void CSVWorld::Table::mouseMoveEvent(QMouseEvent* event)
 {
     if (event->buttons() & Qt::LeftButton)
     {
@@ -857,24 +859,24 @@ std::vector<std::string> CSVWorld::Table::getColumnsWithDisplay(CSMWorld::Column
     std::vector<std::string> titles;
     for (int i = 0; i < count; ++i)
     {
-        CSMWorld::ColumnBase::Display columndisplay = static_cast<CSMWorld::ColumnBase::Display>
-                                                     (mModel->headerData (i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Display).toInt());
+        CSMWorld::ColumnBase::Display columndisplay = static_cast<CSMWorld::ColumnBase::Display>(
+            mModel->headerData(i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Display).toInt());
 
         if (display == columndisplay)
         {
-            titles.emplace_back(mModel->headerData (i, Qt::Horizontal).toString().toUtf8().constData());
+            titles.emplace_back(mModel->headerData(i, Qt::Horizontal).toString().toUtf8().constData());
         }
     }
     return titles;
 }
 
-std::vector< CSMWorld::UniversalId > CSVWorld::Table::getDraggedRecords() const
+std::vector<CSMWorld::UniversalId> CSVWorld::Table::getDraggedRecords() const
 {
     QModelIndexList selectedRows = selectionModel()->selectedRows();
     std::vector<CSMWorld::UniversalId> idToDrag;
 
     for (QModelIndex& it : selectedRows)
-        idToDrag.push_back (getUniversalId (it.row()));
+        idToDrag.push_back(getUniversalId(it.row()));
 
     return idToDrag;
 }
@@ -883,10 +885,10 @@ std::vector< CSMWorld::UniversalId > CSVWorld::Table::getDraggedRecords() const
 //
 // If, for example, mModel was used instead, then scrolTo() should use the index
 //   mProxyModel->mapFromSource(mModel->index(end, 0))
-void CSVWorld::Table::rowAdded(const std::string &id)
+void CSVWorld::Table::rowAdded(const std::string& id)
 {
     tableSizeUpdate();
-    if(mJumpToAddedRecord)
+    if (mJumpToAddedRecord)
     {
         int idColumn = mModel->findColumnIndex(CSMWorld::Columns::ColumnId_Id);
         int end = mProxyModel->getModelIndex(id, idColumn).row();
@@ -895,7 +897,7 @@ void CSVWorld::Table::rowAdded(const std::string &id)
         // without this delay the scroll works but goes to top for add/clone
         QMetaObject::invokeMethod(this, "queuedScrollTo", Qt::QueuedConnection, Q_ARG(int, end));
 
-        if(mUnselectAfterJump)
+        if (mUnselectAfterJump)
             clearSelection();
     }
 }
@@ -905,7 +907,7 @@ void CSVWorld::Table::queuedScrollTo(int row)
     scrollTo(mProxyModel->index(row, 0), QAbstractItemView::PositionAtCenter);
 }
 
-void CSVWorld::Table::dataChangedEvent(const QModelIndex &topLeft, const QModelIndex &bottomRight)
+void CSVWorld::Table::dataChangedEvent(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     tableSizeUpdate();
 
@@ -918,7 +920,7 @@ void CSVWorld::Table::dataChangedEvent(const QModelIndex &topLeft, const QModelI
 
 void CSVWorld::Table::jumpAfterModChanged(int state)
 {
-    if(state == Qt::Checked)
+    if (state == Qt::Checked)
         mAutoJump = true;
     else
         mAutoJump = false;
diff --git a/apps/opencs/view/world/table.hpp b/apps/opencs/view/world/table.hpp
index caae3165cf..6834e5827a 100644
--- a/apps/opencs/view/world/table.hpp
+++ b/apps/opencs/view/world/table.hpp
@@ -1,8 +1,8 @@
 #ifndef CSV_WORLD_TABLE_H
 #define CSV_WORLD_TABLE_H
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "../../model/filter/node.hpp"
 #include "../../model/world/columnbase.hpp"
@@ -36,139 +36,135 @@ namespace CSVWorld
     ///< Table widget
     class Table : public DragRecordTable
     {
-            Q_OBJECT
-
-            enum DoubleClickAction
-            {
-                Action_None,
-                Action_InPlaceEdit,
-                Action_EditRecord,
-                Action_View,
-                Action_Revert,
-                Action_Delete,
-                Action_EditRecordAndClose,
-                Action_ViewAndClose
-            };
-
-            std::vector<CommandDelegate *> mDelegates;
-            QAction *mEditAction;
-            QAction *mCreateAction;
-            QAction *mCloneAction;
-            QAction *mTouchAction;
-            QAction *mRevertAction;
-            QAction *mDeleteAction;
-            QAction *mMoveUpAction;
-            QAction *mMoveDownAction;
-            QAction *mViewAction;
-            QAction *mPreviewAction;
-            QAction *mExtendedDeleteAction;
-            QAction *mExtendedRevertAction;
-            QAction *mHelpAction;
-            TableEditIdAction *mEditIdAction;
-            CSMWorld::IdTableProxyModel *mProxyModel;
-            CSMWorld::IdTableBase *mModel;
-            int mRecordStatusDisplay;
-            CSMWorld::CommandDispatcher *mDispatcher;
-            std::map<Qt::KeyboardModifiers, DoubleClickAction> mDoubleClickActions;
-            bool mJumpToAddedRecord;
-            bool mUnselectAfterJump;
-            bool mAutoJump;
-
-        private:
+        Q_OBJECT
 
-            void contextMenuEvent (QContextMenuEvent *event) override;
+        enum DoubleClickAction
+        {
+            Action_None,
+            Action_InPlaceEdit,
+            Action_EditRecord,
+            Action_View,
+            Action_Revert,
+            Action_Delete,
+            Action_EditRecordAndClose,
+            Action_ViewAndClose
+        };
 
-            void mouseMoveEvent(QMouseEvent *event) override;
+        std::vector<CommandDelegate*> mDelegates;
+        QAction* mEditAction;
+        QAction* mCreateAction;
+        QAction* mCloneAction;
+        QAction* mTouchAction;
+        QAction* mRevertAction;
+        QAction* mDeleteAction;
+        QAction* mMoveUpAction;
+        QAction* mMoveDownAction;
+        QAction* mViewAction;
+        QAction* mPreviewAction;
+        QAction* mExtendedDeleteAction;
+        QAction* mExtendedRevertAction;
+        QAction* mHelpAction;
+        TableEditIdAction* mEditIdAction;
+        CSMWorld::IdTableProxyModel* mProxyModel;
+        CSMWorld::IdTableBase* mModel;
+        int mRecordStatusDisplay;
+        CSMWorld::CommandDispatcher* mDispatcher;
+        std::map<Qt::KeyboardModifiers, DoubleClickAction> mDoubleClickActions;
+        bool mJumpToAddedRecord;
+        bool mUnselectAfterJump;
+        bool mAutoJump;
 
-        protected:
+    private:
+        void contextMenuEvent(QContextMenuEvent* event) override;
 
-            void mouseDoubleClickEvent (QMouseEvent *event) override;
+        void mouseMoveEvent(QMouseEvent* event) override;
 
-        public:
+    protected:
+        void mouseDoubleClickEvent(QMouseEvent* event) override;
 
-            Table (const CSMWorld::UniversalId& id, bool createAndDelete,
-                bool sorting, CSMDoc::Document& document);
-            ///< \param createAndDelete Allow creation and deletion of records.
-            /// \param sorting Allow changing order of rows in the view via column headers.
+    public:
+        Table(const CSMWorld::UniversalId& id, bool createAndDelete, bool sorting, CSMDoc::Document& document);
+        ///< \param createAndDelete Allow creation and deletion of records.
+        /// \param sorting Allow changing order of rows in the view via column headers.
 
-            virtual void setEditLock (bool locked);
+        virtual void setEditLock(bool locked);
 
-            CSMWorld::UniversalId getUniversalId (int row) const;
+        CSMWorld::UniversalId getUniversalId(int row) const;
 
-            std::vector<std::string> getColumnsWithDisplay(CSMWorld::ColumnBase::Display display) const;
+        std::vector<std::string> getColumnsWithDisplay(CSMWorld::ColumnBase::Display display) const;
 
-            std::vector<std::string> getSelectedIds() const;
+        std::vector<std::string> getSelectedIds() const;
 
-            std::vector<CSMWorld::UniversalId> getDraggedRecords() const override;
+        std::vector<CSMWorld::UniversalId> getDraggedRecords() const override;
 
-        signals:
+    signals:
 
-            void editRequest (const CSMWorld::UniversalId& id, const std::string& hint);
+        void editRequest(const CSMWorld::UniversalId& id, const std::string& hint);
 
-            void selectionSizeChanged (int size);
+        void selectionSizeChanged(int size);
 
-            void tableSizeChanged (int size, int deleted, int modified);
-            ///< \param size Number of not deleted records
-            /// \param deleted Number of deleted records
-            /// \param modified Number of added and modified records
+        void tableSizeChanged(int size, int deleted, int modified);
+        ///< \param size Number of not deleted records
+        /// \param deleted Number of deleted records
+        /// \param modified Number of added and modified records
 
-            void createRequest();
+        void createRequest();
 
-            void cloneRequest(const CSMWorld::UniversalId&);
+        void cloneRequest(const CSMWorld::UniversalId&);
 
-            void touchRequest(const std::vector<CSMWorld::UniversalId>& ids);
+        void touchRequest(const std::vector<CSMWorld::UniversalId>& ids);
 
-            void closeRequest();
+        void closeRequest();
 
-            void extendedDeleteConfigRequest(const std::vector<std::string> &selectedIds);
+        void extendedDeleteConfigRequest(const std::vector<std::string>& selectedIds);
 
-            void extendedRevertConfigRequest(const std::vector<std::string> &selectedIds);
+        void extendedRevertConfigRequest(const std::vector<std::string>& selectedIds);
 
-        private slots:
+    private slots:
 
-            void editCell();
+        void editCell();
 
-            static void openHelp();
+        static void openHelp();
 
-            void editRecord();
+        void editRecord();
 
-            void cloneRecord();
+        void cloneRecord();
 
-            void touchRecord();
+        void touchRecord();
 
-            void moveUpRecord();
+        void moveUpRecord();
 
-            void moveDownRecord();
+        void moveDownRecord();
 
-            void moveRecords(QDropEvent *event);
+        void moveRecords(QDropEvent* event);
 
-            void viewRecord();
+        void viewRecord();
 
-            void previewRecord();
+        void previewRecord();
 
-            void executeExtendedDelete();
+        void executeExtendedDelete();
 
-            void executeExtendedRevert();
+        void executeExtendedRevert();
 
-        public slots:
+    public slots:
 
-            void settingChanged (const CSMPrefs::Setting *setting);
+        void settingChanged(const CSMPrefs::Setting* setting);
 
-            void tableSizeUpdate();
+        void tableSizeUpdate();
 
-            void selectionSizeUpdate();
+        void selectionSizeUpdate();
 
-            void requestFocus (const std::string& id);
+        void requestFocus(const std::string& id);
 
-            void recordFilterChanged (std::shared_ptr<CSMFilter::Node> filter);
+        void recordFilterChanged(std::shared_ptr<CSMFilter::Node> filter);
 
-            void rowAdded(const std::string &id);
+        void rowAdded(const std::string& id);
 
-            void dataChangedEvent(const QModelIndex &topLeft, const QModelIndex &bottomRight);
+        void dataChangedEvent(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
-            void jumpAfterModChanged(int state);
+        void jumpAfterModChanged(int state);
 
-            void queuedScrollTo(int state);
+        void queuedScrollTo(int state);
     };
 }
 
diff --git a/apps/opencs/view/world/tablebottombox.cpp b/apps/opencs/view/world/tablebottombox.cpp
index 3d64280625..217e4308c9 100644
--- a/apps/opencs/view/world/tablebottombox.cpp
+++ b/apps/opencs/view/world/tablebottombox.cpp
@@ -2,11 +2,11 @@
 
 #include <sstream>
 
-#include <QStatusBar>
-#include <QStackedLayout>
-#include <QLabel>
 #include <QEvent>
 #include <QKeyEvent>
+#include <QLabel>
+#include <QStackedLayout>
+#include <QStatusBar>
 
 #include "creator.hpp"
 
@@ -30,29 +30,27 @@ void CSVWorld::TableBottomBox::updateStatus()
     {
         if (!mStatusMessage.isEmpty())
         {
-            mStatus->setText (mStatusMessage);
+            mStatus->setText(mStatusMessage);
             return;
         }
 
-        static const char *sLabels[4] = { "record", "deleted", "touched", "selected" };
-        static const char *sLabelsPlural[4] = { "records", "deleted", "touched", "selected" };
+        static const char* sLabels[4] = { "record", "deleted", "touched", "selected" };
+        static const char* sLabelsPlural[4] = { "records", "deleted", "touched", "selected" };
 
         std::ostringstream stream;
 
         bool first = true;
 
-        for (int i=0; i<4; ++i)
+        for (int i = 0; i < 4; ++i)
         {
-            if (mStatusCount[i]>0)
+            if (mStatusCount[i] > 0)
             {
                 if (first)
                     first = false;
                 else
                     stream << ", ";
 
-                stream
-                    << mStatusCount[i] << ' '
-                    << (mStatusCount[i]==1 ? sLabels[i] : sLabelsPlural[i]);
+                stream << mStatusCount[i] << ' ' << (mStatusCount[i] == 1 ? sLabels[i] : sLabelsPlural[i]);
             }
         }
 
@@ -64,71 +62,73 @@ void CSVWorld::TableBottomBox::updateStatus()
             stream << "(" << mRow << ", " << mColumn << ")";
         }
 
-        mStatus->setText (QString::fromUtf8 (stream.str().c_str()));
+        mStatus->setText(QString::fromUtf8(stream.str().c_str()));
     }
 }
 
-void CSVWorld::TableBottomBox::extendedConfigRequest(CSVWorld::ExtendedCommandConfigurator::Mode mode,
-                                                     const std::vector<std::string> &selectedIds)
+void CSVWorld::TableBottomBox::extendedConfigRequest(
+    CSVWorld::ExtendedCommandConfigurator::Mode mode, const std::vector<std::string>& selectedIds)
 {
-    mExtendedConfigurator->configure (mode, selectedIds);
-    mLayout->setCurrentWidget (mExtendedConfigurator);
+    mExtendedConfigurator->configure(mode, selectedIds);
+    mLayout->setCurrentWidget(mExtendedConfigurator);
     mEditMode = EditMode_ExtendedConfig;
-    setVisible (true);
+    setVisible(true);
     mExtendedConfigurator->setFocus();
 }
 
-CSVWorld::TableBottomBox::TableBottomBox (const CreatorFactoryBase& creatorFactory,
-                                          CSMDoc::Document& document,
-                                          const CSMWorld::UniversalId& id,
-                                          QWidget *parent)
-: QWidget (parent), mShowStatusBar (false), mEditMode(EditMode_None), mHasPosition(false), mRow(0), mColumn(0)
+CSVWorld::TableBottomBox::TableBottomBox(const CreatorFactoryBase& creatorFactory, CSMDoc::Document& document,
+    const CSMWorld::UniversalId& id, QWidget* parent)
+    : QWidget(parent)
+    , mShowStatusBar(false)
+    , mEditMode(EditMode_None)
+    , mHasPosition(false)
+    , mRow(0)
+    , mColumn(0)
 {
-    for (int i=0; i<4; ++i)
+    for (int i = 0; i < 4; ++i)
         mStatusCount[i] = 0;
 
-    setVisible (false);
+    setVisible(false);
 
     mLayout = new QStackedLayout;
-    mLayout->setContentsMargins (0, 0, 0, 0);
-    connect (mLayout, &QStackedLayout::currentChanged, this, &TableBottomBox::currentWidgetChanged);
+    mLayout->setContentsMargins(0, 0, 0, 0);
+    connect(mLayout, &QStackedLayout::currentChanged, this, &TableBottomBox::currentWidgetChanged);
 
     mStatus = new QLabel;
 
     mStatusBar = new QStatusBar(this);
 
-    mStatusBar->addWidget (mStatus);
+    mStatusBar->addWidget(mStatus);
 
-    mLayout->addWidget (mStatusBar);
+    mLayout->addWidget(mStatusBar);
 
-    setLayout (mLayout);
+    setLayout(mLayout);
 
-    mCreator = creatorFactory.makeCreator (document, id);
+    mCreator = creatorFactory.makeCreator(document, id);
 
     if (mCreator)
     {
         mCreator->installEventFilter(this);
-        mLayout->addWidget (mCreator);
+        mLayout->addWidget(mCreator);
 
-        connect (mCreator, &Creator::done, this, &TableBottomBox::requestDone);
+        connect(mCreator, &Creator::done, this, &TableBottomBox::requestDone);
 
-        connect (mCreator, &Creator::requestFocus, this, &TableBottomBox::requestFocus);
+        connect(mCreator, &Creator::requestFocus, this, &TableBottomBox::requestFocus);
     }
 
-    mExtendedConfigurator = new ExtendedCommandConfigurator (document, id, this);
+    mExtendedConfigurator = new ExtendedCommandConfigurator(document, id, this);
     mExtendedConfigurator->installEventFilter(this);
-    mLayout->addWidget (mExtendedConfigurator);
-    connect (mExtendedConfigurator, &ExtendedCommandConfigurator::done, 
-        this, &TableBottomBox::requestDone);
+    mLayout->addWidget(mExtendedConfigurator);
+    connect(mExtendedConfigurator, &ExtendedCommandConfigurator::done, this, &TableBottomBox::requestDone);
 
     updateSize();
 }
 
-void CSVWorld::TableBottomBox::setEditLock (bool locked)
+void CSVWorld::TableBottomBox::setEditLock(bool locked)
 {
     if (mCreator)
-        mCreator->setEditLock (locked);
-    mExtendedConfigurator->setEditLock (locked);
+        mCreator->setEditLock(locked);
+    mExtendedConfigurator->setEditLock(locked);
 }
 
 CSVWorld::TableBottomBox::~TableBottomBox()
@@ -136,11 +136,11 @@ CSVWorld::TableBottomBox::~TableBottomBox()
     delete mCreator;
 }
 
-bool CSVWorld::TableBottomBox::eventFilter(QObject *object, QEvent *event)
+bool CSVWorld::TableBottomBox::eventFilter(QObject* object, QEvent* event)
 {
     if (event->type() == QEvent::KeyPress)
     {
-        QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
+        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
         if (keyEvent->key() == Qt::Key_Escape)
         {
             requestDone();
@@ -150,11 +150,11 @@ bool CSVWorld::TableBottomBox::eventFilter(QObject *object, QEvent *event)
     return QWidget::eventFilter(object, event);
 }
 
-void CSVWorld::TableBottomBox::setStatusBar (bool show)
+void CSVWorld::TableBottomBox::setStatusBar(bool show)
 {
-    if (show!=mShowStatusBar)
+    if (show != mShowStatusBar)
     {
-        setVisible (show || (mEditMode != EditMode_None));
+        setVisible(show || (mEditMode != EditMode_None));
 
         mShowStatusBar = show;
 
@@ -171,11 +171,11 @@ bool CSVWorld::TableBottomBox::canCreateAndDelete() const
 void CSVWorld::TableBottomBox::requestDone()
 {
     if (!mShowStatusBar)
-        setVisible (false);
+        setVisible(false);
     else
         updateStatus();
 
-    mLayout->setCurrentWidget (mStatusBar);
+    mLayout->setCurrentWidget(mStatusBar);
     mEditMode = EditMode_None;
 }
 
@@ -184,15 +184,15 @@ void CSVWorld::TableBottomBox::currentWidgetChanged(int /*index*/)
     updateSize();
 }
 
-void CSVWorld::TableBottomBox::setStatusMessage (const QString& message)
+void CSVWorld::TableBottomBox::setStatusMessage(const QString& message)
 {
     mStatusMessage = message;
     updateStatus();
 }
 
-void CSVWorld::TableBottomBox::selectionSizeChanged (int size)
+void CSVWorld::TableBottomBox::selectionSizeChanged(int size)
 {
-    if (mStatusCount[3]!=size)
+    if (mStatusCount[3] != size)
     {
         mStatusMessage = "";
         mStatusCount[3] = size;
@@ -200,23 +200,23 @@ void CSVWorld::TableBottomBox::selectionSizeChanged (int size)
     }
 }
 
-void CSVWorld::TableBottomBox::tableSizeChanged (int size, int deleted, int modified)
+void CSVWorld::TableBottomBox::tableSizeChanged(int size, int deleted, int modified)
 {
     bool changed = false;
 
-    if (mStatusCount[0]!=size)
+    if (mStatusCount[0] != size)
     {
         mStatusCount[0] = size;
         changed = true;
     }
 
-    if (mStatusCount[1]!=deleted)
+    if (mStatusCount[1] != deleted)
     {
         mStatusCount[1] = deleted;
         changed = true;
     }
 
-    if (mStatusCount[2]!=modified)
+    if (mStatusCount[2] != modified)
     {
         mStatusCount[2] = modified;
         changed = true;
@@ -229,7 +229,7 @@ void CSVWorld::TableBottomBox::tableSizeChanged (int size, int deleted, int modi
     }
 }
 
-void CSVWorld::TableBottomBox::positionChanged (int row, int column)
+void CSVWorld::TableBottomBox::positionChanged(int row, int column)
 {
     mRow = row;
     mColumn = column;
@@ -247,20 +247,19 @@ void CSVWorld::TableBottomBox::createRequest()
 {
     mCreator->reset();
     mCreator->toggleWidgets(true);
-    mLayout->setCurrentWidget (mCreator);
-    setVisible (true);
+    mLayout->setCurrentWidget(mCreator);
+    setVisible(true);
     mEditMode = EditMode_Creation;
     mCreator->focus();
 }
 
-void CSVWorld::TableBottomBox::cloneRequest(const std::string& id,
-                                            const CSMWorld::UniversalId::Type type)
+void CSVWorld::TableBottomBox::cloneRequest(const std::string& id, const CSMWorld::UniversalId::Type type)
 {
     mCreator->reset();
     mCreator->cloneMode(id, type);
     mLayout->setCurrentWidget(mCreator);
     mCreator->toggleWidgets(false);
-    setVisible (true);
+    setVisible(true);
     mEditMode = EditMode_Creation;
     mCreator->focus();
 }
@@ -270,12 +269,12 @@ void CSVWorld::TableBottomBox::touchRequest(const std::vector<CSMWorld::Universa
     mCreator->touch(ids);
 }
 
-void CSVWorld::TableBottomBox::extendedDeleteConfigRequest(const std::vector<std::string> &selectedIds)
+void CSVWorld::TableBottomBox::extendedDeleteConfigRequest(const std::vector<std::string>& selectedIds)
 {
     extendedConfigRequest(ExtendedCommandConfigurator::Mode_Delete, selectedIds);
 }
 
-void CSVWorld::TableBottomBox::extendedRevertConfigRequest(const std::vector<std::string> &selectedIds)
+void CSVWorld::TableBottomBox::extendedRevertConfigRequest(const std::vector<std::string>& selectedIds)
 {
     extendedConfigRequest(ExtendedCommandConfigurator::Mode_Revert, selectedIds);
 }
diff --git a/apps/opencs/view/world/tablebottombox.hpp b/apps/opencs/view/world/tablebottombox.hpp
index ac5ad2fda6..c8b11b0edf 100644
--- a/apps/opencs/view/world/tablebottombox.hpp
+++ b/apps/opencs/view/world/tablebottombox.hpp
@@ -22,93 +22,92 @@ namespace CSVWorld
 
     class TableBottomBox : public QWidget
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            enum EditMode { EditMode_None, EditMode_Creation, EditMode_ExtendedConfig };
+        enum EditMode
+        {
+            EditMode_None,
+            EditMode_Creation,
+            EditMode_ExtendedConfig
+        };
 
-            bool mShowStatusBar;
-            QLabel *mStatus;
-            QStatusBar *mStatusBar;
-            int mStatusCount[4];
+        bool mShowStatusBar;
+        QLabel* mStatus;
+        QStatusBar* mStatusBar;
+        int mStatusCount[4];
 
-            EditMode mEditMode;
-            Creator *mCreator;
-            ExtendedCommandConfigurator *mExtendedConfigurator;
+        EditMode mEditMode;
+        Creator* mCreator;
+        ExtendedCommandConfigurator* mExtendedConfigurator;
 
-            QStackedLayout *mLayout;
-            bool mHasPosition;
-            int mRow;
-            int mColumn;
-            QString mStatusMessage;
+        QStackedLayout* mLayout;
+        bool mHasPosition;
+        int mRow;
+        int mColumn;
+        QString mStatusMessage;
 
-        private:
+    private:
+        // not implemented
+        TableBottomBox(const TableBottomBox&);
+        TableBottomBox& operator=(const TableBottomBox&);
 
-            // not implemented
-            TableBottomBox (const TableBottomBox&);
-            TableBottomBox& operator= (const TableBottomBox&);
+        void updateSize();
 
-            void updateSize();
+        void updateStatus();
 
-            void updateStatus();
+        void extendedConfigRequest(ExtendedCommandConfigurator::Mode mode, const std::vector<std::string>& selectedIds);
 
-            void extendedConfigRequest(ExtendedCommandConfigurator::Mode mode,
-                                       const std::vector<std::string> &selectedIds);
+    public:
+        TableBottomBox(const CreatorFactoryBase& creatorFactory, CSMDoc::Document& document,
+            const CSMWorld::UniversalId& id, QWidget* parent = nullptr);
 
-        public:
+        ~TableBottomBox() override;
 
-            TableBottomBox (const CreatorFactoryBase& creatorFactory,
-                            CSMDoc::Document& document,
-                            const CSMWorld::UniversalId& id,
-                            QWidget *parent = nullptr);
+        bool eventFilter(QObject* object, QEvent* event) override;
 
-            ~TableBottomBox() override;
+        void setEditLock(bool locked);
 
-            bool eventFilter(QObject *object, QEvent *event) override;
+        void setStatusBar(bool show);
 
-            void setEditLock (bool locked);
+        bool canCreateAndDelete() const;
+        ///< Is record creation and deletion supported?
+        ///
+        /// \note The BotomBox does not partake in the deletion of records.
 
-            void setStatusBar (bool show);
+        void setStatusMessage(const QString& message);
 
-            bool canCreateAndDelete() const;
-            ///< Is record creation and deletion supported?
-            ///
-            /// \note The BotomBox does not partake in the deletion of records.
+    signals:
 
-            void setStatusMessage (const QString& message);
+        void requestFocus(const std::string& id);
+        ///< Request owner of this box to focus the just created \a id. The owner may
+        /// ignore this request.
 
-        signals:
+    private slots:
 
-            void requestFocus (const std::string& id);
-            ///< Request owner of this box to focus the just created \a id. The owner may
-            /// ignore this request.
+        void requestDone();
+        ///< \note This slot being called does not imply success.
 
-        private slots:
+        void currentWidgetChanged(int index);
 
-            void requestDone();
-            ///< \note This slot being called does not imply success.
+    public slots:
 
-            void currentWidgetChanged(int index);
+        void selectionSizeChanged(int size);
 
-        public slots:
+        void tableSizeChanged(int size, int deleted, int modified);
+        ///< \param size Number of not deleted records
+        /// \param deleted Number of deleted records
+        /// \param modified Number of added and modified records
 
-            void selectionSizeChanged (int size);
+        void positionChanged(int row, int column);
 
-            void tableSizeChanged (int size, int deleted, int modified);
-            ///< \param size Number of not deleted records
-            /// \param deleted Number of deleted records
-            /// \param modified Number of added and modified records
+        void noMorePosition();
 
-            void positionChanged (int row, int column);
+        void createRequest();
+        void cloneRequest(const std::string& id, const CSMWorld::UniversalId::Type type);
+        void touchRequest(const std::vector<CSMWorld::UniversalId>&);
 
-            void noMorePosition();
-
-            void createRequest();
-            void cloneRequest(const std::string& id,
-                              const CSMWorld::UniversalId::Type type);
-            void touchRequest(const std::vector<CSMWorld::UniversalId>&);
-
-            void extendedDeleteConfigRequest(const std::vector<std::string> &selectedIds);
-            void extendedRevertConfigRequest(const std::vector<std::string> &selectedIds);
+        void extendedDeleteConfigRequest(const std::vector<std::string>& selectedIds);
+        void extendedRevertConfigRequest(const std::vector<std::string>& selectedIds);
     };
 }
 
diff --git a/apps/opencs/view/world/tableeditidaction.cpp b/apps/opencs/view/world/tableeditidaction.cpp
index 4dfc537cc8..427734b2f5 100644
--- a/apps/opencs/view/world/tableeditidaction.cpp
+++ b/apps/opencs/view/world/tableeditidaction.cpp
@@ -16,11 +16,12 @@ CSVWorld::TableEditIdAction::CellData CSVWorld::TableEditIdAction::getCellData(i
     return std::make_pair(CSMWorld::ColumnBase::Display_None, "");
 }
 
-CSVWorld::TableEditIdAction::TableEditIdAction(const QTableView &table, QWidget *parent)
-    : QAction(parent),
-      mTable(table),
-      mCurrentId(CSMWorld::UniversalId::Type_None)
-{}
+CSVWorld::TableEditIdAction::TableEditIdAction(const QTableView& table, QWidget* parent)
+    : QAction(parent)
+    , mTable(table)
+    , mCurrentId(CSMWorld::UniversalId::Type_None)
+{
+}
 
 void CSVWorld::TableEditIdAction::setCell(int row, int column)
 {
@@ -43,7 +44,6 @@ bool CSVWorld::TableEditIdAction::isValidIdCell(int row, int column) const
 {
     CellData data = getCellData(row, column);
     CSMWorld::UniversalId::Type idType = CSMWorld::TableMimeData::convertEnums(data.first);
-    return CSMWorld::ColumnBase::isId(data.first) && 
-           idType != CSMWorld::UniversalId::Type_None &&
-           !data.second.isEmpty();
+    return CSMWorld::ColumnBase::isId(data.first) && idType != CSMWorld::UniversalId::Type_None
+        && !data.second.isEmpty();
 }
diff --git a/apps/opencs/view/world/tableeditidaction.hpp b/apps/opencs/view/world/tableeditidaction.hpp
index 9fe41b0de2..ca1d2a794c 100644
--- a/apps/opencs/view/world/tableeditidaction.hpp
+++ b/apps/opencs/view/world/tableeditidaction.hpp
@@ -12,19 +12,19 @@ namespace CSVWorld
 {
     class TableEditIdAction : public QAction
     {
-            const QTableView &mTable;
-            CSMWorld::UniversalId mCurrentId;
+        const QTableView& mTable;
+        CSMWorld::UniversalId mCurrentId;
 
-            typedef std::pair<CSMWorld::ColumnBase::Display, QString> CellData;
-            CellData getCellData(int row, int column) const;
+        typedef std::pair<CSMWorld::ColumnBase::Display, QString> CellData;
+        CellData getCellData(int row, int column) const;
 
-        public:
-            TableEditIdAction(const QTableView &table, QWidget *parent = nullptr);
+    public:
+        TableEditIdAction(const QTableView& table, QWidget* parent = nullptr);
 
-            void setCell(int row, int column);
+        void setCell(int row, int column);
 
-            CSMWorld::UniversalId getCurrentId() const;
-            bool isValidIdCell(int row, int column) const;
+        CSMWorld::UniversalId getCurrentId() const;
+        bool isValidIdCell(int row, int column) const;
     };
 }
 
diff --git a/apps/opencs/view/world/tableheadermouseeventhandler.cpp b/apps/opencs/view/world/tableheadermouseeventhandler.cpp
index 9c76cfaffe..5f786f77a6 100644
--- a/apps/opencs/view/world/tableheadermouseeventhandler.cpp
+++ b/apps/opencs/view/world/tableheadermouseeventhandler.cpp
@@ -2,64 +2,64 @@
 #include "dragrecordtable.hpp"
 
 #include <QMenu>
-#include <QPoint>
 #include <QMouseEvent>
+#include <QPoint>
 
 namespace CSVWorld
 {
 
-TableHeaderMouseEventHandler::TableHeaderMouseEventHandler(DragRecordTable * parent)
-    : QWidget(parent)
-    , table(*parent)
-    , header(*table.horizontalHeader())
-{
-    header.setContextMenuPolicy(Qt::ContextMenuPolicy::CustomContextMenu);
-    connect(
-        &header, &QHeaderView::customContextMenuRequested, [this](const QPoint & position) { showContextMenu(position); });
+    TableHeaderMouseEventHandler::TableHeaderMouseEventHandler(DragRecordTable* parent)
+        : QWidget(parent)
+        , table(*parent)
+        , header(*table.horizontalHeader())
+    {
+        header.setContextMenuPolicy(Qt::ContextMenuPolicy::CustomContextMenu);
+        connect(&header, &QHeaderView::customContextMenuRequested,
+            [this](const QPoint& position) { showContextMenu(position); });
 
-    header.viewport()->installEventFilter(this);
-}
+        header.viewport()->installEventFilter(this);
+    }
 
-bool TableHeaderMouseEventHandler::eventFilter(QObject * tableWatched, QEvent * event)
-{
-    if (event->type() == QEvent::Type::MouseButtonPress)
+    bool TableHeaderMouseEventHandler::eventFilter(QObject* tableWatched, QEvent* event)
     {
-        auto & clickEvent = static_cast<QMouseEvent &>(*event);
-        if ((clickEvent.button() == Qt::MiddleButton))
+        if (event->type() == QEvent::Type::MouseButtonPress)
         {
-            const auto & index = table.indexAt(clickEvent.pos());
-            table.setColumnHidden(index.column(), true);
-            clickEvent.accept();
-            return true;
+            auto& clickEvent = static_cast<QMouseEvent&>(*event);
+            if ((clickEvent.button() == Qt::MiddleButton))
+            {
+                const auto& index = table.indexAt(clickEvent.pos());
+                table.setColumnHidden(index.column(), true);
+                clickEvent.accept();
+                return true;
+            }
         }
+        return false;
     }
-    return false;
-}
 
-void TableHeaderMouseEventHandler::showContextMenu(const QPoint & position)
-{
-    auto & menu{createContextMenu()};
-    menu.popup(header.viewport()->mapToGlobal(position));
-}
+    void TableHeaderMouseEventHandler::showContextMenu(const QPoint& position)
+    {
+        auto& menu{ createContextMenu() };
+        menu.popup(header.viewport()->mapToGlobal(position));
+    }
 
-QMenu & TableHeaderMouseEventHandler::createContextMenu()
-{
-    auto * menu = new QMenu(this);
-    for (int i = 0; i < table.model()->columnCount(); ++i)
+    QMenu& TableHeaderMouseEventHandler::createContextMenu()
     {
-        const auto & name = table.model()->headerData(i, Qt::Horizontal, Qt::DisplayRole);
-        QAction * action{new QAction(name.toString(), this)};
-        action->setCheckable(true);
-        action->setChecked(!table.isColumnHidden(i));
-        menu->addAction(action);
+        auto* menu = new QMenu(this);
+        for (int i = 0; i < table.model()->columnCount(); ++i)
+        {
+            const auto& name = table.model()->headerData(i, Qt::Horizontal, Qt::DisplayRole);
+            QAction* action{ new QAction(name.toString(), this) };
+            action->setCheckable(true);
+            action->setChecked(!table.isColumnHidden(i));
+            menu->addAction(action);
 
-        connect(action, &QAction::triggered, [this, &action, &i]() {
-            table.setColumnHidden(i, !action->isChecked());
-            action->setChecked(!action->isChecked());
-            action->toggle();
-        });
+            connect(action, &QAction::triggered, [this, &action, &i]() {
+                table.setColumnHidden(i, !action->isChecked());
+                action->setChecked(!action->isChecked());
+                action->toggle();
+            });
+        }
+        return *menu;
     }
-    return *menu;
-}
 
 } // namespace CSVWorld
diff --git a/apps/opencs/view/world/tableheadermouseeventhandler.hpp b/apps/opencs/view/world/tableheadermouseeventhandler.hpp
index 381e127624..737e4d5367 100644
--- a/apps/opencs/view/world/tableheadermouseeventhandler.hpp
+++ b/apps/opencs/view/world/tableheadermouseeventhandler.hpp
@@ -1,25 +1,25 @@
 #pragma once
 
-#include <QHeaderView>
 #include <QEvent>
+#include <QHeaderView>
 
 namespace CSVWorld
 {
-class DragRecordTable;
+    class DragRecordTable;
 
-class TableHeaderMouseEventHandler : public QWidget
-{
-public:
-    explicit TableHeaderMouseEventHandler(DragRecordTable * parent);
+    class TableHeaderMouseEventHandler : public QWidget
+    {
+    public:
+        explicit TableHeaderMouseEventHandler(DragRecordTable* parent);
 
-    void showContextMenu(const QPoint &);
+        void showContextMenu(const QPoint&);
 
-private:
-    DragRecordTable & table;
-    QHeaderView & header;
+    private:
+        DragRecordTable& table;
+        QHeaderView& header;
 
-    QMenu & createContextMenu();
-    bool eventFilter(QObject *, QEvent *) override;
+        QMenu& createContextMenu();
+        bool eventFilter(QObject*, QEvent*) override;
 
-}; // class TableHeaderMouseEventHandler
+    }; // class TableHeaderMouseEventHandler
 } // namespace CSVWorld
diff --git a/apps/opencs/view/world/tablesubview.cpp b/apps/opencs/view/world/tablesubview.cpp
index bd29b3e634..0fafd0c29c 100644
--- a/apps/opencs/view/world/tablesubview.cpp
+++ b/apps/opencs/view/world/tablesubview.cpp
@@ -1,87 +1,88 @@
 #include "tablesubview.hpp"
 
-#include <QHBoxLayout>
-#include <QPushButton>
-#include <QCheckBox>
-#include <QVBoxLayout>
-#include <QEvent>
-#include <QHeaderView>
 #include <QApplication>
+#include <QCheckBox>
 #include <QDesktopWidget>
 #include <QDropEvent>
+#include <QEvent>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QPushButton>
+#include <QVBoxLayout>
 
 #include "../../model/doc/document.hpp"
 #include "../../model/world/tablemimedata.hpp"
 
 #include "../doc/sizehint.hpp"
 #include "../filter/filterbox.hpp"
+#include "creator.hpp"
 #include "table.hpp"
 #include "tablebottombox.hpp"
-#include "creator.hpp"
 
-CSVWorld::TableSubView::TableSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document,
-    const CreatorFactoryBase& creatorFactory, bool sorting)
-: SubView (id), mShowOptions(false), mOptions(0)
+CSVWorld::TableSubView::TableSubView(
+    const CSMWorld::UniversalId& id, CSMDoc::Document& document, const CreatorFactoryBase& creatorFactory, bool sorting)
+    : SubView(id)
+    , mShowOptions(false)
+    , mOptions(0)
 {
-    QVBoxLayout *layout = new QVBoxLayout;
+    QVBoxLayout* layout = new QVBoxLayout;
 
-    layout->addWidget (mBottom =
-        new TableBottomBox (creatorFactory, document, id, this), 0);
+    layout->addWidget(mBottom = new TableBottomBox(creatorFactory, document, id, this), 0);
 
-    layout->insertWidget (0, mTable =
-        new Table (id, mBottom->canCreateAndDelete(), sorting, document), 2);
+    layout->insertWidget(0, mTable = new Table(id, mBottom->canCreateAndDelete(), sorting, document), 2);
 
-    mFilterBox = new CSVFilter::FilterBox (document.getData(), this);
+    mFilterBox = new CSVFilter::FilterBox(document.getData(), this);
 
-    QHBoxLayout *hLayout = new QHBoxLayout;
-    hLayout->insertWidget(0,mFilterBox);
+    QHBoxLayout* hLayout = new QHBoxLayout;
+    hLayout->insertWidget(0, mFilterBox);
 
     mOptions = new QWidget;
 
-    QHBoxLayout *optHLayout = new QHBoxLayout;
-    QCheckBox *autoJump = new QCheckBox("Auto Jump");
-    autoJump->setToolTip ("Whether to jump to the modified record."
-                "\nCan be useful in finding the moved or modified"
-                "\nobject instance while 3D editing.");
+    QHBoxLayout* optHLayout = new QHBoxLayout;
+    QCheckBox* autoJump = new QCheckBox("Auto Jump");
+    autoJump->setToolTip(
+        "Whether to jump to the modified record."
+        "\nCan be useful in finding the moved or modified"
+        "\nobject instance while 3D editing.");
     autoJump->setCheckState(Qt::Unchecked);
     connect(autoJump, &QCheckBox::stateChanged, mTable, &Table::jumpAfterModChanged);
     optHLayout->insertWidget(0, autoJump);
-    optHLayout->setContentsMargins (QMargins (0, 3, 0, 0));
+    optHLayout->setContentsMargins(QMargins(0, 3, 0, 0));
     mOptions->setLayout(optHLayout);
     mOptions->resize(mOptions->width(), mFilterBox->height());
     mOptions->hide();
 
-    QPushButton *opt = new QPushButton ();
-    opt->setIcon (QIcon (":startup/configure"));
-    opt->setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed));
-    opt->setToolTip ("Open additional options for this subview.");
-    connect (opt, &QPushButton::clicked, this, &TableSubView::toggleOptions);
+    QPushButton* opt = new QPushButton();
+    opt->setIcon(QIcon(":startup/configure"));
+    opt->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+    opt->setToolTip("Open additional options for this subview.");
+    connect(opt, &QPushButton::clicked, this, &TableSubView::toggleOptions);
 
-    QVBoxLayout *buttonLayout = new QVBoxLayout; // work around margin issues
-    buttonLayout->setContentsMargins (QMargins (0/*left*/, 3/*top*/, 3/*right*/, 0/*bottom*/));
-    buttonLayout->insertWidget(0, opt, 0, Qt::AlignVCenter|Qt::AlignRight);
+    QVBoxLayout* buttonLayout = new QVBoxLayout; // work around margin issues
+    buttonLayout->setContentsMargins(QMargins(0 /*left*/, 3 /*top*/, 3 /*right*/, 0 /*bottom*/));
+    buttonLayout->insertWidget(0, opt, 0, Qt::AlignVCenter | Qt::AlignRight);
     hLayout->insertWidget(1, mOptions);
     hLayout->insertLayout(2, buttonLayout);
 
-    layout->insertLayout (0, hLayout);
+    layout->insertLayout(0, hLayout);
 
-    CSVDoc::SizeHintWidget *widget = new CSVDoc::SizeHintWidget;
+    CSVDoc::SizeHintWidget* widget = new CSVDoc::SizeHintWidget;
 
-    widget->setLayout (layout);
+    widget->setLayout(layout);
 
-    setWidget (widget);
+    setWidget(widget);
     // prefer height of the screen and full width of the table
     const QRect rect = QApplication::desktop()->screenGeometry(this);
     int frameHeight = 40; // set a reasonable default
-    QWidget *topLevel = QApplication::topLevelAt(pos());
+    QWidget* topLevel = QApplication::topLevelAt(pos());
     if (topLevel)
         frameHeight = topLevel->frameGeometry().height() - topLevel->height();
-    widget->setSizeHint(QSize(mTable->horizontalHeader()->length(), rect.height()-frameHeight));
+    widget->setSizeHint(QSize(mTable->horizontalHeader()->length(), rect.height() - frameHeight));
 
-    connect (mTable, &Table::editRequest, this, &TableSubView::editRequest);
+    connect(mTable, &Table::editRequest, this, &TableSubView::editRequest);
 
-    connect (mTable, &Table::selectionSizeChanged, mBottom, &TableBottomBox::selectionSizeChanged);
-    connect (mTable, &Table::tableSizeChanged, mBottom, &TableBottomBox::tableSizeChanged);
+    connect(mTable, &Table::selectionSizeChanged, mBottom, &TableBottomBox::selectionSizeChanged);
+    connect(mTable, &Table::tableSizeChanged, mBottom, &TableBottomBox::tableSizeChanged);
 
     mTable->tableSizeUpdate();
     mTable->selectionSizeUpdate();
@@ -91,58 +92,51 @@ CSVWorld::TableSubView::TableSubView (const CSMWorld::UniversalId& id, CSMDoc::D
 
     if (mBottom->canCreateAndDelete())
     {
-        connect (mTable, &Table::createRequest, mBottom, &TableBottomBox::createRequest);
+        connect(mTable, &Table::createRequest, mBottom, &TableBottomBox::createRequest);
 
-        connect (mTable, &Table::cloneRequest, 
-            this, qOverload<const CSMWorld::UniversalId&>(&TableSubView::cloneRequest));
+        connect(
+            mTable, &Table::cloneRequest, this, qOverload<const CSMWorld::UniversalId&>(&TableSubView::cloneRequest));
 
-        connect (this, 
-            qOverload<const std::string&,const CSMWorld::UniversalId::Type>(&TableSubView::cloneRequest), 
+        connect(this, qOverload<const std::string&, const CSMWorld::UniversalId::Type>(&TableSubView::cloneRequest),
             mBottom, &TableBottomBox::cloneRequest);
 
-        connect (mTable, &Table::touchRequest,
-            mBottom, &TableBottomBox::touchRequest);
+        connect(mTable, &Table::touchRequest, mBottom, &TableBottomBox::touchRequest);
 
-        connect (mTable, &Table::extendedDeleteConfigRequest,
-            mBottom, &TableBottomBox::extendedDeleteConfigRequest);
-        connect (mTable, &Table::extendedRevertConfigRequest,
-            mBottom, &TableBottomBox::extendedRevertConfigRequest);
+        connect(mTable, &Table::extendedDeleteConfigRequest, mBottom, &TableBottomBox::extendedDeleteConfigRequest);
+        connect(mTable, &Table::extendedRevertConfigRequest, mBottom, &TableBottomBox::extendedRevertConfigRequest);
     }
-    connect (mBottom, &TableBottomBox::requestFocus, mTable, &Table::requestFocus);
-
-    connect (mFilterBox, &CSVFilter::FilterBox::recordFilterChanged,
-        mTable, &Table::recordFilterChanged);
+    connect(mBottom, &TableBottomBox::requestFocus, mTable, &Table::requestFocus);
 
-    connect(mFilterBox, &CSVFilter::FilterBox::recordDropped,
-        this, &TableSubView::createFilterRequest);
+    connect(mFilterBox, &CSVFilter::FilterBox::recordFilterChanged, mTable, &Table::recordFilterChanged);
 
+    connect(mFilterBox, &CSVFilter::FilterBox::recordDropped, this, &TableSubView::createFilterRequest);
 
-    connect (mTable, &Table::closeRequest, this, qOverload<>(&TableSubView::closeRequest));
+    connect(mTable, &Table::closeRequest, this, qOverload<>(&TableSubView::closeRequest));
 }
 
-void CSVWorld::TableSubView::setEditLock (bool locked)
+void CSVWorld::TableSubView::setEditLock(bool locked)
 {
-    mTable->setEditLock (locked);
-    mBottom->setEditLock (locked);
+    mTable->setEditLock(locked);
+    mBottom->setEditLock(locked);
 }
 
-void CSVWorld::TableSubView::editRequest (const CSMWorld::UniversalId& id, const std::string& hint)
+void CSVWorld::TableSubView::editRequest(const CSMWorld::UniversalId& id, const std::string& hint)
 {
-    focusId (id, hint);
+    focusId(id, hint);
 }
 
-void CSVWorld::TableSubView::setStatusBar (bool show)
+void CSVWorld::TableSubView::setStatusBar(bool show)
 {
-    mBottom->setStatusBar (show);
+    mBottom->setStatusBar(show);
 }
 
-void CSVWorld::TableSubView::useHint (const std::string& hint)
+void CSVWorld::TableSubView::useHint(const std::string& hint)
 {
     if (hint.empty())
         return;
 
-    if (hint[0]=='f' && hint.size()>=2)
-        mFilterBox->setRecordFilter (hint.substr (2));
+    if (hint[0] == 'f' && hint.size() >= 2)
+        mFilterBox->setRecordFilter(hint.substr(2));
 }
 
 void CSVWorld::TableSubView::cloneRequest(const CSMWorld::UniversalId& toClone)
@@ -150,23 +144,24 @@ void CSVWorld::TableSubView::cloneRequest(const CSMWorld::UniversalId& toClone)
     emit cloneRequest(toClone.getId(), toClone.getType());
 }
 
-void CSVWorld::TableSubView::createFilterRequest (std::vector< CSMWorld::UniversalId>& types, Qt::DropAction action)
+void CSVWorld::TableSubView::createFilterRequest(std::vector<CSMWorld::UniversalId>& types, Qt::DropAction action)
 {
-    std::vector<std::pair<std::string, std::vector<std::string> > > filterSource;
+    std::vector<std::pair<std::string, std::vector<std::string>>> filterSource;
 
-    std::vector<std::string> refIdColumns = mTable->getColumnsWithDisplay(CSMWorld::TableMimeData::convertEnums(CSMWorld::UniversalId::Type_Referenceable));
+    std::vector<std::string> refIdColumns = mTable->getColumnsWithDisplay(
+        CSMWorld::TableMimeData::convertEnums(CSMWorld::UniversalId::Type_Referenceable));
     bool hasRefIdDisplay = !refIdColumns.empty();
 
     for (std::vector<CSMWorld::UniversalId>::iterator it(types.begin()); it != types.end(); ++it)
     {
         CSMWorld::UniversalId::Type type = it->getType();
         std::vector<std::string> col = mTable->getColumnsWithDisplay(CSMWorld::TableMimeData::convertEnums(type));
-        if(!col.empty())
+        if (!col.empty())
         {
             filterSource.emplace_back(it->getId(), col);
         }
 
-        if(hasRefIdDisplay && CSMWorld::TableMimeData::isReferencable(type))
+        if (hasRefIdDisplay && CSMWorld::TableMimeData::isReferencable(type))
         {
             filterSource.emplace_back(it->getId(), refIdColumns);
         }
@@ -175,13 +170,14 @@ void CSVWorld::TableSubView::createFilterRequest (std::vector< CSMWorld::Univers
     mFilterBox->createFilterRequest(filterSource, action);
 }
 
-bool CSVWorld::TableSubView::eventFilter (QObject* object, QEvent* event)
+bool CSVWorld::TableSubView::eventFilter(QObject* object, QEvent* event)
 {
     if (event->type() == QEvent::Drop)
     {
         if (QDropEvent* drop = dynamic_cast<QDropEvent*>(event))
         {
-            const CSMWorld::TableMimeData* tableMimeData = dynamic_cast<const CSMWorld::TableMimeData*>(drop->mimeData());
+            const CSMWorld::TableMimeData* tableMimeData
+                = dynamic_cast<const CSMWorld::TableMimeData*>(drop->mimeData());
             if (!tableMimeData) // May happen when non-records (e.g. plain text) are dragged and dropped
                 return false;
 
@@ -210,7 +206,7 @@ void CSVWorld::TableSubView::toggleOptions()
     }
 }
 
-void CSVWorld::TableSubView::requestFocus (const std::string& id)
+void CSVWorld::TableSubView::requestFocus(const std::string& id)
 {
     mTable->requestFocus(id);
 }
diff --git a/apps/opencs/view/world/tablesubview.hpp b/apps/opencs/view/world/tablesubview.hpp
index 97d2bf15f2..3f7188f2ac 100644
--- a/apps/opencs/view/world/tablesubview.hpp
+++ b/apps/opencs/view/world/tablesubview.hpp
@@ -29,43 +29,40 @@ namespace CSVWorld
 
     class TableSubView : public CSVDoc::SubView
     {
-            Q_OBJECT
+        Q_OBJECT
 
-            Table *mTable;
-            TableBottomBox *mBottom;
-            CSVFilter::FilterBox *mFilterBox;
-            bool mShowOptions;
-            QWidget *mOptions;
+        Table* mTable;
+        TableBottomBox* mBottom;
+        CSVFilter::FilterBox* mFilterBox;
+        bool mShowOptions;
+        QWidget* mOptions;
 
-        public:
+    public:
+        TableSubView(const CSMWorld::UniversalId& id, CSMDoc::Document& document,
+            const CreatorFactoryBase& creatorFactory, bool sorting);
 
-            TableSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document,
-                const CreatorFactoryBase& creatorFactory, bool sorting);
+        void setEditLock(bool locked) override;
 
-            void setEditLock (bool locked) override;
+        void setStatusBar(bool show) override;
 
-            void setStatusBar (bool show) override;
+        void useHint(const std::string& hint) override;
 
-            void useHint (const std::string& hint) override;
+    protected:
+        bool eventFilter(QObject* object, QEvent* event) override;
 
-        protected:
-            bool eventFilter(QObject* object, QEvent *event) override;
+    signals:
+        void cloneRequest(const std::string&, const CSMWorld::UniversalId::Type);
 
-        signals:
-            void cloneRequest(const std::string&,
-                              const CSMWorld::UniversalId::Type);
+    private slots:
 
-        private slots:
+        void editRequest(const CSMWorld::UniversalId& id, const std::string& hint);
+        void cloneRequest(const CSMWorld::UniversalId& toClone);
+        void createFilterRequest(std::vector<CSMWorld::UniversalId>& types, Qt::DropAction action);
+        void toggleOptions();
 
-            void editRequest (const CSMWorld::UniversalId& id, const std::string& hint);
-            void cloneRequest (const CSMWorld::UniversalId& toClone);
-            void createFilterRequest(std::vector< CSMWorld::UniversalId >& types,
-                                     Qt::DropAction action);
-            void toggleOptions ();
+    public slots:
 
-        public slots:
-
-            void requestFocus (const std::string& id);
+        void requestFocus(const std::string& id);
     };
 }
 
diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
index 14033f20fb..36d22a8fa0 100644
--- a/apps/opencs/view/world/util.cpp
+++ b/apps/opencs/view/world/util.cpp
@@ -3,16 +3,16 @@
 #include <limits>
 #include <stdexcept>
 
-#include <QUndoStack>
-#include <QStyledItemDelegate>
-#include <QLineEdit>
 #include <QCheckBox>
-#include <QPlainTextEdit>
 #include <QItemEditorFactory>
+#include <QLineEdit>
+#include <QPlainTextEdit>
+#include <QStyledItemDelegate>
+#include <QUndoStack>
 
+#include "../../model/world/commanddispatcher.hpp"
 #include "../../model/world/commands.hpp"
 #include "../../model/world/tablemimedata.hpp"
-#include "../../model/world/commanddispatcher.hpp"
 
 #include "../widget/coloreditor.hpp"
 #include "../widget/droplineedit.hpp"
@@ -20,26 +20,27 @@
 #include "dialoguespinbox.hpp"
 #include "scriptedit.hpp"
 
-CSVWorld::NastyTableModelHack::NastyTableModelHack (QAbstractItemModel& model)
-: mModel (model)
-{}
+CSVWorld::NastyTableModelHack::NastyTableModelHack(QAbstractItemModel& model)
+    : mModel(model)
+{
+}
 
-int CSVWorld::NastyTableModelHack::rowCount (const QModelIndex & parent) const
+int CSVWorld::NastyTableModelHack::rowCount(const QModelIndex& parent) const
 {
-    return mModel.rowCount (parent);
+    return mModel.rowCount(parent);
 }
 
-int CSVWorld::NastyTableModelHack::columnCount (const QModelIndex & parent) const
+int CSVWorld::NastyTableModelHack::columnCount(const QModelIndex& parent) const
 {
-    return mModel.columnCount (parent);
+    return mModel.columnCount(parent);
 }
 
-QVariant CSVWorld::NastyTableModelHack::data  (const QModelIndex & index, int role) const
+QVariant CSVWorld::NastyTableModelHack::data(const QModelIndex& index, int role) const
 {
-    return mModel.data (index, role);
+    return mModel.data(index, role);
 }
 
-bool CSVWorld::NastyTableModelHack::setData ( const QModelIndex &index, const QVariant &value, int role)
+bool CSVWorld::NastyTableModelHack::setData(const QModelIndex& index, const QVariant& value, int role)
 {
     mData = value;
     return true;
@@ -50,16 +51,14 @@ QVariant CSVWorld::NastyTableModelHack::getData() const
     return mData;
 }
 
-
 CSVWorld::CommandDelegateFactory::~CommandDelegateFactory() {}
 
-
-CSVWorld::CommandDelegateFactoryCollection *CSVWorld::CommandDelegateFactoryCollection::sThis = nullptr;
+CSVWorld::CommandDelegateFactoryCollection* CSVWorld::CommandDelegateFactoryCollection::sThis = nullptr;
 
 CSVWorld::CommandDelegateFactoryCollection::CommandDelegateFactoryCollection()
 {
     if (sThis)
-        throw std::logic_error ("multiple instances of CSVWorld::CommandDelegateFactoryCollection");
+        throw std::logic_error("multiple instances of CSVWorld::CommandDelegateFactoryCollection");
 
     sThis = this;
 }
@@ -68,39 +67,37 @@ CSVWorld::CommandDelegateFactoryCollection::~CommandDelegateFactoryCollection()
 {
     sThis = nullptr;
 
-    for (std::map<CSMWorld::ColumnBase::Display, CommandDelegateFactory *>::iterator iter (
-        mFactories.begin());
-        iter!=mFactories.end(); ++iter)
-         delete iter->second;
+    for (std::map<CSMWorld::ColumnBase::Display, CommandDelegateFactory*>::iterator iter(mFactories.begin());
+         iter != mFactories.end(); ++iter)
+        delete iter->second;
 }
 
-void CSVWorld::CommandDelegateFactoryCollection::add (CSMWorld::ColumnBase::Display display,
-    CommandDelegateFactory *factory)
+void CSVWorld::CommandDelegateFactoryCollection::add(
+    CSMWorld::ColumnBase::Display display, CommandDelegateFactory* factory)
 {
-    mFactories.insert (std::make_pair (display, factory));
+    mFactories.insert(std::make_pair(display, factory));
 }
 
-CSVWorld::CommandDelegate *CSVWorld::CommandDelegateFactoryCollection::makeDelegate (
-    CSMWorld::ColumnBase::Display display, CSMWorld::CommandDispatcher *dispatcher, CSMDoc::Document& document, QObject *parent) const
+CSVWorld::CommandDelegate* CSVWorld::CommandDelegateFactoryCollection::makeDelegate(
+    CSMWorld::ColumnBase::Display display, CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document,
+    QObject* parent) const
 {
-    std::map<CSMWorld::ColumnBase::Display, CommandDelegateFactory *>::const_iterator iter =
-        mFactories.find (display);
+    std::map<CSMWorld::ColumnBase::Display, CommandDelegateFactory*>::const_iterator iter = mFactories.find(display);
 
-    if (iter!=mFactories.end())
-        return iter->second->makeDelegate (dispatcher, document, parent);
+    if (iter != mFactories.end())
+        return iter->second->makeDelegate(dispatcher, document, parent);
 
-    return new CommandDelegate (dispatcher, document, parent);
+    return new CommandDelegate(dispatcher, document, parent);
 }
 
 const CSVWorld::CommandDelegateFactoryCollection& CSVWorld::CommandDelegateFactoryCollection::get()
 {
     if (!sThis)
-        throw std::logic_error ("no instance of CSVWorld::CommandDelegateFactoryCollection");
+        throw std::logic_error("no instance of CSVWorld::CommandDelegateFactoryCollection");
 
     return *sThis;
 }
 
-
 QUndoStack& CSVWorld::CommandDelegate::getUndoStack() const
 {
     return mDocument.getUndoStack();
@@ -111,14 +108,14 @@ CSMDoc::Document& CSVWorld::CommandDelegate::getDocument() const
     return mDocument;
 }
 
-CSMWorld::ColumnBase::Display CSVWorld::CommandDelegate::getDisplayTypeFromIndex(const QModelIndex &index) const
+CSMWorld::ColumnBase::Display CSVWorld::CommandDelegate::getDisplayTypeFromIndex(const QModelIndex& index) const
 {
     int rawDisplay = index.data(CSMWorld::ColumnBase::Role_Display).toInt();
     return static_cast<CSMWorld::ColumnBase::Display>(rawDisplay);
 }
 
-void CSVWorld::CommandDelegate::setModelDataImp (QWidget *editor, QAbstractItemModel *model,
-    const QModelIndex& index) const
+void CSVWorld::CommandDelegate::setModelDataImp(
+    QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const
 {
     if (!mCommandDispatcher)
         return;
@@ -126,41 +123,43 @@ void CSVWorld::CommandDelegate::setModelDataImp (QWidget *editor, QAbstractItemM
     QVariant variant;
 
     // Color columns use a custom editor, so we need to fetch selected color from it.
-    CSVWidget::ColorEditor *colorEditor = qobject_cast<CSVWidget::ColorEditor *>(editor);
+    CSVWidget::ColorEditor* colorEditor = qobject_cast<CSVWidget::ColorEditor*>(editor);
     if (colorEditor != nullptr)
     {
         variant = colorEditor->colorInt();
     }
     else
     {
-        NastyTableModelHack hack (*model);
-        QStyledItemDelegate::setModelData (editor, &hack, index);
+        NastyTableModelHack hack(*model);
+        QStyledItemDelegate::setModelData(editor, &hack, index);
         variant = hack.getData();
     }
 
-    if ((model->data (index)!=variant) && (model->flags(index) & Qt::ItemIsEditable))
-        mCommandDispatcher->executeModify (model, index, variant);
+    if ((model->data(index) != variant) && (model->flags(index) & Qt::ItemIsEditable))
+        mCommandDispatcher->executeModify(model, index, variant);
 }
 
-CSVWorld::CommandDelegate::CommandDelegate (CSMWorld::CommandDispatcher *commandDispatcher,
-    CSMDoc::Document& document, QObject *parent)
-: QStyledItemDelegate (parent), mEditLock (false),
-  mCommandDispatcher (commandDispatcher), mDocument (document)
-{}
+CSVWorld::CommandDelegate::CommandDelegate(
+    CSMWorld::CommandDispatcher* commandDispatcher, CSMDoc::Document& document, QObject* parent)
+    : QStyledItemDelegate(parent)
+    , mEditLock(false)
+    , mCommandDispatcher(commandDispatcher)
+    , mDocument(document)
+{
+}
 
-void CSVWorld::CommandDelegate::setModelData (QWidget *editor, QAbstractItemModel *model,
-        const QModelIndex& index) const
+void CSVWorld::CommandDelegate::setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const
 {
     if (!mEditLock)
     {
-        setModelDataImp (editor, model, index);
+        setModelDataImp(editor, model, index);
     }
 
     ///< \todo provide some kind of feedback to the user, indicating that editing is currently not possible.
 }
 
-QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleOptionViewItem& option,
-    const QModelIndex& index) const
+QWidget* CSVWorld::CommandDelegate::createEditor(
+    QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
     CSMWorld::ColumnBase::Display display = getDisplayTypeFromIndex(index);
 
@@ -178,10 +177,10 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
     {
         return new CSVWidget::ColorEditor(index.data().toInt(), parent, true);
     }
-    return createEditor (parent, option, index, display);
+    return createEditor(parent, option, index, display);
 }
 
-QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleOptionViewItem& option,
+QWidget* CSVWorld::CommandDelegate::createEditor(QWidget* parent, const QStyleOptionViewItem& option,
     const QModelIndex& index, CSMWorld::ColumnBase::Display display) const
 {
     QVariant variant = index.data();
@@ -204,34 +203,34 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
         }
         case CSMWorld::ColumnBase::Display_Integer:
         {
-            DialogueSpinBox *sb = new DialogueSpinBox(parent);
+            DialogueSpinBox* sb = new DialogueSpinBox(parent);
             sb->setRange(std::numeric_limits<int>::min(), std::numeric_limits<int>::max());
             return sb;
         }
 
         case CSMWorld::ColumnBase::Display_SignedInteger8:
         {
-            DialogueSpinBox *sb = new DialogueSpinBox(parent);
+            DialogueSpinBox* sb = new DialogueSpinBox(parent);
             sb->setRange(std::numeric_limits<signed char>::min(), std::numeric_limits<signed char>::max());
             return sb;
         }
         case CSMWorld::ColumnBase::Display_SignedInteger16:
         {
-            DialogueSpinBox *sb = new DialogueSpinBox(parent);
+            DialogueSpinBox* sb = new DialogueSpinBox(parent);
             sb->setRange(std::numeric_limits<short>::min(), std::numeric_limits<short>::max());
             return sb;
         }
 
         case CSMWorld::ColumnBase::Display_UnsignedInteger8:
         {
-            DialogueSpinBox *sb = new DialogueSpinBox(parent);
+            DialogueSpinBox* sb = new DialogueSpinBox(parent);
             sb->setRange(0, std::numeric_limits<unsigned char>::max());
             return sb;
         }
 
         case CSMWorld::ColumnBase::Display_UnsignedInteger16:
         {
-            DialogueSpinBox *sb = new DialogueSpinBox(parent);
+            DialogueSpinBox* sb = new DialogueSpinBox(parent);
             sb->setRange(0, std::numeric_limits<unsigned short>::max());
             return sb;
         }
@@ -242,7 +241,7 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
 
         case CSMWorld::ColumnBase::Display_Float:
         {
-            DialogueDoubleSpinBox *dsb = new DialogueDoubleSpinBox(parent);
+            DialogueDoubleSpinBox* dsb = new DialogueDoubleSpinBox(parent);
             dsb->setRange(-std::numeric_limits<float>::max(), std::numeric_limits<float>::max());
             dsb->setSingleStep(0.01f);
             dsb->setDecimals(3);
@@ -251,7 +250,7 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
 
         case CSMWorld::ColumnBase::Display_Double:
         {
-            DialogueDoubleSpinBox *dsb = new DialogueDoubleSpinBox(parent);
+            DialogueDoubleSpinBox* dsb = new DialogueDoubleSpinBox(parent);
             dsb->setRange(-std::numeric_limits<double>::max(), std::numeric_limits<double>::max());
             dsb->setSingleStep(0.01f);
             dsb->setDecimals(6);
@@ -262,8 +261,8 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
         case CSMWorld::ColumnBase::Display_LongString:
         case CSMWorld::ColumnBase::Display_LongString256:
         {
-            QPlainTextEdit *edit = new QPlainTextEdit(parent);
-            edit->setUndoRedoEnabled (false);
+            QPlainTextEdit* edit = new QPlainTextEdit(parent);
+            edit->setUndoRedoEnabled(false);
             return edit;
         }
 
@@ -273,36 +272,36 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
 
         case CSMWorld::ColumnBase::Display_ScriptLines:
 
-            return new ScriptEdit (mDocument, ScriptHighlighter::Mode_Console, parent);
+            return new ScriptEdit(mDocument, ScriptHighlighter::Mode_Console, parent);
 
         case CSMWorld::ColumnBase::Display_String:
-        // For other Display types (that represent record IDs) with drop support IdCompletionDelegate is used
+            // For other Display types (that represent record IDs) with drop support IdCompletionDelegate is used
 
             return new CSVWidget::DropLineEdit(display, parent);
 
         case CSMWorld::ColumnBase::Display_String32:
         {
-        // For other Display types (that represent record IDs) with drop support IdCompletionDelegate is used
-            CSVWidget::DropLineEdit *widget = new CSVWidget::DropLineEdit(display, parent);
-            widget->setMaxLength (32);
+            // For other Display types (that represent record IDs) with drop support IdCompletionDelegate is used
+            CSVWidget::DropLineEdit* widget = new CSVWidget::DropLineEdit(display, parent);
+            widget->setMaxLength(32);
             return widget;
         }
 
         case CSMWorld::ColumnBase::Display_String64:
         {
-        // For other Display types (that represent record IDs) with drop support IdCompletionDelegate is used
-            CSVWidget::DropLineEdit *widget = new CSVWidget::DropLineEdit(display, parent);
-            widget->setMaxLength (64);
+            // For other Display types (that represent record IDs) with drop support IdCompletionDelegate is used
+            CSVWidget::DropLineEdit* widget = new CSVWidget::DropLineEdit(display, parent);
+            widget->setMaxLength(64);
             return widget;
         }
 
         default:
 
-            return QStyledItemDelegate::createEditor (parent, option, index);
+            return QStyledItemDelegate::createEditor(parent, option, index);
     }
 }
 
-void CSVWorld::CommandDelegate::setEditLock (bool locked)
+void CSVWorld::CommandDelegate::setEditLock(bool locked)
 {
     mEditLock = locked;
 }
@@ -312,12 +311,12 @@ bool CSVWorld::CommandDelegate::isEditLocked() const
     return mEditLock;
 }
 
-void CSVWorld::CommandDelegate::setEditorData (QWidget *editor, const QModelIndex& index) const
+void CSVWorld::CommandDelegate::setEditorData(QWidget* editor, const QModelIndex& index) const
 {
-    setEditorData (editor, index, false);
+    setEditorData(editor, index, false);
 }
 
-void CSVWorld::CommandDelegate::setEditorData (QWidget *editor, const QModelIndex& index, bool tryDisplay) const
+void CSVWorld::CommandDelegate::setEditorData(QWidget* editor, const QModelIndex& index, bool tryDisplay) const
 {
     QVariant variant = index.data(Qt::EditRole);
     if (tryDisplay)
@@ -331,7 +330,7 @@ void CSVWorld::CommandDelegate::setEditorData (QWidget *editor, const QModelInde
             }
         }
         QPlainTextEdit* plainTextEdit = qobject_cast<QPlainTextEdit*>(editor);
-        if(plainTextEdit) //for some reason it is easier to brake the loop here
+        if (plainTextEdit) // for some reason it is easier to brake the loop here
         {
             if (plainTextEdit->toPlainText() == variant.toString())
             {
@@ -341,7 +340,7 @@ void CSVWorld::CommandDelegate::setEditorData (QWidget *editor, const QModelInde
     }
 
     // Color columns use a custom editor, so we need explicitly set a data for it
-    CSVWidget::ColorEditor *colorEditor = qobject_cast<CSVWidget::ColorEditor *>(editor);
+    CSVWidget::ColorEditor* colorEditor = qobject_cast<CSVWidget::ColorEditor*>(editor);
     if (colorEditor != nullptr)
     {
         colorEditor->setColor(variant.toInt());
@@ -361,10 +360,9 @@ void CSVWorld::CommandDelegate::setEditorData (QWidget *editor, const QModelInde
     if (!n.isEmpty())
     {
         if (!variant.isValid())
-            variant = QVariant(editor->property(n).userType(), (const void *)nullptr);
+            variant = QVariant(editor->property(n).userType(), (const void*)nullptr);
         editor->setProperty(n, variant);
     }
-
 }
 
-void CSVWorld::CommandDelegate::settingChanged (const CSMPrefs::Setting *setting) {}
+void CSVWorld::CommandDelegate::settingChanged(const CSMPrefs::Setting* setting) {}
diff --git a/apps/opencs/view/world/util.hpp b/apps/opencs/view/world/util.hpp
index 2c4537dac9..50ebfc7311 100644
--- a/apps/opencs/view/world/util.hpp
+++ b/apps/opencs/view/world/util.hpp
@@ -6,10 +6,9 @@
 #include <QAbstractTableModel>
 #include <QStyledItemDelegate>
 
-
 #ifndef Q_MOC_RUN
-#include "../../model/world/columnbase.hpp"
 #include "../../model/doc/document.hpp"
+#include "../../model/world/columnbase.hpp"
 #endif
 
 class QUndoStack;
@@ -33,122 +32,108 @@ namespace CSVWorld
     /// Really, Qt? Really?
     class NastyTableModelHack : public QAbstractTableModel
     {
-            QAbstractItemModel& mModel;
-            QVariant mData;
+        QAbstractItemModel& mModel;
+        QVariant mData;
 
-        public:
+    public:
+        NastyTableModelHack(QAbstractItemModel& model);
 
-            NastyTableModelHack (QAbstractItemModel& model);
+        int rowCount(const QModelIndex& parent = QModelIndex()) const override;
 
-            int rowCount (const QModelIndex & parent = QModelIndex()) const override;
+        int columnCount(const QModelIndex& parent = QModelIndex()) const override;
 
-            int columnCount (const QModelIndex & parent = QModelIndex()) const override;
+        QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
 
-            QVariant data  (const QModelIndex & index, int role = Qt::DisplayRole) const override;
+        bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
 
-            bool setData (const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
-
-            QVariant getData() const;
+        QVariant getData() const;
     };
 
     class CommandDelegate;
 
     class CommandDelegateFactory
     {
-        public:
-
-            virtual ~CommandDelegateFactory();
+    public:
+        virtual ~CommandDelegateFactory();
 
-            virtual CommandDelegate *makeDelegate (CSMWorld::CommandDispatcher *dispatcher,
-                CSMDoc::Document& document, QObject *parent)
-                const = 0;
-            ///< The ownership of the returned CommandDelegate is transferred to the caller.
+        virtual CommandDelegate* makeDelegate(
+            CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent) const = 0;
+        ///< The ownership of the returned CommandDelegate is transferred to the caller.
     };
 
     class CommandDelegateFactoryCollection
     {
-            static CommandDelegateFactoryCollection *sThis;
-            std::map<CSMWorld::ColumnBase::Display, CommandDelegateFactory *> mFactories;
+        static CommandDelegateFactoryCollection* sThis;
+        std::map<CSMWorld::ColumnBase::Display, CommandDelegateFactory*> mFactories;
 
-        private:
+    private:
+        // not implemented
+        CommandDelegateFactoryCollection(const CommandDelegateFactoryCollection&);
+        CommandDelegateFactoryCollection& operator=(const CommandDelegateFactoryCollection&);
 
-            // not implemented
-            CommandDelegateFactoryCollection (const CommandDelegateFactoryCollection&);
-            CommandDelegateFactoryCollection& operator= (const CommandDelegateFactoryCollection&);
+    public:
+        CommandDelegateFactoryCollection();
 
-        public:
+        ~CommandDelegateFactoryCollection();
 
-            CommandDelegateFactoryCollection();
+        void add(CSMWorld::ColumnBase::Display display, CommandDelegateFactory* factory);
+        ///< The ownership of \a factory is transferred to *this.
+        ///
+        /// This function must not be called more than once per value of \a display.
 
-            ~CommandDelegateFactoryCollection();
-
-            void add (CSMWorld::ColumnBase::Display display, CommandDelegateFactory *factory);
-            ///< The ownership of \a factory is transferred to *this.
-            ///
-            /// This function must not be called more than once per value of \a display.
-
-            CommandDelegate *makeDelegate (CSMWorld::ColumnBase::Display display,
-                CSMWorld::CommandDispatcher *dispatcher, CSMDoc::Document& document,
-                QObject *parent) const;
-            ///< The ownership of the returned CommandDelegate is transferred to the caller.
-            ///
-            /// If no factory is registered for \a display, a CommandDelegate will be returned.
-
-            static const CommandDelegateFactoryCollection& get();
+        CommandDelegate* makeDelegate(CSMWorld::ColumnBase::Display display, CSMWorld::CommandDispatcher* dispatcher,
+            CSMDoc::Document& document, QObject* parent) const;
+        ///< The ownership of the returned CommandDelegate is transferred to the caller.
+        ///
+        /// If no factory is registered for \a display, a CommandDelegate will be returned.
 
+        static const CommandDelegateFactoryCollection& get();
     };
 
     ///< \brief Use commands instead of manipulating the model directly
     class CommandDelegate : public QStyledItemDelegate
     {
-            Q_OBJECT
-
-            bool mEditLock;
-            CSMWorld::CommandDispatcher *mCommandDispatcher;
-            CSMDoc::Document& mDocument;
-
-        protected:
+        Q_OBJECT
 
-            QUndoStack& getUndoStack() const;
+        bool mEditLock;
+        CSMWorld::CommandDispatcher* mCommandDispatcher;
+        CSMDoc::Document& mDocument;
 
-            CSMDoc::Document& getDocument() const;
+    protected:
+        QUndoStack& getUndoStack() const;
 
-            CSMWorld::ColumnBase::Display getDisplayTypeFromIndex(const QModelIndex &index) const;
+        CSMDoc::Document& getDocument() const;
 
-            virtual void setModelDataImp (QWidget *editor, QAbstractItemModel *model,
-                const QModelIndex& index) const;
+        CSMWorld::ColumnBase::Display getDisplayTypeFromIndex(const QModelIndex& index) const;
 
-        public:
+        virtual void setModelDataImp(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const;
 
-            /// \param commandDispatcher If CommandDelegate will be only be used on read-only
-            /// cells, a 0-pointer can be passed here.
-            CommandDelegate (CSMWorld::CommandDispatcher *commandDispatcher, CSMDoc::Document& document, QObject *parent);
+    public:
+        /// \param commandDispatcher If CommandDelegate will be only be used on read-only
+        /// cells, a 0-pointer can be passed here.
+        CommandDelegate(CSMWorld::CommandDispatcher* commandDispatcher, CSMDoc::Document& document, QObject* parent);
 
-            void setModelData (QWidget *editor, QAbstractItemModel *model,
-                const QModelIndex& index) const override;
+        void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const override;
 
-            QWidget *createEditor (QWidget *parent,
-                                           const QStyleOptionViewItem& option,
-                                           const QModelIndex& index) const override;
+        QWidget* createEditor(
+            QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
 
-            virtual QWidget *createEditor (QWidget *parent,
-                                           const QStyleOptionViewItem& option,
-                                           const QModelIndex& index,
-                                           CSMWorld::ColumnBase::Display display) const;
+        virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index,
+            CSMWorld::ColumnBase::Display display) const;
 
-            void setEditLock (bool locked);
+        void setEditLock(bool locked);
 
-            bool isEditLocked() const;
+        bool isEditLocked() const;
 
-            ///< \return Does column require update?
+        ///< \return Does column require update?
 
-            void setEditorData (QWidget *editor, const QModelIndex& index) const override;
+        void setEditorData(QWidget* editor, const QModelIndex& index) const override;
 
-            virtual void setEditorData (QWidget *editor, const QModelIndex& index, bool tryDisplay) const;
+        virtual void setEditorData(QWidget* editor, const QModelIndex& index, bool tryDisplay) const;
 
-            /// \attention This is not a slot. For ordering reasons this function needs to be
-            /// called manually from the parent object's settingChanged function.
-            virtual void settingChanged (const CSMPrefs::Setting *setting);
+        /// \attention This is not a slot. For ordering reasons this function needs to be
+        /// called manually from the parent object's settingChanged function.
+        virtual void settingChanged(const CSMPrefs::Setting* setting);
     };
 }
 
diff --git a/apps/opencs/view/world/vartypedelegate.cpp b/apps/opencs/view/world/vartypedelegate.cpp
index 80c96afce4..b5b1be2543 100644
--- a/apps/opencs/view/world/vartypedelegate.cpp
+++ b/apps/opencs/view/world/vartypedelegate.cpp
@@ -1,15 +1,14 @@
 #include "vartypedelegate.hpp"
 
-#include "../../model/world/commands.hpp"
 #include "../../model/world/columns.hpp"
 #include "../../model/world/commandmacro.hpp"
+#include "../../model/world/commands.hpp"
 
-void CSVWorld::VarTypeDelegate::addCommands (QAbstractItemModel *model, const QModelIndex& index, int type)
-    const
+void CSVWorld::VarTypeDelegate::addCommands(QAbstractItemModel* model, const QModelIndex& index, int type) const
 {
-    QModelIndex next = model->index (index.row(), index.column()+1);
+    QModelIndex next = model->index(index.row(), index.column() + 1);
 
-    QVariant old = model->data (next);
+    QVariant old = model->data(next);
 
     QVariant value;
 
@@ -32,50 +31,51 @@ void CSVWorld::VarTypeDelegate::addCommands (QAbstractItemModel *model, const QM
             value = old.toString();
             break;
 
-        default: break; // ignore the rest
+        default:
+            break; // ignore the rest
     }
 
-    CSMWorld::CommandMacro macro (getUndoStack(), "Modify " + model->headerData (index.column(), Qt::Horizontal, Qt::DisplayRole).toString());
+    CSMWorld::CommandMacro macro(
+        getUndoStack(), "Modify " + model->headerData(index.column(), Qt::Horizontal, Qt::DisplayRole).toString());
 
-    macro.push (new CSMWorld::ModifyCommand (*model, index, type));
-    macro.push (new CSMWorld::ModifyCommand (*model, next, value));
+    macro.push(new CSMWorld::ModifyCommand(*model, index, type));
+    macro.push(new CSMWorld::ModifyCommand(*model, next, value));
 }
 
-CSVWorld::VarTypeDelegate::VarTypeDelegate (const std::vector<std::pair<int, QString> >& values,
-    CSMWorld::CommandDispatcher *dispatcher, CSMDoc::Document& document, QObject *parent)
-: EnumDelegate (values, dispatcher, document, parent)
-{}
-
+CSVWorld::VarTypeDelegate::VarTypeDelegate(const std::vector<std::pair<int, QString>>& values,
+    CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent)
+    : EnumDelegate(values, dispatcher, document, parent)
+{
+}
 
-CSVWorld::VarTypeDelegateFactory::VarTypeDelegateFactory (ESM::VarType type0,
-    ESM::VarType type1, ESM::VarType type2, ESM::VarType type3)
+CSVWorld::VarTypeDelegateFactory::VarTypeDelegateFactory(
+    ESM::VarType type0, ESM::VarType type1, ESM::VarType type2, ESM::VarType type3)
 {
-    if (type0!=ESM::VT_Unknown)
-        add (type0);
+    if (type0 != ESM::VT_Unknown)
+        add(type0);
 
-    if (type1!=ESM::VT_Unknown)
-        add (type1);
+    if (type1 != ESM::VT_Unknown)
+        add(type1);
 
-    if (type2!=ESM::VT_Unknown)
-        add (type2);
+    if (type2 != ESM::VT_Unknown)
+        add(type2);
 
-    if (type3!=ESM::VT_Unknown)
-        add (type3);
+    if (type3 != ESM::VT_Unknown)
+        add(type3);
 }
 
-CSVWorld::CommandDelegate *CSVWorld::VarTypeDelegateFactory::makeDelegate (
-    CSMWorld::CommandDispatcher *dispatcher, CSMDoc::Document& document, QObject *parent) const
+CSVWorld::CommandDelegate* CSVWorld::VarTypeDelegateFactory::makeDelegate(
+    CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent) const
 {
-    return new VarTypeDelegate (mValues, dispatcher, document, parent);
+    return new VarTypeDelegate(mValues, dispatcher, document, parent);
 }
 
-void CSVWorld::VarTypeDelegateFactory::add (ESM::VarType type)
+void CSVWorld::VarTypeDelegateFactory::add(ESM::VarType type)
 {
-    std::vector<std::pair<int,std::string>> enums =
-        CSMWorld::Columns::getEnums (CSMWorld::Columns::ColumnId_ValueType);
+    std::vector<std::pair<int, std::string>> enums = CSMWorld::Columns::getEnums(CSMWorld::Columns::ColumnId_ValueType);
 
     if (static_cast<size_t>(type) >= enums.size())
-        throw std::logic_error ("Unsupported variable type");
+        throw std::logic_error("Unsupported variable type");
 
-    mValues.emplace_back(type, QString::fromUtf8 (enums[type].second.c_str()));
+    mValues.emplace_back(type, QString::fromUtf8(enums[type].second.c_str()));
 }
diff --git a/apps/opencs/view/world/vartypedelegate.hpp b/apps/opencs/view/world/vartypedelegate.hpp
index 5b0daec904..d841c0435e 100644
--- a/apps/opencs/view/world/vartypedelegate.hpp
+++ b/apps/opencs/view/world/vartypedelegate.hpp
@@ -9,32 +9,27 @@ namespace CSVWorld
 {
     class VarTypeDelegate : public EnumDelegate
     {
-        private:
+    private:
+        void addCommands(QAbstractItemModel* model, const QModelIndex& index, int type) const override;
 
-            void addCommands (QAbstractItemModel *model,
-                const QModelIndex& index, int type) const override;
-
-        public:
-
-            VarTypeDelegate (const std::vector<std::pair<int, QString> >& values,
-                CSMWorld::CommandDispatcher *dispatcher, CSMDoc::Document& document, QObject *parent);
+    public:
+        VarTypeDelegate(const std::vector<std::pair<int, QString>>& values, CSMWorld::CommandDispatcher* dispatcher,
+            CSMDoc::Document& document, QObject* parent);
     };
 
     class VarTypeDelegateFactory : public CommandDelegateFactory
     {
-            std::vector<std::pair<int, QString> > mValues;
-
-        public:
+        std::vector<std::pair<int, QString>> mValues;
 
-            VarTypeDelegateFactory (ESM::VarType type0 = ESM::VT_Unknown,
-                ESM::VarType type1 = ESM::VT_Unknown, ESM::VarType type2 = ESM::VT_Unknown,
-                ESM::VarType type3 = ESM::VT_Unknown);
+    public:
+        VarTypeDelegateFactory(ESM::VarType type0 = ESM::VT_Unknown, ESM::VarType type1 = ESM::VT_Unknown,
+            ESM::VarType type2 = ESM::VT_Unknown, ESM::VarType type3 = ESM::VT_Unknown);
 
-            CommandDelegate *makeDelegate (CSMWorld::CommandDispatcher *dispatcher,
-                CSMDoc::Document& document, QObject *parent) const override;
-            ///< The ownership of the returned CommandDelegate is transferred to the caller.
+        CommandDelegate* makeDelegate(
+            CSMWorld::CommandDispatcher* dispatcher, CSMDoc::Document& document, QObject* parent) const override;
+        ///< The ownership of the returned CommandDelegate is transferred to the caller.
 
-            void add (ESM::VarType type);
+        void add(ESM::VarType type);
     };
 }
 
diff --git a/apps/openmw/android_main.cpp b/apps/openmw/android_main.cpp
index 95365915df..ade009ae07 100644
--- a/apps/openmw/android_main.cpp
+++ b/apps/openmw/android_main.cpp
@@ -3,9 +3,9 @@ int stderr = 0; // Hack: fix linker error
 #endif
 
 #include "SDL_main.h"
+#include <SDL_events.h>
 #include <SDL_gamecontroller.h>
 #include <SDL_mouse.h>
-#include <SDL_events.h>
 
 /*******************************************************************************
  Functions called by JNI
@@ -16,43 +16,50 @@ int stderr = 0; // Hack: fix linker error
 
 extern void SDL_Android_Init(JNIEnv* env, jclass cls);
 extern int argcData;
-extern const char **argvData;
+extern const char** argvData;
 void releaseArgv();
 
-
-extern "C" int Java_org_libsdl_app_SDLActivity_getMouseX(JNIEnv *env, jclass cls, jobject obj) {
+extern "C" int Java_org_libsdl_app_SDLActivity_getMouseX(JNIEnv* env, jclass cls, jobject obj)
+{
     int ret = 0;
     SDL_GetMouseState(&ret, nullptr);
     return ret;
 }
 
-
-extern "C" int Java_org_libsdl_app_SDLActivity_getMouseY(JNIEnv *env, jclass cls, jobject obj) {
+extern "C" int Java_org_libsdl_app_SDLActivity_getMouseY(JNIEnv* env, jclass cls, jobject obj)
+{
     int ret = 0;
     SDL_GetMouseState(nullptr, &ret);
     return ret;
 }
 
-extern "C" int Java_org_libsdl_app_SDLActivity_isMouseShown(JNIEnv *env, jclass cls, jobject obj) {
+extern "C" int Java_org_libsdl_app_SDLActivity_isMouseShown(JNIEnv* env, jclass cls, jobject obj)
+{
     return SDL_ShowCursor(SDL_QUERY);
 }
 
-extern SDL_Window *Android_Window;
-extern "C" int SDL_SendMouseMotion(SDL_Window * window, int mouseID, int relative, int x, int y);
-extern "C" void Java_org_libsdl_app_SDLActivity_sendRelativeMouseMotion(JNIEnv *env, jclass cls, int x, int y) {
+extern SDL_Window* Android_Window;
+extern "C" int SDL_SendMouseMotion(SDL_Window* window, int mouseID, int relative, int x, int y);
+extern "C" void Java_org_libsdl_app_SDLActivity_sendRelativeMouseMotion(JNIEnv* env, jclass cls, int x, int y)
+{
     SDL_SendMouseMotion(Android_Window, 0, 1, x, y);
 }
 
-extern "C" int SDL_SendMouseButton(SDL_Window * window, int mouseID, Uint8 state, Uint8 button);
-extern "C" void Java_org_libsdl_app_SDLActivity_sendMouseButton(JNIEnv *env, jclass cls, int state, int button) {
+extern "C" int SDL_SendMouseButton(SDL_Window* window, int mouseID, Uint8 state, Uint8 button);
+extern "C" void Java_org_libsdl_app_SDLActivity_sendMouseButton(JNIEnv* env, jclass cls, int state, int button)
+{
     SDL_SendMouseButton(Android_Window, 0, state, button);
 }
 
-extern "C" int Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jclass cls, jobject obj) {
+extern "C" int Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jclass cls, jobject obj)
+{
     setenv("OPENMW_DECOMPRESS_TEXTURES", "1", 1);
 
     // On Android, we use a virtual controller with guid="Virtual"
-    SDL_GameControllerAddMapping("5669727475616c000000000000000000,Virtual,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4");
+    SDL_GameControllerAddMapping(
+        "5669727475616c000000000000000000,Virtual,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,"
+        "guide:b16,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,"
+        "righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4");
 
     return 0;
 }
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 724c2e48bb..4641ed8520 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -3,8 +3,8 @@
 #include <chrono>
 #include <thread>
 
-#include <osgViewer/ViewerEventHandlers>
 #include <osgDB/WriteFile>
+#include <osgViewer/ViewerEventHandlers>
 
 #include <SDL.h>
 
@@ -16,8 +16,8 @@
 #include <components/vfs/manager.hpp>
 #include <components/vfs/registerarchives.hpp>
 
-#include <components/sdlutil/sdlgraphicswindow.hpp>
 #include <components/sdlutil/imagetosurface.hpp>
+#include <components/sdlutil/sdlgraphicswindow.hpp>
 
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
@@ -25,8 +25,8 @@
 
 #include <components/compiler/extensions0.hpp>
 
-#include <components/stereo/stereomanager.hpp>
 #include <components/stereo/multiview.hpp>
+#include <components/stereo/stereomanager.hpp>
 
 #include <components/sceneutil/workqueue.hpp>
 
@@ -36,11 +36,11 @@
 
 #include <components/misc/frameratelimiter.hpp>
 
-#include <components/sceneutil/screencapture.hpp>
-#include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/color.hpp>
-#include <components/sceneutil/util.hpp>
+#include <components/sceneutil/depth.hpp>
+#include <components/sceneutil/screencapture.hpp>
 #include <components/sceneutil/unrefqueue.hpp>
+#include <components/sceneutil/util.hpp>
 
 #include <components/settings/shadermanager.hpp>
 
@@ -50,8 +50,8 @@
 
 #include "mwlua/luamanagerimp.hpp"
 
-#include "mwscript/scriptmanagerimp.hpp"
 #include "mwscript/interpretercontext.hpp"
+#include "mwscript/scriptmanagerimp.hpp"
 
 #include "mwsound/soundmanagerimp.hpp"
 
@@ -86,11 +86,12 @@ namespace
         const std::string mTaken;
 
         UserStats(const std::string& label, const std::string& prefix)
-            : mLabel(label),
-              mBegin(prefix + "_time_begin"),
-              mEnd(prefix + "_time_end"),
-              mTaken(prefix + "_time_taken")
-        {}
+            : mLabel(label)
+            , mBegin(prefix + "_time_begin")
+            , mEnd(prefix + "_time_end")
+            , mTaken(prefix + "_time_taken")
+        {
+        }
     };
 
     enum class UserStatsType : std::size_t
@@ -116,39 +117,38 @@ namespace
     };
 
     template <>
-    const UserStats UserStatsValue<UserStatsType::Input>::sValue {"Input", "input"};
+    const UserStats UserStatsValue<UserStatsType::Input>::sValue{ "Input", "input" };
 
     template <>
-    const UserStats UserStatsValue<UserStatsType::Sound>::sValue {"Sound", "sound"};
+    const UserStats UserStatsValue<UserStatsType::Sound>::sValue{ "Sound", "sound" };
 
     template <>
-    const UserStats UserStatsValue<UserStatsType::State>::sValue {"State", "state"};
+    const UserStats UserStatsValue<UserStatsType::State>::sValue{ "State", "state" };
 
     template <>
-    const UserStats UserStatsValue<UserStatsType::Script>::sValue {"Script", "script"};
+    const UserStats UserStatsValue<UserStatsType::Script>::sValue{ "Script", "script" };
 
     template <>
-    const UserStats UserStatsValue<UserStatsType::Mechanics>::sValue {"Mech", "mechanics"};
+    const UserStats UserStatsValue<UserStatsType::Mechanics>::sValue{ "Mech", "mechanics" };
 
     template <>
-    const UserStats UserStatsValue<UserStatsType::Physics>::sValue {"Phys", "physics"};
+    const UserStats UserStatsValue<UserStatsType::Physics>::sValue{ "Phys", "physics" };
 
     template <>
-    const UserStats UserStatsValue<UserStatsType::PhysicsWorker>::sValue {" -Async", "physicsworker"};
+    const UserStats UserStatsValue<UserStatsType::PhysicsWorker>::sValue{ " -Async", "physicsworker" };
 
     template <>
-    const UserStats UserStatsValue<UserStatsType::World>::sValue {"World", "world"};
+    const UserStats UserStatsValue<UserStatsType::World>::sValue{ "World", "world" };
 
     template <>
-    const UserStats UserStatsValue<UserStatsType::Gui>::sValue {"Gui", "gui"};
+    const UserStats UserStatsValue<UserStatsType::Gui>::sValue{ "Gui", "gui" };
 
     template <>
-    const UserStats UserStatsValue<UserStatsType::Lua>::sValue {"Lua", "lua"};
+    const UserStats UserStatsValue<UserStatsType::Lua>::sValue{ "Lua", "lua" };
 
     template <>
     const UserStats UserStatsValue<UserStatsType::LuaSyncUpdate>::sValue{ " -Sync", "luasyncupdate" };
 
-
     template <UserStatsType type>
     struct ForEachUserStatsValue
     {
@@ -165,7 +165,9 @@ namespace
     struct ForEachUserStatsValue<UserStatsType::Number>
     {
         template <class F>
-        static void apply(F&&) {}
+        static void apply(F&&)
+        {
+        }
     };
 
     template <class F>
@@ -177,37 +179,37 @@ namespace
     template <UserStatsType sType>
     class ScopedProfile
     {
-        public:
-            ScopedProfile(osg::Timer_t frameStart, unsigned int frameNumber, const osg::Timer& timer, osg::Stats& stats)
-                : mScopeStart(timer.tick()),
-                  mFrameStart(frameStart),
-                  mFrameNumber(frameNumber),
-                  mTimer(timer),
-                  mStats(stats)
-            {
-            }
+    public:
+        ScopedProfile(osg::Timer_t frameStart, unsigned int frameNumber, const osg::Timer& timer, osg::Stats& stats)
+            : mScopeStart(timer.tick())
+            , mFrameStart(frameStart)
+            , mFrameNumber(frameNumber)
+            , mTimer(timer)
+            , mStats(stats)
+        {
+        }
 
-            ScopedProfile(const ScopedProfile&) = delete;
-            ScopedProfile& operator=(const ScopedProfile&) = delete;
+        ScopedProfile(const ScopedProfile&) = delete;
+        ScopedProfile& operator=(const ScopedProfile&) = delete;
 
-            ~ScopedProfile()
-            {
-                if (!mStats.collectStats("engine"))
-                    return;
-                const osg::Timer_t end = mTimer.tick();
-                const UserStats& stats = UserStatsValue<sType>::sValue;
-
-                mStats.setAttribute(mFrameNumber, stats.mBegin, mTimer.delta_s(mFrameStart, mScopeStart));
-                mStats.setAttribute(mFrameNumber, stats.mTaken, mTimer.delta_s(mScopeStart, end));
-                mStats.setAttribute(mFrameNumber, stats.mEnd, mTimer.delta_s(mFrameStart, end));
-            }
+        ~ScopedProfile()
+        {
+            if (!mStats.collectStats("engine"))
+                return;
+            const osg::Timer_t end = mTimer.tick();
+            const UserStats& stats = UserStatsValue<sType>::sValue;
+
+            mStats.setAttribute(mFrameNumber, stats.mBegin, mTimer.delta_s(mFrameStart, mScopeStart));
+            mStats.setAttribute(mFrameNumber, stats.mTaken, mTimer.delta_s(mScopeStart, end));
+            mStats.setAttribute(mFrameNumber, stats.mEnd, mTimer.delta_s(mFrameStart, end));
+        }
 
-        private:
-            const osg::Timer_t mScopeStart;
-            const osg::Timer_t mFrameStart;
-            const unsigned int mFrameNumber;
-            const osg::Timer& mTimer;
-            osg::Stats& mStats;
+    private:
+        const osg::Timer_t mScopeStart;
+        const osg::Timer_t mFrameStart;
+        const unsigned int mFrameNumber;
+        const osg::Timer& mTimer;
+        osg::Stats& mStats;
     };
 
     void initStatsHandler(Resource::Profiler& profiler)
@@ -219,10 +221,9 @@ namespace
         const bool averageInInverseSpace = false;
         const float maxValue = 10000;
 
-        forEachUserStatsValue([&] (const UserStats& v)
-        {
-            profiler.addUserStatsLine(v.mLabel, textColor, barColor, v.mTaken, multiplier,
-                                      average, averageInInverseSpace, v.mBegin, v.mEnd, maxValue);
+        forEachUserStatsValue([&](const UserStats& v) {
+            profiler.addUserStatsLine(v.mLabel, textColor, barColor, v.mTaken, multiplier, average,
+                averageInInverseSpace, v.mBegin, v.mEnd, maxValue);
         });
         // the forEachUserStatsValue loop is "run" at compile time, hence the settings manager is not available.
         // Unconditionnally add the async physics stats, and then remove it at runtime if necessary
@@ -234,7 +235,8 @@ namespace
     {
         void operator()(std::string message) const
         {
-            MWBase::Environment::get().getWindowManager()->scheduleMessageBox(std::move(message), MWGui::ShowInDialogueMode_Never);
+            MWBase::Environment::get().getWindowManager()->scheduleMessageBox(
+                std::move(message), MWGui::ShowInDialogueMode_Never);
         }
     };
 
@@ -246,8 +248,10 @@ namespace
     class IdentifyOpenGLOperation : public osg::GraphicsOperation
     {
     public:
-        IdentifyOpenGLOperation() : GraphicsOperation("IdentifyOpenGLOperation", false)
-        {}
+        IdentifyOpenGLOperation()
+            : GraphicsOperation("IdentifyOpenGLOperation", false)
+        {
+        }
 
         void operator()(osg::GraphicsContext* graphicsContext) override
         {
@@ -271,8 +275,10 @@ namespace
     class InitializeStereoOperation final : public osg::GraphicsOperation
     {
     public:
-        InitializeStereoOperation() : GraphicsOperation("InitializeStereoOperation", false)
-        {}
+        InitializeStereoOperation()
+            : GraphicsOperation("InitializeStereoOperation", false)
+        {
+        }
 
         void operator()(osg::GraphicsContext* graphicsContext) override
         {
@@ -289,9 +295,8 @@ void OMW::Engine::executeLocalScripts()
     std::pair<std::string, MWWorld::Ptr> script;
     while (localScripts.getNext(script))
     {
-        MWScript::InterpreterContext interpreterContext (
-            &script.second.getRefData().getLocals(), script.second);
-        mScriptManager->run (script.first, interpreterContext);
+        MWScript::InterpreterContext interpreterContext(&script.second.getRefData().getLocals(), script.second);
+        mScriptManager->run(script.first, interpreterContext);
     }
 }
 
@@ -313,8 +318,9 @@ bool OMW::Engine::frame(float frametime)
         }
 
         // When the window is minimized, pause the game. Currently this *has* to be here to work around a MyGUI bug.
-        // If we are not currently rendering, then RenderItems will not be reused resulting in a memory leak upon changing widget textures (fixed in MyGUI 3.3.2),
-        // and destroyed widgets will not be deleted (not fixed yet, https://github.com/MyGUI/mygui/issues/21)
+        // If we are not currently rendering, then RenderItems will not be reused resulting in a memory leak upon
+        // changing widget textures (fixed in MyGUI 3.3.2), and destroyed widgets will not be deleted (not fixed yet,
+        // https://github.com/MyGUI/mygui/issues/21)
         {
             ScopedProfile<UserStatsType::Sound> profile(frameStart, frameNumber, *timer, *stats);
 
@@ -333,7 +339,7 @@ bool OMW::Engine::frame(float frametime)
 
         // Main menu opened? Then scripts are also paused.
         bool paused = mWindowManager->containsMode(MWGui::GM_MainMenu);
-        
+
         {
             ScopedProfile<UserStatsType::LuaSyncUpdate> profile(frameStart, frameNumber, *timer, *stats);
             // Should be called after input manager update and before any change to the game world.
@@ -344,7 +350,7 @@ bool OMW::Engine::frame(float frametime)
         // update game state
         {
             ScopedProfile<UserStatsType::State> profile(frameStart, frameNumber, *timer, *stats);
-            mStateManager->update (frametime);
+            mStateManager->update(frametime);
         }
 
         bool guiActive = mWindowManager->isGuiMode();
@@ -389,7 +395,7 @@ bool OMW::Engine::frame(float frametime)
             if (mStateManager->getState() == MWBase::StateManager::State_Running)
             {
                 MWWorld::Ptr player = mWorld->getPlayerPtr();
-                if(!guiActive && player.getClass().getCreatureStats(player).isDead())
+                if (!guiActive && player.getClass().getCreatureStats(player).isDead())
                     mStateManager->endGame();
             }
         }
@@ -447,34 +453,35 @@ bool OMW::Engine::frame(float frametime)
 }
 
 OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
-  : mWindow(nullptr)
-  , mEncoding(ToUTF8::WINDOWS_1252)
-  , mScreenCaptureOperation(nullptr)
-  , mSelectDepthFormatOperation(new SceneUtil::SelectDepthFormatOperation())
-  , mSelectColorFormatOperation(new SceneUtil::Color::SelectColorFormatOperation())
-  , mStereoManager(nullptr)
-  , mSkipMenu (false)
-  , mUseSound (true)
-  , mCompileAll (false)
-  , mCompileAllDialogue (false)
-  , mWarningsMode (1)
-  , mScriptConsoleMode (false)
-  , mActivationDistanceOverride(-1)
-  , mGrab(true)
-  , mRandomSeed(0)
-  , mFSStrict (false)
-  , mScriptBlacklistUse (true)
-  , mNewGame (false)
-  , mCfgMgr(configurationManager)
-  , mGlMaxTextureImageUnits(0)
+    : mWindow(nullptr)
+    , mEncoding(ToUTF8::WINDOWS_1252)
+    , mScreenCaptureOperation(nullptr)
+    , mSelectDepthFormatOperation(new SceneUtil::SelectDepthFormatOperation())
+    , mSelectColorFormatOperation(new SceneUtil::Color::SelectColorFormatOperation())
+    , mStereoManager(nullptr)
+    , mSkipMenu(false)
+    , mUseSound(true)
+    , mCompileAll(false)
+    , mCompileAllDialogue(false)
+    , mWarningsMode(1)
+    , mScriptConsoleMode(false)
+    , mActivationDistanceOverride(-1)
+    , mGrab(true)
+    , mRandomSeed(0)
+    , mFSStrict(false)
+    , mScriptBlacklistUse(true)
+    , mNewGame(false)
+    , mCfgMgr(configurationManager)
+    , mGlMaxTextureImageUnits(0)
 {
     SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0"); // We use only gamepads
 
-    Uint32 flags = SDL_INIT_VIDEO|SDL_INIT_NOPARACHUTE|SDL_INIT_GAMECONTROLLER|SDL_INIT_JOYSTICK|SDL_INIT_SENSOR;
-    if(SDL_WasInit(flags) == 0)
+    Uint32 flags
+        = SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE | SDL_INIT_GAMECONTROLLER | SDL_INIT_JOYSTICK | SDL_INIT_SENSOR;
+    if (SDL_WasInit(flags) == 0)
     {
         SDL_SetMainReady();
-        if(SDL_Init(flags) != 0)
+        if (SDL_Init(flags) != 0)
         {
             throw std::runtime_error("Could not initialize SDL! " + std::string(SDL_GetError()));
         }
@@ -525,26 +532,27 @@ void OMW::Engine::enableFSStrict(bool fsStrict)
 
 // Set data dir
 
-void OMW::Engine::setDataDirs (const Files::PathContainer& dataDirs)
+void OMW::Engine::setDataDirs(const Files::PathContainer& dataDirs)
 {
     mDataDirs = dataDirs;
     mDataDirs.insert(mDataDirs.begin(), mResDir / "vfs");
-    mFileCollections = Files::Collections (mDataDirs, !mFSStrict);
+    mFileCollections = Files::Collections(mDataDirs, !mFSStrict);
 }
 
 // Add BSA archive
-void OMW::Engine::addArchive (const std::string& archive) {
+void OMW::Engine::addArchive(const std::string& archive)
+{
     mArchives.push_back(archive);
 }
 
 // Set resource dir
-void OMW::Engine::setResourceDir (const std::filesystem::path& parResDir)
+void OMW::Engine::setResourceDir(const std::filesystem::path& parResDir)
 {
     mResDir = parResDir;
 }
 
 // Set start cell name
-void OMW::Engine::setCell (const std::string& cellName)
+void OMW::Engine::setCell(const std::string& cellName)
 {
     mCellName = cellName;
 }
@@ -559,7 +567,7 @@ void OMW::Engine::addGroundcoverFile(const std::string& file)
     mGroundcoverFiles.emplace_back(file);
 }
 
-void OMW::Engine::setSkipMenu (bool skipMenu, bool newGame)
+void OMW::Engine::setSkipMenu(bool skipMenu, bool newGame)
 {
     mSkipMenu = skipMenu;
     mNewGame = newGame;
@@ -570,22 +578,22 @@ void OMW::Engine::createWindow()
     int screen = Settings::Manager::getInt("screen", "Video");
     int width = Settings::Manager::getInt("resolution x", "Video");
     int height = Settings::Manager::getInt("resolution y", "Video");
-    Settings::WindowMode windowMode = static_cast<Settings::WindowMode>(Settings::Manager::getInt("window mode", "Video"));
+    Settings::WindowMode windowMode
+        = static_cast<Settings::WindowMode>(Settings::Manager::getInt("window mode", "Video"));
     bool windowBorder = Settings::Manager::getBool("window border", "Video");
     bool vsync = Settings::Manager::getBool("vsync", "Video");
     unsigned int antialiasing = std::max(0, Settings::Manager::getInt("antialiasing", "Video"));
 
-    int pos_x = SDL_WINDOWPOS_CENTERED_DISPLAY(screen),
-        pos_y = SDL_WINDOWPOS_CENTERED_DISPLAY(screen);
+    int pos_x = SDL_WINDOWPOS_CENTERED_DISPLAY(screen), pos_y = SDL_WINDOWPOS_CENTERED_DISPLAY(screen);
 
-    if(windowMode == Settings::WindowMode::Fullscreen || windowMode == Settings::WindowMode::WindowedFullscreen)
+    if (windowMode == Settings::WindowMode::Fullscreen || windowMode == Settings::WindowMode::WindowedFullscreen)
     {
         pos_x = SDL_WINDOWPOS_UNDEFINED_DISPLAY(screen);
         pos_y = SDL_WINDOWPOS_UNDEFINED_DISPLAY(screen);
     }
 
-    Uint32 flags = SDL_WINDOW_OPENGL|SDL_WINDOW_SHOWN|SDL_WINDOW_RESIZABLE|SDL_WINDOW_ALLOW_HIGHDPI;
-    if(windowMode == Settings::WindowMode::Fullscreen)
+    Uint32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI;
+    if (windowMode == Settings::WindowMode::Fullscreen)
         flags |= SDL_WINDOW_FULLSCREEN;
     else if (windowMode == Settings::WindowMode::WindowedFullscreen)
         flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
@@ -598,7 +606,7 @@ void OMW::Engine::createWindow()
         flags |= SDL_WINDOW_BORDERLESS;
 
     SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS,
-                Settings::Manager::getBool("minimize on focus loss", "Video") ? "1" : "0");
+        Settings::Manager::getBool("minimize on focus loss", "Video") ? "1" : "0");
 
     checkSDLError(SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8));
     checkSDLError(SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8));
@@ -625,7 +633,8 @@ void OMW::Engine::createWindow()
                 // Try with a lower AA
                 if (antialiasing > 0)
                 {
-                    Log(Debug::Warning) << "Warning: " << antialiasing << "x antialiasing not supported, trying " << antialiasing/2;
+                    Log(Debug::Warning) << "Warning: " << antialiasing << "x antialiasing not supported, trying "
+                                        << antialiasing / 2;
                     antialiasing /= 2;
                     Settings::Manager::setInt("antialiasing", "Video", antialiasing);
                     checkSDLError(SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, antialiasing));
@@ -642,11 +651,12 @@ void OMW::Engine::createWindow()
 
         // Since we use physical resolution internally, we have to create the window with scaled resolution,
         // but we can't get the scale before the window exists, so instead we have to resize aftewards.
-        int w,h;
+        int w, h;
         SDL_GetWindowSize(mWindow, &w, &h);
-        int dw,dh;
+        int dw, dh;
         SDL_GL_GetDrawableSize(mWindow, &dw, &dh);
-        if (dw != w || dh != h) {
+        if (dw != w || dh != h)
+        {
             SDL_SetWindowSize(mWindow, width / (dw / w), height / (dh / h));
         }
 
@@ -656,17 +666,19 @@ void OMW::Engine::createWindow()
         SDL_GetWindowPosition(mWindow, &traits->x, &traits->y);
         SDL_GL_GetDrawableSize(mWindow, &traits->width, &traits->height);
         traits->windowName = SDL_GetWindowTitle(mWindow);
-        traits->windowDecoration = !(SDL_GetWindowFlags(mWindow)&SDL_WINDOW_BORDERLESS);
+        traits->windowDecoration = !(SDL_GetWindowFlags(mWindow) & SDL_WINDOW_BORDERLESS);
         traits->screenNum = SDL_GetWindowDisplayIndex(mWindow);
         traits->vsync = vsync;
         traits->inheritedWindowData = new SDLUtil::GraphicsWindowSDL2::WindowData(mWindow);
 
         graphicsWindow = new SDLUtil::GraphicsWindowSDL2(traits);
-        if (!graphicsWindow->valid()) throw std::runtime_error("Failed to create GraphicsContext");
+        if (!graphicsWindow->valid())
+            throw std::runtime_error("Failed to create GraphicsContext");
 
         if (traits->samples < antialiasing)
         {
-            Log(Debug::Warning) << "Warning: Framebuffer MSAA level is only " << traits->samples << "x instead of " << antialiasing << "x. Trying " << antialiasing / 2 << "x instead.";
+            Log(Debug::Warning) << "Warning: Framebuffer MSAA level is only " << traits->samples << "x instead of "
+                                << antialiasing << "x. Trying " << antialiasing / 2 << "x instead.";
             graphicsWindow->closeImplementation();
             SDL_DestroyWindow(mWindow);
             mWindow = nullptr;
@@ -712,7 +724,8 @@ void OMW::Engine::createWindow()
     mViewer->realize();
     mGlMaxTextureImageUnits = identifyOp->getMaxTextureImageUnits();
 
-    mViewer->getEventQueue()->getCurrentEventState()->setWindowRectangle(0, 0, graphicsWindow->getTraits()->width, graphicsWindow->getTraits()->height);
+    mViewer->getEventQueue()->getCurrentEventState()->setWindowRectangle(
+        0, 0, graphicsWindow->getTraits()->width, graphicsWindow->getTraits()->height);
 }
 
 void OMW::Engine::setWindowIcon()
@@ -730,7 +743,8 @@ void OMW::Engine::setWindowIcon()
     }
     osgDB::ReaderWriter::ReadResult result = reader->readImage(windowIconStream);
     if (!result.success())
-        Log(Debug::Error) << "Error: Failed to read " << windowIcon << ": " << result.message() << " code " << result.status();
+        Log(Debug::Error) << "Error: Failed to read " << windowIcon << ": " << result.message() << " code "
+                          << result.status();
     else
     {
         osg::ref_ptr<osg::Image> image = result.getImage();
@@ -757,13 +771,11 @@ void OMW::Engine::prepareEngine()
 
     mResourceSystem = std::make_unique<Resource::ResourceSystem>(mVFS.get());
     mResourceSystem->getSceneManager()->getShaderManager().setMaxTextureUnits(mGlMaxTextureImageUnits);
-    mResourceSystem->getSceneManager()->setUnRefImageDataAfterApply(false); // keep to Off for now to allow better state sharing
-    mResourceSystem->getSceneManager()->setFilterSettings(
-        Settings::Manager::getString("texture mag filter", "General"),
+    mResourceSystem->getSceneManager()->setUnRefImageDataAfterApply(
+        false); // keep to Off for now to allow better state sharing
+    mResourceSystem->getSceneManager()->setFilterSettings(Settings::Manager::getString("texture mag filter", "General"),
         Settings::Manager::getString("texture min filter", "General"),
-        Settings::Manager::getString("texture mipmap", "General"),
-        Settings::Manager::getInt("anisotropy", "General")
-    );
+        Settings::Manager::getString("texture mipmap", "General"), Settings::Manager::getInt("anisotropy", "General"));
     mEnvironment.setResourceSystem(*mResourceSystem);
 
     int numThreads = Settings::Manager::getInt("preload num threads", "Cells");
@@ -772,16 +784,12 @@ void OMW::Engine::prepareEngine()
     mWorkQueue = new SceneUtil::WorkQueue(numThreads);
     mUnrefQueue = std::make_unique<SceneUtil::UnrefQueue>();
 
-    mScreenCaptureOperation = new SceneUtil::AsyncScreenCaptureOperation(
-        mWorkQueue,
-        new SceneUtil::WriteScreenshotToFileOperation(
-            mCfgMgr.getScreenshotPath(),
+    mScreenCaptureOperation = new SceneUtil::AsyncScreenCaptureOperation(mWorkQueue,
+        new SceneUtil::WriteScreenshotToFileOperation(mCfgMgr.getScreenshotPath(),
             Settings::Manager::getString("screenshot format", "General"),
             Settings::Manager::getBool("notify on saved screenshot", "General")
-                    ? std::function<void (std::string)>(ScheduleNonDialogMessageBox {})
-                    : std::function<void (std::string)>(IgnoreString {})
-        )
-    );
+                ? std::function<void(std::string)>(ScheduleNonDialogMessageBox{})
+                : std::function<void(std::string)>(IgnoreString{})));
 
     mScreenCaptureHandler = new osgViewer::ScreenCaptureHandler(mScreenCaptureOperation);
 
@@ -795,10 +803,11 @@ void OMW::Engine::prepareEngine()
 
     const auto keybinderUser = mCfgMgr.getUserConfigPath() / "input_v3.xml";
     bool keybinderUserExists = std::filesystem::exists(keybinderUser);
-    if(!keybinderUserExists)
+    if (!keybinderUserExists)
     {
         const auto input2 = (mCfgMgr.getUserConfigPath() / "input_v2.xml");
-        if(std::filesystem::exists(input2)) {
+        if (std::filesystem::exists(input2))
+        {
             keybinderUserExists = std::filesystem::copy_file(input2, keybinderUser);
             Log(Debug::Info) << "Loading keybindings file: " << keybinderUser;
         }
@@ -819,7 +828,7 @@ void OMW::Engine::prepareEngine()
         gameControllerdb = localdefault;
     else if (std::filesystem::exists(globaldefault))
         gameControllerdb = globaldefault;
-    //else if it doesn't exist, pass in an empty string
+    // else if it doesn't exist, pass in an empty string
 
     // gui needs our shaders path before everything else
     mResourceSystem->getSceneManager()->setShaderPath(mResDir / "shaders");
@@ -839,10 +848,9 @@ void OMW::Engine::prepareEngine()
     mStereoManager->disableStereoForNode(guiRoot);
     rootNode->addChild(guiRoot);
 
-    mWindowManager = std::make_unique<MWGui::WindowManager>(mWindow, mViewer, guiRoot, mResourceSystem.get(), mWorkQueue.get(),
-                mCfgMgr.getLogPath(),
-                mScriptConsoleMode, mTranslationDataStorage, mEncoding,
-                Version::getOpenmwVersionDescription(mResDir), shadersSupported);
+    mWindowManager = std::make_unique<MWGui::WindowManager>(mWindow, mViewer, guiRoot, mResourceSystem.get(),
+        mWorkQueue.get(), mCfgMgr.getLogPath(), mScriptConsoleMode, mTranslationDataStorage, mEncoding,
+        Version::getOpenmwVersionDescription(mResDir), shadersSupported);
     mEnvironment.setWindowManager(*mWindowManager);
 
     mInputManager = std::make_unique<MWInput::InputManager>(mWindow, mViewer, mScreenCaptureHandler,
@@ -872,16 +880,16 @@ void OMW::Engine::prepareEngine()
     mLuaManager->initL10n();
     mWindowManager->initUI();
 
-    //Load translation data
+    // Load translation data
     mTranslationDataStorage.setEncoder(mEncoder.get());
-    for (auto & mContentFile : mContentFiles)
-      mTranslationDataStorage.loadTranslationData(mFileCollections, mContentFile);
+    for (auto& mContentFile : mContentFiles)
+        mTranslationDataStorage.loadTranslationData(mFileCollections, mContentFile);
 
-    Compiler::registerExtensions (mExtensions);
+    Compiler::registerExtensions(mExtensions);
 
     // Create script system
     mScriptContext = std::make_unique<MWScript::CompilerContext>(MWScript::CompilerContext::Type_Full);
-    mScriptContext->setExtensions (&mExtensions);
+    mScriptContext->setExtensions(&mExtensions);
 
     mScriptManager = std::make_unique<MWScript::ScriptManager>(mWorld->getStore(), *mScriptContext, mWarningsMode,
         mScriptBlacklistUse ? mScriptBlacklist : std::vector<std::string>());
@@ -903,19 +911,16 @@ void OMW::Engine::prepareEngine()
     {
         std::pair<int, int> result = mScriptManager->compileAll();
         if (result.first)
-            Log(Debug::Info)
-                << "compiled " << result.second << " of " << result.first << " scripts ("
-                << 100*static_cast<double> (result.second)/result.first
-                << "%)";
+            Log(Debug::Info) << "compiled " << result.second << " of " << result.first << " scripts ("
+                             << 100 * static_cast<double>(result.second) / result.first << "%)";
     }
     if (mCompileAllDialogue)
     {
         std::pair<int, int> result = MWDialogue::ScriptTest::compileAll(&mExtensions, mWarningsMode);
         if (result.first)
-            Log(Debug::Info)
-                << "compiled " << result.second << " of " << result.first << " dialogue script/actor combinations a("
-                << 100*static_cast<double> (result.second)/result.first
-                << "%)";
+            Log(Debug::Info) << "compiled " << result.second << " of " << result.first
+                             << " dialogue script/actor combinations a("
+                             << 100 * static_cast<double>(result.second) / result.first << "%)";
     }
 
     mLuaManager->init();
@@ -925,17 +930,19 @@ void OMW::Engine::prepareEngine()
 class OMW::Engine::LuaWorker
 {
 public:
-    explicit LuaWorker(Engine* engine) : mEngine(engine)
+    explicit LuaWorker(Engine* engine)
+        : mEngine(engine)
     {
         if (Settings::Manager::getInt("lua num threads", "Lua") > 0)
-            mThread = std::thread([this]{ threadBody(); });
+            mThread = std::thread([this] { threadBody(); });
     };
 
     ~LuaWorker()
     {
         if (mThread && mThread->joinable())
         {
-            Log(Debug::Error) << "Unexpected destruction of LuaWorker; likely there is an unhandled exception in the main thread.";
+            Log(Debug::Error)
+                << "Unexpected destruction of LuaWorker; likely there is an unhandled exception in the main thread.";
             join();
         }
     }
@@ -956,7 +963,7 @@ public:
         if (mThread)
         {
             std::unique_lock<std::mutex> lk(mMutex);
-            mCV.wait(lk, [&]{ return !mUpdateRequest; });
+            mCV.wait(lk, [&] { return !mUpdateRequest; });
         }
         else
             update();
@@ -981,7 +988,8 @@ private:
         const auto& viewer = mEngine->mViewer;
         const osg::Timer_t frameStart = viewer->getStartTick();
         const unsigned int frameNumber = viewer->getFrameStamp()->getFrameNumber();
-        ScopedProfile<UserStatsType::Lua> profile(frameStart, frameNumber, *osg::Timer::instance(), *viewer->getViewerStats());
+        ScopedProfile<UserStatsType::Lua> profile(
+            frameStart, frameNumber, *osg::Timer::instance(), *viewer->getViewerStats());
 
         mEngine->mLuaManager->update();
     }
@@ -991,7 +999,7 @@ private:
         while (true)
         {
             std::unique_lock<std::mutex> lk(mMutex);
-            mCV.wait(lk, [&]{ return mUpdateRequest || mJoinRequest; });
+            mCV.wait(lk, [&] { return mUpdateRequest || mJoinRequest; });
             if (mJoinRequest)
                 break;
 
@@ -1014,12 +1022,13 @@ private:
 // Initialise and enter main loop.
 void OMW::Engine::go()
 {
-    assert (!mContentFiles.empty());
+    assert(!mContentFiles.empty());
 
     Log(Debug::Info) << "OSG version: " << osgGetVersion();
     SDL_version sdlVersion;
     SDL_GetVersion(&sdlVersion);
-    Log(Debug::Info) << "SDL version: " << (int)sdlVersion.major << "." << (int)sdlVersion.minor << "." << (int)sdlVersion.patch;
+    Log(Debug::Info) << "SDL version: " << (int)sdlVersion.major << "." << (int)sdlVersion.minor << "."
+                     << (int)sdlVersion.patch;
 
     Misc::Rng::init(mRandomSeed);
 
@@ -1082,15 +1091,15 @@ void OMW::Engine::go()
     else if (!mSkipMenu)
     {
         // start in main menu
-        mWindowManager->pushGuiMode (MWGui::GM_MainMenu);
+        mWindowManager->pushGuiMode(MWGui::GM_MainMenu);
         mSoundManager->playTitleMusic();
         std::string_view logo = Fallback::Map::getString("Movies_Morrowind_Logo");
         if (!logo.empty())
-            mWindowManager->playVideo(logo, /*allowSkipping*/true, /*overrideSounds*/false);
+            mWindowManager->playVideo(logo, /*allowSkipping*/ true, /*overrideSounds*/ false);
     }
     else
     {
-        mStateManager->newGame (!mNewGame);
+        mStateManager->newGame(!mNewGame);
     }
 
     if (!mStartupScript.empty() && mStateManager->getState() == MWState::StateManager::State_Running)
@@ -1098,7 +1107,7 @@ void OMW::Engine::go()
         mWindowManager->executeInConsole(mStartupScript);
     }
 
-    LuaWorker luaWorker(this);  // starts a separate lua thread if "lua num threads" > 0
+    LuaWorker luaWorker(this); // starts a separate lua thread if "lua num threads" > 0
 
     // Start the main rendering loop
     double simulationTime = 0.0;
@@ -1106,10 +1115,10 @@ void OMW::Engine::go()
     const std::chrono::steady_clock::duration maxSimulationInterval(std::chrono::milliseconds(200));
     while (!mViewer->done() && !mStateManager->hasQuitRequest())
     {
-        const double dt = std::chrono::duration_cast<std::chrono::duration<double>>(std::min(
-            frameRateLimiter.getLastFrameDuration(),
-            maxSimulationInterval
-        )).count() * mEnvironment.getWorld()->getSimulationTimeScale();
+        const double dt = std::chrono::duration_cast<std::chrono::duration<double>>(
+                              std::min(frameRateLimiter.getLastFrameDuration(), maxSimulationInterval))
+                              .count()
+            * mEnvironment.getWorld()->getSimulationTimeScale();
 
         mViewer->advance(simulationTime);
 
@@ -1125,7 +1134,7 @@ void OMW::Engine::go()
 
             mWorld->updateWindowManager();
 
-            luaWorker.allowUpdate();  // if there is a separate Lua thread, it starts the update now
+            luaWorker.allowUpdate(); // if there is a separate Lua thread, it starts the update now
 
             mViewer->renderingTraversals();
 
@@ -1162,12 +1171,12 @@ void OMW::Engine::go()
     Log(Debug::Info) << "Quitting peacefully.";
 }
 
-void OMW::Engine::setCompileAll (bool all)
+void OMW::Engine::setCompileAll(bool all)
 {
     mCompileAll = all;
 }
 
-void OMW::Engine::setCompileAllDialogue (bool all)
+void OMW::Engine::setCompileAllDialogue(bool all)
 {
     mCompileAllDialogue = all;
 }
@@ -1182,37 +1191,37 @@ void OMW::Engine::setEncoding(const ToUTF8::FromType& encoding)
     mEncoding = encoding;
 }
 
-void OMW::Engine::setScriptConsoleMode (bool enabled)
+void OMW::Engine::setScriptConsoleMode(bool enabled)
 {
     mScriptConsoleMode = enabled;
 }
 
-void OMW::Engine::setStartupScript (const std::string& path)
+void OMW::Engine::setStartupScript(const std::string& path)
 {
     mStartupScript = path;
 }
 
-void OMW::Engine::setActivationDistanceOverride (int distance)
+void OMW::Engine::setActivationDistanceOverride(int distance)
 {
     mActivationDistanceOverride = distance;
 }
 
-void OMW::Engine::setWarningsMode (int mode)
+void OMW::Engine::setWarningsMode(int mode)
 {
     mWarningsMode = mode;
 }
 
-void OMW::Engine::setScriptBlacklist (const std::vector<std::string>& list)
+void OMW::Engine::setScriptBlacklist(const std::vector<std::string>& list)
 {
     mScriptBlacklist = list;
 }
 
-void OMW::Engine::setScriptBlacklistUse (bool use)
+void OMW::Engine::setScriptBlacklistUse(bool use)
 {
     mScriptBlacklistUse = use;
 }
 
-void OMW::Engine::setSaveGameFile(const std::filesystem::path &savegame)
+void OMW::Engine::setSaveGameFile(const std::filesystem::path& savegame)
 {
     mSaveGameFile = savegame;
 }
diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index 98d667dc43..cdc54c7018 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -5,8 +5,8 @@
 
 #include <components/compiler/extensions.hpp>
 #include <components/files/collections.hpp>
-#include <components/translation/translation.hpp>
 #include <components/settings/settings.hpp>
+#include <components/translation/translation.hpp>
 
 #include <osgViewer/Viewer>
 #include <osgViewer/ViewerEventHandlers>
@@ -117,153 +117,153 @@ namespace OMW
     /// \brief Main engine class, that brings together all the components of OpenMW
     class Engine
     {
-            SDL_Window* mWindow;
-            std::unique_ptr<VFS::Manager> mVFS;
-            std::unique_ptr<Resource::ResourceSystem> mResourceSystem;
-            osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
-            std::unique_ptr<SceneUtil::UnrefQueue> mUnrefQueue;
-            std::unique_ptr<MWWorld::World> mWorld;
-            std::unique_ptr<MWSound::SoundManager> mSoundManager;
-            std::unique_ptr<MWScript::ScriptManager> mScriptManager;
-            std::unique_ptr<MWGui::WindowManager> mWindowManager;
-            std::unique_ptr<MWMechanics::MechanicsManager> mMechanicsManager;
-            std::unique_ptr<MWDialogue::DialogueManager> mDialogueManager;
-            std::unique_ptr<MWDialogue::Journal> mJournal;
-            std::unique_ptr<MWInput::InputManager> mInputManager;
-            std::unique_ptr<MWState::StateManager> mStateManager;
-            std::unique_ptr<MWLua::LuaManager> mLuaManager;
-            MWBase::Environment mEnvironment;
-            ToUTF8::FromType mEncoding;
-            std::unique_ptr<ToUTF8::Utf8Encoder> mEncoder;
-            Files::PathContainer mDataDirs;
-            std::vector<std::string> mArchives;
-            std::filesystem::path mResDir;
-            osg::ref_ptr<osgViewer::Viewer> mViewer;
-            osg::ref_ptr<osgViewer::ScreenCaptureHandler> mScreenCaptureHandler;
-            osg::ref_ptr<SceneUtil::AsyncScreenCaptureOperation> mScreenCaptureOperation;
-            osg::ref_ptr<SceneUtil::SelectDepthFormatOperation> mSelectDepthFormatOperation;
-            osg::ref_ptr<SceneUtil::Color::SelectColorFormatOperation> mSelectColorFormatOperation;
-            std::string mCellName;
-            std::vector<std::string> mContentFiles;
-            std::vector<std::string> mGroundcoverFiles;
-
-            std::unique_ptr<Stereo::Manager> mStereoManager;
-
-            bool mSkipMenu;
-            bool mUseSound;
-            bool mCompileAll;
-            bool mCompileAllDialogue;
-            int mWarningsMode;
-            std::string mFocusName;
-            bool mScriptConsoleMode;
-            std::string mStartupScript;
-            int mActivationDistanceOverride;
-            std::filesystem::path mSaveGameFile;
-            // Grab mouse?
-            bool mGrab;
-
-            unsigned int mRandomSeed;
-
-            Compiler::Extensions mExtensions;
-            std::unique_ptr<Compiler::Context> mScriptContext;
-
-            Files::Collections mFileCollections;
-            bool mFSStrict;
-            Translation::Storage mTranslationDataStorage;
-            std::vector<std::string> mScriptBlacklist;
-            bool mScriptBlacklistUse;
-            bool mNewGame;
-
-            // not implemented
-            Engine (const Engine&);
-            Engine& operator= (const Engine&);
-
-            void executeLocalScripts();
-
-            bool frame (float dt);
-
-            /// Prepare engine for game play
-            void prepareEngine();
-
-            void createWindow();
-            void setWindowIcon();
-
-        public:
-            Engine(Files::ConfigurationManager& configurationManager);
-            virtual ~Engine();
-
-            /// Enable strict filesystem mode (do not fold case)
-            ///
-            /// \attention The strict mode must be specified before any path-related settings
-            /// are given to the engine.
-            void enableFSStrict(bool fsStrict);
-
-            /// Set data dirs
-            void setDataDirs(const Files::PathContainer& dataDirs);
-
-            /// Add BSA archive
-            void addArchive(const std::string& archive);
-
-            /// Set resource dir
-            void setResourceDir(const std::filesystem::path& parResDir);
-
-            /// Set start cell name
-            void setCell(const std::string& cellName);
-
-            /**
-             * @brief addContentFile - Adds content file (ie. esm/esp, or omwgame/omwaddon) to the content files container.
-             * @param file - filename (extension is required)
-             */
-            void addContentFile(const std::string& file);
-            void addGroundcoverFile(const std::string& file);
-
-            /// Disable or enable all sounds
-            void setSoundUsage(bool soundUsage);
-
-            /// Skip main menu and go directly into the game
-            ///
-            /// \param newGame Start a new game instead off dumping the player into the game
-            /// (ignored if !skipMenu).
-            void setSkipMenu (bool skipMenu, bool newGame);
-
-            void setGrabMouse(bool grab) { mGrab = grab; }
-
-            /// Initialise and enter main loop.
-            void go();
+        SDL_Window* mWindow;
+        std::unique_ptr<VFS::Manager> mVFS;
+        std::unique_ptr<Resource::ResourceSystem> mResourceSystem;
+        osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
+        std::unique_ptr<SceneUtil::UnrefQueue> mUnrefQueue;
+        std::unique_ptr<MWWorld::World> mWorld;
+        std::unique_ptr<MWSound::SoundManager> mSoundManager;
+        std::unique_ptr<MWScript::ScriptManager> mScriptManager;
+        std::unique_ptr<MWGui::WindowManager> mWindowManager;
+        std::unique_ptr<MWMechanics::MechanicsManager> mMechanicsManager;
+        std::unique_ptr<MWDialogue::DialogueManager> mDialogueManager;
+        std::unique_ptr<MWDialogue::Journal> mJournal;
+        std::unique_ptr<MWInput::InputManager> mInputManager;
+        std::unique_ptr<MWState::StateManager> mStateManager;
+        std::unique_ptr<MWLua::LuaManager> mLuaManager;
+        MWBase::Environment mEnvironment;
+        ToUTF8::FromType mEncoding;
+        std::unique_ptr<ToUTF8::Utf8Encoder> mEncoder;
+        Files::PathContainer mDataDirs;
+        std::vector<std::string> mArchives;
+        std::filesystem::path mResDir;
+        osg::ref_ptr<osgViewer::Viewer> mViewer;
+        osg::ref_ptr<osgViewer::ScreenCaptureHandler> mScreenCaptureHandler;
+        osg::ref_ptr<SceneUtil::AsyncScreenCaptureOperation> mScreenCaptureOperation;
+        osg::ref_ptr<SceneUtil::SelectDepthFormatOperation> mSelectDepthFormatOperation;
+        osg::ref_ptr<SceneUtil::Color::SelectColorFormatOperation> mSelectColorFormatOperation;
+        std::string mCellName;
+        std::vector<std::string> mContentFiles;
+        std::vector<std::string> mGroundcoverFiles;
+
+        std::unique_ptr<Stereo::Manager> mStereoManager;
+
+        bool mSkipMenu;
+        bool mUseSound;
+        bool mCompileAll;
+        bool mCompileAllDialogue;
+        int mWarningsMode;
+        std::string mFocusName;
+        bool mScriptConsoleMode;
+        std::string mStartupScript;
+        int mActivationDistanceOverride;
+        std::filesystem::path mSaveGameFile;
+        // Grab mouse?
+        bool mGrab;
+
+        unsigned int mRandomSeed;
+
+        Compiler::Extensions mExtensions;
+        std::unique_ptr<Compiler::Context> mScriptContext;
+
+        Files::Collections mFileCollections;
+        bool mFSStrict;
+        Translation::Storage mTranslationDataStorage;
+        std::vector<std::string> mScriptBlacklist;
+        bool mScriptBlacklistUse;
+        bool mNewGame;
+
+        // not implemented
+        Engine(const Engine&);
+        Engine& operator=(const Engine&);
+
+        void executeLocalScripts();
+
+        bool frame(float dt);
+
+        /// Prepare engine for game play
+        void prepareEngine();
+
+        void createWindow();
+        void setWindowIcon();
+
+    public:
+        Engine(Files::ConfigurationManager& configurationManager);
+        virtual ~Engine();
+
+        /// Enable strict filesystem mode (do not fold case)
+        ///
+        /// \attention The strict mode must be specified before any path-related settings
+        /// are given to the engine.
+        void enableFSStrict(bool fsStrict);
+
+        /// Set data dirs
+        void setDataDirs(const Files::PathContainer& dataDirs);
+
+        /// Add BSA archive
+        void addArchive(const std::string& archive);
+
+        /// Set resource dir
+        void setResourceDir(const std::filesystem::path& parResDir);
+
+        /// Set start cell name
+        void setCell(const std::string& cellName);
+
+        /**
+         * @brief addContentFile - Adds content file (ie. esm/esp, or omwgame/omwaddon) to the content files container.
+         * @param file - filename (extension is required)
+         */
+        void addContentFile(const std::string& file);
+        void addGroundcoverFile(const std::string& file);
+
+        /// Disable or enable all sounds
+        void setSoundUsage(bool soundUsage);
+
+        /// Skip main menu and go directly into the game
+        ///
+        /// \param newGame Start a new game instead off dumping the player into the game
+        /// (ignored if !skipMenu).
+        void setSkipMenu(bool skipMenu, bool newGame);
+
+        void setGrabMouse(bool grab) { mGrab = grab; }
+
+        /// Initialise and enter main loop.
+        void go();
 
-            /// Compile all scripts (excludign dialogue scripts) at startup?
-            void setCompileAll (bool all);
+        /// Compile all scripts (excludign dialogue scripts) at startup?
+        void setCompileAll(bool all);
 
-            /// Compile all dialogue scripts at startup?
-            void setCompileAllDialogue (bool all);
+        /// Compile all dialogue scripts at startup?
+        void setCompileAllDialogue(bool all);
 
-            /// Font encoding
-            void setEncoding(const ToUTF8::FromType& encoding);
+        /// Font encoding
+        void setEncoding(const ToUTF8::FromType& encoding);
 
-            /// Enable console-only script functionality
-            void setScriptConsoleMode (bool enabled);
+        /// Enable console-only script functionality
+        void setScriptConsoleMode(bool enabled);
 
-            /// Set path for a script that is run on startup in the console.
-            void setStartupScript (const std::string& path);
+        /// Set path for a script that is run on startup in the console.
+        void setStartupScript(const std::string& path);
 
-            /// Override the game setting specified activation distance.
-            void setActivationDistanceOverride (int distance);
+        /// Override the game setting specified activation distance.
+        void setActivationDistanceOverride(int distance);
 
-            void setWarningsMode (int mode);
+        void setWarningsMode(int mode);
 
-            void setScriptBlacklist (const std::vector<std::string>& list);
+        void setScriptBlacklist(const std::vector<std::string>& list);
 
-            void setScriptBlacklistUse (bool use);
+        void setScriptBlacklistUse(bool use);
 
-            /// Set the save game file to load after initialising the engine.
-            void setSaveGameFile(const std::filesystem::path &savegame);
+        /// Set the save game file to load after initialising the engine.
+        void setSaveGameFile(const std::filesystem::path& savegame);
 
-            void setRandomSeed(unsigned int seed);
+        void setRandomSeed(unsigned int seed);
 
-        private:
-            Files::ConfigurationManager& mCfgMgr;
-            class LuaWorker;
-            int mGlMaxTextureImageUnits;
+    private:
+        Files::ConfigurationManager& mCfgMgr;
+        class LuaWorker;
+        int mGlMaxTextureImageUnits;
     };
 }
 
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index 9700142ab8..a2c096e2a0 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -1,10 +1,10 @@
-#include <components/version/version.hpp>
-#include <components/files/configurationmanager.hpp>
+#include <components/debug/debugging.hpp>
 #include <components/fallback/fallback.hpp>
 #include <components/fallback/validate.hpp>
-#include <components/debug/debugging.hpp>
+#include <components/files/configurationmanager.hpp>
 #include <components/misc/rng.hpp>
 #include <components/platform/platform.hpp>
+#include <components/version/version.hpp>
 
 #include "mwgui/debugwindow.hpp"
 
@@ -27,7 +27,6 @@ extern "C" __declspec(dllexport) DWORD AmdPowerXpressRequestHighPerformance = 0x
 #include <unistd.h>
 #endif
 
-
 using namespace Fallback;
 
 /**
@@ -39,7 +38,7 @@ using namespace Fallback;
  * \retval true - Everything goes OK
  * \retval false - Error
  */
-bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::ConfigurationManager& cfgMgr)
+bool parseOptions(int argc, char** argv, OMW::Engine& engine, Files::ConfigurationManager& cfgMgr)
 {
     // Create a local alias for brevity
     namespace bpo = boost::program_options;
@@ -51,17 +50,21 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     Files::parseArgs(argc, argv, variables, desc);
     bpo::notify(variables);
 
-    if (variables.count ("help"))
+    if (variables.count("help"))
     {
         getRawStdout() << desc << std::endl;
         return false;
     }
 
-    if (variables.count ("version"))
+    if (variables.count("version"))
     {
         cfgMgr.readConfiguration(variables, desc, true);
 
-        Version::Version v = Version::getOpenmwVersion(variables["resources"].as<Files::MaybeQuotedPath>().u8string()); // This call to u8string is redundant, but required to build on MSVC 14.26 due to implementation bugs.
+        Version::Version v
+            = Version::getOpenmwVersion(variables["resources"]
+                                            .as<Files::MaybeQuotedPath>()
+                                            .u8string()); // This call to u8string is redundant, but required to build
+                                                          // on MSVC 14.26 due to implementation bugs.
         getRawStdout() << v.describe() << std::endl;
         return false;
     }
@@ -72,7 +75,11 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     setupLogging(cfgMgr.getLogPath(), "OpenMW");
     MWGui::DebugWindow::startLogRecording();
 
-    Version::Version v = Version::getOpenmwVersion(variables["resources"].as<Files::MaybeQuotedPath>().u8string()); // This call to u8string is redundant, but required to build on MSVC 14.26 due to implementation bugs.
+    Version::Version v
+        = Version::getOpenmwVersion(variables["resources"]
+                                        .as<Files::MaybeQuotedPath>()
+                                        .u8string()); // This call to u8string is redundant, but required to build on
+                                                      // MSVC 14.26 due to implementation bugs.
     Log(Debug::Info) << v.describe();
 
     engine.setGrabMouse(!variables["no-grab"].as<bool>());
@@ -87,13 +94,19 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
 
     Files::PathContainer dataDirs(asPathContainer(variables["data"].as<Files::MaybeQuotedPathContainer>()));
 
-    Files::PathContainer::value_type local(variables["data-local"].as<Files::MaybeQuotedPathContainer::value_type>().u8string()); // This call to u8string is redundant, but required to build on MSVC 14.26 due to implementation bugs.
+    Files::PathContainer::value_type local(variables["data-local"]
+                                               .as<Files::MaybeQuotedPathContainer::value_type>()
+                                               .u8string()); // This call to u8string is redundant, but required to
+                                                             // build on MSVC 14.26 due to implementation bugs.
     if (!local.empty())
         dataDirs.push_back(local);
 
     cfgMgr.filterOutNonExistingPaths(dataDirs);
 
-    engine.setResourceDir(variables["resources"].as<Files::MaybeQuotedPath>().u8string()); // This call to u8string is redundant, but required to build on MSVC 14.26 due to implementation bugs.
+    engine.setResourceDir(variables["resources"]
+                              .as<Files::MaybeQuotedPath>()
+                              .u8string()); // This call to u8string is redundant, but required to build on MSVC 14.26
+                                            // due to implementation bugs.
     engine.setDataDirs(dataDirs);
 
     // fallback archives
@@ -138,24 +151,24 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
 
     // startup-settings
     engine.setCell(variables["start"].as<std::string>());
-    engine.setSkipMenu (variables["skip-menu"].as<bool>(), variables["new-game"].as<bool>());
+    engine.setSkipMenu(variables["skip-menu"].as<bool>(), variables["new-game"].as<bool>());
     if (!variables["skip-menu"].as<bool>() && variables["new-game"].as<bool>())
         Log(Debug::Warning) << "Warning: new-game used without skip-menu -> ignoring it";
 
     // scripts
     engine.setCompileAll(variables["script-all"].as<bool>());
     engine.setCompileAllDialogue(variables["script-all-dialogue"].as<bool>());
-    engine.setScriptConsoleMode (variables["script-console"].as<bool>());
-    engine.setStartupScript (variables["script-run"].as<std::string>());
-    engine.setWarningsMode (variables["script-warn"].as<int>());
-    engine.setScriptBlacklist (variables["script-blacklist"].as<StringsVector>());
-    engine.setScriptBlacklistUse (variables["script-blacklist-use"].as<bool>());
-    engine.setSaveGameFile (variables["load-savegame"].as<Files::MaybeQuotedPath>().u8string());
+    engine.setScriptConsoleMode(variables["script-console"].as<bool>());
+    engine.setStartupScript(variables["script-run"].as<std::string>());
+    engine.setWarningsMode(variables["script-warn"].as<int>());
+    engine.setScriptBlacklist(variables["script-blacklist"].as<StringsVector>());
+    engine.setScriptBlacklistUse(variables["script-blacklist-use"].as<bool>());
+    engine.setSaveGameFile(variables["load-savegame"].as<Files::MaybeQuotedPath>().u8string());
 
     // other settings
     Fallback::Map::init(variables["fallback"].as<FallbackMap>().mMap);
     engine.setSoundUsage(!variables["no-sound"].as<bool>());
-    engine.setActivationDistanceOverride (variables["activate-dist"].as<int>());
+    engine.setActivationDistanceOverride(variables["activate-dist"].as<int>());
     engine.setRandomSeed(variables["random-seed"].as<unsigned int>());
 
     return true;
@@ -175,21 +188,21 @@ namespace
             Debug::Level level;
             switch (severity)
             {
-            case osg::ALWAYS:
-            case osg::FATAL:
-                level = Debug::Error;
-                break;
-            case osg::WARN:
-            case osg::NOTICE:
-                level = Debug::Warning;
-                break;
-            case osg::INFO:
-                level = Debug::Info;
-                break;
-            case osg::DEBUG_INFO:
-            case osg::DEBUG_FP:
-            default:
-                level = Debug::Debug;
+                case osg::ALWAYS:
+                case osg::FATAL:
+                    level = Debug::Error;
+                    break;
+                case osg::WARN:
+                case osg::NOTICE:
+                    level = Debug::Warning;
+                    break;
+                case osg::INFO:
+                    level = Debug::Info;
+                    break;
+                case osg::DEBUG_INFO:
+                case osg::DEBUG_FP:
+                default:
+                    level = Debug::Debug;
             }
             std::string_view s(msgCopy);
             if (s.size() < 1024)
@@ -209,7 +222,7 @@ namespace
     };
 }
 
-int runApplication(int argc, char *argv[])
+int runApplication(int argc, char* argv[])
 {
     Platform::init();
 
@@ -232,9 +245,9 @@ int runApplication(int argc, char *argv[])
 }
 
 #ifdef ANDROID
-extern "C" int SDL_main(int argc, char**argv)
+extern "C" int SDL_main(int argc, char** argv)
 #else
-int main(int argc, char**argv)
+int main(int argc, char** argv)
 #endif
 {
     return wrapApplication(&runApplication, argc, argv, "OpenMW", false);
diff --git a/apps/openmw/mwbase/dialoguemanager.hpp b/apps/openmw/mwbase/dialoguemanager.hpp
index 94543ed955..889da6de71 100644
--- a/apps/openmw/mwbase/dialoguemanager.hpp
+++ b/apps/openmw/mwbase/dialoguemanager.hpp
@@ -1,10 +1,10 @@
 #ifndef GAME_MWBASE_DIALOGUEMANAGER_H
 #define GAME_MWBASE_DIALOGUEMANAGER_H
 
+#include <list>
 #include <string>
 #include <string_view>
 #include <vector>
-#include <list>
 
 #include <cstdint>
 
@@ -29,92 +29,91 @@ namespace MWBase
     /// \brief Interface for dialogue manager (implemented in MWDialogue)
     class DialogueManager
     {
-            DialogueManager (const DialogueManager&);
-            ///< not implemented
+        DialogueManager(const DialogueManager&);
+        ///< not implemented
 
-            DialogueManager& operator= (const DialogueManager&);
-            ///< not implemented
+        DialogueManager& operator=(const DialogueManager&);
+        ///< not implemented
 
+    public:
+        class ResponseCallback
+        {
         public:
+            virtual ~ResponseCallback() = default;
+            virtual void addResponse(const std::string& title, const std::string& text) = 0;
+        };
 
-            class ResponseCallback
-            {
-            public:
-                virtual ~ResponseCallback() = default;
-                virtual void addResponse(const std::string& title, const std::string& text) = 0;
-            };
-
-            DialogueManager() {}
+        DialogueManager() {}
 
-            virtual void clear() = 0;
+        virtual void clear() = 0;
 
-            virtual ~DialogueManager() {}
+        virtual ~DialogueManager() {}
 
-            virtual bool isInChoice() const = 0;
+        virtual bool isInChoice() const = 0;
 
-            virtual bool startDialogue (const MWWorld::Ptr& actor, ResponseCallback* callback) = 0;
+        virtual bool startDialogue(const MWWorld::Ptr& actor, ResponseCallback* callback) = 0;
 
-            virtual bool inJournal (const std::string& topicId, const std::string& infoId) = 0;
+        virtual bool inJournal(const std::string& topicId, const std::string& infoId) = 0;
 
-            virtual void addTopic(std::string_view topic) = 0;
+        virtual void addTopic(std::string_view topic) = 0;
 
-            virtual void addChoice(std::string_view text,int choice) = 0;
-            virtual const std::vector<std::pair<std::string, int> >& getChoices() = 0;
+        virtual void addChoice(std::string_view text, int choice) = 0;
+        virtual const std::vector<std::pair<std::string, int>>& getChoices() = 0;
 
-            virtual bool isGoodbye() = 0;
+        virtual bool isGoodbye() = 0;
 
-            virtual void goodbye() = 0;
+        virtual void goodbye() = 0;
 
-            virtual void say(const MWWorld::Ptr &actor, const std::string &topic) = 0;
+        virtual void say(const MWWorld::Ptr& actor, const std::string& topic) = 0;
 
-            virtual void keywordSelected (const std::string& keyword, ResponseCallback* callback) = 0;
-            virtual void goodbyeSelected() = 0;
-            virtual void questionAnswered (int answer, ResponseCallback* callback) = 0;
+        virtual void keywordSelected(const std::string& keyword, ResponseCallback* callback) = 0;
+        virtual void goodbyeSelected() = 0;
+        virtual void questionAnswered(int answer, ResponseCallback* callback) = 0;
 
-            enum TopicType
-            {
-                Specific = 1,
-                Exhausted = 2
-            };
+        enum TopicType
+        {
+            Specific = 1,
+            Exhausted = 2
+        };
 
-            enum ServiceType
-            {
-                Any = -1,
-                Barter = 1,
-                Repair = 2,
-                Spells = 3,
-                Training = 4,
-                Travel = 5,
-                Spellmaking = 6,
-                Enchanting = 7
-            };
+        enum ServiceType
+        {
+            Any = -1,
+            Barter = 1,
+            Repair = 2,
+            Spells = 3,
+            Training = 4,
+            Travel = 5,
+            Spellmaking = 6,
+            Enchanting = 7
+        };
 
-            virtual std::list<std::string> getAvailableTopics() = 0;
-            virtual int getTopicFlag(const std::string&) = 0;
+        virtual std::list<std::string> getAvailableTopics() = 0;
+        virtual int getTopicFlag(const std::string&) = 0;
 
-            virtual bool checkServiceRefused (ResponseCallback* callback, ServiceType service = ServiceType::Any) = 0;
+        virtual bool checkServiceRefused(ResponseCallback* callback, ServiceType service = ServiceType::Any) = 0;
 
-            virtual void persuade (int type, ResponseCallback* callback) = 0;
+        virtual void persuade(int type, ResponseCallback* callback) = 0;
 
-            /// @note Controlled by an option, gets discarded when dialogue ends by default
-            virtual void applyBarterDispositionChange (int delta) = 0;
+        /// @note Controlled by an option, gets discarded when dialogue ends by default
+        virtual void applyBarterDispositionChange(int delta) = 0;
 
-            virtual int countSavedGameRecords() const = 0;
+        virtual int countSavedGameRecords() const = 0;
 
-            virtual void write (ESM::ESMWriter& writer, Loading::Listener& progress) const = 0;
+        virtual void write(ESM::ESMWriter& writer, Loading::Listener& progress) const = 0;
 
-            virtual void readRecord (ESM::ESMReader& reader, uint32_t type) = 0;
+        virtual void readRecord(ESM::ESMReader& reader, uint32_t type) = 0;
 
-            /// Changes faction1's opinion of faction2 by \a diff.
-            virtual void modFactionReaction (std::string_view faction1, std::string_view faction2, int diff) = 0;
+        /// Changes faction1's opinion of faction2 by \a diff.
+        virtual void modFactionReaction(std::string_view faction1, std::string_view faction2, int diff) = 0;
 
-            virtual void setFactionReaction (std::string_view faction1, std::string_view faction2, int absolute) = 0;
+        virtual void setFactionReaction(std::string_view faction1, std::string_view faction2, int absolute) = 0;
 
-            /// @return faction1's opinion of faction2
-            virtual int getFactionReaction (std::string_view faction1, std::string_view faction2) const = 0;
+        /// @return faction1's opinion of faction2
+        virtual int getFactionReaction(std::string_view faction1, std::string_view faction2) const = 0;
 
-            /// Removes the last added topic response for the given actor from the journal
-            virtual void clearInfoActor (const MWWorld::Ptr& actor) const = 0;
+        /// Removes the last added topic response for the given actor from the journal
+        virtual void clearInfoActor(const MWWorld::Ptr& actor) const = 0;
     };
 }
 
diff --git a/apps/openmw/mwbase/environment.cpp b/apps/openmw/mwbase/environment.cpp
index 6b0c891fa6..18b6589c9a 100644
--- a/apps/openmw/mwbase/environment.cpp
+++ b/apps/openmw/mwbase/environment.cpp
@@ -4,10 +4,10 @@
 
 #include <components/resource/resourcesystem.hpp>
 
-#include "world.hpp"
 #include "mechanicsmanager.hpp"
+#include "world.hpp"
 
-MWBase::Environment *MWBase::Environment::sThis = nullptr;
+MWBase::Environment* MWBase::Environment::sThis = nullptr;
 
 MWBase::Environment::Environment()
 {
diff --git a/apps/openmw/mwbase/environment.hpp b/apps/openmw/mwbase/environment.hpp
index 0c5d39425b..c2f4fd129c 100644
--- a/apps/openmw/mwbase/environment.hpp
+++ b/apps/openmw/mwbase/environment.hpp
@@ -34,92 +34,91 @@ namespace MWBase
     ///
     class Environment
     {
-            static Environment *sThis;
+        static Environment* sThis;
 
-            World* mWorld = nullptr;
-            SoundManager* mSoundManager = nullptr;
-            ScriptManager* mScriptManager = nullptr;
-            WindowManager* mWindowManager = nullptr;
-            MechanicsManager* mMechanicsManager = nullptr;
-            DialogueManager* mDialogueManager = nullptr;
-            Journal* mJournal = nullptr;
-            InputManager* mInputManager = nullptr;
-            StateManager* mStateManager = nullptr;
-            LuaManager* mLuaManager = nullptr;
-            Resource::ResourceSystem* mResourceSystem = nullptr;
-            float mFrameRateLimit = 0;
-            float mFrameDuration = 0;
+        World* mWorld = nullptr;
+        SoundManager* mSoundManager = nullptr;
+        ScriptManager* mScriptManager = nullptr;
+        WindowManager* mWindowManager = nullptr;
+        MechanicsManager* mMechanicsManager = nullptr;
+        DialogueManager* mDialogueManager = nullptr;
+        Journal* mJournal = nullptr;
+        InputManager* mInputManager = nullptr;
+        StateManager* mStateManager = nullptr;
+        LuaManager* mLuaManager = nullptr;
+        Resource::ResourceSystem* mResourceSystem = nullptr;
+        float mFrameRateLimit = 0;
+        float mFrameDuration = 0;
 
-        public:
+    public:
+        Environment();
 
-            Environment();
+        ~Environment();
 
-            ~Environment();
+        Environment(const Environment&) = delete;
 
-            Environment(const Environment&) = delete;
+        Environment& operator=(const Environment&) = delete;
 
-            Environment& operator=(const Environment&) = delete;
+        void setWorld(World& value) { mWorld = &value; }
 
-            void setWorld(World& value) { mWorld = &value; }
+        void setSoundManager(SoundManager& value) { mSoundManager = &value; }
 
-            void setSoundManager(SoundManager& value) { mSoundManager = &value; }
+        void setScriptManager(ScriptManager& value) { mScriptManager = &value; }
 
-            void setScriptManager(ScriptManager& value) { mScriptManager = &value; }
+        void setWindowManager(WindowManager& value) { mWindowManager = &value; }
 
-            void setWindowManager(WindowManager& value) { mWindowManager = &value; }
+        void setMechanicsManager(MechanicsManager& value) { mMechanicsManager = &value; }
 
-            void setMechanicsManager(MechanicsManager& value) { mMechanicsManager = &value; }
+        void setDialogueManager(DialogueManager& value) { mDialogueManager = &value; }
 
-            void setDialogueManager(DialogueManager& value) { mDialogueManager = &value; }
+        void setJournal(Journal& value) { mJournal = &value; }
 
-            void setJournal(Journal& value) { mJournal = &value; }
+        void setInputManager(InputManager& value) { mInputManager = &value; }
 
-            void setInputManager(InputManager& value) { mInputManager = &value; }
+        void setStateManager(StateManager& value) { mStateManager = &value; }
 
-            void setStateManager(StateManager& value) { mStateManager = &value; }
+        void setLuaManager(LuaManager& value) { mLuaManager = &value; }
 
-            void setLuaManager(LuaManager& value) { mLuaManager = &value; }
+        void setResourceSystem(Resource::ResourceSystem& value) { mResourceSystem = &value; }
 
-            void setResourceSystem(Resource::ResourceSystem& value) { mResourceSystem = &value; }
+        Misc::NotNullPtr<World> getWorld() const { return mWorld; }
 
-            Misc::NotNullPtr<World> getWorld() const { return mWorld; }
+        Misc::NotNullPtr<SoundManager> getSoundManager() const { return mSoundManager; }
 
-            Misc::NotNullPtr<SoundManager> getSoundManager() const { return mSoundManager; }
+        Misc::NotNullPtr<ScriptManager> getScriptManager() const { return mScriptManager; }
 
-            Misc::NotNullPtr<ScriptManager> getScriptManager() const { return mScriptManager; }
+        Misc::NotNullPtr<WindowManager> getWindowManager() const { return mWindowManager; }
 
-            Misc::NotNullPtr<WindowManager> getWindowManager() const { return mWindowManager; }
+        Misc::NotNullPtr<MechanicsManager> getMechanicsManager() const { return mMechanicsManager; }
 
-            Misc::NotNullPtr<MechanicsManager> getMechanicsManager() const { return mMechanicsManager; }
+        Misc::NotNullPtr<DialogueManager> getDialogueManager() const { return mDialogueManager; }
 
-            Misc::NotNullPtr<DialogueManager> getDialogueManager() const { return mDialogueManager; }
+        Misc::NotNullPtr<Journal> getJournal() const { return mJournal; }
 
-            Misc::NotNullPtr<Journal> getJournal() const { return mJournal; }
+        Misc::NotNullPtr<InputManager> getInputManager() const { return mInputManager; }
 
-            Misc::NotNullPtr<InputManager> getInputManager() const { return mInputManager; }
+        Misc::NotNullPtr<StateManager> getStateManager() const { return mStateManager; }
 
-            Misc::NotNullPtr<StateManager> getStateManager() const { return mStateManager; }
+        Misc::NotNullPtr<LuaManager> getLuaManager() const { return mLuaManager; }
 
-            Misc::NotNullPtr<LuaManager> getLuaManager() const { return mLuaManager; }
+        Misc::NotNullPtr<Resource::ResourceSystem> getResourceSystem() const { return mResourceSystem; }
 
-            Misc::NotNullPtr<Resource::ResourceSystem> getResourceSystem() const { return mResourceSystem; }
+        float getFrameRateLimit() const { return mFrameRateLimit; }
 
-            float getFrameRateLimit() const { return mFrameRateLimit; }
+        void setFrameRateLimit(float value) { mFrameRateLimit = value; }
 
-            void setFrameRateLimit(float value) { mFrameRateLimit = value; }
+        float getFrameDuration() const { return mFrameDuration; }
 
-            float getFrameDuration() const { return mFrameDuration; }
+        void setFrameDuration(float value) { mFrameDuration = value; }
 
-            void setFrameDuration(float value) { mFrameDuration = value; }
+        /// Return instance of this class.
+        static const Environment& get()
+        {
+            assert(sThis != nullptr);
+            return *sThis;
+        }
 
-            /// Return instance of this class.
-            static const Environment& get()
-            {
-                assert(sThis != nullptr);
-                return *sThis;
-            }
-
-            void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
+        void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
     };
 }
 
diff --git a/apps/openmw/mwbase/inputmanager.hpp b/apps/openmw/mwbase/inputmanager.hpp
index 14679ffd25..0e31f4f370 100644
--- a/apps/openmw/mwbase/inputmanager.hpp
+++ b/apps/openmw/mwbase/inputmanager.hpp
@@ -1,8 +1,8 @@
 #ifndef GAME_MWBASE_INPUTMANAGER_H
 #define GAME_MWBASE_INPUTMANAGER_H
 
-#include <string>
 #include <set>
+#include <string>
 #include <vector>
 
 #include <SDL_gamecontroller.h>
@@ -24,70 +24,70 @@ namespace MWBase
     /// \brief Interface for input manager (implemented in MWInput)
     class InputManager
     {
-            InputManager (const InputManager&);
-            ///< not implemented
-
-            InputManager& operator= (const InputManager&);
-            ///< not implemented
+        InputManager(const InputManager&);
+        ///< not implemented
 
-        public:
+        InputManager& operator=(const InputManager&);
+        ///< not implemented
 
-            InputManager() {}
+    public:
+        InputManager() {}
 
-            /// Clear all savegame-specific data
-            virtual void clear() = 0;
+        /// Clear all savegame-specific data
+        virtual void clear() = 0;
 
-            virtual ~InputManager() {}
+        virtual ~InputManager() {}
 
-            virtual void update(float dt, bool disableControls, bool disableEvents=false) = 0;
+        virtual void update(float dt, bool disableControls, bool disableEvents = false) = 0;
 
-            virtual void changeInputMode(bool guiMode) = 0;
+        virtual void changeInputMode(bool guiMode) = 0;
 
-            virtual void processChangedSettings(const std::set< std::pair<std::string, std::string> >& changed) = 0;
+        virtual void processChangedSettings(const std::set<std::pair<std::string, std::string>>& changed) = 0;
 
-            virtual void setDragDrop(bool dragDrop) = 0;
-            virtual void setGamepadGuiCursorEnabled(bool enabled) = 0;
-            virtual void setAttemptJump(bool jumping) = 0;
+        virtual void setDragDrop(bool dragDrop) = 0;
+        virtual void setGamepadGuiCursorEnabled(bool enabled) = 0;
+        virtual void setAttemptJump(bool jumping) = 0;
 
-            virtual void toggleControlSwitch(std::string_view sw, bool value) = 0;
-            virtual bool getControlSwitch(std::string_view sw) = 0;
+        virtual void toggleControlSwitch(std::string_view sw, bool value) = 0;
+        virtual bool getControlSwitch(std::string_view sw) = 0;
 
-            virtual std::string_view getActionDescription(int action) const = 0;
-            virtual std::string getActionKeyBindingName (int action) const = 0;
-            virtual std::string getActionControllerBindingName (int action) const = 0;
-            virtual bool actionIsActive(int action) const = 0;
+        virtual std::string_view getActionDescription(int action) const = 0;
+        virtual std::string getActionKeyBindingName(int action) const = 0;
+        virtual std::string getActionControllerBindingName(int action) const = 0;
+        virtual bool actionIsActive(int action) const = 0;
 
-            virtual float getActionValue(int action) const = 0;  // returns value in range [0, 1]
-            virtual bool isControllerButtonPressed(SDL_GameControllerButton button) const = 0;
-            virtual float getControllerAxisValue(SDL_GameControllerAxis axis) const = 0;  // returns value in range [-1, 1]
-            virtual int getMouseMoveX() const = 0;
-            virtual int getMouseMoveY() const = 0;
+        virtual float getActionValue(int action) const = 0; // returns value in range [0, 1]
+        virtual bool isControllerButtonPressed(SDL_GameControllerButton button) const = 0;
+        virtual float getControllerAxisValue(SDL_GameControllerAxis axis) const = 0; // returns value in range [-1, 1]
+        virtual int getMouseMoveX() const = 0;
+        virtual int getMouseMoveY() const = 0;
 
-            ///Actions available for binding to keyboard buttons
-            virtual const std::initializer_list<int>& getActionKeySorting() = 0;
-            ///Actions available for binding to controller buttons
-            virtual const std::initializer_list<int>& getActionControllerSorting() = 0;
-            virtual int getNumActions() = 0;
-            ///If keyboard is true, only pay attention to keyboard events. If false, only pay attention to controller events (excluding esc)
-            virtual void enableDetectingBindingMode (int action, bool keyboard) = 0;
-            virtual void resetToDefaultKeyBindings() = 0;
-            virtual void resetToDefaultControllerBindings() = 0;
+        /// Actions available for binding to keyboard buttons
+        virtual const std::initializer_list<int>& getActionKeySorting() = 0;
+        /// Actions available for binding to controller buttons
+        virtual const std::initializer_list<int>& getActionControllerSorting() = 0;
+        virtual int getNumActions() = 0;
+        /// If keyboard is true, only pay attention to keyboard events. If false, only pay attention to controller
+        /// events (excluding esc)
+        virtual void enableDetectingBindingMode(int action, bool keyboard) = 0;
+        virtual void resetToDefaultKeyBindings() = 0;
+        virtual void resetToDefaultControllerBindings() = 0;
 
-            /// Returns if the last used input device was a joystick or a keyboard
-            /// @return true if joystick, false otherwise
-            virtual bool joystickLastUsed() = 0;
-            virtual void setJoystickLastUsed(bool enabled) = 0;
+        /// Returns if the last used input device was a joystick or a keyboard
+        /// @return true if joystick, false otherwise
+        virtual bool joystickLastUsed() = 0;
+        virtual void setJoystickLastUsed(bool enabled) = 0;
 
-            virtual int countSavedGameRecords() const = 0;
-            virtual void write(ESM::ESMWriter& writer, Loading::Listener& progress) = 0;
-            virtual void readRecord(ESM::ESMReader& reader, uint32_t type) = 0;
+        virtual int countSavedGameRecords() const = 0;
+        virtual void write(ESM::ESMWriter& writer, Loading::Listener& progress) = 0;
+        virtual void readRecord(ESM::ESMReader& reader, uint32_t type) = 0;
 
-            virtual void resetIdleTime() = 0;
-            virtual bool isIdle() const = 0;
+        virtual void resetIdleTime() = 0;
+        virtual bool isIdle() const = 0;
 
-            virtual void executeAction(int action) = 0;
+        virtual void executeAction(int action) = 0;
 
-            virtual bool controlsDisabled() = 0;
+        virtual bool controlsDisabled() = 0;
     };
 }
 
diff --git a/apps/openmw/mwbase/journal.hpp b/apps/openmw/mwbase/journal.hpp
index acad5c8788..9956bcf236 100644
--- a/apps/openmw/mwbase/journal.hpp
+++ b/apps/openmw/mwbase/journal.hpp
@@ -1,16 +1,16 @@
 #ifndef GAME_MWBASE_JOURNAL_H
 #define GAME_MWBASE_JOURNAL_H
 
-#include <string>
-#include <string_view>
 #include <deque>
 #include <map>
+#include <string>
+#include <string_view>
 
 #include <cstdint>
 
 #include "../mwdialogue/journalentry.hpp"
-#include "../mwdialogue/topic.hpp"
 #include "../mwdialogue/quest.hpp"
+#include "../mwdialogue/topic.hpp"
 
 namespace Loading
 {
@@ -28,73 +28,71 @@ namespace MWBase
     /// \brief Interface for the player's journal (implemented in MWDialogue)
     class Journal
     {
-            Journal (const Journal&);
-            ///< not implemented
-
-            Journal& operator= (const Journal&);
-            ///< not implemented
-
-        public:
+        Journal(const Journal&);
+        ///< not implemented
 
-            typedef std::deque<MWDialogue::StampedJournalEntry> TEntryContainer;
-            typedef TEntryContainer::const_iterator TEntryIter;
-            typedef std::map<std::string, MWDialogue::Quest> TQuestContainer; // topic, quest
-            typedef TQuestContainer::const_iterator TQuestIter;
-            typedef std::map<std::string, MWDialogue::Topic> TTopicContainer; // topic-id, topic-content
-            typedef TTopicContainer::const_iterator TTopicIter;
+        Journal& operator=(const Journal&);
+        ///< not implemented
 
-        public:
+    public:
+        typedef std::deque<MWDialogue::StampedJournalEntry> TEntryContainer;
+        typedef TEntryContainer::const_iterator TEntryIter;
+        typedef std::map<std::string, MWDialogue::Quest> TQuestContainer; // topic, quest
+        typedef TQuestContainer::const_iterator TQuestIter;
+        typedef std::map<std::string, MWDialogue::Topic> TTopicContainer; // topic-id, topic-content
+        typedef TTopicContainer::const_iterator TTopicIter;
 
-            Journal() {}
+    public:
+        Journal() {}
 
-            virtual void clear() = 0;
+        virtual void clear() = 0;
 
-            virtual ~Journal() {}
+        virtual ~Journal() {}
 
-            virtual void addEntry (const std::string& id, int index, const MWWorld::Ptr& actor) = 0;
-            ///< Add a journal entry.
-            /// @param actor Used as context for replacing of escape sequences (%name, etc).
+        virtual void addEntry(const std::string& id, int index, const MWWorld::Ptr& actor) = 0;
+        ///< Add a journal entry.
+        /// @param actor Used as context for replacing of escape sequences (%name, etc).
 
-            virtual void setJournalIndex (const std::string& id, int index) = 0;
-            ///< Set the journal index without adding an entry.
+        virtual void setJournalIndex(const std::string& id, int index) = 0;
+        ///< Set the journal index without adding an entry.
 
-            virtual int getJournalIndex (const std::string& id) const = 0;
-            ///< Get the journal index.
+        virtual int getJournalIndex(const std::string& id) const = 0;
+        ///< Get the journal index.
 
-            virtual void addTopic (const std::string& topicId, const std::string& infoId, const MWWorld::Ptr& actor) = 0;
-            /// \note topicId must be lowercase
+        virtual void addTopic(const std::string& topicId, const std::string& infoId, const MWWorld::Ptr& actor) = 0;
+        /// \note topicId must be lowercase
 
-            virtual void removeLastAddedTopicResponse(const std::string& topicId, std::string_view actorName) = 0;
-            ///< Removes the last topic response added for the given topicId and actor name.
-            /// \note topicId must be lowercase
+        virtual void removeLastAddedTopicResponse(const std::string& topicId, std::string_view actorName) = 0;
+        ///< Removes the last topic response added for the given topicId and actor name.
+        /// \note topicId must be lowercase
 
-            virtual TEntryIter begin() const = 0;
-            ///< Iterator pointing to the begin of the main journal.
-            ///
-            /// \note Iterators to main journal entries will never become invalid.
+        virtual TEntryIter begin() const = 0;
+        ///< Iterator pointing to the begin of the main journal.
+        ///
+        /// \note Iterators to main journal entries will never become invalid.
 
-            virtual TEntryIter end() const = 0;
-            ///< Iterator pointing past the end of the main journal.
+        virtual TEntryIter end() const = 0;
+        ///< Iterator pointing past the end of the main journal.
 
-            virtual TQuestIter questBegin() const = 0;
-            ///< Iterator pointing to the first quest (sorted by topic ID)
+        virtual TQuestIter questBegin() const = 0;
+        ///< Iterator pointing to the first quest (sorted by topic ID)
 
-            virtual TQuestIter questEnd() const = 0;
-            ///< Iterator pointing past the last quest.
+        virtual TQuestIter questEnd() const = 0;
+        ///< Iterator pointing past the last quest.
 
-            virtual TTopicIter topicBegin() const = 0;
-            ///< Iterator pointing to the first topic (sorted by topic ID)
-            ///
-            /// \note The topic ID is identical with the user-visible topic string.
+        virtual TTopicIter topicBegin() const = 0;
+        ///< Iterator pointing to the first topic (sorted by topic ID)
+        ///
+        /// \note The topic ID is identical with the user-visible topic string.
 
-            virtual TTopicIter topicEnd() const = 0;
-            ///< Iterator pointing past the last topic.
+        virtual TTopicIter topicEnd() const = 0;
+        ///< Iterator pointing past the last topic.
 
-            virtual int countSavedGameRecords() const = 0;
+        virtual int countSavedGameRecords() const = 0;
 
-            virtual void write (ESM::ESMWriter& writer, Loading::Listener& progress) const = 0;
+        virtual void write(ESM::ESMWriter& writer, Loading::Listener& progress) const = 0;
 
-            virtual void readRecord (ESM::ESMReader& reader, uint32_t type) = 0;
+        virtual void readRecord(ESM::ESMReader& reader, uint32_t type) = 0;
     };
 }
 
diff --git a/apps/openmw/mwbase/luamanager.hpp b/apps/openmw/mwbase/luamanager.hpp
index 84a8c8df40..bc0f16048a 100644
--- a/apps/openmw/mwbase/luamanager.hpp
+++ b/apps/openmw/mwbase/luamanager.hpp
@@ -1,9 +1,9 @@
 #ifndef GAME_MWBASE_LUAMANAGER_H
 #define GAME_MWBASE_LUAMANAGER_H
 
-#include <variant>
-#include <string>
 #include <map>
+#include <string>
+#include <variant>
 
 #include <SDL_events.h>
 
@@ -49,7 +49,8 @@ namespace MWBase
 
         struct InputEvent
         {
-            enum {
+            enum
+            {
                 KeyPressed,
                 KeyReleased,
                 ControllerPressed,
@@ -97,9 +98,11 @@ namespace MWBase
         // Drops script cache and reloads all scripts. Calls `onSave` and `onLoad` for every script.
         virtual void reloadAllScripts() = 0;
 
-        virtual void handleConsoleCommand(const std::string& consoleMode, const std::string& command, const MWWorld::Ptr& selectedPtr) = 0;
+        virtual void handleConsoleCommand(
+            const std::string& consoleMode, const std::string& command, const MWWorld::Ptr& selectedPtr)
+            = 0;
     };
 
 }
 
-#endif  // GAME_MWBASE_LUAMANAGER_H
+#endif // GAME_MWBASE_LUAMANAGER_H
diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index 55f024e5b0..8a866a848f 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -1,12 +1,12 @@
 #ifndef GAME_MWBASE_MECHANICSMANAGER_H
 #define GAME_MWBASE_MECHANICSMANAGER_H
 
+#include <cstdint>
+#include <map>
+#include <set>
 #include <string>
 #include <string_view>
 #include <vector>
-#include <set>
-#include <cstdint>
-#include <map>
 
 #include "../mwmechanics/greetingstate.hpp"
 
@@ -43,237 +43,248 @@ namespace MWBase
     /// \brief Interface for game mechanics manager (implemented in MWMechanics)
     class MechanicsManager
     {
-            MechanicsManager (const MechanicsManager&);
-            ///< not implemented
-
-            MechanicsManager& operator= (const MechanicsManager&);
-            ///< not implemented
-
-        public:
-
-            MechanicsManager() {}
-
-            virtual ~MechanicsManager() {}
-
-            virtual void add (const MWWorld::Ptr& ptr) = 0;
-            ///< Register an object for management
-
-            virtual void remove (const MWWorld::Ptr& ptr, bool keepActive) = 0;
-            ///< Deregister an object for management
-
-            virtual void updateCell(const MWWorld::Ptr &old, const MWWorld::Ptr &ptr) = 0;
-            ///< Moves an object to a new cell
-
-            virtual void drop (const MWWorld::CellStore *cellStore) = 0;
-            ///< Deregister all objects in the given cell.
-
-            virtual void setPlayerName (const std::string& name) = 0;
-            ///< Set player name.
-
-            virtual void setPlayerRace (const std::string& id, bool male, const std::string &head, const std::string &hair) = 0;
-            ///< Set player race.
-
-            virtual void setPlayerBirthsign (const std::string& id) = 0;
-            ///< Set player birthsign.
-
-            virtual void setPlayerClass (const std::string& id) = 0;
-            ///< Set player class to stock class.
-
-            virtual void setPlayerClass (const ESM::Class& class_) = 0;
-            ///< Set player class to custom class.
-
-            virtual void restoreDynamicStats(const MWWorld::Ptr& actor, double hours, bool sleep) = 0;
-
-            virtual void rest(double hours, bool sleep) = 0;
-            ///< If the player is sleeping or waiting, this should be called every hour.
-            /// @param sleep is the player sleeping or waiting?
-
-            virtual int getHoursToRest() const = 0;
-            ///< Calculate how many hours the player needs to rest in order to be fully healed
-
-            virtual int getBarterOffer(const MWWorld::Ptr& ptr,int basePrice, bool buying) = 0;
-            ///< This is used by every service to determine the price of objects given the trading skills of the player and NPC.
-
-            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr, bool clamp = true) = 0;
-            ///< Calculate the diposition of an NPC toward the player.
-
-            virtual int countDeaths (const std::string& id) const = 0;
-            ///< Return the number of deaths for actors with the given ID.
-
-            /// Check if \a observer is potentially aware of \a ptr. Does not do a line of sight check!
-            virtual bool awarenessCheck (const MWWorld::Ptr& ptr, const MWWorld::Ptr& observer) = 0;
-
-            /// Makes \a ptr fight \a target. Also shouts a combat taunt.
-            virtual void startCombat (const MWWorld::Ptr& ptr, const MWWorld::Ptr& target) = 0;
-
-            /// Removes an actor and its allies from combat with the actor's targets.
-            virtual void stopCombat(const MWWorld::Ptr& ptr) = 0;
-
-            enum OffenseType
-            {
-                OT_Theft, // Taking items owned by an NPC or a faction you are not a member of
-                OT_Assault, // Attacking a peaceful NPC
-                OT_Murder, // Murdering a peaceful NPC
-                OT_Trespassing, // Picking the lock of an owned door/chest
-                OT_SleepingInOwnedBed, // Sleeping in a bed owned by an NPC or a faction you are not a member of
-                OT_Pickpocket // Entering pickpocket mode, leaving it, and being detected. Any items stolen are a separate crime (Theft)
-            };
-            /**
-             * @note victim may be empty
-             * @param arg Depends on \a type, e.g. for Theft, the value of the item that was stolen.
-             * @param victimAware Is the victim already aware of the crime?
-             *                    If this parameter is false, it will be determined by a line-of-sight and awareness check.
-             * @return was the crime seen?
-             */
-            virtual bool commitCrime (const MWWorld::Ptr& ptr, const MWWorld::Ptr& victim, OffenseType type,
-                                      const std::string& factionId="", int arg=0, bool victimAware=false) = 0;
-            /// @return false if the attack was considered a "friendly hit" and forgiven
-            virtual bool actorAttacked (const MWWorld::Ptr& victim, const MWWorld::Ptr& attacker) = 0;
-
-            /// Notify that actor was killed, add a murder bounty if applicable
-            /// @note No-op for non-player attackers
-            virtual void actorKilled (const MWWorld::Ptr& victim, const MWWorld::Ptr& attacker) = 0;
-
-            /// Utility to check if taking this item is illegal and calling commitCrime if so
-            /// @param container The container the item is in; may be empty for an item in the world
-            virtual void itemTaken (const MWWorld::Ptr& ptr, const MWWorld::Ptr& item, const MWWorld::Ptr& container,
-                                    int count, bool alarm = true) = 0;
-            /// Utility to check if unlocking this object is illegal and calling commitCrime if so
-            virtual void unlockAttempted (const MWWorld::Ptr& ptr, const MWWorld::Ptr& item) = 0;
-            /// Attempt sleeping in a bed. If this is illegal, call commitCrime.
-            /// @return was it illegal, and someone saw you doing it?
-            virtual bool sleepInBed (const MWWorld::Ptr& ptr, const MWWorld::Ptr& bed) = 0;
-
-            enum PersuasionType
-            {
-                PT_Admire,
-                PT_Intimidate,
-                PT_Taunt,
-                PT_Bribe10,
-                PT_Bribe100,
-                PT_Bribe1000
-            };
-            virtual void getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type, bool& success, int& tempChange, int& permChange) = 0;
-            ///< Perform a persuasion action on NPC
-
-            virtual void forceStateUpdate(const MWWorld::Ptr &ptr) = 0;
-            ///< Forces an object to refresh its animation state.
-
-            virtual bool playAnimationGroup(const MWWorld::Ptr& ptr, std::string_view groupName, int mode, int number=1, bool persist=false) = 0;
-            ///< Run animation for a MW-reference. Calls to this function for references that are currently not
-            /// in the scene should be ignored.
-            ///
-            /// \param mode 0 normal, 1 immediate start, 2 immediate loop
-            /// \param count How many times the animation should be run
-            /// \param persist Whether the animation state should be stored in saved games
-            ///                and persist after cell unload.
-            /// \return Success or error
-
-            virtual void skipAnimation(const MWWorld::Ptr& ptr) = 0;
-            ///< Skip the animation for the given MW-reference for one frame. Calls to this function for
-            /// references that are currently not in the scene should be ignored.
-
-            virtual bool checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string& groupName) = 0;
-
-            /// Save the current animation state of managed references to their RefData.
-            virtual void persistAnimationStates() = 0;
-
-            /// Update magic effects for an actor. Usually done automatically once per frame, but if we're currently
-            /// paused we may want to do it manually (after equipping permanent enchantment)
-            virtual void updateMagicEffects (const MWWorld::Ptr& ptr) = 0;
-
-            virtual bool toggleAI() = 0;
-            virtual bool isAIActive() = 0;
-
-            virtual void getObjectsInRange (const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& objects) = 0;
-            virtual void getActorsInRange(const osg::Vec3f &position, float radius, std::vector<MWWorld::Ptr> &objects) = 0;
-
-            /// Check if there are actors in selected range
-            virtual bool isAnyActorInRange(const osg::Vec3f &position, float radius) = 0;
-
-            ///Returns the list of actors which are siding with the given actor in fights
-            /**ie AiFollow or AiEscort is active and the target is the actor **/
-            virtual std::vector<MWWorld::Ptr> getActorsSidingWith(const MWWorld::Ptr& actor) = 0;
-            virtual std::vector<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor) = 0;
-            virtual std::vector<int> getActorsFollowingIndices(const MWWorld::Ptr& actor) = 0;
-            virtual std::map<int, MWWorld::Ptr> getActorsFollowingByIndex(const MWWorld::Ptr& actor) = 0;
-
-            ///Returns a list of actors who are fighting the given actor within the fAlarmDistance
-            /** ie AiCombat is active and the target is the actor **/
-            virtual std::vector<MWWorld::Ptr> getActorsFighting(const MWWorld::Ptr& actor) = 0;
+        MechanicsManager(const MechanicsManager&);
+        ///< not implemented
+
+        MechanicsManager& operator=(const MechanicsManager&);
+        ///< not implemented
+
+    public:
+        MechanicsManager() {}
+
+        virtual ~MechanicsManager() {}
+
+        virtual void add(const MWWorld::Ptr& ptr) = 0;
+        ///< Register an object for management
+
+        virtual void remove(const MWWorld::Ptr& ptr, bool keepActive) = 0;
+        ///< Deregister an object for management
+
+        virtual void updateCell(const MWWorld::Ptr& old, const MWWorld::Ptr& ptr) = 0;
+        ///< Moves an object to a new cell
+
+        virtual void drop(const MWWorld::CellStore* cellStore) = 0;
+        ///< Deregister all objects in the given cell.
+
+        virtual void setPlayerName(const std::string& name) = 0;
+        ///< Set player name.
+
+        virtual void setPlayerRace(const std::string& id, bool male, const std::string& head, const std::string& hair)
+            = 0;
+        ///< Set player race.
+
+        virtual void setPlayerBirthsign(const std::string& id) = 0;
+        ///< Set player birthsign.
+
+        virtual void setPlayerClass(const std::string& id) = 0;
+        ///< Set player class to stock class.
+
+        virtual void setPlayerClass(const ESM::Class& class_) = 0;
+        ///< Set player class to custom class.
+
+        virtual void restoreDynamicStats(const MWWorld::Ptr& actor, double hours, bool sleep) = 0;
+
+        virtual void rest(double hours, bool sleep) = 0;
+        ///< If the player is sleeping or waiting, this should be called every hour.
+        /// @param sleep is the player sleeping or waiting?
+
+        virtual int getHoursToRest() const = 0;
+        ///< Calculate how many hours the player needs to rest in order to be fully healed
+
+        virtual int getBarterOffer(const MWWorld::Ptr& ptr, int basePrice, bool buying) = 0;
+        ///< This is used by every service to determine the price of objects given the trading skills of the player and
+        ///< NPC.
+
+        virtual int getDerivedDisposition(const MWWorld::Ptr& ptr, bool clamp = true) = 0;
+        ///< Calculate the diposition of an NPC toward the player.
+
+        virtual int countDeaths(const std::string& id) const = 0;
+        ///< Return the number of deaths for actors with the given ID.
+
+        /// Check if \a observer is potentially aware of \a ptr. Does not do a line of sight check!
+        virtual bool awarenessCheck(const MWWorld::Ptr& ptr, const MWWorld::Ptr& observer) = 0;
+
+        /// Makes \a ptr fight \a target. Also shouts a combat taunt.
+        virtual void startCombat(const MWWorld::Ptr& ptr, const MWWorld::Ptr& target) = 0;
+
+        /// Removes an actor and its allies from combat with the actor's targets.
+        virtual void stopCombat(const MWWorld::Ptr& ptr) = 0;
+
+        enum OffenseType
+        {
+            OT_Theft, // Taking items owned by an NPC or a faction you are not a member of
+            OT_Assault, // Attacking a peaceful NPC
+            OT_Murder, // Murdering a peaceful NPC
+            OT_Trespassing, // Picking the lock of an owned door/chest
+            OT_SleepingInOwnedBed, // Sleeping in a bed owned by an NPC or a faction you are not a member of
+            OT_Pickpocket // Entering pickpocket mode, leaving it, and being detected. Any items stolen are a separate
+                          // crime (Theft)
+        };
+        /**
+         * @note victim may be empty
+         * @param arg Depends on \a type, e.g. for Theft, the value of the item that was stolen.
+         * @param victimAware Is the victim already aware of the crime?
+         *                    If this parameter is false, it will be determined by a line-of-sight and awareness check.
+         * @return was the crime seen?
+         */
+        virtual bool commitCrime(const MWWorld::Ptr& ptr, const MWWorld::Ptr& victim, OffenseType type,
+            const std::string& factionId = "", int arg = 0, bool victimAware = false)
+            = 0;
+        /// @return false if the attack was considered a "friendly hit" and forgiven
+        virtual bool actorAttacked(const MWWorld::Ptr& victim, const MWWorld::Ptr& attacker) = 0;
+
+        /// Notify that actor was killed, add a murder bounty if applicable
+        /// @note No-op for non-player attackers
+        virtual void actorKilled(const MWWorld::Ptr& victim, const MWWorld::Ptr& attacker) = 0;
+
+        /// Utility to check if taking this item is illegal and calling commitCrime if so
+        /// @param container The container the item is in; may be empty for an item in the world
+        virtual void itemTaken(const MWWorld::Ptr& ptr, const MWWorld::Ptr& item, const MWWorld::Ptr& container,
+            int count, bool alarm = true)
+            = 0;
+        /// Utility to check if unlocking this object is illegal and calling commitCrime if so
+        virtual void unlockAttempted(const MWWorld::Ptr& ptr, const MWWorld::Ptr& item) = 0;
+        /// Attempt sleeping in a bed. If this is illegal, call commitCrime.
+        /// @return was it illegal, and someone saw you doing it?
+        virtual bool sleepInBed(const MWWorld::Ptr& ptr, const MWWorld::Ptr& bed) = 0;
 
-            virtual std::vector<MWWorld::Ptr> getEnemiesNearby(const MWWorld::Ptr& actor) = 0;
+        enum PersuasionType
+        {
+            PT_Admire,
+            PT_Intimidate,
+            PT_Taunt,
+            PT_Bribe10,
+            PT_Bribe100,
+            PT_Bribe1000
+        };
+        virtual void getPersuasionDispositionChange(
+            const MWWorld::Ptr& npc, PersuasionType type, bool& success, int& tempChange, int& permChange)
+            = 0;
+        ///< Perform a persuasion action on NPC
 
-            /// Recursive versions of above methods
-            virtual void getActorsFollowing(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out) = 0;
-            virtual void getActorsSidingWith(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out) = 0;
+        virtual void forceStateUpdate(const MWWorld::Ptr& ptr) = 0;
+        ///< Forces an object to refresh its animation state.
 
-            virtual void playerLoaded() = 0;
-
-            virtual int countSavedGameRecords() const = 0;
+        virtual bool playAnimationGroup(
+            const MWWorld::Ptr& ptr, std::string_view groupName, int mode, int number = 1, bool persist = false)
+            = 0;
+        ///< Run animation for a MW-reference. Calls to this function for references that are currently not
+        /// in the scene should be ignored.
+        ///
+        /// \param mode 0 normal, 1 immediate start, 2 immediate loop
+        /// \param count How many times the animation should be run
+        /// \param persist Whether the animation state should be stored in saved games
+        ///                and persist after cell unload.
+        /// \return Success or error
+
+        virtual void skipAnimation(const MWWorld::Ptr& ptr) = 0;
+        ///< Skip the animation for the given MW-reference for one frame. Calls to this function for
+        /// references that are currently not in the scene should be ignored.
 
-            virtual void write (ESM::ESMWriter& writer, Loading::Listener& listener) const = 0;
+        virtual bool checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string& groupName) = 0;
+
+        /// Save the current animation state of managed references to their RefData.
+        virtual void persistAnimationStates() = 0;
+
+        /// Update magic effects for an actor. Usually done automatically once per frame, but if we're currently
+        /// paused we may want to do it manually (after equipping permanent enchantment)
+        virtual void updateMagicEffects(const MWWorld::Ptr& ptr) = 0;
+
+        virtual bool toggleAI() = 0;
+        virtual bool isAIActive() = 0;
+
+        virtual void getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& objects)
+            = 0;
+        virtual void getActorsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& objects) = 0;
+
+        /// Check if there are actors in selected range
+        virtual bool isAnyActorInRange(const osg::Vec3f& position, float radius) = 0;
+
+        /// Returns the list of actors which are siding with the given actor in fights
+        /**ie AiFollow or AiEscort is active and the target is the actor **/
+        virtual std::vector<MWWorld::Ptr> getActorsSidingWith(const MWWorld::Ptr& actor) = 0;
+        virtual std::vector<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor) = 0;
+        virtual std::vector<int> getActorsFollowingIndices(const MWWorld::Ptr& actor) = 0;
+        virtual std::map<int, MWWorld::Ptr> getActorsFollowingByIndex(const MWWorld::Ptr& actor) = 0;
+
+        /// Returns a list of actors who are fighting the given actor within the fAlarmDistance
+        /** ie AiCombat is active and the target is the actor **/
+        virtual std::vector<MWWorld::Ptr> getActorsFighting(const MWWorld::Ptr& actor) = 0;
+
+        virtual std::vector<MWWorld::Ptr> getEnemiesNearby(const MWWorld::Ptr& actor) = 0;
+
+        /// Recursive versions of above methods
+        virtual void getActorsFollowing(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out) = 0;
+        virtual void getActorsSidingWith(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out) = 0;
+
+        virtual void playerLoaded() = 0;
+
+        virtual int countSavedGameRecords() const = 0;
+
+        virtual void write(ESM::ESMWriter& writer, Loading::Listener& listener) const = 0;
 
-            virtual void readRecord (ESM::ESMReader& reader, uint32_t type) = 0;
+        virtual void readRecord(ESM::ESMReader& reader, uint32_t type) = 0;
 
-            virtual void clear() = 0;
+        virtual void clear() = 0;
 
-            virtual bool isAggressive (const MWWorld::Ptr& ptr, const MWWorld::Ptr& target) = 0;
+        virtual bool isAggressive(const MWWorld::Ptr& ptr, const MWWorld::Ptr& target) = 0;
 
-            /// Resurrects the player if necessary
-            virtual void resurrect(const MWWorld::Ptr& ptr) = 0;
+        /// Resurrects the player if necessary
+        virtual void resurrect(const MWWorld::Ptr& ptr) = 0;
 
-            virtual bool isCastingSpell (const MWWorld::Ptr& ptr) const = 0;
-            virtual bool isReadyToBlock (const MWWorld::Ptr& ptr) const = 0;
-            virtual bool isAttackingOrSpell(const MWWorld::Ptr &ptr) const = 0;
+        virtual bool isCastingSpell(const MWWorld::Ptr& ptr) const = 0;
+        virtual bool isReadyToBlock(const MWWorld::Ptr& ptr) const = 0;
+        virtual bool isAttackingOrSpell(const MWWorld::Ptr& ptr) const = 0;
 
-            virtual void castSpell(const MWWorld::Ptr& ptr, const std::string& spellId, bool manualSpell) = 0;
+        virtual void castSpell(const MWWorld::Ptr& ptr, const std::string& spellId, bool manualSpell) = 0;
 
-            virtual void processChangedSettings (const std::set< std::pair<std::string, std::string> >& settings) = 0;
+        virtual void processChangedSettings(const std::set<std::pair<std::string, std::string>>& settings) = 0;
 
-            virtual float getActorsProcessingRange() const = 0;
+        virtual float getActorsProcessingRange() const = 0;
 
-            virtual void notifyDied(const MWWorld::Ptr& actor) = 0;
+        virtual void notifyDied(const MWWorld::Ptr& actor) = 0;
 
-            virtual bool onOpen(const MWWorld::Ptr& ptr) = 0;
-            virtual void onClose(const MWWorld::Ptr& ptr) = 0;
+        virtual bool onOpen(const MWWorld::Ptr& ptr) = 0;
+        virtual void onClose(const MWWorld::Ptr& ptr) = 0;
 
-            /// Check if the target actor was detected by an observer
-            /// If the observer is a non-NPC, check all actors in AI processing distance as observers
-            virtual bool isActorDetected(const MWWorld::Ptr& actor, const MWWorld::Ptr& observer) = 0;
+        /// Check if the target actor was detected by an observer
+        /// If the observer is a non-NPC, check all actors in AI processing distance as observers
+        virtual bool isActorDetected(const MWWorld::Ptr& actor, const MWWorld::Ptr& observer) = 0;
 
-            virtual void confiscateStolenItems (const MWWorld::Ptr& player, const MWWorld::Ptr& targetContainer) = 0;
+        virtual void confiscateStolenItems(const MWWorld::Ptr& player, const MWWorld::Ptr& targetContainer) = 0;
 
-            /// List the owners that the player has stolen this item from (the owner can be an NPC or a faction).
-            /// <Owner, item count>
-            virtual std::vector<std::pair<std::string, int> > getStolenItemOwners(const std::string& itemid) = 0;
+        /// List the owners that the player has stolen this item from (the owner can be an NPC or a faction).
+        /// <Owner, item count>
+        virtual std::vector<std::pair<std::string, int>> getStolenItemOwners(const std::string& itemid) = 0;
 
-            /// Has the player stolen this item from the given owner?
-            virtual bool isItemStolenFrom(const std::string& itemid, const MWWorld::Ptr& ptr) = 0;
+        /// Has the player stolen this item from the given owner?
+        virtual bool isItemStolenFrom(const std::string& itemid, const MWWorld::Ptr& ptr) = 0;
 
-            virtual bool isBoundItem(const MWWorld::Ptr& item) = 0;
-            virtual bool isAllowedToUse (const MWWorld::Ptr& ptr, const MWWorld::Ptr& target, MWWorld::Ptr& victim) = 0;
+        virtual bool isBoundItem(const MWWorld::Ptr& item) = 0;
+        virtual bool isAllowedToUse(const MWWorld::Ptr& ptr, const MWWorld::Ptr& target, MWWorld::Ptr& victim) = 0;
 
-            /// Turn actor into werewolf or normal form.
-            virtual void setWerewolf(const MWWorld::Ptr& actor, bool werewolf) = 0;
+        /// Turn actor into werewolf or normal form.
+        virtual void setWerewolf(const MWWorld::Ptr& actor, bool werewolf) = 0;
 
-            /// Sets the NPC's Acrobatics skill to match the fWerewolfAcrobatics GMST.
-            /// It only applies to the current form the NPC is in.
-            virtual void applyWerewolfAcrobatics(const MWWorld::Ptr& actor) = 0;
+        /// Sets the NPC's Acrobatics skill to match the fWerewolfAcrobatics GMST.
+        /// It only applies to the current form the NPC is in.
+        virtual void applyWerewolfAcrobatics(const MWWorld::Ptr& actor) = 0;
 
-            virtual void cleanupSummonedCreature(const MWWorld::Ptr& caster, int creatureActorId) = 0;
+        virtual void cleanupSummonedCreature(const MWWorld::Ptr& caster, int creatureActorId) = 0;
 
-            virtual void confiscateStolenItemToOwner(const MWWorld::Ptr &player, const MWWorld::Ptr &item, const MWWorld::Ptr& victim, int count) = 0;
-            virtual bool isAttackPreparing(const MWWorld::Ptr& ptr) = 0;
-            virtual bool isRunning(const MWWorld::Ptr& ptr) = 0;
-            virtual bool isSneaking(const MWWorld::Ptr& ptr) = 0;
+        virtual void confiscateStolenItemToOwner(
+            const MWWorld::Ptr& player, const MWWorld::Ptr& item, const MWWorld::Ptr& victim, int count)
+            = 0;
+        virtual bool isAttackPreparing(const MWWorld::Ptr& ptr) = 0;
+        virtual bool isRunning(const MWWorld::Ptr& ptr) = 0;
+        virtual bool isSneaking(const MWWorld::Ptr& ptr) = 0;
 
-            virtual void reportStats(unsigned int frameNumber, osg::Stats& stats) const = 0;
+        virtual void reportStats(unsigned int frameNumber, osg::Stats& stats) const = 0;
 
-            virtual int getGreetingTimer(const MWWorld::Ptr& ptr) const = 0;
-            virtual float getAngleToPlayer(const MWWorld::Ptr& ptr) const  = 0;
-            virtual MWMechanics::GreetingState getGreetingState(const MWWorld::Ptr& ptr) const = 0;
-            virtual bool isTurningToPlayer(const MWWorld::Ptr& ptr) const = 0;
+        virtual int getGreetingTimer(const MWWorld::Ptr& ptr) const = 0;
+        virtual float getAngleToPlayer(const MWWorld::Ptr& ptr) const = 0;
+        virtual MWMechanics::GreetingState getGreetingState(const MWWorld::Ptr& ptr) const = 0;
+        virtual bool isTurningToPlayer(const MWWorld::Ptr& ptr) const = 0;
     };
 }
 
diff --git a/apps/openmw/mwbase/scriptmanager.hpp b/apps/openmw/mwbase/scriptmanager.hpp
index be62722139..b727de87c2 100644
--- a/apps/openmw/mwbase/scriptmanager.hpp
+++ b/apps/openmw/mwbase/scriptmanager.hpp
@@ -24,38 +24,37 @@ namespace MWBase
     /// \brief Interface for script manager (implemented in MWScript)
     class ScriptManager
     {
-            ScriptManager (const ScriptManager&);
-            ///< not implemented
+        ScriptManager(const ScriptManager&);
+        ///< not implemented
 
-            ScriptManager& operator= (const ScriptManager&);
-            ///< not implemented
+        ScriptManager& operator=(const ScriptManager&);
+        ///< not implemented
 
-        public:
+    public:
+        ScriptManager() {}
 
-            ScriptManager() {}
+        virtual ~ScriptManager() {}
 
-            virtual ~ScriptManager() {}
+        virtual void clear() = 0;
 
-            virtual void clear() = 0;
+        virtual bool run(std::string_view name, Interpreter::Context& interpreterContext) = 0;
+        ///< Run the script with the given name (compile first, if not compiled yet)
 
-            virtual bool run(std::string_view name, Interpreter::Context& interpreterContext) = 0;
-            ///< Run the script with the given name (compile first, if not compiled yet)
+        virtual bool compile(std::string_view name) = 0;
+        ///< Compile script with the given namen
+        /// \return Success?
 
-            virtual bool compile(std::string_view name) = 0;
-            ///< Compile script with the given namen
-            /// \return Success?
+        virtual std::pair<int, int> compileAll() = 0;
+        ///< Compile all scripts
+        /// \return count, success
 
-            virtual std::pair<int, int> compileAll() = 0;
-            ///< Compile all scripts
-            /// \return count, success
+        virtual const Compiler::Locals& getLocals(std::string_view name) = 0;
+        ///< Return locals for script \a name.
 
-            virtual const Compiler::Locals& getLocals(std::string_view name) = 0;
-            ///< Return locals for script \a name.
+        virtual MWScript::GlobalScripts& getGlobalScripts() = 0;
 
-            virtual MWScript::GlobalScripts& getGlobalScripts() = 0;
-
-            virtual const Compiler::Extensions& getExtensions() const = 0;
-   };
+        virtual const Compiler::Extensions& getExtensions() const = 0;
+    };
 }
 
 #endif
diff --git a/apps/openmw/mwbase/soundmanager.hpp b/apps/openmw/mwbase/soundmanager.hpp
index a60ed78154..4035a89abb 100644
--- a/apps/openmw/mwbase/soundmanager.hpp
+++ b/apps/openmw/mwbase/soundmanager.hpp
@@ -2,12 +2,12 @@
 #define GAME_MWBASE_SOUNDMANAGER_H
 
 #include <memory>
+#include <set>
 #include <string>
 #include <string_view>
-#include <set>
 
-#include "../mwworld/ptr.hpp"
 #include "../mwsound/type.hpp"
+#include "../mwworld/ptr.hpp"
 
 namespace MWWorld
 {
@@ -30,30 +30,43 @@ namespace MWSound
     typedef std::shared_ptr<Sound_Decoder> DecoderPtr;
 
     /* These must all fit together */
-    enum class PlayMode {
-        Normal  = 0, /* non-looping, affected by environment */
-        Loop    = 1<<0, /* Sound will continually loop until explicitly stopped */
-        NoEnv   = 1<<1, /* Do not apply environment effects (eg, underwater filters) */
-        RemoveAtDistance = 1<<2, /* (3D only) If the listener gets further than 2000 units away
-                                  * from the sound source, the sound is removed.
-                                  * This is weird stuff but apparently how vanilla works for sounds
-                                  * played by the PlayLoopSound family of script functions. Perhaps
-                                  * we can make this cut off a more subtle fade later, but have to
-                                  * be careful to not change the overall volume of areas by too
-                                  * much. */
-        NoPlayerLocal = 1<<3, /* (3D only) Don't play the sound local to the listener even if the
-                               * player is making it. */
-        NoScaling = 1<<4, /* Don't scale audio with simulation time */
+    enum class PlayMode
+    {
+        Normal = 0, /* non-looping, affected by environment */
+        Loop = 1 << 0, /* Sound will continually loop until explicitly stopped */
+        NoEnv = 1 << 1, /* Do not apply environment effects (eg, underwater filters) */
+        RemoveAtDistance = 1 << 2, /* (3D only) If the listener gets further than 2000 units away
+                                    * from the sound source, the sound is removed.
+                                    * This is weird stuff but apparently how vanilla works for sounds
+                                    * played by the PlayLoopSound family of script functions. Perhaps
+                                    * we can make this cut off a more subtle fade later, but have to
+                                    * be careful to not change the overall volume of areas by too
+                                    * much. */
+        NoPlayerLocal = 1 << 3, /* (3D only) Don't play the sound local to the listener even if the
+                                 * player is making it. */
+        NoScaling = 1 << 4, /* Don't scale audio with simulation time */
         NoEnvNoScaling = NoEnv | NoScaling,
         LoopNoEnv = Loop | NoEnv,
         LoopRemoveAtDistance = Loop | RemoveAtDistance
     };
 
     // Used for creating a type mask for SoundManager::pauseSounds and resumeSounds
-    inline int operator~(Type a) { return ~static_cast<int>(a); }
-    inline int operator&(Type a, Type b) { return static_cast<int>(a) & static_cast<int>(b); }
-    inline int operator&(int a, Type b) { return a & static_cast<int>(b); }
-    inline int operator|(Type a, Type b) { return static_cast<int>(a) | static_cast<int>(b); }
+    inline int operator~(Type a)
+    {
+        return ~static_cast<int>(a);
+    }
+    inline int operator&(Type a, Type b)
+    {
+        return static_cast<int>(a) & static_cast<int>(b);
+    }
+    inline int operator&(int a, Type b)
+    {
+        return a & static_cast<int>(b);
+    }
+    inline int operator|(Type a, Type b)
+    {
+        return static_cast<int>(a) | static_cast<int>(b);
+    }
 }
 
 namespace MWBase
@@ -64,131 +77,135 @@ namespace MWBase
     /// \brief Interface for sound manager (implemented in MWSound)
     class SoundManager
     {
-            SoundManager (const SoundManager&);
-            ///< not implemented
+        SoundManager(const SoundManager&);
+        ///< not implemented
 
-            SoundManager& operator= (const SoundManager&);
-            ///< not implemented
+        SoundManager& operator=(const SoundManager&);
+        ///< not implemented
 
-        protected:
-            using PlayMode = MWSound::PlayMode;
-            using Type = MWSound::Type;
+    protected:
+        using PlayMode = MWSound::PlayMode;
+        using Type = MWSound::Type;
 
-            float mSimulationTimeScale = 1.0;
+        float mSimulationTimeScale = 1.0;
 
-        public:
-            SoundManager() {}
-            virtual ~SoundManager() {}
+    public:
+        SoundManager() {}
+        virtual ~SoundManager() {}
 
-            virtual void processChangedSettings(const std::set< std::pair<std::string, std::string> >& settings) = 0;
+        virtual void processChangedSettings(const std::set<std::pair<std::string, std::string>>& settings) = 0;
 
-            virtual void stopMusic() = 0;
-            ///< Stops music if it's playing
+        virtual void stopMusic() = 0;
+        ///< Stops music if it's playing
 
-            virtual void streamMusic(const std::string& filename) = 0;
-            ///< Play a soundifle
-            /// \param filename name of a sound file in "Music/" in the data directory.
+        virtual void streamMusic(const std::string& filename) = 0;
+        ///< Play a soundifle
+        /// \param filename name of a sound file in "Music/" in the data directory.
 
-            virtual bool isMusicPlaying() = 0;
-            ///< Returns true if music is playing
+        virtual bool isMusicPlaying() = 0;
+        ///< Returns true if music is playing
 
-            virtual void playPlaylist(const std::string &playlist) = 0;
-            ///< Start playing music from the selected folder
-            /// \param name of the folder that contains the playlist
+        virtual void playPlaylist(const std::string& playlist) = 0;
+        ///< Start playing music from the selected folder
+        /// \param name of the folder that contains the playlist
 
-            virtual void playTitleMusic() = 0;
-            ///< Start playing title music
+        virtual void playTitleMusic() = 0;
+        ///< Start playing title music
 
-            virtual void say(const MWWorld::ConstPtr &reference, const std::string& filename) = 0;
-            ///< Make an actor say some text.
-            /// \param filename name of a sound file in "Sound/" in the data directory.
+        virtual void say(const MWWorld::ConstPtr& reference, const std::string& filename) = 0;
+        ///< Make an actor say some text.
+        /// \param filename name of a sound file in "Sound/" in the data directory.
 
-            virtual void say(const std::string& filename) = 0;
-            ///< Say some text, without an actor ref
-            /// \param filename name of a sound file in "Sound/" in the data directory.
+        virtual void say(const std::string& filename) = 0;
+        ///< Say some text, without an actor ref
+        /// \param filename name of a sound file in "Sound/" in the data directory.
 
-            virtual bool sayActive(const MWWorld::ConstPtr &reference=MWWorld::ConstPtr()) const = 0;
-            ///< Is actor not speaking?
+        virtual bool sayActive(const MWWorld::ConstPtr& reference = MWWorld::ConstPtr()) const = 0;
+        ///< Is actor not speaking?
 
-            virtual bool sayDone(const MWWorld::ConstPtr &reference=MWWorld::ConstPtr()) const = 0;
-            ///< For scripting backward compatibility
+        virtual bool sayDone(const MWWorld::ConstPtr& reference = MWWorld::ConstPtr()) const = 0;
+        ///< For scripting backward compatibility
 
-            virtual void stopSay(const MWWorld::ConstPtr &reference=MWWorld::ConstPtr()) = 0;
-            ///< Stop an actor speaking
+        virtual void stopSay(const MWWorld::ConstPtr& reference = MWWorld::ConstPtr()) = 0;
+        ///< Stop an actor speaking
 
-            virtual float getSaySoundLoudness(const MWWorld::ConstPtr& reference) const = 0;
-            ///< Check the currently playing say sound for this actor
-            /// and get an average loudness value (scale [0,1]) at the current time position.
-            /// If the actor is not saying anything, returns 0.
+        virtual float getSaySoundLoudness(const MWWorld::ConstPtr& reference) const = 0;
+        ///< Check the currently playing say sound for this actor
+        /// and get an average loudness value (scale [0,1]) at the current time position.
+        /// If the actor is not saying anything, returns 0.
 
-            virtual SoundStream *playTrack(const MWSound::DecoderPtr& decoder, Type type) = 0;
-            ///< Play a 2D audio track, using a custom decoder. The caller is expected to call
-            /// stopTrack with the returned handle when done.
+        virtual SoundStream* playTrack(const MWSound::DecoderPtr& decoder, Type type) = 0;
+        ///< Play a 2D audio track, using a custom decoder. The caller is expected to call
+        /// stopTrack with the returned handle when done.
 
-            virtual void stopTrack(SoundStream *stream) = 0;
-            ///< Stop the given audio track from playing
+        virtual void stopTrack(SoundStream* stream) = 0;
+        ///< Stop the given audio track from playing
 
-            virtual double getTrackTimeDelay(SoundStream *stream) = 0;
-            ///< Retives the time delay, in seconds, of the audio track (must be a sound
-            /// returned by \ref playTrack). Only intended to be called by the track
-            /// decoder's read method.
+        virtual double getTrackTimeDelay(SoundStream* stream) = 0;
+        ///< Retives the time delay, in seconds, of the audio track (must be a sound
+        /// returned by \ref playTrack). Only intended to be called by the track
+        /// decoder's read method.
 
-            virtual Sound *playSound(std::string_view soundId, float volume, float pitch,
-                                     Type type=Type::Sfx, PlayMode mode=PlayMode::Normal,
-                                     float offset=0) = 0;
-            ///< Play a sound, independently of 3D-position
-            ///< @param offset Number of seconds into the sound to start playback.
+        virtual Sound* playSound(std::string_view soundId, float volume, float pitch, Type type = Type::Sfx,
+            PlayMode mode = PlayMode::Normal, float offset = 0)
+            = 0;
+        ///< Play a sound, independently of 3D-position
+        ///< @param offset Number of seconds into the sound to start playback.
 
-            virtual Sound *playSound3D(const MWWorld::ConstPtr &reference, std::string_view soundId,
-                                       float volume, float pitch, Type type=Type::Sfx,
-                                       PlayMode mode=PlayMode::Normal, float offset=0) = 0;
-            ///< Play a 3D sound attached to an MWWorld::Ptr. Will be updated automatically with the Ptr's position, unless Play_NoTrack is specified.
-            ///< @param offset Number of seconds into the sound to start playback.
+        virtual Sound* playSound3D(const MWWorld::ConstPtr& reference, std::string_view soundId, float volume,
+            float pitch, Type type = Type::Sfx, PlayMode mode = PlayMode::Normal, float offset = 0)
+            = 0;
+        ///< Play a 3D sound attached to an MWWorld::Ptr. Will be updated automatically with the Ptr's position, unless
+        ///< Play_NoTrack is specified.
+        ///< @param offset Number of seconds into the sound to start playback.
 
-            virtual Sound *playSound3D(const osg::Vec3f& initialPos, std::string_view soundId,
-                                       float volume, float pitch, Type type=Type::Sfx,
-                                       PlayMode mode=PlayMode::Normal, float offset=0) = 0;
-            ///< Play a 3D sound at \a initialPos. If the sound should be moving, it must be updated using Sound::setPosition.
+        virtual Sound* playSound3D(const osg::Vec3f& initialPos, std::string_view soundId, float volume, float pitch,
+            Type type = Type::Sfx, PlayMode mode = PlayMode::Normal, float offset = 0)
+            = 0;
+        ///< Play a 3D sound at \a initialPos. If the sound should be moving, it must be updated using
+        ///< Sound::setPosition.
 
-            virtual void stopSound(Sound *sound) = 0;
-            ///< Stop the given sound from playing
+        virtual void stopSound(Sound* sound) = 0;
+        ///< Stop the given sound from playing
 
-            virtual void stopSound3D(const MWWorld::ConstPtr &reference, std::string_view soundId) = 0;
-            ///< Stop the given object from playing the given sound,
+        virtual void stopSound3D(const MWWorld::ConstPtr& reference, std::string_view soundId) = 0;
+        ///< Stop the given object from playing the given sound,
 
-            virtual void stopSound3D(const MWWorld::ConstPtr &reference) = 0;
-            ///< Stop the given object from playing all sounds.
+        virtual void stopSound3D(const MWWorld::ConstPtr& reference) = 0;
+        ///< Stop the given object from playing all sounds.
 
-            virtual void stopSound(const MWWorld::CellStore *cell) = 0;
-            ///< Stop all sounds for the given cell.
+        virtual void stopSound(const MWWorld::CellStore* cell) = 0;
+        ///< Stop all sounds for the given cell.
 
-            virtual void fadeOutSound3D(const MWWorld::ConstPtr &reference, std::string_view soundId, float duration) = 0;
-            ///< Fade out given sound (that is already playing) of given object
-            ///< @param reference Reference to object, whose sound is faded out
-            ///< @param soundId ID of the sound to fade out.
-            ///< @param duration Time until volume reaches 0.
+        virtual void fadeOutSound3D(const MWWorld::ConstPtr& reference, std::string_view soundId, float duration) = 0;
+        ///< Fade out given sound (that is already playing) of given object
+        ///< @param reference Reference to object, whose sound is faded out
+        ///< @param soundId ID of the sound to fade out.
+        ///< @param duration Time until volume reaches 0.
 
-            virtual bool getSoundPlaying(const MWWorld::ConstPtr &reference, std::string_view soundId) const = 0;
-            ///< Is the given sound currently playing on the given object?
-            ///  If you want to check if sound played with playSound is playing, use empty Ptr
+        virtual bool getSoundPlaying(const MWWorld::ConstPtr& reference, std::string_view soundId) const = 0;
+        ///< Is the given sound currently playing on the given object?
+        ///  If you want to check if sound played with playSound is playing, use empty Ptr
 
-            virtual void pauseSounds(MWSound::BlockerType blocker, int types=int(Type::Mask)) = 0;
-            ///< Pauses all currently playing sounds, including music.
+        virtual void pauseSounds(MWSound::BlockerType blocker, int types = int(Type::Mask)) = 0;
+        ///< Pauses all currently playing sounds, including music.
 
-            virtual void resumeSounds(MWSound::BlockerType blocker) = 0;
-            ///< Resumes all previously paused sounds.
+        virtual void resumeSounds(MWSound::BlockerType blocker) = 0;
+        ///< Resumes all previously paused sounds.
 
-            virtual void pausePlayback() = 0;
-            virtual void resumePlayback() = 0;
+        virtual void pausePlayback() = 0;
+        virtual void resumePlayback() = 0;
 
-            virtual void setListenerPosDir(const osg::Vec3f &pos, const osg::Vec3f &dir, const osg::Vec3f &up, bool underwater) = 0;
+        virtual void setListenerPosDir(
+            const osg::Vec3f& pos, const osg::Vec3f& dir, const osg::Vec3f& up, bool underwater)
+            = 0;
 
-            virtual void updatePtr(const MWWorld::ConstPtr& old, const MWWorld::ConstPtr& updated) = 0;
+        virtual void updatePtr(const MWWorld::ConstPtr& old, const MWWorld::ConstPtr& updated) = 0;
 
-            void setSimulationTimeScale(float scale) { mSimulationTimeScale = scale; }
-            float getSimulationTimeScale() const { return mSimulationTimeScale; }
+        void setSimulationTimeScale(float scale) { mSimulationTimeScale = scale; }
+        float getSimulationTimeScale() const { return mSimulationTimeScale; }
 
-            virtual void clear() = 0;
+        virtual void clear() = 0;
     };
 }
 
diff --git a/apps/openmw/mwbase/statemanager.hpp b/apps/openmw/mwbase/statemanager.hpp
index df4df0943d..264549a82a 100644
--- a/apps/openmw/mwbase/statemanager.hpp
+++ b/apps/openmw/mwbase/statemanager.hpp
@@ -15,77 +15,74 @@ namespace MWBase
     /// \brief Interface for game state manager (implemented in MWState)
     class StateManager
     {
-        public:
+    public:
+        enum State
+        {
+            State_NoGame,
+            State_Ended,
+            State_Running
+        };
 
-            enum State
-            {
-                State_NoGame,
-                State_Ended,
-                State_Running
-            };
+        typedef std::list<MWState::Character>::const_iterator CharacterIterator;
 
-            typedef std::list<MWState::Character>::const_iterator CharacterIterator;
+    private:
+        StateManager(const StateManager&);
+        ///< not implemented
 
-        private:
+        StateManager& operator=(const StateManager&);
+        ///< not implemented
 
-            StateManager (const StateManager&);
-            ///< not implemented
+    public:
+        StateManager() {}
 
-            StateManager& operator= (const StateManager&);
-            ///< not implemented
+        virtual ~StateManager() {}
 
-        public:
+        virtual void requestQuit() = 0;
 
-            StateManager() {}
+        virtual bool hasQuitRequest() const = 0;
 
-            virtual ~StateManager() {}
+        virtual void askLoadRecent() = 0;
 
-            virtual void requestQuit() = 0;
+        virtual State getState() const = 0;
 
-            virtual bool hasQuitRequest() const = 0;
+        virtual void newGame(bool bypass = false) = 0;
+        ///< Start a new game.
+        ///
+        /// \param bypass Skip new game mechanics.
 
-            virtual void askLoadRecent() = 0;
+        virtual void resumeGame() = 0;
 
-            virtual State getState() const = 0;
+        virtual void deleteGame(const MWState::Character* character, const MWState::Slot* slot) = 0;
 
-            virtual void newGame (bool bypass = false) = 0;
-            ///< Start a new game.
-            ///
-            /// \param bypass Skip new game mechanics.
+        virtual void saveGame(const std::string& description, const MWState::Slot* slot = nullptr) = 0;
+        ///< Write a saved game to \a slot or create a new slot if \a slot == 0.
+        ///
+        /// \note Slot must belong to the current character.
 
-            virtual void resumeGame() = 0;
+        virtual void loadGame(const std::filesystem::path& filepath) = 0;
+        ///< Load a saved game directly from the given file path. This will search the CharacterManager
+        /// for a Character containing this save file, and set this Character current if one was found.
+        /// Otherwise, a new Character will be created.
 
-            virtual void deleteGame (const MWState::Character *character, const MWState::Slot *slot) = 0;
+        virtual void loadGame(const MWState::Character* character, const std::filesystem::path& filepath) = 0;
+        ///< Load a saved game file belonging to the given character.
 
-            virtual void saveGame (const std::string& description, const MWState::Slot *slot = nullptr) = 0;
-            ///< Write a saved game to \a slot or create a new slot if \a slot == 0.
-            ///
-            /// \note Slot must belong to the current character.
+        /// Simple saver, writes over the file if already existing
+        /** Used for quick save and autosave **/
+        virtual void quickSave(std::string = "Quicksave") = 0;
 
-            virtual void loadGame (const std::filesystem::path &filepath) = 0;
-            ///< Load a saved game directly from the given file path. This will search the CharacterManager
-            /// for a Character containing this save file, and set this Character current if one was found.
-            /// Otherwise, a new Character will be created.
+        /// Simple loader, loads the last saved file
+        /** Used for quickload **/
+        virtual void quickLoad() = 0;
 
-            virtual void loadGame (const MWState::Character *character, const std::filesystem::path &filepath) = 0;
-            ///< Load a saved game file belonging to the given character.
+        virtual MWState::Character* getCurrentCharacter() = 0;
+        ///< @note May return null.
 
-            ///Simple saver, writes over the file if already existing
-            /** Used for quick save and autosave **/
-            virtual void quickSave(std::string = "Quicksave")=0;
+        virtual CharacterIterator characterBegin() = 0;
+        ///< Any call to SaveGame and getCurrentCharacter can invalidate the returned
+        /// iterator.
 
-            ///Simple loader, loads the last saved file
-            /** Used for quickload **/
-            virtual void quickLoad()=0;
-
-            virtual MWState::Character *getCurrentCharacter () = 0;
-            ///< @note May return null.
-
-            virtual CharacterIterator characterBegin() = 0;
-            ///< Any call to SaveGame and getCurrentCharacter can invalidate the returned
-            /// iterator.
-
-            virtual CharacterIterator characterEnd() = 0;
+        virtual CharacterIterator characterEnd() = 0;
     };
 }
 
diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index efca05d0cd..77d8de6c48 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -2,11 +2,11 @@
 #define GAME_MWBASE_WINDOWMANAGER_H
 
 #include <cstdint>
-#include <string>
-#include <vector>
 #include <map>
-#include <set>
 #include <memory>
+#include <set>
+#include <string>
+#include <vector>
 
 #include <MyGUI_KeyCode.h>
 
@@ -41,7 +41,7 @@ namespace ESM
 namespace MWMechanics
 {
     class AttributeValue;
-    template<typename T>
+    template <typename T>
     class DynamicStat;
     class SkillValue;
 }
@@ -73,7 +73,8 @@ namespace MWGui
     class MessageBox;
     class PostProcessorHud;
 
-    enum ShowInDialogueMode {
+    enum ShowInDialogueMode
+    {
         ShowInDialogueMode_IfPossible,
         ShowInDialogueMode_Only,
         ShowInDialogueMode_Never
@@ -92,282 +93,288 @@ namespace MWBase
     /// \brief Interface for widnow manager (implemented in MWGui)
     class WindowManager : public SDLUtil::WindowListener
     {
-            WindowManager (const WindowManager&);
-            ///< not implemented
-
-            WindowManager& operator= (const WindowManager&);
-            ///< not implemented
+        WindowManager(const WindowManager&);
+        ///< not implemented
 
-        public:
+        WindowManager& operator=(const WindowManager&);
+        ///< not implemented
 
-            typedef std::vector<int> SkillList;
+    public:
+        typedef std::vector<int> SkillList;
 
-            WindowManager() {}
+        WindowManager() {}
 
-            virtual ~WindowManager() {}
+        virtual ~WindowManager() {}
 
-            /// @note This method will block until the video finishes playing
-            /// (and will continually update the window while doing so)
-            virtual void playVideo(std::string_view name, bool allowSkipping, bool overrideSounds = true) = 0;
+        /// @note This method will block until the video finishes playing
+        /// (and will continually update the window while doing so)
+        virtual void playVideo(std::string_view name, bool allowSkipping, bool overrideSounds = true) = 0;
 
-            virtual void setNewGame(bool newgame) = 0;
+        virtual void setNewGame(bool newgame) = 0;
 
-            virtual void pushGuiMode (MWGui::GuiMode mode, const MWWorld::Ptr& arg) = 0;
-            virtual void pushGuiMode (MWGui::GuiMode mode) = 0;
-            virtual void popGuiMode(bool noSound=false) = 0;
+        virtual void pushGuiMode(MWGui::GuiMode mode, const MWWorld::Ptr& arg) = 0;
+        virtual void pushGuiMode(MWGui::GuiMode mode) = 0;
+        virtual void popGuiMode(bool noSound = false) = 0;
 
-            virtual void removeGuiMode (MWGui::GuiMode mode, bool noSound=false) = 0;
-            ///< can be anywhere in the stack
+        virtual void removeGuiMode(MWGui::GuiMode mode, bool noSound = false) = 0;
+        ///< can be anywhere in the stack
 
-            virtual void goToJail(int days) = 0;
+        virtual void goToJail(int days) = 0;
 
-            virtual void updatePlayer() = 0;
+        virtual void updatePlayer() = 0;
 
-            virtual MWGui::GuiMode getMode() const = 0;
-            virtual bool containsMode(MWGui::GuiMode) const = 0;
+        virtual MWGui::GuiMode getMode() const = 0;
+        virtual bool containsMode(MWGui::GuiMode) const = 0;
 
-            virtual bool isGuiMode() const = 0;
+        virtual bool isGuiMode() const = 0;
 
-            virtual bool isConsoleMode() const = 0;
+        virtual bool isConsoleMode() const = 0;
 
-            virtual bool isPostProcessorHudVisible() const = 0;
+        virtual bool isPostProcessorHudVisible() const = 0;
 
-            virtual void toggleVisible (MWGui::GuiWindow wnd) = 0;
+        virtual void toggleVisible(MWGui::GuiWindow wnd) = 0;
 
-            virtual void forceHide(MWGui::GuiWindow wnd) = 0;
-            virtual void unsetForceHide(MWGui::GuiWindow wnd) = 0;
+        virtual void forceHide(MWGui::GuiWindow wnd) = 0;
+        virtual void unsetForceHide(MWGui::GuiWindow wnd) = 0;
 
-            /// Disallow all inventory mode windows
-            virtual void disallowAll() = 0;
+        /// Disallow all inventory mode windows
+        virtual void disallowAll() = 0;
 
-            /// Allow one or more windows
-            virtual void allow (MWGui::GuiWindow wnd) = 0;
+        /// Allow one or more windows
+        virtual void allow(MWGui::GuiWindow wnd) = 0;
 
-            virtual bool isAllowed (MWGui::GuiWindow wnd) const = 0;
+        virtual bool isAllowed(MWGui::GuiWindow wnd) const = 0;
 
-            /// \todo investigate, if we really need to expose every single lousy UI element to the outside world
-            virtual MWGui::InventoryWindow* getInventoryWindow() = 0;
-            virtual MWGui::CountDialog* getCountDialog() = 0;
-            virtual MWGui::ConfirmationDialog* getConfirmationDialog() = 0;
-            virtual MWGui::TradeWindow* getTradeWindow() = 0;
-            virtual const std::vector<std::unique_ptr<MWGui::MessageBox>>& getActiveMessageBoxes() const = 0;
-            virtual MWGui::PostProcessorHud* getPostProcessorHud() = 0;
+        /// \todo investigate, if we really need to expose every single lousy UI element to the outside world
+        virtual MWGui::InventoryWindow* getInventoryWindow() = 0;
+        virtual MWGui::CountDialog* getCountDialog() = 0;
+        virtual MWGui::ConfirmationDialog* getConfirmationDialog() = 0;
+        virtual MWGui::TradeWindow* getTradeWindow() = 0;
+        virtual const std::vector<std::unique_ptr<MWGui::MessageBox>>& getActiveMessageBoxes() const = 0;
+        virtual MWGui::PostProcessorHud* getPostProcessorHud() = 0;
 
-            /// Make the player use an item, while updating GUI state accordingly
-            virtual void useItem(const MWWorld::Ptr& item, bool force=false) = 0;
+        /// Make the player use an item, while updating GUI state accordingly
+        virtual void useItem(const MWWorld::Ptr& item, bool force = false) = 0;
 
-            virtual void updateSpellWindow() = 0;
+        virtual void updateSpellWindow() = 0;
 
-            virtual void setConsoleSelectedObject(const MWWorld::Ptr& object) = 0;
-            virtual void setConsoleMode(const std::string& mode) = 0;
+        virtual void setConsoleSelectedObject(const MWWorld::Ptr& object) = 0;
+        virtual void setConsoleMode(const std::string& mode) = 0;
 
-            static constexpr std::string_view sConsoleColor_Default = "#FFFFFF";
-            static constexpr std::string_view sConsoleColor_Error = "#FF2222";
-            static constexpr std::string_view sConsoleColor_Success = "#FF00FF";
-            static constexpr std::string_view sConsoleColor_Info = "#AAAAAA";
-            virtual void printToConsole(const std::string& msg, std::string_view color) = 0;
+        static constexpr std::string_view sConsoleColor_Default = "#FFFFFF";
+        static constexpr std::string_view sConsoleColor_Error = "#FF2222";
+        static constexpr std::string_view sConsoleColor_Success = "#FF00FF";
+        static constexpr std::string_view sConsoleColor_Info = "#AAAAAA";
+        virtual void printToConsole(const std::string& msg, std::string_view color) = 0;
 
-            /// Set time left for the player to start drowning (update the drowning bar)
-            /// @param time time left to start drowning
-            /// @param maxTime how long we can be underwater (in total) until drowning starts
-            virtual void setDrowningTimeLeft (float time, float maxTime) = 0;
+        /// Set time left for the player to start drowning (update the drowning bar)
+        /// @param time time left to start drowning
+        /// @param maxTime how long we can be underwater (in total) until drowning starts
+        virtual void setDrowningTimeLeft(float time, float maxTime) = 0;
 
-            virtual void changeCell(const MWWorld::CellStore* cell) = 0;
-            ///< change the active cell
+        virtual void changeCell(const MWWorld::CellStore* cell) = 0;
+        ///< change the active cell
 
-            virtual void setFocusObject(const MWWorld::Ptr& focus) = 0;
-            virtual void setFocusObjectScreenCoords(float min_x, float min_y, float max_x, float max_y) = 0;
+        virtual void setFocusObject(const MWWorld::Ptr& focus) = 0;
+        virtual void setFocusObjectScreenCoords(float min_x, float min_y, float max_x, float max_y) = 0;
 
-            virtual void setCursorVisible(bool visible) = 0;
-            virtual void setCursorActive(bool active) = 0;
-            virtual void getMousePosition(int &x, int &y) = 0;
-            virtual void getMousePosition(float &x, float &y) = 0;
-            virtual void setDragDrop(bool dragDrop) = 0;
-            virtual bool getWorldMouseOver() = 0;
+        virtual void setCursorVisible(bool visible) = 0;
+        virtual void setCursorActive(bool active) = 0;
+        virtual void getMousePosition(int& x, int& y) = 0;
+        virtual void getMousePosition(float& x, float& y) = 0;
+        virtual void setDragDrop(bool dragDrop) = 0;
+        virtual bool getWorldMouseOver() = 0;
 
-            virtual float getScalingFactor() const = 0;
+        virtual float getScalingFactor() const = 0;
 
-            virtual bool toggleFogOfWar() = 0;
+        virtual bool toggleFogOfWar() = 0;
 
-            virtual bool toggleFullHelp() = 0;
-            ///< show extra info in item tooltips (owner, script)
+        virtual bool toggleFullHelp() = 0;
+        ///< show extra info in item tooltips (owner, script)
 
-            virtual bool getFullHelp() const = 0;
+        virtual bool getFullHelp() const = 0;
 
-            virtual void setActiveMap(int x, int y, bool interior) = 0;
-            ///< set the indices of the map texture that should be used
+        virtual void setActiveMap(int x, int y, bool interior) = 0;
+        ///< set the indices of the map texture that should be used
 
-            /// sets the visibility of the drowning bar
-            virtual void setDrowningBarVisibility(bool visible) = 0;
+        /// sets the visibility of the drowning bar
+        virtual void setDrowningBarVisibility(bool visible) = 0;
 
-            /// sets the visibility of the hud health/magicka/stamina bars
-            virtual void setHMSVisibility(bool visible) = 0;
+        /// sets the visibility of the hud health/magicka/stamina bars
+        virtual void setHMSVisibility(bool visible) = 0;
 
-            /// sets the visibility of the hud minimap
-            virtual void setMinimapVisibility(bool visible) = 0;
-            virtual void setWeaponVisibility(bool visible) = 0;
-            virtual void setSpellVisibility(bool visible) = 0;
-            virtual void setSneakVisibility(bool visible) = 0;
+        /// sets the visibility of the hud minimap
+        virtual void setMinimapVisibility(bool visible) = 0;
+        virtual void setWeaponVisibility(bool visible) = 0;
+        virtual void setSpellVisibility(bool visible) = 0;
+        virtual void setSneakVisibility(bool visible) = 0;
 
-            /// activate selected quick key
-            virtual void activateQuickKey (int index) = 0;
-            /// update activated quick key state (if action executing was delayed for some reason)
-            virtual void updateActivatedQuickKey () = 0;
+        /// activate selected quick key
+        virtual void activateQuickKey(int index) = 0;
+        /// update activated quick key state (if action executing was delayed for some reason)
+        virtual void updateActivatedQuickKey() = 0;
 
-            virtual const std::string& getSelectedSpell() = 0;
-            virtual void setSelectedSpell(const std::string& spellId, int successChancePercent) = 0;
-            virtual void setSelectedEnchantItem(const MWWorld::Ptr& item) = 0;
-            virtual const MWWorld::Ptr& getSelectedEnchantItem() const = 0;
-            virtual void setSelectedWeapon(const MWWorld::Ptr& item) = 0;
-            virtual const MWWorld::Ptr& getSelectedWeapon() const = 0;
-            virtual int getFontHeight() const = 0;
-            virtual void unsetSelectedSpell() = 0;
-            virtual void unsetSelectedWeapon() = 0;
+        virtual const std::string& getSelectedSpell() = 0;
+        virtual void setSelectedSpell(const std::string& spellId, int successChancePercent) = 0;
+        virtual void setSelectedEnchantItem(const MWWorld::Ptr& item) = 0;
+        virtual const MWWorld::Ptr& getSelectedEnchantItem() const = 0;
+        virtual void setSelectedWeapon(const MWWorld::Ptr& item) = 0;
+        virtual const MWWorld::Ptr& getSelectedWeapon() const = 0;
+        virtual int getFontHeight() const = 0;
+        virtual void unsetSelectedSpell() = 0;
+        virtual void unsetSelectedWeapon() = 0;
 
-            virtual void showCrosshair(bool show) = 0;
-            virtual bool getSubtitlesEnabled() = 0;
-            virtual bool toggleHud() = 0;
+        virtual void showCrosshair(bool show) = 0;
+        virtual bool getSubtitlesEnabled() = 0;
+        virtual bool toggleHud() = 0;
 
-            virtual void disallowMouse() = 0;
-            virtual void allowMouse() = 0;
-            virtual void notifyInputActionBound() = 0;
+        virtual void disallowMouse() = 0;
+        virtual void allowMouse() = 0;
+        virtual void notifyInputActionBound() = 0;
 
-            virtual void addVisitedLocation(const std::string& name, int x, int y) = 0;
+        virtual void addVisitedLocation(const std::string& name, int x, int y) = 0;
 
-            /// Hides dialog and schedules dialog to be deleted.
-            virtual void removeDialog(std::unique_ptr<MWGui::Layout>&& dialog) = 0;
+        /// Hides dialog and schedules dialog to be deleted.
+        virtual void removeDialog(std::unique_ptr<MWGui::Layout>&& dialog) = 0;
 
-            ///Gracefully attempts to exit the topmost GUI mode
-            /** No guarantee of actually closing the window **/
-            virtual void exitCurrentGuiMode() = 0;
+        /// Gracefully attempts to exit the topmost GUI mode
+        /** No guarantee of actually closing the window **/
+        virtual void exitCurrentGuiMode() = 0;
 
-            virtual void messageBox(std::string_view message, enum MWGui::ShowInDialogueMode showInDialogueMode = MWGui::ShowInDialogueMode_IfPossible) = 0;
-            /// Puts message into a queue to show on the next update. Thread safe alternative for messageBox.
-            virtual void scheduleMessageBox(std::string message, enum MWGui::ShowInDialogueMode showInDialogueMode = MWGui::ShowInDialogueMode_IfPossible) = 0;
-            virtual void staticMessageBox(std::string_view message) = 0;
-            virtual void removeStaticMessageBox() = 0;
-            virtual void interactiveMessageBox(std::string_view message, const std::vector<std::string>& buttons = {}, bool block = false) = 0;
+        virtual void messageBox(std::string_view message,
+            enum MWGui::ShowInDialogueMode showInDialogueMode = MWGui::ShowInDialogueMode_IfPossible)
+            = 0;
+        /// Puts message into a queue to show on the next update. Thread safe alternative for messageBox.
+        virtual void scheduleMessageBox(std::string message,
+            enum MWGui::ShowInDialogueMode showInDialogueMode = MWGui::ShowInDialogueMode_IfPossible)
+            = 0;
+        virtual void staticMessageBox(std::string_view message) = 0;
+        virtual void removeStaticMessageBox() = 0;
+        virtual void interactiveMessageBox(
+            std::string_view message, const std::vector<std::string>& buttons = {}, bool block = false)
+            = 0;
 
-            /// returns the index of the pressed button or -1 if no button was pressed (->MessageBoxmanager->InteractiveMessageBox)
-            virtual int readPressedButton() = 0;
+        /// returns the index of the pressed button or -1 if no button was pressed
+        /// (->MessageBoxmanager->InteractiveMessageBox)
+        virtual int readPressedButton() = 0;
 
-            virtual void updateConsoleObjectPtr(const MWWorld::Ptr& currentPtr, const MWWorld::Ptr& newPtr) = 0;
+        virtual void updateConsoleObjectPtr(const MWWorld::Ptr& currentPtr, const MWWorld::Ptr& newPtr) = 0;
 
-            /**
-             * Fetches a GMST string from the store, if there is no setting with the given
-             * ID or it is not a string the default string is returned.
-             *
-             * @param id Identifier for the GMST setting, e.g. "aName"
-             * @param default Default value if the GMST setting cannot be used.
-             */
-            virtual std::string_view getGameSettingString(std::string_view id, std::string_view default_) = 0;
+        /**
+         * Fetches a GMST string from the store, if there is no setting with the given
+         * ID or it is not a string the default string is returned.
+         *
+         * @param id Identifier for the GMST setting, e.g. "aName"
+         * @param default Default value if the GMST setting cannot be used.
+         */
+        virtual std::string_view getGameSettingString(std::string_view id, std::string_view default_) = 0;
 
-            virtual void processChangedSettings(const std::set< std::pair<std::string, std::string> >& changed) = 0;
+        virtual void processChangedSettings(const std::set<std::pair<std::string, std::string>>& changed) = 0;
 
-            virtual void executeInConsole (const std::string& path) = 0;
+        virtual void executeInConsole(const std::string& path) = 0;
 
-            virtual void enableRest() = 0;
-            virtual bool getRestEnabled() = 0;
-            virtual bool getJournalAllowed() = 0; 
+        virtual void enableRest() = 0;
+        virtual bool getRestEnabled() = 0;
+        virtual bool getJournalAllowed() = 0;
 
-            virtual bool getPlayerSleeping() = 0;
-            virtual void wakeUpPlayer() = 0;
+        virtual bool getPlayerSleeping() = 0;
+        virtual void wakeUpPlayer() = 0;
 
-            virtual void showSoulgemDialog (MWWorld::Ptr item) = 0;
+        virtual void showSoulgemDialog(MWWorld::Ptr item) = 0;
 
-            virtual void changePointer (const std::string& name) = 0;
+        virtual void changePointer(const std::string& name) = 0;
 
-            virtual void setEnemy (const MWWorld::Ptr& enemy) = 0;
+        virtual void setEnemy(const MWWorld::Ptr& enemy) = 0;
 
-            virtual int getMessagesCount() const = 0;
+        virtual int getMessagesCount() const = 0;
 
-            virtual const Translation::Storage& getTranslationDataStorage() const = 0;
+        virtual const Translation::Storage& getTranslationDataStorage() const = 0;
 
-            /// Warning: do not use MyGUI::InputManager::setKeyFocusWidget directly. Instead use this.
-            virtual void setKeyFocusWidget (MyGUI::Widget* widget) = 0;
+        /// Warning: do not use MyGUI::InputManager::setKeyFocusWidget directly. Instead use this.
+        virtual void setKeyFocusWidget(MyGUI::Widget* widget) = 0;
 
-            virtual Loading::Listener* getLoadingScreen() = 0;
+        virtual Loading::Listener* getLoadingScreen() = 0;
 
-            /// Should the cursor be visible?
-            virtual bool getCursorVisible() = 0;
+        /// Should the cursor be visible?
+        virtual bool getCursorVisible() = 0;
 
-            /// Clear all savegame-specific data
-            virtual void clear() = 0;
+        /// Clear all savegame-specific data
+        virtual void clear() = 0;
 
-            virtual void write (ESM::ESMWriter& writer, Loading::Listener& progress) = 0;
-            virtual void readRecord (ESM::ESMReader& reader, uint32_t type) = 0;
-            virtual int countSavedGameRecords() const = 0;
+        virtual void write(ESM::ESMWriter& writer, Loading::Listener& progress) = 0;
+        virtual void readRecord(ESM::ESMReader& reader, uint32_t type) = 0;
+        virtual int countSavedGameRecords() const = 0;
 
-            /// Does the current stack of GUI-windows permit saving?
-            virtual bool isSavingAllowed() const = 0;
+        /// Does the current stack of GUI-windows permit saving?
+        virtual bool isSavingAllowed() const = 0;
 
-            /// Send exit command to active Modal window
-            virtual void exitCurrentModal() = 0;
+        /// Send exit command to active Modal window
+        virtual void exitCurrentModal() = 0;
 
-            /// Sets the current Modal
-            /** Used to send exit command to active Modal when Esc is pressed **/
-            virtual void addCurrentModal(MWGui::WindowModal* input) = 0;
+        /// Sets the current Modal
+        /** Used to send exit command to active Modal when Esc is pressed **/
+        virtual void addCurrentModal(MWGui::WindowModal* input) = 0;
 
-            /// Removes the top Modal
-            /** Used when one Modal adds another Modal
-                \param input Pointer to the current modal, to ensure proper modal is removed **/
-            virtual void removeCurrentModal(MWGui::WindowModal* input) = 0;
+        /// Removes the top Modal
+        /** Used when one Modal adds another Modal
+            \param input Pointer to the current modal, to ensure proper modal is removed **/
+        virtual void removeCurrentModal(MWGui::WindowModal* input) = 0;
 
-            virtual void pinWindow (MWGui::GuiWindow window) = 0;
-            virtual void toggleMaximized(MWGui::Layout *layout) = 0;
+        virtual void pinWindow(MWGui::GuiWindow window) = 0;
+        virtual void toggleMaximized(MWGui::Layout* layout) = 0;
 
-            /// Fade the screen in, over \a time seconds
-            virtual void fadeScreenIn(const float time, bool clearQueue=true, float delay=0.f) = 0;
-            /// Fade the screen out to black, over \a time seconds
-            virtual void fadeScreenOut(const float time, bool clearQueue=true, float delay=0.f) = 0;
-            /// Fade the screen to a specified percentage of black, over \a time seconds
-            virtual void fadeScreenTo(const int percent, const float time, bool clearQueue=true, float delay=0.f) = 0;
-            /// Darken the screen to a specified percentage
-            virtual void setBlindness(const int percent) = 0;
+        /// Fade the screen in, over \a time seconds
+        virtual void fadeScreenIn(const float time, bool clearQueue = true, float delay = 0.f) = 0;
+        /// Fade the screen out to black, over \a time seconds
+        virtual void fadeScreenOut(const float time, bool clearQueue = true, float delay = 0.f) = 0;
+        /// Fade the screen to a specified percentage of black, over \a time seconds
+        virtual void fadeScreenTo(const int percent, const float time, bool clearQueue = true, float delay = 0.f) = 0;
+        /// Darken the screen to a specified percentage
+        virtual void setBlindness(const int percent) = 0;
 
-            virtual void activateHitOverlay(bool interrupt=true) = 0;
-            virtual void setWerewolfOverlay(bool set) = 0;
+        virtual void activateHitOverlay(bool interrupt = true) = 0;
+        virtual void setWerewolfOverlay(bool set) = 0;
 
-            virtual void toggleConsole() = 0;
-            virtual void toggleDebugWindow() = 0;
-            virtual void togglePostProcessorHud() = 0;
+        virtual void toggleConsole() = 0;
+        virtual void toggleDebugWindow() = 0;
+        virtual void togglePostProcessorHud() = 0;
 
-            /// Cycle to next or previous spell
-            virtual void cycleSpell(bool next) = 0;
-            /// Cycle to next or previous weapon
-            virtual void cycleWeapon(bool next) = 0;
+        /// Cycle to next or previous spell
+        virtual void cycleSpell(bool next) = 0;
+        /// Cycle to next or previous weapon
+        virtual void cycleWeapon(bool next) = 0;
 
-            virtual void playSound(std::string_view soundId, float volume = 1.f, float pitch = 1.f) = 0;
+        virtual void playSound(std::string_view soundId, float volume = 1.f, float pitch = 1.f) = 0;
 
-            virtual void addCell(MWWorld::CellStore* cell) = 0;
-            virtual void removeCell(MWWorld::CellStore* cell) = 0;
-            virtual void writeFog(MWWorld::CellStore* cell) = 0;
+        virtual void addCell(MWWorld::CellStore* cell) = 0;
+        virtual void removeCell(MWWorld::CellStore* cell) = 0;
+        virtual void writeFog(MWWorld::CellStore* cell) = 0;
 
-            virtual const MWGui::TextColours& getTextColours() = 0;
+        virtual const MWGui::TextColours& getTextColours() = 0;
 
-            virtual bool injectKeyPress(MyGUI::KeyCode key, unsigned int text, bool repeat) = 0;
-            virtual bool injectKeyRelease(MyGUI::KeyCode key) = 0;
+        virtual bool injectKeyPress(MyGUI::KeyCode key, unsigned int text, bool repeat) = 0;
+        virtual bool injectKeyRelease(MyGUI::KeyCode key) = 0;
 
-            void windowVisibilityChange(bool visible) override = 0;
-            void windowResized(int x, int y) override = 0;
-            void windowClosed() override = 0;
-            virtual bool isWindowVisible() = 0;
+        void windowVisibilityChange(bool visible) override = 0;
+        void windowResized(int x, int y) override = 0;
+        void windowClosed() override = 0;
+        virtual bool isWindowVisible() = 0;
 
-            virtual void watchActor(const MWWorld::Ptr& ptr) = 0;
-            virtual MWWorld::Ptr getWatchedActor() const = 0;
+        virtual void watchActor(const MWWorld::Ptr& ptr) = 0;
+        virtual MWWorld::Ptr getWatchedActor() const = 0;
 
-            virtual const std::string& getVersionDescription() const = 0;
+        virtual const std::string& getVersionDescription() const = 0;
 
-            virtual void onDeleteCustomData(const MWWorld::Ptr& ptr) = 0;
-            virtual void forceLootMode(const MWWorld::Ptr& ptr) = 0;
+        virtual void onDeleteCustomData(const MWWorld::Ptr& ptr) = 0;
+        virtual void forceLootMode(const MWWorld::Ptr& ptr) = 0;
 
-            virtual void asyncPrepareSaveMap() = 0;
+        virtual void asyncPrepareSaveMap() = 0;
 
-            /// Sets the cull masks for all applicable views
-            virtual void setCullMask(uint32_t mask) = 0;
+        /// Sets the cull masks for all applicable views
+        virtual void setCullMask(uint32_t mask) = 0;
 
-            /// Same as viewer->getCamera()->getCullMask(), provided for consistency.
-            virtual uint32_t getCullMask() = 0;
+        /// Same as viewer->getCamera()->getCullMask(), provided for consistency.
+        virtual uint32_t getCullMask() = 0;
     };
 }
 
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index e6322dfda4..67e8b55db4 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -3,20 +3,20 @@
 
 #include "rotationflags.hpp"
 
-#include <vector>
+#include <deque>
 #include <map>
 #include <set>
-#include <string_view>
-#include <deque>
 #include <span>
+#include <string_view>
+#include <vector>
 
 #include <components/esm3/cellid.hpp>
 #include <components/misc/rng.hpp>
 
 #include <osg/Timer>
 
-#include "../mwworld/ptr.hpp"
 #include "../mwworld/doorstate.hpp"
+#include "../mwworld/ptr.hpp"
 #include "../mwworld/spellcaststate.hpp"
 
 #include "../mwrender/rendermode.hpp"
@@ -92,7 +92,7 @@ namespace MWWorld
     class ESMStore;
     class RefData;
 
-    typedef std::vector<std::pair<MWWorld::Ptr,MWMechanics::Movement> > PtrMovementList;
+    typedef std::vector<std::pair<MWWorld::Ptr, MWMechanics::Movement>> PtrMovementList;
 }
 
 namespace MWBase
@@ -100,580 +100,614 @@ namespace MWBase
     /// \brief Interface for the World (implemented in MWWorld)
     class World
     {
-            World (const World&);
-            ///< not implemented
-
-            World& operator= (const World&);
-            ///< not implemented
-
-        public:
-
-            struct DoorMarker
-            {
-                std::string name;
-                float x, y; // world position
-                ESM::CellId dest;
-            };
-
-            World() {}
-
-            virtual ~World() {}
-
-            virtual void setRandomSeed(uint32_t seed) = 0;
-            ///< \param seed The seed used when starting a new game.
-
-            virtual void startNewGame (bool bypass) = 0;
-            ///< \param bypass Bypass regular game start.
-
-            virtual void clear() = 0;
-
-            virtual int countSavedGameRecords() const = 0;
-            virtual int countSavedGameCells() const = 0;
-
-            virtual void write (ESM::ESMWriter& writer, Loading::Listener& listener) const = 0;
-
-            virtual void readRecord (ESM::ESMReader& reader, uint32_t type,
-                const std::map<int, int>& contentFileMap) = 0;
-
-            virtual MWWorld::CellStore *getExterior (int x, int y) = 0;
-
-            virtual MWWorld::CellStore* getInterior(std::string_view name) = 0;
-
-            virtual MWWorld::CellStore *getCell (const ESM::CellId& id) = 0;
-
-            virtual bool isCellActive(MWWorld::CellStore* cell) const = 0;
-
-            virtual void testExteriorCells() = 0;
-            virtual void testInteriorCells() = 0;
-
-            virtual void useDeathCamera() = 0;
-
-            virtual void setWaterHeight(const float height) = 0;
-
-            virtual bool toggleWater() = 0;
-            virtual bool toggleWorld() = 0;
-            virtual bool toggleBorders() = 0;
-
-            virtual MWWorld::Player& getPlayer() = 0;
-            virtual MWWorld::Ptr getPlayerPtr() = 0;
-            virtual MWWorld::ConstPtr getPlayerConstPtr() const = 0;
-
-            virtual const MWWorld::ESMStore& getStore() const = 0;
-
-            virtual const std::vector<int>& getESMVersions() const = 0;
-
-            virtual MWWorld::LocalScripts& getLocalScripts() = 0;
-
-            virtual bool hasCellChanged() const = 0;
-            ///< Has the set of active cells changed, since the last frame?
+        World(const World&);
+        ///< not implemented
 
-            virtual bool isCellExterior() const = 0;
+        World& operator=(const World&);
+        ///< not implemented
 
-            virtual bool isCellQuasiExterior() const = 0;
+    public:
+        struct DoorMarker
+        {
+            std::string name;
+            float x, y; // world position
+            ESM::CellId dest;
+        };
 
-            virtual osg::Vec2f getNorthVector (const MWWorld::CellStore* cell) = 0;
-            ///< get north vector for given interior cell
+        World() {}
 
-            virtual void getDoorMarkers (MWWorld::CellStore* cell, std::vector<DoorMarker>& out) = 0;
-            ///< get a list of teleport door markers for a given cell, to be displayed on the local map
+        virtual ~World() {}
 
-            virtual void setGlobalInt(std::string_view name, int value) = 0;
-            ///< Set value independently from real type.
+        virtual void setRandomSeed(uint32_t seed) = 0;
+        ///< \param seed The seed used when starting a new game.
 
-            virtual void setGlobalFloat(std::string_view name, float value) = 0;
-            ///< Set value independently from real type.
+        virtual void startNewGame(bool bypass) = 0;
+        ///< \param bypass Bypass regular game start.
 
-            virtual int getGlobalInt(std::string_view name) const = 0;
-            ///< Get value independently from real type.
+        virtual void clear() = 0;
 
-            virtual float getGlobalFloat(std::string_view name) const = 0;
-            ///< Get value independently from real type.
+        virtual int countSavedGameRecords() const = 0;
+        virtual int countSavedGameCells() const = 0;
 
-            virtual char getGlobalVariableType(std::string_view name) const = 0;
-            ///< Return ' ', if there is no global variable with this name.
+        virtual void write(ESM::ESMWriter& writer, Loading::Listener& listener) const = 0;
 
-            virtual std::string_view getCellName(const MWWorld::CellStore* cell = nullptr) const = 0;
-            ///< Return name of the cell.
-            ///
-            /// \note If cell==0, the cell the player is currently in will be used instead to
-            /// generate a name.
-            virtual std::string_view getCellName(const ESM::Cell* cell) const = 0;
+        virtual void readRecord(ESM::ESMReader& reader, uint32_t type, const std::map<int, int>& contentFileMap) = 0;
 
-            virtual void removeRefScript (MWWorld::RefData *ref) = 0;
-            //< Remove the script attached to ref from mLocalScripts
+        virtual MWWorld::CellStore* getExterior(int x, int y) = 0;
 
-            virtual MWWorld::Ptr getPtr (std::string_view name, bool activeOnly) = 0;
-            ///< Return a pointer to a liveCellRef with the given name.
-            /// \param activeOnly do non search inactive cells.
+        virtual MWWorld::CellStore* getInterior(std::string_view name) = 0;
 
-            virtual MWWorld::Ptr searchPtr (std::string_view name, bool activeOnly, bool searchInContainers = true) = 0;
-            ///< Return a pointer to a liveCellRef with the given name.
-            /// \param activeOnly do non search inactive cells.
+        virtual MWWorld::CellStore* getCell(const ESM::CellId& id) = 0;
 
-            virtual MWWorld::Ptr searchPtrViaActorId (int actorId) = 0;
-            ///< Search is limited to the active cells.
+        virtual bool isCellActive(MWWorld::CellStore* cell) const = 0;
 
-            virtual MWWorld::Ptr searchPtrViaRefNum (const std::string& id, const ESM::RefNum& refNum) = 0;
+        virtual void testExteriorCells() = 0;
+        virtual void testInteriorCells() = 0;
 
-            virtual MWWorld::Ptr findContainer (const MWWorld::ConstPtr& ptr) = 0;
-            ///< Return a pointer to a liveCellRef which contains \a ptr.
-            /// \note Search is limited to the active cells.
+        virtual void useDeathCamera() = 0;
 
-            virtual void enable (const MWWorld::Ptr& ptr) = 0;
+        virtual void setWaterHeight(const float height) = 0;
 
-            virtual void disable (const MWWorld::Ptr& ptr) = 0;
+        virtual bool toggleWater() = 0;
+        virtual bool toggleWorld() = 0;
+        virtual bool toggleBorders() = 0;
 
-            virtual void advanceTime (double hours, bool incremental = false) = 0;
-            ///< Advance in-game time.
+        virtual MWWorld::Player& getPlayer() = 0;
+        virtual MWWorld::Ptr getPlayerPtr() = 0;
+        virtual MWWorld::ConstPtr getPlayerConstPtr() const = 0;
 
-            virtual std::string_view getMonthName(int month = -1) const = 0;
-            ///< Return name of month (-1: current month)
+        virtual const MWWorld::ESMStore& getStore() const = 0;
 
-            virtual MWWorld::TimeStamp getTimeStamp() const = 0;
-            ///< Return current in-game time and number of day since new game start.
+        virtual const std::vector<int>& getESMVersions() const = 0;
 
-            virtual ESM::EpochTimeStamp getEpochTimeStamp() const = 0;
-            ///< Return current in-game date and time.
+        virtual MWWorld::LocalScripts& getLocalScripts() = 0;
 
-            virtual bool toggleSky() = 0;
-            ///< \return Resulting mode
+        virtual bool hasCellChanged() const = 0;
+        ///< Has the set of active cells changed, since the last frame?
 
-            virtual void changeWeather(std::string_view region, const unsigned int id) = 0;
+        virtual bool isCellExterior() const = 0;
 
-            virtual int getCurrentWeather() const = 0;
+        virtual bool isCellQuasiExterior() const = 0;
 
-            virtual int getNextWeather() const = 0;
+        virtual osg::Vec2f getNorthVector(const MWWorld::CellStore* cell) = 0;
+        ///< get north vector for given interior cell
 
-            virtual float getWeatherTransition() const = 0;
+        virtual void getDoorMarkers(MWWorld::CellStore* cell, std::vector<DoorMarker>& out) = 0;
+        ///< get a list of teleport door markers for a given cell, to be displayed on the local map
 
-            virtual unsigned int getNightDayMode() const = 0;
+        virtual void setGlobalInt(std::string_view name, int value) = 0;
+        ///< Set value independently from real type.
 
-            virtual int getMasserPhase() const = 0;
+        virtual void setGlobalFloat(std::string_view name, float value) = 0;
+        ///< Set value independently from real type.
 
-            virtual int getSecundaPhase() const = 0;
+        virtual int getGlobalInt(std::string_view name) const = 0;
+        ///< Get value independently from real type.
 
-            virtual void setMoonColour (bool red) = 0;
+        virtual float getGlobalFloat(std::string_view name) const = 0;
+        ///< Get value independently from real type.
 
-            virtual void modRegion(std::string_view regionid, const std::vector<char> &chances) = 0;
+        virtual char getGlobalVariableType(std::string_view name) const = 0;
+        ///< Return ' ', if there is no global variable with this name.
 
-            virtual float getTimeScaleFactor() const = 0;
+        virtual std::string_view getCellName(const MWWorld::CellStore* cell = nullptr) const = 0;
+        ///< Return name of the cell.
+        ///
+        /// \note If cell==0, the cell the player is currently in will be used instead to
+        /// generate a name.
+        virtual std::string_view getCellName(const ESM::Cell* cell) const = 0;
 
-            virtual float getSimulationTimeScale() const = 0;
+        virtual void removeRefScript(MWWorld::RefData* ref) = 0;
+        //< Remove the script attached to ref from mLocalScripts
 
-            virtual void setSimulationTimeScale(float scale) = 0;
+        virtual MWWorld::Ptr getPtr(std::string_view name, bool activeOnly) = 0;
+        ///< Return a pointer to a liveCellRef with the given name.
+        /// \param activeOnly do non search inactive cells.
 
-            virtual void changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent=true) = 0;
-            ///< Move to interior cell.
-            ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
+        virtual MWWorld::Ptr searchPtr(std::string_view name, bool activeOnly, bool searchInContainers = true) = 0;
+        ///< Return a pointer to a liveCellRef with the given name.
+        /// \param activeOnly do non search inactive cells.
 
-            virtual void changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos, bool changeEvent=true) = 0;
-            ///< Move to exterior cell.
-            ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
+        virtual MWWorld::Ptr searchPtrViaActorId(int actorId) = 0;
+        ///< Search is limited to the active cells.
 
-            virtual void changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent=true) = 0;
-            ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
+        virtual MWWorld::Ptr searchPtrViaRefNum(const std::string& id, const ESM::RefNum& refNum) = 0;
 
-            virtual const ESM::Cell* getExterior(std::string_view cellName) const = 0;
-            ///< Return a cell matching the given name or a 0-pointer, if there is no such cell.
+        virtual MWWorld::Ptr findContainer(const MWWorld::ConstPtr& ptr) = 0;
+        ///< Return a pointer to a liveCellRef which contains \a ptr.
+        /// \note Search is limited to the active cells.
 
-            virtual void markCellAsUnchanged() = 0;
+        virtual void enable(const MWWorld::Ptr& ptr) = 0;
 
-            virtual MWWorld::Ptr  getFacedObject() = 0;
-            ///< Return pointer to the object the player is looking at, if it is within activation range
+        virtual void disable(const MWWorld::Ptr& ptr) = 0;
 
-            virtual float getDistanceToFacedObject() = 0;
+        virtual void advanceTime(double hours, bool incremental = false) = 0;
+        ///< Advance in-game time.
 
-            virtual float getMaxActivationDistance() const = 0;
+        virtual std::string_view getMonthName(int month = -1) const = 0;
+        ///< Return name of month (-1: current month)
 
-            /// Returns a pointer to the object the provided object would hit (if within the
-            /// specified distance), and the point where the hit occurs. This will attempt to
-            /// use the "Head" node, or alternatively the "Bip01 Head" node as a basis.
-            virtual std::pair<MWWorld::Ptr,osg::Vec3f> getHitContact(const MWWorld::ConstPtr &ptr, float distance, std::vector<MWWorld::Ptr> &targets) = 0;
+        virtual MWWorld::TimeStamp getTimeStamp() const = 0;
+        ///< Return current in-game time and number of day since new game start.
 
-            virtual void adjustPosition (const MWWorld::Ptr& ptr, bool force) = 0;
-            ///< Adjust position after load to be on ground. Must be called after model load.
-            /// @param force do this even if the ptr is flying
+        virtual ESM::EpochTimeStamp getEpochTimeStamp() const = 0;
+        ///< Return current in-game date and time.
 
-            virtual void fixPosition () = 0;
-            ///< Attempt to fix position so that the player is not stuck inside the geometry.
+        virtual bool toggleSky() = 0;
+        ///< \return Resulting mode
 
-            /// @note No-op for items in containers. Use ContainerStore::removeItem instead.
-            virtual void deleteObject (const MWWorld::Ptr& ptr) = 0;
-            virtual void undeleteObject (const MWWorld::Ptr& ptr) = 0;
+        virtual void changeWeather(std::string_view region, const unsigned int id) = 0;
 
-            virtual MWWorld::Ptr moveObject (const MWWorld::Ptr& ptr, const osg::Vec3f& position, bool movePhysics=true, bool moveToActive=false) = 0;
-            ///< @return an updated Ptr in case the Ptr's cell changes
+        virtual int getCurrentWeather() const = 0;
 
-            virtual MWWorld::Ptr moveObject(const MWWorld::Ptr &ptr, MWWorld::CellStore* newCell, const osg::Vec3f& position, bool movePhysics=true, bool keepActive=false) = 0;
-            ///< @return an updated Ptr
+        virtual int getNextWeather() const = 0;
 
-            virtual MWWorld::Ptr moveObjectBy(const MWWorld::Ptr &ptr, const osg::Vec3f& vec) = 0;
-            ///< @return an updated Ptr
+        virtual float getWeatherTransition() const = 0;
 
-            virtual void scaleObject (const MWWorld::Ptr& ptr, float scale, bool force = false) = 0;
+        virtual unsigned int getNightDayMode() const = 0;
 
-            virtual void rotateObject(const MWWorld::Ptr& ptr, const osg::Vec3f& rot, RotationFlags flags = RotationFlag_inverseOrder) = 0;
+        virtual int getMasserPhase() const = 0;
 
-            virtual MWWorld::Ptr placeObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, const ESM::Position& pos) = 0;
-            ///< Place an object. Makes a copy of the Ptr.
+        virtual int getSecundaPhase() const = 0;
 
-            virtual MWWorld::Ptr safePlaceObject (const MWWorld::ConstPtr& ptr, const MWWorld::ConstPtr& referenceObject, MWWorld::CellStore* referenceCell, int direction, float distance) = 0;
-            ///< Place an object in a safe place next to \a referenceObject. \a direction and \a distance specify the wanted placement
-            /// relative to \a referenceObject (but the object may be placed somewhere else if the wanted location is obstructed).
+        virtual void setMoonColour(bool red) = 0;
 
-            virtual void indexToPosition (int cellX, int cellY, float &x, float &y, bool centre = false)
-                const = 0;
-            ///< Convert cell numbers to position.
+        virtual void modRegion(std::string_view regionid, const std::vector<char>& chances) = 0;
 
-            virtual void queueMovement(const MWWorld::Ptr &ptr, const osg::Vec3f &velocity) = 0;
-            ///< Queues movement for \a ptr (in local space), to be applied in the next call to
-            /// doPhysics.
+        virtual float getTimeScaleFactor() const = 0;
 
-            virtual void updateAnimatedCollisionShape(const MWWorld::Ptr &ptr) = 0;
+        virtual float getSimulationTimeScale() const = 0;
 
-            virtual const MWPhysics::RayCastingInterface* getRayCasting() const = 0;
+        virtual void setSimulationTimeScale(float scale) = 0;
 
-            virtual bool castRay (float x1, float y1, float z1, float x2, float y2, float z2, int mask) = 0;
-            ///< cast a Ray and return true if there is an object in the ray path.
+        virtual void changeToInteriorCell(
+            const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent = true)
+            = 0;
+        ///< Move to interior cell.
+        ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
-            virtual bool castRay (float x1, float y1, float z1, float x2, float y2, float z2) = 0;
+        virtual void changeToExteriorCell(const ESM::Position& position, bool adjustPlayerPos, bool changeEvent = true)
+            = 0;
+        ///< Move to exterior cell.
+        ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
-            virtual bool castRay(const osg::Vec3f& from, const osg::Vec3f& to, int mask, const MWWorld::ConstPtr& ignore) = 0;
+        virtual void changeToCell(
+            const ESM::CellId& cellId, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent = true)
+            = 0;
+        ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
-            virtual bool castRenderingRay(MWPhysics::RayCastingResult& res, const osg::Vec3f& from, const osg::Vec3f& to,
-                                          bool ignorePlayer, bool ignoreActors) = 0;
+        virtual const ESM::Cell* getExterior(std::string_view cellName) const = 0;
+        ///< Return a cell matching the given name or a 0-pointer, if there is no such cell.
 
-            virtual void setActorCollisionMode(const MWWorld::Ptr& ptr, bool internal, bool external) = 0;
-            virtual bool isActorCollisionEnabled(const MWWorld::Ptr& ptr) = 0;
+        virtual void markCellAsUnchanged() = 0;
 
-            virtual bool toggleCollisionMode() = 0;
-            ///< Toggle collision mode for player. If disabled player object should ignore
-            /// collisions and gravity.
-            /// \return Resulting mode
+        virtual MWWorld::Ptr getFacedObject() = 0;
+        ///< Return pointer to the object the player is looking at, if it is within activation range
 
-            virtual bool toggleRenderMode (MWRender::RenderMode mode) = 0;
-            ///< Toggle a render mode.
-            ///< \return Resulting mode
+        virtual float getDistanceToFacedObject() = 0;
 
-            virtual const ESM::Potion *createRecord (const ESM::Potion& record) = 0;
-            ///< Create a new record (of type potion) in the ESM store.
-            /// \return pointer to created record
+        virtual float getMaxActivationDistance() const = 0;
 
-            virtual const ESM::Spell *createRecord (const ESM::Spell& record) = 0;
-            ///< Create a new record (of type spell) in the ESM store.
-            /// \return pointer to created record
+        /// Returns a pointer to the object the provided object would hit (if within the
+        /// specified distance), and the point where the hit occurs. This will attempt to
+        /// use the "Head" node, or alternatively the "Bip01 Head" node as a basis.
+        virtual std::pair<MWWorld::Ptr, osg::Vec3f> getHitContact(
+            const MWWorld::ConstPtr& ptr, float distance, std::vector<MWWorld::Ptr>& targets)
+            = 0;
 
-            virtual const ESM::Class *createRecord (const ESM::Class& record) = 0;
-            ///< Create a new record (of type class) in the ESM store.
-            /// \return pointer to created record
+        virtual void adjustPosition(const MWWorld::Ptr& ptr, bool force) = 0;
+        ///< Adjust position after load to be on ground. Must be called after model load.
+        /// @param force do this even if the ptr is flying
 
-            virtual const ESM::Cell *createRecord (const ESM::Cell& record) = 0;
-            ///< Create a new record (of type cell) in the ESM store.
-            /// \return pointer to created record
+        virtual void fixPosition() = 0;
+        ///< Attempt to fix position so that the player is not stuck inside the geometry.
 
-            virtual const ESM::NPC *createRecord(const ESM::NPC &record) = 0;
-            ///< Create a new record (of type npc) in the ESM store.
-            /// \return pointer to created record
+        /// @note No-op for items in containers. Use ContainerStore::removeItem instead.
+        virtual void deleteObject(const MWWorld::Ptr& ptr) = 0;
+        virtual void undeleteObject(const MWWorld::Ptr& ptr) = 0;
 
-            virtual const ESM::Armor *createRecord (const ESM::Armor& record) = 0;
-            ///< Create a new record (of type armor) in the ESM store.
-            /// \return pointer to created record
+        virtual MWWorld::Ptr moveObject(
+            const MWWorld::Ptr& ptr, const osg::Vec3f& position, bool movePhysics = true, bool moveToActive = false)
+            = 0;
+        ///< @return an updated Ptr in case the Ptr's cell changes
 
-            virtual const ESM::Weapon *createRecord (const ESM::Weapon& record) = 0;
-            ///< Create a new record (of type weapon) in the ESM store.
-            /// \return pointer to created record
+        virtual MWWorld::Ptr moveObject(const MWWorld::Ptr& ptr, MWWorld::CellStore* newCell,
+            const osg::Vec3f& position, bool movePhysics = true, bool keepActive = false)
+            = 0;
+        ///< @return an updated Ptr
 
-            virtual const ESM::Clothing *createRecord (const ESM::Clothing& record) = 0;
-            ///< Create a new record (of type clothing) in the ESM store.
-            /// \return pointer to created record
+        virtual MWWorld::Ptr moveObjectBy(const MWWorld::Ptr& ptr, const osg::Vec3f& vec) = 0;
+        ///< @return an updated Ptr
 
-            virtual const ESM::Enchantment *createRecord (const ESM::Enchantment& record) = 0;
-            ///< Create a new record (of type enchantment) in the ESM store.
-            /// \return pointer to created record
+        virtual void scaleObject(const MWWorld::Ptr& ptr, float scale, bool force = false) = 0;
 
-            virtual const ESM::Book *createRecord (const ESM::Book& record) = 0;
-            ///< Create a new record (of type book) in the ESM store.
-            /// \return pointer to created record
+        virtual void rotateObject(
+            const MWWorld::Ptr& ptr, const osg::Vec3f& rot, RotationFlags flags = RotationFlag_inverseOrder)
+            = 0;
 
-            virtual const ESM::CreatureLevList *createOverrideRecord (const ESM::CreatureLevList& record) = 0;
-            ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
-            /// \return pointer to created record
+        virtual MWWorld::Ptr placeObject(
+            const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, const ESM::Position& pos)
+            = 0;
+        ///< Place an object. Makes a copy of the Ptr.
 
-            virtual const ESM::ItemLevList *createOverrideRecord (const ESM::ItemLevList& record) = 0;
-            ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
-            /// \return pointer to created record
+        virtual MWWorld::Ptr safePlaceObject(const MWWorld::ConstPtr& ptr, const MWWorld::ConstPtr& referenceObject,
+            MWWorld::CellStore* referenceCell, int direction, float distance)
+            = 0;
+        ///< Place an object in a safe place next to \a referenceObject. \a direction and \a distance specify the wanted
+        ///< placement
+        /// relative to \a referenceObject (but the object may be placed somewhere else if the wanted location is
+        /// obstructed).
 
-            virtual const ESM::Creature *createOverrideRecord (const ESM::Creature& record) = 0;
-            ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
-            /// \return pointer to created record
+        virtual void indexToPosition(int cellX, int cellY, float& x, float& y, bool centre = false) const = 0;
+        ///< Convert cell numbers to position.
 
-            virtual const ESM::NPC *createOverrideRecord (const ESM::NPC& record) = 0;
-            ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
-            /// \return pointer to created record
-
-            virtual const ESM::Container *createOverrideRecord (const ESM::Container& record) = 0;
-            ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
-            /// \return pointer to created record
-
-            virtual MWWorld::Ptr placeObject (const MWWorld::ConstPtr& object, float cursorX, float cursorY, int amount) = 0;
-            ///< copy and place an object into the gameworld at the specified cursor position
-            /// @param object
-            /// @param cursor X (relative 0-1)
-            /// @param cursor Y (relative 0-1)
-            /// @param number of objects to place
-
-            virtual MWWorld::Ptr dropObjectOnGround (const MWWorld::Ptr& actor, const MWWorld::ConstPtr& object, int amount) = 0;
-            ///< copy and place an object into the gameworld at the given actor's position
-            /// @param actor giving the dropped object position
-            /// @param object
-            /// @param number of objects to place
-
-            virtual bool canPlaceObject (float cursorX, float cursorY) = 0;
-            ///< @return true if it is possible to place on object at specified cursor location
-
-            virtual void processChangedSettings (const std::set< std::pair<std::string, std::string> >& settings) = 0;
-
-            virtual bool isFlying(const MWWorld::Ptr &ptr) const = 0;
-            virtual bool isSlowFalling(const MWWorld::Ptr &ptr) const = 0;
-            virtual bool isSwimming(const MWWorld::ConstPtr &object) const = 0;
-            virtual bool isWading(const MWWorld::ConstPtr &object) const = 0;
-            ///Is the head of the creature underwater?
-            virtual bool isSubmerged(const MWWorld::ConstPtr &object) const = 0;
-            virtual bool isUnderwater(const MWWorld::CellStore* cell, const osg::Vec3f &pos) const = 0;
-            virtual bool isUnderwater(const MWWorld::ConstPtr &object, const float heightRatio) const = 0;
-            virtual bool isWaterWalkingCastableOnTarget(const MWWorld::ConstPtr &target) const = 0;
-            virtual bool isOnGround(const MWWorld::Ptr &ptr) const = 0;
-
-            virtual osg::Matrixf getActorHeadTransform(const MWWorld::ConstPtr& actor) const = 0;
-
-            virtual MWRender::Camera* getCamera() = 0;
-            virtual void togglePOV(bool force = false) = 0;
-            virtual bool isFirstPerson() const = 0;
-            virtual bool isPreviewModeEnabled() const = 0;
-            virtual bool toggleVanityMode(bool enable) = 0;
-            virtual bool vanityRotateCamera(float * rot) = 0;
-            virtual void applyDeferredPreviewRotationToPlayer(float dt) = 0;
-            virtual void disableDeferredPreviewRotation() = 0;
-
-            virtual void saveLoaded() = 0;
-
-            virtual void setupPlayer() = 0;
-            virtual void renderPlayer() = 0;
-
-            /// open or close a non-teleport door (depending on current state)
-            virtual void activateDoor(const MWWorld::Ptr& door) = 0;
-            /// update movement state of a non-teleport door as specified
-            /// @param state see MWClass::setDoorState
-            /// @note throws an exception when invoked on a teleport door
-            virtual void activateDoor(const MWWorld::Ptr& door, MWWorld::DoorState state) = 0;
+        virtual void queueMovement(const MWWorld::Ptr& ptr, const osg::Vec3f& velocity) = 0;
+        ///< Queues movement for \a ptr (in local space), to be applied in the next call to
+        /// doPhysics.
 
-            virtual void getActorsStandingOn (const MWWorld::ConstPtr& object, std::vector<MWWorld::Ptr> &actors) = 0; ///< get a list of actors standing on \a object
-            virtual bool getPlayerStandingOn (const MWWorld::ConstPtr& object) = 0; ///< @return true if the player is standing on \a object
-            virtual bool getActorStandingOn (const MWWorld::ConstPtr& object) = 0; ///< @return true if any actor is standing on \a object
-            virtual bool getPlayerCollidingWith(const MWWorld::ConstPtr& object) = 0; ///< @return true if the player is colliding with \a object
-            virtual bool getActorCollidingWith (const MWWorld::ConstPtr& object) = 0; ///< @return true if any actor is colliding with \a object
-            virtual void hurtStandingActors (const MWWorld::ConstPtr& object, float dmgPerSecond) = 0;
-            ///< Apply a health difference to any actors standing on \a object.
-            /// To hurt actors, healthPerSecond should be a positive value. For a negative value, actors will be healed.
-            virtual void hurtCollidingActors (const MWWorld::ConstPtr& object, float dmgPerSecond) = 0;
-            ///< Apply a health difference to any actors colliding with \a object.
-            /// To hurt actors, healthPerSecond should be a positive value. For a negative value, actors will be healed.
-
-            virtual float getWindSpeed() = 0;
-
-            virtual void getContainersOwnedBy (const MWWorld::ConstPtr& npc, std::vector<MWWorld::Ptr>& out) = 0;
-            ///< get all containers in active cells owned by this Npc
-            virtual void getItemsOwnedBy (const MWWorld::ConstPtr& npc, std::vector<MWWorld::Ptr>& out) = 0;
-            ///< get all items in active cells owned by this Npc
-
-            virtual bool getLOS(const MWWorld::ConstPtr& actor,const MWWorld::ConstPtr& targetActor) = 0;
-            ///< get Line of Sight (morrowind stupid implementation)
-
-            virtual float getDistToNearestRayHit(const osg::Vec3f& from, const osg::Vec3f& dir, float maxDist, bool includeWater = false) = 0;
-
-            virtual void enableActorCollision(const MWWorld::Ptr& actor, bool enable) = 0;
-
-            enum RestPermitted
-            {
-                Rest_Allowed = 0,
-                Rest_OnlyWaiting = 1,
-                Rest_PlayerIsInAir = 2,
-                Rest_PlayerIsUnderwater = 3,
-                Rest_EnemiesAreNearby = 4
-            };
+        virtual void updateAnimatedCollisionShape(const MWWorld::Ptr& ptr) = 0;
 
-            /// check if the player is allowed to rest
-            virtual RestPermitted canRest() const = 0;
+        virtual const MWPhysics::RayCastingInterface* getRayCasting() const = 0;
 
-            /// \todo Probably shouldn't be here
-            virtual MWRender::Animation* getAnimation(const MWWorld::Ptr &ptr) = 0;
-            virtual const MWRender::Animation* getAnimation(const MWWorld::ConstPtr &ptr) const = 0;
-            virtual void reattachPlayerCamera() = 0;
+        virtual bool castRay(float x1, float y1, float z1, float x2, float y2, float z2, int mask) = 0;
+        ///< cast a Ray and return true if there is an object in the ray path.
 
-            /// \todo this does not belong here
-            virtual void screenshot (osg::Image* image, int w, int h) = 0;
-            virtual bool screenshot360 (osg::Image* image) = 0;
+        virtual bool castRay(float x1, float y1, float z1, float x2, float y2, float z2) = 0;
 
-            /// Find default position inside exterior cell specified by name
-            /// \return false if exterior with given name not exists, true otherwise
-            virtual bool findExteriorPosition(std::string_view name, ESM::Position& pos) = 0;
+        virtual bool castRay(const osg::Vec3f& from, const osg::Vec3f& to, int mask, const MWWorld::ConstPtr& ignore)
+            = 0;
 
-            /// Find default position inside interior cell specified by name
-            /// \return false if interior with given name not exists, true otherwise
-            virtual bool findInteriorPosition(std::string_view name, ESM::Position &pos) = 0;
+        virtual bool castRenderingRay(MWPhysics::RayCastingResult& res, const osg::Vec3f& from, const osg::Vec3f& to,
+            bool ignorePlayer, bool ignoreActors)
+            = 0;
+
+        virtual void setActorCollisionMode(const MWWorld::Ptr& ptr, bool internal, bool external) = 0;
+        virtual bool isActorCollisionEnabled(const MWWorld::Ptr& ptr) = 0;
 
-            /// Enables or disables use of teleport spell effects (recall, intervention, etc).
-            virtual void enableTeleporting(bool enable) = 0;
+        virtual bool toggleCollisionMode() = 0;
+        ///< Toggle collision mode for player. If disabled player object should ignore
+        /// collisions and gravity.
+        /// \return Resulting mode
 
-            /// Returns true if teleport spell effects are allowed.
-            virtual bool isTeleportingEnabled() const = 0;
+        virtual bool toggleRenderMode(MWRender::RenderMode mode) = 0;
+        ///< Toggle a render mode.
+        ///< \return Resulting mode
+
+        virtual const ESM::Potion* createRecord(const ESM::Potion& record) = 0;
+        ///< Create a new record (of type potion) in the ESM store.
+        /// \return pointer to created record
 
-            /// Enables or disables use of levitation spell effect.
-            virtual void enableLevitation(bool enable) = 0;
+        virtual const ESM::Spell* createRecord(const ESM::Spell& record) = 0;
+        ///< Create a new record (of type spell) in the ESM store.
+        /// \return pointer to created record
 
-            /// Returns true if levitation spell effect is allowed.
-            virtual bool isLevitationEnabled() const = 0;
+        virtual const ESM::Class* createRecord(const ESM::Class& record) = 0;
+        ///< Create a new record (of type class) in the ESM store.
+        /// \return pointer to created record
+
+        virtual const ESM::Cell* createRecord(const ESM::Cell& record) = 0;
+        ///< Create a new record (of type cell) in the ESM store.
+        /// \return pointer to created record
+
+        virtual const ESM::NPC* createRecord(const ESM::NPC& record) = 0;
+        ///< Create a new record (of type npc) in the ESM store.
+        /// \return pointer to created record
+
+        virtual const ESM::Armor* createRecord(const ESM::Armor& record) = 0;
+        ///< Create a new record (of type armor) in the ESM store.
+        /// \return pointer to created record
+
+        virtual const ESM::Weapon* createRecord(const ESM::Weapon& record) = 0;
+        ///< Create a new record (of type weapon) in the ESM store.
+        /// \return pointer to created record
+
+        virtual const ESM::Clothing* createRecord(const ESM::Clothing& record) = 0;
+        ///< Create a new record (of type clothing) in the ESM store.
+        /// \return pointer to created record
+
+        virtual const ESM::Enchantment* createRecord(const ESM::Enchantment& record) = 0;
+        ///< Create a new record (of type enchantment) in the ESM store.
+        /// \return pointer to created record
+
+        virtual const ESM::Book* createRecord(const ESM::Book& record) = 0;
+        ///< Create a new record (of type book) in the ESM store.
+        /// \return pointer to created record
+
+        virtual const ESM::CreatureLevList* createOverrideRecord(const ESM::CreatureLevList& record) = 0;
+        ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
+        /// \return pointer to created record
+
+        virtual const ESM::ItemLevList* createOverrideRecord(const ESM::ItemLevList& record) = 0;
+        ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
+        /// \return pointer to created record
+
+        virtual const ESM::Creature* createOverrideRecord(const ESM::Creature& record) = 0;
+        ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
+        /// \return pointer to created record
+
+        virtual const ESM::NPC* createOverrideRecord(const ESM::NPC& record) = 0;
+        ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
+        /// \return pointer to created record
+
+        virtual const ESM::Container* createOverrideRecord(const ESM::Container& record) = 0;
+        ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
+        /// \return pointer to created record
+
+        virtual MWWorld::Ptr placeObject(const MWWorld::ConstPtr& object, float cursorX, float cursorY, int amount) = 0;
+        ///< copy and place an object into the gameworld at the specified cursor position
+        /// @param object
+        /// @param cursor X (relative 0-1)
+        /// @param cursor Y (relative 0-1)
+        /// @param number of objects to place
+
+        virtual MWWorld::Ptr dropObjectOnGround(const MWWorld::Ptr& actor, const MWWorld::ConstPtr& object, int amount)
+            = 0;
+        ///< copy and place an object into the gameworld at the given actor's position
+        /// @param actor giving the dropped object position
+        /// @param object
+        /// @param number of objects to place
+
+        virtual bool canPlaceObject(float cursorX, float cursorY) = 0;
+        ///< @return true if it is possible to place on object at specified cursor location
+
+        virtual void processChangedSettings(const std::set<std::pair<std::string, std::string>>& settings) = 0;
+
+        virtual bool isFlying(const MWWorld::Ptr& ptr) const = 0;
+        virtual bool isSlowFalling(const MWWorld::Ptr& ptr) const = 0;
+        virtual bool isSwimming(const MWWorld::ConstPtr& object) const = 0;
+        virtual bool isWading(const MWWorld::ConstPtr& object) const = 0;
+        /// Is the head of the creature underwater?
+        virtual bool isSubmerged(const MWWorld::ConstPtr& object) const = 0;
+        virtual bool isUnderwater(const MWWorld::CellStore* cell, const osg::Vec3f& pos) const = 0;
+        virtual bool isUnderwater(const MWWorld::ConstPtr& object, const float heightRatio) const = 0;
+        virtual bool isWaterWalkingCastableOnTarget(const MWWorld::ConstPtr& target) const = 0;
+        virtual bool isOnGround(const MWWorld::Ptr& ptr) const = 0;
+
+        virtual osg::Matrixf getActorHeadTransform(const MWWorld::ConstPtr& actor) const = 0;
+
+        virtual MWRender::Camera* getCamera() = 0;
+        virtual void togglePOV(bool force = false) = 0;
+        virtual bool isFirstPerson() const = 0;
+        virtual bool isPreviewModeEnabled() const = 0;
+        virtual bool toggleVanityMode(bool enable) = 0;
+        virtual bool vanityRotateCamera(float* rot) = 0;
+        virtual void applyDeferredPreviewRotationToPlayer(float dt) = 0;
+        virtual void disableDeferredPreviewRotation() = 0;
+
+        virtual void saveLoaded() = 0;
+
+        virtual void setupPlayer() = 0;
+        virtual void renderPlayer() = 0;
+
+        /// open or close a non-teleport door (depending on current state)
+        virtual void activateDoor(const MWWorld::Ptr& door) = 0;
+        /// update movement state of a non-teleport door as specified
+        /// @param state see MWClass::setDoorState
+        /// @note throws an exception when invoked on a teleport door
+        virtual void activateDoor(const MWWorld::Ptr& door, MWWorld::DoorState state) = 0;
+
+        virtual void getActorsStandingOn(const MWWorld::ConstPtr& object, std::vector<MWWorld::Ptr>& actors)
+            = 0; ///< get a list of actors standing on \a object
+        virtual bool getPlayerStandingOn(const MWWorld::ConstPtr& object)
+            = 0; ///< @return true if the player is standing on \a object
+        virtual bool getActorStandingOn(const MWWorld::ConstPtr& object)
+            = 0; ///< @return true if any actor is standing on \a object
+        virtual bool getPlayerCollidingWith(const MWWorld::ConstPtr& object)
+            = 0; ///< @return true if the player is colliding with \a object
+        virtual bool getActorCollidingWith(const MWWorld::ConstPtr& object)
+            = 0; ///< @return true if any actor is colliding with \a object
+        virtual void hurtStandingActors(const MWWorld::ConstPtr& object, float dmgPerSecond) = 0;
+        ///< Apply a health difference to any actors standing on \a object.
+        /// To hurt actors, healthPerSecond should be a positive value. For a negative value, actors will be healed.
+        virtual void hurtCollidingActors(const MWWorld::ConstPtr& object, float dmgPerSecond) = 0;
+        ///< Apply a health difference to any actors colliding with \a object.
+        /// To hurt actors, healthPerSecond should be a positive value. For a negative value, actors will be healed.
+
+        virtual float getWindSpeed() = 0;
+
+        virtual void getContainersOwnedBy(const MWWorld::ConstPtr& npc, std::vector<MWWorld::Ptr>& out) = 0;
+        ///< get all containers in active cells owned by this Npc
+        virtual void getItemsOwnedBy(const MWWorld::ConstPtr& npc, std::vector<MWWorld::Ptr>& out) = 0;
+        ///< get all items in active cells owned by this Npc
+
+        virtual bool getLOS(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& targetActor) = 0;
+        ///< get Line of Sight (morrowind stupid implementation)
+
+        virtual float getDistToNearestRayHit(
+            const osg::Vec3f& from, const osg::Vec3f& dir, float maxDist, bool includeWater = false)
+            = 0;
+
+        virtual void enableActorCollision(const MWWorld::Ptr& actor, bool enable) = 0;
+
+        enum RestPermitted
+        {
+            Rest_Allowed = 0,
+            Rest_OnlyWaiting = 1,
+            Rest_PlayerIsInAir = 2,
+            Rest_PlayerIsUnderwater = 3,
+            Rest_EnemiesAreNearby = 4
+        };
+
+        /// check if the player is allowed to rest
+        virtual RestPermitted canRest() const = 0;
+
+        /// \todo Probably shouldn't be here
+        virtual MWRender::Animation* getAnimation(const MWWorld::Ptr& ptr) = 0;
+        virtual const MWRender::Animation* getAnimation(const MWWorld::ConstPtr& ptr) const = 0;
+        virtual void reattachPlayerCamera() = 0;
+
+        /// \todo this does not belong here
+        virtual void screenshot(osg::Image* image, int w, int h) = 0;
+        virtual bool screenshot360(osg::Image* image) = 0;
+
+        /// Find default position inside exterior cell specified by name
+        /// \return false if exterior with given name not exists, true otherwise
+        virtual bool findExteriorPosition(std::string_view name, ESM::Position& pos) = 0;
+
+        /// Find default position inside interior cell specified by name
+        /// \return false if interior with given name not exists, true otherwise
+        virtual bool findInteriorPosition(std::string_view name, ESM::Position& pos) = 0;
+
+        /// Enables or disables use of teleport spell effects (recall, intervention, etc).
+        virtual void enableTeleporting(bool enable) = 0;
+
+        /// Returns true if teleport spell effects are allowed.
+        virtual bool isTeleportingEnabled() const = 0;
+
+        /// Enables or disables use of levitation spell effect.
+        virtual void enableLevitation(bool enable) = 0;
+
+        /// Returns true if levitation spell effect is allowed.
+        virtual bool isLevitationEnabled() const = 0;
 
-            virtual bool getGodModeState() const = 0;
+        virtual bool getGodModeState() const = 0;
 
-            virtual bool toggleGodMode() = 0;
+        virtual bool toggleGodMode() = 0;
 
-            virtual bool toggleScripts() = 0;
-            virtual bool getScriptsEnabled() const = 0;
+        virtual bool toggleScripts() = 0;
+        virtual bool getScriptsEnabled() const = 0;
 
-            /**
-             * @brief startSpellCast attempt to start casting a spell. Might fail immediately if conditions are not met.
-             * @param actor
-             * @return Success or the failure condition.
-             */
-            virtual MWWorld::SpellCastState startSpellCast (const MWWorld::Ptr& actor) = 0;
+        /**
+         * @brief startSpellCast attempt to start casting a spell. Might fail immediately if conditions are not met.
+         * @param actor
+         * @return Success or the failure condition.
+         */
+        virtual MWWorld::SpellCastState startSpellCast(const MWWorld::Ptr& actor) = 0;
 
-            virtual void castSpell (const MWWorld::Ptr& actor, bool manualSpell=false) = 0;
+        virtual void castSpell(const MWWorld::Ptr& actor, bool manualSpell = false) = 0;
 
-            virtual void launchMagicBolt (const std::string& spellId, const MWWorld::Ptr& caster, const osg::Vec3f& fallbackDirection, int slot) = 0;
-            virtual void launchProjectile (MWWorld::Ptr& actor, MWWorld::Ptr& projectile,
-                                           const osg::Vec3f& worldPos, const osg::Quat& orient, MWWorld::Ptr& bow, float speed, float attackStrength) = 0;
-            virtual void updateProjectilesCasters() = 0;
+        virtual void launchMagicBolt(
+            const std::string& spellId, const MWWorld::Ptr& caster, const osg::Vec3f& fallbackDirection, int slot)
+            = 0;
+        virtual void launchProjectile(MWWorld::Ptr& actor, MWWorld::Ptr& projectile, const osg::Vec3f& worldPos,
+            const osg::Quat& orient, MWWorld::Ptr& bow, float speed, float attackStrength)
+            = 0;
+        virtual void updateProjectilesCasters() = 0;
 
-            virtual void applyLoopingParticles(const MWWorld::Ptr& ptr) const = 0;
+        virtual void applyLoopingParticles(const MWWorld::Ptr& ptr) const = 0;
 
-            virtual const std::vector<std::string>& getContentFiles() const = 0;
+        virtual const std::vector<std::string>& getContentFiles() const = 0;
 
-            virtual void breakInvisibility (const MWWorld::Ptr& actor) = 0;
+        virtual void breakInvisibility(const MWWorld::Ptr& actor) = 0;
 
-            // Allow NPCs to use torches?
-            virtual bool useTorches() const = 0;
+        // Allow NPCs to use torches?
+        virtual bool useTorches() const = 0;
 
-            virtual float getSunVisibility() const = 0;
-            virtual float getSunPercentage() const = 0;
+        virtual float getSunVisibility() const = 0;
+        virtual float getSunPercentage() const = 0;
 
-            virtual bool findInteriorPositionInWorldSpace(const MWWorld::CellStore* cell, osg::Vec3f& result) = 0;
+        virtual bool findInteriorPositionInWorldSpace(const MWWorld::CellStore* cell, osg::Vec3f& result) = 0;
 
-            /// Teleports \a ptr to the closest reference of \a id (e.g. DivineMarker, PrisonMarker, TempleMarker)
-            /// @note id must be lower case
-            virtual void teleportToClosestMarker(const MWWorld::Ptr& ptr, std::string_view id) = 0;
+        /// Teleports \a ptr to the closest reference of \a id (e.g. DivineMarker, PrisonMarker, TempleMarker)
+        /// @note id must be lower case
+        virtual void teleportToClosestMarker(const MWWorld::Ptr& ptr, std::string_view id) = 0;
 
-            enum DetectionType
-            {
-                Detect_Enchantment,
-                Detect_Key,
-                Detect_Creature
-            };
-            /// List all references (filtered by \a type) detected by \a ptr. The range
-            /// is determined by the current magnitude of the "Detect X" magic effect belonging to \a type.
-            /// @note This also works for references in containers.
-            virtual void listDetectedReferences (const MWWorld::Ptr& ptr, std::vector<MWWorld::Ptr>& out,
-                                                  DetectionType type) = 0;
+        enum DetectionType
+        {
+            Detect_Enchantment,
+            Detect_Key,
+            Detect_Creature
+        };
+        /// List all references (filtered by \a type) detected by \a ptr. The range
+        /// is determined by the current magnitude of the "Detect X" magic effect belonging to \a type.
+        /// @note This also works for references in containers.
+        virtual void listDetectedReferences(const MWWorld::Ptr& ptr, std::vector<MWWorld::Ptr>& out, DetectionType type)
+            = 0;
 
-            /// Update the value of some globals according to the world state, which may be used by dialogue entries.
-            /// This should be called when initiating a dialogue.
-            virtual void updateDialogueGlobals() = 0;
+        /// Update the value of some globals according to the world state, which may be used by dialogue entries.
+        /// This should be called when initiating a dialogue.
+        virtual void updateDialogueGlobals() = 0;
 
-            /// Moves all stolen items from \a ptr to the closest evidence chest.
-            virtual void confiscateStolenItems(const MWWorld::Ptr& ptr) = 0;
+        /// Moves all stolen items from \a ptr to the closest evidence chest.
+        virtual void confiscateStolenItems(const MWWorld::Ptr& ptr) = 0;
 
-            virtual void goToJail () = 0;
+        virtual void goToJail() = 0;
 
-            /// Spawn a random creature from a levelled list next to the player
-            virtual void spawnRandomCreature(std::string_view creatureList) = 0;
+        /// Spawn a random creature from a levelled list next to the player
+        virtual void spawnRandomCreature(std::string_view creatureList) = 0;
 
-            /// Spawn a blood effect for \a ptr at \a worldPosition
-            virtual void spawnBloodEffect (const MWWorld::Ptr& ptr, const osg::Vec3f& worldPosition) = 0;
+        /// Spawn a blood effect for \a ptr at \a worldPosition
+        virtual void spawnBloodEffect(const MWWorld::Ptr& ptr, const osg::Vec3f& worldPosition) = 0;
 
-            virtual void spawnEffect (const std::string& model, const std::string& textureOverride, const osg::Vec3f& worldPos, float scale = 1.f, bool isMagicVFX = true) = 0;
+        virtual void spawnEffect(const std::string& model, const std::string& textureOverride,
+            const osg::Vec3f& worldPos, float scale = 1.f, bool isMagicVFX = true)
+            = 0;
 
-            virtual void activate (const MWWorld::Ptr& object, const MWWorld::Ptr& actor) = 0;
+        virtual void activate(const MWWorld::Ptr& object, const MWWorld::Ptr& actor) = 0;
 
-            /// @see MWWorld::WeatherManager::isInStorm
-            virtual bool isInStorm() const = 0;
+        /// @see MWWorld::WeatherManager::isInStorm
+        virtual bool isInStorm() const = 0;
 
-            /// @see MWWorld::WeatherManager::getStormDirection
-            virtual osg::Vec3f getStormDirection() const = 0;
+        /// @see MWWorld::WeatherManager::getStormDirection
+        virtual osg::Vec3f getStormDirection() const = 0;
 
-            /// Resets all actors in the current active cells to their original location within that cell.
-            virtual void resetActors() = 0;
+        /// Resets all actors in the current active cells to their original location within that cell.
+        virtual void resetActors() = 0;
 
-            virtual bool isWalkingOnWater (const MWWorld::ConstPtr& actor) const = 0;
+        virtual bool isWalkingOnWater(const MWWorld::ConstPtr& actor) const = 0;
 
-            /// Return a vector aiming the actor's weapon towards a target.
-            /// @note The length of the vector is the distance between actor and target.
-            virtual osg::Vec3f aimToTarget(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target, bool isRangedCombat) = 0;
+        /// Return a vector aiming the actor's weapon towards a target.
+        /// @note The length of the vector is the distance between actor and target.
+        virtual osg::Vec3f aimToTarget(
+            const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target, bool isRangedCombat)
+            = 0;
 
-            /// Return the distance between actor's weapon and target's collision box.
-            virtual float getHitDistance(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target) = 0;
+        /// Return the distance between actor's weapon and target's collision box.
+        virtual float getHitDistance(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target) = 0;
 
-            virtual void addContainerScripts(const MWWorld::Ptr& reference, MWWorld::CellStore* cell) = 0;
-            virtual void removeContainerScripts(const MWWorld::Ptr& reference) = 0;
+        virtual void addContainerScripts(const MWWorld::Ptr& reference, MWWorld::CellStore* cell) = 0;
+        virtual void removeContainerScripts(const MWWorld::Ptr& reference) = 0;
 
-            virtual bool isPlayerInJail() const = 0;
+        virtual bool isPlayerInJail() const = 0;
 
-            virtual void rest(double hours) = 0;
+        virtual void rest(double hours) = 0;
 
-            virtual void setPlayerTraveling(bool traveling) = 0;
-            virtual bool isPlayerTraveling() const = 0;
+        virtual void setPlayerTraveling(bool traveling) = 0;
+        virtual bool isPlayerTraveling() const = 0;
 
-            virtual void rotateWorldObject (const MWWorld::Ptr& ptr, const osg::Quat& rotate) = 0;
+        virtual void rotateWorldObject(const MWWorld::Ptr& ptr, const osg::Quat& rotate) = 0;
 
-            /// Return terrain height at \a worldPos position.
-            virtual float getTerrainHeightAt(const osg::Vec3f& worldPos) const = 0;
+        /// Return terrain height at \a worldPos position.
+        virtual float getTerrainHeightAt(const osg::Vec3f& worldPos) const = 0;
 
-            /// Return physical or rendering half extents of the given actor.
-            virtual osg::Vec3f getHalfExtents(const MWWorld::ConstPtr& actor, bool rendering=false) const = 0;
+        /// Return physical or rendering half extents of the given actor.
+        virtual osg::Vec3f getHalfExtents(const MWWorld::ConstPtr& actor, bool rendering = false) const = 0;
 
-            /// Export scene graph to a file and return the filename.
-            /// \param ptr object to export scene graph for (if empty, export entire scene graph)
-            virtual std::filesystem::path exportSceneGraph(const MWWorld::Ptr& ptr) = 0;
+        /// Export scene graph to a file and return the filename.
+        /// \param ptr object to export scene graph for (if empty, export entire scene graph)
+        virtual std::filesystem::path exportSceneGraph(const MWWorld::Ptr& ptr) = 0;
 
-            /// Preload VFX associated with this effect list
-            virtual void preloadEffects(const ESM::EffectList* effectList) = 0;
+        /// Preload VFX associated with this effect list
+        virtual void preloadEffects(const ESM::EffectList* effectList) = 0;
 
-            virtual DetourNavigator::Navigator* getNavigator() const = 0;
+        virtual DetourNavigator::Navigator* getNavigator() const = 0;
 
-            virtual void updateActorPath(const MWWorld::ConstPtr& actor, const std::deque<osg::Vec3f>& path,
-                const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end) const = 0;
+        virtual void updateActorPath(const MWWorld::ConstPtr& actor, const std::deque<osg::Vec3f>& path,
+            const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end) const = 0;
 
-            virtual void removeActorPath(const MWWorld::ConstPtr& actor) const = 0;
+        virtual void removeActorPath(const MWWorld::ConstPtr& actor) const = 0;
 
-            virtual void setNavMeshNumberToRender(const std::size_t value) = 0;
+        virtual void setNavMeshNumberToRender(const std::size_t value) = 0;
 
-            virtual DetourNavigator::AgentBounds getPathfindingAgentBounds(const MWWorld::ConstPtr& actor) const = 0;
+        virtual DetourNavigator::AgentBounds getPathfindingAgentBounds(const MWWorld::ConstPtr& actor) const = 0;
 
-            virtual bool hasCollisionWithDoor(const MWWorld::ConstPtr& door, const osg::Vec3f& position, const osg::Vec3f& destination) const = 0;
+        virtual bool hasCollisionWithDoor(
+            const MWWorld::ConstPtr& door, const osg::Vec3f& position, const osg::Vec3f& destination) const = 0;
 
-            virtual bool isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
-                std::span<const MWWorld::ConstPtr> ignore, std::vector<MWWorld::Ptr>* occupyingActors = nullptr) const = 0;
+        virtual bool isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
+            std::span<const MWWorld::ConstPtr> ignore, std::vector<MWWorld::Ptr>* occupyingActors = nullptr) const = 0;
 
-            virtual void reportStats(unsigned int frameNumber, osg::Stats& stats) const = 0;
+        virtual void reportStats(unsigned int frameNumber, osg::Stats& stats) const = 0;
 
-            virtual std::vector<MWWorld::Ptr> getAll(const std::string& id) = 0;
+        virtual std::vector<MWWorld::Ptr> getAll(const std::string& id) = 0;
 
-            virtual Misc::Rng::Generator& getPrng() = 0;
+        virtual Misc::Rng::Generator& getPrng() = 0;
 
-            virtual MWRender::RenderingManager* getRenderingManager() = 0;
+        virtual MWRender::RenderingManager* getRenderingManager() = 0;
 
-            virtual MWRender::PostProcessor* getPostProcessor() = 0;
+        virtual MWRender::PostProcessor* getPostProcessor() = 0;
 
-            virtual void setActorActive(const MWWorld::Ptr& ptr, bool value) = 0;
+        virtual void setActorActive(const MWWorld::Ptr& ptr, bool value) = 0;
     };
 }
 
diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index a651a1f0b5..e12590b63b 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -3,23 +3,22 @@
 #include <MyGUI_TextIterator.h>
 
 #include <components/esm3/loadacti.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadsndg.hpp>
+#include <components/esm3/loadsoun.hpp>
 #include <components/misc/rng.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
-#include <components/esm3/loadsoun.hpp>
-#include <components/esm3/loadsndg.hpp>
-#include <components/esm3/loadacti.hpp>
-#include <components/esm3/loadcrea.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
+#include "../mwworld/action.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
-#include "../mwworld/ptr.hpp"
-#include "../mwworld/action.hpp"
 #include "../mwworld/failedaction.hpp"
 #include "../mwworld/nullaction.hpp"
+#include "../mwworld/ptr.hpp"
 
 #include "../mwphysics/physicssystem.hpp"
 
@@ -41,7 +40,8 @@ namespace MWClass
     {
     }
 
-    void Activator::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
+    void Activator::insertObjectRendering(
+        const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
         if (!model.empty())
         {
@@ -50,17 +50,19 @@ namespace MWClass
         }
     }
 
-    void Activator::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
+    void Activator::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+        MWPhysics::PhysicsSystem& physics) const
     {
         insertObjectPhysics(ptr, model, rotation, physics);
     }
 
-    void Activator::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
+    void Activator::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+        MWPhysics::PhysicsSystem& physics) const
     {
         physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World);
     }
 
-    std::string Activator::getModel(const MWWorld::ConstPtr &ptr) const
+    std::string Activator::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Activator>(ptr);
     }
@@ -77,31 +79,31 @@ namespace MWClass
 
     std::string_view Activator::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Activator> *ref = ptr.get<ESM::Activator>();
+        const MWWorld::LiveCellRef<ESM::Activator>* ref = ptr.get<ESM::Activator>();
 
         return ref->mBase->mName;
     }
 
     std::string_view Activator::getScript(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Activator> *ref =
-            ptr.get<ESM::Activator>();
+        const MWWorld::LiveCellRef<ESM::Activator>* ref = ptr.get<ESM::Activator>();
 
         return ref->mBase->mScript;
     }
 
-    bool Activator::hasToolTip (const MWWorld::ConstPtr& ptr) const
+    bool Activator::hasToolTip(const MWWorld::ConstPtr& ptr) const
     {
         return !getName(ptr).empty();
     }
 
-    MWGui::ToolTipInfo Activator::getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const
+    MWGui::ToolTipInfo Activator::getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const
     {
-        const MWWorld::LiveCellRef<ESM::Activator> *ref = ptr.get<ESM::Activator>();
+        const MWWorld::LiveCellRef<ESM::Activator>* ref = ptr.get<ESM::Activator>();
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption
+            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
 
         std::string text;
         if (MWBase::Environment::get().getWindowManager()->getFullHelp())
@@ -114,41 +116,42 @@ namespace MWClass
         return info;
     }
 
-    std::unique_ptr<MWWorld::Action> Activator::activate(const MWWorld::Ptr &ptr, const MWWorld::Ptr &actor) const
+    std::unique_ptr<MWWorld::Action> Activator::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
     {
-        if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
+        if (actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
-            const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
+            const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-            const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfActivator", prng);
+            const ESM::Sound* sound = store.get<ESM::Sound>().searchRandom("WolfActivator", prng);
 
             std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::FailedAction>("#{sWerewolfRefusal}");
-            if(sound) action->setSound(sound->mId);
+            if (sound)
+                action->setSound(sound->mId);
 
             return action;
         }
         return std::make_unique<MWWorld::NullAction>();
     }
 
-
-    MWWorld::Ptr Activator::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
+    MWWorld::Ptr Activator::copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const
     {
-        const MWWorld::LiveCellRef<ESM::Activator> *ref = ptr.get<ESM::Activator>();
+        const MWWorld::LiveCellRef<ESM::Activator>* ref = ptr.get<ESM::Activator>();
 
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
 
     std::string_view Activator::getSoundIdFromSndGen(const MWWorld::Ptr& ptr, std::string_view name) const
     {
-        const std::string model = getModel(ptr); // Assume it's not empty, since we wouldn't have gotten the soundgen otherwise
-        const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore(); 
+        const std::string model
+            = getModel(ptr); // Assume it's not empty, since we wouldn't have gotten the soundgen otherwise
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
         std::string_view creatureId;
         const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
-        for (const ESM::Creature &iter : store.get<ESM::Creature>())
+        for (const ESM::Creature& iter : store.get<ESM::Creature>())
         {
-            if (!iter.mModel.empty() && Misc::StringUtils::ciEqual(model,
-                Misc::ResourceHelpers::correctMeshPath(iter.mModel, vfs)))
+            if (!iter.mModel.empty()
+                && Misc::StringUtils::ciEqual(model, Misc::ResourceHelpers::correctMeshPath(iter.mModel, vfs)))
             {
                 creatureId = !iter.mOriginal.empty() ? iter.mOriginal : iter.mId;
                 break;
@@ -162,9 +165,11 @@ namespace MWClass
         if (!creatureId.empty())
         {
             std::vector<const ESM::SoundGenerator*> sounds;
-            for (auto sound = store.get<ESM::SoundGenerator>().begin(); sound != store.get<ESM::SoundGenerator>().end(); ++sound)
+            for (auto sound = store.get<ESM::SoundGenerator>().begin(); sound != store.get<ESM::SoundGenerator>().end();
+                 ++sound)
             {
-                if (type == sound->mType && !sound->mCreature.empty() && (Misc::StringUtils::ciEqual(creatureId, sound->mCreature)))
+                if (type == sound->mType && !sound->mCreature.empty()
+                    && (Misc::StringUtils::ciEqual(creatureId, sound->mCreature)))
                     sounds.push_back(&*sound);
                 if (type == sound->mType && sound->mCreature.empty())
                     fallbacksounds.push_back(&*sound);
@@ -178,7 +183,8 @@ namespace MWClass
         else
         {
             // The activator doesn't have a corresponding creature ID, but we can try to use the defaults
-            for (auto sound = store.get<ESM::SoundGenerator>().begin(); sound != store.get<ESM::SoundGenerator>().end(); ++sound)
+            for (auto sound = store.get<ESM::SoundGenerator>().begin(); sound != store.get<ESM::SoundGenerator>().end();
+                 ++sound)
                 if (type == sound->mType && sound->mCreature.empty())
                     fallbacksounds.push_back(&*sound);
 
diff --git a/apps/openmw/mwclass/activator.hpp b/apps/openmw/mwclass/activator.hpp
index 12dce7a893..89478b5e80 100644
--- a/apps/openmw/mwclass/activator.hpp
+++ b/apps/openmw/mwclass/activator.hpp
@@ -7,45 +7,48 @@ namespace MWClass
 {
     class Activator final : public MWWorld::RegisteredClass<Activator>
     {
-            friend MWWorld::RegisteredClass<Activator>;
+        friend MWWorld::RegisteredClass<Activator>;
 
-            Activator();
+        Activator();
 
-            MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
+        MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const override;
 
-            static int getSndGenTypeFromName(std::string_view name);
+        static int getSndGenTypeFromName(std::string_view name);
 
-        public:
-            void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
-            ///< Add reference into a cell for rendering
+    public:
+        void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
+            MWRender::RenderingInterface& renderingInterface) const override;
+        ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const override;
+        void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+            MWPhysics::PhysicsSystem& physics) const override;
 
-            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const override;
+        void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+            MWPhysics::PhysicsSystem& physics) const override;
 
-            std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
-            ///< \return name or ID; can return an empty string.
+        std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return name or ID; can return an empty string.
 
-            bool hasToolTip (const MWWorld::ConstPtr& ptr) const override;
-            ///< @return true if this object has a tooltip when focused (default implementation: true)
+        bool hasToolTip(const MWWorld::ConstPtr& ptr) const override;
+        ///< @return true if this object has a tooltip when focused (default implementation: true)
 
-            MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const override;
-            ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
+        MWGui::ToolTipInfo getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const override;
+        ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
-            std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of the script attached to ptr
+        std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of the script attached to ptr
 
-            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
-            ///< Generate action for activation
+        std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
+        ///< Generate action for activation
 
-            std::string getModel(const MWWorld::ConstPtr &ptr) const override;
+        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
 
-            bool useAnim() const override;
-            ///< Whether or not to use animated variant of model (default false)
+        bool useAnim() const override;
+        ///< Whether or not to use animated variant of model (default false)
 
-            bool isActivator() const override;
+        bool isActivator() const override;
 
-            std::string_view getSoundIdFromSndGen(const MWWorld::Ptr& ptr, std::string_view name) const override;
+        std::string_view getSoundIdFromSndGen(const MWWorld::Ptr& ptr, std::string_view name) const override;
     };
 }
 
diff --git a/apps/openmw/mwclass/actor.cpp b/apps/openmw/mwclass/actor.cpp
index 8b291c5882..fec405b482 100644
--- a/apps/openmw/mwclass/actor.cpp
+++ b/apps/openmw/mwclass/actor.cpp
@@ -3,13 +3,13 @@
 #include <components/esm3/loadmgef.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/soundmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"
-#include "../mwmechanics/movement.hpp"
 #include "../mwmechanics/magiceffects.hpp"
+#include "../mwmechanics/movement.hpp"
 
 #include "../mwphysics/physicssystem.hpp"
 
@@ -22,7 +22,8 @@ namespace MWClass
         MWBase::Environment::get().getWorld()->adjustPosition(ptr, force);
     }
 
-    void Actor::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
+    void Actor::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+        MWPhysics::PhysicsSystem& physics) const
     {
         physics.addActor(ptr, model);
         if (getCreatureStats(ptr).isDead() && getCreatureStats(ptr).isDeathAnimationFinished())
@@ -34,14 +35,14 @@ namespace MWClass
         return true;
     }
 
-    void Actor::block(const MWWorld::Ptr &ptr) const
+    void Actor::block(const MWWorld::Ptr& ptr) const
     {
         const MWWorld::InventoryStore& inv = getInventoryStore(ptr);
         MWWorld::ConstContainerStoreIterator shield = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
         if (shield == inv.end())
             return;
 
-        MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
+        MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
         switch (shield->getClass().getEquipmentSkill(*shield))
         {
             case ESM::Skill::LightArmor:
@@ -60,7 +61,7 @@ namespace MWClass
 
     osg::Vec3f Actor::getRotationVector(const MWWorld::Ptr& ptr) const
     {
-        MWMechanics::Movement &movement = getMovementSettings(ptr);
+        MWMechanics::Movement& movement = getMovementSettings(ptr);
         osg::Vec3f vec(movement.mRotation[0], movement.mRotation[1], movement.mRotation[2]);
         movement.mRotation[0] = 0.0f;
         movement.mRotation[1] = 0.0f;
@@ -78,7 +79,8 @@ namespace MWClass
         return (weight < 0) ? 0.0f : weight;
     }
 
-    bool Actor::allowTelekinesis(const MWWorld::ConstPtr &ptr) const {
+    bool Actor::allowTelekinesis(const MWWorld::ConstPtr& ptr) const
+    {
         return false;
     }
 
diff --git a/apps/openmw/mwclass/actor.hpp b/apps/openmw/mwclass/actor.hpp
index fca610bc41..fae31b8d20 100644
--- a/apps/openmw/mwclass/actor.hpp
+++ b/apps/openmw/mwclass/actor.hpp
@@ -19,30 +19,33 @@ namespace MWClass
     class Actor : public MWWorld::Class
     {
     protected:
-
-        explicit Actor(unsigned type) : Class(type) {}
+        explicit Actor(unsigned type)
+            : Class(type)
+        {
+        }
 
         template <class GMST>
-        float getSwimSpeedImpl(const MWWorld::Ptr& ptr, const GMST& gmst, const MWMechanics::MagicEffects& mageffects, float baseSpeed) const
+        float getSwimSpeedImpl(const MWWorld::Ptr& ptr, const GMST& gmst, const MWMechanics::MagicEffects& mageffects,
+            float baseSpeed) const
         {
-            return baseSpeed
-                * (1.0f + 0.01f * mageffects.get(ESM::MagicEffect::SwiftSwim).getMagnitude())
+            return baseSpeed * (1.0f + 0.01f * mageffects.get(ESM::MagicEffect::SwiftSwim).getMagnitude())
                 * (gmst.fSwimRunBase->mValue.getFloat()
-                   + 0.01f * getSkill(ptr, ESM::Skill::Athletics) * gmst.fSwimRunAthleticsMult->mValue.getFloat());
+                    + 0.01f * getSkill(ptr, ESM::Skill::Athletics) * gmst.fSwimRunAthleticsMult->mValue.getFloat());
         }
 
     public:
-         ~Actor() override = default;
+        ~Actor() override = default;
 
         void adjustPosition(const MWWorld::Ptr& ptr, bool force) const override;
         ///< Adjust position to stand on ground. Must be called post model load
         /// @param force do this even if the ptr is flying
 
-        void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const override;
+        void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+            MWPhysics::PhysicsSystem& physics) const override;
 
         bool useAnim() const override;
 
-        void block(const MWWorld::Ptr &ptr) const override;
+        void block(const MWWorld::Ptr& ptr) const override;
 
         osg::Vec3f getRotationVector(const MWWorld::Ptr& ptr) const override;
         ///< Return desired rotations, as euler angles. Sets getMovementSettings(ptr).mRotation to zero.
@@ -58,10 +61,10 @@ namespace MWClass
 
         /// Return current movement speed.
         float getCurrentSpeed(const MWWorld::Ptr& ptr) const override;
-        
+
         // not implemented
         Actor(const Actor&) = delete;
-        Actor& operator= (const Actor&) = delete;
+        Actor& operator=(const Actor&) = delete;
     };
 }
 
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 885fbb3bbc..aab3c2b583 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -2,14 +2,14 @@
 
 #include <MyGUI_TextIterator.h>
 
-#include <components/esm3/loadappa.hpp>
-#include <components/esm3/loadnpc.hpp>
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include <components/esm3/loadappa.hpp>
+#include <components/esm3/loadnpc.hpp>
 
-#include "../mwworld/ptr.hpp"
 #include "../mwworld/actionalchemy.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/ptr.hpp"
 
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
@@ -26,42 +26,43 @@ namespace MWClass
     {
     }
 
-    void Apparatus::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
+    void Apparatus::insertObjectRendering(
+        const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
-        if (!model.empty()) {
+        if (!model.empty())
+        {
             renderingInterface.getObjects().insertModel(ptr, model);
         }
     }
 
-    std::string Apparatus::getModel(const MWWorld::ConstPtr &ptr) const
+    std::string Apparatus::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Apparatus>(ptr);
     }
 
     std::string_view Apparatus::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Apparatus> *ref = ptr.get<ESM::Apparatus>();
+        const MWWorld::LiveCellRef<ESM::Apparatus>* ref = ptr.get<ESM::Apparatus>();
         const std::string& name = ref->mBase->mName;
 
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::unique_ptr<MWWorld::Action> Apparatus::activate (const MWWorld::Ptr& ptr,
-        const MWWorld::Ptr& actor) const
+    std::unique_ptr<MWWorld::Action> Apparatus::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
     {
         return defaultItemActivate(ptr, actor);
     }
 
     std::string_view Apparatus::getScript(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Apparatus> *ref = ptr.get<ESM::Apparatus>();
+        const MWWorld::LiveCellRef<ESM::Apparatus>* ref = ptr.get<ESM::Apparatus>();
 
         return ref->mBase->mScript;
     }
 
-    int Apparatus::getValue (const MWWorld::ConstPtr& ptr) const
+    int Apparatus::getValue(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Apparatus> *ref = ptr.get<ESM::Apparatus>();
+        const MWWorld::LiveCellRef<ESM::Apparatus>* ref = ptr.get<ESM::Apparatus>();
 
         return ref->mBase->mData.mValue;
     }
@@ -78,18 +79,19 @@ namespace MWClass
 
     const std::string& Apparatus::getInventoryIcon(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Apparatus> *ref = ptr.get<ESM::Apparatus>();
+        const MWWorld::LiveCellRef<ESM::Apparatus>* ref = ptr.get<ESM::Apparatus>();
 
         return ref->mBase->mIcon;
     }
 
-    MWGui::ToolTipInfo Apparatus::getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const
+    MWGui::ToolTipInfo Apparatus::getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const
     {
-        const MWWorld::LiveCellRef<ESM::Apparatus> *ref = ptr.get<ESM::Apparatus>();
+        const MWWorld::LiveCellRef<ESM::Apparatus>* ref = ptr.get<ESM::Apparatus>();
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption
+            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
         info.icon = ref->mBase->mIcon;
 
         std::string text;
@@ -107,26 +109,26 @@ namespace MWClass
         return info;
     }
 
-    std::unique_ptr<MWWorld::Action> Apparatus::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Apparatus::use(const MWWorld::Ptr& ptr, bool force) const
     {
         return std::make_unique<MWWorld::ActionAlchemy>(force);
     }
 
-    MWWorld::Ptr Apparatus::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
+    MWWorld::Ptr Apparatus::copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const
     {
-        const MWWorld::LiveCellRef<ESM::Apparatus> *ref = ptr.get<ESM::Apparatus>();
+        const MWWorld::LiveCellRef<ESM::Apparatus>* ref = ptr.get<ESM::Apparatus>();
 
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
 
-    bool Apparatus::canSell (const MWWorld::ConstPtr& item, int npcServices) const
+    bool Apparatus::canSell(const MWWorld::ConstPtr& item, int npcServices) const
     {
         return (npcServices & ESM::NPC::Apparatus) != 0;
     }
 
-    float Apparatus::getWeight(const MWWorld::ConstPtr &ptr) const
+    float Apparatus::getWeight(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Apparatus> *ref = ptr.get<ESM::Apparatus>();
+        const MWWorld::LiveCellRef<ESM::Apparatus>* ref = ptr.get<ESM::Apparatus>();
         return ref->mBase->mData.mWeight;
     }
 }
diff --git a/apps/openmw/mwclass/apparatus.hpp b/apps/openmw/mwclass/apparatus.hpp
index 43e85a9be6..83036b512d 100644
--- a/apps/openmw/mwclass/apparatus.hpp
+++ b/apps/openmw/mwclass/apparatus.hpp
@@ -7,50 +7,49 @@ namespace MWClass
 {
     class Apparatus : public MWWorld::RegisteredClass<Apparatus>
     {
-            friend MWWorld::RegisteredClass<Apparatus>;
+        friend MWWorld::RegisteredClass<Apparatus>;
 
-            Apparatus();
+        Apparatus();
 
-            MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
+        MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const override;
 
-        public:
+    public:
+        float getWeight(const MWWorld::ConstPtr& ptr) const override;
 
-            float getWeight (const MWWorld::ConstPtr& ptr) const override;
+        void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
+            MWRender::RenderingInterface& renderingInterface) const override;
+        ///< Add reference into a cell for rendering
 
-            void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
-            ///< Add reference into a cell for rendering
+        std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return name or ID; can return an empty string.
 
-            std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
-            ///< \return name or ID; can return an empty string.
+        std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
+        ///< Generate action for activation
 
-            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
-                const MWWorld::Ptr& actor) const override;
-            ///< Generate action for activation
+        std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of the script attached to ptr
 
-            std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of the script attached to ptr
+        int getValue(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            int getValue (const MWWorld::ConstPtr& ptr) const override;
-            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+        MWGui::ToolTipInfo getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const override;
+        ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
-            MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const override;
-            ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
+        std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the pick up sound Id
 
-            std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the pick up sound Id
+        std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the put down sound Id
 
-            std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the put down sound Id
+        const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of inventory icon.
 
-            const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of inventory icon.
+        std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
+        ///< Generate action for using via inventory menu
 
-            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
-            ///< Generate action for using via inventory menu
+        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
 
-            std::string getModel(const MWWorld::ConstPtr &ptr) const override;
-
-            bool canSell (const MWWorld::ConstPtr& item, int npcServices) const override;
+        bool canSell(const MWWorld::ConstPtr& item, int npcServices) const override;
     };
 }
 
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index b4a9d73c5c..d118d37cd6 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -3,26 +3,26 @@
 #include <MyGUI_TextIterator.h>
 
 #include <components/esm3/loadarmo.hpp>
-#include <components/esm3/loadskil.hpp>
 #include <components/esm3/loadgmst.hpp>
-#include <components/esm3/loadrace.hpp>
 #include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/ptr.hpp"
 #include "../mwworld/actionequip.hpp"
-#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"
-#include "../mwworld/esmstore.hpp"
 #include "../mwworld/containerstore.hpp"
+#include "../mwworld/esmstore.hpp"
+#include "../mwworld/inventorystore.hpp"
+#include "../mwworld/ptr.hpp"
 
-#include "../mwrender/objects.hpp"
-#include "../mwrender/renderinginterface.hpp"
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/weapontype.hpp"
+#include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
 #include "../mwgui/tooltips.hpp"
 #include "../mwgui/ustring.hpp"
@@ -36,62 +36,61 @@ namespace MWClass
     {
     }
 
-    void Armor::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
+    void Armor::insertObjectRendering(
+        const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
-        if (!model.empty()) {
+        if (!model.empty())
+        {
             renderingInterface.getObjects().insertModel(ptr, model);
         }
     }
 
-    std::string Armor::getModel(const MWWorld::ConstPtr &ptr) const
+    std::string Armor::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Armor>(ptr);
     }
 
     std::string_view Armor::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
+        const MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
         const std::string& name = ref->mBase->mName;
 
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::unique_ptr<MWWorld::Action> Armor::activate (const MWWorld::Ptr& ptr,
-        const MWWorld::Ptr& actor) const
+    std::unique_ptr<MWWorld::Action> Armor::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
     {
         return defaultItemActivate(ptr, actor);
     }
 
-    bool Armor::hasItemHealth (const MWWorld::ConstPtr& ptr) const
+    bool Armor::hasItemHealth(const MWWorld::ConstPtr& ptr) const
     {
         return true;
     }
 
-    int Armor::getItemMaxHealth (const MWWorld::ConstPtr& ptr) const
+    int Armor::getItemMaxHealth(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
+        const MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
 
         return ref->mBase->mData.mHealth;
     }
 
     std::string_view Armor::getScript(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
+        const MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
 
         return ref->mBase->mScript;
     }
 
-    std::pair<std::vector<int>, bool> Armor::getEquipmentSlots (const MWWorld::ConstPtr& ptr) const
+    std::pair<std::vector<int>, bool> Armor::getEquipmentSlots(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
+        const MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
 
         std::vector<int> slots_;
 
         const int size = 11;
 
-        static const int sMapping[size][2] =
-        {
-            { ESM::Armor::Helmet, MWWorld::InventoryStore::Slot_Helmet },
+        static const int sMapping[size][2] = { { ESM::Armor::Helmet, MWWorld::InventoryStore::Slot_Helmet },
             { ESM::Armor::Cuirass, MWWorld::InventoryStore::Slot_Cuirass },
             { ESM::Armor::LPauldron, MWWorld::InventoryStore::Slot_LeftPauldron },
             { ESM::Armor::RPauldron, MWWorld::InventoryStore::Slot_RightPauldron },
@@ -101,63 +100,78 @@ namespace MWClass
             { ESM::Armor::RGauntlet, MWWorld::InventoryStore::Slot_RightGauntlet },
             { ESM::Armor::Shield, MWWorld::InventoryStore::Slot_CarriedLeft },
             { ESM::Armor::LBracer, MWWorld::InventoryStore::Slot_LeftGauntlet },
-            { ESM::Armor::RBracer, MWWorld::InventoryStore::Slot_RightGauntlet }
-        };
+            { ESM::Armor::RBracer, MWWorld::InventoryStore::Slot_RightGauntlet } };
 
-        for (int i=0; i<size; ++i)
-            if (sMapping[i][0]==ref->mBase->mData.mType)
+        for (int i = 0; i < size; ++i)
+            if (sMapping[i][0] == ref->mBase->mData.mType)
             {
-                slots_.push_back (int (sMapping[i][1]));
+                slots_.push_back(int(sMapping[i][1]));
                 break;
             }
 
-        return std::make_pair (slots_, false);
+        return std::make_pair(slots_, false);
     }
 
-    int Armor::getEquipmentSkill (const MWWorld::ConstPtr& ptr) const
+    int Armor::getEquipmentSkill(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
+        const MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
 
         std::string_view typeGmst;
 
         switch (ref->mBase->mData.mType)
         {
-            case ESM::Armor::Helmet: typeGmst = "iHelmWeight"; break;
-            case ESM::Armor::Cuirass: typeGmst = "iCuirassWeight"; break;
+            case ESM::Armor::Helmet:
+                typeGmst = "iHelmWeight";
+                break;
+            case ESM::Armor::Cuirass:
+                typeGmst = "iCuirassWeight";
+                break;
             case ESM::Armor::LPauldron:
-            case ESM::Armor::RPauldron: typeGmst = "iPauldronWeight"; break;
-            case ESM::Armor::Greaves: typeGmst = "iGreavesWeight"; break;
-            case ESM::Armor::Boots: typeGmst = "iBootsWeight"; break;
+            case ESM::Armor::RPauldron:
+                typeGmst = "iPauldronWeight";
+                break;
+            case ESM::Armor::Greaves:
+                typeGmst = "iGreavesWeight";
+                break;
+            case ESM::Armor::Boots:
+                typeGmst = "iBootsWeight";
+                break;
             case ESM::Armor::LGauntlet:
-            case ESM::Armor::RGauntlet: typeGmst = "iGauntletWeight"; break;
-            case ESM::Armor::Shield: typeGmst = "iShieldWeight"; break;
+            case ESM::Armor::RGauntlet:
+                typeGmst = "iGauntletWeight";
+                break;
+            case ESM::Armor::Shield:
+                typeGmst = "iShieldWeight";
+                break;
             case ESM::Armor::LBracer:
-            case ESM::Armor::RBracer: typeGmst = "iGauntletWeight"; break;
+            case ESM::Armor::RBracer:
+                typeGmst = "iGauntletWeight";
+                break;
         }
 
         if (typeGmst.empty())
             return -1;
 
-        const MWWorld::Store<ESM::GameSetting> &gmst =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
         float iWeight = floor(gmst.find(typeGmst)->mValue.getFloat());
 
         float epsilon = 0.0005f;
 
-        if (ref->mBase->mData.mWeight <= iWeight * gmst.find ("fLightMaxMod")->mValue.getFloat() + epsilon)
+        if (ref->mBase->mData.mWeight <= iWeight * gmst.find("fLightMaxMod")->mValue.getFloat() + epsilon)
             return ESM::Skill::LightArmor;
 
-        if (ref->mBase->mData.mWeight <= iWeight * gmst.find ("fMedMaxMod")->mValue.getFloat() + epsilon)
+        if (ref->mBase->mData.mWeight <= iWeight * gmst.find("fMedMaxMod")->mValue.getFloat() + epsilon)
             return ESM::Skill::MediumArmor;
 
         else
             return ESM::Skill::HeavyArmor;
     }
 
-    int Armor::getValue (const MWWorld::ConstPtr& ptr) const
+    int Armor::getValue(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
+        const MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
 
         return ref->mBase->mData.mValue;
     }
@@ -186,18 +200,19 @@ namespace MWClass
 
     const std::string& Armor::getInventoryIcon(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
+        const MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
 
         return ref->mBase->mIcon;
     }
 
-    MWGui::ToolTipInfo Armor::getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const
+    MWGui::ToolTipInfo Armor::getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const
     {
-        const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
+        const MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption
+            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
         info.icon = ref->mBase->mIcon;
 
         std::string text;
@@ -210,7 +225,7 @@ namespace MWClass
         }
         else
         {
-            int armorType = getEquipmentSkill(ptr);       
+            int armorType = getEquipmentSkill(ptr);
             if (armorType == ESM::Skill::LightArmor)
                 typeText = "#{sLight}";
             else if (armorType == ESM::Skill::MediumArmor)
@@ -219,12 +234,12 @@ namespace MWClass
                 typeText = "#{sHeavy}";
         }
 
-        text += "\n#{sArmorRating}: " + MWGui::ToolTips::toString(static_cast<int>(getEffectiveArmorRating(ptr,
-            MWMechanics::getPlayer())));
+        text += "\n#{sArmorRating}: "
+            + MWGui::ToolTips::toString(static_cast<int>(getEffectiveArmorRating(ptr, MWMechanics::getPlayer())));
 
         int remainingHealth = getItemHealth(ptr);
         text += "\n#{sCondition}: " + MWGui::ToolTips::toString(remainingHealth) + "/"
-                + MWGui::ToolTips::toString(ref->mBase->mData.mHealth);
+            + MWGui::ToolTips::toString(ref->mBase->mData.mHealth);
 
         if (!typeText.empty())
         {
@@ -252,35 +267,36 @@ namespace MWClass
 
     std::string_view Armor::getEnchantment(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
+        const MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
 
         return ref->mBase->mEnchant;
     }
 
-    const std::string& Armor::applyEnchantment(const MWWorld::ConstPtr& ptr, const std::string& enchId, int enchCharge, const std::string& newName) const
+    const std::string& Armor::applyEnchantment(
+        const MWWorld::ConstPtr& ptr, const std::string& enchId, int enchCharge, const std::string& newName) const
     {
-        const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
+        const MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
 
         ESM::Armor newItem = *ref->mBase;
         newItem.mId.clear();
-        newItem.mName=newName;
-        newItem.mData.mEnchant=enchCharge;
-        newItem.mEnchant=enchId;
-        const ESM::Armor *record = MWBase::Environment::get().getWorld()->createRecord (newItem);
+        newItem.mName = newName;
+        newItem.mData.mEnchant = enchCharge;
+        newItem.mEnchant = enchId;
+        const ESM::Armor* record = MWBase::Environment::get().getWorld()->createRecord(newItem);
         return record->mId;
     }
 
-    float Armor::getEffectiveArmorRating(const MWWorld::ConstPtr &ptr, const MWWorld::Ptr &actor) const
+    float Armor::getEffectiveArmorRating(const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& actor) const
     {
-        const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
+        const MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
 
         int armorSkillType = getEquipmentSkill(ptr);
         float armorSkill = actor.getClass().getSkill(actor, armorSkillType);
 
-        const MWBase::World *world = MWBase::Environment::get().getWorld();
+        const MWBase::World* world = MWBase::Environment::get().getWorld();
         int iBaseArmorSkill = world->getStore().get<ESM::GameSetting>().find("iBaseArmorSkill")->mValue.getInteger();
 
-        if(ref->mBase->mData.mWeight == 0)
+        if (ref->mBase->mData.mWeight == 0)
             return ref->mBase->mData.mArmor;
         else
             return ref->mBase->mData.mArmor * armorSkill / static_cast<float>(iBaseArmorSkill);
@@ -291,13 +307,13 @@ namespace MWClass
         const MWWorld::InventoryStore& invStore = npc.getClass().getInventoryStore(npc);
 
         if (getItemHealth(ptr) == 0)
-            return {0, "#{sInventoryMessage1}"};
+            return { 0, "#{sInventoryMessage1}" };
 
         // slots that this item can be equipped in
         std::pair<std::vector<int>, bool> slots_ = getEquipmentSlots(ptr);
 
         if (slots_.first.empty())
-            return {0, {}};
+            return { 0, {} };
 
         if (npc.getClass().isNpc())
         {
@@ -305,41 +321,41 @@ namespace MWClass
 
             // Beast races cannot equip shoes / boots, or full helms (head part vs hair part)
             const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(npcRace);
-            if(race->mData.mFlags & ESM::Race::Beast)
+            if (race->mData.mFlags & ESM::Race::Beast)
             {
                 std::vector<ESM::PartReference> parts = ptr.get<ESM::Armor>()->mBase->mParts.mParts;
 
-                for(std::vector<ESM::PartReference>::iterator itr = parts.begin(); itr != parts.end(); ++itr)
+                for (std::vector<ESM::PartReference>::iterator itr = parts.begin(); itr != parts.end(); ++itr)
                 {
-                    if((*itr).mPart == ESM::PRT_Head)
-                        return {0, "#{sNotifyMessage13}"};
-                    if((*itr).mPart == ESM::PRT_LFoot || (*itr).mPart == ESM::PRT_RFoot)
-                        return {0, "#{sNotifyMessage14}"};
+                    if ((*itr).mPart == ESM::PRT_Head)
+                        return { 0, "#{sNotifyMessage13}" };
+                    if ((*itr).mPart == ESM::PRT_LFoot || (*itr).mPart == ESM::PRT_RFoot)
+                        return { 0, "#{sNotifyMessage14}" };
                 }
             }
         }
 
-        for (std::vector<int>::const_iterator slot=slots_.first.begin();
-            slot!=slots_.first.end(); ++slot)
+        for (std::vector<int>::const_iterator slot = slots_.first.begin(); slot != slots_.first.end(); ++slot)
         {
             // If equipping a shield, check if there's a twohanded weapon conflicting with it
-            if(*slot == MWWorld::InventoryStore::Slot_CarriedLeft)
+            if (*slot == MWWorld::InventoryStore::Slot_CarriedLeft)
             {
-                MWWorld::ConstContainerStoreIterator weapon = invStore.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-                if(weapon != invStore.end() && weapon->getType() == ESM::Weapon::sRecordId)
+                MWWorld::ConstContainerStoreIterator weapon
+                    = invStore.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+                if (weapon != invStore.end() && weapon->getType() == ESM::Weapon::sRecordId)
                 {
-                    const MWWorld::LiveCellRef<ESM::Weapon> *ref = weapon->get<ESM::Weapon>();
+                    const MWWorld::LiveCellRef<ESM::Weapon>* ref = weapon->get<ESM::Weapon>();
                     if (MWMechanics::getWeaponType(ref->mBase->mData.mType)->mFlags & ESM::WeaponType::TwoHanded)
-                        return {3, {}};
+                        return { 3, {} };
                 }
 
-                return {1, {}};
+                return { 1, {} };
             }
         }
-        return {1, {}};
+        return { 1, {} };
     }
 
-    std::unique_ptr<MWWorld::Action> Armor::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Armor::use(const MWWorld::Ptr& ptr, bool force) const
     {
         std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::ActionEquip>(ptr, force);
 
@@ -348,29 +364,29 @@ namespace MWClass
         return action;
     }
 
-    MWWorld::Ptr Armor::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
+    MWWorld::Ptr Armor::copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const
     {
-        const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
+        const MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
 
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
 
-    int Armor::getEnchantmentPoints (const MWWorld::ConstPtr& ptr) const
+    int Armor::getEnchantmentPoints(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
+        const MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
 
         return ref->mBase->mData.mEnchant;
     }
 
-    bool Armor::canSell (const MWWorld::ConstPtr& item, int npcServices) const
+    bool Armor::canSell(const MWWorld::ConstPtr& item, int npcServices) const
     {
         return (npcServices & ESM::NPC::Armor)
-                || ((npcServices & ESM::NPC::MagicItems) && !getEnchantment(item).empty());
+            || ((npcServices & ESM::NPC::MagicItems) && !getEnchantment(item).empty());
     }
 
-    float Armor::getWeight(const MWWorld::ConstPtr &ptr) const
+    float Armor::getWeight(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
+        const MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
         return ref->mBase->mData.mWeight;
     }
 }
diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp
index 5c9732f2ca..86b06715b1 100644
--- a/apps/openmw/mwclass/armor.hpp
+++ b/apps/openmw/mwclass/armor.hpp
@@ -7,79 +7,81 @@ namespace MWClass
 {
     class Armor : public MWWorld::RegisteredClass<Armor>
     {
-            friend MWWorld::RegisteredClass<Armor>;
+        friend MWWorld::RegisteredClass<Armor>;
 
-            Armor();
+        Armor();
 
-            MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
+        MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const override;
 
-        public:
+    public:
+        float getWeight(const MWWorld::ConstPtr& ptr) const override;
 
-            float getWeight (const MWWorld::ConstPtr& ptr) const override;
+        void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
+            MWRender::RenderingInterface& renderingInterface) const override;
+        ///< Add reference into a cell for rendering
 
-            void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
-            ///< Add reference into a cell for rendering
+        std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return name or ID; can return an empty string.
 
-            std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
-            ///< \return name or ID; can return an empty string.
+        std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
+        ///< Generate action for activation
 
-            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
-                const MWWorld::Ptr& actor) const override;
-            ///< Generate action for activation
+        bool hasItemHealth(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return Item health data available?
 
-            bool hasItemHealth (const MWWorld::ConstPtr& ptr) const override;
-            ///< \return Item health data available?
+        int getItemMaxHealth(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return item max health or throw an exception, if class does not have item health
 
-            int getItemMaxHealth (const MWWorld::ConstPtr& ptr) const override;
-            ///< Return item max health or throw an exception, if class does not have item health
+        std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of the script attached to ptr
 
-            std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of the script attached to ptr
+        std::pair<std::vector<int>, bool> getEquipmentSlots(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return first: Return IDs of the slot this object can be equipped in; second: can object
+        /// stay stacked when equipped?
 
-            std::pair<std::vector<int>, bool> getEquipmentSlots (const MWWorld::ConstPtr& ptr) const override;
-            ///< \return first: Return IDs of the slot this object can be equipped in; second: can object
-            /// stay stacked when equipped?
+        int getEquipmentSkill(const MWWorld::ConstPtr& ptr) const override;
+        /// Return the index of the skill this item corresponds to when equipped or -1, if there is
+        /// no such skill.
 
-            int getEquipmentSkill (const MWWorld::ConstPtr& ptr) const override;
-            /// Return the index of the skill this item corresponds to when equipped or -1, if there is
-            /// no such skill.
+        MWGui::ToolTipInfo getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const override;
+        ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
-            MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const override;
-            ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
+        int getValue(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            int getValue (const MWWorld::ConstPtr& ptr) const override;
-            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+        std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the pick up sound Id
 
-            std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the pick up sound Id
+        std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the put down sound Id
 
-            std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the put down sound Id
+        const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of inventory icon.
 
-            const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of inventory icon.
+        std::string_view getEnchantment(const MWWorld::ConstPtr& ptr) const override;
+        ///< @return the enchantment ID if the object is enchanted, otherwise an empty string
 
-            std::string_view getEnchantment(const MWWorld::ConstPtr& ptr) const override;
-            ///< @return the enchantment ID if the object is enchanted, otherwise an empty string
+        const std::string& applyEnchantment(const MWWorld::ConstPtr& ptr, const std::string& enchId, int enchCharge,
+            const std::string& newName) const override;
+        ///< Creates a new record using \a ptr as template, with the given name and the given enchantment applied to it.
 
-            const std::string& applyEnchantment(const MWWorld::ConstPtr& ptr, const std::string& enchId, int enchCharge, const std::string& newName) const override;
-            ///< Creates a new record using \a ptr as template, with the given name and the given enchantment applied to it.
+        std::pair<int, std::string_view> canBeEquipped(
+            const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& npc) const override;
+        ///< Return 0 if player cannot equip item. 1 if can equip. 2 if it's twohanded weapon. 3 if twohanded weapon
+        ///< conflicts with that. \n
+        ///  Second item in the pair specifies the error message
 
-            std::pair<int, std::string_view> canBeEquipped(const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& npc) const override;
-            ///< Return 0 if player cannot equip item. 1 if can equip. 2 if it's twohanded weapon. 3 if twohanded weapon conflicts with that. \n
-            ///  Second item in the pair specifies the error message
+        std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
+        ///< Generate action for using via inventory menu
 
-            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
-            ///< Generate action for using via inventory menu
+        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
 
-            std::string getModel(const MWWorld::ConstPtr &ptr) const override;
+        int getEnchantmentPoints(const MWWorld::ConstPtr& ptr) const override;
 
-            int getEnchantmentPoints (const MWWorld::ConstPtr& ptr) const override;
+        bool canSell(const MWWorld::ConstPtr& item, int npcServices) const override;
 
-            bool canSell (const MWWorld::ConstPtr& item, int npcServices) const override;
-
-            /// Get the effective armor rating, factoring in the actor's skills, for the given armor.
-            float getEffectiveArmorRating(const MWWorld::ConstPtr& armor, const MWWorld::Ptr& actor) const override;
+        /// Get the effective armor rating, factoring in the actor's skills, for the given armor.
+        float getEffectiveArmorRating(const MWWorld::ConstPtr& armor, const MWWorld::Ptr& actor) const override;
     };
 }
 
diff --git a/apps/openmw/mwclass/bodypart.cpp b/apps/openmw/mwclass/bodypart.cpp
index 427203c383..431fb69652 100644
--- a/apps/openmw/mwclass/bodypart.cpp
+++ b/apps/openmw/mwclass/bodypart.cpp
@@ -2,8 +2,8 @@
 
 #include <components/esm3/loadbody.hpp>
 
-#include "../mwrender/renderinginterface.hpp"
 #include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
 #include "../mwworld/cellstore.hpp"
 
@@ -16,21 +16,23 @@ namespace MWClass
     {
     }
 
-    MWWorld::Ptr BodyPart::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
+    MWWorld::Ptr BodyPart::copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const
     {
-        const MWWorld::LiveCellRef<ESM::BodyPart> *ref = ptr.get<ESM::BodyPart>();
+        const MWWorld::LiveCellRef<ESM::BodyPart>* ref = ptr.get<ESM::BodyPart>();
 
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
 
-    void BodyPart::insertObjectRendering(const MWWorld::Ptr &ptr, const std::string &model, MWRender::RenderingInterface &renderingInterface) const
+    void BodyPart::insertObjectRendering(
+        const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
-        if (!model.empty()) {
+        if (!model.empty())
+        {
             renderingInterface.getObjects().insertModel(ptr, model);
         }
     }
 
-    std::string_view BodyPart::getName(const MWWorld::ConstPtr &ptr) const
+    std::string_view BodyPart::getName(const MWWorld::ConstPtr& ptr) const
     {
         return {};
     }
@@ -40,7 +42,7 @@ namespace MWClass
         return false;
     }
 
-    std::string BodyPart::getModel(const MWWorld::ConstPtr &ptr) const
+    std::string BodyPart::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::BodyPart>(ptr);
     }
diff --git a/apps/openmw/mwclass/bodypart.hpp b/apps/openmw/mwclass/bodypart.hpp
index 5491ccf8b6..4a2d9d3620 100644
--- a/apps/openmw/mwclass/bodypart.hpp
+++ b/apps/openmw/mwclass/bodypart.hpp
@@ -12,20 +12,20 @@ namespace MWClass
 
         BodyPart();
 
-        MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
+        MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const override;
 
     public:
-
-        void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
+        void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
+            MWRender::RenderingInterface& renderingInterface) const override;
         ///< Add reference into a cell for rendering
 
-        std::string_view getName (const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
         ///< \return name or ID; can return an empty string.
 
-        bool hasToolTip (const MWWorld::ConstPtr& ptr) const override;
+        bool hasToolTip(const MWWorld::ConstPtr& ptr) const override;
         ///< @return true if this object has a tooltip when focused (default implementation: true)
 
-        std::string getModel(const MWWorld::ConstPtr &ptr) const override;
+        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
     };
 
 }
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index c1734be946..6df4585deb 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -6,14 +6,14 @@
 #include <components/esm3/loadsoun.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/ptr.hpp"
 #include "../mwworld/actionread.hpp"
-#include "../mwworld/failedaction.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/failedaction.hpp"
+#include "../mwworld/ptr.hpp"
 
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
@@ -32,37 +32,39 @@ namespace MWClass
     {
     }
 
-    void Book::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
+    void Book::insertObjectRendering(
+        const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
-        if (!model.empty()) {
+        if (!model.empty())
+        {
             renderingInterface.getObjects().insertModel(ptr, model);
         }
     }
 
-    std::string Book::getModel(const MWWorld::ConstPtr &ptr) const
+    std::string Book::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Book>(ptr);
     }
 
     std::string_view Book::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Book> *ref = ptr.get<ESM::Book>();
+        const MWWorld::LiveCellRef<ESM::Book>* ref = ptr.get<ESM::Book>();
         const std::string& name = ref->mBase->mName;
 
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::unique_ptr<MWWorld::Action> Book::activate (const MWWorld::Ptr& ptr,
-        const MWWorld::Ptr& actor) const
+    std::unique_ptr<MWWorld::Action> Book::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
     {
-        if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
+        if (actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
-            const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
+            const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-            const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfItem", prng);
+            const ESM::Sound* sound = store.get<ESM::Sound>().searchRandom("WolfItem", prng);
 
             std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::FailedAction>("#{sWerewolfRefusal}");
-            if(sound) action->setSound(sound->mId);
+            if (sound)
+                action->setSound(sound->mId);
 
             return action;
         }
@@ -72,14 +74,14 @@ namespace MWClass
 
     std::string_view Book::getScript(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Book> *ref = ptr.get<ESM::Book>();
+        const MWWorld::LiveCellRef<ESM::Book>* ref = ptr.get<ESM::Book>();
 
         return ref->mBase->mScript;
     }
 
-    int Book::getValue (const MWWorld::ConstPtr& ptr) const
+    int Book::getValue(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Book> *ref = ptr.get<ESM::Book>();
+        const MWWorld::LiveCellRef<ESM::Book>* ref = ptr.get<ESM::Book>();
 
         return ref->mBase->mData.mValue;
     }
@@ -96,18 +98,19 @@ namespace MWClass
 
     const std::string& Book::getInventoryIcon(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Book> *ref = ptr.get<ESM::Book>();
+        const MWWorld::LiveCellRef<ESM::Book>* ref = ptr.get<ESM::Book>();
 
         return ref->mBase->mIcon;
     }
 
-    MWGui::ToolTipInfo Book::getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const
+    MWGui::ToolTipInfo Book::getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const
     {
-        const MWWorld::LiveCellRef<ESM::Book> *ref = ptr.get<ESM::Book>();
+        const MWWorld::LiveCellRef<ESM::Book>* ref = ptr.get<ESM::Book>();
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption
+            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
         info.icon = ref->mBase->mIcon;
 
         std::string text;
@@ -130,53 +133,54 @@ namespace MWClass
 
     std::string_view Book::getEnchantment(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Book> *ref = ptr.get<ESM::Book>();
+        const MWWorld::LiveCellRef<ESM::Book>* ref = ptr.get<ESM::Book>();
 
         return ref->mBase->mEnchant;
     }
 
-    const std::string& Book::applyEnchantment(const MWWorld::ConstPtr& ptr, const std::string& enchId, int enchCharge, const std::string& newName) const
+    const std::string& Book::applyEnchantment(
+        const MWWorld::ConstPtr& ptr, const std::string& enchId, int enchCharge, const std::string& newName) const
     {
-        const MWWorld::LiveCellRef<ESM::Book> *ref = ptr.get<ESM::Book>();
+        const MWWorld::LiveCellRef<ESM::Book>* ref = ptr.get<ESM::Book>();
 
         ESM::Book newItem = *ref->mBase;
         newItem.mId.clear();
-        newItem.mName=newName;
+        newItem.mName = newName;
         newItem.mData.mIsScroll = 1;
-        newItem.mData.mEnchant=enchCharge;
-        newItem.mEnchant=enchId;
-        const ESM::Book *record = MWBase::Environment::get().getWorld()->createRecord (newItem);
+        newItem.mData.mEnchant = enchCharge;
+        newItem.mEnchant = enchId;
+        const ESM::Book* record = MWBase::Environment::get().getWorld()->createRecord(newItem);
         return record->mId;
     }
 
-    std::unique_ptr<MWWorld::Action> Book::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Book::use(const MWWorld::Ptr& ptr, bool force) const
     {
         return std::make_unique<MWWorld::ActionRead>(ptr);
     }
 
-    MWWorld::Ptr Book::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
+    MWWorld::Ptr Book::copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const
     {
-        const MWWorld::LiveCellRef<ESM::Book> *ref = ptr.get<ESM::Book>();
+        const MWWorld::LiveCellRef<ESM::Book>* ref = ptr.get<ESM::Book>();
 
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
 
-    int Book::getEnchantmentPoints (const MWWorld::ConstPtr& ptr) const
+    int Book::getEnchantmentPoints(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Book> *ref = ptr.get<ESM::Book>();
+        const MWWorld::LiveCellRef<ESM::Book>* ref = ptr.get<ESM::Book>();
 
         return ref->mBase->mData.mEnchant;
     }
 
-    bool Book::canSell (const MWWorld::ConstPtr& item, int npcServices) const
+    bool Book::canSell(const MWWorld::ConstPtr& item, int npcServices) const
     {
         return (npcServices & ESM::NPC::Books)
-                || ((npcServices & ESM::NPC::MagicItems) && !getEnchantment(item).empty());
+            || ((npcServices & ESM::NPC::MagicItems) && !getEnchantment(item).empty());
     }
 
-    float Book::getWeight(const MWWorld::ConstPtr &ptr) const
+    float Book::getWeight(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Book> *ref = ptr.get<ESM::Book>();
+        const MWWorld::LiveCellRef<ESM::Book>* ref = ptr.get<ESM::Book>();
         return ref->mBase->mData.mWeight;
     }
 }
diff --git a/apps/openmw/mwclass/book.hpp b/apps/openmw/mwclass/book.hpp
index 0cb6c48a59..7b9731c9f5 100644
--- a/apps/openmw/mwclass/book.hpp
+++ b/apps/openmw/mwclass/book.hpp
@@ -7,58 +7,58 @@ namespace MWClass
 {
     class Book : public MWWorld::RegisteredClass<Book>
     {
-            friend MWWorld::RegisteredClass<Book>;
+        friend MWWorld::RegisteredClass<Book>;
 
-            Book();
+        Book();
 
-            MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
+        MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const override;
 
-        public:
+    public:
+        void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
+            MWRender::RenderingInterface& renderingInterface) const override;
+        ///< Add reference into a cell for rendering
 
-            void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
-            ///< Add reference into a cell for rendering
+        std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return name or ID; can return an empty string.
 
-            std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
-            ///< \return name or ID; can return an empty string.
+        std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
+        ///< Generate action for activation
 
-            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
-                const MWWorld::Ptr& actor) const override;
-            ///< Generate action for activation
+        std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of the script attached to ptr
 
-            std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of the script attached to ptr
+        MWGui::ToolTipInfo getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const override;
+        ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
-            MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const override;
-            ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
+        int getValue(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            int getValue (const MWWorld::ConstPtr& ptr) const override;
-            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+        std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the pick up sound Id
 
-            std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the pick up sound Id
+        std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the put down sound Id
 
-            std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the put down sound Id
+        const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of inventory icon.
 
-            const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of inventory icon.
+        std::string_view getEnchantment(const MWWorld::ConstPtr& ptr) const override;
+        ///< @return the enchantment ID if the object is enchanted, otherwise an empty string
 
-            std::string_view getEnchantment(const MWWorld::ConstPtr& ptr) const override;
-            ///< @return the enchantment ID if the object is enchanted, otherwise an empty string
+        const std::string& applyEnchantment(const MWWorld::ConstPtr& ptr, const std::string& enchId, int enchCharge,
+            const std::string& newName) const override;
+        ///< Creates a new record using \a ptr as template, with the given name and the given enchantment applied to it.
 
-            const std::string& applyEnchantment(const MWWorld::ConstPtr& ptr, const std::string& enchId, int enchCharge, const std::string& newName) const override;
-            ///< Creates a new record using \a ptr as template, with the given name and the given enchantment applied to it.
+        std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
+        ///< Generate action for using via inventory menu
 
-            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
-            ///< Generate action for using via inventory menu
+        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
 
-            std::string getModel(const MWWorld::ConstPtr &ptr) const override;
+        int getEnchantmentPoints(const MWWorld::ConstPtr& ptr) const override;
 
-            int getEnchantmentPoints (const MWWorld::ConstPtr& ptr) const override;
+        float getWeight(const MWWorld::ConstPtr& ptr) const override;
 
-            float getWeight (const MWWorld::ConstPtr& ptr) const override;
-
-            bool canSell (const MWWorld::ConstPtr& item, int npcServices) const override;
+        bool canSell(const MWWorld::ConstPtr& item, int npcServices) const override;
     };
 }
 
diff --git a/apps/openmw/mwclass/classes.cpp b/apps/openmw/mwclass/classes.cpp
index a552dfebf0..8303a3a74d 100644
--- a/apps/openmw/mwclass/classes.cpp
+++ b/apps/openmw/mwclass/classes.cpp
@@ -1,26 +1,26 @@
 #include "classes.hpp"
 
 #include "activator.hpp"
-#include "creature.hpp"
-#include "npc.hpp"
-#include "weapon.hpp"
-#include "armor.hpp"
-#include "potion.hpp"
 #include "apparatus.hpp"
+#include "armor.hpp"
+#include "bodypart.hpp"
 #include "book.hpp"
 #include "clothing.hpp"
 #include "container.hpp"
+#include "creature.hpp"
+#include "creaturelevlist.hpp"
 #include "door.hpp"
 #include "ingredient.hpp"
-#include "creaturelevlist.hpp"
 #include "itemlevlist.hpp"
 #include "light.hpp"
 #include "lockpick.hpp"
 #include "misc.hpp"
+#include "npc.hpp"
+#include "potion.hpp"
 #include "probe.hpp"
 #include "repair.hpp"
 #include "static.hpp"
-#include "bodypart.hpp"
+#include "weapon.hpp"
 
 namespace MWClass
 {
diff --git a/apps/openmw/mwclass/classmodel.hpp b/apps/openmw/mwclass/classmodel.hpp
index 3f5997cf4d..5d1019ee1d 100644
--- a/apps/openmw/mwclass/classmodel.hpp
+++ b/apps/openmw/mwclass/classmodel.hpp
@@ -3,8 +3,8 @@
 
 #include "../mwbase/environment.hpp"
 
-#include "../mwworld/ptr.hpp"
 #include "../mwworld/livecellref.hpp"
+#include "../mwworld/ptr.hpp"
 
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
@@ -16,11 +16,11 @@ namespace MWClass
     template <class Class>
     std::string getClassModel(const MWWorld::ConstPtr& ptr)
     {
-        const MWWorld::LiveCellRef<Class> *ref = ptr.get<Class>();
+        const MWWorld::LiveCellRef<Class>* ref = ptr.get<Class>();
 
         if (!ref->mBase->mModel.empty())
-            return Misc::ResourceHelpers::correctMeshPath(ref->mBase->mModel,
-                MWBase::Environment::get().getResourceSystem()->getVFS());
+            return Misc::ResourceHelpers::correctMeshPath(
+                ref->mBase->mModel, MWBase::Environment::get().getResourceSystem()->getVFS());
 
         return {};
     }
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 3413c271ff..6a4353a5b6 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -3,18 +3,18 @@
 #include <MyGUI_TextIterator.h>
 
 #include <components/esm3/loadclot.hpp>
-#include <components/esm3/loadrace.hpp>
 #include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadrace.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/ptr.hpp"
 #include "../mwworld/actionequip.hpp"
-#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/inventorystore.hpp"
+#include "../mwworld/ptr.hpp"
 
 #include "../mwgui/tooltips.hpp"
 #include "../mwgui/ustring.hpp"
@@ -31,57 +31,56 @@ namespace MWClass
     {
     }
 
-    void Clothing::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
+    void Clothing::insertObjectRendering(
+        const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
-        if (!model.empty()) {
+        if (!model.empty())
+        {
             renderingInterface.getObjects().insertModel(ptr, model);
         }
     }
 
-    std::string Clothing::getModel(const MWWorld::ConstPtr &ptr) const
+    std::string Clothing::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Clothing>(ptr);
     }
 
     std::string_view Clothing::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
+        const MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
         const std::string& name = ref->mBase->mName;
 
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::unique_ptr<MWWorld::Action> Clothing::activate (const MWWorld::Ptr& ptr,
-            const MWWorld::Ptr& actor) const
+    std::unique_ptr<MWWorld::Action> Clothing::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
     {
         return defaultItemActivate(ptr, actor);
     }
 
     std::string_view Clothing::getScript(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
+        const MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
 
         return ref->mBase->mScript;
     }
 
-    std::pair<std::vector<int>, bool> Clothing::getEquipmentSlots (const MWWorld::ConstPtr& ptr) const
+    std::pair<std::vector<int>, bool> Clothing::getEquipmentSlots(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
+        const MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
 
         std::vector<int> slots_;
 
-        if (ref->mBase->mData.mType==ESM::Clothing::Ring)
+        if (ref->mBase->mData.mType == ESM::Clothing::Ring)
         {
-            slots_.push_back (int (MWWorld::InventoryStore::Slot_LeftRing));
-            slots_.push_back (int (MWWorld::InventoryStore::Slot_RightRing));
+            slots_.push_back(int(MWWorld::InventoryStore::Slot_LeftRing));
+            slots_.push_back(int(MWWorld::InventoryStore::Slot_RightRing));
         }
         else
         {
             const int size = 9;
 
-            static const int sMapping[size][2] =
-            {
-                { ESM::Clothing::Shirt, MWWorld::InventoryStore::Slot_Shirt },
+            static const int sMapping[size][2] = { { ESM::Clothing::Shirt, MWWorld::InventoryStore::Slot_Shirt },
                 { ESM::Clothing::Belt, MWWorld::InventoryStore::Slot_Belt },
                 { ESM::Clothing::Robe, MWWorld::InventoryStore::Slot_Robe },
                 { ESM::Clothing::Pants, MWWorld::InventoryStore::Slot_Pants },
@@ -89,40 +88,39 @@ namespace MWClass
                 { ESM::Clothing::LGlove, MWWorld::InventoryStore::Slot_LeftGauntlet },
                 { ESM::Clothing::RGlove, MWWorld::InventoryStore::Slot_RightGauntlet },
                 { ESM::Clothing::Skirt, MWWorld::InventoryStore::Slot_Skirt },
-                { ESM::Clothing::Amulet, MWWorld::InventoryStore::Slot_Amulet }
-            };
+                { ESM::Clothing::Amulet, MWWorld::InventoryStore::Slot_Amulet } };
 
-            for (int i=0; i<size; ++i)
-                if (sMapping[i][0]==ref->mBase->mData.mType)
+            for (int i = 0; i < size; ++i)
+                if (sMapping[i][0] == ref->mBase->mData.mType)
                 {
-                    slots_.push_back (int (sMapping[i][1]));
+                    slots_.push_back(int(sMapping[i][1]));
                     break;
                 }
         }
 
-        return std::make_pair (slots_, false);
+        return std::make_pair(slots_, false);
     }
 
-    int Clothing::getEquipmentSkill (const MWWorld::ConstPtr& ptr) const
+    int Clothing::getEquipmentSkill(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
+        const MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
 
-        if (ref->mBase->mData.mType==ESM::Clothing::Shoes)
+        if (ref->mBase->mData.mType == ESM::Clothing::Shoes)
             return ESM::Skill::Unarmored;
 
         return -1;
     }
 
-    int Clothing::getValue (const MWWorld::ConstPtr& ptr) const
+    int Clothing::getValue(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
+        const MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
 
         return ref->mBase->mData.mValue;
     }
 
     std::string_view Clothing::getUpSoundId(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
+        const MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
 
         if (ref->mBase->mData.mType == 8)
         {
@@ -133,7 +131,7 @@ namespace MWClass
 
     std::string_view Clothing::getDownSoundId(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
+        const MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
 
         if (ref->mBase->mData.mType == 8)
         {
@@ -144,18 +142,19 @@ namespace MWClass
 
     const std::string& Clothing::getInventoryIcon(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
+        const MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
 
         return ref->mBase->mIcon;
     }
 
-    MWGui::ToolTipInfo Clothing::getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const
+    MWGui::ToolTipInfo Clothing::getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const
     {
-        const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
+        const MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption
+            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
         info.icon = ref->mBase->mIcon;
 
         std::string text;
@@ -180,31 +179,33 @@ namespace MWClass
 
     std::string_view Clothing::getEnchantment(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
+        const MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
 
         return ref->mBase->mEnchant;
     }
 
-    const std::string& Clothing::applyEnchantment(const MWWorld::ConstPtr& ptr, const std::string& enchId, int enchCharge, const std::string& newName) const
+    const std::string& Clothing::applyEnchantment(
+        const MWWorld::ConstPtr& ptr, const std::string& enchId, int enchCharge, const std::string& newName) const
     {
-        const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
+        const MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
 
         ESM::Clothing newItem = *ref->mBase;
         newItem.mId.clear();
-        newItem.mName=newName;
-        newItem.mData.mEnchant=enchCharge;
-        newItem.mEnchant=enchId;
-        const ESM::Clothing *record = MWBase::Environment::get().getWorld()->createRecord (newItem);
+        newItem.mName = newName;
+        newItem.mData.mEnchant = enchCharge;
+        newItem.mEnchant = enchId;
+        const ESM::Clothing* record = MWBase::Environment::get().getWorld()->createRecord(newItem);
         return record->mId;
     }
 
-    std::pair<int, std::string_view> Clothing::canBeEquipped(const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& npc) const
+    std::pair<int, std::string_view> Clothing::canBeEquipped(
+        const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& npc) const
     {
         // slots that this item can be equipped in
         std::pair<std::vector<int>, bool> slots_ = getEquipmentSlots(ptr);
 
         if (slots_.first.empty())
-            return {0, {}};
+            return { 0, {} };
 
         if (npc.getClass().isNpc())
         {
@@ -212,24 +213,24 @@ namespace MWClass
 
             // Beast races cannot equip shoes / boots, or full helms (head part vs hair part)
             const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(npcRace);
-            if(race->mData.mFlags & ESM::Race::Beast)
+            if (race->mData.mFlags & ESM::Race::Beast)
             {
                 std::vector<ESM::PartReference> parts = ptr.get<ESM::Clothing>()->mBase->mParts.mParts;
 
-                for(std::vector<ESM::PartReference>::iterator itr = parts.begin(); itr != parts.end(); ++itr)
+                for (std::vector<ESM::PartReference>::iterator itr = parts.begin(); itr != parts.end(); ++itr)
                 {
-                    if((*itr).mPart == ESM::PRT_Head)
-                        return {0, "#{sNotifyMessage13}"};
-                    if((*itr).mPart == ESM::PRT_LFoot || (*itr).mPart == ESM::PRT_RFoot)
-                        return {0, "#{sNotifyMessage15}"};
+                    if ((*itr).mPart == ESM::PRT_Head)
+                        return { 0, "#{sNotifyMessage13}" };
+                    if ((*itr).mPart == ESM::PRT_LFoot || (*itr).mPart == ESM::PRT_RFoot)
+                        return { 0, "#{sNotifyMessage15}" };
                 }
             }
         }
 
-        return {1, {}};
+        return { 1, {} };
     }
 
-    std::unique_ptr<MWWorld::Action> Clothing::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Clothing::use(const MWWorld::Ptr& ptr, bool force) const
     {
         std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::ActionEquip>(ptr, force);
 
@@ -238,29 +239,29 @@ namespace MWClass
         return action;
     }
 
-    MWWorld::Ptr Clothing::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
+    MWWorld::Ptr Clothing::copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const
     {
-        const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
+        const MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
 
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
 
-    int Clothing::getEnchantmentPoints (const MWWorld::ConstPtr& ptr) const
+    int Clothing::getEnchantmentPoints(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
+        const MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
 
         return ref->mBase->mData.mEnchant;
     }
 
-    bool Clothing::canSell (const MWWorld::ConstPtr& item, int npcServices) const
+    bool Clothing::canSell(const MWWorld::ConstPtr& item, int npcServices) const
     {
         return (npcServices & ESM::NPC::Clothing)
-                || ((npcServices & ESM::NPC::MagicItems) && !getEnchantment(item).empty());
+            || ((npcServices & ESM::NPC::MagicItems) && !getEnchantment(item).empty());
     }
 
-    float Clothing::getWeight(const MWWorld::ConstPtr &ptr) const
+    float Clothing::getWeight(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
+        const MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
         return ref->mBase->mData.mWeight;
     }
 }
diff --git a/apps/openmw/mwclass/clothing.hpp b/apps/openmw/mwclass/clothing.hpp
index beca02f77a..bd6875b217 100644
--- a/apps/openmw/mwclass/clothing.hpp
+++ b/apps/openmw/mwclass/clothing.hpp
@@ -7,70 +7,72 @@ namespace MWClass
 {
     class Clothing : public MWWorld::RegisteredClass<Clothing>
     {
-            friend MWWorld::RegisteredClass<Clothing>;
+        friend MWWorld::RegisteredClass<Clothing>;
 
-            Clothing();
+        Clothing();
 
-            MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
+        MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const override;
 
-        public:
+    public:
+        void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
+            MWRender::RenderingInterface& renderingInterface) const override;
+        ///< Add reference into a cell for rendering
 
-            void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
-            ///< Add reference into a cell for rendering
+        std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return name or ID; can return an empty string.
 
-            std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
-            ///< \return name or ID; can return an empty string.
+        std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
+        ///< Generate action for activation
 
-            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
-                const MWWorld::Ptr& actor) const override;
-            ///< Generate action for activation
+        std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of the script attached to ptr
 
-            std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of the script attached to ptr
+        std::pair<std::vector<int>, bool> getEquipmentSlots(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return first: Return IDs of the slot this object can be equipped in; second: can object
+        /// stay stacked when equipped?
 
-            std::pair<std::vector<int>, bool> getEquipmentSlots (const MWWorld::ConstPtr& ptr) const override;
-            ///< \return first: Return IDs of the slot this object can be equipped in; second: can object
-            /// stay stacked when equipped?
+        int getEquipmentSkill(const MWWorld::ConstPtr& ptr) const override;
+        /// Return the index of the skill this item corresponds to when equipped or -1, if there is
+        /// no such skill.
 
-            int getEquipmentSkill (const MWWorld::ConstPtr& ptr) const override;
-            /// Return the index of the skill this item corresponds to when equipped or -1, if there is
-            /// no such skill.
+        MWGui::ToolTipInfo getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const override;
+        ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
-            MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const override;
-            ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
+        int getValue(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            int getValue (const MWWorld::ConstPtr& ptr) const override;
-            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+        std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the pick up sound Id
 
-            std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the pick up sound Id
+        std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the put down sound Id
 
-            std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the put down sound Id
+        const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of inventory icon.
 
-            const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of inventory icon.
+        std::string_view getEnchantment(const MWWorld::ConstPtr& ptr) const override;
+        ///< @return the enchantment ID if the object is enchanted, otherwise an empty string
 
-            std::string_view getEnchantment(const MWWorld::ConstPtr& ptr) const override;
-            ///< @return the enchantment ID if the object is enchanted, otherwise an empty string
+        const std::string& applyEnchantment(const MWWorld::ConstPtr& ptr, const std::string& enchId, int enchCharge,
+            const std::string& newName) const override;
+        ///< Creates a new record using \a ptr as template, with the given name and the given enchantment applied to it.
 
-            const std::string& applyEnchantment(const MWWorld::ConstPtr& ptr, const std::string& enchId, int enchCharge, const std::string& newName) const override;
-            ///< Creates a new record using \a ptr as template, with the given name and the given enchantment applied to it.
+        std::pair<int, std::string_view> canBeEquipped(
+            const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& npc) const override;
+        ///< Return 0 if player cannot equip item. 1 if can equip. 2 if it's twohanded weapon. 3 if twohanded weapon
+        ///< conflicts with that.
+        ///  Second item in the pair specifies the error message
 
-            std::pair<int, std::string_view> canBeEquipped(const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& npc) const override;
-            ///< Return 0 if player cannot equip item. 1 if can equip. 2 if it's twohanded weapon. 3 if twohanded weapon conflicts with that.
-            ///  Second item in the pair specifies the error message
+        std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
+        ///< Generate action for using via inventory menu
 
-            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
-            ///< Generate action for using via inventory menu
+        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
 
-            std::string getModel(const MWWorld::ConstPtr &ptr) const override;
+        int getEnchantmentPoints(const MWWorld::ConstPtr& ptr) const override;
 
-            int getEnchantmentPoints (const MWWorld::ConstPtr& ptr) const override;
+        float getWeight(const MWWorld::ConstPtr& ptr) const override;
 
-            float getWeight (const MWWorld::ConstPtr& ptr) const override;
-
-            bool canSell (const MWWorld::ConstPtr& item, int npcServices) const override;
+        bool canSell(const MWWorld::ConstPtr& item, int npcServices) const override;
     };
 }
 
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index a95c90d1b1..cd6805ab6c 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -2,25 +2,25 @@
 
 #include <MyGUI_TextIterator.h>
 
-#include <components/esm3/loadcont.hpp>
 #include <components/esm3/containerstate.hpp>
-#include <components/settings/settings.hpp>
+#include <components/esm3/loadcont.hpp>
 #include <components/esm3/loadsoun.hpp>
+#include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/failedaction.hpp"
-#include "../mwworld/nullaction.hpp"
-#include "../mwworld/cellstore.hpp"
-#include "../mwworld/esmstore.hpp"
+#include "../mwphysics/physicssystem.hpp"
 #include "../mwworld/actionharvest.hpp"
 #include "../mwworld/actionopen.hpp"
 #include "../mwworld/actiontrap.hpp"
-#include "../mwphysics/physicssystem.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/esmstore.hpp"
+#include "../mwworld/failedaction.hpp"
 #include "../mwworld/inventorystore.hpp"
+#include "../mwworld/nullaction.hpp"
 
 #include "../mwgui/tooltips.hpp"
 #include "../mwgui/ustring.hpp"
@@ -29,8 +29,8 @@
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
-#include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/inventory.hpp"
+#include "../mwmechanics/npcstats.hpp"
 
 #include "classmodel.hpp"
 
@@ -65,14 +65,14 @@ namespace MWClass
     {
     }
 
-    void Container::ensureCustomData (const MWWorld::Ptr& ptr) const
+    void Container::ensureCustomData(const MWWorld::Ptr& ptr) const
     {
         if (!ptr.getRefData().getCustomData())
         {
-            MWWorld::LiveCellRef<ESM::Container> *ref = ptr.get<ESM::Container>();
+            MWWorld::LiveCellRef<ESM::Container>* ref = ptr.get<ESM::Container>();
 
             // store
-            ptr.getRefData().setCustomData (std::make_unique<ContainerCustomData>(*ref->mBase, ptr.getCell()));
+            ptr.getRefData().setCustomData(std::make_unique<ContainerCustomData>(*ref->mBase, ptr.getCell()));
 
             MWBase::Environment::get().getWorld()->addContainerScripts(ptr, ptr.getCell());
         }
@@ -89,10 +89,9 @@ namespace MWClass
         return animation->canBeHarvested();
     }
 
-    void Container::respawn(const MWWorld::Ptr &ptr) const
+    void Container::respawn(const MWWorld::Ptr& ptr) const
     {
-        MWWorld::LiveCellRef<ESM::Container> *ref =
-            ptr.get<ESM::Container>();
+        MWWorld::LiveCellRef<ESM::Container>* ref = ptr.get<ESM::Container>();
         if (ref->mBase->mFlags & ESM::Container::Respawn)
         {
             // Container was not touched, there is no need to modify its content.
@@ -104,24 +103,28 @@ namespace MWClass
         }
     }
 
-    void Container::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
+    void Container::insertObjectRendering(
+        const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
-        if (!model.empty()) {
+        if (!model.empty())
+        {
             renderingInterface.getObjects().insertModel(ptr, model, true);
         }
     }
 
-    void Container::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
+    void Container::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+        MWPhysics::PhysicsSystem& physics) const
     {
         insertObjectPhysics(ptr, model, rotation, physics);
     }
 
-    void Container::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
+    void Container::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+        MWPhysics::PhysicsSystem& physics) const
     {
         physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World);
     }
 
-    std::string Container::getModel(const MWWorld::ConstPtr &ptr) const
+    std::string Container::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Container>(ptr);
     }
@@ -131,20 +134,20 @@ namespace MWClass
         return true;
     }
 
-    std::unique_ptr<MWWorld::Action> Container::activate (const MWWorld::Ptr& ptr,
-        const MWWorld::Ptr& actor) const
+    std::unique_ptr<MWWorld::Action> Container::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
     {
         if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
             return std::make_unique<MWWorld::NullAction>();
 
-        if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
+        if (actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
-            const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
+            const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-            const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfContainer", prng);
+            const ESM::Sound* sound = store.get<ESM::Sound>().searchRandom("WolfContainer", prng);
 
             std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::FailedAction>("#{sWerewolfRefusal}");
-            if(sound) action->setSound(sound->mId);
+            if (sound)
+                action->setSound(sound->mId);
 
             return action;
         }
@@ -152,7 +155,7 @@ namespace MWClass
         const std::string_view lockedSound = "LockedChest";
         const std::string_view trapActivationSound = "Disarm Trap Fail";
 
-        MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
         MWWorld::InventoryStore& invStore = player.getClass().getInventoryStore(player);
 
         bool isLocked = ptr.getCellRef().getLockLevel() > 0;
@@ -173,10 +176,10 @@ namespace MWClass
 
         if (isLocked && hasKey)
         {
-            MWBase::Environment::get().getWindowManager ()->messageBox(std::string{keyName} + " #{sKeyUsed}");
+            MWBase::Environment::get().getWindowManager()->messageBox(std::string{ keyName } + " #{sKeyUsed}");
             ptr.getCellRef().unlock();
             // using a key disarms the trap
-            if(isTrapped)
+            if (isTrapped)
             {
                 ptr.getCellRef().setTrap("");
                 MWBase::Environment::get().getSoundManager()->playSound3D(ptr, "Disarm Trap", 1.0f, 1.0f);
@@ -184,10 +187,9 @@ namespace MWClass
             }
         }
 
-
         if (!isLocked || hasKey)
         {
-            if(!isTrapped)
+            if (!isTrapped)
             {
                 if (canBeHarvested(ptr))
                 {
@@ -199,7 +201,8 @@ namespace MWClass
             else
             {
                 // Activate trap
-                std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::ActionTrap>(ptr.getCellRef().getTrap(), ptr);
+                std::unique_ptr<MWWorld::Action> action
+                    = std::make_unique<MWWorld::ActionTrap>(ptr.getCellRef().getTrap(), ptr);
                 action->setSound(trapActivationSound);
                 return action;
             }
@@ -214,15 +217,15 @@ namespace MWClass
 
     std::string_view Container::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Container> *ref = ptr.get<ESM::Container>();
+        const MWWorld::LiveCellRef<ESM::Container>* ref = ptr.get<ESM::Container>();
         const std::string& name = ref->mBase->mName;
 
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    MWWorld::ContainerStore& Container::getContainerStore (const MWWorld::Ptr& ptr) const
+    MWWorld::ContainerStore& Container::getContainerStore(const MWWorld::Ptr& ptr) const
     {
-        ensureCustomData (ptr);
+        ensureCustomData(ptr);
         auto& data = ptr.getRefData().getCustomData()->asContainerCustomData();
         data.mStore.mPtr = ptr;
         return data.mStore;
@@ -230,21 +233,21 @@ namespace MWClass
 
     std::string_view Container::getScript(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Container> *ref = ptr.get<ESM::Container>();
+        const MWWorld::LiveCellRef<ESM::Container>* ref = ptr.get<ESM::Container>();
 
         return ref->mBase->mScript;
     }
 
-    bool Container::hasToolTip (const MWWorld::ConstPtr& ptr) const
+    bool Container::hasToolTip(const MWWorld::ConstPtr& ptr) const
     {
         if (const MWWorld::CustomData* data = ptr.getRefData().getCustomData())
             return !canBeHarvested(ptr) || data->asContainerCustomData().mStore.hasVisibleItems();
         return true;
     }
 
-    MWGui::ToolTipInfo Container::getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const
+    MWGui::ToolTipInfo Container::getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const
     {
-        const MWWorld::LiveCellRef<ESM::Container> *ref = ptr.get<ESM::Container>();
+        const MWWorld::LiveCellRef<ESM::Container>* ref = ptr.get<ESM::Container>();
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
@@ -260,7 +263,8 @@ namespace MWClass
             text += "\n#{sTrapped}";
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp())
-        {   text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
+        {
+            text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
             text += MWGui::ToolTips::getMiscString(ref->mBase->mScript, "Script");
             if (Misc::StringUtils::ciEqual(ptr.getCellRef().getRefId(), "stolen_goods"))
                 text += "\nYou can not use evidence chests";
@@ -271,22 +275,21 @@ namespace MWClass
         return info;
     }
 
-    float Container::getCapacity (const MWWorld::Ptr& ptr) const
+    float Container::getCapacity(const MWWorld::Ptr& ptr) const
     {
-        MWWorld::LiveCellRef<ESM::Container> *ref =
-            ptr.get<ESM::Container>();
+        MWWorld::LiveCellRef<ESM::Container>* ref = ptr.get<ESM::Container>();
 
         return ref->mBase->mWeight;
     }
 
-    float Container::getEncumbrance (const MWWorld::Ptr& ptr) const
+    float Container::getEncumbrance(const MWWorld::Ptr& ptr) const
     {
-        return getContainerStore (ptr).getWeight();
+        return getContainerStore(ptr).getWeight();
     }
 
-    bool Container::canLock(const MWWorld::ConstPtr &ptr) const
+    bool Container::canLock(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Container> *ref = ptr.get<ESM::Container>();
+        const MWWorld::LiveCellRef<ESM::Container>* ref = ptr.get<ESM::Container>();
         return !(ref->mBase->mFlags & ESM::Container::Organic);
     }
 
@@ -295,14 +298,14 @@ namespace MWClass
         MWMechanics::modifyBaseInventory<ESM::Container>(containerId, itemId, amount);
     }
 
-    MWWorld::Ptr Container::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
+    MWWorld::Ptr Container::copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const
     {
-        const MWWorld::LiveCellRef<ESM::Container> *ref = ptr.get<ESM::Container>();
+        const MWWorld::LiveCellRef<ESM::Container>* ref = ptr.get<ESM::Container>();
 
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
 
-    void Container::readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const
+    void Container::readAdditionalState(const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const
     {
         if (!state.mHasCustomState)
             return;
@@ -311,7 +314,7 @@ namespace MWClass
         ptr.getRefData().setCustomData(std::make_unique<ContainerCustomData>(containerState.mInventory));
     }
 
-    void Container::writeAdditionalState (const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const
+    void Container::writeAdditionalState(const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const
     {
         if (!ptr.getRefData().getCustomData())
         {
@@ -327,6 +330,6 @@ namespace MWClass
         }
 
         ESM::ContainerState& containerState = state.asContainerState();
-        customData.mStore.writeState (containerState.mInventory);
+        customData.mStore.writeState(containerState.mInventory);
     }
 }
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index b9573700d6..7126de3afa 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -1,9 +1,9 @@
 #ifndef GAME_MWCLASS_CONTAINER_H
 #define GAME_MWCLASS_CONTAINER_H
 
-#include "../mwworld/registeredclass.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/customdata.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace ESM
 {
@@ -16,6 +16,7 @@ namespace MWClass
     class ContainerCustomData : public MWWorld::TypedCustomData<ContainerCustomData>
     {
         MWWorld::ContainerStore mStore;
+
     public:
         ContainerCustomData(const ESM::Container& container, MWWorld::CellStore* cell);
         ContainerCustomData(const ESM::InventoryState& inventory);
@@ -28,68 +29,69 @@ namespace MWClass
 
     class Container : public MWWorld::RegisteredClass<Container>
     {
-            friend MWWorld::RegisteredClass<Container>;
+        friend MWWorld::RegisteredClass<Container>;
 
-            const bool mHarvestEnabled;
+        const bool mHarvestEnabled;
 
-            Container();
+        Container();
 
-            void ensureCustomData (const MWWorld::Ptr& ptr) const;
+        void ensureCustomData(const MWWorld::Ptr& ptr) const;
 
-            MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
+        MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const override;
 
-            bool canBeHarvested(const MWWorld::ConstPtr& ptr) const;
+        bool canBeHarvested(const MWWorld::ConstPtr& ptr) const;
 
-        public:
-            void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
-            ///< Add reference into a cell for rendering
+    public:
+        void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
+            MWRender::RenderingInterface& renderingInterface) const override;
+        ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const override;
-            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const override;
+        void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+            MWPhysics::PhysicsSystem& physics) const override;
+        void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+            MWPhysics::PhysicsSystem& physics) const override;
 
-            std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
-            ///< \return name or ID; can return an empty string.
+        std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return name or ID; can return an empty string.
 
-            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
-                const MWWorld::Ptr& actor) const override;
-            ///< Generate action for activation
+        std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
+        ///< Generate action for activation
 
-            bool hasToolTip (const MWWorld::ConstPtr& ptr) const override;
-            ///< @return true if this object has a tooltip when focused (default implementation: true)
+        bool hasToolTip(const MWWorld::ConstPtr& ptr) const override;
+        ///< @return true if this object has a tooltip when focused (default implementation: true)
 
-            MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const override;
-            ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
+        MWGui::ToolTipInfo getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const override;
+        ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
-            MWWorld::ContainerStore& getContainerStore (const MWWorld::Ptr& ptr) const override;
-            ///< Return container store
+        MWWorld::ContainerStore& getContainerStore(const MWWorld::Ptr& ptr) const override;
+        ///< Return container store
 
-            std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of the script attached to ptr
+        std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of the script attached to ptr
 
-            float getCapacity (const MWWorld::Ptr& ptr) const override;
-            ///< Return total weight that fits into the object. Throws an exception, if the object can't
-            /// hold other objects.
+        float getCapacity(const MWWorld::Ptr& ptr) const override;
+        ///< Return total weight that fits into the object. Throws an exception, if the object can't
+        /// hold other objects.
 
-            float getEncumbrance (const MWWorld::Ptr& ptr) const override;
-            ///< Returns total weight of objects inside this object (including modifications from magic
-            /// effects). Throws an exception, if the object can't hold other objects.
+        float getEncumbrance(const MWWorld::Ptr& ptr) const override;
+        ///< Returns total weight of objects inside this object (including modifications from magic
+        /// effects). Throws an exception, if the object can't hold other objects.
 
-            bool canLock(const MWWorld::ConstPtr &ptr) const override;
+        bool canLock(const MWWorld::ConstPtr& ptr) const override;
 
-            void readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state)
-                const override;
-            ///< Read additional state from \a state into \a ptr.
+        void readAdditionalState(const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const override;
+        ///< Read additional state from \a state into \a ptr.
 
-            void writeAdditionalState (const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const override;
-            ///< Write additional state from \a ptr into \a state.
+        void writeAdditionalState(const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const override;
+        ///< Write additional state from \a ptr into \a state.
 
-            void respawn (const MWWorld::Ptr& ptr) const override;
+        void respawn(const MWWorld::Ptr& ptr) const override;
 
-            std::string getModel(const MWWorld::ConstPtr &ptr) const override;
+        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
 
-            bool useAnim() const override;
+        bool useAnim() const override;
 
-            void modifyBaseInventory(std::string_view containerId, std::string_view itemId, int amount) const override;
+        void modifyBaseInventory(std::string_view containerId, std::string_view itemId, int amount) const override;
     };
 }
 
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index a3d6ce8212..eacd4a15e9 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -1,46 +1,46 @@
 #include "creature.hpp"
 
-#include <components/misc/rng.hpp>
 #include <components/debug/debuglog.hpp>
-#include <components/esm3/loadcrea.hpp>
 #include <components/esm3/creaturestate.hpp>
-#include <components/settings/settings.hpp>
-#include <components/esm3/loadsoun.hpp>
-#include <components/esm3/loadsndg.hpp>
 #include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadsndg.hpp>
+#include <components/esm3/loadsoun.hpp>
+#include <components/misc/rng.hpp>
+#include <components/settings/settings.hpp>
 
+#include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/aisetting.hpp"
+#include "../mwmechanics/combat.hpp"
+#include "../mwmechanics/creaturecustomdataresetter.hpp"
 #include "../mwmechanics/creaturestats.hpp"
+#include "../mwmechanics/difficultyscaling.hpp"
+#include "../mwmechanics/disease.hpp"
+#include "../mwmechanics/inventory.hpp"
 #include "../mwmechanics/magiceffects.hpp"
 #include "../mwmechanics/movement.hpp"
-#include "../mwmechanics/disease.hpp"
-#include "../mwmechanics/difficultyscaling.hpp"
 #include "../mwmechanics/npcstats.hpp"
-#include "../mwmechanics/combat.hpp"
-#include "../mwmechanics/actorutil.hpp"
-#include "../mwmechanics/creaturecustomdataresetter.hpp"
-#include "../mwmechanics/aisetting.hpp"
-#include "../mwmechanics/inventory.hpp"
 #include "../mwmechanics/setbaseaisetting.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwbase/soundmanager.hpp"
 
-#include "../mwworld/ptr.hpp"
-#include "../mwworld/actiontalk.hpp"
 #include "../mwworld/actionopen.hpp"
-#include "../mwworld/failedaction.hpp"
-#include "../mwworld/customdata.hpp"
-#include "../mwworld/containerstore.hpp"
+#include "../mwworld/actiontalk.hpp"
 #include "../mwworld/cellstore.hpp"
-#include "../mwworld/localscripts.hpp"
-#include "../mwworld/inventorystore.hpp"
+#include "../mwworld/containerstore.hpp"
+#include "../mwworld/customdata.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/failedaction.hpp"
+#include "../mwworld/inventorystore.hpp"
+#include "../mwworld/localscripts.hpp"
+#include "../mwworld/ptr.hpp"
 
-#include "../mwrender/renderinginterface.hpp"
 #include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
 #include "../mwgui/tooltips.hpp"
 #include "../mwgui/ustring.hpp"
@@ -49,7 +49,7 @@
 
 namespace
 {
-    bool isFlagBitSet(const MWWorld::ConstPtr &ptr, ESM::Creature::Flags bitMask)
+    bool isFlagBitSet(const MWWorld::ConstPtr& ptr, ESM::Creature::Flags bitMask)
     {
         return (ptr.get<ESM::Creature>()->mBase->mFlags & bitMask) != 0;
     }
@@ -69,20 +69,14 @@ namespace MWClass
         CreatureCustomData(const CreatureCustomData& other);
         CreatureCustomData(CreatureCustomData&& other) = default;
 
-        CreatureCustomData& asCreatureCustomData() override
-        {
-            return *this;
-        }
-        const CreatureCustomData& asCreatureCustomData() const override
-        {
-            return *this;
-        }
+        CreatureCustomData& asCreatureCustomData() override { return *this; }
+        const CreatureCustomData& asCreatureCustomData() const override { return *this; }
     };
 
     CreatureCustomData::CreatureCustomData(const CreatureCustomData& other)
-        : mCreatureStats(other.mCreatureStats),
-          mContainerStore(other.mContainerStore->clone()),
-          mMovement(other.mMovement)
+        : mCreatureStats(other.mCreatureStats)
+        , mContainerStore(other.mContainerStore->clone())
+        , mMovement(other.mMovement)
     {
     }
 
@@ -93,12 +87,11 @@ namespace MWClass
 
     const Creature::GMST& Creature::getGmst()
     {
-        static const GMST staticGmst = []
-        {
+        static const GMST staticGmst = [] {
             GMST gmst;
 
-            const MWBase::World *world = MWBase::Environment::get().getWorld();
-            const MWWorld::Store<ESM::GameSetting> &store = world->getStore().get<ESM::GameSetting>();
+            const MWBase::World* world = MWBase::Environment::get().getWorld();
+            const MWWorld::Store<ESM::GameSetting>& store = world->getStore().get<ESM::GameSetting>();
 
             gmst.fMinWalkSpeedCreature = store.find("fMinWalkSpeedCreature");
             gmst.fMaxWalkSpeedCreature = store.find("fMaxWalkSpeedCreature");
@@ -115,20 +108,20 @@ namespace MWClass
             gmst.iKnockDownOddsBase = store.find("iKnockDownOddsBase");
 
             return gmst;
-        } ();
+        }();
         return staticGmst;
     }
 
-    void Creature::ensureCustomData (const MWWorld::Ptr& ptr) const
+    void Creature::ensureCustomData(const MWWorld::Ptr& ptr) const
     {
         if (!ptr.getRefData().getCustomData())
         {
             auto tempData = std::make_unique<CreatureCustomData>();
             CreatureCustomData* data = tempData.get();
-            MWMechanics::CreatureCustomDataResetter resetter {ptr};
+            MWMechanics::CreatureCustomDataResetter resetter{ ptr };
             ptr.getRefData().setCustomData(std::move(tempData));
 
-            MWWorld::LiveCellRef<ESM::Creature> *ref = ptr.get<ESM::Creature>();
+            MWWorld::LiveCellRef<ESM::Creature>* ref = ptr.get<ESM::Creature>();
 
             // creature stats
             data->mCreatureStats.setAttribute(ESM::Attribute::Strength, ref->mBase->mData.mStrength);
@@ -180,18 +173,19 @@ namespace MWClass
         }
     }
 
-    void Creature::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
+    void Creature::insertObjectRendering(
+        const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
         MWRender::Objects& objects = renderingInterface.getObjects();
         objects.insertCreature(ptr, model, hasInventoryStore(ptr));
     }
 
-    std::string Creature::getModel(const MWWorld::ConstPtr &ptr) const
+    std::string Creature::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Creature>(ptr);
     }
 
-    void Creature::getModelsToPreload(const MWWorld::Ptr &ptr, std::vector<std::string> &models) const
+    void Creature::getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const
     {
         std::string model = getModel(ptr);
         if (!model.empty())
@@ -216,15 +210,15 @@ namespace MWClass
 
     std::string_view Creature::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Creature> *ref = ptr.get<ESM::Creature>();
+        const MWWorld::LiveCellRef<ESM::Creature>* ref = ptr.get<ESM::Creature>();
         const std::string& name = ref->mBase->mName;
 
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    MWMechanics::CreatureStats& Creature::getCreatureStats (const MWWorld::Ptr& ptr) const
+    MWMechanics::CreatureStats& Creature::getCreatureStats(const MWWorld::Ptr& ptr) const
     {
-        ensureCustomData (ptr);
+        ensureCustomData(ptr);
 
         return ptr.getRefData().getCustomData()->asCreatureCustomData().mCreatureStats;
     }
@@ -238,31 +232,33 @@ namespace MWClass
         MWWorld::Ptr weapon;
         if (hasInventoryStore(ptr))
         {
-            MWWorld::InventoryStore &inv = getInventoryStore(ptr);
+            MWWorld::InventoryStore& inv = getInventoryStore(ptr);
             MWWorld::ContainerStoreIterator weaponslot = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
             if (weaponslot != inv.end() && weaponslot->getType() == ESM::Weapon::sRecordId)
                 weapon = *weaponslot;
         }
 
-        MWBase::World *world = MWBase::Environment::get().getWorld();
-        const MWWorld::Store<ESM::GameSetting> &store = world->getStore().get<ESM::GameSetting>();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+        const MWWorld::Store<ESM::GameSetting>& store = world->getStore().get<ESM::GameSetting>();
         float dist = store.find("fCombatDistance")->mValue.getFloat();
         if (!weapon.isEmpty())
             dist *= weapon.get<ESM::Weapon>()->mBase->mData.mReach;
 
-        // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit result.
+        // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit
+        // result.
         std::vector<MWWorld::Ptr> targetActors;
         getCreatureStats(ptr).getAiSequence().getCombatTargets(targetActors);
 
-        std::pair<MWWorld::Ptr, osg::Vec3f> result = MWBase::Environment::get().getWorld()->getHitContact(ptr, dist, targetActors);
+        std::pair<MWWorld::Ptr, osg::Vec3f> result
+            = MWBase::Environment::get().getWorld()->getHitContact(ptr, dist, targetActors);
         if (result.first.isEmpty()) // Didn't hit anything
             return true;
 
-        const MWWorld::Class &othercls = result.first.getClass();
+        const MWWorld::Class& othercls = result.first.getClass();
         if (!othercls.isActor()) // Can't hit non-actors
             return true;
 
-        MWMechanics::CreatureStats &otherstats = othercls.getCreatureStats(result.first);
+        MWMechanics::CreatureStats& otherstats = othercls.getCreatureStats(result.first);
         if (otherstats.isDead()) // Can't hit dead actors
             return true;
 
@@ -275,9 +271,10 @@ namespace MWClass
         return Misc::Rng::roll0to99(world->getPrng()) < hitchance;
     }
 
-    void Creature::hit(const MWWorld::Ptr& ptr, float attackStrength, int type, const MWWorld::Ptr& victim, const osg::Vec3f& hitPosition, bool success) const
+    void Creature::hit(const MWWorld::Ptr& ptr, float attackStrength, int type, const MWWorld::Ptr& victim,
+        const osg::Vec3f& hitPosition, bool success) const
     {
-        MWMechanics::CreatureStats &stats = getCreatureStats(ptr);
+        MWMechanics::CreatureStats& stats = getCreatureStats(ptr);
 
         if (stats.getDrawState() != MWMechanics::DrawState::Weapon)
             return;
@@ -285,7 +282,7 @@ namespace MWClass
         MWWorld::Ptr weapon;
         if (hasInventoryStore(ptr))
         {
-            MWWorld::InventoryStore &inv = getInventoryStore(ptr);
+            MWWorld::InventoryStore& inv = getInventoryStore(ptr);
             MWWorld::ContainerStoreIterator weaponslot = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
             if (weaponslot != inv.end() && weaponslot->getType() == ESM::Weapon::sRecordId)
                 weapon = *weaponslot;
@@ -296,8 +293,8 @@ namespace MWClass
         if (victim.isEmpty())
             return; // Didn't hit anything
 
-        const MWWorld::Class &othercls = victim.getClass();
-        MWMechanics::CreatureStats &otherstats = othercls.getCreatureStats(victim);
+        const MWWorld::Class& othercls = victim.getClass();
+        MWMechanics::CreatureStats& otherstats = othercls.getCreatureStats(victim);
         if (otherstats.isDead()) // Can't hit dead actors
             return;
 
@@ -308,39 +305,39 @@ namespace MWClass
             return;
         }
 
-        MWWorld::LiveCellRef<ESM::Creature> *ref = ptr.get<ESM::Creature>();
-        int min,max;
+        MWWorld::LiveCellRef<ESM::Creature>* ref = ptr.get<ESM::Creature>();
+        int min, max;
         switch (type)
         {
-        case 0:
-            min = ref->mBase->mData.mAttack[0];
-            max = ref->mBase->mData.mAttack[1];
-            break;
-        case 1:
-            min = ref->mBase->mData.mAttack[2];
-            max = ref->mBase->mData.mAttack[3];
-            break;
-        case 2:
-        default:
-            min = ref->mBase->mData.mAttack[4];
-            max = ref->mBase->mData.mAttack[5];
-            break;
+            case 0:
+                min = ref->mBase->mData.mAttack[0];
+                max = ref->mBase->mData.mAttack[1];
+                break;
+            case 1:
+                min = ref->mBase->mData.mAttack[2];
+                max = ref->mBase->mData.mAttack[3];
+                break;
+            case 2:
+            default:
+                min = ref->mBase->mData.mAttack[4];
+                max = ref->mBase->mData.mAttack[5];
+                break;
         }
 
         float damage = min + (max - min) * attackStrength;
         bool healthdmg = true;
         if (!weapon.isEmpty())
         {
-            const unsigned char *attack = nullptr;
-            if(type == ESM::Weapon::AT_Chop)
+            const unsigned char* attack = nullptr;
+            if (type == ESM::Weapon::AT_Chop)
                 attack = weapon.get<ESM::Weapon>()->mBase->mData.mChop;
-            else if(type == ESM::Weapon::AT_Slash)
+            else if (type == ESM::Weapon::AT_Slash)
                 attack = weapon.get<ESM::Weapon>()->mBase->mData.mSlash;
-            else if(type == ESM::Weapon::AT_Thrust)
+            else if (type == ESM::Weapon::AT_Thrust)
                 attack = weapon.get<ESM::Weapon>()->mBase->mData.mThrust;
-            if(attack)
+            if (attack)
             {
-                damage = attack[0] + ((attack[1]-attack[0])*attackStrength);
+                damage = attack[0] + ((attack[1] - attack[0]) * attackStrength);
                 MWMechanics::adjustWeaponDamage(damage, weapon, ptr);
                 MWMechanics::reduceWeaponCondition(damage, true, weapon, ptr);
                 MWMechanics::resistNormalWeapon(victim, ptr, weapon, damage);
@@ -364,17 +361,18 @@ namespace MWClass
         victim.getClass().onHit(victim, damage, healthdmg, weapon, ptr, hitPosition, true);
     }
 
-    void Creature::onHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object, const MWWorld::Ptr &attacker, const osg::Vec3f &hitPosition, bool successful) const
+    void Creature::onHit(const MWWorld::Ptr& ptr, float damage, bool ishealth, const MWWorld::Ptr& object,
+        const MWWorld::Ptr& attacker, const osg::Vec3f& hitPosition, bool successful) const
     {
         MWMechanics::CreatureStats& stats = getCreatureStats(ptr);
 
-        // NOTE: 'object' and/or 'attacker' may be empty.        
+        // NOTE: 'object' and/or 'attacker' may be empty.
         if (!attacker.isEmpty() && attacker.getClass().isActor() && !stats.getAiSequence().isInCombat(attacker))
             stats.setAttacked(true);
 
         // Self defense
         bool setOnPcHitMe = true; // Note OnPcHitMe is not set for friendly hits.
-        
+
         // No retaliation for totally static creatures (they have no movement or attacks anyway)
         if (isMobile(ptr) && !attacker.isEmpty())
             setOnPcHitMe = MWBase::Environment::get().getMechanicsManager()->actorAttacked(ptr, attacker);
@@ -385,14 +383,12 @@ namespace MWClass
             MWMechanics::CreatureStats& statsAttacker = attacker.getClass().getCreatureStats(attacker);
             // First handle the attacked actor
             if ((stats.getHitAttemptActorId() == -1)
-                && (statsAttacker.getAiSequence().isInCombat(ptr)
-                    || attacker == MWMechanics::getPlayer()))
+                && (statsAttacker.getAiSequence().isInCombat(ptr) || attacker == MWMechanics::getPlayer()))
                 stats.setHitAttemptActorId(statsAttacker.getActorId());
 
             // Next handle the attacking actor
             if ((statsAttacker.getHitAttemptActorId() == -1)
-                && (statsAttacker.getAiSequence().isInCombat(ptr)
-                    || attacker == MWMechanics::getPlayer()))
+                && (statsAttacker.getAiSequence().isInCombat(ptr) || attacker == MWMechanics::getPlayer()))
                 statsAttacker.setHitAttemptActorId(stats.getActorId());
         }
 
@@ -401,9 +397,9 @@ namespace MWClass
 
         if (setOnPcHitMe && !attacker.isEmpty() && attacker == MWMechanics::getPlayer())
         {
-            const std::string &script = ptr.get<ESM::Creature>()->mBase->mScript;
+            const std::string& script = ptr.get<ESM::Creature>()->mBase->mScript;
             /* Set the OnPCHitMe script variable. The script is responsible for clearing it. */
-            if(!script.empty())
+            if (!script.empty())
                 ptr.getRefData().getLocals().setVarByInt(script, "onpchitme", 1);
         }
 
@@ -426,9 +422,11 @@ namespace MWClass
             if (!attacker.isEmpty())
             {
                 // Check for knockdown
-                float agilityTerm = stats.getAttribute(ESM::Attribute::Agility).getModified() * getGmst().fKnockDownMult->mValue.getFloat();
+                float agilityTerm = stats.getAttribute(ESM::Attribute::Agility).getModified()
+                    * getGmst().fKnockDownMult->mValue.getFloat();
                 float knockdownTerm = stats.getAttribute(ESM::Attribute::Agility).getModified()
-                        * getGmst().iKnockDownOddsMult->mValue.getInteger() * 0.01f + getGmst().iKnockDownOddsBase->mValue.getInteger();
+                        * getGmst().iKnockDownOddsMult->mValue.getInteger() * 0.01f
+                    + getGmst().iKnockDownOddsBase->mValue.getInteger();
                 auto& prng = MWBase::Environment::get().getWorld()->getPrng();
                 if (ishealth && agilityTerm <= damage && knockdownTerm <= Misc::Rng::roll0to99(prng))
                     stats.setKnockedDown(true);
@@ -436,7 +434,7 @@ namespace MWClass
                     stats.setHitRecovery(true); // Is this supposed to always occur?
             }
 
-            if(ishealth)
+            if (ishealth)
             {
                 damage *= damage / (damage + getArmorRating(ptr));
                 damage = std::max(1.f, damage);
@@ -461,33 +459,33 @@ namespace MWClass
         }
     }
 
-    std::unique_ptr<MWWorld::Action> Creature::activate (const MWWorld::Ptr& ptr,
-        const MWWorld::Ptr& actor) const
+    std::unique_ptr<MWWorld::Action> Creature::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
     {
-        if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
+        if (actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
-            const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
+            const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-            const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfCreature", prng);
+            const ESM::Sound* sound = store.get<ESM::Sound>().searchRandom("WolfCreature", prng);
 
             std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::FailedAction>("#{sWerewolfRefusal}");
-            if(sound) action->setSound(sound->mId);
+            if (sound)
+                action->setSound(sound->mId);
 
             return action;
         }
 
         const MWMechanics::CreatureStats& stats = getCreatureStats(ptr);
 
-        if(stats.isDead())
+        if (stats.isDead())
         {
-            bool canLoot = Settings::Manager::getBool ("can loot during death animation", "Game");
+            bool canLoot = Settings::Manager::getBool("can loot during death animation", "Game");
 
             // by default user can loot friendly actors during death animation
             if (canLoot && !stats.getAiSequence().isInCombat())
                 return std::make_unique<MWWorld::ActionOpen>(ptr);
 
             // otherwise wait until death animation
-            if(stats.isDeathAnimationFinished())
+            if (stats.isDeathAnimationFinished())
                 return std::make_unique<MWWorld::ActionOpen>(ptr);
         }
         else if (!stats.getAiSequence().isInCombat() && !stats.getKnockedDown())
@@ -500,14 +498,14 @@ namespace MWClass
         return std::make_unique<MWWorld::FailedAction>();
     }
 
-    MWWorld::ContainerStore& Creature::getContainerStore (const MWWorld::Ptr& ptr) const
+    MWWorld::ContainerStore& Creature::getContainerStore(const MWWorld::Ptr& ptr) const
     {
-        ensureCustomData (ptr);
+        ensureCustomData(ptr);
 
         return *ptr.getRefData().getCustomData()->asCreatureCustomData().mContainerStore;
     }
 
-    MWWorld::InventoryStore& Creature::getInventoryStore(const MWWorld::Ptr &ptr) const
+    MWWorld::InventoryStore& Creature::getInventoryStore(const MWWorld::Ptr& ptr) const
     {
         if (hasInventoryStore(ptr))
             return dynamic_cast<MWWorld::InventoryStore&>(getContainerStore(ptr));
@@ -515,24 +513,24 @@ namespace MWClass
             throw std::runtime_error("this creature has no inventory store");
     }
 
-    bool Creature::hasInventoryStore(const MWWorld::Ptr &ptr) const
+    bool Creature::hasInventoryStore(const MWWorld::Ptr& ptr) const
     {
         return isFlagBitSet(ptr, ESM::Creature::Weapon);
     }
 
     std::string_view Creature::getScript(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Creature> *ref = ptr.get<ESM::Creature>();
+        const MWWorld::LiveCellRef<ESM::Creature>* ref = ptr.get<ESM::Creature>();
 
         return ref->mBase->mScript;
     }
 
-    bool Creature::isEssential (const MWWorld::ConstPtr& ptr) const
+    bool Creature::isEssential(const MWWorld::ConstPtr& ptr) const
     {
         return isFlagBitSet(ptr, ESM::Creature::Essential);
     }
 
-    float Creature::getMaxSpeed(const MWWorld::Ptr &ptr) const
+    float Creature::getMaxSpeed(const MWWorld::Ptr& ptr) const
     {
         const MWMechanics::CreatureStats& stats = getCreatureStats(ptr);
 
@@ -541,25 +539,27 @@ namespace MWClass
 
         const GMST& gmst = getGmst();
 
-        const MWBase::World *world = MWBase::Environment::get().getWorld();
-        const MWMechanics::MagicEffects &mageffects = stats.getMagicEffects();
+        const MWBase::World* world = MWBase::Environment::get().getWorld();
+        const MWMechanics::MagicEffects& mageffects = stats.getMagicEffects();
 
         float moveSpeed;
 
-        if(getEncumbrance(ptr) > getCapacity(ptr))
+        if (getEncumbrance(ptr) > getCapacity(ptr))
             moveSpeed = 0.0f;
-        else if(canFly(ptr) || (mageffects.get(ESM::MagicEffect::Levitate).getMagnitude() > 0 &&
-                world->isLevitationEnabled()))
+        else if (canFly(ptr)
+            || (mageffects.get(ESM::MagicEffect::Levitate).getMagnitude() > 0 && world->isLevitationEnabled()))
         {
-            float flySpeed = 0.01f*(stats.getAttribute(ESM::Attribute::Speed).getModified() +
-                                    mageffects.get(ESM::MagicEffect::Levitate).getMagnitude());
-            flySpeed = gmst.fMinFlySpeed->mValue.getFloat() + flySpeed*(gmst.fMaxFlySpeed->mValue.getFloat() - gmst.fMinFlySpeed->mValue.getFloat());
+            float flySpeed = 0.01f
+                * (stats.getAttribute(ESM::Attribute::Speed).getModified()
+                    + mageffects.get(ESM::MagicEffect::Levitate).getMagnitude());
+            flySpeed = gmst.fMinFlySpeed->mValue.getFloat()
+                + flySpeed * (gmst.fMaxFlySpeed->mValue.getFloat() - gmst.fMinFlySpeed->mValue.getFloat());
             const float normalizedEncumbrance = getNormalizedEncumbrance(ptr);
             flySpeed *= 1.0f - gmst.fEncumberedMoveEffect->mValue.getFloat() * normalizedEncumbrance;
             flySpeed = std::max(0.0f, flySpeed);
             moveSpeed = flySpeed;
         }
-        else if(world->isSwimming(ptr))
+        else if (world->isSwimming(ptr))
             moveSpeed = getSwimSpeed(ptr);
         else
             moveSpeed = getWalkSpeed(ptr);
@@ -567,9 +567,9 @@ namespace MWClass
         return moveSpeed;
     }
 
-    MWMechanics::Movement& Creature::getMovementSettings (const MWWorld::Ptr& ptr) const
+    MWMechanics::Movement& Creature::getMovementSettings(const MWWorld::Ptr& ptr) const
     {
-        ensureCustomData (ptr);
+        ensureCustomData(ptr);
 
         return ptr.getRefData().getCustomData()->asCreatureCustomData().mMovement;
     }
@@ -587,9 +587,9 @@ namespace MWClass
         return !customData.mCreatureStats.getAiSequence().isInCombat();
     }
 
-    MWGui::ToolTipInfo Creature::getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const
+    MWGui::ToolTipInfo Creature::getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const
     {
-        const MWWorld::LiveCellRef<ESM::Creature> *ref = ptr.get<ESM::Creature>();
+        const MWWorld::LiveCellRef<ESM::Creature>* ref = ptr.get<ESM::Creature>();
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
@@ -603,24 +603,24 @@ namespace MWClass
         return info;
     }
 
-    float Creature::getArmorRating (const MWWorld::Ptr& ptr) const
+    float Creature::getArmorRating(const MWWorld::Ptr& ptr) const
     {
         // Equipment armor rating is deliberately ignored.
         return getCreatureStats(ptr).getMagicEffects().get(ESM::MagicEffect::Shield).getMagnitude();
     }
 
-    float Creature::getCapacity (const MWWorld::Ptr& ptr) const
+    float Creature::getCapacity(const MWWorld::Ptr& ptr) const
     {
-        const MWMechanics::CreatureStats& stats = getCreatureStats (ptr);
+        const MWMechanics::CreatureStats& stats = getCreatureStats(ptr);
         return stats.getAttribute(ESM::Attribute::Strength).getModified() * 5;
     }
 
-    int Creature::getServices(const MWWorld::ConstPtr &actor) const
+    int Creature::getServices(const MWWorld::ConstPtr& actor) const
     {
         return actor.get<ESM::Creature>()->mBase->mAiData.mServices;
     }
 
-    bool Creature::isPersistent(const MWWorld::ConstPtr &actor) const
+    bool Creature::isPersistent(const MWWorld::ConstPtr& actor) const
     {
         const MWWorld::LiveCellRef<ESM::Creature>* ref = actor.get<ESM::Creature>();
         return (ref->mBase->mRecordFlags & ESM::FLAG_Persistent) != 0;
@@ -637,13 +637,15 @@ namespace MWClass
 
         MWWorld::LiveCellRef<ESM::Creature>* ref = ptr.get<ESM::Creature>();
 
-        const std::string& ourId = (ref->mBase->mOriginal.empty()) ? ptr.getCellRef().getRefId() : ref->mBase->mOriginal;
+        const std::string& ourId
+            = (ref->mBase->mOriginal.empty()) ? ptr.getCellRef().getRefId() : ref->mBase->mOriginal;
 
-        const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
         auto sound = store.get<ESM::SoundGenerator>().begin();
         while (sound != store.get<ESM::SoundGenerator>().end())
         {
-            if (type == sound->mType && !sound->mCreature.empty() && Misc::StringUtils::ciEqual(ourId, sound->mCreature))
+            if (type == sound->mType && !sound->mCreature.empty()
+                && Misc::StringUtils::ciEqual(ourId, sound->mCreature))
                 sounds.push_back(&*sound);
             if (type == sound->mType && sound->mCreature.empty())
                 fallbacksounds.push_back(&*sound);
@@ -656,18 +658,18 @@ namespace MWClass
             if (!model.empty())
             {
                 const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-                for (const ESM::Creature &creature : store.get<ESM::Creature>())
+                for (const ESM::Creature& creature : store.get<ESM::Creature>())
                 {
                     if (creature.mId != ourId && creature.mOriginal != ourId && !creature.mModel.empty()
-                        && Misc::StringUtils::ciEqual(model,
-                            Misc::ResourceHelpers::correctMeshPath(creature.mModel, vfs)))
+                        && Misc::StringUtils::ciEqual(
+                            model, Misc::ResourceHelpers::correctMeshPath(creature.mModel, vfs)))
                     {
                         const std::string& fallbackId = !creature.mOriginal.empty() ? creature.mOriginal : creature.mId;
                         sound = store.get<ESM::SoundGenerator>().begin();
                         while (sound != store.get<ESM::SoundGenerator>().end())
                         {
                             if (type == sound->mType && !sound->mCreature.empty()
-                             && Misc::StringUtils::ciEqual(fallbackId, sound->mCreature))
+                                && Misc::StringUtils::ciEqual(fallbackId, sound->mCreature))
                                 sounds.push_back(&*sound);
                             ++sound;
                         }
@@ -686,102 +688,100 @@ namespace MWClass
         return {};
     }
 
-    MWWorld::Ptr Creature::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
+    MWWorld::Ptr Creature::copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const
     {
-        const MWWorld::LiveCellRef<ESM::Creature> *ref = ptr.get<ESM::Creature>();
+        const MWWorld::LiveCellRef<ESM::Creature>* ref = ptr.get<ESM::Creature>();
 
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
 
-    bool Creature::isBipedal(const MWWorld::ConstPtr &ptr) const
+    bool Creature::isBipedal(const MWWorld::ConstPtr& ptr) const
     {
         return isFlagBitSet(ptr, ESM::Creature::Bipedal);
     }
 
-    bool Creature::canFly(const MWWorld::ConstPtr &ptr) const
+    bool Creature::canFly(const MWWorld::ConstPtr& ptr) const
     {
         return isFlagBitSet(ptr, ESM::Creature::Flies);
     }
 
-    bool Creature::canSwim(const MWWorld::ConstPtr &ptr) const
+    bool Creature::canSwim(const MWWorld::ConstPtr& ptr) const
     {
         return isFlagBitSet(ptr, static_cast<ESM::Creature::Flags>(ESM::Creature::Swims | ESM::Creature::Bipedal));
     }
 
-    bool Creature::canWalk(const MWWorld::ConstPtr &ptr) const
+    bool Creature::canWalk(const MWWorld::ConstPtr& ptr) const
     {
         return isFlagBitSet(ptr, static_cast<ESM::Creature::Flags>(ESM::Creature::Walks | ESM::Creature::Bipedal));
     }
 
     int Creature::getSndGenTypeFromName(const MWWorld::Ptr& ptr, std::string_view name)
     {
-        if(name == "left")
+        if (name == "left")
         {
-            MWBase::World *world = MWBase::Environment::get().getWorld();
-            if(world->isFlying(ptr))
+            MWBase::World* world = MWBase::Environment::get().getWorld();
+            if (world->isFlying(ptr))
                 return -1;
             osg::Vec3f pos(ptr.getRefData().getPosition().asVec3());
-            if(world->isUnderwater(ptr.getCell(), pos) || world->isWalkingOnWater(ptr))
+            if (world->isUnderwater(ptr.getCell(), pos) || world->isWalkingOnWater(ptr))
                 return ESM::SoundGenerator::SwimLeft;
-            if(world->isOnGround(ptr))
+            if (world->isOnGround(ptr))
                 return ESM::SoundGenerator::LeftFoot;
             return -1;
         }
-        if(name == "right")
+        if (name == "right")
         {
-            MWBase::World *world = MWBase::Environment::get().getWorld();
-            if(world->isFlying(ptr))
+            MWBase::World* world = MWBase::Environment::get().getWorld();
+            if (world->isFlying(ptr))
                 return -1;
             osg::Vec3f pos(ptr.getRefData().getPosition().asVec3());
-            if(world->isUnderwater(ptr.getCell(), pos) || world->isWalkingOnWater(ptr))
+            if (world->isUnderwater(ptr.getCell(), pos) || world->isWalkingOnWater(ptr))
                 return ESM::SoundGenerator::SwimRight;
-            if(world->isOnGround(ptr))
+            if (world->isOnGround(ptr))
                 return ESM::SoundGenerator::RightFoot;
             return -1;
         }
-        if(name == "swimleft")
+        if (name == "swimleft")
             return ESM::SoundGenerator::SwimLeft;
-        if(name == "swimright")
+        if (name == "swimright")
             return ESM::SoundGenerator::SwimRight;
-        if(name == "moan")
+        if (name == "moan")
             return ESM::SoundGenerator::Moan;
-        if(name == "roar")
+        if (name == "roar")
             return ESM::SoundGenerator::Roar;
-        if(name == "scream")
+        if (name == "scream")
             return ESM::SoundGenerator::Scream;
-        if(name == "land")
+        if (name == "land")
             return ESM::SoundGenerator::Land;
 
         throw std::runtime_error("Unexpected soundgen type: " + std::string(name));
     }
 
-    float Creature::getSkill(const MWWorld::Ptr &ptr, int skill) const
+    float Creature::getSkill(const MWWorld::Ptr& ptr, int skill) const
     {
-        MWWorld::LiveCellRef<ESM::Creature> *ref =
-            ptr.get<ESM::Creature>();
+        MWWorld::LiveCellRef<ESM::Creature>* ref = ptr.get<ESM::Creature>();
 
         const ESM::Skill* skillRecord = MWBase::Environment::get().getWorld()->getStore().get<ESM::Skill>().find(skill);
 
         switch (skillRecord->mData.mSpecialization)
         {
-        case ESM::Class::Combat:
-            return ref->mBase->mData.mCombat;
-        case ESM::Class::Magic:
-            return ref->mBase->mData.mMagic;
-        case ESM::Class::Stealth:
-            return ref->mBase->mData.mStealth;
-        default:
-            throw std::runtime_error("invalid specialisation");
+            case ESM::Class::Combat:
+                return ref->mBase->mData.mCombat;
+            case ESM::Class::Magic:
+                return ref->mBase->mData.mMagic;
+            case ESM::Class::Stealth:
+                return ref->mBase->mData.mStealth;
+            default:
+                throw std::runtime_error("invalid specialisation");
         }
     }
 
-    int Creature::getBloodTexture(const MWWorld::ConstPtr &ptr) const
+    int Creature::getBloodTexture(const MWWorld::ConstPtr& ptr) const
     {
         return ptr.get<ESM::Creature>()->mBase->mBloodType;
     }
 
-    void Creature::readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state)
-        const
+    void Creature::readAdditionalState(const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const
     {
         if (!state.mHasCustomState)
             return;
@@ -804,24 +804,24 @@ namespace MWClass
                     else
                         data->mContainerStore = std::make_unique<MWWorld::ContainerStore>();
 
-                    ptr.getRefData().setCustomData (std::move(data));
+                    ptr.getRefData().setCustomData(std::move(data));
                 }
             }
         }
         else
-            ensureCustomData(ptr); // in openmw 0.30 savegames not all state was saved yet, so need to load it regardless.
+            ensureCustomData(
+                ptr); // in openmw 0.30 savegames not all state was saved yet, so need to load it regardless.
 
         CreatureCustomData& customData = ptr.getRefData().getCustomData()->asCreatureCustomData();
 
-        customData.mContainerStore->readState (creatureState.mInventory);
+        customData.mContainerStore->readState(creatureState.mInventory);
         bool spellsInitialised = customData.mCreatureStats.getSpells().setSpells(ptr.get<ESM::Creature>()->mBase->mId);
-        if(spellsInitialised)
+        if (spellsInitialised)
             customData.mCreatureStats.getSpells().clear();
-        customData.mCreatureStats.readState (creatureState.mCreatureStats);
+        customData.mCreatureStats.readState(creatureState.mCreatureStats);
     }
 
-    void Creature::writeAdditionalState (const MWWorld::ConstPtr& ptr, ESM::ObjectState& state)
-        const
+    void Creature::writeAdditionalState(const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const
     {
         if (!ptr.getRefData().getCustomData())
         {
@@ -830,15 +830,16 @@ namespace MWClass
         }
 
         const CreatureCustomData& customData = ptr.getRefData().getCustomData()->asCreatureCustomData();
-        if (ptr.getRefData().getCount() <= 0 && (!isFlagBitSet(ptr, ESM::Creature::Respawn) || !customData.mCreatureStats.isDead()))
+        if (ptr.getRefData().getCount() <= 0
+            && (!isFlagBitSet(ptr, ESM::Creature::Respawn) || !customData.mCreatureStats.isDead()))
         {
             state.mHasCustomState = false;
             return;
         }
 
         ESM::CreatureState& creatureState = state.asCreatureState();
-        customData.mContainerStore->writeState (creatureState.mInventory);
-        customData.mCreatureStats.writeState (creatureState.mCreatureStats);
+        customData.mContainerStore->writeState(creatureState.mInventory);
+        customData.mCreatureStats.writeState(creatureState.mCreatureStats);
     }
 
     int Creature::getBaseGold(const MWWorld::ConstPtr& ptr) const
@@ -846,7 +847,7 @@ namespace MWClass
         return ptr.get<ESM::Creature>()->mBase->mData.mGold;
     }
 
-    void Creature::respawn(const MWWorld::Ptr &ptr) const
+    void Creature::respawn(const MWWorld::Ptr& ptr) const
     {
         const MWMechanics::CreatureStats& creatureStats = getCreatureStats(ptr);
         if (ptr.getRefData().getCount() > 0 && !creatureStats.isDead())
@@ -855,14 +856,16 @@ namespace MWClass
         if (!creatureStats.isDeathAnimationFinished())
             return;
 
-        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
         static const float fCorpseRespawnDelay = gmst.find("fCorpseRespawnDelay")->mValue.getFloat();
         static const float fCorpseClearDelay = gmst.find("fCorpseClearDelay")->mValue.getFloat();
 
-        float delay = ptr.getRefData().getCount() == 0 ? fCorpseClearDelay : std::min(fCorpseRespawnDelay, fCorpseClearDelay);
+        float delay
+            = ptr.getRefData().getCount() == 0 ? fCorpseClearDelay : std::min(fCorpseRespawnDelay, fCorpseClearDelay);
 
         if (isFlagBitSet(ptr, ESM::Creature::Respawn)
-                && creatureStats.getTimeOfDeath() + delay <= MWBase::Environment::get().getWorld()->getTimeStamp())
+            && creatureStats.getTimeOfDeath() + delay <= MWBase::Environment::get().getWorld()->getTimeStamp())
         {
             if (ptr.getCellRef().hasContentFile())
             {
@@ -870,7 +873,7 @@ namespace MWClass
                 {
                     ptr.getRefData().setCount(1);
                     std::string_view script = getScript(ptr);
-                    if(!script.empty())
+                    if (!script.empty())
                         MWBase::Environment::get().getWorld()->getLocalScripts().add(script, ptr);
                 }
 
@@ -880,20 +883,21 @@ namespace MWClass
 
                 // Reset to original position
                 MWBase::Environment::get().getWorld()->moveObject(ptr, ptr.getCellRef().getPosition().asVec3());
-                MWBase::Environment::get().getWorld()->rotateObject(ptr, ptr.getCellRef().getPosition().asRotationVec3(), MWBase::RotationFlag_none);
+                MWBase::Environment::get().getWorld()->rotateObject(
+                    ptr, ptr.getCellRef().getPosition().asRotationVec3(), MWBase::RotationFlag_none);
             }
         }
     }
 
-    int Creature::getBaseFightRating(const MWWorld::ConstPtr &ptr) const
+    int Creature::getBaseFightRating(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Creature> *ref = ptr.get<ESM::Creature>();
+        const MWWorld::LiveCellRef<ESM::Creature>* ref = ptr.get<ESM::Creature>();
         return ref->mBase->mAiData.mFight;
     }
 
-    void Creature::adjustScale(const MWWorld::ConstPtr &ptr, osg::Vec3f &scale, bool /* rendering */) const
+    void Creature::adjustScale(const MWWorld::ConstPtr& ptr, osg::Vec3f& scale, bool /* rendering */) const
     {
-        const MWWorld::LiveCellRef<ESM::Creature> *ref = ptr.get<ESM::Creature>();
+        const MWWorld::LiveCellRef<ESM::Creature>* ref = ptr.get<ESM::Creature>();
         scale *= ref->mBase->mScale;
     }
 
@@ -913,8 +917,8 @@ namespace MWClass
         const GMST& gmst = getGmst();
 
         return gmst.fMinWalkSpeedCreature->mValue.getFloat()
-                + 0.01f * stats.getAttribute(ESM::Attribute::Speed).getModified()
-                * (gmst.fMaxWalkSpeedCreature->mValue.getFloat() - gmst.fMinWalkSpeedCreature->mValue.getFloat());
+            + 0.01f * stats.getAttribute(ESM::Attribute::Speed).getModified()
+            * (gmst.fMaxWalkSpeedCreature->mValue.getFloat() - gmst.fMinWalkSpeedCreature->mValue.getFloat());
     }
 
     float Creature::getRunSpeed(const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index 73b716d1ed..1951ce6093 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -16,135 +16,136 @@ namespace MWClass
 {
     class Creature : public MWWorld::RegisteredClass<Creature, Actor>
     {
-            friend MWWorld::RegisteredClass<Creature, Actor>;
+        friend MWWorld::RegisteredClass<Creature, Actor>;
 
-            Creature();
+        Creature();
 
-            void ensureCustomData (const MWWorld::Ptr& ptr) const;
+        void ensureCustomData(const MWWorld::Ptr& ptr) const;
 
-            MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
+        MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const override;
 
-            static int getSndGenTypeFromName(const MWWorld::Ptr& ptr, std::string_view name);
+        static int getSndGenTypeFromName(const MWWorld::Ptr& ptr, std::string_view name);
 
-            // cached GMSTs
-            struct GMST
-            {
-                const ESM::GameSetting *fMinWalkSpeedCreature;
-                const ESM::GameSetting *fMaxWalkSpeedCreature;
-                const ESM::GameSetting *fEncumberedMoveEffect;
-                const ESM::GameSetting *fSneakSpeedMultiplier;
-                const ESM::GameSetting *fAthleticsRunBonus;
-                const ESM::GameSetting *fBaseRunMultiplier;
-                const ESM::GameSetting *fMinFlySpeed;
-                const ESM::GameSetting *fMaxFlySpeed;
-                const ESM::GameSetting *fSwimRunBase;
-                const ESM::GameSetting *fSwimRunAthleticsMult;
-                const ESM::GameSetting *fKnockDownMult;
-                const ESM::GameSetting *iKnockDownOddsMult;
-                const ESM::GameSetting *iKnockDownOddsBase;
-            };
+        // cached GMSTs
+        struct GMST
+        {
+            const ESM::GameSetting* fMinWalkSpeedCreature;
+            const ESM::GameSetting* fMaxWalkSpeedCreature;
+            const ESM::GameSetting* fEncumberedMoveEffect;
+            const ESM::GameSetting* fSneakSpeedMultiplier;
+            const ESM::GameSetting* fAthleticsRunBonus;
+            const ESM::GameSetting* fBaseRunMultiplier;
+            const ESM::GameSetting* fMinFlySpeed;
+            const ESM::GameSetting* fMaxFlySpeed;
+            const ESM::GameSetting* fSwimRunBase;
+            const ESM::GameSetting* fSwimRunAthleticsMult;
+            const ESM::GameSetting* fKnockDownMult;
+            const ESM::GameSetting* iKnockDownOddsMult;
+            const ESM::GameSetting* iKnockDownOddsBase;
+        };
 
-            static const GMST& getGmst();
+        static const GMST& getGmst();
 
-        public:
+    public:
+        void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
+            MWRender::RenderingInterface& renderingInterface) const override;
+        ///< Add reference into a cell for rendering
 
-             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
-            ///< Add reference into a cell for rendering
+        std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return name or ID; can return an empty string.
 
-            std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
-            ///< \return name or ID; can return an empty string.
+        bool hasToolTip(const MWWorld::ConstPtr& ptr) const override;
+        ///< @return true if this object has a tooltip when focused (default implementation: true)
 
-            bool hasToolTip(const MWWorld::ConstPtr& ptr) const override;
-            ///< @return true if this object has a tooltip when focused (default implementation: true)
+        MWGui::ToolTipInfo getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const override;
+        ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
-            MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const override;
-            ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
+        MWMechanics::CreatureStats& getCreatureStats(const MWWorld::Ptr& ptr) const override;
+        ///< Return creature stats
 
-            MWMechanics::CreatureStats& getCreatureStats (const MWWorld::Ptr& ptr) const override;
-            ///< Return creature stats
+        bool evaluateHit(const MWWorld::Ptr& ptr, MWWorld::Ptr& victim, osg::Vec3f& hitPosition) const override;
 
-            bool evaluateHit(const MWWorld::Ptr& ptr, MWWorld::Ptr& victim, osg::Vec3f& hitPosition) const override;
+        void hit(const MWWorld::Ptr& ptr, float attackStrength, int type, const MWWorld::Ptr& victim,
+            const osg::Vec3f& hitPosition, bool success) const override;
 
-            void hit(const MWWorld::Ptr& ptr, float attackStrength, int type, const MWWorld::Ptr& victim, const osg::Vec3f& hitPosition, bool success) const override;
+        void onHit(const MWWorld::Ptr& ptr, float damage, bool ishealth, const MWWorld::Ptr& object,
+            const MWWorld::Ptr& attacker, const osg::Vec3f& hitPosition, bool successful) const override;
 
-            void onHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object, const MWWorld::Ptr &attacker, const osg::Vec3f &hitPosition, bool successful) const override;
+        std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
+        ///< Generate action for activation
 
-            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
-                const MWWorld::Ptr& actor) const override;
-            ///< Generate action for activation
+        MWWorld::ContainerStore& getContainerStore(const MWWorld::Ptr& ptr) const override;
+        ///< Return container store
 
-            MWWorld::ContainerStore& getContainerStore (
-                const MWWorld::Ptr& ptr) const override;
-            ///< Return container store
+        MWWorld::InventoryStore& getInventoryStore(const MWWorld::Ptr& ptr) const override;
+        ///< Return inventory store
 
-            MWWorld::InventoryStore& getInventoryStore (const MWWorld::Ptr& ptr) const override;
-            ///< Return inventory store
+        bool hasInventoryStore(const MWWorld::Ptr& ptr) const override;
 
-            bool hasInventoryStore (const MWWorld::Ptr &ptr) const override;
+        std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of the script attached to ptr
 
-            std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of the script attached to ptr
+        float getCapacity(const MWWorld::Ptr& ptr) const override;
+        ///< Return total weight that fits into the object. Throws an exception, if the object can't
+        /// hold other objects.
 
-            float getCapacity (const MWWorld::Ptr& ptr) const override;
-            ///< Return total weight that fits into the object. Throws an exception, if the object can't
-            /// hold other objects.
+        float getArmorRating(const MWWorld::Ptr& ptr) const override;
+        ///< @return combined armor rating of this actor
 
-            float getArmorRating (const MWWorld::Ptr& ptr) const override;
-            ///< @return combined armor rating of this actor
+        bool isEssential(const MWWorld::ConstPtr& ptr) const override;
+        ///< Is \a ptr essential? (i.e. may losing \a ptr make the game unwinnable)
 
-            bool isEssential (const MWWorld::ConstPtr& ptr) const override;
-            ///< Is \a ptr essential? (i.e. may losing \a ptr make the game unwinnable)
+        int getServices(const MWWorld::ConstPtr& actor) const override;
 
-            int getServices (const MWWorld::ConstPtr& actor) const override;
+        bool isPersistent(const MWWorld::ConstPtr& ptr) const override;
 
-            bool isPersistent (const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getSoundIdFromSndGen(const MWWorld::Ptr& ptr, std::string_view name) const override;
 
-            std::string_view getSoundIdFromSndGen(const MWWorld::Ptr& ptr, std::string_view name) const override;
+        MWMechanics::Movement& getMovementSettings(const MWWorld::Ptr& ptr) const override;
+        ///< Return desired movement.
 
-            MWMechanics::Movement& getMovementSettings (const MWWorld::Ptr& ptr) const override;
-            ///< Return desired movement.
+        float getMaxSpeed(const MWWorld::Ptr& ptr) const override;
 
-            float getMaxSpeed (const MWWorld::Ptr& ptr) const override;
+        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
 
-            std::string getModel(const MWWorld::ConstPtr &ptr) const override;
+        void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const override;
+        ///< Get a list of models to preload that this object may use (directly or indirectly). default implementation:
+        ///< list getModel().
 
-            void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const override;
-            ///< Get a list of models to preload that this object may use (directly or indirectly). default implementation: list getModel().
+        bool isBipedal(const MWWorld::ConstPtr& ptr) const override;
+        bool canFly(const MWWorld::ConstPtr& ptr) const override;
+        bool canSwim(const MWWorld::ConstPtr& ptr) const override;
+        bool canWalk(const MWWorld::ConstPtr& ptr) const override;
 
-            bool isBipedal (const MWWorld::ConstPtr &ptr) const override;
-            bool canFly (const MWWorld::ConstPtr &ptr) const override;
-            bool canSwim (const MWWorld::ConstPtr &ptr) const override;
-            bool canWalk (const MWWorld::ConstPtr &ptr) const override;
+        float getSkill(const MWWorld::Ptr& ptr, int skill) const override;
 
-            float getSkill(const MWWorld::Ptr &ptr, int skill) const override;
+        /// Get a blood texture suitable for \a ptr (see Blood Texture 0-2 in Morrowind.ini)
+        int getBloodTexture(const MWWorld::ConstPtr& ptr) const override;
 
-            /// Get a blood texture suitable for \a ptr (see Blood Texture 0-2 in Morrowind.ini)
-            int getBloodTexture (const MWWorld::ConstPtr& ptr) const override;
+        void readAdditionalState(const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const override;
+        ///< Read additional state from \a state into \a ptr.
 
-            void readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const override;
-            ///< Read additional state from \a state into \a ptr.
+        void writeAdditionalState(const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const override;
+        ///< Write additional state from \a ptr into \a state.
 
-            void writeAdditionalState (const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const override;
-            ///< Write additional state from \a ptr into \a state.
+        int getBaseGold(const MWWorld::ConstPtr& ptr) const override;
 
-            int getBaseGold(const MWWorld::ConstPtr& ptr) const override;
+        void respawn(const MWWorld::Ptr& ptr) const override;
 
-            void respawn (const MWWorld::Ptr& ptr) const override;
+        int getBaseFightRating(const MWWorld::ConstPtr& ptr) const override;
 
-            int getBaseFightRating(const MWWorld::ConstPtr &ptr) const override;
+        void adjustScale(const MWWorld::ConstPtr& ptr, osg::Vec3f& scale, bool rendering) const override;
+        /// @param rendering Indicates if the scale to adjust is for the rendering mesh, or for the collision mesh
 
-            void adjustScale(const MWWorld::ConstPtr& ptr, osg::Vec3f& scale, bool rendering) const override;
-            /// @param rendering Indicates if the scale to adjust is for the rendering mesh, or for the collision mesh
+        void setBaseAISetting(const std::string& id, MWMechanics::AiSetting setting, int value) const override;
 
-            void setBaseAISetting(const std::string& id, MWMechanics::AiSetting setting, int value) const override;
+        void modifyBaseInventory(std::string_view actorId, std::string_view itemId, int amount) const override;
 
-            void modifyBaseInventory(std::string_view actorId, std::string_view itemId, int amount) const override;
+        float getWalkSpeed(const MWWorld::Ptr& ptr) const override;
 
-            float getWalkSpeed(const MWWorld::Ptr& ptr) const override;
+        float getRunSpeed(const MWWorld::Ptr& ptr) const override;
 
-            float getRunSpeed(const MWWorld::Ptr& ptr) const override;
-
-            float getSwimSpeed(const MWWorld::Ptr& ptr) const override;
+        float getSwimSpeed(const MWWorld::Ptr& ptr) const override;
     };
 }
 
diff --git a/apps/openmw/mwclass/creaturelevlist.cpp b/apps/openmw/mwclass/creaturelevlist.cpp
index 41d6b9b280..14ca13719b 100644
--- a/apps/openmw/mwclass/creaturelevlist.cpp
+++ b/apps/openmw/mwclass/creaturelevlist.cpp
@@ -1,7 +1,7 @@
 #include "creaturelevlist.hpp"
 
-#include <components/esm3/loadlevlist.hpp>
 #include <components/esm3/creaturelevliststate.hpp>
+#include <components/esm3/loadlevlist.hpp>
 
 #include "../mwmechanics/levelledlist.hpp"
 
@@ -24,14 +24,8 @@ namespace MWClass
         int mSpawnActorId;
         bool mSpawn; // Should a new creature be spawned?
 
-        CreatureLevListCustomData& asCreatureLevListCustomData() override
-        {
-            return *this;
-        }
-        const CreatureLevListCustomData& asCreatureLevListCustomData() const override
-        {
-            return *this;
-        }
+        CreatureLevListCustomData& asCreatureLevListCustomData() override { return *this; }
+        const CreatureLevListCustomData& asCreatureLevListCustomData() const override { return *this; }
     };
 
     CreatureLevList::CreatureLevList()
@@ -39,9 +33,9 @@ namespace MWClass
     {
     }
 
-    MWWorld::Ptr CreatureLevList::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
+    MWWorld::Ptr CreatureLevList::copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const
     {
-        const MWWorld::LiveCellRef<ESM::CreatureLevList> *ref = ptr.get<ESM::CreatureLevList>();
+        const MWWorld::LiveCellRef<ESM::CreatureLevList>* ref = ptr.get<ESM::CreatureLevList>();
 
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
@@ -52,7 +46,9 @@ namespace MWClass
             return;
 
         CreatureLevListCustomData& customData = ptr.getRefData().getCustomData()->asCreatureLevListCustomData();
-        MWWorld::Ptr creature = (customData.mSpawnActorId == -1) ? MWWorld::Ptr() : MWBase::Environment::get().getWorld()->searchPtrViaActorId(customData.mSpawnActorId);
+        MWWorld::Ptr creature = (customData.mSpawnActorId == -1)
+            ? MWWorld::Ptr()
+            : MWBase::Environment::get().getWorld()->searchPtrViaActorId(customData.mSpawnActorId);
         if (!creature.isEmpty())
             MWBase::Environment::get().getWorld()->adjustPosition(creature, force);
     }
@@ -67,7 +63,7 @@ namespace MWClass
         return false;
     }
 
-    void CreatureLevList::respawn(const MWWorld::Ptr &ptr) const
+    void CreatureLevList::respawn(const MWWorld::Ptr& ptr) const
     {
         ensureCustomData(ptr);
 
@@ -76,10 +72,10 @@ namespace MWClass
             return;
 
         MWWorld::Ptr creature;
-        if(customData.mSpawnActorId != -1)
+        if (customData.mSpawnActorId != -1)
         {
             creature = MWBase::Environment::get().getWorld()->searchPtrViaActorId(customData.mSpawnActorId);
-            if(creature.isEmpty())
+            if (creature.isEmpty())
                 creature = ptr.getCell()->getMovedActor(customData.mSpawnActorId);
         }
         if (!creature.isEmpty())
@@ -89,7 +85,8 @@ namespace MWClass
                 customData.mSpawn = true;
             else if (creatureStats.isDead())
             {
-                const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+                const MWWorld::Store<ESM::GameSetting>& gmst
+                    = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
                 static const float fCorpseRespawnDelay = gmst.find("fCorpseRespawnDelay")->mValue.getFloat();
                 static const float fCorpseClearDelay = gmst.find("fCorpseClearDelay")->mValue.getFloat();
 
@@ -102,12 +99,13 @@ namespace MWClass
             customData.mSpawn = true;
     }
 
-    void CreatureLevList::getModelsToPreload(const MWWorld::Ptr &ptr, std::vector<std::string> &models) const
+    void CreatureLevList::getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const
     {
         // disable for now, too many false positives
         /*
         const MWWorld::LiveCellRef<ESM::CreatureLevList> *ref = ptr.get<ESM::CreatureLevList>();
-        for (std::vector<ESM::LevelledListBase::LevelItem>::const_iterator it = ref->mBase->mList.begin(); it != ref->mBase->mList.end(); ++it)
+        for (std::vector<ESM::LevelledListBase::LevelItem>::const_iterator it = ref->mBase->mList.begin(); it !=
+        ref->mBase->mList.end(); ++it)
         {
             MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
             if (it->mLevel > player.getClass().getCreatureStats(player).getLevel())
@@ -120,7 +118,8 @@ namespace MWClass
         */
     }
 
-    void CreatureLevList::insertObjectRendering(const MWWorld::Ptr &ptr, const std::string& model, MWRender::RenderingInterface &renderingInterface) const
+    void CreatureLevList::insertObjectRendering(
+        const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
         ensureCustomData(ptr);
 
@@ -128,8 +127,7 @@ namespace MWClass
         if (!customData.mSpawn)
             return;
 
-        MWWorld::LiveCellRef<ESM::CreatureLevList> *ref =
-            ptr.get<ESM::CreatureLevList>();
+        MWWorld::LiveCellRef<ESM::CreatureLevList>* ref = ptr.get<ESM::CreatureLevList>();
 
         auto& prng = MWBase::Environment::get().getWorld()->getPrng();
         std::string_view id = MWMechanics::getLevelledItem(ref->mBase, true, prng);
@@ -139,7 +137,8 @@ namespace MWClass
             // Delete the previous creature
             if (customData.mSpawnActorId != -1)
             {
-                MWWorld::Ptr creature = MWBase::Environment::get().getWorld()->searchPtrViaActorId(customData.mSpawnActorId);
+                MWWorld::Ptr creature
+                    = MWBase::Environment::get().getWorld()->searchPtrViaActorId(customData.mSpawnActorId);
                 if (!creature.isEmpty())
                     MWBase::Environment::get().getWorld()->deleteObject(creature);
                 customData.mSpawnActorId = -1;
@@ -149,7 +148,8 @@ namespace MWClass
             MWWorld::ManualRef manualRef(store, id);
             manualRef.getPtr().getCellRef().setPosition(ptr.getCellRef().getPosition());
             manualRef.getPtr().getCellRef().setScale(ptr.getCellRef().getScale());
-            MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(manualRef.getPtr(), ptr.getCell() , ptr.getCellRef().getPosition());
+            MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(
+                manualRef.getPtr(), ptr.getCell(), ptr.getCellRef().getPosition());
             customData.mSpawnActorId = placed.getClass().getCreatureStats(placed).getActorId();
             customData.mSpawn = false;
         }
@@ -157,7 +157,7 @@ namespace MWClass
             customData.mSpawn = false;
     }
 
-    void CreatureLevList::ensureCustomData(const MWWorld::Ptr &ptr) const
+    void CreatureLevList::ensureCustomData(const MWWorld::Ptr& ptr) const
     {
         if (!ptr.getRefData().getCustomData())
         {
@@ -169,8 +169,7 @@ namespace MWClass
         }
     }
 
-    void CreatureLevList::readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state)
-        const
+    void CreatureLevList::readAdditionalState(const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const
     {
         if (!state.mHasCustomState)
             return;
@@ -182,8 +181,7 @@ namespace MWClass
         customData.mSpawn = levListState.mSpawn;
     }
 
-    void CreatureLevList::writeAdditionalState (const MWWorld::ConstPtr& ptr, ESM::ObjectState& state)
-        const
+    void CreatureLevList::writeAdditionalState(const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const
     {
         if (!ptr.getRefData().getCustomData())
         {
diff --git a/apps/openmw/mwclass/creaturelevlist.hpp b/apps/openmw/mwclass/creaturelevlist.hpp
index c8ee3b9b7a..d689d1770e 100644
--- a/apps/openmw/mwclass/creaturelevlist.hpp
+++ b/apps/openmw/mwclass/creaturelevlist.hpp
@@ -7,37 +7,38 @@ namespace MWClass
 {
     class CreatureLevList : public MWWorld::RegisteredClass<CreatureLevList>
     {
-            friend MWWorld::RegisteredClass<CreatureLevList>;
+        friend MWWorld::RegisteredClass<CreatureLevList>;
 
-            CreatureLevList();
+        CreatureLevList();
 
-            void ensureCustomData (const MWWorld::Ptr& ptr) const;
+        void ensureCustomData(const MWWorld::Ptr& ptr) const;
 
-        public:
+    public:
+        std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return name or ID; can return an empty string.
 
-            std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
-            ///< \return name or ID; can return an empty string.
+        bool hasToolTip(const MWWorld::ConstPtr& ptr) const override;
+        ///< @return true if this object has a tooltip when focused (default implementation: true)
 
-            bool hasToolTip (const MWWorld::ConstPtr& ptr) const override;
-            ///< @return true if this object has a tooltip when focused (default implementation: true)
+        void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const override;
+        ///< Get a list of models to preload that this object may use (directly or indirectly). default implementation:
+        ///< list getModel().
 
-            void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const override;
-            ///< Get a list of models to preload that this object may use (directly or indirectly). default implementation: list getModel().
+        void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
+            MWRender::RenderingInterface& renderingInterface) const override;
+        ///< Add reference into a cell for rendering
 
-            void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
-            ///< Add reference into a cell for rendering
+        void readAdditionalState(const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const override;
+        ///< Read additional state from \a state into \a ptr.
 
-            void readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const override;
-            ///< Read additional state from \a state into \a ptr.
+        void writeAdditionalState(const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const override;
+        ///< Write additional state from \a ptr into \a state.
 
-            void writeAdditionalState (const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const override;
-            ///< Write additional state from \a ptr into \a state.
+        void respawn(const MWWorld::Ptr& ptr) const override;
 
-            void respawn (const MWWorld::Ptr& ptr) const override;
+        MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const override;
 
-            MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
-
-            void adjustPosition(const MWWorld::Ptr& ptr, bool force) const override;
+        void adjustPosition(const MWWorld::Ptr& ptr, bool force) const override;
     };
 }
 
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 3faa42b288..8a300fc9e8 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -2,34 +2,34 @@
 
 #include <MyGUI_TextIterator.h>
 
-#include <components/esm3/loaddoor.hpp>
 #include <components/esm3/doorstate.hpp>
+#include <components/esm3/loaddoor.hpp>
 #include <components/esm3/loadmgef.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/ptr.hpp"
-#include "../mwworld/failedaction.hpp"
-#include "../mwworld/actionteleport.hpp"
-#include "../mwworld/actiondoor.hpp"
-#include "../mwworld/cellstore.hpp"
-#include "../mwworld/esmstore.hpp"
 #include "../mwphysics/physicssystem.hpp"
+#include "../mwworld/actiondoor.hpp"
+#include "../mwworld/actionteleport.hpp"
 #include "../mwworld/actiontrap.hpp"
-#include "../mwworld/customdata.hpp"
+#include "../mwworld/cellstore.hpp"
 #include "../mwworld/cellutils.hpp"
 #include "../mwworld/containerstore.hpp"
+#include "../mwworld/customdata.hpp"
+#include "../mwworld/esmstore.hpp"
+#include "../mwworld/failedaction.hpp"
+#include "../mwworld/ptr.hpp"
 
 #include "../mwgui/tooltips.hpp"
 #include "../mwgui/ustring.hpp"
 
+#include "../mwrender/animation.hpp"
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
-#include "../mwrender/animation.hpp"
 #include "../mwrender/vismask.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
@@ -43,14 +43,8 @@ namespace MWClass
     public:
         MWWorld::DoorState mDoorState = MWWorld::DoorState::Idle;
 
-        DoorCustomData& asDoorCustomData() override
-        {
-            return *this;
-        }
-        const DoorCustomData& asDoorCustomData() const override
-        {
-            return *this;
-        }
+        DoorCustomData& asDoorCustomData() override { return *this; }
+        const DoorCustomData& asDoorCustomData() const override { return *this; }
     };
 
     Door::Door()
@@ -58,7 +52,8 @@ namespace MWClass
     {
     }
 
-    void Door::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
+    void Door::insertObjectRendering(
+        const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
         if (!model.empty())
         {
@@ -67,7 +62,8 @@ namespace MWClass
         }
     }
 
-    void Door::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
+    void Door::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+        MWPhysics::PhysicsSystem& physics) const
     {
         insertObjectPhysics(ptr, model, rotation, physics);
 
@@ -82,7 +78,8 @@ namespace MWClass
         }
     }
 
-    void Door::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
+    void Door::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+        MWPhysics::PhysicsSystem& physics) const
     {
         physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_Door);
     }
@@ -97,31 +94,30 @@ namespace MWClass
         return true;
     }
 
-    std::string Door::getModel(const MWWorld::ConstPtr &ptr) const
+    std::string Door::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Door>(ptr);
     }
 
     std::string_view Door::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Door> *ref = ptr.get<ESM::Door>();
+        const MWWorld::LiveCellRef<ESM::Door>* ref = ptr.get<ESM::Door>();
         const std::string& name = ref->mBase->mName;
 
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::unique_ptr<MWWorld::Action> Door::activate (const MWWorld::Ptr& ptr,
-        const MWWorld::Ptr& actor) const
+    std::unique_ptr<MWWorld::Action> Door::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
     {
-        MWWorld::LiveCellRef<ESM::Door> *ref = ptr.get<ESM::Door>();
+        MWWorld::LiveCellRef<ESM::Door>* ref = ptr.get<ESM::Door>();
 
-        const std::string &openSound = ref->mBase->mOpenSound;
-        const std::string &closeSound = ref->mBase->mCloseSound;
+        const std::string& openSound = ref->mBase->mOpenSound;
+        const std::string& closeSound = ref->mBase->mCloseSound;
         const std::string_view lockedSound = "LockedDoor";
         const std::string_view trapActivationSound = "Disarm Trap Fail";
 
-        // FIXME: If NPC activate teleporting door, it can lead to crash due to iterator invalidation in the Actors update.
-        // Make such activation a no-op for now, like how it is in the vanilla game.
+        // FIXME: If NPC activate teleporting door, it can lead to crash due to iterator invalidation in the Actors
+        // update. Make such activation a no-op for now, like how it is in the vanilla game.
         if (actor != MWMechanics::getPlayer() && ptr.getCellRef().getTeleport())
         {
             std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::FailedAction>(std::string_view{}, ptr);
@@ -130,22 +126,23 @@ namespace MWClass
         }
 
         // make door glow if player activates it with telekinesis
-        if (actor == MWMechanics::getPlayer() &&
-            MWBase::Environment::get().getWorld()->getDistanceToFacedObject() >
-            MWBase::Environment::get().getWorld()->getMaxActivationDistance())
+        if (actor == MWMechanics::getPlayer()
+            && MWBase::Environment::get().getWorld()->getDistanceToFacedObject()
+                > MWBase::Environment::get().getWorld()->getMaxActivationDistance())
         {
             MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(ptr);
-            if(animation)
+            if (animation)
             {
                 const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
                 int index = ESM::MagicEffect::effectStringToId("sEffectTelekinesis");
-                const ESM::MagicEffect *effect = store.get<ESM::MagicEffect>().find(index);
+                const ESM::MagicEffect* effect = store.get<ESM::MagicEffect>().find(index);
 
-                animation->addSpellCastGlow(effect, 1); // 1 second glow to match the time taken for a door opening or closing
+                animation->addSpellCastGlow(
+                    effect, 1); // 1 second glow to match the time taken for a door opening or closing
             }
         }
 
-        MWWorld::ContainerStore &invStore = actor.getClass().getContainerStore(actor);
+        MWWorld::ContainerStore& invStore = actor.getClass().getContainerStore(actor);
 
         bool isLocked = ptr.getCellRef().getLockLevel() > 0;
         bool isTrapped = !ptr.getCellRef().getTrap().empty();
@@ -164,11 +161,11 @@ namespace MWClass
 
         if (isLocked && hasKey)
         {
-            if(actor == MWMechanics::getPlayer())
-                MWBase::Environment::get().getWindowManager()->messageBox(std::string{keyName} + " #{sKeyUsed}");
-            ptr.getCellRef().unlock(); //Call the function here. because that makes sense.
+            if (actor == MWMechanics::getPlayer())
+                MWBase::Environment::get().getWindowManager()->messageBox(std::string{ keyName } + " #{sKeyUsed}");
+            ptr.getCellRef().unlock(); // Call the function here. because that makes sense.
             // using a key disarms the trap
-            if(isTrapped)
+            if (isTrapped)
             {
                 ptr.getCellRef().setTrap("");
                 MWBase::Environment::get().getSoundManager()->playSound3D(ptr, "Disarm Trap", 1.0f, 1.0f);
@@ -178,24 +175,28 @@ namespace MWClass
 
         if (!isLocked || hasKey)
         {
-            if(isTrapped)
+            if (isTrapped)
             {
                 // Trap activation
-                std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::ActionTrap>(ptr.getCellRef().getTrap(), ptr);
+                std::unique_ptr<MWWorld::Action> action
+                    = std::make_unique<MWWorld::ActionTrap>(ptr.getCellRef().getTrap(), ptr);
                 action->setSound(trapActivationSound);
                 return action;
             }
 
             if (ptr.getCellRef().getTeleport())
             {
-                if (actor == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getDistanceToFacedObject() > MWBase::Environment::get().getWorld()->getMaxActivationDistance())
+                if (actor == MWMechanics::getPlayer()
+                    && MWBase::Environment::get().getWorld()->getDistanceToFacedObject()
+                        > MWBase::Environment::get().getWorld()->getMaxActivationDistance())
                 {
                     // player activated teleport door with telekinesis
                     return std::make_unique<MWWorld::FailedAction>();
                 }
                 else
                 {
-                    std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::ActionTeleport>(ptr.getCellRef().getDestCell(), ptr.getCellRef().getDoorDest(), true);
+                    std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::ActionTeleport>(
+                        ptr.getCellRef().getDestCell(), ptr.getCellRef().getDoorDest(), true);
                     action->setSound(openSound);
                     return action;
                 }
@@ -214,19 +215,17 @@ namespace MWClass
 
                 if (opening)
                 {
-                    MWBase::Environment::get().getSoundManager()->fadeOutSound3D(ptr,
-                            closeSound, 0.5f);
+                    MWBase::Environment::get().getSoundManager()->fadeOutSound3D(ptr, closeSound, 0.5f);
                     // Doors rotate at 90 degrees per second, so start the sound at
                     // where it would be at the current rotation.
-                    float offset = doorRot/(osg::PI * 0.5f);
+                    float offset = doorRot / (osg::PI * 0.5f);
                     action->setSoundOffset(offset);
                     action->setSound(openSound);
                 }
                 else
                 {
-                    MWBase::Environment::get().getSoundManager()->fadeOutSound3D(ptr,
-                                                openSound, 0.5f);
-                    float offset = 1.0f - doorRot/(osg::PI * 0.5f);
+                    MWBase::Environment::get().getSoundManager()->fadeOutSound3D(ptr, openSound, 0.5f);
+                    float offset = 1.0f - doorRot / (osg::PI * 0.5f);
                     action->setSoundOffset(std::max(offset, 0.0f));
                     action->setSound(closeSound);
                 }
@@ -243,14 +242,15 @@ namespace MWClass
         }
     }
 
-    bool Door::canLock(const MWWorld::ConstPtr &ptr) const
+    bool Door::canLock(const MWWorld::ConstPtr& ptr) const
     {
         return true;
     }
 
-    bool Door::allowTelekinesis(const MWWorld::ConstPtr &ptr) const
+    bool Door::allowTelekinesis(const MWWorld::ConstPtr& ptr) const
     {
-        if (ptr.getCellRef().getTeleport() && ptr.getCellRef().getLockLevel() <= 0 && ptr.getCellRef().getTrap().empty())
+        if (ptr.getCellRef().getTeleport() && ptr.getCellRef().getLockLevel() <= 0
+            && ptr.getCellRef().getTrap().empty())
             return false;
         else
             return true;
@@ -258,14 +258,14 @@ namespace MWClass
 
     std::string_view Door::getScript(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Door> *ref = ptr.get<ESM::Door>();
+        const MWWorld::LiveCellRef<ESM::Door>* ref = ptr.get<ESM::Door>();
 
         return ref->mBase->mScript;
     }
 
-    MWGui::ToolTipInfo Door::getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const
+    MWGui::ToolTipInfo Door::getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const
     {
-        const MWWorld::LiveCellRef<ESM::Door> *ref = ptr.get<ESM::Door>();
+        const MWWorld::LiveCellRef<ESM::Door>* ref = ptr.get<ESM::Door>();
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
@@ -297,15 +297,15 @@ namespace MWClass
         return info;
     }
 
-    std::string Door::getDestination (const MWWorld::LiveCellRef<ESM::Door>& door)
+    std::string Door::getDestination(const MWWorld::LiveCellRef<ESM::Door>& door)
     {
         std::string dest = door.mRef.getDestCell();
         if (dest.empty())
         {
             // door leads to exterior, use cell name (if any), otherwise translated region name
             auto world = MWBase::Environment::get().getWorld();
-            const osg::Vec2i index = MWWorld::positionToCellIndex(door.mRef.getDoorDest().pos[0],
-                door.mRef.getDoorDest().pos[1]);
+            const osg::Vec2i index
+                = MWWorld::positionToCellIndex(door.mRef.getDoorDest().pos[0], door.mRef.getDoorDest().pos[1]);
             const ESM::Cell* cell = world->getStore().get<ESM::Cell>().search(index.x(), index.y());
             dest = world->getCellName(cell);
         }
@@ -313,14 +313,14 @@ namespace MWClass
         return "#{sCell=" + dest + "}";
     }
 
-    MWWorld::Ptr Door::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
+    MWWorld::Ptr Door::copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const
     {
-        const MWWorld::LiveCellRef<ESM::Door> *ref = ptr.get<ESM::Door>();
+        const MWWorld::LiveCellRef<ESM::Door>* ref = ptr.get<ESM::Door>();
 
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
 
-    void Door::ensureCustomData(const MWWorld::Ptr &ptr) const
+    void Door::ensureCustomData(const MWWorld::Ptr& ptr) const
     {
         if (!ptr.getRefData().getCustomData())
         {
@@ -328,7 +328,7 @@ namespace MWClass
         }
     }
 
-    MWWorld::DoorState Door::getDoorState (const MWWorld::ConstPtr &ptr) const
+    MWWorld::DoorState Door::getDoorState(const MWWorld::ConstPtr& ptr) const
     {
         if (!ptr.getRefData().getCustomData())
             return MWWorld::DoorState::Idle;
@@ -336,7 +336,7 @@ namespace MWClass
         return customData.mDoorState;
     }
 
-    void Door::setDoorState (const MWWorld::Ptr &ptr, MWWorld::DoorState state) const
+    void Door::setDoorState(const MWWorld::Ptr& ptr, MWWorld::DoorState state) const
     {
         if (ptr.getCellRef().getTeleport())
             throw std::runtime_error("load doors can't be moved");
@@ -346,7 +346,7 @@ namespace MWClass
         customData.mDoorState = state;
     }
 
-    void Door::readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const
+    void Door::readAdditionalState(const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const
     {
         if (!state.mHasCustomState)
             return;
@@ -357,7 +357,7 @@ namespace MWClass
         customData.mDoorState = MWWorld::DoorState(doorState.mDoorState);
     }
 
-    void Door::writeAdditionalState (const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const
+    void Door::writeAdditionalState(const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const
     {
         if (!ptr.getRefData().getCustomData())
         {
diff --git a/apps/openmw/mwclass/door.hpp b/apps/openmw/mwclass/door.hpp
index 4ffa2bd02e..dc6be431ed 100644
--- a/apps/openmw/mwclass/door.hpp
+++ b/apps/openmw/mwclass/door.hpp
@@ -9,59 +9,59 @@ namespace MWClass
 {
     class Door : public MWWorld::RegisteredClass<Door>
     {
-            friend MWWorld::RegisteredClass<Door>;
+        friend MWWorld::RegisteredClass<Door>;
 
-            Door();
+        Door();
 
-            void ensureCustomData (const MWWorld::Ptr& ptr) const;
+        void ensureCustomData(const MWWorld::Ptr& ptr) const;
 
-            MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
+        MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const override;
 
-        public:
+    public:
+        void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
+            MWRender::RenderingInterface& renderingInterface) const override;
+        ///< Add reference into a cell for rendering
 
-            void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
-            ///< Add reference into a cell for rendering
+        void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+            MWPhysics::PhysicsSystem& physics) const override;
+        void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+            MWPhysics::PhysicsSystem& physics) const override;
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const override;
-            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const override;
+        bool isDoor() const override;
 
-            bool isDoor() const override;
+        bool useAnim() const override;
 
-            bool useAnim() const override;
+        std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return name or ID; can return an empty string.
 
-            std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
-            ///< \return name or ID; can return an empty string.
+        std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
+        ///< Generate action for activation
 
-            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
-                const MWWorld::Ptr& actor) const override;
-            ///< Generate action for activation
+        MWGui::ToolTipInfo getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const override;
+        ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
-            MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const override;
-            ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
+        static std::string getDestination(const MWWorld::LiveCellRef<ESM::Door>& door);
+        ///< @return destination cell name or token
 
-            static std::string getDestination (const MWWorld::LiveCellRef<ESM::Door>& door);
-            ///< @return destination cell name or token
+        bool canLock(const MWWorld::ConstPtr& ptr) const override;
 
-            bool canLock(const MWWorld::ConstPtr &ptr) const override;
+        bool allowTelekinesis(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return whether this class of object can be activated with telekinesis
 
-            bool allowTelekinesis(const MWWorld::ConstPtr &ptr) const override;
-            ///< Return whether this class of object can be activated with telekinesis
+        std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of the script attached to ptr
 
-            std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of the script attached to ptr
+        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
 
-            std::string getModel(const MWWorld::ConstPtr &ptr) const override;
+        MWWorld::DoorState getDoorState(const MWWorld::ConstPtr& ptr) const override;
+        /// This does not actually cause the door to move. Use World::activateDoor instead.
+        void setDoorState(const MWWorld::Ptr& ptr, MWWorld::DoorState state) const override;
 
-            MWWorld::DoorState getDoorState (const MWWorld::ConstPtr &ptr) const override;
-            /// This does not actually cause the door to move. Use World::activateDoor instead.
-            void setDoorState (const MWWorld::Ptr &ptr, MWWorld::DoorState state) const override;
+        void readAdditionalState(const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const override;
+        ///< Read additional state from \a state into \a ptr.
 
-
-            void readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const override;
-            ///< Read additional state from \a state into \a ptr.
-
-            void writeAdditionalState (const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const override;
-            ///< Write additional state from \a ptr into \a state.
+        void writeAdditionalState(const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const override;
+        ///< Write additional state from \a ptr into \a state.
     };
 }
 
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index d7b313a4f9..575377a0e5 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -6,13 +6,13 @@
 #include <components/esm3/loadnpc.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/ptr.hpp"
+#include "../mwworld/actioneat.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
-#include "../mwworld/actioneat.hpp"
+#include "../mwworld/ptr.hpp"
 
 #include "../mwgui/tooltips.hpp"
 #include "../mwgui/ustring.hpp"
@@ -29,52 +29,52 @@ namespace MWClass
     {
     }
 
-    void Ingredient::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
+    void Ingredient::insertObjectRendering(
+        const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
-        if (!model.empty()) {
+        if (!model.empty())
+        {
             renderingInterface.getObjects().insertModel(ptr, model);
         }
     }
 
-    std::string Ingredient::getModel(const MWWorld::ConstPtr &ptr) const
+    std::string Ingredient::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Ingredient>(ptr);
     }
 
     std::string_view Ingredient::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Ingredient> *ref = ptr.get<ESM::Ingredient>();
+        const MWWorld::LiveCellRef<ESM::Ingredient>* ref = ptr.get<ESM::Ingredient>();
         const std::string& name = ref->mBase->mName;
 
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::unique_ptr<MWWorld::Action> Ingredient::activate (const MWWorld::Ptr& ptr,
-        const MWWorld::Ptr& actor) const
+    std::unique_ptr<MWWorld::Action> Ingredient::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
     {
         return defaultItemActivate(ptr, actor);
     }
 
     std::string_view Ingredient::getScript(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Ingredient> *ref = ptr.get<ESM::Ingredient>();
+        const MWWorld::LiveCellRef<ESM::Ingredient>* ref = ptr.get<ESM::Ingredient>();
 
         return ref->mBase->mScript;
     }
 
-    int Ingredient::getValue (const MWWorld::ConstPtr& ptr) const
+    int Ingredient::getValue(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Ingredient> *ref = ptr.get<ESM::Ingredient>();
+        const MWWorld::LiveCellRef<ESM::Ingredient>* ref = ptr.get<ESM::Ingredient>();
 
         return ref->mBase->mData.mValue;
     }
 
-
-    std::unique_ptr<MWWorld::Action> Ingredient::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Ingredient::use(const MWWorld::Ptr& ptr, bool force) const
     {
         std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::ActionEat>(ptr);
 
-        action->setSound ("Swallow");
+        action->setSound("Swallow");
 
         return action;
     }
@@ -91,18 +91,19 @@ namespace MWClass
 
     const std::string& Ingredient::getInventoryIcon(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Ingredient> *ref = ptr.get<ESM::Ingredient>();
+        const MWWorld::LiveCellRef<ESM::Ingredient>* ref = ptr.get<ESM::Ingredient>();
 
         return ref->mBase->mIcon;
     }
 
-    MWGui::ToolTipInfo Ingredient::getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const
+    MWGui::ToolTipInfo Ingredient::getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const
     {
-        const MWWorld::LiveCellRef<ESM::Ingredient> *ref = ptr.get<ESM::Ingredient>();
+        const MWWorld::LiveCellRef<ESM::Ingredient>* ref = ptr.get<ESM::Ingredient>();
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption
+            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
         info.icon = ref->mBase->mIcon;
 
         std::string text;
@@ -110,19 +111,24 @@ namespace MWClass
         text += MWGui::ToolTips::getWeightString(ref->mBase->mData.mWeight, "#{sWeight}");
         text += MWGui::ToolTips::getValueString(ref->mBase->mData.mValue, "#{sValue}");
 
-        if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
+        if (MWBase::Environment::get().getWindowManager()->getFullHelp())
+        {
             text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
             text += MWGui::ToolTips::getMiscString(ref->mBase->mScript, "Script");
         }
 
-        MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
         float alchemySkill = player.getClass().getSkill(player, ESM::Skill::Alchemy);
 
-        static const float fWortChanceValue =
-                MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fWortChanceValue")->mValue.getFloat();
+        static const float fWortChanceValue = MWBase::Environment::get()
+                                                  .getWorld()
+                                                  ->getStore()
+                                                  .get<ESM::GameSetting>()
+                                                  .find("fWortChanceValue")
+                                                  ->mValue.getFloat();
 
         MWGui::Widgets::SpellEffectList list;
-        for (int i=0; i<4; ++i)
+        for (int i = 0; i < 4; ++i)
         {
             if (ref->mBase->mData.mEffectID[i] < 0)
                 continue;
@@ -131,10 +137,9 @@ namespace MWClass
             params.mAttribute = ref->mBase->mData.mAttributes[i];
             params.mSkill = ref->mBase->mData.mSkills[i];
 
-            params.mKnown = ( (i == 0 && alchemySkill >= fWortChanceValue)
-                 || (i == 1 && alchemySkill >= fWortChanceValue*2)
-                 || (i == 2 && alchemySkill >= fWortChanceValue*3)
-                 || (i == 3 && alchemySkill >= fWortChanceValue*4));
+            params.mKnown = ((i == 0 && alchemySkill >= fWortChanceValue)
+                || (i == 1 && alchemySkill >= fWortChanceValue * 2) || (i == 2 && alchemySkill >= fWortChanceValue * 3)
+                || (i == 3 && alchemySkill >= fWortChanceValue * 4));
 
             list.push_back(params);
         }
@@ -146,22 +151,21 @@ namespace MWClass
         return info;
     }
 
-    MWWorld::Ptr Ingredient::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
+    MWWorld::Ptr Ingredient::copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const
     {
-        const MWWorld::LiveCellRef<ESM::Ingredient> *ref = ptr.get<ESM::Ingredient>();
+        const MWWorld::LiveCellRef<ESM::Ingredient>* ref = ptr.get<ESM::Ingredient>();
 
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
 
-    bool Ingredient::canSell (const MWWorld::ConstPtr& item, int npcServices) const
+    bool Ingredient::canSell(const MWWorld::ConstPtr& item, int npcServices) const
     {
         return (npcServices & ESM::NPC::Ingredients) != 0;
     }
 
-
-    float Ingredient::getWeight(const MWWorld::ConstPtr &ptr) const
+    float Ingredient::getWeight(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Ingredient> *ref = ptr.get<ESM::Ingredient>();
+        const MWWorld::LiveCellRef<ESM::Ingredient>* ref = ptr.get<ESM::Ingredient>();
         return ref->mBase->mData.mWeight;
     }
 }
diff --git a/apps/openmw/mwclass/ingredient.hpp b/apps/openmw/mwclass/ingredient.hpp
index 11a6e56944..4527c67d98 100644
--- a/apps/openmw/mwclass/ingredient.hpp
+++ b/apps/openmw/mwclass/ingredient.hpp
@@ -7,50 +7,49 @@ namespace MWClass
 {
     class Ingredient : public MWWorld::RegisteredClass<Ingredient>
     {
-            friend MWWorld::RegisteredClass<Ingredient>;
+        friend MWWorld::RegisteredClass<Ingredient>;
 
-            Ingredient();
+        Ingredient();
 
-            MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
+        MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const override;
 
-        public:
+    public:
+        void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
+            MWRender::RenderingInterface& renderingInterface) const override;
+        ///< Add reference into a cell for rendering
 
-            void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
-            ///< Add reference into a cell for rendering
+        std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return name or ID; can return an empty string.
 
-            std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
-            ///< \return name or ID; can return an empty string.
+        std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
+        ///< Generate action for activation
 
-            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
-                const MWWorld::Ptr& actor) const override;
-            ///< Generate action for activation
+        MWGui::ToolTipInfo getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const override;
+        ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
-            MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const override;
-            ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
+        std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of the script attached to ptr
 
-            std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of the script attached to ptr
+        int getValue(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            int getValue (const MWWorld::ConstPtr& ptr) const override;
-            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+        std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
+        ///< Generate action for using via inventory menu
 
-            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
-            ///< Generate action for using via inventory menu
+        std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the pick up sound Id
 
-            std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the pick up sound Id
+        std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the put down sound Id
 
-            std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the put down sound Id
+        const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of inventory icon.
 
-            const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of inventory icon.
+        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
 
-            std::string getModel(const MWWorld::ConstPtr &ptr) const override;
+        float getWeight(const MWWorld::ConstPtr& ptr) const override;
 
-            float getWeight (const MWWorld::ConstPtr& ptr) const override;
-
-            bool canSell (const MWWorld::ConstPtr& item, int npcServices) const override;
+        bool canSell(const MWWorld::ConstPtr& item, int npcServices) const override;
     };
 }
 
diff --git a/apps/openmw/mwclass/itemlevlist.hpp b/apps/openmw/mwclass/itemlevlist.hpp
index dbaf6f54c4..56652c788b 100644
--- a/apps/openmw/mwclass/itemlevlist.hpp
+++ b/apps/openmw/mwclass/itemlevlist.hpp
@@ -7,17 +7,16 @@ namespace MWClass
 {
     class ItemLevList : public MWWorld::RegisteredClass<ItemLevList>
     {
-            friend MWWorld::RegisteredClass<ItemLevList>;
+        friend MWWorld::RegisteredClass<ItemLevList>;
 
-            ItemLevList();
+        ItemLevList();
 
-        public:
+    public:
+        std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return name or ID; can return an empty string.
 
-            std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
-            ///< \return name or ID; can return an empty string.
-
-            bool hasToolTip (const MWWorld::ConstPtr& ptr) const override;
-            ///< @return true if this object has a tooltip when focused (default implementation: true)
+        bool hasToolTip(const MWWorld::ConstPtr& ptr) const override;
+        ///< @return true if this object has a tooltip when focused (default implementation: true)
     };
 }
 
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 49974f9461..c3ac48ff81 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -11,13 +11,13 @@
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwworld/ptr.hpp"
+#include "../mwphysics/physicssystem.hpp"
 #include "../mwworld/actionequip.hpp"
-#include "../mwworld/nullaction.hpp"
+#include "../mwworld/cellstore.hpp"
 #include "../mwworld/failedaction.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwworld/cellstore.hpp"
-#include "../mwphysics/physicssystem.hpp"
+#include "../mwworld/nullaction.hpp"
+#include "../mwworld/ptr.hpp"
 
 #include "../mwgui/tooltips.hpp"
 #include "../mwgui/ustring.hpp"
@@ -34,30 +34,31 @@ namespace MWClass
     {
     }
 
-    void Light::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
+    void Light::insertObjectRendering(
+        const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
-        MWWorld::LiveCellRef<ESM::Light> *ref =
-            ptr.get<ESM::Light>();
+        MWWorld::LiveCellRef<ESM::Light>* ref = ptr.get<ESM::Light>();
 
         // Insert even if model is empty, so that the light is added
-        renderingInterface.getObjects().insertModel(ptr, model, true, !(ref->mBase->mData.mFlags & ESM::Light::OffDefault));
+        renderingInterface.getObjects().insertModel(
+            ptr, model, true, !(ref->mBase->mData.mFlags & ESM::Light::OffDefault));
     }
 
-    void Light::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
+    void Light::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+        MWPhysics::PhysicsSystem& physics) const
     {
-        MWWorld::LiveCellRef<ESM::Light> *ref =
-            ptr.get<ESM::Light>();
-        assert (ref->mBase != nullptr);
+        MWWorld::LiveCellRef<ESM::Light>* ref = ptr.get<ESM::Light>();
+        assert(ref->mBase != nullptr);
 
         insertObjectPhysics(ptr, model, rotation, physics);
 
         if (!ref->mBase->mSound.empty() && !(ref->mBase->mData.mFlags & ESM::Light::OffDefault))
-            MWBase::Environment::get().getSoundManager()->playSound3D(ptr, ref->mBase->mSound, 1.0, 1.0,
-                                                                      MWSound::Type::Sfx,
-                                                                      MWSound::PlayMode::Loop);
+            MWBase::Environment::get().getSoundManager()->playSound3D(
+                ptr, ref->mBase->mSound, 1.0, 1.0, MWSound::Type::Sfx, MWSound::PlayMode::Loop);
     }
 
-    void Light::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
+    void Light::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+        MWPhysics::PhysicsSystem& physics) const
     {
         // TODO: add option somewhere to enable collision for placeable objects
         if ((ptr.get<ESM::Light>()->mBase->mData.mFlags & ESM::Light::Carry) == 0)
@@ -69,14 +70,14 @@ namespace MWClass
         return true;
     }
 
-    std::string Light::getModel(const MWWorld::ConstPtr &ptr) const
+    std::string Light::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Light>(ptr);
     }
 
     std::string_view Light::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Light> *ref = ptr.get<ESM::Light>();
+        const MWWorld::LiveCellRef<ESM::Light>* ref = ptr.get<ESM::Light>();
 
         if (ref->mBase->mModel.empty())
             return {};
@@ -85,14 +86,13 @@ namespace MWClass
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::unique_ptr<MWWorld::Action> Light::activate (const MWWorld::Ptr& ptr,
-        const MWWorld::Ptr& actor) const
+    std::unique_ptr<MWWorld::Action> Light::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
     {
-        if(!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
+        if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
             return std::make_unique<MWWorld::NullAction>();
 
-        MWWorld::LiveCellRef<ESM::Light> *ref = ptr.get<ESM::Light>();
-        if(!(ref->mBase->mData.mFlags&ESM::Light::Carry))
+        MWWorld::LiveCellRef<ESM::Light>* ref = ptr.get<ESM::Light>();
+        if (!(ref->mBase->mData.mFlags & ESM::Light::Carry))
             return std::make_unique<MWWorld::FailedAction>();
 
         return defaultItemActivate(ptr, actor);
@@ -100,26 +100,26 @@ namespace MWClass
 
     std::string_view Light::getScript(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Light> *ref = ptr.get<ESM::Light>();
+        const MWWorld::LiveCellRef<ESM::Light>* ref = ptr.get<ESM::Light>();
 
         return ref->mBase->mScript;
     }
 
-    std::pair<std::vector<int>, bool> Light::getEquipmentSlots (const MWWorld::ConstPtr& ptr) const
+    std::pair<std::vector<int>, bool> Light::getEquipmentSlots(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Light> *ref = ptr.get<ESM::Light>();
+        const MWWorld::LiveCellRef<ESM::Light>* ref = ptr.get<ESM::Light>();
 
         std::vector<int> slots_;
 
         if (ref->mBase->mData.mFlags & ESM::Light::Carry)
-            slots_.push_back (int (MWWorld::InventoryStore::Slot_CarriedLeft));
+            slots_.push_back(int(MWWorld::InventoryStore::Slot_CarriedLeft));
 
-        return std::make_pair (slots_, false);
+        return std::make_pair(slots_, false);
     }
 
-    int Light::getValue (const MWWorld::ConstPtr& ptr) const
+    int Light::getValue(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Light> *ref = ptr.get<ESM::Light>();
+        const MWWorld::LiveCellRef<ESM::Light>* ref = ptr.get<ESM::Light>();
 
         return ref->mBase->mData.mValue;
     }
@@ -134,38 +134,40 @@ namespace MWClass
         return "Item Misc Down";
     }
 
-
     const std::string& Light::getInventoryIcon(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Light> *ref = ptr.get<ESM::Light>();
+        const MWWorld::LiveCellRef<ESM::Light>* ref = ptr.get<ESM::Light>();
 
         return ref->mBase->mIcon;
     }
 
-    bool Light::hasToolTip (const MWWorld::ConstPtr& ptr) const
+    bool Light::hasToolTip(const MWWorld::ConstPtr& ptr) const
     {
         return showsInInventory(ptr);
     }
 
-    MWGui::ToolTipInfo Light::getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const
+    MWGui::ToolTipInfo Light::getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const
     {
-        const MWWorld::LiveCellRef<ESM::Light> *ref = ptr.get<ESM::Light>();
+        const MWWorld::LiveCellRef<ESM::Light>* ref = ptr.get<ESM::Light>();
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption
+            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
         info.icon = ref->mBase->mIcon;
 
         std::string text;
 
         // Don't show duration for infinite light sources.
-        if (Settings::Manager::getBool("show effect duration","Game") && ptr.getClass().getRemainingUsageTime(ptr) != -1)
+        if (Settings::Manager::getBool("show effect duration", "Game")
+            && ptr.getClass().getRemainingUsageTime(ptr) != -1)
             text += MWGui::ToolTips::getDurationString(ptr.getClass().getRemainingUsageTime(ptr), "\n#{sDuration}");
 
         text += MWGui::ToolTips::getWeightString(ref->mBase->mData.mWeight, "#{sWeight}");
         text += MWGui::ToolTips::getValueString(ref->mBase->mData.mValue, "#{sValue}");
 
-        if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
+        if (MWBase::Environment::get().getWindowManager()->getFullHelp())
+        {
             text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
             text += MWGui::ToolTips::getMiscString(ref->mBase->mScript, "Script");
         }
@@ -175,7 +177,7 @@ namespace MWClass
         return info;
     }
 
-    bool Light::showsInInventory (const MWWorld::ConstPtr& ptr) const
+    bool Light::showsInInventory(const MWWorld::ConstPtr& ptr) const
     {
         const ESM::Light* light = ptr.get<ESM::Light>()->mBase;
 
@@ -185,7 +187,7 @@ namespace MWClass
         return Class::showsInInventory(ptr);
     }
 
-    std::unique_ptr<MWWorld::Action> Light::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Light::use(const MWWorld::Ptr& ptr, bool force) const
     {
         std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::ActionEquip>(ptr, force);
 
@@ -194,49 +196,49 @@ namespace MWClass
         return action;
     }
 
-    void Light::setRemainingUsageTime (const MWWorld::Ptr& ptr, float duration) const
+    void Light::setRemainingUsageTime(const MWWorld::Ptr& ptr, float duration) const
     {
         ptr.getCellRef().setChargeFloat(duration);
     }
 
-    float Light::getRemainingUsageTime (const MWWorld::ConstPtr& ptr) const
+    float Light::getRemainingUsageTime(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Light> *ref = ptr.get<ESM::Light>();
+        const MWWorld::LiveCellRef<ESM::Light>* ref = ptr.get<ESM::Light>();
         if (ptr.getCellRef().getCharge() == -1)
             return static_cast<float>(ref->mBase->mData.mTime);
         else
             return ptr.getCellRef().getChargeFloat();
     }
 
-    MWWorld::Ptr Light::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
+    MWWorld::Ptr Light::copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const
     {
-        const MWWorld::LiveCellRef<ESM::Light> *ref = ptr.get<ESM::Light>();
+        const MWWorld::LiveCellRef<ESM::Light>* ref = ptr.get<ESM::Light>();
 
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
 
-    bool Light::canSell (const MWWorld::ConstPtr& item, int npcServices) const
+    bool Light::canSell(const MWWorld::ConstPtr& item, int npcServices) const
     {
         return (npcServices & ESM::NPC::Lights) != 0;
     }
 
-    float Light::getWeight(const MWWorld::ConstPtr &ptr) const
+    float Light::getWeight(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Light> *ref = ptr.get<ESM::Light>();
+        const MWWorld::LiveCellRef<ESM::Light>* ref = ptr.get<ESM::Light>();
         return ref->mBase->mData.mWeight;
     }
 
     std::pair<int, std::string_view> Light::canBeEquipped(const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& npc) const
     {
-        const MWWorld::LiveCellRef<ESM::Light> *ref = ptr.get<ESM::Light>();
+        const MWWorld::LiveCellRef<ESM::Light>* ref = ptr.get<ESM::Light>();
         if (!(ref->mBase->mData.mFlags & ESM::Light::Carry))
-            return {0, {}};
+            return { 0, {} };
 
-        return {1, {}};
+        return { 1, {} };
     }
 
     std::string_view Light::getSound(const MWWorld::ConstPtr& ptr) const
     {
-      return ptr.get<ESM::Light>()->mBase->mSound;
+        return ptr.get<ESM::Light>()->mBase->mSound;
     }
 }
diff --git a/apps/openmw/mwclass/light.hpp b/apps/openmw/mwclass/light.hpp
index f803b523a3..41382df9b0 100644
--- a/apps/openmw/mwclass/light.hpp
+++ b/apps/openmw/mwclass/light.hpp
@@ -7,74 +7,76 @@ namespace MWClass
 {
     class Light : public MWWorld::RegisteredClass<Light>
     {
-            friend MWWorld::RegisteredClass<Light>;
+        friend MWWorld::RegisteredClass<Light>;
 
-            Light();
+        Light();
 
-            MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
+        MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const override;
 
-        public:
+    public:
+        void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
+            MWRender::RenderingInterface& renderingInterface) const override;
+        ///< Add reference into a cell for rendering
 
-            void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
-            ///< Add reference into a cell for rendering
+        void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+            MWPhysics::PhysicsSystem& physics) const override;
+        void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+            MWPhysics::PhysicsSystem& physics) const override;
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const override;
-            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const override;
+        bool useAnim() const override;
 
-            bool useAnim() const override;
+        std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return name or ID; can return an empty string.
 
-            std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
-            ///< \return name or ID; can return an empty string.
+        bool hasToolTip(const MWWorld::ConstPtr& ptr) const override;
+        ///< @return true if this object has a tooltip when focused (default implementation: true)
 
-            bool hasToolTip (const MWWorld::ConstPtr& ptr) const override;
-            ///< @return true if this object has a tooltip when focused (default implementation: true)
+        MWGui::ToolTipInfo getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const override;
+        ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
-            MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const override;
-            ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
+        bool showsInInventory(const MWWorld::ConstPtr& ptr) const override;
 
-            bool showsInInventory (const MWWorld::ConstPtr& ptr) const override;
+        std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
+        ///< Generate action for activation
 
-            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
-                const MWWorld::Ptr& actor) const override;
-            ///< Generate action for activation
+        std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of the script attached to ptr
 
-            std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of the script attached to ptr
+        std::pair<std::vector<int>, bool> getEquipmentSlots(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return first: Return IDs of the slot this object can be equipped in; second: can object
+        /// stay stacked when equipped?
 
-            std::pair<std::vector<int>, bool> getEquipmentSlots (const MWWorld::ConstPtr& ptr) const override;
-            ///< \return first: Return IDs of the slot this object can be equipped in; second: can object
-            /// stay stacked when equipped?
+        int getValue(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            int getValue (const MWWorld::ConstPtr& ptr) const override;
-            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+        std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the pick up sound Id
 
-            std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the pick up sound Id
+        std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the put down sound Id
 
-            std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the put down sound Id
+        const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of inventory icon.
 
-            const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of inventory icon.
+        std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
+        ///< Generate action for using via inventory menu
 
-            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
-            ///< Generate action for using via inventory menu
+        void setRemainingUsageTime(const MWWorld::Ptr& ptr, float duration) const override;
+        ///< Sets the remaining duration of the object.
 
-            void setRemainingUsageTime (const MWWorld::Ptr& ptr, float duration) const override;
-            ///< Sets the remaining duration of the object.
+        float getRemainingUsageTime(const MWWorld::ConstPtr& ptr) const override;
+        ///< Returns the remaining duration of the object.
 
-            float getRemainingUsageTime (const MWWorld::ConstPtr& ptr) const override;
-            ///< Returns the remaining duration of the object.
+        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
 
-            std::string getModel(const MWWorld::ConstPtr &ptr) const override;
+        float getWeight(const MWWorld::ConstPtr& ptr) const override;
 
-            float getWeight (const MWWorld::ConstPtr& ptr) const override;
+        bool canSell(const MWWorld::ConstPtr& item, int npcServices) const override;
 
-            bool canSell (const MWWorld::ConstPtr& item, int npcServices) const override;
+        std::pair<int, std::string_view> canBeEquipped(
+            const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& npc) const override;
 
-            std::pair<int, std::string_view> canBeEquipped(const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& npc) const override;
-
-            std::string_view getSound(const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getSound(const MWWorld::ConstPtr& ptr) const override;
     };
 }
 
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index 0c09027d25..79b07a8154 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -9,10 +9,10 @@
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwworld/ptr.hpp"
 #include "../mwworld/actionequip.hpp"
-#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/inventorystore.hpp"
+#include "../mwworld/ptr.hpp"
 
 #include "../mwgui/tooltips.hpp"
 #include "../mwgui/ustring.hpp"
@@ -29,51 +29,52 @@ namespace MWClass
     {
     }
 
-    void Lockpick::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
+    void Lockpick::insertObjectRendering(
+        const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
-        if (!model.empty()) {
+        if (!model.empty())
+        {
             renderingInterface.getObjects().insertModel(ptr, model);
         }
     }
 
-    std::string Lockpick::getModel(const MWWorld::ConstPtr &ptr) const
+    std::string Lockpick::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Lockpick>(ptr);
     }
 
     std::string_view Lockpick::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Lockpick> *ref = ptr.get<ESM::Lockpick>();
+        const MWWorld::LiveCellRef<ESM::Lockpick>* ref = ptr.get<ESM::Lockpick>();
         const std::string& name = ref->mBase->mName;
 
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::unique_ptr<MWWorld::Action> Lockpick::activate (const MWWorld::Ptr& ptr,
-        const MWWorld::Ptr& actor) const
+    std::unique_ptr<MWWorld::Action> Lockpick::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
     {
         return defaultItemActivate(ptr, actor);
     }
 
     std::string_view Lockpick::getScript(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Lockpick> *ref = ptr.get<ESM::Lockpick>();
+        const MWWorld::LiveCellRef<ESM::Lockpick>* ref = ptr.get<ESM::Lockpick>();
 
         return ref->mBase->mScript;
     }
 
-    std::pair<std::vector<int>, bool> Lockpick::getEquipmentSlots (const MWWorld::ConstPtr& ptr) const
+    std::pair<std::vector<int>, bool> Lockpick::getEquipmentSlots(const MWWorld::ConstPtr& ptr) const
     {
         std::vector<int> slots_;
 
-        slots_.push_back (int (MWWorld::InventoryStore::Slot_CarriedRight));
+        slots_.push_back(int(MWWorld::InventoryStore::Slot_CarriedRight));
 
-        return std::make_pair (slots_, false);
+        return std::make_pair(slots_, false);
     }
 
-    int Lockpick::getValue (const MWWorld::ConstPtr& ptr) const
+    int Lockpick::getValue(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Lockpick> *ref = ptr.get<ESM::Lockpick>();
+        const MWWorld::LiveCellRef<ESM::Lockpick>* ref = ptr.get<ESM::Lockpick>();
 
         return ref->mBase->mData.mValue;
     }
@@ -90,18 +91,19 @@ namespace MWClass
 
     const std::string& Lockpick::getInventoryIcon(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Lockpick> *ref = ptr.get<ESM::Lockpick>();
+        const MWWorld::LiveCellRef<ESM::Lockpick>* ref = ptr.get<ESM::Lockpick>();
 
         return ref->mBase->mIcon;
     }
 
-    MWGui::ToolTipInfo Lockpick::getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const
+    MWGui::ToolTipInfo Lockpick::getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const
     {
-        const MWWorld::LiveCellRef<ESM::Lockpick> *ref = ptr.get<ESM::Lockpick>();
+        const MWWorld::LiveCellRef<ESM::Lockpick>* ref = ptr.get<ESM::Lockpick>();
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption
+            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
         info.icon = ref->mBase->mIcon;
 
         std::string text;
@@ -113,7 +115,8 @@ namespace MWClass
         text += MWGui::ToolTips::getWeightString(ref->mBase->mData.mWeight, "#{sWeight}");
         text += MWGui::ToolTips::getValueString(ref->mBase->mData.mValue, "#{sValue}");
 
-        if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
+        if (MWBase::Environment::get().getWindowManager()->getFullHelp())
+        {
             text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
             text += MWGui::ToolTips::getMiscString(ref->mBase->mScript, "Script");
         }
@@ -123,7 +126,7 @@ namespace MWClass
         return info;
     }
 
-    std::unique_ptr<MWWorld::Action> Lockpick::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Lockpick::use(const MWWorld::Ptr& ptr, bool force) const
     {
         std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::ActionEquip>(ptr, force);
 
@@ -132,38 +135,39 @@ namespace MWClass
         return action;
     }
 
-    MWWorld::Ptr Lockpick::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
+    MWWorld::Ptr Lockpick::copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const
     {
-        const MWWorld::LiveCellRef<ESM::Lockpick> *ref = ptr.get<ESM::Lockpick>();
+        const MWWorld::LiveCellRef<ESM::Lockpick>* ref = ptr.get<ESM::Lockpick>();
 
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
 
-    std::pair<int, std::string_view> Lockpick::canBeEquipped(const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& npc) const
+    std::pair<int, std::string_view> Lockpick::canBeEquipped(
+        const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& npc) const
     {
         // Do not allow equip tools from inventory during attack
         if (MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(npc)
             && MWBase::Environment::get().getWindowManager()->isGuiMode())
-            return {0, "#{sCantEquipWeapWarning}"};
+            return { 0, "#{sCantEquipWeapWarning}" };
 
-        return {1, {}};
+        return { 1, {} };
     }
 
-    bool Lockpick::canSell (const MWWorld::ConstPtr& item, int npcServices) const
+    bool Lockpick::canSell(const MWWorld::ConstPtr& item, int npcServices) const
     {
         return (npcServices & ESM::NPC::Picks) != 0;
     }
 
-    int Lockpick::getItemMaxHealth (const MWWorld::ConstPtr& ptr) const
+    int Lockpick::getItemMaxHealth(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Lockpick> *ref = ptr.get<ESM::Lockpick>();
+        const MWWorld::LiveCellRef<ESM::Lockpick>* ref = ptr.get<ESM::Lockpick>();
 
         return ref->mBase->mData.mUses;
     }
 
-    float Lockpick::getWeight(const MWWorld::ConstPtr &ptr) const
+    float Lockpick::getWeight(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Lockpick> *ref = ptr.get<ESM::Lockpick>();
+        const MWWorld::LiveCellRef<ESM::Lockpick>* ref = ptr.get<ESM::Lockpick>();
         return ref->mBase->mData.mWeight;
     }
 }
diff --git a/apps/openmw/mwclass/lockpick.hpp b/apps/openmw/mwclass/lockpick.hpp
index f34579c38d..750549b4e3 100644
--- a/apps/openmw/mwclass/lockpick.hpp
+++ b/apps/openmw/mwclass/lockpick.hpp
@@ -7,62 +7,62 @@ namespace MWClass
 {
     class Lockpick : public MWWorld::RegisteredClass<Lockpick>
     {
-            friend MWWorld::RegisteredClass<Lockpick>;
+        friend MWWorld::RegisteredClass<Lockpick>;
 
-            Lockpick();
+        Lockpick();
 
-            MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
+        MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const override;
 
-        public:
+    public:
+        void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
+            MWRender::RenderingInterface& renderingInterface) const override;
+        ///< Add reference into a cell for rendering
 
-            void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
-            ///< Add reference into a cell for rendering
+        std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return name or ID; can return an empty string.
 
-            std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
-            ///< \return name or ID; can return an empty string.
+        std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
+        ///< Generate action for activation
 
-            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
-                const MWWorld::Ptr& actor) const override;
-            ///< Generate action for activation
+        MWGui::ToolTipInfo getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const override;
+        ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
-            MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const override;
-            ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
+        std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of the script attached to ptr
 
-            std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of the script attached to ptr
+        std::pair<std::vector<int>, bool> getEquipmentSlots(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return first: Return IDs of the slot this object can be equipped in; second: can object
+        /// stay stacked when equipped?
 
-            std::pair<std::vector<int>, bool> getEquipmentSlots (const MWWorld::ConstPtr& ptr) const override;
-            ///< \return first: Return IDs of the slot this object can be equipped in; second: can object
-            /// stay stacked when equipped?
+        int getValue(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            int getValue (const MWWorld::ConstPtr& ptr) const override;
-            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+        std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the pick up sound Id
 
-            std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the pick up sound Id
+        std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the put down sound Id
 
-            std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the put down sound Id
+        const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of inventory icon.
 
-            const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of inventory icon.
+        std::pair<int, std::string_view> canBeEquipped(
+            const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& npc) const override;
 
-            std::pair<int, std::string_view> canBeEquipped(const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& npc) const override;
+        std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
+        ///< Generate action for using via inventory menu
 
-            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
-            ///< Generate action for using via inventory menu
+        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
 
-            std::string getModel(const MWWorld::ConstPtr &ptr) const override;
+        bool canSell(const MWWorld::ConstPtr& item, int npcServices) const override;
 
-            bool canSell (const MWWorld::ConstPtr& item, int npcServices) const override;
+        float getWeight(const MWWorld::ConstPtr& ptr) const override;
 
-            float getWeight (const MWWorld::ConstPtr& ptr) const override;
+        int getItemMaxHealth(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return item max health or throw an exception, if class does not have item health
 
-            int getItemMaxHealth (const MWWorld::ConstPtr& ptr) const override;
-            ///< Return item max health or throw an exception, if class does not have item health
-
-            bool hasItemHealth (const MWWorld::ConstPtr& ptr) const override { return true; }
-            ///< \return Item health data available? (default implementation: false)
+        bool hasItemHealth(const MWWorld::ConstPtr& ptr) const override { return true; }
+        ///< \return Item health data available? (default implementation: false)
     };
 }
 
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index 0658212b84..8ddf6f6522 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -2,21 +2,21 @@
 
 #include <MyGUI_TextIterator.h>
 
+#include <components/esm3/loadcrea.hpp>
 #include <components/esm3/loadmisc.hpp>
 #include <components/esm3/loadnpc.hpp>
-#include <components/esm3/loadcrea.hpp>
 
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
+#include "../mwworld/actionsoulgem.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/manualref.hpp"
 #include "../mwworld/nullaction.hpp"
-#include "../mwworld/actionsoulgem.hpp"
 
 #include "../mwgui/tooltips.hpp"
 #include "../mwgui/ustring.hpp"
@@ -33,51 +33,52 @@ namespace MWClass
     {
     }
 
-    bool Miscellaneous::isGold (const MWWorld::ConstPtr& ptr) const
+    bool Miscellaneous::isGold(const MWWorld::ConstPtr& ptr) const
     {
         return Misc::StringUtils::ciEqual(ptr.getCellRef().getRefId(), "gold_001")
-                        || Misc::StringUtils::ciEqual(ptr.getCellRef().getRefId(), "gold_005")
-                        || Misc::StringUtils::ciEqual(ptr.getCellRef().getRefId(), "gold_010")
-                        || Misc::StringUtils::ciEqual(ptr.getCellRef().getRefId(), "gold_025")
-                        || Misc::StringUtils::ciEqual(ptr.getCellRef().getRefId(), "gold_100");
+            || Misc::StringUtils::ciEqual(ptr.getCellRef().getRefId(), "gold_005")
+            || Misc::StringUtils::ciEqual(ptr.getCellRef().getRefId(), "gold_010")
+            || Misc::StringUtils::ciEqual(ptr.getCellRef().getRefId(), "gold_025")
+            || Misc::StringUtils::ciEqual(ptr.getCellRef().getRefId(), "gold_100");
     }
 
-    void Miscellaneous::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
+    void Miscellaneous::insertObjectRendering(
+        const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
-        if (!model.empty()) {
+        if (!model.empty())
+        {
             renderingInterface.getObjects().insertModel(ptr, model);
         }
     }
 
-    std::string Miscellaneous::getModel(const MWWorld::ConstPtr &ptr) const
+    std::string Miscellaneous::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Miscellaneous>(ptr);
     }
 
     std::string_view Miscellaneous::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Miscellaneous> *ref = ptr.get<ESM::Miscellaneous>();
+        const MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = ptr.get<ESM::Miscellaneous>();
         const std::string& name = ref->mBase->mName;
 
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::unique_ptr<MWWorld::Action> Miscellaneous::activate (const MWWorld::Ptr& ptr,
-        const MWWorld::Ptr& actor) const
+    std::unique_ptr<MWWorld::Action> Miscellaneous::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
     {
         return defaultItemActivate(ptr, actor);
     }
 
     std::string_view Miscellaneous::getScript(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Miscellaneous> *ref = ptr.get<ESM::Miscellaneous>();
+        const MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = ptr.get<ESM::Miscellaneous>();
 
         return ref->mBase->mScript;
     }
 
-    int Miscellaneous::getValue (const MWWorld::ConstPtr& ptr) const
+    int Miscellaneous::getValue(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Miscellaneous> *ref = ptr.get<ESM::Miscellaneous>();
+        const MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = ptr.get<ESM::Miscellaneous>();
 
         int value = ref->mBase->mData.mValue;
         if (ptr.getCellRef().getGoldValue() > 1 && ptr.getRefData().getCount() == 1)
@@ -85,15 +86,16 @@ namespace MWClass
 
         if (!ptr.getCellRef().getSoul().empty())
         {
-            const ESM::Creature *creature = MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>().search(ref->mRef.getSoul());
+            const ESM::Creature* creature
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>().search(ref->mRef.getSoul());
             if (creature)
             {
                 int soul = creature->mData.mSoul;
                 if (Settings::Manager::getBool("rebalance soul gem values", "Game"))
                 {
-                    // use the 'soul gem value rebalance' formula from the Morrowind Code Patch 
+                    // use the 'soul gem value rebalance' formula from the Morrowind Code Patch
                     float soulValue = 0.0001 * pow(soul, 3) + 2 * soul;
-                    
+
                     // for Azura's star add the unfilled value
                     if (Misc::StringUtils::ciEqual(ptr.getCellRef().getRefId(), "Misc_SoulGem_Azura"))
                         value += soulValue;
@@ -124,14 +126,14 @@ namespace MWClass
 
     const std::string& Miscellaneous::getInventoryIcon(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Miscellaneous> *ref = ptr.get<ESM::Miscellaneous>();
+        const MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = ptr.get<ESM::Miscellaneous>();
 
         return ref->mBase->mIcon;
     }
 
-    MWGui::ToolTipInfo Miscellaneous::getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const
+    MWGui::ToolTipInfo Miscellaneous::getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const
     {
-        const MWWorld::LiveCellRef<ESM::Miscellaneous> *ref = ptr.get<ESM::Miscellaneous>();
+        const MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = ptr.get<ESM::Miscellaneous>();
 
         MWGui::ToolTipInfo info;
 
@@ -146,7 +148,8 @@ namespace MWClass
             countString = " (" + std::to_string(count) + ")";
 
         std::string_view name = getName(ptr);
-        info.caption = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count) + MWGui::ToolTips::getSoulString(ptr.getCellRef());
+        info.caption = MyGUI::TextIterator::toTagsString(MWGui::toUString(name))
+            + MWGui::ToolTips::getCountString(count) + MWGui::ToolTips::getSoulString(ptr.getCellRef());
         info.icon = ref->mBase->mIcon;
 
         std::string text;
@@ -155,7 +158,8 @@ namespace MWClass
         if (!gold && !ref->mBase->mData.mIsKey)
             text += MWGui::ToolTips::getValueString(getValue(ptr), "#{sValue}");
 
-        if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
+        if (MWBase::Environment::get().getWindowManager()->getFullHelp())
+        {
             text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
             text += MWGui::ToolTips::getMiscString(ref->mBase->mScript, "Script");
         }
@@ -165,14 +169,14 @@ namespace MWClass
         return info;
     }
 
-    MWWorld::Ptr Miscellaneous::copyToCell(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell, int count) const
+    MWWorld::Ptr Miscellaneous::copyToCell(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell, int count) const
     {
         MWWorld::Ptr newPtr;
 
-        const MWWorld::ESMStore &store =
-            MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
 
-        if (isGold(ptr)) {
+        if (isGold(ptr))
+        {
             int goldAmount = getValue(ptr) * count;
 
             std::string_view base = "Gold_001";
@@ -188,15 +192,15 @@ namespace MWClass
             // Really, I have no idea why moving ref out of conditional
             // scope causes list::push_back throwing std::bad_alloc
             MWWorld::ManualRef newRef(store, base);
-            const MWWorld::LiveCellRef<ESM::Miscellaneous> *ref =
-                newRef.getPtr().get<ESM::Miscellaneous>();
+            const MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = newRef.getPtr().get<ESM::Miscellaneous>();
 
             newPtr = MWWorld::Ptr(cell.insert(ref), &cell);
             newPtr.getCellRef().setGoldValue(goldAmount);
             newPtr.getRefData().setCount(1);
-        } else {
-            const MWWorld::LiveCellRef<ESM::Miscellaneous> *ref =
-                ptr.get<ESM::Miscellaneous>();
+        }
+        else
+        {
+            const MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = ptr.get<ESM::Miscellaneous>();
             newPtr = MWWorld::Ptr(cell.insert(ref), &cell);
             newPtr.getRefData().setCount(count);
         }
@@ -205,7 +209,7 @@ namespace MWClass
         return newPtr;
     }
 
-    std::unique_ptr<MWWorld::Action> Miscellaneous::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Miscellaneous::use(const MWWorld::Ptr& ptr, bool force) const
     {
         if (isSoulGem(ptr))
             return std::make_unique<MWWorld::ActionSoulgem>(ptr);
@@ -213,22 +217,22 @@ namespace MWClass
         return std::make_unique<MWWorld::NullAction>();
     }
 
-    bool Miscellaneous::canSell (const MWWorld::ConstPtr& item, int npcServices) const
+    bool Miscellaneous::canSell(const MWWorld::ConstPtr& item, int npcServices) const
     {
-        const MWWorld::LiveCellRef<ESM::Miscellaneous> *ref = item.get<ESM::Miscellaneous>();
+        const MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = item.get<ESM::Miscellaneous>();
 
         return !ref->mBase->mData.mIsKey && (npcServices & ESM::NPC::Misc) && !isGold(item);
     }
 
-    float Miscellaneous::getWeight(const MWWorld::ConstPtr &ptr) const
+    float Miscellaneous::getWeight(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Miscellaneous> *ref = ptr.get<ESM::Miscellaneous>();
+        const MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = ptr.get<ESM::Miscellaneous>();
         return ref->mBase->mData.mWeight;
     }
 
-    bool Miscellaneous::isKey(const MWWorld::ConstPtr &ptr) const
+    bool Miscellaneous::isKey(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Miscellaneous> *ref = ptr.get<ESM::Miscellaneous>();
+        const MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = ptr.get<ESM::Miscellaneous>();
         return ref->mBase->mData.mIsKey != 0;
     }
 
diff --git a/apps/openmw/mwclass/misc.hpp b/apps/openmw/mwclass/misc.hpp
index 55528855a7..1af2b772b8 100644
--- a/apps/openmw/mwclass/misc.hpp
+++ b/apps/openmw/mwclass/misc.hpp
@@ -7,56 +7,55 @@ namespace MWClass
 {
     class Miscellaneous : public MWWorld::RegisteredClass<Miscellaneous>
     {
-            friend MWWorld::RegisteredClass<Miscellaneous>;
+        friend MWWorld::RegisteredClass<Miscellaneous>;
 
-            Miscellaneous();
+        Miscellaneous();
 
-        public:
+    public:
+        MWWorld::Ptr copyToCell(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell, int count) const override;
 
-            MWWorld::Ptr copyToCell(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell, int count) const override;
+        void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
+            MWRender::RenderingInterface& renderingInterface) const override;
+        ///< Add reference into a cell for rendering
 
-            void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
-            ///< Add reference into a cell for rendering
+        std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return name or ID; can return an empty string.
 
-            std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
-            ///< \return name or ID; can return an empty string.
+        std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
+        ///< Generate action for activation
 
-            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
-                const MWWorld::Ptr& actor) const override;
-            ///< Generate action for activation
+        MWGui::ToolTipInfo getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const override;
+        ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
-            MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const override;
-            ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
+        std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of the script attached to ptr
 
-            std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of the script attached to ptr
+        int getValue(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            int getValue (const MWWorld::ConstPtr& ptr) const override;
-            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+        std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the pick up sound Id
 
-            std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the pick up sound Id
+        std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the put down sound Id
 
-            std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the put down sound Id
+        const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of inventory icon.
 
-            const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of inventory icon.
+        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
 
-            std::string getModel(const MWWorld::ConstPtr &ptr) const override;
+        std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
+        ///< Generate action for using via inventory menu
 
-            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
-            ///< Generate action for using via inventory menu
+        float getWeight(const MWWorld::ConstPtr& ptr) const override;
 
-            float getWeight (const MWWorld::ConstPtr& ptr) const override;
+        bool canSell(const MWWorld::ConstPtr& item, int npcServices) const override;
 
-            bool canSell (const MWWorld::ConstPtr& item, int npcServices) const override;
+        bool isKey(const MWWorld::ConstPtr& ptr) const override;
 
-            bool isKey (const MWWorld::ConstPtr &ptr) const override;
+        bool isGold(const MWWorld::ConstPtr& ptr) const override;
 
-            bool isGold (const MWWorld::ConstPtr& ptr) const override;
-
-            bool isSoulGem(const MWWorld::ConstPtr& ptr) const override;
+        bool isSoulGem(const MWWorld::ConstPtr& ptr) const override;
     };
 }
 
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 6a0637576f..7d279084ec 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -5,56 +5,55 @@
 #include <memory>
 
 #include <components/misc/constants.hpp>
-#include <components/misc/rng.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/misc/rng.hpp>
 
 #include <components/debug/debuglog.hpp>
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadclas.hpp>
 #include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadnpc.hpp>
-#include <components/esm3/npcstate.hpp>
-#include <components/settings/settings.hpp>
 #include <components/esm3/loadrace.hpp>
-#include <components/esm3/loadclas.hpp>
-#include <components/esm3/loadnpc.hpp>
 #include <components/esm3/loadsoun.hpp>
-#include <components/esm3/loadbody.hpp>
+#include <components/esm3/npcstate.hpp>
+#include <components/settings/settings.hpp>
 
+#include "../mwbase/dialoguemanager.hpp"
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
+#include "../mwbase/luamanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
-#include "../mwbase/windowmanager.hpp"
-#include "../mwbase/dialoguemanager.hpp"
 #include "../mwbase/soundmanager.hpp"
-#include "../mwbase/luamanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
-#include "../mwmechanics/npcstats.hpp"
-#include "../mwmechanics/movement.hpp"
-#include "../mwmechanics/spellcasting.hpp"
-#include "../mwmechanics/disease.hpp"
-#include "../mwmechanics/combat.hpp"
-#include "../mwmechanics/autocalcspell.hpp"
-#include "../mwmechanics/difficultyscaling.hpp"
-#include "../mwmechanics/weapontype.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/aisetting.hpp"
+#include "../mwmechanics/autocalcspell.hpp"
+#include "../mwmechanics/combat.hpp"
 #include "../mwmechanics/creaturecustomdataresetter.hpp"
+#include "../mwmechanics/creaturestats.hpp"
+#include "../mwmechanics/difficultyscaling.hpp"
+#include "../mwmechanics/disease.hpp"
 #include "../mwmechanics/inventory.hpp"
-#include "../mwmechanics/aisetting.hpp"
+#include "../mwmechanics/movement.hpp"
+#include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/setbaseaisetting.hpp"
+#include "../mwmechanics/spellcasting.hpp"
+#include "../mwmechanics/weapontype.hpp"
 
-#include "../mwworld/ptr.hpp"
-#include "../mwworld/actiontalk.hpp"
 #include "../mwworld/actionopen.hpp"
+#include "../mwworld/actiontalk.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/customdata.hpp"
+#include "../mwworld/esmstore.hpp"
 #include "../mwworld/failedaction.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwworld/customdata.hpp"
-#include "../mwworld/cellstore.hpp"
 #include "../mwworld/localscripts.hpp"
-#include "../mwworld/esmstore.hpp"
+#include "../mwworld/ptr.hpp"
 
+#include "../mwrender/npcanimation.hpp"
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
-#include "../mwrender/npcanimation.hpp"
 
 #include "../mwgui/tooltips.hpp"
 #include "../mwgui/ustring.hpp"
@@ -62,59 +61,59 @@
 namespace
 {
 
-    int is_even(double d) {
+    int is_even(double d)
+    {
         double int_part;
         modf(d / 2.0, &int_part);
         return 2.0 * int_part == d;
     }
 
-    int round_ieee_754(double d) {
+    int round_ieee_754(double d)
+    {
         double i = floor(d);
         d -= i;
-        if(d < 0.5)
+        if (d < 0.5)
             return static_cast<int>(i);
-        if(d > 0.5)
+        if (d > 0.5)
             return static_cast<int>(i) + 1;
-        if(is_even(i))
+        if (is_even(i))
             return static_cast<int>(i);
         return static_cast<int>(i) + 1;
     }
 
-    void autoCalculateAttributes (const ESM::NPC* npc, MWMechanics::CreatureStats& creatureStats)
+    void autoCalculateAttributes(const ESM::NPC* npc, MWMechanics::CreatureStats& creatureStats)
     {
         // race bonus
-        const ESM::Race *race =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(npc->mRace);
+        const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(npc->mRace);
 
         bool male = (npc->mFlags & ESM::NPC::Female) == 0;
 
         int level = creatureStats.getLevel();
-        for (int i=0; i<ESM::Attribute::Length; ++i)
+        for (int i = 0; i < ESM::Attribute::Length; ++i)
         {
             const ESM::Race::MaleFemale& attribute = race->mData.mAttributeValues[i];
             creatureStats.setAttribute(i, male ? attribute.mMale : attribute.mFemale);
         }
 
         // class bonus
-        const ESM::Class *class_ =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find(npc->mClass);
+        const ESM::Class* class_
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find(npc->mClass);
 
-        for (int i=0; i<2; ++i)
+        for (int i = 0; i < 2; ++i)
         {
             int attribute = class_->mData.mAttribute[i];
-            if (attribute>=0 && attribute<8)
+            if (attribute >= 0 && attribute < 8)
             {
-                creatureStats.setAttribute(attribute,
-                    creatureStats.getAttribute(attribute).getBase() + 10);
+                creatureStats.setAttribute(attribute, creatureStats.getAttribute(attribute).getBase() + 10);
             }
         }
 
         // skill bonus
-        for (int attribute=0; attribute < ESM::Attribute::Length; ++attribute)
+        for (int attribute = 0; attribute < ESM::Attribute::Length; ++attribute)
         {
             float modifierSum = 0;
 
-            for (int j=0; j<ESM::Skill::Length; ++j)
+            for (int j = 0; j < ESM::Skill::Length; ++j)
             {
                 const ESM::Skill* skill = MWBase::Environment::get().getWorld()->getStore().get<ESM::Skill>().find(j);
 
@@ -122,22 +121,22 @@ namespace
                     continue;
 
                 // is this a minor or major skill?
-                float add=0.2f;
-                for (int k=0; k<5; ++k)
+                float add = 0.2f;
+                for (int k = 0; k < 5; ++k)
                 {
                     if (class_->mData.mSkills[k][0] == j)
-                        add=0.5;
+                        add = 0.5;
                 }
-                for (int k=0; k<5; ++k)
+                for (int k = 0; k < 5; ++k)
                 {
                     if (class_->mData.mSkills[k][1] == j)
-                        add=1.0;
+                        add = 1.0;
                 }
                 modifierSum += add;
             }
-            creatureStats.setAttribute(attribute, std::min(
-                                           round_ieee_754(creatureStats.getAttribute(attribute).getBase()
-                + (level-1) * modifierSum), 100) );
+            creatureStats.setAttribute(attribute,
+                std::min(
+                    round_ieee_754(creatureStats.getAttribute(attribute).getBase() + (level - 1) * modifierSum), 100));
         }
 
         // initial health
@@ -172,26 +171,26 @@ namespace
      *
      * and by adding class, race, specialization bonus.
      */
-    void autoCalculateSkills(const ESM::NPC* npc, MWMechanics::NpcStats& npcStats, const MWWorld::Ptr& ptr, bool spellsInitialised)
+    void autoCalculateSkills(
+        const ESM::NPC* npc, MWMechanics::NpcStats& npcStats, const MWWorld::Ptr& ptr, bool spellsInitialised)
     {
-        const ESM::Class *class_ =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find(npc->mClass);
+        const ESM::Class* class_
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find(npc->mClass);
 
         unsigned int level = npcStats.getLevel();
 
-        const ESM::Race *race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(npc->mRace);
-
+        const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(npc->mRace);
 
         for (int i = 0; i < 2; ++i)
         {
-            int bonus = (i==0) ? 10 : 25;
+            int bonus = (i == 0) ? 10 : 25;
 
             for (int i2 = 0; i2 < 5; ++i2)
             {
                 int index = class_->mData.mSkills[i2][i];
                 if (index >= 0 && index < ESM::Skill::Length)
                 {
-                    npcStats.getSkill(index).setBase (npcStats.getSkill(index).getBase() + bonus);
+                    npcStats.getSkill(index).setBase(npcStats.getSkill(index).getBase() + bonus);
                 }
             }
         }
@@ -224,29 +223,26 @@ namespace
             }
 
             // is this skill in the same Specialization as the class?
-            const ESM::Skill* skill = MWBase::Environment::get().getWorld()->getStore().get<ESM::Skill>().find(skillIndex);
+            const ESM::Skill* skill
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::Skill>().find(skillIndex);
             if (skill->mData.mSpecialization == class_->mData.mSpecialization)
             {
                 specMultiplier = 0.5f;
                 specBonus = 5;
             }
 
-            npcStats.getSkill(skillIndex).setBase(
-                  std::min(
-                    round_ieee_754(
-                            npcStats.getSkill(skillIndex).getBase()
-                    + 5
-                    + raceBonus
-                    + specBonus
-                    +(int(level)-1) * (majorMultiplier + specMultiplier)), 100)); // Must gracefully handle level 0
+            npcStats.getSkill(skillIndex)
+                .setBase(std::min(round_ieee_754(npcStats.getSkill(skillIndex).getBase() + 5 + raceBonus + specBonus
+                                      + (int(level) - 1) * (majorMultiplier + specMultiplier)),
+                    100)); // Must gracefully handle level 0
         }
 
         int skills[ESM::Skill::Length];
-        for (int i=0; i<ESM::Skill::Length; ++i)
+        for (int i = 0; i < ESM::Skill::Length; ++i)
             skills[i] = npcStats.getSkill(i).getBase();
 
         int attributes[ESM::Attribute::Length];
-        for (int i=0; i<ESM::Attribute::Length; ++i)
+        for (int i = 0; i < ESM::Attribute::Length; ++i)
             attributes[i] = npcStats.getAttribute(i).getBase();
 
         if (!spellsInitialised)
@@ -271,24 +267,17 @@ namespace MWClass
         MWMechanics::Movement mMovement;
         MWWorld::InventoryStore mInventoryStore;
 
-        NpcCustomData& asNpcCustomData() override
-        {
-            return *this;
-        }
-        const NpcCustomData& asNpcCustomData() const override
-        {
-            return *this;
-        }
+        NpcCustomData& asNpcCustomData() override { return *this; }
+        const NpcCustomData& asNpcCustomData() const override { return *this; }
     };
 
     const Npc::GMST& Npc::getGmst()
     {
-        static const GMST staticGmst = []
-        {
+        static const GMST staticGmst = [] {
             GMST gmst;
 
-            const MWBase::World *world = MWBase::Environment::get().getWorld();
-            const MWWorld::Store<ESM::GameSetting> &store = world->getStore().get<ESM::GameSetting>();
+            const MWBase::World* world = MWBase::Environment::get().getWorld();
+            const MWWorld::Store<ESM::GameSetting>& store = world->getStore().get<ESM::GameSetting>();
 
             gmst.fMinWalkSpeed = store.find("fMinWalkSpeed");
             gmst.fMaxWalkSpeed = store.find("fMaxWalkSpeed");
@@ -312,32 +301,32 @@ namespace MWClass
             gmst.fCombatArmorMinMult = store.find("fCombatArmorMinMult");
 
             return gmst;
-        } ();
+        }();
         return staticGmst;
     }
 
-    void Npc::ensureCustomData (const MWWorld::Ptr& ptr) const
+    void Npc::ensureCustomData(const MWWorld::Ptr& ptr) const
     {
         if (!ptr.getRefData().getCustomData())
         {
             bool recalculate = false;
             auto tempData = std::make_unique<NpcCustomData>();
             NpcCustomData* data = tempData.get();
-            MWMechanics::CreatureCustomDataResetter resetter {ptr};
+            MWMechanics::CreatureCustomDataResetter resetter{ ptr };
             ptr.getRefData().setCustomData(std::move(tempData));
 
-            MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
+            MWWorld::LiveCellRef<ESM::NPC>* ref = ptr.get<ESM::NPC>();
 
             bool spellsInitialised = data->mNpcStats.getSpells().setSpells(ref->mBase->mId);
 
             // creature stats
-            int gold=0;
-            if(ref->mBase->mNpdtType != ESM::NPC::NPC_WITH_AUTOCALCULATED_STATS)
+            int gold = 0;
+            if (ref->mBase->mNpdtType != ESM::NPC::NPC_WITH_AUTOCALCULATED_STATS)
             {
                 gold = ref->mBase->mNpdt.mGold;
 
-                for (unsigned int i=0; i< ESM::Skill::Length; ++i)
-                    data->mNpcStats.getSkill (i).setBase (ref->mBase->mNpdt.mSkills[i]);
+                for (unsigned int i = 0; i < ESM::Skill::Length; ++i)
+                    data->mNpcStats.getSkill(i).setBase(ref->mBase->mNpdt.mSkills[i]);
 
                 data->mNpcStats.setAttribute(ESM::Attribute::Strength, ref->mBase->mNpdt.mStrength);
                 data->mNpcStats.setAttribute(ESM::Attribute::Intelligence, ref->mBase->mNpdt.mIntelligence);
@@ -348,9 +337,9 @@ namespace MWClass
                 data->mNpcStats.setAttribute(ESM::Attribute::Personality, ref->mBase->mNpdt.mPersonality);
                 data->mNpcStats.setAttribute(ESM::Attribute::Luck, ref->mBase->mNpdt.mLuck);
 
-                data->mNpcStats.setHealth (ref->mBase->mNpdt.mHealth);
-                data->mNpcStats.setMagicka (ref->mBase->mNpdt.mMana);
-                data->mNpcStats.setFatigue (ref->mBase->mNpdt.mFatigue);
+                data->mNpcStats.setHealth(ref->mBase->mNpdt.mHealth);
+                data->mNpcStats.setMagicka(ref->mBase->mNpdt.mMana);
+                data->mNpcStats.setFatigue(ref->mBase->mNpdt.mFatigue);
 
                 data->mNpcStats.setLevel(ref->mBase->mNpdt.mLevel);
                 data->mNpcStats.setBaseDisposition(ref->mBase->mNpdt.mDisposition);
@@ -360,8 +349,8 @@ namespace MWClass
             {
                 gold = ref->mBase->mNpdt.mGold;
 
-                for (int i=0; i<3; ++i)
-                    data->mNpcStats.setDynamic (i, 10);
+                for (int i = 0; i < 3; ++i)
+                    data->mNpcStats.setDynamic(i, 10);
 
                 data->mNpcStats.setLevel(ref->mBase->mNpdt.mLevel);
                 data->mNpcStats.setBaseDisposition(ref->mBase->mNpdt.mDisposition);
@@ -378,18 +367,28 @@ namespace MWClass
                 data->mNpcStats.setDeathAnimationFinished(isPersistent(ptr));
 
             // race powers
-            const ESM::Race *race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(ref->mBase->mRace);
+            const ESM::Race* race
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(ref->mBase->mRace);
             data->mNpcStats.getSpells().addAllToInstance(race->mPowers.mList);
 
             if (!ref->mBase->mFaction.empty())
             {
-                static const int iAutoRepFacMod = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
-                        .find("iAutoRepFacMod")->mValue.getInteger();
-                static const int iAutoRepLevMod = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
-                        .find("iAutoRepLevMod")->mValue.getInteger();
+                static const int iAutoRepFacMod = MWBase::Environment::get()
+                                                      .getWorld()
+                                                      ->getStore()
+                                                      .get<ESM::GameSetting>()
+                                                      .find("iAutoRepFacMod")
+                                                      ->mValue.getInteger();
+                static const int iAutoRepLevMod = MWBase::Environment::get()
+                                                      .getWorld()
+                                                      ->getStore()
+                                                      .get<ESM::GameSetting>()
+                                                      .find("iAutoRepLevMod")
+                                                      ->mValue.getInteger();
                 int rank = ref->mBase->getFactionRank();
 
-                data->mNpcStats.setReputation(iAutoRepFacMod * (rank+1) + iAutoRepLevMod * (data->mNpcStats.getLevel()-1));
+                data->mNpcStats.setReputation(
+                    iAutoRepFacMod * (rank + 1) + iAutoRepLevMod * (data->mNpcStats.getLevel() - 1));
             }
 
             data->mNpcStats.getAiSequence().fill(ref->mBase->mAiPackage);
@@ -407,7 +406,7 @@ namespace MWClass
 
             // store
             resetter.mPtr = {};
-            if(recalculate)
+            if (recalculate)
                 data->mNpcStats.recalculateMagicka();
 
             // inventory
@@ -419,34 +418,37 @@ namespace MWClass
         }
     }
 
-    void Npc::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
+    void Npc::insertObjectRendering(
+        const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
         renderingInterface.getObjects().insertNPC(ptr);
     }
 
-    bool Npc::isPersistent(const MWWorld::ConstPtr &actor) const
+    bool Npc::isPersistent(const MWWorld::ConstPtr& actor) const
     {
         const MWWorld::LiveCellRef<ESM::NPC>* ref = actor.get<ESM::NPC>();
         return (ref->mBase->mRecordFlags & ESM::FLAG_Persistent) != 0;
     }
 
-    std::string Npc::getModel(const MWWorld::ConstPtr &ptr) const
+    std::string Npc::getModel(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
+        const MWWorld::LiveCellRef<ESM::NPC>* ref = ptr.get<ESM::NPC>();
 
         std::string model = Settings::Manager::getString("baseanim", "Models");
-        const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(ref->mBase->mRace);
-        if(race->mData.mFlags & ESM::Race::Beast)
+        const ESM::Race* race
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(ref->mBase->mRace);
+        if (race->mData.mFlags & ESM::Race::Beast)
             model = Settings::Manager::getString("baseanimkna", "Models");
 
         return model;
     }
 
-    void Npc::getModelsToPreload(const MWWorld::Ptr &ptr, std::vector<std::string> &models) const
+    void Npc::getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const
     {
-        const MWWorld::LiveCellRef<ESM::NPC> *npc = ptr.get<ESM::NPC>();
-        const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().search(npc->mBase->mRace);
-        if(race && race->mData.mFlags & ESM::Race::Beast)
+        const MWWorld::LiveCellRef<ESM::NPC>* npc = ptr.get<ESM::NPC>();
+        const ESM::Race* race
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().search(npc->mBase->mRace);
+        if (race && race->mData.mFlags & ESM::Race::Beast)
             models.emplace_back(Settings::Manager::getString("baseanimkna", "Models"));
 
         // keep these always loaded just in case
@@ -461,13 +463,15 @@ namespace MWClass
 
         if (!npc->mBase->mHead.empty())
         {
-            const ESM::BodyPart* head = MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>().search(npc->mBase->mHead);
+            const ESM::BodyPart* head
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>().search(npc->mBase->mHead);
             if (head)
                 models.push_back(Misc::ResourceHelpers::correctMeshPath(head->mModel, vfs));
         }
         if (!npc->mBase->mHair.empty())
         {
-            const ESM::BodyPart* hair = MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>().search(npc->mBase->mHair);
+            const ESM::BodyPart* hair
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>().search(npc->mBase->mHair);
             if (hair)
                 models.push_back(Misc::ResourceHelpers::correctMeshPath(hair->mModel, vfs));
         }
@@ -483,14 +487,14 @@ namespace MWClass
             if (equipped != invStore.end())
             {
                 std::vector<ESM::PartReference> parts;
-                if(equipped->getType() == ESM::Clothing::sRecordId)
+                if (equipped->getType() == ESM::Clothing::sRecordId)
                 {
-                    const ESM::Clothing *clothes = equipped->get<ESM::Clothing>()->mBase;
+                    const ESM::Clothing* clothes = equipped->get<ESM::Clothing>()->mBase;
                     parts = clothes->mParts.mParts;
                 }
-                else if(equipped->getType() == ESM::Armor::sRecordId)
+                else if (equipped->getType() == ESM::Armor::sRecordId)
                 {
-                    const ESM::Armor *armor = equipped->get<ESM::Armor>()->mBase;
+                    const ESM::Armor* armor = equipped->get<ESM::Armor>()->mBase;
                     parts = armor->mParts.mParts;
                 }
                 else
@@ -505,7 +509,8 @@ namespace MWClass
                     std::string_view partname = female ? it->mFemale : it->mMale;
                     if (partname.empty())
                         partname = female ? it->mMale : it->mFemale;
-                    const ESM::BodyPart* part = MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>().search(partname);
+                    const ESM::BodyPart* part
+                        = MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>().search(partname);
                     if (part && !part->mModel.empty())
                         models.push_back(Misc::ResourceHelpers::correctMeshPath(part->mModel, vfs));
                 }
@@ -515,7 +520,8 @@ namespace MWClass
         // preload body parts
         if (race)
         {
-            const std::vector<const ESM::BodyPart*>& parts = MWRender::NpcAnimation::getBodyParts(Misc::StringUtils::lowerCase(race->mId), female, false, false);
+            const std::vector<const ESM::BodyPart*>& parts
+                = MWRender::NpcAnimation::getBodyParts(Misc::StringUtils::lowerCase(race->mId), female, false, false);
             for (std::vector<const ESM::BodyPart*>::const_iterator it = parts.begin(); it != parts.end(); ++it)
             {
                 const ESM::BodyPart* part = *it;
@@ -523,60 +529,60 @@ namespace MWClass
                     models.push_back(Misc::ResourceHelpers::correctMeshPath(part->mModel, vfs));
             }
         }
-
     }
 
     std::string_view Npc::getName(const MWWorld::ConstPtr& ptr) const
     {
-        if(ptr.getRefData().getCustomData() && ptr.getRefData().getCustomData()->asNpcCustomData().mNpcStats.isWerewolf())
+        if (ptr.getRefData().getCustomData()
+            && ptr.getRefData().getCustomData()->asNpcCustomData().mNpcStats.isWerewolf())
         {
-            const MWBase::World *world = MWBase::Environment::get().getWorld();
-            const MWWorld::Store<ESM::GameSetting> &store = world->getStore().get<ESM::GameSetting>();
+            const MWBase::World* world = MWBase::Environment::get().getWorld();
+            const MWWorld::Store<ESM::GameSetting>& store = world->getStore().get<ESM::GameSetting>();
 
             return store.find("sWerewolfPopup")->mValue.getString();
         }
 
-        const MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
+        const MWWorld::LiveCellRef<ESM::NPC>* ref = ptr.get<ESM::NPC>();
         const std::string& name = ref->mBase->mName;
 
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    MWMechanics::CreatureStats& Npc::getCreatureStats (const MWWorld::Ptr& ptr) const
+    MWMechanics::CreatureStats& Npc::getCreatureStats(const MWWorld::Ptr& ptr) const
     {
-        ensureCustomData (ptr);
+        ensureCustomData(ptr);
 
         return ptr.getRefData().getCustomData()->asNpcCustomData().mNpcStats;
     }
 
-    MWMechanics::NpcStats& Npc::getNpcStats (const MWWorld::Ptr& ptr) const
+    MWMechanics::NpcStats& Npc::getNpcStats(const MWWorld::Ptr& ptr) const
     {
-        ensureCustomData (ptr);
+        ensureCustomData(ptr);
 
         return ptr.getRefData().getCustomData()->asNpcCustomData().mNpcStats;
     }
 
-
     bool Npc::evaluateHit(const MWWorld::Ptr& ptr, MWWorld::Ptr& victim, osg::Vec3f& hitPosition) const
     {
         victim = MWWorld::Ptr();
         hitPosition = osg::Vec3f();
 
         // Get the weapon used (if hand-to-hand, weapon = inv.end())
-        MWWorld::InventoryStore &inv = getInventoryStore(ptr);
+        MWWorld::InventoryStore& inv = getInventoryStore(ptr);
         MWWorld::ContainerStoreIterator weaponslot = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
         MWWorld::Ptr weapon;
         if (weaponslot != inv.end() && weaponslot->getType() == ESM::Weapon::sRecordId)
             weapon = *weaponslot;
 
-        MWBase::World *world = MWBase::Environment::get().getWorld();
-        const MWWorld::Store<ESM::GameSetting> &store = world->getStore().get<ESM::GameSetting>();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+        const MWWorld::Store<ESM::GameSetting>& store = world->getStore().get<ESM::GameSetting>();
         const float fCombatDistance = store.find("fCombatDistance")->mValue.getFloat();
-        float dist = fCombatDistance * (!weapon.isEmpty() ?
-                               weapon.get<ESM::Weapon>()->mBase->mData.mReach :
-                               store.find("fHandToHandReach")->mValue.getFloat());
+        float dist = fCombatDistance
+            * (!weapon.isEmpty() ? weapon.get<ESM::Weapon>()->mBase->mData.mReach
+                                 : store.find("fHandToHandReach")->mValue.getFloat());
 
-        // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit result.
+        // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit
+        // result.
         std::vector<MWWorld::Ptr> targetActors;
         if (ptr != MWMechanics::getPlayer())
             getCreatureStats(ptr).getAiSequence().getCombatTargets(targetActors);
@@ -586,11 +592,11 @@ namespace MWClass
         if (result.first.isEmpty()) // Didn't hit anything
             return true;
 
-        const MWWorld::Class &othercls = result.first.getClass();
+        const MWWorld::Class& othercls = result.first.getClass();
         if (!othercls.isActor()) // Can't hit non-actors
             return true;
 
-        MWMechanics::CreatureStats &otherstats = othercls.getCreatureStats(result.first);
+        MWMechanics::CreatureStats& otherstats = othercls.getCreatureStats(result.first);
         if (otherstats.isDead()) // Can't hit dead actors
             return true;
 
@@ -608,9 +614,10 @@ namespace MWClass
         return Misc::Rng::roll0to99(world->getPrng()) < hitchance;
     }
 
-    void Npc::hit(const MWWorld::Ptr& ptr, float attackStrength, int type, const MWWorld::Ptr& victim, const osg::Vec3f& hitPosition, bool success) const
+    void Npc::hit(const MWWorld::Ptr& ptr, float attackStrength, int type, const MWWorld::Ptr& victim,
+        const osg::Vec3f& hitPosition, bool success) const
     {
-        MWWorld::InventoryStore &inv = getInventoryStore(ptr);
+        MWWorld::InventoryStore& inv = getInventoryStore(ptr);
         MWWorld::ContainerStoreIterator weaponslot = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
         MWWorld::Ptr weapon;
         if (weaponslot != inv.end() && weaponslot->getType() == ESM::Weapon::sRecordId)
@@ -618,15 +625,15 @@ namespace MWClass
 
         MWMechanics::applyFatigueLoss(ptr, weapon, attackStrength);
 
-        if(victim.isEmpty()) // Didn't hit anything
+        if (victim.isEmpty()) // Didn't hit anything
             return;
 
-        const MWWorld::Class &othercls = victim.getClass();
-        MWMechanics::CreatureStats &otherstats = othercls.getCreatureStats(victim);
+        const MWWorld::Class& othercls = victim.getClass();
+        MWMechanics::CreatureStats& otherstats = othercls.getCreatureStats(victim);
         if (otherstats.isDead()) // Can't hit dead actors
             return;
 
-        if(ptr == MWMechanics::getPlayer())
+        if (ptr == MWMechanics::getPlayer())
             MWBase::Environment::get().getWindowManager()->setEnemy(victim);
 
         if (!success)
@@ -638,18 +645,18 @@ namespace MWClass
 
         bool healthdmg;
         float damage = 0.0f;
-        if(!weapon.isEmpty())
+        if (!weapon.isEmpty())
         {
-            const unsigned char *attack = nullptr;
-            if(type == ESM::Weapon::AT_Chop)
+            const unsigned char* attack = nullptr;
+            if (type == ESM::Weapon::AT_Chop)
                 attack = weapon.get<ESM::Weapon>()->mBase->mData.mChop;
-            else if(type == ESM::Weapon::AT_Slash)
+            else if (type == ESM::Weapon::AT_Slash)
                 attack = weapon.get<ESM::Weapon>()->mBase->mData.mSlash;
-            else if(type == ESM::Weapon::AT_Thrust)
+            else if (type == ESM::Weapon::AT_Thrust)
                 attack = weapon.get<ESM::Weapon>()->mBase->mData.mThrust;
-            if(attack)
+            if (attack)
             {
-                damage  = attack[0] + ((attack[1]-attack[0])*attackStrength);
+                damage = attack[0] + ((attack[1] - attack[0]) * attackStrength);
             }
             MWMechanics::adjustWeaponDamage(damage, weapon, ptr);
             MWMechanics::reduceWeaponCondition(damage, true, weapon, ptr);
@@ -662,21 +669,21 @@ namespace MWClass
             MWMechanics::getHandToHandDamage(ptr, victim, damage, healthdmg, attackStrength);
         }
 
-        MWBase::World *world = MWBase::Environment::get().getWorld();
-        const MWWorld::Store<ESM::GameSetting> &store = world->getStore().get<ESM::GameSetting>();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+        const MWWorld::Store<ESM::GameSetting>& store = world->getStore().get<ESM::GameSetting>();
 
-        if(ptr == MWMechanics::getPlayer())
+        if (ptr == MWMechanics::getPlayer())
         {
             int weapskill = ESM::Skill::HandToHand;
-            if(!weapon.isEmpty())
+            if (!weapon.isEmpty())
                 weapskill = weapon.getClass().getEquipmentSkill(weapon);
             skillUsageSucceeded(ptr, weapskill, 0);
 
             const MWMechanics::AiSequence& seq = victim.getClass().getCreatureStats(victim).getAiSequence();
 
-            bool unaware = !seq.isInCombat()
-                    && !MWBase::Environment::get().getMechanicsManager()->awarenessCheck(ptr, victim);
-            if(unaware)
+            bool unaware
+                = !seq.isInCombat() && !MWBase::Environment::get().getMechanicsManager()->awarenessCheck(ptr, victim);
+            if (unaware)
             {
                 damage *= store.find("fCombatCriticalStrikeMult")->mValue.getFloat();
                 MWBase::Environment::get().getWindowManager()->messageBox("#{sTargetCriticalStrike}");
@@ -703,9 +710,10 @@ namespace MWClass
         othercls.onHit(victim, damage, healthdmg, weapon, ptr, hitPosition, true);
     }
 
-    void Npc::onHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object, const MWWorld::Ptr &attacker, const osg::Vec3f &hitPosition, bool successful) const
+    void Npc::onHit(const MWWorld::Ptr& ptr, float damage, bool ishealth, const MWWorld::Ptr& object,
+        const MWWorld::Ptr& attacker, const osg::Vec3f& hitPosition, bool successful) const
     {
-        MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
+        MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
         MWMechanics::CreatureStats& stats = getCreatureStats(ptr);
         bool wasDead = stats.isDead();
 
@@ -725,14 +733,12 @@ namespace MWClass
             MWMechanics::CreatureStats& statsAttacker = attacker.getClass().getCreatureStats(attacker);
             // First handle the attacked actor
             if ((stats.getHitAttemptActorId() == -1)
-                && (statsAttacker.getAiSequence().isInCombat(ptr)
-                    || attacker == MWMechanics::getPlayer()))
+                && (statsAttacker.getAiSequence().isInCombat(ptr) || attacker == MWMechanics::getPlayer()))
                 stats.setHitAttemptActorId(statsAttacker.getActorId());
 
             // Next handle the attacking actor
             if ((statsAttacker.getHitAttemptActorId() == -1)
-                && (statsAttacker.getAiSequence().isInCombat(ptr)
-                    || attacker == MWMechanics::getPlayer()))
+                && (statsAttacker.getAiSequence().isInCombat(ptr) || attacker == MWMechanics::getPlayer()))
                 statsAttacker.setHitAttemptActorId(stats.getActorId());
         }
 
@@ -743,7 +749,7 @@ namespace MWClass
         {
             std::string_view script = getScript(ptr);
             /* Set the OnPCHitMe script variable. The script is responsible for clearing it. */
-            if(!script.empty())
+            if (!script.empty())
                 ptr.getRefData().getLocals().setVarByInt(script, "onpchitme", 1);
         }
 
@@ -758,7 +764,6 @@ namespace MWClass
         if (!object.isEmpty())
             stats.setLastHitObject(object.getCellRef().getRefId());
 
-
         if (damage > 0.0f && !object.isEmpty())
             MWMechanics::resistNormalWeapon(ptr, attacker, object, damage);
 
@@ -775,18 +780,20 @@ namespace MWClass
             // 'ptr' is losing health. Play a 'hit' voiced dialog entry if not already saying
             // something, alert the character controller, scripts, etc.
 
-            const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
+            const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
             const GMST& gmst = getGmst();
 
-            int chance = store.get<ESM::GameSetting>().find("iVoiceHitOdds")->mValue.getInteger(); 
+            int chance = store.get<ESM::GameSetting>().find("iVoiceHitOdds")->mValue.getInteger();
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
             if (Misc::Rng::roll0to99(prng) < chance)
                 MWBase::Environment::get().getDialogueManager()->say(ptr, "hit");
 
             // Check for knockdown
-            float agilityTerm = stats.getAttribute(ESM::Attribute::Agility).getModified() * gmst.fKnockDownMult->mValue.getFloat();
+            float agilityTerm
+                = stats.getAttribute(ESM::Attribute::Agility).getModified() * gmst.fKnockDownMult->mValue.getFloat();
             float knockdownTerm = stats.getAttribute(ESM::Attribute::Agility).getModified()
-                    * gmst.iKnockDownOddsMult->mValue.getInteger() * 0.01f + gmst.iKnockDownOddsBase->mValue.getInteger();
+                    * gmst.iKnockDownOddsMult->mValue.getInteger() * 0.01f
+                + gmst.iKnockDownOddsBase->mValue.getInteger();
             if (ishealth && agilityTerm <= damage && knockdownTerm <= Misc::Rng::roll0to99(prng))
                 stats.setKnockedDown(true);
             else
@@ -798,18 +805,17 @@ namespace MWClass
                 // cuirass = 30%
                 // shield, helmet, greaves, boots, pauldrons = 10% each
                 // guantlets = 5% each
-                static const int hitslots[20] = {
-                    MWWorld::InventoryStore::Slot_Cuirass, MWWorld::InventoryStore::Slot_Cuirass,
-                    MWWorld::InventoryStore::Slot_Cuirass, MWWorld::InventoryStore::Slot_Cuirass,
-                    MWWorld::InventoryStore::Slot_Cuirass, MWWorld::InventoryStore::Slot_Cuirass,
-                    MWWorld::InventoryStore::Slot_CarriedLeft, MWWorld::InventoryStore::Slot_CarriedLeft,
-                    MWWorld::InventoryStore::Slot_Helmet, MWWorld::InventoryStore::Slot_Helmet,
-                    MWWorld::InventoryStore::Slot_Greaves, MWWorld::InventoryStore::Slot_Greaves,
-                    MWWorld::InventoryStore::Slot_Boots, MWWorld::InventoryStore::Slot_Boots,
-                    MWWorld::InventoryStore::Slot_LeftPauldron, MWWorld::InventoryStore::Slot_LeftPauldron,
-                    MWWorld::InventoryStore::Slot_RightPauldron, MWWorld::InventoryStore::Slot_RightPauldron,
-                    MWWorld::InventoryStore::Slot_LeftGauntlet, MWWorld::InventoryStore::Slot_RightGauntlet
-                };
+                static const int hitslots[20]
+                    = { MWWorld::InventoryStore::Slot_Cuirass, MWWorld::InventoryStore::Slot_Cuirass,
+                          MWWorld::InventoryStore::Slot_Cuirass, MWWorld::InventoryStore::Slot_Cuirass,
+                          MWWorld::InventoryStore::Slot_Cuirass, MWWorld::InventoryStore::Slot_Cuirass,
+                          MWWorld::InventoryStore::Slot_CarriedLeft, MWWorld::InventoryStore::Slot_CarriedLeft,
+                          MWWorld::InventoryStore::Slot_Helmet, MWWorld::InventoryStore::Slot_Helmet,
+                          MWWorld::InventoryStore::Slot_Greaves, MWWorld::InventoryStore::Slot_Greaves,
+                          MWWorld::InventoryStore::Slot_Boots, MWWorld::InventoryStore::Slot_Boots,
+                          MWWorld::InventoryStore::Slot_LeftPauldron, MWWorld::InventoryStore::Slot_LeftPauldron,
+                          MWWorld::InventoryStore::Slot_RightPauldron, MWWorld::InventoryStore::Slot_RightPauldron,
+                          MWWorld::InventoryStore::Slot_LeftGauntlet, MWWorld::InventoryStore::Slot_RightGauntlet };
                 int hitslot = hitslots[Misc::Rng::rollDice(20, prng)];
 
                 float unmitigatedDamage = damage;
@@ -819,7 +825,7 @@ namespace MWClass
                 damage = std::max(1.f, damage);
                 damageDiff = std::max(1, damageDiff);
 
-                MWWorld::InventoryStore &inv = getInventoryStore(ptr);
+                MWWorld::InventoryStore& inv = getInventoryStore(ptr);
                 MWWorld::ContainerStoreIterator armorslot = inv.getSlot(hitslot);
                 MWWorld::Ptr armor = ((armorslot != inv.end()) ? *armorslot : MWWorld::Ptr());
                 bool hasArmor = !armor.isEmpty() && armor.getType() == ESM::Armor::sRecordId;
@@ -839,12 +845,12 @@ namespace MWClass
                 }
                 if (hasArmor)
                 {
-                    static const bool creatureDamage = Settings::Manager::getBool("unarmed creature attacks damage armor", "Game");
+                    static const bool creatureDamage
+                        = Settings::Manager::getBool("unarmed creature attacks damage armor", "Game");
 
-                    if (!object.isEmpty() ||
-                        attacker.isEmpty() ||
-                        attacker.getClass().isNpc() ||
-                        creatureDamage) // Unarmed creature attacks don't affect armor condition unless it was explicitly requested.
+                    if (!object.isEmpty() || attacker.isEmpty() || attacker.getClass().isNpc()
+                        || creatureDamage) // Unarmed creature attacks don't affect armor condition unless it was
+                                           // explicitly requested.
                     {
                         int armorhealth = armor.getClass().getItemHealth(armor);
                         armorhealth -= std::min(damageDiff, armorhealth);
@@ -858,7 +864,7 @@ namespace MWClass
                     if (ptr == MWMechanics::getPlayer())
                         skillUsageSucceeded(ptr, armor.getClass().getEquipmentSkill(armor), 0);
 
-                    switch(armor.getClass().getEquipmentSkill(armor))
+                    switch (armor.getClass().getEquipmentSkill(armor))
                     {
                         case ESM::Skill::LightArmor:
                             sndMgr->playSound3D(ptr, "Light Armor Hit", 1.0f, 1.0f);
@@ -871,7 +877,7 @@ namespace MWClass
                             break;
                     }
                 }
-                else if(ptr == MWMechanics::getPlayer())
+                else if (ptr == MWMechanics::getPlayer())
                     skillUsageSucceeded(ptr, ESM::Skill::Unarmored, 0);
             }
         }
@@ -903,7 +909,8 @@ namespace MWClass
         if (!wasDead && getCreatureStats(ptr).isDead())
         {
             // NPC was killed
-            if (!attacker.isEmpty() && attacker.getClass().isNpc() && attacker.getClass().getNpcStats(attacker).isWerewolf())
+            if (!attacker.isEmpty() && attacker.getClass().isNpc()
+                && attacker.getClass().getNpcStats(attacker).isWerewolf())
             {
                 attacker.getClass().getNpcStats(attacker).addWerewolfKill();
             }
@@ -912,38 +919,38 @@ namespace MWClass
         }
     }
 
-    std::unique_ptr<MWWorld::Action> Npc::activate (const MWWorld::Ptr& ptr,
-        const MWWorld::Ptr& actor) const
+    std::unique_ptr<MWWorld::Action> Npc::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
     {
         // player got activated by another NPC
-        if(ptr == MWMechanics::getPlayer())
+        if (ptr == MWMechanics::getPlayer())
             return std::make_unique<MWWorld::ActionTalk>(actor);
 
         // Werewolfs can't activate NPCs
-        if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
+        if (actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
-            const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
+            const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-            const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfNPC", prng);
+            const ESM::Sound* sound = store.get<ESM::Sound>().searchRandom("WolfNPC", prng);
 
             std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::FailedAction>("#{sWerewolfRefusal}");
-            if(sound) action->setSound(sound->mId);
+            if (sound)
+                action->setSound(sound->mId);
 
             return action;
         }
 
         const MWMechanics::CreatureStats& stats = getCreatureStats(ptr);
 
-        if(stats.isDead())
+        if (stats.isDead())
         {
-            bool canLoot = Settings::Manager::getBool ("can loot during death animation", "Game");
+            bool canLoot = Settings::Manager::getBool("can loot during death animation", "Game");
 
             // by default user can loot friendly actors during death animation
             if (canLoot && !stats.getAiSequence().isInCombat())
                 return std::make_unique<MWWorld::ActionOpen>(ptr);
 
             // otherwise wait until death animation
-            if(stats.isDeathAnimationFinished())
+            if (stats.isDeathAnimationFinished())
                 return std::make_unique<MWWorld::ActionOpen>(ptr);
         }
         else if (!stats.getAiSequence().isInCombat())
@@ -957,7 +964,8 @@ namespace MWClass
         }
         else // In combat
         {
-            const bool stealingInCombat = Settings::Manager::getBool ("always allow stealing from knocked out actors", "Game");
+            const bool stealingInCombat
+                = Settings::Manager::getBool("always allow stealing from knocked out actors", "Game");
             if (stealingInCombat && stats.getKnockedDown())
                 return std::make_unique<MWWorld::ActionOpen>(ptr); // stealing
         }
@@ -969,25 +977,23 @@ namespace MWClass
         return std::make_unique<MWWorld::FailedAction>();
     }
 
-    MWWorld::ContainerStore& Npc::getContainerStore (const MWWorld::Ptr& ptr)
-        const
+    MWWorld::ContainerStore& Npc::getContainerStore(const MWWorld::Ptr& ptr) const
     {
-        ensureCustomData (ptr);
+        ensureCustomData(ptr);
 
         return ptr.getRefData().getCustomData()->asNpcCustomData().mInventoryStore;
     }
 
-    MWWorld::InventoryStore& Npc::getInventoryStore (const MWWorld::Ptr& ptr)
-        const
+    MWWorld::InventoryStore& Npc::getInventoryStore(const MWWorld::Ptr& ptr) const
     {
-        ensureCustomData (ptr);
+        ensureCustomData(ptr);
 
         return ptr.getRefData().getCustomData()->asNpcCustomData().mInventoryStore;
     }
 
     std::string_view Npc::getScript(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
+        const MWWorld::LiveCellRef<ESM::NPC>* ref = ptr.get<ESM::NPC>();
 
         return ref->mBase->mScript;
     }
@@ -1001,10 +1007,10 @@ namespace MWClass
         if ((!godmode && stats.isParalyzed()) || stats.getKnockedDown() || stats.isDead())
             return 0.f;
 
-        const MWBase::World *world = MWBase::Environment::get().getWorld();
+        const MWBase::World* world = MWBase::Environment::get().getWorld();
         const GMST& gmst = getGmst();
 
-        const MWMechanics::MagicEffects &mageffects = stats.getMagicEffects();
+        const MWMechanics::MagicEffects& mageffects = stats.getMagicEffects();
 
         const float normalizedEncumbrance = getNormalizedEncumbrance(ptr);
 
@@ -1015,14 +1021,15 @@ namespace MWClass
         running = running && (inair || MWBase::Environment::get().getMechanicsManager()->isRunning(ptr));
 
         float moveSpeed;
-        if(getEncumbrance(ptr) > getCapacity(ptr))
+        if (getEncumbrance(ptr) > getCapacity(ptr))
             moveSpeed = 0.0f;
-        else if(mageffects.get(ESM::MagicEffect::Levitate).getMagnitude() > 0 &&
-                world->isLevitationEnabled())
+        else if (mageffects.get(ESM::MagicEffect::Levitate).getMagnitude() > 0 && world->isLevitationEnabled())
         {
-            float flySpeed = 0.01f*(stats.getAttribute(ESM::Attribute::Speed).getModified() +
-                                    mageffects.get(ESM::MagicEffect::Levitate).getMagnitude());
-            flySpeed = gmst.fMinFlySpeed->mValue.getFloat() + flySpeed*(gmst.fMaxFlySpeed->mValue.getFloat() - gmst.fMinFlySpeed->mValue.getFloat());
+            float flySpeed = 0.01f
+                * (stats.getAttribute(ESM::Attribute::Speed).getModified()
+                    + mageffects.get(ESM::MagicEffect::Levitate).getMagnitude());
+            flySpeed = gmst.fMinFlySpeed->mValue.getFloat()
+                + flySpeed * (gmst.fMaxFlySpeed->mValue.getFloat() - gmst.fMinFlySpeed->mValue.getFloat());
             flySpeed *= 1.0f - gmst.fEncumberedMoveEffect->mValue.getFloat() * normalizedEncumbrance;
             flySpeed = std::max(0.0f, flySpeed);
             moveSpeed = flySpeed;
@@ -1034,15 +1041,15 @@ namespace MWClass
         else
             moveSpeed = getWalkSpeed(ptr);
 
-        if(stats.isWerewolf() && running && stats.getDrawState() == MWMechanics::DrawState::Nothing)
+        if (stats.isWerewolf() && running && stats.getDrawState() == MWMechanics::DrawState::Nothing)
             moveSpeed *= gmst.fWereWolfRunMult->mValue.getFloat();
 
         return moveSpeed;
     }
 
-    float Npc::getJump(const MWWorld::Ptr &ptr) const
+    float Npc::getJump(const MWWorld::Ptr& ptr) const
     {
-        if(getEncumbrance(ptr) > getCapacity(ptr))
+        if (getEncumbrance(ptr) > getCapacity(ptr))
             return 0.f;
 
         const MWMechanics::NpcStats& stats = getNpcStats(ptr);
@@ -1052,25 +1059,24 @@ namespace MWClass
 
         const GMST& gmst = getGmst();
         const MWMechanics::MagicEffects& mageffects = stats.getMagicEffects();
-        const float encumbranceTerm = gmst.fJumpEncumbranceBase->mValue.getFloat() +
-                                          gmst.fJumpEncumbranceMultiplier->mValue.getFloat() *
-                                          (1.0f - Npc::getNormalizedEncumbrance(ptr));
+        const float encumbranceTerm = gmst.fJumpEncumbranceBase->mValue.getFloat()
+            + gmst.fJumpEncumbranceMultiplier->mValue.getFloat() * (1.0f - Npc::getNormalizedEncumbrance(ptr));
 
         float a = getSkill(ptr, ESM::Skill::Acrobatics);
         float b = 0.0f;
-        if(a > 50.0f)
+        if (a > 50.0f)
         {
             b = a - 50.0f;
             a = 50.0f;
         }
 
-        float x = gmst.fJumpAcrobaticsBase->mValue.getFloat() +
-                  std::pow(a / 15.0f, gmst.fJumpAcroMultiplier->mValue.getFloat());
+        float x = gmst.fJumpAcrobaticsBase->mValue.getFloat()
+            + std::pow(a / 15.0f, gmst.fJumpAcroMultiplier->mValue.getFloat());
         x += 3.0f * b * gmst.fJumpAcroMultiplier->mValue.getFloat();
         x += mageffects.get(ESM::MagicEffect::Jump).getMagnitude() * 64;
         x *= encumbranceTerm;
 
-        if(stats.getStance(MWMechanics::CreatureStats::Stance_Run))
+        if (stats.getStance(MWMechanics::CreatureStats::Stance_Run))
             x *= gmst.fJumpRunMultiplier->mValue.getFloat();
         x *= stats.getFatigueTerm();
         x -= -Constants::GravityConst * Constants::UnitsPerMeter;
@@ -1079,16 +1085,16 @@ namespace MWClass
         return x;
     }
 
-    MWMechanics::Movement& Npc::getMovementSettings (const MWWorld::Ptr& ptr) const
+    MWMechanics::Movement& Npc::getMovementSettings(const MWWorld::Ptr& ptr) const
     {
-        ensureCustomData (ptr);
+        ensureCustomData(ptr);
 
         return ptr.getRefData().getCustomData()->asNpcCustomData().mMovement;
     }
 
-    bool Npc::isEssential (const MWWorld::ConstPtr& ptr) const
+    bool Npc::isEssential(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
+        const MWWorld::LiveCellRef<ESM::NPC>* ref = ptr.get<ESM::NPC>();
 
         return (ref->mBase->mFlags & ESM::NPC::Essential) != 0;
     }
@@ -1106,43 +1112,50 @@ namespace MWClass
         if (!customData.mNpcStats.getAiSequence().isInCombat())
             return true;
 
-        const bool stealingInCombat = Settings::Manager::getBool ("always allow stealing from knocked out actors", "Game");
+        const bool stealingInCombat
+            = Settings::Manager::getBool("always allow stealing from knocked out actors", "Game");
         if (stealingInCombat && customData.mNpcStats.getKnockedDown())
             return true;
 
         return false;
     }
 
-    MWGui::ToolTipInfo Npc::getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const
+    MWGui::ToolTipInfo Npc::getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const
     {
-        const MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
+        const MWWorld::LiveCellRef<ESM::NPC>* ref = ptr.get<ESM::NPC>();
 
         bool fullHelp = MWBase::Environment::get().getWindowManager()->getFullHelp();
         MWGui::ToolTipInfo info;
 
         std::string_view name = getName(ptr);
         info.caption = MyGUI::TextIterator::toTagsString(MWGui::toUString(name));
-        if(fullHelp && !ref->mBase->mName.empty() && ptr.getRefData().getCustomData() && ptr.getRefData().getCustomData()->asNpcCustomData().mNpcStats.isWerewolf())
+        if (fullHelp && !ref->mBase->mName.empty() && ptr.getRefData().getCustomData()
+            && ptr.getRefData().getCustomData()->asNpcCustomData().mNpcStats.isWerewolf())
         {
             info.caption += " (";
             info.caption += MyGUI::TextIterator::toTagsString(ref->mBase->mName);
             info.caption += ")";
         }
 
-        if(fullHelp)
+        if (fullHelp)
             info.text = MWGui::ToolTips::getMiscString(ref->mBase->mScript, "Script");
 
         return info;
     }
 
-    float Npc::getCapacity (const MWWorld::Ptr& ptr) const
+    float Npc::getCapacity(const MWWorld::Ptr& ptr) const
     {
-        const MWMechanics::CreatureStats& stats = getCreatureStats (ptr);
-        static const float fEncumbranceStrMult = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fEncumbranceStrMult")->mValue.getFloat();
-        return stats.getAttribute(ESM::Attribute::Strength).getModified()*fEncumbranceStrMult;
+        const MWMechanics::CreatureStats& stats = getCreatureStats(ptr);
+        static const float fEncumbranceStrMult = MWBase::Environment::get()
+                                                     .getWorld()
+                                                     ->getStore()
+                                                     .get<ESM::GameSetting>()
+                                                     .find("fEncumbranceStrMult")
+                                                     ->mValue.getFloat();
+        return stats.getAttribute(ESM::Attribute::Strength).getModified() * fEncumbranceStrMult;
     }
 
-    float Npc::getEncumbrance (const MWWorld::Ptr& ptr) const
+    float Npc::getEncumbrance(const MWWorld::Ptr& ptr) const
     {
         // According to UESP, inventory weight is ignored in werewolf form. Does that include
         // feather and burden effects?
@@ -1159,37 +1172,35 @@ namespace MWClass
         return cast.cast(recordId);
     }
 
-    void Npc::skillUsageSucceeded (const MWWorld::Ptr& ptr, int skill, int usageType, float extraFactor) const
+    void Npc::skillUsageSucceeded(const MWWorld::Ptr& ptr, int skill, int usageType, float extraFactor) const
     {
-        MWMechanics::NpcStats& stats = getNpcStats (ptr);
+        MWMechanics::NpcStats& stats = getNpcStats(ptr);
 
         if (stats.isWerewolf())
             return;
 
-        MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
+        MWWorld::LiveCellRef<ESM::NPC>* ref = ptr.get<ESM::NPC>();
 
-        const ESM::Class *class_ =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find (
-                ref->mBase->mClass
-            );
+        const ESM::Class* class_
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find(ref->mBase->mClass);
 
-        stats.useSkill (skill, *class_, usageType, extraFactor);
+        stats.useSkill(skill, *class_, usageType, extraFactor);
     }
 
-    float Npc::getArmorRating (const MWWorld::Ptr& ptr) const
+    float Npc::getArmorRating(const MWWorld::Ptr& ptr) const
     {
-        const MWBase::World *world = MWBase::Environment::get().getWorld();
-        const MWWorld::Store<ESM::GameSetting> &store = world->getStore().get<ESM::GameSetting>();
+        const MWBase::World* world = MWBase::Environment::get().getWorld();
+        const MWWorld::Store<ESM::GameSetting>& store = world->getStore().get<ESM::GameSetting>();
 
-        MWMechanics::NpcStats &stats = getNpcStats(ptr);
-        const MWWorld::InventoryStore &invStore = getInventoryStore(ptr);
+        MWMechanics::NpcStats& stats = getNpcStats(ptr);
+        const MWWorld::InventoryStore& invStore = getInventoryStore(ptr);
 
         float fUnarmoredBase1 = store.find("fUnarmoredBase1")->mValue.getFloat();
         float fUnarmoredBase2 = store.find("fUnarmoredBase2")->mValue.getFloat();
         float unarmoredSkill = getSkill(ptr, ESM::Skill::Unarmored);
 
         float ratings[MWWorld::InventoryStore::Slots];
-        for(int i = 0;i < MWWorld::InventoryStore::Slots;i++)
+        for (int i = 0; i < MWWorld::InventoryStore::Slots; i++)
         {
             MWWorld::ConstContainerStoreIterator it = invStore.getSlot(i);
             if (it == invStore.end() || it->getType() != ESM::Armor::sRecordId)
@@ -1213,27 +1224,30 @@ namespace MWClass
         float shield = stats.getMagicEffects().get(ESM::MagicEffect::Shield).getMagnitude();
 
         return ratings[MWWorld::InventoryStore::Slot_Cuirass] * 0.3f
-                + (ratings[MWWorld::InventoryStore::Slot_CarriedLeft] + ratings[MWWorld::InventoryStore::Slot_Helmet]
-                    + ratings[MWWorld::InventoryStore::Slot_Greaves] + ratings[MWWorld::InventoryStore::Slot_Boots]
-                    + ratings[MWWorld::InventoryStore::Slot_LeftPauldron] + ratings[MWWorld::InventoryStore::Slot_RightPauldron]
-                    ) * 0.1f
-                + (ratings[MWWorld::InventoryStore::Slot_LeftGauntlet] + ratings[MWWorld::InventoryStore::Slot_RightGauntlet])
-                    * 0.05f
-                + shield;
+            + (ratings[MWWorld::InventoryStore::Slot_CarriedLeft] + ratings[MWWorld::InventoryStore::Slot_Helmet]
+                  + ratings[MWWorld::InventoryStore::Slot_Greaves] + ratings[MWWorld::InventoryStore::Slot_Boots]
+                  + ratings[MWWorld::InventoryStore::Slot_LeftPauldron]
+                  + ratings[MWWorld::InventoryStore::Slot_RightPauldron])
+            * 0.1f
+            + (ratings[MWWorld::InventoryStore::Slot_LeftGauntlet]
+                  + ratings[MWWorld::InventoryStore::Slot_RightGauntlet])
+            * 0.05f
+            + shield;
     }
 
-    void Npc::adjustScale(const MWWorld::ConstPtr &ptr, osg::Vec3f&scale, bool rendering) const
+    void Npc::adjustScale(const MWWorld::ConstPtr& ptr, osg::Vec3f& scale, bool rendering) const
     {
         if (!rendering)
             return; // collision meshes are not scaled based on race height
                     // having the same collision extents for all races makes the environments easier to test
 
-        const MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
+        const MWWorld::LiveCellRef<ESM::NPC>* ref = ptr.get<ESM::NPC>();
 
-        const ESM::Race* race =
-                MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(ref->mBase->mRace);
+        const ESM::Race* race
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(ref->mBase->mRace);
 
-        // Race weight should not affect 1st-person meshes, otherwise it will change hand proportions and can break aiming.
+        // Race weight should not affect 1st-person meshes, otherwise it will change hand proportions and can break
+        // aiming.
         if (ptr == MWMechanics::getPlayer() && ptr.isInCell() && MWBase::Environment::get().getWorld()->isFirstPerson())
         {
             if (ref->mBase->isMale())
@@ -1258,28 +1272,27 @@ namespace MWClass
         }
     }
 
-    int Npc::getServices(const MWWorld::ConstPtr &actor) const
+    int Npc::getServices(const MWWorld::ConstPtr& actor) const
     {
         return actor.get<ESM::NPC>()->mBase->mAiData.mServices;
     }
 
-
     std::string_view Npc::getSoundIdFromSndGen(const MWWorld::Ptr& ptr, std::string_view name) const
     {
-        if(name == "left" || name == "right")
+        if (name == "left" || name == "right")
         {
-            MWBase::World *world = MWBase::Environment::get().getWorld();
-            if(world->isFlying(ptr))
+            MWBase::World* world = MWBase::Environment::get().getWorld();
+            if (world->isFlying(ptr))
                 return {};
             osg::Vec3f pos(ptr.getRefData().getPosition().asVec3());
-            if(world->isSwimming(ptr))
+            if (world->isSwimming(ptr))
                 return (name == "left") ? "Swim Left" : "Swim Right";
-            if(world->isUnderwater(ptr.getCell(), pos) || world->isWalkingOnWater(ptr))
+            if (world->isUnderwater(ptr.getCell(), pos) || world->isWalkingOnWater(ptr))
                 return (name == "left") ? "FootWaterLeft" : "FootWaterRight";
-            if(world->isOnGround(ptr))
+            if (world->isOnGround(ptr))
             {
                 if (getNpcStats(ptr).isWerewolf()
-                        && getCreatureStats(ptr).getStance(MWMechanics::CreatureStats::Stance_Run))
+                    && getCreatureStats(ptr).getStance(MWMechanics::CreatureStats::Stance_Run))
                 {
                     int weaponType = ESM::Weapon::None;
                     MWMechanics::getActiveWeapon(ptr, &weaponType);
@@ -1287,12 +1300,12 @@ namespace MWClass
                         return {};
                 }
 
-                const MWWorld::InventoryStore &inv = Npc::getInventoryStore(ptr);
+                const MWWorld::InventoryStore& inv = Npc::getInventoryStore(ptr);
                 MWWorld::ConstContainerStoreIterator boots = inv.getSlot(MWWorld::InventoryStore::Slot_Boots);
-                if(boots == inv.end() || boots->getType() != ESM::Armor::sRecordId)
+                if (boots == inv.end() || boots->getType() != ESM::Armor::sRecordId)
                     return (name == "left") ? "FootBareLeft" : "FootBareRight";
 
-                switch(boots->getClass().getEquipmentSkill(*boots))
+                switch (boots->getClass().getEquipmentSkill(*boots))
                 {
                     case ESM::Skill::LightArmor:
                         return (name == "left") ? "FootLightLeft" : "FootLightRight";
@@ -1306,29 +1319,29 @@ namespace MWClass
         }
 
         // Morrowind ignores land soundgen for NPCs
-        if(name == "land")
+        if (name == "land")
             return {};
-        if(name == "swimleft")
+        if (name == "swimleft")
             return "Swim Left";
-        if(name == "swimright")
+        if (name == "swimright")
             return "Swim Right";
         // TODO: I have no idea what these are supposed to do for NPCs since they use
         // voiced dialog for various conditions like health loss and combat taunts. Maybe
         // only for biped creatures?
 
-        if(name == "moan")
+        if (name == "moan")
             return {};
-        if(name == "roar")
+        if (name == "roar")
             return {};
-        if(name == "scream")
+        if (name == "scream")
             return {};
 
         throw std::runtime_error("Unexpected soundgen type: " + std::string(name));
     }
 
-    MWWorld::Ptr Npc::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
+    MWWorld::Ptr Npc::copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const
     {
-        const MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
+        const MWWorld::LiveCellRef<ESM::NPC>* ref = ptr.get<ESM::NPC>();
 
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
@@ -1338,13 +1351,12 @@ namespace MWClass
         return getNpcStats(ptr).getSkill(skill).getModified();
     }
 
-    int Npc::getBloodTexture(const MWWorld::ConstPtr &ptr) const
+    int Npc::getBloodTexture(const MWWorld::ConstPtr& ptr) const
     {
         return ptr.get<ESM::NPC>()->mBase->mBloodType;
     }
 
-    void Npc::readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state)
-        const
+    void Npc::readAdditionalState(const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const
     {
         if (!state.mHasCustomState)
             return;
@@ -1363,20 +1375,20 @@ namespace MWClass
             }
         }
         else
-            ensureCustomData(ptr); // in openmw 0.30 savegames not all state was saved yet, so need to load it regardless.
+            ensureCustomData(
+                ptr); // in openmw 0.30 savegames not all state was saved yet, so need to load it regardless.
 
         NpcCustomData& customData = ptr.getRefData().getCustomData()->asNpcCustomData();
 
-        customData.mInventoryStore.readState (npcState.mInventory);
-        customData.mNpcStats.readState (npcState.mNpcStats);
+        customData.mInventoryStore.readState(npcState.mInventory);
+        customData.mNpcStats.readState(npcState.mNpcStats);
         bool spellsInitialised = customData.mNpcStats.getSpells().setSpells(ptr.get<ESM::NPC>()->mBase->mId);
-        if(spellsInitialised)
+        if (spellsInitialised)
             customData.mNpcStats.getSpells().clear();
-        customData.mNpcStats.readState (npcState.mCreatureStats);
+        customData.mNpcStats.readState(npcState.mCreatureStats);
     }
 
-    void Npc::writeAdditionalState (const MWWorld::ConstPtr& ptr, ESM::ObjectState& state)
-        const
+    void Npc::writeAdditionalState(const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const
     {
         if (!ptr.getRefData().getCustomData())
         {
@@ -1385,21 +1397,22 @@ namespace MWClass
         }
 
         const NpcCustomData& customData = ptr.getRefData().getCustomData()->asNpcCustomData();
-        if (ptr.getRefData().getCount() <= 0 && (!(ptr.get<ESM::NPC>()->mBase->mFlags & ESM::NPC::Respawn) || !customData.mNpcStats.isDead()))
+        if (ptr.getRefData().getCount() <= 0
+            && (!(ptr.get<ESM::NPC>()->mBase->mFlags & ESM::NPC::Respawn) || !customData.mNpcStats.isDead()))
         {
             state.mHasCustomState = false;
             return;
         }
 
         ESM::NpcState& npcState = state.asNpcState();
-        customData.mInventoryStore.writeState (npcState.mInventory);
-        customData.mNpcStats.writeState (npcState.mNpcStats);
-        customData.mNpcStats.writeState (npcState.mCreatureStats);
+        customData.mInventoryStore.writeState(npcState.mInventory);
+        customData.mNpcStats.writeState(npcState.mNpcStats);
+        customData.mNpcStats.writeState(npcState.mCreatureStats);
     }
 
     int Npc::getBaseGold(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
+        const MWWorld::LiveCellRef<ESM::NPC>* ref = ptr.get<ESM::NPC>();
         return ref->mBase->mNpdt.mGold;
     }
 
@@ -1408,17 +1421,17 @@ namespace MWClass
         return Misc::StringUtils::ciEqual(ptr.get<ESM::NPC>()->mBase->mClass, className);
     }
 
-    bool Npc::canSwim(const MWWorld::ConstPtr &ptr) const
+    bool Npc::canSwim(const MWWorld::ConstPtr& ptr) const
     {
         return true;
     }
 
-    bool Npc::canWalk(const MWWorld::ConstPtr &ptr) const
+    bool Npc::canWalk(const MWWorld::ConstPtr& ptr) const
     {
         return true;
     }
 
-    void Npc::respawn(const MWWorld::Ptr &ptr) const
+    void Npc::respawn(const MWWorld::Ptr& ptr) const
     {
         const MWMechanics::CreatureStats& creatureStats = getCreatureStats(ptr);
         if (ptr.getRefData().getCount() > 0 && !creatureStats.isDead())
@@ -1427,14 +1440,16 @@ namespace MWClass
         if (!creatureStats.isDeathAnimationFinished())
             return;
 
-        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
         static const float fCorpseRespawnDelay = gmst.find("fCorpseRespawnDelay")->mValue.getFloat();
         static const float fCorpseClearDelay = gmst.find("fCorpseClearDelay")->mValue.getFloat();
 
-        float delay = ptr.getRefData().getCount() == 0 ? fCorpseClearDelay : std::min(fCorpseRespawnDelay, fCorpseClearDelay);
+        float delay
+            = ptr.getRefData().getCount() == 0 ? fCorpseClearDelay : std::min(fCorpseRespawnDelay, fCorpseClearDelay);
 
         if (ptr.get<ESM::NPC>()->mBase->mFlags & ESM::NPC::Respawn
-                && creatureStats.getTimeOfDeath() + delay <= MWBase::Environment::get().getWorld()->getTimeStamp())
+            && creatureStats.getTimeOfDeath() + delay <= MWBase::Environment::get().getWorld()->getTimeStamp())
         {
             if (ptr.getCellRef().hasContentFile())
             {
@@ -1452,32 +1467,33 @@ namespace MWClass
 
                 // Reset to original position
                 MWBase::Environment::get().getWorld()->moveObject(ptr, ptr.getCellRef().getPosition().asVec3());
-                MWBase::Environment::get().getWorld()->rotateObject(ptr, ptr.getCellRef().getPosition().asRotationVec3(), MWBase::RotationFlag_none);
+                MWBase::Environment::get().getWorld()->rotateObject(
+                    ptr, ptr.getCellRef().getPosition().asRotationVec3(), MWBase::RotationFlag_none);
             }
         }
     }
 
-    int Npc::getBaseFightRating (const MWWorld::ConstPtr& ptr) const
+    int Npc::getBaseFightRating(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
+        const MWWorld::LiveCellRef<ESM::NPC>* ref = ptr.get<ESM::NPC>();
         return ref->mBase->mAiData.mFight;
     }
 
-    bool Npc::isBipedal(const MWWorld::ConstPtr &ptr) const
+    bool Npc::isBipedal(const MWWorld::ConstPtr& ptr) const
     {
         return true;
     }
 
     std::string_view Npc::getPrimaryFaction(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
+        const MWWorld::LiveCellRef<ESM::NPC>* ref = ptr.get<ESM::NPC>();
         return ref->mBase->mFaction;
     }
 
-    int Npc::getPrimaryFactionRank (const MWWorld::ConstPtr& ptr) const
+    int Npc::getPrimaryFactionRank(const MWWorld::ConstPtr& ptr) const
     {
         std::string_view factionID = ptr.getClass().getPrimaryFaction(ptr);
-        if(factionID.empty())
+        if (factionID.empty())
             return -1;
 
         // Search in the NPC data first
@@ -1489,7 +1505,7 @@ namespace MWClass
         }
 
         // Use base NPC record as a fallback
-        const MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
+        const MWWorld::LiveCellRef<ESM::NPC>* ref = ptr.get<ESM::NPC>();
         return ref->mBase->getFactionRank();
     }
 
@@ -1511,11 +1527,11 @@ namespace MWClass
         const bool sneaking = MWBase::Environment::get().getMechanicsManager()->isSneaking(ptr);
 
         float walkSpeed = gmst.fMinWalkSpeed->mValue.getFloat()
-                + 0.01f * stats.getAttribute(ESM::Attribute::Speed).getModified()
+            + 0.01f * stats.getAttribute(ESM::Attribute::Speed).getModified()
                 * (gmst.fMaxWalkSpeed->mValue.getFloat() - gmst.fMinWalkSpeed->mValue.getFloat());
-        walkSpeed *= 1.0f - gmst.fEncumberedMoveEffect->mValue.getFloat()*normalizedEncumbrance;
+        walkSpeed *= 1.0f - gmst.fEncumberedMoveEffect->mValue.getFloat() * normalizedEncumbrance;
         walkSpeed = std::max(0.0f, walkSpeed);
-        if(sneaking)
+        if (sneaking)
             walkSpeed *= gmst.fSneakSpeedMultiplier->mValue.getFloat();
 
         return walkSpeed;
@@ -1525,8 +1541,8 @@ namespace MWClass
     {
         const GMST& gmst = getGmst();
         return getWalkSpeed(ptr)
-                * (0.01f * getSkill(ptr, ESM::Skill::Athletics) * gmst.fAthleticsRunBonus->mValue.getFloat()
-                   + gmst.fBaseRunMultiplier->mValue.getFloat());
+            * (0.01f * getSkill(ptr, ESM::Skill::Athletics) * gmst.fAthleticsRunBonus->mValue.getFloat()
+                + gmst.fBaseRunMultiplier->mValue.getFloat());
     }
 
     float Npc::getSwimSpeed(const MWWorld::Ptr& ptr) const
@@ -1537,7 +1553,7 @@ namespace MWClass
         const bool swimming = world->isSwimming(ptr);
         const bool inair = !world->isOnGround(ptr) && !swimming && !world->isFlying(ptr);
         const bool running = stats.getStance(MWMechanics::CreatureStats::Stance_Run)
-                && (inair || MWBase::Environment::get().getMechanicsManager()->isRunning(ptr));
+            && (inair || MWBase::Environment::get().getMechanicsManager()->isRunning(ptr));
 
         return getSwimSpeedImpl(ptr, getGmst(), mageffects, running ? getRunSpeed(ptr) : getWalkSpeed(ptr));
     }
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index ebe9b03318..855d236c22 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -14,165 +14,165 @@ namespace MWClass
 {
     class Npc : public MWWorld::RegisteredClass<Npc, Actor>
     {
-            friend MWWorld::RegisteredClass<Npc, Actor>;
+        friend MWWorld::RegisteredClass<Npc, Actor>;
 
-            Npc();
+        Npc();
 
-            void ensureCustomData (const MWWorld::Ptr& ptr) const;
+        void ensureCustomData(const MWWorld::Ptr& ptr) const;
 
-            MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
+        MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const override;
 
-            struct GMST
-            {
-                const ESM::GameSetting *fMinWalkSpeed;
-                const ESM::GameSetting *fMaxWalkSpeed;
-                const ESM::GameSetting *fEncumberedMoveEffect;
-                const ESM::GameSetting *fSneakSpeedMultiplier;
-                const ESM::GameSetting *fAthleticsRunBonus;
-                const ESM::GameSetting *fBaseRunMultiplier;
-                const ESM::GameSetting *fMinFlySpeed;
-                const ESM::GameSetting *fMaxFlySpeed;
-                const ESM::GameSetting *fSwimRunBase;
-                const ESM::GameSetting *fSwimRunAthleticsMult;
-                const ESM::GameSetting *fJumpEncumbranceBase;
-                const ESM::GameSetting *fJumpEncumbranceMultiplier;
-                const ESM::GameSetting *fJumpAcrobaticsBase;
-                const ESM::GameSetting *fJumpAcroMultiplier;
-                const ESM::GameSetting *fJumpRunMultiplier;
-                const ESM::GameSetting *fWereWolfRunMult;
-                const ESM::GameSetting *fKnockDownMult;
-                const ESM::GameSetting *iKnockDownOddsMult;
-                const ESM::GameSetting *iKnockDownOddsBase;
-                const ESM::GameSetting *fCombatArmorMinMult;
-            };
+        struct GMST
+        {
+            const ESM::GameSetting* fMinWalkSpeed;
+            const ESM::GameSetting* fMaxWalkSpeed;
+            const ESM::GameSetting* fEncumberedMoveEffect;
+            const ESM::GameSetting* fSneakSpeedMultiplier;
+            const ESM::GameSetting* fAthleticsRunBonus;
+            const ESM::GameSetting* fBaseRunMultiplier;
+            const ESM::GameSetting* fMinFlySpeed;
+            const ESM::GameSetting* fMaxFlySpeed;
+            const ESM::GameSetting* fSwimRunBase;
+            const ESM::GameSetting* fSwimRunAthleticsMult;
+            const ESM::GameSetting* fJumpEncumbranceBase;
+            const ESM::GameSetting* fJumpEncumbranceMultiplier;
+            const ESM::GameSetting* fJumpAcrobaticsBase;
+            const ESM::GameSetting* fJumpAcroMultiplier;
+            const ESM::GameSetting* fJumpRunMultiplier;
+            const ESM::GameSetting* fWereWolfRunMult;
+            const ESM::GameSetting* fKnockDownMult;
+            const ESM::GameSetting* iKnockDownOddsMult;
+            const ESM::GameSetting* iKnockDownOddsBase;
+            const ESM::GameSetting* fCombatArmorMinMult;
+        };
 
-            static const GMST& getGmst();
+        static const GMST& getGmst();
 
-        public:
+    public:
+        void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
+            MWRender::RenderingInterface& renderingInterface) const override;
+        ///< Add reference into a cell for rendering
 
-            void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
-            ///< Add reference into a cell for rendering
+        std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return name or ID; can return an empty string.
 
-            std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
-            ///< \return name or ID; can return an empty string.
+        MWMechanics::CreatureStats& getCreatureStats(const MWWorld::Ptr& ptr) const override;
+        ///< Return creature stats
 
-            MWMechanics::CreatureStats& getCreatureStats (const MWWorld::Ptr& ptr) const override;
-            ///< Return creature stats
+        MWMechanics::NpcStats& getNpcStats(const MWWorld::Ptr& ptr) const override;
+        ///< Return NPC stats
 
-            MWMechanics::NpcStats& getNpcStats (const MWWorld::Ptr& ptr) const override;
-            ///< Return NPC stats
+        MWWorld::ContainerStore& getContainerStore(const MWWorld::Ptr& ptr) const override;
+        ///< Return container store
 
-            MWWorld::ContainerStore& getContainerStore (const MWWorld::Ptr& ptr) const override;
-            ///< Return container store
+        bool hasToolTip(const MWWorld::ConstPtr& ptr) const override;
+        ///< @return true if this object has a tooltip when focused (default implementation: true)
 
-            bool hasToolTip(const MWWorld::ConstPtr& ptr) const override;
-            ///< @return true if this object has a tooltip when focused (default implementation: true)
+        MWGui::ToolTipInfo getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const override;
+        ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
-            MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const override;
-            ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
+        MWWorld::InventoryStore& getInventoryStore(const MWWorld::Ptr& ptr) const override;
+        ///< Return inventory store
 
-            MWWorld::InventoryStore& getInventoryStore (const MWWorld::Ptr& ptr) const override;
-            ///< Return inventory store
+        bool hasInventoryStore(const MWWorld::Ptr& ptr) const override { return true; }
 
-            bool hasInventoryStore(const MWWorld::Ptr &ptr) const override { return true; }
+        bool evaluateHit(const MWWorld::Ptr& ptr, MWWorld::Ptr& victim, osg::Vec3f& hitPosition) const override;
 
-            bool evaluateHit(const MWWorld::Ptr& ptr, MWWorld::Ptr& victim, osg::Vec3f& hitPosition) const override;
+        void hit(const MWWorld::Ptr& ptr, float attackStrength, int type, const MWWorld::Ptr& victim,
+            const osg::Vec3f& hitPosition, bool success) const override;
 
-            void hit(const MWWorld::Ptr& ptr, float attackStrength, int type, const MWWorld::Ptr& victim, const osg::Vec3f& hitPosition, bool success) const override;
+        void onHit(const MWWorld::Ptr& ptr, float damage, bool ishealth, const MWWorld::Ptr& object,
+            const MWWorld::Ptr& attacker, const osg::Vec3f& hitPosition, bool successful) const override;
 
-            void onHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object, const MWWorld::Ptr &attacker, const osg::Vec3f &hitPosition, bool successful) const override;
+        void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const override;
+        ///< Get a list of models to preload that this object may use (directly or indirectly). default implementation:
+        ///< list getModel().
 
-            void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const override;
-            ///< Get a list of models to preload that this object may use (directly or indirectly). default implementation: list getModel().
+        std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
+        ///< Generate action for activation
 
-            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
-                const MWWorld::Ptr& actor) const override;
-            ///< Generate action for activation
+        std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of the script attached to ptr
 
-            std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of the script attached to ptr
+        float getMaxSpeed(const MWWorld::Ptr& ptr) const override;
+        ///< Return maximal movement speed.
 
-            float getMaxSpeed (const MWWorld::Ptr& ptr) const override;
-            ///< Return maximal movement speed.
+        float getJump(const MWWorld::Ptr& ptr) const override;
+        ///< Return jump velocity (not accounting for movement)
 
-            float getJump(const MWWorld::Ptr &ptr) const override;
-            ///< Return jump velocity (not accounting for movement)
+        MWMechanics::Movement& getMovementSettings(const MWWorld::Ptr& ptr) const override;
+        ///< Return desired movement.
 
-            MWMechanics::Movement& getMovementSettings (const MWWorld::Ptr& ptr) const override;
-            ///< Return desired movement.
+        float getCapacity(const MWWorld::Ptr& ptr) const override;
+        ///< Return total weight that fits into the object. Throws an exception, if the object can't
+        /// hold other objects.
 
-            float getCapacity (const MWWorld::Ptr& ptr) const override;
-            ///< Return total weight that fits into the object. Throws an exception, if the object can't
-            /// hold other objects.
+        float getEncumbrance(const MWWorld::Ptr& ptr) const override;
+        ///< Returns total weight of objects inside this object (including modifications from magic
+        /// effects). Throws an exception, if the object can't hold other objects.
 
-            float getEncumbrance (const MWWorld::Ptr& ptr) const override;
-            ///< Returns total weight of objects inside this object (including modifications from magic
-            /// effects). Throws an exception, if the object can't hold other objects.
+        float getArmorRating(const MWWorld::Ptr& ptr) const override;
+        ///< @return combined armor rating of this actor
 
-            float getArmorRating (const MWWorld::Ptr& ptr) const override;
-            ///< @return combined armor rating of this actor
+        bool consume(const MWWorld::Ptr& consumable, const MWWorld::Ptr& actor) const override;
 
-            bool consume(const MWWorld::Ptr& consumable, const MWWorld::Ptr& actor) const override;
+        void adjustScale(const MWWorld::ConstPtr& ptr, osg::Vec3f& scale, bool rendering) const override;
+        /// @param rendering Indicates if the scale to adjust is for the rendering mesh, or for the collision mesh
 
-            void adjustScale (const MWWorld::ConstPtr &ptr, osg::Vec3f &scale, bool rendering) const override;
-            /// @param rendering Indicates if the scale to adjust is for the rendering mesh, or for the collision mesh
+        void skillUsageSucceeded(
+            const MWWorld::Ptr& ptr, int skill, int usageType, float extraFactor = 1.f) const override;
+        ///< Inform actor \a ptr that a skill use has succeeded.
 
-            void skillUsageSucceeded (const MWWorld::Ptr& ptr, int skill, int usageType, float extraFactor=1.f) const override;
-            ///< Inform actor \a ptr that a skill use has succeeded.
+        bool isEssential(const MWWorld::ConstPtr& ptr) const override;
+        ///< Is \a ptr essential? (i.e. may losing \a ptr make the game unwinnable)
 
-            bool isEssential (const MWWorld::ConstPtr& ptr) const override;
-            ///< Is \a ptr essential? (i.e. may losing \a ptr make the game unwinnable)
+        int getServices(const MWWorld::ConstPtr& actor) const override;
 
-            int getServices (const MWWorld::ConstPtr& actor) const override;
+        bool isPersistent(const MWWorld::ConstPtr& ptr) const override;
 
-            bool isPersistent (const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getSoundIdFromSndGen(const MWWorld::Ptr& ptr, std::string_view name) const override;
 
-            std::string_view getSoundIdFromSndGen(const MWWorld::Ptr& ptr, std::string_view name) const override;
+        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
 
-            std::string getModel(const MWWorld::ConstPtr &ptr) const override;
+        float getSkill(const MWWorld::Ptr& ptr, int skill) const override;
 
-            float getSkill(const MWWorld::Ptr& ptr, int skill) const override;
+        /// Get a blood texture suitable for \a ptr (see Blood Texture 0-2 in Morrowind.ini)
+        int getBloodTexture(const MWWorld::ConstPtr& ptr) const override;
 
-            /// Get a blood texture suitable for \a ptr (see Blood Texture 0-2 in Morrowind.ini)
-            int getBloodTexture (const MWWorld::ConstPtr& ptr) const override;
+        bool isNpc() const override { return true; }
 
-            bool isNpc() const override
-            {
-                return true;
-            }
+        void readAdditionalState(const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const override;
+        ///< Read additional state from \a state into \a ptr.
 
-            void readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const override;
-            ///< Read additional state from \a state into \a ptr.
+        void writeAdditionalState(const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const override;
+        ///< Write additional state from \a ptr into \a state.
 
-            void writeAdditionalState (const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const override;
-            ///< Write additional state from \a ptr into \a state.
+        int getBaseGold(const MWWorld::ConstPtr& ptr) const override;
 
-            int getBaseGold(const MWWorld::ConstPtr& ptr) const override;
+        bool isClass(const MWWorld::ConstPtr& ptr, std::string_view className) const override;
 
-            bool isClass(const MWWorld::ConstPtr& ptr, std::string_view className) const override;
+        bool canSwim(const MWWorld::ConstPtr& ptr) const override;
 
-            bool canSwim (const MWWorld::ConstPtr &ptr) const override;
+        bool canWalk(const MWWorld::ConstPtr& ptr) const override;
 
-            bool canWalk (const MWWorld::ConstPtr &ptr) const override;
+        bool isBipedal(const MWWorld::ConstPtr& ptr) const override;
 
-            bool isBipedal (const MWWorld::ConstPtr &ptr) const override;
+        void respawn(const MWWorld::Ptr& ptr) const override;
 
-            void respawn (const MWWorld::Ptr& ptr) const override;
+        int getBaseFightRating(const MWWorld::ConstPtr& ptr) const override;
 
-            int getBaseFightRating (const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getPrimaryFaction(const MWWorld::ConstPtr& ptr) const override;
+        int getPrimaryFactionRank(const MWWorld::ConstPtr& ptr) const override;
 
-            std::string_view getPrimaryFaction(const MWWorld::ConstPtr &ptr) const override;
-            int getPrimaryFactionRank(const MWWorld::ConstPtr &ptr) const override;
+        void setBaseAISetting(const std::string& id, MWMechanics::AiSetting setting, int value) const override;
 
-            void setBaseAISetting(const std::string& id, MWMechanics::AiSetting setting, int value) const override;
+        void modifyBaseInventory(std::string_view actorId, std::string_view itemId, int amount) const override;
 
-            void modifyBaseInventory(std::string_view actorId, std::string_view itemId, int amount) const override;
+        float getWalkSpeed(const MWWorld::Ptr& ptr) const override;
 
-            float getWalkSpeed(const MWWorld::Ptr& ptr) const override;
+        float getRunSpeed(const MWWorld::Ptr& ptr) const override;
 
-            float getRunSpeed(const MWWorld::Ptr& ptr) const override;
-
-            float getSwimSpeed(const MWWorld::Ptr& ptr) const override;
+        float getSwimSpeed(const MWWorld::Ptr& ptr) const override;
     };
 }
 
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 874d33c598..499910bd77 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -2,15 +2,15 @@
 
 #include <MyGUI_TextIterator.h>
 
-#include <components/esm3/loadalch.hpp>
-#include <components/esm3/loadnpc.hpp>
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
+#include <components/esm3/loadalch.hpp>
+#include <components/esm3/loadnpc.hpp>
 
-#include "../mwworld/ptr.hpp"
 #include "../mwworld/actionapply.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/ptr.hpp"
 
 #include "../mwgui/tooltips.hpp"
 #include "../mwgui/ustring.hpp"
@@ -29,43 +29,43 @@ namespace MWClass
     {
     }
 
-    void Potion::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
+    void Potion::insertObjectRendering(
+        const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
-        if (!model.empty()) {
+        if (!model.empty())
+        {
             renderingInterface.getObjects().insertModel(ptr, model);
         }
     }
 
-    std::string Potion::getModel(const MWWorld::ConstPtr &ptr) const
+    std::string Potion::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Potion>(ptr);
     }
 
     std::string_view Potion::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Potion> *ref = ptr.get<ESM::Potion>();
+        const MWWorld::LiveCellRef<ESM::Potion>* ref = ptr.get<ESM::Potion>();
         const std::string& name = ref->mBase->mName;
 
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::unique_ptr<MWWorld::Action> Potion::activate (const MWWorld::Ptr& ptr,
-        const MWWorld::Ptr& actor) const
+    std::unique_ptr<MWWorld::Action> Potion::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
     {
         return defaultItemActivate(ptr, actor);
     }
 
     std::string_view Potion::getScript(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Potion> *ref =
-            ptr.get<ESM::Potion>();
+        const MWWorld::LiveCellRef<ESM::Potion>* ref = ptr.get<ESM::Potion>();
 
         return ref->mBase->mScript;
     }
 
-    int Potion::getValue (const MWWorld::ConstPtr& ptr) const
+    int Potion::getValue(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Potion> *ref = ptr.get<ESM::Potion>();
+        const MWWorld::LiveCellRef<ESM::Potion>* ref = ptr.get<ESM::Potion>();
 
         return ref->mBase->mData.mValue;
     }
@@ -82,18 +82,19 @@ namespace MWClass
 
     const std::string& Potion::getInventoryIcon(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Potion> *ref = ptr.get<ESM::Potion>();
+        const MWWorld::LiveCellRef<ESM::Potion>* ref = ptr.get<ESM::Potion>();
 
         return ref->mBase->mIcon;
     }
 
-    MWGui::ToolTipInfo Potion::getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const
+    MWGui::ToolTipInfo Potion::getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const
     {
-        const MWWorld::LiveCellRef<ESM::Potion> *ref = ptr.get<ESM::Potion>();
+        const MWWorld::LiveCellRef<ESM::Potion>* ref = ptr.get<ESM::Potion>();
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption
+            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
         info.icon = ref->mBase->mIcon;
 
         std::string text;
@@ -104,13 +105,14 @@ namespace MWClass
         info.effects = MWGui::Widgets::MWEffectList::effectListFromESM(&ref->mBase->mEffects);
 
         // hide effects the player doesn't know about
-        MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
-        for (unsigned int i=0; i<info.effects.size(); ++i)
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+        for (unsigned int i = 0; i < info.effects.size(); ++i)
             info.effects[i].mKnown = MWMechanics::Alchemy::knownEffect(i, player);
 
         info.isPotion = true;
 
-        if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
+        if (MWBase::Environment::get().getWindowManager()->getFullHelp())
+        {
             text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
             text += MWGui::ToolTips::getMiscString(ref->mBase->mScript, "Script");
         }
@@ -120,33 +122,32 @@ namespace MWClass
         return info;
     }
 
-    std::unique_ptr<MWWorld::Action> Potion::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Potion::use(const MWWorld::Ptr& ptr, bool force) const
     {
-        MWWorld::LiveCellRef<ESM::Potion> *ref =
-            ptr.get<ESM::Potion>();
+        MWWorld::LiveCellRef<ESM::Potion>* ref = ptr.get<ESM::Potion>();
 
         auto action = std::make_unique<MWWorld::ActionApply>(ptr, ref->mBase->mId);
 
-        action->setSound ("Drink");
+        action->setSound("Drink");
 
         return action;
     }
 
-    MWWorld::Ptr Potion::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
+    MWWorld::Ptr Potion::copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const
     {
-        const MWWorld::LiveCellRef<ESM::Potion> *ref = ptr.get<ESM::Potion>();
+        const MWWorld::LiveCellRef<ESM::Potion>* ref = ptr.get<ESM::Potion>();
 
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
 
-    bool Potion::canSell (const MWWorld::ConstPtr& item, int npcServices) const
+    bool Potion::canSell(const MWWorld::ConstPtr& item, int npcServices) const
     {
         return (npcServices & ESM::NPC::Potions) != 0;
     }
 
-    float Potion::getWeight(const MWWorld::ConstPtr &ptr) const
+    float Potion::getWeight(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Potion> *ref = ptr.get<ESM::Potion>();
+        const MWWorld::LiveCellRef<ESM::Potion>* ref = ptr.get<ESM::Potion>();
         return ref->mBase->mData.mWeight;
     }
 }
diff --git a/apps/openmw/mwclass/potion.hpp b/apps/openmw/mwclass/potion.hpp
index 23fc2d1059..1bff256b0d 100644
--- a/apps/openmw/mwclass/potion.hpp
+++ b/apps/openmw/mwclass/potion.hpp
@@ -7,50 +7,49 @@ namespace MWClass
 {
     class Potion : public MWWorld::RegisteredClass<Potion>
     {
-            friend MWWorld::RegisteredClass<Potion>;
+        friend MWWorld::RegisteredClass<Potion>;
 
-            Potion();
+        Potion();
 
-            MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
+        MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const override;
 
-        public:
+    public:
+        void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
+            MWRender::RenderingInterface& renderingInterface) const override;
+        ///< Add reference into a cell for rendering
 
-            void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
-            ///< Add reference into a cell for rendering
+        std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return name or ID; can return an empty string.
 
-            std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
-            ///< \return name or ID; can return an empty string.
+        std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
+        ///< Generate action for activation
 
-            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
-                const MWWorld::Ptr& actor) const override;
-            ///< Generate action for activation
+        MWGui::ToolTipInfo getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const override;
+        ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
-            MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const override;
-            ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
+        std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of the script attached to ptr
 
-            std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of the script attached to ptr
+        int getValue(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            int getValue (const MWWorld::ConstPtr& ptr) const override;
-            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+        std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
+        ///< Generate action for using via inventory menu
 
-            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
-            ///< Generate action for using via inventory menu
+        std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the pick up sound Id
 
-            std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the pick up sound Id
+        std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the put down sound Id
 
-            std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the put down sound Id
+        const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of inventory icon.
 
-            const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of inventory icon.
+        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
 
-            std::string getModel(const MWWorld::ConstPtr &ptr) const override;
+        float getWeight(const MWWorld::ConstPtr& ptr) const override;
 
-            float getWeight (const MWWorld::ConstPtr& ptr) const override;
-
-            bool canSell (const MWWorld::ConstPtr& item, int npcServices) const override;
+        bool canSell(const MWWorld::ConstPtr& item, int npcServices) const override;
     };
 }
 
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index 94bb574b92..7feda8445e 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -2,17 +2,17 @@
 
 #include <MyGUI_TextIterator.h>
 
-#include <components/esm3/loadprob.hpp>
 #include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadprob.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwworld/ptr.hpp"
 #include "../mwworld/actionequip.hpp"
-#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/inventorystore.hpp"
+#include "../mwworld/ptr.hpp"
 
 #include "../mwgui/tooltips.hpp"
 #include "../mwgui/ustring.hpp"
@@ -29,51 +29,51 @@ namespace MWClass
     {
     }
 
-    void Probe::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
+    void Probe::insertObjectRendering(
+        const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
-        if (!model.empty()) {
+        if (!model.empty())
+        {
             renderingInterface.getObjects().insertModel(ptr, model);
         }
     }
 
-    std::string Probe::getModel(const MWWorld::ConstPtr &ptr) const
+    std::string Probe::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Probe>(ptr);
     }
 
     std::string_view Probe::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Probe> *ref = ptr.get<ESM::Probe>();
+        const MWWorld::LiveCellRef<ESM::Probe>* ref = ptr.get<ESM::Probe>();
         const std::string& name = ref->mBase->mName;
 
         return !name.empty() ? name : ref->mBase->mId;
     }
-    std::unique_ptr<MWWorld::Action> Probe::activate (const MWWorld::Ptr& ptr,
-        const MWWorld::Ptr& actor) const
+    std::unique_ptr<MWWorld::Action> Probe::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
     {
         return defaultItemActivate(ptr, actor);
     }
 
     std::string_view Probe::getScript(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Probe> *ref =
-            ptr.get<ESM::Probe>();
+        const MWWorld::LiveCellRef<ESM::Probe>* ref = ptr.get<ESM::Probe>();
 
         return ref->mBase->mScript;
     }
 
-    std::pair<std::vector<int>, bool> Probe::getEquipmentSlots (const MWWorld::ConstPtr& ptr) const
+    std::pair<std::vector<int>, bool> Probe::getEquipmentSlots(const MWWorld::ConstPtr& ptr) const
     {
         std::vector<int> slots_;
 
-        slots_.push_back (int (MWWorld::InventoryStore::Slot_CarriedRight));
+        slots_.push_back(int(MWWorld::InventoryStore::Slot_CarriedRight));
 
-        return std::make_pair (slots_, false);
+        return std::make_pair(slots_, false);
     }
 
-    int Probe::getValue (const MWWorld::ConstPtr& ptr) const
+    int Probe::getValue(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Probe> *ref = ptr.get<ESM::Probe>();
+        const MWWorld::LiveCellRef<ESM::Probe>* ref = ptr.get<ESM::Probe>();
 
         return ref->mBase->mData.mValue;
     }
@@ -90,18 +90,19 @@ namespace MWClass
 
     const std::string& Probe::getInventoryIcon(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Probe> *ref = ptr.get<ESM::Probe>();
+        const MWWorld::LiveCellRef<ESM::Probe>* ref = ptr.get<ESM::Probe>();
 
         return ref->mBase->mIcon;
     }
 
-    MWGui::ToolTipInfo Probe::getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const
+    MWGui::ToolTipInfo Probe::getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const
     {
-        const MWWorld::LiveCellRef<ESM::Probe> *ref = ptr.get<ESM::Probe>();
+        const MWWorld::LiveCellRef<ESM::Probe>* ref = ptr.get<ESM::Probe>();
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption
+            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
         info.icon = ref->mBase->mIcon;
 
         std::string text;
@@ -113,7 +114,8 @@ namespace MWClass
         text += MWGui::ToolTips::getWeightString(ref->mBase->mData.mWeight, "#{sWeight}");
         text += MWGui::ToolTips::getValueString(ref->mBase->mData.mValue, "#{sValue}");
 
-        if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
+        if (MWBase::Environment::get().getWindowManager()->getFullHelp())
+        {
             text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
             text += MWGui::ToolTips::getMiscString(ref->mBase->mScript, "Script");
         }
@@ -123,7 +125,7 @@ namespace MWClass
         return info;
     }
 
-    std::unique_ptr<MWWorld::Action> Probe::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Probe::use(const MWWorld::Ptr& ptr, bool force) const
     {
         std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::ActionEquip>(ptr, force);
 
@@ -132,9 +134,9 @@ namespace MWClass
         return action;
     }
 
-    MWWorld::Ptr Probe::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
+    MWWorld::Ptr Probe::copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const
     {
-        const MWWorld::LiveCellRef<ESM::Probe> *ref = ptr.get<ESM::Probe>();
+        const MWWorld::LiveCellRef<ESM::Probe>* ref = ptr.get<ESM::Probe>();
 
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
@@ -144,26 +146,26 @@ namespace MWClass
         // Do not allow equip tools from inventory during attack
         if (MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(npc)
             && MWBase::Environment::get().getWindowManager()->isGuiMode())
-            return {0, "#{sCantEquipWeapWarning}"};
+            return { 0, "#{sCantEquipWeapWarning}" };
 
-        return {1, {}};
+        return { 1, {} };
     }
 
-    bool Probe::canSell (const MWWorld::ConstPtr& item, int npcServices) const
+    bool Probe::canSell(const MWWorld::ConstPtr& item, int npcServices) const
     {
         return (npcServices & ESM::NPC::Probes) != 0;
     }
 
-    int Probe::getItemMaxHealth (const MWWorld::ConstPtr& ptr) const
+    int Probe::getItemMaxHealth(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Probe> *ref = ptr.get<ESM::Probe>();
+        const MWWorld::LiveCellRef<ESM::Probe>* ref = ptr.get<ESM::Probe>();
 
         return ref->mBase->mData.mUses;
     }
 
-    float Probe::getWeight(const MWWorld::ConstPtr &ptr) const
+    float Probe::getWeight(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Probe> *ref = ptr.get<ESM::Probe>();
+        const MWWorld::LiveCellRef<ESM::Probe>* ref = ptr.get<ESM::Probe>();
         return ref->mBase->mData.mWeight;
     }
 }
diff --git a/apps/openmw/mwclass/probe.hpp b/apps/openmw/mwclass/probe.hpp
index 1583887960..3325c30e3b 100644
--- a/apps/openmw/mwclass/probe.hpp
+++ b/apps/openmw/mwclass/probe.hpp
@@ -7,62 +7,62 @@ namespace MWClass
 {
     class Probe : public MWWorld::RegisteredClass<Probe>
     {
-            friend MWWorld::RegisteredClass<Probe>;
+        friend MWWorld::RegisteredClass<Probe>;
 
-            Probe();
+        Probe();
 
-            MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
+        MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const override;
 
-        public:
+    public:
+        void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
+            MWRender::RenderingInterface& renderingInterface) const override;
+        ///< Add reference into a cell for rendering
 
-            void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
-            ///< Add reference into a cell for rendering
+        std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return name or ID; can return an empty string.
 
-            std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
-            ///< \return name or ID; can return an empty string.
+        std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
+        ///< Generate action for activation
 
-            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
-                const MWWorld::Ptr& actor) const override;
-            ///< Generate action for activation
+        MWGui::ToolTipInfo getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const override;
+        ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
-            MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const override;
-            ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
+        std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of the script attached to ptr
 
-            std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of the script attached to ptr
+        std::pair<std::vector<int>, bool> getEquipmentSlots(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return first: Return IDs of the slot this object can be equipped in; second: can object
+        /// stay stacked when equipped?
 
-            std::pair<std::vector<int>, bool> getEquipmentSlots (const MWWorld::ConstPtr& ptr) const override;
-            ///< \return first: Return IDs of the slot this object can be equipped in; second: can object
-            /// stay stacked when equipped?
+        int getValue(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            int getValue (const MWWorld::ConstPtr& ptr) const override;
-            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+        std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the pick up sound Id
 
-            std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the pick up sound Id
+        std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the put down sound Id
 
-            std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the put down sound Id
+        const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of inventory icon.
 
-            const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of inventory icon.
+        std::pair<int, std::string_view> canBeEquipped(
+            const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& npc) const override;
 
-            std::pair<int, std::string_view> canBeEquipped(const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& npc) const override;
+        std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
+        ///< Generate action for using via inventory menu
 
-            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
-            ///< Generate action for using via inventory menu
+        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
 
-            std::string getModel(const MWWorld::ConstPtr &ptr) const override;
+        bool canSell(const MWWorld::ConstPtr& item, int npcServices) const override;
 
-            bool canSell (const MWWorld::ConstPtr& item, int npcServices) const override;
+        float getWeight(const MWWorld::ConstPtr& ptr) const override;
 
-            float getWeight (const MWWorld::ConstPtr& ptr) const override;
+        int getItemMaxHealth(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return item max health or throw an exception, if class does not have item health
 
-            int getItemMaxHealth (const MWWorld::ConstPtr& ptr) const override;
-            ///< Return item max health or throw an exception, if class does not have item health
-
-            bool hasItemHealth (const MWWorld::ConstPtr& ptr) const override { return true; }
-            ///< \return Item health data available? (default implementation: false)
+        bool hasItemHealth(const MWWorld::ConstPtr& ptr) const override { return true; }
+        ///< \return Item health data available? (default implementation: false)
     };
 }
 
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index 85a014a1bf..899e0f14bd 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -2,15 +2,15 @@
 
 #include <MyGUI_TextIterator.h>
 
-#include <components/esm3/loadrepa.hpp>
 #include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadrepa.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwworld/ptr.hpp"
-#include "../mwworld/cellstore.hpp"
 #include "../mwworld/actionrepair.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/ptr.hpp"
 
 #include "../mwgui/tooltips.hpp"
 #include "../mwgui/ustring.hpp"
@@ -27,43 +27,43 @@ namespace MWClass
     {
     }
 
-    void Repair::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
+    void Repair::insertObjectRendering(
+        const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
-        if (!model.empty()) {
+        if (!model.empty())
+        {
             renderingInterface.getObjects().insertModel(ptr, model);
         }
     }
 
-    std::string Repair::getModel(const MWWorld::ConstPtr &ptr) const
+    std::string Repair::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Repair>(ptr);
     }
 
     std::string_view Repair::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Repair> *ref = ptr.get<ESM::Repair>();
+        const MWWorld::LiveCellRef<ESM::Repair>* ref = ptr.get<ESM::Repair>();
         const std::string& name = ref->mBase->mName;
 
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::unique_ptr<MWWorld::Action> Repair::activate (const MWWorld::Ptr& ptr,
-        const MWWorld::Ptr& actor) const
+    std::unique_ptr<MWWorld::Action> Repair::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
     {
         return defaultItemActivate(ptr, actor);
     }
 
     std::string_view Repair::getScript(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Repair> *ref =
-            ptr.get<ESM::Repair>();
+        const MWWorld::LiveCellRef<ESM::Repair>* ref = ptr.get<ESM::Repair>();
 
         return ref->mBase->mScript;
     }
 
-    int Repair::getValue (const MWWorld::ConstPtr& ptr) const
+    int Repair::getValue(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Repair> *ref = ptr.get<ESM::Repair>();
+        const MWWorld::LiveCellRef<ESM::Repair>* ref = ptr.get<ESM::Repair>();
 
         return ref->mBase->mData.mValue;
     }
@@ -80,30 +80,31 @@ namespace MWClass
 
     const std::string& Repair::getInventoryIcon(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Repair> *ref = ptr.get<ESM::Repair>();
+        const MWWorld::LiveCellRef<ESM::Repair>* ref = ptr.get<ESM::Repair>();
 
         return ref->mBase->mIcon;
     }
 
-    bool Repair::hasItemHealth (const MWWorld::ConstPtr& ptr) const
+    bool Repair::hasItemHealth(const MWWorld::ConstPtr& ptr) const
     {
         return true;
     }
 
-    int Repair::getItemMaxHealth (const MWWorld::ConstPtr& ptr) const
+    int Repair::getItemMaxHealth(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Repair> *ref = ptr.get<ESM::Repair>();
+        const MWWorld::LiveCellRef<ESM::Repair>* ref = ptr.get<ESM::Repair>();
 
         return ref->mBase->mData.mUses;
     }
 
-    MWGui::ToolTipInfo Repair::getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const
+    MWGui::ToolTipInfo Repair::getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const
     {
-        const MWWorld::LiveCellRef<ESM::Repair> *ref = ptr.get<ESM::Repair>();
+        const MWWorld::LiveCellRef<ESM::Repair>* ref = ptr.get<ESM::Repair>();
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption
+            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
         info.icon = ref->mBase->mIcon;
 
         std::string text;
@@ -115,7 +116,8 @@ namespace MWClass
         text += MWGui::ToolTips::getWeightString(ref->mBase->mData.mWeight, "#{sWeight}");
         text += MWGui::ToolTips::getValueString(ref->mBase->mData.mValue, "#{sValue}");
 
-        if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
+        if (MWBase::Environment::get().getWindowManager()->getFullHelp())
+        {
             text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
             text += MWGui::ToolTips::getMiscString(ref->mBase->mScript, "Script");
         }
@@ -125,26 +127,26 @@ namespace MWClass
         return info;
     }
 
-    MWWorld::Ptr Repair::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
+    MWWorld::Ptr Repair::copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const
     {
-        const MWWorld::LiveCellRef<ESM::Repair> *ref = ptr.get<ESM::Repair>();
+        const MWWorld::LiveCellRef<ESM::Repair>* ref = ptr.get<ESM::Repair>();
 
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
 
-    std::unique_ptr<MWWorld::Action> Repair::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Repair::use(const MWWorld::Ptr& ptr, bool force) const
     {
         return std::make_unique<MWWorld::ActionRepair>(ptr, force);
     }
 
-    bool Repair::canSell (const MWWorld::ConstPtr& item, int npcServices) const
+    bool Repair::canSell(const MWWorld::ConstPtr& item, int npcServices) const
     {
         return (npcServices & ESM::NPC::RepairItem) != 0;
     }
 
-    float Repair::getWeight(const MWWorld::ConstPtr &ptr) const
+    float Repair::getWeight(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Repair> *ref = ptr.get<ESM::Repair>();
+        const MWWorld::LiveCellRef<ESM::Repair>* ref = ptr.get<ESM::Repair>();
         return ref->mBase->mData.mWeight;
     }
 }
diff --git a/apps/openmw/mwclass/repair.hpp b/apps/openmw/mwclass/repair.hpp
index 6f84ecd854..02a69fdd0f 100644
--- a/apps/openmw/mwclass/repair.hpp
+++ b/apps/openmw/mwclass/repair.hpp
@@ -7,58 +7,57 @@ namespace MWClass
 {
     class Repair : public MWWorld::RegisteredClass<Repair>
     {
-            friend MWWorld::RegisteredClass<Repair>;
+        friend MWWorld::RegisteredClass<Repair>;
 
-            Repair();
+        Repair();
 
-            MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
+        MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const override;
 
-        public:
+    public:
+        void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
+            MWRender::RenderingInterface& renderingInterface) const override;
+        ///< Add reference into a cell for rendering
 
-            void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
-            ///< Add reference into a cell for rendering
+        std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return name or ID; can return an empty string.
 
-            std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
-            ///< \return name or ID; can return an empty string.
+        std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
+        ///< Generate action for activation
 
-            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
-                const MWWorld::Ptr& actor) const override;
-            ///< Generate action for activation
+        MWGui::ToolTipInfo getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const override;
+        ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
-            MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const override;
-            ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
+        std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of the script attached to ptr
 
-            std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of the script attached to ptr
+        int getValue(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            int getValue (const MWWorld::ConstPtr& ptr) const override;
-            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+        std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the pick up sound Id
 
-            std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the pick up sound Id
+        std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the put down sound Id
 
-            std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the put down sound Id
+        const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of inventory icon.
 
-            const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of inventory icon.
+        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
 
-            std::string getModel(const MWWorld::ConstPtr &ptr) const override;
+        std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
+        ///< Generate action for using via inventory menu (default implementation: return a
+        /// null action).
 
-            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
-            ///< Generate action for using via inventory menu (default implementation: return a
-            /// null action).
+        bool hasItemHealth(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return Item health data available? (default implementation: false)
 
-            bool hasItemHealth (const MWWorld::ConstPtr& ptr) const override;
-            ///< \return Item health data available? (default implementation: false)
+        int getItemMaxHealth(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return item max health or throw an exception, if class does not have item health
+        /// (default implementation: throw an exception)
 
-            int getItemMaxHealth (const MWWorld::ConstPtr& ptr) const override;
-            ///< Return item max health or throw an exception, if class does not have item health
-            /// (default implementation: throw an exception)
+        float getWeight(const MWWorld::ConstPtr& ptr) const override;
 
-            float getWeight (const MWWorld::ConstPtr& ptr) const override;
-
-            bool canSell (const MWWorld::ConstPtr& item, int npcServices) const override;
+        bool canSell(const MWWorld::ConstPtr& item, int npcServices) const override;
     };
 }
 
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index 1d1e45d7f7..c54e1088d3 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -3,9 +3,9 @@
 #include <components/esm3/loadstat.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 
-#include "../mwworld/ptr.hpp"
 #include "../mwphysics/physicssystem.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/ptr.hpp"
 
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
@@ -20,7 +20,8 @@ namespace MWClass
     {
     }
 
-    void Static::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
+    void Static::insertObjectRendering(
+        const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
         if (!model.empty())
         {
@@ -29,17 +30,19 @@ namespace MWClass
         }
     }
 
-    void Static::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
+    void Static::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+        MWPhysics::PhysicsSystem& physics) const
     {
         insertObjectPhysics(ptr, model, rotation, physics);
     }
 
-    void Static::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
+    void Static::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+        MWPhysics::PhysicsSystem& physics) const
     {
         physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World);
     }
 
-    std::string Static::getModel(const MWWorld::ConstPtr &ptr) const
+    std::string Static::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Static>(ptr);
     }
@@ -54,9 +57,9 @@ namespace MWClass
         return false;
     }
 
-    MWWorld::Ptr Static::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
+    MWWorld::Ptr Static::copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const
     {
-        const MWWorld::LiveCellRef<ESM::Static> *ref = ptr.get<ESM::Static>();
+        const MWWorld::LiveCellRef<ESM::Static>* ref = ptr.get<ESM::Static>();
 
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
diff --git a/apps/openmw/mwclass/static.hpp b/apps/openmw/mwclass/static.hpp
index 88cf982d1c..c6b2c3e6f9 100644
--- a/apps/openmw/mwclass/static.hpp
+++ b/apps/openmw/mwclass/static.hpp
@@ -7,27 +7,29 @@ namespace MWClass
 {
     class Static : public MWWorld::RegisteredClass<Static>
     {
-            friend MWWorld::RegisteredClass<Static>;
+        friend MWWorld::RegisteredClass<Static>;
 
-            Static();
+        Static();
 
-            MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
+        MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const override;
 
-        public:
+    public:
+        void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
+            MWRender::RenderingInterface& renderingInterface) const override;
+        ///< Add reference into a cell for rendering
 
-            void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
-            ///< Add reference into a cell for rendering
+        void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+            MWPhysics::PhysicsSystem& physics) const override;
+        void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+            MWPhysics::PhysicsSystem& physics) const override;
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const override;
-            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const override;
+        std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return name or ID; can return an empty string.
 
-            std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
-            ///< \return name or ID; can return an empty string.
+        bool hasToolTip(const MWWorld::ConstPtr& ptr) const override;
+        ///< @return true if this object has a tooltip when focused (default implementation: true)
 
-            bool hasToolTip (const MWWorld::ConstPtr& ptr) const override;
-            ///< @return true if this object has a tooltip when focused (default implementation: true)
-
-            std::string getModel(const MWWorld::ConstPtr &ptr) const override;
+        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
     };
 }
 
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 3e58f68e7e..9c730953bc 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -2,21 +2,21 @@
 
 #include <MyGUI_TextIterator.h>
 
-#include <components/esm3/loadweap.hpp>
 #include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadweap.hpp>
 #include <components/misc/constants.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/ptr.hpp"
 #include "../mwworld/actionequip.hpp"
-#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/inventorystore.hpp"
+#include "../mwworld/ptr.hpp"
 
 #include "../mwmechanics/weapontype.hpp"
 
@@ -35,58 +35,58 @@ namespace MWClass
     {
     }
 
-    void Weapon::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
+    void Weapon::insertObjectRendering(
+        const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
-        if (!model.empty()) {
+        if (!model.empty())
+        {
             renderingInterface.getObjects().insertModel(ptr, model);
         }
     }
 
-    std::string Weapon::getModel(const MWWorld::ConstPtr &ptr) const
+    std::string Weapon::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Weapon>(ptr);
     }
 
     std::string_view Weapon::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
+        const MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
         const std::string& name = ref->mBase->mName;
 
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::unique_ptr<MWWorld::Action> Weapon::activate (const MWWorld::Ptr& ptr,
-        const MWWorld::Ptr& actor) const
+    std::unique_ptr<MWWorld::Action> Weapon::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
     {
         return defaultItemActivate(ptr, actor);
     }
 
-    bool Weapon::hasItemHealth (const MWWorld::ConstPtr& ptr) const
+    bool Weapon::hasItemHealth(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
+        const MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
         int type = ref->mBase->mData.mType;
 
         return MWMechanics::getWeaponType(type)->mFlags & ESM::WeaponType::HasHealth;
     }
 
-    int Weapon::getItemMaxHealth (const MWWorld::ConstPtr& ptr) const
+    int Weapon::getItemMaxHealth(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
+        const MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
 
         return ref->mBase->mData.mHealth;
     }
 
     std::string_view Weapon::getScript(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Weapon> *ref =
-            ptr.get<ESM::Weapon>();
+        const MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
 
         return ref->mBase->mScript;
     }
 
-    std::pair<std::vector<int>, bool> Weapon::getEquipmentSlots (const MWWorld::ConstPtr& ptr) const
+    std::pair<std::vector<int>, bool> Weapon::getEquipmentSlots(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
+        const MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
         ESM::WeaponType::Class weapClass = MWMechanics::getWeaponType(ref->mBase->mData.mType)->mWeaponClass;
 
         std::vector<int> slots_;
@@ -94,64 +94,65 @@ namespace MWClass
 
         if (weapClass == ESM::WeaponType::Ammo)
         {
-            slots_.push_back (int (MWWorld::InventoryStore::Slot_Ammunition));
+            slots_.push_back(int(MWWorld::InventoryStore::Slot_Ammunition));
             stack = true;
         }
         else if (weapClass == ESM::WeaponType::Thrown)
         {
-            slots_.push_back (int (MWWorld::InventoryStore::Slot_CarriedRight));
+            slots_.push_back(int(MWWorld::InventoryStore::Slot_CarriedRight));
             stack = true;
         }
         else
-            slots_.push_back (int (MWWorld::InventoryStore::Slot_CarriedRight));
+            slots_.push_back(int(MWWorld::InventoryStore::Slot_CarriedRight));
 
-        return std::make_pair (slots_, stack);
+        return std::make_pair(slots_, stack);
     }
 
-    int Weapon::getEquipmentSkill (const MWWorld::ConstPtr& ptr) const
+    int Weapon::getEquipmentSkill(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
+        const MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
         int type = ref->mBase->mData.mType;
 
         return MWMechanics::getWeaponType(type)->mSkill;
     }
 
-    int Weapon::getValue (const MWWorld::ConstPtr& ptr) const
+    int Weapon::getValue(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
+        const MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
 
         return ref->mBase->mData.mValue;
     }
 
     std::string_view Weapon::getUpSoundId(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
+        const MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
         int type = ref->mBase->mData.mType;
         return MWMechanics::getWeaponType(type)->mSoundIdUp;
     }
 
     std::string_view Weapon::getDownSoundId(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
+        const MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
         int type = ref->mBase->mData.mType;
         return MWMechanics::getWeaponType(type)->mSoundIdDown;
     }
 
     const std::string& Weapon::getInventoryIcon(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
+        const MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
 
         return ref->mBase->mIcon;
     }
 
-    MWGui::ToolTipInfo Weapon::getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const
+    MWGui::ToolTipInfo Weapon::getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const
     {
-        const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
+        const MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
         const ESM::WeaponType* weaponType = MWMechanics::getWeaponType(ref->mBase->mData.mType);
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption
+            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
         info.icon = ref->mBase->mIcon;
 
         const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
@@ -159,7 +160,8 @@ namespace MWClass
         std::string text;
 
         // weapon type & damage
-        if (weaponType->mWeaponClass != ESM::WeaponType::Ammo || Settings::Manager::getBool("show projectile damage", "Game"))
+        if (weaponType->mWeaponClass != ESM::WeaponType::Ammo
+            || Settings::Manager::getBool("show projectile damage", "Game"))
         {
             text += "\n#{sType} ";
 
@@ -183,30 +185,25 @@ namespace MWClass
             {
                 // Thrown weapons have 2x real damage applied
                 // as they're both the weapon and the ammo
-                text += "\n#{sAttack}: "
-                    + MWGui::ToolTips::toString(static_cast<int>(ref->mBase->mData.mChop[0] * 2))
+                text += "\n#{sAttack}: " + MWGui::ToolTips::toString(static_cast<int>(ref->mBase->mData.mChop[0] * 2))
                     + " - " + MWGui::ToolTips::toString(static_cast<int>(ref->mBase->mData.mChop[1] * 2));
             }
             else if (weaponType->mWeaponClass == ESM::WeaponType::Melee)
             {
                 // Chop
-                text += "\n#{sChop}: "
-                    + MWGui::ToolTips::toString(static_cast<int>(ref->mBase->mData.mChop[0]))
-                    + " - " + MWGui::ToolTips::toString(static_cast<int>(ref->mBase->mData.mChop[1]));
+                text += "\n#{sChop}: " + MWGui::ToolTips::toString(static_cast<int>(ref->mBase->mData.mChop[0])) + " - "
+                    + MWGui::ToolTips::toString(static_cast<int>(ref->mBase->mData.mChop[1]));
                 // Slash
-                text += "\n#{sSlash}: "
-                    + MWGui::ToolTips::toString(static_cast<int>(ref->mBase->mData.mSlash[0]))
+                text += "\n#{sSlash}: " + MWGui::ToolTips::toString(static_cast<int>(ref->mBase->mData.mSlash[0]))
                     + " - " + MWGui::ToolTips::toString(static_cast<int>(ref->mBase->mData.mSlash[1]));
                 // Thrust
-                text += "\n#{sThrust}: "
-                    + MWGui::ToolTips::toString(static_cast<int>(ref->mBase->mData.mThrust[0]))
+                text += "\n#{sThrust}: " + MWGui::ToolTips::toString(static_cast<int>(ref->mBase->mData.mThrust[0]))
                     + " - " + MWGui::ToolTips::toString(static_cast<int>(ref->mBase->mData.mThrust[1]));
             }
             else
             {
                 // marksman
-                text += "\n#{sAttack}: "
-                    + MWGui::ToolTips::toString(static_cast<int>(ref->mBase->mData.mChop[0]))
+                text += "\n#{sAttack}: " + MWGui::ToolTips::toString(static_cast<int>(ref->mBase->mData.mChop[0]))
                     + " - " + MWGui::ToolTips::toString(static_cast<int>(ref->mBase->mData.mChop[1]));
             }
         }
@@ -215,7 +212,7 @@ namespace MWClass
         {
             int remainingHealth = getItemHealth(ptr);
             text += "\n#{sCondition}: " + MWGui::ToolTips::toString(remainingHealth) + "/"
-                    + MWGui::ToolTips::toString(ref->mBase->mData.mHealth);
+                + MWGui::ToolTips::toString(ref->mBase->mData.mHealth);
         }
 
         const bool verbose = Settings::Manager::getBool("show melee info", "Game");
@@ -223,7 +220,8 @@ namespace MWClass
         if (weaponType->mWeaponClass == ESM::WeaponType::Melee && verbose)
         {
             // display value in feet
-            const float combatDistance = store.get<ESM::GameSetting>().find("fCombatDistance")->mValue.getFloat() * ref->mBase->mData.mReach;
+            const float combatDistance
+                = store.get<ESM::GameSetting>().find("fCombatDistance")->mValue.getFloat() * ref->mBase->mData.mReach;
             text += MWGui::ToolTips::getWeightString(combatDistance / Constants::UnitsPerFoot, "#{sRange}");
             text += " #{sFeet}";
         }
@@ -242,7 +240,8 @@ namespace MWClass
         if (!info.enchant.empty())
             info.remainingEnchantCharge = static_cast<int>(ptr.getCellRef().getEnchantmentCharge());
 
-        if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
+        if (MWBase::Environment::get().getWindowManager()->getFullHelp())
+        {
             text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
             text += MWGui::ToolTips::getMiscString(ref->mBase->mScript, "Script");
         }
@@ -254,50 +253,51 @@ namespace MWClass
 
     std::string_view Weapon::getEnchantment(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
+        const MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
 
         return ref->mBase->mEnchant;
     }
 
-    const std::string& Weapon::applyEnchantment(const MWWorld::ConstPtr& ptr, const std::string& enchId, int enchCharge, const std::string& newName) const
+    const std::string& Weapon::applyEnchantment(
+        const MWWorld::ConstPtr& ptr, const std::string& enchId, int enchCharge, const std::string& newName) const
     {
-        const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
+        const MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
 
         ESM::Weapon newItem = *ref->mBase;
         newItem.mId.clear();
-        newItem.mName=newName;
-        newItem.mData.mEnchant=enchCharge;
-        newItem.mEnchant=enchId;
+        newItem.mName = newName;
+        newItem.mData.mEnchant = enchCharge;
+        newItem.mEnchant = enchId;
         newItem.mData.mFlags |= ESM::Weapon::Magical;
-        const ESM::Weapon *record = MWBase::Environment::get().getWorld()->createRecord (newItem);
+        const ESM::Weapon* record = MWBase::Environment::get().getWorld()->createRecord(newItem);
         return record->mId;
     }
 
     std::pair<int, std::string_view> Weapon::canBeEquipped(const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& npc) const
     {
         if (hasItemHealth(ptr) && getItemHealth(ptr) == 0)
-            return {0, "#{sInventoryMessage1}"};
+            return { 0, "#{sInventoryMessage1}" };
 
         // Do not allow equip weapons from inventory during attack
         if (MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(npc)
             && MWBase::Environment::get().getWindowManager()->isGuiMode())
-            return {0, "#{sCantEquipWeapWarning}"};
+            return { 0, "#{sCantEquipWeapWarning}" };
 
         std::pair<std::vector<int>, bool> slots_ = getEquipmentSlots(ptr);
 
         if (slots_.first.empty())
-            return {0, {}};
+            return { 0, {} };
 
         int type = ptr.get<ESM::Weapon>()->mBase->mData.mType;
-        if(MWMechanics::getWeaponType(type)->mFlags & ESM::WeaponType::TwoHanded)
+        if (MWMechanics::getWeaponType(type)->mFlags & ESM::WeaponType::TwoHanded)
         {
-            return {2, {}};
+            return { 2, {} };
         }
 
-        return {1, {}};
+        return { 1, {} };
     }
 
-    std::unique_ptr<MWWorld::Action> Weapon::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Weapon::use(const MWWorld::Ptr& ptr, bool force) const
     {
         std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::ActionEquip>(ptr, force);
 
@@ -306,29 +306,29 @@ namespace MWClass
         return action;
     }
 
-    MWWorld::Ptr Weapon::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
+    MWWorld::Ptr Weapon::copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const
     {
-        const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
+        const MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
 
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
 
-    int Weapon::getEnchantmentPoints (const MWWorld::ConstPtr& ptr) const
+    int Weapon::getEnchantmentPoints(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
+        const MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
 
         return ref->mBase->mData.mEnchant;
     }
 
-    bool Weapon::canSell (const MWWorld::ConstPtr& item, int npcServices) const
+    bool Weapon::canSell(const MWWorld::ConstPtr& item, int npcServices) const
     {
         return (npcServices & ESM::NPC::Weapon)
-                || ((npcServices & ESM::NPC::MagicItems) && !getEnchantment(item).empty());
+            || ((npcServices & ESM::NPC::MagicItems) && !getEnchantment(item).empty());
     }
 
-    float Weapon::getWeight(const MWWorld::ConstPtr &ptr) const
+    float Weapon::getWeight(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
+        const MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
         return ref->mBase->mData.mWeight;
     }
 }
diff --git a/apps/openmw/mwclass/weapon.hpp b/apps/openmw/mwclass/weapon.hpp
index ec0d63a65e..9f07f5f6dd 100644
--- a/apps/openmw/mwclass/weapon.hpp
+++ b/apps/openmw/mwclass/weapon.hpp
@@ -7,76 +7,78 @@ namespace MWClass
 {
     class Weapon : public MWWorld::RegisteredClass<Weapon>
     {
-            friend MWWorld::RegisteredClass<Weapon>;
+        friend MWWorld::RegisteredClass<Weapon>;
 
-            MWWorld::Ptr
-            copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
+        MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const override;
 
-        public:
-            Weapon();
+    public:
+        Weapon();
 
-            void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
-            ///< Add reference into a cell for rendering
+        void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
+            MWRender::RenderingInterface& renderingInterface) const override;
+        ///< Add reference into a cell for rendering
 
-            std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
-            ///< \return name or ID; can return an empty string.
+        std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return name or ID; can return an empty string.
 
-            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
-                const MWWorld::Ptr& actor) const override;
-            ///< Generate action for activation
+        std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
+        ///< Generate action for activation
 
-            MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const override;
-            ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
+        MWGui::ToolTipInfo getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const override;
+        ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
-            bool hasItemHealth (const MWWorld::ConstPtr& ptr) const override;
-            ///< \return Item health data available?
+        bool hasItemHealth(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return Item health data available?
 
-            int getItemMaxHealth (const MWWorld::ConstPtr& ptr) const override;
-            ///< Return item max health or throw an exception, if class does not have item health
+        int getItemMaxHealth(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return item max health or throw an exception, if class does not have item health
 
-            std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of the script attached to ptr
+        std::string_view getScript(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of the script attached to ptr
 
-            std::pair<std::vector<int>, bool> getEquipmentSlots (const MWWorld::ConstPtr& ptr) const override;
-            ///< \return first: Return IDs of the slot this object can be equipped in; second: can object
-            /// stay stacked when equipped?
+        std::pair<std::vector<int>, bool> getEquipmentSlots(const MWWorld::ConstPtr& ptr) const override;
+        ///< \return first: Return IDs of the slot this object can be equipped in; second: can object
+        /// stay stacked when equipped?
 
-            int getEquipmentSkill (const MWWorld::ConstPtr& ptr) const override;
-            /// Return the index of the skill this item corresponds to when equipped or -1, if there is
-            /// no such skill.
+        int getEquipmentSkill(const MWWorld::ConstPtr& ptr) const override;
+        /// Return the index of the skill this item corresponds to when equipped or -1, if there is
+        /// no such skill.
 
-            int getValue (const MWWorld::ConstPtr& ptr) const override;
-            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+        int getValue(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the pick up sound Id
+        std::string_view getUpSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the pick up sound Id
 
-            std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return the put down sound Id
+        std::string_view getDownSoundId(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return the put down sound Id
 
-            const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return name of inventory icon.
+        const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
+        ///< Return name of inventory icon.
 
-            std::string_view getEnchantment(const MWWorld::ConstPtr& ptr) const override;
-            ///< @return the enchantment ID if the object is enchanted, otherwise an empty string
+        std::string_view getEnchantment(const MWWorld::ConstPtr& ptr) const override;
+        ///< @return the enchantment ID if the object is enchanted, otherwise an empty string
 
-            const std::string& applyEnchantment(const MWWorld::ConstPtr& ptr, const std::string& enchId, int enchCharge, const std::string& newName) const override;
-            ///< Creates a new record using \a ptr as template, with the given name and the given enchantment applied to it.
+        const std::string& applyEnchantment(const MWWorld::ConstPtr& ptr, const std::string& enchId, int enchCharge,
+            const std::string& newName) const override;
+        ///< Creates a new record using \a ptr as template, with the given name and the given enchantment applied to it.
 
-            std::pair<int, std::string_view> canBeEquipped(const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& npc) const override;
-            ///< Return 0 if player cannot equip item. 1 if can equip. 2 if it's twohanded weapon. 3 if twohanded weapon conflicts with that.
-            ///  Second item in the pair specifies the error message
+        std::pair<int, std::string_view> canBeEquipped(
+            const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& npc) const override;
+        ///< Return 0 if player cannot equip item. 1 if can equip. 2 if it's twohanded weapon. 3 if twohanded weapon
+        ///< conflicts with that.
+        ///  Second item in the pair specifies the error message
 
-            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
-            ///< Generate action for using via inventory menu
+        std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
+        ///< Generate action for using via inventory menu
 
-            std::string getModel(const MWWorld::ConstPtr &ptr) const override;
+        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
 
-            bool canSell (const MWWorld::ConstPtr& item, int npcServices) const override;
+        bool canSell(const MWWorld::ConstPtr& item, int npcServices) const override;
 
-            float getWeight (const MWWorld::ConstPtr& ptr) const override;
+        float getWeight(const MWWorld::ConstPtr& ptr) const override;
 
-            int getEnchantmentPoints (const MWWorld::ConstPtr& ptr) const override;
+        int getEnchantmentPoints(const MWWorld::ConstPtr& ptr) const override;
     };
 }
 
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index 1f076e6735..690f05d51f 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -6,62 +6,63 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm3/loaddial.hpp>
-#include <components/esm3/loadinfo.hpp>
 #include <components/esm3/dialoguestate.hpp>
 #include <components/esm3/esmwriter.hpp>
+#include <components/esm3/loaddial.hpp>
 #include <components/esm3/loadfact.hpp>
+#include <components/esm3/loadinfo.hpp>
 
-#include <components/compiler/exception.hpp>
 #include <components/compiler/errorhandler.hpp>
-#include <components/compiler/scanner.hpp>
+#include <components/compiler/exception.hpp>
 #include <components/compiler/locals.hpp>
 #include <components/compiler/output.hpp>
+#include <components/compiler/scanner.hpp>
 #include <components/compiler/scriptparser.hpp>
 
-#include <components/interpreter/interpreter.hpp>
 #include <components/interpreter/defines.hpp>
+#include <components/interpreter/interpreter.hpp>
 
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/journal.hpp"
-#include "../mwbase/scriptmanager.hpp"
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/scriptmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/esmstore.hpp"
 
 #include "../mwscript/compilercontext.hpp"
-#include "../mwscript/interpretercontext.hpp"
 #include "../mwscript/extensions.hpp"
+#include "../mwscript/interpretercontext.hpp"
 
+#include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
-#include "../mwmechanics/actorutil.hpp"
 
 #include "filter.hpp"
 #include "hypertextparser.hpp"
 
 namespace MWDialogue
 {
-    DialogueManager::DialogueManager (const Compiler::Extensions& extensions, Translation::Storage& translationDataStorage) :
-      mTranslationDataStorage(translationDataStorage)
-      , mCompilerContext (MWScript::CompilerContext::Type_Dialogue)
-      , mErrorHandler()
-      , mTalkedTo(false)
-      , mOriginalDisposition(0)
-      , mCurrentDisposition(0)
-      , mPermanentDispositionChange(0)
+    DialogueManager::DialogueManager(
+        const Compiler::Extensions& extensions, Translation::Storage& translationDataStorage)
+        : mTranslationDataStorage(translationDataStorage)
+        , mCompilerContext(MWScript::CompilerContext::Type_Dialogue)
+        , mErrorHandler()
+        , mTalkedTo(false)
+        , mOriginalDisposition(0)
+        , mCurrentDisposition(0)
+        , mPermanentDispositionChange(0)
     {
         mChoice = -1;
         mIsInChoice = false;
         mGoodbye = false;
-        mCompilerContext.setExtensions (&extensions);
+        mCompilerContext.setExtensions(&extensions);
     }
 
     void DialogueManager::clear()
@@ -75,10 +76,10 @@ namespace MWDialogue
 
     void DialogueManager::addTopic(std::string_view topic)
     {
-        mKnownTopics.insert( Misc::StringUtils::lowerCase(topic) );
+        mKnownTopics.insert(Misc::StringUtils::lowerCase(topic));
     }
 
-    std::vector<std::string> DialogueManager::parseTopicIdsFromText (const std::string& text)
+    std::vector<std::string> DialogueManager::parseTopicIdsFromText(const std::string& text)
     {
         std::vector<std::string> topicIdList;
 
@@ -92,7 +93,7 @@ namespace MWDialogue
             {
                 // calculation of standard form for all hyperlinks
                 size_t asterisk_count = HyperTextParser::removePseudoAsterisks(topicId);
-                for(; asterisk_count > 0; --asterisk_count)
+                for (; asterisk_count > 0; --asterisk_count)
                     topicId.append("*");
 
                 topicId = mTranslationDataStorage.topicStandardForm(topicId);
@@ -104,24 +105,24 @@ namespace MWDialogue
         return topicIdList;
     }
 
-    void DialogueManager::addTopicsFromText (const std::string& text)
+    void DialogueManager::addTopicsFromText(const std::string& text)
     {
         updateActorKnownTopics();
 
         for (const auto& topicId : parseTopicIdsFromText(text))
         {
-            if (mActorKnownTopics.count( topicId ))
-                mKnownTopics.insert( topicId );
+            if (mActorKnownTopics.count(topicId))
+                mKnownTopics.insert(topicId);
         }
     }
 
     void DialogueManager::updateOriginalDisposition()
     {
-        if(mActor.getClass().isNpc())
+        if (mActor.getClass().isNpc())
         {
             const auto& stats = mActor.getClass().getNpcStats(mActor);
             // Disposition changed by script; discard our preconceived notions
-            if(stats.getBaseDisposition() != mCurrentDisposition)
+            if (stats.getBaseDisposition() != mCurrentDisposition)
             {
                 mCurrentDisposition = stats.getBaseDisposition();
                 mOriginalDisposition = mCurrentDisposition;
@@ -129,7 +130,7 @@ namespace MWDialogue
         }
     }
 
-    bool DialogueManager::startDialogue (const MWWorld::Ptr& actor, ResponseCallback* callback)
+    bool DialogueManager::startDialogue(const MWWorld::Ptr& actor, ResponseCallback* callback)
     {
         updateGlobals();
 
@@ -147,23 +148,23 @@ namespace MWDialogue
 
         mActor = actor;
 
-        MWMechanics::CreatureStats& creatureStats = actor.getClass().getCreatureStats (actor);
+        MWMechanics::CreatureStats& creatureStats = actor.getClass().getCreatureStats(actor);
         mTalkedTo = creatureStats.hasTalkedToPlayer();
 
         mActorKnownTopics.clear();
 
-        //greeting
-        const MWWorld::Store<ESM::Dialogue> &dialogs =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
+        // greeting
+        const MWWorld::Store<ESM::Dialogue>& dialogs
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
 
-        Filter filter (actor, mChoice, mTalkedTo);
+        Filter filter(actor, mChoice, mTalkedTo);
 
         for (MWWorld::Store<ESM::Dialogue>::iterator it = dialogs.begin(); it != dialogs.end(); ++it)
         {
-            if(it->mType == ESM::Dialogue::Greeting)
+            if (it->mType == ESM::Dialogue::Greeting)
             {
                 // Search a response (we do not accept a fallback to "Info refusal" here)
-                if (const ESM::DialInfo *info = filter.search (*it, false))
+                if (const ESM::DialInfo* info = filter.search(*it, false))
                 {
                     creatureStats.talkedToPlayer();
 
@@ -172,12 +173,12 @@ namespace MWDialogue
                         // TODO play sound
                     }
 
-                    MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
+                    MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(), mActor);
                     callback->addResponse("", Interpreter::fixDefinesDialog(info->mResponse, interpreterContext));
-                    executeScript (info->mResultScript, mActor);
+                    executeScript(info->mResultScript, mActor);
                     mLastTopic = it->mId;
 
-                    addTopicsFromText (info->mResponse);
+                    addTopicsFromText(info->mResponse);
 
                     return true;
                 }
@@ -186,7 +187,8 @@ namespace MWDialogue
         return false;
     }
 
-    bool DialogueManager::compile (const std::string& cmd, std::vector<Interpreter::Type_Code>& code, const MWWorld::Ptr& actor)
+    bool DialogueManager::compile(
+        const std::string& cmd, std::vector<Interpreter::Type_Code>& code, const MWWorld::Ptr& actor)
     {
         bool success = true;
 
@@ -196,9 +198,9 @@ namespace MWDialogue
 
             mErrorHandler.setContext("[dialogue script]");
 
-            std::istringstream input (cmd + "\n");
+            std::istringstream input(cmd + "\n");
 
-            Compiler::Scanner scanner (mErrorHandler, input, mCompilerContext.getExtensions());
+            Compiler::Scanner scanner(mErrorHandler, input, mCompilerContext.getExtensions());
 
             Compiler::Locals locals;
 
@@ -207,18 +209,18 @@ namespace MWDialogue
             if (!actorScript.empty())
             {
                 // grab local variables from actor's script, if available.
-                locals = MWBase::Environment::get().getScriptManager()->getLocals (actorScript);
+                locals = MWBase::Environment::get().getScriptManager()->getLocals(actorScript);
             }
 
-            Compiler::ScriptParser parser(mErrorHandler,mCompilerContext, locals, false);
+            Compiler::ScriptParser parser(mErrorHandler, mCompilerContext, locals, false);
 
-            scanner.scan (parser);
+            scanner.scan(parser);
 
             if (!mErrorHandler.isGood())
                 success = false;
 
             if (success)
-                parser.getCode (code);
+                parser.getCode(code);
         }
         catch (const Compiler::SourceException& /* error */)
         {
@@ -227,7 +229,7 @@ namespace MWDialogue
         }
         catch (const std::exception& error)
         {
-            Log(Debug::Error) << std::string ("Dialogue error: An exception has been thrown: ") + error.what();
+            Log(Debug::Error) << std::string("Dialogue error: An exception has been thrown: ") + error.what();
             success = false;
         }
 
@@ -239,29 +241,29 @@ namespace MWDialogue
         return success;
     }
 
-    void DialogueManager::executeScript (const std::string& script, const MWWorld::Ptr& actor)
+    void DialogueManager::executeScript(const std::string& script, const MWWorld::Ptr& actor)
     {
         std::vector<Interpreter::Type_Code> code;
-        if(compile(script, code, actor))
+        if (compile(script, code, actor))
         {
             try
             {
                 MWScript::InterpreterContext interpreterContext(&actor.getRefData().getLocals(), actor);
                 Interpreter::Interpreter interpreter;
-                MWScript::installOpcodes (interpreter);
-                interpreter.run (code.data(), code.size(), interpreterContext);
+                MWScript::installOpcodes(interpreter);
+                interpreter.run(code.data(), code.size(), interpreterContext);
             }
             catch (const std::exception& error)
             {
-               Log(Debug::Error) << std::string ("Dialogue error: An exception has been thrown: ") + error.what();
+                Log(Debug::Error) << std::string("Dialogue error: An exception has been thrown: ") + error.what();
             }
         }
     }
 
-    bool DialogueManager::inJournal (const std::string& topicId, const std::string& infoId)
+    bool DialogueManager::inJournal(const std::string& topicId, const std::string& infoId)
     {
-        const MWDialogue::Topic *topicHistory = nullptr;
-        MWBase::Journal *journal = MWBase::Environment::get().getJournal();
+        const MWDialogue::Topic* topicHistory = nullptr;
+        MWBase::Journal* journal = MWBase::Environment::get().getJournal();
         for (auto it = journal->topicBegin(); it != journal->topicEnd(); ++it)
         {
             if (it->first == topicId)
@@ -274,7 +276,7 @@ namespace MWDialogue
         if (!topicHistory)
             return false;
 
-        for(const auto& topic : *topicHistory)
+        for (const auto& topic : *topicHistory)
         {
             if (topic.mInfoId == infoId)
                 return true;
@@ -282,52 +284,52 @@ namespace MWDialogue
         return false;
     }
 
-    void DialogueManager::executeTopic (const std::string& topic, ResponseCallback* callback)
+    void DialogueManager::executeTopic(const std::string& topic, ResponseCallback* callback)
     {
-        Filter filter (mActor, mChoice, mTalkedTo);
+        Filter filter(mActor, mChoice, mTalkedTo);
+
+        const MWWorld::Store<ESM::Dialogue>& dialogues
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
 
-        const MWWorld::Store<ESM::Dialogue> &dialogues =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
+        const ESM::Dialogue& dialogue = *dialogues.find(topic);
 
-        const ESM::Dialogue& dialogue = *dialogues.find (topic);
+        const ESM::DialInfo* info = mChoice == -1 && mActorKnownTopics.count(topic) ? mActorKnownTopics[topic].mInfo
+                                                                                    : filter.search(dialogue, true);
 
-        const ESM::DialInfo* info =
-            mChoice == -1 && mActorKnownTopics.count(topic) ?
-                mActorKnownTopics[topic].mInfo : filter.search(dialogue, true);
-        
         if (info)
         {
             std::string title;
-            if (dialogue.mType==ESM::Dialogue::Persuasion)
+            if (dialogue.mType == ESM::Dialogue::Persuasion)
             {
                 // Determine GMST from dialogue topic. GMSTs are:
                 // sAdmireSuccess, sAdmireFail, sIntimidateSuccess, sIntimidateFail,
                 // sTauntSuccess, sTauntFail, sBribeSuccess, sBribeFail
                 std::string modifiedTopic = "s" + topic;
 
-                modifiedTopic.erase (std::remove (modifiedTopic.begin(), modifiedTopic.end(), ' '), modifiedTopic.end());
+                modifiedTopic.erase(std::remove(modifiedTopic.begin(), modifiedTopic.end(), ' '), modifiedTopic.end());
 
-                const MWWorld::Store<ESM::GameSetting>& gmsts =
-                    MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+                const MWWorld::Store<ESM::GameSetting>& gmsts
+                    = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
-                title = gmsts.find (modifiedTopic)->mValue.getString();
+                title = gmsts.find(modifiedTopic)->mValue.getString();
             }
             else
                 title = topic;
 
-            MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
+            MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(), mActor);
             callback->addResponse(title, Interpreter::fixDefinesDialog(info->mResponse, interpreterContext));
 
             if (dialogue.mType == ESM::Dialogue::Topic)
             {
-                // Make sure the returned DialInfo is from the Dialogue we supplied. If could also be from the Info refusal group,
-                // in which case it should not be added to the journal.
+                // Make sure the returned DialInfo is from the Dialogue we supplied. If could also be from the Info
+                // refusal group, in which case it should not be added to the journal.
                 for (ESM::Dialogue::InfoContainer::const_iterator iter = dialogue.mInfo.begin();
-                    iter!=dialogue.mInfo.end(); ++iter)
+                     iter != dialogue.mInfo.end(); ++iter)
                 {
                     if (iter->mId == info->mId)
                     {
-                        MWBase::Environment::get().getJournal()->addTopic (Misc::StringUtils::lowerCase(topic), info->mId, mActor);
+                        MWBase::Environment::get().getJournal()->addTopic(
+                            Misc::StringUtils::lowerCase(topic), info->mId, mActor);
                         break;
                     }
                 }
@@ -335,13 +337,13 @@ namespace MWDialogue
 
             mLastTopic = topic;
 
-            executeScript (info->mResultScript, mActor);
+            executeScript(info->mResultScript, mActor);
 
-            addTopicsFromText (info->mResponse);
+            addTopicsFromText(info->mResponse);
         }
     }
 
-    const ESM::Dialogue *DialogueManager::searchDialogue(const std::string& id)
+    const ESM::Dialogue* DialogueManager::searchDialogue(const std::string& id)
     {
         return MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().search(id);
     }
@@ -359,7 +361,7 @@ namespace MWDialogue
 
         const auto& dialogs = MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
 
-        Filter filter (mActor, -1, mTalkedTo);
+        Filter filter(mActor, -1, mTalkedTo);
 
         for (const auto& dialog : dialogs)
         {
@@ -371,7 +373,7 @@ namespace MWDialogue
                 if (answer != nullptr)
                 {
                     int topicFlags = 0;
-                    if(!inJournal(topicId, answer->mId))
+                    if (!inJournal(topicId, answer->mId))
                     {
                         // Does this dialogue contains some actor-specific answer?
                         if (Misc::StringUtils::ciEqual(answer->mActor, mActor.getCellRef().getRefId()))
@@ -379,9 +381,8 @@ namespace MWDialogue
                     }
                     else
                         topicFlags |= MWBase::DialogueManager::TopicType::Exhausted;
-                    mActorKnownTopics.insert (std::make_pair(dialog.mId, ActorKnownTopicInfo {topicFlags, answer}));
+                    mActorKnownTopics.insert(std::make_pair(dialog.mId, ActorKnownTopicInfo{ topicFlags, answer }));
                 }
-
             }
         }
 
@@ -392,13 +393,12 @@ namespace MWDialogue
             // If the topic is not marked as exhausted, we don't need to do anything about it.
             // If the topic will not be shown to the player, the flag actually does not matter.
 
-            if (!(topicInfo.mFlags & MWBase::DialogueManager::TopicType::Exhausted) ||
-                !mKnownTopics.count(dialogId))
+            if (!(topicInfo.mFlags & MWBase::DialogueManager::TopicType::Exhausted) || !mKnownTopics.count(dialogId))
                 continue;
 
             for (const auto& topicId : parseTopicIdsFromText(topicInfo.mInfo->mResponse))
             {
-                if (mActorKnownTopics.count( topicId ) && !mKnownTopics.count( topicId ))
+                if (mActorKnownTopics.count(topicId) && !mKnownTopics.count(topicId))
                 {
                     topicInfo.mFlags &= ~MWBase::DialogueManager::TopicType::Exhausted;
                     break;
@@ -415,7 +415,7 @@ namespace MWDialogue
 
         for (const auto& [topic, topicInfo] : mActorKnownTopics)
         {
-            //does the player know the topic?
+            // does the player know the topic?
             if (mKnownTopics.count(topic))
                 keywordList.push_back(topic);
         }
@@ -430,14 +430,14 @@ namespace MWDialogue
         return mActorKnownTopics[topicId].mFlags;
     }
 
-    void DialogueManager::keywordSelected (const std::string& keyword, ResponseCallback* callback)
+    void DialogueManager::keywordSelected(const std::string& keyword, ResponseCallback* callback)
     {
-        if(!mIsInChoice)
+        if (!mIsInChoice)
         {
             const ESM::Dialogue* dialogue = searchDialogue(keyword);
             if (dialogue && dialogue->mType == ESM::Dialogue::Topic)
             {
-                executeTopic (keyword, callback);
+                executeTopic(keyword, callback);
             }
         }
     }
@@ -454,7 +454,8 @@ namespace MWDialogue
         {
             updateOriginalDisposition();
             MWMechanics::NpcStats& npcStats = mActor.getClass().getNpcStats(mActor);
-            // Clamp permanent disposition change so that final disposition doesn't go below 0 (could happen with intimidate)
+            // Clamp permanent disposition change so that final disposition doesn't go below 0 (could happen with
+            // intimidate)
             npcStats.setBaseDisposition(0);
             int zero = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor, false);
             int disposition = std::clamp(mOriginalDisposition + mPermanentDispositionChange, -zero, 100 - zero);
@@ -466,45 +467,46 @@ namespace MWDialogue
         mCurrentDisposition = 0;
     }
 
-    void DialogueManager::questionAnswered (int answer, ResponseCallback* callback)
+    void DialogueManager::questionAnswered(int answer, ResponseCallback* callback)
     {
         mChoice = answer;
 
         const ESM::Dialogue* dialogue = searchDialogue(mLastTopic);
         if (dialogue)
         {
-            Filter filter (mActor, mChoice, mTalkedTo);
+            Filter filter(mActor, mChoice, mTalkedTo);
 
             if (dialogue->mType == ESM::Dialogue::Topic || dialogue->mType == ESM::Dialogue::Greeting)
             {
-                if (const ESM::DialInfo *info = filter.search (*dialogue, true))
+                if (const ESM::DialInfo* info = filter.search(*dialogue, true))
                 {
                     std::string text = info->mResponse;
-                    addTopicsFromText (text);
+                    addTopicsFromText(text);
 
                     mChoice = -1;
                     mIsInChoice = false;
                     mChoices.clear();
 
-                    MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
+                    MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(), mActor);
                     callback->addResponse("", Interpreter::fixDefinesDialog(text, interpreterContext));
 
                     if (dialogue->mType == ESM::Dialogue::Topic)
                     {
-                        // Make sure the returned DialInfo is from the Dialogue we supplied. If could also be from the Info refusal group,
-                        // in which case it should not be added to the journal
+                        // Make sure the returned DialInfo is from the Dialogue we supplied. If could also be from the
+                        // Info refusal group, in which case it should not be added to the journal
                         for (ESM::Dialogue::InfoContainer::const_iterator iter = dialogue->mInfo.begin();
-                            iter!=dialogue->mInfo.end(); ++iter)
+                             iter != dialogue->mInfo.end(); ++iter)
                         {
                             if (iter->mId == info->mId)
                             {
-                                MWBase::Environment::get().getJournal()->addTopic (Misc::StringUtils::lowerCase(mLastTopic), info->mId, mActor);
+                                MWBase::Environment::get().getJournal()->addTopic(
+                                    Misc::StringUtils::lowerCase(mLastTopic), info->mId, mActor);
                                 break;
                             }
                         }
                     }
 
-                    executeScript (info->mResultScript, mActor);
+                    executeScript(info->mResultScript, mActor);
                 }
                 else
                 {
@@ -524,7 +526,7 @@ namespace MWDialogue
         mChoices.emplace_back(text, choice);
     }
 
-    const std::vector<std::pair<std::string, int> >& DialogueManager::getChoices()
+    const std::vector<std::pair<std::string, int>>& DialogueManager::getChoices()
     {
         return mChoices;
     }
@@ -545,10 +547,9 @@ namespace MWDialogue
         bool success;
         int temp, perm;
         MWBase::Environment::get().getMechanicsManager()->getPersuasionDispositionChange(
-                    mActor, MWBase::MechanicsManager::PersuasionType(type),
-                    success, temp, perm);
+            mActor, MWBase::MechanicsManager::PersuasionType(type), success, temp, perm);
         updateOriginalDisposition();
-        if(temp > 0 && perm > 0 && mOriginalDisposition + perm + mPermanentDispositionChange < 0)
+        if (temp > 0 && perm > 0 && mOriginalDisposition + perm + mPermanentDispositionChange < 0)
             perm = -(mOriginalDisposition + mPermanentDispositionChange);
         mCurrentDisposition += temp;
         mActor.getClass().getNpcStats(mActor).setBaseDisposition(mCurrentDisposition);
@@ -559,7 +560,7 @@ namespace MWDialogue
 
         if (success)
         {
-            int gold=0;
+            int gold = 0;
             if (type == MWBase::MechanicsManager::PT_Bribe10)
                 gold = 10;
             else if (type == MWBase::MechanicsManager::PT_Bribe100)
@@ -582,16 +583,17 @@ namespace MWDialogue
             text = "Taunt";
         else if (type == MWBase::MechanicsManager::PT_Intimidate)
             text = "Intimidate";
-        else{
+        else
+        {
             text = "Bribe";
         }
 
-        executeTopic (text + (success ? " Success" : " Fail"), callback);
+        executeTopic(text + (success ? " Success" : " Fail"), callback);
     }
 
     void DialogueManager::applyBarterDispositionChange(int delta)
     {
-        if(mActor.getClass().isNpc())
+        if (mActor.getClass().isNpc())
         {
             updateOriginalDisposition();
             mCurrentDisposition += delta;
@@ -603,37 +605,38 @@ namespace MWDialogue
 
     bool DialogueManager::checkServiceRefused(ResponseCallback* callback, ServiceType service)
     {
-        Filter filter (mActor, service, mTalkedTo);
+        Filter filter(mActor, service, mTalkedTo);
 
-        const MWWorld::Store<ESM::Dialogue> &dialogues =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
+        const MWWorld::Store<ESM::Dialogue>& dialogues
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
 
-        const ESM::Dialogue& dialogue = *dialogues.find ("Service Refusal");
+        const ESM::Dialogue& dialogue = *dialogues.find("Service Refusal");
 
-        std::vector<const ESM::DialInfo *> infos = filter.list (dialogue, false, false, true);
+        std::vector<const ESM::DialInfo*> infos = filter.list(dialogue, false, false, true);
         if (!infos.empty())
         {
             const ESM::DialInfo* info = infos[0];
 
-            addTopicsFromText (info->mResponse);
+            addTopicsFromText(info->mResponse);
 
-            const MWWorld::Store<ESM::GameSetting>& gmsts =
-                MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+            const MWWorld::Store<ESM::GameSetting>& gmsts
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
-            MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
+            MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(), mActor);
 
-            callback->addResponse(gmsts.find ("sServiceRefusal")->mValue.getString(), Interpreter::fixDefinesDialog(info->mResponse, interpreterContext));
+            callback->addResponse(gmsts.find("sServiceRefusal")->mValue.getString(),
+                Interpreter::fixDefinesDialog(info->mResponse, interpreterContext));
 
-            executeScript (info->mResultScript, mActor);
+            executeScript(info->mResultScript, mActor);
             return true;
         }
         return false;
     }
 
-    void DialogueManager::say(const MWWorld::Ptr &actor, const std::string &topic)
+    void DialogueManager::say(const MWWorld::Ptr& actor, const std::string& topic)
     {
-        MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-        if(sndMgr->sayActive(actor))
+        MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
+        if (sndMgr->sayActive(actor))
         {
             // Actor is already saying something.
             return;
@@ -651,16 +654,16 @@ namespace MWDialogue
             return;
         }
 
-        const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-        const ESM::Dialogue *dial = store.get<ESM::Dialogue>().find(topic);
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+        const ESM::Dialogue* dial = store.get<ESM::Dialogue>().find(topic);
 
         const MWMechanics::CreatureStats& creatureStats = actor.getClass().getCreatureStats(actor);
         Filter filter(actor, 0, creatureStats.hasTalkedToPlayer());
-        const ESM::DialInfo *info = filter.search(*dial, false);
-        if(info != nullptr)
+        const ESM::DialInfo* info = filter.search(*dial, false);
+        if (info != nullptr)
         {
-            MWBase::WindowManager *winMgr = MWBase::Environment::get().getWindowManager();
-            if(winMgr->getSubtitlesEnabled())
+            MWBase::WindowManager* winMgr = MWBase::Environment::get().getWindowManager();
+            if (winMgr->getSubtitlesEnabled())
                 winMgr->messageBox(info->mResponse);
             if (!info->mSound.empty())
                 sndMgr->say(actor, info->mSound);
@@ -674,7 +677,7 @@ namespace MWDialogue
         return 1; // known topics
     }
 
-    void DialogueManager::write (ESM::ESMWriter& writer, Loading::Listener& progress) const
+    void DialogueManager::write(ESM::ESMWriter& writer, Loading::Listener& progress) const
     {
         ESM::DialogueState state;
 
@@ -683,24 +686,24 @@ namespace MWDialogue
 
         state.mChangedFactionReaction = mChangedFactionReaction;
 
-        writer.startRecord (ESM::REC_DIAS);
-        state.save (writer);
-        writer.endRecord (ESM::REC_DIAS);
+        writer.startRecord(ESM::REC_DIAS);
+        state.save(writer);
+        writer.endRecord(ESM::REC_DIAS);
     }
 
-    void DialogueManager::readRecord (ESM::ESMReader& reader, uint32_t type)
+    void DialogueManager::readRecord(ESM::ESMReader& reader, uint32_t type)
     {
-        if (type==ESM::REC_DIAS)
+        if (type == ESM::REC_DIAS)
         {
             const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
 
             ESM::DialogueState state;
-            state.load (reader);
+            state.load(reader);
 
-            for (std::vector<std::string>::const_iterator iter (state.mKnownTopics.begin());
-                iter!=state.mKnownTopics.end(); ++iter)
-                if (store.get<ESM::Dialogue>().search (*iter))
-                    mKnownTopics.insert (*iter);
+            for (std::vector<std::string>::const_iterator iter(state.mKnownTopics.begin());
+                 iter != state.mKnownTopics.end(); ++iter)
+                if (store.get<ESM::Dialogue>().search(*iter))
+                    mKnownTopics.insert(*iter);
 
             mChangedFactionReaction = state.mChangedFactionReaction;
         }
@@ -749,17 +752,17 @@ namespace MWDialogue
         for (; it != faction->mReactions.end(); ++it)
         {
             if (Misc::StringUtils::ciEqual(it->first, fact2))
-                    return it->second;
+                return it->second;
         }
         return 0;
     }
 
-    void DialogueManager::clearInfoActor(const MWWorld::Ptr &actor) const
+    void DialogueManager::clearInfoActor(const MWWorld::Ptr& actor) const
     {
         if (actor == mActor && !mLastTopic.empty())
         {
             MWBase::Environment::get().getJournal()->removeLastAddedTopicResponse(
-                        Misc::StringUtils::lowerCase(mLastTopic), actor.getClass().getName(actor));
+                Misc::StringUtils::lowerCase(mLastTopic), actor.getClass().getName(actor));
         }
     }
 }
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
index 322c454c42..ae6824c57c 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
@@ -8,9 +8,9 @@
 #include <unordered_map>
 
 #include <components/compiler/streamerrorhandler.hpp>
-#include <components/translation/translation.hpp>
-#include <components/misc/strings/algorithm.hpp>
 #include <components/esm3/loadinfo.hpp>
+#include <components/misc/strings/algorithm.hpp>
+#include <components/translation/translation.hpp>
 
 #include "../mwworld/ptr.hpp"
 
@@ -25,107 +25,106 @@ namespace MWDialogue
 {
     class DialogueManager : public MWBase::DialogueManager
     {
-            struct ActorKnownTopicInfo
-            {
-                int mFlags;
-                const ESM::DialInfo* mInfo;
-            };
-
-            std::set<std::string, Misc::StringUtils::CiComp> mKnownTopics;// Those are the topics the player knows.
+        struct ActorKnownTopicInfo
+        {
+            int mFlags;
+            const ESM::DialInfo* mInfo;
+        };
 
-            // Modified faction reactions. <Faction1, <Faction2, Difference> >
-            typedef std::map<std::string, std::map<std::string, int> > ModFactionReactionMap;
-            ModFactionReactionMap mChangedFactionReaction;
+        std::set<std::string, Misc::StringUtils::CiComp> mKnownTopics; // Those are the topics the player knows.
 
-            std::map<std::string, ActorKnownTopicInfo, Misc::StringUtils::CiComp> mActorKnownTopics;
+        // Modified faction reactions. <Faction1, <Faction2, Difference> >
+        typedef std::map<std::string, std::map<std::string, int>> ModFactionReactionMap;
+        ModFactionReactionMap mChangedFactionReaction;
 
-            Translation::Storage& mTranslationDataStorage;
-            MWScript::CompilerContext mCompilerContext;
-            Compiler::StreamErrorHandler mErrorHandler;
+        std::map<std::string, ActorKnownTopicInfo, Misc::StringUtils::CiComp> mActorKnownTopics;
 
-            MWWorld::Ptr mActor;
-            bool mTalkedTo;
+        Translation::Storage& mTranslationDataStorage;
+        MWScript::CompilerContext mCompilerContext;
+        Compiler::StreamErrorHandler mErrorHandler;
 
-            int mChoice;
-            std::string mLastTopic; // last topic ID, lowercase
-            bool mIsInChoice;
-            bool mGoodbye;
+        MWWorld::Ptr mActor;
+        bool mTalkedTo;
 
-            std::vector<std::pair<std::string, int> > mChoices;
+        int mChoice;
+        std::string mLastTopic; // last topic ID, lowercase
+        bool mIsInChoice;
+        bool mGoodbye;
 
-            int mOriginalDisposition;
-            int mCurrentDisposition;
-            int mPermanentDispositionChange;
+        std::vector<std::pair<std::string, int>> mChoices;
 
-            std::vector<std::string> parseTopicIdsFromText (const std::string& text);
-            void addTopicsFromText (const std::string& text);
+        int mOriginalDisposition;
+        int mCurrentDisposition;
+        int mPermanentDispositionChange;
 
-            void updateActorKnownTopics();
-            void updateGlobals();
+        std::vector<std::string> parseTopicIdsFromText(const std::string& text);
+        void addTopicsFromText(const std::string& text);
 
-            bool compile (const std::string& cmd, std::vector<Interpreter::Type_Code>& code, const MWWorld::Ptr& actor);
-            void executeScript (const std::string& script, const MWWorld::Ptr& actor);
+        void updateActorKnownTopics();
+        void updateGlobals();
 
-            void executeTopic (const std::string& topic, ResponseCallback* callback);
+        bool compile(const std::string& cmd, std::vector<Interpreter::Type_Code>& code, const MWWorld::Ptr& actor);
+        void executeScript(const std::string& script, const MWWorld::Ptr& actor);
 
-            const ESM::Dialogue* searchDialogue(const std::string& id);
+        void executeTopic(const std::string& topic, ResponseCallback* callback);
 
-            void updateOriginalDisposition();
+        const ESM::Dialogue* searchDialogue(const std::string& id);
 
-        public:
+        void updateOriginalDisposition();
 
-            DialogueManager (const Compiler::Extensions& extensions, Translation::Storage& translationDataStorage);
+    public:
+        DialogueManager(const Compiler::Extensions& extensions, Translation::Storage& translationDataStorage);
 
-            void clear() override;
+        void clear() override;
 
-            bool isInChoice() const override;
+        bool isInChoice() const override;
 
-            bool startDialogue (const MWWorld::Ptr& actor, ResponseCallback* callback) override;
+        bool startDialogue(const MWWorld::Ptr& actor, ResponseCallback* callback) override;
 
-            std::list<std::string> getAvailableTopics() override;
-            int getTopicFlag(const std::string& topicId) override;
+        std::list<std::string> getAvailableTopics() override;
+        int getTopicFlag(const std::string& topicId) override;
 
-            bool inJournal (const std::string& topicId, const std::string& infoId) override;
+        bool inJournal(const std::string& topicId, const std::string& infoId) override;
 
-            void addTopic(std::string_view topic) override;
+        void addTopic(std::string_view topic) override;
 
-            void addChoice(std::string_view text,int choice) override;
-            const std::vector<std::pair<std::string, int> >& getChoices() override;
+        void addChoice(std::string_view text, int choice) override;
+        const std::vector<std::pair<std::string, int>>& getChoices() override;
 
-            bool isGoodbye() override;
+        bool isGoodbye() override;
 
-            void goodbye() override;
+        void goodbye() override;
 
-            bool checkServiceRefused (ResponseCallback* callback, ServiceType service = ServiceType::Any) override;
+        bool checkServiceRefused(ResponseCallback* callback, ServiceType service = ServiceType::Any) override;
 
-            void say(const MWWorld::Ptr &actor, const std::string &topic) override;
+        void say(const MWWorld::Ptr& actor, const std::string& topic) override;
 
-            //calbacks for the GUI
-            void keywordSelected (const std::string& keyword, ResponseCallback* callback) override;
-            void goodbyeSelected() override;
-            void questionAnswered (int answer, ResponseCallback* callback) override;
+        // calbacks for the GUI
+        void keywordSelected(const std::string& keyword, ResponseCallback* callback) override;
+        void goodbyeSelected() override;
+        void questionAnswered(int answer, ResponseCallback* callback) override;
 
-            void persuade (int type, ResponseCallback* callback) override;
+        void persuade(int type, ResponseCallback* callback) override;
 
-            /// @note Controlled by an option, gets discarded when dialogue ends by default
-            void applyBarterDispositionChange (int delta) override;
+        /// @note Controlled by an option, gets discarded when dialogue ends by default
+        void applyBarterDispositionChange(int delta) override;
 
-            int countSavedGameRecords() const override;
+        int countSavedGameRecords() const override;
 
-            void write (ESM::ESMWriter& writer, Loading::Listener& progress) const override;
+        void write(ESM::ESMWriter& writer, Loading::Listener& progress) const override;
 
-            void readRecord (ESM::ESMReader& reader, uint32_t type) override;
+        void readRecord(ESM::ESMReader& reader, uint32_t type) override;
 
-            /// Changes faction1's opinion of faction2 by \a diff.
-            void modFactionReaction (std::string_view faction1, std::string_view faction2, int diff) override;
+        /// Changes faction1's opinion of faction2 by \a diff.
+        void modFactionReaction(std::string_view faction1, std::string_view faction2, int diff) override;
 
-            void setFactionReaction (std::string_view faction1, std::string_view faction2, int absolute) override;
+        void setFactionReaction(std::string_view faction1, std::string_view faction2, int absolute) override;
 
-            /// @return faction1's opinion of faction2
-            int getFactionReaction (std::string_view faction1, std::string_view faction2) const override;
+        /// @return faction1's opinion of faction2
+        int getFactionReaction(std::string_view faction1, std::string_view faction2) const override;
 
-            /// Removes the last added topic response for the given actor from the journal
-            void clearInfoActor (const MWWorld::Ptr& actor) const override;
+        /// Removes the last added topic response for the given actor from the journal
+        void clearInfoActor(const MWWorld::Ptr& actor) const override;
     };
 }
 
diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 54e853e12b..6ecff18205 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -1,37 +1,37 @@
 #include "filter.hpp"
 
 #include <components/compiler/locals.hpp>
-#include <components/esm3/loadmgef.hpp>
-#include <components/esm3/loadfact.hpp>
 #include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadfact.hpp>
+#include <components/esm3/loadmgef.hpp>
 
+#include "../mwbase/dialoguemanager.hpp"
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/journal.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
-#include "../mwbase/dialoguemanager.hpp"
 #include "../mwbase/scriptmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/class.hpp"
-#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/inventorystore.hpp"
 
-#include "../mwmechanics/npcstats.hpp"
+#include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/magiceffects.hpp"
-#include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/npcstats.hpp"
 
 #include "selectwrapper.hpp"
 
-bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
+bool MWDialogue::Filter::testActor(const ESM::DialInfo& info) const
 {
     bool isCreature = (mActor.getType() != ESM::NPC::sRecordId);
 
     // actor id
     if (!info.mActor.empty())
     {
-        if ( !Misc::StringUtils::ciEqual(info.mActor, mActor.getCellRef().getRefId()))
+        if (!Misc::StringUtils::ciEqual(info.mActor, mActor.getCellRef().getRefId()))
             return false;
     }
     else if (isCreature)
@@ -46,7 +46,7 @@ bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
         if (isCreature)
             return true;
 
-        MWWorld::LiveCellRef<ESM::NPC> *cellRef = mActor.get<ESM::NPC>();
+        MWWorld::LiveCellRef<ESM::NPC>* cellRef = mActor.get<ESM::NPC>();
 
         if (!Misc::StringUtils::ciEqual(info.mRace, cellRef->mBase->mRace))
             return false;
@@ -58,9 +58,9 @@ bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
         if (isCreature)
             return true;
 
-        MWWorld::LiveCellRef<ESM::NPC> *cellRef = mActor.get<ESM::NPC>();
+        MWWorld::LiveCellRef<ESM::NPC>* cellRef = mActor.get<ESM::NPC>();
 
-        if ( !Misc::StringUtils::ciEqual(info.mClass, cellRef->mBase->mClass))
+        if (!Misc::StringUtils::ciEqual(info.mClass, cellRef->mBase->mClass))
             return false;
     }
 
@@ -100,24 +100,25 @@ bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
     if (!isCreature)
     {
         MWWorld::LiveCellRef<ESM::NPC>* npc = mActor.get<ESM::NPC>();
-        if (info.mData.mGender==(npc->mBase->mFlags & npc->mBase->Female ? 0 : 1))
+        if (info.mData.mGender == (npc->mBase->mFlags & npc->mBase->Female ? 0 : 1))
             return false;
     }
 
     return true;
 }
 
-bool MWDialogue::Filter::testPlayer (const ESM::DialInfo& info) const
+bool MWDialogue::Filter::testPlayer(const ESM::DialInfo& info) const
 {
     const MWWorld::Ptr player = MWMechanics::getPlayer();
-    MWMechanics::NpcStats& stats = player.getClass().getNpcStats (player);
+    MWMechanics::NpcStats& stats = player.getClass().getNpcStats(player);
 
     // check player faction and rank
     if (!info.mPcFaction.empty())
     {
-        std::map<std::string,int>::const_iterator iter = stats.getFactionRanks().find (Misc::StringUtils::lowerCase (info.mPcFaction));
+        std::map<std::string, int>::const_iterator iter
+            = stats.getFactionRanks().find(Misc::StringUtils::lowerCase(info.mPcFaction));
 
-        if(iter==stats.getFactionRanks().end())
+        if (iter == stats.getFactionRanks().end())
             return false;
 
         // check rank
@@ -127,9 +128,10 @@ bool MWDialogue::Filter::testPlayer (const ESM::DialInfo& info) const
     else if (info.mData.mPCrank != -1)
     {
         // required PC faction is not specified but PC rank is; use speaker's faction
-        std::map<std::string,int>::const_iterator iter = stats.getFactionRanks().find (Misc::StringUtils::lowerCase (mActor.getClass().getPrimaryFaction(mActor)));
+        std::map<std::string, int>::const_iterator iter
+            = stats.getFactionRanks().find(Misc::StringUtils::lowerCase(mActor.getClass().getPrimaryFaction(mActor)));
 
-        if(iter==stats.getFactionRanks().end())
+        if (iter == stats.getFactionRanks().end())
             return false;
 
         // check rank
@@ -142,8 +144,8 @@ bool MWDialogue::Filter::testPlayer (const ESM::DialInfo& info) const
     {
         // supports partial matches, just like getPcCell
         std::string_view playerCell = MWBase::Environment::get().getWorld()->getCellName(player.getCell());
-        bool match = playerCell.length()>=info.mCell.length() &&
-            Misc::StringUtils::ciEqual(playerCell.substr (0, info.mCell.length()), info.mCell);
+        bool match = playerCell.length() >= info.mCell.length()
+            && Misc::StringUtils::ciEqual(playerCell.substr(0, info.mCell.length()), info.mCell);
         if (!match)
             return false;
     }
@@ -151,17 +153,17 @@ bool MWDialogue::Filter::testPlayer (const ESM::DialInfo& info) const
     return true;
 }
 
-bool MWDialogue::Filter::testSelectStructs (const ESM::DialInfo& info) const
+bool MWDialogue::Filter::testSelectStructs(const ESM::DialInfo& info) const
 {
-    for (std::vector<ESM::DialInfo::SelectStruct>::const_iterator iter (info.mSelects.begin());
-        iter != info.mSelects.end(); ++iter)
-        if (!testSelectStruct (*iter))
+    for (std::vector<ESM::DialInfo::SelectStruct>::const_iterator iter(info.mSelects.begin());
+         iter != info.mSelects.end(); ++iter)
+        if (!testSelectStruct(*iter))
             return false;
 
     return true;
 }
 
-bool MWDialogue::Filter::testDisposition (const ESM::DialInfo& info, bool invert) const
+bool MWDialogue::Filter::testDisposition(const ESM::DialInfo& info, bool invert) const
 {
     bool isCreature = (mActor.getType() != ESM::NPC::sRecordId);
 
@@ -181,17 +183,16 @@ bool MWDialogue::Filter::testFunctionLocal(const MWDialogue::SelectWrapper& sele
     if (scriptName.empty())
         return false; // no script
 
-    std::string name = Misc::StringUtils::lowerCase (select.getName());
+    std::string name = Misc::StringUtils::lowerCase(select.getName());
 
-    const Compiler::Locals& localDefs =
-        MWBase::Environment::get().getScriptManager()->getLocals (scriptName);
+    const Compiler::Locals& localDefs = MWBase::Environment::get().getScriptManager()->getLocals(scriptName);
 
-    char type = localDefs.getType (name);
+    char type = localDefs.getType(name);
 
-    if (type==' ')
+    if (type == ' ')
         return false; // script does not have a variable of this name.
 
-    int index = localDefs.getIndex (name);
+    int index = localDefs.getIndex(name);
     if (index < 0)
         return false; // shouldn't happen, we checked that variable has a type above, so must exist
 
@@ -200,15 +201,18 @@ bool MWDialogue::Filter::testFunctionLocal(const MWDialogue::SelectWrapper& sele
         return select.selectCompare(0);
     switch (type)
     {
-        case 's': return select.selectCompare (static_cast<int> (locals.mShorts[index]));
-        case 'l': return select.selectCompare (locals.mLongs[index]);
-        case 'f': return select.selectCompare (locals.mFloats[index]);
+        case 's':
+            return select.selectCompare(static_cast<int>(locals.mShorts[index]));
+        case 'l':
+            return select.selectCompare(locals.mLongs[index]);
+        case 'f':
+            return select.selectCompare(locals.mFloats[index]);
     }
 
-    throw std::logic_error ("unknown local variable type in dialogue filter");
+    throw std::logic_error("unknown local variable type in dialogue filter");
 }
 
-bool MWDialogue::Filter::testSelectStruct (const SelectWrapper& select) const
+bool MWDialogue::Filter::testSelectStruct(const SelectWrapper& select) const
 {
     if (select.isNpcOnly() && (mActor.getType() != ESM::NPC::sRecordId))
         // If the actor is a creature, we pass all conditions only applicable to NPCs.
@@ -218,34 +222,41 @@ bool MWDialogue::Filter::testSelectStruct (const SelectWrapper& select) const
         // If not currently in a choice, we reject all conditions that test against choices.
         return false;
 
-    if (select.getFunction() == SelectWrapper::Function_Weather && !(MWBase::Environment::get().getWorld()->isCellExterior() || MWBase::Environment::get().getWorld()->isCellQuasiExterior()))
+    if (select.getFunction() == SelectWrapper::Function_Weather
+        && !(MWBase::Environment::get().getWorld()->isCellExterior()
+            || MWBase::Environment::get().getWorld()->isCellQuasiExterior()))
         // Reject weather conditions in interior cells
-        // Note that the original engine doesn't include the "|| isCellQuasiExterior()" check, which could be considered a bug.
+        // Note that the original engine doesn't include the "|| isCellQuasiExterior()" check, which could be considered
+        // a bug.
         return false;
 
     switch (select.getType())
     {
-        case SelectWrapper::Type_None: return true;
-        case SelectWrapper::Type_Integer: return select.selectCompare (getSelectStructInteger (select));
-        case SelectWrapper::Type_Numeric: return testSelectStructNumeric (select);
-        case SelectWrapper::Type_Boolean: return select.selectCompare (getSelectStructBoolean (select));
+        case SelectWrapper::Type_None:
+            return true;
+        case SelectWrapper::Type_Integer:
+            return select.selectCompare(getSelectStructInteger(select));
+        case SelectWrapper::Type_Numeric:
+            return testSelectStructNumeric(select);
+        case SelectWrapper::Type_Boolean:
+            return select.selectCompare(getSelectStructBoolean(select));
 
         // We must not do the comparison for inverted functions (eg. Function_NotClass)
-        case SelectWrapper::Type_Inverted: return getSelectStructBoolean (select);
+        case SelectWrapper::Type_Inverted:
+            return getSelectStructBoolean(select);
     }
 
     return true;
 }
 
-bool MWDialogue::Filter::testSelectStructNumeric (const SelectWrapper& select) const
+bool MWDialogue::Filter::testSelectStructNumeric(const SelectWrapper& select) const
 {
     switch (select.getFunction())
     {
         case SelectWrapper::Function_Global:
 
             // internally all globals are float :(
-            return select.selectCompare (
-                MWBase::Environment::get().getWorld()->getGlobalFloat (select.getName()));
+            return select.selectCompare(MWBase::Environment::get().getWorld()->getGlobalFloat(select.getName()));
 
         case SelectWrapper::Function_Local:
         {
@@ -260,31 +271,32 @@ bool MWDialogue::Filter::testSelectStructNumeric (const SelectWrapper& select) c
         case SelectWrapper::Function_PcHealthPercent:
         {
             MWWorld::Ptr player = MWMechanics::getPlayer();
-            return select.selectCompare(static_cast<int>(player.getClass().getCreatureStats(player).getHealth().getRatio() * 100));
+            return select.selectCompare(
+                static_cast<int>(player.getClass().getCreatureStats(player).getHealth().getRatio() * 100));
         }
 
         case SelectWrapper::Function_PcDynamicStat:
         {
             MWWorld::Ptr player = MWMechanics::getPlayer();
 
-            float value = player.getClass().getCreatureStats (player).
-                getDynamic (select.getArgument()).getCurrent();
+            float value = player.getClass().getCreatureStats(player).getDynamic(select.getArgument()).getCurrent();
 
-            return select.selectCompare (value);
+            return select.selectCompare(value);
         }
 
         case SelectWrapper::Function_HealthPercent:
         {
-            return select.selectCompare(static_cast<int>(mActor.getClass().getCreatureStats(mActor).getHealth().getRatio() * 100));
+            return select.selectCompare(
+                static_cast<int>(mActor.getClass().getCreatureStats(mActor).getHealth().getRatio() * 100));
         }
 
         default:
 
-            throw std::runtime_error ("unknown numeric select function");
+            throw std::runtime_error("unknown numeric select function");
     }
 }
 
-int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) const
+int MWDialogue::Filter::getSelectStructInteger(const SelectWrapper& select) const
 {
     MWWorld::Ptr player = MWMechanics::getPlayer();
 
@@ -292,18 +304,18 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
     {
         case SelectWrapper::Function_Journal:
 
-            return MWBase::Environment::get().getJournal()->getJournalIndex (select.getName());
+            return MWBase::Environment::get().getJournal()->getJournalIndex(select.getName());
 
         case SelectWrapper::Function_Item:
         {
-            MWWorld::ContainerStore& store = player.getClass().getContainerStore (player);
+            MWWorld::ContainerStore& store = player.getClass().getContainerStore(player);
 
             return store.count(select.getName());
         }
 
         case SelectWrapper::Function_Dead:
 
-            return MWBase::Environment::get().getMechanicsManager()->countDeaths (select.getName());
+            return MWBase::Environment::get().getMechanicsManager()->countDeaths(select.getName());
 
         case SelectWrapper::Function_Choice:
 
@@ -311,29 +323,29 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
 
         case SelectWrapper::Function_AiSetting:
 
-            return mActor.getClass().getCreatureStats (mActor).getAiSetting (
-                        (MWMechanics::AiSetting)select.getArgument()).getModified(false);
+            return mActor.getClass()
+                .getCreatureStats(mActor)
+                .getAiSetting((MWMechanics::AiSetting)select.getArgument())
+                .getModified(false);
 
         case SelectWrapper::Function_PcAttribute:
 
-            return player.getClass().getCreatureStats (player).
-                getAttribute (select.getArgument()).getModified();
+            return player.getClass().getCreatureStats(player).getAttribute(select.getArgument()).getModified();
 
         case SelectWrapper::Function_PcSkill:
 
-            return static_cast<int> (player.getClass().
-                getNpcStats (player).getSkill (select.getArgument()).getModified());
+            return static_cast<int>(player.getClass().getNpcStats(player).getSkill(select.getArgument()).getModified());
 
         case SelectWrapper::Function_FriendlyHit:
         {
-            int hits = mActor.getClass().getCreatureStats (mActor).getFriendlyHits();
+            int hits = mActor.getClass().getCreatureStats(mActor).getFriendlyHits();
 
-            return hits>4 ? 4 : hits;
+            return hits > 4 ? 4 : hits;
         }
 
         case SelectWrapper::Function_PcLevel:
 
-            return player.getClass().getCreatureStats (player).getLevel();
+            return player.getClass().getCreatureStats(player).getLevel();
 
         case SelectWrapper::Function_PcGender:
 
@@ -341,16 +353,16 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
 
         case SelectWrapper::Function_PcClothingModifier:
         {
-            const MWWorld::InventoryStore& store = player.getClass().getInventoryStore (player);
+            const MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
 
             int value = 0;
 
-            for (int i=0; i<=15; ++i) // everything except things held in hands and ammunition
+            for (int i = 0; i <= 15; ++i) // everything except things held in hands and ammunition
             {
-                MWWorld::ConstContainerStoreIterator slot = store.getSlot (i);
+                MWWorld::ConstContainerStoreIterator slot = store.getSlot(i);
 
-                if (slot!=store.end())
-                    value += slot->getClass().getValue (*slot);
+                if (slot != store.end())
+                    value += slot->getClass().getValue(*slot);
             }
 
             return value;
@@ -358,7 +370,7 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
 
         case SelectWrapper::Function_PcCrimeLevel:
 
-            return player.getClass().getNpcStats (player).getBounty();
+            return player.getClass().getNpcStats(player).getBounty();
 
         case SelectWrapper::Function_RankRequirement:
         {
@@ -366,17 +378,17 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
             if (faction.empty())
                 return 0;
 
-            int rank = getFactionRank (player, faction);
+            int rank = getFactionRank(player, faction);
 
-            if (rank>=9)
+            if (rank >= 9)
                 return 0; // max rank
 
             int result = 0;
 
-            if (hasFactionRankSkillRequirements (player, faction, rank+1))
+            if (hasFactionRankSkillRequirements(player, faction, rank + 1))
                 result += 1;
 
-            if (hasFactionRankReputationRequirements (player, faction, rank+1))
+            if (hasFactionRankReputationRequirements(player, faction, rank + 1))
                 result += 2;
 
             return result;
@@ -384,11 +396,11 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
 
         case SelectWrapper::Function_Level:
 
-            return mActor.getClass().getCreatureStats (mActor).getLevel();
+            return mActor.getClass().getCreatureStats(mActor).getLevel();
 
         case SelectWrapper::Function_PCReputation:
 
-            return player.getClass().getNpcStats (player).getReputation();
+            return player.getClass().getNpcStats(player).getReputation();
 
         case SelectWrapper::Function_Weather:
 
@@ -396,7 +408,7 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
 
         case SelectWrapper::Function_Reputation:
 
-            return mActor.getClass().getNpcStats (mActor).getReputation();
+            return mActor.getClass().getNpcStats(mActor).getReputation();
 
         case SelectWrapper::Function_FactionRankDiff:
         {
@@ -405,19 +417,19 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
             if (faction.empty())
                 return 0;
 
-            int rank = getFactionRank (player, faction);
+            int rank = getFactionRank(player, faction);
             int npcRank = mActor.getClass().getPrimaryFactionRank(mActor);
-            return rank-npcRank;
+            return rank - npcRank;
         }
 
         case SelectWrapper::Function_WerewolfKills:
 
-            return player.getClass().getNpcStats (player).getWerewolfKills();
+            return player.getClass().getNpcStats(player).getWerewolfKills();
 
         case SelectWrapper::Function_RankLow:
         case SelectWrapper::Function_RankHigh:
         {
-            bool low = select.getFunction()==SelectWrapper::Function_RankLow;
+            bool low = select.getFunction() == SelectWrapper::Function_RankLow;
 
             std::string_view factionId = mActor.getClass().getPrimaryFaction(mActor);
 
@@ -426,12 +438,13 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
 
             int value = 0;
 
-            MWMechanics::NpcStats& playerStats = player.getClass().getNpcStats (player);
+            MWMechanics::NpcStats& playerStats = player.getClass().getNpcStats(player);
 
             std::map<std::string, int>::const_iterator playerFactionIt = playerStats.getFactionRanks().begin();
             for (; playerFactionIt != playerStats.getFactionRanks().end(); ++playerFactionIt)
             {
-                int reaction = MWBase::Environment::get().getDialogueManager()->getFactionReaction(factionId, playerFactionIt->first);
+                int reaction = MWBase::Environment::get().getDialogueManager()->getFactionReaction(
+                    factionId, playerFactionIt->first);
                 if (low ? reaction < value : reaction > value)
                     value = reaction;
             }
@@ -441,26 +454,26 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
 
         case SelectWrapper::Function_CreatureTargetted:
 
+        {
+            MWWorld::Ptr target;
+            mActor.getClass().getCreatureStats(mActor).getAiSequence().getCombatTarget(target);
+            if (target)
             {
-                MWWorld::Ptr target;
-                mActor.getClass().getCreatureStats(mActor).getAiSequence().getCombatTarget(target);
-                if (target)
-                {
-                    if (target.getClass().isNpc() && target.getClass().getNpcStats(target).isWerewolf())
-                        return 2;
-                    if (target.getType() == ESM::Creature::sRecordId)
-                        return 1;
-                }
+                if (target.getClass().isNpc() && target.getClass().getNpcStats(target).isWerewolf())
+                    return 2;
+                if (target.getType() == ESM::Creature::sRecordId)
+                    return 1;
             }
+        }
             return 0;
 
         default:
 
-            throw std::runtime_error ("unknown integer select function");
+            throw std::runtime_error("unknown integer select function");
     }
 }
 
-bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) const
+bool MWDialogue::Filter::getSelectStructBoolean(const SelectWrapper& select) const
 {
     MWWorld::Ptr player = MWMechanics::getPlayer();
 
@@ -487,36 +500,41 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
             return !Misc::StringUtils::ciEqual(mActor.get<ESM::NPC>()->mBase->mRace, select.getName());
 
         case SelectWrapper::Function_NotCell:
-            {
-                std::string_view actorCell = MWBase::Environment::get().getWorld()->getCellName(mActor.getCell());
-                return !(actorCell.length() >= select.getName().length()
-                      && Misc::StringUtils::ciEqual(actorCell.substr(0, select.getName().length()), select.getName()));
-            }
+        {
+            std::string_view actorCell = MWBase::Environment::get().getWorld()->getCellName(mActor.getCell());
+            return !(actorCell.length() >= select.getName().length()
+                && Misc::StringUtils::ciEqual(actorCell.substr(0, select.getName().length()), select.getName()));
+        }
         case SelectWrapper::Function_SameGender:
 
-            return (player.get<ESM::NPC>()->mBase->mFlags & ESM::NPC::Female)==
-                (mActor.get<ESM::NPC>()->mBase->mFlags & ESM::NPC::Female);
+            return (player.get<ESM::NPC>()->mBase->mFlags & ESM::NPC::Female)
+                == (mActor.get<ESM::NPC>()->mBase->mFlags & ESM::NPC::Female);
 
         case SelectWrapper::Function_SameRace:
 
-            return Misc::StringUtils::ciEqual(mActor.get<ESM::NPC>()->mBase->mRace, player.get<ESM::NPC>()->mBase->mRace);
+            return Misc::StringUtils::ciEqual(
+                mActor.get<ESM::NPC>()->mBase->mRace, player.get<ESM::NPC>()->mBase->mRace);
 
         case SelectWrapper::Function_SameFaction:
 
-            return player.getClass().getNpcStats (player).isInFaction(mActor.getClass().getPrimaryFaction(mActor));
+            return player.getClass().getNpcStats(player).isInFaction(mActor.getClass().getPrimaryFaction(mActor));
 
         case SelectWrapper::Function_PcCommonDisease:
 
-            return player.getClass().getCreatureStats (player).hasCommonDisease();
+            return player.getClass().getCreatureStats(player).hasCommonDisease();
 
         case SelectWrapper::Function_PcBlightDisease:
 
-            return player.getClass().getCreatureStats (player).hasBlightDisease();
+            return player.getClass().getCreatureStats(player).hasBlightDisease();
 
         case SelectWrapper::Function_PcCorprus:
 
-            return player.getClass().getCreatureStats (player).
-                getMagicEffects().get (ESM::MagicEffect::Corprus).getMagnitude()!=0;
+            return player.getClass()
+                       .getCreatureStats(player)
+                       .getMagicEffects()
+                       .get(ESM::MagicEffect::Corprus)
+                       .getMagnitude()
+                != 0;
 
         case SelectWrapper::Function_PcExpelled:
         {
@@ -530,8 +548,12 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
 
         case SelectWrapper::Function_PcVampire:
 
-            return player.getClass().getCreatureStats(player).getMagicEffects().
-                    get(ESM::MagicEffect::Vampirism).getMagnitude() > 0;
+            return player.getClass()
+                       .getCreatureStats(player)
+                       .getMagicEffects()
+                       .get(ESM::MagicEffect::Vampirism)
+                       .getMagnitude()
+                > 0;
 
         case SelectWrapper::Function_TalkedToPc:
 
@@ -539,7 +561,7 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
 
         case SelectWrapper::Function_Alarmed:
 
-            return mActor.getClass().getCreatureStats (mActor).isAlarmed();
+            return mActor.getClass().getCreatureStats(mActor).isAlarmed();
 
         case SelectWrapper::Function_Detected:
 
@@ -547,66 +569,70 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
 
         case SelectWrapper::Function_Attacked:
 
-            return mActor.getClass().getCreatureStats (mActor).getAttacked();
+            return mActor.getClass().getCreatureStats(mActor).getAttacked();
 
         case SelectWrapper::Function_ShouldAttack:
 
-            return MWBase::Environment::get().getMechanicsManager()->isAggressive(mActor,
-                    MWMechanics::getPlayer());
+            return MWBase::Environment::get().getMechanicsManager()->isAggressive(mActor, MWMechanics::getPlayer());
 
         case SelectWrapper::Function_Werewolf:
 
-            return mActor.getClass().getNpcStats (mActor).isWerewolf();
+            return mActor.getClass().getNpcStats(mActor).isWerewolf();
 
         default:
 
-            throw std::runtime_error ("unknown boolean select function");
+            throw std::runtime_error("unknown boolean select function");
     }
 }
 
-int MWDialogue::Filter::getFactionRank (const MWWorld::Ptr& actor, std::string_view factionId) const
+int MWDialogue::Filter::getFactionRank(const MWWorld::Ptr& actor, std::string_view factionId) const
 {
-    MWMechanics::NpcStats& stats = actor.getClass().getNpcStats (actor);
+    MWMechanics::NpcStats& stats = actor.getClass().getNpcStats(actor);
     return stats.getFactionRank(factionId);
 }
 
-bool MWDialogue::Filter::hasFactionRankSkillRequirements(const MWWorld::Ptr& actor, std::string_view factionId, int rank) const
+bool MWDialogue::Filter::hasFactionRankSkillRequirements(
+    const MWWorld::Ptr& actor, std::string_view factionId, int rank) const
 {
-    if (rank<0 || rank>=10)
-        throw std::runtime_error ("rank index out of range");
+    if (rank < 0 || rank >= 10)
+        throw std::runtime_error("rank index out of range");
 
-    if (!actor.getClass().getNpcStats (actor).hasSkillsForRank (factionId, rank))
+    if (!actor.getClass().getNpcStats(actor).hasSkillsForRank(factionId, rank))
         return false;
 
-    const ESM::Faction& faction =
-        *MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find (factionId);
+    const ESM::Faction& faction
+        = *MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(factionId);
 
-    MWMechanics::CreatureStats& stats = actor.getClass().getCreatureStats (actor);
+    MWMechanics::CreatureStats& stats = actor.getClass().getCreatureStats(actor);
 
-    return stats.getAttribute (faction.mData.mAttribute[0]).getBase()>=faction.mData.mRankData[rank].mAttribute1 &&
-        stats.getAttribute (faction.mData.mAttribute[1]).getBase()>=faction.mData.mRankData[rank].mAttribute2;
+    return stats.getAttribute(faction.mData.mAttribute[0]).getBase() >= faction.mData.mRankData[rank].mAttribute1
+        && stats.getAttribute(faction.mData.mAttribute[1]).getBase() >= faction.mData.mRankData[rank].mAttribute2;
 }
 
-bool MWDialogue::Filter::hasFactionRankReputationRequirements(const MWWorld::Ptr& actor, std::string_view factionId, int rank) const
+bool MWDialogue::Filter::hasFactionRankReputationRequirements(
+    const MWWorld::Ptr& actor, std::string_view factionId, int rank) const
 {
-    if (rank<0 || rank>=10)
-        throw std::runtime_error ("rank index out of range");
+    if (rank < 0 || rank >= 10)
+        throw std::runtime_error("rank index out of range");
 
-    MWMechanics::NpcStats& stats = actor.getClass().getNpcStats (actor);
+    MWMechanics::NpcStats& stats = actor.getClass().getNpcStats(actor);
 
-    const ESM::Faction& faction =
-        *MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find (factionId);
+    const ESM::Faction& faction
+        = *MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(factionId);
 
-    return stats.getFactionReputation (factionId)>=faction.mData.mRankData[rank].mFactReaction;
+    return stats.getFactionReputation(factionId) >= faction.mData.mRankData[rank].mFactReaction;
 }
 
-MWDialogue::Filter::Filter (const MWWorld::Ptr& actor, int choice, bool talkedToPlayer)
-: mActor (actor), mChoice (choice), mTalkedToPlayer (talkedToPlayer)
-{}
+MWDialogue::Filter::Filter(const MWWorld::Ptr& actor, int choice, bool talkedToPlayer)
+    : mActor(actor)
+    , mChoice(choice)
+    , mTalkedToPlayer(talkedToPlayer)
+{
+}
 
-const ESM::DialInfo* MWDialogue::Filter::search (const ESM::Dialogue& dialogue, const bool fallbackToInfoRefusal) const
+const ESM::DialInfo* MWDialogue::Filter::search(const ESM::Dialogue& dialogue, const bool fallbackToInfoRefusal) const
 {
-    std::vector<const ESM::DialInfo *> suitableInfos = list (dialogue, fallbackToInfoRefusal, false);
+    std::vector<const ESM::DialInfo*> suitableInfos = list(dialogue, fallbackToInfoRefusal, false);
 
     if (suitableInfos.empty())
         return nullptr;
@@ -614,31 +640,33 @@ const ESM::DialInfo* MWDialogue::Filter::search (const ESM::Dialogue& dialogue,
         return suitableInfos[0];
 }
 
-std::vector<const ESM::DialInfo *> MWDialogue::Filter::listAll (const ESM::Dialogue& dialogue) const
+std::vector<const ESM::DialInfo*> MWDialogue::Filter::listAll(const ESM::Dialogue& dialogue) const
 {
-    std::vector<const ESM::DialInfo *> infos;
-    for (ESM::Dialogue::InfoContainer::const_iterator iter = dialogue.mInfo.begin(); iter!=dialogue.mInfo.end(); ++iter)
+    std::vector<const ESM::DialInfo*> infos;
+    for (ESM::Dialogue::InfoContainer::const_iterator iter = dialogue.mInfo.begin(); iter != dialogue.mInfo.end();
+         ++iter)
     {
-        if (testActor (*iter))
+        if (testActor(*iter))
             infos.push_back(&*iter);
     }
     return infos;
 }
 
-std::vector<const ESM::DialInfo *> MWDialogue::Filter::list (const ESM::Dialogue& dialogue,
-    bool fallbackToInfoRefusal, bool searchAll, bool invertDisposition) const
+std::vector<const ESM::DialInfo*> MWDialogue::Filter::list(
+    const ESM::Dialogue& dialogue, bool fallbackToInfoRefusal, bool searchAll, bool invertDisposition) const
 {
-    std::vector<const ESM::DialInfo *> infos;
+    std::vector<const ESM::DialInfo*> infos;
 
     bool infoRefusal = false;
 
     // Iterate over topic responses to find a matching one
-    for (ESM::Dialogue::InfoContainer::const_iterator iter = dialogue.mInfo.begin();
-        iter!=dialogue.mInfo.end(); ++iter)
+    for (ESM::Dialogue::InfoContainer::const_iterator iter = dialogue.mInfo.begin(); iter != dialogue.mInfo.end();
+         ++iter)
     {
-        if (testActor (*iter) && testPlayer (*iter) && testSelectStructs (*iter))
+        if (testActor(*iter) && testPlayer(*iter) && testSelectStructs(*iter))
         {
-            if (testDisposition (*iter, invertDisposition)) {
+            if (testDisposition(*iter, invertDisposition))
+            {
                 infos.push_back(&*iter);
                 if (!searchAll)
                     break;
@@ -653,14 +681,16 @@ std::vector<const ESM::DialInfo *> MWDialogue::Filter::list (const ESM::Dialogue
         // No response is valid because of low NPC disposition,
         // search a response in the topic "Info Refusal"
 
-        const MWWorld::Store<ESM::Dialogue> &dialogues =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
+        const MWWorld::Store<ESM::Dialogue>& dialogues
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
 
-        const ESM::Dialogue& infoRefusalDialogue = *dialogues.find ("Info Refusal");
+        const ESM::Dialogue& infoRefusalDialogue = *dialogues.find("Info Refusal");
 
         for (ESM::Dialogue::InfoContainer::const_iterator iter = infoRefusalDialogue.mInfo.begin();
-            iter!=infoRefusalDialogue.mInfo.end(); ++iter)
-            if (testActor (*iter) && testPlayer (*iter) && testSelectStructs (*iter) && testDisposition(*iter, invertDisposition)) {
+             iter != infoRefusalDialogue.mInfo.end(); ++iter)
+            if (testActor(*iter) && testPlayer(*iter) && testSelectStructs(*iter)
+                && testDisposition(*iter, invertDisposition))
+            {
                 infos.push_back(&*iter);
                 if (!searchAll)
                     break;
diff --git a/apps/openmw/mwdialogue/filter.hpp b/apps/openmw/mwdialogue/filter.hpp
index a9f78ebcb6..3db8a97790 100644
--- a/apps/openmw/mwdialogue/filter.hpp
+++ b/apps/openmw/mwdialogue/filter.hpp
@@ -17,53 +17,54 @@ namespace MWDialogue
 
     class Filter
     {
-            MWWorld::Ptr mActor;
-            int mChoice;
-            bool mTalkedToPlayer;
+        MWWorld::Ptr mActor;
+        int mChoice;
+        bool mTalkedToPlayer;
 
-            bool testActor (const ESM::DialInfo& info) const;
-            ///< Is this the right actor for this \a info?
+        bool testActor(const ESM::DialInfo& info) const;
+        ///< Is this the right actor for this \a info?
 
-            bool testPlayer (const ESM::DialInfo& info) const;
-            ///< Do the player and the cell the player is currently in match \a info?
+        bool testPlayer(const ESM::DialInfo& info) const;
+        ///< Do the player and the cell the player is currently in match \a info?
 
-            bool testSelectStructs (const ESM::DialInfo& info) const;
-            ///< Are all select structs matching?
+        bool testSelectStructs(const ESM::DialInfo& info) const;
+        ///< Are all select structs matching?
 
-            bool testDisposition (const ESM::DialInfo& info, bool invert=false) const;
-            ///< Is the actor disposition toward the player high enough (or low enough, if \a invert is true)?
+        bool testDisposition(const ESM::DialInfo& info, bool invert = false) const;
+        ///< Is the actor disposition toward the player high enough (or low enough, if \a invert is true)?
 
-            bool testFunctionLocal(const SelectWrapper& select) const;
+        bool testFunctionLocal(const SelectWrapper& select) const;
 
-            bool testSelectStruct (const SelectWrapper& select) const;
+        bool testSelectStruct(const SelectWrapper& select) const;
 
-            bool testSelectStructNumeric (const SelectWrapper& select) const;
+        bool testSelectStructNumeric(const SelectWrapper& select) const;
 
-            int getSelectStructInteger (const SelectWrapper& select) const;
+        int getSelectStructInteger(const SelectWrapper& select) const;
 
-            bool getSelectStructBoolean (const SelectWrapper& select) const;
+        bool getSelectStructBoolean(const SelectWrapper& select) const;
 
-            int getFactionRank(const MWWorld::Ptr& actor, std::string_view factionId) const;
+        int getFactionRank(const MWWorld::Ptr& actor, std::string_view factionId) const;
 
-            bool hasFactionRankSkillRequirements(const MWWorld::Ptr& actor, std::string_view factionId, int rank) const;
+        bool hasFactionRankSkillRequirements(const MWWorld::Ptr& actor, std::string_view factionId, int rank) const;
 
-            bool hasFactionRankReputationRequirements(const MWWorld::Ptr& actor, std::string_view factionId, int rank) const;
+        bool hasFactionRankReputationRequirements(
+            const MWWorld::Ptr& actor, std::string_view factionId, int rank) const;
 
-        public:
+    public:
+        Filter(const MWWorld::Ptr& actor, int choice, bool talkedToPlayer);
 
-            Filter (const MWWorld::Ptr& actor, int choice, bool talkedToPlayer);
+        std::vector<const ESM::DialInfo*> list(const ESM::Dialogue& dialogue, bool fallbackToInfoRefusal,
+            bool searchAll, bool invertDisposition = false) const;
+        ///< List all infos that could be used on the given actor, using the current runtime state of the actor.
+        /// \note If fallbackToInfoRefusal is used, the returned DialInfo might not be from the supplied ESM::Dialogue.
 
-            std::vector<const ESM::DialInfo *> list (const ESM::Dialogue& dialogue,
-                bool fallbackToInfoRefusal, bool searchAll, bool invertDisposition=false) const;
-            ///< List all infos that could be used on the given actor, using the current runtime state of the actor.
-            /// \note If fallbackToInfoRefusal is used, the returned DialInfo might not be from the supplied ESM::Dialogue.
+        std::vector<const ESM::DialInfo*> listAll(const ESM::Dialogue& dialogue) const;
+        ///< List all infos that could possibly be used on the given actor, ignoring runtime state filters and ignoring
+        ///< player filters.
 
-            std::vector<const ESM::DialInfo *> listAll (const ESM::Dialogue& dialogue) const;
-            ///< List all infos that could possibly be used on the given actor, ignoring runtime state filters and ignoring player filters.
-
-            const ESM::DialInfo* search (const ESM::Dialogue& dialogue, const bool fallbackToInfoRefusal) const;
-            ///< Get a matching response for the requested dialogue.
-            ///  Redirect to "Info Refusal" topic if a response fulfills all conditions but disposition.
+        const ESM::DialInfo* search(const ESM::Dialogue& dialogue, const bool fallbackToInfoRefusal) const;
+        ///< Get a matching response for the requested dialogue.
+        ///  Redirect to "Info Refusal" topic if a response fulfills all conditions but disposition.
     };
 }
 
diff --git a/apps/openmw/mwdialogue/hypertextparser.cpp b/apps/openmw/mwdialogue/hypertextparser.cpp
index 732cdb1f8f..bb05b5e798 100644
--- a/apps/openmw/mwdialogue/hypertextparser.cpp
+++ b/apps/openmw/mwdialogue/hypertextparser.cpp
@@ -3,8 +3,8 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
-#include "../mwworld/store.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/store.hpp"
 
 #include "keywordsearch.hpp"
 
@@ -14,11 +14,11 @@ namespace MWDialogue
 {
     namespace HyperTextParser
     {
-        std::vector<Token> parseHyperText(const std::string & text)
+        std::vector<Token> parseHyperText(const std::string& text)
         {
             std::vector<Token> result;
             size_t pos_end = std::string::npos, iteration_pos = 0;
-            for(;;)
+            for (;;)
             {
                 size_t pos_begin = text.find('@', iteration_pos);
                 if (pos_begin != std::string::npos)
@@ -45,30 +45,31 @@ namespace MWDialogue
             return result;
         }
 
-        void tokenizeKeywords(const std::string & text, std::vector<Token> & tokens)
+        void tokenizeKeywords(const std::string& text, std::vector<Token>& tokens)
         {
-            const auto& keywordSearch =
-                MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().getDialogIdKeywordSearch();
+            const auto& keywordSearch
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().getDialogIdKeywordSearch();
 
             std::vector<KeywordSearch<std::string, int /*unused*/>::Match> matches;
             keywordSearch.highlightKeywords(text.begin(), text.end(), matches);
 
-            for (std::vector<KeywordSearch<std::string, int /*unused*/>::Match>::const_iterator it = matches.begin(); it != matches.end(); ++it)
+            for (std::vector<KeywordSearch<std::string, int /*unused*/>::Match>::const_iterator it = matches.begin();
+                 it != matches.end(); ++it)
             {
                 tokens.emplace_back(std::string(it->mBeg, it->mEnd), Token::ImplicitKeyword);
             }
         }
 
-        size_t removePseudoAsterisks(std::string & phrase)
+        size_t removePseudoAsterisks(std::string& phrase)
         {
             size_t pseudoAsterisksCount = 0;
 
-            if( !phrase.empty() )
+            if (!phrase.empty())
             {
                 std::string::reverse_iterator rit = phrase.rbegin();
 
                 const char specialPseudoAsteriskCharacter = 127;
-                while( rit != phrase.rend() && *rit == specialPseudoAsteriskCharacter )
+                while (rit != phrase.rend() && *rit == specialPseudoAsteriskCharacter)
                 {
                     pseudoAsterisksCount++;
                     ++rit;
diff --git a/apps/openmw/mwdialogue/hypertextparser.hpp b/apps/openmw/mwdialogue/hypertextparser.hpp
index 4ae0474c42..efd0982dee 100644
--- a/apps/openmw/mwdialogue/hypertextparser.hpp
+++ b/apps/openmw/mwdialogue/hypertextparser.hpp
@@ -16,7 +16,11 @@ namespace MWDialogue
                 ImplicitKeyword
             };
 
-            Token(const std::string & text, Type type) : mText(text), mType(type) {}
+            Token(const std::string& text, Type type)
+                : mText(text)
+                , mType(type)
+            {
+            }
 
             bool isExplicitLink() { return mType == ExplicitLink; }
 
@@ -26,9 +30,9 @@ namespace MWDialogue
 
         // In translations (at least Russian) the links are marked with @#, so
         // it should be a function to parse it
-        std::vector<Token> parseHyperText(const std::string & text);
-        void tokenizeKeywords(const std::string & text, std::vector<Token> & tokens);
-        size_t removePseudoAsterisks(std::string & phrase);
+        std::vector<Token> parseHyperText(const std::string& text);
+        void tokenizeKeywords(const std::string& text, std::vector<Token>& tokens);
+        size_t removePseudoAsterisks(std::string& phrase);
     }
 }
 
diff --git a/apps/openmw/mwdialogue/journalentry.cpp b/apps/openmw/mwdialogue/journalentry.cpp
index 961977ca03..162ca214fe 100644
--- a/apps/openmw/mwdialogue/journalentry.cpp
+++ b/apps/openmw/mwdialogue/journalentry.cpp
@@ -13,17 +13,16 @@
 
 #include "../mwscript/interpretercontext.hpp"
 
-
 namespace MWDialogue
 {
     Entry::Entry(std::string_view topic, std::string_view infoId, const MWWorld::Ptr& actor)
-    : mInfoId (infoId)
+        : mInfoId(infoId)
     {
-        const ESM::Dialogue *dialogue =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().find (topic);
+        const ESM::Dialogue* dialogue
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().find(topic);
 
-        for (ESM::Dialogue::InfoContainer::const_iterator iter (dialogue->mInfo.begin());
-            iter!=dialogue->mInfo.end(); ++iter)
+        for (ESM::Dialogue::InfoContainer::const_iterator iter(dialogue->mInfo.begin()); iter != dialogue->mInfo.end();
+             ++iter)
             if (iter->mId == mInfoId)
             {
                 if (actor.isEmpty())
@@ -33,83 +32,100 @@ namespace MWDialogue
                 }
                 else
                 {
-                    MWScript::InterpreterContext interpreterContext(&actor.getRefData().getLocals(),actor);
+                    MWScript::InterpreterContext interpreterContext(&actor.getRefData().getLocals(), actor);
                     mText = Interpreter::fixDefinesDialog(iter->mResponse, interpreterContext);
                 }
 
                 return;
             }
 
-        throw std::runtime_error ("unknown info ID " + mInfoId + " for topic " + std::string(topic));
+        throw std::runtime_error("unknown info ID " + mInfoId + " for topic " + std::string(topic));
     }
 
-    Entry::Entry (const ESM::JournalEntry& record) : mInfoId (record.mInfo), mText (record.mText), mActorName(record.mActorName) {}
+    Entry::Entry(const ESM::JournalEntry& record)
+        : mInfoId(record.mInfo)
+        , mText(record.mText)
+        , mActorName(record.mActorName)
+    {
+    }
 
     const std::string& Entry::getText() const
     {
         return mText;
     }
 
-    void Entry::write (ESM::JournalEntry& entry) const
+    void Entry::write(ESM::JournalEntry& entry) const
     {
         entry.mInfo = mInfoId;
         entry.mText = mText;
         entry.mActorName = mActorName;
     }
 
-
     JournalEntry::JournalEntry(std::string_view topic, std::string_view infoId, const MWWorld::Ptr& actor)
-        : Entry (topic, infoId, actor), mTopic (topic)
-    {}
+        : Entry(topic, infoId, actor)
+        , mTopic(topic)
+    {
+    }
 
-    JournalEntry::JournalEntry (const ESM::JournalEntry& record)
-        : Entry (record), mTopic (record.mTopic)
-    {}
+    JournalEntry::JournalEntry(const ESM::JournalEntry& record)
+        : Entry(record)
+        , mTopic(record.mTopic)
+    {
+    }
 
-    void JournalEntry::write (ESM::JournalEntry& entry) const
+    void JournalEntry::write(ESM::JournalEntry& entry) const
     {
-        Entry::write (entry);
+        Entry::write(entry);
         entry.mTopic = mTopic;
     }
 
     JournalEntry JournalEntry::makeFromQuest(std::string_view topic, int index)
     {
-        return JournalEntry (topic, idFromIndex (topic, index), MWWorld::Ptr());
+        return JournalEntry(topic, idFromIndex(topic, index), MWWorld::Ptr());
     }
 
-    std::string_view JournalEntry::idFromIndex (std::string_view topic, int index)
+    std::string_view JournalEntry::idFromIndex(std::string_view topic, int index)
     {
-        const ESM::Dialogue *dialogue =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().find (topic);
+        const ESM::Dialogue* dialogue
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().find(topic);
 
-        for (ESM::Dialogue::InfoContainer::const_iterator iter (dialogue->mInfo.begin());
-            iter!=dialogue->mInfo.end(); ++iter)
-            if (iter->mData.mJournalIndex==index)
+        for (ESM::Dialogue::InfoContainer::const_iterator iter(dialogue->mInfo.begin()); iter != dialogue->mInfo.end();
+             ++iter)
+            if (iter->mData.mJournalIndex == index)
             {
                 return iter->mId;
             }
 
-        throw std::runtime_error ("unknown journal index for topic " + std::string(topic));
+        throw std::runtime_error("unknown journal index for topic " + std::string(topic));
     }
 
-
     StampedJournalEntry::StampedJournalEntry()
-    : mDay (0), mMonth (0), mDayOfMonth (0)
-    {}
+        : mDay(0)
+        , mMonth(0)
+        , mDayOfMonth(0)
+    {
+    }
 
-    StampedJournalEntry::StampedJournalEntry(std::string_view topic, std::string_view infoId,
-        int day, int month, int dayOfMonth, const MWWorld::Ptr& actor)
-    : JournalEntry (topic, infoId, actor), mDay (day), mMonth (month), mDayOfMonth (dayOfMonth)
-    {}
+    StampedJournalEntry::StampedJournalEntry(
+        std::string_view topic, std::string_view infoId, int day, int month, int dayOfMonth, const MWWorld::Ptr& actor)
+        : JournalEntry(topic, infoId, actor)
+        , mDay(day)
+        , mMonth(month)
+        , mDayOfMonth(dayOfMonth)
+    {
+    }
 
-    StampedJournalEntry::StampedJournalEntry (const ESM::JournalEntry& record)
-    : JournalEntry (record), mDay (record.mDay), mMonth (record.mMonth),
-      mDayOfMonth (record.mDayOfMonth)
-    {}
+    StampedJournalEntry::StampedJournalEntry(const ESM::JournalEntry& record)
+        : JournalEntry(record)
+        , mDay(record.mDay)
+        , mMonth(record.mMonth)
+        , mDayOfMonth(record.mDayOfMonth)
+    {
+    }
 
-    void StampedJournalEntry::write (ESM::JournalEntry& entry) const
+    void StampedJournalEntry::write(ESM::JournalEntry& entry) const
     {
-        JournalEntry::write (entry);
+        JournalEntry::write(entry);
         entry.mDay = mDay;
         entry.mMonth = mMonth;
         entry.mDayOfMonth = mDayOfMonth;
@@ -117,10 +133,10 @@ namespace MWDialogue
 
     StampedJournalEntry StampedJournalEntry::makeFromQuest(std::string_view topic, int index, const MWWorld::Ptr& actor)
     {
-        int day = MWBase::Environment::get().getWorld()->getGlobalInt ("dayspassed");
-        int month = MWBase::Environment::get().getWorld()->getGlobalInt ("month");
-        int dayOfMonth = MWBase::Environment::get().getWorld()->getGlobalInt ("day");
+        int day = MWBase::Environment::get().getWorld()->getGlobalInt("dayspassed");
+        int month = MWBase::Environment::get().getWorld()->getGlobalInt("month");
+        int dayOfMonth = MWBase::Environment::get().getWorld()->getGlobalInt("day");
 
-        return StampedJournalEntry (topic, idFromIndex (topic, index), day, month, dayOfMonth, actor);
+        return StampedJournalEntry(topic, idFromIndex(topic, index), day, month, dayOfMonth, actor);
     }
 }
diff --git a/apps/openmw/mwdialogue/journalentry.hpp b/apps/openmw/mwdialogue/journalentry.hpp
index c4b93de7c4..4573981cb8 100644
--- a/apps/openmw/mwdialogue/journalentry.hpp
+++ b/apps/openmw/mwdialogue/journalentry.hpp
@@ -28,11 +28,11 @@ namespace MWDialogue
         /// actor is optional
         Entry(std::string_view topic, std::string_view infoId, const MWWorld::Ptr& actor);
 
-        Entry (const ESM::JournalEntry& record);
+        Entry(const ESM::JournalEntry& record);
 
         const std::string& getText() const;
 
-        void write (ESM::JournalEntry& entry) const;
+        void write(ESM::JournalEntry& entry) const;
     };
 
     /// \brief A dialogue entry
@@ -46,9 +46,9 @@ namespace MWDialogue
 
         JournalEntry(std::string_view topic, std::string_view infoId, const MWWorld::Ptr& actor);
 
-        JournalEntry (const ESM::JournalEntry& record);
+        JournalEntry(const ESM::JournalEntry& record);
 
-        void write (ESM::JournalEntry& entry) const;
+        void write(ESM::JournalEntry& entry) const;
 
         static JournalEntry makeFromQuest(std::string_view topic, int index);
 
@@ -64,12 +64,12 @@ namespace MWDialogue
 
         StampedJournalEntry();
 
-        StampedJournalEntry(std::string_view topic, std::string_view infoId,
-            int day, int month, int dayOfMonth, const MWWorld::Ptr& actor);
+        StampedJournalEntry(std::string_view topic, std::string_view infoId, int day, int month, int dayOfMonth,
+            const MWWorld::Ptr& actor);
 
-        StampedJournalEntry (const ESM::JournalEntry& record);
+        StampedJournalEntry(const ESM::JournalEntry& record);
 
-        void write (ESM::JournalEntry& entry) const;
+        void write(ESM::JournalEntry& entry) const;
 
         static StampedJournalEntry makeFromQuest(std::string_view topic, int index, const MWWorld::Ptr& actor);
     };
diff --git a/apps/openmw/mwdialogue/journalimp.cpp b/apps/openmw/mwdialogue/journalimp.cpp
index 906ae97363..6a6348ed58 100644
--- a/apps/openmw/mwdialogue/journalimp.cpp
+++ b/apps/openmw/mwdialogue/journalimp.cpp
@@ -2,30 +2,29 @@
 
 #include <iterator>
 
-#include <components/esm3/esmwriter.hpp>
 #include <components/esm3/esmreader.hpp>
-#include <components/esm3/queststate.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/esm3/journalentry.hpp>
+#include <components/esm3/queststate.hpp>
 
 #include <components/misc/strings/algorithm.hpp>
 
-#include "../mwworld/esmstore.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 namespace MWDialogue
 {
-    Quest& Journal::getQuest (const std::string& id)
+    Quest& Journal::getQuest(const std::string& id)
     {
-        TQuestContainer::iterator iter = mQuests.find (id);
+        TQuestContainer::iterator iter = mQuests.find(id);
 
-        if (iter==mQuests.end())
+        if (iter == mQuests.end())
         {
-            std::pair<TQuestContainer::iterator, bool> result =
-                mQuests.insert (std::make_pair (id, Quest (id)));
+            std::pair<TQuestContainer::iterator, bool> result = mQuests.insert(std::make_pair(id, Quest(id)));
 
             iter = result.first;
         }
@@ -33,14 +32,13 @@ namespace MWDialogue
         return iter->second;
     }
 
-    Topic& Journal::getTopic (const std::string& id)
+    Topic& Journal::getTopic(const std::string& id)
     {
-        TTopicContainer::iterator iter = mTopics.find (id);
+        TTopicContainer::iterator iter = mTopics.find(id);
 
-        if (iter==mTopics.end())
+        if (iter == mTopics.end())
         {
-            std::pair<TTopicContainer::iterator, bool> result
-                = mTopics.insert (std::make_pair (id, Topic (id)));
+            std::pair<TTopicContainer::iterator, bool> result = mTopics.insert(std::make_pair(id, Topic(id)));
 
             iter = result.first;
         }
@@ -48,16 +46,16 @@ namespace MWDialogue
         return iter->second;
     }
 
-    bool Journal::isThere (const std::string& topicId, const std::string& infoId) const
+    bool Journal::isThere(const std::string& topicId, const std::string& infoId) const
     {
-        if (const ESM::Dialogue *dialogue =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().search (topicId))
+        if (const ESM::Dialogue* dialogue
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().search(topicId))
         {
             if (infoId.empty())
                 return true;
 
-            for (ESM::Dialogue::InfoContainer::const_iterator iter (dialogue->mInfo.begin());
-                iter!=dialogue->mInfo.end(); ++iter)
+            for (ESM::Dialogue::InfoContainer::const_iterator iter(dialogue->mInfo.begin());
+                 iter != dialogue->mInfo.end(); ++iter)
                 if (iter->mId == infoId)
                     return true;
         }
@@ -65,8 +63,7 @@ namespace MWDialogue
         return false;
     }
 
-    Journal::Journal()
-    {}
+    Journal::Journal() {}
 
     void Journal::clear()
     {
@@ -75,31 +72,31 @@ namespace MWDialogue
         mTopics.clear();
     }
 
-    void Journal::addEntry (const std::string& id, int index, const MWWorld::Ptr& actor)
+    void Journal::addEntry(const std::string& id, int index, const MWWorld::Ptr& actor)
     {
         // bail out if we already have heard this...
         std::string_view infoId = JournalEntry::idFromIndex(id, index);
-        for (TEntryIter i = mJournal.begin (); i != mJournal.end (); ++i)
+        for (TEntryIter i = mJournal.begin(); i != mJournal.end(); ++i)
             if (i->mTopic == id && i->mInfoId == infoId)
             {
                 if (getJournalIndex(id) < index)
                 {
                     setJournalIndex(id, index);
-                    MWBase::Environment::get().getWindowManager()->messageBox ("#{sJournalEntry}");
+                    MWBase::Environment::get().getWindowManager()->messageBox("#{sJournalEntry}");
                 }
                 return;
             }
 
-        StampedJournalEntry entry = StampedJournalEntry::makeFromQuest (id, index, actor);
+        StampedJournalEntry entry = StampedJournalEntry::makeFromQuest(id, index, actor);
 
-        Quest& quest = getQuest (id);
-        if(quest.addEntry(entry)) // we are doing slicing on purpose here
+        Quest& quest = getQuest(id);
+        if (quest.addEntry(entry)) // we are doing slicing on purpose here
         {
             // Restart all "other" quests with the same name as well
             std::string_view name = quest.getName();
-            for(auto& it : mQuests)
+            for (auto& it : mQuests)
             {
-                if(it.second.isFinished() && Misc::StringUtils::ciEqual(it.second.getName(), name))
+                if (it.second.isFinished() && Misc::StringUtils::ciEqual(it.second.getName(), name))
                     it.second.setFinished(false);
             }
         }
@@ -107,30 +104,30 @@ namespace MWDialogue
         // there is no need to show empty entries in journal
         if (!entry.getText().empty())
         {
-            mJournal.push_back (entry);
-            MWBase::Environment::get().getWindowManager()->messageBox ("#{sJournalEntry}");
+            mJournal.push_back(entry);
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sJournalEntry}");
         }
     }
 
-    void Journal::setJournalIndex (const std::string& id, int index)
+    void Journal::setJournalIndex(const std::string& id, int index)
     {
-        Quest& quest = getQuest (id);
+        Quest& quest = getQuest(id);
 
-        quest.setIndex (index);
+        quest.setIndex(index);
     }
 
-    void Journal::addTopic (const std::string& topicId, const std::string& infoId, const MWWorld::Ptr& actor)
+    void Journal::addTopic(const std::string& topicId, const std::string& infoId, const MWWorld::Ptr& actor)
     {
-        Topic& topic = getTopic (topicId);
+        Topic& topic = getTopic(topicId);
 
         JournalEntry entry(topicId, infoId, actor);
         entry.mActorName = actor.getClass().getName(actor);
-        topic.addEntry (entry);
+        topic.addEntry(entry);
     }
 
-    void Journal::removeLastAddedTopicResponse(const std::string &topicId, std::string_view actorName)
+    void Journal::removeLastAddedTopicResponse(const std::string& topicId, std::string_view actorName)
     {
-        Topic& topic = getTopic (topicId);
+        Topic& topic = getTopic(topicId);
 
         topic.removeLastAddedResponse(actorName);
 
@@ -138,11 +135,11 @@ namespace MWDialogue
             mTopics.erase(mTopics.find(topicId)); // All responses removed -> remove topic
     }
 
-    int Journal::getJournalIndex (const std::string& id) const
+    int Journal::getJournalIndex(const std::string& id) const
     {
-        TQuestContainer::const_iterator iter = mQuests.find (id);
+        TQuestContainer::const_iterator iter = mQuests.find(id);
 
-        if (iter==mQuests.end())
+        if (iter == mQuests.end())
             return 0;
 
         return iter->second.getIndex();
@@ -180,104 +177,105 @@ namespace MWDialogue
 
     int Journal::countSavedGameRecords() const
     {
-        int count = static_cast<int> (mQuests.size());
+        int count = static_cast<int>(mQuests.size());
 
-        for (TQuestIter iter (mQuests.begin()); iter!=mQuests.end(); ++iter)
-            count += std::distance (iter->second.begin(), iter->second.end());
+        for (TQuestIter iter(mQuests.begin()); iter != mQuests.end(); ++iter)
+            count += std::distance(iter->second.begin(), iter->second.end());
 
-        count += std::distance (mJournal.begin(), mJournal.end());
+        count += std::distance(mJournal.begin(), mJournal.end());
 
-        for (TTopicIter iter (mTopics.begin()); iter!=mTopics.end(); ++iter)
-            count += std::distance (iter->second.begin(), iter->second.end());
+        for (TTopicIter iter(mTopics.begin()); iter != mTopics.end(); ++iter)
+            count += std::distance(iter->second.begin(), iter->second.end());
 
         return count;
     }
 
-    void Journal::write (ESM::ESMWriter& writer, Loading::Listener& progress) const
+    void Journal::write(ESM::ESMWriter& writer, Loading::Listener& progress) const
     {
-        for (TQuestIter iter (mQuests.begin()); iter!=mQuests.end(); ++iter)
+        for (TQuestIter iter(mQuests.begin()); iter != mQuests.end(); ++iter)
         {
             const Quest& quest = iter->second;
 
             ESM::QuestState state;
-            quest.write (state);
-            writer.startRecord (ESM::REC_QUES);
-            state.save (writer);
-            writer.endRecord (ESM::REC_QUES);
+            quest.write(state);
+            writer.startRecord(ESM::REC_QUES);
+            state.save(writer);
+            writer.endRecord(ESM::REC_QUES);
 
-            for (Topic::TEntryIter entryIter (quest.begin()); entryIter!=quest.end(); ++entryIter)
+            for (Topic::TEntryIter entryIter(quest.begin()); entryIter != quest.end(); ++entryIter)
             {
                 ESM::JournalEntry entry;
                 entry.mType = ESM::JournalEntry::Type_Quest;
                 entry.mTopic = quest.getTopic();
-                entryIter->write (entry);
-                writer.startRecord (ESM::REC_JOUR);
-                entry.save (writer);
-                writer.endRecord (ESM::REC_JOUR);
+                entryIter->write(entry);
+                writer.startRecord(ESM::REC_JOUR);
+                entry.save(writer);
+                writer.endRecord(ESM::REC_JOUR);
             }
         }
 
-        for (TEntryIter iter (mJournal.begin()); iter!=mJournal.end(); ++iter)
+        for (TEntryIter iter(mJournal.begin()); iter != mJournal.end(); ++iter)
         {
             ESM::JournalEntry entry;
             entry.mType = ESM::JournalEntry::Type_Journal;
-            iter->write (entry);
-            writer.startRecord (ESM::REC_JOUR);
-            entry.save (writer);
-            writer.endRecord (ESM::REC_JOUR);
+            iter->write(entry);
+            writer.startRecord(ESM::REC_JOUR);
+            entry.save(writer);
+            writer.endRecord(ESM::REC_JOUR);
         }
 
-        for (TTopicIter iter (mTopics.begin()); iter!=mTopics.end(); ++iter)
+        for (TTopicIter iter(mTopics.begin()); iter != mTopics.end(); ++iter)
         {
             const Topic& topic = iter->second;
 
-            for (Topic::TEntryIter entryIter (topic.begin()); entryIter!=topic.end(); ++entryIter)
+            for (Topic::TEntryIter entryIter(topic.begin()); entryIter != topic.end(); ++entryIter)
             {
                 ESM::JournalEntry entry;
                 entry.mType = ESM::JournalEntry::Type_Topic;
                 entry.mTopic = topic.getTopic();
-                entryIter->write (entry);
-                writer.startRecord (ESM::REC_JOUR);
-                entry.save (writer);
-                writer.endRecord (ESM::REC_JOUR);
+                entryIter->write(entry);
+                writer.startRecord(ESM::REC_JOUR);
+                entry.save(writer);
+                writer.endRecord(ESM::REC_JOUR);
             }
         }
     }
 
-    void Journal::readRecord (ESM::ESMReader& reader, uint32_t type)
+    void Journal::readRecord(ESM::ESMReader& reader, uint32_t type)
     {
-        if (type==ESM::REC_JOUR || type==ESM::REC_JOUR_LEGACY)
+        if (type == ESM::REC_JOUR || type == ESM::REC_JOUR_LEGACY)
         {
             ESM::JournalEntry record;
-            record.load (reader);
+            record.load(reader);
 
-            if (isThere (record.mTopic, record.mInfo))
+            if (isThere(record.mTopic, record.mInfo))
                 switch (record.mType)
                 {
                     case ESM::JournalEntry::Type_Quest:
 
-                        getQuest (record.mTopic).insertEntry (record);
+                        getQuest(record.mTopic).insertEntry(record);
                         break;
 
                     case ESM::JournalEntry::Type_Journal:
 
-                        mJournal.push_back (record);
+                        mJournal.push_back(record);
                         break;
 
                     case ESM::JournalEntry::Type_Topic:
 
-                        getTopic (record.mTopic).insertEntry (record);
+                        getTopic(record.mTopic).insertEntry(record);
                         break;
                 }
         }
-        else if (type==ESM::REC_QUES)
+        else if (type == ESM::REC_QUES)
         {
             ESM::QuestState record;
-            record.load (reader);
+            record.load(reader);
 
-            if (isThere (record.mTopic))
+            if (isThere(record.mTopic))
             {
-                std::pair<TQuestContainer::iterator, bool> result = mQuests.insert (std::make_pair (record.mTopic, record));
+                std::pair<TQuestContainer::iterator, bool> result
+                    = mQuests.insert(std::make_pair(record.mTopic, record));
                 // reapply quest index, this is to handle users upgrading from only
                 // Morrowind.esm (no quest states) to Morrowind.esm + Tribunal.esm
                 result.first->second.setIndex(record.mState);
diff --git a/apps/openmw/mwdialogue/journalimp.hpp b/apps/openmw/mwdialogue/journalimp.hpp
index 18bbe8b2f2..52d92f333a 100644
--- a/apps/openmw/mwdialogue/journalimp.hpp
+++ b/apps/openmw/mwdialogue/journalimp.hpp
@@ -10,68 +10,66 @@ namespace MWDialogue
     /// \brief The player's journal
     class Journal : public MWBase::Journal
     {
-            TEntryContainer mJournal;
-            TQuestContainer mQuests;
-            TTopicContainer mTopics;
+        TEntryContainer mJournal;
+        TQuestContainer mQuests;
+        TTopicContainer mTopics;
 
-        private:
+    private:
+        Quest& getQuest(const std::string& id);
 
-            Quest& getQuest (const std::string& id);
+        Topic& getTopic(const std::string& id);
 
-            Topic& getTopic (const std::string& id);
+        bool isThere(const std::string& topicId, const std::string& infoId = "") const;
 
-            bool isThere (const std::string& topicId, const std::string& infoId = "") const;
+    public:
+        Journal();
 
-        public:
+        void clear() override;
 
-            Journal();
+        void addEntry(const std::string& id, int index, const MWWorld::Ptr& actor) override;
+        ///< Add a journal entry.
+        /// @param actor Used as context for replacing of escape sequences (%name, etc).
 
-            void clear() override;
+        void setJournalIndex(const std::string& id, int index) override;
+        ///< Set the journal index without adding an entry.
 
-            void addEntry (const std::string& id, int index, const MWWorld::Ptr& actor) override;
-            ///< Add a journal entry.
-            /// @param actor Used as context for replacing of escape sequences (%name, etc).
+        int getJournalIndex(const std::string& id) const override;
+        ///< Get the journal index.
 
-            void setJournalIndex (const std::string& id, int index) override;
-            ///< Set the journal index without adding an entry.
+        void addTopic(const std::string& topicId, const std::string& infoId, const MWWorld::Ptr& actor) override;
+        /// \note topicId must be lowercase
 
-            int getJournalIndex (const std::string& id) const override;
-            ///< Get the journal index.
+        void removeLastAddedTopicResponse(const std::string& topicId, std::string_view actorName) override;
+        ///< Removes the last topic response added for the given topicId and actor name.
+        /// \note topicId must be lowercase
 
-            void addTopic (const std::string& topicId, const std::string& infoId, const MWWorld::Ptr& actor) override;
-            /// \note topicId must be lowercase
+        TEntryIter begin() const override;
+        ///< Iterator pointing to the begin of the main journal.
+        ///
+        /// \note Iterators to main journal entries will never become invalid.
 
-            void removeLastAddedTopicResponse(const std::string& topicId, std::string_view actorName) override;
-            ///< Removes the last topic response added for the given topicId and actor name.
-            /// \note topicId must be lowercase
+        TEntryIter end() const override;
+        ///< Iterator pointing past the end of the main journal.
 
-            TEntryIter begin() const override;
-            ///< Iterator pointing to the begin of the main journal.
-            ///
-            /// \note Iterators to main journal entries will never become invalid.
+        TQuestIter questBegin() const override;
+        ///< Iterator pointing to the first quest (sorted by topic ID)
 
-            TEntryIter end() const override;
-            ///< Iterator pointing past the end of the main journal.
+        TQuestIter questEnd() const override;
+        ///< Iterator pointing past the last quest.
 
-            TQuestIter questBegin() const override;
-            ///< Iterator pointing to the first quest (sorted by topic ID)
+        TTopicIter topicBegin() const override;
+        ///< Iterator pointing to the first topic (sorted by topic ID)
+        ///
+        /// \note The topic ID is identical with the user-visible topic string.
 
-            TQuestIter questEnd() const override;
-            ///< Iterator pointing past the last quest.
+        TTopicIter topicEnd() const override;
+        ///< Iterator pointing past the last topic.
 
-            TTopicIter topicBegin() const override;
-            ///< Iterator pointing to the first topic (sorted by topic ID)
-            ///
-            /// \note The topic ID is identical with the user-visible topic string.
+        int countSavedGameRecords() const override;
 
-            TTopicIter topicEnd() const override;
-            ///< Iterator pointing past the last topic.
+        void write(ESM::ESMWriter& writer, Loading::Listener& progress) const override;
 
-            int countSavedGameRecords() const override;
-
-            void write (ESM::ESMWriter& writer, Loading::Listener& progress) const override;
-
-            void readRecord (ESM::ESMReader& reader, uint32_t type) override;
+        void readRecord(ESM::ESMReader& reader, uint32_t type) override;
     };
 }
 
diff --git a/apps/openmw/mwdialogue/keywordsearch.hpp b/apps/openmw/mwdialogue/keywordsearch.hpp
index 8c02210121..e864533906 100644
--- a/apps/openmw/mwdialogue/keywordsearch.hpp
+++ b/apps/openmw/mwdialogue/keywordsearch.hpp
@@ -1,11 +1,11 @@
 #ifndef GAME_MWDIALOGUE_KEYWORDSEARCH_H
 #define GAME_MWDIALOGUE_KEYWORDSEARCH_H
 
+#include <algorithm> // std::reverse
 #include <cctype>
 #include <map>
 #include <stdexcept>
 #include <vector>
-#include <algorithm>    // std::reverse
 
 #include <components/misc/strings/algorithm.hpp>
 #include <components/misc/strings/lower.hpp>
@@ -13,235 +13,233 @@
 namespace MWDialogue
 {
 
-template <typename string_t, typename value_t>
-class KeywordSearch
-{
-public:
-
-    typedef typename string_t::const_iterator Point;
-
-    struct Match
+    template <typename string_t, typename value_t>
+    class KeywordSearch
     {
-        Point mBeg;
-        Point mEnd;
-        value_t mValue;
-    };
+    public:
+        typedef typename string_t::const_iterator Point;
 
-    void seed (string_t keyword, value_t value)
-    {
-        if (keyword.empty())
-            return;
-        seed_impl  (std::move(keyword), std::move (value), 0, mRoot);
-    }
-
-    void clear ()
-    {
-        mRoot.mChildren.clear ();
-        mRoot.mKeyword.clear ();
-    }
+        struct Match
+        {
+            Point mBeg;
+            Point mEnd;
+            value_t mValue;
+        };
 
-    bool containsKeyword (const string_t& keyword, value_t& value)
-    {
-        typename Entry::childen_t::iterator current;
-        typename Entry::childen_t::iterator next;
+        void seed(string_t keyword, value_t value)
+        {
+            if (keyword.empty())
+                return;
+            seed_impl(std::move(keyword), std::move(value), 0, mRoot);
+        }
 
-        current = mRoot.mChildren.find (Misc::StringUtils::toLower (*keyword.begin()));
-        if (current == mRoot.mChildren.end())
-            return false;
-        else if (current->second.mKeyword.size() && Misc::StringUtils::ciEqual(current->second.mKeyword, keyword))
+        void clear()
         {
-            value = current->second.mValue;
-            return true;
+            mRoot.mChildren.clear();
+            mRoot.mKeyword.clear();
         }
 
-        for (Point i = ++keyword.begin(); i != keyword.end(); ++i)
+        bool containsKeyword(const string_t& keyword, value_t& value)
         {
-            next = current->second.mChildren.find(Misc::StringUtils::toLower (*i));
-            if (next == current->second.mChildren.end())
+            typename Entry::childen_t::iterator current;
+            typename Entry::childen_t::iterator next;
+
+            current = mRoot.mChildren.find(Misc::StringUtils::toLower(*keyword.begin()));
+            if (current == mRoot.mChildren.end())
                 return false;
-            if (Misc::StringUtils::ciEqual(next->second.mKeyword, keyword))
+            else if (current->second.mKeyword.size() && Misc::StringUtils::ciEqual(current->second.mKeyword, keyword))
             {
-                value = next->second.mValue;
+                value = current->second.mValue;
                 return true;
             }
-            current = next;
-        }
-        return false;
-    }
 
+            for (Point i = ++keyword.begin(); i != keyword.end(); ++i)
+            {
+                next = current->second.mChildren.find(Misc::StringUtils::toLower(*i));
+                if (next == current->second.mChildren.end())
+                    return false;
+                if (Misc::StringUtils::ciEqual(next->second.mKeyword, keyword))
+                {
+                    value = next->second.mValue;
+                    return true;
+                }
+                current = next;
+            }
+            return false;
+        }
 
-    static bool sortMatches(const Match& left, const Match& right)
-    {
-        return left.mBeg < right.mBeg;
-    }
+        static bool sortMatches(const Match& left, const Match& right) { return left.mBeg < right.mBeg; }
 
-    void highlightKeywords (Point beg, Point end, std::vector<Match>& out) const
-    {
-        std::vector<Match> matches;
-        for (Point i = beg; i != end; ++i)
+        void highlightKeywords(Point beg, Point end, std::vector<Match>& out) const
         {
-            // check first character
-            typename Entry::childen_t::const_iterator candidate = mRoot.mChildren.find (Misc::StringUtils::toLower (*i));
-
-            // no match, on to next character
-            if (candidate == mRoot.mChildren.end ())
-                continue;
+            std::vector<Match> matches;
+            for (Point i = beg; i != end; ++i)
+            {
+                // check first character
+                typename Entry::childen_t::const_iterator candidate
+                    = mRoot.mChildren.find(Misc::StringUtils::toLower(*i));
 
-            // see how far the match goes
-            Point j = i;
+                // no match, on to next character
+                if (candidate == mRoot.mChildren.end())
+                    continue;
 
-            // some keywords might be longer variations of other keywords, so we definitely need a list of candidates
-            // the first element in the pair is length of the match, i.e. depth from the first character on
-            std::vector< typename std::pair<int, typename Entry::childen_t::const_iterator> > candidates;
+                // see how far the match goes
+                Point j = i;
 
-            while ((j + 1) != end)
-            {
-                typename Entry::childen_t::const_iterator next = candidate->second.mChildren.find (Misc::StringUtils::toLower (*++j));
+                // some keywords might be longer variations of other keywords, so we definitely need a list of
+                // candidates the first element in the pair is length of the match, i.e. depth from the first character
+                // on
+                std::vector<typename std::pair<int, typename Entry::childen_t::const_iterator>> candidates;
 
-                if (next == candidate->second.mChildren.end ())
+                while ((j + 1) != end)
                 {
-                    if (candidate->second.mKeyword.size() > 0)
-                        candidates.push_back(std::make_pair((j-i), candidate));
-                    break;
-                }
+                    typename Entry::childen_t::const_iterator next
+                        = candidate->second.mChildren.find(Misc::StringUtils::toLower(*++j));
 
-                candidate = next;
-
-                if (candidate->second.mKeyword.size() > 0)
-                    candidates.push_back(std::make_pair((j-i), candidate));
-            }
+                    if (next == candidate->second.mChildren.end())
+                    {
+                        if (candidate->second.mKeyword.size() > 0)
+                            candidates.push_back(std::make_pair((j - i), candidate));
+                        break;
+                    }
 
-            if (candidates.empty())
-                continue; // didn't match enough to disambiguate, on to next character
+                    candidate = next;
 
-            // shorter candidates will be added to the vector first. however, we want to check against longer candidates first
-            std::reverse(candidates.begin(), candidates.end());
+                    if (candidate->second.mKeyword.size() > 0)
+                        candidates.push_back(std::make_pair((j - i), candidate));
+                }
 
-            for (typename std::vector< std::pair<int, typename Entry::childen_t::const_iterator> >::iterator it = candidates.begin();
-                 it != candidates.end(); ++it)
-            {
-                candidate = it->second;
-                // try to match the rest of the keyword
-                Point k = i + it->first;
-                typename string_t::const_iterator t = candidate->second.mKeyword.begin () + (k - i);
+                if (candidates.empty())
+                    continue; // didn't match enough to disambiguate, on to next character
 
+                // shorter candidates will be added to the vector first. however, we want to check against longer
+                // candidates first
+                std::reverse(candidates.begin(), candidates.end());
 
-                while (k != end && t != candidate->second.mKeyword.end ())
+                for (typename std::vector<std::pair<int, typename Entry::childen_t::const_iterator>>::iterator it
+                     = candidates.begin();
+                     it != candidates.end(); ++it)
                 {
-                    if (Misc::StringUtils::toLower (*k) != Misc::StringUtils::toLower (*t))
-                        break;
-
-                    ++k, ++t;
+                    candidate = it->second;
+                    // try to match the rest of the keyword
+                    Point k = i + it->first;
+                    typename string_t::const_iterator t = candidate->second.mKeyword.begin() + (k - i);
+
+                    while (k != end && t != candidate->second.mKeyword.end())
+                    {
+                        if (Misc::StringUtils::toLower(*k) != Misc::StringUtils::toLower(*t))
+                            break;
+
+                        ++k, ++t;
+                    }
+
+                    // didn't match full keyword, try the next candidate
+                    if (t != candidate->second.mKeyword.end())
+                        continue;
+
+                    // found a keyword, but there might still be longer keywords that start somewhere _within_ this
+                    // keyword we will resolve these overlapping keywords later, choosing the longest one in case of
+                    // conflict
+                    Match match;
+                    match.mValue = candidate->second.mValue;
+                    match.mBeg = i;
+                    match.mEnd = k;
+                    matches.push_back(match);
+                    break;
                 }
-
-                // didn't match full keyword, try the next candidate
-                if (t != candidate->second.mKeyword.end ())
-                    continue;
-
-                // found a keyword, but there might still be longer keywords that start somewhere _within_ this keyword
-                // we will resolve these overlapping keywords later, choosing the longest one in case of conflict
-                Match match;
-                match.mValue = candidate->second.mValue;
-                match.mBeg = i;
-                match.mEnd = k;
-                matches.push_back(match);
-                break;
             }
-        }
 
-        // resolve overlapping keywords
-        while (!matches.empty())
-        {
-            int longestKeywordSize = 0;
-            typename std::vector<Match>::iterator longestKeyword = matches.begin();
-            for (typename std::vector<Match>::iterator it = matches.begin(); it != matches.end(); ++it)
+            // resolve overlapping keywords
+            while (!matches.empty())
             {
-                int size = it->mEnd - it->mBeg;
-                if (size > longestKeywordSize)
+                int longestKeywordSize = 0;
+                typename std::vector<Match>::iterator longestKeyword = matches.begin();
+                for (typename std::vector<Match>::iterator it = matches.begin(); it != matches.end(); ++it)
                 {
-                    longestKeywordSize = size;
-                    longestKeyword = it;
-                }
+                    int size = it->mEnd - it->mBeg;
+                    if (size > longestKeywordSize)
+                    {
+                        longestKeywordSize = size;
+                        longestKeyword = it;
+                    }
 
-                typename std::vector<Match>::iterator next = it;
-                ++next;
+                    typename std::vector<Match>::iterator next = it;
+                    ++next;
 
-                if (next == matches.end())
-                    break;
+                    if (next == matches.end())
+                        break;
 
-                if (it->mEnd <= next->mBeg)
+                    if (it->mEnd <= next->mBeg)
+                    {
+                        break; // no overlap
+                    }
+                }
+
+                Match keyword = *longestKeyword;
+                matches.erase(longestKeyword);
+                out.push_back(keyword);
+                // erase anything that overlaps with the keyword we just added to the output
+                for (typename std::vector<Match>::iterator it = matches.begin(); it != matches.end();)
                 {
-                    break; // no overlap
+                    if (it->mBeg < keyword.mEnd && it->mEnd > keyword.mBeg)
+                        it = matches.erase(it);
+                    else
+                        ++it;
                 }
             }
 
-            Match keyword = *longestKeyword;
-            matches.erase(longestKeyword);
-            out.push_back(keyword);
-            // erase anything that overlaps with the keyword we just added to the output
-            for (typename std::vector<Match>::iterator it = matches.begin(); it != matches.end();)
-            {
-                if (it->mBeg < keyword.mEnd && it->mEnd > keyword.mBeg)
-                    it = matches.erase(it);
-                else
-                    ++it;
-            }
+            std::sort(out.begin(), out.end(), sortMatches);
         }
 
-        std::sort(out.begin(), out.end(), sortMatches);
-    }
-
-private:
-
-    struct Entry
-    {
-        typedef std::map <wchar_t, Entry> childen_t;
+    private:
+        struct Entry
+        {
+            typedef std::map<wchar_t, Entry> childen_t;
 
-        string_t mKeyword;
-        value_t mValue;
-        childen_t mChildren;
-    };
+            string_t mKeyword;
+            value_t mValue;
+            childen_t mChildren;
+        };
 
-    void seed_impl (string_t keyword, value_t value, size_t depth, Entry  & entry)
-    {
-        int ch = Misc::StringUtils::toLower (keyword.at (depth));
+        void seed_impl(string_t keyword, value_t value, size_t depth, Entry& entry)
+        {
+            int ch = Misc::StringUtils::toLower(keyword.at(depth));
 
-        typename Entry::childen_t::iterator j = entry.mChildren.find (ch);
+            typename Entry::childen_t::iterator j = entry.mChildren.find(ch);
 
-        if (j == entry.mChildren.end ())
-        {
-            entry.mChildren [ch].mValue = std::move (value);
-            entry.mChildren [ch].mKeyword = std::move (keyword);
-        }
-        else
-        {
-            if (j->second.mKeyword.size () > 0)
+            if (j == entry.mChildren.end())
+            {
+                entry.mChildren[ch].mValue = std::move(value);
+                entry.mChildren[ch].mKeyword = std::move(keyword);
+            }
+            else
             {
-                if (keyword == j->second.mKeyword)
-                    throw std::runtime_error ("duplicate keyword inserted");
+                if (j->second.mKeyword.size() > 0)
+                {
+                    if (keyword == j->second.mKeyword)
+                        throw std::runtime_error("duplicate keyword inserted");
 
-                value_t pushValue = j->second.mValue;
-                string_t pushKeyword = j->second.mKeyword;
+                    value_t pushValue = j->second.mValue;
+                    string_t pushKeyword = j->second.mKeyword;
 
-                if (depth >= pushKeyword.size ())
-                    throw std::runtime_error ("unexpected");
+                    if (depth >= pushKeyword.size())
+                        throw std::runtime_error("unexpected");
 
-                if (depth+1 < pushKeyword.size())
-                {
-                    seed_impl (std::move (pushKeyword), std::move (pushValue), depth+1, j->second);
-                    j->second.mKeyword.clear ();
+                    if (depth + 1 < pushKeyword.size())
+                    {
+                        seed_impl(std::move(pushKeyword), std::move(pushValue), depth + 1, j->second);
+                        j->second.mKeyword.clear();
+                    }
                 }
+                if (depth + 1 == keyword.size())
+                    j->second.mKeyword = value;
+                else // depth+1 < keyword.size()
+                    seed_impl(std::move(keyword), std::move(value), depth + 1, j->second);
             }
-            if (depth+1 == keyword.size())
-                j->second.mKeyword = value;
-            else // depth+1 < keyword.size()
-                seed_impl (std::move (keyword), std::move (value), depth+1, j->second);
         }
 
-    }
-
-    Entry mRoot;
-};
+        Entry mRoot;
+    };
 
 }
 
diff --git a/apps/openmw/mwdialogue/quest.cpp b/apps/openmw/mwdialogue/quest.cpp
index e9b0166f9f..ae29b0bca8 100644
--- a/apps/openmw/mwdialogue/quest.cpp
+++ b/apps/openmw/mwdialogue/quest.cpp
@@ -12,25 +12,34 @@
 namespace MWDialogue
 {
     Quest::Quest()
-    : Topic(), mIndex (0), mFinished (false)
-    {}
+        : Topic()
+        , mIndex(0)
+        , mFinished(false)
+    {
+    }
 
-    Quest::Quest (const std::string& topic)
-    : Topic (topic), mIndex (0), mFinished (false)
-    {}
+    Quest::Quest(const std::string& topic)
+        : Topic(topic)
+        , mIndex(0)
+        , mFinished(false)
+    {
+    }
 
-    Quest::Quest (const ESM::QuestState& state)
-    : Topic (state.mTopic), mIndex (state.mState), mFinished (state.mFinished!=0)
-    {}
+    Quest::Quest(const ESM::QuestState& state)
+        : Topic(state.mTopic)
+        , mIndex(state.mState)
+        , mFinished(state.mFinished != 0)
+    {
+    }
 
     std::string_view Quest::getName() const
     {
-        const ESM::Dialogue *dialogue =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().find (mTopic);
+        const ESM::Dialogue* dialogue
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().find(mTopic);
 
-        for (ESM::Dialogue::InfoContainer::const_iterator iter (dialogue->mInfo.begin());
-            iter!=dialogue->mInfo.end(); ++iter)
-            if (iter->mQuestStatus==ESM::DialInfo::QS_Name)
+        for (ESM::Dialogue::InfoContainer::const_iterator iter(dialogue->mInfo.begin()); iter != dialogue->mInfo.end();
+             ++iter)
+            if (iter->mQuestStatus == ESM::DialInfo::QS_Name)
                 return iter->mResponse;
 
         return {};
@@ -41,7 +50,7 @@ namespace MWDialogue
         return mIndex;
     }
 
-    void Quest::setIndex (int index)
+    void Quest::setIndex(int index)
     {
         // The index must be set even if no related journal entry was found
         mIndex = index;
@@ -57,15 +66,16 @@ namespace MWDialogue
         mFinished = finished;
     }
 
-    bool Quest::addEntry (const JournalEntry& entry)
+    bool Quest::addEntry(const JournalEntry& entry)
     {
-        const ESM::Dialogue *dialogue =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().find (entry.mTopic);
+        const ESM::Dialogue* dialogue
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().find(entry.mTopic);
 
-        auto info = std::find_if(dialogue->mInfo.begin(), dialogue->mInfo.end(), [&](const auto& info) { return info.mId == entry.mInfoId; });
+        auto info = std::find_if(dialogue->mInfo.begin(), dialogue->mInfo.end(),
+            [&](const auto& info) { return info.mId == entry.mInfoId; });
 
         if (info == dialogue->mInfo.end() || info->mData.mJournalIndex == -1)
-            throw std::runtime_error ("unknown journal entry for topic " + mTopic);
+            throw std::runtime_error("unknown journal entry for topic " + mTopic);
 
         if (info->mQuestStatus == ESM::DialInfo::QS_Finished || info->mQuestStatus == ESM::DialInfo::QS_Restart)
             mFinished = info->mQuestStatus == ESM::DialInfo::QS_Finished;
@@ -73,15 +83,15 @@ namespace MWDialogue
         if (info->mData.mJournalIndex > mIndex)
             mIndex = info->mData.mJournalIndex;
 
-        for (TEntryIter iter (mEntries.begin()); iter!=mEntries.end(); ++iter)
-            if (iter->mInfoId==entry.mInfoId)
+        for (TEntryIter iter(mEntries.begin()); iter != mEntries.end(); ++iter)
+            if (iter->mInfoId == entry.mInfoId)
                 return info->mQuestStatus == ESM::DialInfo::QS_Restart;
 
-        mEntries.push_back (entry); // we want slicing here
+        mEntries.push_back(entry); // we want slicing here
         return info->mQuestStatus == ESM::DialInfo::QS_Restart;
     }
 
-    void Quest::write (ESM::QuestState& state) const
+    void Quest::write(ESM::QuestState& state) const
     {
         state.mTopic = getTopic();
         state.mState = mIndex;
diff --git a/apps/openmw/mwdialogue/quest.hpp b/apps/openmw/mwdialogue/quest.hpp
index 17ed62b8c9..b1cf178bf5 100644
--- a/apps/openmw/mwdialogue/quest.hpp
+++ b/apps/openmw/mwdialogue/quest.hpp
@@ -13,34 +13,33 @@ namespace MWDialogue
     /// \brief A quest in progress or a completed quest
     class Quest : public Topic
     {
-            int mIndex;
-            bool mFinished;
+        int mIndex;
+        bool mFinished;
 
-        public:
+    public:
+        Quest();
 
-            Quest();
+        Quest(const std::string& topic);
 
-            Quest (const std::string& topic);
+        Quest(const ESM::QuestState& state);
 
-            Quest (const ESM::QuestState& state);
+        std::string_view getName() const override;
+        ///< May be an empty string
 
-            std::string_view getName() const override;
-            ///< May be an empty string
+        int getIndex() const;
 
-            int getIndex() const;
+        void setIndex(int index);
+        ///< Calling this function with a non-existent index will throw an exception.
 
-            void setIndex (int index);
-            ///< Calling this function with a non-existent index will throw an exception.
+        bool isFinished() const;
+        void setFinished(bool finished);
 
-            bool isFinished() const;
-            void setFinished(bool finished);
+        bool addEntry(const JournalEntry& entry) override;
+        ///< Add entry and adjust index accordingly. Returns true if the quest should be restarted.
+        ///
+        /// \note Redundant entries are ignored, but the index is still adjusted.
 
-            bool addEntry (const JournalEntry& entry) override;
-            ///< Add entry and adjust index accordingly. Returns true if the quest should be restarted.
-            ///
-            /// \note Redundant entries are ignored, but the index is still adjusted.
-
-            void write (ESM::QuestState& state) const;
+        void write(ESM::QuestState& state) const;
     };
 }
 
diff --git a/apps/openmw/mwdialogue/scripttest.cpp b/apps/openmw/mwdialogue/scripttest.cpp
index 3edcf077fc..be10479fdc 100644
--- a/apps/openmw/mwdialogue/scripttest.cpp
+++ b/apps/openmw/mwdialogue/scripttest.cpp
@@ -1,23 +1,23 @@
 #include "scripttest.hpp"
 
-#include "../mwworld/manualref.hpp"
-#include "../mwworld/esmstore.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/esmstore.hpp"
+#include "../mwworld/manualref.hpp"
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/scriptmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwscript/compilercontext.hpp"
 
-#include <components/debug/debuglog.hpp>
 #include <components/compiler/exception.hpp>
-#include <components/compiler/streamerrorhandler.hpp>
-#include <components/compiler/scanner.hpp>
 #include <components/compiler/locals.hpp>
+#include <components/compiler/scanner.hpp>
 #include <components/compiler/scriptparser.hpp>
-#include <components/esm3/loadnpc.hpp>
+#include <components/compiler/streamerrorhandler.hpp>
+#include <components/debug/debuglog.hpp>
 #include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadnpc.hpp>
 
 #include "filter.hpp"
 
@@ -26,101 +26,106 @@
 namespace
 {
 
-void test(const MWWorld::Ptr& actor, int &compiled, int &total, const Compiler::Extensions* extensions, int warningsMode)
-{
-    MWDialogue::Filter filter(actor, 0, false);
-
-    MWScript::CompilerContext compilerContext(MWScript::CompilerContext::Type_Dialogue);
-    compilerContext.setExtensions(extensions);
-    Compiler::StreamErrorHandler errorHandler;
-    errorHandler.setWarningsMode (warningsMode);
-
-    const MWWorld::Store<ESM::Dialogue>& dialogues = MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
-    for (MWWorld::Store<ESM::Dialogue>::iterator it = dialogues.begin(); it != dialogues.end(); ++it)
+    void test(
+        const MWWorld::Ptr& actor, int& compiled, int& total, const Compiler::Extensions* extensions, int warningsMode)
     {
-        std::vector<const ESM::DialInfo*> infos = filter.listAll(*it);
+        MWDialogue::Filter filter(actor, 0, false);
 
-        for (std::vector<const ESM::DialInfo*>::iterator iter = infos.begin(); iter != infos.end(); ++iter)
+        MWScript::CompilerContext compilerContext(MWScript::CompilerContext::Type_Dialogue);
+        compilerContext.setExtensions(extensions);
+        Compiler::StreamErrorHandler errorHandler;
+        errorHandler.setWarningsMode(warningsMode);
+
+        const MWWorld::Store<ESM::Dialogue>& dialogues
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
+        for (MWWorld::Store<ESM::Dialogue>::iterator it = dialogues.begin(); it != dialogues.end(); ++it)
         {
-            const ESM::DialInfo* info = *iter;
-            if (!info->mResultScript.empty())
+            std::vector<const ESM::DialInfo*> infos = filter.listAll(*it);
+
+            for (std::vector<const ESM::DialInfo*>::iterator iter = infos.begin(); iter != infos.end(); ++iter)
             {
-                bool success = true;
-                ++total;
-                try
+                const ESM::DialInfo* info = *iter;
+                if (!info->mResultScript.empty())
                 {
-                    errorHandler.reset();
+                    bool success = true;
+                    ++total;
+                    try
+                    {
+                        errorHandler.reset();
 
-                    std::istringstream input (info->mResultScript + "\n");
+                        std::istringstream input(info->mResultScript + "\n");
 
-                    Compiler::Scanner scanner (errorHandler, input, extensions);
+                        Compiler::Scanner scanner(errorHandler, input, extensions);
 
-                    Compiler::Locals locals;
+                        Compiler::Locals locals;
 
-                    std::string_view actorScript = actor.getClass().getScript(actor);
+                        std::string_view actorScript = actor.getClass().getScript(actor);
 
-                    if (!actorScript.empty())
-                    {
-                        // grab local variables from actor's script, if available.
-                        locals = MWBase::Environment::get().getScriptManager()->getLocals (actorScript);
-                    }
+                        if (!actorScript.empty())
+                        {
+                            // grab local variables from actor's script, if available.
+                            locals = MWBase::Environment::get().getScriptManager()->getLocals(actorScript);
+                        }
 
-                    Compiler::ScriptParser parser(errorHandler, compilerContext, locals, false);
+                        Compiler::ScriptParser parser(errorHandler, compilerContext, locals, false);
 
-                    scanner.scan (parser);
+                        scanner.scan(parser);
 
-                    if (!errorHandler.isGood())
-                        success = false;
+                        if (!errorHandler.isGood())
+                            success = false;
 
-                    ++compiled;
-                }
-                catch (const Compiler::SourceException& /* error */)
-                {
-                    // error has already been reported via error handler
-                    success = false;
-                }
-                catch (const std::exception& error)
-                {
-                    Log(Debug::Error) << std::string ("Dialogue error: An exception has been thrown: ") + error.what();
-                    success = false;
-                }
+                        ++compiled;
+                    }
+                    catch (const Compiler::SourceException& /* error */)
+                    {
+                        // error has already been reported via error handler
+                        success = false;
+                    }
+                    catch (const std::exception& error)
+                    {
+                        Log(Debug::Error)
+                            << std::string("Dialogue error: An exception has been thrown: ") + error.what();
+                        success = false;
+                    }
 
-                if (!success)
-                {
-                    Log(Debug::Error) << "Error: compiling failed (dialogue script): \n" << info->mResultScript << "\n";
+                    if (!success)
+                    {
+                        Log(Debug::Error) << "Error: compiling failed (dialogue script): \n"
+                                          << info->mResultScript << "\n";
+                    }
                 }
             }
         }
     }
-}
 
 }
 
 namespace MWDialogue
 {
 
-namespace ScriptTest
-{
-
-    std::pair<int, int> compileAll(const Compiler::Extensions *extensions, int warningsMode)
+    namespace ScriptTest
     {
-        int compiled = 0, total = 0;
-        const MWWorld::Store<ESM::NPC>& npcs = MWBase::Environment::get().getWorld()->getStore().get<ESM::NPC>();
-        for (MWWorld::Store<ESM::NPC>::iterator it = npcs.begin(); it != npcs.end(); ++it)
-        {
-            MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), it->mId);
-            test(ref.getPtr(), compiled, total, extensions, warningsMode);
-        }
 
-        const MWWorld::Store<ESM::Creature>& creatures = MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>();
-        for (MWWorld::Store<ESM::Creature>::iterator it = creatures.begin(); it != creatures.end(); ++it)
+        std::pair<int, int> compileAll(const Compiler::Extensions* extensions, int warningsMode)
         {
-            MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), it->mId);
-            test(ref.getPtr(), compiled, total, extensions, warningsMode);
+            int compiled = 0, total = 0;
+            const MWWorld::Store<ESM::NPC>& npcs = MWBase::Environment::get().getWorld()->getStore().get<ESM::NPC>();
+            for (MWWorld::Store<ESM::NPC>::iterator it = npcs.begin(); it != npcs.end(); ++it)
+            {
+                MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), it->mId);
+                test(ref.getPtr(), compiled, total, extensions, warningsMode);
+            }
+
+            const MWWorld::Store<ESM::Creature>& creatures
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>();
+            for (MWWorld::Store<ESM::Creature>::iterator it = creatures.begin(); it != creatures.end(); ++it)
+            {
+                MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), it->mId);
+                test(ref.getPtr(), compiled, total, extensions, warningsMode);
+            }
+            return std::make_pair(total, compiled);
         }
-        return std::make_pair(total, compiled);
-    }
 
-}
+    }
 
 }
diff --git a/apps/openmw/mwdialogue/scripttest.hpp b/apps/openmw/mwdialogue/scripttest.hpp
index 0ac2597256..4b770ae12c 100644
--- a/apps/openmw/mwdialogue/scripttest.hpp
+++ b/apps/openmw/mwdialogue/scripttest.hpp
@@ -6,14 +6,14 @@
 namespace MWDialogue
 {
 
-namespace ScriptTest
-{
+    namespace ScriptTest
+    {
 
-/// Attempt to compile all dialogue scripts, use for verification purposes
-/// @return A pair containing <total number of scripts, number of successfully compiled scripts>
-std::pair<int, int> compileAll(const Compiler::Extensions* extensions, int warningsMode);
+        /// Attempt to compile all dialogue scripts, use for verification purposes
+        /// @return A pair containing <total number of scripts, number of successfully compiled scripts>
+        std::pair<int, int> compileAll(const Compiler::Extensions* extensions, int warningsMode);
 
-}
+    }
 
 }
 
diff --git a/apps/openmw/mwdialogue/selectwrapper.cpp b/apps/openmw/mwdialogue/selectwrapper.cpp
index 46f8824437..fa33dcb8e9 100644
--- a/apps/openmw/mwdialogue/selectwrapper.cpp
+++ b/apps/openmw/mwdialogue/selectwrapper.cpp
@@ -1,43 +1,48 @@
 #include "selectwrapper.hpp"
 
-#include <stdexcept>
-#include <sstream>
 #include <iterator>
+#include <sstream>
+#include <stdexcept>
 
 #include <components/misc/strings/lower.hpp>
 
 namespace
 {
-    template<typename T1, typename T2>
-    bool selectCompareImp (char comp, T1 value1, T2 value2)
+    template <typename T1, typename T2>
+    bool selectCompareImp(char comp, T1 value1, T2 value2)
     {
         switch (comp)
         {
-            case '0': return value1==value2;
-            case '1': return value1!=value2;
-            case '2': return value1>value2;
-            case '3': return value1>=value2;
-            case '4': return value1<value2;
-            case '5': return value1<=value2;
+            case '0':
+                return value1 == value2;
+            case '1':
+                return value1 != value2;
+            case '2':
+                return value1 > value2;
+            case '3':
+                return value1 >= value2;
+            case '4':
+                return value1 < value2;
+            case '5':
+                return value1 <= value2;
         }
 
-        throw std::runtime_error ("unknown compare type in dialogue info select");
+        throw std::runtime_error("unknown compare type in dialogue info select");
     }
 
-    template<typename T>
-    bool selectCompareImp (const ESM::DialInfo::SelectStruct& select, T value1)
+    template <typename T>
+    bool selectCompareImp(const ESM::DialInfo::SelectStruct& select, T value1)
     {
-        if (select.mValue.getType()==ESM::VT_Int)
+        if (select.mValue.getType() == ESM::VT_Int)
         {
-            return selectCompareImp (select.mSelectRule[4], value1, select.mValue.getInteger());
+            return selectCompareImp(select.mSelectRule[4], value1, select.mValue.getInteger());
         }
-        else if (select.mValue.getType()==ESM::VT_Float)
+        else if (select.mValue.getType() == ESM::VT_Float)
         {
-            return selectCompareImp (select.mSelectRule[4], value1, select.mValue.getFloat());
+            return selectCompareImp(select.mSelectRule[4], value1, select.mValue.getFloat());
         }
         else
-            throw std::runtime_error (
-                "unsupported variable type in dialogue info select");
+            throw std::runtime_error("unsupported variable type in dialogue info select");
     }
 }
 
@@ -45,56 +50,131 @@ MWDialogue::SelectWrapper::Function MWDialogue::SelectWrapper::decodeFunction()
 {
     int index = 0;
 
-    std::istringstream (mSelect.mSelectRule.substr(2,2)) >> index;
+    std::istringstream(mSelect.mSelectRule.substr(2, 2)) >> index;
 
     switch (index)
     {
-        case  0: return Function_RankLow;
-        case  1: return Function_RankHigh;
-        case  2: return Function_RankRequirement;
-        case  3: return Function_Reputation;
-        case  4: return Function_HealthPercent;
-        case  5: return Function_PCReputation;
-        case  6: return Function_PcLevel;
-        case  7: return Function_PcHealthPercent;
-        case  8: case  9: return Function_PcDynamicStat;
-        case 10: return Function_PcAttribute;
-        case 11: case 12: case 13: case 14: case 15: case 16: case 17: case 18: case 19: case 20:
-        case 21: case 22: case 23: case 24: case 25: case 26: case 27: case 28: case 29: case 30:
-        case 31: case 32: case 33: case 34: case 35: case 36: case 37: return Function_PcSkill;
-        case 38: return Function_PcGender;
-        case 39: return Function_PcExpelled;
-        case 40: return Function_PcCommonDisease;
-        case 41: return Function_PcBlightDisease;
-        case 42: return Function_PcClothingModifier;
-        case 43: return Function_PcCrimeLevel;
-        case 44: return Function_SameGender;
-        case 45: return Function_SameRace;
-        case 46: return Function_SameFaction;
-        case 47: return Function_FactionRankDiff;
-        case 48: return Function_Detected;
-        case 49: return Function_Alarmed;
-        case 50: return Function_Choice;
-        case 51: case 52: case 53: case 54: case 55: case 56: case 57: return Function_PcAttribute;
-        case 58: return Function_PcCorprus;
-        case 59: return Function_Weather;
-        case 60: return Function_PcVampire;
-        case 61: return Function_Level;
-        case 62: return Function_Attacked;
-        case 63: return Function_TalkedToPc;
-        case 64: return Function_PcDynamicStat;
-        case 65: return Function_CreatureTargetted;
-        case 66: return Function_FriendlyHit;
-        case 67: case 68: case 69: case 70: return Function_AiSetting;
-        case 71: return Function_ShouldAttack;
-        case 72: return Function_Werewolf;
-        case 73: return Function_WerewolfKills;
+        case 0:
+            return Function_RankLow;
+        case 1:
+            return Function_RankHigh;
+        case 2:
+            return Function_RankRequirement;
+        case 3:
+            return Function_Reputation;
+        case 4:
+            return Function_HealthPercent;
+        case 5:
+            return Function_PCReputation;
+        case 6:
+            return Function_PcLevel;
+        case 7:
+            return Function_PcHealthPercent;
+        case 8:
+        case 9:
+            return Function_PcDynamicStat;
+        case 10:
+            return Function_PcAttribute;
+        case 11:
+        case 12:
+        case 13:
+        case 14:
+        case 15:
+        case 16:
+        case 17:
+        case 18:
+        case 19:
+        case 20:
+        case 21:
+        case 22:
+        case 23:
+        case 24:
+        case 25:
+        case 26:
+        case 27:
+        case 28:
+        case 29:
+        case 30:
+        case 31:
+        case 32:
+        case 33:
+        case 34:
+        case 35:
+        case 36:
+        case 37:
+            return Function_PcSkill;
+        case 38:
+            return Function_PcGender;
+        case 39:
+            return Function_PcExpelled;
+        case 40:
+            return Function_PcCommonDisease;
+        case 41:
+            return Function_PcBlightDisease;
+        case 42:
+            return Function_PcClothingModifier;
+        case 43:
+            return Function_PcCrimeLevel;
+        case 44:
+            return Function_SameGender;
+        case 45:
+            return Function_SameRace;
+        case 46:
+            return Function_SameFaction;
+        case 47:
+            return Function_FactionRankDiff;
+        case 48:
+            return Function_Detected;
+        case 49:
+            return Function_Alarmed;
+        case 50:
+            return Function_Choice;
+        case 51:
+        case 52:
+        case 53:
+        case 54:
+        case 55:
+        case 56:
+        case 57:
+            return Function_PcAttribute;
+        case 58:
+            return Function_PcCorprus;
+        case 59:
+            return Function_Weather;
+        case 60:
+            return Function_PcVampire;
+        case 61:
+            return Function_Level;
+        case 62:
+            return Function_Attacked;
+        case 63:
+            return Function_TalkedToPc;
+        case 64:
+            return Function_PcDynamicStat;
+        case 65:
+            return Function_CreatureTargetted;
+        case 66:
+            return Function_FriendlyHit;
+        case 67:
+        case 68:
+        case 69:
+        case 70:
+            return Function_AiSetting;
+        case 71:
+            return Function_ShouldAttack;
+        case 72:
+            return Function_Werewolf;
+        case 73:
+            return Function_WerewolfKills;
     }
 
     return Function_False;
 }
 
-MWDialogue::SelectWrapper::SelectWrapper (const ESM::DialInfo::SelectStruct& select) : mSelect (select) {}
+MWDialogue::SelectWrapper::SelectWrapper(const ESM::DialInfo::SelectStruct& select)
+    : mSelect(select)
+{
+}
 
 MWDialogue::SelectWrapper::Function MWDialogue::SelectWrapper::getFunction() const
 {
@@ -102,18 +182,30 @@ MWDialogue::SelectWrapper::Function MWDialogue::SelectWrapper::getFunction() con
 
     switch (type)
     {
-        case '1': return decodeFunction();
-        case '2': return Function_Global;
-        case '3': return Function_Local;
-        case '4': return Function_Journal;
-        case '5': return Function_Item;
-        case '6': return Function_Dead;
-        case '7': return Function_NotId;
-        case '8': return Function_NotFaction;
-        case '9': return Function_NotClass;
-        case 'A': return Function_NotRace;
-        case 'B': return Function_NotCell;
-        case 'C': return Function_NotLocal;
+        case '1':
+            return decodeFunction();
+        case '2':
+            return Function_Global;
+        case '3':
+            return Function_Local;
+        case '4':
+            return Function_Journal;
+        case '5':
+            return Function_Item;
+        case '6':
+            return Function_Dead;
+        case '7':
+            return Function_NotId;
+        case '8':
+            return Function_NotFaction;
+        case '9':
+            return Function_NotClass;
+        case 'A':
+            return Function_NotRace;
+        case 'B':
+            return Function_NotCell;
+        case 'C':
+            return Function_NotLocal;
     }
 
     return Function_None;
@@ -121,64 +213,106 @@ MWDialogue::SelectWrapper::Function MWDialogue::SelectWrapper::getFunction() con
 
 int MWDialogue::SelectWrapper::getArgument() const
 {
-    if (mSelect.mSelectRule[1]!='1')
+    if (mSelect.mSelectRule[1] != '1')
         return 0;
 
     int index = 0;
 
-    std::istringstream (mSelect.mSelectRule.substr(2,2)) >> index;
+    std::istringstream(mSelect.mSelectRule.substr(2, 2)) >> index;
 
     switch (index)
     {
         // AI settings
-        case 67: return 1;
-        case 68: return 0;
-        case 69: return 3;
-        case 70: return 2;
+        case 67:
+            return 1;
+        case 68:
+            return 0;
+        case 69:
+            return 3;
+        case 70:
+            return 2;
 
         // attributes
-        case 10: return 0;
-        case 51: return 1;
-        case 52: return 2;
-        case 53: return 3;
-        case 54: return 4;
-        case 55: return 5;
-        case 56: return 6;
-        case 57: return 7;
+        case 10:
+            return 0;
+        case 51:
+            return 1;
+        case 52:
+            return 2;
+        case 53:
+            return 3;
+        case 54:
+            return 4;
+        case 55:
+            return 5;
+        case 56:
+            return 6;
+        case 57:
+            return 7;
 
         // skills
-        case 11: return 0;
-        case 12: return 1;
-        case 13: return 2;
-        case 14: return 3;
-        case 15: return 4;
-        case 16: return 5;
-        case 17: return 6;
-        case 18: return 7;
-        case 19: return 8;
-        case 20: return 9;
-        case 21: return 10;
-        case 22: return 11;
-        case 23: return 12;
-        case 24: return 13;
-        case 25: return 14;
-        case 26: return 15;
-        case 27: return 16;
-        case 28: return 17;
-        case 29: return 18;
-        case 30: return 19;
-        case 31: return 20;
-        case 32: return 21;
-        case 33: return 22;
-        case 34: return 23;
-        case 35: return 24;
-        case 36: return 25;
-        case 37: return 26;
+        case 11:
+            return 0;
+        case 12:
+            return 1;
+        case 13:
+            return 2;
+        case 14:
+            return 3;
+        case 15:
+            return 4;
+        case 16:
+            return 5;
+        case 17:
+            return 6;
+        case 18:
+            return 7;
+        case 19:
+            return 8;
+        case 20:
+            return 9;
+        case 21:
+            return 10;
+        case 22:
+            return 11;
+        case 23:
+            return 12;
+        case 24:
+            return 13;
+        case 25:
+            return 14;
+        case 26:
+            return 15;
+        case 27:
+            return 16;
+        case 28:
+            return 17;
+        case 29:
+            return 18;
+        case 30:
+            return 19;
+        case 31:
+            return 20;
+        case 32:
+            return 21;
+        case 33:
+            return 22;
+        case 34:
+            return 23;
+        case 35:
+            return 24;
+        case 36:
+            return 25;
+        case 37:
+            return 26;
 
         // dynamic stats
-        case  8: return 1;
-        case  9: return 2;
-        case 64: return 0;
+        case 8:
+            return 1;
+        case 9:
+            return 2;
+        case 64:
+            return 0;
     }
 
     return 0;
@@ -186,73 +320,90 @@ int MWDialogue::SelectWrapper::getArgument() const
 
 MWDialogue::SelectWrapper::Type MWDialogue::SelectWrapper::getType() const
 {
-    static const Function integerFunctions[] =
-    {
-        Function_Journal, Function_Item, Function_Dead,
+    static const Function integerFunctions[] = {
+        Function_Journal,
+        Function_Item,
+        Function_Dead,
         Function_Choice,
         Function_AiSetting,
-        Function_PcAttribute, Function_PcSkill,
+        Function_PcAttribute,
+        Function_PcSkill,
         Function_FriendlyHit,
-        Function_PcLevel, Function_PcGender, Function_PcClothingModifier,
+        Function_PcLevel,
+        Function_PcGender,
+        Function_PcClothingModifier,
         Function_PcCrimeLevel,
         Function_RankRequirement,
-        Function_Level, Function_PCReputation,
+        Function_Level,
+        Function_PCReputation,
         Function_Weather,
-        Function_Reputation, Function_FactionRankDiff,
+        Function_Reputation,
+        Function_FactionRankDiff,
         Function_WerewolfKills,
-        Function_RankLow, Function_RankHigh,
+        Function_RankLow,
+        Function_RankHigh,
         Function_CreatureTargetted,
         // end marker
         Function_None,
     };
 
-    static const Function numericFunctions[] =
-    {
-        Function_Global, Function_Local, Function_NotLocal,
-        Function_PcDynamicStat, Function_PcHealthPercent,
+    static const Function numericFunctions[] = {
+        Function_Global,
+        Function_Local,
+        Function_NotLocal,
+        Function_PcDynamicStat,
+        Function_PcHealthPercent,
         Function_HealthPercent,
         // end marker
         Function_None,
     };
 
-    static const Function booleanFunctions[] =
-    {
+    static const Function booleanFunctions[] = {
         Function_False,
-        Function_SameGender, Function_SameRace, Function_SameFaction,
-        Function_PcCommonDisease, Function_PcBlightDisease, Function_PcCorprus,
+        Function_SameGender,
+        Function_SameRace,
+        Function_SameFaction,
+        Function_PcCommonDisease,
+        Function_PcBlightDisease,
+        Function_PcCorprus,
         Function_PcExpelled,
-        Function_PcVampire, Function_TalkedToPc,
-        Function_Alarmed, Function_Detected,
-        Function_Attacked, Function_ShouldAttack,
+        Function_PcVampire,
+        Function_TalkedToPc,
+        Function_Alarmed,
+        Function_Detected,
+        Function_Attacked,
+        Function_ShouldAttack,
         Function_Werewolf,
         // end marker
         Function_None,
     };
 
-    static const Function invertedBooleanFunctions[] =
-    {
-        Function_NotId, Function_NotFaction, Function_NotClass,
-        Function_NotRace, Function_NotCell,
+    static const Function invertedBooleanFunctions[] = {
+        Function_NotId,
+        Function_NotFaction,
+        Function_NotClass,
+        Function_NotRace,
+        Function_NotCell,
         // end marker
         Function_None,
     };
 
     Function function = getFunction();
 
-    for (int i=0; integerFunctions[i]!=Function_None; ++i)
-        if (integerFunctions[i]==function)
+    for (int i = 0; integerFunctions[i] != Function_None; ++i)
+        if (integerFunctions[i] == function)
             return Type_Integer;
 
-    for (int i=0; numericFunctions[i]!=Function_None; ++i)
-        if (numericFunctions[i]==function)
+    for (int i = 0; numericFunctions[i] != Function_None; ++i)
+        if (numericFunctions[i] == function)
             return Type_Numeric;
 
-    for (int i=0; booleanFunctions[i]!=Function_None; ++i)
-        if (booleanFunctions[i]==function)
+    for (int i = 0; booleanFunctions[i] != Function_None; ++i)
+        if (booleanFunctions[i] == function)
             return Type_Boolean;
 
-    for (int i=0; invertedBooleanFunctions[i]!=Function_None; ++i)
-        if (invertedBooleanFunctions[i]==function)
+    for (int i = 0; invertedBooleanFunctions[i] != Function_None; ++i)
+        if (invertedBooleanFunctions[i] == function)
             return Type_Inverted;
 
     return Type_None;
@@ -260,40 +411,46 @@ MWDialogue::SelectWrapper::Type MWDialogue::SelectWrapper::getType() const
 
 bool MWDialogue::SelectWrapper::isNpcOnly() const
 {
-    static const Function functions[] =
-    {
-        Function_NotFaction, Function_NotClass, Function_NotRace,
-        Function_SameGender, Function_SameRace, Function_SameFaction,
+    static const Function functions[] = {
+        Function_NotFaction,
+        Function_NotClass,
+        Function_NotRace,
+        Function_SameGender,
+        Function_SameRace,
+        Function_SameFaction,
         Function_RankRequirement,
-        Function_Reputation, Function_FactionRankDiff,
-        Function_Werewolf, Function_WerewolfKills,
-        Function_RankLow, Function_RankHigh,
+        Function_Reputation,
+        Function_FactionRankDiff,
+        Function_Werewolf,
+        Function_WerewolfKills,
+        Function_RankLow,
+        Function_RankHigh,
         // end marker
         Function_None,
     };
 
     Function function = getFunction();
 
-    for (int i=0; functions[i]!=Function_None; ++i)
-        if (functions[i]==function)
+    for (int i = 0; functions[i] != Function_None; ++i)
+        if (functions[i] == function)
             return true;
 
     return false;
 }
 
-bool MWDialogue::SelectWrapper::selectCompare (int value) const
+bool MWDialogue::SelectWrapper::selectCompare(int value) const
 {
-    return selectCompareImp (mSelect, value);
+    return selectCompareImp(mSelect, value);
 }
 
-bool MWDialogue::SelectWrapper::selectCompare (float value) const
+bool MWDialogue::SelectWrapper::selectCompare(float value) const
 {
-    return selectCompareImp (mSelect, value);
+    return selectCompareImp(mSelect, value);
 }
 
-bool MWDialogue::SelectWrapper::selectCompare (bool value) const
+bool MWDialogue::SelectWrapper::selectCompare(bool value) const
 {
-    return selectCompareImp (mSelect, static_cast<int> (value));
+    return selectCompareImp(mSelect, static_cast<int>(value));
 }
 
 std::string MWDialogue::SelectWrapper::getName() const
diff --git a/apps/openmw/mwdialogue/selectwrapper.hpp b/apps/openmw/mwdialogue/selectwrapper.hpp
index dff484562d..0d376d957c 100644
--- a/apps/openmw/mwdialogue/selectwrapper.hpp
+++ b/apps/openmw/mwdialogue/selectwrapper.hpp
@@ -7,79 +7,94 @@ namespace MWDialogue
 {
     class SelectWrapper
     {
-            const ESM::DialInfo::SelectStruct& mSelect;
-
-        public:
-
-            enum Function
-            {
-                Function_None, Function_False,
-                Function_Journal,
-                Function_Item,
-                Function_Dead,
-                Function_NotId,
-                Function_NotFaction,
-                Function_NotClass,
-                Function_NotRace,
-                Function_NotCell,
-                Function_NotLocal,
-                Function_Local,
-                Function_Global,
-                Function_SameGender, Function_SameRace, Function_SameFaction,
-                Function_Choice,
-                Function_PcCommonDisease, Function_PcBlightDisease, Function_PcCorprus,
-                Function_AiSetting,
-                Function_PcAttribute, Function_PcSkill,
-                Function_PcExpelled,
-                Function_PcVampire,
-                Function_FriendlyHit,
-                Function_TalkedToPc,
-                Function_PcLevel, Function_PcHealthPercent, Function_PcDynamicStat,
-                Function_PcGender, Function_PcClothingModifier, Function_PcCrimeLevel,
-                Function_RankRequirement,
-                Function_HealthPercent, Function_Level, Function_PCReputation,
-                Function_Weather,
-                Function_Reputation, Function_Alarmed, Function_FactionRankDiff, Function_Detected,
-                Function_Attacked, Function_ShouldAttack,
-                Function_CreatureTargetted,
-                Function_Werewolf, Function_WerewolfKills,
-                Function_RankLow, Function_RankHigh
-            };
-
-            enum Type
-            {
-                Type_None,
-                Type_Integer,
-                Type_Numeric,
-                Type_Boolean,
-                Type_Inverted
-            };
-
-        private:
-
-            Function decodeFunction() const;
-
-        public:
-
-            SelectWrapper (const ESM::DialInfo::SelectStruct& select);
-
-            Function getFunction() const;
-
-            int getArgument() const;
-
-            Type getType() const;
-
-            bool isNpcOnly() const;
-            ///< \attention Do not call any of the select functions for this select struct!
-
-            bool selectCompare (int value) const;
-
-            bool selectCompare (float value) const;
-
-            bool selectCompare (bool value) const;
-
-            std::string getName() const;
-            ///< Return case-smashed name.
+        const ESM::DialInfo::SelectStruct& mSelect;
+
+    public:
+        enum Function
+        {
+            Function_None,
+            Function_False,
+            Function_Journal,
+            Function_Item,
+            Function_Dead,
+            Function_NotId,
+            Function_NotFaction,
+            Function_NotClass,
+            Function_NotRace,
+            Function_NotCell,
+            Function_NotLocal,
+            Function_Local,
+            Function_Global,
+            Function_SameGender,
+            Function_SameRace,
+            Function_SameFaction,
+            Function_Choice,
+            Function_PcCommonDisease,
+            Function_PcBlightDisease,
+            Function_PcCorprus,
+            Function_AiSetting,
+            Function_PcAttribute,
+            Function_PcSkill,
+            Function_PcExpelled,
+            Function_PcVampire,
+            Function_FriendlyHit,
+            Function_TalkedToPc,
+            Function_PcLevel,
+            Function_PcHealthPercent,
+            Function_PcDynamicStat,
+            Function_PcGender,
+            Function_PcClothingModifier,
+            Function_PcCrimeLevel,
+            Function_RankRequirement,
+            Function_HealthPercent,
+            Function_Level,
+            Function_PCReputation,
+            Function_Weather,
+            Function_Reputation,
+            Function_Alarmed,
+            Function_FactionRankDiff,
+            Function_Detected,
+            Function_Attacked,
+            Function_ShouldAttack,
+            Function_CreatureTargetted,
+            Function_Werewolf,
+            Function_WerewolfKills,
+            Function_RankLow,
+            Function_RankHigh
+        };
+
+        enum Type
+        {
+            Type_None,
+            Type_Integer,
+            Type_Numeric,
+            Type_Boolean,
+            Type_Inverted
+        };
+
+    private:
+        Function decodeFunction() const;
+
+    public:
+        SelectWrapper(const ESM::DialInfo::SelectStruct& select);
+
+        Function getFunction() const;
+
+        int getArgument() const;
+
+        Type getType() const;
+
+        bool isNpcOnly() const;
+        ///< \attention Do not call any of the select functions for this select struct!
+
+        bool selectCompare(int value) const;
+
+        bool selectCompare(float value) const;
+
+        bool selectCompare(bool value) const;
+
+        std::string getName() const;
+        ///< Return case-smashed name.
     };
 }
 
diff --git a/apps/openmw/mwdialogue/topic.cpp b/apps/openmw/mwdialogue/topic.cpp
index 50316cfabf..fd6ca7d015 100644
--- a/apps/openmw/mwdialogue/topic.cpp
+++ b/apps/openmw/mwdialogue/topic.cpp
@@ -7,21 +7,20 @@
 
 namespace MWDialogue
 {
-    Topic::Topic()
-    {}
+    Topic::Topic() {}
 
-    Topic::Topic (const std::string& topic)
-    : mTopic (topic), mName (
-      MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().find (topic)->mId)
-    {}
+    Topic::Topic(const std::string& topic)
+        : mTopic(topic)
+        , mName(MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().find(topic)->mId)
+    {
+    }
 
-    Topic::~Topic()
-    {}
+    Topic::~Topic() {}
 
-    bool Topic::addEntry (const JournalEntry& entry)
+    bool Topic::addEntry(const JournalEntry& entry)
     {
-        if (entry.mTopic!=mTopic)
-            throw std::runtime_error ("topic does not match: " + mTopic);
+        if (entry.mTopic != mTopic)
+            throw std::runtime_error("topic does not match: " + mTopic);
 
         // bail out if we already have heard this
         for (Topic::TEntryIter it = mEntries.begin(); it != mEntries.end(); ++it)
@@ -30,13 +29,13 @@ namespace MWDialogue
                 return false;
         }
 
-        mEntries.push_back (entry); // we want slicing here
+        mEntries.push_back(entry); // we want slicing here
         return false;
     }
 
-    void Topic::insertEntry (const ESM::JournalEntry& entry)
+    void Topic::insertEntry(const ESM::JournalEntry& entry)
     {
-        mEntries.push_back (entry);
+        mEntries.push_back(entry);
     }
 
     std::string Topic::getTopic() const
@@ -61,12 +60,11 @@ namespace MWDialogue
 
     void Topic::removeLastAddedResponse(std::string_view actorName)
     {
-        for (std::vector<MWDialogue::Entry>::reverse_iterator it = mEntries.rbegin();
-             it != mEntries.rend(); ++it)
+        for (std::vector<MWDialogue::Entry>::reverse_iterator it = mEntries.rbegin(); it != mEntries.rend(); ++it)
         {
             if (it->mActorName == actorName)
             {
-                mEntries.erase( (++it).base() ); // erase doesn't take a reverse_iterator
+                mEntries.erase((++it).base()); // erase doesn't take a reverse_iterator
                 return;
             }
         }
diff --git a/apps/openmw/mwdialogue/topic.hpp b/apps/openmw/mwdialogue/topic.hpp
index bf74b54e13..c45992a763 100644
--- a/apps/openmw/mwdialogue/topic.hpp
+++ b/apps/openmw/mwdialogue/topic.hpp
@@ -17,45 +17,42 @@ namespace MWDialogue
     /// \brief Collection of seen responses for a topic
     class Topic
     {
-        public:
+    public:
+        typedef std::vector<Entry> TEntryContainer;
+        typedef TEntryContainer::const_iterator TEntryIter;
 
-            typedef std::vector<Entry> TEntryContainer;
-            typedef TEntryContainer::const_iterator TEntryIter;
+    protected:
+        std::string mTopic;
+        std::string mName;
+        TEntryContainer mEntries;
 
-        protected:
+    public:
+        Topic();
 
-            std::string mTopic;
-            std::string mName;
-            TEntryContainer mEntries;
+        Topic(const std::string& topic);
 
-        public:
+        virtual ~Topic();
 
-            Topic();
+        virtual bool addEntry(const JournalEntry& entry);
+        ///< Add entry
+        ///
+        /// \note Redundant entries are ignored.
 
-            Topic (const std::string& topic);
+        void insertEntry(const ESM::JournalEntry& entry);
+        ///< Add entry without checking for redundant entries or modifying the state of the
+        /// topic otherwise
 
-            virtual ~Topic();
+        std::string getTopic() const;
 
-            virtual bool addEntry (const JournalEntry& entry);
-            ///< Add entry
-            ///
-            /// \note Redundant entries are ignored.
+        virtual std::string_view getName() const;
 
-            void insertEntry (const ESM::JournalEntry& entry);
-            ///< Add entry without checking for redundant entries or modifying the state of the
-            /// topic otherwise
+        void removeLastAddedResponse(std::string_view actorName);
 
-            std::string getTopic() const;
+        TEntryIter begin() const;
+        ///< Iterator pointing to the begin of the journal for this topic.
 
-            virtual std::string_view getName() const;
-
-            void removeLastAddedResponse(std::string_view actorName);
-
-            TEntryIter begin() const;
-            ///< Iterator pointing to the begin of the journal for this topic.
-
-            TEntryIter end() const;
-            ///< Iterator pointing past the end of the journal for this topic.
+        TEntryIter end() const;
+        ///< Iterator pointing past the end of the journal for this topic.
     };
 }
 
diff --git a/apps/openmw/mwgui/alchemywindow.cpp b/apps/openmw/mwgui/alchemywindow.cpp
index 67bee26710..238e8c3bc8 100644
--- a/apps/openmw/mwgui/alchemywindow.cpp
+++ b/apps/openmw/mwgui/alchemywindow.cpp
@@ -1,22 +1,22 @@
 #include "alchemywindow.hpp"
 
-#include <MyGUI_Gui.h>
 #include <MyGUI_Button.h>
-#include <MyGUI_EditBox.h>
 #include <MyGUI_ComboBox.h>
 #include <MyGUI_ControllerManager.h>
 #include <MyGUI_ControllerRepeatClick.h>
+#include <MyGUI_EditBox.h>
+#include <MyGUI_Gui.h>
 
-#include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadingr.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwmechanics/magiceffects.hpp"
-#include "../mwmechanics/alchemy.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/alchemy.hpp"
+#include "../mwmechanics/magiceffects.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
@@ -24,9 +24,9 @@
 #include <MyGUI_Macros.h>
 
 #include "inventoryitemmodel.hpp"
-#include "sortfilteritemmodel.hpp"
 #include "itemview.hpp"
 #include "itemwidget.hpp"
+#include "sortfilteritemmodel.hpp"
 #include "ustring.hpp"
 #include "widgets.hpp"
 
@@ -38,8 +38,8 @@ namespace MWGui
         , mModel(nullptr)
         , mSortModel(nullptr)
         , mAlchemy(std::make_unique<MWMechanics::Alchemy>())
-        , mApparatus (4)
-        , mIngredients (4)
+        , mApparatus(4)
+        , mIngredients(4)
     {
         getWidget(mCreateButton, "CreateButton");
         getWidget(mCancelButton, "CancelButton");
@@ -112,35 +112,36 @@ namespace MWGui
     void AlchemyWindow::createPotions(int count)
     {
         MWMechanics::Alchemy::Result result = mAlchemy->create(mNameEdit->getCaption(), count);
-        MWBase::WindowManager *winMgr = MWBase::Environment::get().getWindowManager();
+        MWBase::WindowManager* winMgr = MWBase::Environment::get().getWindowManager();
 
         switch (result)
         {
-        case MWMechanics::Alchemy::Result_NoName:
-            winMgr->messageBox("#{sNotifyMessage37}");
-            break;
-        case MWMechanics::Alchemy::Result_NoMortarAndPestle:
-            winMgr->messageBox("#{sNotifyMessage45}");
-            break;
-        case MWMechanics::Alchemy::Result_LessThanTwoIngredients:
-            winMgr->messageBox("#{sNotifyMessage6a}");
-            break;
-        case MWMechanics::Alchemy::Result_Success:
-            winMgr->playSound("potion success");
-            if (count == 1)
-                winMgr->messageBox("#{sPotionSuccess}");
-            else
-                winMgr->messageBox("#{sPotionSuccess} "+mNameEdit->getCaption().asUTF8()+" ("+std::to_string(count)+")");
-            break;
-        case MWMechanics::Alchemy::Result_NoEffects:
-        case MWMechanics::Alchemy::Result_RandomFailure:
-            winMgr->messageBox("#{sNotifyMessage8}");
-            winMgr->playSound("potion fail");
-            break;
+            case MWMechanics::Alchemy::Result_NoName:
+                winMgr->messageBox("#{sNotifyMessage37}");
+                break;
+            case MWMechanics::Alchemy::Result_NoMortarAndPestle:
+                winMgr->messageBox("#{sNotifyMessage45}");
+                break;
+            case MWMechanics::Alchemy::Result_LessThanTwoIngredients:
+                winMgr->messageBox("#{sNotifyMessage6a}");
+                break;
+            case MWMechanics::Alchemy::Result_Success:
+                winMgr->playSound("potion success");
+                if (count == 1)
+                    winMgr->messageBox("#{sPotionSuccess}");
+                else
+                    winMgr->messageBox(
+                        "#{sPotionSuccess} " + mNameEdit->getCaption().asUTF8() + " (" + std::to_string(count) + ")");
+                break;
+            case MWMechanics::Alchemy::Result_NoEffects:
+            case MWMechanics::Alchemy::Result_RandomFailure:
+                winMgr->messageBox("#{sNotifyMessage8}");
+                winMgr->playSound("potion fail");
+                break;
         }
 
         // remove ingredient slots that have been fully used up
-        for (int i=0; i<4; ++i)
+        for (int i = 0; i < 4; ++i)
             if (mIngredients[i]->isUserString("ToolTipType"))
             {
                 MWWorld::Ptr ingred = *mIngredients[i]->getUserData<MWWorld::Ptr>();
@@ -170,7 +171,7 @@ namespace MWGui
     {
         auto const& wm = MWBase::Environment::get().getWindowManager();
         MyGUI::UString ingredient = toUString(wm->getGameSettingString("sIngredients", "Ingredients"));
-        auto *button = _sender->castType<MyGUI::Button>();
+        auto* button = _sender->castType<MyGUI::Button>();
 
         if (button->getCaption() == ingredient)
         {
@@ -200,7 +201,7 @@ namespace MWGui
 
             itemNames.emplace(item.getClass().getName(item));
 
-            MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
+            MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
             auto const alchemySkill = player.getClass().getSkill(player, ESM::Skill::Alchemy);
 
             auto const effects = MWMechanics::Alchemy::effectsDescription(item, alchemySkill);
@@ -208,15 +209,18 @@ namespace MWGui
         }
 
         mFilterValue->removeAllItems();
-        auto const addItems = [&](auto const& container)
-        {
+        auto const addItems = [&](auto const& container) {
             for (auto const& item : container)
                 mFilterValue->addItem(item);
         };
         switch (mCurrentFilter)
         {
-            case FilterType::ByName: addItems(itemNames); break;
-            case FilterType::ByEffect: addItems(itemEffects); break;
+            case FilterType::ByName:
+                addItems(itemNames);
+                break;
+            case FilterType::ByEffect:
+                addItems(itemEffects);
+                break;
         }
     }
 
@@ -224,8 +228,12 @@ namespace MWGui
     {
         switch (mCurrentFilter)
         {
-            case FilterType::ByName: mSortModel->setNameFilter(filter); break;
-            case FilterType::ByEffect: mSortModel->setEffectFilter(filter); break;
+            case FilterType::ByName:
+                mSortModel->setNameFilter(filter);
+                break;
+            case FilterType::ByEffect:
+                mSortModel->setEffectFilter(filter);
+                break;
         }
         mItemView->update();
     }
@@ -246,7 +254,7 @@ namespace MWGui
     void AlchemyWindow::onOpen()
     {
         mAlchemy->clear();
-        mAlchemy->setAlchemist (MWMechanics::getPlayer());
+        mAlchemy->setAlchemist(MWMechanics::getPlayer());
 
         auto model = std::make_unique<InventoryItemModel>(MWMechanics::getPlayer());
         mModel = model.get();
@@ -260,15 +268,15 @@ namespace MWGui
         mBrewCountEdit->setValue(1);
 
         int index = 0;
-        for (MWMechanics::Alchemy::TToolsIterator iter (mAlchemy->beginTools());
-            iter!=mAlchemy->endTools() && index<static_cast<int> (mApparatus.size()); ++iter, ++index)
+        for (MWMechanics::Alchemy::TToolsIterator iter(mAlchemy->beginTools());
+             iter != mAlchemy->endTools() && index < static_cast<int>(mApparatus.size()); ++iter, ++index)
         {
-            mApparatus.at (index)->setItem(*iter);
-            mApparatus.at (index)->clearUserStrings();
+            mApparatus.at(index)->setItem(*iter);
+            mApparatus.at(index)->clearUserStrings();
             if (!iter->isEmpty())
             {
-                mApparatus.at (index)->setUserString ("ToolTipType", "ItemPtr");
-                mApparatus.at (index)->setUserData (MWWorld::Ptr(*iter));
+                mApparatus.at(index)->setUserString("ToolTipType", "ItemPtr");
+                mApparatus.at(index)->setUserData(MWWorld::Ptr(*iter));
             }
         }
 
@@ -307,13 +315,13 @@ namespace MWGui
 
         mSortModel->clearDragItems();
 
-        MWMechanics::Alchemy::TIngredientsIterator it = mAlchemy->beginIngredients ();
-        for (int i=0; i<4; ++i)
+        MWMechanics::Alchemy::TIngredientsIterator it = mAlchemy->beginIngredients();
+        for (int i = 0; i < 4; ++i)
         {
             ItemWidget* ingredient = mIngredients[i];
 
             MWWorld::Ptr item;
-            if (it != mAlchemy->endIngredients ())
+            if (it != mAlchemy->endIngredients())
             {
                 item = *it;
                 ++it;
@@ -325,11 +333,11 @@ namespace MWGui
             if (ingredient->getChildCount())
                 MyGUI::Gui::getInstance().destroyWidget(ingredient->getChildAt(0));
 
-            ingredient->clearUserStrings ();
+            ingredient->clearUserStrings();
 
             ingredient->setItem(item);
 
-            if (item.isEmpty ())
+            if (item.isEmpty())
                 continue;
 
             ingredient->setUserString("ToolTipType", "ItemPtr");
@@ -342,12 +350,13 @@ namespace MWGui
 
         std::set<MWMechanics::EffectKey> effectIds = mAlchemy->listEffects();
         Widgets::SpellEffectList list;
-        unsigned int effectIndex=0;
+        unsigned int effectIndex = 0;
         for (const MWMechanics::EffectKey& effectKey : effectIds)
         {
             Widgets::SpellEffectParams params;
             params.mEffectID = effectKey.mId;
-            const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectKey.mId);
+            const ESM::MagicEffect* magicEffect
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectKey.mId);
             if (magicEffect->mData.mFlags & ESM::MagicEffect::TargetSkill)
                 params.mSkill = effectKey.mArg;
             else if (magicEffect->mData.mFlags & ESM::MagicEffect::TargetAttribute)
@@ -366,8 +375,8 @@ namespace MWGui
             MyGUI::Gui::getInstance().destroyWidget(mEffectsBox->getChildAt(0));
 
         MyGUI::IntCoord coord(0, 0, mEffectsBox->getWidth(), 24);
-        Widgets::MWEffectListPtr effectsWidget = mEffectsBox->createWidget<Widgets::MWEffectList>
-            ("MW_StatName", coord, MyGUI::Align::Left | MyGUI::Align::Top);
+        Widgets::MWEffectListPtr effectsWidget = mEffectsBox->createWidget<Widgets::MWEffectList>(
+            "MW_StatName", coord, MyGUI::Align::Left | MyGUI::Align::Top);
 
         effectsWidget->setEffectList(list);
 
@@ -378,16 +387,17 @@ namespace MWGui
 
     void AlchemyWindow::removeIngredient(MyGUI::Widget* ingredient)
     {
-        for (int i=0; i<4; ++i)
+        for (int i = 0; i < 4; ++i)
             if (mIngredients[i] == ingredient)
-                mAlchemy->removeIngredient (i);
+                mAlchemy->removeIngredient(i);
 
         update();
     }
 
-    void AlchemyWindow::addRepeatController(MyGUI::Widget *widget)
+    void AlchemyWindow::addRepeatController(MyGUI::Widget* widget)
     {
-        MyGUI::ControllerItem* item = MyGUI::ControllerManager::getInstance().createItem(MyGUI::ControllerRepeatClick::getClassTypeName());
+        MyGUI::ControllerItem* item
+            = MyGUI::ControllerManager::getInstance().createItem(MyGUI::ControllerRepeatClick::getClassTypeName());
         MyGUI::ControllerRepeatClick* controller = static_cast<MyGUI::ControllerRepeatClick*>(item);
         controller->eventRepeatClick += newDelegate(this, &AlchemyWindow::onRepeatClick);
         MyGUI::ControllerManager::getInstance().addItem(widget, controller);
@@ -413,7 +423,7 @@ namespace MWGui
             onDecreaseButtonTriggered();
     }
 
-    void AlchemyWindow::onCountButtonReleased(MyGUI::Widget *_sender, int _left, int _top, MyGUI::MouseButton _id)
+    void AlchemyWindow::onCountButtonReleased(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
     {
         MyGUI::ControllerManager::getInstance().removeItem(_sender);
     }
@@ -431,13 +441,13 @@ namespace MWGui
         if (currentCount == std::numeric_limits<int>::max())
             return;
 
-        mBrewCountEdit->setValue(currentCount+1);
+        mBrewCountEdit->setValue(currentCount + 1);
     }
 
     void AlchemyWindow::onDecreaseButtonTriggered()
     {
         int currentCount = mBrewCountEdit->getValue();
         if (currentCount > 1)
-            mBrewCountEdit->setValue(currentCount-1);
+            mBrewCountEdit->setValue(currentCount - 1);
     }
 }
diff --git a/apps/openmw/mwgui/alchemywindow.hpp b/apps/openmw/mwgui/alchemywindow.hpp
index afc00e2bfb..681de0e316 100644
--- a/apps/openmw/mwgui/alchemywindow.hpp
+++ b/apps/openmw/mwgui/alchemywindow.hpp
@@ -4,8 +4,8 @@
 #include <memory>
 #include <vector>
 
-#include <MyGUI_ControllerItem.h>
 #include <MyGUI_ComboBox.h>
+#include <MyGUI_ControllerItem.h>
 
 #include <components/widgets/box.hpp>
 #include <components/widgets/numericeditbox.hpp>
@@ -31,12 +31,15 @@ namespace MWGui
         void onResChange(int, int) override { center(); }
 
     private:
-
         static const float sCountChangeInitialPause; // in seconds
         static const float sCountChangeInterval; // in seconds
 
         std::string mSuggestedPotionName;
-        enum class FilterType { ByName, ByEffect };
+        enum class FilterType
+        {
+            ByName,
+            ByEffect
+        };
         FilterType mCurrentFilter;
 
         ItemView* mItemView;
diff --git a/apps/openmw/mwgui/backgroundimage.cpp b/apps/openmw/mwgui/backgroundimage.cpp
index 55c825ebbd..e2e2c62cd1 100644
--- a/apps/openmw/mwgui/backgroundimage.cpp
+++ b/apps/openmw/mwgui/backgroundimage.cpp
@@ -5,59 +5,59 @@
 namespace MWGui
 {
 
-void BackgroundImage::setBackgroundImage (const std::string& image, bool fixedRatio, bool stretch)
-{
-    if (mChild)
+    void BackgroundImage::setBackgroundImage(const std::string& image, bool fixedRatio, bool stretch)
     {
-        MyGUI::Gui::getInstance().destroyWidget(mChild);
-        mChild = nullptr;
+        if (mChild)
+        {
+            MyGUI::Gui::getInstance().destroyWidget(mChild);
+            mChild = nullptr;
+        }
+        if (!stretch)
+        {
+            setImageTexture("black");
+
+            if (fixedRatio)
+                mAspect = 4.0 / 3.0;
+            else
+                mAspect = 0; // TODO
+
+            mChild
+                = createWidgetReal<MyGUI::ImageBox>("ImageBox", MyGUI::FloatCoord(0, 0, 1, 1), MyGUI::Align::Default);
+            mChild->setImageTexture(image);
+
+            adjustSize();
+        }
+        else
+        {
+            mAspect = 0;
+            setImageTexture(image);
+        }
     }
-    if (!stretch)
+
+    void BackgroundImage::adjustSize()
     {
-        setImageTexture("black");
+        if (mAspect == 0)
+            return;
 
-        if (fixedRatio)
-            mAspect = 4.0/3.0;
-        else
-            mAspect = 0; // TODO
+        MyGUI::IntSize screenSize = getSize();
 
-        mChild = createWidgetReal<MyGUI::ImageBox>("ImageBox",
-            MyGUI::FloatCoord(0,0,1,1), MyGUI::Align::Default);
-        mChild->setImageTexture(image);
+        int leftPadding = std::max(0, static_cast<int>(screenSize.width - screenSize.height * mAspect) / 2);
+        int topPadding = std::max(0, static_cast<int>(screenSize.height - screenSize.width / mAspect) / 2);
 
-        adjustSize();
+        mChild->setCoord(
+            leftPadding, topPadding, screenSize.width - leftPadding * 2, screenSize.height - topPadding * 2);
     }
-    else
+
+    void BackgroundImage::setSize(const MyGUI::IntSize& _value)
     {
-        mAspect = 0;
-        setImageTexture(image);
+        MyGUI::Widget::setSize(_value);
+        adjustSize();
     }
-}
-
-void BackgroundImage::adjustSize()
-{
-    if (mAspect == 0)
-        return;
-
-    MyGUI::IntSize screenSize = getSize();
-
-    int leftPadding = std::max(0, static_cast<int>(screenSize.width - screenSize.height * mAspect) / 2);
-    int topPadding = std::max(0, static_cast<int>(screenSize.height - screenSize.width / mAspect) / 2);
-
-    mChild->setCoord(leftPadding, topPadding, screenSize.width - leftPadding*2, screenSize.height - topPadding*2);
-}
-
-void BackgroundImage::setSize (const MyGUI::IntSize& _value)
-{
-    MyGUI::Widget::setSize (_value);
-    adjustSize();
-}
-
-void BackgroundImage::setCoord (const MyGUI::IntCoord& _value)
-{
-    MyGUI::Widget::setCoord (_value);
-    adjustSize();
-}
 
+    void BackgroundImage::setCoord(const MyGUI::IntCoord& _value)
+    {
+        MyGUI::Widget::setCoord(_value);
+        adjustSize();
+    }
 
 }
diff --git a/apps/openmw/mwgui/backgroundimage.hpp b/apps/openmw/mwgui/backgroundimage.hpp
index 32cdf1a657..b151a26e27 100644
--- a/apps/openmw/mwgui/backgroundimage.hpp
+++ b/apps/openmw/mwgui/backgroundimage.hpp
@@ -11,19 +11,23 @@ namespace MWGui
      */
     class BackgroundImage final : public MyGUI::ImageBox
     {
-    MYGUI_RTTI_DERIVED(BackgroundImage)
+        MYGUI_RTTI_DERIVED(BackgroundImage)
 
     public:
-        BackgroundImage() : mChild(nullptr), mAspect(0) {}
+        BackgroundImage()
+            : mChild(nullptr)
+            , mAspect(0)
+        {
+        }
 
         /**
          * @param fixedRatio Use a fixed ratio of 4:3, regardless of the image dimensions
          * @param stretch Stretch to fill the whole screen, or add black bars?
          */
-        void setBackgroundImage (const std::string& image, bool fixedRatio=true, bool stretch=true);
+        void setBackgroundImage(const std::string& image, bool fixedRatio = true, bool stretch = true);
 
-        void setSize (const MyGUI::IntSize &_value) override;
-        void setCoord (const MyGUI::IntCoord &_value) override;
+        void setSize(const MyGUI::IntSize& _value) override;
+        void setCoord(const MyGUI::IntCoord& _value) override;
 
     private:
         MyGUI::ImageBox* mChild;
diff --git a/apps/openmw/mwgui/birth.cpp b/apps/openmw/mwgui/birth.cpp
index 6686678983..5390705f93 100644
--- a/apps/openmw/mwgui/birth.cpp
+++ b/apps/openmw/mwgui/birth.cpp
@@ -1,18 +1,18 @@
 #include "birth.hpp"
 
-#include <MyGUI_ListBox.h>
-#include <MyGUI_ImageBox.h>
 #include <MyGUI_Gui.h>
+#include <MyGUI_ImageBox.h>
+#include <MyGUI_ListBox.h>
 #include <MyGUI_ScrollView.h>
 
-#include <components/resource/resourcesystem.hpp>
-#include <components/misc/resourcehelpers.hpp>
 #include <components/esm3/loadbsgn.hpp>
 #include <components/esm3/loadspel.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/player.hpp"
@@ -23,9 +23,10 @@
 namespace
 {
 
-    bool sortBirthSigns(const std::pair<std::string, const ESM::BirthSign*>& left, const std::pair<std::string, const ESM::BirthSign*>& right)
+    bool sortBirthSigns(const std::pair<std::string, const ESM::BirthSign*>& left,
+        const std::pair<std::string, const ESM::BirthSign*>& right)
     {
-        return left.second->mName.compare (right.second->mName) < 0;
+        return left.second->mName.compare(right.second->mName) < 0;
     }
 
 }
@@ -34,7 +35,7 @@ namespace MWGui
 {
 
     BirthDialog::BirthDialog()
-      : WindowModal("openmw_chargen_birth.layout")
+        : WindowModal("openmw_chargen_birth.layout")
     {
         // Centre dialog
         center();
@@ -67,9 +68,11 @@ namespace MWGui
         getWidget(okButton, "OKButton");
 
         if (shown)
-            okButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
+            okButton->setCaption(
+                toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
         else
-            okButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
+            okButton->setCaption(
+                toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
     }
 
     void BirthDialog::onOpen()
@@ -80,14 +83,13 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mBirthList);
 
         // Show the current birthsign by default
-        const std::string &signId =
-            MWBase::Environment::get().getWorld()->getPlayer().getBirthSign();
+        const std::string& signId = MWBase::Environment::get().getWorld()->getPlayer().getBirthSign();
 
         if (!signId.empty())
             setBirthId(signId);
     }
 
-    void BirthDialog::setBirthId(const std::string &birthId)
+    void BirthDialog::setBirthId(const std::string& birthId)
     {
         mCurrentBirthId = birthId;
         mBirthList->setIndexSelected(MyGUI::ITEM_NONE);
@@ -108,15 +110,15 @@ namespace MWGui
 
     void BirthDialog::onOkClicked(MyGUI::Widget* _sender)
     {
-        if(mBirthList->getIndexSelected() == MyGUI::ITEM_NONE)
+        if (mBirthList->getIndexSelected() == MyGUI::ITEM_NONE)
             return;
         eventDone(this);
     }
 
-    void BirthDialog::onAccept(MyGUI::ListBox *_sender, size_t _index)
+    void BirthDialog::onAccept(MyGUI::ListBox* _sender, size_t _index)
     {
         onSelectBirth(_sender, _index);
-        if(mBirthList->getIndexSelected() == MyGUI::ITEM_NONE)
+        if (mBirthList->getIndexSelected() == MyGUI::ITEM_NONE)
             return;
         eventDone(this);
     }
@@ -131,7 +133,7 @@ namespace MWGui
         if (_index == MyGUI::ITEM_NONE)
             return;
 
-        const std::string *birthId = mBirthList->getItemDataAt<std::string>(_index);
+        const std::string* birthId = mBirthList->getItemDataAt<std::string>(_index);
         if (Misc::StringUtils::ciEqual(mCurrentBirthId, *birthId))
             return;
 
@@ -145,11 +147,11 @@ namespace MWGui
     {
         mBirthList->removeAllItems();
 
-        const MWWorld::Store<ESM::BirthSign> &signs =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::BirthSign>();
+        const MWWorld::Store<ESM::BirthSign>& signs
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::BirthSign>();
 
         // sort by name
-        std::vector < std::pair<std::string, const ESM::BirthSign*> > birthSigns;
+        std::vector<std::pair<std::string, const ESM::BirthSign*>> birthSigns;
 
         for (const ESM::BirthSign& sign : signs)
         {
@@ -190,14 +192,12 @@ namespace MWGui
         const int lineHeight = MWBase::Environment::get().getWindowManager()->getFontHeight() + 2;
         MyGUI::IntCoord coord(0, 0, mSpellArea->getWidth(), lineHeight);
 
-        const MWWorld::ESMStore &store =
-            MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
 
-        const ESM::BirthSign *birth =
-            store.get<ESM::BirthSign>().find(mCurrentBirthId);
+        const ESM::BirthSign* birth = store.get<ESM::BirthSign>().find(mCurrentBirthId);
 
-        mBirthImage->setImageTexture(Misc::ResourceHelpers::correctTexturePath(birth->mTexture,
-            MWBase::Environment::get().getResourceSystem()->getVFS()));
+        mBirthImage->setImageTexture(Misc::ResourceHelpers::correctTexturePath(
+            birth->mTexture, MWBase::Environment::get().getResourceSystem()->getVFS()));
 
         std::vector<std::string> abilities, powers, spells;
 
@@ -205,8 +205,8 @@ namespace MWGui
         std::vector<std::string>::const_iterator end = birth->mPowers.mList.end();
         for (; it != end; ++it)
         {
-            const std::string &spellId = *it;
-            const ESM::Spell *spell = store.get<ESM::Spell>().search(spellId);
+            const std::string& spellId = *it;
+            const ESM::Spell* spell = store.get<ESM::Spell>().search(spellId);
             if (!spell)
                 continue; // Skip spells which cannot be found
             ESM::Spell::SpellType type = static_cast<ESM::Spell::SpellType>(spell->mData.mType);
@@ -223,38 +223,39 @@ namespace MWGui
 
         int i = 0;
 
-        struct {
-            const std::vector<std::string> &spells;
-            const char *label;
-        }
-        categories[3] = {
-            {abilities, "sBirthsignmenu1"},
-            {powers,    "sPowers"},
-            {spells,    "sBirthsignmenu2"}
-        };
+        struct
+        {
+            const std::vector<std::string>& spells;
+            const char* label;
+        } categories[3] = { { abilities, "sBirthsignmenu1" }, { powers, "sPowers" }, { spells, "sBirthsignmenu2" } };
 
         for (int category = 0; category < 3; ++category)
         {
             if (!categories[category].spells.empty())
             {
-                MyGUI::TextBox* label = mSpellArea->createWidget<MyGUI::TextBox>("SandBrightText", coord, MyGUI::Align::Default, std::string("Label"));
-                label->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString(categories[category].label, {})));
+                MyGUI::TextBox* label = mSpellArea->createWidget<MyGUI::TextBox>(
+                    "SandBrightText", coord, MyGUI::Align::Default, std::string("Label"));
+                label->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString(
+                    categories[category].label, {})));
                 mSpellItems.push_back(label);
                 coord.top += lineHeight;
 
                 end = categories[category].spells.end();
                 for (it = categories[category].spells.begin(); it != end; ++it)
                 {
-                    const std::string &spellId = *it;
-                    spellWidget = mSpellArea->createWidget<Widgets::MWSpell>("MW_StatName", coord, MyGUI::Align::Default, std::string("Spell") + MyGUI::utility::toString(i));
+                    const std::string& spellId = *it;
+                    spellWidget = mSpellArea->createWidget<Widgets::MWSpell>("MW_StatName", coord,
+                        MyGUI::Align::Default, std::string("Spell") + MyGUI::utility::toString(i));
                     spellWidget->setSpellId(spellId);
 
                     mSpellItems.push_back(spellWidget);
                     coord.top += lineHeight;
 
                     MyGUI::IntCoord spellCoord = coord;
-                    spellCoord.height = 24; // TODO: This should be fetched from the skin somehow, or perhaps a widget in the layout as a template?
-                    spellWidget->createEffectWidgets(mSpellItems, mSpellArea, spellCoord, (category == 0) ? Widgets::MWEffectList::EF_Constant : 0);
+                    spellCoord.height = 24; // TODO: This should be fetched from the skin somehow, or perhaps a widget
+                                            // in the layout as a template?
+                    spellWidget->createEffectWidgets(
+                        mSpellItems, mSpellArea, spellCoord, (category == 0) ? Widgets::MWEffectList::EF_Constant : 0);
                     coord.top = spellCoord.top;
 
                     ++i;
@@ -262,7 +263,8 @@ namespace MWGui
             }
         }
 
-        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the scrollbar is hidden
+        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the
+        // scrollbar is hidden
         mSpellArea->setVisibleVScroll(false);
         mSpellArea->setCanvasSize(MyGUI::IntSize(mSpellArea->getWidth(), std::max(mSpellArea->getHeight(), coord.top)));
         mSpellArea->setVisibleVScroll(true);
diff --git a/apps/openmw/mwgui/birth.hpp b/apps/openmw/mwgui/birth.hpp
index 9f9d4332f1..edf2db2351 100644
--- a/apps/openmw/mwgui/birth.hpp
+++ b/apps/openmw/mwgui/birth.hpp
@@ -16,8 +16,8 @@ namespace MWGui
             GM_Female
         };
 
-        const std::string &getBirthId() const { return mCurrentBirthId; }
-        void setBirthId(const std::string &raceId);
+        const std::string& getBirthId() const { return mCurrentBirthId; }
+        void setBirthId(const std::string& raceId);
 
         void setNextButtonShow(bool shown);
         void onOpen() override;
diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp
index 7cc0f60b1d..9833dd5729 100644
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@@ -2,1406 +2,1404 @@
 
 #include <optional>
 
+#include "MyGUI_FactoryManager.h"
+#include "MyGUI_FontManager.h"
 #include "MyGUI_RenderItem.h"
 #include "MyGUI_RenderManager.h"
 #include "MyGUI_TextureUtility.h"
-#include "MyGUI_FactoryManager.h"
-#include "MyGUI_FontManager.h"
 
 #include <components/misc/utf8stream.hpp>
 #include <components/sceneutil/depth.hpp>
 
-
 namespace MWGui
 {
-struct TypesetBookImpl;
-class PageDisplay;
-class BookPageImpl;
+    struct TypesetBookImpl;
+    class PageDisplay;
+    class BookPageImpl;
 
-static bool ucsSpace (int codePoint);
-static bool ucsLineBreak (int codePoint);
-static bool ucsCarriageReturn (int codePoint);
-static bool ucsBreakingSpace (int codePoint);
+    static bool ucsSpace(int codePoint);
+    static bool ucsLineBreak(int codePoint);
+    static bool ucsCarriageReturn(int codePoint);
+    static bool ucsBreakingSpace(int codePoint);
 
-struct BookTypesetter::Style { virtual ~Style () {} };
-
-struct TypesetBookImpl : TypesetBook
-{
-    typedef std::vector <uint8_t> Content;
-    typedef std::list <Content> Contents;
-    typedef Utf8Stream::Point Utf8Point;
-    typedef std::pair <Utf8Point, Utf8Point> Range;
+    struct BookTypesetter::Style
+    {
+        virtual ~Style() {}
+    };
 
-    struct StyleImpl : BookTypesetter::Style
+    struct TypesetBookImpl : TypesetBook
     {
-        MyGUI::IFont*         mFont;
-        MyGUI::Colour         mHotColour;
-        MyGUI::Colour         mActiveColour;
-        MyGUI::Colour         mNormalColour;
-        InteractiveId mInteractiveId;
-
-        bool match (MyGUI::IFont* tstFont, const MyGUI::Colour& tstHotColour, const MyGUI::Colour& tstActiveColour,
-                    const MyGUI::Colour& tstNormalColour, intptr_t tstInteractiveId)
-        {
-            return (mFont == tstFont) &&
-                   partal_match (tstHotColour, tstActiveColour, tstNormalColour, tstInteractiveId);
-        }
+        typedef std::vector<uint8_t> Content;
+        typedef std::list<Content> Contents;
+        typedef Utf8Stream::Point Utf8Point;
+        typedef std::pair<Utf8Point, Utf8Point> Range;
 
-        bool match (char const * tstFont, const MyGUI::Colour& tstHotColour, const MyGUI::Colour& tstActiveColour,
-                    const MyGUI::Colour& tstNormalColour, intptr_t tstInteractiveId)
+        struct StyleImpl : BookTypesetter::Style
         {
-            return (mFont->getResourceName ()   == tstFont) &&
-                   partal_match (tstHotColour, tstActiveColour, tstNormalColour, tstInteractiveId);
-        }
+            MyGUI::IFont* mFont;
+            MyGUI::Colour mHotColour;
+            MyGUI::Colour mActiveColour;
+            MyGUI::Colour mNormalColour;
+            InteractiveId mInteractiveId;
+
+            bool match(MyGUI::IFont* tstFont, const MyGUI::Colour& tstHotColour, const MyGUI::Colour& tstActiveColour,
+                const MyGUI::Colour& tstNormalColour, intptr_t tstInteractiveId)
+            {
+                return (mFont == tstFont)
+                    && partal_match(tstHotColour, tstActiveColour, tstNormalColour, tstInteractiveId);
+            }
 
-        bool partal_match (const MyGUI::Colour& tstHotColour, const MyGUI::Colour& tstActiveColour,
-                           const MyGUI::Colour& tstNormalColour, intptr_t tstInteractiveId)
-        {
-            return
-                (mHotColour                  == tstHotColour     ) &&
-                (mActiveColour               == tstActiveColour  ) &&
-                (mNormalColour               == tstNormalColour  ) &&
-                (mInteractiveId              == tstInteractiveId ) ;
-        }
-    };
+            bool match(char const* tstFont, const MyGUI::Colour& tstHotColour, const MyGUI::Colour& tstActiveColour,
+                const MyGUI::Colour& tstNormalColour, intptr_t tstInteractiveId)
+            {
+                return (mFont->getResourceName() == tstFont)
+                    && partal_match(tstHotColour, tstActiveColour, tstNormalColour, tstInteractiveId);
+            }
 
-    typedef std::list <StyleImpl> Styles;
+            bool partal_match(const MyGUI::Colour& tstHotColour, const MyGUI::Colour& tstActiveColour,
+                const MyGUI::Colour& tstNormalColour, intptr_t tstInteractiveId)
+            {
+                return (mHotColour == tstHotColour) && (mActiveColour == tstActiveColour)
+                    && (mNormalColour == tstNormalColour) && (mInteractiveId == tstInteractiveId);
+            }
+        };
 
-    struct Run
-    {
-        StyleImpl*  mStyle;
-        Range       mRange;
-        int         mLeft, mRight;
-        int         mPrintableChars;
-    };
+        typedef std::list<StyleImpl> Styles;
 
-    typedef std::vector <Run> Runs;
+        struct Run
+        {
+            StyleImpl* mStyle;
+            Range mRange;
+            int mLeft, mRight;
+            int mPrintableChars;
+        };
 
-    struct Line
-    {
-        Runs mRuns;
-        MyGUI::IntRect mRect;
-    };
+        typedef std::vector<Run> Runs;
 
-    typedef std::vector <Line> Lines;
+        struct Line
+        {
+            Runs mRuns;
+            MyGUI::IntRect mRect;
+        };
 
-    struct Section
-    {
-        Lines mLines;
-        MyGUI::IntRect mRect;
-    };
+        typedef std::vector<Line> Lines;
 
-    typedef std::vector <Section> Sections;
+        struct Section
+        {
+            Lines mLines;
+            MyGUI::IntRect mRect;
+        };
 
-    // Holds "top" and "bottom" vertical coordinates in the source text.
-    // A page is basically a "window" into a portion of the source text, similar to a ScrollView.
-    typedef std::pair <int, int> Page;
+        typedef std::vector<Section> Sections;
 
-    typedef std::vector <Page> Pages;
+        // Holds "top" and "bottom" vertical coordinates in the source text.
+        // A page is basically a "window" into a portion of the source text, similar to a ScrollView.
+        typedef std::pair<int, int> Page;
 
-    Pages mPages;
-    Sections mSections;
-    Contents mContents;
-    Styles mStyles;
-    MyGUI::IntRect mRect;
+        typedef std::vector<Page> Pages;
 
-    virtual ~TypesetBookImpl () {}
+        Pages mPages;
+        Sections mSections;
+        Contents mContents;
+        Styles mStyles;
+        MyGUI::IntRect mRect;
 
-    Range addContent (const BookTypesetter::Utf8Span &text)
-    {
-        Contents::iterator i = mContents.insert (mContents.end (), Content (text.first, text.second));
+        virtual ~TypesetBookImpl() {}
 
-        if (i->empty())
-            return Range (Utf8Point (nullptr), Utf8Point (nullptr));
+        Range addContent(const BookTypesetter::Utf8Span& text)
+        {
+            Contents::iterator i = mContents.insert(mContents.end(), Content(text.first, text.second));
 
-        return Range (i->data(), i->data() + i->size());
-    }
+            if (i->empty())
+                return Range(Utf8Point(nullptr), Utf8Point(nullptr));
 
-    size_t pageCount () const override { return mPages.size (); }
+            return Range(i->data(), i->data() + i->size());
+        }
 
-    std::pair <unsigned int, unsigned int> getSize () const override
-    {
-        return std::make_pair (mRect.width (), mRect.height ());
-    }
+        size_t pageCount() const override { return mPages.size(); }
 
-    template <typename Visitor>
-    void visitRuns (int top, int bottom, MyGUI::IFont* Font, Visitor const & visitor) const
-    {
-        for (Sections::const_iterator i = mSections.begin (); i != mSections.end (); ++i)
+        std::pair<unsigned int, unsigned int> getSize() const override
         {
-            if (top >= mRect.bottom || bottom <= i->mRect.top)
-                continue;
+            return std::make_pair(mRect.width(), mRect.height());
+        }
 
-            for (Lines::const_iterator j = i->mLines.begin (); j != i->mLines.end (); ++j)
+        template <typename Visitor>
+        void visitRuns(int top, int bottom, MyGUI::IFont* Font, Visitor const& visitor) const
+        {
+            for (Sections::const_iterator i = mSections.begin(); i != mSections.end(); ++i)
             {
-                if (top >= j->mRect.bottom || bottom <= j->mRect.top)
+                if (top >= mRect.bottom || bottom <= i->mRect.top)
                     continue;
 
-                for (Runs::const_iterator k = j->mRuns.begin (); k != j->mRuns.end (); ++k)
-                    if (!Font || k->mStyle->mFont == Font)
-                        visitor (*i, *j, *k);
+                for (Lines::const_iterator j = i->mLines.begin(); j != i->mLines.end(); ++j)
+                {
+                    if (top >= j->mRect.bottom || bottom <= j->mRect.top)
+                        continue;
+
+                    for (Runs::const_iterator k = j->mRuns.begin(); k != j->mRuns.end(); ++k)
+                        if (!Font || k->mStyle->mFont == Font)
+                            visitor(*i, *j, *k);
+                }
             }
         }
-    }
 
-    template <typename Visitor>
-    void visitRuns (int top, int bottom, Visitor const & visitor) const
-    {
-        visitRuns (top, bottom, nullptr, visitor);
-    }
-
-    /// hit test with a margin for error. only hits on interactive text fragments are reported.
-    StyleImpl * hitTestWithMargin (int left, int top)
-    {
-        StyleImpl * hit = hitTest(left, top);
-        if (hit && hit->mInteractiveId != 0)
-            return hit;
+        template <typename Visitor>
+        void visitRuns(int top, int bottom, Visitor const& visitor) const
+        {
+            visitRuns(top, bottom, nullptr, visitor);
+        }
 
-        const int maxMargin = 10;
-        for (int margin=1; margin < maxMargin; ++margin)
+        /// hit test with a margin for error. only hits on interactive text fragments are reported.
+        StyleImpl* hitTestWithMargin(int left, int top)
         {
-            for (int i=0; i<4; ++i)
-            {
-                if (i==0)
-                    hit = hitTest(left, top-margin);
-                else if (i==1)
-                    hit = hitTest(left, top+margin);
-                else if (i==2)
-                    hit = hitTest(left-margin, top);
-                else
-                    hit = hitTest(left+margin, top);
+            StyleImpl* hit = hitTest(left, top);
+            if (hit && hit->mInteractiveId != 0)
+                return hit;
 
-                if (hit && hit->mInteractiveId != 0)
-                    return hit;
+            const int maxMargin = 10;
+            for (int margin = 1; margin < maxMargin; ++margin)
+            {
+                for (int i = 0; i < 4; ++i)
+                {
+                    if (i == 0)
+                        hit = hitTest(left, top - margin);
+                    else if (i == 1)
+                        hit = hitTest(left, top + margin);
+                    else if (i == 2)
+                        hit = hitTest(left - margin, top);
+                    else
+                        hit = hitTest(left + margin, top);
+
+                    if (hit && hit->mInteractiveId != 0)
+                        return hit;
+                }
             }
+            return nullptr;
         }
-        return nullptr;
-    }
 
-    StyleImpl * hitTest (int left, int top) const
-    {
-        for (Sections::const_iterator i = mSections.begin (); i != mSections.end (); ++i)
+        StyleImpl* hitTest(int left, int top) const
         {
-            if (top < i->mRect.top || top >= i->mRect.bottom)
-                continue;
-
-            int left1 = left - i->mRect.left;
-
-            for (Lines::const_iterator j = i->mLines.begin (); j != i->mLines.end (); ++j)
+            for (Sections::const_iterator i = mSections.begin(); i != mSections.end(); ++i)
             {
-                if (top < j->mRect.top || top >= j->mRect.bottom)
+                if (top < i->mRect.top || top >= i->mRect.bottom)
                     continue;
 
-                int left2 = left1 - j->mRect.left;
+                int left1 = left - i->mRect.left;
 
-                for (Runs::const_iterator k = j->mRuns.begin (); k != j->mRuns.end (); ++k)
+                for (Lines::const_iterator j = i->mLines.begin(); j != i->mLines.end(); ++j)
                 {
-                    if (left2 < k->mLeft || left2 >= k->mRight)
+                    if (top < j->mRect.top || top >= j->mRect.bottom)
                         continue;
 
-                    return k->mStyle;
+                    int left2 = left1 - j->mRect.left;
+
+                    for (Runs::const_iterator k = j->mRuns.begin(); k != j->mRuns.end(); ++k)
+                    {
+                        if (left2 < k->mLeft || left2 >= k->mRight)
+                            continue;
+
+                        return k->mStyle;
+                    }
                 }
             }
+
+            return nullptr;
         }
 
-        return nullptr;
-    }
+        MyGUI::IFont* affectedFont(StyleImpl* style)
+        {
+            for (Styles::iterator i = mStyles.begin(); i != mStyles.end(); ++i)
+                if (&*i == style)
+                    return i->mFont;
+            return nullptr;
+        }
 
-    MyGUI::IFont* affectedFont (StyleImpl* style)
-    {
-        for (Styles::iterator i = mStyles.begin (); i != mStyles.end (); ++i)
-            if (&*i == style)
-                return i->mFont;
-        return nullptr;
-    }
+        struct Typesetter;
+    };
 
-    struct Typesetter;
-};
+    struct TypesetBookImpl::Typesetter : BookTypesetter
+    {
+        struct PartialText
+        {
+            StyleImpl* mStyle;
+            Utf8Stream::Point mBegin;
+            Utf8Stream::Point mEnd;
+            int mWidth;
+
+            PartialText(StyleImpl* style, Utf8Stream::Point begin, Utf8Stream::Point end, int width)
+                : mStyle(style)
+                , mBegin(begin)
+                , mEnd(end)
+                , mWidth(width)
+            {
+            }
+        };
+
+        typedef TypesetBookImpl Book;
+        typedef std::shared_ptr<Book> BookPtr;
+        typedef std::vector<PartialText>::const_iterator PartialTextConstIterator;
+
+        int mPageWidth;
+        int mPageHeight;
+
+        BookPtr mBook;
+        Section* mSection;
+        Line* mLine;
+        Run* mRun;
+
+        std::vector<Alignment> mSectionAlignment;
+        std::vector<PartialText> mPartialWhitespace;
+        std::vector<PartialText> mPartialWord;
+
+        Book::Content const* mCurrentContent;
+        Alignment mCurrentAlignment;
+
+        Typesetter(size_t width, size_t height)
+            : mPageWidth(width)
+            , mPageHeight(height)
+            , mSection(nullptr)
+            , mLine(nullptr)
+            , mRun(nullptr)
+            , mCurrentContent(nullptr)
+            , mCurrentAlignment(AlignLeft)
+        {
+            mBook = std::make_shared<Book>();
+        }
 
-struct TypesetBookImpl::Typesetter : BookTypesetter
-{
-    struct PartialText {
-        StyleImpl *mStyle;
-        Utf8Stream::Point mBegin;
-        Utf8Stream::Point mEnd;
-        int mWidth;
-
-        PartialText( StyleImpl *style, Utf8Stream::Point begin, Utf8Stream::Point end, int width) :
-            mStyle(style), mBegin(begin), mEnd(end), mWidth(width)
-        {}
-    };
+        virtual ~Typesetter() {}
 
-    typedef TypesetBookImpl Book;
-    typedef std::shared_ptr <Book> BookPtr;
-    typedef std::vector<PartialText>::const_iterator PartialTextConstIterator;
+        Style* createStyle(const std::string& fontName, const Colour& fontColour, bool useBookFont) override
+        {
+            std::string fullFontName;
+            if (fontName.empty())
+                fullFontName = MyGUI::FontManager::getInstance().getDefaultFont();
+            else
+                fullFontName = fontName;
 
-    int mPageWidth;
-    int mPageHeight;
+            if (useBookFont)
+                fullFontName = "Journalbook " + fullFontName;
 
-    BookPtr mBook;
-    Section * mSection;
-    Line * mLine;
-    Run * mRun;
+            for (Styles::iterator i = mBook->mStyles.begin(); i != mBook->mStyles.end(); ++i)
+                if (i->match(fullFontName.c_str(), fontColour, fontColour, fontColour, 0))
+                    return &*i;
 
-    std::vector <Alignment> mSectionAlignment;
-    std::vector <PartialText> mPartialWhitespace;
-    std::vector <PartialText> mPartialWord;
+            MyGUI::IFont* font = MyGUI::FontManager::getInstance().getByName(fullFontName);
+            if (!font)
+                throw std::runtime_error(std::string("can't find font ") + fullFontName);
 
-    Book::Content const * mCurrentContent;
-    Alignment mCurrentAlignment;
+            StyleImpl& style = *mBook->mStyles.insert(mBook->mStyles.end(), StyleImpl());
+            style.mFont = font;
+            style.mHotColour = fontColour;
+            style.mActiveColour = fontColour;
+            style.mNormalColour = fontColour;
+            style.mInteractiveId = 0;
 
-    Typesetter (size_t width, size_t height) :
-        mPageWidth (width), mPageHeight(height),
-        mSection (nullptr), mLine (nullptr), mRun (nullptr),
-        mCurrentContent (nullptr),
-        mCurrentAlignment (AlignLeft)
-    {
-        mBook = std::make_shared <Book> ();
-    }
+            return &style;
+        }
 
-    virtual ~Typesetter ()
-    {
-    }
+        Style* createHotStyle(Style* baseStyle, const Colour& normalColour, const Colour& hoverColour,
+            const Colour& activeColour, InteractiveId id, bool unique) override
+        {
+            StyleImpl* BaseStyle = static_cast<StyleImpl*>(baseStyle);
 
-    Style * createStyle (const std::string& fontName, const Colour& fontColour, bool useBookFont) override
-    {
-        std::string fullFontName;
-        if (fontName.empty())
-            fullFontName = MyGUI::FontManager::getInstance().getDefaultFont();
-        else
-            fullFontName = fontName;
-
-        if (useBookFont)
-            fullFontName = "Journalbook " + fullFontName;
-
-        for (Styles::iterator i = mBook->mStyles.begin (); i != mBook->mStyles.end (); ++i)
-            if (i->match (fullFontName.c_str(), fontColour, fontColour, fontColour, 0))
-                return &*i;
-
-        MyGUI::IFont* font = MyGUI::FontManager::getInstance().getByName(fullFontName);
-        if (!font)
-            throw std::runtime_error(std::string("can't find font ") + fullFontName);
-
-        StyleImpl & style = *mBook->mStyles.insert (mBook->mStyles.end (), StyleImpl ());
-        style.mFont = font;
-        style.mHotColour = fontColour;
-        style.mActiveColour = fontColour;
-        style.mNormalColour = fontColour;
-        style.mInteractiveId = 0;
-
-        return &style;
-    }
+            if (!unique)
+                for (Styles::iterator i = mBook->mStyles.begin(); i != mBook->mStyles.end(); ++i)
+                    if (i->match(BaseStyle->mFont, hoverColour, activeColour, normalColour, id))
+                        return &*i;
 
-    Style* createHotStyle (Style* baseStyle, const Colour& normalColour, const Colour& hoverColour,
-                           const Colour& activeColour, InteractiveId id, bool unique) override
-    {
-        StyleImpl* BaseStyle = static_cast <StyleImpl*> (baseStyle);
+            StyleImpl& style = *mBook->mStyles.insert(mBook->mStyles.end(), StyleImpl());
 
-        if (!unique)
-            for (Styles::iterator i = mBook->mStyles.begin (); i != mBook->mStyles.end (); ++i)
-                if (i->match (BaseStyle->mFont, hoverColour, activeColour, normalColour, id))
-                    return &*i;
+            style.mFont = BaseStyle->mFont;
+            style.mHotColour = hoverColour;
+            style.mActiveColour = activeColour;
+            style.mNormalColour = normalColour;
+            style.mInteractiveId = id;
 
-        StyleImpl & style = *mBook->mStyles.insert (mBook->mStyles.end (), StyleImpl ());
+            return &style;
+        }
 
-        style.mFont = BaseStyle->mFont;
-        style.mHotColour = hoverColour;
-        style.mActiveColour = activeColour;
-        style.mNormalColour = normalColour;
-        style.mInteractiveId = id;
+        void write(Style* style, Utf8Span text) override
+        {
+            Range range = mBook->addContent(text);
 
-        return &style;
-    }
+            writeImpl(static_cast<StyleImpl*>(style), range.first, range.second);
+        }
 
-    void write (Style * style, Utf8Span text) override
-    {
-        Range range = mBook->addContent (text);
+        intptr_t addContent(Utf8Span text, bool select) override
+        {
+            add_partial_text();
 
-        writeImpl (static_cast <StyleImpl*> (style), range.first, range.second);
-    }
+            Contents::iterator i = mBook->mContents.insert(mBook->mContents.end(), Content(text.first, text.second));
 
-    intptr_t addContent (Utf8Span text, bool select) override
-    {
-        add_partial_text();
+            if (select)
+                mCurrentContent = &(*i);
 
-        Contents::iterator i = mBook->mContents.insert (mBook->mContents.end (), Content (text.first, text.second));
+            return reinterpret_cast<intptr_t>(&(*i));
+        }
 
-        if (select)
-            mCurrentContent = &(*i);
+        void selectContent(intptr_t contentHandle) override
+        {
+            add_partial_text();
 
-        return reinterpret_cast <intptr_t> (&(*i));
-    }
+            mCurrentContent = reinterpret_cast<Content const*>(contentHandle);
+        }
 
-    void selectContent (intptr_t contentHandle) override
-    {
-        add_partial_text();
+        void write(Style* style, size_t begin, size_t end) override
+        {
+            assert(mCurrentContent != nullptr);
+            assert(end <= mCurrentContent->size());
+            assert(begin <= mCurrentContent->size());
 
-        mCurrentContent = reinterpret_cast <Content const *> (contentHandle);
-    }
+            Utf8Point begin_ = mCurrentContent->data() + begin;
+            Utf8Point end_ = mCurrentContent->data() + end;
 
-    void write (Style * style, size_t begin, size_t end) override
-    {
-        assert (mCurrentContent != nullptr);
-        assert (end <= mCurrentContent->size ());
-        assert (begin <= mCurrentContent->size ());
+            writeImpl(static_cast<StyleImpl*>(style), begin_, end_);
+        }
 
-        Utf8Point begin_ = mCurrentContent->data() + begin;
-        Utf8Point end_   = mCurrentContent->data() + end;
+        void lineBreak(float margin) override
+        {
+            assert(margin == 0); // TODO: figure out proper behavior here...
 
-        writeImpl (static_cast <StyleImpl*> (style), begin_, end_);
-    }
+            add_partial_text();
 
-    void lineBreak (float margin) override
-    {
-        assert (margin == 0); //TODO: figure out proper behavior here...
+            mRun = nullptr;
+            mLine = nullptr;
+        }
 
-        add_partial_text();
+        void sectionBreak(int margin) override
+        {
+            add_partial_text();
 
-        mRun = nullptr;
-        mLine = nullptr;
-    }
+            if (mBook->mSections.size() > 0)
+            {
+                mRun = nullptr;
+                mLine = nullptr;
+                mSection = nullptr;
 
-    void sectionBreak (int margin) override
-    {
-        add_partial_text();
+                if (mBook->mRect.bottom < (mBook->mSections.back().mRect.bottom + margin))
+                    mBook->mRect.bottom = (mBook->mSections.back().mRect.bottom + margin);
+            }
+        }
 
-        if (mBook->mSections.size () > 0)
+        void setSectionAlignment(Alignment sectionAlignment) override
         {
-            mRun = nullptr;
-            mLine = nullptr;
-            mSection = nullptr;
+            add_partial_text();
 
-            if (mBook->mRect.bottom < (mBook->mSections.back ().mRect.bottom + margin))
-                mBook->mRect.bottom = (mBook->mSections.back ().mRect.bottom + margin);
+            if (mSection != nullptr)
+                mSectionAlignment.back() = sectionAlignment;
+            mCurrentAlignment = sectionAlignment;
         }
-    }
 
-    void setSectionAlignment (Alignment sectionAlignment) override
-    {
-        add_partial_text();
+        TypesetBook::Ptr complete() override
+        {
+            int curPageStart = 0;
+            int curPageStop = 0;
 
-        if (mSection != nullptr)
-            mSectionAlignment.back () = sectionAlignment;
-        mCurrentAlignment = sectionAlignment;
-    }
+            add_partial_text();
 
-    TypesetBook::Ptr complete () override
-    {
-        int curPageStart = 0;
-        int curPageStop  = 0;
+            std::vector<Alignment>::iterator sa = mSectionAlignment.begin();
+            for (Sections::iterator i = mBook->mSections.begin(); i != mBook->mSections.end(); ++i, ++sa)
+            {
+                // apply alignment to individual lines...
+                for (Lines::iterator j = i->mLines.begin(); j != i->mLines.end(); ++j)
+                {
+                    int width = j->mRect.width();
+                    int excess = mPageWidth - width;
 
-        add_partial_text();
+                    switch (*sa)
+                    {
+                        default:
+                        case AlignLeft:
+                            j->mRect.left = 0;
+                            break;
+                        case AlignCenter:
+                            j->mRect.left = excess / 2;
+                            break;
+                        case AlignRight:
+                            j->mRect.left = excess;
+                            break;
+                    }
 
-        std::vector <Alignment>::iterator sa = mSectionAlignment.begin ();
-        for (Sections::iterator i = mBook->mSections.begin (); i != mBook->mSections.end (); ++i, ++sa)
-        {
-            // apply alignment to individual lines...
-            for (Lines::iterator j = i->mLines.begin (); j != i->mLines.end (); ++j)
-            {
-                int width = j->mRect.width ();
-                int excess = mPageWidth - width;
+                    j->mRect.right = j->mRect.left + width;
+                }
 
-                switch (*sa)
+                if (curPageStop == curPageStart)
                 {
-                default:
-                case AlignLeft:   j->mRect.left = 0;        break;
-                case AlignCenter: j->mRect.left = excess/2; break;
-                case AlignRight:  j->mRect.left = excess;   break;
+                    curPageStart = i->mRect.top;
+                    curPageStop = i->mRect.top;
                 }
 
-                j->mRect.right = j->mRect.left + width;
-            }
-
-            if (curPageStop == curPageStart)
-            {
-                curPageStart = i->mRect.top;
-                curPageStop  = i->mRect.top;
-            }
-
-            int spaceLeft = mPageHeight - (curPageStop - curPageStart);
-            int sectionHeight = i->mRect.height ();
+                int spaceLeft = mPageHeight - (curPageStop - curPageStart);
+                int sectionHeight = i->mRect.height();
 
-            // This is NOT equal to i->mRect.height(), which doesn't account for section breaks.
-            int spaceRequired = (i->mRect.bottom - curPageStop);
-            if (curPageStart == curPageStop) // If this is a new page, the section break is not needed
-                spaceRequired = i->mRect.height();
+                // This is NOT equal to i->mRect.height(), which doesn't account for section breaks.
+                int spaceRequired = (i->mRect.bottom - curPageStop);
+                if (curPageStart == curPageStop) // If this is a new page, the section break is not needed
+                    spaceRequired = i->mRect.height();
 
-            if (spaceRequired <= mPageHeight)
-            {
-                if (spaceRequired > spaceLeft)
+                if (spaceRequired <= mPageHeight)
                 {
-                    // The section won't completely fit on the current page. Finish the current page and start a new one.
-                    assert (curPageStart != curPageStop);
+                    if (spaceRequired > spaceLeft)
+                    {
+                        // The section won't completely fit on the current page. Finish the current page and start a new
+                        // one.
+                        assert(curPageStart != curPageStop);
 
-                    mBook->mPages.push_back (Page (curPageStart, curPageStop));
+                        mBook->mPages.push_back(Page(curPageStart, curPageStop));
 
-                    curPageStart = i->mRect.top;
-                    curPageStop = i->mRect.bottom;
+                        curPageStart = i->mRect.top;
+                        curPageStop = i->mRect.bottom;
+                    }
+                    else
+                        curPageStop = i->mRect.bottom;
                 }
                 else
-                    curPageStop = i->mRect.bottom;
-            }
-            else
-            {
-                // The section won't completely fit on the current page. Finish the current page and start a new one.
-                mBook->mPages.push_back (Page (curPageStart, curPageStop));
+                {
+                    // The section won't completely fit on the current page. Finish the current page and start a new
+                    // one.
+                    mBook->mPages.push_back(Page(curPageStart, curPageStop));
 
-                curPageStart = i->mRect.top;
-                curPageStop = i->mRect.bottom;
+                    curPageStart = i->mRect.top;
+                    curPageStop = i->mRect.bottom;
 
-                //split section
-                int sectionHeightLeft = sectionHeight;
-                while (sectionHeightLeft >= mPageHeight)
-                {
-                    // Adjust to the top of the first line that does not fit on the current page anymore
-                    int splitPos = curPageStop;
-                    for (Lines::iterator j = i->mLines.begin (); j != i->mLines.end (); ++j)
+                    // split section
+                    int sectionHeightLeft = sectionHeight;
+                    while (sectionHeightLeft >= mPageHeight)
                     {
-                        if (j->mRect.bottom > curPageStart + mPageHeight)
+                        // Adjust to the top of the first line that does not fit on the current page anymore
+                        int splitPos = curPageStop;
+                        for (Lines::iterator j = i->mLines.begin(); j != i->mLines.end(); ++j)
                         {
-                            splitPos = j->mRect.top;
-                            break;
+                            if (j->mRect.bottom > curPageStart + mPageHeight)
+                            {
+                                splitPos = j->mRect.top;
+                                break;
+                            }
                         }
-                    }
 
-                    mBook->mPages.push_back (Page (curPageStart, splitPos));
-                    curPageStart = splitPos;
-                    curPageStop = splitPos;
+                        mBook->mPages.push_back(Page(curPageStart, splitPos));
+                        curPageStart = splitPos;
+                        curPageStop = splitPos;
 
-                    sectionHeightLeft = (i->mRect.bottom - splitPos);
+                        sectionHeightLeft = (i->mRect.bottom - splitPos);
+                    }
+                    curPageStop = i->mRect.bottom;
                 }
-                curPageStop = i->mRect.bottom;
             }
-        }
 
-        if (curPageStart != curPageStop)
-            mBook->mPages.push_back (Page (curPageStart, curPageStop));
+            if (curPageStart != curPageStop)
+                mBook->mPages.push_back(Page(curPageStart, curPageStop));
 
-        return mBook;
-    }
-
-    void writeImpl (StyleImpl * style, Utf8Stream::Point _begin, Utf8Stream::Point _end)
-    {
-        Utf8Stream stream (_begin, _end);
+            return mBook;
+        }
 
-        while (!stream.eof ())
+        void writeImpl(StyleImpl* style, Utf8Stream::Point _begin, Utf8Stream::Point _end)
         {
-            if (ucsLineBreak (stream.peek ()))
+            Utf8Stream stream(_begin, _end);
+
+            while (!stream.eof())
             {
-                add_partial_text();
-                stream.consume ();
-                mLine = nullptr;
-                mRun = nullptr;
-                continue;
-            }
+                if (ucsLineBreak(stream.peek()))
+                {
+                    add_partial_text();
+                    stream.consume();
+                    mLine = nullptr;
+                    mRun = nullptr;
+                    continue;
+                }
 
-            if (ucsBreakingSpace (stream.peek ()) && !mPartialWord.empty())
-                add_partial_text();
+                if (ucsBreakingSpace(stream.peek()) && !mPartialWord.empty())
+                    add_partial_text();
 
-            int word_width = 0;
-            int space_width = 0;
+                int word_width = 0;
+                int space_width = 0;
 
-            Utf8Stream::Point lead = stream.current ();
+                Utf8Stream::Point lead = stream.current();
 
-            while (!stream.eof () && !ucsLineBreak (stream.peek ()) && ucsBreakingSpace (stream.peek ()))
-            {
-                MWGui::GlyphInfo info = GlyphInfo(style->mFont, stream.peek());
-                if (info.charFound)
-                    space_width += static_cast<int>(info.advance + info.bearingX);
-                stream.consume ();
-            }
+                while (!stream.eof() && !ucsLineBreak(stream.peek()) && ucsBreakingSpace(stream.peek()))
+                {
+                    MWGui::GlyphInfo info = GlyphInfo(style->mFont, stream.peek());
+                    if (info.charFound)
+                        space_width += static_cast<int>(info.advance + info.bearingX);
+                    stream.consume();
+                }
 
-            Utf8Stream::Point origin = stream.current ();
+                Utf8Stream::Point origin = stream.current();
 
-            while (!stream.eof () && !ucsLineBreak (stream.peek ()) && !ucsBreakingSpace (stream.peek ()))
-            {
-                MWGui::GlyphInfo info = GlyphInfo(style->mFont, stream.peek());
-                if (info.charFound)
-                    word_width += static_cast<int>(info.advance + info.bearingX);
-                stream.consume ();
-            }
+                while (!stream.eof() && !ucsLineBreak(stream.peek()) && !ucsBreakingSpace(stream.peek()))
+                {
+                    MWGui::GlyphInfo info = GlyphInfo(style->mFont, stream.peek());
+                    if (info.charFound)
+                        word_width += static_cast<int>(info.advance + info.bearingX);
+                    stream.consume();
+                }
 
-            Utf8Stream::Point extent = stream.current ();
+                Utf8Stream::Point extent = stream.current();
 
-            if (lead == extent)
-                break;
+                if (lead == extent)
+                    break;
 
-            if ( lead != origin )
-                mPartialWhitespace.emplace_back(style, lead, origin, space_width);
-            if ( origin != extent )
-                mPartialWord.emplace_back(style, origin, extent, word_width);
+                if (lead != origin)
+                    mPartialWhitespace.emplace_back(style, lead, origin, space_width);
+                if (origin != extent)
+                    mPartialWord.emplace_back(style, origin, extent, word_width);
+            }
         }
-    }
 
-    void add_partial_text ()
-    {
-        if (mPartialWhitespace.empty() && mPartialWord.empty())
-            return;
+        void add_partial_text()
+        {
+            if (mPartialWhitespace.empty() && mPartialWord.empty())
+                return;
 
-        int fontHeight = MWBase::Environment::get().getWindowManager()->getFontHeight();
-        int space_width = 0;
-        int word_width  = 0;
+            int fontHeight = MWBase::Environment::get().getWindowManager()->getFontHeight();
+            int space_width = 0;
+            int word_width = 0;
 
-        for (PartialTextConstIterator i = mPartialWhitespace.begin (); i != mPartialWhitespace.end (); ++i)
-            space_width += i->mWidth;
-        for (PartialTextConstIterator i = mPartialWord.begin (); i != mPartialWord.end (); ++i)
-            word_width += i->mWidth;
+            for (PartialTextConstIterator i = mPartialWhitespace.begin(); i != mPartialWhitespace.end(); ++i)
+                space_width += i->mWidth;
+            for (PartialTextConstIterator i = mPartialWord.begin(); i != mPartialWord.end(); ++i)
+                word_width += i->mWidth;
 
-        int left = mLine ? mLine->mRect.right : 0;
+            int left = mLine ? mLine->mRect.right : 0;
 
-        if (left + space_width + word_width > mPageWidth)
-        {
-            mLine = nullptr;
-            mRun = nullptr;
-            left = 0;
-        }
-        else
-        {
-            for (PartialTextConstIterator i = mPartialWhitespace.begin (); i != mPartialWhitespace.end (); ++i)
+            if (left + space_width + word_width > mPageWidth)
             {
-                int top = mLine ? mLine->mRect.top : mBook->mRect.bottom;
+                mLine = nullptr;
+                mRun = nullptr;
+                left = 0;
+            }
+            else
+            {
+                for (PartialTextConstIterator i = mPartialWhitespace.begin(); i != mPartialWhitespace.end(); ++i)
+                {
+                    int top = mLine ? mLine->mRect.top : mBook->mRect.bottom;
 
-                append_run ( i->mStyle, i->mBegin, i->mEnd, 0, left + i->mWidth, top + fontHeight);
+                    append_run(i->mStyle, i->mBegin, i->mEnd, 0, left + i->mWidth, top + fontHeight);
 
-                left = mLine->mRect.right;
+                    left = mLine->mRect.right;
+                }
             }
-        }
 
-        for (PartialTextConstIterator i = mPartialWord.begin (); i != mPartialWord.end (); ++i)
-        {
-            int top = mLine ? mLine->mRect.top : mBook->mRect.bottom;
-
-            append_run (i->mStyle, i->mBegin, i->mEnd, i->mEnd - i->mBegin, left + i->mWidth, top + fontHeight);
+            for (PartialTextConstIterator i = mPartialWord.begin(); i != mPartialWord.end(); ++i)
+            {
+                int top = mLine ? mLine->mRect.top : mBook->mRect.bottom;
 
-            left = mLine->mRect.right;
-        }
+                append_run(i->mStyle, i->mBegin, i->mEnd, i->mEnd - i->mBegin, left + i->mWidth, top + fontHeight);
 
-        mPartialWhitespace.clear();
-        mPartialWord.clear();
-    }
+                left = mLine->mRect.right;
+            }
 
-    void append_run (StyleImpl * style, Utf8Stream::Point begin, Utf8Stream::Point end, int pc, int right, int bottom)
-    {
-        if (mSection == nullptr)
-        {
-            mBook->mSections.push_back (Section ());
-            mSection = &mBook->mSections.back ();
-            mSection->mRect = MyGUI::IntRect (0, mBook->mRect.bottom, 0, mBook->mRect.bottom);
-            mSectionAlignment.push_back (mCurrentAlignment);
+            mPartialWhitespace.clear();
+            mPartialWord.clear();
         }
 
-        if (mLine == nullptr)
+        void append_run(StyleImpl* style, Utf8Stream::Point begin, Utf8Stream::Point end, int pc, int right, int bottom)
         {
-            mSection->mLines.push_back (Line ());
-            mLine = &mSection->mLines.back ();
-            mLine->mRect = MyGUI::IntRect (0, mSection->mRect.bottom, 0, mBook->mRect.bottom);
-        }
+            if (mSection == nullptr)
+            {
+                mBook->mSections.push_back(Section());
+                mSection = &mBook->mSections.back();
+                mSection->mRect = MyGUI::IntRect(0, mBook->mRect.bottom, 0, mBook->mRect.bottom);
+                mSectionAlignment.push_back(mCurrentAlignment);
+            }
 
-        if (mBook->mRect.right < right)
-            mBook->mRect.right = right;
+            if (mLine == nullptr)
+            {
+                mSection->mLines.push_back(Line());
+                mLine = &mSection->mLines.back();
+                mLine->mRect = MyGUI::IntRect(0, mSection->mRect.bottom, 0, mBook->mRect.bottom);
+            }
 
-        if (mBook->mRect.bottom < bottom)
-            mBook->mRect.bottom = bottom;
+            if (mBook->mRect.right < right)
+                mBook->mRect.right = right;
 
-        if (mSection->mRect.right < right)
-            mSection->mRect.right = right;
+            if (mBook->mRect.bottom < bottom)
+                mBook->mRect.bottom = bottom;
 
-        if (mSection->mRect.bottom < bottom)
-            mSection->mRect.bottom = bottom;
+            if (mSection->mRect.right < right)
+                mSection->mRect.right = right;
 
-        if (mLine->mRect.right < right)
-            mLine->mRect.right = right;
+            if (mSection->mRect.bottom < bottom)
+                mSection->mRect.bottom = bottom;
 
-        if (mLine->mRect.bottom < bottom)
-            mLine->mRect.bottom = bottom;
+            if (mLine->mRect.right < right)
+                mLine->mRect.right = right;
 
-        if (mRun == nullptr || mRun->mStyle != style || mRun->mRange.second != begin)
-        {
-            int left = mRun ? mRun->mRight : mLine->mRect.left;
-
-            mLine->mRuns.push_back (Run ());
-            mRun = &mLine->mRuns.back ();
-            mRun->mStyle = style;
-            mRun->mLeft = left;
-            mRun->mRight = right;
-            mRun->mRange.first = begin;
-            mRun->mRange.second = end;
-            mRun->mPrintableChars = pc;
-          //Run->Locale = Locale;
-        }
-        else
-        {
-            mRun->mRight = right;
-            mRun->mRange.second = end;
-            mRun->mPrintableChars += pc;
-        }
-    }
-};
+            if (mLine->mRect.bottom < bottom)
+                mLine->mRect.bottom = bottom;
 
-BookTypesetter::Ptr BookTypesetter::create (int pageWidth, int pageHeight)
-{
-    return std::make_shared <TypesetBookImpl::Typesetter> (pageWidth, pageHeight);
-}
+            if (mRun == nullptr || mRun->mStyle != style || mRun->mRange.second != begin)
+            {
+                int left = mRun ? mRun->mRight : mLine->mRect.left;
+
+                mLine->mRuns.push_back(Run());
+                mRun = &mLine->mRuns.back();
+                mRun->mStyle = style;
+                mRun->mLeft = left;
+                mRun->mRight = right;
+                mRun->mRange.first = begin;
+                mRun->mRange.second = end;
+                mRun->mPrintableChars = pc;
+                // Run->Locale = Locale;
+            }
+            else
+            {
+                mRun->mRight = right;
+                mRun->mRange.second = end;
+                mRun->mPrintableChars += pc;
+            }
+        }
+    };
 
-namespace
-{
-    struct RenderXform
+    BookTypesetter::Ptr BookTypesetter::create(int pageWidth, int pageHeight)
     {
-    public:
-
-        float clipTop;
-        float clipLeft;
-        float clipRight;
-        float clipBottom;
-
-        float absoluteLeft;
-        float absoluteTop;
-        float leftOffset;
-        float topOffset;
-
-        float pixScaleX;
-        float pixScaleY;
-        float hOffset;
-        float vOffset;
-
-        RenderXform (MyGUI::ICroppedRectangle* croppedParent, MyGUI::RenderTargetInfo const & renderTargetInfo)
-        {
-            clipTop    = static_cast<float>(croppedParent->_getMarginTop());
-            clipLeft   = static_cast<float>(croppedParent->_getMarginLeft ());
-            clipRight  = static_cast<float>(croppedParent->getWidth () - croppedParent->_getMarginRight ());
-            clipBottom = static_cast<float>(croppedParent->getHeight() - croppedParent->_getMarginBottom());
-
-            absoluteLeft = static_cast<float>(croppedParent->getAbsoluteLeft());
-            absoluteTop  = static_cast<float>(croppedParent->getAbsoluteTop());
-            leftOffset   = static_cast<float>(renderTargetInfo.leftOffset);
-            topOffset    = static_cast<float>(renderTargetInfo.topOffset);
-
-            pixScaleX   = renderTargetInfo.pixScaleX;
-            pixScaleY   = renderTargetInfo.pixScaleY;
-            hOffset     = renderTargetInfo.hOffset;
-            vOffset     = renderTargetInfo.vOffset;
-        }
+        return std::make_shared<TypesetBookImpl::Typesetter>(pageWidth, pageHeight);
+    }
 
-        bool clip (MyGUI::FloatRect & vr, MyGUI::FloatRect & tr)
+    namespace
+    {
+        struct RenderXform
         {
-            if (vr.bottom <= clipTop    || vr.right  <= clipLeft   ||
-                vr.left   >= clipRight  || vr.top    >= clipBottom )
-                return false;
-
-            if (vr.top < clipTop)
+        public:
+            float clipTop;
+            float clipLeft;
+            float clipRight;
+            float clipBottom;
+
+            float absoluteLeft;
+            float absoluteTop;
+            float leftOffset;
+            float topOffset;
+
+            float pixScaleX;
+            float pixScaleY;
+            float hOffset;
+            float vOffset;
+
+            RenderXform(MyGUI::ICroppedRectangle* croppedParent, MyGUI::RenderTargetInfo const& renderTargetInfo)
             {
-                tr.top += tr.height () * (clipTop - vr.top) / vr.height ();
-                vr.top = clipTop;
+                clipTop = static_cast<float>(croppedParent->_getMarginTop());
+                clipLeft = static_cast<float>(croppedParent->_getMarginLeft());
+                clipRight = static_cast<float>(croppedParent->getWidth() - croppedParent->_getMarginRight());
+                clipBottom = static_cast<float>(croppedParent->getHeight() - croppedParent->_getMarginBottom());
+
+                absoluteLeft = static_cast<float>(croppedParent->getAbsoluteLeft());
+                absoluteTop = static_cast<float>(croppedParent->getAbsoluteTop());
+                leftOffset = static_cast<float>(renderTargetInfo.leftOffset);
+                topOffset = static_cast<float>(renderTargetInfo.topOffset);
+
+                pixScaleX = renderTargetInfo.pixScaleX;
+                pixScaleY = renderTargetInfo.pixScaleY;
+                hOffset = renderTargetInfo.hOffset;
+                vOffset = renderTargetInfo.vOffset;
             }
 
-            if (vr.left < clipLeft)
+            bool clip(MyGUI::FloatRect& vr, MyGUI::FloatRect& tr)
             {
-                tr.left += tr.width () * (clipLeft - vr.left) / vr.width ();
-                vr.left = clipLeft;
-            }
+                if (vr.bottom <= clipTop || vr.right <= clipLeft || vr.left >= clipRight || vr.top >= clipBottom)
+                    return false;
 
-            if (vr.right > clipRight)
-            {
-                tr.right -= tr.width () * (vr.right - clipRight) / vr.width ();
-                vr.right = clipRight;
-            }
+                if (vr.top < clipTop)
+                {
+                    tr.top += tr.height() * (clipTop - vr.top) / vr.height();
+                    vr.top = clipTop;
+                }
 
-            if (vr.bottom > clipBottom)
-            {
-                tr.bottom -= tr.height () * (vr.bottom - clipBottom) / vr.height ();
-                vr.bottom = clipBottom;
-            }
+                if (vr.left < clipLeft)
+                {
+                    tr.left += tr.width() * (clipLeft - vr.left) / vr.width();
+                    vr.left = clipLeft;
+                }
 
-            return true;
-        }
+                if (vr.right > clipRight)
+                {
+                    tr.right -= tr.width() * (vr.right - clipRight) / vr.width();
+                    vr.right = clipRight;
+                }
 
-        MyGUI::FloatPoint operator () (MyGUI::FloatPoint pt)
-        {
-            pt.left = absoluteLeft - leftOffset + pt.left;
-            pt.top  = absoluteTop  - topOffset  + pt.top;
+                if (vr.bottom > clipBottom)
+                {
+                    tr.bottom -= tr.height() * (vr.bottom - clipBottom) / vr.height();
+                    vr.bottom = clipBottom;
+                }
 
-            pt.left = +(((pixScaleX * pt.left + hOffset) * 2.0f) - 1.0f);
-            pt.top  = -(((pixScaleY * pt.top  + vOffset) * 2.0f) - 1.0f);
+                return true;
+            }
 
-            return pt;
-        }
-    };
+            MyGUI::FloatPoint operator()(MyGUI::FloatPoint pt)
+            {
+                pt.left = absoluteLeft - leftOffset + pt.left;
+                pt.top = absoluteTop - topOffset + pt.top;
 
-    struct GlyphStream
-    {
-        float mZ;
-        uint32_t mC;
-        MyGUI::IFont* mFont;
-        MyGUI::FloatPoint mOrigin;
-        MyGUI::FloatPoint mCursor;
-        MyGUI::Vertex* mVertices;
-        RenderXform mRenderXform;
-        MyGUI::VertexColourType mVertexColourType;
-
-        GlyphStream (MyGUI::IFont* font, float left, float top, float Z,
-                      MyGUI::Vertex* vertices, RenderXform const & renderXform) :
-            mZ(Z),
-            mC(0), mFont (font), mOrigin (left, top),
-            mVertices (vertices),
-            mRenderXform (renderXform)
-        {
-            assert(font != nullptr);
-            mVertexColourType = MyGUI::RenderManager::getInstance().getVertexFormat();
-        }
+                pt.left = +(((pixScaleX * pt.left + hOffset) * 2.0f) - 1.0f);
+                pt.top = -(((pixScaleY * pt.top + vOffset) * 2.0f) - 1.0f);
 
-        ~GlyphStream () = default;
+                return pt;
+            }
+        };
 
-        MyGUI::Vertex* end () const { return mVertices; }
+        struct GlyphStream
+        {
+            float mZ;
+            uint32_t mC;
+            MyGUI::IFont* mFont;
+            MyGUI::FloatPoint mOrigin;
+            MyGUI::FloatPoint mCursor;
+            MyGUI::Vertex* mVertices;
+            RenderXform mRenderXform;
+            MyGUI::VertexColourType mVertexColourType;
+
+            GlyphStream(MyGUI::IFont* font, float left, float top, float Z, MyGUI::Vertex* vertices,
+                RenderXform const& renderXform)
+                : mZ(Z)
+                , mC(0)
+                , mFont(font)
+                , mOrigin(left, top)
+                , mVertices(vertices)
+                , mRenderXform(renderXform)
+            {
+                assert(font != nullptr);
+                mVertexColourType = MyGUI::RenderManager::getInstance().getVertexFormat();
+            }
 
-        void reset (float left, float top, MyGUI::Colour colour)
-        {
-            mC = MyGUI::texture_utility::toColourARGB(colour) | 0xFF000000;
-            MyGUI::texture_utility::convertColour(mC, mVertexColourType);
+            ~GlyphStream() = default;
 
-            mCursor.left = mOrigin.left + left;
-            mCursor.top = mOrigin.top + top;
-        }
+            MyGUI::Vertex* end() const { return mVertices; }
 
-        void emitGlyph (wchar_t ch)
-        {
-            MWGui::GlyphInfo info = GlyphInfo(mFont, ch);
+            void reset(float left, float top, MyGUI::Colour colour)
+            {
+                mC = MyGUI::texture_utility::toColourARGB(colour) | 0xFF000000;
+                MyGUI::texture_utility::convertColour(mC, mVertexColourType);
 
-            if (!info.charFound)
-                return;
+                mCursor.left = mOrigin.left + left;
+                mCursor.top = mOrigin.top + top;
+            }
 
-            MyGUI::FloatRect vr;
+            void emitGlyph(wchar_t ch)
+            {
+                MWGui::GlyphInfo info = GlyphInfo(mFont, ch);
 
-            vr.left = mCursor.left + info.bearingX;
-            vr.top = mCursor.top + info.bearingY;
-            vr.right = vr.left + info.width;
-            vr.bottom = vr.top + info.height;
+                if (!info.charFound)
+                    return;
 
-            MyGUI::FloatRect tr = info.uvRect;
+                MyGUI::FloatRect vr;
 
-            if (mRenderXform.clip (vr, tr))
-                quad (vr, tr);
+                vr.left = mCursor.left + info.bearingX;
+                vr.top = mCursor.top + info.bearingY;
+                vr.right = vr.left + info.width;
+                vr.bottom = vr.top + info.height;
 
-            mCursor.left += static_cast<int>(info.bearingX + info.advance);
-        }
+                MyGUI::FloatRect tr = info.uvRect;
 
-        void emitSpace (wchar_t ch)
-        {
-            MWGui::GlyphInfo info = GlyphInfo(mFont, ch);
+                if (mRenderXform.clip(vr, tr))
+                    quad(vr, tr);
 
-            if (info.charFound)
                 mCursor.left += static_cast<int>(info.bearingX + info.advance);
-        }
-
-    private:
+            }
 
-        void quad (const MyGUI::FloatRect& vr, const MyGUI::FloatRect& tr)
-        {
-            vertex (vr.left, vr.top, tr.left, tr.top);
-            vertex (vr.right, vr.top, tr.right, tr.top);
-            vertex (vr.left, vr.bottom, tr.left, tr.bottom);
-            vertex (vr.right, vr.top, tr.right, tr.top);
-            vertex (vr.left, vr.bottom, tr.left, tr.bottom);
-            vertex (vr.right, vr.bottom, tr.right, tr.bottom);
-        }
+            void emitSpace(wchar_t ch)
+            {
+                MWGui::GlyphInfo info = GlyphInfo(mFont, ch);
 
-        void vertex (float x, float y, float u, float v)
-        {
-            MyGUI::FloatPoint pt = mRenderXform (MyGUI::FloatPoint (x, y));
+                if (info.charFound)
+                    mCursor.left += static_cast<int>(info.bearingX + info.advance);
+            }
 
-            mVertices->x = pt.left;
-            mVertices->y = pt.top ;
-            mVertices->z = mZ;
-            mVertices->u = u;
-            mVertices->v = v;
-            mVertices->colour = mC;
+        private:
+            void quad(const MyGUI::FloatRect& vr, const MyGUI::FloatRect& tr)
+            {
+                vertex(vr.left, vr.top, tr.left, tr.top);
+                vertex(vr.right, vr.top, tr.right, tr.top);
+                vertex(vr.left, vr.bottom, tr.left, tr.bottom);
+                vertex(vr.right, vr.top, tr.right, tr.top);
+                vertex(vr.left, vr.bottom, tr.left, tr.bottom);
+                vertex(vr.right, vr.bottom, tr.right, tr.bottom);
+            }
 
-            ++mVertices;
-        }
-    };
-}
+            void vertex(float x, float y, float u, float v)
+            {
+                MyGUI::FloatPoint pt = mRenderXform(MyGUI::FloatPoint(x, y));
 
-class PageDisplay final : public MyGUI::ISubWidgetText
-{
-    MYGUI_RTTI_DERIVED(PageDisplay)
-protected:
+                mVertices->x = pt.left;
+                mVertices->y = pt.top;
+                mVertices->z = mZ;
+                mVertices->u = u;
+                mVertices->v = v;
+                mVertices->colour = mC;
 
-    typedef TypesetBookImpl::Section Section;
-    typedef TypesetBookImpl::Line    Line;
-    typedef TypesetBookImpl::Run     Run;
-    bool mIsPageReset;
-    size_t mPage;
+                ++mVertices;
+            }
+        };
+    }
 
-    struct TextFormat : ISubWidget
+    class PageDisplay final : public MyGUI::ISubWidgetText
     {
-        typedef MyGUI::IFont* Id;
-
-        Id mFont;
-        int mCountVertex;
-        MyGUI::ITexture* mTexture;
-        MyGUI::RenderItem* mRenderItem;
-        PageDisplay * mDisplay;
-
-        TextFormat (MyGUI::IFont* id, PageDisplay * display) :
-            mFont (id),
-            mCountVertex (0),
-            mTexture (nullptr),
-            mRenderItem (nullptr),
-            mDisplay (display)
-        {
-        }
-
-        void createDrawItem (MyGUI::ILayerNode* node)
+        MYGUI_RTTI_DERIVED(PageDisplay)
+    protected:
+        typedef TypesetBookImpl::Section Section;
+        typedef TypesetBookImpl::Line Line;
+        typedef TypesetBookImpl::Run Run;
+        bool mIsPageReset;
+        size_t mPage;
+
+        struct TextFormat : ISubWidget
         {
-            assert (mRenderItem == nullptr);
-
-            if (mTexture != nullptr)
+            typedef MyGUI::IFont* Id;
+
+            Id mFont;
+            int mCountVertex;
+            MyGUI::ITexture* mTexture;
+            MyGUI::RenderItem* mRenderItem;
+            PageDisplay* mDisplay;
+
+            TextFormat(MyGUI::IFont* id, PageDisplay* display)
+                : mFont(id)
+                , mCountVertex(0)
+                , mTexture(nullptr)
+                , mRenderItem(nullptr)
+                , mDisplay(display)
             {
-                mRenderItem = node->addToRenderItem(mTexture, false, false);
-                mRenderItem->addDrawItem(this, mCountVertex);
             }
-        }
 
-        void destroyDrawItem (MyGUI::ILayerNode* node)
-        {
-            assert (mTexture != nullptr ? mRenderItem != nullptr : mRenderItem == nullptr);
-
-            if (mTexture != nullptr)
+            void createDrawItem(MyGUI::ILayerNode* node)
             {
-                mRenderItem->removeDrawItem (this);
-                mRenderItem = nullptr;
+                assert(mRenderItem == nullptr);
+
+                if (mTexture != nullptr)
+                {
+                    mRenderItem = node->addToRenderItem(mTexture, false, false);
+                    mRenderItem->addDrawItem(this, mCountVertex);
+                }
             }
-        }
 
-        void doRender() override { mDisplay->doRender (*this); }
+            void destroyDrawItem(MyGUI::ILayerNode* node)
+            {
+                assert(mTexture != nullptr ? mRenderItem != nullptr : mRenderItem == nullptr);
 
-        // this isn't really a sub-widget, its just a "drawitem" which
-        // should have its own interface
-        void createDrawItem(MyGUI::ITexture* _texture, MyGUI::ILayerNode* _node) override {}
-        void destroyDrawItem() override {}
-    };
+                if (mTexture != nullptr)
+                {
+                    mRenderItem->removeDrawItem(this);
+                    mRenderItem = nullptr;
+                }
+            }
 
-    void resetPage()
-    {
-       mIsPageReset = true;
-       mPage = 0;
-    }
+            void doRender() override { mDisplay->doRender(*this); }
 
-    void setPage(size_t page)
-    {
-       mIsPageReset = false;
-       mPage = page;
-    }
+            // this isn't really a sub-widget, its just a "drawitem" which
+            // should have its own interface
+            void createDrawItem(MyGUI::ITexture* _texture, MyGUI::ILayerNode* _node) override {}
+            void destroyDrawItem() override {}
+        };
 
-    bool isPageDifferent(size_t page)
-    {
-       return mIsPageReset || (mPage != page);
-    }
+        void resetPage()
+        {
+            mIsPageReset = true;
+            mPage = 0;
+        }
 
-    std::optional<MyGUI::IntPoint> getAdjustedPos(int left, int top, bool move = false)
-    {
-        if (!mBook)
-            return {};
+        void setPage(size_t page)
+        {
+            mIsPageReset = false;
+            mPage = page;
+        }
 
-        if (mPage >= mBook->mPages.size())
-            return {};
+        bool isPageDifferent(size_t page) { return mIsPageReset || (mPage != page); }
 
-        MyGUI::IntPoint pos (left, top);
-        pos.left -= mCroppedParent->getAbsoluteLeft ();
-        pos.top  -= mCroppedParent->getAbsoluteTop  ();
-        pos.top += mViewTop;
-        return pos;
-    }
+        std::optional<MyGUI::IntPoint> getAdjustedPos(int left, int top, bool move = false)
+        {
+            if (!mBook)
+                return {};
 
-public:
+            if (mPage >= mBook->mPages.size())
+                return {};
 
-    typedef TypesetBookImpl::StyleImpl Style;
-    typedef std::map <TextFormat::Id, std::unique_ptr<TextFormat>> ActiveTextFormats;
+            MyGUI::IntPoint pos(left, top);
+            pos.left -= mCroppedParent->getAbsoluteLeft();
+            pos.top -= mCroppedParent->getAbsoluteTop();
+            pos.top += mViewTop;
+            return pos;
+        }
 
-    int mViewTop;
-    int mViewBottom;
+    public:
+        typedef TypesetBookImpl::StyleImpl Style;
+        typedef std::map<TextFormat::Id, std::unique_ptr<TextFormat>> ActiveTextFormats;
 
-    Style* mFocusItem;
-    bool mItemActive;
-    MyGUI::MouseButton mLastDown;
-    std::function <void (intptr_t)> mLinkClicked;
+        int mViewTop;
+        int mViewBottom;
 
+        Style* mFocusItem;
+        bool mItemActive;
+        MyGUI::MouseButton mLastDown;
+        std::function<void(intptr_t)> mLinkClicked;
 
-    std::shared_ptr <TypesetBookImpl> mBook;
+        std::shared_ptr<TypesetBookImpl> mBook;
 
-    MyGUI::ILayerNode* mNode;
-    ActiveTextFormats mActiveTextFormats;
+        MyGUI::ILayerNode* mNode;
+        ActiveTextFormats mActiveTextFormats;
 
-    PageDisplay ()
-    {
-        resetPage ();
-        mViewTop = 0;
-        mViewBottom = 0;
-        mFocusItem = nullptr;
-        mItemActive = false;
-        mNode = nullptr;
-    }
+        PageDisplay()
+        {
+            resetPage();
+            mViewTop = 0;
+            mViewBottom = 0;
+            mFocusItem = nullptr;
+            mItemActive = false;
+            mNode = nullptr;
+        }
 
-    void dirtyFocusItem ()
-    {
-        if (mFocusItem != nullptr)
+        void dirtyFocusItem()
         {
-            MyGUI::IFont* Font = mBook->affectedFont (mFocusItem);
+            if (mFocusItem != nullptr)
+            {
+                MyGUI::IFont* Font = mBook->affectedFont(mFocusItem);
 
-            ActiveTextFormats::iterator i = mActiveTextFormats.find (Font);
+                ActiveTextFormats::iterator i = mActiveTextFormats.find(Font);
 
-            if (mNode)
-                mNode->outOfDate (i->second->mRenderItem);
+                if (mNode)
+                    mNode->outOfDate(i->second->mRenderItem);
+            }
         }
-    }
-
-    void onMouseLostFocus ()
-    {
-        if (!mBook)
-            return;
 
-        if (mPage >= mBook->mPages.size())
-            return;
+        void onMouseLostFocus()
+        {
+            if (!mBook)
+                return;
 
-        dirtyFocusItem ();
+            if (mPage >= mBook->mPages.size())
+                return;
 
-        mFocusItem = nullptr;
-        mItemActive = false;
-    }
+            dirtyFocusItem();
 
-    void onMouseMove (int left, int top)
-    {
-        Style * hit = nullptr;
-        if(auto pos = getAdjustedPos(left, top, true))
-            if(pos->top <= mViewBottom)
-                hit = mBook->hitTestWithMargin (pos->left, pos->top);
+            mFocusItem = nullptr;
+            mItemActive = false;
+        }
 
-        if (mLastDown == MyGUI::MouseButton::None)
+        void onMouseMove(int left, int top)
         {
-            if (hit != mFocusItem)
+            Style* hit = nullptr;
+            if (auto pos = getAdjustedPos(left, top, true))
+                if (pos->top <= mViewBottom)
+                    hit = mBook->hitTestWithMargin(pos->left, pos->top);
+
+            if (mLastDown == MyGUI::MouseButton::None)
             {
-                dirtyFocusItem ();
+                if (hit != mFocusItem)
+                {
+                    dirtyFocusItem();
 
-                mFocusItem = hit;
-                mItemActive = false;
+                    mFocusItem = hit;
+                    mItemActive = false;
 
-                dirtyFocusItem ();
+                    dirtyFocusItem();
+                }
             }
-        }
-        else
-        if (mFocusItem != nullptr)
-        {
-            bool newItemActive = hit == mFocusItem;
-
-            if (newItemActive != mItemActive)
+            else if (mFocusItem != nullptr)
             {
-                mItemActive = newItemActive;
+                bool newItemActive = hit == mFocusItem;
+
+                if (newItemActive != mItemActive)
+                {
+                    mItemActive = newItemActive;
 
-                dirtyFocusItem ();
+                    dirtyFocusItem();
+                }
             }
         }
-    }
-
-    void onMouseButtonPressed (int left, int top, MyGUI::MouseButton id)
-    {
-        auto pos = getAdjustedPos(left, top);
 
-        if (pos && mLastDown == MyGUI::MouseButton::None)
+        void onMouseButtonPressed(int left, int top, MyGUI::MouseButton id)
         {
-            mFocusItem = pos->top <= mViewBottom ? mBook->hitTestWithMargin (pos->left, pos->top) : nullptr;
-            mItemActive = true;
+            auto pos = getAdjustedPos(left, top);
 
-            dirtyFocusItem ();
+            if (pos && mLastDown == MyGUI::MouseButton::None)
+            {
+                mFocusItem = pos->top <= mViewBottom ? mBook->hitTestWithMargin(pos->left, pos->top) : nullptr;
+                mItemActive = true;
 
-            mLastDown = id;
-        }
-    }
+                dirtyFocusItem();
 
-    void onMouseButtonReleased(int left, int top, MyGUI::MouseButton id)
-    {
-        auto pos = getAdjustedPos(left, top);
+                mLastDown = id;
+            }
+        }
 
-        if (pos && mLastDown == id)
+        void onMouseButtonReleased(int left, int top, MyGUI::MouseButton id)
         {
-            Style * item = pos->top <= mViewBottom ? mBook->hitTestWithMargin (pos->left, pos->top) : nullptr;
+            auto pos = getAdjustedPos(left, top);
 
-            bool clicked = mFocusItem == item;
+            if (pos && mLastDown == id)
+            {
+                Style* item = pos->top <= mViewBottom ? mBook->hitTestWithMargin(pos->left, pos->top) : nullptr;
 
-            mItemActive = false;
+                bool clicked = mFocusItem == item;
 
-            dirtyFocusItem ();
+                mItemActive = false;
 
-            mLastDown = MyGUI::MouseButton::None;
+                dirtyFocusItem();
 
-            if (clicked && mLinkClicked && item && item->mInteractiveId != 0)
-                mLinkClicked (item->mInteractiveId);
-        }
-    }
+                mLastDown = MyGUI::MouseButton::None;
 
-    void showPage (TypesetBook::Ptr book, size_t newPage)
-    {
-        std::shared_ptr <TypesetBookImpl> newBook = std::dynamic_pointer_cast <TypesetBookImpl> (book);
+                if (clicked && mLinkClicked && item && item->mInteractiveId != 0)
+                    mLinkClicked(item->mInteractiveId);
+            }
+        }
 
-        if (mBook != newBook)
+        void showPage(TypesetBook::Ptr book, size_t newPage)
         {
-            mFocusItem = nullptr;
-            mItemActive = 0;
+            std::shared_ptr<TypesetBookImpl> newBook = std::dynamic_pointer_cast<TypesetBookImpl>(book);
 
-            for (ActiveTextFormats::iterator i = mActiveTextFormats.begin (); i != mActiveTextFormats.end (); ++i)
+            if (mBook != newBook)
             {
-                if (mNode != nullptr && i->second != nullptr)
-                    i->second->destroyDrawItem (mNode);
-                i->second.reset();
-            }
+                mFocusItem = nullptr;
+                mItemActive = 0;
 
-            mActiveTextFormats.clear ();
-
-            if (newBook != nullptr)
-            {
-                createActiveFormats (newBook);
+                for (ActiveTextFormats::iterator i = mActiveTextFormats.begin(); i != mActiveTextFormats.end(); ++i)
+                {
+                    if (mNode != nullptr && i->second != nullptr)
+                        i->second->destroyDrawItem(mNode);
+                    i->second.reset();
+                }
 
-                mBook = newBook;
-                setPage (newPage);
+                mActiveTextFormats.clear();
 
-                if (newPage < mBook->mPages.size ())
+                if (newBook != nullptr)
                 {
-                    mViewTop = mBook->mPages [newPage].first;
-                    mViewBottom = mBook->mPages [newPage].second;
+                    createActiveFormats(newBook);
+
+                    mBook = newBook;
+                    setPage(newPage);
+
+                    if (newPage < mBook->mPages.size())
+                    {
+                        mViewTop = mBook->mPages[newPage].first;
+                        mViewBottom = mBook->mPages[newPage].second;
+                    }
+                    else
+                    {
+                        mViewTop = 0;
+                        mViewBottom = 0;
+                    }
                 }
                 else
                 {
+                    mBook.reset();
+                    resetPage();
                     mViewTop = 0;
                     mViewBottom = 0;
                 }
             }
-            else
+            else if (mBook && isPageDifferent(newPage))
             {
-                mBook.reset ();
-                resetPage ();
-                mViewTop = 0;
-                mViewBottom = 0;
-            }
-        }
-        else
-        if (mBook && isPageDifferent (newPage))
-        {
-            if (mNode != nullptr)
-                for (ActiveTextFormats::iterator i = mActiveTextFormats.begin (); i != mActiveTextFormats.end (); ++i)
-                    mNode->outOfDate(i->second->mRenderItem);
+                if (mNode != nullptr)
+                    for (ActiveTextFormats::iterator i = mActiveTextFormats.begin(); i != mActiveTextFormats.end(); ++i)
+                        mNode->outOfDate(i->second->mRenderItem);
 
-            setPage (newPage);
+                setPage(newPage);
 
-            if (newPage < mBook->mPages.size ())
-            {
-                mViewTop = mBook->mPages [newPage].first;
-                mViewBottom = mBook->mPages [newPage].second;
-            }
-            else
-            {
-                mViewTop = 0;
-                mViewBottom = 0;
+                if (newPage < mBook->mPages.size())
+                {
+                    mViewTop = mBook->mPages[newPage].first;
+                    mViewBottom = mBook->mPages[newPage].second;
+                }
+                else
+                {
+                    mViewTop = 0;
+                    mViewBottom = 0;
+                }
             }
         }
-    }
 
-    struct CreateActiveFormat
-    {
-        PageDisplay * this_;
-
-        CreateActiveFormat (PageDisplay * this_) : this_ (this_) {}
-
-        void operator () (Section const & section, Line const & line, Run const & run) const
+        struct CreateActiveFormat
         {
-            MyGUI::IFont* Font = run.mStyle->mFont;
-
-            ActiveTextFormats::iterator j = this_->mActiveTextFormats.find (Font);
+            PageDisplay* this_;
 
-            if (j == this_->mActiveTextFormats.end ())
+            CreateActiveFormat(PageDisplay* this_)
+                : this_(this_)
             {
-                auto textFormat = std::make_unique<TextFormat>(Font, this_);
-
-                textFormat->mTexture = Font->getTextureFont ();
-
-                j = this_->mActiveTextFormats.insert (std::make_pair (Font, std::move(textFormat))).first;
             }
 
-            j->second->mCountVertex += run.mPrintableChars * 6;
-        }
-    };
+            void operator()(Section const& section, Line const& line, Run const& run) const
+            {
+                MyGUI::IFont* Font = run.mStyle->mFont;
 
-    void createActiveFormats (std::shared_ptr <TypesetBookImpl> newBook)
-    {
-        newBook->visitRuns (0, 0x7FFFFFFF, CreateActiveFormat (this));
+                ActiveTextFormats::iterator j = this_->mActiveTextFormats.find(Font);
 
-        if (mNode != nullptr)
-            for (ActiveTextFormats::iterator i = mActiveTextFormats.begin (); i != mActiveTextFormats.end (); ++i)
-                i->second->createDrawItem (mNode);
-    }
+                if (j == this_->mActiveTextFormats.end())
+                {
+                    auto textFormat = std::make_unique<TextFormat>(Font, this_);
 
-    void setVisible (bool newVisible) override
-    {
-        if (mVisible == newVisible)
-            return;
+                    textFormat->mTexture = Font->getTextureFont();
 
-        mVisible = newVisible;
+                    j = this_->mActiveTextFormats.insert(std::make_pair(Font, std::move(textFormat))).first;
+                }
 
-        if (mVisible)
-        {
-            // reset input state
-            mLastDown = MyGUI::MouseButton::None;
-            mFocusItem = nullptr;
-            mItemActive = 0;
-        }
+                j->second->mCountVertex += run.mPrintableChars * 6;
+            }
+        };
 
-        if (nullptr != mNode)
+        void createActiveFormats(std::shared_ptr<TypesetBookImpl> newBook)
         {
-            for (ActiveTextFormats::iterator i = mActiveTextFormats.begin (); i != mActiveTextFormats.end (); ++i)
-                mNode->outOfDate(i->second->mRenderItem);
+            newBook->visitRuns(0, 0x7FFFFFFF, CreateActiveFormat(this));
+
+            if (mNode != nullptr)
+                for (ActiveTextFormats::iterator i = mActiveTextFormats.begin(); i != mActiveTextFormats.end(); ++i)
+                    i->second->createDrawItem(mNode);
         }
-    }
 
-    void createDrawItem(MyGUI::ITexture* texture, MyGUI::ILayerNode* node) override
-    {
-        mNode = node;
+        void setVisible(bool newVisible) override
+        {
+            if (mVisible == newVisible)
+                return;
 
-        for (ActiveTextFormats::iterator i = mActiveTextFormats.begin (); i != mActiveTextFormats.end (); ++i)
-            i->second->createDrawItem (node);
-    }
+            mVisible = newVisible;
 
-    struct RenderRun
-    {
-        PageDisplay * this_;
-        GlyphStream &glyphStream;
+            if (mVisible)
+            {
+                // reset input state
+                mLastDown = MyGUI::MouseButton::None;
+                mFocusItem = nullptr;
+                mItemActive = 0;
+            }
 
-        RenderRun (PageDisplay * this_, GlyphStream &glyphStream) :
-            this_(this_), glyphStream (glyphStream)
-        {
+            if (nullptr != mNode)
+            {
+                for (ActiveTextFormats::iterator i = mActiveTextFormats.begin(); i != mActiveTextFormats.end(); ++i)
+                    mNode->outOfDate(i->second->mRenderItem);
+            }
         }
 
-        void operator () (Section const & section, Line const & line, Run const & run) const
+        void createDrawItem(MyGUI::ITexture* texture, MyGUI::ILayerNode* node) override
         {
-            bool isActive = run.mStyle->mInteractiveId && (run.mStyle == this_->mFocusItem);
+            mNode = node;
 
-            MyGUI::Colour colour = isActive ? (this_->mItemActive ? run.mStyle->mActiveColour: run.mStyle->mHotColour) : run.mStyle->mNormalColour;
+            for (ActiveTextFormats::iterator i = mActiveTextFormats.begin(); i != mActiveTextFormats.end(); ++i)
+                i->second->createDrawItem(node);
+        }
 
-            glyphStream.reset(static_cast<float>(section.mRect.left + line.mRect.left + run.mLeft), static_cast<float>(line.mRect.top), colour);
+        struct RenderRun
+        {
+            PageDisplay* this_;
+            GlyphStream& glyphStream;
 
-            Utf8Stream stream (run.mRange);
+            RenderRun(PageDisplay* this_, GlyphStream& glyphStream)
+                : this_(this_)
+                , glyphStream(glyphStream)
+            {
+            }
 
-            while (!stream.eof ())
+            void operator()(Section const& section, Line const& line, Run const& run) const
             {
-                Utf8Stream::UnicodeChar code_point = stream.consume ();
+                bool isActive = run.mStyle->mInteractiveId && (run.mStyle == this_->mFocusItem);
 
-                if (ucsCarriageReturn (code_point))
-                    continue;
+                MyGUI::Colour colour = isActive
+                    ? (this_->mItemActive ? run.mStyle->mActiveColour : run.mStyle->mHotColour)
+                    : run.mStyle->mNormalColour;
 
-                if (!ucsSpace (code_point))
-                    glyphStream.emitGlyph (code_point);
-                else
-                    glyphStream.emitSpace (code_point);
-            }
-        }
-    };
+                glyphStream.reset(static_cast<float>(section.mRect.left + line.mRect.left + run.mLeft),
+                    static_cast<float>(line.mRect.top), colour);
 
-    /*
-        queue up rendering operations for this text format
-    */
-    void doRender(TextFormat & textFormat)
-    {
-        if (!mVisible)
-            return;
+                Utf8Stream stream(run.mRange);
 
-        MyGUI::Vertex* vertices = textFormat.mRenderItem->getCurrentVertexBuffer();
+                while (!stream.eof())
+                {
+                    Utf8Stream::UnicodeChar code_point = stream.consume();
 
-        RenderXform renderXform (mCroppedParent, textFormat.mRenderItem->getRenderTarget()->getInfo());
+                    if (ucsCarriageReturn(code_point))
+                        continue;
 
-        float z = SceneUtil::AutoDepth::isReversed() ? 1.f : -1.f;
+                    if (!ucsSpace(code_point))
+                        glyphStream.emitGlyph(code_point);
+                    else
+                        glyphStream.emitSpace(code_point);
+                }
+            }
+        };
 
-        GlyphStream glyphStream(textFormat.mFont, static_cast<float>(mCoord.left), static_cast<float>(mCoord.top - mViewTop),
-                                  z /*mNode->getNodeDepth()*/, vertices, renderXform);
+        /*
+            queue up rendering operations for this text format
+        */
+        void doRender(TextFormat& textFormat)
+        {
+            if (!mVisible)
+                return;
 
-        int visit_top    = (std::max) (mViewTop,    mViewTop + int (renderXform.clipTop   ));
-        int visit_bottom = (std::min) (mViewBottom, mViewTop + int (renderXform.clipBottom));
+            MyGUI::Vertex* vertices = textFormat.mRenderItem->getCurrentVertexBuffer();
 
-        mBook->visitRuns (visit_top, visit_bottom, textFormat.mFont, RenderRun (this, glyphStream));
+            RenderXform renderXform(mCroppedParent, textFormat.mRenderItem->getRenderTarget()->getInfo());
 
-        textFormat.mRenderItem->setLastVertexCount(glyphStream.end () - vertices);
-    }
+            float z = SceneUtil::AutoDepth::isReversed() ? 1.f : -1.f;
 
-    // ISubWidget should not necessarily be a drawitem
-    // in this case, it is not...
-    void doRender() override { }
+            GlyphStream glyphStream(textFormat.mFont, static_cast<float>(mCoord.left),
+                static_cast<float>(mCoord.top - mViewTop), z /*mNode->getNodeDepth()*/, vertices, renderXform);
 
-    void _updateView () override
-    {
-        _checkMargin();
+            int visit_top = (std::max)(mViewTop, mViewTop + int(renderXform.clipTop));
+            int visit_bottom = (std::min)(mViewBottom, mViewTop + int(renderXform.clipBottom));
 
-        if (mNode != nullptr)
-            for (ActiveTextFormats::iterator i = mActiveTextFormats.begin (); i != mActiveTextFormats.end (); ++i)
-                mNode->outOfDate (i->second->mRenderItem);
-    }
+            mBook->visitRuns(visit_top, visit_bottom, textFormat.mFont, RenderRun(this, glyphStream));
 
-    void _correctView() override
-    {
-        _checkMargin ();
+            textFormat.mRenderItem->setLastVertexCount(glyphStream.end() - vertices);
+        }
 
-        if (mNode != nullptr)
-            for (ActiveTextFormats::iterator i = mActiveTextFormats.begin (); i != mActiveTextFormats.end (); ++i)
-                mNode->outOfDate (i->second->mRenderItem);
+        // ISubWidget should not necessarily be a drawitem
+        // in this case, it is not...
+        void doRender() override {}
 
-    }
+        void _updateView() override
+        {
+            _checkMargin();
 
-    void destroyDrawItem() override
-    {
-        for (ActiveTextFormats::iterator i = mActiveTextFormats.begin (); i != mActiveTextFormats.end (); ++i)
-            i->second->destroyDrawItem (mNode);
+            if (mNode != nullptr)
+                for (ActiveTextFormats::iterator i = mActiveTextFormats.begin(); i != mActiveTextFormats.end(); ++i)
+                    mNode->outOfDate(i->second->mRenderItem);
+        }
 
-        mNode = nullptr;
-    }
-};
+        void _correctView() override
+        {
+            _checkMargin();
 
+            if (mNode != nullptr)
+                for (ActiveTextFormats::iterator i = mActiveTextFormats.begin(); i != mActiveTextFormats.end(); ++i)
+                    mNode->outOfDate(i->second->mRenderItem);
+        }
 
-class BookPageImpl final : public BookPage
-{
-MYGUI_RTTI_DERIVED(BookPage)
-public:
+        void destroyDrawItem() override
+        {
+            for (ActiveTextFormats::iterator i = mActiveTextFormats.begin(); i != mActiveTextFormats.end(); ++i)
+                i->second->destroyDrawItem(mNode);
 
-    BookPageImpl()
-        : mPageDisplay(nullptr)
-    {
-    }
+            mNode = nullptr;
+        }
+    };
 
-    void showPage (TypesetBook::Ptr book, size_t page) override
+    class BookPageImpl final : public BookPage
     {
-        mPageDisplay->showPage (book, page);
-    }
+        MYGUI_RTTI_DERIVED(BookPage)
+    public:
+        BookPageImpl()
+            : mPageDisplay(nullptr)
+        {
+        }
 
-    void adviseLinkClicked (std::function <void (InteractiveId)> linkClicked) override
-    {
-        mPageDisplay->mLinkClicked = linkClicked;
-    }
+        void showPage(TypesetBook::Ptr book, size_t page) override { mPageDisplay->showPage(book, page); }
 
-    void unadviseLinkClicked () override
-    {
-        mPageDisplay->mLinkClicked = std::function <void (InteractiveId)> ();
-    }
+        void adviseLinkClicked(std::function<void(InteractiveId)> linkClicked) override
+        {
+            mPageDisplay->mLinkClicked = linkClicked;
+        }
 
-protected:
+        void unadviseLinkClicked() override { mPageDisplay->mLinkClicked = std::function<void(InteractiveId)>(); }
 
-    void initialiseOverride() override
-    {
-        Base::initialiseOverride();
+    protected:
+        void initialiseOverride() override
+        {
+            Base::initialiseOverride();
+
+            if (getSubWidgetText())
+            {
+                mPageDisplay = getSubWidgetText()->castType<PageDisplay>();
+            }
+            else
+            {
+                throw std::runtime_error("BookPage unable to find page display sub widget");
+            }
+        }
 
-        if (getSubWidgetText())
+        void onMouseLostFocus(Widget* _new) override
         {
-            mPageDisplay = getSubWidgetText()->castType<PageDisplay>();
+            // NOTE: MyGUI also fires eventMouseLostFocus for widgets that are about to be destroyed (if they had
+            // focus). Child widgets may already be destroyed! So be careful.
+            mPageDisplay->onMouseLostFocus();
         }
-        else
+
+        void onMouseMove(int left, int top) override { mPageDisplay->onMouseMove(left, top); }
+
+        void onMouseButtonPressed(int left, int top, MyGUI::MouseButton id) override
         {
-            throw std::runtime_error("BookPage unable to find page display sub widget");
+            mPageDisplay->onMouseButtonPressed(left, top, id);
         }
-    }
 
-    void onMouseLostFocus(Widget* _new) override
-    {
-        // NOTE: MyGUI also fires eventMouseLostFocus for widgets that are about to be destroyed (if they had focus).
-        // Child widgets may already be destroyed! So be careful.
-        mPageDisplay->onMouseLostFocus ();
-    }
+        void onMouseButtonReleased(int left, int top, MyGUI::MouseButton id) override
+        {
+            mPageDisplay->onMouseButtonReleased(left, top, id);
+        }
 
-    void onMouseMove(int left, int top) override
+        PageDisplay* mPageDisplay;
+    };
+
+    void BookPage::registerMyGUIComponents()
     {
-        mPageDisplay->onMouseMove (left, top);
+        MyGUI::FactoryManager& factory = MyGUI::FactoryManager::getInstance();
+
+        factory.registerFactory<BookPageImpl>("Widget");
+        factory.registerFactory<PageDisplay>("BasisSkin");
     }
 
-    void onMouseButtonPressed (int left, int top, MyGUI::MouseButton id) override
+    static bool ucsLineBreak(int codePoint)
     {
-        mPageDisplay->onMouseButtonPressed (left, top, id);
+        return codePoint == '\n';
     }
 
-    void onMouseButtonReleased(int left, int top, MyGUI::MouseButton id) override
+    static bool ucsCarriageReturn(int codePoint)
     {
-        mPageDisplay->onMouseButtonReleased (left, top, id);
+        return codePoint == '\r';
     }
 
-    PageDisplay* mPageDisplay;
-};
-
-void BookPage::registerMyGUIComponents ()
-{
-    MyGUI::FactoryManager & factory = MyGUI::FactoryManager::getInstance();
-
-    factory.registerFactory<BookPageImpl>("Widget");
-    factory.registerFactory<PageDisplay>("BasisSkin");
-}
-
-static bool ucsLineBreak (int codePoint)
-{
-    return codePoint == '\n';
-}
-
-static bool ucsCarriageReturn (int codePoint)
-{
-    return codePoint == '\r';
-}
-
-static bool ucsSpace (int codePoint)
-{
-    switch (codePoint)
+    static bool ucsSpace(int codePoint)
     {
-    case 0x0020: // SPACE
-    case 0x00A0: // NO-BREAK SPACE
-    case 0x1680: // OGHAM SPACE MARK
-    case 0x180E: // MONGOLIAN VOWEL SEPARATOR
-    case 0x2000: // EN QUAD
-    case 0x2001: // EM QUAD
-    case 0x2002: // EN SPACE
-    case 0x2003: // EM SPACE
-    case 0x2004: // THREE-PER-EM SPACE
-    case 0x2005: // FOUR-PER-EM SPACE
-    case 0x2006: // SIX-PER-EM SPACE
-    case 0x2007: // FIGURE SPACE
-    case 0x2008: // PUNCTUATION SPACE
-    case 0x2009: // THIN SPACE
-    case 0x200A: // HAIR SPACE
-    case 0x200B: // ZERO WIDTH SPACE
-    case 0x202F: // NARROW NO-BREAK SPACE
-    case 0x205F: // MEDIUM MATHEMATICAL SPACE
-    case 0x3000: // IDEOGRAPHIC SPACE
-    case 0xFEFF: // ZERO WIDTH NO-BREAK SPACE
-        return true;
-    default:
-        return false;
+        switch (codePoint)
+        {
+            case 0x0020: // SPACE
+            case 0x00A0: // NO-BREAK SPACE
+            case 0x1680: // OGHAM SPACE MARK
+            case 0x180E: // MONGOLIAN VOWEL SEPARATOR
+            case 0x2000: // EN QUAD
+            case 0x2001: // EM QUAD
+            case 0x2002: // EN SPACE
+            case 0x2003: // EM SPACE
+            case 0x2004: // THREE-PER-EM SPACE
+            case 0x2005: // FOUR-PER-EM SPACE
+            case 0x2006: // SIX-PER-EM SPACE
+            case 0x2007: // FIGURE SPACE
+            case 0x2008: // PUNCTUATION SPACE
+            case 0x2009: // THIN SPACE
+            case 0x200A: // HAIR SPACE
+            case 0x200B: // ZERO WIDTH SPACE
+            case 0x202F: // NARROW NO-BREAK SPACE
+            case 0x205F: // MEDIUM MATHEMATICAL SPACE
+            case 0x3000: // IDEOGRAPHIC SPACE
+            case 0xFEFF: // ZERO WIDTH NO-BREAK SPACE
+                return true;
+            default:
+                return false;
+        }
     }
-}
 
-static bool ucsBreakingSpace (int codePoint)
-{
-    switch (codePoint)
+    static bool ucsBreakingSpace(int codePoint)
     {
-    case 0x0020: // SPACE
-  //case 0x00A0: // NO-BREAK SPACE
-    case 0x1680: // OGHAM SPACE MARK
-    case 0x180E: // MONGOLIAN VOWEL SEPARATOR
-    case 0x2000: // EN QUAD
-    case 0x2001: // EM QUAD
-    case 0x2002: // EN SPACE
-    case 0x2003: // EM SPACE
-    case 0x2004: // THREE-PER-EM SPACE
-    case 0x2005: // FOUR-PER-EM SPACE
-    case 0x2006: // SIX-PER-EM SPACE
-    case 0x2007: // FIGURE SPACE
-    case 0x2008: // PUNCTUATION SPACE
-    case 0x2009: // THIN SPACE
-    case 0x200A: // HAIR SPACE
-    case 0x200B: // ZERO WIDTH SPACE
-    case 0x202F: // NARROW NO-BREAK SPACE
-    case 0x205F: // MEDIUM MATHEMATICAL SPACE
-    case 0x3000: // IDEOGRAPHIC SPACE
-  //case 0xFEFF: // ZERO WIDTH NO-BREAK SPACE
-        return true;
-    default:
-        return false;
+        switch (codePoint)
+        {
+            case 0x0020: // SPACE
+                         // case 0x00A0: // NO-BREAK SPACE
+            case 0x1680: // OGHAM SPACE MARK
+            case 0x180E: // MONGOLIAN VOWEL SEPARATOR
+            case 0x2000: // EN QUAD
+            case 0x2001: // EM QUAD
+            case 0x2002: // EN SPACE
+            case 0x2003: // EM SPACE
+            case 0x2004: // THREE-PER-EM SPACE
+            case 0x2005: // FOUR-PER-EM SPACE
+            case 0x2006: // SIX-PER-EM SPACE
+            case 0x2007: // FIGURE SPACE
+            case 0x2008: // PUNCTUATION SPACE
+            case 0x2009: // THIN SPACE
+            case 0x200A: // HAIR SPACE
+            case 0x200B: // ZERO WIDTH SPACE
+            case 0x202F: // NARROW NO-BREAK SPACE
+            case 0x205F: // MEDIUM MATHEMATICAL SPACE
+            case 0x3000: // IDEOGRAPHIC SPACE
+                // case 0xFEFF: // ZERO WIDTH NO-BREAK SPACE
+                return true;
+            default:
+                return false;
+        }
     }
-}
 
 }
diff --git a/apps/openmw/mwgui/bookpage.hpp b/apps/openmw/mwgui/bookpage.hpp
index 05bbd3af82..af6d33ff2b 100644
--- a/apps/openmw/mwgui/bookpage.hpp
+++ b/apps/openmw/mwgui/bookpage.hpp
@@ -2,12 +2,12 @@
 #define MWGUI_BOOKPAGE_HPP
 
 #include "MyGUI_Colour.h"
-#include "MyGUI_Widget.h"
 #include "MyGUI_IFont.h"
+#include "MyGUI_Widget.h"
 
+#include <cstdint>
 #include <functional>
 #include <memory>
-#include <cstdint>
 
 #include <components/settings/settings.hpp>
 
@@ -20,11 +20,11 @@ namespace MWGui
     /// the book page widget.
     struct TypesetBook
     {
-        typedef std::shared_ptr <TypesetBook> Ptr;
+        typedef std::shared_ptr<TypesetBook> Ptr;
         typedef intptr_t InteractiveId;
 
         /// Returns the number of pages in the document.
-        virtual size_t pageCount () const = 0;
+        virtual size_t pageCount() const = 0;
 
         /// Return the area covered by the document. The first
         /// integer is the maximum with of any line. This is not
@@ -32,7 +32,7 @@ namespace MWGui
         /// it is the largest distance from the left edge to the
         /// right edge. The second integer is the height of all
         /// text combined prior to pagination.
-        virtual std::pair <unsigned int, unsigned int> getSize () const = 0;
+        virtual std::pair<unsigned int, unsigned int> getSize() const = 0;
 
         virtual ~TypesetBook() = default;
     };
@@ -55,14 +55,14 @@ namespace MWGui
             const MyGUI::GlyphInfo* gi = font->getGlyphInfo(ch);
             if (gi)
             {
-                const float scale = font->getDefaultHeight() / (float) fontHeight;
+                const float scale = font->getDefaultHeight() / (float)fontHeight;
 
                 codePoint = gi->codePoint;
-                bearingX = (int) gi->bearingX / scale;
-                bearingY = (int) gi->bearingY / scale;
-                width = (int) gi->width / scale;
-                height = (int) gi->height / scale;
-                advance = (int) gi->advance / scale;
+                bearingX = (int)gi->bearingX / scale;
+                bearingY = (int)gi->bearingY / scale;
+                width = (int)gi->width / scale;
+                height = (int)gi->height / scale;
+                advance = (int)gi->advance / scale;
                 uvRect = gi->uvRect;
                 charFound = true;
             }
@@ -82,18 +82,19 @@ namespace MWGui
     /// A factory class for creating a typeset book instance.
     struct BookTypesetter
     {
-        typedef std::shared_ptr <BookTypesetter> Ptr;
+        typedef std::shared_ptr<BookTypesetter> Ptr;
         typedef TypesetBook::InteractiveId InteractiveId;
         typedef MyGUI::Colour Colour;
-        typedef uint8_t const * Utf8Point;
-        typedef std::pair <Utf8Point, Utf8Point> Utf8Span;
+        typedef uint8_t const* Utf8Point;
+        typedef std::pair<Utf8Point, Utf8Point> Utf8Span;
 
         virtual ~BookTypesetter() = default;
 
-        enum Alignment {
-            AlignLeft   = -1,
+        enum Alignment
+        {
+            AlignLeft = -1,
             AlignCenter = 0,
-            AlignRight  = +1
+            AlignRight = +1
         };
 
         /// Styles are used to control the character level formatting
@@ -103,71 +104,71 @@ namespace MWGui
         struct Style;
 
         /// A factory function for creating the default implementation of a book typesetter
-        static Ptr create (int pageWidth, int pageHeight);
+        static Ptr create(int pageWidth, int pageHeight);
 
         /// Create a simple text style consisting of a font and a text color.
-        virtual Style* createStyle (const std::string& fontName, const Colour& colour, bool useBookFont=true) = 0;
+        virtual Style* createStyle(const std::string& fontName, const Colour& colour, bool useBookFont = true) = 0;
 
         /// Create a hyper-link style with a user-defined identifier based on an
         /// existing style. The unique flag forces a new instance of this style
         /// to be created even if an existing instance is present.
-        virtual Style* createHotStyle (Style * BaseStyle, const Colour& NormalColour, const Colour& HoverColour,
-                                       const Colour& ActiveColour, InteractiveId Id, bool Unique = true) = 0;
+        virtual Style* createHotStyle(Style* BaseStyle, const Colour& NormalColour, const Colour& HoverColour,
+            const Colour& ActiveColour, InteractiveId Id, bool Unique = true)
+            = 0;
 
         /// Insert a line break into the document. Newline characters in the input
         /// text have the same affect. The margin parameter adds additional space
         /// before the next line of text.
-        virtual void lineBreak (float margin = 0) = 0;
+        virtual void lineBreak(float margin = 0) = 0;
 
         /// Insert a section  break into the document. This causes a new section
         /// to begin when additional text is inserted. Pagination attempts to keep
         /// sections together on a single page. The margin parameter adds additional space
         /// before the next line of text.
-        virtual void sectionBreak (int margin = 0) = 0;
+        virtual void sectionBreak(int margin = 0) = 0;
 
         /// Changes the alignment for the current section of text.
-        virtual void setSectionAlignment (Alignment sectionAlignment) = 0;
+        virtual void setSectionAlignment(Alignment sectionAlignment) = 0;
 
         // Layout a block of text with the specified style into the document.
-        virtual void write (Style * Style, Utf8Span Text) = 0;
+        virtual void write(Style* Style, Utf8Span Text) = 0;
 
         /// Adds a content block to the document without laying it out. An
         /// identifier is returned that can be used to refer to it. If select
         /// is true, the block is activated to be references by future writes.
-        virtual intptr_t addContent (Utf8Span Text, bool Select = true) = 0;
+        virtual intptr_t addContent(Utf8Span Text, bool Select = true) = 0;
 
         /// Select a previously created content block for future writes.
-        virtual void selectContent (intptr_t contentHandle) = 0;
+        virtual void selectContent(intptr_t contentHandle) = 0;
 
         /// Layout a span of the selected content block into the document
         /// using the specified style.
-        virtual void write (Style * Style, size_t Begin, size_t End) = 0;
+        virtual void write(Style* Style, size_t Begin, size_t End) = 0;
 
         /// Finalize the document layout, and return a pointer to it.
-        virtual TypesetBook::Ptr complete () = 0;
+        virtual TypesetBook::Ptr complete() = 0;
     };
 
     /// An interface to the BookPage widget.
     class BookPage : public MyGUI::Widget
     {
-    MYGUI_RTTI_DERIVED(BookPage)
+        MYGUI_RTTI_DERIVED(BookPage)
     public:
-
         typedef TypesetBook::InteractiveId InteractiveId;
-        typedef std::function <void (InteractiveId)> ClickCallback;
+        typedef std::function<void(InteractiveId)> ClickCallback;
 
         /// Make the widget display the specified page from the specified book.
-        virtual void showPage (TypesetBook::Ptr Book, size_t Page) = 0;
+        virtual void showPage(TypesetBook::Ptr Book, size_t Page) = 0;
 
         /// Set the callback for a clicking a hyper-link in the document.
-        virtual void adviseLinkClicked (ClickCallback callback) = 0;
+        virtual void adviseLinkClicked(ClickCallback callback) = 0;
 
         /// Clear the hyper-link click callback.
-        virtual void unadviseLinkClicked () = 0;
+        virtual void unadviseLinkClicked() = 0;
 
         /// Register the widget and associated sub-widget with MyGUI. Should be
         /// called once near the beginning of the program.
-        static void registerMyGUIComponents ();
+        static void registerMyGUIComponents();
     };
 }
 
diff --git a/apps/openmw/mwgui/bookwindow.cpp b/apps/openmw/mwgui/bookwindow.cpp
index 8dbb90ca6d..56b76836e2 100644
--- a/apps/openmw/mwgui/bookwindow.cpp
+++ b/apps/openmw/mwgui/bookwindow.cpp
@@ -1,13 +1,13 @@
 #include "bookwindow.hpp"
 
-#include <MyGUI_TextBox.h>
 #include <MyGUI_InputManager.h>
+#include <MyGUI_TextBox.h>
 
 #include <components/esm3/loadbook.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 
@@ -19,7 +19,7 @@
 namespace MWGui
 {
 
-    BookWindow::BookWindow ()
+    BookWindow::BookWindow()
         : BookWindowBase("openmw_book.layout")
         , mCurrentPage(0)
         , mTakeButtonShow(true)
@@ -61,14 +61,15 @@ namespace MWGui
         if (mNextPageButton->getSize().width == 64)
         {
             // english button has a 7 pixel wide strip of garbage on its right edge
-            mNextPageButton->setSize(64-7, mNextPageButton->getSize().height);
-            mNextPageButton->setImageCoord(MyGUI::IntCoord(0,0,(64-7)*scale,mNextPageButton->getSize().height*scale));
+            mNextPageButton->setSize(64 - 7, mNextPageButton->getSize().height);
+            mNextPageButton->setImageCoord(
+                MyGUI::IntCoord(0, 0, (64 - 7) * scale, mNextPageButton->getSize().height * scale));
         }
 
         center();
     }
 
-    void BookWindow::onMouseWheel(MyGUI::Widget *_sender, int _rel)
+    void BookWindow::onMouseWheel(MyGUI::Widget* _sender, int _rel)
     {
         if (_rel < 0)
             nextPage();
@@ -81,7 +82,7 @@ namespace MWGui
         mPages.clear();
     }
 
-    void BookWindow::setPtr (const MWWorld::Ptr& book)
+    void BookWindow::setPtr(const MWWorld::Ptr& book)
     {
         mBook = book;
 
@@ -91,7 +92,7 @@ namespace MWGui
         clearPages();
         mCurrentPage = 0;
 
-        MWWorld::LiveCellRef<ESM::Book> *ref = mBook.get<ESM::Book>();
+        MWWorld::LiveCellRef<ESM::Book>* ref = mBook.get<ESM::Book>();
 
         Formatting::BookFormatter formatter;
         mPages = formatter.markupToWidget(mLeftPage, ref->mBase->mText);
@@ -110,7 +111,7 @@ namespace MWGui
         mTakeButton->setVisible(mTakeButtonShow && mTakeButtonAllowed);
     }
 
-    void BookWindow::onKeyButtonPressed(MyGUI::Widget *sender, MyGUI::KeyCode key, MyGUI::Char character)
+    void BookWindow::onKeyButtonPressed(MyGUI::Widget* sender, MyGUI::KeyCode key, MyGUI::Char character)
     {
         if (key == MyGUI::KeyCode::ArrowUp)
             prevPage();
@@ -124,38 +125,38 @@ namespace MWGui
         mTakeButton->setVisible(mTakeButtonShow && mTakeButtonAllowed);
     }
 
-    void BookWindow::onCloseButtonClicked (MyGUI::Widget* sender)
+    void BookWindow::onCloseButtonClicked(MyGUI::Widget* sender)
     {
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Book);
     }
 
-    void BookWindow::onTakeButtonClicked (MyGUI::Widget* sender)
+    void BookWindow::onTakeButtonClicked(MyGUI::Widget* sender)
     {
         MWBase::Environment::get().getWindowManager()->playSound("Item Book Up");
 
         MWWorld::ActionTake take(mBook);
-        take.execute (MWMechanics::getPlayer());
+        take.execute(MWMechanics::getPlayer());
 
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Book);
     }
 
-    void BookWindow::onNextPageButtonClicked (MyGUI::Widget* sender)
+    void BookWindow::onNextPageButtonClicked(MyGUI::Widget* sender)
     {
         nextPage();
     }
 
-    void BookWindow::onPrevPageButtonClicked (MyGUI::Widget* sender)
+    void BookWindow::onPrevPageButtonClicked(MyGUI::Widget* sender)
     {
         prevPage();
     }
 
     void BookWindow::updatePages()
     {
-        mLeftPageNumber->setCaption( MyGUI::utility::toString(mCurrentPage*2 + 1) );
-        mRightPageNumber->setCaption( MyGUI::utility::toString(mCurrentPage*2 + 2) );
+        mLeftPageNumber->setCaption(MyGUI::utility::toString(mCurrentPage * 2 + 1));
+        mRightPageNumber->setCaption(MyGUI::utility::toString(mCurrentPage * 2 + 2));
 
         MyGUI::Widget* focus = MyGUI::InputManager::getInstance().getKeyFocusWidget();
-        bool nextPageVisible = (mCurrentPage+1)*2 < mPages.size();
+        bool nextPageVisible = (mCurrentPage + 1) * 2 < mPages.size();
         mNextPageButton->setVisible(nextPageVisible);
         bool prevPageVisible = mCurrentPage != 0;
         mPrevPageButton->setVisible(prevPageVisible);
@@ -168,17 +169,17 @@ namespace MWGui
         if (mPages.empty())
             return;
 
-        MyGUI::Widget * paper;
+        MyGUI::Widget* paper;
 
         paper = mLeftPage->getChildAt(0);
-        paper->setCoord(paper->getPosition().left, -mPages[mCurrentPage*2].first,
-                paper->getWidth(), mPages[mCurrentPage*2].second);
+        paper->setCoord(paper->getPosition().left, -mPages[mCurrentPage * 2].first, paper->getWidth(),
+            mPages[mCurrentPage * 2].second);
 
         paper = mRightPage->getChildAt(0);
-        if ((mCurrentPage+1)*2 <= mPages.size())
+        if ((mCurrentPage + 1) * 2 <= mPages.size())
         {
-            paper->setCoord(paper->getPosition().left, -mPages[mCurrentPage*2+1].first,
-                    paper->getWidth(), mPages[mCurrentPage*2+1].second);
+            paper->setCoord(paper->getPosition().left, -mPages[mCurrentPage * 2 + 1].first, paper->getWidth(),
+                mPages[mCurrentPage * 2 + 1].second);
             paper->setVisible(true);
         }
         else
@@ -189,7 +190,7 @@ namespace MWGui
 
     void BookWindow::nextPage()
     {
-        if ((mCurrentPage+1)*2 < mPages.size())
+        if ((mCurrentPage + 1) * 2 < mPages.size())
         {
             MWBase::Environment::get().getWindowManager()->playSound("book page2");
 
diff --git a/apps/openmw/mwgui/bookwindow.hpp b/apps/openmw/mwgui/bookwindow.hpp
index 116437f22e..bf210c0b12 100644
--- a/apps/openmw/mwgui/bookwindow.hpp
+++ b/apps/openmw/mwgui/bookwindow.hpp
@@ -11,51 +11,51 @@ namespace MWGui
 {
     class BookWindow : public BookWindowBase
     {
-        public:
-            BookWindow();
+    public:
+        BookWindow();
 
-            void setPtr(const MWWorld::Ptr& book) override;
-            void setInventoryAllowed(bool allowed);
+        void setPtr(const MWWorld::Ptr& book) override;
+        void setInventoryAllowed(bool allowed);
 
-            void onResChange(int, int) override { center(); }
+        void onResChange(int, int) override { center(); }
 
-        protected:
-            void onNextPageButtonClicked (MyGUI::Widget* sender);
-            void onPrevPageButtonClicked (MyGUI::Widget* sender);
-            void onCloseButtonClicked (MyGUI::Widget* sender);
-            void onTakeButtonClicked (MyGUI::Widget* sender);
-            void onMouseWheel(MyGUI::Widget* _sender, int _rel);
-            void setTakeButtonShow(bool show);
+    protected:
+        void onNextPageButtonClicked(MyGUI::Widget* sender);
+        void onPrevPageButtonClicked(MyGUI::Widget* sender);
+        void onCloseButtonClicked(MyGUI::Widget* sender);
+        void onTakeButtonClicked(MyGUI::Widget* sender);
+        void onMouseWheel(MyGUI::Widget* _sender, int _rel);
+        void setTakeButtonShow(bool show);
 
-            void onKeyButtonPressed(MyGUI::Widget* sender, MyGUI::KeyCode key, MyGUI::Char character);
+        void onKeyButtonPressed(MyGUI::Widget* sender, MyGUI::KeyCode key, MyGUI::Char character);
 
-            void nextPage();
-            void prevPage();
+        void nextPage();
+        void prevPage();
 
-            void updatePages();
-            void clearPages();
+        void updatePages();
+        void clearPages();
 
-        private:
-            typedef std::pair<int, int> Page;
-            typedef std::vector<Page> Pages;
+    private:
+        typedef std::pair<int, int> Page;
+        typedef std::vector<Page> Pages;
 
-            Gui::ImageButton* mCloseButton;
-            Gui::ImageButton* mTakeButton;
-            Gui::ImageButton* mNextPageButton;
-            Gui::ImageButton* mPrevPageButton;
+        Gui::ImageButton* mCloseButton;
+        Gui::ImageButton* mTakeButton;
+        Gui::ImageButton* mNextPageButton;
+        Gui::ImageButton* mPrevPageButton;
 
-            MyGUI::TextBox* mLeftPageNumber;
-            MyGUI::TextBox* mRightPageNumber;
-            MyGUI::Widget* mLeftPage;
-            MyGUI::Widget* mRightPage;
+        MyGUI::TextBox* mLeftPageNumber;
+        MyGUI::TextBox* mRightPageNumber;
+        MyGUI::Widget* mLeftPage;
+        MyGUI::Widget* mRightPage;
 
-            unsigned int mCurrentPage; // 0 is first page
-            Pages mPages;
+        unsigned int mCurrentPage; // 0 is first page
+        Pages mPages;
 
-            MWWorld::Ptr mBook;
+        MWWorld::Ptr mBook;
 
-            bool mTakeButtonShow;
-            bool mTakeButtonAllowed;
+        bool mTakeButtonShow;
+        bool mTakeButtonAllowed;
     };
 
 }
diff --git a/apps/openmw/mwgui/charactercreation.cpp b/apps/openmw/mwgui/charactercreation.cpp
index 9a620ae3d5..de71aed1f6 100644
--- a/apps/openmw/mwgui/charactercreation.cpp
+++ b/apps/openmw/mwgui/charactercreation.cpp
@@ -7,24 +7,24 @@
 #include <components/misc/rng.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/soundmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
-#include "../mwbase/world.hpp"
+#include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/npcstats.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/player.hpp"
 
-#include "textinput.hpp"
-#include "race.hpp"
-#include "class.hpp"
 #include "birth.hpp"
-#include "review.hpp"
+#include "class.hpp"
 #include "inventorywindow.hpp"
+#include "race.hpp"
+#include "review.hpp"
+#include "textinput.hpp"
 
 namespace
 {
@@ -45,15 +45,16 @@ namespace
     {
         number++;
 
-        std::string question{Fallback::Map::getString("Question_" + MyGUI::utility::toString(number) + "_Question")};
-        std::string answer0{Fallback::Map::getString("Question_" + MyGUI::utility::toString(number) + "_AnswerOne")};
-        std::string answer1{Fallback::Map::getString("Question_" + MyGUI::utility::toString(number) + "_AnswerTwo")};
-        std::string answer2{Fallback::Map::getString("Question_" + MyGUI::utility::toString(number) + "_AnswerThree")};
+        std::string question{ Fallback::Map::getString("Question_" + MyGUI::utility::toString(number) + "_Question") };
+        std::string answer0{ Fallback::Map::getString("Question_" + MyGUI::utility::toString(number) + "_AnswerOne") };
+        std::string answer1{ Fallback::Map::getString("Question_" + MyGUI::utility::toString(number) + "_AnswerTwo") };
+        std::string answer2{ Fallback::Map::getString(
+            "Question_" + MyGUI::utility::toString(number) + "_AnswerThree") };
         std::string sound = "vo\\misc\\chargen qa" + MyGUI::utility::toString(number) + ".wav";
 
-        Response r0 = {answer0, ESM::Class::Combat};
-        Response r1 = {answer1, ESM::Class::Magic};
-        Response r2 = {answer2, ESM::Class::Stealth};
+        Response r0 = { answer0, ESM::Class::Combat };
+        Response r1 = { answer1, ESM::Class::Magic };
+        Response r2 = { answer2, ESM::Class::Stealth };
 
         // randomize order in which responses are displayed
         int order = Misc::Rng::rollDice(6);
@@ -61,17 +62,17 @@ namespace
         switch (order)
         {
             case 0:
-                return {question, {r0, r1, r2}, sound};
+                return { question, { r0, r1, r2 }, sound };
             case 1:
-                return {question, {r0, r2, r1}, sound};
+                return { question, { r0, r2, r1 }, sound };
             case 2:
-                return {question, {r1, r0, r2}, sound};
+                return { question, { r1, r0, r2 }, sound };
             case 3:
-                return {question, {r1, r2, r0}, sound};
+                return { question, { r1, r2, r0 }, sound };
             case 4:
-                return {question, {r2, r0, r1}, sound};
+                return { question, { r2, r0, r1 }, sound };
             default:
-                return {question, {r2, r1, r0}, sound};
+                return { question, { r2, r1, r0 }, sound };
         }
     }
 }
@@ -100,17 +101,23 @@ namespace MWGui
             mPlayerSkillValues.emplace(ESM::Skill::sSkillIds[i], MWMechanics::SkillValue());
     }
 
-    void CharacterCreation::setValue (const std::string& id, const MWMechanics::AttributeValue& value)
-    {
-        static const char *ids[] =
-        {
-            "AttribVal1", "AttribVal2", "AttribVal3", "AttribVal4",
-            "AttribVal5", "AttribVal6", "AttribVal7", "AttribVal8", nullptr,
+    void CharacterCreation::setValue(const std::string& id, const MWMechanics::AttributeValue& value)
+    {
+        static const char* ids[] = {
+            "AttribVal1",
+            "AttribVal2",
+            "AttribVal3",
+            "AttribVal4",
+            "AttribVal5",
+            "AttribVal6",
+            "AttribVal7",
+            "AttribVal8",
+            nullptr,
         };
 
-        for (int i=0; ids[i]; ++i)
+        for (int i = 0; ids[i]; ++i)
         {
-            if (ids[i]==id)
+            if (ids[i] == id)
             {
                 mPlayerAttributes[static_cast<ESM::Attribute::AttributeID>(i)] = value;
                 if (mReviewDialog)
@@ -121,21 +128,21 @@ namespace MWGui
         }
     }
 
-    void CharacterCreation::setValue (const std::string& id, const MWMechanics::DynamicStat<float>& value)
+    void CharacterCreation::setValue(const std::string& id, const MWMechanics::DynamicStat<float>& value)
     {
         if (mReviewDialog)
         {
             if (id == "HBar")
             {
-                mReviewDialog->setHealth (value);
+                mReviewDialog->setHealth(value);
             }
             else if (id == "MBar")
             {
-                mReviewDialog->setMagicka (value);
+                mReviewDialog->setMagicka(value);
             }
             else if (id == "FBar")
             {
-                mReviewDialog->setFatigue (value);
+                mReviewDialog->setFatigue(value);
             }
         }
     }
@@ -147,7 +154,7 @@ namespace MWGui
             mReviewDialog->setSkillValue(parSkill, value);
     }
 
-    void CharacterCreation::configureSkills (const SkillList& major, const SkillList& minor)
+    void CharacterCreation::configureSkills(const SkillList& major, const SkillList& minor)
     {
         if (mReviewDialog)
             mReviewDialog->configureSkills(major, minor);
@@ -171,7 +178,8 @@ namespace MWGui
                 case GM_Name:
                     MWBase::Environment::get().getWindowManager()->removeDialog(std::move(mNameDialog));
                     mNameDialog = std::make_unique<TextInputDialog>();
-                    mNameDialog->setTextLabel(MWBase::Environment::get().getWindowManager()->getGameSettingString("sName", "Name"));
+                    mNameDialog->setTextLabel(
+                        MWBase::Environment::get().getWindowManager()->getGameSettingString("sName", "Name"));
                     mNameDialog->setTextInput(mPlayerName);
                     mNameDialog->setNextButtonShow(mCreationStage >= CSE_NameChosen);
                     mNameDialog->eventDone += MyGUI::newDelegate(this, &CharacterCreation::onNameDialogDone);
@@ -193,7 +201,8 @@ namespace MWGui
                 case GM_Class:
                     MWBase::Environment::get().getWindowManager()->removeDialog(std::move(mClassChoiceDialog));
                     mClassChoiceDialog = std::make_unique<ClassChoiceDialog>();
-                    mClassChoiceDialog->eventButtonSelected += MyGUI::newDelegate(this, &CharacterCreation::onClassChoice);
+                    mClassChoiceDialog->eventButtonSelected
+                        += MyGUI::newDelegate(this, &CharacterCreation::onClassChoice);
                     mClassChoiceDialog->setVisible(true);
                     if (mCreationStage < CSE_RaceChosen)
                         mCreationStage = CSE_RaceChosen;
@@ -227,8 +236,10 @@ namespace MWGui
                     if (mCreateClassDialog == nullptr)
                     {
                         mCreateClassDialog = std::make_unique<CreateClassDialog>();
-                        mCreateClassDialog->eventDone += MyGUI::newDelegate(this, &CharacterCreation::onCreateClassDialogDone);
-                        mCreateClassDialog->eventBack += MyGUI::newDelegate(this, &CharacterCreation::onCreateClassDialogBack);
+                        mCreateClassDialog->eventDone
+                            += MyGUI::newDelegate(this, &CharacterCreation::onCreateClassDialogDone);
+                        mCreateClassDialog->eventBack
+                            += MyGUI::newDelegate(this, &CharacterCreation::onCreateClassDialogBack);
                     }
                     mCreateClassDialog->setNextButtonShow(mCreationStage >= CSE_ClassChosen);
                     mCreateClassDialog->setVisible(true);
@@ -249,13 +260,13 @@ namespace MWGui
                     MWBase::Environment::get().getWindowManager()->removeDialog(std::move(mReviewDialog));
                     mReviewDialog = std::make_unique<ReviewDialog>();
 
-                    MWBase::World *world = MWBase::Environment::get().getWorld();
+                    MWBase::World* world = MWBase::Environment::get().getWorld();
 
-                    const ESM::NPC *playerNpc = world->getPlayerPtr().get<ESM::NPC>()->mBase;
+                    const ESM::NPC* playerNpc = world->getPlayerPtr().get<ESM::NPC>()->mBase;
 
                     const MWWorld::Player player = world->getPlayer();
 
-                    const ESM::Class *playerClass = world->getStore().get<ESM::Class>().find(playerNpc->mClass);
+                    const ESM::Class* playerClass = world->getStore().get<ESM::Class>().find(playerNpc->mClass);
 
                     mReviewDialog->setPlayerName(playerNpc->mName);
                     mReviewDialog->setRace(playerNpc->mRace);
@@ -270,17 +281,20 @@ namespace MWGui
                     mReviewDialog->setFatigue(stats.getFatigue());
                     for (auto& attributePair : mPlayerAttributes)
                     {
-                        mReviewDialog->setAttribute(static_cast<ESM::Attribute::AttributeID> (attributePair.first), attributePair.second);
+                        mReviewDialog->setAttribute(
+                            static_cast<ESM::Attribute::AttributeID>(attributePair.first), attributePair.second);
                     }
                     for (auto& skillPair : mPlayerSkillValues)
                     {
-                        mReviewDialog->setSkillValue(static_cast<ESM::Skill::SkillEnum> (skillPair.first), skillPair.second);
+                        mReviewDialog->setSkillValue(
+                            static_cast<ESM::Skill::SkillEnum>(skillPair.first), skillPair.second);
                     }
                     mReviewDialog->configureSkills(mPlayerMajorSkills, mPlayerMinorSkills);
 
                     mReviewDialog->eventDone += MyGUI::newDelegate(this, &CharacterCreation::onReviewDialogDone);
                     mReviewDialog->eventBack += MyGUI::newDelegate(this, &CharacterCreation::onReviewDialogBack);
-                    mReviewDialog->eventActivateDialog += MyGUI::newDelegate(this, &CharacterCreation::onReviewActivateDialog);
+                    mReviewDialog->eventActivateDialog
+                        += MyGUI::newDelegate(this, &CharacterCreation::onReviewActivateDialog);
                     mReviewDialog->setVisible(true);
                     if (mCreationStage < CSE_BirthSignChosen)
                         mCreationStage = CSE_BirthSignChosen;
@@ -315,7 +329,7 @@ namespace MWGui
 
         MWBase::Environment::get().getWindowManager()->popGuiMode();
 
-        switch(parDialog)
+        switch (parDialog)
         {
             case ReviewDialog::NAME_DIALOG:
                 MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_Name);
@@ -335,12 +349,11 @@ namespace MWGui
     {
         if (mPickClassDialog)
         {
-            const std::string &classId = mPickClassDialog->getClassId();
+            const std::string& classId = mPickClassDialog->getClassId();
             if (!classId.empty())
                 MWBase::Environment::get().getMechanicsManager()->setPlayerClass(classId);
 
-            const ESM::Class *klass =
-                MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find(classId);
+            const ESM::Class* klass = MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find(classId);
             if (klass)
             {
                 mPlayerClass = *klass;
@@ -370,7 +383,7 @@ namespace MWGui
 
         MWBase::Environment::get().getWindowManager()->popGuiMode();
 
-        switch(_index)
+        switch (_index)
         {
             case ClassChoiceDialog::Class_Generate:
                 MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_ClassGenerate);
@@ -384,7 +397,6 @@ namespace MWGui
             case ClassChoiceDialog::Class_Back:
                 MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_Race);
                 break;
-
         };
     }
 
@@ -404,15 +416,12 @@ namespace MWGui
     {
         if (mRaceDialog)
         {
-            const ESM::NPC &data = mRaceDialog->getResult();
+            const ESM::NPC& data = mRaceDialog->getResult();
             mPlayerRaceId = data.mRace;
-            if (!mPlayerRaceId.empty()) {
+            if (!mPlayerRaceId.empty())
+            {
                 MWBase::Environment::get().getMechanicsManager()->setPlayerRace(
-                    data.mRace,
-                    data.isMale(),
-                    data.mHead,
-                    data.mHair
-                );
+                    data.mRace, data.isMale(), data.mHead, data.mHair);
             }
             MWBase::Environment::get().getWindowManager()->getInventoryWindow()->rebuildAvatar();
 
@@ -479,9 +488,9 @@ namespace MWGui
 
             std::vector<ESM::Skill::SkillEnum> majorSkills = mCreateClassDialog->getMajorSkills();
             std::vector<ESM::Skill::SkillEnum> minorSkills = mCreateClassDialog->getMinorSkills();
-            assert(majorSkills.size() >= sizeof(klass.mData.mSkills)/sizeof(klass.mData.mSkills[0]));
-            assert(minorSkills.size() >= sizeof(klass.mData.mSkills)/sizeof(klass.mData.mSkills[0]));
-            for (size_t i = 0; i < sizeof(klass.mData.mSkills)/sizeof(klass.mData.mSkills[0]); ++i)
+            assert(majorSkills.size() >= sizeof(klass.mData.mSkills) / sizeof(klass.mData.mSkills[0]));
+            assert(minorSkills.size() >= sizeof(klass.mData.mSkills) / sizeof(klass.mData.mSkills[0]));
+            for (size_t i = 0; i < sizeof(klass.mData.mSkills) / sizeof(klass.mData.mSkills[0]); ++i)
             {
                 klass.mData.mSkills[i][1] = majorSkills[i];
                 klass.mData.mSkills[i][0] = minorSkills[i];
@@ -664,7 +673,8 @@ namespace MWGui
         buttons.push_back(step.mResponses[1].mText);
         buttons.push_back(step.mResponses[2].mText);
         mGenerateClassQuestionDialog->setButtons(buttons);
-        mGenerateClassQuestionDialog->eventButtonSelected += MyGUI::newDelegate(this, &CharacterCreation::onClassQuestionChosen);
+        mGenerateClassQuestionDialog->eventButtonSelected
+            += MyGUI::newDelegate(this, &CharacterCreation::onClassQuestionChosen);
         mGenerateClassQuestionDialog->setVisible(true);
 
         MWBase::Environment::get().getSoundManager()->say(step.mSound);
@@ -676,8 +686,8 @@ namespace MWGui
 
         MWBase::Environment::get().getMechanicsManager()->setPlayerClass(mGenerateClass);
 
-        const ESM::Class *klass =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find(mGenerateClass);
+        const ESM::Class* klass
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find(mGenerateClass);
 
         mPlayerClass = *klass;
     }
diff --git a/apps/openmw/mwgui/charactercreation.hpp b/apps/openmw/mwgui/charactercreation.hpp
index e9c21fc212..3780efbd6b 100644
--- a/apps/openmw/mwgui/charactercreation.hpp
+++ b/apps/openmw/mwgui/charactercreation.hpp
@@ -4,8 +4,8 @@
 #include <components/esm3/loadclas.hpp>
 
 #include <map>
-#include <vector>
 #include <memory>
+#include <vector>
 
 #include "statswatcher.hpp"
 
@@ -38,99 +38,100 @@ namespace MWGui
     class CharacterCreation : public StatsListener
     {
     public:
-    typedef std::vector<int> SkillList;
+        typedef std::vector<int> SkillList;
 
-    CharacterCreation(osg::Group* parent, Resource::ResourceSystem* resourceSystem);
-    virtual ~CharacterCreation();
+        CharacterCreation(osg::Group* parent, Resource::ResourceSystem* resourceSystem);
+        virtual ~CharacterCreation();
 
-    //Show a dialog
-    void spawnDialog(const char id);
+        // Show a dialog
+        void spawnDialog(const char id);
 
-    void setValue (const std::string& id, const MWMechanics::AttributeValue& value) override;
-    void setValue (const std::string& id, const MWMechanics::DynamicStat<float>& value) override;
-    void setValue(const ESM::Skill::SkillEnum parSkill, const MWMechanics::SkillValue& value) override;
-    void configureSkills(const SkillList& major, const SkillList& minor) override;
+        void setValue(const std::string& id, const MWMechanics::AttributeValue& value) override;
+        void setValue(const std::string& id, const MWMechanics::DynamicStat<float>& value) override;
+        void setValue(const ESM::Skill::SkillEnum parSkill, const MWMechanics::SkillValue& value) override;
+        void configureSkills(const SkillList& major, const SkillList& minor) override;
 
-    void onFrame(float duration);
+        void onFrame(float duration);
 
     private:
-    osg::Group* mParent;
-    Resource::ResourceSystem* mResourceSystem;
-
-    SkillList mPlayerMajorSkills, mPlayerMinorSkills;
-    std::map<int, MWMechanics::AttributeValue> mPlayerAttributes;
-    std::map<int, MWMechanics::SkillValue> mPlayerSkillValues;
-
-    //Dialogs
-    std::unique_ptr<TextInputDialog> mNameDialog;
-    std::unique_ptr<RaceDialog> mRaceDialog;
-    std::unique_ptr<ClassChoiceDialog> mClassChoiceDialog;
-    std::unique_ptr<InfoBoxDialog> mGenerateClassQuestionDialog;
-    std::unique_ptr<GenerateClassResultDialog> mGenerateClassResultDialog;
-    std::unique_ptr<PickClassDialog> mPickClassDialog;
-    std::unique_ptr<CreateClassDialog> mCreateClassDialog;
-    std::unique_ptr<BirthDialog> mBirthSignDialog;
-    std::unique_ptr<ReviewDialog> mReviewDialog;
-
-    //Player data
-    std::string mPlayerName;
-    std::string mPlayerRaceId;
-    std::string mPlayerBirthSignId;
-    ESM::Class mPlayerClass;
-
-    //Class generation vars
-    unsigned mGenerateClassStep;                 // Keeps track of current step in Generate Class dialog
-    ESM::Class::Specialization mGenerateClassResponses[3];
-    unsigned mGenerateClassSpecializations[3];   // A counter for each specialization which is increased when an answer is chosen
-    std::string mGenerateClass;                  // In order: Combat, Magic, Stealth
-
-    ////Dialog events
-    //Name dialog
-    void onNameDialogDone(WindowBase* parWindow);
-
-    //Race dialog
-    void onRaceDialogDone(WindowBase* parWindow);
-    void onRaceDialogBack();
-    void selectRace();
-
-    //Class dialogs
-    void onClassChoice(int _index);
-    void onPickClassDialogDone(WindowBase* parWindow);
-    void onPickClassDialogBack();
-    void onCreateClassDialogDone(WindowBase* parWindow);
-    void onCreateClassDialogBack();
-    void showClassQuestionDialog();
-    void onClassQuestionChosen(int _index);
-    void onGenerateClassBack();
-    void onGenerateClassDone(WindowBase* parWindow);
-    void selectGeneratedClass();
-    void selectCreatedClass();
-    void selectPickedClass();
-
-    //Birthsign dialog
-    void onBirthSignDialogDone(WindowBase* parWindow);
-    void onBirthSignDialogBack();
-    void selectBirthSign();
-
-    //Review dialog
-    void onReviewDialogDone(WindowBase* parWindow);
-    void onReviewDialogBack();
-    void onReviewActivateDialog(int parDialog);
-
-    enum CSE    //Creation Stage Enum
-    {
-        CSE_NotStarted,
-        CSE_NameChosen,
-        CSE_RaceChosen,
-        CSE_ClassChosen,
-        CSE_BirthSignChosen,
-        CSE_ReviewBack,
-        CSE_ReviewNext
-    };
-
-    CSE mCreationStage; // Which state the character creating is in, controls back/next/ok buttons
-
-    void handleDialogDone(CSE currentStage, int nextMode);
+        osg::Group* mParent;
+        Resource::ResourceSystem* mResourceSystem;
+
+        SkillList mPlayerMajorSkills, mPlayerMinorSkills;
+        std::map<int, MWMechanics::AttributeValue> mPlayerAttributes;
+        std::map<int, MWMechanics::SkillValue> mPlayerSkillValues;
+
+        // Dialogs
+        std::unique_ptr<TextInputDialog> mNameDialog;
+        std::unique_ptr<RaceDialog> mRaceDialog;
+        std::unique_ptr<ClassChoiceDialog> mClassChoiceDialog;
+        std::unique_ptr<InfoBoxDialog> mGenerateClassQuestionDialog;
+        std::unique_ptr<GenerateClassResultDialog> mGenerateClassResultDialog;
+        std::unique_ptr<PickClassDialog> mPickClassDialog;
+        std::unique_ptr<CreateClassDialog> mCreateClassDialog;
+        std::unique_ptr<BirthDialog> mBirthSignDialog;
+        std::unique_ptr<ReviewDialog> mReviewDialog;
+
+        // Player data
+        std::string mPlayerName;
+        std::string mPlayerRaceId;
+        std::string mPlayerBirthSignId;
+        ESM::Class mPlayerClass;
+
+        // Class generation vars
+        unsigned mGenerateClassStep; // Keeps track of current step in Generate Class dialog
+        ESM::Class::Specialization mGenerateClassResponses[3];
+        unsigned mGenerateClassSpecializations[3]; // A counter for each specialization which is increased when an
+                                                   // answer is chosen
+        std::string mGenerateClass; // In order: Combat, Magic, Stealth
+
+        ////Dialog events
+        // Name dialog
+        void onNameDialogDone(WindowBase* parWindow);
+
+        // Race dialog
+        void onRaceDialogDone(WindowBase* parWindow);
+        void onRaceDialogBack();
+        void selectRace();
+
+        // Class dialogs
+        void onClassChoice(int _index);
+        void onPickClassDialogDone(WindowBase* parWindow);
+        void onPickClassDialogBack();
+        void onCreateClassDialogDone(WindowBase* parWindow);
+        void onCreateClassDialogBack();
+        void showClassQuestionDialog();
+        void onClassQuestionChosen(int _index);
+        void onGenerateClassBack();
+        void onGenerateClassDone(WindowBase* parWindow);
+        void selectGeneratedClass();
+        void selectCreatedClass();
+        void selectPickedClass();
+
+        // Birthsign dialog
+        void onBirthSignDialogDone(WindowBase* parWindow);
+        void onBirthSignDialogBack();
+        void selectBirthSign();
+
+        // Review dialog
+        void onReviewDialogDone(WindowBase* parWindow);
+        void onReviewDialogBack();
+        void onReviewActivateDialog(int parDialog);
+
+        enum CSE // Creation Stage Enum
+        {
+            CSE_NotStarted,
+            CSE_NameChosen,
+            CSE_RaceChosen,
+            CSE_ClassChosen,
+            CSE_BirthSignChosen,
+            CSE_ReviewBack,
+            CSE_ReviewNext
+        };
+
+        CSE mCreationStage; // Which state the character creating is in, controls back/next/ok buttons
+
+        void handleDialogDone(CSE currentStage, int nextMode);
     };
 }
 
diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp
index a54435d67f..ec5ec75eef 100644
--- a/apps/openmw/mwgui/class.cpp
+++ b/apps/openmw/mwgui/class.cpp
@@ -1,22 +1,22 @@
 #include "class.hpp"
 
+#include <MyGUI_Gui.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_ListBox.h>
-#include <MyGUI_Gui.h>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 
 #include "../mwworld/esmstore.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/resource/resourcesystem.hpp>
+#include <components/esm3/loadnpc.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
 #include <components/vfs/manager.hpp>
-#include <components/esm3/loadnpc.hpp>
 
 #include "tooltips.hpp"
 #include "ustring.hpp"
@@ -37,9 +37,10 @@ namespace MWGui
     /* GenerateClassResultDialog */
 
     GenerateClassResultDialog::GenerateClassResultDialog()
-      : WindowModal("openmw_chargen_generate_class_result.layout")
+        : WindowModal("openmw_chargen_generate_class_result.layout")
     {
-        setText("ReflectT", MWBase::Environment::get().getWindowManager()->getGameSettingString("sMessageQuestionAnswer1", {}));
+        setText("ReflectT",
+            MWBase::Environment::get().getWindowManager()->getGameSettingString("sMessageQuestionAnswer1", {}));
 
         getWidget(mClassImage, "ClassImage");
         getWidget(mClassName, "ClassName");
@@ -57,13 +58,14 @@ namespace MWGui
         center();
     }
 
-    void GenerateClassResultDialog::setClassId(const std::string &classId)
+    void GenerateClassResultDialog::setClassId(const std::string& classId)
     {
         mCurrentClassId = classId;
 
         setClassImage(mClassImage, mCurrentClassId);
 
-        mClassName->setCaption(MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find(mCurrentClassId)->mName);
+        mClassName->setCaption(
+            MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find(mCurrentClassId)->mName);
 
         center();
     }
@@ -83,7 +85,7 @@ namespace MWGui
     /* PickClassDialog */
 
     PickClassDialog::PickClassDialog()
-      : WindowModal("openmw_chargen_class.layout")
+        : WindowModal("openmw_chargen_class.layout")
     {
         // Centre dialog
         center();
@@ -93,9 +95,9 @@ namespace MWGui
         getWidget(mFavoriteAttribute[0], "FavoriteAttribute0");
         getWidget(mFavoriteAttribute[1], "FavoriteAttribute1");
 
-        for(int i = 0; i < 5; i++)
+        for (int i = 0; i < 5; i++)
         {
-            char theIndex = '0'+i;
+            char theIndex = '0' + i;
             getWidget(mMajorSkill[i], std::string("MajorSkill").append(1, theIndex));
             getWidget(mMinorSkill[i], std::string("MinorSkill").append(1, theIndex));
         }
@@ -125,14 +127,16 @@ namespace MWGui
         getWidget(okButton, "OKButton");
 
         if (shown)
-            okButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
+            okButton->setCaption(
+                toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
         else
-            okButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
+            okButton->setCaption(
+                toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
     }
 
     void PickClassDialog::onOpen()
     {
-        WindowModal::onOpen ();
+        WindowModal::onOpen();
         updateClasses();
         updateStats();
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mClassList);
@@ -140,14 +144,13 @@ namespace MWGui
         // Show the current class by default
         MWWorld::Ptr player = MWMechanics::getPlayer();
 
-        const std::string &classId =
-            player.get<ESM::NPC>()->mBase->mClass;
+        const std::string& classId = player.get<ESM::NPC>()->mBase->mClass;
 
         if (!classId.empty())
             setClassId(classId);
     }
 
-    void PickClassDialog::setClassId(const std::string &classId)
+    void PickClassDialog::setClassId(const std::string& classId)
     {
         mCurrentClassId = classId;
         mClassList->setIndexSelected(MyGUI::ITEM_NONE);
@@ -168,7 +171,7 @@ namespace MWGui
 
     void PickClassDialog::onOkClicked(MyGUI::Widget* _sender)
     {
-        if(mClassList->getIndexSelected() == MyGUI::ITEM_NONE)
+        if (mClassList->getIndexSelected() == MyGUI::ITEM_NONE)
             return;
         eventDone(this);
     }
@@ -181,7 +184,7 @@ namespace MWGui
     void PickClassDialog::onAccept(MyGUI::ListBox* _sender, size_t _index)
     {
         onSelectClass(_sender, _index);
-        if(mClassList->getIndexSelected() == MyGUI::ITEM_NONE)
+        if (mClassList->getIndexSelected() == MyGUI::ITEM_NONE)
             return;
         eventDone(this);
     }
@@ -191,7 +194,7 @@ namespace MWGui
         if (_index == MyGUI::ITEM_NONE)
             return;
 
-        const std::string *classId = mClassList->getItemDataAt<std::string>(_index);
+        const std::string* classId = mClassList->getItemDataAt<std::string>(_index);
         if (Misc::StringUtils::ciEqual(mCurrentClassId, *classId))
             return;
 
@@ -205,9 +208,9 @@ namespace MWGui
     {
         mClassList->removeAllItems();
 
-        const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
 
-        std::vector<std::pair<std::string, std::string> > items; // class id, class name
+        std::vector<std::pair<std::string, std::string>> items; // class id, class name
         for (const ESM::Class& classInfo : store.get<ESM::Class>())
         {
             bool playable = (classInfo.mData.mIsPlayable != 0);
@@ -224,7 +227,7 @@ namespace MWGui
         int index = 0;
         for (auto& itemPair : items)
         {
-            const std::string &id = itemPair.first;
+            const std::string& id = itemPair.first;
             mClassList->addItem(itemPair.second, id);
             if (mCurrentClassId.empty())
             {
@@ -243,19 +246,18 @@ namespace MWGui
     {
         if (mCurrentClassId.empty())
             return;
-        const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-        const ESM::Class *klass = store.get<ESM::Class>().search(mCurrentClassId);
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+        const ESM::Class* klass = store.get<ESM::Class>().search(mCurrentClassId);
         if (!klass)
             return;
 
-        ESM::Class::Specialization specialization = static_cast<ESM::Class::Specialization>(klass->mData.mSpecialization);
+        ESM::Class::Specialization specialization
+            = static_cast<ESM::Class::Specialization>(klass->mData.mSpecialization);
 
-        static const std::string_view specIds[3] = {
-            "sSpecializationCombat",
-            "sSpecializationMagic",
-            "sSpecializationStealth"
-        };
-        std::string specName{MWBase::Environment::get().getWindowManager()->getGameSettingString(specIds[specialization], specIds[specialization])};
+        static const std::string_view specIds[3]
+            = { "sSpecializationCombat", "sSpecializationMagic", "sSpecializationStealth" };
+        std::string specName{ MWBase::Environment::get().getWindowManager()->getGameSettingString(
+            specIds[specialization], specIds[specialization]) };
         mSpecializationName->setCaption(specName);
         ToolTips::createSpecializationToolTip(mSpecializationName, specName, specialization);
 
@@ -303,7 +305,7 @@ namespace MWGui
             width = std::max(width, child->getWidth());
             pos += child->getHeight() + margin;
         }
-        width += margin*2;
+        width += margin * 2;
         widget->setSize(width, pos);
     }
 
@@ -318,7 +320,7 @@ namespace MWGui
         center();
     }
 
-    void InfoBoxDialog::setText(const std::string &str)
+    void InfoBoxDialog::setText(const std::string& str)
     {
         mText->setCaption(str);
         mTextBox->setVisible(!str.empty());
@@ -330,7 +332,7 @@ namespace MWGui
         return mText->getCaption();
     }
 
-    void InfoBoxDialog::setButtons(ButtonList &buttons)
+    void InfoBoxDialog::setButtons(ButtonList& buttons)
     {
         for (MyGUI::Button* button : this->mButtons)
         {
@@ -341,9 +343,10 @@ namespace MWGui
         // TODO: The buttons should be generated from a template in the layout file, ie. cloning an existing widget
         MyGUI::Button* button;
         MyGUI::IntCoord coord = MyGUI::IntCoord(0, 0, mButtonBar->getWidth(), 10);
-        for (const std::string &text : buttons)
+        for (const std::string& text : buttons)
         {
-            button = mButtonBar->createWidget<MyGUI::Button>("MW_Button", coord, MyGUI::Align::Top | MyGUI::Align::HCenter, "");
+            button = mButtonBar->createWidget<MyGUI::Button>(
+                "MW_Button", coord, MyGUI::Align::Top | MyGUI::Align::HCenter, "");
             button->getSubWidgetText()->setWordWrap(true);
             button->setCaption(text);
             fitToText(button);
@@ -385,9 +388,12 @@ namespace MWGui
     {
         setText("");
         ButtonList buttons;
-        buttons.emplace_back(MWBase::Environment::get().getWindowManager()->getGameSettingString("sClassChoiceMenu1", {}));
-        buttons.emplace_back(MWBase::Environment::get().getWindowManager()->getGameSettingString("sClassChoiceMenu2", {}));
-        buttons.emplace_back(MWBase::Environment::get().getWindowManager()->getGameSettingString("sClassChoiceMenu3", {}));
+        buttons.emplace_back(
+            MWBase::Environment::get().getWindowManager()->getGameSettingString("sClassChoiceMenu1", {}));
+        buttons.emplace_back(
+            MWBase::Environment::get().getWindowManager()->getGameSettingString("sClassChoiceMenu2", {}));
+        buttons.emplace_back(
+            MWBase::Environment::get().getWindowManager()->getGameSettingString("sClassChoiceMenu3", {}));
         buttons.emplace_back(MWBase::Environment::get().getWindowManager()->getGameSettingString("sBack", {}));
         setButtons(buttons);
     }
@@ -395,28 +401,34 @@ namespace MWGui
     /* CreateClassDialog */
 
     CreateClassDialog::CreateClassDialog()
-      : WindowModal("openmw_chargen_create_class.layout")
-      , mAffectedAttribute(nullptr)
-      , mAffectedSkill(nullptr)
+        : WindowModal("openmw_chargen_create_class.layout")
+        , mAffectedAttribute(nullptr)
+        , mAffectedSkill(nullptr)
     {
         // Centre dialog
         center();
 
-        setText("SpecializationT", MWBase::Environment::get().getWindowManager()->getGameSettingString("sChooseClassMenu1", "Specialization"));
+        setText("SpecializationT",
+            MWBase::Environment::get().getWindowManager()->getGameSettingString("sChooseClassMenu1", "Specialization"));
         getWidget(mSpecializationName, "SpecializationName");
-        mSpecializationName->eventMouseButtonClick += MyGUI::newDelegate(this, &CreateClassDialog::onSpecializationClicked);
+        mSpecializationName->eventMouseButtonClick
+            += MyGUI::newDelegate(this, &CreateClassDialog::onSpecializationClicked);
 
-        setText("FavoriteAttributesT", MWBase::Environment::get().getWindowManager()->getGameSettingString("sChooseClassMenu2", "Favorite Attributes:"));
+        setText("FavoriteAttributesT",
+            MWBase::Environment::get().getWindowManager()->getGameSettingString(
+                "sChooseClassMenu2", "Favorite Attributes:"));
         getWidget(mFavoriteAttribute0, "FavoriteAttribute0");
         getWidget(mFavoriteAttribute1, "FavoriteAttribute1");
         mFavoriteAttribute0->eventClicked += MyGUI::newDelegate(this, &CreateClassDialog::onAttributeClicked);
         mFavoriteAttribute1->eventClicked += MyGUI::newDelegate(this, &CreateClassDialog::onAttributeClicked);
 
-        setText("MajorSkillT", MWBase::Environment::get().getWindowManager()->getGameSettingString("sSkillClassMajor", {}));
-        setText("MinorSkillT", MWBase::Environment::get().getWindowManager()->getGameSettingString("sSkillClassMinor", {}));
-        for(int i = 0; i < 5; i++)
+        setText(
+            "MajorSkillT", MWBase::Environment::get().getWindowManager()->getGameSettingString("sSkillClassMajor", {}));
+        setText(
+            "MinorSkillT", MWBase::Environment::get().getWindowManager()->getGameSettingString("sSkillClassMinor", {}));
+        for (int i = 0; i < 5; i++)
         {
-            char theIndex = '0'+i;
+            char theIndex = '0' + i;
             getWidget(mMajorSkill[i], std::string("MajorSkill").append(1, theIndex));
             getWidget(mMinorSkill[i], std::string("MinorSkill").append(1, theIndex));
             mSkills.push_back(mMajorSkill[i]);
@@ -508,7 +520,7 @@ namespace MWGui
     {
         std::vector<ESM::Skill::SkillEnum> v;
         v.reserve(5);
-        for(int i = 0; i < 5; i++)
+        for (int i = 0; i < 5; i++)
         {
             v.push_back(mMajorSkill[i]->getSkillId());
         }
@@ -519,7 +531,7 @@ namespace MWGui
     {
         std::vector<ESM::Skill::SkillEnum> v;
         v.reserve(5);
-        for(int i=0; i < 5; i++)
+        for (int i = 0; i < 5; i++)
         {
             v.push_back(mMinorSkill[i]->getSkillId());
         }
@@ -532,9 +544,11 @@ namespace MWGui
         getWidget(okButton, "OKButton");
 
         if (shown)
-            okButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
+            okButton->setCaption(
+                toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
         else
-            okButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
+            okButton->setCaption(
+                toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
     }
 
     // widget controls
@@ -565,13 +579,11 @@ namespace MWGui
 
     void CreateClassDialog::setSpecialization(int id)
     {
-        mSpecializationId = (ESM::Class::Specialization) id;
-        static const std::string_view specIds[3] = {
-            "sSpecializationCombat",
-            "sSpecializationMagic",
-            "sSpecializationStealth"
-        };
-        std::string specName{MWBase::Environment::get().getWindowManager()->getGameSettingString(specIds[mSpecializationId], specIds[mSpecializationId])};
+        mSpecializationId = (ESM::Class::Specialization)id;
+        static const std::string_view specIds[3]
+            = { "sSpecializationCombat", "sSpecializationMagic", "sSpecializationStealth" };
+        std::string specName{ MWBase::Environment::get().getWindowManager()->getGameSettingString(
+            specIds[mSpecializationId], specIds[mSpecializationId]) };
         mSpecializationName->setCaption(specName);
         ToolTips::createSpecializationToolTip(mSpecializationName, specName, mSpecializationId);
     }
@@ -650,7 +662,7 @@ namespace MWGui
 
     void CreateClassDialog::onOkClicked(MyGUI::Widget* _sender)
     {
-        if(getName().size() <= 0)
+        if (getName().size() <= 0)
             return;
         eventDone(this);
     }
@@ -663,7 +675,7 @@ namespace MWGui
     /* SelectSpecializationDialog */
 
     SelectSpecializationDialog::SelectSpecializationDialog()
-      : WindowModal("openmw_chargen_select_specialization.layout")
+        : WindowModal("openmw_chargen_select_specialization.layout")
     {
         // Centre dialog
         center();
@@ -671,16 +683,22 @@ namespace MWGui
         getWidget(mSpecialization0, "Specialization0");
         getWidget(mSpecialization1, "Specialization1");
         getWidget(mSpecialization2, "Specialization2");
-        std::string combat{MWBase::Environment::get().getWindowManager()->getGameSettingString(ESM::Class::sGmstSpecializationIds[ESM::Class::Combat], {})};
-        std::string magic{MWBase::Environment::get().getWindowManager()->getGameSettingString(ESM::Class::sGmstSpecializationIds[ESM::Class::Magic], {})};
-        std::string stealth{MWBase::Environment::get().getWindowManager()->getGameSettingString(ESM::Class::sGmstSpecializationIds[ESM::Class::Stealth], {})};
+        std::string combat{ MWBase::Environment::get().getWindowManager()->getGameSettingString(
+            ESM::Class::sGmstSpecializationIds[ESM::Class::Combat], {}) };
+        std::string magic{ MWBase::Environment::get().getWindowManager()->getGameSettingString(
+            ESM::Class::sGmstSpecializationIds[ESM::Class::Magic], {}) };
+        std::string stealth{ MWBase::Environment::get().getWindowManager()->getGameSettingString(
+            ESM::Class::sGmstSpecializationIds[ESM::Class::Stealth], {}) };
 
         mSpecialization0->setCaption(combat);
-        mSpecialization0->eventMouseButtonClick += MyGUI::newDelegate(this, &SelectSpecializationDialog::onSpecializationClicked);
+        mSpecialization0->eventMouseButtonClick
+            += MyGUI::newDelegate(this, &SelectSpecializationDialog::onSpecializationClicked);
         mSpecialization1->setCaption(magic);
-        mSpecialization1->eventMouseButtonClick += MyGUI::newDelegate(this, &SelectSpecializationDialog::onSpecializationClicked);
+        mSpecialization1->eventMouseButtonClick
+            += MyGUI::newDelegate(this, &SelectSpecializationDialog::onSpecializationClicked);
         mSpecialization2->setCaption(stealth);
-        mSpecialization2->eventMouseButtonClick += MyGUI::newDelegate(this, &SelectSpecializationDialog::onSpecializationClicked);
+        mSpecialization2->eventMouseButtonClick
+            += MyGUI::newDelegate(this, &SelectSpecializationDialog::onSpecializationClicked);
         mSpecializationId = ESM::Class::Combat;
 
         ToolTips::createSpecializationToolTip(mSpecialization0, combat, ESM::Class::Combat);
@@ -692,9 +710,7 @@ namespace MWGui
         cancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SelectSpecializationDialog::onCancelClicked);
     }
 
-    SelectSpecializationDialog::~SelectSpecializationDialog()
-    {
-    }
+    SelectSpecializationDialog::~SelectSpecializationDialog() {}
 
     // widget controls
 
@@ -726,8 +742,8 @@ namespace MWGui
     /* SelectAttributeDialog */
 
     SelectAttributeDialog::SelectAttributeDialog()
-      : WindowModal("openmw_chargen_select_attribute.layout")
-      , mAttributeId(ESM::Attribute::Strength)
+        : WindowModal("openmw_chargen_select_attribute.layout")
+        , mAttributeId(ESM::Attribute::Strength)
     {
         // Centre dialog
         center();
@@ -735,9 +751,9 @@ namespace MWGui
         for (int i = 0; i < 8; ++i)
         {
             Widgets::MWAttributePtr attribute;
-            char theIndex = '0'+i;
+            char theIndex = '0' + i;
 
-            getWidget(attribute,  std::string("Attribute").append(1, theIndex));
+            getWidget(attribute, std::string("Attribute").append(1, theIndex));
             attribute->setAttributeId(ESM::Attribute::sAttributeIds[i]);
             attribute->eventClicked += MyGUI::newDelegate(this, &SelectAttributeDialog::onAttributeClicked);
             ToolTips::createAttributeToolTip(attribute, attribute->getAttributeId());
@@ -748,9 +764,7 @@ namespace MWGui
         cancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SelectAttributeDialog::onCancelClicked);
     }
 
-    SelectAttributeDialog::~SelectAttributeDialog()
-    {
-    }
+    SelectAttributeDialog::~SelectAttributeDialog() {}
 
     // widget controls
 
@@ -772,59 +786,43 @@ namespace MWGui
         return true;
     }
 
-
     /* SelectSkillDialog */
 
     SelectSkillDialog::SelectSkillDialog()
-      : WindowModal("openmw_chargen_select_skill.layout")
-      , mSkillId(ESM::Skill::Block)
+        : WindowModal("openmw_chargen_select_skill.layout")
+        , mSkillId(ESM::Skill::Block)
     {
         // Centre dialog
         center();
 
-        for(int i = 0; i < 9; i++)
+        for (int i = 0; i < 9; i++)
         {
-            char theIndex = '0'+i;
-            getWidget(mCombatSkill[i],  std::string("CombatSkill").append(1, theIndex));
-            getWidget(mMagicSkill[i],   std::string("MagicSkill").append(1, theIndex));
+            char theIndex = '0' + i;
+            getWidget(mCombatSkill[i], std::string("CombatSkill").append(1, theIndex));
+            getWidget(mMagicSkill[i], std::string("MagicSkill").append(1, theIndex));
             getWidget(mStealthSkill[i], std::string("StealthSkill").append(1, theIndex));
         }
 
-        struct {Widgets::MWSkillPtr widget; ESM::Skill::SkillEnum skillId;} mSkills[3][9] = {
-            {
-                {mCombatSkill[0], ESM::Skill::Block},
-                {mCombatSkill[1], ESM::Skill::Armorer},
-                {mCombatSkill[2], ESM::Skill::MediumArmor},
-                {mCombatSkill[3], ESM::Skill::HeavyArmor},
-                {mCombatSkill[4], ESM::Skill::BluntWeapon},
-                {mCombatSkill[5], ESM::Skill::LongBlade},
-                {mCombatSkill[6], ESM::Skill::Axe},
-                {mCombatSkill[7], ESM::Skill::Spear},
-                {mCombatSkill[8], ESM::Skill::Athletics}
-            },
-            {
-                {mMagicSkill[0], ESM::Skill::Enchant},
-                {mMagicSkill[1], ESM::Skill::Destruction},
-                {mMagicSkill[2], ESM::Skill::Alteration},
-                {mMagicSkill[3], ESM::Skill::Illusion},
-                {mMagicSkill[4], ESM::Skill::Conjuration},
-                {mMagicSkill[5], ESM::Skill::Mysticism},
-                {mMagicSkill[6], ESM::Skill::Restoration},
-                {mMagicSkill[7], ESM::Skill::Alchemy},
-                {mMagicSkill[8], ESM::Skill::Unarmored}
-            },
-            {
-                {mStealthSkill[0], ESM::Skill::Security},
-                {mStealthSkill[1], ESM::Skill::Sneak},
-                {mStealthSkill[2], ESM::Skill::Acrobatics},
-                {mStealthSkill[3], ESM::Skill::LightArmor},
-                {mStealthSkill[4], ESM::Skill::ShortBlade},
-                {mStealthSkill[5] ,ESM::Skill::Marksman},
-                {mStealthSkill[6] ,ESM::Skill::Mercantile},
-                {mStealthSkill[7] ,ESM::Skill::Speechcraft},
-                {mStealthSkill[8] ,ESM::Skill::HandToHand}
-            }
-        };
+        struct
+        {
+            Widgets::MWSkillPtr widget;
+            ESM::Skill::SkillEnum skillId;
+        } mSkills[3][9]
+            = { { { mCombatSkill[0], ESM::Skill::Block }, { mCombatSkill[1], ESM::Skill::Armorer },
+                    { mCombatSkill[2], ESM::Skill::MediumArmor }, { mCombatSkill[3], ESM::Skill::HeavyArmor },
+                    { mCombatSkill[4], ESM::Skill::BluntWeapon }, { mCombatSkill[5], ESM::Skill::LongBlade },
+                    { mCombatSkill[6], ESM::Skill::Axe }, { mCombatSkill[7], ESM::Skill::Spear },
+                    { mCombatSkill[8], ESM::Skill::Athletics } },
+                  { { mMagicSkill[0], ESM::Skill::Enchant }, { mMagicSkill[1], ESM::Skill::Destruction },
+                      { mMagicSkill[2], ESM::Skill::Alteration }, { mMagicSkill[3], ESM::Skill::Illusion },
+                      { mMagicSkill[4], ESM::Skill::Conjuration }, { mMagicSkill[5], ESM::Skill::Mysticism },
+                      { mMagicSkill[6], ESM::Skill::Restoration }, { mMagicSkill[7], ESM::Skill::Alchemy },
+                      { mMagicSkill[8], ESM::Skill::Unarmored } },
+                  { { mStealthSkill[0], ESM::Skill::Security }, { mStealthSkill[1], ESM::Skill::Sneak },
+                      { mStealthSkill[2], ESM::Skill::Acrobatics }, { mStealthSkill[3], ESM::Skill::LightArmor },
+                      { mStealthSkill[4], ESM::Skill::ShortBlade }, { mStealthSkill[5], ESM::Skill::Marksman },
+                      { mStealthSkill[6], ESM::Skill::Mercantile }, { mStealthSkill[7], ESM::Skill::Speechcraft },
+                      { mStealthSkill[8], ESM::Skill::HandToHand } } };
 
         for (int spec = 0; spec < 3; ++spec)
         {
@@ -841,9 +839,7 @@ namespace MWGui
         cancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SelectSkillDialog::onCancelClicked);
     }
 
-    SelectSkillDialog::~SelectSkillDialog()
-    {
-    }
+    SelectSkillDialog::~SelectSkillDialog() {}
 
     // widget controls
 
@@ -867,7 +863,7 @@ namespace MWGui
     /* DescriptionDialog */
 
     DescriptionDialog::DescriptionDialog()
-      : WindowModal("openmw_chargen_class_description.layout")
+        : WindowModal("openmw_chargen_class_description.layout")
     {
         // Centre dialog
         center();
@@ -877,15 +873,14 @@ namespace MWGui
         MyGUI::Button* okButton;
         getWidget(okButton, "OKButton");
         okButton->eventMouseButtonClick += MyGUI::newDelegate(this, &DescriptionDialog::onOkClicked);
-        okButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sInputMenu1", {})));
+        okButton->setCaption(
+            toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sInputMenu1", {})));
 
         // Make sure the edit box has focus
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mTextEdit);
     }
 
-    DescriptionDialog::~DescriptionDialog()
-    {
-    }
+    DescriptionDialog::~DescriptionDialog() {}
 
     // widget controls
 
@@ -894,10 +889,11 @@ namespace MWGui
         eventDone(this);
     }
 
-    void setClassImage(MyGUI::ImageBox* imageBox, const std::string &classId)
+    void setClassImage(MyGUI::ImageBox* imageBox, const std::string& classId)
     {
         const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-        std::string classImage = Misc::ResourceHelpers::correctTexturePath("textures\\levelup\\" + classId + ".dds", vfs);
+        std::string classImage
+            = Misc::ResourceHelpers::correctTexturePath("textures\\levelup\\" + classId + ".dds", vfs);
         if (!vfs->exists(classImage))
         {
             Log(Debug::Warning) << "No class image for " << classId << ", falling back to default";
diff --git a/apps/openmw/mwgui/class.hpp b/apps/openmw/mwgui/class.hpp
index 6f45459ad7..b88d51b15f 100644
--- a/apps/openmw/mwgui/class.hpp
+++ b/apps/openmw/mwgui/class.hpp
@@ -22,9 +22,9 @@ namespace MWGui
 
         typedef std::vector<std::string> ButtonList;
 
-        void setText(const std::string &str);
+        void setText(const std::string& str);
         std::string getText() const;
-        void setButtons(ButtonList &buttons);
+        void setButtons(ButtonList& buttons);
 
         void onOpen() override;
 
@@ -42,7 +42,6 @@ namespace MWGui
         void onButtonClicked(MyGUI::Widget* _sender);
 
     private:
-
         void fitToText(MyGUI::TextBox* widget);
         void layoutVertically(MyGUI::Widget* widget, int margin);
         MyGUI::Widget* mTextBox;
@@ -71,7 +70,7 @@ namespace MWGui
     public:
         GenerateClassResultDialog();
 
-        void setClassId(const std::string &classId);
+        void setClassId(const std::string& classId);
 
         bool exit() override { return false; }
 
@@ -94,7 +93,7 @@ namespace MWGui
 
     private:
         MyGUI::ImageBox* mClassImage;
-        MyGUI::TextBox*  mClassName;
+        MyGUI::TextBox* mClassName;
 
         std::string mCurrentClassId;
     };
@@ -104,8 +103,8 @@ namespace MWGui
     public:
         PickClassDialog();
 
-        const std::string &getClassId() const { return mCurrentClassId; }
-        void setClassId(const std::string &classId);
+        const std::string& getClassId() const { return mCurrentClassId; }
+        void setClassId(const std::string& classId);
 
         void setNextButtonShow(bool shown);
         void onOpen() override;
@@ -137,11 +136,11 @@ namespace MWGui
         void updateStats();
 
         MyGUI::ImageBox* mClassImage;
-        MyGUI::ListBox*  mClassList;
-        MyGUI::TextBox*  mSpecializationName;
+        MyGUI::ListBox* mClassList;
+        MyGUI::TextBox* mSpecializationName;
         Widgets::MWAttributePtr mFavoriteAttribute[2];
-        Widgets::MWSkillPtr   mMajorSkill[5];
-        Widgets::MWSkillPtr   mMinorSkill[5];
+        Widgets::MWSkillPtr mMajorSkill[5];
+        Widgets::MWSkillPtr mMinorSkill[5];
 
         std::string mCurrentClassId;
     };
@@ -252,7 +251,7 @@ namespace MWGui
         ~DescriptionDialog();
 
         std::string getTextInput() const { return mTextEdit->getCaption(); }
-        void setTextInput(const std::string &text) { mTextEdit->setCaption(text); }
+        void setTextInput(const std::string& text) { mTextEdit->setCaption(text); }
 
         /** Event : Dialog finished, OK button clicked.\n
             signature : void method()\n
@@ -315,23 +314,23 @@ namespace MWGui
         void update();
 
     private:
-        MyGUI::EditBox*                   mEditName;
-        MyGUI::TextBox*                  mSpecializationName;
-        Widgets::MWAttributePtr          mFavoriteAttribute0, mFavoriteAttribute1;
-        Widgets::MWSkillPtr              mMajorSkill[5];
-        Widgets::MWSkillPtr              mMinorSkill[5];
+        MyGUI::EditBox* mEditName;
+        MyGUI::TextBox* mSpecializationName;
+        Widgets::MWAttributePtr mFavoriteAttribute0, mFavoriteAttribute1;
+        Widgets::MWSkillPtr mMajorSkill[5];
+        Widgets::MWSkillPtr mMinorSkill[5];
         std::vector<Widgets::MWSkillPtr> mSkills;
-        std::string                      mDescription;
+        std::string mDescription;
 
         std::unique_ptr<SelectSpecializationDialog> mSpecDialog;
         std::unique_ptr<SelectAttributeDialog> mAttribDialog;
         std::unique_ptr<SelectSkillDialog> mSkillDialog;
         std::unique_ptr<DescriptionDialog> mDescDialog;
 
-        ESM::Class::Specialization       mSpecializationId;
+        ESM::Class::Specialization mSpecializationId;
 
-        Widgets::MWAttributePtr              mAffectedAttribute;
-        Widgets::MWSkillPtr              mAffectedSkill;
+        Widgets::MWAttributePtr mAffectedAttribute;
+        Widgets::MWSkillPtr mAffectedSkill;
     };
 }
 #endif
diff --git a/apps/openmw/mwgui/companionitemmodel.cpp b/apps/openmw/mwgui/companionitemmodel.cpp
index 4e065da8b5..1f3f7558ed 100644
--- a/apps/openmw/mwgui/companionitemmodel.cpp
+++ b/apps/openmw/mwgui/companionitemmodel.cpp
@@ -20,12 +20,12 @@ namespace
 
 namespace MWGui
 {
-    CompanionItemModel::CompanionItemModel(const MWWorld::Ptr &actor)
+    CompanionItemModel::CompanionItemModel(const MWWorld::Ptr& actor)
         : InventoryItemModel(actor)
     {
     }
 
-    MWWorld::Ptr CompanionItemModel::copyItem (const ItemStack& item, size_t count, bool allowAutoEquip)
+    MWWorld::Ptr CompanionItemModel::copyItem(const ItemStack& item, size_t count, bool allowAutoEquip)
     {
         if (hasProfit(mActor))
             modifyProfit(mActor, item.mBase.getClass().getValue(item.mBase) * count);
@@ -33,7 +33,7 @@ namespace MWGui
         return InventoryItemModel::copyItem(item, count, allowAutoEquip);
     }
 
-    void CompanionItemModel::removeItem (const ItemStack& item, size_t count)
+    void CompanionItemModel::removeItem(const ItemStack& item, size_t count)
     {
         if (hasProfit(mActor))
             modifyProfit(mActor, -item.mBase.getClass().getValue(item.mBase) * count);
@@ -41,7 +41,7 @@ namespace MWGui
         InventoryItemModel::removeItem(item, count);
     }
 
-    bool CompanionItemModel::hasProfit(const MWWorld::Ptr &actor)
+    bool CompanionItemModel::hasProfit(const MWWorld::Ptr& actor)
     {
         std::string_view script = actor.getClass().getScript(actor);
         if (script.empty())
diff --git a/apps/openmw/mwgui/companionitemmodel.hpp b/apps/openmw/mwgui/companionitemmodel.hpp
index 1872dd1569..0a9491c348 100644
--- a/apps/openmw/mwgui/companionitemmodel.hpp
+++ b/apps/openmw/mwgui/companionitemmodel.hpp
@@ -11,10 +11,10 @@ namespace MWGui
     class CompanionItemModel : public InventoryItemModel
     {
     public:
-        CompanionItemModel (const MWWorld::Ptr& actor);
+        CompanionItemModel(const MWWorld::Ptr& actor);
 
-        MWWorld::Ptr copyItem (const ItemStack& item, size_t count, bool allowAutoEquip = true) override;
-        void removeItem (const ItemStack& item, size_t count) override;
+        MWWorld::Ptr copyItem(const ItemStack& item, size_t count, bool allowAutoEquip = true) override;
+        void removeItem(const ItemStack& item, size_t count) override;
 
         bool hasProfit(const MWWorld::Ptr& actor);
     };
diff --git a/apps/openmw/mwgui/companionwindow.cpp b/apps/openmw/mwgui/companionwindow.cpp
index 99ed2d995c..d8b71b2ee9 100644
--- a/apps/openmw/mwgui/companionwindow.cpp
+++ b/apps/openmw/mwgui/companionwindow.cpp
@@ -3,22 +3,22 @@
 #include <cmath>
 
 #include <MyGUI_Button.h>
-#include <MyGUI_InputManager.h>
 #include <MyGUI_EditBox.h>
+#include <MyGUI_InputManager.h>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/class.hpp"
 
-#include "messagebox.hpp"
-#include "itemview.hpp"
-#include "sortfilteritemmodel.hpp"
 #include "companionitemmodel.hpp"
-#include "draganddrop.hpp"
 #include "countdialog.hpp"
-#include "widgets.hpp"
+#include "draganddrop.hpp"
+#include "itemview.hpp"
+#include "messagebox.hpp"
+#include "sortfilteritemmodel.hpp"
 #include "tooltips.hpp"
+#include "widgets.hpp"
 
 namespace
 {
@@ -38,166 +38,166 @@ namespace
 namespace MWGui
 {
 
-CompanionWindow::CompanionWindow(DragAndDrop *dragAndDrop, MessageBoxManager* manager)
-    : WindowBase("openmw_companion_window.layout")
-    , mSortModel(nullptr)
-    , mModel(nullptr)
-    , mSelectedItem(-1)
-    , mDragAndDrop(dragAndDrop)
-    , mMessageBoxManager(manager)
-{
-    getWidget(mCloseButton, "CloseButton");
-    getWidget(mProfitLabel, "ProfitLabel");
-    getWidget(mEncumbranceBar, "EncumbranceBar");
-    getWidget(mFilterEdit, "FilterEdit");
-    getWidget(mItemView, "ItemView");
-    mItemView->eventBackgroundClicked += MyGUI::newDelegate(this, &CompanionWindow::onBackgroundSelected);
-    mItemView->eventItemClicked += MyGUI::newDelegate(this, &CompanionWindow::onItemSelected);
-    mFilterEdit->eventEditTextChange += MyGUI::newDelegate(this, &CompanionWindow::onNameFilterChanged);
-
-    mCloseButton->eventMouseButtonClick += MyGUI::newDelegate(this, &CompanionWindow::onCloseButtonClicked);
-
-    setCoord(200,0,600,300);
-}
-
-void CompanionWindow::onItemSelected(int index)
-{
-    if (mDragAndDrop->mIsOnDragAndDrop)
+    CompanionWindow::CompanionWindow(DragAndDrop* dragAndDrop, MessageBoxManager* manager)
+        : WindowBase("openmw_companion_window.layout")
+        , mSortModel(nullptr)
+        , mModel(nullptr)
+        , mSelectedItem(-1)
+        , mDragAndDrop(dragAndDrop)
+        , mMessageBoxManager(manager)
     {
-        mDragAndDrop->drop(mModel, mItemView);
-        updateEncumbranceBar();
-        return;
+        getWidget(mCloseButton, "CloseButton");
+        getWidget(mProfitLabel, "ProfitLabel");
+        getWidget(mEncumbranceBar, "EncumbranceBar");
+        getWidget(mFilterEdit, "FilterEdit");
+        getWidget(mItemView, "ItemView");
+        mItemView->eventBackgroundClicked += MyGUI::newDelegate(this, &CompanionWindow::onBackgroundSelected);
+        mItemView->eventItemClicked += MyGUI::newDelegate(this, &CompanionWindow::onItemSelected);
+        mFilterEdit->eventEditTextChange += MyGUI::newDelegate(this, &CompanionWindow::onNameFilterChanged);
+
+        mCloseButton->eventMouseButtonClick += MyGUI::newDelegate(this, &CompanionWindow::onCloseButtonClicked);
+
+        setCoord(200, 0, 600, 300);
     }
 
-    const ItemStack& item = mSortModel->getItem(index);
-
-    // We can't take conjured items from a companion NPC
-    if (item.mFlags & ItemStack::Flag_Bound)
+    void CompanionWindow::onItemSelected(int index)
     {
-        MWBase::Environment::get().getWindowManager()->messageBox("#{sBarterDialog12}");
-        return;
-    }
+        if (mDragAndDrop->mIsOnDragAndDrop)
+        {
+            mDragAndDrop->drop(mModel, mItemView);
+            updateEncumbranceBar();
+            return;
+        }
 
-    MWWorld::Ptr object = item.mBase;
-    int count = item.mCount;
-    bool shift = MyGUI::InputManager::getInstance().isShiftPressed();
-    if (MyGUI::InputManager::getInstance().isControlPressed())
-        count = 1;
+        const ItemStack& item = mSortModel->getItem(index);
 
-    mSelectedItem = mSortModel->mapToSource(index);
+        // We can't take conjured items from a companion NPC
+        if (item.mFlags & ItemStack::Flag_Bound)
+        {
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sBarterDialog12}");
+            return;
+        }
 
-    if (count > 1 && !shift)
-    {
-        CountDialog* dialog = MWBase::Environment::get().getWindowManager()->getCountDialog();
-        std::string name{object.getClass().getName(object)};
-        name += MWGui::ToolTips::getSoulString(object.getCellRef());
-        dialog->openCountDialog(name, "#{sTake}", count);
-        dialog->eventOkClicked.clear();
-        dialog->eventOkClicked += MyGUI::newDelegate(this, &CompanionWindow::dragItem);
+        MWWorld::Ptr object = item.mBase;
+        int count = item.mCount;
+        bool shift = MyGUI::InputManager::getInstance().isShiftPressed();
+        if (MyGUI::InputManager::getInstance().isControlPressed())
+            count = 1;
+
+        mSelectedItem = mSortModel->mapToSource(index);
+
+        if (count > 1 && !shift)
+        {
+            CountDialog* dialog = MWBase::Environment::get().getWindowManager()->getCountDialog();
+            std::string name{ object.getClass().getName(object) };
+            name += MWGui::ToolTips::getSoulString(object.getCellRef());
+            dialog->openCountDialog(name, "#{sTake}", count);
+            dialog->eventOkClicked.clear();
+            dialog->eventOkClicked += MyGUI::newDelegate(this, &CompanionWindow::dragItem);
+        }
+        else
+            dragItem(nullptr, count);
     }
-    else
-        dragItem (nullptr, count);
-}
 
-void CompanionWindow::onNameFilterChanged(MyGUI::EditBox* _sender)
+    void CompanionWindow::onNameFilterChanged(MyGUI::EditBox* _sender)
     {
         mSortModel->setNameFilter(_sender->getCaption());
         mItemView->update();
     }
 
-void CompanionWindow::dragItem(MyGUI::Widget* sender, int count)
-{
-    mDragAndDrop->startDrag(mSelectedItem, mSortModel, mModel, mItemView, count);
-}
+    void CompanionWindow::dragItem(MyGUI::Widget* sender, int count)
+    {
+        mDragAndDrop->startDrag(mSelectedItem, mSortModel, mModel, mItemView, count);
+    }
 
-void CompanionWindow::onBackgroundSelected()
-{
-    if (mDragAndDrop->mIsOnDragAndDrop)
+    void CompanionWindow::onBackgroundSelected()
+    {
+        if (mDragAndDrop->mIsOnDragAndDrop)
+        {
+            mDragAndDrop->drop(mModel, mItemView);
+            updateEncumbranceBar();
+        }
+    }
+
+    void CompanionWindow::setPtr(const MWWorld::Ptr& npc)
     {
-        mDragAndDrop->drop(mModel, mItemView);
+        mPtr = npc;
         updateEncumbranceBar();
+        auto model = std::make_unique<CompanionItemModel>(npc);
+        mModel = model.get();
+        auto sortModel = std::make_unique<SortFilterItemModel>(std::move(model));
+        mSortModel = sortModel.get();
+        mFilterEdit->setCaption({});
+        mItemView->setModel(std::move(sortModel));
+        mItemView->resetScrollBars();
+
+        setTitle(npc.getClass().getName(npc));
     }
-}
 
-void CompanionWindow::setPtr(const MWWorld::Ptr& npc)
-{
-    mPtr = npc;
-    updateEncumbranceBar();
-    auto model = std::make_unique<CompanionItemModel>(npc);
-    mModel = model.get();
-    auto sortModel = std::make_unique<SortFilterItemModel>(std::move(model));
-    mSortModel = sortModel.get();
-    mFilterEdit->setCaption({});
-    mItemView->setModel(std::move(sortModel));
-    mItemView->resetScrollBars();
-
-    setTitle(npc.getClass().getName(npc));
-}
+    void CompanionWindow::onFrame(float dt)
+    {
+        checkReferenceAvailable();
+        updateEncumbranceBar();
+    }
 
-void CompanionWindow::onFrame(float dt)
-{
-    checkReferenceAvailable();
-    updateEncumbranceBar();
-}
+    void CompanionWindow::updateEncumbranceBar()
+    {
+        if (mPtr.isEmpty())
+            return;
+        float capacity = mPtr.getClass().getCapacity(mPtr);
+        float encumbrance = mPtr.getClass().getEncumbrance(mPtr);
+        mEncumbranceBar->setValue(std::ceil(encumbrance), static_cast<int>(capacity));
 
-void CompanionWindow::updateEncumbranceBar()
-{
-    if (mPtr.isEmpty())
-        return;
-    float capacity = mPtr.getClass().getCapacity(mPtr);
-    float encumbrance = mPtr.getClass().getEncumbrance(mPtr);
-    mEncumbranceBar->setValue(std::ceil(encumbrance), static_cast<int>(capacity));
+        if (mModel && mModel->hasProfit(mPtr))
+        {
+            mProfitLabel->setCaptionWithReplacing("#{sProfitValue} " + MyGUI::utility::toString(getProfit(mPtr)));
+        }
+        else
+            mProfitLabel->setCaption("");
+    }
 
-    if (mModel && mModel->hasProfit(mPtr))
+    void CompanionWindow::onCloseButtonClicked(MyGUI::Widget* _sender)
     {
-        mProfitLabel->setCaptionWithReplacing("#{sProfitValue} " + MyGUI::utility::toString(getProfit(mPtr)));
+        if (exit())
+            MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Companion);
     }
-    else
-        mProfitLabel->setCaption("");
-}
 
-void CompanionWindow::onCloseButtonClicked(MyGUI::Widget* _sender)
-{
-    if (exit())
-        MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Companion);
-}
+    bool CompanionWindow::exit()
+    {
+        if (mModel && mModel->hasProfit(mPtr) && getProfit(mPtr) < 0)
+        {
+            std::vector<std::string> buttons;
+            buttons.emplace_back("#{sCompanionWarningButtonOne}");
+            buttons.emplace_back("#{sCompanionWarningButtonTwo}");
+            mMessageBoxManager->createInteractiveMessageBox("#{sCompanionWarningMessage}", buttons);
+            mMessageBoxManager->eventButtonPressed
+                += MyGUI::newDelegate(this, &CompanionWindow::onMessageBoxButtonClicked);
+            return false;
+        }
+        return true;
+    }
 
-bool CompanionWindow::exit()
-{
-    if (mModel && mModel->hasProfit(mPtr) && getProfit(mPtr) < 0)
+    void CompanionWindow::onMessageBoxButtonClicked(int button)
     {
-        std::vector<std::string> buttons;
-        buttons.emplace_back("#{sCompanionWarningButtonOne}");
-        buttons.emplace_back("#{sCompanionWarningButtonTwo}");
-        mMessageBoxManager->createInteractiveMessageBox("#{sCompanionWarningMessage}", buttons);
-        mMessageBoxManager->eventButtonPressed += MyGUI::newDelegate(this, &CompanionWindow::onMessageBoxButtonClicked);
-        return false;
+        if (button == 0)
+        {
+            MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Companion);
+            // Important for Calvus' contract script to work properly
+            MWBase::Environment::get().getWindowManager()->exitCurrentGuiMode();
+        }
     }
-    return true;
-}
 
-void CompanionWindow::onMessageBoxButtonClicked(int button)
-{
-    if (button == 0)
+    void CompanionWindow::onReferenceUnavailable()
     {
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Companion);
-        // Important for Calvus' contract script to work properly
-        MWBase::Environment::get().getWindowManager()->exitCurrentGuiMode();
     }
-}
-
-void CompanionWindow::onReferenceUnavailable()
-{
-    MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Companion);
-}
-
-void CompanionWindow::resetReference()
-{
-    ReferenceInterface::resetReference();
-    mItemView->setModel(nullptr);
-    mModel = nullptr;
-    mSortModel = nullptr;
-}
 
+    void CompanionWindow::resetReference()
+    {
+        ReferenceInterface::resetReference();
+        mItemView->setModel(nullptr);
+        mModel = nullptr;
+        mSortModel = nullptr;
+    }
 
 }
diff --git a/apps/openmw/mwgui/companionwindow.hpp b/apps/openmw/mwgui/companionwindow.hpp
index 7a7c92e3dc..40fac26eb5 100644
--- a/apps/openmw/mwgui/companionwindow.hpp
+++ b/apps/openmw/mwgui/companionwindow.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_MWGUI_COMPANIONWINDOW_H
 #define OPENMW_MWGUI_COMPANIONWINDOW_H
 
-#include "windowbase.hpp"
 #include "referenceinterface.hpp"
+#include "windowbase.hpp"
 
 namespace MWGui
 {
@@ -27,7 +27,7 @@ namespace MWGui
         void resetReference() override;
 
         void setPtr(const MWWorld::Ptr& npc) override;
-        void onFrame (float dt) override;
+        void onFrame(float dt) override;
         void clear() override { resetReference(); }
 
     private:
diff --git a/apps/openmw/mwgui/confirmationdialog.cpp b/apps/openmw/mwgui/confirmationdialog.cpp
index 9ebaf3919f..48b209f17e 100644
--- a/apps/openmw/mwgui/confirmationdialog.cpp
+++ b/apps/openmw/mwgui/confirmationdialog.cpp
@@ -8,8 +8,8 @@
 
 namespace MWGui
 {
-    ConfirmationDialog::ConfirmationDialog() :
-        WindowModal("openmw_confirmation_dialog.layout")
+    ConfirmationDialog::ConfirmationDialog()
+        : WindowModal("openmw_confirmation_dialog.layout")
     {
         getWidget(mMessage, "Message");
         getWidget(mOkButton, "OkButton");
diff --git a/apps/openmw/mwgui/confirmationdialog.hpp b/apps/openmw/mwgui/confirmationdialog.hpp
index 2acefd54c1..649e8ba1eb 100644
--- a/apps/openmw/mwgui/confirmationdialog.hpp
+++ b/apps/openmw/mwgui/confirmationdialog.hpp
@@ -7,26 +7,26 @@ namespace MWGui
 {
     class ConfirmationDialog : public WindowModal
     {
-        public:
-            ConfirmationDialog();
-            void askForConfirmation(const std::string& message);
-            bool exit() override;
-
-            typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
-
-            /** Event : Ok button was clicked.\n
-                signature : void method()\n
-            */
-            EventHandle_Void eventOkClicked;
-            EventHandle_Void eventCancelClicked;
-
-        private:
-            MyGUI::EditBox* mMessage;
-            MyGUI::Button* mOkButton;
-            MyGUI::Button* mCancelButton;
-
-            void onCancelButtonClicked(MyGUI::Widget* _sender);
-            void onOkButtonClicked(MyGUI::Widget* _sender);
+    public:
+        ConfirmationDialog();
+        void askForConfirmation(const std::string& message);
+        bool exit() override;
+
+        typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
+
+        /** Event : Ok button was clicked.\n
+            signature : void method()\n
+        */
+        EventHandle_Void eventOkClicked;
+        EventHandle_Void eventCancelClicked;
+
+    private:
+        MyGUI::EditBox* mMessage;
+        MyGUI::Button* mOkButton;
+        MyGUI::Button* mCancelButton;
+
+        void onCancelButtonClicked(MyGUI::Widget* _sender);
+        void onOkButtonClicked(MyGUI::Widget* _sender);
     };
 
 }
diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index 65ac17cea2..7a89227030 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -10,61 +10,59 @@
 #include <components/compiler/exception.hpp>
 #include <components/compiler/extensions0.hpp>
 #include <components/compiler/lineparser.hpp>
-#include <components/compiler/scanner.hpp>
 #include <components/compiler/locals.hpp>
+#include <components/compiler/scanner.hpp>
 #include <components/interpreter/interpreter.hpp>
 
 #include "../mwscript/extensions.hpp"
 #include "../mwscript/interpretercontext.hpp"
 
 #include "../mwbase/environment.hpp"
+#include "../mwbase/luamanager.hpp"
 #include "../mwbase/scriptmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwbase/luamanager.hpp"
 
-#include "../mwworld/esmstore.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/esmstore.hpp"
 
 namespace MWGui
 {
     class ConsoleInterpreterContext : public MWScript::InterpreterContext
     {
-            Console& mConsole;
-
-        public:
+        Console& mConsole;
 
-            ConsoleInterpreterContext (Console& console, MWWorld::Ptr reference);
+    public:
+        ConsoleInterpreterContext(Console& console, MWWorld::Ptr reference);
 
-            void report (const std::string& message) override;
+        void report(const std::string& message) override;
     };
 
-    ConsoleInterpreterContext::ConsoleInterpreterContext (Console& console,
-        MWWorld::Ptr reference)
-    : MWScript::InterpreterContext (
-        reference.isEmpty() ? nullptr : &reference.getRefData().getLocals(), reference),
-      mConsole (console)
-    {}
+    ConsoleInterpreterContext::ConsoleInterpreterContext(Console& console, MWWorld::Ptr reference)
+        : MWScript::InterpreterContext(reference.isEmpty() ? nullptr : &reference.getRefData().getLocals(), reference)
+        , mConsole(console)
+    {
+    }
 
-    void ConsoleInterpreterContext::report (const std::string& message)
+    void ConsoleInterpreterContext::report(const std::string& message)
     {
-        mConsole.printOK (message);
+        mConsole.printOK(message);
     }
 
-    bool Console::compile (const std::string& cmd, Compiler::Output& output)
+    bool Console::compile(const std::string& cmd, Compiler::Output& output)
     {
         try
         {
             ErrorHandler::reset();
 
-            std::istringstream input (cmd + '\n');
+            std::istringstream input(cmd + '\n');
 
-            Compiler::Scanner scanner (*this, input, mCompilerContext.getExtensions());
+            Compiler::Scanner scanner(*this, input, mCompilerContext.getExtensions());
 
-            Compiler::LineParser parser (*this, mCompilerContext, output.getLocals(),
-                output.getLiterals(), output.getCode(), true);
+            Compiler::LineParser parser(
+                *this, mCompilerContext, output.getLocals(), output.getLiterals(), output.getCode(), true);
 
-            scanner.scan (parser);
+            scanner.scan(parser);
 
             return isGood();
         }
@@ -74,24 +72,24 @@ namespace MWGui
         }
         catch (const std::exception& error)
         {
-            printError (std::string ("Error: ") + error.what());
+            printError(std::string("Error: ") + error.what());
         }
 
         return false;
     }
 
-    void Console::report (const std::string& message, const Compiler::TokenLoc& loc, Type type)
+    void Console::report(const std::string& message, const Compiler::TokenLoc& loc, Type type)
     {
         std::ostringstream error;
         error << "column " << loc.mColumn << " (" << loc.mLiteral << "):";
 
-        printError (error.str());
-        printError ((type==ErrorMessage ? "error: " : "warning: ") + message);
+        printError(error.str());
+        printError((type == ErrorMessage ? "error: " : "warning: ") + message);
     }
 
-    void Console::report (const std::string& message, Type type)
+    void Console::report(const std::string& message, Type type)
     {
-        printError ((type==ErrorMessage ? "error: " : "warning: ") + message);
+        printError((type == ErrorMessage ? "error: " : "warning: ") + message);
     }
 
     void Console::listNames()
@@ -99,19 +97,18 @@ namespace MWGui
         if (mNames.empty())
         {
             // keywords
-            std::istringstream input ("");
+            std::istringstream input("");
 
-            Compiler::Scanner scanner (*this, input, mCompilerContext.getExtensions());
+            Compiler::Scanner scanner(*this, input, mCompilerContext.getExtensions());
 
-            scanner.listKeywords (mNames);
+            scanner.listKeywords(mNames);
 
             // identifier
-            const MWWorld::ESMStore& store =
-                MWBase::Environment::get().getWorld()->getStore();
+            const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
 
             for (MWWorld::ESMStore::iterator it = store.begin(); it != store.end(); ++it)
             {
-                (*it)->listIdentifier (mNames);
+                (*it)->listIdentifier(mNames);
             }
 
             // exterior cell names aren't technically identifiers, but since the COC function accepts them,
@@ -124,35 +121,33 @@ namespace MWGui
             }
 
             // sort
-            std::sort (mNames.begin(), mNames.end());
+            std::sort(mNames.begin(), mNames.end());
 
             // remove duplicates
-            mNames.erase( std::unique( mNames.begin(), mNames.end() ), mNames.end() );
+            mNames.erase(std::unique(mNames.begin(), mNames.end()), mNames.end());
         }
     }
 
     Console::Console(int w, int h, bool consoleOnlyScripts)
-      : WindowBase("openmw_console.layout"),
-        mCompilerContext (MWScript::CompilerContext::Type_Console),
-        mConsoleOnlyScripts (consoleOnlyScripts)
+        : WindowBase("openmw_console.layout")
+        , mCompilerContext(MWScript::CompilerContext::Type_Console)
+        , mConsoleOnlyScripts(consoleOnlyScripts)
     {
-        setCoord(10,10, w-10, h/2);
+        setCoord(10, 10, w - 10, h / 2);
 
         getWidget(mCommandLine, "edit_Command");
         getWidget(mHistory, "list_History");
 
         // Set up the command line box
-        mCommandLine->eventEditSelectAccept +=
-            newDelegate(this, &Console::acceptCommand);
-        mCommandLine->eventKeyButtonPressed +=
-            newDelegate(this, &Console::keyPress);
+        mCommandLine->eventEditSelectAccept += newDelegate(this, &Console::acceptCommand);
+        mCommandLine->eventKeyButtonPressed += newDelegate(this, &Console::keyPress);
 
         // Set up the log window
         mHistory->setOverflowToTheLeft(true);
 
         // compiler
-        Compiler::registerExtensions (mExtensions, mConsoleOnlyScripts);
-        mCompilerContext.setExtensions (&mExtensions);
+        Compiler::registerExtensions(mExtensions, mConsoleOnlyScripts);
+        mCompilerContext.setExtensions(&mExtensions);
     }
 
     void Console::onOpen()
@@ -163,22 +158,22 @@ namespace MWGui
         MyGUI::LayerManager::getInstance().upLayerItem(mMainWidget);
     }
 
-    void Console::print(const std::string &msg, std::string_view color)
+    void Console::print(const std::string& msg, std::string_view color)
     {
         mHistory->addText(std::string(color) + MyGUI::TextIterator::toTagsString(msg));
     }
 
-    void Console::printOK(const std::string &msg)
+    void Console::printOK(const std::string& msg)
     {
         print(msg + "\n", MWBase::WindowManager::sConsoleColor_Success);
     }
 
-    void Console::printError(const std::string &msg)
+    void Console::printError(const std::string& msg)
     {
         print(msg + "\n", MWBase::WindowManager::sConsoleColor_Error);
     }
 
-    void Console::execute (const std::string& command)
+    void Console::execute(const std::string& command)
     {
         // Log the command
         if (mConsoleMode.empty())
@@ -199,38 +194,38 @@ namespace MWGui
             if (!script.empty())
                 locals = MWBase::Environment::get().getScriptManager()->getLocals(script);
         }
-        Compiler::Output output (locals);
+        Compiler::Output output(locals);
 
-        if (compile (command + "\n", output))
+        if (compile(command + "\n", output))
         {
             try
             {
-                ConsoleInterpreterContext interpreterContext (*this, mPtr);
+                ConsoleInterpreterContext interpreterContext(*this, mPtr);
                 Interpreter::Interpreter interpreter;
-                MWScript::installOpcodes (interpreter, mConsoleOnlyScripts);
+                MWScript::installOpcodes(interpreter, mConsoleOnlyScripts);
                 std::vector<Interpreter::Type_Code> code;
-                output.getCode (code);
-                interpreter.run (code.data(), code.size(), interpreterContext);
+                output.getCode(code);
+                interpreter.run(code.data(), code.size(), interpreterContext);
             }
             catch (const std::exception& error)
             {
-                printError (std::string ("Error: ") + error.what());
+                printError(std::string("Error: ") + error.what());
             }
         }
     }
 
-    void Console::executeFile (const std::string& path)
+    void Console::executeFile(const std::string& path)
     {
-        std::ifstream stream ((std::filesystem::path(path)));
+        std::ifstream stream((std::filesystem::path(path)));
 
         if (!stream.is_open())
-            printError ("failed to open file: " + path);
+            printError("failed to open file: " + path);
         else
         {
             std::string line;
 
-            while (std::getline (stream, line))
-                execute (line);
+            while (std::getline(stream, line))
+                execute(line);
         }
     }
 
@@ -244,24 +239,22 @@ namespace MWGui
         return c == ' ' || c == '\t';
     }
 
-    void Console::keyPress(MyGUI::Widget* _sender,
-                  MyGUI::KeyCode key,
-                  MyGUI::Char _char)
+    void Console::keyPress(MyGUI::Widget* _sender, MyGUI::KeyCode key, MyGUI::Char _char)
     {
-        if(MyGUI::InputManager::getInstance().isControlPressed())
+        if (MyGUI::InputManager::getInstance().isControlPressed())
         {
-            if(key == MyGUI::KeyCode::W)
+            if (key == MyGUI::KeyCode::W)
             {
                 const auto& caption = mCommandLine->getCaption();
-                if(caption.empty())
+                if (caption.empty())
                     return;
                 size_t max = mCommandLine->getTextCursor();
-                while(max > 0 && (isWhitespace(caption[max - 1]) || caption[max - 1] == '>'))
+                while (max > 0 && (isWhitespace(caption[max - 1]) || caption[max - 1] == '>'))
                     max--;
-                while(max > 0 && !isWhitespace(caption[max - 1]) && caption[max - 1] != '>')
+                while (max > 0 && !isWhitespace(caption[max - 1]) && caption[max - 1] != '>')
                     max--;
                 size_t length = mCommandLine->getTextCursor() - max;
-                if(length > 0)
+                if (length > 0)
                 {
                     auto text = caption;
                     text.erase(max, length);
@@ -269,9 +262,9 @@ namespace MWGui
                     mCommandLine->setTextCursor(max);
                 }
             }
-            else if(key == MyGUI::KeyCode::U)
+            else if (key == MyGUI::KeyCode::U)
             {
-                if(mCommandLine->getTextCursor() > 0)
+                if (mCommandLine->getTextCursor() > 0)
                 {
                     auto text = mCommandLine->getCaption();
                     text.erase(0, mCommandLine->getTextCursor());
@@ -280,12 +273,12 @@ namespace MWGui
                 }
             }
         }
-        else if(key == MyGUI::KeyCode::Tab && mConsoleMode.empty())
+        else if (key == MyGUI::KeyCode::Tab && mConsoleMode.empty())
         {
             std::vector<std::string> matches;
             listNames();
             std::string oldCaption = mCommandLine->getCaption();
-            std::string newCaption = complete( mCommandLine->getOnlyText(), matches );
+            std::string newCaption = complete(mCommandLine->getOnlyText(), matches);
             mCommandLine->setCaption(newCaption);
 
             // List candidates if repeatedly pressing tab
@@ -293,9 +286,9 @@ namespace MWGui
             {
                 int i = 0;
                 printOK("");
-                for(std::string& match : matches)
+                for (std::string& match : matches)
                 {
-                    if(i == 50)
+                    if (i == 50)
                         break;
 
                     printOK(match);
@@ -304,28 +297,29 @@ namespace MWGui
             }
         }
 
-        if(mCommandHistory.empty()) return;
+        if (mCommandHistory.empty())
+            return;
 
         // Traverse history with up and down arrows
-        if(key == MyGUI::KeyCode::ArrowUp)
+        if (key == MyGUI::KeyCode::ArrowUp)
         {
             // If the user was editing a string, store it for later
-            if(mCurrent == mCommandHistory.end())
+            if (mCurrent == mCommandHistory.end())
                 mEditString = mCommandLine->getOnlyText();
 
-            if(mCurrent != mCommandHistory.begin())
+            if (mCurrent != mCommandHistory.begin())
             {
                 --mCurrent;
                 mCommandLine->setCaption(*mCurrent);
             }
         }
-        else if(key == MyGUI::KeyCode::ArrowDown)
+        else if (key == MyGUI::KeyCode::ArrowDown)
         {
-            if(mCurrent != mCommandHistory.end())
+            if (mCurrent != mCommandHistory.end())
             {
                 ++mCurrent;
 
-                if(mCurrent != mCommandHistory.end())
+                if (mCurrent != mCommandHistory.end())
                     mCommandLine->setCaption(*mCurrent);
                 else
                     // Restore the edit string
@@ -336,8 +330,9 @@ namespace MWGui
 
     void Console::acceptCommand(MyGUI::EditBox* _sender)
     {
-        const std::string &cm = mCommandLine->getOnlyText();
-        if(cm.empty()) return;
+        const std::string& cm = mCommandLine->getOnlyText();
+        if (cm.empty())
+            return;
 
         // Add the command to the history, and set the current pointer to
         // the end of the list
@@ -348,14 +343,14 @@ namespace MWGui
         mHistory->setTextCursor(mHistory->getTextLength());
 
         // Reset the command line before the command execution.
-        // It prevents the re-triggering of the acceptCommand() event for the same command 
+        // It prevents the re-triggering of the acceptCommand() event for the same command
         // during the actual command execution
         mCommandLine->setCaption("");
 
-        execute (cm);
+        execute(cm);
     }
 
-    std::string Console::complete( std::string input, std::vector<std::string> &matches )
+    std::string Console::complete(std::string input, std::vector<std::string>& matches)
     {
         std::string output = input;
         std::string tmp = input;
@@ -367,73 +362,87 @@ namespace MWGui
         size_t explicitPos = tmp.find("->");
         if (explicitPos != std::string::npos)
         {
-            tmp.erase(0, explicitPos+2);
+            tmp.erase(0, explicitPos + 2);
         }
 
         /* Are there quotation marks? */
-        if( tmp.find('"') != std::string::npos ) {
-            int numquotes=0;
-            for(std::string::iterator it=tmp.begin(); it < tmp.end(); ++it) {
-                if( *it == '"' )
+        if (tmp.find('"') != std::string::npos)
+        {
+            int numquotes = 0;
+            for (std::string::iterator it = tmp.begin(); it < tmp.end(); ++it)
+            {
+                if (*it == '"')
                     numquotes++;
             }
 
             /* Is it terminated?*/
-            if( numquotes % 2 ) {
-                tmp.erase( 0, tmp.rfind('"')+1 );
+            if (numquotes % 2)
+            {
+                tmp.erase(0, tmp.rfind('"') + 1);
                 has_front_quote = true;
             }
-            else {
+            else
+            {
                 size_t pos;
-                if( ( ((pos = tmp.rfind(' ')) != std::string::npos ) ) && ( pos > tmp.rfind('"') ) ) {
-                    tmp.erase( 0, tmp.rfind(' ')+1);
+                if ((((pos = tmp.rfind(' ')) != std::string::npos)) && (pos > tmp.rfind('"')))
+                {
+                    tmp.erase(0, tmp.rfind(' ') + 1);
                 }
-                else {
+                else
+                {
                     tmp.clear();
                 }
                 has_front_quote = false;
             }
         }
         /* No quotation marks. Are there spaces?*/
-        else {
+        else
+        {
             size_t rpos;
-            if( (rpos=tmp.rfind(' ')) != std::string::npos ) {
-                if( rpos == 0 ) {
+            if ((rpos = tmp.rfind(' ')) != std::string::npos)
+            {
+                if (rpos == 0)
+                {
                     tmp.clear();
                 }
-                else {
-                    tmp.erase(0, rpos+1);
+                else
+                {
+                    tmp.erase(0, rpos + 1);
                 }
             }
         }
 
         /* Erase the input from the output string so we can easily append the completed form later. */
-        output.erase(output.end()-tmp.length(), output.end());
+        output.erase(output.end() - tmp.length(), output.end());
 
-        /* Is there still something in the input string? If not just display all commands and return the unchanged input. */
-        if( tmp.length() == 0 ) {
-                matches=mNames;
+        /* Is there still something in the input string? If not just display all commands and return the unchanged
+         * input. */
+        if (tmp.length() == 0)
+        {
+            matches = mNames;
             return input;
         }
 
         /* Iterate through the vector. */
-        for(std::string& name : mNames)
+        for (std::string& name : mNames)
         {
-            bool string_different=false;
+            bool string_different = false;
 
             /* Is the string shorter than the input string? If yes skip it. */
-            if(name.length() < tmp.length())
+            if (name.length() < tmp.length())
                 continue;
 
             /* Is the beginning of the string different from the input string? If yes skip it. */
-            for( std::string::iterator iter=tmp.begin(), iter2=name.begin(); iter < tmp.end();++iter, ++iter2) {
-                if( Misc::StringUtils::toLower(*iter) != Misc::StringUtils::toLower(*iter2) ) {
-                    string_different=true;
+            for (std::string::iterator iter = tmp.begin(), iter2 = name.begin(); iter < tmp.end(); ++iter, ++iter2)
+            {
+                if (Misc::StringUtils::toLower(*iter) != Misc::StringUtils::toLower(*iter2))
+                {
+                    string_different = true;
                     break;
                 }
             }
 
-            if( string_different )
+            if (string_different)
                 continue;
 
             /* The beginning of the string matches the input string, save it for the next test. */
@@ -441,23 +450,27 @@ namespace MWGui
         }
 
         /* There are no matches. Return the unchanged input. */
-        if( matches.empty() )
+        if (matches.empty())
         {
             return input;
         }
 
         /* Only one match. We're done. */
-        if( matches.size() == 1 ) {
+        if (matches.size() == 1)
+        {
             /* Adding quotation marks when the input string started with a quotation mark or has spaces in it*/
-            if( ( matches.front().find(' ') != std::string::npos )  ) {
-                if( !has_front_quote )
+            if ((matches.front().find(' ') != std::string::npos))
+            {
+                if (!has_front_quote)
                     output.append(std::string("\""));
                 return output.append(matches.front() + std::string("\" "));
             }
-            else if( has_front_quote ) {
-                return  output.append(matches.front() + std::string("\" "));
+            else if (has_front_quote)
+            {
+                return output.append(matches.front() + std::string("\" "));
             }
-            else {
+            else
+            {
                 return output.append(matches.front() + std::string(" "));
             }
         }
@@ -465,11 +478,12 @@ namespace MWGui
         /* Check if all matching strings match further than input. If yes complete to this match. */
         int i = tmp.length();
 
-        for(std::string::iterator iter=matches.front().begin()+tmp.length(); iter < matches.front().end(); ++iter, ++i)
+        for (std::string::iterator iter = matches.front().begin() + tmp.length(); iter < matches.front().end();
+             ++iter, ++i)
         {
-            for(std::string& match : matches)
+            for (std::string& match : matches)
             {
-                if(Misc::StringUtils::toLower(match[i]) != Misc::StringUtils::toLower(*iter))
+                if (Misc::StringUtils::toLower(match[i]) != Misc::StringUtils::toLower(*iter))
                 {
                     /* Append the longest match to the end of the output string*/
                     output.append(matches.front().substr(0, i));
@@ -484,7 +498,7 @@ namespace MWGui
 
     void Console::onResChange(int width, int height)
     {
-        setCoord(10, 10, width-10, height/2);
+        setCoord(10, 10, width - 10, height / 2);
     }
 
     void Console::updateSelectedObjectPtr(const MWWorld::Ptr& currentPtr, const MWWorld::Ptr& newPtr)
diff --git a/apps/openmw/mwgui/console.hpp b/apps/openmw/mwgui/console.hpp
index d90308d4e7..97c4c3e749 100644
--- a/apps/openmw/mwgui/console.hpp
+++ b/apps/openmw/mwgui/console.hpp
@@ -6,8 +6,8 @@
 #include <vector>
 
 #include <components/compiler/errorhandler.hpp>
-#include <components/compiler/output.hpp>
 #include <components/compiler/extensions.hpp>
+#include <components/compiler/output.hpp>
 
 #include "../mwbase/windowmanager.hpp"
 
@@ -20,86 +20,82 @@ namespace MWGui
 {
     class Console : public WindowBase, private Compiler::ErrorHandler, public ReferenceInterface
     {
-        public:
-            /// Set the implicit object for script execution
-            void setSelectedObject(const MWWorld::Ptr& object);
-
-            MyGUI::EditBox* mCommandLine;
-            MyGUI::EditBox* mHistory;
-
-            typedef std::list<std::string> StringList;
+    public:
+        /// Set the implicit object for script execution
+        void setSelectedObject(const MWWorld::Ptr& object);
 
-            // History of previous entered commands
-            StringList mCommandHistory;
-            StringList::iterator mCurrent;
-            std::string mEditString;
+        MyGUI::EditBox* mCommandLine;
+        MyGUI::EditBox* mHistory;
 
-            Console(int w, int h, bool consoleOnlyScripts);
+        typedef std::list<std::string> StringList;
 
-            void onOpen() override;
+        // History of previous entered commands
+        StringList mCommandHistory;
+        StringList::iterator mCurrent;
+        std::string mEditString;
 
-            void onResChange(int width, int height) override;
+        Console(int w, int h, bool consoleOnlyScripts);
 
-            // Print a message to the console, in specified color.
-            void print(const std::string &msg, std::string_view color = MWBase::WindowManager::sConsoleColor_Default);
+        void onOpen() override;
 
-            // These are pre-colored versions that you should use.
+        void onResChange(int width, int height) override;
 
-            /// Output from successful console command
-            void printOK(const std::string &msg);
+        // Print a message to the console, in specified color.
+        void print(const std::string& msg, std::string_view color = MWBase::WindowManager::sConsoleColor_Default);
 
-            /// Error message
-            void printError(const std::string &msg);
+        // These are pre-colored versions that you should use.
 
-            void execute (const std::string& command);
+        /// Output from successful console command
+        void printOK(const std::string& msg);
 
-            void executeFile (const std::string& path);
+        /// Error message
+        void printError(const std::string& msg);
 
-            void updateSelectedObjectPtr(const MWWorld::Ptr& currentPtr, const MWWorld::Ptr& newPtr);
+        void execute(const std::string& command);
 
-            void clear() override;
+        void executeFile(const std::string& path);
 
-            void resetReference () override;
+        void updateSelectedObjectPtr(const MWWorld::Ptr& currentPtr, const MWWorld::Ptr& newPtr);
 
-            const std::string& getConsoleMode() const { return mConsoleMode; }
-            void setConsoleMode(std::string_view mode);
+        void clear() override;
 
-        protected:
+        void resetReference() override;
 
-            void onReferenceUnavailable() override;
+        const std::string& getConsoleMode() const { return mConsoleMode; }
+        void setConsoleMode(std::string_view mode);
 
-        private:
+    protected:
+        void onReferenceUnavailable() override;
 
-            std::string mConsoleMode;
+    private:
+        std::string mConsoleMode;
 
-            void updateConsoleTitle();
+        void updateConsoleTitle();
 
-            void keyPress(MyGUI::Widget* _sender,
-                          MyGUI::KeyCode key,
-                          MyGUI::Char _char);
+        void keyPress(MyGUI::Widget* _sender, MyGUI::KeyCode key, MyGUI::Char _char);
 
-            void acceptCommand(MyGUI::EditBox* _sender);
+        void acceptCommand(MyGUI::EditBox* _sender);
 
-            std::string complete( std::string input, std::vector<std::string> &matches );
+        std::string complete(std::string input, std::vector<std::string>& matches);
 
-            Compiler::Extensions mExtensions;
-            MWScript::CompilerContext mCompilerContext;
-            std::vector<std::string> mNames;
-            bool mConsoleOnlyScripts;
+        Compiler::Extensions mExtensions;
+        MWScript::CompilerContext mCompilerContext;
+        std::vector<std::string> mNames;
+        bool mConsoleOnlyScripts;
 
-            bool compile (const std::string& cmd, Compiler::Output& output);
+        bool compile(const std::string& cmd, Compiler::Output& output);
 
-            /// Report error to the user.
-            void report (const std::string& message, const Compiler::TokenLoc& loc, Type type) override;
+        /// Report error to the user.
+        void report(const std::string& message, const Compiler::TokenLoc& loc, Type type) override;
 
-            /// Report a file related error
-            void report (const std::string& message, Type type) override;
+        /// Report a file related error
+        void report(const std::string& message, Type type) override;
 
-            /// Write all valid identifiers and keywords into mNames and sort them.
-            /// \note If mNames is not empty, this function is a no-op.
-            /// \note The list may contain duplicates (if a name is a keyword and an identifier at the same
-            /// time).
-            void listNames();
-  };
+        /// Write all valid identifiers and keywords into mNames and sort them.
+        /// \note If mNames is not empty, this function is a no-op.
+        /// \note The list may contain duplicates (if a name is a keyword and an identifier at the same
+        /// time).
+        void listNames();
+    };
 }
 #endif
diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index ad23af4711..ecfadf3675 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -1,13 +1,13 @@
 #include "container.hpp"
 
-#include <MyGUI_InputManager.h>
 #include <MyGUI_Button.h>
+#include <MyGUI_InputManager.h>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/scriptmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
@@ -21,12 +21,12 @@
 #include "countdialog.hpp"
 #include "inventorywindow.hpp"
 
-#include "itemview.hpp"
-#include "inventoryitemmodel.hpp"
 #include "containeritemmodel.hpp"
-#include "sortfilteritemmodel.hpp"
-#include "pickpocketitemmodel.hpp"
 #include "draganddrop.hpp"
+#include "inventoryitemmodel.hpp"
+#include "itemview.hpp"
+#include "pickpocketitemmodel.hpp"
+#include "sortfilteritemmodel.hpp"
 #include "tooltips.hpp"
 
 namespace MWGui
@@ -48,11 +48,12 @@ namespace MWGui
         mItemView->eventBackgroundClicked += MyGUI::newDelegate(this, &ContainerWindow::onBackgroundSelected);
         mItemView->eventItemClicked += MyGUI::newDelegate(this, &ContainerWindow::onItemSelected);
 
-        mDisposeCorpseButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ContainerWindow::onDisposeCorpseButtonClicked);
+        mDisposeCorpseButton->eventMouseButtonClick
+            += MyGUI::newDelegate(this, &ContainerWindow::onDisposeCorpseButtonClicked);
         mCloseButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ContainerWindow::onCloseButtonClicked);
         mTakeButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ContainerWindow::onTakeAllButtonClicked);
 
-        setCoord(200,0,600,300);
+        setCoord(200, 0, 600, 300);
     }
 
     void ContainerWindow::onItemSelected(int index)
@@ -83,14 +84,14 @@ namespace MWGui
         if (count > 1 && !shift)
         {
             CountDialog* dialog = MWBase::Environment::get().getWindowManager()->getCountDialog();
-            std::string name{object.getClass().getName(object)};
+            std::string name{ object.getClass().getName(object) };
             name += MWGui::ToolTips::getSoulString(object.getCellRef());
             dialog->openCountDialog(name, "#{sTake}", count);
             dialog->eventOkClicked.clear();
             dialog->eventOkClicked += MyGUI::newDelegate(this, &ContainerWindow::dragItem);
         }
         else
-            dragItem (nullptr, count);
+            dragItem(nullptr, count);
     }
 
     void ContainerWindow::dragItem(MyGUI::Widget* sender, int count)
@@ -136,7 +137,7 @@ namespace MWGui
             {
                 // we are stealing stuff
                 model = std::make_unique<PickpocketItemModel>(mPtr, std::make_unique<InventoryItemModel>(container),
-                                                 !mPtr.getClass().getCreatureStats(mPtr).getKnockedDown());
+                    !mPtr.getClass().getCreatureStats(mPtr).getKnockedDown());
             }
             else
                 model = std::make_unique<InventoryItemModel>(container);
@@ -190,7 +191,7 @@ namespace MWGui
 
     void ContainerWindow::onTakeAllButtonClicked(MyGUI::Widget* _sender)
     {
-        if(mDragAndDrop != nullptr && mDragAndDrop->mIsOnDragAndDrop)
+        if (mDragAndDrop != nullptr && mDragAndDrop->mIsOnDragAndDrop)
             return;
 
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mCloseButton);
@@ -204,7 +205,7 @@ namespace MWGui
         if (mPtr.getClass().hasInventoryStore(mPtr))
         {
             MWWorld::InventoryStore& invStore = mPtr.getClass().getInventoryStore(mPtr);
-            for (size_t i=0; i<mModel->getItemCount(); ++i)
+            for (size_t i = 0; i < mModel->getItemCount(); ++i)
             {
                 const ItemStack& item = mModel->getItem(i);
                 if (invStore.isEquipped(item.mBase) == false)
@@ -216,9 +217,9 @@ namespace MWGui
 
         mModel->update();
 
-        for (size_t i=0; i<mModel->getItemCount(); ++i)
+        for (size_t i = 0; i < mModel->getItemCount(); ++i)
         {
-            if (i==0)
+            if (i == 0)
             {
                 // play the sound of the first object
                 MWWorld::Ptr item = mModel->getItem(i).mBase;
@@ -237,9 +238,9 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Container);
     }
 
-    void ContainerWindow::onDisposeCorpseButtonClicked(MyGUI::Widget *sender)
+    void ContainerWindow::onDisposeCorpseButtonClicked(MyGUI::Widget* sender)
     {
-        if(mDragAndDrop == nullptr || !mDragAndDrop->mIsOnDragAndDrop)
+        if (mDragAndDrop == nullptr || !mDragAndDrop->mIsOnDragAndDrop)
         {
             MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mCloseButton);
 
@@ -263,7 +264,7 @@ namespace MWGui
                     std::string_view script = ptr.getClass().getScript(ptr);
                     if (!script.empty() && MWBase::Environment::get().getWorld()->getScriptsEnabled())
                     {
-                        MWScript::InterpreterContext interpreterContext (&ptr.getRefData().getLocals(), ptr);
+                        MWScript::InterpreterContext interpreterContext(&ptr.getRefData().getLocals(), ptr);
                         MWBase::Environment::get().getScriptManager()->run(script, interpreterContext);
                     }
 
@@ -274,14 +275,15 @@ namespace MWGui
                     creatureMap.clear();
 
                     // Check if we are a summon and inform our master we've bit the dust
-                    for(const auto& package : creatureStats.getAiSequence())
+                    for (const auto& package : creatureStats.getAiSequence())
                     {
-                        if(package->followTargetThroughDoors() && !package->getTarget().isEmpty())
+                        if (package->followTargetThroughDoors() && !package->getTarget().isEmpty())
                         {
                             const auto& summoner = package->getTarget();
                             auto& summons = summoner.getClass().getCreatureStats(summoner).getSummonedCreatureMap();
-                            auto it = std::find_if(summons.begin(), summons.end(), [&] (const auto& entry) { return entry.second == creatureStats.getActorId(); });
-                            if(it != summons.end())
+                            auto it = std::find_if(summons.begin(), summons.end(),
+                                [&](const auto& entry) { return entry.second == creatureStats.getActorId(); });
+                            if (it != summons.end())
                             {
                                 auto summon = *it;
                                 summons.erase(it);
@@ -304,14 +306,14 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Container);
     }
 
-    bool ContainerWindow::onTakeItem(const ItemStack &item, int count)
+    bool ContainerWindow::onTakeItem(const ItemStack& item, int count)
     {
         return mModel->onTakeItem(item.mBase, count);
     }
 
     void ContainerWindow::onDeleteCustomData(const MWWorld::Ptr& ptr)
     {
-        if(mModel && mModel->usesContainer(ptr))
+        if (mModel && mModel->usesContainer(ptr))
             MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Container);
     }
 }
diff --git a/apps/openmw/mwgui/container.hpp b/apps/openmw/mwgui/container.hpp
index 66a20e7ef5..7c625c488f 100644
--- a/apps/openmw/mwgui/container.hpp
+++ b/apps/openmw/mwgui/container.hpp
@@ -1,8 +1,8 @@
 #ifndef MGUI_CONTAINER_H
 #define MGUI_CONTAINER_H
 
-#include "windowbase.hpp"
 #include "referenceinterface.hpp"
+#include "windowbase.hpp"
 
 #include "itemmodel.hpp"
 
@@ -19,7 +19,6 @@ namespace MWGui
     class SortFilterItemModel;
 }
 
-
 namespace MWGui
 {
     class ContainerWindow : public WindowBase, public ReferenceInterface
@@ -38,6 +37,7 @@ namespace MWGui
         void onDeleteCustomData(const MWWorld::Ptr& ptr) override;
 
         void treatNextOpenAsLoot() { mTreatNextOpenAsLoot = true; };
+
     private:
         DragAndDrop* mDragAndDrop;
 
diff --git a/apps/openmw/mwgui/containeritemmodel.cpp b/apps/openmw/mwgui/containeritemmodel.cpp
index 9f202108a2..73a8d2bc2c 100644
--- a/apps/openmw/mwgui/containeritemmodel.cpp
+++ b/apps/openmw/mwgui/containeritemmodel.cpp
@@ -2,11 +2,11 @@
 
 #include <algorithm>
 
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/creaturestats.hpp"
 
-#include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/containerstore.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
@@ -16,15 +16,14 @@
 namespace
 {
 
-    bool stacks (const MWWorld::Ptr& left, const MWWorld::Ptr& right)
+    bool stacks(const MWWorld::Ptr& left, const MWWorld::Ptr& right)
     {
         if (left == right)
             return true;
 
         // If one of the items is in an inventory and currently equipped, we need to check stacking both ways to be sure
         if (left.getContainerStore() && right.getContainerStore())
-            return left.getContainerStore()->stacks(left, right)
-                    && right.getContainerStore()->stacks(left, right);
+            return left.getContainerStore()->stacks(left, right) && right.getContainerStore()->stacks(left, right);
 
         if (left.getContainerStore())
             return left.getContainerStore()->stacks(left, right);
@@ -39,134 +38,158 @@ namespace
 
 namespace MWGui
 {
-ContainerItemModel::ContainerItemModel(const std::vector<MWWorld::Ptr>& itemSources, const std::vector<MWWorld::Ptr>& worldItems)
-    : mWorldItems(worldItems)
-    , mTrading(true)
-{
-    assert (!itemSources.empty());
-    // Tie resolution lifetimes to the ItemModel
-    mItemSources.reserve(itemSources.size());
-    for(const MWWorld::Ptr& source : itemSources)
+    ContainerItemModel::ContainerItemModel(
+        const std::vector<MWWorld::Ptr>& itemSources, const std::vector<MWWorld::Ptr>& worldItems)
+        : mWorldItems(worldItems)
+        , mTrading(true)
+    {
+        assert(!itemSources.empty());
+        // Tie resolution lifetimes to the ItemModel
+        mItemSources.reserve(itemSources.size());
+        for (const MWWorld::Ptr& source : itemSources)
+        {
+            MWWorld::ContainerStore& store = source.getClass().getContainerStore(source);
+            mItemSources.emplace_back(source, store.resolveTemporarily());
+        }
+    }
+
+    ContainerItemModel::ContainerItemModel(const MWWorld::Ptr& source)
+        : mTrading(false)
     {
         MWWorld::ContainerStore& store = source.getClass().getContainerStore(source);
         mItemSources.emplace_back(source, store.resolveTemporarily());
     }
-}
-
-ContainerItemModel::ContainerItemModel (const MWWorld::Ptr& source) : mTrading(false)
-{
-    MWWorld::ContainerStore& store = source.getClass().getContainerStore(source);
-    mItemSources.emplace_back(source, store.resolveTemporarily());
-}
-
-bool ContainerItemModel::allowedToUseItems() const
-{
-    if (mItemSources.empty())
-        return true;
-
-    MWWorld::Ptr ptr = MWMechanics::getPlayer();
-    MWWorld::Ptr victim;
 
-    // Check if the player is allowed to use items from opened container
-    MWBase::MechanicsManager* mm = MWBase::Environment::get().getMechanicsManager();
-    return mm->isAllowedToUse(ptr, mItemSources[0].first, victim);
-}
+    bool ContainerItemModel::allowedToUseItems() const
+    {
+        if (mItemSources.empty())
+            return true;
 
-ItemStack ContainerItemModel::getItem (ModelIndex index)
-{
-    if (index < 0)
-        throw std::runtime_error("Invalid index supplied");
-    if (mItems.size() <= static_cast<size_t>(index))
-        throw std::runtime_error("Item index out of range");
-    return mItems[index];
-}
+        MWWorld::Ptr ptr = MWMechanics::getPlayer();
+        MWWorld::Ptr victim;
 
-size_t ContainerItemModel::getItemCount()
-{
-    return mItems.size();
-}
+        // Check if the player is allowed to use items from opened container
+        MWBase::MechanicsManager* mm = MWBase::Environment::get().getMechanicsManager();
+        return mm->isAllowedToUse(ptr, mItemSources[0].first, victim);
+    }
 
-ItemModel::ModelIndex ContainerItemModel::getIndex (const ItemStack& item)
-{
-    size_t i = 0;
-    for (ItemStack& itemStack : mItems)
+    ItemStack ContainerItemModel::getItem(ModelIndex index)
     {
-        if (itemStack == item)
-            return i;
-        ++i;
+        if (index < 0)
+            throw std::runtime_error("Invalid index supplied");
+        if (mItems.size() <= static_cast<size_t>(index))
+            throw std::runtime_error("Item index out of range");
+        return mItems[index];
     }
-    return -1;
-}
 
-MWWorld::Ptr ContainerItemModel::copyItem (const ItemStack& item, size_t count, bool allowAutoEquip)
-{
-    auto& source = mItemSources[0];
-    MWWorld::ContainerStore& store = source.first.getClass().getContainerStore(source.first);
-    if (item.mBase.getContainerStore() == &store)
-        throw std::runtime_error("Item to copy needs to be from a different container!");
-    return *store.add(item.mBase, count, source.first, allowAutoEquip);
-}
+    size_t ContainerItemModel::getItemCount()
+    {
+        return mItems.size();
+    }
 
-void ContainerItemModel::removeItem (const ItemStack& item, size_t count)
-{
-    int toRemove = count;
+    ItemModel::ModelIndex ContainerItemModel::getIndex(const ItemStack& item)
+    {
+        size_t i = 0;
+        for (ItemStack& itemStack : mItems)
+        {
+            if (itemStack == item)
+                return i;
+            ++i;
+        }
+        return -1;
+    }
 
-    for (auto& source : mItemSources)
+    MWWorld::Ptr ContainerItemModel::copyItem(const ItemStack& item, size_t count, bool allowAutoEquip)
     {
+        auto& source = mItemSources[0];
         MWWorld::ContainerStore& store = source.first.getClass().getContainerStore(source.first);
+        if (item.mBase.getContainerStore() == &store)
+            throw std::runtime_error("Item to copy needs to be from a different container!");
+        return *store.add(item.mBase, count, source.first, allowAutoEquip);
+    }
+
+    void ContainerItemModel::removeItem(const ItemStack& item, size_t count)
+    {
+        int toRemove = count;
+
+        for (auto& source : mItemSources)
+        {
+            MWWorld::ContainerStore& store = source.first.getClass().getContainerStore(source.first);
 
-        for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
+            for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
+            {
+                if (stacks(*it, item.mBase))
+                {
+                    int quantity = it->mRef->mData.getCount(false);
+                    // If this is a restocking quantity, just don't remove it
+                    if (quantity < 0 && mTrading)
+                        toRemove += quantity;
+                    else
+                        toRemove -= store.remove(*it, toRemove, source.first);
+                    if (toRemove <= 0)
+                        return;
+                }
+            }
+        }
+        for (MWWorld::Ptr& source : mWorldItems)
         {
-            if (stacks(*it, item.mBase))
+            if (stacks(source, item.mBase))
             {
-                int quantity = it->mRef->mData.getCount(false);
-                // If this is a restocking quantity, just don't remove it
-                if(quantity < 0 && mTrading)
-                    toRemove += quantity;
+                int refCount = source.getRefData().getCount();
+                if (refCount - toRemove <= 0)
+                    MWBase::Environment::get().getWorld()->deleteObject(source);
                 else
-                    toRemove -= store.remove(*it, toRemove, source.first);
+                    source.getRefData().setCount(std::max(0, refCount - toRemove));
+                toRemove -= refCount;
                 if (toRemove <= 0)
                     return;
             }
         }
+
+        throw std::runtime_error("Not enough items to remove could be found");
     }
-    for (MWWorld::Ptr& source : mWorldItems)
+
+    void ContainerItemModel::update()
     {
-        if (stacks(source, item.mBase))
+        mItems.clear();
+        for (auto& source : mItemSources)
         {
-            int refCount = source.getRefData().getCount();
-            if (refCount - toRemove <= 0)
-                MWBase::Environment::get().getWorld()->deleteObject(source);
-            else
-                source.getRefData().setCount(std::max(0, refCount - toRemove));
-            toRemove -= refCount;
-            if (toRemove <= 0)
-                return;
-        }
-    }
+            MWWorld::ContainerStore& store = source.first.getClass().getContainerStore(source.first);
 
-    throw std::runtime_error("Not enough items to remove could be found");
-}
+            for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
+            {
+                if (!(*it).getClass().showsInInventory(*it))
+                    continue;
 
-void ContainerItemModel::update()
-{
-    mItems.clear();
-    for (auto& source : mItemSources)
-    {
-        MWWorld::ContainerStore& store = source.first.getClass().getContainerStore(source.first);
+                bool found = false;
+                for (ItemStack& itemStack : mItems)
+                {
+                    if (stacks(*it, itemStack.mBase))
+                    {
+                        // we already have an item stack of this kind, add to it
+                        itemStack.mCount += it->getRefData().getCount();
+                        found = true;
+                        break;
+                    }
+                }
 
-        for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
+                if (!found)
+                {
+                    // no stack yet, create one
+                    ItemStack newItem(*it, this, it->getRefData().getCount());
+                    mItems.push_back(newItem);
+                }
+            }
+        }
+        for (MWWorld::Ptr& source : mWorldItems)
         {
-            if (!(*it).getClass().showsInInventory(*it))
-                continue;
-
             bool found = false;
             for (ItemStack& itemStack : mItems)
             {
-                if (stacks(*it, itemStack.mBase))
+                if (stacks(source, itemStack.mBase))
                 {
                     // we already have an item stack of this kind, add to it
-                    itemStack.mCount += it->getRefData().getCount();
+                    itemStack.mCount += source.getRefData().getCount();
                     found = true;
                     break;
                 }
@@ -175,88 +198,65 @@ void ContainerItemModel::update()
             if (!found)
             {
                 // no stack yet, create one
-                ItemStack newItem (*it, this, it->getRefData().getCount());
+                ItemStack newItem(source, this, source.getRefData().getCount());
                 mItems.push_back(newItem);
             }
         }
     }
-    for (MWWorld::Ptr& source : mWorldItems)
+    bool ContainerItemModel::onDropItem(const MWWorld::Ptr& item, int count)
     {
-        bool found = false;
-        for (ItemStack& itemStack : mItems)
+        if (mItemSources.empty())
+            return false;
+
+        MWWorld::Ptr target = mItemSources[0].first;
+
+        if (target.getType() != ESM::Container::sRecordId)
+            return true;
+
+        // check container organic flag
+        MWWorld::LiveCellRef<ESM::Container>* ref = target.get<ESM::Container>();
+        if (ref->mBase->mFlags & ESM::Container::Organic)
         {
-            if (stacks(source, itemStack.mBase))
-            {
-                // we already have an item stack of this kind, add to it
-                itemStack.mCount += source.getRefData().getCount();
-                found = true;
-                break;
-            }
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sContentsMessage2}");
+            return false;
         }
 
-        if (!found)
+        // check that we don't exceed container capacity
+        float weight = item.getClass().getWeight(item) * count;
+        if (target.getClass().getCapacity(target) < target.getClass().getEncumbrance(target) + weight)
         {
-            // no stack yet, create one
-            ItemStack newItem (source, this, source.getRefData().getCount());
-            mItems.push_back(newItem);
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sContentsMessage3}");
+            return false;
         }
-    }
-}
-bool ContainerItemModel::onDropItem(const MWWorld::Ptr &item, int count)
-{
-    if (mItemSources.empty())
-        return false;
 
-    MWWorld::Ptr target = mItemSources[0].first;
-
-    if (target.getType() != ESM::Container::sRecordId)
         return true;
-
-    // check container organic flag
-    MWWorld::LiveCellRef<ESM::Container>* ref = target.get<ESM::Container>();
-    if (ref->mBase->mFlags & ESM::Container::Organic)
-    {
-        MWBase::Environment::get().getWindowManager()->
-            messageBox("#{sContentsMessage2}");
-        return false;
     }
 
-    // check that we don't exceed container capacity
-    float weight = item.getClass().getWeight(item) * count;
-    if (target.getClass().getCapacity(target) < target.getClass().getEncumbrance(target) + weight)
+    bool ContainerItemModel::onTakeItem(const MWWorld::Ptr& item, int count)
     {
-        MWBase::Environment::get().getWindowManager()->messageBox("#{sContentsMessage3}");
-        return false;
-    }
+        if (mItemSources.empty())
+            return false;
 
-    return true;
-}
+        MWWorld::Ptr target = mItemSources[0].first;
 
-bool ContainerItemModel::onTakeItem(const MWWorld::Ptr &item, int count)
-{
-    if (mItemSources.empty())
-        return false;
+        // Looting a dead corpse is considered OK
+        if (target.getClass().isActor() && target.getClass().getCreatureStats(target).isDead())
+            return true;
 
-    MWWorld::Ptr target = mItemSources[0].first;
+        MWWorld::Ptr player = MWMechanics::getPlayer();
+        MWBase::Environment::get().getMechanicsManager()->itemTaken(player, item, target, count);
 
-    // Looting a dead corpse is considered OK
-    if (target.getClass().isActor() && target.getClass().getCreatureStats(target).isDead())
         return true;
+    }
 
-    MWWorld::Ptr player = MWMechanics::getPlayer();
-    MWBase::Environment::get().getMechanicsManager()->itemTaken(player, item, target, count);
-
-    return true;
-}
-
-bool ContainerItemModel::usesContainer(const MWWorld::Ptr& container)
-{
-    for(const auto& source : mItemSources)
+    bool ContainerItemModel::usesContainer(const MWWorld::Ptr& container)
     {
-        if(source.first == container)
-            return true;
+        for (const auto& source : mItemSources)
+        {
+            if (source.first == container)
+                return true;
+        }
+        return false;
     }
-    return false;
-}
 
 }
diff --git a/apps/openmw/mwgui/containeritemmodel.hpp b/apps/openmw/mwgui/containeritemmodel.hpp
index 11fed06913..1bdcec90f9 100644
--- a/apps/openmw/mwgui/containeritemmodel.hpp
+++ b/apps/openmw/mwgui/containeritemmodel.hpp
@@ -16,23 +16,24 @@ namespace MWGui
     class ContainerItemModel : public ItemModel
     {
     public:
-        ContainerItemModel (const std::vector<MWWorld::Ptr>& itemSources, const std::vector<MWWorld::Ptr>& worldItems);
-        ///< @note The order of elements \a itemSources matters here. The first element has the highest priority for removal,
+        ContainerItemModel(const std::vector<MWWorld::Ptr>& itemSources, const std::vector<MWWorld::Ptr>& worldItems);
+        ///< @note The order of elements \a itemSources matters here. The first element has the highest priority for
+        ///< removal,
         ///  while the last element will be used to add new items to.
 
-        ContainerItemModel (const MWWorld::Ptr& source);
+        ContainerItemModel(const MWWorld::Ptr& source);
 
         bool allowedToUseItems() const override;
 
-        bool onDropItem(const MWWorld::Ptr &item, int count) override;
-        bool onTakeItem(const MWWorld::Ptr &item, int count) override;
+        bool onDropItem(const MWWorld::Ptr& item, int count) override;
+        bool onTakeItem(const MWWorld::Ptr& item, int count) override;
 
-        ItemStack getItem (ModelIndex index) override;
-        ModelIndex getIndex (const ItemStack &item) override;
+        ItemStack getItem(ModelIndex index) override;
+        ModelIndex getIndex(const ItemStack& item) override;
         size_t getItemCount() override;
 
-        MWWorld::Ptr copyItem (const ItemStack& item, size_t count, bool allowAutoEquip = true) override;
-        void removeItem (const ItemStack& item, size_t count) override;
+        MWWorld::Ptr copyItem(const ItemStack& item, size_t count, bool allowAutoEquip = true) override;
+        void removeItem(const ItemStack& item, size_t count) override;
 
         void update() override;
 
diff --git a/apps/openmw/mwgui/controllers.cpp b/apps/openmw/mwgui/controllers.cpp
index f3932d3ce6..f024def39b 100644
--- a/apps/openmw/mwgui/controllers.cpp
+++ b/apps/openmw/mwgui/controllers.cpp
@@ -7,11 +7,9 @@ namespace MWGui
 {
     namespace Controllers
     {
-        void ControllerFollowMouse::prepareItem(MyGUI::Widget *_widget)
-        {
-        }
+        void ControllerFollowMouse::prepareItem(MyGUI::Widget* _widget) {}
 
-        bool ControllerFollowMouse::addTime(MyGUI::Widget *_widget, float _time)
+        bool ControllerFollowMouse::addTime(MyGUI::Widget* _widget, float _time)
         {
             _widget->setPosition(MyGUI::InputManager::getInstance().getMousePosition());
             return true;
diff --git a/apps/openmw/mwgui/controllers.hpp b/apps/openmw/mwgui/controllers.hpp
index 416f104d9a..a9e5565187 100644
--- a/apps/openmw/mwgui/controllers.hpp
+++ b/apps/openmw/mwgui/controllers.hpp
@@ -1,8 +1,8 @@
 #ifndef MWGUI_CONTROLLERS_H
 #define MWGUI_CONTROLLERS_H
 
-#include <string>
 #include <MyGUI_ControllerItem.h>
+#include <string>
 
 namespace MyGUI
 {
@@ -10,16 +10,16 @@ namespace MyGUI
 }
 
 namespace MWGui::Controllers
+{
+    /// Automatically positions a widget below the mouse cursor.
+    class ControllerFollowMouse final : public MyGUI::ControllerItem
     {
-        /// Automatically positions a widget below the mouse cursor.
-        class ControllerFollowMouse final : public MyGUI::ControllerItem
-        {
-            MYGUI_RTTI_DERIVED( ControllerFollowMouse )
+        MYGUI_RTTI_DERIVED(ControllerFollowMouse)
 
-        private:
-            bool addTime(MyGUI::Widget* _widget, float _time) override;
-            void prepareItem(MyGUI::Widget* _widget) override;
-        };
-    }
+    private:
+        bool addTime(MyGUI::Widget* _widget, float _time) override;
+        void prepareItem(MyGUI::Widget* _widget) override;
+    };
+}
 
 #endif
diff --git a/apps/openmw/mwgui/countdialog.cpp b/apps/openmw/mwgui/countdialog.cpp
index baf3a43abd..86d6402c88 100644
--- a/apps/openmw/mwgui/countdialog.cpp
+++ b/apps/openmw/mwgui/countdialog.cpp
@@ -1,8 +1,8 @@
 #include "countdialog.hpp"
 
 #include <MyGUI_Button.h>
-#include <MyGUI_ScrollBar.h>
 #include <MyGUI_RenderManager.h>
+#include <MyGUI_ScrollBar.h>
 
 #include <components/widgets/numericeditbox.hpp>
 
@@ -11,8 +11,8 @@
 
 namespace MWGui
 {
-    CountDialog::CountDialog() :
-        WindowModal("openmw_count_window.layout")
+    CountDialog::CountDialog()
+        : WindowModal("openmw_count_window.layout")
     {
         getWidget(mSlider, "CountSlider");
         getWidget(mItemEdit, "ItemEdit");
@@ -41,15 +41,13 @@ namespace MWGui
         mItemText->setCaption(item);
 
         int width = std::max(mItemText->getTextSize().width + 128, 320);
-        setCoord(viewSize.width/2 - width/2,
-                viewSize.height/2 - mMainWidget->getHeight()/2,
-                width,
-                mMainWidget->getHeight());
+        setCoord(viewSize.width / 2 - width / 2, viewSize.height / 2 - mMainWidget->getHeight() / 2, width,
+            mMainWidget->getHeight());
 
         // by default, the text edit field has the focus of the keyboard
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mItemEdit);
 
-        mSlider->setScrollPosition(maxCount-1);
+        mSlider->setScrollPosition(maxCount - 1);
 
         mItemEdit->setMinValue(1);
         mItemEdit->setMaxValue(maxCount);
@@ -63,7 +61,7 @@ namespace MWGui
 
     void CountDialog::onOkButtonClicked(MyGUI::Widget* _sender)
     {
-        eventOkClicked(nullptr, mSlider->getScrollPosition()+1);
+        eventOkClicked(nullptr, mSlider->getScrollPosition() + 1);
 
         setVisible(false);
     }
@@ -72,7 +70,7 @@ namespace MWGui
     // Enter key
     void CountDialog::onEnterKeyPressed(MyGUI::EditBox* _sender)
     {
-        eventOkClicked(nullptr, mSlider->getScrollPosition()+1);
+        eventOkClicked(nullptr, mSlider->getScrollPosition() + 1);
         setVisible(false);
 
         // To do not spam onEnterKeyPressed() again and again
@@ -81,11 +79,11 @@ namespace MWGui
 
     void CountDialog::onEditValueChanged(int value)
     {
-        mSlider->setScrollPosition(value-1);
+        mSlider->setScrollPosition(value - 1);
     }
 
     void CountDialog::onSliderMoved(MyGUI::ScrollBar* _sender, size_t _position)
     {
-        mItemEdit->setValue(_position+1);
+        mItemEdit->setValue(_position + 1);
     }
 }
diff --git a/apps/openmw/mwgui/countdialog.hpp b/apps/openmw/mwgui/countdialog.hpp
index 766612f681..bbc6ed90ff 100644
--- a/apps/openmw/mwgui/countdialog.hpp
+++ b/apps/openmw/mwgui/countdialog.hpp
@@ -12,30 +12,30 @@ namespace MWGui
 {
     class CountDialog : public WindowModal
     {
-        public:
-            CountDialog();
-            void openCountDialog(const std::string& item, const std::string& message, const int maxCount);
-
-            typedef MyGUI::delegates::CMultiDelegate2<MyGUI::Widget*, int> EventHandle_WidgetInt;
-
-            /** Event : Ok button was clicked.\n
-                signature : void method(MyGUI::Widget* _sender, int _count)\n
-            */
-            EventHandle_WidgetInt eventOkClicked;
-
-        private:
-            MyGUI::ScrollBar* mSlider;
-            Gui::NumericEditBox* mItemEdit;
-            MyGUI::TextBox* mItemText;
-            MyGUI::TextBox* mLabelText;
-            MyGUI::Button* mOkButton;
-            MyGUI::Button* mCancelButton;
-
-            void onCancelButtonClicked(MyGUI::Widget* _sender);
-            void onOkButtonClicked(MyGUI::Widget* _sender);
-            void onEditValueChanged(int value);
-            void onSliderMoved(MyGUI::ScrollBar* _sender, size_t _position);
-            void onEnterKeyPressed(MyGUI::EditBox* _sender);
+    public:
+        CountDialog();
+        void openCountDialog(const std::string& item, const std::string& message, const int maxCount);
+
+        typedef MyGUI::delegates::CMultiDelegate2<MyGUI::Widget*, int> EventHandle_WidgetInt;
+
+        /** Event : Ok button was clicked.\n
+            signature : void method(MyGUI::Widget* _sender, int _count)\n
+        */
+        EventHandle_WidgetInt eventOkClicked;
+
+    private:
+        MyGUI::ScrollBar* mSlider;
+        Gui::NumericEditBox* mItemEdit;
+        MyGUI::TextBox* mItemText;
+        MyGUI::TextBox* mLabelText;
+        MyGUI::Button* mOkButton;
+        MyGUI::Button* mCancelButton;
+
+        void onCancelButtonClicked(MyGUI::Widget* _sender);
+        void onOkButtonClicked(MyGUI::Widget* _sender);
+        void onEditValueChanged(int value);
+        void onSliderMoved(MyGUI::ScrollBar* _sender, size_t _position);
+        void onEnterKeyPressed(MyGUI::EditBox* _sender);
     };
 
 }
diff --git a/apps/openmw/mwgui/cursor.cpp b/apps/openmw/mwgui/cursor.cpp
index ed8a76eb87..7c95e2fd11 100644
--- a/apps/openmw/mwgui/cursor.cpp
+++ b/apps/openmw/mwgui/cursor.cpp
@@ -1,23 +1,20 @@
 #include "cursor.hpp"
 
-#include <MyGUI_PointerManager.h>
+#include <MyGUI_Gui.h>
 #include <MyGUI_InputManager.h>
+#include <MyGUI_PointerManager.h>
 #include <MyGUI_RotatingSkin.h>
-#include <MyGUI_Gui.h>
 
 namespace MWGui
 {
 
-
     ResourceImageSetPointerFix::ResourceImageSetPointerFix()
         : mImageSet(nullptr)
         , mRotation(0)
     {
     }
 
-    ResourceImageSetPointerFix::~ResourceImageSetPointerFix()
-    {
-    }
+    ResourceImageSetPointerFix::~ResourceImageSetPointerFix() {}
 
     void ResourceImageSetPointerFix::deserialization(MyGUI::xml::ElementPtr _node, MyGUI::Version _version)
     {
@@ -56,7 +53,7 @@ namespace MWGui
         _image->setCoord(_point.left - mPoint.left, _point.top - mPoint.top, mSize.width, mSize.height);
     }
 
-    MyGUI::ResourceImageSetPtr ResourceImageSetPointerFix:: getImageSet()
+    MyGUI::ResourceImageSetPtr ResourceImageSetPointerFix::getImageSet()
     {
         return mImageSet;
     }
diff --git a/apps/openmw/mwgui/cursor.hpp b/apps/openmw/mwgui/cursor.hpp
index 7e1f9adba9..b25db0ce06 100644
--- a/apps/openmw/mwgui/cursor.hpp
+++ b/apps/openmw/mwgui/cursor.hpp
@@ -9,12 +9,12 @@ namespace MWGui
 
     /// \brief Allows us to get the members of
     ///        ResourceImageSetPointer that we need.
-    /// \example MyGUI::FactoryManager::getInstance().registerFactory<ResourceImageSetPointerFix>("Resource", "ResourceImageSetPointer");
+    /// \example MyGUI::FactoryManager::getInstance().registerFactory<ResourceImageSetPointerFix>("Resource",
+    /// "ResourceImageSetPointer");
     ///          MyGUI::ResourceManager::getInstance().load("core.xml");
-    class ResourceImageSetPointerFix final :
-        public MyGUI::IPointer
+    class ResourceImageSetPointerFix final : public MyGUI::IPointer
     {
-        MYGUI_RTTI_DERIVED( ResourceImageSetPointerFix )
+        MYGUI_RTTI_DERIVED(ResourceImageSetPointerFix)
 
     public:
         ResourceImageSetPointerFix();
@@ -25,8 +25,8 @@ namespace MWGui
         void setImage(MyGUI::ImageBox* _image) override;
         void setPosition(MyGUI::ImageBox* _image, const MyGUI::IntPoint& _point) override;
 
-        //and now for the whole point of this class, allow us to get
-        //the hot spot, the image and the size of the cursor.
+        // and now for the whole point of this class, allow us to get
+        // the hot spot, the image and the size of the cursor.
         MyGUI::ResourceImageSetPtr getImageSet();
         MyGUI::IntPoint getHotSpot();
         MyGUI::IntSize getSize();
diff --git a/apps/openmw/mwgui/debugwindow.cpp b/apps/openmw/mwgui/debugwindow.cpp
index 93f5fdb076..e02e3032f4 100644
--- a/apps/openmw/mwgui/debugwindow.cpp
+++ b/apps/openmw/mwgui/debugwindow.cpp
@@ -1,8 +1,8 @@
 #include "debugwindow.hpp"
 
+#include <MyGUI_EditBox.h>
 #include <MyGUI_TabControl.h>
 #include <MyGUI_TabItem.h>
-#include <MyGUI_EditBox.h>
 
 #include <LinearMath/btQuickprof.h>
 #include <components/debug/debugging.hpp>
@@ -20,47 +20,56 @@ namespace
         if (pit->Is_Done())
             return;
 
-        float accumulated_time=0,parent_time = pit->Is_Root() ? CProfileManager::Get_Time_Since_Reset() : pit->Get_Current_Parent_Total_Time();
-        int i,j;
+        float accumulated_time = 0,
+              parent_time
+            = pit->Is_Root() ? CProfileManager::Get_Time_Since_Reset() : pit->Get_Current_Parent_Total_Time();
+        int i, j;
         int frames_since_reset = CProfileManager::Get_Frame_Count_Since_Reset();
-        for (i=0;i<spacing;i++) os << ".";
+        for (i = 0; i < spacing; i++)
+            os << ".";
         os << "----------------------------------\n";
-        for (i=0;i<spacing;i++) os << ".";
-        std::string s = "Profiling: "+
-                std::string(pit->Get_Current_Parent_Name())+" (total running time: "+MyGUI::utility::toString(parent_time,3)+" ms) ---\n";
+        for (i = 0; i < spacing; i++)
+            os << ".";
+        std::string s = "Profiling: " + std::string(pit->Get_Current_Parent_Name())
+            + " (total running time: " + MyGUI::utility::toString(parent_time, 3) + " ms) ---\n";
         os << s;
-        //float totalTime = 0.f;
+        // float totalTime = 0.f;
 
         int numChildren = 0;
 
-        for (i = 0; !pit->Is_Done(); i++,pit->Next())
+        for (i = 0; !pit->Is_Done(); i++, pit->Next())
         {
             numChildren++;
             float current_total_time = pit->Get_Current_Total_Time();
             accumulated_time += current_total_time;
             float fraction = parent_time > SIMD_EPSILON ? (current_total_time / parent_time) * 100 : 0.f;
 
-            for (j=0;j<spacing;j++) os << ".";
+            for (j = 0; j < spacing; j++)
+                os << ".";
             double ms = (current_total_time / (double)frames_since_reset);
-            s = MyGUI::utility::toString(i)+" -- "+pit->Get_Current_Name()+" ("+MyGUI::utility::toString(fraction,2)+" %) :: "+MyGUI::utility::toString(ms,3)+" ms / frame ("+MyGUI::utility::toString(pit->Get_Current_Total_Calls())+" calls)\n";
+            s = MyGUI::utility::toString(i) + " -- " + pit->Get_Current_Name() + " ("
+                + MyGUI::utility::toString(fraction, 2) + " %) :: " + MyGUI::utility::toString(ms, 3) + " ms / frame ("
+                + MyGUI::utility::toString(pit->Get_Current_Total_Calls()) + " calls)\n";
             os << s;
-            //totalTime += current_total_time;
-            //recurse into children
+            // totalTime += current_total_time;
+            // recurse into children
         }
 
         if (parent_time < accumulated_time)
         {
             os << "what's wrong\n";
         }
-        for (i=0;i<spacing;i++) os << ".";
-        double unaccounted=  parent_time > SIMD_EPSILON ? ((parent_time - accumulated_time) / parent_time) * 100 : 0.f;
-        s = "Unaccounted: ("+MyGUI::utility::toString(unaccounted,3)+" %) :: "+MyGUI::utility::toString(parent_time - accumulated_time,3)+" ms\n";
+        for (i = 0; i < spacing; i++)
+            os << ".";
+        double unaccounted = parent_time > SIMD_EPSILON ? ((parent_time - accumulated_time) / parent_time) * 100 : 0.f;
+        s = "Unaccounted: (" + MyGUI::utility::toString(unaccounted, 3)
+            + " %) :: " + MyGUI::utility::toString(parent_time - accumulated_time, 3) + " ms\n";
         os << s;
 
-        for (i=0;i<numChildren;i++)
+        for (i = 0; i < numChildren; i++)
         {
             pit->Enter_Child(i);
-            bulletDumpRecursive(pit, spacing+3, os);
+            bulletDumpRecursive(pit, spacing + 3, os);
             pit->Enter_Parent();
         }
     }
@@ -93,15 +102,15 @@ namespace MWGui
 
         MyGUI::TabItem* itemLV = mTabControl->addItem("Log Viewer");
         itemLV->setCaptionWithReplacing(" #{DebugMenu:LogViewer} ");
-        mLogView = itemLV->createWidgetReal<MyGUI::EditBox>
-                ("LogEdit", MyGUI::FloatCoord(0,0,1,1), MyGUI::Align::Stretch);
+        mLogView
+            = itemLV->createWidgetReal<MyGUI::EditBox>("LogEdit", MyGUI::FloatCoord(0, 0, 1, 1), MyGUI::Align::Stretch);
         mLogView->setEditReadOnly(true);
 
 #ifndef BT_NO_PROFILE
         MyGUI::TabItem* item = mTabControl->addItem("Physics Profiler");
         item->setCaptionWithReplacing(" #{DebugMenu:PhysicsProfiler} ");
-        mBulletProfilerEdit = item->createWidgetReal<MyGUI::EditBox>
-                ("LogEdit", MyGUI::FloatCoord(0,0,1,1), MyGUI::Align::Stretch);
+        mBulletProfilerEdit
+            = item->createWidgetReal<MyGUI::EditBox>("LogEdit", MyGUI::FloatCoord(0, 0, 1, 1), MyGUI::Align::Stretch);
 #else
         mBulletProfilerEdit = nullptr;
 #endif
@@ -115,32 +124,38 @@ namespace MWGui
     void DebugWindow::startLogRecording()
     {
         sLogCircularBuffer.resize(std::max<int64_t>(0, Settings::Manager::getInt64("log buffer size", "General")));
-        Debug::setLogListener([](Debug::Level level, std::string_view prefix, std::string_view msg)
-        {
+        Debug::setLogListener([](Debug::Level level, std::string_view prefix, std::string_view msg) {
             if (sLogCircularBuffer.empty())
-                return;  // Log viewer is disabled.
+                return; // Log viewer is disabled.
             std::string_view color;
             switch (level)
             {
-                case Debug::Error: color = "#FF0000"; break;
-                case Debug::Warning: color = "#FFFF00"; break;
-                case Debug::Info: color = "#FFFFFF"; break;
+                case Debug::Error:
+                    color = "#FF0000";
+                    break;
+                case Debug::Warning:
+                    color = "#FFFF00";
+                    break;
+                case Debug::Info:
+                    color = "#FFFFFF";
+                    break;
                 case Debug::Verbose:
-                case Debug::Debug: color = "#666666"; break;
-                default: color = "#FFFFFF";
+                case Debug::Debug:
+                    color = "#666666";
+                    break;
+                default:
+                    color = "#FFFFFF";
             }
             bool bufferOverflow = false;
             std::lock_guard lock(sBufferMutex);
             const int64_t bufSize = sLogCircularBuffer.size();
-            auto addChar = [&](char c)
-            {
+            auto addChar = [&](char c) {
                 sLogCircularBuffer[sLogEndIndex++] = c;
                 if (sLogEndIndex == bufSize)
                     sLogEndIndex = 0;
                 bufferOverflow = bufferOverflow || sLogEndIndex == sLogStartIndex;
             };
-            auto addShieldedStr = [&](std::string_view s)
-            {
+            auto addShieldedStr = [&](std::string_view s) {
                 for (char c : s)
                 {
                     addChar(c);
@@ -164,7 +179,7 @@ namespace MWGui
         if (!mLogView || sLogCircularBuffer.empty() || sLogStartIndex == sLogEndIndex)
             return;
         if (mLogView->isTextSelection())
-            return;  // Don't change text while player is trying to copy something
+            return; // Don't change text while player is trying to copy something
 
         std::string addition;
         const int64_t bufSize = sLogCircularBuffer.size();
@@ -180,7 +195,7 @@ namespace MWGui
         }
 
         size_t scrollPos = mLogView->getVScrollPosition();
-        bool scrolledToTheEnd = scrollPos+1 >= mLogView->getVScrollRange();
+        bool scrolledToTheEnd = scrollPos + 1 >= mLogView->getVScrollRange();
         int64_t newSizeEstimation = mLogView->getTextLength() + addition.size();
         if (newSizeEstimation > bufSize)
             mLogView->eraseText(0, newSizeEstimation - bufSize);
@@ -202,7 +217,7 @@ namespace MWGui
 
         size_t previousPos = mBulletProfilerEdit->getVScrollPosition();
         mBulletProfilerEdit->setCaption(stream.str());
-        mBulletProfilerEdit->setVScrollPosition(std::min(previousPos, mBulletProfilerEdit->getVScrollRange()-1));
+        mBulletProfilerEdit->setVScrollPosition(std::min(previousPos, mBulletProfilerEdit->getVScrollRange() - 1));
 #endif
     }
 
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 03cd234fed..1b36e42992 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -1,30 +1,30 @@
 #include "dialogue.hpp"
 
+#include <MyGUI_Button.h>
 #include <MyGUI_LanguageManager.h>
-#include <MyGUI_Window.h>
 #include <MyGUI_ProgressBar.h>
 #include <MyGUI_ScrollBar.h>
-#include <MyGUI_Button.h>
+#include <MyGUI_Window.h>
 
 #include <components/debug/debuglog.hpp>
-#include <components/widgets/box.hpp>
-#include <components/widgets/list.hpp>
-#include <components/translation/translation.hpp>
 #include <components/esm3/loadcrea.hpp>
 #include <components/esm3/loadfact.hpp>
+#include <components/translation/translation.hpp>
+#include <components/widgets/box.hpp>
+#include <components/widgets/list.hpp>
 
+#include "../mwbase/dialoguemanager.hpp"
 #include "../mwbase/environment.hpp"
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwbase/dialoguemanager.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/esmstore.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/creaturestats.hpp"
 
 #include "bookpage.hpp"
 #include "textcolours.hpp"
@@ -96,17 +96,20 @@ namespace MWGui
         totalHeight += lineHeight;
     }
 
-    void PersuasionDialog::onCancel(MyGUI::Widget *sender)
+    void PersuasionDialog::onCancel(MyGUI::Widget* sender)
     {
         setVisible(false);
     }
 
-    void PersuasionDialog::onPersuade(MyGUI::Widget *sender)
+    void PersuasionDialog::onPersuade(MyGUI::Widget* sender)
     {
         MWBase::MechanicsManager::PersuasionType type;
-        if (sender == mAdmireButton) type = MWBase::MechanicsManager::PT_Admire;
-        else if (sender == mIntimidateButton) type = MWBase::MechanicsManager::PT_Intimidate;
-        else if (sender == mTauntButton) type = MWBase::MechanicsManager::PT_Taunt;
+        if (sender == mAdmireButton)
+            type = MWBase::MechanicsManager::PT_Admire;
+        else if (sender == mIntimidateButton)
+            type = MWBase::MechanicsManager::PT_Intimidate;
+        else if (sender == mTauntButton)
+            type = MWBase::MechanicsManager::PT_Taunt;
         else if (sender == mBribe10Button)
             type = MWBase::MechanicsManager::PT_Bribe10;
         else if (sender == mBribe100Button)
@@ -127,9 +130,9 @@ namespace MWGui
         MWWorld::Ptr player = MWMechanics::getPlayer();
         int playerGold = player.getClass().getContainerStore(player).count(MWWorld::ContainerStore::sGoldId);
 
-        mBribe10Button->setEnabled (playerGold >= 10);
-        mBribe100Button->setEnabled (playerGold >= 100);
-        mBribe1000Button->setEnabled (playerGold >= 1000);
+        mBribe10Button->setEnabled(playerGold >= 10);
+        mBribe100Button->setEnabled(playerGold >= 100);
+        mBribe1000Button->setEnabled(playerGold >= 1000);
 
         mGoldLabel->setCaptionWithReplacing("#{sGold}: " + MyGUI::utility::toString(playerGold));
 
@@ -149,13 +152,15 @@ namespace MWGui
 
     // --------------------------------------------------------------------------------------------------
 
-    Response::Response(const std::string &text, const std::string &title, bool needMargin)
-        : mTitle(title), mNeedMargin(needMargin)
+    Response::Response(const std::string& text, const std::string& title, bool needMargin)
+        : mTitle(title)
+        , mNeedMargin(needMargin)
     {
         mText = text;
     }
 
-    void Response::write(BookTypesetter::Ptr typesetter, KeywordSearchT* keywordSearch, std::map<std::string, std::unique_ptr<Link>>& topicLinks) const
+    void Response::write(BookTypesetter::Ptr typesetter, KeywordSearchT* keywordSearch,
+        std::map<std::string, std::unique_ptr<Link>>& topicLinks) const
     {
         typesetter->sectionBreak(mNeedMargin ? 9 : 0);
         auto windowManager = MWBase::Environment::get().getWindowManager();
@@ -175,7 +180,7 @@ namespace MWGui
         std::string text = mText;
 
         size_t pos_end = std::string::npos;
-        for(;;)
+        for (;;)
         {
             size_t pos_begin = text.find('@');
             if (pos_begin != std::string::npos)
@@ -186,16 +191,18 @@ namespace MWGui
                 std::string link = text.substr(pos_begin + 1, pos_end - pos_begin - 1);
                 const char specialPseudoAsteriskCharacter = 127;
                 std::replace(link.begin(), link.end(), specialPseudoAsteriskCharacter, '*');
-                std::string topicName = Misc::StringUtils::lowerCase(windowManager->getTranslationDataStorage().topicStandardForm(link));
+                std::string topicName
+                    = Misc::StringUtils::lowerCase(windowManager->getTranslationDataStorage().topicStandardForm(link));
 
                 std::string displayName = link;
-                while (displayName[displayName.size()-1] == '*')
-                    displayName.erase(displayName.size()-1, 1);
+                while (displayName[displayName.size() - 1] == '*')
+                    displayName.erase(displayName.size() - 1, 1);
 
-                text.replace(pos_begin, pos_end+1-pos_begin, displayName);
+                text.replace(pos_begin, pos_end + 1 - pos_begin, displayName);
 
                 if (topicLinks.find(topicName) != topicLinks.end())
-                    hyperLinks[std::make_pair(pos_begin, pos_begin+displayName.size())] = intptr_t(topicLinks[topicName].get());
+                    hyperLinks[std::make_pair(pos_begin, pos_begin + displayName.size())]
+                        = intptr_t(topicLinks[topicName].get());
             }
             else
                 break;
@@ -203,7 +210,8 @@ namespace MWGui
 
         typesetter->addContent(to_utf8_span(text.c_str()));
 
-        if (hyperLinks.size() && MWBase::Environment::get().getWindowManager()->getTranslationDataStorage().hasTranslation())
+        if (hyperLinks.size()
+            && MWBase::Environment::get().getWindowManager()->getTranslationDataStorage().hasTranslation())
         {
             const TextColours& textColours = MWBase::Environment::get().getWindowManager()->getTextColours();
 
@@ -212,9 +220,8 @@ namespace MWGui
             for (auto& hyperLink : hyperLinks)
             {
                 intptr_t topicId = hyperLink.second;
-                BookTypesetter::Style* hotStyle = typesetter->createHotStyle (style, textColours.link,
-                                                                              textColours.linkOver, textColours.linkPressed,
-                                                                              topicId);
+                BookTypesetter::Style* hotStyle = typesetter->createHotStyle(
+                    style, textColours.link, textColours.linkOver, textColours.linkPressed, topicId);
                 if (formatted < hyperLink.first.first)
                     typesetter->write(style, formatted, hyperLink.first.first);
                 typesetter->write(hotStyle, hyperLink.first.first, hyperLink.first.second);
@@ -228,18 +235,18 @@ namespace MWGui
             std::vector<KeywordSearchT::Match> matches;
             keywordSearch->highlightKeywords(text.begin(), text.end(), matches);
 
-            std::string::const_iterator i = text.begin ();
+            std::string::const_iterator i = text.begin();
             for (KeywordSearchT::Match& match : matches)
             {
                 if (i != match.mBeg)
-                    addTopicLink (typesetter, 0, i - text.begin (), match.mBeg - text.begin ());
+                    addTopicLink(typesetter, 0, i - text.begin(), match.mBeg - text.begin());
 
-                addTopicLink (typesetter, match.mValue, match.mBeg - text.begin (), match.mEnd - text.begin ());
+                addTopicLink(typesetter, match.mValue, match.mBeg - text.begin(), match.mEnd - text.begin());
 
                 i = match.mEnd;
             }
-            if (i != text.end ())
-                addTopicLink (typesetter, 0, i - text.begin (), text.size ());
+            if (i != text.end())
+                addTopicLink(typesetter, 0, i - text.begin(), text.size());
         }
     }
 
@@ -249,10 +256,10 @@ namespace MWGui
 
         BookTypesetter::Style* style = typesetter->createStyle("", textColours.normal, false);
 
-
         if (topicId)
-            style = typesetter->createHotStyle (style, textColours.link, textColours.linkOver, textColours.linkPressed, topicId);
-        typesetter->write (style, begin, end);
+            style = typesetter->createHotStyle(
+                style, textColours.link, textColours.linkOver, textColours.linkPressed, topicId);
+        typesetter->write(style, begin, end);
     }
 
     Message::Message(const std::string& text)
@@ -260,7 +267,8 @@ namespace MWGui
         mText = text;
     }
 
-    void Message::write(BookTypesetter::Ptr typesetter, KeywordSearchT* keywordSearch, std::map<std::string, std::unique_ptr<Link>>& topicLinks) const
+    void Message::write(BookTypesetter::Ptr typesetter, KeywordSearchT* keywordSearch,
+        std::map<std::string, std::unique_ptr<Link>>& topicLinks) const
     {
         const MyGUI::Colour& textColour = MWBase::Environment::get().getWindowManager()->getTextColours().notify;
         BookTypesetter::Style* title = typesetter->createStyle("", textColour, false);
@@ -303,10 +311,10 @@ namespace MWGui
 
         mPersuasionDialog.setVisible(false);
 
-        //History view
+        // History view
         getWidget(mHistory, "History");
 
-        //Topics list
+        // Topics list
         getWidget(mTopicsList, "TopicsList");
         mTopicsList->eventItemSelected += MyGUI::newDelegate(this, &DialogueWindow::onSelectListItem);
 
@@ -314,16 +322,17 @@ namespace MWGui
         mGoodbyeButton->eventMouseButtonClick += MyGUI::newDelegate(this, &DialogueWindow::onByeClicked);
 
         getWidget(mDispositionBar, "Disposition");
-        getWidget(mDispositionText,"DispositionText");
+        getWidget(mDispositionText, "DispositionText");
         getWidget(mScrollBar, "VScroll");
 
         mScrollBar->eventScrollChangePosition += MyGUI::newDelegate(this, &DialogueWindow::onScrollbarMoved);
         mHistory->eventMouseWheel += MyGUI::newDelegate(this, &DialogueWindow::onMouseWheel);
 
-        BookPage::ClickCallback callback = std::bind (&DialogueWindow::notifyLinkClicked, this, std::placeholders::_1);
+        BookPage::ClickCallback callback = std::bind(&DialogueWindow::notifyLinkClicked, this, std::placeholders::_1);
         mHistory->adviseLinkClicked(callback);
 
-        mMainWidget->castType<MyGUI::Window>()->eventWindowChangeCoord += MyGUI::newDelegate(this, &DialogueWindow::onWindowResize);
+        mMainWidget->castType<MyGUI::Window>()->eventWindowChangeCoord
+            += MyGUI::newDelegate(this, &DialogueWindow::onWindowResize);
     }
 
     void DialogueWindow::onTradeComplete()
@@ -349,7 +358,8 @@ namespace MWGui
     void DialogueWindow::onWindowResize(MyGUI::Window* _sender)
     {
         // if the window has only been moved, not resized, we don't need to update
-        if (mCurrentWindowSize == _sender->getSize()) return;
+        if (mCurrentWindowSize == _sender->getSize())
+            return;
 
         mTopicsList->adjustSize();
         updateHistory();
@@ -361,7 +371,8 @@ namespace MWGui
     {
         if (!mScrollBar->getVisible())
             return;
-        mScrollBar->setScrollPosition(std::clamp<int>(mScrollBar->getScrollPosition() - _rel*0.3, 0, mScrollBar->getScrollRange() - 1));
+        mScrollBar->setScrollPosition(
+            std::clamp<int>(mScrollBar->getScrollPosition() - _rel * 0.3, 0, mScrollBar->getScrollRange() - 1));
         onScrollbarMoved(mScrollBar, mScrollBar->getScrollPosition());
     }
 
@@ -380,7 +391,8 @@ namespace MWGui
         if (mGoodbye || dialogueManager->isInChoice())
             return;
 
-        const MWWorld::Store<ESM::GameSetting> &gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
         const std::string& sPersuasion = gmst.find("sPersuasion")->mValue.getString();
         const std::string& sCompanionShare = gmst.find("sCompanionShare")->mValue.getString();
@@ -392,9 +404,9 @@ namespace MWGui
         const std::string& sServiceTrainingTitle = gmst.find("sServiceTrainingTitle")->mValue.getString();
         const std::string& sRepair = gmst.find("sRepair")->mValue.getString();
 
-        if (topic != sPersuasion && topic != sCompanionShare && topic != sBarter 
-         && topic != sSpells && topic != sTravel && topic != sSpellMakingMenuTitle 
-         && topic != sEnchanting && topic != sServiceTrainingTitle && topic != sRepair)
+        if (topic != sPersuasion && topic != sCompanionShare && topic != sBarter && topic != sSpells && topic != sTravel
+            && topic != sSpellMakingMenuTitle && topic != sEnchanting && topic != sServiceTrainingTitle
+            && topic != sRepair)
         {
             onTopicActivated(topic);
             if (mGoodbyeButton->getEnabled())
@@ -406,19 +418,26 @@ namespace MWGui
             MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_Companion, mPtr);
         else if (!dialogueManager->checkServiceRefused(mCallback.get()))
         {
-            if (topic == sBarter && !dialogueManager->checkServiceRefused(mCallback.get(), MWBase::DialogueManager::Barter))
+            if (topic == sBarter
+                && !dialogueManager->checkServiceRefused(mCallback.get(), MWBase::DialogueManager::Barter))
                 MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_Barter, mPtr);
-            else if (topic == sSpells && !dialogueManager->checkServiceRefused(mCallback.get(), MWBase::DialogueManager::Spells))
+            else if (topic == sSpells
+                && !dialogueManager->checkServiceRefused(mCallback.get(), MWBase::DialogueManager::Spells))
                 MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_SpellBuying, mPtr);
-            else if (topic == sTravel && !dialogueManager->checkServiceRefused(mCallback.get(), MWBase::DialogueManager::Travel))
+            else if (topic == sTravel
+                && !dialogueManager->checkServiceRefused(mCallback.get(), MWBase::DialogueManager::Travel))
                 MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_Travel, mPtr);
-            else if (topic == sSpellMakingMenuTitle && !dialogueManager->checkServiceRefused(mCallback.get(), MWBase::DialogueManager::Spellmaking))
+            else if (topic == sSpellMakingMenuTitle
+                && !dialogueManager->checkServiceRefused(mCallback.get(), MWBase::DialogueManager::Spellmaking))
                 MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_SpellCreation, mPtr);
-            else if (topic == sEnchanting && !dialogueManager->checkServiceRefused(mCallback.get(), MWBase::DialogueManager::Enchanting))
+            else if (topic == sEnchanting
+                && !dialogueManager->checkServiceRefused(mCallback.get(), MWBase::DialogueManager::Enchanting))
                 MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_Enchanting, mPtr);
-            else if (topic == sServiceTrainingTitle && !dialogueManager->checkServiceRefused(mCallback.get(), MWBase::DialogueManager::Training))
+            else if (topic == sServiceTrainingTitle
+                && !dialogueManager->checkServiceRefused(mCallback.get(), MWBase::DialogueManager::Training))
                 MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_Training, mPtr);
-            else if (topic == sRepair && !dialogueManager->checkServiceRefused(mCallback.get(), MWBase::DialogueManager::Repair))
+            else if (topic == sRepair
+                && !dialogueManager->checkServiceRefused(mCallback.get(), MWBase::DialogueManager::Repair))
                 MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_MerchantRepair, mPtr);
         }
         else
@@ -440,7 +459,8 @@ namespace MWGui
             mKeywords.clear();
             mTopicsList->clear();
             for (auto& link : mLinks)
-                mDeleteLater.push_back(std::move(link)); // Links are not deleted right away to prevent issues with event handlers
+                mDeleteLater.push_back(
+                    std::move(link)); // Links are not deleted right away to prevent issues with event handlers
             mLinks.clear();
         }
 
@@ -472,8 +492,13 @@ namespace MWGui
 
     void DialogueWindow::restock()
     {
-        MWMechanics::CreatureStats &sellerStats = mPtr.getClass().getCreatureStats(mPtr);
-        float delay = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fBarterGoldResetDelay")->mValue.getFloat();
+        MWMechanics::CreatureStats& sellerStats = mPtr.getClass().getCreatureStats(mPtr);
+        float delay = MWBase::Environment::get()
+                          .getWorld()
+                          ->getStore()
+                          .get<ESM::GameSetting>()
+                          .find("fBarterGoldResetDelay")
+                          ->mValue.getFloat();
 
         // Gold is restocked every 24h
         if (MWBase::Environment::get().getWorld()->getTimeStamp() >= sellerStats.getLastRestockTime() + delay)
@@ -518,10 +543,11 @@ namespace MWGui
         int services = mPtr.getClass().getServices(mPtr);
 
         bool travel = (mPtr.getType() == ESM::NPC::sRecordId && !mPtr.get<ESM::NPC>()->mBase->getTransport().empty())
-                || (mPtr.getType() == ESM::Creature::sRecordId && !mPtr.get<ESM::Creature>()->mBase->getTransport().empty());
+            || (mPtr.getType() == ESM::Creature::sRecordId
+                && !mPtr.get<ESM::Creature>()->mBase->getTransport().empty());
 
-        const MWWorld::Store<ESM::GameSetting> &gmst =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
         if (mPtr.getType() == ESM::NPC::sRecordId)
             mTopicsList->addItem(gmst.find("sPersuasion")->mValue.getString());
@@ -553,8 +579,7 @@ namespace MWGui
         if (mTopicsList->getItemCount() > 0)
             mTopicsList->addSeparator();
 
-
-        for(const auto& keyword : mKeywords)
+        for (const auto& keyword : mKeywords)
         {
             std::string topicId = Misc::StringUtils::lowerCase(keyword);
             mTopicsList->addItem(keyword);
@@ -575,16 +600,16 @@ namespace MWGui
     {
         if (!scrollbar && mScrollBar->getVisible())
         {
-            mHistory->setSize(mHistory->getSize()+MyGUI::IntSize(mScrollBar->getWidth(),0));
+            mHistory->setSize(mHistory->getSize() + MyGUI::IntSize(mScrollBar->getWidth(), 0));
             mScrollBar->setVisible(false);
         }
         if (scrollbar && !mScrollBar->getVisible())
         {
-            mHistory->setSize(mHistory->getSize()-MyGUI::IntSize(mScrollBar->getWidth(),0));
+            mHistory->setSize(mHistory->getSize() - MyGUI::IntSize(mScrollBar->getWidth(), 0));
             mScrollBar->setVisible(true);
         }
 
-        BookTypesetter::Ptr typesetter = BookTypesetter::create (mHistory->getWidth(), std::numeric_limits<int>::max());
+        BookTypesetter::Ptr typesetter = BookTypesetter::create(mHistory->getWidth(), std::numeric_limits<int>::max());
 
         for (const auto& text : mHistoryContents)
             text->write(typesetter, &mKeywordSearch, mTopicLinks);
@@ -603,8 +628,8 @@ namespace MWGui
             mLinks.push_back(std::move(link));
 
             typesetter->lineBreak();
-            BookTypesetter::Style* questionStyle = typesetter->createHotStyle(body, textColours.answer, textColours.answerOver,
-                                                                              textColours.answerPressed, interactiveId);
+            BookTypesetter::Style* questionStyle = typesetter->createHotStyle(
+                body, textColours.answer, textColours.answerOver, textColours.answerPressed, interactiveId);
             typesetter->write(questionStyle, to_utf8_span(choice.first.c_str()));
         }
 
@@ -615,9 +640,14 @@ namespace MWGui
             link->eventActivated += MyGUI::newDelegate(this, &DialogueWindow::onGoodbyeActivated);
             auto interactiveId = TypesetBook::InteractiveId(link.get());
             mLinks.push_back(std::move(link));
-            const std::string& goodbye = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("sGoodbye")->mValue.getString();
-            BookTypesetter::Style* questionStyle = typesetter->createHotStyle(body, textColours.answer, textColours.answerOver,
-                textColours.answerPressed, interactiveId);
+            const std::string& goodbye = MWBase::Environment::get()
+                                             .getWorld()
+                                             ->getStore()
+                                             .get<ESM::GameSetting>()
+                                             .find("sGoodbye")
+                                             ->mValue.getString();
+            BookTypesetter::Style* questionStyle = typesetter->createHotStyle(
+                body, textColours.answer, textColours.answerOver, textColours.answerPressed, interactiveId);
             typesetter->lineBreak();
             typesetter->write(questionStyle, to_utf8_span(goodbye.c_str()));
         }
@@ -632,9 +662,10 @@ namespace MWGui
             mHistory->setSize(MyGUI::IntSize(mHistory->getWidth(), book->getSize().second));
             size_t range = book->getSize().second - viewHeight;
             mScrollBar->setScrollRange(range);
-            mScrollBar->setScrollPosition(range-1);
-            mScrollBar->setTrackSize(static_cast<int>(viewHeight / static_cast<float>(book->getSize().second) * mScrollBar->getLineSize()));
-            onScrollbarMoved(mScrollBar, range-1);
+            mScrollBar->setScrollPosition(range - 1);
+            mScrollBar->setTrackSize(
+                static_cast<int>(viewHeight / static_cast<float>(book->getSize().second) * mScrollBar->getLineSize()));
+            onScrollbarMoved(mScrollBar, range - 1);
         }
         else
         {
@@ -652,12 +683,12 @@ namespace MWGui
         mTopicsList->setEnabled(topicsEnabled);
     }
 
-    void DialogueWindow::notifyLinkClicked (TypesetBook::InteractiveId link)
+    void DialogueWindow::notifyLinkClicked(TypesetBook::InteractiveId link)
     {
         reinterpret_cast<Link*>(link)->activated();
     }
 
-    void DialogueWindow::onTopicActivated(const std::string &topicId)
+    void DialogueWindow::onTopicActivated(const std::string& topicId)
     {
         if (mGoodbye)
             return;
@@ -684,12 +715,12 @@ namespace MWGui
         resetReference();
     }
 
-    void DialogueWindow::onScrollbarMoved(MyGUI::ScrollBar *sender, size_t pos)
+    void DialogueWindow::onScrollbarMoved(MyGUI::ScrollBar* sender, size_t pos)
     {
         mHistory->setPosition(0, static_cast<int>(pos) * -1);
     }
 
-    void DialogueWindow::addResponse(const std::string &title, const std::string &text, bool needMargin)
+    void DialogueWindow::addResponse(const std::string& title, const std::string& text, bool needMargin)
     {
         mHistoryContents.push_back(std::make_unique<Response>(text, title, needMargin));
         updateHistory();
@@ -708,8 +739,11 @@ namespace MWGui
         {
             dispositionVisible = true;
             mDispositionBar->setProgressRange(100);
-            mDispositionBar->setProgressPosition(MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr));
-            mDispositionText->setCaption(MyGUI::utility::toString(MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr))+std::string("/100"));
+            mDispositionBar->setProgressPosition(
+                MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr));
+            mDispositionText->setCaption(
+                MyGUI::utility::toString(MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr))
+                + std::string("/100"));
         }
 
         bool dispositionWasVisible = mDispositionBar->getVisible();
@@ -717,15 +751,15 @@ namespace MWGui
         if (dispositionVisible && !dispositionWasVisible)
         {
             mDispositionBar->setVisible(true);
-            int offset = mDispositionBar->getHeight()+5;
-            mTopicsList->setCoord(mTopicsList->getCoord() + MyGUI::IntCoord(0,offset,0,-offset));
+            int offset = mDispositionBar->getHeight() + 5;
+            mTopicsList->setCoord(mTopicsList->getCoord() + MyGUI::IntCoord(0, offset, 0, -offset));
             mTopicsList->adjustSize();
         }
         else if (!dispositionVisible && dispositionWasVisible)
         {
             mDispositionBar->setVisible(false);
-            int offset = mDispositionBar->getHeight()+5;
-            mTopicsList->setCoord(mTopicsList->getCoord() - MyGUI::IntCoord(0,offset,0,-offset));
+            int offset = mDispositionBar->getHeight() + 5;
+            mTopicsList->setCoord(mTopicsList->getCoord() - MyGUI::IntCoord(0, offset, 0, -offset));
             mTopicsList->adjustSize();
         }
     }
@@ -745,7 +779,7 @@ namespace MWGui
         deleteLater();
 
         if (mChoices != MWBase::Environment::get().getDialogueManager()->getChoices()
-                || mGoodbye != MWBase::Environment::get().getDialogueManager()->isGoodbye())
+            || mGoodbye != MWBase::Environment::get().getDialogueManager()->isGoodbye())
             updateHistory();
     }
 
@@ -787,7 +821,7 @@ namespace MWGui
             return false;
 
         return !actor.getClass().getScript(actor).empty()
-                && actor.getRefData().getLocals().getIntVar(actor.getClass().getScript(actor), "companion");
+            && actor.getRefData().getLocals().getIntVar(actor.getClass().getScript(actor), "companion");
     }
 
 }
diff --git a/apps/openmw/mwgui/dialogue.hpp b/apps/openmw/mwgui/dialogue.hpp
index 27547ca046..632fd9ea09 100644
--- a/apps/openmw/mwgui/dialogue.hpp
+++ b/apps/openmw/mwgui/dialogue.hpp
@@ -3,8 +3,8 @@
 
 #include <memory>
 
-#include "windowbase.hpp"
 #include "referenceinterface.hpp"
+#include "windowbase.hpp"
 
 #include "bookpage.hpp"
 
@@ -27,10 +27,13 @@ namespace MWGui
     {
         DialogueWindow* mWindow;
         bool mNeedMargin;
-        
+
     public:
-        ResponseCallback(DialogueWindow* win, bool needMargin = true) : mWindow(win), mNeedMargin(needMargin)
-        {}
+        ResponseCallback(DialogueWindow* win, bool needMargin = true)
+            : mWindow(win)
+            , mNeedMargin(needMargin)
+        {
+        }
 
         void addResponse(const std::string& title, const std::string& text) override;
 
@@ -64,56 +67,63 @@ namespace MWGui
 
         void adjustAction(MyGUI::Widget* action, int& totalHeight);
 
-        void onCancel (MyGUI::Widget* sender);
-        void onPersuade (MyGUI::Widget* sender);
+        void onCancel(MyGUI::Widget* sender);
+        void onPersuade(MyGUI::Widget* sender);
     };
 
-
     struct Link
     {
         virtual ~Link() {}
-        virtual void activated () = 0;
+        virtual void activated() = 0;
     };
 
     struct Topic : Link
     {
         typedef MyGUI::delegates::CMultiDelegate1<const std::string&> EventHandle_TopicId;
         EventHandle_TopicId eventTopicActivated;
-        Topic(const std::string& id) : mTopicId(id) {}
+        Topic(const std::string& id)
+            : mTopicId(id)
+        {
+        }
         std::string mTopicId;
-        void activated () override;
+        void activated() override;
     };
 
     struct Choice : Link
     {
         typedef MyGUI::delegates::CMultiDelegate1<int> EventHandle_ChoiceId;
         EventHandle_ChoiceId eventChoiceActivated;
-        Choice(int id) : mChoiceId(id) {}
+        Choice(int id)
+            : mChoiceId(id)
+        {
+        }
         int mChoiceId;
-        void activated () override;
+        void activated() override;
     };
 
     struct Goodbye : Link
     {
         typedef MyGUI::delegates::CMultiDelegate0 Event_Activated;
         Event_Activated eventActivated;
-        void activated () override;
+        void activated() override;
     };
 
-    typedef MWDialogue::KeywordSearch <std::string, intptr_t> KeywordSearchT;
+    typedef MWDialogue::KeywordSearch<std::string, intptr_t> KeywordSearchT;
 
     struct DialogueText
     {
         virtual ~DialogueText() {}
-        virtual void write(BookTypesetter::Ptr typesetter, KeywordSearchT* keywordSearch, std::map<std::string, std::unique_ptr<Link>>& topicLinks) const = 0;
+        virtual void write(BookTypesetter::Ptr typesetter, KeywordSearchT* keywordSearch,
+            std::map<std::string, std::unique_ptr<Link>>& topicLinks) const = 0;
         std::string mText;
     };
 
     struct Response : DialogueText
     {
         Response(const std::string& text, const std::string& title = "", bool needMargin = true);
-        void write(BookTypesetter::Ptr typesetter, KeywordSearchT* keywordSearch, std::map<std::string, std::unique_ptr<Link>>& topicLinks) const override;
-        void addTopicLink (BookTypesetter::Ptr typesetter, intptr_t topicId, size_t begin, size_t end) const;
+        void write(BookTypesetter::Ptr typesetter, KeywordSearchT* keywordSearch,
+            std::map<std::string, std::unique_ptr<Link>>& topicLinks) const override;
+        void addTopicLink(BookTypesetter::Ptr typesetter, intptr_t topicId, size_t begin, size_t end) const;
         std::string mTitle;
         bool mNeedMargin;
     };
@@ -121,10 +131,11 @@ namespace MWGui
     struct Message : DialogueText
     {
         Message(const std::string& text);
-        void write(BookTypesetter::Ptr typesetter, KeywordSearchT* keywordSearch, std::map<std::string, std::unique_ptr<Link>>& topicLinks) const override;
+        void write(BookTypesetter::Ptr typesetter, KeywordSearchT* keywordSearch,
+            std::map<std::string, std::unique_ptr<Link>>& topicLinks) const override;
     };
 
-    class DialogueWindow: public WindowBase, public ReferenceInterface
+    class DialogueWindow : public WindowBase, public ReferenceInterface
     {
     public:
         DialogueWindow();
@@ -136,14 +147,14 @@ namespace MWGui
         // Events
         typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
 
-        void notifyLinkClicked (TypesetBook::InteractiveId link);
+        void notifyLinkClicked(TypesetBook::InteractiveId link);
 
         void setPtr(const MWWorld::Ptr& actor) override;
 
         /// @return true if stale keywords were updated successfully
         bool setKeywords(const std::list<std::string>& keyWord);
 
-        void addResponse (const std::string& title, const std::string& text, bool needMargin = true);
+        void addResponse(const std::string& title, const std::string& text, bool needMargin = true);
 
         void addMessageBox(const std::string& text);
 
@@ -167,9 +178,9 @@ namespace MWGui
         void onChoiceActivated(int id);
         void onGoodbyeActivated();
 
-        void onScrollbarMoved (MyGUI::ScrollBar* sender, size_t pos);
+        void onScrollbarMoved(MyGUI::ScrollBar* sender, size_t pos);
 
-        void updateHistory(bool scrollbar=false);
+        void updateHistory(bool scrollbar = false);
 
         void onReferenceUnavailable() override;
 
@@ -182,7 +193,7 @@ namespace MWGui
         std::list<std::string> mKeywords;
 
         std::vector<std::unique_ptr<DialogueText>> mHistoryContents;
-        std::vector<std::pair<std::string, int> > mChoices;
+        std::vector<std::pair<std::string, int>> mChoices;
         bool mGoodbye;
 
         std::vector<std::unique_ptr<Link>> mLinks;
@@ -193,10 +204,10 @@ namespace MWGui
         KeywordSearchT mKeywordSearch;
 
         BookPage* mHistory;
-        Gui::MWList*   mTopicsList;
+        Gui::MWList* mTopicsList;
         MyGUI::ScrollBar* mScrollBar;
         MyGUI::ProgressBar* mDispositionBar;
-        MyGUI::TextBox*     mDispositionText;
+        MyGUI::TextBox* mDispositionText;
         MyGUI::Button* mGoodbyeButton;
 
         PersuasionDialog mPersuasionDialog;
diff --git a/apps/openmw/mwgui/draganddrop.cpp b/apps/openmw/mwgui/draganddrop.cpp
index 543c7f9e1a..a8c63337c2 100644
--- a/apps/openmw/mwgui/draganddrop.cpp
+++ b/apps/openmw/mwgui/draganddrop.cpp
@@ -1,142 +1,145 @@
 #include "draganddrop.hpp"
 
-#include <MyGUI_Gui.h>
 #include <MyGUI_ControllerManager.h>
+#include <MyGUI_Gui.h>
 
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/class.hpp"
 
-#include "sortfilteritemmodel.hpp"
+#include "controllers.hpp"
 #include "inventorywindow.hpp"
-#include "itemwidget.hpp"
 #include "itemview.hpp"
-#include "controllers.hpp"
+#include "itemwidget.hpp"
+#include "sortfilteritemmodel.hpp"
 
 namespace MWGui
 {
 
+    DragAndDrop::DragAndDrop()
+        : mIsOnDragAndDrop(false)
+        , mDraggedWidget(nullptr)
+        , mSourceModel(nullptr)
+        , mSourceView(nullptr)
+        , mSourceSortModel(nullptr)
+        , mDraggedCount(0)
+    {
+    }
 
-DragAndDrop::DragAndDrop()
-    : mIsOnDragAndDrop(false)
-    , mDraggedWidget(nullptr)
-    , mSourceModel(nullptr)
-    , mSourceView(nullptr)
-    , mSourceSortModel(nullptr)
-    , mDraggedCount(0)
-{
-}
-
-void DragAndDrop::startDrag (int index, SortFilterItemModel* sortModel, ItemModel* sourceModel, ItemView* sourceView, int count)
-{
-    mItem = sourceModel->getItem(index);
-    mDraggedCount = count;
-    mSourceModel = sourceModel;
-    mSourceView = sourceView;
-    mSourceSortModel = sortModel;
-
-    // If picking up an item that isn't from the player's inventory, the item gets added to player inventory backend
-    // immediately, even though it's still floating beneath the mouse cursor. A bit counterintuitive,
-    // but this is how it works in vanilla, and not doing so would break quests (BM_beasts for instance).
-    ItemModel* playerModel = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getModel();
-    if (mSourceModel != playerModel)
+    void DragAndDrop::startDrag(
+        int index, SortFilterItemModel* sortModel, ItemModel* sourceModel, ItemView* sourceView, int count)
     {
-        MWWorld::Ptr item = mSourceModel->moveItem(mItem, mDraggedCount, playerModel);
+        mItem = sourceModel->getItem(index);
+        mDraggedCount = count;
+        mSourceModel = sourceModel;
+        mSourceView = sourceView;
+        mSourceSortModel = sortModel;
+
+        // If picking up an item that isn't from the player's inventory, the item gets added to player inventory backend
+        // immediately, even though it's still floating beneath the mouse cursor. A bit counterintuitive,
+        // but this is how it works in vanilla, and not doing so would break quests (BM_beasts for instance).
+        ItemModel* playerModel = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getModel();
+        if (mSourceModel != playerModel)
+        {
+            MWWorld::Ptr item = mSourceModel->moveItem(mItem, mDraggedCount, playerModel);
 
-        playerModel->update();
+            playerModel->update();
 
-        ItemModel::ModelIndex newIndex = -1;
-        for (unsigned int i=0; i<playerModel->getItemCount(); ++i)
-        {
-            if (playerModel->getItem(i).mBase == item)
+            ItemModel::ModelIndex newIndex = -1;
+            for (unsigned int i = 0; i < playerModel->getItemCount(); ++i)
             {
-                newIndex = i;
-                break;
+                if (playerModel->getItem(i).mBase == item)
+                {
+                    newIndex = i;
+                    break;
+                }
             }
+            mItem = playerModel->getItem(newIndex);
+            mSourceModel = playerModel;
+
+            SortFilterItemModel* playerFilterModel
+                = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getSortFilterModel();
+            mSourceSortModel = playerFilterModel;
         }
-        mItem = playerModel->getItem(newIndex);
-        mSourceModel = playerModel;
 
-        SortFilterItemModel* playerFilterModel = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getSortFilterModel();
-        mSourceSortModel = playerFilterModel;
-    }
+        std::string_view sound = mItem.mBase.getClass().getUpSoundId(mItem.mBase);
+        MWBase::Environment::get().getWindowManager()->playSound(sound);
 
-    std::string_view sound = mItem.mBase.getClass().getUpSoundId(mItem.mBase);
-    MWBase::Environment::get().getWindowManager()->playSound (sound);
+        if (mSourceSortModel)
+        {
+            mSourceSortModel->clearDragItems();
+            mSourceSortModel->addDragItem(mItem.mBase, count);
+        }
 
-    if (mSourceSortModel)
-    {
-        mSourceSortModel->clearDragItems();
-        mSourceSortModel->addDragItem(mItem.mBase, count);
-    }
+        ItemWidget* baseWidget = MyGUI::Gui::getInstance().createWidget<ItemWidget>(
+            "MW_ItemIcon", 0, 0, 42, 42, MyGUI::Align::Default, "DragAndDrop");
 
-    ItemWidget* baseWidget = MyGUI::Gui::getInstance().createWidget<ItemWidget>("MW_ItemIcon", 0, 0, 42, 42, MyGUI::Align::Default, "DragAndDrop");
+        Controllers::ControllerFollowMouse* controller
+            = MyGUI::ControllerManager::getInstance()
+                  .createItem(Controllers::ControllerFollowMouse::getClassTypeName())
+                  ->castType<Controllers::ControllerFollowMouse>();
+        MyGUI::ControllerManager::getInstance().addItem(baseWidget, controller);
 
-    Controllers::ControllerFollowMouse* controller =
-            MyGUI::ControllerManager::getInstance().createItem(Controllers::ControllerFollowMouse::getClassTypeName())
-            ->castType<Controllers::ControllerFollowMouse>();
-    MyGUI::ControllerManager::getInstance().addItem(baseWidget, controller);
+        mDraggedWidget = baseWidget;
+        baseWidget->setItem(mItem.mBase);
+        baseWidget->setNeedMouseFocus(false);
+        baseWidget->setCount(count);
 
-    mDraggedWidget = baseWidget;
-    baseWidget->setItem(mItem.mBase);
-    baseWidget->setNeedMouseFocus(false);
-    baseWidget->setCount(count);
+        sourceView->update();
 
-    sourceView->update();
+        MWBase::Environment::get().getWindowManager()->setDragDrop(true);
 
-    MWBase::Environment::get().getWindowManager()->setDragDrop(true);
+        mIsOnDragAndDrop = true;
+    }
 
-    mIsOnDragAndDrop = true;
-}
+    void DragAndDrop::drop(ItemModel* targetModel, ItemView* targetView)
+    {
+        std::string_view sound = mItem.mBase.getClass().getDownSoundId(mItem.mBase);
+        MWBase::Environment::get().getWindowManager()->playSound(sound);
 
-void DragAndDrop::drop(ItemModel *targetModel, ItemView *targetView)
-{
-    std::string_view sound = mItem.mBase.getClass().getDownSoundId(mItem.mBase);
-    MWBase::Environment::get().getWindowManager()->playSound(sound);
+        // We can't drop a conjured item to the ground; the target container should always be the source container
+        if (mItem.mFlags & ItemStack::Flag_Bound && targetModel != mSourceModel)
+        {
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sBarterDialog12}");
+            return;
+        }
 
-    // We can't drop a conjured item to the ground; the target container should always be the source container
-    if (mItem.mFlags & ItemStack::Flag_Bound && targetModel != mSourceModel)
-    {
-        MWBase::Environment::get().getWindowManager()->messageBox("#{sBarterDialog12}");
-        return;
-    }
+        // If item is dropped where it was taken from, we don't need to do anything -
+        // otherwise, do the transfer
+        if (targetModel != mSourceModel)
+        {
+            mSourceModel->moveItem(mItem, mDraggedCount, targetModel);
+        }
 
-    // If item is dropped where it was taken from, we don't need to do anything -
-    // otherwise, do the transfer
-    if (targetModel != mSourceModel)
-    {
-        mSourceModel->moveItem(mItem, mDraggedCount, targetModel);
-    }
+        mSourceModel->update();
 
-    mSourceModel->update();
+        finish();
+        if (targetView)
+            targetView->update();
 
-    finish();
-    if (targetView)
-        targetView->update();
+        MWBase::Environment::get().getWindowManager()->getInventoryWindow()->updateItemView();
 
-    MWBase::Environment::get().getWindowManager()->getInventoryWindow()->updateItemView();
+        // We need to update the view since an other item could be auto-equipped.
+        mSourceView->update();
+    }
 
-    // We need to update the view since an other item could be auto-equipped.
-    mSourceView->update();
-}
+    void DragAndDrop::onFrame()
+    {
+        if (mIsOnDragAndDrop && mItem.mBase.getRefData().getCount() == 0)
+            finish();
+    }
 
-void DragAndDrop::onFrame()
-{
-    if (mIsOnDragAndDrop && mItem.mBase.getRefData().getCount() == 0)
-        finish();
-}
+    void DragAndDrop::finish()
+    {
+        mIsOnDragAndDrop = false;
+        mSourceSortModel->clearDragItems();
+        // since mSourceView doesn't get updated in drag()
+        MWBase::Environment::get().getWindowManager()->getInventoryWindow()->updateItemView();
 
-void DragAndDrop::finish()
-{
-    mIsOnDragAndDrop = false;
-    mSourceSortModel->clearDragItems();
-    // since mSourceView doesn't get updated in drag()
-    MWBase::Environment::get().getWindowManager()->getInventoryWindow()->updateItemView();
-
-    MyGUI::Gui::getInstance().destroyWidget(mDraggedWidget);
-    mDraggedWidget = nullptr;
-    MWBase::Environment::get().getWindowManager()->setDragDrop(false);
-}
+        MyGUI::Gui::getInstance().destroyWidget(mDraggedWidget);
+        mDraggedWidget = nullptr;
+        MWBase::Environment::get().getWindowManager()->setDragDrop(false);
+    }
 
 }
diff --git a/apps/openmw/mwgui/draganddrop.hpp b/apps/openmw/mwgui/draganddrop.hpp
index dff8cd73c0..fab7f30d75 100644
--- a/apps/openmw/mwgui/draganddrop.hpp
+++ b/apps/openmw/mwgui/draganddrop.hpp
@@ -27,8 +27,9 @@ namespace MWGui
 
         DragAndDrop();
 
-        void startDrag (int index, SortFilterItemModel* sortModel, ItemModel* sourceModel, ItemView* sourceView, int count);
-        void drop (ItemModel* targetModel, ItemView* targetView);
+        void startDrag(
+            int index, SortFilterItemModel* sortModel, ItemModel* sourceModel, ItemView* sourceView, int count);
+        void drop(ItemModel* targetModel, ItemView* targetView);
         void onFrame();
 
         void finish();
diff --git a/apps/openmw/mwgui/enchantingdialog.cpp b/apps/openmw/mwgui/enchantingdialog.cpp
index 1e340b4a99..d12f1ce6ab 100644
--- a/apps/openmw/mwgui/enchantingdialog.cpp
+++ b/apps/openmw/mwgui/enchantingdialog.cpp
@@ -3,19 +3,19 @@
 #include <iomanip>
 
 #include <MyGUI_Button.h>
-#include <MyGUI_ScrollView.h>
 #include <MyGUI_EditBox.h>
+#include <MyGUI_ScrollView.h>
 
-#include <components/widgets/list.hpp>
 #include <components/misc/strings/format.hpp>
 #include <components/settings/settings.hpp>
+#include <components/widgets/list.hpp>
 
 #include <components/esm3/loadgmst.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
@@ -32,7 +32,6 @@
 namespace MWGui
 {
 
-
     EnchantingDialog::EnchantingDialog()
         : WindowBase("openmw_enchanting_dialog.layout")
         , EffectEditorBase(EffectEditorBase::Enchanting)
@@ -69,7 +68,7 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mName);
     }
 
-    void EnchantingDialog::setSoulGem(const MWWorld::Ptr &gem)
+    void EnchantingDialog::setSoulGem(const MWWorld::Ptr& gem)
     {
         if (gem.isEmpty())
         {
@@ -80,13 +79,13 @@ namespace MWGui
         else
         {
             mSoulBox->setItem(gem);
-            mSoulBox->setUserString ("ToolTipType", "ItemPtr");
+            mSoulBox->setUserString("ToolTipType", "ItemPtr");
             mSoulBox->setUserData(MWWorld::Ptr(gem));
             mEnchanting.setSoulGem(gem);
         }
     }
 
-    void EnchantingDialog::setItem(const MWWorld::Ptr &item)
+    void EnchantingDialog::setItem(const MWWorld::Ptr& item)
     {
         if (item.isEmpty())
         {
@@ -99,7 +98,7 @@ namespace MWGui
             std::string_view name = item.getClass().getName(item);
             mName->setCaption(toUString(name));
             mItemBox->setItem(item);
-            mItemBox->setUserString ("ToolTipType", "ItemPtr");
+            mItemBox->setUserString("ToolTipType", "ItemPtr");
             mItemBox->setUserData(MWWorld::Ptr(item));
             mEnchanting.setOldItem(item);
         }
@@ -107,34 +106,39 @@ namespace MWGui
 
     void EnchantingDialog::updateLabels()
     {
-        mEnchantmentPoints->setCaption(std::to_string(static_cast<int>(mEnchanting.getEnchantPoints(false))) + " / " + std::to_string(mEnchanting.getMaxEnchantValue()));
+        mEnchantmentPoints->setCaption(std::to_string(static_cast<int>(mEnchanting.getEnchantPoints(false))) + " / "
+            + std::to_string(mEnchanting.getMaxEnchantValue()));
         mCharge->setCaption(std::to_string(mEnchanting.getGemCharge()));
         mSuccessChance->setCaption(std::to_string(std::clamp(mEnchanting.getEnchantChance(), 0, 100)));
         mCastCost->setCaption(std::to_string(mEnchanting.getEffectiveCastCost()));
         mPrice->setCaption(std::to_string(mEnchanting.getEnchantPrice()));
 
-        switch(mEnchanting.getCastStyle())
+        switch (mEnchanting.getCastStyle())
         {
             case ESM::Enchantment::CastOnce:
-                mTypeButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sItemCastOnce", "Cast Once")));
+                mTypeButton->setCaption(toUString(
+                    MWBase::Environment::get().getWindowManager()->getGameSettingString("sItemCastOnce", "Cast Once")));
                 setConstantEffect(false);
                 break;
             case ESM::Enchantment::WhenStrikes:
-                mTypeButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sItemCastWhenStrikes", "When Strikes")));
+                mTypeButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString(
+                    "sItemCastWhenStrikes", "When Strikes")));
                 setConstantEffect(false);
                 break;
             case ESM::Enchantment::WhenUsed:
-                mTypeButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sItemCastWhenUsed", "When Used")));
+                mTypeButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString(
+                    "sItemCastWhenUsed", "When Used")));
                 setConstantEffect(false);
                 break;
             case ESM::Enchantment::ConstantEffect:
-                mTypeButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sItemCastConstant", "Cast Constant")));
+                mTypeButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString(
+                    "sItemCastConstant", "Cast Constant")));
                 setConstantEffect(true);
                 break;
         }
     }
 
-    void EnchantingDialog::setPtr (const MWWorld::Ptr& ptr)
+    void EnchantingDialog::setPtr(const MWWorld::Ptr& ptr)
     {
         mName->setCaption("");
 
@@ -154,7 +158,7 @@ namespace MWGui
             mEnchanting.setSelfEnchanting(true);
             mEnchanting.setEnchanter(MWMechanics::getPlayer());
             mBuyButton->setCaptionWithReplacing("#{sCreate}");
-            bool enabled = Settings::Manager::getBool("show enchant chance","Game");
+            bool enabled = Settings::Manager::getBool("show enchant chance", "Game");
             mChanceLayout->setVisible(enabled);
             mPtr = MWMechanics::getPlayer();
             setSoulGem(ptr);
@@ -163,13 +167,13 @@ namespace MWGui
         }
 
         setItem(MWWorld::Ptr());
-        startEditing ();
+        startEditing();
         updateLabels();
     }
 
-    void EnchantingDialog::onReferenceUnavailable ()
+    void EnchantingDialog::onReferenceUnavailable()
     {
-        MWBase::Environment::get().getWindowManager()->removeGuiMode (GM_Enchanting);
+        MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Enchanting);
         resetReference();
     }
 
@@ -187,7 +191,7 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Enchanting);
     }
 
-    void EnchantingDialog::onSelectItem(MyGUI::Widget *sender)
+    void EnchantingDialog::onSelectItem(MyGUI::Widget* sender)
     {
         if (mEnchanting.getOldItem().isEmpty())
         {
@@ -225,9 +229,9 @@ namespace MWGui
         mItemSelectionDialog->setVisible(false);
 
         mEnchanting.setSoulGem(item);
-        if(mEnchanting.getGemCharge()==0)
+        if (mEnchanting.getGemCharge() == 0)
         {
-            MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage32}");
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage32}");
             return;
         }
 
@@ -241,7 +245,7 @@ namespace MWGui
         mItemSelectionDialog->setVisible(false);
     }
 
-    void EnchantingDialog::onSelectSoul(MyGUI::Widget *sender)
+    void EnchantingDialog::onSelectSoul(MyGUI::Widget* sender)
     {
         if (mEnchanting.getGem().isEmpty())
         {
@@ -252,7 +256,7 @@ namespace MWGui
             mItemSelectionDialog->openContainer(MWMechanics::getPlayer());
             mItemSelectionDialog->setFilter(SortFilterItemModel::Filter_OnlyChargedSoulstones);
 
-            //MWBase::Environment::get().getWindowManager()->messageBox("#{sInventorySelectNoSoul}");
+            // MWBase::Environment::get().getWindowManager()->messageBox("#{sInventorySelectNoSoul}");
         }
         else
         {
@@ -263,7 +267,7 @@ namespace MWGui
         }
     }
 
-    void EnchantingDialog::notifyEffectsChanged ()
+    void EnchantingDialog::notifyEffectsChanged()
     {
         mEffectList.mList = mEffects;
         mEnchanting.setEffect(mEffectList);
@@ -277,7 +281,7 @@ namespace MWGui
         updateEffectsView();
     }
 
-    void EnchantingDialog::onAccept(MyGUI::EditBox *sender)
+    void EnchantingDialog::onAccept(MyGUI::EditBox* sender)
     {
         onBuyButtonClicked(sender);
 
@@ -289,31 +293,31 @@ namespace MWGui
     {
         if (mEffects.size() <= 0)
         {
-            MWBase::Environment::get().getWindowManager()->messageBox ("#{sEnchantmentMenu11}");
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sEnchantmentMenu11}");
             return;
         }
 
-        if (mName->getCaption ().empty())
+        if (mName->getCaption().empty())
         {
-            MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage10}");
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage10}");
             return;
         }
 
         if (mEnchanting.soulEmpty())
         {
-            MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage52}");
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage52}");
             return;
         }
 
         if (mEnchanting.itemEmpty())
         {
-            MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage11}");
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage11}");
             return;
         }
 
         if (static_cast<int>(mEnchanting.getEnchantPoints(false)) > mEnchanting.getMaxEnchantValue())
         {
-            MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage29}");
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage29}");
             return;
         }
 
@@ -324,25 +328,32 @@ namespace MWGui
         int playerGold = player.getClass().getContainerStore(player).count(MWWorld::ContainerStore::sGoldId);
         if (mPtr != player && mEnchanting.getEnchantPrice() > playerGold)
         {
-            MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage18}");
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage18}");
             return;
         }
 
         // check if the player is attempting to use a soulstone or item that was stolen from this actor
         if (mPtr != player)
         {
-            for (int i=0; i<2; ++i)
+            for (int i = 0; i < 2; ++i)
             {
                 MWWorld::Ptr item = (i == 0) ? mEnchanting.getOldItem() : mEnchanting.getGem();
-                if (MWBase::Environment::get().getMechanicsManager()->isItemStolenFrom(item.getCellRef().getRefId(), mPtr))
+                if (MWBase::Environment::get().getMechanicsManager()->isItemStolenFrom(
+                        item.getCellRef().getRefId(), mPtr))
                 {
-                    std::string msg = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("sNotifyMessage49")->mValue.getString();
+                    std::string msg = MWBase::Environment::get()
+                                          .getWorld()
+                                          ->getStore()
+                                          .get<ESM::GameSetting>()
+                                          .find("sNotifyMessage49")
+                                          ->mValue.getString();
                     msg = Misc::StringUtils::format(msg, item.getClass().getName(item));
                     MWBase::Environment::get().getWindowManager()->messageBox(msg);
 
-                    MWBase::Environment::get().getMechanicsManager()->confiscateStolenItemToOwner(player, item, mPtr, 1);
+                    MWBase::Environment::get().getMechanicsManager()->confiscateStolenItemToOwner(
+                        player, item, mPtr, 1);
 
-                    MWBase::Environment::get().getWindowManager()->removeGuiMode (GM_Enchanting);
+                    MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Enchanting);
                     MWBase::Environment::get().getWindowManager()->exitCurrentGuiMode();
                     return;
                 }
@@ -351,16 +362,16 @@ namespace MWGui
 
         int result = mEnchanting.create();
 
-        if(result==1)
+        if (result == 1)
         {
             MWBase::Environment::get().getWindowManager()->playSound("enchant success");
-            MWBase::Environment::get().getWindowManager()->messageBox ("#{sEnchantmentMenu12}");
-            MWBase::Environment::get().getWindowManager()->removeGuiMode (GM_Enchanting);
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sEnchantmentMenu12}");
+            MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Enchanting);
         }
         else
         {
             MWBase::Environment::get().getWindowManager()->playSound("enchant fail");
-            MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage34}");
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage34}");
             if (!mEnchanting.getGem().isEmpty() && !mEnchanting.getGem().getRefData().getCount())
             {
                 setSoulGem(MWWorld::Ptr());
diff --git a/apps/openmw/mwgui/enchantingdialog.hpp b/apps/openmw/mwgui/enchantingdialog.hpp
index 14157d800e..f9d891b2dc 100644
--- a/apps/openmw/mwgui/enchantingdialog.hpp
+++ b/apps/openmw/mwgui/enchantingdialog.hpp
@@ -24,8 +24,8 @@ namespace MWGui
         void onFrame(float dt) override { checkReferenceAvailable(); }
         void clear() override { resetReference(); }
 
-        void setSoulGem (const MWWorld::Ptr& gem);
-        void setItem (const MWWorld::Ptr& item);
+        void setSoulGem(const MWWorld::Ptr& gem);
+        void setItem(const MWWorld::Ptr& item);
 
         /// Actor Ptr: buy enchantment from this actor
         /// Soulgem Ptr: player self-enchant
@@ -38,8 +38,8 @@ namespace MWGui
         void notifyEffectsChanged() override;
 
         void onCancelButtonClicked(MyGUI::Widget* sender);
-        void onSelectItem (MyGUI::Widget* sender);
-        void onSelectSoul (MyGUI::Widget* sender);
+        void onSelectItem(MyGUI::Widget* sender);
+        void onSelectSoul(MyGUI::Widget* sender);
 
         void onItemSelected(MWWorld::Ptr item);
         void onItemCancel();
diff --git a/apps/openmw/mwgui/exposedwindow.cpp b/apps/openmw/mwgui/exposedwindow.cpp
index 90cfa09d34..36b47d98f2 100644
--- a/apps/openmw/mwgui/exposedwindow.cpp
+++ b/apps/openmw/mwgui/exposedwindow.cpp
@@ -2,18 +2,18 @@
 
 namespace MWGui
 {
-    MyGUI::VectorWidgetPtr Window::getSkinWidgetsByName (const std::string &name)
+    MyGUI::VectorWidgetPtr Window::getSkinWidgetsByName(const std::string& name)
     {
-        return MyGUI::Widget::getSkinWidgetsByName (name);
+        return MyGUI::Widget::getSkinWidgetsByName(name);
     }
 
-    MyGUI::Widget* Window::getSkinWidget(const std::string & _name, bool _throw)
+    MyGUI::Widget* Window::getSkinWidget(const std::string& _name, bool _throw)
     {
-        MyGUI::VectorWidgetPtr widgets = getSkinWidgetsByName (_name);
+        MyGUI::VectorWidgetPtr widgets = getSkinWidgetsByName(_name);
 
         if (widgets.empty())
         {
-            MYGUI_ASSERT( ! _throw, "widget name '" << _name << "' not found in skin of layout '" << getName() << "'");
+            MYGUI_ASSERT(!_throw, "widget name '" << _name << "' not found in skin of layout '" << getName() << "'");
             return nullptr;
         }
         else
diff --git a/apps/openmw/mwgui/exposedwindow.hpp b/apps/openmw/mwgui/exposedwindow.hpp
index f1f5d3c2f8..d192a3db01 100644
--- a/apps/openmw/mwgui/exposedwindow.hpp
+++ b/apps/openmw/mwgui/exposedwindow.hpp
@@ -14,13 +14,12 @@ namespace MWGui
         MYGUI_RTTI_DERIVED(Window)
 
     public:
-        MyGUI::VectorWidgetPtr getSkinWidgetsByName (const std::string &name);
+        MyGUI::VectorWidgetPtr getSkinWidgetsByName(const std::string& name);
 
-        MyGUI::Widget* getSkinWidget(const std::string & _name, bool _throw = true);
+        MyGUI::Widget* getSkinWidget(const std::string& _name, bool _throw = true);
         ///< Get a widget defined in the inner skin of this window.
     };
 
 }
 
 #endif
-
diff --git a/apps/openmw/mwgui/formatting.cpp b/apps/openmw/mwgui/formatting.cpp
index cc3c125552..474615ab2d 100644
--- a/apps/openmw/mwgui/formatting.cpp
+++ b/apps/openmw/mwgui/formatting.cpp
@@ -1,493 +1,501 @@
 #include "formatting.hpp"
 
+#include <MyGUI_EditBox.h>
 #include <MyGUI_EditText.h>
 #include <MyGUI_Gui.h>
-#include <MyGUI_EditBox.h>
 #include <MyGUI_ImageBox.h>
 
 #include <components/debug/debuglog.hpp>
+#include <components/fontloader/fontloader.hpp>
 #include <components/interpreter/defines.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/misc/strings/algorithm.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/vfs/manager.hpp>
-#include <components/misc/strings/algorithm.hpp>
-#include <components/misc/resourcehelpers.hpp>
-#include <components/fontloader/fontloader.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwscript/interpretercontext.hpp"
 
 namespace MWGui::Formatting
+{
+    /* BookTextParser */
+    BookTextParser::BookTextParser(const std::string& text)
+        : mIndex(0)
+        , mText(text)
+        , mIgnoreNewlineTags(true)
+        , mIgnoreLineEndings(true)
+        , mClosingTag(false)
     {
-        /* BookTextParser */
-        BookTextParser::BookTextParser(const std::string & text)
-            : mIndex(0), mText(text), mIgnoreNewlineTags(true), mIgnoreLineEndings(true), mClosingTag(false)
+        MWScript::InterpreterContext interpreterContext(
+            nullptr, MWWorld::Ptr()); // empty arguments, because there is no locals or actor
+        mText = Interpreter::fixDefinesBook(mText, interpreterContext);
+
+        Misc::StringUtils::replaceAll(mText, "\r", "");
+
+        // vanilla game does not show any text after the last EOL tag.
+        const std::string lowerText = Misc::StringUtils::lowerCase(mText);
+        size_t brIndex = lowerText.rfind("<br>");
+        size_t pIndex = lowerText.rfind("<p>");
+        mPlainTextEnd = 0;
+        if (brIndex != pIndex)
         {
-            MWScript::InterpreterContext interpreterContext(nullptr, MWWorld::Ptr()); // empty arguments, because there is no locals or actor
-            mText = Interpreter::fixDefinesBook(mText, interpreterContext);
-
-            Misc::StringUtils::replaceAll(mText, "\r", "");
-
-            // vanilla game does not show any text after the last EOL tag.
-            const std::string lowerText = Misc::StringUtils::lowerCase(mText);
-            size_t brIndex = lowerText.rfind("<br>");
-            size_t pIndex = lowerText.rfind("<p>");
-            mPlainTextEnd = 0;
-            if (brIndex != pIndex)
-            {
-                if (brIndex != std::string::npos && pIndex != std::string::npos)
-                    mPlainTextEnd = std::max(brIndex, pIndex);
-                else if (brIndex != std::string::npos)
-                    mPlainTextEnd = brIndex;
-                else
-                    mPlainTextEnd = pIndex;
-            }
-
-            registerTag("br", Event_BrTag);
-            registerTag("p", Event_PTag);
-            registerTag("img", Event_ImgTag);
-            registerTag("div", Event_DivTag);
-            registerTag("font", Event_FontTag);
+            if (brIndex != std::string::npos && pIndex != std::string::npos)
+                mPlainTextEnd = std::max(brIndex, pIndex);
+            else if (brIndex != std::string::npos)
+                mPlainTextEnd = brIndex;
+            else
+                mPlainTextEnd = pIndex;
         }
 
-        void BookTextParser::registerTag(const std::string & tag, BookTextParser::Events type)
-        {
-            mTagTypes[tag] = type;
-        }
+        registerTag("br", Event_BrTag);
+        registerTag("p", Event_PTag);
+        registerTag("img", Event_ImgTag);
+        registerTag("div", Event_DivTag);
+        registerTag("font", Event_FontTag);
+    }
 
-        std::string BookTextParser::getReadyText() const
-        {
-            return mReadyText;
-        }
+    void BookTextParser::registerTag(const std::string& tag, BookTextParser::Events type)
+    {
+        mTagTypes[tag] = type;
+    }
+
+    std::string BookTextParser::getReadyText() const
+    {
+        return mReadyText;
+    }
 
-        BookTextParser::Events BookTextParser::next()
+    BookTextParser::Events BookTextParser::next()
+    {
+        while (mIndex < mText.size())
         {
-            while (mIndex < mText.size())
+            char ch = mText[mIndex];
+            if (ch == '<')
             {
-                char ch = mText[mIndex];
-                if (ch == '<')
+                const size_t tagStart = mIndex + 1;
+                const size_t tagEnd = mText.find('>', tagStart);
+                if (tagEnd == std::string::npos)
+                    throw std::runtime_error("BookTextParser Error: Tag is not terminated");
+                parseTag(mText.substr(tagStart, tagEnd - tagStart));
+                mIndex = tagEnd;
+
+                if (mTagTypes.find(mTag) != mTagTypes.end())
                 {
-                    const size_t tagStart = mIndex + 1;
-                    const size_t tagEnd = mText.find('>', tagStart);
-                    if (tagEnd == std::string::npos)
-                        throw std::runtime_error("BookTextParser Error: Tag is not terminated");
-                    parseTag(mText.substr(tagStart, tagEnd - tagStart));
-                    mIndex = tagEnd;
-
-                    if (mTagTypes.find(mTag) != mTagTypes.end())
-                    {
-                        Events type = mTagTypes.at(mTag);
+                    Events type = mTagTypes.at(mTag);
 
-                        if (type == Event_BrTag || type == Event_PTag)
+                    if (type == Event_BrTag || type == Event_PTag)
+                    {
+                        if (!mIgnoreNewlineTags)
                         {
-                            if (!mIgnoreNewlineTags)
+                            if (type == Event_BrTag)
+                                mBuffer.push_back('\n');
+                            else
                             {
-                                if (type == Event_BrTag)
-                                    mBuffer.push_back('\n');
-                                else
-                                {
-                                    mBuffer.append("\n\n");
-                                }
+                                mBuffer.append("\n\n");
                             }
-                            mIgnoreLineEndings = true;
-                        }
-                        else
-                            flushBuffer();
-
-                        if (type == Event_ImgTag)
-                        {
-                            mIgnoreNewlineTags = false;
                         }
-
-                        ++mIndex;
-                        return type;
+                        mIgnoreLineEndings = true;
                     }
-                }
-                else
-                {
-                    if (!mIgnoreLineEndings || ch != '\n')
+                    else
+                        flushBuffer();
+
+                    if (type == Event_ImgTag)
                     {
-                        if (mIndex < mPlainTextEnd)
-                            mBuffer.push_back(ch);
-                        mIgnoreLineEndings = false;
                         mIgnoreNewlineTags = false;
                     }
-                }
 
-                ++mIndex;
+                    ++mIndex;
+                    return type;
+                }
+            }
+            else
+            {
+                if (!mIgnoreLineEndings || ch != '\n')
+                {
+                    if (mIndex < mPlainTextEnd)
+                        mBuffer.push_back(ch);
+                    mIgnoreLineEndings = false;
+                    mIgnoreNewlineTags = false;
+                }
             }
 
-            flushBuffer();
-            return Event_EOF;
+            ++mIndex;
         }
 
-        void BookTextParser::flushBuffer()
-        {
-            mReadyText = mBuffer;
-            mBuffer.clear();
-        }
+        flushBuffer();
+        return Event_EOF;
+    }
 
-        const BookTextParser::Attributes & BookTextParser::getAttributes() const
-        {
-            return mAttributes;
-        }
+    void BookTextParser::flushBuffer()
+    {
+        mReadyText = mBuffer;
+        mBuffer.clear();
+    }
+
+    const BookTextParser::Attributes& BookTextParser::getAttributes() const
+    {
+        return mAttributes;
+    }
 
-        bool BookTextParser::isClosingTag() const
+    bool BookTextParser::isClosingTag() const
+    {
+        return mClosingTag;
+    }
+
+    void BookTextParser::parseTag(std::string tag)
+    {
+        size_t tagNameEndPos = tag.find(' ');
+        mAttributes.clear();
+        mTag = tag.substr(0, tagNameEndPos);
+        Misc::StringUtils::lowerCaseInPlace(mTag);
+        if (mTag.empty())
+            return;
+
+        mClosingTag = (mTag[0] == '/');
+        if (mClosingTag)
         {
-            return mClosingTag;
+            mTag.erase(mTag.begin());
+            return;
         }
 
-        void BookTextParser::parseTag(std::string tag)
+        if (tagNameEndPos == std::string::npos)
+            return;
+        tag.erase(0, tagNameEndPos + 1);
+
+        while (!tag.empty())
         {
-            size_t tagNameEndPos = tag.find(' ');
-            mAttributes.clear();
-            mTag = tag.substr(0, tagNameEndPos);
-            Misc::StringUtils::lowerCaseInPlace(mTag);
-            if (mTag.empty())
+            size_t sepPos = tag.find('=');
+            if (sepPos == std::string::npos)
                 return;
 
-            mClosingTag = (mTag[0] == '/');
-            if (mClosingTag)
-            {
-                mTag.erase(mTag.begin());
-                return;
-            }
+            std::string key = tag.substr(0, sepPos);
+            Misc::StringUtils::lowerCaseInPlace(key);
+            tag.erase(0, sepPos + 1);
+
+            std::string value;
 
-            if (tagNameEndPos == std::string::npos)
+            if (tag.empty())
                 return;
-            tag.erase(0, tagNameEndPos+1);
 
-            while (!tag.empty())
+            if (tag[0] == '"')
             {
-                size_t sepPos = tag.find('=');
-                if (sepPos == std::string::npos)
-                    return;
-
-                std::string key = tag.substr(0, sepPos);
-                Misc::StringUtils::lowerCaseInPlace(key);
-                tag.erase(0, sepPos+1);
-
-                std::string value;
-
-                if (tag.empty())
-                    return;
-
-                if (tag[0] == '"')
+                size_t quoteEndPos = tag.find('"', 1);
+                if (quoteEndPos == std::string::npos)
+                    throw std::runtime_error("BookTextParser Error: Missing end quote in tag");
+                value = tag.substr(1, quoteEndPos - 1);
+                tag.erase(0, quoteEndPos + 2);
+            }
+            else
+            {
+                size_t valEndPos = tag.find(' ');
+                if (valEndPos == std::string::npos)
                 {
-                    size_t quoteEndPos = tag.find('"', 1);
-                    if (quoteEndPos == std::string::npos)
-                        throw std::runtime_error("BookTextParser Error: Missing end quote in tag");
-                    value = tag.substr(1, quoteEndPos-1);
-                    tag.erase(0, quoteEndPos+2);
+                    value = tag;
+                    tag.erase();
                 }
                 else
                 {
-                    size_t valEndPos = tag.find(' ');
-                    if (valEndPos == std::string::npos)
-                    {
-                        value = tag;
-                        tag.erase();
-                    }
-                    else
-                    {
-                        value = tag.substr(0, valEndPos);
-                        tag.erase(0, valEndPos+1);
-                    }
+                    value = tag.substr(0, valEndPos);
+                    tag.erase(0, valEndPos + 1);
                 }
-
-                mAttributes[key] = value;
             }
+
+            mAttributes[key] = value;
         }
+    }
 
-        /* BookFormatter */
-        Paginator::Pages BookFormatter::markupToWidget(MyGUI::Widget * parent, const std::string & markup, const int pageWidth, const int pageHeight)
-        {
-            Paginator pag(pageWidth, pageHeight);
+    /* BookFormatter */
+    Paginator::Pages BookFormatter::markupToWidget(
+        MyGUI::Widget* parent, const std::string& markup, const int pageWidth, const int pageHeight)
+    {
+        Paginator pag(pageWidth, pageHeight);
 
-            while (parent->getChildCount())
-            {
-                MyGUI::Gui::getInstance().destroyWidget(parent->getChildAt(0));
-            }
+        while (parent->getChildCount())
+        {
+            MyGUI::Gui::getInstance().destroyWidget(parent->getChildAt(0));
+        }
 
-            mTextStyle = TextStyle();
-            mBlockStyle = BlockStyle();
+        mTextStyle = TextStyle();
+        mBlockStyle = BlockStyle();
 
-            MyGUI::Widget * paper = parent->createWidget<MyGUI::Widget>("Widget", MyGUI::IntCoord(0, 0, pag.getPageWidth(), pag.getPageHeight()), MyGUI::Align::Left | MyGUI::Align::Top);
-            paper->setNeedMouseFocus(false);
+        MyGUI::Widget* paper = parent->createWidget<MyGUI::Widget>("Widget",
+            MyGUI::IntCoord(0, 0, pag.getPageWidth(), pag.getPageHeight()), MyGUI::Align::Left | MyGUI::Align::Top);
+        paper->setNeedMouseFocus(false);
 
-            BookTextParser parser(markup);
+        BookTextParser parser(markup);
 
-            bool brBeforeLastTag = false;
-            bool isPrevImg = false;
-            for (;;)
-            {
-                BookTextParser::Events event = parser.next();
-                if (event == BookTextParser::Event_BrTag || event == BookTextParser::Event_PTag)
-                    continue;
+        bool brBeforeLastTag = false;
+        bool isPrevImg = false;
+        for (;;)
+        {
+            BookTextParser::Events event = parser.next();
+            if (event == BookTextParser::Event_BrTag || event == BookTextParser::Event_PTag)
+                continue;
 
-                std::string plainText = parser.getReadyText();
+            std::string plainText = parser.getReadyText();
 
-                // for cases when linebreaks are used to cause a shift to the next page
-                // if the split text block ends in an empty line, proceeding text block(s) should have leading empty lines removed
-                if (pag.getIgnoreLeadingEmptyLines())
+            // for cases when linebreaks are used to cause a shift to the next page
+            // if the split text block ends in an empty line, proceeding text block(s) should have leading empty lines
+            // removed
+            if (pag.getIgnoreLeadingEmptyLines())
+            {
+                while (!plainText.empty())
                 {
-                    while (!plainText.empty())
+                    if (plainText[0] == '\n')
+                        plainText.erase(plainText.begin());
+                    else
                     {
-                        if (plainText[0] == '\n')
-                            plainText.erase(plainText.begin());
-                        else
-                        {
-                            pag.setIgnoreLeadingEmptyLines(false);
-                            break;
-                        }
+                        pag.setIgnoreLeadingEmptyLines(false);
+                        break;
                     }
                 }
+            }
 
-                if (plainText.empty())
-                    brBeforeLastTag = true;
-                else
-                {
-                    // Each block of text (between two tags / boundary and tag) will be displayed in a separate editbox widget,
-                    // which means an additional linebreak will be created between them.
-                    // ^ This is not what vanilla MW assumes, so we must deal with line breaks around tags appropriately.
-                    bool brAtStart = (plainText[0] == '\n');
-                    bool brAtEnd = (plainText[plainText.size()-1] == '\n');
-
-                    if (brAtStart && !brBeforeLastTag && !isPrevImg)
-                        plainText.erase(plainText.begin());
+            if (plainText.empty())
+                brBeforeLastTag = true;
+            else
+            {
+                // Each block of text (between two tags / boundary and tag) will be displayed in a separate editbox
+                // widget, which means an additional linebreak will be created between them. ^ This is not what vanilla
+                // MW assumes, so we must deal with line breaks around tags appropriately.
+                bool brAtStart = (plainText[0] == '\n');
+                bool brAtEnd = (plainText[plainText.size() - 1] == '\n');
 
-                    if (plainText.size() && brAtEnd)
-                        plainText.erase(plainText.end()-1);
+                if (brAtStart && !brBeforeLastTag && !isPrevImg)
+                    plainText.erase(plainText.begin());
 
-                    if (!plainText.empty() || brBeforeLastTag || isPrevImg)
-                    {
-                        TextElement elem(paper, pag, mBlockStyle,
-                                         mTextStyle, plainText);
-                        elem.paginate();
-                    }
+                if (plainText.size() && brAtEnd)
+                    plainText.erase(plainText.end() - 1);
 
-                    brBeforeLastTag = brAtEnd;
+                if (!plainText.empty() || brBeforeLastTag || isPrevImg)
+                {
+                    TextElement elem(paper, pag, mBlockStyle, mTextStyle, plainText);
+                    elem.paginate();
                 }
 
-                if (event == BookTextParser::Event_EOF)
-                    break;
-
-                isPrevImg = (event == BookTextParser::Event_ImgTag);
+                brBeforeLastTag = brAtEnd;
+            }
 
-                switch (event)
-                {
-                    case BookTextParser::Event_ImgTag:
-                    {
-                        const BookTextParser::Attributes & attr = parser.getAttributes();
+            if (event == BookTextParser::Event_EOF)
+                break;
 
-                        if (attr.find("src") == attr.end() || attr.find("width") == attr.end() || attr.find("height") == attr.end())
-                            continue;
+            isPrevImg = (event == BookTextParser::Event_ImgTag);
 
-                        std::string src = attr.at("src");
-                        int width = MyGUI::utility::parseInt(attr.at("width"));
-                        int height = MyGUI::utility::parseInt(attr.at("height"));
+            switch (event)
+            {
+                case BookTextParser::Event_ImgTag:
+                {
+                    const BookTextParser::Attributes& attr = parser.getAttributes();
 
-                        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-                        std::string correctedSrc = Misc::ResourceHelpers::correctBookartPath(src, width, height, vfs);
-                        bool exists = vfs->exists(correctedSrc);
+                    if (attr.find("src") == attr.end() || attr.find("width") == attr.end()
+                        || attr.find("height") == attr.end())
+                        continue;
 
-                        if (!exists)
-                        {
-                            Log(Debug::Warning) << "Warning: Could not find \"" << src << "\" referenced by an <img> tag.";
-                            break;
-                        }
+                    std::string src = attr.at("src");
+                    int width = MyGUI::utility::parseInt(attr.at("width"));
+                    int height = MyGUI::utility::parseInt(attr.at("height"));
 
-                        pag.setIgnoreLeadingEmptyLines(false);
+                    auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+                    std::string correctedSrc = Misc::ResourceHelpers::correctBookartPath(src, width, height, vfs);
+                    bool exists = vfs->exists(correctedSrc);
 
-                        ImageElement elem(paper, pag, mBlockStyle, correctedSrc, width, height);
-                        elem.paginate();
+                    if (!exists)
+                    {
+                        Log(Debug::Warning) << "Warning: Could not find \"" << src << "\" referenced by an <img> tag.";
                         break;
                     }
-                    case BookTextParser::Event_FontTag:
-                        if (parser.isClosingTag())
-                            resetFontProperties();
-                        else
-                            handleFont(parser.getAttributes());
-                        break;
-                    case BookTextParser::Event_DivTag:
-                        handleDiv(parser.getAttributes());
-                        break;
-                    default:
-                        break;
+
+                    pag.setIgnoreLeadingEmptyLines(false);
+
+                    ImageElement elem(paper, pag, mBlockStyle, correctedSrc, width, height);
+                    elem.paginate();
+                    break;
                 }
+                case BookTextParser::Event_FontTag:
+                    if (parser.isClosingTag())
+                        resetFontProperties();
+                    else
+                        handleFont(parser.getAttributes());
+                    break;
+                case BookTextParser::Event_DivTag:
+                    handleDiv(parser.getAttributes());
+                    break;
+                default:
+                    break;
             }
+        }
 
-            // insert last page
-            if (pag.getStartTop() != pag.getCurrentTop())
-                pag << Paginator::Page(pag.getStartTop(), pag.getStartTop() + pag.getPageHeight());
+        // insert last page
+        if (pag.getStartTop() != pag.getCurrentTop())
+            pag << Paginator::Page(pag.getStartTop(), pag.getStartTop() + pag.getPageHeight());
 
-            paper->setSize(paper->getWidth(), pag.getCurrentTop());
+        paper->setSize(paper->getWidth(), pag.getCurrentTop());
 
-            return pag.getPages();
-        }
+        return pag.getPages();
+    }
 
-        Paginator::Pages BookFormatter::markupToWidget(MyGUI::Widget * parent, const std::string & markup)
-        {
-            return markupToWidget(parent, markup, parent->getWidth(), parent->getHeight());
-        }
+    Paginator::Pages BookFormatter::markupToWidget(MyGUI::Widget* parent, const std::string& markup)
+    {
+        return markupToWidget(parent, markup, parent->getWidth(), parent->getHeight());
+    }
 
-        void BookFormatter::resetFontProperties()
-        {
-            mTextStyle = TextStyle();
-        }
+    void BookFormatter::resetFontProperties()
+    {
+        mTextStyle = TextStyle();
+    }
 
-        void BookFormatter::handleDiv(const BookTextParser::Attributes & attr)
-        {
-            if (attr.find("align") == attr.end())
-                return;
+    void BookFormatter::handleDiv(const BookTextParser::Attributes& attr)
+    {
+        if (attr.find("align") == attr.end())
+            return;
 
-            std::string align = attr.at("align");
+        std::string align = attr.at("align");
 
-            if (Misc::StringUtils::ciEqual(align, "center"))
-                mBlockStyle.mAlign = MyGUI::Align::HCenter;
-            else if (Misc::StringUtils::ciEqual(align, "left"))
-                mBlockStyle.mAlign = MyGUI::Align::Left;
-            else if (Misc::StringUtils::ciEqual(align, "right"))
-                mBlockStyle.mAlign = MyGUI::Align::Right;
-        }
+        if (Misc::StringUtils::ciEqual(align, "center"))
+            mBlockStyle.mAlign = MyGUI::Align::HCenter;
+        else if (Misc::StringUtils::ciEqual(align, "left"))
+            mBlockStyle.mAlign = MyGUI::Align::Left;
+        else if (Misc::StringUtils::ciEqual(align, "right"))
+            mBlockStyle.mAlign = MyGUI::Align::Right;
+    }
 
-        void BookFormatter::handleFont(const BookTextParser::Attributes & attr)
+    void BookFormatter::handleFont(const BookTextParser::Attributes& attr)
+    {
+        if (attr.find("color") != attr.end())
         {
-            if (attr.find("color") != attr.end())
-            {
-                unsigned int color;
-                std::stringstream ss;
-                ss << attr.at("color");
-                ss >> std::hex >> color;
-
-                mTextStyle.mColour = MyGUI::Colour(
-                    (color>>16 & 0xFF) / 255.f,
-                    (color>>8 & 0xFF) / 255.f,
-                    (color & 0xFF) / 255.f);
-            }
-            if (attr.find("face") != attr.end())
-            {
-                std::string face = attr.at("face");
-                std::string name = Gui::FontLoader::getFontForFace(face);
-
-                mTextStyle.mFont = "Journalbook "+name;
-            }
-            if (attr.find("size") != attr.end())
-            {
-                /// \todo
-            }
-        }
+            unsigned int color;
+            std::stringstream ss;
+            ss << attr.at("color");
+            ss >> std::hex >> color;
 
-        /* GraphicElement */
-        GraphicElement::GraphicElement(MyGUI::Widget * parent, Paginator & pag, const BlockStyle & blockStyle)
-            : mParent(parent), mPaginator(pag), mBlockStyle(blockStyle)
-        {
+            mTextStyle.mColour
+                = MyGUI::Colour((color >> 16 & 0xFF) / 255.f, (color >> 8 & 0xFF) / 255.f, (color & 0xFF) / 255.f);
         }
-
-        void GraphicElement::paginate()
+        if (attr.find("face") != attr.end())
         {
-            int newTop = mPaginator.getCurrentTop() + getHeight();
-            while (newTop-mPaginator.getStartTop() > mPaginator.getPageHeight())
-            {
-                int newStartTop = pageSplit();
-                mPaginator << Paginator::Page(mPaginator.getStartTop(), newStartTop);
-                mPaginator.setStartTop(newStartTop);
-            }
+            std::string face = attr.at("face");
+            std::string name = Gui::FontLoader::getFontForFace(face);
 
-            mPaginator.setCurrentTop(newTop);
+            mTextStyle.mFont = "Journalbook " + name;
         }
-
-        int GraphicElement::pageSplit()
+        if (attr.find("size") != attr.end())
         {
-            return mPaginator.getStartTop() + mPaginator.getPageHeight();
+            /// \todo
         }
+    }
 
-        /* TextElement */
-        TextElement::TextElement(MyGUI::Widget * parent, Paginator & pag, const BlockStyle & blockStyle,
-                                 const TextStyle & textStyle, const std::string & text)
-            : GraphicElement(parent, pag, blockStyle),
-              mTextStyle(textStyle)
-        {
-            Gui::EditBox* box = parent->createWidget<Gui::EditBox>("NormalText",
-                MyGUI::IntCoord(0, pag.getCurrentTop(), pag.getPageWidth(), 0), MyGUI::Align::Left | MyGUI::Align::Top,
-                parent->getName() + MyGUI::utility::toString(parent->getChildCount()));
-            box->setEditStatic(true);
-            box->setEditMultiLine(true);
-            box->setEditWordWrap(true);
-            box->setNeedMouseFocus(false);
-            box->setNeedKeyFocus(false);
-            box->setMaxTextLength(text.size());
-            box->setTextAlign(mBlockStyle.mAlign);
-            box->setTextColour(mTextStyle.mColour);
-            box->setFontName(mTextStyle.mFont);
-            box->setCaption(MyGUI::TextIterator::toTagsString(text));
-            box->setSize(box->getSize().width, box->getTextSize().height);
-            mEditBox = box;
-        }
+    /* GraphicElement */
+    GraphicElement::GraphicElement(MyGUI::Widget* parent, Paginator& pag, const BlockStyle& blockStyle)
+        : mParent(parent)
+        , mPaginator(pag)
+        , mBlockStyle(blockStyle)
+    {
+    }
 
-        int TextElement::getHeight()
+    void GraphicElement::paginate()
+    {
+        int newTop = mPaginator.getCurrentTop() + getHeight();
+        while (newTop - mPaginator.getStartTop() > mPaginator.getPageHeight())
         {
-            return mEditBox->getTextSize().height;
+            int newStartTop = pageSplit();
+            mPaginator << Paginator::Page(mPaginator.getStartTop(), newStartTop);
+            mPaginator.setStartTop(newStartTop);
         }
 
-        int TextElement::pageSplit()
+        mPaginator.setCurrentTop(newTop);
+    }
+
+    int GraphicElement::pageSplit()
+    {
+        return mPaginator.getStartTop() + mPaginator.getPageHeight();
+    }
+
+    /* TextElement */
+    TextElement::TextElement(MyGUI::Widget* parent, Paginator& pag, const BlockStyle& blockStyle,
+        const TextStyle& textStyle, const std::string& text)
+        : GraphicElement(parent, pag, blockStyle)
+        , mTextStyle(textStyle)
+    {
+        Gui::EditBox* box = parent->createWidget<Gui::EditBox>("NormalText",
+            MyGUI::IntCoord(0, pag.getCurrentTop(), pag.getPageWidth(), 0), MyGUI::Align::Left | MyGUI::Align::Top,
+            parent->getName() + MyGUI::utility::toString(parent->getChildCount()));
+        box->setEditStatic(true);
+        box->setEditMultiLine(true);
+        box->setEditWordWrap(true);
+        box->setNeedMouseFocus(false);
+        box->setNeedKeyFocus(false);
+        box->setMaxTextLength(text.size());
+        box->setTextAlign(mBlockStyle.mAlign);
+        box->setTextColour(mTextStyle.mColour);
+        box->setFontName(mTextStyle.mFont);
+        box->setCaption(MyGUI::TextIterator::toTagsString(text));
+        box->setSize(box->getSize().width, box->getTextSize().height);
+        mEditBox = box;
+    }
+
+    int TextElement::getHeight()
+    {
+        return mEditBox->getTextSize().height;
+    }
+
+    int TextElement::pageSplit()
+    {
+        // split lines
+        const int lineHeight = MWBase::Environment::get().getWindowManager()->getFontHeight();
+        unsigned int lastLine = (mPaginator.getStartTop() + mPaginator.getPageHeight() - mPaginator.getCurrentTop());
+        if (lineHeight > 0)
+            lastLine /= lineHeight;
+        int ret = mPaginator.getCurrentTop() + lastLine * lineHeight;
+
+        // first empty lines that would go to the next page should be ignored
+        mPaginator.setIgnoreLeadingEmptyLines(true);
+
+        const MyGUI::VectorLineInfo& lines = mEditBox->getSubWidgetText()->castType<MyGUI::EditText>()->getLineInfo();
+        for (unsigned int i = lastLine; i < lines.size(); ++i)
         {
-            // split lines
-            const int lineHeight = MWBase::Environment::get().getWindowManager()->getFontHeight();
-            unsigned int lastLine = (mPaginator.getStartTop() + mPaginator.getPageHeight() - mPaginator.getCurrentTop());
-            if (lineHeight > 0)
-                lastLine /= lineHeight;
-            int ret = mPaginator.getCurrentTop() + lastLine * lineHeight;
-
-            // first empty lines that would go to the next page should be ignored
-            mPaginator.setIgnoreLeadingEmptyLines(true);
-
-            const MyGUI::VectorLineInfo & lines = mEditBox->getSubWidgetText()->castType<MyGUI::EditText>()->getLineInfo();
-            for (unsigned int i = lastLine; i < lines.size(); ++i)
+            if (lines[i].width == 0)
+                ret += lineHeight;
+            else
             {
-                if (lines[i].width == 0)
-                    ret += lineHeight;
-                else
-                {
-                    mPaginator.setIgnoreLeadingEmptyLines(false);
-                    break;
-                }
+                mPaginator.setIgnoreLeadingEmptyLines(false);
+                break;
             }
-            return ret;
         }
+        return ret;
+    }
 
-        /* ImageElement */
-        ImageElement::ImageElement(MyGUI::Widget * parent, Paginator & pag, const BlockStyle & blockStyle,
-                                   const std::string & src, int width, int height)
-            : GraphicElement(parent, pag, blockStyle),
-              mImageHeight(height)
-        {
-            int left = 0;
-            if (mBlockStyle.mAlign.isHCenter())
-                left += (pag.getPageWidth() - width) / 2;
-            else if (mBlockStyle.mAlign.isLeft())
-                left = 0;
-            else if (mBlockStyle.mAlign.isRight())
-                left += pag.getPageWidth() - width;
-
-            mImageBox = parent->createWidget<MyGUI::ImageBox> ("ImageBox",
-                MyGUI::IntCoord(left, pag.getCurrentTop(), width, mImageHeight), MyGUI::Align::Left | MyGUI::Align::Top,
-                parent->getName() + MyGUI::utility::toString(parent->getChildCount()));
-
-            mImageBox->setImageTexture(src);
-            mImageBox->setProperty("NeedMouse", "false");
-        }
+    /* ImageElement */
+    ImageElement::ImageElement(MyGUI::Widget* parent, Paginator& pag, const BlockStyle& blockStyle,
+        const std::string& src, int width, int height)
+        : GraphicElement(parent, pag, blockStyle)
+        , mImageHeight(height)
+    {
+        int left = 0;
+        if (mBlockStyle.mAlign.isHCenter())
+            left += (pag.getPageWidth() - width) / 2;
+        else if (mBlockStyle.mAlign.isLeft())
+            left = 0;
+        else if (mBlockStyle.mAlign.isRight())
+            left += pag.getPageWidth() - width;
+
+        mImageBox = parent->createWidget<MyGUI::ImageBox>("ImageBox",
+            MyGUI::IntCoord(left, pag.getCurrentTop(), width, mImageHeight), MyGUI::Align::Left | MyGUI::Align::Top,
+            parent->getName() + MyGUI::utility::toString(parent->getChildCount()));
+
+        mImageBox->setImageTexture(src);
+        mImageBox->setProperty("NeedMouse", "false");
+    }
 
-        int ImageElement::getHeight()
-        {
-            return mImageHeight;
-        }
+    int ImageElement::getHeight()
+    {
+        return mImageHeight;
+    }
 
-        int ImageElement::pageSplit()
-        {
-            // if the image is larger than the page, fall back to the default pageSplit implementation
-            if (mImageHeight > mPaginator.getPageHeight())
-                return GraphicElement::pageSplit();
-            return mPaginator.getCurrentTop();
-        }
+    int ImageElement::pageSplit()
+    {
+        // if the image is larger than the page, fall back to the default pageSplit implementation
+        if (mImageHeight > mPaginator.getPageHeight())
+            return GraphicElement::pageSplit();
+        return mPaginator.getCurrentTop();
     }
+}
diff --git a/apps/openmw/mwgui/formatting.hpp b/apps/openmw/mwgui/formatting.hpp
index 387acd58c8..421bda6f1d 100644
--- a/apps/openmw/mwgui/formatting.hpp
+++ b/apps/openmw/mwgui/formatting.hpp
@@ -12,8 +12,8 @@ namespace MWGui
     {
         struct TextStyle
         {
-            TextStyle() :
-                mColour(0,0,0)
+            TextStyle()
+                : mColour(0, 0, 0)
                 , mFont("Journalbook DefaultFont")
                 , mTextSize(16)
             {
@@ -26,8 +26,8 @@ namespace MWGui
 
         struct BlockStyle
         {
-            BlockStyle() :
-                mAlign(MyGUI::Align::Left | MyGUI::Align::Top)
+            BlockStyle()
+                : mAlign(MyGUI::Align::Left | MyGUI::Align::Top)
             {
             }
 
@@ -36,140 +36,144 @@ namespace MWGui
 
         class BookTextParser
         {
-            public:
-                typedef std::map<std::string, std::string> Attributes;
-                enum Events
-                {
-                    Event_None = -2,
-                    Event_EOF = -1,
-                    Event_BrTag,
-                    Event_PTag,
-                    Event_ImgTag,
-                    Event_DivTag,
-                    Event_FontTag
-                };
-
-                BookTextParser(const std::string & text);
-
-                Events next();
-
-                const Attributes & getAttributes() const;
-                std::string getReadyText() const;
-                bool isClosingTag() const;
-
-            private:
-                void registerTag(const std::string & tag, Events type);
-                void flushBuffer();
-                void parseTag(std::string tag);
-
-                size_t mIndex;
-                std::string mText;
-                std::string mReadyText;
-
-                bool mIgnoreNewlineTags;
-                bool mIgnoreLineEndings;
-                Attributes mAttributes;
-                std::string mTag;
-                bool mClosingTag;
-                std::map<std::string, Events> mTagTypes;
-                std::string mBuffer;
-
-                size_t mPlainTextEnd;
+        public:
+            typedef std::map<std::string, std::string> Attributes;
+            enum Events
+            {
+                Event_None = -2,
+                Event_EOF = -1,
+                Event_BrTag,
+                Event_PTag,
+                Event_ImgTag,
+                Event_DivTag,
+                Event_FontTag
+            };
+
+            BookTextParser(const std::string& text);
+
+            Events next();
+
+            const Attributes& getAttributes() const;
+            std::string getReadyText() const;
+            bool isClosingTag() const;
+
+        private:
+            void registerTag(const std::string& tag, Events type);
+            void flushBuffer();
+            void parseTag(std::string tag);
+
+            size_t mIndex;
+            std::string mText;
+            std::string mReadyText;
+
+            bool mIgnoreNewlineTags;
+            bool mIgnoreLineEndings;
+            Attributes mAttributes;
+            std::string mTag;
+            bool mClosingTag;
+            std::map<std::string, Events> mTagTypes;
+            std::string mBuffer;
+
+            size_t mPlainTextEnd;
         };
 
         class Paginator
         {
-            public:
-                typedef std::pair<int, int> Page;
-                typedef std::vector<Page> Pages;
-
-                Paginator(int pageWidth, int pageHeight)
-                    : mStartTop(0), mCurrentTop(0),
-                      mPageWidth(pageWidth), mPageHeight(pageHeight),
-                      mIgnoreLeadingEmptyLines(false)
-                {
-                }
-
-                int getStartTop() const { return mStartTop; }
-                int getCurrentTop() const { return mCurrentTop; }
-                int getPageWidth() const { return mPageWidth; }
-                int getPageHeight() const { return mPageHeight; }
-                bool getIgnoreLeadingEmptyLines() const { return mIgnoreLeadingEmptyLines; }
-                Pages getPages() const { return mPages; }
-
-                void setStartTop(int top) { mStartTop = top; }
-                void setCurrentTop(int top) { mCurrentTop = top; }
-                void setIgnoreLeadingEmptyLines(bool ignore) { mIgnoreLeadingEmptyLines = ignore; }
-
-                Paginator & operator<<(const Page & page)
-                {
-                    mPages.push_back(page);
-                    return *this;
-                }
-
-            private:
-                int mStartTop, mCurrentTop;
-                int mPageWidth, mPageHeight;
-                bool mIgnoreLeadingEmptyLines;
-                Pages mPages;
+        public:
+            typedef std::pair<int, int> Page;
+            typedef std::vector<Page> Pages;
+
+            Paginator(int pageWidth, int pageHeight)
+                : mStartTop(0)
+                , mCurrentTop(0)
+                , mPageWidth(pageWidth)
+                , mPageHeight(pageHeight)
+                , mIgnoreLeadingEmptyLines(false)
+            {
+            }
+
+            int getStartTop() const { return mStartTop; }
+            int getCurrentTop() const { return mCurrentTop; }
+            int getPageWidth() const { return mPageWidth; }
+            int getPageHeight() const { return mPageHeight; }
+            bool getIgnoreLeadingEmptyLines() const { return mIgnoreLeadingEmptyLines; }
+            Pages getPages() const { return mPages; }
+
+            void setStartTop(int top) { mStartTop = top; }
+            void setCurrentTop(int top) { mCurrentTop = top; }
+            void setIgnoreLeadingEmptyLines(bool ignore) { mIgnoreLeadingEmptyLines = ignore; }
+
+            Paginator& operator<<(const Page& page)
+            {
+                mPages.push_back(page);
+                return *this;
+            }
+
+        private:
+            int mStartTop, mCurrentTop;
+            int mPageWidth, mPageHeight;
+            bool mIgnoreLeadingEmptyLines;
+            Pages mPages;
         };
 
         /// \brief utilities for parsing book/scroll text as mygui widgets
         class BookFormatter
         {
-            public:
-                Paginator::Pages markupToWidget(MyGUI::Widget * parent, const std::string & markup, const int pageWidth, const int pageHeight);
-                Paginator::Pages markupToWidget(MyGUI::Widget * parent, const std::string & markup);
+        public:
+            Paginator::Pages markupToWidget(
+                MyGUI::Widget* parent, const std::string& markup, const int pageWidth, const int pageHeight);
+            Paginator::Pages markupToWidget(MyGUI::Widget* parent, const std::string& markup);
 
-            private:
-                void resetFontProperties();
+        private:
+            void resetFontProperties();
 
-                void handleDiv(const BookTextParser::Attributes & attr);
-                void handleFont(const BookTextParser::Attributes & attr);
+            void handleDiv(const BookTextParser::Attributes& attr);
+            void handleFont(const BookTextParser::Attributes& attr);
 
-                TextStyle mTextStyle;
-                BlockStyle mBlockStyle;
+            TextStyle mTextStyle;
+            BlockStyle mBlockStyle;
         };
 
         class GraphicElement
         {
-            public:
-                GraphicElement(MyGUI::Widget * parent, Paginator & pag, const BlockStyle & blockStyle);
-                virtual int getHeight() = 0;
-                virtual void paginate();
-                virtual int pageSplit();
-
-            protected:
-                virtual ~GraphicElement() {}
-                MyGUI::Widget * mParent;
-                Paginator & mPaginator;
-                BlockStyle mBlockStyle;
+        public:
+            GraphicElement(MyGUI::Widget* parent, Paginator& pag, const BlockStyle& blockStyle);
+            virtual int getHeight() = 0;
+            virtual void paginate();
+            virtual int pageSplit();
+
+        protected:
+            virtual ~GraphicElement() {}
+            MyGUI::Widget* mParent;
+            Paginator& mPaginator;
+            BlockStyle mBlockStyle;
         };
 
         class TextElement : public GraphicElement
         {
-            public:
-                TextElement(MyGUI::Widget * parent, Paginator & pag, const BlockStyle & blockStyle,
-                            const TextStyle & textStyle, const std::string & text);
-                int getHeight() override;
-                int pageSplit() override;
-            private:
-                int currentFontHeight() const;
-                TextStyle mTextStyle;
-                Gui::EditBox * mEditBox;
+        public:
+            TextElement(MyGUI::Widget* parent, Paginator& pag, const BlockStyle& blockStyle, const TextStyle& textStyle,
+                const std::string& text);
+            int getHeight() override;
+            int pageSplit() override;
+
+        private:
+            int currentFontHeight() const;
+            TextStyle mTextStyle;
+            Gui::EditBox* mEditBox;
         };
 
         class ImageElement : public GraphicElement
         {
-            public:
-                ImageElement(MyGUI::Widget * parent, Paginator & pag, const BlockStyle & blockStyle,
-                             const std::string & src, int width, int height);
-                int getHeight() override;
-                int pageSplit() override;
-
-            private:
-                int mImageHeight;
-                MyGUI::ImageBox * mImageBox;
+        public:
+            ImageElement(MyGUI::Widget* parent, Paginator& pag, const BlockStyle& blockStyle, const std::string& src,
+                int width, int height);
+            int getHeight() override;
+            int pageSplit() override;
+
+        private:
+            int mImageHeight;
+            MyGUI::ImageBox* mImageBox;
         };
     }
 }
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index d2a2b8f320..0b33668920 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -1,17 +1,17 @@
 #include "hud.hpp"
 
-#include <MyGUI_RenderManager.h>
-#include <MyGUI_ProgressBar.h>
 #include <MyGUI_Button.h>
-#include <MyGUI_InputManager.h>
 #include <MyGUI_ImageBox.h>
+#include <MyGUI_InputManager.h>
+#include <MyGUI_ProgressBar.h>
+#include <MyGUI_RenderManager.h>
 #include <MyGUI_ScrollView.h>
 
-#include <components/settings/settings.hpp>
-#include <components/misc/resourcehelpers.hpp>
-#include <components/resource/resourcesystem.hpp>
 #include <components/esm3/loadgmst.hpp>
 #include <components/esm3/loadmgef.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
+#include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -20,13 +20,13 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 
-#include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/npcstats.hpp"
 
+#include "draganddrop.hpp"
 #include "inventorywindow.hpp"
-#include "spellicons.hpp"
 #include "itemmodel.hpp"
-#include "draganddrop.hpp"
+#include "spellicons.hpp"
 
 #include "itemwidget.hpp"
 
@@ -39,9 +39,13 @@ namespace MWGui
     class WorldItemModel : public ItemModel
     {
     public:
-        WorldItemModel(float left, float top) : mLeft(left), mTop(top) {}
+        WorldItemModel(float left, float top)
+            : mLeft(left)
+            , mTop(top)
+        {
+        }
         virtual ~WorldItemModel() override {}
-        MWWorld::Ptr copyItem (const ItemStack& item, size_t count, bool /*allowAutoEquip*/) override
+        MWWorld::Ptr copyItem(const ItemStack& item, size_t count, bool /*allowAutoEquip*/) override
         {
             MWBase::World* world = MWBase::Environment::get().getWorld();
 
@@ -55,11 +59,14 @@ namespace MWGui
             return dropped;
         }
 
-        void removeItem (const ItemStack& item, size_t count) override { throw std::runtime_error("removeItem not implemented"); }
-        ModelIndex getIndex (const ItemStack &item) override { throw std::runtime_error("getIndex not implemented"); }
+        void removeItem(const ItemStack& item, size_t count) override
+        {
+            throw std::runtime_error("removeItem not implemented");
+        }
+        ModelIndex getIndex(const ItemStack& item) override { throw std::runtime_error("getIndex not implemented"); }
         void update() override {}
         size_t getItemCount() override { return 0; }
-        ItemStack getItem (ModelIndex index) override { throw std::runtime_error("getItem not implemented"); }
+        ItemStack getItem(ModelIndex index) override { throw std::runtime_error("getItem not implemented"); }
         bool usesContainer(const MWWorld::Ptr&) override { return false; }
 
     private:
@@ -68,8 +75,7 @@ namespace MWGui
         float mTop;
     };
 
-
-    HUD::HUD(CustomMarkerCollection &customMarkers, DragAndDrop* dragAndDrop, MWRender::LocalMap* localMapRender)
+    HUD::HUD(CustomMarkerCollection& customMarkers, DragAndDrop* dragAndDrop, MWRender::LocalMap* localMapRender)
         : WindowBase("openmw_hud.layout")
         , LocalMapBase(customMarkers, localMapRender, Settings::Manager::getBool("local map hud fog of war", "Map"))
         , mHealth(nullptr)
@@ -119,7 +125,7 @@ namespace MWGui
         magickaFrame->eventMouseButtonClick += MyGUI::newDelegate(this, &HUD::onHMSClicked);
         fatigueFrame->eventMouseButtonClick += MyGUI::newDelegate(this, &HUD::onHMSClicked);
 
-        //Drowning bar
+        // Drowning bar
         getWidget(mDrowningBar, "DrowningBar");
         getWidget(mDrowningFrame, "DrowningFrame");
         getWidget(mDrowning, "Drowning");
@@ -229,22 +235,21 @@ namespace MWGui
 
     void HUD::onWorldClicked(MyGUI::Widget* _sender)
     {
-        if (!MWBase::Environment::get().getWindowManager ()->isGuiMode ())
+        if (!MWBase::Environment::get().getWindowManager()->isGuiMode())
             return;
 
-        MWBase::WindowManager *winMgr = MWBase::Environment::get().getWindowManager();
+        MWBase::WindowManager* winMgr = MWBase::Environment::get().getWindowManager();
         if (mDragAndDrop->mIsOnDragAndDrop)
         {
             // drop item into the gameworld
-            MWBase::Environment::get().getWorld()->breakInvisibility(
-                        MWMechanics::getPlayer());
+            MWBase::Environment::get().getWorld()->breakInvisibility(MWMechanics::getPlayer());
 
             MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
             MyGUI::IntPoint cursorPosition = MyGUI::InputManager::getInstance().getMousePosition();
             float mouseX = cursorPosition.left / float(viewSize.width);
             float mouseY = cursorPosition.top / float(viewSize.height);
 
-            WorldItemModel drop (mouseX, mouseY);
+            WorldItemModel drop(mouseX, mouseY);
             mDragAndDrop->drop(&drop, nullptr);
 
             winMgr->changePointer("arrow");
@@ -260,7 +265,7 @@ namespace MWGui
 
             if (winMgr->isConsoleMode())
                 winMgr->setConsoleSelectedObject(object);
-            else //if ((mode == GM_Container) || (mode == GM_Inventory))
+            else // if ((mode == GM_Container) || (mode == GM_Inventory))
             {
                 // pick up object
                 if (!object.isEmpty())
@@ -289,7 +294,6 @@ namespace MWGui
                 MWBase::Environment::get().getWindowManager()->changePointer("drop_ground");
             else
                 MWBase::Environment::get().getWindowManager()->changePointer("arrow");
-
         }
         else
         {
@@ -365,7 +369,7 @@ namespace MWGui
         if (mEnemyHealth->getVisible() && mEnemyHealthTimer < 0)
         {
             mEnemyHealth->setVisible(false);
-            mWeaponSpellBox->setPosition(mWeaponSpellBox->getPosition() + MyGUI::IntPoint(0,20));
+            mWeaponSpellBox->setPosition(mWeaponSpellBox->getPosition() + MyGUI::IntPoint(0, 20));
         }
 
         mSpellIcons->updateWidgets(mEffectBox, true);
@@ -376,11 +380,12 @@ namespace MWGui
         }
 
         if (mDrowningBar->getVisible())
-            mDrowningBar->setPosition(mMainWidget->getWidth()/2 - mDrowningFrame->getWidth()/2, mMainWidget->getTop());
+            mDrowningBar->setPosition(
+                mMainWidget->getWidth() / 2 - mDrowningFrame->getWidth() / 2, mMainWidget->getTop());
 
         if (mIsDrowning)
         {
-            mDrowningFlashTheta += dt * osg::PI*2;
+            mDrowningFlashTheta += dt * osg::PI * 2;
 
             float intensity = (cos(mDrowningFlashTheta) + 2.0f) / 3.0f;
 
@@ -390,8 +395,7 @@ namespace MWGui
 
     void HUD::setSelectedSpell(const std::string& spellId, int successChancePercent)
     {
-        const ESM::Spell* spell =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(spellId);
+        const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(spellId);
 
         const std::string& spellName = spell->mName;
         if (spellName != mSpellName && mSpellVisible)
@@ -409,12 +413,12 @@ namespace MWGui
         mSpellBox->setUserString("Spell", spellId);
 
         // use the icon of the first effect
-        const ESM::MagicEffect* effect =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(spell->mEffects.mList.front().mEffectID);
+        const ESM::MagicEffect* effect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(
+            spell->mEffects.mList.front().mEffectID);
 
         std::string icon = effect->mIcon;
         int slashPos = icon.rfind('\\');
-        icon.insert(slashPos+1, "b_");
+        icon.insert(slashPos + 1, "b_");
         icon = Misc::ResourceHelpers::correctIconPath(icon, MWBase::Environment::get().getResourceSystem()->getVFS());
 
         mSpellImage->setSpellIcon(icon);
@@ -492,11 +496,12 @@ namespace MWGui
         mWeapStatus->setProgressRange(100);
         mWeapStatus->setProgressPosition(0);
 
-        MWBase::World *world = MWBase::Environment::get().getWorld();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
         MWWorld::Ptr player = world->getPlayerPtr();
 
         mWeapImage->setItem(MWWorld::Ptr());
-        std::string icon = (player.getClass().getNpcStats(player).isWerewolf()) ? "icons\\k\\tx_werewolf_hand.dds" : "icons\\k\\stealth_handtohand.dds";
+        std::string icon = (player.getClass().getNpcStats(player).isWerewolf()) ? "icons\\k\\tx_werewolf_hand.dds"
+                                                                                : "icons\\k\\stealth_handtohand.dds";
         mWeapImage->setIcon(icon);
 
         mWeapBox->clearUserStrings();
@@ -508,12 +513,12 @@ namespace MWGui
 
     void HUD::setCrosshairVisible(bool visible)
     {
-        mCrosshair->setVisible (visible);
+        mCrosshair->setVisible(visible);
     }
-    
+
     void HUD::setCrosshairOwned(bool owned)
     {
-        if(owned)
+        if (owned)
         {
             mCrosshair->changeWidgetSkin("HUD_Crosshair_Owned");
         }
@@ -522,7 +527,7 @@ namespace MWGui
             mCrosshair->changeWidgetSkin("HUD_Crosshair");
         }
     }
-    
+
     void HUD::setHmsVisible(bool visible)
     {
         mHealth->setVisible(visible);
@@ -551,13 +556,13 @@ namespace MWGui
 
     void HUD::setEffectVisible(bool visible)
     {
-        mEffectBox->setVisible (visible);
+        mEffectBox->setVisible(visible);
         updatePositions();
     }
 
     void HUD::setMinimapVisible(bool visible)
     {
-        mMinimapBox->setVisible (visible);
+        mMinimapBox->setVisible(visible);
         updatePositions();
     }
 
@@ -589,14 +594,15 @@ namespace MWGui
 
         // effect box can have variable width -> variable left coordinate
         int effectsDx = 0;
-        if (!mMinimapBox->getVisible ())
+        if (!mMinimapBox->getVisible())
             effectsDx = mEffectBoxBaseRight - mMinimapBoxBaseRight;
 
-        mMapVisible = mMinimapBox->getVisible ();
+        mMapVisible = mMinimapBox->getVisible();
         if (!mMapVisible)
             mCellNameBox->setVisible(false);
 
-        mEffectBox->setPosition((viewSize.width - mEffectBoxBaseRight) - mEffectBox->getWidth() + effectsDx, mEffectBox->getTop());
+        mEffectBox->setPosition(
+            (viewSize.width - mEffectBoxBaseRight) - mEffectBox->getWidth() + effectsDx, mEffectBox->getTop());
     }
 
     void HUD::updateEnemyHealthBar()
@@ -610,18 +616,27 @@ namespace MWGui
         // Therefore any value < 1 should show as an empty health bar. We do the same in statswindow :)
         mEnemyHealth->setProgressPosition(static_cast<size_t>(stats.getHealth().getRatio() * 100));
 
-        static const float fNPCHealthBarFade = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fNPCHealthBarFade")->mValue.getFloat();
+        static const float fNPCHealthBarFade = MWBase::Environment::get()
+                                                   .getWorld()
+                                                   ->getStore()
+                                                   .get<ESM::GameSetting>()
+                                                   .find("fNPCHealthBarFade")
+                                                   ->mValue.getFloat();
         if (fNPCHealthBarFade > 0.f)
             mEnemyHealth->setAlpha(std::clamp(mEnemyHealthTimer / fNPCHealthBarFade, 0.f, 1.f));
-
     }
 
-    void HUD::setEnemy(const MWWorld::Ptr &enemy)
+    void HUD::setEnemy(const MWWorld::Ptr& enemy)
     {
         mEnemyActorId = enemy.getClass().getCreatureStats(enemy).getActorId();
-        mEnemyHealthTimer = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fNPCHealthBarTime")->mValue.getFloat();
+        mEnemyHealthTimer = MWBase::Environment::get()
+                                .getWorld()
+                                ->getStore()
+                                .get<ESM::GameSetting>()
+                                .find("fNPCHealthBarTime")
+                                ->mValue.getFloat();
         if (!mEnemyHealth->getVisible())
-            mWeaponSpellBox->setPosition(mWeaponSpellBox->getPosition() - MyGUI::IntPoint(0,20));
+            mWeaponSpellBox->setPosition(mWeaponSpellBox->getPosition() - MyGUI::IntPoint(0, 20));
         mEnemyHealth->setVisible(true);
         updateEnemyHealthBar();
     }
@@ -639,12 +654,12 @@ namespace MWGui
         resetEnemy();
     }
 
-    void HUD::customMarkerCreated(MyGUI::Widget *marker)
+    void HUD::customMarkerCreated(MyGUI::Widget* marker)
     {
         marker->eventMouseButtonClick += MyGUI::newDelegate(this, &HUD::onMapClicked);
     }
 
-    void HUD::doorMarkerCreated(MyGUI::Widget *marker)
+    void HUD::doorMarkerCreated(MyGUI::Widget* marker)
     {
         marker->eventMouseButtonClick += MyGUI::newDelegate(this, &HUD::onMapClicked);
     }
diff --git a/apps/openmw/mwgui/hud.hpp b/apps/openmw/mwgui/hud.hpp
index aacca60a52..3285aa307f 100644
--- a/apps/openmw/mwgui/hud.hpp
+++ b/apps/openmw/mwgui/hud.hpp
@@ -23,7 +23,7 @@ namespace MWGui
     public:
         HUD(CustomMarkerCollection& customMarkers, DragAndDrop* dragAndDrop, MWRender::LocalMap* localMapRender);
         virtual ~HUD();
-        void setValue (const std::string& id, const MWMechanics::DynamicStat<float>& value) override;
+        void setValue(const std::string& id, const MWMechanics::DynamicStat<float>& value) override;
 
         /// Set time left for the player to start drowning
         /// @param time time left to start drowning
@@ -66,8 +66,8 @@ namespace MWGui
         MyGUI::ProgressBar *mHealth, *mMagicka, *mStamina, *mEnemyHealth, *mDrowning;
         MyGUI::Widget* mHealthFrame;
         MyGUI::Widget *mWeapBox, *mSpellBox, *mSneakBox;
-        ItemWidget *mWeapImage;
-        SpellWidget *mSpellImage;
+        ItemWidget* mWeapImage;
+        SpellWidget* mSpellImage;
         MyGUI::ProgressBar *mWeapStatus, *mSpellStatus;
         MyGUI::Widget *mEffectBox, *mMinimapBox;
         MyGUI::Button* mMinimapButton;
@@ -102,7 +102,7 @@ namespace MWGui
         int mEnemyActorId;
         float mEnemyHealthTimer;
 
-        bool  mIsDrowning;
+        bool mIsDrowning;
         float mDrowningFlashTheta;
 
         void onWorldClicked(MyGUI::Widget* _sender);
diff --git a/apps/openmw/mwgui/inventoryitemmodel.cpp b/apps/openmw/mwgui/inventoryitemmodel.cpp
index f96cfd865e..77799d4278 100644
--- a/apps/openmw/mwgui/inventoryitemmodel.cpp
+++ b/apps/openmw/mwgui/inventoryitemmodel.cpp
@@ -5,8 +5,8 @@
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/npcstats.hpp"
 
-#include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/containerstore.hpp"
 #include "../mwworld/inventorystore.hpp"
 
 #include "../mwbase/environment.hpp"
@@ -15,125 +15,127 @@
 namespace MWGui
 {
 
-InventoryItemModel::InventoryItemModel(const MWWorld::Ptr &actor)
-    : mActor(actor)
-{
-}
-
-ItemStack InventoryItemModel::getItem (ModelIndex index)
-{
-    if (index < 0)
-        throw std::runtime_error("Invalid index supplied");
-    if (mItems.size() <= static_cast<size_t>(index))
-        throw std::runtime_error("Item index out of range");
-    return mItems[index];
-}
-
-size_t InventoryItemModel::getItemCount()
-{
-    return mItems.size();
-}
-
-ItemModel::ModelIndex InventoryItemModel::getIndex (const ItemStack& item)
-{
-    size_t i = 0;
-    for (ItemStack& itemStack : mItems)
+    InventoryItemModel::InventoryItemModel(const MWWorld::Ptr& actor)
+        : mActor(actor)
     {
-        if (itemStack == item)
-            return i;
-        ++i;
     }
-    return -1;
-}
-
-MWWorld::Ptr InventoryItemModel::copyItem (const ItemStack& item, size_t count, bool allowAutoEquip)
-{
-    if (item.mBase.getContainerStore() == &mActor.getClass().getContainerStore(mActor))
-        throw std::runtime_error("Item to copy needs to be from a different container!");
-    return *mActor.getClass().getContainerStore(mActor).add(item.mBase, count, mActor, allowAutoEquip);
-}
 
-void InventoryItemModel::removeItem (const ItemStack& item, size_t count)
-{
-    int removed = 0;
-    // Re-equipping makes sense only if a target has inventory
-    if (mActor.getClass().hasInventoryStore(mActor))
+    ItemStack InventoryItemModel::getItem(ModelIndex index)
     {
-        MWWorld::InventoryStore& store = mActor.getClass().getInventoryStore(mActor);
-        removed = store.remove(item.mBase, count, mActor, true);
+        if (index < 0)
+            throw std::runtime_error("Invalid index supplied");
+        if (mItems.size() <= static_cast<size_t>(index))
+            throw std::runtime_error("Item index out of range");
+        return mItems[index];
     }
-    else
+
+    size_t InventoryItemModel::getItemCount()
     {
-        MWWorld::ContainerStore& store = mActor.getClass().getContainerStore(mActor);
-        removed = store.remove(item.mBase, count, mActor);
+        return mItems.size();
     }
 
-    std::stringstream error;
-
-    if (removed == 0)
+    ItemModel::ModelIndex InventoryItemModel::getIndex(const ItemStack& item)
     {
-        error << "Item '" << item.mBase.getCellRef().getRefId() << "' was not found in container store to remove";
-        throw std::runtime_error(error.str());
+        size_t i = 0;
+        for (ItemStack& itemStack : mItems)
+        {
+            if (itemStack == item)
+                return i;
+            ++i;
+        }
+        return -1;
     }
-    else if (removed < static_cast<int>(count))
+
+    MWWorld::Ptr InventoryItemModel::copyItem(const ItemStack& item, size_t count, bool allowAutoEquip)
     {
-        error << "Not enough items '" << item.mBase.getCellRef().getRefId() << "' in the stack to remove (" << static_cast<int>(count) << " requested, " << removed << " found)";
-        throw std::runtime_error(error.str());
+        if (item.mBase.getContainerStore() == &mActor.getClass().getContainerStore(mActor))
+            throw std::runtime_error("Item to copy needs to be from a different container!");
+        return *mActor.getClass().getContainerStore(mActor).add(item.mBase, count, mActor, allowAutoEquip);
     }
-}
-
-MWWorld::Ptr InventoryItemModel::moveItem(const ItemStack &item, size_t count, ItemModel *otherModel)
-{
-    // Can't move conjured items: This is a general fix that also takes care of issues with taking conjured items via the 'Take All' button.
-    if (item.mFlags & ItemStack::Flag_Bound)
-        return MWWorld::Ptr();
 
-    MWWorld::Ptr ret = otherModel->copyItem(item, count);
-    removeItem(item, count);
-    return ret;
-}
+    void InventoryItemModel::removeItem(const ItemStack& item, size_t count)
+    {
+        int removed = 0;
+        // Re-equipping makes sense only if a target has inventory
+        if (mActor.getClass().hasInventoryStore(mActor))
+        {
+            MWWorld::InventoryStore& store = mActor.getClass().getInventoryStore(mActor);
+            removed = store.remove(item.mBase, count, mActor, true);
+        }
+        else
+        {
+            MWWorld::ContainerStore& store = mActor.getClass().getContainerStore(mActor);
+            removed = store.remove(item.mBase, count, mActor);
+        }
 
-void InventoryItemModel::update()
-{
-    MWWorld::ContainerStore& store = mActor.getClass().getContainerStore(mActor);
+        std::stringstream error;
 
-    mItems.clear();
+        if (removed == 0)
+        {
+            error << "Item '" << item.mBase.getCellRef().getRefId() << "' was not found in container store to remove";
+            throw std::runtime_error(error.str());
+        }
+        else if (removed < static_cast<int>(count))
+        {
+            error << "Not enough items '" << item.mBase.getCellRef().getRefId() << "' in the stack to remove ("
+                  << static_cast<int>(count) << " requested, " << removed << " found)";
+            throw std::runtime_error(error.str());
+        }
+    }
 
-    for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
+    MWWorld::Ptr InventoryItemModel::moveItem(const ItemStack& item, size_t count, ItemModel* otherModel)
     {
-        MWWorld::Ptr item = *it;
+        // Can't move conjured items: This is a general fix that also takes care of issues with taking conjured items
+        // via the 'Take All' button.
+        if (item.mFlags & ItemStack::Flag_Bound)
+            return MWWorld::Ptr();
+
+        MWWorld::Ptr ret = otherModel->copyItem(item, count);
+        removeItem(item, count);
+        return ret;
+    }
 
-        if (!item.getClass().showsInInventory(item))
-            continue;
+    void InventoryItemModel::update()
+    {
+        MWWorld::ContainerStore& store = mActor.getClass().getContainerStore(mActor);
 
-        ItemStack newItem (item, this, item.getRefData().getCount());
+        mItems.clear();
 
-        if (mActor.getClass().hasInventoryStore(mActor))
+        for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
         {
-            MWWorld::InventoryStore& invStore = mActor.getClass().getInventoryStore(mActor);
-            if (invStore.isEquipped(newItem.mBase))
-                newItem.mType = ItemStack::Type_Equipped;
-        }
+            MWWorld::Ptr item = *it;
+
+            if (!item.getClass().showsInInventory(item))
+                continue;
 
-        mItems.push_back(newItem);
+            ItemStack newItem(item, this, item.getRefData().getCount());
+
+            if (mActor.getClass().hasInventoryStore(mActor))
+            {
+                MWWorld::InventoryStore& invStore = mActor.getClass().getInventoryStore(mActor);
+                if (invStore.isEquipped(newItem.mBase))
+                    newItem.mType = ItemStack::Type_Equipped;
+            }
+
+            mItems.push_back(newItem);
+        }
     }
-}
 
-bool InventoryItemModel::onTakeItem(const MWWorld::Ptr &item, int count)
-{
-    // Looting a dead corpse is considered OK
-    if (mActor.getClass().isActor() && mActor.getClass().getCreatureStats(mActor).isDead())
-        return true;
+    bool InventoryItemModel::onTakeItem(const MWWorld::Ptr& item, int count)
+    {
+        // Looting a dead corpse is considered OK
+        if (mActor.getClass().isActor() && mActor.getClass().getCreatureStats(mActor).isDead())
+            return true;
 
-    MWWorld::Ptr player = MWMechanics::getPlayer();
-    MWBase::Environment::get().getMechanicsManager()->itemTaken(player, item, mActor, count);
+        MWWorld::Ptr player = MWMechanics::getPlayer();
+        MWBase::Environment::get().getMechanicsManager()->itemTaken(player, item, mActor, count);
 
-    return true;
-}
+        return true;
+    }
 
-bool InventoryItemModel::usesContainer(const MWWorld::Ptr& container)
-{
-    return mActor == container;
-}
+    bool InventoryItemModel::usesContainer(const MWWorld::Ptr& container)
+    {
+        return mActor == container;
+    }
 
 }
diff --git a/apps/openmw/mwgui/inventoryitemmodel.hpp b/apps/openmw/mwgui/inventoryitemmodel.hpp
index 87d874c946..b99bfc544d 100644
--- a/apps/openmw/mwgui/inventoryitemmodel.hpp
+++ b/apps/openmw/mwgui/inventoryitemmodel.hpp
@@ -9,19 +9,19 @@ namespace MWGui
     class InventoryItemModel : public ItemModel
     {
     public:
-        InventoryItemModel (const MWWorld::Ptr& actor);
+        InventoryItemModel(const MWWorld::Ptr& actor);
 
-        ItemStack getItem (ModelIndex index) override;
-        ModelIndex getIndex (const ItemStack &item) override;
+        ItemStack getItem(ModelIndex index) override;
+        ModelIndex getIndex(const ItemStack& item) override;
         size_t getItemCount() override;
 
-        bool onTakeItem(const MWWorld::Ptr &item, int count) override;
+        bool onTakeItem(const MWWorld::Ptr& item, int count) override;
 
-        MWWorld::Ptr copyItem (const ItemStack& item, size_t count, bool allowAutoEquip = true) override;
-        void removeItem (const ItemStack& item, size_t count) override;
+        MWWorld::Ptr copyItem(const ItemStack& item, size_t count, bool allowAutoEquip = true) override;
+        void removeItem(const ItemStack& item, size_t count) override;
 
         /// Move items from this model to \a otherModel.
-        MWWorld::Ptr moveItem (const ItemStack& item, size_t count, ItemModel* otherModel) override;
+        MWWorld::Ptr moveItem(const ItemStack& item, size_t count, ItemModel* otherModel) override;
 
         void update() override;
 
@@ -29,6 +29,7 @@ namespace MWGui
 
     protected:
         MWWorld::Ptr mActor;
+
     private:
         std::vector<ItemStack> mItems;
     };
diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 8a3a72d2b0..7deb91455c 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -3,12 +3,12 @@
 #include <cmath>
 #include <stdexcept>
 
-#include <MyGUI_Window.h>
-#include <MyGUI_ImageBox.h>
-#include <MyGUI_RenderManager.h>
-#include <MyGUI_InputManager.h>
 #include <MyGUI_Button.h>
 #include <MyGUI_EditBox.h>
+#include <MyGUI_ImageBox.h>
+#include <MyGUI_InputManager.h>
+#include <MyGUI_RenderManager.h>
+#include <MyGUI_Window.h>
 
 #include <osg/Texture2D>
 
@@ -18,26 +18,26 @@
 
 #include <components/settings/settings.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/inventorystore.hpp"
-#include "../mwworld/class.hpp"
 #include "../mwworld/actionequip.hpp"
+#include "../mwworld/class.hpp"
+#include "../mwworld/inventorystore.hpp"
 
-#include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/npcstats.hpp"
 
-#include "itemview.hpp"
+#include "countdialog.hpp"
+#include "draganddrop.hpp"
 #include "inventoryitemmodel.hpp"
+#include "itemview.hpp"
 #include "sortfilteritemmodel.hpp"
+#include "tooltips.hpp"
 #include "tradeitemmodel.hpp"
-#include "countdialog.hpp"
 #include "tradewindow.hpp"
-#include "draganddrop.hpp"
-#include "tooltips.hpp"
 
 namespace
 {
@@ -55,7 +55,8 @@ namespace
 namespace MWGui
 {
 
-    InventoryWindow::InventoryWindow(DragAndDrop* dragAndDrop, osg::Group* parent, Resource::ResourceSystem* resourceSystem)
+    InventoryWindow::InventoryWindow(
+        DragAndDrop* dragAndDrop, osg::Group* parent, Resource::ResourceSystem* resourceSystem)
         : WindowPinnableBase("openmw_inventory_window.layout")
         , mDragAndDrop(dragAndDrop)
         , mSelectedItem(-1)
@@ -68,10 +69,12 @@ namespace MWGui
         , mTrading(false)
         , mUpdateTimer(0.f)
     {
-        mPreviewTexture = std::make_unique<osgMyGUI::OSGTexture>(mPreview->getTexture(), mPreview->getTextureStateSet());
+        mPreviewTexture
+            = std::make_unique<osgMyGUI::OSGTexture>(mPreview->getTexture(), mPreview->getTextureStateSet());
         mPreview->rebuild();
 
-        mMainWidget->castType<MyGUI::Window>()->eventWindowChangeCoord += MyGUI::newDelegate(this, &InventoryWindow::onWindowResize);
+        mMainWidget->castType<MyGUI::Window>()->eventWindowChangeCoord
+            += MyGUI::newDelegate(this, &InventoryWindow::onWindowResize);
 
         getWidget(mAvatar, "Avatar");
         getWidget(mAvatarImage, "AvatarImage");
@@ -112,16 +115,14 @@ namespace MWGui
     {
         const float aspect = 0.5; // fixed aspect ratio for the avatar image
         int leftPaneWidth = static_cast<int>((mMainWidget->getSize().height - 44 - mArmorRating->getHeight()) * aspect);
-        mLeftPane->setSize( leftPaneWidth, mMainWidget->getSize().height-44 );
-        mRightPane->setCoord( mLeftPane->getPosition().left + leftPaneWidth + 4,
-                              mRightPane->getPosition().top,
-                              mMainWidget->getSize().width - 12 - leftPaneWidth - 15,
-                              mMainWidget->getSize().height-44 );
+        mLeftPane->setSize(leftPaneWidth, mMainWidget->getSize().height - 44);
+        mRightPane->setCoord(mLeftPane->getPosition().left + leftPaneWidth + 4, mRightPane->getPosition().top,
+            mMainWidget->getSize().width - 12 - leftPaneWidth - 15, mMainWidget->getSize().height - 44);
     }
 
     void InventoryWindow::updatePlayer()
     {
-        mPtr = MWBase::Environment::get().getWorld ()->getPlayerPtr();
+        mPtr = MWBase::Environment::get().getWorld()->getPlayerPtr();
         auto tradeModel = std::make_unique<TradeItemModel>(std::make_unique<InventoryItemModel>(mPtr), MWWorld::Ptr());
         mTradeModel = tradeModel.get();
 
@@ -199,9 +200,9 @@ namespace MWGui
 
         MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
         MyGUI::IntPoint pos(static_cast<int>(Settings::Manager::getFloat(setting + " x", "Windows") * viewSize.width),
-                            static_cast<int>(Settings::Manager::getFloat(setting + " y", "Windows") * viewSize.height));
+            static_cast<int>(Settings::Manager::getFloat(setting + " y", "Windows") * viewSize.height));
         MyGUI::IntSize size(static_cast<int>(Settings::Manager::getFloat(setting + " w", "Windows") * viewSize.width),
-                            static_cast<int>(Settings::Manager::getFloat(setting + " h", "Windows") * viewSize.height));
+            static_cast<int>(Settings::Manager::getFloat(setting + " h", "Windows") * viewSize.height));
 
         bool needUpdate = (size.width != mMainWidget->getWidth() || size.height != mMainWidget->getHeight());
 
@@ -235,12 +236,12 @@ namespace MWGui
             mDragAndDrop->drop(mTradeModel, mItemView);
     }
 
-    void InventoryWindow::onItemSelected (int index)
+    void InventoryWindow::onItemSelected(int index)
     {
-        onItemSelectedFromSourceModel (mSortModel->mapToSource(index));
+        onItemSelectedFromSourceModel(mSortModel->mapToSource(index));
     }
 
-    void InventoryWindow::onItemSelectedFromSourceModel (int index)
+    void InventoryWindow::onItemSelectedFromSourceModel(int index)
     {
         if (mDragAndDrop->mIsOnDragAndDrop)
         {
@@ -273,8 +274,7 @@ namespace MWGui
             if (!object.getClass().canSell(object, services))
             {
                 MWBase::Environment::get().getWindowManager()->playSound(sound);
-                MWBase::Environment::get().getWindowManager()->
-                        messageBox("#{sBarterDialog4}");
+                MWBase::Environment::get().getWindowManager()->messageBox("#{sBarterDialog4}");
                 return;
             }
         }
@@ -296,7 +296,7 @@ namespace MWGui
         {
             CountDialog* dialog = MWBase::Environment::get().getWindowManager()->getCountDialog();
             std::string message = mTrading ? "#{sQuanityMenuMessage01}" : "#{sTake}";
-            std::string name{object.getClass().getName(object)};
+            std::string name{ object.getClass().getName(object) };
             name += MWGui::ToolTips::getSoulString(object.getCellRef());
             dialog->openCountDialog(name, message, count);
             dialog->eventOkClicked.clear();
@@ -310,9 +310,9 @@ namespace MWGui
         {
             mSelectedItem = index;
             if (mTrading)
-                sellItem (nullptr, count);
+                sellItem(nullptr, count);
             else
-                dragItem (nullptr, count);
+                dragItem(nullptr, count);
         }
     }
 
@@ -328,11 +328,11 @@ namespace MWGui
             // since the item pointed does not exist anymore.
             if (item.mBase != newStack)
             {
-                updateItemView();  // Unequipping can produce a new stack, not yet in the window...
+                updateItemView(); // Unequipping can produce a new stack, not yet in the window...
 
                 // newIndex will store the index of the ItemStack the item was stacked on
                 int newIndex = -1;
-                for (size_t i=0; i < mTradeModel->getItemCount(); ++i)
+                for (size_t i = 0; i < mTradeModel->getItemCount(); ++i)
                 {
                     if (mTradeModel->getItem(i).mBase == newStack)
                     {
@@ -408,7 +408,7 @@ namespace MWGui
     std::string InventoryWindow::getModeSetting() const
     {
         std::string setting = "inventory";
-        switch(mGuiMode)
+        switch (mGuiMode)
         {
             case GM_Container:
                 setting += " container";
@@ -456,18 +456,20 @@ namespace MWGui
 
     void InventoryWindow::updateArmorRating()
     {
-        mArmorRating->setCaptionWithReplacing ("#{sArmor}: "
-            + MyGUI::utility::toString(static_cast<int>(mPtr.getClass().getArmorRating(mPtr))));
+        mArmorRating->setCaptionWithReplacing(
+            "#{sArmor}: " + MyGUI::utility::toString(static_cast<int>(mPtr.getClass().getArmorRating(mPtr))));
         if (mArmorRating->getTextSize().width > mArmorRating->getSize().width)
-            mArmorRating->setCaptionWithReplacing (MyGUI::utility::toString(static_cast<int>(mPtr.getClass().getArmorRating(mPtr))));
+            mArmorRating->setCaptionWithReplacing(
+                MyGUI::utility::toString(static_cast<int>(mPtr.getClass().getArmorRating(mPtr))));
     }
 
     void InventoryWindow::updatePreviewSize()
     {
         const MyGUI::IntSize viewport = getPreviewViewportSize();
         mPreview->setViewport(viewport.width, viewport.height);
-        mAvatarImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f,
-                                                                     viewport.width / float(mPreview->getTextureWidth()), viewport.height / float(mPreview->getTextureHeight())));
+        mAvatarImage->getSubWidgetMain()->_setUVSet(
+            MyGUI::FloatRect(0.f, 0.f, viewport.width / float(mPreview->getTextureWidth()),
+                viewport.height / float(mPreview->getTextureHeight())));
     }
 
     void InventoryWindow::onNameFilterChanged(MyGUI::EditBox* _sender)
@@ -514,7 +516,7 @@ namespace MWGui
             MWBase::Environment::get().getWindowManager()->toggleVisible(GW_Inventory);
     }
 
-    void InventoryWindow::useItem(const MWWorld::Ptr &ptr, bool force)
+    void InventoryWindow::useItem(const MWWorld::Ptr& ptr, bool force)
     {
         std::string_view script = ptr.getClass().getScript(ptr);
         if (!script.empty())
@@ -530,7 +532,8 @@ namespace MWGui
 
         MWWorld::Ptr player = MWMechanics::getPlayer();
 
-        // early-out for items that need to be equipped, but can't be equipped: we don't want to set OnPcEquip in that case
+        // early-out for items that need to be equipped, but can't be equipped: we don't want to set OnPcEquip in that
+        // case
         if (!ptr.getClass().getEquipmentSlots(ptr).first.empty())
         {
             if (ptr.getClass().hasItemHealth(ptr) && ptr.getCellRef().getCharge() == 0)
@@ -589,14 +592,15 @@ namespace MWGui
             if (mDragAndDrop->mSourceModel != mTradeModel)
             {
                 // Move item to the player's inventory
-                ptr = mDragAndDrop->mSourceModel->moveItem(mDragAndDrop->mItem, mDragAndDrop->mDraggedCount, mTradeModel);
+                ptr = mDragAndDrop->mSourceModel->moveItem(
+                    mDragAndDrop->mItem, mDragAndDrop->mDraggedCount, mTradeModel);
             }
 
             useItem(ptr);
 
-            // If item is ingredient or potion don't stop drag and drop to simplify action of taking more than one 1 item
-            if ((ptr.getType() == ESM::Potion::sRecordId ||
-                 ptr.getType() == ESM::Ingredient::sRecordId)
+            // If item is ingredient or potion don't stop drag and drop to simplify action of taking more than one 1
+            // item
+            if ((ptr.getType() == ESM::Potion::sRecordId || ptr.getType() == ESM::Ingredient::sRecordId)
                 && mDragAndDrop->mDraggedCount > 1)
             {
                 // Item can be provided from other window for example container.
@@ -607,14 +611,15 @@ namespace MWGui
         }
         else
         {
-            MyGUI::IntPoint mousePos = MyGUI::InputManager::getInstance ().getLastPressedPosition (MyGUI::MouseButton::Left);
-            MyGUI::IntPoint relPos = mousePos - mAvatarImage->getAbsolutePosition ();
+            MyGUI::IntPoint mousePos
+                = MyGUI::InputManager::getInstance().getLastPressedPosition(MyGUI::MouseButton::Left);
+            MyGUI::IntPoint relPos = mousePos - mAvatarImage->getAbsolutePosition();
 
-            MWWorld::Ptr itemSelected = getAvatarSelectedItem (relPos.left, relPos.top);
-            if (itemSelected.isEmpty ())
+            MWWorld::Ptr itemSelected = getAvatarSelectedItem(relPos.left, relPos.top);
+            if (itemSelected.isEmpty())
                 return;
 
-            for (size_t i=0; i < mTradeModel->getItemCount (); ++i)
+            for (size_t i = 0; i < mTradeModel->getItemCount(); ++i)
             {
                 if (mTradeModel->getItem(i).mBase == itemSelected)
                 {
@@ -635,7 +640,7 @@ namespace MWGui
             return MWWorld::Ptr();
 
         MWWorld::InventoryStore& invStore = mPtr.getClass().getInventoryStore(mPtr);
-        if(invStore.getSlot(slot) != invStore.end())
+        if (invStore.getSlot(slot) != invStore.end())
         {
             MWWorld::Ptr item = *invStore.getSlot(slot);
             if (!item.getClass().showsInInventory(item))
@@ -694,31 +699,23 @@ namespace MWGui
         // update the spell window just in case new enchanted items were added to inventory
         MWBase::Environment::get().getWindowManager()->updateSpellWindow();
 
-        MWBase::Environment::get().getMechanicsManager()->updateMagicEffects(
-                    MWMechanics::getPlayer());
+        MWBase::Environment::get().getMechanicsManager()->updateMagicEffects(MWMechanics::getPlayer());
 
         dirtyPreview();
     }
 
-    void InventoryWindow::pickUpObject (MWWorld::Ptr object)
+    void InventoryWindow::pickUpObject(MWWorld::Ptr object)
     {
         // If the inventory is not yet enabled, don't pick anything up
         if (!MWBase::Environment::get().getWindowManager()->isAllowed(GW_Inventory))
             return;
         // make sure the object is of a type that can be picked up
         auto type = object.getType();
-        if ( (type != ESM::Apparatus::sRecordId)
-            && (type != ESM::Armor::sRecordId)
-            && (type != ESM::Book::sRecordId)
-            && (type != ESM::Clothing::sRecordId)
-            && (type != ESM::Ingredient::sRecordId)
-            && (type != ESM::Light::sRecordId)
-            && (type != ESM::Miscellaneous::sRecordId)
-            && (type != ESM::Lockpick::sRecordId)
-            && (type != ESM::Probe::sRecordId)
-            && (type != ESM::Repair::sRecordId)
-            && (type != ESM::Weapon::sRecordId)
-            && (type != ESM::Potion::sRecordId))
+        if ((type != ESM::Apparatus::sRecordId) && (type != ESM::Armor::sRecordId) && (type != ESM::Book::sRecordId)
+            && (type != ESM::Clothing::sRecordId) && (type != ESM::Ingredient::sRecordId)
+            && (type != ESM::Light::sRecordId) && (type != ESM::Miscellaneous::sRecordId)
+            && (type != ESM::Lockpick::sRecordId) && (type != ESM::Probe::sRecordId) && (type != ESM::Repair::sRecordId)
+            && (type != ESM::Weapon::sRecordId) && (type != ESM::Potion::sRecordId))
             return;
 
         // An object that can be picked up must have a tooltip.
@@ -731,7 +728,7 @@ namespace MWGui
 
         MWWorld::Ptr player = MWMechanics::getPlayer();
         MWBase::Environment::get().getWorld()->breakInvisibility(player);
-        
+
         if (!object.getRefData().activate())
             return;
 
@@ -745,15 +742,16 @@ namespace MWGui
 
         // add to player inventory
         // can't use ActionTake here because we need an MWWorld::Ptr to the newly inserted object
-        MWWorld::Ptr newObject = *player.getClass().getContainerStore (player).add (object, object.getRefData().getCount(), player);
+        MWWorld::Ptr newObject
+            = *player.getClass().getContainerStore(player).add(object, object.getRefData().getCount(), player);
 
         // remove from world
-        MWBase::Environment::get().getWorld()->deleteObject (object);
+        MWBase::Environment::get().getWorld()->deleteObject(object);
 
         // get ModelIndex to the item
         mTradeModel->update();
-        size_t i=0;
-        for (; i<mTradeModel->getItemCount(); ++i)
+        size_t i = 0;
+        for (; i < mTradeModel->getItemCount(); ++i)
         {
             if (mTradeModel->getItem(i).mBase == newObject)
                 break;
@@ -772,7 +770,7 @@ namespace MWGui
         if (MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(player))
             return;
 
-        const MWMechanics::CreatureStats &stats = player.getClass().getCreatureStats(player);
+        const MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
         bool godmode = MWBase::Environment::get().getWorld()->getGodModeState();
         if ((!godmode && stats.isParalyzed()) || stats.getKnockedDown() || stats.isDead() || stats.getHitRecovery())
             return;
@@ -785,7 +783,7 @@ namespace MWGui
         if (model.getItemCount() == 0)
             return;
 
-        for (ItemModel::ModelIndex i=0; i<int(model.getItemCount()); ++i)
+        for (ItemModel::ModelIndex i = 0; i < int(model.getItemCount()); ++i)
         {
             MWWorld::Ptr item = model.getItem(i).mBase;
             if (model.getItem(i).mType & ItemStack::Type_Equipped && isRightHandWeapon(item))
@@ -798,22 +796,22 @@ namespace MWGui
         if (selected != -1)
             lastId = model.getItem(selected).mBase.getCellRef().getRefId();
         ItemModel::ModelIndex cycled = selected;
-        for (unsigned int i=0; i<model.getItemCount(); ++i)
+        for (unsigned int i = 0; i < model.getItemCount(); ++i)
         {
             cycled += incr;
             cycled = (cycled + model.getItemCount()) % model.getItemCount();
 
             MWWorld::Ptr item = model.getItem(cycled).mBase;
 
-            // skip different stacks of the same item, or we will get stuck as stacking/unstacking them may change their relative ordering
+            // skip different stacks of the same item, or we will get stuck as stacking/unstacking them may change their
+            // relative ordering
             if (Misc::StringUtils::ciEqual(lastId, item.getCellRef().getRefId()))
                 continue;
 
             lastId = item.getCellRef().getRefId();
 
-            if (item.getClass().getType() == ESM::Weapon::sRecordId &&
-                isRightHandWeapon(item) &&
-                item.getClass().canBeEquipped(item, player).first)
+            if (item.getClass().getType() == ESM::Weapon::sRecordId && isRightHandWeapon(item)
+                && item.getClass().canBeEquipped(item, player).first)
             {
                 found = true;
                 break;
@@ -837,7 +835,7 @@ namespace MWGui
         const float scale = MWBase::Environment::get().getWindowManager()->getScalingFactor();
 
         return MyGUI::IntSize(std::min<int>(mPreview->getTextureWidth(), previewWindowSize.width * scale),
-                              std::min<int>(mPreview->getTextureHeight(), previewWindowSize.height * scale));
+            std::min<int>(mPreview->getTextureHeight(), previewWindowSize.height * scale));
     }
 
     osg::Vec2f InventoryWindow::mapPreviewWindowToViewport(int x, int y) const
@@ -847,9 +845,6 @@ namespace MWGui
         const float normalisedY = y / std::max<float>(1.0f, previewWindowSize.height);
 
         const MyGUI::IntSize viewport = getPreviewViewportSize();
-        return osg::Vec2f(
-            normalisedX * float(viewport.width - 1),
-            (1.0 - normalisedY) * float(viewport.height - 1)
-        );
+        return osg::Vec2f(normalisedX * float(viewport.width - 1), (1.0 - normalisedY) * float(viewport.height - 1));
     }
 }
diff --git a/apps/openmw/mwgui/inventorywindow.hpp b/apps/openmw/mwgui/inventorywindow.hpp
index a89e9a945f..be331297ed 100644
--- a/apps/openmw/mwgui/inventorywindow.hpp
+++ b/apps/openmw/mwgui/inventorywindow.hpp
@@ -1,11 +1,11 @@
 #ifndef MGUI_Inventory_H
 #define MGUI_Inventory_H
 
-#include "windowpinnablebase.hpp"
 #include "mode.hpp"
+#include "windowpinnablebase.hpp"
 
-#include "../mwworld/ptr.hpp"
 #include "../mwrender/characterpreview.hpp"
+#include "../mwworld/ptr.hpp"
 
 namespace osg
 {
@@ -32,111 +32,112 @@ namespace MWGui
 
     class InventoryWindow : public WindowPinnableBase
     {
-        public:
-            InventoryWindow(DragAndDrop* dragAndDrop, osg::Group* parent, Resource::ResourceSystem* resourceSystem);
+    public:
+        InventoryWindow(DragAndDrop* dragAndDrop, osg::Group* parent, Resource::ResourceSystem* resourceSystem);
+
+        void onOpen() override;
 
-            void onOpen() override;
+        /// start trading, disables item drag&drop
+        void setTrading(bool trading);
 
-            /// start trading, disables item drag&drop
-            void setTrading(bool trading);
+        void onFrame(float dt) override;
 
-            void onFrame(float dt) override;
+        void pickUpObject(MWWorld::Ptr object);
 
-            void pickUpObject (MWWorld::Ptr object);
+        MWWorld::Ptr getAvatarSelectedItem(int x, int y);
 
-            MWWorld::Ptr getAvatarSelectedItem(int x, int y);
+        void rebuildAvatar();
 
-            void rebuildAvatar();
+        SortFilterItemModel* getSortFilterModel();
+        TradeItemModel* getTradeModel();
+        ItemModel* getModel();
 
-            SortFilterItemModel* getSortFilterModel();
-            TradeItemModel* getTradeModel();
-            ItemModel* getModel();
+        void updateItemView();
 
-            void updateItemView();
+        void updatePlayer();
 
-            void updatePlayer();
+        void clear() override;
 
-            void clear() override;
+        void useItem(const MWWorld::Ptr& ptr, bool force = false);
 
-            void useItem(const MWWorld::Ptr& ptr, bool force=false);
+        void setGuiMode(GuiMode mode);
 
-            void setGuiMode(GuiMode mode);
+        /// Cycle to previous/next weapon
+        void cycle(bool next);
 
-            /// Cycle to previous/next weapon
-            void cycle(bool next);
+    protected:
+        void onTitleDoubleClicked() override;
 
-        protected:
-            void onTitleDoubleClicked() override;
+    private:
+        DragAndDrop* mDragAndDrop;
 
-        private:
-            DragAndDrop* mDragAndDrop;
+        int mSelectedItem;
 
-            int mSelectedItem;
+        MWWorld::Ptr mPtr;
 
-            MWWorld::Ptr mPtr;
+        MWGui::ItemView* mItemView;
+        SortFilterItemModel* mSortModel;
+        TradeItemModel* mTradeModel;
 
-            MWGui::ItemView* mItemView;
-            SortFilterItemModel* mSortModel;
-            TradeItemModel* mTradeModel;
+        MyGUI::Widget* mAvatar;
+        MyGUI::ImageBox* mAvatarImage;
+        MyGUI::TextBox* mArmorRating;
+        Widgets::MWDynamicStat* mEncumbranceBar;
 
-            MyGUI::Widget* mAvatar;
-            MyGUI::ImageBox* mAvatarImage;
-            MyGUI::TextBox* mArmorRating;
-            Widgets::MWDynamicStat* mEncumbranceBar;
+        MyGUI::Widget* mLeftPane;
+        MyGUI::Widget* mRightPane;
 
-            MyGUI::Widget* mLeftPane;
-            MyGUI::Widget* mRightPane;
+        MyGUI::Button* mFilterAll;
+        MyGUI::Button* mFilterWeapon;
+        MyGUI::Button* mFilterApparel;
+        MyGUI::Button* mFilterMagic;
+        MyGUI::Button* mFilterMisc;
 
-            MyGUI::Button* mFilterAll;
-            MyGUI::Button* mFilterWeapon;
-            MyGUI::Button* mFilterApparel;
-            MyGUI::Button* mFilterMagic;
-            MyGUI::Button* mFilterMisc;
-            
-            MyGUI::EditBox* mFilterEdit;
+        MyGUI::EditBox* mFilterEdit;
 
-            GuiMode mGuiMode;
+        GuiMode mGuiMode;
 
-            int mLastXSize;
-            int mLastYSize;
+        int mLastXSize;
+        int mLastYSize;
 
-            std::unique_ptr<MyGUI::ITexture> mPreviewTexture;
-            std::unique_ptr<MWRender::InventoryPreview> mPreview;
+        std::unique_ptr<MyGUI::ITexture> mPreviewTexture;
+        std::unique_ptr<MWRender::InventoryPreview> mPreview;
 
-            bool mTrading;
-            float mUpdateTimer;
+        bool mTrading;
+        float mUpdateTimer;
 
-            void toggleMaximized();
+        void toggleMaximized();
 
-            void onItemSelected(int index);
-            void onItemSelectedFromSourceModel(int index);
+        void onItemSelected(int index);
+        void onItemSelectedFromSourceModel(int index);
 
-            void onBackgroundSelected();
+        void onBackgroundSelected();
 
-            std::string getModeSetting() const;
+        std::string getModeSetting() const;
 
-            void sellItem(MyGUI::Widget* sender, int count);
-            void dragItem(MyGUI::Widget* sender, int count);
+        void sellItem(MyGUI::Widget* sender, int count);
+        void dragItem(MyGUI::Widget* sender, int count);
 
-            void onWindowResize(MyGUI::Window* _sender);
-            void onFilterChanged(MyGUI::Widget* _sender);
-            void onNameFilterChanged(MyGUI::EditBox* _sender);
-            void onAvatarClicked(MyGUI::Widget* _sender);
-            void onPinToggled() override;
+        void onWindowResize(MyGUI::Window* _sender);
+        void onFilterChanged(MyGUI::Widget* _sender);
+        void onNameFilterChanged(MyGUI::EditBox* _sender);
+        void onAvatarClicked(MyGUI::Widget* _sender);
+        void onPinToggled() override;
 
-            void updateEncumbranceBar();
-            void notifyContentChanged();
-            void dirtyPreview();
-            void updatePreviewSize();
-            void updateArmorRating();
+        void updateEncumbranceBar();
+        void notifyContentChanged();
+        void dirtyPreview();
+        void updatePreviewSize();
+        void updateArmorRating();
 
-            MyGUI::IntSize getPreviewViewportSize() const;
-            osg::Vec2f mapPreviewWindowToViewport(int x, int y) const;
+        MyGUI::IntSize getPreviewViewportSize() const;
+        osg::Vec2f mapPreviewWindowToViewport(int x, int y) const;
 
-            void adjustPanes();
+        void adjustPanes();
 
-            /// Unequips count items from mSelectedItem, if it is equipped, and then updates mSelectedItem in case the items were re-stacked
-            void ensureSelectedItemUnequipped(int count);
+        /// Unequips count items from mSelectedItem, if it is equipped, and then updates mSelectedItem in case the items
+        /// were re-stacked
+        void ensureSelectedItemUnequipped(int count);
     };
 }
 
diff --git a/apps/openmw/mwgui/itemchargeview.cpp b/apps/openmw/mwgui/itemchargeview.cpp
index e2745003e7..b7dc441b49 100644
--- a/apps/openmw/mwgui/itemchargeview.cpp
+++ b/apps/openmw/mwgui/itemchargeview.cpp
@@ -2,10 +2,10 @@
 
 #include <set>
 
+#include <MyGUI_FactoryManager.h>
 #include <MyGUI_Gui.h>
-#include <MyGUI_TextBox.h>
 #include <MyGUI_ScrollView.h>
-#include <MyGUI_FactoryManager.h>
+#include <MyGUI_TextBox.h>
 
 #include <components/esm3/loadench.hpp>
 
@@ -22,8 +22,8 @@
 namespace MWGui
 {
     ItemChargeView::ItemChargeView()
-        : mScrollView(nullptr),
-          mDisplayMode(DisplayMode_Health)
+        : mScrollView(nullptr)
+        , mDisplayMode(DisplayMode_Health)
     {
     }
 
@@ -92,17 +92,20 @@ namespace MWGui
                 Line line;
                 line.mItemPtr = stack.mBase;
 
-                line.mText = mScrollView->createWidget<MyGUI::TextBox>("SandText", MyGUI::IntCoord(), MyGUI::Align::Default);
+                line.mText
+                    = mScrollView->createWidget<MyGUI::TextBox>("SandText", MyGUI::IntCoord(), MyGUI::Align::Default);
                 line.mText->setNeedMouseFocus(false);
 
-                line.mIcon = mScrollView->createWidget<ItemWidget>("MW_ItemIconSmall", MyGUI::IntCoord(), MyGUI::Align::Default);
+                line.mIcon = mScrollView->createWidget<ItemWidget>(
+                    "MW_ItemIconSmall", MyGUI::IntCoord(), MyGUI::Align::Default);
                 line.mIcon->setItem(line.mItemPtr);
                 line.mIcon->setUserString("ToolTipType", "ItemPtr");
                 line.mIcon->setUserData(MWWorld::Ptr(line.mItemPtr));
                 line.mIcon->eventMouseButtonClick += MyGUI::newDelegate(this, &ItemChargeView::onIconClicked);
                 line.mIcon->eventMouseWheel += MyGUI::newDelegate(this, &ItemChargeView::onMouseWheelMoved);
 
-                line.mCharge = mScrollView->createWidget<Widgets::MWDynamicStat>("MW_ChargeBar", MyGUI::IntCoord(), MyGUI::Align::Default);
+                line.mCharge = mScrollView->createWidget<Widgets::MWDynamicStat>(
+                    "MW_ChargeBar", MyGUI::IntCoord(), MyGUI::Align::Default);
                 line.mCharge->setNeedMouseFocus(false);
 
                 updateLine(line);
@@ -133,17 +136,19 @@ namespace MWGui
 
         for (Line& line : mLines)
         {
-            line.mText->setCoord(8, currentY, mScrollView->getWidth()-8, 18);
+            line.mText->setCoord(8, currentY, mScrollView->getWidth() - 8, 18);
             currentY += 19;
 
             line.mIcon->setCoord(16, currentY, 32, 32);
-            line.mCharge->setCoord(72, currentY+2, std::max(199, mScrollView->getWidth()-72-38), 20);
+            line.mCharge->setCoord(72, currentY + 2, std::max(199, mScrollView->getWidth() - 72 - 38), 20);
             currentY += 32 + 4;
         }
 
-        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the scrollbar is hidden
+        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the
+        // scrollbar is hidden
         mScrollView->setVisibleVScroll(false);
-        mScrollView->setCanvasSize(MyGUI::IntSize(mScrollView->getWidth(), std::max(mScrollView->getHeight(), currentY)));
+        mScrollView->setCanvasSize(
+            MyGUI::IntSize(mScrollView->getWidth(), std::max(mScrollView->getHeight(), currentY)));
         mScrollView->setVisibleVScroll(true);
     }
 
@@ -182,19 +187,20 @@ namespace MWGui
 
                 line.mCharge->setVisible(true);
                 line.mCharge->setValue(line.mItemPtr.getClass().getItemHealth(line.mItemPtr),
-                                       line.mItemPtr.getClass().getItemMaxHealth(line.mItemPtr));
+                    line.mItemPtr.getClass().getItemMaxHealth(line.mItemPtr));
                 break;
             case DisplayMode_EnchantmentCharge:
                 std::string_view enchId = line.mItemPtr.getClass().getEnchantment(line.mItemPtr);
                 if (enchId.empty())
                     break;
-                const ESM::Enchantment* ench = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().search(enchId);
+                const ESM::Enchantment* ench
+                    = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().search(enchId);
                 if (!ench)
                     break;
 
                 line.mCharge->setVisible(true);
-                line.mCharge->setValue(static_cast<int>(line.mItemPtr.getCellRef().getEnchantmentCharge()),
-                                       ench->mData.mCharge);
+                line.mCharge->setValue(
+                    static_cast<int>(line.mItemPtr.getCellRef().getEnchantmentCharge()), ench->mData.mCharge);
                 break;
         }
     }
@@ -206,9 +212,10 @@ namespace MWGui
 
     void ItemChargeView::onMouseWheelMoved(MyGUI::Widget* /*sender*/, int rel)
     {
-        if (mScrollView->getViewOffset().top + rel*0.3f > 0)
+        if (mScrollView->getViewOffset().top + rel * 0.3f > 0)
             mScrollView->setViewOffset(MyGUI::IntPoint(0, 0));
         else
-            mScrollView->setViewOffset(MyGUI::IntPoint(0, static_cast<int>(mScrollView->getViewOffset().top + rel*0.3f)));
+            mScrollView->setViewOffset(
+                MyGUI::IntPoint(0, static_cast<int>(mScrollView->getViewOffset().top + rel * 0.3f)));
     }
 }
diff --git a/apps/openmw/mwgui/itemchargeview.hpp b/apps/openmw/mwgui/itemchargeview.hpp
index 039dcaf4e6..8c266c4a26 100644
--- a/apps/openmw/mwgui/itemchargeview.hpp
+++ b/apps/openmw/mwgui/itemchargeview.hpp
@@ -1,8 +1,8 @@
 #ifndef MWGUI_ITEMCHARGEVIEW_H
 #define MWGUI_ITEMCHARGEVIEW_H
 
-#include <vector>
 #include <memory>
+#include <vector>
 
 #include <MyGUI_Widget.h>
 
@@ -24,54 +24,54 @@ namespace MWGui
     class ItemChargeView final : public MyGUI::Widget
     {
         MYGUI_RTTI_DERIVED(ItemChargeView)
-        public:
-            enum DisplayMode
-            {
-                DisplayMode_Health,
-                DisplayMode_EnchantmentCharge
-            };
+    public:
+        enum DisplayMode
+        {
+            DisplayMode_Health,
+            DisplayMode_EnchantmentCharge
+        };
 
-            ItemChargeView();
+        ItemChargeView();
 
-            /// Register needed components with MyGUI's factory manager
-            static void registerComponents();
+        /// Register needed components with MyGUI's factory manager
+        static void registerComponents();
 
-            void initialiseOverride() override;
+        void initialiseOverride() override;
 
-            /// Takes ownership of \a model
-            void setModel(ItemModel* model);
+        /// Takes ownership of \a model
+        void setModel(ItemModel* model);
 
-            void setDisplayMode(DisplayMode type);
+        void setDisplayMode(DisplayMode type);
 
-            void update();
-            void layoutWidgets();
-            void resetScrollbars();
+        void update();
+        void layoutWidgets();
+        void resetScrollbars();
 
-            void setSize(const MyGUI::IntSize& value) override;
-            void setCoord(const MyGUI::IntCoord& value) override;
+        void setSize(const MyGUI::IntSize& value) override;
+        void setCoord(const MyGUI::IntCoord& value) override;
 
-            MyGUI::delegates::CMultiDelegate2<MyGUI::Widget*, const MWWorld::Ptr&> eventItemClicked;
+        MyGUI::delegates::CMultiDelegate2<MyGUI::Widget*, const MWWorld::Ptr&> eventItemClicked;
 
-        private:
-            struct Line
-            {
-                MWWorld::Ptr mItemPtr;
-                MyGUI::TextBox* mText;
-                ItemWidget* mIcon;
-                Widgets::MWDynamicStatPtr mCharge;
-            };
+    private:
+        struct Line
+        {
+            MWWorld::Ptr mItemPtr;
+            MyGUI::TextBox* mText;
+            ItemWidget* mIcon;
+            Widgets::MWDynamicStatPtr mCharge;
+        };
 
-            void updateLine(const Line& line);
+        void updateLine(const Line& line);
 
-            void onIconClicked(MyGUI::Widget* sender);
-            void onMouseWheelMoved(MyGUI::Widget* sender, int rel);
+        void onIconClicked(MyGUI::Widget* sender);
+        void onMouseWheelMoved(MyGUI::Widget* sender, int rel);
 
-            typedef std::vector<Line> Lines;
-            Lines mLines;
+        typedef std::vector<Line> Lines;
+        Lines mLines;
 
-            std::unique_ptr<ItemModel> mModel;
-            MyGUI::ScrollView* mScrollView;
-            DisplayMode mDisplayMode;
+        std::unique_ptr<ItemModel> mModel;
+        MyGUI::ScrollView* mScrollView;
+        DisplayMode mDisplayMode;
     };
 }
 
diff --git a/apps/openmw/mwgui/itemmodel.cpp b/apps/openmw/mwgui/itemmodel.cpp
index 55b2994199..810c8944dd 100644
--- a/apps/openmw/mwgui/itemmodel.cpp
+++ b/apps/openmw/mwgui/itemmodel.cpp
@@ -9,7 +9,7 @@
 namespace MWGui
 {
 
-    ItemStack::ItemStack(const MWWorld::Ptr &base, ItemModel *creator, size_t count)
+    ItemStack::ItemStack(const MWWorld::Ptr& base, ItemModel* creator, size_t count)
         : mType(Type_Normal)
         , mFlags(0)
         , mCreator(creator)
@@ -31,18 +31,18 @@ namespace MWGui
     {
     }
 
-    bool operator == (const ItemStack& left, const ItemStack& right)
+    bool operator==(const ItemStack& left, const ItemStack& right)
     {
         if (left.mType != right.mType)
             return false;
 
-        if(left.mBase == right.mBase)
+        if (left.mBase == right.mBase)
             return true;
 
         // If one of the items is in an inventory and currently equipped, we need to check stacking both ways to be sure
         if (left.mBase.getContainerStore() && right.mBase.getContainerStore())
             return left.mBase.getContainerStore()->stacks(left.mBase, right.mBase)
-                    && right.mBase.getContainerStore()->stacks(left.mBase, right.mBase);
+                && right.mBase.getContainerStore()->stacks(left.mBase, right.mBase);
 
         if (left.mBase.getContainerStore())
             return left.mBase.getContainerStore()->stacks(left.mBase, right.mBase);
@@ -53,11 +53,9 @@ namespace MWGui
         return store.stacks(left.mBase, right.mBase);
     }
 
-    ItemModel::ItemModel()
-    {
-    }
+    ItemModel::ItemModel() {}
 
-    MWWorld::Ptr ItemModel::moveItem(const ItemStack &item, size_t count, ItemModel *otherModel)
+    MWWorld::Ptr ItemModel::moveItem(const ItemStack& item, size_t count, ItemModel* otherModel)
     {
         MWWorld::Ptr ret = otherModel->copyItem(item, count);
         removeItem(item, count);
@@ -69,12 +67,12 @@ namespace MWGui
         return true;
     }
 
-    bool ItemModel::onDropItem(const MWWorld::Ptr &item, int count)
+    bool ItemModel::onDropItem(const MWWorld::Ptr& item, int count)
     {
         return true;
     }
 
-    bool ItemModel::onTakeItem(const MWWorld::Ptr &item, int count)
+    bool ItemModel::onTakeItem(const MWWorld::Ptr& item, int count)
     {
         return true;
     }
@@ -84,20 +82,20 @@ namespace MWGui
         return mSourceModel->allowedToUseItems();
     }
 
-    MWWorld::Ptr ProxyItemModel::copyItem (const ItemStack& item, size_t count, bool allowAutoEquip)
+    MWWorld::Ptr ProxyItemModel::copyItem(const ItemStack& item, size_t count, bool allowAutoEquip)
     {
-        return mSourceModel->copyItem (item, count, allowAutoEquip);
+        return mSourceModel->copyItem(item, count, allowAutoEquip);
     }
 
-    void ProxyItemModel::removeItem (const ItemStack& item, size_t count)
+    void ProxyItemModel::removeItem(const ItemStack& item, size_t count)
     {
-        mSourceModel->removeItem (item, count);
+        mSourceModel->removeItem(item, count);
     }
 
-    ItemModel::ModelIndex ProxyItemModel::mapToSource (ModelIndex index)
+    ItemModel::ModelIndex ProxyItemModel::mapToSource(ModelIndex index)
     {
         const ItemStack& itemToSearch = getItem(index);
-        for (size_t i=0; i<mSourceModel->getItemCount(); ++i)
+        for (size_t i = 0; i < mSourceModel->getItemCount(); ++i)
         {
             const ItemStack& item = mSourceModel->getItem(i);
             if (item.mBase == itemToSearch.mBase)
@@ -106,10 +104,10 @@ namespace MWGui
         return -1;
     }
 
-    ItemModel::ModelIndex ProxyItemModel::mapFromSource (ModelIndex index)
+    ItemModel::ModelIndex ProxyItemModel::mapFromSource(ModelIndex index)
     {
         const ItemStack& itemToSearch = mSourceModel->getItem(index);
-        for (size_t i=0; i<getItemCount(); ++i)
+        for (size_t i = 0; i < getItemCount(); ++i)
         {
             const ItemStack& item = getItem(i);
             if (item.mBase == itemToSearch.mBase)
@@ -118,7 +116,7 @@ namespace MWGui
         return -1;
     }
 
-    ItemModel::ModelIndex ProxyItemModel::getIndex (const ItemStack& item)
+    ItemModel::ModelIndex ProxyItemModel::getIndex(const ItemStack& item)
     {
         return mSourceModel->getIndex(item);
     }
@@ -133,12 +131,12 @@ namespace MWGui
         mSourceModel->onClose();
     }
 
-    bool ProxyItemModel::onDropItem(const MWWorld::Ptr &item, int count)
+    bool ProxyItemModel::onDropItem(const MWWorld::Ptr& item, int count)
     {
         return mSourceModel->onDropItem(item, count);
     }
 
-    bool ProxyItemModel::onTakeItem(const MWWorld::Ptr &item, int count)
+    bool ProxyItemModel::onTakeItem(const MWWorld::Ptr& item, int count)
     {
         return mSourceModel->onTakeItem(item, count);
     }
diff --git a/apps/openmw/mwgui/itemmodel.hpp b/apps/openmw/mwgui/itemmodel.hpp
index 9ddcaffc50..c7143b4b91 100644
--- a/apps/openmw/mwgui/itemmodel.hpp
+++ b/apps/openmw/mwgui/itemmodel.hpp
@@ -13,7 +13,7 @@ namespace MWGui
     /// @brief A single item stack managed by an item model
     struct ItemStack
     {
-        ItemStack (const MWWorld::Ptr& base, ItemModel* creator, size_t count);
+        ItemStack(const MWWorld::Ptr& base, ItemModel* creator, size_t count);
         ItemStack();
         ///< like operator==, only without checking mType
 
@@ -27,8 +27,8 @@ namespace MWGui
 
         enum Flags
         {
-            Flag_Enchanted = (1<<0),
-            Flag_Bound = (1<<1)
+            Flag_Enchanted = (1 << 0),
+            Flag_Bound = (1 << 1)
         };
         int mFlags;
 
@@ -37,8 +37,7 @@ namespace MWGui
         MWWorld::Ptr mBase;
     };
 
-    bool operator == (const ItemStack& left, const ItemStack& right);
-
+    bool operator==(const ItemStack& left, const ItemStack& right);
 
     /// @brief The base class that all item models should derive from.
     class ItemModel
@@ -50,32 +49,30 @@ namespace MWGui
         typedef int ModelIndex; // -1 means invalid index
 
         /// Throws for invalid index or out of range index
-        virtual ItemStack getItem (ModelIndex index) = 0;
+        virtual ItemStack getItem(ModelIndex index) = 0;
 
         /// The number of items in the model, this specifies the range of indices you can pass to
         /// the getItem function (but this range is only valid until the next call to update())
         virtual size_t getItemCount() = 0;
 
         /// Returns an invalid index if the item was not found
-        virtual ModelIndex getIndex (const ItemStack &item) = 0;
+        virtual ModelIndex getIndex(const ItemStack& item) = 0;
 
         /// Rebuild the item model, this will invalidate existing model indices
         virtual void update() = 0;
 
         /// Move items from this model to \a otherModel.
         /// @note Derived implementations may return an empty Ptr if the move was unsuccessful.
-        virtual MWWorld::Ptr moveItem (const ItemStack& item, size_t count, ItemModel* otherModel);
+        virtual MWWorld::Ptr moveItem(const ItemStack& item, size_t count, ItemModel* otherModel);
 
-        virtual MWWorld::Ptr copyItem (const ItemStack& item, size_t count, bool allowAutoEquip = true) = 0;
-        virtual void removeItem (const ItemStack& item, size_t count) = 0;
+        virtual MWWorld::Ptr copyItem(const ItemStack& item, size_t count, bool allowAutoEquip = true) = 0;
+        virtual void removeItem(const ItemStack& item, size_t count) = 0;
 
         /// Is the player allowed to use items from this item model? (default true)
         virtual bool allowedToUseItems() const;
-        virtual void onClose()
-        {
-        }
-        virtual bool onDropItem(const MWWorld::Ptr &item, int count);
-        virtual bool onTakeItem(const MWWorld::Ptr &item, int count);
+        virtual void onClose() {}
+        virtual bool onDropItem(const MWWorld::Ptr& item, int count);
+        virtual bool onTakeItem(const MWWorld::Ptr& item, int count);
 
         virtual bool usesContainer(const MWWorld::Ptr& container) = 0;
 
@@ -84,8 +81,8 @@ namespace MWGui
         ItemModel& operator=(const ItemModel&);
     };
 
-    /// @brief A proxy item model can be used to filter or rearrange items from a source model (or even add new items to it).
-    /// The neat thing is that this does not actually alter the source model.
+    /// @brief A proxy item model can be used to filter or rearrange items from a source model (or even add new items to
+    /// it). The neat thing is that this does not actually alter the source model.
     class ProxyItemModel : public ItemModel
     {
     public:
@@ -95,20 +92,21 @@ namespace MWGui
         bool allowedToUseItems() const override;
 
         void onClose() override;
-        bool onDropItem(const MWWorld::Ptr &item, int count) override;
-        bool onTakeItem(const MWWorld::Ptr &item, int count) override;
+        bool onDropItem(const MWWorld::Ptr& item, int count) override;
+        bool onTakeItem(const MWWorld::Ptr& item, int count) override;
 
-        MWWorld::Ptr copyItem (const ItemStack& item, size_t count, bool allowAutoEquip = true) override;
-        void removeItem (const ItemStack& item, size_t count) override;
-        ModelIndex getIndex (const ItemStack &item) override;
+        MWWorld::Ptr copyItem(const ItemStack& item, size_t count, bool allowAutoEquip = true) override;
+        void removeItem(const ItemStack& item, size_t count) override;
+        ModelIndex getIndex(const ItemStack& item) override;
 
         /// @note Takes ownership of the passed pointer.
         void setSourceModel(std::unique_ptr<ItemModel> sourceModel);
 
-        ModelIndex mapToSource (ModelIndex index);
-        ModelIndex mapFromSource (ModelIndex index);
+        ModelIndex mapToSource(ModelIndex index);
+        ModelIndex mapFromSource(ModelIndex index);
 
         bool usesContainer(const MWWorld::Ptr& container) override;
+
     protected:
         std::unique_ptr<ItemModel> mSourceModel;
     };
diff --git a/apps/openmw/mwgui/itemselection.cpp b/apps/openmw/mwgui/itemselection.cpp
index 1a34f5d623..4fe40ce693 100644
--- a/apps/openmw/mwgui/itemselection.cpp
+++ b/apps/openmw/mwgui/itemselection.cpp
@@ -1,16 +1,16 @@
 #include "itemselection.hpp"
 
-#include <MyGUI_TextBox.h>
 #include <MyGUI_Button.h>
+#include <MyGUI_TextBox.h>
 
-#include "itemview.hpp"
 #include "inventoryitemmodel.hpp"
+#include "itemview.hpp"
 #include "sortfilteritemmodel.hpp"
 
 namespace MWGui
 {
 
-    ItemSelectionDialog::ItemSelectionDialog(const std::string &label)
+    ItemSelectionDialog::ItemSelectionDialog(const std::string& label)
         : WindowModal("openmw_itemselection_dialog.layout")
         , mSortModel(nullptr)
     {
@@ -19,7 +19,7 @@ namespace MWGui
 
         MyGUI::TextBox* l;
         getWidget(l, "Label");
-        l->setCaptionWithReplacing (label);
+        l->setCaptionWithReplacing(label);
 
         MyGUI::Button* cancelButton;
         getWidget(cancelButton, "CancelButton");
diff --git a/apps/openmw/mwgui/itemselection.hpp b/apps/openmw/mwgui/itemselection.hpp
index 27eed8ea51..d418f5dbd6 100644
--- a/apps/openmw/mwgui/itemselection.hpp
+++ b/apps/openmw/mwgui/itemselection.hpp
@@ -28,7 +28,7 @@ namespace MWGui
         EventHandle_Item eventItemSelected;
         EventHandle_Void eventDialogCanceled;
 
-        void openContainer (const MWWorld::Ptr& container);
+        void openContainer(const MWWorld::Ptr& container);
         void setCategory(int category);
         void setFilter(int filter);
 
diff --git a/apps/openmw/mwgui/itemview.cpp b/apps/openmw/mwgui/itemview.cpp
index ba12d622c5..760fc650d6 100644
--- a/apps/openmw/mwgui/itemview.cpp
+++ b/apps/openmw/mwgui/itemview.cpp
@@ -15,154 +15,156 @@
 namespace MWGui
 {
 
-ItemView::ItemView()
-    : mScrollView(nullptr)
-{
-}
+    ItemView::ItemView()
+        : mScrollView(nullptr)
+    {
+    }
 
-void ItemView::setModel(std::unique_ptr<ItemModel> model)
-{
-    mModel = std::move(model);
+    void ItemView::setModel(std::unique_ptr<ItemModel> model)
+    {
+        mModel = std::move(model);
 
-    update();
-}
+        update();
+    }
 
-void ItemView::initialiseOverride()
-{
-    Base::initialiseOverride();
+    void ItemView::initialiseOverride()
+    {
+        Base::initialiseOverride();
 
-    assignWidget(mScrollView, "ScrollView");
-    if (mScrollView == nullptr)
-        throw std::runtime_error("Item view needs a scroll view");
+        assignWidget(mScrollView, "ScrollView");
+        if (mScrollView == nullptr)
+            throw std::runtime_error("Item view needs a scroll view");
 
-    mScrollView->setCanvasAlign(MyGUI::Align::Left | MyGUI::Align::Top);
-}
+        mScrollView->setCanvasAlign(MyGUI::Align::Left | MyGUI::Align::Top);
+    }
 
-void ItemView::layoutWidgets()
-{
-    if (!mScrollView->getChildCount())
-        return;
+    void ItemView::layoutWidgets()
+    {
+        if (!mScrollView->getChildCount())
+            return;
 
-    int x = 0;
-    int y = 0;
-    MyGUI::Widget* dragArea = mScrollView->getChildAt(0);
-    int maxHeight = mScrollView->getHeight();
+        int x = 0;
+        int y = 0;
+        MyGUI::Widget* dragArea = mScrollView->getChildAt(0);
+        int maxHeight = mScrollView->getHeight();
 
-    int rows = maxHeight/42;
-    rows = std::max(rows, 1);
-    bool showScrollbar = int(std::ceil(dragArea->getChildCount()/float(rows))) > mScrollView->getWidth()/42;
-    if (showScrollbar)
-        maxHeight -= 18;
+        int rows = maxHeight / 42;
+        rows = std::max(rows, 1);
+        bool showScrollbar = int(std::ceil(dragArea->getChildCount() / float(rows))) > mScrollView->getWidth() / 42;
+        if (showScrollbar)
+            maxHeight -= 18;
 
-    for (unsigned int i=0; i<dragArea->getChildCount(); ++i)
-    {
-        MyGUI::Widget* w = dragArea->getChildAt(i);
+        for (unsigned int i = 0; i < dragArea->getChildCount(); ++i)
+        {
+            MyGUI::Widget* w = dragArea->getChildAt(i);
 
-        w->setPosition(x, y);
+            w->setPosition(x, y);
 
-        y += 42;
+            y += 42;
 
-        if (y > maxHeight-42 && i < dragArea->getChildCount()-1)
-        {
-            x += 42;
-            y = 0;
+            if (y > maxHeight - 42 && i < dragArea->getChildCount() - 1)
+            {
+                x += 42;
+                y = 0;
+            }
         }
+        x += 42;
+
+        MyGUI::IntSize size = MyGUI::IntSize(std::max(mScrollView->getSize().width, x), mScrollView->getSize().height);
+
+        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the
+        // scrollbar is hidden
+        mScrollView->setVisibleVScroll(false);
+        mScrollView->setVisibleHScroll(false);
+        mScrollView->setCanvasSize(size);
+        mScrollView->setVisibleVScroll(true);
+        mScrollView->setVisibleHScroll(true);
+        dragArea->setSize(size);
     }
-    x += 42;
 
-    MyGUI::IntSize size = MyGUI::IntSize(std::max(mScrollView->getSize().width, x), mScrollView->getSize().height);
+    void ItemView::update()
+    {
+        while (mScrollView->getChildCount())
+            MyGUI::Gui::getInstance().destroyWidget(mScrollView->getChildAt(0));
 
-    // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the scrollbar is hidden
-    mScrollView->setVisibleVScroll(false);
-    mScrollView->setVisibleHScroll(false);
-    mScrollView->setCanvasSize(size);
-    mScrollView->setVisibleVScroll(true);
-    mScrollView->setVisibleHScroll(true);
-    dragArea->setSize(size);
-}
+        if (!mModel)
+            return;
 
-void ItemView::update()
-{
-    while (mScrollView->getChildCount())
-        MyGUI::Gui::getInstance().destroyWidget(mScrollView->getChildAt(0));
+        mModel->update();
 
-    if (!mModel)
-        return;
+        MyGUI::Widget* dragArea = mScrollView->createWidget<MyGUI::Widget>(
+            "", 0, 0, mScrollView->getWidth(), mScrollView->getHeight(), MyGUI::Align::Stretch);
+        dragArea->setNeedMouseFocus(true);
+        dragArea->eventMouseButtonClick += MyGUI::newDelegate(this, &ItemView::onSelectedBackground);
+        dragArea->eventMouseWheel += MyGUI::newDelegate(this, &ItemView::onMouseWheelMoved);
 
-    mModel->update();
+        for (ItemModel::ModelIndex i = 0; i < static_cast<int>(mModel->getItemCount()); ++i)
+        {
+            const ItemStack& item = mModel->getItem(i);
+
+            ItemWidget* itemWidget = dragArea->createWidget<ItemWidget>(
+                "MW_ItemIcon", MyGUI::IntCoord(0, 0, 42, 42), MyGUI::Align::Default);
+            itemWidget->setUserString("ToolTipType", "ItemModelIndex");
+            itemWidget->setUserData(std::make_pair(i, mModel.get()));
+            ItemWidget::ItemState state = ItemWidget::None;
+            if (item.mType == ItemStack::Type_Barter)
+                state = ItemWidget::Barter;
+            if (item.mType == ItemStack::Type_Equipped)
+                state = ItemWidget::Equip;
+            itemWidget->setItem(item.mBase, state);
+            itemWidget->setCount(item.mCount);
+
+            itemWidget->eventMouseButtonClick += MyGUI::newDelegate(this, &ItemView::onSelectedItem);
+            itemWidget->eventMouseWheel += MyGUI::newDelegate(this, &ItemView::onMouseWheelMoved);
+        }
 
-    MyGUI::Widget* dragArea = mScrollView->createWidget<MyGUI::Widget>("",0,0,mScrollView->getWidth(),mScrollView->getHeight(),
-                                                                       MyGUI::Align::Stretch);
-    dragArea->setNeedMouseFocus(true);
-    dragArea->eventMouseButtonClick += MyGUI::newDelegate(this, &ItemView::onSelectedBackground);
-    dragArea->eventMouseWheel += MyGUI::newDelegate(this, &ItemView::onMouseWheelMoved);
+        layoutWidgets();
+    }
 
-    for (ItemModel::ModelIndex i=0; i<static_cast<int>(mModel->getItemCount()); ++i)
+    void ItemView::resetScrollBars()
     {
-        const ItemStack& item = mModel->getItem(i);
-
-        ItemWidget* itemWidget = dragArea->createWidget<ItemWidget>("MW_ItemIcon",
-            MyGUI::IntCoord(0, 0, 42, 42), MyGUI::Align::Default);
-        itemWidget->setUserString("ToolTipType", "ItemModelIndex");
-        itemWidget->setUserData(std::make_pair(i, mModel.get()));
-        ItemWidget::ItemState state = ItemWidget::None;
-        if (item.mType == ItemStack::Type_Barter)
-            state = ItemWidget::Barter;
-        if (item.mType == ItemStack::Type_Equipped)
-            state = ItemWidget::Equip;
-        itemWidget->setItem(item.mBase, state);
-        itemWidget->setCount(item.mCount);
-
-        itemWidget->eventMouseButtonClick += MyGUI::newDelegate(this, &ItemView::onSelectedItem);
-        itemWidget->eventMouseWheel += MyGUI::newDelegate(this, &ItemView::onMouseWheelMoved);
+        mScrollView->setViewOffset(MyGUI::IntPoint(0, 0));
     }
 
-    layoutWidgets();
-}
-
-void ItemView::resetScrollBars()
-{
-    mScrollView->setViewOffset(MyGUI::IntPoint(0, 0));
-}
-
-void ItemView::onSelectedItem(MyGUI::Widget *sender)
-{
-    ItemModel::ModelIndex index = (*sender->getUserData<std::pair<ItemModel::ModelIndex, ItemModel*> >()).first;
-    eventItemClicked(index);
-}
+    void ItemView::onSelectedItem(MyGUI::Widget* sender)
+    {
+        ItemModel::ModelIndex index = (*sender->getUserData<std::pair<ItemModel::ModelIndex, ItemModel*>>()).first;
+        eventItemClicked(index);
+    }
 
-void ItemView::onSelectedBackground(MyGUI::Widget *sender)
-{
-    eventBackgroundClicked();
-}
+    void ItemView::onSelectedBackground(MyGUI::Widget* sender)
+    {
+        eventBackgroundClicked();
+    }
 
-void ItemView::onMouseWheelMoved(MyGUI::Widget *_sender, int _rel)
-{
-    if (mScrollView->getViewOffset().left + _rel*0.3f > 0)
-        mScrollView->setViewOffset(MyGUI::IntPoint(0, 0));
-    else
-        mScrollView->setViewOffset(MyGUI::IntPoint(static_cast<int>(mScrollView->getViewOffset().left + _rel*0.3f), 0));
-}
+    void ItemView::onMouseWheelMoved(MyGUI::Widget* _sender, int _rel)
+    {
+        if (mScrollView->getViewOffset().left + _rel * 0.3f > 0)
+            mScrollView->setViewOffset(MyGUI::IntPoint(0, 0));
+        else
+            mScrollView->setViewOffset(
+                MyGUI::IntPoint(static_cast<int>(mScrollView->getViewOffset().left + _rel * 0.3f), 0));
+    }
 
-void ItemView::setSize(const MyGUI::IntSize &_value)
-{
-    bool changed = (_value.width != getWidth() || _value.height != getHeight());
-    Base::setSize(_value);
-    if (changed)
-        layoutWidgets();
-}
+    void ItemView::setSize(const MyGUI::IntSize& _value)
+    {
+        bool changed = (_value.width != getWidth() || _value.height != getHeight());
+        Base::setSize(_value);
+        if (changed)
+            layoutWidgets();
+    }
 
-void ItemView::setCoord(const MyGUI::IntCoord &_value)
-{
-    bool changed = (_value.width != getWidth() || _value.height != getHeight());
-    Base::setCoord(_value);
-    if (changed)
-        layoutWidgets();
-}
+    void ItemView::setCoord(const MyGUI::IntCoord& _value)
+    {
+        bool changed = (_value.width != getWidth() || _value.height != getHeight());
+        Base::setCoord(_value);
+        if (changed)
+            layoutWidgets();
+    }
 
-void ItemView::registerComponents()
-{
-    MyGUI::FactoryManager::getInstance().registerFactory<MWGui::ItemView>("Widget");
-}
+    void ItemView::registerComponents()
+    {
+        MyGUI::FactoryManager::getInstance().registerFactory<MWGui::ItemView>("Widget");
+    }
 
 }
diff --git a/apps/openmw/mwgui/itemview.hpp b/apps/openmw/mwgui/itemview.hpp
index e2f882e618..7fb242f51e 100644
--- a/apps/openmw/mwgui/itemview.hpp
+++ b/apps/openmw/mwgui/itemview.hpp
@@ -10,12 +10,12 @@ namespace MWGui
 
     class ItemView final : public MyGUI::Widget
     {
-    MYGUI_RTTI_DERIVED(ItemView)
+        MYGUI_RTTI_DERIVED(ItemView)
     public:
         ItemView();
 
         /// Register needed components with MyGUI's factory manager
-        static void registerComponents ();
+        static void registerComponents();
 
         /// Takes ownership of \a model
         void setModel(std::unique_ptr<ItemModel> model);
@@ -39,13 +39,12 @@ namespace MWGui
         void setSize(const MyGUI::IntSize& _value) override;
         void setCoord(const MyGUI::IntCoord& _value) override;
 
-        void onSelectedItem (MyGUI::Widget* sender);
-        void onSelectedBackground (MyGUI::Widget* sender);
+        void onSelectedItem(MyGUI::Widget* sender);
+        void onSelectedBackground(MyGUI::Widget* sender);
         void onMouseWheelMoved(MyGUI::Widget* _sender, int _rel);
 
         std::unique_ptr<ItemModel> mModel;
         MyGUI::ScrollView* mScrollView;
-
     };
 
 }
diff --git a/apps/openmw/mwgui/itemwidget.cpp b/apps/openmw/mwgui/itemwidget.cpp
index a7e6cb8bef..a2877e8b1e 100644
--- a/apps/openmw/mwgui/itemwidget.cpp
+++ b/apps/openmw/mwgui/itemwidget.cpp
@@ -7,9 +7,9 @@
 
 #include <components/debug/debuglog.hpp>
 // correctIconPath
+#include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/vfs/manager.hpp>
-#include <components/misc/resourcehelpers.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -29,25 +29,25 @@ namespace
         if (fontHeight > 16)
         {
             if (count > 999999999)
-                return MyGUI::utility::toString(count/1000000000) + "b";
+                return MyGUI::utility::toString(count / 1000000000) + "b";
             else if (count > 9999999)
                 return ">9m";
             else if (count > 999999)
-                return MyGUI::utility::toString(count/1000000) + "m";
+                return MyGUI::utility::toString(count / 1000000) + "m";
             else if (count > 9999)
                 return ">9k";
             else if (count > 999)
-                return MyGUI::utility::toString(count/1000) + "k";
+                return MyGUI::utility::toString(count / 1000) + "k";
             else
                 return MyGUI::utility::toString(count);
         }
 
         if (count > 999999999)
-            return MyGUI::utility::toString(count/1000000000) + "b";
+            return MyGUI::utility::toString(count / 1000000000) + "b";
         else if (count > 999999)
-            return MyGUI::utility::toString(count/1000000) + "m";
+            return MyGUI::utility::toString(count / 1000000) + "m";
         else if (count > 9999)
-            return MyGUI::utility::toString(count/1000) + "k";
+            return MyGUI::utility::toString(count / 1000) + "k";
         else
             return MyGUI::utility::toString(count);
     }
@@ -63,7 +63,6 @@ namespace MWGui
         , mFrame(nullptr)
         , mText(nullptr)
     {
-
     }
 
     void ItemWidget::registerComponents()
@@ -97,7 +96,7 @@ namespace MWGui
         mText->setCaption(getCountString(count));
     }
 
-    void ItemWidget::setIcon(const std::string &icon)
+    void ItemWidget::setIcon(const std::string& icon)
     {
         if (mCurrentIcon != icon)
         {
@@ -110,7 +109,7 @@ namespace MWGui
         }
     }
 
-    void ItemWidget::setFrame(const std::string &frame, const MyGUI::IntCoord &coord)
+    void ItemWidget::setFrame(const std::string& frame, const MyGUI::IntCoord& coord)
     {
         if (mFrame)
         {
@@ -125,7 +124,7 @@ namespace MWGui
         }
     }
 
-    void ItemWidget::setIcon(const MWWorld::Ptr &ptr)
+    void ItemWidget::setIcon(const MWWorld::Ptr& ptr)
     {
         std::string_view icon = ptr.getClass().getInventoryIcon(ptr);
         if (icon.empty())
@@ -134,14 +133,14 @@ namespace MWGui
         std::string invIcon = Misc::ResourceHelpers::correctIconPath(icon, vfs);
         if (!vfs->exists(invIcon))
         {
-            Log(Debug::Error) << "Failed to open image: '" << invIcon << "' not found, falling back to 'default-icon.tga'";
+            Log(Debug::Error) << "Failed to open image: '" << invIcon
+                              << "' not found, falling back to 'default-icon.tga'";
             invIcon = Misc::ResourceHelpers::correctIconPath("default icon.tga", vfs);
         }
         setIcon(invIcon);
     }
 
-
-    void ItemWidget::setItem(const MWWorld::Ptr &ptr, ItemState state)
+    void ItemWidget::setItem(const MWWorld::Ptr& ptr, ItemState state)
     {
         if (!mItem)
             return;
@@ -199,9 +198,9 @@ namespace MWGui
         }
 
         if (state == Barter && !isMagic)
-            setFrame(backgroundTex, MyGUI::IntCoord(2*scale,2*scale,44*scale,44*scale));
+            setFrame(backgroundTex, MyGUI::IntCoord(2 * scale, 2 * scale, 44 * scale, 44 * scale));
         else
-            setFrame(backgroundTex, MyGUI::IntCoord(0,0,44*scale,44*scale));
+            setFrame(backgroundTex, MyGUI::IntCoord(0, 0, 44 * scale, 44 * scale));
 
         setIcon(ptr);
     }
diff --git a/apps/openmw/mwgui/itemwidget.hpp b/apps/openmw/mwgui/itemwidget.hpp
index 550d736433..29b0063203 100644
--- a/apps/openmw/mwgui/itemwidget.hpp
+++ b/apps/openmw/mwgui/itemwidget.hpp
@@ -14,12 +14,12 @@ namespace MWGui
     /// @brief A widget that shows an icon for an MWWorld::Ptr
     class ItemWidget : public MyGUI::Widget
     {
-    MYGUI_RTTI_DERIVED(ItemWidget)
+        MYGUI_RTTI_DERIVED(ItemWidget)
     public:
         ItemWidget();
 
         /// Register needed components with MyGUI's factory manager
-        static void registerComponents ();
+        static void registerComponents();
 
         enum ItemState
         {
@@ -33,12 +33,12 @@ namespace MWGui
         void setCount(int count);
 
         /// \a ptr may be empty
-        void setItem (const MWWorld::Ptr& ptr, ItemState state = None);
+        void setItem(const MWWorld::Ptr& ptr, ItemState state = None);
 
         // Set icon and frame manually
-        void setIcon (const std::string& icon);
-        void setIcon (const MWWorld::Ptr& ptr);
-        void setFrame (const std::string& frame, const MyGUI::IntCoord& coord);
+        void setIcon(const std::string& icon);
+        void setIcon(const MWWorld::Ptr& ptr);
+        void setFrame(const std::string& frame, const MyGUI::IntCoord& coord);
 
     protected:
         void initialiseOverride() override;
@@ -56,10 +56,9 @@ namespace MWGui
 
     class SpellWidget : public ItemWidget
     {
-    MYGUI_RTTI_DERIVED(SpellWidget)
+        MYGUI_RTTI_DERIVED(SpellWidget)
     public:
-
-        void setSpellIcon (const std::string& icon);
+        void setSpellIcon(const std::string& icon);
     };
 
 }
diff --git a/apps/openmw/mwgui/jailscreen.cpp b/apps/openmw/mwgui/jailscreen.cpp
index b77d484445..7d791afc08 100644
--- a/apps/openmw/mwgui/jailscreen.cpp
+++ b/apps/openmw/mwgui/jailscreen.cpp
@@ -3,27 +3,27 @@
 #include <components/misc/rng.hpp>
 #include <components/misc/strings/format.hpp>
 
-#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwbase/environment.hpp"
 
-#include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/npcstats.hpp"
 
+#include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/store.hpp"
-#include "../mwworld/class.hpp"
 
 #include "jailscreen.hpp"
 
 namespace MWGui
 {
     JailScreen::JailScreen()
-        : WindowBase("openmw_jail_screen.layout"),
-          mDays(1),
-          mFadeTimeRemaining(0),
-          mTimeAdvancer(0.01f)
+        : WindowBase("openmw_jail_screen.layout")
+        , mDays(1)
+        , mFadeTimeRemaining(0)
+        , mTimeAdvancer(0.01f)
     {
         getWidget(mProgressBar, "ProgressBar");
 
@@ -41,7 +41,7 @@ namespace MWGui
         mFadeTimeRemaining = 0.5;
 
         setVisible(false);
-        mProgressBar->setScrollRange(100+1);
+        mProgressBar->setScrollRange(100 + 1);
         mProgressBar->setScrollPosition(0);
         mProgressBar->setTrackSize(0);
     }
@@ -59,7 +59,8 @@ namespace MWGui
         {
             MWWorld::Ptr player = MWMechanics::getPlayer();
             MWBase::Environment::get().getWorld()->teleportToClosestMarker(player, "prisonmarker");
-            MWBase::Environment::get().getWindowManager()->fadeScreenOut(0.f); // override fade-in caused by cell transition
+            MWBase::Environment::get().getWindowManager()->fadeScreenOut(
+                0.f); // override fade-in caused by cell transition
 
             setVisible(true);
             mTimeAdvancer.run(100);
@@ -69,7 +70,8 @@ namespace MWGui
     void JailScreen::onJailProgressChanged(int cur, int /*total*/)
     {
         mProgressBar->setScrollPosition(0);
-        mProgressBar->setTrackSize(static_cast<int>(cur / (float)(mProgressBar->getScrollRange()) * mProgressBar->getLineSize()));
+        mProgressBar->setTrackSize(
+            static_cast<int>(cur / (float)(mProgressBar->getScrollRange()) * mProgressBar->getLineSize()));
     }
 
     void JailScreen::onJailFinished()
@@ -86,7 +88,7 @@ namespace MWGui
         player.getClass().getCreatureStats(player).getActiveSpells().skipWorsenings(mDays * 24);
 
         std::set<int> skills;
-        for (int day=0; day<mDays; ++day)
+        for (int day = 0; day < mDays; ++day)
         {
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
             int skill = Misc::Rng::rollDice(ESM::Skill::Length, prng);
@@ -94,12 +96,13 @@ namespace MWGui
 
             MWMechanics::SkillValue& value = player.getClass().getNpcStats(player).getSkill(skill);
             if (skill == ESM::Skill::Security || skill == ESM::Skill::Sneak)
-                value.setBase(std::min(100.f, value.getBase()+1));
+                value.setBase(std::min(100.f, value.getBase() + 1));
             else
-                value.setBase(std::max(0.f, value.getBase()-1));
+                value.setBase(std::max(0.f, value.getBase() - 1));
         }
 
-        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
         std::string message;
         if (mDays == 1)
diff --git a/apps/openmw/mwgui/jailscreen.hpp b/apps/openmw/mwgui/jailscreen.hpp
index 871a861d77..42a70abf44 100644
--- a/apps/openmw/mwgui/jailscreen.hpp
+++ b/apps/openmw/mwgui/jailscreen.hpp
@@ -1,32 +1,32 @@
 #ifndef MWGUI_JAILSCREEN_H
 #define MWGUI_JAILSCREEN_H
 
-#include "windowbase.hpp"
 #include "timeadvancer.hpp"
+#include "windowbase.hpp"
 
 namespace MWGui
 {
     class JailScreen : public WindowBase
     {
-        public:
-            JailScreen();
-            void goToJail(int days);
+    public:
+        JailScreen();
+        void goToJail(int days);
 
-            void onFrame(float dt) override;
+        void onFrame(float dt) override;
 
-            bool exit() override { return false; }
+        bool exit() override { return false; }
 
-        private:
-            int mDays;
+    private:
+        int mDays;
 
-            float mFadeTimeRemaining;
+        float mFadeTimeRemaining;
 
-            MyGUI::ScrollBar* mProgressBar;
+        MyGUI::ScrollBar* mProgressBar;
 
-            void onJailProgressChanged(int cur, int total);
-            void onJailFinished();
+        void onJailProgressChanged(int cur, int total);
+        void onJailFinished();
 
-            TimeAdvancer mTimeAdvancer;
+        TimeAdvancer mTimeAdvancer;
     };
 }
 
diff --git a/apps/openmw/mwgui/journalbooks.cpp b/apps/openmw/mwgui/journalbooks.cpp
index 40053b3c8a..f16491f2d5 100644
--- a/apps/openmw/mwgui/journalbooks.cpp
+++ b/apps/openmw/mwgui/journalbooks.cpp
@@ -15,29 +15,30 @@ namespace
         MWGui::BookTypesetter::Ptr mTypesetter;
         MWGui::BookTypesetter::Style* mBodyStyle;
 
-        AddContent (MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* body_style) :
-            mTypesetter (typesetter), mBodyStyle (body_style)
+        AddContent(MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* body_style)
+            : mTypesetter(typesetter)
+            , mBodyStyle(body_style)
         {
         }
     };
 
     struct AddSpan : AddContent
     {
-        AddSpan (MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* body_style) :
-            AddContent (typesetter, body_style)
+        AddSpan(MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* body_style)
+            : AddContent(typesetter, body_style)
         {
         }
 
-        void operator () (intptr_t topicId, size_t begin, size_t end)
+        void operator()(intptr_t topicId, size_t begin, size_t end)
         {
             MWGui::BookTypesetter::Style* style = mBodyStyle;
 
             const MWGui::TextColours& textColours = MWBase::Environment::get().getWindowManager()->getTextColours();
             if (topicId)
-                style = mTypesetter->createHotStyle (mBodyStyle, textColours.journalLink, textColours.journalLinkOver,
-                                                     textColours.journalLinkPressed, topicId);
+                style = mTypesetter->createHotStyle(mBodyStyle, textColours.journalLink, textColours.journalLinkOver,
+                    textColours.journalLinkPressed, topicId);
 
-            mTypesetter->write (style, begin, end);
+            mTypesetter->write(style, begin, end);
         }
     };
 
@@ -46,16 +47,17 @@ namespace
         MWGui::BookTypesetter::Ptr mTypesetter;
         MWGui::BookTypesetter::Style* mBodyStyle;
 
-        AddEntry (MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* body_style) :
-            mTypesetter (typesetter), mBodyStyle (body_style)
+        AddEntry(MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* body_style)
+            : mTypesetter(typesetter)
+            , mBodyStyle(body_style)
         {
         }
 
-        void operator () (MWGui::JournalViewModel::Entry const & entry)
+        void operator()(MWGui::JournalViewModel::Entry const& entry)
         {
-            mTypesetter->addContent (entry.body ());
+            mTypesetter->addContent(entry.body());
 
-            entry.visitSpans (AddSpan (mTypesetter, mBodyStyle));
+            entry.visitSpans(AddSpan(mTypesetter, mBodyStyle));
         }
     };
 
@@ -64,25 +66,25 @@ namespace
         bool mAddHeader;
         MWGui::BookTypesetter::Style* mHeaderStyle;
 
-        AddJournalEntry (MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* body_style,
-                            MWGui::BookTypesetter::Style* header_style, bool add_header) :
-            AddEntry (typesetter, body_style),
-            mAddHeader (add_header),
-            mHeaderStyle (header_style)
+        AddJournalEntry(MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* body_style,
+            MWGui::BookTypesetter::Style* header_style, bool add_header)
+            : AddEntry(typesetter, body_style)
+            , mAddHeader(add_header)
+            , mHeaderStyle(header_style)
         {
         }
 
-        void operator () (MWGui::JournalViewModel::JournalEntry const & entry)
+        void operator()(MWGui::JournalViewModel::JournalEntry const& entry)
         {
             if (mAddHeader)
             {
-                mTypesetter->write (mHeaderStyle, entry.timestamp ());
-                mTypesetter->lineBreak ();
+                mTypesetter->write(mHeaderStyle, entry.timestamp());
+                mTypesetter->lineBreak();
             }
 
-            AddEntry::operator () (entry);
+            AddEntry::operator()(entry);
 
-            mTypesetter->sectionBreak (30);
+            mTypesetter->sectionBreak(30);
         }
     };
 
@@ -91,51 +93,53 @@ namespace
         intptr_t mContentId;
         MWGui::BookTypesetter::Style* mHeaderStyle;
 
-        AddTopicEntry (MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* body_style,
-                        MWGui::BookTypesetter::Style* header_style, intptr_t contentId) :
-            AddEntry (typesetter, body_style), mContentId (contentId), mHeaderStyle (header_style)
+        AddTopicEntry(MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* body_style,
+            MWGui::BookTypesetter::Style* header_style, intptr_t contentId)
+            : AddEntry(typesetter, body_style)
+            , mContentId(contentId)
+            , mHeaderStyle(header_style)
         {
         }
 
-        void operator () (MWGui::JournalViewModel::TopicEntry const & entry)
+        void operator()(MWGui::JournalViewModel::TopicEntry const& entry)
         {
-            mTypesetter->write (mBodyStyle, entry.source ());
-            mTypesetter->write (mBodyStyle, 0, 3);// begin
+            mTypesetter->write(mBodyStyle, entry.source());
+            mTypesetter->write(mBodyStyle, 0, 3); // begin
 
-            AddEntry::operator() (entry);
+            AddEntry::operator()(entry);
 
-            mTypesetter->selectContent (mContentId);
-            mTypesetter->write (mBodyStyle, 2, 3);// end quote
+            mTypesetter->selectContent(mContentId);
+            mTypesetter->write(mBodyStyle, 2, 3); // end quote
 
-            mTypesetter->sectionBreak (30);
+            mTypesetter->sectionBreak(30);
         }
     };
 
     struct AddTopicName : AddContent
     {
-        AddTopicName (MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* style) :
-            AddContent (typesetter, style)
+        AddTopicName(MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* style)
+            : AddContent(typesetter, style)
         {
         }
 
-        void operator () (MWGui::JournalViewModel::Utf8Span topicName)
+        void operator()(MWGui::JournalViewModel::Utf8Span topicName)
         {
-            mTypesetter->write (mBodyStyle, topicName);
-            mTypesetter->sectionBreak ();
+            mTypesetter->write(mBodyStyle, topicName);
+            mTypesetter->sectionBreak();
         }
     };
 
     struct AddQuestName : AddContent
     {
-        AddQuestName (MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* style) :
-            AddContent (typesetter, style)
+        AddQuestName(MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* style)
+            : AddContent(typesetter, style)
         {
         }
 
-        void operator () (MWGui::JournalViewModel::Utf8Span topicName)
+        void operator()(MWGui::JournalViewModel::Utf8Span topicName)
         {
-            mTypesetter->write (mBodyStyle, topicName);
-            mTypesetter->sectionBreak ();
+            mTypesetter->write(mBodyStyle, topicName);
+            mTypesetter->sectionBreak();
         }
     };
 }
@@ -143,176 +147,178 @@ namespace
 namespace MWGui
 {
 
-MWGui::BookTypesetter::Utf8Span to_utf8_span (char const * text)
-{
-    typedef MWGui::BookTypesetter::Utf8Point point;
+    MWGui::BookTypesetter::Utf8Span to_utf8_span(char const* text)
+    {
+        typedef MWGui::BookTypesetter::Utf8Point point;
 
-    point begin = reinterpret_cast <point> (text);
+        point begin = reinterpret_cast<point>(text);
 
-    return MWGui::BookTypesetter::Utf8Span (begin, begin + strlen (text));
-}
+        return MWGui::BookTypesetter::Utf8Span(begin, begin + strlen(text));
+    }
 
-typedef TypesetBook::Ptr book;
+    typedef TypesetBook::Ptr book;
 
-JournalBooks::JournalBooks (JournalViewModel::Ptr model, ToUTF8::FromType encoding) :
-    mModel (model), mEncoding(encoding), mIndexPagesCount(0)
-{
-}
+    JournalBooks::JournalBooks(JournalViewModel::Ptr model, ToUTF8::FromType encoding)
+        : mModel(model)
+        , mEncoding(encoding)
+        , mIndexPagesCount(0)
+    {
+    }
 
-book JournalBooks::createEmptyJournalBook ()
-{
-    BookTypesetter::Ptr typesetter = createTypesetter ();
+    book JournalBooks::createEmptyJournalBook()
+    {
+        BookTypesetter::Ptr typesetter = createTypesetter();
 
-    BookTypesetter::Style* header = typesetter->createStyle ("", MyGUI::Colour (0.60f, 0.00f, 0.00f));
-    BookTypesetter::Style* body   = typesetter->createStyle ("", MyGUI::Colour::Black);
+        BookTypesetter::Style* header = typesetter->createStyle("", MyGUI::Colour(0.60f, 0.00f, 0.00f));
+        BookTypesetter::Style* body = typesetter->createStyle("", MyGUI::Colour::Black);
 
-    typesetter->write (header, to_utf8_span ("You have no journal entries!"));
-    typesetter->lineBreak ();
-    typesetter->write (body, to_utf8_span ("You should have gone though the starting quest and got an initial quest."));
+        typesetter->write(header, to_utf8_span("You have no journal entries!"));
+        typesetter->lineBreak();
+        typesetter->write(
+            body, to_utf8_span("You should have gone though the starting quest and got an initial quest."));
 
-    return typesetter->complete ();
-}
+        return typesetter->complete();
+    }
 
-book JournalBooks::createJournalBook ()
-{
-    BookTypesetter::Ptr typesetter = createTypesetter ();
+    book JournalBooks::createJournalBook()
+    {
+        BookTypesetter::Ptr typesetter = createTypesetter();
 
-    BookTypesetter::Style* header = typesetter->createStyle ("", MyGUI::Colour (0.60f, 0.00f, 0.00f));
-    BookTypesetter::Style* body   = typesetter->createStyle ("", MyGUI::Colour::Black);
+        BookTypesetter::Style* header = typesetter->createStyle("", MyGUI::Colour(0.60f, 0.00f, 0.00f));
+        BookTypesetter::Style* body = typesetter->createStyle("", MyGUI::Colour::Black);
 
-    mModel->visitJournalEntries ("", AddJournalEntry (typesetter, body, header, true));
+        mModel->visitJournalEntries("", AddJournalEntry(typesetter, body, header, true));
 
-    return typesetter->complete ();
-}
+        return typesetter->complete();
+    }
 
-book JournalBooks::createTopicBook (uintptr_t topicId)
-{
-    BookTypesetter::Ptr typesetter = createTypesetter ();
+    book JournalBooks::createTopicBook(uintptr_t topicId)
+    {
+        BookTypesetter::Ptr typesetter = createTypesetter();
 
-    BookTypesetter::Style* header = typesetter->createStyle ("", MyGUI::Colour (0.60f, 0.00f, 0.00f));
-    BookTypesetter::Style* body   = typesetter->createStyle ("", MyGUI::Colour::Black);
+        BookTypesetter::Style* header = typesetter->createStyle("", MyGUI::Colour(0.60f, 0.00f, 0.00f));
+        BookTypesetter::Style* body = typesetter->createStyle("", MyGUI::Colour::Black);
 
-    mModel->visitTopicName (topicId, AddTopicName (typesetter, header));
+        mModel->visitTopicName(topicId, AddTopicName(typesetter, header));
 
-    intptr_t contentId = typesetter->addContent (to_utf8_span (", \""));
+        intptr_t contentId = typesetter->addContent(to_utf8_span(", \""));
 
-    mModel->visitTopicEntries (topicId, AddTopicEntry (typesetter, body, header, contentId));
+        mModel->visitTopicEntries(topicId, AddTopicEntry(typesetter, body, header, contentId));
 
-    return typesetter->complete ();
-}
+        return typesetter->complete();
+    }
 
-book JournalBooks::createQuestBook (const std::string& questName)
-{
-    BookTypesetter::Ptr typesetter = createTypesetter ();
+    book JournalBooks::createQuestBook(const std::string& questName)
+    {
+        BookTypesetter::Ptr typesetter = createTypesetter();
 
-    BookTypesetter::Style* header = typesetter->createStyle ("", MyGUI::Colour (0.60f, 0.00f, 0.00f));
-    BookTypesetter::Style* body   = typesetter->createStyle ("", MyGUI::Colour::Black);
+        BookTypesetter::Style* header = typesetter->createStyle("", MyGUI::Colour(0.60f, 0.00f, 0.00f));
+        BookTypesetter::Style* body = typesetter->createStyle("", MyGUI::Colour::Black);
 
-    AddQuestName addName (typesetter, header);
-    addName(to_utf8_span(questName.c_str()));
+        AddQuestName addName(typesetter, header);
+        addName(to_utf8_span(questName.c_str()));
 
-    mModel->visitJournalEntries (questName, AddJournalEntry (typesetter, body, header, false));
+        mModel->visitJournalEntries(questName, AddJournalEntry(typesetter, body, header, false));
 
-    return typesetter->complete ();
-}
+        return typesetter->complete();
+    }
 
-book JournalBooks::createTopicIndexBook ()
-{
-    bool isRussian = (mEncoding == ToUTF8::WINDOWS_1251);
+    book JournalBooks::createTopicIndexBook()
+    {
+        bool isRussian = (mEncoding == ToUTF8::WINDOWS_1251);
 
-    BookTypesetter::Ptr typesetter = isRussian ? createCyrillicJournalIndex() : createLatinJournalIndex();
+        BookTypesetter::Ptr typesetter = isRussian ? createCyrillicJournalIndex() : createLatinJournalIndex();
 
-    return typesetter->complete ();
-}
+        return typesetter->complete();
+    }
 
-BookTypesetter::Ptr JournalBooks::createLatinJournalIndex ()
-{
-    BookTypesetter::Ptr typesetter = BookTypesetter::create (92, 260);
+    BookTypesetter::Ptr JournalBooks::createLatinJournalIndex()
+    {
+        BookTypesetter::Ptr typesetter = BookTypesetter::create(92, 260);
 
-    typesetter->setSectionAlignment (BookTypesetter::AlignCenter);
+        typesetter->setSectionAlignment(BookTypesetter::AlignCenter);
 
-    // Latin journal index always has two columns for now.
-    mIndexPagesCount = 2;
+        // Latin journal index always has two columns for now.
+        mIndexPagesCount = 2;
 
-    char ch = 'A';
+        char ch = 'A';
 
-    BookTypesetter::Style* body = typesetter->createStyle ("", MyGUI::Colour::Black);
-    for (int i = 0; i < 26; ++i)
-    {
-        char buffer [32];
-        sprintf (buffer, "( %c )", ch);
+        BookTypesetter::Style* body = typesetter->createStyle("", MyGUI::Colour::Black);
+        for (int i = 0; i < 26; ++i)
+        {
+            char buffer[32];
+            sprintf(buffer, "( %c )", ch);
+
+            const MWGui::TextColours& textColours = MWBase::Environment::get().getWindowManager()->getTextColours();
+            BookTypesetter::Style* style = typesetter->createHotStyle(body, textColours.journalTopic,
+                textColours.journalTopicOver, textColours.journalTopicPressed, (Utf8Stream::UnicodeChar)ch);
 
-        const MWGui::TextColours& textColours = MWBase::Environment::get().getWindowManager()->getTextColours();
-        BookTypesetter::Style* style = typesetter->createHotStyle (body, textColours.journalTopic,
-                                                                   textColours.journalTopicOver,
-                                                                   textColours.journalTopicPressed, (Utf8Stream::UnicodeChar) ch);
+            if (i == 13)
+                typesetter->sectionBreak();
 
-        if (i == 13)
-            typesetter->sectionBreak ();
+            typesetter->write(style, to_utf8_span(buffer));
+            typesetter->lineBreak();
 
-        typesetter->write (style, to_utf8_span (buffer));
-        typesetter->lineBreak ();
+            ch++;
+        }
 
-        ch++;
+        return typesetter;
     }
 
-    return typesetter;
-}
+    BookTypesetter::Ptr JournalBooks::createCyrillicJournalIndex()
+    {
+        BookTypesetter::Ptr typesetter = BookTypesetter::create(92, 260);
 
-BookTypesetter::Ptr JournalBooks::createCyrillicJournalIndex ()
-{
-    BookTypesetter::Ptr typesetter = BookTypesetter::create (92, 260);
+        typesetter->setSectionAlignment(BookTypesetter::AlignCenter);
 
-    typesetter->setSectionAlignment (BookTypesetter::AlignCenter);
+        BookTypesetter::Style* body = typesetter->createStyle("", MyGUI::Colour::Black);
 
-    BookTypesetter::Style* body = typesetter->createStyle ("", MyGUI::Colour::Black);
+        int fontHeight = MWBase::Environment::get().getWindowManager()->getFontHeight();
 
-    int fontHeight = MWBase::Environment::get().getWindowManager()->getFontHeight();
+        // for small font size split alphabet to two columns (2x15 characers), for big font size split it to three
+        // colums (3x10 characters).
+        int sectionBreak = 10;
+        mIndexPagesCount = 3;
+        if (fontHeight < 18)
+        {
+            sectionBreak = 15;
+            mIndexPagesCount = 2;
+        }
 
-    // for small font size split alphabet to two columns (2x15 characers), for big font size split it to three colums (3x10 characters).
-    int sectionBreak = 10;
-    mIndexPagesCount = 3;
-    if (fontHeight < 18)
-    {
-        sectionBreak = 15;
-        mIndexPagesCount = 2;
-    }
+        unsigned char ch[3] = { 0xd0, 0x90, 0x00 }; // CYRILLIC CAPITAL A is a 0xd090 in UTF-8
 
-    unsigned char ch[3] = {0xd0, 0x90, 0x00}; // CYRILLIC CAPITAL A is a 0xd090 in UTF-8
+        for (int i = 0; i < 32; ++i)
+        {
+            char buffer[32];
+            sprintf(buffer, "( %c%c )", ch[0], ch[1]);
 
-    for (int i = 0; i < 32; ++i)
-    {
-        char buffer [32];
-        sprintf(buffer, "( %c%c )", ch[0], ch[1]);
+            Utf8Stream stream((char*)ch);
+            Utf8Stream::UnicodeChar first = stream.peek();
 
-        Utf8Stream stream ((char*) ch);
-        Utf8Stream::UnicodeChar first = stream.peek();
+            const MWGui::TextColours& textColours = MWBase::Environment::get().getWindowManager()->getTextColours();
+            BookTypesetter::Style* style = typesetter->createHotStyle(
+                body, textColours.journalTopic, textColours.journalTopicOver, textColours.journalTopicPressed, first);
 
-        const MWGui::TextColours& textColours = MWBase::Environment::get().getWindowManager()->getTextColours();
-        BookTypesetter::Style* style = typesetter->createHotStyle (body, textColours.journalTopic,
-                                                                   textColours.journalTopicOver,
-                                                                   textColours.journalTopicPressed, first);
+            ch[1]++;
 
-        ch[1]++;
+            // Words can not be started with these characters
+            if (i == 26 || i == 28)
+                continue;
 
-        // Words can not be started with these characters
-        if (i == 26 || i == 28)
-            continue;
+            if (i % sectionBreak == 0)
+                typesetter->sectionBreak();
 
-        if (i % sectionBreak == 0)
-            typesetter->sectionBreak ();
+            typesetter->write(style, to_utf8_span(buffer));
+            typesetter->lineBreak();
+        }
 
-        typesetter->write (style, to_utf8_span (buffer));
-        typesetter->lineBreak ();
+        return typesetter;
     }
 
-    return typesetter;
-}
-
-BookTypesetter::Ptr JournalBooks::createTypesetter ()
-{
-    //TODO: determine page size from layout...
-    return BookTypesetter::create (240, 320);
-}
+    BookTypesetter::Ptr JournalBooks::createTypesetter()
+    {
+        // TODO: determine page size from layout...
+        return BookTypesetter::create(240, 320);
+    }
 
 }
diff --git a/apps/openmw/mwgui/journalbooks.hpp b/apps/openmw/mwgui/journalbooks.hpp
index 05eda6e222..1045b81ed9 100644
--- a/apps/openmw/mwgui/journalbooks.hpp
+++ b/apps/openmw/mwgui/journalbooks.hpp
@@ -8,29 +8,29 @@
 
 namespace MWGui
 {
-    MWGui::BookTypesetter::Utf8Span to_utf8_span (char const * text);
+    MWGui::BookTypesetter::Utf8Span to_utf8_span(char const* text);
 
     struct JournalBooks
     {
         typedef TypesetBook::Ptr Book;
         JournalViewModel::Ptr mModel;
 
-        JournalBooks (JournalViewModel::Ptr model, ToUTF8::FromType encoding);
+        JournalBooks(JournalViewModel::Ptr model, ToUTF8::FromType encoding);
 
-        Book createEmptyJournalBook ();
-        Book createJournalBook ();
-        Book createTopicBook (uintptr_t topicId);
-        Book createTopicBook (const std::string& topicId);
-        Book createQuestBook (const std::string& questName);
-        Book createTopicIndexBook ();
+        Book createEmptyJournalBook();
+        Book createJournalBook();
+        Book createTopicBook(uintptr_t topicId);
+        Book createTopicBook(const std::string& topicId);
+        Book createQuestBook(const std::string& questName);
+        Book createTopicIndexBook();
 
         ToUTF8::FromType mEncoding;
         int mIndexPagesCount;
 
     private:
-        BookTypesetter::Ptr createTypesetter ();
-        BookTypesetter::Ptr createLatinJournalIndex ();
-        BookTypesetter::Ptr createCyrillicJournalIndex ();
+        BookTypesetter::Ptr createTypesetter();
+        BookTypesetter::Ptr createLatinJournalIndex();
+        BookTypesetter::Ptr createCyrillicJournalIndex();
     };
 }
 
diff --git a/apps/openmw/mwgui/journalviewmodel.cpp b/apps/openmw/mwgui/journalviewmodel.cpp
index 7e0832bb47..80e58a784a 100644
--- a/apps/openmw/mwgui/journalviewmodel.cpp
+++ b/apps/openmw/mwgui/journalviewmodel.cpp
@@ -4,357 +4,353 @@
 
 #include <MyGUI_LanguageManager.h>
 
-#include <components/translation/translation.hpp>
 #include <components/misc/strings/algorithm.hpp>
+#include <components/translation/translation.hpp>
 
-#include "../mwbase/world.hpp"
-#include "../mwbase/journal.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/journal.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwdialogue/keywordsearch.hpp"
 
-namespace MWGui {
-
-struct JournalViewModelImpl;
-
-struct JournalViewModelImpl : JournalViewModel
+namespace MWGui
 {
-    typedef MWDialogue::KeywordSearch <std::string, intptr_t> KeywordSearchT;
 
-    mutable bool             mKeywordSearchLoaded;
-    mutable KeywordSearchT mKeywordSearch;
+    struct JournalViewModelImpl;
 
-    JournalViewModelImpl ()
+    struct JournalViewModelImpl : JournalViewModel
     {
-        mKeywordSearchLoaded = false;
-    }
+        typedef MWDialogue::KeywordSearch<std::string, intptr_t> KeywordSearchT;
 
-    virtual ~JournalViewModelImpl ()
-    {
-    }
+        mutable bool mKeywordSearchLoaded;
+        mutable KeywordSearchT mKeywordSearch;
 
-    /// \todo replace this nasty BS
-    static Utf8Span toUtf8Span(std::string_view str)
-    {
-        if (str.size () == 0)
-            return Utf8Span (Utf8Point (nullptr), Utf8Point (nullptr));
+        JournalViewModelImpl() { mKeywordSearchLoaded = false; }
 
-        Utf8Point point = reinterpret_cast<Utf8Point>(str.data());
+        virtual ~JournalViewModelImpl() {}
 
-        return Utf8Span (point, point + str.size ());
-    }
+        /// \todo replace this nasty BS
+        static Utf8Span toUtf8Span(std::string_view str)
+        {
+            if (str.size() == 0)
+                return Utf8Span(Utf8Point(nullptr), Utf8Point(nullptr));
 
-    void load () override
-    {
-    }
+            Utf8Point point = reinterpret_cast<Utf8Point>(str.data());
 
-    void unload () override
-    {
-        mKeywordSearch.clear ();
-        mKeywordSearchLoaded = false;
-    }
+            return Utf8Span(point, point + str.size());
+        }
 
-    void ensureKeyWordSearchLoaded () const
-    {
-        if (!mKeywordSearchLoaded)
+        void load() override {}
+
+        void unload() override
+        {
+            mKeywordSearch.clear();
+            mKeywordSearchLoaded = false;
+        }
+
+        void ensureKeyWordSearchLoaded() const
         {
-            MWBase::Journal * journal = MWBase::Environment::get().getJournal();
+            if (!mKeywordSearchLoaded)
+            {
+                MWBase::Journal* journal = MWBase::Environment::get().getJournal();
 
-            for(MWBase::Journal::TTopicIter i = journal->topicBegin(); i != journal->topicEnd (); ++i)
-                mKeywordSearch.seed (i->first, intptr_t (&i->second));
+                for (MWBase::Journal::TTopicIter i = journal->topicBegin(); i != journal->topicEnd(); ++i)
+                    mKeywordSearch.seed(i->first, intptr_t(&i->second));
 
-            mKeywordSearchLoaded = true;
+                mKeywordSearchLoaded = true;
+            }
         }
-    }
 
-    bool isEmpty () const override
-    {
-        MWBase::Journal * journal = MWBase::Environment::get().getJournal();
+        bool isEmpty() const override
+        {
+            MWBase::Journal* journal = MWBase::Environment::get().getJournal();
 
-        return journal->begin () == journal->end ();
-    }
+            return journal->begin() == journal->end();
+        }
 
-    template <typename t_iterator, typename Interface>
-    struct BaseEntry : Interface
-    {
-        typedef t_iterator iterator_t;
+        template <typename t_iterator, typename Interface>
+        struct BaseEntry : Interface
+        {
+            typedef t_iterator iterator_t;
 
-        iterator_t                      itr;
-        JournalViewModelImpl const *    mModel;
+            iterator_t itr;
+            JournalViewModelImpl const* mModel;
 
-        BaseEntry (JournalViewModelImpl const * model, iterator_t itr) :
-            itr (itr), mModel (model), loaded (false)
-        {}
+            BaseEntry(JournalViewModelImpl const* model, iterator_t itr)
+                : itr(itr)
+                , mModel(model)
+                , loaded(false)
+            {
+            }
 
-        virtual ~BaseEntry () {}
+            virtual ~BaseEntry() {}
 
-        mutable bool loaded;
-        mutable std::string utf8text;
+            mutable bool loaded;
+            mutable std::string utf8text;
 
-        typedef std::pair<size_t, size_t> Range;
+            typedef std::pair<size_t, size_t> Range;
 
-        // hyperlinks in @link# notation
-        mutable std::map<Range, intptr_t> mHyperLinks;
+            // hyperlinks in @link# notation
+            mutable std::map<Range, intptr_t> mHyperLinks;
 
-        virtual std::string getText () const = 0;
+            virtual std::string getText() const = 0;
 
-        void ensureLoaded () const
-        {
-            if (!loaded)
+            void ensureLoaded() const
             {
-                mModel->ensureKeyWordSearchLoaded ();
-
-                utf8text = getText ();
-
-                size_t pos_end = 0;
-                for(;;)
+                if (!loaded)
                 {
-                    size_t pos_begin = utf8text.find('@');
-                    if (pos_begin != std::string::npos)
-                        pos_end = utf8text.find('#', pos_begin);
-
-                    if (pos_begin != std::string::npos && pos_end != std::string::npos)
-                    {
-                        std::string link = utf8text.substr(pos_begin + 1, pos_end - pos_begin - 1);
-                        const char specialPseudoAsteriskCharacter = 127;
-                        std::replace(link.begin(), link.end(), specialPseudoAsteriskCharacter, '*');
-                        std::string topicName = MWBase::Environment::get().getWindowManager()->
-                                getTranslationDataStorage().topicStandardForm(link);
+                    mModel->ensureKeyWordSearchLoaded();
 
-                        std::string displayName = link;
-                        while (displayName[displayName.size()-1] == '*')
-                            displayName.erase(displayName.size()-1, 1);
+                    utf8text = getText();
 
-                        utf8text.replace(pos_begin, pos_end+1-pos_begin, displayName);
-
-                        intptr_t value = 0;
-                        if (mModel->mKeywordSearch.containsKeyword(topicName, value))
-                            mHyperLinks[std::make_pair(pos_begin, pos_begin+displayName.size())] = value;
+                    size_t pos_end = 0;
+                    for (;;)
+                    {
+                        size_t pos_begin = utf8text.find('@');
+                        if (pos_begin != std::string::npos)
+                            pos_end = utf8text.find('#', pos_begin);
+
+                        if (pos_begin != std::string::npos && pos_end != std::string::npos)
+                        {
+                            std::string link = utf8text.substr(pos_begin + 1, pos_end - pos_begin - 1);
+                            const char specialPseudoAsteriskCharacter = 127;
+                            std::replace(link.begin(), link.end(), specialPseudoAsteriskCharacter, '*');
+                            std::string topicName = MWBase::Environment::get()
+                                                        .getWindowManager()
+                                                        ->getTranslationDataStorage()
+                                                        .topicStandardForm(link);
+
+                            std::string displayName = link;
+                            while (displayName[displayName.size() - 1] == '*')
+                                displayName.erase(displayName.size() - 1, 1);
+
+                            utf8text.replace(pos_begin, pos_end + 1 - pos_begin, displayName);
+
+                            intptr_t value = 0;
+                            if (mModel->mKeywordSearch.containsKeyword(topicName, value))
+                                mHyperLinks[std::make_pair(pos_begin, pos_begin + displayName.size())] = value;
+                        }
+                        else
+                            break;
                     }
-                    else
-                        break;
-                }
 
-                loaded = true;
+                    loaded = true;
+                }
             }
-        }
-
-        Utf8Span body () const override
-        {
-            ensureLoaded ();
 
-            return toUtf8Span (utf8text);
-        }
+            Utf8Span body() const override
+            {
+                ensureLoaded();
 
-        void visitSpans (std::function < void (TopicId, size_t, size_t)> visitor) const override
-        {
-            ensureLoaded ();
-            mModel->ensureKeyWordSearchLoaded ();
+                return toUtf8Span(utf8text);
+            }
 
-            if (mHyperLinks.size() && MWBase::Environment::get().getWindowManager()->getTranslationDataStorage().hasTranslation())
+            void visitSpans(std::function<void(TopicId, size_t, size_t)> visitor) const override
             {
-                size_t formatted = 0; // points to the first character that is not laid out yet
-                for (std::map<Range, intptr_t>::const_iterator it = mHyperLinks.begin(); it != mHyperLinks.end(); ++it)
+                ensureLoaded();
+                mModel->ensureKeyWordSearchLoaded();
+
+                if (mHyperLinks.size()
+                    && MWBase::Environment::get().getWindowManager()->getTranslationDataStorage().hasTranslation())
                 {
-                    intptr_t topicId = it->second;
-                    if (formatted < it->first.first)
-                        visitor (0, formatted, it->first.first);
-                    visitor (topicId, it->first.first, it->first.second);
-                    formatted = it->first.second;
+                    size_t formatted = 0; // points to the first character that is not laid out yet
+                    for (std::map<Range, intptr_t>::const_iterator it = mHyperLinks.begin(); it != mHyperLinks.end();
+                         ++it)
+                    {
+                        intptr_t topicId = it->second;
+                        if (formatted < it->first.first)
+                            visitor(0, formatted, it->first.first);
+                        visitor(topicId, it->first.first, it->first.second);
+                        formatted = it->first.second;
+                    }
+                    if (formatted < utf8text.size())
+                        visitor(0, formatted, utf8text.size());
                 }
-                if (formatted < utf8text.size())
-                    visitor (0, formatted, utf8text.size());
-            }
-            else
-            {
-                std::vector<KeywordSearchT::Match> matches;
-                mModel->mKeywordSearch.highlightKeywords(utf8text.begin(), utf8text.end(), matches);
-
-                std::string::const_iterator i = utf8text.begin ();
-                for (std::vector<KeywordSearchT::Match>::const_iterator it = matches.begin(); it != matches.end(); ++it)
+                else
                 {
-                    const KeywordSearchT::Match& match = *it;
-
-                    if (i != match.mBeg)
-                        visitor (0, i - utf8text.begin (), match.mBeg - utf8text.begin ());
-
-                    visitor (match.mValue, match.mBeg - utf8text.begin (), match.mEnd - utf8text.begin ());
+                    std::vector<KeywordSearchT::Match> matches;
+                    mModel->mKeywordSearch.highlightKeywords(utf8text.begin(), utf8text.end(), matches);
 
-                    i = match.mEnd;
-                }
+                    std::string::const_iterator i = utf8text.begin();
+                    for (std::vector<KeywordSearchT::Match>::const_iterator it = matches.begin(); it != matches.end();
+                         ++it)
+                    {
+                        const KeywordSearchT::Match& match = *it;
 
-                if (i != utf8text.end ())
-                    visitor (0, i - utf8text.begin (), utf8text.size ());
-            }
-        }
+                        if (i != match.mBeg)
+                            visitor(0, i - utf8text.begin(), match.mBeg - utf8text.begin());
 
-    };
+                        visitor(match.mValue, match.mBeg - utf8text.begin(), match.mEnd - utf8text.begin());
 
-    void visitQuestNames(bool active_only, std::function <void (std::string_view, bool)> visitor) const override
-    {
-        MWBase::Journal * journal = MWBase::Environment::get ().getJournal ();
+                        i = match.mEnd;
+                    }
 
-        std::set<std::string, std::less<>> visitedQuests;
+                    if (i != utf8text.end())
+                        visitor(0, i - utf8text.begin(), utf8text.size());
+                }
+            }
+        };
 
-        // Note that for purposes of the journal GUI, quests are identified by the name, not the ID, so several
-        // different quest IDs can end up in the same quest log. A quest log should be considered finished
-        // when any quest ID in that log is finished.
-        for (MWBase::Journal::TQuestIter i = journal->questBegin (); i != journal->questEnd (); ++i)
+        void visitQuestNames(bool active_only, std::function<void(std::string_view, bool)> visitor) const override
         {
-            const MWDialogue::Quest& quest = i->second;
+            MWBase::Journal* journal = MWBase::Environment::get().getJournal();
+
+            std::set<std::string, std::less<>> visitedQuests;
 
-            bool isFinished = false;
-            for (MWBase::Journal::TQuestIter j = journal->questBegin (); j != journal->questEnd (); ++j)
+            // Note that for purposes of the journal GUI, quests are identified by the name, not the ID, so several
+            // different quest IDs can end up in the same quest log. A quest log should be considered finished
+            // when any quest ID in that log is finished.
+            for (MWBase::Journal::TQuestIter i = journal->questBegin(); i != journal->questEnd(); ++i)
             {
-                if (quest.getName() == j->second.getName() && j->second.isFinished())
-                    isFinished = true;
-            }
+                const MWDialogue::Quest& quest = i->second;
 
-            if (active_only && isFinished)
-                continue;
+                bool isFinished = false;
+                for (MWBase::Journal::TQuestIter j = journal->questBegin(); j != journal->questEnd(); ++j)
+                {
+                    if (quest.getName() == j->second.getName() && j->second.isFinished())
+                        isFinished = true;
+                }
 
-            // Unfortunately Morrowind.esm has no quest names, since the quest book was added with tribunal.
-            // Note that even with Tribunal, some quests still don't have quest names. I'm assuming those are not supposed
-            // to appear in the quest book.
-            if (!quest.getName().empty())
-            {
-                // Don't list the same quest name twice
-                if (visitedQuests.find(quest.getName()) != visitedQuests.end())
+                if (active_only && isFinished)
                     continue;
 
-                visitor (quest.getName(), isFinished);
+                // Unfortunately Morrowind.esm has no quest names, since the quest book was added with tribunal.
+                // Note that even with Tribunal, some quests still don't have quest names. I'm assuming those are not
+                // supposed to appear in the quest book.
+                if (!quest.getName().empty())
+                {
+                    // Don't list the same quest name twice
+                    if (visitedQuests.find(quest.getName()) != visitedQuests.end())
+                        continue;
+
+                    visitor(quest.getName(), isFinished);
 
-                visitedQuests.emplace(quest.getName());
+                    visitedQuests.emplace(quest.getName());
+                }
             }
         }
-    }
 
-    template <typename iterator_t>
-    struct JournalEntryImpl : BaseEntry <iterator_t, JournalEntry>
-    {
-        using BaseEntry <iterator_t, JournalEntry>::itr;
+        template <typename iterator_t>
+        struct JournalEntryImpl : BaseEntry<iterator_t, JournalEntry>
+        {
+            using BaseEntry<iterator_t, JournalEntry>::itr;
 
-        mutable std::string timestamp_buffer;
+            mutable std::string timestamp_buffer;
 
-        JournalEntryImpl (JournalViewModelImpl const * model, iterator_t itr) :
-            BaseEntry <iterator_t, JournalEntry> (model, itr)
-        {}
+            JournalEntryImpl(JournalViewModelImpl const* model, iterator_t itr)
+                : BaseEntry<iterator_t, JournalEntry>(model, itr)
+            {
+            }
 
-        std::string getText () const override
-        {
-            return itr->getText();
-        }
+            std::string getText() const override { return itr->getText(); }
 
-        Utf8Span timestamp () const override
-        {
-            if (timestamp_buffer.empty ())
+            Utf8Span timestamp() const override
             {
-                std::string dayStr = MyGUI::LanguageManager::getInstance().replaceTags("#{sDay}");
-
-                std::ostringstream os;
+                if (timestamp_buffer.empty())
+                {
+                    std::string dayStr = MyGUI::LanguageManager::getInstance().replaceTags("#{sDay}");
 
-                os
-                    << itr->mDayOfMonth << ' '
-                    << MWBase::Environment::get().getWorld()->getMonthName (itr->mMonth)
-                    << " (" << dayStr << " " << (itr->mDay) << ')';
+                    std::ostringstream os;
 
-                timestamp_buffer = os.str ();
-            }
+                    os << itr->mDayOfMonth << ' ' << MWBase::Environment::get().getWorld()->getMonthName(itr->mMonth)
+                       << " (" << dayStr << " " << (itr->mDay) << ')';
 
-            return toUtf8Span (timestamp_buffer);
-        }
-    };
+                    timestamp_buffer = os.str();
+                }
 
-    void visitJournalEntries (const std::string& questName, std::function <void (JournalEntry const &)> visitor) const override
-    {
-        MWBase::Journal * journal = MWBase::Environment::get().getJournal();
+                return toUtf8Span(timestamp_buffer);
+            }
+        };
 
-        if (!questName.empty())
+        void visitJournalEntries(
+            const std::string& questName, std::function<void(JournalEntry const&)> visitor) const override
         {
-            std::vector<MWDialogue::Quest const*> quests;
-            for (MWBase::Journal::TQuestIter questIt = journal->questBegin(); questIt != journal->questEnd(); ++questIt)
-            {
-                if (Misc::StringUtils::ciEqual(questIt->second.getName(), questName))
-                    quests.push_back(&questIt->second);
-            }
+            MWBase::Journal* journal = MWBase::Environment::get().getJournal();
 
-            for(MWBase::Journal::TEntryIter i = journal->begin(); i != journal->end (); ++i)
+            if (!questName.empty())
             {
-                for (std::vector<MWDialogue::Quest const*>::iterator questIt = quests.begin(); questIt != quests.end(); ++questIt)
+                std::vector<MWDialogue::Quest const*> quests;
+                for (MWBase::Journal::TQuestIter questIt = journal->questBegin(); questIt != journal->questEnd();
+                     ++questIt)
+                {
+                    if (Misc::StringUtils::ciEqual(questIt->second.getName(), questName))
+                        quests.push_back(&questIt->second);
+                }
+
+                for (MWBase::Journal::TEntryIter i = journal->begin(); i != journal->end(); ++i)
                 {
-                    MWDialogue::Quest const* quest = *questIt;
-                    for (MWDialogue::Topic::TEntryIter j = quest->begin (); j != quest->end (); ++j)
+                    for (std::vector<MWDialogue::Quest const*>::iterator questIt = quests.begin();
+                         questIt != quests.end(); ++questIt)
                     {
-                        if (i->mInfoId == j->mInfoId)
-                            visitor (JournalEntryImpl <MWBase::Journal::TEntryIter> (this, i));
+                        MWDialogue::Quest const* quest = *questIt;
+                        for (MWDialogue::Topic::TEntryIter j = quest->begin(); j != quest->end(); ++j)
+                        {
+                            if (i->mInfoId == j->mInfoId)
+                                visitor(JournalEntryImpl<MWBase::Journal::TEntryIter>(this, i));
+                        }
                     }
                 }
             }
+            else
+            {
+                for (MWBase::Journal::TEntryIter i = journal->begin(); i != journal->end(); ++i)
+                    visitor(JournalEntryImpl<MWBase::Journal::TEntryIter>(this, i));
+            }
         }
-        else
+
+        void visitTopicName(TopicId topicId, std::function<void(Utf8Span)> visitor) const override
         {
-            for(MWBase::Journal::TEntryIter i = journal->begin(); i != journal->end (); ++i)
-                visitor (JournalEntryImpl <MWBase::Journal::TEntryIter> (this, i));
+            MWDialogue::Topic const& topic = *reinterpret_cast<MWDialogue::Topic const*>(topicId);
+            visitor(toUtf8Span(topic.getName()));
         }
-    }
-
-    void visitTopicName (TopicId topicId, std::function <void (Utf8Span)> visitor) const override
-    {
-        MWDialogue::Topic const & topic = * reinterpret_cast <MWDialogue::Topic const *> (topicId);
-        visitor (toUtf8Span (topic.getName()));
-    }
-
-    void visitTopicNamesStartingWith(Utf8Stream::UnicodeChar character, std::function < void (std::string_view) > visitor) const override
-    {
-        MWBase::Journal * journal = MWBase::Environment::get().getJournal();
 
-        for (MWBase::Journal::TTopicIter i = journal->topicBegin (); i != journal->topicEnd (); ++i)
+        void visitTopicNamesStartingWith(
+            Utf8Stream::UnicodeChar character, std::function<void(std::string_view)> visitor) const override
         {
-            Utf8Stream stream (i->first.c_str());
-            Utf8Stream::UnicodeChar first = Utf8Stream::toLowerUtf8(stream.peek());
+            MWBase::Journal* journal = MWBase::Environment::get().getJournal();
 
-            if (first != Utf8Stream::toLowerUtf8(character))
-                continue;
+            for (MWBase::Journal::TTopicIter i = journal->topicBegin(); i != journal->topicEnd(); ++i)
+            {
+                Utf8Stream stream(i->first.c_str());
+                Utf8Stream::UnicodeChar first = Utf8Stream::toLowerUtf8(stream.peek());
+
+                if (first != Utf8Stream::toLowerUtf8(character))
+                    continue;
 
-            visitor (i->second.getName());
+                visitor(i->second.getName());
+            }
         }
-    }
 
-    struct TopicEntryImpl : BaseEntry <MWDialogue::Topic::TEntryIter, TopicEntry>
-    {
-        MWDialogue::Topic const & mTopic;
+        struct TopicEntryImpl : BaseEntry<MWDialogue::Topic::TEntryIter, TopicEntry>
+        {
+            MWDialogue::Topic const& mTopic;
+
+            TopicEntryImpl(JournalViewModelImpl const* model, MWDialogue::Topic const& topic, iterator_t itr)
+                : BaseEntry(model, itr)
+                , mTopic(topic)
+            {
+            }
 
-        TopicEntryImpl (JournalViewModelImpl const * model, MWDialogue::Topic const & topic, iterator_t itr) :
-            BaseEntry (model, itr), mTopic (topic)
-        {}
+            std::string getText() const override { return itr->getText(); }
 
-        std::string getText () const override
-        {
-            return  itr->getText();
-        }
+            Utf8Span source() const override { return toUtf8Span(itr->mActorName); }
+        };
 
-        Utf8Span source () const override
+        void visitTopicEntries(TopicId topicId, std::function<void(TopicEntry const&)> visitor) const override
         {
-            return toUtf8Span (itr->mActorName);
-        }
+            typedef MWDialogue::Topic::TEntryIter iterator_t;
+
+            MWDialogue::Topic const& topic = *reinterpret_cast<MWDialogue::Topic const*>(topicId);
 
+            for (iterator_t i = topic.begin(); i != topic.end(); ++i)
+                visitor(TopicEntryImpl(this, topic, i));
+        }
     };
 
-    void visitTopicEntries (TopicId topicId, std::function <void (TopicEntry const &)> visitor) const override
+    JournalViewModel::Ptr JournalViewModel::create()
     {
-        typedef MWDialogue::Topic::TEntryIter iterator_t;
-
-        MWDialogue::Topic const & topic = * reinterpret_cast <MWDialogue::Topic const *> (topicId);
-
-        for (iterator_t i = topic.begin (); i != topic.end (); ++i)
-            visitor (TopicEntryImpl (this, topic, i));
+        return std::make_shared<JournalViewModelImpl>();
     }
-};
-
-JournalViewModel::Ptr JournalViewModel::create ()
-{
-    return std::make_shared <JournalViewModelImpl> ();
-}
 
 }
diff --git a/apps/openmw/mwgui/journalviewmodel.hpp b/apps/openmw/mwgui/journalviewmodel.hpp
index c49ccf3e20..125706aabb 100644
--- a/apps/openmw/mwgui/journalviewmodel.hpp
+++ b/apps/openmw/mwgui/journalviewmodel.hpp
@@ -1,10 +1,10 @@
 #ifndef MWGUI_JOURNALVIEWMODEL_HPP
 #define MWGUI_JOURNALVIEWMODEL_HPP
 
-#include <string>
-#include <memory>
-#include <functional>
 #include <cstdint>
+#include <functional>
+#include <memory>
+#include <string>
 
 #include <components/misc/utf8stream.hpp>
 
@@ -18,12 +18,12 @@ namespace MWGui
     /// game data store.
     struct JournalViewModel
     {
-        typedef std::shared_ptr <JournalViewModel> Ptr;
+        typedef std::shared_ptr<JournalViewModel> Ptr;
 
         typedef intptr_t QuestId;
         typedef intptr_t TopicId;
-        typedef uint8_t const * Utf8Point;
-        typedef std::pair <Utf8Point, Utf8Point> Utf8Span;
+        typedef uint8_t const* Utf8Point;
+        typedef std::pair<Utf8Point, Utf8Point> Utf8Span;
 
         /// The base interface for both journal entries and topics.
         struct Entry
@@ -33,12 +33,12 @@ namespace MWGui
             /// This function returns a borrowed reference to the body of the
             /// journal entry. The returned reference becomes invalid when the
             /// entry is destroyed.
-            virtual Utf8Span body () const = 0;
+            virtual Utf8Span body() const = 0;
 
             /// Visits each subset of text in the body, delivering the beginning
             /// and end of the span relative to the body, and a valid topic ID if
             /// the span represents a keyword, or zero if not.
-            virtual void visitSpans (std::function <void (TopicId, size_t, size_t)> visitor) const = 0;
+            virtual void visitSpans(std::function<void(TopicId, size_t, size_t)> visitor) const = 0;
 
             virtual ~Entry() = default;
         };
@@ -48,7 +48,7 @@ namespace MWGui
         {
             /// Returns a pre-formatted span of UTF8 encoded text representing
             /// the name of the NPC this portion of dialog was heard from.
-            virtual Utf8Span source () const = 0;
+            virtual Utf8Span source() const = 0;
 
             virtual ~TopicEntry() = default;
         };
@@ -58,38 +58,40 @@ namespace MWGui
         {
             /// Returns a pre-formatted span of UTF8 encoded text representing
             /// the in-game date this entry was added to the journal.
-            virtual Utf8Span timestamp () const = 0;
+            virtual Utf8Span timestamp() const = 0;
 
             virtual ~JournalEntry() = default;
         };
 
         /// called prior to journal opening
-        virtual void load () = 0;
+        virtual void load() = 0;
 
         /// called prior to journal closing
-        virtual void unload () = 0;
+        virtual void unload() = 0;
 
         /// returns true if their are no journal entries to display
-        virtual bool isEmpty () const = 0;
+        virtual bool isEmpty() const = 0;
 
         /// walks the active and optionally completed, quests providing the name and completed status
-        virtual void visitQuestNames(bool active_only, std::function <void (std::string_view, bool)> visitor) const = 0;
+        virtual void visitQuestNames(bool active_only, std::function<void(std::string_view, bool)> visitor) const = 0;
 
         /// walks over the journal entries related to all quests with the given name
         /// If \a questName is empty, simply visits all journal entries
-        virtual void visitJournalEntries (const std::string& questName, std::function <void (JournalEntry const &)> visitor) const = 0;
+        virtual void visitJournalEntries(
+            const std::string& questName, std::function<void(JournalEntry const&)> visitor) const = 0;
 
         /// provides the name of the topic specified by its id
-        virtual void visitTopicName (TopicId topicId, std::function <void (Utf8Span)> visitor) const = 0;
+        virtual void visitTopicName(TopicId topicId, std::function<void(Utf8Span)> visitor) const = 0;
 
         /// walks over the topics whose names start with the character
-        virtual void visitTopicNamesStartingWith(Utf8Stream::UnicodeChar character, std::function < void (std::string_view) > visitor) const = 0;
+        virtual void visitTopicNamesStartingWith(
+            Utf8Stream::UnicodeChar character, std::function<void(std::string_view)> visitor) const = 0;
 
         /// walks over the topic entries for the topic specified by its identifier
-        virtual void visitTopicEntries (TopicId topicId, std::function <void (TopicEntry const &)> visitor) const = 0;
+        virtual void visitTopicEntries(TopicId topicId, std::function<void(TopicEntry const&)> visitor) const = 0;
 
         // create an instance of the default journal view model implementation
-        static Ptr create ();
+        static Ptr create();
 
         virtual ~JournalViewModel() = default;
     };
diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp
index 7009e66110..729e29edf3 100644
--- a/apps/openmw/mwgui/journalwindow.cpp
+++ b/apps/openmw/mwgui/journalwindow.cpp
@@ -5,45 +5,45 @@
 #include <string>
 #include <utility>
 
-#include <MyGUI_TextBox.h>
 #include <MyGUI_Button.h>
 #include <MyGUI_InputManager.h>
+#include <MyGUI_TextBox.h>
 
 #include <components/misc/strings/algorithm.hpp>
 #include <components/widgets/imagebutton.hpp>
 #include <components/widgets/list.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/journal.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "bookpage.hpp"
-#include "windowbase.hpp"
-#include "journalviewmodel.hpp"
 #include "journalbooks.hpp"
+#include "journalviewmodel.hpp"
+#include "windowbase.hpp"
 
 namespace
 {
-    static char const OptionsOverlay [] = "OptionsOverlay";
-    static char const OptionsBTN [] = "OptionsBTN";
-    static char const PrevPageBTN [] = "PrevPageBTN";
-    static char const NextPageBTN [] = "NextPageBTN";
-    static char const CloseBTN [] = "CloseBTN";
-    static char const JournalBTN [] = "JournalBTN";
-    static char const TopicsBTN [] = "TopicsBTN";
-    static char const QuestsBTN [] = "QuestsBTN";
-    static char const CancelBTN [] = "CancelBTN";
-    static char const ShowAllBTN [] = "ShowAllBTN";
-    static char const ShowActiveBTN [] = "ShowActiveBTN";
-    static char const PageOneNum [] = "PageOneNum";
-    static char const PageTwoNum [] = "PageTwoNum";
-    static char const TopicsList [] = "TopicsList";
-    static char const QuestsList [] = "QuestsList";
-    static char const LeftBookPage [] = "LeftBookPage";
-    static char const RightBookPage [] = "RightBookPage";
-    static char const LeftTopicIndex [] = "LeftTopicIndex";
-    static char const CenterTopicIndex [] = "CenterTopicIndex";
-    static char const RightTopicIndex [] = "RightTopicIndex";
+    static char const OptionsOverlay[] = "OptionsOverlay";
+    static char const OptionsBTN[] = "OptionsBTN";
+    static char const PrevPageBTN[] = "PrevPageBTN";
+    static char const NextPageBTN[] = "NextPageBTN";
+    static char const CloseBTN[] = "CloseBTN";
+    static char const JournalBTN[] = "JournalBTN";
+    static char const TopicsBTN[] = "TopicsBTN";
+    static char const QuestsBTN[] = "QuestsBTN";
+    static char const CancelBTN[] = "CancelBTN";
+    static char const ShowAllBTN[] = "ShowAllBTN";
+    static char const ShowActiveBTN[] = "ShowActiveBTN";
+    static char const PageOneNum[] = "PageOneNum";
+    static char const PageTwoNum[] = "PageTwoNum";
+    static char const TopicsList[] = "TopicsList";
+    static char const QuestsList[] = "QuestsList";
+    static char const LeftBookPage[] = "LeftBookPage";
+    static char const RightBookPage[] = "RightBookPage";
+    static char const LeftTopicIndex[] = "LeftTopicIndex";
+    static char const CenterTopicIndex[] = "CenterTopicIndex";
+    static char const RightTopicIndex[] = "RightTopicIndex";
 
     struct JournalWindowImpl : MWGui::JournalBooks, MWGui::JournalWindow
     {
@@ -53,7 +53,7 @@ namespace
             Book mBook;
         };
 
-        typedef std::stack <DisplayState> DisplayStateStack;
+        typedef std::stack<DisplayState> DisplayStateStack;
 
         DisplayStateStack mStates;
         Book mTopicIndexBook;
@@ -63,66 +63,58 @@ namespace
         bool mAllQuests;
 
         template <typename T>
-        T * getWidget (char const * name)
+        T* getWidget(char const* name)
         {
-            T * widget;
-            WindowBase::getWidget (widget, name);
+            T* widget;
+            WindowBase::getWidget(widget, name);
             return widget;
         }
 
         template <typename value_type>
-        void setText (char const * name, value_type const & value)
+        void setText(char const* name, value_type const& value)
         {
-            getWidget <MyGUI::TextBox> (name) ->
-                setCaption (MyGUI::utility::toString (value));
+            getWidget<MyGUI::TextBox>(name)->setCaption(MyGUI::utility::toString(value));
         }
 
-        void setVisible (char const * name, bool visible)
-        {
-            getWidget <MyGUI::Widget> (name) ->
-                setVisible (visible);
-        }
+        void setVisible(char const* name, bool visible) { getWidget<MyGUI::Widget>(name)->setVisible(visible); }
 
-        void adviseButtonClick (char const * name, void (JournalWindowImpl::*handler)(MyGUI::Widget*))
+        void adviseButtonClick(char const* name, void (JournalWindowImpl::*handler)(MyGUI::Widget*))
         {
-            getWidget <MyGUI::Widget> (name) ->
-                eventMouseButtonClick += newDelegate(this, handler);
+            getWidget<MyGUI::Widget>(name)->eventMouseButtonClick += newDelegate(this, handler);
         }
 
-        void adviseKeyPress (char const * name, void (JournalWindowImpl::*handler)(MyGUI::Widget*, MyGUI::KeyCode, MyGUI::Char))
+        void adviseKeyPress(
+            char const* name, void (JournalWindowImpl::*handler)(MyGUI::Widget*, MyGUI::KeyCode, MyGUI::Char))
         {
-            getWidget <MyGUI::Widget> (name) ->
-                eventKeyButtonPressed += newDelegate(this, handler);
+            getWidget<MyGUI::Widget>(name)->eventKeyButtonPressed += newDelegate(this, handler);
         }
 
-        MWGui::BookPage* getPage (char const * name)
-        {
-            return getWidget <MWGui::BookPage> (name);
-        }
+        MWGui::BookPage* getPage(char const* name) { return getWidget<MWGui::BookPage>(name); }
 
-        JournalWindowImpl (MWGui::JournalViewModel::Ptr Model, bool questList, ToUTF8::FromType encoding)
-            : JournalBooks (Model, encoding), JournalWindow()
+        JournalWindowImpl(MWGui::JournalViewModel::Ptr Model, bool questList, ToUTF8::FromType encoding)
+            : JournalBooks(Model, encoding)
+            , JournalWindow()
         {
             center();
 
-            adviseButtonClick (OptionsBTN,    &JournalWindowImpl::notifyOptions   );
-            adviseButtonClick (PrevPageBTN,   &JournalWindowImpl::notifyPrevPage  );
-            adviseButtonClick (NextPageBTN,   &JournalWindowImpl::notifyNextPage  );
-            adviseButtonClick (CloseBTN,      &JournalWindowImpl::notifyClose     );
-            adviseButtonClick (JournalBTN,    &JournalWindowImpl::notifyJournal   );
+            adviseButtonClick(OptionsBTN, &JournalWindowImpl::notifyOptions);
+            adviseButtonClick(PrevPageBTN, &JournalWindowImpl::notifyPrevPage);
+            adviseButtonClick(NextPageBTN, &JournalWindowImpl::notifyNextPage);
+            adviseButtonClick(CloseBTN, &JournalWindowImpl::notifyClose);
+            adviseButtonClick(JournalBTN, &JournalWindowImpl::notifyJournal);
 
-            adviseButtonClick (TopicsBTN,     &JournalWindowImpl::notifyTopics    );
-            adviseButtonClick (QuestsBTN,     &JournalWindowImpl::notifyQuests    );
-            adviseButtonClick (CancelBTN,     &JournalWindowImpl::notifyCancel    );
+            adviseButtonClick(TopicsBTN, &JournalWindowImpl::notifyTopics);
+            adviseButtonClick(QuestsBTN, &JournalWindowImpl::notifyQuests);
+            adviseButtonClick(CancelBTN, &JournalWindowImpl::notifyCancel);
 
-            adviseButtonClick (ShowAllBTN,    &JournalWindowImpl::notifyShowAll   );
-            adviseButtonClick (ShowActiveBTN, &JournalWindowImpl::notifyShowActive);
+            adviseButtonClick(ShowAllBTN, &JournalWindowImpl::notifyShowAll);
+            adviseButtonClick(ShowActiveBTN, &JournalWindowImpl::notifyShowActive);
 
-            adviseKeyPress (OptionsBTN, &JournalWindowImpl::notifyKeyPress);
-            adviseKeyPress (PrevPageBTN, &JournalWindowImpl::notifyKeyPress);
-            adviseKeyPress (NextPageBTN, &JournalWindowImpl::notifyKeyPress);
-            adviseKeyPress (CloseBTN, &JournalWindowImpl::notifyKeyPress);
-            adviseKeyPress (JournalBTN, &JournalWindowImpl::notifyKeyPress);
+            adviseKeyPress(OptionsBTN, &JournalWindowImpl::notifyKeyPress);
+            adviseKeyPress(PrevPageBTN, &JournalWindowImpl::notifyKeyPress);
+            adviseKeyPress(NextPageBTN, &JournalWindowImpl::notifyKeyPress);
+            adviseKeyPress(CloseBTN, &JournalWindowImpl::notifyKeyPress);
+            adviseKeyPress(JournalBTN, &JournalWindowImpl::notifyKeyPress);
 
             Gui::MWList* list = getWidget<Gui::MWList>(QuestsList);
             list->eventItemSelected += MyGUI::newDelegate(this, &JournalWindowImpl::notifyQuestClicked);
@@ -132,24 +124,26 @@ namespace
 
             {
                 MWGui::BookPage::ClickCallback callback;
-                
-                callback = std::bind (&JournalWindowImpl::notifyTopicClicked, this, std::placeholders::_1);
 
-                getPage (LeftBookPage)->adviseLinkClicked (callback);
-                getPage (RightBookPage)->adviseLinkClicked (callback);
+                callback = std::bind(&JournalWindowImpl::notifyTopicClicked, this, std::placeholders::_1);
+
+                getPage(LeftBookPage)->adviseLinkClicked(callback);
+                getPage(RightBookPage)->adviseLinkClicked(callback);
 
-                getPage (LeftBookPage)->eventMouseWheel += MyGUI::newDelegate(this, &JournalWindowImpl::notifyMouseWheel);
-                getPage (RightBookPage)->eventMouseWheel += MyGUI::newDelegate(this, &JournalWindowImpl::notifyMouseWheel);
+                getPage(LeftBookPage)->eventMouseWheel
+                    += MyGUI::newDelegate(this, &JournalWindowImpl::notifyMouseWheel);
+                getPage(RightBookPage)->eventMouseWheel
+                    += MyGUI::newDelegate(this, &JournalWindowImpl::notifyMouseWheel);
             }
 
             {
                 MWGui::BookPage::ClickCallback callback;
-                
+
                 callback = std::bind(&JournalWindowImpl::notifyIndexLinkClicked, this, std::placeholders::_1);
 
-                getPage (LeftTopicIndex)->adviseLinkClicked (callback);
-                getPage (CenterTopicIndex)->adviseLinkClicked (callback);
-                getPage (RightTopicIndex)->adviseLinkClicked (callback);
+                getPage(LeftTopicIndex)->adviseLinkClicked(callback);
+                getPage(CenterTopicIndex)->adviseLinkClicked(callback);
+                getPage(RightTopicIndex)->adviseLinkClicked(callback);
             }
 
             adjustButton(PrevPageBTN);
@@ -167,8 +161,9 @@ namespace
             if (nextButton->getSize().width == 64)
             {
                 // english button has a 7 pixel wide strip of garbage on its right edge
-                nextButton->setSize(64-7, nextButton->getSize().height);
-                nextButton->setImageCoord(MyGUI::IntCoord(0,0,(64-7)*nextButtonScale,nextButton->getSize().height*nextButtonScale));
+                nextButton->setSize(64 - 7, nextButton->getSize().height);
+                nextButton->setImageCoord(
+                    MyGUI::IntCoord(0, 0, (64 - 7) * nextButtonScale, nextButton->getSize().height * nextButtonScale));
             }
 
             if (!questList)
@@ -203,20 +198,26 @@ namespace
                 adjustButton(TopicsBTN);
                 int topicsWidth = getWidget<MyGUI::Widget>(TopicsBTN)->getSize().width;
                 int cancelLeft = getWidget<MyGUI::Widget>(CancelBTN)->getPosition().left;
-                int cancelRight = getWidget<MyGUI::Widget>(CancelBTN)->getPosition().left + getWidget<MyGUI::Widget>(CancelBTN)->getSize().width;
+                int cancelRight = getWidget<MyGUI::Widget>(CancelBTN)->getPosition().left
+                    + getWidget<MyGUI::Widget>(CancelBTN)->getSize().width;
 
-                getWidget<MyGUI::Widget>(QuestsBTN)->setPosition(cancelRight, getWidget<MyGUI::Widget>(QuestsBTN)->getPosition().top);
+                getWidget<MyGUI::Widget>(QuestsBTN)->setPosition(
+                    cancelRight, getWidget<MyGUI::Widget>(QuestsBTN)->getPosition().top);
 
-                // Usually Topics, Quests, and Cancel buttons have the 64px width, so we can place the Topics left-up from the Cancel button, and the Quests right-up from the Cancel button.
-                // But in some installations, e.g. German one, the Topics button has the 128px width, so we should place it exactly left from the Quests button.
+                // Usually Topics, Quests, and Cancel buttons have the 64px width, so we can place the Topics left-up
+                // from the Cancel button, and the Quests right-up from the Cancel button. But in some installations,
+                // e.g. German one, the Topics button has the 128px width, so we should place it exactly left from the
+                // Quests button.
                 if (topicsWidth == 64)
                 {
-                    getWidget<MyGUI::Widget>(TopicsBTN)->setPosition(cancelLeft - topicsWidth, getWidget<MyGUI::Widget>(TopicsBTN)->getPosition().top);
+                    getWidget<MyGUI::Widget>(TopicsBTN)->setPosition(
+                        cancelLeft - topicsWidth, getWidget<MyGUI::Widget>(TopicsBTN)->getPosition().top);
                 }
                 else
                 {
                     int questLeft = getWidget<MyGUI::Widget>(QuestsBTN)->getPosition().left;
-                    getWidget<MyGUI::Widget>(TopicsBTN)->setPosition(questLeft - topicsWidth, getWidget<MyGUI::Widget>(TopicsBTN)->getPosition().top);
+                    getWidget<MyGUI::Widget>(TopicsBTN)->setPosition(
+                        questLeft - topicsWidth, getWidget<MyGUI::Widget>(TopicsBTN)->getPosition().top);
                 }
             }
 
@@ -228,28 +229,28 @@ namespace
 
         void onOpen() override
         {
-            if (!MWBase::Environment::get().getWindowManager ()->getJournalAllowed ())
+            if (!MWBase::Environment::get().getWindowManager()->getJournalAllowed())
             {
-                MWBase::Environment::get().getWindowManager()->popGuiMode ();
+                MWBase::Environment::get().getWindowManager()->popGuiMode();
             }
-            mModel->load ();
+            mModel->load();
 
-            setBookMode ();
+            setBookMode();
 
             Book journalBook;
-            if (mModel->isEmpty ())
-                journalBook = createEmptyJournalBook ();
+            if (mModel->isEmpty())
+                journalBook = createEmptyJournalBook();
             else
-                journalBook = createJournalBook ();
+                journalBook = createJournalBook();
 
-            pushBook (journalBook, 0);
+            pushBook(journalBook, 0);
 
             // fast forward to the last page
-            if (!mStates.empty ())
+            if (!mStates.empty())
             {
-                unsigned int  & page = mStates.top ().mPage;
-                page = mStates.top().mBook->pageCount()-1;
-                if (page%2)
+                unsigned int& page = mStates.top().mPage;
+                page = mStates.top().mBook->pageCount() - 1;
+                if (page % 2)
                     --page;
             }
             updateShowingPages();
@@ -259,57 +260,54 @@ namespace
 
         void onClose() override
         {
-            mModel->unload ();
+            mModel->unload();
 
-            getPage (LeftBookPage)->showPage (Book (), 0);
-            getPage (RightBookPage)->showPage (Book (), 0);
+            getPage(LeftBookPage)->showPage(Book(), 0);
+            getPage(RightBookPage)->showPage(Book(), 0);
 
-            while (!mStates.empty ())
-                mStates.pop ();
+            while (!mStates.empty())
+                mStates.pop();
 
-            mTopicIndexBook.reset ();
+            mTopicIndexBook.reset();
         }
 
-        void setVisible (bool newValue) override
-        {
-            WindowBase::setVisible (newValue);
-        }
+        void setVisible(bool newValue) override { WindowBase::setVisible(newValue); }
 
-        void setBookMode ()
+        void setBookMode()
         {
             mOptionsMode = false;
             mTopicsMode = false;
-            setVisible (OptionsBTN, true);
-            setVisible (OptionsOverlay, false);
+            setVisible(OptionsBTN, true);
+            setVisible(OptionsOverlay, false);
 
-            updateShowingPages ();
-            updateCloseJournalButton ();
+            updateShowingPages();
+            updateCloseJournalButton();
         }
 
-        void setOptionsMode ()
+        void setOptionsMode()
         {
             mOptionsMode = true;
             mTopicsMode = false;
 
-            setVisible (OptionsBTN, false);
-            setVisible (OptionsOverlay, true);
+            setVisible(OptionsBTN, false);
+            setVisible(OptionsOverlay, true);
 
-            setVisible (PrevPageBTN, false);
-            setVisible (NextPageBTN, false);
-            setVisible (CloseBTN, false);
-            setVisible (JournalBTN, false);
+            setVisible(PrevPageBTN, false);
+            setVisible(NextPageBTN, false);
+            setVisible(CloseBTN, false);
+            setVisible(JournalBTN, false);
 
-            setVisible (TopicsList, false);
-            setVisible (QuestsList, mQuestMode);
-            setVisible (LeftTopicIndex, !mQuestMode);
-            setVisible (CenterTopicIndex, !mQuestMode);
-            setVisible (RightTopicIndex, !mQuestMode);
-            setVisible (ShowAllBTN, mQuestMode && !mAllQuests);
-            setVisible (ShowActiveBTN, mQuestMode && mAllQuests);
+            setVisible(TopicsList, false);
+            setVisible(QuestsList, mQuestMode);
+            setVisible(LeftTopicIndex, !mQuestMode);
+            setVisible(CenterTopicIndex, !mQuestMode);
+            setVisible(RightTopicIndex, !mQuestMode);
+            setVisible(ShowAllBTN, mQuestMode && !mAllQuests);
+            setVisible(ShowActiveBTN, mQuestMode && mAllQuests);
 
-            //TODO: figure out how to make "options" page overlay book page
-            //      correctly, so that text may show underneath
-            getPage (RightBookPage)->showPage (Book (), 0);
+            // TODO: figure out how to make "options" page overlay book page
+            //       correctly, so that text may show underneath
+            getPage(RightBookPage)->showPage(Book(), 0);
 
             // If in quest mode, ensure the quest list is updated
             if (mQuestMode)
@@ -318,48 +316,48 @@ namespace
                 notifyTopics(getWidget<MyGUI::Widget>(TopicsList));
         }
 
-        void pushBook (Book book, unsigned int page)
+        void pushBook(Book book, unsigned int page)
         {
             DisplayState bs;
             bs.mPage = page;
             bs.mBook = book;
-            mStates.push (bs);
-            updateShowingPages ();
-            updateCloseJournalButton ();
+            mStates.push(bs);
+            updateShowingPages();
+            updateCloseJournalButton();
         }
 
-        void replaceBook (Book book, unsigned int page)
+        void replaceBook(Book book, unsigned int page)
         {
-            assert (!mStates.empty ());
-            mStates.top ().mBook = book;
-            mStates.top ().mPage = page;
-            updateShowingPages ();
+            assert(!mStates.empty());
+            mStates.top().mBook = book;
+            mStates.top().mPage = page;
+            updateShowingPages();
         }
 
-        void popBook ()
+        void popBook()
         {
-            mStates.pop ();
-            updateShowingPages ();
-            updateCloseJournalButton ();
+            mStates.pop();
+            updateShowingPages();
+            updateCloseJournalButton();
         }
 
-        void updateCloseJournalButton ()
+        void updateCloseJournalButton()
         {
-            setVisible (CloseBTN, mStates.size () < 2);
-            setVisible (JournalBTN, mStates.size () >= 2);
+            setVisible(CloseBTN, mStates.size() < 2);
+            setVisible(JournalBTN, mStates.size() >= 2);
         }
 
-        void updateShowingPages ()
+        void updateShowingPages()
         {
             Book book;
             unsigned int page;
             unsigned int relPages;
 
-            if (!mStates.empty ())
+            if (!mStates.empty())
             {
-                book = mStates.top ().mBook;
-                page = mStates.top ().mPage;
-                relPages = book->pageCount () - page;
+                book = mStates.top().mBook;
+                page = mStates.top().mPage;
+                relPages = book->pageCount() - page;
             }
             else
             {
@@ -381,14 +379,14 @@ namespace
             else if (focus == prevPageBtn && !prevPageVisible && nextPageVisible)
                 MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(nextPageBtn);
 
-            setVisible (PageOneNum, relPages > 0);
-            setVisible (PageTwoNum, relPages > 1);
+            setVisible(PageOneNum, relPages > 0);
+            setVisible(PageTwoNum, relPages > 1);
 
-            getPage (LeftBookPage)->showPage ((relPages > 0) ? book : Book (), page+0);
-            getPage (RightBookPage)->showPage ((relPages > 0) ? book : Book (), page+1);
+            getPage(LeftBookPage)->showPage((relPages > 0) ? book : Book(), page + 0);
+            getPage(RightBookPage)->showPage((relPages > 0) ? book : Book(), page + 1);
 
-            setText (PageOneNum, page + 1);
-            setText (PageTwoNum, page + 2);
+            setText(PageOneNum, page + 1);
+            setText(PageTwoNum, page + 2);
         }
 
         void notifyKeyPress(MyGUI::Widget* sender, MyGUI::KeyCode key, MyGUI::Char character)
@@ -399,18 +397,18 @@ namespace
                 notifyNextPage(sender);
         }
 
-        void notifyTopicClicked (intptr_t linkId)
+        void notifyTopicClicked(intptr_t linkId)
         {
-            Book topicBook = createTopicBook (linkId);
+            Book topicBook = createTopicBook(linkId);
 
-            if (mStates.size () > 1)
-                replaceBook (topicBook, 0);
+            if (mStates.size() > 1)
+                replaceBook(topicBook, 0);
             else
-                pushBook (topicBook, 0);
+                pushBook(topicBook, 0);
 
-            setVisible (OptionsOverlay, false);
-            setVisible (OptionsBTN, true);
-            setVisible (JournalBTN, true);
+            setVisible(OptionsOverlay, false);
+            setVisible(OptionsBTN, true);
+            setVisible(JournalBTN, true);
 
             mOptionsMode = false;
             mTopicsMode = false;
@@ -418,31 +416,31 @@ namespace
             MWBase::Environment::get().getWindowManager()->playSound("book page");
         }
 
-        void notifyTopicSelected (const std::string& topic, int id)
+        void notifyTopicSelected(const std::string& topic, int id)
         {
             const MWBase::Journal* journal = MWBase::Environment::get().getJournal();
             intptr_t topicId = 0; /// \todo get rid of intptr ids
-            for(MWBase::Journal::TTopicIter i = journal->topicBegin(); i != journal->topicEnd (); ++i)
+            for (MWBase::Journal::TTopicIter i = journal->topicBegin(); i != journal->topicEnd(); ++i)
             {
                 if (Misc::StringUtils::ciEqual(i->first, topic))
-                    topicId = intptr_t (&i->second);
+                    topicId = intptr_t(&i->second);
             }
 
             notifyTopicClicked(topicId);
         }
 
-        void notifyQuestClicked (const std::string& name, int id)
+        void notifyQuestClicked(const std::string& name, int id)
         {
-            Book book = createQuestBook (name);
+            Book book = createQuestBook(name);
 
-            if (mStates.size () > 1)
-                replaceBook (book, 0);
+            if (mStates.size() > 1)
+                replaceBook(book, 0);
             else
-                pushBook (book, 0);
+                pushBook(book, 0);
 
-            setVisible (OptionsOverlay, false);
-            setVisible (OptionsBTN, true);
-            setVisible (JournalBTN, true);
+            setVisible(OptionsOverlay, false);
+            setVisible(OptionsBTN, true);
+            setVisible(JournalBTN, true);
 
             mOptionsMode = false;
 
@@ -451,38 +449,38 @@ namespace
 
         void notifyOptions(MyGUI::Widget* _sender)
         {
-            setOptionsMode ();
+            setOptionsMode();
 
             if (!mTopicIndexBook)
-                mTopicIndexBook = createTopicIndexBook ();
+                mTopicIndexBook = createTopicIndexBook();
 
             if (mIndexPagesCount == 3)
             {
-                getPage (LeftTopicIndex)->showPage (mTopicIndexBook, 0);
-                getPage (CenterTopicIndex)->showPage (mTopicIndexBook, 1);
-                getPage (RightTopicIndex)->showPage (mTopicIndexBook, 2);
+                getPage(LeftTopicIndex)->showPage(mTopicIndexBook, 0);
+                getPage(CenterTopicIndex)->showPage(mTopicIndexBook, 1);
+                getPage(RightTopicIndex)->showPage(mTopicIndexBook, 2);
             }
             else
             {
-                getPage (LeftTopicIndex)->showPage (mTopicIndexBook, 0);
-                getPage (RightTopicIndex)->showPage (mTopicIndexBook, 1);
+                getPage(LeftTopicIndex)->showPage(mTopicIndexBook, 0);
+                getPage(RightTopicIndex)->showPage(mTopicIndexBook, 1);
             }
         }
 
         void notifyJournal(MyGUI::Widget* _sender)
         {
-            assert (mStates.size () > 1);
-            popBook ();
+            assert(mStates.size() > 1);
+            popBook();
 
             MWBase::Environment::get().getWindowManager()->playSound("book page");
         }
 
-        void notifyIndexLinkClicked (MWGui::TypesetBook::InteractiveId index)
+        void notifyIndexLinkClicked(MWGui::TypesetBook::InteractiveId index)
         {
-            setVisible (LeftTopicIndex, false);
-            setVisible (CenterTopicIndex, false);
-            setVisible (RightTopicIndex, false);
-            setVisible (TopicsList, true);
+            setVisible(LeftTopicIndex, false);
+            setVisible(CenterTopicIndex, false);
+            setVisible(RightTopicIndex, false);
+            setVisible(TopicsList, true);
 
             mTopicsMode = true;
 
@@ -502,33 +500,36 @@ namespace
         {
             mQuestMode = false;
             mTopicsMode = false;
-            setVisible (LeftTopicIndex, true);
-            setVisible (CenterTopicIndex, true);
-            setVisible (RightTopicIndex, true);
-            setVisible (TopicsList, false);
-            setVisible (QuestsList, false);
-            setVisible (ShowAllBTN, false);
-            setVisible (ShowActiveBTN, false);
+            setVisible(LeftTopicIndex, true);
+            setVisible(CenterTopicIndex, true);
+            setVisible(RightTopicIndex, true);
+            setVisible(TopicsList, false);
+            setVisible(QuestsList, false);
+            setVisible(ShowAllBTN, false);
+            setVisible(ShowActiveBTN, false);
 
             MWBase::Environment::get().getWindowManager()->playSound("book page");
         }
 
         struct AddNamesToList
         {
-            AddNamesToList(Gui::MWList* list) : mList(list) {}
-
-            Gui::MWList* mList;
-            void operator() (std::string_view name, bool finished = false)
+            AddNamesToList(Gui::MWList* list)
+                : mList(list)
             {
-                mList->addItem(name);
             }
+
+            Gui::MWList* mList;
+            void operator()(std::string_view name, bool finished = false) { mList->addItem(name); }
         };
         struct SetNamesInactive
         {
-            SetNamesInactive(Gui::MWList* list) : mList(list) {}
+            SetNamesInactive(Gui::MWList* list)
+                : mList(list)
+            {
+            }
 
             Gui::MWList* mList;
-            void operator() (std::string_view name, bool finished)
+            void operator()(std::string_view name, bool finished)
             {
                 if (finished)
                 {
@@ -541,13 +542,13 @@ namespace
         {
             mQuestMode = true;
 
-            setVisible (LeftTopicIndex, false);
-            setVisible (CenterTopicIndex, false);
-            setVisible (RightTopicIndex, false);
-            setVisible (TopicsList, false);
-            setVisible (QuestsList, true);
-            setVisible (ShowAllBTN, !mAllQuests);
-            setVisible (ShowActiveBTN, mAllQuests);
+            setVisible(LeftTopicIndex, false);
+            setVisible(CenterTopicIndex, false);
+            setVisible(RightTopicIndex, false);
+            setVisible(TopicsList, false);
+            setVisible(QuestsList, true);
+            setVisible(ShowAllBTN, !mAllQuests);
+            setVisible(ShowActiveBTN, mAllQuests);
 
             Gui::MWList* list = getWidget<Gui::MWList>(QuestsList);
             list->clear();
@@ -590,12 +591,11 @@ namespace
                 setBookMode();
                 MWBase::Environment::get().getWindowManager()->playSound("book page");
             }
-
         }
 
         void notifyClose(MyGUI::Widget* _sender)
         {
-            MWBase::WindowManager *winMgr = MWBase::Environment::get().getWindowManager();
+            MWBase::WindowManager* winMgr = MWBase::Environment::get().getWindowManager();
             winMgr->playSound("book close");
             winMgr->popGuiMode();
         }
@@ -612,17 +612,17 @@ namespace
         {
             if (mOptionsMode)
                 return;
-            if (!mStates.empty ())
+            if (!mStates.empty())
             {
-                unsigned int  & page = mStates.top ().mPage;
-                Book   book = mStates.top ().mBook;
+                unsigned int& page = mStates.top().mPage;
+                Book book = mStates.top().mBook;
 
-                if (page+2 < book->pageCount())
+                if (page + 2 < book->pageCount())
                 {
                     MWBase::Environment::get().getWindowManager()->playSound("book page");
 
                     page += 2;
-                    updateShowingPages ();
+                    updateShowingPages();
                 }
             }
         }
@@ -631,16 +631,16 @@ namespace
         {
             if (mOptionsMode)
                 return;
-            if (!mStates.empty ())
+            if (!mStates.empty())
             {
-                unsigned int & page = mStates.top ().mPage;
+                unsigned int& page = mStates.top().mPage;
 
-                if(page >= 2)
+                if (page >= 2)
                 {
                     MWBase::Environment::get().getWindowManager()->playSound("book page");
 
                     page -= 2;
-                    updateShowingPages ();
+                    updateShowingPages();
                 }
             }
         }
@@ -648,7 +648,8 @@ namespace
 }
 
 // glue the implementation to the interface
-std::unique_ptr<MWGui::JournalWindow> MWGui::JournalWindow::create(JournalViewModel::Ptr Model, bool questList, ToUTF8::FromType encoding)
+std::unique_ptr<MWGui::JournalWindow> MWGui::JournalWindow::create(
+    JournalViewModel::Ptr Model, bool questList, ToUTF8::FromType encoding)
 {
     return std::make_unique<JournalWindowImpl>(Model, questList, encoding);
 }
@@ -656,5 +657,4 @@ std::unique_ptr<MWGui::JournalWindow> MWGui::JournalWindow::create(JournalViewMo
 MWGui::JournalWindow::JournalWindow()
     : BookWindowBase("openmw_journal.layout")
 {
-
 }
diff --git a/apps/openmw/mwgui/journalwindow.hpp b/apps/openmw/mwgui/journalwindow.hpp
index 0f3071f113..1c73e37a34 100644
--- a/apps/openmw/mwgui/journalwindow.hpp
+++ b/apps/openmw/mwgui/journalwindow.hpp
@@ -7,7 +7,10 @@
 
 #include <memory>
 
-namespace MWBase { class WindowManager; }
+namespace MWBase
+{
+    class WindowManager;
+}
 
 namespace MWGui
 {
@@ -18,13 +21,14 @@ namespace MWGui
         JournalWindow();
 
         /// construct a new instance of the one JournalWindow implementation
-        static std::unique_ptr<JournalWindow> create(std::shared_ptr<JournalViewModel> Model, bool questList, ToUTF8::FromType encoding);
+        static std::unique_ptr<JournalWindow> create(
+            std::shared_ptr<JournalViewModel> Model, bool questList, ToUTF8::FromType encoding);
 
         /// destroy this instance of the JournalWindow implementation
-        virtual ~JournalWindow () {}
+        virtual ~JournalWindow() {}
 
         /// show/hide the journal window
-        void setVisible (bool newValue) override = 0;
+        void setVisible(bool newValue) override = 0;
     };
 }
 
diff --git a/apps/openmw/mwgui/keyboardnavigation.cpp b/apps/openmw/mwgui/keyboardnavigation.cpp
index 37b64f276c..a8fb52c95e 100644
--- a/apps/openmw/mwgui/keyboardnavigation.cpp
+++ b/apps/openmw/mwgui/keyboardnavigation.cpp
@@ -1,300 +1,301 @@
 #include "keyboardnavigation.hpp"
 
+#include <MyGUI_Gui.h>
 #include <MyGUI_InputManager.h>
 #include <MyGUI_WidgetManager.h>
-#include <MyGUI_Gui.h>
 #include <MyGUI_Window.h>
 
 #include <components/debug/debuglog.hpp>
 
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 namespace MWGui
 {
 
-bool shouldAcceptKeyFocus(MyGUI::Widget* w)
-{
-    return w && !w->castType<MyGUI::Window>(false) && w->getInheritedEnabled() && w->getInheritedVisible() && w->getVisible() && w->getEnabled();
-}
-
-/// Recursively get all child widgets that accept keyboard input
-void getKeyFocusWidgets(MyGUI::Widget* parent, std::vector<MyGUI::Widget*>& results)
-{
-    assert(parent != nullptr);
-
-    if (!parent->getVisible() || !parent->getEnabled())
-        return;
-
-    MyGUI::EnumeratorWidgetPtr enumerator = parent->getEnumerator();
-    while (enumerator.next())
+    bool shouldAcceptKeyFocus(MyGUI::Widget* w)
     {
-        MyGUI::Widget* w = enumerator.current();
-        if (!w->getVisible() || !w->getEnabled())
-            continue;
-        if (w->getNeedKeyFocus() && shouldAcceptKeyFocus(w))
-            results.push_back(w);
-        else
-            getKeyFocusWidgets(w, results);
+        return w && !w->castType<MyGUI::Window>(false) && w->getInheritedEnabled() && w->getInheritedVisible()
+            && w->getVisible() && w->getEnabled();
     }
-}
 
-KeyboardNavigation::KeyboardNavigation()
-    : mCurrentFocus(nullptr)
-    , mModalWindow(nullptr)
-    , mEnabled(true)
-{
-    MyGUI::WidgetManager::getInstance().registerUnlinker(this);
-}
-
-KeyboardNavigation::~KeyboardNavigation()
-{
-    try
+    /// Recursively get all child widgets that accept keyboard input
+    void getKeyFocusWidgets(MyGUI::Widget* parent, std::vector<MyGUI::Widget*>& results)
     {
-        MyGUI::WidgetManager::getInstance().unregisterUnlinker(this);
+        assert(parent != nullptr);
+
+        if (!parent->getVisible() || !parent->getEnabled())
+            return;
+
+        MyGUI::EnumeratorWidgetPtr enumerator = parent->getEnumerator();
+        while (enumerator.next())
+        {
+            MyGUI::Widget* w = enumerator.current();
+            if (!w->getVisible() || !w->getEnabled())
+                continue;
+            if (w->getNeedKeyFocus() && shouldAcceptKeyFocus(w))
+                results.push_back(w);
+            else
+                getKeyFocusWidgets(w, results);
+        }
     }
-    catch(const MyGUI::Exception& e)
+
+    KeyboardNavigation::KeyboardNavigation()
+        : mCurrentFocus(nullptr)
+        , mModalWindow(nullptr)
+        , mEnabled(true)
     {
-        Log(Debug::Error) << "Error in the destructor: " << e.what();
+        MyGUI::WidgetManager::getInstance().registerUnlinker(this);
     }
-}
 
-void KeyboardNavigation::saveFocus(int mode)
-{
-    MyGUI::Widget* focus = MyGUI::InputManager::getInstance().getKeyFocusWidget();
-    if (shouldAcceptKeyFocus(focus))
+    KeyboardNavigation::~KeyboardNavigation()
     {
-        mKeyFocus[mode] = focus;
+        try
+        {
+            MyGUI::WidgetManager::getInstance().unregisterUnlinker(this);
+        }
+        catch (const MyGUI::Exception& e)
+        {
+            Log(Debug::Error) << "Error in the destructor: " << e.what();
+        }
     }
-    else if(shouldAcceptKeyFocus(mCurrentFocus))
+
+    void KeyboardNavigation::saveFocus(int mode)
     {
-        mKeyFocus[mode] = mCurrentFocus;
+        MyGUI::Widget* focus = MyGUI::InputManager::getInstance().getKeyFocusWidget();
+        if (shouldAcceptKeyFocus(focus))
+        {
+            mKeyFocus[mode] = focus;
+        }
+        else if (shouldAcceptKeyFocus(mCurrentFocus))
+        {
+            mKeyFocus[mode] = mCurrentFocus;
+        }
     }
-}
 
-void KeyboardNavigation::restoreFocus(int mode)
-{
-    std::map<int, MyGUI::Widget*>::const_iterator found = mKeyFocus.find(mode);
-    if (found != mKeyFocus.end())
+    void KeyboardNavigation::restoreFocus(int mode)
     {
-        MyGUI::Widget* w = found->second;
-        if (w && w->getVisible() && w->getEnabled() && w->getInheritedVisible() && w->getInheritedEnabled())
-            MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(found->second);
+        std::map<int, MyGUI::Widget*>::const_iterator found = mKeyFocus.find(mode);
+        if (found != mKeyFocus.end())
+        {
+            MyGUI::Widget* w = found->second;
+            if (w && w->getVisible() && w->getEnabled() && w->getInheritedVisible() && w->getInheritedEnabled())
+                MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(found->second);
+        }
     }
-}
 
-void KeyboardNavigation::_unlinkWidget(MyGUI::Widget *widget)
-{
-    for (std::pair<const int, MyGUI::Widget*>& w : mKeyFocus)
-        if (w.second == widget)
-            w.second = nullptr;
-    if (widget == mCurrentFocus)
-        mCurrentFocus = nullptr;
-}
-
-bool isRootParent(MyGUI::Widget* widget, MyGUI::Widget* root)
-{
-    while (widget && widget->getParent())
-        widget = widget->getParent();
-    return widget == root;
-}
-
-void KeyboardNavigation::onFrame()
-{
-    if (!mEnabled)
-        return;
-
-    if (!MWBase::Environment::get().getWindowManager()->isGuiMode())
+    void KeyboardNavigation::_unlinkWidget(MyGUI::Widget* widget)
     {
-        MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(nullptr);
-        return;
+        for (std::pair<const int, MyGUI::Widget*>& w : mKeyFocus)
+            if (w.second == widget)
+                w.second = nullptr;
+        if (widget == mCurrentFocus)
+            mCurrentFocus = nullptr;
     }
 
-    MyGUI::Widget* focus = MyGUI::InputManager::getInstance().getKeyFocusWidget();
-
-    if (focus == mCurrentFocus)
+    bool isRootParent(MyGUI::Widget* widget, MyGUI::Widget* root)
     {
-        return;
+        while (widget && widget->getParent())
+            widget = widget->getParent();
+        return widget == root;
     }
 
-    // workaround incorrect key focus resets (fix in MyGUI TBD)
-    if (!shouldAcceptKeyFocus(focus) && shouldAcceptKeyFocus(mCurrentFocus) && (!mModalWindow || isRootParent(mCurrentFocus, mModalWindow)))
+    void KeyboardNavigation::onFrame()
     {
-        MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mCurrentFocus);
-        focus = mCurrentFocus;
+        if (!mEnabled)
+            return;
+
+        if (!MWBase::Environment::get().getWindowManager()->isGuiMode())
+        {
+            MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(nullptr);
+            return;
+        }
+
+        MyGUI::Widget* focus = MyGUI::InputManager::getInstance().getKeyFocusWidget();
+
+        if (focus == mCurrentFocus)
+        {
+            return;
+        }
+
+        // workaround incorrect key focus resets (fix in MyGUI TBD)
+        if (!shouldAcceptKeyFocus(focus) && shouldAcceptKeyFocus(mCurrentFocus)
+            && (!mModalWindow || isRootParent(mCurrentFocus, mModalWindow)))
+        {
+            MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mCurrentFocus);
+            focus = mCurrentFocus;
+        }
+
+        if (focus != mCurrentFocus)
+        {
+            mCurrentFocus = focus;
+        }
     }
 
-    if (focus != mCurrentFocus)
+    void KeyboardNavigation::setDefaultFocus(MyGUI::Widget* window, MyGUI::Widget* defaultFocus)
     {
-        mCurrentFocus = focus;
+        MyGUI::Widget* focus = MyGUI::InputManager::getInstance().getKeyFocusWidget();
+        if (!focus || !shouldAcceptKeyFocus(focus))
+        {
+            MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(defaultFocus);
+        }
+        else
+        {
+            if (!isRootParent(focus, window))
+                MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(defaultFocus);
+        }
     }
-}
 
-void KeyboardNavigation::setDefaultFocus(MyGUI::Widget *window, MyGUI::Widget *defaultFocus)
-{
-    MyGUI::Widget* focus = MyGUI::InputManager::getInstance().getKeyFocusWidget();
-    if (!focus || !shouldAcceptKeyFocus(focus))
+    void KeyboardNavigation::setModalWindow(MyGUI::Widget* window)
     {
-        MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(defaultFocus);
+        mModalWindow = window;
     }
-    else
+
+    void KeyboardNavigation::setEnabled(bool enabled)
     {
-        if (!isRootParent(focus, window))
-            MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(defaultFocus);
+        mEnabled = enabled;
     }
-}
-
-void KeyboardNavigation::setModalWindow(MyGUI::Widget *window)
-{
-    mModalWindow = window;
-}
-
-void KeyboardNavigation::setEnabled(bool enabled)
-{
-    mEnabled = enabled;
-}
-
-enum Direction
-{
-    D_Left,
-    D_Up,
-    D_Right,
-    D_Down,
-    D_Next,
-    D_Prev
-};
-
-bool KeyboardNavigation::injectKeyPress(MyGUI::KeyCode key, unsigned int text, bool repeat)
-{
-    if (!mEnabled)
-        return false;
 
-    switch (key.getValue())
+    enum Direction
     {
-    case MyGUI::KeyCode::ArrowLeft:
-        return switchFocus(D_Left, false);
-    case MyGUI::KeyCode::ArrowRight:
-        return switchFocus(D_Right, false);
-    case MyGUI::KeyCode::ArrowUp:
-        return switchFocus(D_Up, false);
-    case MyGUI::KeyCode::ArrowDown:
-        return switchFocus(D_Down, false);
-    case MyGUI::KeyCode::Tab:
-        return switchFocus(MyGUI::InputManager::getInstance().isShiftPressed() ? D_Prev : D_Next, true);
-    case MyGUI::KeyCode::Return:
-    case MyGUI::KeyCode::NumpadEnter:
-    case MyGUI::KeyCode::Space:
+        D_Left,
+        D_Up,
+        D_Right,
+        D_Down,
+        D_Next,
+        D_Prev
+    };
+
+    bool KeyboardNavigation::injectKeyPress(MyGUI::KeyCode key, unsigned int text, bool repeat)
     {
-        // We should disable repeating for activation keys
-        MyGUI::InputManager::getInstance().injectKeyRelease(MyGUI::KeyCode::None);
-        if (repeat)
-            return true;
+        if (!mEnabled)
+            return false;
 
-        return accept();
-    }
-    default:
-        return false;
+        switch (key.getValue())
+        {
+            case MyGUI::KeyCode::ArrowLeft:
+                return switchFocus(D_Left, false);
+            case MyGUI::KeyCode::ArrowRight:
+                return switchFocus(D_Right, false);
+            case MyGUI::KeyCode::ArrowUp:
+                return switchFocus(D_Up, false);
+            case MyGUI::KeyCode::ArrowDown:
+                return switchFocus(D_Down, false);
+            case MyGUI::KeyCode::Tab:
+                return switchFocus(MyGUI::InputManager::getInstance().isShiftPressed() ? D_Prev : D_Next, true);
+            case MyGUI::KeyCode::Return:
+            case MyGUI::KeyCode::NumpadEnter:
+            case MyGUI::KeyCode::Space:
+            {
+                // We should disable repeating for activation keys
+                MyGUI::InputManager::getInstance().injectKeyRelease(MyGUI::KeyCode::None);
+                if (repeat)
+                    return true;
+
+                return accept();
+            }
+            default:
+                return false;
+        }
     }
-}
-
-bool KeyboardNavigation::switchFocus(int direction, bool wrap)
-{
-    if (!MWBase::Environment::get().getWindowManager()->isGuiMode())
-        return false;
-
-    MyGUI::Widget* focus = MyGUI::InputManager::getInstance().getKeyFocusWidget();
 
-    bool isCycle = (direction == D_Prev || direction == D_Next);
-
-    if ((focus && focus->getTypeName().find("Button") == std::string::npos) && !isCycle)
-        return false;
+    bool KeyboardNavigation::switchFocus(int direction, bool wrap)
+    {
+        if (!MWBase::Environment::get().getWindowManager()->isGuiMode())
+            return false;
 
-    if (focus && isCycle && focus->getUserString("AcceptTab") == "true")
-        return false;
+        MyGUI::Widget* focus = MyGUI::InputManager::getInstance().getKeyFocusWidget();
 
-    if ((!focus || !focus->getNeedKeyFocus()) && isCycle)
-    {
-        // if nothing is selected, select the first widget
-        return selectFirstWidget();
-    }
-    if (!focus)
-        return false;
+        bool isCycle = (direction == D_Prev || direction == D_Next);
 
-    MyGUI::Widget* window = focus;
-    while (window && window->getParent())
-        window = window->getParent();
-    MyGUI::VectorWidgetPtr keyFocusList;
-    getKeyFocusWidgets(window, keyFocusList);
+        if ((focus && focus->getTypeName().find("Button") == std::string::npos) && !isCycle)
+            return false;
 
-    if (keyFocusList.empty())
-        return false;
+        if (focus && isCycle && focus->getUserString("AcceptTab") == "true")
+            return false;
 
-    MyGUI::VectorWidgetPtr::iterator found = std::find(keyFocusList.begin(), keyFocusList.end(), focus);
-    if (found == keyFocusList.end())
-    {
-        if (isCycle)
+        if ((!focus || !focus->getNeedKeyFocus()) && isCycle)
+        {
+            // if nothing is selected, select the first widget
             return selectFirstWidget();
-        else
+        }
+        if (!focus)
             return false;
-    }
 
-    bool forward = (direction == D_Next || direction == D_Right || direction == D_Down);
+        MyGUI::Widget* window = focus;
+        while (window && window->getParent())
+            window = window->getParent();
+        MyGUI::VectorWidgetPtr keyFocusList;
+        getKeyFocusWidgets(window, keyFocusList);
 
-    int index = found - keyFocusList.begin();
-    index = forward ? (index+1) : (index-1);
-    if (wrap)
-        index = (index + keyFocusList.size())%keyFocusList.size();
-    else
-        index = std::clamp<int>(index, 0, keyFocusList.size() - 1);
+        if (keyFocusList.empty())
+            return false;
 
-    MyGUI::Widget* next = keyFocusList[index];
-    int vertdiff = next->getTop() - focus->getTop();
-    int horizdiff = next->getLeft() - focus->getLeft();
-    bool isVertical = std::abs(vertdiff) > std::abs(horizdiff);
-    if (direction == D_Right && (horizdiff <= 0 || isVertical))
-        return false;
-    else if (direction == D_Left && (horizdiff >= 0 || isVertical))
-        return false;
-    else if (direction == D_Down && (vertdiff <= 0 || !isVertical))
-        return false;
-    else if (direction == D_Up && (vertdiff >= 0 || !isVertical))
-        return false;
+        MyGUI::VectorWidgetPtr::iterator found = std::find(keyFocusList.begin(), keyFocusList.end(), focus);
+        if (found == keyFocusList.end())
+        {
+            if (isCycle)
+                return selectFirstWidget();
+            else
+                return false;
+        }
+
+        bool forward = (direction == D_Next || direction == D_Right || direction == D_Down);
+
+        int index = found - keyFocusList.begin();
+        index = forward ? (index + 1) : (index - 1);
+        if (wrap)
+            index = (index + keyFocusList.size()) % keyFocusList.size();
+        else
+            index = std::clamp<int>(index, 0, keyFocusList.size() - 1);
 
-    MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(keyFocusList[index]);
-    return true;
-}
+        MyGUI::Widget* next = keyFocusList[index];
+        int vertdiff = next->getTop() - focus->getTop();
+        int horizdiff = next->getLeft() - focus->getLeft();
+        bool isVertical = std::abs(vertdiff) > std::abs(horizdiff);
+        if (direction == D_Right && (horizdiff <= 0 || isVertical))
+            return false;
+        else if (direction == D_Left && (horizdiff >= 0 || isVertical))
+            return false;
+        else if (direction == D_Down && (vertdiff <= 0 || !isVertical))
+            return false;
+        else if (direction == D_Up && (vertdiff >= 0 || !isVertical))
+            return false;
 
-bool KeyboardNavigation::selectFirstWidget()
-{
-    MyGUI::VectorWidgetPtr keyFocusList;
-    MyGUI::EnumeratorWidgetPtr enumerator = MyGUI::Gui::getInstance().getEnumerator();
-    if (mModalWindow)
-        enumerator = mModalWindow->getEnumerator();
-    while (enumerator.next())
-        getKeyFocusWidgets(enumerator.current(), keyFocusList);
-
-    if (!keyFocusList.empty())
-    {
-        MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(keyFocusList[0]);
+        MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(keyFocusList[index]);
         return true;
     }
-    return false;
-}
 
-bool KeyboardNavigation::accept()
-{
-    MyGUI::Widget* focus = MyGUI::InputManager::getInstance().getKeyFocusWidget();
-    if (!focus)
-        return false;
-    //MyGUI::Button* button = focus->castType<MyGUI::Button>(false);
-    //if (button && button->getEnabled())
-    if (focus->getTypeName().find("Button") != std::string::npos && focus->getEnabled())
+    bool KeyboardNavigation::selectFirstWidget()
     {
-        focus->eventMouseButtonClick(focus);
-        return true;
+        MyGUI::VectorWidgetPtr keyFocusList;
+        MyGUI::EnumeratorWidgetPtr enumerator = MyGUI::Gui::getInstance().getEnumerator();
+        if (mModalWindow)
+            enumerator = mModalWindow->getEnumerator();
+        while (enumerator.next())
+            getKeyFocusWidgets(enumerator.current(), keyFocusList);
+
+        if (!keyFocusList.empty())
+        {
+            MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(keyFocusList[0]);
+            return true;
+        }
+        return false;
     }
-    return false;
-}
 
+    bool KeyboardNavigation::accept()
+    {
+        MyGUI::Widget* focus = MyGUI::InputManager::getInstance().getKeyFocusWidget();
+        if (!focus)
+            return false;
+        // MyGUI::Button* button = focus->castType<MyGUI::Button>(false);
+        // if (button && button->getEnabled())
+        if (focus->getTypeName().find("Button") != std::string::npos && focus->getEnabled())
+        {
+            focus->eventMouseButtonClick(focus);
+            return true;
+        }
+        return false;
+    }
 
 }
diff --git a/apps/openmw/mwgui/keyboardnavigation.hpp b/apps/openmw/mwgui/keyboardnavigation.hpp
index d5159c24a0..e37fe9088b 100644
--- a/apps/openmw/mwgui/keyboardnavigation.hpp
+++ b/apps/openmw/mwgui/keyboardnavigation.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_MWGUI_KEYBOARDNAVIGATION_H
 #define OPENMW_MWGUI_KEYBOARDNAVIGATION_H
 
-#include <MyGUI_KeyCode.h>
 #include <MyGUI_IUnlinkWidget.h>
+#include <MyGUI_KeyCode.h>
 
 namespace MWGui
 {
diff --git a/apps/openmw/mwgui/layout.cpp b/apps/openmw/mwgui/layout.cpp
index 2f763b6552..fb0fb5e1c5 100644
--- a/apps/openmw/mwgui/layout.cpp
+++ b/apps/openmw/mwgui/layout.cpp
@@ -1,9 +1,9 @@
 #include "layout.hpp"
 
-#include <MyGUI_LayoutManager.h>
-#include <MyGUI_Widget.h>
 #include <MyGUI_Gui.h>
+#include <MyGUI_LayoutManager.h>
 #include <MyGUI_TextBox.h>
+#include <MyGUI_Widget.h>
 #include <MyGUI_Window.h>
 
 #include "ustring.hpp"
@@ -27,7 +27,8 @@ namespace MWGui
             // Force the alignment to update immediately
             widget->_setAlign(widget->getSize(), widget->getParentSize());
         }
-        MYGUI_ASSERT(mMainWidget, "root widget name '" << MAIN_WINDOW << "' in layout '" << mLayoutName << "' not found.");
+        MYGUI_ASSERT(
+            mMainWidget, "root widget name '" << MAIN_WINDOW << "' in layout '" << mLayoutName << "' not found.");
     }
 
     void Layout::shutdown()
@@ -39,7 +40,7 @@ namespace MWGui
 
     void Layout::setCoord(int x, int y, int w, int h)
     {
-        mMainWidget->setCoord(x,y,w,h);
+        mMainWidget->setCoord(x, y, w, h);
     }
 
     void Layout::setVisible(bool b)
diff --git a/apps/openmw/mwgui/layout.hpp b/apps/openmw/mwgui/layout.hpp
index 7239f6a80c..07a3d1e66b 100644
--- a/apps/openmw/mwgui/layout.hpp
+++ b/apps/openmw/mwgui/layout.hpp
@@ -10,69 +10,69 @@
 
 namespace MWGui
 {
-  /** The Layout class is an utility class used to load MyGUI layouts
-      from xml files, and to manipulate member widgets.
-   */
-  class Layout
-  {
-  public:
-    Layout(std::string_view layout) : mMainWidget(nullptr)
+    /** The Layout class is an utility class used to load MyGUI layouts
+        from xml files, and to manipulate member widgets.
+     */
+    class Layout
     {
-      initialise(layout);
-      assert(mMainWidget);
-    }
-
-    virtual ~Layout()
-    {
-        try
+    public:
+        Layout(std::string_view layout)
+            : mMainWidget(nullptr)
         {
-            shutdown();
+            initialise(layout);
+            assert(mMainWidget);
         }
-        catch(const MyGUI::Exception& e)
+
+        virtual ~Layout()
         {
-            Log(Debug::Error) << "Error in the destructor: " << e.what();
+            try
+            {
+                shutdown();
+            }
+            catch (const MyGUI::Exception& e)
+            {
+                Log(Debug::Error) << "Error in the destructor: " << e.what();
+            }
         }
-    }
 
-    MyGUI::Widget* getWidget(std::string_view name);
+        MyGUI::Widget* getWidget(std::string_view name);
 
-    template <typename T>
-    void getWidget(T * & _widget, std::string_view _name)
-    {
-        MyGUI::Widget* w = getWidget(_name);
-        T* cast = w->castType<T>(false);
-        if (!cast)
+        template <typename T>
+        void getWidget(T*& _widget, std::string_view _name)
         {
-            MYGUI_EXCEPT("Error cast : dest type = '" << T::getClassTypeName()
-                         << "' source name = '" << w->getName()
-                         << "' source type = '" << w->getTypeName() << "' in layout '" << mLayoutName << "'");
+            MyGUI::Widget* w = getWidget(_name);
+            T* cast = w->castType<T>(false);
+            if (!cast)
+            {
+                MYGUI_EXCEPT("Error cast : dest type = '" << T::getClassTypeName() << "' source name = '"
+                                                          << w->getName() << "' source type = '" << w->getTypeName()
+                                                          << "' in layout '" << mLayoutName << "'");
+            }
+            else
+                _widget = cast;
         }
-        else
-            _widget = cast;
-    }
-
-  private:
-    void initialise(std::string_view layout);
 
-    void shutdown();
+    private:
+        void initialise(std::string_view layout);
 
-  public:
-    void setCoord(int x, int y, int w, int h);
+        void shutdown();
 
-    virtual void setVisible(bool b);
+    public:
+        void setCoord(int x, int y, int w, int h);
 
-    void setText(std::string_view name, std::string_view caption);
+        virtual void setVisible(bool b);
 
-    // NOTE: this assume that mMainWidget is of type Window.
-    void setTitle(std::string_view title);
+        void setText(std::string_view name, std::string_view caption);
 
-    MyGUI::Widget* mMainWidget;
+        // NOTE: this assume that mMainWidget is of type Window.
+        void setTitle(std::string_view title);
 
-  protected:
+        MyGUI::Widget* mMainWidget;
 
-    std::string mPrefix;
-    std::string mLayoutName;
-    MyGUI::VectorWidgetPtr mListWindowRoot;
-  };
+    protected:
+        std::string mPrefix;
+        std::string mLayoutName;
+        MyGUI::VectorWidgetPtr mListWindowRoot;
+    };
 }
 #endif
diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp
index a4609ec16a..7c41c8865f 100644
--- a/apps/openmw/mwgui/levelupdialog.cpp
+++ b/apps/openmw/mwgui/levelupdialog.cpp
@@ -1,21 +1,21 @@
 #include "levelupdialog.hpp"
 
 #include <MyGUI_Button.h>
-#include <MyGUI_ImageBox.h>
 #include <MyGUI_EditBox.h>
+#include <MyGUI_ImageBox.h>
 
 #include <components/fallback/fallback.hpp>
 
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/soundmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
 
+#include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
-#include "../mwmechanics/actorutil.hpp"
 
 #include "class.hpp"
 #include "ustring.hpp"
@@ -24,8 +24,8 @@ namespace MWGui
 {
     const unsigned int LevelupDialog::sMaxCoins = 3;
     LevelupDialog::LevelupDialog()
-        : WindowBase("openmw_levelup_dialog.layout"),
-          mCoinCount(sMaxCoins)
+        : WindowBase("openmw_levelup_dialog.layout")
+        , mCoinCount(sMaxCoins)
     {
         getWidget(mOkButton, "OkButton");
         getWidget(mClassImage, "ClassImage");
@@ -36,7 +36,7 @@ namespace MWGui
 
         mOkButton->eventMouseButtonClick += MyGUI::newDelegate(this, &LevelupDialog::onOkButtonClicked);
 
-        for (int i=1; i<9; ++i)
+        for (int i = 1; i < 9; ++i)
         {
             MyGUI::TextBox* t;
             getWidget(t, "AttribVal" + MyGUI::utility::toString(i));
@@ -44,7 +44,7 @@ namespace MWGui
 
             MyGUI::Button* b;
             getWidget(b, "Attrib" + MyGUI::utility::toString(i));
-            b->setUserData (i-1);
+            b->setUserData(i - 1);
             b->eventMouseButtonClick += MyGUI::newDelegate(this, &LevelupDialog::onAttributeClicked);
             mAttributes.push_back(b);
 
@@ -54,8 +54,9 @@ namespace MWGui
 
         for (unsigned int i = 0; i < mCoinCount; ++i)
         {
-            MyGUI::ImageBox* image = mCoinBox->createWidget<MyGUI::ImageBox>("ImageBox", MyGUI::IntCoord(0,0,16,16), MyGUI::Align::Default);
-            image->setImageTexture ("icons\\tx_goldicon.dds");
+            MyGUI::ImageBox* image = mCoinBox->createWidget<MyGUI::ImageBox>(
+                "ImageBox", MyGUI::IntCoord(0, 0, 16, 16), MyGUI::Align::Default);
+            image->setImageTexture("icons\\tx_goldicon.dds");
             mCoins.push_back(image);
         }
 
@@ -64,9 +65,9 @@ namespace MWGui
 
     void LevelupDialog::setAttributeValues()
     {
-        MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
         MWMechanics::CreatureStats& creatureStats = player.getClass().getCreatureStats(player);
-        MWMechanics::NpcStats& pcStats = player.getClass().getNpcStats (player);
+        MWMechanics::NpcStats& pcStats = player.getClass().getNpcStats(player);
 
         for (int i = 0; i < 8; ++i)
         {
@@ -83,12 +84,11 @@ namespace MWGui
         }
     }
 
-
     void LevelupDialog::resetCoins()
     {
         const int coinSpacing = 33;
-        int curX = mCoinBox->getWidth()/2 - (coinSpacing*(mCoinCount - 1) + 16*mCoinCount)/2;
-        for (unsigned int i=0; i<sMaxCoins; ++i)
+        int curX = mCoinBox->getWidth() / 2 - (coinSpacing * (mCoinCount - 1) + 16 * mCoinCount) / 2;
+        for (unsigned int i = 0; i < sMaxCoins; ++i)
         {
             MyGUI::ImageBox* image = mCoins[i];
             image->detachFromWidget();
@@ -96,8 +96,8 @@ namespace MWGui
             if (i < mCoinCount)
             {
                 mCoins[i]->setVisible(true);
-                image->setCoord(MyGUI::IntCoord(curX,0,16,16));
-                curX += 16+coinSpacing;
+                image->setCoord(MyGUI::IntCoord(curX, 0, 16, 16));
+                curX += 16 + coinSpacing;
             }
             else
                 mCoins[i]->setVisible(false);
@@ -107,7 +107,7 @@ namespace MWGui
     void LevelupDialog::assignCoins()
     {
         resetCoins();
-        for (unsigned int i=0; i<mSpentAttributes.size(); ++i)
+        for (unsigned int i = 0; i < mSpentAttributes.size(); ++i)
         {
             MyGUI::ImageBox* image = mCoins[i];
             image->detachFromWidget();
@@ -117,8 +117,9 @@ namespace MWGui
 
             int xdiff = mAttributeMultipliers[attribute]->getCaption() == "" ? 0 : 20;
 
-            MyGUI::IntPoint pos = mAttributes[attribute]->getAbsolutePosition() - mAssignWidget->getAbsolutePosition() - MyGUI::IntPoint(22+xdiff,0);
-            pos.top += (mAttributes[attribute]->getHeight() - image->getHeight())/2;
+            MyGUI::IntPoint pos = mAttributes[attribute]->getAbsolutePosition() - mAssignWidget->getAbsolutePosition()
+                - MyGUI::IntPoint(22 + xdiff, 0);
+            pos.top += (mAttributes[attribute]->getHeight() - image->getHeight()) / 2;
             image->setPosition(pos);
         }
 
@@ -127,20 +128,20 @@ namespace MWGui
 
     void LevelupDialog::onOpen()
     {
-        MWBase::World *world = MWBase::Environment::get().getWorld();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
         MWWorld::Ptr player = world->getPlayerPtr();
         MWMechanics::CreatureStats& creatureStats = player.getClass().getCreatureStats(player);
         MWMechanics::NpcStats& pcStats = player.getClass().getNpcStats(player);
 
-        setClassImage(mClassImage, getLevelupClassImage(pcStats.getSkillIncreasesForSpecialization(0),
-                                                        pcStats.getSkillIncreasesForSpecialization(1),
-                                                        pcStats.getSkillIncreasesForSpecialization(2)));
+        setClassImage(mClassImage,
+            getLevelupClassImage(pcStats.getSkillIncreasesForSpecialization(0),
+                pcStats.getSkillIncreasesForSpecialization(1), pcStats.getSkillIncreasesForSpecialization(2)));
 
-        int level = creatureStats.getLevel ()+1;
+        int level = creatureStats.getLevel() + 1;
         mLevelText->setCaptionWithReplacing("#{sLevelUpMenu1} " + MyGUI::utility::toString(level));
 
         std::string_view levelupdescription;
-        levelupdescription = Fallback::Map::getString("Level_Up_Level"+MyGUI::utility::toString(level));
+        levelupdescription = Fallback::Map::getString("Level_Up_Level" + MyGUI::utility::toString(level));
 
         if (levelupdescription.empty())
             levelupdescription = Fallback::Map::getString("Level_Up_Default");
@@ -157,8 +158,8 @@ namespace MWGui
                 mAttributeValues[i]->setEnabled(true);
                 availableAttributes++;
 
-                float mult = pcStats.getLevelupAttributeMultiplier (i);
-                mult = std::min(mult, 100-pcStats.getAttribute(i).getBase());
+                float mult = pcStats.getLevelupAttributeMultiplier(i);
+                mult = std::min(mult, 100 - pcStats.getAttribute(i).getBase());
                 text->setCaption(mult <= 1 ? "" : "x" + MyGUI::utility::toString(mult));
             }
             else
@@ -186,7 +187,7 @@ namespace MWGui
     void LevelupDialog::onOkButtonClicked(MyGUI::Widget* sender)
     {
         MWWorld::Ptr player = MWMechanics::getPlayer();
-        MWMechanics::NpcStats& pcStats = player.getClass().getNpcStats (player);
+        MWMechanics::NpcStats& pcStats = player.getClass().getNpcStats(player);
 
         if (mSpentAttributes.size() < mCoinCount)
             MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage36}");
@@ -207,10 +208,9 @@ namespace MWGui
 
             MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Levelup);
         }
-
     }
 
-    void LevelupDialog::onAttributeClicked(MyGUI::Widget *sender)
+    void LevelupDialog::onAttributeClicked(MyGUI::Widget* sender)
     {
         int attribute = *sender->getUserData<int>();
 
@@ -227,7 +227,8 @@ namespace MWGui
         assignCoins();
     }
 
-    std::string LevelupDialog::getLevelupClassImage(const int combatIncreases, const int magicIncreases, const int stealthIncreases)
+    std::string LevelupDialog::getLevelupClassImage(
+        const int combatIncreases, const int magicIncreases, const int stealthIncreases)
     {
         std::string ret = "acrobat";
 
diff --git a/apps/openmw/mwgui/levelupdialog.hpp b/apps/openmw/mwgui/levelupdialog.hpp
index 6c9182609e..2f7bf84089 100644
--- a/apps/openmw/mwgui/levelupdialog.hpp
+++ b/apps/openmw/mwgui/levelupdialog.hpp
@@ -40,7 +40,8 @@ namespace MWGui
 
         void setAttributeValues();
 
-        std::string getLevelupClassImage(const int combatIncreases, const int magicIncreases, const int stealthIncreases);
+        std::string getLevelupClassImage(
+            const int combatIncreases, const int magicIncreases, const int stealthIncreases);
     };
 
 }
diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index f80b24cccd..a91ce61ba7 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -6,22 +6,22 @@
 
 #include <osg/Texture2D>
 
-#include <MyGUI_ScrollBar.h>
 #include <MyGUI_Gui.h>
+#include <MyGUI_ScrollBar.h>
 #include <MyGUI_TextBox.h>
 
+#include <components/debug/debuglog.hpp>
 #include <components/misc/pathhelpers.hpp>
 #include <components/misc/rng.hpp>
-#include <components/debug/debuglog.hpp>
 #include <components/myguiplatform/myguitexture.hpp>
+#include <components/resource/resourcesystem.hpp>
 #include <components/settings/settings.hpp>
 #include <components/vfs/manager.hpp>
-#include <components/resource/resourcesystem.hpp>
 
 #include "../mwbase/environment.hpp"
+#include "../mwbase/inputmanager.hpp"
 #include "../mwbase/statemanager.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/inputmanager.hpp"
 
 #include "backgroundimage.hpp"
 
@@ -53,15 +53,16 @@ namespace MWGui
         findSplashScreens();
     }
 
-    LoadingScreen::~LoadingScreen()
-    {
-    }
+    LoadingScreen::~LoadingScreen() {}
 
     void LoadingScreen::findSplashScreens()
     {
         auto isSupportedExtension = [](const std::string_view& ext) {
-            static const std::array<std::string, 7> supported_extensions{ {"tga", "dds", "ktx", "png", "bmp", "jpeg", "jpg"} };
-            return !ext.empty() && std::find(supported_extensions.begin(), supported_extensions.end(), ext) != supported_extensions.end();
+            static const std::array<std::string, 7> supported_extensions{ { "tga", "dds", "ktx", "png", "bmp", "jpeg",
+                "jpg" } };
+            return !ext.empty()
+                && std::find(supported_extensions.begin(), supported_extensions.end(), ext)
+                != supported_extensions.end();
         };
 
         for (const auto& name : mResourceSystem->getVFS()->getRecursiveDirectoryIterator("Splash/"))
@@ -73,20 +74,22 @@ namespace MWGui
             Log(Debug::Warning) << "Warning: no splash screens found!";
     }
 
-    void LoadingScreen::setLabel(const std::string &label, bool important)
+    void LoadingScreen::setLabel(const std::string& label, bool important)
     {
         mImportantLabel = important;
 
         mLoadingText->setCaptionWithReplacing(label);
         int padding = mLoadingBox->getWidth() - mLoadingText->getWidth();
-        MyGUI::IntSize size(mLoadingText->getTextSize().width+padding, mLoadingBox->getHeight());
+        MyGUI::IntSize size(mLoadingText->getTextSize().width + padding, mLoadingBox->getHeight());
         size.width = std::max(300, size.width);
         mLoadingBox->setSize(size);
 
         if (MWBase::Environment::get().getWindowManager()->getMessagesCount() > 0)
-            mLoadingBox->setPosition(mMainWidget->getWidth()/2 - mLoadingBox->getWidth()/2, mMainWidget->getHeight()/2 - mLoadingBox->getHeight()/2);
+            mLoadingBox->setPosition(mMainWidget->getWidth() / 2 - mLoadingBox->getWidth() / 2,
+                mMainWidget->getHeight() / 2 - mLoadingBox->getHeight() / 2);
         else
-            mLoadingBox->setPosition(mMainWidget->getWidth()/2 - mLoadingBox->getWidth()/2, mMainWidget->getHeight() - mLoadingBox->getHeight() - 8);
+            mLoadingBox->setPosition(mMainWidget->getWidth() / 2 - mLoadingBox->getWidth() / 2,
+                mMainWidget->getHeight() - mLoadingBox->getHeight() - 8);
     }
 
     void LoadingScreen::setVisible(bool visible)
@@ -114,7 +117,7 @@ namespace MWGui
         {
         }
 
-        void operator () (osg::RenderInfo& renderInfo) const override
+        void operator()(osg::RenderInfo& renderInfo) const override
         {
             int w = renderInfo.getCurrentCamera()->getViewport()->width();
             int h = renderInfo.getCurrentCamera()->getViewport()->height();
@@ -123,10 +126,7 @@ namespace MWGui
             mOneshot = false;
         }
 
-        void reset()
-        {
-            mOneshot = true;
-        }
+        void reset() { mOneshot = true; }
 
     private:
         mutable bool mOneshot;
@@ -147,11 +147,13 @@ namespace MWGui
 
         mLoadingOnTime = mTimer.time_m();
 
-        // Assign dummy bounding sphere callback to avoid the bounding sphere of the entire scene being recomputed after each frame of loading
-        // We are already using node masks to avoid the scene from being updated/rendered, but node masks don't work for computeBound()
+        // Assign dummy bounding sphere callback to avoid the bounding sphere of the entire scene being recomputed after
+        // each frame of loading We are already using node masks to avoid the scene from being updated/rendered, but
+        // node masks don't work for computeBound()
         mViewer->getSceneData()->setComputeBoundingSphereCallback(new DontComputeBoundCallback);
 
-        if (const osgUtil::IncrementalCompileOperation* ico = mViewer->getIncrementalCompileOperation()) {
+        if (const osgUtil::IncrementalCompileOperation* ico = mViewer->getIncrementalCompileOperation())
+        {
             mOldIcoMin = ico->getMinimumTimeAvailableForGLCompileAndDeletePerFrame();
             mOldIcoMax = ico->getMaximumNumOfObjectsToCompilePerFrame();
         }
@@ -181,7 +183,7 @@ namespace MWGui
     {
         if (--mNestedLoadingCount > 0)
             return;
-        mLoadingBox->setVisible(true);   // restore
+        mLoadingBox->setVisible(true); // restore
 
         if (mLastRenderTime < mLoadingOnTime)
         {
@@ -211,14 +213,15 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_LoadingWallpaper);
     }
 
-    void LoadingScreen::changeWallpaper ()
+    void LoadingScreen::changeWallpaper()
     {
         if (!mSplashScreens.empty())
         {
-            std::string const & randomSplash = mSplashScreens.at(Misc::Rng::rollDice(mSplashScreens.size()));
+            std::string const& randomSplash = mSplashScreens.at(Misc::Rng::rollDice(mSplashScreens.size()));
 
             // TODO: add option (filename pattern?) to use image aspect ratio instead of 4:3
-            // we can't do this by default, because the Morrowind splash screens are 1024x1024, but should be displayed as 4:3
+            // we can't do this by default, because the Morrowind splash screens are 1024x1024, but should be displayed
+            // as 4:3
             bool stretch = Settings::Manager::getBool("stretch menu background", "GUI");
             mSplashImage->setVisible(true);
             mSplashImage->setBackgroundImage(randomSplash, true, stretch);
@@ -227,39 +230,42 @@ namespace MWGui
         mSceneImage->setVisible(false);
     }
 
-    void LoadingScreen::setProgressRange (size_t range)
+    void LoadingScreen::setProgressRange(size_t range)
     {
-        mProgressBar->setScrollRange(range+1);
+        mProgressBar->setScrollRange(range + 1);
         mProgressBar->setScrollPosition(0);
         mProgressBar->setTrackSize(0);
         mProgress = 0;
     }
 
-    void LoadingScreen::setProgress (size_t value)
+    void LoadingScreen::setProgress(size_t value)
     {
         // skip expensive update if there isn't enough visible progress
-        if (mProgressBar->getWidth() <= 0 || value - mProgress < mProgressBar->getScrollRange()/mProgressBar->getWidth())
+        if (mProgressBar->getWidth() <= 0
+            || value - mProgress < mProgressBar->getScrollRange() / mProgressBar->getWidth())
             return;
-        value = std::min(value, mProgressBar->getScrollRange()-1);
+        value = std::min(value, mProgressBar->getScrollRange() - 1);
         mProgress = value;
         mProgressBar->setScrollPosition(0);
-        mProgressBar->setTrackSize(static_cast<int>(value / (float)(mProgressBar->getScrollRange()) * mProgressBar->getLineSize()));
+        mProgressBar->setTrackSize(
+            static_cast<int>(value / (float)(mProgressBar->getScrollRange()) * mProgressBar->getLineSize()));
         draw();
     }
 
-    void LoadingScreen::increaseProgress (size_t increase)
+    void LoadingScreen::increaseProgress(size_t increase)
     {
         mProgressBar->setScrollPosition(0);
         size_t value = mProgress + increase;
-        value = std::min(value, mProgressBar->getScrollRange()-1);
+        value = std::min(value, mProgressBar->getScrollRange() - 1);
         mProgress = value;
-        mProgressBar->setTrackSize(static_cast<int>(value / (float)(mProgressBar->getScrollRange()) * mProgressBar->getLineSize()));
+        mProgressBar->setTrackSize(
+            static_cast<int>(value / (float)(mProgressBar->getScrollRange()) * mProgressBar->getLineSize()));
         draw();
     }
 
     bool LoadingScreen::needToDrawLoadingScreen()
     {
-        if ( mTimer.time_m() <= mLastRenderTime + (1.0/getTargetFrameRate()) * 1000.0)
+        if (mTimer.time_m() <= mLastRenderTime + (1.0 / getTargetFrameRate()) * 1000.0)
             return false;
 
         // the minimal delay before a loading screen shows
@@ -275,7 +281,7 @@ namespace MWGui
             diff -= mProgress / static_cast<float>(mProgressBar->getScrollRange()) * 100.f;
         }
 
-        if (!mShowWallpaper && diff < initialDelay*1000)
+        if (!mShowWallpaper && diff < initialDelay * 1000)
             return false;
         return true;
     }
@@ -320,7 +326,7 @@ namespace MWGui
         if (mVisible && !needToDrawLoadingScreen())
             return;
 
-        if (mShowWallpaper && mTimer.time_m() > mLastWallpaperChangeTime + 5000*1)
+        if (mShowWallpaper && mTimer.time_m() > mLastWallpaperChangeTime + 5000 * 1)
         {
             mLastWallpaperChangeTime = mTimer.time_m();
             changeWallpaper();
@@ -336,7 +342,7 @@ namespace MWGui
         mResourceSystem->reportStats(mViewer->getFrameStamp()->getFrameNumber(), mViewer->getViewerStats());
         if (osgUtil::IncrementalCompileOperation* ico = mViewer->getIncrementalCompileOperation())
         {
-            ico->setMinimumTimeAvailableForGLCompileAndDeletePerFrame(1.f/getTargetFrameRate());
+            ico->setMinimumTimeAvailableForGLCompileAndDeletePerFrame(1.f / getTargetFrameRate());
             ico->setMaximumNumOfObjectsToCompilePerFrame(1000);
         }
 
diff --git a/apps/openmw/mwgui/loadingscreen.hpp b/apps/openmw/mwgui/loadingscreen.hpp
index cfa97ed762..2cd3f73576 100644
--- a/apps/openmw/mwgui/loadingscreen.hpp
+++ b/apps/openmw/mwgui/loadingscreen.hpp
@@ -37,12 +37,12 @@ namespace MWGui
         virtual ~LoadingScreen();
 
         /// Overridden from Loading::Listener, see the Loading::Listener documentation for usage details
-        void setLabel (const std::string& label, bool important) override;
-        void loadingOn(bool visible=true) override;
+        void setLabel(const std::string& label, bool important) override;
+        void loadingOn(bool visible = true) override;
         void loadingOff() override;
-        void setProgressRange (size_t range) override;
-        void setProgress (size_t value) override;
-        void increaseProgress (size_t increase=1) override;
+        void setProgressRange(size_t range) override;
+        void setProgress(size_t value) override;
+        void increaseProgress(size_t increase = 1) override;
 
         void setVisible(bool visible) override;
 
@@ -95,5 +95,4 @@ namespace MWGui
 
 }
 
-
 #endif
diff --git a/apps/openmw/mwgui/mainmenu.cpp b/apps/openmw/mwgui/mainmenu.cpp
index f178576f12..850acf8090 100644
--- a/apps/openmw/mwgui/mainmenu.cpp
+++ b/apps/openmw/mwgui/mainmenu.cpp
@@ -1,21 +1,21 @@
 #include "mainmenu.hpp"
 
-#include <MyGUI_TextBox.h>
 #include <MyGUI_Gui.h>
 #include <MyGUI_RenderManager.h>
+#include <MyGUI_TextBox.h>
 
-#include <components/widgets/imagebutton.hpp>
 #include <components/settings/settings.hpp>
 #include <components/vfs/manager.hpp>
+#include <components/widgets/imagebutton.hpp>
 
 #include "../mwbase/environment.hpp"
+#include "../mwbase/statemanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwbase/statemanager.hpp"
 
-#include "savegamedialog.hpp"
-#include "confirmationdialog.hpp"
 #include "backgroundimage.hpp"
+#include "confirmationdialog.hpp"
+#include "savegamedialog.hpp"
 #include "videowidget.hpp"
 
 namespace MWGui
@@ -23,8 +23,10 @@ namespace MWGui
 
     MainMenu::MainMenu(int w, int h, const VFS::Manager* vfs, const std::string& versionDescription)
         : WindowBase("openmw_mainmenu.layout")
-        , mWidth (w), mHeight (h)
-        , mVFS(vfs), mButtonBox(nullptr)
+        , mWidth(w)
+        , mHeight(h)
+        , mVFS(vfs)
+        , mButtonBox(nullptr)
         , mBackground(nullptr)
         , mVideoBackground(nullptr)
         , mVideo(nullptr)
@@ -45,14 +47,13 @@ namespace MWGui
         updateMenu();
     }
 
-    void MainMenu::setVisible (bool visible)
+    void MainMenu::setVisible(bool visible)
     {
         if (visible)
             updateMenu();
 
-        bool isMainMenu =
-                MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_MainMenu) &&
-                MWBase::Environment::get().getStateManager()->getState() == MWBase::StateManager::State_NoGame;
+        bool isMainMenu = MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_MainMenu)
+            && MWBase::Environment::get().getStateManager()->getState() == MWBase::StateManager::State_NoGame;
 
         showBackground(isMainMenu);
 
@@ -69,12 +70,12 @@ namespace MWGui
                 MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mButtons["return"]);
         }
 
-        Layout::setVisible (visible);
+        Layout::setVisible(visible);
     }
 
     void MainMenu::onNewGameConfirmed()
     {
-        MWBase::Environment::get().getWindowManager()->removeGuiMode (MWGui::GM_MainMenu);
+        MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_MainMenu);
         MWBase::Environment::get().getStateManager()->newGame();
     }
 
@@ -83,18 +84,18 @@ namespace MWGui
         MWBase::Environment::get().getStateManager()->requestQuit();
     }
 
-    void MainMenu::onButtonClicked(MyGUI::Widget *sender)
+    void MainMenu::onButtonClicked(MyGUI::Widget* sender)
     {
-        MWBase::WindowManager *winMgr = MWBase::Environment::get().getWindowManager();
+        MWBase::WindowManager* winMgr = MWBase::Environment::get().getWindowManager();
 
         const std::string& name = *sender->getUserData<std::string>();
         winMgr->playSound("Menu Click");
         if (name == "return")
         {
-            winMgr->removeGuiMode (GM_MainMenu);
+            winMgr->removeGuiMode(GM_MainMenu);
         }
         else if (name == "options")
-            winMgr->pushGuiMode (GM_Settings);
+            winMgr->pushGuiMode(GM_Settings);
         else if (name == "credits")
             winMgr->playVideo("mw_credits.bik", true);
         else if (name == "exitgame")
@@ -160,12 +161,12 @@ namespace MWGui
             if (!mVideo)
             {
                 // Use black background to correct aspect ratio
-                mVideoBackground = MyGUI::Gui::getInstance().createWidgetReal<MyGUI::ImageBox>("ImageBox", 0,0,1,1,
-                    MyGUI::Align::Default, "MainMenuBackground");
+                mVideoBackground = MyGUI::Gui::getInstance().createWidgetReal<MyGUI::ImageBox>(
+                    "ImageBox", 0, 0, 1, 1, MyGUI::Align::Default, "MainMenuBackground");
                 mVideoBackground->setImageTexture("black");
 
-                mVideo = mVideoBackground->createWidget<VideoWidget>("ImageBox", 0,0,1,1,
-                    MyGUI::Align::Stretch, "MainMenuBackground");
+                mVideo = mVideoBackground->createWidget<VideoWidget>(
+                    "ImageBox", 0, 0, 1, 1, MyGUI::Align::Stretch, "MainMenuBackground");
                 mVideo->setVFS(mVFS);
 
                 mVideo->playVideo("video\\menu_background.bik");
@@ -184,8 +185,8 @@ namespace MWGui
         {
             if (!mBackground)
             {
-                mBackground = MyGUI::Gui::getInstance().createWidgetReal<BackgroundImage>("ImageBox", 0,0,1,1,
-                    MyGUI::Align::Stretch, "MainMenuBackground");
+                mBackground = MyGUI::Gui::getInstance().createWidgetReal<BackgroundImage>(
+                    "ImageBox", 0, 0, 1, 1, MyGUI::Align::Stretch, "MainMenuBackground");
                 mBackground->setBackgroundImage("textures\\menu_morrowind.dds", true, stretch);
             }
             mBackground->setVisible(true);
@@ -211,10 +212,11 @@ namespace MWGui
 
     void MainMenu::updateMenu()
     {
-        setCoord(0,0, mWidth, mHeight);
+        setCoord(0, 0, mWidth, mHeight);
 
         if (!mButtonBox)
-            mButtonBox = mMainWidget->createWidget<MyGUI::Widget>("", MyGUI::IntCoord(0, 0, 0, 0), MyGUI::Align::Default);
+            mButtonBox
+                = mMainWidget->createWidget<MyGUI::Widget>("", MyGUI::IntCoord(0, 0, 0, 0), MyGUI::Align::Default);
 
         int curH = 0;
 
@@ -224,35 +226,36 @@ namespace MWGui
 
         std::vector<std::string> buttons;
 
-        if (state==MWBase::StateManager::State_Running)
+        if (state == MWBase::StateManager::State_Running)
             buttons.emplace_back("return");
 
         buttons.emplace_back("newgame");
 
-        if (state==MWBase::StateManager::State_Running &&
-            MWBase::Environment::get().getWorld()->getGlobalInt ("chargenstate")==-1 &&
-                MWBase::Environment::get().getWindowManager()->isSavingAllowed())
+        if (state == MWBase::StateManager::State_Running
+            && MWBase::Environment::get().getWorld()->getGlobalInt("chargenstate") == -1
+            && MWBase::Environment::get().getWindowManager()->isSavingAllowed())
             buttons.emplace_back("savegame");
 
-        if (MWBase::Environment::get().getStateManager()->characterBegin()!=
-            MWBase::Environment::get().getStateManager()->characterEnd())
+        if (MWBase::Environment::get().getStateManager()->characterBegin()
+            != MWBase::Environment::get().getStateManager()->characterEnd())
             buttons.emplace_back("loadgame");
 
         buttons.emplace_back("options");
 
-        if (state==MWBase::StateManager::State_NoGame)
+        if (state == MWBase::StateManager::State_NoGame)
             buttons.emplace_back("credits");
 
         buttons.emplace_back("exitgame");
 
         // Create new buttons if needed
-        std::vector<std::string> allButtons { "return", "newgame", "savegame", "loadgame", "options", "credits", "exitgame"};
+        std::vector<std::string> allButtons{ "return", "newgame", "savegame", "loadgame", "options", "credits",
+            "exitgame" };
         for (std::string& buttonId : allButtons)
         {
             if (mButtons.find(buttonId) == mButtons.end())
             {
-                Gui::ImageButton* button = mButtonBox->createWidget<Gui::ImageButton>
-                        ("ImageBox", MyGUI::IntCoord(0, curH, 0, 0), MyGUI::Align::Default);
+                Gui::ImageButton* button = mButtonBox->createWidget<Gui::ImageButton>(
+                    "ImageBox", MyGUI::IntCoord(0, curH, 0, 0), MyGUI::Align::Default);
                 button->setProperty("ImageHighlighted", "textures\\menu_" + buttonId + "_over.dds");
                 button->setProperty("ImageNormal", "textures\\menu_" + buttonId + ".dds");
                 button->setProperty("ImagePushed", "textures\\menu_" + buttonId + "_pressed.dds");
@@ -288,19 +291,19 @@ namespace MWGui
             // Trim off some of the excessive padding
             // TODO: perhaps do this within ImageButton?
             int height = requested.height;
-            button->setImageTile(MyGUI::IntSize(requested.width, requested.height-16*scale));
-            button->setCoord((maxwidth-requested.width/scale) / 2, curH, requested.width/scale, height/scale-16);
-            curH += height/scale-16;
+            button->setImageTile(MyGUI::IntSize(requested.width, requested.height - 16 * scale));
+            button->setCoord(
+                (maxwidth - requested.width / scale) / 2, curH, requested.width / scale, height / scale - 16);
+            curH += height / scale - 16;
         }
 
         if (state == MWBase::StateManager::State_NoGame)
         {
             // Align with the background image
-            int bottomPadding=24;
-            mButtonBox->setCoord (mWidth/2 - maxwidth/2, mHeight - curH - bottomPadding, maxwidth, curH);
+            int bottomPadding = 24;
+            mButtonBox->setCoord(mWidth / 2 - maxwidth / 2, mHeight - curH - bottomPadding, maxwidth, curH);
         }
         else
-            mButtonBox->setCoord (mWidth/2 - maxwidth/2, mHeight/2 - curH/2, maxwidth, curH);
-
+            mButtonBox->setCoord(mWidth / 2 - maxwidth / 2, mHeight / 2 - curH / 2, maxwidth, curH);
     }
 }
diff --git a/apps/openmw/mwgui/mainmenu.hpp b/apps/openmw/mwgui/mainmenu.hpp
index 2ca3844f37..710a246653 100644
--- a/apps/openmw/mwgui/mainmenu.hpp
+++ b/apps/openmw/mwgui/mainmenu.hpp
@@ -24,45 +24,44 @@ namespace MWGui
 
     class MainMenu : public WindowBase
     {
-            int mWidth;
-            int mHeight;
+        int mWidth;
+        int mHeight;
 
-            bool mHasAnimatedMenu;
+        bool mHasAnimatedMenu;
 
-        public:
+    public:
+        MainMenu(int w, int h, const VFS::Manager* vfs, const std::string& versionDescription);
 
-            MainMenu(int w, int h, const VFS::Manager* vfs, const std::string& versionDescription);
+        void onResChange(int w, int h) override;
 
-            void onResChange(int w, int h) override;
+        void setVisible(bool visible) override;
 
-            void setVisible (bool visible) override;
+        void onFrame(float dt) override;
 
-            void onFrame(float dt) override;
+        bool exit() override;
 
-            bool exit() override;
+    private:
+        const VFS::Manager* mVFS;
 
-        private:
-            const VFS::Manager* mVFS;
+        MyGUI::Widget* mButtonBox;
+        MyGUI::TextBox* mVersionText;
 
-            MyGUI::Widget* mButtonBox;
-            MyGUI::TextBox* mVersionText;
+        BackgroundImage* mBackground;
 
-            BackgroundImage* mBackground;
+        MyGUI::ImageBox* mVideoBackground;
+        VideoWidget* mVideo; // For animated main menus
 
-            MyGUI::ImageBox* mVideoBackground;
-            VideoWidget* mVideo; // For animated main menus
+        std::map<std::string, Gui::ImageButton*> mButtons;
 
-            std::map<std::string, Gui::ImageButton*> mButtons;
+        void onButtonClicked(MyGUI::Widget* sender);
+        void onNewGameConfirmed();
+        void onExitConfirmed();
 
-            void onButtonClicked (MyGUI::Widget* sender);
-            void onNewGameConfirmed();
-            void onExitConfirmed();
+        void showBackground(bool show);
 
-            void showBackground(bool show);
+        void updateMenu();
 
-            void updateMenu();
-
-            std::unique_ptr<SaveGameDialog> mSaveGameDialog;
+        std::unique_ptr<SaveGameDialog> mSaveGameDialog;
     };
 
 }
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index c52d1f0660..e963fef05e 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -2,30 +2,30 @@
 
 #include <osg/Texture2D>
 
-#include <MyGUI_ScrollView.h>
-#include <MyGUI_ImageBox.h>
-#include <MyGUI_RenderManager.h>
+#include <MyGUI_Button.h>
+#include <MyGUI_FactoryManager.h>
 #include <MyGUI_Gui.h>
-#include <MyGUI_LanguageManager.h>
+#include <MyGUI_ImageBox.h>
 #include <MyGUI_InputManager.h>
+#include <MyGUI_LanguageManager.h>
+#include <MyGUI_RenderManager.h>
 #include <MyGUI_RotatingSkin.h>
-#include <MyGUI_FactoryManager.h>
+#include <MyGUI_ScrollView.h>
 #include <MyGUI_TextIterator.h>
-#include <MyGUI_Button.h>
 
-#include <components/esm3/globalmap.hpp>
 #include <components/esm3/esmwriter.hpp>
-#include <components/settings/settings.hpp>
+#include <components/esm3/globalmap.hpp>
 #include <components/myguiplatform/myguitexture.hpp>
+#include <components/settings/settings.hpp>
 
+#include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwbase/environment.hpp"
 
-#include "../mwworld/player.hpp"
 #include "../mwworld/cellstore.hpp"
-#include "../mwworld/esmstore.hpp"
 #include "../mwworld/cellutils.hpp"
+#include "../mwworld/esmstore.hpp"
+#include "../mwworld/player.hpp"
 
 #include "../mwrender/globalmap.hpp"
 #include "../mwrender/localmap.hpp"
@@ -39,7 +39,7 @@ namespace
 {
 
     const int cellSize = Constants::CellSizeInUnits;
-    constexpr float speed = 1.08f;   //the zoom speed, it should be greater than 1
+    constexpr float speed = 1.08f; // the zoom speed, it should be greater than 1
 
     enum LocalMapWidgetDepth
     {
@@ -58,7 +58,6 @@ namespace
         Global_MapLayer = 3
     };
 
-
     /// @brief A widget that changes its color when hovered.
     class MarkerWidget final : public MyGUI::Widget
     {
@@ -71,24 +70,15 @@ namespace
             setColour(colour);
         }
 
-        void setHoverColour(const MyGUI::Colour& colour)
-        {
-            mHoverColour = colour;
-        }
+        void setHoverColour(const MyGUI::Colour& colour) { mHoverColour = colour; }
 
     private:
         MyGUI::Colour mNormalColour;
         MyGUI::Colour mHoverColour;
 
-        void onMouseLostFocus(MyGUI::Widget* _new) override
-        {
-            setColour(mNormalColour);
-        }
+        void onMouseLostFocus(MyGUI::Widget* _new) override { setColour(mNormalColour); }
 
-        void onMouseSetFocus(MyGUI::Widget* _old) override
-        {
-            setColour(mHoverColour);
-        }
+        void onMouseSetFocus(MyGUI::Widget* _old) override { setColour(mHoverColour); }
     };
 
     MyGUI::IntRect createRect(const MyGUI::IntPoint& center, int radius)
@@ -102,8 +92,10 @@ namespace
             return Constants::CellGridRadius;
         if (!Settings::Manager::getBool("distant terrain", "Terrain"))
             return Constants::CellGridRadius;
-        const int maxLocalViewingDistance = std::max(Settings::Manager::getInt("max local viewing distance", "Map"), Constants::CellGridRadius);
-        const int viewingDistanceInCells = Settings::Manager::getFloat("viewing distance", "Camera") / Constants::CellSizeInUnits;
+        const int maxLocalViewingDistance
+            = std::max(Settings::Manager::getInt("max local viewing distance", "Map"), Constants::CellGridRadius);
+        const int viewingDistanceInCells
+            = Settings::Manager::getFloat("viewing distance", "Camera") / Constants::CellSizeInUnits;
         return std::clamp(viewingDistanceInCells, Constants::CellGridRadius, maxLocalViewingDistance);
     }
 }
@@ -111,14 +103,14 @@ namespace
 namespace MWGui
 {
 
-    void CustomMarkerCollection::addMarker(const ESM::CustomMarker &marker, bool triggerEvent)
+    void CustomMarkerCollection::addMarker(const ESM::CustomMarker& marker, bool triggerEvent)
     {
         mMarkers.insert(std::make_pair(marker.mCell, marker));
         if (triggerEvent)
             eventMarkersChanged();
     }
 
-    void CustomMarkerCollection::deleteMarker(const ESM::CustomMarker &marker)
+    void CustomMarkerCollection::deleteMarker(const ESM::CustomMarker& marker)
     {
         std::pair<ContainerType::iterator, ContainerType::iterator> range = mMarkers.equal_range(marker.mCell);
 
@@ -134,7 +126,7 @@ namespace MWGui
         throw std::runtime_error("can't find marker to delete");
     }
 
-    void CustomMarkerCollection::updateMarker(const ESM::CustomMarker &marker, const std::string &newNote)
+    void CustomMarkerCollection::updateMarker(const ESM::CustomMarker& marker, const std::string& newNote)
     {
         std::pair<ContainerType::iterator, ContainerType::iterator> range = mMarkers.equal_range(marker.mCell);
 
@@ -166,7 +158,7 @@ namespace MWGui
         return mMarkers.end();
     }
 
-    CustomMarkerCollection::RangeType CustomMarkerCollection::getMarkers(const ESM::CellId &cellId) const
+    CustomMarkerCollection::RangeType CustomMarkerCollection::getMarkers(const ESM::CellId& cellId) const
     {
         return mMarkers.equal_range(cellId);
     }
@@ -178,7 +170,8 @@ namespace MWGui
 
     // ------------------------------------------------------
 
-    LocalMapBase::LocalMapBase(CustomMarkerCollection &markers, MWRender::LocalMap* localMapRender, bool fogOfWarEnabled)
+    LocalMapBase::LocalMapBase(
+        CustomMarkerCollection& markers, MWRender::LocalMap* localMapRender, bool fogOfWarEnabled)
         : mLocalMapRender(localMapRender)
         , mCurX(0)
         , mCurY(0)
@@ -213,22 +206,22 @@ namespace MWGui
         mCellDistance = cellDistance;
         mNumCells = mCellDistance * 2 + 1;
 
-        mLocalMap->setCanvasSize(mMapWidgetSize*mNumCells, mMapWidgetSize*mNumCells);
+        mLocalMap->setCanvasSize(mMapWidgetSize * mNumCells, mMapWidgetSize * mNumCells);
 
         mCompass->setDepth(Local_CompassLayer);
         mCompass->setNeedMouseFocus(false);
 
-        for (int mx=0; mx<mNumCells; ++mx)
+        for (int mx = 0; mx < mNumCells; ++mx)
         {
-            for (int my=0; my<mNumCells; ++my)
+            for (int my = 0; my < mNumCells; ++my)
             {
                 MyGUI::ImageBox* map = mLocalMap->createWidget<MyGUI::ImageBox>("ImageBox",
-                    MyGUI::IntCoord(mx*mMapWidgetSize, my*mMapWidgetSize, mMapWidgetSize, mMapWidgetSize),
+                    MyGUI::IntCoord(mx * mMapWidgetSize, my * mMapWidgetSize, mMapWidgetSize, mMapWidgetSize),
                     MyGUI::Align::Top | MyGUI::Align::Left);
                 map->setDepth(Local_MapLayer);
 
                 MyGUI::ImageBox* fog = mLocalMap->createWidget<MyGUI::ImageBox>("ImageBox",
-                    MyGUI::IntCoord(mx*mMapWidgetSize, my*mMapWidgetSize, mMapWidgetSize, mMapWidgetSize),
+                    MyGUI::IntCoord(mx * mMapWidgetSize, my * mMapWidgetSize, mMapWidgetSize, mMapWidgetSize),
                     MyGUI::Align::Top | MyGUI::Align::Left);
                 fog->setDepth(Local_FogLayer);
                 fog->setColour(MyGUI::Colour(0, 0, 0));
@@ -272,17 +265,15 @@ namespace MWGui
     {
         // normalized cell coordinates
         auto mapWidgetSize = getWidgetSize();
-        return MyGUI::IntPoint(
-            std::round(nX * mapWidgetSize + (mCellDistance + (cellX - mCurX)) * mapWidgetSize),
-            std::round(nY * mapWidgetSize + (mCellDistance - (cellY - mCurY)) * mapWidgetSize)
-        );
+        return MyGUI::IntPoint(std::round(nX * mapWidgetSize + (mCellDistance + (cellX - mCurX)) * mapWidgetSize),
+            std::round(nY * mapWidgetSize + (mCellDistance - (cellY - mCurY)) * mapWidgetSize));
     }
 
     MyGUI::IntPoint LocalMapBase::getMarkerPosition(float worldX, float worldY, MarkerUserData& markerPos) const
     {
         osg::Vec2i cellIndex;
         // normalized cell coordinates
-        float nX,nY;
+        float nX, nY;
 
         if (!mInterior)
         {
@@ -301,22 +292,26 @@ namespace MWGui
         return getPosition(markerPos.cellX, markerPos.cellY, markerPos.nX, markerPos.nY);
     }
 
-    MyGUI::IntCoord LocalMapBase::getMarkerCoordinates(float worldX, float worldY, MarkerUserData& markerPos, size_t markerSize) const
+    MyGUI::IntCoord LocalMapBase::getMarkerCoordinates(
+        float worldX, float worldY, MarkerUserData& markerPos, size_t markerSize) const
     {
         int halfMarkerSize = markerSize / 2;
         auto position = getMarkerPosition(worldX, worldY, markerPos);
         return MyGUI::IntCoord(position.left - halfMarkerSize, position.top - halfMarkerSize, markerSize, markerSize);
     }
 
-    MyGUI::Widget* LocalMapBase::createDoorMarker(const std::string& name, const MyGUI::VectorString& notes, float x, float y) const
+    MyGUI::Widget* LocalMapBase::createDoorMarker(
+        const std::string& name, const MyGUI::VectorString& notes, float x, float y) const
     {
         MarkerUserData data(mLocalMapRender);
         data.notes = notes;
         data.caption = name;
-        MarkerWidget* markerWidget = mLocalMap->createWidget<MarkerWidget>("MarkerButton",
-            getMarkerCoordinates(x, y, data, 8), MyGUI::Align::Default);
-        markerWidget->setNormalColour(MyGUI::Colour::parse(MyGUI::LanguageManager::getInstance().replaceTags("#{fontcolour=normal}")));
-        markerWidget->setHoverColour(MyGUI::Colour::parse(MyGUI::LanguageManager::getInstance().replaceTags("#{fontcolour=normal_over}")));
+        MarkerWidget* markerWidget = mLocalMap->createWidget<MarkerWidget>(
+            "MarkerButton", getMarkerCoordinates(x, y, data, 8), MyGUI::Align::Default);
+        markerWidget->setNormalColour(
+            MyGUI::Colour::parse(MyGUI::LanguageManager::getInstance().replaceTags("#{fontcolour=normal}")));
+        markerWidget->setHoverColour(
+            MyGUI::Colour::parse(MyGUI::LanguageManager::getInstance().replaceTags("#{fontcolour=normal_over}")));
         markerWidget->setDepth(Local_MarkerLayer);
         markerWidget->setNeedMouseFocus(true);
         // Used by tooltips to not show the tooltip if marker is hidden by fog of war
@@ -354,20 +349,21 @@ namespace MWGui
 
         for (int dX = -mCellDistance; dX <= mCellDistance; ++dX)
         {
-            for (int dY =-mCellDistance; dY <= mCellDistance; ++dY)
+            for (int dY = -mCellDistance; dY <= mCellDistance; ++dY)
             {
                 ESM::CellId cellId;
                 cellId.mPaged = !mInterior;
                 cellId.mWorldspace = (mInterior ? mPrefix : ESM::CellId::sDefaultWorldspace);
-                cellId.mIndex.mX = mCurX+dX;
-                cellId.mIndex.mY = mCurY+dY;
+                cellId.mIndex.mX = mCurX + dX;
+                cellId.mIndex.mY = mCurY + dY;
 
                 CustomMarkerCollection::RangeType markers = mCustomMarkers.getMarkers(cellId);
-                for (CustomMarkerCollection::ContainerType::const_iterator it = markers.first; it != markers.second; ++it)
+                for (CustomMarkerCollection::ContainerType::const_iterator it = markers.first; it != markers.second;
+                     ++it)
                 {
                     const ESM::CustomMarker& marker = it->second;
 
-                    MarkerUserData markerPos (mLocalMapRender);
+                    MarkerUserData markerPos(mLocalMapRender);
                     MarkerWidget* markerWidget = mLocalMap->createWidget<MarkerWidget>("CustomMarkerButton",
                         getMarkerCoordinates(marker.mWorldX, marker.mWorldY, markerPos, 16), MyGUI::Align::Default);
                     markerWidget->setDepth(Local_MarkerAboveFogLayer);
@@ -389,15 +385,14 @@ namespace MWGui
 
     void LocalMapBase::setActiveCell(const int x, const int y, bool interior)
     {
-        if (x==mCurX && y==mCurY && mInterior==interior && !mChanged)
+        if (x == mCurX && y == mCurY && mInterior == interior && !mChanged)
             return; // don't do anything if we're still in the same cell
 
         if (!interior && !(x == mCurX && y == mCurY))
         {
-            const MyGUI::IntRect intersection = {
-                std::max(x, mCurX) - mCellDistance, std::max(y, mCurY) - mCellDistance,
-                std::min(x, mCurX) + mCellDistance, std::min(y, mCurY) + mCellDistance
-            };
+            const MyGUI::IntRect intersection
+                = { std::max(x, mCurX) - mCellDistance, std::max(y, mCurY) - mCellDistance,
+                      std::min(x, mCurX) + mCellDistance, std::min(y, mCurY) + mCellDistance };
 
             const MyGUI::IntRect activeGrid = createRect({ x, y }, Constants::CellGridRadius);
             const MyGUI::IntRect currentView = createRect({ x, y }, mCellDistance);
@@ -405,7 +400,8 @@ namespace MWGui
             mExteriorDoorMarkerWidgets.clear();
             for (auto& [coord, doors] : mExteriorDoorsByCell)
             {
-                if (!mHasALastActiveCell || !currentView.inside({ coord.first, coord.second }) || activeGrid.inside({ coord.first, coord.second }))
+                if (!mHasALastActiveCell || !currentView.inside({ coord.first, coord.second })
+                    || activeGrid.inside({ coord.first, coord.second }))
                 {
                     mDoorMarkersToRecycle.insert(mDoorMarkersToRecycle.end(), doors.begin(), doors.end());
                     doors.clear();
@@ -429,11 +425,11 @@ namespace MWGui
         mInterior = interior;
         mChanged = false;
 
-        for (int mx=0; mx<mNumCells; ++mx)
+        for (int mx = 0; mx < mNumCells; ++mx)
         {
-            for (int my=0; my<mNumCells; ++my)
+            for (int my = 0; my < mNumCells; ++my)
             {
-                MapEntry& entry = mMaps[my + mNumCells*mx];
+                MapEntry& entry = mMaps[my + mNumCells * mx];
                 entry.mMapWidget->setRenderItemTexture(nullptr);
                 entry.mFogWidget->setRenderItemTexture(nullptr);
                 entry.mMapTexture.reset();
@@ -458,7 +454,7 @@ namespace MWGui
         updateCustomMarkers();
     }
 
-    void LocalMapBase::requestMapRender(const MWWorld::CellStore *cell)
+    void LocalMapBase::requestMapRender(const MWWorld::CellStore* cell)
     {
         mLocalMapRender->requestMap(cell);
     }
@@ -480,7 +476,7 @@ namespace MWGui
 
         if (pos != mCompass->getPosition())
         {
-            notifyPlayerUpdate ();
+            notifyPlayerUpdate();
 
             mCompass->setPosition(pos);
         }
@@ -497,12 +493,12 @@ namespace MWGui
         if (x == mLastDirectionX && y == mLastDirectionY)
             return;
 
-        notifyPlayerUpdate ();
+        notifyPlayerUpdate();
 
         MyGUI::ISubWidget* main = mCompass->getSubWidgetMain();
         MyGUI::RotatingSkin* rotatingSubskin = main->castType<MyGUI::RotatingSkin>();
-        rotatingSubskin->setCenter(MyGUI::IntPoint(16,16));
-        float angle = std::atan2(x,y);
+        rotatingSubskin->setCenter(MyGUI::IntPoint(16, 16));
+        float angle = std::atan2(x, y);
         rotatingSubskin->setAngle(angle);
 
         mLastDirectionX = x;
@@ -513,9 +509,7 @@ namespace MWGui
     {
         std::vector<MWWorld::Ptr> markers;
         MWBase::World* world = MWBase::Environment::get().getWorld();
-        world->listDetectedReferences(
-                    world->getPlayerPtr(),
-                    markers, MWBase::World::DetectionType(type));
+        world->listDetectedReferences(world->getPlayerPtr(), markers, MWBase::World::DetectionType(type));
         if (markers.empty())
             return;
 
@@ -536,12 +530,12 @@ namespace MWGui
         for (const MWWorld::Ptr& ptr : markers)
         {
             const ESM::Position& worldPos = ptr.getRefData().getPosition();
-            MarkerUserData markerPos (mLocalMapRender);
+            MarkerUserData markerPos(mLocalMapRender);
             MyGUI::ImageBox* markerWidget = mLocalMap->createWidget<MyGUI::ImageBox>("ImageBox",
                 getMarkerCoordinates(worldPos.pos[0], worldPos.pos[1], markerPos, 8), MyGUI::Align::Default);
             markerWidget->setDepth(Local_MarkerAboveFogLayer);
             markerWidget->setImageTexture(markerTexture);
-            markerWidget->setImageCoord(MyGUI::IntCoord(0,0,8,8));
+            markerWidget->setImageCoord(MyGUI::IntCoord(0, 0, 8, 8));
             markerWidget->setNeedMouseFocus(false);
             markerWidget->setUserData(markerPos);
             mMagicMarkerWidgets.push_back(markerWidget);
@@ -593,7 +587,7 @@ namespace MWGui
             if (!entry.mMapTexture)
             {
                 if (!mInterior)
-                    requestMapRender(MWBase::Environment::get().getWorld()->getExterior (entry.mCellX, entry.mCellY));
+                    requestMapRender(MWBase::Environment::get().getWorld()->getExterior(entry.mCellX, entry.mCellY));
 
                 osg::ref_ptr<osg::Texture2D> texture = mLocalMapRender->getMapTexture(entry.mCellX, entry.mCellY);
                 if (texture)
@@ -632,7 +626,8 @@ namespace MWGui
         std::vector<MWBase::World::DoorMarker> doors;
         MWBase::World* world = MWBase::Environment::get().getWorld();
 
-        mDoorMarkersToRecycle.insert(mDoorMarkersToRecycle.end(), mInteriorDoorMarkerWidgets.begin(), mInteriorDoorMarkerWidgets.end());
+        mDoorMarkersToRecycle.insert(
+            mDoorMarkersToRecycle.end(), mInteriorDoorMarkerWidgets.begin(), mInteriorDoorMarkerWidgets.end());
         mInteriorDoorMarkerWidgets.clear();
 
         if (mInterior)
@@ -640,7 +635,7 @@ namespace MWGui
             for (MyGUI::Widget* widget : mExteriorDoorMarkerWidgets)
                 widget->setVisible(false);
 
-            MWWorld::CellStore* cell = world->getInterior (mPrefix);
+            MWWorld::CellStore* cell = world->getInterior(mPrefix);
             world->getDoorMarkers(cell, doors);
         }
         else
@@ -659,7 +654,8 @@ namespace MWGui
         {
             std::vector<std::string> destNotes;
             CustomMarkerCollection::RangeType markers = mCustomMarkers.getMarkers(marker.dest);
-            for (CustomMarkerCollection::ContainerType::const_iterator iter = markers.first; iter != markers.second; ++iter)
+            for (CustomMarkerCollection::ContainerType::const_iterator iter = markers.first; iter != markers.second;
+                 ++iter)
                 destNotes.push_back(iter->second.mNote);
 
             MyGUI::Widget* markerWidget = nullptr;
@@ -684,7 +680,7 @@ namespace MWGui
 
             currentDoorMarkersWidgets().push_back(markerWidget);
             if (!mInterior)
-                mExteriorDoorsByCell[{data->cellX, data->cellY}].push_back(markerWidget);
+                mExteriorDoorsByCell[{ data->cellX, data->cellY }].push_back(markerWidget);
         }
 
         for (auto& widget : mDoorMarkersToRecycle)
@@ -707,11 +703,12 @@ namespace MWGui
         ESM::Position markedPosition;
         MWBase::Environment::get().getWorld()->getPlayer().getMarkedPosition(markedCell, markedPosition);
         if (markedCell && markedCell->isExterior() == !mInterior
-                && (!mInterior || Misc::StringUtils::ciEqual(markedCell->getCell()->mName, mPrefix)))
+            && (!mInterior || Misc::StringUtils::ciEqual(markedCell->getCell()->mName, mPrefix)))
         {
-            MarkerUserData markerPos (mLocalMapRender);
+            MarkerUserData markerPos(mLocalMapRender);
             MyGUI::ImageBox* markerWidget = mLocalMap->createWidget<MyGUI::ImageBox>("ImageBox",
-                getMarkerCoordinates(markedPosition.pos[0], markedPosition.pos[1], markerPos, 8), MyGUI::Align::Default);
+                getMarkerCoordinates(markedPosition.pos[0], markedPosition.pos[1], markerPos, 8),
+                MyGUI::Align::Default);
             markerWidget->setDepth(Local_MarkerAboveFogLayer);
             markerWidget->setImageTexture("textures\\menu_map_smark.dds");
             markerWidget->setNeedMouseFocus(false);
@@ -750,7 +747,8 @@ namespace MWGui
     }
 
     // ------------------------------------------------------------------------------------------
-    MapWindow::MapWindow(CustomMarkerCollection &customMarkers, DragAndDrop* drag, MWRender::LocalMap* localMapRender, SceneUtil::WorkQueue* workQueue)
+    MapWindow::MapWindow(CustomMarkerCollection& customMarkers, DragAndDrop* drag, MWRender::LocalMap* localMapRender,
+        SceneUtil::WorkQueue* workQueue)
 #ifdef USE_OPENXR
         : WindowPinnableBase("openmw_map_window_vr.layout")
 #else
@@ -778,7 +776,7 @@ namespace MWGui
         mEditNoteDialog.eventOkClicked += MyGUI::newDelegate(this, &MapWindow::onNoteEditOk);
         mEditNoteDialog.eventDeleteClicked += MyGUI::newDelegate(this, &MapWindow::onNoteEditDelete);
 
-        setCoord(500,0,320,300);
+        setCoord(500, 0, 320, 300);
 
         getWidget(mLocalMap, "LocalMap");
         getWidget(mGlobalMap, "GlobalMap");
@@ -795,17 +793,17 @@ namespace MWGui
         mLastScrollWindowCoordinates = mLocalMap->getCoord();
         mLocalMap->eventChangeCoord += MyGUI::newDelegate(this, &MapWindow::onChangeScrollWindowCoord);
 
-        mGlobalMap->setVisible (false);
+        mGlobalMap->setVisible(false);
 
         getWidget(mButton, "WorldButton");
         mButton->eventMouseButtonClick += MyGUI::newDelegate(this, &MapWindow::onWorldButtonClicked);
-        mButton->setCaptionWithReplacing( mGlobal ? "#{sLocal}" : "#{sWorld}");
+        mButton->setCaptionWithReplacing(mGlobal ? "#{sLocal}" : "#{sWorld}");
 
         getWidget(mEventBoxGlobal, "EventBoxGlobal");
         mEventBoxGlobal->eventMouseDrag += MyGUI::newDelegate(this, &MapWindow::onMouseDrag);
         mEventBoxGlobal->eventMouseButtonPressed += MyGUI::newDelegate(this, &MapWindow::onDragStart);
         const bool allowZooming = Settings::Manager::getBool("allow zooming", "Map");
-        if(allowZooming)
+        if (allowZooming)
             mEventBoxGlobal->eventMouseWheel += MyGUI::newDelegate(this, &MapWindow::onMapZoomed);
         mEventBoxGlobal->setDepth(Global_ExploreOverlayLayer);
 
@@ -851,7 +849,7 @@ namespace MWGui
         mEditNoteDialog.setVisible(false);
     }
 
-    void MapWindow::onCustomMarkerDoubleClicked(MyGUI::Widget *sender)
+    void MapWindow::onCustomMarkerDoubleClicked(MyGUI::Widget* sender)
     {
         mEditingMarker = *sender->getUserData<ESM::CustomMarker>();
         mEditNoteDialog.setText(mEditingMarker.mNote);
@@ -859,16 +857,16 @@ namespace MWGui
         mEditNoteDialog.setVisible(true);
     }
 
-    void MapWindow::onMapDoubleClicked(MyGUI::Widget *sender)
+    void MapWindow::onMapDoubleClicked(MyGUI::Widget* sender)
     {
         MyGUI::IntPoint clickedPos = MyGUI::InputManager::getInstance().getMousePosition();
 
         MyGUI::IntPoint widgetPos = clickedPos - mEventBoxLocal->getAbsolutePosition();
         auto mapWidgetSize = getWidgetSize();
-        int x = int(widgetPos.left/float(mapWidgetSize))-mCellDistance;
-        int y = (int(widgetPos.top/float(mapWidgetSize))-mCellDistance)*-1;
-        float nX = widgetPos.left/float(mapWidgetSize) - int(widgetPos.left/float(mapWidgetSize));
-        float nY = widgetPos.top/float(mapWidgetSize) - int(widgetPos.top/float(mapWidgetSize));
+        int x = int(widgetPos.left / float(mapWidgetSize)) - mCellDistance;
+        int y = (int(widgetPos.top / float(mapWidgetSize)) - mCellDistance) * -1;
+        float nX = widgetPos.left / float(mapWidgetSize) - int(widgetPos.left / float(mapWidgetSize));
+        float nY = widgetPos.top / float(mapWidgetSize) - int(widgetPos.top / float(mapWidgetSize));
         x += mCurX;
         y += mCurY;
 
@@ -880,7 +878,7 @@ namespace MWGui
         else
         {
             worldPos.x() = (x + nX) * cellSize;
-            worldPos.y() = (y + (1.0f-nY)) * cellSize;
+            worldPos.y() = (y + (1.0f - nY)) * cellSize;
         }
 
         mEditingMarker.mWorldX = worldPos.x();
@@ -911,19 +909,15 @@ namespace MWGui
         const double speedDiff = zoomOut ? 1.0 / speed : speed;
         const float localMapSizeInUnits = localWidgetSize * mNumCells;
 
-        const float currentMinLocalMapZoom = std::max({
-            (float(globalCellSize) * 4.f) / float(localWidgetSize),
-            float(mLocalMap->getWidth()) / localMapSizeInUnits,
-            float(mLocalMap->getHeight()) / localMapSizeInUnits
-        });
+        const float currentMinLocalMapZoom = std::max({ (float(globalCellSize) * 4.f) / float(localWidgetSize),
+            float(mLocalMap->getWidth()) / localMapSizeInUnits, float(mLocalMap->getHeight()) / localMapSizeInUnits });
 
         if (mGlobal)
         {
             const float currentGlobalZoom = mGlobalMapZoom;
-            const float currentMinGlobalMapZoom = std::min(
-                float(mGlobalMap->getWidth()) / float(mGlobalMapRender->getWidth()),
-                float(mGlobalMap->getHeight()) / float(mGlobalMapRender->getHeight())
-            );
+            const float currentMinGlobalMapZoom
+                = std::min(float(mGlobalMap->getWidth()) / float(mGlobalMapRender->getWidth()),
+                    float(mGlobalMap->getHeight()) / float(mGlobalMapRender->getHeight()));
 
             mGlobalMapZoom *= speedDiff;
 
@@ -933,13 +927,13 @@ namespace MWGui
                 mLocalMapZoom = currentMinLocalMapZoom;
                 onWorldButtonClicked(nullptr);
                 updateLocalMap();
-                return; //the zoom in is too big
+                return; // the zoom in is too big
             }
 
             if (zoomOut && mGlobalMapZoom < currentMinGlobalMapZoom)
             {
                 mGlobalMapZoom = currentGlobalZoom;
-                return; //the zoom out is too big, we have reach the borders of the widget
+                return; // the zoom out is too big, we have reach the borders of the widget
             }
         }
         else
@@ -950,19 +944,19 @@ namespace MWGui
             if (zoomIn && mLocalMapZoom > 4.0f)
             {
                 mLocalMapZoom = currentLocalZoom;
-                return; //the zoom in is too big
+                return; // the zoom in is too big
             }
 
             if (zoomOut && mLocalMapZoom < currentMinLocalMapZoom)
             {
                 mLocalMapZoom = currentLocalZoom;
 
-                float zoomRatio = 4.f/ mGlobalMapZoom;
+                float zoomRatio = 4.f / mGlobalMapZoom;
                 mGlobalMapZoom = 4.f;
                 onWorldButtonClicked(nullptr);
 
                 zoomOnCursor(zoomRatio);
-                return; //the zoom out is too big, we switch to the global map
+                return; // the zoom out is too big, we switch to the global map
             }
 
             if (zoomOut)
@@ -977,12 +971,10 @@ namespace MWGui
         auto cursor = MyGUI::InputManager::getInstance().getMousePosition() - map->getAbsolutePosition();
         auto centerView = map->getViewOffset() - cursor;
 
-        mGlobal? updateGlobalMap() : updateLocalMap();
+        mGlobal ? updateGlobalMap() : updateLocalMap();
 
-        map->setViewOffset(MyGUI::IntPoint(
-            std::round(centerView.left * speedDiff) + cursor.left,
-            std::round(centerView.top * speedDiff) + cursor.top
-        ));
+        map->setViewOffset(MyGUI::IntPoint(std::round(centerView.left * speedDiff) + cursor.left,
+            std::round(centerView.top * speedDiff) + cursor.top));
     }
 
     void MapWindow::updateGlobalMap()
@@ -1009,8 +1001,10 @@ namespace MWGui
     {
         MyGUI::IntCoord currentCoordinates = sender->getCoord();
 
-        MyGUI::IntPoint currentViewPortCenter = MyGUI::IntPoint(currentCoordinates.width / 2, currentCoordinates.height / 2);
-        MyGUI::IntPoint lastViewPortCenter = MyGUI::IntPoint(mLastScrollWindowCoordinates.width / 2, mLastScrollWindowCoordinates.height / 2);
+        MyGUI::IntPoint currentViewPortCenter
+            = MyGUI::IntPoint(currentCoordinates.width / 2, currentCoordinates.height / 2);
+        MyGUI::IntPoint lastViewPortCenter
+            = MyGUI::IntPoint(mLastScrollWindowCoordinates.width / 2, mLastScrollWindowCoordinates.height / 2);
         MyGUI::IntPoint viewPortCenterDiff = currentViewPortCenter - lastViewPortCenter;
 
         mLocalMap->setViewOffset(mLocalMap->getViewOffset() + viewPortCenterDiff);
@@ -1031,9 +1025,7 @@ namespace MWGui
         resizeGlobalMap();
     }
 
-    MapWindow::~MapWindow()
-    {
-    }
+    MapWindow::~MapWindow() {}
 
     void MapWindow::setCellName(const std::string& cellName)
     {
@@ -1043,20 +1035,19 @@ namespace MWGui
     MyGUI::IntCoord MapWindow::createMarkerCoords(float x, float y, float agregatedWeight) const
     {
         float worldX, worldY;
-        worldPosToGlobalMapImageSpace((x + 0.5f) * Constants::CellSizeInUnits, (y + 0.5f)* Constants::CellSizeInUnits, worldX, worldY);
+        worldPosToGlobalMapImageSpace(
+            (x + 0.5f) * Constants::CellSizeInUnits, (y + 0.5f) * Constants::CellSizeInUnits, worldX, worldY);
 
         const float markerSize = getMarkerSize(agregatedWeight);
         const float halfMarkerSize = markerSize / 2.0f;
-        return MyGUI::IntCoord(
-            static_cast<int>(worldX - halfMarkerSize),
-            static_cast<int>(worldY - halfMarkerSize),
+        return MyGUI::IntCoord(static_cast<int>(worldX - halfMarkerSize), static_cast<int>(worldY - halfMarkerSize),
             markerSize, markerSize);
     }
 
     MyGUI::Widget* MapWindow::createMarker(const std::string& name, float x, float y, float agregatedWeight)
     {
-        MyGUI::Widget* markerWidget = mGlobalMap->createWidget<MyGUI::Widget>("MarkerButton",
-            createMarkerCoords(x, y, agregatedWeight), MyGUI::Align::Default);
+        MyGUI::Widget* markerWidget = mGlobalMap->createWidget<MyGUI::Widget>(
+            "MarkerButton", createMarkerCoords(x, y, agregatedWeight), MyGUI::Align::Default);
         markerWidget->setVisible(markerWidget->getHeight() >= 6.0);
         markerWidget->setUserString("Caption_TextOneLine", "#{sCell=" + name + "}");
         setGlobalMapMarkerTooltip(markerWidget, x, y);
@@ -1064,7 +1055,8 @@ namespace MWGui
         markerWidget->setUserString("ToolTipLayout", "TextToolTipOneLine");
 
         markerWidget->setNeedMouseFocus(true);
-        markerWidget->setColour(MyGUI::Colour::parse(MyGUI::LanguageManager::getInstance().replaceTags("#{fontcolour=normal}")));
+        markerWidget->setColour(
+            MyGUI::Colour::parse(MyGUI::LanguageManager::getInstance().replaceTags("#{fontcolour=normal}")));
         markerWidget->setDepth(Global_MarkerLayer);
         markerWidget->eventMouseDrag += MyGUI::newDelegate(this, &MapWindow::onMouseDrag);
         markerWidget->eventMouseWheel += MyGUI::newDelegate(this, &MapWindow::onMapZoomed);
@@ -1087,7 +1079,7 @@ namespace MWGui
             auto& entry = mGlobalMapMarkersByName[name_];
             if (!entry.widget)
             {
-                entry = { osg::Vec2f(x, y), entry.widget };   //update the coords
+                entry = { osg::Vec2f(x, y), entry.widget }; // update the coords
 
                 entry.widget = createMarker(name_, entry.position.x(), entry.position.y(), 1);
                 mGlobalMapMarkers.emplace(entry, std::vector<MapMarkerType>{ entry });
@@ -1099,10 +1091,11 @@ namespace MWGui
                 auto& elements = it->second;
                 elements.emplace_back(mapMarkerWidget);
 
-                //we compute the barycenter of the entry elements => it will be the place on the world map for the agregated widget
-                marker.position = std::accumulate(elements.begin(), elements.end(), osg::Vec2f(0.f, 0.f), [](const auto& left, const auto& right) {
-                    return left + right.position;
-                }) / float(elements.size());
+                // we compute the barycenter of the entry elements => it will be the place on the world map for the
+                // agregated widget
+                marker.position = std::accumulate(elements.begin(), elements.end(), osg::Vec2f(0.f, 0.f),
+                                      [](const auto& left, const auto& right) { return left + right.position; })
+                    / float(elements.size());
 
                 marker.widget->setCoord(createMarkerCoords(marker.position.x(), marker.position.y(), elements.size()));
                 marker.widget->setVisible(marker.widget->getHeight() >= 6);
@@ -1136,7 +1129,7 @@ namespace MWGui
 
         if (!destNotes.empty())
         {
-            MarkerUserData data (nullptr);
+            MarkerUserData data(nullptr);
             data.notes = destNotes;
             data.caption = markerWidget->getUserString("Caption_TextOneLine");
             markerWidget->setUserData(data);
@@ -1152,14 +1145,16 @@ namespace MWGui
     {
         float markerSize = 12.f * mGlobalMapZoom;
         if (mGlobalMapZoom < 1)
-            return markerSize * std::sqrt(agregatedWeight);  //we want to see agregated object
-        return agregatedWeight ? 0 : markerSize; //we want to see only original markers (i.e. non agregated)
+            return markerSize * std::sqrt(agregatedWeight); // we want to see agregated object
+        return agregatedWeight ? 0 : markerSize; // we want to see only original markers (i.e. non agregated)
     }
 
     void MapWindow::resizeGlobalMap()
     {
-        mGlobalMap->setCanvasSize(mGlobalMapRender->getWidth() * mGlobalMapZoom, mGlobalMapRender->getHeight() * mGlobalMapZoom);
-        mGlobalMapImage->setSize(mGlobalMapRender->getWidth() * mGlobalMapZoom, mGlobalMapRender->getHeight() * mGlobalMapZoom);
+        mGlobalMap->setCanvasSize(
+            mGlobalMapRender->getWidth() * mGlobalMapZoom, mGlobalMapRender->getHeight() * mGlobalMapZoom);
+        mGlobalMapImage->setSize(
+            mGlobalMapRender->getWidth() * mGlobalMapZoom, mGlobalMapRender->getHeight() * mGlobalMapZoom);
     }
 
     void MapWindow::worldPosToGlobalMapImageSpace(float x, float y, float& imageX, float& imageY) const
@@ -1173,29 +1168,31 @@ namespace MWGui
     {
         LocalMapBase::updateCustomMarkers();
 
-        for (auto& [widgetPair, ignore]: mGlobalMapMarkers)
+        for (auto& [widgetPair, ignore] : mGlobalMapMarkers)
             setGlobalMapMarkerTooltip(widgetPair.widget, widgetPair.position.x(), widgetPair.position.y());
     }
 
     void MapWindow::onDragStart(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
     {
-        if (_id!=MyGUI::MouseButton::Left) return;
+        if (_id != MyGUI::MouseButton::Left)
+            return;
         mLastDragPos = MyGUI::IntPoint(_left, _top);
     }
 
     void MapWindow::onMouseDrag(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
     {
-        if (_id!=MyGUI::MouseButton::Left) return;
+        if (_id != MyGUI::MouseButton::Left)
+            return;
 
         MyGUI::IntPoint diff = MyGUI::IntPoint(_left, _top) - mLastDragPos;
 
         if (!mGlobal)
         {
             mNeedDoorMarkersUpdate = true;
-            mLocalMap->setViewOffset( mLocalMap->getViewOffset() + diff );
+            mLocalMap->setViewOffset(mLocalMap->getViewOffset() + diff);
         }
         else
-            mGlobalMap->setViewOffset( mGlobalMap->getViewOffset() + diff );
+            mGlobalMap->setViewOffset(mGlobalMap->getViewOffset() + diff);
 
         mLastDragPos = MyGUI::IntPoint(_left, _top);
     }
@@ -1208,8 +1205,7 @@ namespace MWGui
 
         Settings::Manager::setBool("global", "Map", mGlobal);
 
-        mButton->setCaptionWithReplacing( mGlobal ? "#{sLocal}" :
-                "#{sWorld}");
+        mButton->setCaptionWithReplacing(mGlobal ? "#{sLocal}" : "#{sWorld}");
     }
 
     void MapWindow::onPinToggled()
@@ -1234,19 +1230,19 @@ namespace MWGui
         globalMapUpdatePlayer();
     }
 
-    void MapWindow::globalMapUpdatePlayer ()
+    void MapWindow::globalMapUpdatePlayer()
     {
         // For interiors, position is set by WindowManager via setGlobalMapPlayerPosition
-        if (MWBase::Environment::get().getWorld ()->isCellExterior ())
+        if (MWBase::Environment::get().getWorld()->isCellExterior())
         {
-            osg::Vec3f pos = MWBase::Environment::get().getWorld ()->getPlayerPtr().getRefData().getPosition().asVec3();
+            osg::Vec3f pos = MWBase::Environment::get().getWorld()->getPlayerPtr().getRefData().getPosition().asVec3();
             setGlobalMapPlayerPosition(pos.x(), pos.y());
         }
     }
 
-    void MapWindow::notifyPlayerUpdate ()
+    void MapWindow::notifyPlayerUpdate()
     {
-        globalMapUpdatePlayer ();
+        globalMapUpdatePlayer();
 
         setGlobalMapPlayerDir(mLastDirectionX, mLastDirectionY);
     }
@@ -1256,8 +1252,9 @@ namespace MWGui
         LocalMapBase::centerView();
         // set the view offset so that player is in the center
         MyGUI::IntSize viewsize = mGlobalMap->getSize();
-        MyGUI::IntPoint pos = mPlayerArrowGlobal->getPosition() + MyGUI::IntPoint{ 16,16 };
-        MyGUI::IntPoint viewoffs(static_cast<int>(viewsize.width * 0.5f - pos.left), static_cast<int>(viewsize.height * 0.5f - pos.top));
+        MyGUI::IntPoint pos = mPlayerArrowGlobal->getPosition() + MyGUI::IntPoint{ 16, 16 };
+        MyGUI::IntPoint viewoffs(
+            static_cast<int>(viewsize.width * 0.5f - pos.left), static_cast<int>(viewsize.height * 0.5f - pos.top));
         mGlobalMap->setViewOffset(viewoffs);
     }
 
@@ -1272,8 +1269,8 @@ namespace MWGui
     {
         MyGUI::ISubWidget* main = mPlayerArrowGlobal->getSubWidgetMain();
         MyGUI::RotatingSkin* rotatingSubskin = main->castType<MyGUI::RotatingSkin>();
-        rotatingSubskin->setCenter(MyGUI::IntPoint(16,16));
-        float angle = std::atan2(x,y);
+        rotatingSubskin->setCenter(MyGUI::IntPoint(16, 16));
+        float angle = std::atan2(x, y);
         rotatingSubskin->setAngle(angle);
     }
 
@@ -1307,7 +1304,7 @@ namespace MWGui
         mGlobalMapMarkersByName.clear();
     }
 
-    void MapWindow::write(ESM::ESMWriter &writer, Loading::Listener& progress)
+    void MapWindow::write(ESM::ESMWriter& writer, Loading::Listener& progress)
     {
         ESM::GlobalMap map;
         mGlobalMapRender->write(map);
@@ -1319,7 +1316,7 @@ namespace MWGui
         writer.endRecord(ESM::REC_GMAP);
     }
 
-    void MapWindow::readRecord(ESM::ESMReader &reader, uint32_t type)
+    void MapWindow::readRecord(ESM::ESMReader& reader, uint32_t type)
     {
         if (type == ESM::REC_GMAP)
         {
@@ -1330,7 +1327,8 @@ namespace MWGui
 
             for (const ESM::GlobalMap::CellId& cellId : map.mMarkers)
             {
-                const ESM::Cell* cell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Cell>().search(cellId.first, cellId.second);
+                const ESM::Cell* cell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Cell>().search(
+                    cellId.first, cellId.second);
                 if (cell && !cell->mName.empty())
                     addVisitedLocation(cell->mName, cellId.first, cellId.second);
             }
@@ -1346,7 +1344,7 @@ namespace MWGui
             entry.mMapWidget->setVisible(alpha == 1);
     }
 
-    void MapWindow::customMarkerCreated(MyGUI::Widget *marker)
+    void MapWindow::customMarkerCreated(MyGUI::Widget* marker)
     {
         marker->eventMouseDrag += MyGUI::newDelegate(this, &MapWindow::onMouseDrag);
         marker->eventMouseButtonPressed += MyGUI::newDelegate(this, &MapWindow::onDragStart);
@@ -1354,7 +1352,7 @@ namespace MWGui
         marker->eventMouseWheel += MyGUI::newDelegate(this, &MapWindow::onMapZoomed);
     }
 
-    void MapWindow::doorMarkerCreated(MyGUI::Widget *marker)
+    void MapWindow::doorMarkerCreated(MyGUI::Widget* marker)
     {
         marker->eventMouseDrag += MyGUI::newDelegate(this, &MapWindow::onMouseDrag);
         marker->eventMouseButtonPressed += MyGUI::newDelegate(this, &MapWindow::onDragStart);
@@ -1391,7 +1389,7 @@ namespace MWGui
         return mDeleteButton->getVisible();
     }
 
-    void EditNoteDialog::setText(const std::string &text)
+    void EditNoteDialog::setText(const std::string& text)
     {
         mTextEdit->setCaption(MyGUI::TextIterator::toTagsString(text));
     }
@@ -1408,17 +1406,17 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mTextEdit);
     }
 
-    void EditNoteDialog::onCancelButtonClicked(MyGUI::Widget *sender)
+    void EditNoteDialog::onCancelButtonClicked(MyGUI::Widget* sender)
     {
         setVisible(false);
     }
 
-    void EditNoteDialog::onOkButtonClicked(MyGUI::Widget *sender)
+    void EditNoteDialog::onOkButtonClicked(MyGUI::Widget* sender)
     {
         eventOkClicked();
     }
 
-    void EditNoteDialog::onDeleteButtonClicked(MyGUI::Widget *sender)
+    void EditNoteDialog::onDeleteButtonClicked(MyGUI::Widget* sender)
     {
         eventDeleteClicked();
     }
diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index 37c971cd19..10dd9dbe0c 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -48,8 +48,8 @@ namespace MWGui
     class CustomMarkerCollection
     {
     public:
-        void addMarker(const ESM::CustomMarker& marker, bool triggerEvent=true);
-        void deleteMarker (const ESM::CustomMarker& marker);
+        void addMarker(const ESM::CustomMarker& marker, bool triggerEvent = true);
+        void deleteMarker(const ESM::CustomMarker& marker);
         void updateMarker(const ESM::CustomMarker& marker, const std::string& newNote);
 
         void clear();
@@ -80,7 +80,7 @@ namespace MWGui
         void init(MyGUI::ScrollView* widget, MyGUI::ImageBox* compass, int cellDistance = Constants::CellGridRadius);
 
         void setCellPrefix(const std::string& prefix);
-        void setActiveCell(const int x, const int y, bool interior=false);
+        void setActiveCell(const int x, const int y, bool interior = false);
         void requestMapRender(const MWWorld::CellStore* cell);
         void setPlayerDir(const float x, const float y);
         void setPlayerPos(int cellX, int cellY, const float nx, const float ny);
@@ -117,9 +117,9 @@ namespace MWGui
         float mLocalMapZoom = 1.f;
         MWRender::LocalMap* mLocalMapRender;
 
-        int mCurX, mCurY;   //the position of the active cell on the global map (in cell coords)
+        int mCurX, mCurY; // the position of the active cell on the global map (in cell coords)
         bool mHasALastActiveCell = false;
-        osg::Vec2f mCurPos;   //the position of the player in the world (in cell coords)
+        osg::Vec2f mCurPos; // the position of the player in the world (in cell coords)
 
         bool mInterior;
         MyGUI::ScrollView* mLocalMap;
@@ -140,7 +140,12 @@ namespace MWGui
         struct MapEntry
         {
             MapEntry(MyGUI::ImageBox* mapWidget, MyGUI::ImageBox* fogWidget)
-                : mMapWidget(mapWidget), mFogWidget(fogWidget), mCellX(0), mCellY(0) {}
+                : mMapWidget(mapWidget)
+                , mFogWidget(fogWidget)
+                , mCellX(0)
+                , mCellY(0)
+            {
+            }
 
             MyGUI::ImageBox* mMapWidget;
             MyGUI::ImageBox* mFogWidget;
@@ -166,9 +171,11 @@ namespace MWGui
         void applyFogOfWar();
 
         MyGUI::IntPoint getPosition(int cellX, int cellY, float nx, float ny) const;
-        MyGUI::IntPoint getMarkerPosition (float worldX, float worldY, MarkerUserData& markerPos) const;
-        MyGUI::IntCoord getMarkerCoordinates(float worldX, float worldY, MarkerUserData& markerPos, size_t markerSize) const;
-        MyGUI::Widget* createDoorMarker(const std::string& name, const MyGUI::VectorString& notes, float x, float y) const;
+        MyGUI::IntPoint getMarkerPosition(float worldX, float worldY, MarkerUserData& markerPos) const;
+        MyGUI::IntCoord getMarkerCoordinates(
+            float worldX, float worldY, MarkerUserData& markerPos, size_t markerSize) const;
+        MyGUI::Widget* createDoorMarker(
+            const std::string& name, const MyGUI::VectorString& notes, float x, float y) const;
         MyGUI::IntCoord getMarkerCoordinates(MyGUI::Widget* widget, size_t markerSize) const;
 
         virtual void notifyPlayerUpdate() {}
@@ -228,7 +235,8 @@ namespace MWGui
     class MapWindow : public MWGui::WindowPinnableBase, public LocalMapBase, public NoDrop
     {
     public:
-        MapWindow(CustomMarkerCollection& customMarkers, DragAndDrop* drag, MWRender::LocalMap* localMapRender, SceneUtil::WorkQueue* workQueue);
+        MapWindow(CustomMarkerCollection& customMarkers, DragAndDrop* drag, MWRender::LocalMap* localMapRender,
+            SceneUtil::WorkQueue* workQueue);
         virtual ~MapWindow();
 
         void setCellName(const std::string& cellName);
@@ -245,7 +253,7 @@ namespace MWGui
         // reveals this cell's map on the global map
         void cellExplored(int x, int y);
 
-        void setGlobalMapPlayerPosition (float worldX, float worldY);
+        void setGlobalMapPlayerPosition(float worldX, float worldY);
         void setGlobalMapPlayerDir(const float x, const float y);
 
         void ensureGlobalMapLoaded();
@@ -259,8 +267,8 @@ namespace MWGui
         /// Clear all savegame-specific data
         void clear() override;
 
-        void write (ESM::ESMWriter& writer, Loading::Listener& progress);
-        void readRecord (ESM::ESMReader& reader, uint32_t type);
+        void write(ESM::ESMWriter& writer, Loading::Listener& progress);
+        void readRecord(ESM::ESMReader& reader, uint32_t type);
 
         void asyncPrepareSaveMap();
 
@@ -286,7 +294,6 @@ namespace MWGui
         MyGUI::IntCoord createMarkerCoords(float x, float y, float agregatedWeight) const;
         MyGUI::Widget* createMarker(const std::string& name, float x, float y, float agregatedWeight);
 
-
         MyGUI::ScrollView* mGlobalMap;
         std::unique_ptr<MyGUI::ITexture> mGlobalMapTexture;
         std::unique_ptr<MyGUI::ITexture> mGlobalMapOverlayTexture;
@@ -315,9 +322,7 @@ namespace MWGui
             osg::Vec2f position;
             MyGUI::Widget* widget = nullptr;
 
-            bool operator<(const MapMarkerType& right) const {
-                return widget < right.widget;
-            }
+            bool operator<(const MapMarkerType& right) const { return widget < right.widget; }
         };
 
         std::map<std::string, MapMarkerType> mGlobalMapMarkersByName;
@@ -330,7 +335,7 @@ namespace MWGui
         void onTitleDoubleClicked() override;
 
         void doorMarkerCreated(MyGUI::Widget* marker) override;
-        void customMarkerCreated(MyGUI::Widget *marker) override;
+        void customMarkerCreated(MyGUI::Widget* marker) override;
 
         void notifyPlayerUpdate() override;
 
diff --git a/apps/openmw/mwgui/merchantrepair.cpp b/apps/openmw/mwgui/merchantrepair.cpp
index 169dfe0de7..208127a606 100644
--- a/apps/openmw/mwgui/merchantrepair.cpp
+++ b/apps/openmw/mwgui/merchantrepair.cpp
@@ -3,16 +3,16 @@
 #include <components/esm3/loadgmst.hpp>
 
 #include <MyGUI_Button.h>
-#include <MyGUI_ScrollView.h>
 #include <MyGUI_Gui.h>
+#include <MyGUI_ScrollView.h>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/creaturestats.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
@@ -20,130 +20,134 @@
 
 namespace MWGui
 {
-MerchantRepair::MerchantRepair()
-    : WindowBase("openmw_merchantrepair.layout")
-{
-    getWidget(mList, "RepairView");
-    getWidget(mOkButton, "OkButton");
-    getWidget(mGoldLabel, "PlayerGold");
+    MerchantRepair::MerchantRepair()
+        : WindowBase("openmw_merchantrepair.layout")
+    {
+        getWidget(mList, "RepairView");
+        getWidget(mOkButton, "OkButton");
+        getWidget(mGoldLabel, "PlayerGold");
 
-    mOkButton->eventMouseButtonClick += MyGUI::newDelegate(this, &MerchantRepair::onOkButtonClick);
-}
+        mOkButton->eventMouseButtonClick += MyGUI::newDelegate(this, &MerchantRepair::onOkButtonClick);
+    }
 
-void MerchantRepair::setPtr(const MWWorld::Ptr &actor)
-{
-    mActor = actor;
+    void MerchantRepair::setPtr(const MWWorld::Ptr& actor)
+    {
+        mActor = actor;
 
-    while (mList->getChildCount())
-        MyGUI::Gui::getInstance().destroyWidget(mList->getChildAt(0));
+        while (mList->getChildCount())
+            MyGUI::Gui::getInstance().destroyWidget(mList->getChildAt(0));
 
-    int lineHeight = MWBase::Environment::get().getWindowManager()->getFontHeight() + 2;
-    int currentY = 0;
+        int lineHeight = MWBase::Environment::get().getWindowManager()->getFontHeight() + 2;
+        int currentY = 0;
 
-    MWWorld::Ptr player = MWMechanics::getPlayer();
-    int playerGold = player.getClass().getContainerStore(player).count(MWWorld::ContainerStore::sGoldId);
+        MWWorld::Ptr player = MWMechanics::getPlayer();
+        int playerGold = player.getClass().getContainerStore(player).count(MWWorld::ContainerStore::sGoldId);
 
-    MWWorld::ContainerStore& store = player.getClass().getContainerStore(player);
-    int categories = MWWorld::ContainerStore::Type_Weapon | MWWorld::ContainerStore::Type_Armor;
-    for (MWWorld::ContainerStoreIterator iter (store.begin(categories)); iter!=store.end(); ++iter)
-    {
-        if (iter->getClass().hasItemHealth(*iter))
+        MWWorld::ContainerStore& store = player.getClass().getContainerStore(player);
+        int categories = MWWorld::ContainerStore::Type_Weapon | MWWorld::ContainerStore::Type_Armor;
+        for (MWWorld::ContainerStoreIterator iter(store.begin(categories)); iter != store.end(); ++iter)
         {
-            int maxDurability = iter->getClass().getItemMaxHealth(*iter);
-            int durability = iter->getClass().getItemHealth(*iter);
-            if (maxDurability == durability || maxDurability == 0)
-                continue;
-
-            int basePrice = iter->getClass().getValue(*iter);
-            float fRepairMult = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
-                    .find("fRepairMult")->mValue.getFloat();
-
-            float p = static_cast<float>(std::max(1, basePrice));
-            float r = static_cast<float>(std::max(1, static_cast<int>(maxDurability / p)));
-
-            int x = static_cast<int>((maxDurability - durability) / r);
-            x = static_cast<int>(fRepairMult * x);
-            x = std::max(1, x);
-
-            int price = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mActor, x, true);
-
-            std::string name{iter->getClass().getName(*iter)};
-            name += " - " + MyGUI::utility::toString(price)
-                    + MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
-                    .find("sgp")->mValue.getString();
-
-            MyGUI::Button* button =
-                mList->createWidget<MyGUI::Button>(price <= playerGold ? "SandTextButton" : "SandTextButtonDisabled", // can't use setEnabled since that removes tooltip
-                    0,
-                    currentY,
-                    0,
-                    lineHeight,
-                    MyGUI::Align::Default
-                );
-
-            currentY += lineHeight;
-
-            button->setUserString("Price", MyGUI::utility::toString(price));
-            button->setUserData(MWWorld::Ptr(*iter));
-            button->setCaptionWithReplacing(name);
-            button->setSize(mList->getWidth(), lineHeight);
-            button->eventMouseWheel += MyGUI::newDelegate(this, &MerchantRepair::onMouseWheel);
-            button->setUserString("ToolTipType", "ItemPtr");
-            button->eventMouseButtonClick += MyGUI::newDelegate(this, &MerchantRepair::onRepairButtonClick);
+            if (iter->getClass().hasItemHealth(*iter))
+            {
+                int maxDurability = iter->getClass().getItemMaxHealth(*iter);
+                int durability = iter->getClass().getItemHealth(*iter);
+                if (maxDurability == durability || maxDurability == 0)
+                    continue;
+
+                int basePrice = iter->getClass().getValue(*iter);
+                float fRepairMult = MWBase::Environment::get()
+                                        .getWorld()
+                                        ->getStore()
+                                        .get<ESM::GameSetting>()
+                                        .find("fRepairMult")
+                                        ->mValue.getFloat();
+
+                float p = static_cast<float>(std::max(1, basePrice));
+                float r = static_cast<float>(std::max(1, static_cast<int>(maxDurability / p)));
+
+                int x = static_cast<int>((maxDurability - durability) / r);
+                x = static_cast<int>(fRepairMult * x);
+                x = std::max(1, x);
+
+                int price = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mActor, x, true);
+
+                std::string name{ iter->getClass().getName(*iter) };
+                name += " - " + MyGUI::utility::toString(price)
+                    + MWBase::Environment::get()
+                          .getWorld()
+                          ->getStore()
+                          .get<ESM::GameSetting>()
+                          .find("sgp")
+                          ->mValue.getString();
+
+                MyGUI::Button* button = mList->createWidget<MyGUI::Button>(price <= playerGold
+                        ? "SandTextButton"
+                        : "SandTextButtonDisabled", // can't use setEnabled since that removes tooltip
+                    0, currentY, 0, lineHeight, MyGUI::Align::Default);
+
+                currentY += lineHeight;
+
+                button->setUserString("Price", MyGUI::utility::toString(price));
+                button->setUserData(MWWorld::Ptr(*iter));
+                button->setCaptionWithReplacing(name);
+                button->setSize(mList->getWidth(), lineHeight);
+                button->eventMouseWheel += MyGUI::newDelegate(this, &MerchantRepair::onMouseWheel);
+                button->setUserString("ToolTipType", "ItemPtr");
+                button->eventMouseButtonClick += MyGUI::newDelegate(this, &MerchantRepair::onRepairButtonClick);
+            }
         }
+        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the
+        // scrollbar is hidden
+        mList->setVisibleVScroll(false);
+        mList->setCanvasSize(MyGUI::IntSize(mList->getWidth(), std::max(mList->getHeight(), currentY)));
+        mList->setVisibleVScroll(true);
+
+        mGoldLabel->setCaptionWithReplacing("#{sGold}: " + MyGUI::utility::toString(playerGold));
     }
-    // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the scrollbar is hidden
-    mList->setVisibleVScroll(false);
-    mList->setCanvasSize (MyGUI::IntSize(mList->getWidth(), std::max(mList->getHeight(), currentY)));
-    mList->setVisibleVScroll(true);
 
-    mGoldLabel->setCaptionWithReplacing("#{sGold}: "
-        + MyGUI::utility::toString(playerGold));
-}
+    void MerchantRepair::onMouseWheel(MyGUI::Widget* _sender, int _rel)
+    {
+        if (mList->getViewOffset().top + _rel * 0.3f > 0)
+            mList->setViewOffset(MyGUI::IntPoint(0, 0));
+        else
+            mList->setViewOffset(MyGUI::IntPoint(0, static_cast<int>(mList->getViewOffset().top + _rel * 0.3f)));
+    }
 
-void MerchantRepair::onMouseWheel(MyGUI::Widget* _sender, int _rel)
-{
-    if (mList->getViewOffset().top + _rel*0.3f > 0)
+    void MerchantRepair::onOpen()
+    {
+        center();
+        // Reset scrollbars
         mList->setViewOffset(MyGUI::IntPoint(0, 0));
-    else
-        mList->setViewOffset(MyGUI::IntPoint(0, static_cast<int>(mList->getViewOffset().top + _rel*0.3f)));
-}
-
-void MerchantRepair::onOpen()
-{
-    center();
-    // Reset scrollbars
-    mList->setViewOffset(MyGUI::IntPoint(0, 0));
-}
+    }
 
-void MerchantRepair::onRepairButtonClick(MyGUI::Widget *sender)
-{
-    MWWorld::Ptr player = MWMechanics::getPlayer();
+    void MerchantRepair::onRepairButtonClick(MyGUI::Widget* sender)
+    {
+        MWWorld::Ptr player = MWMechanics::getPlayer();
 
-    int price = MyGUI::utility::parseInt(sender->getUserString("Price"));
-    if (price > player.getClass().getContainerStore(player).count(MWWorld::ContainerStore::sGoldId))
-        return;
+        int price = MyGUI::utility::parseInt(sender->getUserString("Price"));
+        if (price > player.getClass().getContainerStore(player).count(MWWorld::ContainerStore::sGoldId))
+            return;
 
-    // repair
-    MWWorld::Ptr item = *sender->getUserData<MWWorld::Ptr>();
-    item.getCellRef().setCharge(item.getClass().getItemMaxHealth(item));
+        // repair
+        MWWorld::Ptr item = *sender->getUserData<MWWorld::Ptr>();
+        item.getCellRef().setCharge(item.getClass().getItemMaxHealth(item));
 
-    player.getClass().getContainerStore(player).restack(item);
+        player.getClass().getContainerStore(player).restack(item);
 
-    MWBase::Environment::get().getWindowManager()->playSound("Repair");
+        MWBase::Environment::get().getWindowManager()->playSound("Repair");
 
-    player.getClass().getContainerStore(player).remove(MWWorld::ContainerStore::sGoldId, price, player);
+        player.getClass().getContainerStore(player).remove(MWWorld::ContainerStore::sGoldId, price, player);
 
-    // add gold to NPC trading gold pool
-    MWMechanics::CreatureStats& actorStats = mActor.getClass().getCreatureStats(mActor);
-    actorStats.setGoldPool(actorStats.getGoldPool() + price);
+        // add gold to NPC trading gold pool
+        MWMechanics::CreatureStats& actorStats = mActor.getClass().getCreatureStats(mActor);
+        actorStats.setGoldPool(actorStats.getGoldPool() + price);
 
-    setPtr(mActor);
-}
+        setPtr(mActor);
+    }
 
-void MerchantRepair::onOkButtonClick(MyGUI::Widget *sender)
-{
-    MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_MerchantRepair);
-}
+    void MerchantRepair::onOkButtonClick(MyGUI::Widget* sender)
+    {
+        MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_MerchantRepair);
+    }
 
 }
diff --git a/apps/openmw/mwgui/merchantrepair.hpp b/apps/openmw/mwgui/merchantrepair.hpp
index f5276d7f6e..c2fa1cc28a 100644
--- a/apps/openmw/mwgui/merchantrepair.hpp
+++ b/apps/openmw/mwgui/merchantrepair.hpp
@@ -1,33 +1,33 @@
 #ifndef OPENMW_MWGUI_MERCHANTREPAIR_H
 #define OPENMW_MWGUI_MERCHANTREPAIR_H
 
-#include "windowbase.hpp"
 #include "../mwworld/ptr.hpp"
+#include "windowbase.hpp"
 
 namespace MWGui
 {
 
-class MerchantRepair : public WindowBase
-{
-public:
-    MerchantRepair();
+    class MerchantRepair : public WindowBase
+    {
+    public:
+        MerchantRepair();
 
-    void onOpen() override;
+        void onOpen() override;
 
-    void setPtr(const MWWorld::Ptr& actor) override;
+        void setPtr(const MWWorld::Ptr& actor) override;
 
-private:
-    MyGUI::ScrollView* mList;
-    MyGUI::Button* mOkButton;
-    MyGUI::TextBox* mGoldLabel;
+    private:
+        MyGUI::ScrollView* mList;
+        MyGUI::Button* mOkButton;
+        MyGUI::TextBox* mGoldLabel;
 
-    MWWorld::Ptr mActor;
+        MWWorld::Ptr mActor;
 
-protected:
-    void onMouseWheel(MyGUI::Widget* _sender, int _rel);
-    void onRepairButtonClick(MyGUI::Widget* sender);
-    void onOkButtonClick(MyGUI::Widget* sender);
-};
+    protected:
+        void onMouseWheel(MyGUI::Widget* _sender, int _rel);
+        void onRepairButtonClick(MyGUI::Widget* sender);
+        void onOkButtonClick(MyGUI::Widget* sender);
+    };
 
 }
 
diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp
index 4e163f7d37..1b8fa8b1f8 100644
--- a/apps/openmw/mwgui/messagebox.cpp
+++ b/apps/openmw/mwgui/messagebox.cpp
@@ -1,29 +1,29 @@
 #include "messagebox.hpp"
 
-#include <MyGUI_LanguageManager.h>
+#include <MyGUI_Button.h>
 #include <MyGUI_EditBox.h>
+#include <MyGUI_LanguageManager.h>
 #include <MyGUI_RenderManager.h>
-#include <MyGUI_Button.h>
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/strings/algorithm.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/soundmanager.hpp"
 #include "../mwbase/inputmanager.hpp"
+#include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 
 namespace MWGui
 {
 
-    MessageBoxManager::MessageBoxManager (float timePerChar)
+    MessageBoxManager::MessageBoxManager(float timePerChar)
     {
         mStaticMessageBox = nullptr;
         mLastButtonPressed = -1;
         mMessageBoxSpeed = timePerChar;
     }
 
-    MessageBoxManager::~MessageBoxManager ()
+    MessageBoxManager::~MessageBoxManager()
     {
         MessageBoxManager::clear();
     }
@@ -47,12 +47,12 @@ namespace MWGui
         mLastButtonPressed = -1;
     }
 
-    void MessageBoxManager::onFrame (float frameDuration)
+    void MessageBoxManager::onFrame(float frameDuration)
     {
-        for(auto it = mMessageBoxes.begin(); it != mMessageBoxes.end();)
+        for (auto it = mMessageBoxes.begin(); it != mMessageBoxes.end();)
         {
             (*it)->mCurrentTime += frameDuration;
-            if((*it)->mCurrentTime >= (*it)->mMaxTime && it->get() != mStaticMessageBox)
+            if ((*it)->mCurrentTime >= (*it)->mMaxTime && it->get() != mStaticMessageBox)
             {
                 it = mMessageBoxes.erase(it);
             }
@@ -62,19 +62,20 @@ namespace MWGui
 
         float height = 0;
         auto it = mMessageBoxes.begin();
-        while(it != mMessageBoxes.end())
+        while (it != mMessageBoxes.end())
         {
             (*it)->update(static_cast<int>(height));
             height += (*it)->getHeight();
             ++it;
         }
 
-        if(mInterMessageBoxe != nullptr && mInterMessageBoxe->mMarkedToDelete) {
+        if (mInterMessageBoxe != nullptr && mInterMessageBoxe->mMarkedToDelete)
+        {
             mLastButtonPressed = mInterMessageBoxe->readPressedButton();
             mInterMessageBoxe->setVisible(false);
             mInterMessageBoxe.reset();
             MWBase::Environment::get().getInputManager()->changeInputMode(
-                        MWBase::Environment::get().getWindowManager()->isGuiMode());
+                MWBase::Environment::get().getWindowManager()->isGuiMode());
         }
     }
 
@@ -82,17 +83,18 @@ namespace MWGui
     {
         auto box = std::make_unique<MessageBox>(*this, message);
         box->mCurrentTime = 0;
-        auto realMessage = MyGUI::LanguageManager::getInstance().replaceTags({message.data(), message.size()});
-        box->mMaxTime = realMessage.length()*mMessageBoxSpeed;
+        auto realMessage = MyGUI::LanguageManager::getInstance().replaceTags({ message.data(), message.size() });
+        box->mMaxTime = realMessage.length() * mMessageBoxSpeed;
 
-        if(stat)
+        if (stat)
             mStaticMessageBox = box.get();
 
         box->setVisible(mVisible);
 
         mMessageBoxes.push_back(std::move(box));
 
-        if(mMessageBoxes.size() > 3) {
+        if (mMessageBoxes.size() > 3)
+        {
             mMessageBoxes.erase(mMessageBoxes.begin());
         }
 
@@ -104,13 +106,14 @@ namespace MWGui
         }
     }
 
-    void MessageBoxManager::removeStaticMessageBox ()
+    void MessageBoxManager::removeStaticMessageBox()
     {
         removeMessageBox(mStaticMessageBox);
         mStaticMessageBox = nullptr;
     }
 
-    bool MessageBoxManager::createInteractiveMessageBox(std::string_view message, const std::vector<std::string>& buttons)
+    bool MessageBoxManager::createInteractiveMessageBox(
+        std::string_view message, const std::vector<std::string>& buttons)
     {
         if (mInterMessageBoxe != nullptr)
         {
@@ -118,22 +121,22 @@ namespace MWGui
             mInterMessageBoxe->setVisible(false);
         }
 
-        mInterMessageBoxe = std::make_unique<InteractiveMessageBox>(*this, std::string{message}, buttons);
+        mInterMessageBoxe = std::make_unique<InteractiveMessageBox>(*this, std::string{ message }, buttons);
         mLastButtonPressed = -1;
 
         return true;
     }
 
-    bool MessageBoxManager::isInteractiveMessageBox ()
+    bool MessageBoxManager::isInteractiveMessageBox()
     {
         return mInterMessageBoxe != nullptr;
     }
 
-    bool MessageBoxManager::removeMessageBox (MessageBox *msgbox)
+    bool MessageBoxManager::removeMessageBox(MessageBox* msgbox)
     {
-        for(auto it = mMessageBoxes.begin(); it != mMessageBoxes.end(); ++it)
+        for (auto it = mMessageBoxes.begin(); it != mMessageBoxes.end(); ++it)
         {
-            if(it->get() == msgbox)
+            if (it->get() == msgbox)
             {
                 mMessageBoxes.erase(it);
                 return true;
@@ -147,7 +150,7 @@ namespace MWGui
         return mMessageBoxes;
     }
 
-    int MessageBoxManager::readPressedButton (bool reset)
+    int MessageBoxManager::readPressedButton(bool reset)
     {
         int pressed = mLastButtonPressed;
         if (reset)
@@ -163,11 +166,11 @@ namespace MWGui
     }
 
     MessageBox::MessageBox(MessageBoxManager& parMessageBoxManager, std::string_view message)
-      : Layout("openmw_messagebox.layout")
-      , mCurrentTime(0)
-      , mMaxTime(0)
-      , mMessageBoxManager(parMessageBoxManager)
-      , mMessage(message)
+        : Layout("openmw_messagebox.layout")
+        , mCurrentTime(0)
+        , mMaxTime(0)
+        , mMessageBoxManager(parMessageBoxManager)
+        , mMessage(message)
     {
         // defines
         mBottomPadding = 48;
@@ -178,19 +181,19 @@ namespace MWGui
         mMessageWidget->setCaptionWithReplacing(mMessage);
     }
 
-    void MessageBox::update (int height)
+    void MessageBox::update(int height)
     {
         MyGUI::IntSize gameWindowSize = MyGUI::RenderManager::getInstance().getViewSize();
         MyGUI::IntPoint pos;
-        pos.left = (gameWindowSize.width - mMainWidget->getWidth())/2;
+        pos.left = (gameWindowSize.width - mMainWidget->getWidth()) / 2;
         pos.top = (gameWindowSize.height - mMainWidget->getHeight() - height - mBottomPadding);
 
         mMainWidget->setPosition(pos);
     }
 
-    int MessageBox::getHeight ()
+    int MessageBox::getHeight()
     {
-        return mMainWidget->getHeight()+mNextBoxPadding;
+        return mMainWidget->getHeight() + mNextBoxPadding;
     }
 
     void MessageBox::setVisible(bool value)
@@ -198,10 +201,13 @@ namespace MWGui
         mMainWidget->setVisible(value);
     }
 
-    InteractiveMessageBox::InteractiveMessageBox(MessageBoxManager& parMessageBoxManager, const std::string& message, const std::vector<std::string>& buttons)
-        : WindowModal(MWBase::Environment::get().getWindowManager()->isGuiMode() ? "openmw_interactive_messagebox_notransp.layout" : "openmw_interactive_messagebox.layout")
-      , mMessageBoxManager(parMessageBoxManager)
-      , mButtonPressed(-1)
+    InteractiveMessageBox::InteractiveMessageBox(
+        MessageBoxManager& parMessageBoxManager, const std::string& message, const std::vector<std::string>& buttons)
+        : WindowModal(MWBase::Environment::get().getWindowManager()->isGuiMode()
+                ? "openmw_interactive_messagebox_notransp.layout"
+                : "openmw_interactive_messagebox.layout")
+        , mMessageBoxManager(parMessageBoxManager)
+        , mButtonPressed(-1)
     {
         int textPadding = 10; // padding between text-widget and main-widget
         int textButtonPadding = 10; // padding between the text-widget und the button-widget
@@ -213,7 +219,6 @@ namespace MWGui
 
         mMarkedToDelete = false;
 
-
         getWidget(mMessageWidget, "message");
         getWidget(mButtonsWidget, "buttons");
 
@@ -230,13 +235,10 @@ namespace MWGui
         int buttonHeight = 0;
         MyGUI::IntCoord dummyCoord(0, 0, 0, 0);
 
-        for(const std::string& buttonId : buttons)
+        for (const std::string& buttonId : buttons)
         {
             MyGUI::Button* button = mButtonsWidget->createWidget<MyGUI::Button>(
-                MyGUI::WidgetStyle::Child,
-                std::string("MW_Button"),
-                dummyCoord,
-                MyGUI::Align::Default);
+                MyGUI::WidgetStyle::Child, std::string("MW_Button"), dummyCoord, MyGUI::Align::Default);
             button->setCaptionWithReplacing(buttonId);
 
             button->eventMouseButtonClick += MyGUI::newDelegate(this, &InteractiveMessageBox::mousePressed);
@@ -246,41 +248,42 @@ namespace MWGui
             if (buttonsWidth != 0)
                 buttonsWidth += buttonLeftPadding;
 
-            int buttonWidth = button->getTextSize().width + 2*buttonLabelLeftPadding;
+            int buttonWidth = button->getTextSize().width + 2 * buttonLabelLeftPadding;
             buttonsWidth += buttonWidth;
 
-            buttonHeight = button->getTextSize().height + 2*buttonLabelTopPadding;
+            buttonHeight = button->getTextSize().height + 2 * buttonLabelTopPadding;
 
             if (buttonsHeight != 0)
                 buttonsHeight += buttonTopPadding;
             buttonsHeight += buttonHeight;
 
-            if(buttonWidth > biggestButtonWidth)
+            if (buttonWidth > biggestButtonWidth)
             {
                 biggestButtonWidth = buttonWidth;
             }
         }
 
         MyGUI::IntSize mainWidgetSize;
-        if(buttonsWidth < textSize.width)
+        if (buttonsWidth < textSize.width)
         {
             // on one line
-            mainWidgetSize.width = textSize.width + 3*textPadding;
-            mainWidgetSize.height = textPadding + textSize.height + textButtonPadding + buttonHeight + buttonMainPadding;
+            mainWidgetSize.width = textSize.width + 3 * textPadding;
+            mainWidgetSize.height
+                = textPadding + textSize.height + textButtonPadding + buttonHeight + buttonMainPadding;
 
             MyGUI::IntSize realSize = mainWidgetSize +
-                    // To account for borders
-                    (mMainWidget->getSize() - mMainWidget->getClientWidget()->getSize());
+                // To account for borders
+                (mMainWidget->getSize() - mMainWidget->getClientWidget()->getSize());
 
             MyGUI::IntPoint absPos;
-            absPos.left = (gameWindowSize.width - realSize.width)/2;
-            absPos.top = (gameWindowSize.height - realSize.height)/2;
+            absPos.left = (gameWindowSize.width - realSize.width) / 2;
+            absPos.top = (gameWindowSize.height - realSize.height) / 2;
 
             mMainWidget->setPosition(absPos);
             mMainWidget->setSize(realSize);
 
             MyGUI::IntCoord messageWidgetCoord;
-            messageWidgetCoord.left = (mainWidgetSize.width - textSize.width)/2;
+            messageWidgetCoord.left = (mainWidgetSize.width - textSize.width) / 2;
             messageWidgetCoord.top = textPadding;
             mMessageWidget->setCoord(messageWidgetCoord);
 
@@ -288,15 +291,15 @@ namespace MWGui
 
             MyGUI::IntCoord buttonCord;
             MyGUI::IntSize buttonSize(0, buttonHeight);
-            int left = (mainWidgetSize.width - buttonsWidth)/2;
+            int left = (mainWidgetSize.width - buttonsWidth) / 2;
 
-            for(MyGUI::Button* button : mButtons)
+            for (MyGUI::Button* button : mButtons)
             {
                 buttonCord.left = left;
                 buttonCord.top = messageWidgetCoord.top + textSize.height + textButtonPadding;
 
-                buttonSize.width = button->getTextSize().width + 2*buttonLabelLeftPadding;
-                buttonSize.height = button->getTextSize().height + 2*buttonLabelTopPadding;
+                buttonSize.width = button->getTextSize().width + 2 * buttonLabelLeftPadding;
+                buttonSize.height = button->getTextSize().height + 2 * buttonLabelTopPadding;
 
                 button->setCoord(buttonCord);
                 button->setSize(buttonSize);
@@ -307,11 +310,13 @@ namespace MWGui
         else
         {
             // among each other
-            if(biggestButtonWidth > textSize.width) {
-                mainWidgetSize.width = biggestButtonWidth + buttonTopPadding*2;
+            if (biggestButtonWidth > textSize.width)
+            {
+                mainWidgetSize.width = biggestButtonWidth + buttonTopPadding * 2;
             }
-            else {
-                mainWidgetSize.width = textSize.width + 3*textPadding;
+            else
+            {
+                mainWidgetSize.width = textSize.width + 3 * textPadding;
             }
 
             MyGUI::IntCoord buttonCord;
@@ -319,13 +324,13 @@ namespace MWGui
 
             int top = textPadding + textSize.height + textButtonPadding;
 
-            for(MyGUI::Button* button : mButtons)
+            for (MyGUI::Button* button : mButtons)
             {
-                buttonSize.width = button->getTextSize().width + buttonLabelLeftPadding*2;
-                buttonSize.height = button->getTextSize().height + buttonLabelTopPadding*2;
+                buttonSize.width = button->getTextSize().width + buttonLabelLeftPadding * 2;
+                buttonSize.height = button->getTextSize().height + buttonLabelTopPadding * 2;
 
                 buttonCord.top = top;
-                buttonCord.left = (mainWidgetSize.width - buttonSize.width)/2;
+                buttonCord.left = (mainWidgetSize.width - buttonSize.width) / 2;
 
                 button->setCoord(buttonCord);
                 button->setSize(buttonSize);
@@ -333,19 +338,20 @@ namespace MWGui
                 top += buttonSize.height + buttonTopPadding;
             }
 
-            mainWidgetSize.height = textPadding + textSize.height + textButtonPadding + buttonsHeight + buttonMainPadding;
+            mainWidgetSize.height
+                = textPadding + textSize.height + textButtonPadding + buttonsHeight + buttonMainPadding;
             mMainWidget->setSize(mainWidgetSize +
-                                 // To account for borders
-                                 (mMainWidget->getSize() - mMainWidget->getClientWidget()->getSize()));
+                // To account for borders
+                (mMainWidget->getSize() - mMainWidget->getClientWidget()->getSize()));
 
             MyGUI::IntPoint absPos;
-            absPos.left = (gameWindowSize.width - mainWidgetSize.width)/2;
-            absPos.top = (gameWindowSize.height - mainWidgetSize.height)/2;
+            absPos.left = (gameWindowSize.width - mainWidgetSize.width) / 2;
+            absPos.top = (gameWindowSize.height - mainWidgetSize.height) / 2;
 
             mMainWidget->setPosition(absPos);
 
             MyGUI::IntCoord messageWidgetCoord;
-            messageWidgetCoord.left = (mainWidgetSize.width - textSize.width)/2;
+            messageWidgetCoord.left = (mainWidgetSize.width - textSize.width) / 2;
             messageWidgetCoord.top = textPadding;
             messageWidgetCoord.width = textSize.width;
             messageWidgetCoord.height = textSize.height;
@@ -357,8 +363,8 @@ namespace MWGui
 
     MyGUI::Widget* InteractiveMessageBox::getDefaultKeyFocus()
     {
-        std::vector<std::string> keywords { "sOk", "sYes" };
-        for(MyGUI::Button* button : mButtons)
+        std::vector<std::string> keywords{ "sOk", "sYes" };
+        for (MyGUI::Button* button : mButtons)
         {
             for (const std::string& keyword : keywords)
             {
@@ -373,18 +379,18 @@ namespace MWGui
         return nullptr;
     }
 
-    void InteractiveMessageBox::mousePressed (MyGUI::Widget* pressed)
+    void InteractiveMessageBox::mousePressed(MyGUI::Widget* pressed)
     {
-        buttonActivated (pressed);
+        buttonActivated(pressed);
     }
 
-    void InteractiveMessageBox::buttonActivated (MyGUI::Widget* pressed)
+    void InteractiveMessageBox::buttonActivated(MyGUI::Widget* pressed)
     {
         mMarkedToDelete = true;
         int index = 0;
-        for(const MyGUI::Button* button : mButtons)
+        for (const MyGUI::Button* button : mButtons)
         {
-            if(button == pressed)
+            if (button == pressed)
             {
                 mButtonPressed = index;
                 mMessageBoxManager.onButtonPressed(mButtonPressed);
@@ -394,7 +400,7 @@ namespace MWGui
         }
     }
 
-    int InteractiveMessageBox::readPressedButton ()
+    int InteractiveMessageBox::readPressedButton()
     {
         return mButtonPressed;
     }
diff --git a/apps/openmw/mwgui/messagebox.hpp b/apps/openmw/mwgui/messagebox.hpp
index 3fec60caee..78f3df0d84 100644
--- a/apps/openmw/mwgui/messagebox.hpp
+++ b/apps/openmw/mwgui/messagebox.hpp
@@ -19,89 +19,94 @@ namespace MWGui
     class MessageBox;
     class MessageBoxManager
     {
-        public:
-            MessageBoxManager (float timePerChar);
-            ~MessageBoxManager ();
-            void onFrame (float frameDuration);
-            void createMessageBox(std::string_view message, bool stat = false);
-            void removeStaticMessageBox ();
-            bool createInteractiveMessageBox(std::string_view message, const std::vector<std::string>& buttons);
-            bool isInteractiveMessageBox ();
+    public:
+        MessageBoxManager(float timePerChar);
+        ~MessageBoxManager();
+        void onFrame(float frameDuration);
+        void createMessageBox(std::string_view message, bool stat = false);
+        void removeStaticMessageBox();
+        bool createInteractiveMessageBox(std::string_view message, const std::vector<std::string>& buttons);
+        bool isInteractiveMessageBox();
 
-            int getMessagesCount();
+        int getMessagesCount();
 
-            const InteractiveMessageBox* getInteractiveMessageBox() const { return mInterMessageBoxe.get(); }
+        const InteractiveMessageBox* getInteractiveMessageBox() const { return mInterMessageBoxe.get(); }
 
-            /// Remove all message boxes
-            void clear();
+        /// Remove all message boxes
+        void clear();
 
-            bool removeMessageBox (MessageBox *msgbox);
+        bool removeMessageBox(MessageBox* msgbox);
 
-            /// @param reset Reset the pressed button to -1 after reading it.
-            int readPressedButton (bool reset=true);
+        /// @param reset Reset the pressed button to -1 after reading it.
+        int readPressedButton(bool reset = true);
 
-            typedef MyGUI::delegates::CMultiDelegate1<int> EventHandle_Int;
+        typedef MyGUI::delegates::CMultiDelegate1<int> EventHandle_Int;
 
-            // Note: this delegate unassigns itself after it was fired, i.e. works once.
-            EventHandle_Int eventButtonPressed;
+        // Note: this delegate unassigns itself after it was fired, i.e. works once.
+        EventHandle_Int eventButtonPressed;
 
-            void onButtonPressed(int button) { eventButtonPressed(button); eventButtonPressed.clear(); }
+        void onButtonPressed(int button)
+        {
+            eventButtonPressed(button);
+            eventButtonPressed.clear();
+        }
 
-            void setVisible(bool value);
+        void setVisible(bool value);
 
-            const std::vector<std::unique_ptr<MessageBox>>& getActiveMessageBoxes() const;
+        const std::vector<std::unique_ptr<MessageBox>>& getActiveMessageBoxes() const;
 
-        private:
-            std::vector<std::unique_ptr<MessageBox>> mMessageBoxes;
-            std::unique_ptr<InteractiveMessageBox> mInterMessageBoxe;
-            MessageBox* mStaticMessageBox;
-            float mMessageBoxSpeed;
-            int mLastButtonPressed;
-            bool mVisible = true;
+    private:
+        std::vector<std::unique_ptr<MessageBox>> mMessageBoxes;
+        std::unique_ptr<InteractiveMessageBox> mInterMessageBoxe;
+        MessageBox* mStaticMessageBox;
+        float mMessageBoxSpeed;
+        int mLastButtonPressed;
+        bool mVisible = true;
     };
 
     class MessageBox : public Layout
     {
-        public:
-            MessageBox (MessageBoxManager& parMessageBoxManager, std::string_view message);
-            const std::string& getMessage() { return mMessage; };
-            int getHeight ();
-            void update (int height);
-            void setVisible(bool value);
-
-            float mCurrentTime;
-            float mMaxTime;
-
-        protected:
-            MessageBoxManager& mMessageBoxManager;
-            std::string mMessage;
-            MyGUI::EditBox* mMessageWidget;
-            int mBottomPadding;
-            int mNextBoxPadding;
+    public:
+        MessageBox(MessageBoxManager& parMessageBoxManager, std::string_view message);
+        const std::string& getMessage() { return mMessage; };
+        int getHeight();
+        void update(int height);
+        void setVisible(bool value);
+
+        float mCurrentTime;
+        float mMaxTime;
+
+    protected:
+        MessageBoxManager& mMessageBoxManager;
+        std::string mMessage;
+        MyGUI::EditBox* mMessageWidget;
+        int mBottomPadding;
+        int mNextBoxPadding;
     };
 
     class InteractiveMessageBox : public WindowModal
     {
-        public:
-            InteractiveMessageBox (MessageBoxManager& parMessageBoxManager, const std::string& message, const std::vector<std::string>& buttons);
-            void mousePressed (MyGUI::Widget* _widget);
-            int readPressedButton ();
+    public:
+        InteractiveMessageBox(MessageBoxManager& parMessageBoxManager, const std::string& message,
+            const std::vector<std::string>& buttons);
+        void mousePressed(MyGUI::Widget* _widget);
+        int readPressedButton();
 
-            MyGUI::Widget* getDefaultKeyFocus() override;
+        MyGUI::Widget* getDefaultKeyFocus() override;
 
-            bool exit() override { return false; }
+        bool exit() override { return false; }
 
-            bool mMarkedToDelete;
+        bool mMarkedToDelete;
 
-        private:
-            void buttonActivated (MyGUI::Widget* _widget);
+    private:
+        void buttonActivated(MyGUI::Widget* _widget);
 
-            MessageBoxManager& mMessageBoxManager;
-            MyGUI::EditBox* mMessageWidget;
-            MyGUI::Widget* mButtonsWidget;
-            std::vector<MyGUI::Button*> mButtons;
+        MessageBoxManager& mMessageBoxManager;
+        MyGUI::EditBox* mMessageWidget;
+        MyGUI::Widget* mButtonsWidget;
+        std::vector<MyGUI::Button*> mButtons;
 
-            int mButtonPressed;
+        int mButtonPressed;
     };
 
 }
diff --git a/apps/openmw/mwgui/mode.hpp b/apps/openmw/mwgui/mode.hpp
index 62d7396577..63f81e8b47 100644
--- a/apps/openmw/mwgui/mode.hpp
+++ b/apps/openmw/mwgui/mode.hpp
@@ -3,63 +3,63 @@
 
 namespace MWGui
 {
-  enum GuiMode
+    enum GuiMode
     {
-      GM_None,
-      GM_Settings,      // Settings window
-      GM_Inventory,     // Inventory mode
-      GM_Container,
-      GM_Companion,
-      GM_MainMenu,      // Main menu mode
+        GM_None,
+        GM_Settings, // Settings window
+        GM_Inventory, // Inventory mode
+        GM_Container,
+        GM_Companion,
+        GM_MainMenu, // Main menu mode
 
-      GM_Journal,       // Journal mode
+        GM_Journal, // Journal mode
 
-      GM_Scroll,        // Read scroll
-      GM_Book,          // Read book
-      GM_Alchemy,       // Make potions
-      GM_Repair,
+        GM_Scroll, // Read scroll
+        GM_Book, // Read book
+        GM_Alchemy, // Make potions
+        GM_Repair,
 
-      GM_Dialogue,      // NPC interaction
-      GM_Barter,
-      GM_Rest,
-      GM_SpellBuying,
-      GM_Travel,
-      GM_SpellCreation,
-      GM_Enchanting,
-      GM_Recharge,
-      GM_Training,
-      GM_MerchantRepair,
+        GM_Dialogue, // NPC interaction
+        GM_Barter,
+        GM_Rest,
+        GM_SpellBuying,
+        GM_Travel,
+        GM_SpellCreation,
+        GM_Enchanting,
+        GM_Recharge,
+        GM_Training,
+        GM_MerchantRepair,
 
-      GM_Levelup,
+        GM_Levelup,
 
-      // Startup character creation dialogs
-      GM_Name,
-      GM_Race,
-      GM_Birth,
-      GM_Class,
-      GM_ClassGenerate,
-      GM_ClassPick,
-      GM_ClassCreate,
-      GM_Review,
-      
-      GM_Loading,
-      GM_LoadingWallpaper,
-      GM_Jail,
+        // Startup character creation dialogs
+        GM_Name,
+        GM_Race,
+        GM_Birth,
+        GM_Class,
+        GM_ClassGenerate,
+        GM_ClassPick,
+        GM_ClassCreate,
+        GM_Review,
 
-      GM_QuickKeysMenu
+        GM_Loading,
+        GM_LoadingWallpaper,
+        GM_Jail,
+
+        GM_QuickKeysMenu
     };
 
-  // Windows shown in inventory mode
-  enum GuiWindow
+    // Windows shown in inventory mode
+    enum GuiWindow
     {
-      GW_None           = 0,
+        GW_None = 0,
 
-      GW_Map            = 0x01,
-      GW_Inventory      = 0x02,
-      GW_Magic          = 0x04,
-      GW_Stats          = 0x08,
+        GW_Map = 0x01,
+        GW_Inventory = 0x02,
+        GW_Magic = 0x04,
+        GW_Stats = 0x08,
 
-      GW_ALL            = 0xFF
+        GW_ALL = 0xFF
     };
 }
 
diff --git a/apps/openmw/mwgui/pickpocketitemmodel.cpp b/apps/openmw/mwgui/pickpocketitemmodel.cpp
index aca1b7392b..cfa832fd7f 100644
--- a/apps/openmw/mwgui/pickpocketitemmodel.cpp
+++ b/apps/openmw/mwgui/pickpocketitemmodel.cpp
@@ -1,7 +1,7 @@
 #include "pickpocketitemmodel.hpp"
 
-#include <components/misc/rng.hpp>
 #include <components/esm3/loadskil.hpp>
+#include <components/misc/rng.hpp>
 
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"
@@ -17,8 +17,10 @@
 namespace MWGui
 {
 
-    PickpocketItemModel::PickpocketItemModel(const MWWorld::Ptr& actor, std::unique_ptr<ItemModel> sourceModel, bool hideItems)
-        : mActor(actor), mPickpocketDetected(false)
+    PickpocketItemModel::PickpocketItemModel(
+        const MWWorld::Ptr& actor, std::unique_ptr<ItemModel> sourceModel, bool hideItems)
+        : mActor(actor)
+        , mPickpocketDetected(false)
     {
         MWWorld::Ptr player = MWMechanics::getPlayer();
         mSourceModel = std::move(sourceModel);
@@ -29,7 +31,7 @@ namespace MWGui
         if (hideItems)
         {
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-            for (size_t i = 0; i<mSourceModel->getItemCount(); ++i)
+            for (size_t i = 0; i < mSourceModel->getItemCount(); ++i)
             {
                 if (Misc::Rng::roll0to99(prng) > chance)
                     mHiddenItems.push_back(mSourceModel->getItem(i));
@@ -42,7 +44,7 @@ namespace MWGui
         return false;
     }
 
-    ItemStack PickpocketItemModel::getItem (ModelIndex index)
+    ItemStack PickpocketItemModel::getItem(ModelIndex index)
     {
         if (index < 0)
             throw std::runtime_error("Invalid index supplied");
@@ -60,7 +62,7 @@ namespace MWGui
     {
         mSourceModel->update();
         mItems.clear();
-        for (size_t i = 0; i<mSourceModel->getItemCount(); ++i)
+        for (size_t i = 0; i < mSourceModel->getItemCount(); ++i)
         {
             const ItemStack& item = mSourceModel->getItem(i);
 
@@ -69,17 +71,17 @@ namespace MWGui
                 continue;
 
             if (std::find(mHiddenItems.begin(), mHiddenItems.end(), item) == mHiddenItems.end()
-                    && item.mType != ItemStack::Type_Equipped)
+                && item.mType != ItemStack::Type_Equipped)
                 mItems.push_back(item);
         }
     }
 
-    void PickpocketItemModel::removeItem (const ItemStack &item, size_t count)
+    void PickpocketItemModel::removeItem(const ItemStack& item, size_t count)
     {
         ProxyItemModel::removeItem(item, count);
     }
 
-    bool PickpocketItemModel::onDropItem(const MWWorld::Ptr &item, int count)
+    bool PickpocketItemModel::onDropItem(const MWWorld::Ptr& item, int count)
     {
         // don't allow "reverse pickpocket" (it will be handled by scripts after 1.0)
         return false;
@@ -89,8 +91,8 @@ namespace MWGui
     {
         // Make sure we were actually closed, rather than just temporarily hidden (e.g. console or main menu opened)
         if (MWBase::Environment::get().getWindowManager()->containsMode(GM_Container)
-        // If it was already detected while taking an item, no need to check now
-                || mPickpocketDetected)
+            // If it was already detected while taking an item, no need to check now
+            || mPickpocketDetected)
             return;
 
         MWWorld::Ptr player = MWMechanics::getPlayer();
@@ -98,13 +100,13 @@ namespace MWGui
         if (pickpocket.finish())
         {
             MWBase::Environment::get().getMechanicsManager()->commitCrime(
-                        player, mActor, MWBase::MechanicsManager::OT_Pickpocket, std::string(), 0, true);
+                player, mActor, MWBase::MechanicsManager::OT_Pickpocket, std::string(), 0, true);
             MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Container);
             mPickpocketDetected = true;
         }
     }
 
-    bool PickpocketItemModel::onTakeItem(const MWWorld::Ptr &item, int count)
+    bool PickpocketItemModel::onTakeItem(const MWWorld::Ptr& item, int count)
     {
         if (mActor.getClass().getCreatureStats(mActor).getKnockedDown())
             return mSourceModel->onTakeItem(item, count);
@@ -119,14 +121,14 @@ namespace MWGui
         return success;
     }
 
-    bool PickpocketItemModel::stealItem(const MWWorld::Ptr &item, int count)
+    bool PickpocketItemModel::stealItem(const MWWorld::Ptr& item, int count)
     {
         MWWorld::Ptr player = MWMechanics::getPlayer();
         MWMechanics::Pickpocket pickpocket(player, mActor);
         if (pickpocket.pick(item, count))
         {
             MWBase::Environment::get().getMechanicsManager()->commitCrime(
-                        player, mActor, MWBase::MechanicsManager::OT_Pickpocket, std::string(), 0, true);
+                player, mActor, MWBase::MechanicsManager::OT_Pickpocket, std::string(), 0, true);
             MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Container);
             mPickpocketDetected = true;
             return false;
diff --git a/apps/openmw/mwgui/pickpocketitemmodel.hpp b/apps/openmw/mwgui/pickpocketitemmodel.hpp
index ec18f13609..3ed1786d82 100644
--- a/apps/openmw/mwgui/pickpocketitemmodel.hpp
+++ b/apps/openmw/mwgui/pickpocketitemmodel.hpp
@@ -6,25 +6,26 @@
 namespace MWGui
 {
 
-    /// @brief The pickpocket item model randomly hides item stacks based on a specified chance. Equipped items are always hidden.
+    /// @brief The pickpocket item model randomly hides item stacks based on a specified chance. Equipped items are
+    /// always hidden.
     class PickpocketItemModel : public ProxyItemModel
     {
     public:
         PickpocketItemModel(const MWWorld::Ptr& thief, std::unique_ptr<ItemModel> sourceModel, bool hideItems = true);
 
         bool allowedToUseItems() const override;
-        ItemStack getItem (ModelIndex index) override;
+        ItemStack getItem(ModelIndex index) override;
         size_t getItemCount() override;
         void update() override;
-        void removeItem (const ItemStack& item, size_t count) override;
+        void removeItem(const ItemStack& item, size_t count) override;
         void onClose() override;
-        bool onDropItem(const MWWorld::Ptr &item, int count) override;
-        bool onTakeItem(const MWWorld::Ptr &item, int count) override;
+        bool onDropItem(const MWWorld::Ptr& item, int count) override;
+        bool onTakeItem(const MWWorld::Ptr& item, int count) override;
 
     protected:
         MWWorld::Ptr mActor;
         bool mPickpocketDetected;
-        bool stealItem(const MWWorld::Ptr &item, int count);
+        bool stealItem(const MWWorld::Ptr& item, int count);
 
     private:
         std::vector<ItemStack> mHiddenItems;
diff --git a/apps/openmw/mwgui/postprocessorhud.cpp b/apps/openmw/mwgui/postprocessorhud.cpp
index b7a25405b2..bd54bbf2c2 100644
--- a/apps/openmw/mwgui/postprocessorhud.cpp
+++ b/apps/openmw/mwgui/postprocessorhud.cpp
@@ -1,27 +1,28 @@
 #include "postprocessorhud.hpp"
 
-#include <MyGUI_Window.h>
 #include <MyGUI_Button.h>
-#include <MyGUI_TabItem.h>
-#include <MyGUI_ScrollView.h>
 #include <MyGUI_FactoryManager.h>
+#include <MyGUI_ScrollView.h>
+#include <MyGUI_TabItem.h>
+#include <MyGUI_Window.h>
 
-#include <components/fx/widgets.hpp>
 #include <components/fx/technique.hpp>
+#include <components/fx/widgets.hpp>
 
 #include <components/widgets/box.hpp>
 
 #include "../mwrender/postprocessor.hpp"
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 namespace MWGui
 {
     void PostProcessorHud::ListWrapper::onKeyButtonPressed(MyGUI::KeyCode key, MyGUI::Char ch)
     {
-        if (MyGUI::InputManager::getInstance().isShiftPressed() && (key == MyGUI::KeyCode::ArrowUp || key == MyGUI::KeyCode::ArrowDown))
+        if (MyGUI::InputManager::getInstance().isShiftPressed()
+            && (key == MyGUI::KeyCode::ArrowUp || key == MyGUI::KeyCode::ArrowDown))
             return;
 
         MyGUI::ListBox::onKeyButtonPressed(key, ch);
@@ -41,7 +42,8 @@ namespace MWGui
         getWidget(mButtonDown, "ButtonDown");
 
         mButtonActivate->eventMouseButtonClick += MyGUI::newDelegate(this, &PostProcessorHud::notifyActivatePressed);
-        mButtonDeactivate->eventMouseButtonClick += MyGUI::newDelegate(this, &PostProcessorHud::notifyDeactivatePressed);
+        mButtonDeactivate->eventMouseButtonClick
+            += MyGUI::newDelegate(this, &PostProcessorHud::notifyDeactivatePressed);
         mButtonUp->eventMouseButtonClick += MyGUI::newDelegate(this, &PostProcessorHud::notifyShaderUpPressed);
         mButtonDown->eventMouseButtonClick += MyGUI::newDelegate(this, &PostProcessorHud::notifyShaderDownPressed);
 
@@ -53,7 +55,8 @@ namespace MWGui
 
         mFilter->eventEditTextChange += MyGUI::newDelegate(this, &PostProcessorHud::notifyFilterChanged);
 
-        mMainWidget->castType<MyGUI::Window>()->eventWindowChangeCoord += MyGUI::newDelegate(this, &PostProcessorHud::notifyWindowResize);
+        mMainWidget->castType<MyGUI::Window>()->eventWindowChangeCoord
+            += MyGUI::newDelegate(this, &PostProcessorHud::notifyWindowResize);
 
         mShaderInfo = mConfigLayout->createWidget<Gui::AutoSizedEditBox>("HeaderText", {}, MyGUI::Align::Default);
         mShaderInfo->setUserString("VStretch", "true");
@@ -203,7 +206,8 @@ namespace MWGui
                 select(mActiveList, 0);
             }
         }
-        else if (list == mActiveList && MyGUI::InputManager::getInstance().isShiftPressed() && (key == MyGUI::KeyCode::ArrowUp || key == MyGUI::KeyCode::ArrowDown))
+        else if (list == mActiveList && MyGUI::InputManager::getInstance().isShiftPressed()
+            && (key == MyGUI::KeyCode::ArrowUp || key == MyGUI::KeyCode::ArrowDown))
         {
             moveShader(key == MyGUI::KeyCode::ArrowUp ? Direction::Up : Direction::Down);
         }
@@ -224,19 +228,21 @@ namespace MWGui
     {
         constexpr int padding = 12;
         constexpr int padding2 = padding * 2;
-        mShaderInfo->setCoord(padding, padding, mConfigLayout->getSize().width - padding2 - padding, mShaderInfo->getTextSize().height);
+        mShaderInfo->setCoord(
+            padding, padding, mConfigLayout->getSize().width - padding2 - padding, mShaderInfo->getTextSize().height);
 
         int totalHeight = mShaderInfo->getTop() + mShaderInfo->getTextSize().height + padding;
 
-        mConfigArea->setCoord({padding, totalHeight, mShaderInfo->getSize().width, mConfigLayout->getHeight()});
+        mConfigArea->setCoord({ padding, totalHeight, mShaderInfo->getSize().width, mConfigLayout->getHeight() });
 
         int childHeights = 0;
-		MyGUI::EnumeratorWidgetPtr enumerator = mConfigArea->getEnumerator();
-		while (enumerator.next())
-		{
-			enumerator.current()->setCoord(padding, childHeights + padding, mShaderInfo->getSize().width - padding2, enumerator.current()->getHeight());
+        MyGUI::EnumeratorWidgetPtr enumerator = mConfigArea->getEnumerator();
+        while (enumerator.next())
+        {
+            enumerator.current()->setCoord(padding, childHeights + padding, mShaderInfo->getSize().width - padding2,
+                enumerator.current()->getHeight());
             childHeights += enumerator.current()->getHeight() + padding;
-		}
+        }
         totalHeight += childHeights;
 
         mConfigArea->setSize(mConfigArea->getWidth(), childHeights);
@@ -245,7 +251,7 @@ namespace MWGui
         mConfigLayout->setSize(mConfigLayout->getWidth(), mConfigLayout->getParentSize().height - padding2);
     }
 
-    void PostProcessorHud::notifyMouseWheel(MyGUI::Widget *sender, int rel)
+    void PostProcessorHud::notifyMouseWheel(MyGUI::Widget* sender, int rel)
     {
         int offset = mConfigLayout->getViewOffset().top + rel * 0.3;
         if (offset > 0)
@@ -298,9 +304,7 @@ namespace MWGui
         std::string_view version = technique->getVersion().empty() ? NA : technique->getVersion();
         std::string_view description = technique->getDescription().empty() ? NA : technique->getDescription();
 
-        auto serializeBool = [](bool value) {
-            return value ? "#{sYes}" : "#{sNo}";
-        };
+        auto serializeBool = [](bool value) { return value ? "#{sYes}" : "#{sNo}"; };
 
         const auto flags = technique->getFlags();
 
@@ -315,19 +319,34 @@ namespace MWGui
             case fx::Technique::Status::Uncompiled:
             {
                 if (technique->getDynamic())
-                    ss  << "#{fontcolourhtml=header}#{PostProcessing:ShaderLocked}:      #{fontcolourhtml=normal} #{PostProcessing:ShaderLockedDescription}" << endl << endl;
-                ss  << "#{fontcolourhtml=header}#{PostProcessing:Author}:      #{fontcolourhtml=normal} " << author << endl << endl
-                    << "#{fontcolourhtml=header}#{PostProcessing:Version}:     #{fontcolourhtml=normal} " << version << endl << endl
-                    << "#{fontcolourhtml=header}#{PostProcessing:Description}: #{fontcolourhtml=normal} " << description << endl << endl
-                    << "#{fontcolourhtml=header}#{PostProcessing:InInteriors}: #{fontcolourhtml=normal} " << flag_interior
-                    << "#{fontcolourhtml=header}   #{PostProcessing:InExteriors}: #{fontcolourhtml=normal} " << flag_exterior
-                    << "#{fontcolourhtml=header}   #{PostProcessing:Underwater}: #{fontcolourhtml=normal} " << flag_underwater
-                    << "#{fontcolourhtml=header}   #{PostProcessing:Abovewater}: #{fontcolourhtml=normal} " << flag_abovewater;
+                    ss << "#{fontcolourhtml=header}#{PostProcessing:ShaderLocked}:      #{fontcolourhtml=normal} "
+                          "#{PostProcessing:ShaderLockedDescription}"
+                       << endl
+                       << endl;
+                ss << "#{fontcolourhtml=header}#{PostProcessing:Author}:      #{fontcolourhtml=normal} " << author
+                   << endl
+                   << endl
+                   << "#{fontcolourhtml=header}#{PostProcessing:Version}:     #{fontcolourhtml=normal} " << version
+                   << endl
+                   << endl
+                   << "#{fontcolourhtml=header}#{PostProcessing:Description}: #{fontcolourhtml=normal} " << description
+                   << endl
+                   << endl
+                   << "#{fontcolourhtml=header}#{PostProcessing:InInteriors}: #{fontcolourhtml=normal} "
+                   << flag_interior
+                   << "#{fontcolourhtml=header}   #{PostProcessing:InExteriors}: #{fontcolourhtml=normal} "
+                   << flag_exterior
+                   << "#{fontcolourhtml=header}   #{PostProcessing:Underwater}: #{fontcolourhtml=normal} "
+                   << flag_underwater
+                   << "#{fontcolourhtml=header}   #{PostProcessing:Abovewater}: #{fontcolourhtml=normal} "
+                   << flag_abovewater;
                 break;
             }
             case fx::Technique::Status::Parse_Error:
-                ss  << "#{fontcolourhtml=negative}Shader Compile Error: #{fontcolourhtml=normal} <" << std::string(technique->getName()) << "> failed to compile." << endl << endl
-                    << technique->getLastError();
+                ss << "#{fontcolourhtml=negative}Shader Compile Error: #{fontcolourhtml=normal} <"
+                   << std::string(technique->getName()) << "> failed to compile." << endl
+                   << endl
+                   << technique->getLastError();
                 break;
             case fx::Technique::Status::File_Not_exists:
                 break;
@@ -339,11 +358,13 @@ namespace MWGui
         {
             if (technique->getUniformMap().size() > 0)
             {
-                MyGUI::Button* resetButton = mConfigArea->createWidget<MyGUI::Button>("MW_Button", {0,0,0,24}, MyGUI::Align::Default);
+                MyGUI::Button* resetButton
+                    = mConfigArea->createWidget<MyGUI::Button>("MW_Button", { 0, 0, 0, 24 }, MyGUI::Align::Default);
                 resetButton->setCaptionWithReplacing("#{PostProcessing:ResetShader}");
                 resetButton->setTextAlign(MyGUI::Align::Center);
                 resetButton->eventMouseWheel += MyGUI::newDelegate(this, &PostProcessorHud::notifyMouseWheel);
-                resetButton->eventMouseButtonClick += MyGUI::newDelegate(this, &PostProcessorHud::notifyResetButtonClicked);
+                resetButton->eventMouseButtonClick
+                    += MyGUI::newDelegate(this, &PostProcessorHud::notifyResetButtonClicked);
             }
 
             for (const auto& uniform : technique->getUniformMap())
@@ -353,12 +374,14 @@ namespace MWGui
 
                 if (!uniform->mHeader.empty())
                 {
-                    Gui::AutoSizedTextBox* divider = mConfigArea->createWidget<Gui::AutoSizedTextBox>("MW_UniformGroup", {0,0,0,34}, MyGUI::Align::Default);
+                    Gui::AutoSizedTextBox* divider = mConfigArea->createWidget<Gui::AutoSizedTextBox>(
+                        "MW_UniformGroup", { 0, 0, 0, 34 }, MyGUI::Align::Default);
                     divider->setNeedMouseFocus(false);
                     divider->setCaptionWithReplacing(uniform->mHeader);
                 }
 
-                fx::Widgets::UniformBase* uwidget = mConfigArea->createWidget<fx::Widgets::UniformBase>("MW_UniformEdit", {0,0,0,22}, MyGUI::Align::Default);
+                fx::Widgets::UniformBase* uwidget = mConfigArea->createWidget<fx::Widgets::UniformBase>(
+                    "MW_UniformEdit", { 0, 0, 0, 22 }, MyGUI::Align::Default);
                 uwidget->init(uniform);
                 uwidget->getLabel()->eventMouseWheel += MyGUI::newDelegate(this, &PostProcessorHud::notifyMouseWheel);
             }
@@ -397,7 +420,8 @@ namespace MWGui
             if (!technique)
                 continue;
 
-            if (!technique->getHidden() && !processor->isTechniqueEnabled(technique) && name.find(mFilter->getCaption()) != std::string::npos)
+            if (!technique->getHidden() && !processor->isTechniqueEnabled(technique)
+                && name.find(mFilter->getCaption()) != std::string::npos)
                 mInactiveList->addItem(name, technique);
         }
 
@@ -407,8 +431,7 @@ namespace MWGui
                 mActiveList->addItem(technique->getName(), technique);
         }
 
-        auto tryFocus = [this](ListWrapper* widget, const std::string& hint)
-        {
+        auto tryFocus = [this](ListWrapper* widget, const std::string& hint) {
             size_t index = widget->findItemIndexWith(hint);
 
             if (index != MyGUI::ITEM_NONE)
diff --git a/apps/openmw/mwgui/postprocessorhud.hpp b/apps/openmw/mwgui/postprocessorhud.hpp
index 7473cfcfa5..54e95e7986 100644
--- a/apps/openmw/mwgui/postprocessorhud.hpp
+++ b/apps/openmw/mwgui/postprocessorhud.hpp
@@ -44,7 +44,6 @@ namespace MWGui
         static void registerMyGUIComponents();
 
     private:
-
         void notifyWindowResize(MyGUI::Window* sender);
 
         void notifyFilterChanged(MyGUI::EditBox* sender);
@@ -65,7 +64,7 @@ namespace MWGui
 
         void notifyShaderDownPressed(MyGUI::Widget* sender);
 
-        void notifyMouseWheel(MyGUI::Widget *sender, int rel);
+        void notifyMouseWheel(MyGUI::Widget* sender, int rel);
 
         enum class Direction
         {
diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index c218d60726..4b7bcb58ff 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -1,36 +1,35 @@
 #include "quickkeysmenu.hpp"
 
-#include <MyGUI_EditBox.h>
 #include <MyGUI_Button.h>
+#include <MyGUI_EditBox.h>
 #include <MyGUI_Gui.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_RenderManager.h>
 
 #include <components/esm3/esmwriter.hpp>
+#include <components/esm3/loadmgef.hpp>
 #include <components/esm3/quickkeys.hpp>
-#include <components/resource/resourcesystem.hpp>
 #include <components/misc/resourcehelpers.hpp>
-#include <components/esm3/loadmgef.hpp>
+#include <components/resource/resourcesystem.hpp>
 
-#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/class.hpp"
-#include "../mwworld/player.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/inventorystore.hpp"
+#include "../mwworld/player.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwmechanics/spellutil.hpp"
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/creaturestats.hpp"
+#include "../mwmechanics/spellutil.hpp"
 
 #include "itemselection.hpp"
-#include "spellview.hpp"
 #include "itemwidget.hpp"
 #include "sortfilteritemmodel.hpp"
-
+#include "spellview.hpp"
 
 namespace MWGui
 {
@@ -46,16 +45,15 @@ namespace MWGui
         getWidget(mInstructionLabel, "InstructionLabel");
 
         mMainWidget->setSize(mMainWidget->getWidth(),
-                             mMainWidget->getHeight() +
-                             (mInstructionLabel->getTextSize().height - mInstructionLabel->getHeight()));
+            mMainWidget->getHeight() + (mInstructionLabel->getTextSize().height - mInstructionLabel->getHeight()));
 
         mOkButton->eventMouseButtonClick += MyGUI::newDelegate(this, &QuickKeysMenu::onOkButtonClicked);
         center();
 
         for (int i = 0; i < 10; ++i)
         {
-            mKey[i].index = i+1;
-            getWidget(mKey[i].button, "QuickKey" + MyGUI::utility::toString(i+1));
+            mKey[i].index = i + 1;
+            getWidget(mKey[i].button, "QuickKey" + MyGUI::utility::toString(i + 1));
             mKey[i].button->eventMouseButtonClick += MyGUI::newDelegate(this, &QuickKeysMenu::onQuickKeyButtonClicked);
 
             unassign(&mKey[i]);
@@ -66,7 +64,7 @@ namespace MWGui
     {
         mActivated = nullptr;
 
-        for (int i=0; i<10; ++i)
+        for (int i = 0; i < 10; ++i)
         {
             unassign(&mKey[i]);
         }
@@ -87,9 +85,8 @@ namespace MWGui
             {
                 MWWorld::Ptr item = *mKey[index].button->getUserData<MWWorld::Ptr>();
                 // Make sure the item is available and is not broken
-                if (!item || item.getRefData().getCount() < 1 ||
-                    (item.getClass().hasItemHealth(item) &&
-                        item.getClass().getItemHealth(item) <= 0))
+                if (!item || item.getRefData().getCount() < 1
+                    || (item.getClass().hasItemHealth(item) && item.getClass().getItemHealth(item) <= 0))
                 {
                     // Try searching for a compatible replacement
                     item = store.findReplacement(mKey[index].id);
@@ -138,8 +135,8 @@ namespace MWGui
         {
             key->type = Type_HandToHand;
 
-            MyGUI::ImageBox* image = key->button->createWidget<MyGUI::ImageBox>("ImageBox",
-                MyGUI::IntCoord(14, 13, 32, 32), MyGUI::Align::Default);
+            MyGUI::ImageBox* image = key->button->createWidget<MyGUI::ImageBox>(
+                "ImageBox", MyGUI::IntCoord(14, 13, 32, 32), MyGUI::Align::Default);
 
             image->setImageTexture("icons\\k\\stealth_handtohand.dds");
             image->setNeedMouseFocus(false);
@@ -150,8 +147,8 @@ namespace MWGui
             key->id.clear();
             key->name.clear();
 
-            MyGUI::TextBox* textBox = key->button->createWidgetReal<MyGUI::TextBox>("SandText",
-                MyGUI::FloatCoord(0,0,1,1), MyGUI::Align::Default);
+            MyGUI::TextBox* textBox = key->button->createWidgetReal<MyGUI::TextBox>(
+                "SandText", MyGUI::FloatCoord(0, 0, 1, 1), MyGUI::Align::Default);
 
             textBox->setTextAlign(MyGUI::Align::Center);
             textBox->setCaption(MyGUI::utility::toString(key->index));
@@ -180,7 +177,7 @@ namespace MWGui
         mSelected = &mKey[index];
 
         // prevent reallocation of zero key from Type_HandToHand
-        if(mSelected->index == 10)
+        if (mSelected->index == 10)
             return;
 
         // open assign dialog
@@ -190,7 +187,7 @@ namespace MWGui
         mAssignDialog->setVisible(true);
     }
 
-    void QuickKeysMenu::onOkButtonClicked (MyGUI::Widget *sender)
+    void QuickKeysMenu::onOkButtonClicked(MyGUI::Widget* sender)
     {
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_QuickKeysMenu);
     }
@@ -268,11 +265,13 @@ namespace MWGui
         mSelected->name = item.getClass().getName(item);
 
         float scale = 1.f;
-        MyGUI::ITexture* texture = MyGUI::RenderManager::getInstance().getTexture("textures\\menu_icon_select_magic_magic.dds");
+        MyGUI::ITexture* texture
+            = MyGUI::RenderManager::getInstance().getTexture("textures\\menu_icon_select_magic_magic.dds");
         if (texture)
             scale = texture->getHeight() / 64.f;
 
-        mSelected->button->setFrame("textures\\menu_icon_select_magic_magic.dds", MyGUI::IntCoord(0, 0, 44*scale, 44*scale));
+        mSelected->button->setFrame(
+            "textures\\menu_icon_select_magic_magic.dds", MyGUI::IntCoord(0, 0, 44 * scale, 44 * scale));
         mSelected->button->setIcon(item);
 
         mSelected->button->setUserString("ToolTipType", "ItemPtr");
@@ -288,7 +287,7 @@ namespace MWGui
         while (mSelected->button->getChildCount()) // Destroy number label
             MyGUI::Gui::getInstance().destroyWidget(mSelected->button->getChildAt(0));
 
-        const MWWorld::ESMStore &esmStore = MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
         const ESM::Spell* spell = esmStore.get<ESM::Spell>().find(spellId);
 
         mSelected->type = Type_Magic;
@@ -304,15 +303,17 @@ namespace MWGui
 
         std::string path = effect->mIcon;
         int slashPos = path.rfind('\\');
-        path.insert(slashPos+1, "b_");
+        path.insert(slashPos + 1, "b_");
         path = Misc::ResourceHelpers::correctIconPath(path, MWBase::Environment::get().getResourceSystem()->getVFS());
 
         float scale = 1.f;
-        MyGUI::ITexture* texture = MyGUI::RenderManager::getInstance().getTexture("textures\\menu_icon_select_magic.dds");
+        MyGUI::ITexture* texture
+            = MyGUI::RenderManager::getInstance().getTexture("textures\\menu_icon_select_magic.dds");
         if (texture)
             scale = texture->getHeight() / 64.f;
 
-        mSelected->button->setFrame("textures\\menu_icon_select_magic.dds", MyGUI::IntCoord(0, 0, 44*scale, 44*scale));
+        mSelected->button->setFrame(
+            "textures\\menu_icon_select_magic.dds", MyGUI::IntCoord(0, 0, 44 * scale, 44 * scale));
         mSelected->button->setIcon(path);
 
         if (mMagicSelectionDialog)
@@ -337,19 +338,18 @@ namespace MWGui
     {
         assert(index >= 1 && index <= 10);
 
-        keyData *key = &mKey[index-1];
-        
+        keyData* key = &mKey[index - 1];
+
         MWWorld::Ptr player = MWMechanics::getPlayer();
         MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
-        const MWMechanics::CreatureStats &playerStats = player.getClass().getCreatureStats(player);
+        const MWMechanics::CreatureStats& playerStats = player.getClass().getCreatureStats(player);
 
-        validate(index-1);
+        validate(index - 1);
 
         // Delay action executing,
         // if player is busy for now (casting a spell, attacking someone, etc.)
         bool isDelayNeeded = MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(player)
-                || playerStats.getKnockedDown()
-                || playerStats.getHitRecovery();
+            || playerStats.getKnockedDown() || playerStats.getHitRecovery();
 
         bool godmode = MWBase::Environment::get().getWorld()->getGodModeState();
         bool isReturnNeeded = (!godmode && playerStats.isParalyzed()) || playerStats.isDead();
@@ -382,15 +382,14 @@ namespace MWGui
                 item = nullptr;
 
             // check the item is available and not broken
-            if (!item || item.getRefData().getCount() < 1 ||
-               (item.getClass().hasItemHealth(item) && item.getClass().getItemHealth(item) <= 0))
+            if (!item || item.getRefData().getCount() < 1
+                || (item.getClass().hasItemHealth(item) && item.getClass().getItemHealth(item) <= 0))
             {
                 item = store.findReplacement(key->id);
 
                 if (!item || item.getRefData().getCount() < 1)
                 {
-                    MWBase::Environment::get().getWindowManager()->messageBox(
-                        "#{sQuickMenu5} " + key->name);
+                    MWBase::Environment::get().getWindowManager()->messageBox("#{sQuickMenu5} " + key->name);
 
                     return;
                 }
@@ -400,7 +399,8 @@ namespace MWGui
             {
                 if (!store.isEquipped(item))
                     MWBase::Environment::get().getWindowManager()->useItem(item);
-                MWWorld::ConstContainerStoreIterator rightHand = store.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+                MWWorld::ConstContainerStoreIterator rightHand
+                    = store.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
                 // change draw state only if the item is in player's right hand
                 if (rightHand != store.end() && item == *rightHand)
                 {
@@ -438,8 +438,8 @@ namespace MWGui
             }
 
             store.setSelectedEnchantItem(store.end());
-            MWBase::Environment::get().getWindowManager()
-                ->setSelectedSpell(spellId, int(MWMechanics::getSpellSuccessChance(spellId, player)));
+            MWBase::Environment::get().getWindowManager()->setSelectedSpell(
+                spellId, int(MWMechanics::getSpellSuccessChance(spellId, player)));
             MWBase::Environment::get().getWorld()->getPlayer().setDrawState(MWMechanics::DrawState::Spell);
         }
         else if (key->type == Type_HandToHand)
@@ -451,7 +451,7 @@ namespace MWGui
 
     // ---------------------------------------------------------------------------------------------------------
 
-    QuickKeysMenuAssign::QuickKeysMenuAssign (QuickKeysMenu* parent)
+    QuickKeysMenuAssign::QuickKeysMenuAssign(QuickKeysMenu* parent)
         : WindowModal("openmw_quickkeys_menu_assign.layout")
         , mParent(parent)
     {
@@ -466,44 +466,35 @@ namespace MWGui
         mUnassignButton->eventMouseButtonClick += MyGUI::newDelegate(mParent, &QuickKeysMenu::onUnassignButtonClicked);
         mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(mParent, &QuickKeysMenu::onCancelButtonClicked);
 
-
-        int maxWidth = mLabel->getTextSize ().width + 24;
-        maxWidth = std::max(maxWidth, mItemButton->getTextSize ().width + 24);
-        maxWidth = std::max(maxWidth, mMagicButton->getTextSize ().width + 24);
-        maxWidth = std::max(maxWidth, mUnassignButton->getTextSize ().width + 24);
-        maxWidth = std::max(maxWidth, mCancelButton->getTextSize ().width + 24);
+        int maxWidth = mLabel->getTextSize().width + 24;
+        maxWidth = std::max(maxWidth, mItemButton->getTextSize().width + 24);
+        maxWidth = std::max(maxWidth, mMagicButton->getTextSize().width + 24);
+        maxWidth = std::max(maxWidth, mUnassignButton->getTextSize().width + 24);
+        maxWidth = std::max(maxWidth, mCancelButton->getTextSize().width + 24);
 
         mMainWidget->setSize(maxWidth + 24, mMainWidget->getHeight());
         mLabel->setSize(maxWidth, mLabel->getHeight());
 
-        mItemButton->setCoord((maxWidth - mItemButton->getTextSize().width-24)/2 + 8,
-                              mItemButton->getTop(),
-                              mItemButton->getTextSize().width + 24,
-                              mItemButton->getHeight());
-        mMagicButton->setCoord((maxWidth - mMagicButton->getTextSize().width-24)/2 + 8,
-                              mMagicButton->getTop(),
-                              mMagicButton->getTextSize().width + 24,
-                              mMagicButton->getHeight());
-        mUnassignButton->setCoord((maxWidth - mUnassignButton->getTextSize().width-24)/2 + 8,
-                              mUnassignButton->getTop(),
-                              mUnassignButton->getTextSize().width + 24,
-                              mUnassignButton->getHeight());
-        mCancelButton->setCoord((maxWidth - mCancelButton->getTextSize().width-24)/2 + 8,
-                              mCancelButton->getTop(),
-                              mCancelButton->getTextSize().width + 24,
-                              mCancelButton->getHeight());
+        mItemButton->setCoord((maxWidth - mItemButton->getTextSize().width - 24) / 2 + 8, mItemButton->getTop(),
+            mItemButton->getTextSize().width + 24, mItemButton->getHeight());
+        mMagicButton->setCoord((maxWidth - mMagicButton->getTextSize().width - 24) / 2 + 8, mMagicButton->getTop(),
+            mMagicButton->getTextSize().width + 24, mMagicButton->getHeight());
+        mUnassignButton->setCoord((maxWidth - mUnassignButton->getTextSize().width - 24) / 2 + 8,
+            mUnassignButton->getTop(), mUnassignButton->getTextSize().width + 24, mUnassignButton->getHeight());
+        mCancelButton->setCoord((maxWidth - mCancelButton->getTextSize().width - 24) / 2 + 8, mCancelButton->getTop(),
+            mCancelButton->getTextSize().width + 24, mCancelButton->getHeight());
 
         center();
     }
 
-    void QuickKeysMenu::write(ESM::ESMWriter &writer)
+    void QuickKeysMenu::write(ESM::ESMWriter& writer)
     {
         writer.startRecord(ESM::REC_KEYS);
 
         ESM::QuickKeys keys;
 
         // NB: The quick key with index 9 always has Hand-to-Hand type and must not be saved
-        for (int i=0; i<9; ++i)
+        for (int i = 0; i < 9; ++i)
         {
             ItemWidget* button = mKey[i].button;
 
@@ -537,7 +528,7 @@ namespace MWGui
         writer.endRecord(ESM::REC_KEYS);
     }
 
-    void QuickKeysMenu::readRecord(ESM::ESMReader &reader, uint32_t type)
+    void QuickKeysMenu::readRecord(ESM::ESMReader& reader, uint32_t type)
     {
         if (type != ESM::REC_KEYS)
             return;
@@ -548,7 +539,7 @@ namespace MWGui
         MWWorld::Ptr player = MWMechanics::getPlayer();
         MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
 
-        int i=0;
+        int i = 0;
         for (ESM::QuickKeys::QuickKey& quickKey : keys.mKeys)
         {
             // NB: The quick key with index 9 always has Hand-to-Hand type and must not be loaded
@@ -559,32 +550,32 @@ namespace MWGui
 
             switch (quickKey.mType)
             {
-            case Type_Magic:
-                if (MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(quickKey.mId))
-                    onAssignMagic(quickKey.mId);
-                break;
-            case Type_Item:
-            case Type_MagicItem:
-            {
-                // Find the item by id
-                MWWorld::Ptr item = store.findReplacement(quickKey.mId);
-
-                if (item.isEmpty())
-                    unassign(mSelected);
-                else
+                case Type_Magic:
+                    if (MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(quickKey.mId))
+                        onAssignMagic(quickKey.mId);
+                    break;
+                case Type_Item:
+                case Type_MagicItem:
                 {
-                    if (quickKey.mType == Type_Item)
-                        onAssignItem(item);
-                    else // if (quickKey.mType == Type_MagicItem)
-                        onAssignMagicItem(item);
-                }
+                    // Find the item by id
+                    MWWorld::Ptr item = store.findReplacement(quickKey.mId);
+
+                    if (item.isEmpty())
+                        unassign(mSelected);
+                    else
+                    {
+                        if (quickKey.mType == Type_Item)
+                            onAssignItem(item);
+                        else // if (quickKey.mType == Type_MagicItem)
+                            onAssignMagicItem(item);
+                    }
 
-                break;
-            }
-            case Type_Unassigned:
-            case Type_HandToHand:
-                unassign(mSelected);
-                break;
+                    break;
+                }
+                case Type_Unassigned:
+                case Type_HandToHand:
+                    unassign(mSelected);
+                    break;
             }
 
             ++i;
@@ -608,7 +599,7 @@ namespace MWGui
         center();
     }
 
-    void MagicSelectionDialog::onCancelButtonClicked (MyGUI::Widget *sender)
+    void MagicSelectionDialog::onCancelButtonClicked(MyGUI::Widget* sender)
     {
         exit();
     }
@@ -619,7 +610,7 @@ namespace MWGui
         return true;
     }
 
-    void MagicSelectionDialog::onOpen ()
+    void MagicSelectionDialog::onOpen()
     {
         WindowModal::onOpen();
 
diff --git a/apps/openmw/mwgui/quickkeysmenu.hpp b/apps/openmw/mwgui/quickkeysmenu.hpp
index 2c28bfee61..affffd5bd4 100644
--- a/apps/openmw/mwgui/quickkeysmenu.hpp
+++ b/apps/openmw/mwgui/quickkeysmenu.hpp
@@ -27,11 +27,11 @@ namespace MWGui
         void onUnassignButtonClicked(MyGUI::Widget* sender);
         void onCancelButtonClicked(MyGUI::Widget* sender);
 
-        void onAssignItem (MWWorld::Ptr item);
-        void onAssignItemCancel ();
-        void onAssignMagicItem (MWWorld::Ptr item);
-        void onAssignMagic (const std::string& spellId);
-        void onAssignMagicCancel ();
+        void onAssignItem(MWWorld::Ptr item);
+        void onAssignItemCancel();
+        void onAssignMagicItem(MWWorld::Ptr item);
+        void onAssignMagic(const std::string& spellId);
+        void onAssignMagicCancel();
         void onOpen() override;
         void onClose() override;
 
@@ -48,20 +48,26 @@ namespace MWGui
             Type_HandToHand
         };
 
-        void write (ESM::ESMWriter& writer);
-        void readRecord (ESM::ESMReader& reader, uint32_t type);
+        void write(ESM::ESMWriter& writer);
+        void readRecord(ESM::ESMReader& reader, uint32_t type);
         void clear() override;
 
-
     private:
-
-        struct keyData {
+        struct keyData
+        {
             int index;
             ItemWidget* button;
             QuickKeysMenu::QuickKeyType type;
             std::string id;
             std::string name;
-            keyData(): index(-1), button(nullptr), type(Type_Unassigned), id(""), name("") {}
+            keyData()
+                : index(-1)
+                , button(nullptr)
+                , type(Type_Unassigned)
+                , id("")
+                , name("")
+            {
+            }
         };
 
         std::vector<keyData> mKey;
@@ -111,10 +117,9 @@ namespace MWGui
 
         QuickKeysMenu* mParent;
 
-        void onCancelButtonClicked (MyGUI::Widget* sender);
+        void onCancelButtonClicked(MyGUI::Widget* sender);
         void onModelIndexSelected(SpellModel::ModelIndex index);
     };
 }
 
-
 #endif
diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index f9d261a272..e52161d442 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -1,8 +1,8 @@
 #include "race.hpp"
 
-#include <MyGUI_ListBox.h>
-#include <MyGUI_ImageBox.h>
 #include <MyGUI_Gui.h>
+#include <MyGUI_ImageBox.h>
+#include <MyGUI_ListBox.h>
 #include <MyGUI_ScrollBar.h>
 
 #include <osg/Texture2D>
@@ -13,11 +13,11 @@
 #include <components/esm3/loadbody.hpp>
 #include <components/esm3/loadrace.hpp>
 
-#include "../mwworld/esmstore.hpp"
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 #include "../mwrender/characterpreview.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include "tooltips.hpp"
 #include "ustring.hpp"
@@ -45,19 +45,20 @@ namespace MWGui
 {
 
     RaceDialog::RaceDialog(osg::Group* parent, Resource::ResourceSystem* resourceSystem)
-      : WindowModal("openmw_chargen_race.layout")
-      , mParent(parent)
-      , mResourceSystem(resourceSystem)
-      , mGenderIndex(0)
-      , mFaceIndex(0)
-      , mHairIndex(0)
-      , mCurrentAngle(0)
-      , mPreviewDirty(true)
+        : WindowModal("openmw_chargen_race.layout")
+        , mParent(parent)
+        , mResourceSystem(resourceSystem)
+        , mGenderIndex(0)
+        , mFaceIndex(0)
+        , mHairIndex(0)
+        , mCurrentAngle(0)
+        , mPreviewDirty(true)
     {
         // Centre dialog
         center();
 
-        setText("AppearanceT", MWBase::Environment::get().getWindowManager()->getGameSettingString("sRaceMenu1", "Appearance"));
+        setText("AppearanceT",
+            MWBase::Environment::get().getWindowManager()->getGameSettingString("sRaceMenu1", "Appearance"));
         getWidget(mPreviewImage, "PreviewImage");
 
         mPreviewImage->eventMouseWheel += MyGUI::newDelegate(this, &RaceDialog::onPreviewScroll);
@@ -74,19 +75,22 @@ namespace MWGui
         // Set up next/previous buttons
         MyGUI::Button *prevButton, *nextButton;
 
-        setText("GenderChoiceT", MWBase::Environment::get().getWindowManager()->getGameSettingString("sRaceMenu2", "Change Sex"));
+        setText("GenderChoiceT",
+            MWBase::Environment::get().getWindowManager()->getGameSettingString("sRaceMenu2", "Change Sex"));
         getWidget(prevButton, "PrevGenderButton");
         getWidget(nextButton, "NextGenderButton");
         prevButton->eventMouseButtonClick += MyGUI::newDelegate(this, &RaceDialog::onSelectPreviousGender);
         nextButton->eventMouseButtonClick += MyGUI::newDelegate(this, &RaceDialog::onSelectNextGender);
 
-        setText("FaceChoiceT", MWBase::Environment::get().getWindowManager()->getGameSettingString("sRaceMenu3", "Change Face"));
+        setText("FaceChoiceT",
+            MWBase::Environment::get().getWindowManager()->getGameSettingString("sRaceMenu3", "Change Face"));
         getWidget(prevButton, "PrevFaceButton");
         getWidget(nextButton, "NextFaceButton");
         prevButton->eventMouseButtonClick += MyGUI::newDelegate(this, &RaceDialog::onSelectPreviousFace);
         nextButton->eventMouseButtonClick += MyGUI::newDelegate(this, &RaceDialog::onSelectNextFace);
 
-        setText("HairChoiceT", MWBase::Environment::get().getWindowManager()->getGameSettingString("sRaceMenu4", "Change Hair"));
+        setText("HairChoiceT",
+            MWBase::Environment::get().getWindowManager()->getGameSettingString("sRaceMenu4", "Change Hair"));
         getWidget(prevButton, "PrevHairButton");
         getWidget(nextButton, "NextHairButton");
         prevButton->eventMouseButtonClick += MyGUI::newDelegate(this, &RaceDialog::onSelectPreviousHair);
@@ -98,9 +102,11 @@ namespace MWGui
         mRaceList->eventListSelectAccept += MyGUI::newDelegate(this, &RaceDialog::onAccept);
         mRaceList->eventListChangePosition += MyGUI::newDelegate(this, &RaceDialog::onSelectRace);
 
-        setText("SkillsT", MWBase::Environment::get().getWindowManager()->getGameSettingString("sBonusSkillTitle", "Skill Bonus"));
+        setText("SkillsT",
+            MWBase::Environment::get().getWindowManager()->getGameSettingString("sBonusSkillTitle", "Skill Bonus"));
         getWidget(mSkillList, "SkillList");
-        setText("SpellPowerT", MWBase::Environment::get().getWindowManager()->getGameSettingString("sRaceMenu7", "Specials"));
+        setText("SpellPowerT",
+            MWBase::Environment::get().getWindowManager()->getGameSettingString("sRaceMenu7", "Specials"));
         getWidget(mSpellPowerList, "SpellPowerList");
 
         MyGUI::Button* backButton;
@@ -123,9 +129,11 @@ namespace MWGui
         getWidget(okButton, "OKButton");
 
         if (shown)
-            okButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
+            okButton->setCaption(
+                toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
         else
-            okButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
+            okButton->setCaption(
+                toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
     }
 
     void RaceDialog::onOpen()
@@ -143,9 +151,10 @@ namespace MWGui
 
         mPreview = std::make_unique<MWRender::RaceSelectionPreview>(mParent, mResourceSystem);
         mPreview->rebuild();
-        mPreview->setAngle (mCurrentAngle);
+        mPreview->setAngle(mCurrentAngle);
 
-        mPreviewTexture = std::make_unique<osgMyGUI::OSGTexture>(mPreview->getTexture(), mPreview->getTextureStateSet());
+        mPreviewTexture
+            = std::make_unique<osgMyGUI::OSGTexture>(mPreview->getTexture(), mPreview->getTextureStateSet());
         mPreviewImage->setRenderItemTexture(mPreviewTexture.get());
         mPreviewImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
 
@@ -154,13 +163,13 @@ namespace MWGui
         setGender(proto.isMale() ? GM_Male : GM_Female);
         recountParts();
 
-        for (unsigned int i=0; i<mAvailableHeads.size(); ++i)
+        for (unsigned int i = 0; i < mAvailableHeads.size(); ++i)
         {
             if (Misc::StringUtils::ciEqual(mAvailableHeads[i], proto.mHead))
                 mFaceIndex = i;
         }
 
-        for (unsigned int i=0; i<mAvailableHairs.size(); ++i)
+        for (unsigned int i = 0; i < mAvailableHairs.size(); ++i)
         {
             if (Misc::StringUtils::ciEqual(mAvailableHairs[i], proto.mHair))
                 mHairIndex = i;
@@ -168,14 +177,14 @@ namespace MWGui
 
         mPreviewDirty = true;
 
-        size_t initialPos = mHeadRotate->getScrollRange()/2+mHeadRotate->getScrollRange()/10;
+        size_t initialPos = mHeadRotate->getScrollRange() / 2 + mHeadRotate->getScrollRange() / 10;
         mHeadRotate->setScrollPosition(initialPos);
         onHeadRotate(mHeadRotate, initialPos);
 
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mRaceList);
     }
 
-    void RaceDialog::setRaceId(const std::string &raceId)
+    void RaceDialog::setRaceId(const std::string& raceId)
     {
         mCurrentRaceId = raceId;
         mRaceList->setIndexSelected(MyGUI::ITEM_NONE);
@@ -207,7 +216,7 @@ namespace MWGui
 
     void RaceDialog::onOkClicked(MyGUI::Widget* _sender)
     {
-        if(mRaceList->getIndexSelected() == MyGUI::ITEM_NONE)
+        if (mRaceList->getIndexSelected() == MyGUI::ITEM_NONE)
             return;
         eventDone(this);
     }
@@ -232,8 +241,8 @@ namespace MWGui
 
     void RaceDialog::onHeadRotate(MyGUI::ScrollBar* scroll, size_t _position)
     {
-        float angle = (float(_position) / (scroll->getScrollRange()-1) - 0.5f) * osg::PI * 2;
-        mPreview->setAngle (angle);
+        float angle = (float(_position) / (scroll->getScrollRange() - 1) - 0.5f) * osg::PI * 2;
+        mPreview->setAngle(angle);
 
         mCurrentAngle = angle;
     }
@@ -283,7 +292,7 @@ namespace MWGui
         if (_index == MyGUI::ITEM_NONE)
             return;
 
-        const std::string *raceId = mRaceList->getItemDataAt<std::string>(_index);
+        const std::string* raceId = mRaceList->getItemDataAt<std::string>(_index);
         if (Misc::StringUtils::ciEqual(mCurrentRaceId, *raceId))
             return;
 
@@ -296,19 +305,19 @@ namespace MWGui
         updateSpellPowers();
     }
 
-    void RaceDialog::onAccept(MyGUI::ListBox *_sender, size_t _index)
+    void RaceDialog::onAccept(MyGUI::ListBox* _sender, size_t _index)
     {
         onSelectRace(_sender, _index);
-        if(mRaceList->getIndexSelected() == MyGUI::ITEM_NONE)
+        if (mRaceList->getIndexSelected() == MyGUI::ITEM_NONE)
             return;
         eventDone(this);
     }
 
-    void RaceDialog::getBodyParts (int part, std::vector<std::string>& out)
+    void RaceDialog::getBodyParts(int part, std::vector<std::string>& out)
     {
         out.clear();
-        const MWWorld::Store<ESM::BodyPart> &store =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>();
+        const MWWorld::Store<ESM::BodyPart>& store
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>();
 
         for (const ESM::BodyPart& bodypart : store)
         {
@@ -320,10 +329,8 @@ namespace MWGui
                 continue;
             if (mGenderIndex != (bodypart.mData.mFlags & ESM::BodyPart::BPF_Female))
                 continue;
-            bool firstPerson = (bodypart.mId.size() >= 3)
-                    && bodypart.mId[bodypart.mId.size()-3] == '1'
-                    && bodypart.mId[bodypart.mId.size()-2] == 's'
-                    && bodypart.mId[bodypart.mId.size()-1] == 't';
+            bool firstPerson = (bodypart.mId.size() >= 3) && bodypart.mId[bodypart.mId.size() - 3] == '1'
+                && bodypart.mId[bodypart.mId.size() - 2] == 's' && bodypart.mId[bodypart.mId.size() - 1] == 't';
             if (firstPerson)
                 continue;
             if (Misc::StringUtils::ciEqual(bodypart.mRace, mCurrentRaceId))
@@ -368,10 +375,9 @@ namespace MWGui
     {
         mRaceList->removeAllItems();
 
-        const MWWorld::Store<ESM::Race> &races =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>();
+        const MWWorld::Store<ESM::Race>& races = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>();
 
-        std::vector<std::pair<std::string, std::string> > items; // ID, name
+        std::vector<std::pair<std::string, std::string>> items; // ID, name
         for (const ESM::Race& race : races)
         {
             bool playable = race.mData.mFlags & ESM::Race::Playable;
@@ -407,22 +413,23 @@ namespace MWGui
         const int lineHeight = MWBase::Environment::get().getWindowManager()->getFontHeight() + 2;
         MyGUI::IntCoord coord1(0, 0, mSkillList->getWidth(), 18);
 
-        const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-        const ESM::Race *race = store.get<ESM::Race>().find(mCurrentRaceId);
-        int count = sizeof(race->mData.mBonus)/sizeof(race->mData.mBonus[0]); // TODO: Find a portable macro for this ARRAYSIZE?
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+        const ESM::Race* race = store.get<ESM::Race>().find(mCurrentRaceId);
+        int count = sizeof(race->mData.mBonus)
+            / sizeof(race->mData.mBonus[0]); // TODO: Find a portable macro for this ARRAYSIZE?
         for (int i = 0; i < count; ++i)
         {
             int skillId = race->mData.mBonus[i].mSkill;
             if (skillId < 0 || skillId > ESM::Skill::Length) // Skip unknown skill indexes
                 continue;
 
-            skillWidget = mSkillList->createWidget<Widgets::MWSkill>("MW_StatNameValue", coord1, MyGUI::Align::Default,
-                                                           std::string("Skill") + MyGUI::utility::toString(i));
+            skillWidget = mSkillList->createWidget<Widgets::MWSkill>(
+                "MW_StatNameValue", coord1, MyGUI::Align::Default, std::string("Skill") + MyGUI::utility::toString(i));
             skillWidget->setSkillNumber(skillId);
-            skillWidget->setSkillValue(Widgets::MWSkill::SkillValue(static_cast<float>(race->mData.mBonus[i].mBonus), 0.f));
+            skillWidget->setSkillValue(
+                Widgets::MWSkill::SkillValue(static_cast<float>(race->mData.mBonus[i].mBonus), 0.f));
             ToolTips::createSkillToolTip(skillWidget, skillId);
 
-
             mSkillItems.push_back(skillWidget);
 
             coord1.top += lineHeight;
@@ -443,13 +450,14 @@ namespace MWGui
         const int lineHeight = MWBase::Environment::get().getWindowManager()->getFontHeight() + 2;
         MyGUI::IntCoord coord(0, 0, mSpellPowerList->getWidth(), lineHeight);
 
-        const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-        const ESM::Race *race = store.get<ESM::Race>().find(mCurrentRaceId);
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+        const ESM::Race* race = store.get<ESM::Race>().find(mCurrentRaceId);
 
         int i = 0;
         for (const std::string& spellpower : race->mPowers.mList)
         {
-            Widgets::MWSpellPtr spellPowerWidget = mSpellPowerList->createWidget<Widgets::MWSpell>("MW_StatName", coord, MyGUI::Align::Default, std::string("SpellPower") + MyGUI::utility::toString(i));
+            Widgets::MWSpellPtr spellPowerWidget = mSpellPowerList->createWidget<Widgets::MWSpell>(
+                "MW_StatName", coord, MyGUI::Align::Default, std::string("SpellPower") + MyGUI::utility::toString(i));
             spellPowerWidget->setSpellId(spellpower);
             spellPowerWidget->setUserString("ToolTipType", "Spell");
             spellPowerWidget->setUserString("Spell", spellpower);
diff --git a/apps/openmw/mwgui/race.hpp b/apps/openmw/mwgui/race.hpp
index e48ca28162..3a6966cb7c 100644
--- a/apps/openmw/mwgui/race.hpp
+++ b/apps/openmw/mwgui/race.hpp
@@ -5,7 +5,6 @@
 
 #include "windowbase.hpp"
 
-
 namespace MWRender
 {
     class RaceSelectionPreview;
@@ -39,11 +38,11 @@ namespace MWGui
             GM_Female
         };
 
-        const ESM::NPC &getResult() const;
-        const std::string &getRaceId() const { return mCurrentRaceId; }
+        const ESM::NPC& getResult() const;
+        const std::string& getRaceId() const { return mCurrentRaceId; }
         Gender getGender() const { return mGenderIndex == 0 ? GM_Male : GM_Female; }
 
-        void setRaceId(const std::string &raceId);
+        void setRaceId(const std::string& raceId);
         void setGender(Gender gender) { mGenderIndex = gender == GM_Male ? 0 : 1; }
 
         void setNextButtonShow(bool shown);
@@ -91,7 +90,7 @@ namespace MWGui
         void updatePreview();
         void recountParts();
 
-        void getBodyParts (int part, std::vector<std::string>& out);
+        void getBodyParts(int part, std::vector<std::string>& out);
 
         osg::Group* mParent;
         Resource::ResourceSystem* mResourceSystem;
@@ -99,8 +98,8 @@ namespace MWGui
         std::vector<std::string> mAvailableHeads;
         std::vector<std::string> mAvailableHairs;
 
-        MyGUI::ImageBox*  mPreviewImage;
-        MyGUI::ListBox*   mRaceList;
+        MyGUI::ImageBox* mPreviewImage;
+        MyGUI::ListBox* mRaceList;
         MyGUI::ScrollBar* mHeadRotate;
 
         MyGUI::Widget* mSkillList;
diff --git a/apps/openmw/mwgui/recharge.cpp b/apps/openmw/mwgui/recharge.cpp
index 46fb64780e..8fc0328a0b 100644
--- a/apps/openmw/mwgui/recharge.cpp
+++ b/apps/openmw/mwgui/recharge.cpp
@@ -8,132 +8,134 @@
 
 #include <components/esm3/loadcrea.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/containerstore.hpp"
 #include "../mwworld/esmstore.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/recharge.hpp"
 
+#include "inventoryitemmodel.hpp"
+#include "itemchargeview.hpp"
 #include "itemselection.hpp"
 #include "itemwidget.hpp"
-#include "itemchargeview.hpp"
 #include "sortfilteritemmodel.hpp"
-#include "inventoryitemmodel.hpp"
 
 namespace MWGui
 {
 
-Recharge::Recharge()
-    : WindowBase("openmw_recharge_dialog.layout")
-{
-    getWidget(mBox, "Box");
-    getWidget(mGemBox, "GemBox");
-    getWidget(mGemIcon, "GemIcon");
-    getWidget(mChargeLabel, "ChargeLabel");
-    getWidget(mCancelButton, "CancelButton");
+    Recharge::Recharge()
+        : WindowBase("openmw_recharge_dialog.layout")
+    {
+        getWidget(mBox, "Box");
+        getWidget(mGemBox, "GemBox");
+        getWidget(mGemIcon, "GemIcon");
+        getWidget(mChargeLabel, "ChargeLabel");
+        getWidget(mCancelButton, "CancelButton");
 
-    mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &Recharge::onCancel);
-    mBox->eventItemClicked += MyGUI::newDelegate(this, &Recharge::onItemClicked);
+        mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &Recharge::onCancel);
+        mBox->eventItemClicked += MyGUI::newDelegate(this, &Recharge::onItemClicked);
 
-    mBox->setDisplayMode(ItemChargeView::DisplayMode_EnchantmentCharge);
+        mBox->setDisplayMode(ItemChargeView::DisplayMode_EnchantmentCharge);
 
-    mGemIcon->eventMouseButtonClick += MyGUI::newDelegate(this, &Recharge::onSelectItem);
-}
+        mGemIcon->eventMouseButtonClick += MyGUI::newDelegate(this, &Recharge::onSelectItem);
+    }
 
-void Recharge::onOpen()
-{
-    center();
+    void Recharge::onOpen()
+    {
+        center();
 
-    SortFilterItemModel * model = new SortFilterItemModel(std::make_unique<InventoryItemModel>(MWMechanics::getPlayer()));
-    model->setFilter(SortFilterItemModel::Filter_OnlyRechargable);
-    mBox->setModel(model);
+        SortFilterItemModel* model
+            = new SortFilterItemModel(std::make_unique<InventoryItemModel>(MWMechanics::getPlayer()));
+        model->setFilter(SortFilterItemModel::Filter_OnlyRechargable);
+        mBox->setModel(model);
 
-    // Reset scrollbars
-    mBox->resetScrollbars();
-}
+        // Reset scrollbars
+        mBox->resetScrollbars();
+    }
 
-void Recharge::setPtr (const MWWorld::Ptr &item)
-{
-    mGemIcon->setItem(item);
-    mGemIcon->setUserString("ToolTipType", "ItemPtr");
-    mGemIcon->setUserData(MWWorld::Ptr(item));
+    void Recharge::setPtr(const MWWorld::Ptr& item)
+    {
+        mGemIcon->setItem(item);
+        mGemIcon->setUserString("ToolTipType", "ItemPtr");
+        mGemIcon->setUserData(MWWorld::Ptr(item));
 
-    updateView();
-}
+        updateView();
+    }
 
-void Recharge::updateView()
-{
-    MWWorld::Ptr gem = *mGemIcon->getUserData<MWWorld::Ptr>();
+    void Recharge::updateView()
+    {
+        MWWorld::Ptr gem = *mGemIcon->getUserData<MWWorld::Ptr>();
 
-    const std::string& soul = gem.getCellRef().getSoul();
-    const ESM::Creature *creature = MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>().find(soul);
+        const std::string& soul = gem.getCellRef().getSoul();
+        const ESM::Creature* creature
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>().find(soul);
 
-    mChargeLabel->setCaptionWithReplacing("#{sCharges} " + MyGUI::utility::toString(creature->mData.mSoul));
+        mChargeLabel->setCaptionWithReplacing("#{sCharges} " + MyGUI::utility::toString(creature->mData.mSoul));
 
-    bool toolBoxVisible = (gem.getRefData().getCount() != 0);
-    mGemBox->setVisible(toolBoxVisible);
-    mGemBox->setUserString("Hidden", toolBoxVisible ? "false" : "true");
+        bool toolBoxVisible = (gem.getRefData().getCount() != 0);
+        mGemBox->setVisible(toolBoxVisible);
+        mGemBox->setUserString("Hidden", toolBoxVisible ? "false" : "true");
 
-    if (!toolBoxVisible)
-    {
-        mGemIcon->setItem(MWWorld::Ptr());
-        mGemIcon->clearUserStrings();
-    }
+        if (!toolBoxVisible)
+        {
+            mGemIcon->setItem(MWWorld::Ptr());
+            mGemIcon->clearUserStrings();
+        }
 
-    mBox->update();
+        mBox->update();
 
-    Gui::Box* box = dynamic_cast<Gui::Box*>(mMainWidget);
-    if (box == nullptr)
-        throw std::runtime_error("main widget must be a box");
+        Gui::Box* box = dynamic_cast<Gui::Box*>(mMainWidget);
+        if (box == nullptr)
+            throw std::runtime_error("main widget must be a box");
 
-    box->notifyChildrenSizeChanged();
-    center();
-}
+        box->notifyChildrenSizeChanged();
+        center();
+    }
 
-void Recharge::onCancel(MyGUI::Widget *sender)
-{
-    MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Recharge);
-}
+    void Recharge::onCancel(MyGUI::Widget* sender)
+    {
+        MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Recharge);
+    }
 
-void Recharge::onSelectItem(MyGUI::Widget *sender)
-{
-    mItemSelectionDialog = std::make_unique<ItemSelectionDialog>("#{sSoulGemsWithSouls}");
-    mItemSelectionDialog->eventItemSelected += MyGUI::newDelegate(this, &Recharge::onItemSelected);
-    mItemSelectionDialog->eventDialogCanceled += MyGUI::newDelegate(this, &Recharge::onItemCancel);
-    mItemSelectionDialog->setVisible(true);
-    mItemSelectionDialog->openContainer(MWMechanics::getPlayer());
-    mItemSelectionDialog->setFilter(SortFilterItemModel::Filter_OnlyChargedSoulstones);
-}
+    void Recharge::onSelectItem(MyGUI::Widget* sender)
+    {
+        mItemSelectionDialog = std::make_unique<ItemSelectionDialog>("#{sSoulGemsWithSouls}");
+        mItemSelectionDialog->eventItemSelected += MyGUI::newDelegate(this, &Recharge::onItemSelected);
+        mItemSelectionDialog->eventDialogCanceled += MyGUI::newDelegate(this, &Recharge::onItemCancel);
+        mItemSelectionDialog->setVisible(true);
+        mItemSelectionDialog->openContainer(MWMechanics::getPlayer());
+        mItemSelectionDialog->setFilter(SortFilterItemModel::Filter_OnlyChargedSoulstones);
+    }
 
-void Recharge::onItemSelected(MWWorld::Ptr item)
-{
-    mItemSelectionDialog->setVisible(false);
+    void Recharge::onItemSelected(MWWorld::Ptr item)
+    {
+        mItemSelectionDialog->setVisible(false);
 
-    mGemIcon->setItem(item);
-    mGemIcon->setUserString ("ToolTipType", "ItemPtr");
-    mGemIcon->setUserData(item);
+        mGemIcon->setItem(item);
+        mGemIcon->setUserString("ToolTipType", "ItemPtr");
+        mGemIcon->setUserData(item);
 
-    MWBase::Environment::get().getWindowManager()->playSound(item.getClass().getDownSoundId(item));
-    updateView();
-}
+        MWBase::Environment::get().getWindowManager()->playSound(item.getClass().getDownSoundId(item));
+        updateView();
+    }
 
-void Recharge::onItemCancel()
-{
-    mItemSelectionDialog->setVisible(false);
-}
+    void Recharge::onItemCancel()
+    {
+        mItemSelectionDialog->setVisible(false);
+    }
 
-void Recharge::onItemClicked(MyGUI::Widget *sender, const MWWorld::Ptr& item)
-{
-    MWWorld::Ptr gem = *mGemIcon->getUserData<MWWorld::Ptr>();
-    if (!MWMechanics::rechargeItem(item, gem))
-        return;
+    void Recharge::onItemClicked(MyGUI::Widget* sender, const MWWorld::Ptr& item)
+    {
+        MWWorld::Ptr gem = *mGemIcon->getUserData<MWWorld::Ptr>();
+        if (!MWMechanics::rechargeItem(item, gem))
+            return;
 
-    updateView();
-}
+        updateView();
+    }
 
 }
diff --git a/apps/openmw/mwgui/recharge.hpp b/apps/openmw/mwgui/recharge.hpp
index 76852f3052..f7afde4571 100644
--- a/apps/openmw/mwgui/recharge.hpp
+++ b/apps/openmw/mwgui/recharge.hpp
@@ -13,44 +13,43 @@ namespace MWWorld
 namespace MWGui
 {
 
-class ItemSelectionDialog;
-class ItemWidget;
-class ItemChargeView;
+    class ItemSelectionDialog;
+    class ItemWidget;
+    class ItemChargeView;
 
-class Recharge : public WindowBase
-{
-public:
-    Recharge();
-
-    void onOpen() override;
+    class Recharge : public WindowBase
+    {
+    public:
+        Recharge();
 
-    void setPtr (const MWWorld::Ptr& gem) override;
+        void onOpen() override;
 
-protected:
-    ItemChargeView* mBox;
+        void setPtr(const MWWorld::Ptr& gem) override;
 
-    MyGUI::Widget* mGemBox;
+    protected:
+        ItemChargeView* mBox;
 
-    ItemWidget* mGemIcon;
+        MyGUI::Widget* mGemBox;
 
-    std::unique_ptr<ItemSelectionDialog> mItemSelectionDialog;
+        ItemWidget* mGemIcon;
 
-    MyGUI::TextBox* mChargeLabel;
+        std::unique_ptr<ItemSelectionDialog> mItemSelectionDialog;
 
-    MyGUI::Button* mCancelButton;
+        MyGUI::TextBox* mChargeLabel;
 
-    void updateView();
+        MyGUI::Button* mCancelButton;
 
-    void onSelectItem(MyGUI::Widget* sender);
+        void updateView();
 
-    void onItemSelected(MWWorld::Ptr item);
-    void onItemCancel();
+        void onSelectItem(MyGUI::Widget* sender);
 
-    void onItemClicked (MyGUI::Widget* sender, const MWWorld::Ptr& item);
-    void onCancel (MyGUI::Widget* sender);
-    void onMouseWheel(MyGUI::Widget* _sender, int _rel);
+        void onItemSelected(MWWorld::Ptr item);
+        void onItemCancel();
 
-};
+        void onItemClicked(MyGUI::Widget* sender, const MWWorld::Ptr& item);
+        void onCancel(MyGUI::Widget* sender);
+        void onMouseWheel(MyGUI::Widget* _sender, int _rel);
+    };
 
 }
 
diff --git a/apps/openmw/mwgui/referenceinterface.cpp b/apps/openmw/mwgui/referenceinterface.cpp
index 83221c4f4b..de7c93d862 100644
--- a/apps/openmw/mwgui/referenceinterface.cpp
+++ b/apps/openmw/mwgui/referenceinterface.cpp
@@ -2,13 +2,9 @@
 
 namespace MWGui
 {
-    ReferenceInterface::ReferenceInterface()
-    {
-    }
+    ReferenceInterface::ReferenceInterface() {}
 
-    ReferenceInterface::~ReferenceInterface()
-    {
-    }
+    ReferenceInterface::~ReferenceInterface() {}
 
     void ReferenceInterface::checkReferenceAvailable()
     {
diff --git a/apps/openmw/mwgui/referenceinterface.hpp b/apps/openmw/mwgui/referenceinterface.hpp
index 6428a5b540..e8b60693e4 100644
--- a/apps/openmw/mwgui/referenceinterface.hpp
+++ b/apps/openmw/mwgui/referenceinterface.hpp
@@ -8,7 +8,8 @@ namespace MWGui
     /// \brief this class is intended for GUI interfaces that access an MW-Reference
     /// for example dialogue window accesses an NPC, or Container window accesses a Container
     /// these classes have to be automatically closed if the reference becomes unavailable
-    /// make sure that checkReferenceAvailable() is called every frame and that onReferenceUnavailable() has been overridden
+    /// make sure that checkReferenceAvailable() is called every frame and that onReferenceUnavailable() has been
+    /// overridden
     class ReferenceInterface
     {
     public:
diff --git a/apps/openmw/mwgui/repair.cpp b/apps/openmw/mwgui/repair.cpp
index 9917e03f9b..e91435b0d1 100644
--- a/apps/openmw/mwgui/repair.cpp
+++ b/apps/openmw/mwgui/repair.cpp
@@ -6,146 +6,146 @@
 
 #include <components/widgets/box.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 
-#include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/containerstore.hpp"
 
+#include "inventoryitemmodel.hpp"
+#include "itemchargeview.hpp"
 #include "itemselection.hpp"
 #include "itemwidget.hpp"
-#include "itemchargeview.hpp"
 #include "sortfilteritemmodel.hpp"
-#include "inventoryitemmodel.hpp"
 
 namespace MWGui
 {
 
-Repair::Repair()
-    : WindowBase("openmw_repair.layout")
-{
-    getWidget(mRepairBox, "RepairBox");
-    getWidget(mToolBox, "ToolBox");
-    getWidget(mToolIcon, "ToolIcon");
-    getWidget(mUsesLabel, "UsesLabel");
-    getWidget(mQualityLabel, "QualityLabel");
-    getWidget(mCancelButton, "CancelButton");
+    Repair::Repair()
+        : WindowBase("openmw_repair.layout")
+    {
+        getWidget(mRepairBox, "RepairBox");
+        getWidget(mToolBox, "ToolBox");
+        getWidget(mToolIcon, "ToolIcon");
+        getWidget(mUsesLabel, "UsesLabel");
+        getWidget(mQualityLabel, "QualityLabel");
+        getWidget(mCancelButton, "CancelButton");
 
-    mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &Repair::onCancel);
+        mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &Repair::onCancel);
 
-    mRepairBox->eventItemClicked += MyGUI::newDelegate(this, &Repair::onRepairItem);
-    mRepairBox->setDisplayMode(ItemChargeView::DisplayMode_Health);
+        mRepairBox->eventItemClicked += MyGUI::newDelegate(this, &Repair::onRepairItem);
+        mRepairBox->setDisplayMode(ItemChargeView::DisplayMode_Health);
 
-    mToolIcon->eventMouseButtonClick += MyGUI::newDelegate(this, &Repair::onSelectItem);
-}
+        mToolIcon->eventMouseButtonClick += MyGUI::newDelegate(this, &Repair::onSelectItem);
+    }
 
-void Repair::onOpen()
-{
-    center();
+    void Repair::onOpen()
+    {
+        center();
 
-    SortFilterItemModel * model = new SortFilterItemModel(std::make_unique<InventoryItemModel>(MWMechanics::getPlayer()));
-    model->setFilter(SortFilterItemModel::Filter_OnlyRepairable);
-    mRepairBox->setModel(model);
+        SortFilterItemModel* model
+            = new SortFilterItemModel(std::make_unique<InventoryItemModel>(MWMechanics::getPlayer()));
+        model->setFilter(SortFilterItemModel::Filter_OnlyRepairable);
+        mRepairBox->setModel(model);
 
-    // Reset scrollbars
-    mRepairBox->resetScrollbars();
-}
+        // Reset scrollbars
+        mRepairBox->resetScrollbars();
+    }
 
-void Repair::setPtr(const MWWorld::Ptr &item)
-{
-    MWBase::Environment::get().getWindowManager()->playSound("Item Repair Up");
+    void Repair::setPtr(const MWWorld::Ptr& item)
+    {
+        MWBase::Environment::get().getWindowManager()->playSound("Item Repair Up");
 
-    mRepair.setTool(item);
+        mRepair.setTool(item);
 
-    mToolIcon->setItem(item);
-    mToolIcon->setUserString("ToolTipType", "ItemPtr");
-    mToolIcon->setUserData(MWWorld::Ptr(item));
+        mToolIcon->setItem(item);
+        mToolIcon->setUserString("ToolTipType", "ItemPtr");
+        mToolIcon->setUserData(MWWorld::Ptr(item));
 
-    updateRepairView();
-}
+        updateRepairView();
+    }
 
-void Repair::updateRepairView()
-{
-    MWWorld::LiveCellRef<ESM::Repair> *ref =
-        mRepair.getTool().get<ESM::Repair>();
+    void Repair::updateRepairView()
+    {
+        MWWorld::LiveCellRef<ESM::Repair>* ref = mRepair.getTool().get<ESM::Repair>();
 
-    int uses = mRepair.getTool().getClass().getItemHealth(mRepair.getTool());
+        int uses = mRepair.getTool().getClass().getItemHealth(mRepair.getTool());
 
-    float quality = ref->mBase->mData.mQuality;
+        float quality = ref->mBase->mData.mQuality;
 
-    mToolIcon->setUserData(mRepair.getTool());
+        mToolIcon->setUserData(mRepair.getTool());
 
-    std::stringstream qualityStr;
-    qualityStr << std::setprecision(3) << quality;
+        std::stringstream qualityStr;
+        qualityStr << std::setprecision(3) << quality;
 
-    mUsesLabel->setCaptionWithReplacing("#{sUses} " + MyGUI::utility::toString(uses));
-    mQualityLabel->setCaptionWithReplacing("#{sQuality} " + qualityStr.str());
+        mUsesLabel->setCaptionWithReplacing("#{sUses} " + MyGUI::utility::toString(uses));
+        mQualityLabel->setCaptionWithReplacing("#{sQuality} " + qualityStr.str());
 
-    bool toolBoxVisible = (mRepair.getTool().getRefData().getCount() != 0);
-    mToolBox->setVisible(toolBoxVisible);
-    mToolBox->setUserString("Hidden", toolBoxVisible ? "false" : "true");
+        bool toolBoxVisible = (mRepair.getTool().getRefData().getCount() != 0);
+        mToolBox->setVisible(toolBoxVisible);
+        mToolBox->setUserString("Hidden", toolBoxVisible ? "false" : "true");
 
-    if (!toolBoxVisible)
-    {
-        mToolIcon->setItem(MWWorld::Ptr());
-        mToolIcon->clearUserStrings();
-    }
+        if (!toolBoxVisible)
+        {
+            mToolIcon->setItem(MWWorld::Ptr());
+            mToolIcon->clearUserStrings();
+        }
 
-    mRepairBox->update();
+        mRepairBox->update();
 
-    Gui::Box* box = dynamic_cast<Gui::Box*>(mMainWidget);
-    if (box == nullptr)
-        throw std::runtime_error("main widget must be a box");
+        Gui::Box* box = dynamic_cast<Gui::Box*>(mMainWidget);
+        if (box == nullptr)
+            throw std::runtime_error("main widget must be a box");
 
-    box->notifyChildrenSizeChanged();
-    center();
-}
+        box->notifyChildrenSizeChanged();
+        center();
+    }
 
-void Repair::onSelectItem(MyGUI::Widget *sender)
-{
-    mItemSelectionDialog = std::make_unique<ItemSelectionDialog>("#{sRepair}");
-    mItemSelectionDialog->eventItemSelected += MyGUI::newDelegate(this, &Repair::onItemSelected);
-    mItemSelectionDialog->eventDialogCanceled += MyGUI::newDelegate(this, &Repair::onItemCancel);
-    mItemSelectionDialog->setVisible(true);
-    mItemSelectionDialog->openContainer(MWMechanics::getPlayer());
-    mItemSelectionDialog->setFilter(SortFilterItemModel::Filter_OnlyRepairTools);
-}
+    void Repair::onSelectItem(MyGUI::Widget* sender)
+    {
+        mItemSelectionDialog = std::make_unique<ItemSelectionDialog>("#{sRepair}");
+        mItemSelectionDialog->eventItemSelected += MyGUI::newDelegate(this, &Repair::onItemSelected);
+        mItemSelectionDialog->eventDialogCanceled += MyGUI::newDelegate(this, &Repair::onItemCancel);
+        mItemSelectionDialog->setVisible(true);
+        mItemSelectionDialog->openContainer(MWMechanics::getPlayer());
+        mItemSelectionDialog->setFilter(SortFilterItemModel::Filter_OnlyRepairTools);
+    }
 
-void Repair::onItemSelected(MWWorld::Ptr item)
-{
-    mItemSelectionDialog->setVisible(false);
+    void Repair::onItemSelected(MWWorld::Ptr item)
+    {
+        mItemSelectionDialog->setVisible(false);
 
-    mToolIcon->setItem(item);
-    mToolIcon->setUserString ("ToolTipType", "ItemPtr");
-    mToolIcon->setUserData(item);
+        mToolIcon->setItem(item);
+        mToolIcon->setUserString("ToolTipType", "ItemPtr");
+        mToolIcon->setUserData(item);
 
-    mRepair.setTool(item);
+        mRepair.setTool(item);
 
-    MWBase::Environment::get().getWindowManager()->playSound(item.getClass().getDownSoundId(item));
-    updateRepairView();
-}
+        MWBase::Environment::get().getWindowManager()->playSound(item.getClass().getDownSoundId(item));
+        updateRepairView();
+    }
 
-void Repair::onItemCancel()
-{
-    mItemSelectionDialog->setVisible(false);
-}
+    void Repair::onItemCancel()
+    {
+        mItemSelectionDialog->setVisible(false);
+    }
 
-void Repair::onCancel(MyGUI::Widget* /*sender*/)
-{
-    MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Repair);
-}
+    void Repair::onCancel(MyGUI::Widget* /*sender*/)
+    {
+        MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Repair);
+    }
 
-void Repair::onRepairItem(MyGUI::Widget* /*sender*/, const MWWorld::Ptr& ptr)
-{
-    if (!mRepair.getTool().getRefData().getCount())
-        return;
+    void Repair::onRepairItem(MyGUI::Widget* /*sender*/, const MWWorld::Ptr& ptr)
+    {
+        if (!mRepair.getTool().getRefData().getCount())
+            return;
 
-    mRepair.repair(ptr);
+        mRepair.repair(ptr);
 
-    updateRepairView();
-}
+        updateRepairView();
+    }
 
 }
diff --git a/apps/openmw/mwgui/repair.hpp b/apps/openmw/mwgui/repair.hpp
index 7d992939fc..db608d9b8b 100644
--- a/apps/openmw/mwgui/repair.hpp
+++ b/apps/openmw/mwgui/repair.hpp
@@ -10,46 +10,45 @@
 namespace MWGui
 {
 
-class ItemSelectionDialog;
-class ItemWidget;
-class ItemChargeView;
+    class ItemSelectionDialog;
+    class ItemWidget;
+    class ItemChargeView;
 
-class Repair : public WindowBase
-{
-public:
-    Repair();
-
-    void onOpen() override;
+    class Repair : public WindowBase
+    {
+    public:
+        Repair();
 
-    void setPtr (const MWWorld::Ptr& item) override;
+        void onOpen() override;
 
-protected:
-    ItemChargeView* mRepairBox;
+        void setPtr(const MWWorld::Ptr& item) override;
 
-    MyGUI::Widget* mToolBox;
+    protected:
+        ItemChargeView* mRepairBox;
 
-    ItemWidget* mToolIcon;
+        MyGUI::Widget* mToolBox;
 
-    std::unique_ptr<ItemSelectionDialog> mItemSelectionDialog;
+        ItemWidget* mToolIcon;
 
-    MyGUI::TextBox* mUsesLabel;
-    MyGUI::TextBox* mQualityLabel;
+        std::unique_ptr<ItemSelectionDialog> mItemSelectionDialog;
 
-    MyGUI::Button* mCancelButton;
+        MyGUI::TextBox* mUsesLabel;
+        MyGUI::TextBox* mQualityLabel;
 
-    MWMechanics::Repair mRepair;
+        MyGUI::Button* mCancelButton;
 
-    void updateRepairView();
+        MWMechanics::Repair mRepair;
 
-    void onSelectItem(MyGUI::Widget* sender);
+        void updateRepairView();
 
-    void onItemSelected(MWWorld::Ptr item);
-    void onItemCancel();
+        void onSelectItem(MyGUI::Widget* sender);
 
-    void onRepairItem(MyGUI::Widget* sender, const MWWorld::Ptr& ptr);
-    void onCancel(MyGUI::Widget* sender);
+        void onItemSelected(MWWorld::Ptr item);
+        void onItemCancel();
 
-};
+        void onRepairItem(MyGUI::Widget* sender, const MWWorld::Ptr& ptr);
+        void onCancel(MyGUI::Widget* sender);
+    };
 
 }
 
diff --git a/apps/openmw/mwgui/resourceskin.cpp b/apps/openmw/mwgui/resourceskin.cpp
index f549241a62..b71355c3e6 100644
--- a/apps/openmw/mwgui/resourceskin.cpp
+++ b/apps/openmw/mwgui/resourceskin.cpp
@@ -23,7 +23,7 @@ namespace MWGui
 
         MyGUI::IntCoord coord(0, 0, texture->getWidth(), texture->getHeight());
         MyGUI::xml::ElementEnumerator basis = _node->getElementEnumerator();
-        const std::string textureSize = std::to_string(coord.width) + " " +  std::to_string(coord.height);
+        const std::string textureSize = std::to_string(coord.width) + " " + std::to_string(coord.height);
         _node->addAttribute("size", textureSize);
         while (basis.next())
         {
diff --git a/apps/openmw/mwgui/resourceskin.hpp b/apps/openmw/mwgui/resourceskin.hpp
index fd1977e660..1b66c22fb2 100644
--- a/apps/openmw/mwgui/resourceskin.hpp
+++ b/apps/openmw/mwgui/resourceskin.hpp
@@ -7,7 +7,7 @@ namespace MWGui
 {
     class AutoSizedResourceSkin final : public MyGUI::ResourceSkin
     {
-        MYGUI_RTTI_DERIVED( AutoSizedResourceSkin )
+        MYGUI_RTTI_DERIVED(AutoSizedResourceSkin)
 
     public:
         void deserialization(MyGUI::xml::ElementPtr _node, MyGUI::Version _version) override;
diff --git a/apps/openmw/mwgui/review.cpp b/apps/openmw/mwgui/review.cpp
index 737efba65c..541c07287f 100644
--- a/apps/openmw/mwgui/review.cpp
+++ b/apps/openmw/mwgui/review.cpp
@@ -3,26 +3,26 @@
 #include <cmath>
 
 #include <MyGUI_Button.h>
-#include <MyGUI_ScrollView.h>
-#include <MyGUI_ImageBox.h>
 #include <MyGUI_Gui.h>
+#include <MyGUI_ImageBox.h>
+#include <MyGUI_ScrollView.h>
 
 #include <components/esm3/loadbsgn.hpp>
 #include <components/esm3/loadrace.hpp>
 #include <components/esm3/loadspel.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwworld/esmstore.hpp"
+#include "../mwbase/world.hpp"
 #include "../mwmechanics/autocalcspell.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include "tooltips.hpp"
 #include "ustring.hpp"
 
 namespace
 {
-    void adjustButtonSize(MyGUI::Button *button)
+    void adjustButtonSize(MyGUI::Button* button)
     {
         // adjust size of button to fit its text
         MyGUI::IntSize size = button->getTextSize();
@@ -33,8 +33,8 @@ namespace
 namespace MWGui
 {
     ReviewDialog::ReviewDialog()
-        : WindowModal("openmw_chargen_review.layout"),
-          mUpdateSkillArea(false)
+        : WindowModal("openmw_chargen_review.layout")
+        , mUpdateSkillArea(false)
     {
         // Centre dialog
         center();
@@ -92,7 +92,7 @@ namespace MWGui
         for (int i = 0; i < ESM::Skill::Length; ++i)
         {
             mSkillValues.insert(std::make_pair(i, MWMechanics::SkillValue()));
-            mSkillWidgetMap.insert(std::make_pair(i, static_cast<MyGUI::TextBox*> (nullptr)));
+            mSkillWidgetMap.insert(std::make_pair(i, static_cast<MyGUI::TextBox*>(nullptr)));
         }
 
         MyGUI::Button* backButton;
@@ -119,17 +119,16 @@ namespace MWGui
         }
     }
 
-    void ReviewDialog::setPlayerName(const std::string &name)
+    void ReviewDialog::setPlayerName(const std::string& name)
     {
         mNameWidget->setCaption(name);
     }
 
-    void ReviewDialog::setRace(const std::string &raceId)
+    void ReviewDialog::setRace(const std::string& raceId)
     {
         mRaceId = raceId;
 
-        const ESM::Race *race =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().search(mRaceId);
+        const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().search(mRaceId);
         if (race)
         {
             ToolTips::createRaceToolTip(mRaceWidget, race);
@@ -150,8 +149,8 @@ namespace MWGui
     {
         mBirthSignId = signId;
 
-        const ESM::BirthSign *sign =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::BirthSign>().search(mBirthSignId);
+        const ESM::BirthSign* sign
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::BirthSign>().search(mBirthSignId);
         if (sign)
         {
             mBirthSignWidget->setCaption(sign->mName);
@@ -167,7 +166,7 @@ namespace MWGui
         int modified = static_cast<int>(value.getModified());
 
         mHealth->setValue(current, modified);
-        std::string valStr =  MyGUI::utility::toString(current) + " / " + MyGUI::utility::toString(modified);
+        std::string valStr = MyGUI::utility::toString(current) + " / " + MyGUI::utility::toString(modified);
         mHealth->setUserString("Caption_HealthDescription", "#{sHealthDesc}\n" + valStr);
     }
 
@@ -177,7 +176,7 @@ namespace MWGui
         int modified = static_cast<int>(value.getModified());
 
         mMagicka->setValue(current, modified);
-        std::string valStr =  MyGUI::utility::toString(current) + " / " + MyGUI::utility::toString(modified);
+        std::string valStr = MyGUI::utility::toString(current) + " / " + MyGUI::utility::toString(modified);
         mMagicka->setUserString("Caption_HealthDescription", "#{sMagDesc}\n" + valStr);
     }
 
@@ -187,7 +186,7 @@ namespace MWGui
         int modified = static_cast<int>(value.getModified());
 
         mFatigue->setValue(current, modified);
-        std::string valStr =  MyGUI::utility::toString(current) + " / " + MyGUI::utility::toString(modified);
+        std::string valStr = MyGUI::utility::toString(current) + " / " + MyGUI::utility::toString(modified);
         mFatigue->setUserString("Caption_HealthDescription", "#{sFatDesc}\n" + valStr);
     }
 
@@ -244,9 +243,10 @@ namespace MWGui
         mUpdateSkillArea = true;
     }
 
-    void ReviewDialog::addSeparator(MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
+    void ReviewDialog::addSeparator(MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2)
     {
-        MyGUI::ImageBox* separator = mSkillView->createWidget<MyGUI::ImageBox>("MW_HLine", MyGUI::IntCoord(10, coord1.top, coord1.width + coord2.width - 4, 18), MyGUI::Align::Default);
+        MyGUI::ImageBox* separator = mSkillView->createWidget<MyGUI::ImageBox>(
+            "MW_HLine", MyGUI::IntCoord(10, coord1.top, coord1.width + coord2.width - 4, 18), MyGUI::Align::Default);
         separator->eventMouseWheel += MyGUI::newDelegate(this, &ReviewDialog::onMouseWheel);
 
         mSkillWidgets.push_back(separator);
@@ -257,7 +257,8 @@ namespace MWGui
 
     void ReviewDialog::addGroup(std::string_view label, MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2)
     {
-        MyGUI::TextBox* groupWidget = mSkillView->createWidget<MyGUI::TextBox>("SandBrightText", MyGUI::IntCoord(0, coord1.top, coord1.width + coord2.width, coord1.height), MyGUI::Align::Default);
+        MyGUI::TextBox* groupWidget = mSkillView->createWidget<MyGUI::TextBox>("SandBrightText",
+            MyGUI::IntCoord(0, coord1.top, coord1.width + coord2.width, coord1.height), MyGUI::Align::Default);
         groupWidget->eventMouseWheel += MyGUI::newDelegate(this, &ReviewDialog::onMouseWheel);
         groupWidget->setCaption(toUString(label));
         mSkillWidgets.push_back(groupWidget);
@@ -267,7 +268,8 @@ namespace MWGui
         coord2.top += lineHeight;
     }
 
-    MyGUI::TextBox* ReviewDialog::addValueItem(std::string_view text, const std::string& value, const std::string& state, MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2)
+    MyGUI::TextBox* ReviewDialog::addValueItem(std::string_view text, const std::string& value,
+        const std::string& state, MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2)
     {
         MyGUI::TextBox* skillNameWidget;
         MyGUI::TextBox* skillValueWidget;
@@ -291,11 +293,12 @@ namespace MWGui
         return skillValueWidget;
     }
 
-    void ReviewDialog::addItem(const std::string& text, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
+    void ReviewDialog::addItem(const std::string& text, MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2)
     {
         MyGUI::TextBox* skillNameWidget;
 
-        skillNameWidget = mSkillView->createWidget<MyGUI::TextBox>("SandText", coord1 + MyGUI::IntSize(coord2.width, 0), MyGUI::Align::Default);
+        skillNameWidget = mSkillView->createWidget<MyGUI::TextBox>(
+            "SandText", coord1 + MyGUI::IntSize(coord2.width, 0), MyGUI::Align::Default);
         skillNameWidget->setCaption(text);
         skillNameWidget->eventMouseWheel += MyGUI::newDelegate(this, &ReviewDialog::onMouseWheel);
 
@@ -308,7 +311,8 @@ namespace MWGui
 
     void ReviewDialog::addItem(const ESM::Spell* spell, MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2)
     {
-        Widgets::MWSpellPtr widget = mSkillView->createWidget<Widgets::MWSpell>("MW_StatName", coord1 + MyGUI::IntSize(coord2.width, 0), MyGUI::Align::Default);
+        Widgets::MWSpellPtr widget = mSkillView->createWidget<Widgets::MWSpell>(
+            "MW_StatName", coord1 + MyGUI::IntSize(coord2.width, 0), MyGUI::Align::Default);
         widget->setSpellId(spell->mId);
         widget->setUserString("ToolTipType", "Spell");
         widget->setUserString("Spell", spell->mId);
@@ -321,7 +325,8 @@ namespace MWGui
         coord2.top += lineHeight;
     }
 
-    void ReviewDialog::addSkills(const SkillList &skills, const std::string &titleId, const std::string &titleDefault, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
+    void ReviewDialog::addSkills(const SkillList& skills, const std::string& titleId, const std::string& titleDefault,
+        MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2)
     {
         // Add a line separator if there are items above
         if (!mSkillWidgets.empty())
@@ -329,15 +334,16 @@ namespace MWGui
             addSeparator(coord1, coord2);
         }
 
-        addGroup(MWBase::Environment::get().getWindowManager()->getGameSettingString(titleId, titleDefault), coord1, coord2);
+        addGroup(
+            MWBase::Environment::get().getWindowManager()->getGameSettingString(titleId, titleDefault), coord1, coord2);
 
         for (const int& skillId : skills)
         {
             if (skillId < 0 || skillId >= ESM::Skill::Length) // Skip unknown skill indexes
                 continue;
             assert(skillId >= 0 && skillId < ESM::Skill::Length);
-            const std::string &skillNameId = ESM::Skill::sSkillNameIds[skillId];
-            const MWMechanics::SkillValue &stat = mSkillValues.find(skillId)->second;
+            const std::string& skillNameId = ESM::Skill::sSkillNameIds[skillId];
+            const MWMechanics::SkillValue& stat = mSkillValues.find(skillId)->second;
             int base = stat.getBase();
             int modified = stat.getModified();
 
@@ -346,11 +352,13 @@ namespace MWGui
                 state = "increased";
             else if (modified < base)
                 state = "decreased";
-            MyGUI::TextBox* widget = addValueItem(MWBase::Environment::get().getWindowManager()->getGameSettingString(skillNameId, skillNameId), MyGUI::utility::toString(static_cast<int>(modified)), state, coord1, coord2);
+            MyGUI::TextBox* widget = addValueItem(
+                MWBase::Environment::get().getWindowManager()->getGameSettingString(skillNameId, skillNameId),
+                MyGUI::utility::toString(static_cast<int>(modified)), state, coord1, coord2);
 
-            for (int i=0; i<2; ++i)
+            for (int i = 0; i < 2; ++i)
             {
-                ToolTips::createSkillToolTip(mSkillWidgets[mSkillWidgets.size()-1-i], skillId);
+                ToolTips::createSkillToolTip(mSkillWidgets[mSkillWidgets.size() - 1 - i], skillId);
             }
 
             mSkillWidgetMap[skillId] = widget;
@@ -386,11 +394,11 @@ namespace MWGui
             race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(mRaceId);
 
         int skills[ESM::Skill::Length];
-        for (int i=0; i<ESM::Skill::Length; ++i)
+        for (int i = 0; i < ESM::Skill::Length; ++i)
             skills[i] = mSkillValues.find(i)->second.getBase();
 
         int attributes[ESM::Attribute::Length];
-        for (int i=0; i<ESM::Attribute::Length; ++i)
+        for (int i = 0; i < ESM::Attribute::Length; ++i)
             attributes[i] = mAttributeWidgets[i]->getAttributeValue().getBase();
 
         std::vector<std::string> selectedSpells = MWMechanics::autoCalcPlayerSpells(skills, attributes, race);
@@ -413,7 +421,8 @@ namespace MWGui
 
         if (!mBirthSignId.empty())
         {
-            const ESM::BirthSign* sign = MWBase::Environment::get().getWorld()->getStore().get<ESM::BirthSign>().find(mBirthSignId);
+            const ESM::BirthSign* sign
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::BirthSign>().find(mBirthSignId);
             for (const std::string& spellId : sign->mPowers.mList)
             {
                 std::string lower = Misc::StringUtils::lowerCase(spellId);
@@ -424,7 +433,8 @@ namespace MWGui
 
         if (!mSkillWidgets.empty())
             addSeparator(coord1, coord2);
-        addGroup(MWBase::Environment::get().getWindowManager()->getGameSettingString("sTypeAbility", "Abilities"), coord1, coord2);
+        addGroup(MWBase::Environment::get().getWindowManager()->getGameSettingString("sTypeAbility", "Abilities"),
+            coord1, coord2);
         for (std::string& spellId : spells)
         {
             const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(spellId);
@@ -433,7 +443,8 @@ namespace MWGui
         }
 
         addSeparator(coord1, coord2);
-        addGroup(MWBase::Environment::get().getWindowManager()->getGameSettingString("sTypePower", "Powers"), coord1, coord2);
+        addGroup(MWBase::Environment::get().getWindowManager()->getGameSettingString("sTypePower", "Powers"), coord1,
+            coord2);
         for (std::string& spellId : spells)
         {
             const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(spellId);
@@ -442,7 +453,8 @@ namespace MWGui
         }
 
         addSeparator(coord1, coord2);
-        addGroup(MWBase::Environment::get().getWindowManager()->getGameSettingString("sTypeSpell", "Spells"), coord1, coord2);
+        addGroup(MWBase::Environment::get().getWindowManager()->getGameSettingString("sTypeSpell", "Spells"), coord1,
+            coord2);
         for (std::string& spellId : spells)
         {
             const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(spellId);
@@ -450,9 +462,10 @@ namespace MWGui
                 addItem(spell, coord1, coord2);
         }
 
-        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the scrollbar is hidden
+        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the
+        // scrollbar is hidden
         mSkillView->setVisibleVScroll(false);
-        mSkillView->setCanvasSize (mSkillView->getWidth(), std::max(mSkillView->getHeight(), coord1.top));
+        mSkillView->setCanvasSize(mSkillView->getWidth(), std::max(mSkillView->getHeight(), coord1.top));
         mSkillView->setVisibleVScroll(true);
     }
 
@@ -490,10 +503,11 @@ namespace MWGui
 
     void ReviewDialog::onMouseWheel(MyGUI::Widget* _sender, int _rel)
     {
-        if (mSkillView->getViewOffset().top + _rel*0.3 > 0)
+        if (mSkillView->getViewOffset().top + _rel * 0.3 > 0)
             mSkillView->setViewOffset(MyGUI::IntPoint(0, 0));
         else
-            mSkillView->setViewOffset(MyGUI::IntPoint(0, static_cast<int>(mSkillView->getViewOffset().top + _rel*0.3)));
+            mSkillView->setViewOffset(
+                MyGUI::IntPoint(0, static_cast<int>(mSkillView->getViewOffset().top + _rel * 0.3)));
     }
 
 }
diff --git a/apps/openmw/mwgui/review.hpp b/apps/openmw/mwgui/review.hpp
index 59a5daecac..913c825217 100644
--- a/apps/openmw/mwgui/review.hpp
+++ b/apps/openmw/mwgui/review.hpp
@@ -1,10 +1,10 @@
 #ifndef MWGUI_REVIEW_H
 #define MWGUI_REVIEW_H
 
+#include "widgets.hpp"
+#include "windowbase.hpp"
 #include <components/esm/attr.hpp>
 #include <components/esm3/loadclas.hpp>
-#include "windowbase.hpp"
-#include "widgets.hpp"
 
 namespace ESM
 {
@@ -16,7 +16,8 @@ namespace MWGui
     class ReviewDialog : public WindowModal
     {
     public:
-        enum Dialogs {
+        enum Dialogs
+        {
             NAME_DIALOG,
             RACE_DIALOG,
             CLASS_DIALOG,
@@ -28,10 +29,10 @@ namespace MWGui
 
         bool exit() override { return false; }
 
-        void setPlayerName(const std::string &name);
-        void setRace(const std::string &raceId);
+        void setPlayerName(const std::string& name);
+        void setRace(const std::string& raceId);
         void setClass(const ESM::Class& class_);
-        void setBirthSign (const std::string &signId);
+        void setBirthSign(const std::string& signId);
 
         void setHealth(const MWMechanics::DynamicStat<float>& value);
         void setMagicka(const MWMechanics::DynamicStat<float>& value);
@@ -74,12 +75,14 @@ namespace MWGui
         void onMouseWheel(MyGUI::Widget* _sender, int _rel);
 
     private:
-        void addSkills(const SkillList &skills, const std::string &titleId, const std::string &titleDefault, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
-        void addSeparator(MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
+        void addSkills(const SkillList& skills, const std::string& titleId, const std::string& titleDefault,
+            MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2);
+        void addSeparator(MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2);
         void addGroup(std::string_view label, MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2);
-        MyGUI::TextBox* addValueItem(std::string_view text, const std::string& value, const std::string& state, MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2);
-        void addItem(const std::string& text, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
-        void addItem(const ESM::Spell* spell, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
+        MyGUI::TextBox* addValueItem(std::string_view text, const std::string& value, const std::string& state,
+            MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2);
+        void addItem(const std::string& text, MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2);
+        void addItem(const ESM::Spell* spell, MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2);
         void updateSkillArea();
 
         MyGUI::TextBox *mNameWidget, *mRaceWidget, *mClassWidget, *mBirthSignWidget;
@@ -90,7 +93,7 @@ namespace MWGui
         std::map<int, Widgets::MWAttributePtr> mAttributeWidgets;
 
         SkillList mMajorSkills, mMinorSkills, mMiscSkills;
-        std::map<int, MWMechanics::SkillValue > mSkillValues;
+        std::map<int, MWMechanics::SkillValue> mSkillValues;
         std::map<int, MyGUI::TextBox*> mSkillWidgetMap;
         std::string mName, mRaceId, mBirthSignId;
         ESM::Class mKlass;
diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp
index 8da5047efd..c2bfbf682e 100644
--- a/apps/openmw/mwgui/savegamedialog.cpp
+++ b/apps/openmw/mwgui/savegamedialog.cpp
@@ -1,15 +1,15 @@
 #include "savegamedialog.hpp"
 
-#include <sstream>
 #include <iomanip>
+#include <sstream>
 
 #include <MyGUI_ComboBox.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_InputManager.h>
 #include <MyGUI_LanguageManager.h>
 
-#include <osgDB/ReadFile>
 #include <osg/Texture2D>
+#include <osgDB/ReadFile>
 
 #include <components/debug/debuglog.hpp>
 
@@ -19,16 +19,16 @@
 
 #include <components/settings/settings.hpp>
 
+#include <components/files/conversion.hpp>
 #include <components/files/memorystream.hpp>
 #include <components/misc/timeconvert.hpp>
-#include <components/files/conversion.hpp>
 
 #include <components/esm3/loadclas.hpp>
 
-#include "../mwbase/statemanager.hpp"
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
+#include "../mwbase/statemanager.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 #include "../mwworld/esmstore.hpp"
 
 #include "../mwstate/character.hpp"
@@ -68,7 +68,7 @@ namespace MWGui
         mDeleteButton->setNeedKeyFocus(false);
     }
 
-    void SaveGameDialog::onSlotActivated(MyGUI::ListBox *sender, size_t pos)
+    void SaveGameDialog::onSlotActivated(MyGUI::ListBox* sender, size_t pos)
     {
         onSlotSelected(sender, pos);
         accept();
@@ -94,7 +94,7 @@ namespace MWGui
 
     void SaveGameDialog::onDeleteSlotConfirmed()
     {
-        MWBase::Environment::get().getStateManager()->deleteGame (mCurrentCharacter, mCurrentSlot);
+        MWBase::Environment::get().getStateManager()->deleteGame(mCurrentCharacter, mCurrentSlot);
         mSaveList->removeItemAt(mSaveList->getIndexSelected());
         onSlotSelected(mSaveList, mSaveList->getIndexSelected());
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mSaveList);
@@ -106,7 +106,7 @@ namespace MWGui
             mCharacterSelection->removeItemAt(previousIndex);
             if (mCharacterSelection->getItemCount())
             {
-                size_t nextCharacter = std::min(previousIndex, mCharacterSelection->getItemCount()-1);
+                size_t nextCharacter = std::min(previousIndex, mCharacterSelection->getItemCount() - 1);
                 mCharacterSelection->setIndexSelected(nextCharacter);
                 onCharacterSelected(mCharacterSelection, nextCharacter);
             }
@@ -120,14 +120,14 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mSaveList);
     }
 
-    void SaveGameDialog::onSaveNameChanged(MyGUI::EditBox *sender)
+    void SaveGameDialog::onSaveNameChanged(MyGUI::EditBox* sender)
     {
         // This might have previously been a save slot from the list. If so, that is no longer the case
         mSaveList->setIndexSelected(MyGUI::ITEM_NONE);
         onSlotSelected(mSaveList, MyGUI::ITEM_NONE);
     }
 
-    void SaveGameDialog::onEditSelectAccept(MyGUI::EditBox *sender)
+    void SaveGameDialog::onEditSelectAccept(MyGUI::EditBox* sender)
     {
         accept();
 
@@ -146,7 +146,7 @@ namespace MWGui
     {
         WindowModal::onOpen();
 
-        mSaveNameEdit->setCaption ("");
+        mSaveNameEdit->setCaption("");
         if (mSaving)
             MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mSaveNameEdit);
         else
@@ -167,14 +167,13 @@ namespace MWGui
 
         mCurrentCharacter = mgr->getCurrentCharacter();
 
-        std::string directory =
-            Misc::StringUtils::lowerCase (Settings::Manager::getString ("character", "Saves"));
+        std::string directory = Misc::StringUtils::lowerCase(Settings::Manager::getString("character", "Saves"));
 
         size_t selectedIndex = MyGUI::ITEM_NONE;
 
         for (MWBase::StateManager::CharacterIterator it = mgr->characterBegin(); it != mgr->characterEnd(); ++it)
         {
-            if (it->begin()!=it->end())
+            if (it->begin() != it->end())
             {
                 const ESM::SavedGame& signature = it->getSignature();
 
@@ -189,24 +188,28 @@ namespace MWGui
                 else
                 {
                     // Find the localised name for this class from the store
-                    const ESM::Class* class_ = MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>()
-                            .search(signature.mPlayerClassId);
+                    const ESM::Class* class_
+                        = MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().search(
+                            signature.mPlayerClassId);
                     if (class_)
                         className = class_->mName;
                     else
                         className = "?"; // From an older savegame format that did not support custom classes properly.
                 }
 
-                title << " (#{sLevel} " << signature.mPlayerLevel << " " << MyGUI::TextIterator::toTagsString(toUString(className)) << ")";
+                title << " (#{sLevel} " << signature.mPlayerLevel << " "
+                      << MyGUI::TextIterator::toTagsString(toUString(className)) << ")";
 
-                mCharacterSelection->addItem (MyGUI::LanguageManager::getInstance().replaceTags(title.str()));
+                mCharacterSelection->addItem(MyGUI::LanguageManager::getInstance().replaceTags(title.str()));
 
-                if (mCurrentCharacter == &*it ||
-                    (!mCurrentCharacter && !mSaving && directory==Misc::StringUtils::lowerCase (
-                    Files::pathToUnicodeString(it->begin()->mPath.parent_path().filename()))))
+                if (mCurrentCharacter == &*it
+                    || (!mCurrentCharacter && !mSaving
+                        && directory
+                            == Misc::StringUtils::lowerCase(
+                                Files::pathToUnicodeString(it->begin()->mPath.parent_path().filename()))))
                 {
                     mCurrentCharacter = &*it;
-                    selectedIndex = mCharacterSelection->getItemCount()-1;
+                    selectedIndex = mCharacterSelection->getItemCount() - 1;
                 }
             }
         }
@@ -216,7 +219,6 @@ namespace MWGui
             mCharacterSelection->setCaptionWithReplacing("#{SavegameMenu:SelectCharacter}");
 
         fillSaveList();
-
     }
 
     void SaveGameDialog::setLoadOrSave(bool load)
@@ -237,12 +239,12 @@ namespace MWGui
         center();
     }
 
-    void SaveGameDialog::onCancelButtonClicked(MyGUI::Widget *sender)
+    void SaveGameDialog::onCancelButtonClicked(MyGUI::Widget* sender)
     {
         setVisible(false);
     }
 
-    void SaveGameDialog::onDeleteButtonClicked(MyGUI::Widget *sender)
+    void SaveGameDialog::onDeleteButtonClicked(MyGUI::Widget* sender)
     {
         if (mCurrentSlot)
             confirmDeleteSave();
@@ -297,16 +299,16 @@ namespace MWGui
         }
 
         setVisible(false);
-        MWBase::Environment::get().getWindowManager()->removeGuiMode (MWGui::GM_MainMenu);
+        MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_MainMenu);
 
         if (mSaving)
         {
-            MWBase::Environment::get().getStateManager()->saveGame (mSaveNameEdit->getCaption(), mCurrentSlot);
+            MWBase::Environment::get().getStateManager()->saveGame(mSaveNameEdit->getCaption(), mCurrentSlot);
         }
         else
         {
-            assert (mCurrentCharacter && mCurrentSlot);
-            MWBase::Environment::get().getStateManager()->loadGame (mCurrentCharacter, mCurrentSlot->mPath);
+            assert(mCurrentCharacter && mCurrentSlot);
+            MWBase::Environment::get().getStateManager()->loadGame(mCurrentCharacter, mCurrentSlot->mPath);
         }
     }
 
@@ -316,16 +318,16 @@ namespace MWGui
             confirmDeleteSave();
     }
 
-    void SaveGameDialog::onOkButtonClicked(MyGUI::Widget *sender)
+    void SaveGameDialog::onOkButtonClicked(MyGUI::Widget* sender)
     {
         accept();
     }
 
-    void SaveGameDialog::onCharacterSelected(MyGUI::ComboBox *sender, size_t pos)
+    void SaveGameDialog::onCharacterSelected(MyGUI::ComboBox* sender, size_t pos)
     {
         MWBase::StateManager* mgr = MWBase::Environment::get().getStateManager();
 
-        unsigned int i=0;
+        unsigned int i = 0;
         const MWState::Character* character = nullptr;
         for (MWBase::StateManager::CharacterIterator it = mgr->characterBegin(); it != mgr->characterEnd(); ++it, ++i)
         {
@@ -380,7 +382,7 @@ namespace MWGui
         return stream.str();
     }
 
-    void SaveGameDialog::onSlotSelected(MyGUI::ListBox *sender, size_t pos)
+    void SaveGameDialog::onSlotSelected(MyGUI::ListBox* sender, size_t pos)
     {
         mOkButton->setEnabled(pos != MyGUI::ITEM_NONE || mSaving);
         mDeleteButton->setEnabled(pos != MyGUI::ITEM_NONE);
@@ -397,8 +399,9 @@ namespace MWGui
             mSaveNameEdit->setCaption(sender->getItemNameAt(pos));
 
         mCurrentSlot = nullptr;
-        unsigned int i=0;
-        for (MWState::Character::SlotIterator it = mCurrentCharacter->begin(); it != mCurrentCharacter->end(); ++it, ++i)
+        unsigned int i = 0;
+        for (MWState::Character::SlotIterator it = mCurrentCharacter->begin(); it != mCurrentCharacter->end();
+             ++it, ++i)
         {
             if (i == pos)
                 mCurrentSlot = &*it;
@@ -418,17 +421,19 @@ namespace MWGui
 
         int hour = int(mCurrentSlot->mProfile.mInGameTime.mGameHour);
         bool pm = hour >= 12;
-        if (hour >= 13) hour -= 12;
-        if (hour == 0) hour = 12;
+        if (hour >= 13)
+            hour -= 12;
+        if (hour == 0)
+            hour = 12;
 
-        text
-            << mCurrentSlot->mProfile.mInGameTime.mDay << " "
-            << MWBase::Environment::get().getWorld()->getMonthName(mCurrentSlot->mProfile.mInGameTime.mMonth)
-            <<  " " << hour << " " << (pm ? "#{sSaveMenuHelp05}" : "#{sSaveMenuHelp04}");
+        text << mCurrentSlot->mProfile.mInGameTime.mDay << " "
+             << MWBase::Environment::get().getWorld()->getMonthName(mCurrentSlot->mProfile.mInGameTime.mMonth) << " "
+             << hour << " " << (pm ? "#{sSaveMenuHelp05}" : "#{sSaveMenuHelp04}");
 
-        if (Settings::Manager::getBool("timeplayed","Saves"))
+        if (Settings::Manager::getBool("timeplayed", "Saves"))
         {
-            text << "\n" << "#{SavegameMenu:TimePlayed}: " << formatTimeplayed(mCurrentSlot->mProfile.mTimePlayed);
+            text << "\n"
+                 << "#{SavegameMenu:TimePlayed}: " << formatTimeplayed(mCurrentSlot->mProfile.mTimePlayed);
         }
 
         mInfoText->setCaptionWithReplacing(text.str());
@@ -442,11 +447,12 @@ namespace MWGui
         const std::vector<char>& data = mCurrentSlot->mProfile.mScreenshot;
         if (!data.size())
         {
-            Log(Debug::Warning) << "Selected save file '" << Files::pathToUnicodeString(mCurrentSlot->mPath.filename()) << "' has no savegame screenshot";
+            Log(Debug::Warning) << "Selected save file '" << Files::pathToUnicodeString(mCurrentSlot->mPath.filename())
+                                << "' has no savegame screenshot";
             return;
         }
 
-        Files::IMemStream instream (data.data(), data.size());
+        Files::IMemStream instream(data.data(), data.size());
 
         osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension("jpg");
         if (!readerwriter)
@@ -458,11 +464,12 @@ namespace MWGui
         osgDB::ReaderWriter::ReadResult result = readerwriter->readImage(instream);
         if (!result.success())
         {
-            Log(Debug::Error) << "Failed to read savegame screenshot: " << result.message() << " code " << result.status();
+            Log(Debug::Error) << "Failed to read savegame screenshot: " << result.message() << " code "
+                              << result.status();
             return;
         }
 
-        osg::ref_ptr<osg::Texture2D> texture (new osg::Texture2D);
+        osg::ref_ptr<osg::Texture2D> texture(new osg::Texture2D);
         texture->setImage(result.getImage());
         texture->setInternalFormat(GL_RGB);
         texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
diff --git a/apps/openmw/mwgui/savegamedialog.hpp b/apps/openmw/mwgui/savegamedialog.hpp
index 86d4ade8ac..35e65fbed0 100644
--- a/apps/openmw/mwgui/savegamedialog.hpp
+++ b/apps/openmw/mwgui/savegamedialog.hpp
@@ -28,27 +28,27 @@ namespace MWGui
         void confirmDeleteSave();
 
         void onKeyButtonPressed(MyGUI::Widget* _sender, MyGUI::KeyCode key, MyGUI::Char character);
-        void onCancelButtonClicked (MyGUI::Widget* sender);
-        void onOkButtonClicked (MyGUI::Widget* sender);
-        void onDeleteButtonClicked (MyGUI::Widget* sender);
-        void onCharacterSelected (MyGUI::ComboBox* sender, size_t pos);
+        void onCancelButtonClicked(MyGUI::Widget* sender);
+        void onOkButtonClicked(MyGUI::Widget* sender);
+        void onDeleteButtonClicked(MyGUI::Widget* sender);
+        void onCharacterSelected(MyGUI::ComboBox* sender, size_t pos);
         void onCharacterAccept(MyGUI::ComboBox* sender, size_t pos);
         // Slot selected (mouse click or arrow keys)
-        void onSlotSelected (MyGUI::ListBox* sender, size_t pos);
+        void onSlotSelected(MyGUI::ListBox* sender, size_t pos);
         // Slot activated (double click or enter key)
-        void onSlotActivated (MyGUI::ListBox* sender, size_t pos);
+        void onSlotActivated(MyGUI::ListBox* sender, size_t pos);
         // Slot clicked with mouse
         void onSlotMouseClick(MyGUI::ListBox* sender, size_t pos);
 
         void onDeleteSlotConfirmed();
         void onDeleteSlotCancel();
 
-        void onEditSelectAccept (MyGUI::EditBox* sender);
-        void onSaveNameChanged (MyGUI::EditBox* sender);
+        void onEditSelectAccept(MyGUI::EditBox* sender);
+        void onSaveNameChanged(MyGUI::EditBox* sender);
         void onConfirmationGiven();
         void onConfirmationCancel();
 
-        void accept(bool reallySure=false);
+        void accept(bool reallySure = false);
 
         void fillSaveList();
 
@@ -66,7 +66,6 @@ namespace MWGui
 
         const MWState::Character* mCurrentCharacter;
         const MWState::Slot* mCurrentSlot;
-
     };
 
 }
diff --git a/apps/openmw/mwgui/screenfader.cpp b/apps/openmw/mwgui/screenfader.cpp
index aa47d0821c..e22517a360 100644
--- a/apps/openmw/mwgui/screenfader.cpp
+++ b/apps/openmw/mwgui/screenfader.cpp
@@ -1,19 +1,19 @@
 #include "screenfader.hpp"
 
-#include <MyGUI_ImageBox.h>
 #include <MyGUI_Gui.h>
+#include <MyGUI_ImageBox.h>
 
 namespace MWGui
 {
 
-    FadeOp::FadeOp(ScreenFader * fader, float time, float targetAlpha, float delay)
-        : mFader(fader),
-          mRemainingTime(time+delay),
-          mTargetTime(time),
-          mTargetAlpha(targetAlpha),
-          mStartAlpha(0.f),
-          mDelay(delay),
-          mRunning(false)
+    FadeOp::FadeOp(ScreenFader* fader, float time, float targetAlpha, float delay)
+        : mFader(fader)
+        , mRemainingTime(time + delay)
+        , mTargetTime(time)
+        , mTargetAlpha(targetAlpha)
+        , mStartAlpha(0.f)
+        , mDelay(delay)
+        , mRunning(false)
     {
     }
 
@@ -60,13 +60,13 @@ namespace MWGui
         float currentAlpha = mFader->getCurrentAlpha();
         if (mStartAlpha > mTargetAlpha)
         {
-            currentAlpha -= dt/mTargetTime * (mStartAlpha-mTargetAlpha);
+            currentAlpha -= dt / mTargetTime * (mStartAlpha - mTargetAlpha);
             if (currentAlpha < mTargetAlpha)
                 currentAlpha = mTargetAlpha;
         }
         else
         {
-            currentAlpha += dt/mTargetTime * (mTargetAlpha-mStartAlpha);
+            currentAlpha += dt / mTargetTime * (mTargetAlpha - mStartAlpha);
             if (currentAlpha > mTargetAlpha)
                 currentAlpha = mTargetAlpha;
         }
@@ -82,7 +82,8 @@ namespace MWGui
         mFader->notifyOperationFinished();
     }
 
-    ScreenFader::ScreenFader(const std::string & texturePath, const std::string& layout, const MyGUI::FloatCoord& texCoordOverride)
+    ScreenFader::ScreenFader(
+        const std::string& texturePath, const std::string& layout, const MyGUI::FloatCoord& texCoordOverride)
         : WindowBase(layout)
         , mCurrentAlpha(0.f)
         , mFactor(1.f)
@@ -95,10 +96,9 @@ namespace MWGui
         {
             imageBox->setImageTexture(texturePath);
             const MyGUI::IntSize imageSize = imageBox->getImageSize();
-            imageBox->setImageCoord(MyGUI::IntCoord(texCoordOverride.left * imageSize.width,
-                                                    texCoordOverride.top * imageSize.height,
-                                                    texCoordOverride.width * imageSize.width,
-                                                    texCoordOverride.height * imageSize.height));
+            imageBox->setImageCoord(
+                MyGUI::IntCoord(texCoordOverride.left * imageSize.width, texCoordOverride.top * imageSize.height,
+                    texCoordOverride.width * imageSize.width, texCoordOverride.height * imageSize.height));
         }
     }
 
@@ -108,7 +108,7 @@ namespace MWGui
         {
             MyGUI::Gui::getInstance().eventFrameStart -= MyGUI::newDelegate(this, &ScreenFader::onFrameStart);
         }
-        catch(const MyGUI::Exception& e)
+        catch (const MyGUI::Exception& e)
         {
             Log(Debug::Error) << "Error in the destructor: " << e.what();
         }
@@ -127,7 +127,7 @@ namespace MWGui
     void ScreenFader::applyAlpha()
     {
         setVisible(true);
-        mMainWidget->setAlpha(1.f-((1.f-mCurrentAlpha) * mFactor));
+        mMainWidget->setAlpha(1.f - ((1.f - mCurrentAlpha) * mFactor));
     }
 
     void ScreenFader::fadeIn(float time, float delay)
@@ -142,7 +142,7 @@ namespace MWGui
 
     void ScreenFader::fadeTo(const int percent, const float time, float delay)
     {
-        queue(time, percent/100.f, delay);
+        queue(time, percent / 100.f, delay);
     }
 
     void ScreenFader::clear()
@@ -194,7 +194,7 @@ namespace MWGui
 
         mCurrentAlpha = alpha;
 
-        if (1.f-((1.f-mCurrentAlpha) * mFactor) == 0.f)
+        if (1.f - ((1.f - mCurrentAlpha) * mFactor) == 0.f)
             mMainWidget->setVisible(false);
         else
             applyAlpha();
diff --git a/apps/openmw/mwgui/screenfader.hpp b/apps/openmw/mwgui/screenfader.hpp
index 8eb8a68591..4ef1ae2f43 100644
--- a/apps/openmw/mwgui/screenfader.hpp
+++ b/apps/openmw/mwgui/screenfader.hpp
@@ -15,7 +15,7 @@ namespace MWGui
     public:
         typedef std::shared_ptr<FadeOp> Ptr;
 
-        FadeOp(ScreenFader * fader, float time, float targetAlpha, float delay);
+        FadeOp(ScreenFader* fader, float time, float targetAlpha, float delay);
 
         bool isRunning();
 
@@ -24,7 +24,7 @@ namespace MWGui
         void finish();
 
     private:
-        ScreenFader * mFader;
+        ScreenFader* mFader;
         float mRemainingTime;
         float mTargetTime;
         float mTargetAlpha;
@@ -36,18 +36,19 @@ namespace MWGui
     class ScreenFader : public WindowBase
     {
     public:
-        ScreenFader(const std::string & texturePath, const std::string& layout = "openmw_screen_fader.layout", const MyGUI::FloatCoord& texCoordOverride = MyGUI::FloatCoord(0,0,1,1));
+        ScreenFader(const std::string& texturePath, const std::string& layout = "openmw_screen_fader.layout",
+            const MyGUI::FloatCoord& texCoordOverride = MyGUI::FloatCoord(0, 0, 1, 1));
         ~ScreenFader();
 
         void onFrameStart(float dt);
 
-        void fadeIn(const float time, float delay=0);
-        void fadeOut(const float time, float delay=0);
-        void fadeTo(const int percent, const float time, float delay=0);
+        void fadeIn(const float time, float delay = 0);
+        void fadeOut(const float time, float delay = 0);
+        void fadeTo(const int percent, const float time, float delay = 0);
 
         void clear() override;
 
-        void setFactor (float factor);
+        void setFactor(float factor);
         void setRepeat(bool repeat);
 
         void queue(float time, float targetAlpha, float delay);
diff --git a/apps/openmw/mwgui/scrollwindow.cpp b/apps/openmw/mwgui/scrollwindow.cpp
index df703dcb61..99cec7eb1c 100644
--- a/apps/openmw/mwgui/scrollwindow.cpp
+++ b/apps/openmw/mwgui/scrollwindow.cpp
@@ -6,8 +6,8 @@
 #include <components/widgets/imagebutton.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 
@@ -19,7 +19,7 @@
 namespace MWGui
 {
 
-    ScrollWindow::ScrollWindow ()
+    ScrollWindow::ScrollWindow()
         : BookWindowBase("openmw_scroll.layout")
         , mTakeButtonShow(true)
         , mTakeButtonAllowed(true)
@@ -41,20 +41,21 @@ namespace MWGui
         center();
     }
 
-    void ScrollWindow::setPtr (const MWWorld::Ptr& scroll)
+    void ScrollWindow::setPtr(const MWWorld::Ptr& scroll)
     {
         mScroll = scroll;
 
         MWWorld::Ptr player = MWMechanics::getPlayer();
         bool showTakeButton = scroll.getContainerStore() != &player.getClass().getContainerStore(player);
 
-        MWWorld::LiveCellRef<ESM::Book> *ref = mScroll.get<ESM::Book>();
+        MWWorld::LiveCellRef<ESM::Book>* ref = mScroll.get<ESM::Book>();
 
         Formatting::BookFormatter formatter;
         formatter.markupToWidget(mTextView, ref->mBase->mText, 390, mTextView->getHeight());
         MyGUI::IntSize size = mTextView->getChildAt(0)->getSize();
 
-        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the scrollbar is hidden
+        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the
+        // scrollbar is hidden
         mTextView->setVisibleVScroll(false);
         if (size.height > mTextView->getSize().height)
             mTextView->setCanvasSize(mTextView->getWidth(), size.height);
@@ -62,14 +63,14 @@ namespace MWGui
             mTextView->setCanvasSize(mTextView->getWidth(), mTextView->getSize().height);
         mTextView->setVisibleVScroll(true);
 
-        mTextView->setViewOffset(MyGUI::IntPoint(0,0));
+        mTextView->setViewOffset(MyGUI::IntPoint(0, 0));
 
         setTakeButtonShow(showTakeButton);
 
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mCloseButton);
     }
 
-    void ScrollWindow::onKeyButtonPressed(MyGUI::Widget *sender, MyGUI::KeyCode key, MyGUI::Char character)
+    void ScrollWindow::onKeyButtonPressed(MyGUI::Widget* sender, MyGUI::KeyCode key, MyGUI::Char character)
     {
         int scroll = 0;
         if (key == MyGUI::KeyCode::ArrowUp)
@@ -93,17 +94,17 @@ namespace MWGui
         mTakeButton->setVisible(mTakeButtonShow && mTakeButtonAllowed);
     }
 
-    void ScrollWindow::onCloseButtonClicked (MyGUI::Widget* _sender)
+    void ScrollWindow::onCloseButtonClicked(MyGUI::Widget* _sender)
     {
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Scroll);
     }
 
-    void ScrollWindow::onTakeButtonClicked (MyGUI::Widget* _sender)
+    void ScrollWindow::onTakeButtonClicked(MyGUI::Widget* _sender)
     {
         MWBase::Environment::get().getWindowManager()->playSound("Item Book Up");
 
         MWWorld::ActionTake take(mScroll);
-        take.execute (MWMechanics::getPlayer());
+        take.execute(MWMechanics::getPlayer());
 
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Scroll, true);
     }
diff --git a/apps/openmw/mwgui/scrollwindow.hpp b/apps/openmw/mwgui/scrollwindow.hpp
index 8a1e323ab1..a8d22a64b0 100644
--- a/apps/openmw/mwgui/scrollwindow.hpp
+++ b/apps/openmw/mwgui/scrollwindow.hpp
@@ -14,30 +14,29 @@ namespace MWGui
 {
     class ScrollWindow : public BookWindowBase
     {
-        public:
-            ScrollWindow ();
+    public:
+        ScrollWindow();
 
-            void setPtr (const MWWorld::Ptr& scroll) override;
-            void setInventoryAllowed(bool allowed);
+        void setPtr(const MWWorld::Ptr& scroll) override;
+        void setInventoryAllowed(bool allowed);
 
-            void onResChange(int, int) override { center(); }
+        void onResChange(int, int) override { center(); }
 
-        protected:
-            void onCloseButtonClicked (MyGUI::Widget* _sender);
-            void onTakeButtonClicked (MyGUI::Widget* _sender);
-            void setTakeButtonShow(bool show);
-            void onKeyButtonPressed(MyGUI::Widget* sender, MyGUI::KeyCode key, MyGUI::Char character);
+    protected:
+        void onCloseButtonClicked(MyGUI::Widget* _sender);
+        void onTakeButtonClicked(MyGUI::Widget* _sender);
+        void setTakeButtonShow(bool show);
+        void onKeyButtonPressed(MyGUI::Widget* sender, MyGUI::KeyCode key, MyGUI::Char character);
 
-        private:
-            Gui::ImageButton* mCloseButton;
-            Gui::ImageButton* mTakeButton;
-            MyGUI::ScrollView* mTextView;
+    private:
+        Gui::ImageButton* mCloseButton;
+        Gui::ImageButton* mTakeButton;
+        MyGUI::ScrollView* mTextView;
 
-            MWWorld::Ptr mScroll;
-
-            bool mTakeButtonShow;
-            bool mTakeButtonAllowed;
+        MWWorld::Ptr mScroll;
 
+        bool mTakeButtonShow;
+        bool mTakeButtonAllowed;
     };
 
 }
diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index a249f1e203..bc2d9a2d78 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -1,41 +1,41 @@
 #include "settingswindow.hpp"
 
-#include <regex>
+#include <array>
 #include <iomanip>
 #include <numeric>
-#include <array>
+#include <regex>
 
 #include <unicode/locid.h>
 
-#include <MyGUI_ScrollBar.h>
-#include <MyGUI_Window.h>
 #include <MyGUI_ComboBox.h>
-#include <MyGUI_ScrollView.h>
 #include <MyGUI_Gui.h>
-#include <MyGUI_TabControl.h>
 #include <MyGUI_LanguageManager.h>
+#include <MyGUI_ScrollBar.h>
+#include <MyGUI_ScrollView.h>
+#include <MyGUI_TabControl.h>
+#include <MyGUI_Window.h>
 
 #include <SDL_video.h>
 
 #include <components/debug/debuglog.hpp>
-#include <components/misc/strings/algorithm.hpp>
-#include <components/misc/strings/format.hpp>
+#include <components/lua_ui/scriptsettings.hpp>
 #include <components/misc/constants.hpp>
 #include <components/misc/pathhelpers.hpp>
-#include <components/widgets/sharedstatebutton.hpp>
-#include <components/settings/settings.hpp>
+#include <components/misc/strings/algorithm.hpp>
+#include <components/misc/strings/format.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/lightmanager.hpp>
-#include <components/lua_ui/scriptsettings.hpp>
+#include <components/settings/settings.hpp>
 #include <components/vfs/manager.hpp>
+#include <components/widgets/sharedstatebutton.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-#include "../mwbase/soundmanager.hpp"
 #include "../mwbase/inputmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "confirmationdialog.hpp"
 #include "ustring.hpp"
@@ -44,11 +44,14 @@ namespace
 {
     std::string textureMipmappingToStr(const std::string& val)
     {
-        if (val == "linear")  return "#{SettingsMenu:TextureFilteringTrilinear}";
-        if (val == "nearest") return "#{SettingsMenu:TextureFilteringBilinear}";
-        if (val == "none") return "#{SettingsMenu:TextureFilteringDisabled}";
-
-        Log(Debug::Warning) << "Warning: Invalid texture mipmap option: "<< val;
+        if (val == "linear")
+            return "#{SettingsMenu:TextureFilteringTrilinear}";
+        if (val == "nearest")
+            return "#{SettingsMenu:TextureFilteringBilinear}";
+        if (val == "none")
+            return "#{SettingsMenu:TextureFilteringDisabled}";
+
+        Log(Debug::Warning) << "Warning: Invalid texture mipmap option: " << val;
         return "#{SettingsMenu:TextureFilteringOther}";
     }
 
@@ -57,42 +60,42 @@ namespace
         std::string result;
         switch (method)
         {
-        case SceneUtil::LightingMethod::FFP:
-            result = "#{SettingsMenu:LightingMethodLegacy}";
-            break;
-        case SceneUtil::LightingMethod::PerObjectUniform:
-            result = "#{SettingsMenu:LightingMethodShadersCompatibility}";
-            break;
-        case SceneUtil::LightingMethod::SingleUBO:
-        default:
-            result = "#{SettingsMenu:LightingMethodShaders}";
-            break;
+            case SceneUtil::LightingMethod::FFP:
+                result = "#{SettingsMenu:LightingMethodLegacy}";
+                break;
+            case SceneUtil::LightingMethod::PerObjectUniform:
+                result = "#{SettingsMenu:LightingMethodShadersCompatibility}";
+                break;
+            case SceneUtil::LightingMethod::SingleUBO:
+            default:
+                result = "#{SettingsMenu:LightingMethodShaders}";
+                break;
         }
 
         return MyGUI::LanguageManager::getInstance().replaceTags(result);
     }
 
-    void parseResolution (int &x, int &y, const std::string& str)
+    void parseResolution(int& x, int& y, const std::string& str)
     {
         std::vector<std::string> split;
-        Misc::StringUtils::split (str, split, "@(x");
-        assert (split.size() >= 2);
+        Misc::StringUtils::split(str, split, "@(x");
+        assert(split.size() >= 2);
         Misc::StringUtils::trim(split[0]);
         Misc::StringUtils::trim(split[1]);
-        x = MyGUI::utility::parseInt (split[0]);
-        y = MyGUI::utility::parseInt (split[1]);
+        x = MyGUI::utility::parseInt(split[0]);
+        y = MyGUI::utility::parseInt(split[1]);
     }
 
-    bool sortResolutions (std::pair<int, int> left, std::pair<int, int> right)
+    bool sortResolutions(std::pair<int, int> left, std::pair<int, int> right)
     {
         if (left.first == right.first)
             return left.second > right.second;
         return left.first > right.first;
     }
 
-    std::string getAspect (int x, int y)
+    std::string getAspect(int x, int y)
     {
-        int gcd = std::gcd (x, y);
+        int gcd = std::gcd(x, y);
         if (gcd == 0)
             return std::string();
 
@@ -147,7 +150,7 @@ namespace
         int maxLights = Settings::Manager::getInt("max lights", "Shaders");
         // show increments of 8 in dropdown
         if (maxLights >= min && maxLights <= max && !(maxLights % increment))
-            box->setIndexSelected((maxLights / increment)-1);
+            box->setIndexSelected((maxLights / increment) - 1);
         else
             box->setIndexSelected(MyGUI::ITEM_NONE);
     }
@@ -165,9 +168,9 @@ namespace MWGui
             std::string type = getSettingType(current);
             if (type == checkButtonType)
             {
-                std::string initialValue = Settings::Manager::getBool(getSettingName(current),
-                                                                      getSettingCategory(current))
-                        ? "#{sOn}" : "#{sOff}";
+                std::string initialValue
+                    = Settings::Manager::getBool(getSettingName(current), getSettingCategory(current)) ? "#{sOn}"
+                                                                                                       : "#{sOff}";
                 current->castType<MyGUI::Button>()->setCaptionWithReplacing(initialValue);
                 if (init)
                     current->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onButtonToggled);
@@ -180,14 +183,14 @@ namespace MWGui
                 if (valueType == "Float" || valueType == "Integer" || valueType == "Cell")
                 {
                     // TODO: ScrollBar isn't meant for this. should probably use a dedicated FloatSlider widget
-                    float min,max;
+                    float min, max;
                     getSettingMinMax(scroll, min, max);
                     float value = Settings::Manager::getFloat(getSettingName(current), getSettingCategory(current));
 
                     if (valueType == "Cell")
                     {
                         std::stringstream ss;
-                        ss << std::fixed << std::setprecision(2) << value/Constants::CellSizeInUnits;
+                        ss << std::fixed << std::setprecision(2) << value / Constants::CellSizeInUnits;
                         valueStr = ss.str();
                     }
                     else if (valueType == "Float")
@@ -200,7 +203,7 @@ namespace MWGui
                         valueStr = MyGUI::utility::toString(int(value));
 
                     value = std::clamp(value, min, max);
-                    value = (value-min)/(max-min);
+                    value = (value - min) / (max - min);
 
                     scroll->setScrollPosition(static_cast<size_t>(value * (scroll->getScrollRange() - 1)));
                 }
@@ -211,7 +214,8 @@ namespace MWGui
                     scroll->setScrollPosition(value);
                 }
                 if (init)
-                    scroll->eventScrollChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onSliderChangePosition);
+                    scroll->eventScrollChangePosition
+                        += MyGUI::newDelegate(this, &SettingsWindow::onSliderChangePosition);
                 if (scroll->getVisible())
                     updateSliderLabel(scroll, valueStr);
             }
@@ -220,7 +224,7 @@ namespace MWGui
         }
     }
 
-    void SettingsWindow::updateSliderLabel(MyGUI::ScrollBar *scroller, const std::string& value)
+    void SettingsWindow::updateSliderLabel(MyGUI::ScrollBar* scroller, const std::string& value)
     {
         std::string labelWidgetName = scroller->getUserString("SettingLabelWidget");
         if (!labelWidgetName.empty())
@@ -233,7 +237,8 @@ namespace MWGui
         }
     }
 
-    SettingsWindow::SettingsWindow() : WindowBase("openmw_settings_window.layout")
+    SettingsWindow::SettingsWindow()
+        : WindowBase("openmw_settings_window.layout")
         , mKeyboardMode(true)
         , mCurrentPage(-1)
     {
@@ -274,10 +279,10 @@ namespace MWGui
 
 #ifndef WIN32
         // hide gamma controls since it currently does not work under Linux
-        MyGUI::ScrollBar *gammaSlider;
+        MyGUI::ScrollBar* gammaSlider;
         getWidget(gammaSlider, "GammaSlider");
         gammaSlider->setVisible(false);
-        MyGUI::TextBox *textBox;
+        MyGUI::TextBox* textBox;
         getWidget(textBox, "GammaText");
         textBox->setVisible(false);
         getWidget(textBox, "GammaTextDark");
@@ -286,39 +291,50 @@ namespace MWGui
         textBox->setVisible(false);
 #endif
 
-        mMainWidget->castType<MyGUI::Window>()->eventWindowChangeCoord += MyGUI::newDelegate(this, &SettingsWindow::onWindowResize);
+        mMainWidget->castType<MyGUI::Window>()->eventWindowChangeCoord
+            += MyGUI::newDelegate(this, &SettingsWindow::onWindowResize);
 
         mSettingsTab->eventTabChangeSelect += MyGUI::newDelegate(this, &SettingsWindow::onTabChanged);
         mOkButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onOkButtonClicked);
-        mTextureFilteringButton->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onTextureFilteringChanged);
+        mTextureFilteringButton->eventComboChangePosition
+            += MyGUI::newDelegate(this, &SettingsWindow::onTextureFilteringChanged);
         mResolutionList->eventListChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onResolutionSelected);
 
-        mWaterTextureSize->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onWaterTextureSizeChanged);
-        mWaterReflectionDetail->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onWaterReflectionDetailChanged);
-        mWaterRainRippleDetail->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onWaterRainRippleDetailChanged);
-
-        mLightingMethodButton->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onLightingMethodButtonChanged);
-        mLightsResetButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onLightsResetButtonClicked);
+        mWaterTextureSize->eventComboChangePosition
+            += MyGUI::newDelegate(this, &SettingsWindow::onWaterTextureSizeChanged);
+        mWaterReflectionDetail->eventComboChangePosition
+            += MyGUI::newDelegate(this, &SettingsWindow::onWaterReflectionDetailChanged);
+        mWaterRainRippleDetail->eventComboChangePosition
+            += MyGUI::newDelegate(this, &SettingsWindow::onWaterRainRippleDetailChanged);
+
+        mLightingMethodButton->eventComboChangePosition
+            += MyGUI::newDelegate(this, &SettingsWindow::onLightingMethodButtonChanged);
+        mLightsResetButton->eventMouseButtonClick
+            += MyGUI::newDelegate(this, &SettingsWindow::onLightsResetButtonClicked);
         mMaxLights->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onMaxLightsChanged);
 
         mWindowModeList->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onWindowModeChanged);
 
         mKeyboardSwitch->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onKeyboardSwitchClicked);
-        mControllerSwitch->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onControllerSwitchClicked);
+        mControllerSwitch->eventMouseButtonClick
+            += MyGUI::newDelegate(this, &SettingsWindow::onControllerSwitchClicked);
 
-        mPrimaryLanguage->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onPrimaryLanguageChanged);
-        mSecondaryLanguage->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onSecondaryLanguageChanged);
+        mPrimaryLanguage->eventComboChangePosition
+            += MyGUI::newDelegate(this, &SettingsWindow::onPrimaryLanguageChanged);
+        mSecondaryLanguage->eventComboChangePosition
+            += MyGUI::newDelegate(this, &SettingsWindow::onSecondaryLanguageChanged);
 
         computeMinimumWindowSize();
 
         center();
 
-        mResetControlsButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onResetDefaultBindings);
+        mResetControlsButton->eventMouseButtonClick
+            += MyGUI::newDelegate(this, &SettingsWindow::onResetDefaultBindings);
 
         // fill resolution list
         int screen = Settings::Manager::getInt("screen", "Video");
         int numDisplayModes = SDL_GetNumDisplayModes(screen);
-        std::vector < std::pair<int, int> > resolutions;
+        std::vector<std::pair<int, int>> resolutions;
         for (int i = 0; i < numDisplayModes; i++)
         {
             SDL_DisplayMode mode;
@@ -328,10 +344,11 @@ namespace MWGui
         std::sort(resolutions.begin(), resolutions.end(), sortResolutions);
         for (std::pair<int, int>& resolution : resolutions)
         {
-            std::string str = MyGUI::utility::toString(resolution.first) + " x " + MyGUI::utility::toString(resolution.second);
+            std::string str
+                = MyGUI::utility::toString(resolution.first) + " x " + MyGUI::utility::toString(resolution.second);
             std::string aspect = getAspect(resolution.first, resolution.second);
             if (!aspect.empty())
-                 str = str + " (" + aspect + ")";
+                str = str + " (" + aspect + ")";
 
             if (mResolutionList->findItemIndexWith(str) == MyGUI::ITEM_NONE)
                 mResolutionList->addItem(str);
@@ -357,8 +374,10 @@ namespace MWGui
 
         updateMaxLightsComboBox(mMaxLights);
 
-        Settings::WindowMode windowMode = static_cast<Settings::WindowMode>(Settings::Manager::getInt("window mode", "Video"));
-        mWindowBorderButton->setEnabled(windowMode != Settings::WindowMode::Fullscreen && windowMode != Settings::WindowMode::WindowedFullscreen);
+        Settings::WindowMode windowMode
+            = static_cast<Settings::WindowMode>(Settings::Manager::getInt("window mode", "Video"));
+        mWindowBorderButton->setEnabled(
+            windowMode != Settings::WindowMode::Fullscreen && windowMode != Settings::WindowMode::WindowedFullscreen);
 
         mKeyboardSwitch->setStateSelected(true);
         mControllerSwitch->setStateSelected(false);
@@ -373,12 +392,13 @@ namespace MWGui
             if (Misc::getFileExtension(path) == "yaml")
             {
                 std::string localeName(Misc::stemFile(path));
-                if (std::find(availableLanguages.begin(), availableLanguages.end(), localeName) == availableLanguages.end())
-                     availableLanguages.push_back(localeName);
+                if (std::find(availableLanguages.begin(), availableLanguages.end(), localeName)
+                    == availableLanguages.end())
+                    availableLanguages.push_back(localeName);
             }
         }
 
-        std::sort (availableLanguages.begin(), availableLanguages.end());
+        std::sort(availableLanguages.begin(), availableLanguages.end());
 
         std::vector<std::string> currentLocales = Settings::Manager::getStringArray("preferred locales", "General");
         if (currentLocales.empty())
@@ -442,7 +462,7 @@ namespace MWGui
     {
         std::string resStr = mResolutionList->getItemNameAt(mResolutionList->getIndexSelected());
         int resX, resY;
-        parseResolution (resX, resY, resStr);
+        parseResolution(resX, resY, resStr);
 
         Settings::Manager::setInt("resolution x", "Video", resX);
         Settings::Manager::setInt("resolution y", "Video", resY);
@@ -462,10 +482,10 @@ namespace MWGui
         int currentX = Settings::Manager::getInt("resolution x", "Video");
         int currentY = Settings::Manager::getInt("resolution y", "Video");
 
-        for (size_t i=0; i<mResolutionList->getItemCount(); ++i)
+        for (size_t i = 0; i < mResolutionList->getItemCount(); ++i)
         {
             int resX, resY;
-            parseResolution (resX, resY, mResolutionList->getItemNameAt(i));
+            parseResolution(resX, resY, mResolutionList->getItemNameAt(i));
 
             if (resX == currentX && resY == currentY)
             {
@@ -509,7 +529,8 @@ namespace MWGui
 
         _sender->setCaptionWithReplacing(_sender->getItemNameAt(_sender->getIndexSelected()));
 
-        MWBase::Environment::get().getWindowManager()->interactiveMessageBox("#{SettingsMenu:ChangeRequiresRestart}", {"#{sOK}"}, true);
+        MWBase::Environment::get().getWindowManager()->interactiveMessageBox(
+            "#{SettingsMenu:ChangeRequiresRestart}", { "#{sOK}" }, true);
 
         Settings::Manager::setString("lighting method", "Shaders", *_sender->getItemDataAt<std::string>(pos));
         apply();
@@ -522,7 +543,8 @@ namespace MWGui
 
         _sender->setCaptionWithReplacing(_sender->getItemNameAt(_sender->getIndexSelected()));
 
-        MWBase::Environment::get().getWindowManager()->interactiveMessageBox("#{SettingsMenu:ChangeRequiresRestart}", {"#{sOK}"}, true);
+        MWBase::Environment::get().getWindowManager()->interactiveMessageBox(
+            "#{SettingsMenu:ChangeRequiresRestart}", { "#{sOK}" }, true);
 
         std::vector<std::string> currentLocales = Settings::Manager::getStringArray("preferred locales", "General");
         if (currentLocales.size() <= langPriority)
@@ -557,8 +579,9 @@ namespace MWGui
 
     void SettingsWindow::onLightsResetButtonClicked(MyGUI::Widget* _sender)
     {
-        std::vector<std::string> buttons = {"#{sYes}", "#{sNo}"};
-        MWBase::Environment::get().getWindowManager()->interactiveMessageBox("#{SettingsMenu:LightingResetToDefaults}", buttons, true);
+        std::vector<std::string> buttons = { "#{sYes}", "#{sNo}" };
+        MWBase::Environment::get().getWindowManager()->interactiveMessageBox(
+            "#{SettingsMenu:LightingResetToDefaults}", buttons, true);
         int selectedButton = MWBase::Environment::get().getWindowManager()->readPressedButton();
         if (selectedButton == 1 || selectedButton == -1)
             return;
@@ -572,9 +595,11 @@ namespace MWGui
             "lighting method",
         };
         for (const auto& setting : settings)
-            Settings::Manager::setString(setting, "Shaders", Settings::Manager::mDefaultSettings[{"Shaders", setting}]);
+            Settings::Manager::setString(
+                setting, "Shaders", Settings::Manager::mDefaultSettings[{ "Shaders", setting }]);
 
-        auto lightingMethod = SceneUtil::LightManager::getLightingMethodFromString(Settings::Manager::mDefaultSettings[{"Shaders", "lighting method"}]);
+        auto lightingMethod = SceneUtil::LightManager::getLightingMethodFromString(
+            Settings::Manager::mDefaultSettings[{ "Shaders", "lighting method" }]);
         auto lightIndex = mLightingMethodButton->findItemIndexWith(lightingMethodToStr(lightingMethod));
         mLightingMethodButton->setIndexSelected(lightIndex);
         updateMaxLightsComboBox(mMaxLights);
@@ -589,7 +614,8 @@ namespace MWGui
         bool newState;
         if (_sender->castType<MyGUI::Button>()->getCaption() == on)
         {
-            MyGUI::UString off = toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOff", "Off"));
+            MyGUI::UString off
+                = toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOff", "Off"));
             _sender->castType<MyGUI::Button>()->setCaption(off);
             newState = false;
         }
@@ -609,9 +635,9 @@ namespace MWGui
 
     void SettingsWindow::onTextureFilteringChanged(MyGUI::ComboBox* _sender, size_t pos)
     {
-        if(pos == 0)
+        if (pos == 0)
             Settings::Manager::setString("texture mipmap", "General", "nearest");
-        else if(pos == 1)
+        else if (pos == 1)
             Settings::Manager::setString("texture mipmap", "General", "linear");
         else
             Log(Debug::Warning) << "Unexpected option pos " << pos;
@@ -626,11 +652,11 @@ namespace MWGui
             std::string valueType = getSettingValueType(scroller);
             if (valueType == "Float" || valueType == "Integer" || valueType == "Cell")
             {
-                float value = pos / float(scroller->getScrollRange()-1);
+                float value = pos / float(scroller->getScrollRange() - 1);
 
-                float min,max;
+                float min, max;
                 getSettingMinMax(scroller, min, max);
-                value = min + (max-min) * value;
+                value = min + (max - min) * value;
                 if (valueType == "Float")
                     Settings::Manager::setFloat(getSettingName(scroller), getSettingCategory(scroller), value);
                 else
@@ -639,7 +665,7 @@ namespace MWGui
                 if (valueType == "Cell")
                 {
                     std::stringstream ss;
-                    ss << std::fixed << std::setprecision(2) << value/Constants::CellSizeInUnits;
+                    ss << std::fixed << std::setprecision(2) << value / Constants::CellSizeInUnits;
                     valueStr = ss.str();
                 }
                 else if (valueType == "Float")
@@ -675,7 +701,7 @@ namespace MWGui
 
     void SettingsWindow::onKeyboardSwitchClicked(MyGUI::Widget* _sender)
     {
-        if(mKeyboardMode)
+        if (mKeyboardMode)
             return;
         mKeyboardMode = true;
         mKeyboardSwitch->setStateSelected(true);
@@ -686,7 +712,7 @@ namespace MWGui
 
     void SettingsWindow::onControllerSwitchClicked(MyGUI::Widget* _sender)
     {
-        if(!mKeyboardMode)
+        if (!mKeyboardMode)
             return;
         mKeyboardMode = false;
         mKeyboardSwitch->setStateSelected(false);
@@ -702,26 +728,29 @@ namespace MWGui
 
         MWBase::Environment::get().getWindowManager()->removeStaticMessageBox();
         const auto inputManager = MWBase::Environment::get().getInputManager();
-        const auto& actions = mKeyboardMode ? inputManager->getActionKeySorting() : inputManager->getActionControllerSorting();
+        const auto& actions
+            = mKeyboardMode ? inputManager->getActionKeySorting() : inputManager->getActionControllerSorting();
 
         for (const int& action : actions)
         {
-            std::string desc{inputManager->getActionDescription(action)};
+            std::string desc{ inputManager->getActionDescription(action) };
             if (desc.empty())
                 continue;
 
             std::string binding;
-            if(mKeyboardMode)
+            if (mKeyboardMode)
                 binding = inputManager->getActionKeyBindingName(action);
             else
                 binding = inputManager->getActionControllerBindingName(action);
 
-            Gui::SharedStateButton* leftText = mControlsBox->createWidget<Gui::SharedStateButton>("SandTextButton", MyGUI::IntCoord(), MyGUI::Align::Default);
+            Gui::SharedStateButton* leftText = mControlsBox->createWidget<Gui::SharedStateButton>(
+                "SandTextButton", MyGUI::IntCoord(), MyGUI::Align::Default);
             leftText->setCaptionWithReplacing(desc);
 
-            Gui::SharedStateButton* rightText = mControlsBox->createWidget<Gui::SharedStateButton>("SandTextButton", MyGUI::IntCoord(), MyGUI::Align::Default);
+            Gui::SharedStateButton* rightText = mControlsBox->createWidget<Gui::SharedStateButton>(
+                "SandTextButton", MyGUI::IntCoord(), MyGUI::Align::Default);
             rightText->setCaptionWithReplacing(binding);
-            rightText->setTextAlign (MyGUI::Align::Right);
+            rightText->setTextAlign(MyGUI::Align::Right);
             rightText->setUserData(action); // save the action id for callbacks
             rightText->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onRebindAction);
             rightText->eventMouseWheel += MyGUI::newDelegate(this, &SettingsWindow::onInputTabMouseWheel);
@@ -753,7 +782,8 @@ namespace MWGui
             if (!MWBase::Environment::get().getResourceSystem()->getSceneManager()->isSupportedLightingMethod(method))
                 continue;
 
-            mLightingMethodButton->addItem(lightingMethodToStr(method), SceneUtil::LightManager::getLightingMethodString(method));
+            mLightingMethodButton->addItem(
+                lightingMethodToStr(method), SceneUtil::LightManager::getLightingMethodString(method));
         }
         mLightingMethodButton->setIndexSelected(mLightingMethodButton->findItemIndexWith(lightingMethodStr));
     }
@@ -774,18 +804,18 @@ namespace MWGui
             {
                 std::string resStr = mResolutionList->getItemNameAt(mResolutionList->getIndexSelected());
                 int resX, resY;
-                parseResolution (resX, resY, resStr);
+                parseResolution(resX, resY, resStr);
                 Settings::Manager::setInt("resolution x", "Video", resX);
                 Settings::Manager::setInt("resolution y", "Video", resY);
             }
 
             bool supported = false;
             int fallbackX = 0, fallbackY = 0;
-            for (unsigned int i=0; i<mResolutionList->getItemCount(); ++i)
+            for (unsigned int i = 0; i < mResolutionList->getItemCount(); ++i)
             {
                 std::string resStr = mResolutionList->getItemNameAt(i);
                 int resX, resY;
-                parseResolution (resX, resY, resStr);
+                parseResolution(resX, resY, resStr);
 
                 if (i == 0)
                 {
@@ -794,7 +824,7 @@ namespace MWGui
                 }
 
                 if (resX == Settings::Manager::getInt("resolution x", "Video")
-                    && resY  == Settings::Manager::getInt("resolution y", "Video"))
+                    && resY == Settings::Manager::getInt("resolution y", "Video"))
                     supported = true;
             }
 
@@ -820,13 +850,14 @@ namespace MWGui
 
         for (size_t i = 0; i < mControlsBox->getChildCount(); i++)
         {
-            MyGUI::Widget * widget = mControlsBox->getChildAt(i);
+            MyGUI::Widget* widget = mControlsBox->getChildAt(i);
             widget->setCoord(0, i / noWidgetsInRow * h, w, h);
         }
 
-        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the scrollbar is hidden
+        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the
+        // scrollbar is hidden
         mControlsBox->setVisibleVScroll(false);
-        mControlsBox->setCanvasSize (mControlsBox->getWidth(), std::max(totalH, mControlsBox->getHeight()));
+        mControlsBox->setCanvasSize(mControlsBox->getWidth(), std::max(totalH, mControlsBox->getHeight()));
         mControlsBox->setVisibleVScroll(true);
     }
 
@@ -871,9 +902,10 @@ namespace MWGui
         mScriptAdapter->detach();
 
         mScriptList->removeAllItems();
-        mScriptView->setCanvasSize({0, 0});
+        mScriptView->setCanvasSize({ 0, 0 });
 
-        struct WeightedPage {
+        struct WeightedPage
+        {
             size_t mIndex;
             std::string mName;
             double mNameWeight;
@@ -933,19 +965,19 @@ namespace MWGui
 
         _sender->castType<MyGUI::Button>()->setCaptionWithReplacing("#{sNone}");
 
-        MWBase::Environment::get().getWindowManager ()->staticMessageBox ("#{sControlsMenu3}");
-        MWBase::Environment::get().getWindowManager ()->disallowMouse();
-
-        MWBase::Environment::get().getInputManager ()->enableDetectingBindingMode (actionId, mKeyboardMode);
+        MWBase::Environment::get().getWindowManager()->staticMessageBox("#{sControlsMenu3}");
+        MWBase::Environment::get().getWindowManager()->disallowMouse();
 
+        MWBase::Environment::get().getInputManager()->enableDetectingBindingMode(actionId, mKeyboardMode);
     }
 
     void SettingsWindow::onInputTabMouseWheel(MyGUI::Widget* _sender, int _rel)
     {
-        if (mControlsBox->getViewOffset().top + _rel*0.3f > 0)
+        if (mControlsBox->getViewOffset().top + _rel * 0.3f > 0)
             mControlsBox->setViewOffset(MyGUI::IntPoint(0, 0));
         else
-            mControlsBox->setViewOffset(MyGUI::IntPoint(0, static_cast<int>(mControlsBox->getViewOffset().top + _rel*0.3f)));
+            mControlsBox->setViewOffset(
+                MyGUI::IntPoint(0, static_cast<int>(mControlsBox->getViewOffset().top + _rel * 0.3f)));
     }
 
     void SettingsWindow::onResetDefaultBindings(MyGUI::Widget* _sender)
@@ -959,11 +991,11 @@ namespace MWGui
 
     void SettingsWindow::onResetDefaultBindingsAccept()
     {
-        if(mKeyboardMode)
-            MWBase::Environment::get().getInputManager ()->resetToDefaultKeyBindings ();
+        if (mKeyboardMode)
+            MWBase::Environment::get().getInputManager()->resetToDefaultKeyBindings();
         else
             MWBase::Environment::get().getInputManager()->resetToDefaultControllerBindings();
-        updateControlsBox ();
+        updateControlsBox();
     }
 
     void SettingsWindow::onOpen()
@@ -977,7 +1009,7 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mOkButton);
     }
 
-    void SettingsWindow::onWindowResize(MyGUI::Window *_sender)
+    void SettingsWindow::onWindowResize(MyGUI::Window* _sender)
     {
         layoutControlsBox();
     }
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index 5851457e9c..576ba2c627 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -9,103 +9,103 @@ namespace MWGui
 {
     class SettingsWindow : public WindowBase
     {
-        public:
-            SettingsWindow();
+    public:
+        SettingsWindow();
 
-            void onOpen() override;
+        void onOpen() override;
 
-            void updateControlsBox();
+        void updateControlsBox();
 
-            void updateLightSettings();
+        void updateLightSettings();
 
-            void updateWindowModeSettings();
+        void updateWindowModeSettings();
 
-            void onResChange(int, int) override { center(); }
+        void onResChange(int, int) override { center(); }
 
     protected:
-            MyGUI::TabControl* mSettingsTab;
-            MyGUI::Button* mOkButton;
-
-            // graphics
-            MyGUI::ListBox* mResolutionList;
-            MyGUI::ComboBox* mWindowModeList;
-            MyGUI::Button* mWindowBorderButton;
-            MyGUI::ComboBox* mTextureFilteringButton;
-
-            MyGUI::ComboBox* mWaterTextureSize;
-            MyGUI::ComboBox* mWaterReflectionDetail;
-            MyGUI::ComboBox* mWaterRainRippleDetail;
-
-            MyGUI::ComboBox* mMaxLights;
-            MyGUI::ComboBox* mLightingMethodButton;
-            MyGUI::Button* mLightsResetButton;
-
-            MyGUI::ComboBox* mPrimaryLanguage;
-            MyGUI::ComboBox* mSecondaryLanguage;
-
-            // controls
-            MyGUI::ScrollView* mControlsBox;
-            MyGUI::Button* mResetControlsButton;
-            MyGUI::Button* mKeyboardSwitch;
-            MyGUI::Button* mControllerSwitch;
-            bool mKeyboardMode; //if true, setting up the keyboard. Otherwise, it's controller
-
-            MyGUI::EditBox* mScriptFilter;
-            MyGUI::ListBox* mScriptList;
-            MyGUI::Widget* mScriptBox;
-            MyGUI::Widget* mScriptDisabled;
-            MyGUI::ScrollView* mScriptView;
-            LuaUi::LuaAdapter* mScriptAdapter;
-            int mCurrentPage;
-
-            void onTabChanged(MyGUI::TabControl* _sender, size_t index);
-            void onOkButtonClicked(MyGUI::Widget* _sender);
-            void onTextureFilteringChanged(MyGUI::ComboBox* _sender, size_t pos);
-            void onSliderChangePosition(MyGUI::ScrollBar* scroller, size_t pos);
-            void onButtonToggled(MyGUI::Widget* _sender);
-            void onResolutionSelected(MyGUI::ListBox* _sender, size_t index);
-            void onResolutionAccept();
-            void onResolutionCancel();
-            void highlightCurrentResolution();
-
-            void onWaterTextureSizeChanged(MyGUI::ComboBox* _sender, size_t pos);
-            void onWaterReflectionDetailChanged(MyGUI::ComboBox* _sender, size_t pos);
-            void onWaterRainRippleDetailChanged(MyGUI::ComboBox* _sender, size_t pos);
-
-            void onLightingMethodButtonChanged(MyGUI::ComboBox* _sender, size_t pos);
-            void onLightsResetButtonClicked(MyGUI::Widget* _sender);
-            void onMaxLightsChanged(MyGUI::ComboBox* _sender, size_t pos);
-
-            void onPrimaryLanguageChanged(MyGUI::ComboBox* _sender, size_t pos) { onLanguageChanged(0, _sender, pos); }
-            void onSecondaryLanguageChanged(MyGUI::ComboBox* _sender, size_t pos) { onLanguageChanged(1, _sender, pos); }
-            void onLanguageChanged(size_t langPriority, MyGUI::ComboBox* _sender, size_t pos);
-
-            void onWindowModeChanged(MyGUI::ComboBox* _sender, size_t pos);
-
-            void onRebindAction(MyGUI::Widget* _sender);
-            void onInputTabMouseWheel(MyGUI::Widget* _sender, int _rel);
-            void onResetDefaultBindings(MyGUI::Widget* _sender);
-            void onResetDefaultBindingsAccept ();
-            void onKeyboardSwitchClicked(MyGUI::Widget* _sender);
-            void onControllerSwitchClicked(MyGUI::Widget* _sender);
-
-            void onWindowResize(MyGUI::Window* _sender);
-
-            void onScriptFilterChange(MyGUI::EditBox*);
-            void onScriptListSelection(MyGUI::ListBox*, size_t index);
-
-            void apply();
-
-            void configureWidgets(MyGUI::Widget* widget, bool init);
-            void updateSliderLabel(MyGUI::ScrollBar* scroller, const std::string& value);
-
-            void layoutControlsBox();
-            void renderScriptSettings();
-
-            void computeMinimumWindowSize();
-
-        private:
-            void resetScrollbars();
+        MyGUI::TabControl* mSettingsTab;
+        MyGUI::Button* mOkButton;
+
+        // graphics
+        MyGUI::ListBox* mResolutionList;
+        MyGUI::ComboBox* mWindowModeList;
+        MyGUI::Button* mWindowBorderButton;
+        MyGUI::ComboBox* mTextureFilteringButton;
+
+        MyGUI::ComboBox* mWaterTextureSize;
+        MyGUI::ComboBox* mWaterReflectionDetail;
+        MyGUI::ComboBox* mWaterRainRippleDetail;
+
+        MyGUI::ComboBox* mMaxLights;
+        MyGUI::ComboBox* mLightingMethodButton;
+        MyGUI::Button* mLightsResetButton;
+
+        MyGUI::ComboBox* mPrimaryLanguage;
+        MyGUI::ComboBox* mSecondaryLanguage;
+
+        // controls
+        MyGUI::ScrollView* mControlsBox;
+        MyGUI::Button* mResetControlsButton;
+        MyGUI::Button* mKeyboardSwitch;
+        MyGUI::Button* mControllerSwitch;
+        bool mKeyboardMode; // if true, setting up the keyboard. Otherwise, it's controller
+
+        MyGUI::EditBox* mScriptFilter;
+        MyGUI::ListBox* mScriptList;
+        MyGUI::Widget* mScriptBox;
+        MyGUI::Widget* mScriptDisabled;
+        MyGUI::ScrollView* mScriptView;
+        LuaUi::LuaAdapter* mScriptAdapter;
+        int mCurrentPage;
+
+        void onTabChanged(MyGUI::TabControl* _sender, size_t index);
+        void onOkButtonClicked(MyGUI::Widget* _sender);
+        void onTextureFilteringChanged(MyGUI::ComboBox* _sender, size_t pos);
+        void onSliderChangePosition(MyGUI::ScrollBar* scroller, size_t pos);
+        void onButtonToggled(MyGUI::Widget* _sender);
+        void onResolutionSelected(MyGUI::ListBox* _sender, size_t index);
+        void onResolutionAccept();
+        void onResolutionCancel();
+        void highlightCurrentResolution();
+
+        void onWaterTextureSizeChanged(MyGUI::ComboBox* _sender, size_t pos);
+        void onWaterReflectionDetailChanged(MyGUI::ComboBox* _sender, size_t pos);
+        void onWaterRainRippleDetailChanged(MyGUI::ComboBox* _sender, size_t pos);
+
+        void onLightingMethodButtonChanged(MyGUI::ComboBox* _sender, size_t pos);
+        void onLightsResetButtonClicked(MyGUI::Widget* _sender);
+        void onMaxLightsChanged(MyGUI::ComboBox* _sender, size_t pos);
+
+        void onPrimaryLanguageChanged(MyGUI::ComboBox* _sender, size_t pos) { onLanguageChanged(0, _sender, pos); }
+        void onSecondaryLanguageChanged(MyGUI::ComboBox* _sender, size_t pos) { onLanguageChanged(1, _sender, pos); }
+        void onLanguageChanged(size_t langPriority, MyGUI::ComboBox* _sender, size_t pos);
+
+        void onWindowModeChanged(MyGUI::ComboBox* _sender, size_t pos);
+
+        void onRebindAction(MyGUI::Widget* _sender);
+        void onInputTabMouseWheel(MyGUI::Widget* _sender, int _rel);
+        void onResetDefaultBindings(MyGUI::Widget* _sender);
+        void onResetDefaultBindingsAccept();
+        void onKeyboardSwitchClicked(MyGUI::Widget* _sender);
+        void onControllerSwitchClicked(MyGUI::Widget* _sender);
+
+        void onWindowResize(MyGUI::Window* _sender);
+
+        void onScriptFilterChange(MyGUI::EditBox*);
+        void onScriptListSelection(MyGUI::ListBox*, size_t index);
+
+        void apply();
+
+        void configureWidgets(MyGUI::Widget* widget, bool init);
+        void updateSliderLabel(MyGUI::ScrollBar* scroller, const std::string& value);
+
+        void layoutControlsBox();
+        void renderScriptSettings();
+
+        void computeMinimumWindowSize();
+
+    private:
+        void resetScrollbars();
     };
 }
 
diff --git a/apps/openmw/mwgui/sortfilteritemmodel.cpp b/apps/openmw/mwgui/sortfilteritemmodel.cpp
index f3239f0186..35a9d792e0 100644
--- a/apps/openmw/mwgui/sortfilteritemmodel.cpp
+++ b/apps/openmw/mwgui/sortfilteritemmodel.cpp
@@ -1,27 +1,27 @@
 #include "sortfilteritemmodel.hpp"
 
-#include <components/misc/utf8stream.hpp>
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 #include <components/debug/debuglog.hpp>
 #include <components/esm3/loadalch.hpp>
 #include <components/esm3/loadappa.hpp>
 #include <components/esm3/loadarmo.hpp>
 #include <components/esm3/loadbook.hpp>
 #include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadench.hpp>
 #include <components/esm3/loadingr.hpp>
-#include <components/esm3/loadlock.hpp>
 #include <components/esm3/loadligh.hpp>
+#include <components/esm3/loadlock.hpp>
 #include <components/esm3/loadmisc.hpp>
 #include <components/esm3/loadprob.hpp>
 #include <components/esm3/loadrepa.hpp>
 #include <components/esm3/loadweap.hpp>
-#include <components/esm3/loadench.hpp>
-#include <components/esm3/loadcrea.hpp>
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
+#include <components/misc/utf8stream.hpp>
 
 #include "../mwworld/class.hpp"
-#include "../mwworld/nullaction.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/nullaction.hpp"
 
 #include "../mwmechanics/alchemy.hpp"
 
@@ -31,18 +31,30 @@ namespace
     {
         switch (type)
         {
-            case ESM::Weapon::sRecordId: return 0;
-            case ESM::Armor::sRecordId: return 1;
-            case ESM::Clothing::sRecordId: return 2;
-            case ESM::Potion::sRecordId: return 3;
-            case ESM::Ingredient::sRecordId: return 4;
-            case ESM::Apparatus::sRecordId: return 5;
-            case ESM::Book::sRecordId: return 6;
-            case ESM::Light::sRecordId: return 7;
-            case ESM::Miscellaneous::sRecordId: return 8;
-            case ESM::Lockpick::sRecordId: return 9;
-            case ESM::Repair::sRecordId: return 10;
-            case ESM::Probe::sRecordId: return 11;
+            case ESM::Weapon::sRecordId:
+                return 0;
+            case ESM::Armor::sRecordId:
+                return 1;
+            case ESM::Clothing::sRecordId:
+                return 2;
+            case ESM::Potion::sRecordId:
+                return 3;
+            case ESM::Ingredient::sRecordId:
+                return 4;
+            case ESM::Apparatus::sRecordId:
+                return 5;
+            case ESM::Book::sRecordId:
+                return 6;
+            case ESM::Light::sRecordId:
+                return 7;
+            case ESM::Miscellaneous::sRecordId:
+                return 8;
+            case ESM::Lockpick::sRecordId:
+                return 9;
+            case ESM::Repair::sRecordId:
+                return 10;
+            case ESM::Probe::sRecordId:
+                return 11;
         }
         assert(false && "Invalid type value");
         return std::numeric_limits<unsigned int>::max();
@@ -56,8 +68,11 @@ namespace
     struct Compare
     {
         bool mSortByType;
-        Compare() : mSortByType(true) {}
-        bool operator() (const MWGui::ItemStack& left, const MWGui::ItemStack& right)
+        Compare()
+            : mSortByType(true)
+        {
+        }
+        bool operator()(const MWGui::ItemStack& left, const MWGui::ItemStack& right)
         {
             if (mSortByType && left.mType != right.mType)
                 return left.mType < right.mType;
@@ -90,25 +105,29 @@ namespace
 
             if (!leftName.empty())
             {
-                const ESM::Enchantment* ench = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().search(leftName);
+                const ESM::Enchantment* ench
+                    = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().search(leftName);
                 if (ench)
                 {
                     if (ench->mData.mType == ESM::Enchantment::ConstantEffect)
                         leftChargePercent = 101;
                     else
-                        leftChargePercent = static_cast<int>(left.mBase.getCellRef().getNormalizedEnchantmentCharge(ench->mData.mCharge) * 100);
+                        leftChargePercent = static_cast<int>(
+                            left.mBase.getCellRef().getNormalizedEnchantmentCharge(ench->mData.mCharge) * 100);
                 }
             }
 
             if (!rightName.empty())
             {
-                const ESM::Enchantment* ench = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().search(rightName);
+                const ESM::Enchantment* ench
+                    = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().search(rightName);
                 if (ench)
                 {
                     if (ench->mData.mType == ESM::Enchantment::ConstantEffect)
                         rightChargePercent = 101;
                     else
-                        rightChargePercent = static_cast<int>(right.mBase.getCellRef().getNormalizedEnchantmentCharge(ench->mData.mCharge) * 100);
+                        rightChargePercent = static_cast<int>(
+                            right.mBase.getCellRef().getNormalizedEnchantmentCharge(ench->mData.mCharge) * 100);
                 }
             }
 
@@ -119,13 +138,15 @@ namespace
             // compare items by condition
             if (left.mBase.getClass().hasItemHealth(left.mBase) && right.mBase.getClass().hasItemHealth(right.mBase))
             {
-                result = left.mBase.getClass().getItemHealth(left.mBase) - right.mBase.getClass().getItemHealth(right.mBase);
+                result = left.mBase.getClass().getItemHealth(left.mBase)
+                    - right.mBase.getClass().getItemHealth(right.mBase);
                 if (result != 0)
                     return result > 0;
             }
 
             // compare items by remaining usage time
-            result = left.mBase.getClass().getRemainingUsageTime(left.mBase) - right.mBase.getClass().getRemainingUsageTime(right.mBase);
+            result = left.mBase.getClass().getRemainingUsageTime(left.mBase)
+                - right.mBase.getClass().getRemainingUsageTime(right.mBase);
             if (result != 0)
                 return result > 0;
 
@@ -165,7 +186,7 @@ namespace MWGui
         return mSourceModel->allowedToUseItems();
     }
 
-    void SortFilterItemModel::addDragItem (const MWWorld::Ptr& dragItem, size_t count)
+    void SortFilterItemModel::addDragItem(const MWWorld::Ptr& dragItem, size_t count)
     {
         mDragItems.emplace_back(dragItem, count);
     }
@@ -175,7 +196,7 @@ namespace MWGui
         mDragItems.clear();
     }
 
-    bool SortFilterItemModel::filterAccepts (const ItemStack& item)
+    bool SortFilterItemModel::filterAccepts(const ItemStack& item)
     {
         MWWorld::Ptr base = item.mBase;
 
@@ -226,7 +247,7 @@ namespace MWGui
 
             if (!mEffectFilter.empty())
             {
-                MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
+                MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
                 const auto alchemySkill = player.getClass().getSkill(player, ESM::Skill::Alchemy);
 
                 const auto effects = MWMechanics::Alchemy::effectsDescription(base, alchemySkill);
@@ -245,19 +266,20 @@ namespace MWGui
 
         if ((mFilter & Filter_OnlyEnchanted) && !(item.mFlags & ItemStack::Flag_Enchanted))
             return false;
-        if ((mFilter & Filter_OnlyChargedSoulstones) && (base.getType() != ESM::Miscellaneous::sRecordId
-                                                     || base.getCellRef().getSoul() == "" || !MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>().search(base.getCellRef().getSoul())))
+        if ((mFilter & Filter_OnlyChargedSoulstones)
+            && (base.getType() != ESM::Miscellaneous::sRecordId || base.getCellRef().getSoul() == ""
+                || !MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>().search(
+                    base.getCellRef().getSoul())))
             return false;
         if ((mFilter & Filter_OnlyRepairTools) && (base.getType() != ESM::Repair::sRecordId))
             return false;
-        if ((mFilter & Filter_OnlyEnchantable) && (item.mFlags & ItemStack::Flag_Enchanted
-                                               || (base.getType() != ESM::Armor::sRecordId
-                                                   && base.getType() != ESM::Clothing::sRecordId
-                                                   && base.getType() != ESM::Weapon::sRecordId
-                                                   && base.getType() != ESM::Book::sRecordId)))
+        if ((mFilter & Filter_OnlyEnchantable)
+            && (item.mFlags & ItemStack::Flag_Enchanted
+                || (base.getType() != ESM::Armor::sRecordId && base.getType() != ESM::Clothing::sRecordId
+                    && base.getType() != ESM::Weapon::sRecordId && base.getType() != ESM::Book::sRecordId)))
             return false;
         if ((mFilter & Filter_OnlyEnchantable) && base.getType() == ESM::Book::sRecordId
-                && !base.get<ESM::Book>()->mBase->mData.mIsScroll)
+            && !base.get<ESM::Book>()->mBase->mData.mIsScroll)
             return false;
 
         if ((mFilter & Filter_OnlyUsableItems) && base.getClass().getScript(base).empty())
@@ -267,11 +289,10 @@ namespace MWGui
                 return false;
         }
 
-        if ((mFilter & Filter_OnlyRepairable) && (
-                    !base.getClass().hasItemHealth(base)
-                    || (base.getClass().getItemHealth(base) == base.getClass().getItemMaxHealth(base))
-                    || (base.getType() != ESM::Weapon::sRecordId
-                        && base.getType() != ESM::Armor::sRecordId)))
+        if ((mFilter & Filter_OnlyRepairable)
+            && (!base.getClass().hasItemHealth(base)
+                || (base.getClass().getItemHealth(base) == base.getClass().getItemMaxHealth(base))
+                || (base.getType() != ESM::Weapon::sRecordId && base.getType() != ESM::Armor::sRecordId)))
             return false;
 
         if (mFilter & Filter_OnlyRechargable)
@@ -280,26 +301,28 @@ namespace MWGui
                 return false;
 
             std::string_view enchId = base.getClass().getEnchantment(base);
-            const ESM::Enchantment* ench = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().search(enchId);
+            const ESM::Enchantment* ench
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().search(enchId);
             if (!ench)
             {
-                Log(Debug::Warning) << "Warning: Can't find enchantment '" << enchId << "' on item " << base.getCellRef().getRefId();
+                Log(Debug::Warning) << "Warning: Can't find enchantment '" << enchId << "' on item "
+                                    << base.getCellRef().getRefId();
                 return false;
             }
 
             if (base.getCellRef().getEnchantmentCharge() >= ench->mData.mCharge
-                    || base.getCellRef().getEnchantmentCharge() == -1)
+                || base.getCellRef().getEnchantmentCharge() == -1)
                 return false;
         }
 
         std::string compare = Utf8Stream::lowerCaseUtf8(item.mBase.getClass().getName(item.mBase));
-        if(compare.find(mNameFilter) == std::string::npos)
+        if (compare.find(mNameFilter) == std::string::npos)
             return false;
 
         return true;
     }
 
-    ItemStack SortFilterItemModel::getItem (ModelIndex index)
+    ItemStack SortFilterItemModel::getItem(ModelIndex index)
     {
         if (index < 0)
             throw std::runtime_error("Invalid index supplied");
@@ -313,22 +336,22 @@ namespace MWGui
         return mItems.size();
     }
 
-    void SortFilterItemModel::setCategory (int category)
+    void SortFilterItemModel::setCategory(int category)
     {
         mCategory = category;
     }
 
-    void SortFilterItemModel::setFilter (int filter)
+    void SortFilterItemModel::setFilter(int filter)
     {
         mFilter = filter;
     }
 
-    void SortFilterItemModel::setNameFilter (const std::string& filter)
+    void SortFilterItemModel::setNameFilter(const std::string& filter)
     {
         mNameFilter = Utf8Stream::lowerCaseUtf8(filter);
     }
 
-    void SortFilterItemModel::setEffectFilter (const std::string& filter)
+    void SortFilterItemModel::setEffectFilter(const std::string& filter)
     {
         mEffectFilter = Utf8Stream::lowerCaseUtf8(filter);
     }
@@ -340,11 +363,12 @@ namespace MWGui
         size_t count = mSourceModel->getItemCount();
 
         mItems.clear();
-        for (size_t i=0; i<count; ++i)
+        for (size_t i = 0; i < count; ++i)
         {
             ItemStack item = mSourceModel->getItem(i);
 
-            for (std::vector<std::pair<MWWorld::Ptr, size_t> >::iterator it = mDragItems.begin(); it != mDragItems.end(); ++it)
+            for (std::vector<std::pair<MWWorld::Ptr, size_t>>::iterator it = mDragItems.begin(); it != mDragItems.end();
+                 ++it)
             {
                 if (item.mBase == it->first)
                 {
@@ -368,12 +392,12 @@ namespace MWGui
         mSourceModel->onClose();
     }
 
-    bool SortFilterItemModel::onDropItem(const MWWorld::Ptr &item, int count)
+    bool SortFilterItemModel::onDropItem(const MWWorld::Ptr& item, int count)
     {
         return mSourceModel->onDropItem(item, count);
     }
 
-    bool SortFilterItemModel::onTakeItem(const MWWorld::Ptr &item, int count)
+    bool SortFilterItemModel::onTakeItem(const MWWorld::Ptr& item, int count)
     {
         return mSourceModel->onTakeItem(item, count);
     }
diff --git a/apps/openmw/mwgui/sortfilteritemmodel.hpp b/apps/openmw/mwgui/sortfilteritemmodel.hpp
index 2640737a89..66a22b3afa 100644
--- a/apps/openmw/mwgui/sortfilteritemmodel.hpp
+++ b/apps/openmw/mwgui/sortfilteritemmodel.hpp
@@ -13,48 +13,47 @@ namespace MWGui
 
         void update() override;
 
-        bool filterAccepts (const ItemStack& item);
+        bool filterAccepts(const ItemStack& item);
 
         bool allowedToUseItems() const override;
-        ItemStack getItem (ModelIndex index) override;
+        ItemStack getItem(ModelIndex index) override;
         size_t getItemCount() override;
 
         /// Dragged items are not displayed.
-        void addDragItem (const MWWorld::Ptr& dragItem, size_t count);
+        void addDragItem(const MWWorld::Ptr& dragItem, size_t count);
         void clearDragItems();
 
-        void setCategory (int category);
-        void setFilter (int filter);
-        void setNameFilter (const std::string& filter);
-        void setEffectFilter (const std::string& filter);
+        void setCategory(int category);
+        void setFilter(int filter);
+        void setNameFilter(const std::string& filter);
+        void setEffectFilter(const std::string& filter);
 
         /// Use ItemStack::Type for sorting?
         void setSortByType(bool sort) { mSortByType = sort; }
 
         void onClose() override;
-        bool onDropItem(const MWWorld::Ptr &item, int count) override;
-        bool onTakeItem(const MWWorld::Ptr &item, int count) override;
+        bool onDropItem(const MWWorld::Ptr& item, int count) override;
+        bool onTakeItem(const MWWorld::Ptr& item, int count) override;
 
-        static constexpr int Category_Weapon = (1<<1);
-        static constexpr int Category_Apparel = (1<<2);
-        static constexpr int Category_Misc = (1<<3);
-        static constexpr int Category_Magic = (1<<4);
+        static constexpr int Category_Weapon = (1 << 1);
+        static constexpr int Category_Apparel = (1 << 2);
+        static constexpr int Category_Misc = (1 << 3);
+        static constexpr int Category_Magic = (1 << 4);
         static constexpr int Category_All = 255;
 
-        static constexpr int Filter_OnlyIngredients = (1<<0);
-        static constexpr int Filter_OnlyEnchanted = (1<<1);
-        static constexpr int Filter_OnlyEnchantable = (1<<2);
-        static constexpr int Filter_OnlyChargedSoulstones = (1<<3);
-        static constexpr int Filter_OnlyUsableItems = (1<<4); // Only items with a Use action
-        static constexpr int Filter_OnlyRepairable = (1<<5);
-        static constexpr int Filter_OnlyRechargable = (1<<6);
-        static constexpr int Filter_OnlyRepairTools = (1<<7);
-
+        static constexpr int Filter_OnlyIngredients = (1 << 0);
+        static constexpr int Filter_OnlyEnchanted = (1 << 1);
+        static constexpr int Filter_OnlyEnchantable = (1 << 2);
+        static constexpr int Filter_OnlyChargedSoulstones = (1 << 3);
+        static constexpr int Filter_OnlyUsableItems = (1 << 4); // Only items with a Use action
+        static constexpr int Filter_OnlyRepairable = (1 << 5);
+        static constexpr int Filter_OnlyRechargable = (1 << 6);
+        static constexpr int Filter_OnlyRepairTools = (1 << 7);
 
     private:
         std::vector<ItemStack> mItems;
 
-        std::vector<std::pair<MWWorld::Ptr, size_t> > mDragItems;
+        std::vector<std::pair<MWWorld::Ptr, size_t>> mDragItems;
 
         int mCategory;
         int mFilter;
diff --git a/apps/openmw/mwgui/soulgemdialog.cpp b/apps/openmw/mwgui/soulgemdialog.cpp
index 345c8b7221..8aaf182159 100644
--- a/apps/openmw/mwgui/soulgemdialog.cpp
+++ b/apps/openmw/mwgui/soulgemdialog.cpp
@@ -8,7 +8,7 @@
 namespace MWGui
 {
 
-    void SoulgemDialog::show(const MWWorld::Ptr &soulgem)
+    void SoulgemDialog::show(const MWWorld::Ptr& soulgem)
     {
         mSoulgem = soulgem;
         std::vector<std::string> buttons;
diff --git a/apps/openmw/mwgui/soulgemdialog.hpp b/apps/openmw/mwgui/soulgemdialog.hpp
index 9aea1f3393..775378f763 100644
--- a/apps/openmw/mwgui/soulgemdialog.hpp
+++ b/apps/openmw/mwgui/soulgemdialog.hpp
@@ -11,10 +11,12 @@ namespace MWGui
     class SoulgemDialog
     {
     public:
-        SoulgemDialog (MessageBoxManager* manager)
-            : mManager(manager) {}
+        SoulgemDialog(MessageBoxManager* manager)
+            : mManager(manager)
+        {
+        }
 
-        void show (const MWWorld::Ptr& soulgem);
+        void show(const MWWorld::Ptr& soulgem);
 
         void onButtonPressed(int button);
 
diff --git a/apps/openmw/mwgui/spellbuyingwindow.cpp b/apps/openmw/mwgui/spellbuyingwindow.cpp
index 0894e9e1f2..b0a58ddc02 100644
--- a/apps/openmw/mwgui/spellbuyingwindow.cpp
+++ b/apps/openmw/mwgui/spellbuyingwindow.cpp
@@ -1,32 +1,31 @@
 #include "spellbuyingwindow.hpp"
 
-#include <MyGUI_Gui.h>
 #include <MyGUI_Button.h>
+#include <MyGUI_Gui.h>
 #include <MyGUI_ScrollView.h>
 
 #include <components/misc/strings/lower.hpp>
 
-#include <components/esm3/loadrace.hpp>
 #include <components/esm3/loadgmst.hpp>
-
+#include <components/esm3/loadrace.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/esmstore.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
-#include "../mwmechanics/spells.hpp"
 #include "../mwmechanics/creaturestats.hpp"
+#include "../mwmechanics/spells.hpp"
 
 namespace MWGui
 {
-    SpellBuyingWindow::SpellBuyingWindow() :
-        WindowBase("openmw_spell_buying_window.layout")
+    SpellBuyingWindow::SpellBuyingWindow()
+        : WindowBase("openmw_spell_buying_window.layout")
         , mCurrentY(0)
     {
         getWidget(mCancelButton, "CancelButton");
@@ -36,18 +35,19 @@ namespace MWGui
         mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellBuyingWindow::onCancelButtonClicked);
     }
 
-    bool SpellBuyingWindow::sortSpells (const ESM::Spell* left, const ESM::Spell* right)
+    bool SpellBuyingWindow::sortSpells(const ESM::Spell* left, const ESM::Spell* right)
     {
         return Misc::StringUtils::ciLess(left->mName, right->mName);
     }
 
     void SpellBuyingWindow::addSpell(const ESM::Spell& spell)
     {
-        const MWWorld::ESMStore &store =
-            MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
 
-        int price = std::max(1, static_cast<int>(spell.mData.mCost*store.get<ESM::GameSetting>().find("fSpellValueMult")->mValue.getFloat()));
-        price = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr,price,true);
+        int price = std::max(1,
+            static_cast<int>(
+                spell.mData.mCost * store.get<ESM::GameSetting>().find("fSpellValueMult")->mValue.getFloat()));
+        price = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, price, true);
 
         MWWorld::Ptr player = MWMechanics::getPlayer();
         int playerGold = player.getClass().getContainerStore(player).count(MWWorld::ContainerStore::sGoldId);
@@ -56,39 +56,34 @@ namespace MWGui
 
         int lineHeight = MWBase::Environment::get().getWindowManager()->getFontHeight() + 2;
 
-        MyGUI::Button* toAdd =
-            mSpellsView->createWidget<MyGUI::Button>(
-                price <= playerGold ? "SandTextButton" : "SandTextButtonDisabled", // can't use setEnabled since that removes tooltip
-                0,
-                mCurrentY,
-                200,
-                lineHeight,
-                MyGUI::Align::Default
-            );
+        MyGUI::Button* toAdd = mSpellsView->createWidget<MyGUI::Button>(price <= playerGold
+                ? "SandTextButton"
+                : "SandTextButtonDisabled", // can't use setEnabled since that removes tooltip
+            0, mCurrentY, 200, lineHeight, MyGUI::Align::Default);
 
         mCurrentY += lineHeight;
 
         toAdd->setUserData(price);
-        toAdd->setCaptionWithReplacing(spell.mName+"   -   "+MyGUI::utility::toString(price)+"#{sgp}");
+        toAdd->setCaptionWithReplacing(spell.mName + "   -   " + MyGUI::utility::toString(price) + "#{sgp}");
         toAdd->setSize(mSpellsView->getWidth(), lineHeight);
         toAdd->eventMouseWheel += MyGUI::newDelegate(this, &SpellBuyingWindow::onMouseWheel);
         toAdd->setUserString("ToolTipType", "Spell");
         toAdd->setUserString("Spell", spell.mId);
         toAdd->setUserString("SpellCost", std::to_string(spell.mData.mCost));
         toAdd->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellBuyingWindow::onSpellButtonClick);
-        mSpellsWidgetMap.insert(std::make_pair (toAdd, spell.mId));
+        mSpellsWidgetMap.insert(std::make_pair(toAdd, spell.mId));
     }
 
     void SpellBuyingWindow::clearSpells()
     {
-        mSpellsView->setViewOffset(MyGUI::IntPoint(0,0));
+        mSpellsView->setViewOffset(MyGUI::IntPoint(0, 0));
         mCurrentY = 0;
         while (mSpellsView->getChildCount())
             MyGUI::Gui::getInstance().destroyWidget(mSpellsView->getChildAt(0));
         mSpellsWidgetMap.clear();
     }
 
-    void SpellBuyingWindow::setPtr(const MWWorld::Ptr &actor)
+    void SpellBuyingWindow::setPtr(const MWWorld::Ptr& actor)
     {
         setPtr(actor, 0);
     }
@@ -99,20 +94,19 @@ namespace MWGui
         mPtr = actor;
         clearSpells();
 
-        MWMechanics::Spells& merchantSpells = actor.getClass().getCreatureStats (actor).getSpells();
+        MWMechanics::Spells& merchantSpells = actor.getClass().getCreatureStats(actor).getSpells();
 
         std::vector<const ESM::Spell*> spellsToSort;
 
         for (const ESM::Spell* spell : merchantSpells)
         {
-            if (spell->mData.mType!=ESM::Spell::ST_Spell)
+            if (spell->mData.mType != ESM::Spell::ST_Spell)
                 continue; // don't try to sell diseases, curses or powers
 
             if (actor.getClass().isNpc())
             {
-                const ESM::Race* race =
-                        MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(
-                        actor.get<ESM::NPC>()->mBase->mRace);
+                const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(
+                    actor.get<ESM::NPC>()->mBase->mRace);
                 if (race->mPowers.exists(spell->mId))
                     continue;
             }
@@ -134,14 +128,16 @@ namespace MWGui
 
         updateLabels();
 
-        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the scrollbar is hidden
+        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the
+        // scrollbar is hidden
         mSpellsView->setVisibleVScroll(false);
-        mSpellsView->setCanvasSize (MyGUI::IntSize(mSpellsView->getWidth(), std::max(mSpellsView->getHeight(), mCurrentY)));
+        mSpellsView->setCanvasSize(
+            MyGUI::IntSize(mSpellsView->getWidth(), std::max(mSpellsView->getHeight(), mCurrentY)));
         mSpellsView->setVisibleVScroll(true);
         mSpellsView->setViewOffset(MyGUI::IntPoint(0, startOffset));
     }
 
-    bool SpellBuyingWindow::playerHasSpell(const std::string &id)
+    bool SpellBuyingWindow::playerHasSpell(const std::string& id)
     {
         MWWorld::Ptr player = MWMechanics::getPlayer();
         return player.getClass().getCreatureStats(player).getSpells().hasSpell(id);
@@ -157,7 +153,7 @@ namespace MWGui
 
         MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
         MWMechanics::Spells& spells = stats.getSpells();
-        spells.add (mSpellsWidgetMap.find(_sender)->second);
+        spells.add(mSpellsWidgetMap.find(_sender)->second);
         player.getClass().getContainerStore(player).remove(MWWorld::ContainerStore::sGoldId, price, player);
 
         // add gold to NPC trading gold pool
@@ -171,7 +167,7 @@ namespace MWGui
 
     void SpellBuyingWindow::onCancelButtonClicked(MyGUI::Widget* _sender)
     {
-        MWBase::Environment::get().getWindowManager()->removeGuiMode (MWGui::GM_SpellBuying);
+        MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_SpellBuying);
     }
 
     void SpellBuyingWindow::updateLabels()
@@ -180,25 +176,23 @@ namespace MWGui
         int playerGold = player.getClass().getContainerStore(player).count(MWWorld::ContainerStore::sGoldId);
 
         mPlayerGold->setCaptionWithReplacing("#{sGold}: " + MyGUI::utility::toString(playerGold));
-        mPlayerGold->setCoord(8,
-                              mPlayerGold->getTop(),
-                              mPlayerGold->getTextSize().width,
-                              mPlayerGold->getHeight());
+        mPlayerGold->setCoord(8, mPlayerGold->getTop(), mPlayerGold->getTextSize().width, mPlayerGold->getHeight());
     }
 
     void SpellBuyingWindow::onReferenceUnavailable()
     {
-        // remove both Spells and Dialogue (since you always trade with the NPC/creature that you have previously talked to)
+        // remove both Spells and Dialogue (since you always trade with the NPC/creature that you have previously talked
+        // to)
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_SpellBuying);
         MWBase::Environment::get().getWindowManager()->exitCurrentGuiMode();
     }
 
     void SpellBuyingWindow::onMouseWheel(MyGUI::Widget* _sender, int _rel)
     {
-        if (mSpellsView->getViewOffset().top + _rel*0.3 > 0)
+        if (mSpellsView->getViewOffset().top + _rel * 0.3 > 0)
             mSpellsView->setViewOffset(MyGUI::IntPoint(0, 0));
         else
-            mSpellsView->setViewOffset(MyGUI::IntPoint(0, static_cast<int>(mSpellsView->getViewOffset().top + _rel*0.3f)));
+            mSpellsView->setViewOffset(
+                MyGUI::IntPoint(0, static_cast<int>(mSpellsView->getViewOffset().top + _rel * 0.3f)));
     }
 }
-
diff --git a/apps/openmw/mwgui/spellbuyingwindow.hpp b/apps/openmw/mwgui/spellbuyingwindow.hpp
index f46c437963..17c49eb68c 100644
--- a/apps/openmw/mwgui/spellbuyingwindow.hpp
+++ b/apps/openmw/mwgui/spellbuyingwindow.hpp
@@ -1,8 +1,8 @@
 #ifndef MWGUI_SpellBuyingWINDOW_H
 #define MWGUI_SpellBuyingWINDOW_H
 
-#include "windowbase.hpp"
 #include "referenceinterface.hpp"
+#include "windowbase.hpp"
 
 namespace ESM
 {
@@ -11,48 +11,48 @@ namespace ESM
 
 namespace MyGUI
 {
-  class Gui;
-  class Widget;
+    class Gui;
+    class Widget;
 }
 
 namespace MWGui
 {
     class SpellBuyingWindow : public ReferenceInterface, public WindowBase
     {
-        public:
-            SpellBuyingWindow();
+    public:
+        SpellBuyingWindow();
 
-            void setPtr(const MWWorld::Ptr& actor) override;
-            void setPtr(const MWWorld::Ptr& actor, int startOffset);
+        void setPtr(const MWWorld::Ptr& actor) override;
+        void setPtr(const MWWorld::Ptr& actor, int startOffset);
 
-            void onFrame(float dt) override { checkReferenceAvailable(); }
-            void clear() override { resetReference(); }
+        void onFrame(float dt) override { checkReferenceAvailable(); }
+        void clear() override { resetReference(); }
 
-            void onResChange(int, int) override { center(); }
+        void onResChange(int, int) override { center(); }
 
-        protected:
-            MyGUI::Button* mCancelButton;
-            MyGUI::TextBox* mPlayerGold;
+    protected:
+        MyGUI::Button* mCancelButton;
+        MyGUI::TextBox* mPlayerGold;
 
-            MyGUI::ScrollView* mSpellsView;
+        MyGUI::ScrollView* mSpellsView;
 
-            std::map<MyGUI::Widget*, std::string> mSpellsWidgetMap;
+        std::map<MyGUI::Widget*, std::string> mSpellsWidgetMap;
 
-            void onCancelButtonClicked(MyGUI::Widget* _sender);
-            void onSpellButtonClick(MyGUI::Widget* _sender);
-            void onMouseWheel(MyGUI::Widget* _sender, int _rel);
-            void addSpell(const ESM::Spell& spell);
-            void clearSpells();
-            int mCurrentY;
+        void onCancelButtonClicked(MyGUI::Widget* _sender);
+        void onSpellButtonClick(MyGUI::Widget* _sender);
+        void onMouseWheel(MyGUI::Widget* _sender, int _rel);
+        void addSpell(const ESM::Spell& spell);
+        void clearSpells();
+        int mCurrentY;
 
-            void updateLabels();
+        void updateLabels();
 
-            void onReferenceUnavailable() override;
+        void onReferenceUnavailable() override;
 
-            bool playerHasSpell (const std::string& id);
+        bool playerHasSpell(const std::string& id);
 
-        private:
-            static bool sortSpells (const ESM::Spell* left, const ESM::Spell* right);
+    private:
+        static bool sortSpells(const ESM::Spell* left, const ESM::Spell* right);
     };
 }
 
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index 43024a3db3..e57246b009 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -1,44 +1,44 @@
 #include "spellcreationdialog.hpp"
 
 #include <MyGUI_Button.h>
-#include <MyGUI_ImageBox.h>
 #include <MyGUI_Gui.h>
+#include <MyGUI_ImageBox.h>
 #include <MyGUI_ScrollBar.h>
 
-#include <components/widgets/list.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/widgets/list.hpp>
 
 #include <components/esm3/loadgmst.hpp>
 
-#include "../mwbase/windowmanager.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
-#include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
-#include "../mwworld/store.hpp"
+#include "../mwworld/containerstore.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/store.hpp"
 
-#include "../mwmechanics/spellutil.hpp"
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"
+#include "../mwmechanics/spellutil.hpp"
 
-#include "tooltips.hpp"
 #include "class.hpp"
+#include "tooltips.hpp"
 #include "widgets.hpp"
 
 namespace
 {
 
-    bool sortMagicEffects (short id1, short id2)
+    bool sortMagicEffects(short id1, short id2)
     {
-        const MWWorld::Store<ESM::GameSetting> &gmst =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
-        return gmst.find(ESM::MagicEffect::effectIdToString (id1))->mValue.getString()
-                < gmst.find(ESM::MagicEffect::effectIdToString  (id2))->mValue.getString();
+        return gmst.find(ESM::MagicEffect::effectIdToString(id1))->mValue.getString()
+            < gmst.find(ESM::MagicEffect::effectIdToString(id2))->mValue.getString();
     }
 
     void init(ESM::ENAMstruct& effect)
@@ -90,8 +90,10 @@ namespace MWGui
         mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &EditEffectDialog::onCancelButtonClicked);
         mDeleteButton->eventMouseButtonClick += MyGUI::newDelegate(this, &EditEffectDialog::onDeleteButtonClicked);
 
-        mMagnitudeMinSlider->eventScrollChangePosition += MyGUI::newDelegate(this, &EditEffectDialog::onMagnitudeMinChanged);
-        mMagnitudeMaxSlider->eventScrollChangePosition += MyGUI::newDelegate(this, &EditEffectDialog::onMagnitudeMaxChanged);
+        mMagnitudeMinSlider->eventScrollChangePosition
+            += MyGUI::newDelegate(this, &EditEffectDialog::onMagnitudeMinChanged);
+        mMagnitudeMaxSlider->eventScrollChangePosition
+            += MyGUI::newDelegate(this, &EditEffectDialog::onMagnitudeMaxChanged);
         mDurationSlider->eventScrollChangePosition += MyGUI::newDelegate(this, &EditEffectDialog::onDurationChanged);
         mAreaSlider->eventScrollChangePosition += MyGUI::newDelegate(this, &EditEffectDialog::onAreaChanged);
     }
@@ -109,14 +111,14 @@ namespace MWGui
 
     bool EditEffectDialog::exit()
     {
-        if(mEditing)
+        if (mEditing)
             eventEffectModified(mOldEffect);
         else
             eventEffectRemoved(mEffect);
         return true;
     }
 
-    void EditEffectDialog::newEffect (const ESM::MagicEffect *effect)
+    void EditEffectDialog::newEffect(const ESM::MagicEffect* effect)
     {
         bool allowSelf = (effect->mData.mFlags & ESM::MagicEffect::CastSelf) != 0;
         bool allowTouch = (effect->mData.mFlags & ESM::MagicEffect::CastTouch) && !mConstantEffect;
@@ -124,7 +126,7 @@ namespace MWGui
         setMagicEffect(effect);
         mEditing = false;
 
-        mDeleteButton->setVisible (false);
+        mDeleteButton->setVisible(false);
 
         mEffect.mRange = ESM::RT_Self;
         if (!allowSelf)
@@ -141,14 +143,14 @@ namespace MWGui
 
         onRangeButtonClicked(mRangeButton);
 
-        mMagnitudeMinSlider->setScrollPosition (0);
-        mMagnitudeMaxSlider->setScrollPosition (0);
-        mAreaSlider->setScrollPosition (0);
-        mDurationSlider->setScrollPosition (0);
+        mMagnitudeMinSlider->setScrollPosition(0);
+        mMagnitudeMaxSlider->setScrollPosition(0);
+        mAreaSlider->setScrollPosition(0);
+        mDurationSlider->setScrollPosition(0);
 
         mDurationValue->setCaption("1");
         mMagnitudeMinValue->setCaption("1");
-        const std::string to{MWBase::Environment::get().getWindowManager()->getGameSettingString("sTo", "-")};
+        const std::string to{ MWBase::Environment::get().getWindowManager()->getGameSettingString("sTo", "-") };
 
         mMagnitudeMaxValue->setCaption(to + " 1");
         mAreaValue->setCaption("0");
@@ -156,45 +158,45 @@ namespace MWGui
         setVisible(true);
     }
 
-    void EditEffectDialog::editEffect (ESM::ENAMstruct effect)
+    void EditEffectDialog::editEffect(ESM::ENAMstruct effect)
     {
-        const ESM::MagicEffect* magicEffect =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effect.mEffectID);
+        const ESM::MagicEffect* magicEffect
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effect.mEffectID);
 
         setMagicEffect(magicEffect);
         mOldEffect = effect;
         mEffect = effect;
         mEditing = true;
 
-        mDeleteButton->setVisible (true);
+        mDeleteButton->setVisible(true);
 
-        mMagnitudeMinSlider->setScrollPosition (effect.mMagnMin-1);
-        mMagnitudeMaxSlider->setScrollPosition (effect.mMagnMax-1);
-        mAreaSlider->setScrollPosition (effect.mArea);
-        mDurationSlider->setScrollPosition (effect.mDuration-1);
+        mMagnitudeMinSlider->setScrollPosition(effect.mMagnMin - 1);
+        mMagnitudeMaxSlider->setScrollPosition(effect.mMagnMax - 1);
+        mAreaSlider->setScrollPosition(effect.mArea);
+        mDurationSlider->setScrollPosition(effect.mDuration - 1);
 
         if (mEffect.mRange == ESM::RT_Self)
-            mRangeButton->setCaptionWithReplacing ("#{sRangeSelf}");
+            mRangeButton->setCaptionWithReplacing("#{sRangeSelf}");
         else if (mEffect.mRange == ESM::RT_Target)
-            mRangeButton->setCaptionWithReplacing ("#{sRangeTarget}");
+            mRangeButton->setCaptionWithReplacing("#{sRangeTarget}");
         else if (mEffect.mRange == ESM::RT_Touch)
-            mRangeButton->setCaptionWithReplacing ("#{sRangeTouch}");
+            mRangeButton->setCaptionWithReplacing("#{sRangeTouch}");
 
-        onMagnitudeMinChanged (mMagnitudeMinSlider, effect.mMagnMin-1);
-        onMagnitudeMaxChanged (mMagnitudeMinSlider, effect.mMagnMax-1);
-        onAreaChanged (mAreaSlider, effect.mArea);
-        onDurationChanged (mDurationSlider, effect.mDuration-1);
+        onMagnitudeMinChanged(mMagnitudeMinSlider, effect.mMagnMin - 1);
+        onMagnitudeMaxChanged(mMagnitudeMinSlider, effect.mMagnMax - 1);
+        onAreaChanged(mAreaSlider, effect.mArea);
+        onDurationChanged(mDurationSlider, effect.mDuration - 1);
         eventEffectModified(mEffect);
 
         updateBoxes();
     }
 
-    void EditEffectDialog::setMagicEffect (const ESM::MagicEffect *effect)
+    void EditEffectDialog::setMagicEffect(const ESM::MagicEffect* effect)
     {
-        mEffectImage->setImageTexture(Misc::ResourceHelpers::correctIconPath(effect->mIcon,
-            MWBase::Environment::get().getResourceSystem()->getVFS()));
+        mEffectImage->setImageTexture(Misc::ResourceHelpers::correctIconPath(
+            effect->mIcon, MWBase::Environment::get().getResourceSystem()->getVFS()));
 
-        mEffectName->setCaptionWithReplacing("#{"+ESM::MagicEffect::effectIdToString  (effect->mIndex)+"}");
+        mEffectName->setCaptionWithReplacing("#{" + ESM::MagicEffect::effectIdToString(effect->mIndex) + "}");
 
         mEffect.mEffectID = effect->mIndex;
 
@@ -208,129 +210,131 @@ namespace MWGui
         static int startY = mMagnitudeBox->getPosition().top;
         int curY = startY;
 
-        mMagnitudeBox->setVisible (false);
-        mDurationBox->setVisible (false);
-        mAreaBox->setVisible (false);
+        mMagnitudeBox->setVisible(false);
+        mDurationBox->setVisible(false);
+        mAreaBox->setVisible(false);
 
         if (!(mMagicEffect->mData.mFlags & ESM::MagicEffect::NoMagnitude))
         {
             mMagnitudeBox->setPosition(mMagnitudeBox->getPosition().left, curY);
-            mMagnitudeBox->setVisible (true);
+            mMagnitudeBox->setVisible(true);
             curY += mMagnitudeBox->getSize().height;
         }
-        if (!(mMagicEffect->mData.mFlags & ESM::MagicEffect::NoDuration)&&mConstantEffect==false)
+        if (!(mMagicEffect->mData.mFlags & ESM::MagicEffect::NoDuration) && mConstantEffect == false)
         {
             mDurationBox->setPosition(mDurationBox->getPosition().left, curY);
-            mDurationBox->setVisible (true);
+            mDurationBox->setVisible(true);
             curY += mDurationBox->getSize().height;
         }
         if (mEffect.mRange != ESM::RT_Self)
         {
             mAreaBox->setPosition(mAreaBox->getPosition().left, curY);
-            mAreaBox->setVisible (true);
-            //curY += mAreaBox->getSize().height;
+            mAreaBox->setVisible(true);
+            // curY += mAreaBox->getSize().height;
         }
     }
 
-    void EditEffectDialog::onRangeButtonClicked (MyGUI::Widget* sender)
+    void EditEffectDialog::onRangeButtonClicked(MyGUI::Widget* sender)
     {
-        mEffect.mRange = (mEffect.mRange+1)%3;
+        mEffect.mRange = (mEffect.mRange + 1) % 3;
 
         // cycle through range types until we find something that's allowed
-        // does not handle the case where nothing is allowed (this should be prevented before opening the Add Effect dialog)
+        // does not handle the case where nothing is allowed (this should be prevented before opening the Add Effect
+        // dialog)
         bool allowSelf = (mMagicEffect->mData.mFlags & ESM::MagicEffect::CastSelf) != 0;
         bool allowTouch = (mMagicEffect->mData.mFlags & ESM::MagicEffect::CastTouch) && !mConstantEffect;
         bool allowTarget = (mMagicEffect->mData.mFlags & ESM::MagicEffect::CastTarget) && !mConstantEffect;
         if (mEffect.mRange == ESM::RT_Self && !allowSelf)
-            mEffect.mRange = (mEffect.mRange+1)%3;
+            mEffect.mRange = (mEffect.mRange + 1) % 3;
         if (mEffect.mRange == ESM::RT_Touch && !allowTouch)
-            mEffect.mRange = (mEffect.mRange+1)%3;
+            mEffect.mRange = (mEffect.mRange + 1) % 3;
         if (mEffect.mRange == ESM::RT_Target && !allowTarget)
-            mEffect.mRange = (mEffect.mRange+1)%3;
+            mEffect.mRange = (mEffect.mRange + 1) % 3;
 
-        if(mEffect.mRange == ESM::RT_Self)
+        if (mEffect.mRange == ESM::RT_Self)
         {
             mAreaSlider->setScrollPosition(0);
-            onAreaChanged(mAreaSlider,0);
+            onAreaChanged(mAreaSlider, 0);
         }
 
         if (mEffect.mRange == ESM::RT_Self)
-            mRangeButton->setCaptionWithReplacing ("#{sRangeSelf}");
+            mRangeButton->setCaptionWithReplacing("#{sRangeSelf}");
         else if (mEffect.mRange == ESM::RT_Target)
-            mRangeButton->setCaptionWithReplacing ("#{sRangeTarget}");
+            mRangeButton->setCaptionWithReplacing("#{sRangeTarget}");
         else if (mEffect.mRange == ESM::RT_Touch)
-            mRangeButton->setCaptionWithReplacing ("#{sRangeTouch}");
+            mRangeButton->setCaptionWithReplacing("#{sRangeTouch}");
 
         updateBoxes();
         eventEffectModified(mEffect);
     }
 
-    void EditEffectDialog::onDeleteButtonClicked (MyGUI::Widget* sender)
+    void EditEffectDialog::onDeleteButtonClicked(MyGUI::Widget* sender)
     {
         setVisible(false);
 
         eventEffectRemoved(mEffect);
     }
 
-    void EditEffectDialog::onOkButtonClicked (MyGUI::Widget* sender)
+    void EditEffectDialog::onOkButtonClicked(MyGUI::Widget* sender)
     {
         setVisible(false);
     }
 
-    void EditEffectDialog::onCancelButtonClicked (MyGUI::Widget* sender)
+    void EditEffectDialog::onCancelButtonClicked(MyGUI::Widget* sender)
     {
         setVisible(false);
         exit();
     }
 
-    void EditEffectDialog::setSkill (int skill)
+    void EditEffectDialog::setSkill(int skill)
     {
         mEffect.mSkill = skill;
         eventEffectModified(mEffect);
     }
 
-    void EditEffectDialog::setAttribute (int attribute)
+    void EditEffectDialog::setAttribute(int attribute)
     {
         mEffect.mAttribute = attribute;
         eventEffectModified(mEffect);
     }
 
-    void EditEffectDialog::onMagnitudeMinChanged (MyGUI::ScrollBar* sender, size_t pos)
+    void EditEffectDialog::onMagnitudeMinChanged(MyGUI::ScrollBar* sender, size_t pos)
     {
-        mMagnitudeMinValue->setCaption(MyGUI::utility::toString(pos+1));
-        mEffect.mMagnMin = pos+1;
+        mMagnitudeMinValue->setCaption(MyGUI::utility::toString(pos + 1));
+        mEffect.mMagnMin = pos + 1;
 
         // trigger the check again (see below)
-        onMagnitudeMaxChanged(mMagnitudeMaxSlider, mMagnitudeMaxSlider->getScrollPosition ());
+        onMagnitudeMaxChanged(mMagnitudeMaxSlider, mMagnitudeMaxSlider->getScrollPosition());
         eventEffectModified(mEffect);
     }
 
-    void EditEffectDialog::onMagnitudeMaxChanged (MyGUI::ScrollBar* sender, size_t pos)
+    void EditEffectDialog::onMagnitudeMaxChanged(MyGUI::ScrollBar* sender, size_t pos)
     {
         // make sure the max value is actually larger or equal than the min value
-        size_t magnMin = std::abs(mEffect.mMagnMin); // should never be < 0, this is just here to avoid the compiler warning
-        if (pos+1 < magnMin)
+        size_t magnMin
+            = std::abs(mEffect.mMagnMin); // should never be < 0, this is just here to avoid the compiler warning
+        if (pos + 1 < magnMin)
         {
-            pos = mEffect.mMagnMin-1;
-            sender->setScrollPosition (pos);
+            pos = mEffect.mMagnMin - 1;
+            sender->setScrollPosition(pos);
         }
 
-        mEffect.mMagnMax = pos+1;
-        const std::string to{MWBase::Environment::get().getWindowManager()->getGameSettingString("sTo", "-")};
+        mEffect.mMagnMax = pos + 1;
+        const std::string to{ MWBase::Environment::get().getWindowManager()->getGameSettingString("sTo", "-") };
 
-        mMagnitudeMaxValue->setCaption(to + " " + MyGUI::utility::toString(pos+1));
+        mMagnitudeMaxValue->setCaption(to + " " + MyGUI::utility::toString(pos + 1));
 
         eventEffectModified(mEffect);
     }
 
-    void EditEffectDialog::onDurationChanged (MyGUI::ScrollBar* sender, size_t pos)
+    void EditEffectDialog::onDurationChanged(MyGUI::ScrollBar* sender, size_t pos)
     {
-        mDurationValue->setCaption(MyGUI::utility::toString(pos+1));
-        mEffect.mDuration = pos+1;
+        mDurationValue->setCaption(MyGUI::utility::toString(pos + 1));
+        mEffect.mDuration = pos + 1;
         eventEffectModified(mEffect);
     }
 
-    void EditEffectDialog::onAreaChanged (MyGUI::ScrollBar* sender, size_t pos)
+    void EditEffectDialog::onAreaChanged(MyGUI::ScrollBar* sender, size_t pos)
     {
         mAreaValue->setCaption(MyGUI::utility::toString(pos));
         mEffect.mArea = pos;
@@ -359,7 +363,7 @@ namespace MWGui
         setWidgets(mAvailableEffectsList, mUsedEffectsView);
     }
 
-    void SpellCreationDialog::setPtr (const MWWorld::Ptr& actor)
+    void SpellCreationDialog::setPtr(const MWWorld::Ptr& actor)
     {
         mPtr = actor;
         mNameEdit->setCaption("");
@@ -367,28 +371,28 @@ namespace MWGui
         startEditing();
     }
 
-    void SpellCreationDialog::onCancelButtonClicked (MyGUI::Widget* sender)
+    void SpellCreationDialog::onCancelButtonClicked(MyGUI::Widget* sender)
     {
-        MWBase::Environment::get().getWindowManager()->removeGuiMode (MWGui::GM_SpellCreation);
+        MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_SpellCreation);
     }
 
-    void SpellCreationDialog::onBuyButtonClicked (MyGUI::Widget* sender)
+    void SpellCreationDialog::onBuyButtonClicked(MyGUI::Widget* sender)
     {
         if (mEffects.size() <= 0)
         {
-            MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage30}");
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage30}");
             return;
         }
 
-        if (mNameEdit->getCaption () == "")
+        if (mNameEdit->getCaption() == "")
         {
-            MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage10}");
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage10}");
             return;
         }
 
         if (mMagickaCost->getCaption() == "0")
         {
-            MWBase::Environment::get().getWindowManager()->messageBox ("#{sEnchantmentMenu8}");
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sEnchantmentMenu8}");
             return;
         }
 
@@ -398,7 +402,7 @@ namespace MWGui
         int price = MyGUI::utility::parseInt(mPriceLabel->getCaption());
         if (price > playerGold)
         {
-            MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage18}");
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage18}");
             return;
         }
 
@@ -410,18 +414,18 @@ namespace MWGui
         MWMechanics::CreatureStats& npcStats = mPtr.getClass().getCreatureStats(mPtr);
         npcStats.setGoldPool(npcStats.getGoldPool() + price);
 
-        MWBase::Environment::get().getWindowManager()->playSound ("Mysticism Hit");
+        MWBase::Environment::get().getWindowManager()->playSound("Mysticism Hit");
 
         const ESM::Spell* spell = MWBase::Environment::get().getWorld()->createRecord(mSpell);
 
         MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
         MWMechanics::Spells& spells = stats.getSpells();
-        spells.add (spell->mId);
+        spells.add(spell->mId);
 
-        MWBase::Environment::get().getWindowManager()->removeGuiMode (GM_SpellCreation);
+        MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_SpellCreation);
     }
 
-    void SpellCreationDialog::onAccept(MyGUI::EditBox *sender)
+    void SpellCreationDialog::onAccept(MyGUI::EditBox* sender)
     {
         onBuyButtonClicked(sender);
 
@@ -435,13 +439,13 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mNameEdit);
     }
 
-    void SpellCreationDialog::onReferenceUnavailable ()
+    void SpellCreationDialog::onReferenceUnavailable()
     {
-        MWBase::Environment::get().getWindowManager()->removeGuiMode (GM_Dialogue);
-        MWBase::Environment::get().getWindowManager()->removeGuiMode (GM_SpellCreation);
+        MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Dialogue);
+        MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_SpellCreation);
     }
 
-    void SpellCreationDialog::notifyEffectsChanged ()
+    void SpellCreationDialog::notifyEffectsChanged()
     {
         if (mEffects.empty())
         {
@@ -453,12 +457,12 @@ namespace MWGui
 
         float y = 0;
 
-        const MWWorld::ESMStore &store =
-            MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
 
         for (const ESM::ENAMstruct& effect : mEffects)
         {
-            y += std::max(1.f, MWMechanics::calcEffectCost(effect, nullptr, MWMechanics::EffectCostMethod::PlayerSpell));
+            y += std::max(
+                1.f, MWMechanics::calcEffectCost(effect, nullptr, MWMechanics::EffectCostMethod::PlayerSpell));
 
             if (effect.mRange == ESM::RT_Target)
                 y *= 1.5;
@@ -473,8 +477,7 @@ namespace MWGui
 
         mMagickaCost->setCaption(MyGUI::utility::toString(int(y)));
 
-        float fSpellMakingValueMult =
-            store.get<ESM::GameSetting>().find("fSpellMakingValueMult")->mValue.getFloat();
+        float fSpellMakingValueMult = store.get<ESM::GameSetting>().find("fSpellMakingValueMult")->mValue.getFloat();
 
         int price = std::max(1, static_cast<int>(y * fSpellMakingValueMult));
         price = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, price, true);
@@ -489,7 +492,6 @@ namespace MWGui
 
     // ------------------------------------------------------------------------------------------------
 
-
     EffectEditorBase::EffectEditorBase(Type type)
         : mAvailableEffectsList(nullptr)
         , mUsedEffectsView(nullptr)
@@ -503,14 +505,12 @@ namespace MWGui
         mAddEffectDialog.eventEffectModified += MyGUI::newDelegate(this, &EffectEditorBase::onEffectModified);
         mAddEffectDialog.eventEffectRemoved += MyGUI::newDelegate(this, &EffectEditorBase::onEffectRemoved);
 
-        mAddEffectDialog.setVisible (false);
+        mAddEffectDialog.setVisible(false);
     }
 
-    EffectEditorBase::~EffectEditorBase()
-    {
-    }
+    EffectEditorBase::~EffectEditorBase() {}
 
-    void EffectEditorBase::startEditing ()
+    void EffectEditorBase::startEditing()
     {
         // get the list of magic effects that are known to the player
 
@@ -528,10 +528,13 @@ namespace MWGui
 
             for (const ESM::ENAMstruct& effectInfo : spell->mEffects.mList)
             {
-                const ESM::MagicEffect * effect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectInfo.mEffectID);
+                const ESM::MagicEffect* effect
+                    = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(
+                        effectInfo.mEffectID);
 
                 // skip effects that do not allow spellmaking/enchanting
-                int requiredFlags = (mType == Spellmaking) ? ESM::MagicEffect::AllowSpellmaking : ESM::MagicEffect::AllowEnchanting;
+                int requiredFlags
+                    = (mType == Spellmaking) ? ESM::MagicEffect::AllowSpellmaking : ESM::MagicEffect::AllowEnchanting;
                 if (!(effect->mData.mFlags & requiredFlags))
                     continue;
 
@@ -542,61 +545,70 @@ namespace MWGui
 
         std::sort(knownEffects.begin(), knownEffects.end(), sortMagicEffects);
 
-        mAvailableEffectsList->clear ();
+        mAvailableEffectsList->clear();
 
-        int i=0;
+        int i = 0;
         for (const short effectId : knownEffects)
         {
-            mAvailableEffectsList->addItem(MWBase::Environment::get().getWorld ()->getStore ().get<ESM::GameSetting>().find(
-                                               ESM::MagicEffect::effectIdToString(effectId))->mValue.getString());
+            mAvailableEffectsList->addItem(MWBase::Environment::get()
+                                               .getWorld()
+                                               ->getStore()
+                                               .get<ESM::GameSetting>()
+                                               .find(ESM::MagicEffect::effectIdToString(effectId))
+                                               ->mValue.getString());
             mButtonMapping[i] = effectId;
             ++i;
         }
-        mAvailableEffectsList->adjustSize ();
+        mAvailableEffectsList->adjustSize();
         mAvailableEffectsList->scrollToTop();
 
         for (const short effectId : knownEffects)
         {
-            const std::string& name = MWBase::Environment::get().getWorld ()->getStore ().get<ESM::GameSetting>().find(
-                                               ESM::MagicEffect::effectIdToString(effectId))->mValue.getString();
+            const std::string& name = MWBase::Environment::get()
+                                          .getWorld()
+                                          ->getStore()
+                                          .get<ESM::GameSetting>()
+                                          .find(ESM::MagicEffect::effectIdToString(effectId))
+                                          ->mValue.getString();
             MyGUI::Widget* w = mAvailableEffectsList->getItemWidget(name);
 
-            ToolTips::createMagicEffectToolTip (w, effectId);
+            ToolTips::createMagicEffectToolTip(w, effectId);
         }
 
         mEffects.clear();
-        updateEffectsView ();
+        updateEffectsView();
     }
 
-    void EffectEditorBase::setWidgets (Gui::MWList *availableEffectsList, MyGUI::ScrollView *usedEffectsView)
+    void EffectEditorBase::setWidgets(Gui::MWList* availableEffectsList, MyGUI::ScrollView* usedEffectsView)
     {
         mAvailableEffectsList = availableEffectsList;
         mUsedEffectsView = usedEffectsView;
 
-        mAvailableEffectsList->eventWidgetSelected += MyGUI::newDelegate(this, &EffectEditorBase::onAvailableEffectClicked);
+        mAvailableEffectsList->eventWidgetSelected
+            += MyGUI::newDelegate(this, &EffectEditorBase::onAvailableEffectClicked);
     }
 
-    void EffectEditorBase::onSelectAttribute ()
+    void EffectEditorBase::onSelectAttribute()
     {
-        const ESM::MagicEffect* effect =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(mSelectedKnownEffectId);
+        const ESM::MagicEffect* effect
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(mSelectedKnownEffectId);
 
         mAddEffectDialog.newEffect(effect);
-        mAddEffectDialog.setAttribute (mSelectAttributeDialog->getAttributeId());
+        mAddEffectDialog.setAttribute(mSelectAttributeDialog->getAttributeId());
         MWBase::Environment::get().getWindowManager()->removeDialog(std::move(mSelectAttributeDialog));
     }
 
-    void EffectEditorBase::onSelectSkill ()
+    void EffectEditorBase::onSelectSkill()
     {
-        const ESM::MagicEffect* effect =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(mSelectedKnownEffectId);
+        const ESM::MagicEffect* effect
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(mSelectedKnownEffectId);
 
         mAddEffectDialog.newEffect(effect);
-        mAddEffectDialog.setSkill (mSelectSkillDialog->getSkillId());
+        mAddEffectDialog.setSkill(mSelectSkillDialog->getSkillId());
         MWBase::Environment::get().getWindowManager()->removeDialog(std::move(mSelectSkillDialog));
     }
 
-    void EffectEditorBase::onAttributeOrSkillCancel ()
+    void EffectEditorBase::onAttributeOrSkillCancel()
     {
         if (mSelectSkillDialog != nullptr)
             MWBase::Environment::get().getWindowManager()->removeDialog(std::move(mSelectSkillDialog));
@@ -604,7 +616,7 @@ namespace MWGui
             MWBase::Environment::get().getWindowManager()->removeDialog(std::move(mSelectAttributeDialog));
     }
 
-    void EffectEditorBase::onAvailableEffectClicked (MyGUI::Widget* sender)
+    void EffectEditorBase::onAvailableEffectClicked(MyGUI::Widget* sender)
     {
         if (mEffects.size() >= 8)
         {
@@ -615,8 +627,8 @@ namespace MWGui
         int buttonId = *sender->getUserData<int>();
         mSelectedKnownEffectId = mButtonMapping[buttonId];
 
-        const ESM::MagicEffect* effect =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(mSelectedKnownEffectId);
+        const ESM::MagicEffect* effect
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(mSelectedKnownEffectId);
 
         bool allowSelf = (effect->mData.mFlags & ESM::MagicEffect::CastSelf) != 0;
         bool allowTouch = (effect->mData.mFlags & ESM::MagicEffect::CastTouch) && !mConstantEffect;
@@ -630,14 +642,16 @@ namespace MWGui
             mSelectSkillDialog = std::make_unique<SelectSkillDialog>();
             mSelectSkillDialog->eventCancel += MyGUI::newDelegate(this, &SpellCreationDialog::onAttributeOrSkillCancel);
             mSelectSkillDialog->eventItemSelected += MyGUI::newDelegate(this, &SpellCreationDialog::onSelectSkill);
-            mSelectSkillDialog->setVisible (true);
+            mSelectSkillDialog->setVisible(true);
         }
         else if (effect->mData.mFlags & ESM::MagicEffect::TargetAttribute)
         {
             mSelectAttributeDialog = std::make_unique<SelectAttributeDialog>();
-            mSelectAttributeDialog->eventCancel += MyGUI::newDelegate(this, &SpellCreationDialog::onAttributeOrSkillCancel);
-            mSelectAttributeDialog->eventItemSelected += MyGUI::newDelegate(this, &SpellCreationDialog::onSelectAttribute);
-            mSelectAttributeDialog->setVisible (true);
+            mSelectAttributeDialog->eventCancel
+                += MyGUI::newDelegate(this, &SpellCreationDialog::onAttributeOrSkillCancel);
+            mSelectAttributeDialog->eventItemSelected
+                += MyGUI::newDelegate(this, &SpellCreationDialog::onSelectAttribute);
+            mSelectAttributeDialog->setVisible(true);
         }
         else
         {
@@ -645,7 +659,7 @@ namespace MWGui
             {
                 if (effectInfo.mEffectID == mSelectedKnownEffectId)
                 {
-                    MWBase::Environment::get().getWindowManager()->messageBox ("#{sOnetypeEffectMessage}");
+                    MWBase::Environment::get().getWindowManager()->messageBox("#{sOnetypeEffectMessage}");
                     return;
                 }
             }
@@ -654,25 +668,25 @@ namespace MWGui
         }
     }
 
-    void EffectEditorBase::onEffectModified (ESM::ENAMstruct effect)
+    void EffectEditorBase::onEffectModified(ESM::ENAMstruct effect)
     {
         mEffects[mSelectedEffect] = effect;
 
         updateEffectsView();
     }
 
-    void EffectEditorBase::onEffectRemoved (ESM::ENAMstruct effect)
+    void EffectEditorBase::onEffectRemoved(ESM::ENAMstruct effect)
     {
         mEffects.erase(mEffects.begin() + mSelectedEffect);
         updateEffectsView();
     }
 
-    void EffectEditorBase::updateEffectsView ()
+    void EffectEditorBase::updateEffectsView()
     {
-        MyGUI::EnumeratorWidgetPtr oldWidgets = mUsedEffectsView->getEnumerator ();
-        MyGUI::Gui::getInstance ().destroyWidgets (oldWidgets);
+        MyGUI::EnumeratorWidgetPtr oldWidgets = mUsedEffectsView->getEnumerator();
+        MyGUI::Gui::getInstance().destroyWidgets(oldWidgets);
 
-        MyGUI::IntSize size(0,0);
+        MyGUI::IntSize size(0, 0);
 
         int i = 0;
         for (const ESM::ENAMstruct& effectInfo : mEffects)
@@ -688,25 +702,28 @@ namespace MWGui
             params.mArea = effectInfo.mArea;
             params.mIsConstant = mConstantEffect;
 
-            MyGUI::Button* button = mUsedEffectsView->createWidget<MyGUI::Button>("", MyGUI::IntCoord(0, size.height, 0, 24), MyGUI::Align::Default);
+            MyGUI::Button* button = mUsedEffectsView->createWidget<MyGUI::Button>(
+                "", MyGUI::IntCoord(0, size.height, 0, 24), MyGUI::Align::Default);
             button->setUserData(i);
             button->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellCreationDialog::onEditEffect);
-            button->setNeedMouseFocus (true);
+            button->setNeedMouseFocus(true);
 
-            Widgets::MWSpellEffectPtr effect = button->createWidget<Widgets::MWSpellEffect>("MW_EffectImage", MyGUI::IntCoord(0,0,0,24), MyGUI::Align::Default);
+            Widgets::MWSpellEffectPtr effect = button->createWidget<Widgets::MWSpellEffect>(
+                "MW_EffectImage", MyGUI::IntCoord(0, 0, 0, 24), MyGUI::Align::Default);
 
-            effect->setNeedMouseFocus (false);
-            effect->setSpellEffect (params);
+            effect->setNeedMouseFocus(false);
+            effect->setSpellEffect(params);
 
-            effect->setSize(effect->getRequestedWidth (), 24);
-            button->setSize(effect->getRequestedWidth (), 24);
+            effect->setSize(effect->getRequestedWidth(), 24);
+            button->setSize(effect->getRequestedWidth(), 24);
 
-            size.width = std::max(size.width, effect->getRequestedWidth ());
+            size.width = std::max(size.width, effect->getRequestedWidth());
             size.height += 24;
             ++i;
         }
 
-        // Canvas size must be expressed with HScroll disabled, otherwise MyGUI would expand the scroll area when the scrollbar is hidden
+        // Canvas size must be expressed with HScroll disabled, otherwise MyGUI would expand the scroll area when the
+        // scrollbar is hidden
         mUsedEffectsView->setVisibleHScroll(false);
         mUsedEffectsView->setCanvasSize(size);
         mUsedEffectsView->setVisibleHScroll(true);
@@ -714,22 +731,22 @@ namespace MWGui
         notifyEffectsChanged();
     }
 
-    void EffectEditorBase::onEffectAdded (ESM::ENAMstruct effect)
+    void EffectEditorBase::onEffectAdded(ESM::ENAMstruct effect)
     {
         mEffects.push_back(effect);
-        mSelectedEffect=mEffects.size()-1;
+        mSelectedEffect = mEffects.size() - 1;
 
         updateEffectsView();
     }
 
-    void EffectEditorBase::onEditEffect (MyGUI::Widget *sender)
+    void EffectEditorBase::onEditEffect(MyGUI::Widget* sender)
     {
         int id = *sender->getUserData<int>();
 
         mSelectedEffect = id;
 
-        mAddEffectDialog.editEffect (mEffects[id]);
-        mAddEffectDialog.setVisible (true);
+        mAddEffectDialog.editEffect(mEffects[id]);
+        mAddEffectDialog.setVisible(true);
     }
 
     void EffectEditorBase::setConstantEffect(bool constant)
diff --git a/apps/openmw/mwgui/spellcreationdialog.hpp b/apps/openmw/mwgui/spellcreationdialog.hpp
index 683455d557..d79494dae2 100644
--- a/apps/openmw/mwgui/spellcreationdialog.hpp
+++ b/apps/openmw/mwgui/spellcreationdialog.hpp
@@ -6,8 +6,8 @@
 #include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadspel.hpp>
 
-#include "windowbase.hpp"
 #include "referenceinterface.hpp"
+#include "windowbase.hpp"
 
 namespace Gui
 {
@@ -33,8 +33,8 @@ namespace MWGui
         void setSkill(int skill);
         void setAttribute(int attribute);
 
-        void newEffect (const ESM::MagicEffect* effect);
-        void editEffect (ESM::ENAMstruct effect);
+        void newEffect(const ESM::MagicEffect* effect);
+        void editEffect(ESM::ENAMstruct effect);
         typedef MyGUI::delegates::CMultiDelegate1<ESM::ENAMstruct> EventHandle_Effect;
 
         EventHandle_Effect eventEffectAdded;
@@ -70,15 +70,15 @@ namespace MWGui
         bool mEditing;
 
     protected:
-        void onRangeButtonClicked (MyGUI::Widget* sender);
-        void onDeleteButtonClicked (MyGUI::Widget* sender);
-        void onOkButtonClicked (MyGUI::Widget* sender);
-        void onCancelButtonClicked (MyGUI::Widget* sender);
-
-        void onMagnitudeMinChanged (MyGUI::ScrollBar* sender, size_t pos);
-        void onMagnitudeMaxChanged (MyGUI::ScrollBar* sender, size_t pos);
-        void onDurationChanged (MyGUI::ScrollBar* sender, size_t pos);
-        void onAreaChanged (MyGUI::ScrollBar* sender, size_t pos);
+        void onRangeButtonClicked(MyGUI::Widget* sender);
+        void onDeleteButtonClicked(MyGUI::Widget* sender);
+        void onOkButtonClicked(MyGUI::Widget* sender);
+        void onCancelButtonClicked(MyGUI::Widget* sender);
+
+        void onMagnitudeMinChanged(MyGUI::ScrollBar* sender, size_t pos);
+        void onMagnitudeMaxChanged(MyGUI::ScrollBar* sender, size_t pos);
+        void onDurationChanged(MyGUI::ScrollBar* sender, size_t pos);
+        void onAreaChanged(MyGUI::ScrollBar* sender, size_t pos);
         void setMagicEffect(const ESM::MagicEffect* effect);
 
         void updateBoxes();
@@ -92,7 +92,6 @@ namespace MWGui
         bool mConstantEffect;
     };
 
-
     class EffectEditorBase
     {
     public:
@@ -128,7 +127,7 @@ namespace MWGui
         void onEffectModified(ESM::ENAMstruct effect);
         void onEffectRemoved(ESM::ENAMstruct effect);
 
-        void onAvailableEffectClicked (MyGUI::Widget* sender);
+        void onAvailableEffectClicked(MyGUI::Widget* sender);
 
         void onAttributeOrSkillCancel();
         void onSelectAttribute();
@@ -139,9 +138,9 @@ namespace MWGui
         void updateEffectsView();
 
         void startEditing();
-        void setWidgets (Gui::MWList* availableEffectsList, MyGUI::ScrollView* usedEffectsView);
+        void setWidgets(Gui::MWList* availableEffectsList, MyGUI::ScrollView* usedEffectsView);
 
-        virtual void notifyEffectsChanged () {}
+        virtual void notifyEffectsChanged() {}
 
     private:
         Type mType;
@@ -162,8 +161,8 @@ namespace MWGui
     protected:
         void onReferenceUnavailable() override;
 
-        void onCancelButtonClicked (MyGUI::Widget* sender);
-        void onBuyButtonClicked (MyGUI::Widget* sender);
+        void onCancelButtonClicked(MyGUI::Widget* sender);
+        void onBuyButtonClicked(MyGUI::Widget* sender);
         void onAccept(MyGUI::EditBox* sender);
 
         void notifyEffectsChanged() override;
@@ -176,7 +175,6 @@ namespace MWGui
         MyGUI::TextBox* mPriceLabel;
 
         ESM::Spell mSpell;
-
     };
 
 }
diff --git a/apps/openmw/mwgui/spellicons.cpp b/apps/openmw/mwgui/spellicons.cpp
index 60ea47683b..be59dfb171 100644
--- a/apps/openmw/mwgui/spellicons.cpp
+++ b/apps/openmw/mwgui/spellicons.cpp
@@ -1,42 +1,41 @@
 #include "spellicons.hpp"
 
-#include <sstream>
 #include <iomanip>
+#include <sstream>
 
 #include <MyGUI_ImageBox.h>
 
 #include <components/esm3/loadmgef.hpp>
-#include <components/settings/settings.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/settings/settings.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/creaturestats.hpp"
 
 #include "tooltips.hpp"
 
-
 namespace MWGui
 {
-    void SpellIcons::updateWidgets(MyGUI::Widget *parent, bool adjustSize)
+    void SpellIcons::updateWidgets(MyGUI::Widget* parent, bool adjustSize)
     {
         MWWorld::Ptr player = MWMechanics::getPlayer();
         const MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
 
         std::map<int, std::vector<MagicEffectInfo>> effects;
-        for(const auto& params : stats.getActiveSpells())
+        for (const auto& params : stats.getActiveSpells())
         {
-            for(const auto& effect : params.getEffects())
+            for (const auto& effect : params.getEffects())
             {
-                if(!(effect.mFlags & ESM::ActiveEffect::Flag_Applied))
+                if (!(effect.mFlags & ESM::ActiveEffect::Flag_Applied))
                     continue;
                 MagicEffectInfo newEffectSource;
                 newEffectSource.mKey = MWMechanics::EffectKey(effect.mEffectId, effect.mArg);
@@ -49,19 +48,24 @@ namespace MWGui
             }
         }
 
-        int w=2;
+        int w = 2;
 
         for (const auto& [effectId, effectInfos] : effects)
         {
-            const ESM::MagicEffect* effect =
-                MWBase::Environment::get().getWorld ()->getStore ().get<ESM::MagicEffect>().find(effectId);
+            const ESM::MagicEffect* effect
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectId);
 
             float remainingDuration = 0;
             float totalDuration = 0;
 
             std::string sourcesDescription;
 
-            static const float fadeTime = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fMagicStartIconBlink")->mValue.getFloat();
+            static const float fadeTime = MWBase::Environment::get()
+                                              .getWorld()
+                                              ->getStore()
+                                              .get<ESM::GameSetting>()
+                                              .find("fMagicStartIconBlink")
+                                              ->mValue.getFloat();
 
             bool addNewLine = false;
             for (const MagicEffectInfo& effectInfo : effectInfos)
@@ -86,53 +90,64 @@ namespace MWGui
                 if (effect->mData.mFlags & ESM::MagicEffect::TargetSkill)
                 {
                     sourcesDescription += " (";
-                    sourcesDescription += MWBase::Environment::get().getWindowManager()->getGameSettingString(ESM::Skill::sSkillNameIds[effectInfo.mKey.mArg], {});
+                    sourcesDescription += MWBase::Environment::get().getWindowManager()->getGameSettingString(
+                        ESM::Skill::sSkillNameIds[effectInfo.mKey.mArg], {});
                     sourcesDescription += ')';
                 }
                 if (effect->mData.mFlags & ESM::MagicEffect::TargetAttribute)
                 {
                     sourcesDescription += " (";
-                    sourcesDescription += MWBase::Environment::get().getWindowManager()->getGameSettingString(ESM::Attribute::sGmstAttributeIds[effectInfo.mKey.mArg], {});
+                    sourcesDescription += MWBase::Environment::get().getWindowManager()->getGameSettingString(
+                        ESM::Attribute::sGmstAttributeIds[effectInfo.mKey.mArg], {});
                     sourcesDescription += ')';
                 }
                 ESM::MagicEffect::MagnitudeDisplayType displayType = effect->getMagnitudeDisplayType();
                 if (displayType == ESM::MagicEffect::MDT_TimesInt)
                 {
-                    std::string_view timesInt = MWBase::Environment::get().getWindowManager()->getGameSettingString("sXTimesINT", {});
+                    std::string_view timesInt
+                        = MWBase::Environment::get().getWindowManager()->getGameSettingString("sXTimesINT", {});
                     std::stringstream formatter;
-                    formatter << std::fixed << std::setprecision(1) << " " << (effectInfo.mMagnitude / 10.0f) << timesInt;
+                    formatter << std::fixed << std::setprecision(1) << " " << (effectInfo.mMagnitude / 10.0f)
+                              << timesInt;
                     sourcesDescription += formatter.str();
                 }
-                else if ( displayType != ESM::MagicEffect::MDT_None )
+                else if (displayType != ESM::MagicEffect::MDT_None)
                 {
                     sourcesDescription += ": " + MyGUI::utility::toString(effectInfo.mMagnitude);
 
-                    if ( displayType == ESM::MagicEffect::MDT_Percentage )
-                        sourcesDescription += MWBase::Environment::get().getWindowManager()->getGameSettingString("spercent", {});
-                    else if ( displayType == ESM::MagicEffect::MDT_Feet )
+                    if (displayType == ESM::MagicEffect::MDT_Percentage)
+                        sourcesDescription
+                            += MWBase::Environment::get().getWindowManager()->getGameSettingString("spercent", {});
+                    else if (displayType == ESM::MagicEffect::MDT_Feet)
                     {
                         sourcesDescription += ' ';
-                        sourcesDescription += MWBase::Environment::get().getWindowManager()->getGameSettingString("sfeet", {});
+                        sourcesDescription
+                            += MWBase::Environment::get().getWindowManager()->getGameSettingString("sfeet", {});
                     }
-                    else if ( displayType == ESM::MagicEffect::MDT_Level )
+                    else if (displayType == ESM::MagicEffect::MDT_Level)
                     {
                         sourcesDescription += ' ';
                         if (effectInfo.mMagnitude > 1)
-                            sourcesDescription += MWBase::Environment::get().getWindowManager()->getGameSettingString("sLevels", {});
+                            sourcesDescription
+                                += MWBase::Environment::get().getWindowManager()->getGameSettingString("sLevels", {});
                         else
-                            sourcesDescription += MWBase::Environment::get().getWindowManager()->getGameSettingString("sLevel", {});
+                            sourcesDescription
+                                += MWBase::Environment::get().getWindowManager()->getGameSettingString("sLevel", {});
                     }
                     else // ESM::MagicEffect::MDT_Points
                     {
                         sourcesDescription += ' ';
                         if (effectInfo.mMagnitude > 1)
-                            sourcesDescription += MWBase::Environment::get().getWindowManager()->getGameSettingString("spoints", {});
+                            sourcesDescription
+                                += MWBase::Environment::get().getWindowManager()->getGameSettingString("spoints", {});
                         else
-                            sourcesDescription += MWBase::Environment::get().getWindowManager()->getGameSettingString("spoint", {});
+                            sourcesDescription
+                                += MWBase::Environment::get().getWindowManager()->getGameSettingString("spoint", {});
                     }
                 }
-                if (effectInfo.mRemainingTime > -1 && Settings::Manager::getBool("show effect duration","Game"))
-                    sourcesDescription += MWGui::ToolTips::getDurationString(effectInfo.mRemainingTime, " #{sDuration}");
+                if (effectInfo.mRemainingTime > -1 && Settings::Manager::getBool("show effect duration", "Game"))
+                    sourcesDescription
+                        += MWGui::ToolTips::getDurationString(effectInfo.mRemainingTime, " #{sDuration}");
 
                 addNewLine = true;
             }
@@ -142,12 +157,12 @@ namespace MWGui
                 MyGUI::ImageBox* image;
                 if (mWidgetMap.find(effectId) == mWidgetMap.end())
                 {
-                    image = parent->createWidget<MyGUI::ImageBox>
-                        ("ImageBox", MyGUI::IntCoord(w,2,16,16), MyGUI::Align::Default);
+                    image = parent->createWidget<MyGUI::ImageBox>(
+                        "ImageBox", MyGUI::IntCoord(w, 2, 16, 16), MyGUI::Align::Default);
                     mWidgetMap[effectId] = image;
 
-                    image->setImageTexture(Misc::ResourceHelpers::correctIconPath(effect->mIcon,
-                        MWBase::Environment::get().getResourceSystem()->getVFS()));
+                    image->setImageTexture(Misc::ResourceHelpers::correctIconPath(
+                        effect->mIcon, MWBase::Environment::get().getResourceSystem()->getVFS()));
 
                     const std::string& name = ESM::MagicEffect::effectIdToString(effectId);
 
@@ -163,7 +178,7 @@ namespace MWGui
                 else
                     image = mWidgetMap[effectId];
 
-                image->setPosition(w,2);
+                image->setPosition(w, 2);
                 image->setVisible(true);
                 w += 16;
 
@@ -172,7 +187,7 @@ namespace MWGui
 
                 // Fade out
                 if (totalDuration >= fadeTime && fadeTime > 0.f)
-                    image->setAlpha(std::min(remainingDuration/fadeTime, 1.f));
+                    image->setAlpha(std::min(remainingDuration / fadeTime, 1.f));
             }
             else if (mWidgetMap.find(effectId) != mWidgetMap.end())
             {
@@ -189,7 +204,7 @@ namespace MWGui
                 s = 0;
             int diff = parent->getWidth() - s;
             parent->setSize(s, parent->getHeight());
-            parent->setPosition(parent->getLeft()+diff, parent->getTop());
+            parent->setPosition(parent->getLeft() + diff, parent->getTop());
         }
 
         // hide inactive effects
diff --git a/apps/openmw/mwgui/spellicons.hpp b/apps/openmw/mwgui/spellicons.hpp
index 9825162a33..e53fa98284 100644
--- a/apps/openmw/mwgui/spellicons.hpp
+++ b/apps/openmw/mwgui/spellicons.hpp
@@ -28,7 +28,8 @@ namespace MWGui
             , mRemainingTime(0.f)
             , mTotalTime(0.f)
             , mPermanent(false)
-        {}
+        {
+        }
         std::string mSource; // display name for effect source (e.g. potion name)
         MWMechanics::EffectKey mKey;
         int mMagnitude;
@@ -43,7 +44,6 @@ namespace MWGui
         void updateWidgets(MyGUI::Widget* parent, bool adjustSize);
 
     private:
-
         std::map<int, MyGUI::ImageBox*> mWidgetMap;
     };
 
diff --git a/apps/openmw/mwgui/spellmodel.cpp b/apps/openmw/mwgui/spellmodel.cpp
index a6972b90e4..af428587f7 100644
--- a/apps/openmw/mwgui/spellmodel.cpp
+++ b/apps/openmw/mwgui/spellmodel.cpp
@@ -3,19 +3,19 @@
 #include <components/debug/debuglog.hpp>
 #include <components/misc/utf8stream.hpp>
 
-#include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadench.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/spellutil.hpp"
 
+#include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwworld/class.hpp"
 
 namespace
 {
@@ -32,21 +32,21 @@ namespace
 namespace MWGui
 {
 
-    SpellModel::SpellModel(const MWWorld::Ptr &actor, const std::string& filter)
-        : mActor(actor), mFilter(filter)
+    SpellModel::SpellModel(const MWWorld::Ptr& actor, const std::string& filter)
+        : mActor(actor)
+        , mFilter(filter)
     {
     }
 
-    SpellModel::SpellModel(const MWWorld::Ptr &actor)
+    SpellModel::SpellModel(const MWWorld::Ptr& actor)
         : mActor(actor)
     {
     }
 
-    bool SpellModel::matchingEffectExists(std::string filter, const ESM::EffectList &effects)
+    bool SpellModel::matchingEffectExists(std::string filter, const ESM::EffectList& effects)
     {
         auto wm = MWBase::Environment::get().getWindowManager();
-        const MWWorld::ESMStore &store =
-            MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
 
         for (const auto& effect : effects.mList)
         {
@@ -54,10 +54,9 @@ namespace MWGui
 
             if (effectId != -1)
             {
-                const ESM::MagicEffect *magicEffect =
-                    store.get<ESM::MagicEffect>().find(effectId);
+                const ESM::MagicEffect* magicEffect = store.get<ESM::MagicEffect>().find(effectId);
                 const std::string& effectIDStr = ESM::MagicEffect::effectIdToString(effectId);
-                std::string fullEffectName{wm->getGameSettingString(effectIDStr, {})};
+                std::string fullEffectName{ wm->getGameSettingString(effectIDStr, {}) };
 
                 if (magicEffect->mData.mFlags & ESM::MagicEffect::TargetSkill && effect.mSkill != -1)
                 {
@@ -68,7 +67,8 @@ namespace MWGui
                 if (magicEffect->mData.mFlags & ESM::MagicEffect::TargetAttribute && effect.mAttribute != -1)
                 {
                     fullEffectName += ' ';
-                    fullEffectName += wm->getGameSettingString(ESM::Attribute::sGmstAttributeIds[effect.mAttribute], {});
+                    fullEffectName
+                        += wm->getGameSettingString(ESM::Attribute::sGmstAttributeIds[effect.mAttribute], {});
                 }
 
                 std::string convert = Utf8Stream::lowerCaseUtf8(fullEffectName);
@@ -89,8 +89,7 @@ namespace MWGui
         MWMechanics::CreatureStats& stats = mActor.getClass().getCreatureStats(mActor);
         const MWMechanics::Spells& spells = stats.getSpells();
 
-        const MWWorld::ESMStore &esmStore =
-            MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
 
         std::string filter = Utf8Stream::lowerCaseUtf8(mFilter);
 
@@ -100,9 +99,8 @@ namespace MWGui
                 continue;
 
             std::string name = Utf8Stream::lowerCaseUtf8(spell->mName);
- 
-            if (name.find(filter) == std::string::npos 
-                && !matchingEffectExists(filter, spell->mEffects))
+
+            if (name.find(filter) == std::string::npos && !matchingEffectExists(filter, spell->mEffects))
                 continue;
 
             Spell newSpell;
@@ -134,17 +132,18 @@ namespace MWGui
             const ESM::Enchantment* enchant = esmStore.get<ESM::Enchantment>().search(enchantId);
             if (!enchant)
             {
-                Log(Debug::Warning) << "Warning: Can't find enchantment '" << enchantId << "' on item " << item.getCellRef().getRefId();
+                Log(Debug::Warning) << "Warning: Can't find enchantment '" << enchantId << "' on item "
+                                    << item.getCellRef().getRefId();
                 continue;
             }
 
-            if (enchant->mData.mType != ESM::Enchantment::WhenUsed && enchant->mData.mType != ESM::Enchantment::CastOnce)
+            if (enchant->mData.mType != ESM::Enchantment::WhenUsed
+                && enchant->mData.mType != ESM::Enchantment::CastOnce)
                 continue;
 
             std::string name = Utf8Stream::lowerCaseUtf8(item.getClass().getName(item));
 
-            if (name.find(filter) == std::string::npos
-                && !matchingEffectExists(filter, enchant->mEffects))
+            if (name.find(filter) == std::string::npos && !matchingEffectExists(filter, enchant->mEffects))
                 continue;
 
             Spell newSpell;
@@ -164,14 +163,15 @@ namespace MWGui
             else
             {
                 if (!item.getClass().getEquipmentSlots(item).first.empty()
-                        && item.getClass().canBeEquipped(item, mActor).first == 0)
+                    && item.getClass().canBeEquipped(item, mActor).first == 0)
                     continue;
 
-                int castCost = MWMechanics::getEffectiveEnchantmentCastCost(static_cast<float>(enchant->mData.mCost), mActor);
+                int castCost
+                    = MWMechanics::getEffectiveEnchantmentCastCost(static_cast<float>(enchant->mData.mCost), mActor);
 
                 std::string cost = std::to_string(castCost);
                 int currentCharge = int(item.getCellRef().getEnchantmentCharge());
-                if (currentCharge ==  -1)
+                if (currentCharge == -1)
                     currentCharge = enchant->mData.mCharge;
                 std::string charge = std::to_string(currentCharge);
                 newSpell.mCostColumn = cost + "/" + charge;
@@ -192,9 +192,10 @@ namespace MWGui
     SpellModel::ModelIndex SpellModel::getSelectedIndex() const
     {
         ModelIndex selected = -1;
-        for (SpellModel::ModelIndex i = 0; i<int(getItemCount()); ++i)
+        for (SpellModel::ModelIndex i = 0; i < int(getItemCount()); ++i)
         {
-            if (getItem(i).mSelected) {
+            if (getItem(i).mSelected)
+            {
                 selected = i;
                 break;
             }
diff --git a/apps/openmw/mwgui/spellmodel.hpp b/apps/openmw/mwgui/spellmodel.hpp
index af8000c278..888808776f 100644
--- a/apps/openmw/mwgui/spellmodel.hpp
+++ b/apps/openmw/mwgui/spellmodel.hpp
@@ -45,7 +45,7 @@ namespace MWGui
 
         void update();
 
-        Spell getItem (ModelIndex index) const;
+        Spell getItem(ModelIndex index) const;
         ///< throws for invalid index
 
         size_t getItemCount() const;
@@ -59,7 +59,7 @@ namespace MWGui
 
         std::string mFilter;
 
-        bool matchingEffectExists(std::string filter, const ESM::EffectList &effects);
+        bool matchingEffectExists(std::string filter, const ESM::EffectList& effects);
     };
 
 }
diff --git a/apps/openmw/mwgui/spellview.cpp b/apps/openmw/mwgui/spellview.cpp
index fe081e0b16..98469f17e5 100644
--- a/apps/openmw/mwgui/spellview.cpp
+++ b/apps/openmw/mwgui/spellview.cpp
@@ -1,15 +1,15 @@
 #include "spellview.hpp"
 
 #include <MyGUI_FactoryManager.h>
-#include <MyGUI_ScrollView.h>
-#include <MyGUI_ImageBox.h>
 #include <MyGUI_Gui.h>
+#include <MyGUI_ImageBox.h>
+#include <MyGUI_ScrollView.h>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include <components/widgets/sharedstatebutton.hpp>
 #include <components/widgets/box.hpp>
+#include <components/widgets/sharedstatebutton.hpp>
 
 #include "tooltips.hpp"
 
@@ -18,12 +18,12 @@ namespace MWGui
 
     const char* SpellView::sSpellModelIndex = "SpellModelIndex";
 
-    SpellView::LineInfo::LineInfo(MyGUI::Widget* leftWidget, MyGUI::Widget* rightWidget, SpellModel::ModelIndex spellIndex)
+    SpellView::LineInfo::LineInfo(
+        MyGUI::Widget* leftWidget, MyGUI::Widget* rightWidget, SpellModel::ModelIndex spellIndex)
         : mLeftWidget(leftWidget)
         , mRightWidget(rightWidget)
         , mSpellIndex(spellIndex)
     {
-
     }
 
     SpellView::SpellView()
@@ -49,7 +49,7 @@ namespace MWGui
         MyGUI::FactoryManager::getInstance().registerFactory<SpellView>("Widget");
     }
 
-    void SpellView::setModel(SpellModel *model)
+    void SpellView::setModel(SpellModel* model)
     {
         mModel.reset(model);
         update();
@@ -94,7 +94,7 @@ namespace MWGui
         while (mScrollView->getChildCount())
             MyGUI::Gui::getInstance().destroyWidget(mScrollView->getChildAt(0));
 
-        for (SpellModel::ModelIndex i = 0; i<int(mModel->getItemCount()); ++i)
+        for (SpellModel::ModelIndex i = 0; i < int(mModel->getItemCount()); ++i)
         {
             const Spell& spell = mModel->getItem(i);
             if (curType != spell.mType)
@@ -111,8 +111,8 @@ namespace MWGui
             const std::string skin = spell.mActive ? "SandTextButton" : "SpellTextUnequipped";
             const std::string captionSuffix = MWGui::ToolTips::getCountString(spell.mCount);
 
-            Gui::SharedStateButton* t = mScrollView->createWidget<Gui::SharedStateButton>(skin,
-                MyGUI::IntCoord(0, 0, 0, spellHeight), MyGUI::Align::Left | MyGUI::Align::Top);
+            Gui::SharedStateButton* t = mScrollView->createWidget<Gui::SharedStateButton>(
+                skin, MyGUI::IntCoord(0, 0, 0, spellHeight), MyGUI::Align::Left | MyGUI::Align::Top);
             t->setNeedKeyFocus(true);
             t->setCaption(spell.mName + captionSuffix);
             t->setTextAlign(MyGUI::Align::Left);
@@ -120,8 +120,8 @@ namespace MWGui
 
             if (!spell.mCostColumn.empty() && mShowCostColumn)
             {
-                Gui::SharedStateButton* costChance = mScrollView->createWidget<Gui::SharedStateButton>(skin,
-                    MyGUI::IntCoord(0, 0, 0, spellHeight), MyGUI::Align::Left | MyGUI::Align::Top);
+                Gui::SharedStateButton* costChance = mScrollView->createWidget<Gui::SharedStateButton>(
+                    skin, MyGUI::IntCoord(0, 0, 0, spellHeight), MyGUI::Align::Left | MyGUI::Align::Top);
                 costChance->setCaption(spell.mCostColumn);
                 costChance->setTextAlign(MyGUI::Align::Right);
                 adjustSpellWidget(spell, i, costChance);
@@ -190,14 +190,12 @@ namespace MWGui
 
         // special case, look for spells added to model that are beyond last updatable item
         SpellModel::ModelIndex topSpellIndex = mModel->getItemCount() - 1;
-        if (fullUpdateRequired ||
-            ((0 <= topSpellIndex) && (maxSpellIndexFound < topSpellIndex)))
+        if (fullUpdateRequired || ((0 <= topSpellIndex) && (maxSpellIndexFound < topSpellIndex)))
         {
             update();
         }
     }
 
-
     void SpellView::layoutWidgets()
     {
         int height = 0;
@@ -225,26 +223,25 @@ namespace MWGui
             height += lineHeight;
         }
 
-        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the scrollbar is hidden
+        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the
+        // scrollbar is hidden
         mScrollView->setVisibleVScroll(false);
         mScrollView->setCanvasSize(mScrollView->getWidth(), std::max(mScrollView->getHeight(), height));
         mScrollView->setVisibleVScroll(true);
     }
 
-    void SpellView::addGroup(const std::string &label, const std::string& label2)
+    void SpellView::addGroup(const std::string& label, const std::string& label2)
     {
         if (mScrollView->getChildCount() > 0)
         {
-            MyGUI::ImageBox* separator = mScrollView->createWidget<MyGUI::ImageBox>("MW_HLine",
-                MyGUI::IntCoord(0, 0, mScrollView->getWidth(), 18),
-                MyGUI::Align::Left | MyGUI::Align::Top);
+            MyGUI::ImageBox* separator = mScrollView->createWidget<MyGUI::ImageBox>(
+                "MW_HLine", MyGUI::IntCoord(0, 0, mScrollView->getWidth(), 18), MyGUI::Align::Left | MyGUI::Align::Top);
             separator->setNeedMouseFocus(false);
             mLines.emplace_back(separator, (MyGUI::Widget*)nullptr, NoSpellIndex);
         }
 
         MyGUI::TextBox* groupWidget = mScrollView->createWidget<Gui::TextBox>("SandBrightText",
-            MyGUI::IntCoord(0, 0, mScrollView->getWidth(), 24),
-            MyGUI::Align::Left | MyGUI::Align::Top);
+            MyGUI::IntCoord(0, 0, mScrollView->getWidth(), 24), MyGUI::Align::Left | MyGUI::Align::Top);
         groupWidget->setCaptionWithReplacing(label);
         groupWidget->setTextAlign(MyGUI::Align::Left);
         groupWidget->setNeedMouseFocus(false);
@@ -252,8 +249,7 @@ namespace MWGui
         if (label2 != "")
         {
             MyGUI::TextBox* groupWidget2 = mScrollView->createWidget<Gui::TextBox>("SandBrightText",
-                MyGUI::IntCoord(0, 0, mScrollView->getWidth(), 24),
-                MyGUI::Align::Left | MyGUI::Align::Top);
+                MyGUI::IntCoord(0, 0, mScrollView->getWidth(), 24), MyGUI::Align::Left | MyGUI::Align::Top);
             groupWidget2->setCaptionWithReplacing(label2);
             groupWidget2->setTextAlign(MyGUI::Align::Right);
             groupWidget2->setNeedMouseFocus(false);
@@ -264,8 +260,7 @@ namespace MWGui
             mLines.emplace_back(groupWidget, (MyGUI::Widget*)nullptr, NoSpellIndex);
     }
 
-
-    void SpellView::setSize(const MyGUI::IntSize &_value)
+    void SpellView::setSize(const MyGUI::IntSize& _value)
     {
         bool changed = (_value.width != getWidth() || _value.height != getHeight());
         Base::setSize(_value);
@@ -273,7 +268,7 @@ namespace MWGui
             layoutWidgets();
     }
 
-    void SpellView::setCoord(const MyGUI::IntCoord &_value)
+    void SpellView::setCoord(const MyGUI::IntCoord& _value)
     {
         bool changed = (_value.width != getWidth() || _value.height != getHeight());
         Base::setCoord(_value);
@@ -281,7 +276,7 @@ namespace MWGui
             layoutWidgets();
     }
 
-    void SpellView::adjustSpellWidget(const Spell &spell, SpellModel::ModelIndex index, MyGUI::Widget *widget)
+    void SpellView::adjustSpellWidget(const Spell& spell, SpellModel::ModelIndex index, MyGUI::Widget* widget)
     {
         if (spell.mType == Spell::Type_EnchantedItem)
         {
@@ -312,10 +307,11 @@ namespace MWGui
 
     void SpellView::onMouseWheelMoved(MyGUI::Widget* _sender, int _rel)
     {
-        if (mScrollView->getViewOffset().top + _rel*0.3f > 0)
+        if (mScrollView->getViewOffset().top + _rel * 0.3f > 0)
             mScrollView->setViewOffset(MyGUI::IntPoint(0, 0));
         else
-            mScrollView->setViewOffset(MyGUI::IntPoint(0, static_cast<int>(mScrollView->getViewOffset().top + _rel*0.3f)));
+            mScrollView->setViewOffset(
+                MyGUI::IntPoint(0, static_cast<int>(mScrollView->getViewOffset().top + _rel * 0.3f)));
     }
 
     void SpellView::resetScrollbars()
diff --git a/apps/openmw/mwgui/spellview.hpp b/apps/openmw/mwgui/spellview.hpp
index 6b3effc453..8805aaf2ab 100644
--- a/apps/openmw/mwgui/spellview.hpp
+++ b/apps/openmw/mwgui/spellview.hpp
@@ -26,7 +26,7 @@ namespace MWGui
         SpellView();
 
         /// Register needed components with MyGUI's factory manager
-        static void registerComponents ();
+        static void registerComponents();
 
         /// Should the cost/chance column be shown?
         void setShowCostColumn(bool show);
@@ -34,7 +34,7 @@ namespace MWGui
         void setHighlightSelected(bool highlight);
 
         /// Takes ownership of \a model
-        void setModel (SpellModel* model);
+        void setModel(SpellModel* model);
 
         SpellModel* getModel();
 
@@ -75,9 +75,12 @@ namespace MWGui
         };
 
         /// magic number indicating LineInfo does not correspond to an item in mModel
-        enum { NoSpellIndex = -1 };
+        enum
+        {
+            NoSpellIndex = -1
+        };
 
-        std::vector< LineInfo > mLines;
+        std::vector<LineInfo> mLines;
 
         bool mShowCostColumn;
         bool mHighlightSelected;
diff --git a/apps/openmw/mwgui/spellwindow.cpp b/apps/openmw/mwgui/spellwindow.cpp
index f35d435f0c..59312a33af 100644
--- a/apps/openmw/mwgui/spellwindow.cpp
+++ b/apps/openmw/mwgui/spellwindow.cpp
@@ -3,28 +3,28 @@
 #include <MyGUI_EditBox.h>
 #include <MyGUI_InputManager.h>
 
-#include <components/settings/settings.hpp>
-#include <components/misc/strings/format.hpp>
-#include <components/esm3/loadrace.hpp>
 #include <components/esm3/loadbsgn.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/misc/strings/format.hpp>
+#include <components/settings/settings.hpp>
 
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/player.hpp"
 
-#include "../mwmechanics/spellutil.hpp"
-#include "../mwmechanics/spells.hpp"
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/creaturestats.hpp"
+#include "../mwmechanics/spells.hpp"
+#include "../mwmechanics/spellutil.hpp"
 
-#include "spellicons.hpp"
 #include "confirmationdialog.hpp"
+#include "spellicons.hpp"
 #include "spellview.hpp"
 
 namespace MWGui
@@ -81,7 +81,7 @@ namespace MWGui
         updateSpells();
     }
 
-    void SpellWindow::onFrame(float dt) 
+    void SpellWindow::onFrame(float dt)
     {
         NoDrop::onFrame(dt);
         mUpdateTimer += dt;
@@ -121,8 +121,7 @@ namespace MWGui
             throw std::runtime_error("can't find selected item");
 
         // equip, if it can be equipped and is not already equipped
-        if (!alreadyEquipped
-            && !item.getClass().getEquipmentSlots(item).first.empty())
+        if (!alreadyEquipped && !item.getClass().getEquipmentSlots(item).first.empty())
         {
             MWBase::Environment::get().getWindowManager()->useItem(item);
             // make sure that item was successfully equipped
@@ -137,11 +136,10 @@ namespace MWGui
         updateSpells();
     }
 
-    void SpellWindow::askDeleteSpell(const std::string &spellId)
+    void SpellWindow::askDeleteSpell(const std::string& spellId)
     {
         // delete spell, if allowed
-        const ESM::Spell* spell =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(spellId);
+        const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(spellId);
 
         MWWorld::Ptr player = MWMechanics::getPlayer();
         const std::string& raceId = player.get<ESM::NPC>()->mBase->mRace;
@@ -151,7 +149,8 @@ namespace MWGui
         const std::string& signId = MWBase::Environment::get().getWorld()->getPlayer().getBirthSign();
         if (!isInherent && !signId.empty())
         {
-            const ESM::BirthSign* sign = MWBase::Environment::get().getWorld()->getStore().get<ESM::BirthSign>().find(signId);
+            const ESM::BirthSign* sign
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::BirthSign>().find(signId);
             isInherent = sign->mPowers.exists(spell->mId);
         }
 
@@ -165,7 +164,7 @@ namespace MWGui
             // ask for confirmation
             mSpellToDelete = spellId;
             ConfirmationDialog* dialog = windowManager->getConfirmationDialog();
-            std::string question{windowManager->getGameSettingString("sQuestionDeleteSpell", "Delete %s?")};
+            std::string question{ windowManager->getGameSettingString("sQuestionDeleteSpell", "Delete %s?") };
             question = Misc::StringUtils::format(question, spell->mName);
             dialog->askForConfirmation(question);
             dialog->eventOkClicked.clear();
@@ -190,12 +189,12 @@ namespace MWGui
         }
     }
 
-    void SpellWindow::onFilterChanged(MyGUI::EditBox *sender)
+    void SpellWindow::onFilterChanged(MyGUI::EditBox* sender)
     {
         mSpellView->setModel(new SpellModel(MWMechanics::getPlayer(), sender->getCaption()));
     }
 
-    void SpellWindow::onDeleteClicked(MyGUI::Widget *widget)
+    void SpellWindow::onDeleteClicked(MyGUI::Widget* widget)
     {
         SpellModel::ModelIndex selected = mSpellView->getModel()->getSelectedIndex();
         if (selected < 0)
@@ -211,7 +210,8 @@ namespace MWGui
         MWWorld::Ptr player = MWMechanics::getPlayer();
         MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
         store.setSelectedEnchantItem(store.end());
-        MWBase::Environment::get().getWindowManager()->setSelectedSpell(spellId, int(MWMechanics::getSpellSuccessChance(spellId, player)));
+        MWBase::Environment::get().getWindowManager()->setSelectedSpell(
+            spellId, int(MWMechanics::getSpellSuccessChance(spellId, player)));
 
         updateSpells();
     }
@@ -238,7 +238,7 @@ namespace MWGui
             return;
 
         bool godmode = MWBase::Environment::get().getWorld()->getGodModeState();
-        const MWMechanics::CreatureStats &stats = player.getClass().getCreatureStats(player);
+        const MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
         if ((!godmode && stats.isParalyzed()) || stats.getKnockedDown() || stats.isDead() || stats.getHitRecovery())
             return;
 
diff --git a/apps/openmw/mwgui/spellwindow.hpp b/apps/openmw/mwgui/spellwindow.hpp
index f7176bebd6..7e2e7e267f 100644
--- a/apps/openmw/mwgui/spellwindow.hpp
+++ b/apps/openmw/mwgui/spellwindow.hpp
@@ -31,8 +31,8 @@ namespace MWGui
         void onEnchantedItemSelected(MWWorld::Ptr item, bool alreadyEquipped);
         void onSpellSelected(const std::string& spellId);
         void onModelIndexSelected(SpellModel::ModelIndex index);
-        void onFilterChanged(MyGUI::EditBox *sender);
-        void onDeleteClicked(MyGUI::Widget *widget);
+        void onFilterChanged(MyGUI::EditBox* sender);
+        void onDeleteClicked(MyGUI::Widget* widget);
         void onDeleteSpellAccept();
         void askDeleteSpell(const std::string& spellId);
 
diff --git a/apps/openmw/mwgui/statswatcher.cpp b/apps/openmw/mwgui/statswatcher.cpp
index 46be15542a..1318173a60 100644
--- a/apps/openmw/mwgui/statswatcher.cpp
+++ b/apps/openmw/mwgui/statswatcher.cpp
@@ -1,7 +1,7 @@
 #include "statswatcher.hpp"
 
-#include <components/esm3/loadrace.hpp>
 #include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadrace.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -21,7 +21,9 @@ namespace MWGui
     // mWatchedTimeToStartDrowning = -1 for correct drowning state check,
     // if stats.getTimeToStartDrowning() == 0 already on game start
     StatsWatcher::StatsWatcher()
-      : mWatchedLevel(-1), mWatchedTimeToStartDrowning(-1), mWatchedStatsEmpty(true)
+        : mWatchedLevel(-1)
+        , mWatchedTimeToStartDrowning(-1)
+        , mWatchedStatsEmpty(true)
     {
     }
 
@@ -35,9 +37,9 @@ namespace MWGui
         if (mWatched.isEmpty())
             return;
 
-        MWBase::WindowManager *winMgr = MWBase::Environment::get().getWindowManager();
-        const MWMechanics::NpcStats &stats = mWatched.getClass().getNpcStats(mWatched);
-        for (int i = 0;i < ESM::Attribute::Length;++i)
+        MWBase::WindowManager* winMgr = MWBase::Environment::get().getWindowManager();
+        const MWMechanics::NpcStats& stats = mWatched.getClass().getNpcStats(mWatched);
+        for (int i = 0; i < ESM::Attribute::Length; ++i)
         {
             if (stats.getAttribute(i) != mWatchedAttributes[i] || mWatchedStatsEmpty)
             {
@@ -69,12 +71,16 @@ namespace MWGui
 
         if (timeToDrown != mWatchedTimeToStartDrowning)
         {
-            static const float fHoldBreathTime = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
-                    .find("fHoldBreathTime")->mValue.getFloat();
+            static const float fHoldBreathTime = MWBase::Environment::get()
+                                                     .getWorld()
+                                                     ->getStore()
+                                                     .get<ESM::GameSetting>()
+                                                     .find("fHoldBreathTime")
+                                                     ->mValue.getFloat();
 
             mWatchedTimeToStartDrowning = timeToDrown;
 
-            if(timeToDrown >= fHoldBreathTime || timeToDrown == -1.0) // -1.0 is a special value during initialization
+            if (timeToDrown >= fHoldBreathTime || timeToDrown == -1.0) // -1.0 is a special value during initialization
                 winMgr->setDrowningBarVisibility(false);
             else
             {
@@ -83,10 +89,10 @@ namespace MWGui
             }
         }
 
-        //Loop over ESM::Skill::SkillEnum
+        // Loop over ESM::Skill::SkillEnum
         for (int i = 0; i < ESM::Skill::Length; ++i)
         {
-            if(stats.getSkill(i) != mWatchedSkills[i] || mWatchedStatsEmpty)
+            if (stats.getSkill(i) != mWatchedSkills[i] || mWatchedStatsEmpty)
             {
                 mWatchedSkills[i] = stats.getSkill(i);
                 setValue((ESM::Skill::SkillEnum)i, stats.getSkill(i));
@@ -101,7 +107,7 @@ namespace MWGui
 
         if (mWatched.getClass().isNpc())
         {
-            const ESM::NPC *watchedRecord = mWatched.get<ESM::NPC>()->mBase;
+            const ESM::NPC* watchedRecord = mWatched.get<ESM::NPC>()->mBase;
 
             if (watchedRecord->mName != mWatchedName || mWatchedStatsEmpty)
             {
@@ -112,22 +118,22 @@ namespace MWGui
             if (watchedRecord->mRace != mWatchedRace || mWatchedStatsEmpty)
             {
                 mWatchedRace = watchedRecord->mRace;
-                const ESM::Race *race = MWBase::Environment::get().getWorld()->getStore()
-                    .get<ESM::Race>().find(watchedRecord->mRace);
+                const ESM::Race* race
+                    = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(watchedRecord->mRace);
                 setValue("race", race->mName);
             }
 
             if (watchedRecord->mClass != mWatchedClass || mWatchedStatsEmpty)
             {
                 mWatchedClass = watchedRecord->mClass;
-                const ESM::Class *cls = MWBase::Environment::get().getWorld()->getStore()
-                    .get<ESM::Class>().find(watchedRecord->mClass);
+                const ESM::Class* cls
+                    = MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find(watchedRecord->mClass);
                 setValue("class", cls->mName);
 
-                MWBase::WindowManager::SkillList majorSkills (5);
-                MWBase::WindowManager::SkillList minorSkills (5);
+                MWBase::WindowManager::SkillList majorSkills(5);
+                MWBase::WindowManager::SkillList minorSkills(5);
 
-                for (int i=0; i<5; ++i)
+                for (int i = 0; i < 5; ++i)
                 {
                     minorSkills[i] = cls->mData.mSkills[i][0];
                     majorSkills[i] = cls->mData.mSkills[i][1];
diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp
index e957b5d192..988577613c 100644
--- a/apps/openmw/mwgui/statswindow.cpp
+++ b/apps/openmw/mwgui/statswindow.cpp
@@ -1,75 +1,67 @@
 #include "statswindow.hpp"
 
-#include <MyGUI_Window.h>
-#include <MyGUI_ScrollView.h>
-#include <MyGUI_ProgressBar.h>
+#include <MyGUI_Gui.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_InputManager.h>
 #include <MyGUI_LanguageManager.h>
+#include <MyGUI_ProgressBar.h>
+#include <MyGUI_ScrollView.h>
 #include <MyGUI_TextIterator.h>
-#include <MyGUI_Gui.h>
+#include <MyGUI_Window.h>
 
-#include <components/esm3/loadgmst.hpp>
-#include <components/esm3/loadfact.hpp>
-#include <components/esm3/loadspel.hpp>
 #include <components/esm3/loadbsgn.hpp>
 #include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadfact.hpp>
+#include <components/esm3/loadgmst.hpp>
 #include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadspel.hpp>
 
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
-#include "../mwworld/player.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/player.hpp"
 
-#include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/npcstats.hpp"
 
 #include "tooltips.hpp"
 #include "ustring.hpp"
 
 namespace MWGui
 {
-    StatsWindow::StatsWindow (DragAndDrop* drag)
-      : WindowPinnableBase("openmw_stats_window.layout")
-      , NoDrop(drag, mMainWidget)
-      , mSkillView(nullptr)
-      , mMajorSkills()
-      , mMinorSkills()
-      , mMiscSkills()
-      , mSkillValues()
-      , mSkillWidgetMap()
-      , mFactionWidgetMap()
-      , mFactions()
-      , mBirthSignId()
-      , mReputation(0)
-      , mBounty(0)
-      , mSkillWidgets()
-      , mChanged(true)
-      , mMinFullWidth(mMainWidget->getSize().width)
+    StatsWindow::StatsWindow(DragAndDrop* drag)
+        : WindowPinnableBase("openmw_stats_window.layout")
+        , NoDrop(drag, mMainWidget)
+        , mSkillView(nullptr)
+        , mMajorSkills()
+        , mMinorSkills()
+        , mMiscSkills()
+        , mSkillValues()
+        , mSkillWidgetMap()
+        , mFactionWidgetMap()
+        , mFactions()
+        , mBirthSignId()
+        , mReputation(0)
+        , mBounty(0)
+        , mSkillWidgets()
+        , mChanged(true)
+        , mMinFullWidth(mMainWidget->getSize().width)
     {
 
-        const char *names[][2] =
-        {
-            { "Attrib1", "sAttributeStrength" },
-            { "Attrib2", "sAttributeIntelligence" },
-            { "Attrib3", "sAttributeWillpower" },
-            { "Attrib4", "sAttributeAgility" },
-            { "Attrib5", "sAttributeSpeed" },
-            { "Attrib6", "sAttributeEndurance" },
-            { "Attrib7", "sAttributePersonality" },
-            { "Attrib8", "sAttributeLuck" },
-            { 0, 0 }
-        };
+        const char* names[][2] = { { "Attrib1", "sAttributeStrength" }, { "Attrib2", "sAttributeIntelligence" },
+            { "Attrib3", "sAttributeWillpower" }, { "Attrib4", "sAttributeAgility" }, { "Attrib5", "sAttributeSpeed" },
+            { "Attrib6", "sAttributeEndurance" }, { "Attrib7", "sAttributePersonality" },
+            { "Attrib8", "sAttributeLuck" }, { 0, 0 } };
 
-        const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-        for (int i=0; names[i][0]; ++i)
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+        for (int i = 0; names[i][0]; ++i)
         {
-            setText (names[i][0], store.get<ESM::GameSetting>().find (names[i][1])->mValue.getString());
+            setText(names[i][0], store.get<ESM::GameSetting>().find(names[i][1])->mValue.getString());
         }
 
         getWidget(mSkillView, "SkillView");
@@ -79,7 +71,8 @@ namespace MWGui
         for (int i = 0; i < ESM::Skill::Length; ++i)
         {
             mSkillValues.insert(std::make_pair(i, MWMechanics::SkillValue()));
-            mSkillWidgetMap.insert(std::make_pair(i, std::make_pair((MyGUI::TextBox*)nullptr, (MyGUI::TextBox*)nullptr)));
+            mSkillWidgetMap.insert(
+                std::make_pair(i, std::make_pair((MyGUI::TextBox*)nullptr, (MyGUI::TextBox*)nullptr)));
         }
 
         MyGUI::Window* t = mMainWidget->castType<MyGUI::Window>();
@@ -90,10 +83,11 @@ namespace MWGui
 
     void StatsWindow::onMouseWheel(MyGUI::Widget* _sender, int _rel)
     {
-        if (mSkillView->getViewOffset().top + _rel*0.3 > 0)
+        if (mSkillView->getViewOffset().top + _rel * 0.3 > 0)
             mSkillView->setViewOffset(MyGUI::IntPoint(0, 0));
         else
-            mSkillView->setViewOffset(MyGUI::IntPoint(0, static_cast<int>(mSkillView->getViewOffset().top + _rel*0.3)));
+            mSkillView->setViewOffset(
+                MyGUI::IntPoint(0, static_cast<int>(mSkillView->getViewOffset().top + _rel * 0.3)));
     }
 
     void StatsWindow::onWindowResize(MyGUI::Window* window)
@@ -101,7 +95,8 @@ namespace MWGui
         int windowWidth = window->getSize().width;
         int windowHeight = window->getSize().height;
 
-        //initial values defined in openmw_stats_window.layout, if custom options are not present in .layout, a default is loaded
+        // initial values defined in openmw_stats_window.layout, if custom options are not present in .layout, a default
+        // is loaded
         float leftPaneRatio = 0.44f;
         if (mLeftPane->isUserString("LeftPaneRatio"))
             leftPaneRatio = MyGUI::utility::parseFloat(mLeftPane->getUserString("LeftPaneRatio"));
@@ -114,28 +109,30 @@ namespace MWGui
         int minLeftWidth = static_cast<int>(mMinFullWidth * leftPaneRatio);
         int minLeftOffsetWidth = minLeftWidth + leftOffsetWidth;
 
-        //if there's no space for right pane
+        // if there's no space for right pane
         mRightPane->setVisible(windowWidth >= minLeftOffsetWidth);
         if (!mRightPane->getVisible())
         {
             mLeftPane->setCoord(MyGUI::IntCoord(0, 0, windowWidth - leftOffsetWidth, windowHeight));
         }
-        //if there's some space for right pane
+        // if there's some space for right pane
         else if (windowWidth < mMinFullWidth)
         {
             mLeftPane->setCoord(MyGUI::IntCoord(0, 0, minLeftWidth, windowHeight));
             mRightPane->setCoord(MyGUI::IntCoord(minLeftWidth, 0, windowWidth - minLeftWidth, windowHeight));
         }
-        //if there's enough space for both panes
+        // if there's enough space for both panes
         else
         {
-            mLeftPane->setCoord(MyGUI::IntCoord(0, 0, static_cast<int>(leftPaneRatio*windowWidth), windowHeight));
-            mRightPane->setCoord(MyGUI::IntCoord(static_cast<int>(leftPaneRatio*windowWidth), 0, static_cast<int>(rightPaneRatio*windowWidth), windowHeight));
+            mLeftPane->setCoord(MyGUI::IntCoord(0, 0, static_cast<int>(leftPaneRatio * windowWidth), windowHeight));
+            mRightPane->setCoord(MyGUI::IntCoord(static_cast<int>(leftPaneRatio * windowWidth), 0,
+                static_cast<int>(rightPaneRatio * windowWidth), windowHeight));
         }
 
-        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the scrollbar is hidden
+        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the
+        // scrollbar is hidden
         mSkillView->setVisibleVScroll(false);
-        mSkillView->setCanvasSize (mSkillView->getWidth(), mSkillView->getCanvasSize().height);
+        mSkillView->setCanvasSize(mSkillView->getWidth(), mSkillView->getCanvasSize().height);
         mSkillView->setVisibleVScroll(true);
     }
 
@@ -157,26 +154,31 @@ namespace MWGui
         mMainWidget->castType<MyGUI::Window>()->setCaption(playerName);
     }
 
-    void StatsWindow::setValue (const std::string& id, const MWMechanics::AttributeValue& value)
+    void StatsWindow::setValue(const std::string& id, const MWMechanics::AttributeValue& value)
     {
-        static const char *ids[] =
-        {
-            "AttribVal1", "AttribVal2", "AttribVal3", "AttribVal4", "AttribVal5",
-            "AttribVal6", "AttribVal7", "AttribVal8",
+        static const char* ids[] = {
+            "AttribVal1",
+            "AttribVal2",
+            "AttribVal3",
+            "AttribVal4",
+            "AttribVal5",
+            "AttribVal6",
+            "AttribVal7",
+            "AttribVal8",
             nullptr,
         };
 
-        for (int i=0; ids[i]; ++i)
-            if (ids[i]==id)
+        for (int i = 0; ids[i]; ++i)
+            if (ids[i] == id)
             {
-                setText (id, std::to_string(static_cast<int>(value.getModified())));
+                setText(id, std::to_string(static_cast<int>(value.getModified())));
 
                 MyGUI::TextBox* box;
                 getWidget(box, id);
 
-                if (value.getModified()>value.getBase())
+                if (value.getModified() > value.getBase())
                     box->_setWidgetState("increased");
-                else if (value.getModified()<value.getBase())
+                else if (value.getModified() < value.getBase())
                     box->_setWidgetState("decreased");
                 else
                     box->_setWidgetState("normal");
@@ -185,7 +187,7 @@ namespace MWGui
             }
     }
 
-    void StatsWindow::setValue (const std::string& id, const MWMechanics::DynamicStat<float>& value)
+    void StatsWindow::setValue(const std::string& id, const MWMechanics::DynamicStat<float>& value)
     {
         int current = static_cast<int>(value.getCurrent());
         int modified = static_cast<int>(value.getModified(false));
@@ -194,11 +196,11 @@ namespace MWGui
         if (id != "FBar")
             current = std::max(0, current);
 
-        setBar (id, id + "T", current, modified);
+        setBar(id, id + "T", current, modified);
 
         // health, magicka, fatigue tooltip
         MyGUI::Widget* w;
-        std::string valStr =  MyGUI::utility::toString(current) + " / " + MyGUI::utility::toString(modified);
+        std::string valStr = MyGUI::utility::toString(current) + " / " + MyGUI::utility::toString(modified);
         if (id == "HBar")
         {
             getWidget(w, "Health");
@@ -216,19 +218,19 @@ namespace MWGui
         }
     }
 
-    void StatsWindow::setValue (const std::string& id, const std::string& value)
+    void StatsWindow::setValue(const std::string& id, const std::string& value)
     {
-        if (id=="name")
-            setPlayerName (value);
-        else if (id=="race")
-            setText ("RaceText", value);
-        else if (id=="class")
-            setText ("ClassText", value);
+        if (id == "name")
+            setPlayerName(value);
+        else if (id == "race")
+            setText("RaceText", value);
+        else if (id == "class")
+            setText("ClassText", value);
     }
 
-    void StatsWindow::setValue (const std::string& id, int value)
+    void StatsWindow::setValue(const std::string& id, int value)
     {
-        if (id=="level")
+        if (id == "level")
         {
             std::ostringstream text;
             text << value;
@@ -239,11 +241,10 @@ namespace MWGui
     void setSkillProgress(MyGUI::Widget* w, float progress, int skillId)
     {
         MWWorld::Ptr player = MWMechanics::getPlayer();
-        const MWWorld::ESMStore &esmStore =
-            MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
 
-        float progressRequirement = player.getClass().getNpcStats(player).getSkillProgressRequirement(skillId,
-            *esmStore.get<ESM::Class>().find(player.get<ESM::NPC>()->mBase->mClass));
+        float progressRequirement = player.getClass().getNpcStats(player).getSkillProgressRequirement(
+            skillId, *esmStore.get<ESM::Class>().find(player.get<ESM::NPC>()->mBase->mClass));
 
         // This is how vanilla MW displays the progress bar (I think). Note it's slightly inaccurate,
         // due to the int casting in the skill levelup logic. Also the progress label could in rare cases
@@ -251,7 +252,7 @@ namespace MWGui
         // Leaving the original display logic for now, for consistency with ess-imported savegames.
         int progressPercent = int(float(progress) / float(progressRequirement) * 100.f + 0.5f);
 
-        w->setUserString("Caption_SkillProgressText", MyGUI::utility::toString(progressPercent)+"/100");
+        w->setUserString("Caption_SkillProgressText", MyGUI::utility::toString(progressPercent) + "/100");
         w->setUserString("RangePosition_SkillProgress", MyGUI::utility::toString(progressPercent));
     }
 
@@ -279,8 +280,9 @@ namespace MWGui
             int widthAfter = valueWidget->getTextSize().width;
             if (widthBefore != widthAfter)
             {
-                valueWidget->setCoord(valueWidget->getLeft() - (widthAfter-widthBefore), valueWidget->getTop(), valueWidget->getWidth() + (widthAfter-widthBefore), valueWidget->getHeight());
-                nameWidget->setSize(nameWidget->getWidth() - (widthAfter-widthBefore), nameWidget->getHeight());
+                valueWidget->setCoord(valueWidget->getLeft() - (widthAfter - widthBefore), valueWidget->getTop(),
+                    valueWidget->getWidth() + (widthAfter - widthBefore), valueWidget->getHeight());
+                nameWidget->setSize(nameWidget->getWidth() - (widthAfter - widthBefore), nameWidget->getHeight());
             }
 
             if (value.getBase() < 100)
@@ -313,7 +315,7 @@ namespace MWGui
         }
     }
 
-    void StatsWindow::configureSkills (const std::vector<int>& major, const std::vector<int>& minor)
+    void StatsWindow::configureSkills(const std::vector<int>& major, const std::vector<int>& minor)
     {
         mMajorSkills = major;
         mMinorSkills = minor;
@@ -332,12 +334,12 @@ namespace MWGui
         updateSkillArea();
     }
 
-    void StatsWindow::onFrame (float dt)
+    void StatsWindow::onFrame(float dt)
     {
         NoDrop::onFrame(dt);
 
         MWWorld::Ptr player = MWMechanics::getPlayer();
-        const MWMechanics::NpcStats &PCstats = player.getClass().getNpcStats(player);
+        const MWMechanics::NpcStats& PCstats = player.getClass().getNpcStats(player);
 
         std::string detailText;
         std::stringstream detail;
@@ -347,40 +349,45 @@ namespace MWGui
             mult = std::min(mult, 100 - PCstats.getAttribute(attribute).getBase());
             if (mult > 1)
                 detail << (detail.str().empty() ? "" : "\n") << "#{"
-                << MyGUI::TextIterator::toTagsString(ESM::Attribute::sGmstAttributeIds[attribute])
-                << "} x" << MyGUI::utility::toString(mult);
+                       << MyGUI::TextIterator::toTagsString(ESM::Attribute::sGmstAttributeIds[attribute]) << "} x"
+                       << MyGUI::utility::toString(mult);
         }
         detailText = MyGUI::LanguageManager::getInstance().replaceTags(detail.str());
 
         // level progress
         MyGUI::Widget* levelWidget;
-        for (int i=0; i<2; ++i)
+        for (int i = 0; i < 2; ++i)
         {
-            int max = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("iLevelUpTotal")->mValue.getInteger();
-            getWidget(levelWidget, i==0 ? "Level_str" : "LevelText");
-
-            levelWidget->setUserString("RangePosition_LevelProgress", MyGUI::utility::toString(PCstats.getLevelProgress()));
+            int max = MWBase::Environment::get()
+                          .getWorld()
+                          ->getStore()
+                          .get<ESM::GameSetting>()
+                          .find("iLevelUpTotal")
+                          ->mValue.getInteger();
+            getWidget(levelWidget, i == 0 ? "Level_str" : "LevelText");
+
+            levelWidget->setUserString(
+                "RangePosition_LevelProgress", MyGUI::utility::toString(PCstats.getLevelProgress()));
             levelWidget->setUserString("Range_LevelProgress", MyGUI::utility::toString(max));
-            levelWidget->setUserString("Caption_LevelProgressText", MyGUI::utility::toString(PCstats.getLevelProgress()) + "/"
-                                       + MyGUI::utility::toString(max));
+            levelWidget->setUserString("Caption_LevelProgressText",
+                MyGUI::utility::toString(PCstats.getLevelProgress()) + "/" + MyGUI::utility::toString(max));
             levelWidget->setUserString("Caption_LevelDetailText", detailText);
         }
 
         setFactions(PCstats.getFactionRanks());
-        setExpelled(PCstats.getExpelled ());
+        setExpelled(PCstats.getExpelled());
 
-        const std::string &signId =
-            MWBase::Environment::get().getWorld()->getPlayer().getBirthSign();
+        const std::string& signId = MWBase::Environment::get().getWorld()->getPlayer().getBirthSign();
 
         setBirthSign(signId);
-        setReputation (PCstats.getReputation ());
-        setBounty (PCstats.getBounty ());
+        setReputation(PCstats.getReputation());
+        setBounty(PCstats.getBounty());
 
         if (mChanged)
             updateSkillArea();
     }
 
-    void StatsWindow::setFactions (const FactionList& factions)
+    void StatsWindow::setFactions(const FactionList& factions)
     {
         if (mFactions != factions)
         {
@@ -389,7 +396,7 @@ namespace MWGui
         }
     }
 
-    void StatsWindow::setExpelled (const std::set<std::string>& expelled)
+    void StatsWindow::setExpelled(const std::set<std::string>& expelled)
     {
         if (mExpelled != expelled)
         {
@@ -398,7 +405,7 @@ namespace MWGui
         }
     }
 
-    void StatsWindow::setBirthSign (const std::string& signId)
+    void StatsWindow::setBirthSign(const std::string& signId)
     {
         if (signId != mBirthSignId)
         {
@@ -407,7 +414,7 @@ namespace MWGui
         }
     }
 
-    void StatsWindow::addSeparator(MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
+    void StatsWindow::addSeparator(MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2)
     {
         MyGUI::ImageBox* separator = mSkillView->createWidget<MyGUI::ImageBox>("MW_HLine",
             MyGUI::IntCoord(10, coord1.top, coord1.width + coord2.width - 4, 18),
@@ -433,22 +440,26 @@ namespace MWGui
         coord2.top += lineHeight;
     }
 
-    std::pair<MyGUI::TextBox*, MyGUI::TextBox*> StatsWindow::addValueItem(std::string_view text, const std::string &value, const std::string& state, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
+    std::pair<MyGUI::TextBox*, MyGUI::TextBox*> StatsWindow::addValueItem(std::string_view text,
+        const std::string& value, const std::string& state, MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2)
     {
         MyGUI::TextBox *skillNameWidget, *skillValueWidget;
 
-        skillNameWidget = mSkillView->createWidget<MyGUI::TextBox>("SandText", coord1, MyGUI::Align::Left | MyGUI::Align::Top | MyGUI::Align::HStretch);
+        skillNameWidget = mSkillView->createWidget<MyGUI::TextBox>(
+            "SandText", coord1, MyGUI::Align::Left | MyGUI::Align::Top | MyGUI::Align::HStretch);
         skillNameWidget->setCaption(toUString(text));
         skillNameWidget->eventMouseWheel += MyGUI::newDelegate(this, &StatsWindow::onMouseWheel);
 
-        skillValueWidget = mSkillView->createWidget<MyGUI::TextBox>("SandTextRight", coord2, MyGUI::Align::Right | MyGUI::Align::Top);
+        skillValueWidget = mSkillView->createWidget<MyGUI::TextBox>(
+            "SandTextRight", coord2, MyGUI::Align::Right | MyGUI::Align::Top);
         skillValueWidget->setCaption(value);
         skillValueWidget->_setWidgetState(state);
         skillValueWidget->eventMouseWheel += MyGUI::newDelegate(this, &StatsWindow::onMouseWheel);
 
         // resize dynamically according to text size
         int textWidthPlusMargin = skillValueWidget->getTextSize().width + 12;
-        skillValueWidget->setCoord(coord2.left + coord2.width - textWidthPlusMargin, coord2.top, textWidthPlusMargin, coord2.height);
+        skillValueWidget->setCoord(
+            coord2.left + coord2.width - textWidthPlusMargin, coord2.top, textWidthPlusMargin, coord2.height);
         skillNameWidget->setSize(skillNameWidget->getSize() + MyGUI::IntSize(coord2.width - textWidthPlusMargin, 0));
 
         mSkillWidgets.push_back(skillNameWidget);
@@ -461,7 +472,7 @@ namespace MWGui
         return std::make_pair(skillNameWidget, skillValueWidget);
     }
 
-    MyGUI::Widget* StatsWindow::addItem(const std::string& text, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
+    MyGUI::Widget* StatsWindow::addItem(const std::string& text, MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2)
     {
         MyGUI::TextBox* skillNameWidget;
 
@@ -482,7 +493,8 @@ namespace MWGui
         return skillNameWidget;
     }
 
-    void StatsWindow::addSkills(const SkillList &skills, const std::string &titleId, const std::string &titleDefault, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
+    void StatsWindow::addSkills(const SkillList& skills, const std::string& titleId, const std::string& titleDefault,
+        MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2)
     {
         // Add a line separator if there are items above
         if (!mSkillWidgets.empty())
@@ -490,37 +502,40 @@ namespace MWGui
             addSeparator(coord1, coord2);
         }
 
-        addGroup(MWBase::Environment::get().getWindowManager()->getGameSettingString(titleId, titleDefault), coord1, coord2);
+        addGroup(
+            MWBase::Environment::get().getWindowManager()->getGameSettingString(titleId, titleDefault), coord1, coord2);
 
         for (const int skillId : skills)
         {
             if (skillId < 0 || skillId >= ESM::Skill::Length) // Skip unknown skill indexes
                 continue;
-            const std::string &skillNameId = ESM::Skill::sSkillNameIds[skillId];
+            const std::string& skillNameId = ESM::Skill::sSkillNameIds[skillId];
 
-            const MWWorld::ESMStore &esmStore =
-                MWBase::Environment::get().getWorld()->getStore();
+            const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
 
             const ESM::Skill* skill = esmStore.get<ESM::Skill>().find(skillId);
 
             std::string icon = "icons\\k\\" + ESM::Skill::sIconNames[skillId];
 
-            const ESM::Attribute* attr =
-                esmStore.get<ESM::Attribute>().find(skill->mData.mAttribute);
+            const ESM::Attribute* attr = esmStore.get<ESM::Attribute>().find(skill->mData.mAttribute);
 
-            std::pair<MyGUI::TextBox*, MyGUI::TextBox*> widgets = addValueItem(MWBase::Environment::get().getWindowManager()->getGameSettingString(skillNameId, skillNameId),
-                {}, "normal", coord1, coord2);
+            std::pair<MyGUI::TextBox*, MyGUI::TextBox*> widgets = addValueItem(
+                MWBase::Environment::get().getWindowManager()->getGameSettingString(skillNameId, skillNameId), {},
+                "normal", coord1, coord2);
             mSkillWidgetMap[skillId] = widgets;
 
-            for (int i=0; i<2; ++i)
+            for (int i = 0; i < 2; ++i)
             {
-                mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("ToolTipType", "Layout");
-                mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("ToolTipLayout", "SkillToolTip");
-                mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("Caption_SkillName", "#{"+skillNameId+"}");
-                mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("Caption_SkillDescription", skill->mDescription);
-                mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("Caption_SkillAttribute", "#{sGoverningAttribute}: #{" + attr->mName + "}");
-                mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("ImageTexture_SkillImage", icon);
-                mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("Range_SkillProgress", "100");
+                mSkillWidgets[mSkillWidgets.size() - 1 - i]->setUserString("ToolTipType", "Layout");
+                mSkillWidgets[mSkillWidgets.size() - 1 - i]->setUserString("ToolTipLayout", "SkillToolTip");
+                mSkillWidgets[mSkillWidgets.size() - 1 - i]->setUserString(
+                    "Caption_SkillName", "#{" + skillNameId + "}");
+                mSkillWidgets[mSkillWidgets.size() - 1 - i]->setUserString(
+                    "Caption_SkillDescription", skill->mDescription);
+                mSkillWidgets[mSkillWidgets.size() - 1 - i]->setUserString(
+                    "Caption_SkillAttribute", "#{sGoverningAttribute}: #{" + attr->mName + "}");
+                mSkillWidgets[mSkillWidgets.size() - 1 - i]->setUserString("ImageTexture_SkillImage", icon);
+                mSkillWidgets[mSkillWidgets.size() - 1 - i]->setUserString("Range_SkillProgress", "100");
             }
 
             setValue(static_cast<ESM::Skill::SkillEnum>(skillId), mSkillValues.find(skillId)->second);
@@ -550,10 +565,9 @@ namespace MWGui
         if (!mMiscSkills.empty())
             addSkills(mMiscSkills, "sSkillClassMisc", "Misc Skills", coord1, coord2);
 
-        MWBase::World *world = MWBase::Environment::get().getWorld();
-        const MWWorld::ESMStore &store = world->getStore();
-        const ESM::NPC *player =
-            world->getPlayerPtr().get<ESM::NPC>()->mBase;
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+        const MWWorld::ESMStore& store = world->getStore();
+        const ESM::NPC* player = world->getPlayerPtr().get<ESM::NPC>()->mBase;
 
         // race tooltip
         const ESM::Race* playerRace = store.get<ESM::Race>().find(player->mRace);
@@ -567,8 +581,7 @@ namespace MWGui
         // class tooltip
         MyGUI::Widget* classWidget;
 
-        const ESM::Class *playerClass =
-            store.get<ESM::Class>().find(player->mClass);
+        const ESM::Class* playerClass = store.get<ESM::Class>().find(player->mClass);
 
         getWidget(classWidget, "ClassText");
         ToolTips::createClassToolTip(classWidget, *playerClass);
@@ -578,15 +591,14 @@ namespace MWGui
         if (!mFactions.empty())
         {
             MWWorld::Ptr playerPtr = MWMechanics::getPlayer();
-            const MWMechanics::NpcStats &PCstats = playerPtr.getClass().getNpcStats(playerPtr);
-            const std::set<std::string> &expelled = PCstats.getExpelled();
+            const MWMechanics::NpcStats& PCstats = playerPtr.getClass().getNpcStats(playerPtr);
+            const std::set<std::string>& expelled = PCstats.getExpelled();
 
-            bool firstFaction=true;
+            bool firstFaction = true;
             for (auto& factionPair : mFactions)
             {
                 const std::string& factionId = factionPair.first;
-                const ESM::Faction *faction =
-                    store.get<ESM::Faction>().find(factionId);
+                const ESM::Faction* faction = store.get<ESM::Faction>().find(factionId);
                 if (faction->mData.mIsHidden == 1)
                     continue;
 
@@ -596,7 +608,8 @@ namespace MWGui
                     if (!mSkillWidgets.empty())
                         addSeparator(coord1, coord2);
 
-                    addGroup(MWBase::Environment::get().getWindowManager()->getGameSettingString("sFaction", "Faction"), coord1, coord2);
+                    addGroup(MWBase::Environment::get().getWindowManager()->getGameSettingString("sFaction", "Faction"),
+                        coord1, coord2);
 
                     firstFaction = false;
                 }
@@ -617,19 +630,20 @@ namespace MWGui
                     if (rank < 9)
                     {
                         // player doesn't have max rank yet
-                        text += std::string("\n\n#{fontcolourhtml=header}#{sNextRank} ") + faction->mRanks[rank+1];
+                        text += std::string("\n\n#{fontcolourhtml=header}#{sNextRank} ") + faction->mRanks[rank + 1];
 
-                        ESM::RankData rankData = faction->mData.mRankData[rank+1];
+                        ESM::RankData rankData = faction->mData.mRankData[rank + 1];
                         const ESM::Attribute* attr1 = store.get<ESM::Attribute>().find(faction->mData.mAttribute[0]);
                         const ESM::Attribute* attr2 = store.get<ESM::Attribute>().find(faction->mData.mAttribute[1]);
 
-                        text += "\n#{fontcolourhtml=normal}#{" + attr1->mName + "}: " + MyGUI::utility::toString(rankData.mAttribute1)
-                                + ", #{" + attr2->mName + "}: " + MyGUI::utility::toString(rankData.mAttribute2);
+                        text += "\n#{fontcolourhtml=normal}#{" + attr1->mName
+                            + "}: " + MyGUI::utility::toString(rankData.mAttribute1) + ", #{" + attr2->mName
+                            + "}: " + MyGUI::utility::toString(rankData.mAttribute2);
 
                         text += "\n\n#{fontcolourhtml=header}#{sFavoriteSkills}";
                         text += "\n#{fontcolourhtml=normal}";
                         bool firstSkill = true;
-                        for (int i=0; i<7; ++i)
+                        for (int i = 0; i < 7; ++i)
                         {
                             if (faction->mData.mSkills[i] != -1)
                             {
@@ -638,7 +652,7 @@ namespace MWGui
 
                                 firstSkill = false;
 
-                                text += "#{"+ESM::Skill::sSkillNameIds[faction->mData.mSkills[i]]+"}";
+                                text += "#{" + ESM::Skill::sSkillNameIds[faction->mData.mSkills[i]] + "}";
                             }
                         }
 
@@ -663,9 +677,9 @@ namespace MWGui
             if (!mSkillWidgets.empty())
                 addSeparator(coord1, coord2);
 
-            addGroup(MWBase::Environment::get().getWindowManager()->getGameSettingString("sBirthSign", "Sign"), coord1, coord2);
-            const ESM::BirthSign *sign =
-                store.get<ESM::BirthSign>().find(mBirthSignId);
+            addGroup(MWBase::Environment::get().getWindowManager()->getGameSettingString("sBirthSign", "Sign"), coord1,
+                coord2);
+            const ESM::BirthSign* sign = store.get<ESM::BirthSign>().find(mBirthSignId);
             MyGUI::Widget* w = addItem(sign->mName, coord1, coord2);
 
             ToolTips::createBirthsignToolTip(w, mBirthSignId);
@@ -676,28 +690,29 @@ namespace MWGui
             addSeparator(coord1, coord2);
 
         addValueItem(MWBase::Environment::get().getWindowManager()->getGameSettingString("sReputation", "Reputation"),
-                    MyGUI::utility::toString(static_cast<int>(mReputation)), "normal", coord1, coord2);
+            MyGUI::utility::toString(static_cast<int>(mReputation)), "normal", coord1, coord2);
 
-        for (int i=0; i<2; ++i)
+        for (int i = 0; i < 2; ++i)
         {
-            mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("ToolTipType", "Layout");
-            mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("ToolTipLayout", "TextToolTip");
-            mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("Caption_Text", "#{sSkillsMenuReputationHelp}");
+            mSkillWidgets[mSkillWidgets.size() - 1 - i]->setUserString("ToolTipType", "Layout");
+            mSkillWidgets[mSkillWidgets.size() - 1 - i]->setUserString("ToolTipLayout", "TextToolTip");
+            mSkillWidgets[mSkillWidgets.size() - 1 - i]->setUserString("Caption_Text", "#{sSkillsMenuReputationHelp}");
         }
 
         addValueItem(MWBase::Environment::get().getWindowManager()->getGameSettingString("sBounty", "Bounty"),
-                    MyGUI::utility::toString(static_cast<int>(mBounty)), "normal", coord1, coord2);
+            MyGUI::utility::toString(static_cast<int>(mBounty)), "normal", coord1, coord2);
 
-        for (int i=0; i<2; ++i)
+        for (int i = 0; i < 2; ++i)
         {
-            mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("ToolTipType", "Layout");
-            mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("ToolTipLayout", "TextToolTip");
-            mSkillWidgets[mSkillWidgets.size()-1-i]->setUserString("Caption_Text", "#{sCrimeHelp}");
+            mSkillWidgets[mSkillWidgets.size() - 1 - i]->setUserString("ToolTipType", "Layout");
+            mSkillWidgets[mSkillWidgets.size() - 1 - i]->setUserString("ToolTipLayout", "TextToolTip");
+            mSkillWidgets[mSkillWidgets.size() - 1 - i]->setUserString("Caption_Text", "#{sCrimeHelp}");
         }
 
-        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the scrollbar is hidden
+        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the
+        // scrollbar is hidden
         mSkillView->setVisibleVScroll(false);
-        mSkillView->setCanvasSize (mSkillView->getWidth(), std::max(mSkillView->getHeight(), coord1.top));
+        mSkillView->setCanvasSize(mSkillView->getWidth(), std::max(mSkillView->getHeight(), coord1.top));
         mSkillView->setVisibleVScroll(true);
     }
 
diff --git a/apps/openmw/mwgui/statswindow.hpp b/apps/openmw/mwgui/statswindow.hpp
index cc87ea9523..c7d887903d 100644
--- a/apps/openmw/mwgui/statswindow.hpp
+++ b/apps/openmw/mwgui/statswindow.hpp
@@ -8,68 +8,80 @@ namespace MWGui
 {
     class StatsWindow : public WindowPinnableBase, public NoDrop, public StatsListener
     {
-        public:
-            typedef std::map<std::string, int> FactionList;
-
-            typedef std::vector<int> SkillList;
-
-            StatsWindow(DragAndDrop* drag);
-
-            /// automatically updates all the data in the stats window, but only if it has changed.
-            void onFrame(float dt) override;
-
-            void setBar(const std::string& name, const std::string& tname, int val, int max);
-            void setPlayerName(const std::string& playerName);
-
-            /// Set value for the given ID.
-            void setValue (const std::string& id, const MWMechanics::AttributeValue& value) override;
-            void setValue (const std::string& id, const MWMechanics::DynamicStat<float>& value) override;
-            void setValue (const std::string& id, const std::string& value) override;
-            void setValue (const std::string& id, int value) override;
-            void setValue(const ESM::Skill::SkillEnum parSkill, const MWMechanics::SkillValue& value) override;
-            void configureSkills(const SkillList& major, const SkillList& minor) override;
-
-            void setReputation (int reputation) { if (reputation != mReputation) mChanged = true; this->mReputation = reputation; }
-            void setBounty (int bounty) { if (bounty != mBounty) mChanged = true; this->mBounty = bounty; }
-            void updateSkillArea();
-
-            void onOpen() override { onWindowResize(mMainWidget->castType<MyGUI::Window>()); }
-
-        private:
-            void addSkills(const SkillList &skills, const std::string &titleId, const std::string &titleDefault, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
-            void addSeparator(MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
-            void addGroup(std::string_view label, MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2);
-            std::pair<MyGUI::TextBox*, MyGUI::TextBox*> addValueItem(std::string_view text, const std::string &value, const std::string& state, MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2);
-            MyGUI::Widget* addItem(const std::string& text, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
-
-            void setFactions (const FactionList& factions);
-            void setExpelled (const std::set<std::string>& expelled);
-            void setBirthSign (const std::string &signId);
-
-            void onWindowResize(MyGUI::Window* window);
-            void onMouseWheel(MyGUI::Widget* _sender, int _rel);
-
-            MyGUI::Widget* mLeftPane;
-            MyGUI::Widget* mRightPane;
-
-            MyGUI::ScrollView* mSkillView;
-
-            SkillList mMajorSkills, mMinorSkills, mMiscSkills;
-            std::map<int, MWMechanics::SkillValue > mSkillValues;
-            std::map<int, std::pair<MyGUI::TextBox*, MyGUI::TextBox*> > mSkillWidgetMap;
-            std::map<std::string, MyGUI::Widget*> mFactionWidgetMap;
-            FactionList mFactions; ///< Stores a list of factions and the current rank
-            std::string mBirthSignId;
-            int mReputation, mBounty;
-            std::vector<MyGUI::Widget*> mSkillWidgets; //< Skills and other information
-            std::set<std::string> mExpelled;
-
-            bool mChanged;
-            const int mMinFullWidth;
-
-        protected:
-            void onPinToggled() override;
-            void onTitleDoubleClicked() override;
+    public:
+        typedef std::map<std::string, int> FactionList;
+
+        typedef std::vector<int> SkillList;
+
+        StatsWindow(DragAndDrop* drag);
+
+        /// automatically updates all the data in the stats window, but only if it has changed.
+        void onFrame(float dt) override;
+
+        void setBar(const std::string& name, const std::string& tname, int val, int max);
+        void setPlayerName(const std::string& playerName);
+
+        /// Set value for the given ID.
+        void setValue(const std::string& id, const MWMechanics::AttributeValue& value) override;
+        void setValue(const std::string& id, const MWMechanics::DynamicStat<float>& value) override;
+        void setValue(const std::string& id, const std::string& value) override;
+        void setValue(const std::string& id, int value) override;
+        void setValue(const ESM::Skill::SkillEnum parSkill, const MWMechanics::SkillValue& value) override;
+        void configureSkills(const SkillList& major, const SkillList& minor) override;
+
+        void setReputation(int reputation)
+        {
+            if (reputation != mReputation)
+                mChanged = true;
+            this->mReputation = reputation;
+        }
+        void setBounty(int bounty)
+        {
+            if (bounty != mBounty)
+                mChanged = true;
+            this->mBounty = bounty;
+        }
+        void updateSkillArea();
+
+        void onOpen() override { onWindowResize(mMainWidget->castType<MyGUI::Window>()); }
+
+    private:
+        void addSkills(const SkillList& skills, const std::string& titleId, const std::string& titleDefault,
+            MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2);
+        void addSeparator(MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2);
+        void addGroup(std::string_view label, MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2);
+        std::pair<MyGUI::TextBox*, MyGUI::TextBox*> addValueItem(std::string_view text, const std::string& value,
+            const std::string& state, MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2);
+        MyGUI::Widget* addItem(const std::string& text, MyGUI::IntCoord& coord1, MyGUI::IntCoord& coord2);
+
+        void setFactions(const FactionList& factions);
+        void setExpelled(const std::set<std::string>& expelled);
+        void setBirthSign(const std::string& signId);
+
+        void onWindowResize(MyGUI::Window* window);
+        void onMouseWheel(MyGUI::Widget* _sender, int _rel);
+
+        MyGUI::Widget* mLeftPane;
+        MyGUI::Widget* mRightPane;
+
+        MyGUI::ScrollView* mSkillView;
+
+        SkillList mMajorSkills, mMinorSkills, mMiscSkills;
+        std::map<int, MWMechanics::SkillValue> mSkillValues;
+        std::map<int, std::pair<MyGUI::TextBox*, MyGUI::TextBox*>> mSkillWidgetMap;
+        std::map<std::string, MyGUI::Widget*> mFactionWidgetMap;
+        FactionList mFactions; ///< Stores a list of factions and the current rank
+        std::string mBirthSignId;
+        int mReputation, mBounty;
+        std::vector<MyGUI::Widget*> mSkillWidgets; //< Skills and other information
+        std::set<std::string> mExpelled;
+
+        bool mChanged;
+        const int mMinFullWidth;
+
+    protected:
+        void onPinToggled() override;
+        void onTitleDoubleClicked() override;
     };
 }
 #endif
diff --git a/apps/openmw/mwgui/textinput.cpp b/apps/openmw/mwgui/textinput.cpp
index 016e84ecf0..6ff4e5304a 100644
--- a/apps/openmw/mwgui/textinput.cpp
+++ b/apps/openmw/mwgui/textinput.cpp
@@ -1,10 +1,10 @@
 #include "textinput.hpp"
 
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/windowmanager.hpp"
 
-#include <MyGUI_EditBox.h>
 #include <MyGUI_Button.h>
+#include <MyGUI_EditBox.h>
 
 #include "ustring.hpp"
 
@@ -12,7 +12,7 @@ namespace MWGui
 {
 
     TextInputDialog::TextInputDialog()
-      : WindowModal("openmw_text_input.layout")
+        : WindowModal("openmw_text_input.layout")
     {
         // Centre dialog
         center();
@@ -34,9 +34,11 @@ namespace MWGui
         getWidget(okButton, "OKButton");
 
         if (shown)
-            okButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
+            okButton->setCaption(
+                toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
         else
-            okButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
+            okButton->setCaption(
+                toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
     }
 
     void TextInputDialog::setTextLabel(std::string_view label)
@@ -57,8 +59,8 @@ namespace MWGui
     {
         if (mTextEdit->getCaption().empty())
         {
-            MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage37}");
-            MWBase::Environment::get().getWindowManager()->setKeyFocusWidget (mTextEdit);
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage37}");
+            MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mTextEdit);
         }
         else
             eventDone(this);
@@ -77,10 +79,9 @@ namespace MWGui
         return mTextEdit->getCaption();
     }
 
-    void TextInputDialog::setTextInput(const std::string &text)
+    void TextInputDialog::setTextInput(const std::string& text)
     {
         mTextEdit->setCaption(text);
     }
 
-
 }
diff --git a/apps/openmw/mwgui/textinput.hpp b/apps/openmw/mwgui/textinput.hpp
index 3914d5119f..0e616305cb 100644
--- a/apps/openmw/mwgui/textinput.hpp
+++ b/apps/openmw/mwgui/textinput.hpp
@@ -11,7 +11,7 @@ namespace MWGui
         TextInputDialog();
 
         std::string getTextInput() const;
-        void setTextInput(const std::string &text);
+        void setTextInput(const std::string& text);
 
         void setNextButtonShow(bool shown);
         void setTextLabel(std::string_view label);
diff --git a/apps/openmw/mwgui/timeadvancer.cpp b/apps/openmw/mwgui/timeadvancer.cpp
index c38094ae45..2cdab127b9 100644
--- a/apps/openmw/mwgui/timeadvancer.cpp
+++ b/apps/openmw/mwgui/timeadvancer.cpp
@@ -3,12 +3,12 @@
 namespace MWGui
 {
     TimeAdvancer::TimeAdvancer(float delay)
-        : mRunning(false),
-          mCurHour(0),
-          mHours(1),
-          mInterruptAt(-1),
-          mDelay(delay),
-          mRemainingTime(delay)
+        : mRunning(false)
+        , mCurHour(0)
+        , mHours(1)
+        , mInterruptAt(-1)
+        , mDelay(delay)
+        , mRemainingTime(delay)
     {
     }
 
@@ -54,7 +54,6 @@ namespace MWGui
                 eventFinished();
                 return;
             }
-
         }
     }
 
diff --git a/apps/openmw/mwgui/timeadvancer.hpp b/apps/openmw/mwgui/timeadvancer.hpp
index 40fce978b9..56a190a3e3 100644
--- a/apps/openmw/mwgui/timeadvancer.hpp
+++ b/apps/openmw/mwgui/timeadvancer.hpp
@@ -7,33 +7,33 @@ namespace MWGui
 {
     class TimeAdvancer
     {
-        public:
-            TimeAdvancer(float delay);
+    public:
+        TimeAdvancer(float delay);
 
-            void run(int hours, int interruptAt=-1);
-            void stop();
-            void onFrame(float dt);
+        void run(int hours, int interruptAt = -1);
+        void stop();
+        void onFrame(float dt);
 
-            int getHours() const;
-            bool isRunning() const;
+        int getHours() const;
+        bool isRunning() const;
 
-            // signals
-            typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
-            typedef MyGUI::delegates::CMultiDelegate2<int, int> EventHandle_IntInt;
+        // signals
+        typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
+        typedef MyGUI::delegates::CMultiDelegate2<int, int> EventHandle_IntInt;
 
-            EventHandle_IntInt eventProgressChanged;
-            EventHandle_Void eventInterrupted;
-            EventHandle_Void eventFinished;
+        EventHandle_IntInt eventProgressChanged;
+        EventHandle_Void eventInterrupted;
+        EventHandle_Void eventFinished;
 
-        private:
-            bool mRunning;
+    private:
+        bool mRunning;
 
-            int mCurHour;
-            int mHours;
-            int mInterruptAt;
+        int mCurHour;
+        int mHours;
+        int mInterruptAt;
 
-            float mDelay;
-            float mRemainingTime;
+        float mDelay;
+        float mRemainingTime;
     };
 }
 
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index 2bd4ea8e61..de22f2a38a 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -3,36 +3,37 @@
 #include <iomanip>
 
 #include <MyGUI_Gui.h>
-#include <MyGUI_RenderManager.h>
-#include <MyGUI_InputManager.h>
 #include <MyGUI_ImageBox.h>
+#include <MyGUI_InputManager.h>
+#include <MyGUI_RenderManager.h>
 
+#include <components/esm/records.hpp>
+#include <components/misc/resourcehelpers.hpp>
 #include <components/settings/settings.hpp>
 #include <components/widgets/box.hpp>
-#include <components/misc/resourcehelpers.hpp>
-#include <components/esm/records.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
+#include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/spellutil.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
-#include "../mwmechanics/spellutil.hpp"
-#include "../mwmechanics/actorutil.hpp"
 
-#include "mapwindow.hpp"
 #include "inventorywindow.hpp"
+#include "mapwindow.hpp"
 
 #include "itemmodel.hpp"
 
 namespace MWGui
 {
-    std::string ToolTips::sSchoolNames[] = {"#{sSchoolAlteration}", "#{sSchoolConjuration}", "#{sSchoolDestruction}", "#{sSchoolIllusion}", "#{sSchoolMysticism}", "#{sSchoolRestoration}"};
+    std::string ToolTips::sSchoolNames[] = { "#{sSchoolAlteration}", "#{sSchoolConjuration}", "#{sSchoolDestruction}",
+        "#{sSchoolIllusion}", "#{sSchoolMysticism}", "#{sSchoolRestoration}" };
 
-    ToolTips::ToolTips() :
-        Layout("openmw_tooltips.layout")
+    ToolTips::ToolTips()
+        : Layout("openmw_tooltips.layout")
         , mFocusToolTipX(0.0)
         , mFocusToolTipY(0.0)
         , mHorizontalScrollIndex(0)
@@ -57,11 +58,11 @@ namespace MWGui
         mDelay = Settings::Manager::getFloat("tooltip delay", "GUI");
         mRemainingDelay = mDelay;
 
-        for (unsigned int i=0; i < mMainWidget->getChildCount(); ++i)
+        for (unsigned int i = 0; i < mMainWidget->getChildCount(); ++i)
         {
             mMainWidget->getChildAt(i)->setVisible(false);
         }
-        
+
         mShowOwned = Settings::Manager::getInt("show owned", "Game");
     }
 
@@ -84,19 +85,19 @@ namespace MWGui
         }
 
         // start by hiding everything
-        for (unsigned int i=0; i < mMainWidget->getChildCount(); ++i)
+        for (unsigned int i = 0; i < mMainWidget->getChildCount(); ++i)
         {
             mMainWidget->getChildAt(i)->setVisible(false);
         }
 
-        const MyGUI::IntSize &viewSize = MyGUI::RenderManager::getInstance().getViewSize();
+        const MyGUI::IntSize& viewSize = MyGUI::RenderManager::getInstance().getViewSize();
 
         if (!mEnabled)
         {
             return;
         }
 
-        MWBase::WindowManager *winMgr = MWBase::Environment::get().getWindowManager();
+        MWBase::WindowManager* winMgr = MWBase::Environment::get().getWindowManager();
         bool guiMode = winMgr->isGuiMode();
 
         if (guiMode)
@@ -105,12 +106,11 @@ namespace MWGui
                 return;
             const MyGUI::IntPoint& mousePos = MyGUI::InputManager::getInstance().getMousePosition();
 
-            if (winMgr->getWorldMouseOver() &&
-                (winMgr->isConsoleMode() ||
-                (winMgr->getMode() == GM_Container) ||
-                (winMgr->getMode() == GM_Inventory)))
+            if (winMgr->getWorldMouseOver()
+                && (winMgr->isConsoleMode() || (winMgr->getMode() == GM_Container)
+                    || (winMgr->getMode() == GM_Inventory)))
             {
-                if (mFocusObject.isEmpty ())
+                if (mFocusObject.isEmpty())
                     return;
 
                 const MWWorld::Class& objectclass = mFocusObject.getClass();
@@ -123,7 +123,7 @@ namespace MWGui
                     ToolTipInfo info;
                     info.caption = mFocusObject.getClass().getName(mFocusObject);
                     if (info.caption.empty())
-                        info.caption=mFocusObject.getCellRef().getRefId();
+                        info.caption = mFocusObject.getCellRef().getRefId();
                     info.icon.clear();
                     tooltipSize = createToolTip(info, checkOwned());
                 }
@@ -150,7 +150,6 @@ namespace MWGui
                 mLastMouseX = mousePos.left;
                 mLastMouseY = mousePos.top;
 
-
                 if (mRemainingDelay > 0)
                     return;
 
@@ -176,7 +175,6 @@ namespace MWGui
                     return;
                 }
 
-
                 // special handling for markers on the local map: the tooltip should only be visible
                 // if the marker is not hidden due to the fog of war.
                 if (type == "MapMarker")
@@ -201,7 +199,8 @@ namespace MWGui
                 }
                 else if (type == "ItemModelIndex")
                 {
-                    std::pair<ItemModel::ModelIndex, ItemModel*> pair = *focus->getUserData<std::pair<ItemModel::ModelIndex, ItemModel*> >();
+                    std::pair<ItemModel::ModelIndex, ItemModel*> pair
+                        = *focus->getUserData<std::pair<ItemModel::ModelIndex, ItemModel*>>();
                     mFocusObject = pair.second->getItem(pair.first).mBase;
                     bool isAllowedToUse = pair.second->allowedToUseItems();
                     tooltipSize = getToolTipViaPtr(pair.second->getItem(pair.first).mCount, false, !isAllowedToUse);
@@ -213,19 +212,21 @@ namespace MWGui
                 else if (type == "AvatarItemSelection")
                 {
                     MyGUI::IntCoord avatarPos = focus->getAbsoluteCoord();
-                    MyGUI::IntPoint relMousePos = MyGUI::InputManager::getInstance ().getMousePosition () - MyGUI::IntPoint(avatarPos.left, avatarPos.top);
-                    MWWorld::Ptr item = winMgr->getInventoryWindow ()->getAvatarSelectedItem (relMousePos.left, relMousePos.top);
+                    MyGUI::IntPoint relMousePos = MyGUI::InputManager::getInstance().getMousePosition()
+                        - MyGUI::IntPoint(avatarPos.left, avatarPos.top);
+                    MWWorld::Ptr item
+                        = winMgr->getInventoryWindow()->getAvatarSelectedItem(relMousePos.left, relMousePos.top);
 
                     mFocusObject = item;
-                    if (!mFocusObject.isEmpty ())
+                    if (!mFocusObject.isEmpty())
                         tooltipSize = getToolTipViaPtr(mFocusObject.getRefData().getCount(), false);
                 }
                 else if (type == "Spell")
                 {
                     ToolTipInfo info;
 
-                    const ESM::Spell *spell =
-                        MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(focus->getUserString("Spell"));
+                    const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(
+                        focus->getUserString("Spell"));
                     info.caption = spell->mName;
                     Widgets::SpellEffectList effects;
                     for (const ESM::ENAMstruct& spellEffect : spell->mEffects.mList)
@@ -243,7 +244,8 @@ namespace MWGui
                         params.mNoTarget = false;
                         effects.push_back(params);
                     }
-                    if (MWMechanics::spellIncreasesSkill(spell)) // display school of spells that contribute to skill progress
+                    if (MWMechanics::spellIncreasesSkill(
+                            spell)) // display school of spells that contribute to skill progress
                     {
                         MWWorld::Ptr player = MWMechanics::getPlayer();
                         int school = MWMechanics::getSpellSchool(spell, player);
@@ -251,7 +253,8 @@ namespace MWGui
                     }
                     std::string cost = focus->getUserString("SpellCost");
                     if (cost != "" && cost != "0")
-                        info.text += MWGui::ToolTips::getValueString(MWMechanics::calcSpellCost(*spell), "#{sCastCost}");
+                        info.text
+                            += MWGui::ToolTips::getValueString(MWMechanics::calcSpellCost(*spell), "#{sCastCost}");
                     info.effects = effects;
                     tooltipSize = createToolTip(info);
                 }
@@ -270,7 +273,8 @@ namespace MWGui
                         if (underscorePos == std::string::npos)
                             continue;
                         std::string key = userStringPair.first.substr(0, underscorePos);
-                        std::string widgetName = userStringPair.first.substr(underscorePos+1, userStringPair.first.size()-(underscorePos+1));
+                        std::string widgetName = userStringPair.first.substr(
+                            underscorePos + 1, userStringPair.first.size() - (underscorePos + 1));
 
                         type = "Property";
                         size_t caretPos = key.find('^');
@@ -293,7 +297,7 @@ namespace MWGui
                     tooltip->setCoord(0, 0, tooltipSize.width, tooltipSize.height);
                 }
                 else
-                    throw std::runtime_error ("unknown tooltip type");
+                    throw std::runtime_error("unknown tooltip type");
 
                 MyGUI::IntPoint tooltipPosition = MyGUI::InputManager::getInstance().getMousePosition();
 
@@ -308,10 +312,9 @@ namespace MWGui
             {
                 MyGUI::IntSize tooltipSize = getToolTipViaPtr(mFocusObject.getRefData().getCount(), true, checkOwned());
 
-                setCoord(viewSize.width/2 - tooltipSize.width/2,
-                        std::max(0, int(mFocusToolTipY*viewSize.height - tooltipSize.height)),
-                        tooltipSize.width,
-                        tooltipSize.height);
+                setCoord(viewSize.width / 2 - tooltipSize.width / 2,
+                    std::max(0, int(mFocusToolTipY * viewSize.height - tooltipSize.height)), tooltipSize.width,
+                    tooltipSize.height);
 
                 mDynamicToolTipBox->setVisible(true);
             }
@@ -321,7 +324,9 @@ namespace MWGui
     void ToolTips::position(MyGUI::IntPoint& position, MyGUI::IntSize size, MyGUI::IntSize viewportSize)
     {
         position += MyGUI::IntPoint(0, 32)
-        - MyGUI::IntPoint(static_cast<int>(MyGUI::InputManager::getInstance().getMousePosition().left / float(viewportSize.width) * size.width), 0);
+            - MyGUI::IntPoint(static_cast<int>(MyGUI::InputManager::getInstance().getMousePosition().left
+                                  / float(viewportSize.width) * size.width),
+                0);
 
         if ((position.left + size.width) > viewportSize.width)
         {
@@ -342,7 +347,7 @@ namespace MWGui
             MyGUI::Gui::getInstance().destroyWidget(mDynamicToolTipBox->getChildAt(0));
         }
 
-        for (unsigned int i=0; i < mMainWidget->getChildCount(); ++i)
+        for (unsigned int i = 0; i < mMainWidget->getChildCount(); ++i)
         {
             mMainWidget->getChildAt(i)->setVisible(false);
         }
@@ -355,7 +360,7 @@ namespace MWGui
         update(mFrameDuration);
     }
 
-    MyGUI::IntSize ToolTips::getToolTipViaPtr (int count, bool image, bool isOwned)
+    MyGUI::IntSize ToolTips::getToolTipViaPtr(int count, bool image, bool isOwned)
     {
         // this the maximum width of the tooltip before it starts word-wrapping
         setCoord(0, 0, 300, 300);
@@ -379,10 +384,10 @@ namespace MWGui
 
         return tooltipSize;
     }
-    
+
     bool ToolTips::checkOwned()
     {
-        if(mFocusObject.isEmpty())
+        if (mFocusObject.isEmpty())
             return false;
 
         MWWorld::Ptr ptr = MWMechanics::getPlayer();
@@ -395,11 +400,14 @@ namespace MWGui
     MyGUI::IntSize ToolTips::createToolTip(const MWGui::ToolTipInfo& info, bool isOwned)
     {
         mDynamicToolTipBox->setVisible(true);
-        
-        if((mShowOwned == 1 || mShowOwned == 3) && isOwned)
-            mDynamicToolTipBox->changeWidgetSkin(MWBase::Environment::get().getWindowManager()->isGuiMode() ? "HUD_Box_NoTransp_Owned" : "HUD_Box_Owned");
+
+        if ((mShowOwned == 1 || mShowOwned == 3) && isOwned)
+            mDynamicToolTipBox->changeWidgetSkin(MWBase::Environment::get().getWindowManager()->isGuiMode()
+                    ? "HUD_Box_NoTransp_Owned"
+                    : "HUD_Box_Owned");
         else
-            mDynamicToolTipBox->changeWidgetSkin(MWBase::Environment::get().getWindowManager()->isGuiMode() ? "HUD_Box_NoTransp" : "HUD_Box");
+            mDynamicToolTipBox->changeWidgetSkin(
+                MWBase::Environment::get().getWindowManager()->isGuiMode() ? "HUD_Box_NoTransp" : "HUD_Box");
 
         const std::string& caption = info.caption;
         const std::string& image = info.icon;
@@ -438,10 +446,11 @@ namespace MWGui
 
         const int maximumWidth = MyGUI::RenderManager::getInstance().getViewSize().width - imageCaptionHPadding * 2;
 
-        const std::string realImage = Misc::ResourceHelpers::correctIconPath(image,
-            MWBase::Environment::get().getResourceSystem()->getVFS());
+        const std::string realImage
+            = Misc::ResourceHelpers::correctIconPath(image, MWBase::Environment::get().getResourceSystem()->getVFS());
 
-        Gui::EditBox* captionWidget = mDynamicToolTipBox->createWidget<Gui::EditBox>("NormalText", MyGUI::IntCoord(0, 0, 300, 300), MyGUI::Align::Left | MyGUI::Align::Top, "ToolTipCaption");
+        Gui::EditBox* captionWidget = mDynamicToolTipBox->createWidget<Gui::EditBox>(
+            "NormalText", MyGUI::IntCoord(0, 0, 300, 300), MyGUI::Align::Left | MyGUI::Align::Top, "ToolTipCaption");
         captionWidget->setEditStatic(true);
         captionWidget->setNeedKeyFocus(false);
         captionWidget->setCaptionWithReplacing(caption);
@@ -449,7 +458,9 @@ namespace MWGui
 
         int captionHeight = std::max(!caption.empty() ? captionSize.height : 0, imageSize);
 
-        Gui::EditBox* textWidget = mDynamicToolTipBox->createWidget<Gui::EditBox>("SandText", MyGUI::IntCoord(0, captionHeight+imageCaptionVPadding, 300, 300-captionHeight-imageCaptionVPadding), MyGUI::Align::Stretch, "ToolTipText");
+        Gui::EditBox* textWidget = mDynamicToolTipBox->createWidget<Gui::EditBox>("SandText",
+            MyGUI::IntCoord(0, captionHeight + imageCaptionVPadding, 300, 300 - captionHeight - imageCaptionVPadding),
+            MyGUI::Align::Stretch, "ToolTipText");
         textWidget->setEditStatic(true);
         textWidget->setEditMultiLine(true);
         textWidget->setEditWordWrap(info.wordWrap);
@@ -459,63 +470,68 @@ namespace MWGui
         MyGUI::IntSize textSize = textWidget->getTextSize();
 
         captionSize += MyGUI::IntSize(imageSize, 0); // adjust for image
-        MyGUI::IntSize totalSize = MyGUI::IntSize( std::min(std::max(textSize.width,captionSize.width + ((!image.empty()) ? imageCaptionHPadding : 0)),maximumWidth),
-            (!text.empty() ? textSize.height + imageCaptionVPadding : 0) + captionHeight );
+        MyGUI::IntSize totalSize = MyGUI::IntSize(
+            std::min(std::max(textSize.width, captionSize.width + ((!image.empty()) ? imageCaptionHPadding : 0)),
+                maximumWidth),
+            (!text.empty() ? textSize.height + imageCaptionVPadding : 0) + captionHeight);
 
         for (const std::string& note : info.notes)
         {
             MyGUI::ImageBox* icon = mDynamicToolTipBox->createWidget<MyGUI::ImageBox>("MarkerButton",
-                MyGUI::IntCoord(padding.left, totalSize.height+padding.top, 8, 8), MyGUI::Align::Default);
+                MyGUI::IntCoord(padding.left, totalSize.height + padding.top, 8, 8), MyGUI::Align::Default);
             icon->setColour(MyGUI::Colour(1.0f, 0.3f, 0.3f));
             Gui::EditBox* edit = mDynamicToolTipBox->createWidget<Gui::EditBox>("SandText",
-                MyGUI::IntCoord(padding.left+8+4, totalSize.height+padding.top, 300-padding.left-8-4, 300-totalSize.height),
-                                                                                    MyGUI::Align::Default);
+                MyGUI::IntCoord(padding.left + 8 + 4, totalSize.height + padding.top, 300 - padding.left - 8 - 4,
+                    300 - totalSize.height),
+                MyGUI::Align::Default);
             edit->setEditMultiLine(true);
             edit->setEditWordWrap(true);
             edit->setCaption(note);
             edit->setSize(edit->getWidth(), edit->getTextSize().height);
-            icon->setPosition(icon->getLeft(),(edit->getTop()+edit->getBottom())/2-icon->getHeight()/2);
+            icon->setPosition(icon->getLeft(), (edit->getTop() + edit->getBottom()) / 2 - icon->getHeight() / 2);
             totalSize.height += std::max(edit->getHeight(), icon->getHeight());
-            totalSize.width = std::max(totalSize.width, edit->getWidth()+8+4);
+            totalSize.width = std::max(totalSize.width, edit->getWidth() + 8 + 4);
         }
 
         if (!info.effects.empty())
         {
             MyGUI::Widget* effectArea = mDynamicToolTipBox->createWidget<MyGUI::Widget>("",
-                MyGUI::IntCoord(padding.left, totalSize.height, 300-padding.left, 300-totalSize.height),
+                MyGUI::IntCoord(padding.left, totalSize.height, 300 - padding.left, 300 - totalSize.height),
                 MyGUI::Align::Stretch);
 
             MyGUI::IntCoord coord(0, 6, totalSize.width, 24);
 
-            Widgets::MWEffectListPtr effectsWidget = effectArea->createWidget<Widgets::MWEffectList>
-                ("MW_StatName", coord, MyGUI::Align::Default);
+            Widgets::MWEffectListPtr effectsWidget
+                = effectArea->createWidget<Widgets::MWEffectList>("MW_StatName", coord, MyGUI::Align::Default);
             effectsWidget->setEffectList(info.effects);
 
             std::vector<MyGUI::Widget*> effectItems;
             int flag = info.isPotion ? Widgets::MWEffectList::EF_NoTarget : 0;
             flag |= info.isIngredient ? Widgets::MWEffectList::EF_NoMagnitude : 0;
             flag |= info.isIngredient ? Widgets::MWEffectList::EF_Constant : 0;
-            effectsWidget->createEffectWidgets(effectItems, effectArea, coord, info.isPotion || info.isIngredient, flag);
-            totalSize.height += coord.top-6;
+            effectsWidget->createEffectWidgets(
+                effectItems, effectArea, coord, info.isPotion || info.isIngredient, flag);
+            totalSize.height += coord.top - 6;
             totalSize.width = std::max(totalSize.width, coord.width);
         }
 
         if (enchant)
         {
             MyGUI::Widget* enchantArea = mDynamicToolTipBox->createWidget<MyGUI::Widget>("",
-                MyGUI::IntCoord(padding.left, totalSize.height, 300-padding.left, 300-totalSize.height),
+                MyGUI::IntCoord(padding.left, totalSize.height, 300 - padding.left, 300 - totalSize.height),
                 MyGUI::Align::Stretch);
 
             MyGUI::IntCoord coord(0, 6, totalSize.width, 24);
 
-            Widgets::MWEffectListPtr enchantWidget = enchantArea->createWidget<Widgets::MWEffectList>
-                ("MW_StatName", coord, MyGUI::Align::Default);
+            Widgets::MWEffectListPtr enchantWidget
+                = enchantArea->createWidget<Widgets::MWEffectList>("MW_StatName", coord, MyGUI::Align::Default);
             enchantWidget->setEffectList(Widgets::MWEffectList::effectListFromESM(&enchant->mEffects));
 
             std::vector<MyGUI::Widget*> enchantEffectItems;
-            int flag = (enchant->mData.mType == ESM::Enchantment::ConstantEffect) ? Widgets::MWEffectList::EF_Constant : 0;
+            int flag
+                = (enchant->mData.mType == ESM::Enchantment::ConstantEffect) ? Widgets::MWEffectList::EF_Constant : 0;
             enchantWidget->createEffectWidgets(enchantEffectItems, enchantArea, coord, false, flag);
-            totalSize.height += coord.top-6;
+            totalSize.height += coord.top - 6;
             totalSize.width = std::max(totalSize.width, coord.width);
 
             if (enchant->mData.mType == ESM::Enchantment::WhenStrikes
@@ -526,7 +542,8 @@ namespace MWGui
 
                 const int chargeWidth = 204;
 
-                MyGUI::TextBox* chargeText = enchantArea->createWidget<MyGUI::TextBox>("SandText", MyGUI::IntCoord(0, 0, 10, 18), MyGUI::Align::Default, "ToolTipEnchantChargeText");
+                MyGUI::TextBox* chargeText = enchantArea->createWidget<MyGUI::TextBox>(
+                    "SandText", MyGUI::IntCoord(0, 0, 10, 18), MyGUI::Align::Default, "ToolTipEnchantChargeText");
                 chargeText->setCaptionWithReplacing("#{sCharges}");
 
                 const int chargeTextWidth = chargeText->getTextSize().width + 5;
@@ -535,60 +552,69 @@ namespace MWGui
 
                 totalSize.width = std::max(totalSize.width, chargeAndTextWidth);
 
-                chargeText->setCoord((totalSize.width - chargeAndTextWidth)/2, coord.top+6, chargeTextWidth, 18);
+                chargeText->setCoord((totalSize.width - chargeAndTextWidth) / 2, coord.top + 6, chargeTextWidth, 18);
 
                 MyGUI::IntCoord chargeCoord;
                 if (totalSize.width < chargeWidth)
                 {
                     totalSize.width = chargeWidth;
-                    chargeCoord = MyGUI::IntCoord(0, coord.top+6, chargeWidth, 18);
+                    chargeCoord = MyGUI::IntCoord(0, coord.top + 6, chargeWidth, 18);
                 }
                 else
                 {
-                    chargeCoord = MyGUI::IntCoord((totalSize.width - chargeAndTextWidth)/2 + chargeTextWidth, coord.top+6, chargeWidth, 18);
+                    chargeCoord = MyGUI::IntCoord(
+                        (totalSize.width - chargeAndTextWidth) / 2 + chargeTextWidth, coord.top + 6, chargeWidth, 18);
                 }
-                Widgets::MWDynamicStatPtr chargeWidget = enchantArea->createWidget<Widgets::MWDynamicStat>
-                    ("MW_ChargeBar", chargeCoord, MyGUI::Align::Default);
+                Widgets::MWDynamicStatPtr chargeWidget = enchantArea->createWidget<Widgets::MWDynamicStat>(
+                    "MW_ChargeBar", chargeCoord, MyGUI::Align::Default);
                 chargeWidget->setValue(charge, maxCharge);
                 totalSize.height += 24;
             }
         }
 
-        captionWidget->setCoord( (totalSize.width - captionSize.width)/2 + imageSize,
-            (captionHeight-captionSize.height)/2,
-            captionSize.width-imageSize,
-            captionSize.height);
+        captionWidget->setCoord((totalSize.width - captionSize.width) / 2 + imageSize,
+            (captionHeight - captionSize.height) / 2, captionSize.width - imageSize, captionSize.height);
 
-         //if its too long we do hscroll with the caption
+        // if its too long we do hscroll with the caption
         if (captionSize.width > maximumWidth)
         {
             mHorizontalScrollIndex = mHorizontalScrollIndex + 2;
-            if (mHorizontalScrollIndex > captionSize.width){
+            if (mHorizontalScrollIndex > captionSize.width)
+            {
                 mHorizontalScrollIndex = -totalSize.width;
             }
             int horizontal_scroll = mHorizontalScrollIndex;
-            if (horizontal_scroll < 40){
+            if (horizontal_scroll < 40)
+            {
                 horizontal_scroll = 40;
-            }else{
+            }
+            else
+            {
                 horizontal_scroll = 80 - mHorizontalScrollIndex;
             }
-            captionWidget->setPosition (MyGUI::IntPoint(horizontal_scroll, captionWidget->getPosition().top + padding.top));
-        } else {
-            captionWidget->setPosition (captionWidget->getPosition() + padding);
+            captionWidget->setPosition(
+                MyGUI::IntPoint(horizontal_scroll, captionWidget->getPosition().top + padding.top));
+        }
+        else
+        {
+            captionWidget->setPosition(captionWidget->getPosition() + padding);
         }
 
-        textWidget->setPosition (textWidget->getPosition() + MyGUI::IntPoint(0, padding.top)); // only apply vertical padding, the horizontal works automatically due to Align::HCenter
+        textWidget->setPosition(textWidget->getPosition()
+            + MyGUI::IntPoint(0,
+                padding.top)); // only apply vertical padding, the horizontal works automatically due to Align::HCenter
 
         if (!image.empty())
         {
             MyGUI::ImageBox* imageWidget = mDynamicToolTipBox->createWidget<MyGUI::ImageBox>("ImageBox",
-                MyGUI::IntCoord((totalSize.width - captionSize.width - imageCaptionHPadding)/2, 0, imageSize, imageSize),
+                MyGUI::IntCoord(
+                    (totalSize.width - captionSize.width - imageCaptionHPadding) / 2, 0, imageSize, imageSize),
                 MyGUI::Align::Left | MyGUI::Align::Top);
             imageWidget->setImageTexture(realImage);
-            imageWidget->setPosition (imageWidget->getPosition() + padding);
+            imageWidget->setPosition(imageWidget->getPosition() + padding);
         }
 
-        totalSize += MyGUI::IntSize(padding.left*2, padding.top*2);
+        totalSize += MyGUI::IntSize(padding.left * 2, padding.top * 2);
 
         return totalSize;
     }
@@ -622,7 +648,7 @@ namespace MWGui
         if (value == 0)
             return {};
         else
-            return "\n" + prefix + ": " + toString(value*100) +"%";
+            return "\n" + prefix + ": " + toString(value * 100) + "%";
     }
 
     std::string ToolTips::getValueString(const int value, const std::string& prefix)
@@ -654,8 +680,8 @@ namespace MWGui
         const std::string& soul = cellref.getSoul();
         if (soul.empty())
             return {};
-        const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-        const ESM::Creature *creature = store.get<ESM::Creature>().search(soul);
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+        const ESM::Creature* creature = store.get<ESM::Creature>().search(soul);
         if (!creature)
             return {};
         if (creature->mName.empty())
@@ -670,8 +696,8 @@ namespace MWGui
         const std::string& factionId = cellref.getFaction();
         if (!factionId.empty())
         {
-            const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-            const ESM::Faction *fact = store.get<ESM::Faction>().search(factionId);
+            const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+            const ESM::Faction* fact = store.get<ESM::Faction>().search(factionId);
             if (fact != nullptr)
             {
                 ret += getMiscString(fact->mName.empty() ? factionId : fact->mName, "Owner Faction");
@@ -687,8 +713,8 @@ namespace MWGui
             }
         }
 
-        std::vector<std::pair<std::string, int> > itemOwners =
-                MWBase::Environment::get().getMechanicsManager()->getStolenItemOwners(cellref.getRefId());
+        std::vector<std::pair<std::string, int>> itemOwners
+            = MWBase::Environment::get().getMechanicsManager()->getStolenItemOwners(cellref.getRefId());
 
         for (std::pair<std::string, int>& owner : itemOwners)
         {
@@ -722,7 +748,8 @@ namespace MWGui
         int units = 0;
         int years = fullDuration / secondsPerYear;
         int months = fullDuration % secondsPerYear / secondsPerMonth;
-        int days = fullDuration % secondsPerYear % secondsPerMonth / secondsPerDay; // Because a year is not exactly 12 "months"
+        int days = fullDuration % secondsPerYear % secondsPerMonth
+            / secondsPerDay; // Because a year is not exactly 12 "months"
         int hours = fullDuration % secondsPerDay / secondsPerHour;
         int minutes = fullDuration % secondsPerHour / secondsPerMinute;
         int seconds = fullDuration % secondsPerMinute;
@@ -778,21 +805,19 @@ namespace MWGui
         if (skillId == -1)
             return;
 
-        const MWWorld::ESMStore &store =
-            MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
 
-        const std::string &skillNameId = ESM::Skill::sSkillNameIds[skillId];
+        const std::string& skillNameId = ESM::Skill::sSkillNameIds[skillId];
         const ESM::Skill* skill = store.get<ESM::Skill>().find(skillId);
         assert(skill);
 
-        const ESM::Attribute* attr =
-            store.get<ESM::Attribute>().find(skill->mData.mAttribute);
+        const ESM::Attribute* attr = store.get<ESM::Attribute>().find(skill->mData.mAttribute);
         assert(attr);
         std::string icon = "icons\\k\\" + ESM::Skill::sIconNames[skillId];
 
         widget->setUserString("ToolTipType", "Layout");
         widget->setUserString("ToolTipLayout", "SkillNoProgressToolTip");
-        widget->setUserString("Caption_SkillNoProgressName", "#{"+skillNameId+"}");
+        widget->setUserString("Caption_SkillNoProgressName", "#{" + skillNameId + "}");
         widget->setUserString("Caption_SkillNoProgressDescription", skill->mDescription);
         widget->setUserString("Caption_SkillNoProgressAttribute", "#{sGoverningAttribute}: #{" + attr->mName + "}");
         widget->setUserString("ImageTexture_SkillNoProgressImage", icon);
@@ -809,8 +834,8 @@ namespace MWGui
 
         widget->setUserString("ToolTipType", "Layout");
         widget->setUserString("ToolTipLayout", "AttributeToolTip");
-        widget->setUserString("Caption_AttributeName", "#{"+name+"}");
-        widget->setUserString("Caption_AttributeDescription", "#{"+desc+"}");
+        widget->setUserString("Caption_AttributeName", "#{" + name + "}");
+        widget->setUserString("Caption_AttributeDescription", "#{" + desc + "}");
         widget->setUserString("ImageTexture_AttributeImage", icon);
     }
 
@@ -819,8 +844,7 @@ namespace MWGui
         widget->setUserString("Caption_Caption", name);
         std::string specText;
         // get all skills of this specialisation
-        const MWWorld::Store<ESM::Skill> &skills =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Skill>();
+        const MWWorld::Store<ESM::Skill>& skills = MWBase::Environment::get().getWorld()->getStore().get<ESM::Skill>();
 
         bool isFirst = true;
         for (auto& skillPair : skills)
@@ -842,22 +866,22 @@ namespace MWGui
 
     void ToolTips::createBirthsignToolTip(MyGUI::Widget* widget, const std::string& birthsignId)
     {
-        const MWWorld::ESMStore &store =
-            MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
 
-        const ESM::BirthSign *sign = store.get<ESM::BirthSign>().find(birthsignId);
+        const ESM::BirthSign* sign = store.get<ESM::BirthSign>().find(birthsignId);
         const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
         widget->setUserString("ToolTipType", "Layout");
         widget->setUserString("ToolTipLayout", "BirthSignToolTip");
-        widget->setUserString("ImageTexture_BirthSignImage", Misc::ResourceHelpers::correctTexturePath(sign->mTexture, vfs));
+        widget->setUserString(
+            "ImageTexture_BirthSignImage", Misc::ResourceHelpers::correctTexturePath(sign->mTexture, vfs));
         std::string text = sign->mName + "\n#{fontcolourhtml=normal}" + sign->mDescription;
 
         std::vector<const ESM::Spell*> abilities, powers, spells;
 
         for (const std::string& spellId : sign->mPowers.mList)
         {
-            const ESM::Spell *spell = store.get<ESM::Spell>().search(spellId);
+            const ESM::Spell* spell = store.get<ESM::Spell>().search(spellId);
             if (!spell)
                 continue; // Skip spells which cannot be found
             ESM::Spell::SpellType type = static_cast<ESM::Spell::SpellType>(spell->mData.mType);
@@ -873,7 +897,8 @@ namespace MWGui
         }
 
         using Category = std::pair<const std::vector<const ESM::Spell*>&, std::string_view>;
-        for (const auto&[category, label] : std::initializer_list<Category>{{abilities, "sBirthsignmenu1"}, {powers, "sPowers"}, {spells, "sBirthsignmenu2"}})
+        for (const auto& [category, label] : std::initializer_list<Category>{
+                 { abilities, "sBirthsignmenu1" }, { powers, "sPowers" }, { spells, "sBirthsignmenu2" } })
         {
             bool addHeader = true;
             for (const ESM::Spell* spell : category)
@@ -924,13 +949,13 @@ namespace MWGui
 
     void ToolTips::createMagicEffectToolTip(MyGUI::Widget* widget, short id)
     {
-        const ESM::MagicEffect* effect =
-            MWBase::Environment::get().getWorld ()->getStore ().get<ESM::MagicEffect>().find(id);
-        const std::string &name = ESM::MagicEffect::effectIdToString (id);
+        const ESM::MagicEffect* effect
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(id);
+        const std::string& name = ESM::MagicEffect::effectIdToString(id);
 
         std::string icon = effect->mIcon;
         int slashPos = icon.rfind('\\');
-        icon.insert(slashPos+1, "b_");
+        icon.insert(slashPos + 1, "b_");
         icon = Misc::ResourceHelpers::correctIconPath(icon, MWBase::Environment::get().getResourceSystem()->getVFS());
 
         widget->setUserString("ToolTipType", "Layout");
diff --git a/apps/openmw/mwgui/tooltips.hpp b/apps/openmw/mwgui/tooltips.hpp
index d7bb87bdb0..1c2c434070 100644
--- a/apps/openmw/mwgui/tooltips.hpp
+++ b/apps/openmw/mwgui/tooltips.hpp
@@ -1,8 +1,8 @@
 #ifndef MWGUI_TOOLTIPS_H
 #define MWGUI_TOOLTIPS_H
 
-#include "layout.hpp"
 #include "../mwworld/ptr.hpp"
+#include "layout.hpp"
 
 #include "widgets.hpp"
 
@@ -24,7 +24,8 @@ namespace MWGui
             , isPotion(false)
             , isIngredient(false)
             , wordWrap(true)
-        {}
+        {
+        }
 
         std::string caption;
         std::string text;
@@ -87,7 +88,7 @@ namespace MWGui
         static std::string getCellRefString(const MWWorld::CellRef& cellref);
         ///< Returns a string containing debug tooltip information about the given cellref.
 
-        static std::string getDurationString (float duration, const std::string& prefix);
+        static std::string getDurationString(float duration, const std::string& prefix);
         ///< Returns duration as two largest time units, rounded down. Note: not localized; no line break.
 
         // these do not create an actual tooltip, but they fill in the data that is required so the tooltip
@@ -99,16 +100,16 @@ namespace MWGui
         static void createRaceToolTip(MyGUI::Widget* widget, const ESM::Race* playerRace);
         static void createClassToolTip(MyGUI::Widget* widget, const ESM::Class& playerClass);
         static void createMagicEffectToolTip(MyGUI::Widget* widget, short id);
-        
+
         bool checkOwned();
         /// Returns True if taking mFocusObject would be crime
- 
+
     private:
         MyGUI::Widget* mDynamicToolTipBox;
 
         MWWorld::Ptr mFocusObject;
 
-        MyGUI::IntSize getToolTipViaPtr (int count, bool image = true, bool isOwned = false);
+        MyGUI::IntSize getToolTipViaPtr(int count, bool image = true, bool isOwned = false);
         ///< @return requested tooltip size
 
         MyGUI::IntSize createToolTip(const ToolTipInfo& info, bool isOwned = false);
@@ -125,7 +126,6 @@ namespace MWGui
 
         int mHorizontalScrollIndex;
 
-
         float mDelay;
         float mRemainingDelay; // remaining time until tooltip will show
 
@@ -135,7 +135,7 @@ namespace MWGui
         bool mEnabled;
 
         bool mFullHelp;
-        
+
         int mShowOwned;
 
         float mFrameDuration;
diff --git a/apps/openmw/mwgui/tradeitemmodel.cpp b/apps/openmw/mwgui/tradeitemmodel.cpp
index 22973ee91a..b3202c112a 100644
--- a/apps/openmw/mwgui/tradeitemmodel.cpp
+++ b/apps/openmw/mwgui/tradeitemmodel.cpp
@@ -21,7 +21,7 @@ namespace MWGui
         return true;
     }
 
-    ItemStack TradeItemModel::getItem (ModelIndex index)
+    ItemStack TradeItemModel::getItem(ModelIndex index)
     {
         if (index < 0)
             throw std::runtime_error("Invalid index supplied");
@@ -35,7 +35,7 @@ namespace MWGui
         return mItems.size();
     }
 
-    void TradeItemModel::borrowImpl(const ItemStack &item, std::vector<ItemStack> &out)
+    void TradeItemModel::borrowImpl(const ItemStack& item, std::vector<ItemStack>& out)
     {
         bool found = false;
         for (ItemStack& itemStack : out)
@@ -51,7 +51,7 @@ namespace MWGui
             out.push_back(item);
     }
 
-    void TradeItemModel::unborrowImpl(const ItemStack &item, size_t count, std::vector<ItemStack> &out)
+    void TradeItemModel::unborrowImpl(const ItemStack& item, size_t count, std::vector<ItemStack>& out)
     {
         std::vector<ItemStack>::iterator it = out.begin();
         bool found = false;
@@ -72,33 +72,33 @@ namespace MWGui
             throw std::runtime_error("Can't find borrowed item to return");
     }
 
-    void TradeItemModel::borrowItemFromUs (ModelIndex itemIndex, size_t count)
+    void TradeItemModel::borrowItemFromUs(ModelIndex itemIndex, size_t count)
     {
         ItemStack item = getItem(itemIndex);
         item.mCount = count;
         borrowImpl(item, mBorrowedFromUs);
     }
 
-    void TradeItemModel::borrowItemToUs (ModelIndex itemIndex, ItemModel* source, size_t count)
+    void TradeItemModel::borrowItemToUs(ModelIndex itemIndex, ItemModel* source, size_t count)
     {
         ItemStack item = source->getItem(itemIndex);
         item.mCount = count;
         borrowImpl(item, mBorrowedToUs);
     }
 
-    void TradeItemModel::returnItemBorrowedToUs (ModelIndex itemIndex, size_t count)
+    void TradeItemModel::returnItemBorrowedToUs(ModelIndex itemIndex, size_t count)
     {
         ItemStack item = getItem(itemIndex);
         unborrowImpl(item, count, mBorrowedToUs);
     }
 
-    void TradeItemModel::returnItemBorrowedFromUs (ModelIndex itemIndex, ItemModel* source, size_t count)
+    void TradeItemModel::returnItemBorrowedFromUs(ModelIndex itemIndex, ItemModel* source, size_t count)
     {
         ItemStack item = source->getItem(itemIndex);
         unborrowImpl(item, count, mBorrowedFromUs);
     }
 
-    void TradeItemModel::adjustEncumbrance(float &encumbrance)
+    void TradeItemModel::adjustEncumbrance(float& encumbrance)
     {
         for (ItemStack& itemStack : mBorrowedToUs)
         {
@@ -130,8 +130,8 @@ namespace MWGui
         {
             // get index in the source model
             ItemModel* sourceModel = itemStack.mCreator;
-            size_t i=0;
-            for (; i<sourceModel->getItemCount(); ++i)
+            size_t i = 0;
+            for (; i < sourceModel->getItemCount(); ++i)
             {
                 if (itemStack.mBase == sourceModel->getItem(i).mBase)
                     break;
@@ -160,19 +160,19 @@ namespace MWGui
 
         mItems.clear();
         // add regular items
-        for (size_t i=0; i<mSourceModel->getItemCount(); ++i)
+        for (size_t i = 0; i < mSourceModel->getItemCount(); ++i)
         {
             ItemStack item = mSourceModel->getItem(i);
-            if(!mMerchant.isEmpty())
+            if (!mMerchant.isEmpty())
             {
                 MWWorld::Ptr base = item.mBase;
-                if(Misc::StringUtils::ciEqual(base.getCellRef().getRefId(), MWWorld::ContainerStore::sGoldId))
+                if (Misc::StringUtils::ciEqual(base.getCellRef().getRefId(), MWWorld::ContainerStore::sGoldId))
                     continue;
 
                 if (!base.getClass().showsInInventory(base))
                     return;
 
-                if(!base.getClass().canSell(base, services))
+                if (!base.getClass().canSell(base, services))
                     continue;
 
                 // Bound items may not be bought
@@ -180,7 +180,7 @@ namespace MWGui
                     continue;
 
                 // don't show equipped items
-                if(mMerchant.getClass().hasInventoryStore(mMerchant))
+                if (mMerchant.getClass().hasInventoryStore(mMerchant))
                 {
                     MWWorld::InventoryStore& store = mMerchant.getClass().getInventoryStore(mMerchant);
                     if (store.isEquipped(base))
diff --git a/apps/openmw/mwgui/tradeitemmodel.hpp b/apps/openmw/mwgui/tradeitemmodel.hpp
index 5a22bab8d3..d395744d2a 100644
--- a/apps/openmw/mwgui/tradeitemmodel.hpp
+++ b/apps/openmw/mwgui/tradeitemmodel.hpp
@@ -17,28 +17,28 @@ namespace MWGui
 
         bool allowedToUseItems() const override;
 
-        ItemStack getItem (ModelIndex index) override;
+        ItemStack getItem(ModelIndex index) override;
         size_t getItemCount() override;
 
         void update() override;
 
-        void borrowItemFromUs (ModelIndex itemIndex, size_t count);
+        void borrowItemFromUs(ModelIndex itemIndex, size_t count);
 
-        void borrowItemToUs (ModelIndex itemIndex, ItemModel* source, size_t count);
+        void borrowItemToUs(ModelIndex itemIndex, ItemModel* source, size_t count);
         ///< @note itemIndex points to an item in \a source
 
-        void returnItemBorrowedToUs (ModelIndex itemIndex, size_t count);
+        void returnItemBorrowedToUs(ModelIndex itemIndex, size_t count);
 
-        void returnItemBorrowedFromUs (ModelIndex itemIndex, ItemModel* source, size_t count);
+        void returnItemBorrowedFromUs(ModelIndex itemIndex, ItemModel* source, size_t count);
 
         /// Permanently transfers items that were borrowed to us from another model to this model
-        void transferItems ();
+        void transferItems();
         /// Aborts trade
         void abort();
 
         /// Adjusts the given encumbrance by adding weight for items that have been lent to us,
         /// and removing weight for items we've lent to someone else.
-        void adjustEncumbrance (float& encumbrance);
+        void adjustEncumbrance(float& encumbrance);
 
         const std::vector<ItemStack> getItemsBorrowedToUs() const;
 
diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index 3abe10a6fb..60e0374ff2 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -1,18 +1,18 @@
 #include "tradewindow.hpp"
 
 #include <MyGUI_Button.h>
-#include <MyGUI_InputManager.h>
 #include <MyGUI_ControllerManager.h>
 #include <MyGUI_ControllerRepeatClick.h>
+#include <MyGUI_InputManager.h>
 
-#include <components/widgets/numericeditbox.hpp>
 #include <components/misc/strings/format.hpp>
+#include <components/widgets/numericeditbox.hpp>
 
+#include "../mwbase/dialoguemanager.hpp"
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
-#include "../mwbase/dialoguemanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
@@ -21,18 +21,18 @@
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 
+#include "containeritemmodel.hpp"
+#include "countdialog.hpp"
 #include "inventorywindow.hpp"
 #include "itemview.hpp"
 #include "sortfilteritemmodel.hpp"
-#include "containeritemmodel.hpp"
-#include "tradeitemmodel.hpp"
-#include "countdialog.hpp"
 #include "tooltips.hpp"
+#include "tradeitemmodel.hpp"
 
 namespace
 {
 
-    int getEffectiveValue (MWWorld::Ptr item, int count)
+    int getEffectiveValue(MWWorld::Ptr item, int count)
     {
         float price = static_cast<float>(item.getClass().getValue(item));
         if (item.getClass().hasItemHealth(item))
@@ -94,7 +94,8 @@ namespace MWGui
 
         mTotalBalance->eventValueChanged += MyGUI::newDelegate(this, &TradeWindow::onBalanceValueChanged);
         mTotalBalance->eventEditSelectAccept += MyGUI::newDelegate(this, &TradeWindow::onAccept);
-        mTotalBalance->setMinValue(std::numeric_limits<int>::min()+1); // disallow INT_MIN since abs(INT_MIN) is undefined
+        mTotalBalance->setMinValue(
+            std::numeric_limits<int>::min() + 1); // disallow INT_MIN since abs(INT_MIN) is undefined
 
         setCoord(400, 0, 400, 300);
     }
@@ -114,7 +115,8 @@ namespace MWGui
         std::vector<MWWorld::Ptr> worldItems;
         MWBase::Environment::get().getWorld()->getItemsOwnedBy(actor, worldItems);
 
-        auto tradeModel = std::make_unique<TradeItemModel>(std::make_unique<ContainerItemModel>(itemSources, worldItems), mPtr);
+        auto tradeModel
+            = std::make_unique<TradeItemModel>(std::make_unique<ContainerItemModel>(itemSources, worldItems), mPtr);
         mTradeModel = tradeModel.get();
         auto sortModel = std::make_unique<SortFilterItemModel>(std::move(tradeModel));
         mSortModel = sortModel.get();
@@ -176,7 +178,7 @@ namespace MWGui
         return true;
     }
 
-    void TradeWindow::onItemSelected (int index)
+    void TradeWindow::onItemSelected(int index)
     {
         const ItemStack& item = mSortModel->getItem(index);
 
@@ -190,7 +192,7 @@ namespace MWGui
         {
             CountDialog* dialog = MWBase::Environment::get().getWindowManager()->getCountDialog();
             std::string message = "#{sQuanityMenuMessage02}";
-            std::string name{object.getClass().getName(object)};
+            std::string name{ object.getClass().getName(object) };
             name += MWGui::ToolTips::getSoulString(object.getCellRef());
             dialog->openCountDialog(name, message, count);
             dialog->eventOkClicked.clear();
@@ -200,7 +202,7 @@ namespace MWGui
         else
         {
             mItemToSell = mSortModel->mapToSource(index);
-            sellItem (nullptr, count);
+            sellItem(nullptr, count);
         }
     }
 
@@ -210,7 +212,8 @@ namespace MWGui
         std::string_view sound = item.mBase.getClass().getUpSoundId(item.mBase);
         MWBase::Environment::get().getWindowManager()->playSound(sound);
 
-        TradeItemModel* playerTradeModel = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getTradeModel();
+        TradeItemModel* playerTradeModel
+            = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getTradeModel();
 
         if (item.mType == ItemStack::Type_Barter)
         {
@@ -231,17 +234,19 @@ namespace MWGui
         mItemView->update();
     }
 
-    void TradeWindow::borrowItem (int index, size_t count)
+    void TradeWindow::borrowItem(int index, size_t count)
     {
-        TradeItemModel* playerTradeModel = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getTradeModel();
+        TradeItemModel* playerTradeModel
+            = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getTradeModel();
         mTradeModel->borrowItemToUs(index, playerTradeModel, count);
         mItemView->update();
         sellToNpc(playerTradeModel->getItem(index).mBase, count, false);
     }
 
-    void TradeWindow::returnItem (int index, size_t count)
+    void TradeWindow::returnItem(int index, size_t count)
     {
-        TradeItemModel* playerTradeModel = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getTradeModel();
+        TradeItemModel* playerTradeModel
+            = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getTradeModel();
         const ItemStack& item = playerTradeModel->getItem(index);
         mTradeModel->returnItemBorrowedFromUs(index, playerTradeModel, count);
         mItemView->update();
@@ -258,18 +263,20 @@ namespace MWGui
         }
         else
         {
-            store.remove(MWWorld::ContainerStore::sGoldId, - amount, actor);
+            store.remove(MWWorld::ContainerStore::sGoldId, -amount, actor);
         }
     }
 
     void TradeWindow::onOfferButtonClicked(MyGUI::Widget* _sender)
     {
-        TradeItemModel* playerItemModel = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getTradeModel();
+        TradeItemModel* playerItemModel
+            = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getTradeModel();
 
-        const MWWorld::Store<ESM::GameSetting> &gmst =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
-        if (mTotalBalance->getValue() == 0) mCurrentBalance = 0;
+        if (mTotalBalance->getValue() == 0)
+            mCurrentBalance = 0;
 
         // were there any items traded at all?
         const std::vector<ItemStack>& playerBought = playerItemModel->getItemsBorrowedToUs();
@@ -277,8 +284,7 @@ namespace MWGui
         if (playerBought.empty() && merchantBought.empty())
         {
             // user notification
-            MWBase::Environment::get().getWindowManager()->
-                messageBox("#{sBarterDialog11}");
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sBarterDialog11}");
             return;
         }
 
@@ -289,8 +295,7 @@ namespace MWGui
         if (mCurrentBalance < 0 && playerGold < std::abs(mCurrentBalance))
         {
             // user notification
-            MWBase::Environment::get().getWindowManager()->
-                messageBox("#{sBarterDialog1}");
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sBarterDialog1}");
             return;
         }
 
@@ -298,21 +303,22 @@ namespace MWGui
         if (mCurrentBalance > 0 && getMerchantGold() < mCurrentBalance)
         {
             // user notification
-            MWBase::Environment::get().getWindowManager()->
-                messageBox("#{sBarterDialog2}");
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sBarterDialog2}");
             return;
         }
 
         // check if the player is attempting to sell back an item stolen from this actor
         for (const ItemStack& itemStack : merchantBought)
         {
-            if (MWBase::Environment::get().getMechanicsManager()->isItemStolenFrom(itemStack.mBase.getCellRef().getRefId(), mPtr))
+            if (MWBase::Environment::get().getMechanicsManager()->isItemStolenFrom(
+                    itemStack.mBase.getCellRef().getRefId(), mPtr))
             {
                 std::string msg = gmst.find("sNotifyMessage49")->mValue.getString();
                 msg = Misc::StringUtils::format(msg, itemStack.mBase.getClass().getName(itemStack.mBase));
                 MWBase::Environment::get().getWindowManager()->messageBox(msg);
 
-                MWBase::Environment::get().getMechanicsManager()->confiscateStolenItemToOwner(player, itemStack.mBase, mPtr, itemStack.mCount);
+                MWBase::Environment::get().getMechanicsManager()->confiscateStolenItemToOwner(
+                    player, itemStack.mBase, mPtr, itemStack.mCount);
 
                 onCancelButtonClicked(mCancelButton);
                 MWBase::Environment::get().getWindowManager()->exitCurrentGuiMode();
@@ -323,18 +329,18 @@ namespace MWGui
         bool offerAccepted = mTrading.haggle(player, mPtr, mCurrentBalance, mCurrentMerchantOffer);
 
         // apply disposition change if merchant is NPC
-        if ( mPtr.getClass().isNpc() ) {
-            int dispositionDelta = offerAccepted
-                ? gmst.find("iBarterSuccessDisposition")->mValue.getInteger()
-                : gmst.find("iBarterFailDisposition")->mValue.getInteger();
+        if (mPtr.getClass().isNpc())
+        {
+            int dispositionDelta = offerAccepted ? gmst.find("iBarterSuccessDisposition")->mValue.getInteger()
+                                                 : gmst.find("iBarterFailDisposition")->mValue.getInteger();
 
             MWBase::Environment::get().getDialogueManager()->applyBarterDispositionChange(dispositionDelta);
         }
 
         // display message on haggle failure
-        if ( !offerAccepted ) {
-            MWBase::Environment::get().getWindowManager()->
-                messageBox("#{sNotifyMessage9}");
+        if (!offerAccepted)
+        {
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage9}");
             return;
         }
 
@@ -347,7 +353,7 @@ namespace MWGui
         {
             addOrRemoveGold(mCurrentBalance, player);
             mPtr.getClass().getCreatureStats(mPtr).setGoldPool(
-                        mPtr.getClass().getCreatureStats(mPtr).getGoldPool() - mCurrentBalance );
+                mPtr.getClass().getCreatureStats(mPtr).getGoldPool() - mCurrentBalance);
         }
 
         eventTradeDone();
@@ -356,7 +362,7 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Barter);
     }
 
-    void TradeWindow::onAccept(MyGUI::EditBox *sender)
+    void TradeWindow::onAccept(MyGUI::EditBox* sender)
     {
         onOfferButtonClicked(sender);
 
@@ -376,9 +382,10 @@ namespace MWGui
         updateLabels();
     }
 
-    void TradeWindow::addRepeatController(MyGUI::Widget *widget)
+    void TradeWindow::addRepeatController(MyGUI::Widget* widget)
     {
-        MyGUI::ControllerItem* item = MyGUI::ControllerManager::getInstance().createItem(MyGUI::ControllerRepeatClick::getClassTypeName());
+        MyGUI::ControllerItem* item
+            = MyGUI::ControllerManager::getInstance().createItem(MyGUI::ControllerRepeatClick::getClassTypeName());
         MyGUI::ControllerRepeatClick* controller = static_cast<MyGUI::ControllerRepeatClick*>(item);
         controller->eventRepeatClick += newDelegate(this, &TradeWindow::onRepeatClick);
         MyGUI::ControllerManager::getInstance().addItem(widget, controller);
@@ -404,7 +411,7 @@ namespace MWGui
             onDecreaseButtonTriggered();
     }
 
-    void TradeWindow::onBalanceButtonReleased(MyGUI::Widget *_sender, int _left, int _top, MyGUI::MouseButton _id)
+    void TradeWindow::onBalanceButtonReleased(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
     {
         MyGUI::ControllerManager::getInstance().removeItem(_sender);
     }
@@ -427,19 +434,26 @@ namespace MWGui
     void TradeWindow::onIncreaseButtonTriggered()
     {
         // prevent overflows, and prevent entering INT_MIN since abs(INT_MIN) is undefined
-        if (mCurrentBalance == std::numeric_limits<int>::max() || mCurrentBalance == std::numeric_limits<int>::min()+1)
+        if (mCurrentBalance == std::numeric_limits<int>::max()
+            || mCurrentBalance == std::numeric_limits<int>::min() + 1)
             return;
-        if (mTotalBalance->getValue() == 0) mCurrentBalance = 0;
-        if (mCurrentBalance < 0) mCurrentBalance -= 1;
-        else mCurrentBalance += 1;
+        if (mTotalBalance->getValue() == 0)
+            mCurrentBalance = 0;
+        if (mCurrentBalance < 0)
+            mCurrentBalance -= 1;
+        else
+            mCurrentBalance += 1;
         updateLabels();
     }
 
     void TradeWindow::onDecreaseButtonTriggered()
     {
-        if (mTotalBalance->getValue() == 0) mCurrentBalance = 0;
-        if (mCurrentBalance < 0) mCurrentBalance += 1;
-        else mCurrentBalance -= 1;
+        if (mTotalBalance->getValue() == 0)
+            mCurrentBalance = 0;
+        if (mCurrentBalance < 0)
+            mCurrentBalance += 1;
+        else
+            mCurrentBalance -= 1;
         updateLabels();
     }
 
@@ -449,7 +463,8 @@ namespace MWGui
         int playerGold = player.getClass().getContainerStore(player).count(MWWorld::ContainerStore::sGoldId);
         mPlayerGold->setCaptionWithReplacing("#{sYourGold} " + MyGUI::utility::toString(playerGold));
 
-        TradeItemModel* playerTradeModel = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getTradeModel();
+        TradeItemModel* playerTradeModel
+            = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getTradeModel();
         const std::vector<ItemStack>& playerBorrowed = playerTradeModel->getItemsBorrowedToUs();
         const std::vector<ItemStack>& merchantBorrowed = mTradeModel->getItemsBorrowedToUs();
 
@@ -474,7 +489,8 @@ namespace MWGui
 
     void TradeWindow::updateOffer()
     {
-        TradeItemModel* playerTradeModel = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getTradeModel();
+        TradeItemModel* playerTradeModel
+            = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getTradeModel();
 
         int merchantOffer = 0;
 
@@ -486,8 +502,10 @@ namespace MWGui
         for (const ItemStack& itemStack : playerBorrowed)
         {
             const int basePrice = getEffectiveValue(itemStack.mBase, itemStack.mCount);
-            const int cap = static_cast<int>(std::max(1.f, 0.75f * basePrice)); // Minimum buying price -- 75% of the base
-            const int buyingPrice = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, basePrice, true);
+            const int cap
+                = static_cast<int>(std::max(1.f, 0.75f * basePrice)); // Minimum buying price -- 75% of the base
+            const int buyingPrice
+                = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, basePrice, true);
             merchantOffer -= std::max(cap, buyingPrice);
         }
 
@@ -495,8 +513,10 @@ namespace MWGui
         for (const ItemStack& itemStack : merchantBorrowed)
         {
             const int basePrice = getEffectiveValue(itemStack.mBase, itemStack.mCount);
-            const int cap = static_cast<int>(std::max(1.f, 0.75f * basePrice)); // Maximum selling price -- 75% of the base
-            const int sellingPrice = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, basePrice, false);
+            const int cap
+                = static_cast<int>(std::max(1.f, 0.75f * basePrice)); // Maximum selling price -- 75% of the base
+            const int sellingPrice
+                = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, basePrice, false);
             merchantOffer += mPtr.getClass().isNpc() ? std::min(cap, sellingPrice) : sellingPrice;
         }
 
@@ -518,7 +538,8 @@ namespace MWGui
 
     void TradeWindow::onReferenceUnavailable()
     {
-        // remove both Trade and Dialogue (since you always trade with the NPC/creature that you have previously talked to)
+        // remove both Trade and Dialogue (since you always trade with the NPC/creature that you have previously talked
+        // to)
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Barter);
         MWBase::Environment::get().getWindowManager()->exitCurrentGuiMode();
     }
@@ -547,7 +568,7 @@ namespace MWGui
 
     void TradeWindow::onDeleteCustomData(const MWWorld::Ptr& ptr)
     {
-        if(mTradeModel && mTradeModel->usesContainer(ptr))
+        if (mTradeModel && mTradeModel->usesContainer(ptr))
             MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Barter);
     }
 }
diff --git a/apps/openmw/mwgui/tradewindow.hpp b/apps/openmw/mwgui/tradewindow.hpp
index 5ace09e8e2..62a51be0dd 100644
--- a/apps/openmw/mwgui/tradewindow.hpp
+++ b/apps/openmw/mwgui/tradewindow.hpp
@@ -24,96 +24,98 @@ namespace MWGui
 
     class TradeWindow : public WindowBase, public ReferenceInterface
     {
-        public:
-            TradeWindow();
+    public:
+        TradeWindow();
 
-            void setPtr(const MWWorld::Ptr& actor) override;
+        void setPtr(const MWWorld::Ptr& actor) override;
 
-            void onClose() override;
-            void onFrame(float dt) override;
-            void clear() override { resetReference(); }
+        void onClose() override;
+        void onFrame(float dt) override;
+        void clear() override { resetReference(); }
 
-            void borrowItem (int index, size_t count);
-            void returnItem (int index, size_t count);
+        void borrowItem(int index, size_t count);
+        void returnItem(int index, size_t count);
 
-            int getMerchantServices();
+        int getMerchantServices();
 
-            bool exit() override;
+        bool exit() override;
 
-            void resetReference() override;
+        void resetReference() override;
 
-            void onDeleteCustomData(const MWWorld::Ptr& ptr) override;
+        void onDeleteCustomData(const MWWorld::Ptr& ptr) override;
 
-            typedef MyGUI::delegates::CMultiDelegate0 EventHandle_TradeDone;
-            EventHandle_TradeDone eventTradeDone;
+        typedef MyGUI::delegates::CMultiDelegate0 EventHandle_TradeDone;
+        EventHandle_TradeDone eventTradeDone;
 
-        private:
-            ItemView* mItemView;
-            SortFilterItemModel* mSortModel;
-            TradeItemModel* mTradeModel;
-            MWMechanics::Trading mTrading;
+    private:
+        ItemView* mItemView;
+        SortFilterItemModel* mSortModel;
+        TradeItemModel* mTradeModel;
+        MWMechanics::Trading mTrading;
 
-            static const float sBalanceChangeInitialPause; // in seconds
-            static const float sBalanceChangeInterval; // in seconds
+        static const float sBalanceChangeInitialPause; // in seconds
+        static const float sBalanceChangeInterval; // in seconds
 
-            MyGUI::Button* mFilterAll;
-            MyGUI::Button* mFilterWeapon;
-            MyGUI::Button* mFilterApparel;
-            MyGUI::Button* mFilterMagic;
-            MyGUI::Button* mFilterMisc;
+        MyGUI::Button* mFilterAll;
+        MyGUI::Button* mFilterWeapon;
+        MyGUI::Button* mFilterApparel;
+        MyGUI::Button* mFilterMagic;
+        MyGUI::Button* mFilterMisc;
 
-            MyGUI::EditBox* mFilterEdit;
+        MyGUI::EditBox* mFilterEdit;
 
-            MyGUI::Button* mIncreaseButton;
-            MyGUI::Button* mDecreaseButton;
-            MyGUI::TextBox* mTotalBalanceLabel;
-            Gui::NumericEditBox* mTotalBalance;
+        MyGUI::Button* mIncreaseButton;
+        MyGUI::Button* mDecreaseButton;
+        MyGUI::TextBox* mTotalBalanceLabel;
+        Gui::NumericEditBox* mTotalBalance;
 
-            MyGUI::Widget* mBottomPane;
+        MyGUI::Widget* mBottomPane;
 
-            MyGUI::Button* mMaxSaleButton;
-            MyGUI::Button* mCancelButton;
-            MyGUI::Button* mOfferButton;
-            MyGUI::TextBox* mPlayerGold;
-            MyGUI::TextBox* mMerchantGold;
+        MyGUI::Button* mMaxSaleButton;
+        MyGUI::Button* mCancelButton;
+        MyGUI::Button* mOfferButton;
+        MyGUI::TextBox* mPlayerGold;
+        MyGUI::TextBox* mMerchantGold;
 
-            int mItemToSell;
+        int mItemToSell;
 
-            int mCurrentBalance;
-            int mCurrentMerchantOffer;
+        int mCurrentBalance;
+        int mCurrentMerchantOffer;
 
-            void sellToNpc(const MWWorld::Ptr& item, int count, bool boughtItem); ///< only used for adjusting the gold balance
-            void buyFromNpc(const MWWorld::Ptr& item, int count, bool soldItem); ///< only used for adjusting the gold balance
+        void sellToNpc(
+            const MWWorld::Ptr& item, int count, bool boughtItem); ///< only used for adjusting the gold balance
+        void buyFromNpc(
+            const MWWorld::Ptr& item, int count, bool soldItem); ///< only used for adjusting the gold balance
 
-            void updateOffer();
+        void updateOffer();
 
-            void onItemSelected (int index);
-            void sellItem (MyGUI::Widget* sender, int count);
+        void onItemSelected(int index);
+        void sellItem(MyGUI::Widget* sender, int count);
 
-            void onFilterChanged(MyGUI::Widget* _sender);
-            void onNameFilterChanged(MyGUI::EditBox* _sender);
-            void onOfferButtonClicked(MyGUI::Widget* _sender);
-            void onAccept(MyGUI::EditBox* sender);
-            void onCancelButtonClicked(MyGUI::Widget* _sender);
-            void onMaxSaleButtonClicked(MyGUI::Widget* _sender);
-            void onIncreaseButtonPressed(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
-            void onDecreaseButtonPressed(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
-            void onBalanceButtonReleased(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
-            void onBalanceValueChanged(int value);
-            void onRepeatClick(MyGUI::Widget* widget, MyGUI::ControllerItem* controller);
+        void onFilterChanged(MyGUI::Widget* _sender);
+        void onNameFilterChanged(MyGUI::EditBox* _sender);
+        void onOfferButtonClicked(MyGUI::Widget* _sender);
+        void onAccept(MyGUI::EditBox* sender);
+        void onCancelButtonClicked(MyGUI::Widget* _sender);
+        void onMaxSaleButtonClicked(MyGUI::Widget* _sender);
+        void onIncreaseButtonPressed(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
+        void onDecreaseButtonPressed(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
+        void onBalanceButtonReleased(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
+        void onBalanceValueChanged(int value);
+        void onRepeatClick(MyGUI::Widget* widget, MyGUI::ControllerItem* controller);
 
-            void addRepeatController(MyGUI::Widget* widget);
+        void addRepeatController(MyGUI::Widget* widget);
 
-            void onIncreaseButtonTriggered();
-            void onDecreaseButtonTriggered();
+        void onIncreaseButtonTriggered();
+        void onDecreaseButtonTriggered();
 
-            void addOrRemoveGold(int gold, const MWWorld::Ptr& actor);
+        void addOrRemoveGold(int gold, const MWWorld::Ptr& actor);
 
-            void updateLabels();
+        void updateLabels();
 
-            void onReferenceUnavailable() override;
+        void onReferenceUnavailable() override;
 
-            int getMerchantGold();
+        int getMerchantGold();
     };
 }
 
diff --git a/apps/openmw/mwgui/trainingwindow.cpp b/apps/openmw/mwgui/trainingwindow.cpp
index 1955a79426..f8549d70fa 100644
--- a/apps/openmw/mwgui/trainingwindow.cpp
+++ b/apps/openmw/mwgui/trainingwindow.cpp
@@ -3,39 +3,39 @@
 #include <MyGUI_Button.h>
 #include <MyGUI_Gui.h>
 
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/esmstore.hpp"
 
-#include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/npcstats.hpp"
 
-#include <components/settings/settings.hpp>
 #include <components/esm3/loadclas.hpp>
+#include <components/settings/settings.hpp>
 
 #include "tooltips.hpp"
 
 namespace
 {
-// Sorts a container descending by skill value. If skill value is equal, sorts ascending by skill ID.
-// pair <skill ID, skill value>
-bool sortSkills (const std::pair<int, int>& left, const std::pair<int, int>& right)
-{
-    if (left == right)
-        return false;
+    // Sorts a container descending by skill value. If skill value is equal, sorts ascending by skill ID.
+    // pair <skill ID, skill value>
+    bool sortSkills(const std::pair<int, int>& left, const std::pair<int, int>& right)
+    {
+        if (left == right)
+            return false;
 
-    if (left.second > right.second)
-        return true;
-    else if (left.second < right.second)
-        return false;
+        if (left.second > right.second)
+            return true;
+        else if (left.second < right.second)
+            return false;
 
-    return left.first < right.first;
-}
+        return left.first < right.first;
+    }
 }
 
 namespace MWGui
@@ -44,7 +44,8 @@ namespace MWGui
     TrainingWindow::TrainingWindow()
         : WindowBase("openmw_trainingwindow.layout")
         , mTimeAdvancer(0.05f)
-        , mTrainingSkillBasedOnBaseSkill(Settings::Manager::getBool("trainers training skills based on base skill", "Game"))
+        , mTrainingSkillBasedOnBaseSkill(
+              Settings::Manager::getBool("trainers training skills based on base skill", "Game"))
     {
         getWidget(mTrainingOptions, "TrainingOptions");
         getWidget(mCancelButton, "CancelButton");
@@ -69,7 +70,7 @@ namespace MWGui
         center();
     }
 
-    void TrainingWindow::setPtr (const MWWorld::Ptr& actor)
+    void TrainingWindow::setPtr(const MWWorld::Ptr& actor)
     {
         mPtr = actor;
 
@@ -79,10 +80,10 @@ namespace MWGui
         mPlayerGold->setCaptionWithReplacing("#{sGold}: " + MyGUI::utility::toString(playerGold));
 
         // NPC can train you in his best 3 skills
-        std::vector< std::pair<int, float> > skills;
+        std::vector<std::pair<int, float>> skills;
 
         MWMechanics::NpcStats const& actorStats(actor.getClass().getNpcStats(actor));
-        for (int i=0; i<ESM::Skill::Length; ++i)
+        for (int i = 0; i < ESM::Skill::Length; ++i)
         {
             float value = getSkillForTraining(actorStats, i);
 
@@ -91,67 +92,72 @@ namespace MWGui
 
         std::sort(skills.begin(), skills.end(), sortSkills);
 
-        MyGUI::EnumeratorWidgetPtr widgets = mTrainingOptions->getEnumerator ();
-        MyGUI::Gui::getInstance ().destroyWidgets (widgets);
+        MyGUI::EnumeratorWidgetPtr widgets = mTrainingOptions->getEnumerator();
+        MyGUI::Gui::getInstance().destroyWidgets(widgets);
 
-        MWMechanics::NpcStats& pcStats = player.getClass().getNpcStats (player);
+        MWMechanics::NpcStats& pcStats = player.getClass().getNpcStats(player);
 
-        const MWWorld::Store<ESM::GameSetting> &gmst =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
         const int lineHeight = MWBase::Environment::get().getWindowManager()->getFontHeight() + 2;
 
-        for (int i=0; i<3; ++i)
+        for (int i = 0; i < 3; ++i)
         {
-            int price = static_cast<int>(pcStats.getSkill (skills[i].first).getBase() * gmst.find("iTrainingMod")->mValue.getInteger());
+            int price = static_cast<int>(
+                pcStats.getSkill(skills[i].first).getBase() * gmst.find("iTrainingMod")->mValue.getInteger());
             price = std::max(1, price);
             price = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, price, true);
 
-            MyGUI::Button* button = mTrainingOptions->createWidget<MyGUI::Button>(price <= playerGold ? "SandTextButton" : "SandTextButtonDisabled", // can't use setEnabled since that removes tooltip
-                MyGUI::IntCoord(5, 5+i*lineHeight, mTrainingOptions->getWidth()-10, lineHeight), MyGUI::Align::Default);
+            MyGUI::Button* button = mTrainingOptions->createWidget<MyGUI::Button>(price <= playerGold
+                    ? "SandTextButton"
+                    : "SandTextButtonDisabled", // can't use setEnabled since that removes tooltip
+                MyGUI::IntCoord(5, 5 + i * lineHeight, mTrainingOptions->getWidth() - 10, lineHeight),
+                MyGUI::Align::Default);
 
             button->setUserData(skills[i].first);
             button->eventMouseButtonClick += MyGUI::newDelegate(this, &TrainingWindow::onTrainingSelected);
 
-            button->setCaptionWithReplacing("#{" + ESM::Skill::sSkillNameIds[skills[i].first] + "} - " + MyGUI::utility::toString(price));
+            button->setCaptionWithReplacing(
+                "#{" + ESM::Skill::sSkillNameIds[skills[i].first] + "} - " + MyGUI::utility::toString(price));
 
-            button->setSize(button->getTextSize ().width+12, button->getSize().height);
+            button->setSize(button->getTextSize().width + 12, button->getSize().height);
 
-            ToolTips::createSkillToolTip (button, skills[i].first);
+            ToolTips::createSkillToolTip(button, skills[i].first);
         }
 
         center();
     }
 
-    void TrainingWindow::onReferenceUnavailable ()
+    void TrainingWindow::onReferenceUnavailable()
     {
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Training);
     }
 
-    void TrainingWindow::onCancelButtonClicked (MyGUI::Widget *sender)
+    void TrainingWindow::onCancelButtonClicked(MyGUI::Widget* sender)
     {
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Training);
     }
 
-    void TrainingWindow::onTrainingSelected (MyGUI::Widget *sender)
+    void TrainingWindow::onTrainingSelected(MyGUI::Widget* sender)
     {
         int skillId = *sender->getUserData<int>();
 
-        MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
-        MWMechanics::NpcStats& pcStats = player.getClass().getNpcStats (player);
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+        MWMechanics::NpcStats& pcStats = player.getClass().getNpcStats(player);
 
-        const MWWorld::ESMStore &store =
-            MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
 
-        int price = pcStats.getSkill (skillId).getBase() * store.get<ESM::GameSetting>().find("iTrainingMod")->mValue.getInteger();
-        price = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr,price,true);
+        int price = pcStats.getSkill(skillId).getBase()
+            * store.get<ESM::GameSetting>().find("iTrainingMod")->mValue.getInteger();
+        price = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, price, true);
 
         if (price > player.getClass().getContainerStore(player).count(MWWorld::ContainerStore::sGoldId))
             return;
 
         if (getSkillForTraining(mPtr.getClass().getNpcStats(mPtr), skillId) <= pcStats.getSkill(skillId).getBase())
         {
-            MWBase::Environment::get().getWindowManager()->messageBox ("#{sServiceTrainingWords}");
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sServiceTrainingWords}");
             return;
         }
 
@@ -159,16 +165,15 @@ namespace MWGui
         const ESM::Skill* skill = MWBase::Environment::get().getWorld()->getStore().get<ESM::Skill>().find(skillId);
         if (pcStats.getSkill(skillId).getBase() >= pcStats.getAttribute(skill->mData.mAttribute).getBase())
         {
-            MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage17}");
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage17}");
             return;
         }
 
         // increase skill
-        MWWorld::LiveCellRef<ESM::NPC> *playerRef = player.get<ESM::NPC>();
+        MWWorld::LiveCellRef<ESM::NPC>* playerRef = player.get<ESM::NPC>();
 
-        const ESM::Class *class_ =
-            store.get<ESM::Class>().find(playerRef->mBase->mClass);
-        pcStats.increaseSkill (skillId, *class_, true);
+        const ESM::Class* class_ = store.get<ESM::Class>().find(playerRef->mBase->mClass);
+        pcStats.increaseSkill(skillId, *class_, true);
 
         // remove gold
         player.getClass().getContainerStore(player).remove(MWWorld::ContainerStore::sGoldId, price, player);
@@ -179,7 +184,7 @@ namespace MWGui
 
         // advance time
         MWBase::Environment::get().getMechanicsManager()->rest(2, false);
-        MWBase::Environment::get().getWorld ()->advanceTime (2);
+        MWBase::Environment::get().getWorld()->advanceTime(2);
 
         setVisible(false);
         mProgressBar.setVisible(true);
@@ -200,7 +205,7 @@ namespace MWGui
         mProgressBar.setVisible(false);
 
         // go back to game mode
-        MWBase::Environment::get().getWindowManager()->removeGuiMode (GM_Training);
+        MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Training);
         MWBase::Environment::get().getWindowManager()->exitCurrentGuiMode();
     }
 
diff --git a/apps/openmw/mwgui/trainingwindow.hpp b/apps/openmw/mwgui/trainingwindow.hpp
index 57fdd323a4..145c326150 100644
--- a/apps/openmw/mwgui/trainingwindow.hpp
+++ b/apps/openmw/mwgui/trainingwindow.hpp
@@ -1,10 +1,10 @@
 #ifndef MWGUI_TRAININGWINDOW_H
 #define MWGUI_TRAININGWINDOW_H
 
-#include "windowbase.hpp"
 #include "referenceinterface.hpp"
 #include "timeadvancer.hpp"
 #include "waitdialog.hpp"
+#include "windowbase.hpp"
 
 namespace MWMechanics
 {
@@ -34,7 +34,7 @@ namespace MWGui
     protected:
         void onReferenceUnavailable() override;
 
-        void onCancelButtonClicked (MyGUI::Widget* sender);
+        void onCancelButtonClicked(MyGUI::Widget* sender);
         void onTrainingSelected(MyGUI::Widget* sender);
 
         void onTrainingProgressChanged(int cur, int total);
@@ -50,7 +50,7 @@ namespace MWGui
 
         WaitDialogProgressBar mProgressBar;
         TimeAdvancer mTimeAdvancer;
-        bool mTrainingSkillBasedOnBaseSkill;    //corresponds to the setting 'training skills based on base skill'
+        bool mTrainingSkillBasedOnBaseSkill; // corresponds to the setting 'training skills based on base skill'
     };
 
 }
diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp
index 9533e00375..506c2123db 100644
--- a/apps/openmw/mwgui/travelwindow.cpp
+++ b/apps/openmw/mwgui/travelwindow.cpp
@@ -1,33 +1,33 @@
 #include "travelwindow.hpp"
 
 #include <MyGUI_Button.h>
-#include <MyGUI_ScrollView.h>
 #include <MyGUI_Gui.h>
+#include <MyGUI_ScrollView.h>
 
-#include <components/settings/settings.hpp>
-#include <components/esm3/loadgmst.hpp>
 #include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/class.hpp"
-#include "../mwworld/containerstore.hpp"
 #include "../mwworld/actionteleport.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/cellutils.hpp"
-#include "../mwworld/store.hpp"
+#include "../mwworld/class.hpp"
+#include "../mwworld/containerstore.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/store.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 
 namespace MWGui
 {
-    TravelWindow::TravelWindow() :
-        WindowBase("openmw_travel_window.layout")
+    TravelWindow::TravelWindow()
+        : WindowBase("openmw_travel_window.layout")
         , mCurrentY(0)
     {
         getWidget(mCancelButton, "CancelButton");
@@ -38,24 +38,19 @@ namespace MWGui
 
         mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &TravelWindow::onCancelButtonClicked);
 
-        mDestinations->setCoord(450/2-mDestinations->getTextSize().width/2,
-                          mDestinations->getTop(),
-                          mDestinations->getTextSize().width,
-                          mDestinations->getHeight());
-        mSelect->setCoord(8,
-                          mSelect->getTop(),
-                          mSelect->getTextSize().width,
-                          mSelect->getHeight());
+        mDestinations->setCoord(450 / 2 - mDestinations->getTextSize().width / 2, mDestinations->getTop(),
+            mDestinations->getTextSize().width, mDestinations->getHeight());
+        mSelect->setCoord(8, mSelect->getTop(), mSelect->getTextSize().width, mSelect->getHeight());
     }
 
-    void TravelWindow::addDestination(const std::string& name, const ESM::Position &pos, bool interior)
+    void TravelWindow::addDestination(const std::string& name, const ESM::Position& pos, bool interior)
     {
         int price;
 
-        const MWWorld::Store<ESM::GameSetting> &gmst =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
-        MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
         int playerGold = player.getClass().getContainerStore(player).count(MWWorld::ContainerStore::sGoldId);
 
         if (!mPtr.getCell()->isExterior())
@@ -65,7 +60,8 @@ namespace MWGui
         else
         {
             ESM::Position PlayerPos = player.getRefData().getPosition();
-            float d = sqrt(pow(pos.pos[0] - PlayerPos.pos[0], 2) + pow(pos.pos[1] - PlayerPos.pos[1], 2) + pow(pos.pos[2] - PlayerPos.pos[2], 2));
+            float d = sqrt(pow(pos.pos[0] - PlayerPos.pos[0], 2) + pow(pos.pos[1] - PlayerPos.pos[1], 2)
+                + pow(pos.pos[2] - PlayerPos.pos[2], 2));
             float fTravelMult = gmst.find("fTravelMult")->mValue.getFloat();
             if (fTravelMult != 0)
                 price = static_cast<int>(d / fTravelMult);
@@ -85,17 +81,18 @@ namespace MWGui
 
         int lineHeight = MWBase::Environment::get().getWindowManager()->getFontHeight() + 2;
 
-        MyGUI::Button* toAdd = mDestinationsView->createWidget<MyGUI::Button>("SandTextButton", 0, mCurrentY, 200, lineHeight, MyGUI::Align::Default);
+        MyGUI::Button* toAdd = mDestinationsView->createWidget<MyGUI::Button>(
+            "SandTextButton", 0, mCurrentY, 200, lineHeight, MyGUI::Align::Default);
         toAdd->setEnabled(price <= playerGold);
         mCurrentY += lineHeight;
-        if(interior)
-            toAdd->setUserString("interior","y");
+        if (interior)
+            toAdd->setUserString("interior", "y");
         else
-            toAdd->setUserString("interior","n");
+            toAdd->setUserString("interior", "n");
 
         toAdd->setUserString("price", std::to_string(price));
-        toAdd->setCaptionWithReplacing("#{sCell=" + name + "}   -   " + MyGUI::utility::toString(price)+"#{sgp}");
-        toAdd->setSize(mDestinationsView->getWidth(),lineHeight);
+        toAdd->setCaptionWithReplacing("#{sCell=" + name + "}   -   " + MyGUI::utility::toString(price) + "#{sgp}");
+        toAdd->setSize(mDestinationsView->getWidth(), lineHeight);
         toAdd->eventMouseWheel += MyGUI::newDelegate(this, &TravelWindow::onMouseWheel);
         toAdd->setUserString("Destination", name);
         toAdd->setUserData(pos);
@@ -104,7 +101,7 @@ namespace MWGui
 
     void TravelWindow::clearDestinations()
     {
-        mDestinationsView->setViewOffset(MyGUI::IntPoint(0,0));
+        mDestinationsView->setViewOffset(MyGUI::IntPoint(0, 0));
         mCurrentY = 0;
         while (mDestinationsView->getChildCount())
             MyGUI::Gui::getInstance().destroyWidget(mDestinationsView->getChildAt(0));
@@ -122,24 +119,28 @@ namespace MWGui
         else if (mPtr.getType() == ESM::Creature::sRecordId)
             transport = mPtr.get<ESM::Creature>()->mBase->getTransport();
 
-        for(unsigned int i = 0;i<transport.size();i++)
+        for (unsigned int i = 0; i < transport.size(); i++)
         {
             std::string cellname = transport[i].mCellName;
             bool interior = true;
-            const osg::Vec2i cellIndex = MWWorld::positionToCellIndex(transport[i].mPos.pos[0], transport[i].mPos.pos[1]);
+            const osg::Vec2i cellIndex
+                = MWWorld::positionToCellIndex(transport[i].mPos.pos[0], transport[i].mPos.pos[1]);
             if (cellname.empty())
             {
-                MWWorld::CellStore* cell = MWBase::Environment::get().getWorld()->getExterior(cellIndex.x(), cellIndex.y());
+                MWWorld::CellStore* cell
+                    = MWBase::Environment::get().getWorld()->getExterior(cellIndex.x(), cellIndex.y());
                 cellname = MWBase::Environment::get().getWorld()->getCellName(cell);
                 interior = false;
             }
-            addDestination(cellname,transport[i].mPos,interior);
+            addDestination(cellname, transport[i].mPos, interior);
         }
 
         updateLabels();
-        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the scrollbar is hidden
+        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the
+        // scrollbar is hidden
         mDestinationsView->setVisibleVScroll(false);
-        mDestinationsView->setCanvasSize (MyGUI::IntSize(mDestinationsView->getWidth(), std::max(mDestinationsView->getHeight(), mCurrentY)));
+        mDestinationsView->setCanvasSize(
+            MyGUI::IntSize(mDestinationsView->getWidth(), std::max(mDestinationsView->getHeight(), mCurrentY)));
         mDestinationsView->setVisibleVScroll(true);
     }
 
@@ -152,7 +153,7 @@ namespace MWGui
         MWWorld::Ptr player = MWMechanics::getPlayer();
         int playerGold = player.getClass().getContainerStore(player).count(MWWorld::ContainerStore::sGoldId);
 
-        if (playerGold<price)
+        if (playerGold < price)
             return;
 
         // Set "traveling" flag, so GetPCTraveling can detect teleportation.
@@ -176,9 +177,16 @@ namespace MWGui
         if (mPtr.getCell()->isExterior())
         {
             ESM::Position playerPos = player.getRefData().getPosition();
-            float d = (osg::Vec3f(pos.pos[0], pos.pos[1], 0) - osg::Vec3f(playerPos.pos[0], playerPos.pos[1], 0)).length();
-            int hours = static_cast<int>(d /MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fTravelTimeMult")->mValue.getFloat());
-            MWBase::Environment::get().getMechanicsManager ()->rest (hours, true);
+            float d
+                = (osg::Vec3f(pos.pos[0], pos.pos[1], 0) - osg::Vec3f(playerPos.pos[0], playerPos.pos[1], 0)).length();
+            int hours = static_cast<int>(d
+                / MWBase::Environment::get()
+                      .getWorld()
+                      ->getStore()
+                      .get<ESM::GameSetting>()
+                      .find("fTravelTimeMult")
+                      ->mValue.getFloat());
+            MWBase::Environment::get().getMechanicsManager()->rest(hours, true);
             MWBase::Environment::get().getWorld()->advanceTime(hours);
         }
 
@@ -202,14 +210,11 @@ namespace MWGui
 
     void TravelWindow::updateLabels()
     {
-        MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
         int playerGold = player.getClass().getContainerStore(player).count(MWWorld::ContainerStore::sGoldId);
 
         mPlayerGold->setCaptionWithReplacing("#{sGold}: " + MyGUI::utility::toString(playerGold));
-        mPlayerGold->setCoord(8,
-                              mPlayerGold->getTop(),
-                              mPlayerGold->getTextSize().width,
-                              mPlayerGold->getHeight());
+        mPlayerGold->setCoord(8, mPlayerGold->getTop(), mPlayerGold->getTextSize().width, mPlayerGold->getHeight());
     }
 
     void TravelWindow::onReferenceUnavailable()
@@ -220,10 +225,10 @@ namespace MWGui
 
     void TravelWindow::onMouseWheel(MyGUI::Widget* _sender, int _rel)
     {
-        if (mDestinationsView->getViewOffset().top + _rel*0.3f > 0)
+        if (mDestinationsView->getViewOffset().top + _rel * 0.3f > 0)
             mDestinationsView->setViewOffset(MyGUI::IntPoint(0, 0));
         else
-            mDestinationsView->setViewOffset(MyGUI::IntPoint(0, static_cast<int>(mDestinationsView->getViewOffset().top + _rel*0.3f)));
+            mDestinationsView->setViewOffset(
+                MyGUI::IntPoint(0, static_cast<int>(mDestinationsView->getViewOffset().top + _rel * 0.3f)));
     }
 }
-
diff --git a/apps/openmw/mwgui/travelwindow.hpp b/apps/openmw/mwgui/travelwindow.hpp
index dd970ee10e..75aa7a580f 100644
--- a/apps/openmw/mwgui/travelwindow.hpp
+++ b/apps/openmw/mwgui/travelwindow.hpp
@@ -1,43 +1,42 @@
 #ifndef MWGUI_TravelWINDOW_H
 #define MWGUI_TravelWINDOW_H
 
-
-#include "windowbase.hpp"
 #include "referenceinterface.hpp"
+#include "windowbase.hpp"
 
 namespace MyGUI
 {
-  class Gui;
-  class Widget;
+    class Gui;
+    class Widget;
 }
 
 namespace MWGui
 {
     class TravelWindow : public ReferenceInterface, public WindowBase
     {
-        public:
-            TravelWindow();
+    public:
+        TravelWindow();
 
-            void setPtr (const MWWorld::Ptr& actor) override;
+        void setPtr(const MWWorld::Ptr& actor) override;
 
-        protected:
-            MyGUI::Button* mCancelButton;
-            MyGUI::TextBox* mPlayerGold;
-            MyGUI::TextBox* mDestinations;
-            MyGUI::TextBox* mSelect;
+    protected:
+        MyGUI::Button* mCancelButton;
+        MyGUI::TextBox* mPlayerGold;
+        MyGUI::TextBox* mDestinations;
+        MyGUI::TextBox* mSelect;
 
-            MyGUI::ScrollView* mDestinationsView;
+        MyGUI::ScrollView* mDestinationsView;
 
-            void onCancelButtonClicked(MyGUI::Widget* _sender);
-            void onTravelButtonClick(MyGUI::Widget* _sender);
-            void onMouseWheel(MyGUI::Widget* _sender, int _rel);
-            void addDestination(const std::string& name, const ESM::Position& pos, bool interior);
-            void clearDestinations();
-            int mCurrentY;
+        void onCancelButtonClicked(MyGUI::Widget* _sender);
+        void onTravelButtonClick(MyGUI::Widget* _sender);
+        void onMouseWheel(MyGUI::Widget* _sender, int _rel);
+        void addDestination(const std::string& name, const ESM::Position& pos, bool interior);
+        void clearDestinations();
+        int mCurrentY;
 
-            void updateLabels();
+        void updateLabels();
 
-            void onReferenceUnavailable() override;
+        void onReferenceUnavailable() override;
     };
 }
 
diff --git a/apps/openmw/mwgui/ustring.hpp b/apps/openmw/mwgui/ustring.hpp
index 1d8ec3ba13..5a6c30312a 100644
--- a/apps/openmw/mwgui/ustring.hpp
+++ b/apps/openmw/mwgui/ustring.hpp
@@ -8,7 +8,7 @@ namespace MWGui
     // FIXME: Remove once we get a version of MyGUI that supports string_view
     inline MyGUI::UString toUString(std::string_view string)
     {
-        return {string.data(), string.size()};
+        return { string.data(), string.size() };
     }
 }
 
diff --git a/apps/openmw/mwgui/videowidget.cpp b/apps/openmw/mwgui/videowidget.cpp
index a973db3a61..a82d8ce67f 100644
--- a/apps/openmw/mwgui/videowidget.cpp
+++ b/apps/openmw/mwgui/videowidget.cpp
@@ -7,113 +7,112 @@
 #include <osg/Texture2D>
 
 #include <components/debug/debuglog.hpp>
-#include <components/vfs/manager.hpp>
 #include <components/myguiplatform/myguitexture.hpp>
+#include <components/vfs/manager.hpp>
 
 #include "../mwsound/movieaudiofactory.hpp"
 
 namespace MWGui
 {
 
-VideoWidget::VideoWidget()
-    : mVFS(nullptr)
-{
-    mPlayer = std::make_unique<Video::VideoPlayer>();
-    setNeedKeyFocus(true);
-}
-
-VideoWidget::~VideoWidget() = default;
-
-void VideoWidget::setVFS(const VFS::Manager *vfs)
-{
-    mVFS = vfs;
-}
+    VideoWidget::VideoWidget()
+        : mVFS(nullptr)
+    {
+        mPlayer = std::make_unique<Video::VideoPlayer>();
+        setNeedKeyFocus(true);
+    }
 
-void VideoWidget::playVideo(const std::string &video)
-{
-    mPlayer->setAudioFactory(new MWSound::MovieAudioFactory());
+    VideoWidget::~VideoWidget() = default;
 
-    Files::IStreamPtr videoStream;
-    try
+    void VideoWidget::setVFS(const VFS::Manager* vfs)
     {
-        videoStream = mVFS->get(video);
+        mVFS = vfs;
     }
-    catch (std::exception& e)
+
+    void VideoWidget::playVideo(const std::string& video)
     {
-        Log(Debug::Error) << "Failed to open video: " << e.what();
-        return;
-    }
+        mPlayer->setAudioFactory(new MWSound::MovieAudioFactory());
 
-    mPlayer->playVideo(std::move(videoStream), video);
+        Files::IStreamPtr videoStream;
+        try
+        {
+            videoStream = mVFS->get(video);
+        }
+        catch (std::exception& e)
+        {
+            Log(Debug::Error) << "Failed to open video: " << e.what();
+            return;
+        }
 
-    osg::ref_ptr<osg::Texture2D> texture = mPlayer->getVideoTexture();
-    if (!texture)
-        return;
+        mPlayer->playVideo(std::move(videoStream), video);
 
-    mTexture = std::make_unique<osgMyGUI::OSGTexture>(texture);
+        osg::ref_ptr<osg::Texture2D> texture = mPlayer->getVideoTexture();
+        if (!texture)
+            return;
 
-    setRenderItemTexture(mTexture.get());
-    getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 1.f, 1.f, 0.f));
-}
+        mTexture = std::make_unique<osgMyGUI::OSGTexture>(texture);
 
-int VideoWidget::getVideoWidth()
-{
-    return mPlayer->getVideoWidth();
-}
+        setRenderItemTexture(mTexture.get());
+        getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 1.f, 1.f, 0.f));
+    }
 
-int VideoWidget::getVideoHeight()
-{
-    return mPlayer->getVideoHeight();
-}
+    int VideoWidget::getVideoWidth()
+    {
+        return mPlayer->getVideoWidth();
+    }
 
-bool VideoWidget::update()
-{
-    return mPlayer->update();
-}
+    int VideoWidget::getVideoHeight()
+    {
+        return mPlayer->getVideoHeight();
+    }
 
-void VideoWidget::stop()
-{
-    mPlayer->close();
-}
+    bool VideoWidget::update()
+    {
+        return mPlayer->update();
+    }
 
-void VideoWidget::pause()
-{
-    mPlayer->pause();
-}
+    void VideoWidget::stop()
+    {
+        mPlayer->close();
+    }
 
-void VideoWidget::resume()
-{
-    mPlayer->play();
-}
+    void VideoWidget::pause()
+    {
+        mPlayer->pause();
+    }
 
-bool VideoWidget::isPaused() const
-{
-    return mPlayer->isPaused();
-}
+    void VideoWidget::resume()
+    {
+        mPlayer->play();
+    }
 
-bool VideoWidget::hasAudioStream()
-{
-    return mPlayer->hasAudioStream();
-}
+    bool VideoWidget::isPaused() const
+    {
+        return mPlayer->isPaused();
+    }
 
-void VideoWidget::autoResize(bool stretch)
-{
-    MyGUI::IntSize screenSize = MyGUI::RenderManager::getInstance().getViewSize();
-    if (getParent())
-        screenSize = getParent()->getSize();
+    bool VideoWidget::hasAudioStream()
+    {
+        return mPlayer->hasAudioStream();
+    }
 
-    if (getVideoHeight() > 0 && !stretch)
+    void VideoWidget::autoResize(bool stretch)
     {
-        double imageaspect = static_cast<double>(getVideoWidth())/getVideoHeight();
+        MyGUI::IntSize screenSize = MyGUI::RenderManager::getInstance().getViewSize();
+        if (getParent())
+            screenSize = getParent()->getSize();
+
+        if (getVideoHeight() > 0 && !stretch)
+        {
+            double imageaspect = static_cast<double>(getVideoWidth()) / getVideoHeight();
 
-        int leftPadding = std::max(0, static_cast<int>(screenSize.width - screenSize.height * imageaspect) / 2);
-        int topPadding = std::max(0, static_cast<int>(screenSize.height - screenSize.width / imageaspect) / 2);
+            int leftPadding = std::max(0, static_cast<int>(screenSize.width - screenSize.height * imageaspect) / 2);
+            int topPadding = std::max(0, static_cast<int>(screenSize.height - screenSize.width / imageaspect) / 2);
 
-        setCoord(leftPadding, topPadding,
-                               screenSize.width - leftPadding*2, screenSize.height - topPadding*2);
+            setCoord(leftPadding, topPadding, screenSize.width - leftPadding * 2, screenSize.height - topPadding * 2);
+        }
+        else
+            setCoord(0, 0, screenSize.width, screenSize.height);
     }
-    else
-        setCoord(0,0,screenSize.width,screenSize.height);
-}
 
 }
diff --git a/apps/openmw/mwgui/videowidget.hpp b/apps/openmw/mwgui/videowidget.hpp
index 814b9ca73a..f6f70068e3 100644
--- a/apps/openmw/mwgui/videowidget.hpp
+++ b/apps/openmw/mwgui/videowidget.hpp
@@ -27,13 +27,13 @@ namespace MWGui
         MYGUI_RTTI_DERIVED(VideoWidget)
 
         VideoWidget();
-        
+
         ~VideoWidget();
 
         /// Set the VFS (virtual file system) to find the videos on.
         void setVFS(const VFS::Manager* vfs);
 
-        void playVideo (const std::string& video);
+        void playVideo(const std::string& video);
 
         int getVideoWidth();
         int getVideoHeight();
@@ -55,7 +55,7 @@ namespace MWGui
         /// based on the dimensions of the playing video.
         /// @param stretch Stretch the video to fill the whole screen? If false,
         ///                black bars may be added to fix the aspect ratio.
-        void autoResize (bool stretch);
+        void autoResize(bool stretch);
 
     private:
         const VFS::Manager* mVFS;
diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index c8abf87fcb..54a78d99bc 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/apps/openmw/mwgui/waitdialog.cpp
@@ -1,29 +1,29 @@
 #include "waitdialog.hpp"
 
-#include <MyGUI_ProgressBar.h>
 #include <MyGUI_InputManager.h>
+#include <MyGUI_ProgressBar.h>
 #include <MyGUI_ScrollBar.h>
 
 #include <components/misc/rng.hpp>
 
-#include <components/widgets/box.hpp>
-#include <components/settings/settings.hpp>
-#include <components/misc/strings/format.hpp>
 #include <components/esm3/loadregn.hpp>
+#include <components/misc/strings/format.hpp>
+#include <components/settings/settings.hpp>
+#include <components/widgets/box.hpp>
 
-#include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/statemanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 
+#include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
-#include "../mwmechanics/actorutil.hpp"
 
 namespace MWGui
 {
@@ -40,10 +40,10 @@ namespace MWGui
         center();
     }
 
-    void WaitDialogProgressBar::setProgress (int cur, int total)
+    void WaitDialogProgressBar::setProgress(int cur, int total)
     {
-        mProgressBar->setProgressRange (total);
-        mProgressBar->setProgressPosition (cur);
+        mProgressBar->setProgressRange(total);
+        mProgressBar->setProgressPosition(cur);
         mProgressText->setCaption(MyGUI::utility::toString(cur) + "/" + MyGUI::utility::toString(total));
     }
 
@@ -81,17 +81,17 @@ namespace MWGui
         mTimeAdvancer.eventFinished += MyGUI::newDelegate(this, &WaitDialog::onWaitingFinished);
     }
 
-    void WaitDialog::setPtr(const MWWorld::Ptr &ptr)
+    void WaitDialog::setPtr(const MWWorld::Ptr& ptr)
     {
-        setCanRest(!ptr.isEmpty() || MWBase::Environment::get().getWorld ()->canRest () == MWBase::World::Rest_Allowed);
+        setCanRest(!ptr.isEmpty() || MWBase::Environment::get().getWorld()->canRest() == MWBase::World::Rest_Allowed);
 
-        if (ptr.isEmpty() && MWBase::Environment::get().getWorld ()->canRest() == MWBase::World::Rest_PlayerIsInAir)
+        if (ptr.isEmpty() && MWBase::Environment::get().getWorld()->canRest() == MWBase::World::Rest_PlayerIsInAir)
         {
             // Resting in air is not allowed unless you're using a bed
-            MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage1}");
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage1}");
             MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Rest);
         }
-            
+
         if (mUntilHealedButton->getVisible())
             MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mUntilHealedButton);
         else
@@ -132,39 +132,43 @@ namespace MWGui
             mProgressBar.setVisible(false);
         }
 
-        if (!MWBase::Environment::get().getWindowManager ()->getRestEnabled ())
+        if (!MWBase::Environment::get().getWindowManager()->getRestEnabled())
         {
-            MWBase::Environment::get().getWindowManager()->popGuiMode ();
+            MWBase::Environment::get().getWindowManager()->popGuiMode();
         }
 
-        MWBase::World::RestPermitted canRest = MWBase::Environment::get().getWorld ()->canRest ();
+        MWBase::World::RestPermitted canRest = MWBase::Environment::get().getWorld()->canRest();
 
         if (canRest == MWBase::World::Rest_EnemiesAreNearby)
         {
             MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage2}");
-            MWBase::Environment::get().getWindowManager()->popGuiMode ();
+            MWBase::Environment::get().getWindowManager()->popGuiMode();
         }
         else if (canRest == MWBase::World::Rest_PlayerIsUnderwater)
         {
             // resting underwater not allowed
-            MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage1}");
-            MWBase::Environment::get().getWindowManager()->popGuiMode ();
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage1}");
+            MWBase::Environment::get().getWindowManager()->popGuiMode();
         }
 
         onHourSliderChangedPosition(mHourSlider, 0);
-        mHourSlider->setScrollPosition (0);
+        mHourSlider->setScrollPosition(0);
 
-        std::string_view month = MWBase::Environment::get().getWorld ()->getMonthName();
+        std::string_view month = MWBase::Environment::get().getWorld()->getMonthName();
         int hour = static_cast<int>(MWBase::Environment::get().getWorld()->getTimeStamp().getHour());
         bool pm = hour >= 12;
-        if (hour >= 13) hour -= 12;
-        if (hour == 0) hour = 12;
+        if (hour >= 13)
+            hour -= 12;
+        if (hour == 0)
+            hour = 12;
 
         ESM::EpochTimeStamp currentDate = MWBase::Environment::get().getWorld()->getEpochTimeStamp();
-        std::string daysPassed = Misc::StringUtils::format("(#{sDay} %i)", MWBase::Environment::get().getWorld()->getTimeStamp().getDay());
+        std::string daysPassed
+            = Misc::StringUtils::format("(#{sDay} %i)", MWBase::Environment::get().getWorld()->getTimeStamp().getDay());
         std::string_view formattedHour(pm ? "#{sSaveMenuHelp05}" : "#{sSaveMenuHelp04}");
-        std::string dateTimeText = Misc::StringUtils::format("%i %s %s %i %s", currentDate.mDay, month, daysPassed, hour, formattedHour);
-        mDateTimeText->setCaptionWithReplacing (dateTimeText);
+        std::string dateTimeText
+            = Misc::StringUtils::format("%i %s %s %i %s", currentDate.mDay, month, daysPassed, hour, formattedHour);
+        mDateTimeText->setCaptionWithReplacing(dateTimeText);
     }
 
     void WaitDialog::onUntilHealedButtonClicked(MyGUI::Widget* sender)
@@ -181,7 +185,7 @@ namespace MWGui
 
     void WaitDialog::startWaiting(int hoursToWait)
     {
-        if(Settings::Manager::getBool("autosave","Saves")) //autosaves when enabled
+        if (Settings::Manager::getBool("autosave", "Saves")) // autosaves when enabled
             MWBase::Environment::get().getStateManager()->quickSave("Autosave");
 
         MWBase::World* world = MWBase::Environment::get().getWorld();
@@ -199,15 +203,17 @@ namespace MWGui
             const std::string& regionstr = player.getCell()->getCell()->mRegion;
             if (!regionstr.empty())
             {
-                const ESM::Region *region = world->getStore().get<ESM::Region>().find (regionstr);
+                const ESM::Region* region = world->getStore().get<ESM::Region>().find(regionstr);
                 if (!region->mSleepList.empty())
                 {
                     // figure out if player will be woken while sleeping
                     int x = Misc::Rng::rollDice(hoursToWait, world->getPrng());
-                    float fSleepRandMod = world->getStore().get<ESM::GameSetting>().find("fSleepRandMod")->mValue.getFloat();
+                    float fSleepRandMod
+                        = world->getStore().get<ESM::GameSetting>().find("fSleepRandMod")->mValue.getFloat();
                     if (x < fSleepRandMod * hoursToWait)
                     {
-                        float fSleepRestMod = world->getStore().get<ESM::GameSetting>().find("fSleepRestMod")->mValue.getFloat();
+                        float fSleepRestMod
+                            = world->getStore().get<ESM::GameSetting>().find("fSleepRestMod")->mValue.getFloat();
                         int interruptAtHoursRemaining = int(fSleepRestMod * hoursToWait);
                         if (interruptAtHoursRemaining != 0)
                         {
@@ -219,7 +225,7 @@ namespace MWGui
             }
         }
 
-        mProgressBar.setProgress (0, hoursToWait);
+        mProgressBar.setProgress(0, hoursToWait);
     }
 
     void WaitDialog::onCancelButtonClicked(MyGUI::Widget* sender)
@@ -229,17 +235,18 @@ namespace MWGui
 
     void WaitDialog::onHourSliderChangedPosition(MyGUI::ScrollBar* sender, size_t position)
     {
-        mHourText->setCaptionWithReplacing (MyGUI::utility::toString(position+1) + " #{sRestMenu2}");
-        mManualHours = position+1;
+        mHourText->setCaptionWithReplacing(MyGUI::utility::toString(position + 1) + " #{sRestMenu2}");
+        mManualHours = position + 1;
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mWaitButton);
     }
 
-    void WaitDialog::onKeyButtonPressed(MyGUI::Widget *sender, MyGUI::KeyCode key, MyGUI::Char character)
+    void WaitDialog::onKeyButtonPressed(MyGUI::Widget* sender, MyGUI::KeyCode key, MyGUI::Char character)
     {
         if (key == MyGUI::KeyCode::ArrowUp)
-            mHourSlider->setScrollPosition(std::min(mHourSlider->getScrollPosition()+1, mHourSlider->getScrollRange()-1));
+            mHourSlider->setScrollPosition(
+                std::min(mHourSlider->getScrollPosition() + 1, mHourSlider->getScrollRange() - 1));
         else if (key == MyGUI::KeyCode::ArrowDown)
-            mHourSlider->setScrollPosition(std::max(static_cast<int>(mHourSlider->getScrollPosition())-1, 0));
+            mHourSlider->setScrollPosition(std::max(static_cast<int>(mHourSlider->getScrollPosition()) - 1, 0));
         else
             return;
         onHourSliderChangedPosition(mHourSlider, mHourSlider->getScrollPosition());
@@ -268,31 +275,30 @@ namespace MWGui
         stopWaiting();
 
         MWWorld::Ptr player = MWMechanics::getPlayer();
-        const MWMechanics::NpcStats &pcstats = player.getClass().getNpcStats(player);
+        const MWMechanics::NpcStats& pcstats = player.getClass().getNpcStats(player);
 
         // trigger levelup if possible
-        const MWWorld::Store<ESM::GameSetting> &gmst =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
-        if (mSleeping && pcstats.getLevelProgress () >= gmst.find("iLevelUpTotal")->mValue.getInteger())
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        if (mSleeping && pcstats.getLevelProgress() >= gmst.find("iLevelUpTotal")->mValue.getInteger())
         {
-            MWBase::Environment::get().getWindowManager()->pushGuiMode (GM_Levelup);
+            MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_Levelup);
         }
     }
 
-    void WaitDialog::setCanRest (bool canRest)
+    void WaitDialog::setCanRest(bool canRest)
     {
         MWWorld::Ptr player = MWMechanics::getPlayer();
         MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
         bool full = (stats.getHealth().getCurrent() >= stats.getHealth().getModified())
-                && (stats.getMagicka().getCurrent() >= stats.getMagicka().getModified());
+            && (stats.getMagicka().getCurrent() >= stats.getMagicka().getModified());
         MWMechanics::NpcStats& npcstats = player.getClass().getNpcStats(player);
         bool werewolf = npcstats.isWerewolf();
 
         mUntilHealedButton->setVisible(canRest && !full);
-        mWaitButton->setCaptionWithReplacing (canRest ? "#{sRest}" : "#{sWait}");
-        mRestText->setCaptionWithReplacing (canRest ? "#{sRestMenu3}"
-                                                    : (werewolf ? "#{sWerewolfRestMessage}"
-                                                                : "#{sRestIllegal}"));
+        mWaitButton->setCaptionWithReplacing(canRest ? "#{sRest}" : "#{sWait}");
+        mRestText->setCaptionWithReplacing(
+            canRest ? "#{sRestMenu3}" : (werewolf ? "#{sWerewolfRestMessage}" : "#{sRestIllegal}"));
 
         mSleeping = canRest;
 
@@ -319,16 +325,15 @@ namespace MWGui
         }
     }
 
-    void WaitDialog::stopWaiting ()
+    void WaitDialog::stopWaiting()
     {
         MWBase::Environment::get().getWindowManager()->fadeScreenIn(0.2f);
-        mProgressBar.setVisible (false);
-        MWBase::Environment::get().getWindowManager()->removeGuiMode (GM_Rest);
+        mProgressBar.setVisible(false);
+        MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Rest);
         mTimeAdvancer.stop();
     }
 
-
-    void WaitDialog::wakeUp ()
+    void WaitDialog::wakeUp()
     {
         mSleeping = false;
         if (mInterruptAt != -1)
diff --git a/apps/openmw/mwgui/waitdialog.hpp b/apps/openmw/mwgui/waitdialog.hpp
index bf84e7e819..cff0d66bf8 100644
--- a/apps/openmw/mwgui/waitdialog.hpp
+++ b/apps/openmw/mwgui/waitdialog.hpp
@@ -27,7 +27,7 @@ namespace MWGui
     public:
         WaitDialog();
 
-        void setPtr(const MWWorld::Ptr &ptr) override;
+        void setPtr(const MWWorld::Ptr& ptr) override;
 
         void onOpen() override;
 
diff --git a/apps/openmw/mwgui/widgets.cpp b/apps/openmw/mwgui/widgets.cpp
index aa88d58c4f..a6a5299289 100644
--- a/apps/openmw/mwgui/widgets.cpp
+++ b/apps/openmw/mwgui/widgets.cpp
@@ -3,19 +3,19 @@
 #include <iomanip>
 
 #include <MyGUI_Button.h>
-#include <MyGUI_ProgressBar.h>
-#include <MyGUI_ImageBox.h>
 #include <MyGUI_ControllerManager.h>
+#include <MyGUI_ImageBox.h>
+#include <MyGUI_ProgressBar.h>
 
-#include <components/resource/resourcesystem.hpp>
-#include <components/misc/resourcehelpers.hpp>
-#include <components/esm3/loadspel.hpp>
-#include <components/esm3/loadmgef.hpp>
 #include <components/esm/attr.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadspel.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/esmstore.hpp"
 
@@ -23,541 +23,535 @@
 #include "ustring.hpp"
 
 namespace MWGui::Widgets
-    {
-        /* MWSkill */
+{
+    /* MWSkill */
 
-        MWSkill::MWSkill()
-            : mSkillId(ESM::Skill::Length)
-            , mSkillNameWidget(nullptr)
-            , mSkillValueWidget(nullptr)
-        {
-        }
+    MWSkill::MWSkill()
+        : mSkillId(ESM::Skill::Length)
+        , mSkillNameWidget(nullptr)
+        , mSkillValueWidget(nullptr)
+    {
+    }
 
-        void MWSkill::setSkillId(ESM::Skill::SkillEnum skill)
-        {
-            mSkillId = skill;
-            updateWidgets();
-        }
+    void MWSkill::setSkillId(ESM::Skill::SkillEnum skill)
+    {
+        mSkillId = skill;
+        updateWidgets();
+    }
 
-        void MWSkill::setSkillNumber(int skill)
-        {
-            if (skill < 0)
-                setSkillId(ESM::Skill::Length);
-            else if (skill < ESM::Skill::Length)
-                setSkillId(static_cast<ESM::Skill::SkillEnum>(skill));
-            else
-                throw std::runtime_error("Skill number out of range");
-        }
+    void MWSkill::setSkillNumber(int skill)
+    {
+        if (skill < 0)
+            setSkillId(ESM::Skill::Length);
+        else if (skill < ESM::Skill::Length)
+            setSkillId(static_cast<ESM::Skill::SkillEnum>(skill));
+        else
+            throw std::runtime_error("Skill number out of range");
+    }
 
-        void MWSkill::setSkillValue(const SkillValue& value)
-        {
-            mValue = value;
-            updateWidgets();
-        }
+    void MWSkill::setSkillValue(const SkillValue& value)
+    {
+        mValue = value;
+        updateWidgets();
+    }
 
-        void MWSkill::updateWidgets()
+    void MWSkill::updateWidgets()
+    {
+        if (mSkillNameWidget)
         {
-            if (mSkillNameWidget)
+            if (mSkillId == ESM::Skill::Length)
             {
-                if (mSkillId == ESM::Skill::Length)
-                {
-                    mSkillNameWidget->setCaption("");
-                }
-                else
-                {
-                    MyGUI::UString name = toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString(ESM::Skill::sSkillNameIds[mSkillId], {}));
-                    mSkillNameWidget->setCaption(name);
-                }
+                mSkillNameWidget->setCaption("");
             }
-            if (mSkillValueWidget)
+            else
             {
-                SkillValue::Type modified = mValue.getModified(), base = mValue.getBase();
-                mSkillValueWidget->setCaption(MyGUI::utility::toString(modified));
-                if (modified > base)
-                    mSkillValueWidget->_setWidgetState("increased");
-                else if (modified < base)
-                    mSkillValueWidget->_setWidgetState("decreased");
-                else
-                    mSkillValueWidget->_setWidgetState("normal");
+                MyGUI::UString name = toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString(
+                    ESM::Skill::sSkillNameIds[mSkillId], {}));
+                mSkillNameWidget->setCaption(name);
             }
         }
-
-        void MWSkill::onClicked(MyGUI::Widget* _sender)
-        {
-            eventClicked(this);
-        }
-
-        MWSkill::~MWSkill()
+        if (mSkillValueWidget)
         {
+            SkillValue::Type modified = mValue.getModified(), base = mValue.getBase();
+            mSkillValueWidget->setCaption(MyGUI::utility::toString(modified));
+            if (modified > base)
+                mSkillValueWidget->_setWidgetState("increased");
+            else if (modified < base)
+                mSkillValueWidget->_setWidgetState("decreased");
+            else
+                mSkillValueWidget->_setWidgetState("normal");
         }
+    }
 
-        void MWSkill::initialiseOverride()
-        {
-            Base::initialiseOverride();
+    void MWSkill::onClicked(MyGUI::Widget* _sender)
+    {
+        eventClicked(this);
+    }
 
-            assignWidget(mSkillNameWidget, "StatName");
-            assignWidget(mSkillValueWidget, "StatValue");
+    MWSkill::~MWSkill() {}
 
-            MyGUI::Button* button;
-            assignWidget(button, "StatNameButton");
-            if (button)
-            {
-                mSkillNameWidget = button;
-                button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWSkill::onClicked);
-            }
-
-            button = nullptr;
-            assignWidget(button, "StatValueButton");
-            if (button)
-            {
-                mSkillValueWidget = button;
-                button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWSkill::onClicked);
-            }
-        }
+    void MWSkill::initialiseOverride()
+    {
+        Base::initialiseOverride();
 
-        /* MWAttribute */
+        assignWidget(mSkillNameWidget, "StatName");
+        assignWidget(mSkillValueWidget, "StatValue");
 
-        MWAttribute::MWAttribute()
-            : mId(-1)
-            , mAttributeNameWidget(nullptr)
-            , mAttributeValueWidget(nullptr)
+        MyGUI::Button* button;
+        assignWidget(button, "StatNameButton");
+        if (button)
         {
+            mSkillNameWidget = button;
+            button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWSkill::onClicked);
         }
 
-        void MWAttribute::setAttributeId(int attributeId)
+        button = nullptr;
+        assignWidget(button, "StatValueButton");
+        if (button)
         {
-            mId = attributeId;
-            updateWidgets();
+            mSkillValueWidget = button;
+            button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWSkill::onClicked);
         }
+    }
 
-        void MWAttribute::setAttributeValue(const AttributeValue& value)
-        {
-            mValue = value;
-            updateWidgets();
-        }
+    /* MWAttribute */
 
-        void MWAttribute::onClicked(MyGUI::Widget* _sender)
-        {
-            eventClicked(this);
-        }
+    MWAttribute::MWAttribute()
+        : mId(-1)
+        , mAttributeNameWidget(nullptr)
+        , mAttributeValueWidget(nullptr)
+    {
+    }
+
+    void MWAttribute::setAttributeId(int attributeId)
+    {
+        mId = attributeId;
+        updateWidgets();
+    }
 
-        void MWAttribute::updateWidgets()
+    void MWAttribute::setAttributeValue(const AttributeValue& value)
+    {
+        mValue = value;
+        updateWidgets();
+    }
+
+    void MWAttribute::onClicked(MyGUI::Widget* _sender)
+    {
+        eventClicked(this);
+    }
+
+    void MWAttribute::updateWidgets()
+    {
+        if (mAttributeNameWidget)
         {
-            if (mAttributeNameWidget)
+            if (mId < 0 || mId >= 8)
             {
-                if (mId < 0 || mId >= 8)
-                {
-                    mAttributeNameWidget->setCaption("");
-                }
-                else
-                {
-                    static const std::string_view attributes[8] = {
-                        "sAttributeStrength",
-                        "sAttributeIntelligence",
-                        "sAttributeWillpower",
-                        "sAttributeAgility",
-                        "sAttributeSpeed",
-                        "sAttributeEndurance",
-                        "sAttributePersonality",
-                        "sAttributeLuck"
-                    };
-                    MyGUI::UString name = toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString(attributes[mId], {}));
-                    mAttributeNameWidget->setCaption(name);
-                }
+                mAttributeNameWidget->setCaption("");
             }
-            if (mAttributeValueWidget)
+            else
             {
-                int modified = mValue.getModified(), base = mValue.getBase();
-                mAttributeValueWidget->setCaption(MyGUI::utility::toString(modified));
-                if (modified > base)
-                    mAttributeValueWidget->_setWidgetState("increased");
-                else if (modified < base)
-                    mAttributeValueWidget->_setWidgetState("decreased");
-                else
-                    mAttributeValueWidget->_setWidgetState("normal");
+                static const std::string_view attributes[8]
+                    = { "sAttributeStrength", "sAttributeIntelligence", "sAttributeWillpower", "sAttributeAgility",
+                          "sAttributeSpeed", "sAttributeEndurance", "sAttributePersonality", "sAttributeLuck" };
+                MyGUI::UString name = toUString(
+                    MWBase::Environment::get().getWindowManager()->getGameSettingString(attributes[mId], {}));
+                mAttributeNameWidget->setCaption(name);
             }
         }
-
-        MWAttribute::~MWAttribute()
+        if (mAttributeValueWidget)
         {
+            int modified = mValue.getModified(), base = mValue.getBase();
+            mAttributeValueWidget->setCaption(MyGUI::utility::toString(modified));
+            if (modified > base)
+                mAttributeValueWidget->_setWidgetState("increased");
+            else if (modified < base)
+                mAttributeValueWidget->_setWidgetState("decreased");
+            else
+                mAttributeValueWidget->_setWidgetState("normal");
         }
+    }
 
-        void MWAttribute::initialiseOverride()
-        {
-            Base::initialiseOverride();
-
-            assignWidget(mAttributeNameWidget, "StatName");
-            assignWidget(mAttributeValueWidget, "StatValue");
-
-            MyGUI::Button* button;
-            assignWidget(button, "StatNameButton");
-            if (button)
-            {
-                mAttributeNameWidget = button;
-                button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWAttribute::onClicked);
-            }
+    MWAttribute::~MWAttribute() {}
 
-            button = nullptr;
-            assignWidget(button, "StatValueButton");
-            if (button)
-            {
-                mAttributeValueWidget = button;
-                button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWAttribute::onClicked);
-            }
-        }
+    void MWAttribute::initialiseOverride()
+    {
+        Base::initialiseOverride();
 
-        /* MWSpell */
+        assignWidget(mAttributeNameWidget, "StatName");
+        assignWidget(mAttributeValueWidget, "StatValue");
 
-        MWSpell::MWSpell()
-            : mSpellNameWidget(nullptr)
+        MyGUI::Button* button;
+        assignWidget(button, "StatNameButton");
+        if (button)
         {
+            mAttributeNameWidget = button;
+            button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWAttribute::onClicked);
         }
 
-        void MWSpell::setSpellId(const std::string &spellId)
+        button = nullptr;
+        assignWidget(button, "StatValueButton");
+        if (button)
         {
-            mId = spellId;
-            updateWidgets();
+            mAttributeValueWidget = button;
+            button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWAttribute::onClicked);
         }
+    }
 
-        void MWSpell::createEffectWidgets(std::vector<MyGUI::Widget*> &effects, MyGUI::Widget* creator, MyGUI::IntCoord &coord, int flags)
-        {
-            const MWWorld::ESMStore &store =
-                MWBase::Environment::get().getWorld()->getStore();
+    /* MWSpell */
 
-            const ESM::Spell *spell = store.get<ESM::Spell>().search(mId);
-            MYGUI_ASSERT(spell, "spell with id '" << mId << "' not found");
+    MWSpell::MWSpell()
+        : mSpellNameWidget(nullptr)
+    {
+    }
 
-            for (const ESM::ENAMstruct& effectInfo : spell->mEffects.mList)
-            {
-                MWSpellEffectPtr effect = creator->createWidget<MWSpellEffect>("MW_EffectImage", coord, MyGUI::Align::Default);
-                SpellEffectParams params;
-                params.mEffectID = effectInfo.mEffectID;
-                params.mSkill = effectInfo.mSkill;
-                params.mAttribute = effectInfo.mAttribute;
-                params.mDuration = effectInfo.mDuration;
-                params.mMagnMin = effectInfo.mMagnMin;
-                params.mMagnMax = effectInfo.mMagnMax;
-                params.mRange = effectInfo.mRange;
-                params.mIsConstant = (flags & MWEffectList::EF_Constant) != 0;
-                params.mNoTarget = (flags & MWEffectList::EF_NoTarget);
-                params.mNoMagnitude = (flags & MWEffectList::EF_NoMagnitude);
-                effect->setSpellEffect(params);
-                effects.push_back(effect);
-                coord.top += effect->getHeight();
-                coord.width = std::max(coord.width, effect->getRequestedWidth());
-            }
-        }
+    void MWSpell::setSpellId(const std::string& spellId)
+    {
+        mId = spellId;
+        updateWidgets();
+    }
 
-        void MWSpell::updateWidgets()
-        {
-            if (mSpellNameWidget && MWBase::Environment::get().getWindowManager())
-            {
-                const MWWorld::ESMStore &store =
-                    MWBase::Environment::get().getWorld()->getStore();
-
-                const ESM::Spell *spell = store.get<ESM::Spell>().search(mId);
-                if (spell)
-                    mSpellNameWidget->setCaption(spell->mName);
-                else
-                    mSpellNameWidget->setCaption("");
-            }
+    void MWSpell::createEffectWidgets(
+        std::vector<MyGUI::Widget*>& effects, MyGUI::Widget* creator, MyGUI::IntCoord& coord, int flags)
+    {
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+
+        const ESM::Spell* spell = store.get<ESM::Spell>().search(mId);
+        MYGUI_ASSERT(spell, "spell with id '" << mId << "' not found");
+
+        for (const ESM::ENAMstruct& effectInfo : spell->mEffects.mList)
+        {
+            MWSpellEffectPtr effect
+                = creator->createWidget<MWSpellEffect>("MW_EffectImage", coord, MyGUI::Align::Default);
+            SpellEffectParams params;
+            params.mEffectID = effectInfo.mEffectID;
+            params.mSkill = effectInfo.mSkill;
+            params.mAttribute = effectInfo.mAttribute;
+            params.mDuration = effectInfo.mDuration;
+            params.mMagnMin = effectInfo.mMagnMin;
+            params.mMagnMax = effectInfo.mMagnMax;
+            params.mRange = effectInfo.mRange;
+            params.mIsConstant = (flags & MWEffectList::EF_Constant) != 0;
+            params.mNoTarget = (flags & MWEffectList::EF_NoTarget);
+            params.mNoMagnitude = (flags & MWEffectList::EF_NoMagnitude);
+            effect->setSpellEffect(params);
+            effects.push_back(effect);
+            coord.top += effect->getHeight();
+            coord.width = std::max(coord.width, effect->getRequestedWidth());
         }
+    }
 
-        void MWSpell::initialiseOverride()
+    void MWSpell::updateWidgets()
+    {
+        if (mSpellNameWidget && MWBase::Environment::get().getWindowManager())
         {
-            Base::initialiseOverride();
+            const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
 
-            assignWidget(mSpellNameWidget, "StatName");
+            const ESM::Spell* spell = store.get<ESM::Spell>().search(mId);
+            if (spell)
+                mSpellNameWidget->setCaption(spell->mName);
+            else
+                mSpellNameWidget->setCaption("");
         }
+    }
 
-        MWSpell::~MWSpell()
-        {
-        }
+    void MWSpell::initialiseOverride()
+    {
+        Base::initialiseOverride();
+
+        assignWidget(mSpellNameWidget, "StatName");
+    }
 
-        /* MWEffectList */
+    MWSpell::~MWSpell() {}
 
-        MWEffectList::MWEffectList()
-            : mEffectList(0)
-        {
-        }
+    /* MWEffectList */
+
+    MWEffectList::MWEffectList()
+        : mEffectList(0)
+    {
+    }
+
+    void MWEffectList::setEffectList(const SpellEffectList& list)
+    {
+        mEffectList = list;
+        updateWidgets();
+    }
+
+    void MWEffectList::createEffectWidgets(
+        std::vector<MyGUI::Widget*>& effects, MyGUI::Widget* creator, MyGUI::IntCoord& coord, bool center, int flags)
+    {
+        // We don't know the width of all the elements beforehand, so we do it in
+        // 2 steps: first, create all widgets and check their width....
+        MWSpellEffectPtr effect = nullptr;
+        int maxwidth = coord.width;
 
-        void MWEffectList::setEffectList(const SpellEffectList& list)
+        for (auto& effectInfo : mEffectList)
         {
-            mEffectList = list;
-            updateWidgets();
+            effect = creator->createWidget<MWSpellEffect>("MW_EffectImage", coord, MyGUI::Align::Default);
+            effectInfo.mIsConstant = (flags & EF_Constant) || effectInfo.mIsConstant;
+            effectInfo.mNoTarget = (flags & EF_NoTarget) || effectInfo.mNoTarget;
+            effectInfo.mNoMagnitude = (flags & EF_NoMagnitude) || effectInfo.mNoMagnitude;
+            effect->setSpellEffect(effectInfo);
+            effects.push_back(effect);
+            if (effect->getRequestedWidth() > maxwidth)
+                maxwidth = effect->getRequestedWidth();
+
+            coord.top += effect->getHeight();
         }
 
-        void MWEffectList::createEffectWidgets(std::vector<MyGUI::Widget*> &effects, MyGUI::Widget* creator, MyGUI::IntCoord &coord, bool center, int flags)
+        // ... then adjust the size for all widgets
+        for (MyGUI::Widget* effectWidget : effects)
         {
-            // We don't know the width of all the elements beforehand, so we do it in
-            // 2 steps: first, create all widgets and check their width....
-            MWSpellEffectPtr effect = nullptr;
-            int maxwidth = coord.width;
-
-            for (auto& effectInfo : mEffectList)
+            effect = effectWidget->castType<MWSpellEffect>();
+            bool needcenter = center && (maxwidth > effect->getRequestedWidth());
+            int diff = maxwidth - effect->getRequestedWidth();
+            if (needcenter)
             {
-                effect = creator->createWidget<MWSpellEffect>("MW_EffectImage", coord, MyGUI::Align::Default);
-                effectInfo.mIsConstant = (flags & EF_Constant) || effectInfo.mIsConstant;
-                effectInfo.mNoTarget = (flags & EF_NoTarget) || effectInfo.mNoTarget;
-                effectInfo.mNoMagnitude = (flags & EF_NoMagnitude) || effectInfo.mNoMagnitude;
-                effect->setSpellEffect(effectInfo);
-                effects.push_back(effect);
-                if (effect->getRequestedWidth() > maxwidth)
-                    maxwidth = effect->getRequestedWidth();
-
-                coord.top += effect->getHeight();
+                effect->setCoord(
+                    diff / 2, effect->getCoord().top, effect->getRequestedWidth(), effect->getCoord().height);
             }
-
-            // ... then adjust the size for all widgets
-            for (MyGUI::Widget* effectWidget : effects)
+            else
             {
-                effect = effectWidget->castType<MWSpellEffect>();
-                bool needcenter = center && (maxwidth > effect->getRequestedWidth());
-                int diff = maxwidth - effect->getRequestedWidth();
-                if (needcenter)
-                {
-                    effect->setCoord(diff/2, effect->getCoord().top, effect->getRequestedWidth(), effect->getCoord().height);
-                }
-                else
-                {
-                    effect->setCoord(0, effect->getCoord().top, effect->getRequestedWidth(), effect->getCoord().height);
-                }
+                effect->setCoord(0, effect->getCoord().top, effect->getRequestedWidth(), effect->getCoord().height);
             }
-
-            // inform the parent about width
-            coord.width = maxwidth;
         }
 
-        void MWEffectList::updateWidgets()
-        {
-        }
+        // inform the parent about width
+        coord.width = maxwidth;
+    }
 
-        void MWEffectList::initialiseOverride()
-        {
-            Base::initialiseOverride();
-        }
+    void MWEffectList::updateWidgets() {}
 
-        MWEffectList::~MWEffectList()
-        {
-        }
+    void MWEffectList::initialiseOverride()
+    {
+        Base::initialiseOverride();
+    }
 
-        SpellEffectList MWEffectList::effectListFromESM(const ESM::EffectList* effects)
-        {
-            SpellEffectList result;
-            for (const ESM::ENAMstruct& effectInfo : effects->mList)
-            {
-                SpellEffectParams params;
-                params.mEffectID = effectInfo.mEffectID;
-                params.mSkill = effectInfo.mSkill;
-                params.mAttribute = effectInfo.mAttribute;
-                params.mDuration = effectInfo.mDuration;
-                params.mMagnMin = effectInfo.mMagnMin;
-                params.mMagnMax = effectInfo.mMagnMax;
-                params.mRange = effectInfo.mRange;
-                params.mArea = effectInfo.mArea;
-                result.push_back(params);
-            }
-            return result;
-        }
+    MWEffectList::~MWEffectList() {}
+
+    SpellEffectList MWEffectList::effectListFromESM(const ESM::EffectList* effects)
+    {
+        SpellEffectList result;
+        for (const ESM::ENAMstruct& effectInfo : effects->mList)
+        {
+            SpellEffectParams params;
+            params.mEffectID = effectInfo.mEffectID;
+            params.mSkill = effectInfo.mSkill;
+            params.mAttribute = effectInfo.mAttribute;
+            params.mDuration = effectInfo.mDuration;
+            params.mMagnMin = effectInfo.mMagnMin;
+            params.mMagnMax = effectInfo.mMagnMax;
+            params.mRange = effectInfo.mRange;
+            params.mArea = effectInfo.mArea;
+            result.push_back(params);
+        }
+        return result;
+    }
 
-        /* MWSpellEffect */
+    /* MWSpellEffect */
 
-        MWSpellEffect::MWSpellEffect()
-            : mImageWidget(nullptr)
-            , mTextWidget(nullptr)
-            , mRequestedWidth(0)
-        {
-        }
+    MWSpellEffect::MWSpellEffect()
+        : mImageWidget(nullptr)
+        , mTextWidget(nullptr)
+        , mRequestedWidth(0)
+    {
+    }
 
-        void MWSpellEffect::setSpellEffect(const SpellEffectParams& params)
+    void MWSpellEffect::setSpellEffect(const SpellEffectParams& params)
+    {
+        mEffectParams = params;
+        updateWidgets();
+    }
+
+    void MWSpellEffect::updateWidgets()
+    {
+        if (!mEffectParams.mKnown)
         {
-            mEffectParams = params;
-            updateWidgets();
+            mTextWidget->setCaption("?");
+            mTextWidget->setCoord(sIconOffset / 2, mTextWidget->getCoord().top, mTextWidget->getCoord().width,
+                mTextWidget->getCoord().height); // Compensates for the missing image when effect is not known
+            mRequestedWidth = mTextWidget->getTextSize().width + sIconOffset;
+            mImageWidget->setImageTexture("");
+            return;
         }
 
-        void MWSpellEffect::updateWidgets()
-        {
-            if (!mEffectParams.mKnown)
-            {
-                mTextWidget->setCaption ("?");
-                mTextWidget->setCoord(sIconOffset / 2, mTextWidget->getCoord().top, mTextWidget->getCoord().width, mTextWidget->getCoord().height); // Compensates for the missing image when effect is not known
-                mRequestedWidth = mTextWidget->getTextSize().width + sIconOffset;
-                mImageWidget->setImageTexture ("");
-                return;
-            }
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
 
-            const MWWorld::ESMStore &store =
-                MWBase::Environment::get().getWorld()->getStore();
+        const ESM::MagicEffect* magicEffect = store.get<ESM::MagicEffect>().search(mEffectParams.mEffectID);
 
-            const ESM::MagicEffect *magicEffect =
-                store.get<ESM::MagicEffect>().search(mEffectParams.mEffectID);
+        assert(magicEffect);
 
-            assert(magicEffect);
+        std::string_view pt = MWBase::Environment::get().getWindowManager()->getGameSettingString("spoint", {});
+        std::string_view pts = MWBase::Environment::get().getWindowManager()->getGameSettingString("spoints", {});
+        std::string_view pct = MWBase::Environment::get().getWindowManager()->getGameSettingString("spercent", {});
+        std::string_view ft = MWBase::Environment::get().getWindowManager()->getGameSettingString("sfeet", {});
+        std::string_view lvl = MWBase::Environment::get().getWindowManager()->getGameSettingString("sLevel", {});
+        std::string_view lvls = MWBase::Environment::get().getWindowManager()->getGameSettingString("sLevels", {});
+        std::string to
+            = " " + std::string{ MWBase::Environment::get().getWindowManager()->getGameSettingString("sTo", {}) } + " ";
+        std::string sec
+            = " " + std::string{ MWBase::Environment::get().getWindowManager()->getGameSettingString("ssecond", {}) };
+        std::string secs
+            = " " + std::string{ MWBase::Environment::get().getWindowManager()->getGameSettingString("sseconds", {}) };
 
-            std::string_view pt = MWBase::Environment::get().getWindowManager()->getGameSettingString("spoint", {});
-            std::string_view pts = MWBase::Environment::get().getWindowManager()->getGameSettingString("spoints", {});
-            std::string_view pct = MWBase::Environment::get().getWindowManager()->getGameSettingString("spercent", {});
-            std::string_view ft = MWBase::Environment::get().getWindowManager()->getGameSettingString("sfeet", {});
-            std::string_view lvl = MWBase::Environment::get().getWindowManager()->getGameSettingString("sLevel", {});
-            std::string_view lvls = MWBase::Environment::get().getWindowManager()->getGameSettingString("sLevels", {});
-            std::string to =  " " + std::string{MWBase::Environment::get().getWindowManager()->getGameSettingString("sTo", {})} + " ";
-            std::string sec =  " " + std::string{MWBase::Environment::get().getWindowManager()->getGameSettingString("ssecond", {})};
-            std::string secs =  " " + std::string{MWBase::Environment::get().getWindowManager()->getGameSettingString("sseconds", {})};
+        const std::string& effectIDStr = ESM::MagicEffect::effectIdToString(mEffectParams.mEffectID);
+        std::string spellLine{ MWBase::Environment::get().getWindowManager()->getGameSettingString(effectIDStr, {}) };
 
-            const std::string& effectIDStr = ESM::MagicEffect::effectIdToString(mEffectParams.mEffectID);
-            std::string spellLine{MWBase::Environment::get().getWindowManager()->getGameSettingString(effectIDStr, {})};
+        if (magicEffect->mData.mFlags & ESM::MagicEffect::TargetSkill && mEffectParams.mSkill != -1)
+        {
+            spellLine += ' ';
+            spellLine += MWBase::Environment::get().getWindowManager()->getGameSettingString(
+                ESM::Skill::sSkillNameIds[mEffectParams.mSkill], {});
+        }
+        if (magicEffect->mData.mFlags & ESM::MagicEffect::TargetAttribute && mEffectParams.mAttribute != -1)
+        {
+            spellLine += ' ';
+            spellLine += MWBase::Environment::get().getWindowManager()->getGameSettingString(
+                ESM::Attribute::sGmstAttributeIds[mEffectParams.mAttribute], {});
+        }
 
-            if (magicEffect->mData.mFlags & ESM::MagicEffect::TargetSkill && mEffectParams.mSkill != -1)
-            {
-                spellLine += ' ';
-                spellLine += MWBase::Environment::get().getWindowManager()->getGameSettingString(ESM::Skill::sSkillNameIds[mEffectParams.mSkill], {});
-            }
-            if (magicEffect->mData.mFlags & ESM::MagicEffect::TargetAttribute && mEffectParams.mAttribute != -1)
+        if (mEffectParams.mMagnMin || mEffectParams.mMagnMax)
+        {
+            ESM::MagicEffect::MagnitudeDisplayType displayType = magicEffect->getMagnitudeDisplayType();
+            if (displayType == ESM::MagicEffect::MDT_TimesInt)
             {
-                spellLine += ' ';
-                spellLine += MWBase::Environment::get().getWindowManager()->getGameSettingString(ESM::Attribute::sGmstAttributeIds[mEffectParams.mAttribute], {});
-            }
+                std::string_view timesInt
+                    = MWBase::Environment::get().getWindowManager()->getGameSettingString("sXTimesINT", {});
+                std::stringstream formatter;
 
-            if (mEffectParams.mMagnMin || mEffectParams.mMagnMax) {
-                ESM::MagicEffect::MagnitudeDisplayType displayType = magicEffect->getMagnitudeDisplayType();
-                if ( displayType == ESM::MagicEffect::MDT_TimesInt ) {
-                    std::string_view timesInt =  MWBase::Environment::get().getWindowManager()->getGameSettingString("sXTimesINT", {});
-                    std::stringstream formatter;
+                formatter << std::fixed << std::setprecision(1) << " " << (mEffectParams.mMagnMin / 10.0f);
+                if (mEffectParams.mMagnMin != mEffectParams.mMagnMax)
+                    formatter << to << (mEffectParams.mMagnMax / 10.0f);
+                formatter << timesInt;
 
-                    formatter << std::fixed << std::setprecision(1) << " " << (mEffectParams.mMagnMin / 10.0f);
-                    if (mEffectParams.mMagnMin != mEffectParams.mMagnMax)
-                        formatter << to << (mEffectParams.mMagnMax / 10.0f);
-                    formatter << timesInt;
-
-                    spellLine += formatter.str();
-                }
-                else if ( displayType != ESM::MagicEffect::MDT_None  && !mEffectParams.mNoMagnitude) {
-                    spellLine += " " + MyGUI::utility::toString(mEffectParams.mMagnMin);
-                    if (mEffectParams.mMagnMin != mEffectParams.mMagnMax)
-                        spellLine += to + MyGUI::utility::toString(mEffectParams.mMagnMax);
-
-                    if ( displayType == ESM::MagicEffect::MDT_Percentage )
-                        spellLine += pct;
-                    else if ( displayType == ESM::MagicEffect::MDT_Feet )
-                    {
-                        spellLine += ' ';
-                        spellLine += ft;
-                    }
-                    else if ( displayType == ESM::MagicEffect::MDT_Level )
-                    {
-                        spellLine += ' ';
-                        if (mEffectParams.mMagnMin == mEffectParams.mMagnMax && std::abs(mEffectParams.mMagnMin) == 1)
-                            spellLine += lvl;
-                        else
-                            spellLine += lvls;
-                    }
-                    else  // ESM::MagicEffect::MDT_Points
-                    {
-                        spellLine += ' ';
-                        if (mEffectParams.mMagnMin == mEffectParams.mMagnMax && std::abs(mEffectParams.mMagnMin) == 1)
-                            spellLine += pt;
-                        else
-                            spellLine += pts;
-                    }
-                }
+                spellLine += formatter.str();
             }
-
-            // constant effects have no duration and no target
-            if (!mEffectParams.mIsConstant)
+            else if (displayType != ESM::MagicEffect::MDT_None && !mEffectParams.mNoMagnitude)
             {
-                if (!(magicEffect->mData.mFlags & ESM::MagicEffect::AppliedOnce))
-                    mEffectParams.mDuration = std::max(1, mEffectParams.mDuration);
+                spellLine += " " + MyGUI::utility::toString(mEffectParams.mMagnMin);
+                if (mEffectParams.mMagnMin != mEffectParams.mMagnMax)
+                    spellLine += to + MyGUI::utility::toString(mEffectParams.mMagnMax);
 
-                if (mEffectParams.mDuration > 0 && !(magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration))
+                if (displayType == ESM::MagicEffect::MDT_Percentage)
+                    spellLine += pct;
+                else if (displayType == ESM::MagicEffect::MDT_Feet)
                 {
                     spellLine += ' ';
-                    spellLine += MWBase::Environment::get().getWindowManager()->getGameSettingString("sfor", {});
-                    spellLine += ' ' + MyGUI::utility::toString(mEffectParams.mDuration) + ((mEffectParams.mDuration == 1) ? sec : secs);
+                    spellLine += ft;
                 }
-
-                if (mEffectParams.mArea > 0)
+                else if (displayType == ESM::MagicEffect::MDT_Level)
                 {
-                    spellLine += " #{sin} " + MyGUI::utility::toString(mEffectParams.mArea) + " #{sfootarea}";
+                    spellLine += ' ';
+                    if (mEffectParams.mMagnMin == mEffectParams.mMagnMax && std::abs(mEffectParams.mMagnMin) == 1)
+                        spellLine += lvl;
+                    else
+                        spellLine += lvls;
                 }
-
-                // potions have no target
-                if (!mEffectParams.mNoTarget)
+                else // ESM::MagicEffect::MDT_Points
                 {
                     spellLine += ' ';
-                    spellLine += MWBase::Environment::get().getWindowManager()->getGameSettingString("sonword", {});
-                    spellLine += ' ';
-                    if (mEffectParams.mRange == ESM::RT_Self)
-                        spellLine += MWBase::Environment::get().getWindowManager()->getGameSettingString("sRangeSelf", {});
-                    else if (mEffectParams.mRange == ESM::RT_Touch)
-                        spellLine += MWBase::Environment::get().getWindowManager()->getGameSettingString("sRangeTouch", {});
-                    else if (mEffectParams.mRange == ESM::RT_Target)
-                        spellLine += MWBase::Environment::get().getWindowManager()->getGameSettingString("sRangeTarget", {});
+                    if (mEffectParams.mMagnMin == mEffectParams.mMagnMax && std::abs(mEffectParams.mMagnMin) == 1)
+                        spellLine += pt;
+                    else
+                        spellLine += pts;
                 }
             }
-
-            mTextWidget->setCaptionWithReplacing(spellLine);
-            mRequestedWidth = mTextWidget->getTextSize().width + sIconOffset;
-
-            mImageWidget->setImageTexture(Misc::ResourceHelpers::correctIconPath(magicEffect->mIcon, MWBase::Environment::get().getResourceSystem()->getVFS()));
         }
 
-        MWSpellEffect::~MWSpellEffect()
+        // constant effects have no duration and no target
+        if (!mEffectParams.mIsConstant)
         {
-        }
+            if (!(magicEffect->mData.mFlags & ESM::MagicEffect::AppliedOnce))
+                mEffectParams.mDuration = std::max(1, mEffectParams.mDuration);
 
-        void MWSpellEffect::initialiseOverride()
-        {
-            Base::initialiseOverride();
+            if (mEffectParams.mDuration > 0 && !(magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration))
+            {
+                spellLine += ' ';
+                spellLine += MWBase::Environment::get().getWindowManager()->getGameSettingString("sfor", {});
+                spellLine += ' ' + MyGUI::utility::toString(mEffectParams.mDuration)
+                    + ((mEffectParams.mDuration == 1) ? sec : secs);
+            }
 
-            assignWidget(mTextWidget, "Text");
-            assignWidget(mImageWidget, "Image");
+            if (mEffectParams.mArea > 0)
+            {
+                spellLine += " #{sin} " + MyGUI::utility::toString(mEffectParams.mArea) + " #{sfootarea}";
+            }
+
+            // potions have no target
+            if (!mEffectParams.mNoTarget)
+            {
+                spellLine += ' ';
+                spellLine += MWBase::Environment::get().getWindowManager()->getGameSettingString("sonword", {});
+                spellLine += ' ';
+                if (mEffectParams.mRange == ESM::RT_Self)
+                    spellLine += MWBase::Environment::get().getWindowManager()->getGameSettingString("sRangeSelf", {});
+                else if (mEffectParams.mRange == ESM::RT_Touch)
+                    spellLine += MWBase::Environment::get().getWindowManager()->getGameSettingString("sRangeTouch", {});
+                else if (mEffectParams.mRange == ESM::RT_Target)
+                    spellLine
+                        += MWBase::Environment::get().getWindowManager()->getGameSettingString("sRangeTarget", {});
+            }
         }
 
-        /* MWDynamicStat */
+        mTextWidget->setCaptionWithReplacing(spellLine);
+        mRequestedWidth = mTextWidget->getTextSize().width + sIconOffset;
 
-        MWDynamicStat::MWDynamicStat()
+        mImageWidget->setImageTexture(Misc::ResourceHelpers::correctIconPath(
+            magicEffect->mIcon, MWBase::Environment::get().getResourceSystem()->getVFS()));
+    }
+
+    MWSpellEffect::~MWSpellEffect() {}
+
+    void MWSpellEffect::initialiseOverride()
+    {
+        Base::initialiseOverride();
+
+        assignWidget(mTextWidget, "Text");
+        assignWidget(mImageWidget, "Image");
+    }
+
+    /* MWDynamicStat */
+
+    MWDynamicStat::MWDynamicStat()
         : mValue(0)
         , mMax(1)
         , mTextWidget(nullptr)
         , mBarWidget(nullptr)
         , mBarTextWidget(nullptr)
-        {
-        }
-
-        void MWDynamicStat::setValue(int cur, int max)
-        {
-            mValue = cur;
-            mMax = max;
+    {
+    }
 
-            if (mBarWidget)
-            {
-                mBarWidget->setProgressRange(std::max(0, mMax));
-                mBarWidget->setProgressPosition(std::max(0, mValue));
-            }
+    void MWDynamicStat::setValue(int cur, int max)
+    {
+        mValue = cur;
+        mMax = max;
 
-            if (mBarTextWidget)
-            {
-                std::stringstream out;
-                out << mValue << "/" << mMax;
-                mBarTextWidget->setCaption(out.str().c_str());
-            }
-        }
-        void MWDynamicStat::setTitle(std::string_view text)
+        if (mBarWidget)
         {
-            if (mTextWidget)
-                mTextWidget->setCaption(toUString(text));
+            mBarWidget->setProgressRange(std::max(0, mMax));
+            mBarWidget->setProgressPosition(std::max(0, mValue));
         }
 
-        MWDynamicStat::~MWDynamicStat()
+        if (mBarTextWidget)
         {
+            std::stringstream out;
+            out << mValue << "/" << mMax;
+            mBarTextWidget->setCaption(out.str().c_str());
         }
+    }
+    void MWDynamicStat::setTitle(std::string_view text)
+    {
+        if (mTextWidget)
+            mTextWidget->setCaption(toUString(text));
+    }
 
-        void MWDynamicStat::initialiseOverride()
-        {
-            Base::initialiseOverride();
+    MWDynamicStat::~MWDynamicStat() {}
 
-            assignWidget(mTextWidget, "Text");
-            assignWidget(mBarWidget, "Bar");
-            assignWidget(mBarTextWidget, "BarText");
-        }
+    void MWDynamicStat::initialiseOverride()
+    {
+        Base::initialiseOverride();
+
+        assignWidget(mTextWidget, "Text");
+        assignWidget(mBarWidget, "Bar");
+        assignWidget(mBarTextWidget, "BarText");
     }
+}
diff --git a/apps/openmw/mwgui/widgets.hpp b/apps/openmw/mwgui/widgets.hpp
index af83daf34c..b3b4f2ec82 100644
--- a/apps/openmw/mwgui/widgets.hpp
+++ b/apps/openmw/mwgui/widgets.hpp
@@ -31,7 +31,7 @@ namespace MWGui
     {
         class MWEffectList;
 
-        void fixTexturePath(std::string &path);
+        void fixTexturePath(std::string& path);
 
         struct SpellEffectParams
         {
@@ -71,20 +71,21 @@ namespace MWGui
 
             bool operator==(const SpellEffectParams& other) const
             {
-                if (mEffectID !=  other.mEffectID)
+                if (mEffectID != other.mEffectID)
                     return false;
 
                 bool involvesAttribute = (mEffectID == 74 // restore attribute
-                                        || mEffectID == 85 // absorb attribute
-                                        || mEffectID == 17 // drain attribute
-                                        || mEffectID == 79 // fortify attribute
-                                        || mEffectID == 22); // damage attribute
+                    || mEffectID == 85 // absorb attribute
+                    || mEffectID == 17 // drain attribute
+                    || mEffectID == 79 // fortify attribute
+                    || mEffectID == 22); // damage attribute
                 bool involvesSkill = (mEffectID == 78 // restore skill
-                                        || mEffectID == 89 // absorb skill
-                                        || mEffectID == 21 // drain skill
-                                        || mEffectID == 83 // fortify skill
-                                        || mEffectID == 26); // damage skill
-                return ((other.mSkill == mSkill) || !involvesSkill) && ((other.mAttribute == mAttribute) && !involvesAttribute) && (other.mArea == mArea);
+                    || mEffectID == 89 // absorb skill
+                    || mEffectID == 21 // drain skill
+                    || mEffectID == 83 // fortify skill
+                    || mEffectID == 26); // damage skill
+                return ((other.mSkill == mSkill) || !involvesSkill)
+                    && ((other.mAttribute == mAttribute) && !involvesAttribute) && (other.mArea == mArea);
             }
         };
 
@@ -92,7 +93,7 @@ namespace MWGui
 
         class MWSkill final : public MyGUI::Widget
         {
-            MYGUI_RTTI_DERIVED( MWSkill )
+            MYGUI_RTTI_DERIVED(MWSkill)
         public:
             MWSkill();
 
@@ -121,7 +122,6 @@ namespace MWGui
             void onClicked(MyGUI::Widget* _sender);
 
         private:
-
             void updateWidgets();
 
             ESM::Skill::SkillEnum mSkillId;
@@ -133,7 +133,7 @@ namespace MWGui
 
         class MWAttribute final : public MyGUI::Widget
         {
-            MYGUI_RTTI_DERIVED( MWAttribute )
+            MYGUI_RTTI_DERIVED(MWAttribute)
         public:
             MWAttribute();
 
@@ -161,7 +161,6 @@ namespace MWGui
             void onClicked(MyGUI::Widget* _sender);
 
         private:
-
             void updateWidgets();
 
             int mId;
@@ -177,22 +176,24 @@ namespace MWGui
         class MWSpellEffect;
         class MWSpell final : public MyGUI::Widget
         {
-            MYGUI_RTTI_DERIVED( MWSpell )
+            MYGUI_RTTI_DERIVED(MWSpell)
         public:
             MWSpell();
 
-            void setSpellId(const std::string &id);
+            void setSpellId(const std::string& id);
 
             /**
              * @param vector to store the created effect widgets
              * @param parent widget
              * @param coordinates to use, will be expanded if more space is needed
-             * @param spell category, if this is 0, this means the spell effects are permanent and won't display e.g. duration
+             * @param spell category, if this is 0, this means the spell effects are permanent and won't display e.g.
+             * duration
              * @param various flags, see MWEffectList::EffectFlags
              */
-            void createEffectWidgets(std::vector<MyGUI::Widget*> &effects, MyGUI::Widget* creator, MyGUI::IntCoord &coord, int flags);
+            void createEffectWidgets(
+                std::vector<MyGUI::Widget*>& effects, MyGUI::Widget* creator, MyGUI::IntCoord& coord, int flags);
 
-            const std::string &getSpellId() const { return mId; }
+            const std::string& getSpellId() const { return mId; }
 
         protected:
             virtual ~MWSpell();
@@ -209,7 +210,7 @@ namespace MWGui
 
         class MWEffectList final : public MyGUI::Widget
         {
-            MYGUI_RTTI_DERIVED( MWEffectList )
+            MYGUI_RTTI_DERIVED(MWEffectList)
         public:
             MWEffectList();
 
@@ -232,7 +233,8 @@ namespace MWGui
              * @param center the effect widgets horizontally
              * @param various flags, see MWEffectList::EffectFlags
              */
-            void createEffectWidgets(std::vector<MyGUI::Widget*> &effects, MyGUI::Widget* creator, MyGUI::IntCoord &coord, bool center, int flags);
+            void createEffectWidgets(std::vector<MyGUI::Widget*>& effects, MyGUI::Widget* creator,
+                MyGUI::IntCoord& coord, bool center, int flags);
 
         protected:
             virtual ~MWEffectList();
@@ -248,7 +250,7 @@ namespace MWGui
 
         class MWSpellEffect final : public MyGUI::Widget
         {
-            MYGUI_RTTI_DERIVED( MWSpellEffect )
+            MYGUI_RTTI_DERIVED(MWSpellEffect)
         public:
             MWSpellEffect();
 
@@ -265,7 +267,7 @@ namespace MWGui
 
         private:
             static constexpr int sIconOffset = 24;
-            
+
             void updateWidgets();
 
             SpellEffectParams mEffectParams;
@@ -277,7 +279,7 @@ namespace MWGui
 
         class MWDynamicStat final : public MyGUI::Widget
         {
-            MYGUI_RTTI_DERIVED( MWDynamicStat )
+            MYGUI_RTTI_DERIVED(MWDynamicStat)
         public:
             MWDynamicStat();
 
@@ -293,7 +295,6 @@ namespace MWGui
             void initialiseOverride() override;
 
         private:
-
             int mValue, mMax;
             MyGUI::TextBox* mTextWidget;
             MyGUI::ProgressBar* mBarWidget;
diff --git a/apps/openmw/mwgui/windowbase.cpp b/apps/openmw/mwgui/windowbase.cpp
index 9e476e4dab..d072efb677 100644
--- a/apps/openmw/mwgui/windowbase.cpp
+++ b/apps/openmw/mwgui/windowbase.cpp
@@ -4,8 +4,8 @@
 #include <MyGUI_InputManager.h>
 #include <MyGUI_RenderManager.h>
 
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include <components/widgets/imagebutton.hpp>
 
@@ -15,7 +15,7 @@
 using namespace MWGui;
 
 WindowBase::WindowBase(std::string_view parLayout)
-  : Layout(parLayout)
+    : Layout(parLayout)
 {
     mMainWidget->setVisible(false);
 
@@ -41,7 +41,7 @@ void WindowBase::onTitleDoubleClicked()
         MWBase::Environment::get().getWindowManager()->toggleMaximized(this);
 }
 
-void WindowBase::onDoubleClick(MyGUI::Widget *_sender)
+void WindowBase::onDoubleClick(MyGUI::Widget* _sender)
 {
     onTitleDoubleClicked();
 }
@@ -71,8 +71,8 @@ void WindowBase::center()
         layerSize = mMainWidget->getLayer()->getSize();
 
     MyGUI::IntCoord coord = mMainWidget->getCoord();
-    coord.left = (layerSize.width - coord.width)/2;
-    coord.top = (layerSize.height - coord.height)/2;
+    coord.left = (layerSize.width - coord.width) / 2;
+    coord.top = (layerSize.height - coord.height) / 2;
     mMainWidget->setCoord(coord);
 }
 
@@ -83,10 +83,10 @@ WindowModal::WindowModal(const std::string& parLayout)
 
 void WindowModal::onOpen()
 {
-    MWBase::Environment::get().getWindowManager()->addCurrentModal(this); //Set so we can escape it if needed
+    MWBase::Environment::get().getWindowManager()->addCurrentModal(this); // Set so we can escape it if needed
 
     MyGUI::Widget* focus = MyGUI::InputManager::getInstance().getKeyFocusWidget();
-    MyGUI::InputManager::getInstance ().addWidgetModal (mMainWidget);
+    MyGUI::InputManager::getInstance().addWidgetModal(mMainWidget);
     MyGUI::InputManager::getInstance().setKeyFocusWidget(focus);
 }
 
@@ -94,11 +94,13 @@ void WindowModal::onClose()
 {
     MWBase::Environment::get().getWindowManager()->removeCurrentModal(this);
 
-    MyGUI::InputManager::getInstance ().removeWidgetModal (mMainWidget);
+    MyGUI::InputManager::getInstance().removeWidgetModal(mMainWidget);
 }
 
-NoDrop::NoDrop(DragAndDrop *drag, MyGUI::Widget *widget)
-    : mWidget(widget), mDrag(drag), mTransparent(false)
+NoDrop::NoDrop(DragAndDrop* drag, MyGUI::Widget* widget)
+    : mWidget(widget)
+    , mDrag(drag)
+    , mTransparent(false)
 {
 }
 
@@ -124,12 +126,12 @@ void NoDrop::onFrame(float dt)
     if (mTransparent)
     {
         mWidget->setNeedMouseFocus(false); // Allow click-through
-        setAlpha(std::max(0.13f, mWidget->getAlpha() - dt*5));
+        setAlpha(std::max(0.13f, mWidget->getAlpha() - dt * 5));
     }
     else
     {
         mWidget->setNeedMouseFocus(true);
-        setAlpha(std::min(1.0f, mWidget->getAlpha() + dt*5));
+        setAlpha(std::min(1.0f, mWidget->getAlpha() + dt * 5));
     }
 }
 
@@ -140,14 +142,14 @@ void NoDrop::setAlpha(float alpha)
 }
 
 BookWindowBase::BookWindowBase(std::string_view parLayout)
-  : WindowBase(parLayout)
+    : WindowBase(parLayout)
 {
 }
 
 float BookWindowBase::adjustButton(std::string_view name)
 {
     Gui::ImageButton* button;
-    WindowBase::getWidget (button, name);
+    WindowBase::getWidget(button, name);
     MyGUI::IntSize requested = button->getRequestedSize();
     float scale = float(requested.height) / button->getSize().height;
     MyGUI::IntSize newSize = requested;
@@ -160,7 +162,7 @@ float BookWindowBase::adjustButton(std::string_view name)
         MyGUI::IntSize diff = (button->getSize() - requested);
         diff.width /= scale;
         diff.height /= scale;
-        button->setPosition(button->getPosition() + MyGUI::IntPoint(diff.width,0));
+        button->setPosition(button->getPosition() + MyGUI::IntPoint(diff.width, 0));
     }
 
     return scale;
diff --git a/apps/openmw/mwgui/windowbase.hpp b/apps/openmw/mwgui/windowbase.hpp
index dde9190666..4bf622a099 100644
--- a/apps/openmw/mwgui/windowbase.hpp
+++ b/apps/openmw/mwgui/windowbase.hpp
@@ -12,7 +12,7 @@ namespace MWGui
 {
     class DragAndDrop;
 
-    class WindowBase: public Layout
+    class WindowBase : public Layout
     {
     public:
         WindowBase(std::string_view parLayout);
@@ -31,9 +31,9 @@ namespace MWGui
         /// Notify that window has been made visible
         virtual void onOpen() {}
         /// Notify that window has been hidden
-        virtual void onClose () {}
+        virtual void onClose() {}
         /// Gracefully exits the window
-        virtual bool exit() {return true;}
+        virtual bool exit() { return true; }
         /// Sets the visibility of the window
         void setVisible(bool visible) override;
         /// Returns the visibility state of the window
@@ -65,7 +65,7 @@ namespace MWGui
         WindowModal(const std::string& parLayout);
         void onOpen() override;
         void onClose() override;
-        bool exit() override {return true;}
+        bool exit() override { return true; }
     };
 
     /// A window that cannot be the target of a drag&drop action.
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 79f4312590..f41f6a4a79 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -8,18 +8,18 @@
 
 #include <osgViewer/Viewer>
 
-#include <MyGUI_UString.h>
+#include <MyGUI_ClipboardManager.h>
 #include <MyGUI_FactoryManager.h>
+#include <MyGUI_InputManager.h>
 #include <MyGUI_LanguageManager.h>
 #include <MyGUI_PointerManager.h>
-#include <MyGUI_InputManager.h>
-#include <MyGUI_ClipboardManager.h>
+#include <MyGUI_UString.h>
 
 // For BT_NO_PROFILE
 #include <LinearMath/btQuickprof.h>
 
-#include <SDL_keyboard.h>
 #include <SDL_clipboard.h>
+#include <SDL_keyboard.h>
 
 #include <components/debug/debuglog.hpp>
 
@@ -28,17 +28,17 @@
 
 #include <components/fontloader/fontloader.hpp>
 
-#include <components/resource/resourcesystem.hpp>
 #include <components/resource/imagemanager.hpp>
+#include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 
 #include <components/sceneutil/workqueue.hpp>
 
 #include <components/translation/translation.hpp>
 
+#include <components/myguiplatform/additivelayer.hpp>
 #include <components/myguiplatform/myguiplatform.hpp>
 #include <components/myguiplatform/myguirendermanager.hpp>
-#include <components/myguiplatform/additivelayer.hpp>
 #include <components/myguiplatform/scalinglayer.hpp>
 
 #include <components/vfs/manager.hpp>
@@ -46,146 +46,145 @@
 #include <components/widgets/tags.hpp>
 #include <components/widgets/widgets.hpp>
 
-#include <components/misc/resourcehelpers.hpp>
 #include <components/misc/frameratelimiter.hpp>
+#include <components/misc/resourcehelpers.hpp>
 
 #include <components/lua_ui/util.hpp>
 
 #include "../mwbase/inputmanager.hpp"
 #include "../mwbase/luamanager.hpp"
-#include "../mwbase/statemanager.hpp"
 #include "../mwbase/soundmanager.hpp"
+#include "../mwbase/statemanager.hpp"
 #include "../mwbase/world.hpp"
 
 #include "../mwrender/vismask.hpp"
 
-#include "../mwworld/class.hpp"
-#include "../mwworld/player.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/player.hpp"
 
-#include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/npcstats.hpp"
 
 #include "../mwrender/postprocessor.hpp"
 
-#include "console.hpp"
-#include "journalwindow.hpp"
-#include "journalviewmodel.hpp"
-#include "dialogue.hpp"
-#include "statswindow.hpp"
-#include "scrollwindow.hpp"
+#include "alchemywindow.hpp"
+#include "backgroundimage.hpp"
+#include "bookpage.hpp"
 #include "bookwindow.hpp"
-#include "hud.hpp"
-#include "mainmenu.hpp"
-#include "countdialog.hpp"
-#include "tradewindow.hpp"
-#include "spellbuyingwindow.hpp"
-#include "travelwindow.hpp"
-#include "settingswindow.hpp"
+#include "companionwindow.hpp"
 #include "confirmationdialog.hpp"
-#include "alchemywindow.hpp"
-#include "spellwindow.hpp"
-#include "quickkeysmenu.hpp"
-#include "loadingscreen.hpp"
-#include "levelupdialog.hpp"
-#include "waitdialog.hpp"
+#include "console.hpp"
+#include "container.hpp"
+#include "controllers.hpp"
+#include "countdialog.hpp"
+#include "cursor.hpp"
+#include "debugwindow.hpp"
+#include "dialogue.hpp"
 #include "enchantingdialog.hpp"
-#include "trainingwindow.hpp"
-#include "recharge.hpp"
 #include "exposedwindow.hpp"
-#include "cursor.hpp"
-#include "merchantrepair.hpp"
-#include "repair.hpp"
-#include "companionwindow.hpp"
+#include "hud.hpp"
 #include "inventorywindow.hpp"
-#include "bookpage.hpp"
+#include "itemchargeview.hpp"
 #include "itemview.hpp"
-#include "videowidget.hpp"
-#include "backgroundimage.hpp"
 #include "itemwidget.hpp"
-#include "screenfader.hpp"
-#include "debugwindow.hpp"
-#include "postprocessorhud.hpp"
-#include "spellview.hpp"
-#include "container.hpp"
-#include "controllers.hpp"
 #include "jailscreen.hpp"
-#include "itemchargeview.hpp"
+#include "journalviewmodel.hpp"
+#include "journalwindow.hpp"
 #include "keyboardnavigation.hpp"
+#include "levelupdialog.hpp"
+#include "loadingscreen.hpp"
+#include "mainmenu.hpp"
+#include "merchantrepair.hpp"
+#include "postprocessorhud.hpp"
+#include "quickkeysmenu.hpp"
+#include "recharge.hpp"
+#include "repair.hpp"
 #include "resourceskin.hpp"
+#include "screenfader.hpp"
+#include "scrollwindow.hpp"
+#include "settingswindow.hpp"
+#include "spellbuyingwindow.hpp"
+#include "spellview.hpp"
+#include "spellwindow.hpp"
+#include "statswindow.hpp"
+#include "tradewindow.hpp"
+#include "trainingwindow.hpp"
+#include "travelwindow.hpp"
 #include "ustring.hpp"
+#include "videowidget.hpp"
+#include "waitdialog.hpp"
 
 namespace MWGui
 {
-    WindowManager::WindowManager(
-            SDL_Window* window, osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
-            const std::filesystem::path& logpath, bool consoleOnlyScripts, Translation::Storage& translationDataStorage,
-            ToUTF8::FromType encoding, const std::string& versionDescription, bool useShaders)
-      : mOldUpdateMask(0)
-      , mOldCullMask(0)
-      , mStore(nullptr)
-      , mResourceSystem(resourceSystem)
-      , mWorkQueue(workQueue)
-      , mViewer(viewer)
-      , mConsoleOnlyScripts(consoleOnlyScripts)
-      , mCurrentModals()
-      , mHud(nullptr)
-      , mMap(nullptr)
-      , mStatsWindow(nullptr)
-      , mConsole(nullptr)
-      , mDialogueWindow(nullptr)
-      , mInventoryWindow(nullptr)
-      , mScrollWindow(nullptr)
-      , mBookWindow(nullptr)
-      , mCountDialog(nullptr)
-      , mTradeWindow(nullptr)
-      , mSettingsWindow(nullptr)
-      , mConfirmationDialog(nullptr)
-      , mSpellWindow(nullptr)
-      , mQuickKeysMenu(nullptr)
-      , mLoadingScreen(nullptr)
-      , mWaitDialog(nullptr)
-      , mVideoBackground(nullptr)
-      , mVideoWidget(nullptr)
-      , mWerewolfFader(nullptr)
-      , mBlindnessFader(nullptr)
-      , mHitFader(nullptr)
-      , mScreenFader(nullptr)
-      , mDebugWindow(nullptr)
-      , mPostProcessorHud(nullptr)
-      , mJailScreen(nullptr)
-      , mContainerWindow(nullptr)
-      , mTranslationDataStorage (translationDataStorage)
-      , mInputBlocker(nullptr)
-      , mCrosshairEnabled(Settings::Manager::getBool ("crosshair", "HUD"))
-      , mSubtitlesEnabled(Settings::Manager::getBool ("subtitles", "GUI"))
-      , mHitFaderEnabled(Settings::Manager::getBool ("hit fader", "GUI"))
-      , mWerewolfOverlayEnabled(Settings::Manager::getBool ("werewolf overlay", "GUI"))
-      , mHudEnabled(true)
-      , mCursorVisible(true)
-      , mCursorActive(true)
-      , mPlayerBounty(-1)
-      , mGuiModes()
-      , mGarbageDialogs()
-      , mShown(GW_ALL)
-      , mForceHidden(GW_None)
-      , mAllowed(GW_ALL)
-      , mRestAllowed(true)
-      , mShowOwned(0)
-      , mEncoding(encoding)
-      , mVersionDescription(versionDescription)
-      , mWindowVisible(true)
-    {
-        int w,h;
+    WindowManager::WindowManager(SDL_Window* window, osgViewer::Viewer* viewer, osg::Group* guiRoot,
+        Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue, const std::filesystem::path& logpath,
+        bool consoleOnlyScripts, Translation::Storage& translationDataStorage, ToUTF8::FromType encoding,
+        const std::string& versionDescription, bool useShaders)
+        : mOldUpdateMask(0)
+        , mOldCullMask(0)
+        , mStore(nullptr)
+        , mResourceSystem(resourceSystem)
+        , mWorkQueue(workQueue)
+        , mViewer(viewer)
+        , mConsoleOnlyScripts(consoleOnlyScripts)
+        , mCurrentModals()
+        , mHud(nullptr)
+        , mMap(nullptr)
+        , mStatsWindow(nullptr)
+        , mConsole(nullptr)
+        , mDialogueWindow(nullptr)
+        , mInventoryWindow(nullptr)
+        , mScrollWindow(nullptr)
+        , mBookWindow(nullptr)
+        , mCountDialog(nullptr)
+        , mTradeWindow(nullptr)
+        , mSettingsWindow(nullptr)
+        , mConfirmationDialog(nullptr)
+        , mSpellWindow(nullptr)
+        , mQuickKeysMenu(nullptr)
+        , mLoadingScreen(nullptr)
+        , mWaitDialog(nullptr)
+        , mVideoBackground(nullptr)
+        , mVideoWidget(nullptr)
+        , mWerewolfFader(nullptr)
+        , mBlindnessFader(nullptr)
+        , mHitFader(nullptr)
+        , mScreenFader(nullptr)
+        , mDebugWindow(nullptr)
+        , mPostProcessorHud(nullptr)
+        , mJailScreen(nullptr)
+        , mContainerWindow(nullptr)
+        , mTranslationDataStorage(translationDataStorage)
+        , mInputBlocker(nullptr)
+        , mCrosshairEnabled(Settings::Manager::getBool("crosshair", "HUD"))
+        , mSubtitlesEnabled(Settings::Manager::getBool("subtitles", "GUI"))
+        , mHitFaderEnabled(Settings::Manager::getBool("hit fader", "GUI"))
+        , mWerewolfOverlayEnabled(Settings::Manager::getBool("werewolf overlay", "GUI"))
+        , mHudEnabled(true)
+        , mCursorVisible(true)
+        , mCursorActive(true)
+        , mPlayerBounty(-1)
+        , mGuiModes()
+        , mGarbageDialogs()
+        , mShown(GW_ALL)
+        , mForceHidden(GW_None)
+        , mAllowed(GW_ALL)
+        , mRestAllowed(true)
+        , mShowOwned(0)
+        , mEncoding(encoding)
+        , mVersionDescription(versionDescription)
+        , mWindowVisible(true)
+    {
+        int w, h;
         SDL_GetWindowSize(window, &w, &h);
-        int dw,dh;
+        int dw, dh;
         SDL_GL_GetDrawableSize(window, &dw, &dh);
 
         mScalingFactor = std::clamp(Settings::Manager::getFloat("scaling factor", "GUI"), 0.5f, 8.f) * (dw / w);
         mGuiPlatform = std::make_unique<osgMyGUI::Platform>(viewer, guiRoot, resourceSystem->getImageManager(),
-            resourceSystem->getVFS(), mScalingFactor, "mygui",
-            logpath / "MyGUI.log");
+            resourceSystem->getVFS(), mScalingFactor, "mygui", logpath / "MyGUI.log");
 
         mGui = std::make_unique<MyGUI::Gui>();
         mGui->initialise("");
@@ -197,7 +196,7 @@ namespace MWGui
         // Load fonts
         mFontLoader = std::make_unique<Gui::FontLoader>(encoding, resourceSystem->getVFS(), mScalingFactor);
 
-        //Register own widgets with MyGUI
+        // Register own widgets with MyGUI
         MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWSkill>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWAttribute>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWSpell>("Widget");
@@ -220,8 +219,10 @@ namespace MWGui
 
         MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Controllers::ControllerFollowMouse>("Controller");
 
-        MyGUI::FactoryManager::getInstance().registerFactory<ResourceImageSetPointerFix>("Resource", "ResourceImageSetPointer");
-        MyGUI::FactoryManager::getInstance().registerFactory<AutoSizedResourceSkin>("Resource", "AutoSizedResourceSkin");
+        MyGUI::FactoryManager::getInstance().registerFactory<ResourceImageSetPointerFix>(
+            "Resource", "ResourceImageSetPointer");
+        MyGUI::FactoryManager::getInstance().registerFactory<AutoSizedResourceSkin>(
+            "Resource", "AutoSizedResourceSkin");
         MyGUI::ResourceManager::getInstance().load("core.xml");
 
         bool keyboardNav = Settings::Manager::getBool("keyboard navigation", "GUI");
@@ -233,12 +234,14 @@ namespace MWGui
         mLoadingScreen = loadingScreen.get();
         mWindows.push_back(std::move(loadingScreen));
 
-        //set up the hardware cursor manager
+        // set up the hardware cursor manager
         mCursorManager = std::make_unique<SDLUtil::SDLCursorManager>();
 
-        MyGUI::PointerManager::getInstance().eventChangeMousePointer += MyGUI::newDelegate(this, &WindowManager::onCursorChange);
+        MyGUI::PointerManager::getInstance().eventChangeMousePointer
+            += MyGUI::newDelegate(this, &WindowManager::onCursorChange);
 
-        MyGUI::InputManager::getInstance().eventChangeKeyFocus += MyGUI::newDelegate(this, &WindowManager::onKeyFocusChanged);
+        MyGUI::InputManager::getInstance().eventChangeKeyFocus
+            += MyGUI::newDelegate(this, &WindowManager::onKeyFocusChanged);
 
         // Create all cursors in advance
         createCursors();
@@ -248,14 +251,14 @@ namespace MWGui
         // hide mygui's pointer
         MyGUI::PointerManager::getInstance().setVisible(false);
 
-        mVideoBackground = MyGUI::Gui::getInstance().createWidgetReal<MyGUI::ImageBox>("ImageBox", 0,0,1,1,
-            MyGUI::Align::Default, "Video");
+        mVideoBackground = MyGUI::Gui::getInstance().createWidgetReal<MyGUI::ImageBox>(
+            "ImageBox", 0, 0, 1, 1, MyGUI::Align::Default, "Video");
         mVideoBackground->setImageTexture("black");
         mVideoBackground->setVisible(false);
         mVideoBackground->setNeedMouseFocus(true);
         mVideoBackground->setNeedKeyFocus(true);
 
-        mVideoWidget = mVideoBackground->createWidgetReal<VideoWidget>("ImageBox", 0,0,1,1, MyGUI::Align::Default);
+        mVideoWidget = mVideoBackground->createWidgetReal<VideoWidget>("ImageBox", 0, 0, 1, 1, MyGUI::Align::Default);
         mVideoWidget->setNeedMouseFocus(true);
         mVideoWidget->setNeedKeyFocus(true);
         mVideoWidget->setVFS(resourceSystem->getVFS());
@@ -264,14 +267,16 @@ namespace MWGui
         MyGUI::ClipboardManager::getInstance().eventClipboardChanged.clear();
         MyGUI::ClipboardManager::getInstance().eventClipboardRequested.clear();
 
-        MyGUI::ClipboardManager::getInstance().eventClipboardChanged += MyGUI::newDelegate(this, &WindowManager::onClipboardChanged);
-        MyGUI::ClipboardManager::getInstance().eventClipboardRequested += MyGUI::newDelegate(this, &WindowManager::onClipboardRequested);
+        MyGUI::ClipboardManager::getInstance().eventClipboardChanged
+            += MyGUI::newDelegate(this, &WindowManager::onClipboardChanged);
+        MyGUI::ClipboardManager::getInstance().eventClipboardRequested
+            += MyGUI::newDelegate(this, &WindowManager::onClipboardRequested);
 
         mShowOwned = Settings::Manager::getInt("show owned", "Game");
 
         mVideoWrapper = std::make_unique<SDLUtil::VideoWrapper>(window, viewer);
-        mVideoWrapper->setGammaContrast(Settings::Manager::getFloat("gamma", "Video"),
-                                        Settings::Manager::getFloat("contrast", "Video"));
+        mVideoWrapper->setGammaContrast(
+            Settings::Manager::getFloat("gamma", "Video"), Settings::Manager::getFloat("contrast", "Video"));
 
         if (useShaders)
             mGuiPlatform->getRenderManagerPtr()->enableShaders(mResourceSystem->getSceneManager()->getShaderManager());
@@ -309,7 +314,8 @@ namespace MWGui
         mWindows.push_back(std::move(statsWindow));
         trackWindow(mStatsWindow, "stats");
 
-        auto inventoryWindow = std::make_unique<InventoryWindow>(mDragAndDrop.get(), mViewer->getSceneData()->asGroup(), mResourceSystem);
+        auto inventoryWindow = std::make_unique<InventoryWindow>(
+            mDragAndDrop.get(), mViewer->getSceneData()->asGroup(), mResourceSystem);
         mInventoryWindow = inventoryWindow.get();
         mWindows.push_back(std::move(inventoryWindow));
 
@@ -318,16 +324,16 @@ namespace MWGui
         mWindows.push_back(std::move(spellWindow));
         trackWindow(mSpellWindow, "spells");
 
-        mGuiModeStates[GM_Inventory] = GuiModeState({mMap, mInventoryWindow, mSpellWindow, mStatsWindow});
-        mGuiModeStates[GM_None] = GuiModeState({mMap, mInventoryWindow, mSpellWindow, mStatsWindow});
+        mGuiModeStates[GM_Inventory] = GuiModeState({ mMap, mInventoryWindow, mSpellWindow, mStatsWindow });
+        mGuiModeStates[GM_None] = GuiModeState({ mMap, mInventoryWindow, mSpellWindow, mStatsWindow });
 
         auto tradeWindow = std::make_unique<TradeWindow>();
         mTradeWindow = tradeWindow.get();
         mWindows.push_back(std::move(tradeWindow));
         trackWindow(mTradeWindow, "barter");
-        mGuiModeStates[GM_Barter] = GuiModeState({mInventoryWindow, mTradeWindow});
+        mGuiModeStates[GM_Barter] = GuiModeState({ mInventoryWindow, mTradeWindow });
 
-        auto console = std::make_unique<Console>(w,h, mConsoleOnlyScripts);
+        auto console = std::make_unique<Console>(w, h, mConsoleOnlyScripts);
         mConsole = console.get();
         mWindows.push_back(std::move(console));
         trackWindow(mConsole, "console");
@@ -339,7 +345,8 @@ namespace MWGui
         mGuiModeStates[GM_Journal].mOpenSound = "book open";
         mWindows.push_back(std::move(journal));
 
-        mMessageBoxManager = std::make_unique<MessageBoxManager>(mStore->get<ESM::GameSetting>().find("fMessageTimePerChar")->mValue.getFloat());
+        mMessageBoxManager = std::make_unique<MessageBoxManager>(
+            mStore->get<ESM::GameSetting>().find("fMessageTimePerChar")->mValue.getFloat());
 
         auto spellBuyingWindow = std::make_unique<SpellBuyingWindow>();
         mGuiModeStates[GM_SpellBuying] = GuiModeState(spellBuyingWindow.get());
@@ -360,7 +367,7 @@ namespace MWGui
         mContainerWindow = containerWindow.get();
         mWindows.push_back(std::move(containerWindow));
         trackWindow(mContainerWindow, "container");
-        mGuiModeStates[GM_Container] = GuiModeState({mContainerWindow, mInventoryWindow});
+        mGuiModeStates[GM_Container] = GuiModeState({ mContainerWindow, mInventoryWindow });
 
         auto hud = std::make_unique<HUD>(mCustomMarkers, mDragAndDrop.get(), mLocalMapRender.get());
         mHud = hud.get();
@@ -413,7 +420,7 @@ namespace MWGui
         auto waitDialog = std::make_unique<WaitDialog>();
         mWaitDialog = waitDialog.get();
         mWindows.push_back(std::move(waitDialog));
-        mGuiModeStates[GM_Rest] = GuiModeState({mWaitDialog->getProgressBar(), mWaitDialog});
+        mGuiModeStates[GM_Rest] = GuiModeState({ mWaitDialog->getProgressBar(), mWaitDialog });
 
         auto spellCreationDialog = std::make_unique<SpellCreationDialog>();
         mGuiModeStates[GM_SpellCreation] = GuiModeState(spellCreationDialog.get());
@@ -424,7 +431,7 @@ namespace MWGui
         mWindows.push_back(std::move(enchantingDialog));
 
         auto trainingWindow = std::make_unique<TrainingWindow>();
-        mGuiModeStates[GM_Training] = GuiModeState({trainingWindow->getProgressBar(), trainingWindow.get()});
+        mGuiModeStates[GM_Training] = GuiModeState({ trainingWindow->getProgressBar(), trainingWindow.get() });
         mWindows.push_back(std::move(trainingWindow));
 
         auto merchantRepair = std::make_unique<MerchantRepair>();
@@ -439,7 +446,7 @@ namespace MWGui
 
         auto companionWindow = std::make_unique<CompanionWindow>(mDragAndDrop.get(), mMessageBoxManager.get());
         trackWindow(companionWindow.get(), "companion");
-        mGuiModeStates[GM_Companion] = GuiModeState({mInventoryWindow, companionWindow.get()});
+        mGuiModeStates[GM_Companion] = GuiModeState({ mInventoryWindow, companionWindow.get() });
         mWindows.push_back(std::move(companionWindow));
 
         auto jailScreen = std::make_unique<JailScreen>();
@@ -461,8 +468,8 @@ namespace MWGui
         // fall back to player_hit_01.dds if bm_player_hit_01.dds is not available
         std::string hitFaderTexture = "textures\\bm_player_hit_01.dds";
         const std::string hitFaderLayout = "openmw_screen_fader_hit.layout";
-        MyGUI::FloatCoord hitFaderCoord (0,0,1,1);
-        if(!mResourceSystem->getVFS()->exists(hitFaderTexture))
+        MyGUI::FloatCoord hitFaderCoord(0, 0, 1, 1);
+        if (!mResourceSystem->getVFS()->exists(hitFaderTexture))
         {
             hitFaderTexture = "textures\\player_hit_01.dds";
             hitFaderCoord = MyGUI::FloatCoord(0.2, 0.25, 0.6, 0.5);
@@ -484,7 +491,8 @@ namespace MWGui
         mWindows.push_back(std::move(postProcessorHud));
         trackWindow(mPostProcessorHud, "postprocessor");
 
-        mInputBlocker = MyGUI::Gui::getInstance().createWidget<MyGUI::Widget>("",0,0,w,h,MyGUI::Align::Stretch,"InputBlocker");
+        mInputBlocker = MyGUI::Gui::getInstance().createWidget<MyGUI::Widget>(
+            "", 0, 0, w, h, MyGUI::Align::Stretch, "InputBlocker");
 
         mHud->setVisible(true);
 
@@ -549,13 +557,13 @@ namespace MWGui
 
             mGuiPlatform->shutdown();
         }
-        catch(const MyGUI::Exception& e)
+        catch (const MyGUI::Exception& e)
         {
             Log(Debug::Error) << "Error in the destructor: " << e.what();
         }
     }
 
-    void WindowManager::setStore(const MWWorld::ESMStore &store)
+    void WindowManager::setStore(const MWWorld::ESMStore& store)
     {
         mStore = &store;
     }
@@ -568,7 +576,7 @@ namespace MWGui
 
     void WindowManager::enableScene(bool enable)
     {
-        unsigned int disablemask = MWRender::Mask_GUI|MWRender::Mask_PreCompile;
+        unsigned int disablemask = MWRender::Mask_GUI | MWRender::Mask_PreCompile;
         if (!enable && getCullMask() != disablemask)
         {
             mOldUpdateMask = mViewer->getUpdateVisitor()->getTraversalMask();
@@ -592,7 +600,8 @@ namespace MWGui
     {
         bool loading = (getMode() == GM_Loading || getMode() == GM_LoadingWallpaper);
 
-        bool mainmenucover = containsMode(GM_MainMenu) && MWBase::Environment::get().getStateManager()->getState() == MWBase::StateManager::State_NoGame;
+        bool mainmenucover = containsMode(GM_MainMenu)
+            && MWBase::Environment::get().getStateManager()->getState() == MWBase::StateManager::State_NoGame;
 
         enableScene(!loading && !mainmenucover);
 
@@ -606,7 +615,7 @@ namespace MWGui
 
         MWBase::Environment::get().getInputManager()->changeInputMode(!gameMode);
 
-        mInputBlocker->setVisible (gameMode);
+        mInputBlocker->setVisible(gameMode);
 
         if (loading)
             setCursorVisible(mMessageBoxManager && mMessageBoxManager->isInteractiveMessageBox());
@@ -614,11 +623,12 @@ namespace MWGui
             setCursorVisible(!gameMode);
 
         if (gameMode)
-            setKeyFocusWidget (nullptr);
+            setKeyFocusWidget(nullptr);
 
         // Icons of forced hidden windows are displayed
         setMinimapVisibility((mAllowed & GW_Map) && (!mMap->pinned() || (mForceHidden & GW_Map)));
-        setWeaponVisibility((mAllowed & GW_Inventory) && (!mInventoryWindow->pinned() || (mForceHidden & GW_Inventory)));
+        setWeaponVisibility(
+            (mAllowed & GW_Inventory) && (!mInventoryWindow->pinned() || (mForceHidden & GW_Inventory)));
         setSpellVisibility((mAllowed & GW_Magic) && (!mSpellWindow->pinned() || (mForceHidden & GW_Magic)));
         setHMSVisibility((mAllowed & GW_Stats) && (!mStatsWindow->pinned() || (mForceHidden & GW_Stats)));
 
@@ -628,9 +638,12 @@ namespace MWGui
         if (mGuiModes.empty())
         {
             mMap->setVisible(mMap->pinned() && !isConsoleMode() && !(mForceHidden & GW_Map) && (mAllowed & GW_Map));
-            mStatsWindow->setVisible(mStatsWindow->pinned() && !isConsoleMode() && !(mForceHidden & GW_Stats) && (mAllowed & GW_Stats));
-            mInventoryWindow->setVisible(mInventoryWindow->pinned() && !isConsoleMode() && !(mForceHidden & GW_Inventory) && (mAllowed & GW_Inventory));
-            mSpellWindow->setVisible(mSpellWindow->pinned() && !isConsoleMode() && !(mForceHidden & GW_Magic) && (mAllowed & GW_Magic));
+            mStatsWindow->setVisible(
+                mStatsWindow->pinned() && !isConsoleMode() && !(mForceHidden & GW_Stats) && (mAllowed & GW_Stats));
+            mInventoryWindow->setVisible(mInventoryWindow->pinned() && !isConsoleMode()
+                && !(mForceHidden & GW_Inventory) && (mAllowed & GW_Inventory));
+            mSpellWindow->setVisible(
+                mSpellWindow->pinned() && !isConsoleMode() && !(mForceHidden & GW_Magic) && (mAllowed & GW_Magic));
             return;
         }
         else if (getMode() != GM_Inventory)
@@ -639,7 +652,8 @@ namespace MWGui
             mStatsWindow->setVisible(false);
             mSpellWindow->setVisible(false);
             mHud->setDrowningBarVisible(false);
-            mInventoryWindow->setVisible(getMode() == GM_Container || getMode() == GM_Barter || getMode() == GM_Companion);
+            mInventoryWindow->setVisible(
+                getMode() == GM_Container || getMode() == GM_Barter || getMode() == GM_Companion);
         }
 
         GuiMode mode = mGuiModes.back();
@@ -661,23 +675,23 @@ namespace MWGui
 
         switch (mode)
         {
-        // FIXME: refactor chargen windows to use modes properly (or not use them at all)
-        case GM_Name:
-        case GM_Race:
-        case GM_Class:
-        case GM_ClassPick:
-        case GM_ClassCreate:
-        case GM_Birth:
-        case GM_ClassGenerate:
-        case GM_Review:
-            mCharGen->spawnDialog(mode);
-            break;
-        default:
-            break;
+            // FIXME: refactor chargen windows to use modes properly (or not use them at all)
+            case GM_Name:
+            case GM_Race:
+            case GM_Class:
+            case GM_ClassPick:
+            case GM_ClassCreate:
+            case GM_Birth:
+            case GM_ClassGenerate:
+            case GM_Review:
+                mCharGen->spawnDialog(mode);
+                break;
+            default:
+                break;
         }
     }
 
-    void WindowManager::setDrowningTimeLeft (float time, float maxTime)
+    void WindowManager::setDrowningTimeLeft(float time, float maxTime)
     {
         mHud->setDrowningTimeLeft(time, maxTime);
     }
@@ -705,7 +719,7 @@ namespace MWGui
             {
                 // unable to exit window, but give access to main menu
                 if (!MyGUI::InputManager::getInstance().isModalAny() && getMode() != GM_MainMenu)
-                    pushGuiMode (GM_MainMenu);
+                    pushGuiMode(GM_MainMenu);
                 return;
             }
         }
@@ -713,18 +727,22 @@ namespace MWGui
         popGuiMode();
     }
 
-    void WindowManager::interactiveMessageBox(std::string_view message, const std::vector<std::string> &buttons, bool block)
+    void WindowManager::interactiveMessageBox(
+        std::string_view message, const std::vector<std::string>& buttons, bool block)
     {
         mMessageBoxManager->createInteractiveMessageBox(message, buttons);
         updateVisible();
 
         if (block)
         {
-            Misc::FrameRateLimiter frameRateLimiter = Misc::makeFrameRateLimiter(MWBase::Environment::get().getFrameRateLimit());
+            Misc::FrameRateLimiter frameRateLimiter
+                = Misc::makeFrameRateLimiter(MWBase::Environment::get().getFrameRateLimit());
             while (mMessageBoxManager->readPressedButton(false) == -1
-                   && !MWBase::Environment::get().getStateManager()->hasQuitRequest())
+                && !MWBase::Environment::get().getStateManager()->hasQuitRequest())
             {
-                const double dt = std::chrono::duration_cast<std::chrono::duration<double>>(frameRateLimiter.getLastFrameDuration()).count();
+                const double dt
+                    = std::chrono::duration_cast<std::chrono::duration<double>>(frameRateLimiter.getLastFrameDuration())
+                          .count();
 
                 mKeyboardNavigation->onFrame();
                 mMessageBoxManager->onFrame(dt);
@@ -750,9 +768,12 @@ namespace MWGui
 
     void WindowManager::messageBox(std::string_view message, enum MWGui::ShowInDialogueMode showInDialogueMode)
     {
-        if (getMode() == GM_Dialogue && showInDialogueMode != MWGui::ShowInDialogueMode_Never) {
+        if (getMode() == GM_Dialogue && showInDialogueMode != MWGui::ShowInDialogueMode_Never)
+        {
             mDialogueWindow->addMessageBox(MyGUI::LanguageManager::getInstance().replaceTags(toUString(message)));
-        } else if (showInDialogueMode != MWGui::ShowInDialogueMode_Only) {
+        }
+        else if (showInDialogueMode != MWGui::ShowInDialogueMode_Only)
+        {
             mMessageBoxManager->createMessageBox(message);
         }
     }
@@ -777,16 +798,16 @@ namespace MWGui
         return mMessageBoxManager->getActiveMessageBoxes();
     }
 
-    int WindowManager::readPressedButton ()
+    int WindowManager::readPressedButton()
     {
         return mMessageBoxManager->readPressedButton();
     }
 
     std::string_view WindowManager::getGameSettingString(std::string_view id, std::string_view default_)
     {
-        const ESM::GameSetting *setting = mStore->get<ESM::GameSetting>().search(id);
+        const ESM::GameSetting* setting = mStore->get<ESM::GameSetting>().search(id);
 
-        if (setting && setting->mValue.getType()==ESM::VT_String)
+        if (setting && setting->mValue.getType() == ESM::VT_String)
             return setting->mValue.getString();
 
         return default_;
@@ -800,11 +821,11 @@ namespace MWGui
         MWWorld::ConstPtr player = MWMechanics::getPlayer();
 
         osg::Vec3f playerPosition = player.getRefData().getPosition().asVec3();
-        osg::Quat playerOrientation (-player.getRefData().getPosition().rot[2], osg::Vec3(0,0,1));
+        osg::Quat playerOrientation(-player.getRefData().getPosition().rot[2], osg::Vec3(0, 0, 1));
 
         osg::Vec3f playerdirection;
-        int x,y;
-        float u,v;
+        int x, y;
+        float u, v;
         mLocalMapRender->updatePlayer(playerPosition, playerOrientation, u, v, x, y, playerdirection);
 
         if (!player.getCell()->isExterior())
@@ -819,12 +840,12 @@ namespace MWGui
         mHud->setPlayerPos(x, y, u, v);
     }
 
-    void WindowManager::update (float frameDuration)
+    void WindowManager::update(float frameDuration)
     {
         handleScheduledMessageBoxes();
 
-        bool gameRunning = MWBase::Environment::get().getStateManager()->getState()!=
-            MWBase::StateManager::State_NoGame;
+        bool gameRunning
+            = MWBase::Environment::get().getStateManager()->getState() != MWBase::StateManager::State_NoGame;
 
         if (gameRunning)
             updateMap();
@@ -846,9 +867,11 @@ namespace MWGui
         // Make sure message boxes are always in front
         // This is an awful workaround for a series of awfully interwoven issues that couldn't be worked around
         // in a better way because of an impressive number of even more awfully interwoven issues.
-        if (mMessageBoxManager && mMessageBoxManager->isInteractiveMessageBox() && mCurrentModals.back() != mMessageBoxManager->getInteractiveMessageBox())
+        if (mMessageBoxManager && mMessageBoxManager->isInteractiveMessageBox()
+            && mCurrentModals.back() != mMessageBoxManager->getInteractiveMessageBox())
         {
-            std::vector<WindowModal*>::iterator found = std::find(mCurrentModals.begin(), mCurrentModals.end(), mMessageBoxManager->getInteractiveMessageBox());
+            std::vector<WindowModal*>::iterator found = std::find(
+                mCurrentModals.begin(), mCurrentModals.end(), mMessageBoxManager->getInteractiveMessageBox());
             if (found != mCurrentModals.end())
             {
                 WindowModal* msgbox = *found;
@@ -909,24 +932,24 @@ namespace MWGui
     {
         mMap->requestMapRender(cell);
 
-        std::string name{MWBase::Environment::get().getWorld()->getCellName(cell)};
+        std::string name{ MWBase::Environment::get().getWorld()->getCellName(cell) };
 
-        mMap->setCellName( name );
-        mHud->setCellName( name );
+        mMap->setCellName(name);
+        mHud->setCellName(name);
 
         if (cell->getCell()->isExterior())
         {
             if (!cell->getCell()->mName.empty())
-                mMap->addVisitedLocation (name, cell->getCell()->getGridX (), cell->getCell()->getGridY ());
+                mMap->addVisitedLocation(name, cell->getCell()->getGridX(), cell->getCell()->getGridY());
 
-            mMap->cellExplored (cell->getCell()->getGridX(), cell->getCell()->getGridY());
+            mMap->cellExplored(cell->getCell()->getGridX(), cell->getCell()->getGridY());
 
             setActiveMap(cell->getCell()->getGridX(), cell->getCell()->getGridY(), false);
         }
         else
         {
-            mMap->setCellPrefix (cell->getCell()->mName );
-            mHud->setCellPrefix (cell->getCell()->mName );
+            mMap->setCellPrefix(cell->getCell()->mName);
+            mHud->setCellPrefix(cell->getCell()->mName);
 
             osg::Vec3f worldPos;
             if (!MWBase::Environment::get().getWorld()->findInteriorPositionInWorldSpace(cell, worldPos))
@@ -941,8 +964,8 @@ namespace MWGui
 
     void WindowManager::setActiveMap(int x, int y, bool interior)
     {
-        mMap->setActiveCell(x,y, interior);
-        mHud->setActiveCell(x,y, interior);
+        mMap->setActiveCell(x, y, interior);
+        mHud->setActiveCell(x, y, interior);
     }
 
     void WindowManager::setDrowningBarVisibility(bool visible)
@@ -952,12 +975,12 @@ namespace MWGui
 
     void WindowManager::setHMSVisibility(bool visible)
     {
-        mHud->setHmsVisible (visible);
+        mHud->setHmsVisible(visible);
     }
 
     void WindowManager::setMinimapVisibility(bool visible)
     {
-        mHud->setMinimapVisible (visible);
+        mHud->setMinimapVisible(visible);
     }
 
     bool WindowManager::toggleFogOfWar()
@@ -970,7 +993,7 @@ namespace MWGui
     {
         mToolTips->setFocusObject(focus);
 
-        if(mHud && (mShowOwned == 2 || mShowOwned == 3))
+        if (mHud && (mShowOwned == 2 || mShowOwned == 3))
         {
             bool owned = mToolTips->checkOwned();
             mHud->setCrosshairOwned(owned);
@@ -994,13 +1017,13 @@ namespace MWGui
 
     void WindowManager::setWeaponVisibility(bool visible)
     {
-        mHud->setWeapVisible (visible);
+        mHud->setWeapVisible(visible);
     }
 
     void WindowManager::setSpellVisibility(bool visible)
     {
-        mHud->setSpellVisible (visible);
-        mHud->setEffectVisible (visible);
+        mHud->setSpellVisible(visible);
+        mHud->setEffectVisible(visible);
     }
 
     void WindowManager::setSneakVisibility(bool visible)
@@ -1027,21 +1050,21 @@ namespace MWGui
     void WindowManager::onRetrieveTag(const MyGUI::UString& _tag, MyGUI::UString& _result)
     {
         std::string tag(_tag);
-        
+
         std::string MyGuiPrefix = "setting=";
         size_t MyGuiPrefixLength = MyGuiPrefix.length();
 
         std::string tokenToFind = "sCell=";
         size_t tokenLength = tokenToFind.length();
-        
-        if(tag.compare(0, MyGuiPrefixLength, MyGuiPrefix) == 0)
+
+        if (tag.compare(0, MyGuiPrefixLength, MyGuiPrefix) == 0)
         {
             tag = tag.substr(MyGuiPrefixLength, tag.length());
             size_t comma_pos = tag.find(',');
             std::string settingSection = tag.substr(0, comma_pos);
-            std::string settingTag = tag.substr(comma_pos+1, tag.length());
-            
-            _result = Settings::Manager::getString(settingTag, settingSection);            
+            std::string settingTag = tag.substr(comma_pos + 1, tag.length());
+
+            _result = Settings::Manager::getString(settingTag, settingSection);
         }
         else if (tag.compare(0, tokenLength, tokenToFind) == 0)
         {
@@ -1070,13 +1093,14 @@ namespace MWGui
             // If not, treat is as GMST name from legacy localization
             if (!mStore)
             {
-                Log(Debug::Error) << "Error: WindowManager::onRetrieveTag: no Store set up yet, can not replace '" << tag << "'";
+                Log(Debug::Error) << "Error: WindowManager::onRetrieveTag: no Store set up yet, can not replace '"
+                                  << tag << "'";
                 _result = tag;
                 return;
             }
-            const ESM::GameSetting *setting = mStore->get<ESM::GameSetting>().search(tag);
+            const ESM::GameSetting* setting = mStore->get<ESM::GameSetting>().search(tag);
 
-            if (setting && setting->mValue.getType()==ESM::VT_String)
+            if (setting && setting->mValue.getType() == ESM::VT_String)
                 _result = setting->mValue.getString();
             else
                 _result = tag;
@@ -1091,31 +1115,29 @@ namespace MWGui
         for (const auto& setting : changed)
         {
             if (setting.first == "HUD" && setting.second == "crosshair")
-                mCrosshairEnabled = Settings::Manager::getBool ("crosshair", "HUD");
+                mCrosshairEnabled = Settings::Manager::getBool("crosshair", "HUD");
             else if (setting.first == "GUI" && setting.second == "subtitles")
-                mSubtitlesEnabled = Settings::Manager::getBool ("subtitles", "GUI");
+                mSubtitlesEnabled = Settings::Manager::getBool("subtitles", "GUI");
             else if (setting.first == "GUI" && setting.second == "menu transparency")
                 setMenuTransparency(Settings::Manager::getFloat("menu transparency", "GUI"));
-            else if (setting.first == "Video" && (
-                    setting.second == "resolution x"
-                    || setting.second == "resolution y"
-                    || setting.second == "window mode"
-                    || setting.second == "window border"))
+            else if (setting.first == "Video"
+                && (setting.second == "resolution x" || setting.second == "resolution y"
+                    || setting.second == "window mode" || setting.second == "window border"))
                 changeRes = true;
 
             else if (setting.first == "Video" && setting.second == "vsync")
                 mVideoWrapper->setSyncToVBlank(Settings::Manager::getBool("vsync", "Video"));
             else if (setting.first == "Video" && (setting.second == "gamma" || setting.second == "contrast"))
-                mVideoWrapper->setGammaContrast(Settings::Manager::getFloat("gamma", "Video"),
-                                                Settings::Manager::getFloat("contrast", "Video"));
+                mVideoWrapper->setGammaContrast(
+                    Settings::Manager::getFloat("gamma", "Video"), Settings::Manager::getFloat("contrast", "Video"));
         }
 
         if (changeRes)
         {
             mVideoWrapper->setVideoMode(Settings::Manager::getInt("resolution x", "Video"),
-                                        Settings::Manager::getInt("resolution y", "Video"),
-                                        static_cast<Settings::WindowMode>(Settings::Manager::getInt("window mode", "Video")),
-                                        Settings::Manager::getBool("window border", "Video"));
+                Settings::Manager::getInt("resolution y", "Video"),
+                static_cast<Settings::WindowMode>(Settings::Manager::getInt("window mode", "Video")),
+                Settings::Manager::getBool("window border", "Video"));
         }
     }
 
@@ -1125,14 +1147,12 @@ namespace MWGui
         Settings::Manager::setInt("resolution y", "Video", y);
 
         // We only want to process changes to window-size related settings.
-        Settings::CategorySettingVector filter = {{"Video", "resolution x"},
-                                                  {"Video", "resolution y"}};
+        Settings::CategorySettingVector filter = { { "Video", "resolution x" }, { "Video", "resolution y" } };
 
         // If the HUD has not been initialised, the World singleton will not be available.
         if (mHud)
         {
-            MWBase::Environment::get().getWorld()->processChangedSettings(
-                    Settings::Manager::getPendingChanges(filter));
+            MWBase::Environment::get().getWorld()->processChangedSettings(Settings::Manager::getPendingChanges(filter));
         }
 
         Settings::Manager::resetPendingChanges(filter);
@@ -1149,16 +1169,17 @@ namespace MWGui
         if (!mHud)
             return; // UI not initialized yet
 
-        for (std::map<MyGUI::Window*, std::string>::iterator it = mTrackedWindows.begin(); it != mTrackedWindows.end(); ++it)
+        for (std::map<MyGUI::Window*, std::string>::iterator it = mTrackedWindows.begin(); it != mTrackedWindows.end();
+             ++it)
         {
             std::string settingName = it->second;
             if (Settings::Manager::getBool(settingName + " maximized", "Windows"))
                 settingName += " maximized";
 
             MyGUI::IntPoint pos(static_cast<int>(Settings::Manager::getFloat(settingName + " x", "Windows") * x),
-                                static_cast<int>(Settings::Manager::getFloat(settingName + " y", "Windows") * y));
+                static_cast<int>(Settings::Manager::getFloat(settingName + " y", "Windows") * y));
             MyGUI::IntSize size(static_cast<int>(Settings::Manager::getFloat(settingName + " w", "Windows") * x),
-                                 static_cast<int>(Settings::Manager::getFloat(settingName + " h", "Windows") * y));
+                static_cast<int>(Settings::Manager::getFloat(settingName + " h", "Windows") * y));
             it->first->setPosition(pos);
             it->first->setSize(size);
         }
@@ -1184,7 +1205,7 @@ namespace MWGui
         MWBase::Environment::get().getStateManager()->requestQuit();
     }
 
-    void WindowManager::onCursorChange(const std::string &name)
+    void WindowManager::onCursorChange(const std::string& name)
     {
         mCursorManager->cursorChanged(name);
     }
@@ -1206,7 +1227,7 @@ namespace MWGui
 
     void WindowManager::pushGuiMode(GuiMode mode, const MWWorld::Ptr& arg, bool force)
     {
-        if (mode==GM_Inventory && mAllowed==GW_None)
+        if (mode == GM_Inventory && mAllowed == GW_None)
             return;
 
         if (mGuiModes.empty() || mGuiModes.back() != mode)
@@ -1227,7 +1248,7 @@ namespace MWGui
             mGuiModeStates[mode].update(true);
             playSound(mGuiModeStates[mode].mOpenSound);
         }
-        if(force)
+        if (force)
             mContainerWindow->treatNextOpenAsLoot();
         for (WindowBase* window : mGuiModeStates[mode].mWindows)
             window->setPtr(arg);
@@ -1241,7 +1262,7 @@ namespace MWGui
     {
         mViewer->getCamera()->setCullMask(mask);
 
-        // We could check whether stereo is enabled here, but these methods are 
+        // We could check whether stereo is enabled here, but these methods are
         // trivial and have no effect in mono or multiview so just call them regardless.
         mViewer->getCamera()->setCullMaskLeft(mask);
         mViewer->getCamera()->setCullMaskRight(mask);
@@ -1324,15 +1345,15 @@ namespace MWGui
     {
         mSelectedEnchantItem = item;
         mSelectedSpell.clear();
-        const ESM::Enchantment* ench = mStore->get<ESM::Enchantment>()
-                .find(item.getClass().getEnchantment(item));
+        const ESM::Enchantment* ench = mStore->get<ESM::Enchantment>().find(item.getClass().getEnchantment(item));
 
-        int chargePercent = static_cast<int>(item.getCellRef().getNormalizedEnchantmentCharge(ench->mData.mCharge) * 100);
+        int chargePercent
+            = static_cast<int>(item.getCellRef().getNormalizedEnchantmentCharge(ench->mData.mCharge) * 100);
         mHud->setSelectedEnchantItem(item, chargePercent);
         mSpellWindow->setTitle(item.getClass().getName(item));
     }
 
-    const MWWorld::Ptr &WindowManager::getSelectedEnchantItem() const
+    const MWWorld::Ptr& WindowManager::getSelectedEnchantItem() const
     {
         return mSelectedEnchantItem;
     }
@@ -1349,7 +1370,7 @@ namespace MWGui
         mInventoryWindow->setTitle(item.getClass().getName(item));
     }
 
-    const MWWorld::Ptr &WindowManager::getSelectedWeapon() const
+    const MWWorld::Ptr& WindowManager::getSelectedWeapon() const
     {
         return mSelectedWeapon;
     }
@@ -1374,14 +1395,14 @@ namespace MWGui
         mInventoryWindow->setTitle("#{sSkillHandtohand}");
     }
 
-    void WindowManager::getMousePosition(int &x, int &y)
+    void WindowManager::getMousePosition(int& x, int& y)
     {
         const MyGUI::IntPoint& pos = MyGUI::InputManager::getInstance().getMousePosition();
         x = pos.left;
         y = pos.top;
     }
 
-    void WindowManager::getMousePosition(float &x, float &y)
+    void WindowManager::getMousePosition(float& x, float& y)
     {
         const MyGUI::IntPoint& pos = MyGUI::InputManager::getInstance().getMousePosition();
         x = static_cast<float>(pos.left);
@@ -1401,36 +1422,51 @@ namespace MWGui
         return mScalingFactor;
     }
 
-    void WindowManager::executeInConsole (const std::string& path)
+    void WindowManager::executeInConsole(const std::string& path)
     {
-        mConsole->executeFile (path);
+        mConsole->executeFile(path);
     }
 
-    MWGui::InventoryWindow* WindowManager::getInventoryWindow() { return mInventoryWindow; }
-    MWGui::CountDialog* WindowManager::getCountDialog() { return mCountDialog; }
-    MWGui::ConfirmationDialog* WindowManager::getConfirmationDialog() { return mConfirmationDialog; }
-    MWGui::TradeWindow* WindowManager::getTradeWindow() { return mTradeWindow; }
-    MWGui::PostProcessorHud* WindowManager::getPostProcessorHud() { return mPostProcessorHud; }
+    MWGui::InventoryWindow* WindowManager::getInventoryWindow()
+    {
+        return mInventoryWindow;
+    }
+    MWGui::CountDialog* WindowManager::getCountDialog()
+    {
+        return mCountDialog;
+    }
+    MWGui::ConfirmationDialog* WindowManager::getConfirmationDialog()
+    {
+        return mConfirmationDialog;
+    }
+    MWGui::TradeWindow* WindowManager::getTradeWindow()
+    {
+        return mTradeWindow;
+    }
+    MWGui::PostProcessorHud* WindowManager::getPostProcessorHud()
+    {
+        return mPostProcessorHud;
+    }
 
-    void WindowManager::useItem(const MWWorld::Ptr &item, bool bypassBeastRestrictions)
+    void WindowManager::useItem(const MWWorld::Ptr& item, bool bypassBeastRestrictions)
     {
         if (mInventoryWindow)
             mInventoryWindow->useItem(item, bypassBeastRestrictions);
     }
 
-    bool WindowManager::isAllowed (GuiWindow wnd) const
+    bool WindowManager::isAllowed(GuiWindow wnd) const
     {
         return (mAllowed & wnd) != 0;
     }
 
-    void WindowManager::allow (GuiWindow wnd)
+    void WindowManager::allow(GuiWindow wnd)
     {
         mAllowed = (GuiWindow)(mAllowed | wnd);
 
         if (wnd & GW_Inventory)
         {
-            mBookWindow->setInventoryAllowed (true);
-            mScrollWindow->setInventoryAllowed (true);
+            mBookWindow->setInventoryAllowed(true);
+            mScrollWindow->setInventoryAllowed(true);
         }
 
         updateVisible();
@@ -1441,13 +1477,13 @@ namespace MWGui
         mAllowed = GW_None;
         mRestAllowed = false;
 
-        mBookWindow->setInventoryAllowed (false);
-        mScrollWindow->setInventoryAllowed (false);
+        mBookWindow->setInventoryAllowed(false);
+        mScrollWindow->setInventoryAllowed(false);
 
         updateVisible();
     }
 
-    void WindowManager::toggleVisible (GuiWindow wnd)
+    void WindowManager::toggleVisible(GuiWindow wnd)
     {
         if (getMode() != GM_Inventory)
             return;
@@ -1496,11 +1532,8 @@ namespace MWGui
 
     bool WindowManager::isGuiMode() const
     {
-        return
-            !mGuiModes.empty() ||
-            isConsoleMode() ||
-            (mPostProcessorHud && mPostProcessorHud->isVisible()) ||
-            (mMessageBoxManager && mMessageBoxManager->isInteractiveMessageBox());
+        return !mGuiModes.empty() || isConsoleMode() || (mPostProcessorHud && mPostProcessorHud->isVisible())
+            || (mMessageBoxManager && mMessageBoxManager->isInteractiveMessageBox());
     }
 
     bool WindowManager::isConsoleMode() const
@@ -1522,45 +1555,45 @@ namespace MWGui
 
     void WindowManager::disallowMouse()
     {
-        mInputBlocker->setVisible (true);
+        mInputBlocker->setVisible(true);
     }
 
     void WindowManager::allowMouse()
     {
-        mInputBlocker->setVisible (!isGuiMode ());
+        mInputBlocker->setVisible(!isGuiMode());
     }
 
-    void WindowManager::notifyInputActionBound ()
+    void WindowManager::notifyInputActionBound()
     {
-        mSettingsWindow->updateControlsBox ();
+        mSettingsWindow->updateControlsBox();
         allowMouse();
     }
 
     bool WindowManager::containsMode(GuiMode mode) const
     {
-        if(mGuiModes.empty())
+        if (mGuiModes.empty())
             return false;
 
         return std::find(mGuiModes.begin(), mGuiModes.end(), mode) != mGuiModes.end();
     }
 
-    void WindowManager::showCrosshair (bool show)
+    void WindowManager::showCrosshair(bool show)
     {
         if (mHud)
-            mHud->setCrosshairVisible (show && mCrosshairEnabled);
+            mHud->setCrosshairVisible(show && mCrosshairEnabled);
     }
 
-    void WindowManager::updateActivatedQuickKey ()
+    void WindowManager::updateActivatedQuickKey()
     {
         mQuickKeysMenu->updateActivatedQuickKey();
     }
 
-    void WindowManager::activateQuickKey (int index)
+    void WindowManager::activateQuickKey(int index)
     {
         mQuickKeysMenu->activateQuickKey(index);
     }
 
-    bool WindowManager::getSubtitlesEnabled ()
+    bool WindowManager::getSubtitlesEnabled()
     {
         return mSubtitlesEnabled;
     }
@@ -1575,13 +1608,13 @@ namespace MWGui
 
     bool WindowManager::getRestEnabled()
     {
-        //Enable rest dialogue if character creation finished
-        if(mRestAllowed==false && MWBase::Environment::get().getWorld()->getGlobalFloat ("chargenstate")==-1)
-            mRestAllowed=true;
+        // Enable rest dialogue if character creation finished
+        if (mRestAllowed == false && MWBase::Environment::get().getWorld()->getGlobalFloat("chargenstate") == -1)
+            mRestAllowed = true;
         return mRestAllowed;
     }
 
-    bool WindowManager::getPlayerSleeping ()
+    bool WindowManager::getPlayerSleeping()
     {
         return mWaitDialog->getSleeping();
     }
@@ -1593,7 +1626,7 @@ namespace MWGui
 
     void WindowManager::addVisitedLocation(const std::string& name, int x, int y)
     {
-        mMap->addVisitedLocation (name, x, y);
+        mMap->addVisitedLocation(name, x, y);
     }
 
     const Translation::Storage& WindowManager::getTranslationDataStorage() const
@@ -1601,7 +1634,7 @@ namespace MWGui
         return mTranslationDataStorage;
     }
 
-    void WindowManager::changePointer(const std::string &name)
+    void WindowManager::changePointer(const std::string& name)
     {
         MyGUI::PointerManager::getInstance().setPointer(name);
         onCursorChange(name);
@@ -1626,13 +1659,13 @@ namespace MWGui
     }
 
     // Remove this wrapper once onKeyFocusChanged call is rendered unnecessary
-    void WindowManager::setKeyFocusWidget(MyGUI::Widget *widget)
+    void WindowManager::setKeyFocusWidget(MyGUI::Widget* widget)
     {
         MyGUI::InputManager::getInstance().setKeyFocusWidget(widget);
         onKeyFocusChanged(widget);
     }
 
-    void WindowManager::onKeyFocusChanged(MyGUI::Widget *widget)
+    void WindowManager::onKeyFocusChanged(MyGUI::Widget* widget)
     {
         if (widget && widget->castType<MyGUI::EditBox>(false))
             SDL_StartTextInput();
@@ -1640,7 +1673,7 @@ namespace MWGui
             SDL_StopTextInput();
     }
 
-    void WindowManager::setEnemy(const MWWorld::Ptr &enemy)
+    void WindowManager::setEnemy(const MWWorld::Ptr& enemy)
     {
         mHud->setEnemy(enemy);
     }
@@ -1664,7 +1697,7 @@ namespace MWGui
         return mCursorVisible && mCursorActive;
     }
 
-    void WindowManager::trackWindow(Layout *layout, const std::string &name)
+    void WindowManager::trackWindow(Layout* layout, const std::string& name)
     {
         std::string settingName = name;
         MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
@@ -1672,10 +1705,12 @@ namespace MWGui
         if (isMaximized)
             settingName += " maximized";
 
-        MyGUI::IntPoint pos(static_cast<int>(Settings::Manager::getFloat(settingName + " x", "Windows") * viewSize.width),
-                            static_cast<int>(Settings::Manager::getFloat(settingName + " y", "Windows") * viewSize.height));
-        MyGUI::IntSize size (static_cast<int>(Settings::Manager::getFloat(settingName + " w", "Windows") * viewSize.width),
-                             static_cast<int>(Settings::Manager::getFloat(settingName + " h", "Windows") * viewSize.height));
+        MyGUI::IntPoint pos(
+            static_cast<int>(Settings::Manager::getFloat(settingName + " x", "Windows") * viewSize.width),
+            static_cast<int>(Settings::Manager::getFloat(settingName + " y", "Windows") * viewSize.height));
+        MyGUI::IntSize size(
+            static_cast<int>(Settings::Manager::getFloat(settingName + " w", "Windows") * viewSize.width),
+            static_cast<int>(Settings::Manager::getFloat(settingName + " h", "Windows") * viewSize.height));
         layout->mMainWidget->setPosition(pos);
         layout->mMainWidget->setSize(size);
 
@@ -1684,7 +1719,7 @@ namespace MWGui
         mTrackedWindows[window] = name;
     }
 
-    void WindowManager::toggleMaximized(Layout *layout)
+    void WindowManager::toggleMaximized(Layout* layout)
     {
         MyGUI::Window* window = layout->mMainWidget->castType<MyGUI::Window>();
         std::string setting = mTrackedWindows[window];
@@ -1704,7 +1739,7 @@ namespace MWGui
         Settings::Manager::setBool(mTrackedWindows[window] + " maximized", "Windows", maximized);
     }
 
-    void WindowManager::onWindowChangeCoord(MyGUI::Window *_sender)
+    void WindowManager::onWindowChangeCoord(MyGUI::Window* _sender)
     {
         std::string setting = mTrackedWindows[_sender];
         MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
@@ -1747,7 +1782,7 @@ namespace MWGui
         updateVisible();
     }
 
-    void WindowManager::write(ESM::ESMWriter &writer, Loading::Listener& progress)
+    void WindowManager::write(ESM::ESMWriter& writer, Loading::Listener& progress)
     {
         mMap->write(writer, progress);
 
@@ -1760,7 +1795,8 @@ namespace MWGui
             writer.endRecord(ESM::REC_ASPL);
         }
 
-        for (CustomMarkerCollection::ContainerType::const_iterator it = mCustomMarkers.begin(); it != mCustomMarkers.end(); ++it)
+        for (CustomMarkerCollection::ContainerType::const_iterator it = mCustomMarkers.begin();
+             it != mCustomMarkers.end(); ++it)
         {
             writer.startRecord(ESM::REC_MARK);
             it->second.save(writer);
@@ -1768,7 +1804,7 @@ namespace MWGui
         }
     }
 
-    void WindowManager::readRecord(ESM::ESMReader &reader, uint32_t type)
+    void WindowManager::readRecord(ESM::ESMReader& reader, uint32_t type)
     {
         if (type == ESM::REC_GMAP)
             mMap->readRecord(reader, type);
@@ -1792,22 +1828,21 @@ namespace MWGui
     int WindowManager::countSavedGameRecords() const
     {
         return 1 // Global map
-                + 1 // QuickKeysMenu
-                + mCustomMarkers.size()
-                + (!mSelectedSpell.empty() ? 1 : 0);
+            + 1 // QuickKeysMenu
+            + mCustomMarkers.size() + (!mSelectedSpell.empty() ? 1 : 0);
     }
 
     bool WindowManager::isSavingAllowed() const
     {
         return !MyGUI::InputManager::getInstance().isModalAny()
-                && !isConsoleMode()
-                // TODO: remove this, once we have properly serialized the state of open windows
-                && (!isGuiMode() || (mGuiModes.size() == 1 && (getMode() == GM_MainMenu || getMode() == GM_Rest)));
+            && !isConsoleMode()
+            // TODO: remove this, once we have properly serialized the state of open windows
+            && (!isGuiMode() || (mGuiModes.size() == 1 && (getMode() == GM_MainMenu || getMode() == GM_Rest)));
     }
 
     void WindowManager::playVideo(std::string_view name, bool allowSkipping, bool overrideSounds)
     {
-        mVideoWidget->playVideo("video\\" + std::string{name});
+        mVideoWidget->playVideo("video\\" + std::string{ name });
 
         mVideoWidget->eventKeyButtonPressed.clear();
         mVideoBackground->eventKeyButtonPressed.clear();
@@ -1831,14 +1866,16 @@ namespace MWGui
         setCursorVisible(false);
 
         if (overrideSounds && mVideoWidget->hasAudioStream())
-            MWBase::Environment::get().getSoundManager()->pauseSounds(MWSound::VideoPlayback,
-                ~MWSound::Type::Movie & MWSound::Type::Mask
-            );
+            MWBase::Environment::get().getSoundManager()->pauseSounds(
+                MWSound::VideoPlayback, ~MWSound::Type::Movie & MWSound::Type::Mask);
 
-        Misc::FrameRateLimiter frameRateLimiter = Misc::makeFrameRateLimiter(MWBase::Environment::get().getFrameRateLimit());
+        Misc::FrameRateLimiter frameRateLimiter
+            = Misc::makeFrameRateLimiter(MWBase::Environment::get().getFrameRateLimit());
         while (mVideoWidget->update() && !MWBase::Environment::get().getStateManager()->hasQuitRequest())
         {
-            const double dt = std::chrono::duration_cast<std::chrono::duration<double>>(frameRateLimiter.getLastFrameDuration()).count();
+            const double dt
+                = std::chrono::duration_cast<std::chrono::duration<double>>(frameRateLimiter.getLastFrameDuration())
+                      .count();
 
             MWBase::Environment::get().getInputManager()->update(dt, true, false);
 
@@ -1896,7 +1933,7 @@ namespace MWGui
         }
     }
 
-    void WindowManager::addCurrentModal(WindowModal *input)
+    void WindowManager::addCurrentModal(WindowModal* input)
     {
         if (mCurrentModals.empty())
             mKeyboardNavigation->saveFocus(getMode());
@@ -1910,9 +1947,9 @@ namespace MWGui
 
     void WindowManager::removeCurrentModal(WindowModal* input)
     {
-        if(!mCurrentModals.empty())
+        if (!mCurrentModals.empty())
         {
-            if(input == mCurrentModals.back())
+            if (input == mCurrentModals.back())
             {
                 mCurrentModals.pop_back();
                 mKeyboardNavigation->saveFocus(-1);
@@ -1935,7 +1972,7 @@ namespace MWGui
             mKeyboardNavigation->setModalWindow(mCurrentModals.back()->mMainWidget);
     }
 
-    void WindowManager::onVideoKeyPressed(MyGUI::Widget *_sender, MyGUI::KeyCode _key, MyGUI::Char _char)
+    void WindowManager::onVideoKeyPressed(MyGUI::Widget* _sender, MyGUI::KeyCode _key, MyGUI::Char _char)
     {
         if (_key == MyGUI::KeyCode::Escape)
             mVideoWidget->stop();
@@ -1964,20 +2001,20 @@ namespace MWGui
     {
         switch (window)
         {
-        case GW_Inventory:
-            mInventoryWindow->setPinned(true);
-            break;
-        case GW_Map:
-            mMap->setPinned(true);
-            break;
-        case GW_Magic:
-            mSpellWindow->setPinned(true);
-            break;
-        case GW_Stats:
-            mStatsWindow->setPinned(true);
-            break;
-        default:
-            break;
+            case GW_Inventory:
+                mInventoryWindow->setPinned(true);
+                break;
+            case GW_Map:
+                mMap->setPinned(true);
+                break;
+            case GW_Magic:
+                mSpellWindow->setPinned(true);
+                break;
+            case GW_Stats:
+                mStatsWindow->setPinned(true);
+                break;
+            default:
+                break;
         }
 
         updateVisible();
@@ -2031,17 +2068,17 @@ namespace MWGui
             mWerewolfFader->notifyAlphaChanged(set ? 1.0f : 0.0f);
     }
 
-    void WindowManager::onClipboardChanged(const std::string &_type, const std::string &_data)
+    void WindowManager::onClipboardChanged(const std::string& _type, const std::string& _data)
     {
         if (_type == "Text")
             SDL_SetClipboardText(MyGUI::TextIterator::getOnlyText(MyGUI::UString(_data)).asUTF8().c_str());
     }
 
-    void WindowManager::onClipboardRequested(const std::string &_type, std::string &_data)
+    void WindowManager::onClipboardRequested(const std::string& _type, std::string& _data)
     {
         if (_type != "Text")
             return;
-        char* text=nullptr;
+        char* text = nullptr;
         text = SDL_GetClipboardText();
         if (text)
             _data = MyGUI::TextIterator::toTagsString(text);
@@ -2107,7 +2144,8 @@ namespace MWGui
         if (soundId.empty())
             return;
 
-        MWBase::Environment::get().getSoundManager()->playSound(soundId, volume, pitch, MWSound::Type::Sfx, MWSound::PlayMode::NoEnvNoScaling);
+        MWBase::Environment::get().getSoundManager()->playSound(
+            soundId, volume, pitch, MWSound::Type::Sfx, MWSound::PlayMode::NoEnvNoScaling);
     }
 
     void WindowManager::updateSpellWindow()
@@ -2116,7 +2154,7 @@ namespace MWGui
             mSpellWindow->updateSpells();
     }
 
-    void WindowManager::setConsoleSelectedObject(const MWWorld::Ptr &object)
+    void WindowManager::setConsoleSelectedObject(const MWWorld::Ptr& object)
     {
         mConsole->setSelectedObject(object);
     }
@@ -2140,19 +2178,20 @@ namespace MWGui
             ResourceImageSetPointerFix* imgSetPointer = resource->castType<ResourceImageSetPointerFix>(false);
             if (!imgSetPointer)
                 continue;
-            std::string tex_name = imgSetPointer->getImageSet()->getIndexInfo(0,0).texture;
+            std::string tex_name = imgSetPointer->getImageSet()->getIndexInfo(0, 0).texture;
 
             osg::ref_ptr<osg::Image> image = mResourceSystem->getImageManager()->getImage(tex_name);
 
-            if(image.valid())
+            if (image.valid())
             {
-                //everything looks good, send it to the cursor manager
+                // everything looks good, send it to the cursor manager
                 Uint8 hotspot_x = imgSetPointer->getHotSpot().left;
                 Uint8 hotspot_y = imgSetPointer->getHotSpot().top;
                 int rotation = imgSetPointer->getRotation();
                 MyGUI::IntSize pointerSize = imgSetPointer->getSize();
 
-                mCursorManager->createCursor(imgSetPointer->getResourceName(), rotation, image, hotspot_x, hotspot_y, pointerSize.width, pointerSize.height);
+                mCursorManager->createCursor(imgSetPointer->getResourceName(), rotation, image, hotspot_x, hotspot_y,
+                    pointerSize.width, pointerSize.height);
             }
         }
     }
@@ -2163,8 +2202,8 @@ namespace MWGui
             MyGUI::ITexture* tex = MyGUI::RenderManager::getInstance().createTexture("white");
             tex->createManual(8, 8, MyGUI::TextureUsage::Write, MyGUI::PixelFormat::R8G8B8);
             unsigned char* data = reinterpret_cast<unsigned char*>(tex->lock(MyGUI::TextureUsage::Write));
-            for (int x=0; x<8; ++x)
-                for (int y=0; y<8; ++y)
+            for (int x = 0; x < 8; ++x)
+                for (int y = 0; y < 8; ++y)
                 {
                     *(data++) = 255;
                     *(data++) = 255;
@@ -2177,8 +2216,8 @@ namespace MWGui
             MyGUI::ITexture* tex = MyGUI::RenderManager::getInstance().createTexture("black");
             tex->createManual(8, 8, MyGUI::TextureUsage::Write, MyGUI::PixelFormat::R8G8B8);
             unsigned char* data = reinterpret_cast<unsigned char*>(tex->lock(MyGUI::TextureUsage::Write));
-            for (int x=0; x<8; ++x)
-                for (int y=0; y<8; ++y)
+            for (int x = 0; x < 8; ++x)
+                for (int y = 0; y < 8; ++y)
                 {
                     *(data++) = 0;
                     *(data++) = 0;
@@ -2198,13 +2237,13 @@ namespace MWGui
     {
         MyGUI::ITexture* tex = MyGUI::RenderManager::getInstance().getTexture("transparent");
         unsigned char* data = reinterpret_cast<unsigned char*>(tex->lock(MyGUI::TextureUsage::Write));
-        for (int x=0; x<8; ++x)
-            for (int y=0; y<8; ++y)
+        for (int x = 0; x < 8; ++x)
+            for (int y = 0; y < 8; ++y)
             {
                 *(data++) = 255;
                 *(data++) = 255;
                 *(data++) = 255;
-                *(data++) = static_cast<unsigned char>(value*255);
+                *(data++) = static_cast<unsigned char>(value * 255);
             }
         tex->unlock();
     }
@@ -2214,12 +2253,12 @@ namespace MWGui
         mLocalMapRender->addCell(cell);
     }
 
-    void WindowManager::removeCell(MWWorld::CellStore *cell)
+    void WindowManager::removeCell(MWWorld::CellStore* cell)
     {
         mLocalMapRender->removeCell(cell);
     }
 
-    void WindowManager::writeFog(MWWorld::CellStore *cell)
+    void WindowManager::writeFog(MWWorld::CellStore* cell)
     {
         mLocalMapRender->saveFogOfWar(cell);
     }
@@ -2242,16 +2281,16 @@ namespace MWGui
             {
                 switch (key.getValue())
                 {
-                case MyGUI::KeyCode::ArrowDown:
-                case MyGUI::KeyCode::ArrowUp:
-                case MyGUI::KeyCode::ArrowLeft:
-                case MyGUI::KeyCode::ArrowRight:
-                case MyGUI::KeyCode::Return:
-                case MyGUI::KeyCode::NumpadEnter:
-                case MyGUI::KeyCode::Space:
-                    return true;
-                default:
-                    return false;
+                    case MyGUI::KeyCode::ArrowDown:
+                    case MyGUI::KeyCode::ArrowUp:
+                    case MyGUI::KeyCode::ArrowLeft:
+                    case MyGUI::KeyCode::ArrowRight:
+                    case MyGUI::KeyCode::Return:
+                    case MyGUI::KeyCode::NumpadEnter:
+                    case MyGUI::KeyCode::Space:
+                        return true;
+                    default:
+                        return false;
                 }
             }
             return false;
@@ -2296,7 +2335,7 @@ namespace MWGui
 
     void WindowManager::onDeleteCustomData(const MWWorld::Ptr& ptr)
     {
-        for(const auto& window : mWindows)
+        for (const auto& window : mWindows)
             window->onDeleteCustomData(ptr);
     }
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 162f3403aa..773f670d1e 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -7,9 +7,9 @@
    and retrieving information from the Gui.
 **/
 
+#include <memory>
 #include <stack>
 #include <vector>
-#include <memory>
 
 #include <osg/ref_ptr>
 
@@ -88,492 +88,504 @@ namespace Gui
 
 namespace MWGui
 {
-  class HUD;
-  class MapWindow;
-  class MainMenu;
-  class StatsWindow;
-  class InventoryWindow;
-  struct JournalWindow;
-  class TextInputDialog;
-  class InfoBoxDialog;
-  class SettingsWindow;
-  class AlchemyWindow;
-  class QuickKeysMenu;
-  class LoadingScreen;
-  class LevelupDialog;
-  class WaitDialog;
-  class SpellCreationDialog;
-  class EnchantingDialog;
-  class TrainingWindow;
-  class SpellIcons;
-  class MerchantRepair;
-  class Recharge;
-  class CompanionWindow;
-  class VideoWidget;
-  class WindowModal;
-  class ScreenFader;
-  class DebugWindow;
-  class PostProcessorHud;
-  class JailScreen;
-  class KeyboardNavigation;
-
-  class WindowManager :
-      public MWBase::WindowManager
-  {
-  public:
-    typedef std::pair<std::string, int> Faction;
-    typedef std::vector<Faction> FactionList;
-
-    WindowManager(SDL_Window* window, osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
-                  const std::filesystem::path& logpath, bool consoleOnlyScripts, Translation::Storage& translationDataStorage,
-                  ToUTF8::FromType encoding, const std::string& versionDescription, bool useShaders);
-    virtual ~WindowManager();
-
-    /// Set the ESMStore to use for retrieving of GUI-related strings.
-    void setStore (const MWWorld::ESMStore& store);
-
-    void initUI();
-
-    Loading::Listener* getLoadingScreen() override;
-
-    /// @note This method will block until the video finishes playing
-    /// (and will continually update the window while doing so)
-    void playVideo(std::string_view name, bool allowSkipping, bool overrideSounds = true) override;
-
-    /// Warning: do not use MyGUI::InputManager::setKeyFocusWidget directly. Instead use this.
-    void setKeyFocusWidget (MyGUI::Widget* widget) override;
-
-    void setNewGame(bool newgame) override;
-
-    void pushGuiMode(GuiMode mode, const MWWorld::Ptr& arg) override;
-    void pushGuiMode (GuiMode mode) override;
-    void popGuiMode(bool noSound=false) override;
-    void removeGuiMode(GuiMode mode, bool noSound=false) override; ///< can be anywhere in the stack
-
-    void goToJail(int days) override;
-
-    GuiMode getMode() const override;
-    bool containsMode(GuiMode mode) const override;
-
-    bool isGuiMode() const override;
-
-    bool isConsoleMode() const override;
-
-    bool isPostProcessorHudVisible() const override;
-
-    void toggleVisible(GuiWindow wnd) override;
-
-    void forceHide(MWGui::GuiWindow wnd) override;
-    void unsetForceHide(MWGui::GuiWindow wnd) override;
-
-    /// Disallow all inventory mode windows
-    void disallowAll() override;
-
-    /// Allow one or more windows
-    void allow(GuiWindow wnd) override;
-
-    bool isAllowed(GuiWindow wnd) const override;
-
-    /// \todo investigate, if we really need to expose every single lousy UI element to the outside world
-    MWGui::InventoryWindow* getInventoryWindow() override;
-    MWGui::CountDialog* getCountDialog() override;
-    MWGui::ConfirmationDialog* getConfirmationDialog() override;
-    MWGui::TradeWindow* getTradeWindow() override;
-    const std::vector<std::unique_ptr<MWGui::MessageBox>>& getActiveMessageBoxes() const override;
-    MWGui::PostProcessorHud* getPostProcessorHud() override;
-
-    /// Make the player use an item, while updating GUI state accordingly
-    void useItem(const MWWorld::Ptr& item, bool bypassBeastRestrictions=false) override;
-
-    void updateSpellWindow() override;
-
-    void setConsoleSelectedObject(const MWWorld::Ptr& object) override;
-    void printToConsole(const std::string& msg, std::string_view color) override;
-    void setConsoleMode(const std::string& mode) override;
-
-    /// Set time left for the player to start drowning (update the drowning bar)
-    /// @param time time left to start drowning
-    /// @param maxTime how long we can be underwater (in total) until drowning starts
-    void setDrowningTimeLeft (float time, float maxTime) override;
+    class HUD;
+    class MapWindow;
+    class MainMenu;
+    class StatsWindow;
+    class InventoryWindow;
+    struct JournalWindow;
+    class TextInputDialog;
+    class InfoBoxDialog;
+    class SettingsWindow;
+    class AlchemyWindow;
+    class QuickKeysMenu;
+    class LoadingScreen;
+    class LevelupDialog;
+    class WaitDialog;
+    class SpellCreationDialog;
+    class EnchantingDialog;
+    class TrainingWindow;
+    class SpellIcons;
+    class MerchantRepair;
+    class Recharge;
+    class CompanionWindow;
+    class VideoWidget;
+    class WindowModal;
+    class ScreenFader;
+    class DebugWindow;
+    class PostProcessorHud;
+    class JailScreen;
+    class KeyboardNavigation;
+
+    class WindowManager : public MWBase::WindowManager
+    {
+    public:
+        typedef std::pair<std::string, int> Faction;
+        typedef std::vector<Faction> FactionList;
 
-    void changeCell(const MWWorld::CellStore* cell) override; ///< change the active cell
+        WindowManager(SDL_Window* window, osgViewer::Viewer* viewer, osg::Group* guiRoot,
+            Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
+            const std::filesystem::path& logpath, bool consoleOnlyScripts, Translation::Storage& translationDataStorage,
+            ToUTF8::FromType encoding, const std::string& versionDescription, bool useShaders);
+        virtual ~WindowManager();
 
-    void setFocusObject(const MWWorld::Ptr& focus) override;
-    void setFocusObjectScreenCoords(float min_x, float min_y, float max_x, float max_y) override;
+        /// Set the ESMStore to use for retrieving of GUI-related strings.
+        void setStore(const MWWorld::ESMStore& store);
 
-    void getMousePosition(int &x, int &y) override;
-    void getMousePosition(float &x, float &y) override;
-    void setDragDrop(bool dragDrop) override;
-    bool getWorldMouseOver() override;
+        void initUI();
 
-    float getScalingFactor() const override;
+        Loading::Listener* getLoadingScreen() override;
 
-    bool toggleFogOfWar() override;
-    bool toggleFullHelp() override; ///< show extra info in item tooltips (owner, script)
-    bool getFullHelp() const override;
+        /// @note This method will block until the video finishes playing
+        /// (and will continually update the window while doing so)
+        void playVideo(std::string_view name, bool allowSkipping, bool overrideSounds = true) override;
 
-    void setActiveMap(int x, int y, bool interior) override;
-    ///< set the indices of the map texture that should be used
+        /// Warning: do not use MyGUI::InputManager::setKeyFocusWidget directly. Instead use this.
+        void setKeyFocusWidget(MyGUI::Widget* widget) override;
 
-    /// sets the visibility of the drowning bar
-    void setDrowningBarVisibility(bool visible) override;
+        void setNewGame(bool newgame) override;
 
-    // sets the visibility of the hud health/magicka/stamina bars
-    void setHMSVisibility(bool visible) override;
-    // sets the visibility of the hud minimap
-    void setMinimapVisibility(bool visible) override;
-    void setWeaponVisibility(bool visible) override;
-    void setSpellVisibility(bool visible) override;
-    void setSneakVisibility(bool visible) override;
+        void pushGuiMode(GuiMode mode, const MWWorld::Ptr& arg) override;
+        void pushGuiMode(GuiMode mode) override;
+        void popGuiMode(bool noSound = false) override;
+        void removeGuiMode(GuiMode mode, bool noSound = false) override; ///< can be anywhere in the stack
 
-    /// activate selected quick key
-    void activateQuickKey (int index) override;
-    /// update activated quick key state (if action executing was delayed for some reason)
-    void updateActivatedQuickKey () override;
+        void goToJail(int days) override;
 
-    const std::string& getSelectedSpell() override { return mSelectedSpell; }
-    void setSelectedSpell(const std::string& spellId, int successChancePercent) override;
-    void setSelectedEnchantItem(const MWWorld::Ptr& item) override;
-    const MWWorld::Ptr& getSelectedEnchantItem() const override;
-    void setSelectedWeapon(const MWWorld::Ptr& item) override;
-    const MWWorld::Ptr& getSelectedWeapon() const override;
-    int getFontHeight() const override;
-    void unsetSelectedSpell() override;
-    void unsetSelectedWeapon() override;
+        GuiMode getMode() const override;
+        bool containsMode(GuiMode mode) const override;
 
-    void updateConsoleObjectPtr(const MWWorld::Ptr& currentPtr, const MWWorld::Ptr& newPtr) override;
+        bool isGuiMode() const override;
 
-    void showCrosshair(bool show) override;
-    bool getSubtitlesEnabled() override;
+        bool isConsoleMode() const override;
 
-    /// Turn visibility of HUD on or off
-    bool toggleHud() override;
+        bool isPostProcessorHudVisible() const override;
 
-    void disallowMouse() override;
-    void allowMouse() override;
-    void notifyInputActionBound() override;
+        void toggleVisible(GuiWindow wnd) override;
 
-    void addVisitedLocation(const std::string& name, int x, int y) override;
+        void forceHide(MWGui::GuiWindow wnd) override;
+        void unsetForceHide(MWGui::GuiWindow wnd) override;
 
-    ///Hides dialog and schedules dialog to be deleted.
-    void removeDialog(std::unique_ptr<Layout>&& dialog) override;
+        /// Disallow all inventory mode windows
+        void disallowAll() override;
 
-    ///Gracefully attempts to exit the topmost GUI mode
-    void exitCurrentGuiMode() override;
+        /// Allow one or more windows
+        void allow(GuiWindow wnd) override;
 
-    void messageBox(std::string_view message, enum MWGui::ShowInDialogueMode showInDialogueMode = MWGui::ShowInDialogueMode_IfPossible) override;
-    void scheduleMessageBox (std::string message, enum MWGui::ShowInDialogueMode showInDialogueMode = MWGui::ShowInDialogueMode_IfPossible) override;
-    void staticMessageBox(std::string_view message) override;
-    void removeStaticMessageBox() override;
-    void interactiveMessageBox(std::string_view message, const std::vector<std::string>& buttons = {}, bool block = false) override;
+        bool isAllowed(GuiWindow wnd) const override;
 
-    int readPressedButton () override; ///< returns the index of the pressed button or -1 if no button was pressed (->MessageBoxmanager->InteractiveMessageBox)
+        /// \todo investigate, if we really need to expose every single lousy UI element to the outside world
+        MWGui::InventoryWindow* getInventoryWindow() override;
+        MWGui::CountDialog* getCountDialog() override;
+        MWGui::ConfirmationDialog* getConfirmationDialog() override;
+        MWGui::TradeWindow* getTradeWindow() override;
+        const std::vector<std::unique_ptr<MWGui::MessageBox>>& getActiveMessageBoxes() const override;
+        MWGui::PostProcessorHud* getPostProcessorHud() override;
 
-    void update (float duration);
+        /// Make the player use an item, while updating GUI state accordingly
+        void useItem(const MWWorld::Ptr& item, bool bypassBeastRestrictions = false) override;
 
-    /**
-     * Fetches a GMST string from the store, if there is no setting with the given
-     * ID or it is not a string the default string is returned.
-     *
-     * @param id Identifier for the GMST setting, e.g. "aName"
-     * @param default Default value if the GMST setting cannot be used.
-     */
-    std::string_view getGameSettingString(std::string_view id, std::string_view default_) override;
+        void updateSpellWindow() override;
 
-    void processChangedSettings(const Settings::CategorySettingVector& changed) override;
+        void setConsoleSelectedObject(const MWWorld::Ptr& object) override;
+        void printToConsole(const std::string& msg, std::string_view color) override;
+        void setConsoleMode(const std::string& mode) override;
 
-    void windowVisibilityChange(bool visible) override;
-    void windowResized(int x, int y) override;
-    void windowClosed() override;
-    bool isWindowVisible() override;
+        /// Set time left for the player to start drowning (update the drowning bar)
+        /// @param time time left to start drowning
+        /// @param maxTime how long we can be underwater (in total) until drowning starts
+        void setDrowningTimeLeft(float time, float maxTime) override;
 
-    void watchActor(const MWWorld::Ptr& ptr) override;
-    MWWorld::Ptr getWatchedActor() const override;
+        void changeCell(const MWWorld::CellStore* cell) override; ///< change the active cell
 
-    void executeInConsole (const std::string& path) override;
+        void setFocusObject(const MWWorld::Ptr& focus) override;
+        void setFocusObjectScreenCoords(float min_x, float min_y, float max_x, float max_y) override;
 
-    void enableRest() override { mRestAllowed = true; }
-    bool getRestEnabled() override;
+        void getMousePosition(int& x, int& y) override;
+        void getMousePosition(float& x, float& y) override;
+        void setDragDrop(bool dragDrop) override;
+        bool getWorldMouseOver() override;
 
-    bool getJournalAllowed() override { return (mAllowed & GW_Magic) != 0; }
+        float getScalingFactor() const override;
 
-    bool getPlayerSleeping() override;
-    void wakeUpPlayer() override;
+        bool toggleFogOfWar() override;
+        bool toggleFullHelp() override; ///< show extra info in item tooltips (owner, script)
+        bool getFullHelp() const override;
 
-    void updatePlayer() override;
+        void setActiveMap(int x, int y, bool interior) override;
+        ///< set the indices of the map texture that should be used
 
-    void showSoulgemDialog (MWWorld::Ptr item) override;
+        /// sets the visibility of the drowning bar
+        void setDrowningBarVisibility(bool visible) override;
 
-    void changePointer (const std::string& name) override;
+        // sets the visibility of the hud health/magicka/stamina bars
+        void setHMSVisibility(bool visible) override;
+        // sets the visibility of the hud minimap
+        void setMinimapVisibility(bool visible) override;
+        void setWeaponVisibility(bool visible) override;
+        void setSpellVisibility(bool visible) override;
+        void setSneakVisibility(bool visible) override;
 
-    void setEnemy (const MWWorld::Ptr& enemy) override;
+        /// activate selected quick key
+        void activateQuickKey(int index) override;
+        /// update activated quick key state (if action executing was delayed for some reason)
+        void updateActivatedQuickKey() override;
 
-    int getMessagesCount() const override;
+        const std::string& getSelectedSpell() override { return mSelectedSpell; }
+        void setSelectedSpell(const std::string& spellId, int successChancePercent) override;
+        void setSelectedEnchantItem(const MWWorld::Ptr& item) override;
+        const MWWorld::Ptr& getSelectedEnchantItem() const override;
+        void setSelectedWeapon(const MWWorld::Ptr& item) override;
+        const MWWorld::Ptr& getSelectedWeapon() const override;
+        int getFontHeight() const override;
+        void unsetSelectedSpell() override;
+        void unsetSelectedWeapon() override;
 
-    const Translation::Storage& getTranslationDataStorage() const override;
+        void updateConsoleObjectPtr(const MWWorld::Ptr& currentPtr, const MWWorld::Ptr& newPtr) override;
 
-    void onSoulgemDialogButtonPressed (int button);
+        void showCrosshair(bool show) override;
+        bool getSubtitlesEnabled() override;
 
-    bool getCursorVisible() override;
+        /// Turn visibility of HUD on or off
+        bool toggleHud() override;
 
-    /// Call when mouse cursor or buttons are used.
-    void setCursorActive(bool active) override;
+        void disallowMouse() override;
+        void allowMouse() override;
+        void notifyInputActionBound() override;
 
-    /// Clear all savegame-specific data
-    void clear() override;
+        void addVisitedLocation(const std::string& name, int x, int y) override;
 
-    void write (ESM::ESMWriter& writer, Loading::Listener& progress) override;
-    void readRecord (ESM::ESMReader& reader, uint32_t type) override;
-    int countSavedGameRecords() const override;
+        /// Hides dialog and schedules dialog to be deleted.
+        void removeDialog(std::unique_ptr<Layout>&& dialog) override;
 
-    /// Does the current stack of GUI-windows permit saving?
-    bool isSavingAllowed() const override;
+        /// Gracefully attempts to exit the topmost GUI mode
+        void exitCurrentGuiMode() override;
 
-    /// Send exit command to active Modal window **/
-    void exitCurrentModal() override;
+        void messageBox(std::string_view message,
+            enum MWGui::ShowInDialogueMode showInDialogueMode = MWGui::ShowInDialogueMode_IfPossible) override;
+        void scheduleMessageBox(std::string message,
+            enum MWGui::ShowInDialogueMode showInDialogueMode = MWGui::ShowInDialogueMode_IfPossible) override;
+        void staticMessageBox(std::string_view message) override;
+        void removeStaticMessageBox() override;
+        void interactiveMessageBox(
+            std::string_view message, const std::vector<std::string>& buttons = {}, bool block = false) override;
 
-    /// Sets the current Modal
-    /** Used to send exit command to active Modal when Esc is pressed **/
-    void addCurrentModal(WindowModal* input) override;
+        int readPressedButton() override; ///< returns the index of the pressed button or -1 if no button was pressed
+                                          ///< (->MessageBoxmanager->InteractiveMessageBox)
 
-    /// Removes the top Modal
-    /** Used when one Modal adds another Modal
-        \param input Pointer to the current modal, to ensure proper modal is removed **/
-    void removeCurrentModal(WindowModal* input) override;
+        void update(float duration);
 
-    void pinWindow (MWGui::GuiWindow window) override;
-    void toggleMaximized(Layout *layout) override;
+        /**
+         * Fetches a GMST string from the store, if there is no setting with the given
+         * ID or it is not a string the default string is returned.
+         *
+         * @param id Identifier for the GMST setting, e.g. "aName"
+         * @param default Default value if the GMST setting cannot be used.
+         */
+        std::string_view getGameSettingString(std::string_view id, std::string_view default_) override;
 
-    /// Fade the screen in, over \a time seconds
-    void fadeScreenIn(const float time, bool clearQueue, float delay) override;
-    /// Fade the screen out to black, over \a time seconds
-    void fadeScreenOut(const float time, bool clearQueue, float delay) override;
-    /// Fade the screen to a specified percentage of black, over \a time seconds
-    void fadeScreenTo(const int percent, const float time, bool clearQueue, float delay) override;
-    /// Darken the screen to a specified percentage
-    void setBlindness(const int percent) override;
+        void processChangedSettings(const Settings::CategorySettingVector& changed) override;
 
-    void activateHitOverlay(bool interrupt) override;
-    void setWerewolfOverlay(bool set) override;
+        void windowVisibilityChange(bool visible) override;
+        void windowResized(int x, int y) override;
+        void windowClosed() override;
+        bool isWindowVisible() override;
 
-    void toggleConsole() override;
-    void toggleDebugWindow() override;
-    void togglePostProcessorHud() override;
+        void watchActor(const MWWorld::Ptr& ptr) override;
+        MWWorld::Ptr getWatchedActor() const override;
 
-    /// Cycle to next or previous spell
-    void cycleSpell(bool next) override;
-    /// Cycle to next or previous weapon
-    void cycleWeapon(bool next) override;
+        void executeInConsole(const std::string& path) override;
 
-    void playSound(std::string_view soundId, float volume = 1.f, float pitch = 1.f) override;
+        void enableRest() override { mRestAllowed = true; }
+        bool getRestEnabled() override;
 
-    void addCell(MWWorld::CellStore* cell) override;
-    void removeCell(MWWorld::CellStore* cell) override;
-    void writeFog(MWWorld::CellStore* cell) override;
+        bool getJournalAllowed() override { return (mAllowed & GW_Magic) != 0; }
 
-    const MWGui::TextColours& getTextColours() override;
+        bool getPlayerSleeping() override;
+        void wakeUpPlayer() override;
 
-    bool injectKeyPress(MyGUI::KeyCode key, unsigned int text, bool repeat=false) override;
-    bool injectKeyRelease(MyGUI::KeyCode key) override;
+        void updatePlayer() override;
 
-    const std::string& getVersionDescription() const override;
+        void showSoulgemDialog(MWWorld::Ptr item) override;
 
-    void onDeleteCustomData(const MWWorld::Ptr& ptr) override;
-    void forceLootMode(const MWWorld::Ptr& ptr) override;
+        void changePointer(const std::string& name) override;
 
-    void asyncPrepareSaveMap() override;
+        void setEnemy(const MWWorld::Ptr& enemy) override;
 
-  private:
-    unsigned int mOldUpdateMask; unsigned int mOldCullMask;
+        int getMessagesCount() const override;
 
-    const MWWorld::ESMStore* mStore;
-    Resource::ResourceSystem* mResourceSystem;
-    osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
+        const Translation::Storage& getTranslationDataStorage() const override;
 
-    std::unique_ptr<osgMyGUI::Platform> mGuiPlatform;
-    osgViewer::Viewer* mViewer;
+        void onSoulgemDialogButtonPressed(int button);
 
-    std::unique_ptr<Gui::FontLoader> mFontLoader;
-    std::unique_ptr<StatsWatcher> mStatsWatcher;
+        bool getCursorVisible() override;
 
-    bool mConsoleOnlyScripts;
+        /// Call when mouse cursor or buttons are used.
+        void setCursorActive(bool active) override;
 
-    std::map<MyGUI::Window*, std::string> mTrackedWindows;
-    void trackWindow(Layout* layout, const std::string& name);
-    void onWindowChangeCoord(MyGUI::Window* _sender);
+        /// Clear all savegame-specific data
+        void clear() override;
 
-    std::string mSelectedSpell;
-    MWWorld::Ptr mSelectedEnchantItem;
-    MWWorld::Ptr mSelectedWeapon;
+        void write(ESM::ESMWriter& writer, Loading::Listener& progress) override;
+        void readRecord(ESM::ESMReader& reader, uint32_t type) override;
+        int countSavedGameRecords() const override;
 
-    std::vector<WindowModal*> mCurrentModals;
+        /// Does the current stack of GUI-windows permit saving?
+        bool isSavingAllowed() const override;
 
-    // Markers placed manually by the player. Must be shared between both map views (the HUD map and the map window).
-    CustomMarkerCollection mCustomMarkers;
+        /// Send exit command to active Modal window **/
+        void exitCurrentModal() override;
 
-    HUD *mHud;
-    MapWindow *mMap;
-    std::unique_ptr<MWRender::LocalMap> mLocalMapRender;
-    std::unique_ptr<ToolTips> mToolTips;
-    StatsWindow *mStatsWindow;
-    std::unique_ptr<MessageBoxManager> mMessageBoxManager;
-    Console *mConsole;
-    DialogueWindow *mDialogueWindow;
-    std::unique_ptr<DragAndDrop> mDragAndDrop;
-    InventoryWindow *mInventoryWindow;
-    ScrollWindow* mScrollWindow;
-    BookWindow* mBookWindow;
-    CountDialog* mCountDialog;
-    TradeWindow* mTradeWindow;
-    SettingsWindow* mSettingsWindow;
-    ConfirmationDialog* mConfirmationDialog;
-    SpellWindow* mSpellWindow;
-    QuickKeysMenu* mQuickKeysMenu;
-    LoadingScreen* mLoadingScreen;
-    WaitDialog* mWaitDialog;
-    std::unique_ptr<SoulgemDialog> mSoulgemDialog;
-    MyGUI::ImageBox* mVideoBackground;
-    VideoWidget* mVideoWidget;
-    ScreenFader* mWerewolfFader;
-    ScreenFader* mBlindnessFader;
-    ScreenFader* mHitFader;
-    ScreenFader* mScreenFader;
-    DebugWindow* mDebugWindow;
-    PostProcessorHud* mPostProcessorHud;
-    JailScreen* mJailScreen;
-    ContainerWindow* mContainerWindow;
-
-    std::vector<std::unique_ptr<WindowBase>> mWindows;
-
-    Translation::Storage& mTranslationDataStorage;
-
-    std::unique_ptr<CharacterCreation> mCharGen;
+        /// Sets the current Modal
+        /** Used to send exit command to active Modal when Esc is pressed **/
+        void addCurrentModal(WindowModal* input) override;
 
-    MyGUI::Widget* mInputBlocker;
+        /// Removes the top Modal
+        /** Used when one Modal adds another Modal
+            \param input Pointer to the current modal, to ensure proper modal is removed **/
+        void removeCurrentModal(WindowModal* input) override;
 
-    bool mCrosshairEnabled;
-    bool mSubtitlesEnabled;
-    bool mHitFaderEnabled;
-    bool mWerewolfOverlayEnabled;
-    bool mHudEnabled;
-    bool mCursorVisible;
-    bool mCursorActive;
+        void pinWindow(MWGui::GuiWindow window) override;
+        void toggleMaximized(Layout* layout) override;
 
-    int mPlayerBounty;
+        /// Fade the screen in, over \a time seconds
+        void fadeScreenIn(const float time, bool clearQueue, float delay) override;
+        /// Fade the screen out to black, over \a time seconds
+        void fadeScreenOut(const float time, bool clearQueue, float delay) override;
+        /// Fade the screen to a specified percentage of black, over \a time seconds
+        void fadeScreenTo(const int percent, const float time, bool clearQueue, float delay) override;
+        /// Darken the screen to a specified percentage
+        void setBlindness(const int percent) override;
 
-    void setCursorVisible(bool visible) override;
+        void activateHitOverlay(bool interrupt) override;
+        void setWerewolfOverlay(bool set) override;
 
-    std::unique_ptr<MyGUI::Gui> mGui; // Gui
+        void toggleConsole() override;
+        void toggleDebugWindow() override;
+        void togglePostProcessorHud() override;
 
-    struct GuiModeState
-    {
-        GuiModeState(WindowBase* window)
+        /// Cycle to next or previous spell
+        void cycleSpell(bool next) override;
+        /// Cycle to next or previous weapon
+        void cycleWeapon(bool next) override;
+
+        void playSound(std::string_view soundId, float volume = 1.f, float pitch = 1.f) override;
+
+        void addCell(MWWorld::CellStore* cell) override;
+        void removeCell(MWWorld::CellStore* cell) override;
+        void writeFog(MWWorld::CellStore* cell) override;
+
+        const MWGui::TextColours& getTextColours() override;
+
+        bool injectKeyPress(MyGUI::KeyCode key, unsigned int text, bool repeat = false) override;
+        bool injectKeyRelease(MyGUI::KeyCode key) override;
+
+        const std::string& getVersionDescription() const override;
+
+        void onDeleteCustomData(const MWWorld::Ptr& ptr) override;
+        void forceLootMode(const MWWorld::Ptr& ptr) override;
+
+        void asyncPrepareSaveMap() override;
+
+    private:
+        unsigned int mOldUpdateMask;
+        unsigned int mOldCullMask;
+
+        const MWWorld::ESMStore* mStore;
+        Resource::ResourceSystem* mResourceSystem;
+        osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
+
+        std::unique_ptr<osgMyGUI::Platform> mGuiPlatform;
+        osgViewer::Viewer* mViewer;
+
+        std::unique_ptr<Gui::FontLoader> mFontLoader;
+        std::unique_ptr<StatsWatcher> mStatsWatcher;
+
+        bool mConsoleOnlyScripts;
+
+        std::map<MyGUI::Window*, std::string> mTrackedWindows;
+        void trackWindow(Layout* layout, const std::string& name);
+        void onWindowChangeCoord(MyGUI::Window* _sender);
+
+        std::string mSelectedSpell;
+        MWWorld::Ptr mSelectedEnchantItem;
+        MWWorld::Ptr mSelectedWeapon;
+
+        std::vector<WindowModal*> mCurrentModals;
+
+        // Markers placed manually by the player. Must be shared between both map views (the HUD map and the map
+        // window).
+        CustomMarkerCollection mCustomMarkers;
+
+        HUD* mHud;
+        MapWindow* mMap;
+        std::unique_ptr<MWRender::LocalMap> mLocalMapRender;
+        std::unique_ptr<ToolTips> mToolTips;
+        StatsWindow* mStatsWindow;
+        std::unique_ptr<MessageBoxManager> mMessageBoxManager;
+        Console* mConsole;
+        DialogueWindow* mDialogueWindow;
+        std::unique_ptr<DragAndDrop> mDragAndDrop;
+        InventoryWindow* mInventoryWindow;
+        ScrollWindow* mScrollWindow;
+        BookWindow* mBookWindow;
+        CountDialog* mCountDialog;
+        TradeWindow* mTradeWindow;
+        SettingsWindow* mSettingsWindow;
+        ConfirmationDialog* mConfirmationDialog;
+        SpellWindow* mSpellWindow;
+        QuickKeysMenu* mQuickKeysMenu;
+        LoadingScreen* mLoadingScreen;
+        WaitDialog* mWaitDialog;
+        std::unique_ptr<SoulgemDialog> mSoulgemDialog;
+        MyGUI::ImageBox* mVideoBackground;
+        VideoWidget* mVideoWidget;
+        ScreenFader* mWerewolfFader;
+        ScreenFader* mBlindnessFader;
+        ScreenFader* mHitFader;
+        ScreenFader* mScreenFader;
+        DebugWindow* mDebugWindow;
+        PostProcessorHud* mPostProcessorHud;
+        JailScreen* mJailScreen;
+        ContainerWindow* mContainerWindow;
+
+        std::vector<std::unique_ptr<WindowBase>> mWindows;
+
+        Translation::Storage& mTranslationDataStorage;
+
+        std::unique_ptr<CharacterCreation> mCharGen;
+
+        MyGUI::Widget* mInputBlocker;
+
+        bool mCrosshairEnabled;
+        bool mSubtitlesEnabled;
+        bool mHitFaderEnabled;
+        bool mWerewolfOverlayEnabled;
+        bool mHudEnabled;
+        bool mCursorVisible;
+        bool mCursorActive;
+
+        int mPlayerBounty;
+
+        void setCursorVisible(bool visible) override;
+
+        std::unique_ptr<MyGUI::Gui> mGui; // Gui
+
+        struct GuiModeState
         {
-            mWindows.push_back(window);
-        }
-        GuiModeState(const std::vector<WindowBase*>& windows)
-            : mWindows(windows) {}
-        GuiModeState() {}
+            GuiModeState(WindowBase* window) { mWindows.push_back(window); }
+            GuiModeState(const std::vector<WindowBase*>& windows)
+                : mWindows(windows)
+            {
+            }
+            GuiModeState() {}
 
-        void update(bool visible);
+            void update(bool visible);
 
-        std::vector<WindowBase*> mWindows;
+            std::vector<WindowBase*> mWindows;
 
-        std::string mCloseSound;
-        std::string mOpenSound;
-    };
-    // Defines the windows that should be shown in a particular GUI mode.
-    std::map<GuiMode, GuiModeState> mGuiModeStates;
-    // The currently active stack of GUI modes (top mode is the one we are in).
-    std::vector<GuiMode> mGuiModes;
+            std::string mCloseSound;
+            std::string mOpenSound;
+        };
+        // Defines the windows that should be shown in a particular GUI mode.
+        std::map<GuiMode, GuiModeState> mGuiModeStates;
+        // The currently active stack of GUI modes (top mode is the one we are in).
+        std::vector<GuiMode> mGuiModes;
 
-    std::unique_ptr<SDLUtil::SDLCursorManager> mCursorManager;
+        std::unique_ptr<SDLUtil::SDLCursorManager> mCursorManager;
 
-    std::vector<std::unique_ptr<Layout>> mGarbageDialogs;
-    void cleanupGarbage();
+        std::vector<std::unique_ptr<Layout>> mGarbageDialogs;
+        void cleanupGarbage();
 
-    GuiWindow mShown; // Currently shown windows in inventory mode
-    GuiWindow mForceHidden; // Hidden windows (overrides mShown)
+        GuiWindow mShown; // Currently shown windows in inventory mode
+        GuiWindow mForceHidden; // Hidden windows (overrides mShown)
 
-    /* Currently ALLOWED windows in inventory mode. This is used at
-       the start of the game, when windows are enabled one by one
-       through script commands. You can manipulate this through using
-       allow() and disableAll().
-     */
-    GuiWindow mAllowed;
-    // is the rest window allowed?
-    bool mRestAllowed;
+        /* Currently ALLOWED windows in inventory mode. This is used at
+           the start of the game, when windows are enabled one by one
+           through script commands. You can manipulate this through using
+           allow() and disableAll().
+         */
+        GuiWindow mAllowed;
+        // is the rest window allowed?
+        bool mRestAllowed;
 
-    void updateVisible(); // Update visibility of all windows based on mode, shown and allowed settings
+        void updateVisible(); // Update visibility of all windows based on mode, shown and allowed settings
 
-    void updateMap();
+        void updateMap();
 
-    int mShowOwned;
+        int mShowOwned;
 
-    ToUTF8::FromType mEncoding;
+        ToUTF8::FromType mEncoding;
 
-    std::string mVersionDescription;
+        std::string mVersionDescription;
 
-    bool mWindowVisible;
+        bool mWindowVisible;
 
-    MWGui::TextColours mTextColours;
+        MWGui::TextColours mTextColours;
 
-    std::unique_ptr<KeyboardNavigation> mKeyboardNavigation;
+        std::unique_ptr<KeyboardNavigation> mKeyboardNavigation;
 
-    std::unique_ptr<SDLUtil::VideoWrapper> mVideoWrapper;
+        std::unique_ptr<SDLUtil::VideoWrapper> mVideoWrapper;
 
-    float mScalingFactor;
+        float mScalingFactor;
 
-    struct ScheduledMessageBox
-    {
-        std::string mMessage;
-        MWGui::ShowInDialogueMode mShowInDialogueMode;
+        struct ScheduledMessageBox
+        {
+            std::string mMessage;
+            MWGui::ShowInDialogueMode mShowInDialogueMode;
 
-        ScheduledMessageBox(std::string&& message, MWGui::ShowInDialogueMode showInDialogueMode)
-            : mMessage(std::move(message)), mShowInDialogueMode(showInDialogueMode) {}
-    };
+            ScheduledMessageBox(std::string&& message, MWGui::ShowInDialogueMode showInDialogueMode)
+                : mMessage(std::move(message))
+                , mShowInDialogueMode(showInDialogueMode)
+            {
+            }
+        };
 
-    Misc::ScopeGuarded<std::vector<ScheduledMessageBox>> mScheduledMessageBoxes;
+        Misc::ScopeGuarded<std::vector<ScheduledMessageBox>> mScheduledMessageBoxes;
 
-    /**
-     * Called when MyGUI tries to retrieve a tag's value. Tags must be denoted in #{tag} notation and will be replaced upon setting a user visible text/property.
-     * Supported syntax:
-     * #{GMSTName}: retrieves String value of the GMST called GMSTName
-     * #{setting=CATEGORY_NAME,SETTING_NAME}: retrieves String value of SETTING_NAME under category CATEGORY_NAME from settings.cfg
-     * #{sCell=CellID}: retrieves translated name of the given CellID (used only by some Morrowind localisations, in others cell ID is == cell name)
-     * #{fontcolour=FontColourName}: retrieves the value of the fallback setting "FontColor_color_<FontColourName>" from openmw.cfg,
-     *                              in the format "r g b a", float values in range 0-1. Useful for "Colour" and "TextColour" properties in skins.
-     * #{fontcolourhtml=FontColourName}: retrieves the value of the fallback setting "FontColor_color_<FontColourName>" from openmw.cfg,
-     *                              in the format "#xxxxxx" where x are hexadecimal numbers. Useful in an EditBox's caption to change the color of following text.
-     */
-    void onRetrieveTag(const MyGUI::UString& _tag, MyGUI::UString& _result);
+        /**
+         * Called when MyGUI tries to retrieve a tag's value. Tags must be denoted in #{tag} notation and will be
+         * replaced upon setting a user visible text/property. Supported syntax:
+         * #{GMSTName}: retrieves String value of the GMST called GMSTName
+         * #{setting=CATEGORY_NAME,SETTING_NAME}: retrieves String value of SETTING_NAME under category CATEGORY_NAME
+         * from settings.cfg
+         * #{sCell=CellID}: retrieves translated name of the given CellID (used only by some Morrowind localisations, in
+         * others cell ID is == cell name)
+         * #{fontcolour=FontColourName}: retrieves the value of the fallback setting "FontColor_color_<FontColourName>"
+         * from openmw.cfg, in the format "r g b a", float values in range 0-1. Useful for "Colour" and "TextColour"
+         * properties in skins.
+         * #{fontcolourhtml=FontColourName}: retrieves the value of the fallback setting
+         * "FontColor_color_<FontColourName>" from openmw.cfg, in the format "#xxxxxx" where x are hexadecimal numbers.
+         * Useful in an EditBox's caption to change the color of following text.
+         */
+        void onRetrieveTag(const MyGUI::UString& _tag, MyGUI::UString& _result);
 
-    void onCursorChange(const std::string& name);
-    void onKeyFocusChanged(MyGUI::Widget* widget);
+        void onCursorChange(const std::string& name);
+        void onKeyFocusChanged(MyGUI::Widget* widget);
 
-    // Key pressed while playing a video
-    void onVideoKeyPressed(MyGUI::Widget *_sender, MyGUI::KeyCode _key, MyGUI::Char _char);
+        // Key pressed while playing a video
+        void onVideoKeyPressed(MyGUI::Widget* _sender, MyGUI::KeyCode _key, MyGUI::Char _char);
 
-    void sizeVideo(int screenWidth, int screenHeight);
+        void sizeVideo(int screenWidth, int screenHeight);
 
-    void onClipboardChanged(const std::string& _type, const std::string& _data);
-    void onClipboardRequested(const std::string& _type, std::string& _data);
+        void onClipboardChanged(const std::string& _type, const std::string& _data);
+        void onClipboardRequested(const std::string& _type, std::string& _data);
 
-    void createTextures();
-    void createCursors();
-    void setMenuTransparency(float value);
+        void createTextures();
+        void createCursors();
+        void setMenuTransparency(float value);
 
-    void updatePinnedWindows();
+        void updatePinnedWindows();
 
-    void enableScene(bool enable);
+        void enableScene(bool enable);
 
-    void handleScheduledMessageBoxes();
+        void handleScheduledMessageBoxes();
 
-    void pushGuiMode(GuiMode mode, const MWWorld::Ptr& arg, bool force);
+        void pushGuiMode(GuiMode mode, const MWWorld::Ptr& arg, bool force);
 
-    void setCullMask(uint32_t mask) override;
-    uint32_t getCullMask() override;
-  };
+        void setCullMask(uint32_t mask) override;
+        uint32_t getCullMask() override;
+    };
 }
 
 #endif
diff --git a/apps/openmw/mwgui/windowpinnablebase.cpp b/apps/openmw/mwgui/windowpinnablebase.cpp
index 6106d6b563..1b3bd1d2d8 100644
--- a/apps/openmw/mwgui/windowpinnablebase.cpp
+++ b/apps/openmw/mwgui/windowpinnablebase.cpp
@@ -5,10 +5,11 @@
 namespace MWGui
 {
     WindowPinnableBase::WindowPinnableBase(const std::string& parLayout)
-      : WindowBase(parLayout), mPinned(false)
+        : WindowBase(parLayout)
+        , mPinned(false)
     {
         Window* window = mMainWidget->castType<Window>();
-        mPinButton = window->getSkinWidget ("Button");
+        mPinButton = window->getSkinWidget("Button");
 
         mPinButton->eventMouseButtonPressed += MyGUI::newDelegate(this, &WindowPinnableBase::onPinButtonPressed);
     }
@@ -21,9 +22,9 @@ namespace MWGui
         mPinned = !mPinned;
 
         if (mPinned)
-            mPinButton->changeWidgetSkin ("PinDown");
+            mPinButton->changeWidgetSkin("PinDown");
         else
-            mPinButton->changeWidgetSkin ("PinUp");
+            mPinButton->changeWidgetSkin("PinUp");
 
         onPinToggled();
     }
diff --git a/apps/openmw/mwgui/windowpinnablebase.hpp b/apps/openmw/mwgui/windowpinnablebase.hpp
index c91f0a1489..ebb3e2cf05 100644
--- a/apps/openmw/mwgui/windowpinnablebase.hpp
+++ b/apps/openmw/mwgui/windowpinnablebase.hpp
@@ -5,12 +5,12 @@
 
 namespace MWGui
 {
-    class WindowPinnableBase: public WindowBase
+    class WindowPinnableBase : public WindowBase
     {
     public:
         WindowPinnableBase(const std::string& parLayout);
         bool pinned() { return mPinned; }
-        void setPinned (bool pinned);
+        void setPinned(bool pinned);
         void setPinButtonVisible(bool visible);
 
     private:
diff --git a/apps/openmw/mwinput/actionmanager.cpp b/apps/openmw/mwinput/actionmanager.cpp
index 610f88cef9..3d712fe228 100644
--- a/apps/openmw/mwinput/actionmanager.cpp
+++ b/apps/openmw/mwinput/actionmanager.cpp
@@ -6,20 +6,20 @@
 
 #include <components/settings/settings.hpp>
 
-#include "../mwbase/inputmanager.hpp"
-#include "../mwbase/statemanager.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/inputmanager.hpp"
 #include "../mwbase/luamanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/statemanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
-#include "../mwworld/player.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
+#include "../mwworld/player.hpp"
 
-#include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/npcstats.hpp"
 
 #include "../mwgui/messagebox.hpp"
 
@@ -30,9 +30,8 @@ namespace MWInput
 {
 
     ActionManager::ActionManager(BindingsManager* bindingsManager,
-            osgViewer::ScreenCaptureHandler::CaptureOperation* screenCaptureOperation,
-            osg::ref_ptr<osgViewer::Viewer> viewer,
-            osg::ref_ptr<osgViewer::ScreenCaptureHandler> screenCaptureHandler)
+        osgViewer::ScreenCaptureHandler::CaptureOperation* screenCaptureOperation,
+        osg::ref_ptr<osgViewer::Viewer> viewer, osg::ref_ptr<osgViewer::ScreenCaptureHandler> screenCaptureHandler)
         : mBindingsManager(bindingsManager)
         , mViewer(viewer)
         , mScreenCaptureHandler(screenCaptureHandler)
@@ -73,7 +72,7 @@ namespace MWInput
             {
                 alwaysRunAllowed = true;
                 triedToMove = true;
-                player.setAutoMove (false);
+                player.setAutoMove(false);
                 player.setForwardBackward(mBindingsManager->actionIsActive(A_MoveForward) ? 1 : -1);
             }
 
@@ -81,7 +80,7 @@ namespace MWInput
             {
                 alwaysRunAllowed = true;
                 triedToMove = true;
-                player.setForwardBackward (1);
+                player.setForwardBackward(1);
             }
 
             if (mAttemptJump && MWBase::Environment::get().getInputManager()->getControlSwitch("playerjumping"))
@@ -93,17 +92,18 @@ namespace MWInput
             // if player tried to start moving, but can't (due to being overencumbered), display a notification.
             if (triedToMove)
             {
-                MWWorld::Ptr playerPtr = MWBase::Environment::get().getWorld ()->getPlayerPtr();
+                MWWorld::Ptr playerPtr = MWBase::Environment::get().getWorld()->getPlayerPtr();
                 if (playerPtr.getClass().getEncumbrance(playerPtr) > playerPtr.getClass().getCapacity(playerPtr))
                 {
-                    player.setAutoMove (false);
+                    player.setAutoMove(false);
                     const auto& msgboxs = MWBase::Environment::get().getWindowManager()->getActiveMessageBoxes();
-                    auto it = std::find_if(msgboxs.begin(), msgboxs.end(), [](const std::unique_ptr<MWGui::MessageBox>& msgbox)
-                    {
-                        return (msgbox->getMessage() == "#{sNotifyMessage59}");
-                    });
+                    auto it = std::find_if(
+                        msgboxs.begin(), msgboxs.end(), [](const std::unique_ptr<MWGui::MessageBox>& msgbox) {
+                            return (msgbox->getMessage() == "#{sNotifyMessage59}");
+                        });
 
-                    // if an overencumbered messagebox is already present, reset its expiry timer, otherwise create new one.
+                    // if an overencumbered messagebox is already present, reset its expiry timer, otherwise create new
+                    // one.
                     if (it != msgboxs.end())
                         (*it)->mCurrentTime = 0;
                     else
@@ -117,7 +117,7 @@ namespace MWInput
             static const bool isToggleSneak = Settings::Manager::getBool("toggle sneak", "Input");
             if (!isToggleSneak)
             {
-                if(!MWBase::Environment::get().getInputManager()->joystickLastUsed())
+                if (!MWBase::Environment::get().getInputManager()->joystickLastUsed())
                     player.setSneak(mBindingsManager->actionIsActive(A_Sneak));
             }
 
@@ -130,15 +130,11 @@ namespace MWInput
                 player.setRunState(mBindingsManager->actionIsActive(A_Run));
         }
 
-        if (mBindingsManager->actionIsActive(A_MoveForward) ||
-            mBindingsManager->actionIsActive(A_MoveBackward) ||
-            mBindingsManager->actionIsActive(A_MoveLeft) ||
-            mBindingsManager->actionIsActive(A_MoveRight) ||
-            mBindingsManager->actionIsActive(A_Jump) ||
-            mBindingsManager->actionIsActive(A_Sneak) ||
-            mBindingsManager->actionIsActive(A_TogglePOV) ||
-            mBindingsManager->actionIsActive(A_ZoomIn) ||
-            mBindingsManager->actionIsActive(A_ZoomOut))
+        if (mBindingsManager->actionIsActive(A_MoveForward) || mBindingsManager->actionIsActive(A_MoveBackward)
+            || mBindingsManager->actionIsActive(A_MoveLeft) || mBindingsManager->actionIsActive(A_MoveRight)
+            || mBindingsManager->actionIsActive(A_Jump) || mBindingsManager->actionIsActive(A_Sneak)
+            || mBindingsManager->actionIsActive(A_TogglePOV) || mBindingsManager->actionIsActive(A_ZoomIn)
+            || mBindingsManager->actionIsActive(A_ZoomOut))
         {
             resetIdleTime();
         }
@@ -155,123 +151,123 @@ namespace MWInput
 
     void ActionManager::executeAction(int action)
     {
-        MWBase::Environment::get().getLuaManager()->inputEvent({MWBase::LuaManager::InputEvent::Action, action});
+        MWBase::Environment::get().getLuaManager()->inputEvent({ MWBase::LuaManager::InputEvent::Action, action });
         const auto inputManager = MWBase::Environment::get().getInputManager();
         const auto windowManager = MWBase::Environment::get().getWindowManager();
         // trigger action activated
         switch (action)
         {
-        case A_GameMenu:
-            toggleMainMenu ();
-            break;
-        case A_Screenshot:
-            screenshot();
-            break;
-        case A_Inventory:
-            toggleInventory ();
-            break;
-        case A_Console:
-            toggleConsole ();
-            break;
-        case A_Activate:
-            inputManager->resetIdleTime();
-            activate();
-            break;
-        case A_MoveLeft:
-        case A_MoveRight:
-        case A_MoveForward:
-        case A_MoveBackward:
-            handleGuiArrowKey(action);
-            break;
-        case A_Journal:
-            toggleJournal();
-            break;
-        case A_AutoMove:
-            toggleAutoMove();
-            break;
-        case A_AlwaysRun:
-            toggleWalking();
-            break;
-        case A_ToggleWeapon:
-            toggleWeapon();
-            break;
-        case A_Rest:
-            rest();
-            break;
-        case A_ToggleSpell:
-            toggleSpell();
-            break;
-        case A_QuickKey1:
-            quickKey(1);
-            break;
-        case A_QuickKey2:
-            quickKey(2);
-            break;
-        case A_QuickKey3:
-            quickKey(3);
-            break;
-        case A_QuickKey4:
-            quickKey(4);
-            break;
-        case A_QuickKey5:
-            quickKey(5);
-            break;
-        case A_QuickKey6:
-            quickKey(6);
-            break;
-        case A_QuickKey7:
-            quickKey(7);
-            break;
-        case A_QuickKey8:
-            quickKey(8);
-            break;
-        case A_QuickKey9:
-            quickKey(9);
-            break;
-        case A_QuickKey10:
-            quickKey(10);
-            break;
-        case A_QuickKeysMenu:
-            showQuickKeysMenu();
-            break;
-        case A_ToggleHUD:
-            windowManager->toggleHud();
-            break;
-        case A_ToggleDebug:
-            windowManager->toggleDebugWindow();
-            break;
-        case A_TogglePostProcessorHUD:
-            windowManager->togglePostProcessorHud();
-            break;
-        case A_QuickSave:
-            quickSave();
-            break;
-        case A_QuickLoad:
-            quickLoad();
-            break;
-        case A_CycleSpellLeft:
-            if (checkAllowedToUseItems() && windowManager->isAllowed(MWGui::GW_Magic))
-                MWBase::Environment::get().getWindowManager()->cycleSpell(false);
-            break;
-        case A_CycleSpellRight:
-            if (checkAllowedToUseItems() && windowManager->isAllowed(MWGui::GW_Magic))
-                MWBase::Environment::get().getWindowManager()->cycleSpell(true);
-            break;
-        case A_CycleWeaponLeft:
-            if (checkAllowedToUseItems() && windowManager->isAllowed(MWGui::GW_Inventory))
-                MWBase::Environment::get().getWindowManager()->cycleWeapon(false);
-            break;
-        case A_CycleWeaponRight:
-            if (checkAllowedToUseItems() && windowManager->isAllowed(MWGui::GW_Inventory))
-                MWBase::Environment::get().getWindowManager()->cycleWeapon(true);
-            break;
-        case A_Sneak:
-            static const bool isToggleSneak = Settings::Manager::getBool("toggle sneak", "Input");
-            if (isToggleSneak)
-            {
-                toggleSneaking();
-            }
-            break;
+            case A_GameMenu:
+                toggleMainMenu();
+                break;
+            case A_Screenshot:
+                screenshot();
+                break;
+            case A_Inventory:
+                toggleInventory();
+                break;
+            case A_Console:
+                toggleConsole();
+                break;
+            case A_Activate:
+                inputManager->resetIdleTime();
+                activate();
+                break;
+            case A_MoveLeft:
+            case A_MoveRight:
+            case A_MoveForward:
+            case A_MoveBackward:
+                handleGuiArrowKey(action);
+                break;
+            case A_Journal:
+                toggleJournal();
+                break;
+            case A_AutoMove:
+                toggleAutoMove();
+                break;
+            case A_AlwaysRun:
+                toggleWalking();
+                break;
+            case A_ToggleWeapon:
+                toggleWeapon();
+                break;
+            case A_Rest:
+                rest();
+                break;
+            case A_ToggleSpell:
+                toggleSpell();
+                break;
+            case A_QuickKey1:
+                quickKey(1);
+                break;
+            case A_QuickKey2:
+                quickKey(2);
+                break;
+            case A_QuickKey3:
+                quickKey(3);
+                break;
+            case A_QuickKey4:
+                quickKey(4);
+                break;
+            case A_QuickKey5:
+                quickKey(5);
+                break;
+            case A_QuickKey6:
+                quickKey(6);
+                break;
+            case A_QuickKey7:
+                quickKey(7);
+                break;
+            case A_QuickKey8:
+                quickKey(8);
+                break;
+            case A_QuickKey9:
+                quickKey(9);
+                break;
+            case A_QuickKey10:
+                quickKey(10);
+                break;
+            case A_QuickKeysMenu:
+                showQuickKeysMenu();
+                break;
+            case A_ToggleHUD:
+                windowManager->toggleHud();
+                break;
+            case A_ToggleDebug:
+                windowManager->toggleDebugWindow();
+                break;
+            case A_TogglePostProcessorHUD:
+                windowManager->togglePostProcessorHud();
+                break;
+            case A_QuickSave:
+                quickSave();
+                break;
+            case A_QuickLoad:
+                quickLoad();
+                break;
+            case A_CycleSpellLeft:
+                if (checkAllowedToUseItems() && windowManager->isAllowed(MWGui::GW_Magic))
+                    MWBase::Environment::get().getWindowManager()->cycleSpell(false);
+                break;
+            case A_CycleSpellRight:
+                if (checkAllowedToUseItems() && windowManager->isAllowed(MWGui::GW_Magic))
+                    MWBase::Environment::get().getWindowManager()->cycleSpell(true);
+                break;
+            case A_CycleWeaponLeft:
+                if (checkAllowedToUseItems() && windowManager->isAllowed(MWGui::GW_Inventory))
+                    MWBase::Environment::get().getWindowManager()->cycleWeapon(false);
+                break;
+            case A_CycleWeaponRight:
+                if (checkAllowedToUseItems() && windowManager->isAllowed(MWGui::GW_Inventory))
+                    MWBase::Environment::get().getWindowManager()->cycleWeapon(true);
+                break;
+            case A_Sneak:
+                static const bool isToggleSneak = Settings::Manager::getBool("toggle sneak", "Input");
+                if (isToggleSneak)
+                {
+                    toggleSneaking();
+                }
+                break;
         }
     }
 
@@ -299,11 +295,11 @@ namespace MWInput
         }
         else
         {
-            osg::ref_ptr<osg::Image> screenshot (new osg::Image);
+            osg::ref_ptr<osg::Image> screenshot(new osg::Image);
 
             if (MWBase::Environment::get().getWorld()->screenshot360(screenshot.get()))
             {
-                (*mScreenCaptureOperation) (*(screenshot.get()), 0);
+                (*mScreenCaptureOperation)(*(screenshot.get()), 0);
                 // FIXME: mScreenCaptureHandler->getCaptureOperation() causes crash for some reason
             }
         }
@@ -329,11 +325,11 @@ namespace MWInput
             return;
         }
 
-        if (!MWBase::Environment::get().getWindowManager()->isGuiMode()) //No open GUIs, open up the MainMenu
+        if (!MWBase::Environment::get().getWindowManager()->isGuiMode()) // No open GUIs, open up the MainMenu
         {
-            MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
+            MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_MainMenu);
         }
-        else //Close current GUI
+        else // Close current GUI
         {
             MWBase::Environment::get().getWindowManager()->exitCurrentGuiMode();
         }
@@ -341,10 +337,12 @@ namespace MWInput
 
     void ActionManager::toggleSpell()
     {
-        if (MWBase::Environment::get().getWindowManager()->isGuiMode()) return;
+        if (MWBase::Environment::get().getWindowManager()->isGuiMode())
+            return;
 
         // Not allowed before the magic window is accessible
-        if (!MWBase::Environment::get().getInputManager()->getControlSwitch("playermagic") || !MWBase::Environment::get().getInputManager()->getControlSwitch("playercontrols"))
+        if (!MWBase::Environment::get().getInputManager()->getControlSwitch("playermagic")
+            || !MWBase::Environment::get().getInputManager()->getControlSwitch("playercontrols"))
             return;
 
         if (!checkAllowedToUseItems())
@@ -353,8 +351,8 @@ namespace MWInput
         // Not allowed if no spell selected
         MWWorld::Player& player = MWBase::Environment::get().getWorld()->getPlayer();
         MWWorld::InventoryStore& inventory = player.getPlayer().getClass().getInventoryStore(player.getPlayer());
-        if (MWBase::Environment::get().getWindowManager()->getSelectedSpell().empty() &&
-            inventory.getSelectedEnchantItem() == inventory.end())
+        if (MWBase::Environment::get().getWindowManager()->getSelectedSpell().empty()
+            && inventory.getSelectedEnchantItem() == inventory.end())
             return;
 
         if (MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(player.getPlayer()))
@@ -381,15 +379,18 @@ namespace MWInput
 
     void ActionManager::toggleWeapon()
     {
-        if (MWBase::Environment::get().getWindowManager()->isGuiMode()) return;
+        if (MWBase::Environment::get().getWindowManager()->isGuiMode())
+            return;
 
         // Not allowed before the inventory window is accessible
-        if (!MWBase::Environment::get().getInputManager()->getControlSwitch("playerfighting") || !MWBase::Environment::get().getInputManager()->getControlSwitch("playercontrols"))
+        if (!MWBase::Environment::get().getInputManager()->getControlSwitch("playerfighting")
+            || !MWBase::Environment::get().getInputManager()->getControlSwitch("playercontrols"))
             return;
 
         MWWorld::Player& player = MWBase::Environment::get().getWorld()->getPlayer();
         // We want to interrupt animation only if attack is preparing, but still is not triggered
-        // Otherwise we will get a "speedshooting" exploit, when player can skip reload animation by hitting "Toggle Weapon" key twice
+        // Otherwise we will get a "speedshooting" exploit, when player can skip reload animation by hitting "Toggle
+        // Weapon" key twice
         if (MWBase::Environment::get().getMechanicsManager()->isAttackPreparing(player.getPlayer()))
             player.setAttackingOrSpell(false);
         else if (MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(player.getPlayer()))
@@ -407,10 +408,11 @@ namespace MWInput
         if (!MWBase::Environment::get().getInputManager()->getControlSwitch("playercontrols"))
             return;
 
-        if (!MWBase::Environment::get().getWindowManager()->getRestEnabled() || MWBase::Environment::get().getWindowManager()->isGuiMode())
+        if (!MWBase::Environment::get().getWindowManager()->getRestEnabled()
+            || MWBase::Environment::get().getWindowManager()->isGuiMode())
             return;
 
-        MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Rest); //Open rest GUI
+        MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Rest); // Open rest GUI
     }
 
     void ActionManager::toggleInventory()
@@ -425,12 +427,12 @@ namespace MWInput
             return;
 
         // Toggle between game mode and inventory mode
-        if(!MWBase::Environment::get().getWindowManager()->isGuiMode())
+        if (!MWBase::Environment::get().getWindowManager()->isGuiMode())
             MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Inventory);
         else
         {
             MWGui::GuiMode mode = MWBase::Environment::get().getWindowManager()->getMode();
-            if(mode == MWGui::GM_Inventory || mode == MWGui::GM_Container)
+            if (mode == MWGui::GM_Inventory || mode == MWGui::GM_Container)
                 MWBase::Environment::get().getWindowManager()->popGuiMode();
         }
 
@@ -449,14 +451,12 @@ namespace MWInput
     {
         if (!MWBase::Environment::get().getInputManager()->getControlSwitch("playercontrols"))
             return;
-        if (MyGUI::InputManager::getInstance ().isModalAny())
+        if (MyGUI::InputManager::getInstance().isModalAny())
             return;
 
         MWBase::WindowManager* windowManager = MWBase::Environment::get().getWindowManager();
-        if (windowManager->getMode() != MWGui::GM_Journal
-                && windowManager->getMode() != MWGui::GM_MainMenu
-                && windowManager->getMode() != MWGui::GM_Settings
-                && windowManager->getJournalAllowed())
+        if (windowManager->getMode() != MWGui::GM_Journal && windowManager->getMode() != MWGui::GM_MainMenu
+            && windowManager->getMode() != MWGui::GM_Settings && windowManager->getJournalAllowed())
         {
             windowManager->pushGuiMode(MWGui::GM_Journal);
         }
@@ -466,35 +466,37 @@ namespace MWInput
         }
     }
 
-    void ActionManager::quickKey (int index)
+    void ActionManager::quickKey(int index)
     {
-        if (!MWBase::Environment::get().getInputManager()->getControlSwitch("playercontrols") || !MWBase::Environment::get().getInputManager()->getControlSwitch("playerfighting") || !MWBase::Environment::get().getInputManager()->getControlSwitch("playermagic"))
+        if (!MWBase::Environment::get().getInputManager()->getControlSwitch("playercontrols")
+            || !MWBase::Environment::get().getInputManager()->getControlSwitch("playerfighting")
+            || !MWBase::Environment::get().getInputManager()->getControlSwitch("playermagic"))
             return;
         if (!checkAllowedToUseItems())
             return;
 
-        if (MWBase::Environment::get().getWorld()->getGlobalFloat ("chargenstate")!=-1)
+        if (MWBase::Environment::get().getWorld()->getGlobalFloat("chargenstate") != -1)
             return;
 
         if (!MWBase::Environment::get().getWindowManager()->isGuiMode())
-            MWBase::Environment::get().getWindowManager()->activateQuickKey (index);
+            MWBase::Environment::get().getWindowManager()->activateQuickKey(index);
     }
 
     void ActionManager::showQuickKeysMenu()
     {
-        if (MWBase::Environment::get().getWindowManager()->getMode () == MWGui::GM_QuickKeysMenu)
+        if (MWBase::Environment::get().getWindowManager()->getMode() == MWGui::GM_QuickKeysMenu)
         {
             MWBase::Environment::get().getWindowManager()->exitCurrentGuiMode();
             return;
         }
 
-        if (MWBase::Environment::get().getWorld()->getGlobalFloat ("chargenstate") != -1)
+        if (MWBase::Environment::get().getWorld()->getGlobalFloat("chargenstate") != -1)
             return;
 
         if (!checkAllowedToUseItems())
             return;
 
-        MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_QuickKeysMenu);
+        MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_QuickKeysMenu);
     }
 
     void ActionManager::activate()
@@ -514,18 +516,20 @@ namespace MWInput
 
     void ActionManager::toggleAutoMove()
     {
-        if (MWBase::Environment::get().getWindowManager()->isGuiMode()) return;
+        if (MWBase::Environment::get().getWindowManager()->isGuiMode())
+            return;
 
         if (MWBase::Environment::get().getInputManager()->getControlSwitch("playercontrols"))
         {
             MWWorld::Player& player = MWBase::Environment::get().getWorld()->getPlayer();
-            player.setAutoMove (!player.getAutoMove());
+            player.setAutoMove(!player.getAutoMove());
         }
     }
 
     void ActionManager::toggleWalking()
     {
-        if (MWBase::Environment::get().getWindowManager()->isGuiMode() || SDL_IsTextInputActive()) return;
+        if (MWBase::Environment::get().getWindowManager()->isGuiMode() || SDL_IsTextInputActive())
+            return;
         mAlwaysRunActive = !mAlwaysRunActive;
 
         Settings::Manager::setBool("always run", "Input", mAlwaysRunActive);
@@ -533,8 +537,10 @@ namespace MWInput
 
     void ActionManager::toggleSneaking()
     {
-        if (MWBase::Environment::get().getWindowManager()->isGuiMode()) return;
-        if (!MWBase::Environment::get().getInputManager()->getControlSwitch("playercontrols")) return;
+        if (MWBase::Environment::get().getWindowManager()->isGuiMode())
+            return;
+        if (!MWBase::Environment::get().getInputManager()->getControlSwitch("playercontrols"))
+            return;
         mSneaking = !mSneaking;
         MWWorld::Player& player = MWBase::Environment::get().getWorld()->getPlayer();
         player.setSneak(mSneaking);
@@ -557,19 +563,19 @@ namespace MWInput
         MyGUI::KeyCode key;
         switch (action)
         {
-        case A_MoveLeft:
-            key = MyGUI::KeyCode::ArrowLeft;
-            break;
-        case A_MoveRight:
-            key = MyGUI::KeyCode::ArrowRight;
-            break;
-        case A_MoveForward:
-            key = MyGUI::KeyCode::ArrowUp;
-            break;
-        case A_MoveBackward:
-        default:
-            key = MyGUI::KeyCode::ArrowDown;
-            break;
+            case A_MoveLeft:
+                key = MyGUI::KeyCode::ArrowLeft;
+                break;
+            case A_MoveRight:
+                key = MyGUI::KeyCode::ArrowRight;
+                break;
+            case A_MoveForward:
+                key = MyGUI::KeyCode::ArrowUp;
+                break;
+            case A_MoveBackward:
+            default:
+                key = MyGUI::KeyCode::ArrowDown;
+                break;
         }
 
         MWBase::Environment::get().getWindowManager()->injectKeyPress(key, 0, false);
diff --git a/apps/openmw/mwinput/actionmanager.hpp b/apps/openmw/mwinput/actionmanager.hpp
index 4c51139d46..6b8fc1ed6b 100644
--- a/apps/openmw/mwinput/actionmanager.hpp
+++ b/apps/openmw/mwinput/actionmanager.hpp
@@ -17,11 +17,9 @@ namespace MWInput
     class ActionManager
     {
     public:
-
         ActionManager(BindingsManager* bindingsManager,
             osgViewer::ScreenCaptureHandler::CaptureOperation* screenCaptureOperation,
-            osg::ref_ptr<osgViewer::Viewer> viewer,
-            osg::ref_ptr<osgViewer::ScreenCaptureHandler> screenCaptureHandler);
+            osg::ref_ptr<osgViewer::Viewer> viewer, osg::ref_ptr<osgViewer::ScreenCaptureHandler> screenCaptureHandler);
 
         void update(float dt, bool triedToMove);
 
@@ -44,7 +42,7 @@ namespace MWInput
         void quickLoad();
         void quickSave();
 
-        void quickKey (int index);
+        void quickKey(int index);
         void showQuickKeysMenu();
 
         void resetIdleTime();
diff --git a/apps/openmw/mwinput/actions.hpp b/apps/openmw/mwinput/actions.hpp
index c7bdbf28d3..e586a613f7 100644
--- a/apps/openmw/mwinput/actions.hpp
+++ b/apps/openmw/mwinput/actions.hpp
@@ -11,33 +11,33 @@ namespace MWInput
 
         A_Unused,
 
-        A_Screenshot,               // Take a screenshot
+        A_Screenshot, // Take a screenshot
 
-        A_Inventory,                // Toggle inventory screen
+        A_Inventory, // Toggle inventory screen
 
-        A_Console,                  // Toggle console screen
+        A_Console, // Toggle console screen
 
-        A_MoveLeft,                 // Move player left / right
+        A_MoveLeft, // Move player left / right
         A_MoveRight,
-        A_MoveForward,              // Forward / Backward
+        A_MoveForward, // Forward / Backward
         A_MoveBackward,
 
         A_Activate,
 
-        A_Use,                      //Use weapon, spell, etc.
+        A_Use, // Use weapon, spell, etc.
         A_Jump,
-        A_AutoMove,                 //Toggle Auto-move forward
-        A_Rest,                     //Rest
-        A_Journal,                  //Journal
-        A_Weapon,                   //Draw/Sheath weapon
-        A_Spell,                    //Ready/Unready Casting
-        A_Run,                      //Run when held
-        A_CycleSpellLeft,           //cycling through spells
+        A_AutoMove, // Toggle Auto-move forward
+        A_Rest, // Rest
+        A_Journal, // Journal
+        A_Weapon, // Draw/Sheath weapon
+        A_Spell, // Ready/Unready Casting
+        A_Run, // Run when held
+        A_CycleSpellLeft, // cycling through spells
         A_CycleSpellRight,
-        A_CycleWeaponLeft,          //Cycling through weapons
+        A_CycleWeaponLeft, // Cycling through weapons
         A_CycleWeaponRight,
-        A_ToggleSneak,              //Toggles Sneak
-        A_AlwaysRun,                //Toggle Walking/Running
+        A_ToggleSneak, // Toggles Sneak
+        A_AlwaysRun, // Toggle Walking/Running
         A_Sneak,
 
         A_QuickSave,
@@ -65,7 +65,7 @@ namespace MWInput
 
         A_ToggleDebug,
 
-        A_LookUpDown,               //Joystick look
+        A_LookUpDown, // Joystick look
         A_LookLeftRight,
         A_MoveForwardBackward,
         A_MoveLeftRight,
@@ -75,7 +75,7 @@ namespace MWInput
 
         A_TogglePostProcessorHUD,
 
-        A_Last                      // Marker for the last item
+        A_Last // Marker for the last item
     };
 }
 #endif
diff --git a/apps/openmw/mwinput/bindingsmanager.cpp b/apps/openmw/mwinput/bindingsmanager.cpp
index c799056f45..609be27ddf 100644
--- a/apps/openmw/mwinput/bindingsmanager.cpp
+++ b/apps/openmw/mwinput/bindingsmanager.cpp
@@ -5,8 +5,8 @@
 #include <extern/oics/ICSChannelListener.h>
 #include <extern/oics/ICSInputControlSystem.h>
 
-#include <components/sdlutil/sdlmappings.hpp>
 #include <components/files/conversion.hpp>
+#include <components/sdlutil/sdlmappings.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/inputmanager.hpp"
@@ -19,7 +19,8 @@
 
 namespace MWInput
 {
-    static const int sFakeDeviceId = 1; //As we only support one controller at a time, use a fake deviceID so we don't lose bindings when switching controllers
+    static const int sFakeDeviceId = 1; // As we only support one controller at a time, use a fake deviceID so we don't
+                                        // lose bindings when switching controllers
 
     void clearAllKeyBindings(ICS::InputControlSystem* inputBinder, ICS::Control* control)
     {
@@ -28,7 +29,8 @@ namespace MWInput
             inputBinder->removeKeyBinding(inputBinder->getKeyBinding(control, ICS::Control::INCREASE));
         if (inputBinder->getMouseButtonBinding(control, ICS::Control::INCREASE) != ICS_MAX_DEVICE_BUTTONS)
             inputBinder->removeMouseButtonBinding(inputBinder->getMouseButtonBinding(control, ICS::Control::INCREASE));
-        if (inputBinder->getMouseWheelBinding(control, ICS::Control::INCREASE) != ICS::InputControlSystem::MouseWheelClick::UNASSIGNED)
+        if (inputBinder->getMouseWheelBinding(control, ICS::Control::INCREASE)
+            != ICS::InputControlSystem::MouseWheelClick::UNASSIGNED)
             inputBinder->removeMouseWheelBinding(inputBinder->getMouseWheelBinding(control, ICS::Control::INCREASE));
     }
 
@@ -36,23 +38,24 @@ namespace MWInput
     {
         // right now we don't really need multiple bindings for the same action, so remove all others first
         if (inputBinder->getJoystickAxisBinding(control, sFakeDeviceId, ICS::Control::INCREASE) != SDL_SCANCODE_UNKNOWN)
-            inputBinder->removeJoystickAxisBinding(sFakeDeviceId, inputBinder->getJoystickAxisBinding(control, sFakeDeviceId, ICS::Control::INCREASE));
-        if (inputBinder->getJoystickButtonBinding(control, sFakeDeviceId, ICS::Control::INCREASE) != ICS_MAX_DEVICE_BUTTONS)
-            inputBinder->removeJoystickButtonBinding(sFakeDeviceId, inputBinder->getJoystickButtonBinding(control, sFakeDeviceId, ICS::Control::INCREASE));
+            inputBinder->removeJoystickAxisBinding(
+                sFakeDeviceId, inputBinder->getJoystickAxisBinding(control, sFakeDeviceId, ICS::Control::INCREASE));
+        if (inputBinder->getJoystickButtonBinding(control, sFakeDeviceId, ICS::Control::INCREASE)
+            != ICS_MAX_DEVICE_BUTTONS)
+            inputBinder->removeJoystickButtonBinding(
+                sFakeDeviceId, inputBinder->getJoystickButtonBinding(control, sFakeDeviceId, ICS::Control::INCREASE));
     }
 
     class InputControlSystem : public ICS::InputControlSystem
     {
     public:
-        InputControlSystem(const std::filesystem::path &bindingsFile)
+        InputControlSystem(const std::filesystem::path& bindingsFile)
             : ICS::InputControlSystem(Files::pathToUnicodeString(bindingsFile), true, nullptr, nullptr, A_Last)
         {
         }
     };
 
-    class BindingsListener :
-            public ICS::ChannelListener,
-            public ICS::DetectingBindingListener
+    class BindingsListener : public ICS::ChannelListener, public ICS::DetectingBindingListener
     {
     public:
         BindingsListener(ICS::InputControlSystem* inputBinder, BindingsManager* bindingsManager)
@@ -70,13 +73,13 @@ namespace MWInput
             mBindingsManager->actionValueChanged(action, currentValue, previousValue);
         }
 
-        void keyBindingDetected(ICS::InputControlSystem* ICS, ICS::Control* control
-            , SDL_Scancode key, ICS::Control::ControlChangingDirection direction) override
+        void keyBindingDetected(ICS::InputControlSystem* ICS, ICS::Control* control, SDL_Scancode key,
+            ICS::Control::ControlChangingDirection direction) override
         {
-            //Disallow binding escape key
-            if (key==SDL_SCANCODE_ESCAPE)
+            // Disallow binding escape key
+            if (key == SDL_SCANCODE_ESCAPE)
             {
-                //Stop binding if esc pressed
+                // Stop binding if esc pressed
                 mInputBinder->cancelDetectingBindingState();
                 MWBase::Environment::get().getWindowManager()->notifyInputActionBound();
                 return;
@@ -86,11 +89,11 @@ namespace MWInput
             if (key == SDL_SCANCODE_F3 || key == SDL_SCANCODE_F4 || key == SDL_SCANCODE_F10)
                 return;
 
-            #ifndef __APPLE__
+#ifndef __APPLE__
             // Disallow binding Windows/Meta keys
             if (key == SDL_SCANCODE_LGUI || key == SDL_SCANCODE_RGUI)
                 return;
-            #endif
+#endif
 
             if (!mDetectingKeyboard)
                 return;
@@ -101,15 +104,15 @@ namespace MWInput
             MWBase::Environment::get().getWindowManager()->notifyInputActionBound();
         }
 
-        void mouseAxisBindingDetected(ICS::InputControlSystem* ICS, ICS::Control* control
-            , ICS::InputControlSystem::NamedAxis axis, ICS::Control::ControlChangingDirection direction) override
+        void mouseAxisBindingDetected(ICS::InputControlSystem* ICS, ICS::Control* control,
+            ICS::InputControlSystem::NamedAxis axis, ICS::Control::ControlChangingDirection direction) override
         {
             // we don't want mouse movement bindings
             return;
         }
 
-        void mouseButtonBindingDetected(ICS::InputControlSystem* ICS, ICS::Control* control
-            , unsigned int button, ICS::Control::ControlChangingDirection direction) override
+        void mouseButtonBindingDetected(ICS::InputControlSystem* ICS, ICS::Control* control, unsigned int button,
+            ICS::Control::ControlChangingDirection direction) override
         {
             if (!mDetectingKeyboard)
                 return;
@@ -119,8 +122,8 @@ namespace MWInput
             MWBase::Environment::get().getWindowManager()->notifyInputActionBound();
         }
 
-        void mouseWheelBindingDetected(ICS::InputControlSystem* ICS, ICS::Control* control
-            , ICS::InputControlSystem::MouseWheelClick click, ICS::Control::ControlChangingDirection direction) override
+        void mouseWheelBindingDetected(ICS::InputControlSystem* ICS, ICS::Control* control,
+            ICS::InputControlSystem::MouseWheelClick click, ICS::Control::ControlChangingDirection direction) override
         {
             if (!mDetectingKeyboard)
                 return;
@@ -130,30 +133,30 @@ namespace MWInput
             MWBase::Environment::get().getWindowManager()->notifyInputActionBound();
         }
 
-        void joystickAxisBindingDetected(ICS::InputControlSystem* ICS, int deviceID, ICS::Control* control
-            , int axis, ICS::Control::ControlChangingDirection direction) override
+        void joystickAxisBindingDetected(ICS::InputControlSystem* ICS, int deviceID, ICS::Control* control, int axis,
+            ICS::Control::ControlChangingDirection direction) override
         {
-            //only allow binding to the trigers
+            // only allow binding to the trigers
             if (axis != SDL_CONTROLLER_AXIS_TRIGGERLEFT && axis != SDL_CONTROLLER_AXIS_TRIGGERRIGHT)
                 return;
             if (mDetectingKeyboard)
                 return;
 
             clearAllControllerBindings(mInputBinder, control);
-            control->setValue(0.5f); //axis bindings must start at 0.5
+            control->setValue(0.5f); // axis bindings must start at 0.5
             control->setInitialValue(0.5f);
             ICS::DetectingBindingListener::joystickAxisBindingDetected(ICS, deviceID, control, axis, direction);
             MWBase::Environment::get().getWindowManager()->notifyInputActionBound();
         }
 
-        void joystickButtonBindingDetected(ICS::InputControlSystem* ICS, int deviceID, ICS::Control* control
-            , unsigned int button, ICS::Control::ControlChangingDirection direction) override
+        void joystickButtonBindingDetected(ICS::InputControlSystem* ICS, int deviceID, ICS::Control* control,
+            unsigned int button, ICS::Control::ControlChangingDirection direction) override
         {
             if (mDetectingKeyboard)
                 return;
-            clearAllControllerBindings(mInputBinder,control);
+            clearAllControllerBindings(mInputBinder, control);
             control->setInitialValue(0.0f);
-            ICS::DetectingBindingListener::joystickButtonBindingDetected (ICS, deviceID, control, button, direction);
+            ICS::DetectingBindingListener::joystickButtonBindingDetected(ICS, deviceID, control, button, direction);
             MWBase::Environment::get().getWindowManager()->notifyInputActionBound();
         }
 
@@ -168,7 +171,7 @@ namespace MWInput
         bool mDetectingKeyboard;
     };
 
-    BindingsManager::BindingsManager(const std::filesystem::path &userFile, bool userFileExists)
+    BindingsManager::BindingsManager(const std::filesystem::path& userFile, bool userFileExists)
         : mUserFile(userFile)
         , mDragDrop(false)
     {
@@ -204,10 +207,12 @@ namespace MWInput
 
     bool BindingsManager::isLeftOrRightButton(int action, bool joystick) const
     {
-        int mouseBinding = mInputBinder->getMouseButtonBinding(mInputBinder->getControl(action), ICS::Control::INCREASE);
+        int mouseBinding
+            = mInputBinder->getMouseButtonBinding(mInputBinder->getControl(action), ICS::Control::INCREASE);
         if (mouseBinding != ICS_MAX_DEVICE_BUTTONS)
             return true;
-        int buttonBinding = mInputBinder->getJoystickButtonBinding(mInputBinder->getControl(action), sFakeDeviceId, ICS::Control::INCREASE);
+        int buttonBinding = mInputBinder->getJoystickButtonBinding(
+            mInputBinder->getControl(action), sFakeDeviceId, ICS::Control::INCREASE);
         if (joystick && (buttonBinding == 0 || buttonBinding == 1))
             return true;
         return false;
@@ -215,13 +220,11 @@ namespace MWInput
 
     void BindingsManager::setPlayerControlsEnabled(bool enabled)
     {
-        int playerChannels[] = {A_AutoMove, A_AlwaysRun, A_ToggleWeapon,
-                                A_ToggleSpell, A_Rest, A_QuickKey1, A_QuickKey2,
-                                A_QuickKey3, A_QuickKey4, A_QuickKey5, A_QuickKey6,
-                                A_QuickKey7, A_QuickKey8, A_QuickKey9, A_QuickKey10,
-                                A_Use, A_Journal};
+        int playerChannels[] = { A_AutoMove, A_AlwaysRun, A_ToggleWeapon, A_ToggleSpell, A_Rest, A_QuickKey1,
+            A_QuickKey2, A_QuickKey3, A_QuickKey4, A_QuickKey5, A_QuickKey6, A_QuickKey7, A_QuickKey8, A_QuickKey9,
+            A_QuickKey10, A_Use, A_Journal };
 
-        for(int pc : playerChannels)
+        for (int pc : playerChannels)
         {
             mInputBinder->getChannel(pc)->setEnabled(enabled);
         }
@@ -232,23 +235,23 @@ namespace MWInput
         mInputBinder->setJoystickDeadZone(deadZone);
     }
 
-    float BindingsManager::getActionValue (int id) const
+    float BindingsManager::getActionValue(int id) const
     {
         return mInputBinder->getChannel(id)->getValue();
     }
 
-    bool BindingsManager::actionIsActive (int id) const
+    bool BindingsManager::actionIsActive(int id) const
     {
         return getActionValue(id) == 1.0;
     }
 
-    void BindingsManager::loadKeyDefaults (bool force)
+    void BindingsManager::loadKeyDefaults(bool force)
     {
         // using hardcoded key defaults is inevitable, if we want the configuration files to stay valid
         // across different versions of OpenMW (in the case where another input action is added)
         std::map<int, SDL_Scancode> defaultKeyBindings;
 
-        //Gets the Keyvalue from the Scancode; gives the button in the same place reguardless of keyboard format
+        // Gets the Keyvalue from the Scancode; gives the button in the same place reguardless of keyboard format
         defaultKeyBindings[A_Activate] = SDL_SCANCODE_SPACE;
         defaultKeyBindings[A_MoveBackward] = SDL_SCANCODE_S;
         defaultKeyBindings[A_MoveForward] = SDL_SCANCODE_W;
@@ -312,38 +315,41 @@ namespace MWInput
                 control = mInputBinder->getChannel(i)->getAttachedControls().front().control;
             }
 
-            if (!controlExists || force ||
-                    (mInputBinder->getKeyBinding(control, ICS::Control::INCREASE) == SDL_SCANCODE_UNKNOWN
-                      && mInputBinder->getMouseButtonBinding(control, ICS::Control::INCREASE) == ICS_MAX_DEVICE_BUTTONS
-                      && mInputBinder->getMouseWheelBinding(control, ICS::Control::INCREASE) == ICS::InputControlSystem::MouseWheelClick::UNASSIGNED))
+            if (!controlExists || force
+                || (mInputBinder->getKeyBinding(control, ICS::Control::INCREASE) == SDL_SCANCODE_UNKNOWN
+                    && mInputBinder->getMouseButtonBinding(control, ICS::Control::INCREASE) == ICS_MAX_DEVICE_BUTTONS
+                    && mInputBinder->getMouseWheelBinding(control, ICS::Control::INCREASE)
+                        == ICS::InputControlSystem::MouseWheelClick::UNASSIGNED))
             {
                 clearAllKeyBindings(mInputBinder.get(), control);
 
                 if (defaultKeyBindings.find(i) != defaultKeyBindings.end()
-                        && (force || !mInputBinder->isKeyBound(defaultKeyBindings[i])))
+                    && (force || !mInputBinder->isKeyBound(defaultKeyBindings[i])))
                 {
                     control->setInitialValue(0.0f);
                     mInputBinder->addKeyBinding(control, defaultKeyBindings[i], ICS::Control::INCREASE);
                 }
                 else if (defaultMouseButtonBindings.find(i) != defaultMouseButtonBindings.end()
-                         && (force || !mInputBinder->isMouseButtonBound(defaultMouseButtonBindings[i])))
+                    && (force || !mInputBinder->isMouseButtonBound(defaultMouseButtonBindings[i])))
                 {
                     control->setInitialValue(0.0f);
                     mInputBinder->addMouseButtonBinding(control, defaultMouseButtonBindings[i], ICS::Control::INCREASE);
                 }
                 else if (defaultMouseWheelBindings.find(i) != defaultMouseWheelBindings.end()
-                        && (force || !mInputBinder->isMouseWheelBound(defaultMouseWheelBindings[i])))
+                    && (force || !mInputBinder->isMouseWheelBound(defaultMouseWheelBindings[i])))
                 {
                     control->setInitialValue(0.f);
                     mInputBinder->addMouseWheelBinding(control, defaultMouseWheelBindings[i], ICS::Control::INCREASE);
                 }
 
-                if (i == A_LookLeftRight && !mInputBinder->isKeyBound(SDL_SCANCODE_KP_4) && !mInputBinder->isKeyBound(SDL_SCANCODE_KP_6))
+                if (i == A_LookLeftRight && !mInputBinder->isKeyBound(SDL_SCANCODE_KP_4)
+                    && !mInputBinder->isKeyBound(SDL_SCANCODE_KP_6))
                 {
                     mInputBinder->addKeyBinding(control, SDL_SCANCODE_KP_6, ICS::Control::INCREASE);
                     mInputBinder->addKeyBinding(control, SDL_SCANCODE_KP_4, ICS::Control::DECREASE);
                 }
-                if (i == A_LookUpDown && !mInputBinder->isKeyBound(SDL_SCANCODE_KP_8) && !mInputBinder->isKeyBound(SDL_SCANCODE_KP_2))
+                if (i == A_LookUpDown && !mInputBinder->isKeyBound(SDL_SCANCODE_KP_8)
+                    && !mInputBinder->isKeyBound(SDL_SCANCODE_KP_2))
                 {
                     mInputBinder->addKeyBinding(control, SDL_SCANCODE_KP_2, ICS::Control::INCREASE);
                     mInputBinder->addKeyBinding(control, SDL_SCANCODE_KP_8, ICS::Control::DECREASE);
@@ -361,7 +367,8 @@ namespace MWInput
         defaultButtonBindings[A_Activate] = SDL_CONTROLLER_BUTTON_A;
         defaultButtonBindings[A_ToggleWeapon] = SDL_CONTROLLER_BUTTON_X;
         defaultButtonBindings[A_ToggleSpell] = SDL_CONTROLLER_BUTTON_Y;
-        //defaultButtonBindings[A_QuickButtonsMenu] = SDL_GetButtonFromScancode(SDL_SCANCODE_F1); // Need to implement, should be ToggleSpell(5) AND Wait(9)
+        // defaultButtonBindings[A_QuickButtonsMenu] = SDL_GetButtonFromScancode(SDL_SCANCODE_F1); // Need to implement,
+        // should be ToggleSpell(5) AND Wait(9)
         defaultButtonBindings[A_Sneak] = SDL_CONTROLLER_BUTTON_LEFTSTICK;
         defaultButtonBindings[A_Journal] = SDL_CONTROLLER_BUTTON_LEFTSHOULDER;
         defaultButtonBindings[A_Rest] = SDL_CONTROLLER_BUTTON_RIGHTSHOULDER;
@@ -391,7 +398,8 @@ namespace MWInput
                 float initial;
                 if (defaultAxisBindings.find(i) == defaultAxisBindings.end())
                     initial = 0.0f;
-                else initial = 0.5f;
+                else
+                    initial = 0.5f;
                 control = new ICS::Control(std::to_string(i), false, true, initial, ICS::ICS_MAX, ICS::ICS_MAX);
                 mInputBinder->addControl(control);
                 control->attachChannel(mInputBinder->getChannel(i), ICS::Channel::DIRECT);
@@ -401,22 +409,28 @@ namespace MWInput
                 control = mInputBinder->getChannel(i)->getAttachedControls().front().control;
             }
 
-            if (!controlExists || force || (mInputBinder->getJoystickAxisBinding(control, sFakeDeviceId, ICS::Control::INCREASE) == ICS::InputControlSystem::UNASSIGNED &&
-                mInputBinder->getJoystickButtonBinding(control, sFakeDeviceId, ICS::Control::INCREASE) == ICS_MAX_DEVICE_BUTTONS))
+            if (!controlExists || force
+                || (mInputBinder->getJoystickAxisBinding(control, sFakeDeviceId, ICS::Control::INCREASE)
+                        == ICS::InputControlSystem::UNASSIGNED
+                    && mInputBinder->getJoystickButtonBinding(control, sFakeDeviceId, ICS::Control::INCREASE)
+                        == ICS_MAX_DEVICE_BUTTONS))
             {
                 clearAllControllerBindings(mInputBinder.get(), control);
 
                 if (defaultButtonBindings.find(i) != defaultButtonBindings.end()
-                        && (force || !mInputBinder->isJoystickButtonBound(sFakeDeviceId, defaultButtonBindings[i])))
+                    && (force || !mInputBinder->isJoystickButtonBound(sFakeDeviceId, defaultButtonBindings[i])))
                 {
                     control->setInitialValue(0.0f);
-                    mInputBinder->addJoystickButtonBinding(control, sFakeDeviceId, defaultButtonBindings[i], ICS::Control::INCREASE);
+                    mInputBinder->addJoystickButtonBinding(
+                        control, sFakeDeviceId, defaultButtonBindings[i], ICS::Control::INCREASE);
                 }
-                else if (defaultAxisBindings.find(i) != defaultAxisBindings.end() && (force || !mInputBinder->isJoystickAxisBound(sFakeDeviceId, defaultAxisBindings[i])))
+                else if (defaultAxisBindings.find(i) != defaultAxisBindings.end()
+                    && (force || !mInputBinder->isJoystickAxisBound(sFakeDeviceId, defaultAxisBindings[i])))
                 {
                     control->setValue(0.5f);
                     control->setInitialValue(0.5f);
-                    mInputBinder->addJoystickAxisBinding(control, sFakeDeviceId, defaultAxisBindings[i], ICS::Control::INCREASE);
+                    mInputBinder->addJoystickAxisBinding(
+                        control, sFakeDeviceId, defaultAxisBindings[i], ICS::Control::INCREASE);
                 }
             }
         }
@@ -550,39 +564,36 @@ namespace MWInput
 
         ICS::Control* c = mInputBinder->getChannel(action)->getAttachedControls().front().control;
 
-        if (mInputBinder->getJoystickAxisBinding(c, sFakeDeviceId, ICS::Control::INCREASE) != ICS::InputControlSystem::UNASSIGNED)
-            return SDLUtil::sdlControllerAxisToString(mInputBinder->getJoystickAxisBinding(c, sFakeDeviceId, ICS::Control::INCREASE));
-        else if (mInputBinder->getJoystickButtonBinding(c, sFakeDeviceId, ICS::Control::INCREASE) != ICS_MAX_DEVICE_BUTTONS)
-            return SDLUtil::sdlControllerButtonToString(mInputBinder->getJoystickButtonBinding(c, sFakeDeviceId, ICS::Control::INCREASE));
+        if (mInputBinder->getJoystickAxisBinding(c, sFakeDeviceId, ICS::Control::INCREASE)
+            != ICS::InputControlSystem::UNASSIGNED)
+            return SDLUtil::sdlControllerAxisToString(
+                mInputBinder->getJoystickAxisBinding(c, sFakeDeviceId, ICS::Control::INCREASE));
+        else if (mInputBinder->getJoystickButtonBinding(c, sFakeDeviceId, ICS::Control::INCREASE)
+            != ICS_MAX_DEVICE_BUTTONS)
+            return SDLUtil::sdlControllerButtonToString(
+                mInputBinder->getJoystickButtonBinding(c, sFakeDeviceId, ICS::Control::INCREASE));
         else
             return "#{sNone}";
     }
 
     const std::initializer_list<int>& BindingsManager::getActionKeySorting()
     {
-        static const std::initializer_list<int> actions
-        {
-            A_MoveForward, A_MoveBackward, A_MoveLeft, A_MoveRight, A_TogglePOV, A_ZoomIn, A_ZoomOut,
-            A_Run, A_AlwaysRun, A_Sneak, A_Activate, A_Use, A_ToggleWeapon, A_ToggleSpell,
-            A_CycleSpellLeft, A_CycleSpellRight, A_CycleWeaponLeft, A_CycleWeaponRight, A_AutoMove,
-            A_Jump, A_Inventory, A_Journal, A_Rest, A_Console, A_QuickSave, A_QuickLoad,
-            A_ToggleHUD, A_Screenshot, A_QuickKeysMenu, A_QuickKey1, A_QuickKey2, A_QuickKey3,
-            A_QuickKey4, A_QuickKey5, A_QuickKey6, A_QuickKey7, A_QuickKey8, A_QuickKey9, A_QuickKey10,
-            A_TogglePostProcessorHUD
-        };
+        static const std::initializer_list<int> actions{ A_MoveForward, A_MoveBackward, A_MoveLeft, A_MoveRight,
+            A_TogglePOV, A_ZoomIn, A_ZoomOut, A_Run, A_AlwaysRun, A_Sneak, A_Activate, A_Use, A_ToggleWeapon,
+            A_ToggleSpell, A_CycleSpellLeft, A_CycleSpellRight, A_CycleWeaponLeft, A_CycleWeaponRight, A_AutoMove,
+            A_Jump, A_Inventory, A_Journal, A_Rest, A_Console, A_QuickSave, A_QuickLoad, A_ToggleHUD, A_Screenshot,
+            A_QuickKeysMenu, A_QuickKey1, A_QuickKey2, A_QuickKey3, A_QuickKey4, A_QuickKey5, A_QuickKey6, A_QuickKey7,
+            A_QuickKey8, A_QuickKey9, A_QuickKey10, A_TogglePostProcessorHUD };
 
         return actions;
     }
     const std::initializer_list<int>& BindingsManager::getActionControllerSorting()
     {
-        static const std::initializer_list<int> actions
-        {
-            A_TogglePOV, A_ZoomIn, A_ZoomOut, A_Sneak, A_Activate, A_Use, A_ToggleWeapon, A_ToggleSpell,
-            A_AutoMove, A_Jump, A_Inventory, A_Journal, A_Rest, A_QuickSave, A_QuickLoad, A_ToggleHUD,
-            A_Screenshot, A_QuickKeysMenu, A_QuickKey1, A_QuickKey2, A_QuickKey3, A_QuickKey4,
-            A_QuickKey5, A_QuickKey6, A_QuickKey7, A_QuickKey8, A_QuickKey9, A_QuickKey10,
-            A_CycleSpellLeft, A_CycleSpellRight, A_CycleWeaponLeft, A_CycleWeaponRight
-        };
+        static const std::initializer_list<int> actions{ A_TogglePOV, A_ZoomIn, A_ZoomOut, A_Sneak, A_Activate, A_Use,
+            A_ToggleWeapon, A_ToggleSpell, A_AutoMove, A_Jump, A_Inventory, A_Journal, A_Rest, A_QuickSave, A_QuickLoad,
+            A_ToggleHUD, A_Screenshot, A_QuickKeysMenu, A_QuickKey1, A_QuickKey2, A_QuickKey3, A_QuickKey4, A_QuickKey5,
+            A_QuickKey6, A_QuickKey7, A_QuickKey8, A_QuickKey9, A_QuickKey10, A_CycleSpellLeft, A_CycleSpellRight,
+            A_CycleWeaponLeft, A_CycleWeaponRight };
 
         return actions;
     }
@@ -599,57 +610,57 @@ namespace MWInput
         return mInputBinder->detectingBindingState();
     }
 
-    void BindingsManager::mousePressed(const SDL_MouseButtonEvent &arg, int deviceID)
+    void BindingsManager::mousePressed(const SDL_MouseButtonEvent& arg, int deviceID)
     {
         mInputBinder->mousePressed(arg, deviceID);
     }
 
-    void BindingsManager::mouseReleased(const SDL_MouseButtonEvent &arg, int deviceID)
+    void BindingsManager::mouseReleased(const SDL_MouseButtonEvent& arg, int deviceID)
     {
         mInputBinder->mouseReleased(arg, deviceID);
     }
 
-    void BindingsManager::mouseMoved(const SDLUtil::MouseMotionEvent &arg)
+    void BindingsManager::mouseMoved(const SDLUtil::MouseMotionEvent& arg)
     {
         mInputBinder->mouseMoved(arg);
     }
 
-    void BindingsManager::mouseWheelMoved(const SDL_MouseWheelEvent &arg)
+    void BindingsManager::mouseWheelMoved(const SDL_MouseWheelEvent& arg)
     {
         mInputBinder->mouseWheelMoved(arg);
     }
 
-    void BindingsManager::keyPressed(const SDL_KeyboardEvent &arg)
+    void BindingsManager::keyPressed(const SDL_KeyboardEvent& arg)
     {
         mInputBinder->keyPressed(arg);
     }
 
-    void BindingsManager::keyReleased(const SDL_KeyboardEvent &arg)
+    void BindingsManager::keyReleased(const SDL_KeyboardEvent& arg)
     {
         mInputBinder->keyReleased(arg);
     }
 
-    void BindingsManager::controllerAdded(int deviceID, const SDL_ControllerDeviceEvent &arg)
+    void BindingsManager::controllerAdded(int deviceID, const SDL_ControllerDeviceEvent& arg)
     {
         mInputBinder->controllerAdded(deviceID, arg);
     }
 
-    void BindingsManager::controllerRemoved(const SDL_ControllerDeviceEvent &arg)
+    void BindingsManager::controllerRemoved(const SDL_ControllerDeviceEvent& arg)
     {
         mInputBinder->controllerRemoved(arg);
     }
 
-    void BindingsManager::controllerButtonPressed(int deviceID, const SDL_ControllerButtonEvent &arg)
+    void BindingsManager::controllerButtonPressed(int deviceID, const SDL_ControllerButtonEvent& arg)
     {
         mInputBinder->buttonPressed(deviceID, arg);
     }
 
-    void BindingsManager::controllerButtonReleased(int deviceID, const SDL_ControllerButtonEvent &arg)
+    void BindingsManager::controllerButtonReleased(int deviceID, const SDL_ControllerButtonEvent& arg)
     {
         mInputBinder->buttonReleased(deviceID, arg);
     }
 
-    void BindingsManager::controllerAxisMoved(int deviceID, const SDL_ControllerAxisEvent &arg)
+    void BindingsManager::controllerAxisMoved(int deviceID, const SDL_ControllerAxisEvent& arg)
     {
         mInputBinder->axisMoved(deviceID, arg);
     }
@@ -675,11 +686,11 @@ namespace MWInput
         if (mDragDrop && action != A_GameMenu && action != A_Inventory)
             return;
 
-        if ((previousValue == 1 || previousValue == 0) && (currentValue==1 || currentValue==0))
+        if ((previousValue == 1 || previousValue == 0) && (currentValue == 1 || currentValue == 0))
         {
-            //Is a normal button press, so don't change it at all
+            // Is a normal button press, so don't change it at all
         }
-        //Otherwise only trigger button presses as they go through specific points
+        // Otherwise only trigger button presses as they go through specific points
         else if (previousValue >= 0.8 && currentValue < 0.8)
         {
             currentValue = 0.0;
@@ -692,7 +703,7 @@ namespace MWInput
         }
         else
         {
-            //If it's not switching between those values, ignore the channel change.
+            // If it's not switching between those values, ignore the channel change.
             return;
         }
 
@@ -723,7 +734,8 @@ namespace MWInput
                     action = A_CycleSpellLeft;
 
                 else
-                    MWBase::Environment::get().getInputManager()->setAttemptJump(currentValue == 1.0 && previousValue == 0.0);
+                    MWBase::Environment::get().getInputManager()->setAttemptJump(
+                        currentValue == 1.0 && previousValue == 0.0);
             }
         }
 
diff --git a/apps/openmw/mwinput/bindingsmanager.hpp b/apps/openmw/mwinput/bindingsmanager.hpp
index a3b3825b99..a11baf74de 100644
--- a/apps/openmw/mwinput/bindingsmanager.hpp
+++ b/apps/openmw/mwinput/bindingsmanager.hpp
@@ -1,10 +1,10 @@
 #ifndef MWINPUT_MWBINDINGSMANAGER_H
 #define MWINPUT_MWBINDINGSMANAGER_H
 
+#include <filesystem>
 #include <memory>
 #include <string>
 #include <vector>
-#include <filesystem>
 
 #include <components/sdlutil/events.hpp>
 
@@ -16,17 +16,17 @@ namespace MWInput
     class BindingsManager
     {
     public:
-        BindingsManager(const std::filesystem::path &userFile, bool userFileExists);
+        BindingsManager(const std::filesystem::path& userFile, bool userFileExists);
 
         virtual ~BindingsManager();
 
         std::string_view getActionDescription(int action);
-        std::string getActionKeyBindingName (int action);
-        std::string getActionControllerBindingName (int action);
+        std::string getActionKeyBindingName(int action);
+        std::string getActionControllerBindingName(int action);
         const std::initializer_list<int>& getActionKeySorting();
         const std::initializer_list<int>& getActionControllerSorting();
 
-        void enableDetectingBindingMode (int action, bool keyboard);
+        void enableDetectingBindingMode(int action, bool keyboard);
         bool isDetectingBindingState() const;
 
         void loadKeyDefaults(bool force = false);
@@ -43,23 +43,23 @@ namespace MWInput
         bool isLeftOrRightButton(int action, bool joystick) const;
 
         bool actionIsActive(int id) const;
-        float getActionValue(int id) const;  // returns value in range [0, 1]
+        float getActionValue(int id) const; // returns value in range [0, 1]
 
         SDL_GameController* getControllerOrNull() const;
 
-        void mousePressed(const SDL_MouseButtonEvent &evt, int deviceID);
-        void mouseReleased(const SDL_MouseButtonEvent &arg, int deviceID);
-        void mouseMoved(const SDLUtil::MouseMotionEvent &arg);
-        void mouseWheelMoved(const SDL_MouseWheelEvent &arg);
+        void mousePressed(const SDL_MouseButtonEvent& evt, int deviceID);
+        void mouseReleased(const SDL_MouseButtonEvent& arg, int deviceID);
+        void mouseMoved(const SDLUtil::MouseMotionEvent& arg);
+        void mouseWheelMoved(const SDL_MouseWheelEvent& arg);
 
-        void keyPressed(const SDL_KeyboardEvent &arg);
-        void keyReleased(const SDL_KeyboardEvent &arg);
+        void keyPressed(const SDL_KeyboardEvent& arg);
+        void keyReleased(const SDL_KeyboardEvent& arg);
 
-        void controllerAdded(int deviceID, const SDL_ControllerDeviceEvent &arg);
-        void controllerRemoved(const SDL_ControllerDeviceEvent &arg);
-        void controllerButtonPressed(int deviceID, const SDL_ControllerButtonEvent &arg);
-        void controllerButtonReleased(int deviceID, const SDL_ControllerButtonEvent &arg);
-        void controllerAxisMoved(int deviceID, const SDL_ControllerAxisEvent &arg);
+        void controllerAdded(int deviceID, const SDL_ControllerDeviceEvent& arg);
+        void controllerRemoved(const SDL_ControllerDeviceEvent& arg);
+        void controllerButtonPressed(int deviceID, const SDL_ControllerButtonEvent& arg);
+        void controllerButtonReleased(int deviceID, const SDL_ControllerButtonEvent& arg);
+        void controllerAxisMoved(int deviceID, const SDL_ControllerAxisEvent& arg);
 
         SDL_Scancode getKeyBinding(int actionId);
 
diff --git a/apps/openmw/mwinput/controllermanager.cpp b/apps/openmw/mwinput/controllermanager.cpp
index d6ed81cd15..61f912aa0d 100644
--- a/apps/openmw/mwinput/controllermanager.cpp
+++ b/apps/openmw/mwinput/controllermanager.cpp
@@ -6,8 +6,8 @@
 #include <SDL.h>
 
 #include <components/debug/debuglog.hpp>
-#include <components/sdlutil/sdlmappings.hpp>
 #include <components/files/conversion.hpp>
+#include <components/sdlutil/sdlmappings.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/inputmanager.hpp"
@@ -18,22 +18,20 @@
 
 #include "../mwworld/player.hpp"
 
-#include "actions.hpp"
 #include "actionmanager.hpp"
+#include "actions.hpp"
 #include "bindingsmanager.hpp"
 #include "mousemanager.hpp"
 
 namespace MWInput
 {
-    ControllerManager::ControllerManager(BindingsManager* bindingsManager,
-            ActionManager* actionManager,
-            MouseManager* mouseManager,
-            const std::filesystem::path &userControllerBindingsFile,
-            const std::filesystem::path &controllerBindingsFile)
+    ControllerManager::ControllerManager(BindingsManager* bindingsManager, ActionManager* actionManager,
+        MouseManager* mouseManager, const std::filesystem::path& userControllerBindingsFile,
+        const std::filesystem::path& controllerBindingsFile)
         : mBindingsManager(bindingsManager)
         , mActionManager(actionManager)
         , mMouseManager(mouseManager)
-        , mJoystickEnabled (Settings::Manager::getBool("enable controller", "Input"))
+        , mJoystickEnabled(Settings::Manager::getBool("enable controller", "Input"))
         , mGyroAvailable(false)
         , mGamepadCursorSpeed(Settings::Manager::getFloat("gamepad cursor speed", "Input"))
         , mSneakToggleShortcutTimer(0.f)
@@ -135,7 +133,7 @@ namespace MWInput
             if (yAxis != 0.5)
             {
                 triedToMove = true;
-                player.setAutoMove (false);
+                player.setAutoMove(false);
                 player.setForwardBackward((0.5f - yAxis) * 2);
             }
 
@@ -183,13 +181,13 @@ namespace MWInput
         return triedToMove;
     }
 
-    void ControllerManager::buttonPressed(int deviceID, const SDL_ControllerButtonEvent &arg)
+    void ControllerManager::buttonPressed(int deviceID, const SDL_ControllerButtonEvent& arg)
     {
         if (!mJoystickEnabled || mBindingsManager->isDetectingBindingState())
             return;
 
         MWBase::Environment::get().getLuaManager()->inputEvent(
-            {MWBase::LuaManager::InputEvent::ControllerPressed, arg.button});
+            { MWBase::LuaManager::InputEvent::ControllerPressed, arg.button });
 
         mJoystickLastUsed = true;
         if (MWBase::Environment::get().getWindowManager()->isGuiMode())
@@ -205,7 +203,8 @@ namespace MWInput
                     bool mousePressSuccess = mMouseManager->injectMouseButtonPress(SDL_BUTTON_LEFT);
                     if (MyGUI::InputManager::getInstance().getMouseFocusWidget())
                     {
-                        MyGUI::Button* b = MyGUI::InputManager::getInstance().getMouseFocusWidget()->castType<MyGUI::Button>(false);
+                        MyGUI::Button* b
+                            = MyGUI::InputManager::getInstance().getMouseFocusWidget()->castType<MyGUI::Button>(false);
                         if (b && b->getEnabled())
                             MWBase::Environment::get().getWindowManager()->playSound("Menu Click");
                     }
@@ -217,7 +216,7 @@ namespace MWInput
         else
             mBindingsManager->setPlayerControlsEnabled(true);
 
-        //esc, to leave initial movie screen
+        // esc, to leave initial movie screen
         auto kc = SDLUtil::sdlKeyToMyGUI(SDLK_ESCAPE);
         mBindingsManager->setPlayerControlsEnabled(!MyGUI::InputManager::getInstance().injectKeyPress(kc, 0));
 
@@ -225,7 +224,7 @@ namespace MWInput
             mBindingsManager->controllerButtonPressed(deviceID, arg);
     }
 
-    void ControllerManager::buttonReleased(int deviceID, const SDL_ControllerButtonEvent &arg)
+    void ControllerManager::buttonReleased(int deviceID, const SDL_ControllerButtonEvent& arg)
     {
         if (mBindingsManager->isDetectingBindingState())
         {
@@ -236,7 +235,7 @@ namespace MWInput
         if (mJoystickEnabled)
         {
             MWBase::Environment::get().getLuaManager()->inputEvent(
-                {MWBase::LuaManager::InputEvent::ControllerReleased, arg.button});
+                { MWBase::LuaManager::InputEvent::ControllerReleased, arg.button });
         }
 
         if (!mJoystickEnabled || MWBase::Environment::get().getInputManager()->controlsDisabled())
@@ -251,7 +250,8 @@ namespace MWInput
                 if (arg.button == SDL_CONTROLLER_BUTTON_A) // We'll pretend that A is left click.
                 {
                     bool mousePressSuccess = mMouseManager->injectMouseButtonRelease(SDL_BUTTON_LEFT);
-                    if (mBindingsManager->isDetectingBindingState()) // If the player just triggered binding, don't let button release bind.
+                    if (mBindingsManager->isDetectingBindingState()) // If the player just triggered binding, don't let
+                                                                     // button release bind.
                         return;
 
                     mBindingsManager->setPlayerControlsEnabled(!mousePressSuccess);
@@ -261,14 +261,14 @@ namespace MWInput
         else
             mBindingsManager->setPlayerControlsEnabled(true);
 
-        //esc, to leave initial movie screen
+        // esc, to leave initial movie screen
         auto kc = SDLUtil::sdlKeyToMyGUI(SDLK_ESCAPE);
         mBindingsManager->setPlayerControlsEnabled(!MyGUI::InputManager::getInstance().injectKeyRelease(kc));
 
         mBindingsManager->controllerButtonReleased(deviceID, arg);
     }
 
-    void ControllerManager::axisMoved(int deviceID, const SDL_ControllerAxisEvent &arg)
+    void ControllerManager::axisMoved(int deviceID, const SDL_ControllerAxisEvent& arg)
     {
         if (!mJoystickEnabled || MWBase::Environment::get().getInputManager()->controlsDisabled())
             return;
@@ -278,8 +278,8 @@ namespace MWInput
         {
             gamepadToGuiControl(arg);
         }
-        else if (mBindingsManager->actionIsActive(A_TogglePOV) &&
-                (arg.axis == SDL_CONTROLLER_AXIS_TRIGGERRIGHT || arg.axis == SDL_CONTROLLER_AXIS_TRIGGERLEFT))
+        else if (mBindingsManager->actionIsActive(A_TogglePOV)
+            && (arg.axis == SDL_CONTROLLER_AXIS_TRIGGERRIGHT || arg.axis == SDL_CONTROLLER_AXIS_TRIGGERLEFT))
         {
             // Preview Mode Gamepad Zooming; do not propagate to mBindingsManager
             return;
@@ -287,18 +287,18 @@ namespace MWInput
         mBindingsManager->controllerAxisMoved(deviceID, arg);
     }
 
-    void ControllerManager::controllerAdded(int deviceID, const SDL_ControllerDeviceEvent &arg)
+    void ControllerManager::controllerAdded(int deviceID, const SDL_ControllerDeviceEvent& arg)
     {
         mBindingsManager->controllerAdded(deviceID, arg);
         enableGyroSensor();
     }
 
-    void ControllerManager::controllerRemoved(const SDL_ControllerDeviceEvent &arg)
+    void ControllerManager::controllerRemoved(const SDL_ControllerDeviceEvent& arg)
     {
         mBindingsManager->controllerRemoved(arg);
     }
 
-    bool ControllerManager::gamepadToGuiControl(const SDL_ControllerButtonEvent &arg)
+    bool ControllerManager::gamepadToGuiControl(const SDL_ControllerButtonEvent& arg)
     {
         // Presumption of GUI mode will be removed in the future.
         // MyGUI KeyCodes *may* change.
@@ -357,7 +357,7 @@ namespace MWInput
         return true;
     }
 
-    bool ControllerManager::gamepadToGuiControl(const SDL_ControllerAxisEvent &arg)
+    bool ControllerManager::gamepadToGuiControl(const SDL_ControllerAxisEvent& arg)
     {
         switch (arg.axis)
         {
@@ -406,16 +406,16 @@ namespace MWInput
     void ControllerManager::enableGyroSensor()
     {
         mGyroAvailable = false;
-        #if SDL_VERSION_ATLEAST(2, 0, 14)
-            SDL_GameController* cntrl = mBindingsManager->getControllerOrNull();
-            if (!cntrl)
-                return;
-            if (!SDL_GameControllerHasSensor(cntrl, SDL_SENSOR_GYRO))
-                return;
-            if (SDL_GameControllerSetSensorEnabled(cntrl, SDL_SENSOR_GYRO, SDL_TRUE) < 0)
-                return;
-            mGyroAvailable = true;
-        #endif
+#if SDL_VERSION_ATLEAST(2, 0, 14)
+        SDL_GameController* cntrl = mBindingsManager->getControllerOrNull();
+        if (!cntrl)
+            return;
+        if (!SDL_GameControllerHasSensor(cntrl, SDL_SENSOR_GYRO))
+            return;
+        if (SDL_GameControllerSetSensorEnabled(cntrl, SDL_SENSOR_GYRO, SDL_TRUE) < 0)
+            return;
+        mGyroAvailable = true;
+#endif
     }
 
     bool ControllerManager::isGyroAvailable() const
@@ -426,29 +426,26 @@ namespace MWInput
     std::array<float, 3> ControllerManager::getGyroValues() const
     {
         float gyro[3] = { 0.f };
-        #if SDL_VERSION_ATLEAST(2, 0, 14)
-            SDL_GameController* cntrl = mBindingsManager->getControllerOrNull();
-            if (cntrl && mGyroAvailable)
-                SDL_GameControllerGetSensorData(cntrl, SDL_SENSOR_GYRO, gyro, 3);
-        #endif
-        return std::array<float, 3>({gyro[0], gyro[1], gyro[2]});
+#if SDL_VERSION_ATLEAST(2, 0, 14)
+        SDL_GameController* cntrl = mBindingsManager->getControllerOrNull();
+        if (cntrl && mGyroAvailable)
+            SDL_GameControllerGetSensorData(cntrl, SDL_SENSOR_GYRO, gyro, 3);
+#endif
+        return std::array<float, 3>({ gyro[0], gyro[1], gyro[2] });
     }
 
     void ControllerManager::touchpadMoved(int deviceId, const SDLUtil::TouchEvent& arg)
     {
-        MWBase::Environment::get().getLuaManager()->inputEvent(
-            { MWBase::LuaManager::InputEvent::TouchMoved, arg });
+        MWBase::Environment::get().getLuaManager()->inputEvent({ MWBase::LuaManager::InputEvent::TouchMoved, arg });
     }
 
     void ControllerManager::touchpadPressed(int deviceId, const SDLUtil::TouchEvent& arg)
     {
-        MWBase::Environment::get().getLuaManager()->inputEvent(
-            { MWBase::LuaManager::InputEvent::TouchPressed, arg });
+        MWBase::Environment::get().getLuaManager()->inputEvent({ MWBase::LuaManager::InputEvent::TouchPressed, arg });
     }
 
     void ControllerManager::touchpadReleased(int deviceId, const SDLUtil::TouchEvent& arg)
     {
-        MWBase::Environment::get().getLuaManager()->inputEvent(
-            { MWBase::LuaManager::InputEvent::TouchReleased, arg });
+        MWBase::Environment::get().getLuaManager()->inputEvent({ MWBase::LuaManager::InputEvent::TouchReleased, arg });
     }
 }
diff --git a/apps/openmw/mwinput/controllermanager.hpp b/apps/openmw/mwinput/controllermanager.hpp
index ea89c8aec3..cbd279204f 100644
--- a/apps/openmw/mwinput/controllermanager.hpp
+++ b/apps/openmw/mwinput/controllermanager.hpp
@@ -3,8 +3,8 @@
 
 #include <string>
 
-#include <components/settings/settings.hpp>
 #include <components/sdlutil/events.hpp>
+#include <components/settings/settings.hpp>
 #include <filesystem>
 
 namespace MWInput
@@ -16,21 +16,19 @@ namespace MWInput
     class ControllerManager : public SDLUtil::ControllerListener
     {
     public:
-        ControllerManager(BindingsManager* bindingsManager,
-            ActionManager* actionManager,
-            MouseManager* mouseManager,
-            const std::filesystem::path &userControllerBindingsFile,
-            const std::filesystem::path &controllerBindingsFile);
+        ControllerManager(BindingsManager* bindingsManager, ActionManager* actionManager, MouseManager* mouseManager,
+            const std::filesystem::path& userControllerBindingsFile,
+            const std::filesystem::path& controllerBindingsFile);
 
         virtual ~ControllerManager() = default;
 
         bool update(float dt);
 
-        void buttonPressed(int deviceID, const SDL_ControllerButtonEvent &arg) override;
-        void buttonReleased(int deviceID, const SDL_ControllerButtonEvent &arg) override;
-        void axisMoved(int deviceID, const SDL_ControllerAxisEvent &arg) override;
-        void controllerAdded(int deviceID, const SDL_ControllerDeviceEvent &arg) override;
-        void controllerRemoved(const SDL_ControllerDeviceEvent &arg) override;
+        void buttonPressed(int deviceID, const SDL_ControllerButtonEvent& arg) override;
+        void buttonReleased(int deviceID, const SDL_ControllerButtonEvent& arg) override;
+        void axisMoved(int deviceID, const SDL_ControllerAxisEvent& arg) override;
+        void controllerAdded(int deviceID, const SDL_ControllerDeviceEvent& arg) override;
+        void controllerRemoved(const SDL_ControllerDeviceEvent& arg) override;
 
         void touchpadMoved(int deviceId, const SDLUtil::TouchEvent& arg) override;
         void touchpadPressed(int deviceId, const SDLUtil::TouchEvent& arg) override;
@@ -46,7 +44,7 @@ namespace MWInput
         void setGamepadGuiCursorEnabled(bool enabled) { mGamepadGuiCursorEnabled = enabled; }
         bool gamepadGuiCursorEnabled() const { return mGamepadGuiCursorEnabled; }
 
-        float getAxisValue(SDL_GameControllerAxis axis) const;  // returns value in range [-1, 1]
+        float getAxisValue(SDL_GameControllerAxis axis) const; // returns value in range [-1, 1]
         bool isButtonPressed(SDL_GameControllerButton button) const;
 
         bool isGyroAvailable() const;
@@ -54,8 +52,8 @@ namespace MWInput
 
     private:
         // Return true if GUI consumes input.
-        bool gamepadToGuiControl(const SDL_ControllerButtonEvent &arg);
-        bool gamepadToGuiControl(const SDL_ControllerAxisEvent &arg);
+        bool gamepadToGuiControl(const SDL_ControllerButtonEvent& arg);
+        bool gamepadToGuiControl(const SDL_ControllerAxisEvent& arg);
 
         void enableGyroSensor();
 
diff --git a/apps/openmw/mwinput/controlswitch.cpp b/apps/openmw/mwinput/controlswitch.cpp
index da8df3ac6b..74fa101e4e 100644
--- a/apps/openmw/mwinput/controlswitch.cpp
+++ b/apps/openmw/mwinput/controlswitch.cpp
@@ -1,8 +1,8 @@
 #include "controlswitch.hpp"
 
-#include <components/esm3/esmwriter.hpp>
-#include <components/esm3/esmreader.hpp>
 #include <components/esm3/controlsstate.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 #include <components/loadinglistener/loadinglistener.hpp>
 
@@ -20,13 +20,13 @@ namespace MWInput
 
     void ControlSwitch::clear()
     {
-        mSwitches["playercontrols"]      = true;
-        mSwitches["playerfighting"]      = true;
-        mSwitches["playerjumping"]       = true;
-        mSwitches["playerlooking"]       = true;
-        mSwitches["playermagic"]         = true;
-        mSwitches["playerviewswitch"]    = true;
-        mSwitches["vanitymode"]          = true;
+        mSwitches["playercontrols"] = true;
+        mSwitches["playerfighting"] = true;
+        mSwitches["playerjumping"] = true;
+        mSwitches["playerlooking"] = true;
+        mSwitches["playermagic"] = true;
+        mSwitches["playerviewswitch"] = true;
+        mSwitches["vanitymode"] = true;
     }
 
     bool ControlSwitch::get(std::string_view key)
@@ -75,9 +75,9 @@ namespace MWInput
         controls.mWeaponDrawingDisabled = !mSwitches["playerfighting"];
         controls.mSpellDrawingDisabled = !mSwitches["playermagic"];
 
-        writer.startRecord (ESM::REC_INPU);
+        writer.startRecord(ESM::REC_INPU);
         controls.save(writer);
-        writer.endRecord (ESM::REC_INPU);
+        writer.endRecord(ESM::REC_INPU);
     }
 
     void ControlSwitch::readRecord(ESM::ESMReader& reader, uint32_t type)
diff --git a/apps/openmw/mwinput/gyromanager.cpp b/apps/openmw/mwinput/gyromanager.cpp
index b0c6f121c5..1ffa368729 100644
--- a/apps/openmw/mwinput/gyromanager.cpp
+++ b/apps/openmw/mwinput/gyromanager.cpp
@@ -1,7 +1,7 @@
 #include "gyromanager.hpp"
 
-#include "../mwbase/inputmanager.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/inputmanager.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwworld/player.hpp"
 
@@ -33,7 +33,8 @@ namespace MWInput
         , mInputThreshold(Settings::Manager::getFloat("gyro input threshold", "Input"))
         , mAxisH(gyroscopeAxisFromString(Settings::Manager::getString("gyro horizontal axis", "Input")))
         , mAxisV(gyroscopeAxisFromString(Settings::Manager::getString("gyro vertical axis", "Input")))
-    {}
+    {
+    }
 
     void GyroManager::update(float dt, std::array<float, 3> values) const
     {
diff --git a/apps/openmw/mwinput/gyromanager.hpp b/apps/openmw/mwinput/gyromanager.hpp
index bcd3b88f49..c9877945a6 100644
--- a/apps/openmw/mwinput/gyromanager.hpp
+++ b/apps/openmw/mwinput/gyromanager.hpp
@@ -7,40 +7,40 @@ namespace MWInput
 {
     class GyroManager
     {
-        public:
-            GyroManager();
+    public:
+        GyroManager();
 
-            bool isEnabled() const { return mEnabled; }
+        bool isEnabled() const { return mEnabled; }
 
-            void update(float dt, std::array<float, 3> values) const;
+        void update(float dt, std::array<float, 3> values) const;
 
-            void processChangedSettings(const Settings::CategorySettingVector& changed);
+        void processChangedSettings(const Settings::CategorySettingVector& changed);
 
-            void setGuiCursorEnabled(bool enabled) { mGuiCursorEnabled = enabled; }
+        void setGuiCursorEnabled(bool enabled) { mGuiCursorEnabled = enabled; }
 
-        private:
-            enum GyroscopeAxis
-            {
-                Unknown = 0,
-                X = 1,
-                Y = 2,
-                Z = 3,
-                Minus_X = -1,
-                Minus_Y = -2,
-                Minus_Z = -3
-            };
+    private:
+        enum GyroscopeAxis
+        {
+            Unknown = 0,
+            X = 1,
+            Y = 2,
+            Z = 3,
+            Minus_X = -1,
+            Minus_Y = -2,
+            Minus_Z = -3
+        };
 
-            static GyroscopeAxis gyroscopeAxisFromString(std::string_view s);
+        static GyroscopeAxis gyroscopeAxisFromString(std::string_view s);
 
-            bool mEnabled;
-            bool mGuiCursorEnabled;
-            float mSensitivityH;
-            float mSensitivityV;
-            float mInputThreshold;
-            GyroscopeAxis mAxisH;
-            GyroscopeAxis mAxisV;
+        bool mEnabled;
+        bool mGuiCursorEnabled;
+        float mSensitivityH;
+        float mSensitivityV;
+        float mInputThreshold;
+        GyroscopeAxis mAxisH;
+        GyroscopeAxis mAxisV;
 
-            float getAxisValue(GyroscopeAxis axis, std::array<float, 3> values) const;
+        float getAxisValue(GyroscopeAxis axis, std::array<float, 3> values) const;
     };
 }
 
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index abe9996e01..e31c0f1318 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -2,12 +2,12 @@
 
 #include <osgViewer/ViewerEventHandlers>
 
-#include <components/sdlutil/sdlinputwrapper.hpp>
-#include <components/esm3/esmwriter.hpp>
 #include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/sdlutil/sdlinputwrapper.hpp>
 
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
 #include "../mwworld/esmstore.hpp"
@@ -16,28 +16,29 @@
 #include "bindingsmanager.hpp"
 #include "controllermanager.hpp"
 #include "controlswitch.hpp"
+#include "gyromanager.hpp"
 #include "keyboardmanager.hpp"
 #include "mousemanager.hpp"
 #include "sensormanager.hpp"
-#include "gyromanager.hpp"
 
 namespace MWInput
 {
-    InputManager::InputManager(
-            SDL_Window* window,
-            osg::ref_ptr<osgViewer::Viewer> viewer,
-            osg::ref_ptr<osgViewer::ScreenCaptureHandler> screenCaptureHandler,
-            osgViewer::ScreenCaptureHandler::CaptureOperation *screenCaptureOperation,
-            const std::filesystem::path &userFile, bool userFileExists, const std::filesystem::path &userControllerBindingsFile,
-            const std::filesystem::path &controllerBindingsFile, bool grab)
+    InputManager::InputManager(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> viewer,
+        osg::ref_ptr<osgViewer::ScreenCaptureHandler> screenCaptureHandler,
+        osgViewer::ScreenCaptureHandler::CaptureOperation* screenCaptureOperation,
+        const std::filesystem::path& userFile, bool userFileExists,
+        const std::filesystem::path& userControllerBindingsFile, const std::filesystem::path& controllerBindingsFile,
+        bool grab)
         : mControlsDisabled(false)
         , mInputWrapper(std::make_unique<SDLUtil::InputWrapper>(window, viewer, grab))
         , mBindingsManager(std::make_unique<BindingsManager>(userFile, userFileExists))
         , mControlSwitch(std::make_unique<ControlSwitch>())
-        , mActionManager(std::make_unique<ActionManager>(mBindingsManager.get(), screenCaptureOperation, viewer, screenCaptureHandler))
+        , mActionManager(std::make_unique<ActionManager>(
+              mBindingsManager.get(), screenCaptureOperation, viewer, screenCaptureHandler))
         , mKeyboardManager(std::make_unique<KeyboardManager>(mBindingsManager.get()))
         , mMouseManager(std::make_unique<MouseManager>(mBindingsManager.get(), mInputWrapper.get(), window))
-        , mControllerManager(std::make_unique<ControllerManager>(mBindingsManager.get(), mActionManager.get(), mMouseManager.get(), userControllerBindingsFile, controllerBindingsFile))
+        , mControllerManager(std::make_unique<ControllerManager>(mBindingsManager.get(), mActionManager.get(),
+              mMouseManager.get(), userControllerBindingsFile, controllerBindingsFile))
         , mSensorManager(std::make_unique<SensorManager>())
         , mGyroManager(std::make_unique<GyroManager>())
     {
@@ -89,8 +90,8 @@ namespace MWInput
             bool sensorAvailable = mSensorManager->isGyroAvailable();
             if (controllerAvailable || sensorAvailable)
             {
-                mGyroManager->update(dt,
-                    controllerAvailable ? mControllerManager->getGyroValues() : mSensorManager->getGyroValues());
+                mGyroManager->update(
+                    dt, controllerAvailable ? mControllerManager->getGyroValues() : mSensorManager->getGyroValues());
             }
         }
     }
@@ -114,7 +115,8 @@ namespace MWInput
         if (guiMode)
             MWBase::Environment::get().getWindowManager()->showCrosshair(false);
 
-        bool isCursorVisible = guiMode && (!mControllerManager->joystickLastUsed() || mControllerManager->gamepadGuiCursorEnabled());
+        bool isCursorVisible
+            = guiMode && (!mControllerManager->joystickLastUsed() || mControllerManager->gamepadGuiCursorEnabled());
         MWBase::Environment::get().getWindowManager()->setCursorVisible(isCursorVisible);
         // if not in gui mode, the camera decides whether to show crosshair or not.
     }
diff --git a/apps/openmw/mwinput/inputmanagerimp.hpp b/apps/openmw/mwinput/inputmanagerimp.hpp
index d31aeff51b..f5690f277e 100644
--- a/apps/openmw/mwinput/inputmanagerimp.hpp
+++ b/apps/openmw/mwinput/inputmanagerimp.hpp
@@ -6,8 +6,8 @@
 #include <osg/ref_ptr>
 #include <osgViewer/ViewerEventHandlers>
 
-#include <components/settings/settings.hpp>
 #include <components/sdlutil/events.hpp>
+#include <components/settings/settings.hpp>
 #include <filesystem>
 
 #include "../mwbase/inputmanager.hpp"
@@ -43,26 +43,24 @@ namespace MWInput
     class GyroManager;
 
     /**
-    * @brief Class that provides a high-level API for game input
-    */
+     * @brief Class that provides a high-level API for game input
+     */
     class InputManager final : public MWBase::InputManager
     {
     public:
-        InputManager(
-            SDL_Window* window,
-            osg::ref_ptr<osgViewer::Viewer> viewer,
+        InputManager(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> viewer,
             osg::ref_ptr<osgViewer::ScreenCaptureHandler> screenCaptureHandler,
-            osgViewer::ScreenCaptureHandler::CaptureOperation *screenCaptureOperation,
-            const std::filesystem::path &userFile, bool userFileExists,
-            const std::filesystem::path &userControllerBindingsFile,
-            const std::filesystem::path &controllerBindingsFile, bool grab);
+            osgViewer::ScreenCaptureHandler::CaptureOperation* screenCaptureOperation,
+            const std::filesystem::path& userFile, bool userFileExists,
+            const std::filesystem::path& userControllerBindingsFile,
+            const std::filesystem::path& controllerBindingsFile, bool grab);
 
         ~InputManager() final;
 
         /// Clear all savegame-specific data
         void clear() override;
 
-        void update(float dt, bool disableControls, bool disableEvents=false) override;
+        void update(float dt, bool disableControls, bool disableEvents = false) override;
 
         void changeInputMode(bool guiMode) override;
 
@@ -76,8 +74,8 @@ namespace MWInput
         bool getControlSwitch(std::string_view sw) override;
 
         std::string_view getActionDescription(int action) const override;
-        std::string getActionKeyBindingName (int action) const override;
-        std::string getActionControllerBindingName (int action) const override;
+        std::string getActionKeyBindingName(int action) const override;
+        std::string getActionControllerBindingName(int action) const override;
         bool actionIsActive(int action) const override;
 
         float getActionValue(int action) const override;
@@ -89,7 +87,7 @@ namespace MWInput
         int getNumActions() override { return A_Last; }
         const std::initializer_list<int>& getActionKeySorting() override;
         const std::initializer_list<int>& getActionControllerSorting() override;
-        void enableDetectingBindingMode (int action, bool keyboard) override;
+        void enableDetectingBindingMode(int action, bool keyboard) override;
         void resetToDefaultKeyBindings() override;
         void resetToDefaultControllerBindings() override;
 
diff --git a/apps/openmw/mwinput/keyboardmanager.cpp b/apps/openmw/mwinput/keyboardmanager.cpp
index d8fc548f25..97d46c1796 100644
--- a/apps/openmw/mwinput/keyboardmanager.cpp
+++ b/apps/openmw/mwinput/keyboardmanager.cpp
@@ -23,7 +23,7 @@ namespace MWInput
     {
     }
 
-    void KeyboardManager::textInput(const SDL_TextInputEvent &arg)
+    void KeyboardManager::textInput(const SDL_TextInputEvent& arg)
     {
         MyGUI::UString ustring(&arg.text[0]);
         MyGUI::UString::utf32string utf32string = ustring.asUTF32();
@@ -31,21 +31,21 @@ namespace MWInput
             MyGUI::InputManager::getInstance().injectKeyPress(MyGUI::KeyCode::None, *it);
     }
 
-    void KeyboardManager::keyPressed(const SDL_KeyboardEvent &arg)
+    void KeyboardManager::keyPressed(const SDL_KeyboardEvent& arg)
     {
         // HACK: to make default keybinding for the console work without printing an extra "^" upon closing
         // This assumes that SDL_TextInput events always come *after* the key event
         // (which is somewhat reasonable, and hopefully true for all SDL platforms)
         auto kc = SDLUtil::sdlKeyToMyGUI(arg.keysym.sym);
         if (mBindingsManager->getKeyBinding(A_Console) == arg.keysym.scancode
-                && MWBase::Environment::get().getWindowManager()->isConsoleMode())
+            && MWBase::Environment::get().getWindowManager()->isConsoleMode())
             SDL_StopTextInput();
 
-        bool consumed = SDL_IsTextInputActive() &&  // Little trick to check if key is printable
-                        (!(SDLK_SCANCODE_MASK & arg.keysym.sym) &&
-                        // Don't trust isprint for symbols outside the extended ASCII range
-                        ((kc == MyGUI::KeyCode::None && arg.keysym.sym > 0xff) ||
-                        (arg.keysym.sym >= 0 && arg.keysym.sym <= 255 && std::isprint(arg.keysym.sym))));
+        bool consumed = SDL_IsTextInputActive() && // Little trick to check if key is printable
+            (!(SDLK_SCANCODE_MASK & arg.keysym.sym) &&
+                // Don't trust isprint for symbols outside the extended ASCII range
+                ((kc == MyGUI::KeyCode::None && arg.keysym.sym > 0xff)
+                    || (arg.keysym.sym >= 0 && arg.keysym.sym <= 255 && std::isprint(arg.keysym.sym))));
         if (kc != MyGUI::KeyCode::None && !mBindingsManager->isDetectingBindingState())
         {
             if (MWBase::Environment::get().getWindowManager()->injectKeyPress(kc, 0, arg.repeat))
@@ -63,13 +63,13 @@ namespace MWInput
         if (!consumed)
         {
             MWBase::Environment::get().getLuaManager()->inputEvent(
-                {MWBase::LuaManager::InputEvent::KeyPressed, arg.keysym});
+                { MWBase::LuaManager::InputEvent::KeyPressed, arg.keysym });
         }
 
         input->setJoystickLastUsed(false);
     }
 
-    void KeyboardManager::keyReleased(const SDL_KeyboardEvent &arg)
+    void KeyboardManager::keyReleased(const SDL_KeyboardEvent& arg)
     {
         MWBase::Environment::get().getInputManager()->setJoystickLastUsed(false);
         auto kc = SDLUtil::sdlKeyToMyGUI(arg.keysym.sym);
@@ -77,6 +77,7 @@ namespace MWInput
         if (!mBindingsManager->isDetectingBindingState())
             mBindingsManager->setPlayerControlsEnabled(!MyGUI::InputManager::getInstance().injectKeyRelease(kc));
         mBindingsManager->keyReleased(arg);
-        MWBase::Environment::get().getLuaManager()->inputEvent({MWBase::LuaManager::InputEvent::KeyReleased, arg.keysym});
+        MWBase::Environment::get().getLuaManager()->inputEvent(
+            { MWBase::LuaManager::InputEvent::KeyReleased, arg.keysym });
     }
 }
diff --git a/apps/openmw/mwinput/keyboardmanager.hpp b/apps/openmw/mwinput/keyboardmanager.hpp
index ca58461a20..f7b1bbee2b 100644
--- a/apps/openmw/mwinput/keyboardmanager.hpp
+++ b/apps/openmw/mwinput/keyboardmanager.hpp
@@ -14,9 +14,9 @@ namespace MWInput
 
         virtual ~KeyboardManager() = default;
 
-        void textInput(const SDL_TextInputEvent &arg) override;
-        void keyPressed(const SDL_KeyboardEvent &arg) override;
-        void keyReleased(const SDL_KeyboardEvent &arg) override;
+        void textInput(const SDL_TextInputEvent& arg) override;
+        void keyPressed(const SDL_KeyboardEvent& arg) override;
+        void keyReleased(const SDL_KeyboardEvent& arg) override;
 
     private:
         BindingsManager* mBindingsManager;
diff --git a/apps/openmw/mwinput/mousemanager.cpp b/apps/openmw/mwinput/mousemanager.cpp
index 26bccc79c4..a8938f07a2 100644
--- a/apps/openmw/mwinput/mousemanager.cpp
+++ b/apps/openmw/mwinput/mousemanager.cpp
@@ -20,7 +20,8 @@
 
 namespace MWInput
 {
-    MouseManager::MouseManager(BindingsManager* bindingsManager, SDLUtil::InputWrapper* inputWrapper, SDL_Window* window)
+    MouseManager::MouseManager(
+        BindingsManager* bindingsManager, SDLUtil::InputWrapper* inputWrapper, SDL_Window* window)
         : mInvertX(Settings::Manager::getBool("invert x axis", "Input"))
         , mInvertY(Settings::Manager::getBool("invert y axis", "Input"))
         , mGrabCursor(Settings::Manager::getBool("grab cursor", "Input"))
@@ -36,7 +37,7 @@ namespace MWInput
         , mMouseMoveX(0)
         , mMouseMoveY(0)
     {
-        int w,h;
+        int w, h;
         SDL_GetWindowSize(window, &w, &h);
 
         float uiScale = MWBase::Environment::get().getWindowManager()->getScalingFactor();
@@ -62,7 +63,7 @@ namespace MWInput
         }
     }
 
-    void MouseManager::mouseMoved(const SDLUtil::MouseMotionEvent &arg)
+    void MouseManager::mouseMoved(const SDLUtil::MouseMotionEvent& arg)
     {
         mBindingsManager->mouseMoved(arg);
 
@@ -82,9 +83,12 @@ namespace MWInput
 
             mMouseWheel = static_cast<int>(arg.z);
 
-            MyGUI::InputManager::getInstance().injectMouseMove(static_cast<int>(mGuiCursorX), static_cast<int>(mGuiCursorY), mMouseWheel);
-            // FIXME: inject twice to force updating focused widget states (tooltips) resulting from changing the viewport by scroll wheel
-            MyGUI::InputManager::getInstance().injectMouseMove(static_cast<int>(mGuiCursorX), static_cast<int>(mGuiCursorY), mMouseWheel);
+            MyGUI::InputManager::getInstance().injectMouseMove(
+                static_cast<int>(mGuiCursorX), static_cast<int>(mGuiCursorY), mMouseWheel);
+            // FIXME: inject twice to force updating focused widget states (tooltips) resulting from changing the
+            // viewport by scroll wheel
+            MyGUI::InputManager::getInstance().injectMouseMove(
+                static_cast<int>(mGuiCursorX), static_cast<int>(mGuiCursorY), mMouseWheel);
 
             MWBase::Environment::get().getWindowManager()->setCursorActive(true);
         }
@@ -113,7 +117,7 @@ namespace MWInput
         }
     }
 
-    void MouseManager::mouseReleased(const SDL_MouseButtonEvent &arg, Uint8 id)
+    void MouseManager::mouseReleased(const SDL_MouseButtonEvent& arg, Uint8 id)
     {
         MWBase::Environment::get().getInputManager()->setJoystickLastUsed(false);
 
@@ -124,11 +128,9 @@ namespace MWInput
         else
         {
             bool guiMode = MWBase::Environment::get().getWindowManager()->isGuiMode();
-            guiMode = MyGUI::InputManager::getInstance().injectMouseRelease(
-                static_cast<int>(mGuiCursorX),
-                static_cast<int>(mGuiCursorY),
-                SDLUtil::sdlMouseButtonToMyGui(id)
-            ) && guiMode;
+            guiMode = MyGUI::InputManager::getInstance().injectMouseRelease(static_cast<int>(mGuiCursorX),
+                          static_cast<int>(mGuiCursorY), SDLUtil::sdlMouseButtonToMyGui(id))
+                && guiMode;
 
             if (mBindingsManager->isDetectingBindingState())
                 return; // don't allow same mouseup to bind as initiated bind
@@ -138,7 +140,7 @@ namespace MWInput
         }
     }
 
-    void MouseManager::mouseWheelMoved(const SDL_MouseWheelEvent &arg)
+    void MouseManager::mouseWheelMoved(const SDL_MouseWheelEvent& arg)
     {
         MWBase::InputManager* input = MWBase::Environment::get().getInputManager();
         if (mBindingsManager->isDetectingBindingState() || !input->controlsDisabled())
@@ -147,7 +149,7 @@ namespace MWInput
         input->setJoystickLastUsed(false);
     }
 
-    void MouseManager::mousePressed(const SDL_MouseButtonEvent &arg, Uint8 id)
+    void MouseManager::mousePressed(const SDL_MouseButtonEvent& arg, Uint8 id)
     {
         MWBase::InputManager* input = MWBase::Environment::get().getInputManager();
         input->setJoystickLastUsed(false);
@@ -156,14 +158,13 @@ namespace MWInput
         if (id == SDL_BUTTON_LEFT || id == SDL_BUTTON_RIGHT) // MyGUI only uses these mouse events
         {
             guiMode = MWBase::Environment::get().getWindowManager()->isGuiMode();
-            guiMode = MyGUI::InputManager::getInstance().injectMousePress(
-                static_cast<int>(mGuiCursorX),
-                static_cast<int>(mGuiCursorY),
-                SDLUtil::sdlMouseButtonToMyGui(id)
-            ) && guiMode;
-            if (MyGUI::InputManager::getInstance().getMouseFocusWidget () != nullptr)
+            guiMode = MyGUI::InputManager::getInstance().injectMousePress(static_cast<int>(mGuiCursorX),
+                          static_cast<int>(mGuiCursorY), SDLUtil::sdlMouseButtonToMyGui(id))
+                && guiMode;
+            if (MyGUI::InputManager::getInstance().getMouseFocusWidget() != nullptr)
             {
-                MyGUI::Button* b = MyGUI::InputManager::getInstance().getMouseFocusWidget()->castType<MyGUI::Button>(false);
+                MyGUI::Button* b
+                    = MyGUI::InputManager::getInstance().getMouseFocusWidget()->castType<MyGUI::Button>(false);
                 if (b && b->getEnabled() && id == SDL_BUTTON_LEFT)
                 {
                     MWBase::Environment::get().getWindowManager()->playSound("Menu Click");
@@ -176,14 +177,15 @@ namespace MWInput
 
         // Don't trigger any mouse bindings while in settings menu, otherwise rebinding controls becomes impossible
         // Also do not trigger bindings when input controls are disabled, e.g. during save loading
-        if (MWBase::Environment::get().getWindowManager()->getMode() != MWGui::GM_Settings && !input->controlsDisabled())
+        if (MWBase::Environment::get().getWindowManager()->getMode() != MWGui::GM_Settings
+            && !input->controlsDisabled())
             mBindingsManager->mousePressed(arg, id);
     }
 
     void MouseManager::updateCursorMode()
     {
         bool grab = !MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_MainMenu)
-             && !MWBase::Environment::get().getWindowManager()->isConsoleMode();
+            && !MWBase::Environment::get().getWindowManager()->isConsoleMode();
 
         bool wasRelative = mInputWrapper->getMouseRelative();
         bool isRelative = !MWBase::Environment::get().getWindowManager()->isGuiMode();
@@ -192,11 +194,11 @@ namespace MWInput
         // stop using raw mouse motions and switch to system cursor movements
         mInputWrapper->setMouseRelative(isRelative);
 
-        //we let the mouse escape in the main menu
+        // we let the mouse escape in the main menu
         mInputWrapper->setGrabPointer(grab && (mGrabCursor || isRelative));
 
-        //we switched to non-relative mode, move our cursor to where the in-game
-        //cursor is
+        // we switched to non-relative mode, move our cursor to where the in-game
+        // cursor is
         if (!isRelative && wasRelative != isRelative)
         {
             warpMouse();
@@ -237,17 +239,13 @@ namespace MWInput
     bool MouseManager::injectMouseButtonPress(Uint8 button)
     {
         return MyGUI::InputManager::getInstance().injectMousePress(
-            static_cast<int>(mGuiCursorX),
-            static_cast<int>(mGuiCursorY),
-            SDLUtil::sdlMouseButtonToMyGui(button));
+            static_cast<int>(mGuiCursorX), static_cast<int>(mGuiCursorY), SDLUtil::sdlMouseButtonToMyGui(button));
     }
 
     bool MouseManager::injectMouseButtonRelease(Uint8 button)
     {
         return MyGUI::InputManager::getInstance().injectMouseRelease(
-            static_cast<int>(mGuiCursorX),
-            static_cast<int>(mGuiCursorY),
-            SDLUtil::sdlMouseButtonToMyGui(button));
+            static_cast<int>(mGuiCursorX), static_cast<int>(mGuiCursorY), SDLUtil::sdlMouseButtonToMyGui(button));
     }
 
     void MouseManager::injectMouseMove(float xMove, float yMove, float mouseWheelMove)
@@ -260,12 +258,13 @@ namespace MWInput
         mGuiCursorX = std::clamp<float>(mGuiCursorX, 0.f, viewSize.width - 1);
         mGuiCursorY = std::clamp<float>(mGuiCursorY, 0.f, viewSize.height - 1);
 
-        MyGUI::InputManager::getInstance().injectMouseMove(static_cast<int>(mGuiCursorX), static_cast<int>(mGuiCursorY), static_cast<int>(mMouseWheel));
+        MyGUI::InputManager::getInstance().injectMouseMove(
+            static_cast<int>(mGuiCursorX), static_cast<int>(mGuiCursorY), static_cast<int>(mMouseWheel));
     }
 
     void MouseManager::warpMouse()
     {
         float uiScale = MWBase::Environment::get().getWindowManager()->getScalingFactor();
-        mInputWrapper->warpMouse(static_cast<int>(mGuiCursorX*uiScale), static_cast<int>(mGuiCursorY*uiScale));
+        mInputWrapper->warpMouse(static_cast<int>(mGuiCursorX * uiScale), static_cast<int>(mGuiCursorY * uiScale));
     }
 }
diff --git a/apps/openmw/mwinput/mousemanager.hpp b/apps/openmw/mwinput/mousemanager.hpp
index 16ea56d62b..4e8996a99c 100644
--- a/apps/openmw/mwinput/mousemanager.hpp
+++ b/apps/openmw/mwinput/mousemanager.hpp
@@ -1,8 +1,8 @@
 #ifndef MWINPUT_MWMOUSEMANAGER_H
 #define MWINPUT_MWMOUSEMANAGER_H
 
-#include <components/settings/settings.hpp>
 #include <components/sdlutil/events.hpp>
+#include <components/settings/settings.hpp>
 
 namespace SDLUtil
 {
@@ -23,10 +23,10 @@ namespace MWInput
         void updateCursorMode();
         void update(float dt);
 
-        void mouseMoved(const SDLUtil::MouseMotionEvent &arg) override;
-        void mousePressed(const SDL_MouseButtonEvent &arg, Uint8 id) override;
-        void mouseReleased(const SDL_MouseButtonEvent &arg, Uint8 id) override;
-        void mouseWheelMoved(const SDL_MouseWheelEvent &arg) override;
+        void mouseMoved(const SDLUtil::MouseMotionEvent& arg) override;
+        void mousePressed(const SDL_MouseButtonEvent& arg, Uint8 id) override;
+        void mouseReleased(const SDL_MouseButtonEvent& arg, Uint8 id) override;
+        void mouseWheelMoved(const SDL_MouseWheelEvent& arg) override;
 
         void processChangedSettings(const Settings::CategorySettingVector& changed);
 
diff --git a/apps/openmw/mwinput/sensormanager.cpp b/apps/openmw/mwinput/sensormanager.cpp
index f3cee579e5..33b493f4d4 100644
--- a/apps/openmw/mwinput/sensormanager.cpp
+++ b/apps/openmw/mwinput/sensormanager.cpp
@@ -47,7 +47,8 @@ namespace MWInput
 
         float angle = 0;
 
-        SDL_DisplayOrientation currentOrientation = SDL_GetDisplayOrientation(Settings::Manager::getInt("screen", "Video"));
+        SDL_DisplayOrientation currentOrientation
+            = SDL_GetDisplayOrientation(Settings::Manager::getInt("screen", "Video"));
         switch (currentOrientation)
         {
             case SDL_ORIENTATION_UNKNOWN:
@@ -84,7 +85,8 @@ namespace MWInput
                 if (SDL_SensorGetDeviceType(i) == SDL_SENSOR_GYRO)
                 {
                     // It is unclear how to handle several enabled gyroscopes, so use the first one.
-                    // Note: Android registers some gyroscope as two separate sensors, for non-wake-up mode and for wake-up mode.
+                    // Note: Android registers some gyroscope as two separate sensors, for non-wake-up mode and for
+                    // wake-up mode.
                     if (mGyroscope != nullptr)
                     {
                         SDL_SensorClose(mGyroscope);
@@ -93,9 +95,10 @@ namespace MWInput
                     }
 
                     // FIXME: SDL2 does not provide a way to configure a sensor update frequency so far.
-                    SDL_Sensor *sensor = SDL_SensorOpen(i);
+                    SDL_Sensor* sensor = SDL_SensorOpen(i);
                     if (sensor == nullptr)
-                        Log(Debug::Error) << "Couldn't open sensor " << SDL_SensorGetDeviceName(i) << ": " << SDL_GetError();
+                        Log(Debug::Error)
+                            << "Couldn't open sensor " << SDL_SensorGetDeviceName(i) << ": " << SDL_GetError();
                     else
                     {
                         mGyroscope = sensor;
@@ -129,12 +132,12 @@ namespace MWInput
         correctGyroscopeAxes();
     }
 
-    void SensorManager::sensorUpdated(const SDL_SensorEvent &arg)
+    void SensorManager::sensorUpdated(const SDL_SensorEvent& arg)
     {
         if (!Settings::Manager::getBool("enable gyroscope", "Input"))
             return;
 
-        SDL_Sensor *sensor = SDL_SensorFromInstanceID(arg.which);
+        SDL_Sensor* sensor = SDL_SensorFromInstanceID(arg.which);
         if (!sensor)
         {
             Log(Debug::Info) << "Couldn't get sensor for sensor event";
@@ -151,9 +154,9 @@ namespace MWInput
                 mGyroValues = mRotation * gyro;
                 mGyroUpdateTimer = 0.f;
                 break;
-        }
-        default:
-            break;
+            }
+            default:
+                break;
         }
     }
 
diff --git a/apps/openmw/mwinput/sensormanager.hpp b/apps/openmw/mwinput/sensormanager.hpp
index 8f72b99de9..96d46d6280 100644
--- a/apps/openmw/mwinput/sensormanager.hpp
+++ b/apps/openmw/mwinput/sensormanager.hpp
@@ -6,8 +6,8 @@
 #include <osg/Matrixf>
 #include <osg/Vec3f>
 
-#include <components/settings/settings.hpp>
 #include <components/sdlutil/events.hpp>
+#include <components/settings/settings.hpp>
 
 namespace SDLUtil
 {
@@ -32,7 +32,7 @@ namespace MWInput
 
         void update(float dt);
 
-        void sensorUpdated(const SDL_SensorEvent &arg) override;
+        void sensorUpdated(const SDL_SensorEvent& arg) override;
         void displayOrientationChanged() override;
         void processChangedSettings(const Settings::CategorySettingVector& changed);
 
@@ -40,7 +40,6 @@ namespace MWInput
         std::array<float, 3> getGyroValues() const;
 
     private:
-
         void updateSensors();
         void correctGyroscopeAxes();
 
diff --git a/apps/openmw/mwlua/asyncbindings.cpp b/apps/openmw/mwlua/asyncbindings.cpp
index 55f9558fb0..00ca7b75ec 100644
--- a/apps/openmw/mwlua/asyncbindings.cpp
+++ b/apps/openmw/mwlua/asyncbindings.cpp
@@ -5,10 +5,14 @@
 namespace sol
 {
     template <>
-    struct is_automagical<MWLua::AsyncPackageId> : std::false_type {};
+    struct is_automagical<MWLua::AsyncPackageId> : std::false_type
+    {
+    };
 
     template <>
-    struct is_automagical<LuaUtil::Callback> : std::false_type {};
+    struct is_automagical<LuaUtil::Callback> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
@@ -24,48 +28,43 @@ namespace MWLua
     {
         using TimerType = LuaUtil::ScriptsContainer::TimerType;
         sol::usertype<AsyncPackageId> api = context.mLua->sol().new_usertype<AsyncPackageId>("AsyncPackage");
-        api["registerTimerCallback"] = [](const AsyncPackageId& asyncId, std::string_view name, sol::function callback)
-        {
-            asyncId.mContainer->registerTimerCallback(asyncId.mScriptId, name, std::move(callback));
-            return TimerCallback{asyncId, std::string(name)};
+        api["registerTimerCallback"]
+            = [](const AsyncPackageId& asyncId, std::string_view name, sol::function callback) {
+                  asyncId.mContainer->registerTimerCallback(asyncId.mScriptId, name, std::move(callback));
+                  return TimerCallback{ asyncId, std::string(name) };
+              };
+        api["newSimulationTimer"] = [world = context.mWorldView](const AsyncPackageId&, double delay,
+                                        const TimerCallback& callback, sol::object callbackArg) {
+            callback.mAsyncId.mContainer->setupSerializableTimer(TimerType::SIMULATION_TIME,
+                world->getSimulationTime() + delay, callback.mAsyncId.mScriptId, callback.mName,
+                std::move(callbackArg));
         };
-        api["newSimulationTimer"] = [world=context.mWorldView](const AsyncPackageId&, double delay,
-                                                               const TimerCallback& callback, sol::object callbackArg)
-        {
-            callback.mAsyncId.mContainer->setupSerializableTimer(
-                TimerType::SIMULATION_TIME, world->getSimulationTime() + delay,
+        api["newGameTimer"] = [world = context.mWorldView](const AsyncPackageId&, double delay,
+                                  const TimerCallback& callback, sol::object callbackArg) {
+            callback.mAsyncId.mContainer->setupSerializableTimer(TimerType::GAME_TIME, world->getGameTime() + delay,
                 callback.mAsyncId.mScriptId, callback.mName, std::move(callbackArg));
         };
-        api["newGameTimer"] = [world=context.mWorldView](const AsyncPackageId&, double delay,
-                                                         const TimerCallback& callback, sol::object callbackArg)
-        {
-            callback.mAsyncId.mContainer->setupSerializableTimer(
-                TimerType::GAME_TIME, world->getGameTime() + delay,
-                callback.mAsyncId.mScriptId, callback.mName, std::move(callbackArg));
-        };
-        api["newUnsavableSimulationTimer"] = [world=context.mWorldView](const AsyncPackageId& asyncId, double delay, sol::function callback)
-        {
-            asyncId.mContainer->setupUnsavableTimer(
-                TimerType::SIMULATION_TIME, world->getSimulationTime() + delay, asyncId.mScriptId, std::move(callback));
-        };
-        api["newUnsavableGameTimer"] = [world=context.mWorldView](const AsyncPackageId& asyncId, double delay, sol::function callback)
-        {
-            asyncId.mContainer->setupUnsavableTimer(
-                TimerType::GAME_TIME, world->getGameTime() + delay, asyncId.mScriptId, std::move(callback));
-        };
-        api["callback"] = [](const AsyncPackageId& asyncId, sol::function fn) -> LuaUtil::Callback
-        {
-            return LuaUtil::Callback{std::move(fn), asyncId.mHiddenData};
+        api["newUnsavableSimulationTimer"]
+            = [world = context.mWorldView](const AsyncPackageId& asyncId, double delay, sol::function callback) {
+                  asyncId.mContainer->setupUnsavableTimer(TimerType::SIMULATION_TIME,
+                      world->getSimulationTime() + delay, asyncId.mScriptId, std::move(callback));
+              };
+        api["newUnsavableGameTimer"]
+            = [world = context.mWorldView](const AsyncPackageId& asyncId, double delay, sol::function callback) {
+                  asyncId.mContainer->setupUnsavableTimer(
+                      TimerType::GAME_TIME, world->getGameTime() + delay, asyncId.mScriptId, std::move(callback));
+              };
+        api["callback"] = [](const AsyncPackageId& asyncId, sol::function fn) -> LuaUtil::Callback {
+            return LuaUtil::Callback{ std::move(fn), asyncId.mHiddenData };
         };
 
         sol::usertype<LuaUtil::Callback> callbackType = context.mLua->sol().new_usertype<LuaUtil::Callback>("Callback");
-        callbackType[sol::meta_function::call] =
-            [](const LuaUtil::Callback& callback, sol::variadic_args va) { return callback.call(sol::as_args(va)); };
+        callbackType[sol::meta_function::call]
+            = [](const LuaUtil::Callback& callback, sol::variadic_args va) { return callback.call(sol::as_args(va)); };
 
-        auto initializer = [](sol::table hiddenData)
-        {
+        auto initializer = [](sol::table hiddenData) {
             LuaUtil::ScriptsContainer::ScriptId id = hiddenData[LuaUtil::ScriptsContainer::sScriptIdKey];
-            return AsyncPackageId{id.mContainer, id.mIndex, hiddenData};
+            return AsyncPackageId{ id.mContainer, id.mIndex, hiddenData };
         };
         return sol::make_object(context.mLua->sol(), initializer);
     }
diff --git a/apps/openmw/mwlua/camerabindings.cpp b/apps/openmw/mwlua/camerabindings.cpp
index 3405654d53..3b13e02936 100644
--- a/apps/openmw/mwlua/camerabindings.cpp
+++ b/apps/openmw/mwlua/camerabindings.cpp
@@ -3,10 +3,10 @@
 #include <components/lua/utilpackage.hpp>
 #include <components/settings/settings.hpp>
 
-#include "../mwrender/camera.hpp"
-#include "../mwrender/renderingmanager.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
+#include "../mwrender/camera.hpp"
+#include "../mwrender/renderingmanager.hpp"
 
 namespace MWLua
 {
@@ -19,25 +19,19 @@ namespace MWLua
         MWRender::RenderingManager* renderingManager = MWBase::Environment::get().getWorld()->getRenderingManager();
 
         sol::table api(context.mLua->sol(), sol::create);
-        api["MODE"] = LuaUtil::makeStrictReadOnly(context.mLua->sol().create_table_with(
-            "Static", CameraMode::Static,
-            "FirstPerson", CameraMode::FirstPerson,
-            "ThirdPerson", CameraMode::ThirdPerson,
-            "Vanity", CameraMode::Vanity,
-            "Preview", CameraMode::Preview
-        ));
+        api["MODE"] = LuaUtil::makeStrictReadOnly(
+            context.mLua->sol().create_table_with("Static", CameraMode::Static, "FirstPerson", CameraMode::FirstPerson,
+                "ThirdPerson", CameraMode::ThirdPerson, "Vanity", CameraMode::Vanity, "Preview", CameraMode::Preview));
 
         api["getMode"] = [camera]() -> int { return static_cast<int>(camera->getMode()); };
-        api["getQueuedMode"] = [camera]() -> sol::optional<int>
-        {
+        api["getQueuedMode"] = [camera]() -> sol::optional<int> {
             std::optional<CameraMode> mode = camera->getQueuedMode();
             if (mode)
                 return static_cast<int>(*mode);
             else
                 return sol::nullopt;
         };
-        api["setMode"] = [camera](int mode, sol::optional<bool> force)
-        {
+        api["setMode"] = [camera](int mode, sol::optional<bool> force) {
             camera->setMode(static_cast<CameraMode>(mode), force ? *force : false);
         };
 
@@ -54,14 +48,12 @@ namespace MWLua
         api["getRoll"] = [camera]() { return -camera->getRoll(); };
 
         api["setStaticPosition"] = [camera](const osg::Vec3f& pos) { camera->setStaticPosition(pos); };
-        api["setPitch"] = [camera](float v)
-        {
+        api["setPitch"] = [camera](float v) {
             camera->setPitch(-v, true);
             if (camera->getMode() == CameraMode::ThirdPerson)
                 camera->calculateDeferredRotation();
         };
-        api["setYaw"] = [camera](float v)
-        {
+        api["setYaw"] = [camera](float v) {
             camera->setYaw(-v, true);
             if (camera->getMode() == CameraMode::ThirdPerson)
                 camera->calculateDeferredRotation();
@@ -89,24 +81,23 @@ namespace MWLua
         api["getCollisionType"] = [camera]() { return camera->getCollisionType(); };
         api["setCollisionType"] = [camera](int collisionType) { camera->setCollisionType(collisionType); };
 
-        api["getBaseFieldOfView"] = []()
-        {
-            return osg::DegreesToRadians(std::clamp(Settings::Manager::getFloat("field of view", "Camera"), 1.f, 179.f));
+        api["getBaseFieldOfView"] = []() {
+            return osg::DegreesToRadians(
+                std::clamp(Settings::Manager::getFloat("field of view", "Camera"), 1.f, 179.f));
         };
-        api["getFieldOfView"] = [renderingManager]() { return osg::DegreesToRadians(renderingManager->getFieldOfView()); };
-        api["setFieldOfView"] = [renderingManager](float v) { renderingManager->setFieldOfView(osg::RadiansToDegrees(v)); };
+        api["getFieldOfView"]
+            = [renderingManager]() { return osg::DegreesToRadians(renderingManager->getFieldOfView()); };
+        api["setFieldOfView"]
+            = [renderingManager](float v) { renderingManager->setFieldOfView(osg::RadiansToDegrees(v)); };
 
-        api["getBaseViewDistance"] = []()
-        {
-            return std::max(0.f, Settings::Manager::getFloat("viewing distance", "Camera"));
-        };
+        api["getBaseViewDistance"]
+            = []() { return std::max(0.f, Settings::Manager::getFloat("viewing distance", "Camera")); };
         api["getViewDistance"] = [renderingManager]() { return renderingManager->getViewDistance(); };
         api["setViewDistance"] = [renderingManager](float d) { renderingManager->setViewDistance(d, true); };
 
-        api["getViewTransform"] = [camera]() { return LuaUtil::TransformM{camera->getViewMatrix()}; };
+        api["getViewTransform"] = [camera]() { return LuaUtil::TransformM{ camera->getViewMatrix() }; };
 
-        api["viewportToWorldVector"] = [camera, renderingManager](osg::Vec2f pos) -> osg::Vec3f
-        {
+        api["viewportToWorldVector"] = [camera, renderingManager](osg::Vec2f pos) -> osg::Vec3f {
             double width = Settings::Manager::getInt("resolution x", "Video");
             double height = Settings::Manager::getInt("resolution y", "Video");
             double aspect = (height == 0.0) ? 1.0 : width / height;
diff --git a/apps/openmw/mwlua/cellbindings.cpp b/apps/openmw/mwlua/cellbindings.cpp
index 63ea583a6c..9126021575 100644
--- a/apps/openmw/mwlua/cellbindings.cpp
+++ b/apps/openmw/mwlua/cellbindings.cpp
@@ -10,9 +10,13 @@
 namespace sol
 {
     template <>
-    struct is_automagical<MWLua::LCell> : std::false_type {};
+    struct is_automagical<MWLua::LCell> : std::false_type
+    {
+    };
     template <>
-    struct is_automagical<MWLua::GCell> : std::false_type {};
+    struct is_automagical<MWLua::GCell> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
@@ -24,8 +28,7 @@ namespace MWLua
         sol::usertype<CellT> cellT = context.mLua->sol().new_usertype<CellT>(prefix + "Cell");
 
         cellT[sol::meta_function::equal_to] = [](const CellT& a, const CellT& b) { return a.mStore == b.mStore; };
-        cellT[sol::meta_function::to_string] = [](const CellT& c)
-        {
+        cellT[sol::meta_function::to_string] = [](const CellT& c) {
             const ESM::Cell* cell = c.mStore->getCell();
             std::stringstream res;
             if (cell->isExterior())
@@ -41,28 +44,23 @@ namespace MWLua
         cellT["gridY"] = sol::readonly_property([](const CellT& c) { return c.mStore->getCell()->getGridY(); });
         cellT["hasWater"] = sol::readonly_property([](const CellT& c) { return c.mStore->getCell()->hasWater(); });
         cellT["isExterior"] = sol::readonly_property([](const CellT& c) { return c.mStore->isExterior(); });
-        cellT["isQuasiExterior"] = sol::readonly_property([](const CellT& c)
-        {
-            return (c.mStore->getCell()->mData.mFlags & ESM::Cell::QuasiEx) != 0;
-        });
+        cellT["isQuasiExterior"] = sol::readonly_property(
+            [](const CellT& c) { return (c.mStore->getCell()->mData.mFlags & ESM::Cell::QuasiEx) != 0; });
 
-        cellT["isInSameSpace"] = [](const CellT& c, const ObjectT& obj)
-        {
+        cellT["isInSameSpace"] = [](const CellT& c, const ObjectT& obj) {
             const MWWorld::Ptr& ptr = obj.ptr();
             if (!ptr.isInCell())
                 return false;
             MWWorld::CellStore* cell = ptr.getCell();
             return cell == c.mStore || (cell->isExterior() && c.mStore->isExterior());
         };
-        
+
         if constexpr (std::is_same_v<CellT, GCell>)
-        {  // only for global scripts
-            cellT["getAll"] = [worldView=context.mWorldView, ids=getPackageToTypeTable(context.mLua->sol())](
-                const CellT& cell, sol::optional<sol::table> type)
-            {
+        { // only for global scripts
+            cellT["getAll"] = [worldView = context.mWorldView, ids = getPackageToTypeTable(context.mLua->sol())](
+                                  const CellT& cell, sol::optional<sol::table> type) {
                 ObjectIdList res = std::make_shared<std::vector<ObjectId>>();
-                auto visitor = [&](const MWWorld::Ptr& ptr)
-                {
+                auto visitor = [&](const MWWorld::Ptr& ptr) {
                     worldView->getObjectRegistry()->registerPtr(ptr);
                     if (getLiveCellRefType(ptr.mRef) == ptr.getType())
                         res->push_back(getId(ptr));
@@ -84,37 +82,73 @@ namespace MWLua
                     switch (*typeId)
                     {
                         case ESM::REC_INTERNAL_PLAYER:
-                            {
-                                MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-                                if (player.getCell() == cell.mStore)
-                                    res->push_back(getId(player));
-                            }
-                            break;
-
-                        case ESM::REC_CREA: cell.mStore->template forEachType<ESM::Creature>(visitor); break;
-                        case ESM::REC_NPC_: cell.mStore->template forEachType<ESM::NPC>(visitor); break;
-                        case ESM::REC_ACTI: cell.mStore->template forEachType<ESM::Activator>(visitor); break;
-                        case ESM::REC_DOOR: cell.mStore->template forEachType<ESM::Door>(visitor); break;
-                        case ESM::REC_CONT: cell.mStore->template forEachType<ESM::Container>(visitor); break;
-
-                        case ESM::REC_ALCH: cell.mStore->template forEachType<ESM::Potion>(visitor); break;
-                        case ESM::REC_ARMO: cell.mStore->template forEachType<ESM::Armor>(visitor); break;
-                        case ESM::REC_BOOK: cell.mStore->template forEachType<ESM::Book>(visitor); break;
-                        case ESM::REC_CLOT: cell.mStore->template forEachType<ESM::Clothing>(visitor); break;
-                        case ESM::REC_INGR: cell.mStore->template forEachType<ESM::Ingredient>(visitor); break;
-                        case ESM::REC_LIGH: cell.mStore->template forEachType<ESM::Light>(visitor); break;
-                        case ESM::REC_MISC: cell.mStore->template forEachType<ESM::Miscellaneous>(visitor); break;
-                        case ESM::REC_WEAP: cell.mStore->template forEachType<ESM::Weapon>(visitor); break;
-                        case ESM::REC_APPA: cell.mStore->template forEachType<ESM::Apparatus>(visitor); break;
-                        case ESM::REC_LOCK: cell.mStore->template forEachType<ESM::Lockpick>(visitor); break;
-                        case ESM::REC_PROB: cell.mStore->template forEachType<ESM::Probe>(visitor); break;
-                        case ESM::REC_REPA: cell.mStore->template forEachType<ESM::Repair>(visitor); break;
-                        default: ok = false;
+                        {
+                            MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+                            if (player.getCell() == cell.mStore)
+                                res->push_back(getId(player));
+                        }
+                        break;
+
+                        case ESM::REC_CREA:
+                            cell.mStore->template forEachType<ESM::Creature>(visitor);
+                            break;
+                        case ESM::REC_NPC_:
+                            cell.mStore->template forEachType<ESM::NPC>(visitor);
+                            break;
+                        case ESM::REC_ACTI:
+                            cell.mStore->template forEachType<ESM::Activator>(visitor);
+                            break;
+                        case ESM::REC_DOOR:
+                            cell.mStore->template forEachType<ESM::Door>(visitor);
+                            break;
+                        case ESM::REC_CONT:
+                            cell.mStore->template forEachType<ESM::Container>(visitor);
+                            break;
+
+                        case ESM::REC_ALCH:
+                            cell.mStore->template forEachType<ESM::Potion>(visitor);
+                            break;
+                        case ESM::REC_ARMO:
+                            cell.mStore->template forEachType<ESM::Armor>(visitor);
+                            break;
+                        case ESM::REC_BOOK:
+                            cell.mStore->template forEachType<ESM::Book>(visitor);
+                            break;
+                        case ESM::REC_CLOT:
+                            cell.mStore->template forEachType<ESM::Clothing>(visitor);
+                            break;
+                        case ESM::REC_INGR:
+                            cell.mStore->template forEachType<ESM::Ingredient>(visitor);
+                            break;
+                        case ESM::REC_LIGH:
+                            cell.mStore->template forEachType<ESM::Light>(visitor);
+                            break;
+                        case ESM::REC_MISC:
+                            cell.mStore->template forEachType<ESM::Miscellaneous>(visitor);
+                            break;
+                        case ESM::REC_WEAP:
+                            cell.mStore->template forEachType<ESM::Weapon>(visitor);
+                            break;
+                        case ESM::REC_APPA:
+                            cell.mStore->template forEachType<ESM::Apparatus>(visitor);
+                            break;
+                        case ESM::REC_LOCK:
+                            cell.mStore->template forEachType<ESM::Lockpick>(visitor);
+                            break;
+                        case ESM::REC_PROB:
+                            cell.mStore->template forEachType<ESM::Probe>(visitor);
+                            break;
+                        case ESM::REC_REPA:
+                            cell.mStore->template forEachType<ESM::Repair>(visitor);
+                            break;
+                        default:
+                            ok = false;
                     }
                 }
                 if (!ok)
-                    throw std::runtime_error(std::string("Incorrect type argument in cell:getAll: " + LuaUtil::toString(*type)));
-                return GObjectList{res};
+                    throw std::runtime_error(
+                        std::string("Incorrect type argument in cell:getAll: " + LuaUtil::toString(*type)));
+                return GObjectList{ res };
             };
         }
     }
diff --git a/apps/openmw/mwlua/debugbindings.cpp b/apps/openmw/mwlua/debugbindings.cpp
index d51ab1897b..b9b5698254 100644
--- a/apps/openmw/mwlua/debugbindings.cpp
+++ b/apps/openmw/mwlua/debugbindings.cpp
@@ -4,8 +4,8 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwrender/renderingmanager.hpp"
 #include "../mwrender/postprocessor.hpp"
+#include "../mwrender/renderingmanager.hpp"
 
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
@@ -19,57 +19,56 @@ namespace MWLua
     {
         sol::table api = context.mLua->newTable();
 
-        api["RENDER_MODE"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, MWRender::RenderMode>({
-            {"CollisionDebug", MWRender::Render_CollisionDebug},
-            {"Wireframe", MWRender::Render_Wireframe},
-            {"Pathgrid", MWRender::Render_Pathgrid},
-            {"Water", MWRender::Render_Water},
-            {"Scene", MWRender::Render_Scene},
-            {"NavMesh", MWRender::Render_NavMesh},
-            {"ActorsPaths", MWRender::Render_ActorsPaths},
-            {"RecastMesh", MWRender::Render_RecastMesh},
-        }));
+        api["RENDER_MODE"]
+            = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, MWRender::RenderMode>({
+                { "CollisionDebug", MWRender::Render_CollisionDebug },
+                { "Wireframe", MWRender::Render_Wireframe },
+                { "Pathgrid", MWRender::Render_Pathgrid },
+                { "Water", MWRender::Render_Water },
+                { "Scene", MWRender::Render_Scene },
+                { "NavMesh", MWRender::Render_NavMesh },
+                { "ActorsPaths", MWRender::Render_ActorsPaths },
+                { "RecastMesh", MWRender::Render_RecastMesh },
+            }));
 
-        api["toggleRenderMode"] = [context] (MWRender::RenderMode value)
-        {
-            context.mLuaManager->addAction([value]
-            {
-                MWBase::Environment::get().getWorld()->toggleRenderMode(value);
-            });
+        api["toggleRenderMode"] = [context](MWRender::RenderMode value) {
+            context.mLuaManager->addAction([value] { MWBase::Environment::get().getWorld()->toggleRenderMode(value); });
         };
 
-        api["NAV_MESH_RENDER_MODE"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, MWRender::NavMeshMode>({
-            {"AreaType", MWRender::NavMeshMode::AreaType},
-            {"UpdateFrequency", MWRender::NavMeshMode::UpdateFrequency},
-        }));
+        api["NAV_MESH_RENDER_MODE"]
+            = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, MWRender::NavMeshMode>({
+                { "AreaType", MWRender::NavMeshMode::AreaType },
+                { "UpdateFrequency", MWRender::NavMeshMode::UpdateFrequency },
+            }));
 
-        api["setNavMeshRenderMode"] = [context] (MWRender::NavMeshMode value)
-        {
-            context.mLuaManager->addAction([value]
-            {
-                MWBase::Environment::get().getWorld()->getRenderingManager()->setNavMeshMode(value);
-            });
+        api["setNavMeshRenderMode"] = [context](MWRender::NavMeshMode value) {
+            context.mLuaManager->addAction(
+                [value] { MWBase::Environment::get().getWorld()->getRenderingManager()->setNavMeshMode(value); });
         };
 
-        api["triggerShaderReload"] = [context]()
-        {
-            context.mLuaManager->addAction([]
-                {
-                    auto world = MWBase::Environment::get().getWorld();
+        api["triggerShaderReload"] = [context]() {
+            context.mLuaManager->addAction([] {
+                auto world = MWBase::Environment::get().getWorld();
 
-                    world->getRenderingManager()->getResourceSystem()->getSceneManager()->getShaderManager().triggerShaderReload();
-                    world->getPostProcessor()->triggerShaderReload();
-                });
+                world->getRenderingManager()
+                    ->getResourceSystem()
+                    ->getSceneManager()
+                    ->getShaderManager()
+                    .triggerShaderReload();
+                world->getPostProcessor()->triggerShaderReload();
+            });
         };
 
-        api["setShaderHotReloadEnabled"] = [context](bool value)
-        {
-            context.mLuaManager->addAction([value]
-                {
-                    auto world = MWBase::Environment::get().getWorld();
-                    world->getRenderingManager()->getResourceSystem()->getSceneManager()->getShaderManager().setHotReloadEnabled(value);
-                    world->getPostProcessor()->mEnableLiveReload = value;
-                });
+        api["setShaderHotReloadEnabled"] = [context](bool value) {
+            context.mLuaManager->addAction([value] {
+                auto world = MWBase::Environment::get().getWorld();
+                world->getRenderingManager()
+                    ->getResourceSystem()
+                    ->getSceneManager()
+                    ->getShaderManager()
+                    .setHotReloadEnabled(value);
+                world->getPostProcessor()->mEnableLiveReload = value;
+            });
         };
 
         return LuaUtil::makeReadOnly(api);
diff --git a/apps/openmw/mwlua/eventqueue.cpp b/apps/openmw/mwlua/eventqueue.cpp
index 86086f29db..cb952e4e3c 100644
--- a/apps/openmw/mwlua/eventqueue.cpp
+++ b/apps/openmw/mwlua/eventqueue.cpp
@@ -2,9 +2,9 @@
 
 #include <components/debug/debuglog.hpp>
 
+#include <components/esm/luascripts.hpp>
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/esmwriter.hpp>
-#include <components/esm/luascripts.hpp>
 
 #include <components/lua/serialization.hpp>
 
@@ -21,7 +21,7 @@ namespace MWLua
     }
 
     void loadEvents(sol::state& lua, ESM::ESMReader& esm, GlobalEventQueue& globalEvents, LocalEventQueue& localEvents,
-                    const std::map<int, int>& contentFileMapping, const LuaUtil::UserdataSerializer* serializer)
+        const std::map<int, int>& contentFileMapping, const LuaUtil::UserdataSerializer* serializer)
     {
         while (esm.isNextSub("LUAE"))
         {
@@ -42,17 +42,17 @@ namespace MWLua
                 auto it = contentFileMapping.find(dest.mContentFile);
                 if (it != contentFileMapping.end())
                     dest.mContentFile = it->second;
-                localEvents.push_back({dest, std::move(name), std::move(data)});
+                localEvents.push_back({ dest, std::move(name), std::move(data) });
             }
             else
-                globalEvents.push_back({std::move(name), std::move(data)});
+                globalEvents.push_back({ std::move(name), std::move(data) });
         }
     }
 
     void saveEvents(ESM::ESMWriter& esm, const GlobalEventQueue& globalEvents, const LocalEventQueue& localEvents)
     {
         ObjectId globalId;
-        globalId.unset();  // Used as a marker of a global event.
+        globalId.unset(); // Used as a marker of a global event.
 
         for (const GlobalEvent& e : globalEvents)
             saveEvent(esm, globalId, e);
diff --git a/apps/openmw/mwlua/eventqueue.hpp b/apps/openmw/mwlua/eventqueue.hpp
index 0e5f2dfcb4..273a4c2ad7 100644
--- a/apps/openmw/mwlua/eventqueue.hpp
+++ b/apps/openmw/mwlua/eventqueue.hpp
@@ -36,7 +36,7 @@ namespace MWLua
     using LocalEventQueue = std::vector<LocalEvent>;
 
     void loadEvents(sol::state& lua, ESM::ESMReader& esm, GlobalEventQueue&, LocalEventQueue&,
-                    const std::map<int, int>& contentFileMapping, const LuaUtil::UserdataSerializer* serializer);
+        const std::map<int, int>& contentFileMapping, const LuaUtil::UserdataSerializer* serializer);
     void saveEvents(ESM::ESMWriter& esm, const GlobalEventQueue&, const LocalEventQueue&);
 }
 
diff --git a/apps/openmw/mwlua/globalscripts.hpp b/apps/openmw/mwlua/globalscripts.hpp
index 5f8dc1ecf0..9448d626c9 100644
--- a/apps/openmw/mwlua/globalscripts.hpp
+++ b/apps/openmw/mwlua/globalscripts.hpp
@@ -16,15 +16,11 @@ namespace MWLua
     class GlobalScripts : public LuaUtil::ScriptsContainer
     {
     public:
-        GlobalScripts(LuaUtil::LuaState* lua) : LuaUtil::ScriptsContainer(lua, "Global")
+        GlobalScripts(LuaUtil::LuaState* lua)
+            : LuaUtil::ScriptsContainer(lua, "Global")
         {
-            registerEngineHandlers({
-                &mObjectActiveHandlers,
-                &mActorActiveHandlers,
-                &mItemActiveHandlers,
-                &mNewGameHandlers,
-                &mPlayerAddedHandlers
-            });
+            registerEngineHandlers({ &mObjectActiveHandlers, &mActorActiveHandlers, &mItemActiveHandlers,
+                &mNewGameHandlers, &mPlayerAddedHandlers });
         }
 
         void newGameStarted() { callEngineHandlers(mNewGameHandlers); }
@@ -34,11 +30,11 @@ namespace MWLua
         void playerAdded(const GObject& obj) { callEngineHandlers(mPlayerAddedHandlers, obj); }
 
     private:
-        EngineHandlerList mObjectActiveHandlers{"onObjectActive"};
-        EngineHandlerList mActorActiveHandlers{"onActorActive"};
-        EngineHandlerList mItemActiveHandlers{"onItemActive"};
-        EngineHandlerList mNewGameHandlers{"onNewGame"};
-        EngineHandlerList mPlayerAddedHandlers{"onPlayerAdded"};
+        EngineHandlerList mObjectActiveHandlers{ "onObjectActive" };
+        EngineHandlerList mActorActiveHandlers{ "onActorActive" };
+        EngineHandlerList mItemActiveHandlers{ "onItemActive" };
+        EngineHandlerList mNewGameHandlers{ "onNewGame" };
+        EngineHandlerList mPlayerAddedHandlers{ "onPlayerAdded" };
     };
 
 }
diff --git a/apps/openmw/mwlua/inputbindings.cpp b/apps/openmw/mwlua/inputbindings.cpp
index 13155c1aa6..105a107301 100644
--- a/apps/openmw/mwlua/inputbindings.cpp
+++ b/apps/openmw/mwlua/inputbindings.cpp
@@ -13,7 +13,9 @@
 namespace sol
 {
     template <>
-    struct is_automagical<SDL_Keysym> : std::false_type {};
+    struct is_automagical<SDL_Keysym> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
@@ -22,8 +24,7 @@ namespace MWLua
     sol::table initInputPackage(const Context& context)
     {
         sol::usertype<SDL_Keysym> keyEvent = context.mLua->sol().new_usertype<SDL_Keysym>("KeyEvent");
-        keyEvent["symbol"] = sol::readonly_property([](const SDL_Keysym& e)
-        {
+        keyEvent["symbol"] = sol::readonly_property([](const SDL_Keysym& e) {
             if (e.sym > 0 && e.sym <= 255)
                 return std::string(1, static_cast<char>(e.sym));
             else
@@ -36,22 +37,20 @@ namespace MWLua
         keyEvent["withSuper"] = sol::readonly_property([](const SDL_Keysym& e) -> bool { return e.mod & KMOD_GUI; });
 
         auto touchpadEvent = context.mLua->sol().new_usertype<SDLUtil::TouchEvent>("TouchpadEvent");
-        touchpadEvent["device"] = sol::readonly_property(
-            [](const SDLUtil::TouchEvent& e) -> int { return e.mDevice; });
-        touchpadEvent["finger"] = sol::readonly_property(
-            [](const SDLUtil::TouchEvent& e) -> int { return e.mFinger; });
-        touchpadEvent["position"] = sol::readonly_property(
-            [](const SDLUtil::TouchEvent& e) -> osg::Vec2f { return {e.mX, e.mY};});
-        touchpadEvent["pressure"] = sol::readonly_property(
-            [](const SDLUtil::TouchEvent& e) -> float { return e.mPressure; });
+        touchpadEvent["device"] = sol::readonly_property([](const SDLUtil::TouchEvent& e) -> int { return e.mDevice; });
+        touchpadEvent["finger"] = sol::readonly_property([](const SDLUtil::TouchEvent& e) -> int { return e.mFinger; });
+        touchpadEvent["position"] = sol::readonly_property([](const SDLUtil::TouchEvent& e) -> osg::Vec2f {
+            return { e.mX, e.mY };
+        });
+        touchpadEvent["pressure"]
+            = sol::readonly_property([](const SDLUtil::TouchEvent& e) -> float { return e.mPressure; });
 
         MWBase::InputManager* input = MWBase::Environment::get().getInputManager();
         sol::table api(context.mLua->sol(), sol::create);
 
         api["isIdle"] = [input]() { return input->isIdle(); };
         api["isActionPressed"] = [input](int action) { return input->actionIsActive(action); };
-        api["isKeyPressed"] = [](SDL_Scancode code) -> bool
-        {
+        api["isKeyPressed"] = [](SDL_Scancode code) -> bool {
             int maxCode;
             const auto* state = SDL_GetKeyboardState(&maxCode);
             if (code >= 0 && code < maxCode)
@@ -63,18 +62,14 @@ namespace MWLua
         api["isCtrlPressed"] = []() -> bool { return SDL_GetModState() & KMOD_CTRL; };
         api["isAltPressed"] = []() -> bool { return SDL_GetModState() & KMOD_ALT; };
         api["isSuperPressed"] = []() -> bool { return SDL_GetModState() & KMOD_GUI; };
-        api["isControllerButtonPressed"] = [input](int button)
-        {
+        api["isControllerButtonPressed"] = [input](int button) {
             return input->isControllerButtonPressed(static_cast<SDL_GameControllerButton>(button));
         };
-        api["isMouseButtonPressed"] = [](int button) -> bool
-        {
-            return SDL_GetMouseState(nullptr, nullptr) & SDL_BUTTON(button);
-        };
+        api["isMouseButtonPressed"]
+            = [](int button) -> bool { return SDL_GetMouseState(nullptr, nullptr) & SDL_BUTTON(button); };
         api["getMouseMoveX"] = [input]() { return input->getMouseMoveX(); };
         api["getMouseMoveY"] = [input]() { return input->getMouseMoveY(); };
-        api["getAxisValue"] = [input](int axis)
-        {
+        api["getAxisValue"] = [input](int axis) {
             if (axis < SDL_CONTROLLER_AXIS_MAX)
                 return input->getControllerAxisValue(static_cast<SDL_GameControllerAxis>(axis));
             else
@@ -84,216 +79,216 @@ namespace MWLua
         api["getControlSwitch"] = [input](std::string_view key) { return input->getControlSwitch(key); };
         api["setControlSwitch"] = [input](std::string_view key, bool v) { input->toggleControlSwitch(key, v); };
 
-        api["getKeyName"] = [](SDL_Scancode code) {
-            return SDL_GetKeyName(SDL_GetKeyFromScancode(code));
-        };
+        api["getKeyName"] = [](SDL_Scancode code) { return SDL_GetKeyName(SDL_GetKeyFromScancode(code)); };
 
         api["ACTION"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, MWInput::Actions>({
-            {"GameMenu", MWInput::A_GameMenu},
-            {"Screenshot", MWInput::A_Screenshot},
-            {"Inventory", MWInput::A_Inventory},
-            {"Console", MWInput::A_Console},
+            { "GameMenu", MWInput::A_GameMenu },
+            { "Screenshot", MWInput::A_Screenshot },
+            { "Inventory", MWInput::A_Inventory },
+            { "Console", MWInput::A_Console },
 
-            {"MoveLeft", MWInput::A_MoveLeft},
-            {"MoveRight", MWInput::A_MoveRight},
-            {"MoveForward", MWInput::A_MoveForward},
-            {"MoveBackward", MWInput::A_MoveBackward},
+            { "MoveLeft", MWInput::A_MoveLeft },
+            { "MoveRight", MWInput::A_MoveRight },
+            { "MoveForward", MWInput::A_MoveForward },
+            { "MoveBackward", MWInput::A_MoveBackward },
 
-            {"Activate", MWInput::A_Activate},
-            {"Use", MWInput::A_Use},
-            {"Jump", MWInput::A_Jump},
-            {"AutoMove", MWInput::A_AutoMove},
-            {"Rest", MWInput::A_Rest},
-            {"Journal", MWInput::A_Journal},
-            {"Weapon", MWInput::A_Weapon},
-            {"Spell", MWInput::A_Spell},
-            {"Run", MWInput::A_Run},
-            {"CycleSpellLeft", MWInput::A_CycleSpellLeft},
-            {"CycleSpellRight", MWInput::A_CycleSpellRight},
-            {"CycleWeaponLeft", MWInput::A_CycleWeaponLeft},
-            {"CycleWeaponRight", MWInput::A_CycleWeaponRight},
-            {"ToggleSneak", MWInput::A_ToggleSneak},
-            {"AlwaysRun", MWInput::A_AlwaysRun},
-            {"Sneak", MWInput::A_Sneak},
+            { "Activate", MWInput::A_Activate },
+            { "Use", MWInput::A_Use },
+            { "Jump", MWInput::A_Jump },
+            { "AutoMove", MWInput::A_AutoMove },
+            { "Rest", MWInput::A_Rest },
+            { "Journal", MWInput::A_Journal },
+            { "Weapon", MWInput::A_Weapon },
+            { "Spell", MWInput::A_Spell },
+            { "Run", MWInput::A_Run },
+            { "CycleSpellLeft", MWInput::A_CycleSpellLeft },
+            { "CycleSpellRight", MWInput::A_CycleSpellRight },
+            { "CycleWeaponLeft", MWInput::A_CycleWeaponLeft },
+            { "CycleWeaponRight", MWInput::A_CycleWeaponRight },
+            { "ToggleSneak", MWInput::A_ToggleSneak },
+            { "AlwaysRun", MWInput::A_AlwaysRun },
+            { "Sneak", MWInput::A_Sneak },
 
-            {"QuickSave", MWInput::A_QuickSave},
-            {"QuickLoad", MWInput::A_QuickLoad},
-            {"QuickMenu", MWInput::A_QuickMenu},
-            {"ToggleWeapon", MWInput::A_ToggleWeapon},
-            {"ToggleSpell", MWInput::A_ToggleSpell},
-            {"TogglePOV", MWInput::A_TogglePOV},
+            { "QuickSave", MWInput::A_QuickSave },
+            { "QuickLoad", MWInput::A_QuickLoad },
+            { "QuickMenu", MWInput::A_QuickMenu },
+            { "ToggleWeapon", MWInput::A_ToggleWeapon },
+            { "ToggleSpell", MWInput::A_ToggleSpell },
+            { "TogglePOV", MWInput::A_TogglePOV },
 
-            {"QuickKey1", MWInput::A_QuickKey1},
-            {"QuickKey2", MWInput::A_QuickKey2},
-            {"QuickKey3", MWInput::A_QuickKey3},
-            {"QuickKey4", MWInput::A_QuickKey4},
-            {"QuickKey5", MWInput::A_QuickKey5},
-            {"QuickKey6", MWInput::A_QuickKey6},
-            {"QuickKey7", MWInput::A_QuickKey7},
-            {"QuickKey8", MWInput::A_QuickKey8},
-            {"QuickKey9", MWInput::A_QuickKey9},
-            {"QuickKey10", MWInput::A_QuickKey10},
-            {"QuickKeysMenu", MWInput::A_QuickKeysMenu},
+            { "QuickKey1", MWInput::A_QuickKey1 },
+            { "QuickKey2", MWInput::A_QuickKey2 },
+            { "QuickKey3", MWInput::A_QuickKey3 },
+            { "QuickKey4", MWInput::A_QuickKey4 },
+            { "QuickKey5", MWInput::A_QuickKey5 },
+            { "QuickKey6", MWInput::A_QuickKey6 },
+            { "QuickKey7", MWInput::A_QuickKey7 },
+            { "QuickKey8", MWInput::A_QuickKey8 },
+            { "QuickKey9", MWInput::A_QuickKey9 },
+            { "QuickKey10", MWInput::A_QuickKey10 },
+            { "QuickKeysMenu", MWInput::A_QuickKeysMenu },
 
-            {"ToggleHUD", MWInput::A_ToggleHUD},
-            {"ToggleDebug", MWInput::A_ToggleDebug},
-            {"TogglePostProcessorHUD", MWInput::A_TogglePostProcessorHUD},
+            { "ToggleHUD", MWInput::A_ToggleHUD },
+            { "ToggleDebug", MWInput::A_ToggleDebug },
+            { "TogglePostProcessorHUD", MWInput::A_TogglePostProcessorHUD },
 
-            {"ZoomIn", MWInput::A_ZoomIn},
-            {"ZoomOut", MWInput::A_ZoomOut},
+            { "ZoomIn", MWInput::A_ZoomIn },
+            { "ZoomOut", MWInput::A_ZoomOut },
         }));
 
-        api["CONTROL_SWITCH"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, std::string_view>({
-            {"Controls", "playercontrols"},
-            {"Fighting", "playerfighting"},
-            {"Jumping", "playerjumping"},
-            {"Looking", "playerlooking"},
-            {"Magic", "playermagic"},
-            {"ViewMode", "playerviewswitch"},
-            {"VanityMode", "vanitymode"},
-        }));
+        api["CONTROL_SWITCH"]
+            = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, std::string_view>({
+                { "Controls", "playercontrols" },
+                { "Fighting", "playerfighting" },
+                { "Jumping", "playerjumping" },
+                { "Looking", "playerlooking" },
+                { "Magic", "playermagic" },
+                { "ViewMode", "playerviewswitch" },
+                { "VanityMode", "vanitymode" },
+            }));
 
-        api["CONTROLLER_BUTTON"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, SDL_GameControllerButton>({
-            {"A", SDL_CONTROLLER_BUTTON_A},
-            {"B", SDL_CONTROLLER_BUTTON_B},
-            {"X", SDL_CONTROLLER_BUTTON_X},
-            {"Y", SDL_CONTROLLER_BUTTON_Y},
-            {"Back", SDL_CONTROLLER_BUTTON_BACK},
-            {"Guide", SDL_CONTROLLER_BUTTON_GUIDE},
-            {"Start", SDL_CONTROLLER_BUTTON_START},
-            {"LeftStick", SDL_CONTROLLER_BUTTON_LEFTSTICK},
-            {"RightStick", SDL_CONTROLLER_BUTTON_RIGHTSTICK},
-            {"LeftShoulder", SDL_CONTROLLER_BUTTON_LEFTSHOULDER},
-            {"RightShoulder", SDL_CONTROLLER_BUTTON_RIGHTSHOULDER},
-            {"DPadUp", SDL_CONTROLLER_BUTTON_DPAD_UP},
-            {"DPadDown", SDL_CONTROLLER_BUTTON_DPAD_DOWN},
-            {"DPadLeft", SDL_CONTROLLER_BUTTON_DPAD_LEFT},
-            {"DPadRight", SDL_CONTROLLER_BUTTON_DPAD_RIGHT},
-        }));
+        api["CONTROLLER_BUTTON"]
+            = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, SDL_GameControllerButton>({
+                { "A", SDL_CONTROLLER_BUTTON_A },
+                { "B", SDL_CONTROLLER_BUTTON_B },
+                { "X", SDL_CONTROLLER_BUTTON_X },
+                { "Y", SDL_CONTROLLER_BUTTON_Y },
+                { "Back", SDL_CONTROLLER_BUTTON_BACK },
+                { "Guide", SDL_CONTROLLER_BUTTON_GUIDE },
+                { "Start", SDL_CONTROLLER_BUTTON_START },
+                { "LeftStick", SDL_CONTROLLER_BUTTON_LEFTSTICK },
+                { "RightStick", SDL_CONTROLLER_BUTTON_RIGHTSTICK },
+                { "LeftShoulder", SDL_CONTROLLER_BUTTON_LEFTSHOULDER },
+                { "RightShoulder", SDL_CONTROLLER_BUTTON_RIGHTSHOULDER },
+                { "DPadUp", SDL_CONTROLLER_BUTTON_DPAD_UP },
+                { "DPadDown", SDL_CONTROLLER_BUTTON_DPAD_DOWN },
+                { "DPadLeft", SDL_CONTROLLER_BUTTON_DPAD_LEFT },
+                { "DPadRight", SDL_CONTROLLER_BUTTON_DPAD_RIGHT },
+            }));
 
         api["CONTROLLER_AXIS"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
-            {"LeftX", SDL_CONTROLLER_AXIS_LEFTX},
-            {"LeftY", SDL_CONTROLLER_AXIS_LEFTY},
-            {"RightX", SDL_CONTROLLER_AXIS_RIGHTX},
-            {"RightY", SDL_CONTROLLER_AXIS_RIGHTY},
-            {"TriggerLeft", SDL_CONTROLLER_AXIS_TRIGGERLEFT},
-            {"TriggerRight", SDL_CONTROLLER_AXIS_TRIGGERRIGHT},
+            { "LeftX", SDL_CONTROLLER_AXIS_LEFTX },
+            { "LeftY", SDL_CONTROLLER_AXIS_LEFTY },
+            { "RightX", SDL_CONTROLLER_AXIS_RIGHTX },
+            { "RightY", SDL_CONTROLLER_AXIS_RIGHTY },
+            { "TriggerLeft", SDL_CONTROLLER_AXIS_TRIGGERLEFT },
+            { "TriggerRight", SDL_CONTROLLER_AXIS_TRIGGERRIGHT },
 
-            {"LookUpDown", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_LookUpDown)},
-            {"LookLeftRight", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_LookLeftRight)},
-            {"MoveForwardBackward", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_MoveForwardBackward)},
-            {"MoveLeftRight", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_MoveLeftRight)},
+            { "LookUpDown", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_LookUpDown) },
+            { "LookLeftRight", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_LookLeftRight) },
+            { "MoveForwardBackward", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_MoveForwardBackward) },
+            { "MoveLeftRight", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_MoveLeftRight) },
         }));
 
         api["KEY"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, SDL_Scancode>({
-            {"_0", SDL_SCANCODE_0},
-            {"_1", SDL_SCANCODE_1},
-            {"_2", SDL_SCANCODE_2},
-            {"_3", SDL_SCANCODE_3},
-            {"_4", SDL_SCANCODE_4},
-            {"_5", SDL_SCANCODE_5},
-            {"_6", SDL_SCANCODE_6},
-            {"_7", SDL_SCANCODE_7},
-            {"_8", SDL_SCANCODE_8},
-            {"_9", SDL_SCANCODE_9},
+            { "_0", SDL_SCANCODE_0 },
+            { "_1", SDL_SCANCODE_1 },
+            { "_2", SDL_SCANCODE_2 },
+            { "_3", SDL_SCANCODE_3 },
+            { "_4", SDL_SCANCODE_4 },
+            { "_5", SDL_SCANCODE_5 },
+            { "_6", SDL_SCANCODE_6 },
+            { "_7", SDL_SCANCODE_7 },
+            { "_8", SDL_SCANCODE_8 },
+            { "_9", SDL_SCANCODE_9 },
 
-            {"NP_0", SDL_SCANCODE_KP_0},
-            {"NP_1", SDL_SCANCODE_KP_1},
-            {"NP_2", SDL_SCANCODE_KP_2},
-            {"NP_3", SDL_SCANCODE_KP_3},
-            {"NP_4", SDL_SCANCODE_KP_4},
-            {"NP_5", SDL_SCANCODE_KP_5},
-            {"NP_6", SDL_SCANCODE_KP_6},
-            {"NP_7", SDL_SCANCODE_KP_7},
-            {"NP_8", SDL_SCANCODE_KP_8},
-            {"NP_9", SDL_SCANCODE_KP_9},
-            {"NP_Divide", SDL_SCANCODE_KP_DIVIDE},
-            {"NP_Enter", SDL_SCANCODE_KP_ENTER},
-            {"NP_Minus", SDL_SCANCODE_KP_MINUS},
-            {"NP_Multiply", SDL_SCANCODE_KP_MULTIPLY},
-            {"NP_Delete", SDL_SCANCODE_KP_PERIOD},
-            {"NP_Plus", SDL_SCANCODE_KP_PLUS},
+            { "NP_0", SDL_SCANCODE_KP_0 },
+            { "NP_1", SDL_SCANCODE_KP_1 },
+            { "NP_2", SDL_SCANCODE_KP_2 },
+            { "NP_3", SDL_SCANCODE_KP_3 },
+            { "NP_4", SDL_SCANCODE_KP_4 },
+            { "NP_5", SDL_SCANCODE_KP_5 },
+            { "NP_6", SDL_SCANCODE_KP_6 },
+            { "NP_7", SDL_SCANCODE_KP_7 },
+            { "NP_8", SDL_SCANCODE_KP_8 },
+            { "NP_9", SDL_SCANCODE_KP_9 },
+            { "NP_Divide", SDL_SCANCODE_KP_DIVIDE },
+            { "NP_Enter", SDL_SCANCODE_KP_ENTER },
+            { "NP_Minus", SDL_SCANCODE_KP_MINUS },
+            { "NP_Multiply", SDL_SCANCODE_KP_MULTIPLY },
+            { "NP_Delete", SDL_SCANCODE_KP_PERIOD },
+            { "NP_Plus", SDL_SCANCODE_KP_PLUS },
 
-            {"F1", SDL_SCANCODE_F1},
-            {"F2", SDL_SCANCODE_F2},
-            {"F3", SDL_SCANCODE_F3},
-            {"F4", SDL_SCANCODE_F4},
-            {"F5", SDL_SCANCODE_F5},
-            {"F6", SDL_SCANCODE_F6},
-            {"F7", SDL_SCANCODE_F7},
-            {"F8", SDL_SCANCODE_F8},
-            {"F9", SDL_SCANCODE_F9},
-            {"F10", SDL_SCANCODE_F10},
-            {"F11", SDL_SCANCODE_F11},
-            {"F12", SDL_SCANCODE_F12},
+            { "F1", SDL_SCANCODE_F1 },
+            { "F2", SDL_SCANCODE_F2 },
+            { "F3", SDL_SCANCODE_F3 },
+            { "F4", SDL_SCANCODE_F4 },
+            { "F5", SDL_SCANCODE_F5 },
+            { "F6", SDL_SCANCODE_F6 },
+            { "F7", SDL_SCANCODE_F7 },
+            { "F8", SDL_SCANCODE_F8 },
+            { "F9", SDL_SCANCODE_F9 },
+            { "F10", SDL_SCANCODE_F10 },
+            { "F11", SDL_SCANCODE_F11 },
+            { "F12", SDL_SCANCODE_F12 },
 
-            {"A", SDL_SCANCODE_A},
-            {"B", SDL_SCANCODE_B},
-            {"C", SDL_SCANCODE_C},
-            {"D", SDL_SCANCODE_D},
-            {"E", SDL_SCANCODE_E},
-            {"F", SDL_SCANCODE_F},
-            {"G", SDL_SCANCODE_G},
-            {"H", SDL_SCANCODE_H},
-            {"I", SDL_SCANCODE_I},
-            {"J", SDL_SCANCODE_J},
-            {"K", SDL_SCANCODE_K},
-            {"L", SDL_SCANCODE_L},
-            {"M", SDL_SCANCODE_M},
-            {"N", SDL_SCANCODE_N},
-            {"O", SDL_SCANCODE_O},
-            {"P", SDL_SCANCODE_P},
-            {"Q", SDL_SCANCODE_Q},
-            {"R", SDL_SCANCODE_R},
-            {"S", SDL_SCANCODE_S},
-            {"T", SDL_SCANCODE_T},
-            {"U", SDL_SCANCODE_U},
-            {"V", SDL_SCANCODE_V},
-            {"W", SDL_SCANCODE_W},
-            {"X", SDL_SCANCODE_X},
-            {"Y", SDL_SCANCODE_Y},
-            {"Z", SDL_SCANCODE_Z},
+            { "A", SDL_SCANCODE_A },
+            { "B", SDL_SCANCODE_B },
+            { "C", SDL_SCANCODE_C },
+            { "D", SDL_SCANCODE_D },
+            { "E", SDL_SCANCODE_E },
+            { "F", SDL_SCANCODE_F },
+            { "G", SDL_SCANCODE_G },
+            { "H", SDL_SCANCODE_H },
+            { "I", SDL_SCANCODE_I },
+            { "J", SDL_SCANCODE_J },
+            { "K", SDL_SCANCODE_K },
+            { "L", SDL_SCANCODE_L },
+            { "M", SDL_SCANCODE_M },
+            { "N", SDL_SCANCODE_N },
+            { "O", SDL_SCANCODE_O },
+            { "P", SDL_SCANCODE_P },
+            { "Q", SDL_SCANCODE_Q },
+            { "R", SDL_SCANCODE_R },
+            { "S", SDL_SCANCODE_S },
+            { "T", SDL_SCANCODE_T },
+            { "U", SDL_SCANCODE_U },
+            { "V", SDL_SCANCODE_V },
+            { "W", SDL_SCANCODE_W },
+            { "X", SDL_SCANCODE_X },
+            { "Y", SDL_SCANCODE_Y },
+            { "Z", SDL_SCANCODE_Z },
 
-            {"LeftArrow", SDL_SCANCODE_LEFT},
-            {"RightArrow", SDL_SCANCODE_RIGHT},
-            {"UpArrow", SDL_SCANCODE_UP},
-            {"DownArrow", SDL_SCANCODE_DOWN},
+            { "LeftArrow", SDL_SCANCODE_LEFT },
+            { "RightArrow", SDL_SCANCODE_RIGHT },
+            { "UpArrow", SDL_SCANCODE_UP },
+            { "DownArrow", SDL_SCANCODE_DOWN },
 
-            {"LeftAlt", SDL_SCANCODE_LALT},
-            {"LeftCtrl", SDL_SCANCODE_LCTRL},
-            {"LeftBracket", SDL_SCANCODE_LEFTBRACKET},
-            {"LeftSuper", SDL_SCANCODE_LGUI},
-            {"LeftShift", SDL_SCANCODE_LSHIFT},
-            {"RightAlt", SDL_SCANCODE_RALT},
-            {"RightCtrl", SDL_SCANCODE_RCTRL},
-            {"RightSuper", SDL_SCANCODE_RGUI},
-            {"RightBracket", SDL_SCANCODE_RIGHTBRACKET},
-            {"RightShift", SDL_SCANCODE_RSHIFT},
+            { "LeftAlt", SDL_SCANCODE_LALT },
+            { "LeftCtrl", SDL_SCANCODE_LCTRL },
+            { "LeftBracket", SDL_SCANCODE_LEFTBRACKET },
+            { "LeftSuper", SDL_SCANCODE_LGUI },
+            { "LeftShift", SDL_SCANCODE_LSHIFT },
+            { "RightAlt", SDL_SCANCODE_RALT },
+            { "RightCtrl", SDL_SCANCODE_RCTRL },
+            { "RightSuper", SDL_SCANCODE_RGUI },
+            { "RightBracket", SDL_SCANCODE_RIGHTBRACKET },
+            { "RightShift", SDL_SCANCODE_RSHIFT },
 
-            {"Apostrophe", SDL_SCANCODE_APOSTROPHE},
-            {"BackSlash", SDL_SCANCODE_BACKSLASH},
-            {"Backspace", SDL_SCANCODE_BACKSPACE},
-            {"CapsLock", SDL_SCANCODE_CAPSLOCK},
-            {"Comma", SDL_SCANCODE_COMMA},
-            {"Delete", SDL_SCANCODE_DELETE},
-            {"End", SDL_SCANCODE_END},
-            {"Enter", SDL_SCANCODE_RETURN},
-            {"Equals", SDL_SCANCODE_EQUALS},
-            {"Escape", SDL_SCANCODE_ESCAPE},
-            {"Home", SDL_SCANCODE_HOME},
-            {"Insert", SDL_SCANCODE_INSERT},
-            {"Minus", SDL_SCANCODE_MINUS},
-            {"NumLock", SDL_SCANCODE_NUMLOCKCLEAR},
-            {"PageDown", SDL_SCANCODE_PAGEDOWN},
-            {"PageUp", SDL_SCANCODE_PAGEUP},
-            {"Period", SDL_SCANCODE_PERIOD},
-            {"Pause", SDL_SCANCODE_PAUSE},
-            {"PrintScreen", SDL_SCANCODE_PRINTSCREEN},
-            {"ScrollLock", SDL_SCANCODE_SCROLLLOCK},
-            {"Semicolon", SDL_SCANCODE_SEMICOLON},
-            {"Slash", SDL_SCANCODE_SLASH},
-            {"Space", SDL_SCANCODE_SPACE},
-            {"Tab", SDL_SCANCODE_TAB},
+            { "Apostrophe", SDL_SCANCODE_APOSTROPHE },
+            { "BackSlash", SDL_SCANCODE_BACKSLASH },
+            { "Backspace", SDL_SCANCODE_BACKSPACE },
+            { "CapsLock", SDL_SCANCODE_CAPSLOCK },
+            { "Comma", SDL_SCANCODE_COMMA },
+            { "Delete", SDL_SCANCODE_DELETE },
+            { "End", SDL_SCANCODE_END },
+            { "Enter", SDL_SCANCODE_RETURN },
+            { "Equals", SDL_SCANCODE_EQUALS },
+            { "Escape", SDL_SCANCODE_ESCAPE },
+            { "Home", SDL_SCANCODE_HOME },
+            { "Insert", SDL_SCANCODE_INSERT },
+            { "Minus", SDL_SCANCODE_MINUS },
+            { "NumLock", SDL_SCANCODE_NUMLOCKCLEAR },
+            { "PageDown", SDL_SCANCODE_PAGEDOWN },
+            { "PageUp", SDL_SCANCODE_PAGEUP },
+            { "Period", SDL_SCANCODE_PERIOD },
+            { "Pause", SDL_SCANCODE_PAUSE },
+            { "PrintScreen", SDL_SCANCODE_PRINTSCREEN },
+            { "ScrollLock", SDL_SCANCODE_SCROLLLOCK },
+            { "Semicolon", SDL_SCANCODE_SEMICOLON },
+            { "Slash", SDL_SCANCODE_SLASH },
+            { "Space", SDL_SCANCODE_SPACE },
+            { "Tab", SDL_SCANCODE_TAB },
         }));
 
         return LuaUtil::makeReadOnly(api);
diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index 9c925b44a5..1cd1b2359e 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -2,17 +2,17 @@
 
 #include <components/esm3/loadcell.hpp>
 
-#include "../mwworld/ptr.hpp"
-#include "../mwworld/class.hpp"
-#include "../mwmechanics/aisequence.hpp"
 #include "../mwmechanics/aicombat.hpp"
 #include "../mwmechanics/aiescort.hpp"
 #include "../mwmechanics/aifollow.hpp"
+#include "../mwmechanics/aipackage.hpp"
 #include "../mwmechanics/aipursue.hpp"
+#include "../mwmechanics/aisequence.hpp"
 #include "../mwmechanics/aitravel.hpp"
 #include "../mwmechanics/aiwander.hpp"
-#include "../mwmechanics/aipackage.hpp"
 #include "../mwmechanics/creaturestats.hpp"
+#include "../mwworld/class.hpp"
+#include "../mwworld/ptr.hpp"
 
 #include "context.hpp"
 #include "worldview.hpp"
@@ -20,9 +20,13 @@
 namespace sol
 {
     template <>
-    struct is_automagical<MWBase::LuaManager::ActorControls> : std::false_type {};
+    struct is_automagical<MWBase::LuaManager::ActorControls> : std::false_type
+    {
+    };
     template <>
-    struct is_automagical<MWLua::LocalScripts::SelfObject> : std::false_type {};
+    struct is_automagical<MWLua::LocalScripts::SelfObject> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
@@ -33,8 +37,12 @@ namespace MWLua
         using ActorControls = MWBase::LuaManager::ActorControls;
         sol::usertype<ActorControls> controls = context.mLua->sol().new_usertype<ActorControls>("ActorControls");
 
-#define CONTROL(TYPE, FIELD) sol::property([](const ActorControls& c) { return c.FIELD; },\
-                                           [](ActorControls& c, const TYPE& v) { c.FIELD = v; c.mChanged = true; })
+#define CONTROL(TYPE, FIELD)                                                                                           \
+    sol::property([](const ActorControls& c) { return c.FIELD; },                                                      \
+        [](ActorControls& c, const TYPE& v) {                                                                          \
+            c.FIELD = v;                                                                                               \
+            c.mChanged = true;                                                                                         \
+        })
         controls["movement"] = CONTROL(float, mMovement);
         controls["sideMovement"] = CONTROL(float, mSideMovement);
         controls["pitchChange"] = CONTROL(float, mPitchChange);
@@ -44,9 +52,10 @@ namespace MWLua
         controls["use"] = CONTROL(int, mUse);
 #undef CONTROL
 
-        sol::usertype<SelfObject> selfAPI =
-            context.mLua->sol().new_usertype<SelfObject>("SelfObject", sol::base_classes, sol::bases<LObject, Object>());
-        selfAPI[sol::meta_function::to_string] = [](SelfObject& self) { return "openmw.self[" + self.toString() + "]"; };
+        sol::usertype<SelfObject> selfAPI = context.mLua->sol().new_usertype<SelfObject>(
+            "SelfObject", sol::base_classes, sol::bases<LObject, Object>());
+        selfAPI[sol::meta_function::to_string]
+            = [](SelfObject& self) { return "openmw.self[" + self.toString() + "]"; };
         selfAPI["object"] = sol::readonly_property([](SelfObject& self) -> LObject { return LObject(self); });
         selfAPI["controls"] = sol::readonly_property([](SelfObject& self) { return &self.mControls; });
         selfAPI["isActive"] = [](SelfObject& self) { return &self.mIsActive; };
@@ -54,37 +63,47 @@ namespace MWLua
 
         using AiPackage = MWMechanics::AiPackage;
         sol::usertype<AiPackage> aiPackage = context.mLua->sol().new_usertype<AiPackage>("AiPackage");
-        aiPackage["type"] = sol::readonly_property([](const AiPackage& p) -> std::string_view
-        {
+        aiPackage["type"] = sol::readonly_property([](const AiPackage& p) -> std::string_view {
             switch (p.getTypeId())
             {
-                case MWMechanics::AiPackageTypeId::Wander: return "Wander";
-                case MWMechanics::AiPackageTypeId::Travel: return "Travel";
-                case MWMechanics::AiPackageTypeId::Escort: return "Escort";
-                case MWMechanics::AiPackageTypeId::Follow: return "Follow";
-                case MWMechanics::AiPackageTypeId::Activate: return "Activate";
-                case MWMechanics::AiPackageTypeId::Combat: return "Combat";
-                case MWMechanics::AiPackageTypeId::Pursue: return "Pursue";
-                case MWMechanics::AiPackageTypeId::AvoidDoor: return "AvoidDoor";
-                case MWMechanics::AiPackageTypeId::Face: return "Face";
-                case MWMechanics::AiPackageTypeId::Breathe: return "Breathe";
-                case MWMechanics::AiPackageTypeId::Cast: return "Cast";
-                default: return "Unknown";
+                case MWMechanics::AiPackageTypeId::Wander:
+                    return "Wander";
+                case MWMechanics::AiPackageTypeId::Travel:
+                    return "Travel";
+                case MWMechanics::AiPackageTypeId::Escort:
+                    return "Escort";
+                case MWMechanics::AiPackageTypeId::Follow:
+                    return "Follow";
+                case MWMechanics::AiPackageTypeId::Activate:
+                    return "Activate";
+                case MWMechanics::AiPackageTypeId::Combat:
+                    return "Combat";
+                case MWMechanics::AiPackageTypeId::Pursue:
+                    return "Pursue";
+                case MWMechanics::AiPackageTypeId::AvoidDoor:
+                    return "AvoidDoor";
+                case MWMechanics::AiPackageTypeId::Face:
+                    return "Face";
+                case MWMechanics::AiPackageTypeId::Breathe:
+                    return "Breathe";
+                case MWMechanics::AiPackageTypeId::Cast:
+                    return "Cast";
+                default:
+                    return "Unknown";
             }
         });
-        aiPackage["target"] = sol::readonly_property([worldView=context.mWorldView](const AiPackage& p) -> sol::optional<LObject>
-        {
-            MWWorld::Ptr target = p.getTarget();
-            if (target.isEmpty())
-                return sol::nullopt;
-            else
-                return LObject(getId(target), worldView->getObjectRegistry());
-        });
+        aiPackage["target"]
+            = sol::readonly_property([worldView = context.mWorldView](const AiPackage& p) -> sol::optional<LObject> {
+                  MWWorld::Ptr target = p.getTarget();
+                  if (target.isEmpty())
+                      return sol::nullopt;
+                  else
+                      return LObject(getId(target), worldView->getObjectRegistry());
+              });
         aiPackage["sideWithTarget"] = sol::readonly_property([](const AiPackage& p) { return p.sideWithTarget(); });
         aiPackage["destPosition"] = sol::readonly_property([](const AiPackage& p) { return p.getDestination(); });
 
-        selfAPI["_getActiveAiPackage"] = [](SelfObject& self) -> sol::optional<std::shared_ptr<AiPackage>>
-        {
+        selfAPI["_getActiveAiPackage"] = [](SelfObject& self) -> sol::optional<std::shared_ptr<AiPackage>> {
             const MWWorld::Ptr& ptr = self.ptr();
             MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
             if (ai.isEmpty())
@@ -92,38 +111,32 @@ namespace MWLua
             else
                 return *ai.begin();
         };
-        selfAPI["_iterateAndFilterAiSequence"] = [](SelfObject& self, sol::function callback)
-        {
+        selfAPI["_iterateAndFilterAiSequence"] = [](SelfObject& self, sol::function callback) {
             const MWWorld::Ptr& ptr = self.ptr();
             MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
 
-            ai.erasePackagesIf([&](auto& entry)
-            {
+            ai.erasePackagesIf([&](auto& entry) {
                 bool keep = LuaUtil::call(callback, entry).template get<bool>();
                 return !keep;
             });
         };
-        selfAPI["_startAiCombat"] = [](SelfObject& self, const LObject& target)
-        {
+        selfAPI["_startAiCombat"] = [](SelfObject& self, const LObject& target) {
             const MWWorld::Ptr& ptr = self.ptr();
             MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
             ai.stack(MWMechanics::AiCombat(target.ptr()), ptr);
         };
-        selfAPI["_startAiPursue"] = [](SelfObject& self, const LObject& target)
-        {
+        selfAPI["_startAiPursue"] = [](SelfObject& self, const LObject& target) {
             const MWWorld::Ptr& ptr = self.ptr();
             MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
             ai.stack(MWMechanics::AiPursue(target.ptr()), ptr);
         };
-        selfAPI["_startAiFollow"] = [](SelfObject& self, const LObject& target)
-        {
+        selfAPI["_startAiFollow"] = [](SelfObject& self, const LObject& target) {
             const MWWorld::Ptr& ptr = self.ptr();
             MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
             ai.stack(MWMechanics::AiFollow(target.ptr()), ptr);
         };
-        selfAPI["_startAiEscort"] = [](SelfObject& self, const LObject& target, LCell cell,
-                                       float duration, const osg::Vec3f& dest)
-        {
+        selfAPI["_startAiEscort"] = [](SelfObject& self, const LObject& target, LCell cell, float duration,
+                                        const osg::Vec3f& dest) {
             const MWWorld::Ptr& ptr = self.ptr();
             MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
             // TODO: change AiEscort implementation to accept ptr instead of a non-unique refId.
@@ -133,17 +146,17 @@ namespace MWLua
             if (esmCell->isExterior())
                 ai.stack(MWMechanics::AiEscort(refId, gameHoursDuration, dest.x(), dest.y(), dest.z(), false), ptr);
             else
-                ai.stack(MWMechanics::AiEscort(refId, esmCell->mName, gameHoursDuration, dest.x(), dest.y(), dest.z(), false), ptr);
+                ai.stack(MWMechanics::AiEscort(
+                             refId, esmCell->mName, gameHoursDuration, dest.x(), dest.y(), dest.z(), false),
+                    ptr);
         };
-        selfAPI["_startAiWander"] = [](SelfObject& self, int distance, float duration)
-        {
+        selfAPI["_startAiWander"] = [](SelfObject& self, int distance, float duration) {
             const MWWorld::Ptr& ptr = self.ptr();
             MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
             int gameHoursDuration = static_cast<int>(std::ceil(duration / 3600.0));
             ai.stack(MWMechanics::AiWander(distance, gameHoursDuration, 0, {}, false), ptr);
         };
-        selfAPI["_startAiTravel"] = [](SelfObject& self, const osg::Vec3f& target)
-        {
+        selfAPI["_startAiTravel"] = [](SelfObject& self, const osg::Vec3f& target) {
             const MWWorld::Ptr& ptr = self.ptr();
             MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
             ai.stack(MWMechanics::AiTravel(target.x(), target.y(), target.z(), false), ptr);
@@ -151,37 +164,40 @@ namespace MWLua
     }
 
     LocalScripts::LocalScripts(LuaUtil::LuaState* lua, const LObject& obj)
-        : LuaUtil::ScriptsContainer(lua, "L" + idToString(obj.id())), mData(obj)
+        : LuaUtil::ScriptsContainer(lua, "L" + idToString(obj.id()))
+        , mData(obj)
     {
         this->addPackage("openmw.self", sol::make_object(lua->sol(), &mData));
-        registerEngineHandlers({&mOnActiveHandlers, &mOnInactiveHandlers, &mOnConsumeHandlers, &mOnActivatedHandlers});
+        registerEngineHandlers(
+            { &mOnActiveHandlers, &mOnInactiveHandlers, &mOnConsumeHandlers, &mOnActivatedHandlers });
     }
 
     void LocalScripts::receiveEngineEvent(const EngineEvent& event)
     {
-        std::visit([this](auto&& arg)
-        {
-            using EventT = std::decay_t<decltype(arg)>;
-            if constexpr (std::is_same_v<EventT, OnActive>)
-            {
-                mData.mIsActive = true;
-                callEngineHandlers(mOnActiveHandlers);
-            }
-            else if constexpr (std::is_same_v<EventT, OnInactive>)
-            {
-                mData.mIsActive = false;
-                callEngineHandlers(mOnInactiveHandlers);
-            }
-            else if constexpr (std::is_same_v<EventT, OnActivated>)
-            {
-                callEngineHandlers(mOnActivatedHandlers, arg.mActivatingActor);
-            }
-            else
-            {
-                static_assert(std::is_same_v<EventT, OnConsume>);
-                callEngineHandlers(mOnConsumeHandlers, arg.mConsumable);
-            }
-        }, event);
+        std::visit(
+            [this](auto&& arg) {
+                using EventT = std::decay_t<decltype(arg)>;
+                if constexpr (std::is_same_v<EventT, OnActive>)
+                {
+                    mData.mIsActive = true;
+                    callEngineHandlers(mOnActiveHandlers);
+                }
+                else if constexpr (std::is_same_v<EventT, OnInactive>)
+                {
+                    mData.mIsActive = false;
+                    callEngineHandlers(mOnInactiveHandlers);
+                }
+                else if constexpr (std::is_same_v<EventT, OnActivated>)
+                {
+                    callEngineHandlers(mOnActivatedHandlers, arg.mActivatingActor);
+                }
+                else
+                {
+                    static_assert(std::is_same_v<EventT, OnConsume>);
+                    callEngineHandlers(mOnConsumeHandlers, arg.mConsumable);
+                }
+            },
+            event);
     }
 
     void LocalScripts::applyStatsCache()
diff --git a/apps/openmw/mwlua/localscripts.hpp b/apps/openmw/mwlua/localscripts.hpp
index ec08f5b5f3..c76c1be51a 100644
--- a/apps/openmw/mwlua/localscripts.hpp
+++ b/apps/openmw/mwlua/localscripts.hpp
@@ -29,13 +29,19 @@ namespace MWLua
             class CachedStat
             {
             public:
-                using Setter = void(*)(int, std::string_view, const MWWorld::Ptr&, const sol::object&);
+                using Setter = void (*)(int, std::string_view, const MWWorld::Ptr&, const sol::object&);
+
             private:
                 Setter mSetter; // Function that updates a stat's property
                 int mIndex; // Optional index to disambiguate the stat
                 std::string_view mProp; // Name of the stat's property
             public:
-                CachedStat(Setter setter, int index, std::string_view prop) : mSetter(setter), mIndex(index), mProp(std::move(prop)) {}
+                CachedStat(Setter setter, int index, std::string_view prop)
+                    : mSetter(setter)
+                    , mIndex(index)
+                    , mProp(std::move(prop))
+                {
+                }
 
                 void operator()(const MWWorld::Ptr& ptr, const sol::object& object) const
                 {
@@ -48,17 +54,25 @@ namespace MWLua
                 }
             };
 
-            SelfObject(const LObject& obj) : LObject(obj), mIsActive(false) {}
+            SelfObject(const LObject& obj)
+                : LObject(obj)
+                , mIsActive(false)
+            {
+            }
             MWBase::LuaManager::ActorControls mControls;
             std::map<CachedStat, sol::object> mStatsCache;
             bool mIsActive;
         };
 
-        struct OnActive {};
-        struct OnInactive {};
+        struct OnActive
+        {
+        };
+        struct OnInactive
+        {
+        };
         struct OnActivated
         {
-           LObject mActivatingActor;
+            LObject mActivatingActor;
         };
         struct OnConsume
         {
@@ -69,14 +83,15 @@ namespace MWLua
         void receiveEngineEvent(const EngineEvent&);
 
         void applyStatsCache();
+
     protected:
         SelfObject mData;
 
     private:
-        EngineHandlerList mOnActiveHandlers{"onActive"};
-        EngineHandlerList mOnInactiveHandlers{"onInactive"};
-        EngineHandlerList mOnConsumeHandlers{"onConsume"};
-        EngineHandlerList mOnActivatedHandlers{"onActivated"};
+        EngineHandlerList mOnActiveHandlers{ "onActive" };
+        EngineHandlerList mOnInactiveHandlers{ "onInactive" };
+        EngineHandlerList mOnConsumeHandlers{ "onConsume" };
+        EngineHandlerList mOnActivatedHandlers{ "onActivated" };
     };
 
 }
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 268c8d8165..2abc094a76 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -2,8 +2,8 @@
 
 #include <chrono>
 
-#include <components/lua/luastate.hpp>
 #include <components/lua/l10n.hpp>
+#include <components/lua/luastate.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/statemanager.hpp"
@@ -11,8 +11,8 @@
 #include "../mwworld/store.hpp"
 
 #include "eventqueue.hpp"
-#include "worldview.hpp"
 #include "luamanagerimp.hpp"
+#include "worldview.hpp"
 
 namespace MWLua
 {
@@ -21,26 +21,22 @@ namespace MWLua
     {
         MWBase::World* world = MWBase::Environment::get().getWorld();
 
-        api["getSimulationTime"] = [world=context.mWorldView]() { return world->getSimulationTime(); };
+        api["getSimulationTime"] = [world = context.mWorldView]() { return world->getSimulationTime(); };
         api["getSimulationTimeScale"] = [world]() { return world->getSimulationTimeScale(); };
-        api["getGameTime"] = [world=context.mWorldView]() { return world->getGameTime(); };
-        api["getGameTimeScale"] = [world=context.mWorldView]() { return world->getGameTimeScale(); };
-        api["isWorldPaused"] = [world=context.mWorldView]() { return world->isPaused(); };
-        api["getRealTime"] = []()
-        {
+        api["getGameTime"] = [world = context.mWorldView]() { return world->getGameTime(); };
+        api["getGameTimeScale"] = [world = context.mWorldView]() { return world->getGameTimeScale(); };
+        api["isWorldPaused"] = [world = context.mWorldView]() { return world->isPaused(); };
+        api["getRealTime"] = []() {
             return std::chrono::duration<double>(std::chrono::steady_clock::now().time_since_epoch()).count();
         };
 
         if (!global)
             return;
 
-        api["setGameTimeScale"] = [world=context.mWorldView](double scale) { world->setGameTimeScale(scale); };
+        api["setGameTimeScale"] = [world = context.mWorldView](double scale) { world->setGameTimeScale(scale); };
 
-        api["setSimulationTimeScale"] = [context, world](float scale)
-        {
-            context.mLuaManager->addAction([scale, world] {
-                world->setSimulationTimeScale(scale);
-            });
+        api["setSimulationTimeScale"] = [context, world](float scale) {
+            context.mLuaManager->addAction([scale, world] { world->setSimulationTimeScale(scale); });
         };
 
         // TODO: Ability to pause/resume world from Lua (needed for UI dehardcoding)
@@ -53,25 +49,24 @@ namespace MWLua
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
         api["API_REVISION"] = 30;
-        api["quit"] = [lua]()
-        {
+        api["quit"] = [lua]() {
             Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();
             MWBase::Environment::get().getStateManager()->requestQuit();
         };
-        api["sendGlobalEvent"] = [context](std::string eventName, const sol::object& eventData)
-        {
-            context.mGlobalEventQueue->push_back({std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer)});
+        api["sendGlobalEvent"] = [context](std::string eventName, const sol::object& eventData) {
+            context.mGlobalEventQueue->push_back(
+                { std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer) });
         };
         addTimeBindings(api, context, false);
-        api["l10n"] = [l10n=context.mL10n](const std::string& context, const sol::object &fallbackLocale) {
+        api["l10n"] = [l10n = context.mL10n](const std::string& context, const sol::object& fallbackLocale) {
             if (fallbackLocale == sol::nil)
                 return l10n->getContext(context);
             else
                 return l10n->getContext(context, fallbackLocale.as<std::string>());
         };
-        const MWWorld::Store<ESM::GameSetting>* gmst = &MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
-        api["getGMST"] = [lua=context.mLua, gmst](const std::string& setting) -> sol::object
-        {
+        const MWWorld::Store<ESM::GameSetting>* gmst
+            = &MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        api["getGMST"] = [lua = context.mLua, gmst](const std::string& setting) -> sol::object {
             const ESM::Variant& value = gmst->find(setting)->mValue;
             if (value.getType() == ESM::VT_String)
                 return sol::make_object<std::string>(lua->sol(), value.getString());
@@ -88,23 +83,21 @@ namespace MWLua
         sol::table api(context.mLua->sol(), sol::create);
         WorldView* worldView = context.mWorldView;
         addTimeBindings(api, context, true);
-        api["getCellByName"] = [worldView=context.mWorldView](const std::string& name) -> sol::optional<GCell>
-        {
+        api["getCellByName"] = [worldView = context.mWorldView](const std::string& name) -> sol::optional<GCell> {
             MWWorld::CellStore* cell = worldView->findNamedCell(name);
             if (cell)
-                return GCell{cell};
+                return GCell{ cell };
             else
                 return sol::nullopt;
         };
-        api["getExteriorCell"] = [worldView=context.mWorldView](int x, int y) -> sol::optional<GCell>
-        {
+        api["getExteriorCell"] = [worldView = context.mWorldView](int x, int y) -> sol::optional<GCell> {
             MWWorld::CellStore* cell = worldView->findExteriorCell(x, y);
             if (cell)
-                return GCell{cell};
+                return GCell{ cell };
             else
                 return sol::nullopt;
         };
-        api["activeActors"] = GObjectList{worldView->getActorsInScene()};
+        api["activeActors"] = GObjectList{ worldView->getActorsInScene() };
         // TODO: add world.placeNewObject(recordId, cell, pos, [rot])
         return LuaUtil::makeReadOnly(api);
     }
@@ -112,7 +105,8 @@ namespace MWLua
     sol::table initGlobalStoragePackage(const Context& context, LuaUtil::LuaStorage* globalStorage)
     {
         sol::table res(context.mLua->sol(), sol::create);
-        res["globalSection"] = [globalStorage](std::string_view section) { return globalStorage->getMutableSection(section); };
+        res["globalSection"]
+            = [globalStorage](std::string_view section) { return globalStorage->getMutableSection(section); };
         res["allGlobalSections"] = [globalStorage]() { return globalStorage->getAllSections(); };
         return LuaUtil::makeReadOnly(res);
     }
@@ -120,18 +114,21 @@ namespace MWLua
     sol::table initLocalStoragePackage(const Context& context, LuaUtil::LuaStorage* globalStorage)
     {
         sol::table res(context.mLua->sol(), sol::create);
-        res["globalSection"] = [globalStorage](std::string_view section) { return globalStorage->getReadOnlySection(section); };
+        res["globalSection"]
+            = [globalStorage](std::string_view section) { return globalStorage->getReadOnlySection(section); };
         return LuaUtil::makeReadOnly(res);
     }
 
-    sol::table initPlayerStoragePackage(const Context& context, LuaUtil::LuaStorage* globalStorage, LuaUtil::LuaStorage* playerStorage)
+    sol::table initPlayerStoragePackage(
+        const Context& context, LuaUtil::LuaStorage* globalStorage, LuaUtil::LuaStorage* playerStorage)
     {
         sol::table res(context.mLua->sol(), sol::create);
-        res["globalSection"] = [globalStorage](std::string_view section) { return globalStorage->getReadOnlySection(section); };
-        res["playerSection"] = [playerStorage](std::string_view section) { return playerStorage->getMutableSection(section); };
+        res["globalSection"]
+            = [globalStorage](std::string_view section) { return globalStorage->getReadOnlySection(section); };
+        res["playerSection"]
+            = [playerStorage](std::string_view section) { return playerStorage->getMutableSection(section); };
         res["allPlayerSections"] = [playerStorage]() { return playerStorage->getAllSections(); };
         return LuaUtil::makeReadOnly(res);
     }
 
 }
-
diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp
index 537fc0bf46..88ff7d67e5 100644
--- a/apps/openmw/mwlua/luabindings.hpp
+++ b/apps/openmw/mwlua/luabindings.hpp
@@ -2,8 +2,8 @@
 #define MWLUA_LUABINDINGS_H
 
 #include <components/lua/luastate.hpp>
-#include <components/lua/serialization.hpp>
 #include <components/lua/scriptscontainer.hpp>
+#include <components/lua/serialization.hpp>
 #include <components/lua/storage.hpp>
 
 #include "context.hpp"
@@ -22,7 +22,8 @@ namespace MWLua
 
     sol::table initGlobalStoragePackage(const Context&, LuaUtil::LuaStorage* globalStorage);
     sol::table initLocalStoragePackage(const Context&, LuaUtil::LuaStorage* globalStorage);
-    sol::table initPlayerStoragePackage(const Context&, LuaUtil::LuaStorage* globalStorage, LuaUtil::LuaStorage* playerStorage);
+    sol::table initPlayerStoragePackage(
+        const Context&, LuaUtil::LuaStorage* globalStorage, LuaUtil::LuaStorage* playerStorage);
 
     // Implemented in nearbybindings.cpp
     sol::table initNearbyPackage(const Context&);
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 2c8754375c..95da0e78c1 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -4,9 +4,9 @@
 
 #include <components/debug/debuglog.hpp>
 
+#include <components/esm/luascripts.hpp>
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/esmwriter.hpp>
-#include <components/esm/luascripts.hpp>
 
 #include <components/settings/settings.hpp>
 
@@ -22,16 +22,16 @@
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/ptr.hpp"
 
-#include "luabindings.hpp"
-#include "userdataserializer.hpp"
-#include "types/types.hpp"
 #include "debugbindings.hpp"
+#include "luabindings.hpp"
 #include "playerscripts.hpp"
+#include "types/types.hpp"
+#include "userdataserializer.hpp"
 
 namespace MWLua
 {
 
-    LuaManager::LuaManager(const VFS::Manager* vfs, const std::filesystem::path &libsDir)
+    LuaManager::LuaManager(const VFS::Manager* vfs, const std::filesystem::path& libsDir)
         : mLua(vfs, &mConfiguration)
         , mUiResourceManager(vfs)
         , mL10n(vfs, &mLua)
@@ -110,7 +110,7 @@ namespace MWLua
         return mL10n.translate(contextName, key);
     }
 
-    void LuaManager::loadPermanentStorage(const std::filesystem::path &userConfigPath)
+    void LuaManager::loadPermanentStorage(const std::filesystem::path& userConfigPath)
     {
         const auto globalPath = userConfigPath / "global_storage.bin";
         const auto playerPath = userConfigPath / "player_storage.bin";
@@ -120,7 +120,7 @@ namespace MWLua
             mPlayerStorage.load(playerPath);
     }
 
-    void LuaManager::savePermanentStorage(const std::filesystem::path &userConfigPath)
+    void LuaManager::savePermanentStorage(const std::filesystem::path& userConfigPath)
     {
         mGlobalStorage.save(userConfigPath / "global_storage.bin");
         mPlayerStorage.save(userConfigPath / "player_storage.bin");
@@ -130,7 +130,7 @@ namespace MWLua
     {
         static const bool luaDebug = Settings::Manager::getBool("lua debug", "Lua");
         if (mPlayer.isEmpty())
-            return;  // The game is not started yet.
+            return; // The game is not started yet.
 
         float frameDuration = MWBase::Environment::get().getFrameDuration();
         ObjectRegistry* objectRegistry = mWorldView.getObjectRegistry();
@@ -140,7 +140,7 @@ namespace MWLua
             throw std::logic_error("Player Refnum was changed unexpectedly");
         if (!mPlayer.isInCell() || !newPlayerPtr.isInCell() || mPlayer.getCell() != newPlayerPtr.getCell())
         {
-            mPlayer = newPlayerPtr;  // player was moved to another cell, update ptr in registry
+            mPlayer = newPlayerPtr; // player was moved to another cell, update ptr in registry
             objectRegistry->registerPtr(mPlayer);
         }
 
@@ -152,7 +152,7 @@ namespace MWLua
         mLocalEvents = std::vector<LocalEvent>();
 
         if (!mWorldView.isPaused())
-        {  // Update time and process timers
+        { // Update time and process timers
             double simulationTime = mWorldView.getSimulationTime() + frameDuration;
             mWorldView.setSimulationTime(simulationTime);
             double gameTime = mWorldView.getGameTime();
@@ -188,7 +188,8 @@ namespace MWLua
             if (!obj.isValid())
             {
                 if (luaDebug)
-                    Log(Debug::Verbose) << "Can not call engine handlers: object" << idToString(e.mDest) << " is not found";
+                    Log(Debug::Verbose) << "Can not call engine handlers: object" << idToString(e.mDest)
+                                        << " is not found";
                 continue;
             }
             LocalScripts* scripts = obj.ptr().getRefData().getLuaScripts();
@@ -229,7 +230,7 @@ namespace MWLua
             }
             else if (luaDebug)
                 Log(Debug::Verbose) << "Could not resolve a Lua object added event: object" << idToString(id)
-                    << " is already removed";
+                                    << " is already removed";
         }
         mObjectAddedEvents.clear();
 
@@ -240,7 +241,7 @@ namespace MWLua
     void LuaManager::synchronizedUpdate()
     {
         if (mPlayer.isEmpty())
-            return;  // The game is not started yet.
+            return; // The game is not started yet.
 
         // We apply input events in `synchronizedUpdate` rather than in `update` in order to reduce input latency.
         mProcessingInputEvents = true;
@@ -266,7 +267,7 @@ namespace MWLua
         for (std::unique_ptr<Action>& action : mActionQueue)
             action->safeApply(mWorldView);
         mActionQueue.clear();
-        
+
         if (mTeleportPlayerAction)
             mTeleportPlayerAction->safeApply(mWorldView);
         mTeleportPlayerAction.reset();
@@ -314,7 +315,7 @@ namespace MWLua
             localScripts->addAutoStartedScripts();
         }
         mActiveLocalScripts.insert(localScripts);
-        mLocalEngineEvents.push_back({getId(ptr), LocalScripts::OnActive{}});
+        mLocalEngineEvents.push_back({ getId(ptr), LocalScripts::OnActive{} });
         mPlayerChanged = true;
     }
 
@@ -335,23 +336,23 @@ namespace MWLua
 
     void LuaManager::objectAddedToScene(const MWWorld::Ptr& ptr)
     {
-        mWorldView.objectAddedToScene(ptr);  // assigns generated RefNum if it is not set yet.
+        mWorldView.objectAddedToScene(ptr); // assigns generated RefNum if it is not set yet.
 
         LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
         if (!localScripts)
         {
-            LuaUtil::ScriptIdsWithInitializationData autoStartConf =
-                mConfiguration.getLocalConf(getLiveCellRefType(ptr.mRef), ptr.getCellRef().getRefId(), getId(ptr));
+            LuaUtil::ScriptIdsWithInitializationData autoStartConf
+                = mConfiguration.getLocalConf(getLiveCellRefType(ptr.mRef), ptr.getCellRef().getRefId(), getId(ptr));
             if (!autoStartConf.empty())
             {
                 localScripts = createLocalScripts(ptr, std::move(autoStartConf));
-                localScripts->addAutoStartedScripts();  // TODO: put to a queue and apply on next `update()`
+                localScripts->addAutoStartedScripts(); // TODO: put to a queue and apply on next `update()`
             }
         }
         if (localScripts)
         {
             mActiveLocalScripts.insert(localScripts);
-            mLocalEngineEvents.push_back({getId(ptr), LocalScripts::OnActive{}});
+            mLocalEngineEvents.push_back({ getId(ptr), LocalScripts::OnActive{} });
         }
 
         if (ptr != mPlayer)
@@ -366,7 +367,7 @@ namespace MWLua
         {
             mActiveLocalScripts.erase(localScripts);
             if (!mWorldView.getObjectRegistry()->getPtr(getId(ptr), true).isEmpty())
-                mLocalEngineEvents.push_back({getId(ptr), LocalScripts::OnInactive{}});
+                mLocalEngineEvents.push_back({ getId(ptr), LocalScripts::OnInactive{} });
         }
     }
 
@@ -383,12 +384,14 @@ namespace MWLua
     void LuaManager::itemConsumed(const MWWorld::Ptr& consumable, const MWWorld::Ptr& actor)
     {
         mWorldView.getObjectRegistry()->registerPtr(consumable);
-        mLocalEngineEvents.push_back({getId(actor), LocalScripts::OnConsume{LObject(getId(consumable), mWorldView.getObjectRegistry())}});
+        mLocalEngineEvents.push_back(
+            { getId(actor), LocalScripts::OnConsume{ LObject(getId(consumable), mWorldView.getObjectRegistry()) } });
     }
 
     void LuaManager::objectActivated(const MWWorld::Ptr& object, const MWWorld::Ptr& actor)
     {
-        mLocalEngineEvents.push_back({getId(object), LocalScripts::OnActivated{LObject(getId(actor), mWorldView.getObjectRegistry())}});
+        mLocalEngineEvents.push_back(
+            { getId(object), LocalScripts::OnActivated{ LObject(getId(actor), mWorldView.getObjectRegistry()) } });
     }
 
     MWBase::LuaManager::ActorControls* LuaManager::getActorControls(const MWWorld::Ptr& ptr) const
@@ -412,8 +415,8 @@ namespace MWLua
         localScripts->addCustomScript(scriptId);
     }
 
-    LocalScripts* LuaManager::createLocalScripts(const MWWorld::Ptr& ptr,
-                                                 std::optional<LuaUtil::ScriptIdsWithInitializationData> autoStartConf)
+    LocalScripts* LuaManager::createLocalScripts(
+        const MWWorld::Ptr& ptr, std::optional<LuaUtil::ScriptIdsWithInitializationData> autoStartConf)
     {
         assert(mInitialized);
         std::shared_ptr<LocalScripts> scripts;
@@ -514,7 +517,7 @@ namespace MWLua
         mL10n.clear();
         initConfiguration();
 
-        {  // Reload global scripts
+        { // Reload global scripts
             mGlobalScripts.setSavedDataDeserializer(mGlobalSerializer.get());
             ESM::LuaScripts data;
             mGlobalScripts.save(data);
@@ -522,7 +525,7 @@ namespace MWLua
         }
 
         for (const auto& [id, ptr] : mWorldView.getObjectRegistry()->mObjectMapping)
-        {  // Reload local scripts
+        { // Reload local scripts
             LocalScripts* scripts = ptr.getRefData().getLuaScripts();
             if (scripts == nullptr)
                 continue;
@@ -535,23 +538,24 @@ namespace MWLua
             scripts->receiveEngineEvent(LocalScripts::OnActive());
     }
 
-    void LuaManager::handleConsoleCommand(const std::string& consoleMode, const std::string& command, const MWWorld::Ptr& selectedPtr)
+    void LuaManager::handleConsoleCommand(
+        const std::string& consoleMode, const std::string& command, const MWWorld::Ptr& selectedPtr)
     {
         PlayerScripts* playerScripts = nullptr;
         if (!mPlayer.isEmpty())
             playerScripts = dynamic_cast<PlayerScripts*>(mPlayer.getRefData().getLuaScripts());
         if (!playerScripts)
         {
-            MWBase::Environment::get().getWindowManager()->printToConsole("You must enter a game session to run Lua commands\n",
-                                                                          MWBase::WindowManager::sConsoleColor_Error);
+            MWBase::Environment::get().getWindowManager()->printToConsole(
+                "You must enter a game session to run Lua commands\n", MWBase::WindowManager::sConsoleColor_Error);
             return;
         }
         sol::object selected = sol::nil;
         if (!selectedPtr.isEmpty())
             selected = sol::make_object(mLua.sol(), LObject(getId(selectedPtr), mWorldView.getObjectRegistry()));
         if (!playerScripts->consoleCommand(consoleMode, command, selected))
-            MWBase::Environment::get().getWindowManager()->printToConsole("No Lua handlers for console\n",
-                                                                          MWBase::WindowManager::sConsoleColor_Error);
+            MWBase::Environment::get().getWindowManager()->printToConsole(
+                "No Lua handlers for console\n", MWBase::WindowManager::sConsoleColor_Error);
     }
 
     LuaManager::Action::Action(LuaUtil::LuaState* state)
@@ -584,7 +588,11 @@ namespace MWLua
         {
         public:
             FunctionAction(LuaUtil::LuaState* state, std::function<void()> fn, std::string_view name)
-                : Action(state), mFn(std::move(fn)), mName(name) {}
+                : Action(state)
+                , mFn(std::move(fn))
+                , mName(name)
+            {
+            }
 
             void apply(WorldView&) const override { mFn(); }
             std::string toString() const override { return "FunctionAction " + mName; }
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index 8c4c6f4d95..1146147acc 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -15,11 +15,11 @@
 
 #include "../mwbase/luamanager.hpp"
 
-#include "object.hpp"
 #include "eventqueue.hpp"
 #include "globalscripts.hpp"
-#include "worldview.hpp"
 #include "localscripts.hpp"
+#include "object.hpp"
+#include "worldview.hpp"
 
 namespace MWLua
 {
@@ -27,7 +27,7 @@ namespace MWLua
     class LuaManager : public MWBase::LuaManager
     {
     public:
-        LuaManager(const VFS::Manager* vfs, const std::filesystem::path &libsDir);
+        LuaManager(const VFS::Manager* vfs, const std::filesystem::path& libsDir);
 
         // Called by engine.cpp before UI setup.
         void initL10n();
@@ -35,8 +35,8 @@ namespace MWLua
         // Called by engine.cpp when the environment is fully initialized.
         void init();
 
-        void loadPermanentStorage(const std::filesystem::path &userConfigPath);
-        void savePermanentStorage(const std::filesystem::path &userConfigPath);
+        void loadPermanentStorage(const std::filesystem::path& userConfigPath);
+        void savePermanentStorage(const std::filesystem::path& userConfigPath);
 
         // Called by engine.cpp every frame. For performance reasons it works in a separate
         // thread (in parallel with osg Cull). Can not use scene graph.
@@ -61,20 +61,20 @@ namespace MWLua
 
         MWBase::LuaManager::ActorControls* getActorControls(const MWWorld::Ptr&) const override;
 
-        void clear() override;  // should be called before loading game or starting a new game to reset internal state.
-        void setupPlayer(const MWWorld::Ptr& ptr) override;  // Should be called once after each "clear".
+        void clear() override; // should be called before loading game or starting a new game to reset internal state.
+        void setupPlayer(const MWWorld::Ptr& ptr) override; // Should be called once after each "clear".
 
         // Used only in Lua bindings
         void addCustomLocalScript(const MWWorld::Ptr&, int scriptId);
         void addUIMessage(std::string_view message) { mUIMessages.emplace_back(message); }
         void addInGameConsoleMessage(const std::string& msg, const Misc::Color& color)
         {
-            mInGameConsoleMessages.push_back({msg, color});
+            mInGameConsoleMessages.push_back({ msg, color });
         }
-        
-        // Some changes to the game world can not be done from the scripting thread (because it runs in parallel with OSG Cull),
-        // so we need to queue it and apply from the main thread. All such changes should be implemented as classes inherited
-        // from MWLua::Action.
+
+        // Some changes to the game world can not be done from the scripting thread (because it runs in parallel with
+        // OSG Cull), so we need to queue it and apply from the main thread. All such changes should be implemented as
+        // classes inherited from MWLua::Action.
         class Action
         {
         public:
@@ -105,12 +105,13 @@ namespace MWLua
         // Drops script cache and reloads all scripts. Calls `onSave` and `onLoad` for every script.
         void reloadAllScripts() override;
 
-        void handleConsoleCommand(const std::string& consoleMode, const std::string& command, const MWWorld::Ptr& selectedPtr) override;
+        void handleConsoleCommand(
+            const std::string& consoleMode, const std::string& command, const MWWorld::Ptr& selectedPtr) override;
 
         // Used to call Lua callbacks from C++
         void queueCallback(LuaUtil::Callback callback, sol::object arg)
         {
-            mQueuedCallbacks.push_back({std::move(callback), std::move(arg)});
+            mQueuedCallbacks.push_back({ std::move(callback), std::move(arg) });
         }
 
         // Wraps Lua callback into an std::function.
@@ -129,7 +130,7 @@ namespace MWLua
     private:
         void initConfiguration();
         LocalScripts* createLocalScripts(const MWWorld::Ptr& ptr,
-                                         std::optional<LuaUtil::ScriptIdsWithInitializationData> autoStartConf = std::nullopt);
+            std::optional<LuaUtil::ScriptIdsWithInitializationData> autoStartConf = std::nullopt);
 
         bool mInitialized = false;
         bool mGlobalScriptsStarted = false;
@@ -147,7 +148,7 @@ namespace MWLua
         sol::table mPostprocessingPackage;
         sol::table mDebugPackage;
 
-        GlobalScripts mGlobalScripts{&mLua};
+        GlobalScripts mGlobalScripts{ &mLua };
         std::set<LocalScripts*> mActiveLocalScripts;
         WorldView mWorldView;
 
@@ -188,10 +189,10 @@ namespace MWLua
         std::vector<std::string> mUIMessages;
         std::vector<std::pair<std::string, Misc::Color>> mInGameConsoleMessages;
 
-        LuaUtil::LuaStorage mGlobalStorage{mLua.sol()};
-        LuaUtil::LuaStorage mPlayerStorage{mLua.sol()};
+        LuaUtil::LuaStorage mGlobalStorage{ mLua.sol() };
+        LuaUtil::LuaStorage mPlayerStorage{ mLua.sol() };
     };
 
 }
 
-#endif  // MWLUA_LUAMANAGERIMP_H
+#endif // MWLUA_LUAMANAGERIMP_H
diff --git a/apps/openmw/mwlua/nearbybindings.cpp b/apps/openmw/mwlua/nearbybindings.cpp
index 6bba80fde2..df1fafc9d7 100644
--- a/apps/openmw/mwlua/nearbybindings.cpp
+++ b/apps/openmw/mwlua/nearbybindings.cpp
@@ -1,8 +1,8 @@
 #include "luabindings.hpp"
 
-#include <components/lua/luastate.hpp>
 #include <components/detournavigator/navigator.hpp>
 #include <components/detournavigator/navigatorutils.hpp>
+#include <components/lua/luastate.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -15,7 +15,9 @@
 namespace sol
 {
     template <>
-    struct is_automagical<MWPhysics::RayCastingResult> : std::false_type {};
+    struct is_automagical<MWPhysics::RayCastingResult> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
@@ -25,53 +27,54 @@ namespace MWLua
         sol::table api(context.mLua->sol(), sol::create);
         WorldView* worldView = context.mWorldView;
 
-        sol::usertype<MWPhysics::RayCastingResult> rayResult =
-            context.mLua->sol().new_usertype<MWPhysics::RayCastingResult>("RayCastingResult");
+        sol::usertype<MWPhysics::RayCastingResult> rayResult
+            = context.mLua->sol().new_usertype<MWPhysics::RayCastingResult>("RayCastingResult");
         rayResult["hit"] = sol::readonly_property([](const MWPhysics::RayCastingResult& r) { return r.mHit; });
-        rayResult["hitPos"] = sol::readonly_property([](const MWPhysics::RayCastingResult& r) -> sol::optional<osg::Vec3f>
-        {
-            if (r.mHit)
-                return r.mHitPos;
-            else
-                return sol::nullopt;
-        });
-        rayResult["hitNormal"] = sol::readonly_property([](const MWPhysics::RayCastingResult& r) -> sol::optional<osg::Vec3f>
-        {
-            if (r.mHit)
-                return r.mHitNormal;
-            else
-                return sol::nullopt;
-        });
-        rayResult["hitObject"] = sol::readonly_property([worldView](const MWPhysics::RayCastingResult& r) -> sol::optional<LObject>
-        {
-            if (r.mHitObject.isEmpty())
-                return sol::nullopt;
-            else
-                return LObject(getId(r.mHitObject), worldView->getObjectRegistry());
-        });
+        rayResult["hitPos"]
+            = sol::readonly_property([](const MWPhysics::RayCastingResult& r) -> sol::optional<osg::Vec3f> {
+                  if (r.mHit)
+                      return r.mHitPos;
+                  else
+                      return sol::nullopt;
+              });
+        rayResult["hitNormal"]
+            = sol::readonly_property([](const MWPhysics::RayCastingResult& r) -> sol::optional<osg::Vec3f> {
+                  if (r.mHit)
+                      return r.mHitNormal;
+                  else
+                      return sol::nullopt;
+              });
+        rayResult["hitObject"]
+            = sol::readonly_property([worldView](const MWPhysics::RayCastingResult& r) -> sol::optional<LObject> {
+                  if (r.mHitObject.isEmpty())
+                      return sol::nullopt;
+                  else
+                      return LObject(getId(r.mHitObject), worldView->getObjectRegistry());
+              });
 
-        api["COLLISION_TYPE"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, MWPhysics::CollisionType>({
-            {"World", MWPhysics::CollisionType_World},
-            {"Door", MWPhysics::CollisionType_Door},
-            {"Actor", MWPhysics::CollisionType_Actor},
-            {"HeightMap", MWPhysics::CollisionType_HeightMap},
-            {"Projectile", MWPhysics::CollisionType_Projectile},
-            {"Water", MWPhysics::CollisionType_Water},
-            {"Default", MWPhysics::CollisionType_Default},
-            {"AnyPhysical", MWPhysics::CollisionType_AnyPhysical},
-            {"Camera", MWPhysics::CollisionType_CameraOnly},
-            {"VisualOnly", MWPhysics::CollisionType_VisualOnly},
-        }));
+        api["COLLISION_TYPE"]
+            = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, MWPhysics::CollisionType>({
+                { "World", MWPhysics::CollisionType_World },
+                { "Door", MWPhysics::CollisionType_Door },
+                { "Actor", MWPhysics::CollisionType_Actor },
+                { "HeightMap", MWPhysics::CollisionType_HeightMap },
+                { "Projectile", MWPhysics::CollisionType_Projectile },
+                { "Water", MWPhysics::CollisionType_Water },
+                { "Default", MWPhysics::CollisionType_Default },
+                { "AnyPhysical", MWPhysics::CollisionType_AnyPhysical },
+                { "Camera", MWPhysics::CollisionType_CameraOnly },
+                { "VisualOnly", MWPhysics::CollisionType_VisualOnly },
+            }));
 
-        api["castRay"] = [](const osg::Vec3f& from, const osg::Vec3f& to, sol::optional<sol::table> options)
-        {
+        api["castRay"] = [](const osg::Vec3f& from, const osg::Vec3f& to, sol::optional<sol::table> options) {
             MWWorld::Ptr ignore;
             int collisionType = MWPhysics::CollisionType_Default;
             float radius = 0;
             if (options)
             {
                 sol::optional<LObject> ignoreObj = options->get<sol::optional<LObject>>("ignore");
-                if (ignoreObj) ignore = ignoreObj->ptr();
+                if (ignoreObj)
+                    ignore = ignoreObj->ptr();
                 collisionType = options->get<sol::optional<int>>("collisionType").value_or(collisionType);
                 radius = options->get<sol::optional<float>>("radius").value_or(0);
             }
@@ -80,13 +83,15 @@ namespace MWLua
                 return rayCasting->castRay(from, to, ignore, std::vector<MWWorld::Ptr>(), collisionType);
             else
             {
-                if (!ignore.isEmpty()) throw std::logic_error("Currently castRay doesn't support `ignore` when radius > 0");
+                if (!ignore.isEmpty())
+                    throw std::logic_error("Currently castRay doesn't support `ignore` when radius > 0");
                 return rayCasting->castSphere(from, to, radius, collisionType);
             }
         };
         // TODO: async raycasting
         /*api["asyncCastRay"] = [luaManager = context.mLuaManager](
-            const Callback& luaCallback, const osg::Vec3f& from, const osg::Vec3f& to, sol::optional<sol::table> options)
+            const Callback& luaCallback, const osg::Vec3f& from, const osg::Vec3f& to, sol::optional<sol::table>
+        options)
         {
             std::function<void(MWPhysics::RayCastingResult)> callback =
                 luaManager->wrapLuaCallback<MWPhysics::RayCastingResult>(luaCallback);
@@ -94,127 +99,123 @@ namespace MWLua
 
             // Handle options the same way as in `castRay`.
 
-            // NOTE: `callback` is not thread safe. If MWPhysics works in separate thread, it must put results to a queue
+            // NOTE: `callback` is not thread safe. If MWPhysics works in separate thread, it must put results to a
+        queue
             //       and use this callback from the main thread at the beginning of the next frame processing.
             rayCasting->asyncCastRay(callback, from, to, ignore, std::vector<MWWorld::Ptr>(), collisionType);
         };*/
-        api["castRenderingRay"] = [manager=context.mLuaManager](const osg::Vec3f& from, const osg::Vec3f& to)
-        {
+        api["castRenderingRay"] = [manager = context.mLuaManager](const osg::Vec3f& from, const osg::Vec3f& to) {
             if (!manager->isProcessingInputEvents())
             {
-                throw std::logic_error("castRenderingRay can be used only in player scripts during processing of input events; "
-                                       "use asyncCastRenderingRay instead.");
+                throw std::logic_error(
+                    "castRenderingRay can be used only in player scripts during processing of input events; "
+                    "use asyncCastRenderingRay instead.");
             }
             MWPhysics::RayCastingResult res;
             MWBase::Environment::get().getWorld()->castRenderingRay(res, from, to, false, false);
             return res;
         };
-        api["asyncCastRenderingRay"] =
-            [manager=context.mLuaManager](const LuaUtil::Callback& callback, const osg::Vec3f& from, const osg::Vec3f& to)
-        {
-            manager->addAction([manager, callback, from, to]
-            {
+        api["asyncCastRenderingRay"] = [manager = context.mLuaManager](const LuaUtil::Callback& callback,
+                                           const osg::Vec3f& from, const osg::Vec3f& to) {
+            manager->addAction([manager, callback, from, to] {
                 MWPhysics::RayCastingResult res;
                 MWBase::Environment::get().getWorld()->castRenderingRay(res, from, to, false, false);
                 manager->queueCallback(callback, sol::make_object(callback.mFunc.lua_state(), res));
             });
         };
 
-        api["activators"] = LObjectList{worldView->getActivatorsInScene()};
-        api["actors"] = LObjectList{worldView->getActorsInScene()};
-        api["containers"] = LObjectList{worldView->getContainersInScene()};
-        api["doors"] = LObjectList{worldView->getDoorsInScene()};
-        api["items"] = LObjectList{worldView->getItemsInScene()};
+        api["activators"] = LObjectList{ worldView->getActivatorsInScene() };
+        api["actors"] = LObjectList{ worldView->getActorsInScene() };
+        api["containers"] = LObjectList{ worldView->getContainersInScene() };
+        api["doors"] = LObjectList{ worldView->getDoorsInScene() };
+        api["items"] = LObjectList{ worldView->getItemsInScene() };
 
-        api["NAVIGATOR_FLAGS"] = LuaUtil::makeStrictReadOnly(
-            context.mLua->tableFromPairs<std::string_view, DetourNavigator::Flag>({
-                {"Walk", DetourNavigator::Flag_walk},
-                {"Swim", DetourNavigator::Flag_swim},
-                {"OpenDoor", DetourNavigator::Flag_openDoor},
-                {"UsePathgrid", DetourNavigator::Flag_usePathgrid},
+        api["NAVIGATOR_FLAGS"]
+            = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, DetourNavigator::Flag>({
+                { "Walk", DetourNavigator::Flag_walk },
+                { "Swim", DetourNavigator::Flag_swim },
+                { "OpenDoor", DetourNavigator::Flag_openDoor },
+                { "UsePathgrid", DetourNavigator::Flag_usePathgrid },
             }));
 
         api["COLLISION_SHAPE_TYPE"] = LuaUtil::makeStrictReadOnly(
             context.mLua->tableFromPairs<std::string_view, DetourNavigator::CollisionShapeType>({
-                {"Aabb", DetourNavigator::CollisionShapeType::Aabb},
-                {"RotatingBox", DetourNavigator::CollisionShapeType::RotatingBox},
-                {"Cylinder", DetourNavigator::CollisionShapeType::Cylinder},
+                { "Aabb", DetourNavigator::CollisionShapeType::Aabb },
+                { "RotatingBox", DetourNavigator::CollisionShapeType::RotatingBox },
+                { "Cylinder", DetourNavigator::CollisionShapeType::Cylinder },
             }));
 
-        api["FIND_PATH_STATUS"] = LuaUtil::makeStrictReadOnly(
-            context.mLua->tableFromPairs<std::string_view, DetourNavigator::Status>({
-                {"Success", DetourNavigator::Status::Success},
-                {"PartialPath", DetourNavigator::Status::PartialPath},
-                {"NavMeshNotFound", DetourNavigator::Status::NavMeshNotFound},
-                {"StartPolygonNotFound", DetourNavigator::Status::StartPolygonNotFound},
-                {"EndPolygonNotFound", DetourNavigator::Status::EndPolygonNotFound},
-                {"MoveAlongSurfaceFailed", DetourNavigator::Status::MoveAlongSurfaceFailed},
-                {"FindPathOverPolygonsFailed", DetourNavigator::Status::FindPathOverPolygonsFailed},
-                {"InitNavMeshQueryFailed", DetourNavigator::Status::InitNavMeshQueryFailed},
+        api["FIND_PATH_STATUS"]
+            = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, DetourNavigator::Status>({
+                { "Success", DetourNavigator::Status::Success },
+                { "PartialPath", DetourNavigator::Status::PartialPath },
+                { "NavMeshNotFound", DetourNavigator::Status::NavMeshNotFound },
+                { "StartPolygonNotFound", DetourNavigator::Status::StartPolygonNotFound },
+                { "EndPolygonNotFound", DetourNavigator::Status::EndPolygonNotFound },
+                { "MoveAlongSurfaceFailed", DetourNavigator::Status::MoveAlongSurfaceFailed },
+                { "FindPathOverPolygonsFailed", DetourNavigator::Status::FindPathOverPolygonsFailed },
+                { "InitNavMeshQueryFailed", DetourNavigator::Status::InitNavMeshQueryFailed },
             }));
 
-        static const DetourNavigator::AgentBounds defaultAgentBounds {
+        static const DetourNavigator::AgentBounds defaultAgentBounds{
             DetourNavigator::toCollisionShapeType(Settings::Manager::getInt("actor collision shape type", "Game")),
             Settings::Manager::getVector3("default actor pathfind half extents", "Game"),
         };
-        static const float defaultStepSize = 2 * std::max(defaultAgentBounds.mHalfExtents.x(), defaultAgentBounds.mHalfExtents.y());
+        static const float defaultStepSize
+            = 2 * std::max(defaultAgentBounds.mHalfExtents.x(), defaultAgentBounds.mHalfExtents.y());
         static constexpr DetourNavigator::Flags defaultIncludeFlags = DetourNavigator::Flag_walk
-                | DetourNavigator::Flag_swim
-                | DetourNavigator::Flag_openDoor
-                | DetourNavigator::Flag_usePathgrid;
+            | DetourNavigator::Flag_swim | DetourNavigator::Flag_openDoor | DetourNavigator::Flag_usePathgrid;
 
-        api["findPath"] = [] (const osg::Vec3f& source, const osg::Vec3f& destination,
-            const sol::optional<sol::table>& options)
-        {
-            DetourNavigator::AgentBounds agentBounds = defaultAgentBounds;
-            float stepSize = defaultStepSize;
-            DetourNavigator::Flags includeFlags = defaultIncludeFlags;
-            DetourNavigator::AreaCosts areaCosts {};
-            float destinationTolerance = 1;
+        api["findPath"]
+            = [](const osg::Vec3f& source, const osg::Vec3f& destination, const sol::optional<sol::table>& options) {
+                  DetourNavigator::AgentBounds agentBounds = defaultAgentBounds;
+                  float stepSize = defaultStepSize;
+                  DetourNavigator::Flags includeFlags = defaultIncludeFlags;
+                  DetourNavigator::AreaCosts areaCosts{};
+                  float destinationTolerance = 1;
 
-            if (options.has_value())
-            {
-                if (const auto& t = options->get<sol::optional<sol::table>>("agentBounds"))
-                {
-                    if (const auto& v = t->get<sol::optional<DetourNavigator::CollisionShapeType>>("shapeType"))
-                        agentBounds.mShapeType = *v;
-                    if (const auto& v = t->get<sol::optional<osg::Vec3f>>("halfExtents"))
-                    {
-                        agentBounds.mHalfExtents = *v;
-                        stepSize = 2 * std::max(v->x(), v->y());
-                    }
-                }
-                if (const auto& v = options->get<sol::optional<float>>("stepSize"))
-                    stepSize = *v;
-                if (const auto& v = options->get<sol::optional<DetourNavigator::Flags>>("includeFlags"))
-                    includeFlags = *v;
-                if (const auto& t = options->get<sol::optional<sol::table>>("areaCosts"))
-                {
-                    if (const auto& v = t->get<sol::optional<float>>("water"))
-                        areaCosts.mWater = *v;
-                    if (const auto& v = t->get<sol::optional<float>>("door"))
-                        areaCosts.mDoor = *v;
-                    if (const auto& v = t->get<sol::optional<float>>("pathgrid"))
-                        areaCosts.mPathgrid = *v;
-                    if (const auto& v = t->get<sol::optional<float>>("ground"))
-                        areaCosts.mGround = *v;
-                }
-                if (const auto& v = options->get<sol::optional<float>>("destinationTolerance"))
-                    destinationTolerance = *v;
-            }
+                  if (options.has_value())
+                  {
+                      if (const auto& t = options->get<sol::optional<sol::table>>("agentBounds"))
+                      {
+                          if (const auto& v = t->get<sol::optional<DetourNavigator::CollisionShapeType>>("shapeType"))
+                              agentBounds.mShapeType = *v;
+                          if (const auto& v = t->get<sol::optional<osg::Vec3f>>("halfExtents"))
+                          {
+                              agentBounds.mHalfExtents = *v;
+                              stepSize = 2 * std::max(v->x(), v->y());
+                          }
+                      }
+                      if (const auto& v = options->get<sol::optional<float>>("stepSize"))
+                          stepSize = *v;
+                      if (const auto& v = options->get<sol::optional<DetourNavigator::Flags>>("includeFlags"))
+                          includeFlags = *v;
+                      if (const auto& t = options->get<sol::optional<sol::table>>("areaCosts"))
+                      {
+                          if (const auto& v = t->get<sol::optional<float>>("water"))
+                              areaCosts.mWater = *v;
+                          if (const auto& v = t->get<sol::optional<float>>("door"))
+                              areaCosts.mDoor = *v;
+                          if (const auto& v = t->get<sol::optional<float>>("pathgrid"))
+                              areaCosts.mPathgrid = *v;
+                          if (const auto& v = t->get<sol::optional<float>>("ground"))
+                              areaCosts.mGround = *v;
+                      }
+                      if (const auto& v = options->get<sol::optional<float>>("destinationTolerance"))
+                          destinationTolerance = *v;
+                  }
 
-            std::vector<osg::Vec3f> result;
+                  std::vector<osg::Vec3f> result;
 
-            const DetourNavigator::Status status = DetourNavigator::findPath(
-                *MWBase::Environment::get().getWorld()->getNavigator(), agentBounds, stepSize, source,
-                destination, includeFlags, areaCosts, destinationTolerance, std::back_inserter(result));
+                  const DetourNavigator::Status status = DetourNavigator::findPath(
+                      *MWBase::Environment::get().getWorld()->getNavigator(), agentBounds, stepSize, source,
+                      destination, includeFlags, areaCosts, destinationTolerance, std::back_inserter(result));
 
-            return std::make_tuple(status, std::move(result));
-        };
+                  return std::make_tuple(status, std::move(result));
+              };
 
-        api["findRandomPointAroundCircle"] = [] (const osg::Vec3f& position, float maxRadius,
-            const sol::optional<sol::table>& options)
-        {
+        api["findRandomPointAroundCircle"] = [](const osg::Vec3f& position, float maxRadius,
+                                                 const sol::optional<sol::table>& options) {
             DetourNavigator::AgentBounds agentBounds = defaultAgentBounds;
             DetourNavigator::Flags includeFlags = defaultIncludeFlags;
 
@@ -231,37 +232,34 @@ namespace MWLua
                     includeFlags = *v;
             }
 
-            constexpr auto getRandom = []
-            {
-                return Misc::Rng::rollProbability(MWBase::Environment::get().getWorld()->getPrng());
-            };
+            constexpr auto getRandom
+                = [] { return Misc::Rng::rollProbability(MWBase::Environment::get().getWorld()->getPrng()); };
 
             return DetourNavigator::findRandomPointAroundCircle(*MWBase::Environment::get().getWorld()->getNavigator(),
                 agentBounds, position, maxRadius, includeFlags, getRandom);
         };
 
-        api["castNavigationRay"] = [] (const osg::Vec3f& from, const osg::Vec3f& to,
-            const sol::optional<sol::table>& options)
-        {
-            DetourNavigator::AgentBounds agentBounds = defaultAgentBounds;
-            DetourNavigator::Flags includeFlags = defaultIncludeFlags;
+        api["castNavigationRay"]
+            = [](const osg::Vec3f& from, const osg::Vec3f& to, const sol::optional<sol::table>& options) {
+                  DetourNavigator::AgentBounds agentBounds = defaultAgentBounds;
+                  DetourNavigator::Flags includeFlags = defaultIncludeFlags;
 
-            if (options.has_value())
-            {
-                if (const auto& t = options->get<sol::optional<sol::table>>("agentBounds"))
-                {
-                    if (const auto& v = t->get<sol::optional<DetourNavigator::CollisionShapeType>>("shapeType"))
-                        agentBounds.mShapeType = *v;
-                    if (const auto& v = t->get<sol::optional<osg::Vec3f>>("halfExtents"))
-                        agentBounds.mHalfExtents = *v;
-                }
-                if (const auto& v = options->get<sol::optional<DetourNavigator::Flags>>("includeFlags"))
-                    includeFlags = *v;
-            }
+                  if (options.has_value())
+                  {
+                      if (const auto& t = options->get<sol::optional<sol::table>>("agentBounds"))
+                      {
+                          if (const auto& v = t->get<sol::optional<DetourNavigator::CollisionShapeType>>("shapeType"))
+                              agentBounds.mShapeType = *v;
+                          if (const auto& v = t->get<sol::optional<osg::Vec3f>>("halfExtents"))
+                              agentBounds.mHalfExtents = *v;
+                      }
+                      if (const auto& v = options->get<sol::optional<DetourNavigator::Flags>>("includeFlags"))
+                          includeFlags = *v;
+                  }
 
-            return DetourNavigator::raycast(*MWBase::Environment::get().getWorld()->getNavigator(),
-                agentBounds, from, to, includeFlags);
-        };
+                  return DetourNavigator::raycast(
+                      *MWBase::Environment::get().getWorld()->getNavigator(), agentBounds, from, to, includeFlags);
+              };
 
         return LuaUtil::makeReadOnly(api);
     }
diff --git a/apps/openmw/mwlua/object.hpp b/apps/openmw/mwlua/object.hpp
index 4c4fbd7908..cf715256a7 100644
--- a/apps/openmw/mwlua/object.hpp
+++ b/apps/openmw/mwlua/object.hpp
@@ -1,8 +1,8 @@
 #ifndef MWLUA_OBJECT_H
 #define MWLUA_OBJECT_H
 
-#include <typeindex>
 #include <map>
+#include <typeindex>
 
 #include <sol/sol.hpp>
 
@@ -15,7 +15,10 @@ namespace MWLua
     // ObjectId is a unique identifier of a game object.
     // It can change only if the order of content files was change.
     using ObjectId = ESM::RefNum;
-    inline const ObjectId& getId(const MWWorld::Ptr& ptr) { return ptr.getCellRef().getRefNum(); }
+    inline const ObjectId& getId(const MWWorld::Ptr& ptr)
+    {
+        return ptr.getCellRef().getRefNum();
+    }
     std::string idToString(const ObjectId& id);
     std::string ptrToString(const MWWorld::Ptr& ptr);
     bool isMarker(const MWWorld::Ptr& ptr);
@@ -26,8 +29,8 @@ namespace MWLua
     public:
         ObjectRegistry() { mLastAssignedId.unset(); }
 
-        void update();  // Should be called every frame.
-        void clear();  // Should be called before starting or loading a new game.
+        void update(); // Should be called every frame.
+        void clear(); // Should be called before starting or loading a new game.
 
         ObjectId registerPtr(const MWWorld::Ptr& ptr);
         ObjectId deregisterPtr(const MWWorld::Ptr& ptr);
@@ -57,7 +60,11 @@ namespace MWLua
     class Object
     {
     public:
-        Object(ObjectId id, ObjectRegistry* reg) : mId(id), mObjectRegistry(reg) {}
+        Object(ObjectId id, ObjectRegistry* reg)
+            : mId(id)
+            , mObjectRegistry(reg)
+        {
+        }
         virtual ~Object() {}
         ObjectId id() const { return mId; }
 
@@ -69,8 +76,8 @@ namespace MWLua
         // Returns `true` if calling `ptr()` is safe.
         bool isValid() const;
 
-        virtual sol::object getObject(lua_State* lua, ObjectId id) const = 0;  // returns LObject or GOBject
-        virtual sol::object getCell(lua_State* lua, MWWorld::CellStore* store) const = 0;  // returns LCell or GCell
+        virtual sol::object getObject(lua_State* lua, ObjectId id) const = 0; // returns LObject or GOBject
+        virtual sol::object getCell(lua_State* lua, MWWorld::CellStore* store) const = 0; // returns LCell or GCell
 
     protected:
         virtual void updatePtr() const = 0;
@@ -91,8 +98,14 @@ namespace MWLua
     {
         using Object::Object;
         void updatePtr() const final { mPtr = mObjectRegistry->getPtr(mId, true); }
-        sol::object getObject(lua_State* lua, ObjectId id) const final { return sol::make_object<LObject>(lua, id, mObjectRegistry); }
-        sol::object getCell(lua_State* lua, MWWorld::CellStore* store) const final { return sol::make_object(lua, LCell{store}); }
+        sol::object getObject(lua_State* lua, ObjectId id) const final
+        {
+            return sol::make_object<LObject>(lua, id, mObjectRegistry);
+        }
+        sol::object getCell(lua_State* lua, MWWorld::CellStore* store) const final
+        {
+            return sol::make_object(lua, LCell{ store });
+        }
     };
 
     // Used only in global scripts
@@ -104,19 +117,31 @@ namespace MWLua
     {
         using Object::Object;
         void updatePtr() const final { mPtr = mObjectRegistry->getPtr(mId, false); }
-        sol::object getObject(lua_State* lua, ObjectId id) const final { return sol::make_object<GObject>(lua, id, mObjectRegistry); }
-        sol::object getCell(lua_State* lua, MWWorld::CellStore* store) const final { return sol::make_object(lua, GCell{store}); }
+        sol::object getObject(lua_State* lua, ObjectId id) const final
+        {
+            return sol::make_object<GObject>(lua, id, mObjectRegistry);
+        }
+        sol::object getCell(lua_State* lua, MWWorld::CellStore* store) const final
+        {
+            return sol::make_object(lua, GCell{ store });
+        }
     };
 
     using ObjectIdList = std::shared_ptr<std::vector<ObjectId>>;
     template <typename Obj>
-    struct ObjectList { ObjectIdList mIds; };
+    struct ObjectList
+    {
+        ObjectIdList mIds;
+    };
     using GObjectList = ObjectList<GObject>;
     using LObjectList = ObjectList<LObject>;
 
     template <typename Obj>
-    struct Inventory { Obj mObj; };
+    struct Inventory
+    {
+        Obj mObj;
+    };
 
 }
 
-#endif  // MWLUA_OBJECT_H
+#endif // MWLUA_OBJECT_H
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 85c2b01cd2..2b1d572575 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -17,29 +17,49 @@
 namespace sol
 {
     template <>
-    struct is_automagical<MWLua::LObject> : std::false_type {};
+    struct is_automagical<MWLua::LObject> : std::false_type
+    {
+    };
     template <>
-    struct is_automagical<MWLua::GObject> : std::false_type {};
+    struct is_automagical<MWLua::GObject> : std::false_type
+    {
+    };
     template <>
-    struct is_automagical<MWLua::LObjectList> : std::false_type {};
+    struct is_automagical<MWLua::LObjectList> : std::false_type
+    {
+    };
     template <>
-    struct is_automagical<MWLua::GObjectList> : std::false_type {};
+    struct is_automagical<MWLua::GObjectList> : std::false_type
+    {
+    };
     template <>
-    struct is_automagical<MWLua::Inventory<MWLua::LObject>> : std::false_type {};
+    struct is_automagical<MWLua::Inventory<MWLua::LObject>> : std::false_type
+    {
+    };
     template <>
-    struct is_automagical<MWLua::Inventory<MWLua::GObject>> : std::false_type {};
+    struct is_automagical<MWLua::Inventory<MWLua::GObject>> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
 {
 
-    namespace {
+    namespace
+    {
 
         class TeleportAction final : public LuaManager::Action
         {
         public:
-            TeleportAction(LuaUtil::LuaState* state, ObjectId object, std::string cell, const osg::Vec3f& pos, const osg::Vec3f& rot)
-                : Action(state), mObject(object), mCell(std::move(cell)), mPos(pos), mRot(rot) {}
+            TeleportAction(LuaUtil::LuaState* state, ObjectId object, std::string cell, const osg::Vec3f& pos,
+                const osg::Vec3f& rot)
+                : Action(state)
+                , mObject(object)
+                , mCell(std::move(cell))
+                , mPos(pos)
+                , mRot(rot)
+            {
+            }
 
             void apply(WorldView& worldView) const override
             {
@@ -85,7 +105,11 @@ namespace MWLua
         {
         public:
             ActivateAction(LuaUtil::LuaState* state, ObjectId object, ObjectId actor)
-                : Action(state), mObject(object), mActor(actor) {}
+                : Action(state)
+                , mObject(object)
+                , mActor(actor)
+            {
+            }
 
             void apply(WorldView& worldView) const override
             {
@@ -106,15 +130,15 @@ namespace MWLua
 
             std::string toString() const override
             {
-                return std::string("ActivateAction object=") + idToString(mObject) +
-                       std::string(" actor=") + idToString(mActor);
+                return std::string("ActivateAction object=") + idToString(mObject) + std::string(" actor=")
+                    + idToString(mActor);
             }
 
         private:
             ObjectId mObject;
             ObjectId mActor;
         };
-    
+
         template <typename ObjT>
         using Cell = std::conditional_t<std::is_same_v<ObjT, LObject>, LCell, GCell>;
 
@@ -125,11 +149,10 @@ namespace MWLua
             sol::state& lua = context.mLua->sol();
             ObjectRegistry* registry = context.mWorldView->getObjectRegistry();
             sol::usertype<ListT> listT = lua.new_usertype<ListT>(prefix + "ObjectList");
-            listT[sol::meta_function::to_string] =
-                [](const ListT& list) { return "{" + std::to_string(list.mIds->size()) + " objects}"; };
+            listT[sol::meta_function::to_string]
+                = [](const ListT& list) { return "{" + std::to_string(list.mIds->size()) + " objects}"; };
             listT[sol::meta_function::length] = [](const ListT& list) { return list.mIds->size(); };
-            listT[sol::meta_function::index] = [registry](const ListT& list, size_t index)
-            {
+            listT[sol::meta_function::index] = [registry](const ListT& list, size_t index) {
                 if (index > 0 && index <= list.mIds->size())
                     return ObjectT((*list.mIds)[index - 1], registry);
                 else
@@ -143,65 +166,57 @@ namespace MWLua
         void addBasicBindings(sol::usertype<ObjectT>& objectT, const Context& context)
         {
             objectT["isValid"] = [](const ObjectT& o) { return o.isValid(); };
-            objectT["recordId"] = sol::readonly_property([](const ObjectT& o) -> std::string
-            {
-                return o.ptr().getCellRef().getRefId();
-            });
-            objectT["cell"] = sol::readonly_property([](const ObjectT& o) -> sol::optional<Cell<ObjectT>>
-            {
+            objectT["recordId"] = sol::readonly_property(
+                [](const ObjectT& o) -> std::string { return o.ptr().getCellRef().getRefId(); });
+            objectT["cell"] = sol::readonly_property([](const ObjectT& o) -> sol::optional<Cell<ObjectT>> {
                 const MWWorld::Ptr& ptr = o.ptr();
                 if (ptr.isInCell())
-                    return Cell<ObjectT>{ptr.getCell()};
+                    return Cell<ObjectT>{ ptr.getCell() };
                 else
                     return sol::nullopt;
             });
-            objectT["position"] = sol::readonly_property([](const ObjectT& o) -> osg::Vec3f
-            {
-                return o.ptr().getRefData().getPosition().asVec3();
-            });
-            objectT["rotation"] = sol::readonly_property([](const ObjectT& o) -> osg::Vec3f
-            {
-                return o.ptr().getRefData().getPosition().asRotationVec3();
-            });
+            objectT["position"] = sol::readonly_property(
+                [](const ObjectT& o) -> osg::Vec3f { return o.ptr().getRefData().getPosition().asVec3(); });
+            objectT["rotation"] = sol::readonly_property(
+                [](const ObjectT& o) -> osg::Vec3f { return o.ptr().getRefData().getPosition().asRotationVec3(); });
 
-            objectT["type"] = sol::readonly_property([types=getTypeToPackageTable(context.mLua->sol())](const ObjectT& o) mutable
-            {
-                return types[getLiveCellRefType(o.ptr().mRef)];
-            });
+            objectT["type"] = sol::readonly_property(
+                [types = getTypeToPackageTable(context.mLua->sol())](
+                    const ObjectT& o) mutable { return types[getLiveCellRefType(o.ptr().mRef)]; });
 
             objectT["count"] = sol::readonly_property([](const ObjectT& o) { return o.ptr().getRefData().getCount(); });
             objectT[sol::meta_function::equal_to] = [](const ObjectT& a, const ObjectT& b) { return a.id() == b.id(); };
             objectT[sol::meta_function::to_string] = &ObjectT::toString;
-            objectT["sendEvent"] = [context](const ObjectT& dest, std::string eventName, const sol::object& eventData)
-            {
-                context.mLocalEventQueue->push_back({dest.id(), std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer)});
+            objectT["sendEvent"] = [context](const ObjectT& dest, std::string eventName, const sol::object& eventData) {
+                context.mLocalEventQueue->push_back(
+                    { dest.id(), std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer) });
             };
 
-            objectT["activateBy"] = [context](const ObjectT& o, const ObjectT& actor)
-            {
+            objectT["activateBy"] = [context](const ObjectT& o, const ObjectT& actor) {
                 uint32_t esmRecordType = actor.ptr().getType();
                 if (esmRecordType != ESM::REC_CREA && esmRecordType != ESM::REC_NPC_)
-                    throw std::runtime_error("The argument of `activateBy` must be an actor who activates the object. Got: " +
-                                             ptrToString(actor.ptr()));
+                    throw std::runtime_error(
+                        "The argument of `activateBy` must be an actor who activates the object. Got: "
+                        + ptrToString(actor.ptr()));
                 context.mLuaManager->addAction(std::make_unique<ActivateAction>(context.mLua, o.id(), actor.id()));
             };
 
             if constexpr (std::is_same_v<ObjectT, GObject>)
-            {  // Only for global scripts
-                objectT["addScript"] = [lua=context.mLua, luaManager=context.mLuaManager](const GObject& object, std::string_view path)
-                {
+            { // Only for global scripts
+                objectT["addScript"] = [lua = context.mLua, luaManager = context.mLuaManager](
+                                           const GObject& object, std::string_view path) {
                     const LuaUtil::ScriptsConfiguration& cfg = lua->getConfiguration();
                     std::optional<int> scriptId = cfg.findId(path);
                     if (!scriptId)
                         throw std::runtime_error("Unknown script: " + std::string(path));
                     if (!(cfg[*scriptId].mFlags & ESM::LuaScriptCfg::sCustom))
-                        throw std::runtime_error("Script without CUSTOM tag can not be added dynamically: " + std::string(path));
+                        throw std::runtime_error(
+                            "Script without CUSTOM tag can not be added dynamically: " + std::string(path));
                     if (object.ptr().getType() == ESM::REC_STAT)
                         throw std::runtime_error("Attaching scripts to Static is not allowed: " + std::string(path));
                     luaManager->addCustomLocalScript(object.ptr(), *scriptId);
                 };
-                objectT["hasScript"] = [lua=context.mLua](const GObject& object, std::string_view path)
-                {
+                objectT["hasScript"] = [lua = context.mLua](const GObject& object, std::string_view path) {
                     const LuaUtil::ScriptsConfiguration& cfg = lua->getConfiguration();
                     std::optional<int> scriptId = cfg.findId(path);
                     if (!scriptId)
@@ -213,8 +228,7 @@ namespace MWLua
                     else
                         return false;
                 };
-                objectT["removeScript"] = [lua=context.mLua](const GObject& object, std::string_view path)
-                {
+                objectT["removeScript"] = [lua = context.mLua](const GObject& object, std::string_view path) {
                     const LuaUtil::ScriptsConfiguration& cfg = lua->getConfiguration();
                     std::optional<int> scriptId = cfg.findId(path);
                     if (!scriptId)
@@ -228,12 +242,12 @@ namespace MWLua
                     localScripts->removeScript(*scriptId);
                 };
 
-                objectT["teleport"] = [context](const GObject& object, std::string_view cell,
-                                                const osg::Vec3f& pos, const sol::optional<osg::Vec3f>& optRot)
-                {
+                objectT["teleport"] = [context](const GObject& object, std::string_view cell, const osg::Vec3f& pos,
+                                          const sol::optional<osg::Vec3f>& optRot) {
                     MWWorld::Ptr ptr = object.ptr();
                     osg::Vec3f rot = optRot ? *optRot : ptr.getRefData().getPosition().asRotationVec3();
-                    auto action = std::make_unique<TeleportAction>(context.mLua, object.id(), std::string(cell), pos, rot);
+                    auto action
+                        = std::make_unique<TeleportAction>(context.mLua, object.id(), std::string(cell), pos, rot);
                     if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
                         context.mLuaManager->addTeleportPlayerAction(std::move(action));
                     else
@@ -248,12 +262,11 @@ namespace MWLua
             using InventoryT = Inventory<ObjectT>;
             sol::usertype<InventoryT> inventoryT = context.mLua->sol().new_usertype<InventoryT>(prefix + "Inventory");
 
-            inventoryT[sol::meta_function::to_string] =
-                [](const InventoryT& inv) { return "Inventory[" + inv.mObj.toString() + "]"; };
+            inventoryT[sol::meta_function::to_string]
+                = [](const InventoryT& inv) { return "Inventory[" + inv.mObj.toString() + "]"; };
 
-            inventoryT["getAll"] = [worldView=context.mWorldView, ids=getPackageToTypeTable(context.mLua->sol())](
-                const InventoryT& inventory, sol::optional<sol::table> type)
-            {
+            inventoryT["getAll"] = [worldView = context.mWorldView, ids = getPackageToTypeTable(context.mLua->sol())](
+                                       const InventoryT& inventory, sol::optional<sol::table> type) {
                 int mask = -1;
                 sol::optional<uint32_t> typeId = sol::nullopt;
                 if (type.has_value())
@@ -265,24 +278,49 @@ namespace MWLua
                 {
                     switch (*typeId)
                     {
-                        case ESM::REC_ALCH: mask = MWWorld::ContainerStore::Type_Potion; break;
-                        case ESM::REC_ARMO: mask = MWWorld::ContainerStore::Type_Armor; break;
-                        case ESM::REC_BOOK: mask = MWWorld::ContainerStore::Type_Book; break;
-                        case ESM::REC_CLOT: mask = MWWorld::ContainerStore::Type_Clothing; break;
-                        case ESM::REC_INGR: mask = MWWorld::ContainerStore::Type_Ingredient; break;
-                        case ESM::REC_LIGH: mask = MWWorld::ContainerStore::Type_Light; break;
-                        case ESM::REC_MISC: mask = MWWorld::ContainerStore::Type_Miscellaneous; break;
-                        case ESM::REC_WEAP: mask = MWWorld::ContainerStore::Type_Weapon; break;
-                        case ESM::REC_APPA: mask = MWWorld::ContainerStore::Type_Apparatus; break;
-                        case ESM::REC_LOCK: mask = MWWorld::ContainerStore::Type_Lockpick; break;
-                        case ESM::REC_PROB: mask = MWWorld::ContainerStore::Type_Probe; break;
-                        case ESM::REC_REPA: mask = MWWorld::ContainerStore::Type_Repair; break;
+                        case ESM::REC_ALCH:
+                            mask = MWWorld::ContainerStore::Type_Potion;
+                            break;
+                        case ESM::REC_ARMO:
+                            mask = MWWorld::ContainerStore::Type_Armor;
+                            break;
+                        case ESM::REC_BOOK:
+                            mask = MWWorld::ContainerStore::Type_Book;
+                            break;
+                        case ESM::REC_CLOT:
+                            mask = MWWorld::ContainerStore::Type_Clothing;
+                            break;
+                        case ESM::REC_INGR:
+                            mask = MWWorld::ContainerStore::Type_Ingredient;
+                            break;
+                        case ESM::REC_LIGH:
+                            mask = MWWorld::ContainerStore::Type_Light;
+                            break;
+                        case ESM::REC_MISC:
+                            mask = MWWorld::ContainerStore::Type_Miscellaneous;
+                            break;
+                        case ESM::REC_WEAP:
+                            mask = MWWorld::ContainerStore::Type_Weapon;
+                            break;
+                        case ESM::REC_APPA:
+                            mask = MWWorld::ContainerStore::Type_Apparatus;
+                            break;
+                        case ESM::REC_LOCK:
+                            mask = MWWorld::ContainerStore::Type_Lockpick;
+                            break;
+                        case ESM::REC_PROB:
+                            mask = MWWorld::ContainerStore::Type_Probe;
+                            break;
+                        case ESM::REC_REPA:
+                            mask = MWWorld::ContainerStore::Type_Repair;
+                            break;
                         default:;
                     }
                 }
 
                 if (mask == -1)
-                    throw std::runtime_error(std::string("Incorrect type argument in inventory:getAll: " + LuaUtil::toString(*type)));
+                    throw std::runtime_error(
+                        std::string("Incorrect type argument in inventory:getAll: " + LuaUtil::toString(*type)));
 
                 const MWWorld::Ptr& ptr = inventory.mObj.ptr();
                 MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
@@ -294,23 +332,22 @@ namespace MWLua
                     worldView->getObjectRegistry()->registerPtr(item);
                     list->push_back(getId(item));
                 }
-                return ObjectList<ObjectT>{list};
+                return ObjectList<ObjectT>{ list };
             };
 
-            inventoryT["countOf"] = [](const InventoryT& inventory, const std::string& recordId)
-            {
+            inventoryT["countOf"] = [](const InventoryT& inventory, const std::string& recordId) {
                 const MWWorld::Ptr& ptr = inventory.mObj.ptr();
                 MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
                 return store.count(recordId);
             };
 
             if constexpr (std::is_same_v<ObjectT, GObject>)
-            {  // Only for global scripts
-                // TODO
-                // obj.inventory:drop(obj2, [count])
-                // obj.inventory:drop(recordId, [count])
-                // obj.inventory:addNew(recordId, [count])
-                // obj.inventory:remove(obj/recordId, [count])
+            { // Only for global scripts
+              // TODO
+              // obj.inventory:drop(obj2, [count])
+              // obj.inventory:drop(recordId, [count])
+              // obj.inventory:addNew(recordId, [count])
+              // obj.inventory:remove(obj/recordId, [count])
                 /*objectT["moveInto"] = [](const GObject& obj, const InventoryT& inventory) {};
                 inventoryT["drop"] = [](const InventoryT& inventory) {};
                 inventoryT["addNew"] = [](const InventoryT& inventory) {};
@@ -321,14 +358,14 @@ namespace MWLua
         template <class ObjectT>
         void initObjectBindings(const std::string& prefix, const Context& context)
         {
-            sol::usertype<ObjectT> objectT = context.mLua->sol().new_usertype<ObjectT>(
-                prefix + "Object", sol::base_classes, sol::bases<Object>());
+            sol::usertype<ObjectT> objectT
+                = context.mLua->sol().new_usertype<ObjectT>(prefix + "Object", sol::base_classes, sol::bases<Object>());
             addBasicBindings<ObjectT>(objectT, context);
             addInventoryBindings<ObjectT>(objectT, prefix, context);
 
             registerObjectList<ObjectT>(prefix, context);
         }
-    }  // namespace
+    } // namespace
 
     void initObjectBindingsForLocalScripts(const Context& context)
     {
diff --git a/apps/openmw/mwlua/playerscripts.hpp b/apps/openmw/mwlua/playerscripts.hpp
index b8173f6b7b..577e93a553 100644
--- a/apps/openmw/mwlua/playerscripts.hpp
+++ b/apps/openmw/mwlua/playerscripts.hpp
@@ -15,14 +15,12 @@ namespace MWLua
     class PlayerScripts : public LocalScripts
     {
     public:
-        PlayerScripts(LuaUtil::LuaState* lua, const LObject& obj) : LocalScripts(lua, obj)
+        PlayerScripts(LuaUtil::LuaState* lua, const LObject& obj)
+            : LocalScripts(lua, obj)
         {
-            registerEngineHandlers({
-                &mConsoleCommandHandlers, &mKeyPressHandlers, &mKeyReleaseHandlers,
-                &mControllerButtonPressHandlers, &mControllerButtonReleaseHandlers,
-                &mActionHandlers, &mOnFrameHandlers,
-                &mTouchpadPressed, &mTouchpadReleased, &mTouchpadMoved
-            });
+            registerEngineHandlers({ &mConsoleCommandHandlers, &mKeyPressHandlers, &mKeyReleaseHandlers,
+                &mControllerButtonPressHandlers, &mControllerButtonReleaseHandlers, &mActionHandlers, &mOnFrameHandlers,
+                &mTouchpadPressed, &mTouchpadReleased, &mTouchpadMoved });
         }
 
         void processInputEvent(const MWBase::LuaManager::InputEvent& event)
@@ -30,49 +28,50 @@ namespace MWLua
             using InputEvent = MWBase::LuaManager::InputEvent;
             switch (event.mType)
             {
-            case InputEvent::KeyPressed:
-                callEngineHandlers(mKeyPressHandlers, std::get<SDL_Keysym>(event.mValue));
-                break;
-            case InputEvent::KeyReleased:
-                callEngineHandlers(mKeyReleaseHandlers, std::get<SDL_Keysym>(event.mValue));
-                break;
-            case InputEvent::ControllerPressed:
-                callEngineHandlers(mControllerButtonPressHandlers, std::get<int>(event.mValue));
-                break;
-            case InputEvent::ControllerReleased:
-                callEngineHandlers(mControllerButtonReleaseHandlers, std::get<int>(event.mValue));
-                break;
-            case InputEvent::Action:
-                callEngineHandlers(mActionHandlers, std::get<int>(event.mValue));
-                break;
-            case InputEvent::TouchPressed:
-                callEngineHandlers(mTouchpadPressed, std::get<SDLUtil::TouchEvent>(event.mValue));
-                break;
-            case InputEvent::TouchReleased:
-                callEngineHandlers(mTouchpadReleased, std::get<SDLUtil::TouchEvent>(event.mValue));
-                break;
-            case InputEvent::TouchMoved:
-                callEngineHandlers(mTouchpadMoved, std::get<SDLUtil::TouchEvent>(event.mValue));
-                break;
+                case InputEvent::KeyPressed:
+                    callEngineHandlers(mKeyPressHandlers, std::get<SDL_Keysym>(event.mValue));
+                    break;
+                case InputEvent::KeyReleased:
+                    callEngineHandlers(mKeyReleaseHandlers, std::get<SDL_Keysym>(event.mValue));
+                    break;
+                case InputEvent::ControllerPressed:
+                    callEngineHandlers(mControllerButtonPressHandlers, std::get<int>(event.mValue));
+                    break;
+                case InputEvent::ControllerReleased:
+                    callEngineHandlers(mControllerButtonReleaseHandlers, std::get<int>(event.mValue));
+                    break;
+                case InputEvent::Action:
+                    callEngineHandlers(mActionHandlers, std::get<int>(event.mValue));
+                    break;
+                case InputEvent::TouchPressed:
+                    callEngineHandlers(mTouchpadPressed, std::get<SDLUtil::TouchEvent>(event.mValue));
+                    break;
+                case InputEvent::TouchReleased:
+                    callEngineHandlers(mTouchpadReleased, std::get<SDLUtil::TouchEvent>(event.mValue));
+                    break;
+                case InputEvent::TouchMoved:
+                    callEngineHandlers(mTouchpadMoved, std::get<SDLUtil::TouchEvent>(event.mValue));
+                    break;
             }
         }
 
         void onFrame(float dt) { callEngineHandlers(mOnFrameHandlers, dt); }
 
-        bool consoleCommand(const std::string& consoleMode, const std::string& command, const sol::object& selectedObject)
+        bool consoleCommand(
+            const std::string& consoleMode, const std::string& command, const sol::object& selectedObject)
         {
             callEngineHandlers(mConsoleCommandHandlers, consoleMode, command, selectedObject);
             return !mConsoleCommandHandlers.mList.empty();
         }
 
     private:
-        EngineHandlerList mConsoleCommandHandlers{"onConsoleCommand"};
-        EngineHandlerList mKeyPressHandlers{"onKeyPress"};
-        EngineHandlerList mKeyReleaseHandlers{"onKeyRelease"};
-        EngineHandlerList mControllerButtonPressHandlers{"onControllerButtonPress"};
-        EngineHandlerList mControllerButtonReleaseHandlers{"onControllerButtonRelease"};
-        EngineHandlerList mActionHandlers{"onInputAction"};
-        EngineHandlerList mOnFrameHandlers{"onFrame"};
+        EngineHandlerList mConsoleCommandHandlers{ "onConsoleCommand" };
+        EngineHandlerList mKeyPressHandlers{ "onKeyPress" };
+        EngineHandlerList mKeyReleaseHandlers{ "onKeyRelease" };
+        EngineHandlerList mControllerButtonPressHandlers{ "onControllerButtonPress" };
+        EngineHandlerList mControllerButtonReleaseHandlers{ "onControllerButtonRelease" };
+        EngineHandlerList mActionHandlers{ "onInputAction" };
+        EngineHandlerList mOnFrameHandlers{ "onFrame" };
         EngineHandlerList mTouchpadPressed{ "onTouchPress" };
         EngineHandlerList mTouchpadReleased{ "onTouchRelease" };
         EngineHandlerList mTouchpadMoved{ "onTouchMove" };
diff --git a/apps/openmw/mwlua/postprocessingbindings.cpp b/apps/openmw/mwlua/postprocessingbindings.cpp
index 8ae9cd10a8..96e4ac27d3 100644
--- a/apps/openmw/mwlua/postprocessingbindings.cpp
+++ b/apps/openmw/mwlua/postprocessingbindings.cpp
@@ -11,8 +11,14 @@ namespace
     class SetUniformShaderAction final : public MWLua::LuaManager::Action
     {
     public:
-        SetUniformShaderAction(LuaUtil::LuaState* state, std::shared_ptr<fx::Technique> shader, const std::string& name, const T& value)
-            : MWLua::LuaManager::Action(state), mShader(std::move(shader)), mName(name), mValue(value) {}
+        SetUniformShaderAction(
+            LuaUtil::LuaState* state, std::shared_ptr<fx::Technique> shader, const std::string& name, const T& value)
+            : MWLua::LuaManager::Action(state)
+            , mShader(std::move(shader))
+            , mName(name)
+            , mValue(value)
+        {
+        }
 
         void apply(MWLua::WorldView&) const override
         {
@@ -21,8 +27,8 @@ namespace
 
         std::string toString() const override
         {
-            return  std::string("SetUniformShaderAction shader=") + (mShader ? mShader->getName() : "nil") +
-                    std::string("uniform=") + (mShader ? mName : "nil");
+            return std::string("SetUniformShaderAction shader=") + (mShader ? mShader->getName() : "nil")
+                + std::string("uniform=") + (mShader ? mName : "nil");
         }
 
     private:
@@ -40,7 +46,9 @@ namespace MWLua
 namespace sol
 {
     template <>
-    struct is_automagical<MWLua::Shader> : std::false_type {};
+    struct is_automagical<MWLua::Shader> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
@@ -49,7 +57,10 @@ namespace MWLua
     {
         std::shared_ptr<fx::Technique> mShader;
 
-        Shader(std::shared_ptr<fx::Technique> shader) : mShader(std::move(shader)) {}
+        Shader(std::shared_ptr<fx::Technique> shader)
+            : mShader(std::move(shader))
+        {
+        }
 
         std::string toString() const
         {
@@ -59,14 +70,21 @@ namespace MWLua
             return Misc::StringUtils::format("Shader(%s, %s)", mShader->getName(), mShader->getFileName());
         }
 
-        enum { Action_None, Action_Enable, Action_Disable } mQueuedAction = Action_None;
+        enum
+        {
+            Action_None,
+            Action_Enable,
+            Action_Disable
+        } mQueuedAction
+            = Action_None;
     };
 
     template <class T>
     auto getSetter(const Context& context)
     {
         return [context](const Shader& shader, const std::string& name, const T& value) {
-            context.mLuaManager->addAction(std::make_unique<SetUniformShaderAction<T>>(context.mLua, shader.mShader, name, value));
+            context.mLuaManager->addAction(
+                std::make_unique<SetUniformShaderAction<T>>(context.mLua, shader.mShader, name, value));
         };
     }
 
@@ -74,26 +92,29 @@ namespace MWLua
     auto getArraySetter(const Context& context)
     {
         return [context](const Shader& shader, const std::string& name, const sol::table& table) {
-            auto targetSize = MWBase::Environment::get().getWorld()->getPostProcessor()->getUniformSize(shader.mShader, name);
+            auto targetSize
+                = MWBase::Environment::get().getWorld()->getPostProcessor()->getUniformSize(shader.mShader, name);
 
             if (!targetSize.has_value())
                 throw std::runtime_error(Misc::StringUtils::format("Failed setting uniform array '%s'", name));
 
             if (*targetSize != table.size())
-                throw std::runtime_error(Misc::StringUtils::format("Mismatching uniform array size, got %zu expected %zu", table.size(), *targetSize));
+                throw std::runtime_error(Misc::StringUtils::format(
+                    "Mismatching uniform array size, got %zu expected %zu", table.size(), *targetSize));
 
             std::vector<T> values;
             values.reserve(*targetSize);
 
             for (size_t i = 0; i < *targetSize; ++i)
             {
-                sol::object obj = table[i+1];
+                sol::object obj = table[i + 1];
                 if (!obj.is<T>())
                     throw std::runtime_error("Invalid type for uniform array");
                 values.push_back(obj.as<T>());
             }
 
-            context.mLuaManager->addAction(std::make_unique<SetUniformShaderAction<std::vector<T>>>(context.mLua, shader.mShader, name, values));
+            context.mLuaManager->addAction(
+                std::make_unique<SetUniformShaderAction<std::vector<T>>>(context.mLua, shader.mShader, name, values));
         };
     }
 
@@ -104,8 +125,7 @@ namespace MWLua
         sol::usertype<Shader> shader = context.mLua->sol().new_usertype<Shader>("Shader");
         shader[sol::meta_function::to_string] = [](const Shader& shader) { return shader.toString(); };
 
-        shader["enable"] = [context](Shader& shader, sol::optional<int> optPos)
-        {
+        shader["enable"] = [context](Shader& shader, sol::optional<int> optPos) {
             std::optional<int> pos = std::nullopt;
             if (optPos)
                 pos = optPos.value();
@@ -113,32 +133,28 @@ namespace MWLua
             if (shader.mShader && shader.mShader->isValid())
                 shader.mQueuedAction = Shader::Action_Enable;
 
-            context.mLuaManager->addAction(
-                [=, &shader] {
-                    shader.mQueuedAction = Shader::Action_None;
+            context.mLuaManager->addAction([=, &shader] {
+                shader.mQueuedAction = Shader::Action_None;
 
-                    if (MWBase::Environment::get().getWorld()->getPostProcessor()->enableTechnique(shader.mShader, pos) == MWRender::PostProcessor::Status_Error)
-                        throw std::runtime_error("Failed enabling shader '" + shader.mShader->getName() + "'");
-                }
-            );
+                if (MWBase::Environment::get().getWorld()->getPostProcessor()->enableTechnique(shader.mShader, pos)
+                    == MWRender::PostProcessor::Status_Error)
+                    throw std::runtime_error("Failed enabling shader '" + shader.mShader->getName() + "'");
+            });
         };
 
-        shader["disable"] = [context](Shader& shader)
-        {
+        shader["disable"] = [context](Shader& shader) {
             shader.mQueuedAction = Shader::Action_Disable;
 
-            context.mLuaManager->addAction(
-                [&] {
-                    shader.mQueuedAction = Shader::Action_None;
+            context.mLuaManager->addAction([&] {
+                shader.mQueuedAction = Shader::Action_None;
 
-                    if (MWBase::Environment::get().getWorld()->getPostProcessor()->disableTechnique(shader.mShader) == MWRender::PostProcessor::Status_Error)
-                        throw std::runtime_error("Failed disabling shader '" + shader.mShader->getName() + "'");
-                }
-            );
+                if (MWBase::Environment::get().getWorld()->getPostProcessor()->disableTechnique(shader.mShader)
+                    == MWRender::PostProcessor::Status_Error)
+                    throw std::runtime_error("Failed disabling shader '" + shader.mShader->getName() + "'");
+            });
         };
 
-        shader["isEnabled"] = [](const Shader& shader)
-        {
+        shader["isEnabled"] = [](const Shader& shader) {
             if (shader.mQueuedAction == Shader::Action_Enable)
                 return true;
             else if (shader.mQueuedAction == Shader::Action_Disable)
@@ -159,9 +175,8 @@ namespace MWLua
         shader["setVector3Array"] = getArraySetter<osg::Vec3f>(context);
         shader["setVector4Array"] = getArraySetter<osg::Vec4f>(context);
 
-        api["load"] = [](const std::string& name)
-        {
-            Shader shader{MWBase::Environment::get().getWorld()->getPostProcessor()->loadTechnique(name, false)};
+        api["load"] = [](const std::string& name) {
+            Shader shader{ MWBase::Environment::get().getWorld()->getPostProcessor()->loadTechnique(name, false) };
 
             if (!shader.mShader || !shader.mShader->isValid())
                 throw std::runtime_error(Misc::StringUtils::format("Failed loading shader '%s'", name));
diff --git a/apps/openmw/mwlua/stats.cpp b/apps/openmw/mwlua/stats.cpp
index 83bce35cca..977d3b3eec 100644
--- a/apps/openmw/mwlua/stats.cpp
+++ b/apps/openmw/mwlua/stats.cpp
@@ -6,12 +6,12 @@
 #include <string_view>
 #include <variant>
 
-#include <components/lua/luastate.hpp>
 #include <components/esm3/loadclas.hpp>
+#include <components/lua/luastate.hpp>
 
+#include "context.hpp"
 #include "localscripts.hpp"
 #include "luamanagerimp.hpp"
-#include "context.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
@@ -20,21 +20,18 @@
 
 namespace
 {
-    template<class T>
+    template <class T>
     auto addIndexedAccessor(int index)
     {
-        return sol::overload(
-            [index](MWLua::LocalScripts::SelfObject& o) { return T::create(&o, index); },
+        return sol::overload([index](MWLua::LocalScripts::SelfObject& o) { return T::create(&o, index); },
             [index](const MWLua::LObject& o) { return T::create(o, index); },
-            [index](const MWLua::GObject& o) { return T::create(o, index); }
-        );
+            [index](const MWLua::GObject& o) { return T::create(o, index); });
     }
 
-    template<class T, class G>
+    template <class T, class G>
     void addProp(const MWLua::Context& context, sol::usertype<T>& type, std::string_view prop, G getter)
     {
-        type[prop] = sol::property(
-            [=](const T& stat) { return stat.get(context, prop, getter); },
+        type[prop] = sol::property([=](const T& stat) { return stat.get(context, prop, getter); },
             [=](const T& stat, const sol::object& value) { stat.cache(context, prop, value); });
     }
 
@@ -43,36 +40,39 @@ namespace
 
     const MWLua::Object* getObject(const StatObject& obj)
     {
-        return std::visit([] (auto&& variant) -> const MWLua::Object*
-        {
-            using T = std::decay_t<decltype(variant)>;
-            if constexpr(std::is_same_v<T, SelfObject*>)
-                return variant;
-            else if constexpr(std::is_same_v<T, MWLua::LObject>)
-                return &variant;
-            else if constexpr(std::is_same_v<T, MWLua::GObject>)
-                return &variant;
-        }, obj);
+        return std::visit(
+            [](auto&& variant) -> const MWLua::Object* {
+                using T = std::decay_t<decltype(variant)>;
+                if constexpr (std::is_same_v<T, SelfObject*>)
+                    return variant;
+                else if constexpr (std::is_same_v<T, MWLua::LObject>)
+                    return &variant;
+                else if constexpr (std::is_same_v<T, MWLua::GObject>)
+                    return &variant;
+            },
+            obj);
     }
 
-    template<class G>
-    sol::object getValue(const MWLua::Context& context, const StatObject& obj, SelfObject::CachedStat::Setter setter, int index, std::string_view prop, G getter)
+    template <class G>
+    sol::object getValue(const MWLua::Context& context, const StatObject& obj, SelfObject::CachedStat::Setter setter,
+        int index, std::string_view prop, G getter)
     {
-        return std::visit([&] (auto&& variant)
-        {
-            using T = std::decay_t<decltype(variant)>;
-            if constexpr(std::is_same_v<T, SelfObject*>)
-            {
-                auto it = variant->mStatsCache.find({ setter, index, prop });
-                if(it != variant->mStatsCache.end())
-                    return it->second;
-                return sol::make_object(context.mLua->sol(), getter(variant));
-            }
-            else if constexpr(std::is_same_v<T, MWLua::LObject>)
-                return sol::make_object(context.mLua->sol(), getter(&variant));
-            else if constexpr(std::is_same_v<T, MWLua::GObject>)
-                return sol::make_object(context.mLua->sol(), getter(&variant));
-        }, obj);
+        return std::visit(
+            [&](auto&& variant) {
+                using T = std::decay_t<decltype(variant)>;
+                if constexpr (std::is_same_v<T, SelfObject*>)
+                {
+                    auto it = variant->mStatsCache.find({ setter, index, prop });
+                    if (it != variant->mStatsCache.end())
+                        return it->second;
+                    return sol::make_object(context.mLua->sol(), getter(variant));
+                }
+                else if constexpr (std::is_same_v<T, MWLua::LObject>)
+                    return sol::make_object(context.mLua->sol(), getter(&variant));
+                else if constexpr (std::is_same_v<T, MWLua::GObject>)
+                    return sol::make_object(context.mLua->sol(), getter(&variant));
+            },
+            obj);
     }
 }
 
@@ -83,8 +83,13 @@ namespace MWLua
         class StatUpdateAction final : public LuaManager::Action
         {
             ObjectId mId;
+
         public:
-            StatUpdateAction(LuaUtil::LuaState* state, ObjectId id) : Action(state), mId(id) {}
+            StatUpdateAction(LuaUtil::LuaState* state, ObjectId id)
+                : Action(state)
+                , mId(id)
+            {
+            }
 
             void apply(WorldView& worldView) const override
             {
@@ -102,12 +107,15 @@ namespace MWLua
     {
         StatObject mObject;
 
-        LevelStat(StatObject object) : mObject(std::move(object)) {}
+        LevelStat(StatObject object)
+            : mObject(std::move(object))
+        {
+        }
+
     public:
         sol::object getCurrent(const Context& context) const
         {
-            return getValue(context, mObject, &LevelStat::setValue, 0, "current", [](const MWLua::Object* obj)
-            {
+            return getValue(context, mObject, &LevelStat::setValue, 0, "current", [](const MWLua::Object* obj) {
                 const auto& ptr = obj->ptr();
                 return ptr.getClass().getCreatureStats(ptr).getLevel();
             });
@@ -116,30 +124,30 @@ namespace MWLua
         void setCurrent(const Context& context, const sol::object& value) const
         {
             SelfObject* obj = std::get<SelfObject*>(mObject);
-            if(obj->mStatsCache.empty())
+            if (obj->mStatsCache.empty())
                 context.mLuaManager->addAction(std::make_unique<StatUpdateAction>(context.mLua, obj->id()));
-            obj->mStatsCache[SelfObject::CachedStat{&LevelStat::setValue, 0, "current"}] = value;
+            obj->mStatsCache[SelfObject::CachedStat{ &LevelStat::setValue, 0, "current" }] = value;
         }
 
         sol::object getProgress(const Context& context) const
         {
             const auto& ptr = getObject(mObject)->ptr();
-            if(!ptr.getClass().isNpc())
+            if (!ptr.getClass().isNpc())
                 return sol::nil;
             return sol::make_object(context.mLua->sol(), ptr.getClass().getNpcStats(ptr).getLevelProgress());
         }
 
         static std::optional<LevelStat> create(StatObject object, int index)
         {
-            if(!getObject(object)->ptr().getClass().isActor())
+            if (!getObject(object)->ptr().getClass().isActor())
                 return {};
-            return LevelStat{std::move(object)};
+            return LevelStat{ std::move(object) };
         }
 
         static void setValue(int, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)
         {
             auto& stats = ptr.getClass().getCreatureStats(ptr);
-            if(prop == "current")
+            if (prop == "current")
                 stats.setLevel(value.as<int>());
         }
     };
@@ -149,31 +157,36 @@ namespace MWLua
         StatObject mObject;
         int mIndex;
 
-        DynamicStat(StatObject object, int index) : mObject(std::move(object)), mIndex(index) {}
+        DynamicStat(StatObject object, int index)
+            : mObject(std::move(object))
+            , mIndex(index)
+        {
+        }
+
     public:
-        template<class G>
+        template <class G>
         sol::object get(const Context& context, std::string_view prop, G getter) const
         {
-            return getValue(context, mObject, &DynamicStat::setValue, mIndex, prop, [this, getter](const MWLua::Object* obj)
-            {
-                const auto& ptr = obj->ptr();
-                return (ptr.getClass().getCreatureStats(ptr).getDynamic(mIndex).*getter)();
-            });
+            return getValue(
+                context, mObject, &DynamicStat::setValue, mIndex, prop, [this, getter](const MWLua::Object* obj) {
+                    const auto& ptr = obj->ptr();
+                    return (ptr.getClass().getCreatureStats(ptr).getDynamic(mIndex).*getter)();
+                });
         }
 
         static std::optional<DynamicStat> create(StatObject object, int index)
         {
-            if(!getObject(object)->ptr().getClass().isActor())
+            if (!getObject(object)->ptr().getClass().isActor())
                 return {};
-            return DynamicStat{std::move(object), index};
+            return DynamicStat{ std::move(object), index };
         }
 
         void cache(const Context& context, std::string_view prop, const sol::object& value) const
         {
             SelfObject* obj = std::get<SelfObject*>(mObject);
-            if(obj->mStatsCache.empty())
+            if (obj->mStatsCache.empty())
                 context.mLuaManager->addAction(std::make_unique<StatUpdateAction>(context.mLua, obj->id()));
-            obj->mStatsCache[SelfObject::CachedStat{&DynamicStat::setValue, mIndex, prop}] = value;
+            obj->mStatsCache[SelfObject::CachedStat{ &DynamicStat::setValue, mIndex, prop }] = value;
         }
 
         static void setValue(int index, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)
@@ -181,11 +194,11 @@ namespace MWLua
             auto& stats = ptr.getClass().getCreatureStats(ptr);
             auto stat = stats.getDynamic(index);
             float floatValue = value.as<float>();
-            if(prop == "base")
+            if (prop == "base")
                 stat.setBase(floatValue);
-            else if(prop == "current")
+            else if (prop == "current")
                 stat.setCurrent(floatValue, true, true);
-            else if(prop == "modifier")
+            else if (prop == "modifier")
                 stat.setModifier(floatValue);
             stats.setDynamic(index, stat);
         }
@@ -196,16 +209,21 @@ namespace MWLua
         StatObject mObject;
         int mIndex;
 
-        AttributeStat(StatObject object, int index) : mObject(std::move(object)), mIndex(index) {}
+        AttributeStat(StatObject object, int index)
+            : mObject(std::move(object))
+            , mIndex(index)
+        {
+        }
+
     public:
-        template<class G>
+        template <class G>
         sol::object get(const Context& context, std::string_view prop, G getter) const
         {
-            return getValue(context, mObject, &AttributeStat::setValue, mIndex, prop, [this, getter](const MWLua::Object* obj)
-            {
-                const auto& ptr = obj->ptr();
-                return (ptr.getClass().getCreatureStats(ptr).getAttribute(mIndex).*getter)();
-            });
+            return getValue(
+                context, mObject, &AttributeStat::setValue, mIndex, prop, [this, getter](const MWLua::Object* obj) {
+                    const auto& ptr = obj->ptr();
+                    return (ptr.getClass().getCreatureStats(ptr).getAttribute(mIndex).*getter)();
+                });
         }
 
         float getModified(const Context& context) const
@@ -218,17 +236,17 @@ namespace MWLua
 
         static std::optional<AttributeStat> create(StatObject object, int index)
         {
-            if(!getObject(object)->ptr().getClass().isActor())
+            if (!getObject(object)->ptr().getClass().isActor())
                 return {};
-            return AttributeStat{std::move(object), index};
+            return AttributeStat{ std::move(object), index };
         }
 
         void cache(const Context& context, std::string_view prop, const sol::object& value) const
         {
             SelfObject* obj = std::get<SelfObject*>(mObject);
-            if(obj->mStatsCache.empty())
+            if (obj->mStatsCache.empty())
                 context.mLuaManager->addAction(std::make_unique<StatUpdateAction>(context.mLua, obj->id()));
-            obj->mStatsCache[SelfObject::CachedStat{&AttributeStat::setValue, mIndex, prop}] = value;
+            obj->mStatsCache[SelfObject::CachedStat{ &AttributeStat::setValue, mIndex, prop }] = value;
         }
 
         static void setValue(int index, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)
@@ -236,14 +254,14 @@ namespace MWLua
             auto& stats = ptr.getClass().getCreatureStats(ptr);
             auto stat = stats.getAttribute(index);
             float floatValue = value.as<float>();
-            if(prop == "base")
+            if (prop == "base")
                 stat.setBase(floatValue);
-            else if(prop == "damage")
+            else if (prop == "damage")
             {
                 stat.restore(stat.getDamage());
                 stat.damage(floatValue);
             }
-            else if(prop == "modifier")
+            else if (prop == "modifier")
                 stat.setModifier(floatValue);
             stats.setAttribute(index, stat);
         }
@@ -254,30 +272,36 @@ namespace MWLua
         StatObject mObject;
         int mIndex;
 
-        SkillStat(StatObject object, int index) : mObject(std::move(object)), mIndex(index) {}
+        SkillStat(StatObject object, int index)
+            : mObject(std::move(object))
+            , mIndex(index)
+        {
+        }
 
         static float getProgress(const MWWorld::Ptr& ptr, int index, const MWMechanics::SkillValue& stat)
         {
             float progress = stat.getProgress();
-            if(progress != 0.f)
+            if (progress != 0.f)
                 progress /= getMaxProgress(ptr, index, stat);
             return progress;
         }
 
-        static float getMaxProgress(const MWWorld::Ptr& ptr, int index, const MWMechanics::SkillValue& stat) {
+        static float getMaxProgress(const MWWorld::Ptr& ptr, int index, const MWMechanics::SkillValue& stat)
+        {
             const auto& store = MWBase::Environment::get().getWorld()->getStore();
             const auto cl = store.get<ESM::Class>().find(ptr.get<ESM::NPC>()->mBase->mClass);
             return ptr.getClass().getNpcStats(ptr).getSkillProgressRequirement(index, *cl);
         }
+
     public:
-        template<class G>
+        template <class G>
         sol::object get(const Context& context, std::string_view prop, G getter) const
         {
-            return getValue(context, mObject, &SkillStat::setValue, mIndex, prop, [this, getter](const MWLua::Object* obj)
-            {
-                const auto& ptr = obj->ptr();
-                return (ptr.getClass().getNpcStats(ptr).getSkill(mIndex).*getter)();
-            });
+            return getValue(
+                context, mObject, &SkillStat::setValue, mIndex, prop, [this, getter](const MWLua::Object* obj) {
+                    const auto& ptr = obj->ptr();
+                    return (ptr.getClass().getNpcStats(ptr).getSkill(mIndex).*getter)();
+                });
         }
 
         float getModified(const Context& context) const
@@ -290,26 +314,26 @@ namespace MWLua
 
         sol::object getProgress(const Context& context) const
         {
-            return getValue(context, mObject, &SkillStat::setValue, mIndex, "progress", [this](const MWLua::Object* obj)
-            {
-                const auto& ptr = obj->ptr();
-                return getProgress(ptr, mIndex, ptr.getClass().getNpcStats(ptr).getSkill(mIndex));
-            });
+            return getValue(
+                context, mObject, &SkillStat::setValue, mIndex, "progress", [this](const MWLua::Object* obj) {
+                    const auto& ptr = obj->ptr();
+                    return getProgress(ptr, mIndex, ptr.getClass().getNpcStats(ptr).getSkill(mIndex));
+                });
         }
 
         static std::optional<SkillStat> create(StatObject object, int index)
         {
-            if(!getObject(object)->ptr().getClass().isNpc())
+            if (!getObject(object)->ptr().getClass().isNpc())
                 return {};
-            return SkillStat{std::move(object), index};
+            return SkillStat{ std::move(object), index };
         }
 
         void cache(const Context& context, std::string_view prop, const sol::object& value) const
         {
             SelfObject* obj = std::get<SelfObject*>(mObject);
-            if(obj->mStatsCache.empty())
+            if (obj->mStatsCache.empty())
                 context.mLuaManager->addAction(std::make_unique<StatUpdateAction>(context.mLua, obj->id()));
-            obj->mStatsCache[SelfObject::CachedStat{&SkillStat::setValue, mIndex, prop}] = value;
+            obj->mStatsCache[SelfObject::CachedStat{ &SkillStat::setValue, mIndex, prop }] = value;
         }
 
         static void setValue(int index, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)
@@ -317,16 +341,16 @@ namespace MWLua
             auto& stats = ptr.getClass().getNpcStats(ptr);
             auto stat = stats.getSkill(index);
             float floatValue = value.as<float>();
-            if(prop == "base")
+            if (prop == "base")
                 stat.setBase(floatValue);
-            else if(prop == "damage")
+            else if (prop == "damage")
             {
                 stat.restore(stat.getDamage());
                 stat.damage(floatValue);
             }
-            else if(prop == "modifier")
+            else if (prop == "modifier")
                 stat.setModifier(floatValue);
-            else if(prop == "progress")
+            else if (prop == "progress")
                 stat.setProgress(floatValue * getMaxProgress(ptr, index, stat));
             stats.setSkill(index, stat);
         }
@@ -336,13 +360,21 @@ namespace MWLua
 namespace sol
 {
     template <>
-    struct is_automagical<MWLua::LevelStat> : std::false_type {};
+    struct is_automagical<MWLua::LevelStat> : std::false_type
+    {
+    };
     template <>
-    struct is_automagical<MWLua::DynamicStat> : std::false_type {};
+    struct is_automagical<MWLua::DynamicStat> : std::false_type
+    {
+    };
     template <>
-    struct is_automagical<MWLua::AttributeStat> : std::false_type {};
+    struct is_automagical<MWLua::AttributeStat> : std::false_type
+    {
+    };
     template <>
-    struct is_automagical<MWLua::SkillStat> : std::false_type {};
+    struct is_automagical<MWLua::SkillStat> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
@@ -353,8 +385,7 @@ namespace MWLua
         actor["stats"] = LuaUtil::makeReadOnly(stats);
 
         auto levelStatT = context.mLua->sol().new_usertype<LevelStat>("LevelStat");
-        levelStatT["current"] = sol::property(
-            [context](const LevelStat& stat) { return stat.getCurrent(context); },
+        levelStatT["current"] = sol::property([context](const LevelStat& stat) { return stat.getCurrent(context); },
             [context](const LevelStat& stat, const sol::object& value) { stat.setCurrent(context, value); });
         levelStatT["progress"] = sol::property([context](const LevelStat& stat) { return stat.getProgress(context); });
         stats["level"] = addIndexedAccessor<LevelStat>(0);
@@ -372,12 +403,14 @@ namespace MWLua
         auto attributeStatT = context.mLua->sol().new_usertype<AttributeStat>("AttributeStat");
         addProp(context, attributeStatT, "base", &MWMechanics::AttributeValue::getBase);
         addProp(context, attributeStatT, "damage", &MWMechanics::AttributeValue::getDamage);
-        attributeStatT["modified"] = sol::property([=](const AttributeStat& stat) { return stat.getModified(context); });
+        attributeStatT["modified"]
+            = sol::property([=](const AttributeStat& stat) { return stat.getModified(context); });
         addProp(context, attributeStatT, "modifier", &MWMechanics::AttributeValue::getModifier);
         sol::table attributes(context.mLua->sol(), sol::create);
         stats["attributes"] = LuaUtil::makeReadOnly(attributes);
-        for(int id = ESM::Attribute::Strength; id < ESM::Attribute::Length; ++id)
-            attributes[Misc::StringUtils::lowerCase(ESM::Attribute::sAttributeNames[id])] = addIndexedAccessor<AttributeStat>(id);
+        for (int id = ESM::Attribute::Strength; id < ESM::Attribute::Length; ++id)
+            attributes[Misc::StringUtils::lowerCase(ESM::Attribute::sAttributeNames[id])]
+                = addIndexedAccessor<AttributeStat>(id);
     }
 
     void addNpcStatsBindings(sol::table& npc, const Context& context)
@@ -393,12 +426,11 @@ namespace MWLua
         addProp(context, skillStatT, "damage", &MWMechanics::SkillValue::getDamage);
         skillStatT["modified"] = sol::property([=](const SkillStat& stat) { return stat.getModified(context); });
         addProp(context, skillStatT, "modifier", &MWMechanics::SkillValue::getModifier);
-        skillStatT["progress"] = sol::property(
-            [context](const SkillStat& stat) { return stat.getProgress(context); },
+        skillStatT["progress"] = sol::property([context](const SkillStat& stat) { return stat.getProgress(context); },
             [context](const SkillStat& stat, const sol::object& value) { stat.cache(context, "progress", value); });
         sol::table skills(context.mLua->sol(), sol::create);
         npcStats["skills"] = LuaUtil::makeReadOnly(skills);
-        for(int id = ESM::Skill::Block; id < ESM::Skill::Length; ++id)
+        for (int id = ESM::Skill::Block; id < ESM::Skill::Length; ++id)
             skills[Misc::StringUtils::lowerCase(ESM::Skill::sSkillNames[id])] = addIndexedAccessor<SkillStat>(id);
     }
 }
diff --git a/apps/openmw/mwlua/types/activator.cpp b/apps/openmw/mwlua/types/activator.cpp
index 6618b0f7ea..e9f1a8494b 100644
--- a/apps/openmw/mwlua/types/activator.cpp
+++ b/apps/openmw/mwlua/types/activator.cpp
@@ -1,18 +1,20 @@
 #include "types.hpp"
 
 #include <components/esm3/loadacti.hpp>
+#include <components/lua/luastate.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
-#include <components/lua/luastate.hpp>
 
-#include <apps/openmw/mwworld/esmstore.hpp>
 #include <apps/openmw/mwbase/environment.hpp>
 #include <apps/openmw/mwbase/world.hpp>
+#include <apps/openmw/mwworld/esmstore.hpp>
 
 namespace sol
 {
     template <>
-    struct is_automagical<ESM::Activator> : std::false_type {};
+    struct is_automagical<ESM::Activator> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
@@ -21,18 +23,20 @@ namespace MWLua
     {
         auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
-        const MWWorld::Store<ESM::Activator>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Activator>();
+        const MWWorld::Store<ESM::Activator>* store
+            = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Activator>();
         activator["record"] = sol::overload(
             [](const Object& obj) -> const ESM::Activator* { return obj.ptr().get<ESM::Activator>()->mBase; },
             [store](const std::string& recordId) -> const ESM::Activator* { return store->find(recordId); });
         sol::usertype<ESM::Activator> record = context.mLua->sol().new_usertype<ESM::Activator>("ESM3_Activator");
-        record[sol::meta_function::to_string] = [](const ESM::Activator& rec) { return "ESM3_Activator[" + rec.mId + "]"; };
+        record[sol::meta_function::to_string]
+            = [](const ESM::Activator& rec) { return "ESM3_Activator[" + rec.mId + "]"; };
         record["id"] = sol::readonly_property([](const ESM::Activator& rec) -> std::string { return rec.mId; });
         record["name"] = sol::readonly_property([](const ESM::Activator& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Activator& rec) -> std::string
-        {
+        record["model"] = sol::readonly_property([vfs](const ESM::Activator& rec) -> std::string {
             return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
         });
-        record["mwscript"] = sol::readonly_property([](const ESM::Activator& rec) -> std::string { return rec.mScript; });
+        record["mwscript"]
+            = sol::readonly_property([](const ESM::Activator& rec) -> std::string { return rec.mScript; });
     }
 }
diff --git a/apps/openmw/mwlua/types/actor.cpp b/apps/openmw/mwlua/types/actor.cpp
index b3a00faa5c..20c32e4a30 100644
--- a/apps/openmw/mwlua/types/actor.cpp
+++ b/apps/openmw/mwlua/types/actor.cpp
@@ -1,12 +1,12 @@
 #include "types.hpp"
 
-#include <components/lua/luastate.hpp>
 #include <components/detournavigator/agentbounds.hpp>
+#include <components/lua/luastate.hpp>
 
-#include <apps/openmw/mwmechanics/drawstate.hpp>
 #include <apps/openmw/mwmechanics/creaturestats.hpp>
-#include <apps/openmw/mwworld/inventorystore.hpp>
+#include <apps/openmw/mwmechanics/drawstate.hpp>
 #include <apps/openmw/mwworld/class.hpp>
+#include <apps/openmw/mwworld/inventorystore.hpp>
 
 #include "../localscripts.hpp"
 #include "../luamanagerimp.hpp"
@@ -19,11 +19,15 @@ namespace MWLua
         class SetEquipmentAction final : public LuaManager::Action
         {
         public:
-            using Item = std::variant<std::string, ObjectId>;  // recordId or ObjectId
-            using Equipment = std::map<int, Item>;  // slot to item
+            using Item = std::variant<std::string, ObjectId>; // recordId or ObjectId
+            using Equipment = std::map<int, Item>; // slot to item
 
             SetEquipmentAction(LuaUtil::LuaState* state, ObjectId actor, Equipment equipment)
-                : Action(state), mActor(actor), mEquipment(std::move(equipment)) {}
+                : Action(state)
+                , mActor(actor)
+                , mEquipment(std::move(equipment))
+            {
+            }
 
             void apply(WorldView& worldView) const override
             {
@@ -33,19 +37,19 @@ namespace MWLua
                 std::fill(usedSlots.begin(), usedSlots.end(), false);
 
                 static constexpr int anySlot = -1;
-                auto tryEquipToSlot = [&actor, &store, &usedSlots, &worldView](int slot, const Item& item) -> bool
-                {
+                auto tryEquipToSlot = [&actor, &store, &usedSlots, &worldView](int slot, const Item& item) -> bool {
                     auto old_it = slot != anySlot ? store.getSlot(slot) : store.end();
                     MWWorld::Ptr itemPtr;
                     if (std::holds_alternative<ObjectId>(item))
                     {
                         itemPtr = worldView.getObjectRegistry()->getPtr(std::get<ObjectId>(item), false);
                         if (old_it != store.end() && *old_it == itemPtr)
-                            return true;  // already equipped
-                        if (itemPtr.isEmpty() || itemPtr.getRefData().getCount() == 0 ||
-                            itemPtr.getContainerStore() != static_cast<const MWWorld::ContainerStore*>(&store))
+                            return true; // already equipped
+                        if (itemPtr.isEmpty() || itemPtr.getRefData().getCount() == 0
+                            || itemPtr.getContainerStore() != static_cast<const MWWorld::ContainerStore*>(&store))
                         {
-                            Log(Debug::Warning) << "Object" << idToString(std::get<ObjectId>(item)) << " is not in inventory";
+                            Log(Debug::Warning)
+                                << "Object" << idToString(std::get<ObjectId>(item)) << " is not in inventory";
                             return false;
                         }
                     }
@@ -53,7 +57,7 @@ namespace MWLua
                     {
                         const std::string& recordId = std::get<std::string>(item);
                         if (old_it != store.end() && old_it->getCellRef().getRefId() == recordId)
-                            return true;  // already equipped
+                            return true; // already equipped
                         itemPtr = store.search(recordId);
                         if (itemPtr.isEmpty() || itemPtr.getRefData().getCount() == 0)
                         {
@@ -63,10 +67,12 @@ namespace MWLua
                     }
 
                     auto [allowedSlots, _] = itemPtr.getClass().getEquipmentSlots(itemPtr);
-                    bool requestedSlotIsAllowed = std::find(allowedSlots.begin(), allowedSlots.end(), slot) != allowedSlots.end();
+                    bool requestedSlotIsAllowed
+                        = std::find(allowedSlots.begin(), allowedSlots.end(), slot) != allowedSlots.end();
                     if (!requestedSlotIsAllowed)
                     {
-                        auto firstAllowed = std::find_if(allowedSlots.begin(), allowedSlots.end(), [&](int s) { return !usedSlots[s]; });
+                        auto firstAllowed = std::find_if(
+                            allowedSlots.begin(), allowedSlots.end(), [&](int s) { return !usedSlots[s]; });
                         if (firstAllowed == allowedSlots.end())
                         {
                             Log(Debug::Warning) << "No suitable slot for " << ptrToString(itemPtr);
@@ -77,11 +83,12 @@ namespace MWLua
 
                     // TODO: Refactor InventoryStore to accept Ptr and get rid of this linear search.
                     MWWorld::ContainerStoreIterator it = std::find(store.begin(), store.end(), itemPtr);
-                    if (it == store.end())  // should never happen
+                    if (it == store.end()) // should never happen
                         throw std::logic_error("Item not found in container");
 
                     store.equip(slot, it, actor);
-                    return requestedSlotIsAllowed;  // return true if equipped to requested slot and false if slot was changed
+                    return requestedSlotIsAllowed; // return true if equipped to requested slot and false if slot was
+                                                   // changed
                 };
 
                 for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
@@ -109,40 +116,34 @@ namespace MWLua
             Equipment mEquipment;
         };
     }
-    
+
     using SelfObject = LocalScripts::SelfObject;
 
     void addActorBindings(sol::table actor, const Context& context)
     {
-        actor["STANCE"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, MWMechanics::DrawState>({
-            {"Nothing", MWMechanics::DrawState::Nothing},
-            {"Weapon", MWMechanics::DrawState::Weapon},
-            {"Spell", MWMechanics::DrawState::Spell},
-        }));
-        actor["EQUIPMENT_SLOT"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
-            {"Helmet", MWWorld::InventoryStore::Slot_Helmet},
-            {"Cuirass", MWWorld::InventoryStore::Slot_Cuirass},
-            {"Greaves", MWWorld::InventoryStore::Slot_Greaves},
-            {"LeftPauldron", MWWorld::InventoryStore::Slot_LeftPauldron},
-            {"RightPauldron", MWWorld::InventoryStore::Slot_RightPauldron},
-            {"LeftGauntlet", MWWorld::InventoryStore::Slot_LeftGauntlet},
-            {"RightGauntlet", MWWorld::InventoryStore::Slot_RightGauntlet},
-            {"Boots", MWWorld::InventoryStore::Slot_Boots},
-            {"Shirt", MWWorld::InventoryStore::Slot_Shirt},
-            {"Pants", MWWorld::InventoryStore::Slot_Pants},
-            {"Skirt", MWWorld::InventoryStore::Slot_Skirt},
-            {"Robe", MWWorld::InventoryStore::Slot_Robe},
-            {"LeftRing", MWWorld::InventoryStore::Slot_LeftRing},
-            {"RightRing", MWWorld::InventoryStore::Slot_RightRing},
-            {"Amulet", MWWorld::InventoryStore::Slot_Amulet},
-            {"Belt", MWWorld::InventoryStore::Slot_Belt},
-            {"CarriedRight", MWWorld::InventoryStore::Slot_CarriedRight},
-            {"CarriedLeft", MWWorld::InventoryStore::Slot_CarriedLeft},
-            {"Ammunition", MWWorld::InventoryStore::Slot_Ammunition}
-        }));
-
-        actor["stance"] = [](const Object& o)
-        {
+        actor["STANCE"]
+            = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, MWMechanics::DrawState>({
+                { "Nothing", MWMechanics::DrawState::Nothing },
+                { "Weapon", MWMechanics::DrawState::Weapon },
+                { "Spell", MWMechanics::DrawState::Spell },
+            }));
+        actor["EQUIPMENT_SLOT"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>(
+            { { "Helmet", MWWorld::InventoryStore::Slot_Helmet }, { "Cuirass", MWWorld::InventoryStore::Slot_Cuirass },
+                { "Greaves", MWWorld::InventoryStore::Slot_Greaves },
+                { "LeftPauldron", MWWorld::InventoryStore::Slot_LeftPauldron },
+                { "RightPauldron", MWWorld::InventoryStore::Slot_RightPauldron },
+                { "LeftGauntlet", MWWorld::InventoryStore::Slot_LeftGauntlet },
+                { "RightGauntlet", MWWorld::InventoryStore::Slot_RightGauntlet },
+                { "Boots", MWWorld::InventoryStore::Slot_Boots }, { "Shirt", MWWorld::InventoryStore::Slot_Shirt },
+                { "Pants", MWWorld::InventoryStore::Slot_Pants }, { "Skirt", MWWorld::InventoryStore::Slot_Skirt },
+                { "Robe", MWWorld::InventoryStore::Slot_Robe }, { "LeftRing", MWWorld::InventoryStore::Slot_LeftRing },
+                { "RightRing", MWWorld::InventoryStore::Slot_RightRing },
+                { "Amulet", MWWorld::InventoryStore::Slot_Amulet }, { "Belt", MWWorld::InventoryStore::Slot_Belt },
+                { "CarriedRight", MWWorld::InventoryStore::Slot_CarriedRight },
+                { "CarriedLeft", MWWorld::InventoryStore::Slot_CarriedLeft },
+                { "Ammunition", MWWorld::InventoryStore::Slot_Ammunition } }));
+
+        actor["stance"] = [](const Object& o) {
             const MWWorld::Class& cls = o.ptr().getClass();
             if (cls.isActor())
                 return cls.getCreatureStats(o.ptr()).getDrawState();
@@ -150,42 +151,31 @@ namespace MWLua
                 throw std::runtime_error("Actor expected");
         };
 
-        actor["canMove"] = [](const Object& o)
-        {
+        actor["canMove"] = [](const Object& o) {
             const MWWorld::Class& cls = o.ptr().getClass();
             return cls.getMaxSpeed(o.ptr()) > 0;
         };
-        actor["runSpeed"] = [](const Object& o)
-        {
+        actor["runSpeed"] = [](const Object& o) {
             const MWWorld::Class& cls = o.ptr().getClass();
             return cls.getRunSpeed(o.ptr());
         };
-        actor["walkSpeed"] = [](const Object& o)
-        {
+        actor["walkSpeed"] = [](const Object& o) {
             const MWWorld::Class& cls = o.ptr().getClass();
             return cls.getWalkSpeed(o.ptr());
         };
-        actor["currentSpeed"] = [](const Object& o)
-        {
+        actor["currentSpeed"] = [](const Object& o) {
             const MWWorld::Class& cls = o.ptr().getClass();
             return cls.getCurrentSpeed(o.ptr());
         };
 
-        actor["isOnGround"] = [](const LObject& o)
-        {
-            return MWBase::Environment::get().getWorld()->isOnGround(o.ptr());
-        };
-        actor["isSwimming"] = [](const LObject& o)
-        {
-            return MWBase::Environment::get().getWorld()->isSwimming(o.ptr());
-        };
+        actor["isOnGround"]
+            = [](const LObject& o) { return MWBase::Environment::get().getWorld()->isOnGround(o.ptr()); };
+        actor["isSwimming"]
+            = [](const LObject& o) { return MWBase::Environment::get().getWorld()->isSwimming(o.ptr()); };
 
-        actor["inventory"] = sol::overload(
-            [](const LObject& o) { return Inventory<LObject>{o}; },
-            [](const GObject& o) { return Inventory<GObject>{o}; }
-        );
-        auto getAllEquipment = [context](const Object& o)
-        {
+        actor["inventory"] = sol::overload([](const LObject& o) { return Inventory<LObject>{ o }; },
+            [](const GObject& o) { return Inventory<GObject>{ o }; });
+        auto getAllEquipment = [context](const Object& o) {
             const MWWorld::Ptr& ptr = o.ptr();
             sol::table equipment(context.mLua->sol(), sol::create);
             if (!ptr.getClass().hasInventoryStore(ptr))
@@ -202,8 +192,7 @@ namespace MWLua
             }
             return equipment;
         };
-        auto getEquipmentFromSlot = [context](const Object& o, int slot) -> sol::object
-        {
+        auto getEquipmentFromSlot = [context](const Object& o, int slot) -> sol::object {
             const MWWorld::Ptr& ptr = o.ptr();
             sol::table equipment(context.mLua->sol(), sol::create);
             if (!ptr.getClass().hasInventoryStore(ptr))
@@ -216,16 +205,14 @@ namespace MWLua
             return o.getObject(context.mLua->sol(), getId(*it));
         };
         actor["equipment"] = sol::overload(getAllEquipment, getEquipmentFromSlot);
-        actor["hasEquipped"] = [](const Object& o, const Object& item)
-        {
+        actor["hasEquipped"] = [](const Object& o, const Object& item) {
             const MWWorld::Ptr& ptr = o.ptr();
             if (!ptr.getClass().hasInventoryStore(ptr))
                 return false;
             MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
             return store.isEquipped(item.ptr());
         };
-        actor["setEquipment"] = [context](const SelfObject& obj, const sol::table& equipment)
-        {
+        actor["setEquipment"] = [context](const SelfObject& obj, const sol::table& equipment) {
             if (!obj.ptr().getClass().hasInventoryStore(obj.ptr()))
             {
                 if (!equipment.empty())
@@ -241,11 +228,12 @@ namespace MWLua
                 else
                     eqp[slot] = value.as<std::string>();
             }
-            context.mLuaManager->addAction(std::make_unique<SetEquipmentAction>(context.mLua, obj.id(), std::move(eqp)));
+            context.mLuaManager->addAction(
+                std::make_unique<SetEquipmentAction>(context.mLua, obj.id(), std::move(eqp)));
         };
-        actor["getPathfindingAgentBounds"] = [context](const LObject& o)
-        {
-            const DetourNavigator::AgentBounds agentBounds = MWBase::Environment::get().getWorld()->getPathfindingAgentBounds(o.ptr());
+        actor["getPathfindingAgentBounds"] = [context](const LObject& o) {
+            const DetourNavigator::AgentBounds agentBounds
+                = MWBase::Environment::get().getWorld()->getPathfindingAgentBounds(o.ptr());
             sol::table result = context.mLua->newTable();
             result["shapeType"] = agentBounds.mShapeType;
             result["halfExtents"] = agentBounds.mHalfExtents;
diff --git a/apps/openmw/mwlua/types/apparatus.cpp b/apps/openmw/mwlua/types/apparatus.cpp
index 57cc9ff313..6b65b000f1 100644
--- a/apps/openmw/mwlua/types/apparatus.cpp
+++ b/apps/openmw/mwlua/types/apparatus.cpp
@@ -1,18 +1,20 @@
 #include "types.hpp"
 
 #include <components/esm3/loadappa.hpp>
+#include <components/lua/luastate.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
-#include <components/lua/luastate.hpp>
 
-#include <apps/openmw/mwworld/esmstore.hpp>
 #include <apps/openmw/mwbase/environment.hpp>
 #include <apps/openmw/mwbase/world.hpp>
+#include <apps/openmw/mwworld/esmstore.hpp>
 
 namespace sol
 {
     template <>
-    struct is_automagical<ESM::Apparatus> : std::false_type {};
+    struct is_automagical<ESM::Apparatus> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
@@ -20,34 +22,36 @@ namespace MWLua
     void addApparatusBindings(sol::table apparatus, const Context& context)
     {
         apparatus["TYPE"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
-            {"MortarPestle", ESM::Apparatus::MortarPestle},
-            {"Alembic", ESM::Apparatus::Alembic},
-            {"Calcinator", ESM::Apparatus::Calcinator},
-            {"Retort", ESM::Apparatus::Retort},
-            }));
+            { "MortarPestle", ESM::Apparatus::MortarPestle },
+            { "Alembic", ESM::Apparatus::Alembic },
+            { "Calcinator", ESM::Apparatus::Calcinator },
+            { "Retort", ESM::Apparatus::Retort },
+        }));
 
         auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
-        const MWWorld::Store<ESM::Apparatus>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Apparatus>();
+        const MWWorld::Store<ESM::Apparatus>* store
+            = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Apparatus>();
         apparatus["record"] = sol::overload(
             [](const Object& obj) -> const ESM::Apparatus* { return obj.ptr().get<ESM::Apparatus>()->mBase; },
             [store](const std::string& recordId) -> const ESM::Apparatus* { return store->find(recordId); });
         sol::usertype<ESM::Apparatus> record = context.mLua->sol().new_usertype<ESM::Apparatus>("ESM3_Apparatus");
-        record[sol::meta_function::to_string] = [](const ESM::Apparatus& rec) { return "ESM3_Apparatus[" + rec.mId + "]"; };
+        record[sol::meta_function::to_string]
+            = [](const ESM::Apparatus& rec) { return "ESM3_Apparatus[" + rec.mId + "]"; };
         record["id"] = sol::readonly_property([](const ESM::Apparatus& rec) -> std::string { return rec.mId; });
         record["name"] = sol::readonly_property([](const ESM::Apparatus& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Apparatus& rec) -> std::string
-        {
+        record["model"] = sol::readonly_property([vfs](const ESM::Apparatus& rec) -> std::string {
             return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
         });
-        record["mwscript"] = sol::readonly_property([](const ESM::Apparatus& rec) -> std::string { return rec.mScript; });
-        record["icon"] = sol::readonly_property([vfs](const ESM::Apparatus& rec) -> std::string
-        {
+        record["mwscript"]
+            = sol::readonly_property([](const ESM::Apparatus& rec) -> std::string { return rec.mScript; });
+        record["icon"] = sol::readonly_property([vfs](const ESM::Apparatus& rec) -> std::string {
             return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
         });
         record["type"] = sol::readonly_property([](const ESM::Apparatus& rec) -> int { return rec.mData.mType; });
         record["value"] = sol::readonly_property([](const ESM::Apparatus& rec) -> int { return rec.mData.mValue; });
         record["weight"] = sol::readonly_property([](const ESM::Apparatus& rec) -> float { return rec.mData.mWeight; });
-        record["quality"] = sol::readonly_property([](const ESM::Apparatus& rec) -> float { return rec.mData.mQuality; });
+        record["quality"]
+            = sol::readonly_property([](const ESM::Apparatus& rec) -> float { return rec.mData.mQuality; });
     }
 }
diff --git a/apps/openmw/mwlua/types/book.cpp b/apps/openmw/mwlua/types/book.cpp
index c439965f30..d65e884cad 100644
--- a/apps/openmw/mwlua/types/book.cpp
+++ b/apps/openmw/mwlua/types/book.cpp
@@ -1,25 +1,27 @@
 #include "types.hpp"
 
 #include <components/esm3/loadbook.hpp>
+#include <components/lua/luastate.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
-#include <components/lua/luastate.hpp>
 
-#include <apps/openmw/mwworld/esmstore.hpp>
 #include <apps/openmw/mwbase/environment.hpp>
 #include <apps/openmw/mwbase/world.hpp>
+#include <apps/openmw/mwworld/esmstore.hpp>
 #include <components/esm3/loadskil.hpp>
 
 namespace sol
 {
     template <>
-    struct is_automagical<ESM::Book> : std::false_type {};
+    struct is_automagical<ESM::Book> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
 {
     void addBookBindings(sol::table book, const Context& context)
-    {   
+    {
         sol::table skill(context.mLua->sol(), sol::create);
         book["SKILL"] = LuaUtil::makeStrictReadOnly(skill);
         for (int id = ESM::Skill::Block; id < ESM::Skill::Length; ++id)
@@ -31,20 +33,18 @@ namespace MWLua
         auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
         const MWWorld::Store<ESM::Book>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Book>();
-        book["record"] = sol::overload(
-            [](const Object& obj) -> const ESM::Book* { return obj.ptr().get<ESM::Book>()->mBase; },
-            [store](const std::string& recordId) -> const ESM::Book* { return store->find(recordId); });
+        book["record"]
+            = sol::overload([](const Object& obj) -> const ESM::Book* { return obj.ptr().get<ESM::Book>()->mBase; },
+                [store](const std::string& recordId) -> const ESM::Book* { return store->find(recordId); });
         sol::usertype<ESM::Book> record = context.mLua->sol().new_usertype<ESM::Book>("ESM3_Book");
         record[sol::meta_function::to_string] = [](const ESM::Book& rec) { return "ESM3_Book[" + rec.mId + "]"; };
         record["id"] = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mId; });
         record["name"] = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Book& rec) -> std::string
-        {
+        record["model"] = sol::readonly_property([vfs](const ESM::Book& rec) -> std::string {
             return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
         });
         record["mwscript"] = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mScript; });
-        record["icon"] = sol::readonly_property([vfs](const ESM::Book& rec) -> std::string
-        {
+        record["icon"] = sol::readonly_property([vfs](const ESM::Book& rec) -> std::string {
             return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
         });
         record["text"] = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mText; });
@@ -52,9 +52,9 @@ namespace MWLua
         record["isScroll"] = sol::readonly_property([](const ESM::Book& rec) -> bool { return rec.mData.mIsScroll; });
         record["value"] = sol::readonly_property([](const ESM::Book& rec) -> int { return rec.mData.mValue; });
         record["weight"] = sol::readonly_property([](const ESM::Book& rec) -> float { return rec.mData.mWeight; });
-        record["enchantCapacity"] = sol::readonly_property([](const ESM::Book& rec) -> float { return rec.mData.mEnchant * 0.1f; });
-        record["skill"] = sol::readonly_property([](const ESM::Book& rec) -> sol::optional<std::string>
-        { 
+        record["enchantCapacity"]
+            = sol::readonly_property([](const ESM::Book& rec) -> float { return rec.mData.mEnchant * 0.1f; });
+        record["skill"] = sol::readonly_property([](const ESM::Book& rec) -> sol::optional<std::string> {
             if (rec.mData.mSkillId >= 0)
                 return Misc::StringUtils::lowerCase(ESM::Skill::sSkillNames[rec.mData.mSkillId]);
             else
diff --git a/apps/openmw/mwlua/types/container.cpp b/apps/openmw/mwlua/types/container.cpp
index 2fd0940245..e799535985 100644
--- a/apps/openmw/mwlua/types/container.cpp
+++ b/apps/openmw/mwlua/types/container.cpp
@@ -1,32 +1,42 @@
 #include "types.hpp"
 
 #include <components/esm3/loadcont.hpp>
+#include <components/lua/luastate.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
-#include <components/lua/luastate.hpp>
 
-#include <apps/openmw/mwworld/esmstore.hpp>
-#include <apps/openmw/mwworld/class.hpp>
 #include <apps/openmw/mwbase/environment.hpp>
 #include <apps/openmw/mwbase/world.hpp>
+#include <apps/openmw/mwworld/class.hpp>
+#include <apps/openmw/mwworld/esmstore.hpp>
 
 namespace sol
 {
     template <>
-    struct is_automagical<ESM::Container> : std::false_type {};
+    struct is_automagical<ESM::Container> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
 {
 
-    static const MWWorld::Ptr& containerPtr(const Object& o) { return verifyType(ESM::REC_CONT, o.ptr()); }
+    static const MWWorld::Ptr& containerPtr(const Object& o)
+    {
+        return verifyType(ESM::REC_CONT, o.ptr());
+    }
 
     void addContainerBindings(sol::table container, const Context& context)
     {
         container["content"] = sol::overload(
-            [](const LObject& o) { containerPtr(o); return Inventory<LObject>{o}; },
-            [](const GObject& o) { containerPtr(o); return Inventory<GObject>{o}; }
-        );
+            [](const LObject& o) {
+                containerPtr(o);
+                return Inventory<LObject>{ o };
+            },
+            [](const GObject& o) {
+                containerPtr(o);
+                return Inventory<GObject>{ o };
+            });
         container["encumbrance"] = [](const Object& obj) -> float {
             const MWWorld::Ptr& ptr = containerPtr(obj);
             return ptr.getClass().getEncumbrance(ptr);
@@ -38,19 +48,21 @@ namespace MWLua
 
         auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
-        const MWWorld::Store<ESM::Container>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Container>();
+        const MWWorld::Store<ESM::Container>* store
+            = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Container>();
         container["record"] = sol::overload(
             [](const Object& obj) -> const ESM::Container* { return obj.ptr().get<ESM::Container>()->mBase; },
             [store](const std::string& recordId) -> const ESM::Container* { return store->find(recordId); });
         sol::usertype<ESM::Container> record = context.mLua->sol().new_usertype<ESM::Container>("ESM3_Container");
-        record[sol::meta_function::to_string] = [](const ESM::Container& rec) -> std::string { return "ESM3_Container[" + rec.mId + "]"; };
+        record[sol::meta_function::to_string]
+            = [](const ESM::Container& rec) -> std::string { return "ESM3_Container[" + rec.mId + "]"; };
         record["id"] = sol::readonly_property([](const ESM::Container& rec) -> std::string { return rec.mId; });
         record["name"] = sol::readonly_property([](const ESM::Container& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Container& rec) -> std::string
-        {
+        record["model"] = sol::readonly_property([vfs](const ESM::Container& rec) -> std::string {
             return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
         });
-        record["mwscript"] = sol::readonly_property([](const ESM::Container& rec) -> std::string { return rec.mScript; });
+        record["mwscript"]
+            = sol::readonly_property([](const ESM::Container& rec) -> std::string { return rec.mScript; });
         record["weight"] = sol::readonly_property([](const ESM::Container& rec) -> float { return rec.mWeight; });
     }
 }
diff --git a/apps/openmw/mwlua/types/creature.cpp b/apps/openmw/mwlua/types/creature.cpp
index ee67597555..b900286d7c 100644
--- a/apps/openmw/mwlua/types/creature.cpp
+++ b/apps/openmw/mwlua/types/creature.cpp
@@ -5,14 +5,16 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include <apps/openmw/mwworld/esmstore.hpp>
 #include <apps/openmw/mwbase/environment.hpp>
 #include <apps/openmw/mwbase/world.hpp>
+#include <apps/openmw/mwworld/esmstore.hpp>
 
 namespace sol
 {
     template <>
-    struct is_automagical<ESM::Creature> : std::false_type {};
+    struct is_automagical<ESM::Creature> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
@@ -21,18 +23,21 @@ namespace MWLua
     {
         auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
-        const MWWorld::Store<ESM::Creature>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>();
+        const MWWorld::Store<ESM::Creature>* store
+            = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>();
         creature["record"] = sol::overload(
             [](const Object& obj) -> const ESM::Creature* { return obj.ptr().get<ESM::Creature>()->mBase; },
             [store](const std::string& recordId) -> const ESM::Creature* { return store->find(recordId); });
         sol::usertype<ESM::Creature> record = context.mLua->sol().new_usertype<ESM::Creature>("ESM3_Creature");
-        record[sol::meta_function::to_string] = [](const ESM::Creature& rec) { return "ESM3_Creature[" + rec.mId + "]"; };
+        record[sol::meta_function::to_string]
+            = [](const ESM::Creature& rec) { return "ESM3_Creature[" + rec.mId + "]"; };
         record["name"] = sol::readonly_property([](const ESM::Creature& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Creature& rec) -> std::string
-        {
+        record["model"] = sol::readonly_property([vfs](const ESM::Creature& rec) -> std::string {
             return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
         });
-        record["mwscript"] = sol::readonly_property([](const ESM::Creature& rec) -> std::string { return rec.mScript; });
-        record["baseCreature"] = sol::readonly_property([](const ESM::Creature& rec) -> std::string { return rec.mOriginal; });
+        record["mwscript"]
+            = sol::readonly_property([](const ESM::Creature& rec) -> std::string { return rec.mScript; });
+        record["baseCreature"]
+            = sol::readonly_property([](const ESM::Creature& rec) -> std::string { return rec.mOriginal; });
     }
 }
diff --git a/apps/openmw/mwlua/types/door.cpp b/apps/openmw/mwlua/types/door.cpp
index f82d78f3f0..9ddf3b18fc 100644
--- a/apps/openmw/mwlua/types/door.cpp
+++ b/apps/openmw/mwlua/types/door.cpp
@@ -12,27 +12,27 @@
 namespace sol
 {
     template <>
-    struct is_automagical<ESM::Door> : std::false_type {};
+    struct is_automagical<ESM::Door> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
 {
 
-    static const MWWorld::Ptr& doorPtr(const Object& o) { return verifyType(ESM::REC_DOOR, o.ptr()); }
+    static const MWWorld::Ptr& doorPtr(const Object& o)
+    {
+        return verifyType(ESM::REC_DOOR, o.ptr());
+    }
 
     void addDoorBindings(sol::table door, const Context& context)
     {
         door["isTeleport"] = [](const Object& o) { return doorPtr(o).getCellRef().getTeleport(); };
-        door["destPosition"] = [](const Object& o) -> osg::Vec3f
-        {
-            return doorPtr(o).getCellRef().getDoorDest().asVec3();
-        };
-        door["destRotation"] = [](const Object& o) -> osg::Vec3f
-        {
-            return doorPtr(o).getCellRef().getDoorDest().asRotationVec3();
-        };
-        door["destCell"] = [worldView=context.mWorldView](sol::this_state lua, const Object& o) -> sol::object
-        {
+        door["destPosition"]
+            = [](const Object& o) -> osg::Vec3f { return doorPtr(o).getCellRef().getDoorDest().asVec3(); };
+        door["destRotation"]
+            = [](const Object& o) -> osg::Vec3f { return doorPtr(o).getCellRef().getDoorDest().asRotationVec3(); };
+        door["destCell"] = [worldView = context.mWorldView](sol::this_state lua, const Object& o) -> sol::object {
             const MWWorld::CellRef& cellRef = doorPtr(o).getCellRef();
             if (!cellRef.getTeleport())
                 return sol::nil;
@@ -46,20 +46,22 @@ namespace MWLua
         auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
         const MWWorld::Store<ESM::Door>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Door>();
-        door["record"] = sol::overload(
-            [](const Object& obj) -> const ESM::Door* { return obj.ptr().get<ESM::Door>()->mBase; },
-            [store](const std::string& recordId) -> const ESM::Door* { return store->find(recordId); });
+        door["record"]
+            = sol::overload([](const Object& obj) -> const ESM::Door* { return obj.ptr().get<ESM::Door>()->mBase; },
+                [store](const std::string& recordId) -> const ESM::Door* { return store->find(recordId); });
         sol::usertype<ESM::Door> record = context.mLua->sol().new_usertype<ESM::Door>("ESM3_Door");
-        record[sol::meta_function::to_string] = [](const ESM::Door& rec) -> std::string { return "ESM3_Door[" + rec.mId + "]"; };
+        record[sol::meta_function::to_string]
+            = [](const ESM::Door& rec) -> std::string { return "ESM3_Door[" + rec.mId + "]"; };
         record["id"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mId; });
         record["name"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Door& rec) -> std::string
-        {
+        record["model"] = sol::readonly_property([vfs](const ESM::Door& rec) -> std::string {
             return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
         });
         record["mwscript"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mScript; });
-        record["openSound"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mOpenSound; });
-        record["closeSound"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mCloseSound; });
+        record["openSound"]
+            = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mOpenSound; });
+        record["closeSound"]
+            = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mCloseSound; });
     }
 
 }
diff --git a/apps/openmw/mwlua/types/ingredient.cpp b/apps/openmw/mwlua/types/ingredient.cpp
index 3505633036..5f119fc729 100644
--- a/apps/openmw/mwlua/types/ingredient.cpp
+++ b/apps/openmw/mwlua/types/ingredient.cpp
@@ -13,25 +13,31 @@
 namespace sol
 {
     template <>
-    struct is_automagical<ESM::Ingredient> : std::false_type {};
+    struct is_automagical<ESM::Ingredient> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
 {
     void addIngredientBindings(sol::table ingredient, const Context& context)
     {
-        const MWWorld::Store<ESM::Ingredient>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Ingredient>();
+        const MWWorld::Store<ESM::Ingredient>* store
+            = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Ingredient>();
         ingredient["record"] = sol::overload(
-            [](const Object& obj)-> const ESM::Ingredient* { return obj.ptr().get<ESM::Ingredient>()->mBase; },
-            [store](const std::string& recordID)-> const ESM::Ingredient* {return store->find(recordID); });
+            [](const Object& obj) -> const ESM::Ingredient* { return obj.ptr().get<ESM::Ingredient>()->mBase; },
+            [store](const std::string& recordID) -> const ESM::Ingredient* { return store->find(recordID); });
         sol::usertype<ESM::Ingredient> record = context.mLua->sol().new_usertype<ESM::Ingredient>(("ESM3_Ingredient"));
-        record[sol::meta_function::to_string] = [](const ESM::Potion& rec) {return "ESM3_Ingredient[" + rec.mId + "]"; };
-        record["id"] = sol::readonly_property([](const ESM::Ingredient& rec) -> std::string {return rec.mId; });
-        record["name"] = sol::readonly_property([](const ESM::Ingredient& rec) -> std::string {return rec.mName; });
-        record["model"] = sol::readonly_property([](const ESM::Ingredient& rec) -> std::string {return rec.mModel; });
-        record["mwscript"] = sol::readonly_property([](const ESM::Ingredient& rec) -> std::string {return rec.mScript; });
-        record["icon"] = sol::readonly_property([](const ESM::Ingredient& rec) -> std::string {return rec.mIcon; });
-        record["weight"] = sol::readonly_property([](const ESM::Ingredient& rec) -> float {return rec.mData.mWeight; });
-        record["value"] = sol::readonly_property([](const ESM::Ingredient& rec) -> int{return rec.mData.mValue; });
+        record[sol::meta_function::to_string]
+            = [](const ESM::Potion& rec) { return "ESM3_Ingredient[" + rec.mId + "]"; };
+        record["id"] = sol::readonly_property([](const ESM::Ingredient& rec) -> std::string { return rec.mId; });
+        record["name"] = sol::readonly_property([](const ESM::Ingredient& rec) -> std::string { return rec.mName; });
+        record["model"] = sol::readonly_property([](const ESM::Ingredient& rec) -> std::string { return rec.mModel; });
+        record["mwscript"]
+            = sol::readonly_property([](const ESM::Ingredient& rec) -> std::string { return rec.mScript; });
+        record["icon"] = sol::readonly_property([](const ESM::Ingredient& rec) -> std::string { return rec.mIcon; });
+        record["weight"]
+            = sol::readonly_property([](const ESM::Ingredient& rec) -> float { return rec.mData.mWeight; });
+        record["value"] = sol::readonly_property([](const ESM::Ingredient& rec) -> int { return rec.mData.mValue; });
     }
 }
diff --git a/apps/openmw/mwlua/types/lockpick.cpp b/apps/openmw/mwlua/types/lockpick.cpp
index 807c3fb69f..4bc98f4f6e 100644
--- a/apps/openmw/mwlua/types/lockpick.cpp
+++ b/apps/openmw/mwlua/types/lockpick.cpp
@@ -1,18 +1,20 @@
 #include "types.hpp"
 
 #include <components/esm3/loadlock.hpp>
+#include <components/lua/luastate.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
-#include <components/lua/luastate.hpp>
 
-#include <apps/openmw/mwworld/esmstore.hpp>
 #include <apps/openmw/mwbase/environment.hpp>
 #include <apps/openmw/mwbase/world.hpp>
+#include <apps/openmw/mwworld/esmstore.hpp>
 
 namespace sol
 {
     template <>
-    struct is_automagical<ESM::Lockpick> : std::false_type {};
+    struct is_automagical<ESM::Lockpick> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
@@ -21,26 +23,29 @@ namespace MWLua
     {
         auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
-        const MWWorld::Store<ESM::Lockpick>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Lockpick>();
+        const MWWorld::Store<ESM::Lockpick>* store
+            = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Lockpick>();
         lockpick["record"] = sol::overload(
-            [](const Object& obj) -> const ESM::Lockpick* { return obj.ptr().get<ESM::Lockpick>()->mBase;},
-            [store](const std::string& recordId) -> const ESM::Lockpick* { return store->find(recordId);});
+            [](const Object& obj) -> const ESM::Lockpick* { return obj.ptr().get<ESM::Lockpick>()->mBase; },
+            [store](const std::string& recordId) -> const ESM::Lockpick* { return store->find(recordId); });
         sol::usertype<ESM::Lockpick> record = context.mLua->sol().new_usertype<ESM::Lockpick>("ESM3_Lockpick");
-        record[sol::meta_function::to_string] = [](const ESM::Lockpick& rec) { return "ESM3_Lockpick[" + rec.mId + "]";};
-        record["id"] = sol::readonly_property([](const ESM::Lockpick& rec) -> std::string { return rec.mId;});
-        record["name"] = sol::readonly_property([](const ESM::Lockpick& rec) -> std::string { return rec.mName;});
-        record["model"] = sol::readonly_property([vfs](const ESM::Lockpick& rec) -> std::string
-        {
+        record[sol::meta_function::to_string]
+            = [](const ESM::Lockpick& rec) { return "ESM3_Lockpick[" + rec.mId + "]"; };
+        record["id"] = sol::readonly_property([](const ESM::Lockpick& rec) -> std::string { return rec.mId; });
+        record["name"] = sol::readonly_property([](const ESM::Lockpick& rec) -> std::string { return rec.mName; });
+        record["model"] = sol::readonly_property([vfs](const ESM::Lockpick& rec) -> std::string {
             return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
         });
-        record["mwscript"] = sol::readonly_property([](const ESM::Lockpick& rec) -> std::string { return rec.mScript;});
-        record["icon"] = sol::readonly_property([vfs](const ESM::Lockpick& rec) -> std::string
-        {
+        record["mwscript"]
+            = sol::readonly_property([](const ESM::Lockpick& rec) -> std::string { return rec.mScript; });
+        record["icon"] = sol::readonly_property([vfs](const ESM::Lockpick& rec) -> std::string {
             return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
         });
-        record["maxCondition"] = sol::readonly_property([](const ESM::Lockpick& rec) -> int { return rec.mData.mUses;});
-        record["value"] = sol::readonly_property([](const ESM::Lockpick& rec) -> int { return rec.mData.mValue;});
-        record["weight"] = sol::readonly_property([](const ESM::Lockpick& rec) -> float { return rec.mData.mWeight;});
-        record["quality"] = sol::readonly_property([](const ESM::Lockpick& rec) -> float { return rec.mData.mQuality;});
+        record["maxCondition"]
+            = sol::readonly_property([](const ESM::Lockpick& rec) -> int { return rec.mData.mUses; });
+        record["value"] = sol::readonly_property([](const ESM::Lockpick& rec) -> int { return rec.mData.mValue; });
+        record["weight"] = sol::readonly_property([](const ESM::Lockpick& rec) -> float { return rec.mData.mWeight; });
+        record["quality"]
+            = sol::readonly_property([](const ESM::Lockpick& rec) -> float { return rec.mData.mQuality; });
     }
 }
diff --git a/apps/openmw/mwlua/types/misc.cpp b/apps/openmw/mwlua/types/misc.cpp
index bbf878e5fd..0b3f66a327 100644
--- a/apps/openmw/mwlua/types/misc.cpp
+++ b/apps/openmw/mwlua/types/misc.cpp
@@ -1,18 +1,20 @@
 #include "types.hpp"
 
 #include <components/esm3/loadmisc.hpp>
+#include <components/lua/luastate.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
-#include <components/lua/luastate.hpp>
 
-#include <apps/openmw/mwworld/esmstore.hpp>
 #include <apps/openmw/mwbase/environment.hpp>
 #include <apps/openmw/mwbase/world.hpp>
+#include <apps/openmw/mwworld/esmstore.hpp>
 
 namespace sol
 {
     template <>
-    struct is_automagical<ESM::Miscellaneous> : std::false_type {};
+    struct is_automagical<ESM::Miscellaneous> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
@@ -21,25 +23,29 @@ namespace MWLua
     {
         auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
-        const MWWorld::Store<ESM::Miscellaneous>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Miscellaneous>();
+        const MWWorld::Store<ESM::Miscellaneous>* store
+            = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Miscellaneous>();
         miscellaneous["record"] = sol::overload(
             [](const Object& obj) -> const ESM::Miscellaneous* { return obj.ptr().get<ESM::Miscellaneous>()->mBase; },
             [store](const std::string& recordId) -> const ESM::Miscellaneous* { return store->find(recordId); });
-        sol::usertype<ESM::Miscellaneous> record = context.mLua->sol().new_usertype<ESM::Miscellaneous>("ESM3_Miscellaneous");
-        record[sol::meta_function::to_string] = [](const ESM::Miscellaneous& rec) { return "ESM3_Miscellaneous[" + rec.mId + "]"; };
+        sol::usertype<ESM::Miscellaneous> record
+            = context.mLua->sol().new_usertype<ESM::Miscellaneous>("ESM3_Miscellaneous");
+        record[sol::meta_function::to_string]
+            = [](const ESM::Miscellaneous& rec) { return "ESM3_Miscellaneous[" + rec.mId + "]"; };
         record["id"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> std::string { return rec.mId; });
         record["name"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Miscellaneous& rec) -> std::string
-        {
+        record["model"] = sol::readonly_property([vfs](const ESM::Miscellaneous& rec) -> std::string {
             return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
         });
-        record["mwscript"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> std::string { return rec.mScript; });
-        record["icon"] = sol::readonly_property([vfs](const ESM::Miscellaneous& rec) -> std::string
-        {
+        record["mwscript"]
+            = sol::readonly_property([](const ESM::Miscellaneous& rec) -> std::string { return rec.mScript; });
+        record["icon"] = sol::readonly_property([vfs](const ESM::Miscellaneous& rec) -> std::string {
             return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
         });
-        record["isKey"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> bool { return rec.mData.mIsKey; });
+        record["isKey"]
+            = sol::readonly_property([](const ESM::Miscellaneous& rec) -> bool { return rec.mData.mIsKey; });
         record["value"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> int { return rec.mData.mValue; });
-        record["weight"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> float { return rec.mData.mWeight; });
+        record["weight"]
+            = sol::readonly_property([](const ESM::Miscellaneous& rec) -> float { return rec.mData.mWeight; });
     }
 }
diff --git a/apps/openmw/mwlua/types/npc.cpp b/apps/openmw/mwlua/types/npc.cpp
index 9a2df896bd..9cbee90e04 100644
--- a/apps/openmw/mwlua/types/npc.cpp
+++ b/apps/openmw/mwlua/types/npc.cpp
@@ -3,16 +3,18 @@
 #include <components/esm3/loadnpc.hpp>
 #include <components/lua/luastate.hpp>
 
-#include <apps/openmw/mwworld/esmstore.hpp>
 #include <apps/openmw/mwbase/environment.hpp>
 #include <apps/openmw/mwbase/world.hpp>
+#include <apps/openmw/mwworld/esmstore.hpp>
 
 #include "../stats.hpp"
 
 namespace sol
 {
     template <>
-    struct is_automagical<ESM::NPC> : std::false_type {};
+    struct is_automagical<ESM::NPC> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
@@ -22,9 +24,9 @@ namespace MWLua
         addNpcStatsBindings(npc, context);
 
         const MWWorld::Store<ESM::NPC>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::NPC>();
-        npc["record"] = sol::overload(
-            [](const Object& obj) -> const ESM::NPC* { return obj.ptr().get<ESM::NPC>()->mBase; },
-            [store](const std::string& recordId) -> const ESM::NPC* { return store->find(recordId); });
+        npc["record"]
+            = sol::overload([](const Object& obj) -> const ESM::NPC* { return obj.ptr().get<ESM::NPC>()->mBase; },
+                [store](const std::string& recordId) -> const ESM::NPC* { return store->find(recordId); });
         sol::usertype<ESM::NPC> record = context.mLua->sol().new_usertype<ESM::NPC>("ESM3_NPC");
         record[sol::meta_function::to_string] = [](const ESM::NPC& rec) { return "ESM3_NPC[" + rec.mId + "]"; };
         record["name"] = sol::readonly_property([](const ESM::NPC& rec) -> std::string { return rec.mName; });
diff --git a/apps/openmw/mwlua/types/potion.cpp b/apps/openmw/mwlua/types/potion.cpp
index 51a6dceb81..d0bb1d8779 100644
--- a/apps/openmw/mwlua/types/potion.cpp
+++ b/apps/openmw/mwlua/types/potion.cpp
@@ -1,40 +1,41 @@
 #include "types.hpp"
 
 #include <components/esm3/loadalch.hpp>
+#include <components/lua/luastate.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
-#include <components/lua/luastate.hpp>
 
-#include <apps/openmw/mwworld/esmstore.hpp>
 #include <apps/openmw/mwbase/environment.hpp>
 #include <apps/openmw/mwbase/world.hpp>
+#include <apps/openmw/mwworld/esmstore.hpp>
 
 namespace sol
 {
     template <>
-    struct is_automagical<ESM::Potion> : std::false_type {};
+    struct is_automagical<ESM::Potion> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
 {
     void addPotionBindings(sol::table potion, const Context& context)
     {
-        const MWWorld::Store<ESM::Potion>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Potion>();
-        potion["record"] = sol::overload(
-            [](const Object& obj) -> const ESM::Potion* { return obj.ptr().get<ESM::Potion>()->mBase; },
-            [store](const std::string& recordId) -> const ESM::Potion* { return store->find(recordId); });
+        const MWWorld::Store<ESM::Potion>* store
+            = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Potion>();
+        potion["record"]
+            = sol::overload([](const Object& obj) -> const ESM::Potion* { return obj.ptr().get<ESM::Potion>()->mBase; },
+                [store](const std::string& recordId) -> const ESM::Potion* { return store->find(recordId); });
 
         auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
         sol::usertype<ESM::Potion> record = context.mLua->sol().new_usertype<ESM::Potion>("ESM3_Potion");
         record[sol::meta_function::to_string] = [](const ESM::Potion& rec) { return "ESM3_Potion[" + rec.mId + "]"; };
         record["id"] = sol::readonly_property([](const ESM::Potion& rec) -> std::string { return rec.mId; });
         record["name"] = sol::readonly_property([](const ESM::Potion& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Potion& rec) -> std::string
-        {
+        record["model"] = sol::readonly_property([vfs](const ESM::Potion& rec) -> std::string {
             return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
         });
-        record["icon"] = sol::readonly_property([vfs](const ESM::Potion& rec) -> std::string
-        {
+        record["icon"] = sol::readonly_property([vfs](const ESM::Potion& rec) -> std::string {
             return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
         });
         record["mwscript"] = sol::readonly_property([](const ESM::Potion& rec) -> std::string { return rec.mScript; });
diff --git a/apps/openmw/mwlua/types/probe.cpp b/apps/openmw/mwlua/types/probe.cpp
index b7dbcc88b4..77843b76e0 100644
--- a/apps/openmw/mwlua/types/probe.cpp
+++ b/apps/openmw/mwlua/types/probe.cpp
@@ -1,18 +1,20 @@
 #include "types.hpp"
 
 #include <components/esm3/loadprob.hpp>
+#include <components/lua/luastate.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
-#include <components/lua/luastate.hpp>
 
-#include <apps/openmw/mwworld/esmstore.hpp>
 #include <apps/openmw/mwbase/environment.hpp>
 #include <apps/openmw/mwbase/world.hpp>
+#include <apps/openmw/mwworld/esmstore.hpp>
 
 namespace sol
 {
     template <>
-    struct is_automagical<ESM::Probe> : std::false_type {};
+    struct is_automagical<ESM::Probe> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
@@ -22,25 +24,23 @@ namespace MWLua
         auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
         const MWWorld::Store<ESM::Probe>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Probe>();
-        probe["record"] = sol::overload(
-            [](const Object& obj) -> const ESM::Probe* { return obj.ptr().get<ESM::Probe>()->mBase;},
-            [store](const std::string& recordId) -> const ESM::Probe* { return store->find(recordId);});
+        probe["record"]
+            = sol::overload([](const Object& obj) -> const ESM::Probe* { return obj.ptr().get<ESM::Probe>()->mBase; },
+                [store](const std::string& recordId) -> const ESM::Probe* { return store->find(recordId); });
         sol::usertype<ESM::Probe> record = context.mLua->sol().new_usertype<ESM::Probe>("ESM3_Probe");
-        record[sol::meta_function::to_string] = [](const ESM::Probe& rec) { return "ESM3_Probe[" + rec.mId + "]";};
-        record["id"] = sol::readonly_property([](const ESM::Probe& rec) -> std::string { return rec.mId;});
-        record["name"] = sol::readonly_property([](const ESM::Probe& rec) -> std::string { return rec.mName;});
-        record["model"] = sol::readonly_property([vfs](const ESM::Probe& rec) -> std::string
-        {
+        record[sol::meta_function::to_string] = [](const ESM::Probe& rec) { return "ESM3_Probe[" + rec.mId + "]"; };
+        record["id"] = sol::readonly_property([](const ESM::Probe& rec) -> std::string { return rec.mId; });
+        record["name"] = sol::readonly_property([](const ESM::Probe& rec) -> std::string { return rec.mName; });
+        record["model"] = sol::readonly_property([vfs](const ESM::Probe& rec) -> std::string {
             return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
         });
-        record["mwscript"] = sol::readonly_property([](const ESM::Probe& rec) -> std::string { return rec.mScript;});
-        record["icon"] = sol::readonly_property([vfs](const ESM::Probe& rec) -> std::string
-        {
+        record["mwscript"] = sol::readonly_property([](const ESM::Probe& rec) -> std::string { return rec.mScript; });
+        record["icon"] = sol::readonly_property([vfs](const ESM::Probe& rec) -> std::string {
             return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
         });
-        record["maxCondition"] = sol::readonly_property([](const ESM::Probe& rec) -> int { return rec.mData.mUses;});
-        record["value"] = sol::readonly_property([](const ESM::Probe& rec) -> int { return rec.mData.mValue;});
-        record["weight"] = sol::readonly_property([](const ESM::Probe& rec) -> float { return rec.mData.mWeight;});
-        record["quality"] = sol::readonly_property([](const ESM::Probe& rec) -> float { return rec.mData.mQuality;});
+        record["maxCondition"] = sol::readonly_property([](const ESM::Probe& rec) -> int { return rec.mData.mUses; });
+        record["value"] = sol::readonly_property([](const ESM::Probe& rec) -> int { return rec.mData.mValue; });
+        record["weight"] = sol::readonly_property([](const ESM::Probe& rec) -> float { return rec.mData.mWeight; });
+        record["quality"] = sol::readonly_property([](const ESM::Probe& rec) -> float { return rec.mData.mQuality; });
     }
 }
diff --git a/apps/openmw/mwlua/types/repair.cpp b/apps/openmw/mwlua/types/repair.cpp
index 88997c2b34..dbf42707b6 100644
--- a/apps/openmw/mwlua/types/repair.cpp
+++ b/apps/openmw/mwlua/types/repair.cpp
@@ -1,18 +1,20 @@
 #include "types.hpp"
 
 #include <components/esm3/loadrepa.hpp>
+#include <components/lua/luastate.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
-#include <components/lua/luastate.hpp>
 
-#include <apps/openmw/mwworld/esmstore.hpp>
 #include <apps/openmw/mwbase/environment.hpp>
 #include <apps/openmw/mwbase/world.hpp>
+#include <apps/openmw/mwworld/esmstore.hpp>
 
 namespace sol
 {
     template <>
-    struct is_automagical<ESM::Repair> : std::false_type {};
+    struct is_automagical<ESM::Repair> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
@@ -21,21 +23,20 @@ namespace MWLua
     {
         auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
-        const MWWorld::Store<ESM::Repair>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Repair>();
-        repair["record"] = sol::overload(
-            [](const Object& obj) -> const ESM::Repair* { return obj.ptr().get<ESM::Repair>()->mBase; },
-            [store](const std::string& recordId) -> const ESM::Repair* { return store->find(recordId); });
+        const MWWorld::Store<ESM::Repair>* store
+            = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Repair>();
+        repair["record"]
+            = sol::overload([](const Object& obj) -> const ESM::Repair* { return obj.ptr().get<ESM::Repair>()->mBase; },
+                [store](const std::string& recordId) -> const ESM::Repair* { return store->find(recordId); });
         sol::usertype<ESM::Repair> record = context.mLua->sol().new_usertype<ESM::Repair>("ESM3_Repair");
         record[sol::meta_function::to_string] = [](const ESM::Repair& rec) { return "ESM3_Repair[" + rec.mId + "]"; };
         record["id"] = sol::readonly_property([](const ESM::Repair& rec) -> std::string { return rec.mId; });
         record["name"] = sol::readonly_property([](const ESM::Repair& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Repair& rec) -> std::string
-        {
+        record["model"] = sol::readonly_property([vfs](const ESM::Repair& rec) -> std::string {
             return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
         });
         record["mwscript"] = sol::readonly_property([](const ESM::Repair& rec) -> std::string { return rec.mScript; });
-        record["icon"] = sol::readonly_property([vfs](const ESM::Repair& rec) -> std::string
-        {
+        record["icon"] = sol::readonly_property([vfs](const ESM::Repair& rec) -> std::string {
             return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
         });
         record["maxCondition"] = sol::readonly_property([](const ESM::Repair& rec) -> int { return rec.mData.mUses; });
diff --git a/apps/openmw/mwlua/types/types.cpp b/apps/openmw/mwlua/types/types.cpp
index b9ddce4a96..8db8612d06 100644
--- a/apps/openmw/mwlua/types/types.cpp
+++ b/apps/openmw/mwlua/types/types.cpp
@@ -9,8 +9,8 @@ namespace MWLua
     {
         // Names of object types in Lua.
         // These names are part of OpenMW Lua API.
-        constexpr std::string_view Actor = "Actor";  // base type for NPC, Creature, Player
-        constexpr std::string_view Item = "Item";  // base type for all items
+        constexpr std::string_view Actor = "Actor"; // base type for NPC, Creature, Player
+        constexpr std::string_view Item = "Item"; // base type for all items
 
         constexpr std::string_view Activator = "Activator";
         constexpr std::string_view Armor = "Armor";
@@ -37,26 +37,26 @@ namespace MWLua
     namespace
     {
         const static std::unordered_map<ESM::RecNameInts, std::string_view> luaObjectTypeInfo = {
-            {ESM::REC_INTERNAL_PLAYER, ObjectTypeName::Player},
-            {ESM::REC_INTERNAL_MARKER, ObjectTypeName::Marker},
-            {ESM::REC_ACTI, ObjectTypeName::Activator},
-            {ESM::REC_ARMO, ObjectTypeName::Armor},
-            {ESM::REC_BOOK, ObjectTypeName::Book},
-            {ESM::REC_CLOT, ObjectTypeName::Clothing},
-            {ESM::REC_CONT, ObjectTypeName::Container},
-            {ESM::REC_CREA, ObjectTypeName::Creature},
-            {ESM::REC_DOOR, ObjectTypeName::Door},
-            {ESM::REC_INGR, ObjectTypeName::Ingredient},
-            {ESM::REC_LIGH, ObjectTypeName::Light},
-            {ESM::REC_MISC, ObjectTypeName::MiscItem},
-            {ESM::REC_NPC_, ObjectTypeName::NPC},
-            {ESM::REC_ALCH, ObjectTypeName::Potion},
-            {ESM::REC_STAT, ObjectTypeName::Static},
-            {ESM::REC_WEAP, ObjectTypeName::Weapon},
-            {ESM::REC_APPA, ObjectTypeName::Apparatus},
-            {ESM::REC_LOCK, ObjectTypeName::Lockpick},
-            {ESM::REC_PROB, ObjectTypeName::Probe},
-            {ESM::REC_REPA, ObjectTypeName::Repair},
+            { ESM::REC_INTERNAL_PLAYER, ObjectTypeName::Player },
+            { ESM::REC_INTERNAL_MARKER, ObjectTypeName::Marker },
+            { ESM::REC_ACTI, ObjectTypeName::Activator },
+            { ESM::REC_ARMO, ObjectTypeName::Armor },
+            { ESM::REC_BOOK, ObjectTypeName::Book },
+            { ESM::REC_CLOT, ObjectTypeName::Clothing },
+            { ESM::REC_CONT, ObjectTypeName::Container },
+            { ESM::REC_CREA, ObjectTypeName::Creature },
+            { ESM::REC_DOOR, ObjectTypeName::Door },
+            { ESM::REC_INGR, ObjectTypeName::Ingredient },
+            { ESM::REC_LIGH, ObjectTypeName::Light },
+            { ESM::REC_MISC, ObjectTypeName::MiscItem },
+            { ESM::REC_NPC_, ObjectTypeName::NPC },
+            { ESM::REC_ALCH, ObjectTypeName::Potion },
+            { ESM::REC_STAT, ObjectTypeName::Static },
+            { ESM::REC_WEAP, ObjectTypeName::Weapon },
+            { ESM::REC_APPA, ObjectTypeName::Apparatus },
+            { ESM::REC_LOCK, ObjectTypeName::Lockpick },
+            { ESM::REC_PROB, ObjectTypeName::Probe },
+            { ESM::REC_REPA, ObjectTypeName::Repair },
         };
 
     }
@@ -84,7 +84,8 @@ namespace MWLua
 
     std::string_view getLuaObjectTypeName(const MWWorld::Ptr& ptr)
     {
-        return getLuaObjectTypeName(static_cast<ESM::RecNameInts>(getLiveCellRefType(ptr.mRef)), /*fallback=*/ptr.getTypeDescription());
+        return getLuaObjectTypeName(
+            static_cast<ESM::RecNameInts>(getLiveCellRefType(ptr.mRef)), /*fallback=*/ptr.getTypeDescription());
     }
 
     const MWWorld::Ptr& verifyType(ESM::RecNameInts recordType, const MWWorld::Ptr& ptr)
@@ -123,8 +124,7 @@ namespace MWLua
         auto* lua = context.mLua;
         sol::table types(lua->sol(), sol::create);
         auto addType = [&](std::string_view name, std::vector<ESM::RecNameInts> recTypes,
-                           std::optional<std::string_view> base = std::nullopt) -> sol::table
-        {
+                           std::optional<std::string_view> base = std::nullopt) -> sol::table {
             sol::table t(lua->sol(), sol::create);
             sol::table ro = LuaUtil::makeReadOnly(t);
             sol::table meta = ro[sol::metatable_key];
@@ -136,8 +136,7 @@ namespace MWLua
                 baseMeta[sol::meta_function::index] = LuaUtil::getMutableFromReadOnly(types[*base]);
                 t[sol::metatable_key] = baseMeta;
             }
-            t["objectIsInstance"] = [types=recTypes](const Object& o)
-            {
+            t["objectIsInstance"] = [types = recTypes](const Object& o) {
                 unsigned int type = getLiveCellRefType(o.ptr().mRef);
                 for (ESM::RecNameInts t : types)
                     if (t == type)
@@ -148,32 +147,34 @@ namespace MWLua
             return t;
         };
 
-        addActorBindings(addType(ObjectTypeName::Actor, {ESM::REC_INTERNAL_PLAYER, ESM::REC_CREA, ESM::REC_NPC_}), context);
-        addType(ObjectTypeName::Item, {ESM::REC_ARMO, ESM::REC_BOOK, ESM::REC_CLOT, ESM::REC_INGR,
-                                       ESM::REC_LIGH, ESM::REC_MISC, ESM::REC_ALCH, ESM::REC_WEAP,
-                                       ESM::REC_APPA, ESM::REC_LOCK, ESM::REC_PROB, ESM::REC_REPA});
+        addActorBindings(
+            addType(ObjectTypeName::Actor, { ESM::REC_INTERNAL_PLAYER, ESM::REC_CREA, ESM::REC_NPC_ }), context);
+        addType(ObjectTypeName::Item,
+            { ESM::REC_ARMO, ESM::REC_BOOK, ESM::REC_CLOT, ESM::REC_INGR, ESM::REC_LIGH, ESM::REC_MISC, ESM::REC_ALCH,
+                ESM::REC_WEAP, ESM::REC_APPA, ESM::REC_LOCK, ESM::REC_PROB, ESM::REC_REPA });
 
-        addCreatureBindings(addType(ObjectTypeName::Creature, {ESM::REC_CREA}, ObjectTypeName::Actor), context);
-        addNpcBindings(addType(ObjectTypeName::NPC, {ESM::REC_INTERNAL_PLAYER, ESM::REC_NPC_}, ObjectTypeName::Actor), context);
-        addType(ObjectTypeName::Player, {ESM::REC_INTERNAL_PLAYER}, ObjectTypeName::NPC);
+        addCreatureBindings(addType(ObjectTypeName::Creature, { ESM::REC_CREA }, ObjectTypeName::Actor), context);
+        addNpcBindings(
+            addType(ObjectTypeName::NPC, { ESM::REC_INTERNAL_PLAYER, ESM::REC_NPC_ }, ObjectTypeName::Actor), context);
+        addType(ObjectTypeName::Player, { ESM::REC_INTERNAL_PLAYER }, ObjectTypeName::NPC);
 
-        addType(ObjectTypeName::Armor, {ESM::REC_ARMO}, ObjectTypeName::Item);
-        addType(ObjectTypeName::Clothing, {ESM::REC_CLOT}, ObjectTypeName::Item);
+        addType(ObjectTypeName::Armor, { ESM::REC_ARMO }, ObjectTypeName::Item);
+        addType(ObjectTypeName::Clothing, { ESM::REC_CLOT }, ObjectTypeName::Item);
         addIngredientBindings(addType(ObjectTypeName::Ingredient, { ESM::REC_INGR }, ObjectTypeName::Item), context);
-        addType(ObjectTypeName::Light, {ESM::REC_LIGH}, ObjectTypeName::Item);
-        addMiscellaneousBindings(addType(ObjectTypeName::MiscItem, {ESM::REC_MISC}, ObjectTypeName::Item), context);
-        addPotionBindings(addType(ObjectTypeName::Potion, {ESM::REC_ALCH}, ObjectTypeName::Item), context);
-        addWeaponBindings(addType(ObjectTypeName::Weapon, {ESM::REC_WEAP}, ObjectTypeName::Item), context);
-        addBookBindings(addType(ObjectTypeName::Book, {ESM::REC_BOOK}, ObjectTypeName::Item), context);
-        addLockpickBindings(addType(ObjectTypeName::Lockpick, {ESM::REC_LOCK}, ObjectTypeName::Item), context);
-        addProbeBindings(addType(ObjectTypeName::Probe, {ESM::REC_PROB}, ObjectTypeName::Item), context);
-        addApparatusBindings(addType(ObjectTypeName::Apparatus, {ESM::REC_APPA}, ObjectTypeName::Item), context);
-        addRepairBindings(addType(ObjectTypeName::Repair, {ESM::REC_REPA}, ObjectTypeName::Item), context);
-
-        addActivatorBindings(addType(ObjectTypeName::Activator, {ESM::REC_ACTI}), context);
-        addContainerBindings(addType(ObjectTypeName::Container, {ESM::REC_CONT}), context);
-        addDoorBindings(addType(ObjectTypeName::Door, {ESM::REC_DOOR}), context);
-        addType(ObjectTypeName::Static, {ESM::REC_STAT});
+        addType(ObjectTypeName::Light, { ESM::REC_LIGH }, ObjectTypeName::Item);
+        addMiscellaneousBindings(addType(ObjectTypeName::MiscItem, { ESM::REC_MISC }, ObjectTypeName::Item), context);
+        addPotionBindings(addType(ObjectTypeName::Potion, { ESM::REC_ALCH }, ObjectTypeName::Item), context);
+        addWeaponBindings(addType(ObjectTypeName::Weapon, { ESM::REC_WEAP }, ObjectTypeName::Item), context);
+        addBookBindings(addType(ObjectTypeName::Book, { ESM::REC_BOOK }, ObjectTypeName::Item), context);
+        addLockpickBindings(addType(ObjectTypeName::Lockpick, { ESM::REC_LOCK }, ObjectTypeName::Item), context);
+        addProbeBindings(addType(ObjectTypeName::Probe, { ESM::REC_PROB }, ObjectTypeName::Item), context);
+        addApparatusBindings(addType(ObjectTypeName::Apparatus, { ESM::REC_APPA }, ObjectTypeName::Item), context);
+        addRepairBindings(addType(ObjectTypeName::Repair, { ESM::REC_REPA }, ObjectTypeName::Item), context);
+
+        addActivatorBindings(addType(ObjectTypeName::Activator, { ESM::REC_ACTI }), context);
+        addContainerBindings(addType(ObjectTypeName::Container, { ESM::REC_CONT }), context);
+        addDoorBindings(addType(ObjectTypeName::Door, { ESM::REC_DOOR }), context);
+        addType(ObjectTypeName::Static, { ESM::REC_STAT });
 
         sol::table typeToPackage = getTypeToPackageTable(context.mLua->sol());
         sol::table packageToType = getPackageToTypeTable(context.mLua->sol());
diff --git a/apps/openmw/mwlua/types/weapon.cpp b/apps/openmw/mwlua/types/weapon.cpp
index dd12cbc583..1f3ab35c2c 100644
--- a/apps/openmw/mwlua/types/weapon.cpp
+++ b/apps/openmw/mwlua/types/weapon.cpp
@@ -1,18 +1,20 @@
 #include "types.hpp"
 
 #include <components/esm3/loadweap.hpp>
+#include <components/lua/luastate.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
-#include <components/lua/luastate.hpp>
 
-#include <apps/openmw/mwworld/esmstore.hpp>
 #include <apps/openmw/mwbase/environment.hpp>
 #include <apps/openmw/mwbase/world.hpp>
+#include <apps/openmw/mwworld/esmstore.hpp>
 
 namespace sol
 {
     template <>
-    struct is_automagical<ESM::Weapon> : std::false_type {};
+    struct is_automagical<ESM::Weapon> : std::false_type
+    {
+    };
 }
 #include <components/resource/resourcesystem.hpp>
 namespace MWLua
@@ -20,38 +22,38 @@ namespace MWLua
     void addWeaponBindings(sol::table weapon, const Context& context)
     {
         weapon["TYPE"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
-            {"ShortBladeOneHand", ESM::Weapon::ShortBladeOneHand},
-            {"LongBladeOneHand", ESM::Weapon::LongBladeOneHand},
-            {"LongBladeTwoHand", ESM::Weapon::LongBladeTwoHand},
-            {"BluntOneHand", ESM::Weapon::BluntOneHand},
-            {"BluntTwoClose", ESM::Weapon::BluntTwoClose},
-            {"BluntTwoWide", ESM::Weapon::BluntTwoWide},
-            {"SpearTwoWide", ESM::Weapon::SpearTwoWide},
-            {"AxeOneHand", ESM::Weapon::AxeOneHand},
-            {"AxeTwoHand", ESM::Weapon::AxeTwoHand},
-            {"MarksmanBow", ESM::Weapon::MarksmanBow},
-            {"MarksmanCrossbow", ESM::Weapon::MarksmanCrossbow},
-            {"MarksmanThrown", ESM::Weapon::MarksmanThrown},
-            {"Arrow", ESM::Weapon::Arrow},
-            {"Bolt", ESM::Weapon::Bolt},
+            { "ShortBladeOneHand", ESM::Weapon::ShortBladeOneHand },
+            { "LongBladeOneHand", ESM::Weapon::LongBladeOneHand },
+            { "LongBladeTwoHand", ESM::Weapon::LongBladeTwoHand },
+            { "BluntOneHand", ESM::Weapon::BluntOneHand },
+            { "BluntTwoClose", ESM::Weapon::BluntTwoClose },
+            { "BluntTwoWide", ESM::Weapon::BluntTwoWide },
+            { "SpearTwoWide", ESM::Weapon::SpearTwoWide },
+            { "AxeOneHand", ESM::Weapon::AxeOneHand },
+            { "AxeTwoHand", ESM::Weapon::AxeTwoHand },
+            { "MarksmanBow", ESM::Weapon::MarksmanBow },
+            { "MarksmanCrossbow", ESM::Weapon::MarksmanCrossbow },
+            { "MarksmanThrown", ESM::Weapon::MarksmanThrown },
+            { "Arrow", ESM::Weapon::Arrow },
+            { "Bolt", ESM::Weapon::Bolt },
         }));
 
         auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
-        const MWWorld::Store<ESM::Weapon>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Weapon>();
-        weapon["record"] = sol::overload(
-            [](const Object& obj) -> const ESM::Weapon* { return obj.ptr().get<ESM::Weapon>()->mBase; },
-            [store](const std::string& recordId) -> const ESM::Weapon* { return store->find(recordId); });
+        const MWWorld::Store<ESM::Weapon>* store
+            = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Weapon>();
+        weapon["record"]
+            = sol::overload([](const Object& obj) -> const ESM::Weapon* { return obj.ptr().get<ESM::Weapon>()->mBase; },
+                [store](const std::string& recordId) -> const ESM::Weapon* { return store->find(recordId); });
         sol::usertype<ESM::Weapon> record = context.mLua->sol().new_usertype<ESM::Weapon>("ESM3_Weapon");
-        record[sol::meta_function::to_string] = [](const ESM::Weapon& rec) -> std::string { return "ESM3_Weapon[" + rec.mId + "]"; };
+        record[sol::meta_function::to_string]
+            = [](const ESM::Weapon& rec) -> std::string { return "ESM3_Weapon[" + rec.mId + "]"; };
         record["id"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mId; });
         record["name"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Weapon& rec) -> std::string
-        {
+        record["model"] = sol::readonly_property([vfs](const ESM::Weapon& rec) -> std::string {
             return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
         });
-        record["icon"] = sol::readonly_property([vfs](const ESM::Weapon& rec) -> std::string
-        {
+        record["icon"] = sol::readonly_property([vfs](const ESM::Weapon& rec) -> std::string {
             return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
         });
         record["enchant"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mEnchant; });
@@ -66,13 +68,20 @@ namespace MWLua
         record["health"] = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mHealth; });
         record["speed"] = sol::readonly_property([](const ESM::Weapon& rec) -> float { return rec.mData.mSpeed; });
         record["reach"] = sol::readonly_property([](const ESM::Weapon& rec) -> float { return rec.mData.mReach; });
-        record["enchantCapacity"] = sol::readonly_property([](const ESM::Weapon& rec) -> float { return rec.mData.mEnchant * 0.1f; });
-        record["chopMinDamage"] = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mChop[0]; });
-        record["chopMaxDamage"] = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mChop[1]; });
-        record["slashMinDamage"] = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mSlash[0]; });
-        record["slashMaxDamage"] = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mSlash[1]; });
-        record["thrustMinDamage"] = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mThrust[0]; });
-        record["thrustMaxDamage"] = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mThrust[1]; });
+        record["enchantCapacity"]
+            = sol::readonly_property([](const ESM::Weapon& rec) -> float { return rec.mData.mEnchant * 0.1f; });
+        record["chopMinDamage"]
+            = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mChop[0]; });
+        record["chopMaxDamage"]
+            = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mChop[1]; });
+        record["slashMinDamage"]
+            = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mSlash[0]; });
+        record["slashMaxDamage"]
+            = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mSlash[1]; });
+        record["thrustMinDamage"]
+            = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mThrust[0]; });
+        record["thrustMaxDamage"]
+            = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mThrust[1]; });
     }
 
 }
diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index 6fe6926489..fdc58554fe 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -1,13 +1,13 @@
-#include <components/lua_ui/util.hpp>
+#include <components/lua_ui/alignment.hpp>
+#include <components/lua_ui/content.hpp>
 #include <components/lua_ui/element.hpp>
 #include <components/lua_ui/layers.hpp>
-#include <components/lua_ui/content.hpp>
 #include <components/lua_ui/registerscriptsettings.hpp>
-#include <components/lua_ui/alignment.hpp>
 #include <components/lua_ui/resources.hpp>
+#include <components/lua_ui/util.hpp>
 
-#include <components/settings/settings.hpp>
 #include <components/misc/strings/format.hpp>
+#include <components/settings/settings.hpp>
 
 #include "context.hpp"
 #include "luamanagerimp.hpp"
@@ -20,116 +20,102 @@ namespace MWLua
     {
         class UiAction final : public LuaManager::Action
         {
-            public:
-                enum Type
-                {
-                    CREATE = 0,
-                    UPDATE,
-                    DESTROY,
-                };
-
-                UiAction(Type type, std::shared_ptr<LuaUi::Element> element, LuaUtil::LuaState* state)
-                    : Action(state)
-                    , mType{ type }
-                    , mElement{ std::move(element) }
-                {}
+        public:
+            enum Type
+            {
+                CREATE = 0,
+                UPDATE,
+                DESTROY,
+            };
 
-                void apply(WorldView&) const override
-                {
-                    try {
-                        switch (mType)
-                        {
-                            case CREATE:
-                                mElement->create();
-                                break;
-                            case UPDATE:
-                                mElement->update();
-                                break;
-                            case DESTROY:
-                                mElement->destroy();
-                                break;
-                        }
-                    }
-                    catch (std::exception&)
-                    {
-                        // prevent any actions on a potentially corrupted widget
-                        mElement->mRoot = nullptr;
-                        throw;
-                    }
-                }
+            UiAction(Type type, std::shared_ptr<LuaUi::Element> element, LuaUtil::LuaState* state)
+                : Action(state)
+                , mType{ type }
+                , mElement{ std::move(element) }
+            {
+            }
 
-                std::string toString() const override
+            void apply(WorldView&) const override
+            {
+                try
                 {
-                    std::string result;
                     switch (mType)
                     {
                         case CREATE:
-                            result += "Create";
+                            mElement->create();
                             break;
                         case UPDATE:
-                            result += "Update";
+                            mElement->update();
                             break;
                         case DESTROY:
-                            result += "Destroy";
+                            mElement->destroy();
                             break;
                     }
-                    result += " UI";
-                    return result;
                 }
+                catch (std::exception&)
+                {
+                    // prevent any actions on a potentially corrupted widget
+                    mElement->mRoot = nullptr;
+                    throw;
+                }
+            }
+
+            std::string toString() const override
+            {
+                std::string result;
+                switch (mType)
+                {
+                    case CREATE:
+                        result += "Create";
+                        break;
+                    case UPDATE:
+                        result += "Update";
+                        break;
+                    case DESTROY:
+                        result += "Destroy";
+                        break;
+                }
+                result += " UI";
+                return result;
+            }
 
-            private:
-                Type mType;
-                std::shared_ptr<LuaUi::Element> mElement;
+        private:
+            Type mType;
+            std::shared_ptr<LuaUi::Element> mElement;
         };
 
         // Lua arrays index from 1
-        inline size_t fromLuaIndex(size_t i) { return i - 1; }
-        inline size_t toLuaIndex(size_t i) { return i + 1; }
+        inline size_t fromLuaIndex(size_t i)
+        {
+            return i - 1;
+        }
+        inline size_t toLuaIndex(size_t i)
+        {
+            return i + 1;
+        }
     }
 
     sol::table initUserInterfacePackage(const Context& context)
     {
         auto uiContent = context.mLua->sol().new_usertype<LuaUi::Content>("UiContent");
-        uiContent[sol::meta_function::length] = [](const LuaUi::Content& content)
-        {
-            return content.size();
-        };
-        uiContent[sol::meta_function::index] = sol::overload(
-            [](const LuaUi::Content& content, size_t index)
-            {
-                return content.at(fromLuaIndex(index));
-            },
-            [](const LuaUi::Content& content, std::string_view name)
-            {
-                return content.at(name);
-            });
-        uiContent[sol::meta_function::new_index] = sol::overload(
-            [](LuaUi::Content& content, size_t index, const sol::table& table)
-            {
-                content.assign(fromLuaIndex(index), table);
-            },
-            [](LuaUi::Content& content, size_t index, sol::nil_t nil)
-            {
-                content.remove(fromLuaIndex(index));
-            },
-            [](LuaUi::Content& content, std::string_view name, const sol::table& table)
-            {
-                content.assign(name, table);
-            },
-            [](LuaUi::Content& content, std::string_view name, sol::nil_t nil)
-            {
-                content.remove(name);
-            });
-        uiContent["insert"] = [](LuaUi::Content& content, size_t index, const sol::table& table)
-        {
+        uiContent[sol::meta_function::length] = [](const LuaUi::Content& content) { return content.size(); };
+        uiContent[sol::meta_function::index]
+            = sol::overload([](const LuaUi::Content& content, size_t index) { return content.at(fromLuaIndex(index)); },
+                [](const LuaUi::Content& content, std::string_view name) { return content.at(name); });
+        uiContent[sol::meta_function::new_index]
+            = sol::overload([](LuaUi::Content& content, size_t index,
+                                const sol::table& table) { content.assign(fromLuaIndex(index), table); },
+                [](LuaUi::Content& content, size_t index, sol::nil_t nil) { content.remove(fromLuaIndex(index)); },
+                [](LuaUi::Content& content, std::string_view name, const sol::table& table) {
+                    content.assign(name, table);
+                },
+                [](LuaUi::Content& content, std::string_view name, sol::nil_t nil) { content.remove(name); });
+        uiContent["insert"] = [](LuaUi::Content& content, size_t index, const sol::table& table) {
             content.insert(fromLuaIndex(index), table);
         };
-        uiContent["add"] = [](LuaUi::Content& content, const sol::table& table)
-        {
-            content.insert(content.size(), table);
-        };
-        uiContent["indexOf"] = [](LuaUi::Content& content, const sol::table& table) -> sol::optional<size_t>
-        {
+        uiContent["add"]
+            = [](LuaUi::Content& content, const sol::table& table) { content.insert(content.size(), table); };
+        uiContent["indexOf"] = [](LuaUi::Content& content, const sol::table& table) -> sol::optional<size_t> {
             size_t index = content.indexOf(table);
             if (index < content.size())
                 return toLuaIndex(index);
@@ -137,10 +123,8 @@ namespace MWLua
                 return sol::nullopt;
         };
         {
-            auto pairs = [](LuaUi::Content& content)
-            {
-                auto next = [](LuaUi::Content& content, size_t i) -> sol::optional<std::tuple<size_t, sol::table>>
-                {
+            auto pairs = [](LuaUi::Content& content) {
+                auto next = [](LuaUi::Content& content, size_t i) -> sol::optional<std::tuple<size_t, sol::table>> {
                     if (i < content.size())
                         return std::make_tuple(i + 1, content.at(i));
                     else
@@ -153,25 +137,15 @@ namespace MWLua
         }
 
         auto element = context.mLua->sol().new_usertype<LuaUi::Element>("Element");
-        element["layout"] = sol::property(
-            [](LuaUi::Element& element)
-            {
-                return element.mLayout;
-            },
-            [](LuaUi::Element& element, const sol::table& layout)
-            {
-                element.mLayout = layout;
-            }
-        );
-        element["update"] = [context](const std::shared_ptr<LuaUi::Element>& element)
-        {
+        element["layout"] = sol::property([](LuaUi::Element& element) { return element.mLayout; },
+            [](LuaUi::Element& element, const sol::table& layout) { element.mLayout = layout; });
+        element["update"] = [context](const std::shared_ptr<LuaUi::Element>& element) {
             if (element->mDestroy || element->mUpdate)
                 return;
             element->mUpdate = true;
             context.mLuaManager->addAction(std::make_unique<UiAction>(UiAction::UPDATE, element, context.mLua));
         };
-        element["destroy"] = [context](const std::shared_ptr<LuaUi::Element>& element)
-        {
+        element["destroy"] = [context](const std::shared_ptr<LuaUi::Element>& element) {
             if (element->mDestroy)
                 return;
             element->mDestroy = true;
@@ -179,88 +153,66 @@ namespace MWLua
         };
 
         sol::table api = context.mLua->newTable();
-        api["showMessage"] = [luaManager=context.mLuaManager](std::string_view message)
-        {
-            luaManager->addUIMessage(message);
-        };
+        api["showMessage"]
+            = [luaManager = context.mLuaManager](std::string_view message) { luaManager->addUIMessage(message); };
         api["CONSOLE_COLOR"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string, Misc::Color>({
-            {"Default", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Default.substr(1))},
-            {"Error", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Error.substr(1))},
-            {"Success", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Success.substr(1))},
-            {"Info", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Info.substr(1))},
+            { "Default", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Default.substr(1)) },
+            { "Error", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Error.substr(1)) },
+            { "Success", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Success.substr(1)) },
+            { "Info", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Info.substr(1)) },
         }));
-        api["printToConsole"] = [luaManager=context.mLuaManager](const std::string& message, const Misc::Color& color)
-        {
-            luaManager->addInGameConsoleMessage(message + "\n", color);
-        };
-        api["setConsoleMode"] = [luaManager=context.mLuaManager](std::string_view mode)
-        {
+        api["printToConsole"]
+            = [luaManager = context.mLuaManager](const std::string& message, const Misc::Color& color) {
+                  luaManager->addInGameConsoleMessage(message + "\n", color);
+              };
+        api["setConsoleMode"] = [luaManager = context.mLuaManager](std::string_view mode) {
             luaManager->addAction(
-                [mode = std::string(mode)]{ MWBase::Environment::get().getWindowManager()->setConsoleMode(mode); });
+                [mode = std::string(mode)] { MWBase::Environment::get().getWindowManager()->setConsoleMode(mode); });
         };
-        api["setConsoleSelectedObject"] = [luaManager=context.mLuaManager](const sol::object& obj)
-        {
+        api["setConsoleSelectedObject"] = [luaManager = context.mLuaManager](const sol::object& obj) {
             const auto wm = MWBase::Environment::get().getWindowManager();
             if (obj == sol::nil)
-                luaManager->addAction([wm]{ wm->setConsoleSelectedObject(MWWorld::Ptr()); });
+                luaManager->addAction([wm] { wm->setConsoleSelectedObject(MWWorld::Ptr()); });
             else
             {
                 if (!obj.is<LObject>())
                     throw std::runtime_error("Game object expected");
-                luaManager->addAction([wm, obj=obj.as<LObject>()]{ wm->setConsoleSelectedObject(obj.ptr()); });
+                luaManager->addAction([wm, obj = obj.as<LObject>()] { wm->setConsoleSelectedObject(obj.ptr()); });
             }
         };
-        api["content"] = [](const sol::table& table)
-        {
-            return LuaUi::Content(table);
-        };
-        api["create"] = [context](const sol::table& layout)
-        {
+        api["content"] = [](const sol::table& table) { return LuaUi::Content(table); };
+        api["create"] = [context](const sol::table& layout) {
             auto element = LuaUi::Element::make(layout);
             context.mLuaManager->addAction(std::make_unique<UiAction>(UiAction::CREATE, element, context.mLua));
             return element;
         };
-        api["updateAll"] = [context]()
-        {
+        api["updateAll"] = [context]() {
             LuaUi::Element::forEach([](LuaUi::Element* e) { e->mUpdate = true; });
-            context.mLuaManager->addAction([]()
-            {
-                LuaUi::Element::forEach([](LuaUi::Element* e) { e->update(); });
-            }, "Update all UI elements");
-        };
-        api["_getMenuTransparency"] = []()
-        {
-            return Settings::Manager::getFloat("menu transparency", "GUI");
+            context.mLuaManager->addAction(
+                []() { LuaUi::Element::forEach([](LuaUi::Element* e) { e->update(); }); }, "Update all UI elements");
         };
+        api["_getMenuTransparency"] = []() { return Settings::Manager::getFloat("menu transparency", "GUI"); };
 
         auto uiLayer = context.mLua->sol().new_usertype<LuaUi::Layer>("UiLayer");
         uiLayer["name"] = sol::property([](LuaUi::Layer& self) { return self.name(); });
         uiLayer["size"] = sol::property([](LuaUi::Layer& self) { return self.size(); });
-        uiLayer[sol::meta_function::to_string] = [](LuaUi::Layer& self)
-        {
-            return Misc::StringUtils::format("UiLayer(%s)", self.name());
-        };
+        uiLayer[sol::meta_function::to_string]
+            = [](LuaUi::Layer& self) { return Misc::StringUtils::format("UiLayer(%s)", self.name()); };
 
         sol::table layers = context.mLua->newTable();
-        layers[sol::meta_function::length] = []()
-        {
-            return LuaUi::Layer::count();
-        };
-        layers[sol::meta_function::index] = [](size_t index)
-        {
+        layers[sol::meta_function::length] = []() { return LuaUi::Layer::count(); };
+        layers[sol::meta_function::index] = [](size_t index) {
             index = fromLuaIndex(index);
             return LuaUi::Layer(index);
         };
-        layers["indexOf"] = [](std::string_view name) -> sol::optional<size_t>
-        {
+        layers["indexOf"] = [](std::string_view name) -> sol::optional<size_t> {
             size_t index = LuaUi::Layer::indexOf(name);
             if (index == LuaUi::Layer::count())
                 return sol::nullopt;
             else
                 return toLuaIndex(index);
         };
-        layers["insertAfter"] = [context](std::string_view afterName, std::string_view name, const sol::object& opt)
-        {
+        layers["insertAfter"] = [context](std::string_view afterName, std::string_view name, const sol::object& opt) {
             LuaUi::Layer::Options options;
             options.mInteractive = LuaUtil::getValueOrDefault(LuaUtil::getFieldOrNil(opt, "interactive"), true);
             size_t index = LuaUi::Layer::indexOf(afterName);
@@ -269,8 +221,7 @@ namespace MWLua
             index++;
             context.mLuaManager->addAction([=]() { LuaUi::Layer::insert(index, name, options); }, "Insert UI layer");
         };
-        layers["insertBefore"] = [context](std::string_view beforename, std::string_view name, const sol::object& opt)
-        {
+        layers["insertBefore"] = [context](std::string_view beforename, std::string_view name, const sol::object& opt) {
             LuaUi::Layer::Options options;
             options.mInteractive = LuaUtil::getValueOrDefault(LuaUtil::getFieldOrNil(opt, "interactive"), true);
             size_t index = LuaUi::Layer::indexOf(beforename);
@@ -279,10 +230,8 @@ namespace MWLua
             context.mLuaManager->addAction([=]() { LuaUi::Layer::insert(index, name, options); }, "Insert UI layer");
         };
         {
-            auto pairs = [layers](const sol::object&)
-            {
-                auto next = [](const sol::table& l, size_t i) -> sol::optional<std::tuple<size_t, LuaUi::Layer>>
-                {
+            auto pairs = [layers](const sol::object&) {
+                auto next = [](const sol::table& l, size_t i) -> sol::optional<std::tuple<size_t, LuaUi::Layer>> {
                     if (i < LuaUi::Layer::count())
                         return std::make_tuple(i + 1, LuaUi::Layer(i));
                     else
@@ -300,16 +249,13 @@ namespace MWLua
             typeTable.set(it.second, it.first);
         api["TYPE"] = LuaUtil::makeStrictReadOnly(typeTable);
 
-        api["ALIGNMENT"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, LuaUi::Alignment>({
-            { "Start", LuaUi::Alignment::Start },
-            { "Center", LuaUi::Alignment::Center },
-            { "End", LuaUi::Alignment::End }
-        }));
+        api["ALIGNMENT"] = LuaUtil::makeStrictReadOnly(
+            context.mLua->tableFromPairs<std::string_view, LuaUi::Alignment>({ { "Start", LuaUi::Alignment::Start },
+                { "Center", LuaUi::Alignment::Center }, { "End", LuaUi::Alignment::End } }));
 
         api["registerSettingsPage"] = &LuaUi::registerSettingsPage;
 
-        api["texture"] = [luaManager=context.mLuaManager](const sol::table& options)
-        {
+        api["texture"] = [luaManager = context.mLuaManager](const sol::table& options) {
             LuaUi::TextureData data;
             sol::object path = LuaUtil::getFieldOrNil(options, "path");
             if (path.is<std::string>())
@@ -325,12 +271,9 @@ namespace MWLua
             return luaManager->uiResourceManager()->registerTexture(data);
         };
 
-        api["screenSize"] = []()
-        {
+        api["screenSize"] = []() {
             return osg::Vec2f(
-                Settings::Manager::getInt("resolution x", "Video"),
-                Settings::Manager::getInt("resolution y", "Video")
-            );
+                Settings::Manager::getInt("resolution x", "Video"), Settings::Manager::getInt("resolution y", "Video"));
         };
 
         return LuaUtil::makeReadOnly(api);
diff --git a/apps/openmw/mwlua/userdataserializer.cpp b/apps/openmw/mwlua/userdataserializer.cpp
index 3aabbfe0ac..9640a05625 100644
--- a/apps/openmw/mwlua/userdataserializer.cpp
+++ b/apps/openmw/mwlua/userdataserializer.cpp
@@ -12,7 +12,11 @@ namespace MWLua
     {
     public:
         explicit Serializer(bool localSerializer, ObjectRegistry* registry, std::map<int, int>* contentFileMapping)
-            : mLocalSerializer(localSerializer), mObjectRegistry(registry), mContentFileMapping(contentFileMapping) {}
+            : mLocalSerializer(localSerializer)
+            , mObjectRegistry(registry)
+            , mContentFileMapping(contentFileMapping)
+        {
+        }
 
     private:
         // Appends serialized sol::userdata to the end of BinaryData.
@@ -27,8 +31,8 @@ namespace MWLua
             return false;
         }
 
-        // Deserializes userdata of type "typeName" from binaryData. Should push the result on stack using sol::stack::push.
-        // Returns false if this type is not supported by this serializer.
+        // Deserializes userdata of type "typeName" from binaryData. Should push the result on stack using
+        // sol::stack::push. Returns false if this type is not supported by this serializer.
         bool deserialize(std::string_view typeName, std::string_view binaryData, lua_State* lua) const override
         {
             if (typeName == sRefNumTypeName)
diff --git a/apps/openmw/mwlua/worldview.cpp b/apps/openmw/mwlua/worldview.cpp
index e1bf3002a7..49b28226d2 100644
--- a/apps/openmw/mwlua/worldview.cpp
+++ b/apps/openmw/mwlua/worldview.cpp
@@ -8,9 +8,9 @@
 
 #include "../mwclass/container.hpp"
 
+#include "../mwworld/cellutils.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/timestamp.hpp"
-#include "../mwworld/cellutils.hpp"
 
 namespace MWLua
 {
@@ -122,7 +122,8 @@ namespace MWLua
         group.mChanged = true;
     }
 
-    // TODO: If Lua scripts will use several threads at the same time, then `find*Cell` functions should have critical sections.
+    // TODO: If Lua scripts will use several threads at the same time, then `find*Cell` functions should have critical
+    // sections.
     MWWorld::CellStore* WorldView::findCell(const std::string& name, osg::Vec3f position)
     {
         MWBase::World* world = MWBase::Environment::get().getWorld();
diff --git a/apps/openmw/mwlua/worldview.hpp b/apps/openmw/mwlua/worldview.hpp
index 181a73c0b0..8c5127b6f6 100644
--- a/apps/openmw/mwlua/worldview.hpp
+++ b/apps/openmw/mwlua/worldview.hpp
@@ -21,8 +21,8 @@ namespace MWLua
     class WorldView
     {
     public:
-        void update();  // Should be called every frame.
-        void clear();  // Should be called every time before starting or loading a new game.
+        void update(); // Should be called every frame.
+        void clear(); // Should be called every time before starting or loading a new game.
 
         // Whether the world is paused (i.e. game time is not changing and actors don't move).
         bool isPaused() const { return mPaused; }
diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index 6d61b59553..8cfce2db7e 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -4,15 +4,15 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/misc/rng.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/misc/rng.hpp>
 
 #include <components/misc/strings/algorithm.hpp>
 
-#include <components/esm3/loadmgef.hpp>
-#include <components/esm3/loadstat.hpp>
 #include <components/esm3/loadench.hpp>
+#include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadstat.hpp>
 
 #include <components/settings/settings.hpp>
 
@@ -27,8 +27,8 @@
 
 #include "../mwrender/animation.hpp"
 
-#include "../mwworld/esmstore.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
 
 namespace
@@ -36,20 +36,22 @@ namespace
     bool merge(std::vector<ESM::ActiveEffect>& present, const std::vector<ESM::ActiveEffect>& queued)
     {
         // Can't merge if we already have an effect with the same effect index
-        auto problem = std::find_if(queued.begin(), queued.end(), [&] (const auto& qEffect)
-        {
-            return std::find_if(present.begin(), present.end(), [&] (const auto& pEffect) { return pEffect.mEffectIndex == qEffect.mEffectIndex; }) != present.end();
+        auto problem = std::find_if(queued.begin(), queued.end(), [&](const auto& qEffect) {
+            return std::find_if(present.begin(), present.end(), [&](const auto& pEffect) {
+                return pEffect.mEffectIndex == qEffect.mEffectIndex;
+            }) != present.end();
         });
-        if(problem != queued.end())
+        if (problem != queued.end())
             return false;
         present.insert(present.end(), queued.begin(), queued.end());
         return true;
     }
 
-    void addEffects(std::vector<ESM::ActiveEffect>& effects, const ESM::EffectList& list, bool ignoreResistances = false)
+    void addEffects(
+        std::vector<ESM::ActiveEffect>& effects, const ESM::EffectList& list, bool ignoreResistances = false)
     {
         int currentEffectIndex = 0;
-        for(const auto& enam : list.mList)
+        for (const auto& enam : list.mList)
         {
             ESM::ActiveEffect effect;
             effect.mEffectId = enam.mEffectID;
@@ -59,7 +61,7 @@ namespace
             effect.mMaxMagnitude = enam.mMagnMax;
             effect.mEffectIndex = currentEffectIndex++;
             effect.mFlags = ESM::ActiveEffect::Flag_None;
-            if(ignoreResistances)
+            if (ignoreResistances)
                 effect.mFlags |= ESM::ActiveEffect::Flag_Ignore_Resistances;
             effect.mDuration = -1;
             effect.mTimeLeft = -1;
@@ -70,7 +72,8 @@ namespace
 
 namespace MWMechanics
 {
-    ActiveSpells::IterationGuard::IterationGuard(ActiveSpells& spells) : mActiveSpells(spells)
+    ActiveSpells::IterationGuard::IterationGuard(ActiveSpells& spells)
+        : mActiveSpells(spells)
     {
         mActiveSpells.mIterating = true;
     }
@@ -81,38 +84,65 @@ namespace MWMechanics
     }
 
     ActiveSpells::ActiveSpellParams::ActiveSpellParams(const CastSpell& cast, const MWWorld::Ptr& caster)
-    : mId(cast.mId), mDisplayName(cast.mSourceName), mCasterActorId(-1), mSlot(cast.mSlot), mType(cast.mType), mWorsenings(-1)
+        : mId(cast.mId)
+        , mDisplayName(cast.mSourceName)
+        , mCasterActorId(-1)
+        , mSlot(cast.mSlot)
+        , mType(cast.mType)
+        , mWorsenings(-1)
     {
-        if(!caster.isEmpty() && caster.getClass().isActor())
+        if (!caster.isEmpty() && caster.getClass().isActor())
             mCasterActorId = caster.getClass().getCreatureStats(caster).getActorId();
     }
 
-    ActiveSpells::ActiveSpellParams::ActiveSpellParams(const ESM::Spell* spell, const MWWorld::Ptr& actor, bool ignoreResistances)
-    : mId(spell->mId), mDisplayName(spell->mName), mCasterActorId(actor.getClass().getCreatureStats(actor).getActorId()), mSlot(0)
-    , mType(spell->mData.mType == ESM::Spell::ST_Ability ? ESM::ActiveSpells::Type_Ability : ESM::ActiveSpells::Type_Permanent), mWorsenings(-1)
+    ActiveSpells::ActiveSpellParams::ActiveSpellParams(
+        const ESM::Spell* spell, const MWWorld::Ptr& actor, bool ignoreResistances)
+        : mId(spell->mId)
+        , mDisplayName(spell->mName)
+        , mCasterActorId(actor.getClass().getCreatureStats(actor).getActorId())
+        , mSlot(0)
+        , mType(spell->mData.mType == ESM::Spell::ST_Ability ? ESM::ActiveSpells::Type_Ability
+                                                             : ESM::ActiveSpells::Type_Permanent)
+        , mWorsenings(-1)
     {
         assert(spell->mData.mType != ESM::Spell::ST_Spell && spell->mData.mType != ESM::Spell::ST_Power);
         addEffects(mEffects, spell->mEffects, ignoreResistances);
     }
 
-    ActiveSpells::ActiveSpellParams::ActiveSpellParams(const MWWorld::ConstPtr& item, const ESM::Enchantment* enchantment, int slotIndex, const MWWorld::Ptr& actor)
-    : mId(item.getCellRef().getRefId()), mDisplayName(item.getClass().getName(item)), mCasterActorId(actor.getClass().getCreatureStats(actor).getActorId())
-    , mSlot(slotIndex), mType(ESM::ActiveSpells::Type_Enchantment), mWorsenings(-1)
+    ActiveSpells::ActiveSpellParams::ActiveSpellParams(
+        const MWWorld::ConstPtr& item, const ESM::Enchantment* enchantment, int slotIndex, const MWWorld::Ptr& actor)
+        : mId(item.getCellRef().getRefId())
+        , mDisplayName(item.getClass().getName(item))
+        , mCasterActorId(actor.getClass().getCreatureStats(actor).getActorId())
+        , mSlot(slotIndex)
+        , mType(ESM::ActiveSpells::Type_Enchantment)
+        , mWorsenings(-1)
     {
         assert(enchantment->mData.mType == ESM::Enchantment::ConstantEffect);
         addEffects(mEffects, enchantment->mEffects);
     }
 
     ActiveSpells::ActiveSpellParams::ActiveSpellParams(const ESM::ActiveSpells::ActiveSpellParams& params)
-    : mId(params.mId), mEffects(params.mEffects), mDisplayName(params.mDisplayName), mCasterActorId(params.mCasterActorId)
-    , mSlot(params.mItem.isSet() ? params.mItem.mIndex : 0)
-    , mType(params.mType), mWorsenings(params.mWorsenings), mNextWorsening({params.mNextWorsening})
-    {}
+        : mId(params.mId)
+        , mEffects(params.mEffects)
+        , mDisplayName(params.mDisplayName)
+        , mCasterActorId(params.mCasterActorId)
+        , mSlot(params.mItem.isSet() ? params.mItem.mIndex : 0)
+        , mType(params.mType)
+        , mWorsenings(params.mWorsenings)
+        , mNextWorsening({ params.mNextWorsening })
+    {
+    }
 
     ActiveSpells::ActiveSpellParams::ActiveSpellParams(const ActiveSpellParams& params, const MWWorld::Ptr& actor)
-    : mId(params.mId), mDisplayName(params.mDisplayName), mCasterActorId(actor.getClass().getCreatureStats(actor).getActorId())
-    , mSlot(params.mSlot), mType(params.mType), mWorsenings(-1)
-    {}
+        : mId(params.mId)
+        , mDisplayName(params.mDisplayName)
+        , mCasterActorId(actor.getClass().getCreatureStats(actor).getActorId())
+        , mSlot(params.mSlot)
+        , mType(params.mType)
+        , mWorsenings(-1)
+    {
+    }
 
     ESM::ActiveSpells::ActiveSpellParams ActiveSpells::ActiveSpellParams::toEsm() const
     {
@@ -122,7 +152,7 @@ namespace MWMechanics
         params.mDisplayName = mDisplayName;
         params.mCasterActorId = mCasterActorId;
         params.mItem.unset();
-        if(mSlot)
+        if (mSlot)
         {
             // Note that we're storing the inventory slot as a RefNum instead of an int as a matter of future proofing
             // mSlot needs to be replaced with a RefNum once inventory items get persistent RefNum (#4508 #6148)
@@ -137,7 +167,7 @@ namespace MWMechanics
     void ActiveSpells::ActiveSpellParams::worsen()
     {
         ++mWorsenings;
-        if(!mWorsenings)
+        if (!mWorsenings)
             mNextWorsening = MWBase::Environment::get().getWorld()->getTimeStamp();
         mNextWorsening += CorprusStats::sWorseningPeriod;
     }
@@ -156,25 +186,26 @@ namespace MWMechanics
     {
         const auto& creatureStats = ptr.getClass().getCreatureStats(ptr);
         assert(&creatureStats.getActiveSpells() == this);
-        IterationGuard guard{*this};
+        IterationGuard guard{ *this };
         // Erase no longer active spells and effects
-        for(auto spellIt = mSpells.begin(); spellIt != mSpells.end();)
+        for (auto spellIt = mSpells.begin(); spellIt != mSpells.end();)
         {
-            if(spellIt->mType != ESM::ActiveSpells::Type_Temporary && spellIt->mType != ESM::ActiveSpells::Type_Consumable)
+            if (spellIt->mType != ESM::ActiveSpells::Type_Temporary
+                && spellIt->mType != ESM::ActiveSpells::Type_Consumable)
             {
                 ++spellIt;
                 continue;
             }
             bool removedSpell = false;
-            for(auto effectIt = spellIt->mEffects.begin(); effectIt != spellIt->mEffects.end();)
+            for (auto effectIt = spellIt->mEffects.begin(); effectIt != spellIt->mEffects.end();)
             {
-                if(effectIt->mFlags & ESM::ActiveEffect::Flag_Remove && effectIt->mTimeLeft <= 0.f)
+                if (effectIt->mFlags & ESM::ActiveEffect::Flag_Remove && effectIt->mTimeLeft <= 0.f)
                 {
                     auto effect = *effectIt;
                     effectIt = spellIt->mEffects.erase(effectIt);
                     onMagicEffectRemoved(ptr, *spellIt, effect);
                     removedSpell = applyPurges(ptr, &spellIt, &effectIt);
-                    if(removedSpell)
+                    if (removedSpell)
                         break;
                 }
                 else
@@ -182,55 +213,62 @@ namespace MWMechanics
                     ++effectIt;
                 }
             }
-            if(removedSpell)
+            if (removedSpell)
                 continue;
-            if(spellIt->mEffects.empty())
+            if (spellIt->mEffects.empty())
                 spellIt = mSpells.erase(spellIt);
             else
                 ++spellIt;
         }
 
-        for(const auto& spell : mQueue)
+        for (const auto& spell : mQueue)
             addToSpells(ptr, spell);
         mQueue.clear();
 
         // Vanilla only does this on cell change I think
         const auto& spells = creatureStats.getSpells();
-        for(const ESM::Spell* spell : spells)
+        for (const ESM::Spell* spell : spells)
         {
-            if(spell->mData.mType != ESM::Spell::ST_Spell && spell->mData.mType != ESM::Spell::ST_Power && !isSpellActive(spell->mId))
-                mSpells.emplace_back(ActiveSpellParams{spell, ptr});
+            if (spell->mData.mType != ESM::Spell::ST_Spell && spell->mData.mType != ESM::Spell::ST_Power
+                && !isSpellActive(spell->mId))
+                mSpells.emplace_back(ActiveSpellParams{ spell, ptr });
         }
 
-        if(ptr.getClass().hasInventoryStore(ptr) && !(creatureStats.isDead() && !creatureStats.isDeathAnimationFinished()))
+        if (ptr.getClass().hasInventoryStore(ptr)
+            && !(creatureStats.isDead() && !creatureStats.isDeathAnimationFinished()))
         {
             auto& store = ptr.getClass().getInventoryStore(ptr);
-            if(store.getInvListener() != nullptr)
+            if (store.getInvListener() != nullptr)
             {
                 bool playNonLooping = !store.isFirstEquip();
                 const auto world = MWBase::Environment::get().getWorld();
-                for(int slotIndex = 0; slotIndex < MWWorld::InventoryStore::Slots; slotIndex++)
+                for (int slotIndex = 0; slotIndex < MWWorld::InventoryStore::Slots; slotIndex++)
                 {
                     auto slot = store.getSlot(slotIndex);
-                    if(slot == store.end())
+                    if (slot == store.end())
                         continue;
                     const std::string_view enchantmentId = slot->getClass().getEnchantment(*slot);
-                    if(enchantmentId.empty())
+                    if (enchantmentId.empty())
                         continue;
                     const ESM::Enchantment* enchantment = world->getStore().get<ESM::Enchantment>().find(enchantmentId);
-                    if(enchantment->mData.mType != ESM::Enchantment::ConstantEffect)
+                    if (enchantment->mData.mType != ESM::Enchantment::ConstantEffect)
                         continue;
-                    if(std::find_if(mSpells.begin(), mSpells.end(), [&] (const ActiveSpellParams& params)
-                    {
-                        return params.mSlot == slotIndex && params.mType == ESM::ActiveSpells::Type_Enchantment && params.mId == slot->getCellRef().getRefId();
-                    }) != mSpells.end())
+                    if (std::find_if(mSpells.begin(), mSpells.end(),
+                            [&](const ActiveSpellParams& params) {
+                                return params.mSlot == slotIndex && params.mType == ESM::ActiveSpells::Type_Enchantment
+                                    && params.mId == slot->getCellRef().getRefId();
+                            })
+                        != mSpells.end())
                         continue;
-                    // world->breakInvisibility leads to a stack overflow as it calls this method so just break invisibility manually
+                    // world->breakInvisibility leads to a stack overflow as it calls this method so just break
+                    // invisibility manually
                     purgeEffect(ptr, ESM::MagicEffect::Invisibility);
                     applyPurges(ptr);
-                    const ActiveSpellParams& params = mSpells.emplace_back(ActiveSpellParams{*slot, enchantment, slotIndex, ptr});
-                    for(const auto& effect : params.mEffects)
-                        MWMechanics::playEffects(ptr, *world->getStore().get<ESM::MagicEffect>().find(effect.mEffectId), playNonLooping);
+                    const ActiveSpellParams& params
+                        = mSpells.emplace_back(ActiveSpellParams{ *slot, enchantment, slotIndex, ptr });
+                    for (const auto& effect : params.mEffects)
+                        MWMechanics::playEffects(
+                            ptr, *world->getStore().get<ESM::MagicEffect>().find(effect.mEffectId), playNonLooping);
                 }
             }
         }
@@ -239,88 +277,92 @@ namespace MWMechanics
         bool updatedHitOverlay = false;
         bool updatedEnemy = false;
         // Update effects
-        for(auto spellIt = mSpells.begin(); spellIt != mSpells.end();)
+        for (auto spellIt = mSpells.begin(); spellIt != mSpells.end();)
         {
-            const auto caster = MWBase::Environment::get().getWorld()->searchPtrViaActorId(spellIt->mCasterActorId); //Maybe make this search outside active grid?
+            const auto caster = MWBase::Environment::get().getWorld()->searchPtrViaActorId(
+                spellIt->mCasterActorId); // Maybe make this search outside active grid?
             bool removedSpell = false;
             std::optional<ActiveSpellParams> reflected;
-            for(auto it = spellIt->mEffects.begin(); it != spellIt->mEffects.end();)
+            for (auto it = spellIt->mEffects.begin(); it != spellIt->mEffects.end();)
             {
                 auto result = applyMagicEffect(ptr, caster, *spellIt, *it, duration);
-                if(result.mType == MagicApplicationResult::Type::REFLECTED)
+                if (result.mType == MagicApplicationResult::Type::REFLECTED)
                 {
-                    if(!reflected)
+                    if (!reflected)
                     {
-                        static const bool keepOriginalCaster = Settings::Manager::getBool("classic reflected absorb spells behavior", "Game");
-                        if(keepOriginalCaster)
-                            reflected = {*spellIt, caster};
+                        static const bool keepOriginalCaster
+                            = Settings::Manager::getBool("classic reflected absorb spells behavior", "Game");
+                        if (keepOriginalCaster)
+                            reflected = { *spellIt, caster };
                         else
-                            reflected = {*spellIt, ptr};
+                            reflected = { *spellIt, ptr };
                     }
                     auto& reflectedEffect = reflected->mEffects.emplace_back(*it);
-                    reflectedEffect.mFlags = ESM::ActiveEffect::Flag_Ignore_Reflect | ESM::ActiveEffect::Flag_Ignore_SpellAbsorption;
+                    reflectedEffect.mFlags
+                        = ESM::ActiveEffect::Flag_Ignore_Reflect | ESM::ActiveEffect::Flag_Ignore_SpellAbsorption;
                     it = spellIt->mEffects.erase(it);
                 }
-                else if(result.mType == MagicApplicationResult::Type::REMOVED)
+                else if (result.mType == MagicApplicationResult::Type::REMOVED)
                     it = spellIt->mEffects.erase(it);
                 else
                 {
                     ++it;
-                    if(!updatedEnemy && result.mShowHealth && caster == player && ptr != player)
+                    if (!updatedEnemy && result.mShowHealth && caster == player && ptr != player)
                     {
                         MWBase::Environment::get().getWindowManager()->setEnemy(ptr);
                         updatedEnemy = true;
                     }
-                    if(!updatedHitOverlay && result.mShowHit && ptr == player)
+                    if (!updatedHitOverlay && result.mShowHit && ptr == player)
                     {
                         MWBase::Environment::get().getWindowManager()->activateHitOverlay(false);
                         updatedHitOverlay = true;
                     }
                 }
                 removedSpell = applyPurges(ptr, &spellIt, &it);
-                if(removedSpell)
+                if (removedSpell)
                     break;
             }
-            if(reflected)
+            if (reflected)
             {
-                const ESM::Static* reflectStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find("VFX_Reflect");
+                const ESM::Static* reflectStatic
+                    = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find("VFX_Reflect");
                 MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(ptr);
-                if(animation && !reflectStatic->mModel.empty())
+                if (animation && !reflectStatic->mModel.empty())
                 {
                     const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-                    animation->addEffect(
-                        Misc::ResourceHelpers::correctMeshPath(reflectStatic->mModel, vfs),
+                    animation->addEffect(Misc::ResourceHelpers::correctMeshPath(reflectStatic->mModel, vfs),
                         ESM::MagicEffect::Reflect, false);
                 }
                 caster.getClass().getCreatureStats(caster).getActiveSpells().addSpell(*reflected);
             }
-            if(removedSpell)
+            if (removedSpell)
                 continue;
 
             bool remove = false;
-            if(spellIt->mType == ESM::ActiveSpells::Type_Ability || spellIt->mType == ESM::ActiveSpells::Type_Permanent)
+            if (spellIt->mType == ESM::ActiveSpells::Type_Ability
+                || spellIt->mType == ESM::ActiveSpells::Type_Permanent)
             {
                 try
                 {
                     remove = !spells.hasSpell(spellIt->mId);
                 }
-                catch(const std::runtime_error& e)
+                catch (const std::runtime_error& e)
                 {
                     remove = true;
                     Log(Debug::Error) << "Removing active effect: " << e.what();
                 }
             }
-            else if(spellIt->mType == ESM::ActiveSpells::Type_Enchantment)
+            else if (spellIt->mType == ESM::ActiveSpells::Type_Enchantment)
             {
                 const auto& store = ptr.getClass().getInventoryStore(ptr);
                 auto slot = store.getSlot(spellIt->mSlot);
                 remove = slot == store.end() || slot->getCellRef().getRefId() != spellIt->mId;
             }
-            if(remove)
+            if (remove)
             {
                 auto params = *spellIt;
                 spellIt = mSpells.erase(spellIt);
-                for(const auto& effect : params.mEffects)
+                for (const auto& effect : params.mEffects)
                     onMagicEffectRemoved(ptr, params, effect);
                 applyPurges(ptr, &spellIt);
                 continue;
@@ -331,27 +373,29 @@ namespace MWMechanics
 
     void ActiveSpells::addToSpells(const MWWorld::Ptr& ptr, const ActiveSpellParams& spell)
     {
-        if(spell.mType != ESM::ActiveSpells::Type_Consumable)
+        if (spell.mType != ESM::ActiveSpells::Type_Consumable)
         {
-            auto found = std::find_if(mSpells.begin(), mSpells.end(), [&] (const auto& existing)
-            {
-                return spell.mId == existing.mId && spell.mCasterActorId == existing.mCasterActorId && spell.mSlot == existing.mSlot;
+            auto found = std::find_if(mSpells.begin(), mSpells.end(), [&](const auto& existing) {
+                return spell.mId == existing.mId && spell.mCasterActorId == existing.mCasterActorId
+                    && spell.mSlot == existing.mSlot;
             });
-            if(found != mSpells.end())
+            if (found != mSpells.end())
             {
-                if(merge(found->mEffects, spell.mEffects))
+                if (merge(found->mEffects, spell.mEffects))
                     return;
                 auto params = *found;
                 mSpells.erase(found);
-                for(const auto& effect : params.mEffects)
+                for (const auto& effect : params.mEffects)
                     onMagicEffectRemoved(ptr, params, effect);
             }
         }
         mSpells.emplace_back(spell);
     }
 
-    ActiveSpells::ActiveSpells() : mIterating(false)
-    {}
+    ActiveSpells::ActiveSpells()
+        : mIterating(false)
+    {
+    }
 
     ActiveSpells::TIterator ActiveSpells::begin() const
     {
@@ -365,8 +409,7 @@ namespace MWMechanics
 
     bool ActiveSpells::isSpellActive(std::string_view id) const
     {
-        return std::find_if(mSpells.begin(), mSpells.end(), [&] (const auto& spell)
-        {
+        return std::find_if(mSpells.begin(), mSpells.end(), [&](const auto& spell) {
             return Misc::StringUtils::ciEqual(spell.mId, id);
         }) != mSpells.end();
     }
@@ -378,16 +421,16 @@ namespace MWMechanics
 
     void ActiveSpells::addSpell(const ESM::Spell* spell, const MWWorld::Ptr& actor)
     {
-        mQueue.emplace_back(ActiveSpellParams{spell, actor, true});
+        mQueue.emplace_back(ActiveSpellParams{ spell, actor, true });
     }
 
     void ActiveSpells::purge(ParamsPredicate predicate, const MWWorld::Ptr& ptr)
     {
         assert(&ptr.getClass().getCreatureStats(ptr).getActiveSpells() == this);
         mPurges.emplace(predicate);
-        if(!mIterating)
+        if (!mIterating)
         {
-            IterationGuard guard{*this};
+            IterationGuard guard{ *this };
             applyPurges(ptr);
         }
     }
@@ -396,69 +439,71 @@ namespace MWMechanics
     {
         assert(&ptr.getClass().getCreatureStats(ptr).getActiveSpells() == this);
         mPurges.emplace(predicate);
-        if(!mIterating)
+        if (!mIterating)
         {
-            IterationGuard guard{*this};
+            IterationGuard guard{ *this };
             applyPurges(ptr);
         }
     }
 
-    bool ActiveSpells::applyPurges(const MWWorld::Ptr& ptr, std::list<ActiveSpellParams>::iterator* currentSpell, std::vector<ActiveEffect>::iterator* currentEffect)
+    bool ActiveSpells::applyPurges(const MWWorld::Ptr& ptr, std::list<ActiveSpellParams>::iterator* currentSpell,
+        std::vector<ActiveEffect>::iterator* currentEffect)
     {
         bool removedCurrentSpell = false;
-        while(!mPurges.empty())
+        while (!mPurges.empty())
         {
             auto predicate = mPurges.front();
             mPurges.pop();
-            for(auto spellIt = mSpells.begin(); spellIt != mSpells.end();)
+            for (auto spellIt = mSpells.begin(); spellIt != mSpells.end();)
             {
                 bool isCurrentSpell = currentSpell && *currentSpell == spellIt;
-                std::visit([&] (auto&& variant)
-                {
-                    using T = std::decay_t<decltype(variant)>;
-                    if constexpr (std::is_same_v<T, ParamsPredicate>)
-                    {
-                        if(variant(*spellIt))
+                std::visit(
+                    [&](auto&& variant) {
+                        using T = std::decay_t<decltype(variant)>;
+                        if constexpr (std::is_same_v<T, ParamsPredicate>)
                         {
-                            auto params = *spellIt;
-                            spellIt = mSpells.erase(spellIt);
-                            if(isCurrentSpell)
+                            if (variant(*spellIt))
                             {
-                                *currentSpell = spellIt;
-                                removedCurrentSpell = true;
+                                auto params = *spellIt;
+                                spellIt = mSpells.erase(spellIt);
+                                if (isCurrentSpell)
+                                {
+                                    *currentSpell = spellIt;
+                                    removedCurrentSpell = true;
+                                }
+                                for (const auto& effect : params.mEffects)
+                                    onMagicEffectRemoved(ptr, params, effect);
                             }
-                            for(const auto& effect : params.mEffects)
-                                onMagicEffectRemoved(ptr, params, effect);
+                            else
+                                ++spellIt;
                         }
                         else
-                            ++spellIt;
-                    }
-                    else
-                    {
-                        static_assert(std::is_same_v<T, EffectPredicate>, "Non-exhaustive visitor");
-                        for(auto effectIt = spellIt->mEffects.begin(); effectIt != spellIt->mEffects.end();)
                         {
-                            if(variant(*spellIt, *effectIt))
+                            static_assert(std::is_same_v<T, EffectPredicate>, "Non-exhaustive visitor");
+                            for (auto effectIt = spellIt->mEffects.begin(); effectIt != spellIt->mEffects.end();)
                             {
-                                auto effect = *effectIt;
-                                if(isCurrentSpell && currentEffect)
+                                if (variant(*spellIt, *effectIt))
                                 {
-                                    auto distance = std::distance(spellIt->mEffects.begin(), *currentEffect);
-                                    if(effectIt <= *currentEffect)
-                                        distance--;
-                                    effectIt = spellIt->mEffects.erase(effectIt);
-                                    *currentEffect = spellIt->mEffects.begin() + distance;
+                                    auto effect = *effectIt;
+                                    if (isCurrentSpell && currentEffect)
+                                    {
+                                        auto distance = std::distance(spellIt->mEffects.begin(), *currentEffect);
+                                        if (effectIt <= *currentEffect)
+                                            distance--;
+                                        effectIt = spellIt->mEffects.erase(effectIt);
+                                        *currentEffect = spellIt->mEffects.begin() + distance;
+                                    }
+                                    else
+                                        effectIt = spellIt->mEffects.erase(effectIt);
+                                    onMagicEffectRemoved(ptr, *spellIt, effect);
                                 }
                                 else
-                                    effectIt = spellIt->mEffects.erase(effectIt);
-                                onMagicEffectRemoved(ptr, *spellIt, effect);
+                                    ++effectIt;
                             }
-                            else
-                                ++effectIt;
+                            ++spellIt;
                         }
-                        ++spellIt;
-                    }
-                }, predicate);
+                    },
+                    predicate);
             }
         }
         return removedCurrentSpell;
@@ -466,65 +511,59 @@ namespace MWMechanics
 
     void ActiveSpells::removeEffects(const MWWorld::Ptr& ptr, std::string_view id)
     {
-        purge([=] (const ActiveSpellParams& params)
-        {
-            return params.mId == id;
-        }, ptr);
+        purge([=](const ActiveSpellParams& params) { return params.mId == id; }, ptr);
     }
 
     void ActiveSpells::purgeEffect(const MWWorld::Ptr& ptr, short effectId)
     {
-        purge([=] (const ActiveSpellParams&, const ESM::ActiveEffect& effect)
-        {
-            return effect.mEffectId == effectId;
-        }, ptr);
+        purge([=](const ActiveSpellParams&, const ESM::ActiveEffect& effect) { return effect.mEffectId == effectId; },
+            ptr);
     }
 
     void ActiveSpells::purge(const MWWorld::Ptr& ptr, int casterActorId)
     {
-        purge([=] (const ActiveSpellParams& params)
-        {
-            return params.mCasterActorId == casterActorId;
-        }, ptr);
+        purge([=](const ActiveSpellParams& params) { return params.mCasterActorId == casterActorId; }, ptr);
     }
 
     void ActiveSpells::clear(const MWWorld::Ptr& ptr)
     {
         mQueue.clear();
-        purge([] (const ActiveSpellParams& params) { return true; }, ptr);
+        purge([](const ActiveSpellParams& params) { return true; }, ptr);
     }
 
     void ActiveSpells::skipWorsenings(double hours)
     {
-        for(auto& spell : mSpells)
+        for (auto& spell : mSpells)
         {
-            if(spell.mWorsenings >= 0)
+            if (spell.mWorsenings >= 0)
                 spell.mNextWorsening += hours;
         }
     }
 
-    void ActiveSpells::writeState(ESM::ActiveSpells &state) const
+    void ActiveSpells::writeState(ESM::ActiveSpells& state) const
     {
-        for(const auto& spell : mSpells)
+        for (const auto& spell : mSpells)
             state.mSpells.emplace_back(spell.toEsm());
-        for(const auto& spell : mQueue)
+        for (const auto& spell : mQueue)
             state.mQueue.emplace_back(spell.toEsm());
     }
 
-    void ActiveSpells::readState(const ESM::ActiveSpells &state)
+    void ActiveSpells::readState(const ESM::ActiveSpells& state)
     {
-        for(const ESM::ActiveSpells::ActiveSpellParams& spell : state.mSpells)
-            mSpells.emplace_back(ActiveSpellParams{spell});
-        for(const ESM::ActiveSpells::ActiveSpellParams& spell : state.mQueue)
-            mQueue.emplace_back(ActiveSpellParams{spell});
+        for (const ESM::ActiveSpells::ActiveSpellParams& spell : state.mSpells)
+            mSpells.emplace_back(ActiveSpellParams{ spell });
+        for (const ESM::ActiveSpells::ActiveSpellParams& spell : state.mQueue)
+            mQueue.emplace_back(ActiveSpellParams{ spell });
     }
 
     void ActiveSpells::unloadActor(const MWWorld::Ptr& ptr)
     {
-        purge([] (const auto& spell)
-        {
-            return spell.getType() == ESM::ActiveSpells::Type_Consumable || spell.getType() == ESM::ActiveSpells::Type_Temporary;
-        }, ptr);
+        purge(
+            [](const auto& spell) {
+                return spell.getType() == ESM::ActiveSpells::Type_Consumable
+                    || spell.getType() == ESM::ActiveSpells::Type_Temporary;
+            },
+            ptr);
         mQueue.clear();
     }
 }
diff --git a/apps/openmw/mwmechanics/activespells.hpp b/apps/openmw/mwmechanics/activespells.hpp
index 5481211985..38445a0a7f 100644
--- a/apps/openmw/mwmechanics/activespells.hpp
+++ b/apps/openmw/mwmechanics/activespells.hpp
@@ -10,8 +10,8 @@
 
 #include <components/esm3/activespells.hpp>
 
-#include "../mwworld/timestamp.hpp"
 #include "../mwworld/ptr.hpp"
+#include "../mwworld/timestamp.hpp"
 
 #include "spellcasting.hpp"
 
@@ -29,123 +29,124 @@ namespace MWMechanics
     /// effects.
     class ActiveSpells
     {
-        public:
+    public:
+        using ActiveEffect = ESM::ActiveEffect;
+        class ActiveSpellParams
+        {
+            std::string mId;
+            std::vector<ActiveEffect> mEffects;
+            std::string mDisplayName;
+            int mCasterActorId;
+            int mSlot;
+            ESM::ActiveSpells::EffectType mType;
+            int mWorsenings;
+            MWWorld::TimeStamp mNextWorsening;
 
-            using ActiveEffect = ESM::ActiveEffect;
-            class ActiveSpellParams
-            {
-                    std::string mId;
-                    std::vector<ActiveEffect> mEffects;
-                    std::string mDisplayName;
-                    int mCasterActorId;
-                    int mSlot;
-                    ESM::ActiveSpells::EffectType mType;
-                    int mWorsenings;
-                    MWWorld::TimeStamp mNextWorsening;
+            ActiveSpellParams(const ESM::ActiveSpells::ActiveSpellParams& params);
 
-                    ActiveSpellParams(const ESM::ActiveSpells::ActiveSpellParams& params);
+            ActiveSpellParams(const ESM::Spell* spell, const MWWorld::Ptr& actor, bool ignoreResistances = false);
 
-                    ActiveSpellParams(const ESM::Spell* spell, const MWWorld::Ptr& actor, bool ignoreResistances = false);
+            ActiveSpellParams(const MWWorld::ConstPtr& item, const ESM::Enchantment* enchantment, int slotIndex,
+                const MWWorld::Ptr& actor);
 
-                    ActiveSpellParams(const MWWorld::ConstPtr& item, const ESM::Enchantment* enchantment, int slotIndex, const MWWorld::Ptr& actor);
+            ActiveSpellParams(const ActiveSpellParams& params, const MWWorld::Ptr& actor);
 
-                    ActiveSpellParams(const ActiveSpellParams& params, const MWWorld::Ptr& actor);
+            ESM::ActiveSpells::ActiveSpellParams toEsm() const;
 
-                    ESM::ActiveSpells::ActiveSpellParams toEsm() const;
+            friend class ActiveSpells;
 
-                    friend class ActiveSpells;
-                public:
-                    ActiveSpellParams(const CastSpell& cast, const MWWorld::Ptr& caster);
-
-                    const std::string& getId() const { return mId; }
+        public:
+            ActiveSpellParams(const CastSpell& cast, const MWWorld::Ptr& caster);
 
-                    const std::vector<ActiveEffect>& getEffects() const { return mEffects; }
-                    std::vector<ActiveEffect>& getEffects() { return mEffects; }
+            const std::string& getId() const { return mId; }
 
-                    ESM::ActiveSpells::EffectType getType() const { return mType; }
+            const std::vector<ActiveEffect>& getEffects() const { return mEffects; }
+            std::vector<ActiveEffect>& getEffects() { return mEffects; }
 
-                    int getCasterActorId() const { return mCasterActorId; }
+            ESM::ActiveSpells::EffectType getType() const { return mType; }
 
-                    int getWorsenings() const { return mWorsenings; }
+            int getCasterActorId() const { return mCasterActorId; }
 
-                    const std::string& getDisplayName() const { return mDisplayName; }
+            int getWorsenings() const { return mWorsenings; }
 
-                    // Increments worsenings count and sets the next timestamp
-                    void worsen();
+            const std::string& getDisplayName() const { return mDisplayName; }
 
-                    bool shouldWorsen() const;
+            // Increments worsenings count and sets the next timestamp
+            void worsen();
 
-                    void resetWorsenings();
-            };
+            bool shouldWorsen() const;
 
-            typedef std::list<ActiveSpellParams>::const_iterator TIterator;
+            void resetWorsenings();
+        };
 
-            void readState (const ESM::ActiveSpells& state);
-            void writeState (ESM::ActiveSpells& state) const;
+        typedef std::list<ActiveSpellParams>::const_iterator TIterator;
 
-            TIterator begin() const;
+        void readState(const ESM::ActiveSpells& state);
+        void writeState(ESM::ActiveSpells& state) const;
 
-            TIterator end() const;
+        TIterator begin() const;
 
-            void update(const MWWorld::Ptr& ptr, float duration);
+        TIterator end() const;
 
-        private:
-            using ParamsPredicate = std::function<bool(const ActiveSpellParams&)>;
-            using EffectPredicate = std::function<bool(const ActiveSpellParams&, const ESM::ActiveEffect&)>;
-            using Predicate = std::variant<ParamsPredicate, EffectPredicate>;
+        void update(const MWWorld::Ptr& ptr, float duration);
 
-            struct IterationGuard
-            {
-                ActiveSpells& mActiveSpells;
+    private:
+        using ParamsPredicate = std::function<bool(const ActiveSpellParams&)>;
+        using EffectPredicate = std::function<bool(const ActiveSpellParams&, const ESM::ActiveEffect&)>;
+        using Predicate = std::variant<ParamsPredicate, EffectPredicate>;
 
-                IterationGuard(ActiveSpells& spells);
-                ~IterationGuard();
-            };
+        struct IterationGuard
+        {
+            ActiveSpells& mActiveSpells;
 
-            std::list<ActiveSpellParams> mSpells;
-            std::vector<ActiveSpellParams> mQueue;
-            std::queue<Predicate> mPurges;
-            bool mIterating;
+            IterationGuard(ActiveSpells& spells);
+            ~IterationGuard();
+        };
 
-            void addToSpells(const MWWorld::Ptr& ptr, const ActiveSpellParams& spell);
+        std::list<ActiveSpellParams> mSpells;
+        std::vector<ActiveSpellParams> mQueue;
+        std::queue<Predicate> mPurges;
+        bool mIterating;
 
-            bool applyPurges(const MWWorld::Ptr& ptr, std::list<ActiveSpellParams>::iterator* currentSpell = nullptr, std::vector<ActiveEffect>::iterator* currentEffect = nullptr);
+        void addToSpells(const MWWorld::Ptr& ptr, const ActiveSpellParams& spell);
 
-        public:
+        bool applyPurges(const MWWorld::Ptr& ptr, std::list<ActiveSpellParams>::iterator* currentSpell = nullptr,
+            std::vector<ActiveEffect>::iterator* currentEffect = nullptr);
 
-            ActiveSpells();
+    public:
+        ActiveSpells();
 
-            /// Add lasting effects
-            ///
-            /// \brief addSpell
-            /// \param id ID for stacking purposes.
-            ///
-            void addSpell (const ActiveSpellParams& params);
+        /// Add lasting effects
+        ///
+        /// \brief addSpell
+        /// \param id ID for stacking purposes.
+        ///
+        void addSpell(const ActiveSpellParams& params);
 
-            /// Bypasses resistances
-            void addSpell(const ESM::Spell* spell, const MWWorld::Ptr& actor);
+        /// Bypasses resistances
+        void addSpell(const ESM::Spell* spell, const MWWorld::Ptr& actor);
 
-            /// Removes the active effects from this spell/potion/.. with \a id
-            void removeEffects (const MWWorld::Ptr& ptr, std::string_view id);
+        /// Removes the active effects from this spell/potion/.. with \a id
+        void removeEffects(const MWWorld::Ptr& ptr, std::string_view id);
 
-            /// Remove all active effects with this effect id
-            void purgeEffect (const MWWorld::Ptr& ptr, short effectId);
+        /// Remove all active effects with this effect id
+        void purgeEffect(const MWWorld::Ptr& ptr, short effectId);
 
-            void purge(EffectPredicate predicate, const MWWorld::Ptr& ptr);
-            void purge(ParamsPredicate predicate, const MWWorld::Ptr& ptr);
+        void purge(EffectPredicate predicate, const MWWorld::Ptr& ptr);
+        void purge(ParamsPredicate predicate, const MWWorld::Ptr& ptr);
 
-            /// Remove all effects that were cast by \a casterActorId
-            void purge (const MWWorld::Ptr& ptr, int casterActorId);
+        /// Remove all effects that were cast by \a casterActorId
+        void purge(const MWWorld::Ptr& ptr, int casterActorId);
 
-            /// Remove all spells
-            void clear(const MWWorld::Ptr& ptr);
+        /// Remove all spells
+        void clear(const MWWorld::Ptr& ptr);
 
-            bool isSpellActive (std::string_view id) const;
-            ///< case insensitive
+        bool isSpellActive(std::string_view id) const;
+        ///< case insensitive
 
-            void skipWorsenings(double hours);
+        void skipWorsenings(double hours);
 
-            void unloadActor(const MWWorld::Ptr& ptr);
+        void unloadActor(const MWWorld::Ptr& ptr);
     };
 }
 
diff --git a/apps/openmw/mwmechanics/actor.hpp b/apps/openmw/mwmechanics/actor.hpp
index 1e257f613d..b9f1f97a4b 100644
--- a/apps/openmw/mwmechanics/actor.hpp
+++ b/apps/openmw/mwmechanics/actor.hpp
@@ -29,7 +29,8 @@ namespace MWMechanics
         Actor(const MWWorld::Ptr& ptr, MWRender::Animation* animation)
             : mCharacterController(ptr, animation)
             , mPositionAdjusted(false)
-        {}
+        {
+        }
 
         const MWWorld::Ptr& getPtr() const { return mCharacterController.getPtr(); }
 
@@ -61,11 +62,12 @@ namespace MWMechanics
 
     private:
         CharacterController mCharacterController;
-        int mGreetingTimer{0};
-        float mTargetAngleRadians{0.f};
-        GreetingState mGreetingState{Greet_None};
-        bool mIsTurningToPlayer{false};
-        Misc::DeviatingPeriodicTimer mEngageCombat{1.0f, 0.25f, Misc::Rng::deviate(0, 0.25f, MWBase::Environment::get().getWorld()->getPrng())};
+        int mGreetingTimer{ 0 };
+        float mTargetAngleRadians{ 0.f };
+        GreetingState mGreetingState{ Greet_None };
+        bool mIsTurningToPlayer{ false };
+        Misc::DeviatingPeriodicTimer mEngageCombat{ 1.0f, 0.25f,
+            Misc::Rng::deviate(0, 0.25f, MWBase::Environment::get().getWorld()->getPrng()) };
         bool mPositionAdjusted;
     };
 
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 3a2d9e19db..c0cdceb3f6 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -5,240 +5,244 @@
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/esmwriter.hpp>
 
-#include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/debug/debuglog.hpp>
-#include <components/misc/rng.hpp>
 #include <components/misc/mathutil.hpp>
-#include <components/settings/settings.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/misc/rng.hpp>
+#include <components/sceneutil/positionattitudetransform.hpp>
+#include <components/settings/settings.hpp>
 
-#include <components/esm3/loadmgef.hpp>
-#include <components/esm3/loadgmst.hpp>
 #include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadstat.hpp>
 
-
-#include "../mwworld/esmstore.hpp"
+#include "../mwworld/actionequip.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwworld/actionequip.hpp"
 #include "../mwworld/player.hpp"
 
-#include "../mwbase/world.hpp"
-#include "../mwbase/environment.hpp"
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/dialoguemanager.hpp"
-#include "../mwbase/soundmanager.hpp"
+#include "../mwbase/environment.hpp"
+#include "../mwbase/luamanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/soundmanager.hpp"
 #include "../mwbase/statemanager.hpp"
-#include "../mwbase/luamanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwmechanics/aibreathe.hpp"
 
 #include "../mwrender/vismask.hpp"
 
-#include "spellcasting.hpp"
-#include "steering.hpp"
-#include "npcstats.hpp"
-#include "creaturestats.hpp"
-#include "movement.hpp"
-#include "character.hpp"
+#include "actor.hpp"
+#include "actorutil.hpp"
 #include "aicombat.hpp"
 #include "aicombataction.hpp"
 #include "aifollow.hpp"
 #include "aipursue.hpp"
 #include "aiwander.hpp"
-#include "actor.hpp"
+#include "character.hpp"
+#include "creaturestats.hpp"
+#include "movement.hpp"
+#include "npcstats.hpp"
+#include "spellcasting.hpp"
+#include "steering.hpp"
 #include "summoning.hpp"
-#include "actorutil.hpp"
 
 namespace
 {
 
-bool isConscious(const MWWorld::Ptr& ptr)
-{
-    const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
-    return !stats.isDead() && !stats.getKnockedDown();
-}
+    bool isConscious(const MWWorld::Ptr& ptr)
+    {
+        const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
+        return !stats.isDead() && !stats.getKnockedDown();
+    }
 
-bool isCommanded(const MWWorld::Ptr& actor)
-{
-    const auto& actorClass = actor.getClass();
-    const auto& stats = actorClass.getCreatureStats(actor);
-    const bool isActorNpc = actorClass.isNpc();
-    const auto level = stats.getLevel();
-    for (const auto& params : stats.getActiveSpells())
+    bool isCommanded(const MWWorld::Ptr& actor)
     {
-        for (const auto& effect : params.getEffects())
+        const auto& actorClass = actor.getClass();
+        const auto& stats = actorClass.getCreatureStats(actor);
+        const bool isActorNpc = actorClass.isNpc();
+        const auto level = stats.getLevel();
+        for (const auto& params : stats.getActiveSpells())
         {
-            if (((effect.mEffectId == ESM::MagicEffect::CommandHumanoid && isActorNpc)
-                || (effect.mEffectId == ESM::MagicEffect::CommandCreature && !isActorNpc))
-                && effect.mMagnitude >= level)
-                return true;
+            for (const auto& effect : params.getEffects())
+            {
+                if (((effect.mEffectId == ESM::MagicEffect::CommandHumanoid && isActorNpc)
+                        || (effect.mEffectId == ESM::MagicEffect::CommandCreature && !isActorNpc))
+                    && effect.mMagnitude >= level)
+                    return true;
+            }
         }
+        return false;
     }
-    return false;
-}
 
-// Check for command effects having ended and remove package if necessary
-void adjustCommandedActor (const MWWorld::Ptr& actor)
-{
-    if (isCommanded(actor))
-        return;
+    // Check for command effects having ended and remove package if necessary
+    void adjustCommandedActor(const MWWorld::Ptr& actor)
+    {
+        if (isCommanded(actor))
+            return;
 
-    MWMechanics::CreatureStats& stats = actor.getClass().getCreatureStats(actor);
+        MWMechanics::CreatureStats& stats = actor.getClass().getCreatureStats(actor);
 
-    stats.getAiSequence().erasePackageIf([](auto& entry)
-    {
-        if (entry->getTypeId() == MWMechanics::AiPackageTypeId::Follow &&
-            static_cast<const MWMechanics::AiFollow*>(entry.get())->isCommanded())
-        {
-            return true;
-        }
-        return false;
-    });
-}
+        stats.getAiSequence().erasePackageIf([](auto& entry) {
+            if (entry->getTypeId() == MWMechanics::AiPackageTypeId::Follow
+                && static_cast<const MWMechanics::AiFollow*>(entry.get())->isCommanded())
+            {
+                return true;
+            }
+            return false;
+        });
+    }
 
-std::pair<float, float> getRestorationPerHourOfSleep(const MWWorld::Ptr& ptr)
-{
-    const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats (ptr);
-    const MWWorld::Store<ESM::GameSetting>& settings = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+    std::pair<float, float> getRestorationPerHourOfSleep(const MWWorld::Ptr& ptr)
+    {
+        const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
+        const MWWorld::Store<ESM::GameSetting>& settings
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
-    const float endurance = stats.getAttribute (ESM::Attribute::Endurance).getModified();
-    const float health = 0.1f * endurance;
+        const float endurance = stats.getAttribute(ESM::Attribute::Endurance).getModified();
+        const float health = 0.1f * endurance;
 
-    static const float fRestMagicMult = settings.find("fRestMagicMult")->mValue.getFloat();
-    const float magicka = fRestMagicMult * stats.getAttribute(ESM::Attribute::Intelligence).getModified();
+        static const float fRestMagicMult = settings.find("fRestMagicMult")->mValue.getFloat();
+        const float magicka = fRestMagicMult * stats.getAttribute(ESM::Attribute::Intelligence).getModified();
 
-    return {health, magicka};
-}
+        return { health, magicka };
+    }
 
-template<class T>
-void forEachFollowingPackage(const std::list<MWMechanics::Actor>& actors, const MWWorld::Ptr& actorPtr, const MWWorld::Ptr& player, T&& func)
-{
-    for (const MWMechanics::Actor& actor : actors)
+    template <class T>
+    void forEachFollowingPackage(
+        const std::list<MWMechanics::Actor>& actors, const MWWorld::Ptr& actorPtr, const MWWorld::Ptr& player, T&& func)
     {
-        const MWWorld::Ptr &iteratedActor = actor.getPtr();
-        if (iteratedActor == player || iteratedActor == actorPtr)
-            continue;
+        for (const MWMechanics::Actor& actor : actors)
+        {
+            const MWWorld::Ptr& iteratedActor = actor.getPtr();
+            if (iteratedActor == player || iteratedActor == actorPtr)
+                continue;
 
-        const MWMechanics::CreatureStats &stats = iteratedActor.getClass().getCreatureStats(iteratedActor);
-        if (stats.isDead())
-            continue;
+            const MWMechanics::CreatureStats& stats = iteratedActor.getClass().getCreatureStats(iteratedActor);
+            if (stats.isDead())
+                continue;
 
-        // An actor counts as following if AiFollow is the current AiPackage,
-        // or there are only Combat and Wander packages before the AiFollow package
-        for (const auto& package : stats.getAiSequence())
-        {
-            if (!func(actor, package))
-                break;
+            // An actor counts as following if AiFollow is the current AiPackage,
+            // or there are only Combat and Wander packages before the AiFollow package
+            for (const auto& package : stats.getAiSequence())
+            {
+                if (!func(actor, package))
+                    break;
+            }
         }
     }
-}
 
-float getStuntedMagickaDuration(const MWWorld::Ptr& actor)
-{
-    float remainingTime = 0.f;
-    for(const auto& params : actor.getClass().getCreatureStats(actor).getActiveSpells())
+    float getStuntedMagickaDuration(const MWWorld::Ptr& actor)
     {
-        for(const auto& effect : params.getEffects())
+        float remainingTime = 0.f;
+        for (const auto& params : actor.getClass().getCreatureStats(actor).getActiveSpells())
         {
-            if(effect.mEffectId == ESM::MagicEffect::StuntedMagicka)
+            for (const auto& effect : params.getEffects())
             {
-                if(effect.mDuration == -1.f)
-                    return -1.f;
-                remainingTime = std::max(remainingTime, effect.mTimeLeft);
+                if (effect.mEffectId == ESM::MagicEffect::StuntedMagicka)
+                {
+                    if (effect.mDuration == -1.f)
+                        return -1.f;
+                    remainingTime = std::max(remainingTime, effect.mTimeLeft);
+                }
             }
         }
+        return remainingTime;
     }
-    return remainingTime;
-}
 
-void soulTrap(const MWWorld::Ptr& creature)
-{
-    const auto& stats = creature.getClass().getCreatureStats(creature);
-    if(!stats.getMagicEffects().get(ESM::MagicEffect::Soultrap).getMagnitude())
-        return;
-    const int creatureSoulValue = creature.get<ESM::Creature>()->mBase->mData.mSoul;
-    if (creatureSoulValue == 0)
-        return;
-    MWBase::World* const world = MWBase::Environment::get().getWorld();
-    static const float fSoulgemMult = world->getStore().get<ESM::GameSetting>().find("fSoulgemMult")->mValue.getFloat();
-    for(const auto& params : stats.getActiveSpells())
-    {
-        for(const auto& effect : params.getEffects())
+    void soulTrap(const MWWorld::Ptr& creature)
+    {
+        const auto& stats = creature.getClass().getCreatureStats(creature);
+        if (!stats.getMagicEffects().get(ESM::MagicEffect::Soultrap).getMagnitude())
+            return;
+        const int creatureSoulValue = creature.get<ESM::Creature>()->mBase->mData.mSoul;
+        if (creatureSoulValue == 0)
+            return;
+        MWBase::World* const world = MWBase::Environment::get().getWorld();
+        static const float fSoulgemMult
+            = world->getStore().get<ESM::GameSetting>().find("fSoulgemMult")->mValue.getFloat();
+        for (const auto& params : stats.getActiveSpells())
         {
-            if(effect.mEffectId != ESM::MagicEffect::Soultrap || effect.mMagnitude <= 0.f)
-                continue;
-            MWWorld::Ptr caster = world->searchPtrViaActorId(params.getCasterActorId());
-            if (caster.isEmpty() || !caster.getClass().isActor())
-                continue;
-
-            // Use the smallest soulgem that is large enough to hold the soul
-            MWWorld::ContainerStore& container = caster.getClass().getContainerStore(caster);
-            MWWorld::ContainerStoreIterator gem = container.end();
-            float gemCapacity = std::numeric_limits<float>::max();
-            for (auto it = container.begin(MWWorld::ContainerStore::Type_Miscellaneous); it != container.end(); ++it)
+            for (const auto& effect : params.getEffects())
             {
-                if (it->getClass().isSoulGem(*it))
+                if (effect.mEffectId != ESM::MagicEffect::Soultrap || effect.mMagnitude <= 0.f)
+                    continue;
+                MWWorld::Ptr caster = world->searchPtrViaActorId(params.getCasterActorId());
+                if (caster.isEmpty() || !caster.getClass().isActor())
+                    continue;
+
+                // Use the smallest soulgem that is large enough to hold the soul
+                MWWorld::ContainerStore& container = caster.getClass().getContainerStore(caster);
+                MWWorld::ContainerStoreIterator gem = container.end();
+                float gemCapacity = std::numeric_limits<float>::max();
+                for (auto it = container.begin(MWWorld::ContainerStore::Type_Miscellaneous); it != container.end();
+                     ++it)
                 {
-                    float thisGemCapacity = it->get<ESM::Miscellaneous>()->mBase->mData.mValue * fSoulgemMult;
-                    if (thisGemCapacity >= creatureSoulValue && thisGemCapacity < gemCapacity
-                            && it->getCellRef().getSoul().empty())
+                    if (it->getClass().isSoulGem(*it))
                     {
-                        gem = it;
-                        gemCapacity = thisGemCapacity;
+                        float thisGemCapacity = it->get<ESM::Miscellaneous>()->mBase->mData.mValue * fSoulgemMult;
+                        if (thisGemCapacity >= creatureSoulValue && thisGemCapacity < gemCapacity
+                            && it->getCellRef().getSoul().empty())
+                        {
+                            gem = it;
+                            gemCapacity = thisGemCapacity;
+                        }
                     }
                 }
-            }
 
-            if (gem == container.end())
-                continue;
+                if (gem == container.end())
+                    continue;
 
-            // Set the soul on just one of the gems, not the whole stack
-            gem->getContainerStore()->unstack(*gem, caster);
-            gem->getCellRef().setSoul(creature.getCellRef().getRefId());
+                // Set the soul on just one of the gems, not the whole stack
+                gem->getContainerStore()->unstack(*gem, caster);
+                gem->getCellRef().setSoul(creature.getCellRef().getRefId());
 
-            // Restack the gem with other gems with the same soul
-            gem->getContainerStore()->restack(*gem);
+                // Restack the gem with other gems with the same soul
+                gem->getContainerStore()->restack(*gem);
 
-            if (caster == MWMechanics::getPlayer())
-                MWBase::Environment::get().getWindowManager()->messageBox("#{sSoultrapSuccess}");
+                if (caster == MWMechanics::getPlayer())
+                    MWBase::Environment::get().getWindowManager()->messageBox("#{sSoultrapSuccess}");
 
-            const ESM::Static* const fx = world->getStore().get<ESM::Static>().search("VFX_Soul_Trap");
-            if (fx != nullptr)
-            {
-                const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-                world->spawnEffect(
-                    Misc::ResourceHelpers::correctMeshPath(fx->mModel, vfs),
-                    "", creature.getRefData().getPosition().asVec3());
-            }
+                const ESM::Static* const fx = world->getStore().get<ESM::Static>().search("VFX_Soul_Trap");
+                if (fx != nullptr)
+                {
+                    const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+                    world->spawnEffect(Misc::ResourceHelpers::correctMeshPath(fx->mModel, vfs), "",
+                        creature.getRefData().getPosition().asVec3());
+                }
 
-            MWBase::Environment::get().getSoundManager()->playSound3D(creature.getRefData().getPosition().asVec3(), "conjuration hit", 1.f, 1.f);
-            return; //remove to get vanilla behaviour
+                MWBase::Environment::get().getSoundManager()->playSound3D(
+                    creature.getRefData().getPosition().asVec3(), "conjuration hit", 1.f, 1.f);
+                return; // remove to get vanilla behaviour
+            }
         }
     }
-}
 
-void removeTemporaryEffects(const MWWorld::Ptr& ptr)
-{
-    ptr.getClass().getCreatureStats(ptr).getActiveSpells().unloadActor(ptr);
-}
+    void removeTemporaryEffects(const MWWorld::Ptr& ptr)
+    {
+        ptr.getClass().getCreatureStats(ptr).getActiveSpells().unloadActor(ptr);
+    }
 
 }
 
 namespace MWMechanics
 {
     static constexpr int GREETING_SHOULD_START = 4; // how many updates should pass before NPC can greet player
-    static constexpr int GREETING_SHOULD_END = 20;  // how many updates should pass before NPC stops turning to player
-    static constexpr int GREETING_COOLDOWN = 40;    // how many updates should pass before NPC can continue movement
+    static constexpr int GREETING_SHOULD_END = 20; // how many updates should pass before NPC stops turning to player
+    static constexpr int GREETING_COOLDOWN = 40; // how many updates should pass before NPC can continue movement
     static constexpr float DECELERATE_DISTANCE = 512.f;
 
     namespace
     {
-        float getTimeToDestination(const AiPackage& package, const osg::Vec3f& position, float speed, float duration, const osg::Vec3f& halfExtents)
+        float getTimeToDestination(const AiPackage& package, const osg::Vec3f& position, float speed, float duration,
+            const osg::Vec3f& halfExtents)
         {
-            const auto distanceToNextPathPoint = (package.getNextPathPoint(package.getDestination()) - position).length();
+            const auto distanceToNextPathPoint
+                = (package.getNextPathPoint(package.getDestination()) - position).length();
             return (distanceToNextPathPoint - package.getNextPathPointTolerance(speed, duration, halfExtents)) / speed;
         }
 
@@ -255,10 +259,18 @@ namespace MWMechanics
             if (isTargetMagicallyHidden(targetActor))
                 return;
 
-            static const float fMaxHeadTrackDistance = MWBase::Environment::get().getWorld()->getStore()
-                .get<ESM::GameSetting>().find("fMaxHeadTrackDistance")->mValue.getFloat();
-            static const float fInteriorHeadTrackMult = MWBase::Environment::get().getWorld()->getStore()
-                .get<ESM::GameSetting>().find("fInteriorHeadTrackMult")->mValue.getFloat();
+            static const float fMaxHeadTrackDistance = MWBase::Environment::get()
+                                                           .getWorld()
+                                                           ->getStore()
+                                                           .get<ESM::GameSetting>()
+                                                           .find("fMaxHeadTrackDistance")
+                                                           ->mValue.getFloat();
+            static const float fInteriorHeadTrackMult = MWBase::Environment::get()
+                                                            .getWorld()
+                                                            ->getStore()
+                                                            .get<ESM::GameSetting>()
+                                                            .find("fInteriorHeadTrackMult")
+                                                            ->mValue.getFloat();
             float maxDistance = fMaxHeadTrackDistance;
             const ESM::Cell* currentCell = actor.getCell()->getCell();
             if (!currentCell->isExterior() && !(currentCell->mData.mFlags & ESM::Cell::QuasiEx))
@@ -272,7 +284,7 @@ namespace MWMechanics
                 return;
 
             // stop tracking when target is behind the actor
-            osg::Vec3f actorDirection = actorRefData.getBaseNode()->getAttitude() * osg::Vec3f(0,1,0);
+            osg::Vec3f actorDirection = actorRefData.getBaseNode()->getAttitude() * osg::Vec3f(0, 1, 0);
             osg::Vec3f targetDirection(actor2Pos - actor1Pos);
             actorDirection.z() = 0;
             targetDirection.z() = 0;
@@ -286,7 +298,8 @@ namespace MWMechanics
             }
         }
 
-        void updateHeadTracking(const MWWorld::Ptr& ptr, const std::list<Actor>& actors, bool isPlayer, CharacterController& ctrl)
+        void updateHeadTracking(
+            const MWWorld::Ptr& ptr, const std::list<Actor>& actors, bool isPlayer, CharacterController& ctrl)
         {
             float sqrHeadTrackDistance = std::numeric_limits<float>::max();
             MWWorld::Ptr headTrackTarget;
@@ -306,7 +319,8 @@ namespace MWMechanics
                     if (!activePackageTarget.isEmpty())
                     {
                         // Track the specified target of package.
-                        updateHeadTracking(ptr, activePackageTarget, headTrackTarget, sqrHeadTrackDistance, inCombatOrPursue);
+                        updateHeadTracking(
+                            ptr, activePackageTarget, headTrackTarget, sqrHeadTrackDistance, inCombatOrPursue);
                     }
                 }
                 else
@@ -317,7 +331,8 @@ namespace MWMechanics
                         if (otherActor.getPtr() == ptr)
                             continue;
 
-                        updateHeadTracking(ptr, otherActor.getPtr(), headTrackTarget, sqrHeadTrackDistance, inCombatOrPursue);
+                        updateHeadTracking(
+                            ptr, otherActor.getPtr(), headTrackTarget, sqrHeadTrackDistance, inCombatOrPursue);
                     }
                 }
             }
@@ -362,7 +377,7 @@ namespace MWMechanics
     void Actors::updateActor(const MWWorld::Ptr& ptr, float duration) const
     {
         // magic effects
-        adjustMagicEffects (ptr, duration);
+        adjustMagicEffects(ptr, duration);
 
         // fatigue restoration
         calculateRestoration(ptr, duration);
@@ -370,10 +385,11 @@ namespace MWMechanics
 
     void Actors::playIdleDialogue(const MWWorld::Ptr& actor) const
     {
-        if (!actor.getClass().isActor() || actor == getPlayer() || MWBase::Environment::get().getSoundManager()->sayActive(actor))
+        if (!actor.getClass().isActor() || actor == getPlayer()
+            || MWBase::Environment::get().getSoundManager()->sayActive(actor))
             return;
 
-        const CreatureStats &stats = actor.getClass().getCreatureStats(actor);
+        const CreatureStats& stats = actor.getClass().getCreatureStats(actor);
         if (stats.getAiSetting(AiSetting::Hello).getModified() == 0)
             return;
 
@@ -390,8 +406,10 @@ namespace MWMechanics
         // Our implementation is not FPS-dependent unlike Morrowind's so it needs to be recalibrated.
         // We chose to use the chance MW would have when run at 60 FPS with the default value of the GMST.
         const float delta = MWBase::Environment::get().getFrameDuration() * 6.f;
-        static const float fVoiceIdleOdds = world->getStore().get<ESM::GameSetting>().find("fVoiceIdleOdds")->mValue.getFloat();
-        if (Misc::Rng::rollProbability(world->getPrng()) * 10000.f < fVoiceIdleOdds * delta && world->getLOS(getPlayer(), actor))
+        static const float fVoiceIdleOdds
+            = world->getStore().get<ESM::GameSetting>().find("fVoiceIdleOdds")->mValue.getFloat();
+        if (Misc::Rng::rollProbability(world->getPrng()) * 10000.f < fVoiceIdleOdds * delta
+            && world->getLOS(getPlayer(), actor))
             MWBase::Environment::get().getDialogueManager()->say(actor, "idle");
     }
 
@@ -401,7 +419,7 @@ namespace MWMechanics
             return;
 
         const auto& actorClass = actor.getClass();
-        const CreatureStats &stats = actorClass.getCreatureStats(actor);
+        const CreatureStats& stats = actorClass.getCreatureStats(actor);
         const MWMechanics::AiSequence& seq = stats.getAiSequence();
 
         if (!seq.isEmpty() && seq.getActivePackage().useVariableSpeed())
@@ -430,9 +448,9 @@ namespace MWMechanics
         const MWMechanics::AiSequence& seq = actorStats.getAiSequence();
         const auto packageId = seq.getTypeId();
 
-        if (seq.isInCombat() ||
-            MWBase::Environment::get().getWorld()->isSwimming(actor) ||
-            (packageId != AiPackageTypeId::Wander && packageId != AiPackageTypeId::Travel && packageId != AiPackageTypeId::None))
+        if (seq.isInCombat() || MWBase::Environment::get().getWorld()->isSwimming(actor)
+            || (packageId != AiPackageTypeId::Wander && packageId != AiPackageTypeId::Travel
+                && packageId != AiPackageTypeId::None))
         {
             actorState.setTurningToPlayer(false);
             actorState.setGreetingTimer(0);
@@ -462,18 +480,23 @@ namespace MWMechanics
             return;
 
         // Play a random voice greeting if the player gets too close
-        static const int iGreetDistanceMultiplier = MWBase::Environment::get().getWorld()->getStore()
-            .get<ESM::GameSetting>().find("iGreetDistanceMultiplier")->mValue.getInteger();
-
-        const float helloDistance = static_cast<float>(actorStats.getAiSetting(AiSetting::Hello).getModified() * iGreetDistanceMultiplier);
+        static const int iGreetDistanceMultiplier = MWBase::Environment::get()
+                                                        .getWorld()
+                                                        ->getStore()
+                                                        .get<ESM::GameSetting>()
+                                                        .find("iGreetDistanceMultiplier")
+                                                        ->mValue.getInteger();
+
+        const float helloDistance
+            = static_cast<float>(actorStats.getAiSetting(AiSetting::Hello).getModified() * iGreetDistanceMultiplier);
         const auto& playerStats = player.getClass().getCreatureStats(player);
 
         int greetingTimer = actorState.getGreetingTimer();
         GreetingState greetingState = actorState.getGreetingState();
         if (greetingState == Greet_None)
         {
-            if ((playerPos - actorPos).length2() <= helloDistance * helloDistance &&
-                !playerStats.isDead() && !actorStats.isParalyzed() && !isTargetMagicallyHidden(player)
+            if ((playerPos - actorPos).length2() <= helloDistance * helloDistance && !playerStats.isDead()
+                && !actorStats.isParalyzed() && !isTargetMagicallyHidden(player)
                 && MWBase::Environment::get().getWorld()->getLOS(player, actor)
                 && MWBase::Environment::get().getMechanicsManager()->awarenessCheck(player, actor))
                 greetingTimer++;
@@ -490,8 +513,10 @@ namespace MWMechanics
         {
             greetingTimer++;
 
-            if (!actorStats.getMovementFlag(CreatureStats::Flag_ForceJump) && !actorStats.getMovementFlag(CreatureStats::Flag_ForceSneak)
-                && (greetingTimer <= GREETING_SHOULD_END || MWBase::Environment::get().getSoundManager()->sayActive(actor)))
+            if (!actorStats.getMovementFlag(CreatureStats::Flag_ForceJump)
+                && !actorStats.getMovementFlag(CreatureStats::Flag_ForceSneak)
+                && (greetingTimer <= GREETING_SHOULD_END
+                    || MWBase::Environment::get().getSoundManager()->sayActive(actor)))
                 turnActorToFacePlayer(actor, actorState, dir);
 
             if (greetingTimer >= GREETING_COOLDOWN)
@@ -534,15 +559,15 @@ namespace MWMechanics
     {
         auto& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
         std::vector<MWWorld::Ptr> targets;
-        if(ai.getCombatTargets(targets))
+        if (ai.getCombatTargets(targets))
         {
             std::set<MWWorld::Ptr> allySet;
             getActorsSidingWith(ptr, allySet);
             allySet.insert(ptr);
             std::vector<MWWorld::Ptr> allies(allySet.begin(), allySet.end());
-            for(const auto& ally : allies)
+            for (const auto& ally : allies)
                 ally.getClass().getCreatureStats(ally).getAiSequence().stopCombat(targets);
-            for(const auto& target : targets)
+            for (const auto& target : targets)
                 target.getClass().getCreatureStats(target).getAiSequence().stopCombat(allies);
         }
     }
@@ -569,17 +594,19 @@ namespace MWMechanics
         if (sqrDist > mActorsProcessingRange * mActorsProcessingRange)
             return;
 
-        // If this is set to true, actor1 will start combat with actor2 if the awareness check at the end of the method returns true
+        // If this is set to true, actor1 will start combat with actor2 if the awareness check at the end of the method
+        // returns true
         bool aggressive = false;
 
-        // Get actors allied with actor1. Includes those following or escorting actor1, actors following or escorting those actors, (recursive)
-        // and any actor currently being followed or escorted by actor1
+        // Get actors allied with actor1. Includes those following or escorting actor1, actors following or escorting
+        // those actors, (recursive) and any actor currently being followed or escorted by actor1
         std::set<MWWorld::Ptr> allies1;
 
         getActorsSidingWith(actor1, allies1, cachedAllies);
 
         const auto mechanicsManager = MWBase::Environment::get().getMechanicsManager();
-        // If an ally of actor1 has been attacked by actor2 or has attacked actor2, start combat between actor1 and actor2
+        // If an ally of actor1 has been attacked by actor2 or has attacked actor2, start combat between actor1 and
+        // actor2
         for (const MWWorld::Ptr& ally : allies1)
         {
             if (creatureStats1.getAiSequence().isInCombat(ally))
@@ -594,7 +621,8 @@ namespace MWMechanics
                 return;
             }
 
-            // If there's been no attack attempt yet but an ally of actor1 is in combat with actor2, become aggressive to actor2
+            // If there's been no attack attempt yet but an ally of actor1 is in combat with actor2, become aggressive
+            // to actor2
             if (ally.getClass().getCreatureStats(ally).getAiSequence().isInCombat(actor2))
                 aggressive = true;
         }
@@ -637,7 +665,8 @@ namespace MWMechanics
         if (!canFight(actor1, actor2))
             return;
 
-        // If set in the settings file, player followers and escorters will become aggressive toward enemies in combat with them or the player
+        // If set in the settings file, player followers and escorters will become aggressive toward enemies in combat
+        // with them or the player
         static const bool followersAttackOnSight = Settings::Manager::getBool("followers attack on sight", "Game");
         if (!aggressive && isPlayerFollowerOrEscorter && followersAttackOnSight)
         {
@@ -670,10 +699,12 @@ namespace MWMechanics
 
         // Make guards go aggressive with creatures that are in combat, unless the creature is a follower or escorter
         const auto world = MWBase::Environment::get().getWorld();
-        if (!aggressive && actor1.getClass().isClass(actor1, "Guard") && !actor2.getClass().isNpc() && creatureStats2.getAiSequence().isInCombat())
+        if (!aggressive && actor1.getClass().isClass(actor1, "Guard") && !actor2.getClass().isNpc()
+            && creatureStats2.getAiSequence().isInCombat())
         {
             // Check if the creature is too far
-            static const float fAlarmRadius = world->getStore().get<ESM::GameSetting>().find("fAlarmRadius")->mValue.getFloat();
+            static const float fAlarmRadius
+                = world->getStore().get<ESM::GameSetting>().find("fAlarmRadius")->mValue.getFloat();
             if (sqrDist > fAlarmRadius * fAlarmRadius)
                 return;
 
@@ -693,11 +724,11 @@ namespace MWMechanics
                 aggressive = true;
         }
 
-        // If any of the above conditions turned actor1 aggressive towards actor2, do an awareness check. If it passes, start combat with actor2.
+        // If any of the above conditions turned actor1 aggressive towards actor2, do an awareness check. If it passes,
+        // start combat with actor2.
         if (aggressive)
         {
-            bool LOS = world->getLOS(actor1, actor2) &&
-                mechanicsManager->awarenessCheck(actor2, actor1);
+            bool LOS = world->getLOS(actor1, actor2) && mechanicsManager->awarenessCheck(actor2, actor1);
 
             if (LOS)
                 mechanicsManager->startCombat(actor1, actor2);
@@ -706,7 +737,7 @@ namespace MWMechanics
 
     void Actors::adjustMagicEffects(const MWWorld::Ptr& creature, float duration) const
     {
-        CreatureStats& creatureStats = creature.getClass().getCreatureStats (creature);
+        CreatureStats& creatureStats = creature.getClass().getCreatureStats(creature);
         const bool wasDead = creatureStats.isDead();
 
         creatureStats.getActiveSpells().update(creature, duration);
@@ -723,15 +754,22 @@ namespace MWMechanics
             {
                 bool actorKilled = false;
 
-                MWWorld::Ptr caster = MWBase::Environment::get().getWorld()->searchPtrViaActorId(spell.getCasterActorId());
+                MWWorld::Ptr caster
+                    = MWBase::Environment::get().getWorld()->searchPtrViaActorId(spell.getCasterActorId());
                 for (const auto& effect : spell.getEffects())
                 {
                     static const std::array<int, 7> damageEffects{
-                        ESM::MagicEffect::FireDamage, ESM::MagicEffect::ShockDamage, ESM::MagicEffect::FrostDamage, ESM::MagicEffect::Poison,
-                        ESM::MagicEffect::SunDamage, ESM::MagicEffect::DamageHealth, ESM::MagicEffect::AbsorbHealth,
+                        ESM::MagicEffect::FireDamage,
+                        ESM::MagicEffect::ShockDamage,
+                        ESM::MagicEffect::FrostDamage,
+                        ESM::MagicEffect::Poison,
+                        ESM::MagicEffect::SunDamage,
+                        ESM::MagicEffect::DamageHealth,
+                        ESM::MagicEffect::AbsorbHealth,
                     };
 
-                    const bool isDamageEffect = std::find(damageEffects.begin(), damageEffects.end(), effect.mEffectId) != damageEffects.end();
+                    const bool isDamageEffect = std::find(damageEffects.begin(), damageEffects.end(), effect.mEffectId)
+                        != damageEffects.end();
 
                     if (isDamageEffect)
                     {
@@ -762,11 +800,12 @@ namespace MWMechanics
 
     void Actors::restoreDynamicStats(const MWWorld::Ptr& ptr, double hours, bool sleep) const
     {
-        MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats (ptr);
+        MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
         if (stats.isDead())
             return;
 
-        const MWWorld::Store<ESM::GameSetting>& settings = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& settings
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
         if (sleep)
         {
@@ -777,7 +816,7 @@ namespace MWMechanics
             stats.setHealth(stat);
 
             double restoreHours = hours;
-            const bool stunted = stats.getMagicEffects ().get(ESM::MagicEffect::StuntedMagicka).getMagnitude() > 0;
+            const bool stunted = stats.getMagicEffects().get(ESM::MagicEffect::StuntedMagicka).getMagnitude() > 0;
             if (stunted)
             {
                 // Stunted Magicka effect should be taken into account.
@@ -787,7 +826,7 @@ namespace MWMechanics
                 if (remainingTime > 0)
                 {
                     double timeScale = MWBase::Environment::get().getWorld()->getTimeScaleFactor();
-                    if(timeScale == 0.0)
+                    if (timeScale == 0.0)
                         timeScale = 1;
 
                     restoreHours = std::max(0.0, hours - remainingTime * timeScale / 3600.f);
@@ -811,21 +850,21 @@ namespace MWMechanics
             return;
 
         // Restore fatigue
-        static const float fFatigueReturnBase = settings.find("fFatigueReturnBase")->mValue.getFloat ();
-        static const float fFatigueReturnMult = settings.find("fFatigueReturnMult")->mValue.getFloat ();
-        static const float fEndFatigueMult = settings.find("fEndFatigueMult")->mValue.getFloat ();
+        static const float fFatigueReturnBase = settings.find("fFatigueReturnBase")->mValue.getFloat();
+        static const float fFatigueReturnMult = settings.find("fFatigueReturnMult")->mValue.getFloat();
+        static const float fEndFatigueMult = settings.find("fEndFatigueMult")->mValue.getFloat();
 
-        const float endurance = stats.getAttribute (ESM::Attribute::Endurance).getModified ();
+        const float endurance = stats.getAttribute(ESM::Attribute::Endurance).getModified();
 
         float normalizedEncumbrance = ptr.getClass().getNormalizedEncumbrance(ptr);
         if (normalizedEncumbrance > 1)
             normalizedEncumbrance = 1;
 
-        const float x = (fFatigueReturnBase + fFatigueReturnMult * (1 - normalizedEncumbrance))
-                        * (fEndFatigueMult * endurance);
+        const float x
+            = (fFatigueReturnBase + fFatigueReturnMult * (1 - normalizedEncumbrance)) * (fEndFatigueMult * endurance);
 
-        fatigue.setCurrent (fatigue.getCurrent() + 3600 * x * hours);
-        stats.setFatigue (fatigue);
+        fatigue.setCurrent(fatigue.getCurrent() + 3600 * x * hours);
+        stats.setFatigue(fatigue);
     }
 
     void Actors::calculateRestoration(const MWWorld::Ptr& ptr, float duration) const
@@ -833,7 +872,7 @@ namespace MWMechanics
         if (ptr.getClass().getCreatureStats(ptr).isDead())
             return;
 
-        MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats (ptr);
+        MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
 
         // Current fatigue can be above base value due to a fortify effect.
         // In that case stop here and don't try to restore.
@@ -843,14 +882,15 @@ namespace MWMechanics
 
         // Restore fatigue
         const float endurance = stats.getAttribute(ESM::Attribute::Endurance).getModified();
-        const MWWorld::Store<ESM::GameSetting>& settings = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
-        static const float fFatigueReturnBase = settings.find("fFatigueReturnBase")->mValue.getFloat ();
-        static const float fFatigueReturnMult = settings.find("fFatigueReturnMult")->mValue.getFloat ();
+        const MWWorld::Store<ESM::GameSetting>& settings
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        static const float fFatigueReturnBase = settings.find("fFatigueReturnBase")->mValue.getFloat();
+        static const float fFatigueReturnMult = settings.find("fFatigueReturnMult")->mValue.getFloat();
 
         const float x = fFatigueReturnBase + fFatigueReturnMult * endurance;
 
-        fatigue.setCurrent (fatigue.getCurrent() + duration * x);
-        stats.setFatigue (fatigue);
+        fatigue.setCurrent(fatigue.getCurrent() + duration * x);
+        stats.setFatigue(fatigue);
     }
 
     bool Actors::isAttackPreparing(const MWWorld::Ptr& ptr) const
@@ -883,19 +923,25 @@ namespace MWMechanics
         NpcStats& stats = actorClass.getNpcStats(ptr);
 
         // When npc stats are just initialized, mTimeToStartDrowning == -1 and we should get value from GMST
-        static const float fHoldBreathTime = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fHoldBreathTime")->mValue.getFloat();
+        static const float fHoldBreathTime = MWBase::Environment::get()
+                                                 .getWorld()
+                                                 ->getStore()
+                                                 .get<ESM::GameSetting>()
+                                                 .find("fHoldBreathTime")
+                                                 ->mValue.getFloat();
         if (stats.getTimeToStartDrowning() == -1.f)
             stats.setTimeToStartDrowning(fHoldBreathTime);
 
         if (!isPlayer && stats.getTimeToStartDrowning() < fHoldBreathTime / 2)
         {
             AiSequence& seq = actorClass.getCreatureStats(ptr).getAiSequence();
-            if (seq.getTypeId() != AiPackageTypeId::Breathe) //Only add it once
+            if (seq.getTypeId() != AiPackageTypeId::Breathe) // Only add it once
                 seq.stack(AiBreathe(), ptr);
         }
 
         const MWBase::World* const world = MWBase::Environment::get().getWorld();
-        const bool knockedOutUnderwater = (isKnockedOut && world->isUnderwater(ptr.getCell(), osg::Vec3f(ptr.getRefData().getPosition().asVec3())));
+        const bool knockedOutUnderwater
+            = (isKnockedOut && world->isUnderwater(ptr.getCell(), osg::Vec3f(ptr.getRefData().getPosition().asVec3())));
         if ((world->isSubmerged(ptr) || knockedOutUnderwater)
             && stats.getMagicEffects().get(ESM::MagicEffect::WaterBreathing).getMagnitude() == 0)
         {
@@ -915,7 +961,8 @@ namespace MWMechanics
             if (timeLeft == 0.0f && !godmode)
             {
                 // If drowning, apply 3 points of damage per second
-                static const float fSuffocationDamage = world->getStore().get<ESM::GameSetting>().find("fSuffocationDamage")->mValue.getFloat();
+                static const float fSuffocationDamage
+                    = world->getStore().get<ESM::GameSetting>().find("fSuffocationDamage")->mValue.getFloat();
                 DynamicStat<float> health = stats.getHealth();
                 health.setCurrent(health.getCurrent() - fSuffocationDamage * duration);
                 stats.setHealth(health);
@@ -947,11 +994,9 @@ namespace MWMechanics
          */
         if (!isPlayer)
         {
-            auto torchIter = std::find_if(std::begin(inventoryStore), std::end(inventoryStore), [&](auto entry)
-                {
-                    return entry.getType() == ESM::Light::sRecordId &&
-                        entry.getClass().canBeEquipped(entry, ptr).first;
-                });
+            auto torchIter = std::find_if(std::begin(inventoryStore), std::end(inventoryStore), [&](auto entry) {
+                return entry.getType() == ESM::Light::sRecordId && entry.getClass().canBeEquipped(entry, ptr).first;
+            });
             if (mayEquip)
             {
                 if (torchIter != inventoryStore.end())
@@ -992,13 +1037,13 @@ namespace MWMechanics
 
         heldIter = inventoryStore.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
 
-        //If holding a light...
+        // If holding a light...
         const auto world = MWBase::Environment::get().getWorld();
-        MWRender::Animation *anim = world->getAnimation(ptr);
+        MWRender::Animation* anim = world->getAnimation(ptr);
         if (heldIter.getType() == MWWorld::ContainerStore::Type_Light && anim && anim->getCarriedLeftShown())
         {
             // Use time from the player's light
-            if(isPlayer)
+            if (isPlayer)
             {
                 float timeRemaining = heldIter->getClass().getRemainingUsageTime(*heldIter);
 
@@ -1017,14 +1062,14 @@ namespace MWMechanics
             }
 
             // Both NPC and player lights extinguish in water.
-            if(world->isSwimming(ptr))
+            if (world->isSwimming(ptr))
             {
                 inventoryStore.remove(*heldIter, 1, ptr); // remove it
 
                 // ...But, only the player makes a sound.
-                if(isPlayer)
-                    MWBase::Environment::get().getSoundManager()->playSound("torch out",
-                            1.0, 1.0, MWSound::Type::Sfx, MWSound::PlayMode::NoEnv);
+                if (isPlayer)
+                    MWBase::Environment::get().getSoundManager()->playSound(
+                        "torch out", 1.0, 1.0, MWSound::Type::Sfx, MWSound::PlayMode::NoEnv);
             }
         }
     }
@@ -1051,23 +1096,28 @@ namespace MWMechanics
         const auto mechanicsManager = MWBase::Environment::get().getMechanicsManager();
         const auto world = MWBase::Environment::get().getWorld();
 
-        if (actorClass.isClass(ptr, "Guard") && !creatureStats.getAiSequence().isInPursuit() && !creatureStats.getAiSequence().isInCombat()
+        if (actorClass.isClass(ptr, "Guard") && !creatureStats.getAiSequence().isInPursuit()
+            && !creatureStats.getAiSequence().isInCombat()
             && creatureStats.getMagicEffects().get(ESM::MagicEffect::CalmHumanoid).getMagnitude() == 0)
         {
             const MWWorld::ESMStore& esmStore = world->getStore();
             static const int cutoff = esmStore.get<ESM::GameSetting>().find("iCrimeThreshold")->mValue.getInteger();
             // Force dialogue on sight if bounty is greater than the cutoff
-            // In vanilla morrowind, the greeting dialogue is scripted to either arrest the player (< 5000 bounty) or attack (>= 5000 bounty)
+            // In vanilla morrowind, the greeting dialogue is scripted to either arrest the player (< 5000 bounty) or
+            // attack (>= 5000 bounty)
             if (playerStats.getBounty() >= cutoff
-                // TODO: do not run these two every frame. keep an Aware state for each actor and update it every 0.2 s or so?
-                && world->getLOS(ptr, player)
-                && mechanicsManager->awarenessCheck(player, ptr))
+                // TODO: do not run these two every frame. keep an Aware state for each actor and update it every 0.2 s
+                // or so?
+                && world->getLOS(ptr, player) && mechanicsManager->awarenessCheck(player, ptr))
             {
-                static const int iCrimeThresholdMultiplier = esmStore.get<ESM::GameSetting>().find("iCrimeThresholdMultiplier")->mValue.getInteger();
+                static const int iCrimeThresholdMultiplier
+                    = esmStore.get<ESM::GameSetting>().find("iCrimeThresholdMultiplier")->mValue.getInteger();
                 if (playerStats.getBounty() >= cutoff * iCrimeThresholdMultiplier)
                 {
                     mechanicsManager->startCombat(ptr, player);
-                    creatureStats.setHitAttemptActorId(playerClass.getCreatureStats(player).getActorId()); // Stops the guard from quitting combat if player is unreachable
+                    creatureStats.setHitAttemptActorId(
+                        playerClass.getCreatureStats(player)
+                            .getActorId()); // Stops the guard from quitting combat if player is unreachable
                 }
                 else
                     creatureStats.getAiSequence().stack(AiPursue(player), ptr);
@@ -1098,9 +1148,11 @@ namespace MWMechanics
         }
     }
 
-    Actors::Actors() : mSmoothMovement(Settings::Manager::getBool("smooth movement", "Game"))
+    Actors::Actors()
+        : mSmoothMovement(Settings::Manager::getBool("smooth movement", "Game"))
     {
-        mTimerDisposeSummonsCorpses = 0.2f; // We should add a delay between summoned creature death and its corpse despawning
+        mTimerDisposeSummonsCorpses
+            = 0.2f; // We should add a delay between summoned creature death and its corpse despawning
 
         updateProcessingRange();
     }
@@ -1112,18 +1164,20 @@ namespace MWMechanics
 
     void Actors::updateProcessingRange()
     {
-        // We have to cap it since using high values (larger than 7168) will make some quests harder or impossible to complete (bug #1876)
+        // We have to cap it since using high values (larger than 7168) will make some quests harder or impossible to
+        // complete (bug #1876)
         static constexpr float maxRange = 7168.f;
         static constexpr float minRange = maxRange / 2.f;
 
-        mActorsProcessingRange = std::clamp(Settings::Manager::getFloat("actors processing range", "Game"), minRange, maxRange);
+        mActorsProcessingRange
+            = std::clamp(Settings::Manager::getFloat("actors processing range", "Game"), minRange, maxRange);
     }
 
-    void Actors::addActor (const MWWorld::Ptr& ptr, bool updateImmediately)
+    void Actors::addActor(const MWWorld::Ptr& ptr, bool updateImmediately)
     {
         removeActor(ptr, true);
 
-        MWRender::Animation *anim = MWBase::Environment::get().getWorld()->getAnimation(ptr);
+        MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(ptr);
         if (!anim)
             return;
         const auto it = mActors.emplace(mActors.end(), ptr, anim);
@@ -1147,7 +1201,8 @@ namespace MWMechanics
         if (ptr == player)
             return;
 
-        const float dist = (player.getRefData().getPosition().asVec3() - ptr.getRefData().getPosition().asVec3()).length();
+        const float dist
+            = (player.getRefData().getPosition().asVec3() - ptr.getRefData().getPosition().asVec3()).length();
         if (dist > mActorsProcessingRange)
         {
             ptr.getRefData().getBaseNode()->setNodeMask(0);
@@ -1158,9 +1213,9 @@ namespace MWMechanics
 
         // Fade away actors on large distance (>90% of actor's processing distance)
         float visibilityRatio = 1.0;
-        const float fadeStartDistance = mActorsProcessingRange*0.9f;
+        const float fadeStartDistance = mActorsProcessingRange * 0.9f;
         const float fadeEndDistance = mActorsProcessingRange;
-        const float fadeRatio = (dist - fadeStartDistance)/(fadeEndDistance - fadeStartDistance);
+        const float fadeRatio = (dist - fadeStartDistance) / (fadeEndDistance - fadeStartDistance);
         if (fadeRatio > 0)
             visibilityRatio -= std::max(0.f, fadeRatio);
 
@@ -1169,12 +1224,12 @@ namespace MWMechanics
         ctrl.setVisibility(visibilityRatio);
     }
 
-    void Actors::removeActor (const MWWorld::Ptr& ptr, bool keepActive)
+    void Actors::removeActor(const MWWorld::Ptr& ptr, bool keepActive)
     {
         const auto iter = mIndex.find(ptr.mRef);
         if (iter != mIndex.end())
         {
-            if(!keepActive)
+            if (!keepActive)
                 removeTemporaryEffects(iter->second->getPtr());
             mActors.erase(iter->second);
             mIndex.erase(iter);
@@ -1196,22 +1251,21 @@ namespace MWMechanics
         // If an observer is NPC, check if he detected an actor
         if (!observer.isEmpty() && observer.getClass().isNpc())
         {
-            return
-                MWBase::Environment::get().getWorld()->getLOS(observer, actor) &&
-                MWBase::Environment::get().getMechanicsManager()->awarenessCheck(actor, observer);
+            return MWBase::Environment::get().getWorld()->getLOS(observer, actor)
+                && MWBase::Environment::get().getMechanicsManager()->awarenessCheck(actor, observer);
         }
 
         // Otherwise check if any actor in AI processing range sees the target actor
         std::vector<MWWorld::Ptr> neighbors;
-        osg::Vec3f position (actor.getRefData().getPosition().asVec3());
+        osg::Vec3f position(actor.getRefData().getPosition().asVec3());
         getObjectsInRange(position, mActorsProcessingRange, neighbors);
-        for (const MWWorld::Ptr &neighbor : neighbors)
+        for (const MWWorld::Ptr& neighbor : neighbors)
         {
             if (neighbor == actor)
                 continue;
 
             const bool result = MWBase::Environment::get().getWorld()->getLOS(neighbor, actor)
-                       && MWBase::Environment::get().getMechanicsManager()->awarenessCheck(actor, neighbor);
+                && MWBase::Environment::get().getMechanicsManager()->awarenessCheck(actor, neighbor);
 
             if (result)
                 return true;
@@ -1220,14 +1274,14 @@ namespace MWMechanics
         return false;
     }
 
-    void Actors::updateActor(const MWWorld::Ptr &old, const MWWorld::Ptr &ptr) const
+    void Actors::updateActor(const MWWorld::Ptr& old, const MWWorld::Ptr& ptr) const
     {
         const auto iter = mIndex.find(old.mRef);
         if (iter != mIndex.end())
             iter->second->updatePtr(ptr);
     }
 
-    void Actors::dropActors (const MWWorld::CellStore *cellStore, const MWWorld::Ptr& ignore)
+    void Actors::dropActors(const MWWorld::CellStore* cellStore, const MWWorld::Ptr& ignore)
     {
         for (auto iter = mActors.begin(); iter != mActors.end();)
         {
@@ -1242,7 +1296,7 @@ namespace MWMechanics
         }
     }
 
-    void Actors::updateCombatMusic ()
+    void Actors::updateCombatMusic()
     {
         const MWWorld::Ptr player = getPlayer();
         const osg::Vec3f playerPos = player.getRefData().getPosition().asVec3();
@@ -1253,9 +1307,11 @@ namespace MWMechanics
         {
             for (const Actor& actor : mActors)
             {
-                if (actor.getPtr() == player) continue;
+                if (actor.getPtr() == player)
+                    continue;
 
-                bool inProcessingRange = (playerPos - actor.getPtr().getRefData().getPosition().asVec3()).length2() <= mActorsProcessingRange*mActorsProcessingRange;
+                bool inProcessingRange = (playerPos - actor.getPtr().getRefData().getPosition().asVec3()).length2()
+                    <= mActorsProcessingRange * mActorsProcessingRange;
                 if (inProcessingRange)
                 {
                     MWMechanics::CreatureStats& stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
@@ -1270,8 +1326,8 @@ namespace MWMechanics
 
         // check if we still have any player enemies to switch music
         if (mCurrentMusic != MusicType::Explore && !hasHostiles
-                && !(player.getClass().getCreatureStats(player).isDead()
-                     && MWBase::Environment::get().getSoundManager()->isMusicPlaying()))
+            && !(player.getClass().getCreatureStats(player).isDead()
+                && MWBase::Environment::get().getSoundManager()->isMusicPlaying()))
         {
             MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Explore"));
             mCurrentMusic = MusicType::Explore;
@@ -1281,7 +1337,6 @@ namespace MWMechanics
             MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Battle"));
             mCurrentMusic = MusicType::Battle;
         }
-
     }
 
     void Actors::predictAndAvoidCollisions(float duration) const
@@ -1333,7 +1388,8 @@ namespace MWMechanics
                     if (!static_cast<const AiWander&>(package).isStationary())
                         shouldGiveWay = true;
                 }
-                else if (package.getTypeId() == AiPackageTypeId::Combat || package.getTypeId() == AiPackageTypeId::Pursue)
+                else if (package.getTypeId() == AiPackageTypeId::Combat
+                    || package.getTypeId() == AiPackageTypeId::Pursue)
                 {
                     currentTarget = package.getTarget();
                     shouldAvoidCollision = isMoving;
@@ -1352,7 +1408,8 @@ namespace MWMechanics
 
             float timeToCheck = maxTimeToCheck;
             if (!shouldGiveWay && !aiSequence.isEmpty())
-                timeToCheck = std::min(timeToCheck, getTimeToDestination(**aiSequence.begin(), basePos, maxSpeed, duration, halfExtents));
+                timeToCheck = std::min(
+                    timeToCheck, getTimeToDestination(**aiSequence.begin(), basePos, maxSpeed, duration, halfExtents));
 
             float timeToCollision = timeToCheck;
             osg::Vec2f movementCorrection(0, 0);
@@ -1379,9 +1436,10 @@ namespace MWMechanics
                     continue;
 
                 const osg::Vec3f speed = otherPtr.getClass().getMovementSettings(otherPtr).asVec3()
-                        * otherPtr.getClass().getMaxSpeed(otherPtr);
+                    * otherPtr.getClass().getMaxSpeed(otherPtr);
                 const float rotZ = otherPtr.getRefData().getPosition().rot[2];
-                const osg::Vec2f relSpeed = Misc::rotateVec2f(osg::Vec2f(speed.x(), speed.y()), baseRotZ - rotZ) - baseSpeed;
+                const osg::Vec2f relSpeed
+                    = Misc::rotateVec2f(osg::Vec2f(speed.x(), speed.y()), baseRotZ - rotZ) - baseSpeed;
 
                 float collisionDist = minGap + halfExtents.x() + otherHalfExtents.x();
                 collisionDist = std::min(collisionDist, relPos.length());
@@ -1406,8 +1464,11 @@ namespace MWMechanics
                 timeToCollision = t;
                 angleToApproachingActor = std::atan2(deltaPos.x(), deltaPos.y());
                 const osg::Vec2f posAtT = relPos + relSpeed * t;
-                const float coef = (posAtT.x() * relSpeed.x() + posAtT.y() * relSpeed.y()) / (collisionDist * collisionDist * maxSpeed)
-                    * std::clamp((maxDistForPartialAvoiding - dist) / (maxDistForPartialAvoiding - maxDistForStrictAvoiding), 0.f, 1.f);
+                const float coef = (posAtT.x() * relSpeed.x() + posAtT.y() * relSpeed.y())
+                    / (collisionDist * collisionDist * maxSpeed)
+                    * std::clamp(
+                        (maxDistForPartialAvoiding - dist) / (maxDistForPartialAvoiding - maxDistForStrictAvoiding),
+                        0.f, 1.f);
                 movementCorrection = posAtT * coef;
                 if (otherPtr.getClass().getCreatureStats(otherPtr).isDead())
                     // In case of dead body still try to go around (it looks natural), but reduce the correction twice.
@@ -1418,7 +1479,8 @@ namespace MWMechanics
             {
                 // Try to evade the nearest collision.
                 osg::Vec2f newMovement = origMovement + movementCorrection;
-                // Step to the side rather than backward. Otherwise player will be able to push the NPC far away from it's original location.
+                // Step to the side rather than backward. Otherwise player will be able to push the NPC far away from
+                // it's original location.
                 newMovement.y() = std::max(newMovement.y(), 0.f);
                 newMovement.normalize();
                 if (isMoving)
@@ -1431,9 +1493,9 @@ namespace MWMechanics
         }
     }
 
-    void Actors::update (float duration, bool paused)
+    void Actors::update(float duration, bool paused)
     {
-        if(!paused)
+        if (!paused)
         {
             const float updateEquippedLightInterval = 1.0f;
 
@@ -1458,7 +1520,8 @@ namespace MWMechanics
 
             /// \todo move update logic to Actor class where appropriate
 
-            std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr> > cachedAllies; // will be filled as engageCombat iterates
+            std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr>>
+                cachedAllies; // will be filled as engageCombat iterates
 
             const bool aiActive = MWBase::Environment::get().getMechanicsManager()->isAIActive();
             const int attackedByPlayerId = player.getClass().getCreatureStats(player).getHitAttemptActorId();
@@ -1471,25 +1534,28 @@ namespace MWMechanics
             }
             const bool godmode = MWBase::Environment::get().getWorld()->getGodModeState();
 
-             // AI and magic effects update
+            // AI and magic effects update
             for (Actor& actor : mActors)
             {
                 const bool isPlayer = actor.getPtr() == player;
                 CharacterController& ctrl = actor.getCharacterController();
-                MWBase::LuaManager::ActorControls* luaControls =
-                    MWBase::Environment::get().getLuaManager()->getActorControls(actor.getPtr());
+                MWBase::LuaManager::ActorControls* luaControls
+                    = MWBase::Environment::get().getLuaManager()->getActorControls(actor.getPtr());
 
                 const float distSqr = (playerPos - actor.getPtr().getRefData().getPosition().asVec3()).length2();
                 // AI processing is only done within given distance to the player.
-                const bool inProcessingRange = distSqr <= mActorsProcessingRange*mActorsProcessingRange;
-
-                // If dead or no longer in combat, no longer store any actors who attempted to hit us. Also remove for the player.
-                if (!isPlayer && (actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDead()
-                    || !actor.getPtr().getClass().getCreatureStats(actor.getPtr()).getAiSequence().isInCombat()
-                    || !inProcessingRange))
+                const bool inProcessingRange = distSqr <= mActorsProcessingRange * mActorsProcessingRange;
+
+                // If dead or no longer in combat, no longer store any actors who attempted to hit us. Also remove for
+                // the player.
+                if (!isPlayer
+                    && (actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDead()
+                        || !actor.getPtr().getClass().getCreatureStats(actor.getPtr()).getAiSequence().isInCombat()
+                        || !inProcessingRange))
                 {
                     actor.getPtr().getClass().getCreatureStats(actor.getPtr()).setHitAttemptActorId(-1);
-                    if (player.getClass().getCreatureStats(player).getHitAttemptActorId() == actor.getPtr().getClass().getCreatureStats(actor.getPtr()).getActorId())
+                    if (player.getClass().getCreatureStats(player).getHitAttemptActorId()
+                        == actor.getPtr().getClass().getCreatureStats(actor.getPtr()).getActorId())
                         player.getClass().getCreatureStats(player).setHitAttemptActorId(-1);
                 }
 
@@ -1506,7 +1572,8 @@ namespace MWMechanics
                 else
                 {
                     const bool cellChanged = world->hasCellChanged();
-                    const MWWorld::Ptr actorPtr = actor.getPtr(); // make a copy of the map key to avoid it being invalidated when the player teleports
+                    const MWWorld::Ptr actorPtr = actor.getPtr(); // make a copy of the map key to avoid it being
+                                                                  // invalidated when the player teleports
                     updateActor(actorPtr, duration);
 
                     // Looping magic VFX update
@@ -1532,7 +1599,8 @@ namespace MWMechanics
                             {
                                 if (otherActor.getPtr() == actor.getPtr() || isPlayer) // player is not AI-controlled
                                     continue;
-                                engageCombat(actor.getPtr(), otherActor.getPtr(), cachedAllies, otherActor.getPtr() == player);
+                                engageCombat(
+                                    actor.getPtr(), otherActor.getPtr(), cachedAllies, otherActor.getPtr() == player);
                             }
                         }
                         if (mTimerUpdateHeadTrack == 0)
@@ -1543,7 +1611,7 @@ namespace MWMechanics
 
                         if (!isPlayer)
                         {
-                            CreatureStats &stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
+                            CreatureStats& stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
                             if (isConscious(actor.getPtr()) && !(luaControls && luaControls->mDisableAI))
                             {
                                 stats.getAiSequence().execute(actor.getPtr(), ctrl, duration);
@@ -1553,15 +1621,17 @@ namespace MWMechanics
                             }
                         }
                     }
-                    else if (aiActive && !isPlayer && isConscious(actor.getPtr()) && !(luaControls && luaControls->mDisableAI))
+                    else if (aiActive && !isPlayer && isConscious(actor.getPtr())
+                        && !(luaControls && luaControls->mDisableAI))
                     {
-                        CreatureStats &stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
-                        stats.getAiSequence().execute(actor.getPtr(), ctrl, duration, /*outOfRange*/true);
+                        CreatureStats& stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
+                        stats.getAiSequence().execute(actor.getPtr(), ctrl, duration, /*outOfRange*/ true);
                     }
 
                     if (inProcessingRange && actor.getPtr().getClass().isNpc())
                     {
-                        // We can not update drowning state for actors outside of AI distance - they can not resurface to breathe
+                        // We can not update drowning state for actors outside of AI distance - they can not resurface
+                        // to breathe
                         updateDrowning(actor.getPtr(), duration, ctrl.isKnockedOut(), isPlayer);
                     }
                     if (mTimerUpdateEquippedLight == 0 && actor.getPtr().getClass().hasInventoryStore(actor.getPtr()))
@@ -1587,7 +1657,7 @@ namespace MWMechanics
             {
                 const float dist = (playerPos - actor.getPtr().getRefData().getPosition().asVec3()).length();
                 const bool isPlayer = actor.getPtr() == player;
-                CreatureStats &stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
+                CreatureStats& stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
                 // Actors with active AI should be able to move.
                 bool alwaysActive = false;
                 if (!isPlayer && isConscious(actor.getPtr()) && !stats.isParalyzed())
@@ -1596,7 +1666,8 @@ namespace MWMechanics
                     alwaysActive = !seq.isEmpty() && seq.getActivePackage().alwaysActive();
                 }
                 const bool inRange = isPlayer || dist <= mActorsProcessingRange || alwaysActive;
-                const int activeFlag = isPlayer ? 2 : 1; // Can be changed back to '2' to keep updating bounding boxes off screen (more accurate, but slower)
+                const int activeFlag = isPlayer ? 2 : 1; // Can be changed back to '2' to keep updating bounding boxes
+                                                         // off screen (more accurate, but slower)
                 const int active = inRange ? activeFlag : 0;
 
                 CharacterController& ctrl = actor.getCharacterController();
@@ -1612,7 +1683,8 @@ namespace MWMechanics
                 world->setActorActive(actor.getPtr(), true);
 
                 const bool isDead = actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDead();
-                if (!isDead && (!godmode || !isPlayer) && actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isParalyzed())
+                if (!isDead && (!godmode || !isPlayer)
+                    && actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isParalyzed())
                     ctrl.skipAnim();
 
                 // Handle player last, in case a cell transition occurs by casting a teleportation spell
@@ -1624,7 +1696,8 @@ namespace MWMechanics
                 }
 
                 actor.getPtr().getRefData().getBaseNode()->setNodeMask(MWRender::Mask_Actor);
-                world->setActorCollisionMode(actor.getPtr(), true, !actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDeathAnimationFinished());
+                world->setActorCollisionMode(actor.getPtr(), true,
+                    !actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDeathAnimationFinished());
 
                 if (!actor.getPositionAdjusted())
                 {
@@ -1646,18 +1719,18 @@ namespace MWMechanics
 
             for (const Actor& actor : mActors)
             {
-                const MWWorld::Class &cls = actor.getPtr().getClass();
-                CreatureStats &stats = cls.getCreatureStats(actor.getPtr());
+                const MWWorld::Class& cls = actor.getPtr().getClass();
+                CreatureStats& stats = cls.getCreatureStats(actor.getPtr());
 
-                //KnockedOutOneFrameLogic
-                //Used for "OnKnockedOut" command
-                //Put here to ensure that it's run for PRECISELY one frame.
+                // KnockedOutOneFrameLogic
+                // Used for "OnKnockedOut" command
+                // Put here to ensure that it's run for PRECISELY one frame.
                 if (stats.getKnockedDown() && !stats.getKnockedDownOneFrame() && !stats.getKnockedDownOverOneFrame())
-                { //Start it for one frame if nessesary
+                { // Start it for one frame if nessesary
                     stats.setKnockedDownOneFrame(true);
                 }
                 else if (stats.getKnockedDownOneFrame() && !stats.getKnockedDownOverOneFrame())
-                { //Turn off KnockedOutOneframe
+                { // Turn off KnockedOutOneframe
                     stats.setKnockedDownOneFrame(false);
                     stats.setKnockedDownOverOneFrame(true);
                 }
@@ -1670,14 +1743,14 @@ namespace MWMechanics
         updateCombatMusic();
     }
 
-    void Actors::notifyDied(const MWWorld::Ptr &actor)
+    void Actors::notifyDied(const MWWorld::Ptr& actor)
     {
         actor.getClass().getCreatureStats(actor).notifyDied();
 
         ++mDeathCount[Misc::StringUtils::lowerCase(actor.getCellRef().getRefId())];
     }
 
-    void Actors::resurrect(const MWWorld::Ptr &ptr) const
+    void Actors::resurrect(const MWWorld::Ptr& ptr) const
     {
         const auto iter = mIndex.find(ptr.mRef);
         if (iter != mIndex.end())
@@ -1695,10 +1768,10 @@ namespace MWMechanics
     {
         for (Actor& actor : mActors)
         {
-            const MWWorld::Class &cls = actor.getPtr().getClass();
-            CreatureStats &stats = cls.getCreatureStats(actor.getPtr());
+            const MWWorld::Class& cls = actor.getPtr().getClass();
+            CreatureStats& stats = cls.getCreatureStats(actor.getPtr());
 
-            if(!stats.isDead())
+            if (!stats.isDead())
                 continue;
 
             MWBase::Environment::get().getWorld()->removeActorPath(actor.getPtr());
@@ -1733,7 +1806,7 @@ namespace MWMechanics
 
                 if (isPlayer)
                 {
-                    //player's death animation is over
+                    // player's death animation is over
                     MWBase::Environment::get().getStateManager()->askLoadRecent();
                     // Play Death Music if it was the player dying
                     MWBase::Environment::get().getSoundManager()->streamMusic("Special/MW_Death.mp3");
@@ -1754,14 +1827,14 @@ namespace MWMechanics
         {
             MWBase::Environment::get().getWorld()->deleteObject(ptr);
 
-            const ESM::Static* fx = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>()
-                    .search("VFX_Summon_End");
+            const ESM::Static* fx
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().search("VFX_Summon_End");
             if (fx)
             {
                 const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
                 MWBase::Environment::get().getWorld()->spawnEffect(
-                    Misc::ResourceHelpers::correctMeshPath(fx->mModel, vfs),
-                    "", ptr.getRefData().getPosition().asVec3());
+                    Misc::ResourceHelpers::correctMeshPath(fx->mModel, vfs), "",
+                    ptr.getRefData().getPosition().asVec3());
             }
 
             // Remove the summoned creature's summoned creatures as well
@@ -1786,7 +1859,8 @@ namespace MWMechanics
     {
         for (const Actor& actor : mActors)
         {
-            MWMechanics::ActiveSpells& spells = actor.getPtr().getClass().getCreatureStats(actor.getPtr()).getActiveSpells();
+            MWMechanics::ActiveSpells& spells
+                = actor.getPtr().getClass().getCreatureStats(actor.getPtr()).getActiveSpells();
             spells.purge(actor.getPtr(), casterActorId);
         }
     }
@@ -1812,11 +1886,12 @@ namespace MWMechanics
             if (!sleep || actor.getPtr() == player)
                 restoreDynamicStats(actor.getPtr(), hours, sleep);
 
-            if ((!actor.getPtr().getRefData().getBaseNode()) ||
-                    (playerPos - actor.getPtr().getRefData().getPosition().asVec3()).length2() > mActorsProcessingRange*mActorsProcessingRange)
+            if ((!actor.getPtr().getRefData().getBaseNode())
+                || (playerPos - actor.getPtr().getRefData().getPosition().asVec3()).length2()
+                    > mActorsProcessingRange * mActorsProcessingRange)
                 continue;
 
-            adjustMagicEffects (actor.getPtr(), duration);
+            adjustMagicEffects(actor.getPtr(), duration);
 
             MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(actor.getPtr());
             if (animation)
@@ -1867,7 +1942,7 @@ namespace MWMechanics
             std::set<MWWorld::Ptr> sidingActors;
             getActorsSidingWith(player, sidingActors);
 
-            for (const MWWorld::Ptr &observer : observers)
+            for (const MWWorld::Ptr& observer : observers)
             {
                 if (observer == player || observer.getClass().getCreatureStats(observer).isDead())
                     continue;
@@ -1905,27 +1980,27 @@ namespace MWMechanics
         mSneakSkillTimer += duration;
     }
 
-    int Actors::getHoursToRest(const MWWorld::Ptr &ptr) const
+    int Actors::getHoursToRest(const MWWorld::Ptr& ptr) const
     {
         const auto [healthPerHour, magickaPerHour] = getRestorationPerHourOfSleep(ptr);
 
         CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
-        const bool stunted = stats.getMagicEffects ().get(ESM::MagicEffect::StuntedMagicka).getMagnitude() > 0;
+        const bool stunted = stats.getMagicEffects().get(ESM::MagicEffect::StuntedMagicka).getMagnitude() > 0;
 
-        const float healthHours  = healthPerHour > 0
-                             ? (stats.getHealth().getModified() - stats.getHealth().getCurrent()) / healthPerHour
-                             : 1.0f;
+        const float healthHours = healthPerHour > 0
+            ? (stats.getHealth().getModified() - stats.getHealth().getCurrent()) / healthPerHour
+            : 1.0f;
         const float magickaHours = magickaPerHour > 0 && !stunted
-                              ? (stats.getMagicka().getModified() - stats.getMagicka().getCurrent()) / magickaPerHour
-                              : 1.0f;
+            ? (stats.getMagicka().getModified() - stats.getMagicka().getCurrent()) / magickaPerHour
+            : 1.0f;
 
         return static_cast<int>(std::ceil(std::max(1.f, std::max(healthHours, magickaHours))));
     }
 
-    int Actors::countDeaths (const std::string& id) const
+    int Actors::countDeaths(const std::string& id) const
     {
         const auto iter = mDeathCount.find(id);
-        if(iter != mDeathCount.end())
+        if (iter != mDeathCount.end())
             return iter->second;
         return 0;
     }
@@ -1937,16 +2012,18 @@ namespace MWMechanics
             iter->second->getCharacterController().forceStateUpdate();
     }
 
-    bool Actors::playAnimationGroup(const MWWorld::Ptr& ptr, std::string_view groupName, int mode, int number, bool persist) const
+    bool Actors::playAnimationGroup(
+        const MWWorld::Ptr& ptr, std::string_view groupName, int mode, int number, bool persist) const
     {
         const auto iter = mIndex.find(ptr.mRef);
-        if(iter != mIndex.end())
+        if (iter != mIndex.end())
         {
             return iter->second->getCharacterController().playGroup(groupName, mode, number, persist);
         }
         else
         {
-            Log(Debug::Warning) << "Warning: Actors::playAnimationGroup: Unable to find " << ptr.getCellRef().getRefId();
+            Log(Debug::Warning) << "Warning: Actors::playAnimationGroup: Unable to find "
+                                << ptr.getCellRef().getRefId();
             return false;
         }
     }
@@ -1960,7 +2037,7 @@ namespace MWMechanics
     bool Actors::checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string& groupName) const
     {
         const auto iter = mIndex.find(ptr.mRef);
-        if(iter != mIndex.end())
+        if (iter != mIndex.end())
             return iter->second->getCharacterController().isAnimPlaying(groupName);
         return false;
     }
@@ -1975,7 +2052,7 @@ namespace MWMechanics
     {
         for (const Actor& actor : mActors)
         {
-            if ((actor.getPtr().getRefData().getPosition().asVec3() - position).length2() <= radius*radius)
+            if ((actor.getPtr().getRefData().getPosition().asVec3() - position).length2() <= radius * radius)
                 out.push_back(actor.getPtr());
         }
     }
@@ -1984,7 +2061,7 @@ namespace MWMechanics
     {
         for (const Actor& actor : mActors)
         {
-            if ((actor.getPtr().getRefData().getPosition().asVec3() - position).length2() <= radius*radius)
+            if ((actor.getPtr().getRefData().getPosition().asVec3() - position).length2() <= radius * radius)
                 return true;
         }
 
@@ -2002,25 +2079,27 @@ namespace MWMechanics
 
             const bool sameActor = (iteratedActor == actorPtr);
 
-            const CreatureStats &stats = iteratedActor.getClass().getCreatureStats(iteratedActor);
+            const CreatureStats& stats = iteratedActor.getClass().getCreatureStats(iteratedActor);
             if (stats.isDead())
                 continue;
 
-            // An actor counts as siding with this actor if Follow or Escort is the current AI package, or there are only Wander packages before the Follow/Escort package
-            // Actors that are targeted by this actor's Follow or Escort packages also side with them
+            // An actor counts as siding with this actor if Follow or Escort is the current AI package, or there are
+            // only Wander packages before the Follow/Escort package Actors that are targeted by this actor's Follow or
+            // Escort packages also side with them
             for (const auto& package : stats.getAiSequence())
             {
-                if (excludeInfighting && !sameActor && package->getTypeId() == AiPackageTypeId::Combat && package->getTarget() == actorPtr)
+                if (excludeInfighting && !sameActor && package->getTypeId() == AiPackageTypeId::Combat
+                    && package->getTarget() == actorPtr)
                     break;
                 if (package->sideWithTarget() && !package->getTarget().isEmpty())
                 {
                     if (sameActor)
                     {
-                        if(excludeInfighting)
+                        if (excludeInfighting)
                         {
                             MWWorld::Ptr ally = package->getTarget();
                             std::vector<MWWorld::Ptr> enemies;
-                            if(ally.getClass().getCreatureStats(ally).getAiSequence().getCombatTargets(enemies)
+                            if (ally.getClass().getCreatureStats(ally).getAiSequence().getCombatTargets(enemies)
                                 && std::find(enemies.begin(), enemies.end(), actorPtr) != enemies.end())
                                 break;
                         }
@@ -2032,7 +2111,8 @@ namespace MWMechanics
                     }
                     break;
                 }
-                else if (package->getTypeId() > AiPackageTypeId::Wander && package->getTypeId() <= AiPackageTypeId::Activate) // Don't count "fake" package types
+                else if (package->getTypeId() > AiPackageTypeId::Wander
+                    && package->getTypeId() <= AiPackageTypeId::Activate) // Don't count "fake" package types
                     break;
             }
         }
@@ -2042,49 +2122,51 @@ namespace MWMechanics
     std::vector<MWWorld::Ptr> Actors::getActorsFollowing(const MWWorld::Ptr& actorPtr) const
     {
         std::vector<MWWorld::Ptr> list;
-        forEachFollowingPackage(mActors, actorPtr, getPlayer(), [&] (const Actor& actor, const std::shared_ptr<AiPackage>& package)
-        {
-            if (package->followTargetThroughDoors() && package->getTarget() == actorPtr)
-                list.push_back(actor.getPtr());
-            else if (package->getTypeId() != AiPackageTypeId::Combat && package->getTypeId() != AiPackageTypeId::Wander)
-                return false;
-            return true;
-        });
+        forEachFollowingPackage(
+            mActors, actorPtr, getPlayer(), [&](const Actor& actor, const std::shared_ptr<AiPackage>& package) {
+                if (package->followTargetThroughDoors() && package->getTarget() == actorPtr)
+                    list.push_back(actor.getPtr());
+                else if (package->getTypeId() != AiPackageTypeId::Combat
+                    && package->getTypeId() != AiPackageTypeId::Wander)
+                    return false;
+                return true;
+            });
         return list;
     }
 
-    void Actors::getActorsFollowing(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out) const
+    void Actors::getActorsFollowing(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out) const
     {
         auto followers = getActorsFollowing(actor);
-        for(const MWWorld::Ptr &follower : followers)
+        for (const MWWorld::Ptr& follower : followers)
             if (out.insert(follower).second)
                 getActorsFollowing(follower, out);
     }
 
-    void Actors::getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out, bool excludeInfighting) const
+    void Actors::getActorsSidingWith(
+        const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out, bool excludeInfighting) const
     {
         auto followers = getActorsSidingWith(actor, excludeInfighting);
-        for(const MWWorld::Ptr &follower : followers)
+        for (const MWWorld::Ptr& follower : followers)
             if (out.insert(follower).second)
                 getActorsSidingWith(follower, out, excludeInfighting);
     }
 
-    void Actors::getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out,
+    void Actors::getActorsSidingWith(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out,
         std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr>>& cachedAllies) const
     {
         // If we have already found actor's allies, use the cache
-        std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr> >::const_iterator search = cachedAllies.find(actor);
+        std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr>>::const_iterator search = cachedAllies.find(actor);
         if (search != cachedAllies.end())
             out.insert(search->second.begin(), search->second.end());
         else
         {
-            for (const MWWorld::Ptr &follower : getActorsSidingWith(actor, true))
+            for (const MWWorld::Ptr& follower : getActorsSidingWith(actor, true))
                 if (out.insert(follower).second)
                     getActorsSidingWith(follower, out, cachedAllies);
 
             // Cache ptrs and their sets of allies
             cachedAllies.insert(std::make_pair(actor, out));
-            for (const MWWorld::Ptr &iter : out)
+            for (const MWWorld::Ptr& iter : out)
             {
                 search = cachedAllies.find(iter);
                 if (search == cachedAllies.end())
@@ -2093,38 +2175,40 @@ namespace MWMechanics
         }
     }
 
-    std::vector<int> Actors::getActorsFollowingIndices(const MWWorld::Ptr &actor) const
+    std::vector<int> Actors::getActorsFollowingIndices(const MWWorld::Ptr& actor) const
     {
         std::vector<int> list;
-        forEachFollowingPackage(mActors, actor, getPlayer(), [&] (const Actor&, const std::shared_ptr<AiPackage>& package)
-        {
-            if (package->followTargetThroughDoors() && package->getTarget() == actor)
-            {
-                list.push_back(static_cast<const AiFollow*>(package.get())->getFollowIndex());
-                return false;
-            }
-            else if (package->getTypeId() != AiPackageTypeId::Combat && package->getTypeId() != AiPackageTypeId::Wander)
-                return false;
-            return true;
-        });
+        forEachFollowingPackage(
+            mActors, actor, getPlayer(), [&](const Actor&, const std::shared_ptr<AiPackage>& package) {
+                if (package->followTargetThroughDoors() && package->getTarget() == actor)
+                {
+                    list.push_back(static_cast<const AiFollow*>(package.get())->getFollowIndex());
+                    return false;
+                }
+                else if (package->getTypeId() != AiPackageTypeId::Combat
+                    && package->getTypeId() != AiPackageTypeId::Wander)
+                    return false;
+                return true;
+            });
         return list;
     }
 
-    std::map<int, MWWorld::Ptr> Actors::getActorsFollowingByIndex(const MWWorld::Ptr &actor) const
+    std::map<int, MWWorld::Ptr> Actors::getActorsFollowingByIndex(const MWWorld::Ptr& actor) const
     {
         std::map<int, MWWorld::Ptr> map;
-        forEachFollowingPackage(mActors, actor, getPlayer(), [&] (const Actor& otherActor, const std::shared_ptr<AiPackage>& package)
-        {
-            if (package->followTargetThroughDoors() && package->getTarget() == actor)
-            {
-                const int index = static_cast<const AiFollow*>(package.get())->getFollowIndex();
-                map[index] = otherActor.getPtr();
-                return false;
-            }
-            else if (package->getTypeId() != AiPackageTypeId::Combat && package->getTypeId() != AiPackageTypeId::Wander)
-                return false;
-            return true;
-        });
+        forEachFollowingPackage(
+            mActors, actor, getPlayer(), [&](const Actor& otherActor, const std::shared_ptr<AiPackage>& package) {
+                if (package->followTargetThroughDoors() && package->getTarget() == actor)
+                {
+                    const int index = static_cast<const AiFollow*>(package.get())->getFollowIndex();
+                    map[index] = otherActor.getPtr();
+                    return false;
+                }
+                else if (package->getTypeId() != AiPackageTypeId::Combat
+                    && package->getTypeId() != AiPackageTypeId::Wander)
+                    return false;
+                return true;
+            });
         return map;
     }
 
@@ -2134,12 +2218,12 @@ namespace MWMechanics
         std::vector<MWWorld::Ptr> neighbors;
         const osg::Vec3f position(actor.getRefData().getPosition().asVec3());
         getObjectsInRange(position, mActorsProcessingRange, neighbors);
-        for(const MWWorld::Ptr& neighbor : neighbors)
+        for (const MWWorld::Ptr& neighbor : neighbors)
         {
             if (neighbor == actor)
                 continue;
 
-            const CreatureStats &stats = neighbor.getClass().getCreatureStats(neighbor);
+            const CreatureStats& stats = neighbor.getClass().getCreatureStats(neighbor);
             if (stats.isDead())
                 continue;
 
@@ -2153,39 +2237,38 @@ namespace MWMechanics
     {
         std::vector<MWWorld::Ptr> list;
         std::vector<MWWorld::Ptr> neighbors;
-        osg::Vec3f position (actor.getRefData().getPosition().asVec3());
+        osg::Vec3f position(actor.getRefData().getPosition().asVec3());
         getObjectsInRange(position, mActorsProcessingRange, neighbors);
 
         std::set<MWWorld::Ptr> followers;
         getActorsFollowing(actor, followers);
         for (const MWWorld::Ptr& neighbor : neighbors)
         {
-            const CreatureStats &stats = neighbor.getClass().getCreatureStats(neighbor);
+            const CreatureStats& stats = neighbor.getClass().getCreatureStats(neighbor);
             if (stats.isDead() || neighbor == actor || neighbor.getClass().isPureWaterCreature(neighbor))
                 continue;
 
             const bool isFollower = followers.find(neighbor) != followers.end();
 
             if (stats.getAiSequence().isInCombat(actor)
-                    || (MWBase::Environment::get().getMechanicsManager()->isAggressive(neighbor, actor) && !isFollower))
+                || (MWBase::Environment::get().getMechanicsManager()->isAggressive(neighbor, actor) && !isFollower))
                 list.push_back(neighbor);
         }
         return list;
     }
 
-
-    void Actors::write (ESM::ESMWriter& writer, Loading::Listener& listener) const
+    void Actors::write(ESM::ESMWriter& writer, Loading::Listener& listener) const
     {
         writer.startRecord(ESM::REC_DCOU);
         for (const auto& [id, count] : mDeathCount)
         {
             writer.writeHNString("ID__", id);
-            writer.writeHNT ("COUN", count);
+            writer.writeHNT("COUN", count);
         }
         writer.endRecord(ESM::REC_DCOU);
     }
 
-    void Actors::readRecord (ESM::ESMReader& reader, uint32_t type)
+    void Actors::readRecord(ESM::ESMReader& reader, uint32_t type)
     {
         if (type == ESM::REC_DCOU)
         {
@@ -2207,12 +2290,12 @@ namespace MWMechanics
         mDeathCount.clear();
     }
 
-    void Actors::updateMagicEffects(const MWWorld::Ptr &ptr) const
+    void Actors::updateMagicEffects(const MWWorld::Ptr& ptr) const
     {
         adjustMagicEffects(ptr, 0.f);
     }
 
-    bool Actors::isReadyToBlock(const MWWorld::Ptr &ptr) const
+    bool Actors::isReadyToBlock(const MWWorld::Ptr& ptr) const
     {
         const auto it = mIndex.find(ptr.mRef);
         if (it == mIndex.end())
@@ -2221,7 +2304,7 @@ namespace MWMechanics
         return it->second->getCharacterController().isReadyToBlock();
     }
 
-    bool Actors::isCastingSpell(const MWWorld::Ptr &ptr) const
+    bool Actors::isCastingSpell(const MWWorld::Ptr& ptr) const
     {
         const auto it = mIndex.find(ptr.mRef);
         if (it == mIndex.end())
@@ -2284,9 +2367,7 @@ namespace MWMechanics
         {
             const MWWorld::Ptr ptr = it->getPtr();
             ++it;
-            if (ptr == getPlayer()
-                    || !isConscious(ptr)
-                    || ptr.getClass().getCreatureStats(ptr).isParalyzed())
+            if (ptr == getPlayer() || !isConscious(ptr) || ptr.getClass().getCreatureStats(ptr).isParalyzed())
                 continue;
             MWMechanics::AiSequence& seq = ptr.getClass().getCreatureStats(ptr).getAiSequence();
             seq.fastForward(ptr);
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index c2102615f3..f9ce7eb3cc 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -1,11 +1,11 @@
 #ifndef GAME_MWMECHANICS_ACTORS_H
 #define GAME_MWMECHANICS_ACTORS_H
 
-#include <set>
-#include <vector>
-#include <string>
 #include <list>
 #include <map>
+#include <set>
+#include <string>
+#include <vector>
 
 #include "actor.hpp"
 
@@ -39,185 +39,182 @@ namespace MWMechanics
 
     class Actors
     {
-        public:
-
-            Actors();
-
-            std::list<Actor>::const_iterator begin() const { return mActors.begin(); }
-            std::list<Actor>::const_iterator end() const { return mActors.end(); }
-            std::size_t size() const { return mActors.size(); }
+    public:
+        Actors();
 
-            void notifyDied(const MWWorld::Ptr &actor);
+        std::list<Actor>::const_iterator begin() const { return mActors.begin(); }
+        std::list<Actor>::const_iterator end() const { return mActors.end(); }
+        std::size_t size() const { return mActors.size(); }
 
-            /// Check if the target actor was detected by an observer
-            /// If the observer is a non-NPC, check all actors in AI processing distance as observers
-            bool isActorDetected(const MWWorld::Ptr& actor, const MWWorld::Ptr& observer) const;
+        void notifyDied(const MWWorld::Ptr& actor);
 
-            /// Update magic effects for an actor. Usually done automatically once per frame, but if we're currently
-            /// paused we may want to do it manually (after equipping permanent enchantment)
-            void updateMagicEffects(const MWWorld::Ptr& ptr) const;
+        /// Check if the target actor was detected by an observer
+        /// If the observer is a non-NPC, check all actors in AI processing distance as observers
+        bool isActorDetected(const MWWorld::Ptr& actor, const MWWorld::Ptr& observer) const;
 
-            void updateProcessingRange();
-            float getProcessingRange() const;
+        /// Update magic effects for an actor. Usually done automatically once per frame, but if we're currently
+        /// paused we may want to do it manually (after equipping permanent enchantment)
+        void updateMagicEffects(const MWWorld::Ptr& ptr) const;
 
-            void addActor (const MWWorld::Ptr& ptr, bool updateImmediately=false);
-            ///< Register an actor for stats management
-            ///
-            /// \note Dead actors are ignored.
+        void updateProcessingRange();
+        float getProcessingRange() const;
 
-            void removeActor (const MWWorld::Ptr& ptr, bool keepActive);
-            ///< Deregister an actor for stats management
-            ///
-            /// \note Ignored, if \a ptr is not a registered actor.
+        void addActor(const MWWorld::Ptr& ptr, bool updateImmediately = false);
+        ///< Register an actor for stats management
+        ///
+        /// \note Dead actors are ignored.
 
-            void resurrect(const MWWorld::Ptr& ptr) const;
+        void removeActor(const MWWorld::Ptr& ptr, bool keepActive);
+        ///< Deregister an actor for stats management
+        ///
+        /// \note Ignored, if \a ptr is not a registered actor.
 
-            void castSpell(const MWWorld::Ptr& ptr, const std::string& spellId, bool manualSpell = false) const;
+        void resurrect(const MWWorld::Ptr& ptr) const;
 
-            void updateActor(const MWWorld::Ptr &old, const MWWorld::Ptr& ptr) const;
-            ///< Updates an actor with a new Ptr
+        void castSpell(const MWWorld::Ptr& ptr, const std::string& spellId, bool manualSpell = false) const;
 
-            void dropActors (const MWWorld::CellStore *cellStore, const MWWorld::Ptr& ignore);
-            ///< Deregister all actors (except for \a ignore) in the given cell.
+        void updateActor(const MWWorld::Ptr& old, const MWWorld::Ptr& ptr) const;
+        ///< Updates an actor with a new Ptr
 
-            void updateCombatMusic();
-            ///< Update combat music state
+        void dropActors(const MWWorld::CellStore* cellStore, const MWWorld::Ptr& ignore);
+        ///< Deregister all actors (except for \a ignore) in the given cell.
 
-            void update (float duration, bool paused);
-            ///< Update actor stats and store desired velocity vectors in \a movement
+        void updateCombatMusic();
+        ///< Update combat music state
 
-            void updateActor(const MWWorld::Ptr& ptr, float duration) const;
-            ///< This function is normally called automatically during the update process, but it can
-            /// also be called explicitly at any time to force an update.
+        void update(float duration, bool paused);
+        ///< Update actor stats and store desired velocity vectors in \a movement
 
-            /// Removes an actor from combat and makes all of their allies stop fighting the actor's targets
-            void stopCombat(const MWWorld::Ptr& ptr) const;
+        void updateActor(const MWWorld::Ptr& ptr, float duration) const;
+        ///< This function is normally called automatically during the update process, but it can
+        /// also be called explicitly at any time to force an update.
 
-            void playIdleDialogue(const MWWorld::Ptr& actor) const;
-            void updateMovementSpeed(const MWWorld::Ptr& actor) const;
-            void updateGreetingState(const MWWorld::Ptr& actor, Actor& actorState, bool turnOnly);
-            void turnActorToFacePlayer(const MWWorld::Ptr& actor, Actor& actorState, const osg::Vec3f& dir) const;
+        /// Removes an actor from combat and makes all of their allies stop fighting the actor's targets
+        void stopCombat(const MWWorld::Ptr& ptr) const;
 
-            void rest(double hours, bool sleep) const;
-            ///< Update actors while the player is waiting or sleeping.
+        void playIdleDialogue(const MWWorld::Ptr& actor) const;
+        void updateMovementSpeed(const MWWorld::Ptr& actor) const;
+        void updateGreetingState(const MWWorld::Ptr& actor, Actor& actorState, bool turnOnly);
+        void turnActorToFacePlayer(const MWWorld::Ptr& actor, Actor& actorState, const osg::Vec3f& dir) const;
 
-            void updateSneaking(CharacterController* ctrl, float duration);
-            ///< Update the sneaking indicator state according to the given player character controller.
+        void rest(double hours, bool sleep) const;
+        ///< Update actors while the player is waiting or sleeping.
 
-            void restoreDynamicStats(const MWWorld::Ptr& actor, double hours, bool sleep) const;
+        void updateSneaking(CharacterController* ctrl, float duration);
+        ///< Update the sneaking indicator state according to the given player character controller.
 
-            int getHoursToRest(const MWWorld::Ptr& ptr) const;
-            ///< Calculate how many hours the given actor needs to rest in order to be fully healed
+        void restoreDynamicStats(const MWWorld::Ptr& actor, double hours, bool sleep) const;
 
-            void fastForwardAi() const;
-            ///< Simulate the passing of time
+        int getHoursToRest(const MWWorld::Ptr& ptr) const;
+        ///< Calculate how many hours the given actor needs to rest in order to be fully healed
 
-            int countDeaths (const std::string& id) const;
-            ///< Return the number of deaths for actors with the given ID.
+        void fastForwardAi() const;
+        ///< Simulate the passing of time
 
-            bool isAttackPreparing(const MWWorld::Ptr& ptr) const;
-            bool isRunning(const MWWorld::Ptr& ptr) const;
-            bool isSneaking(const MWWorld::Ptr& ptr) const;
+        int countDeaths(const std::string& id) const;
+        ///< Return the number of deaths for actors with the given ID.
 
-            void forceStateUpdate(const MWWorld::Ptr &ptr) const;
+        bool isAttackPreparing(const MWWorld::Ptr& ptr) const;
+        bool isRunning(const MWWorld::Ptr& ptr) const;
+        bool isSneaking(const MWWorld::Ptr& ptr) const;
 
-            bool playAnimationGroup(const MWWorld::Ptr& ptr, std::string_view groupName, int mode,
-                int number, bool persist = false) const;
-            void skipAnimation(const MWWorld::Ptr& ptr) const;
-            bool checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string& groupName) const;
-            void persistAnimationStates() const;
+        void forceStateUpdate(const MWWorld::Ptr& ptr) const;
 
-            void getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out) const;
+        bool playAnimationGroup(
+            const MWWorld::Ptr& ptr, std::string_view groupName, int mode, int number, bool persist = false) const;
+        void skipAnimation(const MWWorld::Ptr& ptr) const;
+        bool checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string& groupName) const;
+        void persistAnimationStates() const;
 
-            bool isAnyObjectInRange(const osg::Vec3f& position, float radius) const;
+        void getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out) const;
 
-            void cleanupSummonedCreature(CreatureStats& casterStats, int creatureActorId) const;
+        bool isAnyObjectInRange(const osg::Vec3f& position, float radius) const;
 
-            ///Returns the list of actors which are siding with the given actor in fights
-            /**ie AiFollow or AiEscort is active and the target is the actor **/
-            std::vector<MWWorld::Ptr> getActorsSidingWith(const MWWorld::Ptr& actor,
-                bool excludeInfighting = false) const;
-            std::vector<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor) const;
+        void cleanupSummonedCreature(CreatureStats& casterStats, int creatureActorId) const;
 
-            /// Recursive version of getActorsFollowing
-            void getActorsFollowing(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out) const;
-            /// Recursive version of getActorsSidingWith
-            void getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out,
-                bool excludeInfighting = false) const;
+        /// Returns the list of actors which are siding with the given actor in fights
+        /**ie AiFollow or AiEscort is active and the target is the actor **/
+        std::vector<MWWorld::Ptr> getActorsSidingWith(const MWWorld::Ptr& actor, bool excludeInfighting = false) const;
+        std::vector<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor) const;
 
-            /// Get the list of AiFollow::mFollowIndex for all actors following this target
-            std::vector<int> getActorsFollowingIndices(const MWWorld::Ptr& actor) const;
-            std::map<int, MWWorld::Ptr> getActorsFollowingByIndex(const MWWorld::Ptr& actor) const;
+        /// Recursive version of getActorsFollowing
+        void getActorsFollowing(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out) const;
+        /// Recursive version of getActorsSidingWith
+        void getActorsSidingWith(
+            const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out, bool excludeInfighting = false) const;
 
-            ///Returns the list of actors which are fighting the given actor
-            /**ie AiCombat is active and the target is the actor **/
-            std::vector<MWWorld::Ptr> getActorsFighting(const MWWorld::Ptr& actor) const;
+        /// Get the list of AiFollow::mFollowIndex for all actors following this target
+        std::vector<int> getActorsFollowingIndices(const MWWorld::Ptr& actor) const;
+        std::map<int, MWWorld::Ptr> getActorsFollowingByIndex(const MWWorld::Ptr& actor) const;
 
-            /// Unlike getActorsFighting, also returns actors that *would* fight the given actor if they saw him.
-            std::vector<MWWorld::Ptr> getEnemiesNearby(const MWWorld::Ptr& actor) const;
+        /// Returns the list of actors which are fighting the given actor
+        /**ie AiCombat is active and the target is the actor **/
+        std::vector<MWWorld::Ptr> getActorsFighting(const MWWorld::Ptr& actor) const;
 
-            void write (ESM::ESMWriter& writer, Loading::Listener& listener) const;
+        /// Unlike getActorsFighting, also returns actors that *would* fight the given actor if they saw him.
+        std::vector<MWWorld::Ptr> getEnemiesNearby(const MWWorld::Ptr& actor) const;
 
-            void readRecord (ESM::ESMReader& reader, uint32_t type);
+        void write(ESM::ESMWriter& writer, Loading::Listener& listener) const;
 
-            void clear(); // Clear death counter
+        void readRecord(ESM::ESMReader& reader, uint32_t type);
 
-            bool isCastingSpell(const MWWorld::Ptr& ptr) const;
-            bool isReadyToBlock(const MWWorld::Ptr& ptr) const;
-            bool isAttackingOrSpell(const MWWorld::Ptr& ptr) const;
+        void clear(); // Clear death counter
 
-            int getGreetingTimer(const MWWorld::Ptr& ptr) const;
-            float getAngleToPlayer(const MWWorld::Ptr& ptr) const;
-            GreetingState getGreetingState(const MWWorld::Ptr& ptr) const;
-            bool isTurningToPlayer(const MWWorld::Ptr& ptr) const;
+        bool isCastingSpell(const MWWorld::Ptr& ptr) const;
+        bool isReadyToBlock(const MWWorld::Ptr& ptr) const;
+        bool isAttackingOrSpell(const MWWorld::Ptr& ptr) const;
 
-        private:
-            enum class MusicType
-            {
-                Title,
-                Explore,
-                Battle
-            };
+        int getGreetingTimer(const MWWorld::Ptr& ptr) const;
+        float getAngleToPlayer(const MWWorld::Ptr& ptr) const;
+        GreetingState getGreetingState(const MWWorld::Ptr& ptr) const;
+        bool isTurningToPlayer(const MWWorld::Ptr& ptr) const;
 
-            std::map<std::string, int> mDeathCount;
-            std::list<Actor> mActors;
-            std::map<const MWWorld::LiveCellRefBase*, std::list<Actor>::iterator> mIndex;
-            float mTimerDisposeSummonsCorpses;
-            float mTimerUpdateHeadTrack = 0;
-            float mTimerUpdateEquippedLight = 0;
-            float mTimerUpdateHello = 0;
-            float mSneakTimer = 0; // Times update of sneak icon
-            float mSneakSkillTimer = 0; // Times sneak skill progress from "avoid notice"
-            float mActorsProcessingRange;
-            bool mSmoothMovement;
-            MusicType mCurrentMusic = MusicType::Title;
+    private:
+        enum class MusicType
+        {
+            Title,
+            Explore,
+            Battle
+        };
 
-            void updateVisibility(const MWWorld::Ptr& ptr, CharacterController& ctrl) const;
+        std::map<std::string, int> mDeathCount;
+        std::list<Actor> mActors;
+        std::map<const MWWorld::LiveCellRefBase*, std::list<Actor>::iterator> mIndex;
+        float mTimerDisposeSummonsCorpses;
+        float mTimerUpdateHeadTrack = 0;
+        float mTimerUpdateEquippedLight = 0;
+        float mTimerUpdateHello = 0;
+        float mSneakTimer = 0; // Times update of sneak icon
+        float mSneakSkillTimer = 0; // Times sneak skill progress from "avoid notice"
+        float mActorsProcessingRange;
+        bool mSmoothMovement;
+        MusicType mCurrentMusic = MusicType::Title;
 
-            void adjustMagicEffects(const MWWorld::Ptr& creature, float duration) const;
+        void updateVisibility(const MWWorld::Ptr& ptr, CharacterController& ctrl) const;
 
-            void calculateRestoration(const MWWorld::Ptr& ptr, float duration) const;
+        void adjustMagicEffects(const MWWorld::Ptr& creature, float duration) const;
 
-            void updateCrimePursuit(const MWWorld::Ptr& ptr, float duration) const;
+        void calculateRestoration(const MWWorld::Ptr& ptr, float duration) const;
 
-            void killDeadActors ();
+        void updateCrimePursuit(const MWWorld::Ptr& ptr, float duration) const;
 
-            void purgeSpellEffects(int casterActorId) const;
+        void killDeadActors();
 
-            void predictAndAvoidCollisions(float duration) const;
+        void purgeSpellEffects(int casterActorId) const;
 
-            /** Start combat between two actors
-                @Notes: If againstPlayer = true then actor2 should be the Player.
-                        If one of the combatants is creature it should be actor1.
-            */
-            void engageCombat(const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2,
-                std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr>>& cachedAllies, bool againstPlayer) const;
+        void predictAndAvoidCollisions(float duration) const;
 
-            /// Recursive version of getActorsSidingWith that takes, adds to and returns a cache of
-            /// actors mapped to their allies. Excludes infighting
-            void getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out,
-                std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr>>& cachedAllies) const;
+        /** Start combat between two actors
+            @Notes: If againstPlayer = true then actor2 should be the Player.
+                    If one of the combatants is creature it should be actor1.
+        */
+        void engageCombat(const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2,
+            std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr>>& cachedAllies, bool againstPlayer) const;
 
+        /// Recursive version of getActorsSidingWith that takes, adds to and returns a cache of
+        /// actors mapped to their allies. Excludes infighting
+        void getActorsSidingWith(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out,
+            std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr>>& cachedAllies) const;
     };
 }
 
diff --git a/apps/openmw/mwmechanics/actorutil.cpp b/apps/openmw/mwmechanics/actorutil.cpp
index 3c6c9593c2..5b255b3d78 100644
--- a/apps/openmw/mwmechanics/actorutil.cpp
+++ b/apps/openmw/mwmechanics/actorutil.cpp
@@ -1,13 +1,13 @@
 #include "actorutil.hpp"
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/player.hpp"
 
-#include "../mwmechanics/magiceffects.hpp"
 #include "../mwmechanics/creaturestats.hpp"
+#include "../mwmechanics/magiceffects.hpp"
 
 #include <components/esm3/loadmgef.hpp>
 
diff --git a/apps/openmw/mwmechanics/aiactivate.cpp b/apps/openmw/mwmechanics/aiactivate.cpp
index d5bb335936..43dcb33a7a 100644
--- a/apps/openmw/mwmechanics/aiactivate.cpp
+++ b/apps/openmw/mwmechanics/aiactivate.cpp
@@ -2,8 +2,8 @@
 
 #include <components/esm3/aisequence.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
 
@@ -14,13 +14,16 @@
 namespace MWMechanics
 {
     AiActivate::AiActivate(std::string_view objectId, bool repeat)
-        : TypedAiPackage<AiActivate>(repeat), mObjectId(objectId)
+        : TypedAiPackage<AiActivate>(repeat)
+        , mObjectId(objectId)
     {
     }
 
-    bool AiActivate::execute(const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
+    bool AiActivate::execute(
+        const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
     {
-        const MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtr(mObjectId, false); //The target to follow
+        const MWWorld::Ptr target
+            = MWBase::Environment::get().getWorld()->searchPtr(mObjectId, false); // The target to follow
 
         actor.getClass().getCreatureStats(actor).setDrawState(DrawState::Nothing);
 
@@ -30,7 +33,8 @@ namespace MWMechanics
             return true;
 
         // Turn to target and move to it directly, without pathfinding.
-        const osg::Vec3f targetDir = target.getRefData().getPosition().asVec3() - actor.getRefData().getPosition().asVec3();
+        const osg::Vec3f targetDir
+            = target.getRefData().getPosition().asVec3() - actor.getRefData().getPosition().asVec3();
 
         zTurn(actor, std::atan2(targetDir.x(), targetDir.y()), 0.f);
         actor.getClass().getMovementSettings(actor).mPosition[1] = 1;
@@ -38,13 +42,14 @@ namespace MWMechanics
 
         if (MWBase::Environment::get().getWorld()->getMaxActivationDistance() >= targetDir.length())
         {
-            // Note: we intentionally do not cancel package after activation here for backward compatibility with original engine.
+            // Note: we intentionally do not cancel package after activation here for backward compatibility with
+            // original engine.
             MWBase::Environment::get().getWorld()->activate(target, actor);
         }
         return false;
     }
 
-    void AiActivate::writeState(ESM::AiSequence::AiSequence &sequence) const
+    void AiActivate::writeState(ESM::AiSequence::AiSequence& sequence) const
     {
         auto activate = std::make_unique<ESM::AiSequence::AiActivate>();
         activate->mTargetId = mObjectId;
@@ -56,7 +61,7 @@ namespace MWMechanics
         sequence.mPackages.push_back(std::move(package));
     }
 
-    AiActivate::AiActivate(const ESM::AiSequence::AiActivate *activate)
+    AiActivate::AiActivate(const ESM::AiSequence::AiActivate* activate)
         : AiActivate(activate->mTargetId, activate->mRepeat)
     {
     }
diff --git a/apps/openmw/mwmechanics/aiactivate.hpp b/apps/openmw/mwmechanics/aiactivate.hpp
index f8686d746b..01b469f3aa 100644
--- a/apps/openmw/mwmechanics/aiactivate.hpp
+++ b/apps/openmw/mwmechanics/aiactivate.hpp
@@ -8,10 +8,10 @@
 
 namespace ESM
 {
-namespace AiSequence
-{
-    struct AiActivate;
-}
+    namespace AiSequence
+    {
+        struct AiActivate;
+    }
 }
 
 namespace MWMechanics
@@ -20,21 +20,22 @@ namespace MWMechanics
     /** Will activate when close to object **/
     class AiActivate final : public TypedAiPackage<AiActivate>
     {
-        public:
-            /// Constructor
-            /** \param objectId Reference to object to activate **/
-            explicit AiActivate(std::string_view objectId, bool repeat);
+    public:
+        /// Constructor
+        /** \param objectId Reference to object to activate **/
+        explicit AiActivate(std::string_view objectId, bool repeat);
 
-            explicit AiActivate(const ESM::AiSequence::AiActivate* activate);
+        explicit AiActivate(const ESM::AiSequence::AiActivate* activate);
 
-            bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) override;
+        bool execute(const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state,
+            float duration) override;
 
-            static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::Activate; }
+        static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::Activate; }
 
-            void writeState(ESM::AiSequence::AiSequence& sequence) const override;
+        void writeState(ESM::AiSequence::AiSequence& sequence) const override;
 
-        private:
-            const std::string mObjectId;
+    private:
+        const std::string mObjectId;
     };
 }
 #endif // GAME_MWMECHANICS_AIACTIVATE_H
diff --git a/apps/openmw/mwmechanics/aiavoiddoor.cpp b/apps/openmw/mwmechanics/aiavoiddoor.cpp
index e8cb71add0..1f229f61bf 100644
--- a/apps/openmw/mwmechanics/aiavoiddoor.cpp
+++ b/apps/openmw/mwmechanics/aiavoiddoor.cpp
@@ -2,56 +2,58 @@
 
 #include <components/misc/rng.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
 
+#include "actorutil.hpp"
 #include "creaturestats.hpp"
 #include "movement.hpp"
-#include "actorutil.hpp"
 #include "steering.hpp"
 
 static const int MAX_DIRECTIONS = 4;
 
 MWMechanics::AiAvoidDoor::AiAvoidDoor(const MWWorld::ConstPtr& doorPtr)
-: mDuration(1), mDoorPtr(doorPtr), mDirection(0)
+    : mDuration(1)
+    , mDoorPtr(doorPtr)
+    , mDirection(0)
 {
-
 }
 
-bool MWMechanics::AiAvoidDoor::execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
+bool MWMechanics::AiAvoidDoor::execute(
+    const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
 {
 
     ESM::Position pos = actor.getRefData().getPosition();
-    if(mDuration == 1) //If it just started, get the actor position as the stuck detection thing
+    if (mDuration == 1) // If it just started, get the actor position as the stuck detection thing
         mLastPos = pos.asVec3();
 
-    mDuration -= duration; //Update timer
+    mDuration -= duration; // Update timer
 
     if (mDuration < 0)
     {
         if (isStuck(pos.asVec3()))
         {
             adjustDirection();
-            mDuration = 1; //reset timer
+            mDuration = 1; // reset timer
         }
         else
             return true; // We have tried backing up for more than one second, we've probably cleared it
     }
 
     if (mDoorPtr.getClass().getDoorState(mDoorPtr) == MWWorld::DoorState::Idle)
-        return true; //Door is no longer opening
+        return true; // Door is no longer opening
 
-    ESM::Position tPos = mDoorPtr.getRefData().getPosition(); //Position of the door
+    ESM::Position tPos = mDoorPtr.getRefData().getPosition(); // Position of the door
     float x = pos.pos[1] - tPos.pos[1];
     float y = pos.pos[0] - tPos.pos[0];
 
     actor.getClass().getCreatureStats(actor).setMovementFlag(CreatureStats::Flag_Run, true);
 
     // Turn away from the door and move when turn completed
-    if (zTurn(actor, std::atan2(y,x) + getAdjustedAngle(), osg::DegreesToRadians(5.f)))
+    if (zTurn(actor, std::atan2(y, x) + getAdjustedAngle(), osg::DegreesToRadians(5.f)))
         actor.getClass().getMovementSettings(actor).mPosition[1] = 1;
     else
         actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
@@ -59,8 +61,8 @@ bool MWMechanics::AiAvoidDoor::execute (const MWWorld::Ptr& actor, CharacterCont
 
     // Make all nearby actors also avoid the door
     std::vector<MWWorld::Ptr> actors;
-    MWBase::Environment::get().getMechanicsManager()->getActorsInRange(pos.asVec3(),100,actors);
-    for(auto& neighbor : actors)
+    MWBase::Environment::get().getMechanicsManager()->getActorsInRange(pos.asVec3(), 100, actors);
+    for (auto& neighbor : actors)
     {
         if (neighbor == getPlayer())
             continue;
diff --git a/apps/openmw/mwmechanics/aiavoiddoor.hpp b/apps/openmw/mwmechanics/aiavoiddoor.hpp
index 5a91bb012d..8b268ef816 100644
--- a/apps/openmw/mwmechanics/aiavoiddoor.hpp
+++ b/apps/openmw/mwmechanics/aiavoiddoor.hpp
@@ -6,39 +6,40 @@
 namespace MWMechanics
 {
     /// \brief AiPackage to have an actor avoid an opening door
-    /** The AI will retreat from the door until it has finished opening, walked far away from it, or one second has passed, in an attempt to avoid it
-    **/
+    /** The AI will retreat from the door until it has finished opening, walked far away from it, or one second has
+     *passed, in an attempt to avoid it
+     **/
     class AiAvoidDoor final : public TypedAiPackage<AiAvoidDoor>
     {
-        public:
-            /// Avoid door until the door is fully open
-            explicit AiAvoidDoor(const MWWorld::ConstPtr& doorPtr);
+    public:
+        /// Avoid door until the door is fully open
+        explicit AiAvoidDoor(const MWWorld::ConstPtr& doorPtr);
 
-            bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) override;
+        bool execute(const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state,
+            float duration) override;
 
-            static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::AvoidDoor; }
+        static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::AvoidDoor; }
 
-            static constexpr Options makeDefaultOptions()
-            {
-                AiPackage::Options options;
-                options.mPriority = 2;
-                options.mCanCancel = false;
-                options.mShouldCancelPreviousAi = false;
-                return options;
-            }
+        static constexpr Options makeDefaultOptions()
+        {
+            AiPackage::Options options;
+            options.mPriority = 2;
+            options.mCanCancel = false;
+            options.mShouldCancelPreviousAi = false;
+            return options;
+        }
 
-        private:
-            float mDuration;
-            const MWWorld::ConstPtr mDoorPtr;
-            osg::Vec3f mLastPos;
-            int mDirection;
+    private:
+        float mDuration;
+        const MWWorld::ConstPtr mDoorPtr;
+        osg::Vec3f mLastPos;
+        int mDirection;
 
-            bool isStuck(const osg::Vec3f& actorPos) const;
+        bool isStuck(const osg::Vec3f& actorPos) const;
 
-            void adjustDirection();
+        void adjustDirection();
 
-            float getAdjustedAngle() const;
+        float getAdjustedAngle() const;
     };
 }
 #endif
-
diff --git a/apps/openmw/mwmechanics/aibreathe.cpp b/apps/openmw/mwmechanics/aibreathe.cpp
index 94e4ecd955..e437547a7a 100644
--- a/apps/openmw/mwmechanics/aibreathe.cpp
+++ b/apps/openmw/mwmechanics/aibreathe.cpp
@@ -1,7 +1,7 @@
 #include "aibreathe.hpp"
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
@@ -11,9 +11,15 @@
 #include "movement.hpp"
 #include "steering.hpp"
 
-bool MWMechanics::AiBreathe::execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
+bool MWMechanics::AiBreathe::execute(
+    const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
 {
-    static const float fHoldBreathTime = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fHoldBreathTime")->mValue.getFloat();
+    static const float fHoldBreathTime = MWBase::Environment::get()
+                                             .getWorld()
+                                             ->getStore()
+                                             .get<ESM::GameSetting>()
+                                             .find("fHoldBreathTime")
+                                             ->mValue.getFloat();
 
     const MWWorld::Class& actorClass = actor.getClass();
     if (actorClass.isNpc())
diff --git a/apps/openmw/mwmechanics/aibreathe.hpp b/apps/openmw/mwmechanics/aibreathe.hpp
index b84c0eb76e..6b2bdfed8e 100644
--- a/apps/openmw/mwmechanics/aibreathe.hpp
+++ b/apps/openmw/mwmechanics/aibreathe.hpp
@@ -9,19 +9,20 @@ namespace MWMechanics
     // The AI will go up if lesser than half breath left
     class AiBreathe final : public TypedAiPackage<AiBreathe>
     {
-        public:
-            bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) override;
+    public:
+        bool execute(const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state,
+            float duration) override;
 
-            static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::Breathe; }
+        static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::Breathe; }
 
-            static constexpr Options makeDefaultOptions()
-            {
-                AiPackage::Options options;
-                options.mPriority = 2;
-                options.mCanCancel = false;
-                options.mShouldCancelPreviousAi = false;
-                return options;
-            }
+        static constexpr Options makeDefaultOptions()
+        {
+            AiPackage::Options options;
+            options.mPriority = 2;
+            options.mCanCancel = false;
+            options.mShouldCancelPreviousAi = false;
+            return options;
+        }
     };
 }
 #endif
diff --git a/apps/openmw/mwmechanics/aicast.cpp b/apps/openmw/mwmechanics/aicast.cpp
index 630c04a6a7..91876f2f04 100644
--- a/apps/openmw/mwmechanics/aicast.cpp
+++ b/apps/openmw/mwmechanics/aicast.cpp
@@ -26,11 +26,16 @@ namespace MWMechanics
 }
 
 MWMechanics::AiCast::AiCast(const std::string& targetId, const std::string& spellId, bool manualSpell)
-    : mTargetId(targetId), mSpellId(spellId), mCasting(false), mManual(manualSpell), mDistance(getInitialDistance(spellId))
+    : mTargetId(targetId)
+    , mSpellId(spellId)
+    , mCasting(false)
+    , mManual(manualSpell)
+    , mDistance(getInitialDistance(spellId))
 {
 }
 
-bool MWMechanics::AiCast::execute(const MWWorld::Ptr& actor, MWMechanics::CharacterController& characterController, MWMechanics::AiState& state, float duration)
+bool MWMechanics::AiCast::execute(const MWWorld::Ptr& actor, MWMechanics::CharacterController& characterController,
+    MWMechanics::AiState& state, float duration)
 {
     MWWorld::Ptr target;
     if (actor.getCellRef().getRefId() == mTargetId)
diff --git a/apps/openmw/mwmechanics/aicast.hpp b/apps/openmw/mwmechanics/aicast.hpp
index 9758c2b94d..e3ab224d7d 100644
--- a/apps/openmw/mwmechanics/aicast.hpp
+++ b/apps/openmw/mwmechanics/aicast.hpp
@@ -11,31 +11,33 @@ namespace MWWorld
 namespace MWMechanics
 {
     /// AiPackage which makes an actor to cast given spell.
-    class AiCast final : public TypedAiPackage<AiCast> {
-        public:
-            AiCast(const std::string& targetId, const std::string& spellId, bool manualSpell=false);
-
-            bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) override;
-
-            static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::Cast; }
-
-            MWWorld::Ptr getTarget() const override;
-
-            static constexpr Options makeDefaultOptions()
-            {
-                AiPackage::Options options;
-                options.mPriority = 3;
-                options.mCanCancel = false;
-                options.mShouldCancelPreviousAi = false;
-                return options;
-            }
-
-        private:
-            const std::string mTargetId;
-            const std::string mSpellId;
-            bool mCasting;
-            const bool mManual;
-            const float mDistance;
+    class AiCast final : public TypedAiPackage<AiCast>
+    {
+    public:
+        AiCast(const std::string& targetId, const std::string& spellId, bool manualSpell = false);
+
+        bool execute(const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state,
+            float duration) override;
+
+        static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::Cast; }
+
+        MWWorld::Ptr getTarget() const override;
+
+        static constexpr Options makeDefaultOptions()
+        {
+            AiPackage::Options options;
+            options.mPriority = 3;
+            options.mCanCancel = false;
+            options.mShouldCancelPreviousAi = false;
+            return options;
+        }
+
+    private:
+        const std::string mTargetId;
+        const std::string mSpellId;
+        bool mCasting;
+        const bool mManual;
+        const float mDistance;
     };
 }
 
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 2be388568b..6a21411315 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -1,42 +1,42 @@
 #include "aicombat.hpp"
 
-#include <components/misc/rng.hpp>
 #include <components/misc/coordinateconverter.hpp>
+#include <components/misc/rng.hpp>
 
 #include <components/esm3/aisequence.hpp>
 
 #include <components/misc/mathutil.hpp>
 
-#include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/detournavigator/navigatorutils.hpp>
+#include <components/sceneutil/positionattitudetransform.hpp>
 
 #include "../mwphysics/collisiontype.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 
-#include "../mwbase/environment.hpp"
 #include "../mwbase/dialoguemanager.hpp"
+#include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/world.hpp"
 
-#include "pathgrid.hpp"
+#include "actorutil.hpp"
+#include "aicombataction.hpp"
+#include "character.hpp"
 #include "creaturestats.hpp"
-#include "steering.hpp"
 #include "movement.hpp"
-#include "character.hpp"
-#include "aicombataction.hpp"
-#include "actorutil.hpp"
+#include "pathgrid.hpp"
+#include "steering.hpp"
 #include "weapontype.hpp"
 
 namespace
 {
 
-    //chooses an attack depending on probability to avoid uniformity
+    // chooses an attack depending on probability to avoid uniformity
     std::string_view chooseBestAttack(const ESM::Weapon* weapon);
 
-    osg::Vec3f AimDirToMovingTarget(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, const osg::Vec3f& vLastTargetPos,
-        float duration, int weapType, float strength);
+    osg::Vec3f AimDirToMovingTarget(const MWWorld::Ptr& actor, const MWWorld::Ptr& target,
+        const osg::Vec3f& vLastTargetPos, float duration, int weapType, float strength);
 }
 
 namespace MWMechanics
@@ -46,15 +46,12 @@ namespace MWMechanics
         mTargetActorId = actor.getClass().getCreatureStats(actor).getActorId();
     }
 
-    AiCombat::AiCombat(const ESM::AiSequence::AiCombat *combat)
+    AiCombat::AiCombat(const ESM::AiSequence::AiCombat* combat)
     {
         mTargetActorId = combat->mTargetActorId;
     }
 
-    void AiCombat::init()
-    {
-
-    }
+    void AiCombat::init() {}
 
     /*
      * Current AiCombat movement states (as of 0.29.0), ignoring the details of the
@@ -103,12 +100,13 @@ namespace MWMechanics
      * whether the target was hit, etc.
      */
 
-    bool AiCombat::execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
+    bool AiCombat::execute(
+        const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
     {
         // get or create temporary storage
         AiCombatStorage& storage = state.get<AiCombatStorage>();
-        
-        //General description
+
+        // General description
         if (actor.getClass().getCreatureStats(actor).isDead())
             return true;
 
@@ -116,9 +114,10 @@ namespace MWMechanics
         if (target.isEmpty())
             return false;
 
-        if(!target.getRefData().getCount() || !target.getRefData().isEnabled()  // Really we should be checking whether the target is currently registered
-                                                                                // with the MechanicsManager
-                || target.getClass().getCreatureStats(target).isDead())
+        if (!target.getRefData().getCount()
+            || !target.getRefData().isEnabled() // Really we should be checking whether the target is currently
+                                                // registered with the MechanicsManager
+            || target.getClass().getCreatureStats(target).isDead())
             return true;
 
         if (actor == target) // This should never happen.
@@ -128,19 +127,22 @@ namespace MWMechanics
         {
             if (storage.mCurrentAction.get()) // need to wait to init action with its attack range
             {
-                //Update every frame. UpdateLOS uses a timer, so the LOS check does not happen every frame.
+                // Update every frame. UpdateLOS uses a timer, so the LOS check does not happen every frame.
                 updateLOS(actor, target, duration, storage);
-                const float targetReachedTolerance = storage.mLOS && !storage.mUseCustomDestination
-                        ? storage.mAttackRange : 0.0f;
+                const float targetReachedTolerance
+                    = storage.mLOS && !storage.mUseCustomDestination ? storage.mAttackRange : 0.0f;
                 const osg::Vec3f destination = storage.mUseCustomDestination
-                        ? storage.mCustomDestination : target.getRefData().getPosition().asVec3();
+                    ? storage.mCustomDestination
+                    : target.getRefData().getPosition().asVec3();
                 const bool is_target_reached = pathTo(actor, destination, duration, targetReachedTolerance);
-                if (is_target_reached) storage.mReadyToAttack = true;
+                if (is_target_reached)
+                    storage.mReadyToAttack = true;
             }
 
             storage.updateCombatMove(duration);
             storage.mRotateMove = false;
-            if (storage.mReadyToAttack) updateActorsMovement(actor, duration, storage);
+            if (storage.mReadyToAttack)
+                updateActorsMovement(actor, duration, storage);
             if (storage.mRotateMove)
                 return false;
             storage.updateAttack(actor, characterController);
@@ -157,11 +159,12 @@ namespace MWMechanics
         return attack(actor, target, storage, characterController);
     }
 
-    bool AiCombat::attack(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, AiCombatStorage& storage, CharacterController& characterController)
+    bool AiCombat::attack(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, AiCombatStorage& storage,
+        CharacterController& characterController)
     {
         const MWWorld::CellStore*& currentCell = storage.mCell;
         bool cellChange = currentCell && (actor.getCell() != currentCell);
-        if(!currentCell || cellChange)
+        if (!currentCell || cellChange)
         {
             currentCell = actor.getCell();
         }
@@ -173,11 +176,16 @@ namespace MWMechanics
             actor.getClass().getCreatureStats(actor).setAttackingOrSpell(false);
             storage.mActionCooldown = 0.f;
             // Continue combat if target is player or player follower/escorter and an attack has been attempted
-            const auto& playerFollowersAndEscorters = MWBase::Environment::get().getMechanicsManager()->getActorsSidingWith(MWMechanics::getPlayer());
-            bool targetSidesWithPlayer = (std::find(playerFollowersAndEscorters.begin(), playerFollowersAndEscorters.end(), target) != playerFollowersAndEscorters.end());
+            const auto& playerFollowersAndEscorters
+                = MWBase::Environment::get().getMechanicsManager()->getActorsSidingWith(MWMechanics::getPlayer());
+            bool targetSidesWithPlayer
+                = (std::find(playerFollowersAndEscorters.begin(), playerFollowersAndEscorters.end(), target)
+                    != playerFollowersAndEscorters.end());
             if ((target == MWMechanics::getPlayer() || targetSidesWithPlayer)
-                && ((actor.getClass().getCreatureStats(actor).getHitAttemptActorId() == target.getClass().getCreatureStats(target).getActorId())
-                || (target.getClass().getCreatureStats(target).getHitAttemptActorId() == actor.getClass().getCreatureStats(actor).getActorId())))
+                && ((actor.getClass().getCreatureStats(actor).getHitAttemptActorId()
+                        == target.getClass().getCreatureStats(target).getActorId())
+                    || (target.getClass().getCreatureStats(target).getHitAttemptActorId()
+                        == actor.getClass().getCreatureStats(actor).getActorId())))
                 forceFlee = true;
             else // Otherwise end combat
                 return true;
@@ -222,7 +230,7 @@ namespace MWMechanics
         }
 
         bool isRangedCombat = false;
-        float &rangeAttack = storage.mAttackRange;
+        float& rangeAttack = storage.mAttackRange;
 
         rangeAttack = currentAction->getCombatRange(isRangedCombat);
 
@@ -240,7 +248,8 @@ namespace MWMechanics
         if (isRangedCombat)
         {
             // rotate actor taking into account target movement direction and projectile speed
-            osg::Vec3f vAimDir = AimDirToMovingTarget(actor, target, storage.mLastTargetPos, AI_REACTION_TIME, (weapon ? weapon->mData.mType : 0), storage.mStrength);
+            osg::Vec3f vAimDir = AimDirToMovingTarget(actor, target, storage.mLastTargetPos, AI_REACTION_TIME,
+                (weapon ? weapon->mData.mType : 0), storage.mStrength);
 
             storage.mMovement.mRotation[0] = getXAngleToDir(vAimDir);
             storage.mMovement.mRotation[2] = getZAngleToDir(vAimDir);
@@ -249,7 +258,8 @@ namespace MWMechanics
         {
             osg::Vec3f vAimDir = MWBase::Environment::get().getWorld()->aimToTarget(actor, target, false);
             storage.mMovement.mRotation[0] = getXAngleToDir(vAimDir);
-            storage.mMovement.mRotation[2] = getZAngleToDir((vTargetPos-vActorPos)); // using vAimDir results in spastic movements since the head is animated
+            storage.mMovement.mRotation[2] = getZAngleToDir(
+                (vTargetPos - vActorPos)); // using vAimDir results in spastic movements since the head is animated
         }
 
         storage.mLastTargetPos = vTargetPos;
@@ -275,20 +285,21 @@ namespace MWMechanics
             const auto areaCosts = getAreaCosts(actor);
             const auto pathGridGraph = getPathGridGraph(actor.getCell());
             mPathFinder.buildPath(actor, vActorPos, vTargetPos, actor.getCell(), pathGridGraph, agentBounds,
-                                  navigatorFlags, areaCosts, storage.mAttackRange, PathType::Full);
+                navigatorFlags, areaCosts, storage.mAttackRange, PathType::Full);
 
             if (!mPathFinder.isPathConstructed())
             {
                 // If there is no path, try to find a point on a line from the actor position to target projected
                 // on navmesh to attack the target from there.
                 const auto navigator = world->getNavigator();
-                const auto hit = DetourNavigator::raycast(*navigator, agentBounds, vActorPos, vTargetPos, navigatorFlags);
+                const auto hit
+                    = DetourNavigator::raycast(*navigator, agentBounds, vActorPos, vTargetPos, navigatorFlags);
 
                 if (hit.has_value() && (*hit - vTargetPos).length() <= rangeAttack)
                 {
                     // If the point is close enough, try to find a path to that point.
                     mPathFinder.buildPath(actor, vActorPos, *hit, actor.getCell(), pathGridGraph, agentBounds,
-                                          navigatorFlags, areaCosts, storage.mAttackRange, PathType::Full);
+                        navigatorFlags, areaCosts, storage.mAttackRange, PathType::Full);
                     if (mPathFinder.isPathConstructed())
                     {
                         // If path to that point is found use it as custom destination.
@@ -317,7 +328,8 @@ namespace MWMechanics
         return false;
     }
 
-    void MWMechanics::AiCombat::updateLOS(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, float duration, MWMechanics::AiCombatStorage& storage)
+    void MWMechanics::AiCombat::updateLOS(
+        const MWWorld::Ptr& actor, const MWWorld::Ptr& target, float duration, MWMechanics::AiCombatStorage& storage)
     {
         static const float LOS_UPDATE_DURATION = 0.5f;
         if (storage.mUpdateLOSTimer <= 0.f)
@@ -329,7 +341,8 @@ namespace MWMechanics
             storage.mUpdateLOSTimer -= duration;
     }
 
-    void MWMechanics::AiCombat::updateFleeing(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, float duration, MWMechanics::AiCombatStorage& storage)
+    void MWMechanics::AiCombat::updateFleeing(
+        const MWWorld::Ptr& actor, const MWWorld::Ptr& target, float duration, MWMechanics::AiCombatStorage& storage)
     {
         static const float BLIND_RUN_DURATION = 1.0f;
 
@@ -342,85 +355,95 @@ namespace MWMechanics
                 return;
 
             case AiCombatStorage::FleeState_Idle:
+            {
+                float triggerDist = getMaxAttackDistance(target);
+
+                if (storage.mLOS && (triggerDist >= 1000 || getDistanceMinusHalfExtents(actor, target) <= triggerDist))
                 {
-                    float triggerDist = getMaxAttackDistance(target);
+                    const ESM::Pathgrid* pathgrid
+                        = MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(
+                            *storage.mCell->getCell());
 
-                    if (storage.mLOS &&
-                            (triggerDist >= 1000 || getDistanceMinusHalfExtents(actor, target) <= triggerDist))
+                    bool runFallback = true;
+
+                    if (pathgrid != nullptr && !pathgrid->mPoints.empty()
+                        && !actor.getClass().isPureWaterCreature(actor))
                     {
-                        const ESM::Pathgrid* pathgrid =
-                                MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(*storage.mCell->getCell());
+                        ESM::Pathgrid::PointList points;
+                        Misc::CoordinateConverter coords(storage.mCell->getCell());
 
-                        bool runFallback = true;
+                        osg::Vec3f localPos = actor.getRefData().getPosition().asVec3();
+                        coords.toLocal(localPos);
 
-                        if (pathgrid != nullptr && !pathgrid->mPoints.empty() && !actor.getClass().isPureWaterCreature(actor))
+                        int closestPointIndex = PathFinder::getClosestPoint(pathgrid, localPos);
+                        for (int i = 0; i < static_cast<int>(pathgrid->mPoints.size()); i++)
                         {
-                            ESM::Pathgrid::PointList points;
-                            Misc::CoordinateConverter coords(storage.mCell->getCell());
-
-                            osg::Vec3f localPos = actor.getRefData().getPosition().asVec3();
-                            coords.toLocal(localPos);
-
-                            int closestPointIndex = PathFinder::getClosestPoint(pathgrid, localPos);
-                            for (int i = 0; i < static_cast<int>(pathgrid->mPoints.size()); i++)
+                            if (i != closestPointIndex
+                                && getPathGridGraph(storage.mCell).isPointConnected(closestPointIndex, i))
                             {
-                                if (i != closestPointIndex && getPathGridGraph(storage.mCell).isPointConnected(closestPointIndex, i))
-                                {
-                                    points.push_back(pathgrid->mPoints[static_cast<size_t>(i)]);
-                                }
+                                points.push_back(pathgrid->mPoints[static_cast<size_t>(i)]);
                             }
+                        }
 
-                            if (!points.empty())
-                            {
-                                auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-                                ESM::Pathgrid::Point dest = points[Misc::Rng::rollDice(points.size(), prng)];
-                                coords.toWorld(dest);
+                        if (!points.empty())
+                        {
+                            auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+                            ESM::Pathgrid::Point dest = points[Misc::Rng::rollDice(points.size(), prng)];
+                            coords.toWorld(dest);
 
-                                state = AiCombatStorage::FleeState_RunToDestination;
-                                storage.mFleeDest = ESM::Pathgrid::Point(dest.mX, dest.mY, dest.mZ);
+                            state = AiCombatStorage::FleeState_RunToDestination;
+                            storage.mFleeDest = ESM::Pathgrid::Point(dest.mX, dest.mY, dest.mZ);
 
-                                runFallback = false;
-                            }
+                            runFallback = false;
                         }
+                    }
 
-                        if (runFallback)
-                        {
-                            state = AiCombatStorage::FleeState_RunBlindly;
-                            storage.mFleeBlindRunTimer = 0.0f;
-                        }
+                    if (runFallback)
+                    {
+                        state = AiCombatStorage::FleeState_RunBlindly;
+                        storage.mFleeBlindRunTimer = 0.0f;
                     }
                 }
-                break;
+            }
+            break;
 
             case AiCombatStorage::FleeState_RunBlindly:
+            {
+                // timer to prevent twitchy movement that can be observed in vanilla MW
+                if (storage.mFleeBlindRunTimer < BLIND_RUN_DURATION)
                 {
-                    // timer to prevent twitchy movement that can be observed in vanilla MW
-                    if (storage.mFleeBlindRunTimer < BLIND_RUN_DURATION)
-                    {
-                        storage.mFleeBlindRunTimer += duration;
-
-                        storage.mMovement.mRotation[0] = -actor.getRefData().getPosition().rot[0];
-                        storage.mMovement.mRotation[2] = osg::PI + getZAngleToDir(target.getRefData().getPosition().asVec3()-actor.getRefData().getPosition().asVec3());
-                        storage.mMovement.mPosition[1] = 1;
-                        updateActorsMovement(actor, duration, storage);
-                    }
-                    else
-                        state = AiCombatStorage::FleeState_Idle;
+                    storage.mFleeBlindRunTimer += duration;
+
+                    storage.mMovement.mRotation[0] = -actor.getRefData().getPosition().rot[0];
+                    storage.mMovement.mRotation[2] = osg::PI
+                        + getZAngleToDir(
+                            target.getRefData().getPosition().asVec3() - actor.getRefData().getPosition().asVec3());
+                    storage.mMovement.mPosition[1] = 1;
+                    updateActorsMovement(actor, duration, storage);
                 }
-                break;
+                else
+                    state = AiCombatStorage::FleeState_Idle;
+            }
+            break;
 
             case AiCombatStorage::FleeState_RunToDestination:
+            {
+                static const float fFleeDistance = MWBase::Environment::get()
+                                                       .getWorld()
+                                                       ->getStore()
+                                                       .get<ESM::GameSetting>()
+                                                       .find("fFleeDistance")
+                                                       ->mValue.getFloat();
+
+                float dist
+                    = (actor.getRefData().getPosition().asVec3() - target.getRefData().getPosition().asVec3()).length();
+                if ((dist > fFleeDistance && !storage.mLOS)
+                    || pathTo(actor, PathFinder::makeOsgVec3(storage.mFleeDest), duration))
                 {
-                    static const float fFleeDistance = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fFleeDistance")->mValue.getFloat();
-
-                    float dist = (actor.getRefData().getPosition().asVec3() - target.getRefData().getPosition().asVec3()).length();
-                    if ((dist > fFleeDistance && !storage.mLOS)
-                            || pathTo(actor, PathFinder::makeOsgVec3(storage.mFleeDest), duration))
-                    {
-                        state = AiCombatStorage::FleeState_Idle;
-                    }
+                    state = AiCombatStorage::FleeState_Idle;
                 }
-                break;
+            }
+            break;
         };
     }
 
@@ -440,8 +463,8 @@ namespace MWMechanics
         rotateActorOnAxis(actor, 0, actorMovementSettings, storage);
     }
 
-    void AiCombat::rotateActorOnAxis(const MWWorld::Ptr& actor, int axis, 
-        MWMechanics::Movement& actorMovementSettings, AiCombatStorage& storage)
+    void AiCombat::rotateActorOnAxis(
+        const MWWorld::Ptr& actor, int axis, MWMechanics::Movement& actorMovementSettings, AiCombatStorage& storage)
     {
         actorMovementSettings.mRotation[axis] = 0;
         bool isRangedCombat = false;
@@ -453,14 +476,15 @@ namespace MWMechanics
 
     MWWorld::Ptr AiCombat::getTarget() const
     {
-        if (mCachedTarget.isEmpty() || mCachedTarget.getRefData().isDeleted() || !mCachedTarget.getRefData().isEnabled())
+        if (mCachedTarget.isEmpty() || mCachedTarget.getRefData().isDeleted()
+            || !mCachedTarget.getRefData().isEnabled())
         {
             mCachedTarget = MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId);
         }
         return mCachedTarget;
     }
 
-    void AiCombat::writeState(ESM::AiSequence::AiSequence &sequence) const
+    void AiCombat::writeState(ESM::AiSequence::AiSequence& sequence) const
     {
         auto combat = std::make_unique<ESM::AiSequence::AiCombat>();
         combat->mTargetActorId = mTargetActorId;
@@ -471,35 +495,34 @@ namespace MWMechanics
         sequence.mPackages.push_back(std::move(package));
     }
 
-
-    AiCombatStorage::AiCombatStorage() :
-        mAttackCooldown(0.0f),
-        mReaction(MWBase::Environment::get().getWorld()->getPrng()),
-        mTimerCombatMove(0.0f),
-        mReadyToAttack(false),
-        mAttack(false),
-        mAttackRange(0.0f),
-        mCombatMove(false),
-        mRotateMove(false),
-        mLastTargetPos(0, 0, 0),
-        mCell(nullptr),
-        mCurrentAction(),
-        mActionCooldown(0.0f),
-        mStrength(),
-        mForceNoShortcut(false),
-        mShortcutFailPos(),
-        mMovement(),
-        mFleeState(FleeState_None),
-        mLOS(false),
-        mUpdateLOSTimer(0.0f),
-        mFleeBlindRunTimer(0.0f),
-        mUseCustomDestination(false),
-        mCustomDestination()
+    AiCombatStorage::AiCombatStorage()
+        : mAttackCooldown(0.0f)
+        , mReaction(MWBase::Environment::get().getWorld()->getPrng())
+        , mTimerCombatMove(0.0f)
+        , mReadyToAttack(false)
+        , mAttack(false)
+        , mAttackRange(0.0f)
+        , mCombatMove(false)
+        , mRotateMove(false)
+        , mLastTargetPos(0, 0, 0)
+        , mCell(nullptr)
+        , mCurrentAction()
+        , mActionCooldown(0.0f)
+        , mStrength()
+        , mForceNoShortcut(false)
+        , mShortcutFailPos()
+        , mMovement()
+        , mFleeState(FleeState_None)
+        , mLOS(false)
+        , mUpdateLOSTimer(0.0f)
+        , mFleeBlindRunTimer(0.0f)
+        , mUseCustomDestination(false)
+        , mCustomDestination()
     {
-
     }
 
-    void AiCombatStorage::startCombatMove(bool isDistantCombat, float distToTarget, float rangeAttack, const MWWorld::Ptr& actor, const MWWorld::Ptr& target)
+    void AiCombatStorage::startCombatMove(bool isDistantCombat, float distToTarget, float rangeAttack,
+        const MWWorld::Ptr& actor, const MWWorld::Ptr& target)
     {
         auto& prng = MWBase::Environment::get().getWorld()->getPrng();
 
@@ -528,7 +551,8 @@ namespace MWMechanics
         else if (actor.getClass().isBipedal(actor) && !isDistantCombat)
         {
             float moveDuration = 0;
-            float angleToTarget = Misc::normalizeAngle(mMovement.mRotation[2] - actor.getRefData().getPosition().rot[2]);
+            float angleToTarget
+                = Misc::normalizeAngle(mMovement.mRotation[2] - actor.getRefData().getPosition().rot[2]);
             // Apply a big side step if enemy tries to get around and come from behind.
             // Otherwise apply a random side step (kind of dodging) with some probability
             // if actor is within range of target's weapon.
@@ -552,14 +576,16 @@ namespace MWMechanics
             // (in vanilla - only as far as oponent's weapon range),
             // or not at all if opponent is using a ranged weapon
 
-            if (targetUsesRanged || distToTarget > rangeAttackOfTarget*1.5) // Don't back up if the target is wielding ranged weapon
+            if (targetUsesRanged
+                || distToTarget > rangeAttackOfTarget * 1.5) // Don't back up if the target is wielding ranged weapon
                 return;
 
             // actor should not back up into water
             if (MWBase::Environment::get().getWorld()->isUnderwater(MWWorld::ConstPtr(actor), 0.5f))
                 return;
 
-            int mask = MWPhysics::CollisionType_World | MWPhysics::CollisionType_HeightMap | MWPhysics::CollisionType_Door;
+            int mask
+                = MWPhysics::CollisionType_World | MWPhysics::CollisionType_HeightMap | MWPhysics::CollisionType_Door;
 
             // Actor can not back up if there is no free space behind
             // Currently we take the 35% of actor's height from the ground as vector height.
@@ -567,10 +593,11 @@ namespace MWMechanics
             osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getHalfExtents(actor);
             osg::Vec3f pos = actor.getRefData().getPosition().asVec3();
             osg::Vec3f source = pos + osg::Vec3f(0, 0, 0.75f * halfExtents.z());
-            osg::Vec3f fallbackDirection = actor.getRefData().getBaseNode()->getAttitude() * osg::Vec3f(0,-1,0);
+            osg::Vec3f fallbackDirection = actor.getRefData().getBaseNode()->getAttitude() * osg::Vec3f(0, -1, 0);
             osg::Vec3f destination = source + fallbackDirection * (halfExtents.y() + 16);
 
-            bool isObstacleDetected = MWBase::Environment::get().getWorld()->castRay(source.x(), source.y(), source.z(), destination.x(), destination.y(), destination.z(), mask);
+            bool isObstacleDetected = MWBase::Environment::get().getWorld()->castRay(
+                source.x(), source.y(), source.z(), destination.x(), destination.y(), destination.z(), mask);
             if (isObstacleDetected)
                 return;
 
@@ -579,7 +606,8 @@ namespace MWMechanics
             // If we did not hit anything, there is a cliff behind actor.
             source = pos + osg::Vec3f(0, 0, 0.75f * halfExtents.z()) + fallbackDirection * (halfExtents.y() + 96);
             destination = source - osg::Vec3f(0, 0, 0.75f * halfExtents.z() + 96);
-            bool isCliffDetected = !MWBase::Environment::get().getWorld()->castRay(source.x(), source.y(), source.z(), destination.x(), destination.y(), destination.z(), mask);
+            bool isCliffDetected = !MWBase::Environment::get().getWorld()->castRay(
+                source.x(), source.y(), source.z(), destination.x(), destination.y(), destination.z(), mask);
             if (isCliffDetected)
                 return;
 
@@ -606,7 +634,7 @@ namespace MWMechanics
         mCombatMove = false;
     }
 
-    void AiCombatStorage::startAttackIfReady(const MWWorld::Ptr& actor, CharacterController& characterController, 
+    void AiCombatStorage::startAttackIfReady(const MWWorld::Ptr& actor, CharacterController& characterController,
         const ESM::Weapon* weapon, bool distantCombat)
     {
         if (mReadyToAttack && characterController.readyToStartAttack())
@@ -622,7 +650,7 @@ namespace MWMechanics
                 auto& prng = MWBase::Environment::get().getWorld()->getPrng();
                 mStrength = Misc::Rng::rollClosedProbability(prng);
 
-                const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
+                const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
 
                 float baseDelay = store.get<ESM::GameSetting>().find("fCombatDelayCreature")->mValue.getFloat();
                 if (actor.getClass().isNpc())
@@ -631,7 +659,8 @@ namespace MWMechanics
                 }
 
                 // Say a provoking combat phrase
-                const int iVoiceAttackOdds = store.get<ESM::GameSetting>().find("iVoiceAttackOdds")->mValue.getInteger();
+                const int iVoiceAttackOdds
+                    = store.get<ESM::GameSetting>().find("iVoiceAttackOdds")->mValue.getInteger();
                 if (Misc::Rng::roll0to99(prng) < iVoiceAttackOdds)
                 {
                     MWBase::Environment::get().getDialogueManager()->say(actor, "attack");
@@ -648,7 +677,8 @@ namespace MWMechanics
         if (mAttack)
         {
             float attackStrength = characterController.calculateWindUp();
-            mAttack = !characterController.readyToPrepareAttack() && attackStrength < mStrength && attackStrength != -1.f;
+            mAttack
+                = !characterController.readyToPrepareAttack() && attackStrength < mStrength && attackStrength != -1.f;
         }
         actor.getClass().getCreatureStats(actor).setAttackingOrSpell(mAttack);
     }
@@ -683,94 +713,95 @@ namespace MWMechanics
     }
 }
 
-
 namespace
 {
 
-std::string_view chooseBestAttack(const ESM::Weapon* weapon)
-{
-    if (weapon != nullptr)
+    std::string_view chooseBestAttack(const ESM::Weapon* weapon)
     {
-        //the more damage attackType deals the more probability it has
-        int slash = (weapon->mData.mSlash[0] + weapon->mData.mSlash[1])/2;
-        int chop = (weapon->mData.mChop[0] + weapon->mData.mChop[1])/2;
-        int thrust = (weapon->mData.mThrust[0] + weapon->mData.mThrust[1])/2;
-
-        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-        float roll = Misc::Rng::rollClosedProbability(prng) * (slash + chop + thrust);
-        if(roll <= slash)
-            return "slash";
-        else if(roll <= (slash + thrust))
-            return "thrust";
-        else
-            return "chop";
+        if (weapon != nullptr)
+        {
+            // the more damage attackType deals the more probability it has
+            int slash = (weapon->mData.mSlash[0] + weapon->mData.mSlash[1]) / 2;
+            int chop = (weapon->mData.mChop[0] + weapon->mData.mChop[1]) / 2;
+            int thrust = (weapon->mData.mThrust[0] + weapon->mData.mThrust[1]) / 2;
+
+            auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+            float roll = Misc::Rng::rollClosedProbability(prng) * (slash + chop + thrust);
+            if (roll <= slash)
+                return "slash";
+            else if (roll <= (slash + thrust))
+                return "thrust";
+            else
+                return "chop";
+        }
+        return MWMechanics::CharacterController::getRandomAttackType();
     }
-    return MWMechanics::CharacterController::getRandomAttackType();
-}
-
-osg::Vec3f AimDirToMovingTarget(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, const osg::Vec3f& vLastTargetPos,
-    float duration, int weapType, float strength)
-{
-    float projSpeed;
-    const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
-    // get projectile speed (depending on weapon type)
-    if (MWMechanics::getWeaponType(weapType)->mWeaponClass == ESM::WeaponType::Thrown)
+    osg::Vec3f AimDirToMovingTarget(const MWWorld::Ptr& actor, const MWWorld::Ptr& target,
+        const osg::Vec3f& vLastTargetPos, float duration, int weapType, float strength)
     {
-        static float fThrownWeaponMinSpeed = gmst.find("fThrownWeaponMinSpeed")->mValue.getFloat();
-        static float fThrownWeaponMaxSpeed = gmst.find("fThrownWeaponMaxSpeed")->mValue.getFloat();
+        float projSpeed;
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
-        projSpeed = fThrownWeaponMinSpeed + (fThrownWeaponMaxSpeed - fThrownWeaponMinSpeed) * strength;
-    }
-    else if (weapType != 0)
-    {
-        static float fProjectileMinSpeed = gmst.find("fProjectileMinSpeed")->mValue.getFloat();
-        static float fProjectileMaxSpeed = gmst.find("fProjectileMaxSpeed")->mValue.getFloat();
+        // get projectile speed (depending on weapon type)
+        if (MWMechanics::getWeaponType(weapType)->mWeaponClass == ESM::WeaponType::Thrown)
+        {
+            static float fThrownWeaponMinSpeed = gmst.find("fThrownWeaponMinSpeed")->mValue.getFloat();
+            static float fThrownWeaponMaxSpeed = gmst.find("fThrownWeaponMaxSpeed")->mValue.getFloat();
 
-        projSpeed = fProjectileMinSpeed + (fProjectileMaxSpeed - fProjectileMinSpeed) * strength;
-    }
-    else // weapType is 0 ==> it's a target spell projectile
-    {
-        projSpeed = gmst.find("fTargetSpellMaxSpeed")->mValue.getFloat();
-    }
+            projSpeed = fThrownWeaponMinSpeed + (fThrownWeaponMaxSpeed - fThrownWeaponMinSpeed) * strength;
+        }
+        else if (weapType != 0)
+        {
+            static float fProjectileMinSpeed = gmst.find("fProjectileMinSpeed")->mValue.getFloat();
+            static float fProjectileMaxSpeed = gmst.find("fProjectileMaxSpeed")->mValue.getFloat();
 
-    // idea: perpendicular to dir to target speed components of target move vector and projectile vector should be the same
+            projSpeed = fProjectileMinSpeed + (fProjectileMaxSpeed - fProjectileMinSpeed) * strength;
+        }
+        else // weapType is 0 ==> it's a target spell projectile
+        {
+            projSpeed = gmst.find("fTargetSpellMaxSpeed")->mValue.getFloat();
+        }
 
-    osg::Vec3f vTargetPos = target.getRefData().getPosition().asVec3();
-    osg::Vec3f vDirToTarget = MWBase::Environment::get().getWorld()->aimToTarget(actor, target, true);
-    float distToTarget = vDirToTarget.length();
+        // idea: perpendicular to dir to target speed components of target move vector and projectile vector should be
+        // the same
 
-    osg::Vec3f vTargetMoveDir = vTargetPos - vLastTargetPos;
-    vTargetMoveDir /= duration; // |vTargetMoveDir| is target real speed in units/sec now
+        osg::Vec3f vTargetPos = target.getRefData().getPosition().asVec3();
+        osg::Vec3f vDirToTarget = MWBase::Environment::get().getWorld()->aimToTarget(actor, target, true);
+        float distToTarget = vDirToTarget.length();
 
-    osg::Vec3f vPerpToDir = vDirToTarget ^ osg::Vec3f(0,0,1); // cross product
+        osg::Vec3f vTargetMoveDir = vTargetPos - vLastTargetPos;
+        vTargetMoveDir /= duration; // |vTargetMoveDir| is target real speed in units/sec now
 
-    vPerpToDir.normalize();
-    osg::Vec3f vDirToTargetNormalized = vDirToTarget;
-    vDirToTargetNormalized.normalize();
+        osg::Vec3f vPerpToDir = vDirToTarget ^ osg::Vec3f(0, 0, 1); // cross product
 
-    // dot product
-    float velPerp = vTargetMoveDir * vPerpToDir;
-    float velDir = vTargetMoveDir * vDirToTargetNormalized;
+        vPerpToDir.normalize();
+        osg::Vec3f vDirToTargetNormalized = vDirToTarget;
+        vDirToTargetNormalized.normalize();
 
-    // time to collision between target and projectile
-    float t_collision;
+        // dot product
+        float velPerp = vTargetMoveDir * vPerpToDir;
+        float velDir = vTargetMoveDir * vDirToTargetNormalized;
 
-    float projVelDirSquared = projSpeed * projSpeed - velPerp * velPerp;
-    if (projVelDirSquared > 0)
-    {
-        osg::Vec3f vTargetMoveDirNormalized = vTargetMoveDir;
-        vTargetMoveDirNormalized.normalize();
+        // time to collision between target and projectile
+        float t_collision;
 
-        float projDistDiff = vDirToTarget * vTargetMoveDirNormalized; // dot product
-        projDistDiff = std::sqrt(distToTarget * distToTarget - projDistDiff * projDistDiff);
+        float projVelDirSquared = projSpeed * projSpeed - velPerp * velPerp;
+        if (projVelDirSquared > 0)
+        {
+            osg::Vec3f vTargetMoveDirNormalized = vTargetMoveDir;
+            vTargetMoveDirNormalized.normalize();
 
-        t_collision = projDistDiff / (std::sqrt(projVelDirSquared) - velDir);
-    }
-    else
-        t_collision = 0; // speed of projectile is not enough to reach moving target
+            float projDistDiff = vDirToTarget * vTargetMoveDirNormalized; // dot product
+            projDistDiff = std::sqrt(distToTarget * distToTarget - projDistDiff * projDistDiff);
 
-    return vDirToTarget + vTargetMoveDir * t_collision;
-}
+            t_collision = projDistDiff / (std::sqrt(projVelDirSquared) - velDir);
+        }
+        else
+            t_collision = 0; // speed of projectile is not enough to reach moving target
+
+        return vDirToTarget + vTargetMoveDir * t_collision;
+    }
 
 }
diff --git a/apps/openmw/mwmechanics/aicombat.hpp b/apps/openmw/mwmechanics/aicombat.hpp
index a9153041e3..0ae40e48e2 100644
--- a/apps/openmw/mwmechanics/aicombat.hpp
+++ b/apps/openmw/mwmechanics/aicombat.hpp
@@ -1,13 +1,13 @@
 #ifndef GAME_MWMECHANICS_AICOMBAT_H
 #define GAME_MWMECHANICS_AICOMBAT_H
 
-#include "typedaipackage.hpp"
 #include "aitemporarybase.hpp"
+#include "typedaipackage.hpp"
 
 #include "../mwworld/cellstore.hpp" // for Doors
 
-#include "movement.hpp"
 #include "aitimer.hpp"
+#include "movement.hpp"
 
 namespace ESM
 {
@@ -59,7 +59,8 @@ namespace MWMechanics
 
         AiCombatStorage();
 
-        void startCombatMove(bool isDistantCombat, float distToTarget, float rangeAttack, const MWWorld::Ptr& actor, const MWWorld::Ptr& target);
+        void startCombatMove(bool isDistantCombat, float distToTarget, float rangeAttack, const MWWorld::Ptr& actor,
+            const MWWorld::Ptr& target);
         void updateCombatMove(float duration);
         void stopCombatMove();
         void startAttackIfReady(const MWWorld::Ptr& actor, CharacterController& characterController,
@@ -75,48 +76,50 @@ namespace MWMechanics
     /// \brief Causes the actor to fight another actor
     class AiCombat final : public TypedAiPackage<AiCombat>
     {
-        public:
-            ///Constructor
-            /** \param actor Actor to fight **/
-            explicit AiCombat(const MWWorld::Ptr& actor);
+    public:
+        /// Constructor
+        /** \param actor Actor to fight **/
+        explicit AiCombat(const MWWorld::Ptr& actor);
 
-            explicit AiCombat (const ESM::AiSequence::AiCombat* combat);
+        explicit AiCombat(const ESM::AiSequence::AiCombat* combat);
 
-            void init();
+        void init();
 
-            bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) override;
+        bool execute(const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state,
+            float duration) override;
 
-            static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::Combat; }
+        static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::Combat; }
 
-            static constexpr Options makeDefaultOptions()
-            {
-                AiPackage::Options options;
-                options.mPriority = 1;
-                options.mCanCancel = false;
-                options.mShouldCancelPreviousAi = false;
-                return options;
-            }
+        static constexpr Options makeDefaultOptions()
+        {
+            AiPackage::Options options;
+            options.mPriority = 1;
+            options.mCanCancel = false;
+            options.mShouldCancelPreviousAi = false;
+            return options;
+        }
 
-            ///Returns target ID
-            MWWorld::Ptr getTarget() const override;
+        /// Returns target ID
+        MWWorld::Ptr getTarget() const override;
 
-            void writeState(ESM::AiSequence::AiSequence &sequence) const override;
+        void writeState(ESM::AiSequence::AiSequence& sequence) const override;
 
-        private:
-            /// Returns true if combat should end
-            bool attack(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, AiCombatStorage& storage, CharacterController& characterController);
+    private:
+        /// Returns true if combat should end
+        bool attack(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, AiCombatStorage& storage,
+            CharacterController& characterController);
 
-            void updateLOS(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, float duration, AiCombatStorage& storage);
+        void updateLOS(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, float duration, AiCombatStorage& storage);
 
-            void updateFleeing(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, float duration, AiCombatStorage& storage);
+        void updateFleeing(
+            const MWWorld::Ptr& actor, const MWWorld::Ptr& target, float duration, AiCombatStorage& storage);
 
-            /// Transfer desired movement (from AiCombatStorage) to Actor
-            void updateActorsMovement(const MWWorld::Ptr& actor, float duration, AiCombatStorage& storage);
-            void rotateActorOnAxis(const MWWorld::Ptr& actor, int axis, 
-                MWMechanics::Movement& actorMovementSettings, AiCombatStorage& storage);
+        /// Transfer desired movement (from AiCombatStorage) to Actor
+        void updateActorsMovement(const MWWorld::Ptr& actor, float duration, AiCombatStorage& storage);
+        void rotateActorOnAxis(const MWWorld::Ptr& actor, int axis, MWMechanics::Movement& actorMovementSettings,
+            AiCombatStorage& storage);
     };
-    
-    
+
 }
 
 #endif
diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index 2def2696bb..1d73a77059 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -4,28 +4,38 @@
 #include <components/esm3/loadmgef.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/world.hpp"
 
+#include "../mwworld/actionequip.hpp"
+#include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwworld/actionequip.hpp"
-#include "../mwworld/cellstore.hpp"
 
 #include "actorutil.hpp"
-#include "npcstats.hpp"
 #include "combat.hpp"
-#include "weaponpriority.hpp"
+#include "npcstats.hpp"
 #include "spellpriority.hpp"
+#include "weaponpriority.hpp"
 #include "weapontype.hpp"
 
 namespace MWMechanics
 {
     float suggestCombatRange(int rangeTypes)
     {
-        static const float fCombatDistance = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fCombatDistance")->mValue.getFloat();
-        static float fHandToHandReach = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fHandToHandReach")->mValue.getFloat();
+        static const float fCombatDistance = MWBase::Environment::get()
+                                                 .getWorld()
+                                                 ->getStore()
+                                                 .get<ESM::GameSetting>()
+                                                 .find("fCombatDistance")
+                                                 ->mValue.getFloat();
+        static float fHandToHandReach = MWBase::Environment::get()
+                                            .getWorld()
+                                            ->getStore()
+                                            .get<ESM::GameSetting>()
+                                            .find("fHandToHandReach")
+                                            ->mValue.getFloat();
 
         // This distance is a possible distance of melee attack
         static float distance = fCombatDistance * std::max(2.f, fHandToHandReach);
@@ -38,7 +48,7 @@ namespace MWMechanics
         return distance * 4;
     }
 
-    void ActionSpell::prepare(const MWWorld::Ptr &actor)
+    void ActionSpell::prepare(const MWWorld::Ptr& actor)
     {
         actor.getClass().getCreatureStats(actor).getSpells().setSelectedSpell(mSpellId);
         actor.getClass().getCreatureStats(actor).setDrawState(DrawState::Spell);
@@ -52,7 +62,7 @@ namespace MWMechanics
         MWBase::Environment::get().getWorld()->preloadEffects(&spell->mEffects);
     }
 
-    float ActionSpell::getCombatRange (bool& isRanged) const
+    float ActionSpell::getCombatRange(bool& isRanged) const
     {
         const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(mSpellId);
         int types = getRangeTypes(spell->mEffects);
@@ -61,7 +71,7 @@ namespace MWMechanics
         return suggestCombatRange(types);
     }
 
-    void ActionEnchantedItem::prepare(const MWWorld::Ptr &actor)
+    void ActionEnchantedItem::prepare(const MWWorld::Ptr& actor)
     {
         actor.getClass().getCreatureStats(actor).getSpells().setSelectedSpell(std::string());
         actor.getClass().getInventoryStore(actor).setSelectedEnchantItem(mItem);
@@ -70,7 +80,9 @@ namespace MWMechanics
 
     float ActionEnchantedItem::getCombatRange(bool& isRanged) const
     {
-        const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(mItem->getClass().getEnchantment(*mItem));
+        const ESM::Enchantment* enchantment
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(
+                mItem->getClass().getEnchantment(*mItem));
         int types = getRangeTypes(enchantment->mEffects);
 
         isRanged = (types & RangeTypes::Target) | (types & RangeTypes::Self);
@@ -84,17 +96,18 @@ namespace MWMechanics
         return 600.f;
     }
 
-    void ActionPotion::prepare(const MWWorld::Ptr &actor)
+    void ActionPotion::prepare(const MWWorld::Ptr& actor)
     {
         actor.getClass().consume(mPotion, actor);
     }
 
-    void ActionWeapon::prepare(const MWWorld::Ptr &actor)
+    void ActionWeapon::prepare(const MWWorld::Ptr& actor)
     {
         if (actor.getClass().hasInventoryStore(actor))
         {
             if (mWeapon.isEmpty())
-                actor.getClass().getInventoryStore(actor).unequipSlot(MWWorld::InventoryStore::Slot_CarriedRight, actor);
+                actor.getClass().getInventoryStore(actor).unequipSlot(
+                    MWWorld::InventoryStore::Slot_CarriedRight, actor);
             else
             {
                 MWWorld::ActionEquip equip(mWeapon);
@@ -114,13 +127,27 @@ namespace MWMechanics
     {
         isRanged = false;
 
-        static const float fCombatDistance = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fCombatDistance")->mValue.getFloat();
-        static const float fProjectileMaxSpeed = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fProjectileMaxSpeed")->mValue.getFloat();
+        static const float fCombatDistance = MWBase::Environment::get()
+                                                 .getWorld()
+                                                 ->getStore()
+                                                 .get<ESM::GameSetting>()
+                                                 .find("fCombatDistance")
+                                                 ->mValue.getFloat();
+        static const float fProjectileMaxSpeed = MWBase::Environment::get()
+                                                     .getWorld()
+                                                     ->getStore()
+                                                     .get<ESM::GameSetting>()
+                                                     .find("fProjectileMaxSpeed")
+                                                     ->mValue.getFloat();
 
         if (mWeapon.isEmpty())
         {
-            static float fHandToHandReach =
-                MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fHandToHandReach")->mValue.getFloat();
+            static float fHandToHandReach = MWBase::Environment::get()
+                                                .getWorld()
+                                                ->getStore()
+                                                .get<ESM::GameSetting>()
+                                                .find("fHandToHandReach")
+                                                ->mValue.getFloat();
             return fHandToHandReach * fCombatDistance;
         }
 
@@ -141,7 +168,7 @@ namespace MWMechanics
         return mWeapon.get<ESM::Weapon>()->mBase;
     }
 
-    std::unique_ptr<Action> prepareNextAction(const MWWorld::Ptr &actor, const MWWorld::Ptr &enemy)
+    std::unique_ptr<Action> prepareNextAction(const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy)
     {
         Spells& spells = actor.getClass().getCreatureStats(actor).getSpells();
 
@@ -228,7 +255,7 @@ namespace MWMechanics
         return bestAction;
     }
 
-    float getBestActionRating(const MWWorld::Ptr &actor, const MWWorld::Ptr &enemy)
+    float getBestActionRating(const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy)
     {
         Spells& spells = actor.getClass().getCreatureStats(actor).getSpells();
 
@@ -278,7 +305,6 @@ namespace MWMechanics
         return bestActionRating;
     }
 
-
     float getDistanceMinusHalfExtents(const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2, bool minusZDist)
     {
         osg::Vec3f actor1Pos = actor1.getRefData().getPosition().asVec3();
@@ -289,15 +315,15 @@ namespace MWMechanics
         if (minusZDist)
             dist -= std::abs(actor1Pos.z() - actor2Pos.z());
 
-        return (dist
-                - MWBase::Environment::get().getWorld()->getHalfExtents(actor1).y()
-                - MWBase::Environment::get().getWorld()->getHalfExtents(actor2).y());
+        return (dist - MWBase::Environment::get().getWorld()->getHalfExtents(actor1).y()
+            - MWBase::Environment::get().getWorld()->getHalfExtents(actor2).y());
     }
 
     float getMaxAttackDistance(const MWWorld::Ptr& actor)
     {
         const CreatureStats& stats = actor.getClass().getCreatureStats(actor);
-        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
         const std::string& selectedSpellId = stats.getSpells().getSelectedSpell();
         MWWorld::Ptr selectedEnchItem;
@@ -330,13 +356,16 @@ namespace MWMechanics
             dist = 1.0f;
             if (!selectedSpellId.empty())
             {
-                const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(selectedSpellId);
-                for (std::vector<ESM::ENAMstruct>::const_iterator effectIt =
-                     spell->mEffects.mList.begin(); effectIt != spell->mEffects.mList.end(); ++effectIt)
+                const ESM::Spell* spell
+                    = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(selectedSpellId);
+                for (std::vector<ESM::ENAMstruct>::const_iterator effectIt = spell->mEffects.mList.begin();
+                     effectIt != spell->mEffects.mList.end(); ++effectIt)
                 {
                     if (effectIt->mRange == ESM::RT_Target)
                     {
-                        const ESM::MagicEffect* effect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectIt->mEffectID);
+                        const ESM::MagicEffect* effect
+                            = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(
+                                effectIt->mEffectID);
                         dist = effect->mData.mSpeed;
                         break;
                     }
@@ -347,13 +376,16 @@ namespace MWMechanics
                 std::string_view enchId = selectedEnchItem.getClass().getEnchantment(selectedEnchItem);
                 if (!enchId.empty())
                 {
-                    const ESM::Enchantment* ench = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(enchId);
-                    for (std::vector<ESM::ENAMstruct>::const_iterator effectIt =
-                         ench->mEffects.mList.begin(); effectIt != ench->mEffects.mList.end(); ++effectIt)
+                    const ESM::Enchantment* ench
+                        = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(enchId);
+                    for (std::vector<ESM::ENAMstruct>::const_iterator effectIt = ench->mEffects.mList.begin();
+                         effectIt != ench->mEffects.mList.end(); ++effectIt)
                     {
                         if (effectIt->mRange == ESM::RT_Target)
                         {
-                            const ESM::MagicEffect* effect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectIt->mEffectID);
+                            const ESM::MagicEffect* effect
+                                = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(
+                                    effectIt->mEffectID);
                             dist = effect->mData.mSpeed;
                             break;
                         }
@@ -403,7 +435,8 @@ namespace MWMechanics
         ESM::Position actorPos = actor.getRefData().getPosition();
         ESM::Position enemyPos = enemy.getRefData().getPosition();
 
-        if (isTargetMagicallyHidden(enemy) && !MWBase::Environment::get().getMechanicsManager()->awarenessCheck(enemy, actor))
+        if (isTargetMagicallyHidden(enemy)
+            && !MWBase::Environment::get().getMechanicsManager()->awarenessCheck(enemy, actor))
         {
             return false;
         }
@@ -415,14 +448,14 @@ namespace MWMechanics
         }
 
         float atDist = getMaxAttackDistance(actor);
-        if (atDist > getDistanceMinusHalfExtents(actor, enemy)
-                && atDist > std::abs(actorPos.pos[2] - enemyPos.pos[2]))
+        if (atDist > getDistanceMinusHalfExtents(actor, enemy) && atDist > std::abs(actorPos.pos[2] - enemyPos.pos[2]))
         {
             if (MWBase::Environment::get().getWorld()->getLOS(actor, enemy))
                 return true;
         }
 
-        if (actor.getClass().isPureLandCreature(actor) && MWBase::Environment::get().getWorld()->isWalkingOnWater(enemy))
+        if (actor.getClass().isPureLandCreature(actor)
+            && MWBase::Environment::get().getWorld()->isWalkingOnWater(enemy))
         {
             return false;
         }
@@ -435,14 +468,20 @@ namespace MWMechanics
 
         if (actor.getClass().isBipedal(actor) || !actor.getClass().canFly(actor))
         {
-            if (enemy.getClass().getCreatureStats(enemy).getMagicEffects().get(ESM::MagicEffect::Levitate).getMagnitude() > 0)
+            if (enemy.getClass()
+                    .getCreatureStats(enemy)
+                    .getMagicEffects()
+                    .get(ESM::MagicEffect::Levitate)
+                    .getMagnitude()
+                > 0)
             {
                 float attackDistance = getMaxAttackDistance(actor);
                 if ((attackDistance + actorPos.pos[2]) < enemyPos.pos[2])
                 {
                     if (enemy.getCell()->isExterior())
                     {
-                        if (attackDistance < (enemyPos.pos[2] - MWBase::Environment::get().getWorld()->getTerrainHeightAt(enemyPos.asVec3())))
+                        if (attackDistance < (enemyPos.pos[2]
+                                - MWBase::Environment::get().getWorld()->getTerrainHeightAt(enemyPos.asVec3())))
                             return false;
                     }
                 }
@@ -452,7 +491,8 @@ namespace MWMechanics
         if (!actor.getClass().canWalk(actor) && !actor.getClass().isBipedal(actor))
             return true;
 
-        if (actor.getClass().getCreatureStats(actor).getMagicEffects().get(ESM::MagicEffect::Levitate).getMagnitude() > 0)
+        if (actor.getClass().getCreatureStats(actor).getMagicEffects().get(ESM::MagicEffect::Levitate).getMagnitude()
+            > 0)
             return true;
 
         if (MWBase::Environment::get().getWorld()->isSwimming(actor))
@@ -467,7 +507,8 @@ namespace MWMechanics
     float vanillaRateFlee(const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy)
     {
         const CreatureStats& stats = actor.getClass().getCreatureStats(actor);
-        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
         const int flee = stats.getAiSetting(AiSetting::Flee).getModified();
         if (flee >= 100)
diff --git a/apps/openmw/mwmechanics/aicombataction.hpp b/apps/openmw/mwmechanics/aicombataction.hpp
index 56d2247e99..e6b87064e5 100644
--- a/apps/openmw/mwmechanics/aicombataction.hpp
+++ b/apps/openmw/mwmechanics/aicombataction.hpp
@@ -3,8 +3,8 @@
 
 #include <memory>
 
-#include "../mwworld/ptr.hpp"
 #include "../mwworld/containerstore.hpp"
+#include "../mwworld/ptr.hpp"
 
 namespace MWMechanics
 {
@@ -13,7 +13,7 @@ namespace MWMechanics
     public:
         virtual ~Action() {}
         virtual void prepare(const MWWorld::Ptr& actor) = 0;
-        virtual float getCombatRange (bool& isRanged) const = 0;
+        virtual float getCombatRange(bool& isRanged) const = 0;
         virtual float getActionCooldown() { return 0.f; }
         virtual const ESM::Weapon* getWeapon() const { return nullptr; }
         virtual bool isAttackingOrSpell() const { return true; }
@@ -25,7 +25,7 @@ namespace MWMechanics
     public:
         ActionFlee() {}
         void prepare(const MWWorld::Ptr& actor) override {}
-        float getCombatRange (bool& isRanged) const override { return 0.0f; }
+        float getCombatRange(bool& isRanged) const override { return 0.0f; }
         float getActionCooldown() override { return 3.0f; }
         bool isAttackingOrSpell() const override { return false; }
         bool isFleeing() const override { return true; }
@@ -34,22 +34,28 @@ namespace MWMechanics
     class ActionSpell : public Action
     {
     public:
-        ActionSpell(const std::string& spellId) : mSpellId(spellId) {}
+        ActionSpell(const std::string& spellId)
+            : mSpellId(spellId)
+        {
+        }
         std::string mSpellId;
         /// Sets the given spell as selected on the actor's spell list.
         void prepare(const MWWorld::Ptr& actor) override;
 
-        float getCombatRange (bool& isRanged) const override;
+        float getCombatRange(bool& isRanged) const override;
     };
 
     class ActionEnchantedItem : public Action
     {
     public:
-        ActionEnchantedItem(const MWWorld::ContainerStoreIterator& item) : mItem(item) {}
+        ActionEnchantedItem(const MWWorld::ContainerStoreIterator& item)
+            : mItem(item)
+        {
+        }
         MWWorld::ContainerStoreIterator mItem;
         /// Sets the given item as selected enchanted item in the actor's InventoryStore.
         void prepare(const MWWorld::Ptr& actor) override;
-        float getCombatRange (bool& isRanged) const override;
+        float getCombatRange(bool& isRanged) const override;
 
         /// Since this action has no animation, apply a small cool down for using it
         float getActionCooldown() override { return 0.75f; }
@@ -58,11 +64,14 @@ namespace MWMechanics
     class ActionPotion : public Action
     {
     public:
-        ActionPotion(const MWWorld::Ptr& potion) : mPotion(potion) {}
+        ActionPotion(const MWWorld::Ptr& potion)
+            : mPotion(potion)
+        {
+        }
         MWWorld::Ptr mPotion;
         /// Drinks the given potion.
         void prepare(const MWWorld::Ptr& actor) override;
-        float getCombatRange (bool& isRanged) const override;
+        float getCombatRange(bool& isRanged) const override;
         bool isAttackingOrSpell() const override { return false; }
 
         /// Since this action has no animation, apply a small cool down for using it
@@ -78,17 +87,20 @@ namespace MWMechanics
     public:
         /// \a weapon may be empty for hand-to-hand combat
         ActionWeapon(const MWWorld::Ptr& weapon, const MWWorld::Ptr& ammo = MWWorld::Ptr())
-            : mAmmunition(ammo), mWeapon(weapon) {}
+            : mAmmunition(ammo)
+            , mWeapon(weapon)
+        {
+        }
         /// Equips the given weapon.
         void prepare(const MWWorld::Ptr& actor) override;
-        float getCombatRange (bool& isRanged) const override;
+        float getCombatRange(bool& isRanged) const override;
         const ESM::Weapon* getWeapon() const override;
     };
 
-    std::unique_ptr<Action> prepareNextAction (const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
-    float getBestActionRating(const MWWorld::Ptr &actor, const MWWorld::Ptr &enemy);
+    std::unique_ptr<Action> prepareNextAction(const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
+    float getBestActionRating(const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
 
-    float getDistanceMinusHalfExtents(const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy, bool minusZDist=false);
+    float getDistanceMinusHalfExtents(const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy, bool minusZDist = false);
     float getMaxAttackDistance(const MWWorld::Ptr& actor);
     bool canFight(const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
 
diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index bbbab3b5a8..33eb48b58e 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -3,12 +3,12 @@
 #include <components/esm3/aisequence.hpp>
 #include <components/esm3/loadcell.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/class.hpp"
 
 #include "creaturestats.hpp"
 #include "movement.hpp"
@@ -21,23 +21,39 @@
 namespace MWMechanics
 {
     AiEscort::AiEscort(std::string_view actorId, int duration, float x, float y, float z, bool repeat)
-    : TypedAiPackage<AiEscort>(repeat), mX(x), mY(y), mZ(z), mDuration(duration), mRemainingDuration(static_cast<float>(duration))
-    , mCellX(std::numeric_limits<int>::max())
-    , mCellY(std::numeric_limits<int>::max())
+        : TypedAiPackage<AiEscort>(repeat)
+        , mX(x)
+        , mY(y)
+        , mZ(z)
+        , mDuration(duration)
+        , mRemainingDuration(static_cast<float>(duration))
+        , mCellX(std::numeric_limits<int>::max())
+        , mCellY(std::numeric_limits<int>::max())
     {
         mTargetActorRefId = std::string(actorId);
     }
 
-    AiEscort::AiEscort(std::string_view actorId, std::string_view cellId, int duration, float x, float y, float z, bool repeat)
-    : TypedAiPackage<AiEscort>(repeat), mCellId(cellId), mX(x), mY(y), mZ(z), mDuration(duration), mRemainingDuration(static_cast<float>(duration))
-    , mCellX(std::numeric_limits<int>::max())
-    , mCellY(std::numeric_limits<int>::max())
+    AiEscort::AiEscort(
+        std::string_view actorId, std::string_view cellId, int duration, float x, float y, float z, bool repeat)
+        : TypedAiPackage<AiEscort>(repeat)
+        , mCellId(cellId)
+        , mX(x)
+        , mY(y)
+        , mZ(z)
+        , mDuration(duration)
+        , mRemainingDuration(static_cast<float>(duration))
+        , mCellX(std::numeric_limits<int>::max())
+        , mCellY(std::numeric_limits<int>::max())
     {
         mTargetActorRefId = std::string(actorId);
     }
 
-    AiEscort::AiEscort(const ESM::AiSequence::AiEscort *escort)
-        : TypedAiPackage<AiEscort>(escort->mRepeat), mCellId(escort->mCellId), mX(escort->mData.mX), mY(escort->mData.mY), mZ(escort->mData.mZ)
+    AiEscort::AiEscort(const ESM::AiSequence::AiEscort* escort)
+        : TypedAiPackage<AiEscort>(escort->mRepeat)
+        , mCellId(escort->mCellId)
+        , mX(escort->mData.mX)
+        , mY(escort->mData.mY)
+        , mZ(escort->mData.mZ)
         , mDuration(escort->mData.mDuration)
         , mRemainingDuration(escort->mRemainingDuration)
         , mCellX(std::numeric_limits<int>::max())
@@ -47,13 +63,14 @@ namespace MWMechanics
         mTargetActorId = escort->mTargetActorId;
     }
 
-    bool AiEscort::execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
+    bool AiEscort::execute(
+        const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
     {
         // If AiEscort has ran for as long or longer then the duration specified
         // and the duration is not infinite, the package is complete.
         if (mDuration > 0)
         {
-            mRemainingDuration -= ((duration*MWBase::Environment::get().getWorld()->getTimeScaleFactor()) / 3600);
+            mRemainingDuration -= ((duration * MWBase::Environment::get().getWorld()->getTimeScaleFactor()) / 3600);
             if (mRemainingDuration <= 0)
             {
                 mRemainingDuration = mDuration;
@@ -76,7 +93,7 @@ namespace MWMechanics
         if ((leaderPos - followerPos).length2() <= mMaxDist * mMaxDist)
         {
             const osg::Vec3f dest(mX, mY, mZ);
-            if (pathTo(actor, dest, duration, maxHalfExtent)) //Returns true on path complete
+            if (pathTo(actor, dest, duration, maxHalfExtent)) // Returns true on path complete
             {
                 mRemainingDuration = mDuration;
                 return true;
@@ -94,7 +111,7 @@ namespace MWMechanics
         return false;
     }
 
-    void AiEscort::writeState(ESM::AiSequence::AiSequence &sequence) const
+    void AiEscort::writeState(ESM::AiSequence::AiSequence& sequence) const
     {
         auto escort = std::make_unique<ESM::AiSequence::AiEscort>();
         escort->mData.mX = mX;
@@ -113,11 +130,10 @@ namespace MWMechanics
         sequence.mPackages.push_back(std::move(package));
     }
 
-    void AiEscort::fastForward(const MWWorld::Ptr& actor, AiState &state)
+    void AiEscort::fastForward(const MWWorld::Ptr& actor, AiState& state)
     {
         // Update duration counter if this package has a duration
         if (mDuration > 0)
             mRemainingDuration--;
     }
 }
-
diff --git a/apps/openmw/mwmechanics/aiescort.hpp b/apps/openmw/mwmechanics/aiescort.hpp
index 0f601a29ed..32a14131df 100644
--- a/apps/openmw/mwmechanics/aiescort.hpp
+++ b/apps/openmw/mwmechanics/aiescort.hpp
@@ -8,10 +8,10 @@
 
 namespace ESM
 {
-namespace AiSequence
-{
-    struct AiEscort;
-}
+    namespace AiSequence
+    {
+        struct AiEscort;
+    }
 }
 
 namespace MWMechanics
@@ -19,47 +19,49 @@ namespace MWMechanics
     /// \brief AI Package to have an NPC lead the player to a specific point
     class AiEscort final : public TypedAiPackage<AiEscort>
     {
-        public:
-            /// Implementation of AiEscort
-            /** The Actor will escort the specified actor to the world position x, y, z until they reach their position, or they run out of time
-                \implement AiEscort **/
-            AiEscort(std::string_view actorId, int duration, float x, float y, float z, bool repeat);
-            /// Implementation of AiEscortCell
-            /** The Actor will escort the specified actor to the cell position x, y, z until they reach their position, or they run out of time
-                \implement AiEscortCell **/
-            AiEscort(std::string_view actorId, std::string_view cellId, int duration, float x, float y, float z, bool repeat);
+    public:
+        /// Implementation of AiEscort
+        /** The Actor will escort the specified actor to the world position x, y, z until they reach their position, or
+           they run out of time \implement AiEscort **/
+        AiEscort(std::string_view actorId, int duration, float x, float y, float z, bool repeat);
+        /// Implementation of AiEscortCell
+        /** The Actor will escort the specified actor to the cell position x, y, z until they reach their position, or
+           they run out of time \implement AiEscortCell **/
+        AiEscort(
+            std::string_view actorId, std::string_view cellId, int duration, float x, float y, float z, bool repeat);
 
-            AiEscort(const ESM::AiSequence::AiEscort* escort);
+        AiEscort(const ESM::AiSequence::AiEscort* escort);
 
-            bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) override;
+        bool execute(const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state,
+            float duration) override;
 
-            static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::Escort; }
+        static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::Escort; }
 
-            static constexpr Options makeDefaultOptions()
-            {
-                AiPackage::Options options;
-                options.mUseVariableSpeed = true;
-                options.mSideWithTarget = true;
-                return options;
-            }
+        static constexpr Options makeDefaultOptions()
+        {
+            AiPackage::Options options;
+            options.mUseVariableSpeed = true;
+            options.mSideWithTarget = true;
+            return options;
+        }
 
-            void writeState(ESM::AiSequence::AiSequence &sequence) const override;
+        void writeState(ESM::AiSequence::AiSequence& sequence) const override;
 
-            void fastForward(const MWWorld::Ptr& actor, AiState& state) override;
+        void fastForward(const MWWorld::Ptr& actor, AiState& state) override;
 
-            osg::Vec3f getDestination() const override { return osg::Vec3f(mX, mY, mZ); }
+        osg::Vec3f getDestination() const override { return osg::Vec3f(mX, mY, mZ); }
 
-        private:
-            const std::string mCellId;
-            const float mX;
-            const float mY;
-            const float mZ;
-            float mMaxDist = 450;
-            const float mDuration; // In hours
-            float mRemainingDuration; // In hours
+    private:
+        const std::string mCellId;
+        const float mX;
+        const float mY;
+        const float mZ;
+        float mMaxDist = 450;
+        const float mDuration; // In hours
+        float mRemainingDuration; // In hours
 
-            const int mCellX;
-            const int mCellY;
+        const int mCellX;
+        const int mCellY;
     };
 }
 #endif
diff --git a/apps/openmw/mwmechanics/aiface.cpp b/apps/openmw/mwmechanics/aiface.cpp
index 17b18babc1..2cd46a7a00 100644
--- a/apps/openmw/mwmechanics/aiface.cpp
+++ b/apps/openmw/mwmechanics/aiface.cpp
@@ -5,11 +5,13 @@
 #include "steering.hpp"
 
 MWMechanics::AiFace::AiFace(float targetX, float targetY)
-    : mTargetX(targetX), mTargetY(targetY)
+    : mTargetX(targetX)
+    , mTargetY(targetY)
 {
 }
 
-bool MWMechanics::AiFace::execute(const MWWorld::Ptr& actor, MWMechanics::CharacterController& /*characterController*/, MWMechanics::AiState& /*state*/, float /*duration*/)
+bool MWMechanics::AiFace::execute(const MWWorld::Ptr& actor, MWMechanics::CharacterController& /*characterController*/,
+    MWMechanics::AiState& /*state*/, float /*duration*/)
 {
     osg::Vec3f dir = osg::Vec3f(mTargetX, mTargetY, 0) - actor.getRefData().getPosition().asVec3();
     return zTurn(actor, std::atan2(dir.x(), dir.y()), osg::DegreesToRadians(3.f));
diff --git a/apps/openmw/mwmechanics/aiface.hpp b/apps/openmw/mwmechanics/aiface.hpp
index e176eb52ec..56747c078e 100644
--- a/apps/openmw/mwmechanics/aiface.hpp
+++ b/apps/openmw/mwmechanics/aiface.hpp
@@ -6,26 +6,28 @@
 namespace MWMechanics
 {
     /// AiPackage which makes an actor face a certain direction.
-    class AiFace final : public TypedAiPackage<AiFace> {
-        public:
-            AiFace(float targetX, float targetY);
+    class AiFace final : public TypedAiPackage<AiFace>
+    {
+    public:
+        AiFace(float targetX, float targetY);
 
-            bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) override;
+        bool execute(const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state,
+            float duration) override;
 
-            static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::Face; }
+        static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::Face; }
 
-            static constexpr Options makeDefaultOptions()
-            {
-                AiPackage::Options options;
-                options.mPriority = 2;
-                options.mCanCancel = false;
-                options.mShouldCancelPreviousAi = false;
-                return options;
-            }
+        static constexpr Options makeDefaultOptions()
+        {
+            AiPackage::Options options;
+            options.mPriority = 2;
+            options.mCanCancel = false;
+            options.mShouldCancelPreviousAi = false;
+            return options;
+        }
 
-        private:
-            const float mTargetX;
-            const float mTargetY;
+    private:
+        const float mTargetX;
+        const float mTargetY;
     };
 }
 
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index 9a64a5bee3..60659687ed 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -3,12 +3,12 @@
 #include <components/esm3/aisequence.hpp>
 #include <components/esm3/loadcell.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/class.hpp"
 
 #include "creaturestats.hpp"
 #include "movement.hpp"
@@ -16,221 +16,254 @@
 
 namespace
 {
-osg::Vec3f::value_type getHalfExtents(const MWWorld::ConstPtr& actor)
-{
-    if(actor.getClass().isNpc())
-        return 64;
-    return MWBase::Environment::get().getWorld()->getHalfExtents(actor).y();
-}
+    osg::Vec3f::value_type getHalfExtents(const MWWorld::ConstPtr& actor)
+    {
+        if (actor.getClass().isNpc())
+            return 64;
+        return MWBase::Environment::get().getWorld()->getHalfExtents(actor).y();
+    }
 }
 
 namespace MWMechanics
 {
-int AiFollow::mFollowIndexCounter = 0;
-
-AiFollow::AiFollow(std::string_view actorId, float duration, float x, float y, float z, bool repeat)
-: TypedAiPackage<AiFollow>(repeat), mAlwaysFollow(false), mDuration(duration), mRemainingDuration(duration), mX(x), mY(y), mZ(z)
-, mCellId(""), mActive(false), mFollowIndex(mFollowIndexCounter++)
-{
-    mTargetActorRefId = std::string(actorId);
-}
-
-AiFollow::AiFollow(std::string_view actorId, std::string_view cellId, float duration, float x, float y, float z, bool repeat)
-: TypedAiPackage<AiFollow>(repeat), mAlwaysFollow(false), mDuration(duration), mRemainingDuration(duration), mX(x), mY(y), mZ(z)
-, mCellId(cellId), mActive(false), mFollowIndex(mFollowIndexCounter++)
-{
-    mTargetActorRefId = std::string(actorId);
-}
-
-AiFollow::AiFollow(const MWWorld::Ptr& actor, bool commanded)
-: TypedAiPackage<AiFollow>(makeDefaultOptions().withShouldCancelPreviousAi(!commanded))
-, mAlwaysFollow(true), mDuration(0), mRemainingDuration(0), mX(0), mY(0), mZ(0)
-, mCellId(""), mActive(false), mFollowIndex(mFollowIndexCounter++)
-{
-    mTargetActorRefId = actor.getCellRef().getRefId();
-    mTargetActorId = actor.getClass().getCreatureStats(actor).getActorId();
-}
-
-AiFollow::AiFollow(const ESM::AiSequence::AiFollow *follow)
-    : TypedAiPackage<AiFollow>(makeDefaultOptions().withShouldCancelPreviousAi(!follow->mCommanded).withRepeat(follow->mRepeat))
-    , mAlwaysFollow(follow->mAlwaysFollow)
-    , mDuration(follow->mData.mDuration)
-    , mRemainingDuration(follow->mRemainingDuration)
-    , mX(follow->mData.mX), mY(follow->mData.mY), mZ(follow->mData.mZ)
-    , mCellId(follow->mCellId), mActive(follow->mActive), mFollowIndex(mFollowIndexCounter++)
-{
-    mTargetActorRefId = follow->mTargetId;
-    mTargetActorId = follow->mTargetActorId;
-}
-
-bool AiFollow::execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
-{
-    const MWWorld::Ptr target = getTarget();
+    int AiFollow::mFollowIndexCounter = 0;
+
+    AiFollow::AiFollow(std::string_view actorId, float duration, float x, float y, float z, bool repeat)
+        : TypedAiPackage<AiFollow>(repeat)
+        , mAlwaysFollow(false)
+        , mDuration(duration)
+        , mRemainingDuration(duration)
+        , mX(x)
+        , mY(y)
+        , mZ(z)
+        , mCellId("")
+        , mActive(false)
+        , mFollowIndex(mFollowIndexCounter++)
+    {
+        mTargetActorRefId = std::string(actorId);
+    }
 
-    // Target is not here right now, wait for it to return
-    // Really we should be checking whether the target is currently registered with the MechanicsManager
-    if (target == MWWorld::Ptr() || !target.getRefData().getCount() || !target.getRefData().isEnabled())
-        return false;
+    AiFollow::AiFollow(
+        std::string_view actorId, std::string_view cellId, float duration, float x, float y, float z, bool repeat)
+        : TypedAiPackage<AiFollow>(repeat)
+        , mAlwaysFollow(false)
+        , mDuration(duration)
+        , mRemainingDuration(duration)
+        , mX(x)
+        , mY(y)
+        , mZ(z)
+        , mCellId(cellId)
+        , mActive(false)
+        , mFollowIndex(mFollowIndexCounter++)
+    {
+        mTargetActorRefId = std::string(actorId);
+    }
 
-    actor.getClass().getCreatureStats(actor).setDrawState(DrawState::Nothing);
+    AiFollow::AiFollow(const MWWorld::Ptr& actor, bool commanded)
+        : TypedAiPackage<AiFollow>(makeDefaultOptions().withShouldCancelPreviousAi(!commanded))
+        , mAlwaysFollow(true)
+        , mDuration(0)
+        , mRemainingDuration(0)
+        , mX(0)
+        , mY(0)
+        , mZ(0)
+        , mCellId("")
+        , mActive(false)
+        , mFollowIndex(mFollowIndexCounter++)
+    {
+        mTargetActorRefId = actor.getCellRef().getRefId();
+        mTargetActorId = actor.getClass().getCreatureStats(actor).getActorId();
+    }
 
-    AiFollowStorage& storage = state.get<AiFollowStorage>();
+    AiFollow::AiFollow(const ESM::AiSequence::AiFollow* follow)
+        : TypedAiPackage<AiFollow>(
+            makeDefaultOptions().withShouldCancelPreviousAi(!follow->mCommanded).withRepeat(follow->mRepeat))
+        , mAlwaysFollow(follow->mAlwaysFollow)
+        , mDuration(follow->mData.mDuration)
+        , mRemainingDuration(follow->mRemainingDuration)
+        , mX(follow->mData.mX)
+        , mY(follow->mData.mY)
+        , mZ(follow->mData.mZ)
+        , mCellId(follow->mCellId)
+        , mActive(follow->mActive)
+        , mFollowIndex(mFollowIndexCounter++)
+    {
+        mTargetActorRefId = follow->mTargetId;
+        mTargetActorId = follow->mTargetActorId;
+    }
 
-    bool& rotate = storage.mTurnActorToTarget;
-    if (rotate)
+    bool AiFollow::execute(
+        const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
     {
-        if (zTurn(actor, storage.mTargetAngleRadians))
-            rotate = false;
+        const MWWorld::Ptr target = getTarget();
 
-        return false;
-    }
+        // Target is not here right now, wait for it to return
+        // Really we should be checking whether the target is currently registered with the MechanicsManager
+        if (target == MWWorld::Ptr() || !target.getRefData().getCount() || !target.getRefData().isEnabled())
+            return false;
 
-    const osg::Vec3f actorPos(actor.getRefData().getPosition().asVec3());
-    const osg::Vec3f targetPos(target.getRefData().getPosition().asVec3());
-    const osg::Vec3f targetDir = targetPos - actorPos;
+        actor.getClass().getCreatureStats(actor).setDrawState(DrawState::Nothing);
 
-    // AiFollow requires the target to be in range and within sight for the initial activation
-    if (!mActive)
-    {
-        storage.mTimer -= duration;
+        AiFollowStorage& storage = state.get<AiFollowStorage>();
 
-        if (storage.mTimer < 0)
+        bool& rotate = storage.mTurnActorToTarget;
+        if (rotate)
         {
-            if (targetDir.length2() < 500*500 && MWBase::Environment::get().getWorld()->getLOS(actor, target))
-                mActive = true;
-            storage.mTimer = 0.5f;
+            if (zTurn(actor, storage.mTargetAngleRadians))
+                rotate = false;
+
+            return false;
         }
-    }
-    if (!mActive)
-        return false;
 
-    // In the original engine the first follower stays closer to the player than any subsequent followers.
-    // Followers beyond the first usually attempt to stand inside each other.
-    osg::Vec3f::value_type floatingDistance = 0;
-    auto followers = MWBase::Environment::get().getMechanicsManager()->getActorsFollowingByIndex(target);
-    if (followers.size() >= 2 && followers.cbegin()->first != mFollowIndex)
-    {
-        for(auto& follower : followers)
+        const osg::Vec3f actorPos(actor.getRefData().getPosition().asVec3());
+        const osg::Vec3f targetPos(target.getRefData().getPosition().asVec3());
+        const osg::Vec3f targetDir = targetPos - actorPos;
+
+        // AiFollow requires the target to be in range and within sight for the initial activation
+        if (!mActive)
         {
-            auto halfExtent = getHalfExtents(follower.second);
-            if(halfExtent > floatingDistance)
-                floatingDistance = halfExtent;
-        }
-        floatingDistance += 128;
-    }
-    floatingDistance += getHalfExtents(target) + 64;
-    floatingDistance += getHalfExtents(actor) * 2;
-    short followDistance = static_cast<short>(floatingDistance);
+            storage.mTimer -= duration;
 
-    if (!mAlwaysFollow) //Update if you only follow for a bit
-    {
-         //Check if we've run out of time
-        if (mDuration > 0)
+            if (storage.mTimer < 0)
+            {
+                if (targetDir.length2() < 500 * 500 && MWBase::Environment::get().getWorld()->getLOS(actor, target))
+                    mActive = true;
+                storage.mTimer = 0.5f;
+            }
+        }
+        if (!mActive)
+            return false;
+
+        // In the original engine the first follower stays closer to the player than any subsequent followers.
+        // Followers beyond the first usually attempt to stand inside each other.
+        osg::Vec3f::value_type floatingDistance = 0;
+        auto followers = MWBase::Environment::get().getMechanicsManager()->getActorsFollowingByIndex(target);
+        if (followers.size() >= 2 && followers.cbegin()->first != mFollowIndex)
         {
-            mRemainingDuration -= ((duration*MWBase::Environment::get().getWorld()->getTimeScaleFactor()) / 3600);
-            if (mRemainingDuration <= 0)
+            for (auto& follower : followers)
             {
-                mRemainingDuration = mDuration;
-                return true;
+                auto halfExtent = getHalfExtents(follower.second);
+                if (halfExtent > floatingDistance)
+                    floatingDistance = halfExtent;
             }
+            floatingDistance += 128;
         }
+        floatingDistance += getHalfExtents(target) + 64;
+        floatingDistance += getHalfExtents(actor) * 2;
+        short followDistance = static_cast<short>(floatingDistance);
 
-        osg::Vec3f finalPos(mX, mY, mZ);
-        if ((actorPos-finalPos).length2() < followDistance*followDistance) //Close-ish to final position
+        if (!mAlwaysFollow) // Update if you only follow for a bit
         {
-            if (actor.getCell()->isExterior()) //Outside?
+            // Check if we've run out of time
+            if (mDuration > 0)
             {
-                if (mCellId == "") //No cell to travel to
+                mRemainingDuration -= ((duration * MWBase::Environment::get().getWorld()->getTimeScaleFactor()) / 3600);
+                if (mRemainingDuration <= 0)
                 {
                     mRemainingDuration = mDuration;
                     return true;
                 }
             }
-            else if (mCellId == actor.getCell()->getCell()->mName) //Cell to travel to
+
+            osg::Vec3f finalPos(mX, mY, mZ);
+            if ((actorPos - finalPos).length2() < followDistance * followDistance) // Close-ish to final position
             {
-                mRemainingDuration = mDuration;
-                return true;
+                if (actor.getCell()->isExterior()) // Outside?
+                {
+                    if (mCellId == "") // No cell to travel to
+                    {
+                        mRemainingDuration = mDuration;
+                        return true;
+                    }
+                }
+                else if (mCellId == actor.getCell()->getCell()->mName) // Cell to travel to
+                {
+                    mRemainingDuration = mDuration;
+                    return true;
+                }
             }
         }
-    }
 
+        short baseFollowDistance = followDistance;
+        short threshold = 30; // to avoid constant switching between moving/stopping
+        if (storage.mMoving)
+            followDistance -= threshold;
+        else
+            followDistance += threshold;
 
-    short baseFollowDistance = followDistance;
-    short threshold = 30; // to avoid constant switching between moving/stopping
-    if (storage.mMoving)
-        followDistance -= threshold;
-    else
-        followDistance += threshold;
+        if (targetDir.length2() <= followDistance * followDistance)
+        {
+            float faceAngleRadians = std::atan2(targetDir.x(), targetDir.y());
 
-    if (targetDir.length2() <= followDistance * followDistance)
-    {
-        float faceAngleRadians = std::atan2(targetDir.x(), targetDir.y());
+            if (!zTurn(actor, faceAngleRadians, osg::DegreesToRadians(45.f)))
+            {
+                storage.mTargetAngleRadians = faceAngleRadians;
+                storage.mTurnActorToTarget = true;
+            }
 
-        if (!zTurn(actor, faceAngleRadians, osg::DegreesToRadians(45.f)))
+            return false;
+        }
+
+        storage.mMoving = !pathTo(actor, targetPos, duration, baseFollowDistance); // Go to the destination
+
+        if (storage.mMoving)
         {
-            storage.mTargetAngleRadians = faceAngleRadians;
-            storage.mTurnActorToTarget = true;
+            // Check if you're far away
+            if (targetDir.length2() > 450 * 450)
+                actor.getClass().getCreatureStats(actor).setMovementFlag(
+                    MWMechanics::CreatureStats::Flag_Run, true); // Make NPC run
+            else if (targetDir.length2()
+                < 325 * 325) // Have a bit of a dead zone, otherwise npc will constantly flip between running and not
+                             // when right on the edge of the running threshold
+                actor.getClass().getCreatureStats(actor).setMovementFlag(
+                    MWMechanics::CreatureStats::Flag_Run, false); // make NPC walk
         }
 
         return false;
     }
 
-    storage.mMoving = !pathTo(actor, targetPos, duration, baseFollowDistance); // Go to the destination
-
-    if (storage.mMoving)
+    std::string AiFollow::getFollowedActor()
     {
-        //Check if you're far away
-        if (targetDir.length2() > 450 * 450)
-            actor.getClass().getCreatureStats(actor).setMovementFlag(MWMechanics::CreatureStats::Flag_Run, true); //Make NPC run
-        else if (targetDir.length2() < 325 * 325) //Have a bit of a dead zone, otherwise npc will constantly flip between running and not when right on the edge of the running threshold
-            actor.getClass().getCreatureStats(actor).setMovementFlag(MWMechanics::CreatureStats::Flag_Run, false); //make NPC walk
+        return mTargetActorRefId;
     }
 
-    return false;
-}
-
-std::string AiFollow::getFollowedActor()
-{
-    return mTargetActorRefId;
-}
-
-bool AiFollow::isCommanded() const
-{
-    return !mOptions.mShouldCancelPreviousAi;
-}
+    bool AiFollow::isCommanded() const
+    {
+        return !mOptions.mShouldCancelPreviousAi;
+    }
 
-void AiFollow::writeState(ESM::AiSequence::AiSequence &sequence) const
-{
-    auto follow = std::make_unique<ESM::AiSequence::AiFollow>();
-    follow->mData.mX = mX;
-    follow->mData.mY = mY;
-    follow->mData.mZ = mZ;
-    follow->mData.mDuration = mDuration;
-    follow->mTargetId = mTargetActorRefId;
-    follow->mTargetActorId = mTargetActorId;
-    follow->mRemainingDuration = mRemainingDuration;
-    follow->mCellId = mCellId;
-    follow->mAlwaysFollow = mAlwaysFollow;
-    follow->mCommanded = isCommanded();
-    follow->mActive = mActive;
-    follow->mRepeat = getRepeat();
-
-    ESM::AiSequence::AiPackageContainer package;
-    package.mType = ESM::AiSequence::Ai_Follow;
-    package.mPackage = std::move(follow);
-    sequence.mPackages.push_back(std::move(package));
-}
+    void AiFollow::writeState(ESM::AiSequence::AiSequence& sequence) const
+    {
+        auto follow = std::make_unique<ESM::AiSequence::AiFollow>();
+        follow->mData.mX = mX;
+        follow->mData.mY = mY;
+        follow->mData.mZ = mZ;
+        follow->mData.mDuration = mDuration;
+        follow->mTargetId = mTargetActorRefId;
+        follow->mTargetActorId = mTargetActorId;
+        follow->mRemainingDuration = mRemainingDuration;
+        follow->mCellId = mCellId;
+        follow->mAlwaysFollow = mAlwaysFollow;
+        follow->mCommanded = isCommanded();
+        follow->mActive = mActive;
+        follow->mRepeat = getRepeat();
+
+        ESM::AiSequence::AiPackageContainer package;
+        package.mType = ESM::AiSequence::Ai_Follow;
+        package.mPackage = std::move(follow);
+        sequence.mPackages.push_back(std::move(package));
+    }
 
-int AiFollow::getFollowIndex() const
-{
-    return mFollowIndex;
-}
+    int AiFollow::getFollowIndex() const
+    {
+        return mFollowIndex;
+    }
 
-void AiFollow::fastForward(const MWWorld::Ptr& actor, AiState &state)
-{
-    // Update duration counter if this package has a duration
-    if (mDuration > 0)
-        mRemainingDuration--;
-}
+    void AiFollow::fastForward(const MWWorld::Ptr& actor, AiState& state)
+    {
+        // Update duration counter if this package has a duration
+        if (mDuration > 0)
+            mRemainingDuration--;
+    }
 
 }
diff --git a/apps/openmw/mwmechanics/aifollow.hpp b/apps/openmw/mwmechanics/aifollow.hpp
index c1969a7e27..6f20336efa 100644
--- a/apps/openmw/mwmechanics/aifollow.hpp
+++ b/apps/openmw/mwmechanics/aifollow.hpp
@@ -1,8 +1,8 @@
 #ifndef GAME_MWMECHANICS_AIFOLLOW_H
 #define GAME_MWMECHANICS_AIFOLLOW_H
 
-#include "typedaipackage.hpp"
 #include "aitemporarybase.hpp"
+#include "typedaipackage.hpp"
 
 #include <string>
 #include <string_view>
@@ -25,76 +25,80 @@ namespace MWMechanics
         float mTargetAngleRadians;
         bool mTurnActorToTarget;
 
-        AiFollowStorage() :
-            mTimer(0.f),
-            mMoving(false),
-            mTargetAngleRadians(0.f),
-            mTurnActorToTarget(false)
-        {}
+        AiFollowStorage()
+            : mTimer(0.f)
+            , mMoving(false)
+            , mTargetAngleRadians(0.f)
+            , mTurnActorToTarget(false)
+        {
+        }
     };
 
     /// \brief AiPackage for an actor to follow another actor/the PC
-    /** The AI will follow the target until a condition (time, or position) are set. Both can be disabled to cause the actor to follow the other indefinitely
-    **/
+    /** The AI will follow the target until a condition (time, or position) are set. Both can be disabled to cause the
+     *actor to follow the other indefinitely
+     **/
     class AiFollow final : public TypedAiPackage<AiFollow>
     {
-        public:
-            /// Follow Actor for duration or until you arrive at a world position
-            AiFollow(std::string_view actorId, float duration, float x, float y, float z, bool repeat);
-            /// Follow Actor for duration or until you arrive at a position in a cell
-            AiFollow(std::string_view actorId, std::string_view cellId, float duration, float x, float y, float z, bool repeat);
-            /// Follow Actor indefinitively
-            AiFollow(const MWWorld::Ptr& actor, bool commanded=false);
-
-            AiFollow(const ESM::AiSequence::AiFollow* follow);
-
-            bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) override;
-
-            static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::Follow; }
-
-            static constexpr Options makeDefaultOptions()
-            {
-                AiPackage::Options options;
-                options.mUseVariableSpeed = true;
-                options.mSideWithTarget = true;
-                options.mFollowTargetThroughDoors = true;
-                return options;
-            }
-
-            /// Returns the actor being followed
-            std::string getFollowedActor();
-
-            void writeState (ESM::AiSequence::AiSequence& sequence) const override;
-
-            bool isCommanded() const;
-
-            int getFollowIndex() const;
-
-            void fastForward(const MWWorld::Ptr& actor, AiState& state) override;
-
-            osg::Vec3f getDestination() const override
-            {
-                MWWorld::Ptr target = getTarget();
-                if (target.isEmpty())
-                    return osg::Vec3f(0, 0, 0);
-
-                return target.getRefData().getPosition().asVec3();
-            }
-
-        private:
-            /// This will make the actor always follow.
-            /** Thus ignoring mDuration and mX,mY,mZ (used for summoned creatures). **/
-            const bool mAlwaysFollow;
-            const float mDuration; // Hours
-            float mRemainingDuration; // Hours
-            const float mX;
-            const float mY;
-            const float mZ;
-            const std::string mCellId;
-            bool mActive; // have we spotted the target?
-            const int mFollowIndex;
-
-            static int mFollowIndexCounter;
+    public:
+        /// Follow Actor for duration or until you arrive at a world position
+        AiFollow(std::string_view actorId, float duration, float x, float y, float z, bool repeat);
+        /// Follow Actor for duration or until you arrive at a position in a cell
+        AiFollow(
+            std::string_view actorId, std::string_view cellId, float duration, float x, float y, float z, bool repeat);
+        /// Follow Actor indefinitively
+        AiFollow(const MWWorld::Ptr& actor, bool commanded = false);
+
+        AiFollow(const ESM::AiSequence::AiFollow* follow);
+
+        bool execute(const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state,
+            float duration) override;
+
+        static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::Follow; }
+
+        static constexpr Options makeDefaultOptions()
+        {
+            AiPackage::Options options;
+            options.mUseVariableSpeed = true;
+            options.mSideWithTarget = true;
+            options.mFollowTargetThroughDoors = true;
+            return options;
+        }
+
+        /// Returns the actor being followed
+        std::string getFollowedActor();
+
+        void writeState(ESM::AiSequence::AiSequence& sequence) const override;
+
+        bool isCommanded() const;
+
+        int getFollowIndex() const;
+
+        void fastForward(const MWWorld::Ptr& actor, AiState& state) override;
+
+        osg::Vec3f getDestination() const override
+        {
+            MWWorld::Ptr target = getTarget();
+            if (target.isEmpty())
+                return osg::Vec3f(0, 0, 0);
+
+            return target.getRefData().getPosition().asVec3();
+        }
+
+    private:
+        /// This will make the actor always follow.
+        /** Thus ignoring mDuration and mX,mY,mZ (used for summoned creatures). **/
+        const bool mAlwaysFollow;
+        const float mDuration; // Hours
+        float mRemainingDuration; // Hours
+        const float mX;
+        const float mY;
+        const float mZ;
+        const std::string mCellId;
+        bool mActive; // have we spotted the target?
+        const int mFollowIndex;
+
+        static int mFollowIndexCounter;
     };
 }
 #endif
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index edaa481f10..68dfaff7cf 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -1,25 +1,25 @@
 #include "aipackage.hpp"
 
+#include <components/detournavigator/agentbounds.hpp>
+#include <components/detournavigator/navigator.hpp>
 #include <components/esm3/loadcell.hpp>
 #include <components/esm3/loadland.hpp>
-#include <components/detournavigator/navigator.hpp>
-#include <components/detournavigator/agentbounds.hpp>
 #include <components/misc/coordinateconverter.hpp>
 #include <components/settings/settings.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/action.hpp"
-#include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
 
-#include "pathgrid.hpp"
+#include "actorutil.hpp"
 #include "creaturestats.hpp"
 #include "movement.hpp"
+#include "pathgrid.hpp"
 #include "steering.hpp"
-#include "actorutil.hpp"
 
 #include <osg/Quat>
 
@@ -27,7 +27,8 @@ namespace
 {
     float divOrMax(float dividend, float divisor)
     {
-        return divisor == 0 ? std::numeric_limits<float>::max() * std::numeric_limits<float>::epsilon() : dividend / divisor;
+        return divisor == 0 ? std::numeric_limits<float>::max() * std::numeric_limits<float>::epsilon()
+                            : dividend / divisor;
     }
 
     float getPointTolerance(float speed, float duration, const osg::Vec3f& halfExtents)
@@ -42,17 +43,17 @@ namespace
     }
 }
 
-MWMechanics::AiPackage::AiPackage(AiPackageTypeId typeId, const Options& options) :
-    mTypeId(typeId),
-    mOptions(options),
-    mReaction(MWBase::Environment::get().getWorld()->getPrng()),
-    mTargetActorRefId(""),
-    mTargetActorId(-1),
-    mCachedTarget(),
-    mRotateOnTheRunChecks(0),
-    mIsShortcutting(false),
-    mShortcutProhibited(false),
-    mShortcutFailPos()
+MWMechanics::AiPackage::AiPackage(AiPackageTypeId typeId, const Options& options)
+    : mTypeId(typeId)
+    , mOptions(options)
+    , mReaction(MWBase::Environment::get().getWorld()->getPrng())
+    , mTargetActorRefId("")
+    , mTargetActorId(-1)
+    , mCachedTarget()
+    , mRotateOnTheRunChecks(0)
+    , mIsShortcutting(false)
+    , mShortcutProhibited(false)
+    , mShortcutFailPos()
 {
 }
 
@@ -108,16 +109,17 @@ void MWMechanics::AiPackage::reset()
 }
 
 bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f& dest, float duration,
-                                    float destTolerance, float endTolerance, PathType pathType)
+    float destTolerance, float endTolerance, PathType pathType)
 {
     const Misc::TimerStatus timerStatus = mReaction.update(duration);
 
-    const osg::Vec3f position = actor.getRefData().getPosition().asVec3(); //position of the actor
+    const osg::Vec3f position = actor.getRefData().getPosition().asVec3(); // position of the actor
     MWBase::World* world = MWBase::Environment::get().getWorld();
     const DetourNavigator::AgentBounds agentBounds = world->getPathfindingAgentBounds(actor);
 
     /// Stops the actor when it gets too close to a unloaded cell
-    //... At current time, this test is unnecessary. AI shuts down when actor is more than "actors processing range" setting value
+    //... At current time, this test is unnecessary. AI shuts down when actor is more than "actors processing range"
+    // setting value
     //... units from player, and exterior cells are 8192 units long and wide.
     //... But AI processing distance may increase in the future.
     if (isNearInactiveCell(position))
@@ -160,7 +162,8 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
                     // get point just before dest
                     auto pPointBeforeDest = mPathFinder.getPath().rbegin() + 1;
 
-                    // if start point is closer to the target then last point of path (excluding target itself) then go straight on the target
+                    // if start point is closer to the target then last point of path (excluding target itself) then go
+                    // straight on the target
                     if (distance(position, dest) <= distance(dest, *pPointBeforeDest))
                     {
                         mPathFinder.clearPath();
@@ -169,23 +172,23 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
                 }
             }
 
-            if (!mPathFinder.getPath().empty()) //Path has points in it
+            if (!mPathFinder.getPath().empty()) // Path has points in it
             {
-                const osg::Vec3f& lastPos = mPathFinder.getPath().back(); //Get the end of the proposed path
+                const osg::Vec3f& lastPos = mPathFinder.getPath().back(); // Get the end of the proposed path
 
-                if(distance(dest, lastPos) > 100) //End of the path is far from the destination
-                    mPathFinder.addPointToPath(dest); //Adds the final destination to the path, to try to get to where you want to go
+                if (distance(dest, lastPos) > 100) // End of the path is far from the destination
+                    mPathFinder.addPointToPath(
+                        dest); // Adds the final destination to the path, to try to get to where you want to go
             }
         }
     }
 
-    const float pointTolerance = getPointTolerance(actor.getClass().getMaxSpeed(actor), duration,
-                                                   world->getHalfExtents(actor));
+    const float pointTolerance
+        = getPointTolerance(actor.getClass().getMaxSpeed(actor), duration, world->getHalfExtents(actor));
 
     static const bool smoothMovement = Settings::Manager::getBool("smooth movement", "Game");
     mPathFinder.update(position, pointTolerance, DEFAULT_TOLERANCE,
-                       /*shortenIfAlmostStraight=*/smoothMovement, actorCanMoveByZ,
-                       agentBounds, getNavigatorFlags(actor));
+        /*shortenIfAlmostStraight=*/smoothMovement, actorCanMoveByZ, agentBounds, getNavigatorFlags(actor));
 
     if (isDestReached || mPathFinder.checkPathCompleted()) // if path is finished
     {
@@ -201,10 +204,12 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
     world->updateActorPath(actor, mPathFinder.getPath(), agentBounds, position, dest);
 
     if (mRotateOnTheRunChecks == 0
-        || isReachableRotatingOnTheRun(actor, *mPathFinder.getPath().begin())) // to prevent circling around a path point
+        || isReachableRotatingOnTheRun(
+            actor, *mPathFinder.getPath().begin())) // to prevent circling around a path point
     {
         actor.getClass().getMovementSettings(actor).mPosition[1] = 1; // move to the target
-        if (mRotateOnTheRunChecks > 0) mRotateOnTheRunChecks--;
+        if (mRotateOnTheRunChecks > 0)
+            mRotateOnTheRunChecks--;
     }
 
     // turn to next path point by X,Z axes
@@ -244,7 +249,8 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
 void MWMechanics::AiPackage::evadeObstacles(const MWWorld::Ptr& actor)
 {
     // check if stuck due to obstacles
-    if (!mObstacleCheck.isEvading()) return;
+    if (!mObstacleCheck.isEvading())
+        return;
 
     // first check if obstacle is a door
     static float distance = MWBase::Environment::get().getWorld()->getMaxActivationDistance();
@@ -294,7 +300,7 @@ void MWMechanics::AiPackage::openDoors(const MWWorld::Ptr& actor)
         if (!isDoorOnTheWay(actor, door, mPathFinder.getPath().front()))
             return;
 
-        if ((door.getCellRef().getTrap().empty() && door.getCellRef().getLockLevel() <= 0 ))
+        if ((door.getCellRef().getTrap().empty() && door.getCellRef().getLockLevel() <= 0))
         {
             world->activate(door, actor);
             return;
@@ -304,7 +310,7 @@ void MWMechanics::AiPackage::openDoors(const MWWorld::Ptr& actor)
         if (keyId.empty())
             return;
 
-        MWWorld::ContainerStore &invStore = actor.getClass().getContainerStore(actor);
+        MWWorld::ContainerStore& invStore = actor.getClass().getContainerStore(actor);
         MWWorld::Ptr keyPtr = invStore.search(keyId);
 
         if (!keyPtr.isEmpty())
@@ -312,31 +318,32 @@ void MWMechanics::AiPackage::openDoors(const MWWorld::Ptr& actor)
     }
 }
 
-const MWMechanics::PathgridGraph& MWMechanics::AiPackage::getPathGridGraph(const MWWorld::CellStore *cell)
+const MWMechanics::PathgridGraph& MWMechanics::AiPackage::getPathGridGraph(const MWWorld::CellStore* cell)
 {
     const ESM::CellId& id = cell->getCell()->getCellId();
     // static cache is OK for now, pathgrids can never change during runtime
-    typedef std::map<ESM::CellId, std::unique_ptr<MWMechanics::PathgridGraph> > CacheMap;
+    typedef std::map<ESM::CellId, std::unique_ptr<MWMechanics::PathgridGraph>> CacheMap;
     static CacheMap cache;
     CacheMap::iterator found = cache.find(id);
     if (found == cache.end())
     {
-        cache.insert(std::make_pair(id, std::make_unique<MWMechanics::PathgridGraph>(MWMechanics::PathgridGraph(cell))));
+        cache.insert(
+            std::make_pair(id, std::make_unique<MWMechanics::PathgridGraph>(MWMechanics::PathgridGraph(cell))));
     }
     return *cache[id].get();
 }
 
 bool MWMechanics::AiPackage::shortcutPath(const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
-        const MWWorld::Ptr& actor, bool *destInLOS, bool isPathClear)
+    const MWWorld::Ptr& actor, bool* destInLOS, bool isPathClear)
 {
     if (!mShortcutProhibited || (mShortcutFailPos - startPoint).length() >= PATHFIND_SHORTCUT_RETRY_DIST)
     {
         // check if target is clearly visible
         isPathClear = !MWBase::Environment::get().getWorld()->castRay(
-            startPoint.x(), startPoint.y(), startPoint.z(),
-            endPoint.x(), endPoint.y(), endPoint.z());
+            startPoint.x(), startPoint.y(), startPoint.z(), endPoint.x(), endPoint.y(), endPoint.z());
 
-        if (destInLOS != nullptr) *destInLOS = isPathClear;
+        if (destInLOS != nullptr)
+            *destInLOS = isPathClear;
 
         if (!isPathClear)
             return false;
@@ -355,16 +362,18 @@ bool MWMechanics::AiPackage::shortcutPath(const osg::Vec3f& startPoint, const os
     return false;
 }
 
-bool MWMechanics::AiPackage::checkWayIsClearForActor(const osg::Vec3f& startPoint, const osg::Vec3f& endPoint, const MWWorld::Ptr& actor)
+bool MWMechanics::AiPackage::checkWayIsClearForActor(
+    const osg::Vec3f& startPoint, const osg::Vec3f& endPoint, const MWWorld::Ptr& actor)
 {
     if (canActorMoveByZAxis(actor))
         return true;
 
     const float actorSpeed = actor.getClass().getMaxSpeed(actor);
-    const float maxAvoidDist = AI_REACTION_TIME * actorSpeed + actorSpeed / getAngularVelocity(actorSpeed) * 2; // *2 - for reliability
+    const float maxAvoidDist
+        = AI_REACTION_TIME * actorSpeed + actorSpeed / getAngularVelocity(actorSpeed) * 2; // *2 - for reliability
     const float distToTarget = osg::Vec2f(endPoint.x(), endPoint.y()).length();
 
-    const float offsetXY = distToTarget > maxAvoidDist*1.5? maxAvoidDist : maxAvoidDist/2;
+    const float offsetXY = distToTarget > maxAvoidDist * 1.5 ? maxAvoidDist : maxAvoidDist / 2;
 
     // update shortcut prohibit state
     if (checkWayIsClear(startPoint, endPoint, offsetXY))
@@ -390,8 +399,7 @@ bool MWMechanics::AiPackage::checkWayIsClearForActor(const osg::Vec3f& startPoin
 
 bool MWMechanics::AiPackage::doesPathNeedRecalc(const osg::Vec3f& newDest, const MWWorld::Ptr& actor) const
 {
-    return mPathFinder.getPath().empty()
-        || getPathDistance(actor, mPathFinder.getPath().back(), newDest) > 10
+    return mPathFinder.getPath().empty() || getPathDistance(actor, mPathFinder.getPath().back(), newDest) > 10
         || mPathFinder.getPathCell() != actor.getCell();
 }
 
@@ -408,8 +416,8 @@ bool MWMechanics::AiPackage::isNearInactiveCell(osg::Vec3f position)
         const float distanceFromEdge = 200.0;
         float minThreshold = (-1.0f * ESM::Land::REAL_SIZE) + distanceFromEdge;
         float maxThreshold = (2.0f * ESM::Land::REAL_SIZE) - distanceFromEdge;
-        return (position.x() < minThreshold) || (maxThreshold < position.x())
-            || (position.y() < minThreshold) || (maxThreshold < position.y());
+        return (position.x() < minThreshold) || (maxThreshold < position.x()) || (position.y() < minThreshold)
+            || (maxThreshold < position.y());
     }
     else
     {
@@ -447,17 +455,17 @@ bool MWMechanics::AiPackage::isReachableRotatingOnTheRun(const MWWorld::Ptr& act
 
 DetourNavigator::Flags MWMechanics::AiPackage::getNavigatorFlags(const MWWorld::Ptr& actor) const
 {
-    static const bool allowToFollowOverWaterSurface = Settings::Manager::getBool("allow actors to follow over water surface", "Game");
+    static const bool allowToFollowOverWaterSurface
+        = Settings::Manager::getBool("allow actors to follow over water surface", "Game");
 
     const MWWorld::Class& actorClass = actor.getClass();
     DetourNavigator::Flags result = DetourNavigator::Flag_none;
 
     if ((actorClass.isPureWaterCreature(actor)
-         || (getTypeId() != AiPackageTypeId::Wander
-             && ((allowToFollowOverWaterSurface && getTypeId() == AiPackageTypeId::Follow)
-                 || actorClass.canSwim(actor)
-                 || hasWaterWalking(actor)))
-        ) && actorClass.getSwimSpeed(actor) > 0)
+            || (getTypeId() != AiPackageTypeId::Wander
+                && ((allowToFollowOverWaterSurface && getTypeId() == AiPackageTypeId::Follow)
+                    || actorClass.canSwim(actor) || hasWaterWalking(actor))))
+        && actorClass.getSwimSpeed(actor) > 0)
         result |= DetourNavigator::Flag_swim;
 
     if (actorClass.canWalk(actor) && actor.getClass().getWalkSpeed(actor) > 0)
@@ -479,18 +487,15 @@ DetourNavigator::AreaCosts MWMechanics::AiPackage::getAreaCosts(const MWWorld::P
     const DetourNavigator::Flags flags = getNavigatorFlags(actor);
     const MWWorld::Class& actorClass = actor.getClass();
 
-    const float swimSpeed = (flags & DetourNavigator::Flag_swim) == 0
-            ? 0.0f
-            : actorClass.getSwimSpeed(actor);
+    const float swimSpeed = (flags & DetourNavigator::Flag_swim) == 0 ? 0.0f : actorClass.getSwimSpeed(actor);
 
-    const float walkSpeed = [&]
-    {
+    const float walkSpeed = [&] {
         if ((flags & DetourNavigator::Flag_walk) == 0)
             return 0.0f;
         if (getTypeId() == AiPackageTypeId::Wander)
             return actorClass.getWalkSpeed(actor);
         return actorClass.getRunSpeed(actor);
-    } ();
+    }();
 
     const float maxSpeed = std::max(swimSpeed, walkSpeed);
 
@@ -513,7 +518,8 @@ osg::Vec3f MWMechanics::AiPackage::getNextPathPoint(const osg::Vec3f& destinatio
     return mPathFinder.getPath().empty() ? destination : mPathFinder.getPath().front();
 }
 
-float MWMechanics::AiPackage::getNextPathPointTolerance(float speed, float duration, const osg::Vec3f& halfExtents) const
+float MWMechanics::AiPackage::getNextPathPointTolerance(
+    float speed, float duration, const osg::Vec3f& halfExtents) const
 {
     if (mPathFinder.getPathSize() <= 1)
         return std::max(DEFAULT_TOLERANCE, mLastDestinationTolerance);
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index 684ff3338d..97a56b9c5a 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -5,11 +5,11 @@
 
 #include <components/detournavigator/areatype.hpp>
 
-#include "pathfinding.hpp"
-#include "obstacle.hpp"
 #include "aipackagetypeid.hpp"
-#include "aitimer.hpp"
 #include "aistatefwd.hpp"
+#include "aitimer.hpp"
+#include "obstacle.hpp"
+#include "pathfinding.hpp"
 
 #include "../mwworld/ptr.hpp"
 
@@ -22,7 +22,6 @@ namespace ESM
     }
 }
 
-
 namespace MWMechanics
 {
     class CharacterController;
@@ -31,150 +30,150 @@ namespace MWMechanics
     /// \brief Base class for AI packages
     class AiPackage
     {
-        public:
-            struct Options
+    public:
+        struct Options
+        {
+            unsigned int mPriority = 0;
+            bool mUseVariableSpeed = false;
+            bool mSideWithTarget = false;
+            bool mFollowTargetThroughDoors = false;
+            bool mCanCancel = true;
+            bool mShouldCancelPreviousAi = true;
+            bool mRepeat = false;
+            bool mAlwaysActive = false;
+
+            constexpr Options withRepeat(bool value)
             {
-                unsigned int mPriority = 0;
-                bool mUseVariableSpeed = false;
-                bool mSideWithTarget = false;
-                bool mFollowTargetThroughDoors = false;
-                bool mCanCancel = true;
-                bool mShouldCancelPreviousAi = true;
-                bool mRepeat = false;
-                bool mAlwaysActive = false;
-
-                constexpr Options withRepeat(bool value)
-                {
-                    mRepeat = value;
-                    return *this;
-                }
-
-                constexpr Options withShouldCancelPreviousAi(bool value)
-                {
-                    mShouldCancelPreviousAi = value;
-                    return *this;
-                }
-            };
-
-            AiPackage(AiPackageTypeId typeId, const Options& options);
-
-            virtual ~AiPackage() = default;
-
-            static constexpr Options makeDefaultOptions()
+                mRepeat = value;
+                return *this;
+            }
+
+            constexpr Options withShouldCancelPreviousAi(bool value)
             {
-                return Options{};
+                mShouldCancelPreviousAi = value;
+                return *this;
             }
+        };
+
+        AiPackage(AiPackageTypeId typeId, const Options& options);
 
-            ///Clones the package
-            virtual std::unique_ptr<AiPackage> clone() const = 0;
+        virtual ~AiPackage() = default;
 
-            /// Updates and runs the package (Should run every frame)
-            /// \return Package completed?
-            virtual bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) = 0;
+        static constexpr Options makeDefaultOptions() { return Options{}; }
 
-            /// Returns the TypeID of the AiPackage
-            /// \see enum TypeId
-            AiPackageTypeId getTypeId() const { return mTypeId; }
+        /// Clones the package
+        virtual std::unique_ptr<AiPackage> clone() const = 0;
 
-            /// Higher number is higher priority (0 being the lowest)
-            unsigned int getPriority() const { return mOptions.mPriority; }
+        /// Updates and runs the package (Should run every frame)
+        /// \return Package completed?
+        virtual bool execute(
+            const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
+            = 0;
 
-            /// Check if package use movement with variable speed
-            bool useVariableSpeed() const { return mOptions.mUseVariableSpeed; }
+        /// Returns the TypeID of the AiPackage
+        /// \see enum TypeId
+        AiPackageTypeId getTypeId() const { return mTypeId; }
 
-            virtual void writeState (ESM::AiSequence::AiSequence& sequence) const {}
+        /// Higher number is higher priority (0 being the lowest)
+        unsigned int getPriority() const { return mOptions.mPriority; }
 
-            /// Simulates the passing of time
-            virtual void fastForward(const MWWorld::Ptr& actor, AiState& state) {}
+        /// Check if package use movement with variable speed
+        bool useVariableSpeed() const { return mOptions.mUseVariableSpeed; }
 
-            /// Get the target actor the AI is targeted at (not applicable to all AI packages, default return empty Ptr)
-            virtual MWWorld::Ptr getTarget() const;
+        virtual void writeState(ESM::AiSequence::AiSequence& sequence) const {}
 
-            /// Get the destination point of the AI package (not applicable to all AI packages, default return (0, 0, 0))
-            virtual osg::Vec3f getDestination(const MWWorld::Ptr& actor) const { return osg::Vec3f(0, 0, 0); };
+        /// Simulates the passing of time
+        virtual void fastForward(const MWWorld::Ptr& actor, AiState& state) {}
 
-            /// Return true if having this AiPackage makes the actor side with the target in fights (default false)
-            bool sideWithTarget() const { return mOptions.mSideWithTarget; }
+        /// Get the target actor the AI is targeted at (not applicable to all AI packages, default return empty Ptr)
+        virtual MWWorld::Ptr getTarget() const;
 
-            /// Return true if the actor should follow the target through teleport doors (default false)
-            bool followTargetThroughDoors() const { return mOptions.mFollowTargetThroughDoors; }
+        /// Get the destination point of the AI package (not applicable to all AI packages, default return (0, 0, 0))
+        virtual osg::Vec3f getDestination(const MWWorld::Ptr& actor) const { return osg::Vec3f(0, 0, 0); };
 
-            /// Can this Ai package be canceled? (default true)
-            bool canCancel() const { return mOptions.mCanCancel; }
+        /// Return true if having this AiPackage makes the actor side with the target in fights (default false)
+        bool sideWithTarget() const { return mOptions.mSideWithTarget; }
 
-            /// Upon adding this Ai package, should the Ai Sequence attempt to cancel previous Ai packages (default true)?
-            bool shouldCancelPreviousAi() const { return mOptions.mShouldCancelPreviousAi; }
+        /// Return true if the actor should follow the target through teleport doors (default false)
+        bool followTargetThroughDoors() const { return mOptions.mFollowTargetThroughDoors; }
 
-            /// Return true if this package should repeat.
-            bool getRepeat() const { return mOptions.mRepeat; }
+        /// Can this Ai package be canceled? (default true)
+        bool canCancel() const { return mOptions.mCanCancel; }
 
-            virtual osg::Vec3f getDestination() const { return osg::Vec3f(0, 0, 0); }
+        /// Upon adding this Ai package, should the Ai Sequence attempt to cancel previous Ai packages (default true)?
+        bool shouldCancelPreviousAi() const { return mOptions.mShouldCancelPreviousAi; }
 
-            /// Return true if any loaded actor with this AI package must be active.
-            bool alwaysActive() const { return mOptions.mAlwaysActive; }
+        /// Return true if this package should repeat.
+        bool getRepeat() const { return mOptions.mRepeat; }
 
-            /// Reset pathfinding state
-            void reset();
+        virtual osg::Vec3f getDestination() const { return osg::Vec3f(0, 0, 0); }
 
-            /// Return if actor's rotation speed is sufficient to rotate to the destination pathpoint on the run. Otherwise actor should rotate while standing.
-            static bool isReachableRotatingOnTheRun(const MWWorld::Ptr& actor, const osg::Vec3f& dest);
+        /// Return true if any loaded actor with this AI package must be active.
+        bool alwaysActive() const { return mOptions.mAlwaysActive; }
 
-            osg::Vec3f getNextPathPoint(const osg::Vec3f& destination) const;
+        /// Reset pathfinding state
+        void reset();
 
-            float getNextPathPointTolerance(float speed, float duration, const osg::Vec3f& halfExtents) const;
+        /// Return if actor's rotation speed is sufficient to rotate to the destination pathpoint on the run. Otherwise
+        /// actor should rotate while standing.
+        static bool isReachableRotatingOnTheRun(const MWWorld::Ptr& actor, const osg::Vec3f& dest);
 
-        protected:
-            /// Handles path building and shortcutting with obstacles avoiding
-            /** \return If the actor has arrived at his destination **/
-            bool pathTo(const MWWorld::Ptr& actor, const osg::Vec3f& dest, float duration,
-                        float destTolerance = 0.0f, float endTolerance = 0.0f, PathType pathType = PathType::Full);
+        osg::Vec3f getNextPathPoint(const osg::Vec3f& destination) const;
 
-            /// Check if there aren't any obstacles along the path to make shortcut possible
-            /// If a shortcut is possible then path will be cleared and filled with the destination point.
-            /// \param destInLOS If not nullptr function will return ray cast check result
-            /// \return If can shortcut the path
-            bool shortcutPath(const osg::Vec3f& startPoint, const osg::Vec3f& endPoint, const MWWorld::Ptr& actor,
-                              bool *destInLOS, bool isPathClear);
+        float getNextPathPointTolerance(float speed, float duration, const osg::Vec3f& halfExtents) const;
 
-            /// Check if the way to the destination is clear, taking into account actor speed
-            bool checkWayIsClearForActor(const osg::Vec3f& startPoint, const osg::Vec3f& endPoint, const MWWorld::Ptr& actor);
+    protected:
+        /// Handles path building and shortcutting with obstacles avoiding
+        /** \return If the actor has arrived at his destination **/
+        bool pathTo(const MWWorld::Ptr& actor, const osg::Vec3f& dest, float duration, float destTolerance = 0.0f,
+            float endTolerance = 0.0f, PathType pathType = PathType::Full);
 
-            bool doesPathNeedRecalc(const osg::Vec3f& newDest, const MWWorld::Ptr& actor) const;
+        /// Check if there aren't any obstacles along the path to make shortcut possible
+        /// If a shortcut is possible then path will be cleared and filled with the destination point.
+        /// \param destInLOS If not nullptr function will return ray cast check result
+        /// \return If can shortcut the path
+        bool shortcutPath(const osg::Vec3f& startPoint, const osg::Vec3f& endPoint, const MWWorld::Ptr& actor,
+            bool* destInLOS, bool isPathClear);
 
-            void evadeObstacles(const MWWorld::Ptr& actor);
+        /// Check if the way to the destination is clear, taking into account actor speed
+        bool checkWayIsClearForActor(
+            const osg::Vec3f& startPoint, const osg::Vec3f& endPoint, const MWWorld::Ptr& actor);
 
-            void openDoors(const MWWorld::Ptr& actor);
+        bool doesPathNeedRecalc(const osg::Vec3f& newDest, const MWWorld::Ptr& actor) const;
 
-            const PathgridGraph& getPathGridGraph(const MWWorld::CellStore* cell);
+        void evadeObstacles(const MWWorld::Ptr& actor);
 
-            DetourNavigator::Flags getNavigatorFlags(const MWWorld::Ptr& actor) const;
+        void openDoors(const MWWorld::Ptr& actor);
 
-            DetourNavigator::AreaCosts getAreaCosts(const MWWorld::Ptr& actor) const;
+        const PathgridGraph& getPathGridGraph(const MWWorld::CellStore* cell);
 
-            const AiPackageTypeId mTypeId;
-            const Options mOptions;
+        DetourNavigator::Flags getNavigatorFlags(const MWWorld::Ptr& actor) const;
 
-            // TODO: all this does not belong here, move into temporary storage
-            PathFinder mPathFinder;
-            ObstacleCheck mObstacleCheck;
+        DetourNavigator::AreaCosts getAreaCosts(const MWWorld::Ptr& actor) const;
 
-            AiReactionTimer mReaction;
+        const AiPackageTypeId mTypeId;
+        const Options mOptions;
 
-            std::string mTargetActorRefId;
-            mutable int mTargetActorId;
-            mutable MWWorld::Ptr mCachedTarget;
+        // TODO: all this does not belong here, move into temporary storage
+        PathFinder mPathFinder;
+        ObstacleCheck mObstacleCheck;
 
-            short mRotateOnTheRunChecks; // attempts to check rotation to the pathpoint on the run possibility
+        AiReactionTimer mReaction;
 
-            bool mIsShortcutting;   // if shortcutting at the moment
-            bool mShortcutProhibited; // shortcutting may be prohibited after unsuccessful attempt
-            osg::Vec3f mShortcutFailPos; // position of last shortcut fail
-            float mLastDestinationTolerance = 0;
+        std::string mTargetActorRefId;
+        mutable int mTargetActorId;
+        mutable MWWorld::Ptr mCachedTarget;
 
-        private:
-            bool isNearInactiveCell(osg::Vec3f position);
+        short mRotateOnTheRunChecks; // attempts to check rotation to the pathpoint on the run possibility
+
+        bool mIsShortcutting; // if shortcutting at the moment
+        bool mShortcutProhibited; // shortcutting may be prohibited after unsuccessful attempt
+        osg::Vec3f mShortcutFailPos; // position of last shortcut fail
+        float mLastDestinationTolerance = 0;
+
+    private:
+        bool isNearInactiveCell(osg::Vec3f position);
     };
 }
 
 #endif
-
diff --git a/apps/openmw/mwmechanics/aipackagetypeid.hpp b/apps/openmw/mwmechanics/aipackagetypeid.hpp
index 2b9c4fe9c9..3c1df5df51 100644
--- a/apps/openmw/mwmechanics/aipackagetypeid.hpp
+++ b/apps/openmw/mwmechanics/aipackagetypeid.hpp
@@ -3,7 +3,7 @@
 
 namespace MWMechanics
 {
-    ///Enumerates the various AITypes available
+    /// Enumerates the various AITypes available
     enum class AiPackageTypeId
     {
         None = -1,
diff --git a/apps/openmw/mwmechanics/aipursue.cpp b/apps/openmw/mwmechanics/aipursue.cpp
index f48bd7ce51..fa4f901494 100644
--- a/apps/openmw/mwmechanics/aipursue.cpp
+++ b/apps/openmw/mwmechanics/aipursue.cpp
@@ -9,88 +9,93 @@
 
 #include "../mwworld/class.hpp"
 
-#include "movement.hpp"
-#include "creaturestats.hpp"
 #include "actorutil.hpp"
+#include "creaturestats.hpp"
+#include "movement.hpp"
 
 namespace MWMechanics
 {
 
-AiPursue::AiPursue(const MWWorld::Ptr& actor)
-{
-    mTargetActorId = actor.getClass().getCreatureStats(actor).getActorId();
-}
+    AiPursue::AiPursue(const MWWorld::Ptr& actor)
+    {
+        mTargetActorId = actor.getClass().getCreatureStats(actor).getActorId();
+    }
 
-AiPursue::AiPursue(const ESM::AiSequence::AiPursue *pursue)
-{
-    mTargetActorId = pursue->mTargetActorId;
-}
+    AiPursue::AiPursue(const ESM::AiSequence::AiPursue* pursue)
+    {
+        mTargetActorId = pursue->mTargetActorId;
+    }
 
-bool AiPursue::execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
-{
-    if(actor.getClass().getCreatureStats(actor).isDead())
-        return true;
+    bool AiPursue::execute(
+        const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
+    {
+        if (actor.getClass().getCreatureStats(actor).isDead())
+            return true;
 
-    const MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId); //The target to follow
+        const MWWorld::Ptr target
+            = MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId); // The target to follow
 
-    // Stop if the target doesn't exist
-    // Really we should be checking whether the target is currently registered with the MechanicsManager
-    if (target == MWWorld::Ptr() || !target.getRefData().getCount() || !target.getRefData().isEnabled())
-        return true;
+        // Stop if the target doesn't exist
+        // Really we should be checking whether the target is currently registered with the MechanicsManager
+        if (target == MWWorld::Ptr() || !target.getRefData().getCount() || !target.getRefData().isEnabled())
+            return true;
 
-    if (isTargetMagicallyHidden(target) && !MWBase::Environment::get().getMechanicsManager()->awarenessCheck(target, actor))
-        return false;
+        if (isTargetMagicallyHidden(target)
+            && !MWBase::Environment::get().getMechanicsManager()->awarenessCheck(target, actor))
+            return false;
 
-    if (target.getClass().getCreatureStats(target).isDead())
-        return true;
+        if (target.getClass().getCreatureStats(target).isDead())
+            return true;
 
-    actor.getClass().getCreatureStats(actor).setDrawState(DrawState::Nothing);
+        actor.getClass().getCreatureStats(actor).setDrawState(DrawState::Nothing);
 
-    //Set the target destination
-    const osg::Vec3f dest = target.getRefData().getPosition().asVec3();
-    const osg::Vec3f actorPos = actor.getRefData().getPosition().asVec3();
+        // Set the target destination
+        const osg::Vec3f dest = target.getRefData().getPosition().asVec3();
+        const osg::Vec3f actorPos = actor.getRefData().getPosition().asVec3();
 
-    const float pathTolerance = 100.f;
+        const float pathTolerance = 100.f;
 
-    // check the true distance in case the target is far away in Z-direction
-    bool reached = pathTo(actor, dest, duration, pathTolerance, (actorPos - dest).length(), PathType::Partial) &&
-                   std::abs(dest.z() - actorPos.z()) < pathTolerance;
+        // check the true distance in case the target is far away in Z-direction
+        bool reached = pathTo(actor, dest, duration, pathTolerance, (actorPos - dest).length(), PathType::Partial)
+            && std::abs(dest.z() - actorPos.z()) < pathTolerance;
 
-    if (reached)
-    {
-        if (!MWBase::Environment::get().getWorld()->getLOS(target, actor))
-            return false;
-        MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Dialogue, actor); //Arrest player when reached
-        return true;
-    }
+        if (reached)
+        {
+            if (!MWBase::Environment::get().getWorld()->getLOS(target, actor))
+                return false;
+            MWBase::Environment::get().getWindowManager()->pushGuiMode(
+                MWGui::GM_Dialogue, actor); // Arrest player when reached
+            return true;
+        }
 
-    actor.getClass().getCreatureStats(actor).setMovementFlag(MWMechanics::CreatureStats::Flag_Run, true); //Make NPC run
+        actor.getClass().getCreatureStats(actor).setMovementFlag(
+            MWMechanics::CreatureStats::Flag_Run, true); // Make NPC run
 
-    return false;
-}
+        return false;
+    }
 
-MWWorld::Ptr AiPursue::getTarget() const
-{
-    if (!mCachedTarget.isEmpty())
+    MWWorld::Ptr AiPursue::getTarget() const
     {
-        if (mCachedTarget.getRefData().isDeleted() || !mCachedTarget.getRefData().isEnabled())
-            mCachedTarget = MWWorld::Ptr();
-        else
-            return mCachedTarget;
+        if (!mCachedTarget.isEmpty())
+        {
+            if (mCachedTarget.getRefData().isDeleted() || !mCachedTarget.getRefData().isEnabled())
+                mCachedTarget = MWWorld::Ptr();
+            else
+                return mCachedTarget;
+        }
+        mCachedTarget = MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId);
+        return mCachedTarget;
     }
-    mCachedTarget = MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId);
-    return mCachedTarget;
-}
 
-void AiPursue::writeState(ESM::AiSequence::AiSequence &sequence) const
-{
-    auto pursue = std::make_unique<ESM::AiSequence::AiPursue>();
-    pursue->mTargetActorId = mTargetActorId;
-
-    ESM::AiSequence::AiPackageContainer package;
-    package.mType = ESM::AiSequence::Ai_Pursue;
-    package.mPackage = std::move(pursue);
-    sequence.mPackages.push_back(std::move(package));
-}
+    void AiPursue::writeState(ESM::AiSequence::AiSequence& sequence) const
+    {
+        auto pursue = std::make_unique<ESM::AiSequence::AiPursue>();
+        pursue->mTargetActorId = mTargetActorId;
+
+        ESM::AiSequence::AiPackageContainer package;
+        package.mType = ESM::AiSequence::Ai_Pursue;
+        package.mPackage = std::move(pursue);
+        sequence.mPackages.push_back(std::move(package));
+    }
 
 } // namespace MWMechanics
diff --git a/apps/openmw/mwmechanics/aipursue.hpp b/apps/openmw/mwmechanics/aipursue.hpp
index 2fbc13b87c..39a8711ae5 100644
--- a/apps/openmw/mwmechanics/aipursue.hpp
+++ b/apps/openmw/mwmechanics/aipursue.hpp
@@ -5,10 +5,10 @@
 
 namespace ESM
 {
-namespace AiSequence
-{
-    struct AiPursue;
-}
+    namespace AiSequence
+    {
+        struct AiPursue;
+    }
 }
 
 namespace MWMechanics
@@ -19,28 +19,29 @@ namespace MWMechanics
         path is completed). **/
     class AiPursue final : public TypedAiPackage<AiPursue>
     {
-        public:
-            ///Constructor
-            /** \param actor Actor to pursue **/
-            AiPursue(const MWWorld::Ptr& actor);
+    public:
+        /// Constructor
+        /** \param actor Actor to pursue **/
+        AiPursue(const MWWorld::Ptr& actor);
 
-            AiPursue(const ESM::AiSequence::AiPursue* pursue);
+        AiPursue(const ESM::AiSequence::AiPursue* pursue);
 
-            bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) override;
+        bool execute(const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state,
+            float duration) override;
 
-            static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::Pursue; }
+        static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::Pursue; }
 
-            static constexpr Options makeDefaultOptions()
-            {
-                AiPackage::Options options;
-                options.mCanCancel = false;
-                options.mShouldCancelPreviousAi = false;
-                return options;
-            }
+        static constexpr Options makeDefaultOptions()
+        {
+            AiPackage::Options options;
+            options.mCanCancel = false;
+            options.mShouldCancelPreviousAi = false;
+            return options;
+        }
 
-            MWWorld::Ptr getTarget() const override;
+        MWWorld::Ptr getTarget() const override;
 
-            void writeState (ESM::AiSequence::AiSequence& sequence) const override;
+        void writeState(ESM::AiSequence::AiSequence& sequence) const override;
     };
 }
 #endif
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index a9de4a5152..ded72c7406 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -1,560 +1,571 @@
 #include "aisequence.hpp"
 
-#include <limits>
 #include <algorithm>
+#include <limits>
 
 #include <components/debug/debuglog.hpp>
 #include <components/esm3/aisequence.hpp>
 
-#include "aipackage.hpp"
-#include "aistate.hpp"
-#include "aiwander.hpp"
-#include "aiescort.hpp"
-#include "aitravel.hpp"
-#include "aifollow.hpp"
+#include "../mwworld/class.hpp"
+#include "actorutil.hpp"
 #include "aiactivate.hpp"
 #include "aicombat.hpp"
 #include "aicombataction.hpp"
+#include "aiescort.hpp"
+#include "aifollow.hpp"
+#include "aipackage.hpp"
 #include "aipursue.hpp"
-#include "actorutil.hpp"
-#include "../mwworld/class.hpp"
+#include "aistate.hpp"
+#include "aitravel.hpp"
+#include "aiwander.hpp"
 
 namespace MWMechanics
 {
 
-void AiSequence::copy (const AiSequence& sequence)
-{
-    for (const auto& package : sequence.mPackages)
-        mPackages.push_back(package->clone());
-
-    // We need to keep an AiWander storage, if present - it has a state machine.
-    // Not sure about another temporary storages
-    sequence.mAiState.copy<AiWanderStorage>(mAiState);
+    void AiSequence::copy(const AiSequence& sequence)
+    {
+        for (const auto& package : sequence.mPackages)
+            mPackages.push_back(package->clone());
 
-    mNumCombatPackages = sequence.mNumCombatPackages;
-    mNumPursuitPackages = sequence.mNumPursuitPackages;
-}
+        // We need to keep an AiWander storage, if present - it has a state machine.
+        // Not sure about another temporary storages
+        sequence.mAiState.copy<AiWanderStorage>(mAiState);
 
-AiSequence::AiSequence() : mDone (false), mLastAiPackage(AiPackageTypeId::None) {}
+        mNumCombatPackages = sequence.mNumCombatPackages;
+        mNumPursuitPackages = sequence.mNumPursuitPackages;
+    }
 
-AiSequence::AiSequence (const AiSequence& sequence)
-{
-    copy (sequence);
-    mDone = sequence.mDone;
-    mLastAiPackage = sequence.mLastAiPackage;
-}
+    AiSequence::AiSequence()
+        : mDone(false)
+        , mLastAiPackage(AiPackageTypeId::None)
+    {
+    }
 
-AiSequence& AiSequence::operator= (const AiSequence& sequence)
-{
-    if (this!=&sequence)
+    AiSequence::AiSequence(const AiSequence& sequence)
     {
-        clear();
-        copy (sequence);
+        copy(sequence);
         mDone = sequence.mDone;
         mLastAiPackage = sequence.mLastAiPackage;
     }
 
-    return *this;
-}
+    AiSequence& AiSequence::operator=(const AiSequence& sequence)
+    {
+        if (this != &sequence)
+        {
+            clear();
+            copy(sequence);
+            mDone = sequence.mDone;
+            mLastAiPackage = sequence.mLastAiPackage;
+        }
 
-AiSequence::~AiSequence()
-{
-    clear();
-}
+        return *this;
+    }
 
-void AiSequence::onPackageAdded(const AiPackage& package)
-{
-    if (package.getTypeId() == AiPackageTypeId::Combat)
-        mNumCombatPackages++;
-    else if (package.getTypeId() == AiPackageTypeId::Pursue)
-        mNumPursuitPackages++;
+    AiSequence::~AiSequence()
+    {
+        clear();
+    }
 
-    assert(mNumCombatPackages >= 0);
-    assert(mNumPursuitPackages >= 0);
-}
+    void AiSequence::onPackageAdded(const AiPackage& package)
+    {
+        if (package.getTypeId() == AiPackageTypeId::Combat)
+            mNumCombatPackages++;
+        else if (package.getTypeId() == AiPackageTypeId::Pursue)
+            mNumPursuitPackages++;
 
-void AiSequence::onPackageRemoved(const AiPackage& package)
-{
-    if (package.getTypeId() == AiPackageTypeId::Combat)
-        mNumCombatPackages--;
-    else if (package.getTypeId() == AiPackageTypeId::Pursue)
-        mNumPursuitPackages--;
+        assert(mNumCombatPackages >= 0);
+        assert(mNumPursuitPackages >= 0);
+    }
 
-    assert(mNumCombatPackages >= 0);
-    assert(mNumPursuitPackages >= 0);
-}
+    void AiSequence::onPackageRemoved(const AiPackage& package)
+    {
+        if (package.getTypeId() == AiPackageTypeId::Combat)
+            mNumCombatPackages--;
+        else if (package.getTypeId() == AiPackageTypeId::Pursue)
+            mNumPursuitPackages--;
 
-AiPackageTypeId AiSequence::getTypeId() const
-{
-    if (mPackages.empty())
-        return AiPackageTypeId::None;
+        assert(mNumCombatPackages >= 0);
+        assert(mNumPursuitPackages >= 0);
+    }
 
-    return mPackages.front()->getTypeId();
-}
+    AiPackageTypeId AiSequence::getTypeId() const
+    {
+        if (mPackages.empty())
+            return AiPackageTypeId::None;
 
-bool AiSequence::getCombatTarget(MWWorld::Ptr &targetActor) const
-{
-    if (getTypeId() != AiPackageTypeId::Combat)
-        return false;
+        return mPackages.front()->getTypeId();
+    }
 
-    targetActor = mPackages.front()->getTarget();
+    bool AiSequence::getCombatTarget(MWWorld::Ptr& targetActor) const
+    {
+        if (getTypeId() != AiPackageTypeId::Combat)
+            return false;
 
-    return !targetActor.isEmpty();
-}
+        targetActor = mPackages.front()->getTarget();
 
-bool AiSequence::getCombatTargets(std::vector<MWWorld::Ptr> &targetActors) const
-{
-    for (auto it = mPackages.begin(); it != mPackages.end(); ++it)
-    {
-        if ((*it)->getTypeId() == MWMechanics::AiPackageTypeId::Combat)
-            targetActors.push_back((*it)->getTarget());
+        return !targetActor.isEmpty();
     }
 
-    return !targetActors.empty();
-}
+    bool AiSequence::getCombatTargets(std::vector<MWWorld::Ptr>& targetActors) const
+    {
+        for (auto it = mPackages.begin(); it != mPackages.end(); ++it)
+        {
+            if ((*it)->getTypeId() == MWMechanics::AiPackageTypeId::Combat)
+                targetActors.push_back((*it)->getTarget());
+        }
 
-AiPackages::iterator AiSequence::erase(AiPackages::iterator package)
-{
-    // Not sure if manually terminated packages should trigger mDone, probably not?
-    auto& ptr = *package;
-    onPackageRemoved(*ptr);
+        return !targetActors.empty();
+    }
 
-    return mPackages.erase(package);
-}
+    AiPackages::iterator AiSequence::erase(AiPackages::iterator package)
+    {
+        // Not sure if manually terminated packages should trigger mDone, probably not?
+        auto& ptr = *package;
+        onPackageRemoved(*ptr);
 
-bool AiSequence::isInCombat() const
-{
-    return mNumCombatPackages > 0;
-}
+        return mPackages.erase(package);
+    }
 
-bool AiSequence::isInPursuit() const
-{
-    return mNumPursuitPackages > 0;
-}
+    bool AiSequence::isInCombat() const
+    {
+        return mNumCombatPackages > 0;
+    }
 
-bool AiSequence::isEngagedWithActor() const
-{
-    if (!isInCombat())
-        return false;
+    bool AiSequence::isInPursuit() const
+    {
+        return mNumPursuitPackages > 0;
+    }
 
-    for (auto it = mPackages.begin(); it != mPackages.end(); ++it)
+    bool AiSequence::isEngagedWithActor() const
     {
-        if ((*it)->getTypeId() == AiPackageTypeId::Combat)
+        if (!isInCombat())
+            return false;
+
+        for (auto it = mPackages.begin(); it != mPackages.end(); ++it)
         {
-            MWWorld::Ptr target2 = (*it)->getTarget();
-            if (!target2.isEmpty() && target2.getClass().isNpc())
-                return true;
+            if ((*it)->getTypeId() == AiPackageTypeId::Combat)
+            {
+                MWWorld::Ptr target2 = (*it)->getTarget();
+                if (!target2.isEmpty() && target2.getClass().isNpc())
+                    return true;
+            }
         }
+        return false;
     }
-    return false;
-}
 
-bool AiSequence::hasPackage(AiPackageTypeId typeId) const
-{
-    auto it = std::find_if(mPackages.begin(), mPackages.end(), [typeId](const auto& package)
+    bool AiSequence::hasPackage(AiPackageTypeId typeId) const
     {
-        return package->getTypeId() == typeId;
-    });
-    return it != mPackages.end();
-}
-
-bool AiSequence::isInCombat(const MWWorld::Ptr &actor) const
-{
-    if (!isInCombat())
-        return false;
+        auto it = std::find_if(mPackages.begin(), mPackages.end(),
+            [typeId](const auto& package) { return package->getTypeId() == typeId; });
+        return it != mPackages.end();
+    }
 
-    for (auto it = mPackages.begin(); it != mPackages.end(); ++it)
+    bool AiSequence::isInCombat(const MWWorld::Ptr& actor) const
     {
-        if ((*it)->getTypeId() == AiPackageTypeId::Combat)
+        if (!isInCombat())
+            return false;
+
+        for (auto it = mPackages.begin(); it != mPackages.end(); ++it)
         {
-            if ((*it)->getTarget() == actor)
-                return true;
+            if ((*it)->getTypeId() == AiPackageTypeId::Combat)
+            {
+                if ((*it)->getTarget() == actor)
+                    return true;
+            }
         }
+        return false;
     }
-    return false;
-}
 
-void AiSequence::removePackagesById(AiPackageTypeId id)
-{
-    for (auto it = mPackages.begin(); it != mPackages.end(); )
+    void AiSequence::removePackagesById(AiPackageTypeId id)
     {
-        if ((*it)->getTypeId() == id)
+        for (auto it = mPackages.begin(); it != mPackages.end();)
         {
-            it = erase(it);
+            if ((*it)->getTypeId() == id)
+            {
+                it = erase(it);
+            }
+            else
+                ++it;
         }
-        else
-            ++it;
     }
-}
 
-void AiSequence::stopCombat()
-{
-    removePackagesById(AiPackageTypeId::Combat);
-}
+    void AiSequence::stopCombat()
+    {
+        removePackagesById(AiPackageTypeId::Combat);
+    }
 
-void AiSequence::stopCombat(const std::vector<MWWorld::Ptr>& targets)
-{
-    for(auto it = mPackages.begin(); it != mPackages.end(); )
+    void AiSequence::stopCombat(const std::vector<MWWorld::Ptr>& targets)
     {
-        if ((*it)->getTypeId() == AiPackageTypeId::Combat && std::find(targets.begin(), targets.end(), (*it)->getTarget()) != targets.end())
+        for (auto it = mPackages.begin(); it != mPackages.end();)
         {
-            it = erase(it);
+            if ((*it)->getTypeId() == AiPackageTypeId::Combat
+                && std::find(targets.begin(), targets.end(), (*it)->getTarget()) != targets.end())
+            {
+                it = erase(it);
+            }
+            else
+                ++it;
         }
-        else
-            ++it;
     }
-}
-
-void AiSequence::stopPursuit()
-{
-    removePackagesById(AiPackageTypeId::Pursue);
-}
 
-bool AiSequence::isPackageDone() const
-{
-    return mDone;
-}
-
-namespace
-{
-    bool isActualAiPackage(AiPackageTypeId packageTypeId)
+    void AiSequence::stopPursuit()
     {
-        return (packageTypeId >= AiPackageTypeId::Wander &&
-                packageTypeId <= AiPackageTypeId::Activate);
+        removePackagesById(AiPackageTypeId::Pursue);
     }
-}
 
-void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& characterController, float duration, bool outOfRange)
-{
-    if (actor == getPlayer())
+    bool AiSequence::isPackageDone() const
     {
-        // Players don't use this.
-        return;
+        return mDone;
     }
 
-    if (mPackages.empty())
+    namespace
     {
-        mLastAiPackage = AiPackageTypeId::None;
-        return;
+        bool isActualAiPackage(AiPackageTypeId packageTypeId)
+        {
+            return (packageTypeId >= AiPackageTypeId::Wander && packageTypeId <= AiPackageTypeId::Activate);
+        }
     }
 
-    auto* package = mPackages.front().get();
-    if (!package->alwaysActive() && outOfRange)
-        return;
-
-    auto packageTypeId = package->getTypeId();
-    // workaround ai packages not being handled as in the vanilla engine
-    if (isActualAiPackage(packageTypeId))
-        mLastAiPackage = packageTypeId;
-    // if active package is combat one, choose nearest target
-    if (packageTypeId == AiPackageTypeId::Combat)
+    void AiSequence::execute(
+        const MWWorld::Ptr& actor, CharacterController& characterController, float duration, bool outOfRange)
     {
-        auto itActualCombat = mPackages.end();
+        if (actor == getPlayer())
+        {
+            // Players don't use this.
+            return;
+        }
 
-        float nearestDist = std::numeric_limits<float>::max();
-        osg::Vec3f vActorPos = actor.getRefData().getPosition().asVec3();
+        if (mPackages.empty())
+        {
+            mLastAiPackage = AiPackageTypeId::None;
+            return;
+        }
 
-        float bestRating = 0.f;
+        auto* package = mPackages.front().get();
+        if (!package->alwaysActive() && outOfRange)
+            return;
 
-        for (auto it = mPackages.begin(); it != mPackages.end();)
+        auto packageTypeId = package->getTypeId();
+        // workaround ai packages not being handled as in the vanilla engine
+        if (isActualAiPackage(packageTypeId))
+            mLastAiPackage = packageTypeId;
+        // if active package is combat one, choose nearest target
+        if (packageTypeId == AiPackageTypeId::Combat)
         {
-            if ((*it)->getTypeId() != AiPackageTypeId::Combat) break;
+            auto itActualCombat = mPackages.end();
 
-            MWWorld::Ptr target = (*it)->getTarget();
+            float nearestDist = std::numeric_limits<float>::max();
+            osg::Vec3f vActorPos = actor.getRefData().getPosition().asVec3();
 
-            // target disappeared (e.g. summoned creatures)
-            if (target.isEmpty())
-            {
-                it = erase(it);
-            }
-            else
+            float bestRating = 0.f;
+
+            for (auto it = mPackages.begin(); it != mPackages.end();)
             {
-                float rating = MWMechanics::getBestActionRating(actor, target);
+                if ((*it)->getTypeId() != AiPackageTypeId::Combat)
+                    break;
 
-                const ESM::Position &targetPos = target.getRefData().getPosition();
+                MWWorld::Ptr target = (*it)->getTarget();
 
-                float distTo = (targetPos.asVec3() - vActorPos).length2();
+                // target disappeared (e.g. summoned creatures)
+                if (target.isEmpty())
+                {
+                    it = erase(it);
+                }
+                else
+                {
+                    float rating = MWMechanics::getBestActionRating(actor, target);
 
-                // Small threshold for changing target
-                if (it == mPackages.begin())
-                    distTo = std::max(0.f, distTo - 2500.f);
+                    const ESM::Position& targetPos = target.getRefData().getPosition();
 
-                // if a target has higher priority than current target or has same priority but closer
-                if (rating > bestRating || ((distTo < nearestDist) && rating == bestRating))
-                {
-                    nearestDist = distTo;
-                    itActualCombat = it;
-                    bestRating = rating;
+                    float distTo = (targetPos.asVec3() - vActorPos).length2();
+
+                    // Small threshold for changing target
+                    if (it == mPackages.begin())
+                        distTo = std::max(0.f, distTo - 2500.f);
+
+                    // if a target has higher priority than current target or has same priority but closer
+                    if (rating > bestRating || ((distTo < nearestDist) && rating == bestRating))
+                    {
+                        nearestDist = distTo;
+                        itActualCombat = it;
+                        bestRating = rating;
+                    }
+                    ++it;
                 }
-                ++it;
             }
-        }
 
-        if (mPackages.empty())
-            return;
+            if (mPackages.empty())
+                return;
 
-        if (nearestDist < std::numeric_limits<float>::max() && mPackages.begin() != itActualCombat)
-        {
-            assert(itActualCombat != mPackages.end());
-            // move combat package with nearest target to the front
-            std::rotate(mPackages.begin(), itActualCombat, std::next(itActualCombat));
-        }
+            if (nearestDist < std::numeric_limits<float>::max() && mPackages.begin() != itActualCombat)
+            {
+                assert(itActualCombat != mPackages.end());
+                // move combat package with nearest target to the front
+                std::rotate(mPackages.begin(), itActualCombat, std::next(itActualCombat));
+            }
 
-        package = mPackages.front().get();
-        packageTypeId = package->getTypeId();
-    }
+            package = mPackages.front().get();
+            packageTypeId = package->getTypeId();
+        }
 
-    try
-    {
-        if (package->execute(actor, characterController, mAiState, duration))
+        try
         {
-            // Put repeating non-combat AI packages on the end of the stack so they can be used again
-            if (isActualAiPackage(packageTypeId) && package->getRepeat())
+            if (package->execute(actor, characterController, mAiState, duration))
             {
-                package->reset();
-                mPackages.push_back(package->clone());
-            }
-
-            // The active package is typically the first entry, this is however not always the case
-            // e.g. AiPursue executing a dialogue script that uses startCombat adds a combat package to the front
-            // due to the priority.
-            auto activePackageIt = std::find_if(mPackages.begin(), mPackages.end(), [&](auto& entry)
+                // Put repeating non-combat AI packages on the end of the stack so they can be used again
+                if (isActualAiPackage(packageTypeId) && package->getRepeat())
                 {
-                    return entry.get() == package;
-                });
+                    package->reset();
+                    mPackages.push_back(package->clone());
+                }
 
-            erase(activePackageIt);
+                // The active package is typically the first entry, this is however not always the case
+                // e.g. AiPursue executing a dialogue script that uses startCombat adds a combat package to the front
+                // due to the priority.
+                auto activePackageIt = std::find_if(
+                    mPackages.begin(), mPackages.end(), [&](auto& entry) { return entry.get() == package; });
 
-            if (isActualAiPackage(packageTypeId))
-                mDone = true;
+                erase(activePackageIt);
+
+                if (isActualAiPackage(packageTypeId))
+                    mDone = true;
+            }
+            else
+            {
+                mDone = false;
+            }
         }
-        else
+        catch (std::exception& e)
         {
-            mDone = false;
+            Log(Debug::Error) << "Error during AiSequence::execute: " << e.what();
         }
     }
-    catch (std::exception& e)
+
+    void AiSequence::clear()
     {
-        Log(Debug::Error) << "Error during AiSequence::execute: " << e.what();
+        mPackages.clear();
+        mNumCombatPackages = 0;
+        mNumPursuitPackages = 0;
     }
-}
 
-void AiSequence::clear()
-{
-    mPackages.clear();
-    mNumCombatPackages = 0;
-    mNumPursuitPackages = 0;
-}
-
-void AiSequence::stack (const AiPackage& package, const MWWorld::Ptr& actor, bool cancelOther)
-{
-    if (actor == getPlayer())
-        throw std::runtime_error("Can't add AI packages to player");
-
-    // Stop combat when a non-combat AI package is added
-    if (isActualAiPackage(package.getTypeId()))
-        stopCombat();
-
-    // We should return a wandering actor back after combat, casting or pursuit.
-    // The same thing for actors without AI packages.
-    // Also there is no point to stack return packages.
-    const auto currentTypeId = getTypeId();
-    const auto newTypeId = package.getTypeId();
-    if (currentTypeId <= MWMechanics::AiPackageTypeId::Wander
-        && !hasPackage(MWMechanics::AiPackageTypeId::InternalTravel)
-        && (newTypeId <= MWMechanics::AiPackageTypeId::Combat
-        || newTypeId == MWMechanics::AiPackageTypeId::Pursue
-        || newTypeId == MWMechanics::AiPackageTypeId::Cast))
+    void AiSequence::stack(const AiPackage& package, const MWWorld::Ptr& actor, bool cancelOther)
     {
-        osg::Vec3f dest;
-        if (currentTypeId == MWMechanics::AiPackageTypeId::Wander)
+        if (actor == getPlayer())
+            throw std::runtime_error("Can't add AI packages to player");
+
+        // Stop combat when a non-combat AI package is added
+        if (isActualAiPackage(package.getTypeId()))
+            stopCombat();
+
+        // We should return a wandering actor back after combat, casting or pursuit.
+        // The same thing for actors without AI packages.
+        // Also there is no point to stack return packages.
+        const auto currentTypeId = getTypeId();
+        const auto newTypeId = package.getTypeId();
+        if (currentTypeId <= MWMechanics::AiPackageTypeId::Wander
+            && !hasPackage(MWMechanics::AiPackageTypeId::InternalTravel)
+            && (newTypeId <= MWMechanics::AiPackageTypeId::Combat || newTypeId == MWMechanics::AiPackageTypeId::Pursue
+                || newTypeId == MWMechanics::AiPackageTypeId::Cast))
         {
-            dest = getActivePackage().getDestination(actor);
-        }
-        else
-        {
-            dest = actor.getRefData().getPosition().asVec3();
-        }
+            osg::Vec3f dest;
+            if (currentTypeId == MWMechanics::AiPackageTypeId::Wander)
+            {
+                dest = getActivePackage().getDestination(actor);
+            }
+            else
+            {
+                dest = actor.getRefData().getPosition().asVec3();
+            }
 
-        MWMechanics::AiInternalTravel travelPackage(dest.x(), dest.y(), dest.z());
-        stack(travelPackage, actor, false);
-    }
+            MWMechanics::AiInternalTravel travelPackage(dest.x(), dest.y(), dest.z());
+            stack(travelPackage, actor, false);
+        }
 
-    // remove previous packages if required
-    if (cancelOther && package.shouldCancelPreviousAi())
-    {
-        for (auto it = mPackages.begin(); it != mPackages.end();)
+        // remove previous packages if required
+        if (cancelOther && package.shouldCancelPreviousAi())
         {
-            if((*it)->canCancel())
+            for (auto it = mPackages.begin(); it != mPackages.end();)
             {
-                it = erase(it);
+                if ((*it)->canCancel())
+                {
+                    it = erase(it);
+                }
+                else
+                    ++it;
             }
-            else
-                ++it;
         }
-    }
 
-    // insert new package in correct place depending on priority
-    for (auto it = mPackages.begin(); it != mPackages.end(); ++it)
-    {
-        // We should override current AiCast package, if we try to add a new one.
-        if ((*it)->getTypeId() == MWMechanics::AiPackageTypeId::Cast &&
-            package.getTypeId() == MWMechanics::AiPackageTypeId::Cast)
+        // insert new package in correct place depending on priority
+        for (auto it = mPackages.begin(); it != mPackages.end(); ++it)
         {
-            *it = package.clone();
-            return;
+            // We should override current AiCast package, if we try to add a new one.
+            if ((*it)->getTypeId() == MWMechanics::AiPackageTypeId::Cast
+                && package.getTypeId() == MWMechanics::AiPackageTypeId::Cast)
+            {
+                *it = package.clone();
+                return;
+            }
+
+            if ((*it)->getPriority() <= package.getPriority())
+            {
+                onPackageAdded(package);
+                mPackages.insert(it, package.clone());
+                return;
+            }
         }
 
-        if((*it)->getPriority() <= package.getPriority())
+        onPackageAdded(package);
+        mPackages.push_back(package.clone());
+
+        // Make sure that temporary storage is empty
+        if (cancelOther)
         {
-            onPackageAdded(package);
-            mPackages.insert(it, package.clone());
-            return;
+            mAiState.moveIn(std::make_unique<AiCombatStorage>());
+            mAiState.moveIn(std::make_unique<AiFollowStorage>());
+            mAiState.moveIn(std::make_unique<AiWanderStorage>());
         }
     }
 
-    onPackageAdded(package);
-    mPackages.push_back(package.clone());
-
-    // Make sure that temporary storage is empty
-    if (cancelOther)
+    bool MWMechanics::AiSequence::isEmpty() const
     {
-        mAiState.moveIn(std::make_unique<AiCombatStorage>());
-        mAiState.moveIn(std::make_unique<AiFollowStorage>());
-        mAiState.moveIn(std::make_unique<AiWanderStorage>());
+        return mPackages.empty();
     }
-}
 
-bool MWMechanics::AiSequence::isEmpty() const
-{
-    return mPackages.empty();
-}
-
-const AiPackage& MWMechanics::AiSequence::getActivePackage() const
-{
-    if(mPackages.empty())
-        throw std::runtime_error(std::string("No AI Package!"));
-    return *mPackages.front();
-}
+    const AiPackage& MWMechanics::AiSequence::getActivePackage() const
+    {
+        if (mPackages.empty())
+            throw std::runtime_error(std::string("No AI Package!"));
+        return *mPackages.front();
+    }
 
-void AiSequence::fill(const ESM::AIPackageList &list)
-{
-    for (const auto& esmPackage : list.mList)
+    void AiSequence::fill(const ESM::AIPackageList& list)
     {
-        std::unique_ptr<MWMechanics::AiPackage> package;
-        if (esmPackage.mType == ESM::AI_Wander)
-        {
-            ESM::AIWander data = esmPackage.mWander;
-            std::vector<unsigned char> idles;
-            idles.reserve(8);
-            for (int i=0; i<8; ++i)
-                idles.push_back(data.mIdle[i]);
-            package = std::make_unique<MWMechanics::AiWander>(data.mDistance, data.mDuration, data.mTimeOfDay, idles, data.mShouldRepeat != 0);
-        }
-        else if (esmPackage.mType == ESM::AI_Escort)
-        {
-            ESM::AITarget data = esmPackage.mTarget;
-            package = std::make_unique<MWMechanics::AiEscort>(data.mId.toStringView(), data.mDuration, data.mX, data.mY, data.mZ, data.mShouldRepeat != 0);
-        }
-        else if (esmPackage.mType == ESM::AI_Travel)
+        for (const auto& esmPackage : list.mList)
         {
-            ESM::AITravel data = esmPackage.mTravel;
-            package = std::make_unique<MWMechanics::AiTravel>(data.mX, data.mY, data.mZ, data.mShouldRepeat != 0);
-        }
-        else if (esmPackage.mType == ESM::AI_Activate)
-        {
-            ESM::AIActivate data = esmPackage.mActivate;
-            package = std::make_unique<MWMechanics::AiActivate>(data.mName.toStringView(), data.mShouldRepeat != 0);
-        }
-        else //if (esmPackage.mType == ESM::AI_Follow)
-        {
-            ESM::AITarget data = esmPackage.mTarget;
-            package = std::make_unique<MWMechanics::AiFollow>(data.mId.toStringView(), data.mDuration, data.mX, data.mY, data.mZ, data.mShouldRepeat != 0);
-        }
+            std::unique_ptr<MWMechanics::AiPackage> package;
+            if (esmPackage.mType == ESM::AI_Wander)
+            {
+                ESM::AIWander data = esmPackage.mWander;
+                std::vector<unsigned char> idles;
+                idles.reserve(8);
+                for (int i = 0; i < 8; ++i)
+                    idles.push_back(data.mIdle[i]);
+                package = std::make_unique<MWMechanics::AiWander>(
+                    data.mDistance, data.mDuration, data.mTimeOfDay, idles, data.mShouldRepeat != 0);
+            }
+            else if (esmPackage.mType == ESM::AI_Escort)
+            {
+                ESM::AITarget data = esmPackage.mTarget;
+                package = std::make_unique<MWMechanics::AiEscort>(
+                    data.mId.toStringView(), data.mDuration, data.mX, data.mY, data.mZ, data.mShouldRepeat != 0);
+            }
+            else if (esmPackage.mType == ESM::AI_Travel)
+            {
+                ESM::AITravel data = esmPackage.mTravel;
+                package = std::make_unique<MWMechanics::AiTravel>(data.mX, data.mY, data.mZ, data.mShouldRepeat != 0);
+            }
+            else if (esmPackage.mType == ESM::AI_Activate)
+            {
+                ESM::AIActivate data = esmPackage.mActivate;
+                package = std::make_unique<MWMechanics::AiActivate>(data.mName.toStringView(), data.mShouldRepeat != 0);
+            }
+            else // if (esmPackage.mType == ESM::AI_Follow)
+            {
+                ESM::AITarget data = esmPackage.mTarget;
+                package = std::make_unique<MWMechanics::AiFollow>(
+                    data.mId.toStringView(), data.mDuration, data.mX, data.mY, data.mZ, data.mShouldRepeat != 0);
+            }
 
-        onPackageAdded(*package);
-        mPackages.push_back(std::move(package));
+            onPackageAdded(*package);
+            mPackages.push_back(std::move(package));
+        }
     }
-}
 
-void AiSequence::writeState(ESM::AiSequence::AiSequence &sequence) const
-{
-    for (const auto& package : mPackages)
-        package->writeState(sequence);
-
-    sequence.mLastAiPackage = static_cast<int>(mLastAiPackage);
-}
+    void AiSequence::writeState(ESM::AiSequence::AiSequence& sequence) const
+    {
+        for (const auto& package : mPackages)
+            package->writeState(sequence);
 
-void AiSequence::readState(const ESM::AiSequence::AiSequence &sequence)
-{
-    if (!sequence.mPackages.empty())
-        clear();
+        sequence.mLastAiPackage = static_cast<int>(mLastAiPackage);
+    }
 
-    // Load packages
-    for (auto& container : sequence.mPackages)
+    void AiSequence::readState(const ESM::AiSequence::AiSequence& sequence)
     {
-        std::unique_ptr<MWMechanics::AiPackage> package;
-        switch (container.mType)
-        {
-        case ESM::AiSequence::Ai_Wander:
-        {
-            package = std::make_unique<AiWander>(&static_cast<const ESM::AiSequence::AiWander&>(*container.mPackage));
-            break;
-        }
-        case ESM::AiSequence::Ai_Travel:
-        {
-            const ESM::AiSequence::AiTravel& source = static_cast<const ESM::AiSequence::AiTravel&>(*container.mPackage);
-            if (source.mHidden)
-                package = std::make_unique<AiInternalTravel>(&source);
-            else
-                package = std::make_unique<AiTravel>(&source);
-            break;
-        }
-        case ESM::AiSequence::Ai_Escort:
-        {
-            package = std::make_unique<AiEscort>(&static_cast<const ESM::AiSequence::AiEscort&>(*container.mPackage));
-            break;
-        }
-        case ESM::AiSequence::Ai_Follow:
-        {
-            package = std::make_unique<AiFollow>(&static_cast<const ESM::AiSequence::AiFollow&>(*container.mPackage));
-            break;
-        }
-        case ESM::AiSequence::Ai_Activate:
-        {
-            package = std::make_unique<AiActivate>(&static_cast<const ESM::AiSequence::AiActivate&>(*container.mPackage));
-            break;
-        }
-        case ESM::AiSequence::Ai_Combat:
-        {
-            package = std::make_unique<AiCombat>(&static_cast<const ESM::AiSequence::AiCombat&>(*container.mPackage));
-            break;
-        }
-        case ESM::AiSequence::Ai_Pursue:
+        if (!sequence.mPackages.empty())
+            clear();
+
+        // Load packages
+        for (auto& container : sequence.mPackages)
         {
-            package = std::make_unique<AiPursue>(&static_cast<const ESM::AiSequence::AiPursue&>(*container.mPackage));
-            break;
-        }
-        default:
-            break;
-        }
+            std::unique_ptr<MWMechanics::AiPackage> package;
+            switch (container.mType)
+            {
+                case ESM::AiSequence::Ai_Wander:
+                {
+                    package = std::make_unique<AiWander>(
+                        &static_cast<const ESM::AiSequence::AiWander&>(*container.mPackage));
+                    break;
+                }
+                case ESM::AiSequence::Ai_Travel:
+                {
+                    const ESM::AiSequence::AiTravel& source
+                        = static_cast<const ESM::AiSequence::AiTravel&>(*container.mPackage);
+                    if (source.mHidden)
+                        package = std::make_unique<AiInternalTravel>(&source);
+                    else
+                        package = std::make_unique<AiTravel>(&source);
+                    break;
+                }
+                case ESM::AiSequence::Ai_Escort:
+                {
+                    package = std::make_unique<AiEscort>(
+                        &static_cast<const ESM::AiSequence::AiEscort&>(*container.mPackage));
+                    break;
+                }
+                case ESM::AiSequence::Ai_Follow:
+                {
+                    package = std::make_unique<AiFollow>(
+                        &static_cast<const ESM::AiSequence::AiFollow&>(*container.mPackage));
+                    break;
+                }
+                case ESM::AiSequence::Ai_Activate:
+                {
+                    package = std::make_unique<AiActivate>(
+                        &static_cast<const ESM::AiSequence::AiActivate&>(*container.mPackage));
+                    break;
+                }
+                case ESM::AiSequence::Ai_Combat:
+                {
+                    package = std::make_unique<AiCombat>(
+                        &static_cast<const ESM::AiSequence::AiCombat&>(*container.mPackage));
+                    break;
+                }
+                case ESM::AiSequence::Ai_Pursue:
+                {
+                    package = std::make_unique<AiPursue>(
+                        &static_cast<const ESM::AiSequence::AiPursue&>(*container.mPackage));
+                    break;
+                }
+                default:
+                    break;
+            }
 
-        if (!package.get())
-            continue;
+            if (!package.get())
+                continue;
 
-        onPackageAdded(*package);
-        mPackages.push_back(std::move(package));
-    }
+            onPackageAdded(*package);
+            mPackages.push_back(std::move(package));
+        }
 
-    mLastAiPackage = static_cast<AiPackageTypeId>(sequence.mLastAiPackage);
-}
+        mLastAiPackage = static_cast<AiPackageTypeId>(sequence.mLastAiPackage);
+    }
 
-void AiSequence::fastForward(const MWWorld::Ptr& actor)
-{
-    if (!mPackages.empty())
+    void AiSequence::fastForward(const MWWorld::Ptr& actor)
     {
-        mPackages.front()->fastForward(actor, mAiState);
+        if (!mPackages.empty())
+        {
+            mPackages.front()->fastForward(actor, mAiState);
+        }
     }
-}
 
 } // namespace MWMechanics
diff --git a/apps/openmw/mwmechanics/aisequence.hpp b/apps/openmw/mwmechanics/aisequence.hpp
index e6f5a108c2..ab3cc11e2c 100644
--- a/apps/openmw/mwmechanics/aisequence.hpp
+++ b/apps/openmw/mwmechanics/aisequence.hpp
@@ -1,12 +1,12 @@
 #ifndef GAME_MWMECHANICS_AISEQUENCE_H
 #define GAME_MWMECHANICS_AISEQUENCE_H
 
+#include <algorithm>
 #include <memory>
 #include <vector>
-#include <algorithm>
 
-#include "aistate.hpp"
 #include "aipackagetypeid.hpp"
+#include "aistate.hpp"
 
 #include <components/esm3/loadnpc.hpp>
 
@@ -34,142 +34,144 @@ namespace MWMechanics
     /** The top-most AI package is run each frame. When completed, it is removed from the stack. **/
     class AiSequence
     {
-            ///AiPackages to run though
-            AiPackages mPackages;
-
-            ///Finished with top AIPackage, set for one frame
-            bool mDone{};
+        /// AiPackages to run though
+        AiPackages mPackages;
 
-            int mNumCombatPackages{};
-            int mNumPursuitPackages{};
+        /// Finished with top AIPackage, set for one frame
+        bool mDone{};
 
-            ///Copy AiSequence
-            void copy (const AiSequence& sequence);
+        int mNumCombatPackages{};
+        int mNumPursuitPackages{};
 
-            /// The type of AI package that ran last
-            AiPackageTypeId mLastAiPackage;
-            AiState mAiState;
+        /// Copy AiSequence
+        void copy(const AiSequence& sequence);
 
-            void onPackageAdded(const AiPackage& package);
-            void onPackageRemoved(const AiPackage& package);
+        /// The type of AI package that ran last
+        AiPackageTypeId mLastAiPackage;
+        AiState mAiState;
 
-            AiPackages::iterator erase(AiPackages::iterator package);
+        void onPackageAdded(const AiPackage& package);
+        void onPackageRemoved(const AiPackage& package);
 
-        public:
-            ///Default constructor
-            AiSequence();
+        AiPackages::iterator erase(AiPackages::iterator package);
 
-            /// Copy Constructor
-            AiSequence (const AiSequence& sequence);
+    public:
+        /// Default constructor
+        AiSequence();
 
-            /// Assignment operator
-            AiSequence& operator= (const AiSequence& sequence);
+        /// Copy Constructor
+        AiSequence(const AiSequence& sequence);
 
-            virtual ~AiSequence();
+        /// Assignment operator
+        AiSequence& operator=(const AiSequence& sequence);
 
-            /// Iterator may be invalidated by any function calls other than begin() or end().
-            AiPackages::const_iterator begin() const { return mPackages.begin(); }
-            AiPackages::const_iterator end() const { return mPackages.end(); }
+        virtual ~AiSequence();
 
-            /// Removes all packages controlled by the predicate.
-            template<typename F>
-            void erasePackagesIf(const F&& pred)
-            {
-                mPackages.erase(std::remove_if(mPackages.begin(), mPackages.end(), [&](auto& entry)
-                {
-                    const bool doRemove = pred(entry);
-                    if (doRemove)
-                        onPackageRemoved(*entry);
-                    return doRemove;
-                }), mPackages.end());
-            }
+        /// Iterator may be invalidated by any function calls other than begin() or end().
+        AiPackages::const_iterator begin() const { return mPackages.begin(); }
+        AiPackages::const_iterator end() const { return mPackages.end(); }
 
-            /// Removes a single package controlled by the predicate.
-            template<typename F>
-            void erasePackageIf(const F&& pred)
-            {
-                auto it = std::find_if(mPackages.begin(), mPackages.end(), pred);
-                if (it == mPackages.end())
-                    return;
-                erase(it);
-            }
+        /// Removes all packages controlled by the predicate.
+        template <typename F>
+        void erasePackagesIf(const F&& pred)
+        {
+            mPackages.erase(std::remove_if(mPackages.begin(), mPackages.end(),
+                                [&](auto& entry) {
+                                    const bool doRemove = pred(entry);
+                                    if (doRemove)
+                                        onPackageRemoved(*entry);
+                                    return doRemove;
+                                }),
+                mPackages.end());
+        }
 
-            /// Returns currently executing AiPackage type
-            /** \see enum class AiPackageTypeId **/
-            AiPackageTypeId getTypeId() const;
+        /// Removes a single package controlled by the predicate.
+        template <typename F>
+        void erasePackageIf(const F&& pred)
+        {
+            auto it = std::find_if(mPackages.begin(), mPackages.end(), pred);
+            if (it == mPackages.end())
+                return;
+            erase(it);
+        }
 
-            /// Get the typeid of the Ai package that ran last
-            /** NOT the currently "active" Ai package that will be run in the next frame.
-                This difference is important when an Ai package has just finished and been removed.
-                \see enum class AiPackageTypeId **/
-            AiPackageTypeId getLastRunTypeId() const { return mLastAiPackage; }
+        /// Returns currently executing AiPackage type
+        /** \see enum class AiPackageTypeId **/
+        AiPackageTypeId getTypeId() const;
 
-            /// Return true and assign target if combat package is currently active, return false otherwise
-            bool getCombatTarget (MWWorld::Ptr &targetActor) const;
+        /// Get the typeid of the Ai package that ran last
+        /** NOT the currently "active" Ai package that will be run in the next frame.
+            This difference is important when an Ai package has just finished and been removed.
+            \see enum class AiPackageTypeId **/
+        AiPackageTypeId getLastRunTypeId() const { return mLastAiPackage; }
 
-            /// Return true and assign targets for all combat packages, or return false if there are no combat packages
-            bool getCombatTargets(std::vector<MWWorld::Ptr> &targetActors) const;
+        /// Return true and assign target if combat package is currently active, return false otherwise
+        bool getCombatTarget(MWWorld::Ptr& targetActor) const;
 
-            /// Is there any combat package?
-            bool isInCombat () const;
+        /// Return true and assign targets for all combat packages, or return false if there are no combat packages
+        bool getCombatTargets(std::vector<MWWorld::Ptr>& targetActors) const;
 
-            /// Is there any pursuit package.
-            bool isInPursuit() const;
+        /// Is there any combat package?
+        bool isInCombat() const;
 
-            /// Removes all packages using the specified id.
-            void removePackagesById(AiPackageTypeId id);
+        /// Is there any pursuit package.
+        bool isInPursuit() const;
 
-            /// Are we in combat with any other actor, who's also engaging us?
-            bool isEngagedWithActor () const;
+        /// Removes all packages using the specified id.
+        void removePackagesById(AiPackageTypeId id);
 
-            /// Does this AI sequence have the given package type?
-            bool hasPackage(AiPackageTypeId typeId) const;
+        /// Are we in combat with any other actor, who's also engaging us?
+        bool isEngagedWithActor() const;
 
-            /// Are we in combat with this particular actor?
-            bool isInCombat (const MWWorld::Ptr& actor) const;
+        /// Does this AI sequence have the given package type?
+        bool hasPackage(AiPackageTypeId typeId) const;
 
-            bool canAddTarget(const ESM::Position& actorPos, float distToTarget) const;
-            ///< Function assumes that actor can have only 1 target apart player
+        /// Are we in combat with this particular actor?
+        bool isInCombat(const MWWorld::Ptr& actor) const;
 
-            /// Removes all combat packages until first non-combat or stack empty.
-            void stopCombat();
+        bool canAddTarget(const ESM::Position& actorPos, float distToTarget) const;
+        ///< Function assumes that actor can have only 1 target apart player
 
-            /// Removes all combat packages with the given targets
-            void stopCombat(const std::vector<MWWorld::Ptr>& targets);
+        /// Removes all combat packages until first non-combat or stack empty.
+        void stopCombat();
 
-            /// Has a package been completed during the last update?
-            bool isPackageDone() const;
+        /// Removes all combat packages with the given targets
+        void stopCombat(const std::vector<MWWorld::Ptr>& targets);
 
-            /// Removes all pursue packages until first non-pursue or stack empty.
-            void stopPursuit();
+        /// Has a package been completed during the last update?
+        bool isPackageDone() const;
 
-            /// Execute current package, switching if needed.
-            void execute (const MWWorld::Ptr& actor, CharacterController& characterController, float duration, bool outOfRange=false);
+        /// Removes all pursue packages until first non-pursue or stack empty.
+        void stopPursuit();
 
-            /// Simulate the passing of time using the currently active AI package
-            void fastForward(const MWWorld::Ptr &actor);
+        /// Execute current package, switching if needed.
+        void execute(const MWWorld::Ptr& actor, CharacterController& characterController, float duration,
+            bool outOfRange = false);
 
-            /// Remove all packages.
-            void clear();
+        /// Simulate the passing of time using the currently active AI package
+        void fastForward(const MWWorld::Ptr& actor);
 
-            ///< Add \a package to the front of the sequence
-            /** Suspends current package
-                @param actor The actor that owns this AiSequence **/
-            void stack (const AiPackage& package, const MWWorld::Ptr& actor, bool cancelOther=true);
+        /// Remove all packages.
+        void clear();
 
-            /// Return the current active package.
-            /** If there is no active package, it will throw an exception **/
-            const AiPackage& getActivePackage() const;
+        ///< Add \a package to the front of the sequence
+        /** Suspends current package
+            @param actor The actor that owns this AiSequence **/
+        void stack(const AiPackage& package, const MWWorld::Ptr& actor, bool cancelOther = true);
 
-            /// Fills the AiSequence with packages
-            /** Typically used for loading from the ESM
-                \see ESM::AIPackageList **/
-            void fill (const ESM::AIPackageList& list);
+        /// Return the current active package.
+        /** If there is no active package, it will throw an exception **/
+        const AiPackage& getActivePackage() const;
 
-            bool isEmpty() const;
+        /// Fills the AiSequence with packages
+        /** Typically used for loading from the ESM
+            \see ESM::AIPackageList **/
+        void fill(const ESM::AIPackageList& list);
+
+        bool isEmpty() const;
 
-            void writeState (ESM::AiSequence::AiSequence& sequence) const;
-            void readState (const ESM::AiSequence::AiSequence& sequence);
+        void writeState(ESM::AiSequence::AiSequence& sequence) const;
+        void readState(const ESM::AiSequence::AiSequence& sequence);
     };
 }
 
diff --git a/apps/openmw/mwmechanics/aistate.hpp b/apps/openmw/mwmechanics/aistate.hpp
index ca05c44b36..d79469a9a0 100644
--- a/apps/openmw/mwmechanics/aistate.hpp
+++ b/apps/openmw/mwmechanics/aistate.hpp
@@ -14,7 +14,7 @@ namespace MWMechanics
      * the stored object if it has the correct type or otherwise replaces
      * it with an object of the requested type.
      */
-    template< class Base >
+    template <class Base>
     class DerivedClassStorage
     {
     private:
@@ -22,7 +22,7 @@ namespace MWMechanics
 
     public:
         /// \brief returns reference to stored object or deletes it and creates a fitting
-        template< class Derived >
+        template <class Derived>
         Derived& get()
         {
             Derived* result = dynamic_cast<Derived*>(mStorage.get());
@@ -34,11 +34,11 @@ namespace MWMechanics
                 mStorage = std::move(storage);
             }
 
-            //return a reference to the (new allocated) object 
+            // return a reference to the (new allocated) object
             return *result;
         }
 
-        template< class Derived >
+        template <class Derived>
         void copy(DerivedClassStorage& destination) const
         {
             Derived* result = dynamic_cast<Derived*>(mStorage.get());
@@ -46,8 +46,8 @@ namespace MWMechanics
                 destination.store<Derived>(*result);
         }
 
-        template< class Derived >
-        void store( const Derived& payload )
+        template <class Derived>
+        void store(const Derived& payload)
         {
             mStorage = std::make_unique<Derived>(payload);
         }
diff --git a/apps/openmw/mwmechanics/aitimer.hpp b/apps/openmw/mwmechanics/aitimer.hpp
index e4bc07e52d..d2e023f1c8 100644
--- a/apps/openmw/mwmechanics/aitimer.hpp
+++ b/apps/openmw/mwmechanics/aitimer.hpp
@@ -10,23 +10,22 @@ namespace MWMechanics
 
     class AiReactionTimer
     {
-        public:
-            static constexpr float sDeviation = 0.1f;
+    public:
+        static constexpr float sDeviation = 0.1f;
 
-            AiReactionTimer(Misc::Rng::Generator& prng)
-                : mPrng{ prng }
-                , mImpl{ AI_REACTION_TIME, sDeviation, Misc::Rng::deviate(0, sDeviation, prng) }
-            {
-            }
+        AiReactionTimer(Misc::Rng::Generator& prng)
+            : mPrng{ prng }
+            , mImpl{ AI_REACTION_TIME, sDeviation, Misc::Rng::deviate(0, sDeviation, prng) }
+        {
+        }
 
-            Misc::TimerStatus update(float duration) { return mImpl.update(duration, mPrng); }
+        Misc::TimerStatus update(float duration) { return mImpl.update(duration, mPrng); }
 
-            void reset() { mImpl.reset(Misc::Rng::deviate(0, sDeviation, mPrng)); }
-
-        private:
-            Misc::Rng::Generator& mPrng;
-            Misc::DeviatingPeriodicTimer mImpl;
+        void reset() { mImpl.reset(Misc::Rng::deviate(0, sDeviation, mPrng)); }
 
+    private:
+        Misc::Rng::Generator& mPrng;
+        Misc::DeviatingPeriodicTimer mImpl;
     };
 }
 
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index 71432a5537..0ebfe911d1 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -2,43 +2,54 @@
 
 #include <algorithm>
 
-#include <components/esm3/aisequence.hpp>
 #include <components/detournavigator/agentbounds.hpp>
+#include <components/esm3/aisequence.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/world.hpp"
 
-#include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/class.hpp"
 
-#include "movement.hpp"
 #include "creaturestats.hpp"
+#include "movement.hpp"
 
 namespace
 {
 
     constexpr float TRAVEL_FINISH_TIME = 2.f;
 
-bool isWithinMaxRange(const osg::Vec3f& pos1, const osg::Vec3f& pos2)
-{
-    // Maximum travel distance for vanilla compatibility.
-    // Was likely meant to prevent NPCs walking into non-loaded exterior cells, but for some reason is used in interior cells as well.
-    // We can make this configurable at some point, but the default *must* be the below value. Anything else will break shoddily-written content (*cough* MW *cough*) in bizarre ways.
-    return (pos1 - pos2).length2() <= 7168*7168;
-}
+    bool isWithinMaxRange(const osg::Vec3f& pos1, const osg::Vec3f& pos2)
+    {
+        // Maximum travel distance for vanilla compatibility.
+        // Was likely meant to prevent NPCs walking into non-loaded exterior cells, but for some reason is used in
+        // interior cells as well. We can make this configurable at some point, but the default *must* be the below
+        // value. Anything else will break shoddily-written content (*cough* MW *cough*) in bizarre ways.
+        return (pos1 - pos2).length2() <= 7168 * 7168;
+    }
 
 }
 
 namespace MWMechanics
 {
     AiTravel::AiTravel(float x, float y, float z, bool repeat, AiTravel*)
-        : TypedAiPackage<AiTravel>(repeat), mX(x), mY(y), mZ(z), mHidden(false), mDestinationTimer(TRAVEL_FINISH_TIME)
+        : TypedAiPackage<AiTravel>(repeat)
+        , mX(x)
+        , mY(y)
+        , mZ(z)
+        , mHidden(false)
+        , mDestinationTimer(TRAVEL_FINISH_TIME)
     {
     }
 
     AiTravel::AiTravel(float x, float y, float z, AiInternalTravel* derived)
-        : TypedAiPackage<AiTravel>(derived), mX(x), mY(y), mZ(z), mHidden(true), mDestinationTimer(TRAVEL_FINISH_TIME)
+        : TypedAiPackage<AiTravel>(derived)
+        , mX(x)
+        , mY(y)
+        , mZ(z)
+        , mHidden(true)
+        , mDestinationTimer(TRAVEL_FINISH_TIME)
     {
     }
 
@@ -47,21 +58,27 @@ namespace MWMechanics
     {
     }
 
-    AiTravel::AiTravel(const ESM::AiSequence::AiTravel *travel)
-        : TypedAiPackage<AiTravel>(travel->mRepeat), mX(travel->mData.mX), mY(travel->mData.mY), mZ(travel->mData.mZ), mHidden(false)
+    AiTravel::AiTravel(const ESM::AiSequence::AiTravel* travel)
+        : TypedAiPackage<AiTravel>(travel->mRepeat)
+        , mX(travel->mData.mX)
+        , mY(travel->mData.mY)
+        , mZ(travel->mData.mZ)
+        , mHidden(false)
         , mDestinationTimer(TRAVEL_FINISH_TIME)
     {
         // Hidden ESM::AiSequence::AiTravel package should be converted into MWMechanics::AiInternalTravel type
         assert(!travel->mHidden);
     }
 
-    bool AiTravel::execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
+    bool AiTravel::execute(
+        const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
     {
         MWBase::MechanicsManager* mechMgr = MWBase::Environment::get().getMechanicsManager();
         auto& stats = actor.getClass().getCreatureStats(actor);
 
-        if (!stats.getMovementFlag(CreatureStats::Flag_ForceJump) && !stats.getMovementFlag(CreatureStats::Flag_ForceSneak)
-                && (mechMgr->isTurningToPlayer(actor) || mechMgr->getGreetingState(actor) == Greet_InProgress))
+        if (!stats.getMovementFlag(CreatureStats::Flag_ForceJump)
+            && !stats.getMovementFlag(CreatureStats::Flag_ForceSneak)
+            && (mechMgr->isTurningToPlayer(actor) || mechMgr->getGreetingState(actor) == Greet_InProgress))
             return false;
 
         const osg::Vec3f actorPos(actor.getRefData().getPosition().asVec3());
@@ -86,10 +103,12 @@ namespace MWMechanics
         // but Morrowind might stop the actor prematurely under unclear conditions.
 
         // Note Morrowind uses the halved eye level, but this is close enough.
-        float dist = distanceIgnoreZ(actorPos, targetPos) - MWBase::Environment::get().getWorld()->getHalfExtents(actor).z();
+        float dist
+            = distanceIgnoreZ(actorPos, targetPos) - MWBase::Environment::get().getWorld()->getHalfExtents(actor).z();
         const float endTolerance = std::max(64.f, actor.getClass().getCurrentSpeed(actor) * duration);
 
-        // Even if we have entered the threshold, we might have been pushed away. Reset the timer if we're currently too far.
+        // Even if we have entered the threshold, we might have been pushed away. Reset the timer if we're currently too
+        // far.
         if (dist > endTolerance)
         {
             mDestinationTimer = TRAVEL_FINISH_TIME;
@@ -116,7 +135,7 @@ namespace MWMechanics
         reset();
     }
 
-    void AiTravel::writeState(ESM::AiSequence::AiSequence &sequence) const
+    void AiTravel::writeState(ESM::AiSequence::AiSequence& sequence) const
     {
         auto travel = std::make_unique<ESM::AiSequence::AiTravel>();
         travel->mData.mX = mX;
@@ -146,4 +165,3 @@ namespace MWMechanics
         return std::make_unique<AiInternalTravel>(*this);
     }
 }
-
diff --git a/apps/openmw/mwmechanics/aitravel.hpp b/apps/openmw/mwmechanics/aitravel.hpp
index dde63b3aa4..d8e249d465 100644
--- a/apps/openmw/mwmechanics/aitravel.hpp
+++ b/apps/openmw/mwmechanics/aitravel.hpp
@@ -5,10 +5,10 @@
 
 namespace ESM
 {
-namespace AiSequence
-{
-    struct AiTravel;
-}
+    namespace AiSequence
+    {
+        struct AiTravel;
+    }
 }
 
 namespace MWMechanics
@@ -18,42 +18,43 @@ namespace MWMechanics
     /// \brief Causes the AI to travel to the specified point
     class AiTravel : public TypedAiPackage<AiTravel>
     {
-        public:
-            AiTravel(float x, float y, float z, bool repeat, AiTravel* derived);
+    public:
+        AiTravel(float x, float y, float z, bool repeat, AiTravel* derived);
 
-            AiTravel(float x, float y, float z, AiInternalTravel* derived);
+        AiTravel(float x, float y, float z, AiInternalTravel* derived);
 
-            AiTravel(float x, float y, float z, bool repeat);
+        AiTravel(float x, float y, float z, bool repeat);
 
-            explicit AiTravel(const ESM::AiSequence::AiTravel* travel);
+        explicit AiTravel(const ESM::AiSequence::AiTravel* travel);
 
-            /// Simulates the passing of time
-            void fastForward(const MWWorld::Ptr& actor, AiState& state) override;
+        /// Simulates the passing of time
+        void fastForward(const MWWorld::Ptr& actor, AiState& state) override;
 
-            void writeState(ESM::AiSequence::AiSequence &sequence) const override;
+        void writeState(ESM::AiSequence::AiSequence& sequence) const override;
 
-            bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) override;
+        bool execute(const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state,
+            float duration) override;
 
-            static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::Travel; }
+        static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::Travel; }
 
-            static constexpr Options makeDefaultOptions()
-            {
-                AiPackage::Options options;
-                options.mUseVariableSpeed = true;
-                options.mAlwaysActive = true;
-                return options;
-            }
+        static constexpr Options makeDefaultOptions()
+        {
+            AiPackage::Options options;
+            options.mUseVariableSpeed = true;
+            options.mAlwaysActive = true;
+            return options;
+        }
 
-            osg::Vec3f getDestination() const override { return osg::Vec3f(mX, mY, mZ); }
+        osg::Vec3f getDestination() const override { return osg::Vec3f(mX, mY, mZ); }
 
-        private:
-            const float mX;
-            const float mY;
-            const float mZ;
+    private:
+        const float mX;
+        const float mY;
+        const float mZ;
 
-            const bool mHidden;
+        const bool mHidden;
 
-            float mDestinationTimer;
+        float mDestinationTimer;
     };
 
     struct AiInternalTravel final : public AiTravel
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 05eff857e0..1aeab99767 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -5,25 +5,25 @@
 #include <osg/Matrixf>
 
 #include <components/debug/debuglog.hpp>
-#include <components/misc/rng.hpp>
-#include <components/esm3/aisequence.hpp>
 #include <components/detournavigator/navigatorutils.hpp>
+#include <components/esm3/aisequence.hpp>
 #include <components/misc/coordinateconverter.hpp>
+#include <components/misc/rng.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/world.hpp"
 
+#include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
-#include "../mwworld/cellstore.hpp"
 
 #include "../mwphysics/collisiontype.hpp"
 
-#include "pathgrid.hpp"
+#include "actorutil.hpp"
 #include "creaturestats.hpp"
 #include "movement.hpp"
-#include "actorutil.hpp"
+#include "pathgrid.hpp"
 
 namespace MWMechanics
 {
@@ -38,8 +38,7 @@ namespace MWMechanics
 
     static const std::size_t MAX_IDLE_SIZE = 8;
 
-    const std::string AiWander::sIdleSelectToGroupName[GroupIndex_MaxIdle - GroupIndex_MinIdle + 1] =
-    {
+    const std::string AiWander::sIdleSelectToGroupName[GroupIndex_MaxIdle - GroupIndex_MinIdle + 1] = {
         std::string("idle2"),
         std::string("idle3"),
         std::string("idle4"),
@@ -68,23 +67,20 @@ namespace MWMechanics
             return position + osg::Vec3f(distance, 0.0, 0.0) * rotation;
         }
 
-        bool isDestinationHidden(const MWWorld::ConstPtr &actor, const osg::Vec3f& destination)
+        bool isDestinationHidden(const MWWorld::ConstPtr& actor, const osg::Vec3f& destination)
         {
             const auto position = actor.getRefData().getPosition().asVec3();
             const bool isWaterCreature = actor.getClass().isPureWaterCreature(actor);
             const bool isFlyingCreature = actor.getClass().isPureFlyingCreature(actor);
-            const osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getPathfindingAgentBounds(actor).mHalfExtents;
+            const osg::Vec3f halfExtents
+                = MWBase::Environment::get().getWorld()->getPathfindingAgentBounds(actor).mHalfExtents;
             osg::Vec3f direction = destination - position;
             direction.normalize();
-            const auto visibleDestination = (
-                    isWaterCreature || isFlyingCreature
-                    ? destination
-                    : destination + osg::Vec3f(0, 0, halfExtents.z())
-                ) + direction * std::max(halfExtents.x(), std::max(halfExtents.y(), halfExtents.z()));
-            const int mask = MWPhysics::CollisionType_World
-                | MWPhysics::CollisionType_HeightMap
-                | MWPhysics::CollisionType_Door
-                | MWPhysics::CollisionType_Actor;
+            const auto visibleDestination
+                = (isWaterCreature || isFlyingCreature ? destination : destination + osg::Vec3f(0, 0, halfExtents.z()))
+                + direction * std::max(halfExtents.x(), std::max(halfExtents.y(), halfExtents.z()));
+            const int mask = MWPhysics::CollisionType_World | MWPhysics::CollisionType_HeightMap
+                | MWPhysics::CollisionType_Door | MWPhysics::CollisionType_Actor;
             return MWBase::Environment::get().getWorld()->castRay(position, visibleDestination, mask, actor);
         }
 
@@ -109,29 +105,33 @@ namespace MWMechanics
 
     }
 
-    AiWanderStorage::AiWanderStorage() :
-        mReaction(MWBase::Environment::get().getWorld()->getPrng()),
-        mState(Wander_ChooseAction),
-        mIsWanderingManually(false),
-        mCanWanderAlongPathGrid(true),
-        mIdleAnimation(0),
-        mBadIdles(),
-        mPopulateAvailableNodes(true),
-        mAllowedNodes(),
-        mTrimCurrentNode(false),
-        mCheckIdlePositionTimer(0),
-        mStuckCount(0)
+    AiWanderStorage::AiWanderStorage()
+        : mReaction(MWBase::Environment::get().getWorld()->getPrng())
+        , mState(Wander_ChooseAction)
+        , mIsWanderingManually(false)
+        , mCanWanderAlongPathGrid(true)
+        , mIdleAnimation(0)
+        , mBadIdles()
+        , mPopulateAvailableNodes(true)
+        , mAllowedNodes()
+        , mTrimCurrentNode(false)
+        , mCheckIdlePositionTimer(0)
+        , mStuckCount(0)
     {
     }
 
-    AiWander::AiWander(int distance, int duration, int timeOfDay, const std::vector<unsigned char>& idle, bool repeat):
-        TypedAiPackage<AiWander>(repeat),
-        mDistance(std::max(0, distance)),
-        mDuration(std::max(0, duration)),
-        mRemainingDuration(duration), mTimeOfDay(timeOfDay),
-        mIdle(getInitialIdle(idle)),
-        mStoredInitialActorPosition(false), mInitialActorPosition(osg::Vec3f(0, 0, 0)),
-        mHasDestination(false), mDestination(osg::Vec3f(0, 0, 0)), mUsePathgrid(false)
+    AiWander::AiWander(int distance, int duration, int timeOfDay, const std::vector<unsigned char>& idle, bool repeat)
+        : TypedAiPackage<AiWander>(repeat)
+        , mDistance(std::max(0, distance))
+        , mDuration(std::max(0, duration))
+        , mRemainingDuration(duration)
+        , mTimeOfDay(timeOfDay)
+        , mIdle(getInitialIdle(idle))
+        , mStoredInitialActorPosition(false)
+        , mInitialActorPosition(osg::Vec3f(0, 0, 0))
+        , mHasDestination(false)
+        , mDestination(osg::Vec3f(0, 0, 0))
+        , mUsePathgrid(false)
     {
     }
 
@@ -185,7 +185,8 @@ namespace MWMechanics
      * actors will enter combat (i.e. no longer wandering) and different pathfinding
      * will kick in.
      */
-    bool AiWander::execute (const MWWorld::Ptr& actor, CharacterController& /*characterController*/, AiState& state, float duration)
+    bool AiWander::execute(
+        const MWWorld::Ptr& actor, CharacterController& /*characterController*/, AiState& state, float duration)
     {
         MWMechanics::CreatureStats& cStats = actor.getClass().getCreatureStats(actor);
         if (cStats.isDead() || cStats.getHealth().getCurrent() <= 0)
@@ -194,7 +195,7 @@ namespace MWMechanics
         // get or create temporary storage
         AiWanderStorage& storage = state.get<AiWanderStorage>();
 
-        mRemainingDuration -= ((duration*MWBase::Environment::get().getWorld()->getTimeScaleFactor()) / 3600);
+        mRemainingDuration -= ((duration * MWBase::Environment::get().getWorld()->getTimeScaleFactor()) / 3600);
 
         cStats.setDrawState(DrawState::Nothing);
         cStats.setMovementFlag(CreatureStats::Flag_Run, false);
@@ -207,8 +208,8 @@ namespace MWMechanics
         {
             if (mUsePathgrid)
             {
-                mPathFinder.buildPathByPathgrid(pos.asVec3(), mDestination, actor.getCell(),
-                    getPathGridGraph(actor.getCell()));
+                mPathFinder.buildPathByPathgrid(
+                    pos.asVec3(), mDestination, actor.getCell(), getPathGridGraph(actor.getCell()));
             }
             else
             {
@@ -223,7 +224,8 @@ namespace MWMechanics
                 storage.setState(AiWanderStorage::Wander_Walking);
         }
 
-        if(!cStats.getMovementFlag(CreatureStats::Flag_ForceJump) && !cStats.getMovementFlag(CreatureStats::Flag_ForceSneak))
+        if (!cStats.getMovementFlag(CreatureStats::Flag_ForceJump)
+            && !cStats.getMovementFlag(CreatureStats::Flag_ForceSneak))
         {
             GreetingState greetingState = MWBase::Environment::get().getMechanicsManager()->getGreetingState(actor);
             if (greetingState == Greet_InProgress)
@@ -254,7 +256,7 @@ namespace MWMechanics
         {
             stopWalking(actor);
             // Reset package so it can be used again
-            mRemainingDuration=mDuration;
+            mRemainingDuration = mDuration;
             return true;
         }
 
@@ -271,9 +273,11 @@ namespace MWMechanics
         }
 
         auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-        if (canActorMoveByZAxis(actor) && mDistance > 0) {
+        if (canActorMoveByZAxis(actor) && mDistance > 0)
+        {
             // Typically want to idle for a short time before the next wander
-            if (Misc::Rng::rollDice(100, prng) >= 92 && storage.mState != AiWanderStorage::Wander_Walking) {
+            if (Misc::Rng::rollDice(100, prng) >= 92 && storage.mState != AiWanderStorage::Wander_Walking)
+            {
                 wanderNearStart(actor, storage, mDistance);
             }
 
@@ -281,26 +285,33 @@ namespace MWMechanics
         }
         // If the package has a wander distance but no pathgrid is available,
         // randomly idle or wander near spawn point
-        else if(storage.mAllowedNodes.empty() && mDistance > 0 && !storage.mIsWanderingManually) {
+        else if (storage.mAllowedNodes.empty() && mDistance > 0 && !storage.mIsWanderingManually)
+        {
             // Typically want to idle for a short time before the next wander
-            if (Misc::Rng::rollDice(100, prng) >= 96) {
+            if (Misc::Rng::rollDice(100, prng) >= 96)
+            {
                 wanderNearStart(actor, storage, mDistance);
-            } else {
+            }
+            else
+            {
                 storage.setState(AiWanderStorage::Wander_IdleNow);
             }
-        } else if (storage.mAllowedNodes.empty() && !storage.mIsWanderingManually) {
+        }
+        else if (storage.mAllowedNodes.empty() && !storage.mIsWanderingManually)
+        {
             storage.mCanWanderAlongPathGrid = false;
         }
 
         // If Wandering manually and hit an obstacle, stop
-        if (storage.mIsWanderingManually && mObstacleCheck.isEvading()) {
+        if (storage.mIsWanderingManually && mObstacleCheck.isEvading())
+        {
             completeManualWalking(actor, storage);
         }
 
         if (storage.mState == AiWanderStorage::Wander_MoveNow && storage.mCanWanderAlongPathGrid)
         {
             // Construct a new path if there isn't one
-            if(!mPathFinder.isPathConstructed())
+            if (!mPathFinder.isPathConstructed())
             {
                 if (!storage.mAllowedNodes.empty())
                 {
@@ -313,10 +324,8 @@ namespace MWMechanics
             completeManualWalking(actor, storage);
         }
 
-        if (storage.mIsWanderingManually
-            && storage.mState == AiWanderStorage::Wander_Walking
-            && (mPathFinder.getPathSize() == 0
-                || isDestinationHidden(actor, mPathFinder.getPath().back())
+        if (storage.mIsWanderingManually && storage.mState == AiWanderStorage::Wander_Walking
+            && (mPathFinder.getPathSize() == 0 || isDestinationHidden(actor, mPathFinder.getPath().back())
                 || isAreaOccupiedByOtherActor(actor, mPathFinder.getPath().back())))
             completeManualWalking(actor, storage);
 
@@ -340,7 +349,8 @@ namespace MWMechanics
     /*
      * Commands actor to walk to a random location near original spawn location.
      */
-    void AiWander::wanderNearStart(const MWWorld::Ptr &actor, AiWanderStorage &storage, int wanderDistance) {
+    void AiWander::wanderNearStart(const MWWorld::Ptr& actor, AiWanderStorage& storage, int wanderDistance)
+    {
         const auto currentPosition = actor.getRefData().getPosition().asVec3();
 
         std::size_t attempts = 10; // If a unit can't wander out of water, don't want to hang here
@@ -353,19 +363,18 @@ namespace MWMechanics
         const auto areaCosts = getAreaCosts(actor);
         auto& prng = MWBase::Environment::get().getWorld()->getPrng();
 
-        do {
+        do
+        {
 
             // Determine a random location within radius of original position
             const float wanderRadius = (0.2f + Misc::Rng::rollClosedProbability(prng) * 0.8f) * wanderDistance;
             if (!isWaterCreature && !isFlyingCreature)
             {
                 // findRandomPointAroundCircle uses wanderDistance as limit for random and not as exact distance
-                const auto getRandom = []()
-                {
-                    return Misc::Rng::rollProbability(MWBase::Environment::get().getWorld()->getPrng());
-                };
-                auto destination = DetourNavigator::findRandomPointAroundCircle(*navigator, agentBounds,
-                    mInitialActorPosition, wanderRadius, navigatorFlags, getRandom);
+                const auto getRandom
+                    = []() { return Misc::Rng::rollProbability(MWBase::Environment::get().getWorld()->getPrng()); };
+                auto destination = DetourNavigator::findRandomPointAroundCircle(
+                    *navigator, agentBounds, mInitialActorPosition, wanderRadius, navigatorFlags, getRandom);
                 if (destination.has_value())
                 {
                     osg::Vec3f direction = *destination - mInitialActorPosition;
@@ -373,8 +382,8 @@ namespace MWMechanics
                     {
                         direction.normalize();
                         const osg::Vec3f adjustedDestination = mInitialActorPosition + direction * wanderRadius;
-                        destination = DetourNavigator::raycast(*navigator, agentBounds, currentPosition,
-                            adjustedDestination, navigatorFlags);
+                        destination = DetourNavigator::raycast(
+                            *navigator, agentBounds, currentPosition, adjustedDestination, navigatorFlags);
                         if (destination.has_value() && (*destination - mInitialActorPosition).length() > wanderDistance)
                             continue;
                     }
@@ -401,7 +410,7 @@ namespace MWMechanics
                 mPathFinder.buildStraightPath(mDestination);
             else
                 mPathFinder.buildPathByNavMesh(actor, currentPosition, mDestination, agentBounds, navigatorFlags,
-                                               areaCosts, endTolerance, PathType::Full);
+                    areaCosts, endTolerance, PathType::Full);
 
             if (mPathFinder.isPathConstructed())
             {
@@ -417,14 +426,17 @@ namespace MWMechanics
     /*
      * Returns true if the position provided is above water.
      */
-    bool AiWander::destinationIsAtWater(const MWWorld::Ptr &actor, const osg::Vec3f& destination) {
-        float heightToGroundOrWater = MWBase::Environment::get().getWorld()->getDistToNearestRayHit(destination, osg::Vec3f(0,0,-1), 1000.0, true);
+    bool AiWander::destinationIsAtWater(const MWWorld::Ptr& actor, const osg::Vec3f& destination)
+    {
+        float heightToGroundOrWater = MWBase::Environment::get().getWorld()->getDistToNearestRayHit(
+            destination, osg::Vec3f(0, 0, -1), 1000.0, true);
         osg::Vec3f positionBelowSurface = destination;
         positionBelowSurface[2] = positionBelowSurface[2] - heightToGroundOrWater - 1.0f;
         return MWBase::Environment::get().getWorld()->isUnderwater(actor.getCell(), positionBelowSurface);
     }
 
-    void AiWander::completeManualWalking(const MWWorld::Ptr &actor, AiWanderStorage &storage) {
+    void AiWander::completeManualWalking(const MWWorld::Ptr& actor, AiWanderStorage& storage)
+    {
         stopWalking(actor);
         mObstacleCheck.clear();
         storage.setState(AiWanderStorage::Wander_IdleNow);
@@ -447,7 +459,7 @@ namespace MWMechanics
                 break;
 
             case AiWanderStorage::Wander_MoveNow:
-                break;  // nothing to do
+                break; // nothing to do
 
             default:
                 // should never get here
@@ -463,7 +475,7 @@ namespace MWMechanics
 
         if (storage.mCheckIdlePositionTimer >= IDLE_POSITION_CHECK_INTERVAL && !isStationary())
         {
-            storage.mCheckIdlePositionTimer = 0;    // restart timer
+            storage.mCheckIdlePositionTimer = 0; // restart timer
             static float distance = MWBase::Environment::get().getWorld()->getMaxActivationDistance() * 1.6f;
             if (proximityToDoor(actor, distance) || !isNearAllowedNode(actor, storage, distance))
             {
@@ -501,7 +513,8 @@ namespace MWMechanics
     void AiWander::onWalkingStatePerFrameActions(const MWWorld::Ptr& actor, float duration, AiWanderStorage& storage)
     {
         // Is there no destination or are we there yet?
-        if ((!mPathFinder.isPathConstructed()) || pathTo(actor, osg::Vec3f(mPathFinder.getPath().back()), duration, DESTINATION_TOLERANCE))
+        if ((!mPathFinder.isPathConstructed())
+            || pathTo(actor, osg::Vec3f(mPathFinder.getPath().back()), duration, DESTINATION_TOLERANCE))
         {
             stopWalking(actor);
             storage.setState(AiWanderStorage::Wander_ChooseAction);
@@ -527,11 +540,11 @@ namespace MWMechanics
             storage.setState(AiWanderStorage::Wander_MoveNow);
             return;
         }
-        if(idleAnimation)
+        if (idleAnimation)
         {
-            if(std::find(storage.mBadIdles.begin(), storage.mBadIdles.end(), idleAnimation)==storage.mBadIdles.end())
+            if (std::find(storage.mBadIdles.begin(), storage.mBadIdles.end(), idleAnimation) == storage.mBadIdles.end())
             {
-                if(!playIdle(actor, idleAnimation))
+                if (!playIdle(actor, idleAnimation))
                 {
                     storage.mBadIdles.push_back(idleAnimation);
                     storage.setState(AiWanderStorage::Wander_ChooseAction);
@@ -548,8 +561,8 @@ namespace MWMechanics
         if (mUsePathgrid)
         {
             const auto agentBounds = MWBase::Environment::get().getWorld()->getPathfindingAgentBounds(actor);
-            mPathFinder.buildPathByNavMeshToNextPoint(actor, agentBounds, getNavigatorFlags(actor),
-                                                      getAreaCosts(actor));
+            mPathFinder.buildPathByNavMeshToNextPoint(
+                actor, agentBounds, getNavigatorFlags(actor), getAreaCosts(actor));
         }
 
         if (mObstacleCheck.isEvading())
@@ -566,7 +579,7 @@ namespace MWMechanics
                 storage.setState(AiWanderStorage::Wander_MoveNow);
             }
 
-           storage.mStuckCount++;  // TODO: maybe no longer needed
+            storage.mStuckCount++; // TODO: maybe no longer needed
         }
 
         // if stuck for sufficiently long, act like current location was the destination
@@ -579,9 +592,8 @@ namespace MWMechanics
         }
     }
 
-
-
-    void AiWander::setPathToAnAllowedNode(const MWWorld::Ptr& actor, AiWanderStorage& storage, const ESM::Position& actorPos)
+    void AiWander::setPathToAnAllowedNode(
+        const MWWorld::Ptr& actor, AiWanderStorage& storage, const ESM::Position& actorPos)
     {
         auto& prng = MWBase::Environment::get().getWorld()->getPrng();
         unsigned int randNode = Misc::Rng::rollDice(storage.mAllowedNodes.size(), prng);
@@ -601,7 +613,8 @@ namespace MWMechanics
             mDestination = destVec3f;
             mHasDestination = true;
             mUsePathgrid = true;
-            // Remove this node as an option and add back the previously used node (stops NPC from picking the same node):
+            // Remove this node as an option and add back the previously used node (stops NPC from picking the same
+            // node):
             ESM::Pathgrid::Point temp = storage.mAllowedNodes[randNode];
             storage.mAllowedNodes.erase(storage.mAllowedNodes.begin() + randNode);
             // check if mCurrentNode was taken out of mAllowedNodes
@@ -618,13 +631,12 @@ namespace MWMechanics
             storage.mAllowedNodes.erase(storage.mAllowedNodes.begin() + randNode);
     }
 
-    void AiWander::ToWorldCoordinates(ESM::Pathgrid::Point& point, const ESM::Cell * cell)
+    void AiWander::ToWorldCoordinates(ESM::Pathgrid::Point& point, const ESM::Cell* cell)
     {
         Misc::CoordinateConverter(cell).toWorld(point);
     }
 
-    void AiWander::trimAllowedNodes(std::vector<ESM::Pathgrid::Point>& nodes,
-                                    const PathFinder& pathfinder)
+    void AiWander::trimAllowedNodes(std::vector<ESM::Pathgrid::Point>& nodes, const PathFinder& pathfinder)
     {
         // TODO: how to add these back in once the door opens?
         // Idea: keep a list of detected closed doors (see aicombat.cpp)
@@ -632,10 +644,10 @@ namespace MWMechanics
         // at the end of playing idle?) If the door is opened then re-calculate
         // allowed nodes starting from the spawn point.
         auto paths = pathfinder.getPath();
-        while(paths.size() >= 2)
+        while (paths.size() >= 2)
         {
             const auto pt = paths.back();
-            for(unsigned int j = 0; j < nodes.size(); j++)
+            for (unsigned int j = 0; j < nodes.size(); j++)
             {
                 // FIXME: doesn't handle a door with the same X/Y
                 //        coordinates but with a different Z
@@ -665,7 +677,8 @@ namespace MWMechanics
         }
         else
         {
-            Log(Debug::Verbose) << "Attempted to play out of range idle animation \"" << idleSelect << "\" for " << actor.getCellRef().getRefId();
+            Log(Debug::Verbose) << "Attempted to play out of range idle animation \"" << idleSelect << "\" for "
+                                << actor.getCellRef().getRefId();
             return false;
         }
     }
@@ -686,7 +699,8 @@ namespace MWMechanics
     int AiWander::getRandomIdle() const
     {
         MWBase::World* world = MWBase::Environment::get().getWorld();
-        static const float fIdleChanceMultiplier = world->getStore().get<ESM::GameSetting>().find("fIdleChanceMultiplier")->mValue.getFloat();
+        static const float fIdleChanceMultiplier
+            = world->getStore().get<ESM::GameSetting>().find("fIdleChanceMultiplier")->mValue.getFloat();
         if (Misc::Rng::rollClosedProbability(world->getPrng()) > fIdleChanceMultiplier)
             return 0;
 
@@ -705,7 +719,7 @@ namespace MWMechanics
         return newIdle;
     }
 
-    void AiWander::fastForward(const MWWorld::Ptr& actor, AiState &state)
+    void AiWander::fastForward(const MWWorld::Ptr& actor, AiState& state)
     {
         // Update duration counter
         mRemainingDuration--;
@@ -725,7 +739,8 @@ namespace MWMechanics
         ESM::Pathgrid::Point worldDest = dest;
         ToWorldCoordinates(worldDest, actor.getCell()->getCell());
 
-        bool isPathGridOccupied = MWBase::Environment::get().getMechanicsManager()->isAnyActorInRange(PathFinder::makeOsgVec3(worldDest), 60);
+        bool isPathGridOccupied = MWBase::Environment::get().getMechanicsManager()->isAnyActorInRange(
+            PathFinder::makeOsgVec3(worldDest), 60);
 
         // add offset only if the selected pathgrid is occupied by another actor
         if (isPathGridOccupied)
@@ -753,11 +768,13 @@ namespace MWMechanics
                 for (int j = 1; j <= 3; j++)
                 {
                     // move for 5-15% towards random neighboring node
-                    dest = PathFinder::makePathgridPoint(PathFinder::makeOsgVec3(dest) + dir * (j * 5 * length / 100.f));
+                    dest
+                        = PathFinder::makePathgridPoint(PathFinder::makeOsgVec3(dest) + dir * (j * 5 * length / 100.f));
                     worldDest = dest;
                     ToWorldCoordinates(worldDest, actor.getCell()->getCell());
 
-                    isOccupied = MWBase::Environment::get().getMechanicsManager()->isAnyActorInRange(PathFinder::makeOsgVec3(worldDest), 60);
+                    isOccupied = MWBase::Environment::get().getMechanicsManager()->isAnyActorInRange(
+                        PathFinder::makeOsgVec3(worldDest), 60);
 
                     if (!isOccupied)
                         break;
@@ -767,7 +784,7 @@ namespace MWMechanics
                     break;
 
                 // Will try an another neighboring node
-                points.erase(points.begin()+randomIndex);
+                points.erase(points.begin() + randomIndex);
             }
 
             // there is no free space, nowhere to move
@@ -775,8 +792,8 @@ namespace MWMechanics
                 return;
         }
 
-        // place above to prevent moving inside objects, e.g. stairs, because a vector between pathgrids can be underground.
-        // Adding 20 in adjustPosition() is not enough.
+        // place above to prevent moving inside objects, e.g. stairs, because a vector between pathgrids can be
+        // underground. Adding 20 in adjustPosition() is not enough.
         dest.mZ += 60;
 
         ToWorldCoordinates(dest, actor.getCell()->getCell());
@@ -788,10 +805,11 @@ namespace MWMechanics
         actor.getClass().adjustPosition(actor, false);
     }
 
-    void AiWander::getNeighbouringNodes(ESM::Pathgrid::Point dest, const MWWorld::CellStore* currentCell, ESM::Pathgrid::PointList& points)
+    void AiWander::getNeighbouringNodes(
+        ESM::Pathgrid::Point dest, const MWWorld::CellStore* currentCell, ESM::Pathgrid::PointList& points)
     {
-        const ESM::Pathgrid *pathgrid =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(*currentCell->getCell());
+        const ESM::Pathgrid* pathgrid
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(*currentCell->getCell());
 
         if (pathgrid == nullptr || pathgrid->mPoints.empty())
             return;
@@ -804,8 +822,8 @@ namespace MWMechanics
     void AiWander::getAllowedNodes(const MWWorld::Ptr& actor, const ESM::Cell* cell, AiWanderStorage& storage)
     {
         // infrequently used, therefore no benefit in caching it as a member
-        const ESM::Pathgrid *
-            pathgrid = MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(*cell);
+        const ESM::Pathgrid* pathgrid
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(*cell);
         const MWWorld::CellStore* cellStore = actor.getCell();
 
         storage.mAllowedNodes.clear();
@@ -814,7 +832,7 @@ namespace MWMechanics
         // https://forum.openmw.org/viewtopic.php?t=1556
         // http://www.fliggerty.com/phpBB3/viewtopic.php?f=30&t=5833
         // Note: In order to wander, need at least two points.
-        if(!pathgrid || (pathgrid->mPoints.size() < 2))
+        if (!pathgrid || (pathgrid->mPoints.size() < 2))
             storage.mCanWanderAlongPathGrid = false;
 
         // A distance value passed into the constructor indicates how far the
@@ -835,11 +853,11 @@ namespace MWMechanics
             // and if the point is connected to the closest current point
             // NOTE: mPoints and mAllowedNodes are in local coordinates
             int pointIndex = 0;
-            for(unsigned int counter = 0; counter < pathgrid->mPoints.size(); counter++)
+            for (unsigned int counter = 0; counter < pathgrid->mPoints.size(); counter++)
             {
                 osg::Vec3f nodePos(PathFinder::makeOsgVec3(pathgrid->mPoints[counter]));
-                if((npcPos - nodePos).length2() <= mDistance * mDistance &&
-                   getPathGridGraph(cellStore).isPointConnected(closestPointIndex, counter))
+                if ((npcPos - nodePos).length2() <= mDistance * mDistance
+                    && getPathGridGraph(cellStore).isPointConnected(closestPointIndex, counter))
                 {
                     storage.mAllowedNodes.push_back(pathgrid->mPoints[counter]);
                     pointIndex = counter;
@@ -849,7 +867,7 @@ namespace MWMechanics
             {
                 AddNonPathGridAllowedPoints(npcPos, pathgrid, pointIndex, storage);
             }
-            if(!storage.mAllowedNodes.empty())
+            if (!storage.mAllowedNodes.empty())
             {
                 SetCurrentNodeToClosestAllowedNode(npcPos, storage);
             }
@@ -862,7 +880,8 @@ namespace MWMechanics
     // additional points for NPC to wander to are:
     // 1. NPC's initial location
     // 2. Partway along the path between the point and its connected points.
-    void AiWander::AddNonPathGridAllowedPoints(osg::Vec3f npcPos, const ESM::Pathgrid * pathGrid, int pointIndex, AiWanderStorage& storage)
+    void AiWander::AddNonPathGridAllowedPoints(
+        osg::Vec3f npcPos, const ESM::Pathgrid* pathGrid, int pointIndex, AiWanderStorage& storage)
     {
         storage.mAllowedNodes.push_back(PathFinder::makePathgridPoint(npcPos));
         for (auto& edge : pathGrid->mEdges)
@@ -874,7 +893,8 @@ namespace MWMechanics
         }
     }
 
-    void AiWander::AddPointBetweenPathGridPoints(const ESM::Pathgrid::Point& start, const ESM::Pathgrid::Point& end, AiWanderStorage& storage)
+    void AiWander::AddPointBetweenPathGridPoints(
+        const ESM::Pathgrid::Point& start, const ESM::Pathgrid::Point& end, AiWanderStorage& storage)
     {
         osg::Vec3f vectorStart = PathFinder::makeOsgVec3(start);
         osg::Vec3f delta = PathFinder::makeOsgVec3(end) - vectorStart;
@@ -907,7 +927,7 @@ namespace MWMechanics
         storage.mAllowedNodes.erase(storage.mAllowedNodes.begin() + index);
     }
 
-    void AiWander::writeState(ESM::AiSequence::AiSequence &sequence) const
+    void AiWander::writeState(ESM::AiSequence::AiSequence& sequence) const
     {
         float remainingDuration;
         if (mRemainingDuration > 0 && mRemainingDuration < 24)
@@ -920,8 +940,8 @@ namespace MWMechanics
         wander->mData.mDuration = mDuration;
         wander->mData.mTimeOfDay = mTimeOfDay;
         wander->mDurationData.mRemainingDuration = remainingDuration;
-        assert (mIdle.size() == 8);
-        for (int i=0; i<8; ++i)
+        assert(mIdle.size() == 8);
+        for (int i = 0; i < 8; ++i)
             wander->mData.mIdle[i] = mIdle[i];
         wander->mData.mShouldRepeat = mOptions.mRepeat;
         wander->mStoredInitialActorPosition = mStoredInitialActorPosition;
@@ -934,7 +954,7 @@ namespace MWMechanics
         sequence.mPackages.push_back(std::move(package));
     }
 
-    AiWander::AiWander (const ESM::AiSequence::AiWander* wander)
+    AiWander::AiWander(const ESM::AiSequence::AiWander* wander)
         : TypedAiPackage<AiWander>(makeDefaultOptions().withRepeat(wander->mData.mShouldRepeat != 0))
         , mDistance(std::max(static_cast<short>(0), wander->mData.mDistance))
         , mDuration(std::max(static_cast<short>(0), wander->mData.mDuration))
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index 96f1c474b3..35e5c06366 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -5,9 +5,9 @@
 
 #include <vector>
 
-#include "pathfinding.hpp"
 #include "aitemporarybase.hpp"
 #include "aitimer.hpp"
+#include "pathfinding.hpp"
 
 namespace ESM
 {
@@ -66,104 +66,109 @@ namespace MWMechanics
     /// \brief Causes the Actor to wander within a specified range
     class AiWander final : public TypedAiPackage<AiWander>
     {
-        public:
-            /// Constructor
-            /** \param distance Max distance the ACtor will wander
-                \param duration Time, in hours, that this package will be preformed
-                \param timeOfDay Currently unimplemented. Not functional in the original engine.
-                \param idle Chances of each idle to play (9 in total)
-                \param repeat Repeat wander or not **/
-            AiWander(int distance, int duration, int timeOfDay, const std::vector<unsigned char>& idle, bool repeat);
-
-            explicit AiWander (const ESM::AiSequence::AiWander* wander);
-
-            bool execute(const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) override;
-
-            static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::Wander; }
-
-            static constexpr Options makeDefaultOptions()
-            {
-                AiPackage::Options options;
-                options.mUseVariableSpeed = true;
-                return options;
-            }
-
-            void writeState(ESM::AiSequence::AiSequence &sequence) const override;
-
-            void fastForward(const MWWorld::Ptr& actor, AiState& state) override;
-
-            osg::Vec3f getDestination(const MWWorld::Ptr& actor) const override;
+    public:
+        /// Constructor
+        /** \param distance Max distance the ACtor will wander
+            \param duration Time, in hours, that this package will be preformed
+            \param timeOfDay Currently unimplemented. Not functional in the original engine.
+            \param idle Chances of each idle to play (9 in total)
+            \param repeat Repeat wander or not **/
+        AiWander(int distance, int duration, int timeOfDay, const std::vector<unsigned char>& idle, bool repeat);
 
-            osg::Vec3f getDestination() const override
-            {
-                if (!mHasDestination)
-                    return osg::Vec3f(0, 0, 0);
+        explicit AiWander(const ESM::AiSequence::AiWander* wander);
 
-                return mDestination;
-            }
+        bool execute(const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state,
+            float duration) override;
 
-            bool isStationary() const { return mDistance == 0; }
+        static constexpr AiPackageTypeId getTypeId() { return AiPackageTypeId::Wander; }
 
-        private:
-            void stopWalking(const MWWorld::Ptr& actor);
-
-            /// Have the given actor play an idle animation
-            /// @return Success or error
-            bool playIdle(const MWWorld::Ptr& actor, unsigned short idleSelect);
-            bool checkIdle(const MWWorld::Ptr& actor, unsigned short idleSelect);
-            int getRandomIdle() const;
-            void setPathToAnAllowedNode(const MWWorld::Ptr& actor, AiWanderStorage& storage, const ESM::Position& actorPos);
-            void evadeObstacles(const MWWorld::Ptr& actor, AiWanderStorage& storage);
-            void doPerFrameActionsForState(const MWWorld::Ptr& actor, float duration, AiWanderStorage& storage);
-            void onIdleStatePerFrameActions(const MWWorld::Ptr& actor, float duration, AiWanderStorage& storage);
-            void onWalkingStatePerFrameActions(const MWWorld::Ptr& actor, float duration, AiWanderStorage& storage);
-            void onChooseActionStatePerFrameActions(const MWWorld::Ptr& actor, AiWanderStorage& storage);
-            bool reactionTimeActions(const MWWorld::Ptr& actor, AiWanderStorage& storage, ESM::Position& pos);
-            inline bool isPackageCompleted() const;
-            void wanderNearStart(const MWWorld::Ptr &actor, AiWanderStorage &storage, int wanderDistance);
-            bool destinationIsAtWater(const MWWorld::Ptr &actor, const osg::Vec3f& destination);
-            void completeManualWalking(const MWWorld::Ptr &actor, AiWanderStorage &storage);
-            bool isNearAllowedNode(const MWWorld::Ptr &actor, const AiWanderStorage& storage, float distance) const;
-
-            const int mDistance; // how far the actor can wander from the spawn point
-            const int mDuration;
-            float mRemainingDuration;
-            const int mTimeOfDay;
-            const std::vector<unsigned char> mIdle;
+        static constexpr Options makeDefaultOptions()
+        {
+            AiPackage::Options options;
+            options.mUseVariableSpeed = true;
+            return options;
+        }
 
-            bool mStoredInitialActorPosition;
-            osg::Vec3f mInitialActorPosition; // Note: an original engine does not reset coordinates even when actor changes a cell
+        void writeState(ESM::AiSequence::AiSequence& sequence) const override;
 
-            bool mHasDestination;
-            osg::Vec3f mDestination;
-            bool mUsePathgrid;
+        void fastForward(const MWWorld::Ptr& actor, AiState& state) override;
 
-            void getNeighbouringNodes(ESM::Pathgrid::Point dest, const MWWorld::CellStore* currentCell, ESM::Pathgrid::PointList& points);
+        osg::Vec3f getDestination(const MWWorld::Ptr& actor) const override;
 
-            void getAllowedNodes(const MWWorld::Ptr& actor, const ESM::Cell* cell, AiWanderStorage& storage);
+        osg::Vec3f getDestination() const override
+        {
+            if (!mHasDestination)
+                return osg::Vec3f(0, 0, 0);
 
-            void trimAllowedNodes(std::vector<ESM::Pathgrid::Point>& nodes, const PathFinder& pathfinder);
+            return mDestination;
+        }
 
-            // constants for converting idleSelect values into groupNames
-            enum GroupIndex
-            {
-                GroupIndex_MinIdle = 2,
-                GroupIndex_MaxIdle = 9
-            };
+        bool isStationary() const { return mDistance == 0; }
+
+    private:
+        void stopWalking(const MWWorld::Ptr& actor);
+
+        /// Have the given actor play an idle animation
+        /// @return Success or error
+        bool playIdle(const MWWorld::Ptr& actor, unsigned short idleSelect);
+        bool checkIdle(const MWWorld::Ptr& actor, unsigned short idleSelect);
+        int getRandomIdle() const;
+        void setPathToAnAllowedNode(const MWWorld::Ptr& actor, AiWanderStorage& storage, const ESM::Position& actorPos);
+        void evadeObstacles(const MWWorld::Ptr& actor, AiWanderStorage& storage);
+        void doPerFrameActionsForState(const MWWorld::Ptr& actor, float duration, AiWanderStorage& storage);
+        void onIdleStatePerFrameActions(const MWWorld::Ptr& actor, float duration, AiWanderStorage& storage);
+        void onWalkingStatePerFrameActions(const MWWorld::Ptr& actor, float duration, AiWanderStorage& storage);
+        void onChooseActionStatePerFrameActions(const MWWorld::Ptr& actor, AiWanderStorage& storage);
+        bool reactionTimeActions(const MWWorld::Ptr& actor, AiWanderStorage& storage, ESM::Position& pos);
+        inline bool isPackageCompleted() const;
+        void wanderNearStart(const MWWorld::Ptr& actor, AiWanderStorage& storage, int wanderDistance);
+        bool destinationIsAtWater(const MWWorld::Ptr& actor, const osg::Vec3f& destination);
+        void completeManualWalking(const MWWorld::Ptr& actor, AiWanderStorage& storage);
+        bool isNearAllowedNode(const MWWorld::Ptr& actor, const AiWanderStorage& storage, float distance) const;
+
+        const int mDistance; // how far the actor can wander from the spawn point
+        const int mDuration;
+        float mRemainingDuration;
+        const int mTimeOfDay;
+        const std::vector<unsigned char> mIdle;
+
+        bool mStoredInitialActorPosition;
+        osg::Vec3f
+            mInitialActorPosition; // Note: an original engine does not reset coordinates even when actor changes a cell
+
+        bool mHasDestination;
+        osg::Vec3f mDestination;
+        bool mUsePathgrid;
+
+        void getNeighbouringNodes(
+            ESM::Pathgrid::Point dest, const MWWorld::CellStore* currentCell, ESM::Pathgrid::PointList& points);
+
+        void getAllowedNodes(const MWWorld::Ptr& actor, const ESM::Cell* cell, AiWanderStorage& storage);
+
+        void trimAllowedNodes(std::vector<ESM::Pathgrid::Point>& nodes, const PathFinder& pathfinder);
+
+        // constants for converting idleSelect values into groupNames
+        enum GroupIndex
+        {
+            GroupIndex_MinIdle = 2,
+            GroupIndex_MaxIdle = 9
+        };
 
-            /// convert point from local (i.e. cell) to world coordinates
-            void ToWorldCoordinates(ESM::Pathgrid::Point& point, const ESM::Cell * cell);
+        /// convert point from local (i.e. cell) to world coordinates
+        void ToWorldCoordinates(ESM::Pathgrid::Point& point, const ESM::Cell* cell);
 
-            void SetCurrentNodeToClosestAllowedNode(const osg::Vec3f& npcPos, AiWanderStorage& storage);
+        void SetCurrentNodeToClosestAllowedNode(const osg::Vec3f& npcPos, AiWanderStorage& storage);
 
-            void AddNonPathGridAllowedPoints(osg::Vec3f npcPos, const ESM::Pathgrid * pathGrid, int pointIndex, AiWanderStorage& storage);
+        void AddNonPathGridAllowedPoints(
+            osg::Vec3f npcPos, const ESM::Pathgrid* pathGrid, int pointIndex, AiWanderStorage& storage);
 
-            void AddPointBetweenPathGridPoints(const ESM::Pathgrid::Point& start, const ESM::Pathgrid::Point& end, AiWanderStorage& storage);
+        void AddPointBetweenPathGridPoints(
+            const ESM::Pathgrid::Point& start, const ESM::Pathgrid::Point& end, AiWanderStorage& storage);
 
-            /// lookup table for converting idleSelect value to groupName
-            static const std::string sIdleSelectToGroupName[GroupIndex_MaxIdle - GroupIndex_MinIdle + 1];
+        /// lookup table for converting idleSelect value to groupName
+        static const std::string sIdleSelectToGroupName[GroupIndex_MaxIdle - GroupIndex_MinIdle + 1];
 
-            static int OffsetToPreventOvercrowding();
+        static int OffsetToPreventOvercrowding();
     };
 }
 
diff --git a/apps/openmw/mwmechanics/alchemy.cpp b/apps/openmw/mwmechanics/alchemy.cpp
index d60eac15de..fdff3cf2ed 100644
--- a/apps/openmw/mwmechanics/alchemy.cpp
+++ b/apps/openmw/mwmechanics/alchemy.cpp
@@ -4,26 +4,26 @@
 #include <cmath>
 
 #include <algorithm>
-#include <stdexcept>
 #include <map>
+#include <stdexcept>
 
 #include <components/misc/rng.hpp>
 
-#include <components/esm3/loadskil.hpp>
 #include <components/esm3/loadappa.hpp>
 #include <components/esm3/loadgmst.hpp>
 #include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
-#include "../mwworld/esmstore.hpp"
-#include "../mwworld/containerstore.hpp"
-#include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/class.hpp"
+#include "../mwworld/containerstore.hpp"
+#include "../mwworld/esmstore.hpp"
 
-#include "magiceffects.hpp"
 #include "creaturestats.hpp"
+#include "magiceffects.hpp"
 
 MWMechanics::Alchemy::Alchemy()
     : mValue(0)
@@ -35,20 +35,20 @@ std::set<MWMechanics::EffectKey> MWMechanics::Alchemy::listEffects() const
 {
     std::map<EffectKey, int> effects;
 
-    for (TIngredientsIterator iter (mIngredients.begin()); iter!=mIngredients.end(); ++iter)
+    for (TIngredientsIterator iter(mIngredients.begin()); iter != mIngredients.end(); ++iter)
     {
         if (!iter->isEmpty())
         {
-            const MWWorld::LiveCellRef<ESM::Ingredient> *ingredient = iter->get<ESM::Ingredient>();
+            const MWWorld::LiveCellRef<ESM::Ingredient>* ingredient = iter->get<ESM::Ingredient>();
 
             std::set<EffectKey> seenEffects;
 
-            for (int i=0; i<4; ++i)
-                if (ingredient->mBase->mData.mEffectID[i]!=-1)
+            for (int i = 0; i < 4; ++i)
+                if (ingredient->mBase->mData.mEffectID[i] != -1)
                 {
-                    EffectKey key (
-                        ingredient->mBase->mData.mEffectID[i], ingredient->mBase->mData.mSkills[i]!=-1 ?
-                        ingredient->mBase->mData.mSkills[i] : ingredient->mBase->mData.mAttributes[i]);
+                    EffectKey key(ingredient->mBase->mData.mEffectID[i],
+                        ingredient->mBase->mData.mSkills[i] != -1 ? ingredient->mBase->mData.mSkills[i]
+                                                                  : ingredient->mBase->mData.mAttributes[i]);
 
                     if (seenEffects.insert(key).second)
                         ++effects[key];
@@ -58,14 +58,14 @@ std::set<MWMechanics::EffectKey> MWMechanics::Alchemy::listEffects() const
 
     std::set<EffectKey> effects2;
 
-    for (std::map<EffectKey, int>::const_iterator iter (effects.begin()); iter!=effects.end(); ++iter)
-        if (iter->second>1)
-            effects2.insert (iter->first);
+    for (std::map<EffectKey, int>::const_iterator iter(effects.begin()); iter != effects.end(); ++iter)
+        if (iter->second > 1)
+            effects2.insert(iter->first);
 
     return effects2;
 }
 
-void MWMechanics::Alchemy::applyTools (int flags, float& value) const
+void MWMechanics::Alchemy::applyTools(int flags, float& value) const
 {
     bool magnitude = !(flags & ESM::MagicEffect::NoMagnitude);
     bool duration = !(flags & ESM::MagicEffect::NoDuration);
@@ -84,9 +84,10 @@ void MWMechanics::Alchemy::applyTools (int flags, float& value) const
     else
         return;
 
-    float toolQuality = setup==1 || setup==2 ? mTools[tool].get<ESM::Apparatus>()->mBase->mData.mQuality : 0;
-    float calcinatorQuality = setup==1 || setup==3 ?
-        mTools[ESM::Apparatus::Calcinator].get<ESM::Apparatus>()->mBase->mData.mQuality : 0;
+    float toolQuality = setup == 1 || setup == 2 ? mTools[tool].get<ESM::Apparatus>()->mBase->mData.mQuality : 0;
+    float calcinatorQuality = setup == 1 || setup == 3
+        ? mTools[ESM::Apparatus::Calcinator].get<ESM::Apparatus>()->mBase->mData.mQuality
+        : 0;
 
     float quality = 1;
 
@@ -94,14 +95,14 @@ void MWMechanics::Alchemy::applyTools (int flags, float& value) const
     {
         case 1:
 
-            quality = negative ? 2 * toolQuality + 3 * calcinatorQuality :
-                (magnitude && duration ?
-                2 * toolQuality + calcinatorQuality : 2/3.0f * (toolQuality + calcinatorQuality) + 0.5f);
+            quality = negative ? 2 * toolQuality + 3 * calcinatorQuality
+                               : (magnitude && duration ? 2 * toolQuality + calcinatorQuality
+                                                        : 2 / 3.0f * (toolQuality + calcinatorQuality) + 0.5f);
             break;
 
         case 2:
 
-            quality = negative ? 1+toolQuality : (magnitude && duration ? toolQuality : toolQuality + 0.5f);
+            quality = negative ? 1 + toolQuality : (magnitude && duration ? toolQuality : toolQuality + 0.5f);
             break;
 
         case 3:
@@ -110,14 +111,14 @@ void MWMechanics::Alchemy::applyTools (int flags, float& value) const
             break;
     }
 
-    if (setup==3 || !negative)
+    if (setup == 3 || !negative)
     {
         value += quality;
     }
     else
     {
-        if (quality==0)
-            throw std::runtime_error ("invalid derived alchemy apparatus quality");
+        if (quality == 0)
+            throw std::runtime_error("invalid derived alchemy apparatus quality");
 
         value /= quality;
     }
@@ -128,61 +129,81 @@ void MWMechanics::Alchemy::updateEffects()
     mEffects.clear();
     mValue = 0;
 
-    if (countIngredients()<2 || mAlchemist.isEmpty() || mTools[ESM::Apparatus::MortarPestle].isEmpty())
+    if (countIngredients() < 2 || mAlchemist.isEmpty() || mTools[ESM::Apparatus::MortarPestle].isEmpty())
         return;
 
     // find effects
-    std::set<EffectKey> effects (listEffects());
+    std::set<EffectKey> effects(listEffects());
 
     // general alchemy factor
     float x = getAlchemyFactor();
 
     x *= mTools[ESM::Apparatus::MortarPestle].get<ESM::Apparatus>()->mBase->mData.mQuality;
-    x *= MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find ("fPotionStrengthMult")->mValue.getFloat();
+    x *= MWBase::Environment::get()
+             .getWorld()
+             ->getStore()
+             .get<ESM::GameSetting>()
+             .find("fPotionStrengthMult")
+             ->mValue.getFloat();
 
     // value
-    mValue = static_cast<int> (
-        x * MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find ("iAlchemyMod")->mValue.getFloat());
+    mValue = static_cast<int>(x
+        * MWBase::Environment::get()
+              .getWorld()
+              ->getStore()
+              .get<ESM::GameSetting>()
+              .find("iAlchemyMod")
+              ->mValue.getFloat());
 
     // build quantified effect list
-    for (std::set<EffectKey>::const_iterator iter (effects.begin()); iter!=effects.end(); ++iter)
+    for (std::set<EffectKey>::const_iterator iter(effects.begin()); iter != effects.end(); ++iter)
     {
-        const ESM::MagicEffect *magicEffect =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find (iter->mId);
+        const ESM::MagicEffect* magicEffect
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(iter->mId);
 
-        if (magicEffect->mData.mBaseCost<=0)
+        if (magicEffect->mData.mBaseCost <= 0)
         {
             const std::string os = "invalid base cost for magic effect " + std::to_string(iter->mId);
-            throw std::runtime_error (os);
+            throw std::runtime_error(os);
         }
 
-        float fPotionT1MagMul =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find ("fPotionT1MagMult")->mValue.getFloat();
-
-        if (fPotionT1MagMul<=0)
-            throw std::runtime_error ("invalid gmst: fPotionT1MagMul");
-
-        float fPotionT1DurMult =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find ("fPotionT1DurMult")->mValue.getFloat();
-
-        if (fPotionT1DurMult<=0)
-            throw std::runtime_error ("invalid gmst: fPotionT1DurMult");
-
-        float magnitude = (magicEffect->mData.mFlags & ESM::MagicEffect::NoMagnitude) ?
-            1.0f : (x / fPotionT1MagMul) / magicEffect->mData.mBaseCost;
-        float duration = (magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration) ?
-            1.0f : (x / fPotionT1DurMult) / magicEffect->mData.mBaseCost;
+        float fPotionT1MagMul = MWBase::Environment::get()
+                                    .getWorld()
+                                    ->getStore()
+                                    .get<ESM::GameSetting>()
+                                    .find("fPotionT1MagMult")
+                                    ->mValue.getFloat();
+
+        if (fPotionT1MagMul <= 0)
+            throw std::runtime_error("invalid gmst: fPotionT1MagMul");
+
+        float fPotionT1DurMult = MWBase::Environment::get()
+                                     .getWorld()
+                                     ->getStore()
+                                     .get<ESM::GameSetting>()
+                                     .find("fPotionT1DurMult")
+                                     ->mValue.getFloat();
+
+        if (fPotionT1DurMult <= 0)
+            throw std::runtime_error("invalid gmst: fPotionT1DurMult");
+
+        float magnitude = (magicEffect->mData.mFlags & ESM::MagicEffect::NoMagnitude)
+            ? 1.0f
+            : (x / fPotionT1MagMul) / magicEffect->mData.mBaseCost;
+        float duration = (magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration)
+            ? 1.0f
+            : (x / fPotionT1DurMult) / magicEffect->mData.mBaseCost;
 
         if (!(magicEffect->mData.mFlags & ESM::MagicEffect::NoMagnitude))
-            applyTools (magicEffect->mData.mFlags, magnitude);
+            applyTools(magicEffect->mData.mFlags, magnitude);
 
         if (!(magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration))
-            applyTools (magicEffect->mData.mFlags, duration);
+            applyTools(magicEffect->mData.mFlags, duration);
 
         duration = roundf(duration);
         magnitude = roundf(magnitude);
 
-        if (magnitude>0 && duration>0)
+        if (magnitude > 0 && duration > 0)
         {
             ESM::ENAMstruct effect;
             effect.mEffectID = iter->mId;
@@ -201,15 +222,14 @@ void MWMechanics::Alchemy::updateEffects()
             effect.mDuration = static_cast<int>(duration);
             effect.mMagnMin = effect.mMagnMax = static_cast<int>(magnitude);
 
-            mEffects.push_back (effect);
+            mEffects.push_back(effect);
         }
     }
 }
 
-const ESM::Potion *MWMechanics::Alchemy::getRecord(const ESM::Potion& toFind) const
+const ESM::Potion* MWMechanics::Alchemy::getRecord(const ESM::Potion& toFind) const
 {
-    const MWWorld::Store<ESM::Potion> &potions =
-        MWBase::Environment::get().getWorld()->getStore().get<ESM::Potion>();
+    const MWWorld::Store<ESM::Potion>& potions = MWBase::Environment::get().getWorld()->getStore().get<ESM::Potion>();
 
     MWWorld::Store<ESM::Potion>::iterator iter = potions.begin();
     for (; iter != potions.end(); ++iter)
@@ -217,11 +237,9 @@ const ESM::Potion *MWMechanics::Alchemy::getRecord(const ESM::Potion& toFind) co
         if (iter->mEffects.mList.size() != mEffects.size())
             continue;
 
-        if (iter->mName != toFind.mName
-                || iter->mScript != toFind.mScript
-                || iter->mData.mWeight != toFind.mData.mWeight
-                || iter->mData.mValue != toFind.mData.mValue
-                || iter->mData.mAutoCalc != toFind.mData.mAutoCalc)
+        if (iter->mName != toFind.mName || iter->mScript != toFind.mScript
+            || iter->mData.mWeight != toFind.mData.mWeight || iter->mData.mValue != toFind.mData.mValue
+            || iter->mData.mAutoCalc != toFind.mData.mAutoCalc)
             continue;
 
         // Don't choose an ID that came from the content files, would have unintended side effects
@@ -231,19 +249,15 @@ const ESM::Potion *MWMechanics::Alchemy::getRecord(const ESM::Potion& toFind) co
 
         bool mismatch = false;
 
-        for (int i=0; i<static_cast<int> (iter->mEffects.mList.size()); ++i)
+        for (int i = 0; i < static_cast<int>(iter->mEffects.mList.size()); ++i)
         {
             const ESM::ENAMstruct& first = iter->mEffects.mList[i];
             const ESM::ENAMstruct& second = mEffects[i];
 
-            if (first.mEffectID!=second.mEffectID ||
-                first.mArea!=second.mArea ||
-                first.mRange!=second.mRange ||
-                first.mSkill!=second.mSkill ||
-                first.mAttribute!=second.mAttribute ||
-                first.mMagnMin!=second.mMagnMin ||
-                first.mMagnMax!=second.mMagnMax ||
-                first.mDuration!=second.mDuration)
+            if (first.mEffectID != second.mEffectID || first.mArea != second.mArea || first.mRange != second.mRange
+                || first.mSkill != second.mSkill || first.mAttribute != second.mAttribute
+                || first.mMagnMin != second.mMagnMin || first.mMagnMax != second.mMagnMax
+                || first.mDuration != second.mDuration)
             {
                 mismatch = true;
                 break;
@@ -259,25 +273,25 @@ const ESM::Potion *MWMechanics::Alchemy::getRecord(const ESM::Potion& toFind) co
 
 void MWMechanics::Alchemy::removeIngredients()
 {
-    for (TIngredientsContainer::iterator iter (mIngredients.begin()); iter!=mIngredients.end(); ++iter)
+    for (TIngredientsContainer::iterator iter(mIngredients.begin()); iter != mIngredients.end(); ++iter)
         if (!iter->isEmpty())
         {
             iter->getContainerStore()->remove(*iter, 1, mAlchemist);
 
-            if (iter->getRefData().getCount()<1)
+            if (iter->getRefData().getCount() < 1)
                 *iter = MWWorld::Ptr();
         }
 
     updateEffects();
 }
 
-void MWMechanics::Alchemy::addPotion (const std::string& name)
+void MWMechanics::Alchemy::addPotion(const std::string& name)
 {
     ESM::Potion newRecord;
 
     newRecord.mData.mWeight = 0;
 
-    for (TIngredientsIterator iter (beginIngredients()); iter!=endIngredients(); ++iter)
+    for (TIngredientsIterator iter(beginIngredients()); iter != endIngredients(); ++iter)
         if (!iter->isEmpty())
             newRecord.mData.mWeight += iter->get<ESM::Ingredient>()->mBase->mData.mWeight;
 
@@ -291,42 +305,41 @@ void MWMechanics::Alchemy::addPotion (const std::string& name)
 
     auto& prng = MWBase::Environment::get().getWorld()->getPrng();
     int index = Misc::Rng::rollDice(6, prng);
-    assert (index>=0 && index<6);
+    assert(index >= 0 && index < 6);
 
-    static const char *meshes[] = { "standard", "bargain", "cheap", "fresh", "exclusive", "quality" };
+    static const char* meshes[] = { "standard", "bargain", "cheap", "fresh", "exclusive", "quality" };
 
-    newRecord.mModel = "m\\misc_potion_" + std::string (meshes[index]) + "_01.nif";
-    newRecord.mIcon = "m\\tx_potion_" + std::string (meshes[index]) + "_01.dds";
+    newRecord.mModel = "m\\misc_potion_" + std::string(meshes[index]) + "_01.nif";
+    newRecord.mIcon = "m\\tx_potion_" + std::string(meshes[index]) + "_01.dds";
 
     newRecord.mEffects.mList = mEffects;
 
     const ESM::Potion* record = getRecord(newRecord);
     if (!record)
-        record = MWBase::Environment::get().getWorld()->createRecord (newRecord);
+        record = MWBase::Environment::get().getWorld()->createRecord(newRecord);
 
-    mAlchemist.getClass().getContainerStore (mAlchemist).add (record->mId, 1, mAlchemist);
+    mAlchemist.getClass().getContainerStore(mAlchemist).add(record->mId, 1, mAlchemist);
 }
 
 void MWMechanics::Alchemy::increaseSkill()
 {
-    mAlchemist.getClass().skillUsageSucceeded (mAlchemist, ESM::Skill::Alchemy, 0);
+    mAlchemist.getClass().skillUsageSucceeded(mAlchemist, ESM::Skill::Alchemy, 0);
 }
 
 float MWMechanics::Alchemy::getAlchemyFactor() const
 {
-    const CreatureStats& creatureStats = mAlchemist.getClass().getCreatureStats (mAlchemist);
+    const CreatureStats& creatureStats = mAlchemist.getClass().getCreatureStats(mAlchemist);
 
-    return
-        (mAlchemist.getClass().getSkill(mAlchemist, ESM::Skill::Alchemy) +
-        0.1f * creatureStats.getAttribute (ESM::Attribute::Intelligence).getModified()
-        + 0.1f * creatureStats.getAttribute (ESM::Attribute::Luck).getModified());
+    return (mAlchemist.getClass().getSkill(mAlchemist, ESM::Skill::Alchemy)
+        + 0.1f * creatureStats.getAttribute(ESM::Attribute::Intelligence).getModified()
+        + 0.1f * creatureStats.getAttribute(ESM::Attribute::Luck).getModified());
 }
 
 int MWMechanics::Alchemy::countIngredients() const
 {
     int ingredients = 0;
 
-    for (TIngredientsIterator iter (beginIngredients()); iter!=endIngredients(); ++iter)
+    for (TIngredientsIterator iter(beginIngredients()); iter != endIngredients(); ++iter)
         if (!iter->isEmpty())
             ++ingredients;
 
@@ -341,7 +354,7 @@ int MWMechanics::Alchemy::countPotionsToBrew() const
 
     int toBrew = -1;
 
-    for (TIngredientsIterator iter (beginIngredients()); iter!=endIngredients(); ++iter)
+    for (TIngredientsIterator iter(beginIngredients()); iter != endIngredients(); ++iter)
         if (!iter->isEmpty())
         {
             int count = iter->getRefData().getCount();
@@ -352,34 +365,34 @@ int MWMechanics::Alchemy::countPotionsToBrew() const
     return toBrew;
 }
 
-void MWMechanics::Alchemy::setAlchemist (const MWWorld::Ptr& npc)
+void MWMechanics::Alchemy::setAlchemist(const MWWorld::Ptr& npc)
 {
     mAlchemist = npc;
 
-    mIngredients.resize (4);
+    mIngredients.resize(4);
 
-    std::fill (mIngredients.begin(), mIngredients.end(), MWWorld::Ptr());
+    std::fill(mIngredients.begin(), mIngredients.end(), MWWorld::Ptr());
 
-    mTools.resize (4);
+    mTools.resize(4);
 
-    std::fill (mTools.begin(), mTools.end(), MWWorld::Ptr());
+    std::fill(mTools.begin(), mTools.end(), MWWorld::Ptr());
 
     mEffects.clear();
 
-    MWWorld::ContainerStore& store = npc.getClass().getContainerStore (npc);
+    MWWorld::ContainerStore& store = npc.getClass().getContainerStore(npc);
 
-    for (MWWorld::ContainerStoreIterator iter (store.begin (MWWorld::ContainerStore::Type_Apparatus));
-        iter!=store.end(); ++iter)
+    for (MWWorld::ContainerStoreIterator iter(store.begin(MWWorld::ContainerStore::Type_Apparatus));
+         iter != store.end(); ++iter)
     {
         MWWorld::LiveCellRef<ESM::Apparatus>* ref = iter->get<ESM::Apparatus>();
 
         int type = ref->mBase->mData.mType;
 
-        if (type<0 || type>=static_cast<int> (mTools.size()))
-            throw std::runtime_error ("invalid apparatus type");
+        if (type < 0 || type >= static_cast<int>(mTools.size()))
+            throw std::runtime_error("invalid apparatus type");
 
         if (!mTools[type].isEmpty())
-            if (ref->mBase->mData.mQuality<=mTools[type].get<ESM::Apparatus>()->mBase->mData.mQuality)
+            if (ref->mBase->mData.mQuality <= mTools[type].get<ESM::Apparatus>()->mBase->mData.mQuality)
                 continue;
 
         mTools[type] = *iter;
@@ -420,24 +433,24 @@ void MWMechanics::Alchemy::setPotionName(const std::string& name)
     mPotionName = name;
 }
 
-int MWMechanics::Alchemy::addIngredient (const MWWorld::Ptr& ingredient)
+int MWMechanics::Alchemy::addIngredient(const MWWorld::Ptr& ingredient)
 {
     // find a free slot
     int slot = -1;
 
-    for (int i=0; i<static_cast<int> (mIngredients.size()); ++i)
+    for (int i = 0; i < static_cast<int>(mIngredients.size()); ++i)
         if (mIngredients[i].isEmpty())
         {
             slot = i;
             break;
         }
 
-    if (slot==-1)
+    if (slot == -1)
         return -1;
 
-    for (TIngredientsIterator iter (mIngredients.begin()); iter!=mIngredients.end(); ++iter)
-        if (!iter->isEmpty() && Misc::StringUtils::ciEqual(ingredient.getCellRef().getRefId(),
-                                                           iter->getCellRef().getRefId()))
+    for (TIngredientsIterator iter(mIngredients.begin()); iter != mIngredients.end(); ++iter)
+        if (!iter->isEmpty()
+            && Misc::StringUtils::ciEqual(ingredient.getCellRef().getRefId(), iter->getCellRef().getRefId()))
             return -1;
 
     mIngredients[slot] = ingredient;
@@ -447,9 +460,9 @@ int MWMechanics::Alchemy::addIngredient (const MWWorld::Ptr& ingredient)
     return slot;
 }
 
-void MWMechanics::Alchemy::removeIngredient (int index)
+void MWMechanics::Alchemy::removeIngredient(int index)
 {
-    if (index>=0 && index<static_cast<int> (mIngredients.size()))
+    if (index >= 0 && index < static_cast<int>(mIngredients.size()))
     {
         mIngredients[index] = MWWorld::Ptr();
         updateEffects();
@@ -466,15 +479,19 @@ MWMechanics::Alchemy::TEffectsIterator MWMechanics::Alchemy::endEffects() const
     return mEffects.end();
 }
 
-bool MWMechanics::Alchemy::knownEffect(unsigned int potionEffectIndex, const MWWorld::Ptr &npc)
+bool MWMechanics::Alchemy::knownEffect(unsigned int potionEffectIndex, const MWWorld::Ptr& npc)
 {
-    float alchemySkill = npc.getClass().getSkill (npc, ESM::Skill::Alchemy);
-    static const float fWortChanceValue =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fWortChanceValue")->mValue.getFloat();
+    float alchemySkill = npc.getClass().getSkill(npc, ESM::Skill::Alchemy);
+    static const float fWortChanceValue = MWBase::Environment::get()
+                                              .getWorld()
+                                              ->getStore()
+                                              .get<ESM::GameSetting>()
+                                              .find("fWortChanceValue")
+                                              ->mValue.getFloat();
     return (potionEffectIndex <= 1 && alchemySkill >= fWortChanceValue)
-            || (potionEffectIndex <= 3 && alchemySkill >= fWortChanceValue*2)
-            || (potionEffectIndex <= 5 && alchemySkill >= fWortChanceValue*3)
-            || (potionEffectIndex <= 7 && alchemySkill >= fWortChanceValue*4);
+        || (potionEffectIndex <= 3 && alchemySkill >= fWortChanceValue * 2)
+        || (potionEffectIndex <= 5 && alchemySkill >= fWortChanceValue * 3)
+        || (potionEffectIndex <= 7 && alchemySkill >= fWortChanceValue * 4);
 }
 
 MWMechanics::Alchemy::Result MWMechanics::Alchemy::getReadyStatus() const
@@ -482,7 +499,7 @@ MWMechanics::Alchemy::Result MWMechanics::Alchemy::getReadyStatus() const
     if (mTools[ESM::Apparatus::MortarPestle].isEmpty())
         return Result_NoMortarAndPestle;
 
-    if (countIngredients()<2)
+    if (countIngredients() < 2)
         return Result_LessThanTwoIngredients;
 
     if (mPotionName.empty())
@@ -494,7 +511,7 @@ MWMechanics::Alchemy::Result MWMechanics::Alchemy::getReadyStatus() const
     return Result_Success;
 }
 
-MWMechanics::Alchemy::Result MWMechanics::Alchemy::create (const std::string& name, int& count)
+MWMechanics::Alchemy::Result MWMechanics::Alchemy::create(const std::string& name, int& count)
 {
     setPotionName(name);
     Result readyStatus = getReadyStatus();
@@ -520,7 +537,7 @@ MWMechanics::Alchemy::Result MWMechanics::Alchemy::create (const std::string& na
     return result;
 }
 
-MWMechanics::Alchemy::Result MWMechanics::Alchemy::createSingle ()
+MWMechanics::Alchemy::Result MWMechanics::Alchemy::createSingle()
 {
     if (beginEffects() == endEffects())
     {
@@ -551,11 +568,15 @@ std::string MWMechanics::Alchemy::suggestPotionName()
         return "";
 
     int effectId = effects.begin()->mId;
-    return MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
-                ESM::MagicEffect::effectIdToString(effectId))->mValue.getString();
+    return MWBase::Environment::get()
+        .getWorld()
+        ->getStore()
+        .get<ESM::GameSetting>()
+        .find(ESM::MagicEffect::effectIdToString(effectId))
+        ->mValue.getString();
 }
 
-std::vector<std::string> MWMechanics::Alchemy::effectsDescription (const MWWorld::ConstPtr &ptr, const int alchemySkill)
+std::vector<std::string> MWMechanics::Alchemy::effectsDescription(const MWWorld::ConstPtr& ptr, const int alchemySkill)
 {
     std::vector<std::string> effects;
 
@@ -583,7 +604,6 @@ std::vector<std::string> MWMechanics::Alchemy::effectsDescription (const MWWorld
                 effect += " " + gmst.find(ESM::Attribute::sGmstAttributeIds[attributeID])->mValue.getString();
 
             effects.push_back(effect);
-
         }
     }
     return effects;
diff --git a/apps/openmw/mwmechanics/alchemy.hpp b/apps/openmw/mwmechanics/alchemy.hpp
index 8c91a81177..ab6225e544 100644
--- a/apps/openmw/mwmechanics/alchemy.hpp
+++ b/apps/openmw/mwmechanics/alchemy.hpp
@@ -1,8 +1,8 @@
 #ifndef GAME_MWMECHANICS_ALCHEMY_H
 #define GAME_MWMECHANICS_ALCHEMY_H
 
-#include <vector>
 #include <set>
+#include <vector>
 
 #include <components/esm3/effectlist.hpp>
 
@@ -20,121 +20,118 @@ namespace MWMechanics
     /// \brief Potion creation via alchemy skill
     class Alchemy
     {
-        public:
-
-            Alchemy();
+    public:
+        Alchemy();
 
-            typedef std::vector<MWWorld::Ptr> TToolsContainer;
-            typedef TToolsContainer::const_iterator TToolsIterator;
+        typedef std::vector<MWWorld::Ptr> TToolsContainer;
+        typedef TToolsContainer::const_iterator TToolsIterator;
 
-            typedef std::vector<MWWorld::Ptr> TIngredientsContainer;
-            typedef TIngredientsContainer::const_iterator TIngredientsIterator;
+        typedef std::vector<MWWorld::Ptr> TIngredientsContainer;
+        typedef TIngredientsContainer::const_iterator TIngredientsIterator;
 
-            typedef std::vector<ESM::ENAMstruct> TEffectsContainer;
-            typedef TEffectsContainer::const_iterator TEffectsIterator;
+        typedef std::vector<ESM::ENAMstruct> TEffectsContainer;
+        typedef TEffectsContainer::const_iterator TEffectsIterator;
 
-            enum Result
-            {
-                Result_Success,
+        enum Result
+        {
+            Result_Success,
 
-                Result_NoMortarAndPestle,
-                Result_LessThanTwoIngredients,
-                Result_NoName,
-                Result_NoEffects,
-                Result_RandomFailure
-            };
+            Result_NoMortarAndPestle,
+            Result_LessThanTwoIngredients,
+            Result_NoName,
+            Result_NoEffects,
+            Result_RandomFailure
+        };
 
-        private:
+    private:
+        MWWorld::Ptr mAlchemist;
+        TToolsContainer mTools;
+        TIngredientsContainer mIngredients;
+        TEffectsContainer mEffects;
+        int mValue;
+        std::string mPotionName;
 
-            MWWorld::Ptr mAlchemist;
-            TToolsContainer mTools;
-            TIngredientsContainer mIngredients;
-            TEffectsContainer mEffects;
-            int mValue;
-            std::string mPotionName;
+        void applyTools(int flags, float& value) const;
 
-            void applyTools (int flags, float& value) const;
+        void updateEffects();
 
-            void updateEffects();
+        Result getReadyStatus() const;
 
-            Result getReadyStatus() const;
+        const ESM::Potion* getRecord(const ESM::Potion& toFind) const;
+        ///< Try to find a potion record similar to \a toFind in the record store, or return 0 if not found
+        /// \note Does not account for record ID, model or icon
 
-            const ESM::Potion *getRecord(const ESM::Potion& toFind) const;
-            ///< Try to find a potion record similar to \a toFind in the record store, or return 0 if not found
-            /// \note Does not account for record ID, model or icon
+        void removeIngredients();
+        ///< Remove selected ingredients from alchemist's inventory, cleanup selected ingredients and
+        /// update effect list accordingly.
 
-            void removeIngredients();
-            ///< Remove selected ingredients from alchemist's inventory, cleanup selected ingredients and
-            /// update effect list accordingly.
+        void addPotion(const std::string& name);
+        ///< Add a potion to the alchemist's inventory.
 
-            void addPotion (const std::string& name);
-            ///< Add a potion to the alchemist's inventory.
+        void increaseSkill();
+        ///< Increase alchemist's skill.
 
-            void increaseSkill();
-            ///< Increase alchemist's skill.
+        Result createSingle();
+        ///< Try to create a potion from the ingredients, place it in the inventory of the alchemist and
+        /// adjust the skills of the alchemist accordingly.
 
-            Result createSingle ();
-            ///< Try to create a potion from the ingredients, place it in the inventory of the alchemist and
-            /// adjust the skills of the alchemist accordingly.
+        float getAlchemyFactor() const;
 
-            float getAlchemyFactor() const;
+        int countIngredients() const;
 
-            int countIngredients() const;
+        TEffectsIterator beginEffects() const;
 
-            TEffectsIterator beginEffects() const;
+        TEffectsIterator endEffects() const;
 
-            TEffectsIterator endEffects() const;
+    public:
+        int countPotionsToBrew() const;
+        ///< calculates maximum amount of potions, which you can make from selected ingredients
 
-        public:
-            int countPotionsToBrew() const;
-            ///< calculates maximum amount of potions, which you can make from selected ingredients
+        static bool knownEffect(unsigned int potionEffectIndex, const MWWorld::Ptr& npc);
+        ///< Does npc have sufficient alchemy skill to know about this potion effect?
 
-            static bool knownEffect (unsigned int potionEffectIndex, const MWWorld::Ptr& npc);
-            ///< Does npc have sufficient alchemy skill to know about this potion effect?
+        void setAlchemist(const MWWorld::Ptr& npc);
+        ///< Set alchemist and configure alchemy setup accordingly. \a npc may be empty to indicate that
+        /// there is no alchemist (alchemy session has ended).
 
-            void setAlchemist (const MWWorld::Ptr& npc);
-            ///< Set alchemist and configure alchemy setup accordingly. \a npc may be empty to indicate that
-            /// there is no alchemist (alchemy session has ended).
+        TToolsIterator beginTools() const;
+        ///< \attention Iterates over tool slots, not over tools. Some of the slots may be empty.
 
-            TToolsIterator beginTools() const;
-            ///< \attention Iterates over tool slots, not over tools. Some of the slots may be empty.
+        TToolsIterator endTools() const;
 
-            TToolsIterator endTools() const;
+        TIngredientsIterator beginIngredients() const;
+        ///< \attention Iterates over ingredient slots, not over ingredients. Some of the slots may be empty.
 
-            TIngredientsIterator beginIngredients() const;
-            ///< \attention Iterates over ingredient slots, not over ingredients. Some of the slots may be empty.
+        TIngredientsIterator endIngredients() const;
 
-            TIngredientsIterator endIngredients() const;
+        void clear();
+        ///< Remove alchemist, tools and ingredients.
 
-            void clear();
-            ///< Remove alchemist, tools and ingredients.
+        void setPotionName(const std::string& name);
+        ///< Set name of potion to create
 
-            void setPotionName(const std::string& name);
-            ///< Set name of potion to create
+        std::set<EffectKey> listEffects() const;
+        ///< List all effects shared by at least two ingredients.
 
-            std::set<EffectKey> listEffects() const;
-            ///< List all effects shared by at least two ingredients.
+        int addIngredient(const MWWorld::Ptr& ingredient);
+        ///< Add ingredient into the next free slot.
+        ///
+        /// \return Slot index or -1, if adding failed because of no free slot or the ingredient type being
+        /// listed already.
 
-            int addIngredient (const MWWorld::Ptr& ingredient);
-            ///< Add ingredient into the next free slot.
-            ///
-            /// \return Slot index or -1, if adding failed because of no free slot or the ingredient type being
-            /// listed already.
+        void removeIngredient(int index);
+        ///< Remove ingredient from slot (calling this function on an empty slot is a no-op).
 
-            void removeIngredient (int index);
-            ///< Remove ingredient from slot (calling this function on an empty slot is a no-op).
+        std::string suggestPotionName();
+        ///< Suggest a name for the potion, based on the current effects
 
-            std::string suggestPotionName ();
-            ///< Suggest a name for the potion, based on the current effects
+        Result create(const std::string& name, int& count);
+        ///< Try to create potions from the ingredients, place them in the inventory of the alchemist and
+        /// adjust the skills of the alchemist accordingly.
+        /// \param name must not be an empty string, or Result_NoName is returned
 
-            Result create (const std::string& name, int& count);
-            ///< Try to create potions from the ingredients, place them in the inventory of the alchemist and
-            /// adjust the skills of the alchemist accordingly.
-            /// \param name must not be an empty string, or Result_NoName is returned
-
-            static std::vector<std::string> effectsDescription (const MWWorld::ConstPtr &ptr, const int alchemySKill);
+        static std::vector<std::string> effectsDescription(const MWWorld::ConstPtr& ptr, const int alchemySKill);
     };
 }
 
 #endif
-
diff --git a/apps/openmw/mwmechanics/autocalcspell.cpp b/apps/openmw/mwmechanics/autocalcspell.cpp
index fd7bcd7d5e..72398e456d 100644
--- a/apps/openmw/mwmechanics/autocalcspell.cpp
+++ b/apps/openmw/mwmechanics/autocalcspell.cpp
@@ -2,15 +2,15 @@
 
 #include <limits>
 
-#include <components/esm3/loadspel.hpp>
-#include <components/esm3/loadrace.hpp>
 #include <components/esm/attr.hpp>
 #include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadspel.hpp>
 
 #include "../mwworld/esmstore.hpp"
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
 #include "spellutil.hpp"
 
@@ -26,20 +26,21 @@ namespace MWMechanics
         std::string mWeakestSpell;
     };
 
-    std::vector<std::string> autoCalcNpcSpells(const int *actorSkills, const int *actorAttributes, const ESM::Race* race)
+    std::vector<std::string> autoCalcNpcSpells(
+        const int* actorSkills, const int* actorAttributes, const ESM::Race* race)
     {
-        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
         static const float fNPCbaseMagickaMult = gmst.find("fNPCbaseMagickaMult")->mValue.getFloat();
         float baseMagicka = fNPCbaseMagickaMult * actorAttributes[ESM::Attribute::Intelligence];
 
-        static const std::string schools[] = {
-            "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
-        };
+        static const std::string schools[]
+            = { "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration" };
         static int iAutoSpellSchoolMax[6];
         static bool init = false;
         if (!init)
         {
-            for (int i=0; i<6; ++i)
+            for (int i = 0; i < 6; ++i)
             {
                 const std::string& gmstName = "iAutoSpell" + schools[i] + "Max";
                 iAutoSpellSchoolMax[i] = gmst.find(gmstName)->mValue.getInteger();
@@ -48,7 +49,7 @@ namespace MWMechanics
         }
 
         std::map<int, SchoolCaps> schoolCaps;
-        for (int i=0; i<6; ++i)
+        for (int i = 0; i < 6; ++i)
         {
             SchoolCaps caps;
             caps.mCount = 0;
@@ -61,8 +62,7 @@ namespace MWMechanics
 
         std::vector<std::string> selectedSpells;
 
-        const MWWorld::Store<ESM::Spell> &spells =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>();
+        const MWWorld::Store<ESM::Spell>& spells = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>();
 
         // Note: the algorithm heavily depends on the traversal order of the spells. For vanilla-compatible results the
         // Store must preserve the record ordering as it was in the content files.
@@ -100,7 +100,8 @@ namespace MWMechanics
 
             if (cap.mReachedLimit)
             {
-                std::vector<std::string>::iterator found = std::find(selectedSpells.begin(), selectedSpells.end(), cap.mWeakestSpell);
+                std::vector<std::string>::iterator found
+                    = std::find(selectedSpells.begin(), selectedSpells.end(), cap.mWeakestSpell);
                 if (found != selectedSpells.end())
                     selectedSpells.erase(found);
 
@@ -110,19 +111,20 @@ namespace MWMechanics
                     const ESM::Spell* testSpell = spells.find(testSpellName);
                     int testSpellCost = MWMechanics::calcSpellCost(*testSpell);
 
-                    //int testSchool;
-                    //float dummySkillTerm;
-                    //calcWeakestSchool(testSpell, actorSkills, testSchool, dummySkillTerm);
+                    // int testSchool;
+                    // float dummySkillTerm;
+                    // calcWeakestSchool(testSpell, actorSkills, testSchool, dummySkillTerm);
 
                     // Note: if there are multiple spells with the same cost, we pick the first one we found.
                     // So the algorithm depends on the iteration order of the outer loop.
                     if (
-                            // There is a huge bug here. It is not checked that weakestSpell is of the correct school.
-                            // As result multiple SchoolCaps could have the same mWeakestSpell. Erasing the weakest spell would then fail if another school
-                            // already erased it, and so the number of spells would often exceed the sum of limits.
-                            // This bug cannot be fixed without significantly changing the results of the spell autocalc, which will not have been playtested.
-                            //testSchool == school &&
-                            testSpellCost < cap.mMinCost)
+                        // There is a huge bug here. It is not checked that weakestSpell is of the correct school.
+                        // As result multiple SchoolCaps could have the same mWeakestSpell. Erasing the weakest spell
+                        // would then fail if another school already erased it, and so the number of spells would often
+                        // exceed the sum of limits. This bug cannot be fixed without significantly changing the results
+                        // of the spell autocalc, which will not have been playtested.
+                        // testSchool == school &&
+                        testSpellCost < cap.mMinCost)
                     {
                         cap.mMinCost = testSpellCost;
                         cap.mWeakestSpell = testSpell->mId;
@@ -146,11 +148,13 @@ namespace MWMechanics
         return selectedSpells;
     }
 
-    std::vector<std::string> autoCalcPlayerSpells(const int* actorSkills, const int* actorAttributes, const ESM::Race* race)
+    std::vector<std::string> autoCalcPlayerSpells(
+        const int* actorSkills, const int* actorAttributes, const ESM::Race* race)
     {
         const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
 
-        static const float fPCbaseMagickaMult = esmStore.get<ESM::GameSetting>().find("fPCbaseMagickaMult")->mValue.getFloat();
+        static const float fPCbaseMagickaMult
+            = esmStore.get<ESM::GameSetting>().find("fPCbaseMagickaMult")->mValue.getFloat();
 
         float baseMagicka = fPCbaseMagickaMult * actorAttributes[ESM::Attribute::Intelligence];
         bool reachedLimit = false;
@@ -159,7 +163,7 @@ namespace MWMechanics
 
         std::vector<std::string> selectedSpells;
 
-        const MWWorld::Store<ESM::Spell> &spells = esmStore.get<ESM::Spell>();
+        const MWWorld::Store<ESM::Spell>& spells = esmStore.get<ESM::Spell>();
         for (const ESM::Spell& spell : spells)
         {
             if (spell.mData.mType != ESM::Spell::ST_Spell)
@@ -170,12 +174,15 @@ namespace MWMechanics
             int spellCost = MWMechanics::calcSpellCost(spell);
             if (reachedLimit && spellCost <= minCost)
                 continue;
-            if (race && std::find(race->mPowers.mList.begin(), race->mPowers.mList.end(), spell.mId) != race->mPowers.mList.end())
+            if (race
+                && std::find(race->mPowers.mList.begin(), race->mPowers.mList.end(), spell.mId)
+                    != race->mPowers.mList.end())
                 continue;
             if (baseMagicka < spellCost)
                 continue;
 
-            static const float fAutoPCSpellChance = esmStore.get<ESM::GameSetting>().find("fAutoPCSpellChance")->mValue.getFloat();
+            static const float fAutoPCSpellChance
+                = esmStore.get<ESM::GameSetting>().find("fAutoPCSpellChance")->mValue.getFloat();
             if (calcAutoCastChance(&spell, actorSkills, actorAttributes, -1) < fAutoPCSpellChance)
                 continue;
 
@@ -186,7 +193,8 @@ namespace MWMechanics
 
             if (reachedLimit)
             {
-                std::vector<std::string>::iterator it = std::find(selectedSpells.begin(), selectedSpells.end(), weakestSpell->mId);
+                std::vector<std::string>::iterator it
+                    = std::find(selectedSpells.begin(), selectedSpells.end(), weakestSpell->mId);
                 if (it != selectedSpells.end())
                     selectedSpells.erase(it);
 
@@ -209,7 +217,8 @@ namespace MWMechanics
                     weakestSpell = &spell;
                     minCost = MWMechanics::calcSpellCost(*weakestSpell);
                 }
-                static const unsigned int iAutoPCSpellMax = esmStore.get<ESM::GameSetting>().find("iAutoPCSpellMax")->mValue.getInteger();
+                static const unsigned int iAutoPCSpellMax
+                    = esmStore.get<ESM::GameSetting>().find("iAutoPCSpellMax")->mValue.getInteger();
                 if (selectedSpells.size() == iAutoPCSpellMax)
                     reachedLimit = true;
             }
@@ -218,23 +227,29 @@ namespace MWMechanics
         return selectedSpells;
     }
 
-    bool attrSkillCheck (const ESM::Spell* spell, const int* actorSkills, const int* actorAttributes)
+    bool attrSkillCheck(const ESM::Spell* spell, const int* actorSkills, const int* actorAttributes)
     {
         for (const auto& spellEffect : spell->mEffects.mList)
         {
-            const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(spellEffect.mEffectID);
-            static const int iAutoSpellAttSkillMin = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("iAutoSpellAttSkillMin")->mValue.getInteger();
+            const ESM::MagicEffect* magicEffect
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(spellEffect.mEffectID);
+            static const int iAutoSpellAttSkillMin = MWBase::Environment::get()
+                                                         .getWorld()
+                                                         ->getStore()
+                                                         .get<ESM::GameSetting>()
+                                                         .find("iAutoSpellAttSkillMin")
+                                                         ->mValue.getInteger();
 
             if ((magicEffect->mData.mFlags & ESM::MagicEffect::TargetSkill))
             {
-                assert (spellEffect.mSkill >= 0 && spellEffect.mSkill < ESM::Skill::Length);
+                assert(spellEffect.mSkill >= 0 && spellEffect.mSkill < ESM::Skill::Length);
                 if (actorSkills[spellEffect.mSkill] < iAutoSpellAttSkillMin)
                     return false;
             }
 
             if ((magicEffect->mData.mFlags & ESM::MagicEffect::TargetAttribute))
             {
-                assert (spellEffect.mAttribute >= 0 && spellEffect.mAttribute < ESM::Attribute::Length);
+                assert(spellEffect.mAttribute >= 0 && spellEffect.mAttribute < ESM::Attribute::Length);
                 if (actorAttributes[spellEffect.mAttribute] < iAutoSpellAttSkillMin)
                     return false;
             }
@@ -243,13 +258,14 @@ namespace MWMechanics
         return true;
     }
 
-    void calcWeakestSchool (const ESM::Spell* spell, const int* actorSkills, int& effectiveSchool, float& skillTerm)
+    void calcWeakestSchool(const ESM::Spell* spell, const int* actorSkills, int& effectiveSchool, float& skillTerm)
     {
         // Morrowind for some reason uses a formula slightly different from magicka cost calculation
         float minChance = std::numeric_limits<float>::max();
         for (const ESM::ENAMstruct& effect : spell->mEffects.mList)
         {
-            const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effect.mEffectID);
+            const ESM::MagicEffect* magicEffect
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effect.mEffectID);
 
             int minMagn = 1;
             int maxMagn = 1;
@@ -265,8 +281,12 @@ namespace MWMechanics
             if (!(magicEffect->mData.mFlags & ESM::MagicEffect::AppliedOnce))
                 duration = std::max(1, duration);
 
-            static const float fEffectCostMult = MWBase::Environment::get().getWorld()->getStore()
-                .get<ESM::GameSetting>().find("fEffectCostMult")->mValue.getFloat();
+            static const float fEffectCostMult = MWBase::Environment::get()
+                                                     .getWorld()
+                                                     ->getStore()
+                                                     .get<ESM::GameSetting>()
+                                                     .find("fEffectCostMult")
+                                                     ->mValue.getFloat();
 
             float x = 0.5 * (std::max(1, minMagn) + std::max(1, maxMagn));
             x *= 0.1 * magicEffect->mData.mBaseCost;
@@ -287,7 +307,8 @@ namespace MWMechanics
         }
     }
 
-    float calcAutoCastChance(const ESM::Spell *spell, const int *actorSkills, const int *actorAttributes, int effectiveSchool)
+    float calcAutoCastChance(
+        const ESM::Spell* spell, const int* actorSkills, const int* actorAttributes, int effectiveSchool)
     {
         if (spell->mData.mType != ESM::Spell::ST_Spell)
             return 100.f;
@@ -299,11 +320,11 @@ namespace MWMechanics
         if (effectiveSchool != -1)
             skillTerm = 2.f * actorSkills[spellSchoolToSkill(effectiveSchool)];
         else
-            calcWeakestSchool(spell, actorSkills, effectiveSchool, skillTerm); // Note effectiveSchool is unused after this
+            calcWeakestSchool(
+                spell, actorSkills, effectiveSchool, skillTerm); // Note effectiveSchool is unused after this
 
         float castChance = skillTerm - MWMechanics::calcSpellCost(*spell)
-            + 0.2f * actorAttributes[ESM::Attribute::Willpower]
-            + 0.1f * actorAttributes[ESM::Attribute::Luck];
+            + 0.2f * actorAttributes[ESM::Attribute::Willpower] + 0.1f * actorAttributes[ESM::Attribute::Luck];
         return castChance;
     }
 }
diff --git a/apps/openmw/mwmechanics/autocalcspell.hpp b/apps/openmw/mwmechanics/autocalcspell.hpp
index 460713ae37..444077f3fe 100644
--- a/apps/openmw/mwmechanics/autocalcspell.hpp
+++ b/apps/openmw/mwmechanics/autocalcspell.hpp
@@ -13,20 +13,23 @@ namespace ESM
 namespace MWMechanics
 {
 
-/// Contains algorithm for calculating an NPC's spells based on stats
-/// @note We might want to move this code to a component later, so the editor can use it for preview purposes
+    /// Contains algorithm for calculating an NPC's spells based on stats
+    /// @note We might want to move this code to a component later, so the editor can use it for preview purposes
 
-std::vector<std::string> autoCalcNpcSpells(const int* actorSkills, const int* actorAttributes, const ESM::Race* race);
+    std::vector<std::string> autoCalcNpcSpells(
+        const int* actorSkills, const int* actorAttributes, const ESM::Race* race);
 
-std::vector<std::string> autoCalcPlayerSpells(const int* actorSkills, const int* actorAttributes, const ESM::Race* race);
+    std::vector<std::string> autoCalcPlayerSpells(
+        const int* actorSkills, const int* actorAttributes, const ESM::Race* race);
 
-// Helpers
+    // Helpers
 
-bool attrSkillCheck (const ESM::Spell* spell, const int* actorSkills, const int* actorAttributes);
+    bool attrSkillCheck(const ESM::Spell* spell, const int* actorSkills, const int* actorAttributes);
 
-void calcWeakestSchool(const ESM::Spell* spell, const int* actorSkills, int& effectiveSchool, float& skillTerm);
+    void calcWeakestSchool(const ESM::Spell* spell, const int* actorSkills, int& effectiveSchool, float& skillTerm);
 
-float calcAutoCastChance(const ESM::Spell* spell, const int* actorSkills, const int* actorAttributes, int effectiveSchool);
+    float calcAutoCastChance(
+        const ESM::Spell* spell, const int* actorSkills, const int* actorAttributes, int effectiveSchool);
 
 }
 
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 7f14185ad2..76f83eb277 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -21,11 +21,11 @@
 
 #include <sstream>
 
+#include <components/esm/records.hpp>
 #include <components/misc/mathutil.hpp>
+#include <components/misc/resourcehelpers.hpp>
 #include <components/misc/rng.hpp>
 #include <components/misc/strings/algorithm.hpp>
-#include <components/misc/resourcehelpers.hpp>
-#include <components/esm/records.hpp>
 
 #include <components/settings/settings.hpp>
 
@@ -35,2766 +35,2875 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
-#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/player.hpp"
 #include "../mwworld/spellcaststate.hpp"
 
+#include "actorutil.hpp"
 #include "aicombataction.hpp"
+#include "creaturestats.hpp"
 #include "movement.hpp"
 #include "npcstats.hpp"
-#include "creaturestats.hpp"
 #include "security.hpp"
-#include "actorutil.hpp"
 #include "spellcasting.hpp"
 #include "weapontype.hpp"
 
 namespace
 {
 
-std::string_view getBestAttack(const ESM::Weapon* weapon)
-{
-    int slash = weapon->mData.mSlash[0] + weapon->mData.mSlash[1];
-    int chop = weapon->mData.mChop[0] + weapon->mData.mChop[1];
-    int thrust = weapon->mData.mThrust[0] + weapon->mData.mThrust[1];
-    if (slash == chop && slash == thrust)
-        return "slash";
-    else if (thrust >= chop && thrust >= slash)
-        return "thrust";
-    else if (slash >= chop && slash >= thrust)
-        return "slash";
-    else
-        return "chop";
-}
-
-// Converts a movement Run state to its equivalent Walk state, if there is one.
-MWMechanics::CharacterState runStateToWalkState (MWMechanics::CharacterState state)
-{
-    using namespace MWMechanics;
-    switch (state)
-    {
-        case CharState_RunForward: return CharState_WalkForward;
-        case CharState_RunBack: return CharState_WalkBack;
-        case CharState_RunLeft: return CharState_WalkLeft;
-        case CharState_RunRight: return CharState_WalkRight;
-        case CharState_SwimRunForward: return CharState_SwimWalkForward;
-        case CharState_SwimRunBack: return CharState_SwimWalkBack;
-        case CharState_SwimRunLeft: return CharState_SwimWalkLeft;
-        case CharState_SwimRunRight: return CharState_SwimWalkRight;
-        default: return state;
-    }
-}
-
-// Converts a Hit state to its equivalent Death state.
-MWMechanics::CharacterState hitStateToDeathState (MWMechanics::CharacterState state)
-{
-    using namespace MWMechanics;
-    switch (state)
+    std::string_view getBestAttack(const ESM::Weapon* weapon)
     {
-        case CharState_SwimKnockDown: return CharState_SwimDeathKnockDown;
-        case CharState_SwimKnockOut: return CharState_SwimDeathKnockOut;
-        case CharState_KnockDown: return CharState_DeathKnockDown;
-        case CharState_KnockOut: return CharState_DeathKnockOut;
-        default: return CharState_None;
-    }
-}
-
-// Converts a movement state to its equivalent base animation group as long as it is a movement state.
-std::string_view movementStateToAnimGroup(MWMechanics::CharacterState state)
-{
-    using namespace MWMechanics;
-    switch (state)
-    {
-        case CharState_WalkForward: return "walkforward";
-        case CharState_WalkBack: return "walkback";
-        case CharState_WalkLeft: return "walkleft";
-        case CharState_WalkRight: return "walkright";
-
-        case CharState_SwimWalkForward: return "swimwalkforward";
-        case CharState_SwimWalkBack: return "swimwalkback";
-        case CharState_SwimWalkLeft: return "swimwalkleft";
-        case CharState_SwimWalkRight: return "swimwalkright";
-
-        case CharState_RunForward: return "runforward";
-        case CharState_RunBack: return "runback";
-        case CharState_RunLeft: return "runleft";
-        case CharState_RunRight: return "runright";
-
-        case CharState_SwimRunForward: return "swimrunforward";
-        case CharState_SwimRunBack: return "swimrunback";
-        case CharState_SwimRunLeft: return "swimrunleft";
-        case CharState_SwimRunRight: return "swimrunright";
-
-        case CharState_SneakForward: return "sneakforward";
-        case CharState_SneakBack: return "sneakback";
-        case CharState_SneakLeft: return "sneakleft";
-        case CharState_SneakRight: return "sneakright";
-
-        case CharState_TurnLeft: return "turnleft";
-        case CharState_TurnRight: return "turnright";
-        case CharState_SwimTurnLeft: return "swimturnleft";
-        case CharState_SwimTurnRight: return "swimturnright";
-        default: return {};
-    }
-}
+        int slash = weapon->mData.mSlash[0] + weapon->mData.mSlash[1];
+        int chop = weapon->mData.mChop[0] + weapon->mData.mChop[1];
+        int thrust = weapon->mData.mThrust[0] + weapon->mData.mThrust[1];
+        if (slash == chop && slash == thrust)
+            return "slash";
+        else if (thrust >= chop && thrust >= slash)
+            return "thrust";
+        else if (slash >= chop && slash >= thrust)
+            return "slash";
+        else
+            return "chop";
+    }
+
+    // Converts a movement Run state to its equivalent Walk state, if there is one.
+    MWMechanics::CharacterState runStateToWalkState(MWMechanics::CharacterState state)
+    {
+        using namespace MWMechanics;
+        switch (state)
+        {
+            case CharState_RunForward:
+                return CharState_WalkForward;
+            case CharState_RunBack:
+                return CharState_WalkBack;
+            case CharState_RunLeft:
+                return CharState_WalkLeft;
+            case CharState_RunRight:
+                return CharState_WalkRight;
+            case CharState_SwimRunForward:
+                return CharState_SwimWalkForward;
+            case CharState_SwimRunBack:
+                return CharState_SwimWalkBack;
+            case CharState_SwimRunLeft:
+                return CharState_SwimWalkLeft;
+            case CharState_SwimRunRight:
+                return CharState_SwimWalkRight;
+            default:
+                return state;
+        }
+    }
+
+    // Converts a Hit state to its equivalent Death state.
+    MWMechanics::CharacterState hitStateToDeathState(MWMechanics::CharacterState state)
+    {
+        using namespace MWMechanics;
+        switch (state)
+        {
+            case CharState_SwimKnockDown:
+                return CharState_SwimDeathKnockDown;
+            case CharState_SwimKnockOut:
+                return CharState_SwimDeathKnockOut;
+            case CharState_KnockDown:
+                return CharState_DeathKnockDown;
+            case CharState_KnockOut:
+                return CharState_DeathKnockOut;
+            default:
+                return CharState_None;
+        }
+    }
+
+    // Converts a movement state to its equivalent base animation group as long as it is a movement state.
+    std::string_view movementStateToAnimGroup(MWMechanics::CharacterState state)
+    {
+        using namespace MWMechanics;
+        switch (state)
+        {
+            case CharState_WalkForward:
+                return "walkforward";
+            case CharState_WalkBack:
+                return "walkback";
+            case CharState_WalkLeft:
+                return "walkleft";
+            case CharState_WalkRight:
+                return "walkright";
+
+            case CharState_SwimWalkForward:
+                return "swimwalkforward";
+            case CharState_SwimWalkBack:
+                return "swimwalkback";
+            case CharState_SwimWalkLeft:
+                return "swimwalkleft";
+            case CharState_SwimWalkRight:
+                return "swimwalkright";
+
+            case CharState_RunForward:
+                return "runforward";
+            case CharState_RunBack:
+                return "runback";
+            case CharState_RunLeft:
+                return "runleft";
+            case CharState_RunRight:
+                return "runright";
+
+            case CharState_SwimRunForward:
+                return "swimrunforward";
+            case CharState_SwimRunBack:
+                return "swimrunback";
+            case CharState_SwimRunLeft:
+                return "swimrunleft";
+            case CharState_SwimRunRight:
+                return "swimrunright";
+
+            case CharState_SneakForward:
+                return "sneakforward";
+            case CharState_SneakBack:
+                return "sneakback";
+            case CharState_SneakLeft:
+                return "sneakleft";
+            case CharState_SneakRight:
+                return "sneakright";
+
+            case CharState_TurnLeft:
+                return "turnleft";
+            case CharState_TurnRight:
+                return "turnright";
+            case CharState_SwimTurnLeft:
+                return "swimturnleft";
+            case CharState_SwimTurnRight:
+                return "swimturnright";
+            default:
+                return {};
+        }
+    }
+
+    // Converts a death state to its equivalent animation group as long as it is a death state.
+    std::string_view deathStateToAnimGroup(MWMechanics::CharacterState state)
+    {
+        using namespace MWMechanics;
+        switch (state)
+        {
+            case CharState_SwimDeath:
+                return "swimdeath";
+            case CharState_SwimDeathKnockDown:
+                return "swimdeathknockdown";
+            case CharState_SwimDeathKnockOut:
+                return "swimdeathknockout";
+            case CharState_DeathKnockDown:
+                return "deathknockdown";
+            case CharState_DeathKnockOut:
+                return "deathknockout";
+            case CharState_Death1:
+                return "death1";
+            case CharState_Death2:
+                return "death2";
+            case CharState_Death3:
+                return "death3";
+            case CharState_Death4:
+                return "death4";
+            case CharState_Death5:
+                return "death5";
+            default:
+                return {};
+        }
+    }
+
+    // Converts a hit state to its equivalent animation group as long as it is a hit state.
+    std::string hitStateToAnimGroup(MWMechanics::CharacterState state)
+    {
+        using namespace MWMechanics;
+        switch (state)
+        {
+            case CharState_SwimHit:
+                return "swimhit";
+            case CharState_SwimKnockDown:
+                return "swimknockdown";
+            case CharState_SwimKnockOut:
+                return "swimknockout";
+
+            case CharState_Hit:
+                return "hit";
+            case CharState_KnockDown:
+                return "knockdown";
+            case CharState_KnockOut:
+                return "knockout";
+
+            case CharState_Block:
+                return "shield";
+
+            default:
+                return {};
+        }
+    }
+
+    // Converts an idle state to its equivalent animation group.
+    std::string idleStateToAnimGroup(MWMechanics::CharacterState state)
+    {
+        using namespace MWMechanics;
+        switch (state)
+        {
+            case CharState_IdleSwim:
+                return "idleswim";
+            case CharState_IdleSneak:
+                return "idlesneak";
+            case CharState_Idle:
+            case CharState_SpecialIdle:
+                return "idle";
+            default:
+                return {};
+        }
+    }
 
-// Converts a death state to its equivalent animation group as long as it is a death state.
-std::string_view deathStateToAnimGroup(MWMechanics::CharacterState state)
-{
-    using namespace MWMechanics;
-    switch (state)
-    {
-        case CharState_SwimDeath: return "swimdeath";
-        case CharState_SwimDeathKnockDown: return "swimdeathknockdown";
-        case CharState_SwimDeathKnockOut: return "swimdeathknockout";
-        case CharState_DeathKnockDown: return "deathknockdown";
-        case CharState_DeathKnockOut: return "deathknockout";
-        case CharState_Death1: return "death1";
-        case CharState_Death2: return "death2";
-        case CharState_Death3: return "death3";
-        case CharState_Death4: return "death4";
-        case CharState_Death5: return "death5";
-        default: return {};
+    MWRender::Animation::AnimPriority getIdlePriority(MWMechanics::CharacterState state)
+    {
+        using namespace MWMechanics;
+        MWRender::Animation::AnimPriority priority(Priority_Default);
+        switch (state)
+        {
+            case CharState_IdleSwim:
+                return Priority_SwimIdle;
+            case CharState_IdleSneak:
+                priority[MWRender::Animation::BoneGroup_LowerBody] = Priority_SneakIdleLowerBody;
+                [[fallthrough]];
+            default:
+                return priority;
+        }
     }
-}
 
-// Converts a hit state to its equivalent animation group as long as it is a hit state.
-std::string hitStateToAnimGroup(MWMechanics::CharacterState state)
-{
-    using namespace MWMechanics;
-    switch (state)
+    float getFallDamage(const MWWorld::Ptr& ptr, float fallHeight)
     {
-        case CharState_SwimHit: return "swimhit";
-        case CharState_SwimKnockDown: return "swimknockdown";
-        case CharState_SwimKnockOut: return "swimknockout";
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+        const MWWorld::Store<ESM::GameSetting>& store = world->getStore().get<ESM::GameSetting>();
 
-        case CharState_Hit: return "hit";
-        case CharState_KnockDown: return "knockdown";
-        case CharState_KnockOut: return "knockout";
+        const float fallDistanceMin = store.find("fFallDamageDistanceMin")->mValue.getFloat();
 
-        case CharState_Block: return "shield";
+        if (fallHeight >= fallDistanceMin)
+        {
+            const float acrobaticsSkill = static_cast<float>(ptr.getClass().getSkill(ptr, ESM::Skill::Acrobatics));
+            const float jumpSpellBonus
+                = ptr.getClass().getCreatureStats(ptr).getMagicEffects().get(ESM::MagicEffect::Jump).getMagnitude();
+            const float fallAcroBase = store.find("fFallAcroBase")->mValue.getFloat();
+            const float fallAcroMult = store.find("fFallAcroMult")->mValue.getFloat();
+            const float fallDistanceBase = store.find("fFallDistanceBase")->mValue.getFloat();
+            const float fallDistanceMult = store.find("fFallDistanceMult")->mValue.getFloat();
 
-        default: return {};
-    }
-}
+            float x = fallHeight - fallDistanceMin;
+            x -= (1.5f * acrobaticsSkill) + jumpSpellBonus;
+            x = std::max(0.0f, x);
 
-// Converts an idle state to its equivalent animation group.
-std::string idleStateToAnimGroup(MWMechanics::CharacterState state)
-{
-    using namespace MWMechanics;
-    switch (state)
-    {
-        case CharState_IdleSwim:
-            return "idleswim";
-        case CharState_IdleSneak:
-            return "idlesneak";
-        case CharState_Idle:
-        case CharState_SpecialIdle:
-            return "idle";
-        default:
-            return {};
-    }
-}
+            float a = fallAcroBase + fallAcroMult * (100 - acrobaticsSkill);
+            x = fallDistanceBase + fallDistanceMult * x;
+            x *= a;
 
-MWRender::Animation::AnimPriority getIdlePriority(MWMechanics::CharacterState state)
-{
-    using namespace MWMechanics;
-    MWRender::Animation::AnimPriority priority(Priority_Default);
-    switch (state)
-    {
-        case CharState_IdleSwim:
-            return Priority_SwimIdle;
-        case CharState_IdleSneak:
-            priority[MWRender::Animation::BoneGroup_LowerBody] = Priority_SneakIdleLowerBody;
-            [[fallthrough]];
-        default:
-            return priority;
+            return x;
+        }
+        return 0.f;
     }
-}
 
-float getFallDamage(const MWWorld::Ptr& ptr, float fallHeight)
-{
-    MWBase::World *world = MWBase::Environment::get().getWorld();
-    const MWWorld::Store<ESM::GameSetting> &store = world->getStore().get<ESM::GameSetting>();
-
-    const float fallDistanceMin = store.find("fFallDamageDistanceMin")->mValue.getFloat();
-
-    if (fallHeight >= fallDistanceMin)
+    bool isRealWeapon(int weaponType)
     {
-        const float acrobaticsSkill = static_cast<float>(ptr.getClass().getSkill(ptr, ESM::Skill::Acrobatics));
-        const float jumpSpellBonus = ptr.getClass().getCreatureStats(ptr).getMagicEffects().get(ESM::MagicEffect::Jump).getMagnitude();
-        const float fallAcroBase = store.find("fFallAcroBase")->mValue.getFloat();
-        const float fallAcroMult = store.find("fFallAcroMult")->mValue.getFloat();
-        const float fallDistanceBase = store.find("fFallDistanceBase")->mValue.getFloat();
-        const float fallDistanceMult = store.find("fFallDistanceMult")->mValue.getFloat();
-
-        float x = fallHeight - fallDistanceMin;
-        x -= (1.5f * acrobaticsSkill) + jumpSpellBonus;
-        x = std::max(0.0f, x);
-
-        float a = fallAcroBase + fallAcroMult * (100 - acrobaticsSkill);
-        x = fallDistanceBase + fallDistanceMult * x;
-        x *= a;
-
-        return x;
+        return weaponType != ESM::Weapon::HandToHand && weaponType != ESM::Weapon::Spell
+            && weaponType != ESM::Weapon::None;
     }
-    return 0.f;
-}
-
-bool isRealWeapon(int weaponType)
-{
-    return weaponType != ESM::Weapon::HandToHand
-        && weaponType != ESM::Weapon::Spell
-        && weaponType != ESM::Weapon::None;
-}
 
 }
 
 namespace MWMechanics
 {
 
-std::string CharacterController::chooseRandomGroup (const std::string& prefix, int* num) const
-{
-    auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-
-    int numAnims=0;
-    while (mAnimation->hasAnimation(prefix + std::to_string(numAnims+1)))
-        ++numAnims;
-
-    int roll = Misc::Rng::rollDice(numAnims, prng) + 1; // [1, numAnims]
-    if (num)
-        *num = roll;
-    return prefix + std::to_string(roll);
-}
-
-
-void CharacterController::clearStateAnimation(std::string &anim) const
-{
-    if (anim.empty())
-        return;
-    if (mAnimation)
-        mAnimation->disable(anim);
-    anim.clear();
-}
-
-void CharacterController::resetCurrentJumpState()
-{
-    clearStateAnimation(mCurrentJump);
-    mJumpState = JumpState_None;
-}
-
-void CharacterController::resetCurrentMovementState()
-{
-    clearStateAnimation(mCurrentMovement);
-    mMovementState = CharState_None;
-}
-
-void CharacterController::resetCurrentIdleState()
-{
-    clearStateAnimation(mCurrentIdle);
-    mIdleState = CharState_None;
-}
-
-void CharacterController::resetCurrentHitState()
-{
-    clearStateAnimation(mCurrentHit);
-    mHitState = CharState_None;
-}
-
-void CharacterController::resetCurrentWeaponState()
-{
-    clearStateAnimation(mCurrentWeapon);
-    mUpperBodyState = UpperBodyState::None;
-}
+    std::string CharacterController::chooseRandomGroup(const std::string& prefix, int* num) const
+    {
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
 
-void CharacterController::resetCurrentDeathState()
-{
-    clearStateAnimation(mCurrentDeath);
-    mDeathState = CharState_None;
-}
+        int numAnims = 0;
+        while (mAnimation->hasAnimation(prefix + std::to_string(numAnims + 1)))
+            ++numAnims;
 
-void CharacterController::refreshHitRecoilAnims()
-{
-    auto& charClass = mPtr.getClass();
-    if (!charClass.isActor())
-        return;
-    const auto world = MWBase::Environment::get().getWorld();
-    auto& stats = charClass.getCreatureStats(mPtr);
-    bool knockout = stats.getFatigue().getCurrent() < 0 || stats.getFatigue().getBase() == 0;
-    bool recovery = stats.getHitRecovery();
-    bool knockdown = stats.getKnockedDown();
-    bool block = stats.getBlock();
-    bool isSwimming = world->isSwimming(mPtr);
+        int roll = Misc::Rng::rollDice(numAnims, prng) + 1; // [1, numAnims]
+        if (num)
+            *num = roll;
+        return prefix + std::to_string(roll);
+    }
 
-    if (mHitState != CharState_None)
+    void CharacterController::clearStateAnimation(std::string& anim) const
     {
-        if (!mAnimation->isPlaying(mCurrentHit))
-        {
-            mHitState = CharState_None;
-            mCurrentHit.clear();
-            stats.setKnockedDown(false);
-            stats.setHitRecovery(false);
-            stats.setBlock(false);
-            resetCurrentIdleState();
-        }
-        else if (isKnockedOut())
-            mAnimation->setLoopingEnabled(mCurrentHit, knockout);
-        return;
+        if (anim.empty())
+            return;
+        if (mAnimation)
+            mAnimation->disable(anim);
+        anim.clear();
     }
 
-    if (!knockout && !knockdown && !recovery && !block)
-        return;
-
-    MWRender::Animation::AnimPriority priority(Priority_Knockdown);
-    std::string_view startKey = "start";
-    std::string_view stopKey = "stop";
-    if (knockout)
+    void CharacterController::resetCurrentJumpState()
     {
-        mHitState = isSwimming ? CharState_SwimKnockOut : CharState_KnockOut;
-        stats.setKnockedDown(true);
+        clearStateAnimation(mCurrentJump);
+        mJumpState = JumpState_None;
     }
-    else if (knockdown)
+
+    void CharacterController::resetCurrentMovementState()
     {
-        mHitState = isSwimming ? CharState_SwimKnockDown : CharState_KnockDown;
+        clearStateAnimation(mCurrentMovement);
+        mMovementState = CharState_None;
     }
-    else if (recovery)
+
+    void CharacterController::resetCurrentIdleState()
     {
-        mHitState = isSwimming ? CharState_SwimHit : CharState_Hit;
-        priority = Priority_Hit;
+        clearStateAnimation(mCurrentIdle);
+        mIdleState = CharState_None;
     }
-    else if (block)
+
+    void CharacterController::resetCurrentHitState()
     {
-        mHitState = CharState_Block;
-        priority = Priority_Hit;
-        priority[MWRender::Animation::BoneGroup_LeftArm] = Priority_Block;
-        priority[MWRender::Animation::BoneGroup_LowerBody] = Priority_WeaponLowerBody;
-        startKey = "block start";
-        stopKey = "block stop";
+        clearStateAnimation(mCurrentHit);
+        mHitState = CharState_None;
     }
 
-    mCurrentHit = hitStateToAnimGroup(mHitState);
-
-    if (isRecovery())
+    void CharacterController::resetCurrentWeaponState()
     {
-        mCurrentHit = chooseRandomGroup(mCurrentHit);
-        if (mHitState == CharState_SwimHit && !mAnimation->hasAnimation(mCurrentHit))
-            mCurrentHit = chooseRandomGroup(hitStateToAnimGroup(CharState_Hit));
+        clearStateAnimation(mCurrentWeapon);
+        mUpperBodyState = UpperBodyState::None;
     }
 
-    if (!mAnimation->hasAnimation(mCurrentHit))
+    void CharacterController::resetCurrentDeathState()
     {
-        // The hit animation is missing. Reset the current hit state and immediately cancel all states as if the animation were instantaneous.
-        mHitState = CharState_None;
-        mCurrentHit.clear();
-        stats.setKnockedDown(false);
-        stats.setHitRecovery(false);
-        stats.setBlock(false);
-        resetCurrentIdleState();
-        return;
+        clearStateAnimation(mCurrentDeath);
+        mDeathState = CharState_None;
     }
 
-    // Cancel upper body animations
-    if (isKnockedOut() || isKnockedDown())
+    void CharacterController::refreshHitRecoilAnims()
     {
-        if (!mCurrentWeapon.empty())
-            mAnimation->disable(mCurrentWeapon);
-        if (mUpperBodyState > UpperBodyState::WeaponEquipped)
+        auto& charClass = mPtr.getClass();
+        if (!charClass.isActor())
+            return;
+        const auto world = MWBase::Environment::get().getWorld();
+        auto& stats = charClass.getCreatureStats(mPtr);
+        bool knockout = stats.getFatigue().getCurrent() < 0 || stats.getFatigue().getBase() == 0;
+        bool recovery = stats.getHitRecovery();
+        bool knockdown = stats.getKnockedDown();
+        bool block = stats.getBlock();
+        bool isSwimming = world->isSwimming(mPtr);
+
+        if (mHitState != CharState_None)
         {
-            mUpperBodyState = UpperBodyState::WeaponEquipped;
-            if (mWeaponType > ESM::Weapon::None)
-                mAnimation->showWeapons(true);
+            if (!mAnimation->isPlaying(mCurrentHit))
+            {
+                mHitState = CharState_None;
+                mCurrentHit.clear();
+                stats.setKnockedDown(false);
+                stats.setHitRecovery(false);
+                stats.setBlock(false);
+                resetCurrentIdleState();
+            }
+            else if (isKnockedOut())
+                mAnimation->setLoopingEnabled(mCurrentHit, knockout);
+            return;
         }
-        else if (mUpperBodyState < UpperBodyState::WeaponEquipped)
+
+        if (!knockout && !knockdown && !recovery && !block)
+            return;
+
+        MWRender::Animation::AnimPriority priority(Priority_Knockdown);
+        std::string_view startKey = "start";
+        std::string_view stopKey = "stop";
+        if (knockout)
         {
-            mUpperBodyState = UpperBodyState::None;
+            mHitState = isSwimming ? CharState_SwimKnockOut : CharState_KnockOut;
+            stats.setKnockedDown(true);
+        }
+        else if (knockdown)
+        {
+            mHitState = isSwimming ? CharState_SwimKnockDown : CharState_KnockDown;
+        }
+        else if (recovery)
+        {
+            mHitState = isSwimming ? CharState_SwimHit : CharState_Hit;
+            priority = Priority_Hit;
+        }
+        else if (block)
+        {
+            mHitState = CharState_Block;
+            priority = Priority_Hit;
+            priority[MWRender::Animation::BoneGroup_LeftArm] = Priority_Block;
+            priority[MWRender::Animation::BoneGroup_LowerBody] = Priority_WeaponLowerBody;
+            startKey = "block start";
+            stopKey = "block stop";
         }
-    }
 
-    mAnimation->play(mCurrentHit, priority, MWRender::Animation::BlendMask_All, true, 1, startKey, stopKey, 0.0f, ~0ul);
-}
+        mCurrentHit = hitStateToAnimGroup(mHitState);
 
-void CharacterController::refreshJumpAnims(JumpingState jump, bool force)
-{
-    if (!force && jump == mJumpState)
-        return;
+        if (isRecovery())
+        {
+            mCurrentHit = chooseRandomGroup(mCurrentHit);
+            if (mHitState == CharState_SwimHit && !mAnimation->hasAnimation(mCurrentHit))
+                mCurrentHit = chooseRandomGroup(hitStateToAnimGroup(CharState_Hit));
+        }
 
-    if (jump == JumpState_None)
-    {
-        if (!mCurrentJump.empty())
+        if (!mAnimation->hasAnimation(mCurrentHit))
+        {
+            // The hit animation is missing. Reset the current hit state and immediately cancel all states as if the
+            // animation were instantaneous.
+            mHitState = CharState_None;
+            mCurrentHit.clear();
+            stats.setKnockedDown(false);
+            stats.setHitRecovery(false);
+            stats.setBlock(false);
             resetCurrentIdleState();
-        resetCurrentJumpState();
-        return;
-    }
+            return;
+        }
 
-    std::string_view weapShortGroup = getWeaponShortGroup(mWeaponType);
-    std::string jumpAnimName = "jump";
-    jumpAnimName += weapShortGroup;
-    MWRender::Animation::BlendMask jumpmask = MWRender::Animation::BlendMask_All;
-    if (!weapShortGroup.empty() && !mAnimation->hasAnimation(jumpAnimName))
-        jumpAnimName = fallbackShortWeaponGroup("jump", &jumpmask);
+        // Cancel upper body animations
+        if (isKnockedOut() || isKnockedDown())
+        {
+            if (!mCurrentWeapon.empty())
+                mAnimation->disable(mCurrentWeapon);
+            if (mUpperBodyState > UpperBodyState::WeaponEquipped)
+            {
+                mUpperBodyState = UpperBodyState::WeaponEquipped;
+                if (mWeaponType > ESM::Weapon::None)
+                    mAnimation->showWeapons(true);
+            }
+            else if (mUpperBodyState < UpperBodyState::WeaponEquipped)
+            {
+                mUpperBodyState = UpperBodyState::None;
+            }
+        }
 
-    if (!mAnimation->hasAnimation(jumpAnimName))
-    {
-        if (!mCurrentJump.empty())
-            resetCurrentIdleState();
-        resetCurrentJumpState();
-        return;
+        mAnimation->play(
+            mCurrentHit, priority, MWRender::Animation::BlendMask_All, true, 1, startKey, stopKey, 0.0f, ~0ul);
     }
 
-    bool startAtLoop = (jump == mJumpState);
-    mJumpState = jump;
-    clearStateAnimation(mCurrentJump);
-
-    mCurrentJump = jumpAnimName;
-    if(mJumpState == JumpState_InAir)
-        mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, false, 1.0f, startAtLoop ? "loop start" : "start", "stop", 0.f, ~0ul);
-    else if (mJumpState == JumpState_Landing)
-        mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, true, 1.0f, "loop stop", "stop", 0.0f, 0);
-}
-
-bool CharacterController::onOpen() const
-{
-    if (mPtr.getType() == ESM::Container::sRecordId)
+    void CharacterController::refreshJumpAnims(JumpingState jump, bool force)
     {
-        if (!mAnimation->hasAnimation("containeropen"))
-            return true;
-
-        if (mAnimation->isPlaying("containeropen"))
-            return false;
-
-        if (mAnimation->isPlaying("containerclose"))
-            return false;
+        if (!force && jump == mJumpState)
+            return;
 
-        mAnimation->play("containeropen", Priority_Persistent, MWRender::Animation::BlendMask_All, false, 1.0f, "start", "stop", 0.f, 0);
-        if (mAnimation->isPlaying("containeropen"))
-            return false;
-    }
+        if (jump == JumpState_None)
+        {
+            if (!mCurrentJump.empty())
+                resetCurrentIdleState();
+            resetCurrentJumpState();
+            return;
+        }
 
-    return true;
-}
+        std::string_view weapShortGroup = getWeaponShortGroup(mWeaponType);
+        std::string jumpAnimName = "jump";
+        jumpAnimName += weapShortGroup;
+        MWRender::Animation::BlendMask jumpmask = MWRender::Animation::BlendMask_All;
+        if (!weapShortGroup.empty() && !mAnimation->hasAnimation(jumpAnimName))
+            jumpAnimName = fallbackShortWeaponGroup("jump", &jumpmask);
 
-void CharacterController::onClose() const
-{
-    if (mPtr.getType() == ESM::Container::sRecordId)
-    {
-        if (!mAnimation->hasAnimation("containerclose"))
+        if (!mAnimation->hasAnimation(jumpAnimName))
+        {
+            if (!mCurrentJump.empty())
+                resetCurrentIdleState();
+            resetCurrentJumpState();
             return;
+        }
 
-        float complete, startPoint = 0.f;
-        bool animPlaying = mAnimation->getInfo("containeropen", &complete);
-        if (animPlaying)
-            startPoint = 1.f - complete;
+        bool startAtLoop = (jump == mJumpState);
+        mJumpState = jump;
+        clearStateAnimation(mCurrentJump);
 
-        mAnimation->play("containerclose", Priority_Persistent, MWRender::Animation::BlendMask_All, false, 1.0f, "start", "stop", startPoint, 0);
+        mCurrentJump = jumpAnimName;
+        if (mJumpState == JumpState_InAir)
+            mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, false, 1.0f, startAtLoop ? "loop start" : "start",
+                "stop", 0.f, ~0ul);
+        else if (mJumpState == JumpState_Landing)
+            mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, true, 1.0f, "loop stop", "stop", 0.0f, 0);
     }
-}
 
-std::string_view CharacterController::getWeaponAnimation(int weaponType) const
-{
-    std::string_view weaponGroup = getWeaponType(weaponType)->mLongGroup;
-    if (isRealWeapon(weaponType) && !mAnimation->hasAnimation(weaponGroup))
+    bool CharacterController::onOpen() const
     {
-        static const std::string_view oneHandFallback = getWeaponType(ESM::Weapon::LongBladeOneHand)->mLongGroup;
-        static const std::string_view twoHandFallback = getWeaponType(ESM::Weapon::LongBladeTwoHand)->mLongGroup;
-
-        const ESM::WeaponType* weapInfo = getWeaponType(weaponType);
-
-        // For real two-handed melee weapons use 2h swords animations as fallback, otherwise use the 1h ones
-        if (weapInfo->mFlags & ESM::WeaponType::TwoHanded && weapInfo->mWeaponClass == ESM::WeaponType::Melee)
-            weaponGroup = twoHandFallback;
-        else
-            weaponGroup = oneHandFallback;
-    }
-    else if (weaponType == ESM::Weapon::HandToHand && !mPtr.getClass().isBipedal(mPtr))
-        return "attack1";
+        if (mPtr.getType() == ESM::Container::sRecordId)
+        {
+            if (!mAnimation->hasAnimation("containeropen"))
+                return true;
 
-    return weaponGroup;
-}
+            if (mAnimation->isPlaying("containeropen"))
+                return false;
 
-std::string_view CharacterController::getWeaponShortGroup(int weaponType) const
-{
-    if (weaponType == ESM::Weapon::HandToHand && !mPtr.getClass().isBipedal(mPtr))
-        return {};
-    return getWeaponType(weaponType)->mShortGroup;
-}
+            if (mAnimation->isPlaying("containerclose"))
+                return false;
 
-std::string CharacterController::fallbackShortWeaponGroup(const std::string& baseGroupName, MWRender::Animation::BlendMask* blendMask) const
-{
-    if (!isRealWeapon(mWeaponType))
-    {
-        if (blendMask != nullptr)
-            *blendMask = MWRender::Animation::BlendMask_LowerBody;
+            mAnimation->play("containeropen", Priority_Persistent, MWRender::Animation::BlendMask_All, false, 1.0f,
+                "start", "stop", 0.f, 0);
+            if (mAnimation->isPlaying("containeropen"))
+                return false;
+        }
 
-        return baseGroupName;
+        return true;
     }
 
-    static const std::string_view oneHandFallback = getWeaponShortGroup(ESM::Weapon::LongBladeOneHand);
-    static const std::string_view twoHandFallback = getWeaponShortGroup(ESM::Weapon::LongBladeTwoHand);
-
-    std::string groupName = baseGroupName;
-    const ESM::WeaponType* weapInfo = getWeaponType(mWeaponType);
+    void CharacterController::onClose() const
+    {
+        if (mPtr.getType() == ESM::Container::sRecordId)
+        {
+            if (!mAnimation->hasAnimation("containerclose"))
+                return;
 
-    // For real two-handed melee weapons use 2h swords animations as fallback, otherwise use the 1h ones
-    if (weapInfo->mFlags & ESM::WeaponType::TwoHanded && weapInfo->mWeaponClass == ESM::WeaponType::Melee)
-        groupName += twoHandFallback;
-    else
-        groupName += oneHandFallback;
+            float complete, startPoint = 0.f;
+            bool animPlaying = mAnimation->getInfo("containeropen", &complete);
+            if (animPlaying)
+                startPoint = 1.f - complete;
 
-    // Special case for crossbows - we shouls apply 1h animations a fallback only for lower body
-    if (mWeaponType == ESM::Weapon::MarksmanCrossbow && blendMask != nullptr)
-        *blendMask = MWRender::Animation::BlendMask_LowerBody;
+            mAnimation->play("containerclose", Priority_Persistent, MWRender::Animation::BlendMask_All, false, 1.0f,
+                "start", "stop", startPoint, 0);
+        }
+    }
 
-    if (!mAnimation->hasAnimation(groupName))
+    std::string_view CharacterController::getWeaponAnimation(int weaponType) const
     {
-        groupName = baseGroupName;
-        if (blendMask != nullptr)
-            *blendMask = MWRender::Animation::BlendMask_LowerBody;
-    }
+        std::string_view weaponGroup = getWeaponType(weaponType)->mLongGroup;
+        if (isRealWeapon(weaponType) && !mAnimation->hasAnimation(weaponGroup))
+        {
+            static const std::string_view oneHandFallback = getWeaponType(ESM::Weapon::LongBladeOneHand)->mLongGroup;
+            static const std::string_view twoHandFallback = getWeaponType(ESM::Weapon::LongBladeTwoHand)->mLongGroup;
 
-    return groupName;
-}
+            const ESM::WeaponType* weapInfo = getWeaponType(weaponType);
 
-void CharacterController::refreshMovementAnims(CharacterState movement, bool force)
-{
-    if (movement == mMovementState && !force)
-        return;
+            // For real two-handed melee weapons use 2h swords animations as fallback, otherwise use the 1h ones
+            if (weapInfo->mFlags & ESM::WeaponType::TwoHanded && weapInfo->mWeaponClass == ESM::WeaponType::Melee)
+                weaponGroup = twoHandFallback;
+            else
+                weaponGroup = oneHandFallback;
+        }
+        else if (weaponType == ESM::Weapon::HandToHand && !mPtr.getClass().isBipedal(mPtr))
+            return "attack1";
 
-    std::string_view movementAnimGroup = movementStateToAnimGroup(movement);
+        return weaponGroup;
+    }
 
-    if (movementAnimGroup.empty())
+    std::string_view CharacterController::getWeaponShortGroup(int weaponType) const
     {
-        if (!mCurrentMovement.empty())
-            resetCurrentIdleState();
-        resetCurrentMovementState();
-        return;
+        if (weaponType == ESM::Weapon::HandToHand && !mPtr.getClass().isBipedal(mPtr))
+            return {};
+        return getWeaponType(weaponType)->mShortGroup;
     }
-    std::string movementAnimName{movementAnimGroup};
 
-    mMovementState = movement;
-    std::string::size_type swimpos = movementAnimName.find("swim");
-    if (!mAnimation->hasAnimation(movementAnimName))
+    std::string CharacterController::fallbackShortWeaponGroup(
+        const std::string& baseGroupName, MWRender::Animation::BlendMask* blendMask) const
     {
-        if (swimpos != std::string::npos)
+        if (!isRealWeapon(mWeaponType))
         {
-            movementAnimName.erase(swimpos, 4);
-            swimpos = std::string::npos;
-        }
-    }
+            if (blendMask != nullptr)
+                *blendMask = MWRender::Animation::BlendMask_LowerBody;
 
-    MWRender::Animation::BlendMask movemask = MWRender::Animation::BlendMask_All;
+            return baseGroupName;
+        }
 
-    std::string_view weapShortGroup = getWeaponShortGroup(mWeaponType);
+        static const std::string_view oneHandFallback = getWeaponShortGroup(ESM::Weapon::LongBladeOneHand);
+        static const std::string_view twoHandFallback = getWeaponShortGroup(ESM::Weapon::LongBladeTwoHand);
 
-    // Non-biped creatures don't use spellcasting-specific movement animations.
-    if(!isRealWeapon(mWeaponType) && !mPtr.getClass().isBipedal(mPtr))
-        weapShortGroup = {};
+        std::string groupName = baseGroupName;
+        const ESM::WeaponType* weapInfo = getWeaponType(mWeaponType);
 
-    if (swimpos == std::string::npos && !weapShortGroup.empty())
-    {
-        std::string weapMovementAnimName;
-        // Spellcasting stance turning is a special case
-        if (mWeaponType == ESM::Weapon::Spell && isTurning())
-        {
-            weapMovementAnimName = weapShortGroup;
-            weapMovementAnimName += movementAnimName;
-        }
+        // For real two-handed melee weapons use 2h swords animations as fallback, otherwise use the 1h ones
+        if (weapInfo->mFlags & ESM::WeaponType::TwoHanded && weapInfo->mWeaponClass == ESM::WeaponType::Melee)
+            groupName += twoHandFallback;
         else
+            groupName += oneHandFallback;
+
+        // Special case for crossbows - we shouls apply 1h animations a fallback only for lower body
+        if (mWeaponType == ESM::Weapon::MarksmanCrossbow && blendMask != nullptr)
+            *blendMask = MWRender::Animation::BlendMask_LowerBody;
+
+        if (!mAnimation->hasAnimation(groupName))
         {
-            weapMovementAnimName = movementAnimName;
-            weapMovementAnimName += weapShortGroup;
+            groupName = baseGroupName;
+            if (blendMask != nullptr)
+                *blendMask = MWRender::Animation::BlendMask_LowerBody;
         }
 
-        if (!mAnimation->hasAnimation(weapMovementAnimName))
-            weapMovementAnimName = fallbackShortWeaponGroup(movementAnimName, &movemask);
-
-        movementAnimName = weapMovementAnimName;
+        return groupName;
     }
 
-    if (!mAnimation->hasAnimation(movementAnimName))
+    void CharacterController::refreshMovementAnims(CharacterState movement, bool force)
     {
-        std::string::size_type runpos = movementAnimName.find("run");
-        if (runpos != std::string::npos)
-            movementAnimName.replace(runpos, 3, "walk");
+        if (movement == mMovementState && !force)
+            return;
 
-        if (!mAnimation->hasAnimation(movementAnimName))
+        std::string_view movementAnimGroup = movementStateToAnimGroup(movement);
+
+        if (movementAnimGroup.empty())
         {
             if (!mCurrentMovement.empty())
                 resetCurrentIdleState();
             resetCurrentMovementState();
             return;
         }
-    }
+        std::string movementAnimName{ movementAnimGroup };
 
-    // If we're playing the same animation, start it from the point it ended
-    float startpoint = 0.f;
-    if (!mCurrentMovement.empty() && movementAnimName == mCurrentMovement)
-        mAnimation->getInfo(mCurrentMovement, &startpoint);
+        mMovementState = movement;
+        std::string::size_type swimpos = movementAnimName.find("swim");
+        if (!mAnimation->hasAnimation(movementAnimName))
+        {
+            if (swimpos != std::string::npos)
+            {
+                movementAnimName.erase(swimpos, 4);
+                swimpos = std::string::npos;
+            }
+        }
 
-    mMovementAnimationControlled = true;
+        MWRender::Animation::BlendMask movemask = MWRender::Animation::BlendMask_All;
 
-    clearStateAnimation(mCurrentMovement);
-    mCurrentMovement = movementAnimName;
+        std::string_view weapShortGroup = getWeaponShortGroup(mWeaponType);
 
-    // For non-flying creatures, MW uses the Walk animation to calculate the animation velocity
-    // even if we are running. This must be replicated, otherwise the observed speed would differ drastically.
-    mAdjustMovementAnimSpeed = true;
-    if (mPtr.getClass().getType() == ESM::Creature::sRecordId && !(mPtr.get<ESM::Creature>()->mBase->mFlags & ESM::Creature::Flies))
-    {
-        CharacterState walkState = runStateToWalkState(mMovementState);
-        std::string_view anim = movementStateToAnimGroup(walkState);
+        // Non-biped creatures don't use spellcasting-specific movement animations.
+        if (!isRealWeapon(mWeaponType) && !mPtr.getClass().isBipedal(mPtr))
+            weapShortGroup = {};
 
-        mMovementAnimSpeed = mAnimation->getVelocity(anim);
-        if (mMovementAnimSpeed <= 1.0f)
+        if (swimpos == std::string::npos && !weapShortGroup.empty())
         {
-            // Another bug: when using a fallback animation (e.g. RunForward as fallback to SwimRunForward),
-            // then the equivalent Walk animation will not use a fallback, and if that animation doesn't exist
-            // we will play without any scaling.
-            // Makes the speed attribute of most water creatures totally useless.
-            // And again, this can not be fixed without patching game data.
-            mAdjustMovementAnimSpeed = false;
-            mMovementAnimSpeed = 1.f;
+            std::string weapMovementAnimName;
+            // Spellcasting stance turning is a special case
+            if (mWeaponType == ESM::Weapon::Spell && isTurning())
+            {
+                weapMovementAnimName = weapShortGroup;
+                weapMovementAnimName += movementAnimName;
+            }
+            else
+            {
+                weapMovementAnimName = movementAnimName;
+                weapMovementAnimName += weapShortGroup;
+            }
+
+            if (!mAnimation->hasAnimation(weapMovementAnimName))
+                weapMovementAnimName = fallbackShortWeaponGroup(movementAnimName, &movemask);
+
+            movementAnimName = weapMovementAnimName;
         }
-    }
-    else
-    {
-        mMovementAnimSpeed = mAnimation->getVelocity(mCurrentMovement);
 
-        if (mMovementAnimSpeed <= 1.0f)
+        if (!mAnimation->hasAnimation(movementAnimName))
         {
-            // The first person anims don't have any velocity to calculate a speed multiplier from.
-            // We use the third person velocities instead.
-            // FIXME: should be pulled from the actual animation, but it is not presently loaded.
-            bool sneaking = mMovementState == CharState_SneakForward || mMovementState == CharState_SneakBack
-                         || mMovementState == CharState_SneakLeft    || mMovementState == CharState_SneakRight;
-            mMovementAnimSpeed = (sneaking ? 33.5452f : (isRunning() ? 222.857f : 154.064f));
-            mMovementAnimationControlled = false;
+            std::string::size_type runpos = movementAnimName.find("run");
+            if (runpos != std::string::npos)
+                movementAnimName.replace(runpos, 3, "walk");
+
+            if (!mAnimation->hasAnimation(movementAnimName))
+            {
+                if (!mCurrentMovement.empty())
+                    resetCurrentIdleState();
+                resetCurrentMovementState();
+                return;
+            }
         }
-    }
 
-    mAnimation->play(mCurrentMovement, Priority_Movement, movemask, false, 1.f, "start", "stop", startpoint, ~0ul, true);
-}
+        // If we're playing the same animation, start it from the point it ended
+        float startpoint = 0.f;
+        if (!mCurrentMovement.empty() && movementAnimName == mCurrentMovement)
+            mAnimation->getInfo(mCurrentMovement, &startpoint);
 
-void CharacterController::refreshIdleAnims(CharacterState idle, bool force)
-{
-    // FIXME: if one of the below states is close to their last animation frame (i.e. will be disabled in the coming update),
-    // the idle animation should be displayed
-    if (((mUpperBodyState != UpperBodyState::None && mUpperBodyState != UpperBodyState::WeaponEquipped)
-       || mMovementState != CharState_None || mHitState != CharState_None) && !mPtr.getClass().isBipedal(mPtr))
-    {
-        resetCurrentIdleState();
-        return;
-    }
+        mMovementAnimationControlled = true;
 
-    if (!force && idle == mIdleState && (mAnimation->isPlaying(mCurrentIdle) || !mAnimQueue.empty()))
-        return;
+        clearStateAnimation(mCurrentMovement);
+        mCurrentMovement = movementAnimName;
 
-    mIdleState = idle;
+        // For non-flying creatures, MW uses the Walk animation to calculate the animation velocity
+        // even if we are running. This must be replicated, otherwise the observed speed would differ drastically.
+        mAdjustMovementAnimSpeed = true;
+        if (mPtr.getClass().getType() == ESM::Creature::sRecordId
+            && !(mPtr.get<ESM::Creature>()->mBase->mFlags & ESM::Creature::Flies))
+        {
+            CharacterState walkState = runStateToWalkState(mMovementState);
+            std::string_view anim = movementStateToAnimGroup(walkState);
 
-    std::string idleGroup = idleStateToAnimGroup(mIdleState);
-    if (idleGroup.empty())
-    {
-        resetCurrentIdleState();
-        return;
-    }
+            mMovementAnimSpeed = mAnimation->getVelocity(anim);
+            if (mMovementAnimSpeed <= 1.0f)
+            {
+                // Another bug: when using a fallback animation (e.g. RunForward as fallback to SwimRunForward),
+                // then the equivalent Walk animation will not use a fallback, and if that animation doesn't exist
+                // we will play without any scaling.
+                // Makes the speed attribute of most water creatures totally useless.
+                // And again, this can not be fixed without patching game data.
+                mAdjustMovementAnimSpeed = false;
+                mMovementAnimSpeed = 1.f;
+            }
+        }
+        else
+        {
+            mMovementAnimSpeed = mAnimation->getVelocity(mCurrentMovement);
 
-    MWRender::Animation::AnimPriority priority = getIdlePriority(mIdleState);
-    size_t numLoops = std::numeric_limits<size_t>::max();
+            if (mMovementAnimSpeed <= 1.0f)
+            {
+                // The first person anims don't have any velocity to calculate a speed multiplier from.
+                // We use the third person velocities instead.
+                // FIXME: should be pulled from the actual animation, but it is not presently loaded.
+                bool sneaking = mMovementState == CharState_SneakForward || mMovementState == CharState_SneakBack
+                    || mMovementState == CharState_SneakLeft || mMovementState == CharState_SneakRight;
+                mMovementAnimSpeed = (sneaking ? 33.5452f : (isRunning() ? 222.857f : 154.064f));
+                mMovementAnimationControlled = false;
+            }
+        }
 
-    // Only play "idleswim" or "idlesneak" if they exist. Otherwise, fallback to
-    // "idle"+weapon or "idle".
-    bool fallback = mIdleState != CharState_Idle && !mAnimation->hasAnimation(idleGroup);
-    if (fallback)
-    {
-        priority = getIdlePriority(CharState_Idle);
-        idleGroup = idleStateToAnimGroup(CharState_Idle);
+        mAnimation->play(
+            mCurrentMovement, Priority_Movement, movemask, false, 1.f, "start", "stop", startpoint, ~0ul, true);
     }
 
-    if (fallback || mIdleState == CharState_Idle || mIdleState == CharState_SpecialIdle)
+    void CharacterController::refreshIdleAnims(CharacterState idle, bool force)
     {
-        std::string_view weapShortGroup = getWeaponShortGroup(mWeaponType);
-        if (!weapShortGroup.empty())
+        // FIXME: if one of the below states is close to their last animation frame (i.e. will be disabled in the coming
+        // update), the idle animation should be displayed
+        if (((mUpperBodyState != UpperBodyState::None && mUpperBodyState != UpperBodyState::WeaponEquipped)
+                || mMovementState != CharState_None || mHitState != CharState_None)
+            && !mPtr.getClass().isBipedal(mPtr))
         {
-            std::string weapIdleGroup = idleGroup;
-            weapIdleGroup += weapShortGroup;
-            if (!mAnimation->hasAnimation(weapIdleGroup))
-                weapIdleGroup = fallbackShortWeaponGroup(idleGroup);
-            idleGroup = weapIdleGroup;
+            resetCurrentIdleState();
+            return;
+        }
 
-            // play until the Loop Stop key 2 to 5 times, then play until the Stop key
-            // this replicates original engine behavior for the "Idle1h" 1st-person animation
-            auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-            numLoops = 1 + Misc::Rng::rollDice(4, prng);
+        if (!force && idle == mIdleState && (mAnimation->isPlaying(mCurrentIdle) || !mAnimQueue.empty()))
+            return;
+
+        mIdleState = idle;
+
+        std::string idleGroup = idleStateToAnimGroup(mIdleState);
+        if (idleGroup.empty())
+        {
+            resetCurrentIdleState();
+            return;
         }
-    }
 
-    if (!mAnimation->hasAnimation(idleGroup))
-    {
-        resetCurrentIdleState();
-        return;
-    }
+        MWRender::Animation::AnimPriority priority = getIdlePriority(mIdleState);
+        size_t numLoops = std::numeric_limits<size_t>::max();
 
-    float startPoint = 0.f;
-    // There is no need to restart anim if the new and old anims are the same.
-    // Just update the number of loops.
-    if (mCurrentIdle == idleGroup)
-        mAnimation->getInfo(mCurrentIdle, &startPoint);
+        // Only play "idleswim" or "idlesneak" if they exist. Otherwise, fallback to
+        // "idle"+weapon or "idle".
+        bool fallback = mIdleState != CharState_Idle && !mAnimation->hasAnimation(idleGroup);
+        if (fallback)
+        {
+            priority = getIdlePriority(CharState_Idle);
+            idleGroup = idleStateToAnimGroup(CharState_Idle);
+        }
 
-    clearStateAnimation(mCurrentIdle);
-    mCurrentIdle = idleGroup;
-    mAnimation->play(mCurrentIdle, priority, MWRender::Animation::BlendMask_All, false, 1.0f, "start", "stop", startPoint, numLoops, true);
-}
+        if (fallback || mIdleState == CharState_Idle || mIdleState == CharState_SpecialIdle)
+        {
+            std::string_view weapShortGroup = getWeaponShortGroup(mWeaponType);
+            if (!weapShortGroup.empty())
+            {
+                std::string weapIdleGroup = idleGroup;
+                weapIdleGroup += weapShortGroup;
+                if (!mAnimation->hasAnimation(weapIdleGroup))
+                    weapIdleGroup = fallbackShortWeaponGroup(idleGroup);
+                idleGroup = weapIdleGroup;
+
+                // play until the Loop Stop key 2 to 5 times, then play until the Stop key
+                // this replicates original engine behavior for the "Idle1h" 1st-person animation
+                auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+                numLoops = 1 + Misc::Rng::rollDice(4, prng);
+            }
+        }
 
-void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterState movement, JumpingState jump, bool force)
-{
-    // If the current animation is persistent, do not touch it
-    if (isPersistentAnimPlaying())
-        return;
+        if (!mAnimation->hasAnimation(idleGroup))
+        {
+            resetCurrentIdleState();
+            return;
+        }
 
-    refreshHitRecoilAnims();
-    refreshJumpAnims(jump, force);
-    refreshMovementAnims(movement, force);
+        float startPoint = 0.f;
+        // There is no need to restart anim if the new and old anims are the same.
+        // Just update the number of loops.
+        if (mCurrentIdle == idleGroup)
+            mAnimation->getInfo(mCurrentIdle, &startPoint);
 
-    // idle handled last as it can depend on the other states
-    refreshIdleAnims(idle, force);
-}
+        clearStateAnimation(mCurrentIdle);
+        mCurrentIdle = idleGroup;
+        mAnimation->play(mCurrentIdle, priority, MWRender::Animation::BlendMask_All, false, 1.0f, "start", "stop",
+            startPoint, numLoops, true);
+    }
 
-void CharacterController::playDeath(float startpoint, CharacterState death)
-{
-    mDeathState = death;
-    mCurrentDeath = deathStateToAnimGroup(mDeathState);
-    mPtr.getClass().getCreatureStats(mPtr).setDeathAnimation(mDeathState - CharState_Death1);
-
-    // For dead actors, refreshCurrentAnims is no longer called, so we need to disable the movement state manually.
-    // Note that these animations wouldn't actually be visible (due to the Death animation's priority being higher).
-    // However, they could still trigger text keys, such as Hit events, or sounds.
-    resetCurrentMovementState();
-    resetCurrentWeaponState();
-    resetCurrentHitState();
-    resetCurrentIdleState();
-    resetCurrentJumpState();
-    mMovementAnimationControlled = true;
-
-    mAnimation->play(mCurrentDeath, Priority_Death, MWRender::Animation::BlendMask_All,
-                    false, 1.0f, "start", "stop", startpoint, 0);
-}
+    void CharacterController::refreshCurrentAnims(
+        CharacterState idle, CharacterState movement, JumpingState jump, bool force)
+    {
+        // If the current animation is persistent, do not touch it
+        if (isPersistentAnimPlaying())
+            return;
 
-CharacterState CharacterController::chooseRandomDeathState() const
-{
-    int selected=0;
-    chooseRandomGroup("death", &selected);
-    return static_cast<CharacterState>(CharState_Death1 + (selected-1));
-}
+        refreshHitRecoilAnims();
+        refreshJumpAnims(jump, force);
+        refreshMovementAnims(movement, force);
 
-void CharacterController::playRandomDeath(float startpoint)
-{
-    if (mPtr == getPlayer())
+        // idle handled last as it can depend on the other states
+        refreshIdleAnims(idle, force);
+    }
+
+    void CharacterController::playDeath(float startpoint, CharacterState death)
     {
-        // The first-person animations do not include death, so we need to
-        // force-switch to third person before playing the death animation.
-        MWBase::Environment::get().getWorld()->useDeathCamera();
+        mDeathState = death;
+        mCurrentDeath = deathStateToAnimGroup(mDeathState);
+        mPtr.getClass().getCreatureStats(mPtr).setDeathAnimation(mDeathState - CharState_Death1);
+
+        // For dead actors, refreshCurrentAnims is no longer called, so we need to disable the movement state manually.
+        // Note that these animations wouldn't actually be visible (due to the Death animation's priority being higher).
+        // However, they could still trigger text keys, such as Hit events, or sounds.
+        resetCurrentMovementState();
+        resetCurrentWeaponState();
+        resetCurrentHitState();
+        resetCurrentIdleState();
+        resetCurrentJumpState();
+        mMovementAnimationControlled = true;
+
+        mAnimation->play(mCurrentDeath, Priority_Death, MWRender::Animation::BlendMask_All, false, 1.0f, "start",
+            "stop", startpoint, 0);
     }
 
-    mDeathState = hitStateToDeathState(mHitState);
-    if (mDeathState == CharState_None && MWBase::Environment::get().getWorld()->isSwimming(mPtr))
-        mDeathState = CharState_SwimDeath;
+    CharacterState CharacterController::chooseRandomDeathState() const
+    {
+        int selected = 0;
+        chooseRandomGroup("death", &selected);
+        return static_cast<CharacterState>(CharState_Death1 + (selected - 1));
+    }
 
-    if (mDeathState == CharState_None || !mAnimation->hasAnimation(deathStateToAnimGroup(mDeathState)))
-        mDeathState = chooseRandomDeathState();
+    void CharacterController::playRandomDeath(float startpoint)
+    {
+        if (mPtr == getPlayer())
+        {
+            // The first-person animations do not include death, so we need to
+            // force-switch to third person before playing the death animation.
+            MWBase::Environment::get().getWorld()->useDeathCamera();
+        }
 
-    // Do not interrupt scripted animation by death
-    if (isPersistentAnimPlaying())
-        return;
+        mDeathState = hitStateToDeathState(mHitState);
+        if (mDeathState == CharState_None && MWBase::Environment::get().getWorld()->isSwimming(mPtr))
+            mDeathState = CharState_SwimDeath;
 
-    playDeath(startpoint, mDeathState);
-}
+        if (mDeathState == CharState_None || !mAnimation->hasAnimation(deathStateToAnimGroup(mDeathState)))
+            mDeathState = chooseRandomDeathState();
 
-std::string CharacterController::chooseRandomAttackAnimation() const
-{
-    std::string result;
-    bool isSwimming = MWBase::Environment::get().getWorld()->isSwimming(mPtr);
+        // Do not interrupt scripted animation by death
+        if (isPersistentAnimPlaying())
+            return;
 
-    if (isSwimming)
-        result = chooseRandomGroup("swimattack");
+        playDeath(startpoint, mDeathState);
+    }
 
-    if (!isSwimming || !mAnimation->hasAnimation(result))
-        result = chooseRandomGroup("attack");
+    std::string CharacterController::chooseRandomAttackAnimation() const
+    {
+        std::string result;
+        bool isSwimming = MWBase::Environment::get().getWorld()->isSwimming(mPtr);
 
-    return result;
-}
+        if (isSwimming)
+            result = chooseRandomGroup("swimattack");
 
-CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Animation *anim)
-    : mPtr(ptr)
-    , mAnimation(anim)
-{
-    if(!mAnimation)
-        return;
+        if (!isSwimming || !mAnimation->hasAnimation(result))
+            result = chooseRandomGroup("attack");
 
-    mAnimation->setTextKeyListener(this);
+        return result;
+    }
 
-    const MWWorld::Class &cls = mPtr.getClass();
-    if(cls.isActor())
+    CharacterController::CharacterController(const MWWorld::Ptr& ptr, MWRender::Animation* anim)
+        : mPtr(ptr)
+        , mAnimation(anim)
     {
-        /* Accumulate along X/Y only for now, until we can figure out how we should
-         * handle knockout and death which moves the character down. */
-        mAnimation->setAccumulation(osg::Vec3f(1.0f, 1.0f, 0.0f));
+        if (!mAnimation)
+            return;
 
-        if (cls.hasInventoryStore(mPtr))
+        mAnimation->setTextKeyListener(this);
+
+        const MWWorld::Class& cls = mPtr.getClass();
+        if (cls.isActor())
         {
-            getActiveWeapon(mPtr, &mWeaponType);
-            if (mWeaponType != ESM::Weapon::None)
+            /* Accumulate along X/Y only for now, until we can figure out how we should
+             * handle knockout and death which moves the character down. */
+            mAnimation->setAccumulation(osg::Vec3f(1.0f, 1.0f, 0.0f));
+
+            if (cls.hasInventoryStore(mPtr))
             {
-                mUpperBodyState = UpperBodyState::WeaponEquipped;
-                mCurrentWeapon = getWeaponAnimation(mWeaponType);
+                getActiveWeapon(mPtr, &mWeaponType);
+                if (mWeaponType != ESM::Weapon::None)
+                {
+                    mUpperBodyState = UpperBodyState::WeaponEquipped;
+                    mCurrentWeapon = getWeaponAnimation(mWeaponType);
+                }
+
+                if (mWeaponType != ESM::Weapon::None && mWeaponType != ESM::Weapon::Spell
+                    && mWeaponType != ESM::Weapon::HandToHand)
+                {
+                    mAnimation->showWeapons(true);
+                    // Note: controllers for ranged weapon should use time for beginning of animation to play shooting
+                    // properly, for other weapons they should use absolute time. Some mods rely on this behaviour (to
+                    // rotate throwing projectiles, for example)
+                    ESM::WeaponType::Class weaponClass = getWeaponType(mWeaponType)->mWeaponClass;
+                    bool useRelativeDuration = weaponClass == ESM::WeaponType::Ranged;
+                    mAnimation->setWeaponGroup(mCurrentWeapon, useRelativeDuration);
+                }
+
+                mAnimation->showCarriedLeft(updateCarriedLeftVisible(mWeaponType));
             }
 
-            if(mWeaponType != ESM::Weapon::None && mWeaponType != ESM::Weapon::Spell && mWeaponType != ESM::Weapon::HandToHand)
+            if (!cls.getCreatureStats(mPtr).isDead())
             {
-                mAnimation->showWeapons(true);
-                // Note: controllers for ranged weapon should use time for beginning of animation to play shooting properly,
-                // for other weapons they should use absolute time. Some mods rely on this behaviour (to rotate throwing projectiles, for example)
-                ESM::WeaponType::Class weaponClass = getWeaponType(mWeaponType)->mWeaponClass;
-                bool useRelativeDuration = weaponClass == ESM::WeaponType::Ranged;
-                mAnimation->setWeaponGroup(mCurrentWeapon, useRelativeDuration);
+                mIdleState = CharState_Idle;
+                if (cls.getCreatureStats(mPtr).getFallHeight() > 0)
+                    mJumpState = JumpState_InAir;
             }
+            else
+            {
+                const MWMechanics::CreatureStats& cStats = mPtr.getClass().getCreatureStats(mPtr);
+                if (cStats.isDeathAnimationFinished())
+                {
+                    // Set the death state, but don't play it yet
+                    // We will play it in the first frame, but only if no script set the skipAnim flag
+                    signed char deathanim = cStats.getDeathAnimation();
+                    if (deathanim == -1)
+                        mDeathState = chooseRandomDeathState();
+                    else
+                        mDeathState = static_cast<CharacterState>(CharState_Death1 + deathanim);
 
-            mAnimation->showCarriedLeft(updateCarriedLeftVisible(mWeaponType));
-        }
-
-        if(!cls.getCreatureStats(mPtr).isDead())
-        {
-            mIdleState = CharState_Idle;
-            if (cls.getCreatureStats(mPtr).getFallHeight() > 0)
-                mJumpState = JumpState_InAir;
+                    mFloatToSurface = false;
+                }
+                // else: nothing to do, will detect death in the next frame and start playing death animation
+            }
         }
         else
         {
-            const MWMechanics::CreatureStats& cStats = mPtr.getClass().getCreatureStats(mPtr);
-            if (cStats.isDeathAnimationFinished())
-            {
-                // Set the death state, but don't play it yet
-                // We will play it in the first frame, but only if no script set the skipAnim flag
-                signed char deathanim = cStats.getDeathAnimation();
-                if (deathanim == -1)
-                    mDeathState = chooseRandomDeathState();
-                else
-                    mDeathState = static_cast<CharacterState>(CharState_Death1 + deathanim);
+            /* Don't accumulate with non-actors. */
+            mAnimation->setAccumulation(osg::Vec3f(0.f, 0.f, 0.f));
 
-                mFloatToSurface = false;
-            }
-            // else: nothing to do, will detect death in the next frame and start playing death animation
+            mIdleState = CharState_Idle;
         }
-    }
-    else
-    {
-        /* Don't accumulate with non-actors. */
-        mAnimation->setAccumulation(osg::Vec3f(0.f, 0.f, 0.f));
-
-        mIdleState = CharState_Idle;
-    }
-
-    // Do not update animation status for dead actors
-    if(mDeathState == CharState_None && (!cls.isActor() || !cls.getCreatureStats(mPtr).isDead()))
-        refreshCurrentAnims(mIdleState, mMovementState, mJumpState, true);
 
-    mAnimation->runAnimation(0.f);
+        // Do not update animation status for dead actors
+        if (mDeathState == CharState_None && (!cls.isActor() || !cls.getCreatureStats(mPtr).isDead()))
+            refreshCurrentAnims(mIdleState, mMovementState, mJumpState, true);
 
-    unpersistAnimationState();
-}
+        mAnimation->runAnimation(0.f);
 
-CharacterController::~CharacterController()
-{
-    if (mAnimation)
-    {
-        persistAnimationState();
-        mAnimation->setTextKeyListener(nullptr);
+        unpersistAnimationState();
     }
-}
-
-void CharacterController::handleTextKey(std::string_view groupname, SceneUtil::TextKeyMap::ConstIterator key, const SceneUtil::TextKeyMap& map)
-{
-    std::string_view evt = key->second;
 
-    if (evt.substr(0, 7) == "sound: ")
+    CharacterController::~CharacterController()
     {
-        MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-        sndMgr->playSound3D(mPtr, evt.substr(7), 1.0f, 1.0f);
-        return;
+        if (mAnimation)
+        {
+            persistAnimationState();
+            mAnimation->setTextKeyListener(nullptr);
+        }
     }
 
-    auto& charClass = mPtr.getClass();
-    if (evt.substr(0, 10) == "soundgen: ")
+    void CharacterController::handleTextKey(
+        std::string_view groupname, SceneUtil::TextKeyMap::ConstIterator key, const SceneUtil::TextKeyMap& map)
     {
-        std::string_view soundgen = evt.substr(10);
+        std::string_view evt = key->second;
 
-        // The event can optionally contain volume and pitch modifiers
-        float volume=1.f, pitch=1.f;
-        if (soundgen.find(' ') != std::string::npos)
+        if (evt.substr(0, 7) == "sound: ")
         {
-            std::vector<std::string_view> tokens;
-            Misc::StringUtils::split(soundgen, tokens);
-            soundgen = tokens[0];
-            if (tokens.size() >= 2)
-            {
-                std::stringstream stream;
-                stream << tokens[1];
-                stream >> volume;
-            }
-            if (tokens.size() >= 3)
-            {
-                std::stringstream stream;
-                stream << tokens[2];
-                stream >> pitch;
-            }
+            MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
+            sndMgr->playSound3D(mPtr, evt.substr(7), 1.0f, 1.0f);
+            return;
         }
 
-        std::string_view sound = charClass.getSoundIdFromSndGen(mPtr, soundgen);
-        if(!sound.empty())
+        auto& charClass = mPtr.getClass();
+        if (evt.substr(0, 10) == "soundgen: ")
         {
-            MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-            if (soundgen == "left" || soundgen == "right")
+            std::string_view soundgen = evt.substr(10);
+
+            // The event can optionally contain volume and pitch modifiers
+            float volume = 1.f, pitch = 1.f;
+            if (soundgen.find(' ') != std::string::npos)
             {
-                sndMgr->playSound3D(mPtr, sound, volume, pitch, MWSound::Type::Foot,
-                                    MWSound::PlayMode::NoPlayerLocal);
+                std::vector<std::string_view> tokens;
+                Misc::StringUtils::split(soundgen, tokens);
+                soundgen = tokens[0];
+                if (tokens.size() >= 2)
+                {
+                    std::stringstream stream;
+                    stream << tokens[1];
+                    stream >> volume;
+                }
+                if (tokens.size() >= 3)
+                {
+                    std::stringstream stream;
+                    stream << tokens[2];
+                    stream >> pitch;
+                }
             }
-            else
+
+            std::string_view sound = charClass.getSoundIdFromSndGen(mPtr, soundgen);
+            if (!sound.empty())
             {
-                sndMgr->playSound3D(mPtr, sound, volume, pitch);
+                MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
+                if (soundgen == "left" || soundgen == "right")
+                {
+                    sndMgr->playSound3D(
+                        mPtr, sound, volume, pitch, MWSound::Type::Foot, MWSound::PlayMode::NoPlayerLocal);
+                }
+                else
+                {
+                    sndMgr->playSound3D(mPtr, sound, volume, pitch);
+                }
             }
+            return;
         }
-        return;
-    }
 
-    if (evt.substr(0, groupname.size()) != groupname || evt.substr(groupname.size(), 2) != ": ")
-    {
-        // Not ours, skip it
-        return;
-    }
+        if (evt.substr(0, groupname.size()) != groupname || evt.substr(groupname.size(), 2) != ": ")
+        {
+            // Not ours, skip it
+            return;
+        }
 
-    std::string_view action = evt.substr(groupname.size() + 2);
-    if (action == "equip attach")
-    {
-        if (groupname == "shield")
-            mAnimation->showCarriedLeft(true);
-        else
-            mAnimation->showWeapons(true);
-    }
-    else if (action == "unequip detach")
-    {
-        if (groupname == "shield")
-            mAnimation->showCarriedLeft(false);
-        else
-            mAnimation->showWeapons(false);
-    }
-    else if (action == "chop hit")
-        charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Chop, mAttackVictim, mAttackHitPos, mAttackSuccess);
-    else if (action == "slash hit")
-        charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Slash, mAttackVictim, mAttackHitPos, mAttackSuccess);
-    else if (action == "thrust hit")
-        charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Thrust, mAttackVictim, mAttackHitPos, mAttackSuccess);
-    else if (action == "hit")
-    {
-        if (groupname == "attack1" || groupname == "swimattack1")
+        std::string_view action = evt.substr(groupname.size() + 2);
+        if (action == "equip attach")
+        {
+            if (groupname == "shield")
+                mAnimation->showCarriedLeft(true);
+            else
+                mAnimation->showWeapons(true);
+        }
+        else if (action == "unequip detach")
+        {
+            if (groupname == "shield")
+                mAnimation->showCarriedLeft(false);
+            else
+                mAnimation->showWeapons(false);
+        }
+        else if (action == "chop hit")
             charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Chop, mAttackVictim, mAttackHitPos, mAttackSuccess);
-        else if (groupname == "attack2" || groupname == "swimattack2")
+        else if (action == "slash hit")
             charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Slash, mAttackVictim, mAttackHitPos, mAttackSuccess);
-        else if (groupname == "attack3" || groupname == "swimattack3")
+        else if (action == "thrust hit")
             charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Thrust, mAttackVictim, mAttackHitPos, mAttackSuccess);
-        else
-            charClass.hit(mPtr, mAttackStrength, -1, mAttackVictim, mAttackHitPos, mAttackSuccess);
-    }
-    else if (isRandomAttackAnimation(groupname) && action == "start")
-    {
-        std::multimap<float, std::string>::const_iterator hitKey = key;
-
-        // Not all animations have a hit key defined. If there is none, the hit happens with the start key.
-        bool hasHitKey = false;
-        while (hitKey != map.end())
+        else if (action == "hit")
+        {
+            if (groupname == "attack1" || groupname == "swimattack1")
+                charClass.hit(
+                    mPtr, mAttackStrength, ESM::Weapon::AT_Chop, mAttackVictim, mAttackHitPos, mAttackSuccess);
+            else if (groupname == "attack2" || groupname == "swimattack2")
+                charClass.hit(
+                    mPtr, mAttackStrength, ESM::Weapon::AT_Slash, mAttackVictim, mAttackHitPos, mAttackSuccess);
+            else if (groupname == "attack3" || groupname == "swimattack3")
+                charClass.hit(
+                    mPtr, mAttackStrength, ESM::Weapon::AT_Thrust, mAttackVictim, mAttackHitPos, mAttackSuccess);
+            else
+                charClass.hit(mPtr, mAttackStrength, -1, mAttackVictim, mAttackHitPos, mAttackSuccess);
+        }
+        else if (isRandomAttackAnimation(groupname) && action == "start")
         {
-            if (hitKey->second.starts_with(groupname))
+            std::multimap<float, std::string>::const_iterator hitKey = key;
+
+            // Not all animations have a hit key defined. If there is none, the hit happens with the start key.
+            bool hasHitKey = false;
+            while (hitKey != map.end())
             {
-                std::string_view suffix = std::string_view(hitKey->second).substr(groupname.size());
-                if (suffix == ": hit")
+                if (hitKey->second.starts_with(groupname))
                 {
-                    hasHitKey = true;
-                    break;
+                    std::string_view suffix = std::string_view(hitKey->second).substr(groupname.size());
+                    if (suffix == ": hit")
+                    {
+                        hasHitKey = true;
+                        break;
+                    }
+                    if (suffix == ": stop")
+                        break;
                 }
-                if (suffix == ": stop")
-                    break;
+                ++hitKey;
+            }
+            if (!hasHitKey)
+            {
+                if (groupname == "attack1" || groupname == "swimattack1")
+                    charClass.hit(
+                        mPtr, mAttackStrength, ESM::Weapon::AT_Chop, mAttackVictim, mAttackHitPos, mAttackSuccess);
+                else if (groupname == "attack2" || groupname == "swimattack2")
+                    charClass.hit(
+                        mPtr, mAttackStrength, ESM::Weapon::AT_Slash, mAttackVictim, mAttackHitPos, mAttackSuccess);
+                else if (groupname == "attack3" || groupname == "swimattack3")
+                    charClass.hit(
+                        mPtr, mAttackStrength, ESM::Weapon::AT_Thrust, mAttackVictim, mAttackHitPos, mAttackSuccess);
             }
-            ++hitKey;
         }
-        if (!hasHitKey)
+        else if (action == "shoot attach")
+            mAnimation->attachArrow();
+        else if (action == "shoot release")
+            mAnimation->releaseArrow(mAttackStrength);
+        else if (action == "shoot follow attach")
+            mAnimation->attachArrow();
+        // Make sure this key is actually for the RangeType we are casting. The flame atronach has
+        // the same animation for all range types, so there are 3 "release" keys on the same time, one for each range
+        // type.
+        else if (groupname == "spellcast" && action == mAttackType + " release")
         {
-            if (groupname == "attack1" || groupname == "swimattack1")
-                charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Chop, mAttackVictim, mAttackHitPos, mAttackSuccess);
-            else if (groupname == "attack2" || groupname == "swimattack2")
-                charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Slash, mAttackVictim, mAttackHitPos, mAttackSuccess);
-            else if (groupname == "attack3" || groupname == "swimattack3")
-                charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Thrust, mAttackVictim, mAttackHitPos, mAttackSuccess);
+            if (mCanCast)
+                MWBase::Environment::get().getWorld()->castSpell(mPtr, mCastingManualSpell);
+            mCastingManualSpell = false;
+            mCanCast = false;
         }
+        else if (groupname == "shield" && action == "block hit")
+            charClass.block(mPtr);
+        else if (groupname == "containeropen" && action == "loot")
+            MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Container, mPtr);
     }
-    else if (action == "shoot attach")
-        mAnimation->attachArrow();
-    else if (action == "shoot release")
-        mAnimation->releaseArrow(mAttackStrength);
-    else if (action == "shoot follow attach")
-        mAnimation->attachArrow();
-    // Make sure this key is actually for the RangeType we are casting. The flame atronach has
-    // the same animation for all range types, so there are 3 "release" keys on the same time, one for each range type.
-    else if (groupname == "spellcast" && action == mAttackType + " release")
-    {
-        if (mCanCast)
-            MWBase::Environment::get().getWorld()->castSpell(mPtr, mCastingManualSpell);
-        mCastingManualSpell = false;
-        mCanCast = false;
-    }
-    else if (groupname == "shield" && action == "block hit")
-        charClass.block(mPtr);
-    else if (groupname == "containeropen" && action == "loot")
-        MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Container, mPtr);
-}
 
-void CharacterController::updatePtr(const MWWorld::Ptr &ptr)
-{
-    mPtr = ptr;
-}
-
-void CharacterController::updateIdleStormState(bool inwater) const
-{
-    if (!mAnimation->hasAnimation("idlestorm") || mUpperBodyState != UpperBodyState::None || inwater)
+    void CharacterController::updatePtr(const MWWorld::Ptr& ptr)
     {
-        mAnimation->disable("idlestorm");
-        return;
+        mPtr = ptr;
     }
 
-    const auto world = MWBase::Environment::get().getWorld();
-    if (world->isInStorm())
+    void CharacterController::updateIdleStormState(bool inwater) const
     {
-        osg::Vec3f stormDirection = world->getStormDirection();
-        osg::Vec3f characterDirection = mPtr.getRefData().getBaseNode()->getAttitude() * osg::Vec3f(0,1,0);
-        stormDirection.normalize();
-        characterDirection.normalize();
-        if (stormDirection * characterDirection < -0.5f)
+        if (!mAnimation->hasAnimation("idlestorm") || mUpperBodyState != UpperBodyState::None || inwater)
         {
-            if (!mAnimation->isPlaying("idlestorm"))
-            {
-                int mask = MWRender::Animation::BlendMask_Torso | MWRender::Animation::BlendMask_RightArm;
-                mAnimation->play("idlestorm", Priority_Storm, mask, true, 1.0f, "start", "stop", 0.0f, ~0ul);
-            }
-            else
+            mAnimation->disable("idlestorm");
+            return;
+        }
+
+        const auto world = MWBase::Environment::get().getWorld();
+        if (world->isInStorm())
+        {
+            osg::Vec3f stormDirection = world->getStormDirection();
+            osg::Vec3f characterDirection = mPtr.getRefData().getBaseNode()->getAttitude() * osg::Vec3f(0, 1, 0);
+            stormDirection.normalize();
+            characterDirection.normalize();
+            if (stormDirection * characterDirection < -0.5f)
             {
-                mAnimation->setLoopingEnabled("idlestorm", true);
+                if (!mAnimation->isPlaying("idlestorm"))
+                {
+                    int mask = MWRender::Animation::BlendMask_Torso | MWRender::Animation::BlendMask_RightArm;
+                    mAnimation->play("idlestorm", Priority_Storm, mask, true, 1.0f, "start", "stop", 0.0f, ~0ul);
+                }
+                else
+                {
+                    mAnimation->setLoopingEnabled("idlestorm", true);
+                }
+                return;
             }
-            return;
+        }
+
+        if (mAnimation->isPlaying("idlestorm"))
+        {
+            mAnimation->setLoopingEnabled("idlestorm", false);
         }
     }
 
-    if (mAnimation->isPlaying("idlestorm"))
+    bool CharacterController::updateCarriedLeftVisible(const int weaptype) const
     {
-        mAnimation->setLoopingEnabled("idlestorm", false);
+        // Shields/torches shouldn't be visible during any operation involving two hands
+        // There seems to be no text keys for this purpose, except maybe for "[un]equip start/stop",
+        // but they are also present in weapon drawing animation.
+        return mAnimation->updateCarriedLeftVisible(weaptype);
     }
-}
-
-bool CharacterController::updateCarriedLeftVisible(const int weaptype) const
-{
-    // Shields/torches shouldn't be visible during any operation involving two hands
-    // There seems to be no text keys for this purpose, except maybe for "[un]equip start/stop",
-    // but they are also present in weapon drawing animation.
-    return mAnimation->updateCarriedLeftVisible(weaptype);
-}
 
-float CharacterController::calculateWindUp() const
-{
-    if (mCurrentWeapon.empty() || mWeaponType == ESM::Weapon::PickProbe || isRandomAttackAnimation(mCurrentWeapon))
-        return -1.f;
-
-    float minAttackTime = mAnimation->getTextKeyTime(mCurrentWeapon + ": " + mAttackType + " min attack");
-    float maxAttackTime = mAnimation->getTextKeyTime(mCurrentWeapon + ": " + mAttackType + " max attack");
-    if (minAttackTime == -1.f || minAttackTime >= maxAttackTime)
-        return -1.f;
+    float CharacterController::calculateWindUp() const
+    {
+        if (mCurrentWeapon.empty() || mWeaponType == ESM::Weapon::PickProbe || isRandomAttackAnimation(mCurrentWeapon))
+            return -1.f;
 
-    return std::clamp((mAnimation->getCurrentTime(mCurrentWeapon) - minAttackTime) / (maxAttackTime - minAttackTime), 0.f, 1.f);
-}
+        float minAttackTime = mAnimation->getTextKeyTime(mCurrentWeapon + ": " + mAttackType + " min attack");
+        float maxAttackTime = mAnimation->getTextKeyTime(mCurrentWeapon + ": " + mAttackType + " max attack");
+        if (minAttackTime == -1.f || minAttackTime >= maxAttackTime)
+            return -1.f;
 
-bool CharacterController::updateWeaponState()
-{
-    const auto world = MWBase::Environment::get().getWorld();
-    auto& prng = world->getPrng();
-    MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
+        return std::clamp(
+            (mAnimation->getCurrentTime(mCurrentWeapon) - minAttackTime) / (maxAttackTime - minAttackTime), 0.f, 1.f);
+    }
 
-    const MWWorld::Class &cls = mPtr.getClass();
-    CreatureStats &stats = cls.getCreatureStats(mPtr);
-    int weaptype = ESM::Weapon::None;
-    if(stats.getDrawState() == DrawState::Weapon)
-        weaptype = ESM::Weapon::HandToHand;
-    else if (stats.getDrawState() == DrawState::Spell)
-        weaptype = ESM::Weapon::Spell;
+    bool CharacterController::updateWeaponState()
+    {
+        const auto world = MWBase::Environment::get().getWorld();
+        auto& prng = world->getPrng();
+        MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
 
-    const bool isWerewolf = cls.isNpc() && cls.getNpcStats(mPtr).isWerewolf();
+        const MWWorld::Class& cls = mPtr.getClass();
+        CreatureStats& stats = cls.getCreatureStats(mPtr);
+        int weaptype = ESM::Weapon::None;
+        if (stats.getDrawState() == DrawState::Weapon)
+            weaptype = ESM::Weapon::HandToHand;
+        else if (stats.getDrawState() == DrawState::Spell)
+            weaptype = ESM::Weapon::Spell;
 
-    std::string_view downSoundId;
-    bool weaponChanged = false;
-    bool ammunition = true;
-    float weapSpeed = 1.f;
-    if (cls.hasInventoryStore(mPtr))
-    {
-        MWWorld::InventoryStore &inv = cls.getInventoryStore(mPtr);
-        MWWorld::ContainerStoreIterator weapon = getActiveWeapon(mPtr, &weaptype);
-        if(stats.getDrawState() == DrawState::Spell)
-            weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+        const bool isWerewolf = cls.isNpc() && cls.getNpcStats(mPtr).isWerewolf();
 
-        MWWorld::Ptr newWeapon;
-        if (weapon != inv.end())
+        std::string_view downSoundId;
+        bool weaponChanged = false;
+        bool ammunition = true;
+        float weapSpeed = 1.f;
+        if (cls.hasInventoryStore(mPtr))
         {
-            newWeapon = *weapon;
-            if (isRealWeapon(mWeaponType))
-                downSoundId = newWeapon.getClass().getDownSoundId(newWeapon);
-        }
-        // weapon->HtH switch: weapon is empty already, so we need to take sound from previous weapon
-        else if (!mWeapon.isEmpty() && weaptype == ESM::Weapon::HandToHand && mWeaponType != ESM::Weapon::Spell)
-            downSoundId = mWeapon.getClass().getDownSoundId(mWeapon);
+            MWWorld::InventoryStore& inv = cls.getInventoryStore(mPtr);
+            MWWorld::ContainerStoreIterator weapon = getActiveWeapon(mPtr, &weaptype);
+            if (stats.getDrawState() == DrawState::Spell)
+                weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
 
-        if (mWeapon != newWeapon)
-        {
-            mWeapon = newWeapon;
-            weaponChanged = true;
-        }
+            MWWorld::Ptr newWeapon;
+            if (weapon != inv.end())
+            {
+                newWeapon = *weapon;
+                if (isRealWeapon(mWeaponType))
+                    downSoundId = newWeapon.getClass().getDownSoundId(newWeapon);
+            }
+            // weapon->HtH switch: weapon is empty already, so we need to take sound from previous weapon
+            else if (!mWeapon.isEmpty() && weaptype == ESM::Weapon::HandToHand && mWeaponType != ESM::Weapon::Spell)
+                downSoundId = mWeapon.getClass().getDownSoundId(mWeapon);
 
-        if (stats.getDrawState() == DrawState::Weapon && !mWeapon.isEmpty() && mWeapon.getType() == ESM::Weapon::sRecordId)
-        {
-            weapSpeed = mWeapon.get<ESM::Weapon>()->mBase->mData.mSpeed;
-            MWWorld::ConstContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
-            int ammotype = getWeaponType(mWeapon.get<ESM::Weapon>()->mBase->mData.mType)->mAmmoType;
-            if (ammotype != ESM::Weapon::None)
-                ammunition = ammo != inv.end() && ammo->get<ESM::Weapon>()->mBase->mData.mType == ammotype;
-            // Cancel attack if we no longer have ammunition
-            if (!ammunition)
+            if (mWeapon != newWeapon)
+            {
+                mWeapon = newWeapon;
+                weaponChanged = true;
+            }
+
+            if (stats.getDrawState() == DrawState::Weapon && !mWeapon.isEmpty()
+                && mWeapon.getType() == ESM::Weapon::sRecordId)
             {
-                if (mUpperBodyState == UpperBodyState::AttackWindUp)
+                weapSpeed = mWeapon.get<ESM::Weapon>()->mBase->mData.mSpeed;
+                MWWorld::ConstContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
+                int ammotype = getWeaponType(mWeapon.get<ESM::Weapon>()->mBase->mData.mType)->mAmmoType;
+                if (ammotype != ESM::Weapon::None)
+                    ammunition = ammo != inv.end() && ammo->get<ESM::Weapon>()->mBase->mData.mType == ammotype;
+                // Cancel attack if we no longer have ammunition
+                if (!ammunition)
                 {
-                    mAnimation->disable(mCurrentWeapon);
-                    mUpperBodyState = UpperBodyState::WeaponEquipped;
+                    if (mUpperBodyState == UpperBodyState::AttackWindUp)
+                    {
+                        mAnimation->disable(mCurrentWeapon);
+                        mUpperBodyState = UpperBodyState::WeaponEquipped;
+                    }
+                    setAttackingOrSpell(false);
                 }
-                setAttackingOrSpell(false);
             }
-        }
 
-        MWWorld::ConstContainerStoreIterator torch = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
-        if (torch != inv.end() && torch->getType() == ESM::Light::sRecordId && updateCarriedLeftVisible(mWeaponType))
-        {
-            if (mAnimation->isPlaying("shield"))
-                mAnimation->disable("shield");
+            MWWorld::ConstContainerStoreIterator torch = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
+            if (torch != inv.end() && torch->getType() == ESM::Light::sRecordId
+                && updateCarriedLeftVisible(mWeaponType))
+            {
+                if (mAnimation->isPlaying("shield"))
+                    mAnimation->disable("shield");
 
-            mAnimation->play("torch", Priority_Torch, MWRender::Animation::BlendMask_LeftArm,
-                false, 1.0f, "start", "stop", 0.0f, std::numeric_limits<size_t>::max(), true);
-        }
-        else if (mAnimation->isPlaying("torch"))
-        {
-            mAnimation->disable("torch");
+                mAnimation->play("torch", Priority_Torch, MWRender::Animation::BlendMask_LeftArm, false, 1.0f, "start",
+                    "stop", 0.0f, std::numeric_limits<size_t>::max(), true);
+            }
+            else if (mAnimation->isPlaying("torch"))
+            {
+                mAnimation->disable("torch");
+            }
         }
-    }
 
-    // For biped actors, blend weapon animations with lower body animations with higher priority
-    MWRender::Animation::AnimPriority priorityWeapon(Priority_Weapon);
-    if (cls.isBipedal(mPtr))
-        priorityWeapon[MWRender::Animation::BoneGroup_LowerBody] = Priority_WeaponLowerBody;
+        // For biped actors, blend weapon animations with lower body animations with higher priority
+        MWRender::Animation::AnimPriority priorityWeapon(Priority_Weapon);
+        if (cls.isBipedal(mPtr))
+            priorityWeapon[MWRender::Animation::BoneGroup_LowerBody] = Priority_WeaponLowerBody;
 
-    bool forcestateupdate = false;
+        bool forcestateupdate = false;
 
-    // We should not play equipping animation and sound during weapon->weapon transition
-    const bool isStillWeapon = isRealWeapon(mWeaponType) && isRealWeapon(weaptype);
+        // We should not play equipping animation and sound during weapon->weapon transition
+        const bool isStillWeapon = isRealWeapon(mWeaponType) && isRealWeapon(weaptype);
 
-    // If the current weapon type was changed in the middle of attack (e.g. by Equip console command or when bound spell expires),
-    // we should force actor to the "weapon equipped" state, interrupt attack and update animations.
-    if (isStillWeapon && mWeaponType != weaptype && mUpperBodyState > UpperBodyState::WeaponEquipped)
-    {
-        forcestateupdate = true;
-        if (!mCurrentWeapon.empty())
-            mAnimation->disable(mCurrentWeapon);
-        mUpperBodyState = UpperBodyState::WeaponEquipped;
-        setAttackingOrSpell(false);
-        mAnimation->showWeapons(true);
-    }
+        // If the current weapon type was changed in the middle of attack (e.g. by Equip console command or when bound
+        // spell expires), we should force actor to the "weapon equipped" state, interrupt attack and update animations.
+        if (isStillWeapon && mWeaponType != weaptype && mUpperBodyState > UpperBodyState::WeaponEquipped)
+        {
+            forcestateupdate = true;
+            if (!mCurrentWeapon.empty())
+                mAnimation->disable(mCurrentWeapon);
+            mUpperBodyState = UpperBodyState::WeaponEquipped;
+            setAttackingOrSpell(false);
+            mAnimation->showWeapons(true);
+        }
 
-    if(!isKnockedOut() && !isKnockedDown() && !isRecovery())
-    {
-        std::string weapgroup;
-        if ((!isWerewolf || mWeaponType != ESM::Weapon::Spell)
-            && weaptype != mWeaponType
-            && mUpperBodyState != UpperBodyState::Unequipping
-            && !isStillWeapon)
+        if (!isKnockedOut() && !isKnockedDown() && !isRecovery())
         {
-            // We can not play un-equip animation if weapon changed since last update
-            if (!weaponChanged)
+            std::string weapgroup;
+            if ((!isWerewolf || mWeaponType != ESM::Weapon::Spell) && weaptype != mWeaponType
+                && mUpperBodyState != UpperBodyState::Unequipping && !isStillWeapon)
             {
-                // Note: we do not disable unequipping animation automatically to avoid body desync
-                weapgroup = getWeaponAnimation(mWeaponType);
-                int unequipMask = MWRender::Animation::BlendMask_All;
-                bool useShieldAnims = mAnimation->useShieldAnimations();
-                if (useShieldAnims && mWeaponType != ESM::Weapon::HandToHand && mWeaponType != ESM::Weapon::Spell && !(mWeaponType == ESM::Weapon::None && weaptype == ESM::Weapon::Spell))
+                // We can not play un-equip animation if weapon changed since last update
+                if (!weaponChanged)
                 {
-                    unequipMask = unequipMask |~MWRender::Animation::BlendMask_LeftArm;
-                    mAnimation->play("shield", Priority_Block,
-                                MWRender::Animation::BlendMask_LeftArm, true,
-                                1.0f, "unequip start", "unequip stop", 0.0f, 0);
-                }
-                else if (mWeaponType == ESM::Weapon::HandToHand)
-                    mAnimation->showCarriedLeft(false);
+                    // Note: we do not disable unequipping animation automatically to avoid body desync
+                    weapgroup = getWeaponAnimation(mWeaponType);
+                    int unequipMask = MWRender::Animation::BlendMask_All;
+                    bool useShieldAnims = mAnimation->useShieldAnimations();
+                    if (useShieldAnims && mWeaponType != ESM::Weapon::HandToHand && mWeaponType != ESM::Weapon::Spell
+                        && !(mWeaponType == ESM::Weapon::None && weaptype == ESM::Weapon::Spell))
+                    {
+                        unequipMask = unequipMask | ~MWRender::Animation::BlendMask_LeftArm;
+                        mAnimation->play("shield", Priority_Block, MWRender::Animation::BlendMask_LeftArm, true, 1.0f,
+                            "unequip start", "unequip stop", 0.0f, 0);
+                    }
+                    else if (mWeaponType == ESM::Weapon::HandToHand)
+                        mAnimation->showCarriedLeft(false);
 
-                mAnimation->play(weapgroup, priorityWeapon, unequipMask, false,
-                                1.0f, "unequip start", "unequip stop", 0.0f, 0);
-                mUpperBodyState = UpperBodyState::Unequipping;
+                    mAnimation->play(
+                        weapgroup, priorityWeapon, unequipMask, false, 1.0f, "unequip start", "unequip stop", 0.0f, 0);
+                    mUpperBodyState = UpperBodyState::Unequipping;
 
-                mAnimation->detachArrow();
+                    mAnimation->detachArrow();
 
-                // If we do not have the "unequip detach" key, hide weapon manually.
-                if (mAnimation->getTextKeyTime(weapgroup+": unequip detach") < 0)
-                    mAnimation->showWeapons(false);
-            }
+                    // If we do not have the "unequip detach" key, hide weapon manually.
+                    if (mAnimation->getTextKeyTime(weapgroup + ": unequip detach") < 0)
+                        mAnimation->showWeapons(false);
+                }
 
-            if(!downSoundId.empty())
-            {
-                sndMgr->playSound3D(mPtr, downSoundId, 1.0f, 1.0f);
+                if (!downSoundId.empty())
+                {
+                    sndMgr->playSound3D(mPtr, downSoundId, 1.0f, 1.0f);
+                }
             }
-        }
 
-        float complete;
-        bool animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete);
-        if (!animPlaying || complete >= 1.0f)
-        {
-            // Weapon is changed, no current animation (e.g. unequipping or attack).
-            // Start equipping animation now.
-            if (weaptype != mWeaponType)
+            float complete;
+            bool animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete);
+            if (!animPlaying || complete >= 1.0f)
             {
-                forcestateupdate = true;
-                bool useShieldAnims = mAnimation->useShieldAnimations();
-                if (!useShieldAnims)
-                    mAnimation->showCarriedLeft(updateCarriedLeftVisible(weaptype));
+                // Weapon is changed, no current animation (e.g. unequipping or attack).
+                // Start equipping animation now.
+                if (weaptype != mWeaponType)
+                {
+                    forcestateupdate = true;
+                    bool useShieldAnims = mAnimation->useShieldAnimations();
+                    if (!useShieldAnims)
+                        mAnimation->showCarriedLeft(updateCarriedLeftVisible(weaptype));
 
-                weapgroup = getWeaponAnimation(weaptype);
+                    weapgroup = getWeaponAnimation(weaptype);
 
-                // Note: controllers for ranged weapon should use time for beginning of animation to play shooting properly,
-                // for other weapons they should use absolute time. Some mods rely on this behaviour (to rotate throwing projectiles, for example)
-                ESM::WeaponType::Class weaponClass = getWeaponType(weaptype)->mWeaponClass;
-                bool useRelativeDuration = weaponClass == ESM::WeaponType::Ranged;
-                mAnimation->setWeaponGroup(weapgroup, useRelativeDuration);
+                    // Note: controllers for ranged weapon should use time for beginning of animation to play shooting
+                    // properly, for other weapons they should use absolute time. Some mods rely on this behaviour (to
+                    // rotate throwing projectiles, for example)
+                    ESM::WeaponType::Class weaponClass = getWeaponType(weaptype)->mWeaponClass;
+                    bool useRelativeDuration = weaponClass == ESM::WeaponType::Ranged;
+                    mAnimation->setWeaponGroup(weapgroup, useRelativeDuration);
 
-                if (!isStillWeapon)
-                {
-                    if (animPlaying)
-                        mAnimation->disable(mCurrentWeapon);
-                    if (weaptype != ESM::Weapon::None)
+                    if (!isStillWeapon)
                     {
-                        mAnimation->showWeapons(false);
-                        int equipMask = MWRender::Animation::BlendMask_All;
-                        if (useShieldAnims && weaptype != ESM::Weapon::Spell)
+                        if (animPlaying)
+                            mAnimation->disable(mCurrentWeapon);
+                        if (weaptype != ESM::Weapon::None)
                         {
-                            equipMask = equipMask |~MWRender::Animation::BlendMask_LeftArm;
-                            mAnimation->play("shield", Priority_Block,
-                                        MWRender::Animation::BlendMask_LeftArm, true,
-                                        1.0f, "equip start", "equip stop", 0.0f, 0);
-                        }
+                            mAnimation->showWeapons(false);
+                            int equipMask = MWRender::Animation::BlendMask_All;
+                            if (useShieldAnims && weaptype != ESM::Weapon::Spell)
+                            {
+                                equipMask = equipMask | ~MWRender::Animation::BlendMask_LeftArm;
+                                mAnimation->play("shield", Priority_Block, MWRender::Animation::BlendMask_LeftArm, true,
+                                    1.0f, "equip start", "equip stop", 0.0f, 0);
+                            }
 
-                        mAnimation->play(weapgroup, priorityWeapon, equipMask, true,
-                                        1.0f, "equip start", "equip stop", 0.0f, 0);
-                        mUpperBodyState = UpperBodyState::Equipping;
+                            mAnimation->play(
+                                weapgroup, priorityWeapon, equipMask, true, 1.0f, "equip start", "equip stop", 0.0f, 0);
+                            mUpperBodyState = UpperBodyState::Equipping;
 
-                        // If we do not have the "equip attach" key, show weapon manually.
-                        if (weaptype != ESM::Weapon::Spell && mAnimation->getTextKeyTime(weapgroup+": equip attach") < 0)
-                        {
-                            mAnimation->showWeapons(true);
+                            // If we do not have the "equip attach" key, show weapon manually.
+                            if (weaptype != ESM::Weapon::Spell
+                                && mAnimation->getTextKeyTime(weapgroup + ": equip attach") < 0)
+                            {
+                                mAnimation->showWeapons(true);
+                            }
+
+                            if (!mWeapon.isEmpty() && mWeaponType != ESM::Weapon::HandToHand && isRealWeapon(weaptype))
+                            {
+                                std::string_view upSoundId = mWeapon.getClass().getUpSoundId(mWeapon);
+                                if (!upSoundId.empty())
+                                    sndMgr->playSound3D(mPtr, upSoundId, 1.0f, 1.0f);
+                            }
                         }
+                    }
 
-                        if (!mWeapon.isEmpty() && mWeaponType != ESM::Weapon::HandToHand && isRealWeapon(weaptype))
+                    if (isWerewolf)
+                    {
+                        const MWWorld::ESMStore& store = world->getStore();
+                        const ESM::Sound* sound = store.get<ESM::Sound>().searchRandom("WolfEquip", prng);
+                        if (sound)
                         {
-                            std::string_view upSoundId = mWeapon.getClass().getUpSoundId(mWeapon);
-                            if (!upSoundId.empty())
-                                sndMgr->playSound3D(mPtr, upSoundId, 1.0f, 1.0f);
+                            sndMgr->playSound3D(mPtr, sound->mId, 1.0f, 1.0f);
                         }
                     }
+
+                    mWeaponType = weaptype;
+                    mCurrentWeapon = weapgroup;
                 }
 
-                if(isWerewolf)
+                // Make sure that we disabled unequipping animation
+                if (mUpperBodyState == UpperBodyState::Unequipping)
                 {
-                    const MWWorld::ESMStore &store = world->getStore();
-                    const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfEquip", prng);
-                    if(sound)
-                    {
-                        sndMgr->playSound3D(mPtr, sound->mId, 1.0f, 1.0f);
-                    }
+                    resetCurrentWeaponState();
+                    mWeaponType = ESM::Weapon::None;
                 }
-
-                mWeaponType = weaptype;
-                mCurrentWeapon = weapgroup;
-            }
-
-            // Make sure that we disabled unequipping animation
-            if (mUpperBodyState == UpperBodyState::Unequipping)
-            {
-                resetCurrentWeaponState();
-                mWeaponType = ESM::Weapon::None;
             }
         }
-    }
 
-    if(isWerewolf)
-    {
-        if(stats.getStance(MWMechanics::CreatureStats::Stance_Run)
-            && mHasMovedInXY
-            && !world->isSwimming(mPtr)
-            && mWeaponType == ESM::Weapon::None)
+        if (isWerewolf)
         {
-            if(!sndMgr->getSoundPlaying(mPtr, "WolfRun"))
-                sndMgr->playSound3D(mPtr, "WolfRun", 1.0f, 1.0f, MWSound::Type::Sfx,
-                                    MWSound::PlayMode::Loop);
+            if (stats.getStance(MWMechanics::CreatureStats::Stance_Run) && mHasMovedInXY && !world->isSwimming(mPtr)
+                && mWeaponType == ESM::Weapon::None)
+            {
+                if (!sndMgr->getSoundPlaying(mPtr, "WolfRun"))
+                    sndMgr->playSound3D(mPtr, "WolfRun", 1.0f, 1.0f, MWSound::Type::Sfx, MWSound::PlayMode::Loop);
+            }
+            else
+                sndMgr->stopSound3D(mPtr, "WolfRun");
         }
-        else
-            sndMgr->stopSound3D(mPtr, "WolfRun");
-    }
 
-    // Combat for actors with persistent animations obviously will be buggy
-    if (isPersistentAnimPlaying())
-        return forcestateupdate;
+        // Combat for actors with persistent animations obviously will be buggy
+        if (isPersistentAnimPlaying())
+            return forcestateupdate;
 
-    float complete = 0.f;
-    bool animPlaying = false;
-    ESM::WeaponType::Class weapclass = getWeaponType(mWeaponType)->mWeaponClass;
-    if(getAttackingOrSpell())
-    {
-        bool resetIdle = true;
-        if (mUpperBodyState == UpperBodyState::WeaponEquipped && (mHitState == CharState_None || mHitState == CharState_Block))
+        float complete = 0.f;
+        bool animPlaying = false;
+        ESM::WeaponType::Class weapclass = getWeaponType(mWeaponType)->mWeaponClass;
+        if (getAttackingOrSpell())
         {
-            mAttackStrength = 0;
-
-            // Randomize attacks for non-bipedal creatures
-            if (!cls.isBipedal(mPtr) && (!mAnimation->hasAnimation(mCurrentWeapon) || isRandomAttackAnimation(mCurrentWeapon)))
+            bool resetIdle = true;
+            if (mUpperBodyState == UpperBodyState::WeaponEquipped
+                && (mHitState == CharState_None || mHitState == CharState_Block))
             {
-                mCurrentWeapon = chooseRandomAttackAnimation();
-            }
+                mAttackStrength = 0;
 
-            if(mWeaponType == ESM::Weapon::Spell)
-            {
-                // Unset casting flag, otherwise pressing the mouse button down would
-                // continue casting every frame if there is no animation
-                setAttackingOrSpell(false);
-                if (mPtr == getPlayer())
+                // Randomize attacks for non-bipedal creatures
+                if (!cls.isBipedal(mPtr)
+                    && (!mAnimation->hasAnimation(mCurrentWeapon) || isRandomAttackAnimation(mCurrentWeapon)))
                 {
-                    // For the player, set the spell we want to cast
-                    // This has to be done at the start of the casting animation,
-                    // *not* when selecting a spell in the GUI (otherwise you could change the spell mid-animation)
-                    const std::string& selectedSpell = MWBase::Environment::get().getWindowManager()->getSelectedSpell();
-                    stats.getSpells().setSelectedSpell(selectedSpell);
+                    mCurrentWeapon = chooseRandomAttackAnimation();
                 }
-                std::string_view spellid = stats.getSpells().getSelectedSpell();
-                bool isMagicItem = false;
 
-                // Play hand VFX and allow castSpell use (assuming an animation is going to be played) if spellcasting is successful.
-                // Manual spellcasting bypasses restrictions.
-                MWWorld::SpellCastState spellCastResult = MWWorld::SpellCastState::Success;
-                if (!mCastingManualSpell)
-                    spellCastResult = world->startSpellCast(mPtr);
-                mCanCast = spellCastResult == MWWorld::SpellCastState::Success;
-
-                if (spellid.empty() && cls.hasInventoryStore(mPtr))
+                if (mWeaponType == ESM::Weapon::Spell)
                 {
-                    MWWorld::InventoryStore& inv = cls.getInventoryStore(mPtr);
-                    if (inv.getSelectedEnchantItem() != inv.end())
+                    // Unset casting flag, otherwise pressing the mouse button down would
+                    // continue casting every frame if there is no animation
+                    setAttackingOrSpell(false);
+                    if (mPtr == getPlayer())
                     {
-                        const MWWorld::Ptr& enchantItem = *inv.getSelectedEnchantItem();
-                        spellid = enchantItem.getClass().getEnchantment(enchantItem);
-                        isMagicItem = true;
+                        // For the player, set the spell we want to cast
+                        // This has to be done at the start of the casting animation,
+                        // *not* when selecting a spell in the GUI (otherwise you could change the spell mid-animation)
+                        const std::string& selectedSpell
+                            = MWBase::Environment::get().getWindowManager()->getSelectedSpell();
+                        stats.getSpells().setSelectedSpell(selectedSpell);
                     }
-                }
+                    std::string_view spellid = stats.getSpells().getSelectedSpell();
+                    bool isMagicItem = false;
 
-                static const bool useCastingAnimations = Settings::Manager::getBool("use magic item animations", "Game");
-                if (isMagicItem && !useCastingAnimations)
-                {
-                    world->breakInvisibility(mPtr);
-                    // Enchanted items by default do not use casting animations
-                    world->castSpell(mPtr);
-                    resetIdle = false;
-                    // Spellcasting animation needs to "play" for at least one frame to reset the aiming factor
-                    animPlaying = true;
-                    mUpperBodyState = UpperBodyState::Casting;
-                }
-                // Play the spellcasting animation/VFX if the spellcasting was successful or failed due to insufficient magicka.
-                // Used up powers are exempt from this from some reason.
-                else if (!spellid.empty() && spellCastResult != MWWorld::SpellCastState::PowerAlreadyUsed)
-                {
-                    world->breakInvisibility(mPtr);
-                    MWMechanics::CastSpell cast(mPtr, {}, false, mCastingManualSpell);
+                    // Play hand VFX and allow castSpell use (assuming an animation is going to be played) if
+                    // spellcasting is successful. Manual spellcasting bypasses restrictions.
+                    MWWorld::SpellCastState spellCastResult = MWWorld::SpellCastState::Success;
+                    if (!mCastingManualSpell)
+                        spellCastResult = world->startSpellCast(mPtr);
+                    mCanCast = spellCastResult == MWWorld::SpellCastState::Success;
 
-                    const std::vector<ESM::ENAMstruct>* effects{nullptr};
-                    const MWWorld::ESMStore &store = world->getStore();
-                    if (isMagicItem)
+                    if (spellid.empty() && cls.hasInventoryStore(mPtr))
                     {
-                        const ESM::Enchantment *enchantment = store.get<ESM::Enchantment>().find(spellid);
-                        effects = &enchantment->mEffects.mList;
-                        cast.playSpellCastingEffects(enchantment);
+                        MWWorld::InventoryStore& inv = cls.getInventoryStore(mPtr);
+                        if (inv.getSelectedEnchantItem() != inv.end())
+                        {
+                            const MWWorld::Ptr& enchantItem = *inv.getSelectedEnchantItem();
+                            spellid = enchantItem.getClass().getEnchantment(enchantItem);
+                            isMagicItem = true;
+                        }
                     }
-                    else
+
+                    static const bool useCastingAnimations
+                        = Settings::Manager::getBool("use magic item animations", "Game");
+                    if (isMagicItem && !useCastingAnimations)
                     {
-                        const ESM::Spell *spell = store.get<ESM::Spell>().find(spellid);
-                        effects = &spell->mEffects.mList;
-                        cast.playSpellCastingEffects(spell);
+                        world->breakInvisibility(mPtr);
+                        // Enchanted items by default do not use casting animations
+                        world->castSpell(mPtr);
+                        resetIdle = false;
+                        // Spellcasting animation needs to "play" for at least one frame to reset the aiming factor
+                        animPlaying = true;
+                        mUpperBodyState = UpperBodyState::Casting;
                     }
-                    if (mCanCast)
+                    // Play the spellcasting animation/VFX if the spellcasting was successful or failed due to
+                    // insufficient magicka. Used up powers are exempt from this from some reason.
+                    else if (!spellid.empty() && spellCastResult != MWWorld::SpellCastState::PowerAlreadyUsed)
                     {
-                        const ESM::MagicEffect *effect = store.get<ESM::MagicEffect>().find(effects->back().mEffectID); // use last effect of list for color of VFX_Hands
+                        world->breakInvisibility(mPtr);
+                        MWMechanics::CastSpell cast(mPtr, {}, false, mCastingManualSpell);
+
+                        const std::vector<ESM::ENAMstruct>* effects{ nullptr };
+                        const MWWorld::ESMStore& store = world->getStore();
+                        if (isMagicItem)
+                        {
+                            const ESM::Enchantment* enchantment = store.get<ESM::Enchantment>().find(spellid);
+                            effects = &enchantment->mEffects.mList;
+                            cast.playSpellCastingEffects(enchantment);
+                        }
+                        else
+                        {
+                            const ESM::Spell* spell = store.get<ESM::Spell>().find(spellid);
+                            effects = &spell->mEffects.mList;
+                            cast.playSpellCastingEffects(spell);
+                        }
+                        if (mCanCast)
+                        {
+                            const ESM::MagicEffect* effect = store.get<ESM::MagicEffect>().find(
+                                effects->back().mEffectID); // use last effect of list for color of VFX_Hands
+
+                            const ESM::Static* castStatic = world->getStore().get<ESM::Static>().find("VFX_Hands");
 
-                        const ESM::Static* castStatic = world->getStore().get<ESM::Static>().find ("VFX_Hands");
+                            const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+
+                            if (!effects->empty())
+                            {
+                                if (mAnimation->getNode("Bip01 L Hand"))
+                                    mAnimation->addEffect(
+                                        Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs), -1, false,
+                                        "Bip01 L Hand", effect->mParticle);
+
+                                if (mAnimation->getNode("Bip01 R Hand"))
+                                    mAnimation->addEffect(
+                                        Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs), -1, false,
+                                        "Bip01 R Hand", effect->mParticle);
+                            }
+                        }
 
-                        const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+                        const ESM::ENAMstruct& firstEffect = effects->at(0); // first effect used for casting animation
 
-                        if (!effects->empty())
+                        std::string startKey;
+                        std::string stopKey;
+                        if (isRandomAttackAnimation(mCurrentWeapon))
                         {
-                            if (mAnimation->getNode("Bip01 L Hand"))
-                                mAnimation->addEffect(
-                                    Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs),
-                                    -1, false, "Bip01 L Hand", effect->mParticle);
-
-                            if (mAnimation->getNode("Bip01 R Hand"))
-                                mAnimation->addEffect(
-                                    Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs),
-                                    -1, false, "Bip01 R Hand", effect->mParticle);
+                            startKey = "start";
+                            stopKey = "stop";
+                            if (mCanCast)
+                                world->castSpell(
+                                    mPtr, mCastingManualSpell); // No "release" text key to use, so cast immediately
+                            mCastingManualSpell = false;
+                            mCanCast = false;
                         }
-                    }
+                        else
+                        {
+                            switch (firstEffect.mRange)
+                            {
+                                case 0:
+                                    mAttackType = "self";
+                                    break;
+                                case 1:
+                                    mAttackType = "touch";
+                                    break;
+                                case 2:
+                                    mAttackType = "target";
+                                    break;
+                            }
 
-                    const ESM::ENAMstruct& firstEffect = effects->at(0); // first effect used for casting animation
+                            startKey = mAttackType + " start";
+                            stopKey = mAttackType + " stop";
+                        }
 
-                    std::string startKey;
-                    std::string stopKey;
-                    if (isRandomAttackAnimation(mCurrentWeapon))
-                    {
-                        startKey = "start";
-                        stopKey = "stop";
-                        if (mCanCast)
-                            world->castSpell(mPtr, mCastingManualSpell); // No "release" text key to use, so cast immediately
-                        mCastingManualSpell = false;
-                        mCanCast = false;
+                        mAnimation->play(mCurrentWeapon, priorityWeapon, MWRender::Animation::BlendMask_All, false, 1,
+                            startKey, stopKey, 0.0f, 0);
+                        mUpperBodyState = UpperBodyState::Casting;
                     }
                     else
                     {
-                        switch(firstEffect.mRange)
-                        {
-                            case 0: mAttackType = "self"; break;
-                            case 1: mAttackType = "touch"; break;
-                            case 2: mAttackType = "target"; break;
-                        }
-
-                        startKey = mAttackType+" start";
-                        stopKey = mAttackType+" stop";
+                        resetIdle = false;
                     }
-
-                    mAnimation->play(mCurrentWeapon, priorityWeapon,
-                                     MWRender::Animation::BlendMask_All, false,
-                                     1, startKey, stopKey,
-                                     0.0f, 0);
-                    mUpperBodyState = UpperBodyState::Casting;
                 }
                 else
                 {
-                    resetIdle = false;
-                }
-            }
-            else
-            {
-                std::string startKey = "start";
-                std::string stopKey = "stop";
+                    std::string startKey = "start";
+                    std::string stopKey = "stop";
 
-                if (mWeaponType != ESM::Weapon::PickProbe && !isRandomAttackAnimation(mCurrentWeapon))
-                {
-                    if (weapclass == ESM::WeaponType::Ranged || weapclass == ESM::WeaponType::Thrown)
-                        mAttackType = "shoot";
-                    else if (mPtr == getPlayer())
+                    if (mWeaponType != ESM::Weapon::PickProbe && !isRandomAttackAnimation(mCurrentWeapon))
                     {
-                        if (Settings::Manager::getBool("best attack", "Game"))
+                        if (weapclass == ESM::WeaponType::Ranged || weapclass == ESM::WeaponType::Thrown)
+                            mAttackType = "shoot";
+                        else if (mPtr == getPlayer())
                         {
-                            if (!mWeapon.isEmpty() && mWeapon.getType() == ESM::Weapon::sRecordId)
+                            if (Settings::Manager::getBool("best attack", "Game"))
                             {
-                                mAttackType = getBestAttack(mWeapon.get<ESM::Weapon>()->mBase);
+                                if (!mWeapon.isEmpty() && mWeapon.getType() == ESM::Weapon::sRecordId)
+                                {
+                                    mAttackType = getBestAttack(mWeapon.get<ESM::Weapon>()->mBase);
+                                }
+                                else
+                                {
+                                    // There is no "best attack" for Hand-to-Hand
+                                    mAttackType = getRandomAttackType();
+                                }
                             }
                             else
                             {
-                                // There is no "best attack" for Hand-to-Hand
-                                mAttackType = getRandomAttackType();
+                                mAttackType = getMovementBasedAttackType();
                             }
                         }
-                        else
-                        {
-                            mAttackType = getMovementBasedAttackType();
-                        }
+                        // else if (mPtr != getPlayer()) use mAttackType set by AiCombat
+                        startKey = mAttackType + ' ' + startKey;
+                        stopKey = mAttackType + " max attack";
                     }
-                    // else if (mPtr != getPlayer()) use mAttackType set by AiCombat
-                    startKey = mAttackType + ' ' + startKey;
-                    stopKey = mAttackType + " max attack";
-                }
 
-                mAnimation->play(mCurrentWeapon, priorityWeapon,
-                                 MWRender::Animation::BlendMask_All, false,
-                                 weapSpeed, startKey, stopKey,
-                                 0.0f, 0);
-                mUpperBodyState = UpperBodyState::AttackWindUp;
+                    mAnimation->play(mCurrentWeapon, priorityWeapon, MWRender::Animation::BlendMask_All, false,
+                        weapSpeed, startKey, stopKey, 0.0f, 0);
+                    mUpperBodyState = UpperBodyState::AttackWindUp;
 
-                // Reset the attack results when the attack starts.
-                // Strictly speaking this should probably be done when the attack ends,
-                // but the attack animation might be cancelled in a myriad different ways.
-                mAttackSuccess = false;
-                mAttackVictim = MWWorld::Ptr();
-                mAttackHitPos = osg::Vec3f();
+                    // Reset the attack results when the attack starts.
+                    // Strictly speaking this should probably be done when the attack ends,
+                    // but the attack animation might be cancelled in a myriad different ways.
+                    mAttackSuccess = false;
+                    mAttackVictim = MWWorld::Ptr();
+                    mAttackHitPos = osg::Vec3f();
+                }
             }
-        }
 
-        // We should not break swim and sneak animations
-        if (resetIdle && mIdleState != CharState_IdleSneak && mIdleState != CharState_IdleSwim)
-        {
-            resetCurrentIdleState();
+            // We should not break swim and sneak animations
+            if (resetIdle && mIdleState != CharState_IdleSneak && mIdleState != CharState_IdleSwim)
+            {
+                resetCurrentIdleState();
+            }
         }
-    }
 
-    // Random attack and pick/probe animations never have wind up and are played to their end.
-    // Other animations must be released when the attack state is unset.
-    if (mUpperBodyState == UpperBodyState::AttackWindUp && (mWeaponType == ESM::Weapon::PickProbe || isRandomAttackAnimation(mCurrentWeapon) || !getAttackingOrSpell()))
-    {
-        mUpperBodyState = UpperBodyState::AttackRelease;
-        world->breakInvisibility(mPtr);
-        if (mWeaponType == ESM::Weapon::PickProbe)
+        // Random attack and pick/probe animations never have wind up and are played to their end.
+        // Other animations must be released when the attack state is unset.
+        if (mUpperBodyState == UpperBodyState::AttackWindUp
+            && (mWeaponType == ESM::Weapon::PickProbe || isRandomAttackAnimation(mCurrentWeapon)
+                || !getAttackingOrSpell()))
         {
-            // TODO: this will only work for the player, and needs to be fixed if NPCs should ever use lockpicks/probes.
-            MWWorld::Ptr target = world->getFacedObject();
+            mUpperBodyState = UpperBodyState::AttackRelease;
+            world->breakInvisibility(mPtr);
+            if (mWeaponType == ESM::Weapon::PickProbe)
+            {
+                // TODO: this will only work for the player, and needs to be fixed if NPCs should ever use
+                // lockpicks/probes.
+                MWWorld::Ptr target = world->getFacedObject();
 
-            if (!target.isEmpty())
+                if (!target.isEmpty())
+                {
+                    std::string_view resultMessage, resultSound;
+                    if (mWeapon.getType() == ESM::Lockpick::sRecordId)
+                        Security(mPtr).pickLock(target, mWeapon, resultMessage, resultSound);
+                    else if (mWeapon.getType() == ESM::Probe::sRecordId)
+                        Security(mPtr).probeTrap(target, mWeapon, resultMessage, resultSound);
+                    if (!resultMessage.empty())
+                        MWBase::Environment::get().getWindowManager()->messageBox(resultMessage);
+                    if (!resultSound.empty())
+                        sndMgr->playSound3D(target, resultSound, 1.0f, 1.0f);
+                }
+            }
+            else
             {
-                std::string_view resultMessage, resultSound;
-                if (mWeapon.getType() == ESM::Lockpick::sRecordId)
-                    Security(mPtr).pickLock(target, mWeapon, resultMessage, resultSound);
-                else if (mWeapon.getType() == ESM::Probe::sRecordId)
-                    Security(mPtr).probeTrap(target, mWeapon, resultMessage, resultSound);
-                if (!resultMessage.empty())
-                    MWBase::Environment::get().getWindowManager()->messageBox(resultMessage);
-                if (!resultSound.empty())
-                    sndMgr->playSound3D(target, resultSound, 1.0f, 1.0f);
+                mAttackStrength = calculateWindUp();
+                if (mAttackStrength == -1.f)
+                    mAttackStrength = std::min(1.f, 0.1f + Misc::Rng::rollClosedProbability(prng));
+                if (weapclass != ESM::WeaponType::Ranged && weapclass != ESM::WeaponType::Thrown)
+                {
+                    mAttackSuccess = cls.evaluateHit(mPtr, mAttackVictim, mAttackHitPos);
+                    if (!mAttackSuccess)
+                        mAttackStrength = 0.f;
+                    playSwishSound();
+                }
             }
+
+            if (mWeaponType == ESM::Weapon::PickProbe || isRandomAttackAnimation(mCurrentWeapon))
+                mUpperBodyState = UpperBodyState::AttackEnd;
         }
-        else
+
+        if (mUpperBodyState == UpperBodyState::AttackRelease)
         {
-            mAttackStrength = calculateWindUp();
-            if (mAttackStrength == -1.f)
-                mAttackStrength = std::min(1.f, 0.1f + Misc::Rng::rollClosedProbability(prng));
-            if (weapclass != ESM::WeaponType::Ranged && weapclass != ESM::WeaponType::Thrown)
+            // The release state might have been reached before reaching the wind-up section. We'll play the new section
+            // only when the wind-up section is reached.
+            float currentTime = mAnimation->getCurrentTime(mCurrentWeapon);
+            float minAttackTime = mAnimation->getTextKeyTime(mCurrentWeapon + ": " + mAttackType + " min attack");
+            float maxAttackTime = mAnimation->getTextKeyTime(mCurrentWeapon + ": " + mAttackType + " max attack");
+            if (minAttackTime <= currentTime && currentTime <= maxAttackTime)
+            {
+                std::string hit = mAttackType != "shoot" ? "hit" : "release";
+
+                float startPoint = 0.f;
+
+                // Skip a bit of the pre-hit section based on the attack strength
+                if (minAttackTime != -1.f && minAttackTime < maxAttackTime)
+                {
+                    startPoint = 1.f - mAttackStrength;
+                    float minHitTime = mAnimation->getTextKeyTime(mCurrentWeapon + ": " + mAttackType + " min hit");
+                    float hitTime = mAnimation->getTextKeyTime(mCurrentWeapon + ": " + mAttackType + ' ' + hit);
+                    if (maxAttackTime <= minHitTime && minHitTime < hitTime)
+                        startPoint *= (minHitTime - maxAttackTime) / (hitTime - maxAttackTime);
+                }
+
+                mAnimation->disable(mCurrentWeapon);
+                mAnimation->play(mCurrentWeapon, priorityWeapon, MWRender::Animation::BlendMask_All, false, weapSpeed,
+                    mAttackType + " max attack", mAttackType + ' ' + hit, startPoint, 0);
+            }
+
+            animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete);
+
+            // Try playing the "follow" section if the attack animation ended naturally or didn't play at all.
+            if (!animPlaying || (currentTime >= maxAttackTime && complete >= 1.f))
             {
-                mAttackSuccess = cls.evaluateHit(mPtr, mAttackVictim, mAttackHitPos);
-                if (!mAttackSuccess)
-                    mAttackStrength = 0.f;
-                playSwishSound();
+                std::string start = "follow start";
+                std::string stop = "follow stop";
+
+                if (mAttackType != "shoot")
+                {
+                    std::string strength = mAttackStrength < 0.33f ? "small"
+                        : mAttackStrength < 0.66f                  ? "medium"
+                                                                   : "large";
+                    start = strength + ' ' + start;
+                    stop = strength + ' ' + stop;
+                }
+
+                if (animPlaying)
+                    mAnimation->disable(mCurrentWeapon);
+                MWRender::Animation::AnimPriority priorityFollow(priorityWeapon);
+                // Follow animations have lower priority than movement for non-biped creatures, logic be damned
+                if (!cls.isBipedal(mPtr))
+                    priorityFollow = Priority_Default;
+                mAnimation->play(mCurrentWeapon, priorityFollow, MWRender::Animation::BlendMask_All, false, weapSpeed,
+                    mAttackType + ' ' + start, mAttackType + ' ' + stop, 0.0f, 0);
+                mUpperBodyState = UpperBodyState::AttackEnd;
+
+                animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete);
             }
         }
 
-        if (mWeaponType == ESM::Weapon::PickProbe || isRandomAttackAnimation(mCurrentWeapon))
-            mUpperBodyState = UpperBodyState::AttackEnd;
-    }
+        if (!animPlaying)
+            animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete);
 
-    if (mUpperBodyState == UpperBodyState::AttackRelease)
-    {
-        // The release state might have been reached before reaching the wind-up section. We'll play the new section only when the wind-up section is reached.
-        float currentTime = mAnimation->getCurrentTime(mCurrentWeapon);
-        float minAttackTime = mAnimation->getTextKeyTime(mCurrentWeapon + ": " + mAttackType + " min attack");
-        float maxAttackTime = mAnimation->getTextKeyTime(mCurrentWeapon + ": " + mAttackType + " max attack");
-        if (minAttackTime <= currentTime && currentTime <= maxAttackTime)
+        if (!animPlaying || complete >= 1.f)
         {
-            std::string hit = mAttackType != "shoot" ? "hit" : "release";
+            if (mUpperBodyState == UpperBodyState::Equipping || mUpperBodyState == UpperBodyState::AttackEnd
+                || mUpperBodyState == UpperBodyState::Casting)
+            {
+                if (ammunition && mWeaponType == ESM::Weapon::MarksmanCrossbow)
+                    mAnimation->attachArrow();
 
-            float startPoint = 0.f;
+                // Cancel stagger animation at the end of an attack to avoid abrupt transitions
+                // in favor of a different abrupt transition, like Morrowind
+                if (mUpperBodyState != UpperBodyState::Equipping && isRecovery())
+                    mAnimation->disable(mCurrentHit);
 
-            // Skip a bit of the pre-hit section based on the attack strength
-            if (minAttackTime != -1.f && minAttackTime < maxAttackTime)
+                if (animPlaying)
+                    mAnimation->disable(mCurrentWeapon);
+
+                mUpperBodyState = UpperBodyState::WeaponEquipped;
+            }
+            else if (mUpperBodyState == UpperBodyState::Unequipping)
             {
-                startPoint = 1.f - mAttackStrength;
-                float minHitTime = mAnimation->getTextKeyTime(mCurrentWeapon + ": " + mAttackType + " min hit");
-                float hitTime = mAnimation->getTextKeyTime(mCurrentWeapon + ": " + mAttackType + ' ' + hit);
-                if (maxAttackTime <= minHitTime && minHitTime < hitTime)
-                    startPoint *= (minHitTime - maxAttackTime) / (hitTime - maxAttackTime);
+                if (animPlaying)
+                    mAnimation->disable(mCurrentWeapon);
+                mUpperBodyState = UpperBodyState::None;
             }
-
-            mAnimation->disable(mCurrentWeapon);
-            mAnimation->play(mCurrentWeapon, priorityWeapon, MWRender::Animation::BlendMask_All, false, weapSpeed,
-                             mAttackType + " max attack", mAttackType + ' ' + hit, startPoint, 0);
         }
 
-        animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete);
-
-        // Try playing the "follow" section if the attack animation ended naturally or didn't play at all.
-        if (!animPlaying || (currentTime >= maxAttackTime && complete >= 1.f))
+        mAnimation->setPitchFactor(0.f);
+        if (mUpperBodyState > UpperBodyState::WeaponEquipped
+            && (weapclass == ESM::WeaponType::Ranged || weapclass == ESM::WeaponType::Thrown))
         {
-            std::string start = "follow start";
-            std::string stop = "follow stop";
+            mAnimation->setPitchFactor(1.f);
 
-            if (mAttackType != "shoot")
+            // A smooth transition can be provided if a pre-wind-up section is defined. Random attack animations never
+            // have one.
+            if (mUpperBodyState == UpperBodyState::AttackWindUp && !isRandomAttackAnimation(mCurrentWeapon))
+            {
+                float currentTime = mAnimation->getCurrentTime(mCurrentWeapon);
+                float minAttackTime = mAnimation->getTextKeyTime(mCurrentWeapon + ": " + mAttackType + " min attack");
+                float startTime = mAnimation->getTextKeyTime(mCurrentWeapon + ": " + mAttackType + " start");
+                if (startTime <= currentTime && currentTime < minAttackTime)
+                    mAnimation->setPitchFactor((currentTime - startTime) / (minAttackTime - startTime));
+            }
+            else if (mUpperBodyState == UpperBodyState::AttackEnd)
             {
-                std::string strength = mAttackStrength < 0.33f ? "small" : mAttackStrength < 0.66f ? "medium" : "large";
-                start = strength + ' ' + start;
-                stop = strength + ' ' + stop;
+                // technically we do not need a pitch for crossbow reload animation,
+                // but we should avoid abrupt repositioning
+                if (mWeaponType == ESM::Weapon::MarksmanCrossbow)
+                    mAnimation->setPitchFactor(std::max(0.f, 1.f - complete * 10.f));
+                else
+                    mAnimation->setPitchFactor(1.f - complete);
             }
+        }
 
-            if (animPlaying)
-                mAnimation->disable(mCurrentWeapon);
-            MWRender::Animation::AnimPriority priorityFollow(priorityWeapon);
-            // Follow animations have lower priority than movement for non-biped creatures, logic be damned
-            if (!cls.isBipedal(mPtr))
-                priorityFollow = Priority_Default;
-            mAnimation->play(mCurrentWeapon, priorityFollow, MWRender::Animation::BlendMask_All, false, weapSpeed, mAttackType + ' ' + start, mAttackType + ' ' + stop, 0.0f, 0);
-            mUpperBodyState = UpperBodyState::AttackEnd;
+        mAnimation->setAccurateAiming(mUpperBodyState > UpperBodyState::WeaponEquipped);
 
-            animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete);
-        }
+        return forcestateupdate;
     }
 
-    if (!animPlaying)
-        animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete);
-
-    if (!animPlaying || complete >= 1.f)
+    void CharacterController::updateAnimQueue()
     {
-        if (mUpperBodyState == UpperBodyState::Equipping ||
-            mUpperBodyState == UpperBodyState::AttackEnd ||
-            mUpperBodyState == UpperBodyState::Casting)
+        if (mAnimQueue.size() > 1)
         {
-            if (ammunition && mWeaponType == ESM::Weapon::MarksmanCrossbow)
-                mAnimation->attachArrow();
-
-            // Cancel stagger animation at the end of an attack to avoid abrupt transitions
-            // in favor of a different abrupt transition, like Morrowind
-            if (mUpperBodyState != UpperBodyState::Equipping && isRecovery())
-                mAnimation->disable(mCurrentHit);
-
-            if (animPlaying)
-                mAnimation->disable(mCurrentWeapon);
+            if (mAnimation->isPlaying(mAnimQueue.front().mGroup) == false)
+            {
+                mAnimation->disable(mAnimQueue.front().mGroup);
+                mAnimQueue.pop_front();
 
-            mUpperBodyState = UpperBodyState::WeaponEquipped;
-        }
-        else if (mUpperBodyState == UpperBodyState::Unequipping)
-        {
-            if (animPlaying)
-                mAnimation->disable(mCurrentWeapon);
-            mUpperBodyState = UpperBodyState::None;
+                bool loopfallback = (mAnimQueue.front().mGroup.compare(0, 4, "idle") == 0);
+                mAnimation->play(mAnimQueue.front().mGroup, Priority_Default, MWRender::Animation::BlendMask_All, false,
+                    1.0f, "start", "stop", 0.0f, mAnimQueue.front().mLoopCount, loopfallback);
+            }
         }
+
+        if (!mAnimQueue.empty())
+            mAnimation->setLoopingEnabled(mAnimQueue.front().mGroup, mAnimQueue.size() <= 1);
     }
 
-    mAnimation->setPitchFactor(0.f);
-    if (mUpperBodyState > UpperBodyState::WeaponEquipped && (weapclass == ESM::WeaponType::Ranged || weapclass == ESM::WeaponType::Thrown))
+    void CharacterController::update(float duration)
     {
-        mAnimation->setPitchFactor(1.f);
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+        MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
+        const MWWorld::Class& cls = mPtr.getClass();
+        osg::Vec3f movement(0.f, 0.f, 0.f);
+        float speed = 0.f;
 
-        // A smooth transition can be provided if a pre-wind-up section is defined. Random attack animations never have one.
-        if (mUpperBodyState == UpperBodyState::AttackWindUp && !isRandomAttackAnimation(mCurrentWeapon))
-        {
-            float currentTime = mAnimation->getCurrentTime(mCurrentWeapon);
-            float minAttackTime = mAnimation->getTextKeyTime(mCurrentWeapon + ": " + mAttackType + " min attack");
-            float startTime = mAnimation->getTextKeyTime(mCurrentWeapon + ": " + mAttackType + " start");
-            if (startTime <= currentTime && currentTime < minAttackTime)
-                mAnimation->setPitchFactor((currentTime - startTime) / (minAttackTime - startTime));
-        }
-        else if (mUpperBodyState == UpperBodyState::AttackEnd)
-        {
-            // technically we do not need a pitch for crossbow reload animation,
-            // but we should avoid abrupt repositioning
-            if (mWeaponType == ESM::Weapon::MarksmanCrossbow)
-                mAnimation->setPitchFactor(std::max(0.f, 1.f-complete*10.f));
-            else
-                mAnimation->setPitchFactor(1.f-complete);
-        }
-    }
+        updateMagicEffects();
 
-    mAnimation->setAccurateAiming(mUpperBodyState > UpperBodyState::WeaponEquipped);
+        bool isPlayer = mPtr == MWMechanics::getPlayer();
+        bool isFirstPersonPlayer = isPlayer && MWBase::Environment::get().getWorld()->isFirstPerson();
+        bool godmode = isPlayer && MWBase::Environment::get().getWorld()->getGodModeState();
 
-    return forcestateupdate;
-}
+        float scale = mPtr.getCellRef().getScale();
 
-void CharacterController::updateAnimQueue()
-{
-    if(mAnimQueue.size() > 1)
-    {
-        if(mAnimation->isPlaying(mAnimQueue.front().mGroup) == false)
+        static const bool normalizeSpeed = Settings::Manager::getBool("normalise race speed", "Game");
+        if (!normalizeSpeed && mPtr.getClass().isNpc())
         {
-            mAnimation->disable(mAnimQueue.front().mGroup);
-            mAnimQueue.pop_front();
-
-            bool loopfallback = (mAnimQueue.front().mGroup.compare(0,4,"idle") == 0);
-            mAnimation->play(mAnimQueue.front().mGroup, Priority_Default,
-                             MWRender::Animation::BlendMask_All, false,
-                             1.0f, "start", "stop", 0.0f, mAnimQueue.front().mLoopCount, loopfallback);
+            const ESM::NPC* npc = mPtr.get<ESM::NPC>()->mBase;
+            const ESM::Race* race = world->getStore().get<ESM::Race>().find(npc->mRace);
+            float weight = npc->isMale() ? race->mData.mWeight.mMale : race->mData.mWeight.mFemale;
+            scale *= weight;
         }
-    }
 
-    if(!mAnimQueue.empty())
-        mAnimation->setLoopingEnabled(mAnimQueue.front().mGroup, mAnimQueue.size() <= 1);
-}
-
-void CharacterController::update(float duration)
-{
-    MWBase::World *world = MWBase::Environment::get().getWorld();
-    MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-    const MWWorld::Class &cls = mPtr.getClass();
-    osg::Vec3f movement(0.f, 0.f, 0.f);
-    float speed = 0.f;
-
-    updateMagicEffects();
-
-    bool isPlayer = mPtr == MWMechanics::getPlayer();
-    bool isFirstPersonPlayer = isPlayer && MWBase::Environment::get().getWorld()->isFirstPerson();
-    bool godmode = isPlayer && MWBase::Environment::get().getWorld()->getGodModeState();
-
-    float scale = mPtr.getCellRef().getScale();
-
-    static const bool normalizeSpeed = Settings::Manager::getBool("normalise race speed", "Game");
-    if (!normalizeSpeed && mPtr.getClass().isNpc())
-    {
-        const ESM::NPC* npc = mPtr.get<ESM::NPC>()->mBase;
-        const ESM::Race* race = world->getStore().get<ESM::Race>().find(npc->mRace);
-        float weight = npc->isMale() ? race->mData.mWeight.mMale : race->mData.mWeight.mFemale;
-        scale *= weight;
-    }
-
-    if(!cls.isActor())
-        updateAnimQueue();
-    else if(!cls.getCreatureStats(mPtr).isDead())
-    {
-        bool onground = world->isOnGround(mPtr);
-        bool incapacitated = ((!godmode && cls.getCreatureStats(mPtr).isParalyzed()) || cls.getCreatureStats(mPtr).getKnockedDown());
-        bool inwater = world->isSwimming(mPtr);
-        bool flying = world->isFlying(mPtr);
-        bool solid = world->isActorCollisionEnabled(mPtr);
-        // Can't run and sneak while flying (see speed formula in Npc/Creature::getSpeed)
-        bool sneak = cls.getCreatureStats(mPtr).getStance(MWMechanics::CreatureStats::Stance_Sneak) && !flying && !inwater;
-        bool isrunning = cls.getCreatureStats(mPtr).getStance(MWMechanics::CreatureStats::Stance_Run) && !flying;
-        CreatureStats &stats = cls.getCreatureStats(mPtr);
-        Movement& movementSettings = cls.getMovementSettings(mPtr);
-
-        //Force Jump Logic
-
-        bool isMoving = (std::abs(movementSettings.mPosition[0]) > .5 || std::abs(movementSettings.mPosition[1]) > .5);
-        if(!inwater && !flying && solid)
-        {
-            //Force Jump
-            if(stats.getMovementFlag(MWMechanics::CreatureStats::Flag_ForceJump))
-                movementSettings.mPosition[2] = onground ? 1 : 0;
-            //Force Move Jump, only jump if they're otherwise moving
-            if(stats.getMovementFlag(MWMechanics::CreatureStats::Flag_ForceMoveJump) && isMoving)
-                movementSettings.mPosition[2] = onground ? 1 : 0;
-        }
-
-        osg::Vec3f rot = cls.getRotationVector(mPtr);
-        osg::Vec3f vec(movementSettings.asVec3());
-        movementSettings.mSpeedFactor = std::min(vec.length(), 1.f);
-        vec.normalize();
-
-        // TODO: Move this check to mwinput.
-        // Joystick analogue movement.
-        // Due to the half way split between walking/running, we multiply speed by 2 while walking, unless a keyboard was used.
-        if (isPlayer && !isrunning && !sneak && !flying && movementSettings.mSpeedFactor <= 0.5f)
-            movementSettings.mSpeedFactor *= 2.f;
-
-        static const bool smoothMovement = Settings::Manager::getBool("smooth movement", "Game");
-        if (smoothMovement)
-        {
-            static const float playerTurningCoef = 1.0 / std::max(0.01f, Settings::Manager::getFloat("smooth movement player turning delay", "Game"));
-            float angle = mPtr.getRefData().getPosition().rot[2];
-            osg::Vec2f targetSpeed = Misc::rotateVec2f(osg::Vec2f(vec.x(), vec.y()), -angle) * movementSettings.mSpeedFactor;
-            osg::Vec2f delta = targetSpeed - mSmoothedSpeed;
-            float speedDelta = movementSettings.mSpeedFactor - mSmoothedSpeed.length();
-            float deltaLen = delta.length();
-
-            float maxDelta;
-            if (isFirstPersonPlayer)
-                maxDelta = 1;
-            else if (std::abs(speedDelta) < deltaLen / 2)
-                // Turning is smooth for player and less smooth for NPCs (otherwise NPC can miss a path point).
-                maxDelta = duration * (isPlayer ? playerTurningCoef : 6.f);
-            else if (isPlayer && speedDelta < -deltaLen / 2)
-                // As soon as controls are released, mwinput switches player from running to walking.
-                // So stopping should be instant for player, otherwise it causes a small twitch.
-                maxDelta = 1;
-            else // In all other cases speeding up and stopping are smooth.
-                maxDelta = duration * 3.f;
-
-            if (deltaLen > maxDelta)
-                delta *= maxDelta / deltaLen;
-            mSmoothedSpeed += delta;
-
-            osg::Vec2f newSpeed = Misc::rotateVec2f(mSmoothedSpeed, angle);
-            movementSettings.mSpeedFactor = newSpeed.normalize();
-            vec.x() = newSpeed.x();
-            vec.y() = newSpeed.y();
-
-            const float eps = 0.001f;
-            if (movementSettings.mSpeedFactor < eps)
-            {
-                movementSettings.mSpeedFactor = 0;
-                vec.x() = 0;
-                vec.y() = 1;
-            }
-            else if ((vec.y() < 0) != mIsMovingBackward)
-            {
-                if (targetSpeed.length() < eps || (movementSettings.mPosition[1] < 0) == mIsMovingBackward)
-                    vec.y() = mIsMovingBackward ? -eps : eps;
+        if (!cls.isActor())
+            updateAnimQueue();
+        else if (!cls.getCreatureStats(mPtr).isDead())
+        {
+            bool onground = world->isOnGround(mPtr);
+            bool incapacitated = ((!godmode && cls.getCreatureStats(mPtr).isParalyzed())
+                || cls.getCreatureStats(mPtr).getKnockedDown());
+            bool inwater = world->isSwimming(mPtr);
+            bool flying = world->isFlying(mPtr);
+            bool solid = world->isActorCollisionEnabled(mPtr);
+            // Can't run and sneak while flying (see speed formula in Npc/Creature::getSpeed)
+            bool sneak
+                = cls.getCreatureStats(mPtr).getStance(MWMechanics::CreatureStats::Stance_Sneak) && !flying && !inwater;
+            bool isrunning = cls.getCreatureStats(mPtr).getStance(MWMechanics::CreatureStats::Stance_Run) && !flying;
+            CreatureStats& stats = cls.getCreatureStats(mPtr);
+            Movement& movementSettings = cls.getMovementSettings(mPtr);
+
+            // Force Jump Logic
+
+            bool isMoving
+                = (std::abs(movementSettings.mPosition[0]) > .5 || std::abs(movementSettings.mPosition[1]) > .5);
+            if (!inwater && !flying && solid)
+            {
+                // Force Jump
+                if (stats.getMovementFlag(MWMechanics::CreatureStats::Flag_ForceJump))
+                    movementSettings.mPosition[2] = onground ? 1 : 0;
+                // Force Move Jump, only jump if they're otherwise moving
+                if (stats.getMovementFlag(MWMechanics::CreatureStats::Flag_ForceMoveJump) && isMoving)
+                    movementSettings.mPosition[2] = onground ? 1 : 0;
             }
+
+            osg::Vec3f rot = cls.getRotationVector(mPtr);
+            osg::Vec3f vec(movementSettings.asVec3());
+            movementSettings.mSpeedFactor = std::min(vec.length(), 1.f);
             vec.normalize();
-        }
 
-        float effectiveRotation = rot.z();
-        bool canMove = cls.getMaxSpeed(mPtr) > 0;
-        static const bool turnToMovementDirection = Settings::Manager::getBool("turn to movement direction", "Game");
-        if (!turnToMovementDirection || isFirstPersonPlayer)
-        {
-            movementSettings.mIsStrafing = std::abs(vec.x()) > std::abs(vec.y()) * 2;
-            stats.setSideMovementAngle(0);
-        }
-        else if (canMove)
-        {
-            float targetMovementAngle = vec.y() >= 0 ? std::atan2(-vec.x(), vec.y()) : std::atan2(vec.x(), -vec.y());
-            movementSettings.mIsStrafing = (stats.getDrawState() != MWMechanics::DrawState::Nothing || inwater)
-                                           && std::abs(targetMovementAngle) > osg::DegreesToRadians(60.0f);
-            if (movementSettings.mIsStrafing)
-                targetMovementAngle = 0;
-            float delta = targetMovementAngle - stats.getSideMovementAngle();
-            float cosDelta = cosf(delta);
+            // TODO: Move this check to mwinput.
+            // Joystick analogue movement.
+            // Due to the half way split between walking/running, we multiply speed by 2 while walking, unless a
+            // keyboard was used.
+            if (isPlayer && !isrunning && !sneak && !flying && movementSettings.mSpeedFactor <= 0.5f)
+                movementSettings.mSpeedFactor *= 2.f;
 
-            if ((vec.y() < 0) == mIsMovingBackward)
-                movementSettings.mSpeedFactor *= std::min(std::max(cosDelta, 0.f) + 0.3f, 1.f); // slow down when turn
-            if (std::abs(delta) < osg::DegreesToRadians(20.0f))
-                mIsMovingBackward = vec.y() < 0;
+            static const bool smoothMovement = Settings::Manager::getBool("smooth movement", "Game");
+            if (smoothMovement)
+            {
+                static const float playerTurningCoef = 1.0
+                    / std::max(0.01f, Settings::Manager::getFloat("smooth movement player turning delay", "Game"));
+                float angle = mPtr.getRefData().getPosition().rot[2];
+                osg::Vec2f targetSpeed
+                    = Misc::rotateVec2f(osg::Vec2f(vec.x(), vec.y()), -angle) * movementSettings.mSpeedFactor;
+                osg::Vec2f delta = targetSpeed - mSmoothedSpeed;
+                float speedDelta = movementSettings.mSpeedFactor - mSmoothedSpeed.length();
+                float deltaLen = delta.length();
+
+                float maxDelta;
+                if (isFirstPersonPlayer)
+                    maxDelta = 1;
+                else if (std::abs(speedDelta) < deltaLen / 2)
+                    // Turning is smooth for player and less smooth for NPCs (otherwise NPC can miss a path point).
+                    maxDelta = duration * (isPlayer ? playerTurningCoef : 6.f);
+                else if (isPlayer && speedDelta < -deltaLen / 2)
+                    // As soon as controls are released, mwinput switches player from running to walking.
+                    // So stopping should be instant for player, otherwise it causes a small twitch.
+                    maxDelta = 1;
+                else // In all other cases speeding up and stopping are smooth.
+                    maxDelta = duration * 3.f;
+
+                if (deltaLen > maxDelta)
+                    delta *= maxDelta / deltaLen;
+                mSmoothedSpeed += delta;
+
+                osg::Vec2f newSpeed = Misc::rotateVec2f(mSmoothedSpeed, angle);
+                movementSettings.mSpeedFactor = newSpeed.normalize();
+                vec.x() = newSpeed.x();
+                vec.y() = newSpeed.y();
+
+                const float eps = 0.001f;
+                if (movementSettings.mSpeedFactor < eps)
+                {
+                    movementSettings.mSpeedFactor = 0;
+                    vec.x() = 0;
+                    vec.y() = 1;
+                }
+                else if ((vec.y() < 0) != mIsMovingBackward)
+                {
+                    if (targetSpeed.length() < eps || (movementSettings.mPosition[1] < 0) == mIsMovingBackward)
+                        vec.y() = mIsMovingBackward ? -eps : eps;
+                }
+                vec.normalize();
+            }
 
-            float maxDelta = osg::PI * duration * (2.5f - cosDelta);
-            delta = std::clamp(delta, -maxDelta, maxDelta);
-            stats.setSideMovementAngle(stats.getSideMovementAngle() + delta);
-            effectiveRotation += delta;
-        }
+            float effectiveRotation = rot.z();
+            bool canMove = cls.getMaxSpeed(mPtr) > 0;
+            static const bool turnToMovementDirection
+                = Settings::Manager::getBool("turn to movement direction", "Game");
+            if (!turnToMovementDirection || isFirstPersonPlayer)
+            {
+                movementSettings.mIsStrafing = std::abs(vec.x()) > std::abs(vec.y()) * 2;
+                stats.setSideMovementAngle(0);
+            }
+            else if (canMove)
+            {
+                float targetMovementAngle
+                    = vec.y() >= 0 ? std::atan2(-vec.x(), vec.y()) : std::atan2(vec.x(), -vec.y());
+                movementSettings.mIsStrafing = (stats.getDrawState() != MWMechanics::DrawState::Nothing || inwater)
+                    && std::abs(targetMovementAngle) > osg::DegreesToRadians(60.0f);
+                if (movementSettings.mIsStrafing)
+                    targetMovementAngle = 0;
+                float delta = targetMovementAngle - stats.getSideMovementAngle();
+                float cosDelta = cosf(delta);
+
+                if ((vec.y() < 0) == mIsMovingBackward)
+                    movementSettings.mSpeedFactor
+                        *= std::min(std::max(cosDelta, 0.f) + 0.3f, 1.f); // slow down when turn
+                if (std::abs(delta) < osg::DegreesToRadians(20.0f))
+                    mIsMovingBackward = vec.y() < 0;
+
+                float maxDelta = osg::PI * duration * (2.5f - cosDelta);
+                delta = std::clamp(delta, -maxDelta, maxDelta);
+                stats.setSideMovementAngle(stats.getSideMovementAngle() + delta);
+                effectiveRotation += delta;
+            }
 
-        mAnimation->setLegsYawRadians(stats.getSideMovementAngle());
-        if (stats.getDrawState() == MWMechanics::DrawState::Nothing || inwater)
-            mAnimation->setUpperBodyYawRadians(stats.getSideMovementAngle() / 2);
-        else
-            mAnimation->setUpperBodyYawRadians(stats.getSideMovementAngle() / 4);
-        if (smoothMovement && !isPlayer && !inwater)
-            mAnimation->setUpperBodyYawRadians(mAnimation->getUpperBodyYawRadians() + mAnimation->getHeadYaw() / 2);
+            mAnimation->setLegsYawRadians(stats.getSideMovementAngle());
+            if (stats.getDrawState() == MWMechanics::DrawState::Nothing || inwater)
+                mAnimation->setUpperBodyYawRadians(stats.getSideMovementAngle() / 2);
+            else
+                mAnimation->setUpperBodyYawRadians(stats.getSideMovementAngle() / 4);
+            if (smoothMovement && !isPlayer && !inwater)
+                mAnimation->setUpperBodyYawRadians(mAnimation->getUpperBodyYawRadians() + mAnimation->getHeadYaw() / 2);
 
-        speed = cls.getCurrentSpeed(mPtr);
-        vec.x() *= speed;
-        vec.y() *= speed;
+            speed = cls.getCurrentSpeed(mPtr);
+            vec.x() *= speed;
+            vec.y() *= speed;
 
-        if(mHitState != CharState_None && mHitState != CharState_Block && mJumpState == JumpState_None)
-            vec = osg::Vec3f();
+            if (mHitState != CharState_None && mHitState != CharState_Block && mJumpState == JumpState_None)
+                vec = osg::Vec3f();
 
-        CharacterState movestate = CharState_None;
-        CharacterState idlestate = CharState_None;
-        JumpingState jumpstate = JumpState_None;
+            CharacterState movestate = CharState_None;
+            CharacterState idlestate = CharState_None;
+            JumpingState jumpstate = JumpState_None;
 
-        mHasMovedInXY = std::abs(vec.x())+std::abs(vec.y()) > 0.0f;
-        isrunning = isrunning && mHasMovedInXY;
+            mHasMovedInXY = std::abs(vec.x()) + std::abs(vec.y()) > 0.0f;
+            isrunning = isrunning && mHasMovedInXY;
 
-        // advance athletics
-        if(mHasMovedInXY && isPlayer)
-        {
-            if(inwater)
+            // advance athletics
+            if (mHasMovedInXY && isPlayer)
             {
-                mSecondsOfSwimming += duration;
-                while(mSecondsOfSwimming > 1)
+                if (inwater)
                 {
-                    cls.skillUsageSucceeded(mPtr, ESM::Skill::Athletics, 1);
-                    mSecondsOfSwimming -= 1;
+                    mSecondsOfSwimming += duration;
+                    while (mSecondsOfSwimming > 1)
+                    {
+                        cls.skillUsageSucceeded(mPtr, ESM::Skill::Athletics, 1);
+                        mSecondsOfSwimming -= 1;
+                    }
                 }
-            }
-            else if(isrunning && !sneak)
-            {
-                mSecondsOfRunning += duration;
-                while(mSecondsOfRunning > 1)
+                else if (isrunning && !sneak)
                 {
-                    cls.skillUsageSucceeded(mPtr, ESM::Skill::Athletics, 0);
-                    mSecondsOfRunning -= 1;
+                    mSecondsOfRunning += duration;
+                    while (mSecondsOfRunning > 1)
+                    {
+                        cls.skillUsageSucceeded(mPtr, ESM::Skill::Athletics, 0);
+                        mSecondsOfRunning -= 1;
+                    }
                 }
             }
-        }
 
-        // reduce fatigue
-        const MWWorld::Store<ESM::GameSetting> &gmst = world->getStore().get<ESM::GameSetting>();
-        float fatigueLoss = 0;
-        static const float fFatigueRunBase = gmst.find("fFatigueRunBase")->mValue.getFloat();
-        static const float fFatigueRunMult = gmst.find("fFatigueRunMult")->mValue.getFloat();
-        static const float fFatigueSwimWalkBase = gmst.find("fFatigueSwimWalkBase")->mValue.getFloat();
-        static const float fFatigueSwimRunBase = gmst.find("fFatigueSwimRunBase")->mValue.getFloat();
-        static const float fFatigueSwimWalkMult = gmst.find("fFatigueSwimWalkMult")->mValue.getFloat();
-        static const float fFatigueSwimRunMult = gmst.find("fFatigueSwimRunMult")->mValue.getFloat();
-        static const float fFatigueSneakBase = gmst.find("fFatigueSneakBase")->mValue.getFloat();
-        static const float fFatigueSneakMult = gmst.find("fFatigueSneakMult")->mValue.getFloat();
-
-        if (cls.getEncumbrance(mPtr) <= cls.getCapacity(mPtr))
-        {
-            const float encumbrance = cls.getNormalizedEncumbrance(mPtr);
-            if (sneak)
-                fatigueLoss = fFatigueSneakBase + encumbrance * fFatigueSneakMult;
-            else
+            // reduce fatigue
+            const MWWorld::Store<ESM::GameSetting>& gmst = world->getStore().get<ESM::GameSetting>();
+            float fatigueLoss = 0;
+            static const float fFatigueRunBase = gmst.find("fFatigueRunBase")->mValue.getFloat();
+            static const float fFatigueRunMult = gmst.find("fFatigueRunMult")->mValue.getFloat();
+            static const float fFatigueSwimWalkBase = gmst.find("fFatigueSwimWalkBase")->mValue.getFloat();
+            static const float fFatigueSwimRunBase = gmst.find("fFatigueSwimRunBase")->mValue.getFloat();
+            static const float fFatigueSwimWalkMult = gmst.find("fFatigueSwimWalkMult")->mValue.getFloat();
+            static const float fFatigueSwimRunMult = gmst.find("fFatigueSwimRunMult")->mValue.getFloat();
+            static const float fFatigueSneakBase = gmst.find("fFatigueSneakBase")->mValue.getFloat();
+            static const float fFatigueSneakMult = gmst.find("fFatigueSneakMult")->mValue.getFloat();
+
+            if (cls.getEncumbrance(mPtr) <= cls.getCapacity(mPtr))
             {
-                if (inwater)
+                const float encumbrance = cls.getNormalizedEncumbrance(mPtr);
+                if (sneak)
+                    fatigueLoss = fFatigueSneakBase + encumbrance * fFatigueSneakMult;
+                else
                 {
-                    if (!isrunning)
-                        fatigueLoss = fFatigueSwimWalkBase + encumbrance * fFatigueSwimWalkMult;
-                    else
-                        fatigueLoss = fFatigueSwimRunBase + encumbrance * fFatigueSwimRunMult;
+                    if (inwater)
+                    {
+                        if (!isrunning)
+                            fatigueLoss = fFatigueSwimWalkBase + encumbrance * fFatigueSwimWalkMult;
+                        else
+                            fatigueLoss = fFatigueSwimRunBase + encumbrance * fFatigueSwimRunMult;
+                    }
+                    else if (isrunning)
+                        fatigueLoss = fFatigueRunBase + encumbrance * fFatigueRunMult;
                 }
-                else if (isrunning)
-                    fatigueLoss = fFatigueRunBase + encumbrance * fFatigueRunMult;
             }
-        }
-        fatigueLoss *= duration;
-        fatigueLoss *= movementSettings.mSpeedFactor;
-        DynamicStat<float> fatigue = cls.getCreatureStats(mPtr).getFatigue();
-
-        if (!godmode)
-        {
-            fatigue.setCurrent(fatigue.getCurrent() - fatigueLoss, fatigue.getCurrent() < 0);
-            cls.getCreatureStats(mPtr).setFatigue(fatigue);
-        }
+            fatigueLoss *= duration;
+            fatigueLoss *= movementSettings.mSpeedFactor;
+            DynamicStat<float> fatigue = cls.getCreatureStats(mPtr).getFatigue();
 
-        float z = cls.getJump(mPtr);
-        if(sneak || inwater || flying || incapacitated || !solid || z <= 0)
-            vec.z() = 0.0f;
+            if (!godmode)
+            {
+                fatigue.setCurrent(fatigue.getCurrent() - fatigueLoss, fatigue.getCurrent() < 0);
+                cls.getCreatureStats(mPtr).setFatigue(fatigue);
+            }
 
-        bool inJump = true;
-        bool playLandingSound = false;
-        if(!onground && !flying && !inwater && solid)
-        {
-            // In the air (either getting up —ascending part of jump— or falling).
-            jumpstate = JumpState_InAir;
+            float z = cls.getJump(mPtr);
+            if (sneak || inwater || flying || incapacitated || !solid || z <= 0)
+                vec.z() = 0.0f;
 
-            static const float fJumpMoveBase = gmst.find("fJumpMoveBase")->mValue.getFloat();
-            static const float fJumpMoveMult = gmst.find("fJumpMoveMult")->mValue.getFloat();
-            float factor = fJumpMoveBase + fJumpMoveMult * mPtr.getClass().getSkill(mPtr, ESM::Skill::Acrobatics)/100.f;
-            factor = std::min(1.f, factor);
-            vec.x() *= factor;
-            vec.y() *= factor;
-            vec.z()  = 0.0f;
-        }
-        else if(vec.z() > 0.0f && mJumpState != JumpState_InAir)
-        {
-            // Started a jump.
-            if (z > 0)
+            bool inJump = true;
+            bool playLandingSound = false;
+            if (!onground && !flying && !inwater && solid)
             {
-                if(vec.x() == 0 && vec.y() == 0)
-                    vec = osg::Vec3f(0.0f, 0.0f, z);
-                else
+                // In the air (either getting up —ascending part of jump— or falling).
+                jumpstate = JumpState_InAir;
+
+                static const float fJumpMoveBase = gmst.find("fJumpMoveBase")->mValue.getFloat();
+                static const float fJumpMoveMult = gmst.find("fJumpMoveMult")->mValue.getFloat();
+                float factor
+                    = fJumpMoveBase + fJumpMoveMult * mPtr.getClass().getSkill(mPtr, ESM::Skill::Acrobatics) / 100.f;
+                factor = std::min(1.f, factor);
+                vec.x() *= factor;
+                vec.y() *= factor;
+                vec.z() = 0.0f;
+            }
+            else if (vec.z() > 0.0f && mJumpState != JumpState_InAir)
+            {
+                // Started a jump.
+                if (z > 0)
                 {
-                    osg::Vec3f lat (vec.x(), vec.y(), 0.0f);
-                    lat.normalize();
-                    vec = osg::Vec3f(lat.x(), lat.y(), 1.0f) * z * 0.707f;
+                    if (vec.x() == 0 && vec.y() == 0)
+                        vec = osg::Vec3f(0.0f, 0.0f, z);
+                    else
+                    {
+                        osg::Vec3f lat(vec.x(), vec.y(), 0.0f);
+                        lat.normalize();
+                        vec = osg::Vec3f(lat.x(), lat.y(), 1.0f) * z * 0.707f;
+                    }
                 }
             }
-        }
-        else
-        {
-            if (mJumpState == JumpState_InAir && !flying && solid)
+            else
             {
-                float height = cls.getCreatureStats(mPtr).land(isPlayer);
-                float healthLost = 0.f;
-                if (!inwater)
-                    healthLost = getFallDamage(mPtr, height);
-
-                if (healthLost > 0.0f)
+                if (mJumpState == JumpState_InAir && !flying && solid)
                 {
-                    const float fatigueTerm = cls.getCreatureStats(mPtr).getFatigueTerm();
+                    float height = cls.getCreatureStats(mPtr).land(isPlayer);
+                    float healthLost = 0.f;
+                    if (!inwater)
+                        healthLost = getFallDamage(mPtr, height);
 
-                    // inflict fall damages
-                    if (!godmode)
+                    if (healthLost > 0.0f)
                     {
-                        DynamicStat<float> health = cls.getCreatureStats(mPtr).getHealth();
-                        float realHealthLost = healthLost * (1.0f - 0.25f * fatigueTerm);
-                        health.setCurrent(health.getCurrent() - realHealthLost);
-                        cls.getCreatureStats(mPtr).setHealth(health);
-                        sndMgr->playSound3D(mPtr, "Health Damage", 1.0f, 1.0f);
-                        if (isPlayer)
-                            MWBase::Environment::get().getWindowManager()->activateHitOverlay();
-                    }
+                        const float fatigueTerm = cls.getCreatureStats(mPtr).getFatigueTerm();
 
-                    const float acrobaticsSkill = cls.getSkill(mPtr, ESM::Skill::Acrobatics);
-                    if (healthLost > (acrobaticsSkill * fatigueTerm))
-                    {
+                        // inflict fall damages
                         if (!godmode)
-                            cls.getCreatureStats(mPtr).setKnockedDown(true);
-                    }
-                    else
-                    {
-                        // report acrobatics progression
-                        if (isPlayer)
-                            cls.skillUsageSucceeded(mPtr, ESM::Skill::Acrobatics, 1);
+                        {
+                            DynamicStat<float> health = cls.getCreatureStats(mPtr).getHealth();
+                            float realHealthLost = healthLost * (1.0f - 0.25f * fatigueTerm);
+                            health.setCurrent(health.getCurrent() - realHealthLost);
+                            cls.getCreatureStats(mPtr).setHealth(health);
+                            sndMgr->playSound3D(mPtr, "Health Damage", 1.0f, 1.0f);
+                            if (isPlayer)
+                                MWBase::Environment::get().getWindowManager()->activateHitOverlay();
+                        }
+
+                        const float acrobaticsSkill = cls.getSkill(mPtr, ESM::Skill::Acrobatics);
+                        if (healthLost > (acrobaticsSkill * fatigueTerm))
+                        {
+                            if (!godmode)
+                                cls.getCreatureStats(mPtr).setKnockedDown(true);
+                        }
+                        else
+                        {
+                            // report acrobatics progression
+                            if (isPlayer)
+                                cls.skillUsageSucceeded(mPtr, ESM::Skill::Acrobatics, 1);
+                        }
                     }
+
+                    if (mPtr.getClass().isNpc())
+                        playLandingSound = true;
                 }
 
-                if (mPtr.getClass().isNpc())
-                    playLandingSound = true;
-            }
+                if (mAnimation->isPlaying(mCurrentJump))
+                    jumpstate = JumpState_Landing;
 
-            if (mAnimation->isPlaying(mCurrentJump))
-                jumpstate = JumpState_Landing;
+                vec.x() *= scale;
+                vec.y() *= scale;
+                vec.z() = 0.0f;
 
-            vec.x() *= scale;
-            vec.y() *= scale;
-            vec.z() = 0.0f;
+                inJump = false;
 
-            inJump = false;
+                if (movementSettings.mIsStrafing)
+                {
+                    if (vec.x() > 0.0f)
+                        movestate = (inwater ? (isrunning ? CharState_SwimRunRight : CharState_SwimWalkRight)
+                                             : (sneak ? CharState_SneakRight
+                                                      : (isrunning ? CharState_RunRight : CharState_WalkRight)));
+                    else if (vec.x() < 0.0f)
+                        movestate = (inwater
+                                ? (isrunning ? CharState_SwimRunLeft : CharState_SwimWalkLeft)
+                                : (sneak ? CharState_SneakLeft : (isrunning ? CharState_RunLeft : CharState_WalkLeft)));
+                }
+                else if (vec.length2() > 0.0f)
+                {
+                    if (vec.y() >= 0.0f)
+                        movestate = (inwater ? (isrunning ? CharState_SwimRunForward : CharState_SwimWalkForward)
+                                             : (sneak ? CharState_SneakForward
+                                                      : (isrunning ? CharState_RunForward : CharState_WalkForward)));
+                    else
+                        movestate = (inwater
+                                ? (isrunning ? CharState_SwimRunBack : CharState_SwimWalkBack)
+                                : (sneak ? CharState_SneakBack : (isrunning ? CharState_RunBack : CharState_WalkBack)));
+                }
+                else
+                {
+                    // Do not play turning animation for player if rotation speed is very slow.
+                    // Actual threshold should take framerate in account.
+                    float rotationThreshold = (isPlayer ? 0.015f : 0.001f) * 60 * duration;
+
+                    // It seems only bipedal actors use turning animations.
+                    // Also do not use turning animations in the first-person view and when sneaking.
+                    if (!sneak && !isFirstPersonPlayer && mPtr.getClass().isBipedal(mPtr))
+                    {
+                        if (effectiveRotation > rotationThreshold)
+                            movestate = inwater ? CharState_SwimTurnRight : CharState_TurnRight;
+                        else if (effectiveRotation < -rotationThreshold)
+                            movestate = inwater ? CharState_SwimTurnLeft : CharState_TurnLeft;
+                    }
+                }
+            }
 
-            if (movementSettings.mIsStrafing)
+            if (playLandingSound)
             {
-                if(vec.x() > 0.0f)
-                    movestate = (inwater ? (isrunning ? CharState_SwimRunRight : CharState_SwimWalkRight)
-                                         : (sneak ? CharState_SneakRight
-                                                  : (isrunning ? CharState_RunRight : CharState_WalkRight)));
-                else if(vec.x() < 0.0f)
-                    movestate = (inwater ? (isrunning ? CharState_SwimRunLeft : CharState_SwimWalkLeft)
-                                         : (sneak ? CharState_SneakLeft
-                                                  : (isrunning ? CharState_RunLeft : CharState_WalkLeft)));
+                std::string_view sound;
+                osg::Vec3f pos(mPtr.getRefData().getPosition().asVec3());
+                if (world->isUnderwater(mPtr.getCell(), pos) || world->isWalkingOnWater(mPtr))
+                    sound = "DefaultLandWater";
+                else if (onground)
+                    sound = "DefaultLand";
+
+                if (!sound.empty())
+                    sndMgr->playSound3D(mPtr, sound, 1.f, 1.f, MWSound::Type::Foot, MWSound::PlayMode::NoPlayerLocal);
             }
-            else if (vec.length2() > 0.0f)
+
+            if (turnToMovementDirection && !isFirstPersonPlayer
+                && (movestate == CharState_SwimRunForward || movestate == CharState_SwimWalkForward
+                    || movestate == CharState_SwimRunBack || movestate == CharState_SwimWalkBack))
             {
-                if (vec.y() >= 0.0f)
-                    movestate = (inwater ? (isrunning ? CharState_SwimRunForward : CharState_SwimWalkForward)
-                                         : (sneak ? CharState_SneakForward
-                                                  : (isrunning ? CharState_RunForward : CharState_WalkForward)));
-                else
-                    movestate = (inwater ? (isrunning ? CharState_SwimRunBack : CharState_SwimWalkBack)
-                                         : (sneak ? CharState_SneakBack
-                                                  : (isrunning ? CharState_RunBack : CharState_WalkBack)));
+                float swimmingPitch = mAnimation->getBodyPitchRadians();
+                float targetSwimmingPitch = -mPtr.getRefData().getPosition().rot[0];
+                float maxSwimPitchDelta = 3.0f * duration;
+                swimmingPitch += std::clamp(targetSwimmingPitch - swimmingPitch, -maxSwimPitchDelta, maxSwimPitchDelta);
+                mAnimation->setBodyPitchRadians(swimmingPitch);
             }
             else
+                mAnimation->setBodyPitchRadians(0);
+
+            static const bool swimUpwardCorrection = Settings::Manager::getBool("swim upward correction", "Game");
+            if (inwater && isPlayer && !isFirstPersonPlayer && swimUpwardCorrection)
             {
-                // Do not play turning animation for player if rotation speed is very slow.
-                // Actual threshold should take framerate in account.
-                float rotationThreshold = (isPlayer ? 0.015f : 0.001f) * 60 * duration;
+                static const float swimUpwardCoef = Settings::Manager::getFloat("swim upward coef", "Game");
+                static const float swimForwardCoef = sqrtf(1.0f - swimUpwardCoef * swimUpwardCoef);
+                vec.z() = std::abs(vec.y()) * swimUpwardCoef;
+                vec.y() *= swimForwardCoef;
+            }
 
-                // It seems only bipedal actors use turning animations.
-                // Also do not use turning animations in the first-person view and when sneaking.
-                if (!sneak && !isFirstPersonPlayer && mPtr.getClass().isBipedal(mPtr))
+            // Player can not use smooth turning as NPCs, so we play turning animation a bit to avoid jittering
+            if (isPlayer)
+            {
+                float threshold = mCurrentMovement.find("swim") == std::string::npos ? 0.4f : 0.8f;
+                float complete;
+                bool animPlaying = mAnimation->getInfo(mCurrentMovement, &complete);
+                if (movestate == CharState_None && jumpstate == JumpState_None && isTurning())
                 {
-                    if(effectiveRotation > rotationThreshold)
-                        movestate = inwater ? CharState_SwimTurnRight : CharState_TurnRight;
-                    else if(effectiveRotation < -rotationThreshold)
-                        movestate = inwater ? CharState_SwimTurnLeft : CharState_TurnLeft;
+                    if (animPlaying && complete < threshold)
+                        movestate = mMovementState;
                 }
             }
-        }
+            else
+            {
+                if (mPtr.getClass().isBipedal(mPtr))
+                {
+                    if (mTurnAnimationThreshold > 0)
+                        mTurnAnimationThreshold -= duration;
 
-        if (playLandingSound)
-        {
-            std::string_view sound;
-            osg::Vec3f pos(mPtr.getRefData().getPosition().asVec3());
-            if (world->isUnderwater(mPtr.getCell(), pos) || world->isWalkingOnWater(mPtr))
-                sound = "DefaultLandWater";
-            else if (onground)
-                sound = "DefaultLand";
+                    if (movestate == CharState_TurnRight || movestate == CharState_TurnLeft
+                        || movestate == CharState_SwimTurnRight || movestate == CharState_SwimTurnLeft)
+                    {
+                        mTurnAnimationThreshold = 0.05f;
+                    }
+                    else if (movestate == CharState_None && isTurning() && mTurnAnimationThreshold > 0)
+                    {
+                        movestate = mMovementState;
+                    }
+                }
+            }
 
-            if (!sound.empty())
-                sndMgr->playSound3D(mPtr, sound, 1.f, 1.f, MWSound::Type::Foot, MWSound::PlayMode::NoPlayerLocal);
-        }
+            if (movestate != CharState_None)
+            {
+                clearAnimQueue();
+                jumpstate = JumpState_None;
+            }
 
-        if (turnToMovementDirection && !isFirstPersonPlayer &&
-            (movestate == CharState_SwimRunForward || movestate == CharState_SwimWalkForward ||
-             movestate == CharState_SwimRunBack || movestate == CharState_SwimWalkBack))
-        {
-            float swimmingPitch = mAnimation->getBodyPitchRadians();
-            float targetSwimmingPitch = -mPtr.getRefData().getPosition().rot[0];
-            float maxSwimPitchDelta = 3.0f * duration;
-            swimmingPitch += std::clamp(targetSwimmingPitch - swimmingPitch, -maxSwimPitchDelta, maxSwimPitchDelta);
-            mAnimation->setBodyPitchRadians(swimmingPitch);
-        }
-        else
-            mAnimation->setBodyPitchRadians(0);
+            if (mAnimQueue.empty() || inwater || (sneak && mIdleState != CharState_SpecialIdle))
+            {
+                if (inwater)
+                    idlestate = CharState_IdleSwim;
+                else if (sneak && !inJump)
+                    idlestate = CharState_IdleSneak;
+                else
+                    idlestate = CharState_Idle;
+            }
+            else
+                updateAnimQueue();
 
-        static const bool swimUpwardCorrection = Settings::Manager::getBool("swim upward correction", "Game");
-        if (inwater && isPlayer && !isFirstPersonPlayer && swimUpwardCorrection)
-        {
-            static const float swimUpwardCoef = Settings::Manager::getFloat("swim upward coef", "Game");
-            static const float swimForwardCoef = sqrtf(1.0f - swimUpwardCoef * swimUpwardCoef);
-            vec.z() = std::abs(vec.y()) * swimUpwardCoef;
-            vec.y() *= swimForwardCoef;
-        }
+            if (!mSkipAnim)
+            {
+                refreshCurrentAnims(idlestate, movestate, jumpstate, updateWeaponState());
+                updateIdleStormState(inwater);
+            }
 
-        // Player can not use smooth turning as NPCs, so we play turning animation a bit to avoid jittering
-        if (isPlayer)
-        {
-            float threshold = mCurrentMovement.find("swim") == std::string::npos ? 0.4f : 0.8f;
-            float complete;
-            bool animPlaying = mAnimation->getInfo(mCurrentMovement, &complete);
-            if (movestate == CharState_None && jumpstate == JumpState_None && isTurning())
+            if (inJump)
+                mMovementAnimationControlled = false;
+
+            if (isTurning())
             {
-                if (animPlaying && complete < threshold)
-                    movestate = mMovementState;
+                // Adjust animation speed from 1.0 to 1.5 multiplier
+                if (duration > 0)
+                {
+                    float turnSpeed = std::min(1.5f, std::abs(rot.z()) / duration / static_cast<float>(osg::PI));
+                    mAnimation->adjustSpeedMult(mCurrentMovement, std::max(turnSpeed, 1.0f));
+                }
             }
-        }
-        else
-        {
-            if (mPtr.getClass().isBipedal(mPtr))
+            else if (mMovementState != CharState_None && mAdjustMovementAnimSpeed)
             {
-                if (mTurnAnimationThreshold > 0)
-                    mTurnAnimationThreshold -= duration;
+                // Vanilla caps the played animation speed.
+                const float maxSpeedMult = 10.f;
+                const float speedMult = speed / mMovementAnimSpeed;
+                mAnimation->adjustSpeedMult(mCurrentMovement, std::min(maxSpeedMult, speedMult));
+                // Make sure the actual speed is the "expected" speed even though the animation is slower
+                scale *= std::max(1.f, speedMult / maxSpeedMult);
+            }
 
-                if (movestate == CharState_TurnRight || movestate == CharState_TurnLeft ||
-                    movestate == CharState_SwimTurnRight || movestate == CharState_SwimTurnLeft)
+            if (!mSkipAnim)
+            {
+                if (!isKnockedDown() && !isKnockedOut())
                 {
-                    mTurnAnimationThreshold = 0.05f;
+                    if (rot != osg::Vec3f())
+                        world->rotateObject(mPtr, rot, true);
                 }
-                else if (movestate == CharState_None && isTurning()
-                        && mTurnAnimationThreshold > 0)
+                else // avoid z-rotating for knockdown
                 {
-                    movestate = mMovementState;
+                    if (rot.x() != 0 && rot.y() != 0)
+                    {
+                        rot.z() = 0.0f;
+                        world->rotateObject(mPtr, rot, true);
+                    }
                 }
+
+                if (!mMovementAnimationControlled)
+                    world->queueMovement(mPtr, vec);
             }
-        }
 
-        if (movestate != CharState_None)
-        {
-            clearAnimQueue();
-            jumpstate = JumpState_None;
-        }
+            movement = vec;
+            movementSettings.mPosition[0] = movementSettings.mPosition[1] = 0;
+            if (movement.z() == 0.f)
+                movementSettings.mPosition[2] = 0;
+            // Can't reset jump state (mPosition[2]) here in full; we don't know for sure whether the PhysicSystem will
+            // actually handle it in this frame due to the fixed minimum timestep used for the physics update. It will
+            // be reset in PhysicSystem::move once the jump is handled.
 
-        if(mAnimQueue.empty() || inwater || (sneak && mIdleState != CharState_SpecialIdle))
-        {
-            if (inwater)
-                idlestate = CharState_IdleSwim;
-            else if (sneak && !inJump)
-                idlestate = CharState_IdleSneak;
-            else
-                idlestate = CharState_Idle;
+            if (!mSkipAnim)
+                updateHeadTracking(duration);
         }
-        else
-            updateAnimQueue();
-
-        if (!mSkipAnim)
+        else if (cls.getCreatureStats(mPtr).isDead())
         {
-            refreshCurrentAnims(idlestate, movestate, jumpstate, updateWeaponState());
-            updateIdleStormState(inwater);
+            // initial start of death animation for actors that started the game as dead
+            // not done in constructor since we need to give scripts a chance to set the mSkipAnim flag
+            if (!mSkipAnim && mDeathState != CharState_None && mCurrentDeath.empty())
+            {
+                // Fast-forward death animation to end for persisting corpses or corpses after end of death animation
+                if (cls.isPersistent(mPtr) || cls.getCreatureStats(mPtr).isDeathAnimationFinished())
+                    playDeath(1.f, mDeathState);
+            }
         }
 
-        if (inJump)
-            mMovementAnimationControlled = false;
+        bool isPersist = isPersistentAnimPlaying();
+        osg::Vec3f moved = mAnimation->runAnimation(mSkipAnim && !isPersist ? 0.f : duration);
+        if (duration > 0.0f)
+            moved /= duration;
+        else
+            moved = osg::Vec3f(0.f, 0.f, 0.f);
+
+        moved.x() *= scale;
+        moved.y() *= scale;
 
-        if (isTurning())
+        // Ensure we're moving in generally the right direction...
+        if (speed > 0.f && moved != osg::Vec3f())
         {
-            // Adjust animation speed from 1.0 to 1.5 multiplier
-            if (duration > 0)
+            float l = moved.length();
+            if (std::abs(movement.x() - moved.x()) > std::abs(moved.x()) / 2
+                || std::abs(movement.y() - moved.y()) > std::abs(moved.y()) / 2
+                || std::abs(movement.z() - moved.z()) > std::abs(moved.z()) / 2)
             {
-                float turnSpeed = std::min(1.5f, std::abs(rot.z()) / duration / static_cast<float>(osg::PI));
-                mAnimation->adjustSpeedMult(mCurrentMovement, std::max(turnSpeed, 1.0f));
+                moved = movement;
+                // For some creatures getSpeed doesn't work, so we adjust speed to the animation.
+                // TODO: Fix Creature::getSpeed.
+                float newLength = moved.length();
+                if (newLength > 0 && !cls.isNpc())
+                    moved *= (l / newLength);
             }
         }
-        else if (mMovementState != CharState_None && mAdjustMovementAnimSpeed)
-        {
-            // Vanilla caps the played animation speed.
-            const float maxSpeedMult = 10.f;
-            const float speedMult = speed / mMovementAnimSpeed;
-            mAnimation->adjustSpeedMult(mCurrentMovement, std::min(maxSpeedMult, speedMult));
-            // Make sure the actual speed is the "expected" speed even though the animation is slower
-            scale *= std::max(1.f, speedMult / maxSpeedMult);
-        }
 
-        if (!mSkipAnim)
+        if (mFloatToSurface && cls.isActor())
         {
-            if(!isKnockedDown() && !isKnockedOut())
+            if (cls.getCreatureStats(mPtr).isDead()
+                || (!godmode
+                    && cls.getCreatureStats(mPtr).getMagicEffects().get(ESM::MagicEffect::Paralyze).getModifier() > 0))
             {
-                if (rot != osg::Vec3f())
-                    world->rotateObject(mPtr, rot, true);
-            }
-            else //avoid z-rotating for knockdown
-            {
-                if (rot.x() != 0 && rot.y() != 0)
-                {
-                    rot.z() = 0.0f;
-                    world->rotateObject(mPtr, rot, true);
-                }
+                moved.z() = 1.0;
             }
-
-            if (!mMovementAnimationControlled)
-                world->queueMovement(mPtr, vec);
         }
 
-        movement = vec;
-        movementSettings.mPosition[0] = movementSettings.mPosition[1] = 0;
-        if (movement.z() == 0.f)
-            movementSettings.mPosition[2] = 0;
-        // Can't reset jump state (mPosition[2]) here in full; we don't know for sure whether the PhysicSystem will actually handle it in this frame
-        // due to the fixed minimum timestep used for the physics update. It will be reset in PhysicSystem::move once the jump is handled.
+        // Update movement
+        if (mMovementAnimationControlled && mPtr.getClass().isActor())
+            world->queueMovement(mPtr, moved);
+
+        mSkipAnim = false;
 
-        if (!mSkipAnim)
-            updateHeadTracking(duration);
+        mAnimation->enableHeadAnimation(cls.isActor() && !cls.getCreatureStats(mPtr).isDead());
     }
-    else if(cls.getCreatureStats(mPtr).isDead())
+
+    void CharacterController::persistAnimationState() const
     {
-        // initial start of death animation for actors that started the game as dead
-        // not done in constructor since we need to give scripts a chance to set the mSkipAnim flag
-        if (!mSkipAnim && mDeathState != CharState_None && mCurrentDeath.empty())
+        ESM::AnimationState& state = mPtr.getRefData().getAnimationState();
+
+        state.mScriptedAnims.clear();
+        for (AnimationQueue::const_iterator iter = mAnimQueue.begin(); iter != mAnimQueue.end(); ++iter)
         {
-            // Fast-forward death animation to end for persisting corpses or corpses after end of death animation
-            if (cls.isPersistent(mPtr) || cls.getCreatureStats(mPtr).isDeathAnimationFinished())
-                playDeath(1.f, mDeathState);
-        }
-    }
+            if (!iter->mPersist)
+                continue;
 
-    bool isPersist = isPersistentAnimPlaying();
-    osg::Vec3f moved = mAnimation->runAnimation(mSkipAnim && !isPersist ? 0.f : duration);
-    if(duration > 0.0f)
-        moved /= duration;
-    else
-        moved = osg::Vec3f(0.f, 0.f, 0.f);
+            ESM::AnimationState::ScriptedAnimation anim;
+            anim.mGroup = iter->mGroup;
 
-    moved.x() *= scale;
-    moved.y() *= scale;
+            if (iter == mAnimQueue.begin())
+            {
+                anim.mLoopCount = mAnimation->getCurrentLoopCount(anim.mGroup);
+                float complete;
+                mAnimation->getInfo(anim.mGroup, &complete, nullptr);
+                anim.mTime = complete;
+            }
+            else
+            {
+                anim.mLoopCount = iter->mLoopCount;
+                anim.mTime = 0.f;
+            }
 
-    // Ensure we're moving in generally the right direction...
-    if (speed > 0.f && moved != osg::Vec3f())
-    {
-        float l = moved.length();
-        if (std::abs(movement.x() - moved.x()) > std::abs(moved.x()) / 2 ||
-            std::abs(movement.y() - moved.y()) > std::abs(moved.y()) / 2 ||
-            std::abs(movement.z() - moved.z()) > std::abs(moved.z()) / 2)
-        {
-            moved = movement;
-            // For some creatures getSpeed doesn't work, so we adjust speed to the animation.
-            // TODO: Fix Creature::getSpeed.
-            float newLength = moved.length();
-            if (newLength > 0 && !cls.isNpc())
-                moved *= (l / newLength);
+            state.mScriptedAnims.push_back(anim);
         }
     }
 
-    if (mFloatToSurface && cls.isActor())
+    void CharacterController::unpersistAnimationState()
     {
-        if (cls.getCreatureStats(mPtr).isDead()
-            || (!godmode && cls.getCreatureStats(mPtr).getMagicEffects().get(ESM::MagicEffect::Paralyze).getModifier() > 0))
+        const ESM::AnimationState& state = mPtr.getRefData().getAnimationState();
+
+        if (!state.mScriptedAnims.empty())
         {
-            moved.z() = 1.0;
-        }
-    }
+            clearAnimQueue();
+            for (ESM::AnimationState::ScriptedAnimations::const_iterator iter = state.mScriptedAnims.begin();
+                 iter != state.mScriptedAnims.end(); ++iter)
+            {
+                AnimationQueueEntry entry;
+                entry.mGroup = iter->mGroup;
+                entry.mLoopCount = iter->mLoopCount;
+                entry.mPersist = true;
 
-    // Update movement
-    if(mMovementAnimationControlled && mPtr.getClass().isActor())
-        world->queueMovement(mPtr, moved);
+                mAnimQueue.push_back(entry);
+            }
 
-    mSkipAnim = false;
+            const ESM::AnimationState::ScriptedAnimation& anim = state.mScriptedAnims.front();
+            float complete = anim.mTime;
+            if (anim.mAbsolute)
+            {
+                float start = mAnimation->getTextKeyTime(anim.mGroup + ": start");
+                float stop = mAnimation->getTextKeyTime(anim.mGroup + ": stop");
+                float time = std::clamp(anim.mTime, start, stop);
+                complete = (time - start) / (stop - start);
+            }
 
-    mAnimation->enableHeadAnimation(cls.isActor() && !cls.getCreatureStats(mPtr).isDead());
-}
+            clearStateAnimation(mCurrentIdle);
+            mIdleState = CharState_SpecialIdle;
 
-void CharacterController::persistAnimationState() const
-{
-    ESM::AnimationState& state = mPtr.getRefData().getAnimationState();
+            bool loopfallback = (mAnimQueue.front().mGroup.compare(0, 4, "idle") == 0);
+            mAnimation->play(anim.mGroup, Priority_Persistent, MWRender::Animation::BlendMask_All, false, 1.0f, "start",
+                "stop", complete, anim.mLoopCount, loopfallback);
+        }
+    }
 
-    state.mScriptedAnims.clear();
-    for (AnimationQueue::const_iterator iter = mAnimQueue.begin(); iter != mAnimQueue.end(); ++iter)
+    bool CharacterController::playGroup(std::string_view groupname, int mode, int count, bool persist)
     {
-        if (!iter->mPersist)
-            continue;
+        if (!mAnimation || !mAnimation->hasAnimation(groupname))
+            return false;
 
-        ESM::AnimationState::ScriptedAnimation anim;
-        anim.mGroup = iter->mGroup;
+        // We should not interrupt persistent animations by non-persistent ones
+        if (isPersistentAnimPlaying() && !persist)
+            return true;
 
-        if (iter == mAnimQueue.begin())
+        // If this animation is a looped animation (has a "loop start" key) that is already playing
+        // and has not yet reached the end of the loop, allow it to continue animating with its existing loop count
+        // and remove any other animations that were queued.
+        // This emulates observed behavior from the original allows the script "OutsideBanner" to animate banners
+        // correctly.
+        if (!mAnimQueue.empty() && mAnimQueue.front().mGroup == groupname
+            && mAnimation->getTextKeyTime(mAnimQueue.front().mGroup + ": loop start") >= 0
+            && mAnimation->isPlaying(groupname))
         {
-            anim.mLoopCount = mAnimation->getCurrentLoopCount(anim.mGroup);
-            float complete;
-            mAnimation->getInfo(anim.mGroup, &complete, nullptr);
-            anim.mTime = complete;
-        }
-        else
-        {
-            anim.mLoopCount = iter->mLoopCount;
-            anim.mTime = 0.f;
+            float endOfLoop = mAnimation->getTextKeyTime(mAnimQueue.front().mGroup + ": loop stop");
+
+            if (endOfLoop < 0) // if no Loop Stop key was found, use the Stop key
+                endOfLoop = mAnimation->getTextKeyTime(mAnimQueue.front().mGroup + ": stop");
+
+            if (endOfLoop > 0 && (mAnimation->getCurrentTime(mAnimQueue.front().mGroup) < endOfLoop))
+            {
+                mAnimQueue.resize(1);
+                return true;
+            }
         }
 
-        state.mScriptedAnims.push_back(anim);
-    }
-}
+        count = std::max(count, 1);
 
-void CharacterController::unpersistAnimationState()
-{
-    const ESM::AnimationState& state = mPtr.getRefData().getAnimationState();
+        AnimationQueueEntry entry;
+        entry.mGroup = groupname;
+        entry.mLoopCount = count - 1;
+        entry.mPersist = persist;
 
-    if (!state.mScriptedAnims.empty())
-    {
-        clearAnimQueue();
-        for (ESM::AnimationState::ScriptedAnimations::const_iterator iter = state.mScriptedAnims.begin(); iter != state.mScriptedAnims.end(); ++iter)
+        if (mode != 0 || mAnimQueue.empty() || !isAnimPlaying(mAnimQueue.front().mGroup))
         {
-            AnimationQueueEntry entry;
-            entry.mGroup = iter->mGroup;
-            entry.mLoopCount = iter->mLoopCount;
-            entry.mPersist = true;
+            clearAnimQueue(persist);
 
-            mAnimQueue.push_back(entry);
-        }
+            clearStateAnimation(mCurrentIdle);
 
-        const ESM::AnimationState::ScriptedAnimation& anim = state.mScriptedAnims.front();
-        float complete = anim.mTime;
-        if (anim.mAbsolute)
+            mIdleState = CharState_SpecialIdle;
+            bool loopfallback = (entry.mGroup.compare(0, 4, "idle") == 0);
+            mAnimation->play(groupname, persist && groupname != "idle" ? Priority_Persistent : Priority_Default,
+                MWRender::Animation::BlendMask_All, false, 1.0f, ((mode == 2) ? "loop start" : "start"), "stop", 0.0f,
+                count - 1, loopfallback);
+        }
+        else
         {
-            float start = mAnimation->getTextKeyTime(anim.mGroup+": start");
-            float stop = mAnimation->getTextKeyTime(anim.mGroup+": stop");
-            float time = std::clamp(anim.mTime, start, stop);
-            complete = (time - start) / (stop - start);
+            mAnimQueue.resize(1);
         }
 
-        clearStateAnimation(mCurrentIdle);
-        mIdleState = CharState_SpecialIdle;
+        // "PlayGroup idle" is a special case, used to remove to stop scripted animations playing
+        if (groupname == "idle")
+            entry.mPersist = false;
 
-        bool loopfallback = (mAnimQueue.front().mGroup.compare(0,4,"idle") == 0);
-        mAnimation->play(anim.mGroup,
-                         Priority_Persistent, MWRender::Animation::BlendMask_All, false, 1.0f,
-                         "start", "stop", complete, anim.mLoopCount, loopfallback);
+        mAnimQueue.push_back(entry);
+
+        return true;
     }
-}
 
-bool CharacterController::playGroup(std::string_view groupname, int mode, int count, bool persist)
-{
-    if(!mAnimation || !mAnimation->hasAnimation(groupname))
+    void CharacterController::skipAnim()
+    {
+        mSkipAnim = true;
+    }
+
+    bool CharacterController::isPersistentAnimPlaying() const
+    {
+        if (!mAnimQueue.empty())
+        {
+            const AnimationQueueEntry& first = mAnimQueue.front();
+            return first.mPersist && isAnimPlaying(first.mGroup);
+        }
+
         return false;
+    }
 
-    // We should not interrupt persistent animations by non-persistent ones
-    if (isPersistentAnimPlaying() && !persist)
-        return true;
+    bool CharacterController::isAnimPlaying(std::string_view groupName) const
+    {
+        if (mAnimation == nullptr)
+            return false;
+        return mAnimation->isPlaying(groupName);
+    }
 
-    // If this animation is a looped animation (has a "loop start" key) that is already playing
-    // and has not yet reached the end of the loop, allow it to continue animating with its existing loop count
-    // and remove any other animations that were queued.
-    // This emulates observed behavior from the original allows the script "OutsideBanner" to animate banners correctly.
-    if (!mAnimQueue.empty() && mAnimQueue.front().mGroup == groupname &&
-        mAnimation->getTextKeyTime(mAnimQueue.front().mGroup + ": loop start") >= 0 &&
-        mAnimation->isPlaying(groupname))
+    void CharacterController::clearAnimQueue(bool clearPersistAnims)
     {
-        float endOfLoop = mAnimation->getTextKeyTime(mAnimQueue.front().mGroup+": loop stop");
+        // Do not interrupt scripted animations, if we want to keep them
+        if ((!isPersistentAnimPlaying() || clearPersistAnims) && !mAnimQueue.empty())
+            mAnimation->disable(mAnimQueue.front().mGroup);
 
-        if (endOfLoop < 0) // if no Loop Stop key was found, use the Stop key
-            endOfLoop = mAnimation->getTextKeyTime(mAnimQueue.front().mGroup+": stop");
+        if (clearPersistAnims)
+        {
+            mAnimQueue.clear();
+            return;
+        }
 
-        if (endOfLoop > 0 && (mAnimation->getCurrentTime(mAnimQueue.front().mGroup) < endOfLoop))
+        for (AnimationQueue::iterator it = mAnimQueue.begin(); it != mAnimQueue.end();)
         {
-            mAnimQueue.resize(1);
-            return true;
+            if (!it->mPersist)
+                it = mAnimQueue.erase(it);
+            else
+                ++it;
         }
     }
 
-    count = std::max(count, 1);
+    void CharacterController::forceStateUpdate()
+    {
+        if (!mAnimation)
+            return;
+        clearAnimQueue();
 
-    AnimationQueueEntry entry;
-    entry.mGroup = groupname;
-    entry.mLoopCount = count-1;
-    entry.mPersist = persist;
+        // Make sure we canceled the current attack or spellcasting,
+        // because we disabled attack animations anyway.
+        mCanCast = false;
+        mCastingManualSpell = false;
+        setAttackingOrSpell(false);
+        if (mUpperBodyState != UpperBodyState::None)
+            mUpperBodyState = UpperBodyState::WeaponEquipped;
 
-    if(mode != 0 || mAnimQueue.empty() || !isAnimPlaying(mAnimQueue.front().mGroup))
-    {
-        clearAnimQueue(persist);
+        refreshCurrentAnims(mIdleState, mMovementState, mJumpState, true);
 
-        clearStateAnimation(mCurrentIdle);
+        if (mDeathState != CharState_None)
+        {
+            playRandomDeath();
+        }
 
-        mIdleState = CharState_SpecialIdle;
-        bool loopfallback = (entry.mGroup.compare(0,4,"idle") == 0);
-        mAnimation->play(groupname, persist && groupname != "idle" ? Priority_Persistent : Priority_Default,
-                            MWRender::Animation::BlendMask_All, false, 1.0f,
-                            ((mode==2) ? "loop start" : "start"), "stop", 0.0f, count-1, loopfallback);
+        mAnimation->runAnimation(0.f);
     }
-    else
+
+    CharacterController::KillResult CharacterController::kill()
     {
-        mAnimQueue.resize(1);
+        if (mDeathState == CharState_None)
+        {
+            playRandomDeath();
+            resetCurrentIdleState();
+            return Result_DeathAnimStarted;
+        }
+
+        MWMechanics::CreatureStats& cStats = mPtr.getClass().getCreatureStats(mPtr);
+        if (isAnimPlaying(mCurrentDeath))
+            return Result_DeathAnimPlaying;
+        if (!cStats.isDeathAnimationFinished())
+        {
+            cStats.setDeathAnimationFinished(true);
+            return Result_DeathAnimJustFinished;
+        }
+        return Result_DeathAnimFinished;
     }
 
-    // "PlayGroup idle" is a special case, used to remove to stop scripted animations playing
-    if (groupname == "idle")
-        entry.mPersist = false;
+    void CharacterController::resurrect()
+    {
+        if (mDeathState == CharState_None)
+            return;
 
-    mAnimQueue.push_back(entry);
+        resetCurrentDeathState();
+        mWeaponType = ESM::Weapon::None;
+    }
 
-    return true;
-}
+    void CharacterController::updateContinuousVfx() const
+    {
+        // Keeping track of when to stop a continuous VFX seems to be very difficult to do inside the spells code,
+        // as it's extremely spread out (ActiveSpells, Spells, InventoryStore effects, etc...) so we do it here.
 
-void CharacterController::skipAnim()
-{
-    mSkipAnim = true;
-}
+        // Stop any effects that are no longer active
+        std::vector<int> effects;
+        mAnimation->getLoopingEffects(effects);
 
-bool CharacterController::isPersistentAnimPlaying() const
-{
-    if (!mAnimQueue.empty())
-    {
-        const AnimationQueueEntry& first = mAnimQueue.front();
-        return first.mPersist && isAnimPlaying(first.mGroup);
+        for (int effectId : effects)
+        {
+            if (mPtr.getClass().getCreatureStats(mPtr).isDeathAnimationFinished()
+                || mPtr.getClass()
+                        .getCreatureStats(mPtr)
+                        .getMagicEffects()
+                        .get(MWMechanics::EffectKey(effectId))
+                        .getMagnitude()
+                    <= 0)
+                mAnimation->removeEffect(effectId);
+        }
     }
 
-    return false;
-}
+    void CharacterController::updateMagicEffects() const
+    {
+        if (!mPtr.getClass().isActor())
+            return;
 
-bool CharacterController::isAnimPlaying(std::string_view groupName) const
-{
-    if(mAnimation == nullptr)
-        return false;
-    return mAnimation->isPlaying(groupName);
-}
+        float light
+            = mPtr.getClass().getCreatureStats(mPtr).getMagicEffects().get(ESM::MagicEffect::Light).getMagnitude();
+        mAnimation->setLightEffect(light);
 
-void CharacterController::clearAnimQueue(bool clearPersistAnims)
-{
-    // Do not interrupt scripted animations, if we want to keep them
-    if ((!isPersistentAnimPlaying() || clearPersistAnims) && !mAnimQueue.empty())
-        mAnimation->disable(mAnimQueue.front().mGroup);
+        // If you're dead you don't care about whether you've started/stopped being a vampire or not
+        if (mPtr.getClass().getCreatureStats(mPtr).isDead())
+            return;
 
-    if (clearPersistAnims)
-    {
-        mAnimQueue.clear();
-        return;
+        bool vampire
+            = mPtr.getClass().getCreatureStats(mPtr).getMagicEffects().get(ESM::MagicEffect::Vampirism).getMagnitude()
+            > 0.0f;
+        mAnimation->setVampire(vampire);
     }
 
-    for (AnimationQueue::iterator it = mAnimQueue.begin(); it != mAnimQueue.end();)
+    void CharacterController::setVisibility(float visibility) const
     {
-        if (!it->mPersist)
-            it = mAnimQueue.erase(it);
-        else
-            ++it;
-    }
-}
-
-void CharacterController::forceStateUpdate()
-{
-    if(!mAnimation)
-        return;
-    clearAnimQueue();
+        // We should take actor's invisibility in account
+        if (mPtr.getClass().isActor())
+        {
+            float alpha = 1.f;
+            if (mPtr.getClass()
+                    .getCreatureStats(mPtr)
+                    .getMagicEffects()
+                    .get(ESM::MagicEffect::Invisibility)
+                    .getModifier()) // Ignore base magnitude (see bug #3555).
+            {
+                if (mPtr == getPlayer())
+                    alpha = 0.25f;
+                else
+                    alpha = 0.05f;
+            }
+            float chameleon = mPtr.getClass()
+                                  .getCreatureStats(mPtr)
+                                  .getMagicEffects()
+                                  .get(ESM::MagicEffect::Chameleon)
+                                  .getMagnitude();
+            if (chameleon)
+            {
+                alpha *= std::clamp(1.f - chameleon / 100.f, 0.25f, 0.75f);
+            }
 
-    // Make sure we canceled the current attack or spellcasting,
-    // because we disabled attack animations anyway.
-    mCanCast = false;
-    mCastingManualSpell = false;
-    setAttackingOrSpell(false);
-    if (mUpperBodyState != UpperBodyState::None)
-        mUpperBodyState = UpperBodyState::WeaponEquipped;
+            visibility = std::min(visibility, alpha);
+        }
 
-    refreshCurrentAnims(mIdleState, mMovementState, mJumpState, true);
+        // TODO: implement a dithering shader rather than just change object transparency.
+        mAnimation->setAlpha(visibility);
+    }
 
-    if(mDeathState != CharState_None)
+    std::string_view CharacterController::getMovementBasedAttackType() const
     {
-        playRandomDeath();
+        float* move = mPtr.getClass().getMovementSettings(mPtr).mPosition;
+        if (std::abs(move[1]) > std::abs(move[0]) + 0.2f) // forward-backward
+            return "thrust";
+        if (std::abs(move[0]) > std::abs(move[1]) + 0.2f) // sideway
+            return "slash";
+        return "chop";
     }
 
-    mAnimation->runAnimation(0.f);
-}
-
-CharacterController::KillResult CharacterController::kill()
-{
-    if (mDeathState == CharState_None)
+    bool CharacterController::isRandomAttackAnimation(std::string_view group)
     {
-        playRandomDeath();
-        resetCurrentIdleState();
-        return Result_DeathAnimStarted;
+        return (group == "attack1" || group == "swimattack1" || group == "attack2" || group == "swimattack2"
+            || group == "attack3" || group == "swimattack3");
     }
 
-    MWMechanics::CreatureStats& cStats = mPtr.getClass().getCreatureStats(mPtr);
-    if (isAnimPlaying(mCurrentDeath))
-        return Result_DeathAnimPlaying;
-    if (!cStats.isDeathAnimationFinished())
+    bool CharacterController::isAttackPreparing() const
     {
-        cStats.setDeathAnimationFinished(true);
-        return Result_DeathAnimJustFinished;
+        return mUpperBodyState == UpperBodyState::AttackWindUp;
     }
-    return Result_DeathAnimFinished;
-}
-
-void CharacterController::resurrect()
-{
-    if(mDeathState == CharState_None)
-        return;
-
-    resetCurrentDeathState();
-    mWeaponType = ESM::Weapon::None;
-}
 
-void CharacterController::updateContinuousVfx() const
-{
-    // Keeping track of when to stop a continuous VFX seems to be very difficult to do inside the spells code,
-    // as it's extremely spread out (ActiveSpells, Spells, InventoryStore effects, etc...) so we do it here.
-
-    // Stop any effects that are no longer active
-    std::vector<int> effects;
-    mAnimation->getLoopingEffects(effects);
-
-    for (int effectId : effects)
+    bool CharacterController::isCastingSpell() const
     {
-        if (mPtr.getClass().getCreatureStats(mPtr).isDeathAnimationFinished()
-            || mPtr.getClass().getCreatureStats(mPtr).getMagicEffects().get(MWMechanics::EffectKey(effectId)).getMagnitude() <= 0)
-            mAnimation->removeEffect(effectId);
+        return mCastingManualSpell || mUpperBodyState == UpperBodyState::Casting;
     }
-}
 
-void CharacterController::updateMagicEffects() const
-{
-    if (!mPtr.getClass().isActor())
-        return;
-
-    float light = mPtr.getClass().getCreatureStats(mPtr).getMagicEffects().get(ESM::MagicEffect::Light).getMagnitude();
-    mAnimation->setLightEffect(light);
-
-    // If you're dead you don't care about whether you've started/stopped being a vampire or not
-    if (mPtr.getClass().getCreatureStats(mPtr).isDead())
-        return;
-
-    bool vampire = mPtr.getClass().getCreatureStats(mPtr).getMagicEffects().get(ESM::MagicEffect::Vampirism).getMagnitude() > 0.0f;
-    mAnimation->setVampire(vampire);
-}
-
-void CharacterController::setVisibility(float visibility) const
-{
-    // We should take actor's invisibility in account
-    if (mPtr.getClass().isActor())
+    bool CharacterController::isReadyToBlock() const
     {
-        float alpha = 1.f;
-        if (mPtr.getClass().getCreatureStats(mPtr).getMagicEffects().get(ESM::MagicEffect::Invisibility).getModifier()) // Ignore base magnitude (see bug #3555).
-        {
-            if (mPtr == getPlayer())
-                alpha = 0.25f;
-            else
-                alpha = 0.05f;
-        }
-        float chameleon = mPtr.getClass().getCreatureStats(mPtr).getMagicEffects().get(ESM::MagicEffect::Chameleon).getMagnitude();
-        if (chameleon)
-        {
-            alpha *= std::clamp(1.f - chameleon / 100.f, 0.25f, 0.75f);
-        }
-
-        visibility = std::min(visibility, alpha);
+        return updateCarriedLeftVisible(mWeaponType);
     }
 
-    // TODO: implement a dithering shader rather than just change object transparency.
-    mAnimation->setAlpha(visibility);
-}
-
-std::string_view CharacterController::getMovementBasedAttackType() const
-{
-    float *move = mPtr.getClass().getMovementSettings(mPtr).mPosition;
-    if (std::abs(move[1]) > std::abs(move[0]) + 0.2f) // forward-backward
-        return "thrust";
-    if (std::abs(move[0]) > std::abs(move[1]) + 0.2f) // sideway
-        return "slash";
-    return "chop";
-}
-
-bool CharacterController::isRandomAttackAnimation(std::string_view group)
-{
-    return (group == "attack1" || group == "swimattack1" ||
-            group == "attack2" || group == "swimattack2" ||
-            group == "attack3" || group == "swimattack3");
-}
-
-bool CharacterController::isAttackPreparing() const
-{
-    return mUpperBodyState == UpperBodyState::AttackWindUp;
-}
-
-bool CharacterController::isCastingSpell() const
-{
-    return mCastingManualSpell || mUpperBodyState == UpperBodyState::Casting;
-}
-
-bool CharacterController::isReadyToBlock() const
-{
-    return updateCarriedLeftVisible(mWeaponType);
-}
-
-bool CharacterController::isKnockedDown() const
-{
-    return mHitState == CharState_KnockDown ||
-            mHitState == CharState_SwimKnockDown;
-}
+    bool CharacterController::isKnockedDown() const
+    {
+        return mHitState == CharState_KnockDown || mHitState == CharState_SwimKnockDown;
+    }
 
-bool CharacterController::isKnockedOut() const
-{
-    return mHitState == CharState_KnockOut ||
-            mHitState == CharState_SwimKnockOut;
-}
+    bool CharacterController::isKnockedOut() const
+    {
+        return mHitState == CharState_KnockOut || mHitState == CharState_SwimKnockOut;
+    }
 
-bool CharacterController::isTurning() const
-{
-    return mMovementState == CharState_TurnLeft ||
-            mMovementState == CharState_TurnRight ||
-            mMovementState == CharState_SwimTurnLeft ||
-            mMovementState == CharState_SwimTurnRight;
-}
+    bool CharacterController::isTurning() const
+    {
+        return mMovementState == CharState_TurnLeft || mMovementState == CharState_TurnRight
+            || mMovementState == CharState_SwimTurnLeft || mMovementState == CharState_SwimTurnRight;
+    }
 
-bool CharacterController::isRecovery() const
-{
-    return mHitState == CharState_Hit ||
-            mHitState == CharState_SwimHit;
-}
+    bool CharacterController::isRecovery() const
+    {
+        return mHitState == CharState_Hit || mHitState == CharState_SwimHit;
+    }
 
-bool CharacterController::isAttackingOrSpell() const
-{
-    return mUpperBodyState != UpperBodyState::None && mUpperBodyState != UpperBodyState::WeaponEquipped;
-}
+    bool CharacterController::isAttackingOrSpell() const
+    {
+        return mUpperBodyState != UpperBodyState::None && mUpperBodyState != UpperBodyState::WeaponEquipped;
+    }
 
-bool CharacterController::isSneaking() const
-{
-    return mIdleState == CharState_IdleSneak ||
-            mMovementState == CharState_SneakForward ||
-            mMovementState == CharState_SneakBack ||
-            mMovementState == CharState_SneakLeft ||
-            mMovementState == CharState_SneakRight;
-}
+    bool CharacterController::isSneaking() const
+    {
+        return mIdleState == CharState_IdleSneak || mMovementState == CharState_SneakForward
+            || mMovementState == CharState_SneakBack || mMovementState == CharState_SneakLeft
+            || mMovementState == CharState_SneakRight;
+    }
 
-bool CharacterController::isRunning() const
-{
-    return mMovementState == CharState_RunForward ||
-            mMovementState == CharState_RunBack ||
-            mMovementState == CharState_RunLeft ||
-            mMovementState == CharState_RunRight ||
-            mMovementState == CharState_SwimRunForward ||
-            mMovementState == CharState_SwimRunBack ||
-            mMovementState == CharState_SwimRunLeft ||
-            mMovementState == CharState_SwimRunRight;
-}
+    bool CharacterController::isRunning() const
+    {
+        return mMovementState == CharState_RunForward || mMovementState == CharState_RunBack
+            || mMovementState == CharState_RunLeft || mMovementState == CharState_RunRight
+            || mMovementState == CharState_SwimRunForward || mMovementState == CharState_SwimRunBack
+            || mMovementState == CharState_SwimRunLeft || mMovementState == CharState_SwimRunRight;
+    }
 
-void CharacterController::setAttackingOrSpell(bool attackingOrSpell) const
-{
-    mPtr.getClass().getCreatureStats(mPtr).setAttackingOrSpell(attackingOrSpell);
-}
+    void CharacterController::setAttackingOrSpell(bool attackingOrSpell) const
+    {
+        mPtr.getClass().getCreatureStats(mPtr).setAttackingOrSpell(attackingOrSpell);
+    }
 
-void CharacterController::castSpell(const std::string& spellId, bool manualSpell)
-{
-    setAttackingOrSpell(true);
-    mCastingManualSpell = manualSpell;
-    ActionSpell action = ActionSpell(spellId);
-    action.prepare(mPtr);
-}
+    void CharacterController::castSpell(const std::string& spellId, bool manualSpell)
+    {
+        setAttackingOrSpell(true);
+        mCastingManualSpell = manualSpell;
+        ActionSpell action = ActionSpell(spellId);
+        action.prepare(mPtr);
+    }
 
-void CharacterController::setAIAttackType(std::string_view attackType)
-{
-    mAttackType = attackType;
-}
+    void CharacterController::setAIAttackType(std::string_view attackType)
+    {
+        mAttackType = attackType;
+    }
 
-std::string_view CharacterController::getRandomAttackType()
-{
-    MWBase::World* world = MWBase::Environment::get().getWorld();
-    float random = Misc::Rng::rollProbability(world->getPrng());
-    if (random >= 2/3.f)
-        return "thrust";
-    if (random >= 1/3.f)
-        return "slash";
-    return "chop";
-}
+    std::string_view CharacterController::getRandomAttackType()
+    {
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+        float random = Misc::Rng::rollProbability(world->getPrng());
+        if (random >= 2 / 3.f)
+            return "thrust";
+        if (random >= 1 / 3.f)
+            return "slash";
+        return "chop";
+    }
 
-bool CharacterController::readyToPrepareAttack() const
-{
-    return (mHitState == CharState_None || mHitState == CharState_Block)
+    bool CharacterController::readyToPrepareAttack() const
+    {
+        return (mHitState == CharState_None || mHitState == CharState_Block)
             && mUpperBodyState <= UpperBodyState::WeaponEquipped;
-}
-
-bool CharacterController::readyToStartAttack() const
-{
-    if (mHitState != CharState_None && mHitState != CharState_Block)
-        return false;
-
-    return mUpperBodyState == UpperBodyState::WeaponEquipped;
-}
+    }
 
-float CharacterController::getAttackStrength() const
-{
-    return mAttackStrength;
-}
+    bool CharacterController::readyToStartAttack() const
+    {
+        if (mHitState != CharState_None && mHitState != CharState_Block)
+            return false;
 
-bool CharacterController::getAttackingOrSpell() const
-{
-    return mPtr.getClass().getCreatureStats(mPtr).getAttackingOrSpell();
-}
+        return mUpperBodyState == UpperBodyState::WeaponEquipped;
+    }
 
-void CharacterController::setActive(int active) const
-{
-    mAnimation->setActive(active);
-}
+    float CharacterController::getAttackStrength() const
+    {
+        return mAttackStrength;
+    }
 
-void CharacterController::setHeadTrackTarget(const MWWorld::ConstPtr &target)
-{
-    mHeadTrackTarget = target;
-}
+    bool CharacterController::getAttackingOrSpell() const
+    {
+        return mPtr.getClass().getCreatureStats(mPtr).getAttackingOrSpell();
+    }
 
-void CharacterController::playSwishSound() const
-{
-    std::string_view soundId = "Weapon Swish";
-    float volume = 0.98f + mAttackStrength * 0.02f;
-    float pitch = 0.75f + mAttackStrength * 0.4f;
+    void CharacterController::setActive(int active) const
+    {
+        mAnimation->setActive(active);
+    }
 
-    const MWWorld::Class &cls = mPtr.getClass();
-    if (cls.isNpc() && cls.getNpcStats(mPtr).isWerewolf())
+    void CharacterController::setHeadTrackTarget(const MWWorld::ConstPtr& target)
     {
-        MWBase::World* world = MWBase::Environment::get().getWorld();
-        const MWWorld::ESMStore &store = world->getStore();
-        const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfSwing", world->getPrng());
-        if (sound)
-            soundId = sound->mId;
+        mHeadTrackTarget = target;
     }
 
-    if (!soundId.empty())
-        MWBase::Environment::get().getSoundManager()->playSound3D(mPtr, soundId, volume, pitch);
-}
+    void CharacterController::playSwishSound() const
+    {
+        std::string_view soundId = "Weapon Swish";
+        float volume = 0.98f + mAttackStrength * 0.02f;
+        float pitch = 0.75f + mAttackStrength * 0.4f;
 
-void CharacterController::updateHeadTracking(float duration)
-{
-    const osg::Node* head = mAnimation->getNode("Bip01 Head");
-    if (!head)
-        return;
+        const MWWorld::Class& cls = mPtr.getClass();
+        if (cls.isNpc() && cls.getNpcStats(mPtr).isWerewolf())
+        {
+            MWBase::World* world = MWBase::Environment::get().getWorld();
+            const MWWorld::ESMStore& store = world->getStore();
+            const ESM::Sound* sound = store.get<ESM::Sound>().searchRandom("WolfSwing", world->getPrng());
+            if (sound)
+                soundId = sound->mId;
+        }
 
-    double zAngleRadians = 0.f;
-    double xAngleRadians = 0.f;
+        if (!soundId.empty())
+            MWBase::Environment::get().getSoundManager()->playSound3D(mPtr, soundId, volume, pitch);
+    }
 
-    if (!mHeadTrackTarget.isEmpty())
+    void CharacterController::updateHeadTracking(float duration)
     {
-        osg::NodePathList nodepaths = head->getParentalNodePaths();
-        if (nodepaths.empty())
+        const osg::Node* head = mAnimation->getNode("Bip01 Head");
+        if (!head)
             return;
-        osg::Matrixf mat = osg::computeLocalToWorld(nodepaths[0]);
-        osg::Vec3f headPos = mat.getTrans();
 
-        osg::Vec3f direction;
-        if (const MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(mHeadTrackTarget))
+        double zAngleRadians = 0.f;
+        double xAngleRadians = 0.f;
+
+        if (!mHeadTrackTarget.isEmpty())
         {
-            const osg::Node* node = anim->getNode("Head");
-            if (node == nullptr)
-                node = anim->getNode("Bip01 Head");
-            if (node != nullptr)
+            osg::NodePathList nodepaths = head->getParentalNodePaths();
+            if (nodepaths.empty())
+                return;
+            osg::Matrixf mat = osg::computeLocalToWorld(nodepaths[0]);
+            osg::Vec3f headPos = mat.getTrans();
+
+            osg::Vec3f direction;
+            if (const MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(mHeadTrackTarget))
             {
-                nodepaths = node->getParentalNodePaths();
-                if (!nodepaths.empty())
-                    direction = osg::computeLocalToWorld(nodepaths[0]).getTrans() - headPos;
+                const osg::Node* node = anim->getNode("Head");
+                if (node == nullptr)
+                    node = anim->getNode("Bip01 Head");
+                if (node != nullptr)
+                {
+                    nodepaths = node->getParentalNodePaths();
+                    if (!nodepaths.empty())
+                        direction = osg::computeLocalToWorld(nodepaths[0]).getTrans() - headPos;
+                }
+                else
+                    // no head node to look at, fall back to look at center of collision box
+                    direction = MWBase::Environment::get().getWorld()->aimToTarget(mPtr, mHeadTrackTarget, false);
             }
-            else
-                // no head node to look at, fall back to look at center of collision box
-                direction = MWBase::Environment::get().getWorld()->aimToTarget(mPtr, mHeadTrackTarget, false);
-        }
-        direction.normalize();
+            direction.normalize();
 
-        if (!mPtr.getRefData().getBaseNode())
-            return;
-        const osg::Vec3f actorDirection = mPtr.getRefData().getBaseNode()->getAttitude() * osg::Vec3f(0,1,0);
+            if (!mPtr.getRefData().getBaseNode())
+                return;
+            const osg::Vec3f actorDirection = mPtr.getRefData().getBaseNode()->getAttitude() * osg::Vec3f(0, 1, 0);
 
-        zAngleRadians = std::atan2(actorDirection.x(), actorDirection.y()) - std::atan2(direction.x(), direction.y());
-        zAngleRadians = Misc::normalizeAngle(zAngleRadians - mAnimation->getHeadYaw()) + mAnimation->getHeadYaw();
-        zAngleRadians *= (1 - direction.z() * direction.z());
-        xAngleRadians = std::asin(direction.z());
-    }
+            zAngleRadians
+                = std::atan2(actorDirection.x(), actorDirection.y()) - std::atan2(direction.x(), direction.y());
+            zAngleRadians = Misc::normalizeAngle(zAngleRadians - mAnimation->getHeadYaw()) + mAnimation->getHeadYaw();
+            zAngleRadians *= (1 - direction.z() * direction.z());
+            xAngleRadians = std::asin(direction.z());
+        }
 
-    const double xLimit = osg::DegreesToRadians(40.0);
-    const double zLimit = osg::DegreesToRadians(30.0);
-    double zLimitOffset = mAnimation->getUpperBodyYawRadians();
-    xAngleRadians = std::clamp(xAngleRadians, -xLimit, xLimit);
-    zAngleRadians = std::clamp(zAngleRadians, -zLimit + zLimitOffset, zLimit + zLimitOffset);
+        const double xLimit = osg::DegreesToRadians(40.0);
+        const double zLimit = osg::DegreesToRadians(30.0);
+        double zLimitOffset = mAnimation->getUpperBodyYawRadians();
+        xAngleRadians = std::clamp(xAngleRadians, -xLimit, xLimit);
+        zAngleRadians = std::clamp(zAngleRadians, -zLimit + zLimitOffset, zLimit + zLimitOffset);
 
-    float factor = duration*5;
-    factor = std::min(factor, 1.f);
-    xAngleRadians = (1.f-factor) * mAnimation->getHeadPitch() + factor * xAngleRadians;
-    zAngleRadians = (1.f-factor) * mAnimation->getHeadYaw() + factor * zAngleRadians;
+        float factor = duration * 5;
+        factor = std::min(factor, 1.f);
+        xAngleRadians = (1.f - factor) * mAnimation->getHeadPitch() + factor * xAngleRadians;
+        zAngleRadians = (1.f - factor) * mAnimation->getHeadYaw() + factor * zAngleRadians;
 
-    mAnimation->setHeadPitch(xAngleRadians);
-    mAnimation->setHeadYaw(zAngleRadians);
-}
+        mAnimation->setHeadPitch(xAngleRadians);
+        mAnimation->setHeadYaw(zAngleRadians);
+    }
 
 }
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 3f7dcd1114..bf6a61deae 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -22,294 +22,300 @@ namespace MWRender
 namespace MWMechanics
 {
 
-struct Movement;
-class CreatureStats;
-
-enum Priority {
-    Priority_Default,
-    Priority_WeaponLowerBody,
-    Priority_SneakIdleLowerBody,
-    Priority_SwimIdle,
-    Priority_Jump,
-    Priority_Movement,
-    Priority_Hit,
-    Priority_Weapon,
-    Priority_Block,
-    Priority_Knockdown,
-    Priority_Torch,
-    Priority_Storm,
-    Priority_Death,
-    Priority_Persistent,
-
-    Num_Priorities
-};
-
-enum CharacterState {
-    CharState_None,
-
-    CharState_SpecialIdle,
-    CharState_Idle,
-    CharState_IdleSwim,
-    CharState_IdleSneak,
-
-    CharState_WalkForward,
-    CharState_WalkBack,
-    CharState_WalkLeft,
-    CharState_WalkRight,
-
-    CharState_SwimWalkForward,
-    CharState_SwimWalkBack,
-    CharState_SwimWalkLeft,
-    CharState_SwimWalkRight,
-
-    CharState_RunForward,
-    CharState_RunBack,
-    CharState_RunLeft,
-    CharState_RunRight,
-
-    CharState_SwimRunForward,
-    CharState_SwimRunBack,
-    CharState_SwimRunLeft,
-    CharState_SwimRunRight,
-
-    CharState_SneakForward,
-    CharState_SneakBack,
-    CharState_SneakLeft,
-    CharState_SneakRight,
-
-    CharState_TurnLeft,
-    CharState_TurnRight,
-    CharState_SwimTurnLeft,
-    CharState_SwimTurnRight,
-
-    CharState_Death1,
-    CharState_Death2,
-    CharState_Death3,
-    CharState_Death4,
-    CharState_Death5,
-    CharState_SwimDeath,
-    CharState_SwimDeathKnockDown,
-    CharState_SwimDeathKnockOut,
-    CharState_DeathKnockDown,
-    CharState_DeathKnockOut,
-
-    CharState_Hit,
-    CharState_SwimHit,
-    CharState_KnockDown,
-    CharState_KnockOut,
-    CharState_SwimKnockDown,
-    CharState_SwimKnockOut,
-    CharState_Block
-};
-
-enum class UpperBodyState
-{
-    None,
-    Equipping,
-    Unequipping,
-    WeaponEquipped,
-    AttackWindUp,
-    AttackRelease,
-    AttackEnd,
-    Casting
-};
-
-enum JumpingState {
-    JumpState_None,
-    JumpState_InAir,
-    JumpState_Landing
-};
-
-struct WeaponInfo;
-
-class CharacterController : public MWRender::Animation::TextKeyListener
-{
-    MWWorld::Ptr mPtr;
-    MWWorld::Ptr mWeapon;
-    MWRender::Animation *mAnimation;
-    
-    struct AnimationQueueEntry
+    struct Movement;
+    class CreatureStats;
+
+    enum Priority
+    {
+        Priority_Default,
+        Priority_WeaponLowerBody,
+        Priority_SneakIdleLowerBody,
+        Priority_SwimIdle,
+        Priority_Jump,
+        Priority_Movement,
+        Priority_Hit,
+        Priority_Weapon,
+        Priority_Block,
+        Priority_Knockdown,
+        Priority_Torch,
+        Priority_Storm,
+        Priority_Death,
+        Priority_Persistent,
+
+        Num_Priorities
+    };
+
+    enum CharacterState
+    {
+        CharState_None,
+
+        CharState_SpecialIdle,
+        CharState_Idle,
+        CharState_IdleSwim,
+        CharState_IdleSneak,
+
+        CharState_WalkForward,
+        CharState_WalkBack,
+        CharState_WalkLeft,
+        CharState_WalkRight,
+
+        CharState_SwimWalkForward,
+        CharState_SwimWalkBack,
+        CharState_SwimWalkLeft,
+        CharState_SwimWalkRight,
+
+        CharState_RunForward,
+        CharState_RunBack,
+        CharState_RunLeft,
+        CharState_RunRight,
+
+        CharState_SwimRunForward,
+        CharState_SwimRunBack,
+        CharState_SwimRunLeft,
+        CharState_SwimRunRight,
+
+        CharState_SneakForward,
+        CharState_SneakBack,
+        CharState_SneakLeft,
+        CharState_SneakRight,
+
+        CharState_TurnLeft,
+        CharState_TurnRight,
+        CharState_SwimTurnLeft,
+        CharState_SwimTurnRight,
+
+        CharState_Death1,
+        CharState_Death2,
+        CharState_Death3,
+        CharState_Death4,
+        CharState_Death5,
+        CharState_SwimDeath,
+        CharState_SwimDeathKnockDown,
+        CharState_SwimDeathKnockOut,
+        CharState_DeathKnockDown,
+        CharState_DeathKnockOut,
+
+        CharState_Hit,
+        CharState_SwimHit,
+        CharState_KnockDown,
+        CharState_KnockOut,
+        CharState_SwimKnockDown,
+        CharState_SwimKnockOut,
+        CharState_Block
+    };
+
+    enum class UpperBodyState
+    {
+        None,
+        Equipping,
+        Unequipping,
+        WeaponEquipped,
+        AttackWindUp,
+        AttackRelease,
+        AttackEnd,
+        Casting
+    };
+
+    enum JumpingState
     {
-        std::string mGroup;
-        size_t mLoopCount;
-        bool mPersist;
+        JumpState_None,
+        JumpState_InAir,
+        JumpState_Landing
     };
-    typedef std::deque<AnimationQueueEntry> AnimationQueue;
-    AnimationQueue mAnimQueue;
 
-    CharacterState mIdleState{CharState_None};
-    std::string mCurrentIdle;
+    struct WeaponInfo;
 
-    CharacterState mMovementState{CharState_None};
-    std::string mCurrentMovement;
-    float mMovementAnimSpeed{0.f};
-    bool mAdjustMovementAnimSpeed{false};
-    bool mHasMovedInXY{false};
-    bool mMovementAnimationControlled{true};
+    class CharacterController : public MWRender::Animation::TextKeyListener
+    {
+        MWWorld::Ptr mPtr;
+        MWWorld::Ptr mWeapon;
+        MWRender::Animation* mAnimation;
 
-    CharacterState mDeathState{CharState_None};
-    std::string mCurrentDeath;
-    bool mFloatToSurface{true};
+        struct AnimationQueueEntry
+        {
+            std::string mGroup;
+            size_t mLoopCount;
+            bool mPersist;
+        };
+        typedef std::deque<AnimationQueueEntry> AnimationQueue;
+        AnimationQueue mAnimQueue;
 
-    CharacterState mHitState{CharState_None};
-    std::string mCurrentHit;
+        CharacterState mIdleState{ CharState_None };
+        std::string mCurrentIdle;
 
-    UpperBodyState mUpperBodyState{UpperBodyState::None};
+        CharacterState mMovementState{ CharState_None };
+        std::string mCurrentMovement;
+        float mMovementAnimSpeed{ 0.f };
+        bool mAdjustMovementAnimSpeed{ false };
+        bool mHasMovedInXY{ false };
+        bool mMovementAnimationControlled{ true };
 
-    JumpingState mJumpState{JumpState_None};
-    std::string mCurrentJump;
+        CharacterState mDeathState{ CharState_None };
+        std::string mCurrentDeath;
+        bool mFloatToSurface{ true };
 
-    int mWeaponType{ESM::Weapon::None};
-    std::string mCurrentWeapon;
+        CharacterState mHitState{ CharState_None };
+        std::string mCurrentHit;
 
-    float mAttackStrength{0.f};
-    MWWorld::Ptr mAttackVictim;
-    osg::Vec3f mAttackHitPos;
-    bool mAttackSuccess{false};
+        UpperBodyState mUpperBodyState{ UpperBodyState::None };
 
-    bool mSkipAnim{false};
+        JumpingState mJumpState{ JumpState_None };
+        std::string mCurrentJump;
 
-    // counted for skill increase
-    float mSecondsOfSwimming{0.f};
-    float mSecondsOfRunning{0.f};
+        int mWeaponType{ ESM::Weapon::None };
+        std::string mCurrentWeapon;
 
-    MWWorld::ConstPtr mHeadTrackTarget;
+        float mAttackStrength{ 0.f };
+        MWWorld::Ptr mAttackVictim;
+        osg::Vec3f mAttackHitPos;
+        bool mAttackSuccess{ false };
 
-    float mTurnAnimationThreshold{0.f}; // how long to continue playing turning animation after actor stopped turning
+        bool mSkipAnim{ false };
 
-    std::string mAttackType; // slash, chop or thrust
+        // counted for skill increase
+        float mSecondsOfSwimming{ 0.f };
+        float mSecondsOfRunning{ 0.f };
 
-    bool mCanCast{false};
+        MWWorld::ConstPtr mHeadTrackTarget;
 
-    bool mCastingManualSpell{false};
+        float mTurnAnimationThreshold{
+            0.f
+        }; // how long to continue playing turning animation after actor stopped turning
 
-    bool mIsMovingBackward{false};
-    osg::Vec2f mSmoothedSpeed;
+        std::string mAttackType; // slash, chop or thrust
 
-    std::string_view getMovementBasedAttackType() const;
+        bool mCanCast{ false };
 
-    void clearStateAnimation(std::string &anim) const;
-    void resetCurrentJumpState();
-    void resetCurrentMovementState();
-    void resetCurrentIdleState();
-    void resetCurrentHitState();
-    void resetCurrentWeaponState();
-    void resetCurrentDeathState();
+        bool mCastingManualSpell{ false };
 
-    void refreshCurrentAnims(CharacterState idle, CharacterState movement, JumpingState jump, bool force=false);
-    void refreshHitRecoilAnims();
-    void refreshJumpAnims(JumpingState jump, bool force=false);
-    void refreshMovementAnims(CharacterState movement, bool force=false);
-    void refreshIdleAnims(CharacterState idle, bool force=false);
+        bool mIsMovingBackward{ false };
+        osg::Vec2f mSmoothedSpeed;
 
-    void clearAnimQueue(bool clearPersistAnims = false);
+        std::string_view getMovementBasedAttackType() const;
 
-    bool updateWeaponState();
-    void updateIdleStormState(bool inwater) const;
+        void clearStateAnimation(std::string& anim) const;
+        void resetCurrentJumpState();
+        void resetCurrentMovementState();
+        void resetCurrentIdleState();
+        void resetCurrentHitState();
+        void resetCurrentWeaponState();
+        void resetCurrentDeathState();
 
-    std::string chooseRandomAttackAnimation() const;
-    static bool isRandomAttackAnimation(std::string_view group);
+        void refreshCurrentAnims(CharacterState idle, CharacterState movement, JumpingState jump, bool force = false);
+        void refreshHitRecoilAnims();
+        void refreshJumpAnims(JumpingState jump, bool force = false);
+        void refreshMovementAnims(CharacterState movement, bool force = false);
+        void refreshIdleAnims(CharacterState idle, bool force = false);
 
-    bool isPersistentAnimPlaying() const;
+        void clearAnimQueue(bool clearPersistAnims = false);
 
-    void updateAnimQueue();
+        bool updateWeaponState();
+        void updateIdleStormState(bool inwater) const;
 
-    void updateHeadTracking(float duration);
+        std::string chooseRandomAttackAnimation() const;
+        static bool isRandomAttackAnimation(std::string_view group);
 
-    void updateMagicEffects() const;
+        bool isPersistentAnimPlaying() const;
 
-    void playDeath(float startpoint, CharacterState death);
-    CharacterState chooseRandomDeathState() const;
-    void playRandomDeath(float startpoint = 0.0f);
+        void updateAnimQueue();
 
-    /// choose a random animation group with \a prefix and numeric suffix
-    /// @param num if non-nullptr, the chosen animation number will be written here
-    std::string chooseRandomGroup (const std::string& prefix, int* num = nullptr) const;
+        void updateHeadTracking(float duration);
 
-    bool updateCarriedLeftVisible(int weaptype) const;
+        void updateMagicEffects() const;
 
-    std::string fallbackShortWeaponGroup(const std::string& baseGroupName, MWRender::Animation::BlendMask* blendMask = nullptr) const;
+        void playDeath(float startpoint, CharacterState death);
+        CharacterState chooseRandomDeathState() const;
+        void playRandomDeath(float startpoint = 0.0f);
 
-    std::string_view getWeaponAnimation(int weaponType) const;
-    std::string_view getWeaponShortGroup(int weaponType) const;
+        /// choose a random animation group with \a prefix and numeric suffix
+        /// @param num if non-nullptr, the chosen animation number will be written here
+        std::string chooseRandomGroup(const std::string& prefix, int* num = nullptr) const;
 
-    bool getAttackingOrSpell() const;
-    void setAttackingOrSpell(bool attackingOrSpell) const;
+        bool updateCarriedLeftVisible(int weaptype) const;
 
-public:
-    CharacterController(const MWWorld::Ptr &ptr, MWRender::Animation *anim);
-    virtual ~CharacterController();
+        std::string fallbackShortWeaponGroup(
+            const std::string& baseGroupName, MWRender::Animation::BlendMask* blendMask = nullptr) const;
 
-    CharacterController(const CharacterController&) = delete;
-    CharacterController(CharacterController&&) = delete;
+        std::string_view getWeaponAnimation(int weaponType) const;
+        std::string_view getWeaponShortGroup(int weaponType) const;
 
-    const MWWorld::Ptr& getPtr() const { return mPtr; }
+        bool getAttackingOrSpell() const;
+        void setAttackingOrSpell(bool attackingOrSpell) const;
 
-    void handleTextKey(std::string_view groupname, SceneUtil::TextKeyMap::ConstIterator key, const SceneUtil::TextKeyMap& map) override;
+    public:
+        CharacterController(const MWWorld::Ptr& ptr, MWRender::Animation* anim);
+        virtual ~CharacterController();
 
-    // Be careful when to call this, see comment in Actors
-    void updateContinuousVfx() const;
+        CharacterController(const CharacterController&) = delete;
+        CharacterController(CharacterController&&) = delete;
 
-    void updatePtr(const MWWorld::Ptr &ptr);
+        const MWWorld::Ptr& getPtr() const { return mPtr; }
 
-    void update(float duration);
+        void handleTextKey(std::string_view groupname, SceneUtil::TextKeyMap::ConstIterator key,
+            const SceneUtil::TextKeyMap& map) override;
 
-    bool onOpen() const;
-    void onClose() const;
+        // Be careful when to call this, see comment in Actors
+        void updateContinuousVfx() const;
 
-    void persistAnimationState() const;
-    void unpersistAnimationState();
+        void updatePtr(const MWWorld::Ptr& ptr);
 
-    bool playGroup(std::string_view groupname, int mode, int count, bool persist=false);
-    void skipAnim();
-    bool isAnimPlaying(std::string_view groupName) const;
+        void update(float duration);
 
-    enum KillResult
-    {
-        Result_DeathAnimStarted,
-        Result_DeathAnimPlaying,
-        Result_DeathAnimJustFinished,
-        Result_DeathAnimFinished
-    };
-    KillResult kill();
+        bool onOpen() const;
+        void onClose() const;
 
-    void resurrect();
-    bool isDead() const
-    { return mDeathState != CharState_None; }
+        void persistAnimationState() const;
+        void unpersistAnimationState();
 
-    void forceStateUpdate();
-    
-    bool isAttackPreparing() const;
-    bool isCastingSpell() const;
-    bool isReadyToBlock() const;
-    bool isKnockedDown() const;
-    bool isKnockedOut() const;
-    bool isRecovery() const;
-    bool isSneaking() const;
-    bool isRunning() const;
-    bool isTurning() const;
-    bool isAttackingOrSpell() const;
+        bool playGroup(std::string_view groupname, int mode, int count, bool persist = false);
+        void skipAnim();
+        bool isAnimPlaying(std::string_view groupName) const;
 
-    void setVisibility(float visibility) const;
-    void castSpell(const std::string& spellId, bool manualSpell=false);
-    void setAIAttackType(std::string_view attackType);
-    static std::string_view getRandomAttackType();
+        enum KillResult
+        {
+            Result_DeathAnimStarted,
+            Result_DeathAnimPlaying,
+            Result_DeathAnimJustFinished,
+            Result_DeathAnimFinished
+        };
+        KillResult kill();
 
-    bool readyToPrepareAttack() const;
-    bool readyToStartAttack() const;
+        void resurrect();
+        bool isDead() const { return mDeathState != CharState_None; }
 
-    float calculateWindUp() const;
+        void forceStateUpdate();
 
-    float getAttackStrength() const;
+        bool isAttackPreparing() const;
+        bool isCastingSpell() const;
+        bool isReadyToBlock() const;
+        bool isKnockedDown() const;
+        bool isKnockedOut() const;
+        bool isRecovery() const;
+        bool isSneaking() const;
+        bool isRunning() const;
+        bool isTurning() const;
+        bool isAttackingOrSpell() const;
 
-    /// @see Animation::setActive
-    void setActive(int active) const;
+        void setVisibility(float visibility) const;
+        void castSpell(const std::string& spellId, bool manualSpell = false);
+        void setAIAttackType(std::string_view attackType);
+        static std::string_view getRandomAttackType();
 
-    /// Make this character turn its head towards \a target. To turn off head tracking, pass an empty Ptr.
-    void setHeadTrackTarget(const MWWorld::ConstPtr& target);
+        bool readyToPrepareAttack() const;
+        bool readyToStartAttack() const;
 
-    void playSwishSound() const;
-};
+        float calculateWindUp() const;
+
+        float getAttackStrength() const;
+
+        /// @see Animation::setActive
+        void setActive(int active) const;
+
+        /// Make this character turn its head towards \a target. To turn off head tracking, pass an empty Ptr.
+        void setHeadTrackTarget(const MWWorld::ConstPtr& target);
+
+        void playSwishSound() const;
+    };
 }
 
 #endif /* GAME_MWMECHANICS_CHARACTER_HPP */
diff --git a/apps/openmw/mwmechanics/combat.cpp b/apps/openmw/mwmechanics/combat.cpp
index 612f178d65..f7cac36e74 100644
--- a/apps/openmw/mwmechanics/combat.cpp
+++ b/apps/openmw/mwmechanics/combat.cpp
@@ -11,50 +11,51 @@
 #include <components/esm3/loadsoun.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
-#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/inventorystore.hpp"
 
-#include "npcstats.hpp"
+#include "actorutil.hpp"
+#include "difficultyscaling.hpp"
 #include "movement.hpp"
+#include "npcstats.hpp"
+#include "pathfinding.hpp"
 #include "spellcasting.hpp"
 #include "spellresistance.hpp"
-#include "difficultyscaling.hpp"
-#include "actorutil.hpp"
-#include "pathfinding.hpp"
 
 namespace
 {
 
-float signedAngleRadians (const osg::Vec3f& v1, const osg::Vec3f& v2, const osg::Vec3f& normal)
-{
-    return std::atan2((normal * (v1 ^ v2)), (v1 * v2));
-}
+    float signedAngleRadians(const osg::Vec3f& v1, const osg::Vec3f& v2, const osg::Vec3f& normal)
+    {
+        return std::atan2((normal * (v1 ^ v2)), (v1 * v2));
+    }
 
 }
 
 namespace MWMechanics
 {
 
-    bool applyOnStrikeEnchantment(const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim, const MWWorld::Ptr& object, const osg::Vec3f& hitPosition, const bool fromProjectile)
+    bool applyOnStrikeEnchantment(const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim, const MWWorld::Ptr& object,
+        const osg::Vec3f& hitPosition, const bool fromProjectile)
     {
         std::string_view enchantmentName = !object.isEmpty() ? object.getClass().getEnchantment(object) : "";
         if (!enchantmentName.empty())
         {
-            const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(
-                        enchantmentName);
+            const ESM::Enchantment* enchantment
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(enchantmentName);
             if (enchantment->mData.mType == ESM::Enchantment::WhenStrikes)
             {
                 MWMechanics::CastSpell cast(attacker, victim, fromProjectile);
                 cast.mHitPosition = hitPosition;
                 cast.cast(object, 0, false);
                 // Apply magic effects directly instead of waiting a frame to allow soul trap to work on one-hit kills
-                if(!victim.isEmpty() && victim.getClass().isActor())
+                if (!victim.isEmpty() && victim.getClass().isActor())
                     MWBase::Environment::get().getMechanicsManager()->updateMagicEffects(victim);
                 return true;
             }
@@ -62,7 +63,8 @@ namespace MWMechanics
         return false;
     }
 
-    bool blockMeleeAttack(const MWWorld::Ptr &attacker, const MWWorld::Ptr &blocker, const MWWorld::Ptr &weapon, float damage, float attackStrength)
+    bool blockMeleeAttack(const MWWorld::Ptr& attacker, const MWWorld::Ptr& blocker, const MWWorld::Ptr& weapon,
+        float damage, float attackStrength)
     {
         if (!blocker.getClass().hasInventoryStore(blocker))
             return false;
@@ -70,8 +72,7 @@ namespace MWMechanics
         MWMechanics::CreatureStats& blockerStats = blocker.getClass().getCreatureStats(blocker);
 
         if (blockerStats.getKnockedDown() // Used for both knockout or knockdown
-                || blockerStats.getHitRecovery()
-                || blockerStats.isParalyzed())
+            || blockerStats.getHitRecovery() || blockerStats.isParalyzed())
             return false;
 
         if (!MWBase::Environment::get().getMechanicsManager()->isReadyToBlock(blocker))
@@ -85,13 +86,12 @@ namespace MWMechanics
         if (!blocker.getRefData().getBaseNode())
             return false; // shouldn't happen
 
-        float angleDegrees = osg::RadiansToDegrees(
-                    signedAngleRadians (
-                    (attacker.getRefData().getPosition().asVec3() - blocker.getRefData().getPosition().asVec3()),
-                    blocker.getRefData().getBaseNode()->getAttitude() * osg::Vec3f(0,1,0),
-                    osg::Vec3f(0,0,1)));
+        float angleDegrees = osg::RadiansToDegrees(signedAngleRadians(
+            (attacker.getRefData().getPosition().asVec3() - blocker.getRefData().getPosition().asVec3()),
+            blocker.getRefData().getBaseNode()->getAttitude() * osg::Vec3f(0, 1, 0), osg::Vec3f(0, 0, 1)));
 
-        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
         static const float fCombatBlockLeftAngle = gmst.find("fCombatBlockLeftAngle")->mValue.getFloat();
         if (angleDegrees < fCombatBlockLeftAngle)
             return false;
@@ -101,7 +101,8 @@ namespace MWMechanics
 
         MWMechanics::CreatureStats& attackerStats = attacker.getClass().getCreatureStats(attacker);
 
-        float blockTerm = blocker.getClass().getSkill(blocker, ESM::Skill::Block) + 0.2f * blockerStats.getAttribute(ESM::Attribute::Agility).getModified()
+        float blockTerm = blocker.getClass().getSkill(blocker, ESM::Skill::Block)
+            + 0.2f * blockerStats.getAttribute(ESM::Attribute::Agility).getModified()
             + 0.1f * blockerStats.getAttribute(ESM::Attribute::Luck).getModified();
         float enemySwing = attackStrength;
         static const float fSwingBlockMult = gmst.find("fSwingBlockMult")->mValue.getFloat();
@@ -122,7 +123,7 @@ namespace MWMechanics
         else
             attackerSkill = attacker.getClass().getSkill(attacker, weapon.getClass().getEquipmentSkill(weapon));
         float attackerTerm = attackerSkill + 0.2f * attackerStats.getAttribute(ESM::Attribute::Agility).getModified()
-                + 0.1f * attackerStats.getAttribute(ESM::Attribute::Luck).getModified();
+            + 0.1f * attackerStats.getAttribute(ESM::Attribute::Luck).getModified();
         attackerTerm *= attackerStats.getFatigueTerm();
 
         static const int iBlockMaxChance = gmst.find("iBlockMaxChance")->mValue.getInteger();
@@ -162,7 +163,7 @@ namespace MWMechanics
         return false;
     }
 
-    bool isNormalWeapon(const MWWorld::Ptr &weapon)
+    bool isNormalWeapon(const MWWorld::Ptr& weapon)
     {
         if (weapon.isEmpty())
             return false;
@@ -172,10 +173,12 @@ namespace MWMechanics
         bool isMagical = flags & ESM::Weapon::Magical;
         bool isEnchanted = !weapon.getClass().getEnchantment(weapon).empty();
 
-        return !isSilver && !isMagical && (!isEnchanted || !Settings::Manager::getBool("enchanted weapons are magical", "Game"));
+        return !isSilver && !isMagical
+            && (!isEnchanted || !Settings::Manager::getBool("enchanted weapons are magical", "Game"));
     }
 
-    void resistNormalWeapon(const MWWorld::Ptr &actor, const MWWorld::Ptr& attacker, const MWWorld::Ptr &weapon, float &damage)
+    void resistNormalWeapon(
+        const MWWorld::Ptr& actor, const MWWorld::Ptr& attacker, const MWWorld::Ptr& weapon, float& damage)
     {
         if (damage == 0 || weapon.isEmpty() || !isNormalWeapon(weapon))
             return;
@@ -184,13 +187,13 @@ namespace MWMechanics
         const float resistance = effects.get(ESM::MagicEffect::ResistNormalWeapons).getMagnitude() / 100.f;
         const float weakness = effects.get(ESM::MagicEffect::WeaknessToNormalWeapons).getMagnitude() / 100.f;
 
-        damage *= 1.f - std::min(1.f, resistance-weakness);
+        damage *= 1.f - std::min(1.f, resistance - weakness);
 
         if (damage == 0 && attacker == getPlayer())
             MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicTargetResistsWeapons}");
     }
 
-    void applyWerewolfDamageMult(const MWWorld::Ptr &actor, const MWWorld::Ptr &weapon, float &damage)
+    void applyWerewolfDamageMult(const MWWorld::Ptr& actor, const MWWorld::Ptr& weapon, float& damage)
     {
         if (damage == 0 || weapon.isEmpty() || !actor.getClass().isNpc())
             return;
@@ -205,11 +208,11 @@ namespace MWMechanics
         }
     }
 
-    void projectileHit(const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim, MWWorld::Ptr weapon, const MWWorld::Ptr& projectile,
-                       const osg::Vec3f& hitPosition, float attackStrength)
+    void projectileHit(const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim, MWWorld::Ptr weapon,
+        const MWWorld::Ptr& projectile, const osg::Vec3f& hitPosition, float attackStrength)
     {
-        MWBase::World *world = MWBase::Environment::get().getWorld();
-        const MWWorld::Store<ESM::GameSetting> &gmst = world->getStore().get<ESM::GameSetting>();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+        const MWWorld::Store<ESM::GameSetting>& gmst = world->getStore().get<ESM::GameSetting>();
 
         bool validVictim = !victim.isEmpty() && victim.getClass().isActor();
 
@@ -247,7 +250,9 @@ namespace MWMechanics
 
         if (validVictim)
         {
-            if (weapon == projectile || Settings::Manager::getBool("only appropriate ammunition bypasses resistance", "Game") || isNormalWeapon(weapon))
+            if (weapon == projectile
+                || Settings::Manager::getBool("only appropriate ammunition bypasses resistance", "Game")
+                || isNormalWeapon(weapon))
                 resistNormalWeapon(victim, attacker, projectile, damage);
             applyWerewolfDamageMult(victim, projectile, damage);
 
@@ -275,7 +280,8 @@ namespace MWMechanics
             // Non-enchanted arrows shot at enemies have a chance to turn up in their inventory
             if (victim != getPlayer() && !appliedEnchantment)
             {
-                static const float fProjectileThrownStoreChance = gmst.find("fProjectileThrownStoreChance")->mValue.getFloat();
+                static const float fProjectileThrownStoreChance
+                    = gmst.find("fProjectileThrownStoreChance")->mValue.getFloat();
                 if (Misc::Rng::rollProbability(world->getPrng()) < fProjectileThrownStoreChance / 100.f)
                     victim.getClass().getContainerStore(victim).add(projectile, 1, victim);
             }
@@ -284,69 +290,67 @@ namespace MWMechanics
         }
     }
 
-    float getHitChance(const MWWorld::Ptr &attacker, const MWWorld::Ptr &victim, int skillValue)
+    float getHitChance(const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim, int skillValue)
     {
-        MWMechanics::CreatureStats &stats = attacker.getClass().getCreatureStats(attacker);
-        const MWMechanics::MagicEffects &mageffects = stats.getMagicEffects();
+        MWMechanics::CreatureStats& stats = attacker.getClass().getCreatureStats(attacker);
+        const MWMechanics::MagicEffects& mageffects = stats.getMagicEffects();
 
-        MWBase::World *world = MWBase::Environment::get().getWorld();
-        const MWWorld::Store<ESM::GameSetting> &gmst = world->getStore().get<ESM::GameSetting>();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+        const MWWorld::Store<ESM::GameSetting>& gmst = world->getStore().get<ESM::GameSetting>();
 
         float defenseTerm = 0;
         MWMechanics::CreatureStats& victimStats = victim.getClass().getCreatureStats(victim);
         if (victimStats.getFatigue().getCurrent() >= 0)
         {
             // Maybe we should keep an aware state for actors updated every so often instead of testing every time
-            bool unaware = (!victimStats.getAiSequence().isInCombat())
-                    && (attacker == getPlayer())
-                    && (!MWBase::Environment::get().getMechanicsManager()->awarenessCheck(attacker, victim));
-            if (!(victimStats.getKnockedDown() ||
-                    victimStats.isParalyzed()
-                    || unaware ))
+            bool unaware = (!victimStats.getAiSequence().isInCombat()) && (attacker == getPlayer())
+                && (!MWBase::Environment::get().getMechanicsManager()->awarenessCheck(attacker, victim));
+            if (!(victimStats.getKnockedDown() || victimStats.isParalyzed() || unaware))
             {
                 defenseTerm = victimStats.getEvasion();
             }
             static const float fCombatInvisoMult = gmst.find("fCombatInvisoMult")->mValue.getFloat();
             defenseTerm += std::min(100.f,
-                                    fCombatInvisoMult *
-                                    victimStats.getMagicEffects().get(ESM::MagicEffect::Chameleon).getMagnitude());
+                fCombatInvisoMult * victimStats.getMagicEffects().get(ESM::MagicEffect::Chameleon).getMagnitude());
             defenseTerm += std::min(100.f,
-                                    fCombatInvisoMult *
-                                    victimStats.getMagicEffects().get(ESM::MagicEffect::Invisibility).getMagnitude());
+                fCombatInvisoMult * victimStats.getMagicEffects().get(ESM::MagicEffect::Invisibility).getMagnitude());
         }
-        float attackTerm = skillValue +
-                          (stats.getAttribute(ESM::Attribute::Agility).getModified() / 5.0f) +
-                          (stats.getAttribute(ESM::Attribute::Luck).getModified() / 10.0f);
+        float attackTerm = skillValue + (stats.getAttribute(ESM::Attribute::Agility).getModified() / 5.0f)
+            + (stats.getAttribute(ESM::Attribute::Luck).getModified() / 10.0f);
         attackTerm *= stats.getFatigueTerm();
-        attackTerm += mageffects.get(ESM::MagicEffect::FortifyAttack).getMagnitude() -
-                     mageffects.get(ESM::MagicEffect::Blind).getMagnitude();
+        attackTerm += mageffects.get(ESM::MagicEffect::FortifyAttack).getMagnitude()
+            - mageffects.get(ESM::MagicEffect::Blind).getMagnitude();
 
         return round(attackTerm - defenseTerm);
     }
 
-    void applyElementalShields(const MWWorld::Ptr &attacker, const MWWorld::Ptr &victim)
+    void applyElementalShields(const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim)
     {
         // Don't let elemental shields harm the player in god mode.
         bool godmode = attacker == getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
         if (godmode)
             return;
         auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-        for (int i=0; i<3; ++i)
+        for (int i = 0; i < 3; ++i)
         {
-            float magnitude = victim.getClass().getCreatureStats(victim).getMagicEffects().get(ESM::MagicEffect::FireShield+i).getMagnitude();
+            float magnitude = victim.getClass()
+                                  .getCreatureStats(victim)
+                                  .getMagicEffects()
+                                  .get(ESM::MagicEffect::FireShield + i)
+                                  .getMagnitude();
 
             if (!magnitude)
                 continue;
 
             CreatureStats& attackerStats = attacker.getClass().getCreatureStats(attacker);
             float saveTerm = attacker.getClass().getSkill(attacker, ESM::Skill::Destruction)
-                    + 0.2f * attackerStats.getAttribute(ESM::Attribute::Willpower).getModified()
-                    + 0.1f * attackerStats.getAttribute(ESM::Attribute::Luck).getModified();
+                + 0.2f * attackerStats.getAttribute(ESM::Attribute::Willpower).getModified()
+                + 0.1f * attackerStats.getAttribute(ESM::Attribute::Luck).getModified();
 
             float fatigueMax = attackerStats.getFatigue().getModified();
             float fatigueCurrent = attackerStats.getFatigue().getCurrent();
 
-            float normalisedFatigue = floor(fatigueMax)==0 ? 1 : std::max (0.0f, (fatigueCurrent/fatigueMax));
+            float normalisedFatigue = floor(fatigueMax) == 0 ? 1 : std::max(0.0f, (fatigueCurrent / fatigueMax));
 
             saveTerm *= 1.25f * normalisedFatigue;
 
@@ -358,11 +362,17 @@ namespace MWMechanics
             if (i == 2)
                 element = ESM::MagicEffect::FrostDamage;
 
-            float elementResistance = MWMechanics::getEffectResistanceAttribute(element, &attackerStats.getMagicEffects());
+            float elementResistance
+                = MWMechanics::getEffectResistanceAttribute(element, &attackerStats.getMagicEffects());
 
             x = std::min(100.f, x + elementResistance);
 
-            static const float fElementalShieldMult = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fElementalShieldMult")->mValue.getFloat();
+            static const float fElementalShieldMult = MWBase::Environment::get()
+                                                          .getWorld()
+                                                          ->getStore()
+                                                          .get<ESM::GameSetting>()
+                                                          .find("fElementalShieldMult")
+                                                          ->mValue.getFloat();
             x = fElementalShieldMult * magnitude * (1.f - 0.01f * x);
 
             // Note swapped victim and attacker, since the attacker takes the damage here.
@@ -376,7 +386,7 @@ namespace MWMechanics
         }
     }
 
-    void reduceWeaponCondition(float damage, bool hit, MWWorld::Ptr &weapon, const MWWorld::Ptr &attacker)
+    void reduceWeaponCondition(float damage, bool hit, MWWorld::Ptr& weapon, const MWWorld::Ptr& attacker)
     {
         if (weapon.isEmpty())
             return;
@@ -385,16 +395,22 @@ namespace MWMechanics
             damage = 0.f;
 
         const bool weaphashealth = weapon.getClass().hasItemHealth(weapon);
-        if(weaphashealth)
+        if (weaphashealth)
         {
             int weaphealth = weapon.getClass().getItemHealth(weapon);
 
-            bool godmode = attacker == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
+            bool godmode
+                = attacker == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
 
             // weapon condition does not degrade when godmode is on
             if (!godmode)
             {
-                const float fWeaponDamageMult = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fWeaponDamageMult")->mValue.getFloat();
+                const float fWeaponDamageMult = MWBase::Environment::get()
+                                                    .getWorld()
+                                                    ->getStore()
+                                                    .get<ESM::GameSetting>()
+                                                    .find("fWeaponDamageMult")
+                                                    ->mValue.getFloat();
                 float x = std::max(1.f, fWeaponDamageMult * damage);
 
                 weaphealth -= std::min(int(x), weaphealth);
@@ -407,7 +423,7 @@ namespace MWMechanics
         }
     }
 
-    void adjustWeaponDamage(float &damage, const MWWorld::Ptr &weapon, const MWWorld::Ptr& attacker)
+    void adjustWeaponDamage(float& damage, const MWWorld::Ptr& weapon, const MWWorld::Ptr& attacker)
     {
         if (weapon.isEmpty())
             return;
@@ -418,25 +434,34 @@ namespace MWMechanics
             damage *= weapon.getClass().getItemNormalizedHealth(weapon);
         }
 
-        static const float fDamageStrengthBase = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
-                .find("fDamageStrengthBase")->mValue.getFloat();
-        static const float fDamageStrengthMult = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
-                .find("fDamageStrengthMult")->mValue.getFloat();
-        damage *= fDamageStrengthBase +
-                (attacker.getClass().getCreatureStats(attacker).getAttribute(ESM::Attribute::Strength).getModified() * fDamageStrengthMult * 0.1f);
+        static const float fDamageStrengthBase = MWBase::Environment::get()
+                                                     .getWorld()
+                                                     ->getStore()
+                                                     .get<ESM::GameSetting>()
+                                                     .find("fDamageStrengthBase")
+                                                     ->mValue.getFloat();
+        static const float fDamageStrengthMult = MWBase::Environment::get()
+                                                     .getWorld()
+                                                     ->getStore()
+                                                     .get<ESM::GameSetting>()
+                                                     .find("fDamageStrengthMult")
+                                                     ->mValue.getFloat();
+        damage *= fDamageStrengthBase
+            + (attacker.getClass().getCreatureStats(attacker).getAttribute(ESM::Attribute::Strength).getModified()
+                * fDamageStrengthMult * 0.1f);
     }
 
-    void getHandToHandDamage(const MWWorld::Ptr &attacker, const MWWorld::Ptr &victim, float &damage, bool &healthdmg, float attackStrength)
+    void getHandToHandDamage(
+        const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim, float& damage, bool& healthdmg, float attackStrength)
     {
         const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
         static const float minstrike = store.get<ESM::GameSetting>().find("fMinHandToHandMult")->mValue.getFloat();
         static const float maxstrike = store.get<ESM::GameSetting>().find("fMaxHandToHandMult")->mValue.getFloat();
-        damage  = static_cast<float>(attacker.getClass().getSkill(attacker, ESM::Skill::HandToHand));
-        damage *= minstrike + ((maxstrike-minstrike)*attackStrength);
+        damage = static_cast<float>(attacker.getClass().getSkill(attacker, ESM::Skill::HandToHand));
+        damage *= minstrike + ((maxstrike - minstrike) * attackStrength);
 
         MWMechanics::CreatureStats& otherstats = victim.getClass().getCreatureStats(victim);
-        healthdmg = otherstats.isParalyzed()
-                || otherstats.getKnockedDown();
+        healthdmg = otherstats.isParalyzed() || otherstats.getKnockedDown();
         bool isWerewolf = (attacker.getClass().isNpc() && attacker.getClass().getNpcStats(attacker).isWerewolf());
 
         // Options in the launcher's combo box: unarmedFactorsStrengthComboBox
@@ -444,11 +469,14 @@ namespace MWMechanics
         // 1 = Factor into werewolf hand-to-hand combat.
         // 2 = Ignore werewolves.
         int factorStrength = Settings::Manager::getInt("strength influences hand to hand", "Game");
-        if (factorStrength == 1 || (factorStrength == 2 && !isWerewolf)) {
-            damage *= attacker.getClass().getCreatureStats(attacker).getAttribute(ESM::Attribute::Strength).getModified() / 40.0f;
+        if (factorStrength == 1 || (factorStrength == 2 && !isWerewolf))
+        {
+            damage
+                *= attacker.getClass().getCreatureStats(attacker).getAttribute(ESM::Attribute::Strength).getModified()
+                / 40.0f;
         }
 
-        if(isWerewolf)
+        if (isWerewolf)
         {
             healthdmg = true;
             // GLOB instead of GMST because it gets updated during a quest
@@ -456,26 +484,28 @@ namespace MWMechanics
         }
         if (healthdmg)
         {
-            static const float fHandtoHandHealthPer = store.get<ESM::GameSetting>().find("fHandtoHandHealthPer")->mValue.getFloat();
+            static const float fHandtoHandHealthPer
+                = store.get<ESM::GameSetting>().find("fHandtoHandHealthPer")->mValue.getFloat();
             damage *= fHandtoHandHealthPer;
         }
 
-        MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-        if(isWerewolf)
+        MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
+        if (isWerewolf)
         {
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-            const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfHit", prng);
-            if(sound)
+            const ESM::Sound* sound = store.get<ESM::Sound>().searchRandom("WolfHit", prng);
+            if (sound)
                 sndMgr->playSound3D(victim, sound->mId, 1.0f, 1.0f);
         }
         else if (!healthdmg)
             sndMgr->playSound3D(victim, "Hand To Hand Hit", 1.0f, 1.0f);
     }
 
-    void applyFatigueLoss(const MWWorld::Ptr &attacker, const MWWorld::Ptr &weapon, float attackStrength)
+    void applyFatigueLoss(const MWWorld::Ptr& attacker, const MWWorld::Ptr& weapon, float attackStrength)
     {
         // somewhat of a guess, but using the weapon weight makes sense
-        const MWWorld::Store<ESM::GameSetting>& store = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& store
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
         static const float fFatigueAttackBase = store.find("fFatigueAttackBase")->mValue.getFloat();
         static const float fFatigueAttackMult = store.find("fFatigueAttackMult")->mValue.getFloat();
         static const float fWeaponFatigueMult = store.find("fWeaponFatigueMult")->mValue.getFloat();
@@ -497,15 +527,23 @@ namespace MWMechanics
 
     float getFightDistanceBias(const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2)
     {
-        osg::Vec3f pos1 (actor1.getRefData().getPosition().asVec3());
-        osg::Vec3f pos2 (actor2.getRefData().getPosition().asVec3());
+        osg::Vec3f pos1(actor1.getRefData().getPosition().asVec3());
+        osg::Vec3f pos2(actor2.getRefData().getPosition().asVec3());
 
         float d = getAggroDistance(actor1, pos1, pos2);
 
-        static const int iFightDistanceBase = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
-                    "iFightDistanceBase")->mValue.getInteger();
-        static const float fFightDistanceMultiplier = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
-                    "fFightDistanceMultiplier")->mValue.getFloat();
+        static const int iFightDistanceBase = MWBase::Environment::get()
+                                                  .getWorld()
+                                                  ->getStore()
+                                                  .get<ESM::GameSetting>()
+                                                  .find("iFightDistanceBase")
+                                                  ->mValue.getInteger();
+        static const float fFightDistanceMultiplier = MWBase::Environment::get()
+                                                          .getWorld()
+                                                          ->getStore()
+                                                          .get<ESM::GameSetting>()
+                                                          .find("fFightDistanceMultiplier")
+                                                          ->mValue.getFloat();
 
         return (iFightDistanceBase - fFightDistanceMultiplier * d);
     }
diff --git a/apps/openmw/mwmechanics/combat.hpp b/apps/openmw/mwmechanics/combat.hpp
index 355d609b46..2e7caf6189 100644
--- a/apps/openmw/mwmechanics/combat.hpp
+++ b/apps/openmw/mwmechanics/combat.hpp
@@ -14,47 +14,50 @@ namespace MWWorld
 namespace MWMechanics
 {
 
-bool applyOnStrikeEnchantment(const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim, const MWWorld::Ptr& object, const osg::Vec3f& hitPosition,
-                              const bool fromProjectile=false);
+    bool applyOnStrikeEnchantment(const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim, const MWWorld::Ptr& object,
+        const osg::Vec3f& hitPosition, const bool fromProjectile = false);
 
-/// @return can we block the attack?
-bool blockMeleeAttack (const MWWorld::Ptr& attacker, const MWWorld::Ptr& blocker, const MWWorld::Ptr& weapon, float damage, float attackStrength);
+    /// @return can we block the attack?
+    bool blockMeleeAttack(const MWWorld::Ptr& attacker, const MWWorld::Ptr& blocker, const MWWorld::Ptr& weapon,
+        float damage, float attackStrength);
 
-/// @return does normal weapon resistance and weakness apply to the weapon?
-bool isNormalWeapon (const MWWorld::Ptr& weapon);
+    /// @return does normal weapon resistance and weakness apply to the weapon?
+    bool isNormalWeapon(const MWWorld::Ptr& weapon);
 
-void resistNormalWeapon (const MWWorld::Ptr& actor, const MWWorld::Ptr& attacker, const MWWorld::Ptr& weapon, float& damage);
+    void resistNormalWeapon(
+        const MWWorld::Ptr& actor, const MWWorld::Ptr& attacker, const MWWorld::Ptr& weapon, float& damage);
 
-void applyWerewolfDamageMult (const MWWorld::Ptr& actor, const MWWorld::Ptr& weapon, float &damage);
+    void applyWerewolfDamageMult(const MWWorld::Ptr& actor, const MWWorld::Ptr& weapon, float& damage);
 
-/// @note for a thrown weapon, \a weapon == \a projectile, for bows/crossbows, \a projectile is the arrow/bolt
-/// @note \a victim may be empty (e.g. for a hit on terrain), a non-actor (environment objects) or an actor
-void projectileHit (const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim, MWWorld::Ptr weapon, const MWWorld::Ptr& projectile,
-                    const osg::Vec3f& hitPosition, float attackStrength);
+    /// @note for a thrown weapon, \a weapon == \a projectile, for bows/crossbows, \a projectile is the arrow/bolt
+    /// @note \a victim may be empty (e.g. for a hit on terrain), a non-actor (environment objects) or an actor
+    void projectileHit(const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim, MWWorld::Ptr weapon,
+        const MWWorld::Ptr& projectile, const osg::Vec3f& hitPosition, float attackStrength);
 
-/// Get the chance (in percent) for \a attacker to successfully hit \a victim with a given weapon skill value
-float getHitChance (const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim, int skillValue);
+    /// Get the chance (in percent) for \a attacker to successfully hit \a victim with a given weapon skill value
+    float getHitChance(const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim, int skillValue);
 
-/// Applies damage to attacker based on the victim's elemental shields.
-void applyElementalShields(const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim);
+    /// Applies damage to attacker based on the victim's elemental shields.
+    void applyElementalShields(const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim);
 
-/// @param damage Unmitigated weapon damage of the attack
-/// @param hit Was the attack successful?
-/// @param weapon The weapon used.
-/// @note if the weapon is unequipped as result of condition damage, a new Ptr will be assigned to \a weapon.
-void reduceWeaponCondition (float damage, bool hit, MWWorld::Ptr& weapon, const MWWorld::Ptr& attacker);
+    /// @param damage Unmitigated weapon damage of the attack
+    /// @param hit Was the attack successful?
+    /// @param weapon The weapon used.
+    /// @note if the weapon is unequipped as result of condition damage, a new Ptr will be assigned to \a weapon.
+    void reduceWeaponCondition(float damage, bool hit, MWWorld::Ptr& weapon, const MWWorld::Ptr& attacker);
 
-/// Adjust weapon damage based on its condition. A used weapon will be less effective.
-void adjustWeaponDamage (float& damage, const MWWorld::Ptr& weapon, const MWWorld::Ptr& attacker);
+    /// Adjust weapon damage based on its condition. A used weapon will be less effective.
+    void adjustWeaponDamage(float& damage, const MWWorld::Ptr& weapon, const MWWorld::Ptr& attacker);
 
-void getHandToHandDamage (const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim, float& damage, bool& healthdmg, float attackStrength);
+    void getHandToHandDamage(
+        const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim, float& damage, bool& healthdmg, float attackStrength);
 
-/// Apply the fatigue loss incurred by attacking with the given weapon (weapon may be empty = hand-to-hand)
-void applyFatigueLoss(const MWWorld::Ptr& attacker, const MWWorld::Ptr& weapon, float attackStrength);
+    /// Apply the fatigue loss incurred by attacking with the given weapon (weapon may be empty = hand-to-hand)
+    void applyFatigueLoss(const MWWorld::Ptr& attacker, const MWWorld::Ptr& weapon, float attackStrength);
 
-float getFightDistanceBias(const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2);
+    float getFightDistanceBias(const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2);
 
-float getAggroDistance(const MWWorld::Ptr& actor, const osg::Vec3f& lhs, const osg::Vec3f& rhs);
+    float getAggroDistance(const MWWorld::Ptr& actor, const osg::Vec3f& lhs, const osg::Vec3f& rhs);
 
 }
 
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 97e30620da..931d0a3206 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -20,12 +20,30 @@ namespace MWMechanics
     int CreatureStats::sActorId = 0;
 
     CreatureStats::CreatureStats()
-        : mDrawState (DrawState::Nothing), mDead (false), mDeathAnimationFinished(false), mDied (false), mMurdered(false), mFriendlyHits (0),
-          mTalkedTo (false), mAlarmed (false), mAttacked (false),
-          mKnockdown(false), mKnockdownOneFrame(false), mKnockdownOverOneFrame(false),
-          mHitRecovery(false), mBlock(false), mMovementFlags(0),
-          mFallHeight(0), mLastRestock(0,0), mGoldPool(0), mActorId(-1), mHitAttemptActorId(-1),
-          mDeathAnimation(-1), mTimeOfDeath(), mSideMovementAngle(0), mLevel (0)
+        : mDrawState(DrawState::Nothing)
+        , mDead(false)
+        , mDeathAnimationFinished(false)
+        , mDied(false)
+        , mMurdered(false)
+        , mFriendlyHits(0)
+        , mTalkedTo(false)
+        , mAlarmed(false)
+        , mAttacked(false)
+        , mKnockdown(false)
+        , mKnockdownOneFrame(false)
+        , mKnockdownOverOneFrame(false)
+        , mHitRecovery(false)
+        , mBlock(false)
+        , mMovementFlags(0)
+        , mFallHeight(0)
+        , mLastRestock(0, 0)
+        , mGoldPool(0)
+        , mActorId(-1)
+        , mHitAttemptActorId(-1)
+        , mDeathAnimation(-1)
+        , mTimeOfDeath()
+        , mSideMovementAngle(0)
+        , mLevel(0)
         , mAttackingOrSpell(false)
     {
     }
@@ -45,51 +63,52 @@ namespace MWMechanics
         float max = getFatigue().getModified();
         float current = getFatigue().getCurrent();
 
-        float normalised = std::floor(max) == 0 ? 1 : std::max (0.0f, current / max);
+        float normalised = std::floor(max) == 0 ? 1 : std::max(0.0f, current / max);
 
-        const MWWorld::Store<ESM::GameSetting> &gmst =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
         static const float fFatigueBase = gmst.find("fFatigueBase")->mValue.getFloat();
         static const float fFatigueMult = gmst.find("fFatigueMult")->mValue.getFloat();
 
-        return fFatigueBase - fFatigueMult * (1-normalised);
+        return fFatigueBase - fFatigueMult * (1 - normalised);
     }
 
-    const AttributeValue &CreatureStats::getAttribute(int index) const
+    const AttributeValue& CreatureStats::getAttribute(int index) const
     {
-        if (index < 0 || index > 7) {
+        if (index < 0 || index > 7)
+        {
             throw std::runtime_error("attribute index is out of range");
         }
         return mAttributes[index];
     }
 
-    const DynamicStat<float> &CreatureStats::getHealth() const
+    const DynamicStat<float>& CreatureStats::getHealth() const
     {
         return mDynamic[0];
     }
 
-    const DynamicStat<float> &CreatureStats::getMagicka() const
+    const DynamicStat<float>& CreatureStats::getMagicka() const
     {
         return mDynamic[1];
     }
 
-    const DynamicStat<float> &CreatureStats::getFatigue() const
+    const DynamicStat<float>& CreatureStats::getFatigue() const
     {
         return mDynamic[2];
     }
 
-    const Spells &CreatureStats::getSpells() const
+    const Spells& CreatureStats::getSpells() const
     {
         return mSpells;
     }
 
-    const ActiveSpells &CreatureStats::getActiveSpells() const
+    const ActiveSpells& CreatureStats::getActiveSpells() const
     {
         return mActiveSpells;
     }
 
-    const MagicEffects &CreatureStats::getMagicEffects() const
+    const MagicEffects& CreatureStats::getMagicEffects() const
     {
         return mMagicEffects;
     }
@@ -99,30 +118,31 @@ namespace MWMechanics
         return mLevel;
     }
 
-    Stat<int> CreatureStats::getAiSetting (AiSetting index) const
+    Stat<int> CreatureStats::getAiSetting(AiSetting index) const
     {
         return mAiSettings[static_cast<std::underlying_type_t<AiSetting>>(index)];
     }
 
-    const DynamicStat<float> &CreatureStats::getDynamic(int index) const
+    const DynamicStat<float>& CreatureStats::getDynamic(int index) const
     {
-        if (index < 0 || index > 2) {
+        if (index < 0 || index > 2)
+        {
             throw std::runtime_error("dynamic stat index is out of range");
         }
         return mDynamic[index];
     }
 
-    Spells &CreatureStats::getSpells()
+    Spells& CreatureStats::getSpells()
     {
         return mSpells;
     }
 
-    ActiveSpells &CreatureStats::getActiveSpells()
+    ActiveSpells& CreatureStats::getActiveSpells()
     {
         return mActiveSpells;
     }
 
-    MagicEffects &CreatureStats::getMagicEffects()
+    MagicEffects& CreatureStats::getMagicEffects()
     {
         return mMagicEffects;
     }
@@ -134,9 +154,10 @@ namespace MWMechanics
         setAttribute(index, current);
     }
 
-    void CreatureStats::setAttribute(int index, const AttributeValue &value)
+    void CreatureStats::setAttribute(int index, const AttributeValue& value)
     {
-        if (index < 0 || index > 7) {
+        if (index < 0 || index > 7)
+        {
             throw std::runtime_error("attribute index is out of range");
         }
 
@@ -148,15 +169,13 @@ namespace MWMechanics
 
             if (index == ESM::Attribute::Intelligence)
                 recalculateMagicka();
-            else if (index == ESM::Attribute::Strength ||
-                     index == ESM::Attribute::Willpower ||
-                     index == ESM::Attribute::Agility ||
-                     index == ESM::Attribute::Endurance)
+            else if (index == ESM::Attribute::Strength || index == ESM::Attribute::Willpower
+                || index == ESM::Attribute::Agility || index == ESM::Attribute::Endurance)
             {
-                float strength     = getAttribute(ESM::Attribute::Strength).getModified();
-                float willpower    = getAttribute(ESM::Attribute::Willpower).getModified();
-                float agility      = getAttribute(ESM::Attribute::Agility).getModified();
-                float endurance    = getAttribute(ESM::Attribute::Endurance).getModified();
+                float strength = getAttribute(ESM::Attribute::Strength).getModified();
+                float willpower = getAttribute(ESM::Attribute::Willpower).getModified();
+                float agility = getAttribute(ESM::Attribute::Agility).getModified();
+                float endurance = getAttribute(ESM::Attribute::Endurance).getModified();
                 DynamicStat<float> fatigue = getFatigue();
                 float currentToBaseRatio = fatigue.getBase() > 0 ? (fatigue.getCurrent() / fatigue.getBase()) : 0;
                 fatigue.setBase(std::max(0.f, strength + willpower + agility + endurance));
@@ -166,29 +185,29 @@ namespace MWMechanics
         }
     }
 
-    void CreatureStats::setHealth(const DynamicStat<float> &value)
+    void CreatureStats::setHealth(const DynamicStat<float>& value)
     {
-        setDynamic (0, value);
+        setDynamic(0, value);
     }
 
-    void CreatureStats::setMagicka(const DynamicStat<float> &value)
+    void CreatureStats::setMagicka(const DynamicStat<float>& value)
     {
-        setDynamic (1, value);
+        setDynamic(1, value);
     }
 
-    void CreatureStats::setFatigue(const DynamicStat<float> &value)
+    void CreatureStats::setFatigue(const DynamicStat<float>& value)
     {
-        setDynamic (2, value);
+        setDynamic(2, value);
     }
 
-    void CreatureStats::setDynamic (int index, const DynamicStat<float> &value)
+    void CreatureStats::setDynamic(int index, const DynamicStat<float>& value)
     {
         if (index < 0 || index > 2)
             throw std::runtime_error("dynamic stat index is out of range");
 
         mDynamic[index] = value;
 
-        if (index==0 && mDynamic[index].getCurrent()<1)
+        if (index == 0 && mDynamic[index].getCurrent() < 1)
         {
             if (!mDead)
                 mTimeOfDeath = MWBase::Environment::get().getWorld()->getTimeStamp();
@@ -204,20 +223,21 @@ namespace MWMechanics
         mLevel = level;
     }
 
-    void CreatureStats::modifyMagicEffects(const MagicEffects &effects)
+    void CreatureStats::modifyMagicEffects(const MagicEffects& effects)
     {
-        bool recalc = effects.get(ESM::MagicEffect::FortifyMaximumMagicka).getModifier() != mMagicEffects.get(ESM::MagicEffect::FortifyMaximumMagicka).getModifier();
+        bool recalc = effects.get(ESM::MagicEffect::FortifyMaximumMagicka).getModifier()
+            != mMagicEffects.get(ESM::MagicEffect::FortifyMaximumMagicka).getModifier();
         mMagicEffects.setModifiers(effects);
-        if(recalc)
+        if (recalc)
             recalculateMagicka();
     }
 
-    void CreatureStats::setAiSetting (AiSetting index, Stat<int> value)
+    void CreatureStats::setAiSetting(AiSetting index, Stat<int> value)
     {
         mAiSettings[static_cast<std::underlying_type_t<AiSetting>>(index)] = value;
     }
 
-    void CreatureStats::setAiSetting (AiSetting index, int base)
+    void CreatureStats::setAiSetting(AiSetting index, int base)
     {
         Stat<int> stat = getAiSetting(index);
         stat.setBase(base);
@@ -319,7 +339,7 @@ namespace MWMechanics
         return mAlarmed;
     }
 
-    void CreatureStats::setAlarmed (bool alarmed)
+    void CreatureStats::setAlarmed(bool alarmed)
     {
         mAlarmed = alarmed;
     }
@@ -329,15 +349,15 @@ namespace MWMechanics
         return mAttacked;
     }
 
-    void CreatureStats::setAttacked (bool attacked)
+    void CreatureStats::setAttacked(bool attacked)
     {
         mAttacked = attacked;
     }
 
     float CreatureStats::getEvasion() const
     {
-        float evasion = (getAttribute(ESM::Attribute::Agility).getModified() / 5.0f) +
-                        (getAttribute(ESM::Attribute::Luck).getModified() / 10.0f);
+        float evasion = (getAttribute(ESM::Attribute::Agility).getModified() / 5.0f)
+            + (getAttribute(ESM::Attribute::Luck).getModified() / 10.0f);
         evasion *= getFatigueTerm();
         evasion += std::min(100.f, mMagicEffects.get(ESM::MagicEffect::Sanctuary).getMagnitude());
 
@@ -354,7 +374,7 @@ namespace MWMechanics
         mLastHitObject.clear();
     }
 
-    const std::string &CreatureStats::getLastHitObject() const
+    const std::string& CreatureStats::getLastHitObject() const
     {
         return mLastHitObject;
     }
@@ -369,7 +389,7 @@ namespace MWMechanics
         mLastHitAttemptObject.clear();
     }
 
-    const std::string &CreatureStats::getLastHitAttemptObject() const
+    const std::string& CreatureStats::getLastHitAttemptObject() const
     {
         return mLastHitAttemptObject;
     }
@@ -416,7 +436,8 @@ namespace MWMechanics
         else
             base = world->getStore().get<ESM::GameSetting>().find("fNPCbaseMagickaMult")->mValue.getFloat();
 
-        double magickaFactor = base + mMagicEffects.get(EffectKey(ESM::MagicEffect::FortifyMaximumMagicka)).getMagnitude() * 0.1;
+        double magickaFactor
+            = base + mMagicEffects.get(EffectKey(ESM::MagicEffect::FortifyMaximumMagicka)).getMagnitude() * 0.1;
 
         DynamicStat<float> magicka = getMagicka();
         float currentToBaseRatio = magicka.getBase() > 0 ? magicka.getCurrent() / magicka.getBase() : 0;
@@ -428,7 +449,7 @@ namespace MWMechanics
     void CreatureStats::setKnockedDown(bool value)
     {
         mKnockdown = value;
-        if(!value) //Resets the "OverOneFrame" flag
+        if (!value) // Resets the "OverOneFrame" flag
             setKnockedDownOverOneFrame(false);
     }
 
@@ -447,10 +468,12 @@ namespace MWMechanics
         return mKnockdownOneFrame;
     }
 
-    void CreatureStats::setKnockedDownOverOneFrame(bool value) {
+    void CreatureStats::setKnockedDownOverOneFrame(bool value)
+    {
         mKnockdownOverOneFrame = value;
     }
-    bool CreatureStats::getKnockedDownOverOneFrame() const {
+    bool CreatureStats::getKnockedDownOverOneFrame() const
+    {
         return mKnockdownOverOneFrame;
     }
 
@@ -474,12 +497,12 @@ namespace MWMechanics
         return mBlock;
     }
 
-    bool CreatureStats::getMovementFlag (Flag flag) const
+    bool CreatureStats::getMovementFlag(Flag flag) const
     {
         return (mMovementFlags & flag) != 0;
     }
 
-    void CreatureStats::setMovementFlag (Flag flag, bool state)
+    void CreatureStats::setMovementFlag(Flag flag, bool state)
     {
         if (state)
             mMovementFlags |= flag;
@@ -492,9 +515,9 @@ namespace MWMechanics
         switch (flag)
         {
             case Stance_Run:
-                return getMovementFlag (Flag_Run) || getMovementFlag (Flag_ForceRun);
+                return getMovementFlag(Flag_Run) || getMovementFlag(Flag_ForceRun);
             case Stance_Sneak:
-                return getMovementFlag (Flag_Sneak) || getMovementFlag (Flag_ForceSneak);
+                return getMovementFlag(Flag_Sneak) || getMovementFlag(Flag_ForceSneak);
             default:
                 return false;
         }
@@ -510,13 +533,13 @@ namespace MWMechanics
         mDrawState = state;
     }
 
-    void CreatureStats::writeState (ESM::CreatureStats& state) const
+    void CreatureStats::writeState(ESM::CreatureStats& state) const
     {
-        for (int i=0; i<ESM::Attribute::Length; ++i)
-            mAttributes[i].writeState (state.mAttributes[i]);
+        for (int i = 0; i < ESM::Attribute::Length; ++i)
+            mAttributes[i].writeState(state.mAttributes[i]);
 
-        for (int i=0; i<3; ++i)
-            mDynamic[i].writeState (state.mDynamic[i]);
+        for (int i = 0; i < 3; ++i)
+            mDynamic[i].writeState(state.mDynamic[i]);
 
         state.mTradeTime = mLastRestock.toEsm();
         state.mGoldPool = mGoldPool;
@@ -528,7 +551,7 @@ namespace MWMechanics
         // The vanilla engine does not store friendly hits in the save file. Since there's no other mechanism
         // that ever resets the friendly hits (at least not to my knowledge) this should be regarded a feature
         // rather than a bug.
-        //state.mFriendlyHits = mFriendlyHits;
+        // state.mFriendlyHits = mFriendlyHits;
         state.mTalkedTo = mTalkedTo;
         state.mAlarmed = mAlarmed;
         state.mAttacked = mAttacked;
@@ -548,7 +571,7 @@ namespace MWMechanics
         state.mActorId = mActorId;
         state.mDeathAnimation = mDeathAnimation;
         state.mTimeOfDeath = mTimeOfDeath.toEsm();
-        //state.mHitAttemptActorId = mHitAttemptActorId;
+        // state.mHitAttemptActorId = mHitAttemptActorId;
 
         mSpells.writeState(state.mSpells);
         mActiveSpells.writeState(state.mActiveSpells);
@@ -559,21 +582,21 @@ namespace MWMechanics
         state.mSummonGraveyard = mSummonGraveyard;
 
         state.mHasAiSettings = true;
-        for (int i=0; i<4; ++i)
-            mAiSettings[i].writeState (state.mAiSettings[i]);
+        for (int i = 0; i < 4; ++i)
+            mAiSettings[i].writeState(state.mAiSettings[i]);
 
         state.mMissingACDT = false;
     }
 
-    void CreatureStats::readState (const ESM::CreatureStats& state)
+    void CreatureStats::readState(const ESM::CreatureStats& state)
     {
         if (!state.mMissingACDT)
         {
-            for (int i=0; i<ESM::Attribute::Length; ++i)
-                mAttributes[i].readState (state.mAttributes[i]);
+            for (int i = 0; i < ESM::Attribute::Length; ++i)
+                mAttributes[i].readState(state.mAttributes[i]);
 
-            for (int i=0; i<3; ++i)
-                mDynamic[i].readState (state.mDynamic[i]);
+            for (int i = 0; i < 3; ++i)
+                mDynamic[i].readState(state.mDynamic[i]);
 
             mGoldPool = state.mGoldPool;
             mTalkedTo = state.mTalkedTo;
@@ -602,7 +625,7 @@ namespace MWMechanics
         mActorId = state.mActorId;
         mDeathAnimation = state.mDeathAnimation;
         mTimeOfDeath = MWWorld::TimeStamp(state.mTimeOfDeath);
-        //mHitAttemptActorId = state.mHitAttemptActorId;
+        // mHitAttemptActorId = state.mHitAttemptActorId;
 
         mSpells.readState(state.mSpells, this);
         mActiveSpells.readState(state.mActiveSpells);
@@ -613,9 +636,9 @@ namespace MWMechanics
         mSummonGraveyard = state.mSummonGraveyard;
 
         if (state.mHasAiSettings)
-            for (int i=0; i<4; ++i)
+            for (int i = 0; i < 4; ++i)
                 mAiSettings[i].readState(state.mAiSettings[i]);
-        if(state.mRecalcDynamicStats)
+        if (state.mRecalcDynamicStats)
             recalculateMagicka();
     }
 
@@ -640,15 +663,15 @@ namespace MWMechanics
 
     int CreatureStats::getActorId()
     {
-        if (mActorId==-1)
+        if (mActorId == -1)
             mActorId = sActorId++;
 
         return mActorId;
     }
 
-    bool CreatureStats::matchesActorId (int id) const
+    bool CreatureStats::matchesActorId(int id) const
     {
-        return mActorId!=-1 && id==mActorId;
+        return mActorId != -1 && id == mActorId;
     }
 
     void CreatureStats::cleanup()
@@ -656,14 +679,14 @@ namespace MWMechanics
         sActorId = 0;
     }
 
-    void CreatureStats::writeActorIdCounter (ESM::ESMWriter& esm)
+    void CreatureStats::writeActorIdCounter(ESM::ESMWriter& esm)
     {
         esm.startRecord(ESM::REC_ACTC);
         esm.writeHNT("COUN", sActorId);
         esm.endRecord(ESM::REC_ACTC);
     }
 
-    void CreatureStats::readActorIdCounter (ESM::ESMReader& esm)
+    void CreatureStats::readActorIdCounter(ESM::ESMReader& esm)
     {
         esm.getHNT(sActorId, "COUN");
     }
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index a2370015e1..35fdbbf4dc 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -3,16 +3,16 @@
 
 #include <map>
 #include <set>
-#include <string>
 #include <stdexcept>
+#include <string>
 
-#include "stat.hpp"
-#include "magiceffects.hpp"
-#include "spells.hpp"
 #include "activespells.hpp"
 #include "aisequence.hpp"
-#include "drawstate.hpp"
 #include "aisetting.hpp"
+#include "drawstate.hpp"
+#include "magiceffects.hpp"
+#include "spells.hpp"
+#include "stat.hpp"
 
 #include <components/esm/attr.hpp>
 #include <components/esm3/magiceffects.hpp>
@@ -108,56 +108,56 @@ namespace MWMechanics
 
         /// Reset the fall height
         /// @return total fall height
-        float land(bool isPlayer=false);
+        float land(bool isPlayer = false);
 
-        const AttributeValue & getAttribute(int index) const;
+        const AttributeValue& getAttribute(int index) const;
 
-        const DynamicStat<float> & getHealth() const;
+        const DynamicStat<float>& getHealth() const;
 
-        const DynamicStat<float> & getMagicka() const;
+        const DynamicStat<float>& getMagicka() const;
 
-        const DynamicStat<float> & getFatigue() const;
+        const DynamicStat<float>& getFatigue() const;
 
-        const DynamicStat<float> & getDynamic (int index) const;
+        const DynamicStat<float>& getDynamic(int index) const;
 
-        const Spells & getSpells() const;
+        const Spells& getSpells() const;
 
-        const ActiveSpells & getActiveSpells() const;
+        const ActiveSpells& getActiveSpells() const;
 
-        const MagicEffects & getMagicEffects() const;
+        const MagicEffects& getMagicEffects() const;
 
         bool getAttackingOrSpell() const { return mAttackingOrSpell; }
 
         int getLevel() const;
 
-        Spells & getSpells();
+        Spells& getSpells();
 
-        ActiveSpells & getActiveSpells();
+        ActiveSpells& getActiveSpells();
 
-        MagicEffects & getMagicEffects();
+        MagicEffects& getMagicEffects();
 
-        void setAttribute(int index, const AttributeValue &value);
+        void setAttribute(int index, const AttributeValue& value);
         // Shortcut to set only the base
         void setAttribute(int index, float base);
 
-        void setHealth(const DynamicStat<float> &value);
+        void setHealth(const DynamicStat<float>& value);
 
-        void setMagicka(const DynamicStat<float> &value);
+        void setMagicka(const DynamicStat<float>& value);
 
-        void setFatigue(const DynamicStat<float> &value);
+        void setFatigue(const DynamicStat<float>& value);
 
-        void setDynamic (int index, const DynamicStat<float> &value);
+        void setDynamic(int index, const DynamicStat<float>& value);
 
         /// Set Modifier for each magic effect according to \a effects. Does not touch Base values.
-        void modifyMagicEffects(const MagicEffects &effects);
+        void modifyMagicEffects(const MagicEffects& effects);
 
         void setAttackingOrSpell(bool attackingOrSpell) { mAttackingOrSpell = attackingOrSpell; }
 
         void setLevel(int level);
 
-        void setAiSetting (AiSetting index, Stat<int> value);
-        void setAiSetting (AiSetting index, int base);
-        Stat<int> getAiSetting (AiSetting index) const;
+        void setAiSetting(AiSetting index, Stat<int> value);
+        void setAiSetting(AiSetting index, int base);
+        Stat<int> getAiSetting(AiSetting index) const;
 
         const AiSequence& getAiSequence() const;
 
@@ -203,10 +203,10 @@ namespace MWMechanics
         void talkedToPlayer();
 
         bool isAlarmed() const;
-        void setAlarmed (bool alarmed);
+        void setAlarmed(bool alarmed);
 
         bool getAttacked() const;
-        void setAttacked (bool attacked);
+        void setAttacked(bool attacked);
 
         float getEvasion() const;
 
@@ -215,10 +215,11 @@ namespace MWMechanics
         /// including transition animations (falling down & standing up)
         bool getKnockedDown() const;
         void setKnockedDownOneFrame(bool value);
-        ///Returns true only for the first frame of the actor being knocked out; used for "onKnockedOut" command
+        /// Returns true only for the first frame of the actor being knocked out; used for "onKnockedOut" command
         bool getKnockedDownOneFrame() const;
         void setKnockedDownOverOneFrame(bool value);
-        ///Returns true for all but the first frame of being knocked out; used to know to not reset mKnockedDownOneFrame
+        /// Returns true for all but the first frame of being knocked out; used to know to not reset
+        /// mKnockedDownOneFrame
         bool getKnockedDownOverOneFrame() const;
         void setHitRecovery(bool value);
         bool getHitRecovery() const;
@@ -243,26 +244,26 @@ namespace MWMechanics
             Stance_Sneak
         };
 
-        bool getMovementFlag (Flag flag) const;
-        void setMovementFlag (Flag flag, bool state);
+        bool getMovementFlag(Flag flag) const;
+        void setMovementFlag(Flag flag, bool state);
         /// Like getMovementFlag, but also takes into account if the flag is Forced
-        bool getStance (Stance flag) const;
+        bool getStance(Stance flag) const;
 
-        void setLastHitObject(const std::string &objectid);
+        void setLastHitObject(const std::string& objectid);
         void clearLastHitObject();
-        const std::string &getLastHitObject() const;
-        void setLastHitAttemptObject(const std::string &objectid);
+        const std::string& getLastHitObject() const;
+        void setLastHitAttemptObject(const std::string& objectid);
         void clearLastHitAttemptObject();
-        const std::string &getLastHitAttemptObject() const;
+        const std::string& getLastHitAttemptObject() const;
         void setHitAttemptActorId(const int actorId);
         int getHitAttemptActorId() const;
 
-        void writeState (ESM::CreatureStats& state) const;
+        void writeState(ESM::CreatureStats& state) const;
 
-        void readState (const ESM::CreatureStats& state);
+        void readState(const ESM::CreatureStats& state);
 
-        static void writeActorIdCounter (ESM::ESMWriter& esm);
-        static void readActorIdCounter (ESM::ESMReader& esm);
+        static void writeActorIdCounter(ESM::ESMWriter& esm);
+        static void readActorIdCounter(ESM::ESMReader& esm);
 
         void setLastRestockTime(MWWorld::TimeStamp tradeTime);
         MWWorld::TimeStamp getLastRestockTime() const;
@@ -278,7 +279,7 @@ namespace MWMechanics
         int getActorId();
         ///< Will generate an actor ID, if the actor does not have one yet.
 
-        bool matchesActorId (int id) const;
+        bool matchesActorId(int id) const;
         ///< Check if \a id matches the actor ID of *this (if the actor does not have an ID
         /// assigned this function will return false).
 
diff --git a/apps/openmw/mwmechanics/difficultyscaling.cpp b/apps/openmw/mwmechanics/difficultyscaling.cpp
index e973e0ed52..fc027a03c9 100644
--- a/apps/openmw/mwmechanics/difficultyscaling.cpp
+++ b/apps/openmw/mwmechanics/difficultyscaling.cpp
@@ -2,8 +2,8 @@
 
 #include <components/settings/settings.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 #include "../mwworld/esmstore.hpp"
 
 #include "actorutil.hpp"
@@ -15,7 +15,12 @@ float scaleDamage(float damage, const MWWorld::Ptr& attacker, const MWWorld::Ptr
     // [-500, 500]
     const int difficultySetting = std::clamp(Settings::Manager::getInt("difficulty", "Game"), -500, 500);
 
-    static const float fDifficultyMult = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fDifficultyMult")->mValue.getFloat();
+    static const float fDifficultyMult = MWBase::Environment::get()
+                                             .getWorld()
+                                             ->getStore()
+                                             .get<ESM::GameSetting>()
+                                             .find("fDifficultyMult")
+                                             ->mValue.getFloat();
 
     float difficultyTerm = 0.01f * difficultySetting;
 
diff --git a/apps/openmw/mwmechanics/disease.hpp b/apps/openmw/mwmechanics/disease.hpp
index fad9afd015..6b2b185b44 100644
--- a/apps/openmw/mwmechanics/disease.hpp
+++ b/apps/openmw/mwmechanics/disease.hpp
@@ -1,21 +1,21 @@
 #ifndef OPENMW_MECHANICS_DISEASE_H
 #define OPENMW_MECHANICS_DISEASE_H
 
+#include <components/esm3/loadmgef.hpp>
 #include <components/misc/rng.hpp>
 #include <components/misc/strings/format.hpp>
-#include <components/esm3/loadmgef.hpp>
 
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
-#include "../mwworld/ptr.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/ptr.hpp"
 
-#include "spells.hpp"
-#include "creaturestats.hpp"
 #include "actorutil.hpp"
+#include "creaturestats.hpp"
+#include "spells.hpp"
 
 namespace MWMechanics
 {
@@ -23,14 +23,17 @@ namespace MWMechanics
     /// Call when \a actor has got in contact with \a carrier (e.g. hit by him, or loots him)
     /// @param actor The actor that will potentially catch diseases. Currently only the player can catch diseases.
     /// @param carrier The disease carrier.
-    inline void diseaseContact (const MWWorld::Ptr& actor, const MWWorld::Ptr& carrier)
+    inline void diseaseContact(const MWWorld::Ptr& actor, const MWWorld::Ptr& carrier)
     {
         if (!carrier.getClass().isActor() || actor != getPlayer())
             return;
 
-        float fDiseaseXferChance =
-                MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
-                    "fDiseaseXferChance")->mValue.getFloat();
+        float fDiseaseXferChance = MWBase::Environment::get()
+                                       .getWorld()
+                                       ->getStore()
+                                       .get<ESM::GameSetting>()
+                                       .find("fDiseaseXferChance")
+                                       ->mValue.getFloat();
 
         const MagicEffects& actorEffects = actor.getClass().getCreatureStats(actor).getMagicEffects();
 
@@ -42,14 +45,20 @@ namespace MWMechanics
 
             float resist = 0.f;
             if (Spells::hasCorprusEffect(spell))
-                resist = 1.f - 0.01f * (actorEffects.get(ESM::MagicEffect::ResistCorprusDisease).getMagnitude()
-                                        - actorEffects.get(ESM::MagicEffect::WeaknessToCorprusDisease).getMagnitude());
+                resist = 1.f
+                    - 0.01f
+                        * (actorEffects.get(ESM::MagicEffect::ResistCorprusDisease).getMagnitude()
+                            - actorEffects.get(ESM::MagicEffect::WeaknessToCorprusDisease).getMagnitude());
             else if (spell->mData.mType == ESM::Spell::ST_Disease)
-                resist = 1.f - 0.01f * (actorEffects.get(ESM::MagicEffect::ResistCommonDisease).getMagnitude()
-                                        - actorEffects.get(ESM::MagicEffect::WeaknessToCommonDisease).getMagnitude());
+                resist = 1.f
+                    - 0.01f
+                        * (actorEffects.get(ESM::MagicEffect::ResistCommonDisease).getMagnitude()
+                            - actorEffects.get(ESM::MagicEffect::WeaknessToCommonDisease).getMagnitude());
             else if (spell->mData.mType == ESM::Spell::ST_Blight)
-                resist = 1.f - 0.01f * (actorEffects.get(ESM::MagicEffect::ResistBlightDisease).getMagnitude()
-                                        - actorEffects.get(ESM::MagicEffect::WeaknessToBlightDisease).getMagnitude());
+                resist = 1.f
+                    - 0.01f
+                        * (actorEffects.get(ESM::MagicEffect::ResistBlightDisease).getMagnitude()
+                            - actorEffects.get(ESM::MagicEffect::WeaknessToBlightDisease).getMagnitude());
             else
                 continue;
 
@@ -61,7 +70,12 @@ namespace MWMechanics
                 actor.getClass().getCreatureStats(actor).getSpells().add(spell);
                 MWBase::Environment::get().getWorld()->applyLoopingParticles(actor);
 
-                std::string msg = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("sMagicContractDisease")->mValue.getString();
+                std::string msg = MWBase::Environment::get()
+                                      .getWorld()
+                                      ->getStore()
+                                      .get<ESM::GameSetting>()
+                                      .find("sMagicContractDisease")
+                                      ->mValue.getString();
                 msg = Misc::StringUtils::format(msg, spell->mName);
                 MWBase::Environment::get().getWindowManager()->messageBox(msg);
             }
@@ -69,5 +83,4 @@ namespace MWMechanics
     }
 }
 
-
 #endif
diff --git a/apps/openmw/mwmechanics/enchanting.cpp b/apps/openmw/mwmechanics/enchanting.cpp
index 6540b405a0..bb8b78fa99 100644
--- a/apps/openmw/mwmechanics/enchanting.cpp
+++ b/apps/openmw/mwmechanics/enchanting.cpp
@@ -1,22 +1,22 @@
 #include "enchanting.hpp"
 
-#include <components/misc/rng.hpp>
-#include <components/settings/settings.hpp>
 #include <components/esm3/loadcrea.hpp>
 #include <components/esm3/loadmgef.hpp>
+#include <components/misc/rng.hpp>
+#include <components/settings/settings.hpp>
 
-#include "../mwworld/manualref.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/manualref.hpp"
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/world.hpp"
 
+#include "actorutil.hpp"
 #include "creaturestats.hpp"
 #include "spellutil.hpp"
-#include "actorutil.hpp"
 #include "weapontype.hpp"
 
 namespace MWMechanics
@@ -26,14 +26,15 @@ namespace MWMechanics
         , mSelfEnchanting(false)
         , mObjectType(0)
         , mWeaponType(-1)
-    {}
+    {
+    }
 
     void Enchanting::setOldItem(const MWWorld::Ptr& oldItem)
     {
-        mOldItemPtr=oldItem;
+        mOldItemPtr = oldItem;
         mWeaponType = -1;
         mObjectType = 0;
-        if(!itemEmpty())
+        if (!itemEmpty())
         {
             mObjectType = mOldItemPtr.getType();
             if (mObjectType == ESM::Weapon::sRecordId)
@@ -43,12 +44,12 @@ namespace MWMechanics
 
     void Enchanting::setNewItemName(const std::string& s)
     {
-        mNewItemName=s;
+        mNewItemName = s;
     }
 
     void Enchanting::setEffect(const ESM::EffectList& effectList)
     {
-        mEffectList=effectList;
+        mEffectList = effectList;
     }
 
     int Enchanting::getCastStyle() const
@@ -58,7 +59,7 @@ namespace MWMechanics
 
     void Enchanting::setSoulGem(const MWWorld::Ptr& soulGem)
     {
-        mSoulGemPtr=soulGem;
+        mSoulGemPtr = soulGem;
     }
 
     bool Enchanting::create()
@@ -72,24 +73,24 @@ namespace MWMechanics
 
         store.remove(mSoulGemPtr, 1, player);
 
-        //Exception for Azura Star, new one will be added after enchanting
-        if(Misc::StringUtils::ciEqual(mSoulGemPtr.get<ESM::Miscellaneous>()->mBase->mId, "Misc_SoulGem_Azura"))
+        // Exception for Azura Star, new one will be added after enchanting
+        if (Misc::StringUtils::ciEqual(mSoulGemPtr.get<ESM::Miscellaneous>()->mBase->mId, "Misc_SoulGem_Azura"))
             store.add("Misc_SoulGem_Azura", 1, player);
 
-        if(mSelfEnchanting)
+        if (mSelfEnchanting)
         {
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-            if(getEnchantChance() <= (Misc::Rng::roll0to99(prng)))
+            if (getEnchantChance() <= (Misc::Rng::roll0to99(prng)))
                 return false;
 
-            mEnchanter.getClass().skillUsageSucceeded (mEnchanter, ESM::Skill::Enchant, 2);
+            mEnchanter.getClass().skillUsageSucceeded(mEnchanter, ESM::Skill::Enchant, 2);
         }
 
         enchantment.mEffects = mEffectList;
 
         int count = getEnchantItemsCount();
 
-        if(mCastStyle==ESM::Enchantment::ConstantEffect)
+        if (mCastStyle == ESM::Enchantment::ConstantEffect)
             enchantment.mData.mCharge = 0;
         else
             enchantment.mData.mCharge = getGemCharge() / count;
@@ -97,31 +98,36 @@ namespace MWMechanics
         // Try to find a dynamic enchantment with the same stats, create a new one if not found.
         const ESM::Enchantment* enchantmentPtr = getRecord(enchantment);
         if (enchantmentPtr == nullptr)
-            enchantmentPtr = MWBase::Environment::get().getWorld()->createRecord (enchantment);
+            enchantmentPtr = MWBase::Environment::get().getWorld()->createRecord(enchantment);
 
         // Apply the enchantment
-        const std::string& newItemId = mOldItemPtr.getClass().applyEnchantment(mOldItemPtr, enchantmentPtr->mId, getGemCharge(), mNewItemName);
+        const std::string& newItemId
+            = mOldItemPtr.getClass().applyEnchantment(mOldItemPtr, enchantmentPtr->mId, getGemCharge(), mNewItemName);
 
         // Add the new item to player inventory and remove the old one
         store.remove(mOldItemPtr, count, player);
         store.add(newItemId, count, player);
 
-        if(!mSelfEnchanting)
+        if (!mSelfEnchanting)
             payForEnchantment();
 
         return true;
     }
-    
+
     void Enchanting::nextCastStyle()
     {
         if (itemEmpty())
             return;
 
-        const bool powerfulSoul = getGemCharge() >= \
-                MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find ("iSoulAmountForConstantEffect")->mValue.getInteger();
+        const bool powerfulSoul = getGemCharge() >= MWBase::Environment::get()
+                                                        .getWorld()
+                                                        ->getStore()
+                                                        .get<ESM::GameSetting>()
+                                                        .find("iSoulAmountForConstantEffect")
+                                                        ->mValue.getInteger();
         if ((mObjectType == ESM::Armor::sRecordId) || (mObjectType == ESM::Clothing::sRecordId))
         { // Armor or Clothing
-            switch(mCastStyle)
+            switch (mCastStyle)
             {
                 case ESM::Enchantment::WhenUsed:
                     if (powerfulSoul)
@@ -135,7 +141,7 @@ namespace MWMechanics
         else if (mWeaponType != -1)
         { // Weapon
             ESM::WeaponType::Class weapclass = MWMechanics::getWeaponType(mWeaponType)->mWeaponClass;
-            switch(mCastStyle)
+            switch (mCastStyle)
             {
                 case ESM::Enchantment::WhenStrikes:
                     if (weapclass == ESM::WeaponType::Melee || weapclass == ESM::WeaponType::Ranged)
@@ -154,7 +160,7 @@ namespace MWMechanics
                     return;
             }
         }
-        else if(mObjectType == ESM::Book::sRecordId)
+        else if (mObjectType == ESM::Book::sRecordId)
         { // Scroll or Book
             mCastStyle = ESM::Enchantment::CastOnce;
             return;
@@ -184,9 +190,10 @@ namespace MWMechanics
             // No effects added, cost = 0
             return 0;
 
-        const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
         const float fEffectCostMult = store.get<ESM::GameSetting>().find("fEffectCostMult")->mValue.getFloat();
-        const float fEnchantmentConstantDurationMult = store.get<ESM::GameSetting>().find("fEnchantmentConstantDurationMult")->mValue.getFloat();
+        const float fEnchantmentConstantDurationMult
+            = store.get<ESM::GameSetting>().find("fEnchantmentConstantDurationMult")->mValue.getFloat();
 
         float enchantmentCost = 0.f;
         float cost = 0.f;
@@ -215,18 +222,17 @@ namespace MWMechanics
 
     const ESM::Enchantment* Enchanting::getRecord(const ESM::Enchantment& toFind) const
     {
-        const MWWorld::Store<ESM::Enchantment>& enchantments = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>();
-        MWWorld::Store<ESM::Enchantment>::iterator iter (enchantments.begin());
+        const MWWorld::Store<ESM::Enchantment>& enchantments
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>();
+        MWWorld::Store<ESM::Enchantment>::iterator iter(enchantments.begin());
         iter += (enchantments.getSize() - enchantments.getDynamicSize());
         for (; iter != enchantments.end(); ++iter)
         {
             if (iter->mEffects.mList.size() != toFind.mEffects.mList.size())
                 continue;
 
-            if (iter->mData.mFlags != toFind.mData.mFlags
-                    || iter->mData.mType != toFind.mData.mType
-                    || iter->mData.mCost != toFind.mData.mCost
-                    || iter->mData.mCharge != toFind.mData.mCharge)
+            if (iter->mData.mFlags != toFind.mData.mFlags || iter->mData.mType != toFind.mData.mType
+                || iter->mData.mCost != toFind.mData.mCost || iter->mData.mCharge != toFind.mData.mCharge)
                 continue;
 
             // Don't choose an ID that came from the content files, would have unintended side effects
@@ -235,19 +241,15 @@ namespace MWMechanics
 
             bool mismatch = false;
 
-            for (int i=0; i<static_cast<int> (iter->mEffects.mList.size()); ++i)
+            for (int i = 0; i < static_cast<int>(iter->mEffects.mList.size()); ++i)
             {
                 const ESM::ENAMstruct& first = iter->mEffects.mList[i];
                 const ESM::ENAMstruct& second = toFind.mEffects.mList[i];
 
-                if (first.mEffectID!=second.mEffectID ||
-                    first.mArea!=second.mArea ||
-                    first.mRange!=second.mRange ||
-                    first.mSkill!=second.mSkill ||
-                    first.mAttribute!=second.mAttribute ||
-                    first.mMagnMin!=second.mMagnMin ||
-                    first.mMagnMax!=second.mMagnMax ||
-                    first.mDuration!=second.mDuration)
+                if (first.mEffectID != second.mEffectID || first.mArea != second.mArea || first.mRange != second.mRange
+                    || first.mSkill != second.mSkill || first.mAttribute != second.mAttribute
+                    || first.mMagnMin != second.mMagnMin || first.mMagnMax != second.mMagnMax
+                    || first.mDuration != second.mDuration)
                 {
                     mismatch = true;
                     break;
@@ -276,27 +278,32 @@ namespace MWMechanics
         return getEffectiveEnchantmentCastCost(static_cast<float>(baseCost), player);
     }
 
-
     int Enchanting::getEnchantPrice() const
     {
-        if(mEnchanter.isEmpty())
+        if (mEnchanter.isEmpty())
             return 0;
 
-        float priceMultipler = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find ("fEnchantmentValueMult")->mValue.getFloat();
-        int price = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mEnchanter, static_cast<int>(getEnchantPoints() * priceMultipler), true);
+        float priceMultipler = MWBase::Environment::get()
+                                   .getWorld()
+                                   ->getStore()
+                                   .get<ESM::GameSetting>()
+                                   .find("fEnchantmentValueMult")
+                                   ->mValue.getFloat();
+        int price = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(
+            mEnchanter, static_cast<int>(getEnchantPoints() * priceMultipler), true);
         price *= getEnchantItemsCount() * getTypeMultiplier();
         return std::max(1, price);
     }
 
     int Enchanting::getGemCharge() const
     {
-        const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-        if(soulEmpty())
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+        if (soulEmpty())
             return 0;
-        if(mSoulGemPtr.getCellRef().getSoul()=="")
+        if (mSoulGemPtr.getCellRef().getSoul() == "")
             return 0;
         const ESM::Creature* soul = store.get<ESM::Creature>().search(mSoulGemPtr.getCellRef().getSoul());
-        if(soul)
+        if (soul)
             return soul->mData.mSoul;
         else
             return 0;
@@ -307,9 +314,10 @@ namespace MWMechanics
         if (itemEmpty())
             return 0;
 
-        const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
 
-        return static_cast<int>(mOldItemPtr.getClass().getEnchantmentPoints(mOldItemPtr) * store.get<ESM::GameSetting>().find("fEnchantmentMult")->mValue.getFloat());
+        return static_cast<int>(mOldItemPtr.getClass().getEnchantmentPoints(mOldItemPtr)
+            * store.get<ESM::GameSetting>().find("fEnchantmentMult")->mValue.getFloat());
     }
     bool Enchanting::soulEmpty() const
     {
@@ -336,14 +344,17 @@ namespace MWMechanics
     int Enchanting::getEnchantChance() const
     {
         const CreatureStats& stats = mEnchanter.getClass().getCreatureStats(mEnchanter);
-        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
         const float a = static_cast<float>(mEnchanter.getClass().getSkill(mEnchanter, ESM::Skill::Enchant));
-        const float b = static_cast<float>(stats.getAttribute (ESM::Attribute::Intelligence).getModified());
-        const float c = static_cast<float>(stats.getAttribute (ESM::Attribute::Luck).getModified());
+        const float b = static_cast<float>(stats.getAttribute(ESM::Attribute::Intelligence).getModified());
+        const float c = static_cast<float>(stats.getAttribute(ESM::Attribute::Luck).getModified());
         const float fEnchantmentChanceMult = gmst.find("fEnchantmentChanceMult")->mValue.getFloat();
         const float fEnchantmentConstantChanceMult = gmst.find("fEnchantmentConstantChanceMult")->mValue.getFloat();
 
-        float x = (a - getEnchantPoints() * fEnchantmentChanceMult * getTypeMultiplier() * getEnchantItemsCount() + 0.2f * b + 0.1f * c) * stats.getFatigueTerm();
+        float x = (a - getEnchantPoints() * fEnchantmentChanceMult * getTypeMultiplier() * getEnchantItemsCount()
+                      + 0.2f * b + 0.1f * c)
+            * stats.getFatigueTerm();
         if (mCastStyle == ESM::Enchantment::ConstantEffect)
             x *= fEnchantmentConstantChanceMult;
 
@@ -359,7 +370,8 @@ namespace MWMechanics
             ESM::WeaponType::Class weapclass = MWMechanics::getWeaponType(mWeaponType)->mWeaponClass;
             if (weapclass == ESM::WeaponType::Thrown || weapclass == ESM::WeaponType::Ammo)
             {
-                static const float multiplier = std::clamp(Settings::Manager::getFloat("projectiles enchant multiplier", "Game"), 0.f, 1.f);
+                static const float multiplier
+                    = std::clamp(Settings::Manager::getFloat("projectiles enchant multiplier", "Game"), 0.f, 1.f);
                 MWWorld::Ptr player = getPlayer();
                 count = player.getClass().getContainerStore(player).count(mOldItemPtr.getCellRef().getRefId());
                 count = std::clamp<int>(getGemCharge() * multiplier / enchantPoints, 1, count);
diff --git a/apps/openmw/mwmechanics/enchanting.hpp b/apps/openmw/mwmechanics/enchanting.hpp
index 5e1a6fa239..53c3fc3f91 100644
--- a/apps/openmw/mwmechanics/enchanting.hpp
+++ b/apps/openmw/mwmechanics/enchanting.hpp
@@ -12,47 +12,48 @@ namespace MWMechanics
 {
     class Enchanting
     {
-            MWWorld::Ptr mOldItemPtr;
-            MWWorld::Ptr mSoulGemPtr;
-            MWWorld::Ptr mEnchanter;
-
-            int mCastStyle;
-
-            bool mSelfEnchanting;
-
-            ESM::EffectList mEffectList;
-
-            std::string mNewItemName;
-            unsigned int mObjectType;
-            int mWeaponType;
-
-            const ESM::Enchantment* getRecord(const ESM::Enchantment& newEnchantment) const;
-
-        public:
-            Enchanting();
-            void setEnchanter(const MWWorld::Ptr& enchanter);
-            void setSelfEnchanting(bool selfEnchanting);
-            void setOldItem(const MWWorld::Ptr& oldItem);
-            MWWorld::Ptr getOldItem() { return mOldItemPtr; }
-            MWWorld::Ptr getGem() { return mSoulGemPtr; }
-            void setNewItemName(const std::string& s);
-            void setEffect(const ESM::EffectList& effectList);
-            void setSoulGem(const MWWorld::Ptr& soulGem);
-            bool create(); //Return true if created, false if failed.
-            void nextCastStyle(); //Set enchant type to next possible type (for mOldItemPtr object)
-            int getCastStyle() const;
-            float getEnchantPoints(bool precise = true) const;
-            int getBaseCastCost() const; // To be saved in the enchantment's record
-            int getEffectiveCastCost() const; // Effective cost taking player Enchant skill into account, used for preview purposes in the UI
-            int getEnchantPrice() const;
-            int getMaxEnchantValue() const;
-            int getGemCharge() const;
-            int getEnchantChance() const;
-            int getEnchantItemsCount() const;
-            float getTypeMultiplier() const;
-            bool soulEmpty() const; //Return true if empty
-            bool itemEmpty() const; //Return true if empty
-            void payForEnchantment() const;
+        MWWorld::Ptr mOldItemPtr;
+        MWWorld::Ptr mSoulGemPtr;
+        MWWorld::Ptr mEnchanter;
+
+        int mCastStyle;
+
+        bool mSelfEnchanting;
+
+        ESM::EffectList mEffectList;
+
+        std::string mNewItemName;
+        unsigned int mObjectType;
+        int mWeaponType;
+
+        const ESM::Enchantment* getRecord(const ESM::Enchantment& newEnchantment) const;
+
+    public:
+        Enchanting();
+        void setEnchanter(const MWWorld::Ptr& enchanter);
+        void setSelfEnchanting(bool selfEnchanting);
+        void setOldItem(const MWWorld::Ptr& oldItem);
+        MWWorld::Ptr getOldItem() { return mOldItemPtr; }
+        MWWorld::Ptr getGem() { return mSoulGemPtr; }
+        void setNewItemName(const std::string& s);
+        void setEffect(const ESM::EffectList& effectList);
+        void setSoulGem(const MWWorld::Ptr& soulGem);
+        bool create(); // Return true if created, false if failed.
+        void nextCastStyle(); // Set enchant type to next possible type (for mOldItemPtr object)
+        int getCastStyle() const;
+        float getEnchantPoints(bool precise = true) const;
+        int getBaseCastCost() const; // To be saved in the enchantment's record
+        int getEffectiveCastCost()
+            const; // Effective cost taking player Enchant skill into account, used for preview purposes in the UI
+        int getEnchantPrice() const;
+        int getMaxEnchantValue() const;
+        int getGemCharge() const;
+        int getEnchantChance() const;
+        int getEnchantItemsCount() const;
+        float getTypeMultiplier() const;
+        bool soulEmpty() const; // Return true if empty
+        bool itemEmpty() const; // Return true if empty
+        void payForEnchantment() const;
     };
 }
 #endif
diff --git a/apps/openmw/mwmechanics/inventory.hpp b/apps/openmw/mwmechanics/inventory.hpp
index 517eb24820..6c7fe2d3a6 100644
--- a/apps/openmw/mwmechanics/inventory.hpp
+++ b/apps/openmw/mwmechanics/inventory.hpp
@@ -6,8 +6,8 @@
 
 #include "../mwworld/esmstore.hpp"
 
-#include <components/misc/strings/algorithm.hpp>
 #include <components/esm3/loadcont.hpp>
+#include <components/misc/strings/algorithm.hpp>
 
 #include <algorithm>
 #include <string_view>
diff --git a/apps/openmw/mwmechanics/levelledlist.hpp b/apps/openmw/mwmechanics/levelledlist.hpp
index 35ad048a27..9911c06820 100644
--- a/apps/openmw/mwmechanics/levelledlist.hpp
+++ b/apps/openmw/mwmechanics/levelledlist.hpp
@@ -2,25 +2,26 @@
 #define OPENMW_MECHANICS_LEVELLEDLIST_H
 
 #include <components/debug/debuglog.hpp>
-#include <components/misc/rng.hpp>
 #include <components/esm3/loadlevlist.hpp>
+#include <components/misc/rng.hpp>
 
-#include "../mwworld/ptr.hpp"
+#include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/manualref.hpp"
-#include "../mwworld/class.hpp"
+#include "../mwworld/ptr.hpp"
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
-#include "creaturestats.hpp"
 #include "actorutil.hpp"
+#include "creaturestats.hpp"
 
 namespace MWMechanics
 {
 
     /// @return ID of resulting item, or empty if none
-    inline std::string_view getLevelledItem(const ESM::LevelledListBase* levItem, bool creature, Misc::Rng::Generator& prng)
+    inline std::string_view getLevelledItem(
+        const ESM::LevelledListBase* levItem, bool creature, Misc::Rng::Generator& prng)
     {
         const std::vector<ESM::LevelledListBase::LevelItem>& items = levItem->mList;
 
@@ -43,11 +44,10 @@ namespace MWMechanics
         if (creature)
             allLevels = levItem->mFlags & ESM::CreatureLevList::AllLevels;
 
-        std::pair<int, std::string_view> highest = {-1, {}};
+        std::pair<int, std::string_view> highest = { -1, {} };
         for (const auto& levelledItem : items)
         {
-            if (playerLevel >= levelledItem.mLevel
-                    && (allLevels || levelledItem.mLevel == highestLevel))
+            if (playerLevel >= levelledItem.mLevel && (allLevels || levelledItem.mLevel == highestLevel))
             {
                 candidates.push_back(levelledItem.mId);
                 if (levelledItem.mLevel >= highest.first)
@@ -61,14 +61,15 @@ namespace MWMechanics
         // Vanilla doesn't fail on nonexistent items in levelled lists
         if (!MWBase::Environment::get().getWorld()->getStore().find(item))
         {
-            Log(Debug::Warning) << "Warning: ignoring nonexistent item '" << item << "' in levelled list '" << levItem->mId << "'";
+            Log(Debug::Warning) << "Warning: ignoring nonexistent item '" << item << "' in levelled list '"
+                                << levItem->mId << "'";
             return {};
         }
 
         // Is this another levelled item or a real item?
-        MWWorld::ManualRef ref (MWBase::Environment::get().getWorld()->getStore(), item, 1);
+        MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), item, 1);
         if (ref.getPtr().getType() != ESM::ItemLevList::sRecordId
-                && ref.getPtr().getType() != ESM::CreatureLevList::sRecordId)
+            && ref.getPtr().getType() != ESM::CreatureLevList::sRecordId)
         {
             return item;
         }
diff --git a/apps/openmw/mwmechanics/magiceffects.cpp b/apps/openmw/mwmechanics/magiceffects.cpp
index d4b89c56d0..ceb17f03d3 100644
--- a/apps/openmw/mwmechanics/magiceffects.cpp
+++ b/apps/openmw/mwmechanics/magiceffects.cpp
@@ -17,35 +17,38 @@ namespace
 
 namespace MWMechanics
 {
-    EffectKey::EffectKey() : mId (0), mArg (-1) {}
+    EffectKey::EffectKey()
+        : mId(0)
+        , mArg(-1)
+    {
+    }
 
-    EffectKey::EffectKey (const ESM::ENAMstruct& effect)
+    EffectKey::EffectKey(const ESM::ENAMstruct& effect)
     {
         mId = effect.mEffectID;
         mArg = -1;
 
-        if (effect.mSkill!=-1)
+        if (effect.mSkill != -1)
             mArg = effect.mSkill;
 
-        if (effect.mAttribute!=-1)
+        if (effect.mAttribute != -1)
         {
-            if (mArg!=-1)
-                throw std::runtime_error (
-                    "magic effect can't have both a skill and an attribute argument");
+            if (mArg != -1)
+                throw std::runtime_error("magic effect can't have both a skill and an attribute argument");
 
             mArg = effect.mAttribute;
         }
     }
 
-    bool operator< (const EffectKey& left, const EffectKey& right)
+    bool operator<(const EffectKey& left, const EffectKey& right)
     {
-        if (left.mId<right.mId)
+        if (left.mId < right.mId)
             return true;
 
-        if (left.mId>right.mId)
+        if (left.mId > right.mId)
             return false;
 
-        return left.mArg<right.mArg;
+        return left.mArg < right.mArg;
     }
 
     float EffectParam::getMagnitude() const
@@ -78,9 +81,13 @@ namespace MWMechanics
         return mModifier;
     }
 
-    EffectParam::EffectParam() : mModifier (0), mBase(0) {}
+    EffectParam::EffectParam()
+        : mModifier(0)
+        , mBase(0)
+    {
+    }
 
-    EffectParam& EffectParam::operator+= (const EffectParam& param)
+    EffectParam& EffectParam::operator+=(const EffectParam& param)
     {
         mModifier += param.mModifier;
         mBase += param.mBase;
@@ -88,7 +95,7 @@ namespace MWMechanics
         return *this;
     }
 
-    EffectParam& EffectParam::operator-= (const EffectParam& param)
+    EffectParam& EffectParam::operator-=(const EffectParam& param)
     {
         mModifier -= param.mModifier;
         mBase -= param.mBase;
@@ -96,18 +103,18 @@ namespace MWMechanics
         return *this;
     }
 
-    void MagicEffects::remove(const EffectKey &key)
+    void MagicEffects::remove(const EffectKey& key)
     {
         mCollection.erase(key);
     }
 
-    void MagicEffects::add (const EffectKey& key, const EffectParam& param)
+    void MagicEffects::add(const EffectKey& key, const EffectParam& param)
     {
-        Collection::iterator iter = mCollection.find (key);
+        Collection::iterator iter = mCollection.find(key);
 
-        if (iter==mCollection.end())
+        if (iter == mCollection.end())
         {
-            mCollection.insert (std::make_pair (key, param));
+            mCollection.insert(std::make_pair(key, param));
         }
         else
         {
@@ -115,12 +122,12 @@ namespace MWMechanics
         }
     }
 
-    void MagicEffects::modifyBase(const EffectKey &key, int diff)
+    void MagicEffects::modifyBase(const EffectKey& key, int diff)
     {
         mCollection[key].modifyBase(diff);
     }
 
-    void MagicEffects::setModifiers(const MagicEffects &effects)
+    void MagicEffects::setModifiers(const MagicEffects& effects)
     {
         for (Collection::iterator it = mCollection.begin(); it != mCollection.end(); ++it)
         {
@@ -133,11 +140,11 @@ namespace MWMechanics
         }
     }
 
-    EffectParam MagicEffects::get (const EffectKey& key) const
+    EffectParam MagicEffects::get(const EffectKey& key) const
     {
-        Collection::const_iterator iter = mCollection.find (key);
+        Collection::const_iterator iter = mCollection.find(key);
 
-        if (iter==mCollection.end())
+        if (iter == mCollection.end())
         {
             return EffectParam();
         }
@@ -147,53 +154,53 @@ namespace MWMechanics
         }
     }
 
-    MagicEffects MagicEffects::diff (const MagicEffects& prev, const MagicEffects& now)
+    MagicEffects MagicEffects::diff(const MagicEffects& prev, const MagicEffects& now)
     {
         MagicEffects result;
 
         // adding/changing
-        for (Collection::const_iterator iter (now.begin()); iter!=now.end(); ++iter)
+        for (Collection::const_iterator iter(now.begin()); iter != now.end(); ++iter)
         {
-            Collection::const_iterator other = prev.mCollection.find (iter->first);
+            Collection::const_iterator other = prev.mCollection.find(iter->first);
 
-            if (other==prev.end())
+            if (other == prev.end())
             {
                 // adding
-                result.add (iter->first, iter->second);
+                result.add(iter->first, iter->second);
             }
             else
             {
                 // changing
-                result.add (iter->first, iter->second - other->second);
+                result.add(iter->first, iter->second - other->second);
             }
         }
 
         // removing
-        for (Collection::const_iterator iter (prev.begin()); iter!=prev.end(); ++iter)
+        for (Collection::const_iterator iter(prev.begin()); iter != prev.end(); ++iter)
         {
-            Collection::const_iterator other = now.mCollection.find (iter->first);
-            if (other==now.end())
+            Collection::const_iterator other = now.mCollection.find(iter->first);
+            if (other == now.end())
             {
-                result.add (iter->first, EffectParam() - iter->second);
+                result.add(iter->first, EffectParam() - iter->second);
             }
         }
 
         return result;
     }
 
-    void MagicEffects::writeState(ESM::MagicEffects &state) const
+    void MagicEffects::writeState(ESM::MagicEffects& state) const
     {
         for (const auto& [key, params] : mCollection)
         {
             if (params.getBase() != 0 || params.getModifier() != 0.f)
             {
                 // Don't worry about mArg, never used by magic effect script instructions
-                state.mEffects[key.mId] = {params.getBase(), params.getModifier()};
+                state.mEffects[key.mId] = { params.getBase(), params.getModifier() };
             }
         }
     }
 
-    void MagicEffects::readState(const ESM::MagicEffects &state)
+    void MagicEffects::readState(const ESM::MagicEffects& state)
     {
         for (const auto& [key, params] : state.mEffects)
         {
diff --git a/apps/openmw/mwmechanics/magiceffects.hpp b/apps/openmw/mwmechanics/magiceffects.hpp
index e8175f6a78..55cfe4dba4 100644
--- a/apps/openmw/mwmechanics/magiceffects.hpp
+++ b/apps/openmw/mwmechanics/magiceffects.hpp
@@ -21,12 +21,16 @@ namespace MWMechanics
 
         EffectKey();
 
-        EffectKey (int id, int arg = -1) : mId (id), mArg (arg) {}
+        EffectKey(int id, int arg = -1)
+            : mId(id)
+            , mArg(arg)
+        {
+        }
 
-        EffectKey (const ESM::ENAMstruct& effect);
+        EffectKey(const ESM::ENAMstruct& effect);
     };
 
-    bool operator< (const EffectKey& left, const EffectKey& right);
+    bool operator<(const EffectKey& left, const EffectKey& right);
 
     struct EffectParam
     {
@@ -50,58 +54,59 @@ namespace MWMechanics
 
         EffectParam();
 
-        EffectParam(float magnitude) : mModifier(magnitude), mBase(0) {}
+        EffectParam(float magnitude)
+            : mModifier(magnitude)
+            , mBase(0)
+        {
+        }
 
-        EffectParam& operator+= (const EffectParam& param);
+        EffectParam& operator+=(const EffectParam& param);
 
-        EffectParam& operator-= (const EffectParam& param);
+        EffectParam& operator-=(const EffectParam& param);
     };
 
-    inline EffectParam operator+ (const EffectParam& left, const EffectParam& right)
+    inline EffectParam operator+(const EffectParam& left, const EffectParam& right)
     {
-        EffectParam param (left);
+        EffectParam param(left);
         return param += right;
     }
 
-    inline EffectParam operator- (const EffectParam& left, const EffectParam& right)
+    inline EffectParam operator-(const EffectParam& left, const EffectParam& right)
     {
-        EffectParam param (left);
+        EffectParam param(left);
         return param -= right;
     }
 
     /// \brief Effects currently affecting a NPC or creature
     class MagicEffects
     {
-        public:
-
-            typedef std::map<EffectKey, EffectParam> Collection;
-
-        private:
-
-            Collection mCollection;
+    public:
+        typedef std::map<EffectKey, EffectParam> Collection;
 
-        public:
+    private:
+        Collection mCollection;
 
-            Collection::const_iterator begin() const { return mCollection.begin(); }
+    public:
+        Collection::const_iterator begin() const { return mCollection.begin(); }
 
-            Collection::const_iterator end() const { return mCollection.end(); }
+        Collection::const_iterator end() const { return mCollection.end(); }
 
-            void readState (const ESM::MagicEffects& state);
-            void writeState (ESM::MagicEffects& state) const;
+        void readState(const ESM::MagicEffects& state);
+        void writeState(ESM::MagicEffects& state) const;
 
-            void add (const EffectKey& key, const EffectParam& param);
-            void remove (const EffectKey& key);
+        void add(const EffectKey& key, const EffectParam& param);
+        void remove(const EffectKey& key);
 
-            void modifyBase (const EffectKey& key, int diff);
+        void modifyBase(const EffectKey& key, int diff);
 
-            /// Copy Modifier values from \a effects, but keep original mBase values.
-            void setModifiers(const MagicEffects& effects);
+        /// Copy Modifier values from \a effects, but keep original mBase values.
+        void setModifiers(const MagicEffects& effects);
 
-            EffectParam get (const EffectKey& key) const;
-            ///< This function can safely be used for keys that are not present.
+        EffectParam get(const EffectKey& key) const;
+        ///< This function can safely be used for keys that are not present.
 
-            static MagicEffects diff (const MagicEffects& prev, const MagicEffects& now);
-            ///< Return changes from \a prev to \a now.
+        static MagicEffects diff(const MagicEffects& prev, const MagicEffects& now);
+        ///< Return changes from \a prev to \a now.
     };
 }
 
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 1d69faaa8e..81ae2917d6 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -4,52 +4,59 @@
 
 #include <components/misc/rng.hpp>
 
+#include <components/esm/records.hpp>
 #include <components/esm3/esmwriter.hpp>
-#include <components/esm3/stolenitems.hpp>
 #include <components/esm3/loadgmst.hpp>
 #include <components/esm3/loadmgef.hpp>
-#include <components/esm/records.hpp>
+#include <components/esm3/stolenitems.hpp>
 
 #include <components/sceneutil/positionattitudetransform.hpp>
 
+#include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwworld/class.hpp"
 #include "../mwworld/player.hpp"
 #include "../mwworld/ptr.hpp"
 
+#include "../mwbase/dialoguemanager.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/statemanager.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/dialoguemanager.hpp"
+#include "../mwbase/world.hpp"
 
+#include "actor.hpp"
+#include "actorutil.hpp"
 #include "aicombat.hpp"
 #include "aipursue.hpp"
-#include "spellutil.hpp"
 #include "autocalcspell.hpp"
-#include "npcstats.hpp"
-#include "actorutil.hpp"
 #include "combat.hpp"
-#include "actor.hpp"
+#include "npcstats.hpp"
+#include "spellutil.hpp"
 
 namespace
 {
 
     float getFightDispositionBias(float disposition)
     {
-        static const float fFightDispMult = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
-                    "fFightDispMult")->mValue.getFloat();
-        return ((50.f - disposition)  * fFightDispMult);
+        static const float fFightDispMult = MWBase::Environment::get()
+                                                .getWorld()
+                                                ->getStore()
+                                                .get<ESM::GameSetting>()
+                                                .find("fFightDispMult")
+                                                ->mValue.getFloat();
+        return ((50.f - disposition) * fFightDispMult);
     }
 
-    void getPersuasionRatings(const MWMechanics::NpcStats& stats, float& rating1, float& rating2, float& rating3, bool player)
+    void getPersuasionRatings(
+        const MWMechanics::NpcStats& stats, float& rating1, float& rating2, float& rating3, bool player)
     {
-        const MWWorld::Store<ESM::GameSetting> &gmst =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
-        float persTerm = stats.getAttribute(ESM::Attribute::Personality).getModified() / gmst.find("fPersonalityMod")->mValue.getFloat();
-        float luckTerm = stats.getAttribute(ESM::Attribute::Luck).getModified() / gmst.find("fLuckMod")->mValue.getFloat();
+        float persTerm = stats.getAttribute(ESM::Attribute::Personality).getModified()
+            / gmst.find("fPersonalityMod")->mValue.getFloat();
+        float luckTerm
+            = stats.getAttribute(ESM::Attribute::Luck).getModified() / gmst.find("fLuckMod")->mValue.getFloat();
         float repTerm = stats.getReputation() * gmst.find("fReputationMod")->mValue.getFloat();
         float fatigueTerm = stats.getFatigueTerm();
         float levelTerm = stats.getLevel() * gmst.find("fLevelMod")->mValue.getFloat();
@@ -63,8 +70,11 @@ namespace
         }
         else
         {
-            rating2 = (levelTerm + repTerm + luckTerm + persTerm + stats.getSkill(ESM::Skill::Speechcraft).getModified()) * fatigueTerm;
-            rating3 = (stats.getSkill(ESM::Skill::Mercantile).getModified() + repTerm + luckTerm + persTerm) * fatigueTerm;
+            rating2
+                = (levelTerm + repTerm + luckTerm + persTerm + stats.getSkill(ESM::Skill::Speechcraft).getModified())
+                * fatigueTerm;
+            rating3
+                = (stats.getSkill(ESM::Skill::Mercantile).getModified() + repTerm + luckTerm + persTerm) * fatigueTerm;
         }
     }
 
@@ -105,20 +115,20 @@ namespace MWMechanics
     {
         MWWorld::Ptr ptr = getPlayer();
 
-        MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats (ptr);
-        MWMechanics::NpcStats& npcStats = ptr.getClass().getNpcStats (ptr);
+        MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
+        MWMechanics::NpcStats& npcStats = ptr.getClass().getNpcStats(ptr);
 
         npcStats.recalculateMagicka();
 
-        const ESM::NPC *player = ptr.get<ESM::NPC>()->mBase;
+        const ESM::NPC* player = ptr.get<ESM::NPC>()->mBase;
 
         // reset
         creatureStats.setLevel(player->mNpdt.mLevel);
         creatureStats.getSpells().clear(true);
         creatureStats.getActiveSpells().clear(ptr);
 
-        for (int i=0; i<27; ++i)
-            npcStats.getSkill (i).setBase (player->mNpdt.mSkills[i]);
+        for (int i = 0; i < 27; ++i)
+            npcStats.getSkill(i).setBase(player->mNpdt.mSkills[i]);
 
         creatureStats.setAttribute(ESM::Attribute::Strength, player->mNpdt.mStrength);
         creatureStats.setAttribute(ESM::Attribute::Intelligence, player->mNpdt.mIntelligence);
@@ -128,54 +138,50 @@ namespace MWMechanics
         creatureStats.setAttribute(ESM::Attribute::Endurance, player->mNpdt.mEndurance);
         creatureStats.setAttribute(ESM::Attribute::Personality, player->mNpdt.mPersonality);
         creatureStats.setAttribute(ESM::Attribute::Luck, player->mNpdt.mLuck);
-        const MWWorld::ESMStore &esmStore =
-            MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
 
         // race
         if (mRaceSelected)
         {
-            const ESM::Race *race =
-                esmStore.get<ESM::Race>().find(player->mRace);
+            const ESM::Race* race = esmStore.get<ESM::Race>().find(player->mRace);
 
             bool male = (player->mFlags & ESM::NPC::Female) == 0;
 
-            for (int i=0; i<8; ++i)
+            for (int i = 0; i < 8; ++i)
             {
                 const ESM::Race::MaleFemale& attribute = race->mData.mAttributeValues[i];
 
                 creatureStats.setAttribute(i, male ? attribute.mMale : attribute.mFemale);
             }
 
-            for (int i=0; i<27; ++i)
+            for (int i = 0; i < 27; ++i)
             {
                 int bonus = 0;
 
-                for (int i2=0; i2<7; ++i2)
-                    if (race->mData.mBonus[i2].mSkill==i)
+                for (int i2 = 0; i2 < 7; ++i2)
+                    if (race->mData.mBonus[i2].mSkill == i)
                     {
                         bonus = race->mData.mBonus[i2].mBonus;
                         break;
                     }
 
-                npcStats.getSkill (i).setBase (5 + bonus);
+                npcStats.getSkill(i).setBase(5 + bonus);
             }
 
-            for (const std::string &power : race->mPowers.mList)
+            for (const std::string& power : race->mPowers.mList)
             {
                 creatureStats.getSpells().add(power);
             }
         }
 
         // birthsign
-        const std::string &signId =
-            MWBase::Environment::get().getWorld()->getPlayer().getBirthSign();
+        const std::string& signId = MWBase::Environment::get().getWorld()->getPlayer().getBirthSign();
 
         if (!signId.empty())
         {
-            const ESM::BirthSign *sign =
-                esmStore.get<ESM::BirthSign>().find(signId);
+            const ESM::BirthSign* sign = esmStore.get<ESM::BirthSign>().find(signId);
 
-            for (const std::string &power : sign->mPowers.mList)
+            for (const std::string& power : sign->mPowers.mList)
             {
                 creatureStats.getSpells().add(power);
             }
@@ -184,49 +190,44 @@ namespace MWMechanics
         // class
         if (mClassSelected)
         {
-            const ESM::Class *class_ =
-                esmStore.get<ESM::Class>().find(player->mClass);
+            const ESM::Class* class_ = esmStore.get<ESM::Class>().find(player->mClass);
 
-            for (int i=0; i<2; ++i)
+            for (int i = 0; i < 2; ++i)
             {
                 int attribute = class_->mData.mAttribute[i];
-                if (attribute>=0 && attribute<8)
+                if (attribute >= 0 && attribute < 8)
                 {
-                    creatureStats.setAttribute(attribute,
-                        creatureStats.getAttribute(attribute).getBase() + 10);
+                    creatureStats.setAttribute(attribute, creatureStats.getAttribute(attribute).getBase() + 10);
                 }
             }
 
-            for (int i=0; i<2; ++i)
+            for (int i = 0; i < 2; ++i)
             {
-                int bonus = i==0 ? 10 : 25;
+                int bonus = i == 0 ? 10 : 25;
 
-                for (int i2=0; i2<5; ++i2)
+                for (int i2 = 0; i2 < 5; ++i2)
                 {
                     int index = class_->mData.mSkills[i2][i];
 
-                    if (index>=0 && index<27)
+                    if (index >= 0 && index < 27)
                     {
-                        npcStats.getSkill (index).setBase (
-                            npcStats.getSkill (index).getBase() + bonus);
+                        npcStats.getSkill(index).setBase(npcStats.getSkill(index).getBase() + bonus);
                     }
                 }
             }
 
-            const MWWorld::Store<ESM::Skill> &skills =
-                esmStore.get<ESM::Skill>();
+            const MWWorld::Store<ESM::Skill>& skills = esmStore.get<ESM::Skill>();
 
             MWWorld::Store<ESM::Skill>::iterator iter = skills.begin();
             for (; iter != skills.end(); ++iter)
             {
-                if (iter->second.mData.mSpecialization==class_->mData.mSpecialization)
+                if (iter->second.mData.mSpecialization == class_->mData.mSpecialization)
                 {
                     int index = iter->first;
 
-                    if (index>=0 && index<27)
+                    if (index >= 0 && index < 27)
                     {
-                        npcStats.getSkill (index).setBase (
-                            npcStats.getSkill (index).getBase() + 5);
+                        npcStats.getSkill(index).setBase(npcStats.getSkill(index).getBase() + 5);
                     }
                 }
             }
@@ -238,46 +239,49 @@ namespace MWMechanics
             race = esmStore.get<ESM::Race>().find(player->mRace);
 
         int skills[ESM::Skill::Length];
-        for (int i=0; i<ESM::Skill::Length; ++i)
+        for (int i = 0; i < ESM::Skill::Length; ++i)
             skills[i] = npcStats.getSkill(i).getBase();
 
         int attributes[ESM::Attribute::Length];
-        for (int i=0; i<ESM::Attribute::Length; ++i)
+        for (int i = 0; i < ESM::Attribute::Length; ++i)
             attributes[i] = npcStats.getAttribute(i).getBase();
         npcStats.updateHealth();
 
         std::vector<std::string> selectedSpells = autoCalcPlayerSpells(skills, attributes, race);
 
-        for (const std::string &spell : selectedSpells)
+        for (const std::string& spell : selectedSpells)
             creatureStats.getSpells().add(spell);
 
         // forced update and current value adjustments
-        mActors.updateActor (ptr, 0);
+        mActors.updateActor(ptr, 0);
 
-        for (int i=0; i<3; ++i)
+        for (int i = 0; i < 3; ++i)
         {
-            DynamicStat<float> stat = creatureStats.getDynamic (i);
-            stat.setCurrent (stat.getModified());
-            creatureStats.setDynamic (i, stat);
+            DynamicStat<float> stat = creatureStats.getDynamic(i);
+            stat.setCurrent(stat.getModified());
+            creatureStats.setDynamic(i, stat);
         }
 
-        // auto-equip again. we need this for when the race is changed to a beast race and shoes are no longer equippable
+        // auto-equip again. we need this for when the race is changed to a beast race and shoes are no longer
+        // equippable
         MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr);
-        for (int i=0; i<MWWorld::InventoryStore::Slots; ++i)
+        for (int i = 0; i < MWWorld::InventoryStore::Slots; ++i)
             invStore.unequipAll(ptr);
         invStore.autoEquip(ptr);
     }
 
     MechanicsManager::MechanicsManager()
-    : mUpdatePlayer (true), mClassSelected (false),
-      mRaceSelected (false), mAI(true)
+        : mUpdatePlayer(true)
+        , mClassSelected(false)
+        , mRaceSelected(false)
+        , mAI(true)
     {
-        //buildPlayer no longer here, needs to be done explicitly after all subsystems are up and running
+        // buildPlayer no longer here, needs to be done explicitly after all subsystems are up and running
     }
 
     void MechanicsManager::add(const MWWorld::Ptr& ptr)
     {
-        if(ptr.getClass().isActor())
+        if (ptr.getClass().isActor())
             mActors.addActor(ptr);
         else
             mObjects.addObject(ptr);
@@ -285,30 +289,30 @@ namespace MWMechanics
 
     void MechanicsManager::castSpell(const MWWorld::Ptr& ptr, const std::string& spellId, bool manualSpell)
     {
-        if(ptr.getClass().isActor())
+        if (ptr.getClass().isActor())
             mActors.castSpell(ptr, spellId, manualSpell);
     }
 
     void MechanicsManager::remove(const MWWorld::Ptr& ptr, bool keepActive)
     {
-        if(ptr == MWBase::Environment::get().getWindowManager()->getWatchedActor())
+        if (ptr == MWBase::Environment::get().getWindowManager()->getWatchedActor())
             MWBase::Environment::get().getWindowManager()->watchActor(MWWorld::Ptr());
         mActors.removeActor(ptr, keepActive);
         mObjects.removeObject(ptr);
     }
 
-    void MechanicsManager::updateCell(const MWWorld::Ptr &old, const MWWorld::Ptr &ptr)
+    void MechanicsManager::updateCell(const MWWorld::Ptr& old, const MWWorld::Ptr& ptr)
     {
-        if(old == MWBase::Environment::get().getWindowManager()->getWatchedActor())
+        if (old == MWBase::Environment::get().getWindowManager()->getWatchedActor())
             MWBase::Environment::get().getWindowManager()->watchActor(ptr);
 
-        if(ptr.getClass().isActor())
+        if (ptr.getClass().isActor())
             mActors.updateActor(old, ptr);
         else
             mObjects.updateObject(old, ptr);
     }
 
-    void MechanicsManager::drop(const MWWorld::CellStore *cellStore)
+    void MechanicsManager::drop(const MWWorld::CellStore* cellStore)
     {
         mActors.dropActors(cellStore, getPlayer());
         mObjects.dropObjects(cellStore);
@@ -318,7 +322,7 @@ namespace MWMechanics
     {
         // Note: we should do it here since game mechanics and world updates use these values
         MWWorld::Ptr ptr = getPlayer();
-        MWBase::WindowManager *winMgr = MWBase::Environment::get().getWindowManager();
+        MWBase::WindowManager* winMgr = MWBase::Environment::get().getWindowManager();
 
         MWWorld::InventoryStore& inv = ptr.getClass().getInventoryStore(ptr);
         MWWorld::ContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
@@ -356,7 +360,7 @@ namespace MWMechanics
         mObjects.update(duration, paused);
     }
 
-    void MechanicsManager::processChangedSettings(const Settings::CategorySettingVector &changed)
+    void MechanicsManager::processChangedSettings(const Settings::CategorySettingVector& changed)
     {
         for (Settings::CategorySettingVector::const_iterator it = changed.begin(); it != changed.end(); ++it)
         {
@@ -427,12 +431,11 @@ namespace MWMechanics
         return mActors.getHoursToRest(getPlayer());
     }
 
-    void MechanicsManager::setPlayerName (const std::string& name)
+    void MechanicsManager::setPlayerName(const std::string& name)
     {
-        MWBase::World *world = MWBase::Environment::get().getWorld();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
 
-        ESM::NPC player =
-            *world->getPlayerPtr().get<ESM::NPC>()->mBase;
+        ESM::NPC player = *world->getPlayerPtr().get<ESM::NPC>()->mBase;
         player.mName = name;
 
         world->createRecord(player);
@@ -440,12 +443,12 @@ namespace MWMechanics
         mUpdatePlayer = true;
     }
 
-    void MechanicsManager::setPlayerRace (const std::string& race, bool male, const std::string &head, const std::string &hair)
+    void MechanicsManager::setPlayerRace(
+        const std::string& race, bool male, const std::string& head, const std::string& hair)
     {
-        MWBase::World *world = MWBase::Environment::get().getWorld();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
 
-        ESM::NPC player =
-            *world->getPlayerPtr().get<ESM::NPC>()->mBase;
+        ESM::NPC player = *world->getPlayerPtr().get<ESM::NPC>()->mBase;
 
         player.mRace = race;
         player.mHead = head;
@@ -459,19 +462,18 @@ namespace MWMechanics
         mUpdatePlayer = true;
     }
 
-    void MechanicsManager::setPlayerBirthsign (const std::string& id)
+    void MechanicsManager::setPlayerBirthsign(const std::string& id)
     {
         MWBase::Environment::get().getWorld()->getPlayer().setBirthSign(id);
         buildPlayer();
         mUpdatePlayer = true;
     }
 
-    void MechanicsManager::setPlayerClass (const std::string& id)
+    void MechanicsManager::setPlayerClass(const std::string& id)
     {
-        MWBase::World *world = MWBase::Environment::get().getWorld();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
 
-        ESM::NPC player =
-            *world->getPlayerPtr().get<ESM::NPC>()->mBase;
+        ESM::NPC player = *world->getPlayerPtr().get<ESM::NPC>()->mBase;
         player.mClass = id;
 
         world->createRecord(player);
@@ -481,14 +483,13 @@ namespace MWMechanics
         mUpdatePlayer = true;
     }
 
-    void MechanicsManager::setPlayerClass (const ESM::Class &cls)
+    void MechanicsManager::setPlayerClass(const ESM::Class& cls)
     {
-        MWBase::World *world = MWBase::Environment::get().getWorld();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
 
-        const ESM::Class *ptr = world->createRecord(cls);
+        const ESM::Class* ptr = world->createRecord(cls);
 
-        ESM::NPC player =
-            *world->getPlayerPtr().get<ESM::NPC>()->mBase;
+        ESM::NPC player = *world->getPlayerPtr().get<ESM::NPC>()->mBase;
         player.mClass = ptr->mId;
 
         world->createRecord(player);
@@ -506,16 +507,18 @@ namespace MWMechanics
         MWWorld::LiveCellRef<ESM::NPC>* npc = ptr.get<ESM::NPC>();
         MWWorld::Ptr playerPtr = getPlayer();
         MWWorld::LiveCellRef<ESM::NPC>* player = playerPtr.get<ESM::NPC>();
-        const MWMechanics::NpcStats &playerStats = playerPtr.getClass().getNpcStats(playerPtr);
+        const MWMechanics::NpcStats& playerStats = playerPtr.getClass().getNpcStats(playerPtr);
 
-        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
         static const float fDispRaceMod = gmst.find("fDispRaceMod")->mValue.getFloat();
         if (Misc::StringUtils::ciEqual(npc->mBase->mRace, player->mBase->mRace))
             x += fDispRaceMod;
 
         static const float fDispPersonalityMult = gmst.find("fDispPersonalityMult")->mValue.getFloat();
         static const float fDispPersonalityBase = gmst.find("fDispPersonalityBase")->mValue.getFloat();
-        x += fDispPersonalityMult * (playerStats.getAttribute(ESM::Attribute::Personality).getModified() - fDispPersonalityBase);
+        x += fDispPersonalityMult
+            * (playerStats.getAttribute(ESM::Attribute::Personality).getModified() - fDispPersonalityBase);
 
         float reaction = 0;
         int rank = 0;
@@ -526,7 +529,8 @@ namespace MWMechanics
             if (!playerStats.getExpelled(npcFaction))
             {
                 // faction reaction towards itself. yes, that exists
-                reaction = static_cast<float>(MWBase::Environment::get().getDialogueManager()->getFactionReaction(npcFaction, npcFaction));
+                reaction = static_cast<float>(
+                    MWBase::Environment::get().getDialogueManager()->getFactionReaction(npcFaction, npcFaction));
 
                 rank = playerStats.getFactionRanks().find(npcFaction)->second;
             }
@@ -542,7 +546,8 @@ namespace MWMechanics
                 if (playerStats.getExpelled(itFaction))
                     continue;
 
-                int itReaction = MWBase::Environment::get().getDialogueManager()->getFactionReaction(npcFaction, itFaction);
+                int itReaction
+                    = MWBase::Environment::get().getDialogueManager()->getFactionReaction(npcFaction, itFaction);
                 if (playerFactionIt == playerStats.getFactionRanks().begin() || itReaction < reaction)
                 {
                     reaction = static_cast<float>(itReaction);
@@ -559,9 +564,7 @@ namespace MWMechanics
         static const float fDispFactionRankMult = gmst.find("fDispFactionRankMult")->mValue.getFloat();
         static const float fDispFactionRankBase = gmst.find("fDispFactionRankBase")->mValue.getFloat();
         static const float fDispFactionMod = gmst.find("fDispFactionMod")->mValue.getFloat();
-        x += (fDispFactionRankMult * rank
-            + fDispFactionRankBase)
-            * fDispFactionMod * reaction;
+        x += (fDispFactionRankMult * rank + fDispFactionRankBase) * fDispFactionMod * reaction;
 
         static const float fDispCrimeMod = gmst.find("fDispCrimeMod")->mValue.getFloat();
         static const float fDispDiseaseMod = gmst.find("fDispDiseaseMod")->mValue.getFloat();
@@ -576,24 +579,24 @@ namespace MWMechanics
         x += ptr.getClass().getCreatureStats(ptr).getMagicEffects().get(ESM::MagicEffect::Charm).getMagnitude();
 
         if (clamp)
-            return std::clamp<int>(x, 0, 100);//, normally clamped to [0..100] when used
+            return std::clamp<int>(x, 0, 100); //, normally clamped to [0..100] when used
         return static_cast<int>(x);
     }
 
-    int MechanicsManager::getBarterOffer(const MWWorld::Ptr& ptr,int basePrice, bool buying)
+    int MechanicsManager::getBarterOffer(const MWWorld::Ptr& ptr, int basePrice, bool buying)
     {
         // Make sure zero base price items/services can't be bought/sold for 1 gold
         // and return the intended base price for creature merchants
         if (basePrice == 0 || ptr.getType() == ESM::Creature::sRecordId)
             return basePrice;
 
-        const MWMechanics::NpcStats &sellerStats = ptr.getClass().getNpcStats(ptr);
+        const MWMechanics::NpcStats& sellerStats = ptr.getClass().getNpcStats(ptr);
 
         MWWorld::Ptr playerPtr = getPlayer();
-        const MWMechanics::NpcStats &playerStats = playerPtr.getClass().getNpcStats(playerPtr);
+        const MWMechanics::NpcStats& playerStats = playerPtr.getClass().getNpcStats(playerPtr);
 
-        // I suppose the temporary disposition change (second param to getDerivedDisposition()) _has_ to be considered here,
-        // otherwise one would get different prices when exiting and re-entering the dialogue window...
+        // I suppose the temporary disposition change (second param to getDerivedDisposition()) _has_ to be considered
+        // here, otherwise one would get different prices when exiting and re-entering the dialogue window...
         int clampedDisposition = getDerivedDisposition(ptr);
         float a = std::min(playerPtr.getClass().getSkill(playerPtr, ESM::Skill::Mercantile), 100.f);
         float b = std::min(0.1f * playerStats.getAttribute(ESM::Attribute::Luck).getModified(), 10.f);
@@ -609,20 +612,21 @@ namespace MWMechanics
         return std::max(1, offerPrice);
     }
 
-    int MechanicsManager::countDeaths (const std::string& id) const
+    int MechanicsManager::countDeaths(const std::string& id) const
     {
-        return mActors.countDeaths (id);
+        return mActors.countDeaths(id);
     }
 
-    void MechanicsManager::getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type, bool& success, int& tempChange, int& permChange)
+    void MechanicsManager::getPersuasionDispositionChange(
+        const MWWorld::Ptr& npc, PersuasionType type, bool& success, int& tempChange, int& permChange)
     {
-        const MWWorld::Store<ESM::GameSetting> &gmst =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
         MWMechanics::NpcStats& npcStats = npc.getClass().getNpcStats(npc);
 
         MWWorld::Ptr playerPtr = getPlayer();
-        const MWMechanics::NpcStats &playerStats = playerPtr.getClass().getNpcStats(playerPtr);
+        const MWMechanics::NpcStats& playerStats = playerPtr.getClass().getNpcStats(playerPtr);
 
         float npcRating1, npcRating2, npcRating3;
         getPersuasionRatings(npcStats, npcRating1, npcRating2, npcRating3, false);
@@ -637,9 +641,12 @@ namespace MWMechanics
         float target2 = d * (playerRating2 - npcRating2 + 50);
 
         float bribeMod;
-        if (type == PT_Bribe10) bribeMod = gmst.find("fBribe10Mod")->mValue.getFloat();
-        else if (type == PT_Bribe100) bribeMod = gmst.find("fBribe100Mod")->mValue.getFloat();
-        else bribeMod = gmst.find("fBribe1000Mod")->mValue.getFloat();
+        if (type == PT_Bribe10)
+            bribeMod = gmst.find("fBribe10Mod")->mValue.getFloat();
+        else if (type == PT_Bribe100)
+            bribeMod = gmst.find("fBribe100Mod")->mValue.getFloat();
+        else
+            bribeMod = gmst.find("fBribe1000Mod")->mValue.getFloat();
 
         float target3 = d * (playerRating3 - npcRating3 + 50) + bribeMod;
 
@@ -665,7 +672,7 @@ namespace MWMechanics
         {
             target2 = std::max(iPerMinChance, target2);
 
-            success =  (roll <= target2);
+            success = (roll <= target2);
 
             float r;
             if (roll != target2)
@@ -679,10 +686,10 @@ namespace MWMechanics
 
                 const int flee = npcStats.getAiSetting(MWMechanics::AiSetting::Flee).getBase();
                 const int fight = npcStats.getAiSetting(MWMechanics::AiSetting::Fight).getBase();
-                npcStats.setAiSetting (MWMechanics::AiSetting::Flee,
-                                       std::clamp(flee + int(std::max(iPerMinChange, s)), 0, 100));
-                npcStats.setAiSetting (MWMechanics::AiSetting::Fight,
-                                       std::clamp(fight + int(std::min(-iPerMinChange, -s)), 0, 100));
+                npcStats.setAiSetting(
+                    MWMechanics::AiSetting::Flee, std::clamp(flee + int(std::max(iPerMinChange, s)), 0, 100));
+                npcStats.setAiSetting(
+                    MWMechanics::AiSetting::Fight, std::clamp(fight + int(std::min(-iPerMinChange, -s)), 0, 100));
             }
 
             float c = -std::abs(floor(r * fPerDieRollMult));
@@ -720,10 +727,10 @@ namespace MWMechanics
                 float s = c * fPerDieRollMult * fPerTempMult;
                 const int flee = npcStats.getAiSetting(AiSetting::Flee).getBase();
                 const int fight = npcStats.getAiSetting(AiSetting::Fight).getBase();
-                npcStats.setAiSetting(AiSetting::Flee,
-                                       std::clamp(flee + std::min(-int(iPerMinChange), int(-s)), 0, 100));
-                npcStats.setAiSetting(AiSetting::Fight,
-                                       std::clamp(fight + std::max(int(iPerMinChange), int(s)), 0, 100));
+                npcStats.setAiSetting(
+                    AiSetting::Flee, std::clamp(flee + std::min(-int(iPerMinChange), int(-s)), 0, 100));
+                npcStats.setAiSetting(
+                    AiSetting::Fight, std::clamp(fight + std::max(int(iPerMinChange), int(s)), 0, 100));
             }
             x = floor(-c * fPerDieRollMult);
 
@@ -741,7 +748,6 @@ namespace MWMechanics
 
         tempChange = type == PT_Intimidate ? int(x) : int(x * fPerTempMult);
 
-
         int cappedDispositionChange = tempChange;
         if (currentDisposition + tempChange > 100)
             cappedDispositionChange = 100 - currentDisposition;
@@ -754,33 +760,34 @@ namespace MWMechanics
         permChange = floor(cappedDispositionChange / fPerTempMult);
         if (type == PT_Intimidate)
         {
-            permChange = success ? -int(cappedDispositionChange/ fPerTempMult) : int(y);
+            permChange = success ? -int(cappedDispositionChange / fPerTempMult) : int(y);
         }
     }
 
-    void MechanicsManager::forceStateUpdate(const MWWorld::Ptr &ptr)
+    void MechanicsManager::forceStateUpdate(const MWWorld::Ptr& ptr)
     {
-        if(ptr.getClass().isActor())
+        if (ptr.getClass().isActor())
             mActors.forceStateUpdate(ptr);
     }
 
-    bool MechanicsManager::playAnimationGroup(const MWWorld::Ptr& ptr, std::string_view groupName, int mode, int number, bool persist)
+    bool MechanicsManager::playAnimationGroup(
+        const MWWorld::Ptr& ptr, std::string_view groupName, int mode, int number, bool persist)
     {
-        if(ptr.getClass().isActor())
+        if (ptr.getClass().isActor())
             return mActors.playAnimationGroup(ptr, groupName, mode, number, persist);
         else
             return mObjects.playAnimationGroup(ptr, groupName, mode, number, persist);
     }
     void MechanicsManager::skipAnimation(const MWWorld::Ptr& ptr)
     {
-        if(ptr.getClass().isActor())
+        if (ptr.getClass().isActor())
             mActors.skipAnimation(ptr);
         else
             mObjects.skipAnimation(ptr);
     }
-    bool MechanicsManager::checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string &groupName)
+    bool MechanicsManager::checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string& groupName)
     {
-        if(ptr.getClass().isActor())
+        if (ptr.getClass().isActor())
             return mActors.checkAnimationPlaying(ptr, groupName);
         else
             return false;
@@ -788,7 +795,7 @@ namespace MWMechanics
 
     bool MechanicsManager::onOpen(const MWWorld::Ptr& ptr)
     {
-        if(ptr.getClass().isActor())
+        if (ptr.getClass().isActor())
             return true;
         else
             return mObjects.onOpen(ptr);
@@ -796,7 +803,7 @@ namespace MWMechanics
 
     void MechanicsManager::onClose(const MWWorld::Ptr& ptr)
     {
-        if(!ptr.getClass().isActor())
+        if (!ptr.getClass().isActor())
             mObjects.onClose(ptr);
     }
 
@@ -806,7 +813,7 @@ namespace MWMechanics
         mObjects.persistAnimationStates();
     }
 
-    void MechanicsManager::updateMagicEffects(const MWWorld::Ptr &ptr)
+    void MechanicsManager::updateMagicEffects(const MWWorld::Ptr& ptr)
     {
         mActors.updateMagicEffects(ptr);
     }
@@ -834,13 +841,15 @@ namespace MWMechanics
     {
         static std::set<std::string> boundItemIDCache;
 
-        // If this is empty then we haven't executed the GMST cache logic yet; or there isn't any sMagicBound* GMST's for some reason
+        // If this is empty then we haven't executed the GMST cache logic yet; or there isn't any sMagicBound* GMST's
+        // for some reason
         if (boundItemIDCache.empty())
         {
             // Build a list of known bound item ID's
-            const MWWorld::Store<ESM::GameSetting> &gameSettings = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+            const MWWorld::Store<ESM::GameSetting>& gameSettings
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
-            for (const ESM::GameSetting &currentSetting : gameSettings)
+            for (const ESM::GameSetting& currentSetting : gameSettings)
             {
                 // Don't bother checking this GMST if it's not a sMagicBound* one.
                 if (!Misc::StringUtils::ciStartsWith(currentSetting.mId, "smagicbound"))
@@ -864,7 +873,7 @@ namespace MWMechanics
         return false;
     }
 
-    bool MechanicsManager::isAllowedToUse (const MWWorld::Ptr& ptr, const MWWorld::Ptr& target, MWWorld::Ptr& victim)
+    bool MechanicsManager::isAllowedToUse(const MWWorld::Ptr& ptr, const MWWorld::Ptr& target, MWWorld::Ptr& victim)
     {
         if (target.isEmpty())
             return true;
@@ -872,9 +881,8 @@ namespace MWMechanics
         const MWWorld::CellRef& cellref = target.getCellRef();
         // there is no harm to use unlocked doors
         int lockLevel = cellref.getLockLevel();
-        if (target.getClass().isDoor() &&
-            (lockLevel <= 0 || lockLevel == ESM::UnbreakableLock) &&
-            cellref.getTrap().empty())
+        if (target.getClass().isDoor() && (lockLevel <= 0 || lockLevel == ESM::UnbreakableLock)
+            && cellref.getTrap().empty())
         {
             return true;
         }
@@ -908,7 +916,7 @@ namespace MWMechanics
         return !Misc::StringUtils::ciEqual(cellref.getRefId(), "stolen_goods");
     }
 
-    bool MechanicsManager::sleepInBed(const MWWorld::Ptr &ptr, const MWWorld::Ptr &bed)
+    bool MechanicsManager::sleepInBed(const MWWorld::Ptr& ptr, const MWWorld::Ptr& bed)
     {
         if (ptr.getClass().getNpcStats(ptr).isWerewolf())
         {
@@ -916,7 +924,8 @@ namespace MWMechanics
             return true;
         }
 
-        if(MWBase::Environment::get().getWorld()->getPlayer().enemiesNearby()) {
+        if (MWBase::Environment::get().getWorld()->getPlayer().enemiesNearby())
+        {
             MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage2}");
             return true;
         }
@@ -925,7 +934,7 @@ namespace MWMechanics
         if (isAllowedToUse(ptr, bed, victim))
             return false;
 
-        if(commitCrime(ptr, victim, OT_SleepingInOwnedBed, bed.getCellRef().getFaction()))
+        if (commitCrime(ptr, victim, OT_SleepingInOwnedBed, bed.getCellRef().getFaction()))
         {
             MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage64}");
             return true;
@@ -934,22 +943,23 @@ namespace MWMechanics
             return false;
     }
 
-    void MechanicsManager::unlockAttempted(const MWWorld::Ptr &ptr, const MWWorld::Ptr &item)
+    void MechanicsManager::unlockAttempted(const MWWorld::Ptr& ptr, const MWWorld::Ptr& item)
     {
         MWWorld::Ptr victim;
         if (isOwned(ptr, item, victim))
         {
-            // Note that attempting to unlock something that has ever been locked (even ESM::UnbreakableLock) is a crime even if it's already unlocked.
-            // Likewise, it's illegal to unlock something that has a trap but isn't otherwise locked.
+            // Note that attempting to unlock something that has ever been locked (even ESM::UnbreakableLock) is a crime
+            // even if it's already unlocked. Likewise, it's illegal to unlock something that has a trap but isn't
+            // otherwise locked.
             const auto& cellref = item.getCellRef();
-            if(cellref.getLockLevel() || !cellref.getTrap().empty())
+            if (cellref.getLockLevel() || !cellref.getTrap().empty())
                 commitCrime(ptr, victim, OT_Trespassing, item.getCellRef().getFaction());
         }
     }
 
-    std::vector<std::pair<std::string, int> > MechanicsManager::getStolenItemOwners(const std::string& itemid)
+    std::vector<std::pair<std::string, int>> MechanicsManager::getStolenItemOwners(const std::string& itemid)
     {
-        std::vector<std::pair<std::string, int> > result;
+        std::vector<std::pair<std::string, int>> result;
         StolenItemsMap::const_iterator it = mStolenItems.find(Misc::StringUtils::lowerCase(itemid));
         if (it == mStolenItems.end())
             return result;
@@ -962,7 +972,7 @@ namespace MWMechanics
         }
     }
 
-    bool MechanicsManager::isItemStolenFrom(const std::string &itemid, const MWWorld::Ptr& ptr)
+    bool MechanicsManager::isItemStolenFrom(const std::string& itemid, const MWWorld::Ptr& ptr)
     {
         StolenItemsMap::const_iterator it = mStolenItems.find(Misc::StringUtils::lowerCase(itemid));
         if (it == mStolenItems.end())
@@ -977,14 +987,16 @@ namespace MWMechanics
         const std::string_view factionid = ptr.getClass().getPrimaryFaction(ptr);
         if (!factionid.empty())
         {
-            OwnerMap::const_iterator factionOwnerFound = owners.find(std::make_pair(Misc::StringUtils::lowerCase(factionid), true));
+            OwnerMap::const_iterator factionOwnerFound
+                = owners.find(std::make_pair(Misc::StringUtils::lowerCase(factionid), true));
             return factionOwnerFound != owners.end();
         }
 
         return false;
     }
 
-    void MechanicsManager::confiscateStolenItemToOwner(const MWWorld::Ptr &player, const MWWorld::Ptr &item, const MWWorld::Ptr& victim, int count)
+    void MechanicsManager::confiscateStolenItemToOwner(
+        const MWWorld::Ptr& player, const MWWorld::Ptr& item, const MWWorld::Ptr& victim, int count)
     {
         if (player != getPlayer())
             return;
@@ -1000,7 +1012,8 @@ namespace MWMechanics
         owner.second = false;
 
         const std::string_view victimFaction = victim.getClass().getPrimaryFaction(victim);
-        if (!victimFaction.empty() && Misc::StringUtils::ciEqual(item.getCellRef().getFaction(), victimFaction)) // Is the item faction-owned?
+        if (!victimFaction.empty()
+            && Misc::StringUtils::ciEqual(item.getCellRef().getFaction(), victimFaction)) // Is the item faction-owned?
         {
             owner.first = victimFaction;
             owner.second = true;
@@ -1025,16 +1038,18 @@ namespace MWMechanics
         // move items from player to owner and report about theft
         victim.getClass().getContainerStore(victim).add(item, toRemove, victim);
         store.remove(item, toRemove, player);
-        commitCrime(player, victim, OT_Theft, item.getCellRef().getFaction(), item.getClass().getValue(item) * toRemove);
+        commitCrime(
+            player, victim, OT_Theft, item.getCellRef().getFaction(), item.getClass().getValue(item) * toRemove);
     }
 
-    void MechanicsManager::confiscateStolenItems(const MWWorld::Ptr &player, const MWWorld::Ptr &targetContainer)
+    void MechanicsManager::confiscateStolenItems(const MWWorld::Ptr& player, const MWWorld::Ptr& targetContainer)
     {
         MWWorld::ContainerStore& store = player.getClass().getContainerStore(player);
         MWWorld::ContainerStore& containerStore = targetContainer.getClass().getContainerStore(targetContainer);
         for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
         {
-            StolenItemsMap::iterator stolenIt = mStolenItems.find(Misc::StringUtils::lowerCase(it->getCellRef().getRefId()));
+            StolenItemsMap::iterator stolenIt
+                = mStolenItems.find(Misc::StringUtils::lowerCase(it->getCellRef().getRefId()));
             if (stolenIt == mStolenItems.end())
                 continue;
             OwnerMap& owners = stolenIt->second;
@@ -1059,8 +1074,8 @@ namespace MWMechanics
         targetContainer.getCellRef().lock(50);
     }
 
-    void MechanicsManager::itemTaken(const MWWorld::Ptr &ptr, const MWWorld::Ptr &item, const MWWorld::Ptr& container,
-                                     int count, bool alarm)
+    void MechanicsManager::itemTaken(
+        const MWWorld::Ptr& ptr, const MWWorld::Ptr& item, const MWWorld::Ptr& container, int count, bool alarm)
     {
         if (ptr != getPlayer())
             return;
@@ -1109,15 +1124,17 @@ namespace MWMechanics
 
         if (!Misc::StringUtils::ciEqual(item.getCellRef().getRefId(), MWWorld::ContainerStore::sGoldId))
         {
-            if (victim.isEmpty() || (victim.getClass().isActor() && victim.getRefData().getCount() > 0 && !victim.getClass().getCreatureStats(victim).isDead()))
+            if (victim.isEmpty()
+                || (victim.getClass().isActor() && victim.getRefData().getCount() > 0
+                    && !victim.getClass().getCreatureStats(victim).isDead()))
                 mStolenItems[Misc::StringUtils::lowerCase(item.getCellRef().getRefId())][owner] += count;
         }
         if (alarm)
             commitCrime(ptr, victim, OT_Theft, ownerCellRef->getFaction(), item.getClass().getValue(item) * count);
     }
 
-
-    bool MechanicsManager::commitCrime(const MWWorld::Ptr &player, const MWWorld::Ptr &victim, OffenseType type, const std::string& factionId, int arg, bool victimAware)
+    bool MechanicsManager::commitCrime(const MWWorld::Ptr& player, const MWWorld::Ptr& victim, OffenseType type,
+        const std::string& factionId, int arg, bool victimAware)
     {
         // NOTE: victim may be empty
 
@@ -1128,14 +1145,14 @@ namespace MWMechanics
         // Find all the actors within the alarm radius
         std::vector<MWWorld::Ptr> neighbors;
 
-        osg::Vec3f from (player.getRefData().getPosition().asVec3());
+        osg::Vec3f from(player.getRefData().getPosition().asVec3());
         const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
         float radius = esmStore.get<ESM::GameSetting>().find("fAlarmRadius")->mValue.getFloat();
 
         mActors.getObjectsInRange(from, radius, neighbors);
 
         // victim should be considered even beyond alarm radius
-        if (!victim.isEmpty() && (from - victim.getRefData().getPosition().asVec3()).length2() > radius*radius)
+        if (!victim.isEmpty() && (from - victim.getRefData().getPosition().asVec3()).length2() > radius * radius)
             neighbors.push_back(victim);
 
         // get the player's followers / allies (works recursively) that will not report crimes
@@ -1144,16 +1161,17 @@ namespace MWMechanics
 
         // Did anyone see it?
         bool crimeSeen = false;
-        for (const MWWorld::Ptr &neighbor : neighbors)
+        for (const MWWorld::Ptr& neighbor : neighbors)
         {
             if (!canReportCrime(neighbor, victim, playerFollowers))
                 continue;
 
             if ((neighbor == victim && victimAware)
-                    // Murder crime can be reported even if no one saw it (hearing is enough, I guess).
-                    // TODO: Add mod support for stealth executions!
-                    || (type == OT_Murder && neighbor != victim)
-                    || (MWBase::Environment::get().getWorld()->getLOS(player, neighbor) && awarenessCheck(player, neighbor)))
+                // Murder crime can be reported even if no one saw it (hearing is enough, I guess).
+                // TODO: Add mod support for stealth executions!
+                || (type == OT_Murder && neighbor != victim)
+                || (MWBase::Environment::get().getWorld()->getLOS(player, neighbor)
+                    && awarenessCheck(player, neighbor)))
             {
                 // NPC will complain about theft even if he will do nothing about it
                 if (type == OT_Theft || type == OT_Pickpocket)
@@ -1173,15 +1191,16 @@ namespace MWMechanics
                 reported = reportCrime(player, victim, type, std::string(), arg);
 
             if (!reported)
-                startCombat(victim, player); // TODO: combat should be started with an "unaware" flag, which makes the victim flee?
+                startCombat(victim,
+                    player); // TODO: combat should be started with an "unaware" flag, which makes the victim flee?
         }
         return crimeSeen;
     }
 
-    bool MechanicsManager::canReportCrime(const MWWorld::Ptr &actor, const MWWorld::Ptr &victim, std::set<MWWorld::Ptr> &playerFollowers)
+    bool MechanicsManager::canReportCrime(
+        const MWWorld::Ptr& actor, const MWWorld::Ptr& victim, std::set<MWWorld::Ptr>& playerFollowers)
     {
-        if (actor == getPlayer()
-            || !actor.getClass().isNpc() || actor.getClass().getCreatureStats(actor).isDead())
+        if (actor == getPlayer() || !actor.getClass().isNpc() || actor.getClass().getCreatureStats(actor).isDead())
             return false;
 
         if (actor.getClass().getCreatureStats(actor).getAiSequence().isInCombat(victim))
@@ -1201,9 +1220,11 @@ namespace MWMechanics
         return true;
     }
 
-    bool MechanicsManager::reportCrime(const MWWorld::Ptr &player, const MWWorld::Ptr &victim, OffenseType type, const std::string& factionId, int arg)
+    bool MechanicsManager::reportCrime(
+        const MWWorld::Ptr& player, const MWWorld::Ptr& victim, OffenseType type, const std::string& factionId, int arg)
     {
-        const MWWorld::Store<ESM::GameSetting>& store = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& store
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
         if (type == OT_Murder && !victim.isEmpty())
             victim.getClass().getCreatureStats(victim).notifyMurder();
@@ -1243,13 +1264,13 @@ namespace MWMechanics
 
         const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
 
-        osg::Vec3f from (player.getRefData().getPosition().asVec3());
+        osg::Vec3f from(player.getRefData().getPosition().asVec3());
         float radius = esmStore.get<ESM::GameSetting>().find("fAlarmRadius")->mValue.getFloat();
 
         mActors.getObjectsInRange(from, radius, neighbors);
 
         // victim should be considered even beyond alarm radius
-        if (!victim.isEmpty() && (from - victim.getRefData().getPosition().asVec3()).length2() > radius*radius)
+        if (!victim.isEmpty() && (from - victim.getRefData().getPosition().asVec3()).length2() > radius * radius)
             neighbors.push_back(victim);
 
         int id = MWBase::Environment::get().getWorld()->getPlayer().getNewCrimeId();
@@ -1262,7 +1283,8 @@ namespace MWMechanics
         else if (type == OT_Pickpocket)
         {
             fight = esmStore.get<ESM::GameSetting>().find("iFightPickpocket")->mValue.getInteger();
-            fightVictim = esmStore.get<ESM::GameSetting>().find("iFightPickpocket")->mValue.getInteger() * 4; // *4 according to research wiki
+            fightVictim = esmStore.get<ESM::GameSetting>().find("iFightPickpocket")->mValue.getInteger()
+                * 4; // *4 according to research wiki
         }
         else if (type == OT_Assault)
         {
@@ -1280,7 +1302,7 @@ namespace MWMechanics
         getActorsSidingWith(player, playerFollowers);
 
         // Tell everyone (including the original reporter) in alarm range
-        for (const MWWorld::Ptr &actor : neighbors)
+        for (const MWWorld::Ptr& actor : neighbors)
         {
             if (!canReportCrime(actor, victim, playerFollowers))
                 continue;
@@ -1295,7 +1317,7 @@ namespace MWMechanics
             }
         }
 
-        for (const MWWorld::Ptr &actor : neighbors)
+        for (const MWWorld::Ptr& actor : neighbors)
         {
             if (!canReportCrime(actor, victim, playerFollowers))
                 continue;
@@ -1318,7 +1340,8 @@ namespace MWMechanics
             {
                 float dispTerm = (actor == victim) ? dispVictim : disp;
 
-                float alarmTerm = 0.01f * actor.getClass().getCreatureStats(actor).getAiSetting(AiSetting::Alarm).getBase();
+                float alarmTerm
+                    = 0.01f * actor.getClass().getCreatureStats(actor).getAiSetting(AiSetting::Alarm).getBase();
                 if (type == OT_Pickpocket && alarmTerm <= 0)
                     alarmTerm = 1.0;
 
@@ -1330,7 +1353,8 @@ namespace MWMechanics
                 fightTerm += getFightDistanceBias(actor, player);
                 fightTerm *= alarmTerm;
 
-                const int observerFightRating = actor.getClass().getCreatureStats(actor).getAiSetting(AiSetting::Fight).getBase();
+                const int observerFightRating
+                    = actor.getClass().getCreatureStats(actor).getAiSetting(AiSetting::Fight).getBase();
                 if (observerFightRating + fightTerm > 100)
                     fightTerm = static_cast<float>(100 - observerFightRating);
                 fightTerm = std::max(0.f, fightTerm);
@@ -1358,8 +1382,7 @@ namespace MWMechanics
 
         if (reported)
         {
-            player.getClass().getNpcStats(player).setBounty(player.getClass().getNpcStats(player).getBounty()
-                                                      + arg);
+            player.getClass().getNpcStats(player).setBounty(player.getClass().getNpcStats(player).getBounty() + arg);
 
             // If committing a crime against a faction member, expell from the faction
             if (!victim.isEmpty() && victim.getClass().isNpc())
@@ -1382,8 +1405,8 @@ namespace MWMechanics
             }
 
             if (type == OT_Assault && !victim.isEmpty()
-                    && !victim.getClass().getCreatureStats(victim).getAiSequence().isInCombat(player)
-                    && victim.getClass().isNpc())
+                && !victim.getClass().getCreatureStats(victim).getAiSequence().isInCombat(player)
+                && victim.getClass().isNpc())
             {
                 // Attacker is in combat with us, but we are not in combat with the attacker yet. Time to fight back.
                 // Note: accidental or collateral damage attacks are ignored.
@@ -1399,7 +1422,7 @@ namespace MWMechanics
         return reported;
     }
 
-    bool MechanicsManager::actorAttacked(const MWWorld::Ptr &target, const MWWorld::Ptr &attacker)
+    bool MechanicsManager::actorAttacked(const MWWorld::Ptr& target, const MWWorld::Ptr& attacker)
     {
         const MWWorld::Ptr& player = getPlayer();
         if (target == player || !attacker.getClass().isActor())
@@ -1439,9 +1462,11 @@ namespace MWMechanics
                 // he will attack the player only if we will force him (e.g. via StartCombat console command)
                 bool peaceful = false;
                 std::string_view script = target.getClass().getScript(target);
-                if (!script.empty() && target.getRefData().getLocals().hasVar(script, "onpchitme") && attacker == player)
+                if (!script.empty() && target.getRefData().getLocals().hasVar(script, "onpchitme")
+                    && attacker == player)
                 {
-                    const int fight = target.getClass().getCreatureStats(target).getAiSetting(AiSetting::Fight).getModified();
+                    const int fight
+                        = target.getClass().getCreatureStats(target).getAiSetting(AiSetting::Fight).getModified();
                     peaceful = (fight == 0);
                 }
 
@@ -1451,9 +1476,9 @@ namespace MWMechanics
                     // Force friendly actors into combat to prevent infighting between followers
                     std::set<MWWorld::Ptr> followersTarget;
                     getActorsSidingWith(target, followersTarget);
-                    for(const auto& follower : followersTarget)
+                    for (const auto& follower : followersTarget)
                     {
-                        if(follower != attacker && follower != player)
+                        if (follower != attacker && follower != player)
                             startCombat(follower, attacker);
                     }
                 }
@@ -1463,15 +1488,15 @@ namespace MWMechanics
         return true;
     }
 
-    bool MechanicsManager::canCommitCrimeAgainst(const MWWorld::Ptr &target, const MWWorld::Ptr &attacker)
+    bool MechanicsManager::canCommitCrimeAgainst(const MWWorld::Ptr& target, const MWWorld::Ptr& attacker)
     {
         const MWMechanics::AiSequence& seq = target.getClass().getCreatureStats(target).getAiSequence();
         return target.getClass().isNpc() && !attacker.isEmpty() && !seq.isInCombat(attacker)
-                && !isAggressive(target, attacker) && !seq.isEngagedWithActor()
-                && !target.getClass().getCreatureStats(target).getAiSequence().isInPursuit();
+            && !isAggressive(target, attacker) && !seq.isEngagedWithActor()
+            && !target.getClass().getCreatureStats(target).getAiSequence().isInPursuit();
     }
 
-    void MechanicsManager::actorKilled(const MWWorld::Ptr &victim, const MWWorld::Ptr &attacker)
+    void MechanicsManager::actorKilled(const MWWorld::Ptr& victim, const MWWorld::Ptr& attacker)
     {
         if (attacker.isEmpty() || victim.isEmpty())
             return;
@@ -1483,7 +1508,7 @@ namespace MWMechanics
             return; // TODO: implement animal rights
 
         const MWMechanics::NpcStats& victimStats = victim.getClass().getNpcStats(victim);
-        const MWWorld::Ptr &player = getPlayer();
+        const MWWorld::Ptr& player = getPlayer();
         bool canCommit = attacker == player && canCommitCrimeAgainst(victim, attacker);
 
         // For now we report only about crimes of player and player's followers
@@ -1504,12 +1529,13 @@ namespace MWMechanics
         commitCrime(player, victim, MWBase::MechanicsManager::OT_Murder);
     }
 
-    bool MechanicsManager::awarenessCheck(const MWWorld::Ptr &ptr, const MWWorld::Ptr &observer)
+    bool MechanicsManager::awarenessCheck(const MWWorld::Ptr& ptr, const MWWorld::Ptr& observer)
     {
         if (observer.getClass().getCreatureStats(observer).isDead() || !observer.getRefData().isEnabled())
             return false;
 
-        const MWWorld::Store<ESM::GameSetting>& store = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& store
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
         CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
 
@@ -1535,8 +1561,8 @@ namespace MWMechanics
         static float fSneakDistBase = store.find("fSneakDistanceBase")->mValue.getFloat();
         static float fSneakDistMult = store.find("fSneakDistanceMultiplier")->mValue.getFloat();
 
-        osg::Vec3f pos1 (ptr.getRefData().getPosition().asVec3());
-        osg::Vec3f pos2 (observer.getRefData().getPosition().asVec3());
+        osg::Vec3f pos1(ptr.getRefData().getPosition().asVec3());
+        osg::Vec3f pos2(observer.getRefData().getPosition().asVec3());
         float distTerm = fSneakDistBase + fSneakDistMult * (pos1 - pos2).length();
 
         float chameleon = stats.getMagicEffects().get(ESM::MagicEffect::Chameleon).getMagnitude();
@@ -1560,7 +1586,7 @@ namespace MWMechanics
         osg::Vec3f vec = pos1 - pos2;
         if (observer.getRefData().getBaseNode())
         {
-            osg::Vec3f observerDir = (observer.getRefData().getBaseNode()->getAttitude() * osg::Vec3f(0,1,0));
+            osg::Vec3f observerDir = (observer.getRefData().getBaseNode()->getAttitude() * osg::Vec3f(0, 1, 0));
 
             float angleRadians = std::acos(observerDir * vec / (observerDir.length() * vec.length()));
             if (angleRadians > osg::DegreesToRadians(90.f))
@@ -1574,7 +1600,7 @@ namespace MWMechanics
         return (Misc::Rng::roll0to99(prng) >= target);
     }
 
-    void MechanicsManager::startCombat(const MWWorld::Ptr &ptr, const MWWorld::Ptr &target)
+    void MechanicsManager::startCombat(const MWWorld::Ptr& ptr, const MWWorld::Ptr& target)
     {
         CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
 
@@ -1597,17 +1623,27 @@ namespace MWMechanics
             // if guard starts combat with player, guards pursuing player should do the same
             if (ptr.getClass().isClass(ptr, "Guard"))
             {
-                stats.setHitAttemptActorId(target.getClass().getCreatureStats(target).getActorId()); // Stops guard from ending combat if player is unreachable
+                stats.setHitAttemptActorId(
+                    target.getClass()
+                        .getCreatureStats(target)
+                        .getActorId()); // Stops guard from ending combat if player is unreachable
                 for (const Actor& actor : mActors)
                 {
                     if (actor.getPtr().getClass().isClass(actor.getPtr(), "Guard"))
                     {
-                        MWMechanics::AiSequence& aiSeq = actor.getPtr().getClass().getCreatureStats(actor.getPtr()).getAiSequence();
+                        MWMechanics::AiSequence& aiSeq
+                            = actor.getPtr().getClass().getCreatureStats(actor.getPtr()).getAiSequence();
                         if (aiSeq.getTypeId() == MWMechanics::AiPackageTypeId::Pursue)
                         {
                             aiSeq.stopPursuit();
                             aiSeq.stack(MWMechanics::AiCombat(target), ptr);
-                            actor.getPtr().getClass().getCreatureStats(actor.getPtr()).setHitAttemptActorId(target.getClass().getCreatureStats(target).getActorId()); // Stops guard from ending combat if player is unreachable
+                            actor.getPtr()
+                                .getClass()
+                                .getCreatureStats(actor.getPtr())
+                                .setHitAttemptActorId(
+                                    target.getClass()
+                                        .getCreatureStats(target)
+                                        .getActorId()); // Stops guard from ending combat if player is unreachable
                         }
                     }
                 }
@@ -1623,18 +1659,20 @@ namespace MWMechanics
         mActors.stopCombat(actor);
     }
 
-    void MechanicsManager::getObjectsInRange(const osg::Vec3f &position, float radius, std::vector<MWWorld::Ptr> &objects)
+    void MechanicsManager::getObjectsInRange(
+        const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& objects)
     {
         mActors.getObjectsInRange(position, radius, objects);
         mObjects.getObjectsInRange(position, radius, objects);
     }
 
-    void MechanicsManager::getActorsInRange(const osg::Vec3f &position, float radius, std::vector<MWWorld::Ptr> &objects)
+    void MechanicsManager::getActorsInRange(
+        const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& objects)
     {
         mActors.getObjectsInRange(position, radius, objects);
     }
 
-    bool MechanicsManager::isAnyActorInRange(const osg::Vec3f &position, float radius)
+    bool MechanicsManager::isAnyActorInRange(const osg::Vec3f& position, float radius)
     {
         return mActors.isAnyObjectInRange(position, radius);
     }
@@ -1659,29 +1697,33 @@ namespace MWMechanics
         return mActors.getActorsFollowingByIndex(actor);
     }
 
-    std::vector<MWWorld::Ptr> MechanicsManager::getActorsFighting(const MWWorld::Ptr& actor) {
+    std::vector<MWWorld::Ptr> MechanicsManager::getActorsFighting(const MWWorld::Ptr& actor)
+    {
         return mActors.getActorsFighting(actor);
     }
 
-    std::vector<MWWorld::Ptr> MechanicsManager::getEnemiesNearby(const MWWorld::Ptr& actor) {
+    std::vector<MWWorld::Ptr> MechanicsManager::getEnemiesNearby(const MWWorld::Ptr& actor)
+    {
         return mActors.getEnemiesNearby(actor);
     }
 
-    void MechanicsManager::getActorsFollowing(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out) {
+    void MechanicsManager::getActorsFollowing(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out)
+    {
         mActors.getActorsFollowing(actor, out);
     }
 
-    void MechanicsManager::getActorsSidingWith(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out) {
+    void MechanicsManager::getActorsSidingWith(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out)
+    {
         mActors.getActorsSidingWith(actor, out);
     }
 
     int MechanicsManager::countSavedGameRecords() const
     {
         return 1 // Death counter
-                +1; // Stolen items
+            + 1; // Stolen items
     }
 
-    void MechanicsManager::write(ESM::ESMWriter &writer, Loading::Listener &listener) const
+    void MechanicsManager::write(ESM::ESMWriter& writer, Loading::Listener& listener) const
     {
         mActors.write(writer, listener);
 
@@ -1692,7 +1734,7 @@ namespace MWMechanics
         writer.endRecord(ESM::REC_STLN);
     }
 
-    void MechanicsManager::readRecord(ESM::ESMReader &reader, uint32_t type)
+    void MechanicsManager::readRecord(ESM::ESMReader& reader, uint32_t type)
     {
         if (type == ESM::REC_STLN)
         {
@@ -1712,12 +1754,24 @@ namespace MWMechanics
         mRaceSelected = false;
     }
 
-    bool MechanicsManager::isAggressive(const MWWorld::Ptr &ptr, const MWWorld::Ptr &target)
+    bool MechanicsManager::isAggressive(const MWWorld::Ptr& ptr, const MWWorld::Ptr& target)
     {
         // Don't become aggressive if a calm effect is active, since it would cause combat to cycle on/off as
         // combat is activated here and then canceled by the calm effect
-        if ((ptr.getClass().isNpc() && ptr.getClass().getCreatureStats(ptr).getMagicEffects().get(ESM::MagicEffect::CalmHumanoid).getMagnitude() > 0)
-            || (!ptr.getClass().isNpc() && ptr.getClass().getCreatureStats(ptr).getMagicEffects().get(ESM::MagicEffect::CalmCreature).getMagnitude() > 0))
+        if ((ptr.getClass().isNpc()
+                && ptr.getClass()
+                        .getCreatureStats(ptr)
+                        .getMagicEffects()
+                        .get(ESM::MagicEffect::CalmHumanoid)
+                        .getMagnitude()
+                    > 0)
+            || (!ptr.getClass().isNpc()
+                && ptr.getClass()
+                        .getCreatureStats(ptr)
+                        .getMagicEffects()
+                        .get(ESM::MagicEffect::CalmCreature)
+                        .getMagnitude()
+                    > 0))
             return false;
 
         int disposition = 50;
@@ -1725,15 +1779,17 @@ namespace MWMechanics
             disposition = getDerivedDisposition(ptr);
 
         int fight = ptr.getClass().getCreatureStats(ptr).getAiSetting(AiSetting::Fight).getModified()
-                + static_cast<int>(getFightDistanceBias(ptr, target) + getFightDispositionBias(static_cast<float>(disposition)));
+            + static_cast<int>(
+                getFightDistanceBias(ptr, target) + getFightDispositionBias(static_cast<float>(disposition)));
 
         if (ptr.getClass().isNpc() && target.getClass().isNpc())
         {
-            if (target.getClass().getNpcStats(target).isWerewolf() ||
-                    (target == getPlayer() &&
-                     MWBase::Environment::get().getWorld()->getGlobalInt("pcknownwerewolf")))
+            if (target.getClass().getNpcStats(target).isWerewolf()
+                || (target == getPlayer() && MWBase::Environment::get().getWorld()->getGlobalInt("pcknownwerewolf")))
             {
-                const ESM::GameSetting * iWerewolfFightMod = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("iWerewolfFightMod");
+                const ESM::GameSetting* iWerewolfFightMod
+                    = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
+                        "iWerewolfFightMod");
                 fight += iWerewolfFightMod->mValue.getInteger();
             }
         }
@@ -1741,7 +1797,7 @@ namespace MWMechanics
         return (fight >= 100);
     }
 
-    void MechanicsManager::resurrect(const MWWorld::Ptr &ptr)
+    void MechanicsManager::resurrect(const MWWorld::Ptr& ptr)
     {
         CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
         if (stats.isDead())
@@ -1751,17 +1807,17 @@ namespace MWMechanics
         }
     }
 
-    bool MechanicsManager::isCastingSpell(const MWWorld::Ptr &ptr) const
+    bool MechanicsManager::isCastingSpell(const MWWorld::Ptr& ptr) const
     {
         return mActors.isCastingSpell(ptr);
     }
 
-    bool MechanicsManager::isReadyToBlock(const MWWorld::Ptr &ptr) const
+    bool MechanicsManager::isReadyToBlock(const MWWorld::Ptr& ptr) const
     {
         return mActors.isReadyToBlock(ptr);
     }
 
-    bool MechanicsManager::isAttackingOrSpell(const MWWorld::Ptr &ptr) const
+    bool MechanicsManager::isAttackingOrSpell(const MWWorld::Ptr& ptr) const
     {
         return mActors.isAttackingOrSpell(ptr);
     }
@@ -1782,9 +1838,9 @@ namespace MWMechanics
 
         npcStats.setWerewolf(werewolf);
 
-        MWWorld::InventoryStore &inv = actor.getClass().getInventoryStore(actor);
+        MWWorld::InventoryStore& inv = actor.getClass().getInventoryStore(actor);
 
-        if(werewolf)
+        if (werewolf)
         {
             inv.unequipAll(actor);
             inv.equip(MWWorld::InventoryStore::Slot_Robe, inv.ContainerStore::add("werewolfrobe", 1, actor), actor);
@@ -1795,7 +1851,7 @@ namespace MWMechanics
             inv.ContainerStore::remove("werewolfrobe", 1, actor);
         }
 
-        if(actor == player->getPlayer())
+        if (actor == player->getPlayer())
         {
             MWBase::Environment::get().getWorld()->reattachPlayerCamera();
 
@@ -1803,10 +1859,12 @@ namespace MWMechanics
             MWBase::WindowManager* windowManager = MWBase::Environment::get().getWindowManager();
 
             // Transforming removes all temporary effects
-            actor.getClass().getCreatureStats(actor).getActiveSpells().purge([] (const auto& params)
-            {
-                return params.getType() == ESM::ActiveSpells::Type_Consumable || params.getType() == ESM::ActiveSpells::Type_Temporary;
-            }, actor);
+            actor.getClass().getCreatureStats(actor).getActiveSpells().purge(
+                [](const auto& params) {
+                    return params.getType() == ESM::ActiveSpells::Type_Consumable
+                        || params.getType() == ESM::ActiveSpells::Type_Temporary;
+                },
+                actor);
             mActors.updateActor(actor, 0.f);
 
             if (werewolf)
@@ -1827,8 +1885,10 @@ namespace MWMechanics
 
             // Witnesses of the player's transformation will make them a globally known werewolf
             std::vector<MWWorld::Ptr> neighbors;
-            const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
-            getActorsInRange(actor.getRefData().getPosition().asVec3(), gmst.find("fAlarmRadius")->mValue.getFloat(), neighbors);
+            const MWWorld::Store<ESM::GameSetting>& gmst
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+            getActorsInRange(
+                actor.getRefData().getPosition().asVec3(), gmst.find("fAlarmRadius")->mValue.getFloat(), neighbors);
 
             bool detected = false, reported = false;
             for (const MWWorld::Ptr& neighbor : neighbors)
@@ -1839,7 +1899,11 @@ namespace MWMechanics
                 if (MWBase::Environment::get().getWorld()->getLOS(neighbor, actor) && awarenessCheck(actor, neighbor))
                 {
                     detected = true;
-                    if (neighbor.getClass().getCreatureStats(neighbor).getAiSetting(MWMechanics::AiSetting::Alarm).getModified() > 0)
+                    if (neighbor.getClass()
+                            .getCreatureStats(neighbor)
+                            .getAiSetting(MWMechanics::AiSetting::Alarm)
+                            .getModified()
+                        > 0)
                     {
                         reported = true;
                         break;
@@ -1854,22 +1918,22 @@ namespace MWMechanics
 
                 if (reported)
                 {
-                    npcStats.setBounty(npcStats.getBounty()+
-                                       gmst.find("iWereWolfBounty")->mValue.getInteger());
+                    npcStats.setBounty(npcStats.getBounty() + gmst.find("iWereWolfBounty")->mValue.getInteger());
                 }
             }
         }
     }
 
-    void MechanicsManager::applyWerewolfAcrobatics(const MWWorld::Ptr &actor)
+    void MechanicsManager::applyWerewolfAcrobatics(const MWWorld::Ptr& actor)
     {
-        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
-        MWMechanics::NpcStats &stats = actor.getClass().getNpcStats(actor);
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        MWMechanics::NpcStats& stats = actor.getClass().getNpcStats(actor);
         auto& skill = stats.getSkill(ESM::Skill::Acrobatics);
         skill.setModifier(gmst.find("fWerewolfAcrobatics")->mValue.getFloat() - skill.getModified());
     }
 
-    void MechanicsManager::cleanupSummonedCreature(const MWWorld::Ptr &caster, int creatureActorId)
+    void MechanicsManager::cleanupSummonedCreature(const MWWorld::Ptr& caster, int creatureActorId)
     {
         mActors.cleanupSummonedCreature(caster.getClass().getCreatureStats(caster), creatureActorId);
     }
@@ -1880,22 +1944,22 @@ namespace MWMechanics
         stats.setAttribute(frameNumber, "Mechanics Objects", mObjects.size());
     }
 
-    int MechanicsManager::getGreetingTimer(const MWWorld::Ptr &ptr) const
+    int MechanicsManager::getGreetingTimer(const MWWorld::Ptr& ptr) const
     {
         return mActors.getGreetingTimer(ptr);
     }
 
-    float MechanicsManager::getAngleToPlayer(const MWWorld::Ptr &ptr) const
+    float MechanicsManager::getAngleToPlayer(const MWWorld::Ptr& ptr) const
     {
         return mActors.getAngleToPlayer(ptr);
     }
 
-    GreetingState MechanicsManager::getGreetingState(const MWWorld::Ptr &ptr) const
+    GreetingState MechanicsManager::getGreetingState(const MWWorld::Ptr& ptr) const
     {
         return mActors.getGreetingState(ptr);
     }
 
-    bool MechanicsManager::isTurningToPlayer(const MWWorld::Ptr &ptr) const
+    bool MechanicsManager::isTurningToPlayer(const MWWorld::Ptr& ptr) const
     {
         return mActors.isTurningToPlayer(ptr);
     }
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index 3dae0d9a1e..f821319476 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -7,9 +7,9 @@
 
 #include "../mwworld/ptr.hpp"
 
+#include "actors.hpp"
 #include "npcstats.hpp"
 #include "objects.hpp"
-#include "actors.hpp"
 
 namespace MWWorld
 {
@@ -20,223 +20,227 @@ namespace MWMechanics
 {
     class MechanicsManager : public MWBase::MechanicsManager
     {
-            bool mUpdatePlayer;
-            bool mClassSelected;
-            bool mRaceSelected;
-            bool mAI;///< is AI active?
-
-            Objects mObjects;
-            Actors mActors;
+        bool mUpdatePlayer;
+        bool mClassSelected;
+        bool mRaceSelected;
+        bool mAI; ///< is AI active?
 
-            typedef std::pair<std::string, bool> Owner; // < Owner id, bool isFaction >
-            typedef std::map<Owner, int> OwnerMap; // < Owner, number of stolen items with this id from this owner >
-            typedef std::map<std::string, OwnerMap> StolenItemsMap;
-            StolenItemsMap mStolenItems;
+        Objects mObjects;
+        Actors mActors;
 
-        public:
+        typedef std::pair<std::string, bool> Owner; // < Owner id, bool isFaction >
+        typedef std::map<Owner, int> OwnerMap; // < Owner, number of stolen items with this id from this owner >
+        typedef std::map<std::string, OwnerMap> StolenItemsMap;
+        StolenItemsMap mStolenItems;
 
-            void buildPlayer();
-            ///< build player according to stored class/race/birthsign information. Will
-            /// default to the values of the ESM::NPC object, if no explicit information is given.
+    public:
+        void buildPlayer();
+        ///< build player according to stored class/race/birthsign information. Will
+        /// default to the values of the ESM::NPC object, if no explicit information is given.
 
-            MechanicsManager();
+        MechanicsManager();
 
-            void add (const MWWorld::Ptr& ptr) override;
-            ///< Register an object for management
+        void add(const MWWorld::Ptr& ptr) override;
+        ///< Register an object for management
 
-            void remove (const MWWorld::Ptr& ptr, bool keepActive) override;
-            ///< Deregister an object for management
+        void remove(const MWWorld::Ptr& ptr, bool keepActive) override;
+        ///< Deregister an object for management
 
-            void updateCell(const MWWorld::Ptr &old, const MWWorld::Ptr &ptr) override;
-            ///< Moves an object to a new cell
+        void updateCell(const MWWorld::Ptr& old, const MWWorld::Ptr& ptr) override;
+        ///< Moves an object to a new cell
 
-            void drop(const MWWorld::CellStore *cellStore) override;
-            ///< Deregister all objects in the given cell.
+        void drop(const MWWorld::CellStore* cellStore) override;
+        ///< Deregister all objects in the given cell.
 
-            void update(float duration, bool paused);
-            ///< Update objects
-            ///
-            /// \param paused In game type does not currently advance (this usually means some GUI
-            /// component is up).
+        void update(float duration, bool paused);
+        ///< Update objects
+        ///
+        /// \param paused In game type does not currently advance (this usually means some GUI
+        /// component is up).
 
-            void setPlayerName (const std::string& name) override;
-            ///< Set player name.
+        void setPlayerName(const std::string& name) override;
+        ///< Set player name.
 
-            void setPlayerRace (const std::string& id, bool male, const std::string &head, const std::string &hair) override;
-            ///< Set player race.
+        void setPlayerRace(const std::string& id, bool male, const std::string& head, const std::string& hair) override;
+        ///< Set player race.
 
-            void setPlayerBirthsign (const std::string& id) override;
-            ///< Set player birthsign.
+        void setPlayerBirthsign(const std::string& id) override;
+        ///< Set player birthsign.
 
-            void setPlayerClass (const std::string& id) override;
-            ///< Set player class to stock class.
+        void setPlayerClass(const std::string& id) override;
+        ///< Set player class to stock class.
 
-            void setPlayerClass (const ESM::Class& class_) override;
-            ///< Set player class to custom class.
+        void setPlayerClass(const ESM::Class& class_) override;
+        ///< Set player class to custom class.
 
-            void restoreDynamicStats(const MWWorld::Ptr& actor, double hours, bool sleep) override;
+        void restoreDynamicStats(const MWWorld::Ptr& actor, double hours, bool sleep) override;
 
-            void rest(double hours, bool sleep) override;
-            ///< If the player is sleeping or waiting, this should be called every hour.
-            /// @param sleep is the player sleeping or waiting?
+        void rest(double hours, bool sleep) override;
+        ///< If the player is sleeping or waiting, this should be called every hour.
+        /// @param sleep is the player sleeping or waiting?
 
-            int getHoursToRest() const override;
-            ///< Calculate how many hours the player needs to rest in order to be fully healed
+        int getHoursToRest() const override;
+        ///< Calculate how many hours the player needs to rest in order to be fully healed
 
-            int getBarterOffer(const MWWorld::Ptr& ptr,int basePrice, bool buying) override;
-            ///< This is used by every service to determine the price of objects given the trading skills of the player and NPC.
+        int getBarterOffer(const MWWorld::Ptr& ptr, int basePrice, bool buying) override;
+        ///< This is used by every service to determine the price of objects given the trading skills of the player and
+        ///< NPC.
 
-            int getDerivedDisposition(const MWWorld::Ptr& ptr, bool clamp = true) override;
-            ///< Calculate the diposition of an NPC toward the player.
+        int getDerivedDisposition(const MWWorld::Ptr& ptr, bool clamp = true) override;
+        ///< Calculate the diposition of an NPC toward the player.
 
-            int countDeaths (const std::string& id) const override;
-            ///< Return the number of deaths for actors with the given ID.
+        int countDeaths(const std::string& id) const override;
+        ///< Return the number of deaths for actors with the given ID.
 
-            void getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type, bool& success, int& tempChange, int& permChange) override;
-            ///< Perform a persuasion action on NPC
+        void getPersuasionDispositionChange(
+            const MWWorld::Ptr& npc, PersuasionType type, bool& success, int& tempChange, int& permChange) override;
+        ///< Perform a persuasion action on NPC
 
-            /// Check if \a observer is potentially aware of \a ptr. Does not do a line of sight check!
-            bool awarenessCheck (const MWWorld::Ptr& ptr, const MWWorld::Ptr& observer) override;
+        /// Check if \a observer is potentially aware of \a ptr. Does not do a line of sight check!
+        bool awarenessCheck(const MWWorld::Ptr& ptr, const MWWorld::Ptr& observer) override;
 
-            /// Makes \a ptr fight \a target. Also shouts a combat taunt.
-            void startCombat (const MWWorld::Ptr& ptr, const MWWorld::Ptr& target) override;
+        /// Makes \a ptr fight \a target. Also shouts a combat taunt.
+        void startCombat(const MWWorld::Ptr& ptr, const MWWorld::Ptr& target) override;
 
-            void stopCombat(const MWWorld::Ptr& ptr) override;
+        void stopCombat(const MWWorld::Ptr& ptr) override;
 
-            /**
-             * @note victim may be empty
-             * @param arg Depends on \a type, e.g. for Theft, the value of the item that was stolen.
-             * @param victimAware Is the victim already aware of the crime?
-             *                    If this parameter is false, it will be determined by a line-of-sight and awareness check.
-             * @return was the crime seen?
-             */
-            bool commitCrime (const MWWorld::Ptr& ptr, const MWWorld::Ptr& victim,
-                                      OffenseType type, const std::string& factionId="", int arg=0, bool victimAware=false) override;
-            /// @return false if the attack was considered a "friendly hit" and forgiven
-            bool actorAttacked (const MWWorld::Ptr& victim, const MWWorld::Ptr& attacker) override;
+        /**
+         * @note victim may be empty
+         * @param arg Depends on \a type, e.g. for Theft, the value of the item that was stolen.
+         * @param victimAware Is the victim already aware of the crime?
+         *                    If this parameter is false, it will be determined by a line-of-sight and awareness check.
+         * @return was the crime seen?
+         */
+        bool commitCrime(const MWWorld::Ptr& ptr, const MWWorld::Ptr& victim, OffenseType type,
+            const std::string& factionId = "", int arg = 0, bool victimAware = false) override;
+        /// @return false if the attack was considered a "friendly hit" and forgiven
+        bool actorAttacked(const MWWorld::Ptr& victim, const MWWorld::Ptr& attacker) override;
 
-            /// Notify that actor was killed, add a murder bounty if applicable
-            /// @note No-op for non-player attackers
-            void actorKilled (const MWWorld::Ptr& victim, const MWWorld::Ptr& attacker) override;
+        /// Notify that actor was killed, add a murder bounty if applicable
+        /// @note No-op for non-player attackers
+        void actorKilled(const MWWorld::Ptr& victim, const MWWorld::Ptr& attacker) override;
 
-            /// Utility to check if taking this item is illegal and calling commitCrime if so
-            /// @param container The container the item is in; may be empty for an item in the world
-            void itemTaken (const MWWorld::Ptr& ptr, const MWWorld::Ptr& item, const MWWorld::Ptr& container,
-                                    int count, bool alarm = true) override;
-            /// Utility to check if unlocking this object is illegal and calling commitCrime if so
-            void unlockAttempted (const MWWorld::Ptr& ptr, const MWWorld::Ptr& item) override;
-            /// Attempt sleeping in a bed. If this is illegal, call commitCrime.
-            /// @return was it illegal, and someone saw you doing it? Also returns fail when enemies are nearby
-            bool sleepInBed (const MWWorld::Ptr& ptr, const MWWorld::Ptr& bed) override;
+        /// Utility to check if taking this item is illegal and calling commitCrime if so
+        /// @param container The container the item is in; may be empty for an item in the world
+        void itemTaken(const MWWorld::Ptr& ptr, const MWWorld::Ptr& item, const MWWorld::Ptr& container, int count,
+            bool alarm = true) override;
+        /// Utility to check if unlocking this object is illegal and calling commitCrime if so
+        void unlockAttempted(const MWWorld::Ptr& ptr, const MWWorld::Ptr& item) override;
+        /// Attempt sleeping in a bed. If this is illegal, call commitCrime.
+        /// @return was it illegal, and someone saw you doing it? Also returns fail when enemies are nearby
+        bool sleepInBed(const MWWorld::Ptr& ptr, const MWWorld::Ptr& bed) override;
 
-            void forceStateUpdate(const MWWorld::Ptr &ptr) override;
+        void forceStateUpdate(const MWWorld::Ptr& ptr) override;
 
-            /// Attempt to play an animation group
-            /// @return Success or error
-            bool playAnimationGroup(const MWWorld::Ptr& ptr, std::string_view groupName, int mode, int number, bool persist=false) override;
-            void skipAnimation(const MWWorld::Ptr& ptr) override;
-            bool checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string &groupName) override;
-            void persistAnimationStates() override;
+        /// Attempt to play an animation group
+        /// @return Success or error
+        bool playAnimationGroup(
+            const MWWorld::Ptr& ptr, std::string_view groupName, int mode, int number, bool persist = false) override;
+        void skipAnimation(const MWWorld::Ptr& ptr) override;
+        bool checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string& groupName) override;
+        void persistAnimationStates() override;
 
-            /// Update magic effects for an actor. Usually done automatically once per frame, but if we're currently
-            /// paused we may want to do it manually (after equipping permanent enchantment)
-            void updateMagicEffects (const MWWorld::Ptr& ptr) override;
+        /// Update magic effects for an actor. Usually done automatically once per frame, but if we're currently
+        /// paused we may want to do it manually (after equipping permanent enchantment)
+        void updateMagicEffects(const MWWorld::Ptr& ptr) override;
 
-            void getObjectsInRange (const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& objects) override;
-            void getActorsInRange(const osg::Vec3f &position, float radius, std::vector<MWWorld::Ptr> &objects) override;
+        void getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& objects) override;
+        void getActorsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& objects) override;
 
-            /// Check if there are actors in selected range
-            bool isAnyActorInRange(const osg::Vec3f &position, float radius) override;
+        /// Check if there are actors in selected range
+        bool isAnyActorInRange(const osg::Vec3f& position, float radius) override;
 
-            std::vector<MWWorld::Ptr> getActorsSidingWith(const MWWorld::Ptr& actor) override;
-            std::vector<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor) override;
-            std::vector<int> getActorsFollowingIndices(const MWWorld::Ptr& actor) override;
-            std::map<int, MWWorld::Ptr> getActorsFollowingByIndex(const MWWorld::Ptr& actor) override;
+        std::vector<MWWorld::Ptr> getActorsSidingWith(const MWWorld::Ptr& actor) override;
+        std::vector<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor) override;
+        std::vector<int> getActorsFollowingIndices(const MWWorld::Ptr& actor) override;
+        std::map<int, MWWorld::Ptr> getActorsFollowingByIndex(const MWWorld::Ptr& actor) override;
 
-            std::vector<MWWorld::Ptr> getActorsFighting(const MWWorld::Ptr& actor) override;
-            std::vector<MWWorld::Ptr> getEnemiesNearby(const MWWorld::Ptr& actor) override;
+        std::vector<MWWorld::Ptr> getActorsFighting(const MWWorld::Ptr& actor) override;
+        std::vector<MWWorld::Ptr> getEnemiesNearby(const MWWorld::Ptr& actor) override;
 
-            /// Recursive version of getActorsFollowing
-            void getActorsFollowing(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out) override;
-            /// Recursive version of getActorsSidingWith
-            void getActorsSidingWith(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out) override;
+        /// Recursive version of getActorsFollowing
+        void getActorsFollowing(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out) override;
+        /// Recursive version of getActorsSidingWith
+        void getActorsSidingWith(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out) override;
 
-            bool toggleAI() override;
-            bool isAIActive() override;
+        bool toggleAI() override;
+        bool isAIActive() override;
 
-            void playerLoaded() override;
+        void playerLoaded() override;
 
-            bool onOpen(const MWWorld::Ptr& ptr) override;
-            void onClose(const MWWorld::Ptr& ptr) override;
+        bool onOpen(const MWWorld::Ptr& ptr) override;
+        void onClose(const MWWorld::Ptr& ptr) override;
 
-            int countSavedGameRecords() const override;
+        int countSavedGameRecords() const override;
 
-            void write (ESM::ESMWriter& writer, Loading::Listener& listener) const override;
+        void write(ESM::ESMWriter& writer, Loading::Listener& listener) const override;
 
-            void readRecord (ESM::ESMReader& reader, uint32_t type) override;
+        void readRecord(ESM::ESMReader& reader, uint32_t type) override;
 
-            void clear() override;
+        void clear() override;
 
-            bool isAggressive (const MWWorld::Ptr& ptr, const MWWorld::Ptr& target) override;
+        bool isAggressive(const MWWorld::Ptr& ptr, const MWWorld::Ptr& target) override;
 
-            void resurrect(const MWWorld::Ptr& ptr) override;
+        void resurrect(const MWWorld::Ptr& ptr) override;
 
-            bool isCastingSpell (const MWWorld::Ptr& ptr) const override;
+        bool isCastingSpell(const MWWorld::Ptr& ptr) const override;
 
-            bool isReadyToBlock (const MWWorld::Ptr& ptr) const override;
-            /// Is \a ptr casting spell or using weapon now?
-            bool isAttackingOrSpell(const MWWorld::Ptr &ptr) const override;
+        bool isReadyToBlock(const MWWorld::Ptr& ptr) const override;
+        /// Is \a ptr casting spell or using weapon now?
+        bool isAttackingOrSpell(const MWWorld::Ptr& ptr) const override;
 
-            void castSpell(const MWWorld::Ptr& ptr, const std::string& spellId, bool manualSpell=false) override;
+        void castSpell(const MWWorld::Ptr& ptr, const std::string& spellId, bool manualSpell = false) override;
 
-            void processChangedSettings(const Settings::CategorySettingVector& settings) override;
+        void processChangedSettings(const Settings::CategorySettingVector& settings) override;
 
-            float getActorsProcessingRange() const override;
+        float getActorsProcessingRange() const override;
 
-            void notifyDied(const MWWorld::Ptr& actor) override;
+        void notifyDied(const MWWorld::Ptr& actor) override;
 
-            /// Check if the target actor was detected by an observer
-            /// If the observer is a non-NPC, check all actors in AI processing distance as observers
-            bool isActorDetected(const MWWorld::Ptr& actor, const MWWorld::Ptr& observer) override;
+        /// Check if the target actor was detected by an observer
+        /// If the observer is a non-NPC, check all actors in AI processing distance as observers
+        bool isActorDetected(const MWWorld::Ptr& actor, const MWWorld::Ptr& observer) override;
 
-            void confiscateStolenItems (const MWWorld::Ptr& player, const MWWorld::Ptr& targetContainer) override;
+        void confiscateStolenItems(const MWWorld::Ptr& player, const MWWorld::Ptr& targetContainer) override;
 
-            /// List the owners that the player has stolen this item from (the owner can be an NPC or a faction).
-            /// <Owner, item count>
-            std::vector<std::pair<std::string, int> > getStolenItemOwners(const std::string& itemid) override;
+        /// List the owners that the player has stolen this item from (the owner can be an NPC or a faction).
+        /// <Owner, item count>
+        std::vector<std::pair<std::string, int>> getStolenItemOwners(const std::string& itemid) override;
 
-            /// Has the player stolen this item from the given owner?
-            bool isItemStolenFrom(const std::string& itemid, const MWWorld::Ptr& ptr) override;
+        /// Has the player stolen this item from the given owner?
+        bool isItemStolenFrom(const std::string& itemid, const MWWorld::Ptr& ptr) override;
 
-            bool isBoundItem(const MWWorld::Ptr& item) override;
+        bool isBoundItem(const MWWorld::Ptr& item) override;
 
-            /// @return is \a ptr allowed to take/use \a target or is it a crime?
-            bool isAllowedToUse (const MWWorld::Ptr& ptr, const MWWorld::Ptr& target, MWWorld::Ptr& victim) override;
+        /// @return is \a ptr allowed to take/use \a target or is it a crime?
+        bool isAllowedToUse(const MWWorld::Ptr& ptr, const MWWorld::Ptr& target, MWWorld::Ptr& victim) override;
 
-            void setWerewolf(const MWWorld::Ptr& actor, bool werewolf) override;
-            void applyWerewolfAcrobatics(const MWWorld::Ptr& actor) override;
+        void setWerewolf(const MWWorld::Ptr& actor, bool werewolf) override;
+        void applyWerewolfAcrobatics(const MWWorld::Ptr& actor) override;
 
-            void cleanupSummonedCreature(const MWWorld::Ptr& caster, int creatureActorId) override;
+        void cleanupSummonedCreature(const MWWorld::Ptr& caster, int creatureActorId) override;
 
-            void confiscateStolenItemToOwner(const MWWorld::Ptr &player, const MWWorld::Ptr &item, const MWWorld::Ptr& victim, int count) override;
+        void confiscateStolenItemToOwner(
+            const MWWorld::Ptr& player, const MWWorld::Ptr& item, const MWWorld::Ptr& victim, int count) override;
 
-            bool isAttackPreparing(const MWWorld::Ptr& ptr) override;
-            bool isRunning(const MWWorld::Ptr& ptr) override;
-            bool isSneaking(const MWWorld::Ptr& ptr) override;
+        bool isAttackPreparing(const MWWorld::Ptr& ptr) override;
+        bool isRunning(const MWWorld::Ptr& ptr) override;
+        bool isSneaking(const MWWorld::Ptr& ptr) override;
 
-            void reportStats(unsigned int frameNumber, osg::Stats& stats) const override;
+        void reportStats(unsigned int frameNumber, osg::Stats& stats) const override;
 
-            int getGreetingTimer(const MWWorld::Ptr& ptr) const override;
-            float getAngleToPlayer(const MWWorld::Ptr& ptr) const override;
-            GreetingState getGreetingState(const MWWorld::Ptr& ptr) const override;
-            bool isTurningToPlayer(const MWWorld::Ptr& ptr) const override;
+        int getGreetingTimer(const MWWorld::Ptr& ptr) const override;
+        float getAngleToPlayer(const MWWorld::Ptr& ptr) const override;
+        GreetingState getGreetingState(const MWWorld::Ptr& ptr) const override;
+        bool isTurningToPlayer(const MWWorld::Ptr& ptr) const override;
 
-        private:
-            bool canCommitCrimeAgainst(const MWWorld::Ptr& victim, const MWWorld::Ptr& attacker);
-            bool canReportCrime(const MWWorld::Ptr &actor, const MWWorld::Ptr &victim, std::set<MWWorld::Ptr> &playerFollowers);
+    private:
+        bool canCommitCrimeAgainst(const MWWorld::Ptr& victim, const MWWorld::Ptr& attacker);
+        bool canReportCrime(
+            const MWWorld::Ptr& actor, const MWWorld::Ptr& victim, std::set<MWWorld::Ptr>& playerFollowers);
 
-            bool reportCrime (const MWWorld::Ptr& ptr, const MWWorld::Ptr& victim,
-                                      OffenseType type, const std::string& factionId, int arg=0);
+        bool reportCrime(const MWWorld::Ptr& ptr, const MWWorld::Ptr& victim, OffenseType type,
+            const std::string& factionId, int arg = 0);
     };
 }
 
diff --git a/apps/openmw/mwmechanics/movement.hpp b/apps/openmw/mwmechanics/movement.hpp
index 57e106cdec..20606cff45 100644
--- a/apps/openmw/mwmechanics/movement.hpp
+++ b/apps/openmw/mwmechanics/movement.hpp
@@ -27,10 +27,7 @@ namespace MWMechanics
             mIsStrafing = false;
         }
 
-        osg::Vec3f asVec3()
-        {
-            return osg::Vec3f(mPosition[0], mPosition[1], mPosition[2]);
-        }
+        osg::Vec3f asVec3() { return osg::Vec3f(mPosition[0], mPosition[1], mPosition[2]); }
     };
 }
 
diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp
index a89e01259c..2f08019617 100644
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@@ -4,8 +4,8 @@
 #include <sstream>
 
 #include <components/esm3/loadclas.hpp>
-#include <components/esm3/loadgmst.hpp>
 #include <components/esm3/loadfact.hpp>
+#include <components/esm3/loadgmst.hpp>
 #include <components/esm3/npcstats.hpp>
 
 #include <components/misc/strings/format.hpp>
@@ -13,20 +13,20 @@
 #include "../mwworld/esmstore.hpp"
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 MWMechanics::NpcStats::NpcStats()
-    : mDisposition (0)
-, mReputation(0)
-, mCrimeId(-1)
-, mBounty(0)
-, mWerewolfKills (0)
-, mLevelProgress(0)
-, mTimeToStartDrowning(-1.0) // set breath to special value, it will be replaced during actor update
+    : mDisposition(0)
+    , mReputation(0)
+    , mCrimeId(-1)
+    , mBounty(0)
+    , mWerewolfKills(0)
+    , mLevelProgress(0)
+    , mTimeToStartDrowning(-1.0) // set breath to special value, it will be replaced during actor update
     , mIsWerewolf(false)
 {
-    mSkillIncreases.resize (ESM::Attribute::Length, 0);
+    mSkillIncreases.resize(ESM::Attribute::Length, 0);
     mSpecIncreases.resize(3, 0);
 }
 
@@ -40,26 +40,26 @@ void MWMechanics::NpcStats::setBaseDisposition(int disposition)
     mDisposition = disposition;
 }
 
-const MWMechanics::SkillValue& MWMechanics::NpcStats::getSkill (int index) const
+const MWMechanics::SkillValue& MWMechanics::NpcStats::getSkill(int index) const
 {
-    if (index<0 || index>=ESM::Skill::Length)
-        throw std::runtime_error ("skill index out of range");
+    if (index < 0 || index >= ESM::Skill::Length)
+        throw std::runtime_error("skill index out of range");
 
     return mSkill[index];
 }
 
-MWMechanics::SkillValue& MWMechanics::NpcStats::getSkill (int index)
+MWMechanics::SkillValue& MWMechanics::NpcStats::getSkill(int index)
 {
-    if (index<0 || index>=ESM::Skill::Length)
-        throw std::runtime_error ("skill index out of range");
+    if (index < 0 || index >= ESM::Skill::Length)
+        throw std::runtime_error("skill index out of range");
 
     return mSkill[index];
 }
 
-void MWMechanics::NpcStats::setSkill(int index, const MWMechanics::SkillValue &value)
+void MWMechanics::NpcStats::setSkill(int index, const MWMechanics::SkillValue& value)
 {
-    if (index<0 || index>=ESM::Skill::Length)
-        throw std::runtime_error ("skill index out of range");
+    if (index < 0 || index >= ESM::Skill::Length)
+        throw std::runtime_error("skill index out of range");
 
     mSkill[index] = value;
 }
@@ -86,8 +86,9 @@ void MWMechanics::NpcStats::raiseRank(std::string_view faction)
     if (it != mFactionRank.end())
     {
         // Does the next rank exist?
-        const ESM::Faction* factionPtr = MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(lower);
-        if (it->second+1 < 10 && !factionPtr->mRanks[it->second+1].empty())
+        const ESM::Faction* factionPtr
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(lower);
+        if (it->second + 1 < 10 && !factionPtr->mRanks[it->second + 1].empty())
             it->second += 1;
     }
 }
@@ -98,7 +99,7 @@ void MWMechanics::NpcStats::lowerRank(std::string_view faction)
     std::map<std::string, int>::iterator it = mFactionRank.find(lower);
     if (it != mFactionRank.end())
     {
-        it->second = it->second-1;
+        it->second = it->second - 1;
         if (it->second < 0)
         {
             mFactionRank.erase(it);
@@ -144,9 +145,9 @@ bool MWMechanics::NpcStats::isInFaction(std::string_view faction) const
 
 int MWMechanics::NpcStats::getFactionReputation(std::string_view faction) const
 {
-    std::map<std::string, int>::const_iterator iter = mFactionReputation.find (Misc::StringUtils::lowerCase(faction));
+    std::map<std::string, int>::const_iterator iter = mFactionReputation.find(Misc::StringUtils::lowerCase(faction));
 
-    if (iter==mFactionReputation.end())
+    if (iter == mFactionReputation.end())
         return 0;
 
     return iter->second;
@@ -157,91 +158,90 @@ void MWMechanics::NpcStats::setFactionReputation(std::string_view faction, int v
     mFactionReputation[Misc::StringUtils::lowerCase(faction)] = value;
 }
 
-float MWMechanics::NpcStats::getSkillProgressRequirement (int skillIndex, const ESM::Class& class_) const
+float MWMechanics::NpcStats::getSkillProgressRequirement(int skillIndex, const ESM::Class& class_) const
 {
     float progressRequirement = static_cast<float>(1 + getSkill(skillIndex).getBase());
 
-    const MWWorld::Store<ESM::GameSetting> &gmst =
-        MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+    const MWWorld::Store<ESM::GameSetting>& gmst
+        = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
-    float typeFactor = gmst.find ("fMiscSkillBonus")->mValue.getFloat();
+    float typeFactor = gmst.find("fMiscSkillBonus")->mValue.getFloat();
 
-    for (int i=0; i<5; ++i)
+    for (int i = 0; i < 5; ++i)
     {
-        if (class_.mData.mSkills[i][0]==skillIndex)
+        if (class_.mData.mSkills[i][0] == skillIndex)
         {
-            typeFactor = gmst.find ("fMinorSkillBonus")->mValue.getFloat();
+            typeFactor = gmst.find("fMinorSkillBonus")->mValue.getFloat();
             break;
         }
-        else if (class_.mData.mSkills[i][1]==skillIndex)
+        else if (class_.mData.mSkills[i][1] == skillIndex)
         {
-            typeFactor = gmst.find ("fMajorSkillBonus")->mValue.getFloat();
+            typeFactor = gmst.find("fMajorSkillBonus")->mValue.getFloat();
             break;
         }
     }
 
     progressRequirement *= typeFactor;
 
-    if (typeFactor<=0)
-        throw std::runtime_error ("invalid skill type factor");
+    if (typeFactor <= 0)
+        throw std::runtime_error("invalid skill type factor");
 
     float specialisationFactor = 1;
 
-    const ESM::Skill *skill =
-        MWBase::Environment::get().getWorld()->getStore().get<ESM::Skill>().find (skillIndex);
-    if (skill->mData.mSpecialization==class_.mData.mSpecialization)
+    const ESM::Skill* skill = MWBase::Environment::get().getWorld()->getStore().get<ESM::Skill>().find(skillIndex);
+    if (skill->mData.mSpecialization == class_.mData.mSpecialization)
     {
-        specialisationFactor = gmst.find ("fSpecialSkillBonus")->mValue.getFloat();
+        specialisationFactor = gmst.find("fSpecialSkillBonus")->mValue.getFloat();
 
-        if (specialisationFactor<=0)
-            throw std::runtime_error ("invalid skill specialisation factor");
+        if (specialisationFactor <= 0)
+            throw std::runtime_error("invalid skill specialisation factor");
     }
     progressRequirement *= specialisationFactor;
 
     return progressRequirement;
 }
 
-void MWMechanics::NpcStats::useSkill (int skillIndex, const ESM::Class& class_, int usageType, float extraFactor)
+void MWMechanics::NpcStats::useSkill(int skillIndex, const ESM::Class& class_, int usageType, float extraFactor)
 {
-    const ESM::Skill *skill =
-        MWBase::Environment::get().getWorld()->getStore().get<ESM::Skill>().find (skillIndex);
+    const ESM::Skill* skill = MWBase::Environment::get().getWorld()->getStore().get<ESM::Skill>().find(skillIndex);
     float skillGain = 1;
-    if (usageType>=4)
-        throw std::runtime_error ("skill usage type out of range");
-    if (usageType>=0)
+    if (usageType >= 4)
+        throw std::runtime_error("skill usage type out of range");
+    if (usageType >= 0)
     {
         skillGain = skill->mData.mUseValue[usageType];
-        if (skillGain<0)
-            throw std::runtime_error ("invalid skill gain factor");
+        if (skillGain < 0)
+            throw std::runtime_error("invalid skill gain factor");
     }
     skillGain *= extraFactor;
 
-    MWMechanics::SkillValue& value = getSkill (skillIndex);
+    MWMechanics::SkillValue& value = getSkill(skillIndex);
 
     value.setProgress(value.getProgress() + skillGain);
 
-    if (int(value.getProgress())>=int(getSkillProgressRequirement(skillIndex, class_)))
+    if (int(value.getProgress()) >= int(getSkillProgressRequirement(skillIndex, class_)))
     {
         // skill levelled up
         increaseSkill(skillIndex, class_, false);
     }
 }
 
-void MWMechanics::NpcStats::increaseSkill(int skillIndex, const ESM::Class &class_, bool preserveProgress, bool readBook)
+void MWMechanics::NpcStats::increaseSkill(
+    int skillIndex, const ESM::Class& class_, bool preserveProgress, bool readBook)
 {
-    float base = getSkill (skillIndex).getBase();
+    float base = getSkill(skillIndex).getBase();
 
     if (base >= 100.f)
         return;
 
     base += 1;
 
-    const MWWorld::Store<ESM::GameSetting> &gmst =
-        MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+    const MWWorld::Store<ESM::GameSetting>& gmst
+        = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
     // is this a minor or major skill?
     int increase = gmst.find("iLevelupMiscMultAttriubte")->mValue.getInteger(); // Note: GMST has a typo
-    for (int k=0; k<5; ++k)
+    for (int k = 0; k < 5; ++k)
     {
         if (class_.mData.mSkills[k][0] == skillIndex)
         {
@@ -257,8 +257,7 @@ void MWMechanics::NpcStats::increaseSkill(int skillIndex, const ESM::Class &clas
         }
     }
 
-    const ESM::Skill* skill =
-        MWBase::Environment::get().getWorld ()->getStore ().get<ESM::Skill>().find(skillIndex);
+    const ESM::Skill* skill = MWBase::Environment::get().getWorld()->getStore().get<ESM::Skill>().find(skillIndex);
     mSkillIncreases[skill->mData.mAttribute] += increase;
 
     mSpecIncreases[skill->mData.mSpecialization] += gmst.find("iLevelupSpecialization")->mValue.getInteger();
@@ -267,39 +266,40 @@ void MWMechanics::NpcStats::increaseSkill(int skillIndex, const ESM::Class &clas
     /// \todo check if character is the player, if levelling is ever implemented for NPCs
     MWBase::Environment::get().getWindowManager()->playSound("skillraise");
 
-    std::string message{MWBase::Environment::get().getWindowManager()->getGameSettingString("sNotifyMessage39", {})};
-    message = Misc::StringUtils::format(message, ("#{" + ESM::Skill::sSkillNameIds[skillIndex] + "}"), static_cast<int>(base));
+    std::string message{ MWBase::Environment::get().getWindowManager()->getGameSettingString("sNotifyMessage39", {}) };
+    message = Misc::StringUtils::format(
+        message, ("#{" + ESM::Skill::sSkillNameIds[skillIndex] + "}"), static_cast<int>(base));
 
     if (readBook)
         message = "#{sBookSkillMessage}\n" + message;
-    
-    MWBase::Environment::get().getWindowManager ()->messageBox(message, MWGui::ShowInDialogueMode_Never);
+
+    MWBase::Environment::get().getWindowManager()->messageBox(message, MWGui::ShowInDialogueMode_Never);
 
     if (mLevelProgress >= gmst.find("iLevelUpTotal")->mValue.getInteger())
     {
         // levelup is possible now
-        MWBase::Environment::get().getWindowManager ()->messageBox ("#{sLevelUpMsg}", MWGui::ShowInDialogueMode_Never);
+        MWBase::Environment::get().getWindowManager()->messageBox("#{sLevelUpMsg}", MWGui::ShowInDialogueMode_Never);
     }
 
-    getSkill(skillIndex).setBase (base);
+    getSkill(skillIndex).setBase(base);
     if (!preserveProgress)
         getSkill(skillIndex).setProgress(0);
 }
 
-int MWMechanics::NpcStats::getLevelProgress () const
+int MWMechanics::NpcStats::getLevelProgress() const
 {
     return mLevelProgress;
 }
 
 void MWMechanics::NpcStats::levelUp()
 {
-    const MWWorld::Store<ESM::GameSetting> &gmst =
-        MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+    const MWWorld::Store<ESM::GameSetting>& gmst
+        = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
     mLevelProgress -= gmst.find("iLevelUpTotal")->mValue.getInteger();
     mLevelProgress = std::max(0, mLevelProgress); // might be necessary when levelup was invoked via console
 
-    for (int i=0; i<ESM::Attribute::Length; ++i)
+    for (int i = 0; i < ESM::Attribute::Length; ++i)
         mSkillIncreases[i] = 0;
 
     const float endurance = getAttribute(ESM::Attribute::Endurance).getBase();
@@ -314,7 +314,7 @@ void MWMechanics::NpcStats::levelUp()
     health.setCurrent(std::max(1.f, getHealth().getCurrent() + healthGain));
     setHealth(health);
 
-    setLevel(getLevel()+1);
+    setLevel(getLevel() + 1);
 }
 
 void MWMechanics::NpcStats::updateHealth()
@@ -338,7 +338,12 @@ int MWMechanics::NpcStats::getLevelupAttributeMultiplier(int attribute) const
     std::stringstream gmst;
     gmst << "iLevelUp" << std::setfill('0') << std::setw(2) << num << "Mult";
 
-    return MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(gmst.str())->mValue.getInteger();
+    return MWBase::Environment::get()
+        .getWorld()
+        ->getStore()
+        .get<ESM::GameSetting>()
+        .find(gmst.str())
+        ->mValue.getInteger();
 }
 
 int MWMechanics::NpcStats::getSkillIncreasesForSpecialization(int spec) const
@@ -346,14 +351,14 @@ int MWMechanics::NpcStats::getSkillIncreasesForSpecialization(int spec) const
     return mSpecIncreases[spec];
 }
 
-void MWMechanics::NpcStats::flagAsUsed (const std::string& id)
+void MWMechanics::NpcStats::flagAsUsed(const std::string& id)
 {
-    mUsedIds.insert (id);
+    mUsedIds.insert(id);
 }
 
-bool MWMechanics::NpcStats::hasBeenUsed (const std::string& id) const
+bool MWMechanics::NpcStats::hasBeenUsed(const std::string& id) const
 {
-    return mUsedIds.find (id)!=mUsedIds.end();
+    return mUsedIds.find(id) != mUsedIds.end();
 }
 
 int MWMechanics::NpcStats::getBounty() const
@@ -361,7 +366,7 @@ int MWMechanics::NpcStats::getBounty() const
     return mBounty;
 }
 
-void MWMechanics::NpcStats::setBounty (int bounty)
+void MWMechanics::NpcStats::setBounty(int bounty)
 {
     mBounty = bounty;
 }
@@ -389,44 +394,44 @@ void MWMechanics::NpcStats::setCrimeId(int id)
 
 bool MWMechanics::NpcStats::hasSkillsForRank(std::string_view factionId, int rank) const
 {
-    if (rank<0 || rank>=10)
-        throw std::runtime_error ("rank index out of range");
+    if (rank < 0 || rank >= 10)
+        throw std::runtime_error("rank index out of range");
 
-    const ESM::Faction& faction =
-        *MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find (factionId);
+    const ESM::Faction& faction
+        = *MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(factionId);
 
     std::vector<int> skills;
 
-    for (int i=0; i<7; ++i)
+    for (int i = 0; i < 7; ++i)
     {
         if (faction.mData.mSkills[i] != -1)
-            skills.push_back (static_cast<int> (getSkill (faction.mData.mSkills[i]).getBase()));
+            skills.push_back(static_cast<int>(getSkill(faction.mData.mSkills[i]).getBase()));
     }
 
     if (skills.empty())
         return true;
 
-    std::sort (skills.begin(), skills.end());
+    std::sort(skills.begin(), skills.end());
 
     std::vector<int>::const_reverse_iterator iter = skills.rbegin();
 
     const ESM::RankData& rankData = faction.mData.mRankData[rank];
 
-    if (*iter<rankData.mPrimarySkill)
+    if (*iter < rankData.mPrimarySkill)
         return false;
 
     if (skills.size() < 2)
         return true;
 
     iter++;
-    if (*iter<rankData.mFavouredSkill)
+    if (*iter < rankData.mFavouredSkill)
         return false;
 
     if (skills.size() < 3)
         return true;
 
     iter++;
-    if (*iter<rankData.mFavouredSkill)
+    if (*iter < rankData.mFavouredSkill)
         return false;
 
     return true;
@@ -437,12 +442,12 @@ bool MWMechanics::NpcStats::isWerewolf() const
     return mIsWerewolf;
 }
 
-void MWMechanics::NpcStats::setWerewolf (bool set)
+void MWMechanics::NpcStats::setWerewolf(bool set)
 {
     if (mIsWerewolf == set)
         return;
 
-    if(set != false)
+    if (set != false)
     {
         mWerewolfKills = 0;
     }
@@ -466,24 +471,23 @@ float MWMechanics::NpcStats::getTimeToStartDrowning() const
 
 void MWMechanics::NpcStats::setTimeToStartDrowning(float time)
 {
-    mTimeToStartDrowning=time;
+    mTimeToStartDrowning = time;
 }
 
-void MWMechanics::NpcStats::writeState (ESM::CreatureStats& state) const
+void MWMechanics::NpcStats::writeState(ESM::CreatureStats& state) const
 {
     CreatureStats::writeState(state);
 }
 
-void MWMechanics::NpcStats::writeState (ESM::NpcStats& state) const
+void MWMechanics::NpcStats::writeState(ESM::NpcStats& state) const
 {
-    for (std::map<std::string, int>::const_iterator iter (mFactionRank.begin());
-        iter!=mFactionRank.end(); ++iter)
+    for (std::map<std::string, int>::const_iterator iter(mFactionRank.begin()); iter != mFactionRank.end(); ++iter)
         state.mFactions[iter->first].mRank = iter->second;
 
     state.mDisposition = mDisposition;
 
-    for (int i=0; i<ESM::Skill::Length; ++i)
-        mSkill[i].writeState (state.mSkills[i]);
+    for (int i = 0; i < ESM::Skill::Length; ++i)
+        mSkill[i].writeState(state.mSkills[i]);
 
     state.mIsWerewolf = mIsWerewolf;
 
@@ -491,43 +495,42 @@ void MWMechanics::NpcStats::writeState (ESM::NpcStats& state) const
 
     state.mBounty = mBounty;
 
-    for (std::set<std::string>::const_iterator iter (mExpelled.begin());
-        iter!=mExpelled.end(); ++iter)
+    for (std::set<std::string>::const_iterator iter(mExpelled.begin()); iter != mExpelled.end(); ++iter)
         state.mFactions[*iter].mExpelled = true;
 
-    for (std::map<std::string, int>::const_iterator iter (mFactionReputation.begin());
-        iter!=mFactionReputation.end(); ++iter)
+    for (std::map<std::string, int>::const_iterator iter(mFactionReputation.begin()); iter != mFactionReputation.end();
+         ++iter)
         state.mFactions[iter->first].mReputation = iter->second;
 
     state.mReputation = mReputation;
     state.mWerewolfKills = mWerewolfKills;
     state.mLevelProgress = mLevelProgress;
 
-    for (int i=0; i<ESM::Attribute::Length; ++i)
+    for (int i = 0; i < ESM::Attribute::Length; ++i)
         state.mSkillIncrease[i] = mSkillIncreases[i];
 
-    for (int i=0; i<3; ++i)
+    for (int i = 0; i < 3; ++i)
         state.mSpecIncreases[i] = mSpecIncreases[i];
 
-    std::copy (mUsedIds.begin(), mUsedIds.end(), std::back_inserter (state.mUsedIds));
+    std::copy(mUsedIds.begin(), mUsedIds.end(), std::back_inserter(state.mUsedIds));
 
     state.mTimeToStartDrowning = mTimeToStartDrowning;
 }
-void MWMechanics::NpcStats::readState (const ESM::CreatureStats& state)
+void MWMechanics::NpcStats::readState(const ESM::CreatureStats& state)
 {
     CreatureStats::readState(state);
 }
 
-void MWMechanics::NpcStats::readState (const ESM::NpcStats& state)
+void MWMechanics::NpcStats::readState(const ESM::NpcStats& state)
 {
     const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
 
-    for (std::map<std::string, ESM::NpcStats::Faction>::const_iterator iter (state.mFactions.begin());
-        iter!=state.mFactions.end(); ++iter)
-        if (store.get<ESM::Faction>().search (iter->first))
+    for (std::map<std::string, ESM::NpcStats::Faction>::const_iterator iter(state.mFactions.begin());
+         iter != state.mFactions.end(); ++iter)
+        if (store.get<ESM::Faction>().search(iter->first))
         {
             if (iter->second.mExpelled)
-                mExpelled.insert (iter->first);
+                mExpelled.insert(iter->first);
 
             if (iter->second.mRank >= 0)
                 mFactionRank[iter->first] = iter->second.mRank;
@@ -538,8 +541,8 @@ void MWMechanics::NpcStats::readState (const ESM::NpcStats& state)
 
     mDisposition = state.mDisposition;
 
-    for (int i=0; i<ESM::Skill::Length; ++i)
-        mSkill[i].readState (state.mSkills[i]);
+    for (int i = 0; i < ESM::Skill::Length; ++i)
+        mSkill[i].readState(state.mSkills[i]);
 
     mIsWerewolf = state.mIsWerewolf;
 
@@ -549,16 +552,15 @@ void MWMechanics::NpcStats::readState (const ESM::NpcStats& state)
     mWerewolfKills = state.mWerewolfKills;
     mLevelProgress = state.mLevelProgress;
 
-    for (int i=0; i<ESM::Attribute::Length; ++i)
+    for (int i = 0; i < ESM::Attribute::Length; ++i)
         mSkillIncreases[i] = state.mSkillIncrease[i];
 
-    for (int i=0; i<3; ++i)
+    for (int i = 0; i < 3; ++i)
         mSpecIncreases[i] = state.mSpecIncreases[i];
 
-    for (std::vector<std::string>::const_iterator iter (state.mUsedIds.begin());
-        iter!=state.mUsedIds.end(); ++iter)
-        if (store.find (*iter))
-            mUsedIds.insert (*iter);
+    for (std::vector<std::string>::const_iterator iter(state.mUsedIds.begin()); iter != state.mUsedIds.end(); ++iter)
+        if (store.find(*iter))
+            mUsedIds.insert(*iter);
 
     mTimeToStartDrowning = state.mTimeToStartDrowning;
 }
diff --git a/apps/openmw/mwmechanics/npcstats.hpp b/apps/openmw/mwmechanics/npcstats.hpp
index 1e83208f06..6b8e73d615 100644
--- a/apps/openmw/mwmechanics/npcstats.hpp
+++ b/apps/openmw/mwmechanics/npcstats.hpp
@@ -20,118 +20,119 @@ namespace MWMechanics
 
     class NpcStats : public CreatureStats
     {
-            int mDisposition;
-            SkillValue mSkill[ESM::Skill::Length]; // SkillValue.mProgress used by the player only
+        int mDisposition;
+        SkillValue mSkill[ESM::Skill::Length]; // SkillValue.mProgress used by the player only
 
-            int mReputation;
-            int mCrimeId;
+        int mReputation;
+        int mCrimeId;
 
-            // ----- used by the player only, maybe should be moved at some point -------
-            int mBounty;
-            int mWerewolfKills;
-            /// Used only for the player and for NPC's with ranks, modified by scripts; other NPCs have maximum one faction defined in their NPC record
-            std::map<std::string, int> mFactionRank;
-            std::set<std::string> mExpelled;
-            std::map<std::string, int> mFactionReputation;
-            int mLevelProgress; // 0-10
-            std::vector<int> mSkillIncreases; // number of skill increases for each attribute (resets after leveling up)
-            std::vector<int> mSpecIncreases; // number of skill increases for each specialization (accumulates throughout the entire game)
-            std::set<std::string> mUsedIds;
-            // ---------------------------------------------------------------------------
+        // ----- used by the player only, maybe should be moved at some point -------
+        int mBounty;
+        int mWerewolfKills;
+        /// Used only for the player and for NPC's with ranks, modified by scripts; other NPCs have maximum one faction
+        /// defined in their NPC record
+        std::map<std::string, int> mFactionRank;
+        std::set<std::string> mExpelled;
+        std::map<std::string, int> mFactionReputation;
+        int mLevelProgress; // 0-10
+        std::vector<int> mSkillIncreases; // number of skill increases for each attribute (resets after leveling up)
+        std::vector<int> mSpecIncreases; // number of skill increases for each specialization (accumulates throughout
+                                         // the entire game)
+        std::set<std::string> mUsedIds;
+        // ---------------------------------------------------------------------------
 
-            /// Countdown to getting damage while underwater
-            float mTimeToStartDrowning;
+        /// Countdown to getting damage while underwater
+        float mTimeToStartDrowning;
 
-            bool mIsWerewolf;
+        bool mIsWerewolf;
 
-        public:
+    public:
+        NpcStats();
 
-            NpcStats();
+        int getBaseDisposition() const;
+        void setBaseDisposition(int disposition);
 
-            int getBaseDisposition() const;
-            void setBaseDisposition(int disposition);
+        int getReputation() const;
+        void setReputation(int reputation);
 
-            int getReputation() const;
-            void setReputation(int reputation);
+        int getCrimeId() const;
+        void setCrimeId(int id);
 
-            int getCrimeId() const;
-            void setCrimeId(int id);
+        const SkillValue& getSkill(int index) const;
+        SkillValue& getSkill(int index);
+        void setSkill(int index, const SkillValue& value);
 
-            const SkillValue& getSkill (int index) const;
-            SkillValue& getSkill (int index);
-            void setSkill(int index, const SkillValue& value);
+        int getFactionRank(std::string_view faction) const;
+        const std::map<std::string, int>& getFactionRanks() const;
 
-            int getFactionRank(std::string_view faction) const;
-            const std::map<std::string, int>& getFactionRanks() const;
+        /// Increase the rank in this faction by 1, if such a rank exists.
+        void raiseRank(std::string_view faction);
+        /// Lower the rank in this faction by 1, if such a rank exists.
+        void lowerRank(std::string_view faction);
+        /// Join this faction, setting the initial rank to 0.
+        void joinFaction(std::string_view faction);
 
-            /// Increase the rank in this faction by 1, if such a rank exists.
-            void raiseRank(std::string_view faction);
-            /// Lower the rank in this faction by 1, if such a rank exists.
-            void lowerRank(std::string_view faction);
-            /// Join this faction, setting the initial rank to 0.
-            void joinFaction(std::string_view faction);
+        const std::set<std::string>& getExpelled() const { return mExpelled; }
+        bool getExpelled(std::string_view factionID) const;
+        void expell(std::string_view factionID);
+        void clearExpelled(std::string_view factionID);
 
-            const std::set<std::string>& getExpelled() const { return mExpelled; }
-            bool getExpelled(std::string_view factionID) const;
-            void expell(std::string_view factionID);
-            void clearExpelled(std::string_view factionID);
+        bool isInFaction(std::string_view faction) const;
 
-            bool isInFaction(std::string_view faction) const;
+        float getSkillProgressRequirement(int skillIndex, const ESM::Class& class_) const;
 
-            float getSkillProgressRequirement (int skillIndex, const ESM::Class& class_) const;
+        void useSkill(int skillIndex, const ESM::Class& class_, int usageType = -1, float extraFactor = 1.f);
+        ///< Increase skill by usage.
 
-            void useSkill (int skillIndex, const ESM::Class& class_, int usageType = -1, float extraFactor=1.f);
-            ///< Increase skill by usage.
+        void increaseSkill(int skillIndex, const ESM::Class& class_, bool preserveProgress, bool readBook = false);
 
-            void increaseSkill (int skillIndex, const ESM::Class& class_, bool preserveProgress, bool readBook = false);
+        int getLevelProgress() const;
 
-            int getLevelProgress() const;
+        int getLevelupAttributeMultiplier(int attribute) const;
 
-            int getLevelupAttributeMultiplier(int attribute) const;
+        int getSkillIncreasesForSpecialization(int spec) const;
 
-            int getSkillIncreasesForSpecialization(int spec) const;
+        void levelUp();
 
-            void levelUp();
+        void updateHealth();
+        ///< Calculate health based on endurance and strength.
+        ///  Called at character creation.
 
-            void updateHealth();
-            ///< Calculate health based on endurance and strength.
-            ///  Called at character creation.
+        void flagAsUsed(const std::string& id);
+        ///< @note Id must be lower-case
 
-            void flagAsUsed (const std::string& id);
-            ///< @note Id must be lower-case
+        bool hasBeenUsed(const std::string& id) const;
+        ///< @note Id must be lower-case
 
-            bool hasBeenUsed (const std::string& id) const;
-            ///< @note Id must be lower-case
+        int getBounty() const;
 
-            int getBounty() const;
+        void setBounty(int bounty);
 
-            void setBounty (int bounty);
+        int getFactionReputation(std::string_view faction) const;
 
-            int getFactionReputation(std::string_view faction) const;
+        void setFactionReputation(std::string_view faction, int value);
 
-            void setFactionReputation(std::string_view faction, int value);
+        bool hasSkillsForRank(std::string_view factionId, int rank) const;
 
-            bool hasSkillsForRank(std::string_view factionId, int rank) const;
+        bool isWerewolf() const;
 
-            bool isWerewolf() const;
+        void setWerewolf(bool set);
 
-            void setWerewolf(bool set);
+        int getWerewolfKills() const;
 
-            int getWerewolfKills() const;
+        /// Increments mWerewolfKills by 1.
+        void addWerewolfKill();
 
-            /// Increments mWerewolfKills by 1.
-            void addWerewolfKill();
+        float getTimeToStartDrowning() const;
+        /// Sets time left for the creature to drown if it stays underwater.
+        /// @param time value from [0,20]
+        void setTimeToStartDrowning(float time);
 
-            float getTimeToStartDrowning() const;
-            /// Sets time left for the creature to drown if it stays underwater.
-            /// @param time value from [0,20]
-            void setTimeToStartDrowning(float time);
+        void writeState(ESM::CreatureStats& state) const;
+        void writeState(ESM::NpcStats& state) const;
 
-            void writeState (ESM::CreatureStats& state) const;
-            void writeState (ESM::NpcStats& state) const;
-
-            void readState (const ESM::CreatureStats& state);
-            void readState (const ESM::NpcStats& state);
+        void readState(const ESM::CreatureStats& state);
+        void readState(const ESM::NpcStats& state);
     };
 }
 
diff --git a/apps/openmw/mwmechanics/objects.cpp b/apps/openmw/mwmechanics/objects.cpp
index 2814240db7..a6f9727965 100644
--- a/apps/openmw/mwmechanics/objects.cpp
+++ b/apps/openmw/mwmechanics/objects.cpp
@@ -13,123 +13,125 @@
 namespace MWMechanics
 {
 
-void Objects::addObject(const MWWorld::Ptr& ptr)
-{
-    removeObject(ptr);
-
-    MWRender::Animation *anim = MWBase::Environment::get().getWorld()->getAnimation(ptr);
-    if (anim == nullptr)
-        return;
+    void Objects::addObject(const MWWorld::Ptr& ptr)
+    {
+        removeObject(ptr);
 
-    const auto it = mObjects.emplace(mObjects.end(), ptr, anim);
-    mIndex.emplace(ptr.mRef, it);
-}
+        MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(ptr);
+        if (anim == nullptr)
+            return;
 
-void Objects::removeObject(const MWWorld::Ptr& ptr)
-{
-    const auto iter = mIndex.find(ptr.mRef);
-    if (iter != mIndex.end())
-    {
-        mObjects.erase(iter->second);
-        mIndex.erase(iter);
+        const auto it = mObjects.emplace(mObjects.end(), ptr, anim);
+        mIndex.emplace(ptr.mRef, it);
     }
-}
 
-void Objects::updateObject(const MWWorld::Ptr &old, const MWWorld::Ptr &ptr)
-{
-    const auto iter = mIndex.find(old.mRef);
-    if (iter != mIndex.end())
-        iter->second->updatePtr(ptr);
-}
-
-void Objects::dropObjects (const MWWorld::CellStore *cellStore)
-{
-    for (auto iter = mObjects.begin(); iter != mObjects.end();)
+    void Objects::removeObject(const MWWorld::Ptr& ptr)
     {
-        if (iter->getPtr().getCell() == cellStore)
+        const auto iter = mIndex.find(ptr.mRef);
+        if (iter != mIndex.end())
         {
-            mIndex.erase(iter->getPtr().mRef);
-            iter = mObjects.erase(iter);
+            mObjects.erase(iter->second);
+            mIndex.erase(iter);
         }
-        else
-            ++iter;
     }
-}
 
-void Objects::update(float duration, bool paused)
-{
-    if(!paused)
+    void Objects::updateObject(const MWWorld::Ptr& old, const MWWorld::Ptr& ptr)
     {
-        for (CharacterController& object : mObjects)
-            object.update(duration);
+        const auto iter = mIndex.find(old.mRef);
+        if (iter != mIndex.end())
+            iter->second->updatePtr(ptr);
     }
-    else
+
+    void Objects::dropObjects(const MWWorld::CellStore* cellStore)
     {
-        // We still should play container opening animation in the Container GUI mode.
-        MWGui::GuiMode mode = MWBase::Environment::get().getWindowManager()->getMode();
-        if(mode != MWGui::GM_Container)
-            return;
+        for (auto iter = mObjects.begin(); iter != mObjects.end();)
+        {
+            if (iter->getPtr().getCell() == cellStore)
+            {
+                mIndex.erase(iter->getPtr().mRef);
+                iter = mObjects.erase(iter);
+            }
+            else
+                ++iter;
+        }
+    }
 
-        for (CharacterController& object : mObjects)
+    void Objects::update(float duration, bool paused)
+    {
+        if (!paused)
+        {
+            for (CharacterController& object : mObjects)
+                object.update(duration);
+        }
+        else
         {
-            if (object.getPtr().getType() != ESM::Container::sRecordId)
-                continue;
+            // We still should play container opening animation in the Container GUI mode.
+            MWGui::GuiMode mode = MWBase::Environment::get().getWindowManager()->getMode();
+            if (mode != MWGui::GM_Container)
+                return;
 
-            if (object.isAnimPlaying("containeropen"))
+            for (CharacterController& object : mObjects)
             {
-                object.update(duration);
-                MWBase::Environment::get().getWorld()->updateAnimatedCollisionShape(object.getPtr());
+                if (object.getPtr().getType() != ESM::Container::sRecordId)
+                    continue;
+
+                if (object.isAnimPlaying("containeropen"))
+                {
+                    object.update(duration);
+                    MWBase::Environment::get().getWorld()->updateAnimatedCollisionShape(object.getPtr());
+                }
             }
         }
     }
-}
 
-bool Objects::onOpen(const MWWorld::Ptr& ptr)
-{
-    const auto iter = mIndex.find(ptr.mRef);
-    if (iter != mIndex.end())
-        return iter->second->onOpen();
-    return true;
-}
+    bool Objects::onOpen(const MWWorld::Ptr& ptr)
+    {
+        const auto iter = mIndex.find(ptr.mRef);
+        if (iter != mIndex.end())
+            return iter->second->onOpen();
+        return true;
+    }
 
-void Objects::onClose(const MWWorld::Ptr& ptr)
-{
-    const auto iter = mIndex.find(ptr.mRef);
-    if (iter != mIndex.end())
-        iter->second->onClose();
-}
+    void Objects::onClose(const MWWorld::Ptr& ptr)
+    {
+        const auto iter = mIndex.find(ptr.mRef);
+        if (iter != mIndex.end())
+            iter->second->onClose();
+    }
 
-bool Objects::playAnimationGroup(const MWWorld::Ptr& ptr, std::string_view groupName, int mode, int number, bool persist)
-{
-    const auto iter = mIndex.find(ptr.mRef);
-    if (iter != mIndex.end())
+    bool Objects::playAnimationGroup(
+        const MWWorld::Ptr& ptr, std::string_view groupName, int mode, int number, bool persist)
     {
-        return iter->second->playGroup(groupName, mode, number, persist);
+        const auto iter = mIndex.find(ptr.mRef);
+        if (iter != mIndex.end())
+        {
+            return iter->second->playGroup(groupName, mode, number, persist);
+        }
+        else
+        {
+            Log(Debug::Warning) << "Warning: Objects::playAnimationGroup: Unable to find "
+                                << ptr.getCellRef().getRefId();
+            return false;
+        }
     }
-    else
+    void Objects::skipAnimation(const MWWorld::Ptr& ptr)
     {
-        Log(Debug::Warning) << "Warning: Objects::playAnimationGroup: Unable to find " << ptr.getCellRef().getRefId();
-        return false;
+        const auto iter = mIndex.find(ptr.mRef);
+        if (iter != mIndex.end())
+            iter->second->skipAnim();
     }
-}
-void Objects::skipAnimation(const MWWorld::Ptr& ptr)
-{
-    const auto iter = mIndex.find(ptr.mRef);
-    if (iter != mIndex.end())
-        iter->second->skipAnim();
-}
 
-void Objects::persistAnimationStates()
-{
-    for (CharacterController& object : mObjects)
-        object.persistAnimationState();
-}
+    void Objects::persistAnimationStates()
+    {
+        for (CharacterController& object : mObjects)
+            object.persistAnimationState();
+    }
 
-void Objects::getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out) const
-{
-    for (const CharacterController& object : mObjects)
-        if ((position - object.getPtr().getRefData().getPosition().asVec3()).length2() <= radius * radius)
-            out.push_back(object.getPtr());
-}
+    void Objects::getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out) const
+    {
+        for (const CharacterController& object : mObjects)
+            if ((position - object.getPtr().getRefData().getPosition().asVec3()).length2() <= radius * radius)
+                out.push_back(object.getPtr());
+    }
 
 }
diff --git a/apps/openmw/mwmechanics/objects.hpp b/apps/openmw/mwmechanics/objects.hpp
index 7463093480..8b5962109c 100644
--- a/apps/openmw/mwmechanics/objects.hpp
+++ b/apps/openmw/mwmechanics/objects.hpp
@@ -3,10 +3,10 @@
 
 #include "character.hpp"
 
-#include <string>
+#include <list>
 #include <map>
+#include <string>
 #include <vector>
-#include <list>
 
 namespace osg
 {
@@ -27,16 +27,16 @@ namespace MWMechanics
         std::map<const MWWorld::LiveCellRefBase*, std::list<CharacterController>::iterator> mIndex;
 
     public:
-        void addObject (const MWWorld::Ptr& ptr);
+        void addObject(const MWWorld::Ptr& ptr);
         ///< Register an animated object
 
-        void removeObject (const MWWorld::Ptr& ptr);
+        void removeObject(const MWWorld::Ptr& ptr);
         ///< Deregister an object
 
-        void updateObject(const MWWorld::Ptr &old, const MWWorld::Ptr& ptr);
+        void updateObject(const MWWorld::Ptr& old, const MWWorld::Ptr& ptr);
         ///< Updates an object with a new Ptr
 
-        void dropObjects(const MWWorld::CellStore *cellStore);
+        void dropObjects(const MWWorld::CellStore* cellStore);
         ///< Deregister all objects in the given cell.
 
         void update(float duration, bool paused);
@@ -45,16 +45,14 @@ namespace MWMechanics
         bool onOpen(const MWWorld::Ptr& ptr);
         void onClose(const MWWorld::Ptr& ptr);
 
-        bool playAnimationGroup(const MWWorld::Ptr& ptr, std::string_view groupName, int mode, int number, bool persist=false);
+        bool playAnimationGroup(
+            const MWWorld::Ptr& ptr, std::string_view groupName, int mode, int number, bool persist = false);
         void skipAnimation(const MWWorld::Ptr& ptr);
         void persistAnimationStates();
 
         void getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out) const;
 
-        std::size_t size() const
-        {
-            return mObjects.size();
-        }
+        std::size_t size() const { return mObjects.size(); }
     };
 }
 
diff --git a/apps/openmw/mwmechanics/obstacle.cpp b/apps/openmw/mwmechanics/obstacle.cpp
index c7573c3158..0b59782992 100644
--- a/apps/openmw/mwmechanics/obstacle.cpp
+++ b/apps/openmw/mwmechanics/obstacle.cpp
@@ -2,15 +2,15 @@
 
 #include <array>
 
-#include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/detournavigator/agentbounds.hpp>
 #include <components/esm3/loadbody.hpp>
 #include <components/esm3/loaddoor.hpp>
+#include <components/sceneutil/positionattitudetransform.hpp>
 
-#include "../mwworld/class.hpp"
-#include "../mwworld/cellstore.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/class.hpp"
 
 #include "movement.hpp"
 
@@ -21,17 +21,16 @@ namespace MWMechanics
     static const float DURATION_SAME_SPOT = 1.5f;
     static const float DURATION_TO_EVADE = 0.4f;
 
-    const float ObstacleCheck::evadeDirections[NUM_EVADE_DIRECTIONS][2] =
-    {
-        { 1.0f, 0.0f },     // move to side
-        { 1.0f, -1.0f },    // move to side and backwards
-        { -1.0f, 0.0f },    // move to other side
-        { -1.0f, -1.0f }    // move to side and backwards
+    const float ObstacleCheck::evadeDirections[NUM_EVADE_DIRECTIONS][2] = {
+        { 1.0f, 0.0f }, // move to side
+        { 1.0f, -1.0f }, // move to side and backwards
+        { -1.0f, 0.0f }, // move to other side
+        { -1.0f, -1.0f } // move to side and backwards
     };
 
     bool proximityToDoor(const MWWorld::Ptr& actor, float minDist)
     {
-        if(getNearbyDoor(actor, minDist).isEmpty())
+        if (getNearbyDoor(actor, minDist).isEmpty())
             return false;
         else
             return true;
@@ -39,21 +38,22 @@ namespace MWMechanics
 
     const MWWorld::Ptr getNearbyDoor(const MWWorld::Ptr& actor, float minDist)
     {
-        MWWorld::CellStore *cell = actor.getCell();
+        MWWorld::CellStore* cell = actor.getCell();
 
         // Check all the doors in this cell
         const MWWorld::CellRefList<ESM::Door>& doors = cell->getReadOnlyDoors();
         osg::Vec3f pos(actor.getRefData().getPosition().asVec3());
         pos.z() = 0;
 
-        osg::Vec3f actorDir = (actor.getRefData().getBaseNode()->getAttitude() * osg::Vec3f(0,1,0));
+        osg::Vec3f actorDir = (actor.getRefData().getBaseNode()->getAttitude() * osg::Vec3f(0, 1, 0));
 
         for (const auto& ref : doors.mList)
         {
             osg::Vec3f doorPos(ref.mData.getPosition().asVec3());
 
             // FIXME: cast
-            const MWWorld::Ptr doorPtr = MWWorld::Ptr(&const_cast<MWWorld::LiveCellRef<ESM::Door> &>(ref), actor.getCell());
+            const MWWorld::Ptr doorPtr
+                = MWWorld::Ptr(&const_cast<MWWorld::LiveCellRef<ESM::Door>&>(ref), actor.getCell());
 
             const auto doorState = doorPtr.getClass().getDoorState(doorPtr);
             float doorRot = ref.mData.getPosition().rot[2] - doorPtr.getCellRef().getPosition().rot[2];
@@ -70,7 +70,7 @@ namespace MWMechanics
                 continue;
 
             // Door is not close enough
-            if ((pos - doorPos).length2() > minDist*minDist)
+            if ((pos - doorPos).length2() > minDist * minDist)
                 continue;
 
             return doorPtr; // found, stop searching
@@ -87,17 +87,17 @@ namespace MWMechanics
         const auto maxHalfExtent = std::max(halfExtents.x(), std::max(halfExtents.y(), halfExtents.z()));
         if (ignorePlayer)
         {
-            const std::array ignore {actor, world->getPlayerConstPtr()};
+            const std::array ignore{ actor, world->getPlayerConstPtr() };
             return world->isAreaOccupiedByOtherActor(destination, 2 * maxHalfExtent, ignore, occupyingActors);
         }
-        const std::array ignore {actor};
+        const std::array ignore{ actor };
         return world->isAreaOccupiedByOtherActor(destination, 2 * maxHalfExtent, ignore, occupyingActors);
     }
 
     ObstacleCheck::ObstacleCheck()
-      : mWalkState(WalkState::Initial)
-      , mStateDuration(0)
-      , mEvadeDirectionIndex(0)
+        : mWalkState(WalkState::Initial)
+        , mStateDuration(0)
+        , mEvadeDirectionIndex(0)
     {
     }
 
@@ -180,7 +180,7 @@ namespace MWMechanics
         }
 
         mStateDuration += duration;
-        if(mStateDuration >= DURATION_TO_EVADE)
+        if (mStateDuration >= DURATION_TO_EVADE)
         {
             // tried to evade, assume all is ok and start again
             mWalkState = WalkState::Norm;
diff --git a/apps/openmw/mwmechanics/obstacle.hpp b/apps/openmw/mwmechanics/obstacle.hpp
index 2026f22129..bb11a9d611 100644
--- a/apps/openmw/mwmechanics/obstacle.hpp
+++ b/apps/openmw/mwmechanics/obstacle.hpp
@@ -24,45 +24,45 @@ namespace MWMechanics
     /** \return Pointer to the door, or empty pointer if none exists **/
     const MWWorld::Ptr getNearbyDoor(const MWWorld::Ptr& actor, float minDist);
 
-    bool isAreaOccupiedByOtherActor(const MWWorld::ConstPtr& actor, const osg::Vec3f& destination, bool ignorePlayer = false,
-        std::vector<MWWorld::Ptr>* occupyingActors = nullptr);
+    bool isAreaOccupiedByOtherActor(const MWWorld::ConstPtr& actor, const osg::Vec3f& destination,
+        bool ignorePlayer = false, std::vector<MWWorld::Ptr>* occupyingActors = nullptr);
 
     class ObstacleCheck
     {
-        public:
-            ObstacleCheck();
+    public:
+        ObstacleCheck();
 
-            // Clear the timers and set the state machine to default
-            void clear();
+        // Clear the timers and set the state machine to default
+        void clear();
 
-            bool isEvading() const;
+        bool isEvading() const;
 
-            // Updates internal state, call each frame for moving actor
-            void update(const MWWorld::Ptr& actor, const osg::Vec3f& destination, float duration);
+        // Updates internal state, call each frame for moving actor
+        void update(const MWWorld::Ptr& actor, const osg::Vec3f& destination, float duration);
 
-            // change direction to try to fix "stuck" actor
-            void takeEvasiveAction(MWMechanics::Movement& actorMovement) const;
+        // change direction to try to fix "stuck" actor
+        void takeEvasiveAction(MWMechanics::Movement& actorMovement) const;
 
-        private:
-            osg::Vec3f mPrev;
+    private:
+        osg::Vec3f mPrev;
 
-            // directions to try moving in when get stuck
-            static const float evadeDirections[NUM_EVADE_DIRECTIONS][2];
+        // directions to try moving in when get stuck
+        static const float evadeDirections[NUM_EVADE_DIRECTIONS][2];
 
-            enum class WalkState
-            {
-                Initial,
-                Norm,
-                CheckStuck,
-                Evade
-            };
-            WalkState mWalkState;
+        enum class WalkState
+        {
+            Initial,
+            Norm,
+            CheckStuck,
+            Evade
+        };
+        WalkState mWalkState;
 
-            float mStateDuration;
-            int mEvadeDirectionIndex;
-            float mInitialDistance = 0;
+        float mStateDuration;
+        int mEvadeDirectionIndex;
+        float mInitialDistance = 0;
 
-            void chooseEvasionDirection();
+        void chooseEvasionDirection();
     };
 }
 
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index 9a75585cc1..02dfd17a93 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -5,29 +5,28 @@
 
 #include <osg/io_utils>
 
-#include <components/detournavigator/navigatorutils.hpp>
-#include <components/detournavigator/debug.hpp>
 #include <components/debug/debuglog.hpp>
+#include <components/detournavigator/debug.hpp>
+#include <components/detournavigator/navigatorutils.hpp>
 #include <components/misc/coordinateconverter.hpp>
 #include <components/misc/math.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwphysics/collisiontype.hpp"
 
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
 
-#include "pathgrid.hpp"
 #include "actorutil.hpp"
+#include "pathgrid.hpp"
 
 namespace
 {
     // Chooses a reachable end pathgrid point.  start is assumed reachable.
-    std::pair<int, bool> getClosestReachablePoint(const ESM::Pathgrid* grid,
-                                                  const MWMechanics::PathgridGraph *graph,
-                                                  const osg::Vec3f& pos, int start)
+    std::pair<int, bool> getClosestReachablePoint(
+        const ESM::Pathgrid* grid, const MWMechanics::PathgridGraph* graph, const osg::Vec3f& pos, int start)
     {
         assert(grid && !grid->mPoints.empty());
 
@@ -37,7 +36,7 @@ namespace
         int closestReachableIndex = 0;
         // TODO: if this full scan causes performance problems mapping pathgrid
         //       points to a quadtree may help
-        for(unsigned int counter = 0; counter < grid->mPoints.size(); counter++)
+        for (unsigned int counter = 0; counter < grid->mPoints.size(); counter++)
         {
             float potentialDistBetween = MWMechanics::PathFinder::distanceSquared(grid->mPoints[counter], pos);
             if (potentialDistBetween < closestDistanceReachable)
@@ -63,8 +62,7 @@ namespace
         // allowed nodes if not.  Hence a path needs to be created even if the start
         // and the end points are the same.
 
-        return std::pair<int, bool>
-            (closestReachableIndex, closestReachableIndex == closestIndex);
+        return std::pair<int, bool>(closestReachableIndex, closestReachableIndex == closestIndex);
     }
 
     float sqrDistance(const osg::Vec2f& lhs, const osg::Vec2f& rhs)
@@ -92,7 +90,8 @@ namespace
     }
 
     // Returns true if turn in `p2` is less than 10 degrees and all the 3 points are almost on one line.
-    bool isAlmostStraight(const osg::Vec3f& p1, const osg::Vec3f& p2, const osg::Vec3f& p3, float pointTolerance) {
+    bool isAlmostStraight(const osg::Vec3f& p1, const osg::Vec3f& p2, const osg::Vec3f& p3, float pointTolerance)
+    {
         osg::Vec3f v1 = p1 - p2;
         osg::Vec3f v3 = p3 - p2;
         v1.z() = v3.z() = 0;
@@ -118,7 +117,8 @@ namespace
         bool operator()(const osg::Vec3f& start, const osg::Vec3f& end) const
         {
             const auto position = DetourNavigator::raycast(*mNavigator, mAgentBounds, start, end, mFlags);
-            return position.has_value() && std::abs((position.value() - start).length2() - (end - start).length2()) <= 1;
+            return position.has_value()
+                && std::abs((position.value() - start).length2() - (end - start).length2()) <= 1;
         }
     };
 }
@@ -138,10 +138,12 @@ namespace MWMechanics
         dir.z() = 0;
         dir.normalize();
         float verticalOffset = 200; // instead of '200' here we want the height of the actor
-        osg::Vec3f _from = from + dir*offsetXY + osg::Z_AXIS * verticalOffset;
+        osg::Vec3f _from = from + dir * offsetXY + osg::Z_AXIS * verticalOffset;
 
         // cast up-down ray and find height of hit in world space
-        float h = _from.z() - MWBase::Environment::get().getWorld()->getDistToNearestRayHit(_from, -osg::Z_AXIS, verticalOffset + PATHFIND_Z_REACH + 1);
+        float h = _from.z()
+            - MWBase::Environment::get().getWorld()->getDistToNearestRayHit(
+                _from, -osg::Z_AXIS, verticalOffset + PATHFIND_Z_REACH + 1);
 
         return (std::abs(from.z() - h) <= PATHFIND_Z_REACH);
     }
@@ -190,7 +192,7 @@ namespace MWMechanics
         // Refer to AiWander reseach topic on openmw forums for some background.
         // Maybe there is no pathgrid for this cell.  Just go to destination and let
         // physics take care of any blockages.
-        if(!pathgrid || pathgrid->mPoints.empty())
+        if (!pathgrid || pathgrid->mPoints.empty())
             return;
 
         // NOTE: getClosestPoint expects local coordinates
@@ -205,9 +207,8 @@ namespace MWMechanics
         int startNode = getClosestPoint(pathgrid, startPointInLocalCoords);
 
         osg::Vec3f endPointInLocalCoords(converter.toLocalVec3(endPoint));
-        std::pair<int, bool> endNode = getClosestReachablePoint(pathgrid, &pathgridGraph,
-            endPointInLocalCoords,
-                startNode);
+        std::pair<int, bool> endNode
+            = getClosestReachablePoint(pathgrid, &pathgridGraph, endPointInLocalCoords, startNode);
 
         // if it's shorter for actor to travel from start to end, than to travel from either
         // start or end to nearest pathgrid point, just travel from start to end.
@@ -225,7 +226,7 @@ namespace MWMechanics
         // even if the start and the end points are the same.
         // NOTE: aStarSearch will return an empty path if the start and end
         //       nodes are the same
-        if(startNode == endNode.first)
+        if (startNode == endNode.first)
         {
             ESM::Pathgrid::Point temp(pathgrid->mPoints[startNode]);
             converter.toWorld(temp);
@@ -259,12 +260,10 @@ namespace MWMechanics
             }
 
             // convert supplied path to world coordinates
-            std::transform(path.begin(), path.end(), out,
-                [&] (ESM::Pathgrid::Point& point)
-                {
-                    converter.toWorld(point);
-                    return makeOsgVec3(point);
-                });
+            std::transform(path.begin(), path.end(), out, [&](ESM::Pathgrid::Point& point) {
+                converter.toWorld(point);
+                return makeOsgVec3(point);
+            });
         }
 
         // If endNode found is NOT the closest PathGrid point to the endPoint,
@@ -287,7 +286,7 @@ namespace MWMechanics
     {
         // This should never happen (programmers should have an if statement checking
         // isPathConstructed that prevents this call if otherwise).
-        if(mPath.empty())
+        if (mPath.empty())
             return 0.;
 
         const auto& nextPoint = mPath.front();
@@ -301,7 +300,7 @@ namespace MWMechanics
     {
         // This should never happen (programmers should have an if statement checking
         // isPathConstructed that prevents this call if otherwise).
-        if(mPath.empty())
+        if (mPath.empty())
             return 0.;
 
         const osg::Vec3f dir = mPath.front() - osg::Vec3f(x, y, z);
@@ -319,18 +318,16 @@ namespace MWMechanics
         while (mPath.size() > 1 && sqrDistanceIgnoreZ(mPath.front(), position) < pointTolerance * pointTolerance)
             mPath.pop_front();
 
-        const IsValidShortcut isValidShortcut {
-            MWBase::Environment::get().getWorld()->getNavigator(),
-            agentBounds, flags
-        };
+        const IsValidShortcut isValidShortcut{ MWBase::Environment::get().getWorld()->getNavigator(), agentBounds,
+            flags };
 
         if (shortenIfAlmostStraight)
         {
             while (mPath.size() > 2 && isAlmostStraight(mPath[0], mPath[1], mPath[2], pointTolerance)
-                   && isValidShortcut(mPath[0], mPath[2]))
+                && isValidShortcut(mPath[0], mPath[2]))
                 mPath.erase(mPath.begin() + 1);
             if (mPath.size() > 1 && isAlmostStraight(position, mPath[0], mPath[1], pointTolerance)
-                    && isValidShortcut(position, mPath[1]))
+                && isValidShortcut(position, mPath[1]))
                 mPath.pop_front();
         }
 
@@ -397,9 +394,9 @@ namespace MWMechanics
     }
 
     void PathFinder::buildPath(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
-        const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph, const DetourNavigator::AgentBounds& agentBounds,
-        const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts, float endTolerance,
-        PathType pathType)
+        const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph,
+        const DetourNavigator::AgentBounds& agentBounds, const DetourNavigator::Flags flags,
+        const DetourNavigator::AreaCosts& areaCosts, float endTolerance, PathType pathType)
     {
         mPath.clear();
         mCell = cell;
@@ -408,16 +405,18 @@ namespace MWMechanics
 
         if (!actor.getClass().isPureWaterCreature(actor) && !actor.getClass().isPureFlyingCreature(actor))
         {
-            status = buildPathByNavigatorImpl(actor, startPoint, endPoint, agentBounds, flags, areaCosts,
-                                              endTolerance, pathType, std::back_inserter(mPath));
+            status = buildPathByNavigatorImpl(actor, startPoint, endPoint, agentBounds, flags, areaCosts, endTolerance,
+                pathType, std::back_inserter(mPath));
             if (status != DetourNavigator::Status::Success)
                 mPath.clear();
         }
 
-        if (status != DetourNavigator::Status::NavMeshNotFound && mPath.empty() && (flags & DetourNavigator::Flag_usePathgrid) == 0)
+        if (status != DetourNavigator::Status::NavMeshNotFound && mPath.empty()
+            && (flags & DetourNavigator::Flag_usePathgrid) == 0)
         {
             status = buildPathByNavigatorImpl(actor, startPoint, endPoint, agentBounds,
-                flags | DetourNavigator::Flag_usePathgrid, areaCosts, endTolerance, pathType, std::back_inserter(mPath));
+                flags | DetourNavigator::Flag_usePathgrid, areaCosts, endTolerance, pathType,
+                std::back_inserter(mPath));
             if (status != DetourNavigator::Status::Success)
                 mPath.clear();
         }
@@ -431,16 +430,16 @@ namespace MWMechanics
         mConstructed = !mPath.empty();
     }
 
-    DetourNavigator::Status PathFinder::buildPathByNavigatorImpl(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint,
-        const osg::Vec3f& endPoint, const DetourNavigator::AgentBounds& agentBounds, const DetourNavigator::Flags flags,
-        const DetourNavigator::AreaCosts& areaCosts, float endTolerance, PathType pathType,
-        std::back_insert_iterator<std::deque<osg::Vec3f>> out)
+    DetourNavigator::Status PathFinder::buildPathByNavigatorImpl(const MWWorld::ConstPtr& actor,
+        const osg::Vec3f& startPoint, const osg::Vec3f& endPoint, const DetourNavigator::AgentBounds& agentBounds,
+        const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts, float endTolerance,
+        PathType pathType, std::back_insert_iterator<std::deque<osg::Vec3f>> out)
     {
         const auto world = MWBase::Environment::get().getWorld();
         const auto stepSize = getPathStepSize(actor);
         const auto navigator = world->getNavigator();
-        const auto status = DetourNavigator::findPath(*navigator, agentBounds, stepSize,
-            startPoint, endPoint, flags, areaCosts, endTolerance, out);
+        const auto status = DetourNavigator::findPath(
+            *navigator, agentBounds, stepSize, startPoint, endPoint, flags, areaCosts, endTolerance, out);
 
         if (pathType == PathType::Partial && status == DetourNavigator::Status::PartialPath)
             return DetourNavigator::Status::Success;
@@ -448,9 +447,9 @@ namespace MWMechanics
         if (status != DetourNavigator::Status::Success)
         {
             Log(Debug::Debug) << "Build path by navigator error: \"" << DetourNavigator::getMessage(status)
-                << "\" for \"" << actor.getClass().getName(actor) << "\" (" << actor.getBase()
-                << ") from " << startPoint << " to " << endPoint << " with flags ("
-                << DetourNavigator::WriteFlags {flags} << ")";
+                              << "\" for \"" << actor.getClass().getName(actor) << "\" (" << actor.getBase()
+                              << ") from " << startPoint << " to " << endPoint << " with flags ("
+                              << DetourNavigator::WriteFlags{ flags } << ")";
         }
 
         return status;
@@ -473,8 +472,8 @@ namespace MWMechanics
         std::deque<osg::Vec3f> prePath;
         auto prePathInserter = std::back_inserter(prePath);
         const float endTolerance = 0;
-        const auto status = DetourNavigator::findPath(*navigator, agentBounds, stepSize,
-            startPoint, mPath.front(), flags, areaCosts, endTolerance, prePathInserter);
+        const auto status = DetourNavigator::findPath(*navigator, agentBounds, stepSize, startPoint, mPath.front(),
+            flags, areaCosts, endTolerance, prePathInserter);
 
         if (status == DetourNavigator::Status::NavMeshNotFound)
             return;
@@ -482,9 +481,9 @@ namespace MWMechanics
         if (status != DetourNavigator::Status::Success)
         {
             Log(Debug::Debug) << "Build path by navigator error: \"" << DetourNavigator::getMessage(status)
-                << "\" for \"" << actor.getClass().getName(actor) << "\" (" << actor.getBase()
-                << ") from " << startPoint << " to " << mPath.front() << " with flags ("
-                << DetourNavigator::WriteFlags {flags} << ")";
+                              << "\" for \"" << actor.getClass().getName(actor) << "\" (" << actor.getBase()
+                              << ") from " << startPoint << " to " << mPath.front() << " with flags ("
+                              << DetourNavigator::WriteFlags{ flags } << ")";
             return;
         }
 
@@ -497,21 +496,19 @@ namespace MWMechanics
         std::copy(prePath.rbegin(), prePath.rend(), std::front_inserter(mPath));
     }
 
-    void PathFinder::buildLimitedPath(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
-        const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph,
+    void PathFinder::buildLimitedPath(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint,
+        const osg::Vec3f& endPoint, const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph,
         const DetourNavigator::AgentBounds& agentBounds, const DetourNavigator::Flags flags,
         const DetourNavigator::AreaCosts& areaCosts, float endTolerance, PathType pathType)
     {
         const auto navigator = MWBase::Environment::get().getWorld()->getNavigator();
-        const auto maxDistance = std::min(
-            navigator->getMaxNavmeshAreaRealRadius(),
-            static_cast<float>(Constants::CellSizeInUnits)
-        );
+        const auto maxDistance
+            = std::min(navigator->getMaxNavmeshAreaRealRadius(), static_cast<float>(Constants::CellSizeInUnits));
         const auto startToEnd = endPoint - startPoint;
         const auto distance = startToEnd.length();
         if (distance <= maxDistance)
             return buildPath(actor, startPoint, endPoint, cell, pathgridGraph, agentBounds, flags, areaCosts,
-                             endTolerance, pathType);
+                endTolerance, pathType);
         const auto end = startPoint + startToEnd * maxDistance / distance;
         buildPath(actor, startPoint, end, cell, pathgridGraph, agentBounds, flags, areaCosts, endTolerance, pathType);
     }
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index c07b085e5a..330e9fbb0c 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -1,12 +1,12 @@
 #ifndef GAME_MWMECHANICS_PATHFINDING_H
 #define GAME_MWMECHANICS_PATHFINDING_H
 
-#include <deque>
 #include <cassert>
+#include <deque>
 #include <iterator>
 
-#include <components/detournavigator/flags.hpp>
 #include <components/detournavigator/areatype.hpp>
+#include <components/detournavigator/flags.hpp>
 #include <components/detournavigator/status.hpp>
 #include <components/esm/defs.hpp>
 #include <components/esm3/loadpgrd.hpp>
@@ -30,9 +30,7 @@ namespace MWMechanics
     template <class T>
     inline float distance(const T& lhs, const T& rhs)
     {
-        static_assert(std::is_same<T, osg::Vec2f>::value
-                      || std::is_same<T, osg::Vec3f>::value,
-                      "T is not a position");
+        static_assert(std::is_same<T, osg::Vec2f>::value || std::is_same<T, osg::Vec3f>::value, "T is not a position");
         return (lhs - rhs).length();
     }
 
@@ -83,151 +81,138 @@ namespace MWMechanics
 
     class PathFinder
     {
-        public:
-            PathFinder()
-                : mConstructed(false)
-                , mCell(nullptr)
-            {
-            }
-
-            void clearPath()
+    public:
+        PathFinder()
+            : mConstructed(false)
+            , mCell(nullptr)
+        {
+        }
+
+        void clearPath()
+        {
+            mConstructed = false;
+            mPath.clear();
+            mCell = nullptr;
+        }
+
+        void buildStraightPath(const osg::Vec3f& endPoint);
+
+        void buildPathByPathgrid(const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
+            const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph);
+
+        void buildPathByNavMesh(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint,
+            const osg::Vec3f& endPoint, const DetourNavigator::AgentBounds& agentBounds,
+            const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts, float endTolerance,
+            PathType pathType);
+
+        void buildPath(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
+            const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph,
+            const DetourNavigator::AgentBounds& agentBounds, const DetourNavigator::Flags flags,
+            const DetourNavigator::AreaCosts& areaCosts, float endTolerance, PathType pathType);
+
+        void buildPathByNavMeshToNextPoint(const MWWorld::ConstPtr& actor,
+            const DetourNavigator::AgentBounds& agentBounds, const DetourNavigator::Flags flags,
+            const DetourNavigator::AreaCosts& areaCosts);
+
+        void buildLimitedPath(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
+            const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph,
+            const DetourNavigator::AgentBounds& agentBounds, const DetourNavigator::Flags flags,
+            const DetourNavigator::AreaCosts& areaCosts, float endTolerance, PathType pathType);
+
+        /// Remove front point if exist and within tolerance
+        void update(const osg::Vec3f& position, float pointTolerance, float destinationTolerance,
+            bool shortenIfAlmostStraight, bool canMoveByZ, const DetourNavigator::AgentBounds& agentBounds,
+            const DetourNavigator::Flags flags);
+
+        bool checkPathCompleted() const { return mConstructed && mPath.empty(); }
+
+        /// In radians
+        float getZAngleToNext(float x, float y) const;
+
+        float getXAngleToNext(float x, float y, float z) const;
+
+        bool isPathConstructed() const { return mConstructed && !mPath.empty(); }
+
+        std::size_t getPathSize() const { return mPath.size(); }
+
+        const std::deque<osg::Vec3f>& getPath() const { return mPath; }
+
+        const MWWorld::CellStore* getPathCell() const { return mCell; }
+
+        void addPointToPath(const osg::Vec3f& point)
+        {
+            mConstructed = true;
+            mPath.push_back(point);
+        }
+
+        /// utility function to convert a osg::Vec3f to a Pathgrid::Point
+        static ESM::Pathgrid::Point makePathgridPoint(const osg::Vec3f& v)
+        {
+            return ESM::Pathgrid::Point(static_cast<int>(v[0]), static_cast<int>(v[1]), static_cast<int>(v[2]));
+        }
+
+        /// utility function to convert an ESM::Position to a Pathgrid::Point
+        static ESM::Pathgrid::Point makePathgridPoint(const ESM::Position& p)
+        {
+            return ESM::Pathgrid::Point(
+                static_cast<int>(p.pos[0]), static_cast<int>(p.pos[1]), static_cast<int>(p.pos[2]));
+        }
+
+        static osg::Vec3f makeOsgVec3(const ESM::Pathgrid::Point& p)
+        {
+            return osg::Vec3f(static_cast<float>(p.mX), static_cast<float>(p.mY), static_cast<float>(p.mZ));
+        }
+
+        // Slightly cheaper version for comparisons.
+        // Caller needs to be careful for very short distances (i.e. less than 1)
+        // or when accumuating the results i.e. (a + b)^2 != a^2 + b^2
+        //
+        static float distanceSquared(const ESM::Pathgrid::Point& point, const osg::Vec3f& pos)
+        {
+            return (MWMechanics::PathFinder::makeOsgVec3(point) - pos).length2();
+        }
+
+        // Return the closest pathgrid point index from the specified position
+        // coordinates.  NOTE: Does not check if there is a sensible way to get there
+        // (e.g. a cliff in front).
+        //
+        // NOTE: pos is expected to be in local coordinates, as is grid->mPoints
+        //
+        static int getClosestPoint(const ESM::Pathgrid* grid, const osg::Vec3f& pos)
+        {
+            assert(grid && !grid->mPoints.empty());
+
+            float distanceBetween = distanceSquared(grid->mPoints[0], pos);
+            int closestIndex = 0;
+
+            // TODO: if this full scan causes performance problems mapping pathgrid
+            //       points to a quadtree may help
+            for (unsigned int counter = 1; counter < grid->mPoints.size(); counter++)
             {
-                mConstructed = false;
-                mPath.clear();
-                mCell = nullptr;
-            }
-
-            void buildStraightPath(const osg::Vec3f& endPoint);
-
-            void buildPathByPathgrid(const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
-                const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph);
-
-            void buildPathByNavMesh(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint,
-                const osg::Vec3f& endPoint, const DetourNavigator::AgentBounds& agentBounds,
-                const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts, float endTolerance,
-                PathType pathType);
-
-            void buildPath(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
-                const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph,
-                const DetourNavigator::AgentBounds& agentBounds, const DetourNavigator::Flags flags,
-                const DetourNavigator::AreaCosts& areaCosts, float endTolerance, PathType pathType);
-
-            void buildPathByNavMeshToNextPoint(const MWWorld::ConstPtr& actor, const DetourNavigator::AgentBounds& agentBounds,
-                const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts);
-
-            void buildLimitedPath(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
-                const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph, const DetourNavigator::AgentBounds& agentBounds,
-                const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts, float endTolerance,
-                PathType pathType);
-
-            /// Remove front point if exist and within tolerance
-            void update(const osg::Vec3f& position, float pointTolerance, float destinationTolerance,
-                        bool shortenIfAlmostStraight, bool canMoveByZ, const DetourNavigator::AgentBounds& agentBounds,
-                        const DetourNavigator::Flags flags);
-
-            bool checkPathCompleted() const
-            {
-                return mConstructed && mPath.empty();
-            }
-
-            /// In radians
-            float getZAngleToNext(float x, float y) const;
-
-            float getXAngleToNext(float x, float y, float z) const;
-
-            bool isPathConstructed() const
-            {
-                return mConstructed && !mPath.empty();
-            }
-
-            std::size_t getPathSize() const
-            {
-                return mPath.size();
-            }
-
-            const std::deque<osg::Vec3f>& getPath() const
-            {
-                return mPath;
-            }
-
-            const MWWorld::CellStore* getPathCell() const
-            {
-                return mCell;
-            }
-
-            void addPointToPath(const osg::Vec3f& point)
-            {
-                mConstructed = true;
-                mPath.push_back(point);
-            }
-
-            /// utility function to convert a osg::Vec3f to a Pathgrid::Point
-            static ESM::Pathgrid::Point makePathgridPoint(const osg::Vec3f& v)
-            {
-                return ESM::Pathgrid::Point(static_cast<int>(v[0]), static_cast<int>(v[1]), static_cast<int>(v[2]));
-            }
-
-            /// utility function to convert an ESM::Position to a Pathgrid::Point
-            static ESM::Pathgrid::Point makePathgridPoint(const ESM::Position& p)
-            {
-                return ESM::Pathgrid::Point(static_cast<int>(p.pos[0]), static_cast<int>(p.pos[1]), static_cast<int>(p.pos[2]));
-            }
-
-            static osg::Vec3f makeOsgVec3(const ESM::Pathgrid::Point& p)
-            {
-                return osg::Vec3f(static_cast<float>(p.mX), static_cast<float>(p.mY), static_cast<float>(p.mZ));
-            }
-
-            // Slightly cheaper version for comparisons.
-            // Caller needs to be careful for very short distances (i.e. less than 1)
-            // or when accumuating the results i.e. (a + b)^2 != a^2 + b^2
-            //
-            static float distanceSquared(const ESM::Pathgrid::Point& point, const osg::Vec3f& pos)
-            {
-                return (MWMechanics::PathFinder::makeOsgVec3(point) - pos).length2();
-            }
-
-            // Return the closest pathgrid point index from the specified position
-            // coordinates.  NOTE: Does not check if there is a sensible way to get there
-            // (e.g. a cliff in front).
-            //
-            // NOTE: pos is expected to be in local coordinates, as is grid->mPoints
-            //
-            static int getClosestPoint(const ESM::Pathgrid* grid, const osg::Vec3f& pos)
-            {
-                assert(grid && !grid->mPoints.empty());
-
-                float distanceBetween = distanceSquared(grid->mPoints[0], pos);
-                int closestIndex = 0;
-
-                // TODO: if this full scan causes performance problems mapping pathgrid
-                //       points to a quadtree may help
-                for(unsigned int counter = 1; counter < grid->mPoints.size(); counter++)
+                float potentialDistBetween = distanceSquared(grid->mPoints[counter], pos);
+                if (potentialDistBetween < distanceBetween)
                 {
-                    float potentialDistBetween = distanceSquared(grid->mPoints[counter], pos);
-                    if(potentialDistBetween < distanceBetween)
-                    {
-                        distanceBetween = potentialDistBetween;
-                        closestIndex = counter;
-                    }
+                    distanceBetween = potentialDistBetween;
+                    closestIndex = counter;
                 }
-
-                return closestIndex;
             }
 
-        private:
-            bool mConstructed;
-            std::deque<osg::Vec3f> mPath;
+            return closestIndex;
+        }
+
+    private:
+        bool mConstructed;
+        std::deque<osg::Vec3f> mPath;
 
-            const MWWorld::CellStore* mCell;
+        const MWWorld::CellStore* mCell;
 
-            void buildPathByPathgridImpl(const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
-                const PathgridGraph& pathgridGraph, std::back_insert_iterator<std::deque<osg::Vec3f>> out);
+        void buildPathByPathgridImpl(const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
+            const PathgridGraph& pathgridGraph, std::back_insert_iterator<std::deque<osg::Vec3f>> out);
 
-            [[nodiscard]] DetourNavigator::Status buildPathByNavigatorImpl(const MWWorld::ConstPtr& actor,
-                const osg::Vec3f& startPoint, const osg::Vec3f& endPoint, const DetourNavigator::AgentBounds& agentBounds,
-                const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts, float endTolerance, PathType pathType,
-                std::back_insert_iterator<std::deque<osg::Vec3f>> out);
+        [[nodiscard]] DetourNavigator::Status buildPathByNavigatorImpl(const MWWorld::ConstPtr& actor,
+            const osg::Vec3f& startPoint, const osg::Vec3f& endPoint, const DetourNavigator::AgentBounds& agentBounds,
+            const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts, float endTolerance,
+            PathType pathType, std::back_insert_iterator<std::deque<osg::Vec3f>> out);
     };
 }
 
diff --git a/apps/openmw/mwmechanics/pathgrid.cpp b/apps/openmw/mwmechanics/pathgrid.cpp
index ee1de3b5ad..6cac10c1be 100644
--- a/apps/openmw/mwmechanics/pathgrid.cpp
+++ b/apps/openmw/mwmechanics/pathgrid.cpp
@@ -1,7 +1,7 @@
 #include "pathgrid.hpp"
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
@@ -42,14 +42,14 @@ namespace
     //   - faster but not the shortest path
     float costAStar(const ESM::Pathgrid::Point& a, const ESM::Pathgrid::Point& b)
     {
-        //return distance(a, b);
+        // return distance(a, b);
         return manhattan(a, b);
     }
 }
 
 namespace MWMechanics
 {
-    PathgridGraph::PathgridGraph(const MWWorld::CellStore *cell)
+    PathgridGraph::PathgridGraph(const MWWorld::CellStore* cell)
         : mCell(nullptr)
         , mPathgrid(nullptr)
         , mGraph(0)
@@ -96,40 +96,39 @@ namespace MWMechanics
      *    +---------------->
      *      high cost
      */
-    bool PathgridGraph::load(const MWWorld::CellStore *cell)
+    bool PathgridGraph::load(const MWWorld::CellStore* cell)
     {
-        if(!cell)
+        if (!cell)
             return false;
 
-        if(mIsGraphConstructed)
+        if (mIsGraphConstructed)
             return true;
 
         mCell = cell->getCell();
         mPathgrid = MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(*cell->getCell());
-        if(!mPathgrid)
+        if (!mPathgrid)
             return false;
 
-
         mGraph.resize(mPathgrid->mPoints.size());
-        for(int i = 0; i < static_cast<int> (mPathgrid->mEdges.size()); i++)
+        for (int i = 0; i < static_cast<int>(mPathgrid->mEdges.size()); i++)
         {
             ConnectedPoint neighbour;
-            neighbour.cost = costAStar(mPathgrid->mPoints[mPathgrid->mEdges[i].mV0],
-                                       mPathgrid->mPoints[mPathgrid->mEdges[i].mV1]);
+            neighbour.cost
+                = costAStar(mPathgrid->mPoints[mPathgrid->mEdges[i].mV0], mPathgrid->mPoints[mPathgrid->mEdges[i].mV1]);
             // forward path of the edge
             neighbour.index = mPathgrid->mEdges[i].mV1;
             mGraph[mPathgrid->mEdges[i].mV0].edges.push_back(neighbour);
             // reverse path of the edge
             // NOTE: These are redundant, ESM already contains the required reverse paths
-            //neighbour.index = mPathgrid->mEdges[i].mV0;
-            //mGraph[mPathgrid->mEdges[i].mV1].edges.push_back(neighbour);
+            // neighbour.index = mPathgrid->mEdges[i].mV0;
+            // mGraph[mPathgrid->mEdges[i].mV1].edges.push_back(neighbour);
         }
         buildConnectedPoints();
         mIsGraphConstructed = true;
         return true;
     }
 
-    const ESM::Pathgrid *PathgridGraph::getPathgrid() const
+    const ESM::Pathgrid* PathgridGraph::getPathgrid() const
     {
         return mPathgrid;
     }
@@ -137,38 +136,35 @@ namespace MWMechanics
     // v is the pathgrid point index (some call them vertices)
     void PathgridGraph::recursiveStrongConnect(int v)
     {
-        mSCCPoint[v].first = mSCCIndex;  // index
+        mSCCPoint[v].first = mSCCIndex; // index
         mSCCPoint[v].second = mSCCIndex; // lowlink
         mSCCIndex++;
         mSCCStack.push_back(v);
         int w;
 
-        for(int i = 0; i < static_cast<int> (mGraph[v].edges.size()); i++)
+        for (int i = 0; i < static_cast<int>(mGraph[v].edges.size()); i++)
         {
             w = mGraph[v].edges[i].index;
-            if(mSCCPoint[w].first == -1) // not visited
+            if (mSCCPoint[w].first == -1) // not visited
             {
                 recursiveStrongConnect(w); // recurse
-                mSCCPoint[v].second = std::min(mSCCPoint[v].second,
-                                               mSCCPoint[w].second);
+                mSCCPoint[v].second = std::min(mSCCPoint[v].second, mSCCPoint[w].second);
             }
             else
             {
-                if(find(mSCCStack.begin(), mSCCStack.end(), w) != mSCCStack.end())
-                    mSCCPoint[v].second = std::min(mSCCPoint[v].second,
-                                                   mSCCPoint[w].first);
+                if (find(mSCCStack.begin(), mSCCStack.end(), w) != mSCCStack.end())
+                    mSCCPoint[v].second = std::min(mSCCPoint[v].second, mSCCPoint[w].first);
             }
         }
 
-        if(mSCCPoint[v].second == mSCCPoint[v].first)
-        {   // new component
+        if (mSCCPoint[v].second == mSCCPoint[v].first)
+        { // new component
             do
             {
                 w = mSCCStack.back();
                 mSCCStack.pop_back();
                 mGraph[w].componentId = mSCCId;
-            }
-            while(w != v);
+            } while (w != v);
             mSCCId++;
         }
         return;
@@ -200,15 +196,15 @@ namespace MWMechanics
     void PathgridGraph::buildConnectedPoints()
     {
         // both of these are set to zero in the constructor
-        //mSCCId = 0; // how many strongly connected components in this cell
-        //mSCCIndex = 0;
-        int pointsSize = static_cast<int> (mPathgrid->mPoints.size());
-        mSCCPoint.resize(pointsSize, std::pair<int, int> (-1, -1));
+        // mSCCId = 0; // how many strongly connected components in this cell
+        // mSCCIndex = 0;
+        int pointsSize = static_cast<int>(mPathgrid->mPoints.size());
+        mSCCPoint.resize(pointsSize, std::pair<int, int>(-1, -1));
         mSCCStack.reserve(pointsSize);
 
-        for(int v = 0; v < pointsSize; v++)
+        for (int v = 0; v < pointsSize; v++)
         {
-            if(mSCCPoint[v].first == -1) // undefined (haven't visited)
+            if (mSCCPoint[v].first == -1) // undefined (haven't visited)
                 recursiveStrongConnect(v);
         }
     }
@@ -218,9 +214,9 @@ namespace MWMechanics
         return (mGraph[start].componentId == mGraph[end].componentId);
     }
 
-    void PathgridGraph::getNeighbouringPoints(const int index, ESM::Pathgrid::PointList &nodes) const
+    void PathgridGraph::getNeighbouringPoints(const int index, ESM::Pathgrid::PointList& nodes) const
     {
-        for(int i = 0; i < static_cast<int> (mGraph[index].edges.size()); i++)
+        for (int i = 0; i < static_cast<int>(mGraph[index].edges.size()); i++)
         {
             int neighbourIndex = mGraph[index].edges[i].index;
             if (neighbourIndex != index)
@@ -258,15 +254,15 @@ namespace MWMechanics
     std::deque<ESM::Pathgrid::Point> PathgridGraph::aStarSearch(const int start, const int goal) const
     {
         std::deque<ESM::Pathgrid::Point> path;
-        if(!isPointConnected(start, goal))
+        if (!isPointConnected(start, goal))
         {
             return path; // there is no path, return an empty path
         }
 
-        int graphSize = static_cast<int> (mGraph.size());
-        std::vector<float> gScore (graphSize, -1);
-        std::vector<float> fScore (graphSize, -1);
-        std::vector<int> graphParent (graphSize, -1);
+        int graphSize = static_cast<int>(mGraph.size());
+        std::vector<float> gScore(graphSize, -1);
+        std::vector<float> fScore(graphSize, -1);
+        std::vector<int> graphParent(graphSize, -1);
 
         // gScore & fScore keep costs for each pathgrid point in mPoints
         gScore[start] = 0;
@@ -278,41 +274,38 @@ namespace MWMechanics
 
         int current = -1;
 
-        while(!openset.empty())
+        while (!openset.empty())
         {
             current = openset.front(); // front has the lowest cost
             openset.pop_front();
 
-            if(current == goal)
+            if (current == goal)
                 break;
 
             closedset.push_back(current); // remember we've been here
 
             // check all edges for the current point index
-            for(int j = 0; j < static_cast<int> (mGraph[current].edges.size()); j++)
+            for (int j = 0; j < static_cast<int>(mGraph[current].edges.size()); j++)
             {
-                if(std::find(closedset.begin(), closedset.end(), mGraph[current].edges[j].index) ==
-                   closedset.end())
+                if (std::find(closedset.begin(), closedset.end(), mGraph[current].edges[j].index) == closedset.end())
                 {
                     // not in closedset - i.e. have not traversed this edge destination
                     int dest = mGraph[current].edges[j].index;
                     float tentative_g = gScore[current] + mGraph[current].edges[j].cost;
                     bool isInOpenSet = std::find(openset.begin(), openset.end(), dest) != openset.end();
-                    if(!isInOpenSet
-                        || tentative_g < gScore[dest])
+                    if (!isInOpenSet || tentative_g < gScore[dest])
                     {
                         graphParent[dest] = current;
                         gScore[dest] = tentative_g;
-                        fScore[dest] = tentative_g + costAStar(mPathgrid->mPoints[dest],
-                                                               mPathgrid->mPoints[goal]);
-                        if(!isInOpenSet)
+                        fScore[dest] = tentative_g + costAStar(mPathgrid->mPoints[dest], mPathgrid->mPoints[goal]);
+                        if (!isInOpenSet)
                         {
                             // add this edge to openset, lowest cost goes to the front
                             // TODO: if this causes performance problems a hash table may help
                             std::list<int>::iterator it = openset.begin();
-                            for(it = openset.begin(); it!= openset.end(); ++it)
+                            for (it = openset.begin(); it != openset.end(); ++it)
                             {
-                                if(fScore[*it] > fScore[dest])
+                                if (fScore[*it] > fScore[dest])
                                     break;
                             }
                             openset.insert(it, dest);
@@ -322,11 +315,11 @@ namespace MWMechanics
             }
         }
 
-        if(current != goal)
+        if (current != goal)
             return path; // for some reason couldn't build a path
 
         // reconstruct path to return, using local coordinates
-        while(graphParent[current] != -1)
+        while (graphParent[current] != -1)
         {
             path.push_front(mPathgrid->mPoints[current]);
             current = graphParent[current];
@@ -337,4 +330,3 @@ namespace MWMechanics
         return path;
     }
 }
-
diff --git a/apps/openmw/mwmechanics/pathgrid.hpp b/apps/openmw/mwmechanics/pathgrid.hpp
index dfe958e745..a681033dca 100644
--- a/apps/openmw/mwmechanics/pathgrid.hpp
+++ b/apps/openmw/mwmechanics/pathgrid.hpp
@@ -19,65 +19,64 @@ namespace MWMechanics
 {
     class PathgridGraph
     {
-        public:
-            PathgridGraph(const MWWorld::CellStore* cell);
-
-            bool load(const MWWorld::CellStore *cell);
-
-            const ESM::Pathgrid* getPathgrid() const;
-
-            // returns true if end point is strongly connected (i.e. reachable
-            // from start point) both start and end are pathgrid point indexes
-            bool isPointConnected(const int start, const int end) const;
-
-            // get neighbouring nodes for index node and put them to "nodes" vector
-            void getNeighbouringPoints(const int index, ESM::Pathgrid::PointList &nodes) const;
-
-            // the input parameters are pathgrid point indexes
-            // the output list is in local (internal cells) or world (external
-            // cells) coordinates
-            //
-            // NOTE: if start equals end an empty path is returned
-            std::deque<ESM::Pathgrid::Point> aStarSearch(const int start, const int end) const;
-
-        private:
-
-            const ESM::Cell *mCell;
-            const ESM::Pathgrid *mPathgrid;
-
-            struct ConnectedPoint // edge
-            {
-                int index; // pathgrid point index of neighbour
-                float cost;
-            };
-
-            struct Node // point
-            {
-                int componentId;
-                std::vector<ConnectedPoint> edges; // neighbours
-            };
-
-            // componentId is an integer indicating the groups of connected
-            // pathgrid points (all connected points will have the same value)
-            //
-            // In Seyda Neen there are 3:
-            //
-            //   52, 53 and 54 are one set (enclosed yard)
-            //   48, 49, 50, 51, 84, 85, 86, 87, 88, 89, 90 (ship & office)
-            //   all other pathgrid points are the third set
-            //
-            std::vector<Node> mGraph;
-            bool mIsGraphConstructed;
-
-            // variables used to calculate connected components
-            int mSCCId;
-            int mSCCIndex;
-            std::vector<int> mSCCStack;
-            typedef std::pair<int, int> VPair; // first is index, second is lowlink
-            std::vector<VPair> mSCCPoint;
-            // methods used to calculate connected components
-            void recursiveStrongConnect(int v);
-            void buildConnectedPoints();
+    public:
+        PathgridGraph(const MWWorld::CellStore* cell);
+
+        bool load(const MWWorld::CellStore* cell);
+
+        const ESM::Pathgrid* getPathgrid() const;
+
+        // returns true if end point is strongly connected (i.e. reachable
+        // from start point) both start and end are pathgrid point indexes
+        bool isPointConnected(const int start, const int end) const;
+
+        // get neighbouring nodes for index node and put them to "nodes" vector
+        void getNeighbouringPoints(const int index, ESM::Pathgrid::PointList& nodes) const;
+
+        // the input parameters are pathgrid point indexes
+        // the output list is in local (internal cells) or world (external
+        // cells) coordinates
+        //
+        // NOTE: if start equals end an empty path is returned
+        std::deque<ESM::Pathgrid::Point> aStarSearch(const int start, const int end) const;
+
+    private:
+        const ESM::Cell* mCell;
+        const ESM::Pathgrid* mPathgrid;
+
+        struct ConnectedPoint // edge
+        {
+            int index; // pathgrid point index of neighbour
+            float cost;
+        };
+
+        struct Node // point
+        {
+            int componentId;
+            std::vector<ConnectedPoint> edges; // neighbours
+        };
+
+        // componentId is an integer indicating the groups of connected
+        // pathgrid points (all connected points will have the same value)
+        //
+        // In Seyda Neen there are 3:
+        //
+        //   52, 53 and 54 are one set (enclosed yard)
+        //   48, 49, 50, 51, 84, 85, 86, 87, 88, 89, 90 (ship & office)
+        //   all other pathgrid points are the third set
+        //
+        std::vector<Node> mGraph;
+        bool mIsGraphConstructed;
+
+        // variables used to calculate connected components
+        int mSCCId;
+        int mSCCIndex;
+        std::vector<int> mSCCStack;
+        typedef std::pair<int, int> VPair; // first is index, second is lowlink
+        std::vector<VPair> mSCCPoint;
+        // methods used to calculate connected components
+        void recursiveStrongConnect(int v);
+        void buildConnectedPoints();
     };
 }
 
diff --git a/apps/openmw/mwmechanics/pickpocket.cpp b/apps/openmw/mwmechanics/pickpocket.cpp
index 1b638eadd2..58c871880f 100644
--- a/apps/openmw/mwmechanics/pickpocket.cpp
+++ b/apps/openmw/mwmechanics/pickpocket.cpp
@@ -5,21 +5,21 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
 #include "npcstats.hpp"
 
 namespace MWMechanics
 {
 
-    Pickpocket::Pickpocket(const MWWorld::Ptr &thief, const MWWorld::Ptr &victim)
+    Pickpocket::Pickpocket(const MWWorld::Ptr& thief, const MWWorld::Ptr& victim)
         : mThief(thief)
         , mVictim(victim)
     {
     }
 
-    float Pickpocket::getChanceModifier(const MWWorld::Ptr &ptr, float add)
+    float Pickpocket::getChanceModifier(const MWWorld::Ptr& ptr, float add)
     {
         NpcStats& stats = ptr.getClass().getNpcStats(ptr);
         float agility = stats.getAttribute(ESM::Attribute::Agility).getModified();
@@ -33,13 +33,21 @@ namespace MWMechanics
         float x = getChanceModifier(mThief);
         float y = getChanceModifier(mVictim, valueTerm);
 
-        float t = 2*x - y;
+        float t = 2 * x - y;
 
         float pcSneak = static_cast<float>(mThief.getClass().getSkill(mThief, ESM::Skill::Sneak));
-        int iPickMinChance = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
-                .find("iPickMinChance")->mValue.getInteger();
-        int iPickMaxChance = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
-                .find("iPickMaxChance")->mValue.getInteger();
+        int iPickMinChance = MWBase::Environment::get()
+                                 .getWorld()
+                                 ->getStore()
+                                 .get<ESM::GameSetting>()
+                                 .find("iPickMinChance")
+                                 ->mValue.getInteger();
+        int iPickMaxChance = MWBase::Environment::get()
+                                 .getWorld()
+                                 ->getStore()
+                                 .get<ESM::GameSetting>()
+                                 .find("iPickMaxChance")
+                                 ->mValue.getInteger();
 
         auto& prng = MWBase::Environment::get().getWorld()->getPrng();
         int roll = Misc::Rng::roll0to99(prng);
@@ -57,8 +65,12 @@ namespace MWMechanics
     bool Pickpocket::pick(const MWWorld::Ptr& item, int count)
     {
         float stackValue = static_cast<float>(item.getClass().getValue(item) * count);
-        float fPickPocketMod = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
-                .find("fPickPocketMod")->mValue.getFloat();
+        float fPickPocketMod = MWBase::Environment::get()
+                                   .getWorld()
+                                   ->getStore()
+                                   .get<ESM::GameSetting>()
+                                   .find("fPickPocketMod")
+                                   ->mValue.getFloat();
         float valueTerm = 10 * fPickPocketMod * stackValue;
 
         return getDetected(valueTerm);
diff --git a/apps/openmw/mwmechanics/pickpocket.hpp b/apps/openmw/mwmechanics/pickpocket.hpp
index 0957b7a680..83dbca69c2 100644
--- a/apps/openmw/mwmechanics/pickpocket.hpp
+++ b/apps/openmw/mwmechanics/pickpocket.hpp
@@ -9,18 +9,18 @@ namespace MWMechanics
     class Pickpocket
     {
     public:
-        Pickpocket (const MWWorld::Ptr& thief, const MWWorld::Ptr& victim);
+        Pickpocket(const MWWorld::Ptr& thief, const MWWorld::Ptr& victim);
 
         /// Steal some items
         /// @return Was the thief detected?
-        bool pick (const MWWorld::Ptr& item, int count);
+        bool pick(const MWWorld::Ptr& item, int count);
         /// End the pickpocketing process
         /// @return Was the thief detected?
-        bool finish ();
+        bool finish();
 
     private:
         bool getDetected(float valueTerm);
-        float getChanceModifier(const MWWorld::Ptr& ptr, float add=0);
+        float getChanceModifier(const MWWorld::Ptr& ptr, float add = 0);
         MWWorld::Ptr mThief;
         MWWorld::Ptr mVictim;
     };
diff --git a/apps/openmw/mwmechanics/recharge.cpp b/apps/openmw/mwmechanics/recharge.cpp
index d15b44d298..707edb0930 100644
--- a/apps/openmw/mwmechanics/recharge.cpp
+++ b/apps/openmw/mwmechanics/recharge.cpp
@@ -1,96 +1,108 @@
 #include "recharge.hpp"
 
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadench.hpp>
 #include <components/misc/rng.hpp>
 #include <components/misc/strings/format.hpp>
-#include <components/esm3/loadench.hpp>
-#include <components/esm3/loadcrea.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/containerstore.hpp"
 #include "../mwworld/esmstore.hpp"
 
-#include "creaturestats.hpp"
 #include "actorutil.hpp"
+#include "creaturestats.hpp"
 
 namespace MWMechanics
 {
 
-bool rechargeItem(const MWWorld::Ptr &item, const float maxCharge, const float duration)
-{
-    float charge = item.getCellRef().getEnchantmentCharge();
-    if (charge == -1 || charge == maxCharge)
-        return false;
-
-    static const float fMagicItemRechargePerSecond = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
-                "fMagicItemRechargePerSecond")->mValue.getFloat();
-
-    item.getCellRef().setEnchantmentCharge(std::min(charge + fMagicItemRechargePerSecond * duration, maxCharge));
-    return true;
-}
-
-bool rechargeItem(const MWWorld::Ptr &item, const MWWorld::Ptr &gem)
-{
-    if (!gem.getRefData().getCount())
-        return false;
-
-    MWWorld::Ptr player = MWMechanics::getPlayer();
-    MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
-
-    float luckTerm = 0.1f * stats.getAttribute(ESM::Attribute::Luck).getModified();
-    if (luckTerm < 1 || luckTerm > 10)
-        luckTerm = 1;
-
-    float intelligenceTerm = 0.2f * stats.getAttribute(ESM::Attribute::Intelligence).getModified();
-
-    if (intelligenceTerm > 20)
-        intelligenceTerm = 20;
-    if (intelligenceTerm < 1)
-        intelligenceTerm = 1;
+    bool rechargeItem(const MWWorld::Ptr& item, const float maxCharge, const float duration)
+    {
+        float charge = item.getCellRef().getEnchantmentCharge();
+        if (charge == -1 || charge == maxCharge)
+            return false;
+
+        static const float fMagicItemRechargePerSecond = MWBase::Environment::get()
+                                                             .getWorld()
+                                                             ->getStore()
+                                                             .get<ESM::GameSetting>()
+                                                             .find("fMagicItemRechargePerSecond")
+                                                             ->mValue.getFloat();
+
+        item.getCellRef().setEnchantmentCharge(std::min(charge + fMagicItemRechargePerSecond * duration, maxCharge));
+        return true;
+    }
 
-    float x = (player.getClass().getSkill(player, ESM::Skill::Enchant) + intelligenceTerm + luckTerm) * stats.getFatigueTerm();
-    auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-    int roll = Misc::Rng::roll0to99(prng);
-    if (roll < x)
+    bool rechargeItem(const MWWorld::Ptr& item, const MWWorld::Ptr& gem)
     {
-        const std::string& soul = gem.getCellRef().getSoul();
-        const ESM::Creature *creature = MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>().find(soul);
+        if (!gem.getRefData().getCount())
+            return false;
 
-        float restored = creature->mData.mSoul * (roll / x);
+        MWWorld::Ptr player = MWMechanics::getPlayer();
+        MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
 
-        const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(
-                    item.getClass().getEnchantment(item));
-        item.getCellRef().setEnchantmentCharge(
-            std::min(item.getCellRef().getEnchantmentCharge() + restored, static_cast<float>(enchantment->mData.mCharge)));
+        float luckTerm = 0.1f * stats.getAttribute(ESM::Attribute::Luck).getModified();
+        if (luckTerm < 1 || luckTerm > 10)
+            luckTerm = 1;
 
-        MWBase::Environment::get().getWindowManager()->playSound("Enchant Success");
+        float intelligenceTerm = 0.2f * stats.getAttribute(ESM::Attribute::Intelligence).getModified();
 
-        player.getClass().getContainerStore(player).restack(item);
-    }
-    else
-    {
-        MWBase::Environment::get().getWindowManager()->playSound("Enchant Fail");
-    }
+        if (intelligenceTerm > 20)
+            intelligenceTerm = 20;
+        if (intelligenceTerm < 1)
+            intelligenceTerm = 1;
 
-    player.getClass().skillUsageSucceeded (player, ESM::Skill::Enchant, 0);
-    gem.getContainerStore()->remove(gem, 1, player);
-
-    if (gem.getRefData().getCount() == 0)
-    {
-        std::string message = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("sNotifyMessage51")->mValue.getString();
-        message = Misc::StringUtils::format(message, gem.getClass().getName(gem));
+        float x = (player.getClass().getSkill(player, ESM::Skill::Enchant) + intelligenceTerm + luckTerm)
+            * stats.getFatigueTerm();
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        int roll = Misc::Rng::roll0to99(prng);
+        if (roll < x)
+        {
+            const std::string& soul = gem.getCellRef().getSoul();
+            const ESM::Creature* creature
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>().find(soul);
 
-        MWBase::Environment::get().getWindowManager()->messageBox(message);
+            float restored = creature->mData.mSoul * (roll / x);
 
-        // special case: readd Azura's Star
-        if (Misc::StringUtils::ciEqual(gem.get<ESM::Miscellaneous>()->mBase->mId, "Misc_SoulGem_Azura"))
-            player.getClass().getContainerStore(player).add("Misc_SoulGem_Azura", 1, player);
+            const ESM::Enchantment* enchantment
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(
+                    item.getClass().getEnchantment(item));
+            item.getCellRef().setEnchantmentCharge(std::min(
+                item.getCellRef().getEnchantmentCharge() + restored, static_cast<float>(enchantment->mData.mCharge)));
+
+            MWBase::Environment::get().getWindowManager()->playSound("Enchant Success");
+
+            player.getClass().getContainerStore(player).restack(item);
+        }
+        else
+        {
+            MWBase::Environment::get().getWindowManager()->playSound("Enchant Fail");
+        }
+
+        player.getClass().skillUsageSucceeded(player, ESM::Skill::Enchant, 0);
+        gem.getContainerStore()->remove(gem, 1, player);
+
+        if (gem.getRefData().getCount() == 0)
+        {
+            std::string message = MWBase::Environment::get()
+                                      .getWorld()
+                                      ->getStore()
+                                      .get<ESM::GameSetting>()
+                                      .find("sNotifyMessage51")
+                                      ->mValue.getString();
+            message = Misc::StringUtils::format(message, gem.getClass().getName(gem));
+
+            MWBase::Environment::get().getWindowManager()->messageBox(message);
+
+            // special case: readd Azura's Star
+            if (Misc::StringUtils::ciEqual(gem.get<ESM::Miscellaneous>()->mBase->mId, "Misc_SoulGem_Azura"))
+                player.getClass().getContainerStore(player).add("Misc_SoulGem_Azura", 1, player);
+        }
+
+        return true;
     }
 
-    return true;
-}
-
 }
diff --git a/apps/openmw/mwmechanics/recharge.hpp b/apps/openmw/mwmechanics/recharge.hpp
index 913f2109b7..ac1c7ced54 100644
--- a/apps/openmw/mwmechanics/recharge.hpp
+++ b/apps/openmw/mwmechanics/recharge.hpp
@@ -6,9 +6,9 @@
 namespace MWMechanics
 {
 
-    bool rechargeItem(const MWWorld::Ptr &item, const float maxCharge, const float duration);
+    bool rechargeItem(const MWWorld::Ptr& item, const float maxCharge, const float duration);
 
-    bool rechargeItem(const MWWorld::Ptr &item, const MWWorld::Ptr &gem);
+    bool rechargeItem(const MWWorld::Ptr& item, const MWWorld::Ptr& gem);
 
 }
 
diff --git a/apps/openmw/mwmechanics/repair.cpp b/apps/openmw/mwmechanics/repair.cpp
index 266b8dd3c4..42e2fcfe9a 100644
--- a/apps/openmw/mwmechanics/repair.cpp
+++ b/apps/openmw/mwmechanics/repair.cpp
@@ -3,107 +3,113 @@
 #include <components/misc/rng.hpp>
 #include <components/misc/strings/format.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/containerstore.hpp"
 #include "../mwworld/esmstore.hpp"
 
-#include "creaturestats.hpp"
 #include "actorutil.hpp"
+#include "creaturestats.hpp"
 
 namespace MWMechanics
 {
 
-void Repair::repair(const MWWorld::Ptr &itemToRepair)
-{
-    MWWorld::Ptr player = getPlayer();
-    MWWorld::LiveCellRef<ESM::Repair> *ref =
-        mTool.get<ESM::Repair>();
+    void Repair::repair(const MWWorld::Ptr& itemToRepair)
+    {
+        MWWorld::Ptr player = getPlayer();
+        MWWorld::LiveCellRef<ESM::Repair>* ref = mTool.get<ESM::Repair>();
 
-    // unstack tool if required
-    player.getClass().getContainerStore(player).unstack(mTool, player);
+        // unstack tool if required
+        player.getClass().getContainerStore(player).unstack(mTool, player);
 
-    // reduce number of uses left
-    int uses = mTool.getClass().getItemHealth(mTool);
-    uses -= std::min(uses, 1);
-    mTool.getCellRef().setCharge(uses);
+        // reduce number of uses left
+        int uses = mTool.getClass().getItemHealth(mTool);
+        uses -= std::min(uses, 1);
+        mTool.getCellRef().setCharge(uses);
 
-    MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
+        MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
 
-    float fatigueTerm = stats.getFatigueTerm();
-    float pcStrength = stats.getAttribute(ESM::Attribute::Strength).getModified();
-    float pcLuck = stats.getAttribute(ESM::Attribute::Luck).getModified();
-    float armorerSkill = player.getClass().getSkill(player, ESM::Skill::Armorer);
+        float fatigueTerm = stats.getFatigueTerm();
+        float pcStrength = stats.getAttribute(ESM::Attribute::Strength).getModified();
+        float pcLuck = stats.getAttribute(ESM::Attribute::Luck).getModified();
+        float armorerSkill = player.getClass().getSkill(player, ESM::Skill::Armorer);
 
-    float fRepairAmountMult = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
-            .find("fRepairAmountMult")->mValue.getFloat();
+        float fRepairAmountMult = MWBase::Environment::get()
+                                      .getWorld()
+                                      ->getStore()
+                                      .get<ESM::GameSetting>()
+                                      .find("fRepairAmountMult")
+                                      ->mValue.getFloat();
 
-    float toolQuality = ref->mBase->mData.mQuality;
+        float toolQuality = ref->mBase->mData.mQuality;
 
-    float x = (0.1f * pcStrength + 0.1f * pcLuck + armorerSkill) * fatigueTerm;
+        float x = (0.1f * pcStrength + 0.1f * pcLuck + armorerSkill) * fatigueTerm;
 
-    auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-    int roll = Misc::Rng::roll0to99(prng);
-    if (roll <= x)
-    {
-        int y = static_cast<int>(fRepairAmountMult * toolQuality * roll);
-        y = std::max(1, y);
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        int roll = Misc::Rng::roll0to99(prng);
+        if (roll <= x)
+        {
+            int y = static_cast<int>(fRepairAmountMult * toolQuality * roll);
+            y = std::max(1, y);
 
-        // repair by 'y' points
-        int charge = itemToRepair.getClass().getItemHealth(itemToRepair);
-        charge = std::min(charge + y, itemToRepair.getClass().getItemMaxHealth(itemToRepair));
-        itemToRepair.getCellRef().setCharge(charge);
+            // repair by 'y' points
+            int charge = itemToRepair.getClass().getItemHealth(itemToRepair);
+            charge = std::min(charge + y, itemToRepair.getClass().getItemMaxHealth(itemToRepair));
+            itemToRepair.getCellRef().setCharge(charge);
 
-        // attempt to re-stack item, in case it was fully repaired
-        MWWorld::ContainerStoreIterator stacked = player.getClass().getContainerStore(player).restack(itemToRepair);
+            // attempt to re-stack item, in case it was fully repaired
+            MWWorld::ContainerStoreIterator stacked = player.getClass().getContainerStore(player).restack(itemToRepair);
 
-        // set the OnPCRepair variable on the item's script
-        std::string_view script = stacked->getClass().getScript(itemToRepair);
-        if(!script.empty())
-            stacked->getRefData().getLocals().setVarByInt(script, "onpcrepair", 1);
+            // set the OnPCRepair variable on the item's script
+            std::string_view script = stacked->getClass().getScript(itemToRepair);
+            if (!script.empty())
+                stacked->getRefData().getLocals().setVarByInt(script, "onpcrepair", 1);
 
-        // increase skill
-        player.getClass().skillUsageSucceeded(player, ESM::Skill::Armorer, 0);
+            // increase skill
+            player.getClass().skillUsageSucceeded(player, ESM::Skill::Armorer, 0);
 
-        MWBase::Environment::get().getWindowManager()->playSound("Repair");
-        MWBase::Environment::get().getWindowManager()->messageBox("#{sRepairSuccess}");
-    }
-    else
-    {
-        MWBase::Environment::get().getWindowManager()->playSound("Repair Fail");
-        MWBase::Environment::get().getWindowManager()->messageBox("#{sRepairFailed}");
-    }
+            MWBase::Environment::get().getWindowManager()->playSound("Repair");
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sRepairSuccess}");
+        }
+        else
+        {
+            MWBase::Environment::get().getWindowManager()->playSound("Repair Fail");
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sRepairFailed}");
+        }
 
-    // tool used up?
-    if (mTool.getCellRef().getCharge() == 0)
-    {
-        MWWorld::ContainerStore& store = player.getClass().getContainerStore(player);
+        // tool used up?
+        if (mTool.getCellRef().getCharge() == 0)
+        {
+            MWWorld::ContainerStore& store = player.getClass().getContainerStore(player);
 
-        store.remove(mTool, 1, player);
+            store.remove(mTool, 1, player);
 
-        std::string message = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
-                .find("sNotifyMessage51")->mValue.getString();
-        message = Misc::StringUtils::format(message, mTool.getClass().getName(mTool));
+            std::string message = MWBase::Environment::get()
+                                      .getWorld()
+                                      ->getStore()
+                                      .get<ESM::GameSetting>()
+                                      .find("sNotifyMessage51")
+                                      ->mValue.getString();
+            message = Misc::StringUtils::format(message, mTool.getClass().getName(mTool));
 
-        MWBase::Environment::get().getWindowManager()->messageBox(message);
+            MWBase::Environment::get().getWindowManager()->messageBox(message);
 
-        // try to find a new tool of the same ID
-        for (MWWorld::ContainerStoreIterator iter (store.begin());
-             iter!=store.end(); ++iter)
-        {
-            if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), mTool.getCellRef().getRefId()))
+            // try to find a new tool of the same ID
+            for (MWWorld::ContainerStoreIterator iter(store.begin()); iter != store.end(); ++iter)
             {
-                mTool = *iter;
+                if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), mTool.getCellRef().getRefId()))
+                {
+                    mTool = *iter;
 
-                MWBase::Environment::get().getWindowManager()->playSound("Item Repair Up");
+                    MWBase::Environment::get().getWindowManager()->playSound("Item Repair Up");
 
-                break;
+                    break;
+                }
             }
         }
     }
-}
 
 }
diff --git a/apps/openmw/mwmechanics/repair.hpp b/apps/openmw/mwmechanics/repair.hpp
index 6f9a866af1..a596f0d28b 100644
--- a/apps/openmw/mwmechanics/repair.hpp
+++ b/apps/openmw/mwmechanics/repair.hpp
@@ -9,10 +9,10 @@ namespace MWMechanics
     class Repair
     {
     public:
-        void setTool (const MWWorld::Ptr& tool) { mTool = tool; }
+        void setTool(const MWWorld::Ptr& tool) { mTool = tool; }
         MWWorld::Ptr getTool() { return mTool; }
 
-        void repair (const MWWorld::Ptr& itemToRepair);
+        void repair(const MWWorld::Ptr& itemToRepair);
 
     private:
         MWWorld::Ptr mTool;
diff --git a/apps/openmw/mwmechanics/security.cpp b/apps/openmw/mwmechanics/security.cpp
index d41bf817a3..e42a7829f8 100644
--- a/apps/openmw/mwmechanics/security.cpp
+++ b/apps/openmw/mwmechanics/security.cpp
@@ -6,16 +6,16 @@
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/esmstore.hpp"
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "creaturestats.hpp"
 
 namespace MWMechanics
 {
 
-    Security::Security(const MWWorld::Ptr &actor)
+    Security::Security(const MWWorld::Ptr& actor)
         : mActor(actor)
     {
         CreatureStats& creatureStats = actor.getClass().getCreatureStats(actor);
@@ -25,12 +25,11 @@ namespace MWMechanics
         mFatigueTerm = creatureStats.getFatigueTerm();
     }
 
-    void Security::pickLock(const MWWorld::Ptr &lock, const MWWorld::Ptr &lockpick,
-                            std::string_view& resultMessage, std::string_view& resultSound)
+    void Security::pickLock(const MWWorld::Ptr& lock, const MWWorld::Ptr& lockpick, std::string_view& resultMessage,
+        std::string_view& resultSound)
     {
-        if (lock.getCellRef().getLockLevel() <= 0 ||
-            lock.getCellRef().getLockLevel() == ESM::UnbreakableLock ||
-            !lock.getClass().hasToolTip(lock)) //If it's unlocked or can not be unlocked back out immediately
+        if (lock.getCellRef().getLockLevel() <= 0 || lock.getCellRef().getLockLevel() == ESM::UnbreakableLock
+            || !lock.getClass().hasToolTip(lock)) // If it's unlocked or can not be unlocked back out immediately
             return;
 
         int uses = lockpick.getClass().getItemHealth(lockpick);
@@ -41,7 +40,12 @@ namespace MWMechanics
 
         float pickQuality = lockpick.get<ESM::Lockpick>()->mBase->mData.mQuality;
 
-        float fPickLockMult = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fPickLockMult")->mValue.getFloat();
+        float fPickLockMult = MWBase::Environment::get()
+                                  .getWorld()
+                                  ->getStore()
+                                  .get<ESM::GameSetting>()
+                                  .find("fPickLockMult")
+                                  ->mValue.getFloat();
 
         float x = 0.2f * mAgility + 0.1f * mLuck + mSecuritySkill;
         x *= pickQuality * mFatigueTerm;
@@ -71,8 +75,8 @@ namespace MWMechanics
             lockpick.getContainerStore()->remove(lockpick, 1, mActor);
     }
 
-    void Security::probeTrap(const MWWorld::Ptr &trap, const MWWorld::Ptr &probe,
-                             std::string_view& resultMessage, std::string_view& resultSound)
+    void Security::probeTrap(const MWWorld::Ptr& trap, const MWWorld::Ptr& probe, std::string_view& resultMessage,
+        std::string_view& resultSound)
     {
         if (trap.getCellRef().getTrap().empty())
             return;
@@ -83,10 +87,16 @@ namespace MWMechanics
 
         float probeQuality = probe.get<ESM::Probe>()->mBase->mData.mQuality;
 
-        const ESM::Spell* trapSpell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(trap.getCellRef().getTrap());
+        const ESM::Spell* trapSpell
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(trap.getCellRef().getTrap());
         int trapSpellPoints = trapSpell->mData.mCost;
 
-        float fTrapCostMult = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fTrapCostMult")->mValue.getFloat();
+        float fTrapCostMult = MWBase::Environment::get()
+                                  .getWorld()
+                                  ->getStore()
+                                  .get<ESM::GameSetting>()
+                                  .find("fTrapCostMult")
+                                  ->mValue.getFloat();
 
         float x = 0.2f * mAgility + 0.1f * mLuck + mSecuritySkill;
         x += fTrapCostMult * trapSpellPoints;
diff --git a/apps/openmw/mwmechanics/security.hpp b/apps/openmw/mwmechanics/security.hpp
index b555dcc299..7765bcb5dc 100644
--- a/apps/openmw/mwmechanics/security.hpp
+++ b/apps/openmw/mwmechanics/security.hpp
@@ -10,12 +10,12 @@ namespace MWMechanics
     class Security
     {
     public:
-        Security (const MWWorld::Ptr& actor);
+        Security(const MWWorld::Ptr& actor);
 
-        void pickLock (const MWWorld::Ptr& lock, const MWWorld::Ptr& lockpick,
-                              std::string_view& resultMessage, std::string_view& resultSound);
-        void probeTrap (const MWWorld::Ptr& trap, const MWWorld::Ptr& probe,
-                               std::string_view& resultMessage, std::string_view& resultSound);
+        void pickLock(const MWWorld::Ptr& lock, const MWWorld::Ptr& lockpick, std::string_view& resultMessage,
+            std::string_view& resultSound);
+        void probeTrap(const MWWorld::Ptr& trap, const MWWorld::Ptr& probe, std::string_view& resultMessage,
+            std::string_view& resultSound);
 
     private:
         float mAgility, mLuck, mSecuritySkill, mFatigueTerm;
diff --git a/apps/openmw/mwmechanics/setbaseaisetting.hpp b/apps/openmw/mwmechanics/setbaseaisetting.hpp
index f90462182e..ff63ee09fd 100644
--- a/apps/openmw/mwmechanics/setbaseaisetting.hpp
+++ b/apps/openmw/mwmechanics/setbaseaisetting.hpp
@@ -12,7 +12,7 @@
 
 namespace MWMechanics
 {
-    template<class T>
+    template <class T>
     void setBaseAISetting(const std::string& id, MWMechanics::AiSetting setting, int value)
     {
         T copy = *MWBase::Environment::get().getWorld()->getStore().get<T>().find(id);
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 63a9b0ba4c..db92629dbc 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -1,26 +1,26 @@
 #include "spellcasting.hpp"
 
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadstat.hpp>
 #include <components/misc/constants.hpp>
-#include <components/misc/rng.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/misc/rng.hpp>
 #include <components/misc/strings/format.hpp>
-#include <components/esm3/loadmgef.hpp>
-#include <components/esm3/loadench.hpp>
-#include <components/esm3/loadstat.hpp>
 
-#include "../mwbase/windowmanager.hpp"
-#include "../mwbase/soundmanager.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/soundmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
-#include "../mwworld/containerstore.hpp"
 #include "../mwworld/actionteleport.hpp"
-#include "../mwworld/player.hpp"
-#include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/class.hpp"
+#include "../mwworld/containerstore.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
+#include "../mwworld/player.hpp"
 
 #include "../mwrender/animation.hpp"
 
@@ -34,7 +34,8 @@
 
 namespace MWMechanics
 {
-    CastSpell::CastSpell(const MWWorld::Ptr &caster, const MWWorld::Ptr &target, const bool fromProjectile, const bool manualSpell)
+    CastSpell::CastSpell(
+        const MWWorld::Ptr& caster, const MWWorld::Ptr& target, const bool fromProjectile, const bool manualSpell)
         : mCaster(caster)
         , mTarget(target)
         , mFromProjectile(fromProjectile)
@@ -42,26 +43,30 @@ namespace MWMechanics
     {
     }
 
-    void CastSpell::explodeSpell(const ESM::EffectList& effects, const MWWorld::Ptr& ignore, ESM::RangeType rangeType) const
+    void CastSpell::explodeSpell(
+        const ESM::EffectList& effects, const MWWorld::Ptr& ignore, ESM::RangeType rangeType) const
     {
         const auto world = MWBase::Environment::get().getWorld();
         const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-        std::map<MWWorld::Ptr, std::vector<ESM::ENAMstruct> > toApply;
+        std::map<MWWorld::Ptr, std::vector<ESM::ENAMstruct>> toApply;
         int index = -1;
         for (const ESM::ENAMstruct& effectInfo : effects.mList)
         {
             ++index;
             const ESM::MagicEffect* effect = world->getStore().get<ESM::MagicEffect>().find(effectInfo.mEffectID);
 
-            if (effectInfo.mRange != rangeType || (effectInfo.mArea <= 0 && !ignore.isEmpty() && ignore.getClass().isActor()))
+            if (effectInfo.mRange != rangeType
+                || (effectInfo.mArea <= 0 && !ignore.isEmpty() && ignore.getClass().isActor()))
                 continue; // Not right range type, or not area effect and hit an actor
 
             if (mFromProjectile && effectInfo.mArea <= 0)
                 continue; // Don't play explosion for projectiles with 0-area effects
 
-            if (!mFromProjectile && effectInfo.mRange == ESM::RT_Touch && !ignore.isEmpty() && !ignore.getClass().isActor() && !ignore.getClass().hasToolTip(ignore)
+            if (!mFromProjectile && effectInfo.mRange == ESM::RT_Touch && !ignore.isEmpty()
+                && !ignore.getClass().isActor() && !ignore.getClass().hasToolTip(ignore)
                 && (mCaster.isEmpty() || mCaster.getClass().isActor()))
-                continue; // Don't play explosion for touch spells on non-activatable objects except when spell is from a projectile enchantment or ExplodeSpell
+                continue; // Don't play explosion for touch spells on non-activatable objects except when spell is from
+                          // a projectile enchantment or ExplodeSpell
 
             // Spawn the explosion orb effect
             const ESM::Static* areaStatic;
@@ -75,30 +80,33 @@ namespace MWMechanics
             if (effectInfo.mArea <= 0)
             {
                 if (effectInfo.mRange == ESM::RT_Target)
-                    world->spawnEffect(Misc::ResourceHelpers::correctMeshPath(areaStatic->mModel, vfs), texture, mHitPosition, 1.0f);
+                    world->spawnEffect(
+                        Misc::ResourceHelpers::correctMeshPath(areaStatic->mModel, vfs), texture, mHitPosition, 1.0f);
                 continue;
             }
             else
-                world->spawnEffect(Misc::ResourceHelpers::correctMeshPath(areaStatic->mModel, vfs), texture, mHitPosition, static_cast<float>(effectInfo.mArea * 2));
+                world->spawnEffect(Misc::ResourceHelpers::correctMeshPath(areaStatic->mModel, vfs), texture,
+                    mHitPosition, static_cast<float>(effectInfo.mArea * 2));
 
             // Play explosion sound (make sure to use NoTrack, since we will delete the projectile now)
-            static const std::string schools[] = {
-                "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
-            };
+            static const std::string schools[]
+                = { "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration" };
             {
-                MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-                if(!effect->mAreaSound.empty())
+                MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
+                if (!effect->mAreaSound.empty())
                     sndMgr->playSound3D(mHitPosition, effect->mAreaSound, 1.0f, 1.0f);
                 else
-                    sndMgr->playSound3D(mHitPosition, schools[effect->mData.mSchool]+" area", 1.0f, 1.0f);
+                    sndMgr->playSound3D(mHitPosition, schools[effect->mData.mSchool] + " area", 1.0f, 1.0f);
             }
             // Get the actors in range of the effect
             std::vector<MWWorld::Ptr> objects;
             static const int unitsPerFoot = ceil(Constants::UnitsPerFoot);
-            MWBase::Environment::get().getMechanicsManager()->getObjectsInRange(mHitPosition, static_cast<float>(effectInfo.mArea * unitsPerFoot), objects);
+            MWBase::Environment::get().getMechanicsManager()->getObjectsInRange(
+                mHitPosition, static_cast<float>(effectInfo.mArea * unitsPerFoot), objects);
             for (const MWWorld::Ptr& affected : objects)
             {
-                // Ignore actors without collisions here, otherwise it will be possible to hit actors outside processing range.
+                // Ignore actors without collisions here, otherwise it will be possible to hit actors outside processing
+                // range.
                 if (affected.getClass().isActor() && !world->isActorCollisionEnabled(affected))
                     continue;
 
@@ -141,14 +149,14 @@ namespace MWMechanics
         // Fall back to a "caster to target" direction if we have no other means of determining it
         // (e.g. when cast by a non-actor)
         if (!mTarget.isEmpty())
-            fallbackDirection =
-                (mTarget.getRefData().getPosition().asVec3() + offset) -
-                (mCaster.getRefData().getPosition().asVec3());
+            fallbackDirection = (mTarget.getRefData().getPosition().asVec3() + offset)
+                - (mCaster.getRefData().getPosition().asVec3());
 
         MWBase::Environment::get().getWorld()->launchMagicBolt(mId, mCaster, fallbackDirection, mSlot);
     }
 
-    void CastSpell::inflict(const MWWorld::Ptr& target, const ESM::EffectList& effects, ESM::RangeType range, bool exploded) const
+    void CastSpell::inflict(
+        const MWWorld::Ptr& target, const ESM::EffectList& effects, ESM::RangeType range, bool exploded) const
     {
         const bool targetIsActor = !target.isEmpty() && target.getClass().isActor();
         if (targetIsActor)
@@ -180,23 +188,23 @@ namespace MWMechanics
         if (targetIsActor)
             targetSpells = &target.getClass().getCreatureStats(target).getActiveSpells();
 
-        bool canCastAnEffect = false;    // For bound equipment.If this remains false
-                                         // throughout the iteration of this spell's 
-                                         // effects, we display a "can't re-cast" message
+        bool canCastAnEffect = false; // For bound equipment.If this remains false
+                                      // throughout the iteration of this spell's
+                                      // effects, we display a "can't re-cast" message
 
         int currentEffectIndex = 0;
-        for (std::vector<ESM::ENAMstruct>::const_iterator effectIt (effects.mList.begin());
+        for (std::vector<ESM::ENAMstruct>::const_iterator effectIt(effects.mList.begin());
              !target.isEmpty() && effectIt != effects.mList.end(); ++effectIt, ++currentEffectIndex)
         {
             if (effectIt->mRange != range)
                 continue;
 
-            const ESM::MagicEffect *magicEffect =
-                MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find (
-                effectIt->mEffectID);
+            const ESM::MagicEffect* magicEffect
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectIt->mEffectID);
 
             // Re-casting a bound equipment effect has no effect if the spell is still active
-            if (magicEffect->mData.mFlags & ESM::MagicEffect::NonRecastable && targetSpells && targetSpells->isSpellActive(mId))
+            if (magicEffect->mData.mFlags & ESM::MagicEffect::NonRecastable && targetSpells
+                && targetSpells->isSpellActive(mId))
             {
                 if (effectIt == (effects.mList.end() - 1) && !canCastAnEffect && castByPlayer)
                     MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicCannotRecast}");
@@ -205,7 +213,8 @@ namespace MWMechanics
             canCastAnEffect = true;
 
             // caster needs to be an actor for linked effects (e.g. Absorb)
-            if (magicEffect->mData.mFlags & ESM::MagicEffect::CasterLinked && (mCaster.isEmpty() || !mCaster.getClass().isActor()))
+            if (magicEffect->mData.mFlags & ESM::MagicEffect::CasterLinked
+                && (mCaster.isEmpty() || !mCaster.getClass().isActor()))
                 continue;
 
             ActiveSpells::ActiveEffect effect;
@@ -217,7 +226,7 @@ namespace MWMechanics
             effect.mTimeLeft = 0.f;
             effect.mEffectIndex = currentEffectIndex;
             effect.mFlags = ESM::ActiveEffect::Flag_None;
-            if(mManualSpell)
+            if (mManualSpell)
                 effect.mFlags |= ESM::ActiveEffect::Flag_Ignore_Reflect;
 
             bool hasDuration = !(magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration);
@@ -232,10 +241,12 @@ namespace MWMechanics
             // add to list of active effects, to apply in next frame
             params.getEffects().emplace_back(effect);
 
-            bool effectAffectsHealth = magicEffect->mData.mFlags & ESM::MagicEffect::Harmful || effectIt->mEffectID == ESM::MagicEffect::RestoreHealth;
+            bool effectAffectsHealth = magicEffect->mData.mFlags & ESM::MagicEffect::Harmful
+                || effectIt->mEffectID == ESM::MagicEffect::RestoreHealth;
             if (castByPlayer && target != mCaster && targetIsActor && effectAffectsHealth)
             {
-                // If player is attempting to cast a harmful spell on or is healing a living target, show the target's HP bar.
+                // If player is attempting to cast a harmful spell on or is healing a living target, show the target's
+                // HP bar.
                 MWBase::Environment::get().getWindowManager()->setEnemy(target);
             }
 
@@ -252,13 +263,13 @@ namespace MWMechanics
         {
             if (!params.getEffects().empty())
             {
-                if(targetIsActor)
+                if (targetIsActor)
                     target.getClass().getCreatureStats(target).getActiveSpells().addSpell(params);
                 else
                 {
-                    // Apply effects instantly. We can ignore effect deletion since the entire params object gets deleted afterwards anyway
-                    // and we can ignore reflection since non-actors cannot reflect spells
-                    for(auto& effect : params.getEffects())
+                    // Apply effects instantly. We can ignore effect deletion since the entire params object gets
+                    // deleted afterwards anyway and we can ignore reflection since non-actors cannot reflect spells
+                    for (auto& effect : params.getEffects())
                         applyMagicEffect(target, mCaster, params, effect, 0.f);
                 }
             }
@@ -280,7 +291,7 @@ namespace MWMechanics
         throw std::runtime_error("ID type cannot be casted");
     }
 
-    bool CastSpell::cast(const MWWorld::Ptr &item, int slot, bool launchProjectile)
+    bool CastSpell::cast(const MWWorld::Ptr& item, int slot, bool launchProjectile)
     {
         std::string_view enchantmentName = item.getClass().getEnchantment(item);
         if (enchantmentName.empty())
@@ -289,7 +300,8 @@ namespace MWMechanics
         mSourceName = item.getClass().getName(item);
         mId = item.getCellRef().getRefId();
 
-        const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(enchantmentName);
+        const ESM::Enchantment* enchantment
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(enchantmentName);
 
         mSlot = slot;
 
@@ -304,7 +316,8 @@ namespace MWMechanics
         int type = enchantment->mData.mType;
 
         // Check if there's enough charge left
-        if (!godmode && (type == ESM::Enchantment::WhenUsed || (!isProjectile && type == ESM::Enchantment::WhenStrikes)))
+        if (!godmode
+            && (type == ESM::Enchantment::WhenUsed || (!isProjectile && type == ESM::Enchantment::WhenStrikes)))
         {
             int castCost = getEffectiveEnchantmentCastCost(static_cast<float>(enchantment->mData.mCost), mCaster);
 
@@ -322,14 +335,14 @@ namespace MWMechanics
                     if (!enchantment->mEffects.mList.empty())
                     {
                         short effectId = enchantment->mEffects.mList.front().mEffectID;
-                        const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectId);
+                        const ESM::MagicEffect* magicEffect
+                            = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectId);
                         school = magicEffect->mData.mSchool;
                     }
 
-                    static const std::string schools[] = {
-                        "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
-                    };
-                    MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
+                    static const std::string schools[]
+                        = { "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration" };
+                    MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
                     sndMgr->playSound3D(mCaster, "Spell Failure " + schools[school], 1.0f, 1.0f);
                 }
                 return false;
@@ -341,7 +354,7 @@ namespace MWMechanics
         if (type == ESM::Enchantment::WhenUsed)
         {
             if (mCaster == getPlayer())
-                mCaster.getClass().skillUsageSucceeded (mCaster, ESM::Skill::Enchant, 1);
+                mCaster.getClass().skillUsageSucceeded(mCaster, ESM::Skill::Enchant, 1);
         }
         else if (type == ESM::Enchantment::CastOnce)
         {
@@ -351,7 +364,7 @@ namespace MWMechanics
         else if (type == ESM::Enchantment::WhenStrikes)
         {
             if (mCaster == getPlayer())
-                mCaster.getClass().skillUsageSucceeded (mCaster, ESM::Skill::Enchant, 3);
+                mCaster.getClass().skillUsageSucceeded(mCaster, ESM::Skill::Enchant, 3);
         }
 
         if (isProjectile)
@@ -413,11 +426,10 @@ namespace MWMechanics
                 if (fail)
                 {
                     // Failure sound
-                    static const std::string schools[] = {
-                        "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
-                    };
+                    static const std::string schools[]
+                        = { "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration" };
 
-                    MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
+                    MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
                     sndMgr->playSound3D(mCaster, "Spell Failure " + schools[school], 1.0f, 1.0f);
                     return false;
                 }
@@ -445,7 +457,7 @@ namespace MWMechanics
         return true;
     }
 
-    bool CastSpell::cast (const ESM::Ingredient* ingredient)
+    bool CastSpell::cast(const ESM::Ingredient* ingredient)
     {
         mId = ingredient->mId;
         mType = ESM::ActiveSpells::Type_Consumable;
@@ -462,10 +474,10 @@ namespace MWMechanics
         const auto magicEffect = store.get<ESM::MagicEffect>().find(effect.mEffectID);
         const MWMechanics::CreatureStats& creatureStats = mCaster.getClass().getCreatureStats(mCaster);
 
-        float x = (mCaster.getClass().getSkill(mCaster, ESM::Skill::Alchemy) +
-                    0.2f * creatureStats.getAttribute (ESM::Attribute::Intelligence).getModified()
-                    + 0.1f * creatureStats.getAttribute (ESM::Attribute::Luck).getModified())
-                    * creatureStats.getFatigueTerm();
+        float x = (mCaster.getClass().getSkill(mCaster, ESM::Skill::Alchemy)
+                      + 0.2f * creatureStats.getAttribute(ESM::Attribute::Intelligence).getModified()
+                      + 0.1f * creatureStats.getAttribute(ESM::Attribute::Luck).getModified())
+            * creatureStats.getFatigueTerm();
 
         auto& prng = MWBase::Environment::get().getWorld()->getPrng();
         int roll = Misc::Rng::roll0to99(prng);
@@ -530,33 +542,32 @@ namespace MWMechanics
             const ESM::Static* castStatic;
 
             if (!effect->mCasting.empty())
-                castStatic = store.get<ESM::Static>().find (effect->mCasting);
+                castStatic = store.get<ESM::Static>().find(effect->mCasting);
             else
-                castStatic = store.get<ESM::Static>().find ("VFX_DefaultCast");
+                castStatic = store.get<ESM::Static>().find("VFX_DefaultCast");
 
             // check if the effect was already added
             if (std::find(addedEffects.begin(), addedEffects.end(),
-                Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs))
+                    Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs))
                 != addedEffects.end())
                 continue;
 
             MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(mCaster);
             if (animation)
             {
-                animation->addEffect(
-                    Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs),
-                    effect->mIndex, false, {}, effect->mParticle);
+                animation->addEffect(Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs), effect->mIndex,
+                    false, {}, effect->mParticle);
             }
             else
             {
                 // If the caster has no animation, add the effect directly to the effectManager
                 // We must scale and position it manually
                 float scale = mCaster.getCellRef().getScale();
-                osg::Vec3f pos (mCaster.getRefData().getPosition().asVec3());
+                osg::Vec3f pos(mCaster.getRefData().getPosition().asVec3());
                 if (!mCaster.getClass().isNpc())
                 {
-                    osg::Vec3f bounds (MWBase::Environment::get().getWorld()->getHalfExtents(mCaster) * 2.f);
-                    scale *= std::max({bounds.x(), bounds.y(), bounds.z() / 2.f}) / 64.f;
+                    osg::Vec3f bounds(MWBase::Environment::get().getWorld()->getHalfExtents(mCaster) * 2.f);
+                    scale *= std::max({ bounds.x(), bounds.y(), bounds.z() / 2.f }) / 64.f;
                     float offset = 0.f;
                     if (bounds.z() < 128.f)
                         offset = bounds.z() - 128.f;
@@ -569,30 +580,28 @@ namespace MWMechanics
                 else
                 {
                     // Additionally use the NPC's height
-                    osg::Vec3f npcScaleVec (1.f, 1.f, 1.f);
+                    osg::Vec3f npcScaleVec(1.f, 1.f, 1.f);
                     mCaster.getClass().adjustScale(mCaster, npcScaleVec, true);
                     scale *= npcScaleVec.z();
                 }
                 scale = std::max(scale, 1.f);
                 MWBase::Environment::get().getWorld()->spawnEffect(
-                    Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs),
-                    effect->mParticle, pos, scale);
+                    Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs), effect->mParticle, pos, scale);
             }
 
             if (animation && !mCaster.getClass().isActor())
                 animation->addSpellCastGlow(effect);
 
-            static const std::string schools[] = {
-                "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
-            };
+            static const std::string schools[]
+                = { "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration" };
 
             addedEffects.push_back(Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs));
 
-            MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-            if(!effect->mCastSound.empty())
+            MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
+            if (!effect->mCastSound.empty())
                 sndMgr->playSound3D(mCaster, effect->mCastSound, 1.0f, 1.0f);
             else
-                sndMgr->playSound3D(mCaster, schools[effect->mData.mSchool]+" cast", 1.0f, 1.0f);
+                sndMgr->playSound3D(mCaster, schools[effect->mData.mSchool] + " cast", 1.0f, 1.0f);
         }
     }
 
@@ -600,35 +609,33 @@ namespace MWMechanics
     {
         if (playNonLooping)
         {
-            static const std::string schools[] = {
-                "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
-            };
+            static const std::string schools[]
+                = { "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration" };
 
-            MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-            if(!magicEffect.mHitSound.empty())
+            MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
+            if (!magicEffect.mHitSound.empty())
                 sndMgr->playSound3D(target, magicEffect.mHitSound, 1.0f, 1.0f);
             else
-                sndMgr->playSound3D(target, schools[magicEffect.mData.mSchool]+" hit", 1.0f, 1.0f);
+                sndMgr->playSound3D(target, schools[magicEffect.mData.mSchool] + " hit", 1.0f, 1.0f);
         }
 
         // Add VFX
         const ESM::Static* castStatic;
         if (!magicEffect.mHit.empty())
-            castStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find (magicEffect.mHit);
+            castStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find(magicEffect.mHit);
         else
-            castStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find ("VFX_DefaultHit");
+            castStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find("VFX_DefaultHit");
 
         bool loop = (magicEffect.mData.mFlags & ESM::MagicEffect::ContinuousVfx) != 0;
         MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(target);
-        if(anim && !castStatic->mModel.empty())
+        if (anim && !castStatic->mModel.empty())
         {
             // Don't play particle VFX unless the effect is new or it should be looping.
             if (playNonLooping || loop)
             {
                 const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-                anim->addEffect(
-                    Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs),
-                    magicEffect.mIndex, loop, {}, magicEffect.mParticle);
+                anim->addEffect(Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs), magicEffect.mIndex,
+                    loop, {}, magicEffect.mParticle);
             }
         }
     }
diff --git a/apps/openmw/mwmechanics/spellcasting.hpp b/apps/openmw/mwmechanics/spellcasting.hpp
index bc17a00042..fee460f448 100644
--- a/apps/openmw/mwmechanics/spellcasting.hpp
+++ b/apps/openmw/mwmechanics/spellcasting.hpp
@@ -36,35 +36,41 @@ namespace MWMechanics
     public:
         std::string mId; // ID of spell, potion, item etc
         std::string mSourceName; // Display name for spell, potion, etc
-        osg::Vec3f mHitPosition{0,0,0}; // Used for spawning area orb
-        bool mAlwaysSucceed{false}; // Always succeed spells casted by NPCs/creatures regardless of their chance (default: false)
+        osg::Vec3f mHitPosition{ 0, 0, 0 }; // Used for spawning area orb
+        bool mAlwaysSucceed{
+            false
+        }; // Always succeed spells casted by NPCs/creatures regardless of their chance (default: false)
         bool mFromProjectile; // True if spell is cast by enchantment of some projectile (arrow, bolt or thrown weapon)
-        bool mManualSpell; // True if spell is casted from script and ignores some checks (mana level, success chance, etc.)
-        int mSlot{0};
-        ESM::ActiveSpells::EffectType mType{ESM::ActiveSpells::Type_Temporary};
+        bool mManualSpell; // True if spell is casted from script and ignores some checks (mana level, success chance,
+                           // etc.)
+        int mSlot{ 0 };
+        ESM::ActiveSpells::EffectType mType{ ESM::ActiveSpells::Type_Temporary };
 
-        CastSpell(const MWWorld::Ptr& caster, const MWWorld::Ptr& target, const bool fromProjectile=false, const bool manualSpell=false);
+        CastSpell(const MWWorld::Ptr& caster, const MWWorld::Ptr& target, const bool fromProjectile = false,
+            const bool manualSpell = false);
 
-        bool cast (const ESM::Spell* spell);
+        bool cast(const ESM::Spell* spell);
 
         /// @note mCaster must be an actor
-        /// @param launchProjectile If set to false, "on target" effects are directly applied instead of being launched as projectile originating from the caster.
-        bool cast (const MWWorld::Ptr& item, int slot, bool launchProjectile=true);
+        /// @param launchProjectile If set to false, "on target" effects are directly applied instead of being launched
+        /// as projectile originating from the caster.
+        bool cast(const MWWorld::Ptr& item, int slot, bool launchProjectile = true);
 
         /// @note mCaster must be an NPC
-        bool cast (const ESM::Ingredient* ingredient);
+        bool cast(const ESM::Ingredient* ingredient);
 
-        bool cast (const ESM::Potion* potion);
+        bool cast(const ESM::Potion* potion);
 
         /// @note Auto detects if spell, ingredient or potion
-        bool cast (const std::string& id);
+        bool cast(const std::string& id);
 
         void playSpellCastingEffects(const ESM::Enchantment* enchantment) const;
 
         void playSpellCastingEffects(const ESM::Spell* spell) const;
 
         /// @note \a target can be any type of object, not just actors.
-        void inflict(const MWWorld::Ptr& target, const ESM::EffectList& effects, ESM::RangeType range, bool exploded = false) const;
+        void inflict(const MWWorld::Ptr& target, const ESM::EffectList& effects, ESM::RangeType range,
+            bool exploded = false) const;
     };
 
     void playEffects(const MWWorld::Ptr& target, const ESM::MagicEffect& magicEffect, bool playNonLooping = true);
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index 99d5dcce2b..c9de5bd1b9 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -2,14 +2,14 @@
 
 #include <algorithm>
 
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadench.hpp>
 #include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadstat.hpp>
+#include <components/misc/resourcehelpers.hpp>
 #include <components/misc/rng.hpp>
 #include <components/settings/settings.hpp>
-#include <components/misc/resourcehelpers.hpp>
-#include <components/esm3/loadench.hpp>
-#include <components/esm3/loadstat.hpp>
-#include <components/esm3/loadcrea.hpp>
-#include <components/esm3/loadbody.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
@@ -38,15 +38,16 @@ namespace
 {
     float roll(const ESM::ActiveEffect& effect)
     {
-        if(effect.mMinMagnitude == effect.mMaxMagnitude)
+        if (effect.mMinMagnitude == effect.mMaxMagnitude)
             return effect.mMinMagnitude;
         auto& prng = MWBase::Environment::get().getWorld()->getPrng();
         return effect.mMinMagnitude + Misc::Rng::rollDice(effect.mMaxMagnitude - effect.mMinMagnitude + 1, prng);
     }
 
-    void modifyAiSetting(const MWWorld::Ptr& target, const ESM::ActiveEffect& effect, ESM::MagicEffect::Effects creatureEffect, MWMechanics::AiSetting setting, float magnitude, bool& invalid)
+    void modifyAiSetting(const MWWorld::Ptr& target, const ESM::ActiveEffect& effect,
+        ESM::MagicEffect::Effects creatureEffect, MWMechanics::AiSetting setting, float magnitude, bool& invalid)
     {
-        if(target == MWMechanics::getPlayer() || (effect.mEffectId == creatureEffect) == target.getClass().isNpc())
+        if (target == MWMechanics::getPlayer() || (effect.mEffectId == creatureEffect) == target.getClass().isNpc())
             invalid = true;
         else
         {
@@ -57,7 +58,8 @@ namespace
         }
     }
 
-    void adjustDynamicStat(const MWWorld::Ptr& target, int index, float magnitude, bool allowDecreaseBelowZero = false, bool allowIncreaseAboveModified = false)
+    void adjustDynamicStat(const MWWorld::Ptr& target, int index, float magnitude, bool allowDecreaseBelowZero = false,
+        bool allowIncreaseAboveModified = false)
     {
         auto& creatureStats = target.getClass().getCreatureStats(target);
         auto stat = creatureStats.getDynamic(index);
@@ -79,7 +81,7 @@ namespace
     {
         auto& creatureStats = target.getClass().getCreatureStats(target);
         auto attr = creatureStats.getAttribute(effect.mArg);
-        if(effect.mEffectId == ESM::MagicEffect::DamageAttribute)
+        if (effect.mEffectId == ESM::MagicEffect::DamageAttribute)
             magnitude = std::min(attr.getModified(), magnitude);
         attr.damage(magnitude);
         creatureStats.setAttribute(effect.mArg, attr);
@@ -105,7 +107,7 @@ namespace
     {
         auto& npcStats = target.getClass().getNpcStats(target);
         auto& skill = npcStats.getSkill(effect.mArg);
-        if(effect.mEffectId == ESM::MagicEffect::DamageSkill)
+        if (effect.mEffectId == ESM::MagicEffect::DamageSkill)
             magnitude = std::min(skill.getModified(), magnitude);
         skill.damage(magnitude);
     }
@@ -129,7 +131,9 @@ namespace
         MWWorld::InventoryStore& inv = ptr.getClass().getInventoryStore(ptr);
         MWWorld::ContainerStoreIterator item = inv.getSlot(slot);
 
-        if (item != inv.end() && (item.getType() == MWWorld::ContainerStore::Type_Armor || item.getType() == MWWorld::ContainerStore::Type_Weapon))
+        if (item != inv.end()
+            && (item.getType() == MWWorld::ContainerStore::Type_Armor
+                || item.getType() == MWWorld::ContainerStore::Type_Weapon))
         {
             if (!item->getClass().hasItemHealth(*item))
                 return false;
@@ -162,7 +166,7 @@ namespace
     int getBoundItemSlot(const MWWorld::Ptr& boundPtr)
     {
         const auto [slots, _] = boundPtr.getClass().getEquipmentSlots(boundPtr);
-        if(!slots.empty())
+        if (!slots.empty())
             return slots[0];
         return -1;
     }
@@ -184,7 +188,7 @@ namespace
         MWWorld::Ptr newItem;
         auto it = slot >= 0 ? store.getSlot(slot) : store.end();
         // Equip can fail because beast races cannot equip boots/helmets
-        if(it != store.end())
+        if (it != store.end())
             newItem = *it;
 
         if (newItem.isEmpty() || boundPtr != newItem)
@@ -203,17 +207,16 @@ namespace
     void removeBoundItem(const std::string& itemId, const MWWorld::Ptr& actor)
     {
         MWWorld::InventoryStore& store = actor.getClass().getInventoryStore(actor);
-        auto item = std::find_if(store.begin(), store.end(), [&] (const auto& it)
-        {
-            return Misc::StringUtils::ciEqual(it.getCellRef().getRefId(), itemId);
-        });
-        if(item == store.end())
+        auto item = std::find_if(store.begin(), store.end(),
+            [&](const auto& it) { return Misc::StringUtils::ciEqual(it.getCellRef().getRefId(), itemId); });
+        if (item == store.end())
             return;
         int slot = getBoundItemSlot(*item);
 
         auto currentItem = store.getSlot(slot);
 
-        bool wasEquipped = currentItem != store.end() && Misc::StringUtils::ciEqual(currentItem->getCellRef().getRefId(), itemId);
+        bool wasEquipped
+            = currentItem != store.end() && Misc::StringUtils::ciEqual(currentItem->getCellRef().getRefId(), itemId);
 
         if (actor != MWMechanics::getPlayer())
         {
@@ -262,10 +265,12 @@ namespace
 
     bool isCorprusEffect(const MWMechanics::ActiveSpells::ActiveEffect& effect, bool harmfulOnly = false)
     {
-        if(effect.mFlags & ESM::ActiveEffect::Flag_Applied && effect.mEffectId != ESM::MagicEffect::Corprus)
+        if (effect.mFlags & ESM::ActiveEffect::Flag_Applied && effect.mEffectId != ESM::MagicEffect::Corprus)
         {
-            const auto* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effect.mEffectId);
-            if(magicEffect->mData.mFlags & ESM::MagicEffect::Flags::AppliedOnce && (!harmfulOnly || magicEffect->mData.mFlags & ESM::MagicEffect::Flags::Harmful))
+            const auto* magicEffect
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effect.mEffectId);
+            if (magicEffect->mData.mFlags & ESM::MagicEffect::Flags::AppliedOnce
+                && (!harmfulOnly || magicEffect->mData.mFlags & ESM::MagicEffect::Flags::Harmful))
                 return true;
         }
         return false;
@@ -279,8 +284,7 @@ namespace
         if (animation && !absorbStatic->mModel.empty())
         {
             const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-            animation->addEffect(
-                Misc::ResourceHelpers::correctMeshPath(absorbStatic->mModel, vfs),
+            animation->addEffect(Misc::ResourceHelpers::correctMeshPath(absorbStatic->mModel, vfs),
                 ESM::MagicEffect::SpellAbsorption, false);
         }
         const ESM::Spell* spell = esmStore.get<ESM::Spell>().search(spellId);
@@ -293,7 +297,8 @@ namespace
         {
             const ESM::Enchantment* enchantment = esmStore.get<ESM::Enchantment>().search(spellId);
             if (enchantment)
-                spellCost = MWMechanics::getEffectiveEnchantmentCastCost(static_cast<float>(enchantment->mData.mCost), caster);
+                spellCost = MWMechanics::getEffectiveEnchantmentCastCost(
+                    static_cast<float>(enchantment->mData.mCost), caster);
         }
 
         // Magicka is increased by the cost of the spell
@@ -304,35 +309,39 @@ namespace
     }
 
     MWMechanics::MagicApplicationResult::Type applyProtections(const MWWorld::Ptr& target, const MWWorld::Ptr& caster,
-        const MWMechanics::ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect, const ESM::MagicEffect* magicEffect)
+        const MWMechanics::ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect,
+        const ESM::MagicEffect* magicEffect)
     {
         auto& stats = target.getClass().getCreatureStats(target);
         auto& magnitudes = stats.getMagicEffects();
         // Apply reflect and spell absorption
-        if(target != caster && spellParams.getType() != ESM::ActiveSpells::Type_Enchantment && spellParams.getType() != ESM::ActiveSpells::Type_Permanent)
+        if (target != caster && spellParams.getType() != ESM::ActiveSpells::Type_Enchantment
+            && spellParams.getType() != ESM::ActiveSpells::Type_Permanent)
         {
-            bool canReflect = !(magicEffect->mData.mFlags & ESM::MagicEffect::Unreflectable) && !(effect.mFlags & ESM::ActiveEffect::Flag_Ignore_Reflect) &&
-                magnitudes.get(ESM::MagicEffect::Reflect).getMagnitude() > 0.f && !caster.isEmpty();
-            bool canAbsorb = !(effect.mFlags & ESM::ActiveEffect::Flag_Ignore_SpellAbsorption) && magnitudes.get(ESM::MagicEffect::SpellAbsorption).getMagnitude() > 0.f;
-            if(canReflect || canAbsorb)
+            bool canReflect = !(magicEffect->mData.mFlags & ESM::MagicEffect::Unreflectable)
+                && !(effect.mFlags & ESM::ActiveEffect::Flag_Ignore_Reflect)
+                && magnitudes.get(ESM::MagicEffect::Reflect).getMagnitude() > 0.f && !caster.isEmpty();
+            bool canAbsorb = !(effect.mFlags & ESM::ActiveEffect::Flag_Ignore_SpellAbsorption)
+                && magnitudes.get(ESM::MagicEffect::SpellAbsorption).getMagnitude() > 0.f;
+            if (canReflect || canAbsorb)
             {
                 auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-                for(const auto& activeParam : stats.getActiveSpells())
+                for (const auto& activeParam : stats.getActiveSpells())
                 {
-                    for(const auto& activeEffect : activeParam.getEffects())
+                    for (const auto& activeEffect : activeParam.getEffects())
                     {
-                        if(!(activeEffect.mFlags & ESM::ActiveEffect::Flag_Applied))
+                        if (!(activeEffect.mFlags & ESM::ActiveEffect::Flag_Applied))
                             continue;
-                        if(activeEffect.mEffectId == ESM::MagicEffect::Reflect)
+                        if (activeEffect.mEffectId == ESM::MagicEffect::Reflect)
                         {
-                            if(canReflect && Misc::Rng::roll0to99(prng) < activeEffect.mMagnitude)
+                            if (canReflect && Misc::Rng::roll0to99(prng) < activeEffect.mMagnitude)
                             {
                                 return MWMechanics::MagicApplicationResult::Type::REFLECTED;
                             }
                         }
-                        else if(activeEffect.mEffectId == ESM::MagicEffect::SpellAbsorption)
+                        else if (activeEffect.mEffectId == ESM::MagicEffect::SpellAbsorption)
                         {
-                            if(canAbsorb && Misc::Rng::roll0to99(prng) < activeEffect.mMagnitude)
+                            if (canAbsorb && Misc::Rng::roll0to99(prng) < activeEffect.mMagnitude)
                             {
                                 absorbSpell(spellParams.getId(), caster, target);
                                 return MWMechanics::MagicApplicationResult::Type::REMOVED;
@@ -347,12 +356,13 @@ namespace
         if (target.getClass().isActor() && target != caster && !caster.isEmpty() && isHarmful)
             target.getClass().onHit(target, 0.0f, true, MWWorld::Ptr(), caster, osg::Vec3f(), true);
         // Apply resistances
-        if(!(effect.mFlags & ESM::ActiveEffect::Flag_Ignore_Resistances))
+        if (!(effect.mFlags & ESM::ActiveEffect::Flag_Ignore_Resistances))
         {
             const ESM::Spell* spell = nullptr;
-            if(spellParams.getType() == ESM::ActiveSpells::Type_Temporary)
+            if (spellParams.getType() == ESM::ActiveSpells::Type_Temporary)
                 spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(spellParams.getId());
-            float magnitudeMult = MWMechanics::getEffectMultiplier(effect.mEffectId, target, caster, spell, &magnitudes);
+            float magnitudeMult
+                = MWMechanics::getEffectMultiplier(effect.mEffectId, target, caster, spell, &magnitudes);
             if (magnitudeMult == 0)
             {
                 // Fully resisted, show message
@@ -369,651 +379,688 @@ namespace
     }
 
     static const std::map<int, std::string> sBoundItemsMap{
-        {ESM::MagicEffect::BoundBattleAxe, "sMagicBoundBattleAxeID"},
-        {ESM::MagicEffect::BoundBoots, "sMagicBoundBootsID"},
-        {ESM::MagicEffect::BoundCuirass, "sMagicBoundCuirassID"},
-        {ESM::MagicEffect::BoundDagger, "sMagicBoundDaggerID"},
-        {ESM::MagicEffect::BoundGloves, "sMagicBoundLeftGauntletID"},
-        {ESM::MagicEffect::BoundHelm, "sMagicBoundHelmID"},
-        {ESM::MagicEffect::BoundLongbow, "sMagicBoundLongbowID"},
-        {ESM::MagicEffect::BoundLongsword, "sMagicBoundLongswordID"},
-        {ESM::MagicEffect::BoundMace, "sMagicBoundMaceID"},
-        {ESM::MagicEffect::BoundShield, "sMagicBoundShieldID"},
-        {ESM::MagicEffect::BoundSpear, "sMagicBoundSpearID"},
+        { ESM::MagicEffect::BoundBattleAxe, "sMagicBoundBattleAxeID" },
+        { ESM::MagicEffect::BoundBoots, "sMagicBoundBootsID" },
+        { ESM::MagicEffect::BoundCuirass, "sMagicBoundCuirassID" },
+        { ESM::MagicEffect::BoundDagger, "sMagicBoundDaggerID" },
+        { ESM::MagicEffect::BoundGloves, "sMagicBoundLeftGauntletID" },
+        { ESM::MagicEffect::BoundHelm, "sMagicBoundHelmID" },
+        { ESM::MagicEffect::BoundLongbow, "sMagicBoundLongbowID" },
+        { ESM::MagicEffect::BoundLongsword, "sMagicBoundLongswordID" },
+        { ESM::MagicEffect::BoundMace, "sMagicBoundMaceID" },
+        { ESM::MagicEffect::BoundShield, "sMagicBoundShieldID" },
+        { ESM::MagicEffect::BoundSpear, "sMagicBoundSpearID" },
     };
 }
 
 namespace MWMechanics
 {
 
-void applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, const ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect, bool& invalid, bool& receivedMagicDamage, bool& affectedHealth, bool& recalculateMagicka)
-{
-    const auto world = MWBase::Environment::get().getWorld();
-    bool godmode = target == getPlayer() && world->getGodModeState();
-    switch(effect.mEffectId)
+    void applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster,
+        const ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect, bool& invalid,
+        bool& receivedMagicDamage, bool& affectedHealth, bool& recalculateMagicka)
     {
-        case ESM::MagicEffect::CureCommonDisease:
-            target.getClass().getCreatureStats(target).getSpells().purgeCommonDisease();
-            break;
-        case ESM::MagicEffect::CureBlightDisease:
-            target.getClass().getCreatureStats(target).getSpells().purgeBlightDisease();
-            break;
-        case ESM::MagicEffect::RemoveCurse:
-            target.getClass().getCreatureStats(target).getSpells().purgeCurses();
-            break;
-        case ESM::MagicEffect::CureCorprusDisease:
-            target.getClass().getCreatureStats(target).getActiveSpells().purgeEffect(target, ESM::MagicEffect::Corprus);
-            break;
-        case ESM::MagicEffect::CurePoison:
-            target.getClass().getCreatureStats(target).getActiveSpells().purgeEffect(target, ESM::MagicEffect::Poison);
-            break;
-        case ESM::MagicEffect::CureParalyzation:
-            target.getClass().getCreatureStats(target).getActiveSpells().purgeEffect(target, ESM::MagicEffect::Paralyze);
-            break;
-        case ESM::MagicEffect::Dispel:
-            // Dispel removes entire spells at once
-            target.getClass().getCreatureStats(target).getActiveSpells().purge([magnitude=effect.mMagnitude] (const ActiveSpells::ActiveSpellParams& params)
-            {
-                if(params.getType() == ESM::ActiveSpells::Type_Temporary)
+        const auto world = MWBase::Environment::get().getWorld();
+        bool godmode = target == getPlayer() && world->getGodModeState();
+        switch (effect.mEffectId)
+        {
+            case ESM::MagicEffect::CureCommonDisease:
+                target.getClass().getCreatureStats(target).getSpells().purgeCommonDisease();
+                break;
+            case ESM::MagicEffect::CureBlightDisease:
+                target.getClass().getCreatureStats(target).getSpells().purgeBlightDisease();
+                break;
+            case ESM::MagicEffect::RemoveCurse:
+                target.getClass().getCreatureStats(target).getSpells().purgeCurses();
+                break;
+            case ESM::MagicEffect::CureCorprusDisease:
+                target.getClass().getCreatureStats(target).getActiveSpells().purgeEffect(
+                    target, ESM::MagicEffect::Corprus);
+                break;
+            case ESM::MagicEffect::CurePoison:
+                target.getClass().getCreatureStats(target).getActiveSpells().purgeEffect(
+                    target, ESM::MagicEffect::Poison);
+                break;
+            case ESM::MagicEffect::CureParalyzation:
+                target.getClass().getCreatureStats(target).getActiveSpells().purgeEffect(
+                    target, ESM::MagicEffect::Paralyze);
+                break;
+            case ESM::MagicEffect::Dispel:
+                // Dispel removes entire spells at once
+                target.getClass().getCreatureStats(target).getActiveSpells().purge(
+                    [magnitude = effect.mMagnitude](const ActiveSpells::ActiveSpellParams& params) {
+                        if (params.getType() == ESM::ActiveSpells::Type_Temporary)
+                        {
+                            const ESM::Spell* spell
+                                = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(
+                                    params.getId());
+                            if (spell && spell->mData.mType == ESM::Spell::ST_Spell)
+                            {
+                                auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+                                return Misc::Rng::roll0to99(prng) < magnitude;
+                            }
+                        }
+                        return false;
+                    },
+                    target);
+                break;
+            case ESM::MagicEffect::AlmsiviIntervention:
+            case ESM::MagicEffect::DivineIntervention:
+                if (target != getPlayer())
+                    invalid = true;
+                else if (world->isTeleportingEnabled())
                 {
-                    const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(params.getId());
-                    if (spell && spell->mData.mType == ESM::Spell::ST_Spell)
+                    std::string_view marker
+                        = (effect.mEffectId == ESM::MagicEffect::DivineIntervention) ? "divinemarker" : "templemarker";
+                    world->teleportToClosestMarker(target, marker);
+                    if (!caster.isEmpty())
                     {
-                        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-                        return Misc::Rng::roll0to99(prng) < magnitude;
+                        MWRender::Animation* anim = world->getAnimation(caster);
+                        anim->removeEffect(effect.mEffectId);
+                        const ESM::Static* fx = world->getStore().get<ESM::Static>().search("VFX_Summon_end");
+                        if (fx)
+                        {
+                            const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+                            anim->addEffect(Misc::ResourceHelpers::correctMeshPath(fx->mModel, vfs), -1);
+                        }
                     }
                 }
-                return false;
-            }, target);
-            break;
-        case ESM::MagicEffect::AlmsiviIntervention:
-        case ESM::MagicEffect::DivineIntervention:
-            if (target != getPlayer())
-                invalid = true;
-            else if (world->isTeleportingEnabled())
-            {
-                std::string_view marker = (effect.mEffectId == ESM::MagicEffect::DivineIntervention) ? "divinemarker" : "templemarker";
-                world->teleportToClosestMarker(target, marker);
-                if(!caster.isEmpty())
+                else if (caster == getPlayer())
+                    MWBase::Environment::get().getWindowManager()->messageBox("#{sTeleportDisabled}");
+                break;
+            case ESM::MagicEffect::Mark:
+                if (target != getPlayer())
+                    invalid = true;
+                else if (world->isTeleportingEnabled())
+                    world->getPlayer().markPosition(target.getCell(), target.getRefData().getPosition());
+                else if (caster == getPlayer())
+                    MWBase::Environment::get().getWindowManager()->messageBox("#{sTeleportDisabled}");
+                break;
+            case ESM::MagicEffect::Recall:
+                if (target != getPlayer())
+                    invalid = true;
+                else if (world->isTeleportingEnabled())
                 {
-                    MWRender::Animation* anim = world->getAnimation(caster);
-                    anim->removeEffect(effect.mEffectId);
-                    const ESM::Static* fx = world->getStore().get<ESM::Static>().search("VFX_Summon_end");
-                    if (fx)
+                    MWWorld::CellStore* markedCell = nullptr;
+                    ESM::Position markedPosition;
+
+                    world->getPlayer().getMarkedPosition(markedCell, markedPosition);
+                    if (markedCell)
                     {
-                        const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-                        anim->addEffect(Misc::ResourceHelpers::correctMeshPath(fx->mModel, vfs), -1);
+                        std::string_view dest;
+                        if (!markedCell->isExterior())
+                            dest = markedCell->getCell()->mName;
+                        MWWorld::ActionTeleport action(dest, markedPosition, false);
+                        action.execute(target);
+                        if (!caster.isEmpty())
+                        {
+                            MWRender::Animation* anim = world->getAnimation(caster);
+                            anim->removeEffect(effect.mEffectId);
+                        }
                     }
                 }
-            }
-            else if (caster == getPlayer())
-                MWBase::Environment::get().getWindowManager()->messageBox("#{sTeleportDisabled}");
-            break;
-        case ESM::MagicEffect::Mark:
-            if (target != getPlayer())
-                invalid = true;
-            else if (world->isTeleportingEnabled())
-                world->getPlayer().markPosition(target.getCell(), target.getRefData().getPosition());
-            else if (caster == getPlayer())
-                MWBase::Environment::get().getWindowManager()->messageBox("#{sTeleportDisabled}");
-            break;
-        case ESM::MagicEffect::Recall:
-            if (target != getPlayer())
-                invalid = true;
-            else if (world->isTeleportingEnabled())
-            {
-                MWWorld::CellStore* markedCell = nullptr;
-                ESM::Position markedPosition;
-
-                world->getPlayer().getMarkedPosition(markedCell, markedPosition);
-                if (markedCell)
+                else if (caster == getPlayer())
+                    MWBase::Environment::get().getWindowManager()->messageBox("#{sTeleportDisabled}");
+                break;
+            case ESM::MagicEffect::CommandCreature:
+            case ESM::MagicEffect::CommandHumanoid:
+                if (caster.isEmpty() || !caster.getClass().isActor() || target == getPlayer()
+                    || (effect.mEffectId == ESM::MagicEffect::CommandCreature) == target.getClass().isNpc())
+                    invalid = true;
+                else if (effect.mMagnitude >= target.getClass().getCreatureStats(target).getLevel())
                 {
-                    std::string_view dest;
-                    if (!markedCell->isExterior())
-                        dest = markedCell->getCell()->mName;
-                    MWWorld::ActionTeleport action(dest, markedPosition, false);
-                    action.execute(target);
-                    if(!caster.isEmpty())
-                    {
-                        MWRender::Animation* anim = world->getAnimation(caster);
-                        anim->removeEffect(effect.mEffectId);
-                    }
+                    MWMechanics::AiFollow package(caster, true);
+                    target.getClass().getCreatureStats(target).getAiSequence().stack(package, target);
                 }
-            }
-            else if (caster == getPlayer())
-                MWBase::Environment::get().getWindowManager()->messageBox("#{sTeleportDisabled}");
-            break;
-        case ESM::MagicEffect::CommandCreature:
-        case ESM::MagicEffect::CommandHumanoid:
-            if(caster.isEmpty() || !caster.getClass().isActor() || target == getPlayer() || (effect.mEffectId == ESM::MagicEffect::CommandCreature) == target.getClass().isNpc())
-                invalid = true;
-            else if(effect.mMagnitude >= target.getClass().getCreatureStats(target).getLevel())
-            {
-                MWMechanics::AiFollow package(caster, true);
-                target.getClass().getCreatureStats(target).getAiSequence().stack(package, target);
-            }
-            break;
-        case ESM::MagicEffect::ExtraSpell:
-            if(target.getClass().hasInventoryStore(target))
-            {
-                auto& store = target.getClass().getInventoryStore(target);
-                store.unequipAll(target);
-            }
-            else
-                invalid = true;
-            break;
-        case ESM::MagicEffect::TurnUndead:
-            if(target.getClass().isNpc() || target.get<ESM::Creature>()->mBase->mData.mType != ESM::Creature::Undead)
-                invalid = true;
-            else
-            {
-                auto& creatureStats = target.getClass().getCreatureStats(target);
-                Stat<int> stat = creatureStats.getAiSetting(AiSetting::Flee);
-                stat.setModifier(static_cast<int>(stat.getModifier() + effect.mMagnitude));
-                creatureStats.setAiSetting(AiSetting::Flee, stat);
-            }
-            break;
-        case ESM::MagicEffect::FrenzyCreature:
-        case ESM::MagicEffect::FrenzyHumanoid:
-            modifyAiSetting(target, effect, ESM::MagicEffect::FrenzyCreature, AiSetting::Fight, effect.mMagnitude, invalid);
-            break;
-        case ESM::MagicEffect::CalmCreature:
-        case ESM::MagicEffect::CalmHumanoid:
-            modifyAiSetting(target, effect, ESM::MagicEffect::CalmCreature, AiSetting::Fight, -effect.mMagnitude, invalid);
-            if(!invalid && effect.mMagnitude > 0)
-            {
-                auto& creatureStats = target.getClass().getCreatureStats(target);
-                creatureStats.getAiSequence().stopCombat();
-            }
-            break;
-        case ESM::MagicEffect::DemoralizeCreature:
-        case ESM::MagicEffect::DemoralizeHumanoid:
-            modifyAiSetting(target, effect, ESM::MagicEffect::DemoralizeCreature, AiSetting::Flee, effect.mMagnitude, invalid);
-            break;
-        case ESM::MagicEffect::RallyCreature:
-        case ESM::MagicEffect::RallyHumanoid:
-            modifyAiSetting(target, effect, ESM::MagicEffect::RallyCreature, AiSetting::Flee, -effect.mMagnitude, invalid);
-            break;
-        case ESM::MagicEffect::Sound:
-            if(target == getPlayer())
-            {
-                const auto& magnitudes = target.getClass().getCreatureStats(target).getMagicEffects();
-                float volume = std::clamp((magnitudes.get(effect.mEffectId).getModifier() + effect.mMagnitude) / 100.f, 0.f, 1.f);
-                MWBase::Environment::get().getSoundManager()->playSound3D(target, "magic sound", volume, 1.f, MWSound::Type::Sfx, MWSound::PlayMode::LoopNoEnv);
-            }
-            break;
-        case ESM::MagicEffect::SummonScamp:
-        case ESM::MagicEffect::SummonClannfear:
-        case ESM::MagicEffect::SummonDaedroth:
-        case ESM::MagicEffect::SummonDremora:
-        case ESM::MagicEffect::SummonAncestralGhost:
-        case ESM::MagicEffect::SummonSkeletalMinion:
-        case ESM::MagicEffect::SummonBonewalker:
-        case ESM::MagicEffect::SummonGreaterBonewalker:
-        case ESM::MagicEffect::SummonBonelord:
-        case ESM::MagicEffect::SummonWingedTwilight:
-        case ESM::MagicEffect::SummonHunger:
-        case ESM::MagicEffect::SummonGoldenSaint:
-        case ESM::MagicEffect::SummonFlameAtronach:
-        case ESM::MagicEffect::SummonFrostAtronach:
-        case ESM::MagicEffect::SummonStormAtronach:
-        case ESM::MagicEffect::SummonCenturionSphere:
-        case ESM::MagicEffect::SummonFabricant:
-        case ESM::MagicEffect::SummonWolf:
-        case ESM::MagicEffect::SummonBear:
-        case ESM::MagicEffect::SummonBonewolf:
-        case ESM::MagicEffect::SummonCreature04:
-        case ESM::MagicEffect::SummonCreature05:
-            if(!target.isInCell())
-                invalid = true;
-            else
-                effect.mArg = summonCreature(effect.mEffectId, target);
-            break;
-        case ESM::MagicEffect::BoundGloves:
-            if(!target.getClass().hasInventoryStore(target))
-            {
-                invalid = true;
                 break;
-            }
-            addBoundItem(world->getStore().get<ESM::GameSetting>().find("sMagicBoundRightGauntletID")->mValue.getString(), target);
-            // left gauntlet added below
-            [[fallthrough]];
-        case ESM::MagicEffect::BoundDagger:
-        case ESM::MagicEffect::BoundLongsword:
-        case ESM::MagicEffect::BoundMace:
-        case ESM::MagicEffect::BoundBattleAxe:
-        case ESM::MagicEffect::BoundSpear:
-        case ESM::MagicEffect::BoundLongbow:
-        case ESM::MagicEffect::BoundCuirass:
-        case ESM::MagicEffect::BoundHelm:
-        case ESM::MagicEffect::BoundBoots:
-        case ESM::MagicEffect::BoundShield:
-            if(!target.getClass().hasInventoryStore(target))
-                invalid = true;
-            else
-            {
-                const std::string& item = sBoundItemsMap.at(effect.mEffectId);
-                addBoundItem(world->getStore().get<ESM::GameSetting>().find(item)->mValue.getString(), target);
-            }
-            break;
-        case ESM::MagicEffect::FireDamage:
-        case ESM::MagicEffect::ShockDamage:
-        case ESM::MagicEffect::FrostDamage:
-        case ESM::MagicEffect::DamageHealth:
-        case ESM::MagicEffect::Poison:
-        case ESM::MagicEffect::DamageMagicka:
-        case ESM::MagicEffect::DamageFatigue:
-            if(!godmode)
-            {
-                int index = 0;
-                if(effect.mEffectId == ESM::MagicEffect::DamageMagicka)
-                    index = 1;
-                else if(effect.mEffectId == ESM::MagicEffect::DamageFatigue)
-                    index = 2;
-                // Damage "Dynamic" abilities reduce the base value
-                if(spellParams.getType() == ESM::ActiveSpells::Type_Ability)
-                    modDynamicStat(target, index, -effect.mMagnitude);
+            case ESM::MagicEffect::ExtraSpell:
+                if (target.getClass().hasInventoryStore(target))
+                {
+                    auto& store = target.getClass().getInventoryStore(target);
+                    store.unequipAll(target);
+                }
+                else
+                    invalid = true;
+                break;
+            case ESM::MagicEffect::TurnUndead:
+                if (target.getClass().isNpc()
+                    || target.get<ESM::Creature>()->mBase->mData.mType != ESM::Creature::Undead)
+                    invalid = true;
                 else
                 {
-                    static const bool uncappedDamageFatigue = Settings::Manager::getBool("uncapped damage fatigue", "Game");
-                    adjustDynamicStat(target, index, -effect.mMagnitude, index == 2 && uncappedDamageFatigue);
-                    if(index == 0)
-                        receivedMagicDamage = affectedHealth = true;
+                    auto& creatureStats = target.getClass().getCreatureStats(target);
+                    Stat<int> stat = creatureStats.getAiSetting(AiSetting::Flee);
+                    stat.setModifier(static_cast<int>(stat.getModifier() + effect.mMagnitude));
+                    creatureStats.setAiSetting(AiSetting::Flee, stat);
                 }
-            }
-            break;
-        case ESM::MagicEffect::DamageAttribute:
-            if(!godmode)
-                damageAttribute(target, effect, effect.mMagnitude);
-            break;
-        case ESM::MagicEffect::DamageSkill:
-            if(!target.getClass().isNpc())
-                invalid = true;
-            else if(!godmode)
-            {
-                // Damage Skill abilities reduce base skill :todd:
-                if(spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+                break;
+            case ESM::MagicEffect::FrenzyCreature:
+            case ESM::MagicEffect::FrenzyHumanoid:
+                modifyAiSetting(
+                    target, effect, ESM::MagicEffect::FrenzyCreature, AiSetting::Fight, effect.mMagnitude, invalid);
+                break;
+            case ESM::MagicEffect::CalmCreature:
+            case ESM::MagicEffect::CalmHumanoid:
+                modifyAiSetting(
+                    target, effect, ESM::MagicEffect::CalmCreature, AiSetting::Fight, -effect.mMagnitude, invalid);
+                if (!invalid && effect.mMagnitude > 0)
+                {
+                    auto& creatureStats = target.getClass().getCreatureStats(target);
+                    creatureStats.getAiSequence().stopCombat();
+                }
+                break;
+            case ESM::MagicEffect::DemoralizeCreature:
+            case ESM::MagicEffect::DemoralizeHumanoid:
+                modifyAiSetting(
+                    target, effect, ESM::MagicEffect::DemoralizeCreature, AiSetting::Flee, effect.mMagnitude, invalid);
+                break;
+            case ESM::MagicEffect::RallyCreature:
+            case ESM::MagicEffect::RallyHumanoid:
+                modifyAiSetting(
+                    target, effect, ESM::MagicEffect::RallyCreature, AiSetting::Flee, -effect.mMagnitude, invalid);
+                break;
+            case ESM::MagicEffect::Sound:
+                if (target == getPlayer())
+                {
+                    const auto& magnitudes = target.getClass().getCreatureStats(target).getMagicEffects();
+                    float volume = std::clamp(
+                        (magnitudes.get(effect.mEffectId).getModifier() + effect.mMagnitude) / 100.f, 0.f, 1.f);
+                    MWBase::Environment::get().getSoundManager()->playSound3D(
+                        target, "magic sound", volume, 1.f, MWSound::Type::Sfx, MWSound::PlayMode::LoopNoEnv);
+                }
+                break;
+            case ESM::MagicEffect::SummonScamp:
+            case ESM::MagicEffect::SummonClannfear:
+            case ESM::MagicEffect::SummonDaedroth:
+            case ESM::MagicEffect::SummonDremora:
+            case ESM::MagicEffect::SummonAncestralGhost:
+            case ESM::MagicEffect::SummonSkeletalMinion:
+            case ESM::MagicEffect::SummonBonewalker:
+            case ESM::MagicEffect::SummonGreaterBonewalker:
+            case ESM::MagicEffect::SummonBonelord:
+            case ESM::MagicEffect::SummonWingedTwilight:
+            case ESM::MagicEffect::SummonHunger:
+            case ESM::MagicEffect::SummonGoldenSaint:
+            case ESM::MagicEffect::SummonFlameAtronach:
+            case ESM::MagicEffect::SummonFrostAtronach:
+            case ESM::MagicEffect::SummonStormAtronach:
+            case ESM::MagicEffect::SummonCenturionSphere:
+            case ESM::MagicEffect::SummonFabricant:
+            case ESM::MagicEffect::SummonWolf:
+            case ESM::MagicEffect::SummonBear:
+            case ESM::MagicEffect::SummonBonewolf:
+            case ESM::MagicEffect::SummonCreature04:
+            case ESM::MagicEffect::SummonCreature05:
+                if (!target.isInCell())
+                    invalid = true;
+                else
+                    effect.mArg = summonCreature(effect.mEffectId, target);
+                break;
+            case ESM::MagicEffect::BoundGloves:
+                if (!target.getClass().hasInventoryStore(target))
+                {
+                    invalid = true;
+                    break;
+                }
+                addBoundItem(
+                    world->getStore().get<ESM::GameSetting>().find("sMagicBoundRightGauntletID")->mValue.getString(),
+                    target);
+                // left gauntlet added below
+                [[fallthrough]];
+            case ESM::MagicEffect::BoundDagger:
+            case ESM::MagicEffect::BoundLongsword:
+            case ESM::MagicEffect::BoundMace:
+            case ESM::MagicEffect::BoundBattleAxe:
+            case ESM::MagicEffect::BoundSpear:
+            case ESM::MagicEffect::BoundLongbow:
+            case ESM::MagicEffect::BoundCuirass:
+            case ESM::MagicEffect::BoundHelm:
+            case ESM::MagicEffect::BoundBoots:
+            case ESM::MagicEffect::BoundShield:
+                if (!target.getClass().hasInventoryStore(target))
+                    invalid = true;
+                else
+                {
+                    const std::string& item = sBoundItemsMap.at(effect.mEffectId);
+                    addBoundItem(world->getStore().get<ESM::GameSetting>().find(item)->mValue.getString(), target);
+                }
+                break;
+            case ESM::MagicEffect::FireDamage:
+            case ESM::MagicEffect::ShockDamage:
+            case ESM::MagicEffect::FrostDamage:
+            case ESM::MagicEffect::DamageHealth:
+            case ESM::MagicEffect::Poison:
+            case ESM::MagicEffect::DamageMagicka:
+            case ESM::MagicEffect::DamageFatigue:
+                if (!godmode)
+                {
+                    int index = 0;
+                    if (effect.mEffectId == ESM::MagicEffect::DamageMagicka)
+                        index = 1;
+                    else if (effect.mEffectId == ESM::MagicEffect::DamageFatigue)
+                        index = 2;
+                    // Damage "Dynamic" abilities reduce the base value
+                    if (spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+                        modDynamicStat(target, index, -effect.mMagnitude);
+                    else
+                    {
+                        static const bool uncappedDamageFatigue
+                            = Settings::Manager::getBool("uncapped damage fatigue", "Game");
+                        adjustDynamicStat(target, index, -effect.mMagnitude, index == 2 && uncappedDamageFatigue);
+                        if (index == 0)
+                            receivedMagicDamage = affectedHealth = true;
+                    }
+                }
+                break;
+            case ESM::MagicEffect::DamageAttribute:
+                if (!godmode)
+                    damageAttribute(target, effect, effect.mMagnitude);
+                break;
+            case ESM::MagicEffect::DamageSkill:
+                if (!target.getClass().isNpc())
+                    invalid = true;
+                else if (!godmode)
                 {
-                    auto& npcStats = target.getClass().getNpcStats(target);
-                    SkillValue& skill = npcStats.getSkill(effect.mArg);
                     // Damage Skill abilities reduce base skill :todd:
-                    skill.setBase(std::max(skill.getBase() - effect.mMagnitude, 0.f));
+                    if (spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+                    {
+                        auto& npcStats = target.getClass().getNpcStats(target);
+                        SkillValue& skill = npcStats.getSkill(effect.mArg);
+                        // Damage Skill abilities reduce base skill :todd:
+                        skill.setBase(std::max(skill.getBase() - effect.mMagnitude, 0.f));
+                    }
+                    else
+                        damageSkill(target, effect, effect.mMagnitude);
                 }
+                break;
+            case ESM::MagicEffect::RestoreAttribute:
+                restoreAttribute(target, effect, effect.mMagnitude);
+                break;
+            case ESM::MagicEffect::RestoreSkill:
+                if (!target.getClass().isNpc())
+                    invalid = true;
                 else
-                    damageSkill(target, effect, effect.mMagnitude);
-            }
-            break;
-        case ESM::MagicEffect::RestoreAttribute:
-            restoreAttribute(target, effect, effect.mMagnitude);
-            break;
-        case ESM::MagicEffect::RestoreSkill:
-            if(!target.getClass().isNpc())
-                invalid = true;
-            else
-                restoreSkill(target, effect, effect.mMagnitude);
-            break;
-        case ESM::MagicEffect::RestoreHealth:
-            affectedHealth = true;
-            [[fallthrough]];
-        case ESM::MagicEffect::RestoreMagicka:
-        case ESM::MagicEffect::RestoreFatigue:
-            adjustDynamicStat(target, effect.mEffectId - ESM::MagicEffect::RestoreHealth, effect.mMagnitude);
-            break;
-        case ESM::MagicEffect::SunDamage:
+                    restoreSkill(target, effect, effect.mMagnitude);
+                break;
+            case ESM::MagicEffect::RestoreHealth:
+                affectedHealth = true;
+                [[fallthrough]];
+            case ESM::MagicEffect::RestoreMagicka:
+            case ESM::MagicEffect::RestoreFatigue:
+                adjustDynamicStat(target, effect.mEffectId - ESM::MagicEffect::RestoreHealth, effect.mMagnitude);
+                break;
+            case ESM::MagicEffect::SunDamage:
             {
                 // isInCell shouldn't be needed, but updateActor called during game start
-                if (!target.isInCell() || !(target.getCell()->isExterior() || target.getCell()->isQuasiExterior()) || godmode)
+                if (!target.isInCell() || !(target.getCell()->isExterior() || target.getCell()->isQuasiExterior())
+                    || godmode)
                     break;
                 const float sunRisen = world->getSunPercentage();
-                static float fMagicSunBlockedMult = world->getStore().get<ESM::GameSetting>().find("fMagicSunBlockedMult")->mValue.getFloat();
-                const float damageScale = std::clamp(std::max(world->getSunVisibility() * sunRisen, fMagicSunBlockedMult * sunRisen), 0.f, 1.f);
+                static float fMagicSunBlockedMult
+                    = world->getStore().get<ESM::GameSetting>().find("fMagicSunBlockedMult")->mValue.getFloat();
+                const float damageScale = std::clamp(
+                    std::max(world->getSunVisibility() * sunRisen, fMagicSunBlockedMult * sunRisen), 0.f, 1.f);
                 float damage = effect.mMagnitude * damageScale;
                 adjustDynamicStat(target, 0, -damage);
                 if (damage > 0.f)
                     receivedMagicDamage = affectedHealth = true;
             }
             break;
-        case ESM::MagicEffect::DrainHealth:
-        case ESM::MagicEffect::DrainMagicka:
-        case ESM::MagicEffect::DrainFatigue:
-            if(!godmode)
-            {
-                static const bool uncappedDamageFatigue = Settings::Manager::getBool("uncapped damage fatigue", "Game");
-                int index = effect.mEffectId - ESM::MagicEffect::DrainHealth;
-                adjustDynamicStat(target, index, -effect.mMagnitude, uncappedDamageFatigue && index == 2);
-                if(index == 0)
-                    receivedMagicDamage = affectedHealth = true;
-            }
-            break;
-        case ESM::MagicEffect::FortifyHealth:
-        case ESM::MagicEffect::FortifyMagicka:
-        case ESM::MagicEffect::FortifyFatigue:
-            if(spellParams.getType() == ESM::ActiveSpells::Type_Ability)
-                modDynamicStat(target, effect.mEffectId - ESM::MagicEffect::FortifyHealth, effect.mMagnitude);
-            else
-                adjustDynamicStat(target, effect.mEffectId - ESM::MagicEffect::FortifyHealth, effect.mMagnitude, false, true);
-            break;
-        case ESM::MagicEffect::DrainAttribute:
-            if(!godmode)
-                damageAttribute(target, effect, effect.mMagnitude);
-            break;
-        case ESM::MagicEffect::FortifyAttribute:
-            // Abilities affect base stats, but not for drain
-            if(spellParams.getType() == ESM::ActiveSpells::Type_Ability)
-            {
-                auto& creatureStats = target.getClass().getCreatureStats(target);
-                AttributeValue attr = creatureStats.getAttribute(effect.mArg);
-                attr.setBase(attr.getBase() + effect.mMagnitude);
-                creatureStats.setAttribute(effect.mArg, attr);
-            }
-            else
-                fortifyAttribute(target, effect, effect.mMagnitude);
-            break;
-        case ESM::MagicEffect::DrainSkill:
-            if(!target.getClass().isNpc())
-                invalid = true;
-            else if(!godmode)
-                damageSkill(target, effect, effect.mMagnitude);
-            break;
-        case ESM::MagicEffect::FortifySkill:
-            if(!target.getClass().isNpc())
-                invalid = true;
-            else if(spellParams.getType() == ESM::ActiveSpells::Type_Ability)
-            {
+            case ESM::MagicEffect::DrainHealth:
+            case ESM::MagicEffect::DrainMagicka:
+            case ESM::MagicEffect::DrainFatigue:
+                if (!godmode)
+                {
+                    static const bool uncappedDamageFatigue
+                        = Settings::Manager::getBool("uncapped damage fatigue", "Game");
+                    int index = effect.mEffectId - ESM::MagicEffect::DrainHealth;
+                    adjustDynamicStat(target, index, -effect.mMagnitude, uncappedDamageFatigue && index == 2);
+                    if (index == 0)
+                        receivedMagicDamage = affectedHealth = true;
+                }
+                break;
+            case ESM::MagicEffect::FortifyHealth:
+            case ESM::MagicEffect::FortifyMagicka:
+            case ESM::MagicEffect::FortifyFatigue:
+                if (spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+                    modDynamicStat(target, effect.mEffectId - ESM::MagicEffect::FortifyHealth, effect.mMagnitude);
+                else
+                    adjustDynamicStat(
+                        target, effect.mEffectId - ESM::MagicEffect::FortifyHealth, effect.mMagnitude, false, true);
+                break;
+            case ESM::MagicEffect::DrainAttribute:
+                if (!godmode)
+                    damageAttribute(target, effect, effect.mMagnitude);
+                break;
+            case ESM::MagicEffect::FortifyAttribute:
                 // Abilities affect base stats, but not for drain
-                auto& npcStats = target.getClass().getNpcStats(target);
-                auto& skill = npcStats.getSkill(effect.mArg);
-                skill.setBase(skill.getBase() + effect.mMagnitude);
-            }
-            else
-                fortifySkill(target, effect, effect.mMagnitude);
-            break;
-        case ESM::MagicEffect::FortifyMaximumMagicka:
-            recalculateMagicka = true;
-            break;
-        case ESM::MagicEffect::AbsorbHealth:
-        case ESM::MagicEffect::AbsorbMagicka:
-        case ESM::MagicEffect::AbsorbFatigue:
-            if(!godmode)
-            {
-                int index = effect.mEffectId - ESM::MagicEffect::AbsorbHealth;
-                adjustDynamicStat(target, index, -effect.mMagnitude);
-                if(!caster.isEmpty())
-                    adjustDynamicStat(caster, index, effect.mMagnitude);
-                if(index == 0)
-                    receivedMagicDamage = affectedHealth = true;
-            }
-            break;
-        case ESM::MagicEffect::AbsorbAttribute:
-            if(!godmode)
-            {
-                damageAttribute(target, effect, effect.mMagnitude);
-                if(!caster.isEmpty())
-                    fortifyAttribute(caster, effect, effect.mMagnitude);
-            }
-            break;
-        case ESM::MagicEffect::AbsorbSkill:
-            if(!target.getClass().isNpc())
-                invalid = true;
-            else if(!godmode)
+                if (spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+                {
+                    auto& creatureStats = target.getClass().getCreatureStats(target);
+                    AttributeValue attr = creatureStats.getAttribute(effect.mArg);
+                    attr.setBase(attr.getBase() + effect.mMagnitude);
+                    creatureStats.setAttribute(effect.mArg, attr);
+                }
+                else
+                    fortifyAttribute(target, effect, effect.mMagnitude);
+                break;
+            case ESM::MagicEffect::DrainSkill:
+                if (!target.getClass().isNpc())
+                    invalid = true;
+                else if (!godmode)
+                    damageSkill(target, effect, effect.mMagnitude);
+                break;
+            case ESM::MagicEffect::FortifySkill:
+                if (!target.getClass().isNpc())
+                    invalid = true;
+                else if (spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+                {
+                    // Abilities affect base stats, but not for drain
+                    auto& npcStats = target.getClass().getNpcStats(target);
+                    auto& skill = npcStats.getSkill(effect.mArg);
+                    skill.setBase(skill.getBase() + effect.mMagnitude);
+                }
+                else
+                    fortifySkill(target, effect, effect.mMagnitude);
+                break;
+            case ESM::MagicEffect::FortifyMaximumMagicka:
+                recalculateMagicka = true;
+                break;
+            case ESM::MagicEffect::AbsorbHealth:
+            case ESM::MagicEffect::AbsorbMagicka:
+            case ESM::MagicEffect::AbsorbFatigue:
+                if (!godmode)
+                {
+                    int index = effect.mEffectId - ESM::MagicEffect::AbsorbHealth;
+                    adjustDynamicStat(target, index, -effect.mMagnitude);
+                    if (!caster.isEmpty())
+                        adjustDynamicStat(caster, index, effect.mMagnitude);
+                    if (index == 0)
+                        receivedMagicDamage = affectedHealth = true;
+                }
+                break;
+            case ESM::MagicEffect::AbsorbAttribute:
+                if (!godmode)
+                {
+                    damageAttribute(target, effect, effect.mMagnitude);
+                    if (!caster.isEmpty())
+                        fortifyAttribute(caster, effect, effect.mMagnitude);
+                }
+                break;
+            case ESM::MagicEffect::AbsorbSkill:
+                if (!target.getClass().isNpc())
+                    invalid = true;
+                else if (!godmode)
+                {
+                    damageSkill(target, effect, effect.mMagnitude);
+                    if (!caster.isEmpty())
+                        fortifySkill(caster, effect, effect.mMagnitude);
+                }
+                break;
+            case ESM::MagicEffect::DisintegrateArmor:
             {
-                damageSkill(target, effect, effect.mMagnitude);
-                if(!caster.isEmpty())
-                    fortifySkill(caster, effect, effect.mMagnitude);
+                if (!target.getClass().hasInventoryStore(target))
+                {
+                    invalid = true;
+                    break;
+                }
+                if (godmode)
+                    break;
+                static const std::array<int, 9> priorities{
+                    MWWorld::InventoryStore::Slot_CarriedLeft,
+                    MWWorld::InventoryStore::Slot_Cuirass,
+                    MWWorld::InventoryStore::Slot_LeftPauldron,
+                    MWWorld::InventoryStore::Slot_RightPauldron,
+                    MWWorld::InventoryStore::Slot_LeftGauntlet,
+                    MWWorld::InventoryStore::Slot_RightGauntlet,
+                    MWWorld::InventoryStore::Slot_Helmet,
+                    MWWorld::InventoryStore::Slot_Greaves,
+                    MWWorld::InventoryStore::Slot_Boots,
+                };
+                for (const int priority : priorities)
+                {
+                    if (disintegrateSlot(target, priority, effect.mMagnitude))
+                        break;
+                }
+                break;
             }
-            break;
-        case ESM::MagicEffect::DisintegrateArmor:
+            case ESM::MagicEffect::DisintegrateWeapon:
+                if (!target.getClass().hasInventoryStore(target))
+                {
+                    invalid = true;
+                    break;
+                }
+                if (!godmode)
+                    disintegrateSlot(target, MWWorld::InventoryStore::Slot_CarriedRight, effect.mMagnitude);
+                break;
+        }
+    }
+
+    bool shouldRemoveEffect(const MWWorld::Ptr& target, const ESM::ActiveEffect& effect)
+    {
+        const auto world = MWBase::Environment::get().getWorld();
+        switch (effect.mEffectId)
         {
-            if (!target.getClass().hasInventoryStore(target))
+            case ESM::MagicEffect::Levitate:
             {
-                invalid = true;
+                if (!world->isLevitationEnabled())
+                {
+                    if (target == getPlayer())
+                        MWBase::Environment::get().getWindowManager()->messageBox("#{sLevitateDisabled}");
+                    return true;
+                }
                 break;
             }
-            if (godmode)
-                break;
-            static const std::array<int, 9>  priorities
+            case ESM::MagicEffect::Recall:
+            case ESM::MagicEffect::DivineIntervention:
+            case ESM::MagicEffect::AlmsiviIntervention:
             {
-                MWWorld::InventoryStore::Slot_CarriedLeft,
-                MWWorld::InventoryStore::Slot_Cuirass,
-                MWWorld::InventoryStore::Slot_LeftPauldron,
-                MWWorld::InventoryStore::Slot_RightPauldron,
-                MWWorld::InventoryStore::Slot_LeftGauntlet,
-                MWWorld::InventoryStore::Slot_RightGauntlet,
-                MWWorld::InventoryStore::Slot_Helmet,
-                MWWorld::InventoryStore::Slot_Greaves,
-                MWWorld::InventoryStore::Slot_Boots,
-            };
-            for (const int priority : priorities)
-            {
-                if (disintegrateSlot(target, priority, effect.mMagnitude))
-                    break;
+                return effect.mFlags & ESM::ActiveEffect::Flag_Applied;
             }
-            break;
-        }
-        case ESM::MagicEffect::DisintegrateWeapon:
-            if (!target.getClass().hasInventoryStore(target))
+            case ESM::MagicEffect::WaterWalking:
             {
-                invalid = true;
+                if (target.getClass().isPureWaterCreature(target) && world->isSwimming(target))
+                    return true;
+                if (effect.mFlags & ESM::ActiveEffect::Flag_Applied)
+                    break;
+                if (!world->isWaterWalkingCastableOnTarget(target))
+                {
+                    if (target == getPlayer())
+                        MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicInvalidEffect}");
+                    return true;
+                }
                 break;
             }
-            if (!godmode)
-                disintegrateSlot(target, MWWorld::InventoryStore::Slot_CarriedRight, effect.mMagnitude);
-            break;
+        }
+        return false;
     }
-}
 
-bool shouldRemoveEffect(const MWWorld::Ptr& target, const ESM::ActiveEffect& effect)
-{
-    const auto world = MWBase::Environment::get().getWorld();
-    switch(effect.mEffectId)
+    MagicApplicationResult applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster,
+        ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect, float dt)
     {
-        case ESM::MagicEffect::Levitate:
+        const auto world = MWBase::Environment::get().getWorld();
+        bool invalid = false;
+        bool receivedMagicDamage = false;
+        bool recalculateMagicka = false;
+        bool affectedHealth = false;
+        if (effect.mEffectId == ESM::MagicEffect::Corprus && spellParams.shouldWorsen())
         {
-            if(!world->isLevitationEnabled())
+            spellParams.worsen();
+            for (auto& otherEffect : spellParams.getEffects())
             {
-                if(target == getPlayer())
-                    MWBase::Environment::get().getWindowManager()->messageBox("#{sLevitateDisabled}");
-                return true;
+                if (isCorprusEffect(otherEffect))
+                    applyMagicEffect(target, caster, spellParams, otherEffect, invalid, receivedMagicDamage,
+                        affectedHealth, recalculateMagicka);
             }
-            break;
+            if (target == getPlayer())
+                MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicCorprusWorsens}");
+            return { MagicApplicationResult::Type::APPLIED, receivedMagicDamage, affectedHealth };
         }
-        case ESM::MagicEffect::Recall:
-        case ESM::MagicEffect::DivineIntervention:
-        case ESM::MagicEffect::AlmsiviIntervention:
+        else if (shouldRemoveEffect(target, effect))
         {
-            return effect.mFlags & ESM::ActiveEffect::Flag_Applied;
+            onMagicEffectRemoved(target, spellParams, effect);
+            return { MagicApplicationResult::Type::REMOVED, receivedMagicDamage, affectedHealth };
         }
-        case ESM::MagicEffect::WaterWalking:
+        const auto* magicEffect = world->getStore().get<ESM::MagicEffect>().find(effect.mEffectId);
+        if (effect.mFlags & ESM::ActiveEffect::Flag_Applied)
         {
-            if (target.getClass().isPureWaterCreature(target) && world->isSwimming(target))
-                return true;
-            if (effect.mFlags & ESM::ActiveEffect::Flag_Applied)
-                break;
-            if (!world->isWaterWalkingCastableOnTarget(target))
+            if (magicEffect->mData.mFlags & ESM::MagicEffect::Flags::AppliedOnce)
             {
-                if(target == getPlayer())
-                    MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicInvalidEffect}");
-                return true;
+                effect.mTimeLeft -= dt;
+                return { MagicApplicationResult::Type::APPLIED, receivedMagicDamage, affectedHealth };
             }
-            break;
+            else if (!dt)
+                return { MagicApplicationResult::Type::APPLIED, receivedMagicDamage, affectedHealth };
         }
-    }
-    return false;
-}
-
-MagicApplicationResult applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect, float dt)
-{
-    const auto world = MWBase::Environment::get().getWorld();
-    bool invalid = false;
-    bool receivedMagicDamage = false;
-    bool recalculateMagicka = false;
-    bool affectedHealth = false;
-    if(effect.mEffectId == ESM::MagicEffect::Corprus && spellParams.shouldWorsen())
-    {
-        spellParams.worsen();
-        for(auto& otherEffect : spellParams.getEffects())
+        if (effect.mEffectId == ESM::MagicEffect::Lock)
         {
-            if(isCorprusEffect(otherEffect))
-                applyMagicEffect(target, caster, spellParams, otherEffect, invalid, receivedMagicDamage, affectedHealth, recalculateMagicka);
-        }
-        if(target == getPlayer())
-            MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicCorprusWorsens}");
-        return {MagicApplicationResult::Type::APPLIED, receivedMagicDamage, affectedHealth};
-    }
-    else if(shouldRemoveEffect(target, effect))
-    {
-        onMagicEffectRemoved(target, spellParams, effect);
-        return {MagicApplicationResult::Type::REMOVED, receivedMagicDamage, affectedHealth};
-    }
-    const auto* magicEffect = world->getStore().get<ESM::MagicEffect>().find(effect.mEffectId);
-    if(effect.mFlags & ESM::ActiveEffect::Flag_Applied)
-    {
-        if(magicEffect->mData.mFlags & ESM::MagicEffect::Flags::AppliedOnce)
-        {
-            effect.mTimeLeft -= dt;
-            return {MagicApplicationResult::Type::APPLIED, receivedMagicDamage, affectedHealth};
-        }
-        else if(!dt)
-            return {MagicApplicationResult::Type::APPLIED, receivedMagicDamage, affectedHealth};
-    }
-    if(effect.mEffectId == ESM::MagicEffect::Lock)
-    {
-        if(target.getClass().canLock(target))
-        {
-            MWRender::Animation* animation = world->getAnimation(target);
-            if(animation)
-                animation->addSpellCastGlow(magicEffect);
-            int magnitude = static_cast<int>(roll(effect));
-            if(target.getCellRef().getLockLevel() < magnitude) //If the door is not already locked to a higher value, lock it to spell magnitude
+            if (target.getClass().canLock(target))
             {
-                if(caster == getPlayer())
-                    MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicLockSuccess}");
-                target.getCellRef().lock(magnitude);
+                MWRender::Animation* animation = world->getAnimation(target);
+                if (animation)
+                    animation->addSpellCastGlow(magicEffect);
+                int magnitude = static_cast<int>(roll(effect));
+                if (target.getCellRef().getLockLevel()
+                    < magnitude) // If the door is not already locked to a higher value, lock it to spell magnitude
+                {
+                    if (caster == getPlayer())
+                        MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicLockSuccess}");
+                    target.getCellRef().lock(magnitude);
+                }
             }
+            else
+                invalid = true;
         }
-        else
-            invalid = true;
-    }
-    else if(effect.mEffectId == ESM::MagicEffect::Open)
-    {
-        if(target.getClass().canLock(target))
+        else if (effect.mEffectId == ESM::MagicEffect::Open)
         {
-            // Use the player instead of the caster for vanilla crime compatibility
-            MWBase::Environment::get().getMechanicsManager()->unlockAttempted(getPlayer(), target);
-
-            MWRender::Animation* animation = world->getAnimation(target);
-            if(animation)
-                animation->addSpellCastGlow(magicEffect);
-            int magnitude = static_cast<int>(roll(effect));
-            if(target.getCellRef().getLockLevel() <= magnitude)
+            if (target.getClass().canLock(target))
             {
-                if(target.getCellRef().getLockLevel() > 0)
+                // Use the player instead of the caster for vanilla crime compatibility
+                MWBase::Environment::get().getMechanicsManager()->unlockAttempted(getPlayer(), target);
+
+                MWRender::Animation* animation = world->getAnimation(target);
+                if (animation)
+                    animation->addSpellCastGlow(magicEffect);
+                int magnitude = static_cast<int>(roll(effect));
+                if (target.getCellRef().getLockLevel() <= magnitude)
                 {
-                    MWBase::Environment::get().getSoundManager()->playSound3D(target, "Open Lock", 1.f, 1.f);
+                    if (target.getCellRef().getLockLevel() > 0)
+                    {
+                        MWBase::Environment::get().getSoundManager()->playSound3D(target, "Open Lock", 1.f, 1.f);
 
-                    if(caster == getPlayer())
-                        MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicOpenSuccess}");
+                        if (caster == getPlayer())
+                            MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicOpenSuccess}");
+                    }
+                    target.getCellRef().unlock();
+                }
+                else
+                {
+                    MWBase::Environment::get().getSoundManager()->playSound3D(target, "Open Lock Fail", 1.f, 1.f);
                 }
-                target.getCellRef().unlock();
             }
             else
-            {
-                MWBase::Environment::get().getSoundManager()->playSound3D(target, "Open Lock Fail", 1.f, 1.f);
-            }
+                invalid = true;
         }
-        else
-            invalid = true;
-    }
-    else if(!target.getClass().isActor())
-    {
-        invalid = true;
-    }
-    else
-    {
-        auto& stats = target.getClass().getCreatureStats(target);
-        auto& magnitudes = stats.getMagicEffects();
-        if(spellParams.getType() != ESM::ActiveSpells::Type_Ability && !(effect.mFlags & ESM::ActiveEffect::Flag_Applied))
+        else if (!target.getClass().isActor())
         {
-            MagicApplicationResult::Type result = applyProtections(target, caster, spellParams, effect, magicEffect);
-            if(result != MagicApplicationResult::Type::APPLIED)
-                return {result, receivedMagicDamage, affectedHealth};
+            invalid = true;
         }
-        float oldMagnitude = 0.f;
-        if(effect.mFlags & ESM::ActiveEffect::Flag_Applied)
-            oldMagnitude = effect.mMagnitude;
         else
         {
-            if(spellParams.getType() != ESM::ActiveSpells::Type_Enchantment)
-                playEffects(target, *magicEffect, spellParams.getType() == ESM::ActiveSpells::Type_Consumable || spellParams.getType() == ESM::ActiveSpells::Type_Temporary);
-            if(effect.mEffectId == ESM::MagicEffect::Soultrap && !target.getClass().isNpc() && target.getType() == ESM::Creature::sRecordId && target.get<ESM::Creature>()->mBase->mData.mSoul == 0 && caster == getPlayer())
-                MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicInvalidTarget}");
-        }
-        float magnitude = roll(effect);
-        //Note that there's an early out for Flag_Applied AppliedOnce effects so we don't have to exclude them here
-        effect.mMagnitude = magnitude;
-        if(!(magicEffect->mData.mFlags & (ESM::MagicEffect::Flags::NoMagnitude | ESM::MagicEffect::Flags::AppliedOnce)))
-        {
-            if(effect.mDuration != 0)
+            auto& stats = target.getClass().getCreatureStats(target);
+            auto& magnitudes = stats.getMagicEffects();
+            if (spellParams.getType() != ESM::ActiveSpells::Type_Ability
+                && !(effect.mFlags & ESM::ActiveEffect::Flag_Applied))
             {
-                float mult = dt;
-                if(spellParams.getType() == ESM::ActiveSpells::Type_Consumable || spellParams.getType() == ESM::ActiveSpells::Type_Temporary)
-                    mult = std::min(effect.mTimeLeft, dt);
-                effect.mMagnitude *= mult;
+                MagicApplicationResult::Type result
+                    = applyProtections(target, caster, spellParams, effect, magicEffect);
+                if (result != MagicApplicationResult::Type::APPLIED)
+                    return { result, receivedMagicDamage, affectedHealth };
             }
-            if(effect.mMagnitude == 0)
+            float oldMagnitude = 0.f;
+            if (effect.mFlags & ESM::ActiveEffect::Flag_Applied)
+                oldMagnitude = effect.mMagnitude;
+            else
             {
-                effect.mMagnitude = oldMagnitude;
-                effect.mFlags |= ESM::ActiveEffect::Flag_Applied | ESM::ActiveEffect::Flag_Remove;
-                effect.mTimeLeft -= dt;
-                return {MagicApplicationResult::Type::APPLIED, receivedMagicDamage, affectedHealth};
+                if (spellParams.getType() != ESM::ActiveSpells::Type_Enchantment)
+                    playEffects(target, *magicEffect,
+                        spellParams.getType() == ESM::ActiveSpells::Type_Consumable
+                            || spellParams.getType() == ESM::ActiveSpells::Type_Temporary);
+                if (effect.mEffectId == ESM::MagicEffect::Soultrap && !target.getClass().isNpc()
+                    && target.getType() == ESM::Creature::sRecordId
+                    && target.get<ESM::Creature>()->mBase->mData.mSoul == 0 && caster == getPlayer())
+                    MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicInvalidTarget}");
+            }
+            float magnitude = roll(effect);
+            // Note that there's an early out for Flag_Applied AppliedOnce effects so we don't have to exclude them here
+            effect.mMagnitude = magnitude;
+            if (!(magicEffect->mData.mFlags
+                    & (ESM::MagicEffect::Flags::NoMagnitude | ESM::MagicEffect::Flags::AppliedOnce)))
+            {
+                if (effect.mDuration != 0)
+                {
+                    float mult = dt;
+                    if (spellParams.getType() == ESM::ActiveSpells::Type_Consumable
+                        || spellParams.getType() == ESM::ActiveSpells::Type_Temporary)
+                        mult = std::min(effect.mTimeLeft, dt);
+                    effect.mMagnitude *= mult;
+                }
+                if (effect.mMagnitude == 0)
+                {
+                    effect.mMagnitude = oldMagnitude;
+                    effect.mFlags |= ESM::ActiveEffect::Flag_Applied | ESM::ActiveEffect::Flag_Remove;
+                    effect.mTimeLeft -= dt;
+                    return { MagicApplicationResult::Type::APPLIED, receivedMagicDamage, affectedHealth };
+                }
             }
+            if (effect.mEffectId == ESM::MagicEffect::Corprus)
+                spellParams.worsen();
+            else
+                applyMagicEffect(target, caster, spellParams, effect, invalid, receivedMagicDamage, affectedHealth,
+                    recalculateMagicka);
+            effect.mMagnitude = magnitude;
+            magnitudes.add(EffectKey(effect.mEffectId, effect.mArg), EffectParam(effect.mMagnitude - oldMagnitude));
+        }
+        effect.mTimeLeft -= dt;
+        if (invalid)
+        {
+            effect.mTimeLeft = 0;
+            effect.mFlags |= ESM::ActiveEffect::Flag_Remove;
+            auto anim = world->getAnimation(target);
+            if (anim)
+                anim->removeEffect(effect.mEffectId);
         }
-        if(effect.mEffectId == ESM::MagicEffect::Corprus)
-            spellParams.worsen();
         else
-            applyMagicEffect(target, caster, spellParams, effect, invalid, receivedMagicDamage, affectedHealth, recalculateMagicka);
-        effect.mMagnitude = magnitude;
-        magnitudes.add(EffectKey(effect.mEffectId, effect.mArg), EffectParam(effect.mMagnitude - oldMagnitude));
-    }
-    effect.mTimeLeft -= dt;
-    if(invalid)
-    {
-        effect.mTimeLeft = 0;
-        effect.mFlags |= ESM::ActiveEffect::Flag_Remove;
-        auto anim = world->getAnimation(target);
-        if(anim)
-            anim->removeEffect(effect.mEffectId);
+            effect.mFlags |= ESM::ActiveEffect::Flag_Applied | ESM::ActiveEffect::Flag_Remove;
+        if (recalculateMagicka)
+            target.getClass().getCreatureStats(target).recalculateMagicka();
+        return { MagicApplicationResult::Type::APPLIED, receivedMagicDamage, affectedHealth };
     }
-    else
-        effect.mFlags |= ESM::ActiveEffect::Flag_Applied | ESM::ActiveEffect::Flag_Remove;
-    if(recalculateMagicka)
-        target.getClass().getCreatureStats(target).recalculateMagicka();
-    return {MagicApplicationResult::Type::APPLIED, receivedMagicDamage, affectedHealth};
-}
 
-void removeMagicEffect(const MWWorld::Ptr& target, ActiveSpells::ActiveSpellParams& spellParams, const ESM::ActiveEffect& effect)
-{
-    const auto world = MWBase::Environment::get().getWorld();
-    auto& magnitudes = target.getClass().getCreatureStats(target).getMagicEffects();
-    bool invalid;
-    switch(effect.mEffectId)
+    void removeMagicEffect(
+        const MWWorld::Ptr& target, ActiveSpells::ActiveSpellParams& spellParams, const ESM::ActiveEffect& effect)
     {
-        case ESM::MagicEffect::CommandCreature:
-        case ESM::MagicEffect::CommandHumanoid:
-            if(magnitudes.get(effect.mEffectId).getMagnitude() <= 0.f)
-            {
-                auto& seq = target.getClass().getCreatureStats(target).getAiSequence();
-                seq.erasePackageIf([&](const auto& package)
+        const auto world = MWBase::Environment::get().getWorld();
+        auto& magnitudes = target.getClass().getCreatureStats(target).getMagicEffects();
+        bool invalid;
+        switch (effect.mEffectId)
+        {
+            case ESM::MagicEffect::CommandCreature:
+            case ESM::MagicEffect::CommandHumanoid:
+                if (magnitudes.get(effect.mEffectId).getMagnitude() <= 0.f)
                 {
-                    return package->getTypeId() == MWMechanics::AiPackageTypeId::Follow && static_cast<const MWMechanics::AiFollow*>(package.get())->isCommanded();
-                });
-            }
-            break;
-        case ESM::MagicEffect::ExtraSpell:
-            if(magnitudes.get(effect.mEffectId).getMagnitude() <= 0.f)
-                target.getClass().getInventoryStore(target).autoEquip(target);
-            break;
-        case ESM::MagicEffect::TurnUndead:
+                    auto& seq = target.getClass().getCreatureStats(target).getAiSequence();
+                    seq.erasePackageIf([&](const auto& package) {
+                        return package->getTypeId() == MWMechanics::AiPackageTypeId::Follow
+                            && static_cast<const MWMechanics::AiFollow*>(package.get())->isCommanded();
+                    });
+                }
+                break;
+            case ESM::MagicEffect::ExtraSpell:
+                if (magnitudes.get(effect.mEffectId).getMagnitude() <= 0.f)
+                    target.getClass().getInventoryStore(target).autoEquip(target);
+                break;
+            case ESM::MagicEffect::TurnUndead:
             {
                 auto& creatureStats = target.getClass().getCreatureStats(target);
                 Stat<int> stat = creatureStats.getAiSetting(AiSetting::Flee);
@@ -1021,69 +1068,75 @@ void removeMagicEffect(const MWWorld::Ptr& target, ActiveSpells::ActiveSpellPara
                 creatureStats.setAiSetting(AiSetting::Flee, stat);
             }
             break;
-        case ESM::MagicEffect::FrenzyCreature:
-        case ESM::MagicEffect::FrenzyHumanoid:
-            modifyAiSetting(target, effect, ESM::MagicEffect::FrenzyCreature, AiSetting::Fight, -effect.mMagnitude, invalid);
-            break;
-        case ESM::MagicEffect::CalmCreature:
-        case ESM::MagicEffect::CalmHumanoid:
-            modifyAiSetting(target, effect, ESM::MagicEffect::CalmCreature, AiSetting::Fight, effect.mMagnitude, invalid);
-            break;
-        case ESM::MagicEffect::DemoralizeCreature:
-        case ESM::MagicEffect::DemoralizeHumanoid:
-            modifyAiSetting(target, effect, ESM::MagicEffect::DemoralizeCreature, AiSetting::Flee, -effect.mMagnitude, invalid);
-            break;
-        case ESM::MagicEffect::NightEye:
+            case ESM::MagicEffect::FrenzyCreature:
+            case ESM::MagicEffect::FrenzyHumanoid:
+                modifyAiSetting(
+                    target, effect, ESM::MagicEffect::FrenzyCreature, AiSetting::Fight, -effect.mMagnitude, invalid);
+                break;
+            case ESM::MagicEffect::CalmCreature:
+            case ESM::MagicEffect::CalmHumanoid:
+                modifyAiSetting(
+                    target, effect, ESM::MagicEffect::CalmCreature, AiSetting::Fight, effect.mMagnitude, invalid);
+                break;
+            case ESM::MagicEffect::DemoralizeCreature:
+            case ESM::MagicEffect::DemoralizeHumanoid:
+                modifyAiSetting(
+                    target, effect, ESM::MagicEffect::DemoralizeCreature, AiSetting::Flee, -effect.mMagnitude, invalid);
+                break;
+            case ESM::MagicEffect::NightEye:
             {
                 const MWMechanics::EffectParam nightEye = magnitudes.get(effect.mEffectId);
-                if(nightEye.getMagnitude() < 0.f && nightEye.getBase() < 0)
+                if (nightEye.getMagnitude() < 0.f && nightEye.getBase() < 0)
                 {
-                    // The PCVisionBonus functions are different from every other magic effect function in that they clamp the value to [0, 1].
-                    // Morrowind.exe applies the same clamping to the night-eye effect, which can create situations where an effect is still active
-                    // (i.e. shown in the menu) but the screen is no longer bright. Modifying the base value here should prevent that while preserving their function.
+                    // The PCVisionBonus functions are different from every other magic effect function in that they
+                    // clamp the value to [0, 1]. Morrowind.exe applies the same clamping to the night-eye effect, which
+                    // can create situations where an effect is still active (i.e. shown in the menu) but the screen is
+                    // no longer bright. Modifying the base value here should prevent that while preserving their
+                    // function.
                     float delta = std::clamp(-nightEye.getMagnitude(), 0.f, -static_cast<float>(nightEye.getBase()));
                     magnitudes.modifyBase(effect.mEffectId, static_cast<int>(delta));
                 }
             }
             break;
-        case ESM::MagicEffect::RallyCreature:
-        case ESM::MagicEffect::RallyHumanoid:
-            modifyAiSetting(target, effect, ESM::MagicEffect::RallyCreature, AiSetting::Flee, effect.mMagnitude, invalid);
-            break;
-        case ESM::MagicEffect::Sound:
-            if(magnitudes.get(effect.mEffectId).getModifier() <= 0.f && target == getPlayer())
-                MWBase::Environment::get().getSoundManager()->stopSound3D(target, "magic sound");
-            break;
-        case ESM::MagicEffect::SummonScamp:
-        case ESM::MagicEffect::SummonClannfear:
-        case ESM::MagicEffect::SummonDaedroth:
-        case ESM::MagicEffect::SummonDremora:
-        case ESM::MagicEffect::SummonAncestralGhost:
-        case ESM::MagicEffect::SummonSkeletalMinion:
-        case ESM::MagicEffect::SummonBonewalker:
-        case ESM::MagicEffect::SummonGreaterBonewalker:
-        case ESM::MagicEffect::SummonBonelord:
-        case ESM::MagicEffect::SummonWingedTwilight:
-        case ESM::MagicEffect::SummonHunger:
-        case ESM::MagicEffect::SummonGoldenSaint:
-        case ESM::MagicEffect::SummonFlameAtronach:
-        case ESM::MagicEffect::SummonFrostAtronach:
-        case ESM::MagicEffect::SummonStormAtronach:
-        case ESM::MagicEffect::SummonCenturionSphere:
-        case ESM::MagicEffect::SummonFabricant:
-        case ESM::MagicEffect::SummonWolf:
-        case ESM::MagicEffect::SummonBear:
-        case ESM::MagicEffect::SummonBonewolf:
-        case ESM::MagicEffect::SummonCreature04:
-        case ESM::MagicEffect::SummonCreature05:
+            case ESM::MagicEffect::RallyCreature:
+            case ESM::MagicEffect::RallyHumanoid:
+                modifyAiSetting(
+                    target, effect, ESM::MagicEffect::RallyCreature, AiSetting::Flee, effect.mMagnitude, invalid);
+                break;
+            case ESM::MagicEffect::Sound:
+                if (magnitudes.get(effect.mEffectId).getModifier() <= 0.f && target == getPlayer())
+                    MWBase::Environment::get().getSoundManager()->stopSound3D(target, "magic sound");
+                break;
+            case ESM::MagicEffect::SummonScamp:
+            case ESM::MagicEffect::SummonClannfear:
+            case ESM::MagicEffect::SummonDaedroth:
+            case ESM::MagicEffect::SummonDremora:
+            case ESM::MagicEffect::SummonAncestralGhost:
+            case ESM::MagicEffect::SummonSkeletalMinion:
+            case ESM::MagicEffect::SummonBonewalker:
+            case ESM::MagicEffect::SummonGreaterBonewalker:
+            case ESM::MagicEffect::SummonBonelord:
+            case ESM::MagicEffect::SummonWingedTwilight:
+            case ESM::MagicEffect::SummonHunger:
+            case ESM::MagicEffect::SummonGoldenSaint:
+            case ESM::MagicEffect::SummonFlameAtronach:
+            case ESM::MagicEffect::SummonFrostAtronach:
+            case ESM::MagicEffect::SummonStormAtronach:
+            case ESM::MagicEffect::SummonCenturionSphere:
+            case ESM::MagicEffect::SummonFabricant:
+            case ESM::MagicEffect::SummonWolf:
+            case ESM::MagicEffect::SummonBear:
+            case ESM::MagicEffect::SummonBonewolf:
+            case ESM::MagicEffect::SummonCreature04:
+            case ESM::MagicEffect::SummonCreature05:
             {
-                if(effect.mArg != -1)
+                if (effect.mArg != -1)
                     MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(target, effect.mArg);
                 auto& summons = target.getClass().getCreatureStats(target).getSummonedCreatureMap();
                 auto [begin, end] = summons.equal_range(effect.mEffectId);
-                for(auto it = begin; it != end; ++it)
+                for (auto it = begin; it != end; ++it)
                 {
-                    if(it->second == effect.mArg)
+                    if (it->second == effect.mArg)
                     {
                         summons.erase(it);
                         break;
@@ -1091,123 +1144,127 @@ void removeMagicEffect(const MWWorld::Ptr& target, ActiveSpells::ActiveSpellPara
                 }
             }
             break;
-        case ESM::MagicEffect::BoundGloves:
-            removeBoundItem(world->getStore().get<ESM::GameSetting>().find("sMagicBoundRightGauntletID")->mValue.getString(), target);
-            [[fallthrough]];
-        case ESM::MagicEffect::BoundDagger:
-        case ESM::MagicEffect::BoundLongsword:
-        case ESM::MagicEffect::BoundMace:
-        case ESM::MagicEffect::BoundBattleAxe:
-        case ESM::MagicEffect::BoundSpear:
-        case ESM::MagicEffect::BoundLongbow:
-        case ESM::MagicEffect::BoundCuirass:
-        case ESM::MagicEffect::BoundHelm:
-        case ESM::MagicEffect::BoundBoots:
-        case ESM::MagicEffect::BoundShield:
+            case ESM::MagicEffect::BoundGloves:
+                removeBoundItem(
+                    world->getStore().get<ESM::GameSetting>().find("sMagicBoundRightGauntletID")->mValue.getString(),
+                    target);
+                [[fallthrough]];
+            case ESM::MagicEffect::BoundDagger:
+            case ESM::MagicEffect::BoundLongsword:
+            case ESM::MagicEffect::BoundMace:
+            case ESM::MagicEffect::BoundBattleAxe:
+            case ESM::MagicEffect::BoundSpear:
+            case ESM::MagicEffect::BoundLongbow:
+            case ESM::MagicEffect::BoundCuirass:
+            case ESM::MagicEffect::BoundHelm:
+            case ESM::MagicEffect::BoundBoots:
+            case ESM::MagicEffect::BoundShield:
             {
                 const std::string& item = sBoundItemsMap.at(effect.mEffectId);
                 removeBoundItem(world->getStore().get<ESM::GameSetting>().find(item)->mValue.getString(), target);
             }
             break;
-        case ESM::MagicEffect::DrainHealth:
-        case ESM::MagicEffect::DrainMagicka:
-        case ESM::MagicEffect::DrainFatigue:
-            adjustDynamicStat(target, effect.mEffectId - ESM::MagicEffect::DrainHealth, effect.mMagnitude);
-            break;
-        case ESM::MagicEffect::FortifyHealth:
-        case ESM::MagicEffect::FortifyMagicka:
-        case ESM::MagicEffect::FortifyFatigue:
-            if(spellParams.getType() == ESM::ActiveSpells::Type_Ability)
-                modDynamicStat(target, effect.mEffectId - ESM::MagicEffect::FortifyHealth, -effect.mMagnitude);
-            else
-                adjustDynamicStat(target, effect.mEffectId - ESM::MagicEffect::FortifyHealth, -effect.mMagnitude, true);
-            break;
-        case ESM::MagicEffect::DrainAttribute:
-            restoreAttribute(target, effect, effect.mMagnitude);
-            break;
-        case ESM::MagicEffect::FortifyAttribute:
-            // Abilities affect base stats, but not for drain
-            if(spellParams.getType() == ESM::ActiveSpells::Type_Ability)
-            {
-                auto& creatureStats = target.getClass().getCreatureStats(target);
-                AttributeValue attr = creatureStats.getAttribute(effect.mArg);
-                attr.setBase(attr.getBase() - effect.mMagnitude);
-                creatureStats.setAttribute(effect.mArg, attr);
-            }
-            else
-                fortifyAttribute(target, effect, -effect.mMagnitude);
-            break;
-        case ESM::MagicEffect::DrainSkill:
-            restoreSkill(target, effect, effect.mMagnitude);
-            break;
-        case ESM::MagicEffect::FortifySkill:
-            // Abilities affect base stats, but not for drain
-            if(spellParams.getType() == ESM::ActiveSpells::Type_Ability)
-            {
-                auto& npcStats = target.getClass().getNpcStats(target);
-                auto& skill = npcStats.getSkill(effect.mArg);
-                skill.setBase(skill.getBase() - effect.mMagnitude);
-            }
-            else
-                fortifySkill(target, effect, -effect.mMagnitude);
-            break;
-        case ESM::MagicEffect::FortifyMaximumMagicka:
-            target.getClass().getCreatureStats(target).recalculateMagicka();
-            break;
-        case ESM::MagicEffect::AbsorbAttribute:
+            case ESM::MagicEffect::DrainHealth:
+            case ESM::MagicEffect::DrainMagicka:
+            case ESM::MagicEffect::DrainFatigue:
+                adjustDynamicStat(target, effect.mEffectId - ESM::MagicEffect::DrainHealth, effect.mMagnitude);
+                break;
+            case ESM::MagicEffect::FortifyHealth:
+            case ESM::MagicEffect::FortifyMagicka:
+            case ESM::MagicEffect::FortifyFatigue:
+                if (spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+                    modDynamicStat(target, effect.mEffectId - ESM::MagicEffect::FortifyHealth, -effect.mMagnitude);
+                else
+                    adjustDynamicStat(
+                        target, effect.mEffectId - ESM::MagicEffect::FortifyHealth, -effect.mMagnitude, true);
+                break;
+            case ESM::MagicEffect::DrainAttribute:
+                restoreAttribute(target, effect, effect.mMagnitude);
+                break;
+            case ESM::MagicEffect::FortifyAttribute:
+                // Abilities affect base stats, but not for drain
+                if (spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+                {
+                    auto& creatureStats = target.getClass().getCreatureStats(target);
+                    AttributeValue attr = creatureStats.getAttribute(effect.mArg);
+                    attr.setBase(attr.getBase() - effect.mMagnitude);
+                    creatureStats.setAttribute(effect.mArg, attr);
+                }
+                else
+                    fortifyAttribute(target, effect, -effect.mMagnitude);
+                break;
+            case ESM::MagicEffect::DrainSkill:
+                restoreSkill(target, effect, effect.mMagnitude);
+                break;
+            case ESM::MagicEffect::FortifySkill:
+                // Abilities affect base stats, but not for drain
+                if (spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+                {
+                    auto& npcStats = target.getClass().getNpcStats(target);
+                    auto& skill = npcStats.getSkill(effect.mArg);
+                    skill.setBase(skill.getBase() - effect.mMagnitude);
+                }
+                else
+                    fortifySkill(target, effect, -effect.mMagnitude);
+                break;
+            case ESM::MagicEffect::FortifyMaximumMagicka:
+                target.getClass().getCreatureStats(target).recalculateMagicka();
+                break;
+            case ESM::MagicEffect::AbsorbAttribute:
             {
                 const auto caster = world->searchPtrViaActorId(spellParams.getCasterActorId());
                 restoreAttribute(target, effect, effect.mMagnitude);
-                if(!caster.isEmpty())
+                if (!caster.isEmpty())
                     fortifyAttribute(caster, effect, -effect.mMagnitude);
             }
             break;
-        case ESM::MagicEffect::AbsorbSkill:
+            case ESM::MagicEffect::AbsorbSkill:
             {
                 const auto caster = world->searchPtrViaActorId(spellParams.getCasterActorId());
                 restoreSkill(target, effect, effect.mMagnitude);
-                if(!caster.isEmpty())
+                if (!caster.isEmpty())
                     fortifySkill(caster, effect, -effect.mMagnitude);
             }
             break;
-        case ESM::MagicEffect::Corprus:
+            case ESM::MagicEffect::Corprus:
             {
                 int worsenings = spellParams.getWorsenings();
                 spellParams.resetWorsenings();
-                if(worsenings > 0)
+                if (worsenings > 0)
                 {
-                    for(const auto& otherEffect : spellParams.getEffects())
+                    for (const auto& otherEffect : spellParams.getEffects())
                     {
-                        if(isCorprusEffect(otherEffect, true))
+                        if (isCorprusEffect(otherEffect, true))
                         {
-                            for(int i = 0; i < worsenings; i++)
+                            for (int i = 0; i < worsenings; i++)
                                 removeMagicEffect(target, spellParams, otherEffect);
                         }
                     }
                 }
-                //Note that we remove the effects, but keep the params
-                target.getClass().getCreatureStats(target).getActiveSpells().purge([&spellParams] (const ActiveSpells::ActiveSpellParams& params, const auto&)
-                {
-                    return &spellParams == &params;
-                }, target);
+                // Note that we remove the effects, but keep the params
+                target.getClass().getCreatureStats(target).getActiveSpells().purge(
+                    [&spellParams](
+                        const ActiveSpells::ActiveSpellParams& params, const auto&) { return &spellParams == &params; },
+                    target);
             }
             break;
+        }
     }
-}
 
-void onMagicEffectRemoved(const MWWorld::Ptr& target, ActiveSpells::ActiveSpellParams& spellParams, const ESM::ActiveEffect& effect)
-{
-    if(!(effect.mFlags & ESM::ActiveEffect::Flag_Applied))
-        return;
-    auto& magnitudes = target.getClass().getCreatureStats(target).getMagicEffects();
-    magnitudes.add(EffectKey(effect.mEffectId, effect.mArg), EffectParam(-effect.mMagnitude));
-    removeMagicEffect(target, spellParams, effect);
-    if(magnitudes.get(effect.mEffectId).getMagnitude() <= 0.f)
+    void onMagicEffectRemoved(
+        const MWWorld::Ptr& target, ActiveSpells::ActiveSpellParams& spellParams, const ESM::ActiveEffect& effect)
     {
-        auto anim = MWBase::Environment::get().getWorld()->getAnimation(target);
-        if(anim)
-            anim->removeEffect(effect.mEffectId);
+        if (!(effect.mFlags & ESM::ActiveEffect::Flag_Applied))
+            return;
+        auto& magnitudes = target.getClass().getCreatureStats(target).getMagicEffects();
+        magnitudes.add(EffectKey(effect.mEffectId, effect.mArg), EffectParam(-effect.mMagnitude));
+        removeMagicEffect(target, spellParams, effect);
+        if (magnitudes.get(effect.mEffectId).getMagnitude() <= 0.f)
+        {
+            auto anim = MWBase::Environment::get().getWorld()->getAnimation(target);
+            if (anim)
+                anim->removeEffect(effect.mEffectId);
+        }
     }
-}
 
 }
diff --git a/apps/openmw/mwmechanics/spelleffects.hpp b/apps/openmw/mwmechanics/spelleffects.hpp
index 57caa5d33a..2dafedf31f 100644
--- a/apps/openmw/mwmechanics/spelleffects.hpp
+++ b/apps/openmw/mwmechanics/spelleffects.hpp
@@ -3,8 +3,8 @@
 
 #include "activespells.hpp"
 
-// These functions should probably be split up into separate Lua functions for each magic effect when magic is dehardcoded.
-// That way ESM::MGEF could point to two Lua scripts for each effect. Needs discussion.
+// These functions should probably be split up into separate Lua functions for each magic effect when magic is
+// dehardcoded. That way ESM::MGEF could point to two Lua scripts for each effect. Needs discussion.
 
 namespace MWWorld
 {
@@ -17,7 +17,9 @@ namespace MWMechanics
     {
         enum class Type
         {
-            APPLIED, REMOVED, REFLECTED
+            APPLIED,
+            REMOVED,
+            REFLECTED
         };
         Type mType;
         bool mShowHit;
@@ -25,10 +27,12 @@ namespace MWMechanics
     };
 
     // Applies a tick of a single effect. Returns true if the effect should be removed immediately
-    MagicApplicationResult applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect, float dt);
+    MagicApplicationResult applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster,
+        ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect, float dt);
 
     // Undoes permanent effects created by ESM::MagicEffect::AppliedOnce
-    void onMagicEffectRemoved(const MWWorld::Ptr& target, ActiveSpells::ActiveSpellParams& spell, const ESM::ActiveEffect& effect);
+    void onMagicEffectRemoved(
+        const MWWorld::Ptr& target, ActiveSpells::ActiveSpellParams& spell, const ESM::ActiveEffect& effect);
 }
 
 #endif
diff --git a/apps/openmw/mwmechanics/spelllist.cpp b/apps/openmw/mwmechanics/spelllist.cpp
index 7c302f7861..6da7a4e11b 100644
--- a/apps/openmw/mwmechanics/spelllist.cpp
+++ b/apps/openmw/mwmechanics/spelllist.cpp
@@ -2,9 +2,9 @@
 
 #include <algorithm>
 
-#include <components/esm3/loadspel.hpp>
 #include <components/esm3/loadcrea.hpp>
 #include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadspel.hpp>
 
 #include "spells.hpp"
 
@@ -15,18 +15,18 @@
 
 namespace
 {
-    template<class T>
+    template <class T>
     const std::vector<std::string> getSpellList(std::string_view id)
     {
         return MWBase::Environment::get().getWorld()->getStore().get<T>().find(id)->mSpells.mList;
     }
 
-    template<class T>
+    template <class T>
     bool withBaseRecord(std::string_view id, const std::function<bool(std::vector<std::string>&)>& function)
     {
         T copy = *MWBase::Environment::get().getWorld()->getStore().get<T>().find(id);
         bool changed = function(copy.mSpells.mList);
-        if(changed)
+        if (changed)
             MWBase::Environment::get().getWorld()->createOverrideRecord(copy);
         return changed;
     }
@@ -34,11 +34,15 @@ namespace
 
 namespace MWMechanics
 {
-    SpellList::SpellList(const std::string& id, int type) : mId(id), mType(type) {}
+    SpellList::SpellList(const std::string& id, int type)
+        : mId(id)
+        , mType(type)
+    {
+    }
 
     bool SpellList::withBaseRecord(const std::function<bool(std::vector<std::string>&)>& function)
     {
-        switch(mType)
+        switch (mType)
         {
             case ESM::REC_CREA:
                 return ::withBaseRecord<ESM::Creature>(mId, function);
@@ -51,7 +55,7 @@ namespace MWMechanics
 
     const std::vector<std::string> SpellList::getSpells() const
     {
-        switch(mType)
+        switch (mType)
         {
             case ESM::REC_CREA:
                 return getSpellList<ESM::Creature>(mId);
@@ -67,34 +71,32 @@ namespace MWMechanics
         return MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(id);
     }
 
-    void SpellList::add (const ESM::Spell* spell)
+    void SpellList::add(const ESM::Spell* spell)
     {
         auto& id = spell->mId;
-        bool changed = withBaseRecord([&] (auto& spells)
-        {
-            for(const auto& it : spells)
+        bool changed = withBaseRecord([&](auto& spells) {
+            for (const auto& it : spells)
             {
-                if(Misc::StringUtils::ciEqual(id, it))
+                if (Misc::StringUtils::ciEqual(id, it))
                     return false;
             }
             spells.push_back(id);
             return true;
         });
-        if(changed)
+        if (changed)
         {
-            for(auto listener : mListeners)
+            for (auto listener : mListeners)
                 listener->addSpell(spell);
         }
     }
 
-    void SpellList::remove (const ESM::Spell* spell)
+    void SpellList::remove(const ESM::Spell* spell)
     {
         auto& id = spell->mId;
-        bool changed = withBaseRecord([&] (auto& spells)
-        {
-            for(auto it = spells.begin(); it != spells.end(); it++)
+        bool changed = withBaseRecord([&](auto& spells) {
+            for (auto it = spells.begin(); it != spells.end(); it++)
             {
-                if(Misc::StringUtils::ciEqual(id, *it))
+                if (Misc::StringUtils::ciEqual(id, *it))
                 {
                     spells.erase(it);
                     return true;
@@ -102,20 +104,18 @@ namespace MWMechanics
             }
             return false;
         });
-        if(changed)
+        if (changed)
         {
-            for(auto listener : mListeners)
+            for (auto listener : mListeners)
                 listener->removeSpell(spell);
         }
     }
 
-    void SpellList::removeAll (const std::vector<std::string>& ids)
+    void SpellList::removeAll(const std::vector<std::string>& ids)
     {
-        bool changed = withBaseRecord([&] (auto& spells)
-        {
-            const auto it = std::remove_if(spells.begin(), spells.end(), [&] (const auto& spell)
-            {
-                const auto isSpell = [&] (const auto& id) { return Misc::StringUtils::ciEqual(spell, id); };
+        bool changed = withBaseRecord([&](auto& spells) {
+            const auto it = std::remove_if(spells.begin(), spells.end(), [&](const auto& spell) {
+                const auto isSpell = [&](const auto& id) { return Misc::StringUtils::ciEqual(spell, id); };
                 return ids.end() != std::find_if(ids.begin(), ids.end(), isSpell);
             });
             if (it == spells.end())
@@ -123,11 +123,11 @@ namespace MWMechanics
             spells.erase(it, spells.end());
             return true;
         });
-        if(changed)
+        if (changed)
         {
-            for(auto listener : mListeners)
+            for (auto listener : mListeners)
             {
-                for(auto& id : ids)
+                for (auto& id : ids)
                 {
                     const auto spell = getSpell(id);
                     listener->removeSpell(spell);
@@ -138,16 +138,15 @@ namespace MWMechanics
 
     void SpellList::clear()
     {
-        bool changed = withBaseRecord([] (auto& spells)
-        {
-            if(spells.empty())
+        bool changed = withBaseRecord([](auto& spells) {
+            if (spells.empty())
                 return false;
             spells.clear();
             return true;
         });
-        if(changed)
+        if (changed)
         {
-            for(auto listener : mListeners)
+            for (auto listener : mListeners)
                 listener->removeAllSpells();
         }
     }
diff --git a/apps/openmw/mwmechanics/spelllist.hpp b/apps/openmw/mwmechanics/spelllist.hpp
index d4f78e5ed3..383b9dddd6 100644
--- a/apps/openmw/mwmechanics/spelllist.hpp
+++ b/apps/openmw/mwmechanics/spelllist.hpp
@@ -3,8 +3,8 @@
 
 #include <functional>
 #include <map>
-#include <string>
 #include <set>
+#include <string>
 #include <vector>
 
 #include <components/esm3/loadspel.hpp>
@@ -20,42 +20,45 @@ namespace MWMechanics
 
     /// Multiple instances of the same actor share the same spell list in Morrowind.
     /// The most obvious result of this is that adding a spell or ability to one instance adds it to all instances.
-    /// @note The original game will only update visual effects associated with any added abilities for the originally targeted actor,
+    /// @note The original game will only update visual effects associated with any added abilities for the originally
+    /// targeted actor,
     ///       changing cells applies the update to all actors.
-    /// Aside from sharing the same active spell list, changes made to this list are also written to the actor's base record.
-    /// Interestingly, it is not just scripted changes that are persisted to the base record. Curing one instance's disease will cure all instances.
+    /// Aside from sharing the same active spell list, changes made to this list are also written to the actor's base
+    /// record. Interestingly, it is not just scripted changes that are persisted to the base record. Curing one
+    /// instance's disease will cure all instances.
     /// @note The original game is inconsistent in persisting this example;
     ///       saving and loading the game might reapply the cured disease depending on which instance was cured.
     class SpellList
     {
-            const std::string mId;
-            const int mType;
-            std::vector<Spells*> mListeners;
+        const std::string mId;
+        const int mType;
+        std::vector<Spells*> mListeners;
+
+        bool withBaseRecord(const std::function<bool(std::vector<std::string>&)>& function);
 
-            bool withBaseRecord(const std::function<bool(std::vector<std::string>&)>& function);
-        public:
-            SpellList(const std::string& id, int type);
+    public:
+        SpellList(const std::string& id, int type);
 
-            /// Get spell from ID, throws exception if not found
-            static const ESM::Spell* getSpell(std::string_view id);
+        /// Get spell from ID, throws exception if not found
+        static const ESM::Spell* getSpell(std::string_view id);
 
-            void add (const ESM::Spell* spell);
-            ///< Adding a spell that is already listed in *this is a no-op.
+        void add(const ESM::Spell* spell);
+        ///< Adding a spell that is already listed in *this is a no-op.
 
-            void remove (const ESM::Spell* spell);
+        void remove(const ESM::Spell* spell);
 
-            void removeAll(const std::vector<std::string>& spells);
+        void removeAll(const std::vector<std::string>& spells);
 
-            void clear();
-            ///< Remove all spells of all types.
+        void clear();
+        ///< Remove all spells of all types.
 
-            void addListener(Spells* spells);
+        void addListener(Spells* spells);
 
-            void removeListener(Spells* spells);
+        void removeListener(Spells* spells);
 
-            void updateListener(Spells* before, Spells* after);
+        void updateListener(Spells* before, Spells* after);
 
-            const std::vector<std::string> getSpells() const;
+        const std::vector<std::string> getSpells() const;
     };
 }
 
diff --git a/apps/openmw/mwmechanics/spellpriority.cpp b/apps/openmw/mwmechanics/spellpriority.cpp
index de0158040d..2a09ed03f4 100644
--- a/apps/openmw/mwmechanics/spellpriority.cpp
+++ b/apps/openmw/mwmechanics/spellpriority.cpp
@@ -3,36 +3,38 @@
 
 #include <components/esm3/loadench.hpp>
 #include <components/esm3/loadmgef.hpp>
-#include <components/esm3/loadspel.hpp>
 #include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadspel.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/world.hpp"
 
+#include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwworld/cellstore.hpp"
 
 #include "creaturestats.hpp"
 #include "spellresistance.hpp"
-#include "weapontype.hpp"
-#include "summoning.hpp"
 #include "spellutil.hpp"
+#include "summoning.hpp"
+#include "weapontype.hpp"
 
 namespace
 {
-    int numEffectsToDispel (const MWWorld::Ptr& actor, int effectFilter=-1, bool negative = true)
+    int numEffectsToDispel(const MWWorld::Ptr& actor, int effectFilter = -1, bool negative = true)
     {
-        int toCure=0;
+        int toCure = 0;
         const MWMechanics::ActiveSpells& activeSpells = actor.getClass().getCreatureStats(actor).getActiveSpells();
         for (MWMechanics::ActiveSpells::TIterator it = activeSpells.begin(); it != activeSpells.end(); ++it)
         {
-            // if the effect filter is not specified, take in account only spells effects. Leave potions, enchanted items etc.
+            // if the effect filter is not specified, take in account only spells effects. Leave potions, enchanted
+            // items etc.
             if (effectFilter == -1)
             {
-                const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(it->getId());
+                const ESM::Spell* spell
+                    = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(it->getId());
                 if (!spell || spell->mData.mType != ESM::Spell::ST_Spell)
                     continue;
             }
@@ -43,7 +45,8 @@ namespace
                 int effectId = effect.mEffectId;
                 if (effectFilter != -1 && effectId != effectFilter)
                     continue;
-                const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectId);
+                const ESM::MagicEffect* magicEffect
+                    = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectId);
 
                 if (effect.mDuration <= 3) // Don't attempt to dispel if effect runs out shortly anyway
                     continue;
@@ -58,7 +61,7 @@ namespace
         return toCure;
     }
 
-    float getSpellDuration (const MWWorld::Ptr& actor, const std::string& spellId)
+    float getSpellDuration(const MWWorld::Ptr& actor, const std::string& spellId)
     {
         float duration = 0;
         const MWMechanics::ActiveSpells& activeSpells = actor.getClass().getCreatureStats(actor).getActiveSpells();
@@ -81,8 +84,7 @@ namespace
     {
         int actorId = caster.getClass().getCreatureStats(caster).getActorId();
         const auto& active = target.getClass().getCreatureStats(target).getActiveSpells();
-        return std::find_if(active.begin(), active.end(), [&](const auto& spell)
-        {
+        return std::find_if(active.begin(), active.end(), [&](const auto& spell) {
             return spell.getCasterActorId() == actorId && Misc::StringUtils::ciEqual(spell.getId(), id);
         }) != active.end();
     }
@@ -90,7 +92,7 @@ namespace
 
 namespace MWMechanics
 {
-    int getRangeTypes (const ESM::EffectList& effects)
+    int getRangeTypes(const ESM::EffectList& effects)
     {
         int types = 0;
         for (std::vector<ESM::ENAMstruct>::const_iterator it = effects.mList.begin(); it != effects.mList.end(); ++it)
@@ -105,7 +107,7 @@ namespace MWMechanics
         return types;
     }
 
-    float ratePotion (const MWWorld::Ptr &item, const MWWorld::Ptr& actor)
+    float ratePotion(const MWWorld::Ptr& item, const MWWorld::Ptr& actor)
     {
         if (item.getType() != ESM::Potion::sRecordId)
             return 0.f;
@@ -114,7 +116,7 @@ namespace MWMechanics
         return rateEffects(potion->mEffects, actor, MWWorld::Ptr());
     }
 
-    float rateSpell(const ESM::Spell *spell, const MWWorld::Ptr &actor, const MWWorld::Ptr& enemy)
+    float rateSpell(const ESM::Spell* spell, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy)
     {
         float successChance = MWMechanics::getSpellSuccessChance(spell, actor);
         if (successChance == 0.f)
@@ -136,25 +138,28 @@ namespace MWMechanics
         int types = getRangeTypes(spell->mEffects);
         if ((types & Self) && isSpellActive(actor, actor, spell->mId))
             return 0.f;
-        if ( ((types & Touch) || (types & Target)) && isSpellActive(actor, enemy, spell->mId))
+        if (((types & Touch) || (types & Target)) && isSpellActive(actor, enemy, spell->mId))
             return 0.f;
 
         return rateEffects(spell->mEffects, actor, enemy) * (successChance / 100.f);
     }
 
-    float rateMagicItem(const MWWorld::Ptr &ptr, const MWWorld::Ptr &actor, const MWWorld::Ptr& enemy)
+    float rateMagicItem(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy)
     {
         if (ptr.getClass().getEnchantment(ptr).empty())
             return 0.f;
 
-        const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(ptr.getClass().getEnchantment(ptr));
+        const ESM::Enchantment* enchantment
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(
+                ptr.getClass().getEnchantment(ptr));
 
         // Spells don't stack, so early out if the spell is still active on the target
         int types = getRangeTypes(enchantment->mEffects);
-        if ((types & Self) && actor.getClass().getCreatureStats(actor).getActiveSpells().isSpellActive(ptr.getCellRef().getRefId()))
+        if ((types & Self)
+            && actor.getClass().getCreatureStats(actor).getActiveSpells().isSpellActive(ptr.getCellRef().getRefId()))
             return 0.f;
 
-        if (types & (Touch|Target) && getSpellDuration(enemy, ptr.getCellRef().getRefId()) > 3)
+        if (types & (Touch | Target) && getSpellDuration(enemy, ptr.getCellRef().getRefId()) > 3)
             return 0.f;
 
         if (enchantment->mData.mType == ESM::Enchantment::CastOnce)
@@ -165,14 +170,13 @@ namespace MWMechanics
         {
             MWWorld::InventoryStore& store = actor.getClass().getInventoryStore(actor);
 
-            // Creatures can not wear armor/clothing, so allow creatures to use non-equipped items, 
+            // Creatures can not wear armor/clothing, so allow creatures to use non-equipped items,
             if (actor.getClass().isNpc() && !store.isEquipped(ptr))
                 return 0.f;
 
             int castCost = getEffectiveEnchantmentCastCost(static_cast<float>(enchantment->mData.mCost), actor);
 
-            if (ptr.getCellRef().getEnchantmentCharge() != -1
-               && ptr.getCellRef().getEnchantmentCharge() < castCost)
+            if (ptr.getCellRef().getEnchantmentCharge() != -1 && ptr.getCellRef().getEnchantmentCharge() < castCost)
                 return 0.f;
 
             float rating = rateEffects(enchantment->mEffects, actor, enemy);
@@ -184,61 +188,61 @@ namespace MWMechanics
         return 0.f;
     }
 
-    float rateEffect(const ESM::ENAMstruct &effect, const MWWorld::Ptr &actor, const MWWorld::Ptr &enemy)
+    float rateEffect(const ESM::ENAMstruct& effect, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy)
     {
         // NOTE: enemy may be empty
 
         float rating = 1;
         switch (effect.mEffectID)
         {
-        case ESM::MagicEffect::Soultrap:
-        case ESM::MagicEffect::AlmsiviIntervention:
-        case ESM::MagicEffect::DivineIntervention:
-        case ESM::MagicEffect::CalmHumanoid:
-        case ESM::MagicEffect::CalmCreature:
-        case ESM::MagicEffect::FrenzyHumanoid:
-        case ESM::MagicEffect::FrenzyCreature:
-        case ESM::MagicEffect::DemoralizeHumanoid:
-        case ESM::MagicEffect::DemoralizeCreature:
-        case ESM::MagicEffect::RallyHumanoid:
-        case ESM::MagicEffect::RallyCreature:
-        case ESM::MagicEffect::Charm:
-        case ESM::MagicEffect::DetectAnimal:
-        case ESM::MagicEffect::DetectEnchantment:
-        case ESM::MagicEffect::DetectKey:
-        case ESM::MagicEffect::Telekinesis:
-        case ESM::MagicEffect::Mark:
-        case ESM::MagicEffect::Recall:
-        case ESM::MagicEffect::Jump:
-        case ESM::MagicEffect::WaterBreathing:
-        case ESM::MagicEffect::SwiftSwim:
-        case ESM::MagicEffect::WaterWalking:
-        case ESM::MagicEffect::SlowFall:
-        case ESM::MagicEffect::Light:
-        case ESM::MagicEffect::Lock:
-        case ESM::MagicEffect::Open:
-        case ESM::MagicEffect::TurnUndead:
-        case ESM::MagicEffect::WeaknessToCommonDisease:
-        case ESM::MagicEffect::WeaknessToBlightDisease:
-        case ESM::MagicEffect::WeaknessToCorprusDisease:
-        case ESM::MagicEffect::CureCommonDisease:
-        case ESM::MagicEffect::CureBlightDisease:
-        case ESM::MagicEffect::CureCorprusDisease:
-        case ESM::MagicEffect::ResistBlightDisease:
-        case ESM::MagicEffect::ResistCommonDisease:
-        case ESM::MagicEffect::ResistCorprusDisease:
-        case ESM::MagicEffect::Invisibility:
-        case ESM::MagicEffect::Chameleon:
-        case ESM::MagicEffect::NightEye:
-        case ESM::MagicEffect::Vampirism:
-        case ESM::MagicEffect::StuntedMagicka:
-        case ESM::MagicEffect::ExtraSpell:
-        case ESM::MagicEffect::RemoveCurse:
-        case ESM::MagicEffect::CommandCreature:
-        case ESM::MagicEffect::CommandHumanoid:
-            return 0.f;
+            case ESM::MagicEffect::Soultrap:
+            case ESM::MagicEffect::AlmsiviIntervention:
+            case ESM::MagicEffect::DivineIntervention:
+            case ESM::MagicEffect::CalmHumanoid:
+            case ESM::MagicEffect::CalmCreature:
+            case ESM::MagicEffect::FrenzyHumanoid:
+            case ESM::MagicEffect::FrenzyCreature:
+            case ESM::MagicEffect::DemoralizeHumanoid:
+            case ESM::MagicEffect::DemoralizeCreature:
+            case ESM::MagicEffect::RallyHumanoid:
+            case ESM::MagicEffect::RallyCreature:
+            case ESM::MagicEffect::Charm:
+            case ESM::MagicEffect::DetectAnimal:
+            case ESM::MagicEffect::DetectEnchantment:
+            case ESM::MagicEffect::DetectKey:
+            case ESM::MagicEffect::Telekinesis:
+            case ESM::MagicEffect::Mark:
+            case ESM::MagicEffect::Recall:
+            case ESM::MagicEffect::Jump:
+            case ESM::MagicEffect::WaterBreathing:
+            case ESM::MagicEffect::SwiftSwim:
+            case ESM::MagicEffect::WaterWalking:
+            case ESM::MagicEffect::SlowFall:
+            case ESM::MagicEffect::Light:
+            case ESM::MagicEffect::Lock:
+            case ESM::MagicEffect::Open:
+            case ESM::MagicEffect::TurnUndead:
+            case ESM::MagicEffect::WeaknessToCommonDisease:
+            case ESM::MagicEffect::WeaknessToBlightDisease:
+            case ESM::MagicEffect::WeaknessToCorprusDisease:
+            case ESM::MagicEffect::CureCommonDisease:
+            case ESM::MagicEffect::CureBlightDisease:
+            case ESM::MagicEffect::CureCorprusDisease:
+            case ESM::MagicEffect::ResistBlightDisease:
+            case ESM::MagicEffect::ResistCommonDisease:
+            case ESM::MagicEffect::ResistCorprusDisease:
+            case ESM::MagicEffect::Invisibility:
+            case ESM::MagicEffect::Chameleon:
+            case ESM::MagicEffect::NightEye:
+            case ESM::MagicEffect::Vampirism:
+            case ESM::MagicEffect::StuntedMagicka:
+            case ESM::MagicEffect::ExtraSpell:
+            case ESM::MagicEffect::RemoveCurse:
+            case ESM::MagicEffect::CommandCreature:
+            case ESM::MagicEffect::CommandHumanoid:
+                return 0.f;
 
-        case ESM::MagicEffect::Blind:
+            case ESM::MagicEffect::Blind:
             {
                 if (enemy.isEmpty())
                     return 0.f;
@@ -256,7 +260,7 @@ namespace MWMechanics
                 break;
             }
 
-        case ESM::MagicEffect::Sound:
+            case ESM::MagicEffect::Sound:
             {
                 if (enemy.isEmpty())
                     return 0.f;
@@ -277,7 +281,7 @@ namespace MWMechanics
                 break;
             }
 
-        case ESM::MagicEffect::Silence:
+            case ESM::MagicEffect::Silence:
             {
                 if (enemy.isEmpty())
                     return 0.f;
@@ -294,33 +298,34 @@ namespace MWMechanics
                 break;
             }
 
-        case ESM::MagicEffect::RestoreAttribute:
-            return 0.f; // TODO: implement based on attribute damage
-        case ESM::MagicEffect::RestoreSkill:
-            return 0.f; // TODO: implement based on skill damage
-
-        case ESM::MagicEffect::ResistFire:
-        case ESM::MagicEffect::ResistFrost:
-        case ESM::MagicEffect::ResistMagicka:
-        case ESM::MagicEffect::ResistNormalWeapons:
-        case ESM::MagicEffect::ResistParalysis:
-        case ESM::MagicEffect::ResistPoison:
-        case ESM::MagicEffect::ResistShock:
-        case ESM::MagicEffect::SpellAbsorption:
-        case ESM::MagicEffect::Reflect:
-            return 0.f; // probably useless since we don't know in advance what the enemy will cast
-
-        // don't cast these for now as they would make the NPC cast the same effect over and over again, especially when they have potions
-        case ESM::MagicEffect::FortifyAttribute:
-        case ESM::MagicEffect::FortifyHealth:
-        case ESM::MagicEffect::FortifyMagicka:
-        case ESM::MagicEffect::FortifyFatigue:
-        case ESM::MagicEffect::FortifySkill:
-        case ESM::MagicEffect::FortifyMaximumMagicka:
-        case ESM::MagicEffect::FortifyAttack:
-            return 0.f;
+            case ESM::MagicEffect::RestoreAttribute:
+                return 0.f; // TODO: implement based on attribute damage
+            case ESM::MagicEffect::RestoreSkill:
+                return 0.f; // TODO: implement based on skill damage
+
+            case ESM::MagicEffect::ResistFire:
+            case ESM::MagicEffect::ResistFrost:
+            case ESM::MagicEffect::ResistMagicka:
+            case ESM::MagicEffect::ResistNormalWeapons:
+            case ESM::MagicEffect::ResistParalysis:
+            case ESM::MagicEffect::ResistPoison:
+            case ESM::MagicEffect::ResistShock:
+            case ESM::MagicEffect::SpellAbsorption:
+            case ESM::MagicEffect::Reflect:
+                return 0.f; // probably useless since we don't know in advance what the enemy will cast
+
+            // don't cast these for now as they would make the NPC cast the same effect over and over again, especially
+            // when they have potions
+            case ESM::MagicEffect::FortifyAttribute:
+            case ESM::MagicEffect::FortifyHealth:
+            case ESM::MagicEffect::FortifyMagicka:
+            case ESM::MagicEffect::FortifyFatigue:
+            case ESM::MagicEffect::FortifySkill:
+            case ESM::MagicEffect::FortifyMaximumMagicka:
+            case ESM::MagicEffect::FortifyAttack:
+                return 0.f;
 
-        case ESM::MagicEffect::Burden:
+            case ESM::MagicEffect::Burden:
             {
                 if (enemy.isEmpty())
                     return 0.f;
@@ -334,7 +339,7 @@ namespace MWMechanics
                 if (burden > 0)
                     return 0.f;
 
-                if ((effect.mMagnMin + effect.mMagnMax)/2.f > -burden)
+                if ((effect.mMagnMin + effect.mMagnMax) / 2.f > -burden)
                     rating *= 3;
                 else
                     return 0.f;
@@ -342,7 +347,7 @@ namespace MWMechanics
                 break;
             }
 
-        case ESM::MagicEffect::Feather:
+            case ESM::MagicEffect::Feather:
             {
                 // Ignore actors without inventory
                 if (!actor.getClass().hasInventoryStore(actor))
@@ -353,7 +358,7 @@ namespace MWMechanics
                 if (burden <= 0)
                     return 0.f;
 
-                if ((effect.mMagnMin + effect.mMagnMax)/2.f >= burden)
+                if ((effect.mMagnMin + effect.mMagnMax) / 2.f >= burden)
                     rating *= 3;
                 else
                     return 0.f;
@@ -361,120 +366,124 @@ namespace MWMechanics
                 break;
             }
 
-        case ESM::MagicEffect::Levitate:
-            return 0.f; // AI isn't designed to take advantage of this, and could be perceived as unfair anyway
-        case ESM::MagicEffect::BoundBoots:
-        case ESM::MagicEffect::BoundHelm:
-            if (actor.getClass().isNpc())
-            {
-                // Beast races can't wear helmets or boots
-                const std::string& raceid = actor.get<ESM::NPC>()->mBase->mRace;
-                const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(raceid);
-                if (race->mData.mFlags & ESM::Race::Beast)
+            case ESM::MagicEffect::Levitate:
+                return 0.f; // AI isn't designed to take advantage of this, and could be perceived as unfair anyway
+            case ESM::MagicEffect::BoundBoots:
+            case ESM::MagicEffect::BoundHelm:
+                if (actor.getClass().isNpc())
+                {
+                    // Beast races can't wear helmets or boots
+                    const std::string& raceid = actor.get<ESM::NPC>()->mBase->mRace;
+                    const ESM::Race* race
+                        = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(raceid);
+                    if (race->mData.mFlags & ESM::Race::Beast)
+                        return 0.f;
+                }
+                else
                     return 0.f;
-            }
-            else
-                return 0.f;
 
-            break;
-        case ESM::MagicEffect::BoundShield:
-            if(!actor.getClass().hasInventoryStore(actor))
-                return 0.f;
-            else if(!actor.getClass().isNpc())
-            {
-                // If the actor is an NPC they can benefit from the armor rating, otherwise check if we've got a one-handed weapon to use with the shield
-                const auto& store = actor.getClass().getInventoryStore(actor);
-                auto oneHanded = std::find_if(store.cbegin(MWWorld::ContainerStore::Type_Weapon), store.cend(), [](const MWWorld::ConstPtr& weapon)
+                break;
+            case ESM::MagicEffect::BoundShield:
+                if (!actor.getClass().hasInventoryStore(actor))
+                    return 0.f;
+                else if (!actor.getClass().isNpc())
                 {
-                    if(weapon.getClass().getItemHealth(weapon) <= 0.f)
-                        return false;
-                    short type = weapon.get<ESM::Weapon>()->mBase->mData.mType;
-                    return !(MWMechanics::getWeaponType(type)->mFlags & ESM::WeaponType::TwoHanded);
-                });
-                if(oneHanded == store.cend())
+                    // If the actor is an NPC they can benefit from the armor rating, otherwise check if we've got a
+                    // one-handed weapon to use with the shield
+                    const auto& store = actor.getClass().getInventoryStore(actor);
+                    auto oneHanded = std::find_if(store.cbegin(MWWorld::ContainerStore::Type_Weapon), store.cend(),
+                        [](const MWWorld::ConstPtr& weapon) {
+                            if (weapon.getClass().getItemHealth(weapon) <= 0.f)
+                                return false;
+                            short type = weapon.get<ESM::Weapon>()->mBase->mData.mType;
+                            return !(MWMechanics::getWeaponType(type)->mFlags & ESM::WeaponType::TwoHanded);
+                        });
+                    if (oneHanded == store.cend())
+                        return 0.f;
+                }
+                break;
+            // Creatures can not wear armor
+            case ESM::MagicEffect::BoundCuirass:
+            case ESM::MagicEffect::BoundGloves:
+                if (!actor.getClass().isNpc())
                     return 0.f;
-            }
-            break;
-        // Creatures can not wear armor
-        case ESM::MagicEffect::BoundCuirass:
-        case ESM::MagicEffect::BoundGloves:
-            if (!actor.getClass().isNpc())
-                return 0.f;
-            break;
+                break;
 
-        case ESM::MagicEffect::BoundLongbow:
-            // AI should not summon the bow if there is no suitable ammo.
-            if (rateAmmo(actor, enemy, getWeaponType(ESM::Weapon::MarksmanBow)->mAmmoType) <= 0.f)
-                return 0.f;
-            break;
+            case ESM::MagicEffect::BoundLongbow:
+                // AI should not summon the bow if there is no suitable ammo.
+                if (rateAmmo(actor, enemy, getWeaponType(ESM::Weapon::MarksmanBow)->mAmmoType) <= 0.f)
+                    return 0.f;
+                break;
 
-        case ESM::MagicEffect::RestoreHealth:
-        case ESM::MagicEffect::RestoreMagicka:
-        case ESM::MagicEffect::RestoreFatigue:
-            if (effect.mRange == ESM::RT_Self)
-            {
-                int priority = 1;
-                if (effect.mEffectID == ESM::MagicEffect::RestoreHealth)
-                    priority = 10;
-                const MWMechanics::CreatureStats& stats = actor.getClass().getCreatureStats(actor);
-                const DynamicStat<float>& current = stats.getDynamic(effect.mEffectID - ESM::MagicEffect::RestoreHealth);
-                // NB: this currently assumes the hardcoded magic effect flags are used
-                const float magnitude = (effect.mMagnMin + effect.mMagnMax)/2.f;
-                const float toHeal = magnitude * std::max(1, effect.mDuration);
-                // Effect doesn't heal more than we need, *or* we are below 1/2 health
-                if (current.getModified() - current.getCurrent() > toHeal
-                        || current.getCurrent() < current.getModified()*0.5)
+            case ESM::MagicEffect::RestoreHealth:
+            case ESM::MagicEffect::RestoreMagicka:
+            case ESM::MagicEffect::RestoreFatigue:
+                if (effect.mRange == ESM::RT_Self)
                 {
-                    return 10000.f * priority
-                            - (toHeal - (current.getModified()-current.getCurrent())); // prefer the most fitting potion
+                    int priority = 1;
+                    if (effect.mEffectID == ESM::MagicEffect::RestoreHealth)
+                        priority = 10;
+                    const MWMechanics::CreatureStats& stats = actor.getClass().getCreatureStats(actor);
+                    const DynamicStat<float>& current
+                        = stats.getDynamic(effect.mEffectID - ESM::MagicEffect::RestoreHealth);
+                    // NB: this currently assumes the hardcoded magic effect flags are used
+                    const float magnitude = (effect.mMagnMin + effect.mMagnMax) / 2.f;
+                    const float toHeal = magnitude * std::max(1, effect.mDuration);
+                    // Effect doesn't heal more than we need, *or* we are below 1/2 health
+                    if (current.getModified() - current.getCurrent() > toHeal
+                        || current.getCurrent() < current.getModified() * 0.5)
+                    {
+                        return 10000.f * priority
+                            - (toHeal
+                                - (current.getModified() - current.getCurrent())); // prefer the most fitting potion
+                    }
+                    else
+                        return -10000.f * priority; // Save for later
                 }
-                else
-                    return -10000.f * priority; // Save for later
-            }
-            break;
-
-        case ESM::MagicEffect::Dispel:
-        {
-            int numPositive = 0;
-            int numNegative = 0;
-            int diff = 0;
+                break;
 
-            if (effect.mRange == ESM::RT_Self)
+            case ESM::MagicEffect::Dispel:
             {
-                numPositive = numEffectsToDispel(actor, -1, false);
-                numNegative = numEffectsToDispel(actor);
+                int numPositive = 0;
+                int numNegative = 0;
+                int diff = 0;
 
-                diff = numNegative - numPositive;
-            }
-            else
-            {
-                if (enemy.isEmpty())
-                    return 0.f;
+                if (effect.mRange == ESM::RT_Self)
+                {
+                    numPositive = numEffectsToDispel(actor, -1, false);
+                    numNegative = numEffectsToDispel(actor);
 
-                numPositive = numEffectsToDispel(enemy, -1, false);
-                numNegative = numEffectsToDispel(enemy);
+                    diff = numNegative - numPositive;
+                }
+                else
+                {
+                    if (enemy.isEmpty())
+                        return 0.f;
 
-                diff = numPositive - numNegative;
+                    numPositive = numEffectsToDispel(enemy, -1, false);
+                    numNegative = numEffectsToDispel(enemy);
 
-                // if rating < 0 here, the spell will be considered as negative later
-                rating *= -1;
-            }
+                    diff = numPositive - numNegative;
 
-            if (diff <= 0)
-                return 0.f;
+                    // if rating < 0 here, the spell will be considered as negative later
+                    rating *= -1;
+                }
 
-            rating *= (diff) / 5.f;
+                if (diff <= 0)
+                    return 0.f;
 
-            break;
-        }
+                rating *= (diff) / 5.f;
+
+                break;
+            }
 
-        // Prefer Cure effects over Dispel, because Dispel also removes positive effects
-        case ESM::MagicEffect::CureParalyzation:
-            return 1001.f * numEffectsToDispel(actor, ESM::MagicEffect::Paralyze);
+            // Prefer Cure effects over Dispel, because Dispel also removes positive effects
+            case ESM::MagicEffect::CureParalyzation:
+                return 1001.f * numEffectsToDispel(actor, ESM::MagicEffect::Paralyze);
 
-        case ESM::MagicEffect::CurePoison:
-            return 1001.f * numEffectsToDispel(actor, ESM::MagicEffect::Poison);
-        case ESM::MagicEffect::DisintegrateArmor:
+            case ESM::MagicEffect::CurePoison:
+                return 1001.f * numEffectsToDispel(actor, ESM::MagicEffect::Poison);
+            case ESM::MagicEffect::DisintegrateArmor:
             {
                 if (enemy.isEmpty())
                     return 0.f;
@@ -501,7 +510,7 @@ namespace MWMechanics
                 bool enemyHasArmor = false;
 
                 // Ignore enemy without armor
-                for (unsigned int i=0; i<sizeof(armorSlots)/sizeof(int); ++i)
+                for (unsigned int i = 0; i < sizeof(armorSlots) / sizeof(int); ++i)
                 {
                     MWWorld::ContainerStoreIterator item = inv.getSlot(armorSlots[i]);
 
@@ -518,7 +527,7 @@ namespace MWMechanics
                 break;
             }
 
-        case ESM::MagicEffect::DisintegrateWeapon:
+            case ESM::MagicEffect::DisintegrateWeapon:
             {
                 if (enemy.isEmpty())
                     return 0.f;
@@ -537,38 +546,39 @@ namespace MWMechanics
                 break;
             }
 
-        case ESM::MagicEffect::DamageAttribute:
-        case ESM::MagicEffect::DrainAttribute:
-            if (!enemy.isEmpty() && enemy.getClass().getCreatureStats(enemy).getAttribute(effect.mAttribute).getModified() <= 0)
-                return 0.f;
-            {
-                if (effect.mAttribute >= 0 && effect.mAttribute < ESM::Attribute::Length)
+            case ESM::MagicEffect::DamageAttribute:
+            case ESM::MagicEffect::DrainAttribute:
+                if (!enemy.isEmpty()
+                    && enemy.getClass().getCreatureStats(enemy).getAttribute(effect.mAttribute).getModified() <= 0)
+                    return 0.f;
                 {
-                    const float attributePriorities[ESM::Attribute::Length] = {
-                        1.0f, // Strength
-                        0.5f, // Intelligence
-                        0.6f, // Willpower
-                        0.7f, // Agility
-                        0.5f, // Speed
-                        0.8f, // Endurance
-                        0.7f, // Personality
-                        0.3f // Luck
-                    };
-                    rating *= attributePriorities[effect.mAttribute];
+                    if (effect.mAttribute >= 0 && effect.mAttribute < ESM::Attribute::Length)
+                    {
+                        const float attributePriorities[ESM::Attribute::Length] = {
+                            1.0f, // Strength
+                            0.5f, // Intelligence
+                            0.6f, // Willpower
+                            0.7f, // Agility
+                            0.5f, // Speed
+                            0.8f, // Endurance
+                            0.7f, // Personality
+                            0.3f // Luck
+                        };
+                        rating *= attributePriorities[effect.mAttribute];
+                    }
                 }
-            }
-            break;
+                break;
 
-        case ESM::MagicEffect::DamageSkill:
-        case ESM::MagicEffect::DrainSkill:
-            if (enemy.isEmpty() || !enemy.getClass().isNpc())
-                return 0.f;
-            if (enemy.getClass().getSkill(enemy, effect.mSkill) <= 0)
-                return 0.f;
-            break;
+            case ESM::MagicEffect::DamageSkill:
+            case ESM::MagicEffect::DrainSkill:
+                if (enemy.isEmpty() || !enemy.getClass().isNpc())
+                    return 0.f;
+                if (enemy.getClass().getSkill(enemy, effect.mSkill) <= 0)
+                    return 0.f;
+                break;
 
-        default:
-            break;
+            default:
+                break;
         }
 
         // Allow only one summoned creature at time
@@ -579,11 +589,12 @@ namespace MWMechanics
             if (!creatureStats.getSummonedCreatureMap().empty())
                 return 0.f;
         }
-        if(effect.mEffectID >= ESM::MagicEffect::BoundDagger && effect.mEffectID <= ESM::MagicEffect::BoundGloves)
+        if (effect.mEffectID >= ESM::MagicEffect::BoundDagger && effect.mEffectID <= ESM::MagicEffect::BoundGloves)
         {
-            // While rateSpell prevents actors from recasting the same spell, it doesn't prevent them from casting different spells with the same effect.
-            // Multiple instances of the same bound item don't stack so if the effect is already active, rate it as useless.
-            if(actor.getClass().getCreatureStats(actor).getMagicEffects().get(effect.mEffectID).getMagnitude() > 0.f)
+            // While rateSpell prevents actors from recasting the same spell, it doesn't prevent them from casting
+            // different spells with the same effect. Multiple instances of the same bound item don't stack so if the
+            // effect is already active, rate it as useless.
+            if (actor.getClass().getCreatureStats(actor).getMagicEffects().get(effect.mEffectID).getMagnitude() > 0.f)
                 return 0.f;
         }
 
@@ -600,7 +611,8 @@ namespace MWMechanics
                 return 0.f;
         }
 
-        const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effect.mEffectID);
+        const ESM::MagicEffect* magicEffect
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effect.mEffectID);
         if (magicEffect->mData.mFlags & ESM::MagicEffect::Harmful)
         {
             rating *= -1.f;
@@ -646,14 +658,15 @@ namespace MWMechanics
         return rating;
     }
 
-    float rateEffects(const ESM::EffectList &list, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy)
+    float rateEffects(const ESM::EffectList& list, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy)
     {
         // NOTE: enemy may be empty
 
         float rating = 0.f;
         float ratingMult = 1.f; // NB: this multiplier is applied to the effect rating, not the final rating
 
-        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
         static const float fAIMagicSpellMult = gmst.find("fAIMagicSpellMult")->mValue.getFloat();
         static const float fAIRangeMagicSpellMult = gmst.find("fAIRangeMagicSpellMult")->mValue.getFloat();
 
@@ -668,15 +681,16 @@ namespace MWMechanics
 
     float vanillaRateSpell(const ESM::Spell* spell, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy)
     {
-        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
         static const float fAIMagicSpellMult = gmst.find("fAIMagicSpellMult")->mValue.getFloat();
         static const float fAIRangeMagicSpellMult = gmst.find("fAIRangeMagicSpellMult")->mValue.getFloat();
 
         float mult = fAIMagicSpellMult;
 
-        for (std::vector<ESM::ENAMstruct>::const_iterator effectIt =
-             spell->mEffects.mList.begin(); effectIt != spell->mEffects.mList.end(); ++effectIt)
+        for (std::vector<ESM::ENAMstruct>::const_iterator effectIt = spell->mEffects.mList.begin();
+             effectIt != spell->mEffects.mList.end(); ++effectIt)
         {
             if (effectIt->mRange == ESM::RT_Target)
             {
diff --git a/apps/openmw/mwmechanics/spellpriority.hpp b/apps/openmw/mwmechanics/spellpriority.hpp
index 0305f24b5c..b35c5aaf0e 100644
--- a/apps/openmw/mwmechanics/spellpriority.hpp
+++ b/apps/openmw/mwmechanics/spellpriority.hpp
@@ -23,16 +23,16 @@ namespace MWMechanics
         Target = 0x100
     };
 
-    int getRangeTypes (const ESM::EffectList& effects);
+    int getRangeTypes(const ESM::EffectList& effects);
 
-    float rateSpell (const ESM::Spell* spell, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
-    float rateMagicItem (const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
-    float ratePotion (const MWWorld::Ptr& item, const MWWorld::Ptr &actor);
+    float rateSpell(const ESM::Spell* spell, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
+    float rateMagicItem(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
+    float ratePotion(const MWWorld::Ptr& item, const MWWorld::Ptr& actor);
 
     /// @note target may be empty
-    float rateEffect (const ESM::ENAMstruct& effect, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
+    float rateEffect(const ESM::ENAMstruct& effect, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
     /// @note target may be empty
-    float rateEffects (const ESM::EffectList& list, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
+    float rateEffects(const ESM::EffectList& list, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
 
     float vanillaRateSpell(const ESM::Spell* spell, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
 }
diff --git a/apps/openmw/mwmechanics/spellresistance.cpp b/apps/openmw/mwmechanics/spellresistance.cpp
index d865172875..0c27f9c197 100644
--- a/apps/openmw/mwmechanics/spellresistance.cpp
+++ b/apps/openmw/mwmechanics/spellresistance.cpp
@@ -17,7 +17,7 @@ namespace MWMechanics
 {
 
     float getEffectMultiplier(short effectId, const MWWorld::Ptr& actor, const MWWorld::Ptr& caster,
-                              const ESM::Spell* spell, const MagicEffects* effects)
+        const ESM::Spell* spell, const MagicEffects* effects)
     {
         if (!actor.getClass().isActor())
             return 1;
@@ -26,14 +26,15 @@ namespace MWMechanics
         return 1 - resistance / 100.f;
     }
 
-    float getEffectResistance (short effectId, const MWWorld::Ptr& actor, const MWWorld::Ptr& caster,
-                               const ESM::Spell* spell, const MagicEffects* effects)
+    float getEffectResistance(short effectId, const MWWorld::Ptr& actor, const MWWorld::Ptr& caster,
+        const ESM::Spell* spell, const MagicEffects* effects)
     {
         // Effects with no resistance attribute belonging to them can not be resisted
         if (ESM::MagicEffect::getResistanceEffect(effectId) == -1)
             return 0.f;
 
-        const auto magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectId);
+        const auto magicEffect
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectId);
 
         const MWMechanics::CreatureStats& stats = actor.getClass().getCreatureStats(actor);
         const MWMechanics::MagicEffects* magicEffects = &stats.getMagicEffects();
@@ -72,7 +73,7 @@ namespace MWMechanics
         return x;
     }
 
-    float getEffectResistanceAttribute (short effectId, const MagicEffects* actorEffects)
+    float getEffectResistanceAttribute(short effectId, const MagicEffects* actorEffects)
     {
         short resistanceEffect = ESM::MagicEffect::getResistanceEffect(effectId);
         short weaknessEffect = ESM::MagicEffect::getWeaknessEffect(effectId);
diff --git a/apps/openmw/mwmechanics/spellresistance.hpp b/apps/openmw/mwmechanics/spellresistance.hpp
index 8e74c22601..6966a456d1 100644
--- a/apps/openmw/mwmechanics/spellresistance.hpp
+++ b/apps/openmw/mwmechanics/spellresistance.hpp
@@ -20,18 +20,18 @@ namespace MWMechanics
     /// @param effects Override the actor's current magicEffects. Useful if there are effects currently
     ///                being applied (but not applied yet) that should also be considered.
     float getEffectMultiplier(short effectId, const MWWorld::Ptr& actor, const MWWorld::Ptr& caster,
-                              const ESM::Spell* spell = nullptr, const MagicEffects* effects = nullptr);
+        const ESM::Spell* spell = nullptr, const MagicEffects* effects = nullptr);
 
     /// Get the effective resistance against an effect casted by the given actor in the given spell (optional).
     /// @return >=100 for fully resisted. can also return negative value for damage amplification.
     /// @param effects Override the actor's current magicEffects. Useful if there are effects currently
     ///                being applied (but not applied yet) that should also be considered.
-    float getEffectResistance (short effectId, const MWWorld::Ptr& actor, const MWWorld::Ptr& caster,
-                               const ESM::Spell* spell = nullptr, const MagicEffects* effects = nullptr);
+    float getEffectResistance(short effectId, const MWWorld::Ptr& actor, const MWWorld::Ptr& caster,
+        const ESM::Spell* spell = nullptr, const MagicEffects* effects = nullptr);
 
     /// Get the resistance attribute against an effect for a given actor. This will add together
     /// ResistX and Weakness to X effects relevant against the given effect.
-    float getEffectResistanceAttribute (short effectId, const MagicEffects* actorEffects);
+    float getEffectResistanceAttribute(short effectId, const MagicEffects* actorEffects);
 }
 
 #endif
diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp
index 481d555c01..21769e776b 100644
--- a/apps/openmw/mwmechanics/spells.cpp
+++ b/apps/openmw/mwmechanics/spells.cpp
@@ -20,19 +20,23 @@
 
 namespace MWMechanics
 {
-    Spells::Spells()
-    {
-    }
+    Spells::Spells() {}
 
-    Spells::Spells(const Spells& spells) : mSpellList(spells.mSpellList), mSpells(spells.mSpells),
-        mSelectedSpell(spells.mSelectedSpell), mUsedPowers(spells.mUsedPowers)
+    Spells::Spells(const Spells& spells)
+        : mSpellList(spells.mSpellList)
+        , mSpells(spells.mSpells)
+        , mSelectedSpell(spells.mSelectedSpell)
+        , mUsedPowers(spells.mUsedPowers)
     {
-        if(mSpellList)
+        if (mSpellList)
             mSpellList->addListener(this);
     }
 
-    Spells::Spells(Spells&& spells) : mSpellList(std::move(spells.mSpellList)), mSpells(std::move(spells.mSpells)),
-        mSelectedSpell(std::move(spells.mSelectedSpell)), mUsedPowers(std::move(spells.mUsedPowers))
+    Spells::Spells(Spells&& spells)
+        : mSpellList(std::move(spells.mSpellList))
+        , mSpells(std::move(spells.mSpells))
+        , mSelectedSpell(std::move(spells.mSelectedSpell))
+        , mUsedPowers(std::move(spells.mUsedPowers))
     {
         if (mSpellList)
             mSpellList->updateListener(&spells, this);
@@ -53,12 +57,12 @@ namespace MWMechanics
         return hasSpell(SpellList::getSpell(spell));
     }
 
-    bool Spells::hasSpell(const ESM::Spell *spell) const
+    bool Spells::hasSpell(const ESM::Spell* spell) const
     {
         return std::find(mSpells.begin(), mSpells.end(), spell) != mSpells.end();
     }
 
-    void Spells::add (const ESM::Spell* spell)
+    void Spells::add(const ESM::Spell* spell)
     {
         mSpellList->add(spell);
     }
@@ -80,14 +84,14 @@ namespace MWMechanics
         removeSpell(spell);
         mSpellList->remove(spell);
 
-        if (spellId==mSelectedSpell)
+        if (spellId == mSelectedSpell)
             mSelectedSpell.clear();
     }
 
     void Spells::removeSpell(const ESM::Spell* spell)
     {
         const auto it = std::find(mSpells.begin(), mSpells.end(), spell);
-        if(it != mSpells.end())
+        if (it != mSpells.end())
             mSpells.erase(it);
     }
 
@@ -99,11 +103,11 @@ namespace MWMechanics
     void Spells::clear(bool modifyBase)
     {
         removeAllSpells();
-        if(modifyBase)
+        if (modifyBase)
             mSpellList->clear();
     }
 
-    void Spells::setSelectedSpell (const std::string& spellId)
+    void Spells::setSelectedSpell(const std::string& spellId)
     {
         mSelectedSpell = spellId;
     }
@@ -115,10 +119,8 @@ namespace MWMechanics
 
     bool Spells::hasSpellType(const ESM::Spell::SpellType type) const
     {
-        auto it = std::find_if(std::begin(mSpells), std::end(mSpells), [=](const ESM::Spell* spell)
-            {
-                return spell->mData.mType == type;
-            });
+        auto it = std::find_if(std::begin(mSpells), std::end(mSpells),
+            [=](const ESM::Spell* spell) { return spell->mData.mType == type; });
         return it != std::end(mSpells);
     }
 
@@ -135,9 +137,9 @@ namespace MWMechanics
     void Spells::purge(const SpellFilter& filter)
     {
         std::vector<std::string> purged;
-        for (auto iter = mSpells.begin(); iter!=mSpells.end();)
+        for (auto iter = mSpells.begin(); iter != mSpells.end();)
         {
-            const ESM::Spell *spell = *iter;
+            const ESM::Spell* spell = *iter;
             if (filter(spell))
             {
                 iter = mSpells.erase(iter);
@@ -146,7 +148,7 @@ namespace MWMechanics
             else
                 ++iter;
         }
-        if(!purged.empty())
+        if (!purged.empty())
             mSpellList->removeAll(purged);
     }
 
@@ -170,7 +172,7 @@ namespace MWMechanics
         purge([](auto spell) { return spell->mData.mType == ESM::Spell::ST_Curse; });
     }
 
-    bool Spells::hasCorprusEffect(const ESM::Spell *spell)
+    bool Spells::hasCorprusEffect(const ESM::Spell* spell)
     {
         for (const auto& effectIt : spell->mEffects.mList)
         {
@@ -184,14 +186,16 @@ namespace MWMechanics
 
     bool Spells::canUsePower(const ESM::Spell* spell) const
     {
-        const auto it = std::find_if(std::begin(mUsedPowers), std::end(mUsedPowers), [&](auto& pair) { return pair.first == spell; });
+        const auto it = std::find_if(
+            std::begin(mUsedPowers), std::end(mUsedPowers), [&](auto& pair) { return pair.first == spell; });
         return it == mUsedPowers.end() || it->second + 24 <= MWBase::Environment::get().getWorld()->getTimeStamp();
     }
 
     void Spells::usePower(const ESM::Spell* spell)
     {
         // Updates or inserts a new entry with the current timestamp.
-        const auto it = std::find_if(std::begin(mUsedPowers), std::end(mUsedPowers), [&](auto& pair) { return pair.first == spell; });
+        const auto it = std::find_if(
+            std::begin(mUsedPowers), std::end(mUsedPowers), [&](auto& pair) { return pair.first == spell; });
         const auto timestamp = MWBase::Environment::get().getWorld()->getTimeStamp();
         if (it == mUsedPowers.end())
             mUsedPowers.emplace_back(spell, timestamp);
@@ -199,7 +203,7 @@ namespace MWMechanics
             it->second = timestamp;
     }
 
-    void Spells::readState(const ESM::SpellState &state, CreatureStats* creatureStats)
+    void Spells::readState(const ESM::SpellState& state, CreatureStats* creatureStats)
     {
         const auto& baseSpells = mSpellList->getSpells();
 
@@ -216,26 +220,31 @@ namespace MWMechanics
             }
         }
         // Add spells from the base record
-        for(const std::string& id : baseSpells)
+        for (const std::string& id : baseSpells)
         {
             const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(id);
-            if(spell)
+            if (spell)
                 addSpell(spell);
         }
 
-        for (std::map<std::string, ESM::TimeStamp>::const_iterator it = state.mUsedPowers.begin(); it != state.mUsedPowers.end(); ++it)
+        for (std::map<std::string, ESM::TimeStamp>::const_iterator it = state.mUsedPowers.begin();
+             it != state.mUsedPowers.end(); ++it)
         {
-            const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(it->first);
+            const ESM::Spell* spell
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(it->first);
             if (!spell)
                 continue;
             mUsedPowers.emplace_back(spell, MWWorld::TimeStamp(it->second));
         }
 
-        // Permanent effects are used only to keep the custom magnitude of corprus spells effects (after cure too), and only in old saves. Convert data to the new approach.
-        for (std::map<std::string, std::vector<ESM::SpellState::PermanentSpellEffectInfo> >::const_iterator it =
-            state.mPermanentSpellEffects.begin(); it != state.mPermanentSpellEffects.end(); ++it)
+        // Permanent effects are used only to keep the custom magnitude of corprus spells effects (after cure too), and
+        // only in old saves. Convert data to the new approach.
+        for (std::map<std::string, std::vector<ESM::SpellState::PermanentSpellEffectInfo>>::const_iterator it
+             = state.mPermanentSpellEffects.begin();
+             it != state.mPermanentSpellEffects.end(); ++it)
         {
-            const ESM::Spell * spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(it->first);
+            const ESM::Spell* spell
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(it->first);
             if (!spell)
                 continue;
 
@@ -245,7 +254,8 @@ namespace MWMechanics
                 return;
 
             // Note: if target actor has the Restore attirbute effects, stats will be restored.
-            for (std::vector<ESM::SpellState::PermanentSpellEffectInfo>::const_iterator effectIt = it->second.begin(); effectIt != it->second.end(); ++effectIt)
+            for (std::vector<ESM::SpellState::PermanentSpellEffectInfo>::const_iterator effectIt = it->second.begin();
+                 effectIt != it->second.end(); ++effectIt)
             {
                 // Applied corprus effects are already in loaded stats modifiers
                 if (effectIt->mId == ESM::MagicEffect::FortifyAttribute)
@@ -266,14 +276,14 @@ namespace MWMechanics
         }
     }
 
-    void Spells::writeState(ESM::SpellState &state) const
+    void Spells::writeState(ESM::SpellState& state) const
     {
         const auto& baseSpells = mSpellList->getSpells();
         for (const auto spell : mSpells)
         {
             // Don't save spells and powers stored in the base record
-            if((spell->mData.mType != ESM::Spell::ST_Spell && spell->mData.mType != ESM::Spell::ST_Power) ||
-                std::find(baseSpells.begin(), baseSpells.end(), spell->mId) == baseSpells.end())
+            if ((spell->mData.mType != ESM::Spell::ST_Spell && spell->mData.mType != ESM::Spell::ST_Power)
+                || std::find(baseSpells.begin(), baseSpells.end(), spell->mId) == baseSpells.end())
             {
                 state.mSpells.emplace_back(spell->mId);
             }
@@ -296,10 +306,10 @@ namespace MWMechanics
 
     void Spells::addAllToInstance(const std::vector<std::string>& spells)
     {
-        for(const std::string& id : spells)
+        for (const std::string& id : spells)
         {
             const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(id);
-            if(spell)
+            if (spell)
                 addSpell(spell);
             else
                 Log(Debug::Warning) << "Warning: ignoring nonexistent spell '" << id << "'";
@@ -308,7 +318,7 @@ namespace MWMechanics
 
     Spells::~Spells()
     {
-        if(mSpellList)
+        if (mSpellList)
             mSpellList->removeListener(this);
     }
 }
diff --git a/apps/openmw/mwmechanics/spells.hpp b/apps/openmw/mwmechanics/spells.hpp
index 2dd8706b1c..4248e6de95 100644
--- a/apps/openmw/mwmechanics/spells.hpp
+++ b/apps/openmw/mwmechanics/spells.hpp
@@ -1,8 +1,8 @@
 #ifndef GAME_MWMECHANICS_SPELLS_H
 #define GAME_MWMECHANICS_SPELLS_H
 
-#include <memory>
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -27,79 +27,80 @@ namespace MWMechanics
     /// diseases. It also keeps track of used powers (which can only be used every 24h).
     class Spells
     {
-            std::shared_ptr<SpellList> mSpellList;
-            std::vector<const ESM::Spell*> mSpells;
+        std::shared_ptr<SpellList> mSpellList;
+        std::vector<const ESM::Spell*> mSpells;
+
+        // Note: this is the spell that's about to be cast, *not* the spell selected in the GUI (which may be different)
+        std::string mSelectedSpell;
 
-            // Note: this is the spell that's about to be cast, *not* the spell selected in the GUI (which may be different)
-            std::string mSelectedSpell;
+        std::vector<std::pair<const ESM::Spell*, MWWorld::TimeStamp>> mUsedPowers;
 
-            std::vector<std::pair<const ESM::Spell*, MWWorld::TimeStamp>> mUsedPowers;
+        bool hasSpellType(const ESM::Spell::SpellType type) const;
 
-            bool hasSpellType(const ESM::Spell::SpellType type) const;
+        using SpellFilter = bool (*)(const ESM::Spell*);
+        void purge(const SpellFilter& filter);
 
-            using SpellFilter = bool (*)(const ESM::Spell*);
-            void purge(const SpellFilter& filter);
+        void addSpell(const ESM::Spell* spell);
+        void removeSpell(const ESM::Spell* spell);
+        void removeAllSpells();
 
-            void addSpell(const ESM::Spell* spell);
-            void removeSpell(const ESM::Spell* spell);
-            void removeAllSpells();
+        friend class SpellList;
 
-            friend class SpellList;
-        public:
-            Spells();
+    public:
+        Spells();
 
-            Spells(const Spells&);
+        Spells(const Spells&);
 
-            Spells(Spells&& spells);
+        Spells(Spells&& spells);
 
-            ~Spells();
+        ~Spells();
 
-            static bool hasCorprusEffect(const ESM::Spell *spell);
+        static bool hasCorprusEffect(const ESM::Spell* spell);
 
-            bool canUsePower (const ESM::Spell* spell) const;
-            void usePower (const ESM::Spell* spell);
+        bool canUsePower(const ESM::Spell* spell) const;
+        void usePower(const ESM::Spell* spell);
 
-            void purgeCommonDisease();
-            void purgeBlightDisease();
-            void purgeCorprusDisease();
-            void purgeCurses();
+        void purgeCommonDisease();
+        void purgeBlightDisease();
+        void purgeCorprusDisease();
+        void purgeCurses();
 
-            std::vector<const ESM::Spell*>::const_iterator begin() const;
+        std::vector<const ESM::Spell*>::const_iterator begin() const;
 
-            std::vector<const ESM::Spell*>::const_iterator end() const;
+        std::vector<const ESM::Spell*>::const_iterator end() const;
 
-            bool hasSpell(std::string_view spell) const;
-            bool hasSpell(const ESM::Spell* spell) const;
+        bool hasSpell(std::string_view spell) const;
+        bool hasSpell(const ESM::Spell* spell) const;
 
-            void add(std::string_view spell);
-            ///< Adding a spell that is already listed in *this is a no-op.
+        void add(std::string_view spell);
+        ///< Adding a spell that is already listed in *this is a no-op.
 
-            void add (const ESM::Spell* spell);
-            ///< Adding a spell that is already listed in *this is a no-op.
+        void add(const ESM::Spell* spell);
+        ///< Adding a spell that is already listed in *this is a no-op.
 
-            void remove(std::string_view spell);
-            ///< If the spell to be removed is the selected spell, the selected spell will be changed to
-            /// no spell (empty string).
+        void remove(std::string_view spell);
+        ///< If the spell to be removed is the selected spell, the selected spell will be changed to
+        /// no spell (empty string).
 
-            void clear(bool modifyBase = false);
-            ///< Remove all spells of al types.
+        void clear(bool modifyBase = false);
+        ///< Remove all spells of al types.
 
-            void setSelectedSpell (const std::string& spellId);
-            ///< This function does not verify, if the spell is available.
+        void setSelectedSpell(const std::string& spellId);
+        ///< This function does not verify, if the spell is available.
 
-            const std::string& getSelectedSpell() const;
-            ///< May return an empty string.
+        const std::string& getSelectedSpell() const;
+        ///< May return an empty string.
 
-            bool hasCommonDisease() const;
+        bool hasCommonDisease() const;
 
-            bool hasBlightDisease() const;
+        bool hasBlightDisease() const;
 
-            void readState (const ESM::SpellState& state, CreatureStats* creatureStats);
-            void writeState (ESM::SpellState& state) const;
+        void readState(const ESM::SpellState& state, CreatureStats* creatureStats);
+        void writeState(ESM::SpellState& state) const;
 
-            bool setSpells(const std::string& id);
+        bool setSpells(const std::string& id);
 
-            void addAllToInstance(const std::vector<std::string>& spells);
+        void addAllToInstance(const std::vector<std::string>& spells);
     };
 }
 
diff --git a/apps/openmw/mwmechanics/spellutil.cpp b/apps/openmw/mwmechanics/spellutil.cpp
index bfe15e820a..08c2085986 100644
--- a/apps/openmw/mwmechanics/spellutil.cpp
+++ b/apps/openmw/mwmechanics/spellutil.cpp
@@ -17,15 +17,19 @@ namespace MWMechanics
 {
     ESM::Skill::SkillEnum spellSchoolToSkill(int school)
     {
-        static const std::array<ESM::Skill::SkillEnum, 6> schoolSkillArray
-        {
-            ESM::Skill::Alteration, ESM::Skill::Conjuration, ESM::Skill::Destruction,
-            ESM::Skill::Illusion, ESM::Skill::Mysticism, ESM::Skill::Restoration,
+        static const std::array<ESM::Skill::SkillEnum, 6> schoolSkillArray{
+            ESM::Skill::Alteration,
+            ESM::Skill::Conjuration,
+            ESM::Skill::Destruction,
+            ESM::Skill::Illusion,
+            ESM::Skill::Mysticism,
+            ESM::Skill::Restoration,
         };
         return schoolSkillArray.at(school);
     }
 
-    float calcEffectCost(const ESM::ENAMstruct& effect, const ESM::MagicEffect* magicEffect, const EffectCostMethod method)
+    float calcEffectCost(
+        const ESM::ENAMstruct& effect, const ESM::MagicEffect* magicEffect, const EffectCostMethod method)
     {
         const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
         if (!magicEffect)
@@ -42,7 +46,8 @@ namespace MWMechanics
 
         int durationOffset = 0;
         int minArea = 0;
-        if (method == EffectCostMethod::PlayerSpell) {
+        if (method == EffectCostMethod::PlayerSpell)
+        {
             durationOffset = 1;
             minArea = 1;
         }
@@ -55,7 +60,7 @@ namespace MWMechanics
         return x * fEffectCostMult;
     }
 
-    int calcSpellCost (const ESM::Spell& spell)
+    int calcSpellCost(const ESM::Spell& spell)
     {
         if (!(spell.mData.mFlags & ESM::Spell::F_Autocalc))
             return spell.mData.mCost;
@@ -77,7 +82,7 @@ namespace MWMechanics
         return std::round(cost);
     }
 
-    int getEffectiveEnchantmentCastCost(float castCost, const MWWorld::Ptr &actor)
+    int getEffectiveEnchantmentCastCost(float castCost, const MWWorld::Ptr& actor)
     {
         /*
          * Each point of enchant skill above/under 10 subtracts/adds
@@ -89,7 +94,7 @@ namespace MWMechanics
         return static_cast<int>((result < 1) ? 1 : result);
     }
 
-    float calcSpellBaseSuccessChance (const ESM::Spell* spell, const MWWorld::Ptr& actor, int* effectiveSchool)
+    float calcSpellBaseSuccessChance(const ESM::Spell* spell, const MWWorld::Ptr& actor, int* effectiveSchool)
     {
         // Morrowind for some reason uses a formula slightly different from magicka cost calculation
         float y = std::numeric_limits<float>::max();
@@ -98,7 +103,8 @@ namespace MWMechanics
         for (const ESM::ENAMstruct& effect : spell->mEffects.mList)
         {
             float x = static_cast<float>(effect.mDuration);
-            const auto magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effect.mEffectID);
+            const auto magicEffect
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effect.mEffectID);
 
             if (!(magicEffect->mData.mFlags & ESM::MagicEffect::AppliedOnce))
                 x = std::max(1.f, x);
@@ -108,8 +114,12 @@ namespace MWMechanics
             x += effect.mArea * 0.05f * magicEffect->mData.mBaseCost;
             if (effect.mRange == ESM::RT_Target)
                 x *= 1.5f;
-            static const float fEffectCostMult = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
-                        "fEffectCostMult")->mValue.getFloat();
+            static const float fEffectCostMult = MWBase::Environment::get()
+                                                     .getWorld()
+                                                     ->getStore()
+                                                     .get<ESM::GameSetting>()
+                                                     .find("fEffectCostMult")
+                                                     ->mValue.getFloat();
             x *= fEffectCostMult;
 
             float s = 2.0f * actor.getClass().getSkill(actor, spellSchoolToSkill(magicEffect->mData.mSchool));
@@ -132,7 +142,8 @@ namespace MWMechanics
         return castChance;
     }
 
-    float getSpellSuccessChance (const ESM::Spell* spell, const MWWorld::Ptr& actor, int* effectiveSchool, bool cap, bool checkMagicka)
+    float getSpellSuccessChance(
+        const ESM::Spell* spell, const MWWorld::Ptr& actor, int* effectiveSchool, bool cap, bool checkMagicka)
     {
         // NB: Base chance is calculated here because the effective school pointer must be filled
         float baseChance = calcSpellBaseSuccessChance(spell, actor, effectiveSchool);
@@ -169,7 +180,8 @@ namespace MWMechanics
         return std::max(castChance, 0.f);
     }
 
-    float getSpellSuccessChance (const std::string& spellId, const MWWorld::Ptr& actor, int* effectiveSchool, bool cap, bool checkMagicka)
+    float getSpellSuccessChance(
+        const std::string& spellId, const MWWorld::Ptr& actor, int* effectiveSchool, bool cap, bool checkMagicka)
     {
         if (const auto spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(spellId))
             return getSpellSuccessChance(spell, actor, effectiveSchool, cap, checkMagicka);
@@ -190,12 +202,12 @@ namespace MWMechanics
         return school;
     }
 
-    bool spellIncreasesSkill(const ESM::Spell *spell)
+    bool spellIncreasesSkill(const ESM::Spell* spell)
     {
         return spell->mData.mType == ESM::Spell::ST_Spell && !(spell->mData.mFlags & ESM::Spell::F_Always);
     }
 
-    bool spellIncreasesSkill(const std::string &spellId)
+    bool spellIncreasesSkill(const std::string& spellId)
     {
         const auto spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(spellId);
         return spell && spellIncreasesSkill(spell);
diff --git a/apps/openmw/mwmechanics/spellutil.hpp b/apps/openmw/mwmechanics/spellutil.hpp
index 571e02d166..457782d7be 100644
--- a/apps/openmw/mwmechanics/spellutil.hpp
+++ b/apps/openmw/mwmechanics/spellutil.hpp
@@ -19,15 +19,17 @@ namespace MWMechanics
 {
     ESM::Skill::SkillEnum spellSchoolToSkill(int school);
 
-    enum class EffectCostMethod {
+    enum class EffectCostMethod
+    {
         GameSpell,
         PlayerSpell,
     };
 
-    float calcEffectCost(const ESM::ENAMstruct& effect, const ESM::MagicEffect* magicEffect = nullptr, const EffectCostMethod method = EffectCostMethod::GameSpell);
-    int calcSpellCost (const ESM::Spell& spell);
+    float calcEffectCost(const ESM::ENAMstruct& effect, const ESM::MagicEffect* magicEffect = nullptr,
+        const EffectCostMethod method = EffectCostMethod::GameSpell);
+    int calcSpellCost(const ESM::Spell& spell);
 
-    int getEffectiveEnchantmentCastCost (float castCost, const MWWorld::Ptr& actor);
+    int getEffectiveEnchantmentCastCost(float castCost, const MWWorld::Ptr& actor);
 
     /**
      * @param spell spell to cast
@@ -38,9 +40,11 @@ namespace MWMechanics
      * @note actor can be an NPC or a creature
      * @return success chance from 0 to 100 (in percent), if cap=false then chance above 100 may be returned.
      */
-    float calcSpellBaseSuccessChance (const ESM::Spell* spell, const MWWorld::Ptr& actor, int* effectiveSchool);
-    float getSpellSuccessChance (const ESM::Spell* spell, const MWWorld::Ptr& actor, int* effectiveSchool = nullptr, bool cap=true, bool checkMagicka=true);
-    float getSpellSuccessChance (const std::string& spellId, const MWWorld::Ptr& actor, int* effectiveSchool = nullptr, bool cap=true, bool checkMagicka=true);
+    float calcSpellBaseSuccessChance(const ESM::Spell* spell, const MWWorld::Ptr& actor, int* effectiveSchool);
+    float getSpellSuccessChance(const ESM::Spell* spell, const MWWorld::Ptr& actor, int* effectiveSchool = nullptr,
+        bool cap = true, bool checkMagicka = true);
+    float getSpellSuccessChance(const std::string& spellId, const MWWorld::Ptr& actor, int* effectiveSchool = nullptr,
+        bool cap = true, bool checkMagicka = true);
 
     int getSpellSchool(const std::string& spellId, const MWWorld::Ptr& actor);
     int getSpellSchool(const ESM::Spell* spell, const MWWorld::Ptr& actor);
diff --git a/apps/openmw/mwmechanics/stat.cpp b/apps/openmw/mwmechanics/stat.cpp
index eacfca98ae..d96d2cac39 100644
--- a/apps/openmw/mwmechanics/stat.cpp
+++ b/apps/openmw/mwmechanics/stat.cpp
@@ -4,44 +4,67 @@
 
 namespace MWMechanics
 {
-    template<typename T>
-    Stat<T>::Stat() : mBase (0), mModifier (0) {}
-    template<typename T>
-    Stat<T>::Stat(T base, T modified) : mBase (base), mModifier (modified) {}
+    template <typename T>
+    Stat<T>::Stat()
+        : mBase(0)
+        , mModifier(0)
+    {
+    }
+    template <typename T>
+    Stat<T>::Stat(T base, T modified)
+        : mBase(base)
+        , mModifier(modified)
+    {
+    }
 
-    template<typename T>
+    template <typename T>
     T Stat<T>::getModified(bool capped) const
     {
-        if(capped)
+        if (capped)
             return std::max({}, mModifier + mBase);
         return mModifier + mBase;
     }
 
-    template<typename T>
-    void Stat<T>::writeState (ESM::StatState<T>& state) const
+    template <typename T>
+    void Stat<T>::writeState(ESM::StatState<T>& state) const
     {
         state.mBase = mBase;
         state.mMod = mModifier;
     }
-    template<typename T>
-    void Stat<T>::readState (const ESM::StatState<T>& state)
+    template <typename T>
+    void Stat<T>::readState(const ESM::StatState<T>& state)
     {
         mBase = state.mBase;
         mModifier = state.mMod;
     }
 
+    template <typename T>
+    DynamicStat<T>::DynamicStat()
+        : mStatic(0, 0)
+        , mCurrent(0)
+    {
+    }
+    template <typename T>
+    DynamicStat<T>::DynamicStat(T base)
+        : mStatic(base, 0)
+        , mCurrent(base)
+    {
+    }
+    template <typename T>
+    DynamicStat<T>::DynamicStat(T base, T modified, T current)
+        : mStatic(base, modified)
+        , mCurrent(current)
+    {
+    }
+    template <typename T>
+    DynamicStat<T>::DynamicStat(const Stat<T>& stat, T current)
+        : mStatic(stat)
+        , mCurrent(current)
+    {
+    }
 
-    template<typename T>
-    DynamicStat<T>::DynamicStat() : mStatic(0, 0), mCurrent(0) {}
-    template<typename T>
-    DynamicStat<T>::DynamicStat(T base) : mStatic(base, 0), mCurrent(base) {}
-    template<typename T>
-    DynamicStat<T>::DynamicStat(T base, T modified, T current) : mStatic(base, modified), mCurrent (current) {}
-    template<typename T>
-    DynamicStat<T>::DynamicStat(const Stat<T> &stat, T current) : mStatic(stat), mCurrent (current) {}
-
-    template<typename T>
-    void DynamicStat<T>::setCurrent (const T& value, bool allowDecreaseBelowZero, bool allowIncreaseAboveModified)
+    template <typename T>
+    void DynamicStat<T>::setCurrent(const T& value, bool allowDecreaseBelowZero, bool allowIncreaseAboveModified)
     {
         if (value > mCurrent)
         {
@@ -65,34 +88,36 @@ namespace MWMechanics
         }
     }
 
-    template<typename T>
+    template <typename T>
     T DynamicStat<T>::getRatio(bool nanIsZero) const
     {
         T modified = getModified();
-        if(modified == T{})
+        if (modified == T{})
         {
-            if(nanIsZero)
+            if (nanIsZero)
                 return modified;
-            return {1};
+            return { 1 };
         }
         return getCurrent() / modified;
     }
 
-    template<typename T>
-    void DynamicStat<T>::writeState (ESM::StatState<T>& state) const
+    template <typename T>
+    void DynamicStat<T>::writeState(ESM::StatState<T>& state) const
     {
-        mStatic.writeState (state);
+        mStatic.writeState(state);
         state.mCurrent = mCurrent;
     }
-    template<typename T>
-    void DynamicStat<T>::readState (const ESM::StatState<T>& state)
+    template <typename T>
+    void DynamicStat<T>::readState(const ESM::StatState<T>& state)
     {
-        mStatic.readState (state);
+        mStatic.readState(state);
         mCurrent = state.mCurrent;
     }
 
-    AttributeValue::AttributeValue() :
-        mBase(0.f), mModifier(0.f), mDamage(0.f)
+    AttributeValue::AttributeValue()
+        : mBase(0.f)
+        , mModifier(0.f)
+        , mDamage(0.f)
     {
     }
 
@@ -112,7 +137,7 @@ namespace MWMechanics
     void AttributeValue::setBase(float base, bool clearModifier)
     {
         mBase = base;
-        if(clearModifier)
+        if (clearModifier)
         {
             mModifier = 0.f;
             mDamage = 0.f;
@@ -121,7 +146,7 @@ namespace MWMechanics
 
     void AttributeValue::setModifier(float mod)
     {
-        if(mod < 0)
+        if (mod < 0)
         {
             mModifier = 0.f;
             mDamage -= mod;
@@ -136,7 +161,8 @@ namespace MWMechanics
     }
     void AttributeValue::restore(float amount)
     {
-        if (mDamage <= 0) return;
+        if (mDamage <= 0)
+            return;
 
         mDamage -= std::min(mDamage, amount);
     }
@@ -146,22 +172,22 @@ namespace MWMechanics
         return mDamage;
     }
 
-    void AttributeValue::writeState (ESM::StatState<float>& state) const
+    void AttributeValue::writeState(ESM::StatState<float>& state) const
     {
         state.mBase = mBase;
         state.mMod = mModifier;
         state.mDamage = mDamage;
     }
 
-    void AttributeValue::readState (const ESM::StatState<float>& state)
+    void AttributeValue::readState(const ESM::StatState<float>& state)
     {
         mBase = state.mBase;
         mModifier = state.mMod;
         mDamage = state.mDamage;
     }
 
-    SkillValue::SkillValue() :
-        mProgress(0)
+    SkillValue::SkillValue()
+        : mProgress(0)
     {
     }
 
@@ -174,15 +200,15 @@ namespace MWMechanics
         mProgress = progress;
     }
 
-    void SkillValue::writeState (ESM::StatState<float>& state) const
+    void SkillValue::writeState(ESM::StatState<float>& state) const
     {
-        AttributeValue::writeState (state);
+        AttributeValue::writeState(state);
         state.mProgress = mProgress;
     }
 
-    void SkillValue::readState (const ESM::StatState<float>& state)
+    void SkillValue::readState(const ESM::StatState<float>& state)
     {
-        AttributeValue::readState (state);
+        AttributeValue::readState(state);
         mProgress = state.mProgress;
     }
 }
diff --git a/apps/openmw/mwmechanics/stat.hpp b/apps/openmw/mwmechanics/stat.hpp
index 1e9bb100d0..c37cf61990 100644
--- a/apps/openmw/mwmechanics/stat.hpp
+++ b/apps/openmw/mwmechanics/stat.hpp
@@ -6,93 +6,91 @@
 
 namespace ESM
 {
-    template<typename T>
+    template <typename T>
     struct StatState;
 }
 
 namespace MWMechanics
 {
-    template<typename T>
+    template <typename T>
     class Stat
     {
-            T mBase;
-            T mModifier;
+        T mBase;
+        T mModifier;
 
-        public:
-            typedef T Type;
+    public:
+        typedef T Type;
 
-            Stat();
-            Stat(T base, T modified);
+        Stat();
+        Stat(T base, T modified);
 
-            const T& getBase() const { return mBase; };
+        const T& getBase() const { return mBase; };
 
-            T getModified(bool capped = true) const;
-            T getModifier() const { return mModifier; };
+        T getModified(bool capped = true) const;
+        T getModifier() const { return mModifier; };
 
-            void setBase(const T& value) { mBase = value; };
+        void setBase(const T& value) { mBase = value; };
 
-            void setModifier(const T& modifier) { mModifier = modifier; };
+        void setModifier(const T& modifier) { mModifier = modifier; };
 
-            void writeState (ESM::StatState<T>& state) const;
-            void readState (const ESM::StatState<T>& state);
+        void writeState(ESM::StatState<T>& state) const;
+        void readState(const ESM::StatState<T>& state);
     };
 
-    template<typename T>
-    inline bool operator== (const Stat<T>& left, const Stat<T>& right)
+    template <typename T>
+    inline bool operator==(const Stat<T>& left, const Stat<T>& right)
     {
-        return left.getBase()==right.getBase() &&
-            left.getModifier()==right.getModifier();
+        return left.getBase() == right.getBase() && left.getModifier() == right.getModifier();
     }
 
-    template<typename T>
-    inline bool operator!= (const Stat<T>& left, const Stat<T>& right)
+    template <typename T>
+    inline bool operator!=(const Stat<T>& left, const Stat<T>& right)
     {
-        return !(left==right);
+        return !(left == right);
     }
 
-    template<typename T>
+    template <typename T>
     class DynamicStat
     {
-            Stat<T> mStatic;
-            T mCurrent;
+        Stat<T> mStatic;
+        T mCurrent;
 
-        public:
-            typedef T Type;
+    public:
+        typedef T Type;
 
-            DynamicStat();
-            DynamicStat(T base);
-            DynamicStat(T base, T modified, T current);
-            DynamicStat(const Stat<T> &stat, T current);
+        DynamicStat();
+        DynamicStat(T base);
+        DynamicStat(T base, T modified, T current);
+        DynamicStat(const Stat<T>& stat, T current);
 
-            const T& getBase() const { return mStatic.getBase(); };
-            T getModified(bool capped = true) const { return mStatic.getModified(capped); };
-            const T& getCurrent() const { return mCurrent; };
-            T getRatio(bool nanIsZero = true) const;
+        const T& getBase() const { return mStatic.getBase(); };
+        T getModified(bool capped = true) const { return mStatic.getModified(capped); };
+        const T& getCurrent() const { return mCurrent; };
+        T getRatio(bool nanIsZero = true) const;
 
-            /// Set base and adjust current accordingly.
-            void setBase(const T& value) { mStatic.setBase(value); };
+        /// Set base and adjust current accordingly.
+        void setBase(const T& value) { mStatic.setBase(value); };
 
-            void setCurrent (const T& value, bool allowDecreaseBelowZero = false, bool allowIncreaseAboveModified = false);
+        void setCurrent(const T& value, bool allowDecreaseBelowZero = false, bool allowIncreaseAboveModified = false);
 
-            T getModifier() const { return mStatic.getModifier(); }
-            void setModifier(T value) { mStatic.setModifier(value); }
+        T getModifier() const { return mStatic.getModifier(); }
+        void setModifier(T value) { mStatic.setModifier(value); }
 
-            void writeState (ESM::StatState<T>& state) const;
-            void readState (const ESM::StatState<T>& state);
+        void writeState(ESM::StatState<T>& state) const;
+        void readState(const ESM::StatState<T>& state);
     };
 
-    template<typename T>
-    inline bool operator== (const DynamicStat<T>& left, const DynamicStat<T>& right)
+    template <typename T>
+    inline bool operator==(const DynamicStat<T>& left, const DynamicStat<T>& right)
     {
-        return left.getBase()==right.getBase() &&
-            left.getModifier()==right.getModifier() &&
-            left.getCurrent()==right.getCurrent();
+        return left.getBase() == right.getBase() && left.getModifier() == right.getModifier()
+            && left.getCurrent() == right.getCurrent();
     }
 
-    template<typename T>
-    inline bool operator!= (const DynamicStat<T>& left, const DynamicStat<T>& right)
+    template <typename T>
+    inline bool operator!=(const DynamicStat<T>& left, const DynamicStat<T>& right)
     {
-        return !(left==right);
+        return !(left == right);
     }
 
     class AttributeValue
@@ -121,41 +119,39 @@ namespace MWMechanics
 
         float getDamage() const;
 
-        void writeState (ESM::StatState<float>& state) const;
-        void readState (const ESM::StatState<float>& state);
+        void writeState(ESM::StatState<float>& state) const;
+        void readState(const ESM::StatState<float>& state);
     };
 
     class SkillValue : public AttributeValue
     {
         float mProgress;
+
     public:
         SkillValue();
         float getProgress() const;
         void setProgress(float progress);
 
-        void writeState (ESM::StatState<float>& state) const;
-        void readState (const ESM::StatState<float>& state);
+        void writeState(ESM::StatState<float>& state) const;
+        void readState(const ESM::StatState<float>& state);
     };
 
-    inline bool operator== (const AttributeValue& left, const AttributeValue& right)
+    inline bool operator==(const AttributeValue& left, const AttributeValue& right)
     {
-        return left.getBase() == right.getBase()
-                && left.getModifier() == right.getModifier()
-                && left.getDamage() == right.getDamage();
+        return left.getBase() == right.getBase() && left.getModifier() == right.getModifier()
+            && left.getDamage() == right.getDamage();
     }
-    inline bool operator!= (const AttributeValue& left, const AttributeValue& right)
+    inline bool operator!=(const AttributeValue& left, const AttributeValue& right)
     {
         return !(left == right);
     }
 
-    inline bool operator== (const SkillValue& left, const SkillValue& right)
+    inline bool operator==(const SkillValue& left, const SkillValue& right)
     {
-        return left.getBase() == right.getBase()
-                && left.getModifier() == right.getModifier()
-                && left.getDamage() == right.getDamage()
-                && left.getProgress() == right.getProgress();
+        return left.getBase() == right.getBase() && left.getModifier() == right.getModifier()
+            && left.getDamage() == right.getDamage() && left.getProgress() == right.getProgress();
     }
-    inline bool operator!= (const SkillValue& left, const SkillValue& right)
+    inline bool operator!=(const SkillValue& left, const SkillValue& right)
     {
         return !(left == right);
     }
diff --git a/apps/openmw/mwmechanics/steering.cpp b/apps/openmw/mwmechanics/steering.cpp
index eaf37fbd2a..7271b3bc41 100644
--- a/apps/openmw/mwmechanics/steering.cpp
+++ b/apps/openmw/mwmechanics/steering.cpp
@@ -13,32 +13,33 @@
 namespace MWMechanics
 {
 
-bool smoothTurn(const MWWorld::Ptr& actor, float targetAngleRadians, int axis, float epsilonRadians)
-{
-    MWMechanics::Movement& movement = actor.getClass().getMovementSettings(actor);
-    float diff = Misc::normalizeAngle(targetAngleRadians - actor.getRefData().getPosition().rot[axis]);
-    float absDiff = std::abs(diff);
-
-    // The turning animation actually moves you slightly, so the angle will be wrong again.
-    // Use epsilon to prevent jerkiness.
-    if (absDiff < epsilonRadians)
-        return true;
-
-    float limit = getAngularVelocity(actor.getClass().getMaxSpeed(actor)) * MWBase::Environment::get().getFrameDuration();
-    static const bool smoothMovement = Settings::Manager::getBool("smooth movement", "Game");
-    if (smoothMovement)
-        limit *= std::min(absDiff / osg::PI + 0.1, 0.5);
-
-    if (absDiff > limit)
-        diff = osg::sign(diff) * limit;
-
-    movement.mRotation[axis] = diff;
-    return false;
-}
-
-bool zTurn(const MWWorld::Ptr& actor, float targetAngleRadians, float epsilonRadians)
-{
-    return smoothTurn(actor, targetAngleRadians, 2, epsilonRadians);
-}
+    bool smoothTurn(const MWWorld::Ptr& actor, float targetAngleRadians, int axis, float epsilonRadians)
+    {
+        MWMechanics::Movement& movement = actor.getClass().getMovementSettings(actor);
+        float diff = Misc::normalizeAngle(targetAngleRadians - actor.getRefData().getPosition().rot[axis]);
+        float absDiff = std::abs(diff);
+
+        // The turning animation actually moves you slightly, so the angle will be wrong again.
+        // Use epsilon to prevent jerkiness.
+        if (absDiff < epsilonRadians)
+            return true;
+
+        float limit
+            = getAngularVelocity(actor.getClass().getMaxSpeed(actor)) * MWBase::Environment::get().getFrameDuration();
+        static const bool smoothMovement = Settings::Manager::getBool("smooth movement", "Game");
+        if (smoothMovement)
+            limit *= std::min(absDiff / osg::PI + 0.1, 0.5);
+
+        if (absDiff > limit)
+            diff = osg::sign(diff) * limit;
+
+        movement.mRotation[axis] = diff;
+        return false;
+    }
+
+    bool zTurn(const MWWorld::Ptr& actor, float targetAngleRadians, float epsilonRadians)
+    {
+        return smoothTurn(actor, targetAngleRadians, 2, epsilonRadians);
+    }
 
 }
diff --git a/apps/openmw/mwmechanics/steering.hpp b/apps/openmw/mwmechanics/steering.hpp
index 99fa1387db..d1d120e091 100644
--- a/apps/openmw/mwmechanics/steering.hpp
+++ b/apps/openmw/mwmechanics/steering.hpp
@@ -7,29 +7,28 @@
 
 namespace MWWorld
 {
-class Ptr;
+    class Ptr;
 }
 
 namespace MWMechanics
 {
 
-// Max rotating speed, radian/sec
-inline float getAngularVelocity(const float actorSpeed)
-{
-    constexpr float degreesPerFrame = 15.f;
-    constexpr int framesPerSecond = 60;
-    const float baseAngularVelocity = osg::DegreesToRadians(degreesPerFrame * framesPerSecond);
-    const float baseSpeed = 200;
-    return baseAngularVelocity * std::max(actorSpeed / baseSpeed, 1.0f);
-}
-
-/// configure rotation settings for an actor to reach this target angle (eventually)
-/// @return have we reached the target angle?
-bool zTurn(const MWWorld::Ptr& actor, float targetAngleRadians,
-                                      float epsilonRadians = osg::DegreesToRadians(0.5));
-
-bool smoothTurn(const MWWorld::Ptr& actor, float targetAngleRadians, int axis,
-                                      float epsilonRadians = osg::DegreesToRadians(0.5));
+    // Max rotating speed, radian/sec
+    inline float getAngularVelocity(const float actorSpeed)
+    {
+        constexpr float degreesPerFrame = 15.f;
+        constexpr int framesPerSecond = 60;
+        const float baseAngularVelocity = osg::DegreesToRadians(degreesPerFrame * framesPerSecond);
+        const float baseSpeed = 200;
+        return baseAngularVelocity * std::max(actorSpeed / baseSpeed, 1.0f);
+    }
+
+    /// configure rotation settings for an actor to reach this target angle (eventually)
+    /// @return have we reached the target angle?
+    bool zTurn(const MWWorld::Ptr& actor, float targetAngleRadians, float epsilonRadians = osg::DegreesToRadians(0.5));
+
+    bool smoothTurn(const MWWorld::Ptr& actor, float targetAngleRadians, int axis,
+        float epsilonRadians = osg::DegreesToRadians(0.5));
 
 }
 
diff --git a/apps/openmw/mwmechanics/summoning.cpp b/apps/openmw/mwmechanics/summoning.cpp
index f875d6759a..7bd6851e37 100644
--- a/apps/openmw/mwmechanics/summoning.cpp
+++ b/apps/openmw/mwmechanics/summoning.cpp
@@ -1,24 +1,24 @@
 #include "summoning.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/misc/resourcehelpers.hpp>
 #include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadspel.hpp>
 #include <components/esm3/loadstat.hpp>
+#include <components/misc/resourcehelpers.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/esmstore.hpp"
 #include "../mwworld/class.hpp"
-#include "../mwworld/manualref.hpp"
+#include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
+#include "../mwworld/manualref.hpp"
 
 #include "../mwrender/animation.hpp"
 
-#include "creaturestats.hpp"
 #include "aifollow.hpp"
+#include "creaturestats.hpp"
 
 namespace MWMechanics
 {
@@ -26,41 +26,45 @@ namespace MWMechanics
     bool isSummoningEffect(int effectId)
     {
         return ((effectId >= ESM::MagicEffect::SummonScamp && effectId <= ESM::MagicEffect::SummonStormAtronach)
-             || (effectId == ESM::MagicEffect::SummonCenturionSphere)
-             || (effectId >= ESM::MagicEffect::SummonFabricant && effectId <= ESM::MagicEffect::SummonCreature05));
+            || (effectId == ESM::MagicEffect::SummonCenturionSphere)
+            || (effectId >= ESM::MagicEffect::SummonFabricant && effectId <= ESM::MagicEffect::SummonCreature05));
     }
 
     std::string_view getSummonedCreature(int effectId)
     {
-        static const std::map<int, std::string_view> summonMap
-        {
-            {ESM::MagicEffect::SummonAncestralGhost, "sMagicAncestralGhostID"},
-            {ESM::MagicEffect::SummonBonelord, "sMagicBonelordID"},
-            {ESM::MagicEffect::SummonBonewalker, "sMagicLeastBonewalkerID"},
-            {ESM::MagicEffect::SummonCenturionSphere, "sMagicCenturionSphereID"},
-            {ESM::MagicEffect::SummonClannfear, "sMagicClannfearID"},
-            {ESM::MagicEffect::SummonDaedroth, "sMagicDaedrothID"},
-            {ESM::MagicEffect::SummonDremora, "sMagicDremoraID"},
-            {ESM::MagicEffect::SummonFabricant, "sMagicFabricantID"},
-            {ESM::MagicEffect::SummonFlameAtronach, "sMagicFlameAtronachID"},
-            {ESM::MagicEffect::SummonFrostAtronach, "sMagicFrostAtronachID"},
-            {ESM::MagicEffect::SummonGoldenSaint, "sMagicGoldenSaintID"},
-            {ESM::MagicEffect::SummonGreaterBonewalker, "sMagicGreaterBonewalkerID"},
-            {ESM::MagicEffect::SummonHunger, "sMagicHungerID"},
-            {ESM::MagicEffect::SummonScamp, "sMagicScampID"},
-            {ESM::MagicEffect::SummonSkeletalMinion, "sMagicSkeletalMinionID"},
-            {ESM::MagicEffect::SummonStormAtronach, "sMagicStormAtronachID"},
-            {ESM::MagicEffect::SummonWingedTwilight, "sMagicWingedTwilightID"},
-            {ESM::MagicEffect::SummonWolf, "sMagicCreature01ID"},
-            {ESM::MagicEffect::SummonBear, "sMagicCreature02ID"},
-            {ESM::MagicEffect::SummonBonewolf, "sMagicCreature03ID"},
-            {ESM::MagicEffect::SummonCreature04, "sMagicCreature04ID"},
-            {ESM::MagicEffect::SummonCreature05, "sMagicCreature05ID"},
+        static const std::map<int, std::string_view> summonMap{
+            { ESM::MagicEffect::SummonAncestralGhost, "sMagicAncestralGhostID" },
+            { ESM::MagicEffect::SummonBonelord, "sMagicBonelordID" },
+            { ESM::MagicEffect::SummonBonewalker, "sMagicLeastBonewalkerID" },
+            { ESM::MagicEffect::SummonCenturionSphere, "sMagicCenturionSphereID" },
+            { ESM::MagicEffect::SummonClannfear, "sMagicClannfearID" },
+            { ESM::MagicEffect::SummonDaedroth, "sMagicDaedrothID" },
+            { ESM::MagicEffect::SummonDremora, "sMagicDremoraID" },
+            { ESM::MagicEffect::SummonFabricant, "sMagicFabricantID" },
+            { ESM::MagicEffect::SummonFlameAtronach, "sMagicFlameAtronachID" },
+            { ESM::MagicEffect::SummonFrostAtronach, "sMagicFrostAtronachID" },
+            { ESM::MagicEffect::SummonGoldenSaint, "sMagicGoldenSaintID" },
+            { ESM::MagicEffect::SummonGreaterBonewalker, "sMagicGreaterBonewalkerID" },
+            { ESM::MagicEffect::SummonHunger, "sMagicHungerID" },
+            { ESM::MagicEffect::SummonScamp, "sMagicScampID" },
+            { ESM::MagicEffect::SummonSkeletalMinion, "sMagicSkeletalMinionID" },
+            { ESM::MagicEffect::SummonStormAtronach, "sMagicStormAtronachID" },
+            { ESM::MagicEffect::SummonWingedTwilight, "sMagicWingedTwilightID" },
+            { ESM::MagicEffect::SummonWolf, "sMagicCreature01ID" },
+            { ESM::MagicEffect::SummonBear, "sMagicCreature02ID" },
+            { ESM::MagicEffect::SummonBonewolf, "sMagicCreature03ID" },
+            { ESM::MagicEffect::SummonCreature04, "sMagicCreature04ID" },
+            { ESM::MagicEffect::SummonCreature05, "sMagicCreature05ID" },
         };
 
         auto it = summonMap.find(effectId);
         if (it != summonMap.end())
-            return MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(it->second)->mValue.getString();
+            return MWBase::Environment::get()
+                .getWorld()
+                ->getStore()
+                .get<ESM::GameSetting>()
+                .find(it->second)
+                ->mValue.getString();
         return {};
     }
 
@@ -75,7 +79,8 @@ namespace MWMechanics
                 auto world = MWBase::Environment::get().getWorld();
                 MWWorld::ManualRef ref(world->getStore(), creatureID, 1);
 
-                MWMechanics::CreatureStats& summonedCreatureStats = ref.getPtr().getClass().getCreatureStats(ref.getPtr());
+                MWMechanics::CreatureStats& summonedCreatureStats
+                    = ref.getPtr().getClass().getCreatureStats(ref.getPtr());
 
                 // Make the summoned creature follow its master and help in fights
                 AiFollow package(summoner);
@@ -98,7 +103,8 @@ namespace MWMechanics
             catch (std::exception& e)
             {
                 Log(Debug::Error) << "Failed to spawn summoned creature: " << e.what();
-                // still insert into creatureMap so we don't try to spawn again every frame, that would spam the warning log
+                // still insert into creatureMap so we don't try to spawn again every frame, that would spam the warning
+                // log
             }
 
             summoner.getClass().getCreatureStats(summoner).getSummonedCreatureMap().emplace(effectId, creatureActorId);
@@ -120,16 +126,17 @@ namespace MWMechanics
         if (!cleanup)
             return;
 
-        for (auto it = creatureMap.begin(); it != creatureMap.end(); )
+        for (auto it = creatureMap.begin(); it != creatureMap.end();)
         {
-            if(it->second == -1)
+            if (it->second == -1)
             {
                 // Keep the spell effect active if we failed to spawn anything
                 it++;
                 continue;
             }
             MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->searchPtrViaActorId(it->second);
-            if (!ptr.isEmpty() && ptr.getClass().getCreatureStats(ptr).isDead() && ptr.getClass().getCreatureStats(ptr).isDeathAnimationFinished())
+            if (!ptr.isEmpty() && ptr.getClass().getCreatureStats(ptr).isDead()
+                && ptr.getClass().getCreatureStats(ptr).isDeathAnimationFinished())
             {
                 // Purge the magic effect so a new creature can be summoned if desired
                 auto summon = *it;
@@ -144,10 +151,11 @@ namespace MWMechanics
     void purgeSummonEffect(const MWWorld::Ptr& summoner, const std::pair<int, int>& summon)
     {
         auto& creatureStats = summoner.getClass().getCreatureStats(summoner);
-        creatureStats.getActiveSpells().purge([summon] (const auto& spell, const auto& effect)
-        {
-            return effect.mEffectId == summon.first && effect.mArg == summon.second;
-        }, summoner);
+        creatureStats.getActiveSpells().purge(
+            [summon](const auto& spell, const auto& effect) {
+                return effect.mEffectId == summon.first && effect.mArg == summon.second;
+            },
+            summoner);
 
         MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(summoner, summon.second);
     }
diff --git a/apps/openmw/mwmechanics/trading.cpp b/apps/openmw/mwmechanics/trading.cpp
index a40b745d21..0fceda46a4 100644
--- a/apps/openmw/mwmechanics/trading.cpp
+++ b/apps/openmw/mwmechanics/trading.cpp
@@ -18,30 +18,30 @@ namespace MWMechanics
     bool Trading::haggle(const MWWorld::Ptr& player, const MWWorld::Ptr& merchant, int playerOffer, int merchantOffer)
     {
         // accept if merchant offer is better than player offer
-        if ( playerOffer <= merchantOffer ) {
+        if (playerOffer <= merchantOffer)
+        {
             return true;
         }
 
         // reject if npc is a creature
-        if ( merchant.getType() != ESM::NPC::sRecordId ) {
+        if (merchant.getType() != ESM::NPC::sRecordId)
+        {
             return false;
         }
 
-        const MWWorld::Store<ESM::GameSetting> &gmst =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
         // Is the player buying?
         bool buying = (merchantOffer < 0);
         int a = std::abs(merchantOffer);
         int b = std::abs(playerOffer);
-        int d = (buying)
-            ? int(100 * (a - b) / a)
-            : int(100 * (b - a) / b);
+        int d = (buying) ? int(100 * (a - b) / a) : int(100 * (b - a) / b);
 
         int clampedDisposition = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(merchant);
 
-        const MWMechanics::CreatureStats &merchantStats = merchant.getClass().getCreatureStats(merchant);
-        const MWMechanics::CreatureStats &playerStats = player.getClass().getCreatureStats(player);
+        const MWMechanics::CreatureStats& merchantStats = merchant.getClass().getCreatureStats(merchant);
+        const MWMechanics::CreatureStats& playerStats = player.getClass().getCreatureStats(player);
 
         float a1 = static_cast<float>(player.getClass().getSkill(player, ESM::Skill::Mercantile));
         float b1 = 0.1f * playerStats.getAttribute(ESM::Attribute::Luck).getModified();
@@ -54,15 +54,15 @@ namespace MWMechanics
         float pcTerm = (dispositionTerm + a1 + b1 + c1) * playerStats.getFatigueTerm();
         float npcTerm = (d1 + e1 + f1) * merchantStats.getFatigueTerm();
         float x = gmst.find("fBargainOfferMulti")->mValue.getFloat() * d
-            + gmst.find("fBargainOfferBase")->mValue.getFloat()
-            + int(pcTerm - npcTerm);
+            + gmst.find("fBargainOfferBase")->mValue.getFloat() + int(pcTerm - npcTerm);
 
         auto& prng = MWBase::Environment::get().getWorld()->getPrng();
         int roll = Misc::Rng::rollDice(100, prng) + 1;
 
         // reject if roll fails
         // (or if player tries to buy things and get money)
-        if ( roll > x || (merchantOffer < 0 && 0 < playerOffer) ) {
+        if (roll > x || (merchantOffer < 0 && 0 < playerOffer))
+        {
             return false;
         }
 
@@ -71,10 +71,12 @@ namespace MWMechanics
         int finalPrice = std::abs(playerOffer);
         int initialMerchantOffer = std::abs(merchantOffer);
 
-        if ( !buying && (finalPrice > initialMerchantOffer) ) {
+        if (!buying && (finalPrice > initialMerchantOffer))
+        {
             skillGain = std::floor(100.f * (finalPrice - initialMerchantOffer) / finalPrice);
         }
-        else if ( buying && (finalPrice < initialMerchantOffer) ) {
+        else if (buying && (finalPrice < initialMerchantOffer))
+        {
             skillGain = std::floor(100.f * (initialMerchantOffer - finalPrice) / initialMerchantOffer);
         }
         player.getClass().skillUsageSucceeded(player, ESM::Skill::Mercantile, 0, skillGain);
diff --git a/apps/openmw/mwmechanics/typedaipackage.hpp b/apps/openmw/mwmechanics/typedaipackage.hpp
index 0ea276999f..9cbcc95aee 100644
--- a/apps/openmw/mwmechanics/typedaipackage.hpp
+++ b/apps/openmw/mwmechanics/typedaipackage.hpp
@@ -8,23 +8,28 @@ namespace MWMechanics
     template <class T>
     struct TypedAiPackage : public AiPackage
     {
-        TypedAiPackage() :
-            AiPackage(T::getTypeId(), T::makeDefaultOptions()) {}
+        TypedAiPackage()
+            : AiPackage(T::getTypeId(), T::makeDefaultOptions())
+        {
+        }
 
-        TypedAiPackage(bool repeat) :
-            AiPackage(T::getTypeId(), T::makeDefaultOptions().withRepeat(repeat)) {}
+        TypedAiPackage(bool repeat)
+            : AiPackage(T::getTypeId(), T::makeDefaultOptions().withRepeat(repeat))
+        {
+        }
 
-        TypedAiPackage(const Options& options) :
-            AiPackage(T::getTypeId(), options) {}
+        TypedAiPackage(const Options& options)
+            : AiPackage(T::getTypeId(), options)
+        {
+        }
 
         template <class Derived>
-        TypedAiPackage(Derived*) :
-            AiPackage(Derived::getTypeId(), Derived::makeDefaultOptions()) {}
-
-        std::unique_ptr<AiPackage> clone() const override
+        TypedAiPackage(Derived*)
+            : AiPackage(Derived::getTypeId(), Derived::makeDefaultOptions())
         {
-            return std::make_unique<T>(*static_cast<const T*>(this));
         }
+
+        std::unique_ptr<AiPackage> clone() const override { return std::make_unique<T>(*static_cast<const T*>(this)); }
     };
 }
 
diff --git a/apps/openmw/mwmechanics/weaponpriority.cpp b/apps/openmw/mwmechanics/weaponpriority.cpp
index 0beecae990..b6550af9c8 100644
--- a/apps/openmw/mwmechanics/weaponpriority.cpp
+++ b/apps/openmw/mwmechanics/weaponpriority.cpp
@@ -1,8 +1,8 @@
 #include "weaponpriority.hpp"
 
+#include <components/esm3/loadcrea.hpp>
 #include <components/esm3/loadench.hpp>
 #include <components/esm3/loadgmst.hpp>
-#include <components/esm3/loadcrea.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -11,16 +11,16 @@
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
 
-#include "combat.hpp"
 #include "aicombataction.hpp"
+#include "combat.hpp"
 #include "spellpriority.hpp"
 #include "spellutil.hpp"
 #include "weapontype.hpp"
 
 namespace MWMechanics
 {
-    float rateWeapon (const MWWorld::Ptr &item, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy, int type,
-                      float arrowRating, float boltRating)
+    float rateWeapon(const MWWorld::Ptr& item, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy, int type,
+        float arrowRating, float boltRating)
     {
         if (enemy.isEmpty() || item.getType() != ESM::Weapon::sRecordId)
             return 0.f;
@@ -40,7 +40,7 @@ namespace MWMechanics
         if (type == -1 && weapclass == ESM::WeaponType::Ammo)
             return 0.f;
 
-        float rating=0.f;
+        float rating = 0.f;
         static const float fAIMeleeWeaponMult = gmst.find("fAIMeleeWeaponMult")->mValue.getFloat();
         float ratingMult = fAIMeleeWeaponMult;
 
@@ -48,7 +48,7 @@ namespace MWMechanics
         {
             // Underwater ranged combat is impossible
             if (world->isUnderwater(MWWorld::ConstPtr(actor), 0.75f)
-             || world->isUnderwater(MWWorld::ConstPtr(enemy), 0.75f))
+                || world->isUnderwater(MWWorld::ConstPtr(enemy), 0.75f))
                 return 0.f;
 
             // Use a higher rating multiplier if the actor is out of enemy's reach, use the normal mult otherwise
@@ -111,7 +111,8 @@ namespace MWMechanics
                 int castCost = getEffectiveEnchantmentCastCost(static_cast<float>(enchantment->mData.mCost), actor);
                 float charge = item.getCellRef().getEnchantmentCharge();
 
-                if (charge == -1 || charge >= castCost || weapclass == ESM::WeaponType::Thrown || weapclass == ESM::WeaponType::Ammo)
+                if (charge == -1 || charge >= castCost || weapclass == ESM::WeaponType::Thrown
+                    || weapclass == ESM::WeaponType::Ammo)
                     rating += rateEffects(enchantment->mEffects, actor, enemy);
             }
         }
@@ -121,11 +122,11 @@ namespace MWMechanics
         {
             int skill = item.getClass().getEquipmentSkill(item);
             if (skill != -1)
-               value = actor.getClass().getSkill(actor, skill);
+                value = actor.getClass().getSkill(actor, skill);
         }
         else
         {
-            MWWorld::LiveCellRef<ESM::Creature> *ref = actor.get<ESM::Creature>();
+            MWWorld::LiveCellRef<ESM::Creature>* ref = actor.get<ESM::Creature>();
             value = ref->mBase->mData.mCombat;
         }
 
@@ -138,7 +139,7 @@ namespace MWMechanics
         return rating * ratingMult;
     }
 
-    float rateAmmo(const MWWorld::Ptr &actor, const MWWorld::Ptr &enemy, MWWorld::Ptr &bestAmmo, int ammoType)
+    float rateAmmo(const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy, MWWorld::Ptr& bestAmmo, int ammoType)
     {
         float bestAmmoRating = 0.f;
         if (!actor.getClass().hasInventoryStore(actor))
@@ -159,15 +160,17 @@ namespace MWMechanics
         return bestAmmoRating;
     }
 
-    float rateAmmo(const MWWorld::Ptr &actor, const MWWorld::Ptr &enemy, int ammoType)
+    float rateAmmo(const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy, int ammoType)
     {
         MWWorld::Ptr emptyPtr;
         return rateAmmo(actor, enemy, emptyPtr, ammoType);
     }
 
-    float vanillaRateWeaponAndAmmo(const MWWorld::Ptr& weapon, const MWWorld::Ptr& ammo, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy)
+    float vanillaRateWeaponAndAmmo(
+        const MWWorld::Ptr& weapon, const MWWorld::Ptr& ammo, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy)
     {
-        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
         static const float fAIMeleeWeaponMult = gmst.find("fAIMeleeWeaponMult")->mValue.getFloat();
         static const float fAIMeleeArmorMult = gmst.find("fAIMeleeArmorMult")->mValue.getFloat();
@@ -198,7 +201,7 @@ namespace MWMechanics
         float thrustRating = esmWeap->mData.mThrust[1] * skillMult * fAIMeleeWeaponMult;
 
         return actor.getClass().getArmorRating(actor) * fAIMeleeArmorMult
-                    + std::max(std::max(chopRating, slashRating), thrustRating);
+            + std::max(std::max(chopRating, slashRating), thrustRating);
     }
 
 }
diff --git a/apps/openmw/mwmechanics/weaponpriority.hpp b/apps/openmw/mwmechanics/weaponpriority.hpp
index 97abec137e..44e9611b49 100644
--- a/apps/openmw/mwmechanics/weaponpriority.hpp
+++ b/apps/openmw/mwmechanics/weaponpriority.hpp
@@ -8,13 +8,14 @@ namespace MWWorld
 
 namespace MWMechanics
 {
-    float rateWeapon (const MWWorld::Ptr& item, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy,
-                      int type=-1, float arrowRating=0.f, float boltRating=0.f);
+    float rateWeapon(const MWWorld::Ptr& item, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy, int type = -1,
+        float arrowRating = 0.f, float boltRating = 0.f);
 
-    float rateAmmo(const MWWorld::Ptr &actor, const MWWorld::Ptr &enemy, MWWorld::Ptr &bestAmmo, int ammoType);
-    float rateAmmo(const MWWorld::Ptr &actor, const MWWorld::Ptr &enemy, int ammoType);
+    float rateAmmo(const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy, MWWorld::Ptr& bestAmmo, int ammoType);
+    float rateAmmo(const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy, int ammoType);
 
-    float vanillaRateWeaponAndAmmo(const MWWorld::Ptr& weapon, const MWWorld::Ptr& ammo, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
+    float vanillaRateWeaponAndAmmo(
+        const MWWorld::Ptr& weapon, const MWWorld::Ptr& ammo, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
 }
 
 #endif
diff --git a/apps/openmw/mwmechanics/weapontype.cpp b/apps/openmw/mwmechanics/weapontype.cpp
index 9bf2daa886..0612ca1a2e 100644
--- a/apps/openmw/mwmechanics/weapontype.cpp
+++ b/apps/openmw/mwmechanics/weapontype.cpp
@@ -1,7 +1,7 @@
 #include "weapontype.hpp"
 
-#include "drawstate.hpp"
 #include "creaturestats.hpp"
+#include "drawstate.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
@@ -11,13 +11,14 @@
 namespace MWMechanics
 {
     template <enum ESM::Weapon::Type>
-    struct Weapon {};
+    struct Weapon
+    {
+    };
 
     template <>
     struct Weapon<ESM::Weapon::None>
     {
-        inline static const ESM::WeaponType sValue {
-            /* short group */ "",
+        inline static const ESM::WeaponType sValue{ /* short group */ "",
             /* long group  */ "",
             /*  sound ID   */ "",
             /* attach bone */ "",
@@ -25,15 +26,13 @@ namespace MWMechanics
             /* usage skill */ ESM::Skill::HandToHand,
             /* weapon class*/ ESM::WeaponType::Melee,
             /*  ammo type  */ ESM::Weapon::None,
-            /*    flags    */ 0
-        };
+            /*    flags    */ 0 };
     };
 
     template <>
     struct Weapon<ESM::Weapon::PickProbe>
     {
-        inline static const ESM::WeaponType sValue {
-            /* short group */ "1h",
+        inline static const ESM::WeaponType sValue{ /* short group */ "1h",
             /* long group  */ "pickprobe",
             /*  sound ID   */ "",
             /* attach bone */ "",
@@ -41,15 +40,13 @@ namespace MWMechanics
             /* usage skill */ ESM::Skill::Security,
             /* weapon class*/ ESM::WeaponType::Melee,
             /*  ammo type  */ ESM::Weapon::None,
-            /*    flags    */ 0
-        };
+            /*    flags    */ 0 };
     };
 
     template <>
     struct Weapon<ESM::Weapon::Spell>
     {
-        inline static const ESM::WeaponType sValue {
-            /* short group */ "spell",
+        inline static const ESM::WeaponType sValue{ /* short group */ "spell",
             /* long group  */ "spellcast",
             /*  sound ID   */ "",
             /* attach bone */ "",
@@ -57,15 +54,13 @@ namespace MWMechanics
             /* usage skill */ ESM::Skill::HandToHand,
             /* weapon class*/ ESM::WeaponType::Melee,
             /*  ammo type  */ ESM::Weapon::None,
-            /*    flags    */ ESM::WeaponType::TwoHanded
-        };
+            /*    flags    */ ESM::WeaponType::TwoHanded };
     };
 
     template <>
     struct Weapon<ESM::Weapon::HandToHand>
     {
-        inline static const ESM::WeaponType sValue {
-            /* short group */ "hh",
+        inline static const ESM::WeaponType sValue{ /* short group */ "hh",
             /* long group  */ "handtohand",
             /*  sound ID   */ "",
             /* attach bone */ "",
@@ -73,15 +68,13 @@ namespace MWMechanics
             /* usage skill */ ESM::Skill::HandToHand,
             /* weapon class*/ ESM::WeaponType::Melee,
             /*  ammo type  */ ESM::Weapon::None,
-            /*    flags    */ ESM::WeaponType::TwoHanded
-        };
+            /*    flags    */ ESM::WeaponType::TwoHanded };
     };
 
     template <>
     struct Weapon<ESM::Weapon::ShortBladeOneHand>
     {
-        inline static const ESM::WeaponType sValue {
-            /* short group */ "1s",
+        inline static const ESM::WeaponType sValue{ /* short group */ "1s",
             /* long group  */ "shortbladeonehand",
             /*  sound ID   */ "Item Weapon Shortblade",
             /* attach bone */ "Weapon Bone",
@@ -89,15 +82,13 @@ namespace MWMechanics
             /* usage skill */ ESM::Skill::ShortBlade,
             /* weapon class*/ ESM::WeaponType::Melee,
             /*  ammo type  */ ESM::Weapon::None,
-            /*    flags    */ ESM::WeaponType::HasHealth
-        };
+            /*    flags    */ ESM::WeaponType::HasHealth };
     };
 
     template <>
     struct Weapon<ESM::Weapon::LongBladeOneHand>
     {
-        inline static const ESM::WeaponType sValue {
-            /* short group */ "1h",
+        inline static const ESM::WeaponType sValue{ /* short group */ "1h",
             /* long group  */ "weapononehand",
             /*  sound ID   */ "Item Weapon Longblade",
             /* attach bone */ "Weapon Bone",
@@ -105,15 +96,13 @@ namespace MWMechanics
             /* usage skill */ ESM::Skill::LongBlade,
             /* weapon class*/ ESM::WeaponType::Melee,
             /*  ammo type  */ ESM::Weapon::None,
-            /*    flags    */ ESM::WeaponType::HasHealth
-        };
+            /*    flags    */ ESM::WeaponType::HasHealth };
     };
 
     template <>
     struct Weapon<ESM::Weapon::BluntOneHand>
     {
-        inline static const ESM::WeaponType sValue {
-            /* short group */ "1b",
+        inline static const ESM::WeaponType sValue{ /* short group */ "1b",
             /* long group  */ "bluntonehand",
             /*  sound ID   */ "Item Weapon Blunt",
             /* attach bone */ "Weapon Bone",
@@ -121,15 +110,13 @@ namespace MWMechanics
             /* usage skill */ ESM::Skill::BluntWeapon,
             /* weapon class*/ ESM::WeaponType::Melee,
             /*  ammo type  */ ESM::Weapon::None,
-            /*    flags    */ ESM::WeaponType::HasHealth
-        };
+            /*    flags    */ ESM::WeaponType::HasHealth };
     };
 
     template <>
     struct Weapon<ESM::Weapon::AxeOneHand>
     {
-        inline static const ESM::WeaponType sValue {
-            /* short group */ "1b",
+        inline static const ESM::WeaponType sValue{ /* short group */ "1b",
             /* long group  */ "bluntonehand",
             /*  sound ID   */ "Item Weapon Blunt",
             /* attach bone */ "Weapon Bone",
@@ -137,15 +124,13 @@ namespace MWMechanics
             /* usage skill */ ESM::Skill::Axe,
             /* weapon class*/ ESM::WeaponType::Melee,
             /*  ammo type  */ ESM::Weapon::None,
-            /*    flags    */ ESM::WeaponType::HasHealth
-        };
+            /*    flags    */ ESM::WeaponType::HasHealth };
     };
 
     template <>
     struct Weapon<ESM::Weapon::LongBladeTwoHand>
     {
-        inline static const ESM::WeaponType sValue {
-            /* short group */ "2c",
+        inline static const ESM::WeaponType sValue{ /* short group */ "2c",
             /* long group  */ "weapontwohand",
             /*  sound ID   */ "Item Weapon Longblade",
             /* attach bone */ "Weapon Bone",
@@ -153,15 +138,13 @@ namespace MWMechanics
             /* usage skill */ ESM::Skill::LongBlade,
             /* weapon class*/ ESM::WeaponType::Melee,
             /*  ammo type  */ ESM::Weapon::None,
-            /*    flags    */ ESM::WeaponType::HasHealth|ESM::WeaponType::TwoHanded
-        };
+            /*    flags    */ ESM::WeaponType::HasHealth | ESM::WeaponType::TwoHanded };
     };
 
     template <>
     struct Weapon<ESM::Weapon::AxeTwoHand>
     {
-        inline static const ESM::WeaponType sValue {
-            /* short group */ "2b",
+        inline static const ESM::WeaponType sValue{ /* short group */ "2b",
             /* long group  */ "blunttwohand",
             /*  sound ID   */ "Item Weapon Blunt",
             /* attach bone */ "Weapon Bone",
@@ -169,15 +152,13 @@ namespace MWMechanics
             /* usage skill */ ESM::Skill::Axe,
             /* weapon class*/ ESM::WeaponType::Melee,
             /*  ammo type  */ ESM::Weapon::None,
-            /*    flags    */ ESM::WeaponType::HasHealth|ESM::WeaponType::TwoHanded
-        };
+            /*    flags    */ ESM::WeaponType::HasHealth | ESM::WeaponType::TwoHanded };
     };
 
     template <>
     struct Weapon<ESM::Weapon::BluntTwoClose>
     {
-        inline static const ESM::WeaponType sValue {
-            /* short group */ "2b",
+        inline static const ESM::WeaponType sValue{ /* short group */ "2b",
             /* long group  */ "blunttwohand",
             /*  sound ID   */ "Item Weapon Blunt",
             /* attach bone */ "Weapon Bone",
@@ -185,15 +166,13 @@ namespace MWMechanics
             /* usage skill */ ESM::Skill::BluntWeapon,
             /* weapon class*/ ESM::WeaponType::Melee,
             /*  ammo type  */ ESM::Weapon::None,
-            /*    flags    */ ESM::WeaponType::HasHealth|ESM::WeaponType::TwoHanded
-        };
+            /*    flags    */ ESM::WeaponType::HasHealth | ESM::WeaponType::TwoHanded };
     };
 
     template <>
     struct Weapon<ESM::Weapon::BluntTwoWide>
     {
-        inline static const ESM::WeaponType sValue {
-            /* short group */ "2w",
+        inline static const ESM::WeaponType sValue{ /* short group */ "2w",
             /* long group  */ "weapontwowide",
             /*  sound ID   */ "Item Weapon Blunt",
             /* attach bone */ "Weapon Bone",
@@ -201,15 +180,13 @@ namespace MWMechanics
             /* usage skill */ ESM::Skill::BluntWeapon,
             /* weapon class*/ ESM::WeaponType::Melee,
             /*  ammo type  */ ESM::Weapon::None,
-            /*    flags    */ ESM::WeaponType::HasHealth|ESM::WeaponType::TwoHanded
-        };
+            /*    flags    */ ESM::WeaponType::HasHealth | ESM::WeaponType::TwoHanded };
     };
 
     template <>
     struct Weapon<ESM::Weapon::SpearTwoWide>
     {
-        inline static const ESM::WeaponType sValue {
-            /* short group */ "2w",
+        inline static const ESM::WeaponType sValue{ /* short group */ "2w",
             /* long group  */ "weapontwowide",
             /*  sound ID   */ "Item Weapon Spear",
             /* attach bone */ "Weapon Bone",
@@ -217,15 +194,13 @@ namespace MWMechanics
             /* usage skill */ ESM::Skill::Spear,
             /* weapon class*/ ESM::WeaponType::Melee,
             /*  ammo type  */ ESM::Weapon::None,
-            /*    flags    */ ESM::WeaponType::HasHealth|ESM::WeaponType::TwoHanded
-        };
+            /*    flags    */ ESM::WeaponType::HasHealth | ESM::WeaponType::TwoHanded };
     };
 
     template <>
     struct Weapon<ESM::Weapon::MarksmanBow>
     {
-        inline static const ESM::WeaponType sValue {
-            /* short group */ "bow",
+        inline static const ESM::WeaponType sValue{ /* short group */ "bow",
             /* long group  */ "bowandarrow",
             /*  sound ID   */ "Item Weapon Bow",
             /* attach bone */ "Weapon Bone Left",
@@ -233,15 +208,13 @@ namespace MWMechanics
             /* usage skill */ ESM::Skill::Marksman,
             /* weapon class*/ ESM::WeaponType::Ranged,
             /*  ammo type  */ ESM::Weapon::Arrow,
-            /*    flags    */ ESM::WeaponType::HasHealth|ESM::WeaponType::TwoHanded
-        };
+            /*    flags    */ ESM::WeaponType::HasHealth | ESM::WeaponType::TwoHanded };
     };
 
     template <>
     struct Weapon<ESM::Weapon::MarksmanCrossbow>
     {
-        inline static const ESM::WeaponType sValue {
-            /* short group */ "crossbow",
+        inline static const ESM::WeaponType sValue{ /* short group */ "crossbow",
             /* long group  */ "crossbow",
             /*  sound ID   */ "Item Weapon Crossbow",
             /* attach bone */ "Weapon Bone",
@@ -249,15 +222,13 @@ namespace MWMechanics
             /* usage skill */ ESM::Skill::Marksman,
             /* weapon class*/ ESM::WeaponType::Ranged,
             /*  ammo type  */ ESM::Weapon::Bolt,
-            /*    flags    */ ESM::WeaponType::HasHealth|ESM::WeaponType::TwoHanded
-        };
+            /*    flags    */ ESM::WeaponType::HasHealth | ESM::WeaponType::TwoHanded };
     };
 
     template <>
     struct Weapon<ESM::Weapon::MarksmanThrown>
     {
-        inline static const ESM::WeaponType sValue {
-            /* short group */ "1t",
+        inline static const ESM::WeaponType sValue{ /* short group */ "1t",
             /* long group  */ "throwweapon",
             /*  sound ID   */ "Item Weapon Blunt",
             /* attach bone */ "Weapon Bone",
@@ -265,15 +236,13 @@ namespace MWMechanics
             /* usage skill */ ESM::Skill::Marksman,
             /* weapon class*/ ESM::WeaponType::Thrown,
             /*  ammo type  */ ESM::Weapon::None,
-            /*    flags    */ 0
-        };
+            /*    flags    */ 0 };
     };
 
     template <>
     struct Weapon<ESM::Weapon::Arrow>
     {
-        inline static const ESM::WeaponType sValue {
-            /* short group */ "",
+        inline static const ESM::WeaponType sValue{ /* short group */ "",
             /* long group  */ "",
             /*  sound ID   */ "Item Ammo",
             /* attach bone */ "Bip01 Arrow",
@@ -281,15 +250,13 @@ namespace MWMechanics
             /* usage skill */ ESM::Skill::Marksman,
             /* weapon class*/ ESM::WeaponType::Ammo,
             /*  ammo type  */ ESM::Weapon::None,
-            /*    flags    */ 0
-        };
+            /*    flags    */ 0 };
     };
 
     template <>
     struct Weapon<ESM::Weapon::Bolt>
     {
-        inline static const ESM::WeaponType sValue {
-            /* short group */ "",
+        inline static const ESM::WeaponType sValue{ /* short group */ "",
             /* long group  */ "",
             /*  sound ID   */ "Item Ammo",
             /* attach bone */ "ArrowBone",
@@ -297,31 +264,30 @@ namespace MWMechanics
             /* usage skill */ ESM::Skill::Marksman,
             /* weapon class*/ ESM::WeaponType::Ammo,
             /*  ammo type  */ ESM::Weapon::None,
-            /*    flags    */ 0
-        };
+            /*    flags    */ 0 };
     };
 
-    MWWorld::ContainerStoreIterator getActiveWeapon(const MWWorld::Ptr& actor, int *weaptype)
+    MWWorld::ContainerStoreIterator getActiveWeapon(const MWWorld::Ptr& actor, int* weaptype)
     {
-        MWWorld::InventoryStore &inv = actor.getClass().getInventoryStore(actor);
-        CreatureStats &stats = actor.getClass().getCreatureStats(actor);
-        if(stats.getDrawState() == MWMechanics::DrawState::Spell)
+        MWWorld::InventoryStore& inv = actor.getClass().getInventoryStore(actor);
+        CreatureStats& stats = actor.getClass().getCreatureStats(actor);
+        if (stats.getDrawState() == MWMechanics::DrawState::Spell)
         {
             *weaptype = ESM::Weapon::Spell;
             return inv.end();
         }
 
-        if(stats.getDrawState() == MWMechanics::DrawState::Weapon)
+        if (stats.getDrawState() == MWMechanics::DrawState::Weapon)
         {
             MWWorld::ContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-            if(weapon == inv.end())
+            if (weapon == inv.end())
                 *weaptype = ESM::Weapon::HandToHand;
             else
             {
                 auto type = weapon->getType();
-                if(type == ESM::Weapon::sRecordId)
+                if (type == ESM::Weapon::sRecordId)
                 {
-                    const MWWorld::LiveCellRef<ESM::Weapon> *ref = weapon->get<ESM::Weapon>();
+                    const MWWorld::LiveCellRef<ESM::Weapon>* ref = weapon->get<ESM::Weapon>();
                     *weaptype = ref->mBase->mData.mType;
                 }
                 else if (type == ESM::Lockpick::sRecordId || type == ESM::Probe::sRecordId)
@@ -338,24 +304,42 @@ namespace MWMechanics
     {
         switch (static_cast<ESM::Weapon::Type>(weaponType))
         {
-            case ESM::Weapon::PickProbe: return &Weapon<ESM::Weapon::PickProbe>::sValue;
-            case ESM::Weapon::HandToHand: return &Weapon<ESM::Weapon::HandToHand>::sValue;
-            case ESM::Weapon::Spell: return &Weapon<ESM::Weapon::Spell>::sValue;
-            case ESM::Weapon::None: return &Weapon<ESM::Weapon::None>::sValue;
-            case ESM::Weapon::ShortBladeOneHand: return &Weapon<ESM::Weapon::ShortBladeOneHand>::sValue;
-            case ESM::Weapon::LongBladeOneHand: return &Weapon<ESM::Weapon::LongBladeOneHand>::sValue;
-            case ESM::Weapon::LongBladeTwoHand: return &Weapon<ESM::Weapon::LongBladeTwoHand>::sValue;
-            case ESM::Weapon::BluntOneHand: return &Weapon<ESM::Weapon::BluntOneHand>::sValue;
-            case ESM::Weapon::BluntTwoClose: return &Weapon<ESM::Weapon::BluntTwoClose>::sValue;
-            case ESM::Weapon::BluntTwoWide: return &Weapon<ESM::Weapon::BluntTwoWide>::sValue;
-            case ESM::Weapon::SpearTwoWide: return &Weapon<ESM::Weapon::SpearTwoWide>::sValue;
-            case ESM::Weapon::AxeOneHand: return &Weapon<ESM::Weapon::AxeOneHand>::sValue;
-            case ESM::Weapon::AxeTwoHand: return &Weapon<ESM::Weapon::AxeTwoHand>::sValue;
-            case ESM::Weapon::MarksmanBow: return &Weapon<ESM::Weapon::MarksmanBow>::sValue;
-            case ESM::Weapon::MarksmanCrossbow: return &Weapon<ESM::Weapon::MarksmanCrossbow>::sValue;
-            case ESM::Weapon::MarksmanThrown: return &Weapon<ESM::Weapon::MarksmanThrown>::sValue;
-            case ESM::Weapon::Arrow: return &Weapon<ESM::Weapon::Arrow>::sValue;
-            case ESM::Weapon::Bolt: return &Weapon<ESM::Weapon::Bolt>::sValue;
+            case ESM::Weapon::PickProbe:
+                return &Weapon<ESM::Weapon::PickProbe>::sValue;
+            case ESM::Weapon::HandToHand:
+                return &Weapon<ESM::Weapon::HandToHand>::sValue;
+            case ESM::Weapon::Spell:
+                return &Weapon<ESM::Weapon::Spell>::sValue;
+            case ESM::Weapon::None:
+                return &Weapon<ESM::Weapon::None>::sValue;
+            case ESM::Weapon::ShortBladeOneHand:
+                return &Weapon<ESM::Weapon::ShortBladeOneHand>::sValue;
+            case ESM::Weapon::LongBladeOneHand:
+                return &Weapon<ESM::Weapon::LongBladeOneHand>::sValue;
+            case ESM::Weapon::LongBladeTwoHand:
+                return &Weapon<ESM::Weapon::LongBladeTwoHand>::sValue;
+            case ESM::Weapon::BluntOneHand:
+                return &Weapon<ESM::Weapon::BluntOneHand>::sValue;
+            case ESM::Weapon::BluntTwoClose:
+                return &Weapon<ESM::Weapon::BluntTwoClose>::sValue;
+            case ESM::Weapon::BluntTwoWide:
+                return &Weapon<ESM::Weapon::BluntTwoWide>::sValue;
+            case ESM::Weapon::SpearTwoWide:
+                return &Weapon<ESM::Weapon::SpearTwoWide>::sValue;
+            case ESM::Weapon::AxeOneHand:
+                return &Weapon<ESM::Weapon::AxeOneHand>::sValue;
+            case ESM::Weapon::AxeTwoHand:
+                return &Weapon<ESM::Weapon::AxeTwoHand>::sValue;
+            case ESM::Weapon::MarksmanBow:
+                return &Weapon<ESM::Weapon::MarksmanBow>::sValue;
+            case ESM::Weapon::MarksmanCrossbow:
+                return &Weapon<ESM::Weapon::MarksmanCrossbow>::sValue;
+            case ESM::Weapon::MarksmanThrown:
+                return &Weapon<ESM::Weapon::MarksmanThrown>::sValue;
+            case ESM::Weapon::Arrow:
+                return &Weapon<ESM::Weapon::Arrow>::sValue;
+            case ESM::Weapon::Bolt:
+                return &Weapon<ESM::Weapon::Bolt>::sValue;
         }
 
         return &Weapon<ESM::Weapon::ShortBladeOneHand>::sValue;
diff --git a/apps/openmw/mwmechanics/weapontype.hpp b/apps/openmw/mwmechanics/weapontype.hpp
index 6c31be1d27..db7b3013f6 100644
--- a/apps/openmw/mwmechanics/weapontype.hpp
+++ b/apps/openmw/mwmechanics/weapontype.hpp
@@ -18,7 +18,7 @@ namespace MWWorld
 
 namespace MWMechanics
 {
-    MWWorld::ContainerStoreIterator getActiveWeapon(const MWWorld::Ptr& actor, int *weaptype);
+    MWWorld::ContainerStoreIterator getActiveWeapon(const MWWorld::Ptr& actor, int* weaptype);
 
     const ESM::WeaponType* getWeaponType(const int weaponType);
 }
diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 6c7345c031..9c7d6c964e 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -1,12 +1,12 @@
 #include "actor.hpp"
 
-#include <BulletCollision/CollisionShapes/btCylinderShape.h>
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
+#include <BulletCollision/CollisionShapes/btCylinderShape.h>
 
-#include <components/sceneutil/positionattitudetransform.hpp>
-#include <components/resource/bulletshape.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/misc/convert.hpp>
+#include <components/resource/bulletshape.hpp>
+#include <components/sceneutil/positionattitudetransform.hpp>
 
 #include "../mwworld/class.hpp"
 
@@ -19,307 +19,313 @@
 namespace MWPhysics
 {
 
-
-Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, PhysicsTaskScheduler* scheduler,
-    bool canWaterWalk, DetourNavigator::CollisionShapeType collisionShapeType)
-  : PtrHolder(ptr, ptr.getRefData().getPosition().asVec3())
-  , mStandingOnPtr(nullptr), mCanWaterWalk(canWaterWalk), mWalkingOnWater(false)
-  , mMeshTranslation(shape->mCollisionBox.mCenter), mOriginalHalfExtents(shape->mCollisionBox.mExtents)
-  , mStuckFrames(0), mLastStuckPosition{0, 0, 0}
-  , mForce(0.f, 0.f, 0.f), mOnGround(true), mOnSlope(false)
-  , mInternalCollisionMode(true)
-  , mExternalCollisionMode(true)
-  , mActive(false)
-  , mTaskScheduler(scheduler)
-{
-    // We can not create actor without collisions - he will fall through the ground.
-    // In this case we should autogenerate collision box based on mesh shape
-    // (NPCs have bodyparts and use a different approach)
-    if (!ptr.getClass().isNpc() && mOriginalHalfExtents.length2() == 0.f)
+    Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, PhysicsTaskScheduler* scheduler,
+        bool canWaterWalk, DetourNavigator::CollisionShapeType collisionShapeType)
+        : PtrHolder(ptr, ptr.getRefData().getPosition().asVec3())
+        , mStandingOnPtr(nullptr)
+        , mCanWaterWalk(canWaterWalk)
+        , mWalkingOnWater(false)
+        , mMeshTranslation(shape->mCollisionBox.mCenter)
+        , mOriginalHalfExtents(shape->mCollisionBox.mExtents)
+        , mStuckFrames(0)
+        , mLastStuckPosition{ 0, 0, 0 }
+        , mForce(0.f, 0.f, 0.f)
+        , mOnGround(true)
+        , mOnSlope(false)
+        , mInternalCollisionMode(true)
+        , mExternalCollisionMode(true)
+        , mActive(false)
+        , mTaskScheduler(scheduler)
     {
-        if (shape->mCollisionShape)
+        // We can not create actor without collisions - he will fall through the ground.
+        // In this case we should autogenerate collision box based on mesh shape
+        // (NPCs have bodyparts and use a different approach)
+        if (!ptr.getClass().isNpc() && mOriginalHalfExtents.length2() == 0.f)
         {
-            btTransform transform;
-            transform.setIdentity();
-            btVector3 min;
-            btVector3 max;
-
-            shape->mCollisionShape->getAabb(transform, min, max);
-            mOriginalHalfExtents.x() = (max[0] - min[0])/2.f;
-            mOriginalHalfExtents.y() = (max[1] - min[1])/2.f;
-            mOriginalHalfExtents.z() = (max[2] - min[2])/2.f;
-
-            mMeshTranslation = osg::Vec3f(0.f, 0.f, mOriginalHalfExtents.z());
+            if (shape->mCollisionShape)
+            {
+                btTransform transform;
+                transform.setIdentity();
+                btVector3 min;
+                btVector3 max;
+
+                shape->mCollisionShape->getAabb(transform, min, max);
+                mOriginalHalfExtents.x() = (max[0] - min[0]) / 2.f;
+                mOriginalHalfExtents.y() = (max[1] - min[1]) / 2.f;
+                mOriginalHalfExtents.z() = (max[2] - min[2]) / 2.f;
+
+                mMeshTranslation = osg::Vec3f(0.f, 0.f, mOriginalHalfExtents.z());
+            }
+
+            if (mOriginalHalfExtents.length2() == 0.f)
+                Log(Debug::Error) << "Error: Failed to calculate bounding box for actor \""
+                                  << ptr.getCellRef().getRefId() << "\".";
         }
 
-        if (mOriginalHalfExtents.length2() == 0.f)
-            Log(Debug::Error) << "Error: Failed to calculate bounding box for actor \"" << ptr.getCellRef().getRefId() << "\".";
-    }
-
-    const btVector3 halfExtents = Misc::Convert::toBullet(mOriginalHalfExtents);
-    if ((mMeshTranslation.x() == 0.0 && mMeshTranslation.y() == 0.0)
+        const btVector3 halfExtents = Misc::Convert::toBullet(mOriginalHalfExtents);
+        if ((mMeshTranslation.x() == 0.0 && mMeshTranslation.y() == 0.0)
             && std::fabs(mOriginalHalfExtents.x() - mOriginalHalfExtents.y()) < 2.2)
-    {
-        switch (collisionShapeType)
         {
-            case DetourNavigator::CollisionShapeType::Aabb:
-                mShape = std::make_unique<btBoxShape>(halfExtents);
-                mRotationallyInvariant = true;
-                break;
-            case DetourNavigator::CollisionShapeType::RotatingBox:
-                mShape = std::make_unique<btBoxShape>(halfExtents);
-                mRotationallyInvariant = false;
-                break;
-            case DetourNavigator::CollisionShapeType::Cylinder:
-                mShape = std::make_unique<btCylinderShapeZ>(halfExtents);
-                mRotationallyInvariant = true;
-                break;
+            switch (collisionShapeType)
+            {
+                case DetourNavigator::CollisionShapeType::Aabb:
+                    mShape = std::make_unique<btBoxShape>(halfExtents);
+                    mRotationallyInvariant = true;
+                    break;
+                case DetourNavigator::CollisionShapeType::RotatingBox:
+                    mShape = std::make_unique<btBoxShape>(halfExtents);
+                    mRotationallyInvariant = false;
+                    break;
+                case DetourNavigator::CollisionShapeType::Cylinder:
+                    mShape = std::make_unique<btCylinderShapeZ>(halfExtents);
+                    mRotationallyInvariant = true;
+                    break;
+            }
+            mCollisionShapeType = collisionShapeType;
+        }
+        else
+        {
+            mShape = std::make_unique<btBoxShape>(halfExtents);
+            mRotationallyInvariant = false;
+            mCollisionShapeType = DetourNavigator::CollisionShapeType::RotatingBox;
         }
-        mCollisionShapeType = collisionShapeType;
-    }
-    else
-    {
-        mShape = std::make_unique<btBoxShape>(halfExtents);
-        mRotationallyInvariant = false;
-        mCollisionShapeType = DetourNavigator::CollisionShapeType::RotatingBox;
-    }
 
-    mConvexShape = static_cast<btConvexShape*>(mShape.get());
-    mConvexShape->setMargin(0.001); // make sure bullet isn't using the huge default convex shape margin of 0.04
+        mConvexShape = static_cast<btConvexShape*>(mShape.get());
+        mConvexShape->setMargin(0.001); // make sure bullet isn't using the huge default convex shape margin of 0.04
 
-    mCollisionObject = std::make_unique<btCollisionObject>();
-    mCollisionObject->setCollisionFlags(btCollisionObject::CF_KINEMATIC_OBJECT);
-    mCollisionObject->setActivationState(DISABLE_DEACTIVATION);
-    mCollisionObject->setCollisionShape(mShape.get());
-    mCollisionObject->setUserPointer(this);
+        mCollisionObject = std::make_unique<btCollisionObject>();
+        mCollisionObject->setCollisionFlags(btCollisionObject::CF_KINEMATIC_OBJECT);
+        mCollisionObject->setActivationState(DISABLE_DEACTIVATION);
+        mCollisionObject->setCollisionShape(mShape.get());
+        mCollisionObject->setUserPointer(this);
 
-    updateScaleUnsafe();
+        updateScaleUnsafe();
 
-    if(!mRotationallyInvariant)
-        mRotation = mPtr.getRefData().getBaseNode()->getAttitude();
+        if (!mRotationallyInvariant)
+            mRotation = mPtr.getRefData().getBaseNode()->getAttitude();
 
-    addCollisionMask(getCollisionMask());
-    updateCollisionObjectPositionUnsafe();
-}
+        addCollisionMask(getCollisionMask());
+        updateCollisionObjectPositionUnsafe();
+    }
 
-Actor::~Actor()
-{
-    mTaskScheduler->removeCollisionObject(mCollisionObject.get());
-}
+    Actor::~Actor()
+    {
+        mTaskScheduler->removeCollisionObject(mCollisionObject.get());
+    }
 
-void Actor::enableCollisionMode(bool collision)
-{
-    mInternalCollisionMode = collision;
-}
+    void Actor::enableCollisionMode(bool collision)
+    {
+        mInternalCollisionMode = collision;
+    }
 
-void Actor::enableCollisionBody(bool collision)
-{
-    if (mExternalCollisionMode != collision)
+    void Actor::enableCollisionBody(bool collision)
     {
-        mExternalCollisionMode = collision;
-        updateCollisionMask();
+        if (mExternalCollisionMode != collision)
+        {
+            mExternalCollisionMode = collision;
+            updateCollisionMask();
+        }
     }
-}
 
-void Actor::addCollisionMask(int collisionMask)
-{
-    mTaskScheduler->addCollisionObject(mCollisionObject.get(), CollisionType_Actor, collisionMask);
-}
+    void Actor::addCollisionMask(int collisionMask)
+    {
+        mTaskScheduler->addCollisionObject(mCollisionObject.get(), CollisionType_Actor, collisionMask);
+    }
 
-void Actor::updateCollisionMask()
-{
-    mTaskScheduler->setCollisionFilterMask(mCollisionObject.get(), getCollisionMask());
-}
+    void Actor::updateCollisionMask()
+    {
+        mTaskScheduler->setCollisionFilterMask(mCollisionObject.get(), getCollisionMask());
+    }
 
-int Actor::getCollisionMask() const
-{
-    int collisionMask = CollisionType_World | CollisionType_HeightMap;
-    if (mExternalCollisionMode)
-        collisionMask |= CollisionType_Actor | CollisionType_Projectile | CollisionType_Door;
-    if (mCanWaterWalk)
-        collisionMask |= CollisionType_Water;
-    return collisionMask;
-}
+    int Actor::getCollisionMask() const
+    {
+        int collisionMask = CollisionType_World | CollisionType_HeightMap;
+        if (mExternalCollisionMode)
+            collisionMask |= CollisionType_Actor | CollisionType_Projectile | CollisionType_Door;
+        if (mCanWaterWalk)
+            collisionMask |= CollisionType_Water;
+        return collisionMask;
+    }
 
-void Actor::updatePosition()
-{
-    std::scoped_lock lock(mPositionMutex);
-    const auto worldPosition = mPtr.getRefData().getPosition().asVec3();
-    mPreviousPosition = worldPosition;
-    mPosition = worldPosition;
-    mSimulationPosition = worldPosition;
-    mPositionOffset = osg::Vec3f();
-    mStandingOnPtr = nullptr;
-    mSkipSimulation = true;
-}
+    void Actor::updatePosition()
+    {
+        std::scoped_lock lock(mPositionMutex);
+        const auto worldPosition = mPtr.getRefData().getPosition().asVec3();
+        mPreviousPosition = worldPosition;
+        mPosition = worldPosition;
+        mSimulationPosition = worldPosition;
+        mPositionOffset = osg::Vec3f();
+        mStandingOnPtr = nullptr;
+        mSkipSimulation = true;
+    }
 
-void Actor::setSimulationPosition(const osg::Vec3f& position)
-{
-    if (!std::exchange(mSkipSimulation, false))
-        mSimulationPosition = position;
-}
+    void Actor::setSimulationPosition(const osg::Vec3f& position)
+    {
+        if (!std::exchange(mSkipSimulation, false))
+            mSimulationPosition = position;
+    }
 
-osg::Vec3f Actor::getScaledMeshTranslation() const
-{
-    return mRotation * osg::componentMultiply(mMeshTranslation, mScale);
-}
+    osg::Vec3f Actor::getScaledMeshTranslation() const
+    {
+        return mRotation * osg::componentMultiply(mMeshTranslation, mScale);
+    }
 
-void Actor::updateCollisionObjectPosition()
-{
-    std::scoped_lock lock(mPositionMutex);
-    updateCollisionObjectPositionUnsafe();
-}
+    void Actor::updateCollisionObjectPosition()
+    {
+        std::scoped_lock lock(mPositionMutex);
+        updateCollisionObjectPositionUnsafe();
+    }
 
-void Actor::updateCollisionObjectPositionUnsafe()
-{
-    mShape->setLocalScaling(Misc::Convert::toBullet(mScale));
-    osg::Vec3f newPosition = getScaledMeshTranslation() + mPosition;
+    void Actor::updateCollisionObjectPositionUnsafe()
+    {
+        mShape->setLocalScaling(Misc::Convert::toBullet(mScale));
+        osg::Vec3f newPosition = getScaledMeshTranslation() + mPosition;
 
-    auto& trans = mCollisionObject->getWorldTransform();
-    trans.setOrigin(Misc::Convert::toBullet(newPosition));
-    trans.setRotation(Misc::Convert::toBullet(mRotation));
-    mCollisionObject->setWorldTransform(trans);
+        auto& trans = mCollisionObject->getWorldTransform();
+        trans.setOrigin(Misc::Convert::toBullet(newPosition));
+        trans.setRotation(Misc::Convert::toBullet(mRotation));
+        mCollisionObject->setWorldTransform(trans);
 
-    mWorldPositionChanged = false;
-}
+        mWorldPositionChanged = false;
+    }
 
-osg::Vec3f Actor::getCollisionObjectPosition() const
-{
-    std::scoped_lock lock(mPositionMutex);
-    return getScaledMeshTranslation() + mPosition;
-}
+    osg::Vec3f Actor::getCollisionObjectPosition() const
+    {
+        std::scoped_lock lock(mPositionMutex);
+        return getScaledMeshTranslation() + mPosition;
+    }
 
-bool Actor::setPosition(const osg::Vec3f& position)
-{
-    std::scoped_lock lock(mPositionMutex);
-    applyOffsetChange();
-    bool hasChanged = (mPosition.operator!=(position) && !mSkipSimulation) || mWorldPositionChanged;
-    if (!mSkipSimulation)
+    bool Actor::setPosition(const osg::Vec3f& position)
     {
-        mPreviousPosition = mPosition;
-        mPosition = position;
+        std::scoped_lock lock(mPositionMutex);
+        applyOffsetChange();
+        bool hasChanged = (mPosition.operator!=(position) && !mSkipSimulation) || mWorldPositionChanged;
+        if (!mSkipSimulation)
+        {
+            mPreviousPosition = mPosition;
+            mPosition = position;
+        }
+        return hasChanged;
     }
-    return hasChanged;
-}
 
-void Actor::adjustPosition(const osg::Vec3f& offset)
-{
-    std::scoped_lock lock(mPositionMutex);
-    mPositionOffset += offset;
-}
+    void Actor::adjustPosition(const osg::Vec3f& offset)
+    {
+        std::scoped_lock lock(mPositionMutex);
+        mPositionOffset += offset;
+    }
 
-void Actor::applyOffsetChange()
-{
-    if (mPositionOffset.length() == 0)
-        return;
-    mPosition += mPositionOffset;
-    mPreviousPosition += mPositionOffset;
-    mSimulationPosition += mPositionOffset;
-    mPositionOffset = osg::Vec3f();
-    mWorldPositionChanged = true;
-}
+    void Actor::applyOffsetChange()
+    {
+        if (mPositionOffset.length() == 0)
+            return;
+        mPosition += mPositionOffset;
+        mPreviousPosition += mPositionOffset;
+        mSimulationPosition += mPositionOffset;
+        mPositionOffset = osg::Vec3f();
+        mWorldPositionChanged = true;
+    }
 
-void Actor::setRotation(osg::Quat quat)
-{
-    std::scoped_lock lock(mPositionMutex);
-    mRotation = quat;
-}
+    void Actor::setRotation(osg::Quat quat)
+    {
+        std::scoped_lock lock(mPositionMutex);
+        mRotation = quat;
+    }
 
-bool Actor::isRotationallyInvariant() const
-{
-    return mRotationallyInvariant;
-}
+    bool Actor::isRotationallyInvariant() const
+    {
+        return mRotationallyInvariant;
+    }
 
-void Actor::updateScale()
-{
-    std::scoped_lock lock(mPositionMutex);
-    updateScaleUnsafe();
-}
+    void Actor::updateScale()
+    {
+        std::scoped_lock lock(mPositionMutex);
+        updateScaleUnsafe();
+    }
 
-void Actor::updateScaleUnsafe()
-{
-    float scale = mPtr.getCellRef().getScale();
-    osg::Vec3f scaleVec(scale,scale,scale);
+    void Actor::updateScaleUnsafe()
+    {
+        float scale = mPtr.getCellRef().getScale();
+        osg::Vec3f scaleVec(scale, scale, scale);
 
-    mPtr.getClass().adjustScale(mPtr, scaleVec, false);
-    mScale = scaleVec;
-    mHalfExtents = osg::componentMultiply(mOriginalHalfExtents, scaleVec);
+        mPtr.getClass().adjustScale(mPtr, scaleVec, false);
+        mScale = scaleVec;
+        mHalfExtents = osg::componentMultiply(mOriginalHalfExtents, scaleVec);
 
-    scaleVec = osg::Vec3f(scale,scale,scale);
-    mPtr.getClass().adjustScale(mPtr, scaleVec, true);
-    mRenderingHalfExtents = osg::componentMultiply(mOriginalHalfExtents, scaleVec);
-}
+        scaleVec = osg::Vec3f(scale, scale, scale);
+        mPtr.getClass().adjustScale(mPtr, scaleVec, true);
+        mRenderingHalfExtents = osg::componentMultiply(mOriginalHalfExtents, scaleVec);
+    }
 
-osg::Vec3f Actor::getHalfExtents() const
-{
-    return mHalfExtents;
-}
+    osg::Vec3f Actor::getHalfExtents() const
+    {
+        return mHalfExtents;
+    }
 
-osg::Vec3f Actor::getOriginalHalfExtents() const
-{
-    return mOriginalHalfExtents;
-}
+    osg::Vec3f Actor::getOriginalHalfExtents() const
+    {
+        return mOriginalHalfExtents;
+    }
 
-osg::Vec3f Actor::getRenderingHalfExtents() const
-{
-    return mRenderingHalfExtents;
-}
+    osg::Vec3f Actor::getRenderingHalfExtents() const
+    {
+        return mRenderingHalfExtents;
+    }
 
-void Actor::setInertialForce(const osg::Vec3f &force)
-{
-    mForce = force;
-}
+    void Actor::setInertialForce(const osg::Vec3f& force)
+    {
+        mForce = force;
+    }
 
-void Actor::setOnGround(bool grounded)
-{
-    mOnGround = grounded;
-}
+    void Actor::setOnGround(bool grounded)
+    {
+        mOnGround = grounded;
+    }
 
-void Actor::setOnSlope(bool slope)
-{
-    mOnSlope = slope;
-}
+    void Actor::setOnSlope(bool slope)
+    {
+        mOnSlope = slope;
+    }
 
-bool Actor::isWalkingOnWater() const
-{
-    return mWalkingOnWater;
-}
+    bool Actor::isWalkingOnWater() const
+    {
+        return mWalkingOnWater;
+    }
 
-void Actor::setWalkingOnWater(bool walkingOnWater)
-{
-    mWalkingOnWater = walkingOnWater;
-}
+    void Actor::setWalkingOnWater(bool walkingOnWater)
+    {
+        mWalkingOnWater = walkingOnWater;
+    }
 
-void Actor::setCanWaterWalk(bool waterWalk)
-{
-    if (waterWalk != mCanWaterWalk)
+    void Actor::setCanWaterWalk(bool waterWalk)
     {
-        mCanWaterWalk = waterWalk;
-        updateCollisionMask();
+        if (waterWalk != mCanWaterWalk)
+        {
+            mCanWaterWalk = waterWalk;
+            updateCollisionMask();
+        }
     }
-}
 
-MWWorld::Ptr Actor::getStandingOnPtr() const
-{
-    std::scoped_lock lock(mPositionMutex);
-    return mStandingOnPtr;
-}
+    MWWorld::Ptr Actor::getStandingOnPtr() const
+    {
+        std::scoped_lock lock(mPositionMutex);
+        return mStandingOnPtr;
+    }
 
-void Actor::setStandingOnPtr(const MWWorld::Ptr& ptr)
-{
-    std::scoped_lock lock(mPositionMutex);
-    mStandingOnPtr = ptr;
-}
+    void Actor::setStandingOnPtr(const MWWorld::Ptr& ptr)
+    {
+        std::scoped_lock lock(mPositionMutex);
+        mStandingOnPtr = ptr;
+    }
 
-bool Actor::canMoveToWaterSurface(float waterlevel, const btCollisionWorld* world) const
-{
-    const float halfZ = getHalfExtents().z();
-    const osg::Vec3f actorPosition = getPosition();
-    const osg::Vec3f startingPosition(actorPosition.x(), actorPosition.y(), actorPosition.z() + halfZ);
-    const osg::Vec3f destinationPosition(actorPosition.x(), actorPosition.y(), waterlevel + halfZ);
-    MWPhysics::ActorTracer tracer;
-    tracer.doTrace(getCollisionObject(), startingPosition, destinationPosition, world);
-    return (tracer.mFraction >= 1.0f);
-}
+    bool Actor::canMoveToWaterSurface(float waterlevel, const btCollisionWorld* world) const
+    {
+        const float halfZ = getHalfExtents().z();
+        const osg::Vec3f actorPosition = getPosition();
+        const osg::Vec3f startingPosition(actorPosition.x(), actorPosition.y(), actorPosition.z() + halfZ);
+        const osg::Vec3f destinationPosition(actorPosition.x(), actorPosition.y(), waterlevel + halfZ);
+        MWPhysics::ActorTracer tracer;
+        tracer.doTrace(getCollisionObject(), startingPosition, destinationPosition, world);
+        return (tracer.mFraction >= 1.0f);
+    }
 
 }
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 4d7412e88b..40d4f27c0f 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -9,8 +9,8 @@
 #include <components/detournavigator/collisionshapetype.hpp>
 
 #include <LinearMath/btTransform.h>
-#include <osg/Vec3f>
 #include <osg/Quat>
+#include <osg/Vec3f>
 
 class btCollisionShape;
 class btCollisionObject;
@@ -42,15 +42,13 @@ namespace MWPhysics
          */
         void enableCollisionMode(bool collision);
 
-        bool getCollisionMode() const
-        {
-            return mInternalCollisionMode;
-        }
+        bool getCollisionMode() const { return mInternalCollisionMode; }
 
         btConvexShape* getConvexShape() const { return mConvexShape; }
 
         /**
-         * Enables or disables the *external* collision body. If disabled, other actors will not collide with this actor.
+         * Enables or disables the *external* collision body. If disabled, other actors will not collide with this
+         * actor.
          */
         void enableCollisionBody(bool collision);
 
@@ -63,9 +61,9 @@ namespace MWPhysics
         bool isRotationallyInvariant() const;
 
         /**
-        * Used by the physics simulation to store the simulation result. Used in conjunction with mWorldPosition
-        * to account for e.g. scripted movements
-        */
+         * Used by the physics simulation to store the simulation result. Used in conjunction with mWorldPosition
+         * to account for e.g. scripted movements
+         */
         void setSimulationPosition(const osg::Vec3f& position);
 
         void updateCollisionObjectPosition();
@@ -82,14 +80,15 @@ namespace MWPhysics
 
         /**
          * Returns the position of the collision body
-         * @note The collision shape's origin is in its center, so the position returned can be described as center of the actor collision box in world space.
+         * @note The collision shape's origin is in its center, so the position returned can be described as center of
+         * the actor collision box in world space.
          */
         osg::Vec3f getCollisionObjectPosition() const;
 
         /**
-          * Store the current position into mPreviousPosition, then move to this position.
-          * Returns true if the new position is different.
-          */
+         * Store the current position into mPreviousPosition, then move to this position.
+         * Returns true if the new position is different.
+         */
         bool setPosition(const osg::Vec3f& position);
 
         // force set actor position to be as in Ptr::RefData
@@ -103,23 +102,21 @@ namespace MWPhysics
 
         /**
          * Returns the half extents of the collision body (scaled according to rendering scale)
-         * @note The reason we need this extra method is because of an inconsistency in MW - NPC race scales aren't applied to the collision shape,
-         * most likely to make environment collision testing easier. However in some cases (swimming level) we want the actual scale.
+         * @note The reason we need this extra method is because of an inconsistency in MW - NPC race scales aren't
+         * applied to the collision shape, most likely to make environment collision testing easier. However in some
+         * cases (swimming level) we want the actual scale.
          */
         osg::Vec3f getRenderingHalfExtents() const;
 
         /**
          * Sets the current amount of inertial force (incl. gravity) affecting this physic actor
          */
-        void setInertialForce(const osg::Vec3f &force);
+        void setInertialForce(const osg::Vec3f& force);
 
         /**
          * Gets the current amount of inertial force (incl. gravity) affecting this physic actor
          */
-        const osg::Vec3f &getInertialForce() const
-        {
-            return mForce;
-        }
+        const osg::Vec3f& getInertialForce() const { return mForce; }
 
         void setOnGround(bool grounded);
 
@@ -139,23 +136,11 @@ namespace MWPhysics
         MWWorld::Ptr getStandingOnPtr() const;
         void setStandingOnPtr(const MWWorld::Ptr& ptr);
 
-        unsigned int getStuckFrames() const
-        {
-            return mStuckFrames;
-        }
-        void setStuckFrames(unsigned int frames)
-        {
-            mStuckFrames = frames;
-        }
-
-        const osg::Vec3f &getLastStuckPosition() const
-        {
-            return mLastStuckPosition;
-        }
-        void setLastStuckPosition(osg::Vec3f position)
-        {
-            mLastStuckPosition = position;
-        }
+        unsigned int getStuckFrames() const { return mStuckFrames; }
+        void setStuckFrames(unsigned int frames) { mStuckFrames = frames; }
+
+        const osg::Vec3f& getLastStuckPosition() const { return mLastStuckPosition; }
+        void setLastStuckPosition(osg::Vec3f position) { mLastStuckPosition = position; }
 
         bool canMoveToWaterSurface(float waterlevel, const btCollisionWorld* world) const;
 
@@ -216,5 +201,4 @@ namespace MWPhysics
 
 }
 
-
 #endif
diff --git a/apps/openmw/mwphysics/actorconvexcallback.cpp b/apps/openmw/mwphysics/actorconvexcallback.cpp
index 672af05058..db077beb31 100644
--- a/apps/openmw/mwphysics/actorconvexcallback.cpp
+++ b/apps/openmw/mwphysics/actorconvexcallback.cpp
@@ -14,53 +14,58 @@ namespace MWPhysics
     public:
         bool overlapping = false;
 
-        btScalar addSingleResult(btManifoldPoint& cp,
-            const btCollisionObjectWrapper* colObj0Wrap,
-            int partId0,
-            int index0,
-            const btCollisionObjectWrapper* colObj1Wrap,
-            int partId1,
-            int index1) override
+        btScalar addSingleResult(btManifoldPoint& cp, const btCollisionObjectWrapper* colObj0Wrap, int partId0,
+            int index0, const btCollisionObjectWrapper* colObj1Wrap, int partId1, int index1) override
         {
-            if(cp.getDistance() <= 0.0f)
+            if (cp.getDistance() <= 0.0f)
                 overlapping = true;
             return btScalar(1);
         }
     };
 
-    ActorConvexCallback::ActorConvexCallback(const btCollisionObject *me, const btVector3 &motion, btScalar minCollisionDot, const btCollisionWorld * world)
-    : btCollisionWorld::ClosestConvexResultCallback(btVector3(0.0, 0.0, 0.0), btVector3(0.0, 0.0, 0.0)),
-      mMe(me), mMotion(motion), mMinCollisionDot(minCollisionDot), mWorld(world)
+    ActorConvexCallback::ActorConvexCallback(
+        const btCollisionObject* me, const btVector3& motion, btScalar minCollisionDot, const btCollisionWorld* world)
+        : btCollisionWorld::ClosestConvexResultCallback(btVector3(0.0, 0.0, 0.0), btVector3(0.0, 0.0, 0.0))
+        , mMe(me)
+        , mMotion(motion)
+        , mMinCollisionDot(minCollisionDot)
+        , mWorld(world)
     {
     }
 
-    btScalar ActorConvexCallback::addSingleResult(btCollisionWorld::LocalConvexResult& convexResult, bool normalInWorldSpace)
+    btScalar ActorConvexCallback::addSingleResult(
+        btCollisionWorld::LocalConvexResult& convexResult, bool normalInWorldSpace)
     {
         if (convexResult.m_hitCollisionObject == mMe)
             return btScalar(1);
 
         // override data for actor-actor collisions
-        // vanilla Morrowind seems to make overlapping actors collide as though they are both cylinders with a diameter of the distance between them
-        // For some reason this doesn't work as well as it should when using capsules, but it still helps a lot.
-        if(convexResult.m_hitCollisionObject->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Actor)
+        // vanilla Morrowind seems to make overlapping actors collide as though they are both cylinders with a diameter
+        // of the distance between them For some reason this doesn't work as well as it should when using capsules, but
+        // it still helps a lot.
+        if (convexResult.m_hitCollisionObject->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Actor)
         {
             ActorOverlapTester isOverlapping;
-            // FIXME: This is absolutely terrible and bullet should feel terrible for not making contactPairTest const-correct.
-            ContactTestWrapper::contactPairTest(const_cast<btCollisionWorld*>(mWorld), const_cast<btCollisionObject*>(mMe), const_cast<btCollisionObject*>(convexResult.m_hitCollisionObject), isOverlapping);
+            // FIXME: This is absolutely terrible and bullet should feel terrible for not making contactPairTest
+            // const-correct.
+            ContactTestWrapper::contactPairTest(const_cast<btCollisionWorld*>(mWorld),
+                const_cast<btCollisionObject*>(mMe), const_cast<btCollisionObject*>(convexResult.m_hitCollisionObject),
+                isOverlapping);
 
-            if(isOverlapping.overlapping)
+            if (isOverlapping.overlapping)
             {
                 auto originA = Misc::Convert::toOsg(mMe->getWorldTransform().getOrigin());
                 auto originB = Misc::Convert::toOsg(convexResult.m_hitCollisionObject->getWorldTransform().getOrigin());
                 osg::Vec3f motion = Misc::Convert::toOsg(mMotion);
-                osg::Vec3f normal = (originA-originB);
+                osg::Vec3f normal = (originA - originB);
                 normal.z() = 0;
                 normal.normalize();
-                // only collide if horizontally moving towards the hit actor (note: the motion vector appears to be inverted)
-                // FIXME: This kinda screws with standing on actors that walk up slopes for some reason. Makes you fall through them.
-                // It happens in vanilla Morrowind too, but much less often.
-                // I tried hunting down why but couldn't figure it out. Possibly a stair stepping or ground ejection bug.
-                if(normal * motion > 0.0f)
+                // only collide if horizontally moving towards the hit actor (note: the motion vector appears to be
+                // inverted)
+                // FIXME: This kinda screws with standing on actors that walk up slopes for some reason. Makes you fall
+                // through them. It happens in vanilla Morrowind too, but much less often. I tried hunting down why but
+                // couldn't figure it out. Possibly a stair stepping or ground ejection bug.
+                if (normal * motion > 0.0f)
                 {
                     convexResult.m_hitFraction = 0.0f;
                     convexResult.m_hitNormalLocal = Misc::Convert::toBullet(normal);
@@ -72,7 +77,8 @@ namespace MWPhysics
                 }
             }
         }
-        if (convexResult.m_hitCollisionObject->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Projectile)
+        if (convexResult.m_hitCollisionObject->getBroadphaseHandle()->m_collisionFilterGroup
+            == CollisionType_Projectile)
         {
             auto* projectileHolder = static_cast<Projectile*>(convexResult.m_hitCollisionObject->getUserPointer());
             if (!projectileHolder->isActive())
@@ -87,8 +93,9 @@ namespace MWPhysics
             hitNormalWorld = convexResult.m_hitNormalLocal;
         else
         {
-            ///need to transform normal into worldspace
-            hitNormalWorld = convexResult.m_hitCollisionObject->getWorldTransform().getBasis()*convexResult.m_hitNormalLocal;
+            /// need to transform normal into worldspace
+            hitNormalWorld
+                = convexResult.m_hitCollisionObject->getWorldTransform().getBasis() * convexResult.m_hitNormalLocal;
         }
 
         // dot product of the motion vector against the collision contact normal
diff --git a/apps/openmw/mwphysics/actorconvexcallback.hpp b/apps/openmw/mwphysics/actorconvexcallback.hpp
index 1c28ee6cc4..4b9ab1a8a4 100644
--- a/apps/openmw/mwphysics/actorconvexcallback.hpp
+++ b/apps/openmw/mwphysics/actorconvexcallback.hpp
@@ -10,15 +10,16 @@ namespace MWPhysics
     class ActorConvexCallback : public btCollisionWorld::ClosestConvexResultCallback
     {
     public:
-        ActorConvexCallback(const btCollisionObject *me, const btVector3 &motion, btScalar minCollisionDot, const btCollisionWorld * world);
+        ActorConvexCallback(const btCollisionObject* me, const btVector3& motion, btScalar minCollisionDot,
+            const btCollisionWorld* world);
 
-        btScalar addSingleResult(btCollisionWorld::LocalConvexResult& convexResult,bool normalInWorldSpace) override;
+        btScalar addSingleResult(btCollisionWorld::LocalConvexResult& convexResult, bool normalInWorldSpace) override;
 
     protected:
-        const btCollisionObject *mMe;
+        const btCollisionObject* mMe;
         const btVector3 mMotion;
         const btScalar mMinCollisionDot;
-        const btCollisionWorld * mWorld;
+        const btCollisionWorld* mWorld;
     };
 }
 
diff --git a/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp b/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
index 3f6cb2b727..b39603a767 100644
--- a/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
+++ b/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
@@ -12,13 +12,16 @@
 
 namespace MWPhysics
 {
-    ClosestNotMeRayResultCallback::ClosestNotMeRayResultCallback(const btCollisionObject* me, std::vector<const btCollisionObject*>  targets, const btVector3& from, const btVector3& to)
-    : btCollisionWorld::ClosestRayResultCallback(from, to)
-    , mMe(me), mTargets(std::move(targets))
+    ClosestNotMeRayResultCallback::ClosestNotMeRayResultCallback(const btCollisionObject* me,
+        std::vector<const btCollisionObject*> targets, const btVector3& from, const btVector3& to)
+        : btCollisionWorld::ClosestRayResultCallback(from, to)
+        , mMe(me)
+        , mTargets(std::move(targets))
     {
     }
 
-    btScalar ClosestNotMeRayResultCallback::addSingleResult(btCollisionWorld::LocalRayResult& rayResult, bool normalInWorldSpace)
+    btScalar ClosestNotMeRayResultCallback::addSingleResult(
+        btCollisionWorld::LocalRayResult& rayResult, bool normalInWorldSpace)
     {
         const auto* hitObject = rayResult.m_collisionObject;
         if (hitObject == mMe)
diff --git a/apps/openmw/mwphysics/closestnotmerayresultcallback.hpp b/apps/openmw/mwphysics/closestnotmerayresultcallback.hpp
index 1fa32ef686..e6f5c45d36 100644
--- a/apps/openmw/mwphysics/closestnotmerayresultcallback.hpp
+++ b/apps/openmw/mwphysics/closestnotmerayresultcallback.hpp
@@ -14,7 +14,8 @@ namespace MWPhysics
     class ClosestNotMeRayResultCallback : public btCollisionWorld::ClosestRayResultCallback
     {
     public:
-        ClosestNotMeRayResultCallback(const btCollisionObject* me, std::vector<const btCollisionObject*> targets, const btVector3& from, const btVector3& to);
+        ClosestNotMeRayResultCallback(const btCollisionObject* me, std::vector<const btCollisionObject*> targets,
+            const btVector3& from, const btVector3& to);
 
         btScalar addSingleResult(btCollisionWorld::LocalRayResult& rayResult, bool normalInWorldSpace) override;
 
diff --git a/apps/openmw/mwphysics/collisiontype.hpp b/apps/openmw/mwphysics/collisiontype.hpp
index b51a22a2f5..5dda2a6aeb 100644
--- a/apps/openmw/mwphysics/collisiontype.hpp
+++ b/apps/openmw/mwphysics/collisiontype.hpp
@@ -4,18 +4,21 @@
 namespace MWPhysics
 {
 
-enum CollisionType {
-    CollisionType_World = 1<<0,
-    CollisionType_Door = 1<<1,
-    CollisionType_Actor = 1<<2,
-    CollisionType_HeightMap = 1<<3,
-    CollisionType_Projectile = 1<<4,
-    CollisionType_Water = 1<<5,
-    CollisionType_Default = CollisionType_World|CollisionType_HeightMap|CollisionType_Actor|CollisionType_Door,
-    CollisionType_AnyPhysical = CollisionType_World|CollisionType_HeightMap|CollisionType_Actor|CollisionType_Door|CollisionType_Projectile|CollisionType_Water,
-    CollisionType_CameraOnly = 1<<6,
-    CollisionType_VisualOnly = 1<<7
-};
+    enum CollisionType
+    {
+        CollisionType_World = 1 << 0,
+        CollisionType_Door = 1 << 1,
+        CollisionType_Actor = 1 << 2,
+        CollisionType_HeightMap = 1 << 3,
+        CollisionType_Projectile = 1 << 4,
+        CollisionType_Water = 1 << 5,
+        CollisionType_Default
+        = CollisionType_World | CollisionType_HeightMap | CollisionType_Actor | CollisionType_Door,
+        CollisionType_AnyPhysical = CollisionType_World | CollisionType_HeightMap | CollisionType_Actor
+            | CollisionType_Door | CollisionType_Projectile | CollisionType_Water,
+        CollisionType_CameraOnly = 1 << 6,
+        CollisionType_VisualOnly = 1 << 7
+    };
 
 }
 
diff --git a/apps/openmw/mwphysics/constants.hpp b/apps/openmw/mwphysics/constants.hpp
index b2d189e874..0b3c71408e 100644
--- a/apps/openmw/mwphysics/constants.hpp
+++ b/apps/openmw/mwphysics/constants.hpp
@@ -7,7 +7,8 @@ namespace MWPhysics
 
     static constexpr float sMinStep = 10.0f; // hack to skip over tiny unwalkable slopes
     static constexpr float sMinStep2 = 20.0f; // hack to skip over shorter but longer/wider/further unwalkable slopes
-    // whether to do the above stairstepping logic hacks to work around bad morrowind assets - disabling causes problems but improves performance
+    // whether to do the above stairstepping logic hacks to work around bad morrowind assets - disabling causes problems
+    // but improves performance
     static constexpr bool sDoExtraStairHacks = true;
 
     static constexpr float sGroundOffset = 1.0f;
@@ -16,8 +17,9 @@ namespace MWPhysics
     static constexpr int sMaxIterations = 8;
     // Allows for more precise movement solving without getting stuck or snagging too easily.
     static constexpr float sCollisionMargin = 0.2f;
-    // Allow for a small amount of penetration to prevent numerical precision issues from causing the "unstuck"ing code to run unnecessarily
-    // Currently set to 0 because having the "unstuck"ing code run whenever possible prevents some glitchy snagging issues
+    // Allow for a small amount of penetration to prevent numerical precision issues from causing the "unstuck"ing code
+    // to run unnecessarily Currently set to 0 because having the "unstuck"ing code run whenever possible prevents some
+    // glitchy snagging issues
     static constexpr float sAllowedPenetration = 0.0f;
 }
 
diff --git a/apps/openmw/mwphysics/contacttestresultcallback.cpp b/apps/openmw/mwphysics/contacttestresultcallback.cpp
index 5829ee02f5..dae0a65af0 100644
--- a/apps/openmw/mwphysics/contacttestresultcallback.cpp
+++ b/apps/openmw/mwphysics/contacttestresultcallback.cpp
@@ -13,16 +13,16 @@ namespace MWPhysics
     {
     }
 
-    btScalar ContactTestResultCallback::addSingleResult(btManifoldPoint& cp,
-                                                        const btCollisionObjectWrapper* col0Wrap,int partId0,int index0,
-                                                        const btCollisionObjectWrapper* col1Wrap,int partId1,int index1)
+    btScalar ContactTestResultCallback::addSingleResult(btManifoldPoint& cp, const btCollisionObjectWrapper* col0Wrap,
+        int partId0, int index0, const btCollisionObjectWrapper* col1Wrap, int partId1, int index1)
     {
         const btCollisionObject* collisionObject = col0Wrap->m_collisionObject;
         if (collisionObject == mTestedAgainst)
             collisionObject = col1Wrap->m_collisionObject;
         PtrHolder* holder = static_cast<PtrHolder*>(collisionObject->getUserPointer());
         if (holder)
-            mResult.emplace_back(ContactPoint{holder->getPtr(), Misc::Convert::toOsg(cp.m_positionWorldOnB), Misc::Convert::toOsg(cp.m_normalWorldOnB)});
+            mResult.emplace_back(ContactPoint{ holder->getPtr(), Misc::Convert::toOsg(cp.m_positionWorldOnB),
+                Misc::Convert::toOsg(cp.m_normalWorldOnB) });
         return 0.f;
     }
 
diff --git a/apps/openmw/mwphysics/contacttestresultcallback.hpp b/apps/openmw/mwphysics/contacttestresultcallback.hpp
index 3d1b3b8aab..ae900e0208 100644
--- a/apps/openmw/mwphysics/contacttestresultcallback.hpp
+++ b/apps/openmw/mwphysics/contacttestresultcallback.hpp
@@ -19,9 +19,8 @@ namespace MWPhysics
     public:
         ContactTestResultCallback(const btCollisionObject* testedAgainst);
 
-        btScalar addSingleResult(btManifoldPoint& cp,
-                                         const btCollisionObjectWrapper* col0Wrap,int partId0,int index0,
-                                         const btCollisionObjectWrapper* col1Wrap,int partId1,int index1) override;
+        btScalar addSingleResult(btManifoldPoint& cp, const btCollisionObjectWrapper* col0Wrap, int partId0, int index0,
+            const btCollisionObjectWrapper* col1Wrap, int partId1, int index1) override;
 
         std::vector<ContactPoint> mResult;
     };
diff --git a/apps/openmw/mwphysics/contacttestwrapper.cpp b/apps/openmw/mwphysics/contacttestwrapper.cpp
index c11a7e2926..d5da9e67e3 100644
--- a/apps/openmw/mwphysics/contacttestwrapper.cpp
+++ b/apps/openmw/mwphysics/contacttestwrapper.cpp
@@ -6,13 +6,15 @@ namespace MWPhysics
 {
     // Concurrent calls to contactPairTest (and by extension contactTest) are forbidden.
     static std::mutex contactMutex;
-    void ContactTestWrapper::contactTest(btCollisionWorld* collisionWorld, btCollisionObject* colObj, btCollisionWorld::ContactResultCallback& resultCallback)
+    void ContactTestWrapper::contactTest(btCollisionWorld* collisionWorld, btCollisionObject* colObj,
+        btCollisionWorld::ContactResultCallback& resultCallback)
     {
         std::unique_lock lock(contactMutex);
         collisionWorld->contactTest(colObj, resultCallback);
     }
 
-    void ContactTestWrapper::contactPairTest(btCollisionWorld* collisionWorld, btCollisionObject* colObjA, btCollisionObject* colObjB, btCollisionWorld::ContactResultCallback& resultCallback)
+    void ContactTestWrapper::contactPairTest(btCollisionWorld* collisionWorld, btCollisionObject* colObjA,
+        btCollisionObject* colObjB, btCollisionWorld::ContactResultCallback& resultCallback)
     {
         std::unique_lock lock(contactMutex);
         collisionWorld->contactPairTest(colObjA, colObjB, resultCallback);
diff --git a/apps/openmw/mwphysics/contacttestwrapper.h b/apps/openmw/mwphysics/contacttestwrapper.h
index b3b6edc59a..6a53f9ae27 100644
--- a/apps/openmw/mwphysics/contacttestwrapper.h
+++ b/apps/openmw/mwphysics/contacttestwrapper.h
@@ -7,8 +7,10 @@ namespace MWPhysics
 {
     struct ContactTestWrapper
     {
-        static void contactTest(btCollisionWorld* collisionWorld, btCollisionObject* colObj, btCollisionWorld::ContactResultCallback& resultCallback);
-        static void contactPairTest(btCollisionWorld* collisionWorld, btCollisionObject* colObjA, btCollisionObject* colObjB, btCollisionWorld::ContactResultCallback& resultCallback);
+        static void contactTest(btCollisionWorld* collisionWorld, btCollisionObject* colObj,
+            btCollisionWorld::ContactResultCallback& resultCallback);
+        static void contactPairTest(btCollisionWorld* collisionWorld, btCollisionObject* colObjA,
+            btCollisionObject* colObjB, btCollisionWorld::ContactResultCallback& resultCallback);
     };
 }
 #endif
diff --git a/apps/openmw/mwphysics/deepestnotmecontacttestresultcallback.cpp b/apps/openmw/mwphysics/deepestnotmecontacttestresultcallback.cpp
index 3531cc8eb8..773eaf7ff1 100644
--- a/apps/openmw/mwphysics/deepestnotmecontacttestresultcallback.cpp
+++ b/apps/openmw/mwphysics/deepestnotmecontacttestresultcallback.cpp
@@ -12,26 +12,31 @@
 namespace MWPhysics
 {
 
-    DeepestNotMeContactTestResultCallback::DeepestNotMeContactTestResultCallback(const btCollisionObject* me, const std::vector<const btCollisionObject*>& targets, const btVector3 &origin)
-    : mMe(me), mTargets(targets), mOrigin(origin), mLeastDistSqr(std::numeric_limits<float>::max())
+    DeepestNotMeContactTestResultCallback::DeepestNotMeContactTestResultCallback(
+        const btCollisionObject* me, const std::vector<const btCollisionObject*>& targets, const btVector3& origin)
+        : mMe(me)
+        , mTargets(targets)
+        , mOrigin(origin)
+        , mLeastDistSqr(std::numeric_limits<float>::max())
     {
     }
 
     btScalar DeepestNotMeContactTestResultCallback::addSingleResult(btManifoldPoint& cp,
-                                                                    const btCollisionObjectWrapper* col0Wrap,int partId0,int index0,
-                                                                    const btCollisionObjectWrapper* col1Wrap,int partId1,int index1)
+        const btCollisionObjectWrapper* col0Wrap, int partId0, int index0, const btCollisionObjectWrapper* col1Wrap,
+        int partId1, int index1)
     {
         const btCollisionObject* collisionObject = col1Wrap->m_collisionObject;
         if (collisionObject != mMe)
         {
-            if (collisionObject->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Actor && !mTargets.empty())
+            if (collisionObject->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Actor
+                && !mTargets.empty())
             {
                 if ((std::find(mTargets.begin(), mTargets.end(), collisionObject) == mTargets.end()))
                     return 0.f;
             }
 
             btScalar distsqr = mOrigin.distance2(cp.getPositionWorldOnA());
-            if(!mObject || distsqr < mLeastDistSqr)
+            if (!mObject || distsqr < mLeastDistSqr)
             {
                 mObject = collisionObject;
                 mLeastDistSqr = distsqr;
diff --git a/apps/openmw/mwphysics/deepestnotmecontacttestresultcallback.hpp b/apps/openmw/mwphysics/deepestnotmecontacttestresultcallback.hpp
index 00cb5c01f7..d22a79e643 100644
--- a/apps/openmw/mwphysics/deepestnotmecontacttestresultcallback.hpp
+++ b/apps/openmw/mwphysics/deepestnotmecontacttestresultcallback.hpp
@@ -18,16 +18,16 @@ namespace MWPhysics
         btVector3 mOrigin;
 
     public:
-        const btCollisionObject *mObject{nullptr};
-        btVector3 mContactPoint{0,0,0};
-        btVector3 mContactNormal{0,0,0};
+        const btCollisionObject* mObject{ nullptr };
+        btVector3 mContactPoint{ 0, 0, 0 };
+        btVector3 mContactNormal{ 0, 0, 0 };
         btScalar mLeastDistSqr;
 
-        DeepestNotMeContactTestResultCallback(const btCollisionObject* me, const std::vector<const btCollisionObject*>& targets, const btVector3 &origin);
+        DeepestNotMeContactTestResultCallback(
+            const btCollisionObject* me, const std::vector<const btCollisionObject*>& targets, const btVector3& origin);
 
-        btScalar addSingleResult(btManifoldPoint& cp,
-                                         const btCollisionObjectWrapper* col0Wrap,int partId0,int index0,
-                                         const btCollisionObjectWrapper* col1Wrap,int partId1,int index1) override;
+        btScalar addSingleResult(btManifoldPoint& cp, const btCollisionObjectWrapper* col0Wrap, int partId0, int index0,
+            const btCollisionObjectWrapper* col1Wrap, int partId1, int index1) override;
     };
 }
 
diff --git a/apps/openmw/mwphysics/hasspherecollisioncallback.hpp b/apps/openmw/mwphysics/hasspherecollisioncallback.hpp
index 34666e534c..c1fa0ad1ee 100644
--- a/apps/openmw/mwphysics/hasspherecollisioncallback.hpp
+++ b/apps/openmw/mwphysics/hasspherecollisioncallback.hpp
@@ -1,23 +1,20 @@
 #ifndef OPENMW_MWPHYSICS_HASSPHERECOLLISIONCALLBACK_H
 #define OPENMW_MWPHYSICS_HASSPHERECOLLISIONCALLBACK_H
 
-#include <LinearMath/btVector3.h>
-#include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 #include <BulletCollision/BroadphaseCollision/btBroadphaseInterface.h>
+#include <BulletCollision/CollisionDispatch/btCollisionObject.h>
+#include <LinearMath/btVector3.h>
 
 #include <algorithm>
 
 namespace MWPhysics
 {
     // https://developer.mozilla.org/en-US/docs/Games/Techniques/3D_collision_detection
-    bool testAabbAgainstSphere(const btVector3& aabbMin, const btVector3& aabbMax,
-        const btVector3& position, const btScalar radius)
+    bool testAabbAgainstSphere(
+        const btVector3& aabbMin, const btVector3& aabbMax, const btVector3& position, const btScalar radius)
     {
-        const btVector3 nearest(
-            std::clamp(position.x(), aabbMin.x(), aabbMax.x()),
-            std::clamp(position.y(), aabbMin.y(), aabbMax.y()),
-            std::clamp(position.z(), aabbMin.z(), aabbMax.z())
-        );
+        const btVector3 nearest(std::clamp(position.x(), aabbMin.x(), aabbMax.x()),
+            std::clamp(position.y(), aabbMin.y(), aabbMax.y()), std::clamp(position.z(), aabbMin.z(), aabbMax.z()));
         return nearest.distance(position) < radius;
     }
 
@@ -26,13 +23,13 @@ namespace MWPhysics
     {
     public:
         HasSphereCollisionCallback(const btVector3& position, const btScalar radius, const int mask, const int group,
-                                   const Ignore& ignore, OnCollision* onCollision)
-            : mPosition(position),
-              mRadius(radius),
-              mIgnore(ignore),
-              mCollisionFilterMask(mask),
-              mCollisionFilterGroup(group),
-              mOnCollision(onCollision)
+            const Ignore& ignore, OnCollision* onCollision)
+            : mPosition(position)
+            , mRadius(radius)
+            , mIgnore(ignore)
+            , mCollisionFilterMask(mask)
+            , mCollisionFilterGroup(group)
+            , mOnCollision(onCollision)
         {
         }
 
@@ -41,8 +38,7 @@ namespace MWPhysics
             if (mResult && mOnCollision == nullptr)
                 return false;
             const auto collisionObject = static_cast<btCollisionObject*>(proxy->m_clientObject);
-            if (mIgnore(collisionObject)
-                || !needsCollision(*proxy)
+            if (mIgnore(collisionObject) || !needsCollision(*proxy)
                 || !testAabbAgainstSphere(proxy->m_aabbMin, proxy->m_aabbMax, mPosition, mRadius))
                 return true;
             mResult = true;
@@ -54,10 +50,7 @@ namespace MWPhysics
             return !mResult;
         }
 
-        bool getResult() const
-        {
-            return mResult;
-        }
+        bool getResult() const { return mResult; }
 
     private:
         btVector3 mPosition;
diff --git a/apps/openmw/mwphysics/heightfield.cpp b/apps/openmw/mwphysics/heightfield.cpp
index d363ddef11..4ec8dda881 100644
--- a/apps/openmw/mwphysics/heightfield.cpp
+++ b/apps/openmw/mwphysics/heightfield.cpp
@@ -5,8 +5,8 @@
 
 #include <osg/Object>
 
-#include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
+#include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 
 #include <LinearMath/btTransform.h>
 
@@ -53,7 +53,7 @@ namespace
 namespace MWPhysics
 {
     HeightField::HeightField(const float* heights, int x, int y, int size, int verts, float minH, float maxH,
-                             const osg::Object* holdObject, PhysicsTaskScheduler* scheduler)
+        const osg::Object* holdObject, PhysicsTaskScheduler* scheduler)
         : mHoldObject(holdObject)
 #if BT_BULLET_VERSION < 310
         , mHeights(makeHeights(heights, verts))
@@ -62,15 +62,9 @@ namespace MWPhysics
     {
 #if BT_BULLET_VERSION < 310
         mShape = std::make_unique<btHeightfieldTerrainShape>(
-            verts, verts,
-            getHeights(heights, mHeights),
-            1,
-            minH, maxH, 2,
-            PHY_FLOAT, false
-        );
+            verts, verts, getHeights(heights, mHeights), 1, minH, maxH, 2, PHY_FLOAT, false);
 #else
-        mShape = std::make_unique<btHeightfieldTerrainShape>(
-            verts, verts, heights, minH, maxH, 2, false);
+        mShape = std::make_unique<btHeightfieldTerrainShape>(verts, verts, heights, minH, maxH, 2, false);
 #endif
         mShape->setUseDiamondSubdivision(true);
 
@@ -86,13 +80,14 @@ namespace MWPhysics
         mShape->buildAccelerator();
 #endif
 
-        const btTransform transform(btQuaternion::getIdentity(),
-                                    BulletHelpers::getHeightfieldShift(x, y, size, minH, maxH));
+        const btTransform transform(
+            btQuaternion::getIdentity(), BulletHelpers::getHeightfieldShift(x, y, size, minH, maxH));
 
         mCollisionObject = std::make_unique<btCollisionObject>();
         mCollisionObject->setCollisionShape(mShape.get());
         mCollisionObject->setWorldTransform(transform);
-        mTaskScheduler->addCollisionObject(mCollisionObject.get(), CollisionType_HeightMap, CollisionType_Actor|CollisionType_Projectile);
+        mTaskScheduler->addCollisionObject(
+            mCollisionObject.get(), CollisionType_HeightMap, CollisionType_Actor | CollisionType_Projectile);
     }
 
     HeightField::~HeightField()
diff --git a/apps/openmw/mwphysics/heightfield.hpp b/apps/openmw/mwphysics/heightfield.hpp
index c320225258..a54685fda1 100644
--- a/apps/openmw/mwphysics/heightfield.hpp
+++ b/apps/openmw/mwphysics/heightfield.hpp
@@ -24,7 +24,7 @@ namespace MWPhysics
     {
     public:
         HeightField(const float* heights, int x, int y, int size, int verts, float minH, float maxH,
-                    const osg::Object* holdObject, PhysicsTaskScheduler* scheduler);
+            const osg::Object* holdObject, PhysicsTaskScheduler* scheduler);
         ~HeightField();
 
         btCollisionObject* getCollisionObject();
diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index da07d5975b..58d50cd2ed 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -8,8 +8,8 @@
 #include <components/esm3/loadgmst.hpp>
 #include <components/misc/convert.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
@@ -29,7 +29,7 @@
 
 namespace MWPhysics
 {
-    static bool isActor(const btCollisionObject *obj)
+    static bool isActor(const btCollisionObject* obj)
     {
         assert(obj);
         return obj->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Actor;
@@ -38,17 +38,20 @@ namespace MWPhysics
     class ContactCollectionCallback : public btCollisionWorld::ContactResultCallback
     {
     public:
-        ContactCollectionCallback(const btCollisionObject * me, osg::Vec3f velocity) : mMe(me)
+        ContactCollectionCallback(const btCollisionObject* me, osg::Vec3f velocity)
+            : mMe(me)
         {
             m_collisionFilterGroup = me->getBroadphaseHandle()->m_collisionFilterGroup;
             m_collisionFilterMask = me->getBroadphaseHandle()->m_collisionFilterMask & ~CollisionType_Projectile;
             mVelocity = Misc::Convert::toBullet(velocity);
         }
-        btScalar addSingleResult(btManifoldPoint & contact, const btCollisionObjectWrapper * colObj0Wrap, int partId0, int index0, const btCollisionObjectWrapper * colObj1Wrap, int partId1, int index1) override
+        btScalar addSingleResult(btManifoldPoint& contact, const btCollisionObjectWrapper* colObj0Wrap, int partId0,
+            int index0, const btCollisionObjectWrapper* colObj1Wrap, int partId1, int index1) override
         {
             if (isActor(colObj0Wrap->getCollisionObject()) && isActor(colObj1Wrap->getCollisionObject()))
                 return 0.0;
-            // ignore overlap if we're moving in the same direction as it would push us out (don't change this to >=, that would break detection when not moving)
+            // ignore overlap if we're moving in the same direction as it would push us out (don't change this to >=,
+            // that would break detection when not moving)
             if (contact.m_normalWorldOnB.dot(mVelocity) > 0.0)
                 return 0.0;
             auto delta = contact.m_normalWorldOnB * -contact.m_distance1;
@@ -71,21 +74,22 @@ namespace MWPhysics
         btScalar mMaxX = 0.0;
         btScalar mMaxY = 0.0;
         btScalar mMaxZ = 0.0;
-        btVector3 mContactSum{0.0, 0.0, 0.0};
-        btVector3 mNormal{0.0, 0.0, 0.0}; // points towards "me"
-        btVector3 mDelta{0.0, 0.0, 0.0}; // points towards "me"
+        btVector3 mContactSum{ 0.0, 0.0, 0.0 };
+        btVector3 mNormal{ 0.0, 0.0, 0.0 }; // points towards "me"
+        btVector3 mDelta{ 0.0, 0.0, 0.0 }; // points towards "me"
         btScalar mDistance = 0.0; // negative or zero
     protected:
         btVector3 mVelocity;
-        const btCollisionObject * mMe;
+        const btCollisionObject* mMe;
     };
 
-    osg::Vec3f MovementSolver::traceDown(const MWWorld::Ptr &ptr, const osg::Vec3f& position, Actor* actor, btCollisionWorld* collisionWorld, float maxHeight)
+    osg::Vec3f MovementSolver::traceDown(const MWWorld::Ptr& ptr, const osg::Vec3f& position, Actor* actor,
+        btCollisionWorld* collisionWorld, float maxHeight)
     {
         osg::Vec3f offset = actor->getCollisionObjectPosition() - ptr.getRefData().getPosition().asVec3();
 
         ActorTracer tracer;
-        tracer.findGround(actor, position + offset, position + offset - osg::Vec3f(0,0,maxHeight), collisionWorld);
+        tracer.findGround(actor, position + offset, position + offset - osg::Vec3f(0, 0, maxHeight), collisionWorld);
         if (tracer.mFraction >= 1.0f)
         {
             actor->setOnGround(false);
@@ -98,16 +102,17 @@ namespace MWPhysics
         // Required for some broken door destinations in Morrowind.esm, where the spawn point
         // intersects with other geometry if the actor's base is taken into account
         btVector3 from = Misc::Convert::toBullet(position);
-        btVector3 to = from - btVector3(0,0,maxHeight);
+        btVector3 to = from - btVector3(0, 0, maxHeight);
 
         btCollisionWorld::ClosestRayResultCallback resultCallback1(from, to);
         resultCallback1.m_collisionFilterGroup = CollisionType_AnyPhysical;
-        resultCallback1.m_collisionFilterMask = CollisionType_World|CollisionType_HeightMap;
+        resultCallback1.m_collisionFilterMask = CollisionType_World | CollisionType_HeightMap;
 
         collisionWorld->rayTest(from, to, resultCallback1);
 
-        if (resultCallback1.hasHit() && ((Misc::Convert::toOsg(resultCallback1.m_hitPointWorld) - tracer.mEndPos + offset).length2() > 35*35
-            || !isWalkableSlope(tracer.mPlaneNormal)))
+        if (resultCallback1.hasHit()
+            && ((Misc::Convert::toOsg(resultCallback1.m_hitPointWorld) - tracer.mEndPos + offset).length2() > 35 * 35
+                || !isWalkableSlope(tracer.mPlaneNormal)))
         {
             actor->setOnSlope(!isWalkableSlope(resultCallback1.m_hitNormalWorld));
             return Misc::Convert::toOsg(resultCallback1.m_hitPointWorld) + osg::Vec3f(0.f, 0.f, sGroundOffset);
@@ -115,27 +120,28 @@ namespace MWPhysics
 
         actor->setOnSlope(!isWalkableSlope(tracer.mPlaneNormal));
 
-        return tracer.mEndPos-offset + osg::Vec3f(0.f, 0.f, sGroundOffset);
+        return tracer.mEndPos - offset + osg::Vec3f(0.f, 0.f, sGroundOffset);
     }
 
-    void MovementSolver::move(ActorFrameData& actor, float time, const btCollisionWorld* collisionWorld,
-                                           const WorldFrameData& worldData)
+    void MovementSolver::move(
+        ActorFrameData& actor, float time, const btCollisionWorld* collisionWorld, const WorldFrameData& worldData)
     {
         // Reset per-frame data
         actor.mWalkingOnWater = false;
         // Anything to collide with?
-        if(actor.mSkipCollisionDetection)
+        if (actor.mSkipCollisionDetection)
         {
-            actor.mPosition += (osg::Quat(actor.mRotation.x(), osg::Vec3f(-1, 0, 0)) *
-                                osg::Quat(actor.mRotation.y(), osg::Vec3f(0, 0, -1))
-                                ) * actor.mMovement * time;
+            actor.mPosition += (osg::Quat(actor.mRotation.x(), osg::Vec3f(-1, 0, 0))
+                                   * osg::Quat(actor.mRotation.y(), osg::Vec3f(0, 0, -1)))
+                * actor.mMovement * time;
             return;
         }
 
         // Adjust for collision mesh offset relative to actor's "location"
-        // (doTrace doesn't take local/interior collision shape translation into account, so we have to do it on our own)
-        // for compatibility with vanilla assets, we have to derive this from the vertical half extent instead of from internal hull translation
-        // if not for this hack, the "correct" collision hull position would be physicActor->getScaledMeshTranslation()
+        // (doTrace doesn't take local/interior collision shape translation into account, so we have to do it on our
+        // own) for compatibility with vanilla assets, we have to derive this from the vertical half extent instead of
+        // from internal hull translation if not for this hack, the "correct" collision hull position would be
+        // physicActor->getScaledMeshTranslation()
         actor.mPosition.z() += actor.mHalfExtentsZ; // vanilla-accurate
 
         float swimlevel = actor.mSwimLevel + actor.mHalfExtentsZ;
@@ -148,18 +154,20 @@ namespace MWPhysics
         // if the CharacterController tells us to do so
         if (actor.mMovement.z() > 0 && actor.mInert && actor.mPosition.z() < swimlevel)
         {
-            velocity = osg::Vec3f(0,0,1) * 25;
+            velocity = osg::Vec3f(0, 0, 1) * 25;
         }
         else if (actor.mPosition.z() < swimlevel || actor.mFlying)
         {
-            velocity = (osg::Quat(actor.mRotation.x(), osg::Vec3f(-1, 0, 0)) * osg::Quat(actor.mRotation.y(), osg::Vec3f(0, 0, -1))) * actor.mMovement;
+            velocity = (osg::Quat(actor.mRotation.x(), osg::Vec3f(-1, 0, 0))
+                           * osg::Quat(actor.mRotation.y(), osg::Vec3f(0, 0, -1)))
+                * actor.mMovement;
         }
         else
         {
             velocity = (osg::Quat(actor.mRotation.y(), osg::Vec3f(0, 0, -1))) * actor.mMovement;
 
             if ((velocity.z() > 0.f && actor.mIsOnGround && !actor.mIsOnSlope)
-            || (velocity.z() > 0.f && velocity.z() + actor.mInertia.z() <= -velocity.z() && actor.mIsOnSlope))
+                || (velocity.z() > 0.f && velocity.z() + actor.mInertia.z() <= -velocity.z() && actor.mIsOnSlope))
                 actor.mInertia = velocity;
             else if (!actor.mIsOnGround || actor.mIsOnSlope)
                 velocity = velocity + actor.mInertia;
@@ -169,9 +177,15 @@ namespace MWPhysics
         if (worldData.mIsInStorm && velocity.length() > 0)
         {
             osg::Vec3f stormDirection = worldData.mStormDirection;
-            float angleDegrees = osg::RadiansToDegrees(std::acos(stormDirection * velocity / (stormDirection.length() * velocity.length())));
-            static const float fStromWalkMult = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fStromWalkMult")->mValue.getFloat();
-            velocity *= 1.f-(fStromWalkMult * (angleDegrees/180.f));
+            float angleDegrees = osg::RadiansToDegrees(
+                std::acos(stormDirection * velocity / (stormDirection.length() * velocity.length())));
+            static const float fStromWalkMult = MWBase::Environment::get()
+                                                    .getWorld()
+                                                    ->getStore()
+                                                    .get<ESM::GameSetting>()
+                                                    .find("fStromWalkMult")
+                                                    ->mValue.getFloat();
+            velocity *= 1.f - (fStromWalkMult * (angleDegrees / 180.f));
         }
 
         Stepper stepper(collisionWorld, actor.mCollisionObject);
@@ -181,12 +195,12 @@ namespace MWPhysics
          * A loop to find newPosition using tracer, if successful different from the starting position.
          * nextpos is the local variable used to find potential newPosition, using velocity and remainingTime
          * The initial velocity was set earlier (see above).
-        */
+         */
         float remainingTime = time;
 
         int numTimesSlid = 0;
-        osg::Vec3f lastSlideNormal(0,0,1);
-        osg::Vec3f lastSlideNormalFallback(0,0,1);
+        osg::Vec3f lastSlideNormal(0, 0, 1);
+        osg::Vec3f lastSlideNormalFallback(0, 0, 1);
         bool forceGroundTest = false;
 
         for (int iterations = 0; iterations < sMaxIterations && remainingTime > 0.0001f; ++iterations)
@@ -195,21 +209,21 @@ namespace MWPhysics
             bool underwater = newPosition.z() < swimlevel;
 
             // If not able to fly, don't allow to swim up into the air
-            if(!actor.mFlying && nextpos.z() > swimlevel && underwater)
+            if (!actor.mFlying && nextpos.z() > swimlevel && underwater)
             {
-                const osg::Vec3f down(0,0,-1);
+                const osg::Vec3f down(0, 0, -1);
                 velocity = reject(velocity, down);
                 // NOTE: remainingTime is unchanged before the loop continues
                 continue; // velocity updated, calculate nextpos again
             }
 
-            if((newPosition - nextpos).length2() > 0.0001)
+            if ((newPosition - nextpos).length2() > 0.0001)
             {
                 // trace to where character would go if there were no obstructions
                 tracer.doTrace(actor.mCollisionObject, newPosition, nextpos, collisionWorld, actor.mIsOnGround);
 
                 // check for obstructions
-                if(tracer.mFraction >= 1.0f)
+                if (tracer.mFraction >= 1.0f)
                 {
                     newPosition = tracer.mEndPos; // ok to move, so set newPosition
                     break;
@@ -227,7 +241,8 @@ namespace MWPhysics
                 break;
             }
 
-            bool seenGround = !actor.mFlying && !underwater && ((actor.mIsOnGround && !actor.mIsOnSlope) || isWalkableSlope(tracer.mPlaneNormal));
+            bool seenGround = !actor.mFlying && !underwater
+                && ((actor.mIsOnGround && !actor.mIsOnSlope) || isWalkableSlope(tracer.mPlaneNormal));
 
             // We hit something. Check if we can step up.
             float hitHeight = tracer.mHitPoint.z() - tracer.mEndPos.z() + actor.mHalfExtentsZ;
@@ -243,13 +258,13 @@ namespace MWPhysics
             {
                 if (actor.mIsAquatic && newPosition.z() + actor.mHalfExtentsZ > actor.mWaterlevel)
                     newPosition = oldPosition;
-                else if(!actor.mFlying && actor.mPosition.z() >= swimlevel)
+                else if (!actor.mFlying && actor.mPosition.z() >= swimlevel)
                     forceGroundTest = true;
             }
             else
             {
                 // Can't step up, so slide against what we ran into
-                remainingTime *= (1.0f-tracer.mFraction);
+                remainingTime *= (1.0f - tracer.mFraction);
 
                 auto planeNormal = tracer.mPlaneNormal;
                 // need to know the unadjusted normal to handle certain types of seams properly
@@ -257,7 +272,8 @@ namespace MWPhysics
 
                 // If we touched the ground this frame, and whatever we ran into is a wall of some sort,
                 // pretend that its collision normal is pointing horizontally
-                // (fixes snagging on slightly downward-facing walls, and crawling up the bases of very steep walls because of the collision margin)
+                // (fixes snagging on slightly downward-facing walls, and crawling up the bases of very steep walls
+                // because of the collision margin)
                 if (seenGround && !isWalkableSlope(planeNormal) && planeNormal.z() != 0)
                 {
                     planeNormal.z() = 0;
@@ -265,37 +281,39 @@ namespace MWPhysics
                 }
 
                 // Move up to what we ran into (with a bit of a collision margin)
-                if ((newPosition-tracer.mEndPos).length2() > sCollisionMargin*sCollisionMargin)
+                if ((newPosition - tracer.mEndPos).length2() > sCollisionMargin * sCollisionMargin)
                 {
                     auto direction = velocity;
                     direction.normalize();
                     newPosition = tracer.mEndPos;
-                    newPosition -= direction*sCollisionMargin;
+                    newPosition -= direction * sCollisionMargin;
                 }
 
                 osg::Vec3f newVelocity = (velocity * planeNormal <= 0.0) ? reject(velocity, planeNormal) : velocity;
                 bool usedSeamLogic = false;
 
-                // check for the current and previous collision planes forming an acute angle; slide along the seam if they do
-                // for this, we want to use the original plane normal, or else certain types of geometry will snag
-                if(numTimesSlid > 0)
+                // check for the current and previous collision planes forming an acute angle; slide along the seam if
+                // they do for this, we want to use the original plane normal, or else certain types of geometry will
+                // snag
+                if (numTimesSlid > 0)
                 {
                     auto dotA = lastSlideNormal * origPlaneNormal;
                     auto dotB = lastSlideNormalFallback * origPlaneNormal;
-                    if(numTimesSlid <= 1) // ignore fallback normal if this is only the first or second slide
+                    if (numTimesSlid <= 1) // ignore fallback normal if this is only the first or second slide
                         dotB = 1.0;
-                    if(dotA <= 0.0 || dotB <= 0.0)
+                    if (dotA <= 0.0 || dotB <= 0.0)
                     {
                         osg::Vec3f bestNormal = lastSlideNormal;
-                        // use previous-to-previous collision plane if it's acute with current plane but actual previous plane isn't
-                        if(dotB < dotA)
+                        // use previous-to-previous collision plane if it's acute with current plane but actual previous
+                        // plane isn't
+                        if (dotB < dotA)
                         {
                             bestNormal = lastSlideNormalFallback;
                             lastSlideNormal = lastSlideNormalFallback;
                         }
 
                         auto constraintVector = bestNormal ^ origPlaneNormal; // cross product
-                        if(constraintVector.length2() > 0) // only if it's not zero length
+                        if (constraintVector.length2() > 0) // only if it's not zero length
                         {
                             constraintVector.normalize();
                             newVelocity = project(velocity, constraintVector);
@@ -303,8 +321,9 @@ namespace MWPhysics
                             // version of surface rejection for acute crevices/seams
                             auto averageNormal = bestNormal + origPlaneNormal;
                             averageNormal.normalize();
-                            tracer.doTrace(actor.mCollisionObject, newPosition, newPosition + averageNormal*(sCollisionMargin*2.0), collisionWorld);
-                            newPosition = (newPosition + tracer.mEndPos)/2.0;
+                            tracer.doTrace(actor.mCollisionObject, newPosition,
+                                newPosition + averageNormal * (sCollisionMargin * 2.0), collisionWorld);
+                            newPosition = (newPosition + tracer.mEndPos) / 2.0;
 
                             usedSeamLogic = true;
                         }
@@ -313,13 +332,14 @@ namespace MWPhysics
                 // otherwise just keep the normal vector rejection
 
                 // move away from the collision plane slightly, if possible
-                // this reduces getting stuck in some concave geometry, like the gaps above the railings in some ald'ruhn buildings
-                // this is different from the normal collision margin, because the normal collision margin is along the movement path,
-                // but this is along the collision normal
-                if(!usedSeamLogic)
+                // this reduces getting stuck in some concave geometry, like the gaps above the railings in some
+                // ald'ruhn buildings this is different from the normal collision margin, because the normal collision
+                // margin is along the movement path, but this is along the collision normal
+                if (!usedSeamLogic)
                 {
-                    tracer.doTrace(actor.mCollisionObject, newPosition, newPosition + planeNormal*(sCollisionMargin*2.0), collisionWorld);
-                    newPosition = (newPosition + tracer.mEndPos)/2.0;
+                    tracer.doTrace(actor.mCollisionObject, newPosition,
+                        newPosition + planeNormal * (sCollisionMargin * 2.0), collisionWorld);
+                    newPosition = (newPosition + tracer.mEndPos) / 2.0;
                 }
 
                 // short circuit if we went backwards, but only if it was mostly horizontal and we're on the ground
@@ -336,10 +356,10 @@ namespace MWPhysics
 
                 // Do not allow sliding up steep slopes if there is gravity.
                 // The purpose of this is to prevent air control from letting you slide up tall, unwalkable slopes.
-                // For that purpose, it is not necessary to do it when trying to slide along acute seams/crevices (i.e. usedSeamLogic)
-                // and doing so would actually break air control in some situations where vanilla allows air control.
-                // Vanilla actually allows you to slide up slopes as long as you're in the "walking" animation, which can be true even
-                // in the air, so allowing this for seams isn't a compatibility break.
+                // For that purpose, it is not necessary to do it when trying to slide along acute seams/crevices (i.e.
+                // usedSeamLogic) and doing so would actually break air control in some situations where vanilla allows
+                // air control. Vanilla actually allows you to slide up slopes as long as you're in the "walking"
+                // animation, which can be true even in the air, so allowing this for seams isn't a compatibility break.
                 if (newPosition.z() >= swimlevel && !actor.mFlying && !isWalkableSlope(planeNormal) && !usedSeamLogic)
                     newVelocity.z() = std::min(newVelocity.z(), velocity.z());
 
@@ -355,10 +375,10 @@ namespace MWPhysics
         if (forceGroundTest || (actor.mInertia.z() <= 0.f && newPosition.z() >= swimlevel))
         {
             osg::Vec3f from = newPosition;
-            auto dropDistance = 2*sGroundOffset + (actor.mIsOnGround ? sStepSizeDown : 0);
-            osg::Vec3f to = newPosition - osg::Vec3f(0,0,dropDistance);
+            auto dropDistance = 2 * sGroundOffset + (actor.mIsOnGround ? sStepSizeDown : 0);
+            osg::Vec3f to = newPosition - osg::Vec3f(0, 0, dropDistance);
             tracer.doTrace(actor.mCollisionObject, from, to, collisionWorld, actor.mIsOnGround);
-            if(tracer.mFraction < 1.0f)
+            if (tracer.mFraction < 1.0f)
             {
                 if (!isActor(tracer.mHitObject))
                 {
@@ -370,41 +390,45 @@ namespace MWPhysics
                         actor.mWalkingOnWater = true;
                     if (!actor.mFlying && !isOnSlope)
                     {
-                        if (tracer.mFraction*dropDistance > sGroundOffset)
+                        if (tracer.mFraction * dropDistance > sGroundOffset)
                             newPosition.z() = tracer.mEndPos.z() + sGroundOffset;
                         else
                         {
                             newPosition.z() = tracer.mEndPos.z();
-                            tracer.doTrace(actor.mCollisionObject, newPosition, newPosition + osg::Vec3f(0, 0, 2*sGroundOffset), collisionWorld);
-                            newPosition = (newPosition+tracer.mEndPos)/2.0;
+                            tracer.doTrace(actor.mCollisionObject, newPosition,
+                                newPosition + osg::Vec3f(0, 0, 2 * sGroundOffset), collisionWorld);
+                            newPosition = (newPosition + tracer.mEndPos) / 2.0;
                         }
                     }
                 }
                 else
                 {
                     // Vanilla allows actors to float on top of other actors. Do not push them off.
-                    if (!actor.mFlying && isWalkableSlope(tracer.mPlaneNormal) && tracer.mEndPos.z()+sGroundOffset <= newPosition.z())
+                    if (!actor.mFlying && isWalkableSlope(tracer.mPlaneNormal)
+                        && tracer.mEndPos.z() + sGroundOffset <= newPosition.z())
                         newPosition.z() = tracer.mEndPos.z() + sGroundOffset;
 
                     isOnGround = false;
                 }
             }
-            // forcibly treat stuck actors as if they're on flat ground because buggy collisions when inside of things can/will break ground detection
-            if(actor.mStuckFrames > 0)
+            // forcibly treat stuck actors as if they're on flat ground because buggy collisions when inside of things
+            // can/will break ground detection
+            if (actor.mStuckFrames > 0)
             {
                 isOnGround = true;
                 isOnSlope = false;
             }
         }
 
-        if((isOnGround && !isOnSlope) || newPosition.z() < swimlevel || actor.mFlying)
+        if ((isOnGround && !isOnSlope) || newPosition.z() < swimlevel || actor.mFlying)
             actor.mInertia = osg::Vec3f(0.f, 0.f, 0.f);
         else
         {
             actor.mInertia.z() -= time * Constants::GravityConst * Constants::UnitsPerMeter;
             if (actor.mInertia.z() < 0)
                 actor.mInertia.z() *= actor.mSlowFall;
-            if (actor.mSlowFall < 1.f) {
+            if (actor.mSlowFall < 1.f)
+            {
                 actor.mInertia.x() *= actor.mSlowFall;
                 actor.mInertia.y() *= actor.mSlowFall;
             }
@@ -425,55 +449,60 @@ namespace MWPhysics
         if (btFrom == btTo)
             return;
 
-        ProjectileConvexCallback resultCallback(projectile.mCaster, projectile.mCollisionObject, btFrom, btTo, projectile.mProjectile);
+        ProjectileConvexCallback resultCallback(
+            projectile.mCaster, projectile.mCollisionObject, btFrom, btTo, projectile.mProjectile);
         resultCallback.m_collisionFilterMask = CollisionType_AnyPhysical;
         resultCallback.m_collisionFilterGroup = CollisionType_Projectile;
 
         const btQuaternion btrot = btQuaternion::getIdentity();
-        btTransform from_ (btrot, btFrom);
-        btTransform to_ (btrot, btTo);
+        btTransform from_(btrot, btFrom);
+        btTransform to_(btrot, btTo);
 
         const btCollisionShape* shape = projectile.mCollisionObject->getCollisionShape();
         assert(shape->isConvex());
         collisionWorld->convexSweepTest(static_cast<const btConvexShape*>(shape), from_, to_, resultCallback);
 
-        projectile.mPosition = Misc::Convert::toOsg(projectile.mProjectile->isActive() ? btTo : resultCallback.m_hitPointWorld);
+        projectile.mPosition
+            = Misc::Convert::toOsg(projectile.mProjectile->isActive() ? btTo : resultCallback.m_hitPointWorld);
     }
 
     btVector3 addMarginToDelta(btVector3 delta)
     {
-        if(delta.length2() == 0.0)
+        if (delta.length2() == 0.0)
             return delta;
         return delta + delta.normalized() * sCollisionMargin;
     }
 
     void MovementSolver::unstuck(ActorFrameData& actor, const btCollisionWorld* collisionWorld)
     {
-        if(actor.mSkipCollisionDetection) // noclipping/tcl
+        if (actor.mSkipCollisionDetection) // noclipping/tcl
             return;
 
         auto tempPosition = actor.mPosition;
 
-        if(actor.mStuckFrames >= 10)
+        if (actor.mStuckFrames >= 10)
         {
-            if((actor.mLastStuckPosition - actor.mPosition).length2() < 100)
+            if ((actor.mLastStuckPosition - actor.mPosition).length2() < 100)
                 return;
             else
             {
                 actor.mStuckFrames = 0;
-                actor.mLastStuckPosition = {0, 0, 0};
+                actor.mLastStuckPosition = { 0, 0, 0 };
             }
         }
 
         // use vanilla-accurate collision hull position hack (do same hitbox offset hack as movement solver)
-        // if vanilla compatibility didn't matter, the "correct" collision hull position would be physicActor->getScaledMeshTranslation()
+        // if vanilla compatibility didn't matter, the "correct" collision hull position would be
+        // physicActor->getScaledMeshTranslation()
         const auto verticalHalfExtent = osg::Vec3f(0.0, 0.0, actor.mHalfExtentsZ);
 
         // use a 3d approximation of the movement vector to better judge player intent
-        auto velocity = (osg::Quat(actor.mRotation.x(), osg::Vec3f(-1, 0, 0)) * osg::Quat(actor.mRotation.y(), osg::Vec3f(0, 0, -1))) * actor.mMovement;
+        auto velocity = (osg::Quat(actor.mRotation.x(), osg::Vec3f(-1, 0, 0))
+                            * osg::Quat(actor.mRotation.y(), osg::Vec3f(0, 0, -1)))
+            * actor.mMovement;
         // try to pop outside of the world before doing anything else if we're inside of it
         if (!actor.mIsOnGround || actor.mIsOnSlope)
-                velocity += actor.mInertia;
+            velocity += actor.mInertia;
 
         // because of the internal collision box offset hack, and the fact that we're moving the collision box manually,
         // we need to replicate part of the collision box's transform process from scratch
@@ -482,59 +511,60 @@ namespace MWPhysics
         const btTransform oldTransform = actor.mCollisionObject->getWorldTransform();
         btTransform newTransform = oldTransform;
 
-        auto gatherContacts = [&](btVector3 newOffset) -> ContactCollectionCallback
-        {
+        auto gatherContacts = [&](btVector3 newOffset) -> ContactCollectionCallback {
             goodPosition = refPosition + Misc::Convert::toOsg(addMarginToDelta(newOffset));
             newTransform.setOrigin(Misc::Convert::toBullet(goodPosition));
             actor.mCollisionObject->setWorldTransform(newTransform);
 
-            ContactCollectionCallback callback{actor.mCollisionObject, velocity};
-            ContactTestWrapper::contactTest(const_cast<btCollisionWorld*>(collisionWorld), actor.mCollisionObject, callback);
+            ContactCollectionCallback callback{ actor.mCollisionObject, velocity };
+            ContactTestWrapper::contactTest(
+                const_cast<btCollisionWorld*>(collisionWorld), actor.mCollisionObject, callback);
             return callback;
         };
 
         // check whether we're inside the world with our collision box with manually-derived offset
-        auto contactCallback = gatherContacts({0.0, 0.0, 0.0});
-        if(contactCallback.mDistance < -sAllowedPenetration)
+        auto contactCallback = gatherContacts({ 0.0, 0.0, 0.0 });
+        if (contactCallback.mDistance < -sAllowedPenetration)
         {
             ++actor.mStuckFrames;
             actor.mLastStuckPosition = actor.mPosition;
             // we are; try moving it out of the world
             auto positionDelta = contactCallback.mContactSum;
             // limit rejection delta to the largest known individual rejections
-            if(std::abs(positionDelta.x()) > contactCallback.mMaxX)
+            if (std::abs(positionDelta.x()) > contactCallback.mMaxX)
                 positionDelta *= contactCallback.mMaxX / std::abs(positionDelta.x());
-            if(std::abs(positionDelta.y()) > contactCallback.mMaxY)
+            if (std::abs(positionDelta.y()) > contactCallback.mMaxY)
                 positionDelta *= contactCallback.mMaxY / std::abs(positionDelta.y());
-            if(std::abs(positionDelta.z()) > contactCallback.mMaxZ)
+            if (std::abs(positionDelta.z()) > contactCallback.mMaxZ)
                 positionDelta *= contactCallback.mMaxZ / std::abs(positionDelta.z());
 
             auto contactCallback2 = gatherContacts(positionDelta);
-            // successfully moved further out from contact (does not have to be in open space, just less inside of things)
-            if(contactCallback2.mDistance > contactCallback.mDistance)
+            // successfully moved further out from contact (does not have to be in open space, just less inside of
+            // things)
+            if (contactCallback2.mDistance > contactCallback.mDistance)
                 tempPosition = goodPosition - verticalHalfExtent;
             // try again but only upwards (fixes some bad coc floors)
             else
             {
                 // upwards-only offset
-                auto contactCallback3 = gatherContacts({0.0, 0.0, std::abs(positionDelta.z())});
+                auto contactCallback3 = gatherContacts({ 0.0, 0.0, std::abs(positionDelta.z()) });
                 // success
-                if(contactCallback3.mDistance > contactCallback.mDistance)
+                if (contactCallback3.mDistance > contactCallback.mDistance)
                     tempPosition = goodPosition - verticalHalfExtent;
                 else
                 // try again but fixed distance up
                 {
-                    auto contactCallback4 = gatherContacts({0.0, 0.0, 10.0});
+                    auto contactCallback4 = gatherContacts({ 0.0, 0.0, 10.0 });
                     // success
-                    if(contactCallback4.mDistance > contactCallback.mDistance)
+                    if (contactCallback4.mDistance > contactCallback.mDistance)
                         tempPosition = goodPosition - verticalHalfExtent;
                 }
             }
         }
         else
         {
-                actor.mStuckFrames = 0;
-                actor.mLastStuckPosition = {0, 0, 0};
+            actor.mStuckFrames = 0;
+            actor.mLastStuckPosition = { 0, 0, 0 };
         }
 
         actor.mCollisionObject->setWorldTransform(oldTransform);
diff --git a/apps/openmw/mwphysics/movementsolver.hpp b/apps/openmw/mwphysics/movementsolver.hpp
index 1bbe76cbec..15051f6f8d 100644
--- a/apps/openmw/mwphysics/movementsolver.hpp
+++ b/apps/openmw/mwphysics/movementsolver.hpp
@@ -17,19 +17,19 @@ namespace MWWorld
 namespace MWPhysics
 {
     /// Vector projection
-    static inline osg::Vec3f project(const osg::Vec3f& u, const osg::Vec3f &v)
+    static inline osg::Vec3f project(const osg::Vec3f& u, const osg::Vec3f& v)
     {
         return v * (u * v);
     }
 
     /// Vector rejection
-    static inline osg::Vec3f reject(const osg::Vec3f& direction, const osg::Vec3f &planeNormal)
+    static inline osg::Vec3f reject(const osg::Vec3f& direction, const osg::Vec3f& planeNormal)
     {
         return direction - project(direction, planeNormal);
     }
 
     template <class Vec3>
-    static bool isWalkableSlope(const Vec3 &normal)
+    static bool isWalkableSlope(const Vec3& normal)
     {
         static const float sMaxSlopeCos = std::cos(osg::DegreesToRadians(Constants::sMaxSlope));
         return (normal.z() > sMaxSlopeCos);
@@ -43,8 +43,10 @@ namespace MWPhysics
     class MovementSolver
     {
     public:
-        static osg::Vec3f traceDown(const MWWorld::Ptr &ptr, const osg::Vec3f& position, Actor* actor, btCollisionWorld* collisionWorld, float maxHeight);
-        static void move(ActorFrameData& actor, float time, const btCollisionWorld* collisionWorld, const WorldFrameData& worldData);
+        static osg::Vec3f traceDown(const MWWorld::Ptr& ptr, const osg::Vec3f& position, Actor* actor,
+            btCollisionWorld* collisionWorld, float maxHeight);
+        static void move(
+            ActorFrameData& actor, float time, const btCollisionWorld* collisionWorld, const WorldFrameData& worldData);
         static void move(ProjectileFrameData& projectile, float time, const btCollisionWorld* collisionWorld);
         static void unstuck(ActorFrameData& actor, const btCollisionWorld* collisionWorld);
     };
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 46c2574706..e340f25c66 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -1,9 +1,9 @@
+#include <cassert>
 #include <functional>
-#include <variant>
+#include <mutex>
 #include <optional>
 #include <shared_mutex>
-#include <mutex>
-#include <cassert>
+#include <variant>
 
 #include <BulletCollision/BroadphaseCollision/btDbvtBroadphase.h>
 #include <BulletCollision/CollisionShapes/btCollisionShape.h>
@@ -11,13 +11,13 @@
 #include <osg/Stats>
 
 #include "components/debug/debuglog.hpp"
-#include <components/misc/barrier.hpp>
 #include "components/misc/convert.hpp"
 #include "components/settings/settings.hpp"
+#include <components/misc/barrier.hpp>
 
 #include "../mwmechanics/actorutil.hpp"
-#include "../mwmechanics/movement.hpp"
 #include "../mwmechanics/creaturestats.hpp"
+#include "../mwmechanics/movement.hpp"
 
 #include "../mwrender/bulletdebugdraw.hpp"
 
@@ -45,18 +45,19 @@ namespace
     }
 
     /// @brief A scoped lock that is either exclusive or inexistent depending on configuration
-    template<class Mutex>
+    template <class Mutex>
     class MaybeExclusiveLock
     {
-        public:
-            /// @param mutex a mutex
-            /// @param threadCount decide wether the excluse lock will be taken
-            explicit MaybeExclusiveLock(Mutex& mutex, unsigned threadCount)
-                : mImpl(makeExclusiveLock(mutex, threadCount))
-            {}
+    public:
+        /// @param mutex a mutex
+        /// @param threadCount decide wether the excluse lock will be taken
+        explicit MaybeExclusiveLock(Mutex& mutex, unsigned threadCount)
+            : mImpl(makeExclusiveLock(mutex, threadCount))
+        {
+        }
 
-        private:
-            std::optional<std::unique_lock<Mutex>> mImpl;
+    private:
+        std::optional<std::unique_lock<Mutex>> mImpl;
     };
 
     template <class Mutex>
@@ -68,42 +69,46 @@ namespace
     }
 
     /// @brief A scoped lock that is either shared or inexistent depending on configuration
-    template<class Mutex>
+    template <class Mutex>
     class MaybeSharedLock
     {
-        public:
-            /// @param mutex a shared mutex
-            /// @param threadCount decide wether the shared lock will be taken
-            explicit MaybeSharedLock(Mutex& mutex, unsigned threadCount)
-                : mImpl(makeSharedLock(mutex, threadCount))
-            {}
+    public:
+        /// @param mutex a shared mutex
+        /// @param threadCount decide wether the shared lock will be taken
+        explicit MaybeSharedLock(Mutex& mutex, unsigned threadCount)
+            : mImpl(makeSharedLock(mutex, threadCount))
+        {
+        }
 
-        private:
-            std::optional<std::shared_lock<Mutex>> mImpl;
+    private:
+        std::optional<std::shared_lock<Mutex>> mImpl;
     };
 
     template <class Mutex>
-    std::variant<std::monostate, std::unique_lock<Mutex>, std::shared_lock<Mutex>> makeLock(Mutex& mutex, unsigned threadCount)
+    std::variant<std::monostate, std::unique_lock<Mutex>, std::shared_lock<Mutex>> makeLock(
+        Mutex& mutex, unsigned threadCount)
     {
         if (threadCount > 1)
             return std::shared_lock(mutex);
         if (threadCount == 1)
             return std::unique_lock(mutex);
-        return std::monostate {};
+        return std::monostate{};
     }
 
     /// @brief A scoped lock that is either shared, exclusive or inexistent depending on configuration
-    template<class Mutex>
+    template <class Mutex>
     class MaybeLock
     {
-        public:
-            /// @param mutex a shared mutex
-            /// @param threadCount decide wether the lock will be shared, exclusive or inexistent
-            explicit MaybeLock(Mutex& mutex, unsigned threadCount)
-                : mImpl(makeLock(mutex, threadCount)) {}
+    public:
+        /// @param mutex a shared mutex
+        /// @param threadCount decide wether the lock will be shared, exclusive or inexistent
+        explicit MaybeLock(Mutex& mutex, unsigned threadCount)
+            : mImpl(makeLock(mutex, threadCount))
+        {
+        }
 
-        private:
-            std::variant<std::monostate, std::unique_lock<Mutex>, std::shared_lock<Mutex>> mImpl;
+    private:
+        std::variant<std::monostate, std::unique_lock<Mutex>, std::shared_lock<Mutex>> mImpl;
     };
 
     bool isUnderWater(const MWPhysics::ActorFrameData& actorData)
@@ -117,14 +122,10 @@ namespace
         return ptr.getPosition() * interpolationFactor + ptr.getPreviousPosition() * (1.f - interpolationFactor);
     }
 
-    using LockedActorSimulation = std::pair<
-        std::shared_ptr<MWPhysics::Actor>,
-        std::reference_wrapper<MWPhysics::ActorFrameData>
-    >;
-    using LockedProjectileSimulation = std::pair<
-        std::shared_ptr<MWPhysics::Projectile>,
-        std::reference_wrapper<MWPhysics::ProjectileFrameData>
-    >;
+    using LockedActorSimulation
+        = std::pair<std::shared_ptr<MWPhysics::Actor>, std::reference_wrapper<MWPhysics::ActorFrameData>>;
+    using LockedProjectileSimulation
+        = std::pair<std::shared_ptr<MWPhysics::Projectile>, std::reference_wrapper<MWPhysics::ProjectileFrameData>>;
 
     namespace Visitors
     {
@@ -162,7 +163,8 @@ namespace
                 auto& frameData = frameDataRef.get();
                 actor->applyOffsetChange();
                 frameData.mPosition = actor->getPosition();
-                if (frameData.mWaterCollision && frameData.mPosition.z() < frameData.mWaterlevel && actor->canMoveToWaterSurface(frameData.mWaterlevel, mCollisionWorld))
+                if (frameData.mWaterCollision && frameData.mPosition.z() < frameData.mWaterlevel
+                    && actor->canMoveToWaterSurface(frameData.mWaterlevel, mCollisionWorld))
                 {
                     const auto offset = osg::Vec3f(0, 0, frameData.mWaterlevel - frameData.mPosition.z());
                     MWBase::Environment::get().getWorld()->moveObjectBy(actor->getPtr(), offset);
@@ -176,9 +178,7 @@ namespace
                 frameData.mStuckFrames = actor->getStuckFrames();
                 frameData.mLastStuckPosition = actor->getLastStuckPosition();
             }
-            void operator()(MWPhysics::ProjectileSimulation& /*sim*/) const
-            {
-            }
+            void operator()(MWPhysics::ProjectileSimulation& /*sim*/) const {}
         };
 
         struct PreStep
@@ -188,9 +188,7 @@ namespace
             {
                 MWPhysics::MovementSolver::unstuck(sim.second, mCollisionWorld);
             }
-            void operator()(const LockedProjectileSimulation& /*sim*/) const
-            {
-            }
+            void operator()(const LockedProjectileSimulation& /*sim*/) const {}
         };
 
         struct UpdatePosition
@@ -263,11 +261,13 @@ namespace
                 if (mAdvanceSimulation)
                 {
                     MWWorld::Ptr standingOn;
-                    auto* ptrHolder = static_cast<MWPhysics::PtrHolder*>(scheduler->getUserPointer(frameData.mStandingOn));
+                    auto* ptrHolder
+                        = static_cast<MWPhysics::PtrHolder*>(scheduler->getUserPointer(frameData.mStandingOn));
                     if (ptrHolder)
                         standingOn = ptrHolder->getPtr();
                     actor->setStandingOnPtr(standingOn);
-                    // the "on ground" state of an actor might have been updated by a traceDown, don't overwrite the change
+                    // the "on ground" state of an actor might have been updated by a traceDown, don't overwrite the
+                    // change
                     if (actor->getOnGround() == frameData.mWasOnGround)
                         actor->setOnGround(frameData.mIsOnGround);
                     actor->setOnSlope(frameData.mIsOnSlope);
@@ -288,7 +288,8 @@ namespace
 
     namespace Config
     {
-        /// @return either the number of thread as configured by the user, or 1 if Bullet doesn't support multithreading and user requested more than 1 background threads
+        /// @return either the number of thread as configured by the user, or 1 if Bullet doesn't support multithreading
+        /// and user requested more than 1 background threads
         unsigned computeNumThreads()
         {
             int wantedThread = Settings::Manager::getInt("async num threads", "Physics");
@@ -298,7 +299,8 @@ namespace
             auto threadSafeBullet = (maxSupportedThreads > 1);
             if (!threadSafeBullet && wantedThread > 1)
             {
-                Log(Debug::Warning) << "Bullet was not compiled with multithreading support, 1 async thread will be used";
+                Log(Debug::Warning)
+                    << "Bullet was not compiled with multithreading support, 1 async thread will be used";
                 return 1;
             }
             return static_cast<unsigned>(std::max(0, wantedThread));
@@ -308,36 +310,37 @@ namespace
 
 namespace MWPhysics
 {
-    PhysicsTaskScheduler::PhysicsTaskScheduler(float physicsDt, btCollisionWorld *collisionWorld, MWRender::DebugDrawer* debugDrawer)
-          : mDefaultPhysicsDt(physicsDt)
-          , mPhysicsDt(physicsDt)
-          , mTimeAccum(0.f)
-          , mCollisionWorld(collisionWorld)
-          , mDebugDrawer(debugDrawer)
-          , mNumThreads(Config::computeNumThreads())
-          , mNumJobs(0)
-          , mRemainingSteps(0)
-          , mLOSCacheExpiry(Settings::Manager::getInt("lineofsight keep inactive cache", "Physics"))
-          , mFrameCounter(0)
-          , mAdvanceSimulation(false)
-          , mQuit(false)
-          , mNextJob(0)
-          , mNextLOS(0)
-          , mFrameNumber(0)
-          , mTimer(osg::Timer::instance())
-          , mPrevStepCount(1)
-          , mBudget(physicsDt)
-          , mAsyncBudget(0.0f)
-          , mBudgetCursor(0)
-          , mAsyncStartTime(0)
-          , mTimeBegin(0)
-          , mTimeEnd(0)
-          , mFrameStart(0)
+    PhysicsTaskScheduler::PhysicsTaskScheduler(
+        float physicsDt, btCollisionWorld* collisionWorld, MWRender::DebugDrawer* debugDrawer)
+        : mDefaultPhysicsDt(physicsDt)
+        , mPhysicsDt(physicsDt)
+        , mTimeAccum(0.f)
+        , mCollisionWorld(collisionWorld)
+        , mDebugDrawer(debugDrawer)
+        , mNumThreads(Config::computeNumThreads())
+        , mNumJobs(0)
+        , mRemainingSteps(0)
+        , mLOSCacheExpiry(Settings::Manager::getInt("lineofsight keep inactive cache", "Physics"))
+        , mFrameCounter(0)
+        , mAdvanceSimulation(false)
+        , mQuit(false)
+        , mNextJob(0)
+        , mNextLOS(0)
+        , mFrameNumber(0)
+        , mTimer(osg::Timer::instance())
+        , mPrevStepCount(1)
+        , mBudget(physicsDt)
+        , mAsyncBudget(0.0f)
+        , mBudgetCursor(0)
+        , mAsyncStartTime(0)
+        , mTimeBegin(0)
+        , mTimeEnd(0)
+        , mFrameStart(0)
     {
         if (mNumThreads >= 1)
         {
             for (unsigned i = 0; i < mNumThreads; ++i)
-                mThreads.emplace_back([&] { worker(); } );
+                mThreads.emplace_back([&] { worker(); });
         }
         else
         {
@@ -372,11 +375,11 @@ namespace MWPhysics
 
         // adjust maximum step count based on whether we're likely physics bottlenecked or not
         // if maxAllowedSteps ends up higher than numSteps, we will not invoke delta time
-        // if it ends up lower than numSteps, but greater than 1, we will run a number of true delta time physics steps that we expect to be within budget
-        // if it ends up lower than numSteps and also 1, we will run a single delta time physics step
-        // if we did not do this, and had a fixed step count limit,
-        // we would have an unnecessarily low render framerate if we were only physics bottlenecked,
-        // and we would be unnecessarily invoking true delta time if we were only render bottlenecked
+        // if it ends up lower than numSteps, but greater than 1, we will run a number of true delta time physics steps
+        // that we expect to be within budget if it ends up lower than numSteps and also 1, we will run a single delta
+        // time physics step if we did not do this, and had a fixed step count limit, we would have an unnecessarily low
+        // render framerate if we were only physics bottlenecked, and we would be unnecessarily invoking true delta time
+        // if we were only render bottlenecked
 
         // get physics timing stats
         float budgetMeasurement = std::max(mBudget.get(), mAsyncBudget.get());
@@ -389,7 +392,7 @@ namespace MWPhysics
             maxAllowedSteps = 1;
         // physics is fairly cheap; limit based on expense
         if (budgetMeasurement < 0.5)
-            maxAllowedSteps = std::ceil(1.0/budgetMeasurement);
+            maxAllowedSteps = std::ceil(1.0 / budgetMeasurement);
         // limit to a reasonable amount
         maxAllowedSteps = std::min(10, maxAllowedSteps);
 
@@ -401,7 +404,7 @@ namespace MWPhysics
             // ensure that we do not simulate a frame ahead when doing delta time; this reduces stutter and latency
             // this causes interpolation to 100% use the most recent physics result when true delta time is happening
             // and we deliberately simulate up to exactly the timestamp that we want to render
-            actualDelta = timeAccum/float(numSteps+1);
+            actualDelta = timeAccum / float(numSteps + 1);
             // actually: if this results in a per-step delta less than the target physics steptime, clamp it
             // this might reintroduce some stutter, but only comes into play in obscure cases
             // (because numSteps is originally based on mDefaultPhysicsDt, this won't cause us to overrun)
@@ -411,7 +414,8 @@ namespace MWPhysics
         return std::make_tuple(numSteps, actualDelta);
     }
 
-    void PhysicsTaskScheduler::applyQueuedMovements(float& timeAccum, std::vector<Simulation>& simulations, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
+    void PhysicsTaskScheduler::applyQueuedMovements(float& timeAccum, std::vector<Simulation>& simulations,
+        osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
     {
         assert(mSimulations != &simulations);
 
@@ -429,16 +433,16 @@ namespace MWPhysics
         {
             syncWithMainThread();
 
-            if(mAdvanceSimulation)
+            if (mAdvanceSimulation)
                 mAsyncBudget.update(mTimer->delta_s(mAsyncStartTime, mTimeEnd), mPrevStepCount, mBudgetCursor);
             updateStats(frameStart, frameNumber, stats);
         }
 
         auto [numSteps, newDelta] = calculateStepConfig(timeAccum);
-        timeAccum -= numSteps*newDelta;
+        timeAccum -= numSteps * newDelta;
 
         // init
-        const Visitors::InitPosition vis{mCollisionWorld};
+        const Visitors::InitPosition vis{ mCollisionWorld };
         for (auto& sim : simulations)
         {
             std::visit(vis, sim);
@@ -464,7 +468,7 @@ namespace MWPhysics
         {
             doSimulation();
             syncWithMainThread();
-            if(mAdvanceSimulation)
+            if (mAdvanceSimulation)
                 mBudget.update(mTimer->delta_s(timeStart, mTimer->tick()), numSteps, mBudgetCursor);
             return;
         }
@@ -493,19 +497,22 @@ namespace MWPhysics
         }
     }
 
-    void PhysicsTaskScheduler::rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, btCollisionWorld::RayResultCallback& resultCallback) const
+    void PhysicsTaskScheduler::rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld,
+        btCollisionWorld::RayResultCallback& resultCallback) const
     {
         MaybeLock lock(mCollisionWorldMutex, mNumThreads);
         mCollisionWorld->rayTest(rayFromWorld, rayToWorld, resultCallback);
     }
 
-    void PhysicsTaskScheduler::convexSweepTest(const btConvexShape* castShape, const btTransform& from, const btTransform& to, btCollisionWorld::ConvexResultCallback& resultCallback) const
+    void PhysicsTaskScheduler::convexSweepTest(const btConvexShape* castShape, const btTransform& from,
+        const btTransform& to, btCollisionWorld::ConvexResultCallback& resultCallback) const
     {
         MaybeLock lock(mCollisionWorldMutex, mNumThreads);
         mCollisionWorld->convexSweepTest(castShape, from, to, resultCallback);
     }
 
-    void PhysicsTaskScheduler::contactTest(btCollisionObject* colObj, btCollisionWorld::ContactResultCallback& resultCallback)
+    void PhysicsTaskScheduler::contactTest(
+        btCollisionObject* colObj, btCollisionWorld::ContactResultCallback& resultCallback)
     {
         MaybeSharedLock lock(mCollisionWorldMutex, mNumThreads);
         ContactTestWrapper::contactTest(mCollisionWorld, colObj, resultCallback);
@@ -521,14 +528,16 @@ namespace MWPhysics
 
         btCollisionWorld::ClosestRayResultCallback cb(from.getOrigin(), rayTo.getOrigin());
 
-        mCollisionWorld->rayTestSingle(from, rayTo, target, target->getCollisionShape(), target->getWorldTransform(), cb);
+        mCollisionWorld->rayTestSingle(
+            from, rayTo, target, target->getCollisionShape(), target->getWorldTransform(), cb);
         if (!cb.hasHit())
             // didn't hit the target. this could happen if point is already inside the collision box
             return std::nullopt;
-        return {cb.m_hitPointWorld};
+        return { cb.m_hitPointWorld };
     }
 
-    void PhysicsTaskScheduler::aabbTest(const btVector3& aabbMin, const btVector3& aabbMax, btBroadphaseAabbCallback& callback)
+    void PhysicsTaskScheduler::aabbTest(
+        const btVector3& aabbMin, const btVector3& aabbMax, btBroadphaseAabbCallback& callback)
     {
         MaybeSharedLock lock(mCollisionWorldMutex, mNumThreads);
         mCollisionWorld->getBroadphase()->aabbTest(aabbMin, aabbMax, callback);
@@ -546,7 +555,8 @@ namespace MWPhysics
         collisionObject->getBroadphaseHandle()->m_collisionFilterMask = collisionFilterMask;
     }
 
-    void PhysicsTaskScheduler::addCollisionObject(btCollisionObject* collisionObject, int collisionFilterGroup, int collisionFilterMask)
+    void PhysicsTaskScheduler::addCollisionObject(
+        btCollisionObject* collisionObject, int collisionFilterGroup, int collisionFilterMask)
     {
         mCollisionObjects.insert(collisionObject);
         MaybeExclusiveLock lock(mCollisionWorldMutex, mNumThreads);
@@ -573,7 +583,8 @@ namespace MWPhysics
         }
     }
 
-    bool PhysicsTaskScheduler::getLineOfSight(const std::shared_ptr<Actor>& actor1, const std::shared_ptr<Actor>& actor2)
+    bool PhysicsTaskScheduler::getLineOfSight(
+        const std::shared_ptr<Actor>& actor1, const std::shared_ptr<Actor>& actor2)
     {
         MaybeExclusiveLock lock(mLOSCacheMutex, mNumThreads);
 
@@ -605,19 +616,16 @@ namespace MWPhysics
             else
                 req.mResult = hasLineOfSight(actorPtr1.get(), actorPtr2.get());
         }
-
     }
 
     void PhysicsTaskScheduler::updateAabbs()
     {
         MaybeExclusiveLock lock(mUpdateAabbMutex, mNumThreads);
-        std::for_each(mUpdateAabb.begin(), mUpdateAabb.end(),
-            [this](const std::weak_ptr<PtrHolder>& ptr)
-            {
-                auto p = ptr.lock();
-                if (p != nullptr)
-                    updatePtrAabb(p);
-            });
+        std::for_each(mUpdateAabb.begin(), mUpdateAabb.end(), [this](const std::weak_ptr<PtrHolder>& ptr) {
+            auto p = ptr.lock();
+            if (p != nullptr)
+                updatePtrAabb(p);
+        });
         mUpdateAabb.clear();
     }
 
@@ -659,20 +667,23 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::updateActorsPositions()
     {
-        const Visitors::UpdatePosition impl{mCollisionWorld};
-        const Visitors::WithLockedPtr<Visitors::UpdatePosition, MaybeExclusiveLock> vis{impl, mCollisionWorldMutex, mNumThreads};
+        const Visitors::UpdatePosition impl{ mCollisionWorld };
+        const Visitors::WithLockedPtr<Visitors::UpdatePosition, MaybeExclusiveLock> vis{ impl, mCollisionWorldMutex,
+            mNumThreads };
         for (Simulation& sim : *mSimulations)
             std::visit(vis, sim);
     }
 
     bool PhysicsTaskScheduler::hasLineOfSight(const Actor* actor1, const Actor* actor2)
     {
-        btVector3 pos1  = Misc::Convert::toBullet(actor1->getCollisionObjectPosition() + osg::Vec3f(0,0,actor1->getHalfExtents().z() * 0.9)); // eye level
-        btVector3 pos2  = Misc::Convert::toBullet(actor2->getCollisionObjectPosition() + osg::Vec3f(0,0,actor2->getHalfExtents().z() * 0.9));
+        btVector3 pos1 = Misc::Convert::toBullet(
+            actor1->getCollisionObjectPosition() + osg::Vec3f(0, 0, actor1->getHalfExtents().z() * 0.9)); // eye level
+        btVector3 pos2 = Misc::Convert::toBullet(
+            actor2->getCollisionObjectPosition() + osg::Vec3f(0, 0, actor2->getHalfExtents().z() * 0.9));
 
         btCollisionWorld::ClosestRayResultCallback resultCallback(pos1, pos2);
         resultCallback.m_collisionFilterGroup = CollisionType_AnyPhysical;
-        resultCallback.m_collisionFilterMask = CollisionType_World|CollisionType_HeightMap|CollisionType_Door;
+        resultCallback.m_collisionFilterMask = CollisionType_World | CollisionType_HeightMap | CollisionType_Door;
 
         MaybeLock lockColWorld(mCollisionWorldMutex, mNumThreads);
         mCollisionWorld->rayTest(pos1, pos2, resultCallback);
@@ -686,8 +697,8 @@ namespace MWPhysics
         {
             mPreStepBarrier->wait([this] { afterPreStep(); });
             int job = 0;
-            const Visitors::Move impl{mPhysicsDt, mCollisionWorld, *mWorldFrameData};
-            const Visitors::WithLockedPtr<Visitors::Move, MaybeLock> vis{impl, mCollisionWorldMutex, mNumThreads};
+            const Visitors::Move impl{ mPhysicsDt, mCollisionWorld, *mWorldFrameData };
+            const Visitors::WithLockedPtr<Visitors::Move, MaybeLock> vis{ impl, mCollisionWorldMutex, mNumThreads };
             while ((job = mNextJob.fetch_add(1, std::memory_order_relaxed)) < mNumJobs)
                 std::visit(vis, (*mSimulations)[job]);
 
@@ -744,8 +755,9 @@ namespace MWPhysics
         updateAabbs();
         if (!mRemainingSteps)
             return;
-        const Visitors::PreStep impl{mCollisionWorld};
-        const Visitors::WithLockedPtr<Visitors::PreStep, MaybeExclusiveLock> vis{impl, mCollisionWorldMutex, mNumThreads};
+        const Visitors::PreStep impl{ mCollisionWorld };
+        const Visitors::WithLockedPtr<Visitors::PreStep, MaybeExclusiveLock> vis{ impl, mCollisionWorldMutex,
+            mNumThreads };
         for (auto& sim : *mSimulations)
             std::visit(vis, sim);
     }
@@ -765,9 +777,8 @@ namespace MWPhysics
         {
             MaybeExclusiveLock lock(mLOSCacheMutex, mNumThreads);
             mLOSCache.erase(
-                    std::remove_if(mLOSCache.begin(), mLOSCache.end(),
-                        [](const LOSRequest& req) { return req.mStale; }),
-                    mLOSCache.end());
+                std::remove_if(mLOSCache.begin(), mLOSCache.end(), [](const LOSRequest& req) { return req.mStale; }),
+                mLOSCache.end());
         }
         mTimeEnd = mTimer->tick();
 
@@ -780,7 +791,7 @@ namespace MWPhysics
     {
         if (mSimulations == nullptr)
             return;
-        const Visitors::Sync vis{mAdvanceSimulation, mTimeAccum, mPhysicsDt, this};
+        const Visitors::Sync vis{ mAdvanceSimulation, mTimeAccum, mPhysicsDt, this };
         for (auto& sim : *mSimulations)
             std::visit(vis, sim);
         mSimulations->clear();
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index 1e730a5801..20bdffba13 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -13,9 +13,9 @@
 
 #include <osg/Timer>
 
+#include "components/misc/budgetmeasurement.hpp"
 #include "physicssystem.hpp"
 #include "ptrholder.hpp"
-#include "components/misc/budgetmeasurement.hpp"
 
 namespace Misc
 {
@@ -31,99 +31,103 @@ namespace MWPhysics
 {
     class PhysicsTaskScheduler
     {
-        public:
-            PhysicsTaskScheduler(float physicsDt, btCollisionWorld* collisionWorld, MWRender::DebugDrawer* debugDrawer);
-            ~PhysicsTaskScheduler();
-
-            /// @brief move actors taking into account desired movements and collisions
-            /// @param numSteps how much simulation step to run
-            /// @param timeAccum accumulated time from previous run to interpolate movements
-            /// @param actorsData per actor data needed to compute new positions
-            /// @return new position of each actor
-            void applyQueuedMovements(float& timeAccum, std::vector<Simulation>& simulations, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
-
-            void resetSimulation(const ActorMap& actors);
-
-            // Thread safe wrappers
-            void rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, btCollisionWorld::RayResultCallback& resultCallback) const;
-            void convexSweepTest(const btConvexShape* castShape, const btTransform& from, const btTransform& to, btCollisionWorld::ConvexResultCallback& resultCallback) const;
-            void contactTest(btCollisionObject* colObj, btCollisionWorld::ContactResultCallback& resultCallback);
-            std::optional<btVector3> getHitPoint(const btTransform& from, btCollisionObject* target);
-            void aabbTest(const btVector3& aabbMin, const btVector3& aabbMax, btBroadphaseAabbCallback& callback);
-            void getAabb(const btCollisionObject* obj, btVector3& min, btVector3& max);
-            void setCollisionFilterMask(btCollisionObject* collisionObject, int collisionFilterMask);
-            void addCollisionObject(btCollisionObject* collisionObject, int collisionFilterGroup, int collisionFilterMask);
-            void removeCollisionObject(btCollisionObject* collisionObject);
-            void updateSingleAabb(const std::shared_ptr<PtrHolder>& ptr, bool immediate=false);
-            bool getLineOfSight(const std::shared_ptr<Actor>& actor1, const std::shared_ptr<Actor>& actor2);
-            void debugDraw();
-            void* getUserPointer(const btCollisionObject* object) const;
-            void releaseSharedStates(); // destroy all objects whose destructor can't be safely called from ~PhysicsTaskScheduler()
-
-        private:
-            void doSimulation();
-            void worker();
-            void updateActorsPositions();
-            bool hasLineOfSight(const Actor* actor1, const Actor* actor2);
-            void refreshLOSCache();
-            void updateAabbs();
-            void updatePtrAabb(const std::shared_ptr<PtrHolder>& ptr);
-            void updateStats(osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
-            std::tuple<int, float> calculateStepConfig(float timeAccum) const;
-            void afterPreStep();
-            void afterPostStep();
-            void afterPostSim();
-            void syncWithMainThread();
-            void waitForWorkers();
-
-            std::unique_ptr<WorldFrameData> mWorldFrameData;
-            std::vector<Simulation>* mSimulations = nullptr;
-            std::unordered_set<const btCollisionObject*> mCollisionObjects;
-            float mDefaultPhysicsDt;
-            float mPhysicsDt;
-            float mTimeAccum;
-            btCollisionWorld* mCollisionWorld;
-            MWRender::DebugDrawer* mDebugDrawer;
-            std::vector<LOSRequest> mLOSCache;
-            std::set<std::weak_ptr<PtrHolder>, std::owner_less<std::weak_ptr<PtrHolder>>> mUpdateAabb;
-
-            // TODO: use std::experimental::flex_barrier or std::barrier once it becomes a thing
-            std::unique_ptr<Misc::Barrier> mPreStepBarrier;
-            std::unique_ptr<Misc::Barrier> mPostStepBarrier;
-            std::unique_ptr<Misc::Barrier> mPostSimBarrier;
-
-            unsigned mNumThreads;
-            int mNumJobs;
-            int mRemainingSteps;
-            int mLOSCacheExpiry;
-            std::size_t mFrameCounter;
-            bool mAdvanceSimulation;
-            bool mQuit;
-            std::atomic<int> mNextJob;
-            std::atomic<int> mNextLOS;
-            std::vector<std::thread> mThreads;
-
-            std::size_t mWorkersFrameCounter = 0;
-            std::condition_variable mWorkersDone;
-            std::mutex mWorkersDoneMutex;
-
-            mutable std::shared_mutex mSimulationMutex;
-            mutable std::shared_mutex mCollisionWorldMutex;
-            mutable std::shared_mutex mLOSCacheMutex;
-            mutable std::mutex mUpdateAabbMutex;
-            std::condition_variable_any mHasJob;
-
-            unsigned int mFrameNumber;
-            const osg::Timer* mTimer;
-
-            int mPrevStepCount;
-            Misc::BudgetMeasurement mBudget;
-            Misc::BudgetMeasurement mAsyncBudget;
-            unsigned int mBudgetCursor;
-            osg::Timer_t mAsyncStartTime;
-            osg::Timer_t mTimeBegin;
-            osg::Timer_t mTimeEnd;
-            osg::Timer_t mFrameStart;
+    public:
+        PhysicsTaskScheduler(float physicsDt, btCollisionWorld* collisionWorld, MWRender::DebugDrawer* debugDrawer);
+        ~PhysicsTaskScheduler();
+
+        /// @brief move actors taking into account desired movements and collisions
+        /// @param numSteps how much simulation step to run
+        /// @param timeAccum accumulated time from previous run to interpolate movements
+        /// @param actorsData per actor data needed to compute new positions
+        /// @return new position of each actor
+        void applyQueuedMovements(float& timeAccum, std::vector<Simulation>& simulations, osg::Timer_t frameStart,
+            unsigned int frameNumber, osg::Stats& stats);
+
+        void resetSimulation(const ActorMap& actors);
+
+        // Thread safe wrappers
+        void rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld,
+            btCollisionWorld::RayResultCallback& resultCallback) const;
+        void convexSweepTest(const btConvexShape* castShape, const btTransform& from, const btTransform& to,
+            btCollisionWorld::ConvexResultCallback& resultCallback) const;
+        void contactTest(btCollisionObject* colObj, btCollisionWorld::ContactResultCallback& resultCallback);
+        std::optional<btVector3> getHitPoint(const btTransform& from, btCollisionObject* target);
+        void aabbTest(const btVector3& aabbMin, const btVector3& aabbMax, btBroadphaseAabbCallback& callback);
+        void getAabb(const btCollisionObject* obj, btVector3& min, btVector3& max);
+        void setCollisionFilterMask(btCollisionObject* collisionObject, int collisionFilterMask);
+        void addCollisionObject(btCollisionObject* collisionObject, int collisionFilterGroup, int collisionFilterMask);
+        void removeCollisionObject(btCollisionObject* collisionObject);
+        void updateSingleAabb(const std::shared_ptr<PtrHolder>& ptr, bool immediate = false);
+        bool getLineOfSight(const std::shared_ptr<Actor>& actor1, const std::shared_ptr<Actor>& actor2);
+        void debugDraw();
+        void* getUserPointer(const btCollisionObject* object) const;
+        void releaseSharedStates(); // destroy all objects whose destructor can't be safely called from
+                                    // ~PhysicsTaskScheduler()
+
+    private:
+        void doSimulation();
+        void worker();
+        void updateActorsPositions();
+        bool hasLineOfSight(const Actor* actor1, const Actor* actor2);
+        void refreshLOSCache();
+        void updateAabbs();
+        void updatePtrAabb(const std::shared_ptr<PtrHolder>& ptr);
+        void updateStats(osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
+        std::tuple<int, float> calculateStepConfig(float timeAccum) const;
+        void afterPreStep();
+        void afterPostStep();
+        void afterPostSim();
+        void syncWithMainThread();
+        void waitForWorkers();
+
+        std::unique_ptr<WorldFrameData> mWorldFrameData;
+        std::vector<Simulation>* mSimulations = nullptr;
+        std::unordered_set<const btCollisionObject*> mCollisionObjects;
+        float mDefaultPhysicsDt;
+        float mPhysicsDt;
+        float mTimeAccum;
+        btCollisionWorld* mCollisionWorld;
+        MWRender::DebugDrawer* mDebugDrawer;
+        std::vector<LOSRequest> mLOSCache;
+        std::set<std::weak_ptr<PtrHolder>, std::owner_less<std::weak_ptr<PtrHolder>>> mUpdateAabb;
+
+        // TODO: use std::experimental::flex_barrier or std::barrier once it becomes a thing
+        std::unique_ptr<Misc::Barrier> mPreStepBarrier;
+        std::unique_ptr<Misc::Barrier> mPostStepBarrier;
+        std::unique_ptr<Misc::Barrier> mPostSimBarrier;
+
+        unsigned mNumThreads;
+        int mNumJobs;
+        int mRemainingSteps;
+        int mLOSCacheExpiry;
+        std::size_t mFrameCounter;
+        bool mAdvanceSimulation;
+        bool mQuit;
+        std::atomic<int> mNextJob;
+        std::atomic<int> mNextLOS;
+        std::vector<std::thread> mThreads;
+
+        std::size_t mWorkersFrameCounter = 0;
+        std::condition_variable mWorkersDone;
+        std::mutex mWorkersDoneMutex;
+
+        mutable std::shared_mutex mSimulationMutex;
+        mutable std::shared_mutex mCollisionWorldMutex;
+        mutable std::shared_mutex mLOSCacheMutex;
+        mutable std::mutex mUpdateAabbMutex;
+        std::condition_variable_any mHasJob;
+
+        unsigned int mFrameNumber;
+        const osg::Timer* mTimer;
+
+        int mPrevStepCount;
+        Misc::BudgetMeasurement mBudget;
+        Misc::BudgetMeasurement mAsyncBudget;
+        unsigned int mBudgetCursor;
+        osg::Timer_t mAsyncStartTime;
+        osg::Timer_t mTimeBegin;
+        osg::Timer_t mTimeEnd;
+        osg::Timer_t mFrameStart;
     };
 
 }
diff --git a/apps/openmw/mwphysics/object.cpp b/apps/openmw/mwphysics/object.cpp
index b646925ab1..6e0e2cdc7f 100644
--- a/apps/openmw/mwphysics/object.cpp
+++ b/apps/openmw/mwphysics/object.cpp
@@ -1,12 +1,12 @@
 #include "object.hpp"
 #include "mtphysics.hpp"
 
+#include <components/bullethelpers/collisionobject.hpp>
 #include <components/debug/debuglog.hpp>
+#include <components/misc/convert.hpp>
 #include <components/nifosg/particle.hpp>
 #include <components/resource/bulletshape.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
-#include <components/misc/convert.hpp>
-#include <components/bullethelpers/collisionobject.hpp>
 
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
 
@@ -14,7 +14,8 @@
 
 namespace MWPhysics
 {
-    Object::Object(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance, osg::Quat rotation, int collisionType, PhysicsTaskScheduler* scheduler)
+    Object::Object(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance,
+        osg::Quat rotation, int collisionType, PhysicsTaskScheduler* scheduler)
         : PtrHolder(ptr, osg::Vec3f())
         , mShapeInstance(std::move(shapeInstance))
         , mSolid(true)
@@ -27,7 +28,8 @@ namespace MWPhysics
             Misc::Convert::toBullet(mPosition), Misc::Convert::toBullet(rotation));
         mCollisionObject->setUserPointer(this);
         mShapeInstance->setLocalScaling(mScale);
-        mTaskScheduler->addCollisionObject(mCollisionObject.get(), collisionType, CollisionType_Actor|CollisionType_HeightMap|CollisionType_Projectile);
+        mTaskScheduler->addCollisionObject(mCollisionObject.get(), collisionType,
+            CollisionType_Actor | CollisionType_HeightMap | CollisionType_Projectile);
     }
 
     Object::~Object()
@@ -43,7 +45,7 @@ namespace MWPhysics
     void Object::setScale(float scale)
     {
         std::unique_lock<std::mutex> lock(mPositionMutex);
-        mScale = { scale,scale,scale };
+        mScale = { scale, scale, scale };
         mScaleUpdatePending = true;
     }
 
@@ -108,7 +110,7 @@ namespace MWPhysics
         if (mShapeInstance->mAnimatedShapes.empty())
             return false;
 
-        assert (mShapeInstance->mCollisionShape->isCompound());
+        assert(mShapeInstance->mCollisionShape->isCompound());
 
         btCompoundShape* compound = static_cast<btCompoundShape*>(mShapeInstance->mCollisionShape.get());
         bool result = false;
@@ -121,7 +123,8 @@ namespace MWPhysics
                 mPtr.getRefData().getBaseNode()->accept(visitor);
                 if (!visitor.mFound)
                 {
-                    Log(Debug::Warning) << "Warning: animateCollisionShapes can't find node " << recIndex << " for " << mPtr.getCellRef().getRefId();
+                    Log(Debug::Warning) << "Warning: animateCollisionShapes can't find node " << recIndex << " for "
+                                        << mPtr.getCellRef().getRefId();
 
                     // Remove nonexistent nodes from animated shapes map and early out
                     mShapeInstance->mAnimatedShapes.erase(recIndex);
@@ -138,9 +141,9 @@ namespace MWPhysics
 
             btTransform transform;
             transform.setOrigin(Misc::Convert::toBullet(matrix.getTrans()) * compound->getLocalScaling());
-            for (int i=0; i<3; ++i)
-                for (int j=0; j<3; ++j)
-                    transform.getBasis()[i][j] = matrix(j,i); // NB column/row major difference
+            for (int i = 0; i < 3; ++i)
+                for (int j = 0; j < 3; ++j)
+                    transform.getBasis()[i][j] = matrix(j, i); // NB column/row major difference
 
             // Note: we can not apply scaling here for now since we treat scaled shapes
             // as new shapes (btScaledBvhTriangleMeshShape) with 1.0 scale for now
diff --git a/apps/openmw/mwphysics/object.hpp b/apps/openmw/mwphysics/object.hpp
index 520a57a4e8..a143c08548 100644
--- a/apps/openmw/mwphysics/object.hpp
+++ b/apps/openmw/mwphysics/object.hpp
@@ -25,7 +25,8 @@ namespace MWPhysics
     class Object final : public PtrHolder
     {
     public:
-        Object(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance, osg::Quat rotation, int collisionType, PhysicsTaskScheduler* scheduler);
+        Object(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance, osg::Quat rotation,
+            int collisionType, PhysicsTaskScheduler* scheduler);
         ~Object() override;
 
         const Resource::BulletShapeInstance* getShapeInstance() const;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 6b8f680f08..360a79360d 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -1,68 +1,68 @@
 #include "physicssystem.hpp"
 
-#include <memory>
 #include <algorithm>
+#include <memory>
 #include <vector>
 
 #include <osg/Group>
 #include <osg/Stats>
 #include <osg/Timer>
 
-#include <BulletCollision/CollisionShapes/btConeShape.h>
-#include <BulletCollision/CollisionShapes/btSphereShape.h>
-#include <BulletCollision/CollisionShapes/btStaticPlaneShape.h>
+#include <BulletCollision/BroadphaseCollision/btDbvtBroadphase.h>
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 #include <BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h>
-#include <BulletCollision/BroadphaseCollision/btDbvtBroadphase.h>
+#include <BulletCollision/CollisionShapes/btConeShape.h>
+#include <BulletCollision/CollisionShapes/btSphereShape.h>
+#include <BulletCollision/CollisionShapes/btStaticPlaneShape.h>
 
-#include <LinearMath/btVector3.h>
 #include <LinearMath/btQuickprof.h>
+#include <LinearMath/btVector3.h>
 
-#include <components/nifbullet/bulletnifloader.hpp>
-#include <components/resource/resourcesystem.hpp>
-#include <components/resource/bulletshapemanager.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/esm3/loadgmst.hpp>
-#include <components/sceneutil/positionattitudetransform.hpp>
+#include <components/esm3/loadmgef.hpp>
 #include <components/misc/convert.hpp>
-#include <components/settings/settings.hpp>
+#include <components/nifbullet/bulletnifloader.hpp>
 #include <components/nifosg/particle.hpp> // FindRecIndexVisitor
-#include <components/esm3/loadmgef.hpp>
+#include <components/resource/bulletshapemanager.hpp>
+#include <components/resource/resourcesystem.hpp>
+#include <components/sceneutil/positionattitudetransform.hpp>
+#include <components/settings/settings.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/movement.hpp"
 
-#include "../mwworld/esmstore.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/esmstore.hpp"
 #include "../mwworld/player.hpp"
 
 #include "../mwrender/bulletdebugdraw.hpp"
 
 #include "../mwworld/class.hpp"
 
-#include "collisiontype.hpp"
 #include "actor.hpp"
+#include "collisiontype.hpp"
 
-#include "projectile.hpp"
-#include "trace.h"
-#include "object.hpp"
-#include "heightfield.hpp"
-#include "hasspherecollisioncallback.hpp"
-#include "deepestnotmecontacttestresultcallback.hpp"
 #include "closestnotmerayresultcallback.hpp"
 #include "contacttestresultcallback.hpp"
-#include "projectileconvexcallback.hpp"
+#include "deepestnotmecontacttestresultcallback.hpp"
+#include "hasspherecollisioncallback.hpp"
+#include "heightfield.hpp"
 #include "movementsolver.hpp"
 #include "mtphysics.hpp"
+#include "object.hpp"
+#include "projectile.hpp"
+#include "projectileconvexcallback.hpp"
+#include "trace.h"
 
 namespace
 {
-    void handleJump(const MWWorld::Ptr &ptr)
+    void handleJump(const MWWorld::Ptr& ptr)
     {
         if (!ptr.getClass().isActor())
             return;
@@ -79,7 +79,8 @@ namespace
         // Decrease fatigue
         if (!isPlayer || !MWBase::Environment::get().getWorld()->getGodModeState())
         {
-            const MWWorld::Store<ESM::GameSetting> &gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+            const MWWorld::Store<ESM::GameSetting>& gmst
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
             const float fFatigueJumpBase = gmst.find("fFatigueJumpBase")->mValue.getFloat();
             const float fFatigueJumpMult = gmst.find("fFatigueJumpMult")->mValue.getFloat();
             const float normalizedEncumbrance = std::min(1.f, ptr.getClass().getNormalizedEncumbrance(ptr));
@@ -96,7 +97,8 @@ namespace
 namespace MWPhysics
 {
     PhysicsSystem::PhysicsSystem(Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> parentNode)
-        : mShapeManager(std::make_unique<Resource::BulletShapeManager>(resourceSystem->getVFS(), resourceSystem->getSceneManager(), resourceSystem->getNifFileManager()))
+        : mShapeManager(std::make_unique<Resource::BulletShapeManager>(
+            resourceSystem->getVFS(), resourceSystem->getSceneManager(), resourceSystem->getNifFileManager()))
         , mResourceSystem(resourceSystem)
         , mDebugDrawEnabled(false)
         , mTimeAccum(0.0f)
@@ -105,7 +107,8 @@ namespace MWPhysics
         , mWaterEnabled(false)
         , mParentNode(parentNode)
         , mPhysicsDt(1.f / 60.f)
-        , mActorCollisionShapeType(DetourNavigator::toCollisionShapeType(Settings::Manager::getInt("actor collision shape type", "Game")))
+        , mActorCollisionShapeType(
+              DetourNavigator::toCollisionShapeType(Settings::Manager::getInt("actor collision shape type", "Game")))
     {
         mResourceSystem->addResourceManager(mShapeManager.get());
 
@@ -113,10 +116,12 @@ namespace MWPhysics
         mDispatcher = std::make_unique<btCollisionDispatcher>(mCollisionConfiguration.get());
         mBroadphase = std::make_unique<btDbvtBroadphase>();
 
-        mCollisionWorld = std::make_unique<btCollisionWorld>(mDispatcher.get(), mBroadphase.get(), mCollisionConfiguration.get());
+        mCollisionWorld
+            = std::make_unique<btCollisionWorld>(mDispatcher.get(), mBroadphase.get(), mCollisionConfiguration.get());
 
         // Don't update AABBs of all objects every frame. Most objects in MW are static, so we don't need this.
-        // Should a "static" object ever be moved, we have to update its AABB manually using DynamicsWorld::updateSingleAabb.
+        // Should a "static" object ever be moved, we have to update its AABB manually using
+        // DynamicsWorld::updateSingleAabb.
         mCollisionWorld->setForceUpdateAllAabbs(false);
 
         // Check if a user decided to override a physics system FPS
@@ -149,7 +154,7 @@ namespace MWPhysics
         mProjectiles.clear();
     }
 
-    Resource::BulletShapeManager *PhysicsSystem::getShapeManager()
+    Resource::BulletShapeManager* PhysicsSystem::getShapeManager()
     {
         return mShapeManager.get();
     }
@@ -163,7 +168,7 @@ namespace MWPhysics
         return mDebugDrawEnabled;
     }
 
-    void PhysicsSystem::markAsNonSolid(const MWWorld::ConstPtr &ptr)
+    void PhysicsSystem::markAsNonSolid(const MWWorld::ConstPtr& ptr)
     {
         ObjectMap::iterator found = mObjects.find(ptr.mRef);
         if (found == mObjects.end())
@@ -172,7 +177,7 @@ namespace MWPhysics
         found->second->setSolid(false);
     }
 
-    bool PhysicsSystem::isOnSolidGround (const MWWorld::Ptr& actor) const
+    bool PhysicsSystem::isOnSolidGround(const MWWorld::Ptr& actor) const
     {
         const Actor* physactor = getActor(actor);
         if (!physactor || !physactor->getOnGround() || !physactor->getCollisionMode())
@@ -193,13 +198,12 @@ namespace MWPhysics
     }
 
     std::pair<MWWorld::Ptr, osg::Vec3f> PhysicsSystem::getHitContact(const MWWorld::ConstPtr& actor,
-                                                                     const osg::Vec3f &origin,
-                                                                     const osg::Quat &orient,
-                                                                     float queryDistance, std::vector<MWWorld::Ptr>& targets)
+        const osg::Vec3f& origin, const osg::Quat& orient, float queryDistance, std::vector<MWWorld::Ptr>& targets)
     {
         // First of all, try to hit where you aim to
         int hitmask = CollisionType_World | CollisionType_Door | CollisionType_HeightMap | CollisionType_Actor;
-        RayCastingResult result = castRay(origin, origin + (orient * osg::Vec3f(0.0f, queryDistance, 0.0f)), actor, targets, hitmask, CollisionType_Actor);
+        RayCastingResult result = castRay(origin, origin + (orient * osg::Vec3f(0.0f, queryDistance, 0.0f)), actor,
+            targets, hitmask, CollisionType_Actor);
 
         if (result.mHit)
         {
@@ -208,15 +212,16 @@ namespace MWPhysics
         }
 
         // Use cone shape as fallback
-        const MWWorld::Store<ESM::GameSetting> &store = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& store
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
-        btConeShape shape (osg::DegreesToRadians(store.find("fCombatAngleXY")->mValue.getFloat()/2.0f), queryDistance);
-        shape.setLocalScaling(btVector3(1, 1, osg::DegreesToRadians(store.find("fCombatAngleZ")->mValue.getFloat()/2.0f) /
-                                              shape.getRadius()));
+        btConeShape shape(osg::DegreesToRadians(store.find("fCombatAngleXY")->mValue.getFloat() / 2.0f), queryDistance);
+        shape.setLocalScaling(btVector3(
+            1, 1, osg::DegreesToRadians(store.find("fCombatAngleZ")->mValue.getFloat() / 2.0f) / shape.getRadius()));
 
         // The shape origin is its center, so we have to move it forward by half the length. The
         // real origin will be provided to getFilteredContact to find the closest.
-        osg::Vec3f center = origin + (orient * osg::Vec3f(0.0f, queryDistance*0.5f, 0.0f));
+        osg::Vec3f center = origin + (orient * osg::Vec3f(0.0f, queryDistance * 0.5f, 0.0f));
 
         btCollisionObject object;
         object.setCollisionShape(&shape);
@@ -239,9 +244,11 @@ namespace MWPhysics
             }
         }
 
-        DeepestNotMeContactTestResultCallback resultCallback(me, targetCollisionObjects, Misc::Convert::toBullet(origin));
+        DeepestNotMeContactTestResultCallback resultCallback(
+            me, targetCollisionObjects, Misc::Convert::toBullet(origin));
         resultCallback.m_collisionFilterGroup = CollisionType_Actor;
-        resultCallback.m_collisionFilterMask = CollisionType_World | CollisionType_Door | CollisionType_HeightMap | CollisionType_Actor;
+        resultCallback.m_collisionFilterMask
+            = CollisionType_World | CollisionType_Door | CollisionType_HeightMap | CollisionType_Actor;
         mTaskScheduler->contactTest(&object, resultCallback);
 
         if (resultCallback.mObject)
@@ -256,7 +263,7 @@ namespace MWPhysics
         return std::make_pair(MWWorld::Ptr(), osg::Vec3f());
     }
 
-    float PhysicsSystem::getHitDistance(const osg::Vec3f &point, const MWWorld::ConstPtr &target) const
+    float PhysicsSystem::getHitDistance(const osg::Vec3f& point, const MWWorld::ConstPtr& target) const
     {
         btCollisionObject* targetCollisionObj = nullptr;
         const Actor* actor = getActor(target);
@@ -277,7 +284,8 @@ namespace MWPhysics
         return 0.f;
     }
 
-    RayCastingResult PhysicsSystem::castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore, const std::vector<MWWorld::Ptr>& targets, int mask, int group) const
+    RayCastingResult PhysicsSystem::castRay(const osg::Vec3f& from, const osg::Vec3f& to,
+        const MWWorld::ConstPtr& ignore, const std::vector<MWWorld::Ptr>& targets, int mask, int group) const
     {
         if (from == to)
         {
@@ -332,17 +340,19 @@ namespace MWPhysics
         return result;
     }
 
-    RayCastingResult PhysicsSystem::castSphere(const osg::Vec3f &from, const osg::Vec3f &to, float radius, int mask, int group) const
+    RayCastingResult PhysicsSystem::castSphere(
+        const osg::Vec3f& from, const osg::Vec3f& to, float radius, int mask, int group) const
     {
-        btCollisionWorld::ClosestConvexResultCallback callback(Misc::Convert::toBullet(from), Misc::Convert::toBullet(to));
+        btCollisionWorld::ClosestConvexResultCallback callback(
+            Misc::Convert::toBullet(from), Misc::Convert::toBullet(to));
         callback.m_collisionFilterGroup = group;
         callback.m_collisionFilterMask = mask;
 
         btSphereShape shape(radius);
         const btQuaternion btrot = btQuaternion::getIdentity();
 
-        btTransform from_ (btrot, Misc::Convert::toBullet(from));
-        btTransform to_ (btrot, Misc::Convert::toBullet(to));
+        btTransform from_(btrot, Misc::Convert::toBullet(from));
+        btTransform to_(btrot, Misc::Convert::toBullet(to));
 
         mTaskScheduler->convexSweepTest(&shape, from_, to_, callback);
 
@@ -358,9 +368,10 @@ namespace MWPhysics
         return result;
     }
 
-    bool PhysicsSystem::getLineOfSight(const MWWorld::ConstPtr &actor1, const MWWorld::ConstPtr &actor2) const
+    bool PhysicsSystem::getLineOfSight(const MWWorld::ConstPtr& actor1, const MWWorld::ConstPtr& actor2) const
     {
-        if (actor1 == actor2) return true;
+        if (actor1 == actor2)
+            return true;
 
         const auto it1 = mActors.find(actor1.mRef);
         const auto it2 = mActors.find(actor2.mRef);
@@ -370,19 +381,19 @@ namespace MWPhysics
         return mTaskScheduler->getLineOfSight(it1->second, it2->second);
     }
 
-    bool PhysicsSystem::isOnGround(const MWWorld::Ptr &actor)
+    bool PhysicsSystem::isOnGround(const MWWorld::Ptr& actor)
     {
         Actor* physactor = getActor(actor);
         return physactor && physactor->getOnGround() && physactor->getCollisionMode();
     }
 
-    bool PhysicsSystem::canMoveToWaterSurface(const MWWorld::ConstPtr &actor, const float waterlevel)
+    bool PhysicsSystem::canMoveToWaterSurface(const MWWorld::ConstPtr& actor, const float waterlevel)
     {
         const auto* physactor = getActor(actor);
         return physactor && physactor->canMoveToWaterSurface(waterlevel, mCollisionWorld.get());
     }
 
-    osg::Vec3f PhysicsSystem::getHalfExtents(const MWWorld::ConstPtr &actor) const
+    osg::Vec3f PhysicsSystem::getHalfExtents(const MWWorld::ConstPtr& actor) const
     {
         const Actor* physactor = getActor(actor);
         if (physactor)
@@ -391,7 +402,7 @@ namespace MWPhysics
             return osg::Vec3f();
     }
 
-    osg::Vec3f PhysicsSystem::getOriginalHalfExtents(const MWWorld::ConstPtr &actor) const
+    osg::Vec3f PhysicsSystem::getOriginalHalfExtents(const MWWorld::ConstPtr& actor) const
     {
         if (const Actor* physactor = getActor(actor))
             return physactor->getOriginalHalfExtents();
@@ -399,7 +410,7 @@ namespace MWPhysics
             return osg::Vec3f();
     }
 
-    osg::Vec3f PhysicsSystem::getRenderingHalfExtents(const MWWorld::ConstPtr &actor) const
+    osg::Vec3f PhysicsSystem::getRenderingHalfExtents(const MWWorld::ConstPtr& actor) const
     {
         const Actor* physactor = getActor(actor);
         if (physactor)
@@ -408,16 +419,17 @@ namespace MWPhysics
             return osg::Vec3f();
     }
 
-    osg::BoundingBox PhysicsSystem::getBoundingBox(const MWWorld::ConstPtr &object) const
+    osg::BoundingBox PhysicsSystem::getBoundingBox(const MWWorld::ConstPtr& object) const
     {
-        const Object * physobject = getObject(object);
-        if (!physobject) return osg::BoundingBox();
+        const Object* physobject = getObject(object);
+        if (!physobject)
+            return osg::BoundingBox();
         btVector3 min, max;
         mTaskScheduler->getAabb(physobject->getCollisionObject(), min, max);
         return osg::BoundingBox(Misc::Convert::toOsg(min), Misc::Convert::toOsg(max));
     }
 
-    osg::Vec3f PhysicsSystem::getCollisionObjectPosition(const MWWorld::ConstPtr &actor) const
+    osg::Vec3f PhysicsSystem::getCollisionObjectPosition(const MWWorld::ConstPtr& actor) const
     {
         const Actor* physactor = getActor(actor);
         if (physactor)
@@ -426,7 +438,8 @@ namespace MWPhysics
             return osg::Vec3f();
     }
 
-    std::vector<ContactPoint> PhysicsSystem::getCollisionsPoints(const MWWorld::ConstPtr &ptr, int collisionGroup, int collisionMask) const
+    std::vector<ContactPoint> PhysicsSystem::getCollisionsPoints(
+        const MWWorld::ConstPtr& ptr, int collisionGroup, int collisionMask) const
     {
         btCollisionObject* me = nullptr;
 
@@ -436,14 +449,15 @@ namespace MWPhysics
         else
             return {};
 
-        ContactTestResultCallback resultCallback (me);
+        ContactTestResultCallback resultCallback(me);
         resultCallback.m_collisionFilterGroup = collisionGroup;
         resultCallback.m_collisionFilterMask = collisionMask;
         mTaskScheduler->contactTest(me, resultCallback);
         return resultCallback.mResult;
     }
 
-    std::vector<MWWorld::Ptr> PhysicsSystem::getCollisions(const MWWorld::ConstPtr &ptr, int collisionGroup, int collisionMask) const
+    std::vector<MWWorld::Ptr> PhysicsSystem::getCollisions(
+        const MWWorld::ConstPtr& ptr, int collisionGroup, int collisionMask) const
     {
         std::vector<MWWorld::Ptr> actors;
         for (auto& [actor, point, normal] : getCollisionsPoints(ptr, collisionGroup, collisionMask))
@@ -451,23 +465,25 @@ namespace MWPhysics
         return actors;
     }
 
-    osg::Vec3f PhysicsSystem::traceDown(const MWWorld::Ptr &ptr, const osg::Vec3f& position, float maxHeight)
+    osg::Vec3f PhysicsSystem::traceDown(const MWWorld::Ptr& ptr, const osg::Vec3f& position, float maxHeight)
     {
         ActorMap::iterator found = mActors.find(ptr.mRef);
-        if (found ==  mActors.end())
+        if (found == mActors.end())
             return ptr.getRefData().getPosition().asVec3();
         return MovementSolver::traceDown(ptr, position, found->second.get(), mCollisionWorld.get(), maxHeight);
     }
 
-    void PhysicsSystem::addHeightField(const float* heights, int x, int y, int size, int verts, float minH, float maxH, const osg::Object* holdObject)
+    void PhysicsSystem::addHeightField(
+        const float* heights, int x, int y, int size, int verts, float minH, float maxH, const osg::Object* holdObject)
     {
-        mHeightFields[std::make_pair(x,y)] = std::make_unique<HeightField>(heights, x, y, size, verts, minH, maxH, holdObject, mTaskScheduler.get());
+        mHeightFields[std::make_pair(x, y)]
+            = std::make_unique<HeightField>(heights, x, y, size, verts, minH, maxH, holdObject, mTaskScheduler.get());
     }
 
-    void PhysicsSystem::removeHeightField (int x, int y)
+    void PhysicsSystem::removeHeightField(int x, int y)
     {
-        HeightFieldMap::iterator heightfield = mHeightFields.find(std::make_pair(x,y));
-        if(heightfield != mHeightFields.end())
+        HeightFieldMap::iterator heightfield = mHeightFields.find(std::make_pair(x, y));
+        if (heightfield != mHeightFields.end())
             mHeightFields.erase(heightfield);
     }
 
@@ -479,7 +495,8 @@ namespace MWPhysics
         return heightField->second.get();
     }
 
-    void PhysicsSystem::addObject (const MWWorld::Ptr& ptr, const std::string& mesh, osg::Quat rotation, int collisionType)
+    void PhysicsSystem::addObject(
+        const MWWorld::Ptr& ptr, const std::string& mesh, osg::Quat rotation, int collisionType)
     {
         if (ptr.mRef->mData.mPhysicsPostponed)
             return;
@@ -509,7 +526,7 @@ namespace MWPhysics
             mAnimatedObjects.emplace(obj.get(), false);
     }
 
-    void PhysicsSystem::remove(const MWWorld::Ptr &ptr)
+    void PhysicsSystem::remove(const MWWorld::Ptr& ptr)
     {
         if (auto foundObject = mObjects.find(ptr.mRef); foundObject != mObjects.end())
         {
@@ -530,7 +547,7 @@ namespace MWPhysics
             mProjectiles.erase(foundProjectile);
     }
 
-    void PhysicsSystem::updatePtr(const MWWorld::Ptr &old, const MWWorld::Ptr &updated)
+    void PhysicsSystem::updatePtr(const MWWorld::Ptr& old, const MWWorld::Ptr& updated)
     {
         if (auto foundObject = mObjects.find(old.mRef); foundObject != mObjects.end())
             foundObject->second->updatePtr(updated);
@@ -548,10 +565,9 @@ namespace MWPhysics
             if (projectile->getCaster() == old)
                 projectile->setCaster(updated);
         }
-
     }
 
-    Actor *PhysicsSystem::getActor(const MWWorld::Ptr &ptr)
+    Actor* PhysicsSystem::getActor(const MWWorld::Ptr& ptr)
     {
         ActorMap::iterator found = mActors.find(ptr.mRef);
         if (found != mActors.end())
@@ -559,7 +575,7 @@ namespace MWPhysics
         return nullptr;
     }
 
-    const Actor *PhysicsSystem::getActor(const MWWorld::ConstPtr &ptr) const
+    const Actor* PhysicsSystem::getActor(const MWWorld::ConstPtr& ptr) const
     {
         ActorMap::const_iterator found = mActors.find(ptr.mRef);
         if (found != mActors.end())
@@ -567,7 +583,7 @@ namespace MWPhysics
         return nullptr;
     }
 
-    const Object* PhysicsSystem::getObject(const MWWorld::ConstPtr &ptr) const
+    const Object* PhysicsSystem::getObject(const MWWorld::ConstPtr& ptr) const
     {
         ObjectMap::const_iterator found = mObjects.find(ptr.mRef);
         if (found != mObjects.end())
@@ -583,7 +599,7 @@ namespace MWPhysics
         return nullptr;
     }
 
-    void PhysicsSystem::updateScale(const MWWorld::Ptr &ptr)
+    void PhysicsSystem::updateScale(const MWWorld::Ptr& ptr)
     {
         if (auto foundObject = mObjects.find(ptr.mRef); foundObject != mObjects.end())
         {
@@ -598,7 +614,7 @@ namespace MWPhysics
         }
     }
 
-    void PhysicsSystem::updateRotation(const MWWorld::Ptr &ptr, osg::Quat rotate)
+    void PhysicsSystem::updateRotation(const MWWorld::Ptr& ptr, osg::Quat rotate)
     {
         if (auto foundObject = mObjects.find(ptr.mRef); foundObject != mObjects.end())
         {
@@ -615,7 +631,7 @@ namespace MWPhysics
         }
     }
 
-    void PhysicsSystem::updatePosition(const MWWorld::Ptr &ptr)
+    void PhysicsSystem::updatePosition(const MWWorld::Ptr& ptr)
     {
         if (auto foundObject = mObjects.find(ptr.mRef); foundObject != mObjects.end())
         {
@@ -629,7 +645,7 @@ namespace MWPhysics
         }
     }
 
-    void PhysicsSystem::addActor (const MWWorld::Ptr& ptr, const std::string& mesh)
+    void PhysicsSystem::addActor(const MWWorld::Ptr& ptr, const std::string& mesh)
     {
         osg::ref_ptr<const Resource::BulletShape> shape = mShapeManager->getShape(mesh);
 
@@ -655,7 +671,8 @@ namespace MWPhysics
         mActors.emplace(ptr.mRef, std::move(actor));
     }
 
-    int PhysicsSystem::addProjectile (const MWWorld::Ptr& caster, const osg::Vec3f& position, const std::string& mesh, bool computeRadius)
+    int PhysicsSystem::addProjectile(
+        const MWWorld::Ptr& caster, const osg::Vec3f& position, const std::string& mesh, bool computeRadius)
     {
         osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance = mShapeManager->getInstance(mesh);
         assert(shapeInstance);
@@ -693,7 +710,7 @@ namespace MWPhysics
         return false;
     }
 
-    void PhysicsSystem::queueObjectMovement(const MWWorld::Ptr &ptr, const osg::Vec3f &velocity)
+    void PhysicsSystem::queueObjectMovement(const MWWorld::Ptr& ptr, const osg::Vec3f& velocity)
     {
         ActorMap::iterator found = mActors.find(ptr.mRef);
         if (found != mActors.end())
@@ -713,7 +730,7 @@ namespace MWPhysics
     {
         assert(simulations.empty());
         simulations.reserve(mActors.size() + mProjectiles.size());
-        const MWBase::World *world = MWBase::Environment::get().getWorld();
+        const MWBase::World* world = MWBase::Environment::get().getWorld();
         for (const auto& [ref, physicActor] : mActors)
         {
             if (!physicActor->isActive())
@@ -723,8 +740,8 @@ namespace MWPhysics
             if (!ptr.getClass().isMobile(ptr))
                 continue;
             float waterlevel = -std::numeric_limits<float>::max();
-            const MWWorld::CellStore *cell = ptr.getCell();
-            if(cell->getCell()->hasWater())
+            const MWWorld::CellStore* cell = ptr.getCell();
+            if (cell->getCell()->hasWater())
                 waterlevel = cell->getWaterLevel();
 
             const auto& stats = ptr.getClass().getCreatureStats(ptr);
@@ -733,18 +750,22 @@ namespace MWPhysics
             bool waterCollision = false;
             if (cell->getCell()->hasWater() && effects.get(ESM::MagicEffect::WaterWalking).getMagnitude())
             {
-                if (physicActor->getCollisionMode() || !world->isUnderwater(ptr.getCell(), ptr.getRefData().getPosition().asVec3()))
+                if (physicActor->getCollisionMode()
+                    || !world->isUnderwater(ptr.getCell(), ptr.getRefData().getPosition().asVec3()))
                     waterCollision = true;
             }
 
             physicActor->setCanWaterWalk(waterCollision);
 
             // Slow fall reduces fall speed by a factor of (effect magnitude / 200)
-            const float slowFall = 1.f - std::clamp(effects.get(ESM::MagicEffect::SlowFall).getMagnitude() * 0.005f, 0.f, 1.f);
+            const float slowFall
+                = 1.f - std::clamp(effects.get(ESM::MagicEffect::SlowFall).getMagnitude() * 0.005f, 0.f, 1.f);
             const bool godmode = ptr == world->getPlayerConstPtr() && world->getGodModeState();
-            const bool inert = stats.isDead() || (!godmode && stats.getMagicEffects().get(ESM::MagicEffect::Paralyze).getModifier() > 0);
+            const bool inert = stats.isDead()
+                || (!godmode && stats.getMagicEffects().get(ESM::MagicEffect::Paralyze).getModifier() > 0);
 
-            simulations.emplace_back(ActorSimulation{physicActor, ActorFrameData{*physicActor, inert, waterCollision, slowFall, waterlevel}});
+            simulations.emplace_back(ActorSimulation{
+                physicActor, ActorFrameData{ *physicActor, inert, waterCollision, slowFall, waterlevel } });
 
             // if the simulation will run, a jump request will be fulfilled. Update mechanics accordingly.
             if (willSimulate)
@@ -753,11 +774,12 @@ namespace MWPhysics
 
         for (const auto& [id, projectile] : mProjectiles)
         {
-            simulations.emplace_back(ProjectileSimulation{projectile, ProjectileFrameData{*projectile}});
+            simulations.emplace_back(ProjectileSimulation{ projectile, ProjectileFrameData{ *projectile } });
         }
     }
 
-    void PhysicsSystem::stepSimulation(float dt, bool skipSimulation, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
+    void PhysicsSystem::stepSimulation(
+        float dt, bool skipSimulation, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
     {
         for (auto& [animatedObject, changed] : mAnimatedObjects)
         {
@@ -797,7 +819,8 @@ namespace MWPhysics
         auto* player = getActor(MWMechanics::getPlayer());
         const auto world = MWBase::Environment::get().getWorld();
 
-        // copy new ptr position in temporary vector. player is handled separately as its movement might change active cell.
+        // copy new ptr position in temporary vector. player is handled separately as its movement might change active
+        // cell.
         mActorsPositions.clear();
         mActorsPositions.reserve(mActors.size() - 1);
         for (const auto& [ptr, physicActor] : mActors)
@@ -827,7 +850,7 @@ namespace MWPhysics
             mTaskScheduler->debugDraw();
     }
 
-    bool PhysicsSystem::isActorStandingOn(const MWWorld::Ptr &actor, const MWWorld::ConstPtr &object) const
+    bool PhysicsSystem::isActorStandingOn(const MWWorld::Ptr& actor, const MWWorld::ConstPtr& object) const
     {
         const auto physActor = mActors.find(actor.mRef);
         if (physActor != mActors.end())
@@ -835,7 +858,7 @@ namespace MWPhysics
         return false;
     }
 
-    void PhysicsSystem::getActorsStandingOn(const MWWorld::ConstPtr &object, std::vector<MWWorld::Ptr> &out) const
+    void PhysicsSystem::getActorsStandingOn(const MWWorld::ConstPtr& object, std::vector<MWWorld::Ptr>& out) const
     {
         for (const auto& [_, actor] : mActors)
         {
@@ -844,13 +867,13 @@ namespace MWPhysics
         }
     }
 
-    bool PhysicsSystem::isActorCollidingWith(const MWWorld::Ptr &actor, const MWWorld::ConstPtr &object) const
+    bool PhysicsSystem::isActorCollidingWith(const MWWorld::Ptr& actor, const MWWorld::ConstPtr& object) const
     {
         std::vector<MWWorld::Ptr> collisions = getCollisions(object, CollisionType_World, CollisionType_Actor);
         return (std::find(collisions.begin(), collisions.end(), actor) != collisions.end());
     }
 
-    void PhysicsSystem::getActorsCollidingWith(const MWWorld::ConstPtr &object, std::vector<MWWorld::Ptr> &out) const
+    void PhysicsSystem::getActorsCollidingWith(const MWWorld::ConstPtr& object, std::vector<MWWorld::Ptr>& out) const
     {
         std::vector<MWWorld::Ptr> collisions = getCollisions(object, CollisionType_World, CollisionType_Actor);
         out.insert(out.end(), collisions.begin(), collisions.end());
@@ -898,10 +921,10 @@ namespace MWPhysics
         }
 
         mWaterCollisionObject = std::make_unique<btCollisionObject>();
-        mWaterCollisionShape = std::make_unique<btStaticPlaneShape>(btVector3(0,0,1), mWaterHeight);
+        mWaterCollisionShape = std::make_unique<btStaticPlaneShape>(btVector3(0, 0, 1), mWaterHeight);
         mWaterCollisionObject->setCollisionShape(mWaterCollisionShape.get());
-        mTaskScheduler->addCollisionObject(mWaterCollisionObject.get(), CollisionType_Water,
-                                                    CollisionType_Actor|CollisionType_Projectile);
+        mTaskScheduler->addCollisionObject(
+            mWaterCollisionObject.get(), CollisionType_Water, CollisionType_Actor | CollisionType_Projectile);
     }
 
     bool PhysicsSystem::isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
@@ -914,8 +937,7 @@ namespace MWPhysics
                 ignoredObjects.push_back(it->second->getCollisionObject());
         std::sort(ignoredObjects.begin(), ignoredObjects.end());
         ignoredObjects.erase(std::unique(ignoredObjects.begin(), ignoredObjects.end()), ignoredObjects.end());
-        const auto ignoreFilter = [&] (const btCollisionObject* v)
-        {
+        const auto ignoreFilter = [&](const btCollisionObject* v) {
             return std::binary_search(ignoredObjects.begin(), ignoredObjects.end(), v);
         };
         const auto bulletPosition = Misc::Convert::toBullet(position);
@@ -926,12 +948,11 @@ namespace MWPhysics
         if (occupyingActors == nullptr)
         {
             HasSphereCollisionCallback callback(bulletPosition, radius, mask, group, ignoreFilter,
-                                                static_cast<void (*)(const btCollisionObject*)>(nullptr));
+                static_cast<void (*)(const btCollisionObject*)>(nullptr));
             mTaskScheduler->aabbTest(aabbMin, aabbMax, callback);
             return callback.getResult();
         }
-        const auto onCollision = [&] (const btCollisionObject* object)
-        {
+        const auto onCollision = [&](const btCollisionObject* object) {
             if (PtrHolder* holder = static_cast<PtrHolder*>(object->getUserPointer()))
                 occupyingActors->push_back(holder->getPtr());
         };
@@ -962,7 +983,14 @@ namespace MWPhysics
         , mWalkingOnWater(false)
         , mInert(inert)
         , mCollisionObject(actor.getCollisionObject())
-        , mSwimLevel(waterlevel - (actor.getRenderingHalfExtents().z() * 2 * MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fSwimHeightScale")->mValue.getFloat()))
+        , mSwimLevel(waterlevel
+              - (actor.getRenderingHalfExtents().z() * 2
+                  * MWBase::Environment::get()
+                        .getWorld()
+                        ->getStore()
+                        .get<ESM::GameSetting>()
+                        .find("fSwimHeightScale")
+                        ->mValue.getFloat()))
         , mSlowFall(slowFall)
         , mRotation()
         , mMovement(actor.velocity())
@@ -990,25 +1018,29 @@ namespace MWPhysics
     WorldFrameData::WorldFrameData()
         : mIsInStorm(MWBase::Environment::get().getWorld()->isInStorm())
         , mStormDirection(MWBase::Environment::get().getWorld()->getStormDirection())
-    {}
+    {
+    }
 
     LOSRequest::LOSRequest(const std::weak_ptr<Actor>& a1, const std::weak_ptr<Actor>& a2)
-        : mResult(false), mStale(false), mAge(0)
+        : mResult(false)
+        , mStale(false)
+        , mAge(0)
     {
         // we use raw actor pointer pair to uniquely identify request
-        // sort the pointer value in ascending order to not duplicate equivalent requests, eg. getLOS(A, B) and getLOS(B, A)
+        // sort the pointer value in ascending order to not duplicate equivalent requests, eg. getLOS(A, B) and
+        // getLOS(B, A)
         auto* raw1 = a1.lock().get();
         auto* raw2 = a2.lock().get();
         assert(raw1 != raw2);
         if (raw1 < raw2)
         {
-            mActors = {a1, a2};
-            mRawActors = {raw1, raw2};
+            mActors = { a1, a2 };
+            mRawActors = { raw1, raw2 };
         }
         else
         {
-            mActors = {a2, a1};
-            mRawActors = {raw2, raw1};
+            mActors = { a2, a1 };
+            mRawActors = { raw2, raw1 };
         }
     }
 
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 094d4e2230..57dbde1471 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -1,21 +1,21 @@
 #ifndef OPENMW_MWPHYSICS_PHYSICSSYSTEM_H
 #define OPENMW_MWPHYSICS_PHYSICSSYSTEM_H
 
+#include <algorithm>
 #include <array>
-#include <memory>
+#include <functional>
 #include <map>
+#include <memory>
+#include <optional>
 #include <set>
+#include <span>
 #include <unordered_map>
-#include <algorithm>
 #include <variant>
-#include <optional>
-#include <functional>
-#include <span>
 
-#include <osg/Quat>
 #include <osg/BoundingBox>
-#include <osg/ref_ptr>
+#include <osg/Quat>
 #include <osg/Timer>
+#include <osg/ref_ptr>
 
 #include <components/detournavigator/collisionshapetype.hpp>
 
@@ -125,19 +125,23 @@ namespace MWPhysics
     template <class Ptr, class FrameData>
     class SimulationImpl
     {
-        public:
-            explicit SimulationImpl(const std::weak_ptr<Ptr>& ptr, FrameData&& data) : mPtr(ptr), mData(data) {}
-
-            std::optional<std::pair<std::shared_ptr<Ptr>, std::reference_wrapper<FrameData>>> lock()
-            {
-                if (auto locked = mPtr.lock())
-                    return {{std::move(locked), std::ref(mData)}};
-                return std::nullopt;
-            }
-
-        private:
-            std::weak_ptr<Ptr> mPtr;
-            FrameData mData;
+    public:
+        explicit SimulationImpl(const std::weak_ptr<Ptr>& ptr, FrameData&& data)
+            : mPtr(ptr)
+            , mData(data)
+        {
+        }
+
+        std::optional<std::pair<std::shared_ptr<Ptr>, std::reference_wrapper<FrameData>>> lock()
+        {
+            if (auto locked = mPtr.lock())
+                return { { std::move(locked), std::ref(mData) } };
+            return std::nullopt;
+        }
+
+    private:
+        std::weak_ptr<Ptr> mPtr;
+        FrameData mData;
     };
 
     using ActorSimulation = SimulationImpl<Actor, ActorFrameData>;
@@ -146,199 +150,205 @@ namespace MWPhysics
 
     class PhysicsSystem : public RayCastingInterface
     {
-        public:
-            PhysicsSystem (Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> parentNode);
-            virtual ~PhysicsSystem ();
-
-            Resource::BulletShapeManager* getShapeManager();
-
-            void enableWater(float height);
-            void setWaterHeight(float height);
-            void disableWater();
+    public:
+        PhysicsSystem(Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> parentNode);
+        virtual ~PhysicsSystem();
 
-            void addObject (const MWWorld::Ptr& ptr, const std::string& mesh, osg::Quat rotation, int collisionType = CollisionType_World);
-            void addActor (const MWWorld::Ptr& ptr, const std::string& mesh);
+        Resource::BulletShapeManager* getShapeManager();
 
-            int addProjectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, const std::string& mesh, bool computeRadius);
-            void setCaster(int projectileId, const MWWorld::Ptr& caster);
-            void removeProjectile(const int projectileId);
+        void enableWater(float height);
+        void setWaterHeight(float height);
+        void disableWater();
 
-            void updatePtr (const MWWorld::Ptr& old, const MWWorld::Ptr& updated);
+        void addObject(const MWWorld::Ptr& ptr, const std::string& mesh, osg::Quat rotation,
+            int collisionType = CollisionType_World);
+        void addActor(const MWWorld::Ptr& ptr, const std::string& mesh);
 
-            Actor* getActor(const MWWorld::Ptr& ptr);
-            const Actor* getActor(const MWWorld::ConstPtr& ptr) const;
+        int addProjectile(
+            const MWWorld::Ptr& caster, const osg::Vec3f& position, const std::string& mesh, bool computeRadius);
+        void setCaster(int projectileId, const MWWorld::Ptr& caster);
+        void removeProjectile(const int projectileId);
 
-            const Object* getObject(const MWWorld::ConstPtr& ptr) const;
+        void updatePtr(const MWWorld::Ptr& old, const MWWorld::Ptr& updated);
 
-            Projectile* getProjectile(int projectileId) const;
+        Actor* getActor(const MWWorld::Ptr& ptr);
+        const Actor* getActor(const MWWorld::ConstPtr& ptr) const;
 
-            // Object or Actor
-            void remove (const MWWorld::Ptr& ptr);
+        const Object* getObject(const MWWorld::ConstPtr& ptr) const;
 
-            void updateScale (const MWWorld::Ptr& ptr);
-            void updateRotation (const MWWorld::Ptr& ptr, osg::Quat rotate);
-            void updatePosition (const MWWorld::Ptr& ptr);
+        Projectile* getProjectile(int projectileId) const;
 
-            void addHeightField(const float* heights, int x, int y, int size, int verts, float minH, float maxH, const osg::Object* holdObject);
+        // Object or Actor
+        void remove(const MWWorld::Ptr& ptr);
 
-            void removeHeightField (int x, int y);
+        void updateScale(const MWWorld::Ptr& ptr);
+        void updateRotation(const MWWorld::Ptr& ptr, osg::Quat rotate);
+        void updatePosition(const MWWorld::Ptr& ptr);
 
-            const HeightField* getHeightField(int x, int y) const;
+        void addHeightField(const float* heights, int x, int y, int size, int verts, float minH, float maxH,
+            const osg::Object* holdObject);
 
-            bool toggleCollisionMode();
+        void removeHeightField(int x, int y);
 
-            /// Determine new position based on all queued movements, then clear the list.
-            void stepSimulation(float dt, bool skipSimulation, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
+        const HeightField* getHeightField(int x, int y) const;
 
-            /// Apply new positions to actors
-            void moveActors();
-            void debugDraw();
+        bool toggleCollisionMode();
 
-            std::vector<MWWorld::Ptr> getCollisions(const MWWorld::ConstPtr &ptr, int collisionGroup, int collisionMask) const; ///< get handles this object collides with
-            std::vector<ContactPoint> getCollisionsPoints(const MWWorld::ConstPtr &ptr, int collisionGroup, int collisionMask) const;
-            osg::Vec3f traceDown(const MWWorld::Ptr &ptr, const osg::Vec3f& position, float maxHeight);
+        /// Determine new position based on all queued movements, then clear the list.
+        void stepSimulation(
+            float dt, bool skipSimulation, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
 
-            std::pair<MWWorld::Ptr, osg::Vec3f> getHitContact(const MWWorld::ConstPtr& actor,
-                                                               const osg::Vec3f &origin,
-                                                               const osg::Quat &orientation,
-                                                               float queryDistance, std::vector<MWWorld::Ptr>& targets);
+        /// Apply new positions to actors
+        void moveActors();
+        void debugDraw();
 
+        std::vector<MWWorld::Ptr> getCollisions(const MWWorld::ConstPtr& ptr, int collisionGroup,
+            int collisionMask) const; ///< get handles this object collides with
+        std::vector<ContactPoint> getCollisionsPoints(
+            const MWWorld::ConstPtr& ptr, int collisionGroup, int collisionMask) const;
+        osg::Vec3f traceDown(const MWWorld::Ptr& ptr, const osg::Vec3f& position, float maxHeight);
 
-            /// Get distance from \a point to the collision shape of \a target. Uses a raycast to find where the
-            /// target vector hits the collision shape and then calculates distance from the intersection point.
-            /// This can be used to find out how much nearer we need to move to the target for a "getHitContact" to be successful.
-            /// \note Only Actor targets are supported at the moment.
-            float getHitDistance(const osg::Vec3f& point, const MWWorld::ConstPtr& target) const override;
+        std::pair<MWWorld::Ptr, osg::Vec3f> getHitContact(const MWWorld::ConstPtr& actor, const osg::Vec3f& origin,
+            const osg::Quat& orientation, float queryDistance, std::vector<MWWorld::Ptr>& targets);
 
-            /// @param me Optional, a Ptr to ignore in the list of results. targets are actors to filter for, ignoring all other actors.
-            RayCastingResult castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore = MWWorld::ConstPtr(),
-                    const std::vector<MWWorld::Ptr>& targets = std::vector<MWWorld::Ptr>(),
-                    int mask = CollisionType_Default, int group=0xff) const override;
+        /// Get distance from \a point to the collision shape of \a target. Uses a raycast to find where the
+        /// target vector hits the collision shape and then calculates distance from the intersection point.
+        /// This can be used to find out how much nearer we need to move to the target for a "getHitContact" to be
+        /// successful. \note Only Actor targets are supported at the moment.
+        float getHitDistance(const osg::Vec3f& point, const MWWorld::ConstPtr& target) const override;
 
-            RayCastingResult castSphere(const osg::Vec3f& from, const osg::Vec3f& to, float radius,
-                    int mask = CollisionType_Default, int group=0xff) const override;
+        /// @param me Optional, a Ptr to ignore in the list of results. targets are actors to filter for, ignoring all
+        /// other actors.
+        RayCastingResult castRay(const osg::Vec3f& from, const osg::Vec3f& to,
+            const MWWorld::ConstPtr& ignore = MWWorld::ConstPtr(),
+            const std::vector<MWWorld::Ptr>& targets = std::vector<MWWorld::Ptr>(), int mask = CollisionType_Default,
+            int group = 0xff) const override;
 
-            /// Return true if actor1 can see actor2.
-            bool getLineOfSight(const MWWorld::ConstPtr& actor1, const MWWorld::ConstPtr& actor2) const override;
+        RayCastingResult castSphere(const osg::Vec3f& from, const osg::Vec3f& to, float radius,
+            int mask = CollisionType_Default, int group = 0xff) const override;
 
-            bool isOnGround (const MWWorld::Ptr& actor);
+        /// Return true if actor1 can see actor2.
+        bool getLineOfSight(const MWWorld::ConstPtr& actor1, const MWWorld::ConstPtr& actor2) const override;
 
-            bool canMoveToWaterSurface (const MWWorld::ConstPtr &actor, const float waterlevel);
+        bool isOnGround(const MWWorld::Ptr& actor);
 
-            /// Get physical half extents (scaled) of the given actor.
-            osg::Vec3f getHalfExtents(const MWWorld::ConstPtr& actor) const;
+        bool canMoveToWaterSurface(const MWWorld::ConstPtr& actor, const float waterlevel);
 
-            /// Get physical half extents (not scaled) of the given actor.
-            osg::Vec3f getOriginalHalfExtents(const MWWorld::ConstPtr& actor) const;
+        /// Get physical half extents (scaled) of the given actor.
+        osg::Vec3f getHalfExtents(const MWWorld::ConstPtr& actor) const;
 
-            /// @see MWPhysics::Actor::getRenderingHalfExtents
-            osg::Vec3f getRenderingHalfExtents(const MWWorld::ConstPtr& actor) const;
+        /// Get physical half extents (not scaled) of the given actor.
+        osg::Vec3f getOriginalHalfExtents(const MWWorld::ConstPtr& actor) const;
 
-            /// Get the position of the collision shape for the actor. Use together with getHalfExtents() to get the collision bounds in world space.
-            /// @note The collision shape's origin is in its center, so the position returned can be described as center of the actor collision box in world space.
-            osg::Vec3f getCollisionObjectPosition(const MWWorld::ConstPtr& actor) const;
+        /// @see MWPhysics::Actor::getRenderingHalfExtents
+        osg::Vec3f getRenderingHalfExtents(const MWWorld::ConstPtr& actor) const;
 
-            /// Get bounding box in world space of the given object.
-            osg::BoundingBox getBoundingBox(const MWWorld::ConstPtr &object) const;
+        /// Get the position of the collision shape for the actor. Use together with getHalfExtents() to get the
+        /// collision bounds in world space.
+        /// @note The collision shape's origin is in its center, so the position returned can be described as center of
+        /// the actor collision box in world space.
+        osg::Vec3f getCollisionObjectPosition(const MWWorld::ConstPtr& actor) const;
 
-            /// Queues velocity movement for a Ptr. If a Ptr is already queued, its velocity will
-            /// be overwritten. Valid until the next call to stepSimulation
-            void queueObjectMovement(const MWWorld::Ptr &ptr, const osg::Vec3f &velocity);
+        /// Get bounding box in world space of the given object.
+        osg::BoundingBox getBoundingBox(const MWWorld::ConstPtr& object) const;
 
-            /// Clear the queued movements list without applying.
-            void clearQueuedMovement();
+        /// Queues velocity movement for a Ptr. If a Ptr is already queued, its velocity will
+        /// be overwritten. Valid until the next call to stepSimulation
+        void queueObjectMovement(const MWWorld::Ptr& ptr, const osg::Vec3f& velocity);
 
-            /// Return true if \a actor has been standing on \a object in this frame
-            /// This will trigger whenever the object is directly below the actor.
-            /// It doesn't matter if the actor is stationary or moving.
-            bool isActorStandingOn(const MWWorld::Ptr& actor, const MWWorld::ConstPtr& object) const;
+        /// Clear the queued movements list without applying.
+        void clearQueuedMovement();
 
-            /// Get the handle of all actors standing on \a object in this frame.
-            void getActorsStandingOn(const MWWorld::ConstPtr& object, std::vector<MWWorld::Ptr>& out) const;
+        /// Return true if \a actor has been standing on \a object in this frame
+        /// This will trigger whenever the object is directly below the actor.
+        /// It doesn't matter if the actor is stationary or moving.
+        bool isActorStandingOn(const MWWorld::Ptr& actor, const MWWorld::ConstPtr& object) const;
 
-            /// Return true if \a actor has collided with \a object in this frame.
-            /// This will detect running into objects, but will not detect climbing stairs, stepping up a small object, etc.
-            bool isActorCollidingWith(const MWWorld::Ptr& actor, const MWWorld::ConstPtr& object) const;
+        /// Get the handle of all actors standing on \a object in this frame.
+        void getActorsStandingOn(const MWWorld::ConstPtr& object, std::vector<MWWorld::Ptr>& out) const;
 
-            /// Get the handle of all actors colliding with \a object in this frame.
-            void getActorsCollidingWith(const MWWorld::ConstPtr& object, std::vector<MWWorld::Ptr>& out) const;
+        /// Return true if \a actor has collided with \a object in this frame.
+        /// This will detect running into objects, but will not detect climbing stairs, stepping up a small object, etc.
+        bool isActorCollidingWith(const MWWorld::Ptr& actor, const MWWorld::ConstPtr& object) const;
 
-            bool toggleDebugRendering();
+        /// Get the handle of all actors colliding with \a object in this frame.
+        void getActorsCollidingWith(const MWWorld::ConstPtr& object, std::vector<MWWorld::Ptr>& out) const;
 
-            /// Mark the given object as a 'non-solid' object. A non-solid object means that
-            /// \a isOnSolidGround will return false for actors standing on that object.
-            void markAsNonSolid (const MWWorld::ConstPtr& ptr);
+        bool toggleDebugRendering();
 
-            bool isOnSolidGround (const MWWorld::Ptr& actor) const;
+        /// Mark the given object as a 'non-solid' object. A non-solid object means that
+        /// \a isOnSolidGround will return false for actors standing on that object.
+        void markAsNonSolid(const MWWorld::ConstPtr& ptr);
 
-            void updateAnimatedCollisionShape(const MWWorld::Ptr& object);
+        bool isOnSolidGround(const MWWorld::Ptr& actor) const;
 
-            template <class Function>
-            void forEachAnimatedObject(Function&& function) const
-            {
-                std::for_each(mAnimatedObjects.begin(), mAnimatedObjects.end(), function);
-            }
+        void updateAnimatedCollisionShape(const MWWorld::Ptr& object);
 
-            bool isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
-                std::span<const MWWorld::ConstPtr> ignore, std::vector<MWWorld::Ptr>* occupyingActors) const;
+        template <class Function>
+        void forEachAnimatedObject(Function&& function) const
+        {
+            std::for_each(mAnimatedObjects.begin(), mAnimatedObjects.end(), function);
+        }
 
-            void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
-            void reportCollision(const btVector3& position, const btVector3& normal);
+        bool isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
+            std::span<const MWWorld::ConstPtr> ignore, std::vector<MWWorld::Ptr>* occupyingActors) const;
 
-        private:
+        void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
+        void reportCollision(const btVector3& position, const btVector3& normal);
 
-            void updateWater();
+    private:
+        void updateWater();
 
-            void prepareSimulation(bool willSimulate, std::vector<Simulation>& simulations);
+        void prepareSimulation(bool willSimulate, std::vector<Simulation>& simulations);
 
-            std::unique_ptr<btBroadphaseInterface> mBroadphase;
-            std::unique_ptr<btDefaultCollisionConfiguration> mCollisionConfiguration;
-            std::unique_ptr<btCollisionDispatcher> mDispatcher;
-            std::unique_ptr<btCollisionWorld> mCollisionWorld;
-            std::unique_ptr<PhysicsTaskScheduler> mTaskScheduler;
+        std::unique_ptr<btBroadphaseInterface> mBroadphase;
+        std::unique_ptr<btDefaultCollisionConfiguration> mCollisionConfiguration;
+        std::unique_ptr<btCollisionDispatcher> mDispatcher;
+        std::unique_ptr<btCollisionWorld> mCollisionWorld;
+        std::unique_ptr<PhysicsTaskScheduler> mTaskScheduler;
 
-            std::unique_ptr<Resource::BulletShapeManager> mShapeManager;
-            Resource::ResourceSystem* mResourceSystem;
+        std::unique_ptr<Resource::BulletShapeManager> mShapeManager;
+        Resource::ResourceSystem* mResourceSystem;
 
-            using ObjectMap = std::unordered_map<const MWWorld::LiveCellRefBase*, std::shared_ptr<Object>>;
-            ObjectMap mObjects;
+        using ObjectMap = std::unordered_map<const MWWorld::LiveCellRefBase*, std::shared_ptr<Object>>;
+        ObjectMap mObjects;
 
-            std::map<Object*, bool> mAnimatedObjects; // stores pointers to elements in mObjects
+        std::map<Object*, bool> mAnimatedObjects; // stores pointers to elements in mObjects
 
-            ActorMap mActors;
+        ActorMap mActors;
 
-            using ProjectileMap = std::map<int, std::shared_ptr<Projectile>>;
-            ProjectileMap mProjectiles;
+        using ProjectileMap = std::map<int, std::shared_ptr<Projectile>>;
+        ProjectileMap mProjectiles;
 
-            using HeightFieldMap = std::map<std::pair<int, int>, std::unique_ptr<HeightField>>;
-            HeightFieldMap mHeightFields;
+        using HeightFieldMap = std::map<std::pair<int, int>, std::unique_ptr<HeightField>>;
+        HeightFieldMap mHeightFields;
 
-            bool mDebugDrawEnabled;
+        bool mDebugDrawEnabled;
 
-            float mTimeAccum;
+        float mTimeAccum;
 
-            unsigned int mProjectileId;
+        unsigned int mProjectileId;
 
-            float mWaterHeight;
-            bool mWaterEnabled;
+        float mWaterHeight;
+        bool mWaterEnabled;
 
-            std::unique_ptr<btCollisionObject> mWaterCollisionObject;
-            std::unique_ptr<btCollisionShape> mWaterCollisionShape;
+        std::unique_ptr<btCollisionObject> mWaterCollisionObject;
+        std::unique_ptr<btCollisionShape> mWaterCollisionShape;
 
-            std::unique_ptr<MWRender::DebugDrawer> mDebugDrawer;
+        std::unique_ptr<MWRender::DebugDrawer> mDebugDrawer;
 
-            osg::ref_ptr<osg::Group> mParentNode;
+        osg::ref_ptr<osg::Group> mParentNode;
 
-            float mPhysicsDt;
+        float mPhysicsDt;
 
-            DetourNavigator::CollisionShapeType mActorCollisionShapeType;
+        DetourNavigator::CollisionShapeType mActorCollisionShapeType;
 
-            std::size_t mSimulationsCounter = 0;
-            std::array<std::vector<Simulation>, 2> mSimulations;
-            std::vector<std::pair<MWWorld::Ptr, osg::Vec3f>> mActorsPositions;
+        std::size_t mSimulationsCounter = 0;
+        std::array<std::vector<Simulation>, 2> mSimulations;
+        std::vector<std::pair<MWWorld::Ptr, osg::Vec3f>> mActorsPositions;
 
-            PhysicsSystem (const PhysicsSystem&);
-            PhysicsSystem& operator= (const PhysicsSystem&);
+        PhysicsSystem(const PhysicsSystem&);
+        PhysicsSystem& operator=(const PhysicsSystem&);
     };
 }
 
diff --git a/apps/openmw/mwphysics/projectile.cpp b/apps/openmw/mwphysics/projectile.cpp
index d9bfd74bf5..242549147d 100644
--- a/apps/openmw/mwphysics/projectile.cpp
+++ b/apps/openmw/mwphysics/projectile.cpp
@@ -14,111 +14,111 @@
 
 namespace MWPhysics
 {
-Projectile::Projectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, float radius, PhysicsTaskScheduler* scheduler, PhysicsSystem* physicssystem)
-    : PtrHolder(MWWorld::Ptr(), position)
-    , mHitWater(false)
-    , mActive(true)
-    , mHitTarget(nullptr)
-    , mPhysics(physicssystem)
-    , mTaskScheduler(scheduler)
-{
-    mShape = std::make_unique<btSphereShape>(radius);
-    mConvexShape = static_cast<btConvexShape*>(mShape.get());
+    Projectile::Projectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, float radius,
+        PhysicsTaskScheduler* scheduler, PhysicsSystem* physicssystem)
+        : PtrHolder(MWWorld::Ptr(), position)
+        , mHitWater(false)
+        , mActive(true)
+        , mHitTarget(nullptr)
+        , mPhysics(physicssystem)
+        , mTaskScheduler(scheduler)
+    {
+        mShape = std::make_unique<btSphereShape>(radius);
+        mConvexShape = static_cast<btConvexShape*>(mShape.get());
 
-    mCollisionObject = std::make_unique<btCollisionObject>();
-    mCollisionObject->setCollisionFlags(btCollisionObject::CF_KINEMATIC_OBJECT);
-    mCollisionObject->setActivationState(DISABLE_DEACTIVATION);
-    mCollisionObject->setCollisionShape(mShape.get());
-    mCollisionObject->setUserPointer(this);
+        mCollisionObject = std::make_unique<btCollisionObject>();
+        mCollisionObject->setCollisionFlags(btCollisionObject::CF_KINEMATIC_OBJECT);
+        mCollisionObject->setActivationState(DISABLE_DEACTIVATION);
+        mCollisionObject->setCollisionShape(mShape.get());
+        mCollisionObject->setUserPointer(this);
 
-    mPosition = position;
-    mPreviousPosition = position;
-    mSimulationPosition = position;
-    setCaster(caster);
+        mPosition = position;
+        mPreviousPosition = position;
+        mSimulationPosition = position;
+        setCaster(caster);
 
-    const int collisionMask = CollisionType_World | CollisionType_HeightMap |
-        CollisionType_Actor | CollisionType_Door | CollisionType_Water | CollisionType_Projectile;
-    mTaskScheduler->addCollisionObject(mCollisionObject.get(), CollisionType_Projectile, collisionMask);
+        const int collisionMask = CollisionType_World | CollisionType_HeightMap | CollisionType_Actor
+            | CollisionType_Door | CollisionType_Water | CollisionType_Projectile;
+        mTaskScheduler->addCollisionObject(mCollisionObject.get(), CollisionType_Projectile, collisionMask);
 
-    updateCollisionObjectPosition();
-}
+        updateCollisionObjectPosition();
+    }
 
-Projectile::~Projectile()
-{
-    if (!mActive)
-        mPhysics->reportCollision(mHitPosition, mHitNormal);
-    mTaskScheduler->removeCollisionObject(mCollisionObject.get());
-}
+    Projectile::~Projectile()
+    {
+        if (!mActive)
+            mPhysics->reportCollision(mHitPosition, mHitNormal);
+        mTaskScheduler->removeCollisionObject(mCollisionObject.get());
+    }
 
-void Projectile::updateCollisionObjectPosition()
-{
-    std::scoped_lock lock(mMutex);
-    auto& trans = mCollisionObject->getWorldTransform();
-    trans.setOrigin(Misc::Convert::toBullet(mPosition));
-    mCollisionObject->setWorldTransform(trans);
-}
+    void Projectile::updateCollisionObjectPosition()
+    {
+        std::scoped_lock lock(mMutex);
+        auto& trans = mCollisionObject->getWorldTransform();
+        trans.setOrigin(Misc::Convert::toBullet(mPosition));
+        mCollisionObject->setWorldTransform(trans);
+    }
 
-void Projectile::hit(const btCollisionObject* target, btVector3 pos, btVector3 normal)
-{
-    bool active = true;
-    if (!mActive.compare_exchange_strong(active, false, std::memory_order_relaxed) || !active)
-        return;
-    mHitTarget = target;
-    mHitPosition = pos;
-    mHitNormal = normal;
-}
+    void Projectile::hit(const btCollisionObject* target, btVector3 pos, btVector3 normal)
+    {
+        bool active = true;
+        if (!mActive.compare_exchange_strong(active, false, std::memory_order_relaxed) || !active)
+            return;
+        mHitTarget = target;
+        mHitPosition = pos;
+        mHitNormal = normal;
+    }
 
-MWWorld::Ptr Projectile::getTarget() const
-{
-    assert(!mActive);
-    auto* target = static_cast<PtrHolder*>(mHitTarget->getUserPointer());
-    return target ? target->getPtr() : MWWorld::Ptr();
-}
+    MWWorld::Ptr Projectile::getTarget() const
+    {
+        assert(!mActive);
+        auto* target = static_cast<PtrHolder*>(mHitTarget->getUserPointer());
+        return target ? target->getPtr() : MWWorld::Ptr();
+    }
 
-MWWorld::Ptr Projectile::getCaster() const
-{
-    return mCaster;
-}
+    MWWorld::Ptr Projectile::getCaster() const
+    {
+        return mCaster;
+    }
 
-void Projectile::setCaster(const MWWorld::Ptr& caster)
-{
-    mCaster = caster;
-    mCasterColObj = [this,&caster]() -> const btCollisionObject*
+    void Projectile::setCaster(const MWWorld::Ptr& caster)
     {
-        const Actor* actor = mPhysics->getActor(caster);
-        if (actor)
-            return actor->getCollisionObject();
-        const Object* object = mPhysics->getObject(caster);
-        if (object)
-            return object->getCollisionObject();
-        return nullptr;
-    }();
-}
+        mCaster = caster;
+        mCasterColObj = [this, &caster]() -> const btCollisionObject* {
+            const Actor* actor = mPhysics->getActor(caster);
+            if (actor)
+                return actor->getCollisionObject();
+            const Object* object = mPhysics->getObject(caster);
+            if (object)
+                return object->getCollisionObject();
+            return nullptr;
+        }();
+    }
 
-void Projectile::setValidTargets(const std::vector<MWWorld::Ptr>& targets)
-{
-    std::scoped_lock lock(mMutex);
-    mValidTargets.clear();
-    for (const auto& ptr : targets)
+    void Projectile::setValidTargets(const std::vector<MWWorld::Ptr>& targets)
     {
-        const auto* physicActor = mPhysics->getActor(ptr);
-        if (physicActor)
-            mValidTargets.push_back(physicActor->getCollisionObject());
+        std::scoped_lock lock(mMutex);
+        mValidTargets.clear();
+        for (const auto& ptr : targets)
+        {
+            const auto* physicActor = mPhysics->getActor(ptr);
+            if (physicActor)
+                mValidTargets.push_back(physicActor->getCollisionObject());
+        }
     }
-}
 
-bool Projectile::isValidTarget(const btCollisionObject* target) const
-{
-    assert(target);
-    std::scoped_lock lock(mMutex);
-    if (mCasterColObj == target)
-        return false;
+    bool Projectile::isValidTarget(const btCollisionObject* target) const
+    {
+        assert(target);
+        std::scoped_lock lock(mMutex);
+        if (mCasterColObj == target)
+            return false;
 
-    if (mValidTargets.empty())
-        return true;
+        if (mValidTargets.empty())
+            return true;
 
-    return std::any_of(mValidTargets.begin(), mValidTargets.end(),
+        return std::any_of(mValidTargets.begin(), mValidTargets.end(),
             [target](const btCollisionObject* actor) { return target == actor; });
-}
+    }
 
 }
diff --git a/apps/openmw/mwphysics/projectile.hpp b/apps/openmw/mwphysics/projectile.hpp
index 44569d29bf..d8eebf3057 100644
--- a/apps/openmw/mwphysics/projectile.hpp
+++ b/apps/openmw/mwphysics/projectile.hpp
@@ -31,49 +31,34 @@ namespace MWPhysics
     class Projectile final : public PtrHolder
     {
     public:
-        Projectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, float radius, PhysicsTaskScheduler* scheduler, PhysicsSystem* physicssystem);
+        Projectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, float radius,
+            PhysicsTaskScheduler* scheduler, PhysicsSystem* physicssystem);
         ~Projectile() override;
 
         btConvexShape* getConvexShape() const { return mConvexShape; }
 
         void updateCollisionObjectPosition();
 
-        bool isActive() const
-        {
-            return mActive.load(std::memory_order_acquire);
-        }
+        bool isActive() const { return mActive.load(std::memory_order_acquire); }
 
         MWWorld::Ptr getTarget() const;
 
         MWWorld::Ptr getCaster() const;
         void setCaster(const MWWorld::Ptr& caster);
-        const btCollisionObject* getCasterCollisionObject() const
-        {
-            return mCasterColObj;
-        }
+        const btCollisionObject* getCasterCollisionObject() const { return mCasterColObj; }
 
-        void setHitWater()
-        {
-            mHitWater = true;
-        }
+        void setHitWater() { mHitWater = true; }
 
-        bool getHitWater() const
-        {
-            return mHitWater;
-        }
+        bool getHitWater() const { return mHitWater; }
 
         void hit(const btCollisionObject* target, btVector3 pos, btVector3 normal);
 
         void setValidTargets(const std::vector<MWWorld::Ptr>& targets);
         bool isValidTarget(const btCollisionObject* target) const;
 
-        btVector3 getHitPosition() const
-        {
-            return mHitPosition;
-        }
+        btVector3 getHitPosition() const { return mHitPosition; }
 
     private:
-
         std::unique_ptr<btCollisionShape> mShape;
         btConvexShape* mConvexShape;
 
@@ -89,8 +74,8 @@ namespace MWPhysics
 
         mutable std::mutex mMutex;
 
-        PhysicsSystem *mPhysics;
-        PhysicsTaskScheduler *mTaskScheduler;
+        PhysicsSystem* mPhysics;
+        PhysicsTaskScheduler* mTaskScheduler;
 
         Projectile(const Projectile&);
         Projectile& operator=(const Projectile&);
@@ -98,5 +83,4 @@ namespace MWPhysics
 
 }
 
-
 #endif
diff --git a/apps/openmw/mwphysics/projectileconvexcallback.cpp b/apps/openmw/mwphysics/projectileconvexcallback.cpp
index 6520be787d..d3cbf1f21e 100644
--- a/apps/openmw/mwphysics/projectileconvexcallback.cpp
+++ b/apps/openmw/mwphysics/projectileconvexcallback.cpp
@@ -10,7 +10,8 @@
 
 namespace MWPhysics
 {
-    ProjectileConvexCallback::ProjectileConvexCallback(const btCollisionObject* caster, const btCollisionObject* me, const btVector3& from, const btVector3& to, Projectile* proj)
+    ProjectileConvexCallback::ProjectileConvexCallback(const btCollisionObject* caster, const btCollisionObject* me,
+        const btVector3& from, const btVector3& to, Projectile* proj)
         : btCollisionWorld::ClosestConvexResultCallback(from, to)
         , mCaster(caster)
         , mMe(me)
@@ -19,7 +20,8 @@ namespace MWPhysics
         assert(mProjectile);
     }
 
-    btScalar ProjectileConvexCallback::addSingleResult(btCollisionWorld::LocalConvexResult& result, bool normalInWorldSpace)
+    btScalar ProjectileConvexCallback::addSingleResult(
+        btCollisionWorld::LocalConvexResult& result, bool normalInWorldSpace)
     {
         const auto* hitObject = result.m_hitCollisionObject;
         // don't hit the caster
@@ -34,24 +36,24 @@ namespace MWPhysics
         switch (hitObject->getBroadphaseHandle()->m_collisionFilterGroup)
         {
             case CollisionType_Actor:
-                {
-                    if (!mProjectile->isValidTarget(hitObject))
-                        return 1.f;
-                    break;
-                }
+            {
+                if (!mProjectile->isValidTarget(hitObject))
+                    return 1.f;
+                break;
+            }
             case CollisionType_Projectile:
-                {
-                    auto* target = static_cast<Projectile*>(hitObject->getUserPointer());
-                    if (!mProjectile->isValidTarget(target->getCasterCollisionObject()))
-                        return 1.f;
-                    target->hit(mMe, m_hitPointWorld, m_hitNormalWorld);
-                    break;
-                }
+            {
+                auto* target = static_cast<Projectile*>(hitObject->getUserPointer());
+                if (!mProjectile->isValidTarget(target->getCasterCollisionObject()))
+                    return 1.f;
+                target->hit(mMe, m_hitPointWorld, m_hitNormalWorld);
+                break;
+            }
             case CollisionType_Water:
-                {
-                    mProjectile->setHitWater();
-                    break;
-                }
+            {
+                mProjectile->setHitWater();
+                break;
+            }
         }
         mProjectile->hit(hitObject, m_hitPointWorld, m_hitNormalWorld);
 
@@ -59,4 +61,3 @@ namespace MWPhysics
     }
 
 }
-
diff --git a/apps/openmw/mwphysics/projectileconvexcallback.hpp b/apps/openmw/mwphysics/projectileconvexcallback.hpp
index f35cfbd3c8..3cd304bab0 100644
--- a/apps/openmw/mwphysics/projectileconvexcallback.hpp
+++ b/apps/openmw/mwphysics/projectileconvexcallback.hpp
@@ -12,7 +12,8 @@ namespace MWPhysics
     class ProjectileConvexCallback : public btCollisionWorld::ClosestConvexResultCallback
     {
     public:
-        ProjectileConvexCallback(const btCollisionObject* caster, const btCollisionObject* me, const btVector3& from, const btVector3& to, Projectile* proj);
+        ProjectileConvexCallback(const btCollisionObject* caster, const btCollisionObject* me, const btVector3& from,
+            const btVector3& to, Projectile* proj);
 
         btScalar addSingleResult(btCollisionWorld::LocalConvexResult& result, bool normalInWorldSpace) override;
 
diff --git a/apps/openmw/mwphysics/ptrholder.hpp b/apps/openmw/mwphysics/ptrholder.hpp
index e2ba60518c..fc8fd94c30 100644
--- a/apps/openmw/mwphysics/ptrholder.hpp
+++ b/apps/openmw/mwphysics/ptrholder.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_MWPHYSICS_PTRHOLDER_H
 #define OPENMW_MWPHYSICS_PTRHOLDER_H
 
-#include <mutex>
 #include <memory>
+#include <mutex>
 #include <utility>
 
 #include <osg/Vec3d>
@@ -26,40 +26,19 @@ namespace MWPhysics
 
         virtual ~PtrHolder() = default;
 
-        void updatePtr(const MWWorld::Ptr& updated)
-        {
-            mPtr = updated;
-        }
+        void updatePtr(const MWWorld::Ptr& updated) { mPtr = updated; }
 
-        MWWorld::Ptr getPtr() const
-        {
-            return mPtr;
-        }
+        MWWorld::Ptr getPtr() const { return mPtr; }
 
-        btCollisionObject* getCollisionObject() const
-        {
-            return mCollisionObject.get();
-        }
+        btCollisionObject* getCollisionObject() const { return mCollisionObject.get(); }
 
-        void setVelocity(osg::Vec3f velocity)
-        {
-            mVelocity = velocity;
-        }
+        void setVelocity(osg::Vec3f velocity) { mVelocity = velocity; }
 
-        osg::Vec3f velocity()
-        {
-            return std::exchange(mVelocity, osg::Vec3f());
-        }
+        osg::Vec3f velocity() { return std::exchange(mVelocity, osg::Vec3f()); }
 
-        void setSimulationPosition(const osg::Vec3f& position)
-        {
-            mSimulationPosition = position;
-        }
+        void setSimulationPosition(const osg::Vec3f& position) { mSimulationPosition = position; }
 
-        osg::Vec3f getSimulationPosition() const
-        {
-            return mSimulationPosition;
-        }
+        osg::Vec3f getSimulationPosition() const { return mSimulationPosition; }
 
         void setPosition(const osg::Vec3f& position)
         {
@@ -67,15 +46,9 @@ namespace MWPhysics
             mPosition = position;
         }
 
-        osg::Vec3d getPosition() const
-        {
-            return mPosition;
-        }
+        osg::Vec3d getPosition() const { return mPosition; }
 
-        osg::Vec3d getPreviousPosition() const
-        {
-            return mPreviousPosition;
-        }
+        osg::Vec3d getPreviousPosition() const { return mPreviousPosition; }
 
     protected:
         MWWorld::Ptr mPtr;
diff --git a/apps/openmw/mwphysics/raycasting.hpp b/apps/openmw/mwphysics/raycasting.hpp
index 848f17a01a..b46721358d 100644
--- a/apps/openmw/mwphysics/raycasting.hpp
+++ b/apps/openmw/mwphysics/raycasting.hpp
@@ -11,32 +11,34 @@ namespace MWPhysics
 {
     class RayCastingResult
     {
-        public:
-            bool mHit;
-            osg::Vec3f mHitPos;
-            osg::Vec3f mHitNormal;
-            MWWorld::Ptr mHitObject;
+    public:
+        bool mHit;
+        osg::Vec3f mHitPos;
+        osg::Vec3f mHitNormal;
+        MWWorld::Ptr mHitObject;
     };
 
     class RayCastingInterface
     {
-        public:
-            /// Get distance from \a point to the collision shape of \a target. Uses a raycast to find where the
-            /// target vector hits the collision shape and then calculates distance from the intersection point.
-            /// This can be used to find out how much nearer we need to move to the target for a "getHitContact" to be successful.
-            /// \note Only Actor targets are supported at the moment.
-            virtual float getHitDistance(const osg::Vec3f& point, const MWWorld::ConstPtr& target) const = 0;
-
-            /// @param me Optional, a Ptr to ignore in the list of results. targets are actors to filter for, ignoring all other actors.
-            virtual RayCastingResult castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore = MWWorld::ConstPtr(),
-                    const std::vector<MWWorld::Ptr>& targets = std::vector<MWWorld::Ptr>(),
-                    int mask = CollisionType_Default, int group=0xff) const = 0;
-
-            virtual RayCastingResult castSphere(const osg::Vec3f& from, const osg::Vec3f& to, float radius,
-                    int mask = CollisionType_Default, int group=0xff) const = 0;
-
-            /// Return true if actor1 can see actor2.
-            virtual bool getLineOfSight(const MWWorld::ConstPtr& actor1, const MWWorld::ConstPtr& actor2) const = 0;
+    public:
+        /// Get distance from \a point to the collision shape of \a target. Uses a raycast to find where the
+        /// target vector hits the collision shape and then calculates distance from the intersection point.
+        /// This can be used to find out how much nearer we need to move to the target for a "getHitContact" to be
+        /// successful. \note Only Actor targets are supported at the moment.
+        virtual float getHitDistance(const osg::Vec3f& point, const MWWorld::ConstPtr& target) const = 0;
+
+        /// @param me Optional, a Ptr to ignore in the list of results. targets are actors to filter for, ignoring all
+        /// other actors.
+        virtual RayCastingResult castRay(const osg::Vec3f& from, const osg::Vec3f& to,
+            const MWWorld::ConstPtr& ignore = MWWorld::ConstPtr(),
+            const std::vector<MWWorld::Ptr>& targets = std::vector<MWWorld::Ptr>(), int mask = CollisionType_Default,
+            int group = 0xff) const = 0;
+
+        virtual RayCastingResult castSphere(const osg::Vec3f& from, const osg::Vec3f& to, float radius,
+            int mask = CollisionType_Default, int group = 0xff) const = 0;
+
+        /// Return true if actor1 can see actor2.
+        virtual bool getLineOfSight(const MWWorld::ConstPtr& actor1, const MWWorld::ConstPtr& actor2) const = 0;
     };
 }
 
diff --git a/apps/openmw/mwphysics/stepper.cpp b/apps/openmw/mwphysics/stepper.cpp
index 5ef6833701..5b7cde3015 100644
--- a/apps/openmw/mwphysics/stepper.cpp
+++ b/apps/openmw/mwphysics/stepper.cpp
@@ -11,7 +11,7 @@
 
 namespace MWPhysics
 {
-    static bool canStepDown(const ActorTracer &stepper)
+    static bool canStepDown(const ActorTracer& stepper)
     {
         if (!stepper.mHitObject)
             return false;
@@ -22,26 +22,29 @@ namespace MWPhysics
         return stepper.mHitObject->getBroadphaseHandle()->m_collisionFilterGroup != CollisionType_Actor;
     }
 
-    Stepper::Stepper(const btCollisionWorld *colWorld, const btCollisionObject *colObj)
+    Stepper::Stepper(const btCollisionWorld* colWorld, const btCollisionObject* colObj)
         : mColWorld(colWorld)
         , mColObj(colObj)
     {
     }
 
-    bool Stepper::step(osg::Vec3f &position, osg::Vec3f &velocity, float &remainingTime, const bool & onGround, bool firstIteration)
+    bool Stepper::step(
+        osg::Vec3f& position, osg::Vec3f& velocity, float& remainingTime, const bool& onGround, bool firstIteration)
     {
-        if(velocity.x() == 0.0 && velocity.y() == 0.0)
+        if (velocity.x() == 0.0 && velocity.y() == 0.0)
             return false;
 
-        // Stairstepping algorithms work by moving up to avoid the step, moving forwards, then moving back down onto the ground.
-        // This algorithm has a couple of minor problems, but they don't cause problems for sane geometry, and just prevent stepping on insane geometry.
+        // Stairstepping algorithms work by moving up to avoid the step, moving forwards, then moving back down onto the
+        // ground. This algorithm has a couple of minor problems, but they don't cause problems for sane geometry, and
+        // just prevent stepping on insane geometry.
 
-        mUpStepper.doTrace(mColObj, position, position + osg::Vec3f(0.0f, 0.0f, Constants::sStepSizeUp), mColWorld, onGround);
+        mUpStepper.doTrace(
+            mColObj, position, position + osg::Vec3f(0.0f, 0.0f, Constants::sStepSizeUp), mColWorld, onGround);
 
         float upDistance = 0;
-        if(!mUpStepper.mHitObject)
+        if (!mUpStepper.mHitObject)
             upDistance = Constants::sStepSizeUp;
-        else if(mUpStepper.mFraction * Constants::sStepSizeUp > sCollisionMargin)
+        else if (mUpStepper.mFraction * Constants::sStepSizeUp > sCollisionMargin)
             upDistance = mUpStepper.mFraction * Constants::sStepSizeUp - sCollisionMargin;
         else
         {
@@ -56,75 +59,79 @@ namespace MWPhysics
         auto normalMove = toMove;
         auto moveDistance = normalMove.normalize();
         // attempt 1: normal movement
-        // attempt 2: fixed distance movement, only happens on the first movement solver iteration/bounce each frame to avoid a glitch
-        // attempt 3: further, less tall fixed distance movement, same as above
-        // If you're making a full conversion you should purge the logic for attempts 2 and 3. Attempts 2 and 3 just try to work around problems with vanilla Morrowind assets.
+        // attempt 2: fixed distance movement, only happens on the first movement solver iteration/bounce each frame to
+        // avoid a glitch attempt 3: further, less tall fixed distance movement, same as above If you're making a full
+        // conversion you should purge the logic for attempts 2 and 3. Attempts 2 and 3 just try to work around problems
+        // with vanilla Morrowind assets.
         int attempt = 0;
         float downStepSize = 0;
-        while(attempt < 3)
+        while (attempt < 3)
         {
             attempt++;
 
-            if(attempt == 1)
+            if (attempt == 1)
                 tracerDest = tracerPos + toMove;
             else if (!sDoExtraStairHacks) // early out if we have extra hacks disabled
             {
                 return false;
             }
-            else if(attempt == 2)
+            else if (attempt == 2)
             {
                 moveDistance = sMinStep;
-                tracerDest = tracerPos + normalMove*sMinStep;
+                tracerDest = tracerPos + normalMove * sMinStep;
             }
-            else if(attempt == 3)
+            else if (attempt == 3)
             {
-                if(upDistance > Constants::sStepSizeUp)
+                if (upDistance > Constants::sStepSizeUp)
                 {
                     upDistance = Constants::sStepSizeUp;
                     tracerPos = position + osg::Vec3f(0.0f, 0.0f, upDistance);
                 }
                 moveDistance = sMinStep2;
-                tracerDest = tracerPos + normalMove*sMinStep2;
+                tracerDest = tracerPos + normalMove * sMinStep2;
             }
 
             mTracer.doTrace(mColObj, tracerPos, tracerDest, mColWorld);
-            if(mTracer.mHitObject)
+            if (mTracer.mHitObject)
             {
                 // map against what we hit, minus the safety margin
                 moveDistance *= mTracer.mFraction;
-                if(moveDistance <= sCollisionMargin) // didn't move enough to accomplish anything
+                if (moveDistance <= sCollisionMargin) // didn't move enough to accomplish anything
                 {
                     return false;
                 }
 
                 moveDistance -= sCollisionMargin;
-                tracerDest = tracerPos + normalMove*moveDistance;
+                tracerDest = tracerPos + normalMove * moveDistance;
 
                 // safely eject from what we hit by the safety margin
-                auto tempDest = tracerDest + mTracer.mPlaneNormal*sCollisionMargin*2;
+                auto tempDest = tracerDest + mTracer.mPlaneNormal * sCollisionMargin * 2;
 
                 ActorTracer tempTracer;
                 tempTracer.doTrace(mColObj, tracerDest, tempDest, mColWorld);
 
-                if(tempTracer.mFraction > 0.5f) // distance to any object is greater than sCollisionMargin (we checked sCollisionMargin*2 distance)
+                if (tempTracer.mFraction > 0.5f) // distance to any object is greater than sCollisionMargin (we checked
+                                                 // sCollisionMargin*2 distance)
                 {
-                    auto effectiveFraction = tempTracer.mFraction*2.0f - 1.0f;
-                    tracerDest += mTracer.mPlaneNormal*sCollisionMargin*effectiveFraction;
+                    auto effectiveFraction = tempTracer.mFraction * 2.0f - 1.0f;
+                    tracerDest += mTracer.mPlaneNormal * sCollisionMargin * effectiveFraction;
                 }
             }
 
-            if(attempt > 2) // do not allow stepping down below original height for attempt 3
+            if (attempt > 2) // do not allow stepping down below original height for attempt 3
                 downStepSize = upDistance;
             else
                 downStepSize = moveDistance + upDistance + sStepSizeDown;
-            mDownStepper.doTrace(mColObj, tracerDest, tracerDest + osg::Vec3f(0.0f, 0.0f, -downStepSize), mColWorld, onGround);
+            mDownStepper.doTrace(
+                mColObj, tracerDest, tracerDest + osg::Vec3f(0.0f, 0.0f, -downStepSize), mColWorld, onGround);
 
             // can't step down onto air, non-walkable-slopes, or actors
-            // NOTE: using a capsule causes isWalkableSlope (used in canStepDown) to fail on certain geometry that were intended to be valid at the bottoms of stairs
-            // (like the bottoms of the staircases in aldruhn's guild of mages)
-            // The old code worked around this by trying to do mTracer again with a fixed distance of sMinStep (10.0) but it caused all sorts of other problems.
-            // Switched back to cylinders to avoid that and similer problems.
-            if(canStepDown(mDownStepper))
+            // NOTE: using a capsule causes isWalkableSlope (used in canStepDown) to fail on certain geometry that were
+            // intended to be valid at the bottoms of stairs (like the bottoms of the staircases in aldruhn's guild of
+            // mages) The old code worked around this by trying to do mTracer again with a fixed distance of sMinStep
+            // (10.0) but it caused all sorts of other problems. Switched back to cylinders to avoid that and similer
+            // problems.
+            if (canStepDown(mDownStepper))
             {
                 break;
             }
@@ -132,12 +139,12 @@ namespace MWPhysics
             {
                 // do not try attempt 3 if we just tried attempt 2 and the horizontal distance was rather large
                 // (forces actor to get snug against the defective ledge for attempt 3 to be tried)
-                if(attempt == 2 && moveDistance > upDistance-(mDownStepper.mFraction*downStepSize))
+                if (attempt == 2 && moveDistance > upDistance - (mDownStepper.mFraction * downStepSize))
                 {
                     return false;
                 }
                 // do next attempt if first iteration of movement solver and not out of attempts
-                if(firstIteration && attempt < 3)
+                if (firstIteration && attempt < 3)
                 {
                     continue;
                 }
@@ -148,18 +155,18 @@ namespace MWPhysics
 
         // note: can't downstep onto actors so no need to pick safety margin
         float downDistance = 0;
-        if(mDownStepper.mFraction*downStepSize > sCollisionMargin)
-            downDistance = mDownStepper.mFraction*downStepSize - sCollisionMargin;
+        if (mDownStepper.mFraction * downStepSize > sCollisionMargin)
+            downDistance = mDownStepper.mFraction * downStepSize - sCollisionMargin;
 
-        if(downDistance-sCollisionMargin-sGroundOffset > upDistance && !onGround)
+        if (downDistance - sCollisionMargin - sGroundOffset > upDistance && !onGround)
             return false;
 
         auto newpos = tracerDest + osg::Vec3f(0.0f, 0.0f, -downDistance);
 
-        if((position-newpos).length2() < sCollisionMargin*sCollisionMargin)
+        if ((position - newpos).length2() < sCollisionMargin * sCollisionMargin)
             return false;
 
-        if(mTracer.mHitObject)
+        if (mTracer.mHitObject)
         {
             auto planeNormal = mTracer.mPlaneNormal;
             if (onGround && !isWalkableSlope(planeNormal) && planeNormal.z() != 0)
@@ -173,7 +180,7 @@ namespace MWPhysics
 
         position = newpos;
 
-        remainingTime *= (1.0f-mTracer.mFraction); // remaining time is proportional to remaining distance
+        remainingTime *= (1.0f - mTracer.mFraction); // remaining time is proportional to remaining distance
         return true;
     }
 }
diff --git a/apps/openmw/mwphysics/stepper.hpp b/apps/openmw/mwphysics/stepper.hpp
index 512493c524..d555ef540e 100644
--- a/apps/openmw/mwphysics/stepper.hpp
+++ b/apps/openmw/mwphysics/stepper.hpp
@@ -16,15 +16,16 @@ namespace MWPhysics
     class Stepper
     {
     private:
-        const btCollisionWorld *mColWorld;
-        const btCollisionObject *mColObj;
+        const btCollisionWorld* mColWorld;
+        const btCollisionObject* mColObj;
 
         ActorTracer mTracer, mUpStepper, mDownStepper;
 
     public:
-        Stepper(const btCollisionWorld *colWorld, const btCollisionObject *colObj);
+        Stepper(const btCollisionWorld* colWorld, const btCollisionObject* colObj);
 
-        bool step(osg::Vec3f &position, osg::Vec3f &velocity, float &remainingTime, const bool & onGround, bool firstIteration);
+        bool step(osg::Vec3f& position, osg::Vec3f& velocity, float& remainingTime, const bool& onGround,
+            bool firstIteration);
     };
 }
 
diff --git a/apps/openmw/mwphysics/trace.cpp b/apps/openmw/mwphysics/trace.cpp
index b7930bfa53..9e60a7c626 100644
--- a/apps/openmw/mwphysics/trace.cpp
+++ b/apps/openmw/mwphysics/trace.cpp
@@ -5,114 +5,120 @@
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 #include <BulletCollision/CollisionShapes/btConvexShape.h>
 
-#include "collisiontype.hpp"
 #include "actor.hpp"
 #include "actorconvexcallback.hpp"
+#include "collisiontype.hpp"
 
 namespace MWPhysics
 {
 
-ActorConvexCallback sweepHelper(const btCollisionObject *actor, const btVector3& from, const btVector3& to, const btCollisionWorld* world, bool actorFilter)
-{
-    const btTransform &trans = actor->getWorldTransform();
-    btTransform transFrom(trans);
-    btTransform transTo(trans);
-    transFrom.setOrigin(from);
-    transTo.setOrigin(to);
-
-    const btCollisionShape *shape = actor->getCollisionShape();
-    assert(shape->isConvex());
-
-    const btVector3 motion = from - to; // FIXME: this is backwards; means ActorConvexCallback is doing dot product tests backwards too
-    ActorConvexCallback traceCallback(actor, motion, btScalar(0.0), world);
-    // Inherit the actor's collision group and mask
-    traceCallback.m_collisionFilterGroup = actor->getBroadphaseHandle()->m_collisionFilterGroup;
-    traceCallback.m_collisionFilterMask = actor->getBroadphaseHandle()->m_collisionFilterMask;
-    if(actorFilter)
-        traceCallback.m_collisionFilterMask &= ~CollisionType_Actor;
+    ActorConvexCallback sweepHelper(const btCollisionObject* actor, const btVector3& from, const btVector3& to,
+        const btCollisionWorld* world, bool actorFilter)
+    {
+        const btTransform& trans = actor->getWorldTransform();
+        btTransform transFrom(trans);
+        btTransform transTo(trans);
+        transFrom.setOrigin(from);
+        transTo.setOrigin(to);
 
-    world->convexSweepTest(static_cast<const btConvexShape*>(shape), transFrom, transTo, traceCallback);
-    return traceCallback;
-}
+        const btCollisionShape* shape = actor->getCollisionShape();
+        assert(shape->isConvex());
 
-void ActorTracer::doTrace(const btCollisionObject *actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world, bool attempt_short_trace)
-{
-    const btVector3 btstart = Misc::Convert::toBullet(start);
-    btVector3 btend = Misc::Convert::toBullet(end);
+        const btVector3 motion
+            = from - to; // FIXME: this is backwards; means ActorConvexCallback is doing dot product tests backwards too
+        ActorConvexCallback traceCallback(actor, motion, btScalar(0.0), world);
+        // Inherit the actor's collision group and mask
+        traceCallback.m_collisionFilterGroup = actor->getBroadphaseHandle()->m_collisionFilterGroup;
+        traceCallback.m_collisionFilterMask = actor->getBroadphaseHandle()->m_collisionFilterMask;
+        if (actorFilter)
+            traceCallback.m_collisionFilterMask &= ~CollisionType_Actor;
 
-    // Because Bullet's collision trace tests touch *all* geometry in its path, a lot of long collision tests
-    // will unnecessarily test against complex meshes that are dozens of units away. This wouldn't normally be
-    // a problem, but bullet isn't the fastest in the world when it comes to doing tests against triangle meshes.
-    // Therefore, we try out a short trace first, then only fall back to the full length trace if needed.
-    // This trace needs to be at least a couple units long, but there's no one particular ideal length.
-    // The length of 2.1 chosen here is a "works well in practice after testing a few random lengths" value.
-    // (Also, we only do this short test if the intended collision trace is long enough for it to make sense.)
-    const float fallback_length = 2.1f;
-    bool doing_short_trace = false;
-    // For some reason, typical scenes perform a little better if we increase the threshold length for the length test.
-    // (Multiplying by 2 in 'square distance' units gives us about 1.4x the threshold length. In benchmarks this was
-    //  slightly better for the performance of normal scenes than 4.0, and just plain better than 1.0.)
-    if(attempt_short_trace && (btend-btstart).length2() > fallback_length*fallback_length*2.0)
-    {
-        btend = btstart + (btend-btstart).normalized()*fallback_length;
-        doing_short_trace = true;
+        world->convexSweepTest(static_cast<const btConvexShape*>(shape), transFrom, transTo, traceCallback);
+        return traceCallback;
     }
 
-    const auto traceCallback = sweepHelper(actor, btstart, btend, world, false);
-
-    // Copy the hit data over to our trace results struct:
-    if(traceCallback.hasHit())
+    void ActorTracer::doTrace(const btCollisionObject* actor, const osg::Vec3f& start, const osg::Vec3f& end,
+        const btCollisionWorld* world, bool attempt_short_trace)
     {
-        mFraction = traceCallback.m_closestHitFraction;
-        // ensure fraction is correct (covers intended distance traveled instead of actual distance traveled)
-        if(doing_short_trace && (end-start).length2() > 0.0)
-            mFraction *= (btend-btstart).length() / (end-start).length();
-        mPlaneNormal = Misc::Convert::toOsg(traceCallback.m_hitNormalWorld);
-        mEndPos = (end-start)*mFraction + start;
-        mHitPoint = Misc::Convert::toOsg(traceCallback.m_hitPointWorld);
-        mHitObject = traceCallback.m_hitCollisionObject;
-    }
-    else
-    {
-        if(doing_short_trace)
+        const btVector3 btstart = Misc::Convert::toBullet(start);
+        btVector3 btend = Misc::Convert::toBullet(end);
+
+        // Because Bullet's collision trace tests touch *all* geometry in its path, a lot of long collision tests
+        // will unnecessarily test against complex meshes that are dozens of units away. This wouldn't normally be
+        // a problem, but bullet isn't the fastest in the world when it comes to doing tests against triangle meshes.
+        // Therefore, we try out a short trace first, then only fall back to the full length trace if needed.
+        // This trace needs to be at least a couple units long, but there's no one particular ideal length.
+        // The length of 2.1 chosen here is a "works well in practice after testing a few random lengths" value.
+        // (Also, we only do this short test if the intended collision trace is long enough for it to make sense.)
+        const float fallback_length = 2.1f;
+        bool doing_short_trace = false;
+        // For some reason, typical scenes perform a little better if we increase the threshold length for the length
+        // test. (Multiplying by 2 in 'square distance' units gives us about 1.4x the threshold length. In benchmarks
+        // this was
+        //  slightly better for the performance of normal scenes than 4.0, and just plain better than 1.0.)
+        if (attempt_short_trace && (btend - btstart).length2() > fallback_length * fallback_length * 2.0)
         {
-            btend = Misc::Convert::toBullet(end);
-            const auto newTraceCallback = sweepHelper(actor, btstart, btend, world, false);
+            btend = btstart + (btend - btstart).normalized() * fallback_length;
+            doing_short_trace = true;
+        }
 
-            if(newTraceCallback.hasHit())
+        const auto traceCallback = sweepHelper(actor, btstart, btend, world, false);
+
+        // Copy the hit data over to our trace results struct:
+        if (traceCallback.hasHit())
+        {
+            mFraction = traceCallback.m_closestHitFraction;
+            // ensure fraction is correct (covers intended distance traveled instead of actual distance traveled)
+            if (doing_short_trace && (end - start).length2() > 0.0)
+                mFraction *= (btend - btstart).length() / (end - start).length();
+            mPlaneNormal = Misc::Convert::toOsg(traceCallback.m_hitNormalWorld);
+            mEndPos = (end - start) * mFraction + start;
+            mHitPoint = Misc::Convert::toOsg(traceCallback.m_hitPointWorld);
+            mHitObject = traceCallback.m_hitCollisionObject;
+        }
+        else
+        {
+            if (doing_short_trace)
             {
-                mFraction = newTraceCallback.m_closestHitFraction;
-                mPlaneNormal = Misc::Convert::toOsg(newTraceCallback.m_hitNormalWorld);
-                mEndPos = (end-start)*mFraction + start;
-                mHitPoint = Misc::Convert::toOsg(newTraceCallback.m_hitPointWorld);
-                mHitObject = newTraceCallback.m_hitCollisionObject;
-                return;
+                btend = Misc::Convert::toBullet(end);
+                const auto newTraceCallback = sweepHelper(actor, btstart, btend, world, false);
+
+                if (newTraceCallback.hasHit())
+                {
+                    mFraction = newTraceCallback.m_closestHitFraction;
+                    mPlaneNormal = Misc::Convert::toOsg(newTraceCallback.m_hitNormalWorld);
+                    mEndPos = (end - start) * mFraction + start;
+                    mHitPoint = Misc::Convert::toOsg(newTraceCallback.m_hitPointWorld);
+                    mHitObject = newTraceCallback.m_hitCollisionObject;
+                    return;
+                }
             }
+            // fallthrough
+            mEndPos = end;
+            mPlaneNormal = osg::Vec3f(0.0f, 0.0f, 1.0f);
+            mFraction = 1.0f;
+            mHitPoint = end;
+            mHitObject = nullptr;
         }
-        // fallthrough
-        mEndPos = end;
-        mPlaneNormal = osg::Vec3f(0.0f, 0.0f, 1.0f);
-        mFraction = 1.0f;
-        mHitPoint = end;
-        mHitObject = nullptr;
     }
-}
 
-void ActorTracer::findGround(const Actor* actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world)
-{
-    const auto traceCallback = sweepHelper(actor->getCollisionObject(), Misc::Convert::toBullet(start), Misc::Convert::toBullet(end), world, true);
-    if(traceCallback.hasHit())
+    void ActorTracer::findGround(
+        const Actor* actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world)
     {
-        mFraction = traceCallback.m_closestHitFraction;
-        mPlaneNormal = Misc::Convert::toOsg(traceCallback.m_hitNormalWorld);
-        mEndPos = (end-start)*mFraction + start;
-    }
-    else
-    {
-        mEndPos = end;
-        mPlaneNormal = osg::Vec3f(0.0f, 0.0f, 1.0f);
-        mFraction = 1.0f;
+        const auto traceCallback = sweepHelper(
+            actor->getCollisionObject(), Misc::Convert::toBullet(start), Misc::Convert::toBullet(end), world, true);
+        if (traceCallback.hasHit())
+        {
+            mFraction = traceCallback.m_closestHitFraction;
+            mPlaneNormal = Misc::Convert::toOsg(traceCallback.m_hitNormalWorld);
+            mEndPos = (end - start) * mFraction + start;
+        }
+        else
+        {
+            mEndPos = end;
+            mPlaneNormal = osg::Vec3f(0.0f, 0.0f, 1.0f);
+            mFraction = 1.0f;
+        }
     }
-}
 
 }
diff --git a/apps/openmw/mwphysics/trace.h b/apps/openmw/mwphysics/trace.h
index af38756b3e..71475e793c 100644
--- a/apps/openmw/mwphysics/trace.h
+++ b/apps/openmw/mwphysics/trace.h
@@ -6,7 +6,6 @@
 class btCollisionObject;
 class btCollisionWorld;
 
-
 namespace MWPhysics
 {
     class Actor;
@@ -20,8 +19,10 @@ namespace MWPhysics
 
         float mFraction;
 
-        void doTrace(const btCollisionObject *actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world, bool attempt_short_trace = false);
-        void findGround(const Actor* actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world);
+        void doTrace(const btCollisionObject* actor, const osg::Vec3f& start, const osg::Vec3f& end,
+            const btCollisionWorld* world, bool attempt_short_trace = false);
+        void findGround(
+            const Actor* actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world);
     };
 }
 
diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index a6caef852e..ed87d64516 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -1,13 +1,13 @@
 #include "actoranimation.hpp"
 #include <utility>
 
-#include <osg/Node>
 #include <osg/Group>
+#include <osg/Node>
 #include <osg/Vec4f>
 
-#include <components/esm3/loadligh.hpp>
-#include <components/esm3/loadcell.hpp>
 #include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadligh.hpp>
 
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
@@ -25,557 +25,568 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwworld/ptr.hpp"
-#include "../mwworld/class.hpp"
+#include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/creaturestats.hpp"
+#include "../mwmechanics/drawstate.hpp"
+#include "../mwmechanics/weapontype.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwmechanics/actorutil.hpp"
-#include "../mwmechanics/weapontype.hpp"
-#include "../mwmechanics/drawstate.hpp"
-#include "../mwmechanics/creaturestats.hpp"
+#include "../mwworld/ptr.hpp"
 
 #include "vismask.hpp"
 
 namespace MWRender
 {
 
-ActorAnimation::ActorAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem)
-    : Animation(ptr, parentNode, resourceSystem)
-{
-    MWWorld::ContainerStore& store = mPtr.getClass().getContainerStore(mPtr);
-
-    for (MWWorld::ConstContainerStoreIterator iter = store.cbegin(MWWorld::ContainerStore::Type_Light);
-         iter != store.cend(); ++iter)
+    ActorAnimation::ActorAnimation(
+        const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem)
+        : Animation(ptr, parentNode, resourceSystem)
     {
-        const ESM::Light* light = iter->get<ESM::Light>()->mBase;
-        if (!(light->mData.mFlags & ESM::Light::Carry))
+        MWWorld::ContainerStore& store = mPtr.getClass().getContainerStore(mPtr);
+
+        for (MWWorld::ConstContainerStoreIterator iter = store.cbegin(MWWorld::ContainerStore::Type_Light);
+             iter != store.cend(); ++iter)
         {
-            addHiddenItemLight(*iter, light);
+            const ESM::Light* light = iter->get<ESM::Light>()->mBase;
+            if (!(light->mData.mFlags & ESM::Light::Carry))
+            {
+                addHiddenItemLight(*iter, light);
+            }
         }
-    }
 
-    // Make sure we cleaned object from effects, just in cast if we re-use node
-    removeEffects();
-}
-
-ActorAnimation::~ActorAnimation() = default;
+        // Make sure we cleaned object from effects, just in cast if we re-use node
+        removeEffects();
+    }
 
-PartHolderPtr ActorAnimation::attachMesh(const std::string& model, std::string_view bonename, bool enchantedGlow, osg::Vec4f* glowColor)
-{
-    osg::Group* parent = getBoneByName(bonename);
-    if (!parent)
-        return nullptr;
+    ActorAnimation::~ActorAnimation() = default;
 
-    osg::ref_ptr<osg::Node> instance = mResourceSystem->getSceneManager()->getInstance(model, parent);
+    PartHolderPtr ActorAnimation::attachMesh(
+        const std::string& model, std::string_view bonename, bool enchantedGlow, osg::Vec4f* glowColor)
+    {
+        osg::Group* parent = getBoneByName(bonename);
+        if (!parent)
+            return nullptr;
 
-    const NodeMap& nodeMap = getNodeMap();
-    NodeMap::const_iterator found = nodeMap.find(bonename);
-    if (found == nodeMap.end())
-        return {};
+        osg::ref_ptr<osg::Node> instance = mResourceSystem->getSceneManager()->getInstance(model, parent);
 
-    if (enchantedGlow)
-        mGlowUpdater = SceneUtil::addEnchantedGlow(instance, mResourceSystem, *glowColor);
+        const NodeMap& nodeMap = getNodeMap();
+        NodeMap::const_iterator found = nodeMap.find(bonename);
+        if (found == nodeMap.end())
+            return {};
 
-    return std::make_unique<PartHolder>(instance);
-}
+        if (enchantedGlow)
+            mGlowUpdater = SceneUtil::addEnchantedGlow(instance, mResourceSystem, *glowColor);
 
-osg::ref_ptr<osg::Node> ActorAnimation::attach(const std::string& model, std::string_view bonename, std::string_view bonefilter, bool isLight)
-{
-    osg::ref_ptr<const osg::Node> templateNode = mResourceSystem->getSceneManager()->getTemplate(model);
+        return std::make_unique<PartHolder>(instance);
+    }
 
-    const NodeMap& nodeMap = getNodeMap();
-    auto found = nodeMap.find(bonename);
-    if (found == nodeMap.end())
-        throw std::runtime_error("Can't find attachment node " + std::string{bonename});
-    if(isLight)
+    osg::ref_ptr<osg::Node> ActorAnimation::attach(
+        const std::string& model, std::string_view bonename, std::string_view bonefilter, bool isLight)
     {
-        osg::Quat rotation(osg::DegreesToRadians(-90.f), osg::Vec3f(1,0,0));
-        return SceneUtil::attach(templateNode, mObjectRoot, bonefilter, found->second, mResourceSystem->getSceneManager(), &rotation);
+        osg::ref_ptr<const osg::Node> templateNode = mResourceSystem->getSceneManager()->getTemplate(model);
+
+        const NodeMap& nodeMap = getNodeMap();
+        auto found = nodeMap.find(bonename);
+        if (found == nodeMap.end())
+            throw std::runtime_error("Can't find attachment node " + std::string{ bonename });
+        if (isLight)
+        {
+            osg::Quat rotation(osg::DegreesToRadians(-90.f), osg::Vec3f(1, 0, 0));
+            return SceneUtil::attach(
+                templateNode, mObjectRoot, bonefilter, found->second, mResourceSystem->getSceneManager(), &rotation);
+        }
+        return SceneUtil::attach(
+            templateNode, mObjectRoot, bonefilter, found->second, mResourceSystem->getSceneManager());
     }
-    return SceneUtil::attach(templateNode, mObjectRoot, bonefilter, found->second, mResourceSystem->getSceneManager());
-}
 
-std::string ActorAnimation::getShieldMesh(const MWWorld::ConstPtr& shield, bool female) const
-{
-    const ESM::Armor *armor = shield.get<ESM::Armor>()->mBase;
-    const std::vector<ESM::PartReference>& bodyparts = armor->mParts.mParts;
-    // Try to recover the body part model, use ground model as a fallback otherwise.
-    if (!bodyparts.empty())
+    std::string ActorAnimation::getShieldMesh(const MWWorld::ConstPtr& shield, bool female) const
     {
-        const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-        const MWWorld::Store<ESM::BodyPart> &partStore = store.get<ESM::BodyPart>();
-        for (const auto& part : bodyparts)
+        const ESM::Armor* armor = shield.get<ESM::Armor>()->mBase;
+        const std::vector<ESM::PartReference>& bodyparts = armor->mParts.mParts;
+        // Try to recover the body part model, use ground model as a fallback otherwise.
+        if (!bodyparts.empty())
         {
-            if (part.mPart != ESM::PRT_Shield)
-                continue;
-
-            std::string_view bodypartName;
-            if (female && !part.mFemale.empty())
-                bodypartName = part.mFemale;
-            else if (!part.mMale.empty())
-                bodypartName = part.mMale;
-
-            if (!bodypartName.empty())
+            const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+            const MWWorld::Store<ESM::BodyPart>& partStore = store.get<ESM::BodyPart>();
+            for (const auto& part : bodyparts)
             {
-                const ESM::BodyPart *bodypart = partStore.search(bodypartName);
-                if (bodypart == nullptr || bodypart->mData.mType != ESM::BodyPart::MT_Armor)
-                    return std::string();
-                if (!bodypart->mModel.empty())
-                    return Misc::ResourceHelpers::correctMeshPath(bodypart->mModel,
-                        MWBase::Environment::get().getResourceSystem()->getVFS());
+                if (part.mPart != ESM::PRT_Shield)
+                    continue;
+
+                std::string_view bodypartName;
+                if (female && !part.mFemale.empty())
+                    bodypartName = part.mFemale;
+                else if (!part.mMale.empty())
+                    bodypartName = part.mMale;
+
+                if (!bodypartName.empty())
+                {
+                    const ESM::BodyPart* bodypart = partStore.search(bodypartName);
+                    if (bodypart == nullptr || bodypart->mData.mType != ESM::BodyPart::MT_Armor)
+                        return std::string();
+                    if (!bodypart->mModel.empty())
+                        return Misc::ResourceHelpers::correctMeshPath(
+                            bodypart->mModel, MWBase::Environment::get().getResourceSystem()->getVFS());
+                }
             }
         }
+        return shield.getClass().getModel(shield);
     }
-    return shield.getClass().getModel(shield);
-}
 
-std::string ActorAnimation::getSheathedShieldMesh(const MWWorld::ConstPtr& shield) const
-{
-    std::string mesh = getShieldMesh(shield, false);
+    std::string ActorAnimation::getSheathedShieldMesh(const MWWorld::ConstPtr& shield) const
+    {
+        std::string mesh = getShieldMesh(shield, false);
 
-    if (mesh.empty())
-        return mesh;
+        if (mesh.empty())
+            return mesh;
 
-    std::string holsteredName = mesh;
-    holsteredName = holsteredName.replace(holsteredName.size()-4, 4, "_sh.nif");
-    if(mResourceSystem->getVFS()->exists(holsteredName))
-    {
-        osg::ref_ptr<osg::Node> shieldTemplate = mResourceSystem->getSceneManager()->getInstance(holsteredName);
-        SceneUtil::FindByNameVisitor findVisitor ("Bip01 Sheath");
-        shieldTemplate->accept(findVisitor);
-        osg::ref_ptr<osg::Node> sheathNode = findVisitor.mFoundNode;
-        if(!sheathNode)
-            return std::string();
-    }
+        std::string holsteredName = mesh;
+        holsteredName = holsteredName.replace(holsteredName.size() - 4, 4, "_sh.nif");
+        if (mResourceSystem->getVFS()->exists(holsteredName))
+        {
+            osg::ref_ptr<osg::Node> shieldTemplate = mResourceSystem->getSceneManager()->getInstance(holsteredName);
+            SceneUtil::FindByNameVisitor findVisitor("Bip01 Sheath");
+            shieldTemplate->accept(findVisitor);
+            osg::ref_ptr<osg::Node> sheathNode = findVisitor.mFoundNode;
+            if (!sheathNode)
+                return std::string();
+        }
 
-    return mesh;
-}
+        return mesh;
+    }
 
-bool ActorAnimation::updateCarriedLeftVisible(const int weaptype) const
-{
-    static const bool shieldSheathing = Settings::Manager::getBool("shield sheathing", "Game");
-    if (shieldSheathing)
+    bool ActorAnimation::updateCarriedLeftVisible(const int weaptype) const
     {
-        const MWWorld::Class &cls = mPtr.getClass();
-        MWMechanics::CreatureStats &stats = cls.getCreatureStats(mPtr);
-        if (cls.hasInventoryStore(mPtr) && stats.getDrawState() == MWMechanics::DrawState::Nothing)
+        static const bool shieldSheathing = Settings::Manager::getBool("shield sheathing", "Game");
+        if (shieldSheathing)
         {
-            SceneUtil::FindByNameVisitor findVisitor ("Bip01 AttachShield");
-            mObjectRoot->accept(findVisitor);
-            if (findVisitor.mFoundNode)
+            const MWWorld::Class& cls = mPtr.getClass();
+            MWMechanics::CreatureStats& stats = cls.getCreatureStats(mPtr);
+            if (cls.hasInventoryStore(mPtr) && stats.getDrawState() == MWMechanics::DrawState::Nothing)
             {
-                const MWWorld::InventoryStore& inv = cls.getInventoryStore(mPtr);
-                const MWWorld::ConstContainerStoreIterator shield = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
-                if (shield != inv.end() && shield->getType() == ESM::Armor::sRecordId && !getSheathedShieldMesh(*shield).empty())
-                    return false;
+                SceneUtil::FindByNameVisitor findVisitor("Bip01 AttachShield");
+                mObjectRoot->accept(findVisitor);
+                if (findVisitor.mFoundNode)
+                {
+                    const MWWorld::InventoryStore& inv = cls.getInventoryStore(mPtr);
+                    const MWWorld::ConstContainerStoreIterator shield
+                        = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
+                    if (shield != inv.end() && shield->getType() == ESM::Armor::sRecordId
+                        && !getSheathedShieldMesh(*shield).empty())
+                        return false;
+                }
             }
         }
+
+        return !(MWMechanics::getWeaponType(weaptype)->mFlags & ESM::WeaponType::TwoHanded);
     }
 
-    return !(MWMechanics::getWeaponType(weaptype)->mFlags & ESM::WeaponType::TwoHanded);
-}
+    void ActorAnimation::updateHolsteredShield(bool showCarriedLeft)
+    {
+        static const bool shieldSheathing = Settings::Manager::getBool("shield sheathing", "Game");
+        if (!shieldSheathing)
+            return;
 
-void ActorAnimation::updateHolsteredShield(bool showCarriedLeft)
-{
-    static const bool shieldSheathing = Settings::Manager::getBool("shield sheathing", "Game");
-    if (!shieldSheathing)
-        return;
+        if (!mPtr.getClass().hasInventoryStore(mPtr))
+            return;
 
-    if (!mPtr.getClass().hasInventoryStore(mPtr))
-        return;
+        mHolsteredShield.reset();
 
-    mHolsteredShield.reset();
+        if (showCarriedLeft)
+            return;
 
-    if (showCarriedLeft)
-        return;
+        const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
+        MWWorld::ConstContainerStoreIterator shield = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
+        if (shield == inv.end() || shield->getType() != ESM::Armor::sRecordId)
+            return;
 
-    const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
-    MWWorld::ConstContainerStoreIterator shield = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
-    if (shield == inv.end() || shield->getType() != ESM::Armor::sRecordId)
-        return;
+        // Can not show holdstered shields with two-handed weapons at all
+        const MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+        if (weapon == inv.end())
+            return;
 
-    // Can not show holdstered shields with two-handed weapons at all
-    const MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-    if(weapon == inv.end())
-        return;
+        auto type = weapon->getType();
+        if (type == ESM::Weapon::sRecordId)
+        {
+            const MWWorld::LiveCellRef<ESM::Weapon>* ref = weapon->get<ESM::Weapon>();
+            ESM::Weapon::Type weaponType = (ESM::Weapon::Type)ref->mBase->mData.mType;
+            if (MWMechanics::getWeaponType(weaponType)->mFlags & ESM::WeaponType::TwoHanded)
+                return;
+        }
 
-    auto type = weapon->getType();
-    if(type == ESM::Weapon::sRecordId)
-    {
-        const MWWorld::LiveCellRef<ESM::Weapon> *ref = weapon->get<ESM::Weapon>();
-        ESM::Weapon::Type weaponType = (ESM::Weapon::Type)ref->mBase->mData.mType;
-        if (MWMechanics::getWeaponType(weaponType)->mFlags & ESM::WeaponType::TwoHanded)
+        std::string mesh = getSheathedShieldMesh(*shield);
+        if (mesh.empty())
             return;
-    }
 
-    std::string mesh = getSheathedShieldMesh(*shield);
-    if (mesh.empty())
-        return;
+        std::string_view boneName = "Bip01 AttachShield";
+        osg::Vec4f glowColor = shield->getClass().getEnchantmentColor(*shield);
+        std::string holsteredName = mesh;
+        holsteredName = holsteredName.replace(holsteredName.size() - 4, 4, "_sh.nif");
+        bool isEnchanted = !shield->getClass().getEnchantment(*shield).empty();
 
-    std::string_view boneName = "Bip01 AttachShield";
-    osg::Vec4f glowColor = shield->getClass().getEnchantmentColor(*shield);
-    std::string holsteredName = mesh;
-    holsteredName = holsteredName.replace(holsteredName.size()-4, 4, "_sh.nif");
-    bool isEnchanted = !shield->getClass().getEnchantment(*shield).empty();
+        // If we have no dedicated sheath model, use basic shield model as fallback.
+        if (!mResourceSystem->getVFS()->exists(holsteredName))
+            mHolsteredShield = attachMesh(mesh, boneName, isEnchanted, &glowColor);
+        else
+            mHolsteredShield = attachMesh(holsteredName, boneName, isEnchanted, &glowColor);
 
-    // If we have no dedicated sheath model, use basic shield model as fallback.
-    if (!mResourceSystem->getVFS()->exists(holsteredName))
-        mHolsteredShield = attachMesh(mesh, boneName, isEnchanted, &glowColor);
-    else
-        mHolsteredShield = attachMesh(holsteredName, boneName, isEnchanted, &glowColor);
+        if (!mHolsteredShield)
+            return;
 
-    if (!mHolsteredShield)
-        return;
+        SceneUtil::FindByNameVisitor findVisitor("Bip01 Sheath");
+        mHolsteredShield->getNode()->accept(findVisitor);
+        osg::Group* shieldNode = findVisitor.mFoundNode;
 
-    SceneUtil::FindByNameVisitor findVisitor ("Bip01 Sheath");
-    mHolsteredShield->getNode()->accept(findVisitor);
-    osg::Group* shieldNode = findVisitor.mFoundNode;
+        // If mesh author declared an empty sheath node, use transformation from this node, but use the common shield
+        // mesh. This approach allows to tweak shield position without need to store the whole shield mesh in the _sh
+        // file.
+        if (shieldNode && !shieldNode->getNumChildren())
+        {
+            osg::ref_ptr<osg::Node> fallbackNode = mResourceSystem->getSceneManager()->getInstance(mesh, shieldNode);
+            if (isEnchanted)
+                SceneUtil::addEnchantedGlow(shieldNode, mResourceSystem, glowColor);
+        }
+    }
 
-    // If mesh author declared an empty sheath node, use transformation from this node, but use the common shield mesh.
-    // This approach allows to tweak shield position without need to store the whole shield mesh in the _sh file.
-    if (shieldNode && !shieldNode->getNumChildren())
+    bool ActorAnimation::useShieldAnimations() const
     {
-        osg::ref_ptr<osg::Node> fallbackNode = mResourceSystem->getSceneManager()->getInstance(mesh, shieldNode);
-        if (isEnchanted)
-            SceneUtil::addEnchantedGlow(shieldNode, mResourceSystem, glowColor);
-    }
-}
+        static const bool shieldSheathing = Settings::Manager::getBool("shield sheathing", "Game");
+        if (!shieldSheathing)
+            return false;
+
+        const MWWorld::Class& cls = mPtr.getClass();
+        if (!cls.hasInventoryStore(mPtr))
+            return false;
+
+        if (getTextKeyTime("shield: equip attach") < 0 || getTextKeyTime("shield: unequip detach") < 0)
+            return false;
+
+        const MWWorld::InventoryStore& inv = cls.getInventoryStore(mPtr);
+        const MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+        const MWWorld::ConstContainerStoreIterator shield = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
+        if (weapon != inv.end() && shield != inv.end() && shield->getType() == ESM::Armor::sRecordId
+            && !getSheathedShieldMesh(*shield).empty())
+        {
+            auto type = weapon->getType();
+            if (type == ESM::Weapon::sRecordId)
+            {
+                const MWWorld::LiveCellRef<ESM::Weapon>* ref = weapon->get<ESM::Weapon>();
+                ESM::Weapon::Type weaponType = (ESM::Weapon::Type)ref->mBase->mData.mType;
+                return !(MWMechanics::getWeaponType(weaponType)->mFlags & ESM::WeaponType::TwoHanded);
+            }
+            else if (type == ESM::Lockpick::sRecordId || type == ESM::Probe::sRecordId)
+                return true;
+        }
 
-bool ActorAnimation::useShieldAnimations() const
-{
-    static const bool shieldSheathing = Settings::Manager::getBool("shield sheathing", "Game");
-    if (!shieldSheathing)
         return false;
+    }
 
-    const MWWorld::Class &cls = mPtr.getClass();
-    if (!cls.hasInventoryStore(mPtr))
-        return false;
+    osg::Group* ActorAnimation::getBoneByName(std::string_view boneName) const
+    {
+        if (!mObjectRoot)
+            return nullptr;
 
-    if (getTextKeyTime("shield: equip attach") < 0 || getTextKeyTime("shield: unequip detach") < 0)
-        return false;
+        SceneUtil::FindByNameVisitor findVisitor(boneName);
+        mObjectRoot->accept(findVisitor);
 
-    const MWWorld::InventoryStore& inv = cls.getInventoryStore(mPtr);
-    const MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-    const MWWorld::ConstContainerStoreIterator shield = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
-    if (weapon != inv.end() && shield != inv.end() &&
-        shield->getType() == ESM::Armor::sRecordId &&
-        !getSheathedShieldMesh(*shield).empty())
+        return findVisitor.mFoundNode;
+    }
+
+    std::string_view ActorAnimation::getHolsteredWeaponBoneName(const MWWorld::ConstPtr& weapon)
     {
-        auto type = weapon->getType();
-        if(type == ESM::Weapon::sRecordId)
+        if (weapon.isEmpty())
+            return {};
+
+        auto type = weapon.getClass().getType();
+        if (type == ESM::Weapon::sRecordId)
         {
-            const MWWorld::LiveCellRef<ESM::Weapon> *ref = weapon->get<ESM::Weapon>();
-            ESM::Weapon::Type weaponType = (ESM::Weapon::Type)ref->mBase->mData.mType;
-            return !(MWMechanics::getWeaponType(weaponType)->mFlags & ESM::WeaponType::TwoHanded);
+            const MWWorld::LiveCellRef<ESM::Weapon>* ref = weapon.get<ESM::Weapon>();
+            int weaponType = ref->mBase->mData.mType;
+            return MWMechanics::getWeaponType(weaponType)->mSheathingBone;
         }
-        else if (type == ESM::Lockpick::sRecordId || type == ESM::Probe::sRecordId)
-            return true;
+
+        return {};
     }
 
-    return false;
-}
+    void ActorAnimation::resetControllers(osg::Node* node)
+    {
+        if (node == nullptr)
+            return;
 
-osg::Group* ActorAnimation::getBoneByName(std::string_view boneName) const
-{
-    if (!mObjectRoot)
-        return nullptr;
+        SceneUtil::ForceControllerSourcesVisitor removeVisitor(std::make_shared<NullAnimationTime>());
+        node->accept(removeVisitor);
+    }
 
-    SceneUtil::FindByNameVisitor findVisitor(boneName);
-    mObjectRoot->accept(findVisitor);
+    void ActorAnimation::updateHolsteredWeapon(bool showHolsteredWeapons)
+    {
+        static const bool weaponSheathing = Settings::Manager::getBool("weapon sheathing", "Game");
+        if (!weaponSheathing)
+            return;
 
-    return findVisitor.mFoundNode;
-}
+        if (!mPtr.getClass().hasInventoryStore(mPtr))
+            return;
 
-std::string_view ActorAnimation::getHolsteredWeaponBoneName(const MWWorld::ConstPtr& weapon)
-{
-    if(weapon.isEmpty())
-        return {};
+        mScabbard.reset();
 
-    auto type = weapon.getClass().getType();
-    if(type == ESM::Weapon::sRecordId)
-    {
-        const MWWorld::LiveCellRef<ESM::Weapon> *ref = weapon.get<ESM::Weapon>();
-        int weaponType = ref->mBase->mData.mType;
-        return MWMechanics::getWeaponType(weaponType)->mSheathingBone;
-    }
+        const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
+        MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+        if (weapon == inv.end() || weapon->getType() != ESM::Weapon::sRecordId)
+            return;
 
-    return {};
-}
+        // Since throwing weapons stack themselves, do not show such weapon itself
+        int type = weapon->get<ESM::Weapon>()->mBase->mData.mType;
+        if (MWMechanics::getWeaponType(type)->mWeaponClass == ESM::WeaponType::Thrown)
+            showHolsteredWeapons = false;
 
-void ActorAnimation::resetControllers(osg::Node* node)
-{
-    if (node == nullptr)
-        return;
+        std::string mesh = weapon->getClass().getModel(*weapon);
+        std::string scabbardName = mesh;
 
-    SceneUtil::ForceControllerSourcesVisitor removeVisitor(std::make_shared<NullAnimationTime>());
-    node->accept(removeVisitor);
-}
+        std::string_view boneName = getHolsteredWeaponBoneName(*weapon);
+        if (mesh.empty() || boneName.empty())
+            return;
 
-void ActorAnimation::updateHolsteredWeapon(bool showHolsteredWeapons)
-{
-    static const bool weaponSheathing = Settings::Manager::getBool("weapon sheathing", "Game");
-    if (!weaponSheathing)
-        return;
-
-    if (!mPtr.getClass().hasInventoryStore(mPtr))
-        return;
-
-    mScabbard.reset();
-
-    const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
-    MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-    if (weapon == inv.end() || weapon->getType() != ESM::Weapon::sRecordId)
-        return;
-
-    // Since throwing weapons stack themselves, do not show such weapon itself
-    int type = weapon->get<ESM::Weapon>()->mBase->mData.mType;
-    if (MWMechanics::getWeaponType(type)->mWeaponClass == ESM::WeaponType::Thrown)
-        showHolsteredWeapons = false;
-
-    std::string mesh = weapon->getClass().getModel(*weapon);
-    std::string scabbardName = mesh;
-
-    std::string_view boneName = getHolsteredWeaponBoneName(*weapon);
-    if (mesh.empty() || boneName.empty())
-        return;
-
-    // If the scabbard is not found, use a weapon mesh as fallback.
-    // Note: it is unclear how to handle time for controllers attached to bodyparts, so disable them for now.
-    // We use the similar approach for other bodyparts.
-    scabbardName = scabbardName.replace(scabbardName.size()-4, 4, "_sh.nif");
-    bool isEnchanted = !weapon->getClass().getEnchantment(*weapon).empty();
-    if(!mResourceSystem->getVFS()->exists(scabbardName))
-    {
-        if (showHolsteredWeapons)
+        // If the scabbard is not found, use a weapon mesh as fallback.
+        // Note: it is unclear how to handle time for controllers attached to bodyparts, so disable them for now.
+        // We use the similar approach for other bodyparts.
+        scabbardName = scabbardName.replace(scabbardName.size() - 4, 4, "_sh.nif");
+        bool isEnchanted = !weapon->getClass().getEnchantment(*weapon).empty();
+        if (!mResourceSystem->getVFS()->exists(scabbardName))
         {
-            osg::Vec4f glowColor = weapon->getClass().getEnchantmentColor(*weapon);
-            mScabbard = attachMesh(mesh, boneName, isEnchanted, &glowColor);
-            if (mScabbard)
-                resetControllers(mScabbard->getNode());
-        }
+            if (showHolsteredWeapons)
+            {
+                osg::Vec4f glowColor = weapon->getClass().getEnchantmentColor(*weapon);
+                mScabbard = attachMesh(mesh, boneName, isEnchanted, &glowColor);
+                if (mScabbard)
+                    resetControllers(mScabbard->getNode());
+            }
 
-        return;
-    }
+            return;
+        }
 
-    mScabbard = attachMesh(scabbardName, boneName);
-    if (mScabbard)
-        resetControllers(mScabbard->getNode());
+        mScabbard = attachMesh(scabbardName, boneName);
+        if (mScabbard)
+            resetControllers(mScabbard->getNode());
 
-    osg::Group* weaponNode = getBoneByName("Bip01 Weapon");
-    if (!weaponNode)
-        return;
+        osg::Group* weaponNode = getBoneByName("Bip01 Weapon");
+        if (!weaponNode)
+            return;
 
-    // When we draw weapon, hide the Weapon node from sheath model.
-    // Otherwise add the enchanted glow to it.
-    if (!showHolsteredWeapons)
-    {
-        weaponNode->setNodeMask(0);
-    }
-    else
-    {
-        // If mesh author declared empty weapon node, use transformation from this node, but use the common weapon mesh.
-        // This approach allows to tweak weapon position without need to store the whole weapon mesh in the _sh file.
-        if (!weaponNode->getNumChildren())
+        // When we draw weapon, hide the Weapon node from sheath model.
+        // Otherwise add the enchanted glow to it.
+        if (!showHolsteredWeapons)
         {
-            osg::ref_ptr<osg::Node> fallbackNode = mResourceSystem->getSceneManager()->getInstance(mesh, weaponNode);
-            resetControllers(fallbackNode);
+            weaponNode->setNodeMask(0);
         }
-
-        if (isEnchanted)
+        else
         {
-            osg::Vec4f glowColor = weapon->getClass().getEnchantmentColor(*weapon);
-            mGlowUpdater = SceneUtil::addEnchantedGlow(weaponNode, mResourceSystem, glowColor);
+            // If mesh author declared empty weapon node, use transformation from this node, but use the common weapon
+            // mesh. This approach allows to tweak weapon position without need to store the whole weapon mesh in the
+            // _sh file.
+            if (!weaponNode->getNumChildren())
+            {
+                osg::ref_ptr<osg::Node> fallbackNode
+                    = mResourceSystem->getSceneManager()->getInstance(mesh, weaponNode);
+                resetControllers(fallbackNode);
+            }
+
+            if (isEnchanted)
+            {
+                osg::Vec4f glowColor = weapon->getClass().getEnchantmentColor(*weapon);
+                mGlowUpdater = SceneUtil::addEnchantedGlow(weaponNode, mResourceSystem, glowColor);
+            }
         }
     }
-}
 
-void ActorAnimation::updateQuiver()
-{
-    static const bool weaponSheathing = Settings::Manager::getBool("weapon sheathing", "Game");
-    if (!weaponSheathing)
-        return;
-
-    if (!mPtr.getClass().hasInventoryStore(mPtr))
-        return;
-
-    const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
-    MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-    if(weapon == inv.end() || weapon->getType() != ESM::Weapon::sRecordId)
-        return;
-
-    std::string mesh = weapon->getClass().getModel(*weapon);
-    std::string_view boneName = getHolsteredWeaponBoneName(*weapon);
-    if (mesh.empty() || boneName.empty())
-        return;
-
-    osg::Group* ammoNode = getBoneByName("Bip01 Ammo");
-    if (!ammoNode)
-        return;
-
-    // Special case for throwing weapons - they do not use ammo, but they stack themselves
-    bool suitableAmmo = false;
-    MWWorld::ConstContainerStoreIterator ammo = weapon;
-    unsigned int ammoCount = 0;
-    int type = weapon->get<ESM::Weapon>()->mBase->mData.mType;
-    const auto& weaponType = MWMechanics::getWeaponType(type);
-    if (weaponType->mWeaponClass == ESM::WeaponType::Thrown)
+    void ActorAnimation::updateQuiver()
     {
-        ammoCount = ammo->getRefData().getCount();
-        osg::Group* throwingWeaponNode = getBoneByName(weaponType->mAttachBone);
-        if (throwingWeaponNode && throwingWeaponNode->getNumChildren())
-            ammoCount--;
+        static const bool weaponSheathing = Settings::Manager::getBool("weapon sheathing", "Game");
+        if (!weaponSheathing)
+            return;
 
-        suitableAmmo = true;
-    }
-    else
-    {
-        ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
-        if (ammo == inv.end())
+        if (!mPtr.getClass().hasInventoryStore(mPtr))
             return;
 
-        ammoCount = ammo->getRefData().getCount();
-        bool arrowAttached = isArrowAttached();
-        if (arrowAttached)
-            ammoCount--;
+        const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
+        MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+        if (weapon == inv.end() || weapon->getType() != ESM::Weapon::sRecordId)
+            return;
 
-        suitableAmmo = ammo->get<ESM::Weapon>()->mBase->mData.mType == weaponType->mAmmoType;
-    }
+        std::string mesh = weapon->getClass().getModel(*weapon);
+        std::string_view boneName = getHolsteredWeaponBoneName(*weapon);
+        if (mesh.empty() || boneName.empty())
+            return;
 
-    if (!suitableAmmo)
-        return;
+        osg::Group* ammoNode = getBoneByName("Bip01 Ammo");
+        if (!ammoNode)
+            return;
 
-    // We should not show more ammo than equipped and more than quiver mesh has
-    ammoCount = std::min(ammoCount, ammoNode->getNumChildren());
+        // Special case for throwing weapons - they do not use ammo, but they stack themselves
+        bool suitableAmmo = false;
+        MWWorld::ConstContainerStoreIterator ammo = weapon;
+        unsigned int ammoCount = 0;
+        int type = weapon->get<ESM::Weapon>()->mBase->mData.mType;
+        const auto& weaponType = MWMechanics::getWeaponType(type);
+        if (weaponType->mWeaponClass == ESM::WeaponType::Thrown)
+        {
+            ammoCount = ammo->getRefData().getCount();
+            osg::Group* throwingWeaponNode = getBoneByName(weaponType->mAttachBone);
+            if (throwingWeaponNode && throwingWeaponNode->getNumChildren())
+                ammoCount--;
 
-    // Remove existing ammo nodes
-    for (unsigned int i=0; i<ammoNode->getNumChildren(); ++i)
-    {
-        osg::ref_ptr<osg::Group> arrowNode = ammoNode->getChild(i)->asGroup();
-        if (!arrowNode->getNumChildren())
-            continue;
+            suitableAmmo = true;
+        }
+        else
+        {
+            ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
+            if (ammo == inv.end())
+                return;
 
-        osg::ref_ptr<osg::Node> arrowChildNode = arrowNode->getChild(0);
-        arrowNode->removeChild(arrowChildNode);
-    }
+            ammoCount = ammo->getRefData().getCount();
+            bool arrowAttached = isArrowAttached();
+            if (arrowAttached)
+                ammoCount--;
 
-    // Add new ones
-    osg::Vec4f glowColor = ammo->getClass().getEnchantmentColor(*ammo);
-    std::string model = ammo->getClass().getModel(*ammo);
-    for (unsigned int i=0; i<ammoCount; ++i)
-    {
-        osg::ref_ptr<osg::Group> arrowNode = ammoNode->getChild(i)->asGroup();
-        osg::ref_ptr<osg::Node> arrow = mResourceSystem->getSceneManager()->getInstance(model, arrowNode);
-        if (!ammo->getClass().getEnchantment(*ammo).empty())
-            mGlowUpdater = SceneUtil::addEnchantedGlow(arrow, mResourceSystem, glowColor);
+            suitableAmmo = ammo->get<ESM::Weapon>()->mBase->mData.mType == weaponType->mAmmoType;
+        }
+
+        if (!suitableAmmo)
+            return;
+
+        // We should not show more ammo than equipped and more than quiver mesh has
+        ammoCount = std::min(ammoCount, ammoNode->getNumChildren());
+
+        // Remove existing ammo nodes
+        for (unsigned int i = 0; i < ammoNode->getNumChildren(); ++i)
+        {
+            osg::ref_ptr<osg::Group> arrowNode = ammoNode->getChild(i)->asGroup();
+            if (!arrowNode->getNumChildren())
+                continue;
+
+            osg::ref_ptr<osg::Node> arrowChildNode = arrowNode->getChild(0);
+            arrowNode->removeChild(arrowChildNode);
+        }
+
+        // Add new ones
+        osg::Vec4f glowColor = ammo->getClass().getEnchantmentColor(*ammo);
+        std::string model = ammo->getClass().getModel(*ammo);
+        for (unsigned int i = 0; i < ammoCount; ++i)
+        {
+            osg::ref_ptr<osg::Group> arrowNode = ammoNode->getChild(i)->asGroup();
+            osg::ref_ptr<osg::Node> arrow = mResourceSystem->getSceneManager()->getInstance(model, arrowNode);
+            if (!ammo->getClass().getEnchantment(*ammo).empty())
+                mGlowUpdater = SceneUtil::addEnchantedGlow(arrow, mResourceSystem, glowColor);
+        }
     }
-}
 
-void ActorAnimation::itemAdded(const MWWorld::ConstPtr& item, int /*count*/)
-{
-    if (item.getType() == ESM::Light::sRecordId)
+    void ActorAnimation::itemAdded(const MWWorld::ConstPtr& item, int /*count*/)
     {
-        const ESM::Light* light = item.get<ESM::Light>()->mBase;
-        if (!(light->mData.mFlags & ESM::Light::Carry))
+        if (item.getType() == ESM::Light::sRecordId)
         {
-            addHiddenItemLight(item, light);
+            const ESM::Light* light = item.get<ESM::Light>()->mBase;
+            if (!(light->mData.mFlags & ESM::Light::Carry))
+            {
+                addHiddenItemLight(item, light);
+            }
         }
-    }
 
-    if (!mPtr.getClass().hasInventoryStore(mPtr))
-        return;
+        if (!mPtr.getClass().hasInventoryStore(mPtr))
+            return;
 
-    // If the count of equipped ammo or throwing weapon was changed, we should update quiver
-    const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
-    MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-    if(weapon == inv.end() || weapon->getType() != ESM::Weapon::sRecordId)
-        return;
+        // If the count of equipped ammo or throwing weapon was changed, we should update quiver
+        const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
+        MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+        if (weapon == inv.end() || weapon->getType() != ESM::Weapon::sRecordId)
+            return;
 
-    MWWorld::ConstContainerStoreIterator ammo = inv.end();
-    int type = weapon->get<ESM::Weapon>()->mBase->mData.mType;
-    if (MWMechanics::getWeaponType(type)->mWeaponClass == ESM::WeaponType::Thrown)
-        ammo = weapon;
-    else
-        ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
+        MWWorld::ConstContainerStoreIterator ammo = inv.end();
+        int type = weapon->get<ESM::Weapon>()->mBase->mData.mType;
+        if (MWMechanics::getWeaponType(type)->mWeaponClass == ESM::WeaponType::Thrown)
+            ammo = weapon;
+        else
+            ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
 
-    if(ammo != inv.end() && item.getCellRef().getRefId() == ammo->getCellRef().getRefId())
-        updateQuiver();
-}
+        if (ammo != inv.end() && item.getCellRef().getRefId() == ammo->getCellRef().getRefId())
+            updateQuiver();
+    }
 
-void ActorAnimation::itemRemoved(const MWWorld::ConstPtr& item, int /*count*/)
-{
-    if (item.getType() == ESM::Light::sRecordId)
+    void ActorAnimation::itemRemoved(const MWWorld::ConstPtr& item, int /*count*/)
     {
-        ItemLightMap::iterator iter = mItemLights.find(item);
-        if (iter != mItemLights.end())
+        if (item.getType() == ESM::Light::sRecordId)
         {
-            if (!item.getRefData().getCount())
+            ItemLightMap::iterator iter = mItemLights.find(item);
+            if (iter != mItemLights.end())
             {
-                removeHiddenItemLight(item);
+                if (!item.getRefData().getCount())
+                {
+                    removeHiddenItemLight(item);
+                }
             }
         }
-    }
 
-    if (!mPtr.getClass().hasInventoryStore(mPtr))
-        return;
-
-    // If the count of equipped ammo or throwing weapon was changed, we should update quiver
-    const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
-    MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-    if(weapon == inv.end() || weapon->getType() != ESM::Weapon::sRecordId)
-        return;
+        if (!mPtr.getClass().hasInventoryStore(mPtr))
+            return;
 
-    MWWorld::ConstContainerStoreIterator ammo = inv.end();
-    int type = weapon->get<ESM::Weapon>()->mBase->mData.mType;
-    if (MWMechanics::getWeaponType(type)->mWeaponClass == ESM::WeaponType::Thrown)
-        ammo = weapon;
-    else
-        ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
+        // If the count of equipped ammo or throwing weapon was changed, we should update quiver
+        const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
+        MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+        if (weapon == inv.end() || weapon->getType() != ESM::Weapon::sRecordId)
+            return;
 
-    if(ammo != inv.end() && item.getCellRef().getRefId() == ammo->getCellRef().getRefId())
-        updateQuiver();
-}
+        MWWorld::ConstContainerStoreIterator ammo = inv.end();
+        int type = weapon->get<ESM::Weapon>()->mBase->mData.mType;
+        if (MWMechanics::getWeaponType(type)->mWeaponClass == ESM::WeaponType::Thrown)
+            ammo = weapon;
+        else
+            ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
 
-void ActorAnimation::addHiddenItemLight(const MWWorld::ConstPtr& item, const ESM::Light* esmLight)
-{
-    if (mItemLights.find(item) != mItemLights.end())
-        return;
+        if (ammo != inv.end() && item.getCellRef().getRefId() == ammo->getCellRef().getRefId())
+            updateQuiver();
+    }
 
-    bool exterior = mPtr.isInCell() && mPtr.getCell()->getCell()->isExterior();
+    void ActorAnimation::addHiddenItemLight(const MWWorld::ConstPtr& item, const ESM::Light* esmLight)
+    {
+        if (mItemLights.find(item) != mItemLights.end())
+            return;
 
-    osg::Vec4f ambient(1,1,1,1);
-    osg::ref_ptr<SceneUtil::LightSource> lightSource = SceneUtil::createLightSource(esmLight, Mask_Lighting, exterior, ambient);
+        bool exterior = mPtr.isInCell() && mPtr.getCell()->getCell()->isExterior();
 
-    mInsert->addChild(lightSource);
+        osg::Vec4f ambient(1, 1, 1, 1);
+        osg::ref_ptr<SceneUtil::LightSource> lightSource
+            = SceneUtil::createLightSource(esmLight, Mask_Lighting, exterior, ambient);
 
-    if (mLightListCallback && mPtr == MWMechanics::getPlayer())
-        mLightListCallback->getIgnoredLightSources().insert(lightSource.get());
+        mInsert->addChild(lightSource);
 
-    mItemLights.insert(std::make_pair(item, lightSource));
-}
+        if (mLightListCallback && mPtr == MWMechanics::getPlayer())
+            mLightListCallback->getIgnoredLightSources().insert(lightSource.get());
 
-void ActorAnimation::removeHiddenItemLight(const MWWorld::ConstPtr& item)
-{
-    ItemLightMap::iterator iter = mItemLights.find(item);
-    if (iter == mItemLights.end())
-        return;
+        mItemLights.insert(std::make_pair(item, lightSource));
+    }
 
-    if (mLightListCallback && mPtr == MWMechanics::getPlayer())
+    void ActorAnimation::removeHiddenItemLight(const MWWorld::ConstPtr& item)
     {
-        std::set<SceneUtil::LightSource*>::iterator ignoredIter = mLightListCallback->getIgnoredLightSources().find(iter->second.get());
-        if (ignoredIter != mLightListCallback->getIgnoredLightSources().end())
-            mLightListCallback->getIgnoredLightSources().erase(ignoredIter);
-    }
+        ItemLightMap::iterator iter = mItemLights.find(item);
+        if (iter == mItemLights.end())
+            return;
 
-    mInsert->removeChild(iter->second);
-    mItemLights.erase(iter);
-}
+        if (mLightListCallback && mPtr == MWMechanics::getPlayer())
+        {
+            std::set<SceneUtil::LightSource*>::iterator ignoredIter
+                = mLightListCallback->getIgnoredLightSources().find(iter->second.get());
+            if (ignoredIter != mLightListCallback->getIgnoredLightSources().end())
+                mLightListCallback->getIgnoredLightSources().erase(ignoredIter);
+        }
 
-void ActorAnimation::removeFromScene()
-{
-    for (const auto& [k, v] : mItemLights)
-        mInsert->removeChild(v);
-    Animation::removeFromScene();
-}
+        mInsert->removeChild(iter->second);
+        mItemLights.erase(iter);
+    }
+
+    void ActorAnimation::removeFromScene()
+    {
+        for (const auto& [k, v] : mItemLights)
+            mInsert->removeChild(v);
+        Animation::removeFromScene();
+    }
 
 }
diff --git a/apps/openmw/mwrender/actoranimation.hpp b/apps/openmw/mwrender/actoranimation.hpp
index 788458ac09..71b9ad89cb 100644
--- a/apps/openmw/mwrender/actoranimation.hpp
+++ b/apps/openmw/mwrender/actoranimation.hpp
@@ -28,10 +28,11 @@ namespace SceneUtil
 namespace MWRender
 {
 
-class ActorAnimation : public Animation, public MWWorld::ContainerStoreListener
-{
+    class ActorAnimation : public Animation, public MWWorld::ContainerStoreListener
+    {
     public:
-        ActorAnimation(const MWWorld::Ptr &ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem);
+        ActorAnimation(
+            const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem);
         virtual ~ActorAnimation();
 
         void itemAdded(const MWWorld::ConstPtr& item, int count) override;
@@ -50,13 +51,15 @@ class ActorAnimation : public Animation, public MWWorld::ContainerStoreListener
         std::string getShieldMesh(const MWWorld::ConstPtr& shield, bool female) const;
         virtual std::string getSheathedShieldMesh(const MWWorld::ConstPtr& shield) const;
         virtual std::string_view getHolsteredWeaponBoneName(const MWWorld::ConstPtr& weapon);
-        virtual PartHolderPtr attachMesh(const std::string& model, std::string_view bonename, bool enchantedGlow, osg::Vec4f* glowColor);
+        virtual PartHolderPtr attachMesh(
+            const std::string& model, std::string_view bonename, bool enchantedGlow, osg::Vec4f* glowColor);
         virtual PartHolderPtr attachMesh(const std::string& model, std::string_view bonename)
         {
-            osg::Vec4f stubColor = osg::Vec4f(0,0,0,0);
+            osg::Vec4f stubColor = osg::Vec4f(0, 0, 0, 0);
             return attachMesh(model, bonename, false, &stubColor);
         };
-        osg::ref_ptr<osg::Node> attach(const std::string& model, std::string_view bonename, std::string_view bonefilter, bool isLight);
+        osg::ref_ptr<osg::Node> attach(
+            const std::string& model, std::string_view bonename, std::string_view bonefilter, bool isLight);
 
         PartHolderPtr mScabbard;
         PartHolderPtr mHolsteredShield;
@@ -66,9 +69,9 @@ class ActorAnimation : public Animation, public MWWorld::ContainerStoreListener
         void removeHiddenItemLight(const MWWorld::ConstPtr& item);
         void resetControllers(osg::Node* node);
 
-        typedef std::map<MWWorld::ConstPtr, osg::ref_ptr<SceneUtil::LightSource> > ItemLightMap;
+        typedef std::map<MWWorld::ConstPtr, osg::ref_ptr<SceneUtil::LightSource>> ItemLightMap;
         ItemLightMap mItemLights;
-};
+    };
 
 }
 
diff --git a/apps/openmw/mwrender/actorspaths.cpp b/apps/openmw/mwrender/actorspaths.cpp
index 45b35df4b9..68cf73fb52 100644
--- a/apps/openmw/mwrender/actorspaths.cpp
+++ b/apps/openmw/mwrender/actorspaths.cpp
@@ -1,15 +1,15 @@
 #include "actorspaths.hpp"
 #include "vismask.hpp"
 
-#include <components/sceneutil/agentpath.hpp>
+#include <components/detournavigator/settings.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
-#include <components/detournavigator/settings.hpp>
+#include <components/sceneutil/agentpath.hpp>
 
 #include <osg/PositionAttitudeTransform>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
 #include <algorithm>
 
@@ -38,8 +38,8 @@ namespace MWRender
     }
 
     void ActorsPaths::update(const MWWorld::ConstPtr& actor, const std::deque<osg::Vec3f>& path,
-            const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end,
-            const DetourNavigator::Settings& settings)
+        const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end,
+        const DetourNavigator::Settings& settings)
     {
         if (!mEnabled)
             return;
@@ -54,7 +54,7 @@ namespace MWRender
             MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(newGroup, "debug");
             newGroup->setNodeMask(Mask_Debug);
             mRootNode->addChild(newGroup);
-            mGroups[actor.mRef] = Group {actor.mCell, std::move(newGroup)};
+            mGroups[actor.mRef] = Group{ actor.mCell, std::move(newGroup) };
         }
     }
 
@@ -70,7 +70,7 @@ namespace MWRender
 
     void ActorsPaths::removeCell(const MWWorld::CellStore* const store)
     {
-        for (auto it = mGroups.begin(); it != mGroups.end(); )
+        for (auto it = mGroups.begin(); it != mGroups.end();)
         {
             if (it->second.mCell == store)
             {
@@ -92,15 +92,15 @@ namespace MWRender
 
     void ActorsPaths::enable()
     {
-        std::for_each(mGroups.begin(), mGroups.end(),
-            [&] (const Groups::value_type& v) { mRootNode->addChild(v.second.mNode); });
+        std::for_each(
+            mGroups.begin(), mGroups.end(), [&](const Groups::value_type& v) { mRootNode->addChild(v.second.mNode); });
         mEnabled = true;
     }
 
     void ActorsPaths::disable()
     {
         std::for_each(mGroups.begin(), mGroups.end(),
-            [&] (const Groups::value_type& v) { mRootNode->removeChild(v.second.mNode); });
+            [&](const Groups::value_type& v) { mRootNode->removeChild(v.second.mNode); });
         mEnabled = false;
     }
 }
diff --git a/apps/openmw/mwrender/actorspaths.hpp b/apps/openmw/mwrender/actorspaths.hpp
index 304d5c09b3..d18197b974 100644
--- a/apps/openmw/mwrender/actorspaths.hpp
+++ b/apps/openmw/mwrender/actorspaths.hpp
@@ -5,9 +5,9 @@
 
 #include <osg/ref_ptr>
 
-#include <unordered_map>
 #include <deque>
 #include <map>
+#include <unordered_map>
 
 namespace osg
 {
@@ -31,8 +31,8 @@ namespace MWRender
         bool toggle();
 
         void update(const MWWorld::ConstPtr& actor, const std::deque<osg::Vec3f>& path,
-                const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end,
-                const DetourNavigator::Settings& settings);
+            const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end,
+            const DetourNavigator::Settings& settings);
 
         void remove(const MWWorld::ConstPtr& actor);
 
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 55f444b90d..f11d004f11 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -3,57 +3,57 @@
 #include <iomanip>
 #include <limits>
 
-#include <osg/MatrixTransform>
 #include <osg/BlendFunc>
+#include <osg/ColorMaski>
+#include <osg/LightModel>
 #include <osg/Material>
+#include <osg/MatrixTransform>
 #include <osg/Switch>
-#include <osg/LightModel>
-#include <osg/ColorMaski>
 
-#include <osgParticle/ParticleSystem>
 #include <osgParticle/ParticleProcessor>
+#include <osgParticle/ParticleSystem>
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/resource/scenemanager.hpp>
 #include <components/resource/keyframemanager.hpp>
+#include <components/resource/scenemanager.hpp>
 
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadrace.hpp>
 #include <components/misc/constants.hpp>
 #include <components/misc/pathhelpers.hpp>
 #include <components/misc/resourcehelpers.hpp>
-#include <components/esm3/loadmgef.hpp>
-#include <components/esm3/loadrace.hpp>
-#include <components/esm3/loadnpc.hpp>
-#include <components/esm3/loadcont.hpp>
-#include <components/esm3/loadcrea.hpp>
 
 #include <components/sceneutil/keyframe.hpp>
 
 #include <components/vfs/manager.hpp>
 
 #include <components/sceneutil/actorutil.hpp>
-#include <components/sceneutil/statesetupdater.hpp>
-#include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/lightutil.hpp>
-#include <components/sceneutil/skeleton.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
+#include <components/sceneutil/skeleton.hpp>
+#include <components/sceneutil/statesetupdater.hpp>
 #include <components/sceneutil/util.hpp>
+#include <components/sceneutil/visitor.hpp>
 
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwworld/esmstore.hpp"
-#include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include "../mwmechanics/character.hpp" // FIXME: for MWMechanics::Priority
 
-#include "vismask.hpp"
-#include "util.hpp"
 #include "rotatecontroller.hpp"
+#include "util.hpp"
+#include "vismask.hpp"
 
 namespace
 {
@@ -63,13 +63,11 @@ namespace
         MarkDrawablesVisitor(osg::Node::NodeMask mask)
             : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
             , mMask(mask)
-        { }
-
-        void apply(osg::Drawable& drawable) override
         {
-            drawable.setNodeMask(mMask);
         }
 
+        void apply(osg::Drawable& drawable) override { drawable.setNodeMask(mMask); }
+
     private:
         osg::Node::NodeMask mMask = 0;
     };
@@ -80,9 +78,10 @@ namespace
     public:
         RemoveParticlesVisitor()
             : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-        { }
+        {
+        }
 
-        void apply(osg::Node &node) override
+        void apply(osg::Node& node) override
         {
             if (dynamic_cast<osgParticle::ParticleProcessor*>(&node))
                 mToRemove.emplace_back(&node);
@@ -108,13 +107,14 @@ namespace
         }
 
     private:
-        std::vector<osg::ref_ptr<osg::Node> > mToRemove;
+        std::vector<osg::ref_ptr<osg::Node>> mToRemove;
     };
 
     class DayNightCallback : public SceneUtil::NodeCallback<DayNightCallback, osg::Switch*>
     {
     public:
-        DayNightCallback() : mCurrentState(0)
+        DayNightCallback()
+            : mCurrentState(0)
         {
         }
 
@@ -141,9 +141,10 @@ namespace
     public:
         AddSwitchCallbacksVisitor()
             : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-        { }
+        {
+        }
 
-        void apply(osg::Switch &switchNode) override
+        void apply(osg::Switch& switchNode) override
         {
             if (switchNode.getName() == Constants::NightDayLabel)
                 switchNode.addUpdateCallback(new DayNightCallback());
@@ -176,14 +177,14 @@ namespace
         if (value.starts_with(s1))
         {
             value = value.substr(s1.size());
-            if(value.starts_with(s2))
+            if (value.starts_with(s2))
                 return value.substr(s2.size()) == s3;
         }
         return false;
     }
 
-    float calcAnimVelocity(const SceneUtil::TextKeyMap& keys, SceneUtil::KeyframeController *nonaccumctrl,
-                           const osg::Vec3f& accum, std::string_view groupname)
+    float calcAnimVelocity(const SceneUtil::TextKeyMap& keys, SceneUtil::KeyframeController* nonaccumctrl,
+        const osg::Vec3f& accum, std::string_view groupname)
     {
         float starttime = std::numeric_limits<float>::max();
         float stoptime = 0.0f;
@@ -195,9 +196,10 @@ namespace
         // As result the animation velocity calculation is not correct, and this incorrect velocity must be replicated,
         // because otherwise the Creature's Speed (dagoth uthol) would not be sufficient to move fast enough.
         auto keyiter = keys.rbegin();
-        while(keyiter != keys.rend())
+        while (keyiter != keys.rend())
         {
-            if(equalsParts(keyiter->second, groupname, ": start") || equalsParts(keyiter->second, groupname, ": loop start"))
+            if (equalsParts(keyiter->second, groupname, ": start")
+                || equalsParts(keyiter->second, groupname, ": loop start"))
             {
                 starttime = keyiter->first;
                 break;
@@ -205,7 +207,7 @@ namespace
             ++keyiter;
         }
         keyiter = keys.rbegin();
-        while(keyiter != keys.rend())
+        while (keyiter != keys.rend())
         {
             if (equalsParts(keyiter->second, groupname, ": stop"))
                 stoptime = keyiter->first;
@@ -217,12 +219,12 @@ namespace
             ++keyiter;
         }
 
-        if(stoptime > starttime)
+        if (stoptime > starttime)
         {
             osg::Vec3f startpos = osg::componentMultiply(nonaccumctrl->getTranslation(starttime), accum);
             osg::Vec3f endpos = osg::componentMultiply(nonaccumctrl->getTranslation(stoptime), accum);
 
-            return (startpos-endpos).length() / (stoptime - starttime);
+            return (startpos - endpos).length() / (stoptime - starttime);
         }
 
         return 0.0f;
@@ -247,7 +249,7 @@ namespace
             traverse(node);
         }
 
-        std::vector<std::pair<osg::Node*, osg::Group*> > mFoundBones;
+        std::vector<std::pair<osg::Node*, osg::Group*>> mFoundBones;
     };
 
     class RemoveFinishedCallbackVisitor : public SceneUtil::RemoveVisitor
@@ -261,12 +263,9 @@ namespace
         {
         }
 
-        void apply(osg::Node &node) override
-        {
-            traverse(node);
-        }
+        void apply(osg::Node& node) override { traverse(node); }
 
-        void apply(osg::Group &group) override
+        void apply(osg::Group& group) override
         {
             traverse(group);
 
@@ -285,14 +284,9 @@ namespace
             }
         }
 
-        void apply(osg::MatrixTransform &node) override
-        {
-            traverse(node);
-        }
+        void apply(osg::MatrixTransform& node) override { traverse(node); }
 
-        void apply(osg::Geometry&) override
-        {
-        }
+        void apply(osg::Geometry&) override {}
     };
 
     class RemoveCallbackVisitor : public SceneUtil::RemoveVisitor
@@ -314,12 +308,9 @@ namespace
         {
         }
 
-        void apply(osg::Node &node) override
-        {
-            traverse(node);
-        }
+        void apply(osg::Node& node) override { traverse(node); }
 
-        void apply(osg::Group &group) override
+        void apply(osg::Group& group) override
         {
             traverse(group);
 
@@ -338,14 +329,9 @@ namespace
             }
         }
 
-        void apply(osg::MatrixTransform &node) override
-        {
-            traverse(node);
-        }
+        void apply(osg::MatrixTransform& node) override { traverse(node); }
 
-        void apply(osg::Geometry&) override
-        {
-        }
+        void apply(osg::Geometry&) override {}
 
     private:
         int mEffectId;
@@ -354,7 +340,6 @@ namespace
     class FindVfxCallbacksVisitor : public osg::NodeVisitor
     {
     public:
-
         std::vector<MWRender::UpdateVfxCallback*> mCallbacks;
 
         FindVfxCallbacksVisitor()
@@ -369,12 +354,9 @@ namespace
         {
         }
 
-        void apply(osg::Node &node) override
-        {
-            traverse(node);
-        }
+        void apply(osg::Node& node) override { traverse(node); }
 
-        void apply(osg::Group &group) override
+        void apply(osg::Group& group) override
         {
             osg::Callback* callback = group.getUpdateCallback();
             if (callback)
@@ -391,14 +373,9 @@ namespace
             traverse(group);
         }
 
-        void apply(osg::MatrixTransform &node) override
-        {
-            traverse(node);
-        }
+        void apply(osg::MatrixTransform& node) override { traverse(node); }
 
-        void apply(osg::Geometry&) override
-        {
-        }
+        void apply(osg::Geometry&) override {}
 
     private:
         int mEffectId;
@@ -411,7 +388,7 @@ namespace
         if (!lightModel)
         {
             lightModel = new osg::LightModel;
-            lightModel->setAmbientIntensity({1,1,1,1});
+            lightModel->setAmbientIntensity({ 1, 1, 1, 1 });
         }
 
         return lightModel;
@@ -428,16 +405,13 @@ namespace MWRender
         {
         }
 
-        void setAlpha(const float alpha)
-        {
-            mAlpha = alpha;
-        }
+        void setAlpha(const float alpha) { mAlpha = alpha; }
 
     protected:
         void setDefaults(osg::StateSet* stateset) override
         {
-            osg::BlendFunc* blendfunc (new osg::BlendFunc);
-            stateset->setAttributeAndModes(blendfunc, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+            osg::BlendFunc* blendfunc(new osg::BlendFunc);
+            stateset->setAttributeAndModes(blendfunc, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
 
             stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
             stateset->setRenderBinMode(osg::StateSet::OVERRIDE_RENDERBIN_DETAILS);
@@ -445,15 +419,17 @@ namespace MWRender
             // FIXME: overriding diffuse/ambient/emissive colors
             osg::Material* material = new osg::Material;
             material->setColorMode(osg::Material::OFF);
-            material->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,mAlpha));
-            material->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
-            stateset->setAttributeAndModes(material, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-            stateset->addUniform(new osg::Uniform("colorMode", 0), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+            material->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1, 1, 1, mAlpha));
+            material->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1, 1, 1, 1));
+            stateset->setAttributeAndModes(material, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+            stateset->addUniform(
+                new osg::Uniform("colorMode", 0), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
         }
 
         void apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/) override
         {
-            osg::Material* material = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
+            osg::Material* material
+                = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
             material->setAlpha(osg::Material::FRONT_AND_BACK, mAlpha);
         }
 
@@ -465,7 +441,7 @@ namespace MWRender
     {
         osg::ref_ptr<const SceneUtil::KeyframeHolder> mKeyframes;
 
-        typedef std::map<std::string, osg::ref_ptr<SceneUtil::KeyframeController> > ControllerMap;
+        typedef std::map<std::string, osg::ref_ptr<SceneUtil::KeyframeController>> ControllerMap;
 
         ControllerMap mControllerMap[Animation::sNumBlendMasks];
 
@@ -534,7 +510,8 @@ namespace MWRender
         osg::Vec3f mResetAxes;
     };
 
-    Animation::Animation(const MWWorld::Ptr &ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem)
+    Animation::Animation(
+        const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem)
         : mInsert(parentNode)
         , mSkeleton(nullptr)
         , mNodeMapCreated(false)
@@ -550,7 +527,7 @@ namespace MWRender
         , mHasMagicEffects(false)
         , mAlpha(1.f)
     {
-        for(size_t i = 0;i < sNumBlendMasks;i++)
+        for (size_t i = 0; i < sNumBlendMasks; i++)
             mAnimationTimePtr[i] = std::make_shared<AnimationTime>();
 
         mLightListCallback = new SceneUtil::LightListCallback;
@@ -564,7 +541,7 @@ namespace MWRender
             mSkeleton->setActive(static_cast<SceneUtil::Skeleton::ActiveType>(active));
     }
 
-    void Animation::updatePtr(const MWWorld::Ptr &ptr)
+    void Animation::updatePtr(const MWWorld::Ptr& ptr)
     {
         mPtr = ptr;
     }
@@ -586,12 +563,12 @@ namespace MWRender
             "Bip01 R Clavicle", /* Right arm */
         };
 
-        while(node != mObjectRoot)
+        while (node != mObjectRoot)
         {
-            const std::string &name = node->getName();
-            for(size_t i = 1;i < sNumBlendMasks;i++)
+            const std::string& name = node->getName();
+            for (size_t i = 1; i < sNumBlendMasks; i++)
             {
-                if(name == sBlendMaskRoots[i])
+                if (name == sBlendMaskRoots[i])
                     return i;
             }
 
@@ -603,19 +580,19 @@ namespace MWRender
         return 0;
     }
 
-    const SceneUtil::TextKeyMap &Animation::AnimSource::getTextKeys() const
+    const SceneUtil::TextKeyMap& Animation::AnimSource::getTextKeys() const
     {
         return mKeyframes->mTextKeys;
     }
 
-    void Animation::loadAllAnimationsInFolder(const std::string &model, const std::string &baseModel)
+    void Animation::loadAllAnimationsInFolder(const std::string& model, const std::string& baseModel)
     {
         std::string animationPath = model;
         if (animationPath.find("meshes") == 0)
         {
             animationPath.replace(0, 6, "animations");
         }
-        animationPath.replace(animationPath.size()-3, 3, "/");
+        animationPath.replace(animationPath.size() - 3, 3, "/");
 
         for (const auto& name : mResourceSystem->getVFS()->getRecursiveDirectoryIterator(animationPath))
         {
@@ -628,36 +605,39 @@ namespace MWRender
     {
         std::string kfname = Misc::StringUtils::lowerCase(model);
 
-        if(kfname.size() > 4 && kfname.compare(kfname.size()-4, 4, ".nif") == 0)
-            kfname.replace(kfname.size()-4, 4, ".kf");
+        if (kfname.size() > 4 && kfname.compare(kfname.size() - 4, 4, ".nif") == 0)
+            kfname.replace(kfname.size() - 4, 4, ".kf");
 
         addSingleAnimSource(kfname, baseModel);
 
-        static const bool useAdditionalSources = Settings::Manager::getBool ("use additional anim sources", "Game");
+        static const bool useAdditionalSources = Settings::Manager::getBool("use additional anim sources", "Game");
         if (useAdditionalSources)
             loadAllAnimationsInFolder(kfname, baseModel);
     }
 
-    void Animation::addSingleAnimSource(const std::string &kfname, const std::string& baseModel)
+    void Animation::addSingleAnimSource(const std::string& kfname, const std::string& baseModel)
     {
-        if(!mResourceSystem->getVFS()->exists(kfname))
+        if (!mResourceSystem->getVFS()->exists(kfname))
             return;
 
         auto animsrc = std::make_shared<AnimSource>();
         animsrc->mKeyframes = mResourceSystem->getKeyframeManager()->get(kfname);
 
-        if (!animsrc->mKeyframes || animsrc->mKeyframes->mTextKeys.empty() || animsrc->mKeyframes->mKeyframeControllers.empty())
+        if (!animsrc->mKeyframes || animsrc->mKeyframes->mTextKeys.empty()
+            || animsrc->mKeyframes->mKeyframeControllers.empty())
             return;
 
         const NodeMap& nodeMap = getNodeMap();
         const auto& controllerMap = animsrc->mKeyframes->mKeyframeControllers;
-        for (SceneUtil::KeyframeHolder::KeyframeControllerMap::const_iterator it = controllerMap.begin(); it != controllerMap.end(); ++it)
+        for (SceneUtil::KeyframeHolder::KeyframeControllerMap::const_iterator it = controllerMap.begin();
+             it != controllerMap.end(); ++it)
         {
             std::string bonename = Misc::StringUtils::lowerCase(it->first);
             NodeMap::const_iterator found = nodeMap.find(bonename);
             if (found == nodeMap.end())
             {
-                Log(Debug::Warning) << "Warning: addAnimSource: can't find bone '" + bonename << "' in " << baseModel << " (referenced by " << kfname << ")";
+                Log(Debug::Warning) << "Warning: addAnimSource: can't find bone '" + bonename << "' in " << baseModel
+                                    << " (referenced by " << kfname << ")";
                 continue;
             }
 
@@ -666,7 +646,8 @@ namespace MWRender
             size_t blendMask = detectBlendMask(node);
 
             // clone the controller, because each Animation needs its own ControllerSource
-            osg::ref_ptr<SceneUtil::KeyframeController> cloned = osg::clone(it->second.get(), osg::CopyOp::SHALLOW_COPY);
+            osg::ref_ptr<SceneUtil::KeyframeController> cloned
+                = osg::clone(it->second.get(), osg::CopyOp::SHALLOW_COPY);
             cloned->setSource(mAnimationTimePtr[blendMask]);
 
             animsrc->mControllerMap[blendMask].insert(std::make_pair(bonename, cloned));
@@ -681,18 +662,15 @@ namespace MWRender
         if (!mAccumRoot)
         {
             // Priority matters! bip01 is preferred.
-            static const std::initializer_list<std::string_view> accumRootNames =
-            {
-                "bip01",
-                "root bone"
-            };
+            static const std::initializer_list<std::string_view> accumRootNames = { "bip01", "root bone" };
             NodeMap::const_iterator found = nodeMap.end();
             for (const std::string_view& name : accumRootNames)
             {
                 found = nodeMap.find(name);
                 if (found == nodeMap.end())
                     continue;
-                for (SceneUtil::KeyframeHolder::KeyframeControllerMap::const_iterator it = controllerMap.begin(); it != controllerMap.end(); ++it)
+                for (SceneUtil::KeyframeHolder::KeyframeControllerMap::const_iterator it = controllerMap.begin();
+                     it != controllerMap.end(); ++it)
                 {
                     if (Misc::StringUtils::ciEqual(it->first, name))
                     {
@@ -710,7 +688,7 @@ namespace MWRender
     {
         mStates.clear();
 
-        for(size_t i = 0;i < sNumBlendMasks;i++)
+        for (size_t i = 0; i < sNumBlendMasks; i++)
             mAnimationTimePtr[i]->setTimePtr(std::shared_ptr<float>());
 
         mAccumCtrl = nullptr;
@@ -723,9 +701,9 @@ namespace MWRender
     bool Animation::hasAnimation(std::string_view anim) const
     {
         AnimSourceList::const_iterator iter(mAnimSources.begin());
-        for(;iter != mAnimSources.end();++iter)
+        for (; iter != mAnimSources.end(); ++iter)
         {
-            const SceneUtil::TextKeyMap &keys = (*iter)->getTextKeys();
+            const SceneUtil::TextKeyMap& keys = (*iter)->getTextKeys();
             if (keys.hasGroupStart(anim))
                 return true;
         }
@@ -733,14 +711,14 @@ namespace MWRender
         return false;
     }
 
-    float Animation::getStartTime(const std::string &groupname) const
+    float Animation::getStartTime(const std::string& groupname) const
     {
-        for(AnimSourceList::const_reverse_iterator iter(mAnimSources.rbegin()); iter != mAnimSources.rend(); ++iter)
+        for (AnimSourceList::const_reverse_iterator iter(mAnimSources.rbegin()); iter != mAnimSources.rend(); ++iter)
         {
-            const SceneUtil::TextKeyMap &keys = (*iter)->getTextKeys();
+            const SceneUtil::TextKeyMap& keys = (*iter)->getTextKeys();
 
             const auto found = keys.findGroupStart(groupname);
-            if(found != keys.end())
+            if (found != keys.end())
                 return found->first;
         }
         return -1.f;
@@ -748,13 +726,13 @@ namespace MWRender
 
     float Animation::getTextKeyTime(std::string_view textKey) const
     {
-        for(AnimSourceList::const_reverse_iterator iter(mAnimSources.rbegin()); iter != mAnimSources.rend(); ++iter)
+        for (AnimSourceList::const_reverse_iterator iter(mAnimSources.rbegin()); iter != mAnimSources.rend(); ++iter)
         {
-            const SceneUtil::TextKeyMap &keys = (*iter)->getTextKeys();
+            const SceneUtil::TextKeyMap& keys = (*iter)->getTextKeys();
 
-            for(auto iterKey = keys.begin(); iterKey != keys.end(); ++iterKey)
+            for (auto iterKey = keys.begin(); iterKey != keys.end(); ++iterKey)
             {
-                if(iterKey->second.starts_with(textKey))
+                if (iterKey->second.starts_with(textKey))
                     return iterKey->first;
             }
         }
@@ -762,17 +740,17 @@ namespace MWRender
         return -1.f;
     }
 
-    void Animation::handleTextKey(AnimState &state, std::string_view groupname, SceneUtil::TextKeyMap::ConstIterator key,
-                       const SceneUtil::TextKeyMap& map)
+    void Animation::handleTextKey(AnimState& state, std::string_view groupname,
+        SceneUtil::TextKeyMap::ConstIterator key, const SceneUtil::TextKeyMap& map)
     {
         std::string_view evt = key->second;
 
-        if(evt.starts_with(groupname) && evt.substr(groupname.size()).starts_with(": "))
+        if (evt.starts_with(groupname) && evt.substr(groupname.size()).starts_with(": "))
         {
             size_t off = groupname.size() + 2;
-            if(evt.substr(off) == "loop start")
+            if (evt.substr(off) == "loop start")
                 state.mLoopStartTime = key->first;
-            else if(evt.substr(off) == "loop stop")
+            else if (evt.substr(off) == "loop stop")
                 state.mLoopStopTime = key->first;
         }
 
@@ -789,29 +767,30 @@ namespace MWRender
         }
     }
 
-    void Animation::play(std::string_view groupname, const AnimPriority& priority, int blendMask, bool autodisable, float speedmult,
-                         std::string_view start, std::string_view stop, float startpoint, size_t loops, bool loopfallback)
+    void Animation::play(std::string_view groupname, const AnimPriority& priority, int blendMask, bool autodisable,
+        float speedmult, std::string_view start, std::string_view stop, float startpoint, size_t loops,
+        bool loopfallback)
     {
-        if(!mObjectRoot || mAnimSources.empty())
+        if (!mObjectRoot || mAnimSources.empty())
             return;
 
-        if(groupname.empty())
+        if (groupname.empty())
         {
             resetActiveGroups();
             return;
         }
 
         AnimStateMap::iterator stateiter = mStates.begin();
-        while(stateiter != mStates.end())
+        while (stateiter != mStates.end())
         {
-            if(stateiter->second.mPriority == priority)
+            if (stateiter->second.mPriority == priority)
                 mStates.erase(stateiter++);
             else
                 ++stateiter;
         }
 
         stateiter = mStates.find(groupname);
-        if(stateiter != mStates.end())
+        if (stateiter != mStates.end())
         {
             stateiter->second.mPriority = priority;
             resetActiveGroups();
@@ -821,10 +800,10 @@ namespace MWRender
         /* Look in reverse; last-inserted source has priority. */
         AnimState state;
         AnimSourceList::reverse_iterator iter(mAnimSources.rbegin());
-        for(;iter != mAnimSources.rend();++iter)
+        for (; iter != mAnimSources.rend(); ++iter)
         {
-            const SceneUtil::TextKeyMap &textkeys = (*iter)->getTextKeys();
-            if(reset(state, textkeys, groupname, start, stop, startpoint, loopfallback))
+            const SceneUtil::TextKeyMap& textkeys = (*iter)->getTextKeys();
+            if (reset(state, textkeys, groupname, start, stop, startpoint, loopfallback))
             {
                 state.mSource = *iter;
                 state.mSpeedMult = speedmult;
@@ -833,28 +812,28 @@ namespace MWRender
                 state.mPriority = priority;
                 state.mBlendMask = blendMask;
                 state.mAutoDisable = autodisable;
-                mStates[std::string{groupname}] = state;
+                mStates[std::string{ groupname }] = state;
 
                 if (state.mPlaying)
                 {
                     auto textkey = textkeys.lowerBound(state.getTime());
-                    while(textkey != textkeys.end() && textkey->first <= state.getTime())
+                    while (textkey != textkeys.end() && textkey->first <= state.getTime())
                     {
                         handleTextKey(state, groupname, textkey, textkeys);
                         ++textkey;
                     }
                 }
 
-                if(state.getTime() >= state.mLoopStopTime && state.mLoopCount > 0)
+                if (state.getTime() >= state.mLoopStopTime && state.mLoopCount > 0)
                 {
                     state.mLoopCount--;
                     state.setTime(state.mLoopStartTime);
                     state.mPlaying = true;
-                    if(state.getTime() >= state.mLoopStopTime)
+                    if (state.getTime() >= state.mLoopStopTime)
                         break;
 
                     auto textkey = textkeys.lowerBound(state.getTime());
-                    while(textkey != textkeys.end() && textkey->first <= state.getTime())
+                    while (textkey != textkeys.end() && textkey->first <= state.getTime())
                     {
                         handleTextKey(state, groupname, textkey, textkeys);
                         ++textkey;
@@ -868,42 +847,42 @@ namespace MWRender
         resetActiveGroups();
     }
 
-    bool Animation::reset(AnimState& state, const SceneUtil::TextKeyMap& keys, std::string_view groupname, std::string_view start, std::string_view stop, float startpoint, bool loopfallback)
+    bool Animation::reset(AnimState& state, const SceneUtil::TextKeyMap& keys, std::string_view groupname,
+        std::string_view start, std::string_view stop, float startpoint, bool loopfallback)
     {
         // Look for text keys in reverse. This normally wouldn't matter, but for some reason undeadwolf_2.nif has two
         // separate walkforward keys, and the last one is supposed to be used.
         auto groupend = keys.rbegin();
-        for(;groupend != keys.rend();++groupend)
+        for (; groupend != keys.rend(); ++groupend)
         {
-            if(groupend->second.starts_with(groupname) &&
-               groupend->second.compare(groupname.size(), 2, ": ") == 0)
+            if (groupend->second.starts_with(groupname) && groupend->second.compare(groupname.size(), 2, ": ") == 0)
                 break;
         }
 
         auto startkey = groupend;
-        while(startkey != keys.rend() && !equalsParts(startkey->second, groupname, ": ", start))
+        while (startkey != keys.rend() && !equalsParts(startkey->second, groupname, ": ", start))
             ++startkey;
-        if(startkey == keys.rend() && start == "loop start")
+        if (startkey == keys.rend() && start == "loop start")
         {
             startkey = groupend;
-            while(startkey != keys.rend() && !equalsParts(startkey->second, groupname, ": start"))
+            while (startkey != keys.rend() && !equalsParts(startkey->second, groupname, ": start"))
                 ++startkey;
         }
-        if(startkey == keys.rend())
+        if (startkey == keys.rend())
             return false;
 
         auto stopkey = groupend;
         std::size_t checkLength = groupname.size() + 2 + stop.size();
-        while(stopkey != keys.rend()
-              // We have to ignore extra garbage at the end.
-              // The Scrib's idle3 animation has "Idle3: Stop." instead of "Idle3: Stop".
-              // Why, just why? :(
-              && !equalsParts(std::string_view{stopkey->second}.substr(0, checkLength), groupname, ": ", stop))
+        while (stopkey != keys.rend()
+            // We have to ignore extra garbage at the end.
+            // The Scrib's idle3 animation has "Idle3: Stop." instead of "Idle3: Stop".
+            // Why, just why? :(
+            && !equalsParts(std::string_view{ stopkey->second }.substr(0, checkLength), groupname, ": ", stop))
             ++stopkey;
-        if(stopkey == keys.rend())
+        if (stopkey == keys.rend())
             return false;
 
-        if(startkey->first > stopkey->first)
+        if (startkey->first > stopkey->first)
             return false;
 
         state.mStartTime = startkey->first;
@@ -921,8 +900,9 @@ namespace MWRender
 
         state.setTime(state.mStartTime + ((state.mStopTime - state.mStartTime) * startpoint));
 
-        // mLoopStartTime and mLoopStopTime normally get assigned when encountering these keys while playing the animation
-        // (see handleTextKey). But if startpoint is already past these keys, or start time is == stop time, we need to assign them now.
+        // mLoopStartTime and mLoopStopTime normally get assigned when encountering these keys while playing the
+        // animation (see handleTextKey). But if startpoint is already past these keys, or start time is == stop time,
+        // we need to assign them now.
 
         auto key = groupend;
         for (; key != startkey && key != keys.rend(); ++key)
@@ -939,12 +919,12 @@ namespace MWRender
         return true;
     }
 
-    void Animation::setTextKeyListener(Animation::TextKeyListener *listener)
+    void Animation::setTextKeyListener(Animation::TextKeyListener* listener)
     {
         mTextKeyListener = listener;
     }
 
-    const Animation::NodeMap &Animation::getNodeMap() const
+    const Animation::NodeMap& Animation::getNodeMap() const
     {
         if (!mNodeMapCreated && mObjectRoot)
         {
@@ -971,30 +951,34 @@ namespace MWRender
 
         mAccumCtrl = nullptr;
 
-        for(size_t blendMask = 0;blendMask < sNumBlendMasks;blendMask++)
+        for (size_t blendMask = 0; blendMask < sNumBlendMasks; blendMask++)
         {
             AnimStateMap::const_iterator active = mStates.end();
 
             AnimStateMap::const_iterator state = mStates.begin();
-            for(;state != mStates.end();++state)
+            for (; state != mStates.end(); ++state)
             {
-                if(!(state->second.mBlendMask&(1<<blendMask)))
+                if (!(state->second.mBlendMask & (1 << blendMask)))
                     continue;
 
-                if(active == mStates.end() || active->second.mPriority[(BoneGroup)blendMask] < state->second.mPriority[(BoneGroup)blendMask])
+                if (active == mStates.end()
+                    || active->second.mPriority[(BoneGroup)blendMask] < state->second.mPriority[(BoneGroup)blendMask])
                     active = state;
             }
 
-            mAnimationTimePtr[blendMask]->setTimePtr(active == mStates.end() ? std::shared_ptr<float>() : active->second.mTime);
+            mAnimationTimePtr[blendMask]->setTimePtr(
+                active == mStates.end() ? std::shared_ptr<float>() : active->second.mTime);
 
             // add external controllers for the AnimSource active in this blend mask
             if (active != mStates.end())
             {
                 std::shared_ptr<AnimSource> animsrc = active->second.mSource;
 
-                for (AnimSource::ControllerMap::iterator it = animsrc->mControllerMap[blendMask].begin(); it != animsrc->mControllerMap[blendMask].end(); ++it)
+                for (AnimSource::ControllerMap::iterator it = animsrc->mControllerMap[blendMask].begin();
+                     it != animsrc->mControllerMap[blendMask].end(); ++it)
                 {
-                    osg::ref_ptr<osg::Node> node = getNodeMap().at(it->first); // this should not throw, we already checked for the node existing in addAnimSource
+                    osg::ref_ptr<osg::Node> node = getNodeMap().at(
+                        it->first); // this should not throw, we already checked for the node existing in addAnimSource
 
                     osg::Callback* callback = it->second->getAsCallback();
                     node->addUpdateCallback(callback);
@@ -1019,47 +1003,50 @@ namespace MWRender
         addControllers();
     }
 
-    void Animation::adjustSpeedMult(const std::string &groupname, float speedmult)
+    void Animation::adjustSpeedMult(const std::string& groupname, float speedmult)
     {
         AnimStateMap::iterator state(mStates.find(groupname));
-        if(state != mStates.end())
+        if (state != mStates.end())
             state->second.mSpeedMult = speedmult;
     }
 
     bool Animation::isPlaying(std::string_view groupname) const
     {
         AnimStateMap::const_iterator state(mStates.find(groupname));
-        if(state != mStates.end())
+        if (state != mStates.end())
             return state->second.mPlaying;
         return false;
     }
 
-    bool Animation::getInfo(std::string_view groupname, float *complete, float *speedmult) const
+    bool Animation::getInfo(std::string_view groupname, float* complete, float* speedmult) const
     {
         AnimStateMap::const_iterator iter = mStates.find(groupname);
-        if(iter == mStates.end())
+        if (iter == mStates.end())
         {
-            if(complete) *complete = 0.0f;
-            if(speedmult) *speedmult = 0.0f;
+            if (complete)
+                *complete = 0.0f;
+            if (speedmult)
+                *speedmult = 0.0f;
             return false;
         }
 
-        if(complete)
+        if (complete)
         {
-            if(iter->second.mStopTime > iter->second.mStartTime)
-                *complete = (iter->second.getTime() - iter->second.mStartTime) /
-                            (iter->second.mStopTime - iter->second.mStartTime);
+            if (iter->second.mStopTime > iter->second.mStartTime)
+                *complete = (iter->second.getTime() - iter->second.mStartTime)
+                    / (iter->second.mStopTime - iter->second.mStartTime);
             else
                 *complete = (iter->second.mPlaying ? 0.0f : 1.0f);
         }
-        if(speedmult) *speedmult = iter->second.mSpeedMult;
+        if (speedmult)
+            *speedmult = iter->second.mSpeedMult;
         return true;
     }
 
-    float Animation::getCurrentTime(const std::string &groupname) const
+    float Animation::getCurrentTime(const std::string& groupname) const
     {
         AnimStateMap::const_iterator iter = mStates.find(groupname);
-        if(iter == mStates.end())
+        if (iter == mStates.end())
             return -1.f;
 
         return iter->second.getTime();
@@ -1068,7 +1055,7 @@ namespace MWRender
     size_t Animation::getCurrentLoopCount(const std::string& groupname) const
     {
         AnimStateMap::const_iterator iter = mStates.find(groupname);
-        if(iter == mStates.end())
+        if (iter == mStates.end())
             return 0;
 
         return iter->second.mLoopCount;
@@ -1077,7 +1064,7 @@ namespace MWRender
     void Animation::disable(std::string_view groupname)
     {
         AnimStateMap::iterator iter = mStates.find(groupname);
-        if(iter != mStates.end())
+        if (iter != mStates.end())
             mStates.erase(iter);
         resetActiveGroups();
     }
@@ -1093,17 +1080,17 @@ namespace MWRender
 
         // Look in reverse; last-inserted source has priority.
         AnimSourceList::const_reverse_iterator animsrc(mAnimSources.rbegin());
-        for(;animsrc != mAnimSources.rend();++animsrc)
+        for (; animsrc != mAnimSources.rend(); ++animsrc)
         {
-            const SceneUtil::TextKeyMap &keys = (*animsrc)->getTextKeys();
+            const SceneUtil::TextKeyMap& keys = (*animsrc)->getTextKeys();
             if (keys.hasGroupStart(groupname))
                 break;
         }
-        if(animsrc == mAnimSources.rend())
+        if (animsrc == mAnimSources.rend())
             return 0.0f;
 
         float velocity = 0.0f;
-        const SceneUtil::TextKeyMap &keys = (*animsrc)->getTextKeys();
+        const SceneUtil::TextKeyMap& keys = (*animsrc)->getTextKeys();
 
         const AnimSource::ControllerMap& ctrls = (*animsrc)->mControllerMap[0];
         for (AnimSource::ControllerMap::const_iterator it = ctrls.begin(); it != ctrls.end(); ++it)
@@ -1116,15 +1103,15 @@ namespace MWRender
         }
 
         // If there's no velocity, keep looking
-        if(!(velocity > 1.0f))
+        if (!(velocity > 1.0f))
         {
             AnimSourceList::const_reverse_iterator animiter = mAnimSources.rbegin();
-            while(*animiter != *animsrc)
+            while (*animiter != *animsrc)
                 ++animiter;
 
-            while(!(velocity > 1.0f) && ++animiter != mAnimSources.rend())
+            while (!(velocity > 1.0f) && ++animiter != mAnimSources.rend())
             {
-                const SceneUtil::TextKeyMap &keys2 = (*animiter)->getTextKeys();
+                const SceneUtil::TextKeyMap& keys2 = (*animiter)->getTextKeys();
 
                 const AnimSource::ControllerMap& ctrls2 = (*animiter)->mControllerMap[0];
                 for (AnimSource::ControllerMap::const_iterator it = ctrls2.begin(); it != ctrls2.end(); ++it)
@@ -1156,7 +1143,8 @@ namespace MWRender
         bool hasScriptedAnims = false;
         for (AnimStateMap::iterator stateiter = mStates.begin(); stateiter != mStates.end(); stateiter++)
         {
-            if (stateiter->second.mPriority.contains(int(MWMechanics::Priority_Persistent)) && stateiter->second.mPlaying)
+            if (stateiter->second.mPriority.contains(int(MWMechanics::Priority_Persistent))
+                && stateiter->second.mPlaying)
             {
                 hasScriptedAnims = true;
                 break;
@@ -1165,33 +1153,33 @@ namespace MWRender
 
         osg::Vec3f movement(0.f, 0.f, 0.f);
         AnimStateMap::iterator stateiter = mStates.begin();
-        while(stateiter != mStates.end())
+        while (stateiter != mStates.end())
         {
-            AnimState &state = stateiter->second;
+            AnimState& state = stateiter->second;
             if (hasScriptedAnims && !state.mPriority.contains(int(MWMechanics::Priority_Persistent)))
             {
                 ++stateiter;
                 continue;
             }
 
-            const SceneUtil::TextKeyMap &textkeys = state.mSource->getTextKeys();
+            const SceneUtil::TextKeyMap& textkeys = state.mSource->getTextKeys();
             auto textkey = textkeys.upperBound(state.getTime());
 
             float timepassed = duration * state.mSpeedMult;
-            while(state.mPlaying)
+            while (state.mPlaying)
             {
                 if (!state.shouldLoop())
                 {
                     float targetTime = state.getTime() + timepassed;
-                    if(textkey == textkeys.end() || textkey->first > targetTime)
+                    if (textkey == textkeys.end() || textkey->first > targetTime)
                     {
-                        if(mAccumCtrl && state.mTime == mAnimationTimePtr[0]->getTimePtr())
+                        if (mAccumCtrl && state.mTime == mAnimationTimePtr[0]->getTimePtr())
                             updatePosition(state.getTime(), targetTime, movement);
                         state.setTime(std::min(targetTime, state.mStopTime));
                     }
                     else
                     {
-                        if(mAccumCtrl && state.mTime == mAnimationTimePtr[0]->getTimePtr())
+                        if (mAccumCtrl && state.mTime == mAnimationTimePtr[0]->getTimePtr())
                             updatePosition(state.getTime(), textkey->first, movement);
                         state.setTime(textkey->first);
                     }
@@ -1199,34 +1187,34 @@ namespace MWRender
                     state.mPlaying = (state.getTime() < state.mStopTime);
                     timepassed = targetTime - state.getTime();
 
-                    while(textkey != textkeys.end() && textkey->first <= state.getTime())
+                    while (textkey != textkeys.end() && textkey->first <= state.getTime())
                     {
                         handleTextKey(state, stateiter->first, textkey, textkeys);
                         ++textkey;
                     }
                 }
-                if(state.shouldLoop())
+                if (state.shouldLoop())
                 {
                     state.mLoopCount--;
                     state.setTime(state.mLoopStartTime);
                     state.mPlaying = true;
 
                     textkey = textkeys.lowerBound(state.getTime());
-                    while(textkey != textkeys.end() && textkey->first <= state.getTime())
+                    while (textkey != textkeys.end() && textkey->first <= state.getTime())
                     {
                         handleTextKey(state, stateiter->first, textkey, textkeys);
                         ++textkey;
                     }
 
-                    if(state.getTime() >= state.mLoopStopTime)
+                    if (state.getTime() >= state.mLoopStopTime)
                         break;
                 }
 
-                if(timepassed <= 0.0f)
+                if (timepassed <= 0.0f)
                     break;
             }
 
-            if(!state.mPlaying && state.mAutoDisable)
+            if (!state.mPlaying && state.mAutoDisable)
             {
                 mStates.erase(stateiter++);
 
@@ -1246,7 +1234,8 @@ namespace MWRender
             mRootController->setEnabled(enable);
             if (enable)
             {
-                mRootController->setRotate(osg::Quat(mLegsYawRadians, osg::Vec3f(0,0,1)) * osg::Quat(mBodyPitchRadians, osg::Vec3f(1,0,0)));
+                mRootController->setRotate(osg::Quat(mLegsYawRadians, osg::Vec3f(0, 0, 1))
+                    * osg::Quat(mBodyPitchRadians, osg::Vec3f(1, 0, 0)));
                 yawOffset = mLegsYawRadians;
             }
         }
@@ -1257,7 +1246,7 @@ namespace MWRender
             mSpineController->setEnabled(enable);
             if (enable)
             {
-                mSpineController->setRotate(osg::Quat(yaw, osg::Vec3f(0,0,1)));
+                mSpineController->setRotate(osg::Quat(yaw, osg::Vec3f(0, 0, 1)));
                 yawOffset = mUpperBodyYawRadians;
             }
         }
@@ -1267,7 +1256,8 @@ namespace MWRender
             bool enable = (std::abs(mHeadPitchRadians) > epsilon || std::abs(yaw) > epsilon);
             mHeadController->setEnabled(enable);
             if (enable)
-                mHeadController->setRotate(osg::Quat(mHeadPitchRadians, osg::Vec3f(1,0,0)) * osg::Quat(yaw, osg::Vec3f(0,0,1)));
+                mHeadController->setRotate(
+                    osg::Quat(mHeadPitchRadians, osg::Vec3f(1, 0, 0)) * osg::Quat(yaw, osg::Vec3f(0, 0, 1)));
         }
 
         // Scripted animations should not cause movement
@@ -1280,20 +1270,22 @@ namespace MWRender
     void Animation::setLoopingEnabled(std::string_view groupname, bool enabled)
     {
         AnimStateMap::iterator state(mStates.find(groupname));
-        if(state != mStates.end())
+        if (state != mStates.end())
             state->second.mLoopingEnabled = enabled;
     }
 
-    void loadBonesFromFile(osg::ref_ptr<osg::Node>& baseNode, const std::string &model, Resource::ResourceSystem* resourceSystem)
+    void loadBonesFromFile(
+        osg::ref_ptr<osg::Node>& baseNode, const std::string& model, Resource::ResourceSystem* resourceSystem)
     {
         const osg::Node* node = resourceSystem->getSceneManager()->getTemplate(model).get();
-        osg::ref_ptr<osg::Node> sheathSkeleton (const_cast<osg::Node*>(node)); // const-trickery required because there is no const version of NodeVisitor
+        osg::ref_ptr<osg::Node> sheathSkeleton(
+            const_cast<osg::Node*>(node)); // const-trickery required because there is no const version of NodeVisitor
 
         GetExtendedBonesVisitor getBonesVisitor;
         sheathSkeleton->accept(getBonesVisitor);
         for (auto& nodePair : getBonesVisitor.mFoundBones)
         {
-            SceneUtil::FindByNameVisitor findVisitor (nodePair.second->getName());
+            SceneUtil::FindByNameVisitor findVisitor(nodePair.second->getName());
             baseNode->accept(findVisitor);
 
             osg::Group* sheathParent = findVisitor.mFoundNode;
@@ -1305,7 +1297,8 @@ namespace MWRender
         }
     }
 
-    void injectCustomBones(osg::ref_ptr<osg::Node>& node, const std::string& model, Resource::ResourceSystem* resourceSystem)
+    void injectCustomBones(
+        osg::ref_ptr<osg::Node>& node, const std::string& model, Resource::ResourceSystem* resourceSystem)
     {
         if (model.empty())
             return;
@@ -1315,7 +1308,7 @@ namespace MWRender
         {
             animationPath.replace(0, 6, "animations");
         }
-        animationPath.replace(animationPath.size()-4, 4, "/");
+        animationPath.replace(animationPath.size() - 4, 4, "/");
 
         for (const auto& name : resourceSystem->getVFS()->getRecursiveDirectoryIterator(animationPath))
         {
@@ -1324,12 +1317,13 @@ namespace MWRender
         }
     }
 
-    osg::ref_ptr<osg::Node> getModelInstance(Resource::ResourceSystem* resourceSystem, const std::string& model, bool baseonly, bool inject, const std::string& defaultSkeleton)
+    osg::ref_ptr<osg::Node> getModelInstance(Resource::ResourceSystem* resourceSystem, const std::string& model,
+        bool baseonly, bool inject, const std::string& defaultSkeleton)
     {
         Resource::SceneManager* sceneMgr = resourceSystem->getSceneManager();
         if (baseonly)
         {
-            typedef std::map<std::string, osg::ref_ptr<osg::Node> > Cache;
+            typedef std::map<std::string, osg::ref_ptr<osg::Node>> Cache;
             static Cache cache;
             Cache::iterator found = cache.find(model);
             if (found == cache.end())
@@ -1367,7 +1361,7 @@ namespace MWRender
         }
     }
 
-    void Animation::setObjectRoot(const std::string &model, bool forceskeleton, bool baseonly, bool isCreature)
+    void Animation::setObjectRoot(const std::string& model, bool forceskeleton, bool baseonly, bool isCreature)
     {
         osg::ref_ptr<osg::StateSet> previousStateset;
         if (mObjectRoot)
@@ -1388,7 +1382,7 @@ namespace MWRender
         mAccumRoot = nullptr;
         mAccumCtrl = nullptr;
 
-        static const bool useAdditionalSources = Settings::Manager::getBool ("use additional anim sources", "Game");
+        static const bool useAdditionalSources = Settings::Manager::getBool("use additional anim sources", "Game");
         std::string defaultSkeleton;
         bool inject = false;
 
@@ -1396,8 +1390,8 @@ namespace MWRender
         {
             if (isCreature)
             {
-                MWWorld::LiveCellRef<ESM::Creature> *ref = mPtr.get<ESM::Creature>();
-                if(ref->mBase->mFlags & ESM::Creature::Bipedal)
+                MWWorld::LiveCellRef<ESM::Creature>* ref = mPtr.get<ESM::Creature>();
+                if (ref->mBase->mFlags & ESM::Creature::Bipedal)
                 {
                     defaultSkeleton = Settings::Manager::getString("xbaseanim", "Models");
                     inject = true;
@@ -1406,27 +1400,30 @@ namespace MWRender
             else
             {
                 inject = true;
-                MWWorld::LiveCellRef<ESM::NPC> *ref = mPtr.get<ESM::NPC>();
+                MWWorld::LiveCellRef<ESM::NPC>* ref = mPtr.get<ESM::NPC>();
                 if (!ref->mBase->mModel.empty())
                 {
-                    // If NPC has a custom animation model attached, we should inject bones from default skeleton for given race and gender as well
-                    // Since it is a quite rare case, there should not be a noticable performance loss
-                    // Note: consider that player and werewolves have no custom animation files attached for now
-                    const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-                    const ESM::Race *race = store.get<ESM::Race>().find(ref->mBase->mRace);
+                    // If NPC has a custom animation model attached, we should inject bones from default skeleton for
+                    // given race and gender as well Since it is a quite rare case, there should not be a noticable
+                    // performance loss Note: consider that player and werewolves have no custom animation files
+                    // attached for now
+                    const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+                    const ESM::Race* race = store.get<ESM::Race>().find(ref->mBase->mRace);
 
                     bool isBeast = (race->mData.mFlags & ESM::Race::Beast) != 0;
                     bool isFemale = !ref->mBase->isMale();
 
                     defaultSkeleton = SceneUtil::getActorSkeleton(false, isFemale, isBeast, false);
-                    defaultSkeleton = Misc::ResourceHelpers::correctActorModelPath(defaultSkeleton, mResourceSystem->getVFS());
+                    defaultSkeleton
+                        = Misc::ResourceHelpers::correctActorModelPath(defaultSkeleton, mResourceSystem->getVFS());
                 }
             }
         }
 
         if (!forceskeleton)
         {
-            osg::ref_ptr<osg::Node> created = getModelInstance(mResourceSystem, model, baseonly, inject, defaultSkeleton);
+            osg::ref_ptr<osg::Node> created
+                = getModelInstance(mResourceSystem, model, baseonly, inject, defaultSkeleton);
             mInsert->addChild(created);
             mObjectRoot = created->asGroup();
             if (!mObjectRoot)
@@ -1442,7 +1439,8 @@ namespace MWRender
         }
         else
         {
-            osg::ref_ptr<osg::Node> created = getModelInstance(mResourceSystem, model, baseonly, inject, defaultSkeleton);
+            osg::ref_ptr<osg::Node> created
+                = getModelInstance(mResourceSystem, model, baseonly, inject, defaultSkeleton);
             osg::ref_ptr<SceneUtil::Skeleton> skel = dynamic_cast<SceneUtil::Skeleton*>(created.get());
             if (!skel)
             {
@@ -1486,9 +1484,9 @@ namespace MWRender
         return mObjectRoot.get();
     }
 
-    void Animation::addSpellCastGlow(const ESM::MagicEffect *effect, float glowDuration)
+    void Animation::addSpellCastGlow(const ESM::MagicEffect* effect, float glowDuration)
     {
-        osg::Vec4f glowColor(1,1,1,1);
+        osg::Vec4f glowColor(1, 1, 1, 1);
         glowColor.x() = effect->mData.mRed / 255.f;
         glowColor.y() = effect->mData.mGreen / 255.f;
         glowColor.z() = effect->mData.mBlue / 255.f;
@@ -1508,7 +1506,7 @@ namespace MWRender
         }
     }
 
-    void Animation::addExtraLight(osg::ref_ptr<osg::Group> parent, const ESM::Light *esmLight)
+    void Animation::addExtraLight(osg::ref_ptr<osg::Group> parent, const ESM::Light* esmLight)
     {
         bool exterior = mPtr.isInCell() && mPtr.getCell()->getCell()->isExterior();
 
@@ -1516,7 +1514,8 @@ namespace MWRender
         mExtraLightSource->setActorFade(mAlpha);
     }
 
-    void Animation::addEffect(const std::string& model, int effectId, bool loop, std::string_view bonename, std::string_view texture)
+    void Animation::addEffect(
+        const std::string& model, int effectId, bool loop, std::string_view bonename, std::string_view texture)
     {
         if (!mObjectRoot.get())
             return;
@@ -1525,7 +1524,8 @@ namespace MWRender
         FindVfxCallbacksVisitor visitor(effectId);
         mInsert->accept(visitor);
 
-        for (std::vector<UpdateVfxCallback*>::iterator it = visitor.mCallbacks.begin(); it != visitor.mCallbacks.end(); ++it)
+        for (std::vector<UpdateVfxCallback*>::iterator it = visitor.mCallbacks.begin(); it != visitor.mCallbacks.end();
+             ++it)
         {
             UpdateVfxCallback* callback = *it;
 
@@ -1542,7 +1542,7 @@ namespace MWRender
         {
             NodeMap::const_iterator found = getNodeMap().find(bonename);
             if (found == getNodeMap().end())
-                throw std::runtime_error("Can't find bone " + std::string{bonename});
+                throw std::runtime_error("Can't find bone " + std::string{ bonename });
 
             parentNode = found->second;
         }
@@ -1550,8 +1550,8 @@ namespace MWRender
         osg::ref_ptr<SceneUtil::PositionAttitudeTransform> trans = new SceneUtil::PositionAttitudeTransform;
         if (!mPtr.getClass().isNpc())
         {
-            osg::Vec3f bounds (MWBase::Environment::get().getWorld()->getHalfExtents(mPtr) * 2.f);
-            float scale = std::max({bounds.x(), bounds.y(), bounds.z() / 2.f}) / 64.f;
+            osg::Vec3f bounds(MWBase::Environment::get().getWorld()->getHalfExtents(mPtr) * 2.f);
+            float scale = std::max({ bounds.x(), bounds.y(), bounds.z() / 2.f }) / 64.f;
             if (scale > 1.f)
                 trans->setScale(osg::Vec3f(scale, scale, scale));
             float offset = 0.f;
@@ -1568,7 +1568,8 @@ namespace MWRender
         osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->getInstance(model, trans);
 
         // Morrowind has a white ambient light attached to the root VFX node of the scenegraph
-        node->getOrCreateStateSet()->setAttributeAndModes(getVFXLightModelInstance(), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+        node->getOrCreateStateSet()->setAttributeAndModes(
+            getVFXLightModelInstance(), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
         if (mResourceSystem->getSceneManager()->getSupportsNormalsRT())
             node->getOrCreateStateSet()->setAttribute(new osg::ColorMaski(1, false, false, false, false));
         SceneUtil::FindMaxControllerLengthVisitor findMaxLengthVisitor;
@@ -1586,7 +1587,8 @@ namespace MWRender
         params.mAnimTime = std::make_shared<EffectAnimationTime>();
         trans->addUpdateCallback(new UpdateVfxCallback(params));
 
-        SceneUtil::AssignControllerSourcesVisitor assignVisitor(std::shared_ptr<SceneUtil::ControllerSource>(params.mAnimTime));
+        SceneUtil::AssignControllerSourcesVisitor assignVisitor(
+            std::shared_ptr<SceneUtil::ControllerSource>(params.mAnimTime));
         node->accept(assignVisitor);
 
         // Notify that this animation has attached magic effects
@@ -1608,7 +1610,7 @@ namespace MWRender
         removeEffect(-1);
     }
 
-    void Animation::getLoopingEffects(std::vector<int> &out) const
+    void Animation::getLoopingEffects(std::vector<int>& out) const
     {
         if (!mHasMagicEffects)
             return;
@@ -1616,7 +1618,8 @@ namespace MWRender
         FindVfxCallbacksVisitor visitor;
         mInsert->accept(visitor);
 
-        for (std::vector<UpdateVfxCallback*>::iterator it = visitor.mCallbacks.begin(); it != visitor.mCallbacks.end(); ++it)
+        for (std::vector<UpdateVfxCallback*>::iterator it = visitor.mCallbacks.begin(); it != visitor.mCallbacks.end();
+             ++it)
         {
             UpdateVfxCallback* callback = *it;
 
@@ -1645,9 +1648,9 @@ namespace MWRender
         for (AnimStateMap::const_iterator stateiter = mStates.begin(); stateiter != mStates.end(); ++stateiter)
         {
             if (stateiter->second.mPriority.contains(int(MWMechanics::Priority_Hit))
-                    || stateiter->second.mPriority.contains(int(MWMechanics::Priority_Weapon))
-                    || stateiter->second.mPriority.contains(int(MWMechanics::Priority_Knockdown))
-                    || stateiter->second.mPriority.contains(int(MWMechanics::Priority_Death)))
+                || stateiter->second.mPriority.contains(int(MWMechanics::Priority_Weapon))
+                || stateiter->second.mPriority.contains(int(MWMechanics::Priority_Knockdown))
+                || stateiter->second.mPriority.contains(int(MWMechanics::Priority_Death)))
                 return false;
         }
         return true;
@@ -1713,10 +1716,10 @@ namespace MWRender
                     mGlowLight = nullptr;
                 }
 
-                osg::ref_ptr<osg::Light> light (new osg::Light);
-                light->setDiffuse(osg::Vec4f(0,0,0,0));
-                light->setSpecular(osg::Vec4f(0,0,0,0));
-                light->setAmbient(osg::Vec4f(1.5f,1.5f,1.5f,1.f));
+                osg::ref_ptr<osg::Light> light(new osg::Light);
+                light->setDiffuse(osg::Vec4f(0, 0, 0, 0));
+                light->setSpecular(osg::Vec4f(0, 0, 0, 0));
+                light->setAmbient(osg::Vec4f(1.5f, 1.5f, 1.5f, 1.f));
 
                 bool isExterior = mPtr.isInCell() && mPtr.getCell()->getCell()->isExterior();
                 SceneUtil::configureLight(light, radius, isExterior);
@@ -1827,7 +1830,8 @@ namespace MWRender
 
     // --------------------------------------------------------------------------------
 
-    ObjectAnimation::ObjectAnimation(const MWWorld::Ptr &ptr, const std::string &model, Resource::ResourceSystem* resourceSystem, bool animated, bool allowLight)
+    ObjectAnimation::ObjectAnimation(const MWWorld::Ptr& ptr, const std::string& model,
+        Resource::ResourceSystem* resourceSystem, bool animated, bool allowLight)
         : Animation(ptr, osg::ref_ptr<osg::Group>(ptr.getRefData().getBaseNode()), resourceSystem)
     {
         if (!model.empty())
@@ -1837,7 +1841,8 @@ namespace MWRender
                 addAnimSource(model, model);
 
             if (!ptr.getClass().getEnchantment(ptr).empty())
-                mGlowUpdater = SceneUtil::addEnchantedGlow(mObjectRoot, mResourceSystem, ptr.getClass().getEnchantmentColor(ptr));
+                mGlowUpdater = SceneUtil::addEnchantedGlow(
+                    mObjectRoot, mResourceSystem, ptr.getClass().getEnchantmentColor(ptr));
         }
         if (ptr.getType() == ESM::Light::sRecordId && allowLight)
             addExtraLight(getOrCreateObjectRoot(), ptr.get<ESM::Light>()->mBase);
@@ -1849,7 +1854,8 @@ namespace MWRender
             visitor.remove();
         }
 
-        if (Settings::Manager::getBool("day night switches", "Game") && SceneUtil::hasUserDescription(mObjectRoot, Constants::NightDayLabel))
+        if (Settings::Manager::getBool("day night switches", "Game")
+            && SceneUtil::hasUserDescription(mObjectRoot, Constants::NightDayLabel))
         {
             AddSwitchCallbacksVisitor visitor;
             mObjectRoot->accept(visitor);
@@ -1888,12 +1894,13 @@ namespace MWRender
     PartHolder::~PartHolder()
     {
         if (mNode.get() && !mNode->getNumParents())
-            Log(Debug::Verbose) << "Part \"" << mNode->getName() << "\" has no parents" ;
+            Log(Debug::Verbose) << "Part \"" << mNode->getName() << "\" has no parents";
 
         if (mNode.get() && mNode->getNumParents())
         {
             if (mNode->getNumParents() > 1)
-                Log(Debug::Verbose) << "Part \"" << mNode->getName() << "\" has multiple (" << mNode->getNumParents() << ") parents";
+                Log(Debug::Verbose) << "Part \"" << mNode->getName() << "\" has multiple (" << mNode->getNumParents()
+                                    << ") parents";
             mNode->getParent(0)->removeChild(mNode);
         }
     }
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 55f15e3a69..b9a8501bdc 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -3,14 +3,14 @@
 
 #include "../mwworld/ptr.hpp"
 
+#include <components/misc/strings/algorithm.hpp>
 #include <components/sceneutil/controller.hpp>
+#include <components/sceneutil/nodecallback.hpp>
 #include <components/sceneutil/textkeymap.hpp>
 #include <components/sceneutil/util.hpp>
-#include <components/sceneutil/nodecallback.hpp>
-#include <components/misc/strings/algorithm.hpp>
 
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
 namespace ESM
 {
@@ -35,501 +35,505 @@ namespace SceneUtil
 namespace MWRender
 {
 
-class ResetAccumRootCallback;
-class RotateController;
-class TransparencyUpdater;
-
-class EffectAnimationTime : public SceneUtil::ControllerSource
-{
-private:
-    float mTime;
-public:
-    float getValue(osg::NodeVisitor* nv) override;
-
-    void addTime(float duration);
-    void resetTime(float time);
-    float getTime() const;
-
-    EffectAnimationTime() : mTime(0) {  }
-};
-
-/// @brief Detaches the node from its parent when the object goes out of scope.
-class PartHolder
-{
-public:
-    PartHolder(osg::ref_ptr<osg::Node> node);
-
-    ~PartHolder();
+    class ResetAccumRootCallback;
+    class RotateController;
+    class TransparencyUpdater;
 
-    const osg::ref_ptr<osg::Node>& getNode() const
+    class EffectAnimationTime : public SceneUtil::ControllerSource
     {
-        return mNode;
-    }
-
-private:
-    osg::ref_ptr<osg::Node> mNode;
-
-    void operator= (const PartHolder&);
-    PartHolder(const PartHolder&);
-};
-using PartHolderPtr = std::unique_ptr<PartHolder>;
-
-struct EffectParams
-{
-    std::string mModelName; // Just here so we don't add the same effect twice
-    std::shared_ptr<EffectAnimationTime> mAnimTime;
-    float mMaxControllerLength;
-    int mEffectId;
-    bool mLoop;
-    std::string mBoneName;
-};
-
-class Animation : public osg::Referenced
-{
-public:
-    enum BoneGroup {
-        BoneGroup_LowerBody = 0,
-        BoneGroup_Torso,
-        BoneGroup_LeftArm,
-        BoneGroup_RightArm
-    };
-
-    enum BlendMask {
-        BlendMask_LowerBody = 1<<0,
-        BlendMask_Torso = 1<<1,
-        BlendMask_LeftArm = 1<<2,
-        BlendMask_RightArm = 1<<3,
-
-        BlendMask_UpperBody = BlendMask_Torso | BlendMask_LeftArm | BlendMask_RightArm,
-
-        BlendMask_All = BlendMask_LowerBody | BlendMask_UpperBody
-    };
-    /* This is the number of *discrete* blend masks. */
-    static constexpr size_t sNumBlendMasks = 4;
-
-    /// Holds an animation priority value for each BoneGroup.
-    struct AnimPriority
-    {
-        /// Convenience constructor, initialises all priorities to the same value.
-        AnimPriority(int priority)
-        {
-            for (unsigned int i=0; i<sNumBlendMasks; ++i)
-                mPriority[i] = priority;
-        }
-
-        bool operator == (const AnimPriority& other) const
-        {
-            for (unsigned int i=0; i<sNumBlendMasks; ++i)
-                if (other.mPriority[i] != mPriority[i])
-                    return false;
-            return true;
-        }
+    private:
+        float mTime;
 
-        int& operator[] (BoneGroup n)
-        {
-            return mPriority[n];
-        }
+    public:
+        float getValue(osg::NodeVisitor* nv) override;
 
-        const int& operator[] (BoneGroup n) const
-        {
-            return mPriority[n];
-        }
+        void addTime(float duration);
+        void resetTime(float time);
+        float getTime() const;
 
-        bool contains(int priority) const
+        EffectAnimationTime()
+            : mTime(0)
         {
-            for (unsigned int i=0; i<sNumBlendMasks; ++i)
-                if (priority == mPriority[i])
-                    return true;
-            return false;
         }
-
-        int mPriority[sNumBlendMasks];
     };
 
-    class TextKeyListener
+    /// @brief Detaches the node from its parent when the object goes out of scope.
+    class PartHolder
     {
     public:
-        virtual void handleTextKey(std::string_view groupname, SceneUtil::TextKeyMap::ConstIterator key,
-                                   const SceneUtil::TextKeyMap& map) = 0;
+        PartHolder(osg::ref_ptr<osg::Node> node);
 
-        virtual ~TextKeyListener() = default;
-    };
+        ~PartHolder();
 
-    void setTextKeyListener(TextKeyListener* listener);
+        const osg::ref_ptr<osg::Node>& getNode() const { return mNode; }
 
-    virtual bool updateCarriedLeftVisible(const int weaptype) const { return false; };
-
-    typedef std::unordered_map<std::string, osg::ref_ptr<osg::MatrixTransform>, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual> NodeMap;
-
-protected:
-    class AnimationTime : public SceneUtil::ControllerSource
-    {
     private:
-        std::shared_ptr<float> mTimePtr;
-
-    public:
+        osg::ref_ptr<osg::Node> mNode;
 
-        void setTimePtr(std::shared_ptr<float> time)
-        { mTimePtr = time; }
-        std::shared_ptr<float> getTimePtr() const
-        { return mTimePtr; }
+        void operator=(const PartHolder&);
+        PartHolder(const PartHolder&);
+    };
+    using PartHolderPtr = std::unique_ptr<PartHolder>;
 
-        float getValue(osg::NodeVisitor* nv) override;
+    struct EffectParams
+    {
+        std::string mModelName; // Just here so we don't add the same effect twice
+        std::shared_ptr<EffectAnimationTime> mAnimTime;
+        float mMaxControllerLength;
+        int mEffectId;
+        bool mLoop;
+        std::string mBoneName;
     };
 
-    class NullAnimationTime : public SceneUtil::ControllerSource
+    class Animation : public osg::Referenced
     {
     public:
-        float getValue(osg::NodeVisitor *nv) override
+        enum BoneGroup
         {
-            return 0.f;
-        }
-    };
+            BoneGroup_LowerBody = 0,
+            BoneGroup_Torso,
+            BoneGroup_LeftArm,
+            BoneGroup_RightArm
+        };
 
-    struct AnimSource;
+        enum BlendMask
+        {
+            BlendMask_LowerBody = 1 << 0,
+            BlendMask_Torso = 1 << 1,
+            BlendMask_LeftArm = 1 << 2,
+            BlendMask_RightArm = 1 << 3,
 
-    struct AnimState {
-        std::shared_ptr<AnimSource> mSource;
-        float mStartTime;
-        float mLoopStartTime;
-        float mLoopStopTime;
-        float mStopTime;
+            BlendMask_UpperBody = BlendMask_Torso | BlendMask_LeftArm | BlendMask_RightArm,
 
-        typedef std::shared_ptr<float> TimePtr;
-        TimePtr mTime;
-        float mSpeedMult;
+            BlendMask_All = BlendMask_LowerBody | BlendMask_UpperBody
+        };
+        /* This is the number of *discrete* blend masks. */
+        static constexpr size_t sNumBlendMasks = 4;
 
-        bool mPlaying;
-        bool mLoopingEnabled;
-        size_t mLoopCount;
+        /// Holds an animation priority value for each BoneGroup.
+        struct AnimPriority
+        {
+            /// Convenience constructor, initialises all priorities to the same value.
+            AnimPriority(int priority)
+            {
+                for (unsigned int i = 0; i < sNumBlendMasks; ++i)
+                    mPriority[i] = priority;
+            }
+
+            bool operator==(const AnimPriority& other) const
+            {
+                for (unsigned int i = 0; i < sNumBlendMasks; ++i)
+                    if (other.mPriority[i] != mPriority[i])
+                        return false;
+                return true;
+            }
+
+            int& operator[](BoneGroup n) { return mPriority[n]; }
+
+            const int& operator[](BoneGroup n) const { return mPriority[n]; }
+
+            bool contains(int priority) const
+            {
+                for (unsigned int i = 0; i < sNumBlendMasks; ++i)
+                    if (priority == mPriority[i])
+                        return true;
+                return false;
+            }
+
+            int mPriority[sNumBlendMasks];
+        };
+
+        class TextKeyListener
+        {
+        public:
+            virtual void handleTextKey(
+                std::string_view groupname, SceneUtil::TextKeyMap::ConstIterator key, const SceneUtil::TextKeyMap& map)
+                = 0;
 
-        AnimPriority mPriority;
-        int mBlendMask;
-        bool mAutoDisable;
+            virtual ~TextKeyListener() = default;
+        };
 
-        AnimState() : mStartTime(0.0f), mLoopStartTime(0.0f), mLoopStopTime(0.0f), mStopTime(0.0f),
-                      mTime(new float), mSpeedMult(1.0f), mPlaying(false), mLoopingEnabled(true),
-                      mLoopCount(0), mPriority(0), mBlendMask(0), mAutoDisable(true)
-        {
-        }
-        ~AnimState() = default;
+        void setTextKeyListener(TextKeyListener* listener);
 
-        float getTime() const
-        {
-            return *mTime;
-        }
-        void setTime(float time)
-        {
-            *mTime = time;
-        }
+        virtual bool updateCarriedLeftVisible(const int weaptype) const { return false; };
 
-        bool shouldLoop() const
+        typedef std::unordered_map<std::string, osg::ref_ptr<osg::MatrixTransform>, Misc::StringUtils::CiHash,
+            Misc::StringUtils::CiEqual>
+            NodeMap;
+
+    protected:
+        class AnimationTime : public SceneUtil::ControllerSource
         {
-            return getTime() >= mLoopStopTime && mLoopingEnabled && mLoopCount > 0;
-        }
-    };
-    typedef std::map<std::string, AnimState, std::less<>> AnimStateMap;
-    AnimStateMap mStates;
+        private:
+            std::shared_ptr<float> mTimePtr;
 
-    typedef std::vector<std::shared_ptr<AnimSource> > AnimSourceList;
-    AnimSourceList mAnimSources;
+        public:
+            void setTimePtr(std::shared_ptr<float> time) { mTimePtr = time; }
+            std::shared_ptr<float> getTimePtr() const { return mTimePtr; }
 
-    osg::ref_ptr<osg::Group> mInsert;
+            float getValue(osg::NodeVisitor* nv) override;
+        };
 
-    osg::ref_ptr<osg::Group> mObjectRoot;
-    SceneUtil::Skeleton* mSkeleton;
+        class NullAnimationTime : public SceneUtil::ControllerSource
+        {
+        public:
+            float getValue(osg::NodeVisitor* nv) override { return 0.f; }
+        };
 
-    // The node expected to accumulate movement during movement animations.
-    osg::ref_ptr<osg::Node> mAccumRoot;
+        struct AnimSource;
 
-    // The controller animating that node.
-    osg::ref_ptr<SceneUtil::KeyframeController> mAccumCtrl;
+        struct AnimState
+        {
+            std::shared_ptr<AnimSource> mSource;
+            float mStartTime;
+            float mLoopStartTime;
+            float mLoopStopTime;
+            float mStopTime;
 
-    // Used to reset the position of the accumulation root every frame - the movement should be applied to the physics system
-    osg::ref_ptr<ResetAccumRootCallback> mResetAccumRootCallback;
+            typedef std::shared_ptr<float> TimePtr;
+            TimePtr mTime;
+            float mSpeedMult;
 
-    // Keep track of controllers that we added to our scene graph.
-    // We may need to rebuild these controllers when the active animation groups / sources change.
-    std::vector<std::pair<osg::ref_ptr<osg::Node>, osg::ref_ptr<osg::Callback>>> mActiveControllers;
+            bool mPlaying;
+            bool mLoopingEnabled;
+            size_t mLoopCount;
 
-    std::shared_ptr<AnimationTime> mAnimationTimePtr[sNumBlendMasks];
+            AnimPriority mPriority;
+            int mBlendMask;
+            bool mAutoDisable;
 
-    mutable NodeMap mNodeMap;
-    mutable bool mNodeMapCreated;
+            AnimState()
+                : mStartTime(0.0f)
+                , mLoopStartTime(0.0f)
+                , mLoopStopTime(0.0f)
+                , mStopTime(0.0f)
+                , mTime(new float)
+                , mSpeedMult(1.0f)
+                , mPlaying(false)
+                , mLoopingEnabled(true)
+                , mLoopCount(0)
+                , mPriority(0)
+                , mBlendMask(0)
+                , mAutoDisable(true)
+            {
+            }
+            ~AnimState() = default;
 
-    MWWorld::Ptr mPtr;
+            float getTime() const { return *mTime; }
+            void setTime(float time) { *mTime = time; }
 
-    Resource::ResourceSystem* mResourceSystem;
+            bool shouldLoop() const { return getTime() >= mLoopStopTime && mLoopingEnabled && mLoopCount > 0; }
+        };
+        typedef std::map<std::string, AnimState, std::less<>> AnimStateMap;
+        AnimStateMap mStates;
 
-    osg::Vec3f mAccumulate;
+        typedef std::vector<std::shared_ptr<AnimSource>> AnimSourceList;
+        AnimSourceList mAnimSources;
+
+        osg::ref_ptr<osg::Group> mInsert;
+
+        osg::ref_ptr<osg::Group> mObjectRoot;
+        SceneUtil::Skeleton* mSkeleton;
 
-    TextKeyListener* mTextKeyListener;
+        // The node expected to accumulate movement during movement animations.
+        osg::ref_ptr<osg::Node> mAccumRoot;
 
-    osg::ref_ptr<RotateController> mHeadController;
-    osg::ref_ptr<RotateController> mSpineController;
-    osg::ref_ptr<RotateController> mRootController;
-    float mHeadYawRadians;
-    float mHeadPitchRadians;
-    float mUpperBodyYawRadians;
-    float mLegsYawRadians;
-    float mBodyPitchRadians;
+        // The controller animating that node.
+        osg::ref_ptr<SceneUtil::KeyframeController> mAccumCtrl;
+
+        // Used to reset the position of the accumulation root every frame - the movement should be applied to the
+        // physics system
+        osg::ref_ptr<ResetAccumRootCallback> mResetAccumRootCallback;
+
+        // Keep track of controllers that we added to our scene graph.
+        // We may need to rebuild these controllers when the active animation groups / sources change.
+        std::vector<std::pair<osg::ref_ptr<osg::Node>, osg::ref_ptr<osg::Callback>>> mActiveControllers;
+
+        std::shared_ptr<AnimationTime> mAnimationTimePtr[sNumBlendMasks];
+
+        mutable NodeMap mNodeMap;
+        mutable bool mNodeMapCreated;
+
+        MWWorld::Ptr mPtr;
+
+        Resource::ResourceSystem* mResourceSystem;
+
+        osg::Vec3f mAccumulate;
+
+        TextKeyListener* mTextKeyListener;
+
+        osg::ref_ptr<RotateController> mHeadController;
+        osg::ref_ptr<RotateController> mSpineController;
+        osg::ref_ptr<RotateController> mRootController;
+        float mHeadYawRadians;
+        float mHeadPitchRadians;
+        float mUpperBodyYawRadians;
+        float mLegsYawRadians;
+        float mBodyPitchRadians;
+
+        osg::ref_ptr<RotateController> addRotateController(std::string_view bone);
+
+        bool mHasMagicEffects;
+
+        osg::ref_ptr<SceneUtil::LightSource> mGlowLight;
+        osg::ref_ptr<SceneUtil::GlowUpdater> mGlowUpdater;
+        osg::ref_ptr<TransparencyUpdater> mTransparencyUpdater;
+        osg::ref_ptr<SceneUtil::LightSource> mExtraLightSource;
+
+        float mAlpha;
+
+        mutable std::map<std::string, float, std::less<>> mAnimVelocities;
+
+        osg::ref_ptr<SceneUtil::LightListCallback> mLightListCallback;
 
-    osg::ref_ptr<RotateController> addRotateController(std::string_view bone);
+        const NodeMap& getNodeMap() const;
 
-    bool mHasMagicEffects;
+        /* Sets the appropriate animations on the bone groups based on priority.
+         */
+        void resetActiveGroups();
 
-    osg::ref_ptr<SceneUtil::LightSource> mGlowLight;
-    osg::ref_ptr<SceneUtil::GlowUpdater> mGlowUpdater;
-    osg::ref_ptr<TransparencyUpdater> mTransparencyUpdater;
-    osg::ref_ptr<SceneUtil::LightSource> mExtraLightSource;
+        size_t detectBlendMask(const osg::Node* node) const;
 
-    float mAlpha;
+        /* Updates the position of the accum root node for the given time, and
+         * returns the wanted movement vector from the previous time. */
+        void updatePosition(float oldtime, float newtime, osg::Vec3f& position);
 
-    mutable std::map<std::string, float, std::less<>> mAnimVelocities;
+        /* Resets the animation to the time of the specified start marker, without
+         * moving anything, and set the end time to the specified stop marker. If
+         * the marker is not found, or if the markers are the same, it returns
+         * false.
+         */
+        bool reset(AnimState& state, const SceneUtil::TextKeyMap& keys, std::string_view groupname,
+            std::string_view start, std::string_view stop, float startpoint, bool loopfallback);
 
-    osg::ref_ptr<SceneUtil::LightListCallback> mLightListCallback;
+        void handleTextKey(AnimState& state, std::string_view groupname, SceneUtil::TextKeyMap::ConstIterator key,
+            const SceneUtil::TextKeyMap& map);
 
-    const NodeMap& getNodeMap() const;
+        /** Sets the root model of the object.
+         *
+         * Note that you must make sure all animation sources are cleared before resetting the object
+         * root. All nodes previously retrieved with getNode will also become invalidated.
+         * @param forceskeleton Wrap the object root in a Skeleton, even if it contains no skinned parts. Use this if
+         * you intend to add skinned parts manually.
+         * @param baseonly If true, then any meshes or particle systems in the model are ignored
+         *      (useful for NPCs, where only the skeleton is needed for the root, and the actual NPC parts are then
+         * assembled from separate files).
+         */
+        void setObjectRoot(const std::string& model, bool forceskeleton, bool baseonly, bool isCreature);
 
-    /* Sets the appropriate animations on the bone groups based on priority.
-     */
-    void resetActiveGroups();
+        void loadAllAnimationsInFolder(const std::string& model, const std::string& baseModel);
 
-    size_t detectBlendMask(const osg::Node* node) const;
+        /** Adds the keyframe controllers in the specified model as a new animation source.
+         * @note Later added animation sources have the highest priority when it comes to finding a particular
+         * animation.
+         * @param model The file to add the keyframes for. Note that the .nif file extension will be replaced with .kf.
+         * @param baseModel The filename of the mObjectRoot, only used for error messages.
+         */
+        void addAnimSource(std::string_view model, const std::string& baseModel);
+        void addSingleAnimSource(const std::string& model, const std::string& baseModel);
 
-    /* Updates the position of the accum root node for the given time, and
-     * returns the wanted movement vector from the previous time. */
-    void updatePosition(float oldtime, float newtime, osg::Vec3f& position);
+        /** Adds an additional light to the given node using the specified ESM record. */
+        void addExtraLight(osg::ref_ptr<osg::Group> parent, const ESM::Light* light);
 
-    /* Resets the animation to the time of the specified start marker, without
-     * moving anything, and set the end time to the specified stop marker. If
-     * the marker is not found, or if the markers are the same, it returns
-     * false.
-     */
-    bool reset(AnimState &state, const SceneUtil::TextKeyMap &keys,
-               std::string_view groupname, std::string_view start, std::string_view stop,
-               float startpoint, bool loopfallback);
+        void clearAnimSources();
 
-    void handleTextKey(AnimState &state, std::string_view groupname, SceneUtil::TextKeyMap::ConstIterator key,
-                       const SceneUtil::TextKeyMap& map);
+        /**
+         * Provided to allow derived classes adding their own controllers. Note, the controllers must be added to
+         * mActiveControllers so they get cleaned up properly on the next controller rebuild. A controller rebuild may
+         * be necessary to ensure correct ordering.
+         */
+        virtual void addControllers();
 
-    /** Sets the root model of the object.
-     *
-     * Note that you must make sure all animation sources are cleared before resetting the object
-     * root. All nodes previously retrieved with getNode will also become invalidated.
-     * @param forceskeleton Wrap the object root in a Skeleton, even if it contains no skinned parts. Use this if you intend to add skinned parts manually.
-     * @param baseonly If true, then any meshes or particle systems in the model are ignored
-     *      (useful for NPCs, where only the skeleton is needed for the root, and the actual NPC parts are then assembled from separate files).
-     */
-    void setObjectRoot(const std::string &model, bool forceskeleton, bool baseonly, bool isCreature);
+    public:
+        Animation(
+            const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem);
+
+        /// Must be thread safe
+        virtual ~Animation();
+
+        MWWorld::ConstPtr getPtr() const { return mPtr; }
+
+        MWWorld::Ptr getPtr() { return mPtr; }
+
+        /// Set active flag on the object skeleton, if one exists.
+        /// @see SceneUtil::Skeleton::setActive
+        /// 0 = Inactive, 1 = Active in place, 2 = Active
+        void setActive(int active);
+
+        osg::Group* getOrCreateObjectRoot();
+
+        osg::Group* getObjectRoot();
+
+        /**
+         * @brief Add an effect mesh attached to a bone or the insert scene node
+         * @param model
+         * @param effectId An ID for this effect by which you can identify it later. If this is not wanted, set to -1.
+         * @param loop Loop the effect. If false, it is removed automatically after it finishes playing. If true,
+         *              you need to remove it manually using removeEffect when the effect should end.
+         * @param bonename Bone to attach to, or empty string to use the scene node instead
+         * @param texture override the texture specified in the model's materials - if empty, do not override
+         * @note Will not add an effect twice.
+         */
+        void addEffect(const std::string& model, int effectId, bool loop = false, std::string_view bonename = {},
+            std::string_view texture = {});
+        void removeEffect(int effectId);
+        void removeEffects();
+        void getLoopingEffects(std::vector<int>& out) const;
+
+        // Add a spell casting glow to an object. From measuring video taken from the original engine,
+        // the glow seems to be about 1.5 seconds except for telekinesis, which is 1 second.
+        void addSpellCastGlow(const ESM::MagicEffect* effect, float glowDuration = 1.5);
+
+        virtual void updatePtr(const MWWorld::Ptr& ptr);
+
+        bool hasAnimation(std::string_view anim) const;
+
+        // Specifies the axis' to accumulate on. Non-accumulated axis will just
+        // move visually, but not affect the actual movement. Each x/y/z value
+        // should be on the scale of 0 to 1.
+        void setAccumulation(const osg::Vec3f& accum);
+
+        /** Plays an animation.
+         * \param groupname Name of the animation group to play.
+         * \param priority Priority of the animation. The animation will play on
+         *                 bone groups that don't have another animation set of a
+         *                 higher priority.
+         * \param blendMask Bone groups to play the animation on.
+         * \param autodisable Automatically disable the animation when it stops
+         *                    playing.
+         * \param speedmult Speed multiplier for the animation.
+         * \param start Key marker from which to start.
+         * \param stop Key marker to stop at.
+         * \param startpoint How far in between the two markers to start. 0 starts
+         *                   at the start marker, 1 starts at the stop marker.
+         * \param loops How many times to loop the animation. This will use the
+         *              "loop start" and "loop stop" markers if they exist,
+         *              otherwise it may fall back to "start" and "stop", but only if
+         *              the \a loopFallback parameter is true.
+         * \param loopFallback Allow looping an animation that has no loop keys, i.e. fall back to use
+         *                     the "start" and "stop" keys for looping?
+         */
+        void play(std::string_view groupname, const AnimPriority& priority, int blendMask, bool autodisable,
+            float speedmult, std::string_view start, std::string_view stop, float startpoint, size_t loops,
+            bool loopfallback = false);
+
+        /** Adjust the speed multiplier of an already playing animation.
+         */
+        void adjustSpeedMult(const std::string& groupname, float speedmult);
+
+        /** Returns true if the named animation group is playing. */
+        bool isPlaying(std::string_view groupname) const;
+
+        /// Returns true if no important animations are currently playing on the upper body.
+        bool upperBodyReady() const;
+
+        /** Gets info about the given animation group.
+         * \param groupname Animation group to check.
+         * \param complete Stores completion amount (0 = at start key, 0.5 = half way between start and stop keys), etc.
+         * \param speedmult Stores the animation speed multiplier
+         * \return True if the animation is active, false otherwise.
+         */
+        bool getInfo(std::string_view groupname, float* complete = nullptr, float* speedmult = nullptr) const;
+
+        /// Get the absolute position in the animation track of the first text key with the given group.
+        float getStartTime(const std::string& groupname) const;
+
+        /// Get the absolute position in the animation track of the text key
+        float getTextKeyTime(std::string_view textKey) const;
+
+        /// Get the current absolute position in the animation track for the animation that is currently playing from
+        /// the given group.
+        float getCurrentTime(const std::string& groupname) const;
+
+        size_t getCurrentLoopCount(const std::string& groupname) const;
+
+        /** Disables the specified animation group;
+         * \param groupname Animation group to disable.
+         */
+        void disable(std::string_view groupname);
+
+        /** Retrieves the velocity (in units per second) that the animation will move. */
+        float getVelocity(std::string_view groupname) const;
+
+        virtual osg::Vec3f runAnimation(float duration);
+
+        void setLoopingEnabled(std::string_view groupname, bool enabled);
+
+        /// This is typically called as part of runAnimation, but may be called manually if needed.
+        void updateEffects();
+
+        /// Return a node with the specified name, or nullptr if not existing.
+        /// @note The matching is case-insensitive.
+        const osg::Node* getNode(std::string_view name) const;
+
+        virtual bool useShieldAnimations() const { return false; }
+        virtual bool getWeaponsShown() const { return false; }
+        virtual void showWeapons(bool showWeapon) {}
+        virtual bool getCarriedLeftShown() const { return false; }
+        virtual void showCarriedLeft(bool show) {}
+        virtual void setWeaponGroup(const std::string& group, bool relativeDuration) {}
+        virtual void setVampire(bool vampire) {}
+        /// A value < 1 makes the animation translucent, 1.f = fully opaque
+        void setAlpha(float alpha);
+        virtual void setPitchFactor(float factor) {}
+        virtual void attachArrow() {}
+        virtual void detachArrow() {}
+        virtual void releaseArrow(float attackStrength) {}
+        virtual void enableHeadAnimation(bool enable) {}
+        // TODO: move outside of this class
+        /// Makes this object glow, by placing a Light in its center.
+        /// @param effect Controls the radius and intensity of the light.
+        virtual void setLightEffect(float effect);
+
+        virtual void setHeadPitch(float pitchRadians);
+        virtual void setHeadYaw(float yawRadians);
+        virtual float getHeadPitch() const;
+        virtual float getHeadYaw() const;
+
+        virtual void setUpperBodyYawRadians(float v) { mUpperBodyYawRadians = v; }
+        virtual void setLegsYawRadians(float v) { mLegsYawRadians = v; }
+        virtual float getUpperBodyYawRadians() const { return mUpperBodyYawRadians; }
+        virtual float getLegsYawRadians() const { return mLegsYawRadians; }
+        virtual void setBodyPitchRadians(float v) { mBodyPitchRadians = v; }
+        virtual float getBodyPitchRadians() const { return mBodyPitchRadians; }
+
+        virtual void setAccurateAiming(bool enabled) {}
+        virtual bool canBeHarvested() const { return false; }
+
+        virtual void removeFromScene();
 
-    void loadAllAnimationsInFolder(const std::string &model, const std::string &baseModel);
+    private:
+        Animation(const Animation&);
+        void operator=(Animation&);
+    };
 
-    /** Adds the keyframe controllers in the specified model as a new animation source.
-     * @note Later added animation sources have the highest priority when it comes to finding a particular animation.
-     * @param model The file to add the keyframes for. Note that the .nif file extension will be replaced with .kf.
-     * @param baseModel The filename of the mObjectRoot, only used for error messages.
-    */
-    void addAnimSource(std::string_view model, const std::string& baseModel);
-    void addSingleAnimSource(const std::string &model, const std::string& baseModel);
-
-    /** Adds an additional light to the given node using the specified ESM record. */
-    void addExtraLight(osg::ref_ptr<osg::Group> parent, const ESM::Light *light);
-
-    void clearAnimSources();
-
-    /**
-     * Provided to allow derived classes adding their own controllers. Note, the controllers must be added to mActiveControllers
-     * so they get cleaned up properly on the next controller rebuild. A controller rebuild may be necessary to ensure correct ordering.
-     */
-    virtual void addControllers();
-
-public:
-
-    Animation(const MWWorld::Ptr &ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem);
-
-    /// Must be thread safe
-    virtual ~Animation();
-
-    MWWorld::ConstPtr getPtr() const { return mPtr; }
-
-    MWWorld::Ptr getPtr() { return mPtr; }
-
-    /// Set active flag on the object skeleton, if one exists.
-    /// @see SceneUtil::Skeleton::setActive
-    /// 0 = Inactive, 1 = Active in place, 2 = Active
-    void setActive(int active);
-
-    osg::Group* getOrCreateObjectRoot();
-
-    osg::Group* getObjectRoot();
-
-    /**
-     * @brief Add an effect mesh attached to a bone or the insert scene node
-     * @param model
-     * @param effectId An ID for this effect by which you can identify it later. If this is not wanted, set to -1.
-     * @param loop Loop the effect. If false, it is removed automatically after it finishes playing. If true,
-     *              you need to remove it manually using removeEffect when the effect should end.
-     * @param bonename Bone to attach to, or empty string to use the scene node instead
-     * @param texture override the texture specified in the model's materials - if empty, do not override
-     * @note Will not add an effect twice.
-     */
-    void addEffect(const std::string& model, int effectId, bool loop = false, std::string_view bonename = {}, std::string_view texture = {});
-    void removeEffect (int effectId);
-    void removeEffects ();
-    void getLoopingEffects (std::vector<int>& out) const;
-
-    // Add a spell casting glow to an object. From measuring video taken from the original engine,
-    // the glow seems to be about 1.5 seconds except for telekinesis, which is 1 second.
-    void addSpellCastGlow(const ESM::MagicEffect *effect, float glowDuration = 1.5);
-
-    virtual void updatePtr(const MWWorld::Ptr &ptr);
-
-    bool hasAnimation(std::string_view anim) const;
-
-    // Specifies the axis' to accumulate on. Non-accumulated axis will just
-    // move visually, but not affect the actual movement. Each x/y/z value
-    // should be on the scale of 0 to 1.
-    void setAccumulation(const osg::Vec3f& accum);
-
-    /** Plays an animation.
-     * \param groupname Name of the animation group to play.
-     * \param priority Priority of the animation. The animation will play on
-     *                 bone groups that don't have another animation set of a
-     *                 higher priority.
-     * \param blendMask Bone groups to play the animation on.
-     * \param autodisable Automatically disable the animation when it stops
-     *                    playing.
-     * \param speedmult Speed multiplier for the animation.
-     * \param start Key marker from which to start.
-     * \param stop Key marker to stop at.
-     * \param startpoint How far in between the two markers to start. 0 starts
-     *                   at the start marker, 1 starts at the stop marker.
-     * \param loops How many times to loop the animation. This will use the
-     *              "loop start" and "loop stop" markers if they exist,
-     *              otherwise it may fall back to "start" and "stop", but only if
-     *              the \a loopFallback parameter is true.
-     * \param loopFallback Allow looping an animation that has no loop keys, i.e. fall back to use
-     *                     the "start" and "stop" keys for looping?
-     */
-    void play(std::string_view groupname, const AnimPriority& priority, int blendMask, bool autodisable,
-              float speedmult, std::string_view start,std::string_view stop,
-              float startpoint, size_t loops, bool loopfallback=false);
-
-    /** Adjust the speed multiplier of an already playing animation.
-     */
-    void adjustSpeedMult (const std::string& groupname, float speedmult);
-
-    /** Returns true if the named animation group is playing. */
-    bool isPlaying(std::string_view groupname) const;
-
-    /// Returns true if no important animations are currently playing on the upper body.
-    bool upperBodyReady() const;
-
-    /** Gets info about the given animation group.
-     * \param groupname Animation group to check.
-     * \param complete Stores completion amount (0 = at start key, 0.5 = half way between start and stop keys), etc.
-     * \param speedmult Stores the animation speed multiplier
-     * \return True if the animation is active, false otherwise.
-     */
-    bool getInfo(std::string_view groupname, float *complete=nullptr, float *speedmult=nullptr) const;
-
-    /// Get the absolute position in the animation track of the first text key with the given group.
-    float getStartTime(const std::string &groupname) const;
-
-    /// Get the absolute position in the animation track of the text key
-    float getTextKeyTime(std::string_view textKey) const;
-
-    /// Get the current absolute position in the animation track for the animation that is currently playing from the given group.
-    float getCurrentTime(const std::string& groupname) const;
-
-    size_t getCurrentLoopCount(const std::string& groupname) const;
-
-    /** Disables the specified animation group;
-     * \param groupname Animation group to disable.
-     */
-    void disable(std::string_view groupname);
-
-    /** Retrieves the velocity (in units per second) that the animation will move. */
-    float getVelocity(std::string_view groupname) const;
-
-    virtual osg::Vec3f runAnimation(float duration);
-
-    void setLoopingEnabled(std::string_view groupname, bool enabled);
-
-    /// This is typically called as part of runAnimation, but may be called manually if needed.
-    void updateEffects();
-
-    /// Return a node with the specified name, or nullptr if not existing.
-    /// @note The matching is case-insensitive.
-    const osg::Node* getNode(std::string_view name) const;
-
-    virtual bool useShieldAnimations() const { return false; }
-    virtual bool getWeaponsShown() const { return false; }
-    virtual void showWeapons(bool showWeapon) {}
-    virtual bool getCarriedLeftShown() const { return false; }
-    virtual void showCarriedLeft(bool show) {}
-    virtual void setWeaponGroup(const std::string& group, bool relativeDuration) {}
-    virtual void setVampire(bool vampire) {}
-    /// A value < 1 makes the animation translucent, 1.f = fully opaque
-    void setAlpha(float alpha);
-    virtual void setPitchFactor(float factor) {}
-    virtual void attachArrow() {}
-    virtual void detachArrow() {}
-    virtual void releaseArrow(float attackStrength) {}
-    virtual void enableHeadAnimation(bool enable) {}
-    // TODO: move outside of this class
-    /// Makes this object glow, by placing a Light in its center.
-    /// @param effect Controls the radius and intensity of the light.
-    virtual void setLightEffect(float effect);
-
-    virtual void setHeadPitch(float pitchRadians);
-    virtual void setHeadYaw(float yawRadians);
-    virtual float getHeadPitch() const;
-    virtual float getHeadYaw() const;
-
-    virtual void setUpperBodyYawRadians(float v) { mUpperBodyYawRadians = v; }
-    virtual void setLegsYawRadians(float v) { mLegsYawRadians = v; }
-    virtual float getUpperBodyYawRadians() const { return mUpperBodyYawRadians; }
-    virtual float getLegsYawRadians() const { return mLegsYawRadians; }
-    virtual void setBodyPitchRadians(float v) { mBodyPitchRadians = v; }
-    virtual float getBodyPitchRadians() const { return mBodyPitchRadians; }
-
-    virtual void setAccurateAiming(bool enabled) {}
-    virtual bool canBeHarvested() const { return false; }
-
-    virtual void removeFromScene();
-
-private:
-    Animation(const Animation&);
-    void operator=(Animation&);
-};
-
-class ObjectAnimation : public Animation {
-public:
-    ObjectAnimation(const MWWorld::Ptr& ptr, const std::string &model, Resource::ResourceSystem* resourceSystem, bool animated, bool allowLight);
-
-    bool canBeHarvested() const override;
-};
-
-class UpdateVfxCallback : public SceneUtil::NodeCallback<UpdateVfxCallback>
-{
-public:
-    UpdateVfxCallback(EffectParams& params)
-        : mFinished(false)
-        , mParams(params)
-        , mStartingTime(0)
+    class ObjectAnimation : public Animation
     {
-    }
+    public:
+        ObjectAnimation(const MWWorld::Ptr& ptr, const std::string& model, Resource::ResourceSystem* resourceSystem,
+            bool animated, bool allowLight);
 
-    bool mFinished;
-    EffectParams mParams;
+        bool canBeHarvested() const override;
+    };
 
-    void operator()(osg::Node* node, osg::NodeVisitor* nv);
+    class UpdateVfxCallback : public SceneUtil::NodeCallback<UpdateVfxCallback>
+    {
+    public:
+        UpdateVfxCallback(EffectParams& params)
+            : mFinished(false)
+            , mParams(params)
+            , mStartingTime(0)
+        {
+        }
 
-private:
-    double mStartingTime;
-};
+        bool mFinished;
+        EffectParams mParams;
+
+        void operator()(osg::Node* node, osg::NodeVisitor* nv);
+
+    private:
+        double mStartingTime;
+    };
 
 }
 #endif
diff --git a/apps/openmw/mwrender/bulletdebugdraw.cpp b/apps/openmw/mwrender/bulletdebugdraw.cpp
index b14b64e771..3fd71d21ec 100644
--- a/apps/openmw/mwrender/bulletdebugdraw.cpp
+++ b/apps/openmw/mwrender/bulletdebugdraw.cpp
@@ -20,200 +20,204 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
 namespace MWRender
 {
 
-DebugDrawer::DebugDrawer(osg::ref_ptr<osg::Group> parentNode, btCollisionWorld *world, int debugMode)
-    : mParentNode(parentNode),
-      mWorld(world)
-{
-    DebugDrawer::setDebugMode(debugMode);
-}
+    DebugDrawer::DebugDrawer(osg::ref_ptr<osg::Group> parentNode, btCollisionWorld* world, int debugMode)
+        : mParentNode(parentNode)
+        , mWorld(world)
+    {
+        DebugDrawer::setDebugMode(debugMode);
+    }
 
-void DebugDrawer::createGeometry()
-{
-    if (!mLinesGeometry)
+    void DebugDrawer::createGeometry()
     {
-        mLinesGeometry = new osg::Geometry;
-        mTrisGeometry = new osg::Geometry;
-        mLinesGeometry->setNodeMask(Mask_Debug);
-        mTrisGeometry->setNodeMask(Mask_Debug);
-
-        mLinesVertices = new osg::Vec3Array;
-        mTrisVertices = new osg::Vec3Array;
-        mLinesColors = new osg::Vec4Array;
-
-        mLinesDrawArrays = new osg::DrawArrays(osg::PrimitiveSet::LINES);
-        mTrisDrawArrays = new osg::DrawArrays(osg::PrimitiveSet::TRIANGLES);
-
-        mLinesGeometry->setUseDisplayList(false);
-        mLinesGeometry->setVertexArray(mLinesVertices);
-        mLinesGeometry->setColorArray(mLinesColors);
-        mLinesGeometry->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
-        mLinesGeometry->setDataVariance(osg::Object::DYNAMIC);
-        mLinesGeometry->addPrimitiveSet(mLinesDrawArrays);
-
-        mTrisGeometry->setUseDisplayList(false);
-        mTrisGeometry->setVertexArray(mTrisVertices);
-        mTrisGeometry->setDataVariance(osg::Object::DYNAMIC);
-        mTrisGeometry->addPrimitiveSet(mTrisDrawArrays);
-
-        mParentNode->addChild(mLinesGeometry);
-        mParentNode->addChild(mTrisGeometry);
-
-        auto* stateSet = new osg::StateSet;
-        stateSet->setAttributeAndModes(new osg::PolygonMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::LINE), osg::StateAttribute::ON);
-        stateSet->setAttributeAndModes(new osg::PolygonOffset(SceneUtil::AutoDepth::isReversed() ? 1.0 : -1.0, SceneUtil::AutoDepth::isReversed() ? 1.0 : -1.0));
-        osg::ref_ptr<osg::Material> material = new osg::Material;
-        material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
-        stateSet->setAttribute(material);
-        mLinesGeometry->setStateSet(stateSet);
-        mTrisGeometry->setStateSet(stateSet);
-        mShapesRoot = new osg::Group;
-        mShapesRoot->setStateSet(stateSet);
-        mShapesRoot->setDataVariance(osg::Object::DYNAMIC);
-        mShapesRoot->setNodeMask(Mask_Debug);
-        mParentNode->addChild(mShapesRoot);
-
-        MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(mLinesGeometry, "debug");
-        MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(mTrisGeometry, "debug");
-        MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(mShapesRoot, "debug");
+        if (!mLinesGeometry)
+        {
+            mLinesGeometry = new osg::Geometry;
+            mTrisGeometry = new osg::Geometry;
+            mLinesGeometry->setNodeMask(Mask_Debug);
+            mTrisGeometry->setNodeMask(Mask_Debug);
+
+            mLinesVertices = new osg::Vec3Array;
+            mTrisVertices = new osg::Vec3Array;
+            mLinesColors = new osg::Vec4Array;
+
+            mLinesDrawArrays = new osg::DrawArrays(osg::PrimitiveSet::LINES);
+            mTrisDrawArrays = new osg::DrawArrays(osg::PrimitiveSet::TRIANGLES);
+
+            mLinesGeometry->setUseDisplayList(false);
+            mLinesGeometry->setVertexArray(mLinesVertices);
+            mLinesGeometry->setColorArray(mLinesColors);
+            mLinesGeometry->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
+            mLinesGeometry->setDataVariance(osg::Object::DYNAMIC);
+            mLinesGeometry->addPrimitiveSet(mLinesDrawArrays);
+
+            mTrisGeometry->setUseDisplayList(false);
+            mTrisGeometry->setVertexArray(mTrisVertices);
+            mTrisGeometry->setDataVariance(osg::Object::DYNAMIC);
+            mTrisGeometry->addPrimitiveSet(mTrisDrawArrays);
+
+            mParentNode->addChild(mLinesGeometry);
+            mParentNode->addChild(mTrisGeometry);
+
+            auto* stateSet = new osg::StateSet;
+            stateSet->setAttributeAndModes(
+                new osg::PolygonMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::LINE),
+                osg::StateAttribute::ON);
+            stateSet->setAttributeAndModes(new osg::PolygonOffset(
+                SceneUtil::AutoDepth::isReversed() ? 1.0 : -1.0, SceneUtil::AutoDepth::isReversed() ? 1.0 : -1.0));
+            osg::ref_ptr<osg::Material> material = new osg::Material;
+            material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
+            stateSet->setAttribute(material);
+            mLinesGeometry->setStateSet(stateSet);
+            mTrisGeometry->setStateSet(stateSet);
+            mShapesRoot = new osg::Group;
+            mShapesRoot->setStateSet(stateSet);
+            mShapesRoot->setDataVariance(osg::Object::DYNAMIC);
+            mShapesRoot->setNodeMask(Mask_Debug);
+            mParentNode->addChild(mShapesRoot);
+
+            MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(mLinesGeometry, "debug");
+            MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(mTrisGeometry, "debug");
+            MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(mShapesRoot, "debug");
+        }
     }
-}
 
-void DebugDrawer::destroyGeometry()
-{
-    if (mLinesGeometry)
+    void DebugDrawer::destroyGeometry()
     {
-        mParentNode->removeChild(mLinesGeometry);
-        mParentNode->removeChild(mTrisGeometry);
-        mParentNode->removeChild(mShapesRoot);
-        mLinesGeometry = nullptr;
-        mLinesVertices = nullptr;
-        mLinesColors = nullptr;
-        mLinesDrawArrays = nullptr;
-        mTrisGeometry = nullptr;
-        mTrisVertices = nullptr;
-        mTrisDrawArrays = nullptr;
+        if (mLinesGeometry)
+        {
+            mParentNode->removeChild(mLinesGeometry);
+            mParentNode->removeChild(mTrisGeometry);
+            mParentNode->removeChild(mShapesRoot);
+            mLinesGeometry = nullptr;
+            mLinesVertices = nullptr;
+            mLinesColors = nullptr;
+            mLinesDrawArrays = nullptr;
+            mTrisGeometry = nullptr;
+            mTrisVertices = nullptr;
+            mTrisDrawArrays = nullptr;
+        }
     }
-}
 
-DebugDrawer::~DebugDrawer()
-{
-    destroyGeometry();
-}
+    DebugDrawer::~DebugDrawer()
+    {
+        destroyGeometry();
+    }
 
-void DebugDrawer::step()
-{
-    if (mDebugOn)
+    void DebugDrawer::step()
     {
-        mLinesVertices->clear();
-        mTrisVertices->clear();
-        mLinesColors->clear();
-        mShapesRoot->removeChildren(0, mShapesRoot->getNumChildren());
-        mWorld->debugDrawWorld();
-        showCollisions();
-        mLinesDrawArrays->setCount(mLinesVertices->size());
-        mTrisDrawArrays->setCount(mTrisVertices->size());
-        mLinesVertices->dirty();
-        mTrisVertices->dirty();
-        mLinesColors->dirty();
-        mLinesGeometry->dirtyBound();
-        mTrisGeometry->dirtyBound();
+        if (mDebugOn)
+        {
+            mLinesVertices->clear();
+            mTrisVertices->clear();
+            mLinesColors->clear();
+            mShapesRoot->removeChildren(0, mShapesRoot->getNumChildren());
+            mWorld->debugDrawWorld();
+            showCollisions();
+            mLinesDrawArrays->setCount(mLinesVertices->size());
+            mTrisDrawArrays->setCount(mTrisVertices->size());
+            mLinesVertices->dirty();
+            mTrisVertices->dirty();
+            mLinesColors->dirty();
+            mLinesGeometry->dirtyBound();
+            mTrisGeometry->dirtyBound();
+        }
     }
-}
 
-void DebugDrawer::drawLine(const btVector3 &from, const btVector3 &to, const btVector3 &color)
-{
-    mLinesVertices->push_back(Misc::Convert::toOsg(from));
-    mLinesVertices->push_back(Misc::Convert::toOsg(to));
-    mLinesColors->push_back({1,1,1,1});
-    mLinesColors->push_back({1,1,1,1});
+    void DebugDrawer::drawLine(const btVector3& from, const btVector3& to, const btVector3& color)
+    {
+        mLinesVertices->push_back(Misc::Convert::toOsg(from));
+        mLinesVertices->push_back(Misc::Convert::toOsg(to));
+        mLinesColors->push_back({ 1, 1, 1, 1 });
+        mLinesColors->push_back({ 1, 1, 1, 1 });
 
 #if BT_BULLET_VERSION < 317
-    size_t size = mLinesVertices->size();
-    if (size >= 6
-        && (*mLinesVertices)[size - 1] == (*mLinesVertices)[size - 6]
-        && (*mLinesVertices)[size - 2] == (*mLinesVertices)[size - 3]
-        && (*mLinesVertices)[size - 4] == (*mLinesVertices)[size - 5])
-    {
-        mTrisVertices->push_back(mLinesVertices->back());
-        mLinesVertices->pop_back();
-        mLinesColors->pop_back();
-        mTrisVertices->push_back(mLinesVertices->back());
-        mLinesVertices->pop_back();
-        mLinesColors->pop_back();
-        mLinesVertices->pop_back();
-        mLinesColors->pop_back();
-        mTrisVertices->push_back(mLinesVertices->back());
-        mLinesVertices->pop_back();
-        mLinesColors->pop_back();
-        mLinesVertices->pop_back();
-        mLinesColors->pop_back();
-        mLinesVertices->pop_back();
-        mLinesColors->pop_back();
-    }
+        size_t size = mLinesVertices->size();
+        if (size >= 6 && (*mLinesVertices)[size - 1] == (*mLinesVertices)[size - 6]
+            && (*mLinesVertices)[size - 2] == (*mLinesVertices)[size - 3]
+            && (*mLinesVertices)[size - 4] == (*mLinesVertices)[size - 5])
+        {
+            mTrisVertices->push_back(mLinesVertices->back());
+            mLinesVertices->pop_back();
+            mLinesColors->pop_back();
+            mTrisVertices->push_back(mLinesVertices->back());
+            mLinesVertices->pop_back();
+            mLinesColors->pop_back();
+            mLinesVertices->pop_back();
+            mLinesColors->pop_back();
+            mTrisVertices->push_back(mLinesVertices->back());
+            mLinesVertices->pop_back();
+            mLinesColors->pop_back();
+            mLinesVertices->pop_back();
+            mLinesColors->pop_back();
+            mLinesVertices->pop_back();
+            mLinesColors->pop_back();
+        }
 #endif
-}
+    }
 
-void DebugDrawer::drawTriangle(const btVector3& v0, const btVector3& v1, const btVector3& v2, const btVector3& color, btScalar)
-{
-    mTrisVertices->push_back(Misc::Convert::toOsg(v0));
-    mTrisVertices->push_back(Misc::Convert::toOsg(v1));
-    mTrisVertices->push_back(Misc::Convert::toOsg(v2));
-}
+    void DebugDrawer::drawTriangle(
+        const btVector3& v0, const btVector3& v1, const btVector3& v2, const btVector3& color, btScalar)
+    {
+        mTrisVertices->push_back(Misc::Convert::toOsg(v0));
+        mTrisVertices->push_back(Misc::Convert::toOsg(v1));
+        mTrisVertices->push_back(Misc::Convert::toOsg(v2));
+    }
 
-void DebugDrawer::addCollision(const btVector3& orig, const btVector3& normal)
-{
-    mCollisionViews.emplace_back(orig, normal);
-}
+    void DebugDrawer::addCollision(const btVector3& orig, const btVector3& normal)
+    {
+        mCollisionViews.emplace_back(orig, normal);
+    }
 
-void DebugDrawer::showCollisions()
-{
-    const auto now = std::chrono::steady_clock::now();
-    for (auto& [from, to , created] : mCollisionViews)
+    void DebugDrawer::showCollisions()
     {
-        if (now - created < std::chrono::seconds(2))
+        const auto now = std::chrono::steady_clock::now();
+        for (auto& [from, to, created] : mCollisionViews)
         {
-            mLinesVertices->push_back(Misc::Convert::toOsg(from));
-            mLinesVertices->push_back(Misc::Convert::toOsg(to));
-            mLinesColors->push_back({1,0,0,1});
-            mLinesColors->push_back({1,0,0,1});
+            if (now - created < std::chrono::seconds(2))
+            {
+                mLinesVertices->push_back(Misc::Convert::toOsg(from));
+                mLinesVertices->push_back(Misc::Convert::toOsg(to));
+                mLinesColors->push_back({ 1, 0, 0, 1 });
+                mLinesColors->push_back({ 1, 0, 0, 1 });
+            }
         }
-    }
-    mCollisionViews.erase(std::remove_if(mCollisionViews.begin(), mCollisionViews.end(),
+        mCollisionViews.erase(
+            std::remove_if(mCollisionViews.begin(), mCollisionViews.end(),
                 [&now](const CollisionView& view) { return now - view.mCreated >= std::chrono::seconds(2); }),
             mCollisionViews.end());
-}
+    }
 
-void DebugDrawer::drawSphere(btScalar radius, const btTransform& transform, const btVector3& color)
-{
-    auto* geom = new osg::ShapeDrawable(new osg::Sphere(Misc::Convert::toOsg(transform.getOrigin()), radius));
-    geom->setColor(osg::Vec4(1, 1, 1, 1));
-    mShapesRoot->addChild(geom);
-}
+    void DebugDrawer::drawSphere(btScalar radius, const btTransform& transform, const btVector3& color)
+    {
+        auto* geom = new osg::ShapeDrawable(new osg::Sphere(Misc::Convert::toOsg(transform.getOrigin()), radius));
+        geom->setColor(osg::Vec4(1, 1, 1, 1));
+        mShapesRoot->addChild(geom);
+    }
 
-void DebugDrawer::reportErrorWarning(const char *warningString)
-{
-    Log(Debug::Warning) << warningString;
-}
+    void DebugDrawer::reportErrorWarning(const char* warningString)
+    {
+        Log(Debug::Warning) << warningString;
+    }
 
-void DebugDrawer::setDebugMode(int isOn)
-{
-    mDebugOn = (isOn != 0);
+    void DebugDrawer::setDebugMode(int isOn)
+    {
+        mDebugOn = (isOn != 0);
 
-    if (!mDebugOn)
-        destroyGeometry();
-    else
-        createGeometry();
-}
+        if (!mDebugOn)
+            destroyGeometry();
+        else
+            createGeometry();
+    }
 
-int DebugDrawer::getDebugMode() const
-{
-    return mDebugOn;
-}
+    int DebugDrawer::getDebugMode() const
+    {
+        return mDebugOn;
+    }
 
 }
diff --git a/apps/openmw/mwrender/bulletdebugdraw.hpp b/apps/openmw/mwrender/bulletdebugdraw.hpp
index cea5794ba7..017d3af90a 100644
--- a/apps/openmw/mwrender/bulletdebugdraw.hpp
+++ b/apps/openmw/mwrender/bulletdebugdraw.hpp
@@ -4,9 +4,9 @@
 #include <chrono>
 #include <vector>
 
-#include <osg/ref_ptr>
 #include <osg/Array>
 #include <osg/PrimitiveSet>
+#include <osg/ref_ptr>
 
 #include <LinearMath/btIDebugDraw.h>
 
@@ -21,65 +21,67 @@ namespace osg
 namespace MWRender
 {
 
-class DebugDrawer : public btIDebugDraw
-{
-private:
-    struct CollisionView
+    class DebugDrawer : public btIDebugDraw
     {
-        btVector3 mOrig;
-        btVector3 mEnd;
-        std::chrono::time_point<std::chrono::steady_clock> mCreated;
-        CollisionView(btVector3 orig, btVector3 normal) : mOrig(orig), mEnd(orig + normal * 20), mCreated(std::chrono::steady_clock::now()) {};
-    };
-    std::vector<CollisionView> mCollisionViews;
-    osg::ref_ptr<osg::Group> mShapesRoot;
+    private:
+        struct CollisionView
+        {
+            btVector3 mOrig;
+            btVector3 mEnd;
+            std::chrono::time_point<std::chrono::steady_clock> mCreated;
+            CollisionView(btVector3 orig, btVector3 normal)
+                : mOrig(orig)
+                , mEnd(orig + normal * 20)
+                , mCreated(std::chrono::steady_clock::now()){};
+        };
+        std::vector<CollisionView> mCollisionViews;
+        osg::ref_ptr<osg::Group> mShapesRoot;
 
-protected:
-    osg::ref_ptr<osg::Group> mParentNode;
-    btCollisionWorld *mWorld;
-    osg::ref_ptr<osg::Geometry> mLinesGeometry;
-    osg::ref_ptr<osg::Geometry> mTrisGeometry;
-    osg::ref_ptr<osg::Vec3Array> mLinesVertices;
-    osg::ref_ptr<osg::Vec3Array> mTrisVertices;
-    osg::ref_ptr<osg::Vec4Array> mLinesColors;
-    osg::ref_ptr<osg::DrawArrays> mLinesDrawArrays;
-    osg::ref_ptr<osg::DrawArrays> mTrisDrawArrays;
+    protected:
+        osg::ref_ptr<osg::Group> mParentNode;
+        btCollisionWorld* mWorld;
+        osg::ref_ptr<osg::Geometry> mLinesGeometry;
+        osg::ref_ptr<osg::Geometry> mTrisGeometry;
+        osg::ref_ptr<osg::Vec3Array> mLinesVertices;
+        osg::ref_ptr<osg::Vec3Array> mTrisVertices;
+        osg::ref_ptr<osg::Vec4Array> mLinesColors;
+        osg::ref_ptr<osg::DrawArrays> mLinesDrawArrays;
+        osg::ref_ptr<osg::DrawArrays> mTrisDrawArrays;
 
-    bool mDebugOn;
+        bool mDebugOn;
 
-    void createGeometry();
-    void destroyGeometry();
+        void createGeometry();
+        void destroyGeometry();
 
-public:
+    public:
+        DebugDrawer(osg::ref_ptr<osg::Group> parentNode, btCollisionWorld* world, int debugMode = 1);
+        ~DebugDrawer();
 
-    DebugDrawer(osg::ref_ptr<osg::Group> parentNode, btCollisionWorld *world, int debugMode = 1);
-    ~DebugDrawer();
+        void step();
 
-    void step();
+        void drawLine(const btVector3& from, const btVector3& to, const btVector3& color) override;
 
-    void drawLine(const btVector3& from,const btVector3& to,const btVector3& color) override;
+        void drawTriangle(
+            const btVector3& v0, const btVector3& v1, const btVector3& v2, const btVector3& color, btScalar) override;
 
-    void drawTriangle(const btVector3& v0, const btVector3& v1, const btVector3& v2, const btVector3& color, btScalar) override;
+        void addCollision(const btVector3& orig, const btVector3& normal);
 
-    void addCollision(const btVector3& orig, const btVector3& normal);
+        void showCollisions();
 
-    void showCollisions();
+        void drawContactPoint(const btVector3& PointOnB, const btVector3& normalOnB, btScalar distance, int lifeTime,
+            const btVector3& color) override{};
+        void drawSphere(btScalar radius, const btTransform& transform, const btVector3& color) override;
 
-    void drawContactPoint(const btVector3& PointOnB,const btVector3& normalOnB,btScalar distance,int lifeTime,const btVector3& color) override {};
-    void drawSphere(btScalar radius, const btTransform& transform, const btVector3& color) override;
+        void reportErrorWarning(const char* warningString) override;
 
-    void reportErrorWarning(const char* warningString) override;
+        void draw3dText(const btVector3& location, const char* textString) override {}
 
-    void draw3dText(const btVector3& location,const char* textString) override {}
-
-    //0 for off, anything else for on.
-    void setDebugMode(int isOn) override;
-
-    //0 for off, anything else for on.
-    int getDebugMode() const override;
-
-};
+        // 0 for off, anything else for on.
+        void setDebugMode(int isOn) override;
 
+        // 0 for off, anything else for on.
+        int getDebugMode() const override;
+    };
 
 }
 
diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp
index 625b6c3e97..1fe49f0f0f 100644
--- a/apps/openmw/mwrender/camera.cpp
+++ b/apps/openmw/mwrender/camera.cpp
@@ -3,9 +3,9 @@
 #include <osg/Camera>
 
 #include <components/misc/mathutil.hpp>
+#include <components/sceneutil/nodecallback.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/settings/settings.hpp>
-#include <components/sceneutil/nodecallback.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -26,55 +26,57 @@
 namespace
 {
 
-class UpdateRenderCameraCallback : public SceneUtil::NodeCallback<UpdateRenderCameraCallback, osg::Camera*>
-{
-public:
-    UpdateRenderCameraCallback(MWRender::Camera* cam)
-        : mCamera(cam)
+    class UpdateRenderCameraCallback : public SceneUtil::NodeCallback<UpdateRenderCameraCallback, osg::Camera*>
     {
-    }
+    public:
+        UpdateRenderCameraCallback(MWRender::Camera* cam)
+            : mCamera(cam)
+        {
+        }
 
-    void operator()(osg::Camera* cam, osg::NodeVisitor* nv)
-    {
-        // traverse first to update animations, in case the camera is attached to an animated node
-        traverse(cam, nv);
+        void operator()(osg::Camera* cam, osg::NodeVisitor* nv)
+        {
+            // traverse first to update animations, in case the camera is attached to an animated node
+            traverse(cam, nv);
 
-        mCamera->updateCamera(cam);
-    }
+            mCamera->updateCamera(cam);
+        }
 
-private:
-    MWRender::Camera* mCamera;
-};
+    private:
+        MWRender::Camera* mCamera;
+    };
 
 }
 
 namespace MWRender
 {
 
-    Camera::Camera (osg::Camera* camera)
-    : mHeightScale(1.f),
-      mCollisionType((MWPhysics::CollisionType::CollisionType_Default & ~MWPhysics::CollisionType::CollisionType_Actor) | MWPhysics::CollisionType_CameraOnly),
-      mCamera(camera),
-      mAnimation(nullptr),
-      mFirstPersonView(true),
-      mMode(Mode::FirstPerson),
-      mVanityAllowed(true),
-      mDeferredRotationAllowed(true),
-      mProcessViewChange(false),
-      mHeight(124.f),
-      mPitch(0.f),
-      mYaw(0.f),
-      mRoll(0.f),
-      mCameraDistance(0.f),
-      mPreferredCameraDistance(0.f),
-      mFocalPointCurrentOffset(osg::Vec2d()),
-      mFocalPointTargetOffset(osg::Vec2d()),
-      mFocalPointTransitionSpeedCoef(1.f),
-      mSkipFocalPointTransition(true),
-      mPreviousTransitionInfluence(0.f),
-      mShowCrosshair(false),
-      mDeferredRotation(osg::Vec3f()),
-      mDeferredRotationDisabled(false)
+    Camera::Camera(osg::Camera* camera)
+        : mHeightScale(1.f)
+        , mCollisionType(
+              (MWPhysics::CollisionType::CollisionType_Default & ~MWPhysics::CollisionType::CollisionType_Actor)
+              | MWPhysics::CollisionType_CameraOnly)
+        , mCamera(camera)
+        , mAnimation(nullptr)
+        , mFirstPersonView(true)
+        , mMode(Mode::FirstPerson)
+        , mVanityAllowed(true)
+        , mDeferredRotationAllowed(true)
+        , mProcessViewChange(false)
+        , mHeight(124.f)
+        , mPitch(0.f)
+        , mYaw(0.f)
+        , mRoll(0.f)
+        , mCameraDistance(0.f)
+        , mPreferredCameraDistance(0.f)
+        , mFocalPointCurrentOffset(osg::Vec2d())
+        , mFocalPointTargetOffset(osg::Vec2d())
+        , mFocalPointTransitionSpeedCoef(1.f)
+        , mSkipFocalPointTransition(true)
+        , mPreviousTransitionInfluence(0.f)
+        , mShowCrosshair(false)
+        , mDeferredRotation(osg::Vec3f())
+        , mDeferredRotationDisabled(false)
     {
         mUpdateCallback = new UpdateRenderCameraCallback(this);
         mCamera->addUpdateCallback(mUpdateCallback);
@@ -108,13 +110,12 @@ namespace MWRender
         return offset;
     }
 
-    void Camera::updateCamera(osg::Camera *cam)
+    void Camera::updateCamera(osg::Camera* cam)
     {
-        osg::Quat orient = osg::Quat(mRoll + mExtraRoll, osg::Vec3d(0, 1, 0)) *
-                           osg::Quat(mPitch + mExtraPitch, osg::Vec3d(1, 0, 0)) *
-                           osg::Quat(mYaw + mExtraYaw, osg::Vec3d(0, 0, 1));
-        osg::Vec3d forward = orient * osg::Vec3d(0,1,0);
-        osg::Vec3d up = orient * osg::Vec3d(0,0,1);
+        osg::Quat orient = osg::Quat(mRoll + mExtraRoll, osg::Vec3d(0, 1, 0))
+            * osg::Quat(mPitch + mExtraPitch, osg::Vec3d(1, 0, 0)) * osg::Quat(mYaw + mExtraYaw, osg::Vec3d(0, 0, 1));
+        osg::Vec3d forward = orient * osg::Vec3d(0, 1, 0);
+        osg::Vec3d up = orient * osg::Vec3d(0, 0, 1);
 
         osg::Vec3d pos = mPosition;
         if (mMode == Mode::FirstPerson)
@@ -143,7 +144,7 @@ namespace MWRender
             return;
 
         // only show the crosshair in game mode
-        MWBase::WindowManager *wm = MWBase::Environment::get().getWindowManager();
+        MWBase::WindowManager* wm = MWBase::Environment::get().getWindowManager();
         wm->showCrosshair(!wm->isGuiMode() && mShowCrosshair);
 
         updateFocalPointOffset(duration);
@@ -153,7 +154,8 @@ namespace MWRender
     osg::Vec3d Camera::calculateFirstPersonPosition(const osg::Vec3d& trackedPosition) const
     {
         osg::Vec3d res = trackedPosition;
-        osg::Vec2f horizontalOffset = Misc::rotateVec2f(osg::Vec2f(mFirstPersonOffset.x(), mFirstPersonOffset.y()), mYaw);
+        osg::Vec2f horizontalOffset
+            = Misc::rotateVec2f(osg::Vec2f(mFirstPersonOffset.x(), mFirstPersonOffset.y()), mYaw);
         res.x() += horizontalOffset.x();
         res.y() += horizontalOffset.y();
         res.z() += mFirstPersonOffset.z();
@@ -180,24 +182,28 @@ namespace MWRender
         // Adjust focal point to prevent clipping.
         osg::Vec3d focalOffset = getFocalPointOffset();
         osg::Vec3d focal = mTrackedPosition + focalOffset;
-        focalOffset.z() += 10.f;  // Needed to avoid camera clipping through the ceiling because
-                                  // character's head can be a bit higher than the collision area.
+        focalOffset.z() += 10.f; // Needed to avoid camera clipping through the ceiling because
+                                 // character's head can be a bit higher than the collision area.
         float offsetLen = focalOffset.length();
         if (offsetLen > 0)
         {
-            MWPhysics::RayCastingResult result = rayCasting->castSphere(focal - focalOffset, focal, focalObstacleLimit, mCollisionType);
+            MWPhysics::RayCastingResult result
+                = rayCasting->castSphere(focal - focalOffset, focal, focalObstacleLimit, mCollisionType);
             if (result.mHit)
             {
-                double adjustmentCoef = -(result.mHitPos + result.mHitNormal * focalObstacleLimit - focal).length() / offsetLen;
+                double adjustmentCoef
+                    = -(result.mHitPos + result.mHitNormal * focalObstacleLimit - focal).length() / offsetLen;
                 focal += focalOffset * std::max(-1.0, adjustmentCoef);
             }
         }
 
         // Adjust camera distance.
         mCameraDistance = mPreferredCameraDistance;
-        osg::Quat orient =  osg::Quat(mPitch + mExtraPitch, osg::Vec3d(1,0,0)) * osg::Quat(mYaw + mExtraYaw, osg::Vec3d(0,0,1));
+        osg::Quat orient
+            = osg::Quat(mPitch + mExtraPitch, osg::Vec3d(1, 0, 0)) * osg::Quat(mYaw + mExtraYaw, osg::Vec3d(0, 0, 1));
         osg::Vec3d offset = orient * osg::Vec3d(0.f, -mCameraDistance, 0.f);
-        MWPhysics::RayCastingResult result = rayCasting->castSphere(focal, focal + offset, cameraObstacleLimit, mCollisionType);
+        MWPhysics::RayCastingResult result
+            = rayCasting->castSphere(focal, focal + offset, cameraObstacleLimit, mCollisionType);
         if (result.mHit)
         {
             mCameraDistance = (result.mHitPos + result.mHitNormal * cameraObstacleLimit - focal).length();
@@ -212,7 +218,8 @@ namespace MWRender
         if (mMode == newMode)
             return;
         Mode oldMode = mMode;
-        if (!force && (newMode == Mode::FirstPerson || oldMode == Mode::FirstPerson) && mAnimation && !mAnimation->upperBodyReady())
+        if (!force && (newMode == Mode::FirstPerson || oldMode == Mode::FirstPerson) && mAnimation
+            && !mAnimation->upperBodyReady())
         {
             // Changing the view will stop all playing animations, so if we are playing
             // anything important, queue the view change for later
@@ -258,9 +265,10 @@ namespace MWRender
         if (mPreviousTransitionInfluence > 0)
         {
             mFocalPointCurrentOffset -= mPreviousExtraOffset;
-            mPreviousExtraOffset = mPreviousExtraOffset / mPreviousTransitionInfluence + mPreviousTransitionSpeed * duration;
-            mPreviousTransitionInfluence =
-                std::max(0.f, mPreviousTransitionInfluence - duration * mFocalPointTransitionSpeedCoef);
+            mPreviousExtraOffset
+                = mPreviousExtraOffset / mPreviousTransitionInfluence + mPreviousTransitionSpeed * duration;
+            mPreviousTransitionInfluence
+                = std::max(0.f, mPreviousTransitionInfluence - duration * mFocalPointTransitionSpeedCoef);
             mPreviousExtraOffset *= mPreviousTransitionInfluence;
             mFocalPointCurrentOffset += mPreviousExtraOffset;
         }
@@ -268,8 +276,8 @@ namespace MWRender
         osg::Vec2d delta = mFocalPointTargetOffset - mFocalPointCurrentOffset;
         if (delta.length2() > 0)
         {
-            float coef = duration * (1.0 + 5.0 / delta.length()) *
-                         mFocalPointTransitionSpeedCoef * (1.0f - mPreviousTransitionInfluence);
+            float coef = duration * (1.0 + 5.0 / delta.length()) * mFocalPointTransitionSpeedCoef
+                * (1.0f - mPreviousTransitionInfluence);
             mFocalPointCurrentOffset += delta * std::min(coef, 1.0f);
         }
         else
@@ -297,7 +305,7 @@ namespace MWRender
 
     void Camera::setSneakOffset(float offset)
     {
-        mAnimation->setFirstPersonOffset(osg::Vec3f(0,0,-offset));
+        mAnimation->setFirstPersonOffset(osg::Vec3f(0, 0, -offset));
     }
 
     void Camera::setYaw(float angle, bool force)
@@ -325,7 +333,7 @@ namespace MWRender
         mPosition = pos;
     }
 
-    void Camera::setAnimation(NpcAnimation *anim)
+    void Camera::setAnimation(NpcAnimation* anim)
     {
         mAnimation = anim;
         mProcessViewChange = true;
@@ -384,7 +392,7 @@ namespace MWRender
             float c = std::cos(mDeferredRotation.z());
             float x = movement.mPosition[0];
             float y = movement.mPosition[1];
-            movement.mPosition[0] = x *  c + y * s;
+            movement.mPosition[0] = x * c + y * s;
             movement.mPosition[1] = x * -s + y * c;
         }
     }
diff --git a/apps/openmw/mwrender/camera.hpp b/apps/openmw/mwrender/camera.hpp
index e17e63ddaf..627697620e 100644
--- a/apps/openmw/mwrender/camera.hpp
+++ b/apps/openmw/mwrender/camera.hpp
@@ -4,10 +4,10 @@
 #include <optional>
 #include <string>
 
-#include <osg/ref_ptr>
 #include <osg/Matrix>
 #include <osg/Vec3>
 #include <osg/Vec3d>
+#include <osg/ref_ptr>
 
 #include "../mwworld/ptr.hpp"
 
@@ -26,13 +26,20 @@ namespace MWRender
     class Camera
     {
     public:
-        enum class Mode : int {Static = 0, FirstPerson = 1, ThirdPerson = 2, Vanity = 3, Preview = 4};
+        enum class Mode : int
+        {
+            Static = 0,
+            FirstPerson = 1,
+            ThirdPerson = 2,
+            Vanity = 3,
+            Preview = 4
+        };
 
         Camera(osg::Camera* camera);
         ~Camera();
 
         /// Attach camera to object
-        void attachTo(const MWWorld::Ptr &ptr) { mTrackingPtr = ptr; }
+        void attachTo(const MWWorld::Ptr& ptr) { mTrackingPtr = ptr; }
         MWWorld::Ptr getTrackingPtr() const { return mTrackingPtr; }
 
         void setFocalPointTransitionSpeed(float v) { mFocalPointTransitionSpeedCoef = v; }
@@ -66,7 +73,7 @@ namespace MWRender
         void setExtraRoll(float angle) { mExtraRoll = angle; }
 
         /// @param Force view mode switch, even if currently not allowed by the animation.
-        void toggleViewMode(bool force=false);
+        void toggleViewMode(bool force = false);
         bool toggleVanityMode(bool enable);
 
         void applyDeferredPreviewRotationToPlayer(float dt);
@@ -77,12 +84,12 @@ namespace MWRender
 
         void processViewChange();
 
-        void update(float duration, bool paused=false);
+        void update(float duration, bool paused = false);
 
         float getCameraDistance() const { return mCameraDistance; }
         void setPreferredCameraDistance(float v) { mPreferredCameraDistance = v; }
 
-        void setAnimation(NpcAnimation *anim);
+        void setAnimation(NpcAnimation* anim);
 
         osg::Vec3d getTrackedPosition() const { return mTrackedPosition; }
         const osg::Vec3d& getPosition() const { return mPosition; }
@@ -112,7 +119,7 @@ namespace MWRender
 
         osg::ref_ptr<osg::Camera> mCamera;
 
-        NpcAnimation *mAnimation;
+        NpcAnimation* mAnimation;
 
         // Always 'true' if mMode == `FirstPerson`. Also it is 'true' in `Vanity` or `Preview` modes if
         // the camera should return to `FirstPerson` view after it.
@@ -134,7 +141,7 @@ namespace MWRender
 
         float mCameraDistance, mPreferredCameraDistance;
 
-        osg::Vec3f mFirstPersonOffset{0, 0, 0};
+        osg::Vec3f mFirstPersonOffset{ 0, 0, 0 };
 
         osg::Vec2d mFocalPointCurrentOffset;
         osg::Vec2d mFocalPointTargetOffset;
diff --git a/apps/openmw/mwrender/cell.hpp b/apps/openmw/mwrender/cell.hpp
index 8fa3f9f0f0..e6175f6ffd 100644
--- a/apps/openmw/mwrender/cell.hpp
+++ b/apps/openmw/mwrender/cell.hpp
@@ -7,28 +7,27 @@ namespace MWRender
 {
     class CellRender
     {
-        public:
+    public:
+        virtual ~CellRender(){};
 
-            virtual ~CellRender() {};
+        /// Make the cell visible. Load the cell if necessary.
+        virtual void show() = 0;
 
-            /// Make the cell visible. Load the cell if necessary.
-            virtual void show() = 0;
+        /// Remove the cell from rendering, but don't remove it from
+        /// memory.
+        virtual void hide() = 0;
 
-            /// Remove the cell from rendering, but don't remove it from
-            /// memory.
-            virtual void hide() = 0;
+        /// Destroy all rendering objects connected with this cell.
+        virtual void destroy() = 0;
 
-            /// Destroy all rendering objects connected with this cell.
-            virtual void destroy() = 0;
+        /// Make the reference with the given handle visible.
+        virtual void enable(const std::string& handle) = 0;
 
-            /// Make the reference with the given handle visible.
-            virtual void enable (const std::string& handle) = 0;
+        /// Make the reference with the given handle invisible.
+        virtual void disable(const std::string& handle) = 0;
 
-            /// Make the reference with the given handle invisible.
-            virtual void disable (const std::string& handle) = 0;
-
-            /// Remove the reference with the given handle permanently from the scene.
-            virtual void deleteObject (const std::string& handle) = 0;
+        /// Remove the reference with the given handle permanently from the scene.
+        virtual void deleteObject(const std::string& handle) = 0;
     };
 }
 
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 73bd9db484..452fd31188 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -2,29 +2,29 @@
 
 #include <cmath>
 
-#include <osg/Material>
-#include <osg/Fog>
 #include <osg/BlendFunc>
-#include <osg/TexEnvCombine>
-#include <osg/Texture2D>
 #include <osg/Camera>
-#include <osg/PositionAttitudeTransform>
+#include <osg/Fog>
 #include <osg/LightModel>
 #include <osg/LightSource>
+#include <osg/Material>
+#include <osg/PositionAttitudeTransform>
+#include <osg/TexEnvCombine>
+#include <osg/Texture2D>
 #include <osg/ValueObject>
 #include <osgUtil/IntersectionVisitor>
 #include <osgUtil/LineSegmentIntersector>
 
 #include <components/debug/debuglog.hpp>
 #include <components/fallback/fallback.hpp>
-#include <components/resource/scenemanager.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/resource/scenemanager.hpp>
+#include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/lightmanager.hpp>
-#include <components/sceneutil/shadow.hpp>
+#include <components/sceneutil/nodecallback.hpp>
 #include <components/sceneutil/rtt.hpp>
+#include <components/sceneutil/shadow.hpp>
 #include <components/settings/settings.hpp>
-#include <components/sceneutil/nodecallback.hpp>
-#include <components/sceneutil/depth.hpp>
 #include <components/stereo/multiview.hpp>
 
 #include "../mwbase/world.hpp"
@@ -50,7 +50,7 @@ namespace MWRender
         {
         }
 
-        void operator () (osg::Node* node, osg::NodeVisitor* nv)
+        void operator()(osg::Node* node, osg::NodeVisitor* nv)
         {
             if (!mRendered)
             {
@@ -65,7 +65,8 @@ namespace MWRender
                 nv->setFrameStamp(fs);
 
                 // Update keyframe controllers in the scene graph first...
-                // RTTNode does not continue update traversal, so manually continue the update traversal since we need it.
+                // RTTNode does not continue update traversal, so manually continue the update traversal since we need
+                // it.
                 mSubgraph->accept(*nv);
                 traverse(node, nv);
 
@@ -77,15 +78,9 @@ namespace MWRender
             }
         }
 
-        void redrawNextFrame()
-        {
-            mRendered = false;
-        }
+        void redrawNextFrame() { mRendered = false; }
 
-        unsigned int getLastRenderedFrame() const
-        {
-            return mLastRenderedFrame;
-        }
+        unsigned int getLastRenderedFrame() const { return mLastRenderedFrame; }
 
     private:
         bool mRendered;
@@ -93,13 +88,13 @@ namespace MWRender
         osg::ref_ptr<osg::Node> mSubgraph;
     };
 
-
     // Set up alpha blending mode to avoid issues caused by transparent objects writing onto the alpha value of the FBO
     // This makes the RTT have premultiplied alpha, though, so the source blend factor must be GL_ONE when it's applied
     class SetUpBlendVisitor : public osg::NodeVisitor
     {
     public:
-        SetUpBlendVisitor(): osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+        SetUpBlendVisitor()
+            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
         {
         }
 
@@ -108,9 +103,11 @@ namespace MWRender
             if (osg::ref_ptr<osg::StateSet> stateset = node.getStateSet())
             {
                 osg::ref_ptr<osg::StateSet> newStateSet;
-                if (stateset->getAttribute(osg::StateAttribute::BLENDFUNC) || stateset->getBinNumber() == osg::StateSet::TRANSPARENT_BIN)
+                if (stateset->getAttribute(osg::StateAttribute::BLENDFUNC)
+                    || stateset->getBinNumber() == osg::StateSet::TRANSPARENT_BIN)
                 {
-                    osg::BlendFunc* blendFunc = static_cast<osg::BlendFunc*>(stateset->getAttribute(osg::StateAttribute::BLENDFUNC));
+                    osg::BlendFunc* blendFunc
+                        = static_cast<osg::BlendFunc*>(stateset->getAttribute(osg::StateAttribute::BLENDFUNC));
 
                     if (blendFunc)
                     {
@@ -118,15 +115,19 @@ namespace MWRender
                         node.setStateSet(newStateSet);
                         osg::ref_ptr<osg::BlendFunc> newBlendFunc = new osg::BlendFunc(*blendFunc);
                         newStateSet->setAttribute(newBlendFunc, osg::StateAttribute::ON);
-                        // I *think* (based on some by-hand maths) that the RGB and dest alpha factors are unchanged, and only dest determines source alpha factor
-                        // This has the benefit of being idempotent if we assume nothing used glBlendFuncSeparate before we touched it
+                        // I *think* (based on some by-hand maths) that the RGB and dest alpha factors are unchanged,
+                        // and only dest determines source alpha factor This has the benefit of being idempotent if we
+                        // assume nothing used glBlendFuncSeparate before we touched it
                         if (blendFunc->getDestination() == osg::BlendFunc::ONE_MINUS_SRC_ALPHA)
                             newBlendFunc->setSourceAlpha(osg::BlendFunc::ONE);
                         else if (blendFunc->getDestination() == osg::BlendFunc::ONE)
                             newBlendFunc->setSourceAlpha(osg::BlendFunc::ZERO);
-                        // Other setups barely exist in the wild and aren't worth supporting as they're not equippable gear
+                        // Other setups barely exist in the wild and aren't worth supporting as they're not equippable
+                        // gear
                         else
-                            Log(Debug::Info) << "Unable to adjust blend mode for character preview. Source factor 0x" << std::hex << blendFunc->getSource() << ", destination factor 0x" << blendFunc->getDestination() << std::dec;
+                            Log(Debug::Info) << "Unable to adjust blend mode for character preview. Source factor 0x"
+                                             << std::hex << blendFunc->getSource() << ", destination factor 0x"
+                                             << blendFunc->getDestination() << std::dec;
                     }
                 }
                 if (stateset->getMode(GL_BLEND) & osg::StateAttribute::ON)
@@ -153,20 +154,22 @@ namespace MWRender
 
     public:
         CharacterPreviewRTTNode(uint32_t sizeX, uint32_t sizeY)
-            : RTTNode(sizeX, sizeY, Settings::Manager::getInt("antialiasing", "Video"), false, 0, StereoAwareness::Unaware_MultiViewShaders)
+            : RTTNode(sizeX, sizeY, Settings::Manager::getInt("antialiasing", "Video"), false, 0,
+                StereoAwareness::Unaware_MultiViewShaders)
             , mAspectRatio(static_cast<float>(sizeX) / static_cast<float>(sizeY))
         {
             if (SceneUtil::AutoDepth::isReversed())
-                mPerspectiveMatrix = static_cast<osg::Matrixf>(SceneUtil::getReversedZProjectionMatrixAsPerspective(fovYDegrees, mAspectRatio, znear, zfar));
+                mPerspectiveMatrix = static_cast<osg::Matrixf>(
+                    SceneUtil::getReversedZProjectionMatrixAsPerspective(fovYDegrees, mAspectRatio, znear, zfar));
             else
                 mPerspectiveMatrix = osg::Matrixf::perspective(fovYDegrees, mAspectRatio, znear, zfar);
             mGroup->getOrCreateStateSet()->addUniform(new osg::Uniform("projectionMatrix", mPerspectiveMatrix));
             mViewMatrix = osg::Matrixf::identity();
             setColorBufferInternalFormat(GL_RGBA);
             setDepthBufferInternalFormat(GL_DEPTH24_STENCIL8);
-        } 
+        }
 
-        void setDefaults(osg::Camera* camera) override 
+        void setDefaults(osg::Camera* camera) override
         {
             camera->setName("CharacterPreview");
             camera->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
@@ -184,9 +187,9 @@ namespace MWRender
             camera->addChild(mGroup);
         };
 
-        void apply(osg::Camera* camera) override 
+        void apply(osg::Camera* camera) override
         {
-            if(mCameraStateset)
+            if (mCameraStateset)
                 camera->setStateSet(mCameraStateset);
             camera->setViewMatrix(mViewMatrix);
 
@@ -194,20 +197,11 @@ namespace MWRender
                 Stereo::setMultiviewMatrices(mGroup->getOrCreateStateSet(), { mPerspectiveMatrix, mPerspectiveMatrix });
         };
 
-        void addChild(osg::Node* node)
-        {
-            mGroup->addChild(node);
-        }
+        void addChild(osg::Node* node) { mGroup->addChild(node); }
 
-        void setCameraStateset(osg::StateSet* stateset)
-        {
-            mCameraStateset = stateset;
-        }
+        void setCameraStateset(osg::StateSet* stateset) { mCameraStateset = stateset; }
 
-        void setViewMatrix(const osg::Matrixf& viewMatrix)
-        {
-            mViewMatrix = viewMatrix;
-        }
+        void setViewMatrix(const osg::Matrixf& viewMatrix) { mViewMatrix = viewMatrix; }
 
         osg::ref_ptr<osg::Group> mGroup = new osg::Group;
         osg::Matrixf mPerspectiveMatrix;
@@ -217,7 +211,7 @@ namespace MWRender
     };
 
     CharacterPreview::CharacterPreview(osg::Group* parent, Resource::ResourceSystem* resourceSystem,
-                                       const MWWorld::Ptr& character, int sizeX, int sizeY, const osg::Vec3f& position, const osg::Vec3f& lookAt)
+        const MWWorld::Ptr& character, int sizeX, int sizeY, const osg::Vec3f& position, const osg::Vec3f& lookAt)
         : mParent(parent)
         , mResourceSystem(resourceSystem)
         , mPosition(position)
@@ -242,10 +236,10 @@ namespace MWRender
         stateset->setMode(GL_LIGHTING, osg::StateAttribute::ON);
         stateset->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
         stateset->setMode(GL_CULL_FACE, osg::StateAttribute::ON);
-        osg::ref_ptr<osg::Material> defaultMat (new osg::Material);
+        osg::ref_ptr<osg::Material> defaultMat(new osg::Material);
         defaultMat->setColorMode(osg::Material::OFF);
-        defaultMat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
-        defaultMat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
+        defaultMat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1, 1, 1, 1));
+        defaultMat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1, 1, 1, 1));
         defaultMat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
         stateset->setAttribute(defaultMat);
 
@@ -253,17 +247,17 @@ namespace MWRender
 
         // assign large value to effectively turn off fog
         // shaders don't respect glDisable(GL_FOG)
-        osg::ref_ptr<osg::Fog> fog (new osg::Fog);
+        osg::ref_ptr<osg::Fog> fog(new osg::Fog);
         fog->setStart(10000000);
         fog->setEnd(10000000);
-        stateset->setAttributeAndModes(fog, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
+        stateset->setAttributeAndModes(fog, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE);
 
         // TODO: Clean up this mess of loose uniforms that shaders depend on.
         // turn off sky blending
         stateset->addUniform(new osg::Uniform("far", 10000000.0f));
         stateset->addUniform(new osg::Uniform("skyBlendingStart", 8000000.0f));
         stateset->addUniform(new osg::Uniform("sky", 0));
-        stateset->addUniform(new osg::Uniform("screenRes", osg::Vec2f{1, 1}));
+        stateset->addUniform(new osg::Uniform("screenRes", osg::Vec2f{ 1, 1 }));
 
         stateset->addUniform(new osg::Uniform("emissiveMult", 1.f));
 
@@ -299,19 +293,19 @@ namespace MWRender
         float positionX = -std::cos(azimuth) * std::sin(altitude);
         float positionY = std::sin(azimuth) * std::sin(altitude);
         float positionZ = std::cos(altitude);
-        light->setPosition(osg::Vec4(positionX,positionY,positionZ, 0.0));
-        light->setDiffuse(osg::Vec4(diffuseR,diffuseG,diffuseB,1));
-        osg::Vec4 ambientRGBA = osg::Vec4(ambientR,ambientG,ambientB,1);
+        light->setPosition(osg::Vec4(positionX, positionY, positionZ, 0.0));
+        light->setDiffuse(osg::Vec4(diffuseR, diffuseG, diffuseB, 1));
+        osg::Vec4 ambientRGBA = osg::Vec4(ambientR, ambientG, ambientB, 1);
         if (mResourceSystem->getSceneManager()->getForceShaders())
         {
             // When using shaders, we now skip the ambient sun calculation as this is the only place it's used.
             // Using the scene ambient will give identical results.
             lightmodel->setAmbientIntensity(ambientRGBA);
-            light->setAmbient(osg::Vec4(0,0,0,1));
+            light->setAmbient(osg::Vec4(0, 0, 0, 1));
         }
         else
             light->setAmbient(ambientRGBA);
-        light->setSpecular(osg::Vec4(0,0,0,0));
+        light->setSpecular(osg::Vec4(0, 0, 0, 0));
         light->setLightNum(0);
         light->setConstantAttenuation(1.f);
         light->setLinearAttenuation(0.f);
@@ -338,7 +332,7 @@ namespace MWRender
         mCharacter.mCell = nullptr;
     }
 
-    CharacterPreview::~CharacterPreview ()
+    CharacterPreview::~CharacterPreview()
     {
         mParent->removeChild(mRTTNode);
     }
@@ -374,7 +368,7 @@ namespace MWRender
         mAnimation = nullptr;
 
         mAnimation = new NpcAnimation(mCharacter, mNode, mResourceSystem, true,
-                                      (renderHeadOnly() ? NpcAnimation::VM_HeadOnly : NpcAnimation::VM_Normal));
+            (renderHeadOnly() ? NpcAnimation::VM_HeadOnly : NpcAnimation::VM_Normal));
 
         onSetup();
 
@@ -389,9 +383,9 @@ namespace MWRender
 
     // --------------------------------------------------------------------------------------------------
 
-
-    InventoryPreview::InventoryPreview(osg::Group* parent, Resource::ResourceSystem* resourceSystem, const MWWorld::Ptr& character)
-        : CharacterPreview(parent, resourceSystem, character, 512, 1024, osg::Vec3f(0, 700, 71), osg::Vec3f(0,0,71))
+    InventoryPreview::InventoryPreview(
+        osg::Group* parent, Resource::ResourceSystem* resourceSystem, const MWWorld::Ptr& character)
+        : CharacterPreview(parent, resourceSystem, character, 512, 1024, osg::Vec3f(0, 700, 71), osg::Vec3f(0, 0, 71))
     {
     }
 
@@ -402,7 +396,7 @@ namespace MWRender
 
         // NB Camera::setViewport has threading issues
         osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
-        mViewport = new osg::Viewport(0, mSizeY-sizeY, std::min(mSizeX, sizeX), std::min(mSizeY, sizeY));
+        mViewport = new osg::Viewport(0, mSizeY - sizeY, std::min(mSizeX, sizeX), std::min(mSizeY, sizeY));
         stateset->setAttributeAndModes(mViewport);
         mRTTNode->setCameraStateset(stateset);
 
@@ -417,16 +411,16 @@ namespace MWRender
         mAnimation->showWeapons(true);
         mAnimation->updateParts();
 
-        MWWorld::InventoryStore &inv = mCharacter.getClass().getInventoryStore(mCharacter);
+        MWWorld::InventoryStore& inv = mCharacter.getClass().getInventoryStore(mCharacter);
         MWWorld::ContainerStoreIterator iter = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
         std::string groupname = "inventoryhandtohand";
         bool showCarriedLeft = true;
-        if(iter != inv.end())
+        if (iter != inv.end())
         {
             groupname = "inventoryweapononehand";
-            if(iter->getType() == ESM::Weapon::sRecordId)
+            if (iter->getType() == ESM::Weapon::sRecordId)
             {
-                MWWorld::LiveCellRef<ESM::Weapon> *ref = iter->get<ESM::Weapon>();
+                MWWorld::LiveCellRef<ESM::Weapon>* ref = iter->get<ESM::Weapon>();
                 int type = ref->mBase->mData.mType;
                 const ESM::WeaponType* weaponInfo = MWMechanics::getWeaponType(type);
                 showCarriedLeft = !(weaponInfo->mFlags & ESM::WeaponType::TwoHanded);
@@ -439,16 +433,19 @@ namespace MWRender
                     groupname = inventoryGroup;
                 else
                 {
-                    static const std::string oneHandFallback = "inventory" + MWMechanics::getWeaponType(ESM::Weapon::LongBladeOneHand)->mLongGroup;
-                    static const std::string twoHandFallback = "inventory" + MWMechanics::getWeaponType(ESM::Weapon::LongBladeTwoHand)->mLongGroup;
+                    static const std::string oneHandFallback
+                        = "inventory" + MWMechanics::getWeaponType(ESM::Weapon::LongBladeOneHand)->mLongGroup;
+                    static const std::string twoHandFallback
+                        = "inventory" + MWMechanics::getWeaponType(ESM::Weapon::LongBladeTwoHand)->mLongGroup;
 
                     // For real two-handed melee weapons use 2h swords animations as fallback, otherwise use the 1h ones
-                    if (weaponInfo->mFlags & ESM::WeaponType::TwoHanded && weaponInfo->mWeaponClass == ESM::WeaponType::Melee)
+                    if (weaponInfo->mFlags & ESM::WeaponType::TwoHanded
+                        && weaponInfo->mWeaponClass == ESM::WeaponType::Melee)
                         groupname = twoHandFallback;
                     else
                         groupname = oneHandFallback;
                 }
-           }
+            }
         }
 
         mAnimation->showCarriedLeft(showCarriedLeft);
@@ -457,13 +454,13 @@ namespace MWRender
         mAnimation->play(mCurrentAnimGroup, 1, Animation::BlendMask_All, false, 1.0f, "start", "stop", 0.0f, 0);
 
         MWWorld::ConstContainerStoreIterator torch = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
-        if(torch != inv.end() && torch->getType() == ESM::Light::sRecordId && showCarriedLeft)
+        if (torch != inv.end() && torch->getType() == ESM::Light::sRecordId && showCarriedLeft)
         {
-            if(!mAnimation->getInfo("torch"))
-                mAnimation->play("torch", 2, Animation::BlendMask_LeftArm, false,
-                                 1.0f, "start", "stop", 0.0f, ~0ul, true);
+            if (!mAnimation->getInfo("torch"))
+                mAnimation->play(
+                    "torch", 2, Animation::BlendMask_LeftArm, false, 1.0f, "start", "stop", 0.0f, ~0ul, true);
         }
-        else if(mAnimation->getInfo("torch"))
+        else if (mAnimation->getInfo("torch"))
             mAnimation->disable("torch");
 
         mAnimation->runAnimation(0.0f);
@@ -473,7 +470,7 @@ namespace MWRender
         redraw();
     }
 
-    int InventoryPreview::getSlotSelected (int posX, int posY)
+    int InventoryPreview::getSlotSelected(int posX, int posY)
     {
         if (!mViewport)
             return -1;
@@ -483,12 +480,14 @@ namespace MWRender
         // precision issue - compiling with OSG_USE_FLOAT_MATRIX=0, Intersector::WINDOW works ok.
         // Using Intersector::PROJECTION results in better precision because the start/end points and the model matrices
         // don't go through as many transformations.
-        osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector (new osgUtil::LineSegmentIntersector(osgUtil::Intersector::PROJECTION, projX, projY));
+        osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector(
+            new osgUtil::LineSegmentIntersector(osgUtil::Intersector::PROJECTION, projX, projY));
 
         intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::LIMIT_NEAREST);
         osgUtil::IntersectionVisitor visitor(intersector);
         visitor.setTraversalMode(osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN);
-        // Set the traversal number from the last draw, so that the frame switch used for RigGeometry double buffering works correctly
+        // Set the traversal number from the last draw, so that the frame switch used for RigGeometry double buffering
+        // works correctly
         visitor.setTraversalNumber(mDrawOnceCallback->getLastRenderedFrame());
 
         auto* camera = mRTTNode->getCamera(nullptr);
@@ -505,7 +504,7 @@ namespace MWRender
         return -1;
     }
 
-    void InventoryPreview::updatePtr(const MWWorld::Ptr &ptr)
+    void InventoryPreview::updatePtr(const MWWorld::Ptr& ptr)
     {
         mCharacter = MWWorld::Ptr(ptr.getBase(), nullptr);
     }
@@ -513,7 +512,7 @@ namespace MWRender
     void InventoryPreview::onSetup()
     {
         CharacterPreview::onSetup();
-        osg::Vec3f scale (1.f, 1.f, 1.f);
+        osg::Vec3f scale(1.f, 1.f, 1.f);
         mCharacter.getClass().adjustScale(mCharacter, scale, true);
 
         mNode->setScale(scale);
@@ -525,27 +524,24 @@ namespace MWRender
     // --------------------------------------------------------------------------------------------------
 
     RaceSelectionPreview::RaceSelectionPreview(osg::Group* parent, Resource::ResourceSystem* resourceSystem)
-        : CharacterPreview(parent, resourceSystem, MWMechanics::getPlayer(),
-            512, 512, osg::Vec3f(0, 125, 8), osg::Vec3f(0,0,8))
-        , mBase (*mCharacter.get<ESM::NPC>()->mBase)
+        : CharacterPreview(
+            parent, resourceSystem, MWMechanics::getPlayer(), 512, 512, osg::Vec3f(0, 125, 8), osg::Vec3f(0, 0, 8))
+        , mBase(*mCharacter.get<ESM::NPC>()->mBase)
         , mRef(&mBase)
         , mPitchRadians(osg::DegreesToRadians(6.f))
     {
         mCharacter = MWWorld::Ptr(&mRef, nullptr);
     }
 
-    RaceSelectionPreview::~RaceSelectionPreview()
-    {
-    }
+    RaceSelectionPreview::~RaceSelectionPreview() {}
 
     void RaceSelectionPreview::setAngle(float angleRadians)
     {
-        mNode->setAttitude(osg::Quat(mPitchRadians, osg::Vec3(1,0,0))
-                * osg::Quat(angleRadians, osg::Vec3(0,0,1)));
+        mNode->setAttitude(osg::Quat(mPitchRadians, osg::Vec3(1, 0, 0)) * osg::Quat(angleRadians, osg::Vec3(0, 0, 1)));
         redraw();
     }
 
-    void RaceSelectionPreview::setPrototype(const ESM::NPC &proto)
+    void RaceSelectionPreview::setPrototype(const ESM::NPC& proto)
     {
         mBase = proto;
         mBase.mId = "player";
@@ -555,7 +551,8 @@ namespace MWRender
     class UpdateCameraCallback : public SceneUtil::NodeCallback<UpdateCameraCallback, CharacterPreviewRTTNode*>
     {
     public:
-        UpdateCameraCallback(osg::ref_ptr<const osg::Node> nodeToFollow, const osg::Vec3& posOffset, const osg::Vec3& lookAtOffset)
+        UpdateCameraCallback(
+            osg::ref_ptr<const osg::Node> nodeToFollow, const osg::Vec3& posOffset, const osg::Vec3& lookAtOffset)
             : mNodeToFollow(nodeToFollow)
             , mPosOffset(posOffset)
             , mLookAtOffset(lookAtOffset)
@@ -574,7 +571,8 @@ namespace MWRender
             osg::Matrix worldMat = osg::computeLocalToWorld(nodepaths[0]);
             osg::Vec3 headOffset = worldMat.getTrans();
 
-            auto viewMatrix = osg::Matrixf::lookAt(headOffset + mPosOffset, headOffset + mLookAtOffset, osg::Vec3(0, 0, 1));
+            auto viewMatrix
+                = osg::Matrixf::lookAt(headOffset + mPosOffset, headOffset + mLookAtOffset, osg::Vec3(0, 0, 1));
             node->setViewMatrix(viewMatrix);
         }
 
@@ -584,7 +582,7 @@ namespace MWRender
         osg::Vec3 mLookAtOffset;
     };
 
-    void RaceSelectionPreview::onSetup ()
+    void RaceSelectionPreview::onSetup()
     {
         CharacterPreview::onSetup();
         mAnimation->play("idle", 1, Animation::BlendMask_All, false, 1.0f, "start", "stop", 0.0f, 0);
diff --git a/apps/openmw/mwrender/characterpreview.hpp b/apps/openmw/mwrender/characterpreview.hpp
index a8777d8548..e2ab53bef6 100644
--- a/apps/openmw/mwrender/characterpreview.hpp
+++ b/apps/openmw/mwrender/characterpreview.hpp
@@ -1,8 +1,8 @@
 #ifndef MWRENDER_CHARACTERPREVIEW_H
 #define MWRENDER_CHARACTERPREVIEW_H
 
-#include <osg/ref_ptr>
 #include <memory>
+#include <osg/ref_ptr>
 
 #include <osg/PositionAttitudeTransform>
 
@@ -31,8 +31,8 @@ namespace MWRender
     class CharacterPreview
     {
     public:
-        CharacterPreview(osg::Group* parent, Resource::ResourceSystem* resourceSystem, const MWWorld::Ptr& character, int sizeX, int sizeY,
-                         const osg::Vec3f& position, const osg::Vec3f& lookAt);
+        CharacterPreview(osg::Group* parent, Resource::ResourceSystem* resourceSystem, const MWWorld::Ptr& character,
+            int sizeX, int sizeY, const osg::Vec3f& position, const osg::Vec3f& lookAt);
         virtual ~CharacterPreview();
 
         int getTextureWidth() const;
@@ -77,7 +77,6 @@ namespace MWRender
     class InventoryPreview : public CharacterPreview
     {
     public:
-
         InventoryPreview(osg::Group* parent, Resource::ResourceSystem* resourceSystem, const MWWorld::Ptr& character);
 
         void updatePtr(const MWWorld::Ptr& ptr);
@@ -97,11 +96,10 @@ namespace MWRender
 
     class RaceSelectionPreview : public CharacterPreview
     {
-        ESM::NPC                        mBase;
-        MWWorld::LiveCellRef<ESM::NPC>  mRef;
+        ESM::NPC mBase;
+        MWWorld::LiveCellRef<ESM::NPC> mRef;
 
     protected:
-
         bool renderHeadOnly() override { return true; }
         void onSetup() override;
 
@@ -111,14 +109,11 @@ namespace MWRender
 
         void setAngle(float angleRadians);
 
-        const ESM::NPC &getPrototype() const {
-            return mBase;
-        }
+        const ESM::NPC& getPrototype() const { return mBase; }
 
-        void setPrototype(const ESM::NPC &proto);
+        void setPrototype(const ESM::NPC& proto);
 
     private:
-
         osg::ref_ptr<UpdateCameraCallback> mUpdateCameraCallback;
 
         float mPitchRadians;
diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index e3c777674e..9175cb0f04 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -2,14 +2,14 @@
 
 #include <osg/MatrixTransform>
 
-#include <components/esm3/loadcrea.hpp>
 #include <components/debug/debuglog.hpp>
+#include <components/esm3/loadcrea.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/attach.hpp>
-#include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/sceneutil/skeleton.hpp>
+#include <components/sceneutil/visitor.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -23,251 +23,253 @@
 namespace MWRender
 {
 
-CreatureAnimation::CreatureAnimation(const MWWorld::Ptr &ptr,
-                                     const std::string& model, Resource::ResourceSystem* resourceSystem)
-  : ActorAnimation(ptr, osg::ref_ptr<osg::Group>(ptr.getRefData().getBaseNode()), resourceSystem)
-{
-    MWWorld::LiveCellRef<ESM::Creature> *ref = mPtr.get<ESM::Creature>();
-
-    if(!model.empty())
+    CreatureAnimation::CreatureAnimation(
+        const MWWorld::Ptr& ptr, const std::string& model, Resource::ResourceSystem* resourceSystem)
+        : ActorAnimation(ptr, osg::ref_ptr<osg::Group>(ptr.getRefData().getBaseNode()), resourceSystem)
     {
-        setObjectRoot(model, false, false, true);
-
-        if((ref->mBase->mFlags&ESM::Creature::Bipedal))
-            addAnimSource(Settings::Manager::getString("xbaseanim", "Models"), model);
-        addAnimSource(model, model);
-    }
-}
+        MWWorld::LiveCellRef<ESM::Creature>* ref = mPtr.get<ESM::Creature>();
 
+        if (!model.empty())
+        {
+            setObjectRoot(model, false, false, true);
 
-CreatureWeaponAnimation::CreatureWeaponAnimation(const MWWorld::Ptr &ptr, const std::string& model, Resource::ResourceSystem* resourceSystem)
-    : ActorAnimation(ptr, osg::ref_ptr<osg::Group>(ptr.getRefData().getBaseNode()), resourceSystem)
-    , mShowWeapons(false)
-    , mShowCarriedLeft(false)
-{
-    MWWorld::LiveCellRef<ESM::Creature> *ref = mPtr.get<ESM::Creature>();
+            if ((ref->mBase->mFlags & ESM::Creature::Bipedal))
+                addAnimSource(Settings::Manager::getString("xbaseanim", "Models"), model);
+            addAnimSource(model, model);
+        }
+    }
 
-    if(!model.empty())
+    CreatureWeaponAnimation::CreatureWeaponAnimation(
+        const MWWorld::Ptr& ptr, const std::string& model, Resource::ResourceSystem* resourceSystem)
+        : ActorAnimation(ptr, osg::ref_ptr<osg::Group>(ptr.getRefData().getBaseNode()), resourceSystem)
+        , mShowWeapons(false)
+        , mShowCarriedLeft(false)
     {
-        setObjectRoot(model, true, false, true);
+        MWWorld::LiveCellRef<ESM::Creature>* ref = mPtr.get<ESM::Creature>();
 
-        if((ref->mBase->mFlags&ESM::Creature::Bipedal))
+        if (!model.empty())
         {
-            addAnimSource(Settings::Manager::getString("xbaseanim", "Models"), model);
-        }
-        addAnimSource(model, model);
+            setObjectRoot(model, true, false, true);
 
-        mPtr.getClass().getInventoryStore(mPtr).setInvListener(this, mPtr);
+            if ((ref->mBase->mFlags & ESM::Creature::Bipedal))
+            {
+                addAnimSource(Settings::Manager::getString("xbaseanim", "Models"), model);
+            }
+            addAnimSource(model, model);
 
-        updateParts();
-    }
+            mPtr.getClass().getInventoryStore(mPtr).setInvListener(this, mPtr);
 
-    mWeaponAnimationTime = std::make_shared<WeaponAnimationTime>(this);
-}
+            updateParts();
+        }
 
-void CreatureWeaponAnimation::showWeapons(bool showWeapon)
-{
-    if (showWeapon != mShowWeapons)
-    {
-        mShowWeapons = showWeapon;
-        updateParts();
+        mWeaponAnimationTime = std::make_shared<WeaponAnimationTime>(this);
     }
-}
 
-void CreatureWeaponAnimation::showCarriedLeft(bool show)
-{
-    if (show != mShowCarriedLeft)
+    void CreatureWeaponAnimation::showWeapons(bool showWeapon)
     {
-        mShowCarriedLeft = show;
-        updateParts();
+        if (showWeapon != mShowWeapons)
+        {
+            mShowWeapons = showWeapon;
+            updateParts();
+        }
     }
-}
-
-void CreatureWeaponAnimation::updateParts()
-{
-    mAmmunition.reset();
-    mWeapon.reset();
-    mShield.reset();
-
-    updateHolsteredWeapon(!mShowWeapons);
-    updateQuiver();
-    updateHolsteredShield(mShowCarriedLeft);
-
-    if (mShowWeapons)
-        updatePart(mWeapon, MWWorld::InventoryStore::Slot_CarriedRight);
-    if (mShowCarriedLeft)
-        updatePart(mShield, MWWorld::InventoryStore::Slot_CarriedLeft);
-}
 
-void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
-{
-    if (!mObjectRoot)
-        return;
-
-    const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
-    MWWorld::ConstContainerStoreIterator it = inv.getSlot(slot);
+    void CreatureWeaponAnimation::showCarriedLeft(bool show)
+    {
+        if (show != mShowCarriedLeft)
+        {
+            mShowCarriedLeft = show;
+            updateParts();
+        }
+    }
 
-    if (it == inv.end())
+    void CreatureWeaponAnimation::updateParts()
     {
-        scene.reset();
-        return;
+        mAmmunition.reset();
+        mWeapon.reset();
+        mShield.reset();
+
+        updateHolsteredWeapon(!mShowWeapons);
+        updateQuiver();
+        updateHolsteredShield(mShowCarriedLeft);
+
+        if (mShowWeapons)
+            updatePart(mWeapon, MWWorld::InventoryStore::Slot_CarriedRight);
+        if (mShowCarriedLeft)
+            updatePart(mShield, MWWorld::InventoryStore::Slot_CarriedLeft);
     }
-    MWWorld::ConstPtr item = *it;
 
-    std::string_view bonename;
-    std::string itemModel = item.getClass().getModel(item);
-    if (slot == MWWorld::InventoryStore::Slot_CarriedRight)
+    void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
     {
-        if(item.getType() == ESM::Weapon::sRecordId)
+        if (!mObjectRoot)
+            return;
+
+        const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
+        MWWorld::ConstContainerStoreIterator it = inv.getSlot(slot);
+
+        if (it == inv.end())
         {
-            int type = item.get<ESM::Weapon>()->mBase->mData.mType;
-            bonename = MWMechanics::getWeaponType(type)->mAttachBone;
-            if (bonename != "Weapon Bone")
+            scene.reset();
+            return;
+        }
+        MWWorld::ConstPtr item = *it;
+
+        std::string_view bonename;
+        std::string itemModel = item.getClass().getModel(item);
+        if (slot == MWWorld::InventoryStore::Slot_CarriedRight)
+        {
+            if (item.getType() == ESM::Weapon::sRecordId)
             {
-                const NodeMap& nodeMap = getNodeMap();
-                NodeMap::const_iterator found = nodeMap.find(bonename);
-                if (found == nodeMap.end())
-                    bonename = "Weapon Bone";
+                int type = item.get<ESM::Weapon>()->mBase->mData.mType;
+                bonename = MWMechanics::getWeaponType(type)->mAttachBone;
+                if (bonename != "Weapon Bone")
+                {
+                    const NodeMap& nodeMap = getNodeMap();
+                    NodeMap::const_iterator found = nodeMap.find(bonename);
+                    if (found == nodeMap.end())
+                        bonename = "Weapon Bone";
+                }
             }
+            else
+                bonename = "Weapon Bone";
         }
         else
-            bonename = "Weapon Bone";
-    }
-    else
-    {
-        bonename = "Shield Bone";
-        if (item.getType() == ESM::Armor::sRecordId)
         {
-            itemModel = getShieldMesh(item, false);
+            bonename = "Shield Bone";
+            if (item.getType() == ESM::Armor::sRecordId)
+            {
+                itemModel = getShieldMesh(item, false);
+            }
         }
-    }
 
-    try
-    {
-        osg::ref_ptr<osg::Node> attached = attach(itemModel, bonename, bonename, item.getType() == ESM::Light::sRecordId);
+        try
+        {
+            osg::ref_ptr<osg::Node> attached
+                = attach(itemModel, bonename, bonename, item.getType() == ESM::Light::sRecordId);
 
-        scene = std::make_unique<PartHolder>(attached);
+            scene = std::make_unique<PartHolder>(attached);
 
-        if (!item.getClass().getEnchantment(item).empty())
-            mGlowUpdater = SceneUtil::addEnchantedGlow(attached, mResourceSystem, item.getClass().getEnchantmentColor(item));
+            if (!item.getClass().getEnchantment(item).empty())
+                mGlowUpdater
+                    = SceneUtil::addEnchantedGlow(attached, mResourceSystem, item.getClass().getEnchantmentColor(item));
 
-        // Crossbows start out with a bolt attached
-        // FIXME: code duplicated from NpcAnimation
-        if (slot == MWWorld::InventoryStore::Slot_CarriedRight &&
-                item.getType() == ESM::Weapon::sRecordId &&
-                item.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow)
-        {
-            const ESM::WeaponType* weaponInfo = MWMechanics::getWeaponType(ESM::Weapon::MarksmanCrossbow);
-            MWWorld::ConstContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
-            if (ammo != inv.end() && ammo->get<ESM::Weapon>()->mBase->mData.mType == weaponInfo->mAmmoType)
-                attachArrow();
+            // Crossbows start out with a bolt attached
+            // FIXME: code duplicated from NpcAnimation
+            if (slot == MWWorld::InventoryStore::Slot_CarriedRight && item.getType() == ESM::Weapon::sRecordId
+                && item.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow)
+            {
+                const ESM::WeaponType* weaponInfo = MWMechanics::getWeaponType(ESM::Weapon::MarksmanCrossbow);
+                MWWorld::ConstContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
+                if (ammo != inv.end() && ammo->get<ESM::Weapon>()->mBase->mData.mType == weaponInfo->mAmmoType)
+                    attachArrow();
+                else
+                    mAmmunition.reset();
+            }
             else
                 mAmmunition.reset();
-        }
-        else
-            mAmmunition.reset();
 
-        std::shared_ptr<SceneUtil::ControllerSource> source;
+            std::shared_ptr<SceneUtil::ControllerSource> source;
 
-        if (slot == MWWorld::InventoryStore::Slot_CarriedRight)
-            source = mWeaponAnimationTime;
-        else
-            source = std::make_shared<NullAnimationTime>();
+            if (slot == MWWorld::InventoryStore::Slot_CarriedRight)
+                source = mWeaponAnimationTime;
+            else
+                source = std::make_shared<NullAnimationTime>();
 
-        SceneUtil::AssignControllerSourcesVisitor assignVisitor(source);
-        attached->accept(assignVisitor);
+            SceneUtil::AssignControllerSourcesVisitor assignVisitor(source);
+            attached->accept(assignVisitor);
+        }
+        catch (std::exception& e)
+        {
+            Log(Debug::Error) << "Can not add creature part: " << e.what();
+        }
     }
-    catch (std::exception& e)
+
+    bool CreatureWeaponAnimation::isArrowAttached() const
     {
-        Log(Debug::Error) << "Can not add creature part: " << e.what();
+        return mAmmunition != nullptr;
     }
-}
 
-bool CreatureWeaponAnimation::isArrowAttached() const
-{
-    return mAmmunition != nullptr;
-}
+    void CreatureWeaponAnimation::detachArrow()
+    {
+        WeaponAnimation::detachArrow(mPtr);
+        updateQuiver();
+    }
 
-void CreatureWeaponAnimation::detachArrow()
-{
-    WeaponAnimation::detachArrow(mPtr);
-    updateQuiver();
-}
+    void CreatureWeaponAnimation::attachArrow()
+    {
+        WeaponAnimation::attachArrow(mPtr);
 
-void CreatureWeaponAnimation::attachArrow()
-{
-    WeaponAnimation::attachArrow(mPtr);
+        const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
+        MWWorld::ConstContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
+        if (ammo != inv.end() && !ammo->getClass().getEnchantment(*ammo).empty())
+        {
+            osg::Group* bone = getArrowBone();
+            if (bone != nullptr && bone->getNumChildren())
+                SceneUtil::addEnchantedGlow(
+                    bone->getChild(0), mResourceSystem, ammo->getClass().getEnchantmentColor(*ammo));
+        }
 
-    const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
-    MWWorld::ConstContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
-    if (ammo != inv.end() && !ammo->getClass().getEnchantment(*ammo).empty())
-    {
-        osg::Group* bone = getArrowBone();
-        if (bone != nullptr && bone->getNumChildren())
-            SceneUtil::addEnchantedGlow(bone->getChild(0), mResourceSystem, ammo->getClass().getEnchantmentColor(*ammo));
+        updateQuiver();
     }
 
-    updateQuiver();
-}
+    void CreatureWeaponAnimation::releaseArrow(float attackStrength)
+    {
+        WeaponAnimation::releaseArrow(mPtr, attackStrength);
+        updateQuiver();
+    }
 
-void CreatureWeaponAnimation::releaseArrow(float attackStrength)
-{
-    WeaponAnimation::releaseArrow(mPtr, attackStrength);
-    updateQuiver();
-}
+    osg::Group* CreatureWeaponAnimation::getArrowBone()
+    {
+        if (!mWeapon)
+            return nullptr;
 
-osg::Group *CreatureWeaponAnimation::getArrowBone()
-{
-    if (!mWeapon)
-        return nullptr;
+        if (!mPtr.getClass().hasInventoryStore(mPtr))
+            return nullptr;
 
-    if (!mPtr.getClass().hasInventoryStore(mPtr))
-        return nullptr;
+        const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
+        MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+        if (weapon == inv.end() || weapon->getType() != ESM::Weapon::sRecordId)
+            return nullptr;
 
-    const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
-    MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-    if(weapon == inv.end() || weapon->getType() != ESM::Weapon::sRecordId)
-        return nullptr;
+        int type = weapon->get<ESM::Weapon>()->mBase->mData.mType;
+        int ammoType = MWMechanics::getWeaponType(type)->mAmmoType;
+        if (ammoType == ESM::Weapon::None)
+            return nullptr;
 
-    int type = weapon->get<ESM::Weapon>()->mBase->mData.mType;
-    int ammoType = MWMechanics::getWeaponType(type)->mAmmoType;
-    if (ammoType == ESM::Weapon::None)
-        return nullptr;
+        // Try to find and attachment bone in actor's skeleton, otherwise fall back to the ArrowBone in weapon's mesh
+        osg::Group* bone = getBoneByName(MWMechanics::getWeaponType(ammoType)->mAttachBone);
+        if (bone == nullptr)
+        {
+            SceneUtil::FindByNameVisitor findVisitor("ArrowBone");
+            mWeapon->getNode()->accept(findVisitor);
+            bone = findVisitor.mFoundNode;
+        }
+        return bone;
+    }
 
-    // Try to find and attachment bone in actor's skeleton, otherwise fall back to the ArrowBone in weapon's mesh
-    osg::Group* bone = getBoneByName(MWMechanics::getWeaponType(ammoType)->mAttachBone);
-    if (bone == nullptr)
+    osg::Node* CreatureWeaponAnimation::getWeaponNode()
     {
-        SceneUtil::FindByNameVisitor findVisitor ("ArrowBone");
-        mWeapon->getNode()->accept(findVisitor);
-        bone = findVisitor.mFoundNode;
+        return mWeapon ? mWeapon->getNode().get() : nullptr;
     }
-    return bone;
-}
-
-osg::Node *CreatureWeaponAnimation::getWeaponNode()
-{
-    return mWeapon ? mWeapon->getNode().get() : nullptr;
-}
 
-Resource::ResourceSystem *CreatureWeaponAnimation::getResourceSystem()
-{
-    return mResourceSystem;
-}
+    Resource::ResourceSystem* CreatureWeaponAnimation::getResourceSystem()
+    {
+        return mResourceSystem;
+    }
 
-void CreatureWeaponAnimation::addControllers()
-{
-    Animation::addControllers();
-    WeaponAnimation::addControllers(mNodeMap, mActiveControllers, mObjectRoot.get());
-}
+    void CreatureWeaponAnimation::addControllers()
+    {
+        Animation::addControllers();
+        WeaponAnimation::addControllers(mNodeMap, mActiveControllers, mObjectRoot.get());
+    }
 
-osg::Vec3f CreatureWeaponAnimation::runAnimation(float duration)
-{
-    osg::Vec3f ret = Animation::runAnimation(duration);
+    osg::Vec3f CreatureWeaponAnimation::runAnimation(float duration)
+    {
+        osg::Vec3f ret = Animation::runAnimation(duration);
 
-    WeaponAnimation::configureControllers(mPtr.getRefData().getPosition().rot[0] + getBodyPitchRadians());
+        WeaponAnimation::configureControllers(mPtr.getRefData().getPosition().rot[0] + getBodyPitchRadians());
 
-    return ret;
-}
+        return ret;
+    }
 
 }
diff --git a/apps/openmw/mwrender/creatureanimation.hpp b/apps/openmw/mwrender/creatureanimation.hpp
index 8722539d6b..3342fb3967 100644
--- a/apps/openmw/mwrender/creatureanimation.hpp
+++ b/apps/openmw/mwrender/creatureanimation.hpp
@@ -1,9 +1,9 @@
 #ifndef GAME_RENDER_CREATUREANIMATION_H
 #define GAME_RENDER_CREATUREANIMATION_H
 
+#include "../mwworld/inventorystore.hpp"
 #include "actoranimation.hpp"
 #include "weaponanimation.hpp"
-#include "../mwworld/inventorystore.hpp"
 
 namespace MWWorld
 {
@@ -15,17 +15,20 @@ namespace MWRender
     class CreatureAnimation : public ActorAnimation
     {
     public:
-        CreatureAnimation(const MWWorld::Ptr &ptr, const std::string& model, Resource::ResourceSystem* resourceSystem);
+        CreatureAnimation(const MWWorld::Ptr& ptr, const std::string& model, Resource::ResourceSystem* resourceSystem);
         virtual ~CreatureAnimation() {}
     };
 
     // For creatures with weapons and shields
     // Animation is already virtual anyway, so might as well make a separate class.
     // Most creatures don't need weapons/shields, so this will save some memory.
-    class CreatureWeaponAnimation : public ActorAnimation, public WeaponAnimation, public MWWorld::InventoryStoreListener
+    class CreatureWeaponAnimation : public ActorAnimation,
+                                    public WeaponAnimation,
+                                    public MWWorld::InventoryStoreListener
     {
     public:
-        CreatureWeaponAnimation(const MWWorld::Ptr &ptr, const std::string& model, Resource::ResourceSystem* resourceSystem);
+        CreatureWeaponAnimation(
+            const MWWorld::Ptr& ptr, const std::string& model, Resource::ResourceSystem* resourceSystem);
         virtual ~CreatureWeaponAnimation() {}
 
         void equipmentChanged() override { updateParts(); }
@@ -48,7 +51,10 @@ namespace MWRender
         osg::Node* getWeaponNode() override;
         Resource::ResourceSystem* getResourceSystem() override;
         void showWeapon(bool show) override { showWeapons(show); }
-        void setWeaponGroup(const std::string& group, bool relativeDuration) override { mWeaponAnimationTime->setGroup(group, relativeDuration); }
+        void setWeaponGroup(const std::string& group, bool relativeDuration) override
+        {
+            mWeaponAnimationTime->setGroup(group, relativeDuration);
+        }
 
         void addControllers() override;
 
diff --git a/apps/openmw/mwrender/effectmanager.cpp b/apps/openmw/mwrender/effectmanager.cpp
index 6b1543eda9..3ae0c34c7a 100644
--- a/apps/openmw/mwrender/effectmanager.cpp
+++ b/apps/openmw/mwrender/effectmanager.cpp
@@ -8,83 +8,79 @@
 #include <components/sceneutil/controller.hpp>
 
 #include "animation.hpp"
-#include "vismask.hpp"
 #include "util.hpp"
+#include "vismask.hpp"
 
 #include <algorithm>
 
 namespace MWRender
 {
 
-EffectManager::EffectManager(osg::ref_ptr<osg::Group> parent, Resource::ResourceSystem* resourceSystem)
-    : mParentNode(parent)
-    , mResourceSystem(resourceSystem)
-{
-}
+    EffectManager::EffectManager(osg::ref_ptr<osg::Group> parent, Resource::ResourceSystem* resourceSystem)
+        : mParentNode(parent)
+        , mResourceSystem(resourceSystem)
+    {
+    }
 
-EffectManager::~EffectManager()
-{
-    clear();
-}
+    EffectManager::~EffectManager()
+    {
+        clear();
+    }
 
-void EffectManager::addEffect(const std::string& model, std::string_view textureOverride, const osg::Vec3f& worldPosition, float scale, bool isMagicVFX)
-{
-    osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->getInstance(model);
+    void EffectManager::addEffect(const std::string& model, std::string_view textureOverride,
+        const osg::Vec3f& worldPosition, float scale, bool isMagicVFX)
+    {
+        osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->getInstance(model);
 
-    node->setNodeMask(Mask_Effect);
+        node->setNodeMask(Mask_Effect);
 
-    Effect effect;
-    effect.mAnimTime = std::make_shared<EffectAnimationTime>();
+        Effect effect;
+        effect.mAnimTime = std::make_shared<EffectAnimationTime>();
 
-    SceneUtil::FindMaxControllerLengthVisitor findMaxLengthVisitor;
-    node->accept(findMaxLengthVisitor);
-    effect.mMaxControllerLength = findMaxLengthVisitor.getMaxLength();
+        SceneUtil::FindMaxControllerLengthVisitor findMaxLengthVisitor;
+        node->accept(findMaxLengthVisitor);
+        effect.mMaxControllerLength = findMaxLengthVisitor.getMaxLength();
 
-    osg::ref_ptr<osg::PositionAttitudeTransform> trans = new osg::PositionAttitudeTransform;
-    trans->setPosition(worldPosition);
-    trans->setScale(osg::Vec3f(scale, scale, scale));
-    trans->addChild(node);
+        osg::ref_ptr<osg::PositionAttitudeTransform> trans = new osg::PositionAttitudeTransform;
+        trans->setPosition(worldPosition);
+        trans->setScale(osg::Vec3f(scale, scale, scale));
+        trans->addChild(node);
 
-    effect.mTransform = trans;
+        effect.mTransform = trans;
 
-    SceneUtil::AssignControllerSourcesVisitor assignVisitor(effect.mAnimTime);
-    node->accept(assignVisitor);
+        SceneUtil::AssignControllerSourcesVisitor assignVisitor(effect.mAnimTime);
+        node->accept(assignVisitor);
 
-    if (isMagicVFX)
-        overrideFirstRootTexture(textureOverride, mResourceSystem, node);
-    else
-        overrideTexture(textureOverride, mResourceSystem, node);
+        if (isMagicVFX)
+            overrideFirstRootTexture(textureOverride, mResourceSystem, node);
+        else
+            overrideTexture(textureOverride, mResourceSystem, node);
 
-    mParentNode->addChild(trans);
+        mParentNode->addChild(trans);
 
-    mEffects.push_back(std::move(effect));
-}
+        mEffects.push_back(std::move(effect));
+    }
 
-void EffectManager::update(float dt)
-{
-    mEffects.erase(
-        std::remove_if(
-            mEffects.begin(), 
-            mEffects.end(), 
-            [dt, this](Effect& effect)
-            {
-                effect.mAnimTime->addTime(dt);
-                const auto remove = effect.mAnimTime->getTime() >= effect.mMaxControllerLength;
-                if (remove)
-                    mParentNode->removeChild(effect.mTransform);
-                return remove;
-            }), 
-        mEffects.end()
-    );
-}
+    void EffectManager::update(float dt)
+    {
+        mEffects.erase(std::remove_if(mEffects.begin(), mEffects.end(),
+                           [dt, this](Effect& effect) {
+                               effect.mAnimTime->addTime(dt);
+                               const auto remove = effect.mAnimTime->getTime() >= effect.mMaxControllerLength;
+                               if (remove)
+                                   mParentNode->removeChild(effect.mTransform);
+                               return remove;
+                           }),
+            mEffects.end());
+    }
 
-void EffectManager::clear()
-{
-    for(const auto& effect : mEffects)
+    void EffectManager::clear()
     {
-        mParentNode->removeChild(effect.mTransform);
+        for (const auto& effect : mEffects)
+        {
+            mParentNode->removeChild(effect.mTransform);
+        }
+        mEffects.clear();
     }
-    mEffects.clear();
-}
 
 }
diff --git a/apps/openmw/mwrender/effectmanager.hpp b/apps/openmw/mwrender/effectmanager.hpp
index f974a3a01e..2477344fd0 100644
--- a/apps/openmw/mwrender/effectmanager.hpp
+++ b/apps/openmw/mwrender/effectmanager.hpp
@@ -33,7 +33,8 @@ namespace MWRender
         ~EffectManager();
 
         /// Add an effect. When it's finished playing, it will be removed automatically.
-        void addEffect(const std::string& model, std::string_view textureOverride, const osg::Vec3f& worldPosition, float scale, bool isMagicVFX = true);
+        void addEffect(const std::string& model, std::string_view textureOverride, const osg::Vec3f& worldPosition,
+            float scale, bool isMagicVFX = true);
 
         void update(float dt);
 
diff --git a/apps/openmw/mwrender/fogmanager.cpp b/apps/openmw/mwrender/fogmanager.cpp
index b68b846851..cfbad67076 100644
--- a/apps/openmw/mwrender/fogmanager.cpp
+++ b/apps/openmw/mwrender/fogmanager.cpp
@@ -38,14 +38,14 @@ namespace MWRender
         DLInteriorFogEnd = Settings::Manager::getFloat("distant interior fog end", "Fog");
     }
 
-    void FogManager::configure(float viewDistance, const ESM::Cell *cell)
+    void FogManager::configure(float viewDistance, const ESM::Cell* cell)
     {
         osg::Vec4f color = SceneUtil::colourFromRGB(cell->mAmbi.mFog);
 
         if (mDistantFog)
         {
             float density = std::max(0.2f, cell->mAmbi.mFogDensity);
-            mLandFogStart = DLInteriorFogEnd * (1.0f - density) + DLInteriorFogStart*density;
+            mLandFogStart = DLInteriorFogEnd * (1.0f - density) + DLInteriorFogStart * density;
             mLandFogEnd = DLInteriorFogEnd;
             mUnderwaterFogStart = DLUnderwaterFogStart;
             mUnderwaterFogEnd = DLUnderwaterFogEnd;
@@ -55,7 +55,8 @@ namespace MWRender
             configure(viewDistance, cell->mAmbi.mFogDensity, mUnderwaterIndoorFog, 1.0f, 0.0f, color);
     }
 
-    void FogManager::configure(float viewDistance, float fogDepth, float underwaterFog, float dlFactor, float dlOffset, const osg::Vec4f &color)
+    void FogManager::configure(float viewDistance, float fogDepth, float underwaterFog, float dlFactor, float dlOffset,
+        const osg::Vec4f& color)
     {
         if (mDistantFog)
         {
@@ -96,7 +97,7 @@ namespace MWRender
     {
         if (isUnderwater)
         {
-            return mUnderwaterColor * mUnderwaterWeight + mFogColor * (1.f-mUnderwaterWeight);
+            return mUnderwaterColor * mUnderwaterWeight + mFogColor * (1.f - mUnderwaterWeight);
         }
 
         return mFogColor;
diff --git a/apps/openmw/mwrender/fogmanager.hpp b/apps/openmw/mwrender/fogmanager.hpp
index c3efd06ab7..6f91e2ff30 100644
--- a/apps/openmw/mwrender/fogmanager.hpp
+++ b/apps/openmw/mwrender/fogmanager.hpp
@@ -15,8 +15,9 @@ namespace MWRender
     public:
         FogManager();
 
-        void configure(float viewDistance, const ESM::Cell *cell);
-        void configure(float viewDistance, float fogDepth, float underwaterFog, float dlFactor, float dlOffset, const osg::Vec4f &color);
+        void configure(float viewDistance, const ESM::Cell* cell);
+        void configure(float viewDistance, float fogDepth, float underwaterFog, float dlFactor, float dlOffset,
+            const osg::Vec4f& color);
 
         osg::Vec4f getFogColor(bool isUnderwater) const;
         float getFogStart(bool isUnderwater) const;
diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp
index dca26a220f..1d6b881127 100644
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@@ -1,21 +1,21 @@
 #include "globalmap.hpp"
 
-#include <osg/Image>
-#include <osg/Texture2D>
-#include <osg/Group>
 #include <osg/Geometry>
+#include <osg/Group>
+#include <osg/Image>
 #include <osg/TexEnvCombine>
+#include <osg/Texture2D>
 
 #include <osgDB/WriteFile>
 
-#include <components/settings/settings.hpp>
 #include <components/files/memorystream.hpp>
+#include <components/settings/settings.hpp>
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/sceneutil/workqueue.hpp>
-#include <components/sceneutil/nodecallback.hpp>
 #include <components/sceneutil/depth.hpp>
+#include <components/sceneutil/nodecallback.hpp>
+#include <components/sceneutil/workqueue.hpp>
 
 #include <components/esm3/globalmap.hpp>
 
@@ -24,15 +24,16 @@
 
 #include "../mwworld/esmstore.hpp"
 
-#include "vismask.hpp"
 #include "util.hpp"
+#include "vismask.hpp"
 
 namespace
 {
 
     // Create a screen-aligned quad with given texture coordinates.
     // Assumes a top-left origin of the sampled image.
-    osg::ref_ptr<osg::Geometry> createTexturedQuad(float leftTexCoord, float topTexCoord, float rightTexCoord, float bottomTexCoord)
+    osg::ref_ptr<osg::Geometry> createTexturedQuad(
+        float leftTexCoord, float topTexCoord, float rightTexCoord, float bottomTexCoord)
     {
         osg::ref_ptr<osg::Geometry> geom = new osg::Geometry;
 
@@ -45,10 +46,10 @@ namespace
         geom->setVertexArray(verts);
 
         osg::ref_ptr<osg::Vec2Array> texcoords = new osg::Vec2Array;
-        texcoords->push_back(osg::Vec2f(leftTexCoord, 1.f-bottomTexCoord));
-        texcoords->push_back(osg::Vec2f(leftTexCoord, 1.f-topTexCoord));
-        texcoords->push_back(osg::Vec2f(rightTexCoord, 1.f-topTexCoord));
-        texcoords->push_back(osg::Vec2f(rightTexCoord, 1.f-bottomTexCoord));
+        texcoords->push_back(osg::Vec2f(leftTexCoord, 1.f - bottomTexCoord));
+        texcoords->push_back(osg::Vec2f(leftTexCoord, 1.f - topTexCoord));
+        texcoords->push_back(osg::Vec2f(rightTexCoord, 1.f - topTexCoord));
+        texcoords->push_back(osg::Vec2f(rightTexCoord, 1.f - bottomTexCoord));
 
         osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array;
         colors->push_back(osg::Vec4(1.f, 1.f, 1.f, 1.f));
@@ -56,12 +57,11 @@ namespace
 
         geom->setTexCoordArray(0, texcoords, osg::Array::BIND_PER_VERTEX);
 
-        geom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::QUADS,0,4));
+        geom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::QUADS, 0, 4));
 
         return geom;
     }
 
-
     class CameraUpdateGlobalCallback : public SceneUtil::NodeCallback<CameraUpdateGlobalCallback, osg::Camera*>
     {
     public:
@@ -106,7 +106,8 @@ namespace
         osgDB::ReaderWriter::WriteResult result = readerwriter->writeImage(overlayImage, ostream);
         if (!result.success())
         {
-            Log(Debug::Warning) << "Error: Can't write map overlay: " << result.message() << " code " << result.status();
+            Log(Debug::Warning) << "Error: Can't write map overlay: " << result.message() << " code "
+                                << result.status();
             return std::vector<char>();
         }
 
@@ -121,8 +122,16 @@ namespace MWRender
     class CreateMapWorkItem : public SceneUtil::WorkItem
     {
     public:
-        CreateMapWorkItem(int width, int height, int minX, int minY, int maxX, int maxY, int cellSize, const MWWorld::Store<ESM::Land>& landStore)
-            : mWidth(width), mHeight(height), mMinX(minX), mMinY(minY), mMaxX(maxX), mMaxY(maxY), mCellSize(cellSize), mLandStore(landStore)
+        CreateMapWorkItem(int width, int height, int minX, int minY, int maxX, int maxY, int cellSize,
+            const MWWorld::Store<ESM::Land>& landStore)
+            : mWidth(width)
+            , mHeight(height)
+            , mMinX(minX)
+            , mMinY(minY)
+            , mMaxX(maxX)
+            , mMaxY(maxY)
+            , mCellSize(cellSize)
+            , mLandStore(landStore)
         {
         }
 
@@ -140,19 +149,19 @@ namespace MWRender
             {
                 for (int y = mMinY; y <= mMaxY; ++y)
                 {
-                    const ESM::Land* land = mLandStore.search (x,y);
+                    const ESM::Land* land = mLandStore.search(x, y);
 
-                    for (int cellY=0; cellY<mCellSize; ++cellY)
+                    for (int cellY = 0; cellY < mCellSize; ++cellY)
                     {
-                        for (int cellX=0; cellX<mCellSize; ++cellX)
+                        for (int cellX = 0; cellX < mCellSize; ++cellX)
                         {
                             int vertexX = static_cast<int>(float(cellX) / float(mCellSize) * 9);
                             int vertexY = static_cast<int>(float(cellY) / float(mCellSize) * 9);
 
-                            int texelX = (x-mMinX) * mCellSize + cellX;
-                            int texelY = (y-mMinY) * mCellSize + cellY;
+                            int texelX = (x - mMinX) * mCellSize + cellX;
+                            int texelY = (y - mMinY) * mCellSize + cellY;
 
-                            unsigned char r,g,b;
+                            unsigned char r, g, b;
 
                             float y2 = 0;
                             if (land && (land->mDataTypes & ESM::Land::DATA_WNAM))
@@ -188,10 +197,11 @@ namespace MWRender
                             }
 
                             data[texelY * mWidth * 3 + texelX * 3] = r;
-                            data[texelY * mWidth * 3 + texelX * 3+1] = g;
-                            data[texelY * mWidth * 3 + texelX * 3+2] = b;
+                            data[texelY * mWidth * 3 + texelX * 3 + 1] = g;
+                            data[texelY * mWidth * 3 + texelX * 3 + 2] = b;
 
-                            alphaData[texelY * mWidth+ texelX] = (y2 < 0) ? static_cast<unsigned char>(0) : static_cast<unsigned char>(255);
+                            alphaData[texelY * mWidth + texelX]
+                                = (y2 < 0) ? static_cast<unsigned char>(0) : static_cast<unsigned char>(255);
                         }
                     }
                 }
@@ -247,12 +257,11 @@ namespace MWRender
         std::vector<char> mImageData;
 
         explicit WritePng(osg::ref_ptr<const osg::Image> overlayImage)
-            : mOverlayImage(std::move(overlayImage)) {}
-
-        void doWork() override
+            : mOverlayImage(std::move(overlayImage))
         {
-            mImageData = writePng(*mOverlayImage);
         }
+
+        void doWork() override { mImageData = writePng(*mOverlayImage); }
     };
 
     GlobalMap::GlobalMap(osg::Group* root, SceneUtil::WorkQueue* workQueue)
@@ -260,8 +269,10 @@ namespace MWRender
         , mWorkQueue(workQueue)
         , mWidth(0)
         , mHeight(0)
-        , mMinX(0), mMaxX(0)
-        , mMinY(0), mMaxY(0)
+        , mMinX(0)
+        , mMaxX(0)
+        , mMinY(0)
+        , mMaxY(0)
 
     {
         mCellSize = Settings::Manager::getInt("global map cell size", "Map");
@@ -278,10 +289,9 @@ namespace MWRender
             mWorkItem->waitTillDone();
     }
 
-    void GlobalMap::render ()
+    void GlobalMap::render()
     {
-        const MWWorld::ESMStore &esmStore =
-            MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
 
         // get the size of the world
         MWWorld::Store<ESM::Cell>::iterator it = esmStore.get<ESM::Cell>().extBegin();
@@ -297,10 +307,11 @@ namespace MWRender
                 mMaxY = it->getGridY();
         }
 
-        mWidth = mCellSize*(mMaxX-mMinX+1);
-        mHeight = mCellSize*(mMaxY-mMinY+1);
+        mWidth = mCellSize * (mMaxX - mMinX + 1);
+        mHeight = mCellSize * (mMaxY - mMinY + 1);
 
-        mWorkItem = new CreateMapWorkItem(mWidth, mHeight, mMinX, mMinY, mMaxX, mMaxY, mCellSize, esmStore.get<ESM::Land>());
+        mWorkItem
+            = new CreateMapWorkItem(mWidth, mHeight, mMinX, mMinY, mMaxX, mMaxY, mCellSize, esmStore.get<ESM::Land>());
         mWorkQueue->addWorkItem(mWorkItem);
     }
 
@@ -308,13 +319,14 @@ namespace MWRender
     {
         imageX = (float(x / float(Constants::CellSizeInUnits) - mMinX) / (mMaxX - mMinX + 1)) * getWidth();
 
-        imageY = (1.f-float(z / float(Constants::CellSizeInUnits) - mMinY) / (mMaxY - mMinY + 1)) * getHeight();
+        imageY = (1.f - float(z / float(Constants::CellSizeInUnits) - mMinY) / (mMaxY - mMinY + 1)) * getHeight();
     }
 
-    void GlobalMap::requestOverlayTextureUpdate(int x, int y, int width, int height, osg::ref_ptr<osg::Texture2D> texture, bool clear, bool cpuCopy,
-                                                float srcLeft, float srcTop, float srcRight, float srcBottom)
+    void GlobalMap::requestOverlayTextureUpdate(int x, int y, int width, int height,
+        osg::ref_ptr<osg::Texture2D> texture, bool clear, bool cpuCopy, float srcLeft, float srcTop, float srcRight,
+        float srcBottom)
     {
-        osg::ref_ptr<osg::Camera> camera (new osg::Camera);
+        osg::ref_ptr<osg::Camera> camera(new osg::Camera);
         camera->setNodeMask(Mask_RenderToTexture);
         camera->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
         camera->setViewMatrix(osg::Matrix::identity());
@@ -327,7 +339,7 @@ namespace MWRender
         if (clear)
         {
             camera->setClearMask(GL_COLOR_BUFFER_BIT);
-            camera->setClearColor(osg::Vec4(0,0,0,0));
+            camera->setClearColor(osg::Vec4(0, 0, 0, 0));
         }
         else
             camera->setClearMask(GL_NONE);
@@ -343,7 +355,7 @@ namespace MWRender
         if (cpuCopy)
         {
             // Attach an image to copy the render back to the CPU when finished
-            osg::ref_ptr<osg::Image> image (new osg::Image);
+            osg::ref_ptr<osg::Image> image(new osg::Image);
             image->setPixelFormat(mOverlayImage->getPixelFormat());
             image->setDataType(mOverlayImage->getDataType());
             camera->attach(osg::Camera::COLOR_BUFFER, image);
@@ -404,7 +416,8 @@ namespace MWRender
             return;
 
         int originX = (cellX - mMinX) * mCellSize;
-        int originY = (cellY - mMinY + 1) * mCellSize; // +1 because we want the top left corner of the cell, not the bottom left
+        int originY = (cellY - mMinY + 1)
+            * mCellSize; // +1 because we want the top left corner of the cell, not the bottom left
 
         if (cellX > mMaxX || cellX < mMinX || cellY > mMaxY || cellY < mMinY)
             return;
@@ -450,10 +463,13 @@ namespace MWRender
         int mLeft, mTop, mRight, mBottom;
 
         Box(int left, int top, int right, int bottom)
-            : mLeft(left), mTop(top), mRight(right), mBottom(bottom)
+            : mLeft(left)
+            , mTop(top)
+            , mRight(right)
+            , mBottom(bottom)
         {
         }
-        bool operator == (const Box& other) const
+        bool operator==(const Box& other) const
         {
             return mLeft == other.mLeft && mTop == other.mTop && mRight == other.mRight && mBottom == other.mBottom;
         }
@@ -465,13 +481,12 @@ namespace MWRender
 
         const ESM::GlobalMap::Bounds& bounds = map.mBounds;
 
-        if (bounds.mMaxX-bounds.mMinX < 0)
+        if (bounds.mMaxX - bounds.mMinX < 0)
             return;
-        if (bounds.mMaxY-bounds.mMinY < 0)
+        if (bounds.mMaxY - bounds.mMinY < 0)
             return;
 
-        if (bounds.mMinX > bounds.mMaxX
-                || bounds.mMinY > bounds.mMaxY)
+        if (bounds.mMinX > bounds.mMaxX || bounds.mMinY > bounds.mMaxY)
             throw std::runtime_error("invalid map bounds");
 
         if (map.mImageData.empty())
@@ -497,8 +512,8 @@ namespace MWRender
         int imageWidth = image->s();
         int imageHeight = image->t();
 
-        int xLength = (bounds.mMaxX-bounds.mMinX+1);
-        int yLength = (bounds.mMaxY-bounds.mMinY+1);
+        int xLength = (bounds.mMaxX - bounds.mMinX + 1);
+        int yLength = (bounds.mMaxY - bounds.mMinY + 1);
 
         // Size of one cell in image space
         int cellImageSizeSrc = imageWidth / xLength;
@@ -511,28 +526,23 @@ namespace MWRender
         int cellImageSizeDst = mCellSize;
 
         // Completely off-screen? -> no need to blit anything
-        if (bounds.mMaxX < mMinX
-                || bounds.mMaxY < mMinY
-                || bounds.mMinX > mMaxX
-                || bounds.mMinY > mMaxY)
+        if (bounds.mMaxX < mMinX || bounds.mMaxY < mMinY || bounds.mMinX > mMaxX || bounds.mMinY > mMaxY)
             return;
 
         int leftDiff = (mMinX - bounds.mMinX);
         int topDiff = (bounds.mMaxY - mMaxY);
         int rightDiff = (bounds.mMaxX - mMaxX);
-        int bottomDiff =  (mMinY - bounds.mMinY);
+        int bottomDiff = (mMinY - bounds.mMinY);
 
-        Box srcBox ( std::max(0, leftDiff * cellImageSizeSrc),
-                                  std::max(0, topDiff * cellImageSizeSrc),
-                                  std::min(imageWidth, imageWidth - rightDiff * cellImageSizeSrc),
-                                  std::min(imageHeight, imageHeight - bottomDiff * cellImageSizeSrc));
+        Box srcBox(std::max(0, leftDiff * cellImageSizeSrc), std::max(0, topDiff * cellImageSizeSrc),
+            std::min(imageWidth, imageWidth - rightDiff * cellImageSizeSrc),
+            std::min(imageHeight, imageHeight - bottomDiff * cellImageSizeSrc));
 
-        Box destBox ( std::max(0, -leftDiff * cellImageSizeDst),
-                                   std::max(0, -topDiff * cellImageSizeDst),
-                                   std::min(mWidth, mWidth + rightDiff * cellImageSizeDst),
-                                   std::min(mHeight, mHeight + bottomDiff * cellImageSizeDst));
+        Box destBox(std::max(0, -leftDiff * cellImageSizeDst), std::max(0, -topDiff * cellImageSizeDst),
+            std::min(mWidth, mWidth + rightDiff * cellImageSizeDst),
+            std::min(mHeight, mHeight + bottomDiff * cellImageSizeDst));
 
-        osg::ref_ptr<osg::Texture2D> texture (new osg::Texture2D);
+        osg::ref_ptr<osg::Texture2D> texture(new osg::Texture2D);
         texture->setImage(image);
         texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
@@ -551,9 +561,10 @@ namespace MWRender
             // Dimensions don't match. This could mean a changed map region, or a changed map resolution.
             // In the latter case, we'll want filtering.
             // Create a RTT Camera and draw the image onto mOverlayImage in the next frame.
-            requestOverlayTextureUpdate(destBox.mLeft, destBox.mTop, destBox.mRight-destBox.mLeft, destBox.mBottom-destBox.mTop, texture, true, true,
-                                        srcBox.mLeft/float(imageWidth), srcBox.mTop/float(imageHeight),
-                                        srcBox.mRight/float(imageWidth), srcBox.mBottom/float(imageHeight));
+            requestOverlayTextureUpdate(destBox.mLeft, destBox.mTop, destBox.mRight - destBox.mLeft,
+                destBox.mBottom - destBox.mTop, texture, true, true, srcBox.mLeft / float(imageWidth),
+                srcBox.mTop / float(imageHeight), srcBox.mRight / float(imageWidth),
+                srcBox.mBottom / float(imageHeight));
         }
     }
 
@@ -586,7 +597,7 @@ namespace MWRender
         }
     }
 
-    bool GlobalMap::copyResult(osg::Camera *camera, unsigned int frame)
+    bool GlobalMap::copyResult(osg::Camera* camera, unsigned int frame)
     {
         ImageDestMap::iterator it = mPendingImageDest.find(camera);
         if (it == mPendingImageDest.end())
@@ -594,7 +605,9 @@ namespace MWRender
         else
         {
             ImageDest& imageDest = it->second;
-            if (imageDest.mFrameDone == 0) imageDest.mFrameDone = frame+2; // wait an extra frame to ensure the draw thread has completed its frame.
+            if (imageDest.mFrameDone == 0)
+                imageDest.mFrameDone
+                    = frame + 2; // wait an extra frame to ensure the draw thread has completed its frame.
             if (imageDest.mFrameDone > frame)
             {
                 ++it;
@@ -607,7 +620,7 @@ namespace MWRender
         }
     }
 
-    void GlobalMap::markForRemoval(osg::Camera *camera)
+    void GlobalMap::markForRemoval(osg::Camera* camera)
     {
         CameraVector::iterator found = std::find(mActiveCameras.begin(), mActiveCameras.end(), camera);
         if (found == mActiveCameras.end())
@@ -627,7 +640,7 @@ namespace MWRender
         mCamerasPendingRemoval.clear();
     }
 
-    void GlobalMap::removeCamera(osg::Camera *cam)
+    void GlobalMap::removeCamera(osg::Camera* cam)
     {
         cam->removeChildren(0, cam->getNumChildren());
         mRoot->removeChild(cam);
diff --git a/apps/openmw/mwrender/globalmap.hpp b/apps/openmw/mwrender/globalmap.hpp
index 28531f14df..ad5bd38ab1 100644
--- a/apps/openmw/mwrender/globalmap.hpp
+++ b/apps/openmw/mwrender/globalmap.hpp
@@ -1,9 +1,9 @@
 #ifndef GAME_RENDER_GLOBALMAP_H
 #define GAME_RENDER_GLOBALMAP_H
 
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
 
 #include <osg/ref_ptr>
 
@@ -43,7 +43,7 @@ namespace MWRender
 
         void worldPosToImageSpace(float x, float z, float& imageX, float& imageY);
 
-        void exploreCell (int cellX, int cellY, osg::ref_ptr<osg::Texture2D> localMapTexture);
+        void exploreCell(int cellX, int cellY, osg::ref_ptr<osg::Texture2D> localMapTexture);
 
         /// Clears the overlay
         void clear();
@@ -64,8 +64,8 @@ namespace MWRender
          */
         void markForRemoval(osg::Camera* camera);
 
-        void write (ESM::GlobalMap& map);
-        void read (ESM::GlobalMap& map);
+        void write(ESM::GlobalMap& map);
+        void read(ESM::GlobalMap& map);
 
         osg::ref_ptr<osg::Texture2D> getBaseTexture();
         osg::ref_ptr<osg::Texture2D> getOverlayTexture();
@@ -82,14 +82,15 @@ namespace MWRender
          * x, y, width and height are the destination coordinates (top-left coordinate origin)
          * @param cpuCopy copy the resulting render onto mOverlayImage as well?
          */
-        void requestOverlayTextureUpdate(int x, int y, int width, int height, osg::ref_ptr<osg::Texture2D> texture, bool clear, bool cpuCopy,
-                                         float srcLeft = 0.f, float srcTop = 0.f, float srcRight = 1.f, float srcBottom = 1.f);
+        void requestOverlayTextureUpdate(int x, int y, int width, int height, osg::ref_ptr<osg::Texture2D> texture,
+            bool clear, bool cpuCopy, float srcLeft = 0.f, float srcTop = 0.f, float srcRight = 1.f,
+            float srcBottom = 1.f);
 
         int mCellSize;
 
         osg::ref_ptr<osg::Group> mRoot;
 
-        typedef std::vector<osg::ref_ptr<osg::Camera> > CameraVector;
+        typedef std::vector<osg::ref_ptr<osg::Camera>> CameraVector;
         CameraVector mActiveCameras;
 
         CameraVector mCamerasPendingRemoval;
@@ -97,7 +98,8 @@ namespace MWRender
         struct ImageDest
         {
             ImageDest()
-                : mX(0), mY(0)
+                : mX(0)
+                , mY(0)
                 , mFrameDone(0)
             {
             }
@@ -111,7 +113,7 @@ namespace MWRender
 
         ImageDestMap mPendingImageDest;
 
-        std::vector< std::pair<int,int> > mExploredCells;
+        std::vector<std::pair<int, int>> mExploredCells;
 
         osg::ref_ptr<osg::Texture2D> mBaseTexture;
         osg::ref_ptr<osg::Texture2D> mAlphaTexture;
@@ -136,4 +138,3 @@ namespace MWRender
 }
 
 #endif
-
diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index 194227f758..244001923d 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -1,19 +1,19 @@
 #include "groundcover.hpp"
 
-#include <osg/ComputeBoundsVisitor>
 #include <osg/AlphaFunc>
 #include <osg/BlendFunc>
+#include <osg/ComputeBoundsVisitor>
 #include <osg/Geometry>
-#include <osg/VertexAttribDivisor>
 #include <osg/Program>
+#include <osg/VertexAttribDivisor>
 
 #include <components/esm3/esmreader.hpp>
+#include <components/esm3/loadland.hpp>
+#include <components/esm3/readerscache.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/nodecallback.hpp>
-#include <components/terrain/quadtreenode.hpp>
 #include <components/shader/shadermanager.hpp>
-#include <components/esm3/readerscache.hpp>
-#include <components/esm3/loadland.hpp>
+#include <components/terrain/quadtreenode.hpp>
 
 #include "../mwworld/groundcoverstore.hpp"
 
@@ -25,9 +25,9 @@ namespace MWRender
     {
     public:
         InstancingVisitor(std::vector<Groundcover::GroundcoverEntry>& instances, osg::Vec3f& chunkPosition)
-        : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-        , mInstances(instances)
-        , mChunkPosition(chunkPosition)
+            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+            , mInstances(instances)
+            , mChunkPosition(chunkPosition)
         {
         }
 
@@ -68,6 +68,7 @@ namespace MWRender
             geom.setVertexAttribArray(6, transforms.get(), osg::Array::BIND_PER_VERTEX);
             geom.setVertexAttribArray(7, rotations.get(), osg::Array::BIND_PER_VERTEX);
         }
+
     private:
         std::vector<Groundcover::GroundcoverEntry> mInstances;
         osg::Vec3f mChunkPosition;
@@ -83,10 +84,12 @@ namespace MWRender
 
         bool isInstanceEnabled()
         {
-            if (mDensity >= 1.f) return true;
+            if (mDensity >= 1.f)
+                return true;
 
             mCurrentGroundcover += mDensity;
-            if (mCurrentGroundcover < 1.f) return false;
+            if (mCurrentGroundcover < 1.f)
+                return false;
 
             mCurrentGroundcover -= 1.f;
 
@@ -102,12 +105,17 @@ namespace MWRender
     class ViewDistanceCallback : public SceneUtil::NodeCallback<ViewDistanceCallback>
     {
     public:
-        ViewDistanceCallback(float dist, const osg::BoundingBox& box) : mViewDistance(dist), mBox(box) {}
+        ViewDistanceCallback(float dist, const osg::BoundingBox& box)
+            : mViewDistance(dist)
+            , mBox(box)
+        {
+        }
         void operator()(osg::Node* node, osg::NodeVisitor* nv)
         {
             if (Terrain::distance(mBox, nv->getEyePoint()) <= mViewDistance)
                 traverse(node, nv);
         }
+
     private:
         float mViewDistance;
         osg::BoundingBox mBox;
@@ -116,18 +124,22 @@ namespace MWRender
     inline bool isInChunkBorders(ESM::CellRef& ref, osg::Vec2f& minBound, osg::Vec2f& maxBound)
     {
         osg::Vec2f size = maxBound - minBound;
-        if (size.x() >=1 && size.y() >=1) return true;
+        if (size.x() >= 1 && size.y() >= 1)
+            return true;
 
         osg::Vec3f pos = ref.mPos.asVec3();
         osg::Vec3f cellPos = pos / ESM::Land::REAL_SIZE;
-        if ((minBound.x() > std::floor(minBound.x()) && cellPos.x() < minBound.x()) || (minBound.y() > std::floor(minBound.y()) && cellPos.y() < minBound.y())
-            || (maxBound.x() < std::ceil(maxBound.x()) && cellPos.x() >= maxBound.x()) || (maxBound.y() < std::ceil(maxBound.y()) && cellPos.y() >= maxBound.y()))
+        if ((minBound.x() > std::floor(minBound.x()) && cellPos.x() < minBound.x())
+            || (minBound.y() > std::floor(minBound.y()) && cellPos.y() < minBound.y())
+            || (maxBound.x() < std::ceil(maxBound.x()) && cellPos.x() >= maxBound.x())
+            || (maxBound.y() < std::ceil(maxBound.y()) && cellPos.y() >= maxBound.y()))
             return false;
 
         return true;
     }
 
-    osg::ref_ptr<osg::Node> Groundcover::getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile)
+    osg::ref_ptr<osg::Node> Groundcover::getChunk(float size, const osg::Vec2f& center, unsigned char lod,
+        unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile)
     {
         if (lod > getMaxLodLevel())
             return nullptr;
@@ -145,52 +157,55 @@ namespace MWRender
         }
     }
 
-    Groundcover::Groundcover(Resource::SceneManager* sceneManager, float density, float viewDistance, const MWWorld::GroundcoverStore& store)
-         : GenericResourceManager<GroundcoverChunkId>(nullptr)
-         , mSceneManager(sceneManager)
-         , mDensity(density)
-         , mStateset(new osg::StateSet)
-         , mGroundcoverStore(store)
+    Groundcover::Groundcover(
+        Resource::SceneManager* sceneManager, float density, float viewDistance, const MWWorld::GroundcoverStore& store)
+        : GenericResourceManager<GroundcoverChunkId>(nullptr)
+        , mSceneManager(sceneManager)
+        , mDensity(density)
+        , mStateset(new osg::StateSet)
+        , mGroundcoverStore(store)
     {
-         setViewDistance(viewDistance);
-         // MGE uses default alpha settings for groundcover, so we can not rely on alpha properties
-         // Force a unified alpha handling instead of data from meshes
-         osg::ref_ptr<osg::AlphaFunc> alpha = new osg::AlphaFunc(osg::AlphaFunc::GEQUAL, 128.f / 255.f);
-         mStateset->setAttributeAndModes(alpha.get(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-         mStateset->setAttributeAndModes(new osg::BlendFunc, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
-         mStateset->setRenderBinDetails(0, "RenderBin", osg::StateSet::OVERRIDE_RENDERBIN_DETAILS);
-         mStateset->setAttribute(new osg::VertexAttribDivisor(6, 1));
-         mStateset->setAttribute(new osg::VertexAttribDivisor(7, 1));
-
-         mProgramTemplate = mSceneManager->getShaderManager().getProgramTemplate() ? Shader::ShaderManager::cloneProgram(mSceneManager->getShaderManager().getProgramTemplate()) : osg::ref_ptr<osg::Program>(new osg::Program);
-         mProgramTemplate->addBindAttribLocation("aOffset", 6);
-         mProgramTemplate->addBindAttribLocation("aRotation", 7);
+        setViewDistance(viewDistance);
+        // MGE uses default alpha settings for groundcover, so we can not rely on alpha properties
+        // Force a unified alpha handling instead of data from meshes
+        osg::ref_ptr<osg::AlphaFunc> alpha = new osg::AlphaFunc(osg::AlphaFunc::GEQUAL, 128.f / 255.f);
+        mStateset->setAttributeAndModes(alpha.get(), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+        mStateset->setAttributeAndModes(new osg::BlendFunc, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE);
+        mStateset->setRenderBinDetails(0, "RenderBin", osg::StateSet::OVERRIDE_RENDERBIN_DETAILS);
+        mStateset->setAttribute(new osg::VertexAttribDivisor(6, 1));
+        mStateset->setAttribute(new osg::VertexAttribDivisor(7, 1));
+
+        mProgramTemplate = mSceneManager->getShaderManager().getProgramTemplate()
+            ? Shader::ShaderManager::cloneProgram(mSceneManager->getShaderManager().getProgramTemplate())
+            : osg::ref_ptr<osg::Program>(new osg::Program);
+        mProgramTemplate->addBindAttribLocation("aOffset", 6);
+        mProgramTemplate->addBindAttribLocation("aRotation", 7);
     }
 
-    Groundcover::~Groundcover()
-    {
-    }
+    Groundcover::~Groundcover() {}
 
     void Groundcover::collectInstances(InstanceMap& instances, float size, const osg::Vec2f& center)
     {
-        if (mDensity <=0.f) return;
+        if (mDensity <= 0.f)
+            return;
 
-        osg::Vec2f minBound = (center - osg::Vec2f(size/2.f, size/2.f));
-        osg::Vec2f maxBound = (center + osg::Vec2f(size/2.f, size/2.f));
+        osg::Vec2f minBound = (center - osg::Vec2f(size / 2.f, size / 2.f));
+        osg::Vec2f maxBound = (center + osg::Vec2f(size / 2.f, size / 2.f));
         DensityCalculator calculator(mDensity);
         ESM::ReadersCache readers;
-        osg::Vec2i startCell = osg::Vec2i(std::floor(center.x() - size/2.f), std::floor(center.y() - size/2.f));
+        osg::Vec2i startCell = osg::Vec2i(std::floor(center.x() - size / 2.f), std::floor(center.y() - size / 2.f));
         for (int cellX = startCell.x(); cellX < startCell.x() + size; ++cellX)
         {
             for (int cellY = startCell.y(); cellY < startCell.y() + size; ++cellY)
             {
                 ESM::Cell cell;
                 mGroundcoverStore.initCell(cell, cellX, cellY);
-                if (cell.mContextList.empty()) continue;
+                if (cell.mContextList.empty())
+                    continue;
 
                 calculator.reset();
                 std::map<ESM::RefNum, ESM::CellRef> refs;
-                for (size_t i=0; i<cell.mContextList.size(); ++i)
+                for (size_t i = 0; i < cell.mContextList.size(); ++i)
                 {
                     const std::size_t index = static_cast<std::size_t>(cell.mContextList[i].index);
                     const ESM::ReadersCache::BusyItem reader = readers.get(index);
@@ -200,10 +215,16 @@ namespace MWRender
                     bool deleted = false;
                     while (cell.getNextRef(*reader, ref, deleted))
                     {
-                        if (!deleted && refs.find(ref.mRefNum) == refs.end() && !calculator.isInstanceEnabled()) deleted = true;
-                        if (!deleted && !isInChunkBorders(ref, minBound, maxBound)) deleted = true;
-
-                        if (deleted) { refs.erase(ref.mRefNum); continue; }
+                        if (!deleted && refs.find(ref.mRefNum) == refs.end() && !calculator.isInstanceEnabled())
+                            deleted = true;
+                        if (!deleted && !isInChunkBorders(ref, minBound, maxBound))
+                            deleted = true;
+
+                        if (deleted)
+                        {
+                            refs.erase(ref.mRefNum);
+                            continue;
+                        }
                         refs[ref.mRefNum] = std::move(ref);
                     }
                 }
@@ -222,11 +243,13 @@ namespace MWRender
     osg::ref_ptr<osg::Node> Groundcover::createChunk(InstanceMap& instances, const osg::Vec2f& center)
     {
         osg::ref_ptr<osg::Group> group = new osg::Group;
-        osg::Vec3f worldCenter = osg::Vec3f(center.x(), center.y(), 0)*ESM::Land::REAL_SIZE;
+        osg::Vec3f worldCenter = osg::Vec3f(center.x(), center.y(), 0) * ESM::Land::REAL_SIZE;
         for (auto& pair : instances)
         {
             const osg::Node* temp = mSceneManager->getTemplate(pair.first);
-            osg::ref_ptr<osg::Node> node = static_cast<osg::Node*>(temp->clone(osg::CopyOp::DEEP_COPY_NODES|osg::CopyOp::DEEP_COPY_DRAWABLES|osg::CopyOp::DEEP_COPY_USERDATA|osg::CopyOp::DEEP_COPY_ARRAYS|osg::CopyOp::DEEP_COPY_PRIMITIVES));
+            osg::ref_ptr<osg::Node> node = static_cast<osg::Node*>(temp->clone(osg::CopyOp::DEEP_COPY_NODES
+                | osg::CopyOp::DEEP_COPY_DRAWABLES | osg::CopyOp::DEEP_COPY_USERDATA | osg::CopyOp::DEEP_COPY_ARRAYS
+                | osg::CopyOp::DEEP_COPY_PRIMITIVES));
 
             // Keep link to original mesh to keep it in cache
             group->getOrCreateUserDataContainer()->addUserObject(new Resource::TemplateRef(temp));
@@ -256,7 +279,7 @@ namespace MWRender
         return Mask_Groundcover;
     }
 
-    void Groundcover::reportStats(unsigned int frameNumber, osg::Stats *stats) const
+    void Groundcover::reportStats(unsigned int frameNumber, osg::Stats* stats) const
     {
         stats->setAttribute(frameNumber, "Groundcover Chunk", mCache->getCacheSize());
     }
diff --git a/apps/openmw/mwrender/groundcover.hpp b/apps/openmw/mwrender/groundcover.hpp
index d6d3ac52a7..df40d9d529 100644
--- a/apps/openmw/mwrender/groundcover.hpp
+++ b/apps/openmw/mwrender/groundcover.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_MWRENDER_GROUNDCOVER_H
 #define OPENMW_MWRENDER_GROUNDCOVER_H
 
-#include <components/terrain/quadtreeworld.hpp>
-#include <components/resource/scenemanager.hpp>
 #include <components/esm3/loadcell.hpp>
+#include <components/resource/scenemanager.hpp>
+#include <components/terrain/quadtreeworld.hpp>
 
 namespace MWWorld
 {
@@ -18,13 +18,16 @@ namespace osg
 namespace MWRender
 {
     typedef std::tuple<osg::Vec2f, float> GroundcoverChunkId; // Center, Size
-    class Groundcover : public Resource::GenericResourceManager<GroundcoverChunkId>, public Terrain::QuadTreeWorld::ChunkManager
+    class Groundcover : public Resource::GenericResourceManager<GroundcoverChunkId>,
+                        public Terrain::QuadTreeWorld::ChunkManager
     {
     public:
-        Groundcover(Resource::SceneManager* sceneManager, float density, float viewDistance, const MWWorld::GroundcoverStore& store);
+        Groundcover(Resource::SceneManager* sceneManager, float density, float viewDistance,
+            const MWWorld::GroundcoverStore& store);
         ~Groundcover();
 
-        osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile) override;
+        osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags,
+            bool activeGrid, const osg::Vec3f& viewPoint, bool compile) override;
 
         unsigned int getNodeMask() override;
 
@@ -35,8 +38,11 @@ namespace MWRender
             ESM::Position mPos;
             float mScale;
 
-            GroundcoverEntry(const ESM::CellRef& ref) : mPos(ref.mPos), mScale(ref.mScale)
-            {}
+            GroundcoverEntry(const ESM::CellRef& ref)
+                : mPos(ref.mPos)
+                , mScale(ref.mScale)
+            {
+            }
         };
 
     private:
diff --git a/apps/openmw/mwrender/landmanager.cpp b/apps/openmw/mwrender/landmanager.cpp
index 2395eeab69..59b9fdbde4 100644
--- a/apps/openmw/mwrender/landmanager.cpp
+++ b/apps/openmw/mwrender/landmanager.cpp
@@ -11,36 +11,35 @@
 namespace MWRender
 {
 
-LandManager::LandManager(int loadFlags)
-    : GenericResourceManager<std::pair<int, int> >(nullptr)
-    , mLoadFlags(loadFlags)
-{
-    mCache = new CacheType;
-}
-
-osg::ref_ptr<ESMTerrain::LandObject> LandManager::getLand(int x, int y)
-{
-    osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(std::make_pair(x,y));
-    if (obj)
-        return static_cast<ESMTerrain::LandObject*>(obj.get());
-    else
+    LandManager::LandManager(int loadFlags)
+        : GenericResourceManager<std::pair<int, int>>(nullptr)
+        , mLoadFlags(loadFlags)
     {
-        const auto world = MWBase::Environment::get().getWorld();
-        if (!world)
-            return nullptr;
-        const ESM::Land* land = world->getStore().get<ESM::Land>().search(x,y);
-        if (!land)
-            return nullptr;
-        osg::ref_ptr<ESMTerrain::LandObject> landObj (new ESMTerrain::LandObject(land, mLoadFlags));
-        mCache->addEntryToObjectCache(std::make_pair(x,y), landObj.get());
-        return landObj;
+        mCache = new CacheType;
     }
-}
 
-void LandManager::reportStats(unsigned int frameNumber, osg::Stats *stats) const
-{
-    stats->setAttribute(frameNumber, "Land", mCache->getCacheSize());
-}
+    osg::ref_ptr<ESMTerrain::LandObject> LandManager::getLand(int x, int y)
+    {
+        osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(std::make_pair(x, y));
+        if (obj)
+            return static_cast<ESMTerrain::LandObject*>(obj.get());
+        else
+        {
+            const auto world = MWBase::Environment::get().getWorld();
+            if (!world)
+                return nullptr;
+            const ESM::Land* land = world->getStore().get<ESM::Land>().search(x, y);
+            if (!land)
+                return nullptr;
+            osg::ref_ptr<ESMTerrain::LandObject> landObj(new ESMTerrain::LandObject(land, mLoadFlags));
+            mCache->addEntryToObjectCache(std::make_pair(x, y), landObj.get());
+            return landObj;
+        }
+    }
 
+    void LandManager::reportStats(unsigned int frameNumber, osg::Stats* stats) const
+    {
+        stats->setAttribute(frameNumber, "Land", mCache->getCacheSize());
+    }
 
 }
diff --git a/apps/openmw/mwrender/landmanager.hpp b/apps/openmw/mwrender/landmanager.hpp
index e4b068eb76..4c00cefe9b 100644
--- a/apps/openmw/mwrender/landmanager.hpp
+++ b/apps/openmw/mwrender/landmanager.hpp
@@ -3,8 +3,8 @@
 
 #include <osg/Object>
 
-#include <components/resource/resourcemanager.hpp>
 #include <components/esm3terrain/storage.hpp>
+#include <components/resource/resourcemanager.hpp>
 
 namespace ESM
 {
@@ -14,7 +14,7 @@ namespace ESM
 namespace MWRender
 {
 
-    class LandManager : public Resource::GenericResourceManager<std::pair<int, int> >
+    class LandManager : public Resource::GenericResourceManager<std::pair<int, int>>
     {
     public:
         LandManager(int loadFlags);
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 0f433c4d05..f9a14e5239 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -2,29 +2,29 @@
 
 #include <cstdint>
 
+#include <osg/ComputeBoundsVisitor>
 #include <osg/Fog>
 #include <osg/LightModel>
-#include <osg/Texture2D>
-#include <osg/ComputeBoundsVisitor>
 #include <osg/LightSource>
 #include <osg/PolygonMode>
+#include <osg/Texture2D>
 
 #include <osgDB/ReadFile>
 
 #include <components/debug/debuglog.hpp>
 #include <components/esm3/fogstate.hpp>
 #include <components/esm3/loadcell.hpp>
+#include <components/files/memorystream.hpp>
 #include <components/misc/constants.hpp>
-#include <components/stereo/multiview.hpp>
-#include <components/settings/settings.hpp>
-#include <components/sceneutil/visitor.hpp>
-#include <components/sceneutil/shadow.hpp>
+#include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/nodecallback.hpp>
 #include <components/sceneutil/rtt.hpp>
-#include <components/files/memorystream.hpp>
-#include <components/resource/scenemanager.hpp>
+#include <components/sceneutil/shadow.hpp>
+#include <components/sceneutil/visitor.hpp>
+#include <components/settings/settings.hpp>
+#include <components/stereo/multiview.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -38,7 +38,7 @@ namespace
 {
     float square(float val)
     {
-        return val*val;
+        return val * val;
     }
 
     std::pair<int, int> divideIntoSegments(const osg::BoundingBox& bounds, float mapSize)
@@ -48,17 +48,17 @@ namespace
         osg::Vec2f length = max - min;
         const int segsX = static_cast<int>(std::ceil(length.x() / mapSize));
         const int segsY = static_cast<int>(std::ceil(length.y() / mapSize));
-        return {segsX, segsY};
+        return { segsX, segsY };
     }
 }
 
 namespace MWRender
 {
-    class LocalMapRenderToTexture: public SceneUtil::RTTNode
+    class LocalMapRenderToTexture : public SceneUtil::RTTNode
     {
     public:
-        LocalMapRenderToTexture(osg::Node* sceneRoot, int res, int mapWorldSize,
-            float x, float y, const osg::Vec3d& upVector, float zmin, float zmax);
+        LocalMapRenderToTexture(osg::Node* sceneRoot, int res, int mapWorldSize, float x, float y,
+            const osg::Vec3d& upVector, float zmin, float zmax);
 
         void setDefaults(osg::Camera* camera) override;
 
@@ -71,693 +71,702 @@ namespace MWRender
         bool mActive;
     };
 
-    class CameraLocalUpdateCallback : public SceneUtil::NodeCallback<CameraLocalUpdateCallback, LocalMapRenderToTexture*>
+    class CameraLocalUpdateCallback
+        : public SceneUtil::NodeCallback<CameraLocalUpdateCallback, LocalMapRenderToTexture*>
     {
     public:
         void operator()(LocalMapRenderToTexture* node, osg::NodeVisitor* nv);
     };
 
-LocalMap::LocalMap(osg::Group* root)
-    : mRoot(root)
-    , mMapResolution(Settings::Manager::getInt("local map resolution", "Map"))
-    , mMapWorldSize(Constants::CellSizeInUnits)
-    , mCellDistance(Constants::CellGridRadius)
-    , mAngle(0.f)
-    , mInterior(false)
-{
-    // Increase map resolution, if use UI scaling
-    float uiScale = MWBase::Environment::get().getWindowManager()->getScalingFactor();
-    mMapResolution *= uiScale;
-
-    SceneUtil::FindByNameVisitor find("Scene Root");
-    mRoot->accept(find);
-    mSceneRoot = find.mFoundNode;
-    if (!mSceneRoot)
-        throw std::runtime_error("no scene root found");
-}
-
-LocalMap::~LocalMap()
-{
-    for (auto& rtt : mLocalMapRTTs)
-        mRoot->removeChild(rtt);
-}
+    LocalMap::LocalMap(osg::Group* root)
+        : mRoot(root)
+        , mMapResolution(Settings::Manager::getInt("local map resolution", "Map"))
+        , mMapWorldSize(Constants::CellSizeInUnits)
+        , mCellDistance(Constants::CellGridRadius)
+        , mAngle(0.f)
+        , mInterior(false)
+    {
+        // Increase map resolution, if use UI scaling
+        float uiScale = MWBase::Environment::get().getWindowManager()->getScalingFactor();
+        mMapResolution *= uiScale;
+
+        SceneUtil::FindByNameVisitor find("Scene Root");
+        mRoot->accept(find);
+        mSceneRoot = find.mFoundNode;
+        if (!mSceneRoot)
+            throw std::runtime_error("no scene root found");
+    }
 
-const osg::Vec2f LocalMap::rotatePoint(const osg::Vec2f& point, const osg::Vec2f& center, const float angle)
-{
-    return osg::Vec2f( std::cos(angle) * (point.x() - center.x()) - std::sin(angle) * (point.y() - center.y()) + center.x(),
-                    std::sin(angle) * (point.x() - center.x()) + std::cos(angle) * (point.y() - center.y()) + center.y());
-}
+    LocalMap::~LocalMap()
+    {
+        for (auto& rtt : mLocalMapRTTs)
+            mRoot->removeChild(rtt);
+    }
 
-void LocalMap::clear()
-{
-    mExteriorSegments.clear();
-    mInteriorSegments.clear();
-}
+    const osg::Vec2f LocalMap::rotatePoint(const osg::Vec2f& point, const osg::Vec2f& center, const float angle)
+    {
+        return osg::Vec2f(
+            std::cos(angle) * (point.x() - center.x()) - std::sin(angle) * (point.y() - center.y()) + center.x(),
+            std::sin(angle) * (point.x() - center.x()) + std::cos(angle) * (point.y() - center.y()) + center.y());
+    }
 
-void LocalMap::saveFogOfWar(MWWorld::CellStore* cell)
-{
-    if (!mInterior)
+    void LocalMap::clear()
     {
-        const MapSegment& segment = mExteriorSegments[std::make_pair(cell->getCell()->getGridX(), cell->getCell()->getGridY())];
+        mExteriorSegments.clear();
+        mInteriorSegments.clear();
+    }
 
-        if (segment.mFogOfWarImage && segment.mHasFogState)
+    void LocalMap::saveFogOfWar(MWWorld::CellStore* cell)
+    {
+        if (!mInterior)
         {
-            auto fog = std::make_unique<ESM::FogState>();
-            fog->mFogTextures.emplace_back();
+            const MapSegment& segment
+                = mExteriorSegments[std::make_pair(cell->getCell()->getGridX(), cell->getCell()->getGridY())];
 
-            segment.saveFogOfWar(fog->mFogTextures.back());
+            if (segment.mFogOfWarImage && segment.mHasFogState)
+            {
+                auto fog = std::make_unique<ESM::FogState>();
+                fog->mFogTextures.emplace_back();
 
-            cell->setFog(std::move(fog));
+                segment.saveFogOfWar(fog->mFogTextures.back());
+
+                cell->setFog(std::move(fog));
+            }
         }
-    }
-    else
-    {
-        auto segments = divideIntoSegments(mBounds, mMapWorldSize);
+        else
+        {
+            auto segments = divideIntoSegments(mBounds, mMapWorldSize);
 
-        auto fog = std::make_unique<ESM::FogState>();
+            auto fog = std::make_unique<ESM::FogState>();
 
-        fog->mBounds.mMinX = mBounds.xMin();
-        fog->mBounds.mMaxX = mBounds.xMax();
-        fog->mBounds.mMinY = mBounds.yMin();
-        fog->mBounds.mMaxY = mBounds.yMax();
-        fog->mNorthMarkerAngle = mAngle;
+            fog->mBounds.mMinX = mBounds.xMin();
+            fog->mBounds.mMaxX = mBounds.xMax();
+            fog->mBounds.mMinY = mBounds.yMin();
+            fog->mBounds.mMaxY = mBounds.yMax();
+            fog->mNorthMarkerAngle = mAngle;
 
-        fog->mFogTextures.reserve(segments.first * segments.second);
+            fog->mFogTextures.reserve(segments.first * segments.second);
 
-        for (int x = 0; x < segments.first; ++x)
-        {
-            for (int y = 0; y < segments.second; ++y)
+            for (int x = 0; x < segments.first; ++x)
             {
-                const MapSegment& segment = mInteriorSegments[std::make_pair(x,y)];
+                for (int y = 0; y < segments.second; ++y)
+                {
+                    const MapSegment& segment = mInteriorSegments[std::make_pair(x, y)];
 
-                fog->mFogTextures.emplace_back();
+                    fog->mFogTextures.emplace_back();
 
-                // saving even if !segment.mHasFogState so we don't mess up the segmenting
-                // plus, older openmw versions can't deal with empty images
-                segment.saveFogOfWar(fog->mFogTextures.back());
+                    // saving even if !segment.mHasFogState so we don't mess up the segmenting
+                    // plus, older openmw versions can't deal with empty images
+                    segment.saveFogOfWar(fog->mFogTextures.back());
 
-                fog->mFogTextures.back().mX = x;
-                fog->mFogTextures.back().mY = y;
+                    fog->mFogTextures.back().mX = x;
+                    fog->mFogTextures.back().mY = y;
+                }
             }
-        }
 
-        cell->setFog(std::move(fog));
+            cell->setFog(std::move(fog));
+        }
     }
-}
 
-void LocalMap::setupRenderToTexture(int segment_x, int segment_y, float left, float top, const osg::Vec3d& upVector, float zmin, float zmax)
-{
-    mLocalMapRTTs.emplace_back(new LocalMapRenderToTexture(mSceneRoot, mMapResolution, mMapWorldSize, left, top, upVector, zmin, zmax));
+    void LocalMap::setupRenderToTexture(
+        int segment_x, int segment_y, float left, float top, const osg::Vec3d& upVector, float zmin, float zmax)
+    {
+        mLocalMapRTTs.emplace_back(
+            new LocalMapRenderToTexture(mSceneRoot, mMapResolution, mMapWorldSize, left, top, upVector, zmin, zmax));
 
-    mRoot->addChild(mLocalMapRTTs.back());
+        mRoot->addChild(mLocalMapRTTs.back());
 
-    MapSegment& segment = mInterior? mInteriorSegments[std::make_pair(segment_x, segment_y)] : mExteriorSegments[std::make_pair(segment_x, segment_y)];
-    segment.mMapTexture = static_cast<osg::Texture2D*>(mLocalMapRTTs.back()->getColorTexture(nullptr));
-}
+        MapSegment& segment = mInterior ? mInteriorSegments[std::make_pair(segment_x, segment_y)]
+                                        : mExteriorSegments[std::make_pair(segment_x, segment_y)];
+        segment.mMapTexture = static_cast<osg::Texture2D*>(mLocalMapRTTs.back()->getColorTexture(nullptr));
+    }
 
-void LocalMap::requestMap(const MWWorld::CellStore* cell)
-{
-    if (cell->isExterior())
+    void LocalMap::requestMap(const MWWorld::CellStore* cell)
     {
-        int cellX = cell->getCell()->getGridX();
-        int cellY = cell->getCell()->getGridY();
-
-        MapSegment& segment = mExteriorSegments[std::make_pair(cellX, cellY)];
-        if (!segment.needUpdate)
-            return;
-        else
+        if (cell->isExterior())
         {
-            requestExteriorMap(cell);
-            segment.needUpdate = false;
+            int cellX = cell->getCell()->getGridX();
+            int cellY = cell->getCell()->getGridY();
+
+            MapSegment& segment = mExteriorSegments[std::make_pair(cellX, cellY)];
+            if (!segment.needUpdate)
+                return;
+            else
+            {
+                requestExteriorMap(cell);
+                segment.needUpdate = false;
+            }
         }
+        else
+            requestInteriorMap(cell);
     }
-    else
-        requestInteriorMap(cell);
-}
 
-void LocalMap::addCell(MWWorld::CellStore *cell)
-{
-    if (cell->isExterior())
-        mExteriorSegments[std::make_pair(cell->getCell()->getGridX(), cell->getCell()->getGridY())].needUpdate = true;
-}
+    void LocalMap::addCell(MWWorld::CellStore* cell)
+    {
+        if (cell->isExterior())
+            mExteriorSegments[std::make_pair(cell->getCell()->getGridX(), cell->getCell()->getGridY())].needUpdate
+                = true;
+    }
 
-void LocalMap::removeExteriorCell(int x, int y)
-{
-    mExteriorSegments.erase({ x, y });
-}
+    void LocalMap::removeExteriorCell(int x, int y)
+    {
+        mExteriorSegments.erase({ x, y });
+    }
 
-void LocalMap::removeCell(MWWorld::CellStore *cell)
-{
-    saveFogOfWar(cell);
+    void LocalMap::removeCell(MWWorld::CellStore* cell)
+    {
+        saveFogOfWar(cell);
 
-    if (!cell->isExterior())
-        mInteriorSegments.clear();
-}
+        if (!cell->isExterior())
+            mInteriorSegments.clear();
+    }
 
-osg::ref_ptr<osg::Texture2D> LocalMap::getMapTexture(int x, int y)
-{
-    auto& segments(mInterior ? mInteriorSegments : mExteriorSegments);
-    SegmentMap::iterator found = segments.find(std::make_pair(x, y));
-    if (found == segments.end())
-        return osg::ref_ptr<osg::Texture2D>();
-    else
-        return found->second.mMapTexture;
-}
+    osg::ref_ptr<osg::Texture2D> LocalMap::getMapTexture(int x, int y)
+    {
+        auto& segments(mInterior ? mInteriorSegments : mExteriorSegments);
+        SegmentMap::iterator found = segments.find(std::make_pair(x, y));
+        if (found == segments.end())
+            return osg::ref_ptr<osg::Texture2D>();
+        else
+            return found->second.mMapTexture;
+    }
 
-osg::ref_ptr<osg::Texture2D> LocalMap::getFogOfWarTexture(int x, int y)
-{
-    auto& segments(mInterior ? mInteriorSegments : mExteriorSegments);
-    SegmentMap::iterator found = segments.find(std::make_pair(x, y));
-    if (found == segments.end())
-        return osg::ref_ptr<osg::Texture2D>();
-    else
-        return found->second.mFogOfWarTexture;
-}
+    osg::ref_ptr<osg::Texture2D> LocalMap::getFogOfWarTexture(int x, int y)
+    {
+        auto& segments(mInterior ? mInteriorSegments : mExteriorSegments);
+        SegmentMap::iterator found = segments.find(std::make_pair(x, y));
+        if (found == segments.end())
+            return osg::ref_ptr<osg::Texture2D>();
+        else
+            return found->second.mFogOfWarTexture;
+    }
 
-void LocalMap::cleanupCameras()
-{
-    auto it = mLocalMapRTTs.begin();
-    while (it != mLocalMapRTTs.end())
+    void LocalMap::cleanupCameras()
     {
-        if (!(*it)->isActive())
+        auto it = mLocalMapRTTs.begin();
+        while (it != mLocalMapRTTs.end())
         {
-            mRoot->removeChild(*it);
-            it = mLocalMapRTTs.erase(it);
+            if (!(*it)->isActive())
+            {
+                mRoot->removeChild(*it);
+                it = mLocalMapRTTs.erase(it);
+            }
+            else
+                it++;
         }
-        else
-            it++;
     }
-}
 
-void LocalMap::requestExteriorMap(const MWWorld::CellStore* cell)
-{
-    mInterior = false;
+    void LocalMap::requestExteriorMap(const MWWorld::CellStore* cell)
+    {
+        mInterior = false;
 
-    int x = cell->getCell()->getGridX();
-    int y = cell->getCell()->getGridY();
+        int x = cell->getCell()->getGridX();
+        int y = cell->getCell()->getGridY();
 
-    osg::BoundingSphere bound = mSceneRoot->getBound();
-    float zmin = bound.center().z() - bound.radius();
-    float zmax = bound.center().z() + bound.radius();
+        osg::BoundingSphere bound = mSceneRoot->getBound();
+        float zmin = bound.center().z() - bound.radius();
+        float zmax = bound.center().z() + bound.radius();
 
-    setupRenderToTexture(cell->getCell()->getGridX(), cell->getCell()->getGridY(), 
-        x * mMapWorldSize + mMapWorldSize / 2.f, y * mMapWorldSize + mMapWorldSize / 2.f,
-        osg::Vec3d(0, 1, 0), zmin, zmax);
+        setupRenderToTexture(cell->getCell()->getGridX(), cell->getCell()->getGridY(),
+            x * mMapWorldSize + mMapWorldSize / 2.f, y * mMapWorldSize + mMapWorldSize / 2.f, osg::Vec3d(0, 1, 0), zmin,
+            zmax);
 
-    MapSegment& segment = mExteriorSegments[std::make_pair(cell->getCell()->getGridX(), cell->getCell()->getGridY())];
-    if (!segment.mFogOfWarImage)
-    {
-        if (cell->getFog())
-            segment.loadFogOfWar(cell->getFog()->mFogTextures.back());
-        else
-            segment.initFogOfWar();
+        MapSegment& segment
+            = mExteriorSegments[std::make_pair(cell->getCell()->getGridX(), cell->getCell()->getGridY())];
+        if (!segment.mFogOfWarImage)
+        {
+            if (cell->getFog())
+                segment.loadFogOfWar(cell->getFog()->mFogTextures.back());
+            else
+                segment.initFogOfWar();
+        }
     }
-}
-
-void LocalMap::requestInteriorMap(const MWWorld::CellStore* cell)
-{
-    osg::ComputeBoundsVisitor computeBoundsVisitor;
-    computeBoundsVisitor.setTraversalMask(Mask_Scene | Mask_Terrain | Mask_Object | Mask_Static);
-    mSceneRoot->accept(computeBoundsVisitor);
 
-    osg::BoundingBox bounds = computeBoundsVisitor.getBoundingBox();
+    void LocalMap::requestInteriorMap(const MWWorld::CellStore* cell)
+    {
+        osg::ComputeBoundsVisitor computeBoundsVisitor;
+        computeBoundsVisitor.setTraversalMask(Mask_Scene | Mask_Terrain | Mask_Object | Mask_Static);
+        mSceneRoot->accept(computeBoundsVisitor);
 
-    // If we're in an empty cell, bail out
-    // The operations in this function are only valid for finite bounds
-    if (!bounds.valid() || bounds.radius2() == 0.0)
-        return;
+        osg::BoundingBox bounds = computeBoundsVisitor.getBoundingBox();
 
-    mInterior = true;
+        // If we're in an empty cell, bail out
+        // The operations in this function are only valid for finite bounds
+        if (!bounds.valid() || bounds.radius2() == 0.0)
+            return;
 
-    mBounds = bounds;
+        mInterior = true;
 
-    // Get the cell's NorthMarker rotation. This is used to rotate the entire map.
-    osg::Vec2f north = MWBase::Environment::get().getWorld()->getNorthVector(cell);
+        mBounds = bounds;
 
-    mAngle = std::atan2(north.x(), north.y());
+        // Get the cell's NorthMarker rotation. This is used to rotate the entire map.
+        osg::Vec2f north = MWBase::Environment::get().getWorld()->getNorthVector(cell);
 
-    // Rotate the cell and merge the rotated corners to the bounding box
-    osg::Vec2f origCenter(bounds.center().x(), bounds.center().y());
-    osg::Vec3f origCorners[8];
-    for (int i=0; i<8; ++i)
-        origCorners[i] = mBounds.corner(i);
+        mAngle = std::atan2(north.x(), north.y());
 
-    for (int i=0; i<8; ++i)
-    {
-        osg::Vec3f corner = origCorners[i];
-        osg::Vec2f corner2d (corner.x(), corner.y());
-        corner2d = rotatePoint(corner2d, origCenter, mAngle);
-        mBounds.expandBy(osg::Vec3f(corner2d.x(), corner2d.y(), 0));
-    }
+        // Rotate the cell and merge the rotated corners to the bounding box
+        osg::Vec2f origCenter(bounds.center().x(), bounds.center().y());
+        osg::Vec3f origCorners[8];
+        for (int i = 0; i < 8; ++i)
+            origCorners[i] = mBounds.corner(i);
 
-    // Do NOT change padding! This will break older savegames.
-    // If the padding really needs to be changed, then it must be saved in the ESM::FogState and
-    // assume the old (500) value as default for older savegames.
-    const float padding = 500.0f;
+        for (int i = 0; i < 8; ++i)
+        {
+            osg::Vec3f corner = origCorners[i];
+            osg::Vec2f corner2d(corner.x(), corner.y());
+            corner2d = rotatePoint(corner2d, origCenter, mAngle);
+            mBounds.expandBy(osg::Vec3f(corner2d.x(), corner2d.y(), 0));
+        }
 
-    // Apply a little padding
-    mBounds.set(mBounds._min - osg::Vec3f(padding,padding,0.f),
-                mBounds._max + osg::Vec3f(padding,padding,0.f));
+        // Do NOT change padding! This will break older savegames.
+        // If the padding really needs to be changed, then it must be saved in the ESM::FogState and
+        // assume the old (500) value as default for older savegames.
+        const float padding = 500.0f;
 
-    float zMin = mBounds.zMin();
-    float zMax = mBounds.zMax();
+        // Apply a little padding
+        mBounds.set(mBounds._min - osg::Vec3f(padding, padding, 0.f), mBounds._max + osg::Vec3f(padding, padding, 0.f));
 
-    // If there is fog state in the CellStore (e.g. when it came from a savegame) we need to do some checks
-    // to see if this state is still valid.
-    // Both the cell bounds and the NorthMarker rotation could be changed by the content files or exchanged models.
-    // If they changed by too much then parts of the interior might not be covered by the map anymore.
-    // The following code detects this, and discards the CellStore's fog state if it needs to.
-    std::vector<std::pair<int, int>> segmentMappings;
-    if (cell->getFog())
-    {
-        ESM::FogState* fog = cell->getFog();
+        float zMin = mBounds.zMin();
+        float zMax = mBounds.zMax();
 
-        if (std::abs(mAngle - fog->mNorthMarkerAngle) < osg::DegreesToRadians(5.f))
+        // If there is fog state in the CellStore (e.g. when it came from a savegame) we need to do some checks
+        // to see if this state is still valid.
+        // Both the cell bounds and the NorthMarker rotation could be changed by the content files or exchanged models.
+        // If they changed by too much then parts of the interior might not be covered by the map anymore.
+        // The following code detects this, and discards the CellStore's fog state if it needs to.
+        std::vector<std::pair<int, int>> segmentMappings;
+        if (cell->getFog())
         {
-            // Expand mBounds so the saved textures fit the same grid
-            int xOffset = 0;
-            int yOffset = 0;
-            if(fog->mBounds.mMinX < mBounds.xMin())
-            {
-                mBounds.xMin() = fog->mBounds.mMinX;
-            }
-            else if(fog->mBounds.mMinX > mBounds.xMin())
-            {
-                float diff = fog->mBounds.mMinX - mBounds.xMin();
-                xOffset += diff / mMapWorldSize;
-                xOffset++;
-                mBounds.xMin() = fog->mBounds.mMinX - xOffset * mMapWorldSize;
-            }
-            if(fog->mBounds.mMinY < mBounds.yMin())
-            {
-                mBounds.yMin() = fog->mBounds.mMinY;
-            }
-            else if(fog->mBounds.mMinY > mBounds.yMin())
+            ESM::FogState* fog = cell->getFog();
+
+            if (std::abs(mAngle - fog->mNorthMarkerAngle) < osg::DegreesToRadians(5.f))
             {
-                float diff = fog->mBounds.mMinY - mBounds.yMin();
-                yOffset += diff / mMapWorldSize;
-                yOffset++;
-                mBounds.yMin() = fog->mBounds.mMinY - yOffset * mMapWorldSize;
+                // Expand mBounds so the saved textures fit the same grid
+                int xOffset = 0;
+                int yOffset = 0;
+                if (fog->mBounds.mMinX < mBounds.xMin())
+                {
+                    mBounds.xMin() = fog->mBounds.mMinX;
+                }
+                else if (fog->mBounds.mMinX > mBounds.xMin())
+                {
+                    float diff = fog->mBounds.mMinX - mBounds.xMin();
+                    xOffset += diff / mMapWorldSize;
+                    xOffset++;
+                    mBounds.xMin() = fog->mBounds.mMinX - xOffset * mMapWorldSize;
+                }
+                if (fog->mBounds.mMinY < mBounds.yMin())
+                {
+                    mBounds.yMin() = fog->mBounds.mMinY;
+                }
+                else if (fog->mBounds.mMinY > mBounds.yMin())
+                {
+                    float diff = fog->mBounds.mMinY - mBounds.yMin();
+                    yOffset += diff / mMapWorldSize;
+                    yOffset++;
+                    mBounds.yMin() = fog->mBounds.mMinY - yOffset * mMapWorldSize;
+                }
+                if (fog->mBounds.mMaxX > mBounds.xMax())
+                    mBounds.xMax() = fog->mBounds.mMaxX;
+                if (fog->mBounds.mMaxY > mBounds.yMax())
+                    mBounds.yMax() = fog->mBounds.mMaxY;
+
+                if (xOffset != 0 || yOffset != 0)
+                    Log(Debug::Warning) << "Warning: expanding fog by " << xOffset << ", " << yOffset;
+
+                const auto& textures = fog->mFogTextures;
+                segmentMappings.reserve(textures.size());
+                osg::BoundingBox savedBounds{ fog->mBounds.mMinX, fog->mBounds.mMinY, 0, fog->mBounds.mMaxX,
+                    fog->mBounds.mMaxY, 0 };
+                auto segments = divideIntoSegments(savedBounds, mMapWorldSize);
+                for (int x = 0; x < segments.first; ++x)
+                    for (int y = 0; y < segments.second; ++y)
+                        segmentMappings.emplace_back(std::make_pair(x + xOffset, y + yOffset));
+
+                mAngle = fog->mNorthMarkerAngle;
             }
-            if (fog->mBounds.mMaxX > mBounds.xMax())
-                mBounds.xMax() = fog->mBounds.mMaxX;
-            if (fog->mBounds.mMaxY > mBounds.yMax())
-                mBounds.yMax() = fog->mBounds.mMaxY;
-
-            if(xOffset != 0 || yOffset != 0)
-                Log(Debug::Warning) << "Warning: expanding fog by " << xOffset << ", " << yOffset;
-
-            const auto& textures = fog->mFogTextures;
-            segmentMappings.reserve(textures.size());
-            osg::BoundingBox savedBounds{
-                fog->mBounds.mMinX, fog->mBounds.mMinY, 0,
-                fog->mBounds.mMaxX, fog->mBounds.mMaxY, 0
-            };
-            auto segments = divideIntoSegments(savedBounds, mMapWorldSize);
-            for (int x = 0; x < segments.first; ++x)
-                for (int y = 0; y < segments.second; ++y)
-                    segmentMappings.emplace_back(std::make_pair(x + xOffset, y + yOffset));
-
-            mAngle = fog->mNorthMarkerAngle;
         }
-    }
 
-    osg::Vec2f min(mBounds.xMin(), mBounds.yMin());
+        osg::Vec2f min(mBounds.xMin(), mBounds.yMin());
 
-    osg::Vec2f center(mBounds.center().x(), mBounds.center().y());
-    osg::Quat cameraOrient (mAngle, osg::Vec3d(0,0,-1));
+        osg::Vec2f center(mBounds.center().x(), mBounds.center().y());
+        osg::Quat cameraOrient(mAngle, osg::Vec3d(0, 0, -1));
 
-    auto segments = divideIntoSegments(mBounds, mMapWorldSize);
-    for (int x = 0; x < segments.first; ++x)
-    {
-        for (int y = 0; y < segments.second; ++y)
+        auto segments = divideIntoSegments(mBounds, mMapWorldSize);
+        for (int x = 0; x < segments.first; ++x)
         {
-            osg::Vec2f start = min + osg::Vec2f(mMapWorldSize*x, mMapWorldSize*y);
-            osg::Vec2f newcenter = start + osg::Vec2f(mMapWorldSize/2.f, mMapWorldSize/2.f);
+            for (int y = 0; y < segments.second; ++y)
+            {
+                osg::Vec2f start = min + osg::Vec2f(mMapWorldSize * x, mMapWorldSize * y);
+                osg::Vec2f newcenter = start + osg::Vec2f(mMapWorldSize / 2.f, mMapWorldSize / 2.f);
 
-            osg::Vec2f a = newcenter - center;
-            osg::Vec3f rotatedCenter = cameraOrient * (osg::Vec3f(a.x(), a.y(), 0));
+                osg::Vec2f a = newcenter - center;
+                osg::Vec3f rotatedCenter = cameraOrient * (osg::Vec3f(a.x(), a.y(), 0));
 
-            osg::Vec2f pos = osg::Vec2f(rotatedCenter.x(), rotatedCenter.y()) + center;
+                osg::Vec2f pos = osg::Vec2f(rotatedCenter.x(), rotatedCenter.y()) + center;
 
-            setupRenderToTexture(x, y, pos.x(), pos.y(),
-                osg::Vec3f(north.x(), north.y(), 0.f), zMin, zMax);
+                setupRenderToTexture(x, y, pos.x(), pos.y(), osg::Vec3f(north.x(), north.y(), 0.f), zMin, zMax);
 
-            auto coords = std::make_pair(x,y);
-            MapSegment& segment = mInteriorSegments[coords];
-            if (!segment.mFogOfWarImage)
-            {
-                bool loaded = false;
-                for(size_t index{}; index < segmentMappings.size(); index++)
+                auto coords = std::make_pair(x, y);
+                MapSegment& segment = mInteriorSegments[coords];
+                if (!segment.mFogOfWarImage)
                 {
-                    if(segmentMappings[index] == coords)
+                    bool loaded = false;
+                    for (size_t index{}; index < segmentMappings.size(); index++)
                     {
-                        ESM::FogState* fog = cell->getFog();
-                        segment.loadFogOfWar(fog->mFogTextures[index]);
-                        loaded = true;
-                        break;
+                        if (segmentMappings[index] == coords)
+                        {
+                            ESM::FogState* fog = cell->getFog();
+                            segment.loadFogOfWar(fog->mFogTextures[index]);
+                            loaded = true;
+                            break;
+                        }
                     }
+                    if (!loaded)
+                        segment.initFogOfWar();
                 }
-                if(!loaded)
-                    segment.initFogOfWar();
             }
         }
     }
-}
 
-void LocalMap::worldToInteriorMapPosition (osg::Vec2f pos, float& nX, float& nY, int& x, int& y)
-{
-    pos = rotatePoint(pos, osg::Vec2f(mBounds.center().x(), mBounds.center().y()), mAngle);
-
-    osg::Vec2f min(mBounds.xMin(), mBounds.yMin());
+    void LocalMap::worldToInteriorMapPosition(osg::Vec2f pos, float& nX, float& nY, int& x, int& y)
+    {
+        pos = rotatePoint(pos, osg::Vec2f(mBounds.center().x(), mBounds.center().y()), mAngle);
 
-    x = static_cast<int>(std::ceil((pos.x() - min.x()) / mMapWorldSize) - 1);
-    y = static_cast<int>(std::ceil((pos.y() - min.y()) / mMapWorldSize) - 1);
+        osg::Vec2f min(mBounds.xMin(), mBounds.yMin());
 
-    nX = (pos.x() - min.x() - mMapWorldSize*x)/mMapWorldSize;
-    nY = 1.0f-(pos.y() - min.y() - mMapWorldSize*y)/mMapWorldSize;
-}
+        x = static_cast<int>(std::ceil((pos.x() - min.x()) / mMapWorldSize) - 1);
+        y = static_cast<int>(std::ceil((pos.y() - min.y()) / mMapWorldSize) - 1);
 
-osg::Vec2f LocalMap::interiorMapToWorldPosition (float nX, float nY, int x, int y)
-{
-    osg::Vec2f min(mBounds.xMin(), mBounds.yMin());
-    osg::Vec2f pos (mMapWorldSize * (nX + x) + min.x(),
-                    mMapWorldSize * (1.0f-nY + y) + min.y());
+        nX = (pos.x() - min.x() - mMapWorldSize * x) / mMapWorldSize;
+        nY = 1.0f - (pos.y() - min.y() - mMapWorldSize * y) / mMapWorldSize;
+    }
 
-    pos = rotatePoint(pos, osg::Vec2f(mBounds.center().x(), mBounds.center().y()), -mAngle);
-    return pos;
-}
+    osg::Vec2f LocalMap::interiorMapToWorldPosition(float nX, float nY, int x, int y)
+    {
+        osg::Vec2f min(mBounds.xMin(), mBounds.yMin());
+        osg::Vec2f pos(mMapWorldSize * (nX + x) + min.x(), mMapWorldSize * (1.0f - nY + y) + min.y());
 
-bool LocalMap::isPositionExplored (float nX, float nY, int x, int y)
-{
-    auto& segments(mInterior ? mInteriorSegments : mExteriorSegments);
-    const MapSegment& segment = segments[std::make_pair(x, y)];
-    if (!segment.mFogOfWarImage)
-        return false;
+        pos = rotatePoint(pos, osg::Vec2f(mBounds.center().x(), mBounds.center().y()), -mAngle);
+        return pos;
+    }
 
-    nX = std::clamp(nX, 0.f, 1.f);
-    nY = std::clamp(nY, 0.f, 1.f);
+    bool LocalMap::isPositionExplored(float nX, float nY, int x, int y)
+    {
+        auto& segments(mInterior ? mInteriorSegments : mExteriorSegments);
+        const MapSegment& segment = segments[std::make_pair(x, y)];
+        if (!segment.mFogOfWarImage)
+            return false;
 
-    int texU = static_cast<int>((sFogOfWarResolution - 1) * nX);
-    int texV = static_cast<int>((sFogOfWarResolution - 1) * nY);
+        nX = std::clamp(nX, 0.f, 1.f);
+        nY = std::clamp(nY, 0.f, 1.f);
 
-    uint32_t clr = ((const uint32_t*)segment.mFogOfWarImage->data())[texV * sFogOfWarResolution + texU];
-    uint8_t alpha = (clr >> 24);
-    return alpha < 200;
-}
+        int texU = static_cast<int>((sFogOfWarResolution - 1) * nX);
+        int texV = static_cast<int>((sFogOfWarResolution - 1) * nY);
 
-osg::Group* LocalMap::getRoot()
-{
-    return mRoot;
-}
-
-void LocalMap::updatePlayer (const osg::Vec3f& position, const osg::Quat& orientation,
-                             float& u, float& v, int& x, int& y, osg::Vec3f& direction)
-{
-    // retrieve the x,y grid coordinates the player is in
-    osg::Vec2f pos(position.x(), position.y());
+        uint32_t clr = ((const uint32_t*)segment.mFogOfWarImage->data())[texV * sFogOfWarResolution + texU];
+        uint8_t alpha = (clr >> 24);
+        return alpha < 200;
+    }
 
-    if (mInterior)
+    osg::Group* LocalMap::getRoot()
     {
-        worldToInteriorMapPosition(pos, u,v, x,y);
-
-        osg::Quat cameraOrient (mAngle, osg::Vec3(0,0,-1));
-        direction = orientation * cameraOrient.inverse() * osg::Vec3f(0,1,0);
+        return mRoot;
     }
-    else
+
+    void LocalMap::updatePlayer(const osg::Vec3f& position, const osg::Quat& orientation, float& u, float& v, int& x,
+        int& y, osg::Vec3f& direction)
     {
-        direction = orientation * osg::Vec3f(0,1,0);
+        // retrieve the x,y grid coordinates the player is in
+        osg::Vec2f pos(position.x(), position.y());
 
-        x = static_cast<int>(std::ceil(pos.x() / mMapWorldSize) - 1);
-        y = static_cast<int>(std::ceil(pos.y() / mMapWorldSize) - 1);
+        if (mInterior)
+        {
+            worldToInteriorMapPosition(pos, u, v, x, y);
 
-        // convert from world coordinates to texture UV coordinates
-        u = std::abs((pos.x() - (mMapWorldSize*x))/mMapWorldSize);
-        v = 1.0f-std::abs((pos.y() - (mMapWorldSize*y))/mMapWorldSize);
-    }
+            osg::Quat cameraOrient(mAngle, osg::Vec3(0, 0, -1));
+            direction = orientation * cameraOrient.inverse() * osg::Vec3f(0, 1, 0);
+        }
+        else
+        {
+            direction = orientation * osg::Vec3f(0, 1, 0);
 
-    // explore radius (squared)
-    const float exploreRadius = 0.17f * (sFogOfWarResolution-1); // explore radius from 0 to sFogOfWarResolution-1
-    const float sqrExploreRadius = square(exploreRadius);
-    const float exploreRadiusUV = exploreRadius / sFogOfWarResolution; // explore radius from 0 to 1 (UV space)
+            x = static_cast<int>(std::ceil(pos.x() / mMapWorldSize) - 1);
+            y = static_cast<int>(std::ceil(pos.y() / mMapWorldSize) - 1);
 
-    // change the affected fog of war textures (in a 3x3 grid around the player)
-    for (int mx = -mCellDistance; mx<=mCellDistance; ++mx)
-    {
-        for (int my = -mCellDistance; my<=mCellDistance; ++my)
+            // convert from world coordinates to texture UV coordinates
+            u = std::abs((pos.x() - (mMapWorldSize * x)) / mMapWorldSize);
+            v = 1.0f - std::abs((pos.y() - (mMapWorldSize * y)) / mMapWorldSize);
+        }
+
+        // explore radius (squared)
+        const float exploreRadius = 0.17f * (sFogOfWarResolution - 1); // explore radius from 0 to sFogOfWarResolution-1
+        const float sqrExploreRadius = square(exploreRadius);
+        const float exploreRadiusUV = exploreRadius / sFogOfWarResolution; // explore radius from 0 to 1 (UV space)
+
+        // change the affected fog of war textures (in a 3x3 grid around the player)
+        for (int mx = -mCellDistance; mx <= mCellDistance; ++mx)
         {
-            // is this texture affected at all?
-            bool affected = false;
-            if (mx == 0 && my == 0) // the player is always in the center of the 3x3 grid
-                affected = true;
-            else
+            for (int my = -mCellDistance; my <= mCellDistance; ++my)
             {
-                bool affectsX = (mx > 0)? (u + exploreRadiusUV > 1) : (u - exploreRadiusUV < 0);
-                bool affectsY = (my > 0)? (v + exploreRadiusUV > 1) : (v - exploreRadiusUV < 0);
-                affected = (affectsX && (my == 0)) || (affectsY && mx == 0) || (affectsX && affectsY);
-            }
+                // is this texture affected at all?
+                bool affected = false;
+                if (mx == 0 && my == 0) // the player is always in the center of the 3x3 grid
+                    affected = true;
+                else
+                {
+                    bool affectsX = (mx > 0) ? (u + exploreRadiusUV > 1) : (u - exploreRadiusUV < 0);
+                    bool affectsY = (my > 0) ? (v + exploreRadiusUV > 1) : (v - exploreRadiusUV < 0);
+                    affected = (affectsX && (my == 0)) || (affectsY && mx == 0) || (affectsX && affectsY);
+                }
 
-            if (!affected)
-                continue;
+                if (!affected)
+                    continue;
 
-            int texX = x + mx;
-            int texY = y + my*-1;
+                int texX = x + mx;
+                int texY = y + my * -1;
 
-            auto& segments(mInterior ? mInteriorSegments : mExteriorSegments);
-            MapSegment& segment = segments[std::make_pair(texX, texY)];
+                auto& segments(mInterior ? mInteriorSegments : mExteriorSegments);
+                MapSegment& segment = segments[std::make_pair(texX, texY)];
 
-            if (!segment.mFogOfWarImage || !segment.mMapTexture)
-                continue;
+                if (!segment.mFogOfWarImage || !segment.mMapTexture)
+                    continue;
 
-            uint32_t* data = (uint32_t*)segment.mFogOfWarImage->data();
-            bool changed = false;
-            for (int texV = 0; texV<sFogOfWarResolution; ++texV)
-            {
-                for (int texU = 0; texU<sFogOfWarResolution; ++texU)
+                uint32_t* data = (uint32_t*)segment.mFogOfWarImage->data();
+                bool changed = false;
+                for (int texV = 0; texV < sFogOfWarResolution; ++texV)
                 {
-                    float sqrDist = square((texU + mx*(sFogOfWarResolution-1)) - u*(sFogOfWarResolution-1))
-                            + square((texV + my*(sFogOfWarResolution-1)) - v*(sFogOfWarResolution-1));
-
-                    uint32_t clr = *(uint32_t*)data;
-                    uint8_t alpha = (clr >> 24);
-                    alpha = std::min(alpha, (uint8_t)(std::clamp(sqrDist/sqrExploreRadius, 0.f, 1.f) * 255));
-                    uint32_t val = (uint32_t) (alpha << 24);
-                    if ( *data != val)
+                    for (int texU = 0; texU < sFogOfWarResolution; ++texU)
                     {
-                        *data = val;
-                        changed = true;
+                        float sqrDist = square((texU + mx * (sFogOfWarResolution - 1)) - u * (sFogOfWarResolution - 1))
+                            + square((texV + my * (sFogOfWarResolution - 1)) - v * (sFogOfWarResolution - 1));
+
+                        uint32_t clr = *(uint32_t*)data;
+                        uint8_t alpha = (clr >> 24);
+                        alpha = std::min(alpha, (uint8_t)(std::clamp(sqrDist / sqrExploreRadius, 0.f, 1.f) * 255));
+                        uint32_t val = (uint32_t)(alpha << 24);
+                        if (*data != val)
+                        {
+                            *data = val;
+                            changed = true;
+                        }
+
+                        ++data;
                     }
-
-                    ++data;
                 }
-            }
 
-            if (changed)
-            {
-                segment.mHasFogState = true;
-                segment.mFogOfWarImage->dirty();
+                if (changed)
+                {
+                    segment.mHasFogState = true;
+                    segment.mFogOfWarImage->dirty();
+                }
             }
         }
     }
-}
-
-LocalMap::MapSegment::MapSegment()
-    : mHasFogState(false)
-{
-}
-
-void LocalMap::MapSegment::createFogOfWarTexture()
-{
-    if (mFogOfWarTexture)
-        return;
-    mFogOfWarTexture = new osg::Texture2D;
-    // TODO: synchronize access? for now, the worst that could happen is the draw thread jumping a frame ahead.
-    //mFogOfWarTexture->setDataVariance(osg::Object::DYNAMIC);
-    mFogOfWarTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
-    mFogOfWarTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-    mFogOfWarTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-    mFogOfWarTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-    mFogOfWarTexture->setUnRefImageDataAfterApply(false);
-    mFogOfWarTexture->setImage(mFogOfWarImage);
-}
-
-void LocalMap::MapSegment::initFogOfWar()
-{
-    mFogOfWarImage = new osg::Image;
-    // Assign a PixelBufferObject for asynchronous transfer of data to the GPU
-    mFogOfWarImage->setPixelBufferObject(new osg::PixelBufferObject);
-    mFogOfWarImage->allocateImage(sFogOfWarResolution, sFogOfWarResolution, 1, GL_RGBA, GL_UNSIGNED_BYTE);
-    assert(mFogOfWarImage->isDataContiguous());
-    std::vector<uint32_t> data;
-    data.resize(sFogOfWarResolution*sFogOfWarResolution, 0xff000000);
-
-    memcpy(mFogOfWarImage->data(), data.data(), data.size()*4);
-
-    createFogOfWarTexture();
-}
 
-void LocalMap::MapSegment::loadFogOfWar(const ESM::FogTexture &esm)
-{
-    const std::vector<char>& data = esm.mImageData;
-    if (data.empty())
+    LocalMap::MapSegment::MapSegment()
+        : mHasFogState(false)
     {
-        initFogOfWar();
-        return;
     }
 
-    osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension("png");
-    if (!readerwriter)
+    void LocalMap::MapSegment::createFogOfWarTexture()
     {
-        Log(Debug::Error) << "Error: Unable to load fog, can't find a png ReaderWriter" ;
-        return;
+        if (mFogOfWarTexture)
+            return;
+        mFogOfWarTexture = new osg::Texture2D;
+        // TODO: synchronize access? for now, the worst that could happen is the draw thread jumping a frame ahead.
+        // mFogOfWarTexture->setDataVariance(osg::Object::DYNAMIC);
+        mFogOfWarTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
+        mFogOfWarTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+        mFogOfWarTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+        mFogOfWarTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+        mFogOfWarTexture->setUnRefImageDataAfterApply(false);
+        mFogOfWarTexture->setImage(mFogOfWarImage);
     }
 
-    Files::IMemStream in(data.data(), data.size());
-
-    osgDB::ReaderWriter::ReadResult result = readerwriter->readImage(in);
-    if (!result.success())
+    void LocalMap::MapSegment::initFogOfWar()
     {
-        Log(Debug::Error) << "Error: Failed to read fog: " << result.message() << " code " << result.status();
-        return;
+        mFogOfWarImage = new osg::Image;
+        // Assign a PixelBufferObject for asynchronous transfer of data to the GPU
+        mFogOfWarImage->setPixelBufferObject(new osg::PixelBufferObject);
+        mFogOfWarImage->allocateImage(sFogOfWarResolution, sFogOfWarResolution, 1, GL_RGBA, GL_UNSIGNED_BYTE);
+        assert(mFogOfWarImage->isDataContiguous());
+        std::vector<uint32_t> data;
+        data.resize(sFogOfWarResolution * sFogOfWarResolution, 0xff000000);
+
+        memcpy(mFogOfWarImage->data(), data.data(), data.size() * 4);
+
+        createFogOfWarTexture();
     }
 
-    mFogOfWarImage = result.getImage();
-    mFogOfWarImage->flipVertical();
-    mFogOfWarImage->dirty();
+    void LocalMap::MapSegment::loadFogOfWar(const ESM::FogTexture& esm)
+    {
+        const std::vector<char>& data = esm.mImageData;
+        if (data.empty())
+        {
+            initFogOfWar();
+            return;
+        }
 
-    createFogOfWarTexture();
-    mHasFogState = true;
-}
+        osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension("png");
+        if (!readerwriter)
+        {
+            Log(Debug::Error) << "Error: Unable to load fog, can't find a png ReaderWriter";
+            return;
+        }
 
-void LocalMap::MapSegment::saveFogOfWar(ESM::FogTexture &fog) const
-{
-    if (!mFogOfWarImage)
-        return;
+        Files::IMemStream in(data.data(), data.size());
 
-    std::ostringstream ostream;
+        osgDB::ReaderWriter::ReadResult result = readerwriter->readImage(in);
+        if (!result.success())
+        {
+            Log(Debug::Error) << "Error: Failed to read fog: " << result.message() << " code " << result.status();
+            return;
+        }
 
-    osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension("png");
-    if (!readerwriter)
-    {
-        Log(Debug::Error) << "Error: Unable to write fog, can't find a png ReaderWriter";
-        return;
+        mFogOfWarImage = result.getImage();
+        mFogOfWarImage->flipVertical();
+        mFogOfWarImage->dirty();
+
+        createFogOfWarTexture();
+        mHasFogState = true;
     }
 
-    // extra flips are unfortunate, but required for compatibility with older versions
-    mFogOfWarImage->flipVertical();
-    osgDB::ReaderWriter::WriteResult result = readerwriter->writeImage(*mFogOfWarImage, ostream);
-    if (!result.success())
+    void LocalMap::MapSegment::saveFogOfWar(ESM::FogTexture& fog) const
     {
-        Log(Debug::Error) << "Error: Unable to write fog: " << result.message() << " code " << result.status();
-        return;
-    }
-    mFogOfWarImage->flipVertical();
+        if (!mFogOfWarImage)
+            return;
 
-    std::string data = ostream.str();
-    fog.mImageData = std::vector<char>(data.begin(), data.end());
-}
+        std::ostringstream ostream;
 
-LocalMapRenderToTexture::LocalMapRenderToTexture(osg::Node* sceneRoot, int res, int mapWorldSize, float x, float y, const osg::Vec3d& upVector, float zmin, float zmax)
-    : RTTNode(res, res, 0, false, 0, StereoAwareness::Unaware_MultiViewShaders)
-    , mSceneRoot(sceneRoot)
-    , mActive(true)
-{
-    setNodeMask(Mask_RenderToTexture);
+        osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension("png");
+        if (!readerwriter)
+        {
+            Log(Debug::Error) << "Error: Unable to write fog, can't find a png ReaderWriter";
+            return;
+        }
+
+        // extra flips are unfortunate, but required for compatibility with older versions
+        mFogOfWarImage->flipVertical();
+        osgDB::ReaderWriter::WriteResult result = readerwriter->writeImage(*mFogOfWarImage, ostream);
+        if (!result.success())
+        {
+            Log(Debug::Error) << "Error: Unable to write fog: " << result.message() << " code " << result.status();
+            return;
+        }
+        mFogOfWarImage->flipVertical();
 
-    if (SceneUtil::AutoDepth::isReversed())
-        mProjectionMatrix = SceneUtil::getReversedZProjectionMatrixAsOrtho(-mapWorldSize / 2, mapWorldSize / 2, -mapWorldSize / 2, mapWorldSize / 2, 5, (zmax - zmin) + 10);
-    else
-        mProjectionMatrix.makeOrtho(-mapWorldSize / 2, mapWorldSize / 2, -mapWorldSize / 2, mapWorldSize / 2, 5, (zmax - zmin) + 10);
+        std::string data = ostream.str();
+        fog.mImageData = std::vector<char>(data.begin(), data.end());
+    }
 
-    mViewMatrix.makeLookAt(osg::Vec3d(x, y, zmax + 5), osg::Vec3d(x, y, zmin), upVector);
+    LocalMapRenderToTexture::LocalMapRenderToTexture(osg::Node* sceneRoot, int res, int mapWorldSize, float x, float y,
+        const osg::Vec3d& upVector, float zmin, float zmax)
+        : RTTNode(res, res, 0, false, 0, StereoAwareness::Unaware_MultiViewShaders)
+        , mSceneRoot(sceneRoot)
+        , mActive(true)
+    {
+        setNodeMask(Mask_RenderToTexture);
 
-    setUpdateCallback(new CameraLocalUpdateCallback);
-    setDepthBufferInternalFormat(GL_DEPTH24_STENCIL8);
-}
+        if (SceneUtil::AutoDepth::isReversed())
+            mProjectionMatrix = SceneUtil::getReversedZProjectionMatrixAsOrtho(
+                -mapWorldSize / 2, mapWorldSize / 2, -mapWorldSize / 2, mapWorldSize / 2, 5, (zmax - zmin) + 10);
+        else
+            mProjectionMatrix.makeOrtho(
+                -mapWorldSize / 2, mapWorldSize / 2, -mapWorldSize / 2, mapWorldSize / 2, 5, (zmax - zmin) + 10);
 
-void LocalMapRenderToTexture::setDefaults(osg::Camera* camera)
-{
-    // Disable small feature culling, it's not going to be reliable for this camera
-    osg::Camera::CullingMode cullingMode = (osg::Camera::DEFAULT_CULLING | osg::Camera::FAR_PLANE_CULLING) & ~(osg::Camera::SMALL_FEATURE_CULLING);
-    camera->setCullingMode(cullingMode);
-
-    SceneUtil::setCameraClearDepth(camera);
-    camera->setComputeNearFarMode(osg::Camera::DO_NOT_COMPUTE_NEAR_FAR);
-    camera->setReferenceFrame(osg::Camera::ABSOLUTE_RF_INHERIT_VIEWPOINT);
-    camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT, osg::Camera::PIXEL_BUFFER_RTT);
-    camera->setClearColor(osg::Vec4(0.f, 0.f, 0.f, 1.f));
-    camera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-    camera->setRenderOrder(osg::Camera::PRE_RENDER);
-
-    camera->setCullMask(Mask_Scene | Mask_SimpleWater | Mask_Terrain | Mask_Object | Mask_Static);
-    camera->setCullMaskLeft(Mask_Scene | Mask_SimpleWater | Mask_Terrain | Mask_Object | Mask_Static);
-    camera->setCullMaskRight(Mask_Scene | Mask_SimpleWater | Mask_Terrain | Mask_Object | Mask_Static);
-    camera->setNodeMask(Mask_RenderToTexture);
-    camera->setProjectionMatrix(mProjectionMatrix);
-    camera->setViewMatrix(mViewMatrix);
-
-    auto* stateset = camera->getOrCreateStateSet();
-
-    stateset->setAttribute(new osg::PolygonMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::FILL), osg::StateAttribute::OVERRIDE);
-    stateset->addUniform(new osg::Uniform("projectionMatrix", static_cast<osg::Matrixf>(mProjectionMatrix)), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
-
-    if (Stereo::getMultiview())
-        Stereo::setMultiviewMatrices(stateset, { mProjectionMatrix, mProjectionMatrix });
-
-    // assign large value to effectively turn off fog
-    // shaders don't respect glDisable(GL_FOG)
-    osg::ref_ptr<osg::Fog> fog(new osg::Fog);
-    fog->setStart(10000000);
-    fog->setEnd(10000000);
-    stateset->setAttributeAndModes(fog, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE);
-
-    // turn of sky blending
-    stateset->addUniform(new osg::Uniform("far", 10000000.0f));
-    stateset->addUniform(new osg::Uniform("skyBlendingStart", 8000000.0f));
-    stateset->addUniform(new osg::Uniform("sky", 0));
-    stateset->addUniform(new osg::Uniform("screenRes", osg::Vec2f{1, 1}));
-
-    osg::ref_ptr<osg::LightModel> lightmodel = new osg::LightModel;
-    lightmodel->setAmbientIntensity(osg::Vec4(0.3f, 0.3f, 0.3f, 1.f));
-    stateset->setAttributeAndModes(lightmodel, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
-
-    osg::ref_ptr<osg::Light> light = new osg::Light;
-    light->setPosition(osg::Vec4(-0.3f, -0.3f, 0.7f, 0.f));
-    light->setDiffuse(osg::Vec4(0.7f, 0.7f, 0.7f, 1.f));
-    light->setAmbient(osg::Vec4(0, 0, 0, 1));
-    light->setSpecular(osg::Vec4(0, 0, 0, 0));
-    light->setLightNum(0);
-    light->setConstantAttenuation(1.f);
-    light->setLinearAttenuation(0.f);
-    light->setQuadraticAttenuation(0.f);
-
-    osg::ref_ptr<osg::LightSource> lightSource = new osg::LightSource;
-    lightSource->setLight(light);
-
-    lightSource->setStateSetModes(*stateset, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
-
-    SceneUtil::ShadowManager::disableShadowsForStateSet(stateset);
-
-    // override sun for local map 
-    SceneUtil::configureStateSetSunOverride(static_cast<SceneUtil::LightManager*>(mSceneRoot), light, stateset);
-
-    camera->addChild(lightSource);
-    camera->addChild(mSceneRoot);
-}
+        mViewMatrix.makeLookAt(osg::Vec3d(x, y, zmax + 5), osg::Vec3d(x, y, zmin), upVector);
 
-void CameraLocalUpdateCallback::operator()(LocalMapRenderToTexture* node, osg::NodeVisitor* nv)
-{
-    if (!node->isActive())
-        node->setNodeMask(0);
+        setUpdateCallback(new CameraLocalUpdateCallback);
+        setDepthBufferInternalFormat(GL_DEPTH24_STENCIL8);
+    }
 
-    if (node->isActive())
+    void LocalMapRenderToTexture::setDefaults(osg::Camera* camera)
     {
-        node->setIsActive(false);
+        // Disable small feature culling, it's not going to be reliable for this camera
+        osg::Camera::CullingMode cullingMode
+            = (osg::Camera::DEFAULT_CULLING | osg::Camera::FAR_PLANE_CULLING) & ~(osg::Camera::SMALL_FEATURE_CULLING);
+        camera->setCullingMode(cullingMode);
+
+        SceneUtil::setCameraClearDepth(camera);
+        camera->setComputeNearFarMode(osg::Camera::DO_NOT_COMPUTE_NEAR_FAR);
+        camera->setReferenceFrame(osg::Camera::ABSOLUTE_RF_INHERIT_VIEWPOINT);
+        camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT, osg::Camera::PIXEL_BUFFER_RTT);
+        camera->setClearColor(osg::Vec4(0.f, 0.f, 0.f, 1.f));
+        camera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+        camera->setRenderOrder(osg::Camera::PRE_RENDER);
+
+        camera->setCullMask(Mask_Scene | Mask_SimpleWater | Mask_Terrain | Mask_Object | Mask_Static);
+        camera->setCullMaskLeft(Mask_Scene | Mask_SimpleWater | Mask_Terrain | Mask_Object | Mask_Static);
+        camera->setCullMaskRight(Mask_Scene | Mask_SimpleWater | Mask_Terrain | Mask_Object | Mask_Static);
+        camera->setNodeMask(Mask_RenderToTexture);
+        camera->setProjectionMatrix(mProjectionMatrix);
+        camera->setViewMatrix(mViewMatrix);
+
+        auto* stateset = camera->getOrCreateStateSet();
+
+        stateset->setAttribute(new osg::PolygonMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::FILL),
+            osg::StateAttribute::OVERRIDE);
+        stateset->addUniform(new osg::Uniform("projectionMatrix", static_cast<osg::Matrixf>(mProjectionMatrix)),
+            osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+
+        if (Stereo::getMultiview())
+            Stereo::setMultiviewMatrices(stateset, { mProjectionMatrix, mProjectionMatrix });
+
+        // assign large value to effectively turn off fog
+        // shaders don't respect glDisable(GL_FOG)
+        osg::ref_ptr<osg::Fog> fog(new osg::Fog);
+        fog->setStart(10000000);
+        fog->setEnd(10000000);
+        stateset->setAttributeAndModes(fog, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE);
+
+        // turn of sky blending
+        stateset->addUniform(new osg::Uniform("far", 10000000.0f));
+        stateset->addUniform(new osg::Uniform("skyBlendingStart", 8000000.0f));
+        stateset->addUniform(new osg::Uniform("sky", 0));
+        stateset->addUniform(new osg::Uniform("screenRes", osg::Vec2f{ 1, 1 }));
+
+        osg::ref_ptr<osg::LightModel> lightmodel = new osg::LightModel;
+        lightmodel->setAmbientIntensity(osg::Vec4(0.3f, 0.3f, 0.3f, 1.f));
+        stateset->setAttributeAndModes(lightmodel, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+
+        osg::ref_ptr<osg::Light> light = new osg::Light;
+        light->setPosition(osg::Vec4(-0.3f, -0.3f, 0.7f, 0.f));
+        light->setDiffuse(osg::Vec4(0.7f, 0.7f, 0.7f, 1.f));
+        light->setAmbient(osg::Vec4(0, 0, 0, 1));
+        light->setSpecular(osg::Vec4(0, 0, 0, 0));
+        light->setLightNum(0);
+        light->setConstantAttenuation(1.f);
+        light->setLinearAttenuation(0.f);
+        light->setQuadraticAttenuation(0.f);
+
+        osg::ref_ptr<osg::LightSource> lightSource = new osg::LightSource;
+        lightSource->setLight(light);
+
+        lightSource->setStateSetModes(*stateset, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+
+        SceneUtil::ShadowManager::disableShadowsForStateSet(stateset);
+
+        // override sun for local map
+        SceneUtil::configureStateSetSunOverride(static_cast<SceneUtil::LightManager*>(mSceneRoot), light, stateset);
+
+        camera->addChild(lightSource);
+        camera->addChild(mSceneRoot);
     }
 
-    // Rtt-nodes do not forward update traversal to their cameras so we can traverse safely.
-    // Traverse in case there are nested callbacks.
-    traverse(node, nv);
-}
+    void CameraLocalUpdateCallback::operator()(LocalMapRenderToTexture* node, osg::NodeVisitor* nv)
+    {
+        if (!node->isActive())
+            node->setNodeMask(0);
+
+        if (node->isActive())
+        {
+            node->setIsActive(false);
+        }
+
+        // Rtt-nodes do not forward update traversal to their cameras so we can traverse safely.
+        // Traverse in case there are nested callbacks.
+        traverse(node, nv);
+    }
 
 }
diff --git a/apps/openmw/mwrender/localmap.hpp b/apps/openmw/mwrender/localmap.hpp
index 911671aee2..f4a856606e 100644
--- a/apps/openmw/mwrender/localmap.hpp
+++ b/apps/openmw/mwrender/localmap.hpp
@@ -1,9 +1,9 @@
 #ifndef GAME_RENDER_LOCALMAP_H
 #define GAME_RENDER_LOCALMAP_H
 
+#include <map>
 #include <set>
 #include <vector>
-#include <map>
 
 #include <osg/BoundingBox>
 #include <osg/Quat>
@@ -47,18 +47,19 @@ namespace MWRender
         void clear();
 
         /**
-         * Request a map render for the given cell. Render textures will be immediately created and can be retrieved with the getMapTexture function.
+         * Request a map render for the given cell. Render textures will be immediately created and can be retrieved
+         * with the getMapTexture function.
          */
-        void requestMap (const MWWorld::CellStore* cell);
+        void requestMap(const MWWorld::CellStore* cell);
 
         void addCell(MWWorld::CellStore* cell);
         void removeExteriorCell(int x, int y);
 
-        void removeCell (MWWorld::CellStore* cell);
+        void removeCell(MWWorld::CellStore* cell);
 
-        osg::ref_ptr<osg::Texture2D> getMapTexture (int x, int y);
+        osg::ref_ptr<osg::Texture2D> getMapTexture(int x, int y);
 
-        osg::ref_ptr<osg::Texture2D> getFogOfWarTexture (int x, int y);
+        osg::ref_ptr<osg::Texture2D> getFogOfWarTexture(int x, int y);
 
         /**
          * Removes cameras that have already been rendered. Should be called every frame to ensure that
@@ -68,12 +69,13 @@ namespace MWRender
         void cleanupCameras();
 
         /**
-         * Set the position & direction of the player, and returns the position in map space through the reference parameters.
+         * Set the position & direction of the player, and returns the position in map space through the reference
+         * parameters.
          * @remarks This is used to draw a "fog of war" effect
          * to hide areas on the map the player has not discovered yet.
          */
-        void updatePlayer (const osg::Vec3f& position, const osg::Quat& orientation,
-                           float& u, float& v, int& x, int& y, osg::Vec3f& direction);
+        void updatePlayer(const osg::Vec3f& position, const osg::Quat& orientation, float& u, float& v, int& x, int& y,
+            osg::Vec3f& direction);
 
         /**
          * Save the fog of war for this cell to its CellStore.
@@ -84,14 +86,14 @@ namespace MWRender
         /**
          * Get the interior map texture index and normalized position on this texture, given a world position
          */
-        void worldToInteriorMapPosition (osg::Vec2f pos, float& nX, float& nY, int& x, int& y);
+        void worldToInteriorMapPosition(osg::Vec2f pos, float& nX, float& nY, int& x, int& y);
 
-        osg::Vec2f interiorMapToWorldPosition (float nX, float nY, int x, int y);
+        osg::Vec2f interiorMapToWorldPosition(float nX, float nY, int x, int y);
 
         /**
          * Check if a given position is explored by the player (i.e. not obscured by fog of war)
          */
-        bool isPositionExplored (float nX, float nY, int x, int y);
+        bool isPositionExplored(float nX, float nY, int x, int y);
 
         osg::Group* getRoot();
 
@@ -99,10 +101,10 @@ namespace MWRender
         osg::ref_ptr<osg::Group> mRoot;
         osg::ref_ptr<osg::Node> mSceneRoot;
 
-        typedef std::vector< osg::ref_ptr<LocalMapRenderToTexture> > RTTVector;
+        typedef std::vector<osg::ref_ptr<LocalMapRenderToTexture>> RTTVector;
         RTTVector mLocalMapRTTs;
 
-        typedef std::set<std::pair<int, int> > Grid;
+        typedef std::set<std::pair<int, int>> Grid;
         Grid mCurrentGrid;
 
         struct MapSegment
@@ -144,7 +146,8 @@ namespace MWRender
         void requestExteriorMap(const MWWorld::CellStore* cell);
         void requestInteriorMap(const MWWorld::CellStore* cell);
 
-        void setupRenderToTexture(int segment_x, int segment_y, float left, float top, const osg::Vec3d& upVector, float zmin, float zmax);
+        void setupRenderToTexture(
+            int segment_x, int segment_y, float left, float top, const osg::Vec3d& upVector, float zmin, float zmax);
 
         bool mInterior;
         osg::BoundingBox mBounds;
diff --git a/apps/openmw/mwrender/luminancecalculator.cpp b/apps/openmw/mwrender/luminancecalculator.cpp
index 06a0441d0d..6655ae4d8f 100644
--- a/apps/openmw/mwrender/luminancecalculator.cpp
+++ b/apps/openmw/mwrender/luminancecalculator.cpp
@@ -9,7 +9,8 @@ namespace MWRender
 {
     LuminanceCalculator::LuminanceCalculator(Shader::ShaderManager& shaderManager)
     {
-        const float hdrExposureTime = std::max(Settings::Manager::getFloat("auto exposure speed", "Post Processing"), 0.0001f);
+        const float hdrExposureTime
+            = std::max(Settings::Manager::getFloat("auto exposure speed", "Post Processing"), 0.0001f);
 
         constexpr float minLog = -9.0;
         constexpr float maxLog = 4.0;
@@ -18,12 +19,12 @@ namespace MWRender
         constexpr float epsilon = 0.004;
 
         Shader::ShaderManager::DefineMap defines = {
-            {"minLog", std::to_string(minLog)},
-            {"maxLog", std::to_string(maxLog)},
-            {"logLumRange", std::to_string(logLumRange)},
-            {"invLogLumRange", std::to_string(invLogLumRange)},
-            {"hdrExposureTime", std::to_string(hdrExposureTime)},
-            {"epsilon", std::to_string(epsilon)},
+            { "minLog", std::to_string(minLog) },
+            { "maxLog", std::to_string(maxLog) },
+            { "logLumRange", std::to_string(logLumRange) },
+            { "invLogLumRange", std::to_string(invLogLumRange) },
+            { "hdrExposureTime", std::to_string(hdrExposureTime) },
+            { "epsilon", std::to_string(epsilon) },
         };
 
         auto vertex = shaderManager.getShader("fullscreen_tri_vertex.glsl", {}, osg::Shader::VERTEX);
@@ -44,7 +45,8 @@ namespace MWRender
             buffer.mipmappedSceneLuminanceTex->setInternalFormat(GL_R16F);
             buffer.mipmappedSceneLuminanceTex->setSourceFormat(GL_RED);
             buffer.mipmappedSceneLuminanceTex->setSourceType(GL_FLOAT);
-            buffer.mipmappedSceneLuminanceTex->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::LINEAR_MIPMAP_NEAREST);
+            buffer.mipmappedSceneLuminanceTex->setFilter(
+                osg::Texture2D::MIN_FILTER, osg::Texture2D::LINEAR_MIPMAP_NEAREST);
             buffer.mipmappedSceneLuminanceTex->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture2D::LINEAR);
             buffer.mipmappedSceneLuminanceTex->setTextureSize(mWidth, mHeight);
             buffer.mipmappedSceneLuminanceTex->setNumMipmapLevels(mipmapLevels);
@@ -60,16 +62,20 @@ namespace MWRender
             buffer.luminanceProxyTex = new osg::Texture2D(*buffer.luminanceTex);
 
             buffer.resolveFbo = new osg::FrameBufferObject;
-            buffer.resolveFbo->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, osg::FrameBufferAttachment(buffer.luminanceTex));
+            buffer.resolveFbo->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0,
+                osg::FrameBufferAttachment(buffer.luminanceTex));
 
             buffer.luminanceProxyFbo = new osg::FrameBufferObject;
-            buffer.luminanceProxyFbo->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, osg::FrameBufferAttachment(buffer.luminanceProxyTex));
+            buffer.luminanceProxyFbo->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0,
+                osg::FrameBufferAttachment(buffer.luminanceProxyTex));
 
             buffer.resolveSceneLumFbo = new osg::FrameBufferObject;
-            buffer.resolveSceneLumFbo->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, osg::FrameBufferAttachment(buffer.mipmappedSceneLuminanceTex, mipmapLevels - 1));
+            buffer.resolveSceneLumFbo->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0,
+                osg::FrameBufferAttachment(buffer.mipmappedSceneLuminanceTex, mipmapLevels - 1));
 
             buffer.sceneLumFbo = new osg::FrameBufferObject;
-            buffer.sceneLumFbo->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, osg::FrameBufferAttachment(buffer.mipmappedSceneLuminanceTex));
+            buffer.sceneLumFbo->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0,
+                osg::FrameBufferAttachment(buffer.mipmappedSceneLuminanceTex));
 
             buffer.sceneLumSS = new osg::StateSet;
             buffer.sceneLumSS->setAttributeAndModes(mLuminanceProgram);
@@ -88,7 +94,8 @@ namespace MWRender
         mCompiled = true;
     }
 
-    void LuminanceCalculator::draw(const PingPongCanvas& canvas, osg::RenderInfo& renderInfo, osg::State& state, osg::GLExtensions* ext, size_t frameId)
+    void LuminanceCalculator::draw(const PingPongCanvas& canvas, osg::RenderInfo& renderInfo, osg::State& state,
+        osg::GLExtensions* ext, size_t frameId)
     {
         if (!mEnabled)
             return;
@@ -112,7 +119,8 @@ namespace MWRender
         buffer.luminanceProxyFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
         ext->glBlitFramebuffer(0, 0, 1, 1, 0, 0, 1, 1, GL_COLOR_BUFFER_BIT, GL_NEAREST);
 
-        if (dirty) {
+        if (dirty)
+        {
             // Use current frame data for previous frame to warm up calculations and prevent popin
             mBuffers[(frameId + 1) % 2].resolveFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
             ext->glBlitFramebuffer(0, 0, 1, 1, 0, 0, 1, 1, GL_COLOR_BUFFER_BIT, GL_NEAREST);
@@ -124,7 +132,8 @@ namespace MWRender
         state.apply(buffer.resolveSS);
         canvas.drawGeometry(renderInfo);
 
-        ext->glBindFramebuffer(GL_FRAMEBUFFER_EXT, state.getGraphicsContext() ? state.getGraphicsContext()->getDefaultFboId() : 0);
+        ext->glBindFramebuffer(
+            GL_FRAMEBUFFER_EXT, state.getGraphicsContext() ? state.getGraphicsContext()->getDefaultFboId() : 0);
     }
 
     osg::ref_ptr<osg::Texture2D> LuminanceCalculator::getLuminanceTexture(size_t frameId) const
diff --git a/apps/openmw/mwrender/luminancecalculator.hpp b/apps/openmw/mwrender/luminancecalculator.hpp
index 9d17b05653..db823dd900 100644
--- a/apps/openmw/mwrender/luminancecalculator.hpp
+++ b/apps/openmw/mwrender/luminancecalculator.hpp
@@ -4,8 +4,8 @@
 #include <array>
 
 #include <osg/FrameBufferObject>
-#include <osg/Texture2D>
 #include <osg/Program>
+#include <osg/Texture2D>
 
 namespace Shader
 {
@@ -20,12 +20,12 @@ namespace MWRender
     {
 
     public:
-
         LuminanceCalculator() = default;
 
         LuminanceCalculator(Shader::ShaderManager& shaderManager);
 
-        void draw(const PingPongCanvas& canvas, osg::RenderInfo& renderInfo, osg::State& state, osg::GLExtensions* ext, size_t frameId);
+        void draw(const PingPongCanvas& canvas, osg::RenderInfo& renderInfo, osg::State& state, osg::GLExtensions* ext,
+            size_t frameId);
 
         bool isEnabled() const { return mEnabled; }
 
@@ -43,7 +43,6 @@ namespace MWRender
         osg::ref_ptr<osg::Texture2D> getLuminanceTexture(size_t frameId) const;
 
     private:
-
         void compile();
 
         struct Container
diff --git a/apps/openmw/mwrender/navmesh.cpp b/apps/openmw/mwrender/navmesh.cpp
index 7fd12686ae..bb4a2aa234 100644
--- a/apps/openmw/mwrender/navmesh.cpp
+++ b/apps/openmw/mwrender/navmesh.cpp
@@ -1,14 +1,14 @@
 #include "navmesh.hpp"
 #include "vismask.hpp"
 
-#include <components/sceneutil/navmesh.hpp>
+#include <components/detournavigator/guardednavmeshcacheitem.hpp>
+#include <components/detournavigator/navmeshcacheitem.hpp>
+#include <components/detournavigator/settings.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
-#include <components/detournavigator/navmeshcacheitem.hpp>
 #include <components/sceneutil/detourdebugdraw.hpp>
+#include <components/sceneutil/navmesh.hpp>
 #include <components/sceneutil/workqueue.hpp>
-#include <components/detournavigator/settings.hpp>
-#include <components/detournavigator/guardednavmeshcacheitem.hpp>
 
 #include <osg/PositionAttitudeTransform>
 #include <osg/StateSet>
@@ -17,21 +17,21 @@
 
 #include "../mwbase/environment.hpp"
 
-#include <limits>
 #include <algorithm>
+#include <limits>
 
 namespace MWRender
 {
     struct NavMesh::LessByTilePosition
     {
         bool operator()(const DetourNavigator::TilePosition& lhs,
-                        const std::pair<DetourNavigator::TilePosition, DetourNavigator::Version>& rhs) const
+            const std::pair<DetourNavigator::TilePosition, DetourNavigator::Version>& rhs) const
         {
             return lhs < rhs.first;
         }
 
         bool operator()(const std::pair<DetourNavigator::TilePosition, DetourNavigator::Version>& lhs,
-                        const DetourNavigator::TilePosition& rhs) const
+            const DetourNavigator::TilePosition& rhs) const
         {
             return lhs.first < rhs;
         }
@@ -47,7 +47,7 @@ namespace MWRender
         const DetourNavigator::Settings mSettings;
         std::map<DetourNavigator::TilePosition, Tile> mTiles;
         NavMeshMode mMode;
-        std::atomic_bool mAborted {false};
+        std::atomic_bool mAborted{ false };
         std::mutex mMutex;
         bool mStarted = false;
         std::vector<std::pair<DetourNavigator::TilePosition, Tile>> mUpdatedTiles;
@@ -88,12 +88,12 @@ namespace MWRender
             unsigned minSalt = std::numeric_limits<unsigned>::max();
             unsigned maxSalt = 0;
 
-            navMeshPtr->lockConst()->forEachUsedTile([&] (const TilePosition& position, const Version& version, const dtMeshTile& meshTile)
-            {
-                existingTiles.emplace_back(position, version);
-                minSalt = std::min(minSalt, meshTile.salt);
-                maxSalt = std::max(maxSalt, meshTile.salt);
-            });
+            navMeshPtr->lockConst()->forEachUsedTile(
+                [&](const TilePosition& position, const Version& version, const dtMeshTile& meshTile) {
+                    existingTiles.emplace_back(position, version);
+                    minSalt = std::min(minSalt, meshTile.salt);
+                    maxSalt = std::max(maxSalt, meshTile.salt);
+                });
 
             if (mAborted.load(std::memory_order_acquire))
                 return;
@@ -103,7 +103,7 @@ namespace MWRender
             std::vector<DetourNavigator::TilePosition> removedTiles;
 
             for (const auto& [position, tile] : mTiles)
-                if (!std::binary_search(existingTiles.begin(), existingTiles.end(), position, LessByTilePosition {}))
+                if (!std::binary_search(existingTiles.begin(), existingTiles.end(), position, LessByTilePosition{}))
                     removedTiles.push_back(position);
 
             std::vector<std::pair<TilePosition, Tile>> updatedTiles;
@@ -116,7 +116,7 @@ namespace MWRender
             {
                 const auto it = mTiles.find(position);
                 if (it != mTiles.end() && it->second.mGroup != nullptr && it->second.mVersion == version
-                        && mMode != NavMeshMode::UpdateFrequency)
+                    && mMode != NavMeshMode::UpdateFrequency)
                     continue;
 
                 osg::ref_ptr<osg::Group> group;
@@ -139,7 +139,7 @@ namespace MWRender
                 }
                 MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(group, "debug");
                 group->setNodeMask(Mask_Debug);
-                updatedTiles.emplace_back(position, Tile {version, std::move(group)});
+                updatedTiles.emplace_back(position, Tile{ version, std::move(group) });
             }
 
             if (mAborted.load(std::memory_order_acquire))
@@ -149,10 +149,7 @@ namespace MWRender
             mRemovedTiles = std::move(removedTiles);
         }
 
-        void abort() final
-        {
-            mAborted.store(true, std::memory_order_release);
-        }
+        void abort() final { mAborted.store(true, std::memory_order_release); }
     };
 
     struct NavMesh::DeallocateCreateNavMeshTileGroups final : SceneUtil::WorkItem
@@ -160,11 +157,13 @@ namespace MWRender
         osg::ref_ptr<NavMesh::CreateNavMeshTileGroups> mWorkItem;
 
         explicit DeallocateCreateNavMeshTileGroups(osg::ref_ptr<NavMesh::CreateNavMeshTileGroups>&& workItem)
-            : mWorkItem(std::move(workItem)) {}
+            : mWorkItem(std::move(workItem))
+        {
+        }
     };
 
     NavMesh::NavMesh(const osg::ref_ptr<osg::Group>& root, const osg::ref_ptr<SceneUtil::WorkQueue>& workQueue,
-                     bool enabled, NavMeshMode mode)
+        bool enabled, NavMeshMode mode)
         : mRootNode(root)
         , mWorkQueue(workQueue)
         , mGroupStateSet(SceneUtil::makeNavMeshTileStateSet())
@@ -203,7 +202,7 @@ namespace MWRender
             return;
 
         {
-            std::pair<std::size_t, Version> lastest {0, Version {}};
+            std::pair<std::size_t, Version> lastest{ 0, Version{} };
             osg::ref_ptr<CreateNavMeshTileGroups> latestCandidate;
             for (auto it = mWorkItems.begin(); it != mWorkItems.end();)
             {
@@ -212,7 +211,7 @@ namespace MWRender
                     ++it;
                     continue;
                 }
-                const std::pair<std::size_t, Version> order {(*it)->mId, (*it)->mVersion};
+                const std::pair<std::size_t, Version> order{ (*it)->mId, (*it)->mVersion };
                 if (lastest < order)
                 {
                     lastest = order;
@@ -284,8 +283,8 @@ namespace MWRender
             return;
         }
 
-        osg::ref_ptr<CreateNavMeshTileGroups> workItem = new CreateNavMeshTileGroups(id, version, navMesh,
-            mGroupStateSet, mDebugDrawStateSet, settings, mTiles, mMode);
+        osg::ref_ptr<CreateNavMeshTileGroups> workItem = new CreateNavMeshTileGroups(
+            id, version, navMesh, mGroupStateSet, mDebugDrawStateSet, settings, mTiles, mMode);
         mWorkQueue->addWorkItem(workItem);
         mWorkItems.push_back(std::move(workItem));
     }
diff --git a/apps/openmw/mwrender/navmesh.hpp b/apps/openmw/mwrender/navmesh.hpp
index f4d3f07e94..4b4e50f791 100644
--- a/apps/openmw/mwrender/navmesh.hpp
+++ b/apps/openmw/mwrender/navmesh.hpp
@@ -3,8 +3,8 @@
 
 #include "navmeshmode.hpp"
 
-#include <components/detournavigator/version.hpp>
 #include <components/detournavigator/tileposition.hpp>
+#include <components/detournavigator/version.hpp>
 #include <components/misc/guarded.hpp>
 
 #include <osg/ref_ptr>
@@ -12,8 +12,8 @@
 #include <cstddef>
 #include <map>
 #include <memory>
-#include <vector>
 #include <string_view>
+#include <vector>
 
 class dtNavMesh;
 
@@ -41,7 +41,7 @@ namespace MWRender
     {
     public:
         explicit NavMesh(const osg::ref_ptr<osg::Group>& root, const osg::ref_ptr<SceneUtil::WorkQueue>& workQueue,
-                         bool enabled, NavMeshMode mode);
+            bool enabled, NavMeshMode mode);
         ~NavMesh();
 
         bool toggle();
@@ -55,10 +55,7 @@ namespace MWRender
 
         void disable();
 
-        bool isEnabled() const
-        {
-            return mEnabled;
-        }
+        bool isEnabled() const { return mEnabled; }
 
         void setMode(NavMeshMode value);
 
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 940b343792..a0f6cd2b57 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -1,11 +1,11 @@
 #include "npcanimation.hpp"
 
-#include <osg/UserDataContainer>
-#include <osg/MatrixTransform>
 #include <osg/Depth>
+#include <osg/MatrixTransform>
+#include <osg/UserDataContainer>
 
-#include <osgUtil/RenderBin>
 #include <osgUtil/CullVisitor>
+#include <osgUtil/RenderBin>
 
 #include <components/debug/debuglog.hpp>
 
@@ -13,1312 +13,1304 @@
 
 #include <components/misc/resourcehelpers.hpp>
 
+#include <components/esm3/loadacti.hpp>
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loaddoor.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadstat.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/actorutil.hpp>
 #include <components/sceneutil/attach.hpp>
-#include <components/sceneutil/visitor.hpp>
-#include <components/sceneutil/skeleton.hpp>
-#include <components/sceneutil/keyframe.hpp>
 #include <components/sceneutil/depth.hpp>
-#include <components/esm3/loadmgef.hpp>
-#include <components/esm3/loadstat.hpp>
-#include <components/esm3/loadacti.hpp>
-#include <components/esm3/loaddoor.hpp>
-#include <components/esm3/loadcont.hpp>
-#include <components/esm3/loadbody.hpp>
-#include <components/esm3/loadrace.hpp>
+#include <components/sceneutil/keyframe.hpp>
+#include <components/sceneutil/skeleton.hpp>
+#include <components/sceneutil/visitor.hpp>
 #include <components/settings/settings.hpp>
 
 #include <components/vfs/manager.hpp>
 
+#include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwworld/class.hpp"
 #include "../mwworld/player.hpp"
 
-#include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/weapontype.hpp"
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "camera.hpp"
-#include "rotatecontroller.hpp"
+#include "postprocessor.hpp"
 #include "renderbin.hpp"
-#include "vismask.hpp"
+#include "rotatecontroller.hpp"
 #include "util.hpp"
-#include "postprocessor.hpp"
+#include "vismask.hpp"
 
 namespace
 {
 
-std::string getVampireHead(const std::string& race, bool female, const VFS::Manager& vfs)
-{
-    static std::map <std::pair<std::string,int>, const ESM::BodyPart* > sVampireMapping;
+    std::string getVampireHead(const std::string& race, bool female, const VFS::Manager& vfs)
+    {
+        static std::map<std::pair<std::string, int>, const ESM::BodyPart*> sVampireMapping;
 
-    std::pair<std::string, int> thisCombination = std::make_pair(race, int(female));
+        std::pair<std::string, int> thisCombination = std::make_pair(race, int(female));
 
-    if (sVampireMapping.find(thisCombination) == sVampireMapping.end())
-    {
-        const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-        for (const ESM::BodyPart& bodypart : store.get<ESM::BodyPart>())
+        if (sVampireMapping.find(thisCombination) == sVampireMapping.end())
         {
-            if (!bodypart.mData.mVampire)
-                continue;
-            if (bodypart.mData.mType != ESM::BodyPart::MT_Skin)
-                continue;
-            if (bodypart.mData.mPart != ESM::BodyPart::MP_Head)
-                continue;
-            if (female != (bodypart.mData.mFlags & ESM::BodyPart::BPF_Female))
-                continue;
-            if (!Misc::StringUtils::ciEqual(bodypart.mRace, race))
-                continue;
-            sVampireMapping[thisCombination] = &bodypart;
+            const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+            for (const ESM::BodyPart& bodypart : store.get<ESM::BodyPart>())
+            {
+                if (!bodypart.mData.mVampire)
+                    continue;
+                if (bodypart.mData.mType != ESM::BodyPart::MT_Skin)
+                    continue;
+                if (bodypart.mData.mPart != ESM::BodyPart::MP_Head)
+                    continue;
+                if (female != (bodypart.mData.mFlags & ESM::BodyPart::BPF_Female))
+                    continue;
+                if (!Misc::StringUtils::ciEqual(bodypart.mRace, race))
+                    continue;
+                sVampireMapping[thisCombination] = &bodypart;
+            }
         }
-    }
 
-    sVampireMapping.emplace(thisCombination, nullptr);
+        sVampireMapping.emplace(thisCombination, nullptr);
 
-    const ESM::BodyPart* bodyPart = sVampireMapping[thisCombination];
-    if (!bodyPart)
-        return std::string();
-    return Misc::ResourceHelpers::correctMeshPath(bodyPart->mModel, &vfs);
-}
+        const ESM::BodyPart* bodyPart = sVampireMapping[thisCombination];
+        if (!bodyPart)
+            return std::string();
+        return Misc::ResourceHelpers::correctMeshPath(bodyPart->mModel, &vfs);
+    }
 
 }
 
-
 namespace MWRender
 {
 
-class HeadAnimationTime : public SceneUtil::ControllerSource
-{
-private:
-    MWWorld::Ptr mReference;
-    float mTalkStart;
-    float mTalkStop;
-    float mBlinkStart;
-    float mBlinkStop;
+    class HeadAnimationTime : public SceneUtil::ControllerSource
+    {
+    private:
+        MWWorld::Ptr mReference;
+        float mTalkStart;
+        float mTalkStop;
+        float mBlinkStart;
+        float mBlinkStop;
 
-    float mBlinkTimer;
+        float mBlinkTimer;
 
-    bool mEnabled;
+        bool mEnabled;
 
-    float mValue;
-private:
-    void resetBlinkTimer();
-public:
-    HeadAnimationTime(const MWWorld::Ptr& reference);
+        float mValue;
 
-    void updatePtr(const MWWorld::Ptr& updated);
+    private:
+        void resetBlinkTimer();
 
-    void update(float dt);
+    public:
+        HeadAnimationTime(const MWWorld::Ptr& reference);
 
-    void setEnabled(bool enabled);
+        void updatePtr(const MWWorld::Ptr& updated);
 
-    void setTalkStart(float value);
-    void setTalkStop(float value);
-    void setBlinkStart(float value);
-    void setBlinkStop(float value);
+        void update(float dt);
 
-    float getValue(osg::NodeVisitor* nv) override;
-};
+        void setEnabled(bool enabled);
 
-// --------------------------------------------------------------------------------------------------------------
+        void setTalkStart(float value);
+        void setTalkStop(float value);
+        void setBlinkStart(float value);
+        void setBlinkStop(float value);
 
-HeadAnimationTime::HeadAnimationTime(const MWWorld::Ptr& reference)
-    : mReference(reference), mTalkStart(0), mTalkStop(0), mBlinkStart(0), mBlinkStop(0), mEnabled(true), mValue(0)
-{
-    resetBlinkTimer();
-}
+        float getValue(osg::NodeVisitor* nv) override;
+    };
 
-void HeadAnimationTime::updatePtr(const MWWorld::Ptr &updated)
-{
-    mReference = updated;
-}
+    // --------------------------------------------------------------------------------------------------------------
 
-void HeadAnimationTime::setEnabled(bool enabled)
-{
-    mEnabled = enabled;
-}
+    HeadAnimationTime::HeadAnimationTime(const MWWorld::Ptr& reference)
+        : mReference(reference)
+        , mTalkStart(0)
+        , mTalkStop(0)
+        , mBlinkStart(0)
+        , mBlinkStop(0)
+        , mEnabled(true)
+        , mValue(0)
+    {
+        resetBlinkTimer();
+    }
 
-void HeadAnimationTime::resetBlinkTimer()
-{
-    auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-    mBlinkTimer = -(2.0f + Misc::Rng::rollDice(6, prng));
-}
+    void HeadAnimationTime::updatePtr(const MWWorld::Ptr& updated)
+    {
+        mReference = updated;
+    }
 
-void HeadAnimationTime::update(float dt)
-{
-    if (!mEnabled)
-        return;
+    void HeadAnimationTime::setEnabled(bool enabled)
+    {
+        mEnabled = enabled;
+    }
 
-    if (!MWBase::Environment::get().getSoundManager()->sayActive(mReference))
+    void HeadAnimationTime::resetBlinkTimer()
     {
-        mBlinkTimer += dt;
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        mBlinkTimer = -(2.0f + Misc::Rng::rollDice(6, prng));
+    }
 
-        float duration = mBlinkStop - mBlinkStart;
+    void HeadAnimationTime::update(float dt)
+    {
+        if (!mEnabled)
+            return;
 
-        if (mBlinkTimer >= 0 && mBlinkTimer <= duration)
+        if (!MWBase::Environment::get().getSoundManager()->sayActive(mReference))
         {
-            mValue = mBlinkStart + mBlinkTimer;
+            mBlinkTimer += dt;
+
+            float duration = mBlinkStop - mBlinkStart;
+
+            if (mBlinkTimer >= 0 && mBlinkTimer <= duration)
+            {
+                mValue = mBlinkStart + mBlinkTimer;
+            }
+            else
+                mValue = mBlinkStop;
+
+            if (mBlinkTimer > duration)
+                resetBlinkTimer();
         }
         else
-            mValue = mBlinkStop;
+        {
+            // FIXME: would be nice to hold on to the SoundPtr so we don't have to retrieve it every frame
+            mValue = mTalkStart
+                + (mTalkStop - mTalkStart)
+                    * std::min(1.f,
+                        MWBase::Environment::get().getSoundManager()->getSaySoundLoudness(mReference)
+                            * 2); // Rescale a bit (most voices are not very loud)
+        }
+    }
 
-        if (mBlinkTimer > duration)
-            resetBlinkTimer();
+    float HeadAnimationTime::getValue(osg::NodeVisitor*)
+    {
+        return mValue;
     }
-    else
+
+    void HeadAnimationTime::setTalkStart(float value)
     {
-        // FIXME: would be nice to hold on to the SoundPtr so we don't have to retrieve it every frame
-        mValue = mTalkStart +
-            (mTalkStop - mTalkStart) *
-            std::min(1.f, MWBase::Environment::get().getSoundManager()->getSaySoundLoudness(mReference)*2); // Rescale a bit (most voices are not very loud)
+        mTalkStart = value;
     }
-}
 
-float HeadAnimationTime::getValue(osg::NodeVisitor*)
-{
-    return mValue;
-}
+    void HeadAnimationTime::setTalkStop(float value)
+    {
+        mTalkStop = value;
+    }
 
-void HeadAnimationTime::setTalkStart(float value)
-{
-    mTalkStart = value;
-}
+    void HeadAnimationTime::setBlinkStart(float value)
+    {
+        mBlinkStart = value;
+    }
 
-void HeadAnimationTime::setTalkStop(float value)
-{
-    mTalkStop = value;
-}
+    void HeadAnimationTime::setBlinkStop(float value)
+    {
+        mBlinkStop = value;
+    }
 
-void HeadAnimationTime::setBlinkStart(float value)
-{
-    mBlinkStart = value;
-}
+    // ----------------------------------------------------
 
-void HeadAnimationTime::setBlinkStop(float value)
-{
-    mBlinkStop = value;
-}
+    NpcAnimation::NpcType NpcAnimation::getNpcType() const
+    {
+        const MWWorld::Class& cls = mPtr.getClass();
+        // Dead vampires should typically stay vampires.
+        if (mNpcType == Type_Vampire && cls.getNpcStats(mPtr).isDead() && !cls.getNpcStats(mPtr).isWerewolf())
+            return mNpcType;
+        return getNpcType(mPtr);
+    }
 
-// ----------------------------------------------------
+    NpcAnimation::NpcType NpcAnimation::getNpcType(const MWWorld::Ptr& ptr)
+    {
+        const MWWorld::Class& cls = ptr.getClass();
+        NpcAnimation::NpcType curType = Type_Normal;
+        if (cls.getCreatureStats(ptr).getMagicEffects().get(ESM::MagicEffect::Vampirism).getMagnitude() > 0)
+            curType = Type_Vampire;
+        if (cls.getNpcStats(ptr).isWerewolf())
+            curType = Type_Werewolf;
+
+        return curType;
+    }
 
-NpcAnimation::NpcType NpcAnimation::getNpcType() const
-{
-    const MWWorld::Class &cls = mPtr.getClass();
-    // Dead vampires should typically stay vampires.
-    if (mNpcType == Type_Vampire && cls.getNpcStats(mPtr).isDead() && !cls.getNpcStats(mPtr).isWerewolf())
-        return mNpcType;
-    return getNpcType(mPtr);
-}
+    static const inline NpcAnimation::PartBoneMap createPartListMap()
+    {
+        return { { ESM::PRT_Head, "Head" },
+            { ESM::PRT_Hair, "Head" }, // note it uses "Head" as attach bone, but "Hair" as filter
+            { ESM::PRT_Neck, "Neck" }, { ESM::PRT_Cuirass, "Chest" }, { ESM::PRT_Groin, "Groin" },
+            { ESM::PRT_Skirt, "Groin" }, { ESM::PRT_RHand, "Right Hand" }, { ESM::PRT_LHand, "Left Hand" },
+            { ESM::PRT_RWrist, "Right Wrist" }, { ESM::PRT_LWrist, "Left Wrist" }, { ESM::PRT_Shield, "Shield Bone" },
+            { ESM::PRT_RForearm, "Right Forearm" }, { ESM::PRT_LForearm, "Left Forearm" },
+            { ESM::PRT_RUpperarm, "Right Upper Arm" }, { ESM::PRT_LUpperarm, "Left Upper Arm" },
+            { ESM::PRT_RFoot, "Right Foot" }, { ESM::PRT_LFoot, "Left Foot" }, { ESM::PRT_RAnkle, "Right Ankle" },
+            { ESM::PRT_LAnkle, "Left Ankle" }, { ESM::PRT_RKnee, "Right Knee" }, { ESM::PRT_LKnee, "Left Knee" },
+            { ESM::PRT_RLeg, "Right Upper Leg" }, { ESM::PRT_LLeg, "Left Upper Leg" },
+            { ESM::PRT_RPauldron, "Right Clavicle" }, { ESM::PRT_LPauldron, "Left Clavicle" },
+            { ESM::PRT_Weapon, "Weapon Bone" }, // Fallback. The real node name depends on the current weapon type.
+            { ESM::PRT_Tail, "Tail" } };
+    }
+    const NpcAnimation::PartBoneMap NpcAnimation::sPartList = createPartListMap();
 
-NpcAnimation::NpcType NpcAnimation::getNpcType(const MWWorld::Ptr& ptr)
-{
-    const MWWorld::Class &cls = ptr.getClass();
-    NpcAnimation::NpcType curType = Type_Normal;
-    if (cls.getCreatureStats(ptr).getMagicEffects().get(ESM::MagicEffect::Vampirism).getMagnitude() > 0)
-        curType = Type_Vampire;
-    if (cls.getNpcStats(ptr).isWerewolf())
-        curType = Type_Werewolf;
-
-    return curType;
-}
+    NpcAnimation::~NpcAnimation()
+    {
+        mAmmunition.reset();
+    }
 
-static const inline NpcAnimation::PartBoneMap createPartListMap()
-{
-    return {
-        {ESM::PRT_Head, "Head"},
-        {ESM::PRT_Hair, "Head"}, // note it uses "Head" as attach bone, but "Hair" as filter
-        {ESM::PRT_Neck, "Neck"},
-        {ESM::PRT_Cuirass, "Chest"},
-        {ESM::PRT_Groin, "Groin"},
-        {ESM::PRT_Skirt, "Groin"},
-        {ESM::PRT_RHand, "Right Hand"},
-        {ESM::PRT_LHand, "Left Hand"},
-        {ESM::PRT_RWrist, "Right Wrist"},
-        {ESM::PRT_LWrist, "Left Wrist"},
-        {ESM::PRT_Shield, "Shield Bone"},
-        {ESM::PRT_RForearm, "Right Forearm"},
-        {ESM::PRT_LForearm, "Left Forearm"},
-        {ESM::PRT_RUpperarm, "Right Upper Arm"},
-        {ESM::PRT_LUpperarm, "Left Upper Arm"},
-        {ESM::PRT_RFoot, "Right Foot"},
-        {ESM::PRT_LFoot, "Left Foot"},
-        {ESM::PRT_RAnkle, "Right Ankle"},
-        {ESM::PRT_LAnkle, "Left Ankle"},
-        {ESM::PRT_RKnee, "Right Knee"},
-        {ESM::PRT_LKnee, "Left Knee"},
-        {ESM::PRT_RLeg, "Right Upper Leg"},
-        {ESM::PRT_LLeg, "Left Upper Leg"},
-        {ESM::PRT_RPauldron, "Right Clavicle"},
-        {ESM::PRT_LPauldron, "Left Clavicle"},
-        {ESM::PRT_Weapon, "Weapon Bone"}, // Fallback. The real node name depends on the current weapon type.
-        {ESM::PRT_Tail, "Tail"}};
-}
-const NpcAnimation::PartBoneMap NpcAnimation::sPartList = createPartListMap();
+    NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode,
+        Resource::ResourceSystem* resourceSystem, bool disableSounds, ViewMode viewMode, float firstPersonFieldOfView)
+        : ActorAnimation(ptr, parentNode, resourceSystem)
+        , mViewMode(viewMode)
+        , mShowWeapons(false)
+        , mShowCarriedLeft(true)
+        , mNpcType(getNpcType(ptr))
+        , mFirstPersonFieldOfView(firstPersonFieldOfView)
+        , mSoundsDisabled(disableSounds)
+        , mAccurateAiming(false)
+        , mAimingFactor(0.f)
+    {
+        mNpc = mPtr.get<ESM::NPC>()->mBase;
 
-NpcAnimation::~NpcAnimation()
-{
-    mAmmunition.reset();
-}
+        mHeadAnimationTime = std::make_shared<HeadAnimationTime>(mPtr);
+        mWeaponAnimationTime = std::make_shared<WeaponAnimationTime>(this);
 
-NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem,
-                           bool disableSounds, ViewMode viewMode, float firstPersonFieldOfView)
-  : ActorAnimation(ptr, parentNode, resourceSystem),
-    mViewMode(viewMode),
-    mShowWeapons(false),
-    mShowCarriedLeft(true),
-    mNpcType(getNpcType(ptr)),
-    mFirstPersonFieldOfView(firstPersonFieldOfView),
-    mSoundsDisabled(disableSounds),
-    mAccurateAiming(false),
-    mAimingFactor(0.f)
-{
-    mNpc = mPtr.get<ESM::NPC>()->mBase;
+        for (size_t i = 0; i < ESM::PRT_Count; i++)
+        {
+            mPartslots[i] = -1; // each slot is empty
+            mPartPriorities[i] = 0;
+        }
 
-    mHeadAnimationTime = std::make_shared<HeadAnimationTime>(mPtr);
-    mWeaponAnimationTime = std::make_shared<WeaponAnimationTime>(this);
+        std::fill(mSounds.begin(), mSounds.end(), nullptr);
 
-    for(size_t i = 0;i < ESM::PRT_Count;i++)
-    {
-        mPartslots[i] = -1;  //each slot is empty
-        mPartPriorities[i] = 0;
+        updateNpcBase();
     }
 
-    std::fill(mSounds.begin(), mSounds.end(), nullptr);
-
-    updateNpcBase();
-}
-
-void NpcAnimation::setViewMode(NpcAnimation::ViewMode viewMode)
-{
-    assert(viewMode != VM_HeadOnly);
-    if(mViewMode == viewMode)
-        return;
-    // FIXME: sheathing state must be consistent if the third person skeleton doesn't have the necessary node, but
-    // third person skeleton is unavailable in first person view. This is a hack to avoid cosmetic issues.
-    bool viewChange = mViewMode == VM_FirstPerson || viewMode == VM_FirstPerson;
-    mViewMode = viewMode;
-    MWBase::Environment::get().getWorld()->scaleObject(mPtr, mPtr.getCellRef().getScale(), true); // apply race height after view change
-
-    mAmmunition.reset();
-    rebuild();
-    setRenderBin();
-
-    static const bool shieldSheathing = Settings::Manager::getBool("shield sheathing", "Game");
-    if (viewChange && shieldSheathing)
+    void NpcAnimation::setViewMode(NpcAnimation::ViewMode viewMode)
     {
-        int weaptype = ESM::Weapon::None;
-        MWMechanics::getActiveWeapon(mPtr, &weaptype);
-        showCarriedLeft(updateCarriedLeftVisible(weaptype));
+        assert(viewMode != VM_HeadOnly);
+        if (mViewMode == viewMode)
+            return;
+        // FIXME: sheathing state must be consistent if the third person skeleton doesn't have the necessary node, but
+        // third person skeleton is unavailable in first person view. This is a hack to avoid cosmetic issues.
+        bool viewChange = mViewMode == VM_FirstPerson || viewMode == VM_FirstPerson;
+        mViewMode = viewMode;
+        MWBase::Environment::get().getWorld()->scaleObject(
+            mPtr, mPtr.getCellRef().getScale(), true); // apply race height after view change
+
+        mAmmunition.reset();
+        rebuild();
+        setRenderBin();
+
+        static const bool shieldSheathing = Settings::Manager::getBool("shield sheathing", "Game");
+        if (viewChange && shieldSheathing)
+        {
+            int weaptype = ESM::Weapon::None;
+            MWMechanics::getActiveWeapon(mPtr, &weaptype);
+            showCarriedLeft(updateCarriedLeftVisible(weaptype));
+        }
     }
-}
 
-/// @brief A RenderBin callback to clear the depth buffer before rendering.
-/// Switches depth attachments to a proxy renderbuffer, reattaches original depth then redraws first person root.
-/// This gives a complete depth buffer which can be used for postprocessing, buffer resolves as if depth was never cleared.
-class DepthClearCallback : public osgUtil::RenderBin::DrawCallback
-{
-public:
-    DepthClearCallback()
+    /// @brief A RenderBin callback to clear the depth buffer before rendering.
+    /// Switches depth attachments to a proxy renderbuffer, reattaches original depth then redraws first person root.
+    /// This gives a complete depth buffer which can be used for postprocessing, buffer resolves as if depth was never
+    /// cleared.
+    class DepthClearCallback : public osgUtil::RenderBin::DrawCallback
     {
-        mDepth = new SceneUtil::AutoDepth;
-        mDepth->setWriteMask(true);
+    public:
+        DepthClearCallback()
+        {
+            mDepth = new SceneUtil::AutoDepth;
+            mDepth->setWriteMask(true);
 
-        mStateSet = new osg::StateSet;
-        mStateSet->setAttributeAndModes(new osg::ColorMask(false, false, false, false), osg::StateAttribute::ON);
-        mStateSet->setMode(GL_LIGHTING, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
-    }
+            mStateSet = new osg::StateSet;
+            mStateSet->setAttributeAndModes(new osg::ColorMask(false, false, false, false), osg::StateAttribute::ON);
+            mStateSet->setMode(GL_LIGHTING, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE);
+        }
 
-    void drawImplementation(osgUtil::RenderBin* bin, osg::RenderInfo& renderInfo, osgUtil::RenderLeaf*& previous) override
-    {
-        osg::State* state = renderInfo.getState();
+        void drawImplementation(
+            osgUtil::RenderBin* bin, osg::RenderInfo& renderInfo, osgUtil::RenderLeaf*& previous) override
+        {
+            osg::State* state = renderInfo.getState();
 
-        PostProcessor* postProcessor = dynamic_cast<PostProcessor*>(renderInfo.getCurrentCamera()->getUserData());
+            PostProcessor* postProcessor = dynamic_cast<PostProcessor*>(renderInfo.getCurrentCamera()->getUserData());
 
-        state->applyAttribute(mDepth);
+            state->applyAttribute(mDepth);
 
-        unsigned int frameId = state->getFrameStamp()->getFrameNumber() % 2;
+            unsigned int frameId = state->getFrameStamp()->getFrameNumber() % 2;
 
-        if (postProcessor && postProcessor->getFbo(PostProcessor::FBO_FirstPerson, frameId))
-        {
-            postProcessor->getFbo(PostProcessor::FBO_FirstPerson, frameId)->apply(*state);
+            if (postProcessor && postProcessor->getFbo(PostProcessor::FBO_FirstPerson, frameId))
+            {
+                postProcessor->getFbo(PostProcessor::FBO_FirstPerson, frameId)->apply(*state);
 
-            glClear(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-            // color accumulation pass
-            bin->drawImplementation(renderInfo, previous);
+                glClear(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+                // color accumulation pass
+                bin->drawImplementation(renderInfo, previous);
 
-            auto primaryFBO = postProcessor->getPrimaryFbo(frameId);
+                auto primaryFBO = postProcessor->getPrimaryFbo(frameId);
 
-            if (postProcessor->getFbo(PostProcessor::FBO_OpaqueDepth, frameId))
-                postProcessor->getFbo(PostProcessor::FBO_OpaqueDepth, frameId)->apply(*state);
-            else
-                primaryFBO->apply(*state);
+                if (postProcessor->getFbo(PostProcessor::FBO_OpaqueDepth, frameId))
+                    postProcessor->getFbo(PostProcessor::FBO_OpaqueDepth, frameId)->apply(*state);
+                else
+                    primaryFBO->apply(*state);
 
-            // depth accumulation pass
-            osg::ref_ptr<osg::StateSet> restore = bin->getStateSet();
-            bin->setStateSet(mStateSet);
-            bin->drawImplementation(renderInfo, previous);
-            bin->setStateSet(restore);
+                // depth accumulation pass
+                osg::ref_ptr<osg::StateSet> restore = bin->getStateSet();
+                bin->setStateSet(mStateSet);
+                bin->drawImplementation(renderInfo, previous);
+                bin->setStateSet(restore);
 
-            if (postProcessor->getFbo(PostProcessor::FBO_OpaqueDepth, frameId))
-                primaryFBO->apply(*state);
-        }
-        else
-        {
-            // fallback to standard depth clear when we are not rendering our main scene via an intermediate FBO
-            glClear(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-            bin->drawImplementation(renderInfo, previous);
-        }
+                if (postProcessor->getFbo(PostProcessor::FBO_OpaqueDepth, frameId))
+                    primaryFBO->apply(*state);
+            }
+            else
+            {
+                // fallback to standard depth clear when we are not rendering our main scene via an intermediate FBO
+                glClear(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+                bin->drawImplementation(renderInfo, previous);
+            }
 
-        state->checkGLErrors("after DepthClearCallback::drawImplementation");
-    }
+            state->checkGLErrors("after DepthClearCallback::drawImplementation");
+        }
 
-    osg::ref_ptr<osg::Depth> mDepth;
-    osg::ref_ptr<osg::StateSet> mStateSet;
-};
+        osg::ref_ptr<osg::Depth> mDepth;
+        osg::ref_ptr<osg::StateSet> mStateSet;
+    };
 
-/// Overrides Field of View to given value for rendering the subgraph.
-/// Must be added as cull callback.
-class OverrideFieldOfViewCallback : public osg::NodeCallback
-{
-public:
-    OverrideFieldOfViewCallback(float fov)
-        : mFov(fov)
+    /// Overrides Field of View to given value for rendering the subgraph.
+    /// Must be added as cull callback.
+    class OverrideFieldOfViewCallback : public osg::NodeCallback
     {
-    }
+    public:
+        OverrideFieldOfViewCallback(float fov)
+            : mFov(fov)
+        {
+        }
 
-    void operator()(osg::Node* node, osg::NodeVisitor* nv) override
-    {
-        osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
-        float fov, aspect, zNear, zFar;
-        if (cv->getProjectionMatrix()->getPerspective(fov, aspect, zNear, zFar) && std::abs(fov-mFov) > 0.001)
+        void operator()(osg::Node* node, osg::NodeVisitor* nv) override
         {
-            fov = mFov;
-            osg::ref_ptr<osg::RefMatrix> newProjectionMatrix = new osg::RefMatrix();
-            newProjectionMatrix->makePerspective(fov, aspect, zNear, zFar);
-            osg::ref_ptr<osg::RefMatrix> invertedOldMatrix = cv->getProjectionMatrix();
-            invertedOldMatrix = new osg::RefMatrix(osg::RefMatrix::inverse(*invertedOldMatrix));
-            osg::ref_ptr<osg::RefMatrix> viewMatrix = new osg::RefMatrix(*cv->getModelViewMatrix());
-            viewMatrix->postMult(*newProjectionMatrix);
-            viewMatrix->postMult(*invertedOldMatrix);
-            cv->pushModelViewMatrix(viewMatrix, osg::Transform::ReferenceFrame::ABSOLUTE_RF);
-            traverse(node, nv);
-            cv->popModelViewMatrix();
+            osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
+            float fov, aspect, zNear, zFar;
+            if (cv->getProjectionMatrix()->getPerspective(fov, aspect, zNear, zFar) && std::abs(fov - mFov) > 0.001)
+            {
+                fov = mFov;
+                osg::ref_ptr<osg::RefMatrix> newProjectionMatrix = new osg::RefMatrix();
+                newProjectionMatrix->makePerspective(fov, aspect, zNear, zFar);
+                osg::ref_ptr<osg::RefMatrix> invertedOldMatrix = cv->getProjectionMatrix();
+                invertedOldMatrix = new osg::RefMatrix(osg::RefMatrix::inverse(*invertedOldMatrix));
+                osg::ref_ptr<osg::RefMatrix> viewMatrix = new osg::RefMatrix(*cv->getModelViewMatrix());
+                viewMatrix->postMult(*newProjectionMatrix);
+                viewMatrix->postMult(*invertedOldMatrix);
+                cv->pushModelViewMatrix(viewMatrix, osg::Transform::ReferenceFrame::ABSOLUTE_RF);
+                traverse(node, nv);
+                cv->popModelViewMatrix();
+            }
+            else
+                traverse(node, nv);
         }
-        else
-            traverse(node, nv);
-    }
 
-private:
-    float mFov;
-};
+    private:
+        float mFov;
+    };
 
-void NpcAnimation::setRenderBin()
-{
-    if (mViewMode == VM_FirstPerson)
+    void NpcAnimation::setRenderBin()
     {
-        static bool prototypeAdded = false;
-        if (!prototypeAdded)
+        if (mViewMode == VM_FirstPerson)
         {
-            osg::ref_ptr<osgUtil::RenderBin> depthClearBin (new osgUtil::RenderBin);
-            depthClearBin->setDrawCallback(new DepthClearCallback);
-            osgUtil::RenderBin::addRenderBinPrototype("DepthClear", depthClearBin);
-            prototypeAdded = true;
+            static bool prototypeAdded = false;
+            if (!prototypeAdded)
+            {
+                osg::ref_ptr<osgUtil::RenderBin> depthClearBin(new osgUtil::RenderBin);
+                depthClearBin->setDrawCallback(new DepthClearCallback);
+                osgUtil::RenderBin::addRenderBinPrototype("DepthClear", depthClearBin);
+                prototypeAdded = true;
+            }
+            mObjectRoot->getOrCreateStateSet()->setRenderBinDetails(
+                RenderBin_FirstPerson, "DepthClear", osg::StateSet::OVERRIDE_RENDERBIN_DETAILS);
         }
-        mObjectRoot->getOrCreateStateSet()->setRenderBinDetails(RenderBin_FirstPerson, "DepthClear", osg::StateSet::OVERRIDE_RENDERBIN_DETAILS);
+        else if (osg::StateSet* stateset = mObjectRoot->getStateSet())
+            stateset->setRenderBinToInherit();
     }
-    else if (osg::StateSet* stateset = mObjectRoot->getStateSet())
-        stateset->setRenderBinToInherit();
-}
 
-void NpcAnimation::rebuild()
-{
-    mScabbard.reset();
-    mHolsteredShield.reset();
-    updateNpcBase();
+    void NpcAnimation::rebuild()
+    {
+        mScabbard.reset();
+        mHolsteredShield.reset();
+        updateNpcBase();
 
-    MWBase::Environment::get().getMechanicsManager()->forceStateUpdate(mPtr);
-}
+        MWBase::Environment::get().getMechanicsManager()->forceStateUpdate(mPtr);
+    }
 
-int NpcAnimation::getSlot(const osg::NodePath &path) const
-{
-    for (int i=0; i<ESM::PRT_Count; ++i)
+    int NpcAnimation::getSlot(const osg::NodePath& path) const
     {
-        const PartHolder* const part = mObjectParts[i].get();
-        if (part == nullptr)
-            continue;
-        if (std::find(path.begin(), path.end(), part->getNode().get()) != path.end())
+        for (int i = 0; i < ESM::PRT_Count; ++i)
         {
-            return mPartslots[i];
+            const PartHolder* const part = mObjectParts[i].get();
+            if (part == nullptr)
+                continue;
+            if (std::find(path.begin(), path.end(), part->getNode().get()) != path.end())
+            {
+                return mPartslots[i];
+            }
         }
+        return -1;
     }
-    return -1;
-}
 
-void NpcAnimation::updateNpcBase()
-{
-    clearAnimSources();
-    for(size_t i = 0;i < ESM::PRT_Count;i++)
-        removeIndividualPart((ESM::PartReferenceType)i);
+    void NpcAnimation::updateNpcBase()
+    {
+        clearAnimSources();
+        for (size_t i = 0; i < ESM::PRT_Count; i++)
+            removeIndividualPart((ESM::PartReferenceType)i);
 
-    const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-    const ESM::Race *race = store.get<ESM::Race>().find(mNpc->mRace);
-    NpcType curType = getNpcType();
-    bool isWerewolf = (curType == Type_Werewolf);
-    bool isVampire = (curType == Type_Vampire);
-    bool isFemale = !mNpc->isMale();
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+        const ESM::Race* race = store.get<ESM::Race>().find(mNpc->mRace);
+        NpcType curType = getNpcType();
+        bool isWerewolf = (curType == Type_Werewolf);
+        bool isVampire = (curType == Type_Vampire);
+        bool isFemale = !mNpc->isMale();
 
-    mHeadModel.clear();
-    mHairModel.clear();
+        mHeadModel.clear();
+        mHairModel.clear();
 
-    std::string_view headName = isWerewolf ? std::string_view{"WerewolfHead"} : mNpc->mHead;
-    std::string_view hairName = isWerewolf ? std::string_view{"WerewolfHair"} : mNpc->mHair;
+        std::string_view headName = isWerewolf ? std::string_view{ "WerewolfHead" } : mNpc->mHead;
+        std::string_view hairName = isWerewolf ? std::string_view{ "WerewolfHair" } : mNpc->mHair;
 
-    if (!headName.empty())
-    {
-        const ESM::BodyPart* bp = store.get<ESM::BodyPart>().search(headName);
-        if (bp)
-            mHeadModel = Misc::ResourceHelpers::correctMeshPath(bp->mModel, mResourceSystem->getVFS());
-        else
-            Log(Debug::Warning) << "Warning: Failed to load body part '" << headName << "'";
-    }
+        if (!headName.empty())
+        {
+            const ESM::BodyPart* bp = store.get<ESM::BodyPart>().search(headName);
+            if (bp)
+                mHeadModel = Misc::ResourceHelpers::correctMeshPath(bp->mModel, mResourceSystem->getVFS());
+            else
+                Log(Debug::Warning) << "Warning: Failed to load body part '" << headName << "'";
+        }
 
-    if (!hairName.empty())
-    {
-        const ESM::BodyPart* bp = store.get<ESM::BodyPart>().search(hairName);
-        if (bp)
-            mHairModel = Misc::ResourceHelpers::correctMeshPath(bp->mModel, mResourceSystem->getVFS());
-        else
-            Log(Debug::Warning) << "Warning: Failed to load body part '" << hairName << "'";
-    }
+        if (!hairName.empty())
+        {
+            const ESM::BodyPart* bp = store.get<ESM::BodyPart>().search(hairName);
+            if (bp)
+                mHairModel = Misc::ResourceHelpers::correctMeshPath(bp->mModel, mResourceSystem->getVFS());
+            else
+                Log(Debug::Warning) << "Warning: Failed to load body part '" << hairName << "'";
+        }
 
-    const std::string vampireHead = getVampireHead(mNpc->mRace, isFemale, *mResourceSystem->getVFS());
-    if (!isWerewolf && isVampire && !vampireHead.empty())
-        mHeadModel = vampireHead;
+        const std::string vampireHead = getVampireHead(mNpc->mRace, isFemale, *mResourceSystem->getVFS());
+        if (!isWerewolf && isVampire && !vampireHead.empty())
+            mHeadModel = vampireHead;
 
-    bool is1stPerson = mViewMode == VM_FirstPerson;
-    bool isBeast = (race->mData.mFlags & ESM::Race::Beast) != 0;
+        bool is1stPerson = mViewMode == VM_FirstPerson;
+        bool isBeast = (race->mData.mFlags & ESM::Race::Beast) != 0;
 
-    std::string defaultSkeleton = SceneUtil::getActorSkeleton(is1stPerson, isFemale, isBeast, isWerewolf);
-    defaultSkeleton = Misc::ResourceHelpers::correctActorModelPath(defaultSkeleton, mResourceSystem->getVFS());
+        std::string defaultSkeleton = SceneUtil::getActorSkeleton(is1stPerson, isFemale, isBeast, isWerewolf);
+        defaultSkeleton = Misc::ResourceHelpers::correctActorModelPath(defaultSkeleton, mResourceSystem->getVFS());
 
-    std::string smodel = defaultSkeleton;
-    if (!is1stPerson && !isWerewolf && !mNpc->mModel.empty())
-        smodel = Misc::ResourceHelpers::correctActorModelPath(
-            Misc::ResourceHelpers::correctMeshPath(mNpc->mModel, mResourceSystem->getVFS()), mResourceSystem->getVFS());
+        std::string smodel = defaultSkeleton;
+        if (!is1stPerson && !isWerewolf && !mNpc->mModel.empty())
+            smodel = Misc::ResourceHelpers::correctActorModelPath(
+                Misc::ResourceHelpers::correctMeshPath(mNpc->mModel, mResourceSystem->getVFS()),
+                mResourceSystem->getVFS());
 
-    setObjectRoot(smodel, true, true, false);
+        setObjectRoot(smodel, true, true, false);
 
-    updateParts();
+        updateParts();
 
-    if(!is1stPerson)
-    {
-        const std::string& base = Settings::Manager::getString("xbaseanim", "Models");
-        if (smodel != base && !isWerewolf)
-            addAnimSource(base, smodel);
+        if (!is1stPerson)
+        {
+            const std::string& base = Settings::Manager::getString("xbaseanim", "Models");
+            if (smodel != base && !isWerewolf)
+                addAnimSource(base, smodel);
 
-        if (smodel != defaultSkeleton && base != defaultSkeleton)
-            addAnimSource(defaultSkeleton, smodel);
+            if (smodel != defaultSkeleton && base != defaultSkeleton)
+                addAnimSource(defaultSkeleton, smodel);
 
-        addAnimSource(smodel, smodel);
+            addAnimSource(smodel, smodel);
 
-        if(!isWerewolf && Misc::StringUtils::lowerCase(mNpc->mRace).find("argonian") != std::string::npos)
-            addAnimSource("meshes\\xargonian_swimkna.nif", smodel);
-    }
-    else
-    {
-        const std::string& base = Settings::Manager::getString("xbaseanim1st", "Models");
-        if (smodel != base && !isWerewolf)
-            addAnimSource(base, smodel);
+            if (!isWerewolf && Misc::StringUtils::lowerCase(mNpc->mRace).find("argonian") != std::string::npos)
+                addAnimSource("meshes\\xargonian_swimkna.nif", smodel);
+        }
+        else
+        {
+            const std::string& base = Settings::Manager::getString("xbaseanim1st", "Models");
+            if (smodel != base && !isWerewolf)
+                addAnimSource(base, smodel);
+
+            addAnimSource(smodel, smodel);
 
-        addAnimSource(smodel, smodel);
+            mObjectRoot->setNodeMask(Mask_FirstPerson);
+            mObjectRoot->addCullCallback(new OverrideFieldOfViewCallback(mFirstPersonFieldOfView));
+        }
 
-        mObjectRoot->setNodeMask(Mask_FirstPerson);
-        mObjectRoot->addCullCallback(new OverrideFieldOfViewCallback(mFirstPersonFieldOfView));
+        mWeaponAnimationTime->updateStartTime();
     }
 
-    mWeaponAnimationTime->updateStartTime();
-}
+    std::string NpcAnimation::getSheathedShieldMesh(const MWWorld::ConstPtr& shield) const
+    {
+        std::string mesh = getShieldMesh(shield, !mNpc->isMale());
 
-std::string NpcAnimation::getSheathedShieldMesh(const MWWorld::ConstPtr& shield) const
-{
-    std::string mesh = getShieldMesh(shield, !mNpc->isMale());
+        if (mesh.empty())
+            return std::string();
 
-    if (mesh.empty())
-        return std::string();
+        std::string holsteredName = mesh;
+        holsteredName = holsteredName.replace(holsteredName.size() - 4, 4, "_sh.nif");
+        if (mResourceSystem->getVFS()->exists(holsteredName))
+        {
+            osg::ref_ptr<osg::Node> shieldTemplate = mResourceSystem->getSceneManager()->getInstance(holsteredName);
+            SceneUtil::FindByNameVisitor findVisitor("Bip01 Sheath");
+            shieldTemplate->accept(findVisitor);
+            osg::ref_ptr<osg::Node> sheathNode = findVisitor.mFoundNode;
+            if (!sheathNode)
+                return std::string();
+        }
 
-    std::string holsteredName = mesh;
-    holsteredName = holsteredName.replace(holsteredName.size()-4, 4, "_sh.nif");
-    if(mResourceSystem->getVFS()->exists(holsteredName))
-    {
-        osg::ref_ptr<osg::Node> shieldTemplate = mResourceSystem->getSceneManager()->getInstance(holsteredName);
-        SceneUtil::FindByNameVisitor findVisitor ("Bip01 Sheath");
-        shieldTemplate->accept(findVisitor);
-        osg::ref_ptr<osg::Node> sheathNode = findVisitor.mFoundNode;
-        if(!sheathNode)
-            return std::string();
+        return mesh;
     }
 
-    return mesh;
-}
+    void NpcAnimation::updateParts()
+    {
+        if (!mObjectRoot.get())
+            return;
 
-void NpcAnimation::updateParts()
-{
-    if (!mObjectRoot.get())
-        return;
+        NpcType curType = getNpcType();
+        if (curType != mNpcType)
+        {
+            mNpcType = curType;
+            rebuild();
+            return;
+        }
 
-    NpcType curType = getNpcType();
-    if (curType != mNpcType)
-    {
-        mNpcType = curType;
-        rebuild();
-        return;
-    }
+        static const struct
+        {
+            int mSlot;
+            int mBasePriority;
+        } slotlist[] = { // FIXME: Priority is based on the number of reserved slots. There should be a better way.
+            { MWWorld::InventoryStore::Slot_Robe, 11 }, { MWWorld::InventoryStore::Slot_Skirt, 3 },
+            { MWWorld::InventoryStore::Slot_Helmet, 0 }, { MWWorld::InventoryStore::Slot_Cuirass, 0 },
+            { MWWorld::InventoryStore::Slot_Greaves, 0 }, { MWWorld::InventoryStore::Slot_LeftPauldron, 0 },
+            { MWWorld::InventoryStore::Slot_RightPauldron, 0 }, { MWWorld::InventoryStore::Slot_Boots, 0 },
+            { MWWorld::InventoryStore::Slot_LeftGauntlet, 0 }, { MWWorld::InventoryStore::Slot_RightGauntlet, 0 },
+            { MWWorld::InventoryStore::Slot_Shirt, 0 }, { MWWorld::InventoryStore::Slot_Pants, 0 },
+            { MWWorld::InventoryStore::Slot_CarriedLeft, 0 }, { MWWorld::InventoryStore::Slot_CarriedRight, 0 }
+        };
+        static const size_t slotlistsize = sizeof(slotlist) / sizeof(slotlist[0]);
 
-    static const struct {
-        int mSlot;
-        int mBasePriority;
-    } slotlist[] = {
-        // FIXME: Priority is based on the number of reserved slots. There should be a better way.
-        { MWWorld::InventoryStore::Slot_Robe,         11 },
-        { MWWorld::InventoryStore::Slot_Skirt,         3 },
-        { MWWorld::InventoryStore::Slot_Helmet,        0 },
-        { MWWorld::InventoryStore::Slot_Cuirass,       0 },
-        { MWWorld::InventoryStore::Slot_Greaves,       0 },
-        { MWWorld::InventoryStore::Slot_LeftPauldron,  0 },
-        { MWWorld::InventoryStore::Slot_RightPauldron, 0 },
-        { MWWorld::InventoryStore::Slot_Boots,         0 },
-        { MWWorld::InventoryStore::Slot_LeftGauntlet,  0 },
-        { MWWorld::InventoryStore::Slot_RightGauntlet, 0 },
-        { MWWorld::InventoryStore::Slot_Shirt,         0 },
-        { MWWorld::InventoryStore::Slot_Pants,         0 },
-        { MWWorld::InventoryStore::Slot_CarriedLeft,   0 },
-        { MWWorld::InventoryStore::Slot_CarriedRight,  0 }
-    };
-    static const size_t slotlistsize = sizeof(slotlist)/sizeof(slotlist[0]);
+        bool wasArrowAttached = isArrowAttached();
+        mAmmunition.reset();
 
-    bool wasArrowAttached = isArrowAttached();
-    mAmmunition.reset();
+        const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
+        for (size_t i = 0; i < slotlistsize && mViewMode != VM_HeadOnly; i++)
+        {
+            MWWorld::ConstContainerStoreIterator store = inv.getSlot(slotlist[i].mSlot);
 
-    const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
-    for(size_t i = 0;i < slotlistsize && mViewMode != VM_HeadOnly;i++)
-    {
-        MWWorld::ConstContainerStoreIterator store = inv.getSlot(slotlist[i].mSlot);
+            removePartGroup(slotlist[i].mSlot);
 
-        removePartGroup(slotlist[i].mSlot);
+            if (store == inv.end())
+                continue;
 
-        if(store == inv.end())
-            continue;
+            if (slotlist[i].mSlot == MWWorld::InventoryStore::Slot_Helmet)
+                removeIndividualPart(ESM::PRT_Hair);
 
-        if(slotlist[i].mSlot == MWWorld::InventoryStore::Slot_Helmet)
-            removeIndividualPart(ESM::PRT_Hair);
+            int prio = 1;
+            bool enchantedGlow = !store->getClass().getEnchantment(*store).empty();
+            osg::Vec4f glowColor = store->getClass().getEnchantmentColor(*store);
+            if (store->getType() == ESM::Clothing::sRecordId)
+            {
+                prio = ((slotlist[i].mBasePriority + 1) << 1) + 0;
+                const ESM::Clothing* clothes = store->get<ESM::Clothing>()->mBase;
+                addPartGroup(slotlist[i].mSlot, prio, clothes->mParts.mParts, enchantedGlow, &glowColor);
+            }
+            else if (store->getType() == ESM::Armor::sRecordId)
+            {
+                prio = ((slotlist[i].mBasePriority + 1) << 1) + 1;
+                const ESM::Armor* armor = store->get<ESM::Armor>()->mBase;
+                addPartGroup(slotlist[i].mSlot, prio, armor->mParts.mParts, enchantedGlow, &glowColor);
+            }
 
-        int prio = 1;
-        bool enchantedGlow = !store->getClass().getEnchantment(*store).empty();
-        osg::Vec4f glowColor = store->getClass().getEnchantmentColor(*store);
-        if(store->getType() == ESM::Clothing::sRecordId)
-        {
-            prio = ((slotlist[i].mBasePriority+1)<<1) + 0;
-            const ESM::Clothing *clothes = store->get<ESM::Clothing>()->mBase;
-            addPartGroup(slotlist[i].mSlot, prio, clothes->mParts.mParts, enchantedGlow, &glowColor);
-        }
-        else if(store->getType() == ESM::Armor::sRecordId)
-        {
-            prio = ((slotlist[i].mBasePriority+1)<<1) + 1;
-            const ESM::Armor *armor = store->get<ESM::Armor>()->mBase;
-            addPartGroup(slotlist[i].mSlot, prio, armor->mParts.mParts, enchantedGlow, &glowColor);
+            if (slotlist[i].mSlot == MWWorld::InventoryStore::Slot_Robe)
+            {
+                ESM::PartReferenceType parts[] = { ESM::PRT_Groin, ESM::PRT_Skirt, ESM::PRT_RLeg, ESM::PRT_LLeg,
+                    ESM::PRT_RUpperarm, ESM::PRT_LUpperarm, ESM::PRT_RKnee, ESM::PRT_LKnee, ESM::PRT_RForearm,
+                    ESM::PRT_LForearm, ESM::PRT_Cuirass };
+                size_t parts_size = sizeof(parts) / sizeof(parts[0]);
+                for (size_t p = 0; p < parts_size; ++p)
+                    reserveIndividualPart(parts[p], slotlist[i].mSlot, prio);
+            }
+            else if (slotlist[i].mSlot == MWWorld::InventoryStore::Slot_Skirt)
+            {
+                reserveIndividualPart(ESM::PRT_Groin, slotlist[i].mSlot, prio);
+                reserveIndividualPart(ESM::PRT_RLeg, slotlist[i].mSlot, prio);
+                reserveIndividualPart(ESM::PRT_LLeg, slotlist[i].mSlot, prio);
+            }
         }
 
-        if(slotlist[i].mSlot == MWWorld::InventoryStore::Slot_Robe)
+        if (mViewMode != VM_FirstPerson)
         {
-            ESM::PartReferenceType parts[] = {
-                ESM::PRT_Groin, ESM::PRT_Skirt, ESM::PRT_RLeg, ESM::PRT_LLeg,
-                ESM::PRT_RUpperarm, ESM::PRT_LUpperarm, ESM::PRT_RKnee, ESM::PRT_LKnee,
-                ESM::PRT_RForearm, ESM::PRT_LForearm, ESM::PRT_Cuirass
-            };
-            size_t parts_size = sizeof(parts)/sizeof(parts[0]);
-            for(size_t p = 0;p < parts_size;++p)
-                reserveIndividualPart(parts[p], slotlist[i].mSlot, prio);
+            if (mPartPriorities[ESM::PRT_Head] < 1 && !mHeadModel.empty())
+                addOrReplaceIndividualPart(ESM::PRT_Head, -1, 1, mHeadModel);
+            if (mPartPriorities[ESM::PRT_Hair] < 1 && mPartPriorities[ESM::PRT_Head] <= 1 && !mHairModel.empty())
+                addOrReplaceIndividualPart(ESM::PRT_Hair, -1, 1, mHairModel);
         }
-        else if(slotlist[i].mSlot == MWWorld::InventoryStore::Slot_Skirt)
-        {
-            reserveIndividualPart(ESM::PRT_Groin, slotlist[i].mSlot, prio);
-            reserveIndividualPart(ESM::PRT_RLeg, slotlist[i].mSlot, prio);
-            reserveIndividualPart(ESM::PRT_LLeg, slotlist[i].mSlot, prio);
-        }
-    }
+        if (mViewMode == VM_HeadOnly)
+            return;
 
-    if(mViewMode != VM_FirstPerson)
-    {
-        if(mPartPriorities[ESM::PRT_Head] < 1 && !mHeadModel.empty())
-            addOrReplaceIndividualPart(ESM::PRT_Head, -1,1, mHeadModel);
-        if(mPartPriorities[ESM::PRT_Hair] < 1 && mPartPriorities[ESM::PRT_Head] <= 1 && !mHairModel.empty())
-            addOrReplaceIndividualPart(ESM::PRT_Hair, -1,1, mHairModel);
-    }
-    if(mViewMode == VM_HeadOnly)
-        return;
-
-    if(mPartPriorities[ESM::PRT_Shield] < 1)
-    {
-        MWWorld::ConstContainerStoreIterator store = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
-        MWWorld::ConstPtr part;
-        if(store != inv.end() && (part=*store).getType() == ESM::Light::sRecordId)
+        if (mPartPriorities[ESM::PRT_Shield] < 1)
         {
-            const ESM::Light *light = part.get<ESM::Light>()->mBase;
-            const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-            addOrReplaceIndividualPart(ESM::PRT_Shield, MWWorld::InventoryStore::Slot_CarriedLeft, 1,
-                Misc::ResourceHelpers::correctMeshPath(light->mModel, vfs), false, nullptr, true);
-            if (mObjectParts[ESM::PRT_Shield])
-                addExtraLight(mObjectParts[ESM::PRT_Shield]->getNode()->asGroup(), light);
+            MWWorld::ConstContainerStoreIterator store = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
+            MWWorld::ConstPtr part;
+            if (store != inv.end() && (part = *store).getType() == ESM::Light::sRecordId)
+            {
+                const ESM::Light* light = part.get<ESM::Light>()->mBase;
+                const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+                addOrReplaceIndividualPart(ESM::PRT_Shield, MWWorld::InventoryStore::Slot_CarriedLeft, 1,
+                    Misc::ResourceHelpers::correctMeshPath(light->mModel, vfs), false, nullptr, true);
+                if (mObjectParts[ESM::PRT_Shield])
+                    addExtraLight(mObjectParts[ESM::PRT_Shield]->getNode()->asGroup(), light);
+            }
         }
-    }
 
-    showWeapons(mShowWeapons);
-    showCarriedLeft(mShowCarriedLeft);
+        showWeapons(mShowWeapons);
+        showCarriedLeft(mShowCarriedLeft);
 
-    bool isWerewolf = (getNpcType() == Type_Werewolf);
-    std::string race = (isWerewolf ? "werewolf" : Misc::StringUtils::lowerCase(mNpc->mRace));
+        bool isWerewolf = (getNpcType() == Type_Werewolf);
+        std::string race = (isWerewolf ? "werewolf" : Misc::StringUtils::lowerCase(mNpc->mRace));
 
-    const std::vector<const ESM::BodyPart*> &parts = getBodyParts(race, !mNpc->isMale(), mViewMode == VM_FirstPerson, isWerewolf);
-    for(int part = ESM::PRT_Neck; part < ESM::PRT_Count; ++part)
-    {
-        if(mPartPriorities[part] < 1)
+        const std::vector<const ESM::BodyPart*>& parts
+            = getBodyParts(race, !mNpc->isMale(), mViewMode == VM_FirstPerson, isWerewolf);
+        for (int part = ESM::PRT_Neck; part < ESM::PRT_Count; ++part)
         {
-            const ESM::BodyPart* bodypart = parts[part];
-            if(bodypart)
+            if (mPartPriorities[part] < 1)
             {
-                const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-                addOrReplaceIndividualPart(static_cast<ESM::PartReferenceType>(part), -1, 1,
-                    Misc::ResourceHelpers::correctMeshPath(bodypart->mModel, vfs));
+                const ESM::BodyPart* bodypart = parts[part];
+                if (bodypart)
+                {
+                    const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+                    addOrReplaceIndividualPart(static_cast<ESM::PartReferenceType>(part), -1, 1,
+                        Misc::ResourceHelpers::correctMeshPath(bodypart->mModel, vfs));
+                }
             }
         }
-    }
 
-    if (wasArrowAttached)
-        attachArrow();
-}
+        if (wasArrowAttached)
+            attachArrow();
+    }
 
+    PartHolderPtr NpcAnimation::insertBoundedPart(const std::string& model, std::string_view bonename,
+        std::string_view bonefilter, bool enchantedGlow, osg::Vec4f* glowColor, bool isLight)
+    {
+        osg::ref_ptr<osg::Node> attached = attach(model, bonename, bonefilter, isLight);
+        if (enchantedGlow)
+            mGlowUpdater = SceneUtil::addEnchantedGlow(attached, mResourceSystem, *glowColor);
 
+        return std::make_unique<PartHolder>(attached);
+    }
 
-PartHolderPtr NpcAnimation::insertBoundedPart(const std::string& model, std::string_view bonename, std::string_view bonefilter, bool enchantedGlow, osg::Vec4f* glowColor, bool isLight)
-{
-    osg::ref_ptr<osg::Node> attached = attach(model, bonename, bonefilter, isLight);
-    if (enchantedGlow)
-        mGlowUpdater = SceneUtil::addEnchantedGlow(attached, mResourceSystem, *glowColor);
+    osg::Vec3f NpcAnimation::runAnimation(float timepassed)
+    {
+        osg::Vec3f ret = Animation::runAnimation(timepassed);
 
-    return std::make_unique<PartHolder>(attached);
-}
+        mHeadAnimationTime->update(timepassed);
 
-osg::Vec3f NpcAnimation::runAnimation(float timepassed)
-{
-    osg::Vec3f ret = Animation::runAnimation(timepassed);
+        if (mFirstPersonNeckController)
+        {
+            if (mAccurateAiming)
+                mAimingFactor = 1.f;
+            else
+                mAimingFactor = std::max(0.f, mAimingFactor - timepassed * 0.5f);
 
-    mHeadAnimationTime->update(timepassed);
+            float rotateFactor = 0.75f + 0.25f * mAimingFactor;
 
-    if (mFirstPersonNeckController)
-    {
-        if (mAccurateAiming)
-            mAimingFactor = 1.f;
-        else
-            mAimingFactor = std::max(0.f, mAimingFactor - timepassed * 0.5f);
+            mFirstPersonNeckController->setRotate(
+                osg::Quat(mPtr.getRefData().getPosition().rot[0] * rotateFactor, osg::Vec3f(-1, 0, 0)));
+            mFirstPersonNeckController->setOffset(mFirstPersonOffset);
+        }
 
-        float rotateFactor = 0.75f + 0.25f * mAimingFactor;
+        WeaponAnimation::configureControllers(mPtr.getRefData().getPosition().rot[0] + getBodyPitchRadians());
 
-        mFirstPersonNeckController->setRotate(osg::Quat(mPtr.getRefData().getPosition().rot[0] * rotateFactor, osg::Vec3f(-1,0,0)));
-        mFirstPersonNeckController->setOffset(mFirstPersonOffset);
+        return ret;
     }
 
-    WeaponAnimation::configureControllers(mPtr.getRefData().getPosition().rot[0] + getBodyPitchRadians());
-
-    return ret;
-}
+    void NpcAnimation::removeIndividualPart(ESM::PartReferenceType type)
+    {
+        mPartPriorities[type] = 0;
+        mPartslots[type] = -1;
 
-void NpcAnimation::removeIndividualPart(ESM::PartReferenceType type)
-{
-    mPartPriorities[type] = 0;
-    mPartslots[type] = -1;
+        mObjectParts[type].reset();
+        if (mSounds[type] != nullptr && !mSoundsDisabled)
+        {
+            MWBase::Environment::get().getSoundManager()->stopSound(mSounds[type]);
+            mSounds[type] = nullptr;
+        }
+    }
 
-    mObjectParts[type].reset();
-    if (mSounds[type] != nullptr && !mSoundsDisabled)
+    void NpcAnimation::reserveIndividualPart(ESM::PartReferenceType type, int group, int priority)
     {
-        MWBase::Environment::get().getSoundManager()->stopSound(mSounds[type]);
-        mSounds[type] = nullptr;
+        if (priority > mPartPriorities[type])
+        {
+            removeIndividualPart(type);
+            mPartPriorities[type] = priority;
+            mPartslots[type] = group;
+        }
     }
-}
 
-void NpcAnimation::reserveIndividualPart(ESM::PartReferenceType type, int group, int priority)
-{
-    if(priority > mPartPriorities[type])
+    void NpcAnimation::removePartGroup(int group)
     {
-        removeIndividualPart(type);
-        mPartPriorities[type] = priority;
-        mPartslots[type] = group;
+        for (int i = 0; i < ESM::PRT_Count; i++)
+        {
+            if (mPartslots[i] == group)
+                removeIndividualPart((ESM::PartReferenceType)i);
+        }
     }
-}
 
-void NpcAnimation::removePartGroup(int group)
-{
-    for(int i = 0; i < ESM::PRT_Count; i++)
+    bool NpcAnimation::isFirstPersonPart(const ESM::BodyPart* bodypart)
     {
-        if(mPartslots[i] == group)
-            removeIndividualPart((ESM::PartReferenceType)i);
+        return bodypart->mId.size() >= 3 && bodypart->mId.substr(bodypart->mId.size() - 3, 3) == "1st";
     }
-}
-
-bool NpcAnimation::isFirstPersonPart(const ESM::BodyPart* bodypart)
-{
-    return bodypart->mId.size() >= 3 && bodypart->mId.substr(bodypart->mId.size()-3, 3) == "1st";
-}
-
-bool NpcAnimation::isFemalePart(const ESM::BodyPart* bodypart)
-{
-    return bodypart->mData.mFlags & ESM::BodyPart::BPF_Female;
-}
 
-bool NpcAnimation::addOrReplaceIndividualPart(ESM::PartReferenceType type, int group, int priority, const std::string &mesh, bool enchantedGlow, osg::Vec4f* glowColor, bool isLight)
-{
-    if(priority <= mPartPriorities[type])
-        return false;
+    bool NpcAnimation::isFemalePart(const ESM::BodyPart* bodypart)
+    {
+        return bodypart->mData.mFlags & ESM::BodyPart::BPF_Female;
+    }
 
-    removeIndividualPart(type);
-    mPartslots[type] = group;
-    mPartPriorities[type] = priority;
-    try
+    bool NpcAnimation::addOrReplaceIndividualPart(ESM::PartReferenceType type, int group, int priority,
+        const std::string& mesh, bool enchantedGlow, osg::Vec4f* glowColor, bool isLight)
     {
-        std::string_view bonename = sPartList.at(type);
-        if (type == ESM::PRT_Weapon)
+        if (priority <= mPartPriorities[type])
+            return false;
+
+        removeIndividualPart(type);
+        mPartslots[type] = group;
+        mPartPriorities[type] = priority;
+        try
         {
-            const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
-            MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-            if(weapon != inv.end() && weapon->getType() == ESM::Weapon::sRecordId)
+            std::string_view bonename = sPartList.at(type);
+            if (type == ESM::PRT_Weapon)
             {
-                int weaponType = weapon->get<ESM::Weapon>()->mBase->mData.mType;
-                const std::string& weaponBonename = MWMechanics::getWeaponType(weaponType)->mAttachBone;
-
-                if (weaponBonename != bonename)
+                const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
+                MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+                if (weapon != inv.end() && weapon->getType() == ESM::Weapon::sRecordId)
                 {
-                    const NodeMap& nodeMap = getNodeMap();
-                    NodeMap::const_iterator found = nodeMap.find(weaponBonename);
-                    if (found != nodeMap.end())
-                        bonename = weaponBonename;
+                    int weaponType = weapon->get<ESM::Weapon>()->mBase->mData.mType;
+                    const std::string& weaponBonename = MWMechanics::getWeaponType(weaponType)->mAttachBone;
+
+                    if (weaponBonename != bonename)
+                    {
+                        const NodeMap& nodeMap = getNodeMap();
+                        NodeMap::const_iterator found = nodeMap.find(weaponBonename);
+                        if (found != nodeMap.end())
+                            bonename = weaponBonename;
+                    }
                 }
             }
-        }
 
-        // PRT_Hair seems to be the only type that breaks consistency and uses a filter that's different from the attachment bone
-        const std::string_view bonefilter = (type == ESM::PRT_Hair) ? std::string_view{"hair"} : bonename;
-        mObjectParts[type] = insertBoundedPart(mesh, bonename, bonefilter, enchantedGlow, glowColor, isLight);
-    }
-    catch (std::exception& e)
-    {
-        Log(Debug::Error) << "Error adding NPC part: " << e.what();
-        return false;
-    }
+            // PRT_Hair seems to be the only type that breaks consistency and uses a filter that's different from the
+            // attachment bone
+            const std::string_view bonefilter = (type == ESM::PRT_Hair) ? std::string_view{ "hair" } : bonename;
+            mObjectParts[type] = insertBoundedPart(mesh, bonename, bonefilter, enchantedGlow, glowColor, isLight);
+        }
+        catch (std::exception& e)
+        {
+            Log(Debug::Error) << "Error adding NPC part: " << e.what();
+            return false;
+        }
 
-    if (!mSoundsDisabled && group == MWWorld::InventoryStore::Slot_CarriedLeft)
-    {
-        const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
-        MWWorld::ConstContainerStoreIterator csi = inv.getSlot(group);
-        if (csi != inv.end())
+        if (!mSoundsDisabled && group == MWWorld::InventoryStore::Slot_CarriedLeft)
         {
-            const auto soundId = csi->getClass().getSound(*csi);
-            if (!soundId.empty())
+            const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
+            MWWorld::ConstContainerStoreIterator csi = inv.getSlot(group);
+            if (csi != inv.end())
             {
-                mSounds[type] = MWBase::Environment::get().getSoundManager()->playSound3D(mPtr, soundId,
-                    1.0f, 1.0f, MWSound::Type::Sfx, MWSound::PlayMode::Loop
-                );
+                const auto soundId = csi->getClass().getSound(*csi);
+                if (!soundId.empty())
+                {
+                    mSounds[type] = MWBase::Environment::get().getSoundManager()->playSound3D(
+                        mPtr, soundId, 1.0f, 1.0f, MWSound::Type::Sfx, MWSound::PlayMode::Loop);
+                }
             }
         }
-    }
 
-    osg::Node* node = mObjectParts[type]->getNode();
-    if (node->getNumChildrenRequiringUpdateTraversal() > 0)
-    {
-        std::shared_ptr<SceneUtil::ControllerSource> src;
-        if (type == ESM::PRT_Head)
+        osg::Node* node = mObjectParts[type]->getNode();
+        if (node->getNumChildrenRequiringUpdateTraversal() > 0)
         {
-            src = mHeadAnimationTime;
-
-            if (node->getUserDataContainer())
+            std::shared_ptr<SceneUtil::ControllerSource> src;
+            if (type == ESM::PRT_Head)
             {
-                for (unsigned int i=0; i<node->getUserDataContainer()->getNumUserObjects(); ++i)
+                src = mHeadAnimationTime;
+
+                if (node->getUserDataContainer())
                 {
-                    osg::Object* obj = node->getUserDataContainer()->getUserObject(i);
-                    if (SceneUtil::TextKeyMapHolder* keys = dynamic_cast<SceneUtil::TextKeyMapHolder*>(obj))
+                    for (unsigned int i = 0; i < node->getUserDataContainer()->getNumUserObjects(); ++i)
                     {
-                        for (const auto &key : keys->mTextKeys)
+                        osg::Object* obj = node->getUserDataContainer()->getUserObject(i);
+                        if (SceneUtil::TextKeyMapHolder* keys = dynamic_cast<SceneUtil::TextKeyMapHolder*>(obj))
                         {
-                            if (Misc::StringUtils::ciEqual(key.second, "talk: start"))
-                                mHeadAnimationTime->setTalkStart(key.first);
-                            if (Misc::StringUtils::ciEqual(key.second, "talk: stop"))
-                                mHeadAnimationTime->setTalkStop(key.first);
-                            if (Misc::StringUtils::ciEqual(key.second, "blink: start"))
-                                mHeadAnimationTime->setBlinkStart(key.first);
-                            if (Misc::StringUtils::ciEqual(key.second, "blink: stop"))
-                                mHeadAnimationTime->setBlinkStop(key.first);
+                            for (const auto& key : keys->mTextKeys)
+                            {
+                                if (Misc::StringUtils::ciEqual(key.second, "talk: start"))
+                                    mHeadAnimationTime->setTalkStart(key.first);
+                                if (Misc::StringUtils::ciEqual(key.second, "talk: stop"))
+                                    mHeadAnimationTime->setTalkStop(key.first);
+                                if (Misc::StringUtils::ciEqual(key.second, "blink: start"))
+                                    mHeadAnimationTime->setBlinkStart(key.first);
+                                if (Misc::StringUtils::ciEqual(key.second, "blink: stop"))
+                                    mHeadAnimationTime->setBlinkStop(key.first);
+                            }
+
+                            break;
                         }
-
-                        break;
                     }
                 }
+                SceneUtil::ForceControllerSourcesVisitor assignVisitor(src);
+                node->accept(assignVisitor);
             }
-            SceneUtil::ForceControllerSourcesVisitor assignVisitor(src);
-            node->accept(assignVisitor);
-        }
-        else
-        {
-            if (type == ESM::PRT_Weapon)
-                src = mWeaponAnimationTime;
             else
-                src = std::make_shared<NullAnimationTime>();
-            SceneUtil::AssignControllerSourcesVisitor assignVisitor(src);
-            node->accept(assignVisitor);
+            {
+                if (type == ESM::PRT_Weapon)
+                    src = mWeaponAnimationTime;
+                else
+                    src = std::make_shared<NullAnimationTime>();
+                SceneUtil::AssignControllerSourcesVisitor assignVisitor(src);
+                node->accept(assignVisitor);
+            }
         }
-    }
 
-    return true;
-}
-
-void NpcAnimation::addPartGroup(int group, int priority, const std::vector<ESM::PartReference> &parts, bool enchantedGlow, osg::Vec4f* glowColor)
-{
-    const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-    const MWWorld::Store<ESM::BodyPart> &partStore = store.get<ESM::BodyPart>();
+        return true;
+    }
 
-    const char *ext = (mViewMode == VM_FirstPerson) ? ".1st" : "";
-    for(const ESM::PartReference& part : parts)
+    void NpcAnimation::addPartGroup(int group, int priority, const std::vector<ESM::PartReference>& parts,
+        bool enchantedGlow, osg::Vec4f* glowColor)
     {
-        const ESM::BodyPart *bodypart = nullptr;
-        if(!mNpc->isMale() && !part.mFemale.empty())
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::Store<ESM::BodyPart>& partStore = store.get<ESM::BodyPart>();
+
+        const char* ext = (mViewMode == VM_FirstPerson) ? ".1st" : "";
+        for (const ESM::PartReference& part : parts)
         {
-            bodypart = partStore.search(part.mFemale+ext);
-            if(!bodypart && mViewMode == VM_FirstPerson)
+            const ESM::BodyPart* bodypart = nullptr;
+            if (!mNpc->isMale() && !part.mFemale.empty())
             {
-                bodypart = partStore.search(part.mFemale);
-                if(bodypart && !(bodypart->mData.mPart == ESM::BodyPart::MP_Hand ||
-                                 bodypart->mData.mPart == ESM::BodyPart::MP_Wrist ||
-                                 bodypart->mData.mPart == ESM::BodyPart::MP_Forearm ||
-                                 bodypart->mData.mPart == ESM::BodyPart::MP_Upperarm))
-                    bodypart = nullptr;
+                bodypart = partStore.search(part.mFemale + ext);
+                if (!bodypart && mViewMode == VM_FirstPerson)
+                {
+                    bodypart = partStore.search(part.mFemale);
+                    if (bodypart
+                        && !(bodypart->mData.mPart == ESM::BodyPart::MP_Hand
+                            || bodypart->mData.mPart == ESM::BodyPart::MP_Wrist
+                            || bodypart->mData.mPart == ESM::BodyPart::MP_Forearm
+                            || bodypart->mData.mPart == ESM::BodyPart::MP_Upperarm))
+                        bodypart = nullptr;
+                }
+                else if (!bodypart)
+                    Log(Debug::Warning) << "Warning: Failed to find body part '" << part.mFemale << "'";
             }
-            else if (!bodypart)
-                Log(Debug::Warning) << "Warning: Failed to find body part '" << part.mFemale << "'";
-        }
-        if(!bodypart && !part.mMale.empty())
-        {
-            bodypart = partStore.search(part.mMale+ext);
-            if(!bodypart && mViewMode == VM_FirstPerson)
+            if (!bodypart && !part.mMale.empty())
             {
-                bodypart = partStore.search(part.mMale);
-                if(bodypart && !(bodypart->mData.mPart == ESM::BodyPart::MP_Hand ||
-                                 bodypart->mData.mPart == ESM::BodyPart::MP_Wrist ||
-                                 bodypart->mData.mPart == ESM::BodyPart::MP_Forearm ||
-                                 bodypart->mData.mPart == ESM::BodyPart::MP_Upperarm))
-                    bodypart = nullptr;
+                bodypart = partStore.search(part.mMale + ext);
+                if (!bodypart && mViewMode == VM_FirstPerson)
+                {
+                    bodypart = partStore.search(part.mMale);
+                    if (bodypart
+                        && !(bodypart->mData.mPart == ESM::BodyPart::MP_Hand
+                            || bodypart->mData.mPart == ESM::BodyPart::MP_Wrist
+                            || bodypart->mData.mPart == ESM::BodyPart::MP_Forearm
+                            || bodypart->mData.mPart == ESM::BodyPart::MP_Upperarm))
+                        bodypart = nullptr;
+                }
+                else if (!bodypart)
+                    Log(Debug::Warning) << "Warning: Failed to find body part '" << part.mMale << "'";
             }
-            else if (!bodypart)
-                Log(Debug::Warning) << "Warning: Failed to find body part '" << part.mMale << "'";
-        }
 
-        if(bodypart)
-        {
-            const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-            addOrReplaceIndividualPart(static_cast<ESM::PartReferenceType>(part.mPart), group, priority,
-                Misc::ResourceHelpers::correctMeshPath(bodypart->mModel, vfs), enchantedGlow, glowColor);
+            if (bodypart)
+            {
+                const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+                addOrReplaceIndividualPart(static_cast<ESM::PartReferenceType>(part.mPart), group, priority,
+                    Misc::ResourceHelpers::correctMeshPath(bodypart->mModel, vfs), enchantedGlow, glowColor);
+            }
+            else
+                reserveIndividualPart((ESM::PartReferenceType)part.mPart, group, priority);
         }
-        else
-            reserveIndividualPart((ESM::PartReferenceType)part.mPart, group, priority);
     }
-}
 
-void NpcAnimation::addControllers()
-{
-    Animation::addControllers();
+    void NpcAnimation::addControllers()
+    {
+        Animation::addControllers();
 
-    mFirstPersonNeckController = nullptr;
-    WeaponAnimation::deleteControllers();
+        mFirstPersonNeckController = nullptr;
+        WeaponAnimation::deleteControllers();
 
-    if (mViewMode == VM_FirstPerson)
-    {
-        NodeMap::iterator found = mNodeMap.find("bip01 neck");
-        if (found != mNodeMap.end())
+        if (mViewMode == VM_FirstPerson)
         {
-            osg::MatrixTransform* node = found->second.get();
-            mFirstPersonNeckController = new RotateController(mObjectRoot.get());
-            node->addUpdateCallback(mFirstPersonNeckController);
-            mActiveControllers.emplace_back(node, mFirstPersonNeckController);
+            NodeMap::iterator found = mNodeMap.find("bip01 neck");
+            if (found != mNodeMap.end())
+            {
+                osg::MatrixTransform* node = found->second.get();
+                mFirstPersonNeckController = new RotateController(mObjectRoot.get());
+                node->addUpdateCallback(mFirstPersonNeckController);
+                mActiveControllers.emplace_back(node, mFirstPersonNeckController);
+            }
+        }
+        else if (mViewMode == VM_Normal)
+        {
+            WeaponAnimation::addControllers(mNodeMap, mActiveControllers, mObjectRoot.get());
         }
     }
-    else if (mViewMode == VM_Normal)
-    {
-        WeaponAnimation::addControllers(mNodeMap, mActiveControllers, mObjectRoot.get());
-    }
-}
 
-void NpcAnimation::showWeapons(bool showWeapon)
-{
-    mShowWeapons = showWeapon;
-    mAmmunition.reset();
-    if(showWeapon)
+    void NpcAnimation::showWeapons(bool showWeapon)
     {
-        const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
-        MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-        if(weapon != inv.end())
+        mShowWeapons = showWeapon;
+        mAmmunition.reset();
+        if (showWeapon)
         {
-            osg::Vec4f glowColor = weapon->getClass().getEnchantmentColor(*weapon);
-            std::string mesh = weapon->getClass().getModel(*weapon);
-            addOrReplaceIndividualPart(ESM::PRT_Weapon, MWWorld::InventoryStore::Slot_CarriedRight, 1,
-                                       mesh, !weapon->getClass().getEnchantment(*weapon).empty(), &glowColor);
-
-            // Crossbows start out with a bolt attached
-            if (weapon->getType() == ESM::Weapon::sRecordId &&
-                    weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow)
+            const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
+            MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+            if (weapon != inv.end())
             {
-                int ammotype = MWMechanics::getWeaponType(ESM::Weapon::MarksmanCrossbow)->mAmmoType;
-                MWWorld::ConstContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
-                if (ammo != inv.end() && ammo->get<ESM::Weapon>()->mBase->mData.mType == ammotype)
-                    attachArrow();
+                osg::Vec4f glowColor = weapon->getClass().getEnchantmentColor(*weapon);
+                std::string mesh = weapon->getClass().getModel(*weapon);
+                addOrReplaceIndividualPart(ESM::PRT_Weapon, MWWorld::InventoryStore::Slot_CarriedRight, 1, mesh,
+                    !weapon->getClass().getEnchantment(*weapon).empty(), &glowColor);
+
+                // Crossbows start out with a bolt attached
+                if (weapon->getType() == ESM::Weapon::sRecordId
+                    && weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow)
+                {
+                    int ammotype = MWMechanics::getWeaponType(ESM::Weapon::MarksmanCrossbow)->mAmmoType;
+                    MWWorld::ConstContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
+                    if (ammo != inv.end() && ammo->get<ESM::Weapon>()->mBase->mData.mType == ammotype)
+                        attachArrow();
+                }
             }
         }
-    }
-    else
-    {
-        removeIndividualPart(ESM::PRT_Weapon);
-        // If we remove/hide weapon from player, we should reset attack animation as well
-        if (mPtr == MWMechanics::getPlayer())
-            mPtr.getClass().getCreatureStats(mPtr).setAttackingOrSpell(false);
-    }
+        else
+        {
+            removeIndividualPart(ESM::PRT_Weapon);
+            // If we remove/hide weapon from player, we should reset attack animation as well
+            if (mPtr == MWMechanics::getPlayer())
+                mPtr.getClass().getCreatureStats(mPtr).setAttackingOrSpell(false);
+        }
 
-    updateHolsteredWeapon(!mShowWeapons);
-    updateQuiver();
-}
+        updateHolsteredWeapon(!mShowWeapons);
+        updateQuiver();
+    }
 
-bool NpcAnimation::updateCarriedLeftVisible(const int weaptype) const
-{
-    static const bool shieldSheathing = Settings::Manager::getBool("shield sheathing", "Game");
-    if (shieldSheathing)
+    bool NpcAnimation::updateCarriedLeftVisible(const int weaptype) const
     {
-        const MWWorld::Class &cls = mPtr.getClass();
-        MWMechanics::CreatureStats &stats = cls.getCreatureStats(mPtr);
-        if (stats.getDrawState() == MWMechanics::DrawState::Nothing)
+        static const bool shieldSheathing = Settings::Manager::getBool("shield sheathing", "Game");
+        if (shieldSheathing)
         {
-            SceneUtil::FindByNameVisitor findVisitor ("Bip01 AttachShield");
-            mObjectRoot->accept(findVisitor);
-            if (findVisitor.mFoundNode || mViewMode == VM_FirstPerson)
+            const MWWorld::Class& cls = mPtr.getClass();
+            MWMechanics::CreatureStats& stats = cls.getCreatureStats(mPtr);
+            if (stats.getDrawState() == MWMechanics::DrawState::Nothing)
             {
-                const MWWorld::InventoryStore& inv = cls.getInventoryStore(mPtr);
-                const MWWorld::ConstContainerStoreIterator shield = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
-                if (shield != inv.end() && shield->getType() == ESM::Armor::sRecordId && !getSheathedShieldMesh(*shield).empty())
-                    return false;
+                SceneUtil::FindByNameVisitor findVisitor("Bip01 AttachShield");
+                mObjectRoot->accept(findVisitor);
+                if (findVisitor.mFoundNode || mViewMode == VM_FirstPerson)
+                {
+                    const MWWorld::InventoryStore& inv = cls.getInventoryStore(mPtr);
+                    const MWWorld::ConstContainerStoreIterator shield
+                        = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
+                    if (shield != inv.end() && shield->getType() == ESM::Armor::sRecordId
+                        && !getSheathedShieldMesh(*shield).empty())
+                        return false;
+                }
             }
         }
-    }
 
-    return !(MWMechanics::getWeaponType(weaptype)->mFlags & ESM::WeaponType::TwoHanded);
-}
+        return !(MWMechanics::getWeaponType(weaptype)->mFlags & ESM::WeaponType::TwoHanded);
+    }
 
-void NpcAnimation::showCarriedLeft(bool show)
-{
-    mShowCarriedLeft = show;
-    const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
-    MWWorld::ConstContainerStoreIterator iter = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
-    if(show && iter != inv.end())
+    void NpcAnimation::showCarriedLeft(bool show)
     {
-        osg::Vec4f glowColor = iter->getClass().getEnchantmentColor(*iter);
-        std::string mesh = iter->getClass().getModel(*iter);
-        // For shields we must try to use the body part model
-        if (iter->getType() == ESM::Armor::sRecordId)
+        mShowCarriedLeft = show;
+        const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
+        MWWorld::ConstContainerStoreIterator iter = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
+        if (show && iter != inv.end())
         {
-            mesh = getShieldMesh(*iter, !mNpc->isMale());
+            osg::Vec4f glowColor = iter->getClass().getEnchantmentColor(*iter);
+            std::string mesh = iter->getClass().getModel(*iter);
+            // For shields we must try to use the body part model
+            if (iter->getType() == ESM::Armor::sRecordId)
+            {
+                mesh = getShieldMesh(*iter, !mNpc->isMale());
+            }
+            if (mesh.empty()
+                || addOrReplaceIndividualPart(ESM::PRT_Shield, MWWorld::InventoryStore::Slot_CarriedLeft, 1, mesh,
+                    !iter->getClass().getEnchantment(*iter).empty(), &glowColor,
+                    iter->getType() == ESM::Light::sRecordId))
+            {
+                if (mesh.empty())
+                    reserveIndividualPart(ESM::PRT_Shield, MWWorld::InventoryStore::Slot_CarriedLeft, 1);
+                if (iter->getType() == ESM::Light::sRecordId && mObjectParts[ESM::PRT_Shield])
+                    addExtraLight(mObjectParts[ESM::PRT_Shield]->getNode()->asGroup(), iter->get<ESM::Light>()->mBase);
+            }
         }
-        if (mesh.empty() || addOrReplaceIndividualPart(ESM::PRT_Shield, MWWorld::InventoryStore::Slot_CarriedLeft, 1,
-                                        mesh, !iter->getClass().getEnchantment(*iter).empty(), &glowColor, iter->getType() == ESM::Light::sRecordId))
+        else
+            removeIndividualPart(ESM::PRT_Shield);
+
+        updateHolsteredShield(mShowCarriedLeft);
+    }
+
+    void NpcAnimation::attachArrow()
+    {
+        WeaponAnimation::attachArrow(mPtr);
+
+        const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
+        MWWorld::ConstContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
+        if (ammo != inv.end() && !ammo->getClass().getEnchantment(*ammo).empty())
         {
-            if (mesh.empty())
-                reserveIndividualPart(ESM::PRT_Shield, MWWorld::InventoryStore::Slot_CarriedLeft, 1);
-            if (iter->getType() == ESM::Light::sRecordId && mObjectParts[ESM::PRT_Shield])
-                addExtraLight(mObjectParts[ESM::PRT_Shield]->getNode()->asGroup(), iter->get<ESM::Light>()->mBase);
+            osg::Group* bone = getArrowBone();
+            if (bone != nullptr && bone->getNumChildren())
+                SceneUtil::addEnchantedGlow(
+                    bone->getChild(0), mResourceSystem, ammo->getClass().getEnchantmentColor(*ammo));
         }
-    }
-    else
-        removeIndividualPart(ESM::PRT_Shield);
 
-    updateHolsteredShield(mShowCarriedLeft);
-}
+        updateQuiver();
+    }
 
-void NpcAnimation::attachArrow()
-{
-    WeaponAnimation::attachArrow(mPtr);
+    void NpcAnimation::detachArrow()
+    {
+        WeaponAnimation::detachArrow(mPtr);
+        updateQuiver();
+    }
 
-    const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
-    MWWorld::ConstContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
-    if (ammo != inv.end() && !ammo->getClass().getEnchantment(*ammo).empty())
+    void NpcAnimation::releaseArrow(float attackStrength)
     {
-        osg::Group* bone = getArrowBone();
-        if (bone != nullptr && bone->getNumChildren())
-            SceneUtil::addEnchantedGlow(bone->getChild(0), mResourceSystem, ammo->getClass().getEnchantmentColor(*ammo));
+        WeaponAnimation::releaseArrow(mPtr, attackStrength);
+        updateQuiver();
     }
 
-    updateQuiver();
-}
+    osg::Group* NpcAnimation::getArrowBone()
+    {
+        const PartHolder* const part = mObjectParts[ESM::PRT_Weapon].get();
+        if (part == nullptr)
+            return nullptr;
 
-void NpcAnimation::detachArrow()
-{
-    WeaponAnimation::detachArrow(mPtr);
-    updateQuiver();
-}
+        const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
+        MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+        if (weapon == inv.end() || weapon->getType() != ESM::Weapon::sRecordId)
+            return nullptr;
 
-void NpcAnimation::releaseArrow(float attackStrength)
-{
-    WeaponAnimation::releaseArrow(mPtr, attackStrength);
-    updateQuiver();
-}
+        int type = weapon->get<ESM::Weapon>()->mBase->mData.mType;
+        int ammoType = MWMechanics::getWeaponType(type)->mAmmoType;
+        if (ammoType == ESM::Weapon::None)
+            return nullptr;
 
-osg::Group* NpcAnimation::getArrowBone()
-{
-    const PartHolder* const part = mObjectParts[ESM::PRT_Weapon].get();
-    if (part == nullptr)
-        return nullptr;
-
-    const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
-    MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-    if(weapon == inv.end() || weapon->getType() != ESM::Weapon::sRecordId)
-        return nullptr;
-
-    int type = weapon->get<ESM::Weapon>()->mBase->mData.mType;
-    int ammoType = MWMechanics::getWeaponType(type)->mAmmoType;
-    if (ammoType == ESM::Weapon::None)
-        return nullptr;
-
-    // Try to find and attachment bone in actor's skeleton, otherwise fall back to the ArrowBone in weapon's mesh
-    osg::Group* bone = getBoneByName(MWMechanics::getWeaponType(ammoType)->mAttachBone);
-    if (bone == nullptr)
-    {
-        SceneUtil::FindByNameVisitor findVisitor ("ArrowBone");
-        part->getNode()->accept(findVisitor);
-        bone = findVisitor.mFoundNode;
+        // Try to find and attachment bone in actor's skeleton, otherwise fall back to the ArrowBone in weapon's mesh
+        osg::Group* bone = getBoneByName(MWMechanics::getWeaponType(ammoType)->mAttachBone);
+        if (bone == nullptr)
+        {
+            SceneUtil::FindByNameVisitor findVisitor("ArrowBone");
+            part->getNode()->accept(findVisitor);
+            bone = findVisitor.mFoundNode;
+        }
+        return bone;
     }
-    return bone;
-}
-
-osg::Node* NpcAnimation::getWeaponNode()
-{
-    const PartHolder* const part = mObjectParts[ESM::PRT_Weapon].get();
-    if (part == nullptr)
-        return nullptr;
-    return part->getNode();
-}
 
-Resource::ResourceSystem* NpcAnimation::getResourceSystem()
-{
-    return mResourceSystem;
-}
+    osg::Node* NpcAnimation::getWeaponNode()
+    {
+        const PartHolder* const part = mObjectParts[ESM::PRT_Weapon].get();
+        if (part == nullptr)
+            return nullptr;
+        return part->getNode();
+    }
 
-void NpcAnimation::enableHeadAnimation(bool enable)
-{
-    mHeadAnimationTime->setEnabled(enable);
-}
+    Resource::ResourceSystem* NpcAnimation::getResourceSystem()
+    {
+        return mResourceSystem;
+    }
 
-void NpcAnimation::setWeaponGroup(const std::string &group, bool relativeDuration)
-{
-    mWeaponAnimationTime->setGroup(group, relativeDuration);
-}
+    void NpcAnimation::enableHeadAnimation(bool enable)
+    {
+        mHeadAnimationTime->setEnabled(enable);
+    }
 
-void NpcAnimation::equipmentChanged()
-{
-    static const bool shieldSheathing = Settings::Manager::getBool("shield sheathing", "Game");
-    if (shieldSheathing)
+    void NpcAnimation::setWeaponGroup(const std::string& group, bool relativeDuration)
     {
-        int weaptype = ESM::Weapon::None;
-        MWMechanics::getActiveWeapon(mPtr, &weaptype);
-        showCarriedLeft(updateCarriedLeftVisible(weaptype));
+        mWeaponAnimationTime->setGroup(group, relativeDuration);
     }
 
-    updateParts();
-}
+    void NpcAnimation::equipmentChanged()
+    {
+        static const bool shieldSheathing = Settings::Manager::getBool("shield sheathing", "Game");
+        if (shieldSheathing)
+        {
+            int weaptype = ESM::Weapon::None;
+            MWMechanics::getActiveWeapon(mPtr, &weaptype);
+            showCarriedLeft(updateCarriedLeftVisible(weaptype));
+        }
 
-void NpcAnimation::setVampire(bool vampire)
-{
-    if (mNpcType == Type_Werewolf) // we can't have werewolf vampires, can we
-        return;
-    if ((mNpcType == Type_Vampire) != vampire)
+        updateParts();
+    }
+
+    void NpcAnimation::setVampire(bool vampire)
     {
-        if (mPtr == MWMechanics::getPlayer())
-            MWBase::Environment::get().getWorld()->reattachPlayerCamera();
-        else
-            rebuild();
+        if (mNpcType == Type_Werewolf) // we can't have werewolf vampires, can we
+            return;
+        if ((mNpcType == Type_Vampire) != vampire)
+        {
+            if (mPtr == MWMechanics::getPlayer())
+                MWBase::Environment::get().getWorld()->reattachPlayerCamera();
+            else
+                rebuild();
+        }
     }
-}
 
-void NpcAnimation::setFirstPersonOffset(const osg::Vec3f &offset)
-{
-    mFirstPersonOffset = offset;
-}
+    void NpcAnimation::setFirstPersonOffset(const osg::Vec3f& offset)
+    {
+        mFirstPersonOffset = offset;
+    }
 
-void NpcAnimation::updatePtr(const MWWorld::Ptr &updated)
-{
-    Animation::updatePtr(updated);
-    mHeadAnimationTime->updatePtr(updated);
-}
+    void NpcAnimation::updatePtr(const MWWorld::Ptr& updated)
+    {
+        Animation::updatePtr(updated);
+        mHeadAnimationTime->updatePtr(updated);
+    }
 
-// Remember body parts so we only have to search through the store once for each race/gender/viewmode combination
-typedef std::map< std::pair<std::string,int>,std::vector<const ESM::BodyPart*> > RaceMapping;
-static RaceMapping sRaceMapping;
+    // Remember body parts so we only have to search through the store once for each race/gender/viewmode combination
+    typedef std::map<std::pair<std::string, int>, std::vector<const ESM::BodyPart*>> RaceMapping;
+    static RaceMapping sRaceMapping;
 
-const std::vector<const ESM::BodyPart *>& NpcAnimation::getBodyParts(const std::string &race, bool female, bool firstPerson, bool werewolf)
-{
-    static const int Flag_FirstPerson = 1<<1;
-    static const int Flag_Female      = 1<<0;
-
-    int flags = (werewolf ? -1 : 0);
-    if(female)
-        flags |= Flag_Female;
-    if(firstPerson)
-        flags |= Flag_FirstPerson;
-
-    RaceMapping::iterator found = sRaceMapping.find(std::make_pair(race, flags));
-    if (found != sRaceMapping.end())
-        return found->second;
-    else
+    const std::vector<const ESM::BodyPart*>& NpcAnimation::getBodyParts(
+        const std::string& race, bool female, bool firstPerson, bool werewolf)
     {
-        std::vector<const ESM::BodyPart*>& parts = sRaceMapping[std::make_pair(race, flags)];
-
-        typedef std::multimap<ESM::BodyPart::MeshPart,ESM::PartReferenceType> BodyPartMapType;
-        static const BodyPartMapType sBodyPartMap =
+        static const int Flag_FirstPerson = 1 << 1;
+        static const int Flag_Female = 1 << 0;
+
+        int flags = (werewolf ? -1 : 0);
+        if (female)
+            flags |= Flag_Female;
+        if (firstPerson)
+            flags |= Flag_FirstPerson;
+
+        RaceMapping::iterator found = sRaceMapping.find(std::make_pair(race, flags));
+        if (found != sRaceMapping.end())
+            return found->second;
+        else
         {
-            {ESM::BodyPart::MP_Neck, ESM::PRT_Neck},
-            {ESM::BodyPart::MP_Chest, ESM::PRT_Cuirass},
-            {ESM::BodyPart::MP_Groin, ESM::PRT_Groin},
-            {ESM::BodyPart::MP_Hand, ESM::PRT_RHand},
-            {ESM::BodyPart::MP_Hand, ESM::PRT_LHand},
-            {ESM::BodyPart::MP_Wrist, ESM::PRT_RWrist},
-            {ESM::BodyPart::MP_Wrist, ESM::PRT_LWrist},
-            {ESM::BodyPart::MP_Forearm, ESM::PRT_RForearm},
-            {ESM::BodyPart::MP_Forearm, ESM::PRT_LForearm},
-            {ESM::BodyPart::MP_Upperarm, ESM::PRT_RUpperarm},
-            {ESM::BodyPart::MP_Upperarm, ESM::PRT_LUpperarm},
-            {ESM::BodyPart::MP_Foot, ESM::PRT_RFoot},
-            {ESM::BodyPart::MP_Foot, ESM::PRT_LFoot},
-            {ESM::BodyPart::MP_Ankle, ESM::PRT_RAnkle},
-            {ESM::BodyPart::MP_Ankle, ESM::PRT_LAnkle},
-            {ESM::BodyPart::MP_Knee, ESM::PRT_RKnee},
-            {ESM::BodyPart::MP_Knee, ESM::PRT_LKnee},
-            {ESM::BodyPart::MP_Upperleg, ESM::PRT_RLeg},
-            {ESM::BodyPart::MP_Upperleg, ESM::PRT_LLeg},
-            {ESM::BodyPart::MP_Tail, ESM::PRT_Tail}
-        };
+            std::vector<const ESM::BodyPart*>& parts = sRaceMapping[std::make_pair(race, flags)];
 
-        parts.resize(ESM::PRT_Count, nullptr);
+            typedef std::multimap<ESM::BodyPart::MeshPart, ESM::PartReferenceType> BodyPartMapType;
+            static const BodyPartMapType sBodyPartMap = { { ESM::BodyPart::MP_Neck, ESM::PRT_Neck },
+                { ESM::BodyPart::MP_Chest, ESM::PRT_Cuirass }, { ESM::BodyPart::MP_Groin, ESM::PRT_Groin },
+                { ESM::BodyPart::MP_Hand, ESM::PRT_RHand }, { ESM::BodyPart::MP_Hand, ESM::PRT_LHand },
+                { ESM::BodyPart::MP_Wrist, ESM::PRT_RWrist }, { ESM::BodyPart::MP_Wrist, ESM::PRT_LWrist },
+                { ESM::BodyPart::MP_Forearm, ESM::PRT_RForearm }, { ESM::BodyPart::MP_Forearm, ESM::PRT_LForearm },
+                { ESM::BodyPart::MP_Upperarm, ESM::PRT_RUpperarm }, { ESM::BodyPart::MP_Upperarm, ESM::PRT_LUpperarm },
+                { ESM::BodyPart::MP_Foot, ESM::PRT_RFoot }, { ESM::BodyPart::MP_Foot, ESM::PRT_LFoot },
+                { ESM::BodyPart::MP_Ankle, ESM::PRT_RAnkle }, { ESM::BodyPart::MP_Ankle, ESM::PRT_LAnkle },
+                { ESM::BodyPart::MP_Knee, ESM::PRT_RKnee }, { ESM::BodyPart::MP_Knee, ESM::PRT_LKnee },
+                { ESM::BodyPart::MP_Upperleg, ESM::PRT_RLeg }, { ESM::BodyPart::MP_Upperleg, ESM::PRT_LLeg },
+                { ESM::BodyPart::MP_Tail, ESM::PRT_Tail } };
 
-        if (werewolf)
-            return parts;
+            parts.resize(ESM::PRT_Count, nullptr);
 
-        const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
+            if (werewolf)
+                return parts;
 
-        for(const ESM::BodyPart& bodypart : store.get<ESM::BodyPart>())
-        {
-            if (bodypart.mData.mFlags & ESM::BodyPart::BPF_NotPlayable)
-                continue;
-            if (bodypart.mData.mType != ESM::BodyPart::MT_Skin)
-                continue;
+            const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
 
-            if (!Misc::StringUtils::ciEqual(bodypart.mRace, race))
-                continue;
+            for (const ESM::BodyPart& bodypart : store.get<ESM::BodyPart>())
+            {
+                if (bodypart.mData.mFlags & ESM::BodyPart::BPF_NotPlayable)
+                    continue;
+                if (bodypart.mData.mType != ESM::BodyPart::MT_Skin)
+                    continue;
 
-            bool partFirstPerson = isFirstPersonPart(&bodypart);
+                if (!Misc::StringUtils::ciEqual(bodypart.mRace, race))
+                    continue;
 
-            bool isHand = bodypart.mData.mPart == ESM::BodyPart::MP_Hand ||
-                                    bodypart.mData.mPart == ESM::BodyPart::MP_Wrist ||
-                                    bodypart.mData.mPart == ESM::BodyPart::MP_Forearm ||
-                                    bodypart.mData.mPart == ESM::BodyPart::MP_Upperarm;
+                bool partFirstPerson = isFirstPersonPart(&bodypart);
 
-            bool isSameGender = isFemalePart(&bodypart) == female;
+                bool isHand = bodypart.mData.mPart == ESM::BodyPart::MP_Hand
+                    || bodypart.mData.mPart == ESM::BodyPart::MP_Wrist
+                    || bodypart.mData.mPart == ESM::BodyPart::MP_Forearm
+                    || bodypart.mData.mPart == ESM::BodyPart::MP_Upperarm;
 
-            /* A fallback for the arms if 1st person is missing:
-             1. Try to use 3d person skin for same gender
-             2. Try to use 1st person skin for male, if female == true
-             3. Try to use 3d person skin for male, if female == true
+                bool isSameGender = isFemalePart(&bodypart) == female;
 
-             A fallback in another cases: allow to use male bodyparts, if female == true
-            */
-            if (firstPerson && isHand && !partFirstPerson)
-            {
-                // Allow 3rd person skins as a fallback for the arms if 1st person is missing
-                BodyPartMapType::const_iterator bIt = sBodyPartMap.lower_bound(BodyPartMapType::key_type(bodypart.mData.mPart));
-                while(bIt != sBodyPartMap.end() && bIt->first == bodypart.mData.mPart)
+                /* A fallback for the arms if 1st person is missing:
+                 1. Try to use 3d person skin for same gender
+                 2. Try to use 1st person skin for male, if female == true
+                 3. Try to use 3d person skin for male, if female == true
+
+                 A fallback in another cases: allow to use male bodyparts, if female == true
+                */
+                if (firstPerson && isHand && !partFirstPerson)
                 {
-                    // If we have no fallback bodypart now and bodypart is for same gender (1)
-                    if(!parts[bIt->second] && isSameGender)
-                       parts[bIt->second] = &bodypart;
+                    // Allow 3rd person skins as a fallback for the arms if 1st person is missing
+                    BodyPartMapType::const_iterator bIt
+                        = sBodyPartMap.lower_bound(BodyPartMapType::key_type(bodypart.mData.mPart));
+                    while (bIt != sBodyPartMap.end() && bIt->first == bodypart.mData.mPart)
+                    {
+                        // If we have no fallback bodypart now and bodypart is for same gender (1)
+                        if (!parts[bIt->second] && isSameGender)
+                            parts[bIt->second] = &bodypart;
 
-                    // If we have fallback bodypart for other gender and found fallback for current gender (1)
-                    else if(isSameGender && isFemalePart(parts[bIt->second]) != female)
-                       parts[bIt->second] = &bodypart;
+                        // If we have fallback bodypart for other gender and found fallback for current gender (1)
+                        else if (isSameGender && isFemalePart(parts[bIt->second]) != female)
+                            parts[bIt->second] = &bodypart;
 
-                    // If we have no fallback bodypart and searching for female bodyparts (3)
-                    else if(!parts[bIt->second] && female)
-                       parts[bIt->second] = &bodypart;
+                        // If we have no fallback bodypart and searching for female bodyparts (3)
+                        else if (!parts[bIt->second] && female)
+                            parts[bIt->second] = &bodypart;
 
-                    ++bIt;
-                }
+                        ++bIt;
+                    }
 
-                continue;
-            }
+                    continue;
+                }
 
-            // Don't allow to use podyparts for a different view
-            if (partFirstPerson != firstPerson)
-                continue;
+                // Don't allow to use podyparts for a different view
+                if (partFirstPerson != firstPerson)
+                    continue;
 
-            if (female && !isFemalePart(&bodypart))
-            {
-                // Allow male parts as fallback for females if female parts are missing
-                BodyPartMapType::const_iterator bIt = sBodyPartMap.lower_bound(BodyPartMapType::key_type(bodypart.mData.mPart));
-                while(bIt != sBodyPartMap.end() && bIt->first == bodypart.mData.mPart)
+                if (female && !isFemalePart(&bodypart))
                 {
-                    // If we have no fallback bodypart now
-                    if(!parts[bIt->second])
-                        parts[bIt->second] = &bodypart;
+                    // Allow male parts as fallback for females if female parts are missing
+                    BodyPartMapType::const_iterator bIt
+                        = sBodyPartMap.lower_bound(BodyPartMapType::key_type(bodypart.mData.mPart));
+                    while (bIt != sBodyPartMap.end() && bIt->first == bodypart.mData.mPart)
+                    {
+                        // If we have no fallback bodypart now
+                        if (!parts[bIt->second])
+                            parts[bIt->second] = &bodypart;
 
-                    // If we have 3d person fallback bodypart for hand and 1st person fallback found (2)
-                    else if(isHand && !isFirstPersonPart(parts[bIt->second]) && partFirstPerson)
-                        parts[bIt->second] = &bodypart;
+                        // If we have 3d person fallback bodypart for hand and 1st person fallback found (2)
+                        else if (isHand && !isFirstPersonPart(parts[bIt->second]) && partFirstPerson)
+                            parts[bIt->second] = &bodypart;
 
-                    ++bIt;
-                }
+                        ++bIt;
+                    }
 
-                continue;
-            }
+                    continue;
+                }
 
-            // Don't allow to use podyparts for another gender
-            if (female != isFemalePart(&bodypart))
-                continue;
+                // Don't allow to use podyparts for another gender
+                if (female != isFemalePart(&bodypart))
+                    continue;
 
-            // Use properly found bodypart, replacing fallbacks
-            BodyPartMapType::const_iterator bIt = sBodyPartMap.lower_bound(BodyPartMapType::key_type(bodypart.mData.mPart));
-            while(bIt != sBodyPartMap.end() && bIt->first == bodypart.mData.mPart)
-            {
-                parts[bIt->second] = &bodypart;
-                ++bIt;
+                // Use properly found bodypart, replacing fallbacks
+                BodyPartMapType::const_iterator bIt
+                    = sBodyPartMap.lower_bound(BodyPartMapType::key_type(bodypart.mData.mPart));
+                while (bIt != sBodyPartMap.end() && bIt->first == bodypart.mData.mPart)
+                {
+                    parts[bIt->second] = &bodypart;
+                    ++bIt;
+                }
             }
+            return parts;
         }
-        return parts;
     }
-}
 
-void NpcAnimation::setAccurateAiming(bool enabled)
-{
-    mAccurateAiming = enabled;
-}
+    void NpcAnimation::setAccurateAiming(bool enabled)
+    {
+        mAccurateAiming = enabled;
+    }
 
-bool NpcAnimation::isArrowAttached() const
-{
-    return mAmmunition != nullptr;
-}
+    bool NpcAnimation::isArrowAttached() const
+    {
+        return mAmmunition != nullptr;
+    }
 
 }
diff --git a/apps/openmw/mwrender/npcanimation.hpp b/apps/openmw/mwrender/npcanimation.hpp
index 82b21d556b..bb7b889c1e 100644
--- a/apps/openmw/mwrender/npcanimation.hpp
+++ b/apps/openmw/mwrender/npcanimation.hpp
@@ -24,156 +24,160 @@ namespace MWSound
 namespace MWRender
 {
 
-class RotateController;
-class HeadAnimationTime;
+    class RotateController;
+    class HeadAnimationTime;
 
-class NpcAnimation : public ActorAnimation, public WeaponAnimation, public MWWorld::InventoryStoreListener
-{
-public:
-    void equipmentChanged() override;
+    class NpcAnimation : public ActorAnimation, public WeaponAnimation, public MWWorld::InventoryStoreListener
+    {
+    public:
+        void equipmentChanged() override;
 
-public:
-    typedef std::map<ESM::PartReferenceType,std::string> PartBoneMap;
+    public:
+        typedef std::map<ESM::PartReferenceType, std::string> PartBoneMap;
 
-    enum ViewMode {
-        VM_Normal,
-        VM_FirstPerson,
-        VM_HeadOnly
-    };
+        enum ViewMode
+        {
+            VM_Normal,
+            VM_FirstPerson,
+            VM_HeadOnly
+        };
 
-private:
-    static const PartBoneMap sPartList;
+    private:
+        static const PartBoneMap sPartList;
 
-    // Bounded Parts
-    PartHolderPtr mObjectParts[ESM::PRT_Count];
-    std::array<MWSound::Sound*, ESM::PRT_Count> mSounds;
+        // Bounded Parts
+        PartHolderPtr mObjectParts[ESM::PRT_Count];
+        std::array<MWSound::Sound*, ESM::PRT_Count> mSounds;
 
-    const ESM::NPC *mNpc;
-    std::string    mHeadModel;
-    std::string    mHairModel;
-    ViewMode       mViewMode;
-    bool mShowWeapons;
-    bool mShowCarriedLeft;
+        const ESM::NPC* mNpc;
+        std::string mHeadModel;
+        std::string mHairModel;
+        ViewMode mViewMode;
+        bool mShowWeapons;
+        bool mShowCarriedLeft;
 
-    enum NpcType
-    {
-        Type_Normal,
-        Type_Werewolf,
-        Type_Vampire
-    };
-    NpcType mNpcType;
+        enum NpcType
+        {
+            Type_Normal,
+            Type_Werewolf,
+            Type_Vampire
+        };
+        NpcType mNpcType;
 
-    int mPartslots[ESM::PRT_Count];  //Each part slot is taken by clothing, armor, or is empty
-    int mPartPriorities[ESM::PRT_Count];
+        int mPartslots[ESM::PRT_Count]; // Each part slot is taken by clothing, armor, or is empty
+        int mPartPriorities[ESM::PRT_Count];
 
-    osg::Vec3f mFirstPersonOffset;
-    // Field of view to use when rendering first person meshes
-    float mFirstPersonFieldOfView;
+        osg::Vec3f mFirstPersonOffset;
+        // Field of view to use when rendering first person meshes
+        float mFirstPersonFieldOfView;
 
-    std::shared_ptr<HeadAnimationTime> mHeadAnimationTime;
-    std::shared_ptr<WeaponAnimationTime> mWeaponAnimationTime;
+        std::shared_ptr<HeadAnimationTime> mHeadAnimationTime;
+        std::shared_ptr<WeaponAnimationTime> mWeaponAnimationTime;
 
-    bool mSoundsDisabled;
+        bool mSoundsDisabled;
 
-    bool mAccurateAiming;
-    float mAimingFactor;
+        bool mAccurateAiming;
+        float mAimingFactor;
 
-    void updateNpcBase();
+        void updateNpcBase();
 
-    NpcType getNpcType() const;
+        NpcType getNpcType() const;
 
-    PartHolderPtr insertBoundedPart(const std::string &model, std::string_view bonename,
-                                        std::string_view bonefilter, bool enchantedGlow, osg::Vec4f* glowColor, bool isLight);
+        PartHolderPtr insertBoundedPart(const std::string& model, std::string_view bonename,
+            std::string_view bonefilter, bool enchantedGlow, osg::Vec4f* glowColor, bool isLight);
 
-    void removeIndividualPart(ESM::PartReferenceType type);
-    void reserveIndividualPart(ESM::PartReferenceType type, int group, int priority);
+        void removeIndividualPart(ESM::PartReferenceType type);
+        void reserveIndividualPart(ESM::PartReferenceType type, int group, int priority);
 
-    bool addOrReplaceIndividualPart(ESM::PartReferenceType type, int group, int priority, const std::string &mesh,
-                                    bool enchantedGlow=false, osg::Vec4f* glowColor=nullptr, bool isLight = false);
-    void removePartGroup(int group);
-    void addPartGroup(int group, int priority, const std::vector<ESM::PartReference> &parts,
-                                    bool enchantedGlow=false, osg::Vec4f* glowColor=nullptr);
+        bool addOrReplaceIndividualPart(ESM::PartReferenceType type, int group, int priority, const std::string& mesh,
+            bool enchantedGlow = false, osg::Vec4f* glowColor = nullptr, bool isLight = false);
+        void removePartGroup(int group);
+        void addPartGroup(int group, int priority, const std::vector<ESM::PartReference>& parts,
+            bool enchantedGlow = false, osg::Vec4f* glowColor = nullptr);
 
-    void setRenderBin();
+        void setRenderBin();
 
-    osg::ref_ptr<RotateController> mFirstPersonNeckController;
+        osg::ref_ptr<RotateController> mFirstPersonNeckController;
 
-    static bool isFirstPersonPart(const ESM::BodyPart* bodypart);
-    static bool isFemalePart(const ESM::BodyPart* bodypart);
-    static NpcType getNpcType(const MWWorld::Ptr& ptr);
+        static bool isFirstPersonPart(const ESM::BodyPart* bodypart);
+        static bool isFemalePart(const ESM::BodyPart* bodypart);
+        static NpcType getNpcType(const MWWorld::Ptr& ptr);
 
-protected:
-    void addControllers() override;
-    bool isArrowAttached() const override;
-    std::string getSheathedShieldMesh(const MWWorld::ConstPtr& shield) const override;
+    protected:
+        void addControllers() override;
+        bool isArrowAttached() const override;
+        std::string getSheathedShieldMesh(const MWWorld::ConstPtr& shield) const override;
 
-public:
-    /**
-     * @param ptr
-     * @param disableListener  Don't listen for equipment changes and magic effects. InventoryStore only supports
-     *                         one listener at a time, so you shouldn't do this if creating several NpcAnimations
-     *                         for the same Ptr, eg preview dolls for the player.
-     *                         Those need to be manually rendered anyway.
-     * @param disableSounds    Same as \a disableListener but for playing items sounds
-     * @param viewMode
-     */
-    NpcAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem,
-                 bool disableSounds = false, ViewMode viewMode=VM_Normal, float firstPersonFieldOfView=55.f);
-    virtual ~NpcAnimation();
+    public:
+        /**
+         * @param ptr
+         * @param disableListener  Don't listen for equipment changes and magic effects. InventoryStore only supports
+         *                         one listener at a time, so you shouldn't do this if creating several NpcAnimations
+         *                         for the same Ptr, eg preview dolls for the player.
+         *                         Those need to be manually rendered anyway.
+         * @param disableSounds    Same as \a disableListener but for playing items sounds
+         * @param viewMode
+         */
+        NpcAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode,
+            Resource::ResourceSystem* resourceSystem, bool disableSounds = false, ViewMode viewMode = VM_Normal,
+            float firstPersonFieldOfView = 55.f);
+        virtual ~NpcAnimation();
 
-    void enableHeadAnimation(bool enable) override;
+        void enableHeadAnimation(bool enable) override;
 
-    /// 1: the first person meshes follow the camera's rotation completely
-    /// 0: the first person meshes follow the camera with a reduced factor, so you can look down at your own hands
-    void setAccurateAiming(bool enabled) override;
+        /// 1: the first person meshes follow the camera's rotation completely
+        /// 0: the first person meshes follow the camera with a reduced factor, so you can look down at your own hands
+        void setAccurateAiming(bool enabled) override;
 
-    void setWeaponGroup(const std::string& group, bool relativeDuration) override;
+        void setWeaponGroup(const std::string& group, bool relativeDuration) override;
 
-    osg::Vec3f runAnimation(float timepassed) override;
+        osg::Vec3f runAnimation(float timepassed) override;
 
-    /// A relative factor (0-1) that decides if and how much the skeleton should be pitched
-    /// to indicate the facing orientation of the character.
-    void setPitchFactor(float factor) override { mPitchFactor = factor; }
+        /// A relative factor (0-1) that decides if and how much the skeleton should be pitched
+        /// to indicate the facing orientation of the character.
+        void setPitchFactor(float factor) override { mPitchFactor = factor; }
 
-    bool getWeaponsShown() const override { return mShowWeapons; }
-    void showWeapons(bool showWeapon) override;
+        bool getWeaponsShown() const override { return mShowWeapons; }
+        void showWeapons(bool showWeapon) override;
 
-    bool updateCarriedLeftVisible(const int weaptype) const override;
-    bool getCarriedLeftShown() const override { return mShowCarriedLeft; }
-    void showCarriedLeft(bool show) override;
+        bool updateCarriedLeftVisible(const int weaptype) const override;
+        bool getCarriedLeftShown() const override { return mShowCarriedLeft; }
+        void showCarriedLeft(bool show) override;
 
-    void attachArrow() override;
-    void detachArrow() override;
-    void releaseArrow(float attackStrength) override;
+        void attachArrow() override;
+        void detachArrow() override;
+        void releaseArrow(float attackStrength) override;
 
-    osg::Group* getArrowBone() override;
-    osg::Node* getWeaponNode() override;
-    Resource::ResourceSystem* getResourceSystem() override;
+        osg::Group* getArrowBone() override;
+        osg::Node* getWeaponNode() override;
+        Resource::ResourceSystem* getResourceSystem() override;
 
-    // WeaponAnimation
-    void showWeapon(bool show) override { showWeapons(show); }
+        // WeaponAnimation
+        void showWeapon(bool show) override { showWeapons(show); }
 
-    void setViewMode(ViewMode viewMode);
+        void setViewMode(ViewMode viewMode);
 
-    void updateParts();
+        void updateParts();
 
-    /// Rebuilds the NPC, updating their root model, animation sources, and equipment.
-    void rebuild();
+        /// Rebuilds the NPC, updating their root model, animation sources, and equipment.
+        void rebuild();
 
-    /// Get the inventory slot that the given node path leads into, or -1 if not found.
-    int getSlot(const osg::NodePath& path) const;
+        /// Get the inventory slot that the given node path leads into, or -1 if not found.
+        int getSlot(const osg::NodePath& path) const;
 
-    void setVampire(bool vampire) override;
+        void setVampire(bool vampire) override;
 
-    /// Set a translation offset (in object root space) to apply to meshes when in first person mode.
-    void setFirstPersonOffset(const osg::Vec3f& offset);
+        /// Set a translation offset (in object root space) to apply to meshes when in first person mode.
+        void setFirstPersonOffset(const osg::Vec3f& offset);
 
-    void updatePtr(const MWWorld::Ptr& updated) override;
+        void updatePtr(const MWWorld::Ptr& updated) override;
 
-    /// Get a list of body parts that may be used by an NPC of given race and gender.
-    /// @note This is a fixed size list, one list item for each ESM::PartReferenceType, may contain nullptr body parts.
-    static const std::vector<const ESM::BodyPart*>& getBodyParts(const std::string& raceId, bool female, bool firstperson, bool werewolf);
-};
+        /// Get a list of body parts that may be used by an NPC of given race and gender.
+        /// @note This is a fixed size list, one list item for each ESM::PartReferenceType, may contain nullptr body
+        /// parts.
+        static const std::vector<const ESM::BodyPart*>& getBodyParts(
+            const std::string& raceId, bool female, bool firstperson, bool werewolf);
+    };
 
 }
 
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 1426a6d314..77bf4097a0 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -4,40 +4,40 @@
 #include <vector>
 
 #include <osg/LOD>
-#include <osg/Switch>
-#include <osg/Sequence>
-#include <osg/MatrixTransform>
 #include <osg/Material>
+#include <osg/MatrixTransform>
+#include <osg/Sequence>
+#include <osg/Switch>
 #include <osgUtil/IncrementalCompileOperation>
 
 #include <components/esm3/esmreader.hpp>
-#include <components/esm3/loadstat.hpp>
 #include <components/esm3/loadacti.hpp>
 #include <components/esm3/loadcont.hpp>
 #include <components/esm3/loaddoor.hpp>
+#include <components/esm3/loadstat.hpp>
 
+#include <components/esm3/readerscache.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/scenemanager.hpp>
+#include <components/sceneutil/clone.hpp>
 #include <components/sceneutil/optimizer.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
-#include <components/sceneutil/clone.hpp>
 #include <components/sceneutil/util.hpp>
 #include <components/vfs/manager.hpp>
-#include <components/esm3/readerscache.hpp>
 
 #include <osgParticle/ParticleProcessor>
 #include <osgParticle/ParticleSystemUpdater>
 
+#include <components/misc/rng.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/morphgeometry.hpp>
-#include <components/sceneutil/riggeometryosgaextension.hpp>
 #include <components/sceneutil/riggeometry.hpp>
+#include <components/sceneutil/riggeometryosgaextension.hpp>
 #include <components/settings/settings.hpp>
-#include <components/misc/rng.hpp>
 
-#include "apps/openmw/mwworld/esmstore.hpp"
 #include "apps/openmw/mwbase/environment.hpp"
 #include "apps/openmw/mwbase/world.hpp"
+#include "apps/openmw/mwworld/esmstore.hpp"
 
 #include "vismask.hpp"
 
@@ -50,15 +50,15 @@ namespace MWRender
     {
         switch (type)
         {
-          case ESM::REC_STAT:
-          case ESM::REC_ACTI:
-          case ESM::REC_DOOR:
-            return true;
-          case ESM::REC_CONT:
-            return !far;
+            case ESM::REC_STAT:
+            case ESM::REC_ACTI:
+            case ESM::REC_DOOR:
+                return true;
+            case ESM::REC_CONT:
+                return !far;
 
-        default:
-            return false;
+            default:
+                return false;
         }
     }
 
@@ -66,20 +66,21 @@ namespace MWRender
     {
         switch (type)
         {
-          case ESM::REC_STAT:
-            return store.get<ESM::Static>().searchStatic(id)->mModel;
-          case ESM::REC_ACTI:
-            return store.get<ESM::Activator>().searchStatic(id)->mModel;
-          case ESM::REC_DOOR:
-            return store.get<ESM::Door>().searchStatic(id)->mModel;
-          case ESM::REC_CONT:
-            return store.get<ESM::Container>().searchStatic(id)->mModel;
-          default:
-            return {};
+            case ESM::REC_STAT:
+                return store.get<ESM::Static>().searchStatic(id)->mModel;
+            case ESM::REC_ACTI:
+                return store.get<ESM::Activator>().searchStatic(id)->mModel;
+            case ESM::REC_DOOR:
+                return store.get<ESM::Door>().searchStatic(id)->mModel;
+            case ESM::REC_CONT:
+                return store.get<ESM::Container>().searchStatic(id)->mModel;
+            default:
+                return {};
         }
     }
 
-    osg::ref_ptr<osg::Node> ObjectPaging::getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile)
+    osg::ref_ptr<osg::Node> ObjectPaging::getChunk(float size, const osg::Vec2f& center, unsigned char lod,
+        unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile)
     {
         lod = static_cast<unsigned char>(lodFlags >> (4 * 4));
         if (activeGrid && !mActiveGrid)
@@ -101,11 +102,13 @@ namespace MWRender
     class CanOptimizeCallback : public SceneUtil::Optimizer::IsOperationPermissibleForObjectCallback
     {
     public:
-        bool isOperationPermissibleForObjectImplementation(const SceneUtil::Optimizer* optimizer, const osg::Drawable* node,unsigned int option) const override
+        bool isOperationPermissibleForObjectImplementation(
+            const SceneUtil::Optimizer* optimizer, const osg::Drawable* node, unsigned int option) const override
         {
             return true;
         }
-        bool isOperationPermissibleForObjectImplementation(const SceneUtil::Optimizer* optimizer, const osg::Node* node,unsigned int option) const override
+        bool isOperationPermissibleForObjectImplementation(
+            const SceneUtil::Optimizer* optimizer, const osg::Node* node, unsigned int option) const override
         {
             return (node->getDataVariance() != osg::Object::DYNAMIC);
         }
@@ -127,12 +130,12 @@ namespace MWRender
                 attachTo->addChild(operator()(toCopy));
             else
             {
-                for (unsigned int i=0; i<groupToCopy->getNumChildren(); ++i)
+                for (unsigned int i = 0; i < groupToCopy->getNumChildren(); ++i)
                     attachTo->addChild(operator()(groupToCopy->getChild(i)));
             }
         }
 
-        osg::Node* operator() (const osg::Node* node) const override
+        osg::Node* operator()(const osg::Node* node) const override
         {
             if (!(node->getNodeMask() & mCopyMask))
                 return nullptr;
@@ -148,7 +151,7 @@ namespace MWRender
             if (const osg::Switch* sw = node->asSwitch())
             {
                 osg::Group* n = new osg::Group;
-                for (unsigned int i=0; i<sw->getNumChildren(); ++i)
+                for (unsigned int i = 0; i < sw->getNumChildren(); ++i)
                     if (sw->getValue(i))
                         n->addChild(operator()(sw->getChild(i)));
                 n->setDataVariance(osg::Object::STATIC);
@@ -157,8 +160,9 @@ namespace MWRender
             if (const osg::LOD* lod = dynamic_cast<const osg::LOD*>(node))
             {
                 osg::Group* n = new osg::Group;
-                for (unsigned int i=0; i<lod->getNumChildren(); ++i)
-                    if (lod->getMinRange(i) * lod->getMinRange(i) <= mSqrDistance && mSqrDistance < lod->getMaxRange(i) * lod->getMaxRange(i))
+                for (unsigned int i = 0; i < lod->getNumChildren(); ++i)
+                    if (lod->getMinRange(i) * lod->getMinRange(i) <= mSqrDistance
+                        && mSqrDistance < lod->getMaxRange(i) * lod->getMaxRange(i))
                         n->addChild(operator()(lod->getChild(i)));
                 n->setDataVariance(osg::Object::STATIC);
                 return n;
@@ -184,9 +188,10 @@ namespace MWRender
 
             return cloned;
         }
-        void handleCallbacks(const osg::Node* node, osg::Node *cloned) const
+        void handleCallbacks(const osg::Node* node, osg::Node* cloned) const
         {
-            for (const osg::Callback* callback = node->getCullCallback(); callback != nullptr; callback = callback->getNestedCallback())
+            for (const osg::Callback* callback = node->getCullCallback(); callback != nullptr;
+                 callback = callback->getNestedCallback())
             {
                 if (callback->className() == std::string("BillboardCallback"))
                 {
@@ -201,7 +206,7 @@ namespace MWRender
 
                 if (node->getCullCallback()->getNestedCallback())
                 {
-                    osg::Callback *clonedCallback = osg::clone(callback, osg::CopyOp::SHALLOW_COPY);
+                    osg::Callback* clonedCallback = osg::clone(callback, osg::CopyOp::SHALLOW_COPY);
                     clonedCallback->setNestedCallback(nullptr);
                     cloned->addCullCallback(clonedCallback);
                 }
@@ -212,9 +217,11 @@ namespace MWRender
         void handleBillboard(osg::Node* node) const
         {
             osg::Transform* transform = node->asTransform();
-            if (!transform) return;
+            if (!transform)
+                return;
             osg::MatrixTransform* matrixTransform = transform->asMatrixTransform();
-            if (!matrixTransform) return;
+            if (!matrixTransform)
+                return;
 
             osg::Matrix worldToLocal = osg::Matrix::identity();
             for (auto pathNode : mNodePath)
@@ -225,19 +232,20 @@ namespace MWRender
             osg::Matrix billboardMatrix;
             osg::Vec3f viewVector = -(mViewVector + worldToLocal.getTrans());
             viewVector.normalize();
-            osg::Vec3f right = viewVector ^ osg::Vec3f(0,0,1);
+            osg::Vec3f right = viewVector ^ osg::Vec3f(0, 0, 1);
             right.normalize();
             osg::Vec3f up = right ^ viewVector;
             up.normalize();
-            billboardMatrix.makeLookAt(osg::Vec3f(0,0,0), viewVector, up);
+            billboardMatrix.makeLookAt(osg::Vec3f(0, 0, 0), viewVector, up);
             billboardMatrix.invert(billboardMatrix);
 
             const osg::Matrix& oldMatrix = matrixTransform->getMatrix();
             float mag[3]; // attempt to preserve scale
-            for (int i=0;i<3;++i)
-                mag[i] = std::sqrt(oldMatrix(0,i) * oldMatrix(0,i) + oldMatrix(1,i) * oldMatrix(1,i) + oldMatrix(2,i) * oldMatrix(2,i));
+            for (int i = 0; i < 3; ++i)
+                mag[i] = std::sqrt(oldMatrix(0, i) * oldMatrix(0, i) + oldMatrix(1, i) * oldMatrix(1, i)
+                    + oldMatrix(2, i) * oldMatrix(2, i));
             osg::Matrix newMatrix;
-            worldToLocal.setTrans(0,0,0);
+            worldToLocal.setTrans(0, 0, 0);
             newMatrix *= worldToLocal;
             newMatrix.preMult(billboardMatrix);
             newMatrix.preMultScale(osg::Vec3f(mag[0], mag[1], mag[2]));
@@ -245,7 +253,7 @@ namespace MWRender
 
             matrixTransform->setMatrix(newMatrix);
         }
-        osg::Drawable* operator() (const osg::Drawable* drawable) const override
+        osg::Drawable* operator()(const osg::Drawable* drawable) const override
         {
             if (!(drawable->getNodeMask() & mCopyMask))
                 return nullptr;
@@ -271,17 +279,17 @@ namespace MWRender
             else
                 return const_cast<osg::Drawable*>(drawable);
         }
-        osg::Callback* operator() (const osg::Callback* callback) const override
-        {
-            return nullptr;
-        }
+        osg::Callback* operator()(const osg::Callback* callback) const override { return nullptr; }
     };
 
     class RefnumSet : public osg::Object
     {
     public:
-        RefnumSet(){}
-        RefnumSet(const RefnumSet& copy, const osg::CopyOp&) : mRefnums(copy.mRefnums) {}
+        RefnumSet() {}
+        RefnumSet(const RefnumSet& copy, const osg::CopyOp&)
+            : mRefnums(copy.mRefnums)
+        {
+        }
         META_Object(MWRender, RefnumSet)
         std::vector<ESM::RefNum> mRefnums;
     };
@@ -290,10 +298,12 @@ namespace MWRender
     {
     public:
         AnalyzeVisitor(osg::Node::NodeMask analyzeMask)
-         : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-         , mCurrentStateSet(nullptr)
-         , mCurrentDistance(0.f)
-        { setTraversalMask(analyzeMask); }
+            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+            , mCurrentStateSet(nullptr)
+            , mCurrentDistance(0.f)
+        {
+            setTraversalMask(analyzeMask);
+        }
 
         typedef std::unordered_map<osg::StateSet*, unsigned int> StateSetCounter;
         struct Result
@@ -309,15 +319,16 @@ namespace MWRender
 
             if (osg::Switch* sw = node.asSwitch())
             {
-                for (unsigned int i=0; i<sw->getNumChildren(); ++i)
+                for (unsigned int i = 0; i < sw->getNumChildren(); ++i)
                     if (sw->getValue(i))
                         traverse(*sw->getChild(i));
                 return;
             }
             if (osg::LOD* lod = dynamic_cast<osg::LOD*>(&node))
             {
-                for (unsigned int i=0; i<lod->getNumChildren(); ++i)
-                    if (lod->getMinRange(i) * lod->getMinRange(i) <= mCurrentDistance && mCurrentDistance < lod->getMaxRange(i) * lod->getMaxRange(i))
+                for (unsigned int i = 0; i < lod->getNumChildren(); ++i)
+                    if (lod->getMinRange(i) * lod->getMinRange(i) <= mCurrentDistance
+                        && mCurrentDistance < lod->getMaxRange(i) * lod->getMaxRange(i))
                         traverse(*lod->getChild(i));
                 return;
             }
@@ -351,7 +362,8 @@ namespace MWRender
         }
         float getMergeBenefit(const Result& result)
         {
-            if (result.mStateSetCounter.empty()) return 1;
+            if (result.mStateSetCounter.empty())
+                return 1;
             float mergeBenefit = 0;
             for (auto pair : result.mStateSetCounter)
             {
@@ -370,17 +382,22 @@ namespace MWRender
     class DebugVisitor : public osg::NodeVisitor
     {
     public:
-        DebugVisitor() : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN) {}
+        DebugVisitor()
+            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+        {
+        }
         void apply(osg::Drawable& node) override
         {
-            osg::ref_ptr<osg::Material> m (new osg::Material);
-            osg::Vec4f color(Misc::Rng::rollProbability(), Misc::Rng::rollProbability(), Misc::Rng::rollProbability(), 0.f);
+            osg::ref_ptr<osg::Material> m(new osg::Material);
+            osg::Vec4f color(
+                Misc::Rng::rollProbability(), Misc::Rng::rollProbability(), Misc::Rng::rollProbability(), 0.f);
             color.normalize();
-            m->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.1f,0.1f,0.1f,1.f));
-            m->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.1f,0.1f,0.1f,1.f));
+            m->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.1f, 0.1f, 0.1f, 1.f));
+            m->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.1f, 0.1f, 0.1f, 1.f));
             m->setColorMode(osg::Material::OFF);
             m->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(color));
-            osg::ref_ptr<osg::StateSet> stateset = node.getStateSet() ? osg::clone(node.getStateSet(), osg::CopyOp::SHALLOW_COPY) : new osg::StateSet;
+            osg::ref_ptr<osg::StateSet> stateset
+                = node.getStateSet() ? osg::clone(node.getStateSet(), osg::CopyOp::SHALLOW_COPY) : new osg::StateSet;
             stateset->setAttribute(m);
             stateset->addUniform(new osg::Uniform("colorMode", 0));
             stateset->addUniform(new osg::Uniform("emissiveMult", 1.f));
@@ -392,11 +409,15 @@ namespace MWRender
     class AddRefnumMarkerVisitor : public osg::NodeVisitor
     {
     public:
-        AddRefnumMarkerVisitor(const ESM::RefNum &refnum) : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN), mRefnum(refnum) {}
+        AddRefnumMarkerVisitor(const ESM::RefNum& refnum)
+            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+            , mRefnum(refnum)
+        {
+        }
         ESM::RefNum mRefnum;
-        void apply(osg::Geometry &node) override
+        void apply(osg::Geometry& node) override
         {
-            osg::ref_ptr<RefnumMarker> marker (new RefnumMarker);
+            osg::ref_ptr<RefnumMarker> marker(new RefnumMarker);
             marker->mRefnum = mRefnum;
             if (osg::Array* array = node.getVertexArray())
                 marker->mNumVertices = array->getNumElements();
@@ -405,9 +426,9 @@ namespace MWRender
     };
 
     ObjectPaging::ObjectPaging(Resource::SceneManager* sceneManager)
-            : GenericResourceManager<ChunkId>(nullptr)
-         , mSceneManager(sceneManager)
-         , mRefTrackerLocked(false)
+        : GenericResourceManager<ChunkId>(nullptr)
+        , mSceneManager(sceneManager)
+        , mRefTrackerLocked(false)
     {
         mActiveGrid = Settings::Manager::getBool("object paging active grid", "Terrain");
         mDebugBatches = Settings::Manager::getBool("debug chunks", "Terrain");
@@ -417,11 +438,12 @@ namespace MWRender
         mMinSizeCostMultiplier = Settings::Manager::getFloat("object paging min size cost multiplier", "Terrain");
     }
 
-    osg::ref_ptr<osg::Node> ObjectPaging::createChunk(float size, const osg::Vec2f& center, bool activeGrid, const osg::Vec3f& viewPoint, bool compile, unsigned char lod)
+    osg::ref_ptr<osg::Node> ObjectPaging::createChunk(float size, const osg::Vec2f& center, bool activeGrid,
+        const osg::Vec3f& viewPoint, bool compile, unsigned char lod)
     {
-        osg::Vec2i startCell = osg::Vec2i(std::floor(center.x() - size/2.f), std::floor(center.y() - size/2.f));
+        osg::Vec2i startCell = osg::Vec2i(std::floor(center.x() - size / 2.f), std::floor(center.y() - size / 2.f));
 
-        osg::Vec3f worldCenter = osg::Vec3f(center.x(), center.y(), 0)*ESM::Land::REAL_SIZE;
+        osg::Vec3f worldCenter = osg::Vec3f(center.x(), center.y(), 0) * ESM::Land::REAL_SIZE;
         osg::Vec3f relativeViewPoint = viewPoint - worldCenter;
 
         std::map<ESM::RefNum, ESM::CellRef> refs;
@@ -434,8 +456,9 @@ namespace MWRender
             for (int cellY = startCell.y(); cellY < startCell.y() + size; ++cellY)
             {
                 const ESM::Cell* cell = store.get<ESM::Cell>().searchStatic(cellX, cellY);
-                if (!cell) continue;
-                for (size_t i=0; i<cell->mContextList.size(); ++i)
+                if (!cell)
+                    continue;
+                for (size_t i = 0; i < cell->mContextList.size(); ++i)
                 {
                     try
                     {
@@ -448,18 +471,25 @@ namespace MWRender
                         cMRef.mRefNum.mIndex = 0;
                         bool deleted = false;
                         bool moved = false;
-                        while (ESM::Cell::getNextRef(*reader, ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyNotMoved))
+                        while (ESM::Cell::getNextRef(
+                            *reader, ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyNotMoved))
                         {
                             if (moved)
                                 continue;
 
-                            if (std::find(cell->mMovedRefs.begin(), cell->mMovedRefs.end(), ref.mRefNum) != cell->mMovedRefs.end())
+                            if (std::find(cell->mMovedRefs.begin(), cell->mMovedRefs.end(), ref.mRefNum)
+                                != cell->mMovedRefs.end())
                                 continue;
 
                             Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
                             int type = store.findStatic(ref.mRefID);
-                            if (!typeFilter(type,size>=2)) continue;
-                            if (deleted) { refs.erase(ref.mRefNum); continue; }
+                            if (!typeFilter(type, size >= 2))
+                                continue;
+                            if (deleted)
+                            {
+                                refs.erase(ref.mRefNum);
+                                continue;
+                            }
                             refs[ref.mRefNum] = std::move(ref);
                         }
                     }
@@ -477,7 +507,8 @@ namespace MWRender
                     }
                     Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
                     int type = store.findStatic(ref.mRefID);
-                    if (!typeFilter(type,size>=2)) continue;
+                    if (!typeFilter(type, size >= 2))
+                        continue;
                     refs[ref.mRefNum] = std::move(ref);
                 }
             }
@@ -490,8 +521,8 @@ namespace MWRender
                 refs.erase(ref);
         }
 
-        osg::Vec2f minBound = (center - osg::Vec2f(size/2.f, size/2.f));
-        osg::Vec2f maxBound = (center + osg::Vec2f(size/2.f, size/2.f));
+        osg::Vec2f minBound = (center - osg::Vec2f(size / 2.f, size / 2.f));
+        osg::Vec2f maxBound = (center + osg::Vec2f(size / 2.f, size / 2.f));
         struct InstanceList
         {
             std::vector<const ESM::CellRef*> mInstances;
@@ -521,8 +552,10 @@ namespace MWRender
             if (size < 1.f)
             {
                 osg::Vec3f cellPos = pos / ESM::Land::REAL_SIZE;
-                if ((minBound.x() > std::floor(minBound.x()) && cellPos.x() < minBound.x()) || (minBound.y() > std::floor(minBound.y()) && cellPos.y() < minBound.y())
-                 || (maxBound.x() < std::ceil(maxBound.x()) && cellPos.x() >= maxBound.x()) || (maxBound.y() < std::ceil(maxBound.y()) && cellPos.y() >= maxBound.y()))
+                if ((minBound.x() > std::floor(minBound.x()) && cellPos.x() < minBound.x())
+                    || (minBound.y() > std::floor(minBound.y()) && cellPos.y() < minBound.y())
+                    || (maxBound.x() < std::ceil(maxBound.x()) && cellPos.x() >= maxBound.x())
+                    || (maxBound.y() < std::ceil(maxBound.y()) && cellPos.y() >= maxBound.y()))
                     continue;
             }
 
@@ -531,7 +564,7 @@ namespace MWRender
             {
                 std::lock_guard<std::mutex> lock(mSizeCacheMutex);
                 SizeCache::iterator found = mSizeCache.find(pair.first);
-                if (found != mSizeCache.end() && found->second < dSqr*minSize*minSize)
+                if (found != mSizeCache.end() && found->second < dSqr * minSize * minSize)
                     continue;
             }
 
@@ -540,16 +573,17 @@ namespace MWRender
 
             int type = store.findStatic(ref.mRefID);
             std::string model = getModel(type, ref.mRefID, store);
-            if (model.empty()) continue;
+            if (model.empty())
+                continue;
             model = Misc::ResourceHelpers::correctMeshPath(model, mSceneManager->getVFS());
 
             if (activeGrid && type != ESM::REC_STAT)
             {
                 model = Misc::ResourceHelpers::correctActorModelPath(model, mSceneManager->getVFS());
                 std::string kfname = Misc::StringUtils::lowerCase(model);
-                if(kfname.size() > 4 && kfname.compare(kfname.size()-4, 4, ".nif") == 0)
+                if (kfname.size() > 4 && kfname.compare(kfname.size() - 4, 4, ".nif") == 0)
                 {
-                    kfname.replace(kfname.size()-4, 4, ".kf");
+                    kfname.replace(kfname.size() - 4, 4, ".kf");
                     if (mSceneManager->getVFS()->exists(kfname))
                         continue;
                 }
@@ -563,14 +597,22 @@ namespace MWRender
                 if (found != mLODNameCache.end() && found->first == key)
                     model = found->second;
                 else
-                    model = mLODNameCache.insert(found, { key, Misc::ResourceHelpers::getLODMeshName(world->getESMVersions()[ref.mRefNum.mContentFile], model, mSceneManager->getVFS(), lod) })->second;
+                    model = mLODNameCache
+                                .insert(found,
+                                    { key,
+                                        Misc::ResourceHelpers::getLODMeshName(
+                                            world->getESMVersions()[ref.mRefNum.mContentFile], model,
+                                            mSceneManager->getVFS(), lod) })
+                                ->second;
             }
 
             osg::ref_ptr<const osg::Node> cnode = mSceneManager->getTemplate(model, false);
 
             if (activeGrid)
             {
-                if (cnode->getNumChildrenRequiringUpdateTraversal() > 0 || SceneUtil::hasUserDescription(cnode, Constants::NightDayLabel) || SceneUtil::hasUserDescription(cnode, Constants::HerbalismLabel))
+                if (cnode->getNumChildrenRequiringUpdateTraversal() > 0
+                    || SceneUtil::hasUserDescription(cnode, Constants::NightDayLabel)
+                    || SceneUtil::hasUserDescription(cnode, Constants::HerbalismLabel))
                     continue;
                 else
                     refnumSet->mRefnums.push_back(pair.first);
@@ -582,8 +624,8 @@ namespace MWRender
                     continue;
             }
 
-            float radius2 = cnode->getBound().radius2() * ref.mScale*ref.mScale;
-            if (radius2 < dSqr*minSize*minSize && !activeGrid)
+            float radius2 = cnode->getBound().radius2() * ref.mScale * ref.mScale;
+            if (radius2 < dSqr * minSize * minSize && !activeGrid)
             {
                 std::lock_guard<std::mutex> lock(mSizeCacheMutex);
                 mSizeCache[pair.first] = radius2;
@@ -593,7 +635,9 @@ namespace MWRender
             auto emplaced = nodes.emplace(cnode, InstanceList());
             if (emplaced.second)
             {
-                const_cast<osg::Node*>(cnode.get())->accept(analyzeVisitor); // const-trickery required because there is no const version of NodeVisitor
+                const_cast<osg::Node*>(cnode.get())
+                    ->accept(
+                        analyzeVisitor); // const-trickery required because there is no const version of NodeVisitor
                 emplaced.first->second.mAnalyzeResult = analyzeVisitor.retrieveResult();
                 emplaced.first->second.mNeedCompile = compile && cnode->referenceCount() <= 3;
             }
@@ -620,7 +664,7 @@ namespace MWRender
 
             float minSizeMerged = mMinSize;
             float factor2 = mergeBenefit > 0 ? std::min(1.f, mergeCost * mMinSizeCostMultiplier / mergeBenefit) : 1;
-            float minSizeMergeFactor2 = (1-factor2) * mMinSizeMergeFactor + factor2;
+            float minSizeMergeFactor2 = (1 - factor2) * mMinSizeMergeFactor + factor2;
             if (minSizeMergeFactor2 > 0)
                 minSizeMerged *= minSizeMergeFactor2;
 
@@ -630,13 +674,15 @@ namespace MWRender
                 const ESM::CellRef& ref = *cref;
                 osg::Vec3f pos = ref.mPos.asVec3();
 
-                if (!activeGrid && minSizeMerged != minSize && cnode->getBound().radius2() * cref->mScale*cref->mScale < (viewPoint-pos).length2()*minSizeMerged*minSizeMerged)
+                if (!activeGrid && minSizeMerged != minSize
+                    && cnode->getBound().radius2() * cref->mScale * cref->mScale
+                        < (viewPoint - pos).length2() * minSizeMerged * minSizeMerged)
                     continue;
 
                 osg::Vec3f nodePos = pos - worldCenter;
-                osg::Quat nodeAttitude = osg::Quat(ref.mPos.rot[2], osg::Vec3f(0,0,-1)) *
-                                        osg::Quat(ref.mPos.rot[1], osg::Vec3f(0,-1,0)) *
-                                        osg::Quat(ref.mPos.rot[0], osg::Vec3f(-1,0,0));
+                osg::Quat nodeAttitude = osg::Quat(ref.mPos.rot[2], osg::Vec3f(0, 0, -1))
+                    * osg::Quat(ref.mPos.rot[1], osg::Vec3f(0, -1, 0))
+                    * osg::Quat(ref.mPos.rot[0], osg::Vec3f(-1, 0, 0));
                 osg::Vec3f nodeScale = osg::Vec3f(ref.mScale, ref.mScale, ref.mScale);
 
                 osg::ref_ptr<osg::Group> trans;
@@ -653,18 +699,22 @@ namespace MWRender
                 else
                 {
                     trans = new SceneUtil::PositionAttitudeTransform;
-                    SceneUtil::PositionAttitudeTransform* pat = static_cast<SceneUtil::PositionAttitudeTransform*>(trans.get());
+                    SceneUtil::PositionAttitudeTransform* pat
+                        = static_cast<SceneUtil::PositionAttitudeTransform*>(trans.get());
                     pat->setPosition(nodePos);
                     pat->setScale(nodeScale);
                     pat->setAttitude(nodeAttitude);
                 }
 
-                // DO NOT COPY AND PASTE THIS CODE. Cloning osg::Geometry without also cloning its contained Arrays is generally unsafe.
-                // In this specific case the operation is safe under the following two assumptions:
-                // - When Arrays are removed or replaced in the cloned geometry, the original Arrays in their place must outlive the cloned geometry regardless. (ensured by TemplateMultiRef)
-                // - Arrays that we add or replace in the cloned geometry must be explicitely forbidden from reusing BufferObjects of the original geometry. (ensured by needvbo() in optimizer.cpp)
-                copyop.setCopyFlags(merge ? osg::CopyOp::DEEP_COPY_NODES|osg::CopyOp::DEEP_COPY_DRAWABLES : osg::CopyOp::DEEP_COPY_NODES);
-                copyop.mOptimizeBillboards = (size > 1/4.f);
+                // DO NOT COPY AND PASTE THIS CODE. Cloning osg::Geometry without also cloning its contained Arrays is
+                // generally unsafe. In this specific case the operation is safe under the following two assumptions:
+                // - When Arrays are removed or replaced in the cloned geometry, the original Arrays in their place must
+                // outlive the cloned geometry regardless. (ensured by TemplateMultiRef)
+                // - Arrays that we add or replace in the cloned geometry must be explicitely forbidden from reusing
+                // BufferObjects of the original geometry. (ensured by needvbo() in optimizer.cpp)
+                copyop.setCopyFlags(merge ? osg::CopyOp::DEEP_COPY_NODES | osg::CopyOp::DEEP_COPY_DRAWABLES
+                                          : osg::CopyOp::DEEP_COPY_NODES);
+                copyop.mOptimizeBillboards = (size > 1 / 4.f);
                 copyop.mNodePath.push_back(trans);
                 copyop.mSqrDistance = (viewPoint - pos).length2();
                 copyop.mViewVector = (viewPoint - worldCenter);
@@ -680,7 +730,8 @@ namespace MWRender
                     }
                     else
                     {
-                        osg::ref_ptr<RefnumMarker> marker = new RefnumMarker; marker->mRefnum = ref.mRefNum;
+                        osg::ref_ptr<RefnumMarker> marker = new RefnumMarker;
+                        marker->mRefnum = ref.mRefNum;
                         trans->getOrCreateUserDataContainer()->addUserObject(marker);
                     }
                 }
@@ -709,13 +760,14 @@ namespace MWRender
         if (mergeGroup->getNumChildren())
         {
             SceneUtil::Optimizer optimizer;
-            if (size > 1/8.f)
+            if (size > 1 / 8.f)
             {
                 optimizer.setViewPoint(relativeViewPoint);
                 optimizer.setMergeAlphaBlending(true);
             }
             optimizer.setIsOperationPermissibleForObjectCallback(new CanOptimizeCallback);
-            unsigned int options = SceneUtil::Optimizer::FLATTEN_STATIC_TRANSFORMS|SceneUtil::Optimizer::REMOVE_REDUNDANT_NODES|SceneUtil::Optimizer::MERGE_GEOMETRY;
+            unsigned int options = SceneUtil::Optimizer::FLATTEN_STATIC_TRANSFORMS
+                | SceneUtil::Optimizer::REMOVE_REDUNDANT_NODES | SceneUtil::Optimizer::MERGE_GEOMETRY;
 
             optimizer.optimize(mergeGroup, options);
 
@@ -747,7 +799,8 @@ namespace MWRender
         if (activeGrid)
         {
             std::sort(refnumSet->mRefnums.begin(), refnumSet->mRefnums.end());
-            refnumSet->mRefnums.erase(std::unique(refnumSet->mRefnums.begin(), refnumSet->mRefnums.end()), refnumSet->mRefnums.end());
+            refnumSet->mRefnums.erase(
+                std::unique(refnumSet->mRefnums.begin(), refnumSet->mRefnums.end()), refnumSet->mRefnums.end());
             udc->addUserObject(refnumSet);
             group->addCullCallback(new SceneUtil::LightListCallback);
         }
@@ -770,12 +823,14 @@ namespace MWRender
         }
         bool intersects(ChunkId id, osg::Vec3f pos)
         {
-            if (mActiveGridOnly && !std::get<2>(id)) return false;
+            if (mActiveGridOnly && !std::get<2>(id))
+                return false;
             pos /= ESM::Land::REAL_SIZE;
             clampToCell(pos);
             osg::Vec2f center = std::get<0>(id);
-            float halfSize = std::get<1>(id)/2;
-            return pos.x() >= center.x()-halfSize && pos.y() >= center.y()-halfSize && pos.x() <= center.x()+halfSize && pos.y() <= center.y()+halfSize;
+            float halfSize = std::get<1>(id) / 2;
+            return pos.x() >= center.x() - halfSize && pos.y() >= center.y() - halfSize
+                && pos.x() <= center.x() + halfSize && pos.y() <= center.y() + halfSize;
         }
         void clampToCell(osg::Vec3f& cellPos)
         {
@@ -788,37 +843,45 @@ namespace MWRender
         bool mActiveGridOnly = false;
     };
 
-    bool ObjectPaging::enableObject(int type, const ESM::RefNum & refnum, const osg::Vec3f& pos, const osg::Vec2i& cell, bool enabled)
+    bool ObjectPaging::enableObject(
+        int type, const ESM::RefNum& refnum, const osg::Vec3f& pos, const osg::Vec2i& cell, bool enabled)
     {
         if (!typeFilter(type, false))
             return false;
 
         {
             std::lock_guard<std::mutex> lock(mRefTrackerMutex);
-            if (enabled && !getWritableRefTracker().mDisabled.erase(refnum)) return false;
-            if (!enabled && !getWritableRefTracker().mDisabled.insert(refnum).second) return false;
-            if (mRefTrackerLocked) return false;
+            if (enabled && !getWritableRefTracker().mDisabled.erase(refnum))
+                return false;
+            if (!enabled && !getWritableRefTracker().mDisabled.insert(refnum).second)
+                return false;
+            if (mRefTrackerLocked)
+                return false;
         }
 
         ClearCacheFunctor ccf;
         ccf.mPosition = pos;
         ccf.mCell = cell;
         mCache->call(ccf);
-        if (ccf.mToClear.empty()) return false;
+        if (ccf.mToClear.empty())
+            return false;
         for (const auto& chunk : ccf.mToClear)
             mCache->removeFromObjectCache(chunk);
         return true;
     }
 
-    bool ObjectPaging::blacklistObject(int type, const ESM::RefNum & refnum, const osg::Vec3f& pos, const osg::Vec2i& cell)
+    bool ObjectPaging::blacklistObject(
+        int type, const ESM::RefNum& refnum, const osg::Vec3f& pos, const osg::Vec2i& cell)
     {
         if (!typeFilter(type, false))
             return false;
 
         {
             std::lock_guard<std::mutex> lock(mRefTrackerMutex);
-            if (!getWritableRefTracker().mBlacklist.insert(refnum).second) return false;
-            if (mRefTrackerLocked) return false;
+            if (!getWritableRefTracker().mBlacklist.insert(refnum).second)
+                return false;
+            if (mRefTrackerLocked)
+                return false;
         }
 
         ClearCacheFunctor ccf;
@@ -826,13 +889,13 @@ namespace MWRender
         ccf.mCell = cell;
         ccf.mActiveGridOnly = true;
         mCache->call(ccf);
-        if (ccf.mToClear.empty()) return false;
+        if (ccf.mToClear.empty())
+            return false;
         for (const auto& chunk : ccf.mToClear)
             mCache->removeFromObjectCache(chunk);
         return true;
     }
 
-
     void ObjectPaging::clear()
     {
         std::lock_guard<std::mutex> lock(mRefTrackerMutex);
@@ -843,7 +906,8 @@ namespace MWRender
 
     bool ObjectPaging::unlockCache()
     {
-        if (!mRefTrackerLocked) return false;
+        if (!mRefTrackerLocked)
+            return false;
         {
             std::lock_guard<std::mutex> lock(mRefTrackerMutex);
             mRefTrackerLocked = false;
@@ -858,19 +922,26 @@ namespace MWRender
 
     struct GetRefnumsFunctor
     {
-        GetRefnumsFunctor(std::vector<ESM::RefNum>& output) : mOutput(output) {}
+        GetRefnumsFunctor(std::vector<ESM::RefNum>& output)
+            : mOutput(output)
+        {
+        }
         void operator()(MWRender::ChunkId chunkId, osg::Object* obj)
         {
-            if (!std::get<2>(chunkId)) return;
+            if (!std::get<2>(chunkId))
+                return;
             const osg::Vec2f& center = std::get<0>(chunkId);
-            bool activeGrid = (center.x() > mActiveGrid.x() || center.y() > mActiveGrid.y() || center.x() < mActiveGrid.z() || center.y() < mActiveGrid.w());
-            if (!activeGrid) return;
+            bool activeGrid = (center.x() > mActiveGrid.x() || center.y() > mActiveGrid.y()
+                || center.x() < mActiveGrid.z() || center.y() < mActiveGrid.w());
+            if (!activeGrid)
+                return;
 
             osg::UserDataContainer* udc = obj->getUserDataContainer();
             if (udc && udc->getNumUserObjects())
             {
                 RefnumSet* refnums = dynamic_cast<RefnumSet*>(udc->getUserObject(0));
-                if (!refnums) return;
+                if (!refnums)
+                    return;
                 mOutput.insert(mOutput.end(), refnums->mRefnums.begin(), refnums->mRefnums.end());
             }
         }
@@ -878,7 +949,7 @@ namespace MWRender
         std::vector<ESM::RefNum>& mOutput;
     };
 
-    void ObjectPaging::getPagedRefnums(const osg::Vec4i &activeGrid, std::vector<ESM::RefNum>& out)
+    void ObjectPaging::getPagedRefnums(const osg::Vec4i& activeGrid, std::vector<ESM::RefNum>& out)
     {
         GetRefnumsFunctor grf(out);
         grf.mActiveGrid = activeGrid;
@@ -887,7 +958,7 @@ namespace MWRender
         out.erase(std::unique(out.begin(), out.end()), out.end());
     }
 
-    void ObjectPaging::reportStats(unsigned int frameNumber, osg::Stats *stats) const
+    void ObjectPaging::reportStats(unsigned int frameNumber, osg::Stats* stats) const
     {
         stats->setAttribute(frameNumber, "Object Chunk", mCache->getCacheSize());
     }
diff --git a/apps/openmw/mwrender/objectpaging.hpp b/apps/openmw/mwrender/objectpaging.hpp
index 246cef178f..da6e94b811 100644
--- a/apps/openmw/mwrender/objectpaging.hpp
+++ b/apps/openmw/mwrender/objectpaging.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_MWRENDER_OBJECTPAGING_H
 #define OPENMW_MWRENDER_OBJECTPAGING_H
 
-#include <components/terrain/quadtreeworld.hpp>
-#include <components/resource/resourcemanager.hpp>
 #include <components/esm3/loadcell.hpp>
+#include <components/resource/resourcemanager.hpp>
+#include <components/terrain/quadtreeworld.hpp>
 
 #include <mutex>
 
@@ -27,17 +27,20 @@ namespace MWRender
         ObjectPaging(Resource::SceneManager* sceneManager);
         ~ObjectPaging() = default;
 
-        osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile) override;
+        osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags,
+            bool activeGrid, const osg::Vec3f& viewPoint, bool compile) override;
 
-        osg::ref_ptr<osg::Node> createChunk(float size, const osg::Vec2f& center, bool activeGrid, const osg::Vec3f& viewPoint, bool compile, unsigned char lod);
+        osg::ref_ptr<osg::Node> createChunk(float size, const osg::Vec2f& center, bool activeGrid,
+            const osg::Vec3f& viewPoint, bool compile, unsigned char lod);
 
         unsigned int getNodeMask() override;
 
         /// @return true if view needs rebuild
-        bool enableObject(int type, const ESM::RefNum & refnum, const osg::Vec3f& pos, const osg::Vec2i& cell, bool enabled);
+        bool enableObject(
+            int type, const ESM::RefNum& refnum, const osg::Vec3f& pos, const osg::Vec2i& cell, bool enabled);
 
         /// @return true if view needs rebuild
-        bool blacklistObject(int type, const ESM::RefNum & refnum, const osg::Vec3f& pos, const osg::Vec2i& cell);
+        bool blacklistObject(int type, const ESM::RefNum& refnum, const osg::Vec3f& pos, const osg::Vec2i& cell);
 
         void clear();
 
@@ -47,7 +50,7 @@ namespace MWRender
 
         void reportStats(unsigned int frameNumber, osg::Stats* stats) const override;
 
-        void getPagedRefnums(const osg::Vec4i &activeGrid, std::vector<ESM::RefNum>& out);
+        void getPagedRefnums(const osg::Vec4i& activeGrid, std::vector<ESM::RefNum>& out);
 
     private:
         Resource::SceneManager* mSceneManager;
@@ -63,7 +66,10 @@ namespace MWRender
         {
             std::set<ESM::RefNum> mDisabled;
             std::set<ESM::RefNum> mBlacklist;
-            bool operator==(const RefTracker&other) const { return mDisabled == other.mDisabled && mBlacklist == other.mBlacklist; }
+            bool operator==(const RefTracker& other) const
+            {
+                return mDisabled == other.mDisabled && mBlacklist == other.mBlacklist;
+            }
         };
         RefTracker mRefTracker;
         RefTracker mRefTrackerNew;
@@ -77,16 +83,24 @@ namespace MWRender
         SizeCache mSizeCache;
 
         std::mutex mLODNameCacheMutex;
-        typedef std::pair<std::string, unsigned char> LODNameCacheKey; //Key: mesh name, lod level
-        typedef std::map<LODNameCacheKey, std::string> LODNameCache; //Cache: key, mesh name to use
+        typedef std::pair<std::string, unsigned char> LODNameCacheKey; // Key: mesh name, lod level
+        typedef std::map<LODNameCacheKey, std::string> LODNameCache; // Cache: key, mesh name to use
         LODNameCache mLODNameCache;
     };
 
     class RefnumMarker : public osg::Object
     {
     public:
-        RefnumMarker() : mNumVertices(0) { mRefnum.unset(); }
-        RefnumMarker(const RefnumMarker &copy, osg::CopyOp co) : mRefnum(copy.mRefnum), mNumVertices(copy.mNumVertices) {}
+        RefnumMarker()
+            : mNumVertices(0)
+        {
+            mRefnum.unset();
+        }
+        RefnumMarker(const RefnumMarker& copy, osg::CopyOp co)
+            : mRefnum(copy.mRefnum)
+            , mNumVertices(copy.mNumVertices)
+        {
+        }
         META_Object(MWRender, RefnumMarker)
 
         ESM::RefNum mRefnum;
diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index 88b86d8e8a..2d42623bd2 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -6,219 +6,221 @@
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/sceneutil/unrefqueue.hpp>
 
-#include "../mwworld/ptr.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/ptr.hpp"
 
 #include "animation.hpp"
-#include "npcanimation.hpp"
 #include "creatureanimation.hpp"
+#include "npcanimation.hpp"
 #include "vismask.hpp"
 
-
 namespace MWRender
 {
 
-Objects::Objects(Resource::ResourceSystem* resourceSystem, const osg::ref_ptr<osg::Group>& rootNode,
-    SceneUtil::UnrefQueue& unrefQueue)
-    : mRootNode(rootNode)
-    , mResourceSystem(resourceSystem)
-    , mUnrefQueue(unrefQueue)
-{
-}
-
-Objects::~Objects()
-{
-    mObjects.clear();
-
-    for (CellMap::iterator iter = mCellSceneNodes.begin(); iter != mCellSceneNodes.end(); ++iter)
-        iter->second->getParent(0)->removeChild(iter->second);
-    mCellSceneNodes.clear();
-}
-
-void Objects::insertBegin(const MWWorld::Ptr& ptr)
-{
-    assert(mObjects.find(ptr.mRef) == mObjects.end());
-
-    osg::ref_ptr<osg::Group> cellnode;
+    Objects::Objects(Resource::ResourceSystem* resourceSystem, const osg::ref_ptr<osg::Group>& rootNode,
+        SceneUtil::UnrefQueue& unrefQueue)
+        : mRootNode(rootNode)
+        , mResourceSystem(resourceSystem)
+        , mUnrefQueue(unrefQueue)
+    {
+    }
 
-    CellMap::iterator found = mCellSceneNodes.find(ptr.getCell());
-    if (found == mCellSceneNodes.end())
+    Objects::~Objects()
     {
-        cellnode = new osg::Group;
-        cellnode->setName("Cell Root");
-        mRootNode->addChild(cellnode);
-        mCellSceneNodes[ptr.getCell()] = cellnode;
+        mObjects.clear();
+
+        for (CellMap::iterator iter = mCellSceneNodes.begin(); iter != mCellSceneNodes.end(); ++iter)
+            iter->second->getParent(0)->removeChild(iter->second);
+        mCellSceneNodes.clear();
     }
-    else
-        cellnode = found->second;
 
-    osg::ref_ptr<SceneUtil::PositionAttitudeTransform> insert (new SceneUtil::PositionAttitudeTransform);
-    cellnode->addChild(insert);
+    void Objects::insertBegin(const MWWorld::Ptr& ptr)
+    {
+        assert(mObjects.find(ptr.mRef) == mObjects.end());
 
-    insert->getOrCreateUserDataContainer()->addUserObject(new PtrHolder(ptr));
+        osg::ref_ptr<osg::Group> cellnode;
 
-    const float *f = ptr.getRefData().getPosition().pos;
+        CellMap::iterator found = mCellSceneNodes.find(ptr.getCell());
+        if (found == mCellSceneNodes.end())
+        {
+            cellnode = new osg::Group;
+            cellnode->setName("Cell Root");
+            mRootNode->addChild(cellnode);
+            mCellSceneNodes[ptr.getCell()] = cellnode;
+        }
+        else
+            cellnode = found->second;
 
-    insert->setPosition(osg::Vec3(f[0], f[1], f[2]));
+        osg::ref_ptr<SceneUtil::PositionAttitudeTransform> insert(new SceneUtil::PositionAttitudeTransform);
+        cellnode->addChild(insert);
 
-    const float scale = ptr.getCellRef().getScale();
-    osg::Vec3f scaleVec(scale, scale, scale);
-    ptr.getClass().adjustScale(ptr, scaleVec, true);
-    insert->setScale(scaleVec);
+        insert->getOrCreateUserDataContainer()->addUserObject(new PtrHolder(ptr));
 
-    ptr.getRefData().setBaseNode(insert);
-}
+        const float* f = ptr.getRefData().getPosition().pos;
 
-void Objects::insertModel(const MWWorld::Ptr &ptr, const std::string &mesh, bool animated, bool allowLight)
-{
-    insertBegin(ptr);
-    ptr.getRefData().getBaseNode()->setNodeMask(Mask_Object);
+        insert->setPosition(osg::Vec3(f[0], f[1], f[2]));
 
-    osg::ref_ptr<ObjectAnimation> anim (new ObjectAnimation(ptr, mesh, mResourceSystem, animated, allowLight));
+        const float scale = ptr.getCellRef().getScale();
+        osg::Vec3f scaleVec(scale, scale, scale);
+        ptr.getClass().adjustScale(ptr, scaleVec, true);
+        insert->setScale(scaleVec);
 
-    mObjects.emplace(ptr.mRef, std::move(anim));
-}
+        ptr.getRefData().setBaseNode(insert);
+    }
 
-void Objects::insertCreature(const MWWorld::Ptr &ptr, const std::string &mesh, bool weaponsShields)
-{
-    insertBegin(ptr);
-    ptr.getRefData().getBaseNode()->setNodeMask(Mask_Actor);
+    void Objects::insertModel(const MWWorld::Ptr& ptr, const std::string& mesh, bool animated, bool allowLight)
+    {
+        insertBegin(ptr);
+        ptr.getRefData().getBaseNode()->setNodeMask(Mask_Object);
 
-    // CreatureAnimation
-    osg::ref_ptr<Animation> anim;
+        osg::ref_ptr<ObjectAnimation> anim(new ObjectAnimation(ptr, mesh, mResourceSystem, animated, allowLight));
 
-    if (weaponsShields)
-        anim = new CreatureWeaponAnimation(ptr, mesh, mResourceSystem);
-    else
-        anim = new CreatureAnimation(ptr, mesh, mResourceSystem);
+        mObjects.emplace(ptr.mRef, std::move(anim));
+    }
 
-    if (mObjects.emplace(ptr.mRef, anim).second)
-        ptr.getClass().getContainerStore(ptr).setContListener(static_cast<ActorAnimation*>(anim.get()));
-}
+    void Objects::insertCreature(const MWWorld::Ptr& ptr, const std::string& mesh, bool weaponsShields)
+    {
+        insertBegin(ptr);
+        ptr.getRefData().getBaseNode()->setNodeMask(Mask_Actor);
 
-void Objects::insertNPC(const MWWorld::Ptr &ptr)
-{
-    insertBegin(ptr);
-    ptr.getRefData().getBaseNode()->setNodeMask(Mask_Actor);
+        // CreatureAnimation
+        osg::ref_ptr<Animation> anim;
 
-    osg::ref_ptr<NpcAnimation> anim (new NpcAnimation(ptr, osg::ref_ptr<osg::Group>(ptr.getRefData().getBaseNode()), mResourceSystem));
+        if (weaponsShields)
+            anim = new CreatureWeaponAnimation(ptr, mesh, mResourceSystem);
+        else
+            anim = new CreatureAnimation(ptr, mesh, mResourceSystem);
 
-    if (mObjects.emplace(ptr.mRef, anim).second)
-    {
-        ptr.getClass().getInventoryStore(ptr).setInvListener(anim.get(), ptr);
-        ptr.getClass().getInventoryStore(ptr).setContListener(anim.get());
+        if (mObjects.emplace(ptr.mRef, anim).second)
+            ptr.getClass().getContainerStore(ptr).setContListener(static_cast<ActorAnimation*>(anim.get()));
     }
-}
-
-bool Objects::removeObject (const MWWorld::Ptr& ptr)
-{
-    if(!ptr.getRefData().getBaseNode())
-        return true;
 
-    const auto iter = mObjects.find(ptr.mRef);
-    if(iter != mObjects.end())
+    void Objects::insertNPC(const MWWorld::Ptr& ptr)
     {
-        iter->second->removeFromScene();
-        mUnrefQueue.push(std::move(iter->second));
-        mObjects.erase(iter);
+        insertBegin(ptr);
+        ptr.getRefData().getBaseNode()->setNodeMask(Mask_Actor);
 
-        if (ptr.getClass().isActor())
-        {
-            if (ptr.getClass().hasInventoryStore(ptr))
-                ptr.getClass().getInventoryStore(ptr).setInvListener(nullptr, ptr);
+        osg::ref_ptr<NpcAnimation> anim(
+            new NpcAnimation(ptr, osg::ref_ptr<osg::Group>(ptr.getRefData().getBaseNode()), mResourceSystem));
 
-            ptr.getClass().getContainerStore(ptr).setContListener(nullptr);
+        if (mObjects.emplace(ptr.mRef, anim).second)
+        {
+            ptr.getClass().getInventoryStore(ptr).setInvListener(anim.get(), ptr);
+            ptr.getClass().getInventoryStore(ptr).setContListener(anim.get());
         }
-
-        ptr.getRefData().getBaseNode()->getParent(0)->removeChild(ptr.getRefData().getBaseNode());
-
-        ptr.getRefData().setBaseNode(nullptr);
-        return true;
     }
-    return false;
-}
-
 
-void Objects::removeCell(const MWWorld::CellStore* store)
-{
-    for(PtrAnimationMap::iterator iter = mObjects.begin();iter != mObjects.end();)
+    bool Objects::removeObject(const MWWorld::Ptr& ptr)
     {
-        MWWorld::Ptr ptr = iter->second->getPtr();
-        if(ptr.getCell() == store)
+        if (!ptr.getRefData().getBaseNode())
+            return true;
+
+        const auto iter = mObjects.find(ptr.mRef);
+        if (iter != mObjects.end())
         {
-            if (ptr.getClass().isActor() && ptr.getRefData().getCustomData())
+            iter->second->removeFromScene();
+            mUnrefQueue.push(std::move(iter->second));
+            mObjects.erase(iter);
+
+            if (ptr.getClass().isActor())
             {
                 if (ptr.getClass().hasInventoryStore(ptr))
                     ptr.getClass().getInventoryStore(ptr).setInvListener(nullptr, ptr);
+
                 ptr.getClass().getContainerStore(ptr).setContListener(nullptr);
             }
 
-            iter->second->removeFromScene();
-            mUnrefQueue.push(std::move(iter->second));
-            iter = mObjects.erase(iter);
+            ptr.getRefData().getBaseNode()->getParent(0)->removeChild(ptr.getRefData().getBaseNode());
+
+            ptr.getRefData().setBaseNode(nullptr);
+            return true;
         }
-        else
-            ++iter;
+        return false;
     }
 
-    CellMap::iterator cell = mCellSceneNodes.find(store);
-    if(cell != mCellSceneNodes.end())
+    void Objects::removeCell(const MWWorld::CellStore* store)
     {
-        cell->second->getParent(0)->removeChild(cell->second);
-        mCellSceneNodes.erase(cell);
-    }
-}
+        for (PtrAnimationMap::iterator iter = mObjects.begin(); iter != mObjects.end();)
+        {
+            MWWorld::Ptr ptr = iter->second->getPtr();
+            if (ptr.getCell() == store)
+            {
+                if (ptr.getClass().isActor() && ptr.getRefData().getCustomData())
+                {
+                    if (ptr.getClass().hasInventoryStore(ptr))
+                        ptr.getClass().getInventoryStore(ptr).setInvListener(nullptr, ptr);
+                    ptr.getClass().getContainerStore(ptr).setContListener(nullptr);
+                }
+
+                iter->second->removeFromScene();
+                mUnrefQueue.push(std::move(iter->second));
+                iter = mObjects.erase(iter);
+            }
+            else
+                ++iter;
+        }
 
-void Objects::updatePtr(const MWWorld::Ptr &old, const MWWorld::Ptr &cur)
-{
-    osg::ref_ptr<osg::Node> objectNode = cur.getRefData().getBaseNode();
-    if (!objectNode)
-        return;
-
-    MWWorld::CellStore *newCell = cur.getCell();
-
-    osg::Group* cellnode;
-    if(mCellSceneNodes.find(newCell) == mCellSceneNodes.end()) {
-        cellnode = new osg::Group;
-        mRootNode->addChild(cellnode);
-        mCellSceneNodes[newCell] = cellnode;
-    } else {
-        cellnode = mCellSceneNodes[newCell];
+        CellMap::iterator cell = mCellSceneNodes.find(store);
+        if (cell != mCellSceneNodes.end())
+        {
+            cell->second->getParent(0)->removeChild(cell->second);
+            mCellSceneNodes.erase(cell);
+        }
     }
 
-    osg::UserDataContainer* userDataContainer = objectNode->getUserDataContainer();
-    if (userDataContainer)
-        for (unsigned int i=0; i<userDataContainer->getNumUserObjects(); ++i)
+    void Objects::updatePtr(const MWWorld::Ptr& old, const MWWorld::Ptr& cur)
+    {
+        osg::ref_ptr<osg::Node> objectNode = cur.getRefData().getBaseNode();
+        if (!objectNode)
+            return;
+
+        MWWorld::CellStore* newCell = cur.getCell();
+
+        osg::Group* cellnode;
+        if (mCellSceneNodes.find(newCell) == mCellSceneNodes.end())
+        {
+            cellnode = new osg::Group;
+            mRootNode->addChild(cellnode);
+            mCellSceneNodes[newCell] = cellnode;
+        }
+        else
         {
-            if (dynamic_cast<PtrHolder*>(userDataContainer->getUserObject(i)))
-                userDataContainer->setUserObject(i, new PtrHolder(cur));
+            cellnode = mCellSceneNodes[newCell];
         }
 
-    if (objectNode->getNumParents())
-        objectNode->getParent(0)->removeChild(objectNode);
-    cellnode->addChild(objectNode);
+        osg::UserDataContainer* userDataContainer = objectNode->getUserDataContainer();
+        if (userDataContainer)
+            for (unsigned int i = 0; i < userDataContainer->getNumUserObjects(); ++i)
+            {
+                if (dynamic_cast<PtrHolder*>(userDataContainer->getUserObject(i)))
+                    userDataContainer->setUserObject(i, new PtrHolder(cur));
+            }
 
-    PtrAnimationMap::iterator iter = mObjects.find(old.mRef);
-    if(iter != mObjects.end())
-        iter->second->updatePtr(cur);
-}
+        if (objectNode->getNumParents())
+            objectNode->getParent(0)->removeChild(objectNode);
+        cellnode->addChild(objectNode);
 
-Animation* Objects::getAnimation(const MWWorld::Ptr &ptr)
-{
-    PtrAnimationMap::const_iterator iter = mObjects.find(ptr.mRef);
-    if(iter != mObjects.end())
-        return iter->second;
+        PtrAnimationMap::iterator iter = mObjects.find(old.mRef);
+        if (iter != mObjects.end())
+            iter->second->updatePtr(cur);
+    }
 
-    return nullptr;
-}
+    Animation* Objects::getAnimation(const MWWorld::Ptr& ptr)
+    {
+        PtrAnimationMap::const_iterator iter = mObjects.find(ptr.mRef);
+        if (iter != mObjects.end())
+            return iter->second;
 
-const Animation* Objects::getAnimation(const MWWorld::ConstPtr &ptr) const
-{
-    PtrAnimationMap::const_iterator iter = mObjects.find(ptr.mRef);
-    if(iter != mObjects.end())
-        return iter->second;
+        return nullptr;
+    }
 
-    return nullptr;
-}
+    const Animation* Objects::getAnimation(const MWWorld::ConstPtr& ptr) const
+    {
+        PtrAnimationMap::const_iterator iter = mObjects.find(ptr.mRef);
+        if (iter != mObjects.end())
+            return iter->second;
+
+        return nullptr;
+    }
 
 }
diff --git a/apps/openmw/mwrender/objects.hpp b/apps/openmw/mwrender/objects.hpp
index 2ca3da0c86..339079cb0a 100644
--- a/apps/openmw/mwrender/objects.hpp
+++ b/apps/openmw/mwrender/objects.hpp
@@ -4,8 +4,8 @@
 #include <map>
 #include <string>
 
-#include <osg/ref_ptr>
 #include <osg/Object>
+#include <osg/ref_ptr>
 
 #include "../mwworld/ptr.hpp"
 
@@ -29,71 +29,71 @@ namespace SceneUtil
     class UnrefQueue;
 }
 
-namespace MWRender{
+namespace MWRender
+{
 
-class Animation;
+    class Animation;
 
-class PtrHolder : public osg::Object
-{
-public:
-    PtrHolder(const MWWorld::Ptr& ptr)
-        : mPtr(ptr)
+    class PtrHolder : public osg::Object
     {
-    }
+    public:
+        PtrHolder(const MWWorld::Ptr& ptr)
+            : mPtr(ptr)
+        {
+        }
 
-    PtrHolder()
-    {
-    }
+        PtrHolder() {}
 
-    PtrHolder(const PtrHolder& copy, const osg::CopyOp& copyop)
-        : mPtr(copy.mPtr)
-    {
-    }
+        PtrHolder(const PtrHolder& copy, const osg::CopyOp& copyop)
+            : mPtr(copy.mPtr)
+        {
+        }
 
-    META_Object(MWRender, PtrHolder)
+        META_Object(MWRender, PtrHolder)
 
-    MWWorld::Ptr mPtr;
-};
+        MWWorld::Ptr mPtr;
+    };
 
-class Objects
-{
-    using PtrAnimationMap = std::map<const MWWorld::LiveCellRefBase*, osg::ref_ptr<Animation>>;
+    class Objects
+    {
+        using PtrAnimationMap = std::map<const MWWorld::LiveCellRefBase*, osg::ref_ptr<Animation>>;
 
-    typedef std::map<const MWWorld::CellStore*, osg::ref_ptr<osg::Group> > CellMap;
-    CellMap mCellSceneNodes;
-    PtrAnimationMap mObjects;
-    osg::ref_ptr<osg::Group> mRootNode;
-    Resource::ResourceSystem* mResourceSystem;
-    SceneUtil::UnrefQueue& mUnrefQueue;
+        typedef std::map<const MWWorld::CellStore*, osg::ref_ptr<osg::Group>> CellMap;
+        CellMap mCellSceneNodes;
+        PtrAnimationMap mObjects;
+        osg::ref_ptr<osg::Group> mRootNode;
+        Resource::ResourceSystem* mResourceSystem;
+        SceneUtil::UnrefQueue& mUnrefQueue;
 
-    void insertBegin(const MWWorld::Ptr& ptr);
+        void insertBegin(const MWWorld::Ptr& ptr);
 
-public:
-    Objects(Resource::ResourceSystem* resourceSystem, const osg::ref_ptr<osg::Group>& rootNode,
-        SceneUtil::UnrefQueue& unrefQueue);
-    ~Objects();
+    public:
+        Objects(Resource::ResourceSystem* resourceSystem, const osg::ref_ptr<osg::Group>& rootNode,
+            SceneUtil::UnrefQueue& unrefQueue);
+        ~Objects();
 
-    /// @param animated Attempt to load separate keyframes from a .kf file matching the model file?
-    /// @param allowLight If false, no lights will be created, and particles systems will be removed.
-    void insertModel(const MWWorld::Ptr& ptr, const std::string &model, bool animated=false, bool allowLight=true);
+        /// @param animated Attempt to load separate keyframes from a .kf file matching the model file?
+        /// @param allowLight If false, no lights will be created, and particles systems will be removed.
+        void insertModel(
+            const MWWorld::Ptr& ptr, const std::string& model, bool animated = false, bool allowLight = true);
 
-    void insertNPC(const MWWorld::Ptr& ptr);
-    void insertCreature (const MWWorld::Ptr& ptr, const std::string& model, bool weaponsShields);
+        void insertNPC(const MWWorld::Ptr& ptr);
+        void insertCreature(const MWWorld::Ptr& ptr, const std::string& model, bool weaponsShields);
 
-    Animation* getAnimation(const MWWorld::Ptr &ptr);
-    const Animation* getAnimation(const MWWorld::ConstPtr &ptr) const;
+        Animation* getAnimation(const MWWorld::Ptr& ptr);
+        const Animation* getAnimation(const MWWorld::ConstPtr& ptr) const;
 
-    bool removeObject (const MWWorld::Ptr& ptr);
-    ///< \return found?
+        bool removeObject(const MWWorld::Ptr& ptr);
+        ///< \return found?
 
-    void removeCell(const MWWorld::CellStore* store);
+        void removeCell(const MWWorld::CellStore* store);
 
-    /// Updates containing cell for object rendering data
-    void updatePtr(const MWWorld::Ptr &old, const MWWorld::Ptr &cur);
+        /// Updates containing cell for object rendering data
+        void updatePtr(const MWWorld::Ptr& old, const MWWorld::Ptr& cur);
 
-private:
-    void operator = (const Objects&);
-    Objects(const Objects&);
-};
+    private:
+        void operator=(const Objects&);
+        Objects(const Objects&);
+    };
 }
 #endif
diff --git a/apps/openmw/mwrender/pathgrid.cpp b/apps/openmw/mwrender/pathgrid.cpp
index ec7d2c15e0..9ad25bb3b3 100644
--- a/apps/openmw/mwrender/pathgrid.cpp
+++ b/apps/openmw/mwrender/pathgrid.cpp
@@ -3,155 +3,156 @@
 #include <cassert>
 
 #include <osg/Geometry>
-#include <osg/PositionAttitudeTransform>
 #include <osg/Group>
+#include <osg/PositionAttitudeTransform>
 
 #include <components/esm3/loadpgrd.hpp>
-#include <components/sceneutil/pathgridutil.hpp>
-#include <components/sceneutil/util.hpp>
 #include <components/misc/coordinateconverter.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
+#include <components/sceneutil/pathgridutil.hpp>
+#include <components/sceneutil/util.hpp>
 
-#include "../mwbase/world.hpp" // these includes can be removed once the static-hack is gone
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp" // these includes can be removed once the static-hack is gone
 
+#include "../mwmechanics/pathfinding.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
-#include "../mwmechanics/pathfinding.hpp"
 
 #include "vismask.hpp"
 
 namespace MWRender
 {
 
-Pathgrid::Pathgrid(osg::ref_ptr<osg::Group> root)
-    : mPathgridEnabled(false)
-    , mRootNode(root)
-    , mPathGridRoot(nullptr)
-    , mInteriorPathgridNode(nullptr)
-{
-}
-
-Pathgrid::~Pathgrid()
-{
-    if (mPathgridEnabled)
+    Pathgrid::Pathgrid(osg::ref_ptr<osg::Group> root)
+        : mPathgridEnabled(false)
+        , mRootNode(root)
+        , mPathGridRoot(nullptr)
+        , mInteriorPathgridNode(nullptr)
     {
-        togglePathgrid();
     }
-}
-
 
-bool Pathgrid::toggleRenderMode (int mode){
-    switch (mode)
+    Pathgrid::~Pathgrid()
     {
-        case Render_Pathgrid:
+        if (mPathgridEnabled)
+        {
             togglePathgrid();
-            return mPathgridEnabled;
-        default:
-            return false;
+        }
     }
 
-    return false;
-}
-
-void Pathgrid::addCell(const MWWorld::CellStore *store)
-{
-    mActiveCells.push_back(store);
-    if (mPathgridEnabled)
-        enableCellPathgrid(store);
-}
+    bool Pathgrid::toggleRenderMode(int mode)
+    {
+        switch (mode)
+        {
+            case Render_Pathgrid:
+                togglePathgrid();
+                return mPathgridEnabled;
+            default:
+                return false;
+        }
 
-void Pathgrid::removeCell(const MWWorld::CellStore *store)
-{
-    mActiveCells.erase(std::remove(mActiveCells.begin(), mActiveCells.end(), store), mActiveCells.end());
-    if (mPathgridEnabled)
-        disableCellPathgrid(store);
-}
+        return false;
+    }
 
-void Pathgrid::togglePathgrid()
-{
-    mPathgridEnabled = !mPathgridEnabled;
-    if (mPathgridEnabled)
+    void Pathgrid::addCell(const MWWorld::CellStore* store)
     {
-        // add path grid meshes to already loaded cells
-        mPathGridRoot = new osg::Group;
-        mPathGridRoot->setNodeMask(Mask_Debug);
-        mRootNode->addChild(mPathGridRoot);
+        mActiveCells.push_back(store);
+        if (mPathgridEnabled)
+            enableCellPathgrid(store);
+    }
 
-        for(const MWWorld::CellStore* cell : mActiveCells)
-        {
-            enableCellPathgrid(cell);
-        }
+    void Pathgrid::removeCell(const MWWorld::CellStore* store)
+    {
+        mActiveCells.erase(std::remove(mActiveCells.begin(), mActiveCells.end(), store), mActiveCells.end());
+        if (mPathgridEnabled)
+            disableCellPathgrid(store);
     }
-    else
+
+    void Pathgrid::togglePathgrid()
     {
-        // remove path grid meshes from already loaded cells
-        for(const MWWorld::CellStore* cell : mActiveCells)
+        mPathgridEnabled = !mPathgridEnabled;
+        if (mPathgridEnabled)
         {
-            disableCellPathgrid(cell);
+            // add path grid meshes to already loaded cells
+            mPathGridRoot = new osg::Group;
+            mPathGridRoot->setNodeMask(Mask_Debug);
+            mRootNode->addChild(mPathGridRoot);
+
+            for (const MWWorld::CellStore* cell : mActiveCells)
+            {
+                enableCellPathgrid(cell);
+            }
         }
-
-        if (mPathGridRoot)
+        else
         {
-            mRootNode->removeChild(mPathGridRoot);
-            mPathGridRoot = nullptr;
+            // remove path grid meshes from already loaded cells
+            for (const MWWorld::CellStore* cell : mActiveCells)
+            {
+                disableCellPathgrid(cell);
+            }
+
+            if (mPathGridRoot)
+            {
+                mRootNode->removeChild(mPathGridRoot);
+                mPathGridRoot = nullptr;
+            }
         }
     }
-}
 
-void Pathgrid::enableCellPathgrid(const MWWorld::CellStore *store)
-{
-    MWBase::World* world = MWBase::Environment::get().getWorld();
-    const ESM::Pathgrid *pathgrid =
-        world->getStore().get<ESM::Pathgrid>().search(*store->getCell());
-    if (!pathgrid) return;
+    void Pathgrid::enableCellPathgrid(const MWWorld::CellStore* store)
+    {
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+        const ESM::Pathgrid* pathgrid = world->getStore().get<ESM::Pathgrid>().search(*store->getCell());
+        if (!pathgrid)
+            return;
 
-    osg::Vec3f cellPathGridPos(0, 0, 0);
-    Misc::CoordinateConverter(store->getCell()).toWorld(cellPathGridPos);
+        osg::Vec3f cellPathGridPos(0, 0, 0);
+        Misc::CoordinateConverter(store->getCell()).toWorld(cellPathGridPos);
 
-    osg::ref_ptr<osg::PositionAttitudeTransform> cellPathGrid = new osg::PositionAttitudeTransform;
-    cellPathGrid->setPosition(cellPathGridPos);
+        osg::ref_ptr<osg::PositionAttitudeTransform> cellPathGrid = new osg::PositionAttitudeTransform;
+        cellPathGrid->setPosition(cellPathGridPos);
 
-    osg::ref_ptr<osg::Geometry> geometry = SceneUtil::createPathgridGeometry(*pathgrid);
+        osg::ref_ptr<osg::Geometry> geometry = SceneUtil::createPathgridGeometry(*pathgrid);
 
-    MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(geometry, "debug");
+        MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(geometry, "debug");
 
-    cellPathGrid->addChild(geometry);
+        cellPathGrid->addChild(geometry);
 
-    mPathGridRoot->addChild(cellPathGrid);
+        mPathGridRoot->addChild(cellPathGrid);
 
-    if (store->getCell()->isExterior())
-    {
-        mExteriorPathgridNodes[std::make_pair(store->getCell()->getGridX(), store->getCell()->getGridY())] = cellPathGrid;
-    }
-    else
-    {
-        assert(mInteriorPathgridNode == nullptr);
-        mInteriorPathgridNode = cellPathGrid;
+        if (store->getCell()->isExterior())
+        {
+            mExteriorPathgridNodes[std::make_pair(store->getCell()->getGridX(), store->getCell()->getGridY())]
+                = cellPathGrid;
+        }
+        else
+        {
+            assert(mInteriorPathgridNode == nullptr);
+            mInteriorPathgridNode = cellPathGrid;
+        }
     }
-}
 
-void Pathgrid::disableCellPathgrid(const MWWorld::CellStore *store)
-{
-    if (store->getCell()->isExterior())
+    void Pathgrid::disableCellPathgrid(const MWWorld::CellStore* store)
     {
-        ExteriorPathgridNodes::iterator it =
-                mExteriorPathgridNodes.find(std::make_pair(store->getCell()->getGridX(), store->getCell()->getGridY()));
-        if (it != mExteriorPathgridNodes.end())
+        if (store->getCell()->isExterior())
         {
-            mPathGridRoot->removeChild(it->second);
-            mExteriorPathgridNodes.erase(it);
+            ExteriorPathgridNodes::iterator it = mExteriorPathgridNodes.find(
+                std::make_pair(store->getCell()->getGridX(), store->getCell()->getGridY()));
+            if (it != mExteriorPathgridNodes.end())
+            {
+                mPathGridRoot->removeChild(it->second);
+                mExteriorPathgridNodes.erase(it);
+            }
         }
-    }
-    else
-    {
-        if (mInteriorPathgridNode)
+        else
         {
-            mPathGridRoot->removeChild(mInteriorPathgridNode);
-            mInteriorPathgridNode = nullptr;
+            if (mInteriorPathgridNode)
+            {
+                mPathGridRoot->removeChild(mInteriorPathgridNode);
+                mInteriorPathgridNode = nullptr;
+            }
         }
     }
-}
 
 }
diff --git a/apps/openmw/mwrender/pathgrid.hpp b/apps/openmw/mwrender/pathgrid.hpp
index 77f1a7f337..ef815d3962 100644
--- a/apps/openmw/mwrender/pathgrid.hpp
+++ b/apps/openmw/mwrender/pathgrid.hpp
@@ -3,8 +3,8 @@
 
 #include <utility>
 
-#include <vector>
 #include <map>
+#include <vector>
 
 #include <osg/ref_ptr>
 
@@ -33,30 +33,29 @@ namespace MWRender
 
         void togglePathgrid();
 
-        typedef std::vector<const MWWorld::CellStore *> CellList;
+        typedef std::vector<const MWWorld::CellStore*> CellList;
         CellList mActiveCells;
 
         osg::ref_ptr<osg::Group> mRootNode;
 
         osg::ref_ptr<osg::Group> mPathGridRoot;
 
-        typedef std::map<std::pair<int,int>, osg::ref_ptr<osg::Group> > ExteriorPathgridNodes;
+        typedef std::map<std::pair<int, int>, osg::ref_ptr<osg::Group>> ExteriorPathgridNodes;
         ExteriorPathgridNodes mExteriorPathgridNodes;
         osg::ref_ptr<osg::Group> mInteriorPathgridNode;
 
-        void enableCellPathgrid(const MWWorld::CellStore *store);
-        void disableCellPathgrid(const MWWorld::CellStore *store);
+        void enableCellPathgrid(const MWWorld::CellStore* store);
+        void disableCellPathgrid(const MWWorld::CellStore* store);
 
     public:
         Pathgrid(osg::ref_ptr<osg::Group> root);
         ~Pathgrid();
-        bool toggleRenderMode (int mode);
+        bool toggleRenderMode(int mode);
 
         void addCell(const MWWorld::CellStore* store);
         void removeCell(const MWWorld::CellStore* store);
     };
 
-
 }
 
 #endif
diff --git a/apps/openmw/mwrender/pingpongcanvas.cpp b/apps/openmw/mwrender/pingpongcanvas.cpp
index 16c59787a2..3276b7addc 100644
--- a/apps/openmw/mwrender/pingpongcanvas.cpp
+++ b/apps/openmw/mwrender/pingpongcanvas.cpp
@@ -1,9 +1,9 @@
 #include "pingpongcanvas.hpp"
 
-#include <components/shader/shadermanager.hpp>
 #include <components/debug/debuglog.hpp>
-#include <components/stereo/stereomanager.hpp>
+#include <components/shader/shadermanager.hpp>
 #include <components/stereo/multiview.hpp>
+#include <components/stereo/stereomanager.hpp>
 
 #include <osg/Texture2DArray>
 
@@ -41,7 +41,8 @@ namespace MWRender
         mFallbackStateSet->addUniform(new osg::Uniform("omw_SamplerLastShader", 0));
 
         auto multiviewResolveVertex = shaderManager.getShader("multiview_resolve_vertex.glsl", {}, osg::Shader::VERTEX);
-        auto multiviewResolveFragment = shaderManager.getShader("multiview_resolve_fragment.glsl", {}, osg::Shader::FRAGMENT);
+        auto multiviewResolveFragment
+            = shaderManager.getShader("multiview_resolve_fragment.glsl", {}, osg::Shader::FRAGMENT);
         mMultiviewResolveProgram = shaderManager.getProgram(multiviewResolveVertex, multiviewResolveFragment);
         mMultiviewResolveStateSet->setAttributeAndModes(mMultiviewResolveProgram);
         mMultiviewResolveStateSet->addUniform(new osg::Uniform("omw_SamplerLastShader", 0));
@@ -56,8 +57,10 @@ namespace MWRender
     {
         mBufferData[frameId].mask = 0;
 
-        mBufferData[frameId].mask |= underwater ? fx::Technique::Flag_Disable_Underwater : fx::Technique::Flag_Disable_Abovewater;
-        mBufferData[frameId].mask |= exterior ? fx::Technique::Flag_Disable_Exteriors : fx::Technique::Flag_Disable_Interiors;
+        mBufferData[frameId].mask
+            |= underwater ? fx::Technique::Flag_Disable_Underwater : fx::Technique::Flag_Disable_Abovewater;
+        mBufferData[frameId].mask
+            |= exterior ? fx::Technique::Flag_Disable_Exteriors : fx::Technique::Flag_Disable_Interiors;
     }
 
     void PingPongCanvas::drawGeometry(osg::RenderInfo& renderInfo) const
@@ -65,7 +68,8 @@ namespace MWRender
         osg::Geometry::drawImplementation(renderInfo);
     }
 
-    static void attachCloneOfTemplate(osg::FrameBufferObject* fbo, osg::Camera::BufferComponent component, osg::Texture* tex)
+    static void attachCloneOfTemplate(
+        osg::FrameBufferObject* fbo, osg::Camera::BufferComponent component, osg::Texture* tex)
     {
         osg::ref_ptr<osg::Texture> clone = static_cast<osg::Texture*>(tex->clone(osg::CopyOp::SHALLOW_COPY));
         fbo->setAttachment(component, Stereo::createMultiviewCompatibleAttachment(clone));
@@ -130,7 +134,8 @@ namespace MWRender
             for (auto& fbo : mFbos)
             {
                 fbo = new osg::FrameBufferObject;
-                attachCloneOfTemplate(fbo, osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, bufferData.sceneTexLDR);
+                attachCloneOfTemplate(
+                    fbo, osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, bufferData.sceneTexLDR);
                 fbo->apply(state);
                 glClearColor(0.5, 0.5, 0.5, 1);
                 glClear(GL_COLOR_BUFFER_BIT);
@@ -139,33 +144,37 @@ namespace MWRender
             if (Stereo::getMultiview())
             {
                 mMultiviewResolveFramebuffer = new osg::FrameBufferObject();
-                attachCloneOfTemplate(mMultiviewResolveFramebuffer, osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, bufferData.sceneTexLDR);
+                attachCloneOfTemplate(mMultiviewResolveFramebuffer,
+                    osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, bufferData.sceneTexLDR);
                 mMultiviewResolveFramebuffer->apply(state);
                 glClearColor(0.5, 0.5, 0.5, 1);
                 glClear(GL_COLOR_BUFFER_BIT);
 
-                mMultiviewResolveStateSet->setTextureAttribute(PostProcessor::Unit_LastShader, (osg::Texture*)mMultiviewResolveFramebuffer->getAttachment(osg::Camera::COLOR_BUFFER0).getTexture());
+                mMultiviewResolveStateSet->setTextureAttribute(PostProcessor::Unit_LastShader,
+                    (osg::Texture*)mMultiviewResolveFramebuffer->getAttachment(osg::Camera::COLOR_BUFFER0)
+                        .getTexture());
             }
 
             mLuminanceCalculator.dirty(bufferData.sceneTex->getTextureWidth(), bufferData.sceneTex->getTextureHeight());
 
             if (Stereo::getStereo())
-                mRenderViewport = new osg::Viewport(0, 0, bufferData.sceneTex->getTextureWidth(), bufferData.sceneTex->getTextureHeight());
+                mRenderViewport = new osg::Viewport(
+                    0, 0, bufferData.sceneTex->getTextureWidth(), bufferData.sceneTex->getTextureHeight());
             else
                 mRenderViewport = nullptr;
 
             bufferData.dirty = false;
         }
 
-        constexpr std::array<std::array<int, 2>, 3> buffers = {{
-            {GL_COLOR_ATTACHMENT1_EXT, GL_COLOR_ATTACHMENT2_EXT},
-            {GL_COLOR_ATTACHMENT0_EXT, GL_COLOR_ATTACHMENT2_EXT},
-            {GL_COLOR_ATTACHMENT0_EXT, GL_COLOR_ATTACHMENT1_EXT}
-        }};
+        constexpr std::array<std::array<int, 2>, 3> buffers
+            = { { { GL_COLOR_ATTACHMENT1_EXT, GL_COLOR_ATTACHMENT2_EXT },
+                { GL_COLOR_ATTACHMENT0_EXT, GL_COLOR_ATTACHMENT2_EXT },
+                { GL_COLOR_ATTACHMENT0_EXT, GL_COLOR_ATTACHMENT1_EXT } } };
 
         (bufferData.hdr) ? mLuminanceCalculator.enable() : mLuminanceCalculator.disable();
 
-        // A histogram based approach is superior way to calculate scene luminance. Using mipmaps is more broadly supported, so that's what we use for now.
+        // A histogram based approach is superior way to calculate scene luminance. Using mipmaps is more broadly
+        // supported, so that's what we use for now.
         mLuminanceCalculator.draw(*this, renderInfo, state, ext, frameId);
 
         auto buffer = buffers[0];
@@ -177,7 +186,8 @@ namespace MWRender
 
         const unsigned int cid = state.getContextID();
 
-        const osg::ref_ptr<osg::FrameBufferObject>& destinationFbo = bufferData.destination ? bufferData.destination : nullptr;
+        const osg::ref_ptr<osg::FrameBufferObject>& destinationFbo
+            = bufferData.destination ? bufferData.destination : nullptr;
         unsigned int destinationHandle = destinationFbo ? destinationFbo->getHandle(cid) : 0;
 
         auto bindDestinationFbo = [&]() {
@@ -206,10 +216,12 @@ namespace MWRender
             node.mRootStateSet->setTextureAttribute(PostProcessor::Unit_Depth, bufferData.depthTex);
 
             if (bufferData.hdr)
-                node.mRootStateSet->setTextureAttribute(PostProcessor::TextureUnits::Unit_EyeAdaptation, mLuminanceCalculator.getLuminanceTexture(frameId));
+                node.mRootStateSet->setTextureAttribute(
+                    PostProcessor::TextureUnits::Unit_EyeAdaptation, mLuminanceCalculator.getLuminanceTexture(frameId));
 
             if (bufferData.normalsTex)
-                node.mRootStateSet->setTextureAttribute(PostProcessor::TextureUnits::Unit_Normals, bufferData.normalsTex);
+                node.mRootStateSet->setTextureAttribute(
+                    PostProcessor::TextureUnits::Unit_Normals, bufferData.normalsTex);
 
             state.pushStateSet(node.mRootStateSet);
             state.apply();
@@ -222,16 +234,22 @@ namespace MWRender
 
                 bool lastPass = passIndex == node.mPasses.size() - 1;
 
-                //VR-TODO: This won't actually work for tex2darrays
+                // VR-TODO: This won't actually work for tex2darrays
                 if (lastShader == 0)
                     pass.mStateSet->setTextureAttribute(PostProcessor::Unit_LastShader, bufferData.sceneTex);
                 else
-                    pass.mStateSet->setTextureAttribute(PostProcessor::Unit_LastShader, (osg::Texture*)mFbos[lastShader - GL_COLOR_ATTACHMENT0_EXT]->getAttachment(osg::Camera::COLOR_BUFFER0).getTexture());
+                    pass.mStateSet->setTextureAttribute(PostProcessor::Unit_LastShader,
+                        (osg::Texture*)mFbos[lastShader - GL_COLOR_ATTACHMENT0_EXT]
+                            ->getAttachment(osg::Camera::COLOR_BUFFER0)
+                            .getTexture());
 
                 if (lastDraw == 0)
                     pass.mStateSet->setTextureAttribute(PostProcessor::Unit_LastPass, bufferData.sceneTex);
                 else
-                    pass.mStateSet->setTextureAttribute(PostProcessor::Unit_LastPass, (osg::Texture*)mFbos[lastDraw - GL_COLOR_ATTACHMENT0_EXT]->getAttachment(osg::Camera::COLOR_BUFFER0).getTexture());
+                    pass.mStateSet->setTextureAttribute(PostProcessor::Unit_LastPass,
+                        (osg::Texture*)mFbos[lastDraw - GL_COLOR_ATTACHMENT0_EXT]
+                            ->getAttachment(osg::Camera::COLOR_BUFFER0)
+                            .getTexture());
 
                 if (pass.mRenderTarget)
                 {
@@ -240,11 +258,14 @@ namespace MWRender
                     if (pass.mRenderTexture->getNumMipmapLevels() > 0)
                     {
                         state.setActiveTextureUnit(0);
-                        state.applyTextureAttribute(0, pass.mRenderTarget->getAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0).getTexture());
+                        state.applyTextureAttribute(0,
+                            pass.mRenderTarget->getAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0)
+                                .getTexture());
                         ext->glGenerateMipmap(GL_TEXTURE_2D);
                     }
 
-                    lastApplied = pass.mRenderTarget->getHandle(state.getContextID());;
+                    lastApplied = pass.mRenderTarget->getHandle(state.getContextID());
+                    ;
                 }
                 else if (pass.mResolve && index == filtered.back())
                 {
diff --git a/apps/openmw/mwrender/pingpongcanvas.hpp b/apps/openmw/mwrender/pingpongcanvas.hpp
index 4286d10a90..a5557a6d6e 100644
--- a/apps/openmw/mwrender/pingpongcanvas.hpp
+++ b/apps/openmw/mwrender/pingpongcanvas.hpp
@@ -4,9 +4,9 @@
 #include <array>
 #include <optional>
 
+#include <osg/FrameBufferObject>
 #include <osg/Geometry>
 #include <osg/Texture2D>
-#include <osg/FrameBufferObject>
 
 #include <components/fx/technique.hpp>
 
@@ -37,17 +37,29 @@ namespace MWRender
 
         void setSceneTexture(size_t frameId, osg::ref_ptr<osg::Texture> tex) { mBufferData[frameId].sceneTex = tex; }
 
-        void setLDRSceneTexture(size_t frameId, osg::ref_ptr<osg::Texture> tex) { mBufferData[frameId].sceneTexLDR = tex; }
+        void setLDRSceneTexture(size_t frameId, osg::ref_ptr<osg::Texture> tex)
+        {
+            mBufferData[frameId].sceneTexLDR = tex;
+        }
 
         void setDepthTexture(size_t frameId, osg::ref_ptr<osg::Texture> tex) { mBufferData[frameId].depthTex = tex; }
 
-        void setNormalsTexture(size_t frameId, osg::ref_ptr<osg::Texture> tex) { mBufferData[frameId].normalsTex = tex; }
+        void setNormalsTexture(size_t frameId, osg::ref_ptr<osg::Texture> tex)
+        {
+            mBufferData[frameId].normalsTex = tex;
+        }
 
         void setHDR(size_t frameId, bool hdr) { mBufferData[frameId].hdr = hdr; }
 
-        void setPostProcessing(size_t frameId, bool postprocessing) { mBufferData[frameId].postprocessing = postprocessing; }
+        void setPostProcessing(size_t frameId, bool postprocessing)
+        {
+            mBufferData[frameId].postprocessing = postprocessing;
+        }
 
-        const osg::ref_ptr<osg::Texture>& getSceneTexture(size_t frameId) const { return mBufferData[frameId].sceneTex; }
+        const osg::ref_ptr<osg::Texture>& getSceneTexture(size_t frameId) const
+        {
+            return mBufferData[frameId].sceneTex;
+        }
 
         void drawGeometry(osg::RenderInfo& renderInfo) const;
 
diff --git a/apps/openmw/mwrender/pingpongcull.cpp b/apps/openmw/mwrender/pingpongcull.cpp
index c3affa531a..4e36c51932 100644
--- a/apps/openmw/mwrender/pingpongcull.cpp
+++ b/apps/openmw/mwrender/pingpongcull.cpp
@@ -2,15 +2,15 @@
 
 #include <osg/Camera>
 #include <osg/FrameBufferObject>
-#include <osg/Texture>
 #include <osg/Texture2DArray>
+#include <osg/Texture>
 #include <osgUtil/CullVisitor>
 
-#include <components/stereo/stereomanager.hpp>
 #include <components/stereo/multiview.hpp>
+#include <components/stereo/stereomanager.hpp>
 
-#include "postprocessor.hpp"
 #include "pingpongcanvas.hpp"
+#include "postprocessor.hpp"
 
 namespace MWRender
 {
@@ -38,7 +38,8 @@ namespace MWRender
         size_t frame = cv->getTraversalNumber();
         size_t frameId = frame % 2;
 
-        MWRender::PostProcessor* postProcessor = dynamic_cast<MWRender::PostProcessor*>(cv->getCurrentCamera()->getUserData());
+        MWRender::PostProcessor* postProcessor
+            = dynamic_cast<MWRender::PostProcessor*>(cv->getCurrentCamera()->getUserData());
         if (!postProcessor)
             throw std::runtime_error("PingPongCull: failed to get a PostProcessor!");
 
@@ -69,11 +70,12 @@ namespace MWRender
         }
         else
         {
-            renderStage->setMultisampleResolveFramebufferObject(postProcessor->getFbo(PostProcessor::FBO_Primary, frameId));
+            renderStage->setMultisampleResolveFramebufferObject(
+                postProcessor->getFbo(PostProcessor::FBO_Primary, frameId));
             renderStage->setFrameBufferObject(postProcessor->getFbo(PostProcessor::FBO_Multisample, frameId));
 
-            // The MultiView patch has a bug where it does not update resolve layers if the resolve framebuffer is changed.
-            // So we do blit manually in this case
+            // The MultiView patch has a bug where it does not update resolve layers if the resolve framebuffer is
+            // changed. So we do blit manually in this case
             if (Stereo::getMultiview() && !renderStage->getDrawCallback())
                 Stereo::setMultiviewMSAAResolveCallback(renderStage);
         }
diff --git a/apps/openmw/mwrender/pingpongcull.hpp b/apps/openmw/mwrender/pingpongcull.hpp
index da6c0c3c68..8886ede9e3 100644
--- a/apps/openmw/mwrender/pingpongcull.hpp
+++ b/apps/openmw/mwrender/pingpongcull.hpp
@@ -23,6 +23,7 @@ namespace MWRender
         ~PingPongCull();
 
         void operator()(osg::Node* node, osgUtil::CullVisitor* nv);
+
     private:
         std::array<osg::Matrixf, 2> mLastViewMatrix;
         osg::ref_ptr<osg::StateSet> mViewportStateset;
diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index 555baa7efe..2c1b72c97d 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -1,41 +1,41 @@
 #include "postprocessor.hpp"
 
+#include <SDL_opengl_glext.h>
 #include <algorithm>
 #include <chrono>
 #include <thread>
-#include <SDL_opengl_glext.h>
 
 #include <osg/Texture1D>
 #include <osg/Texture2D>
+#include <osg/Texture2DArray>
 #include <osg/Texture2DMultisample>
 #include <osg/Texture3D>
-#include <osg/Texture2DArray>
 
-#include <components/settings/settings.hpp>
-#include <components/sceneutil/depth.hpp>
+#include <components/files/conversion.hpp>
+#include <components/misc/strings/algorithm.hpp>
+#include <components/misc/strings/lower.hpp>
+#include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/color.hpp>
+#include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/nodecallback.hpp>
 #include <components/sceneutil/util.hpp>
-#include <components/resource/scenemanager.hpp>
+#include <components/settings/settings.hpp>
 #include <components/shader/shadermanager.hpp>
-#include <components/misc/strings/lower.hpp>
-#include <components/misc/strings/algorithm.hpp>
-#include <components/vfs/manager.hpp>
 #include <components/stereo/multiview.hpp>
 #include <components/stereo/stereomanager.hpp>
-#include <components/files/conversion.hpp>
+#include <components/vfs/manager.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwgui/postprocessorhud.hpp"
 
-#include "transparentpass.hpp"
 #include "pingpongcull.hpp"
 #include "renderingmanager.hpp"
-#include "vismask.hpp"
 #include "sky.hpp"
+#include "transparentpass.hpp"
+#include "vismask.hpp"
 
 namespace
 {
@@ -43,7 +43,8 @@ namespace
     {
         ResizedCallback(MWRender::PostProcessor* postProcessor)
             : mPostProcessor(postProcessor)
-        { }
+        {
+        }
 
         void resizedImplementation(osg::GraphicsContext* gc, int x, int y, int width, int height) override
         {
@@ -65,9 +66,11 @@ namespace
             auto& sm = Stereo::Manager::instance();
             auto* fullViewport = camera->getViewport();
             if (sm.getEye(cv) == Stereo::Eye::Left)
-                stateset->setAttributeAndModes(new osg::Viewport(0, 0, fullViewport->width() / 2, fullViewport->height()));
+                stateset->setAttributeAndModes(
+                    new osg::Viewport(0, 0, fullViewport->width() / 2, fullViewport->height()));
             if (sm.getEye(cv) == Stereo::Eye::Right)
-                stateset->setAttributeAndModes(new osg::Viewport(fullViewport->width() / 2, 0, fullViewport->width() / 2, fullViewport->height()));
+                stateset->setAttributeAndModes(
+                    new osg::Viewport(fullViewport->width() / 2, 0, fullViewport->width() / 2, fullViewport->height()));
 
             cv->pushStateSet(stateset);
             traverse(camera, cv);
@@ -81,11 +84,13 @@ namespace
         TEXTURE,
     };
 
-    static osg::FrameBufferAttachment createFrameBufferAttachmentFromTemplate(Usage usage, int width, int height, osg::Texture* template_, int samples)
+    static osg::FrameBufferAttachment createFrameBufferAttachmentFromTemplate(
+        Usage usage, int width, int height, osg::Texture* template_, int samples)
     {
         if (usage == Usage::RENDER_BUFFER && !Stereo::getMultiview())
         {
-            osg::ref_ptr<osg::RenderBuffer> attachment = new osg::RenderBuffer(width, height, template_->getInternalFormat(), samples);
+            osg::ref_ptr<osg::RenderBuffer> attachment
+                = new osg::RenderBuffer(width, height, template_->getInternalFormat(), samples);
             return osg::FrameBufferAttachment(attachment);
         }
 
@@ -104,7 +109,8 @@ namespace
 
 namespace MWRender
 {
-    PostProcessor::PostProcessor(RenderingManager& rendering, osgViewer::Viewer* viewer, osg::Group* rootNode, const VFS::Manager* vfs)
+    PostProcessor::PostProcessor(
+        RenderingManager& rendering, osgViewer::Viewer* viewer, osg::Group* rootNode, const VFS::Manager* vfs)
         : osg::Group()
         , mEnableLiveReload(false)
         , mRootNode(rootNode)
@@ -211,7 +217,6 @@ namespace MWRender
 
         mDirty = true;
         mDirtyFrameId = !frameId;
-
     }
 
     void PostProcessor::populateTechniqueFiles()
@@ -243,7 +248,8 @@ namespace MWRender
 
         if (!mDisableDepthPasses)
         {
-            mTransparentDepthPostPass = new TransparentDepthBinCallback(mRendering.getResourceSystem()->getSceneManager()->getShaderManager(), postPass);
+            mTransparentDepthPostPass = new TransparentDepthBinCallback(
+                mRendering.getResourceSystem()->getSceneManager()->getShaderManager(), postPass);
             osgUtil::RenderBin::getRenderBinPrototype("DepthSortedBin")->setDrawCallback(mTransparentDepthPostPass);
         }
 
@@ -324,12 +330,12 @@ namespace MWRender
         mPingPongCanvas->setHDR(frameId, getHDR());
 
         mPingPongCanvas->setSceneTexture(frameId, getTexture(Tex_Scene, frameId));
-            if (mDisableDepthPasses)
-                mPingPongCanvas->setDepthTexture(frameId, getTexture(Tex_Depth, frameId));
-            else
-                mPingPongCanvas->setDepthTexture(frameId, getTexture(Tex_OpaqueDepth, frameId));
+        if (mDisableDepthPasses)
+            mPingPongCanvas->setDepthTexture(frameId, getTexture(Tex_Depth, frameId));
+        else
+            mPingPongCanvas->setDepthTexture(frameId, getTexture(Tex_OpaqueDepth, frameId));
 
-            mPingPongCanvas->setLDRSceneTexture(frameId, getTexture(Tex_Scene_LDR, frameId));
+        mPingPongCanvas->setLDRSceneTexture(frameId, getTexture(Tex_Scene_LDR, frameId));
 
         if (mTransparentDepthPostPass)
         {
@@ -370,7 +376,7 @@ namespace MWRender
         if (!mEnableLiveReload && !mTriggerShaderReload)
             return;
 
-        mTriggerShaderReload = false;//Done only once
+        mTriggerShaderReload = false; // Done only once
 
         for (auto& technique : mTechniques)
         {
@@ -383,7 +389,8 @@ namespace MWRender
             if (!isDirty)
                 continue;
 
-            // TODO: Temporary workaround to avoid conflicts with external programs saving the file, especially problematic on Windows.
+            // TODO: Temporary workaround to avoid conflicts with external programs saving the file, especially
+            // problematic on Windows.
             //       If we move to a file watcher using native APIs this should be removed.
             std::this_thread::sleep_for(std::chrono::milliseconds(5));
 
@@ -470,50 +477,66 @@ namespace MWRender
         }
 
         fbos[FBO_Primary] = new osg::FrameBufferObject;
-        fbos[FBO_Primary]->setAttachment(osg::Camera::COLOR_BUFFER0, Stereo::createMultiviewCompatibleAttachment(textures[Tex_Scene]));
+        fbos[FBO_Primary]->setAttachment(
+            osg::Camera::COLOR_BUFFER0, Stereo::createMultiviewCompatibleAttachment(textures[Tex_Scene]));
         if (mNormals && mNormalsSupported)
-            fbos[FBO_Primary]->setAttachment(osg::Camera::COLOR_BUFFER1, Stereo::createMultiviewCompatibleAttachment(textures[Tex_Normal]));
-        fbos[FBO_Primary]->setAttachment(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, Stereo::createMultiviewCompatibleAttachment(textures[Tex_Depth]));
+            fbos[FBO_Primary]->setAttachment(
+                osg::Camera::COLOR_BUFFER1, Stereo::createMultiviewCompatibleAttachment(textures[Tex_Normal]));
+        fbos[FBO_Primary]->setAttachment(
+            osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, Stereo::createMultiviewCompatibleAttachment(textures[Tex_Depth]));
 
         fbos[FBO_FirstPerson] = new osg::FrameBufferObject;
 
-        auto fpDepthRb = createFrameBufferAttachmentFromTemplate(Usage::RENDER_BUFFER, width, height, textures[Tex_Depth], mSamples);
-        fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(fpDepthRb));
+        auto fpDepthRb = createFrameBufferAttachmentFromTemplate(
+            Usage::RENDER_BUFFER, width, height, textures[Tex_Depth], mSamples);
+        fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER,
+            osg::FrameBufferAttachment(fpDepthRb));
 
         if (mSamples > 1)
         {
             fbos[FBO_Multisample] = new osg::FrameBufferObject;
-            auto colorRB = createFrameBufferAttachmentFromTemplate(Usage::RENDER_BUFFER, width, height, textures[Tex_Scene], mSamples);
+            auto colorRB = createFrameBufferAttachmentFromTemplate(
+                Usage::RENDER_BUFFER, width, height, textures[Tex_Scene], mSamples);
             if (mNormals && mNormalsSupported)
             {
-                auto normalRB = createFrameBufferAttachmentFromTemplate(Usage::RENDER_BUFFER, width, height, textures[Tex_Normal], mSamples);
+                auto normalRB = createFrameBufferAttachmentFromTemplate(
+                    Usage::RENDER_BUFFER, width, height, textures[Tex_Normal], mSamples);
                 fbos[FBO_Multisample]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, normalRB);
             }
-            auto depthRB = createFrameBufferAttachmentFromTemplate(Usage::RENDER_BUFFER, width, height, textures[Tex_Depth], mSamples);
+            auto depthRB = createFrameBufferAttachmentFromTemplate(
+                Usage::RENDER_BUFFER, width, height, textures[Tex_Depth], mSamples);
             fbos[FBO_Multisample]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, colorRB);
-            fbos[FBO_Multisample]->setAttachment(osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER, depthRB);
+            fbos[FBO_Multisample]->setAttachment(
+                osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER, depthRB);
             fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, colorRB);
 
             fbos[FBO_Intercept] = new osg::FrameBufferObject;
-            fbos[FBO_Intercept]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, Stereo::createMultiviewCompatibleAttachment(textures[Tex_Scene]));
-            fbos[FBO_Intercept]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, Stereo::createMultiviewCompatibleAttachment(textures[Tex_Normal]));
+            fbos[FBO_Intercept]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0,
+                Stereo::createMultiviewCompatibleAttachment(textures[Tex_Scene]));
+            fbos[FBO_Intercept]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1,
+                Stereo::createMultiviewCompatibleAttachment(textures[Tex_Normal]));
         }
         else
         {
-            fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, Stereo::createMultiviewCompatibleAttachment(textures[Tex_Scene]));
+            fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0,
+                Stereo::createMultiviewCompatibleAttachment(textures[Tex_Scene]));
             if (mNormals && mNormalsSupported)
-                fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, Stereo::createMultiviewCompatibleAttachment(textures[Tex_Normal]));
+                fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1,
+                    Stereo::createMultiviewCompatibleAttachment(textures[Tex_Normal]));
         }
 
         if (textures[Tex_OpaqueDepth])
         {
             fbos[FBO_OpaqueDepth] = new osg::FrameBufferObject;
-            fbos[FBO_OpaqueDepth]->setAttachment(osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER, Stereo::createMultiviewCompatibleAttachment(textures[Tex_OpaqueDepth]));
+            fbos[FBO_OpaqueDepth]->setAttachment(osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER,
+                Stereo::createMultiviewCompatibleAttachment(textures[Tex_OpaqueDepth]));
         }
 
 #ifdef __APPLE__
         if (textures[Tex_OpaqueDepth])
-            fbos[FBO_OpaqueDepth]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER, osg::FrameBufferAttachment(new osg::RenderBuffer(textures[Tex_OpaqueDepth]->getTextureWidth(), textures[Tex_OpaqueDepth]->getTextureHeight(), textures[Tex_Scene]->getInternalFormat())));
+            fbos[FBO_OpaqueDepth]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER,
+                osg::FrameBufferAttachment(new osg::RenderBuffer(textures[Tex_OpaqueDepth]->getTextureWidth(),
+                    textures[Tex_OpaqueDepth]->getTextureHeight(), textures[Tex_Scene]->getInternalFormat())));
 #endif
     }
 
@@ -541,7 +564,8 @@ namespace MWRender
 
             if (technique->getGLSLVersion() > mGLSLVersion)
             {
-                Log(Debug::Warning) << "Technique " << technique->getName() << " requires GLSL version " << technique->getGLSLVersion() << " which is unsupported by your hardware.";
+                Log(Debug::Warning) << "Technique " << technique->getName() << " requires GLSL version "
+                                    << technique->getGLSLVersion() << " which is unsupported by your hardware.";
                 continue;
             }
 
@@ -590,10 +614,12 @@ namespace MWRender
             // user-defined uniforms
             for (auto& uniform : technique->getUniformMap())
             {
-                if (uniform->mSamplerType) continue;
+                if (uniform->mSamplerType)
+                    continue;
 
                 if (auto type = uniform->getType())
-                    uniform->setUniform(node.mRootStateSet->getOrCreateUniform(uniform->mName.c_str(), *type, uniform->getNumElements()));
+                    uniform->setUniform(node.mRootStateSet->getOrCreateUniform(
+                        uniform->mName.c_str(), *type, uniform->getNumElements()));
             }
 
             std::unordered_map<osg::Texture2D*, osg::Texture2D*> renderTargetCache;
@@ -622,7 +648,8 @@ namespace MWRender
                         subPass.mRenderTexture->setNumMipmapLevels(osg::Image::computeNumberOfMipmapLevels(w, h));
 
                     subPass.mRenderTarget = new osg::FrameBufferObject;
-                    subPass.mRenderTarget->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, osg::FrameBufferAttachment(subPass.mRenderTexture));
+                    subPass.mRenderTarget->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0,
+                        osg::FrameBufferAttachment(subPass.mRenderTexture));
                     subPass.mStateSet->setAttributeAndModes(new osg::Viewport(0, 0, w, h));
                 }
 
@@ -652,7 +679,8 @@ namespace MWRender
         mRendering.getSkyManager()->setSunglare(sunglare);
     }
 
-    PostProcessor::Status PostProcessor::enableTechnique(std::shared_ptr<fx::Technique> technique, std::optional<int> location)
+    PostProcessor::Status PostProcessor::enableTechnique(
+        std::shared_ptr<fx::Technique> technique, std::optional<int> location)
     {
         if (!isEnabled())
         {
@@ -727,7 +755,7 @@ namespace MWRender
         textures[Tex_Normal]->setSourceFormat(GL_RGB);
         textures[Tex_Normal]->setInternalFormat(GL_RGB);
 
-        auto setupDepth = [] (osg::Texture* tex) {
+        auto setupDepth = [](osg::Texture* tex) {
             tex->setSourceFormat(GL_DEPTH_STENCIL_EXT);
             tex->setSourceType(SceneUtil::AutoDepth::depthSourceType());
             tex->setInternalFormat(SceneUtil::AutoDepth::depthInternalFormat());
@@ -785,12 +813,14 @@ namespace MWRender
             if (Misc::StringUtils::ciEqual(technique->getName(), name))
                 return technique;
 
-        auto technique = std::make_shared<fx::Technique>(*mVFS, *mRendering.getResourceSystem()->getImageManager(), name, renderWidth(), renderHeight(), mUBO, mNormalsSupported);
+        auto technique = std::make_shared<fx::Technique>(*mVFS, *mRendering.getResourceSystem()->getImageManager(),
+            name, renderWidth(), renderHeight(), mUBO, mNormalsSupported);
 
         technique->compile();
 
         if (technique->getStatus() != fx::Technique::Status::File_Not_exists)
-            technique->setLastModificationTime(std::filesystem::last_write_time(mTechniqueFileMap[technique->getName()]));
+            technique->setLastModificationTime(
+                std::filesystem::last_write_time(mTechniqueFileMap[technique->getName()]));
 
         if (loadNextFrame)
         {
@@ -827,7 +857,8 @@ namespace MWRender
     {
         std::vector<std::string> chain;
 
-        for (const auto& technique : mTechniques) {
+        for (const auto& technique : mTechniques)
+        {
             if (!technique || technique->getDynamic())
                 continue;
             chain.push_back(technique->getName());
@@ -870,4 +901,3 @@ namespace MWRender
         mTriggerShaderReload = true;
     }
 }
-
diff --git a/apps/openmw/mwrender/postprocessor.hpp b/apps/openmw/mwrender/postprocessor.hpp
index 23cd0f130b..fa230ec2e8 100644
--- a/apps/openmw/mwrender/postprocessor.hpp
+++ b/apps/openmw/mwrender/postprocessor.hpp
@@ -2,22 +2,22 @@
 #define OPENMW_MWRENDER_POSTPROCESSOR_H
 
 #include <array>
-#include <vector>
 #include <string>
 #include <unordered_map>
+#include <vector>
 
 #include <filesystem>
 
-#include <osg/Texture2D>
-#include <osg/Group>
-#include <osg/FrameBufferObject>
 #include <osg/Camera>
+#include <osg/FrameBufferObject>
+#include <osg/Group>
+#include <osg/Texture2D>
 
 #include <osgViewer/Viewer>
 
+#include <components/debug/debuglog.hpp>
 #include <components/fx/stateupdater.hpp>
 #include <components/fx/technique.hpp>
-#include <components/debug/debuglog.hpp>
 
 #include "pingpongcanvas.hpp"
 #include "transparentpass.hpp"
@@ -93,17 +93,27 @@ namespace MWRender
             Status_Unchanged
         };
 
-        PostProcessor(RenderingManager& rendering, osgViewer::Viewer* viewer, osg::Group* rootNode, const VFS::Manager* vfs);
+        PostProcessor(
+            RenderingManager& rendering, osgViewer::Viewer* viewer, osg::Group* rootNode, const VFS::Manager* vfs);
 
         ~PostProcessor();
 
         void traverse(osg::NodeVisitor& nv) override;
 
-        osg::ref_ptr<osg::FrameBufferObject> getFbo(FBOIndex index, unsigned int frameId) { return mFbos[frameId][index]; }
+        osg::ref_ptr<osg::FrameBufferObject> getFbo(FBOIndex index, unsigned int frameId)
+        {
+            return mFbos[frameId][index];
+        }
 
-        osg::ref_ptr<osg::Texture> getTexture(TextureIndex index, unsigned int frameId) { return mTextures[frameId][index]; }
+        osg::ref_ptr<osg::Texture> getTexture(TextureIndex index, unsigned int frameId)
+        {
+            return mTextures[frameId][index];
+        }
 
-        osg::ref_ptr<osg::FrameBufferObject> getPrimaryFbo(unsigned int frameId) { return mFbos[frameId][FBO_Multisample] ? mFbos[frameId][FBO_Multisample] : mFbos[frameId][FBO_Primary]; }
+        osg::ref_ptr<osg::FrameBufferObject> getPrimaryFbo(unsigned int frameId)
+        {
+            return mFbos[frameId][FBO_Multisample] ? mFbos[frameId][FBO_Multisample] : mFbos[frameId][FBO_Primary];
+        }
 
         osg::ref_ptr<fx::StateUpdater> getStateUpdater() { return mStateUpdater; }
 
@@ -161,11 +171,11 @@ namespace MWRender
 
         void toggleMode();
 
-        std::shared_ptr<fx::Technique> loadTechnique(const std::string& name, bool loadNextFrame=false);
+        std::shared_ptr<fx::Technique> loadTechnique(const std::string& name, bool loadNextFrame = false);
 
         bool isEnabled() const { return mUsePostProcessing && mEnabled; }
 
-        bool softParticlesEnabled() const {return mSoftParticles; }
+        bool softParticlesEnabled() const { return mSoftParticles; }
 
         bool getHDR() const { return mHDR; }
 
@@ -173,7 +183,11 @@ namespace MWRender
 
         void enable(bool usePostProcessing = true);
 
-        void setRenderTargetSize(int width, int height) { mWidth = width; mHeight = height; }
+        void setRenderTargetSize(int width, int height)
+        {
+            mWidth = width;
+            mHeight = height;
+        }
 
         void disableDynamicShaders();
 
@@ -187,9 +201,7 @@ namespace MWRender
         void loadChain();
         void saveChain();
 
-
     private:
-
         void populateTechniqueFiles();
 
         size_t frame() const { return mViewer->getFrameStamp()->getFrameNumber(); }
@@ -256,7 +268,7 @@ namespace MWRender
         osg::ref_ptr<PingPongCull> mPingPongCull;
         osg::ref_ptr<PingPongCanvas> mPingPongCanvas;
         osg::ref_ptr<TransparentDepthBinCallback> mTransparentDepthPostPass;
-    
+
         int mWidth;
         int mHeight;
 
diff --git a/apps/openmw/mwrender/recastmesh.cpp b/apps/openmw/mwrender/recastmesh.cpp
index e5f5438dcb..8edbc8568d 100644
--- a/apps/openmw/mwrender/recastmesh.cpp
+++ b/apps/openmw/mwrender/recastmesh.cpp
@@ -2,11 +2,11 @@
 
 #include <algorithm>
 
-#include <components/sceneutil/recastmesh.hpp>
+#include <components/detournavigator/recastmesh.hpp>
+#include <components/detournavigator/settings.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
-#include <components/detournavigator/settings.hpp>
-#include <components/detournavigator/recastmesh.hpp>
+#include <components/sceneutil/recastmesh.hpp>
 
 #include <osg/PositionAttitudeTransform>
 
@@ -74,26 +74,26 @@ namespace MWRender
             const auto group = SceneUtil::createRecastMeshGroup(*tile.second, settings.mRecast);
             MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(group, "debug");
             group->setNodeMask(Mask_Debug);
-            mGroups.emplace(tile.first, Group {tile.second->getVersion(), group});
+            mGroups.emplace(tile.first, Group{ tile.second->getVersion(), group });
             mRootNode->addChild(group);
         }
     }
 
     void RecastMesh::reset()
     {
-        std::for_each(mGroups.begin(), mGroups.end(), [&] (const auto& v) { mRootNode->removeChild(v.second.mValue); });
+        std::for_each(mGroups.begin(), mGroups.end(), [&](const auto& v) { mRootNode->removeChild(v.second.mValue); });
         mGroups.clear();
     }
 
     void RecastMesh::enable()
     {
-        std::for_each(mGroups.begin(), mGroups.end(), [&] (const auto& v) { mRootNode->addChild(v.second.mValue); });
+        std::for_each(mGroups.begin(), mGroups.end(), [&](const auto& v) { mRootNode->addChild(v.second.mValue); });
         mEnabled = true;
     }
 
     void RecastMesh::disable()
     {
-        std::for_each(mGroups.begin(), mGroups.end(), [&] (const auto& v) { mRootNode->removeChild(v.second.mValue); });
+        std::for_each(mGroups.begin(), mGroups.end(), [&](const auto& v) { mRootNode->removeChild(v.second.mValue); });
         mEnabled = false;
     }
 }
diff --git a/apps/openmw/mwrender/recastmesh.hpp b/apps/openmw/mwrender/recastmesh.hpp
index 0f0b34423a..2a45d67c6f 100644
--- a/apps/openmw/mwrender/recastmesh.hpp
+++ b/apps/openmw/mwrender/recastmesh.hpp
@@ -37,10 +37,7 @@ namespace MWRender
 
         void disable();
 
-        bool isEnabled() const
-        {
-            return mEnabled;
-        }
+        bool isEnabled() const { return mEnabled; }
 
     private:
         struct Group
diff --git a/apps/openmw/mwrender/renderinginterface.hpp b/apps/openmw/mwrender/renderinginterface.hpp
index 63039b612a..0fe7d2506f 100644
--- a/apps/openmw/mwrender/renderinginterface.hpp
+++ b/apps/openmw/mwrender/renderinginterface.hpp
@@ -5,12 +5,12 @@ namespace MWRender
 {
     class Objects;
     class Actors;
-      
+
     class RenderingInterface
     {
     public:
         virtual MWRender::Objects& getObjects() = 0;
-        virtual ~RenderingInterface(){}
+        virtual ~RenderingInterface() {}
     };
 }
 #endif
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index f751e59892..5543133ff4 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -1,17 +1,17 @@
 #include "renderingmanager.hpp"
 
-#include <limits>
 #include <cstdlib>
+#include <limits>
 
+#include <osg/ClipControl>
+#include <osg/ComputeBoundsVisitor>
+#include <osg/Fog>
+#include <osg/Group>
 #include <osg/Light>
 #include <osg/LightModel>
-#include <osg/Fog>
 #include <osg/Material>
 #include <osg/PolygonMode>
-#include <osg/Group>
 #include <osg/UserDataContainer>
-#include <osg/ComputeBoundsVisitor>
-#include <osg/ClipControl>
 
 #include <osgUtil/LineSegmentIntersector>
 
@@ -21,12 +21,12 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/stereo/stereomanager.hpp>
 #include <components/stereo/multiview.hpp>
+#include <components/stereo/stereomanager.hpp>
 
-#include <components/resource/resourcesystem.hpp>
 #include <components/resource/imagemanager.hpp>
 #include <components/resource/keyframemanager.hpp>
+#include <components/resource/resourcesystem.hpp>
 
 #include <components/shader/removedalphafunc.hpp>
 #include <components/shader/shadermanager.hpp>
@@ -34,25 +34,25 @@
 #include <components/settings/settings.hpp>
 
 #include <components/sceneutil/depth.hpp>
-#include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/lightmanager.hpp>
-#include <components/sceneutil/statesetupdater.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
+#include <components/sceneutil/rtt.hpp>
+#include <components/sceneutil/shadow.hpp>
+#include <components/sceneutil/statesetupdater.hpp>
+#include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/workqueue.hpp>
 #include <components/sceneutil/writescene.hpp>
-#include <components/sceneutil/shadow.hpp>
-#include <components/sceneutil/rtt.hpp>
 
 #include <components/misc/constants.hpp>
 
-#include <components/terrain/terraingrid.hpp>
 #include <components/terrain/quadtreeworld.hpp>
+#include <components/terrain/terraingrid.hpp>
 
 #include <components/esm3/loadcell.hpp>
 
+#include <components/debug/debugdraw.hpp>
 #include <components/detournavigator/navigator.hpp>
 #include <components/detournavigator/navmeshcacheitem.hpp>
-#include <components/debug/debugdraw.hpp>
 
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
@@ -63,26 +63,26 @@
 
 #include "../mwmechanics/actorutil.hpp"
 
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
-#include "sky.hpp"
+#include "actorspaths.hpp"
+#include "camera.hpp"
 #include "effectmanager.hpp"
+#include "fogmanager.hpp"
+#include "groundcover.hpp"
+#include "navmesh.hpp"
 #include "npcanimation.hpp"
-#include "vismask.hpp"
+#include "objectpaging.hpp"
 #include "pathgrid.hpp"
-#include "camera.hpp"
-#include "water.hpp"
-#include "terrainstorage.hpp"
-#include "navmesh.hpp"
-#include "actorspaths.hpp"
+#include "postprocessor.hpp"
 #include "recastmesh.hpp"
-#include "fogmanager.hpp"
-#include "objectpaging.hpp"
 #include "screenshotmanager.hpp"
-#include "groundcover.hpp"
-#include "postprocessor.hpp"
+#include "sky.hpp"
+#include "terrainstorage.hpp"
+#include "vismask.hpp"
+#include "water.hpp"
 
 namespace MWRender
 {
@@ -92,7 +92,8 @@ namespace MWRender
         PerViewUniformStateUpdater(Resource::SceneManager* sceneManager)
             : mSceneManager(sceneManager)
         {
-            mOpaqueTextureUnit = mSceneManager->getShaderManager().reserveGlobalTextureUnits(Shader::ShaderManager::Slot::OpaqueDepthTexture);
+            mOpaqueTextureUnit = mSceneManager->getShaderManager().reserveGlobalTextureUnits(
+                Shader::ShaderManager::Slot::OpaqueDepthTexture);
         }
 
         void setDefaults(osg::StateSet* stateset) override
@@ -110,35 +111,33 @@ namespace MWRender
             if (mSkyRTT && nv->getVisitorType() == osg::NodeVisitor::CULL_VISITOR)
             {
                 osg::Texture* skyTexture = mSkyRTT->getColorTexture(static_cast<osgUtil::CullVisitor*>(nv));
-                stateset->setTextureAttribute(mSkyTextureUnit, skyTexture, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+                stateset->setTextureAttribute(
+                    mSkyTextureUnit, skyTexture, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
             }
 
-            stateset->setTextureAttribute(mOpaqueTextureUnit, mSceneManager->getOpaqueDepthTex(nv->getTraversalNumber()), osg::StateAttribute::ON);
+            stateset->setTextureAttribute(mOpaqueTextureUnit,
+                mSceneManager->getOpaqueDepthTex(nv->getTraversalNumber()), osg::StateAttribute::ON);
         }
 
         void applyLeft(osg::StateSet* stateset, osgUtil::CullVisitor* nv) override
         {
             auto* uProjectionMatrix = stateset->getUniform("projectionMatrix");
             if (uProjectionMatrix)
-                uProjectionMatrix->set(Stereo::Manager::instance().computeEyeViewOffset(0) * Stereo::Manager::instance().computeEyeProjection(0, SceneUtil::AutoDepth::isReversed()));
+                uProjectionMatrix->set(Stereo::Manager::instance().computeEyeViewOffset(0)
+                    * Stereo::Manager::instance().computeEyeProjection(0, SceneUtil::AutoDepth::isReversed()));
         }
 
         void applyRight(osg::StateSet* stateset, osgUtil::CullVisitor* nv) override
         {
             auto* uProjectionMatrix = stateset->getUniform("projectionMatrix");
             if (uProjectionMatrix)
-                uProjectionMatrix->set(Stereo::Manager::instance().computeEyeViewOffset(1) * Stereo::Manager::instance().computeEyeProjection(1, SceneUtil::AutoDepth::isReversed()));
+                uProjectionMatrix->set(Stereo::Manager::instance().computeEyeViewOffset(1)
+                    * Stereo::Manager::instance().computeEyeProjection(1, SceneUtil::AutoDepth::isReversed()));
         }
 
-        void setProjectionMatrix(const osg::Matrixf& projectionMatrix)
-        {
-            mProjectionMatrix = projectionMatrix;
-        }
+        void setProjectionMatrix(const osg::Matrixf& projectionMatrix) { mProjectionMatrix = projectionMatrix; }
 
-        const osg::Matrixf& getProjectionMatrix() const
-        {
-            return mProjectionMatrix;
-        }
+        const osg::Matrixf& getProjectionMatrix() const { return mProjectionMatrix; }
 
         void enableSkyRTT(int skyTextureUnit, SceneUtil::RTTNode* skyRTT)
         {
@@ -217,35 +216,17 @@ namespace MWRender
             }
         }
 
-        void setLinearFac(float linearFac)
-        {
-            mLinearFac = linearFac;
-        }
+        void setLinearFac(float linearFac) { mLinearFac = linearFac; }
 
-        void setNear(float near)
-        {
-            mNear = near;
-        }
+        void setNear(float near) { mNear = near; }
 
-        void setFar(float far)
-        {
-            mFar = far;
-        }
+        void setFar(float far) { mFar = far; }
 
-        void setScreenRes(float width, float height)
-        {
-            mScreenRes = osg::Vec2f(width, height);
-        }
+        void setScreenRes(float width, float height) { mScreenRes = osg::Vec2f(width, height); }
 
-        void setWindSpeed(float windSpeed)
-        {
-            mWindSpeed = windSpeed;
-        }
+        void setWindSpeed(float windSpeed) { mWindSpeed = windSpeed; }
 
-        void setPlayerPos(osg::Vec3f playerPos)
-        {
-            mPlayerPos = playerPos;
-        }
+        void setPlayerPos(osg::Vec3f playerPos) { mPlayerPos = playerPos; }
 
     private:
         float mLinearFac;
@@ -267,7 +248,7 @@ namespace MWRender
         {
         }
 
-        void setDefaults(osg::StateSet *stateset) override
+        void setDefaults(osg::StateSet* stateset) override
         {
             osg::LightModel* lightModel = new osg::LightModel;
             stateset->setAttribute(lightModel, osg::StateAttribute::ON);
@@ -286,7 +267,8 @@ namespace MWRender
 
         void apply(osg::StateSet* stateset, osg::NodeVisitor*) override
         {
-            osg::LightModel* lightModel = static_cast<osg::LightModel*>(stateset->getAttribute(osg::StateAttribute::LIGHTMODEL));
+            osg::LightModel* lightModel
+                = static_cast<osg::LightModel*>(stateset->getAttribute(osg::StateAttribute::LIGHTMODEL));
             lightModel->setAmbientIntensity(mAmbientColor);
             osg::Fog* fog = static_cast<osg::Fog*>(stateset->getAttribute(osg::StateAttribute::FOG));
             fog->setColor(mFogColor);
@@ -294,25 +276,13 @@ namespace MWRender
             fog->setEnd(mFogEnd);
         }
 
-        void setAmbientColor(const osg::Vec4f& col)
-        {
-            mAmbientColor = col;
-        }
+        void setAmbientColor(const osg::Vec4f& col) { mAmbientColor = col; }
 
-        void setFogColor(const osg::Vec4f& col)
-        {
-            mFogColor = col;
-        }
+        void setFogColor(const osg::Vec4f& col) { mFogColor = col; }
 
-        void setFogStart(float start)
-        {
-            mFogStart = start;
-        }
+        void setFogStart(float start) { mFogStart = start; }
 
-        void setFogEnd(float end)
-        {
-            mFogEnd = end;
-        }
+        void setFogEnd(float end) { mFogEnd = end; }
 
         void setWireframe(bool wireframe)
         {
@@ -323,10 +293,7 @@ namespace MWRender
             }
         }
 
-        bool getWireframe() const
-        {
-            return mWireframe;
-        }
+        bool getWireframe() const { return mWireframe; }
 
     private:
         osg::Vec4f mAmbientColor;
@@ -370,9 +337,9 @@ namespace MWRender
     };
 
     RenderingManager::RenderingManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode,
-        Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue, const std::filesystem::path& resourcePath,
-        DetourNavigator::Navigator& navigator, const MWWorld::GroundcoverStore& groundcoverStore,
-        SceneUtil::UnrefQueue& unrefQueue)
+        Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
+        const std::filesystem::path& resourcePath, DetourNavigator::Navigator& navigator,
+        const MWWorld::GroundcoverStore& groundcoverStore, SceneUtil::UnrefQueue& unrefQueue)
         : mSkyBlending(Settings::Manager::getBool("sky blending", "Fog"))
         , mViewer(viewer)
         , mRootNode(rootNode)
@@ -381,46 +348,56 @@ namespace MWRender
         , mNavigator(navigator)
         , mMinimumAmbientLuminance(0.f)
         , mNightEyeFactor(0.f)
-        // TODO: Near clip should not need to be bounded like this, but too small values break OSG shadow calculations CPU-side.
-        // See issue: #6072
+        // TODO: Near clip should not need to be bounded like this, but too small values break OSG shadow calculations
+        // CPU-side. See issue: #6072
         , mNearClip(std::max(0.005f, Settings::Manager::getFloat("near clip", "Camera")))
         , mViewDistance(Settings::Manager::getFloat("viewing distance", "Camera"))
         , mFieldOfViewOverridden(false)
         , mFieldOfViewOverride(0.f)
         , mFieldOfView(std::clamp(Settings::Manager::getFloat("field of view", "Camera"), 1.f, 179.f))
-        , mFirstPersonFieldOfView(std::clamp(Settings::Manager::getFloat("first person field of view", "Camera"), 1.f, 179.f))
+        , mFirstPersonFieldOfView(
+              std::clamp(Settings::Manager::getFloat("first person field of view", "Camera"), 1.f, 179.f))
     {
         bool reverseZ = SceneUtil::AutoDepth::isReversed();
-        auto lightingMethod = SceneUtil::LightManager::getLightingMethodFromString(Settings::Manager::getString("lighting method", "Shaders"));
+        auto lightingMethod = SceneUtil::LightManager::getLightingMethodFromString(
+            Settings::Manager::getString("lighting method", "Shaders"));
 
         resourceSystem->getSceneManager()->setParticleSystemMask(MWRender::Mask_ParticleSystem);
         // Shadows and radial fog have problems with fixed-function mode.
         bool forceShaders = Settings::Manager::getBool("radial fog", "Fog")
-                            || Settings::Manager::getBool("exponential fog", "Fog")
-                            || Settings::Manager::getBool("soft particles", "Shaders")
-                            || Settings::Manager::getBool("force shaders", "Shaders")
-                            || Settings::Manager::getBool("enable shadows", "Shadows")
-                            || lightingMethod != SceneUtil::LightingMethod::FFP
-                            || reverseZ
-                            || mSkyBlending
-                            || Stereo::getMultiview();
+            || Settings::Manager::getBool("exponential fog", "Fog")
+            || Settings::Manager::getBool("soft particles", "Shaders")
+            || Settings::Manager::getBool("force shaders", "Shaders")
+            || Settings::Manager::getBool("enable shadows", "Shadows")
+            || lightingMethod != SceneUtil::LightingMethod::FFP || reverseZ || mSkyBlending || Stereo::getMultiview();
         resourceSystem->getSceneManager()->setForceShaders(forceShaders);
 
         // FIXME: calling dummy method because terrain needs to know whether lighting is clamped
         resourceSystem->getSceneManager()->setClampLighting(Settings::Manager::getBool("clamp lighting", "Shaders"));
-        resourceSystem->getSceneManager()->setAutoUseNormalMaps(Settings::Manager::getBool("auto use object normal maps", "Shaders"));
-        resourceSystem->getSceneManager()->setNormalMapPattern(Settings::Manager::getString("normal map pattern", "Shaders"));
-        resourceSystem->getSceneManager()->setNormalHeightMapPattern(Settings::Manager::getString("normal height map pattern", "Shaders"));
-        resourceSystem->getSceneManager()->setAutoUseSpecularMaps(Settings::Manager::getBool("auto use object specular maps", "Shaders"));
-        resourceSystem->getSceneManager()->setSpecularMapPattern(Settings::Manager::getString("specular map pattern", "Shaders"));
-        resourceSystem->getSceneManager()->setApplyLightingToEnvMaps(Settings::Manager::getBool("apply lighting to environment maps", "Shaders"));
-        resourceSystem->getSceneManager()->setConvertAlphaTestToAlphaToCoverage(Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1);
-
-        // Let LightManager choose which backend to use based on our hint. For methods besides legacy lighting, this depends on support for various OpenGL extensions.
-        osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager(lightingMethod == SceneUtil::LightingMethod::FFP);
+        resourceSystem->getSceneManager()->setAutoUseNormalMaps(
+            Settings::Manager::getBool("auto use object normal maps", "Shaders"));
+        resourceSystem->getSceneManager()->setNormalMapPattern(
+            Settings::Manager::getString("normal map pattern", "Shaders"));
+        resourceSystem->getSceneManager()->setNormalHeightMapPattern(
+            Settings::Manager::getString("normal height map pattern", "Shaders"));
+        resourceSystem->getSceneManager()->setAutoUseSpecularMaps(
+            Settings::Manager::getBool("auto use object specular maps", "Shaders"));
+        resourceSystem->getSceneManager()->setSpecularMapPattern(
+            Settings::Manager::getString("specular map pattern", "Shaders"));
+        resourceSystem->getSceneManager()->setApplyLightingToEnvMaps(
+            Settings::Manager::getBool("apply lighting to environment maps", "Shaders"));
+        resourceSystem->getSceneManager()->setConvertAlphaTestToAlphaToCoverage(
+            Settings::Manager::getBool("antialias alpha test", "Shaders")
+            && Settings::Manager::getInt("antialiasing", "Video") > 1);
+
+        // Let LightManager choose which backend to use based on our hint. For methods besides legacy lighting, this
+        // depends on support for various OpenGL extensions.
+        osg::ref_ptr<SceneUtil::LightManager> sceneRoot
+            = new SceneUtil::LightManager(lightingMethod == SceneUtil::LightingMethod::FFP);
         resourceSystem->getSceneManager()->setLightingMethod(sceneRoot->getLightingMethod());
         resourceSystem->getSceneManager()->setSupportedLightingMethods(sceneRoot->getSupportedLightingMethods());
-        mMinimumAmbientLuminance = std::clamp(Settings::Manager::getFloat("minimum interior brightness", "Shaders"), 0.f, 1.f);
+        mMinimumAmbientLuminance
+            = std::clamp(Settings::Manager::getFloat("minimum interior brightness", "Shaders"), 0.f, 1.f);
 
         sceneRoot->setLightingMask(Mask_Lighting);
         mSceneRoot = sceneRoot;
@@ -436,22 +413,26 @@ namespace MWRender
 
         int indoorShadowCastingTraversalMask = shadowCastingTraversalMask;
         if (Settings::Manager::getBool("object shadows", "Shadows"))
-            shadowCastingTraversalMask |= (Mask_Object|Mask_Static);
+            shadowCastingTraversalMask |= (Mask_Object | Mask_Static);
         if (Settings::Manager::getBool("terrain shadows", "Shadows"))
             shadowCastingTraversalMask |= Mask_Terrain;
 
-        mShadowManager = std::make_unique<SceneUtil::ShadowManager>(sceneRoot, mRootNode, shadowCastingTraversalMask, indoorShadowCastingTraversalMask, Mask_Terrain|Mask_Object|Mask_Static, mResourceSystem->getSceneManager()->getShaderManager());
+        mShadowManager = std::make_unique<SceneUtil::ShadowManager>(sceneRoot, mRootNode, shadowCastingTraversalMask,
+            indoorShadowCastingTraversalMask, Mask_Terrain | Mask_Object | Mask_Static,
+            mResourceSystem->getSceneManager()->getShaderManager());
 
         Shader::ShaderManager::DefineMap shadowDefines = mShadowManager->getShadowDefines();
         Shader::ShaderManager::DefineMap lightDefines = sceneRoot->getLightDefines();
-        Shader::ShaderManager::DefineMap globalDefines = mResourceSystem->getSceneManager()->getShaderManager().getGlobalDefines();
+        Shader::ShaderManager::DefineMap globalDefines
+            = mResourceSystem->getSceneManager()->getShaderManager().getGlobalDefines();
 
         for (auto itr = shadowDefines.begin(); itr != shadowDefines.end(); itr++)
             globalDefines[itr->first] = itr->second;
 
         globalDefines["forcePPL"] = Settings::Manager::getBool("force per pixel lighting", "Shaders") ? "1" : "0";
         globalDefines["clamp"] = Settings::Manager::getBool("clamp lighting", "Shaders") ? "1" : "0";
-        globalDefines["preLightEnv"] = Settings::Manager::getBool("apply lighting to environment maps", "Shaders") ? "1" : "0";
+        globalDefines["preLightEnv"]
+            = Settings::Manager::getBool("apply lighting to environment maps", "Shaders") ? "1" : "0";
         bool exponentialFog = Settings::Manager::getBool("exponential fog", "Fog");
         globalDefines["radialFog"] = (exponentialFog || Settings::Manager::getBool("radial fog", "Fog")) ? "1" : "0";
         globalDefines["exponentialFog"] = exponentialFog ? "1" : "0";
@@ -469,18 +450,23 @@ namespace MWRender
         float groundcoverDistance = std::max(0.f, Settings::Manager::getFloat("rendering distance", "Groundcover"));
         globalDefines["groundcoverFadeStart"] = std::to_string(groundcoverDistance * 0.9f);
         globalDefines["groundcoverFadeEnd"] = std::to_string(groundcoverDistance);
-        globalDefines["groundcoverStompMode"] = std::to_string(std::clamp(Settings::Manager::getInt("stomp mode", "Groundcover"), 0, 2));
-        globalDefines["groundcoverStompIntensity"] = std::to_string(std::clamp(Settings::Manager::getInt("stomp intensity", "Groundcover"), 0, 2));
+        globalDefines["groundcoverStompMode"]
+            = std::to_string(std::clamp(Settings::Manager::getInt("stomp mode", "Groundcover"), 0, 2));
+        globalDefines["groundcoverStompIntensity"]
+            = std::to_string(std::clamp(Settings::Manager::getInt("stomp intensity", "Groundcover"), 0, 2));
 
         globalDefines["reverseZ"] = reverseZ ? "1" : "0";
 
         // It is unnecessary to stop/start the viewer as no frames are being rendered yet.
         mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(globalDefines);
 
-        mNavMesh = std::make_unique<NavMesh>(mRootNode, mWorkQueue, Settings::Manager::getBool("enable nav mesh render", "Navigator"),
-                                   parseNavMeshMode(Settings::Manager::getString("nav mesh render mode", "Navigator")));
-        mActorsPaths = std::make_unique<ActorsPaths>(mRootNode, Settings::Manager::getBool("enable agents paths render", "Navigator"));
-        mRecastMesh = std::make_unique<RecastMesh>(mRootNode, Settings::Manager::getBool("enable recast mesh render", "Navigator"));
+        mNavMesh = std::make_unique<NavMesh>(mRootNode, mWorkQueue,
+            Settings::Manager::getBool("enable nav mesh render", "Navigator"),
+            parseNavMeshMode(Settings::Manager::getString("nav mesh render mode", "Navigator")));
+        mActorsPaths = std::make_unique<ActorsPaths>(
+            mRootNode, Settings::Manager::getBool("enable agents paths render", "Navigator"));
+        mRecastMesh = std::make_unique<RecastMesh>(
+            mRootNode, Settings::Manager::getBool("enable recast mesh render", "Navigator"));
         mPathgrid = std::make_unique<Pathgrid>(mRootNode);
 
         mObjects = std::make_unique<Objects>(mResourceSystem, sceneRoot, unrefQueue);
@@ -488,10 +474,12 @@ namespace MWRender
         if (getenv("OPENMW_DONT_PRECOMPILE") == nullptr)
         {
             mViewer->setIncrementalCompileOperation(new osgUtil::IncrementalCompileOperation);
-            mViewer->getIncrementalCompileOperation()->setTargetFrameRate(Settings::Manager::getFloat("target framerate", "Cells"));
+            mViewer->getIncrementalCompileOperation()->setTargetFrameRate(
+                Settings::Manager::getFloat("target framerate", "Cells"));
         }
 
-        mDebugDraw = std::make_unique<Debug::DebugDrawer>(mResourceSystem->getSceneManager()->getShaderManager(), mRootNode);
+        mDebugDraw
+            = std::make_unique<Debug::DebugDrawer>(mResourceSystem->getSceneManager()->getShaderManager(), mRootNode);
         mResourceSystem->getSceneManager()->setIncrementalCompileOperation(mViewer->getIncrementalCompileOperation());
 
         mEffectManager = std::make_unique<EffectManager>(sceneRoot, mResourceSystem);
@@ -502,7 +490,8 @@ namespace MWRender
         const bool useTerrainNormalMaps = Settings::Manager::getBool("auto use terrain normal maps", "Shaders");
         const bool useTerrainSpecularMaps = Settings::Manager::getBool("auto use terrain specular maps", "Shaders");
 
-        mTerrainStorage = std::make_unique<TerrainStorage>(mResourceSystem, normalMapPattern, heightMapPattern, useTerrainNormalMaps, specularMapPattern, useTerrainSpecularMaps);
+        mTerrainStorage = std::make_unique<TerrainStorage>(mResourceSystem, normalMapPattern, heightMapPattern,
+            useTerrainNormalMaps, specularMapPattern, useTerrainSpecularMaps);
         const float lodFactor = Settings::Manager::getFloat("lod factor", "Terrain");
 
         bool groundcover = Settings::Manager::getBool("enabled", "Groundcover");
@@ -517,9 +506,9 @@ namespace MWRender
             float maxCompGeometrySize = Settings::Manager::getFloat("max composite geometry size", "Terrain");
             maxCompGeometrySize = std::max(maxCompGeometrySize, 1.f);
             bool debugChunks = Settings::Manager::getBool("debug chunks", "Terrain");
-            mTerrain = std::make_unique<Terrain::QuadTreeWorld>(
-                sceneRoot, mRootNode, mResourceSystem, mTerrainStorage.get(), Mask_Terrain, Mask_PreCompile, Mask_Debug,
-                compMapResolution, compMapLevel, lodFactor, vertexLodMod, maxCompGeometrySize, debugChunks);
+            mTerrain = std::make_unique<Terrain::QuadTreeWorld>(sceneRoot, mRootNode, mResourceSystem,
+                mTerrainStorage.get(), Mask_Terrain, Mask_PreCompile, Mask_Debug, compMapResolution, compMapLevel,
+                lodFactor, vertexLodMod, maxCompGeometrySize, debugChunks);
             if (Settings::Manager::getBool("object paging", "Terrain"))
             {
                 mObjectPaging = std::make_unique<ObjectPaging>(mResourceSystem->getSceneManager());
@@ -528,7 +517,8 @@ namespace MWRender
             }
         }
         else
-            mTerrain = std::make_unique<Terrain::TerrainGrid>(sceneRoot, mRootNode, mResourceSystem, mTerrainStorage.get(), Mask_Terrain, Mask_PreCompile, Mask_Debug);
+            mTerrain = std::make_unique<Terrain::TerrainGrid>(sceneRoot, mRootNode, mResourceSystem,
+                mTerrainStorage.get(), Mask_Terrain, Mask_PreCompile, Mask_Debug);
 
         mTerrain->setTargetFrameRate(Settings::Manager::getFloat("target framerate", "Cells"));
 
@@ -537,7 +527,8 @@ namespace MWRender
             float density = Settings::Manager::getFloat("density", "Groundcover");
             density = std::clamp(density, 0.f, 1.f);
 
-            mGroundcover = std::make_unique<Groundcover>(mResourceSystem->getSceneManager(), density, groundcoverDistance, groundcoverStore);
+            mGroundcover = std::make_unique<Groundcover>(
+                mResourceSystem->getSceneManager(), density, groundcoverDistance, groundcoverStore);
             static_cast<Terrain::QuadTreeWorld*>(mTerrain.get())->addChunkManager(mGroundcover.get());
             mResourceSystem->addResourceManager(mGroundcover.get());
         }
@@ -552,16 +543,20 @@ namespace MWRender
         rootNode->addCullCallback(mPerViewUniformStateUpdater);
 
         mPostProcessor = new PostProcessor(*this, viewer, mRootNode, resourceSystem->getVFS());
-        resourceSystem->getSceneManager()->setOpaqueDepthTex(mPostProcessor->getTexture(PostProcessor::Tex_OpaqueDepth, 0), mPostProcessor->getTexture(PostProcessor::Tex_OpaqueDepth, 1));
+        resourceSystem->getSceneManager()->setOpaqueDepthTex(
+            mPostProcessor->getTexture(PostProcessor::Tex_OpaqueDepth, 0),
+            mPostProcessor->getTexture(PostProcessor::Tex_OpaqueDepth, 1));
         resourceSystem->getSceneManager()->setSoftParticles(mPostProcessor->softParticlesEnabled());
         resourceSystem->getSceneManager()->setSupportsNormalsRT(mPostProcessor->getSupportsNormalsRT());
 
         // water goes after terrain for correct waterculling order
-        mWater = std::make_unique<Water>(sceneRoot->getParent(0), sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), resourcePath);
+        mWater = std::make_unique<Water>(sceneRoot->getParent(0), sceneRoot, mResourceSystem,
+            mViewer->getIncrementalCompileOperation(), resourcePath);
 
         mCamera = std::make_unique<Camera>(mViewer->getCamera());
 
-        mScreenshotManager = std::make_unique<ScreenshotManager>(viewer, mRootNode, sceneRoot, mResourceSystem, mWater.get());
+        mScreenshotManager
+            = std::make_unique<ScreenshotManager>(viewer, mRootNode, sceneRoot, mResourceSystem, mWater.get());
 
         mViewer->setLightingMode(osgViewer::View::NO_LIGHT);
 
@@ -569,9 +564,9 @@ namespace MWRender
         source->setNodeMask(Mask_Lighting);
         mSunLight = new osg::Light;
         source->setLight(mSunLight);
-        mSunLight->setDiffuse(osg::Vec4f(0,0,0,1));
-        mSunLight->setAmbient(osg::Vec4f(0,0,0,1));
-        mSunLight->setSpecular(osg::Vec4f(0,0,0,0));
+        mSunLight->setDiffuse(osg::Vec4f(0, 0, 0, 1));
+        mSunLight->setAmbient(osg::Vec4f(0, 0, 0, 1));
+        mSunLight->setSpecular(osg::Vec4f(0, 0, 0, 0));
         mSunLight->setConstantAttenuation(1.f);
         sceneRoot->setSunlight(mSunLight);
         sceneRoot->addChild(source);
@@ -579,10 +574,10 @@ namespace MWRender
         sceneRoot->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::ON);
         sceneRoot->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::ON);
         sceneRoot->getOrCreateStateSet()->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
-        osg::ref_ptr<osg::Material> defaultMat (new osg::Material);
+        osg::ref_ptr<osg::Material> defaultMat(new osg::Material);
         defaultMat->setColorMode(osg::Material::OFF);
-        defaultMat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
-        defaultMat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
+        defaultMat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1, 1, 1, 1));
+        defaultMat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1, 1, 1, 1));
         defaultMat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
         sceneRoot->getOrCreateStateSet()->setAttribute(defaultMat);
         sceneRoot->getOrCreateStateSet()->addUniform(new osg::Uniform("emissiveMult", 1.f));
@@ -594,20 +589,22 @@ namespace MWRender
         mSky->setCamera(mViewer->getCamera());
         if (mSkyBlending)
         {
-            int skyTextureUnit = mResourceSystem->getSceneManager()->getShaderManager().reserveGlobalTextureUnits(Shader::ShaderManager::Slot::SkyTexture);
+            int skyTextureUnit = mResourceSystem->getSceneManager()->getShaderManager().reserveGlobalTextureUnits(
+                Shader::ShaderManager::Slot::SkyTexture);
             Log(Debug::Info) << "Reserving texture unit for sky RTT: " << skyTextureUnit;
             mPerViewUniformStateUpdater->enableSkyRTT(skyTextureUnit, mSky->getSkyRTT());
         }
 
         source->setStateSetModes(*mRootNode->getOrCreateStateSet(), osg::StateAttribute::ON);
 
-        osg::Camera::CullingMode cullingMode = osg::Camera::DEFAULT_CULLING|osg::Camera::FAR_PLANE_CULLING;
+        osg::Camera::CullingMode cullingMode = osg::Camera::DEFAULT_CULLING | osg::Camera::FAR_PLANE_CULLING;
 
         if (!Settings::Manager::getBool("small feature culling", "Camera"))
             cullingMode &= ~(osg::CullStack::SMALL_FEATURE_CULLING);
         else
         {
-            mViewer->getCamera()->setSmallFeatureCullingPixelSize(Settings::Manager::getFloat("small feature culling pixel size", "Camera"));
+            mViewer->getCamera()->setSmallFeatureCullingPixelSize(
+                Settings::Manager::getFloat("small feature culling pixel size", "Camera"));
             cullingMode |= osg::CullStack::SMALL_FEATURE_CULLING;
         }
 
@@ -625,19 +622,20 @@ namespace MWRender
 
         // Hopefully, anything genuinely requiring the default alpha func of GL_ALWAYS explicitly sets it
         mRootNode->getOrCreateStateSet()->setAttribute(Shader::RemovedAlphaFunc::getInstance(GL_ALWAYS));
-        // The transparent renderbin sets alpha testing on because that was faster on old GPUs. It's now slower and breaks things.
+        // The transparent renderbin sets alpha testing on because that was faster on old GPUs. It's now slower and
+        // breaks things.
         mRootNode->getOrCreateStateSet()->setMode(GL_ALPHA_TEST, osg::StateAttribute::OFF);
 
         if (reverseZ)
         {
-            osg::ref_ptr<osg::ClipControl> clipcontrol = new osg::ClipControl(osg::ClipControl::LOWER_LEFT, osg::ClipControl::ZERO_TO_ONE);
+            osg::ref_ptr<osg::ClipControl> clipcontrol
+                = new osg::ClipControl(osg::ClipControl::LOWER_LEFT, osg::ClipControl::ZERO_TO_ONE);
             mRootNode->getOrCreateStateSet()->setAttributeAndModes(new SceneUtil::AutoDepth, osg::StateAttribute::ON);
             mRootNode->getOrCreateStateSet()->setAttributeAndModes(clipcontrol, osg::StateAttribute::ON);
         }
 
         SceneUtil::setCameraClearDepth(mViewer->getCamera());
 
-
         updateProjectionMatrix();
 
         mViewer->getCamera()->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
@@ -676,7 +674,7 @@ namespace MWRender
 
     void RenderingManager::preloadCommonAssets()
     {
-        osg::ref_ptr<PreloadCommonAssetsWorkItem> workItem (new PreloadCommonAssetsWorkItem(mResourceSystem));
+        osg::ref_ptr<PreloadCommonAssetsWorkItem> workItem(new PreloadCommonAssetsWorkItem(mResourceSystem));
         mSky->listAssetsToPreload(workItem->mModels, workItem->mTextures);
         mWater->listAssetsToPreload(workItem->mTextures);
 
@@ -714,7 +712,7 @@ namespace MWRender
         }
     }
 
-    void RenderingManager::setAmbientColour(const osg::Vec4f &colour)
+    void RenderingManager::setAmbientColour(const osg::Vec4f& colour)
     {
         mAmbientColor = colour;
         updateAmbient();
@@ -740,7 +738,7 @@ namespace MWRender
         mSky->setMoonColour(red);
     }
 
-    void RenderingManager::configureAmbient(const ESM::Cell *cell)
+    void RenderingManager::configureAmbient(const ESM::Cell* cell)
     {
         bool isInterior = !cell->isExterior() && !(cell->mData.mFlags & ESM::Cell::QuasiEx);
         bool needsAdjusting = false;
@@ -756,12 +754,14 @@ namespace MWRender
             constexpr float pB = 0.0722;
 
             // we already work in linear RGB so no conversions are needed for the luminosity function
-            float relativeLuminance = pR*ambient.r() + pG*ambient.g() + pB*ambient.b();
+            float relativeLuminance = pR * ambient.r() + pG * ambient.g() + pB * ambient.b();
             if (relativeLuminance < mMinimumAmbientLuminance)
             {
-                // brighten ambient so it reaches the minimum threshold but no more, we want to mess with content data as least we can
+                // brighten ambient so it reaches the minimum threshold but no more, we want to mess with content data
+                // as least we can
                 if (ambient.r() == 0.f && ambient.g() == 0.f && ambient.b() == 0.f)
-                    ambient = osg::Vec4(mMinimumAmbientLuminance, mMinimumAmbientLuminance, mMinimumAmbientLuminance, ambient.a());
+                    ambient = osg::Vec4(
+                        mMinimumAmbientLuminance, mMinimumAmbientLuminance, mMinimumAmbientLuminance, ambient.a());
                 else
                     ambient *= mMinimumAmbientLuminance / relativeLuminance;
             }
@@ -785,7 +785,7 @@ namespace MWRender
         mPostProcessor->getStateUpdater()->setSunVis(sunVis);
     }
 
-    void RenderingManager::setSunDirection(const osg::Vec3f &direction)
+    void RenderingManager::setSunDirection(const osg::Vec3f& direction)
     {
         osg::Vec3 position = direction * -1;
         // need to wrap this in a StateUpdater?
@@ -796,7 +796,7 @@ namespace MWRender
         mPostProcessor->getStateUpdater()->setSunPos(mSunLight->getPosition(), mNight);
     }
 
-    void RenderingManager::addCell(const MWWorld::CellStore *store)
+    void RenderingManager::addCell(const MWWorld::CellStore* store)
     {
         mPathgrid->addCell(store);
 
@@ -807,7 +807,7 @@ namespace MWRender
             mTerrain->loadCell(store->getCell()->getGridX(), store->getCell()->getGridY());
         }
     }
-    void RenderingManager::removeCell(const MWWorld::CellStore *store)
+    void RenderingManager::removeCell(const MWWorld::CellStore* store)
     {
         mPathgrid->removeCell(store);
         mActorsPaths->removeCell(store);
@@ -863,7 +863,7 @@ namespace MWRender
         {
             const auto wm = MWBase::Environment::get().getWindowManager();
             unsigned int mask = wm->getCullMask();
-            bool enabled = !(mask&sToggleWorldMask);
+            bool enabled = !(mask & sToggleWorldMask);
             if (enabled)
                 mask |= sToggleWorldMask;
             else
@@ -887,12 +887,13 @@ namespace MWRender
         return false;
     }
 
-    void RenderingManager::configureFog(const ESM::Cell *cell)
+    void RenderingManager::configureFog(const ESM::Cell* cell)
     {
         mFog->configure(mViewDistance, cell);
     }
 
-    void RenderingManager::configureFog(float fogDepth, float underwaterFog, float dlFactor, float dlOffset, const osg::Vec4f &color)
+    void RenderingManager::configureFog(
+        float fogDepth, float underwaterFog, float dlFactor, float dlOffset, const osg::Vec4f& color)
     {
         mFog->configure(mViewDistance, fogDepth, underwaterFog, dlFactor, dlOffset, color);
     }
@@ -960,9 +961,9 @@ namespace MWRender
         mPostProcessor->setUnderwaterFlag(isUnderwater);
     }
 
-    void RenderingManager::updatePlayerPtr(const MWWorld::Ptr &ptr)
+    void RenderingManager::updatePlayerPtr(const MWWorld::Ptr& ptr)
     {
-        if(mPlayerAnimation.get())
+        if (mPlayerAnimation.get())
         {
             setupPlayer(ptr);
             mPlayerAnimation->updatePtr(ptr);
@@ -970,15 +971,14 @@ namespace MWRender
         mCamera->attachTo(ptr);
     }
 
-    void RenderingManager::removePlayer(const MWWorld::Ptr &player)
+    void RenderingManager::removePlayer(const MWWorld::Ptr& player)
     {
         mWater->removeEmitter(player);
     }
 
-    void RenderingManager::rotateObject(const MWWorld::Ptr &ptr, const osg::Quat& rot)
+    void RenderingManager::rotateObject(const MWWorld::Ptr& ptr, const osg::Quat& rot)
     {
-        if(ptr == mCamera->getTrackingPtr() &&
-           !mCamera->isVanityOrPreviewModeEnabled())
+        if (ptr == mCamera->getTrackingPtr() && !mCamera->isVanityOrPreviewModeEnabled())
         {
             mCamera->rotateCameraToTrackingPtr();
         }
@@ -986,12 +986,12 @@ namespace MWRender
         ptr.getRefData().getBaseNode()->setAttitude(rot);
     }
 
-    void RenderingManager::moveObject(const MWWorld::Ptr &ptr, const osg::Vec3f &pos)
+    void RenderingManager::moveObject(const MWWorld::Ptr& ptr, const osg::Vec3f& pos)
     {
         ptr.getRefData().getBaseNode()->setPosition(pos);
     }
 
-    void RenderingManager::scaleObject(const MWWorld::Ptr &ptr, const osg::Vec3f &scale)
+    void RenderingManager::scaleObject(const MWWorld::Ptr& ptr, const osg::Vec3f& scale)
     {
         ptr.getRefData().getBaseNode()->setScale(scale);
 
@@ -999,7 +999,7 @@ namespace MWRender
             mCamera->processViewChange();
     }
 
-    void RenderingManager::removeObject(const MWWorld::Ptr &ptr)
+    void RenderingManager::removeObject(const MWWorld::Ptr& ptr)
     {
         mActorsPaths->remove(ptr);
         mObjects->removeObject(ptr);
@@ -1041,12 +1041,13 @@ namespace MWRender
         return true;
     }
 
-    osg::Vec4f RenderingManager::getScreenBounds(const osg::BoundingBox &worldbb)
+    osg::Vec4f RenderingManager::getScreenBounds(const osg::BoundingBox& worldbb)
     {
-        if (!worldbb.valid()) return osg::Vec4f();
+        if (!worldbb.valid())
+            return osg::Vec4f();
         osg::Matrix viewProj = mViewer->getCamera()->getViewMatrix() * mViewer->getCamera()->getProjectionMatrix();
         float min_x = 1.0f, max_x = 0.0f, min_y = 1.0f, max_y = 0.0f;
-        for (int i=0; i<8; ++i)
+        for (int i = 0; i < 8; ++i)
         {
             osg::Vec3f corner = worldbb.corner(i);
             corner = corner * viewProj;
@@ -1055,22 +1056,22 @@ namespace MWRender
             float y = (corner.y() - 1.f) * (-0.5f);
 
             if (x < min_x)
-            min_x = x;
+                min_x = x;
 
             if (x > max_x)
-            max_x = x;
+                max_x = x;
 
             if (y < min_y)
-            min_y = y;
+                min_y = y;
 
             if (y > max_y)
-            max_y = y;
+                max_y = y;
         }
 
         return osg::Vec4f(min_x, min_y, max_x, max_y);
     }
 
-    RenderingManager::RayResult getIntersectionResult (osgUtil::LineSegmentIntersector* intersector)
+    RenderingManager::RayResult getIntersectionResult(osgUtil::LineSegmentIntersector* intersector)
     {
         RenderingManager::RayResult result;
         result.mHit = false;
@@ -1087,12 +1088,13 @@ namespace MWRender
 
             PtrHolder* ptrHolder = nullptr;
             std::vector<RefnumMarker*> refnumMarkers;
-            for (osg::NodePath::const_iterator it = intersection.nodePath.begin(); it != intersection.nodePath.end(); ++it)
+            for (osg::NodePath::const_iterator it = intersection.nodePath.begin(); it != intersection.nodePath.end();
+                 ++it)
             {
                 osg::UserDataContainer* userDataContainer = (*it)->getUserDataContainer();
                 if (!userDataContainer)
                     continue;
-                for (unsigned int i=0; i<userDataContainer->getNumUserObjects(); ++i)
+                for (unsigned int i = 0; i < userDataContainer->getNumUserObjects(); ++i)
                 {
                     if (PtrHolder* p = dynamic_cast<PtrHolder*>(userDataContainer->getUserObject(i)))
                         ptrHolder = p;
@@ -1105,10 +1107,12 @@ namespace MWRender
                 result.mHitObject = ptrHolder->mPtr;
 
             unsigned int vertexCounter = 0;
-            for (unsigned int i=0; i<refnumMarkers.size(); ++i)
+            for (unsigned int i = 0; i < refnumMarkers.size(); ++i)
             {
                 unsigned int intersectionIndex = intersection.indexList.empty() ? 0 : intersection.indexList[0];
-                if (!refnumMarkers[i]->mNumVertices || (intersectionIndex >= vertexCounter && intersectionIndex < vertexCounter + refnumMarkers[i]->mNumVertices))
+                if (!refnumMarkers[i]->mNumVertices
+                    || (intersectionIndex >= vertexCounter
+                        && intersectionIndex < vertexCounter + refnumMarkers[i]->mNumVertices))
                 {
                     result.mHitRefnum = refnumMarkers[i]->mRefnum;
                     break;
@@ -1118,10 +1122,10 @@ namespace MWRender
         }
 
         return result;
-
     }
 
-    osg::ref_ptr<osgUtil::IntersectionVisitor> RenderingManager::getIntersectionVisitor(osgUtil::Intersector *intersector, bool ignorePlayer, bool ignoreActors)
+    osg::ref_ptr<osgUtil::IntersectionVisitor> RenderingManager::getIntersectionVisitor(
+        osgUtil::Intersector* intersector, bool ignorePlayer, bool ignoreActors)
     {
         if (!mIntersectionVisitor)
             mIntersectionVisitor = new osgUtil::IntersectionVisitor;
@@ -1131,20 +1135,22 @@ namespace MWRender
         mIntersectionVisitor->setIntersector(intersector);
 
         unsigned int mask = ~0u;
-        mask &= ~(Mask_RenderToTexture|Mask_Sky|Mask_Debug|Mask_Effect|Mask_Water|Mask_SimpleWater|Mask_Groundcover);
+        mask &= ~(Mask_RenderToTexture | Mask_Sky | Mask_Debug | Mask_Effect | Mask_Water | Mask_SimpleWater
+            | Mask_Groundcover);
         if (ignorePlayer)
             mask &= ~(Mask_Player);
         if (ignoreActors)
-            mask &= ~(Mask_Actor|Mask_Player);
+            mask &= ~(Mask_Actor | Mask_Player);
 
         mIntersectionVisitor->setTraversalMask(mask);
         return mIntersectionVisitor;
     }
 
-    RenderingManager::RayResult RenderingManager::castRay(const osg::Vec3f& origin, const osg::Vec3f& dest, bool ignorePlayer, bool ignoreActors)
+    RenderingManager::RayResult RenderingManager::castRay(
+        const osg::Vec3f& origin, const osg::Vec3f& dest, bool ignorePlayer, bool ignoreActors)
     {
-        osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector (new osgUtil::LineSegmentIntersector(osgUtil::LineSegmentIntersector::MODEL,
-            origin, dest));
+        osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector(
+            new osgUtil::LineSegmentIntersector(osgUtil::LineSegmentIntersector::MODEL, origin, dest));
         intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::LIMIT_NEAREST);
 
         mRootNode->accept(*getIntersectionVisitor(intersector, ignorePlayer, ignoreActors));
@@ -1152,12 +1158,13 @@ namespace MWRender
         return getIntersectionResult(intersector);
     }
 
-    RenderingManager::RayResult RenderingManager::castCameraToViewportRay(const float nX, const float nY, float maxDistance, bool ignorePlayer, bool ignoreActors)
+    RenderingManager::RayResult RenderingManager::castCameraToViewportRay(
+        const float nX, const float nY, float maxDistance, bool ignorePlayer, bool ignoreActors)
     {
-        osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector (new osgUtil::LineSegmentIntersector(osgUtil::LineSegmentIntersector::PROJECTION,
-                                                                                                       nX * 2.f - 1.f, nY * (-2.f) + 1.f));
+        osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector(new osgUtil::LineSegmentIntersector(
+            osgUtil::LineSegmentIntersector::PROJECTION, nX * 2.f - 1.f, nY * (-2.f) + 1.f));
 
-        osg::Vec3d dist (0.f, 0.f, -maxDistance);
+        osg::Vec3d dist(0.f, 0.f, -maxDistance);
 
         dist = dist * mViewer->getCamera()->getProjectionMatrix();
 
@@ -1171,13 +1178,14 @@ namespace MWRender
         return getIntersectionResult(intersector);
     }
 
-    void RenderingManager::updatePtr(const MWWorld::Ptr &old, const MWWorld::Ptr &updated)
+    void RenderingManager::updatePtr(const MWWorld::Ptr& old, const MWWorld::Ptr& updated)
     {
         mObjects->updatePtr(old, updated);
         mActorsPaths->updatePtr(old, updated);
     }
 
-    void RenderingManager::spawnEffect(const std::string& model, std::string_view texture, const osg::Vec3f& worldPosition, float scale, bool isMagicVFX)
+    void RenderingManager::spawnEffect(const std::string& model, std::string_view texture,
+        const osg::Vec3f& worldPosition, float scale, bool isMagicVFX)
     {
         mEffectManager->addEffect(model, texture, worldPosition, scale, isMagicVFX);
     }
@@ -1197,7 +1205,7 @@ namespace MWRender
             mObjectPaging->clear();
     }
 
-    MWRender::Animation* RenderingManager::getAnimation(const MWWorld::Ptr &ptr)
+    MWRender::Animation* RenderingManager::getAnimation(const MWWorld::Ptr& ptr)
     {
         if (mPlayerAnimation.get() && ptr == mPlayerAnimation->getPtr())
             return mPlayerAnimation.get();
@@ -1205,7 +1213,7 @@ namespace MWRender
         return mObjects->getAnimation(ptr);
     }
 
-    const MWRender::Animation* RenderingManager::getAnimation(const MWWorld::ConstPtr &ptr) const
+    const MWRender::Animation* RenderingManager::getAnimation(const MWWorld::ConstPtr& ptr) const
     {
         if (mPlayerAnimation.get() && ptr == mPlayerAnimation->getPtr())
             return mPlayerAnimation.get();
@@ -1218,7 +1226,7 @@ namespace MWRender
         return mPostProcessor;
     }
 
-    void RenderingManager::setupPlayer(const MWWorld::Ptr &player)
+    void RenderingManager::setupPlayer(const MWWorld::Ptr& player)
     {
         if (!mPlayerNode)
         {
@@ -1237,26 +1245,26 @@ namespace MWRender
         mWater->addEmitter(player);
     }
 
-    void RenderingManager::renderPlayer(const MWWorld::Ptr &player)
+    void RenderingManager::renderPlayer(const MWWorld::Ptr& player)
     {
-        mPlayerAnimation = new NpcAnimation(player, player.getRefData().getBaseNode(), mResourceSystem, 0, NpcAnimation::VM_Normal,
-                                                mFirstPersonFieldOfView);
+        mPlayerAnimation = new NpcAnimation(player, player.getRefData().getBaseNode(), mResourceSystem, 0,
+            NpcAnimation::VM_Normal, mFirstPersonFieldOfView);
 
         mCamera->setAnimation(mPlayerAnimation.get());
         mCamera->attachTo(player);
     }
 
-    void RenderingManager::rebuildPtr(const MWWorld::Ptr &ptr)
+    void RenderingManager::rebuildPtr(const MWWorld::Ptr& ptr)
     {
-        NpcAnimation *anim = nullptr;
-        if(ptr == mPlayerAnimation->getPtr())
+        NpcAnimation* anim = nullptr;
+        if (ptr == mPlayerAnimation->getPtr())
             anim = mPlayerAnimation.get();
         else
             anim = dynamic_cast<NpcAnimation*>(mObjects->getAnimation(ptr));
-        if(anim)
+        if (anim)
         {
             anim->rebuild();
-            if(mCamera->getTrackingPtr() == ptr)
+            if (mCamera->getTrackingPtr() == ptr)
             {
                 mCamera->attachTo(ptr);
                 mCamera->setAnimation(anim);
@@ -1264,17 +1272,17 @@ namespace MWRender
         }
     }
 
-    void RenderingManager::addWaterRippleEmitter(const MWWorld::Ptr &ptr)
+    void RenderingManager::addWaterRippleEmitter(const MWWorld::Ptr& ptr)
     {
         mWater->addEmitter(ptr);
     }
 
-    void RenderingManager::removeWaterRippleEmitter(const MWWorld::Ptr &ptr)
+    void RenderingManager::removeWaterRippleEmitter(const MWWorld::Ptr& ptr)
     {
         mWater->removeEmitter(ptr);
     }
 
-    void RenderingManager::emitWaterRipple(const osg::Vec3f &pos)
+    void RenderingManager::emitWaterRipple(const osg::Vec3f& pos)
     {
         mWater->emitRipple(pos);
     }
@@ -1299,7 +1307,8 @@ namespace MWRender
         if (SceneUtil::AutoDepth::isReversed())
         {
             mSharedUniformStateUpdater->setLinearFac(-mNearClip / (mViewDistance - mNearClip) - 1.f);
-            mPerViewUniformStateUpdater->setProjectionMatrix(SceneUtil::getReversedZProjectionMatrixAsPerspective(fov, aspect, mNearClip, mViewDistance));
+            mPerViewUniformStateUpdater->setProjectionMatrix(
+                SceneUtil::getReversedZProjectionMatrixAsPerspective(fov, aspect, mNearClip, mViewDistance));
         }
         else
             mPerViewUniformStateUpdater->setProjectionMatrix(mViewer->getCamera()->getProjectionMatrix());
@@ -1317,10 +1326,10 @@ namespace MWRender
             mSharedUniformStateUpdater->setScreenRes(width, height);
         }
 
-        // Since our fog is not radial yet, we should take FOV in account, otherwise terrain near viewing distance may disappear.
-        // Limit FOV here just for sure, otherwise viewing distance can be too high.
-        float distanceMult = std::cos(osg::DegreesToRadians(std::min(fov, 140.f))/2.f);
-        mTerrain->setViewDistance(mViewDistance * (distanceMult ? 1.f/distanceMult : 1.f));
+        // Since our fog is not radial yet, we should take FOV in account, otherwise terrain near viewing distance may
+        // disappear. Limit FOV here just for sure, otherwise viewing distance can be too high.
+        float distanceMult = std::cos(osg::DegreesToRadians(std::min(fov, 140.f)) / 2.f);
+        mTerrain->setViewDistance(mViewDistance * (distanceMult ? 1.f / distanceMult : 1.f));
 
         if (mPostProcessor)
         {
@@ -1342,8 +1351,7 @@ namespace MWRender
             Settings::Manager::getString("texture mag filter", "General"),
             Settings::Manager::getString("texture min filter", "General"),
             Settings::Manager::getString("texture mipmap", "General"),
-            Settings::Manager::getInt("anisotropy", "General")
-        );
+            Settings::Manager::getInt("anisotropy", "General"));
 
         mTerrain->updateTextureFiltering();
         mWater->processChangedSettings({});
@@ -1361,7 +1369,7 @@ namespace MWRender
         mStateUpdater->setAmbientColor(color);
     }
 
-    void RenderingManager::setFogColor(const osg::Vec4f &color)
+    void RenderingManager::setFogColor(const osg::Vec4f& color)
     {
         mViewer->getCamera()->setClearColor(color);
 
@@ -1378,7 +1386,7 @@ namespace MWRender
         }
     }
 
-    void RenderingManager::processChangedSettings(const Settings::CategorySettingVector &changed)
+    void RenderingManager::processChangedSettings(const Settings::CategorySettingVector& changed)
     {
         // Only perform a projection matrix update once if a relevant setting is changed.
         bool updateProjection = false;
@@ -1398,9 +1406,8 @@ namespace MWRender
             {
                 setViewDistance(Settings::Manager::getFloat("viewing distance", "Camera"));
             }
-            else if (it->first == "General" && (it->second == "texture filter" ||
-                                                it->second == "texture mipmap" ||
-                                                it->second == "anisotropy"))
+            else if (it->first == "General"
+                && (it->second == "texture filter" || it->second == "texture mipmap" || it->second == "anisotropy"))
             {
                 updateTextureFiltering();
             }
@@ -1410,14 +1417,14 @@ namespace MWRender
             }
             else if (it->first == "Shaders" && it->second == "minimum interior brightness")
             {
-                mMinimumAmbientLuminance = std::clamp(Settings::Manager::getFloat("minimum interior brightness", "Shaders"), 0.f, 1.f);
+                mMinimumAmbientLuminance
+                    = std::clamp(Settings::Manager::getFloat("minimum interior brightness", "Shaders"), 0.f, 1.f);
                 if (MWMechanics::getPlayer().isInCell())
                     configureAmbient(MWMechanics::getPlayer().getCell()->getCell());
             }
-            else if (it->first == "Shaders" && (it->second == "light bounds multiplier" ||
-                                                it->second == "maximum light distance" ||
-                                                it->second == "light fade start" ||
-                                                it->second == "max lights"))
+            else if (it->first == "Shaders"
+                && (it->second == "light bounds multiplier" || it->second == "maximum light distance"
+                    || it->second == "light fade start" || it->second == "max lights"))
             {
                 auto* lightManager = getLightRoot();
                 lightManager->processChangedSettings(changed);
@@ -1470,7 +1477,7 @@ namespace MWRender
         updateProjectionMatrix();
     }
 
-    float RenderingManager::getTerrainHeightAt(const osg::Vec3f &pos)
+    float RenderingManager::getTerrainHeightAt(const osg::Vec3f& pos)
     {
         return mTerrain->getHeightAt(pos);
     }
@@ -1505,7 +1512,7 @@ namespace MWRender
 
         osg::ref_ptr<const osg::Node> node = mResourceSystem->getSceneManager()->getTemplate(modelName);
         osg::ComputeBoundsVisitor computeBoundsVisitor;
-        computeBoundsVisitor.setTraversalMask(~(MWRender::Mask_ParticleSystem|MWRender::Mask_Effect));
+        computeBoundsVisitor.setTraversalMask(~(MWRender::Mask_ParticleSystem | MWRender::Mask_Effect));
         const_cast<osg::Node*>(node.get())->accept(computeBoundsVisitor);
         osg::BoundingBox bounds = computeBoundsVisitor.getBoundingBox();
 
@@ -1528,7 +1535,8 @@ namespace MWRender
             updateProjectionMatrix();
         }
     }
-    void RenderingManager::exportSceneGraph(const MWWorld::Ptr &ptr, const std::filesystem::path& filename, const std::string &format)
+    void RenderingManager::exportSceneGraph(
+        const MWWorld::Ptr& ptr, const std::filesystem::path& filename, const std::string& format)
     {
         osg::Node* node = mViewer->getSceneData();
         if (!ptr.isEmpty())
@@ -1537,7 +1545,7 @@ namespace MWRender
         SceneUtil::writeScene(node, filename, format);
     }
 
-    LandManager *RenderingManager::getLandManager() const
+    LandManager* RenderingManager::getLandManager() const
     {
         return mTerrainStorage->getLandManager();
     }
@@ -1593,7 +1601,7 @@ namespace MWRender
         mRecastMesh->update(mNavigator.getRecastMeshTiles(), mNavigator.getSettings());
     }
 
-    void RenderingManager::setActiveGrid(const osg::Vec4i &grid)
+    void RenderingManager::setActiveGrid(const osg::Vec4i& grid)
     {
         mTerrain->setActiveGrid(grid);
     }
@@ -1601,20 +1609,23 @@ namespace MWRender
     {
         if (!ptr.isInCell() || !ptr.getCell()->isExterior() || !mObjectPaging)
             return false;
-        if (mObjectPaging->enableObject(type, ptr.getCellRef().getRefNum(), ptr.getCellRef().getPosition().asVec3(), osg::Vec2i(ptr.getCell()->getCell()->getGridX(), ptr.getCell()->getCell()->getGridY()), enabled))
+        if (mObjectPaging->enableObject(type, ptr.getCellRef().getRefNum(), ptr.getCellRef().getPosition().asVec3(),
+                osg::Vec2i(ptr.getCell()->getCell()->getGridX(), ptr.getCell()->getCell()->getGridY()), enabled))
         {
             mTerrain->rebuildViews();
             return true;
         }
         return false;
     }
-    void RenderingManager::pagingBlacklistObject(int type, const MWWorld::ConstPtr &ptr)
+    void RenderingManager::pagingBlacklistObject(int type, const MWWorld::ConstPtr& ptr)
     {
         if (!ptr.isInCell() || !ptr.getCell()->isExterior() || !mObjectPaging)
             return;
-        const ESM::RefNum & refnum = ptr.getCellRef().getRefNum();
-        if (!refnum.hasContentFile()) return;
-        if (mObjectPaging->blacklistObject(type, refnum, ptr.getCellRef().getPosition().asVec3(), osg::Vec2i(ptr.getCell()->getCell()->getGridX(), ptr.getCell()->getCell()->getGridY())))
+        const ESM::RefNum& refnum = ptr.getCellRef().getRefNum();
+        if (!refnum.hasContentFile())
+            return;
+        if (mObjectPaging->blacklistObject(type, refnum, ptr.getCellRef().getPosition().asVec3(),
+                osg::Vec2i(ptr.getCell()->getCell()->getGridX(), ptr.getCell()->getCell()->getGridY())))
             mTerrain->rebuildViews();
     }
     bool RenderingManager::pagingUnlockCache()
@@ -1626,7 +1637,7 @@ namespace MWRender
         }
         return false;
     }
-    void RenderingManager::getPagedRefnums(const osg::Vec4i &activeGrid, std::vector<ESM::RefNum>& out)
+    void RenderingManager::getPagedRefnums(const osg::Vec4i& activeGrid, std::vector<ESM::RefNum>& out)
     {
         if (mObjectPaging)
             mObjectPaging->getPagedRefnums(activeGrid, out);
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index eea96d0329..ff1d96adcc 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -1,16 +1,16 @@
 #ifndef OPENMW_MWRENDER_RENDERINGMANAGER_H
 #define OPENMW_MWRENDER_RENDERINGMANAGER_H
 
-#include <osg/ref_ptr>
-#include <osg/Light>
 #include <osg/Camera>
+#include <osg/Light>
+#include <osg/ref_ptr>
 
 #include <components/settings/settings.hpp>
 
 #include <osgUtil/IncrementalCompileOperation>
 
-#include "objects.hpp"
 #include "navmeshmode.hpp"
+#include "objects.hpp"
 #include "renderinginterface.hpp"
 #include "rendermode.hpp"
 
@@ -107,9 +107,9 @@ namespace MWRender
     {
     public:
         RenderingManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode,
-            Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue, const std::filesystem::path& resourcePath,
-            DetourNavigator::Navigator& navigator, const MWWorld::GroundcoverStore& groundcoverStore,
-            SceneUtil::UnrefQueue& unrefQueue);
+            Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
+            const std::filesystem::path& resourcePath, DetourNavigator::Navigator& navigator,
+            const MWWorld::GroundcoverStore& groundcoverStore, SceneUtil::UnrefQueue& unrefQueue);
         ~RenderingManager();
 
         osgUtil::IncrementalCompileOperation* getIncrementalCompileOperation();
@@ -142,7 +142,8 @@ namespace MWRender
 
         void configureAmbient(const ESM::Cell* cell);
         void configureFog(const ESM::Cell* cell);
-        void configureFog(float fogDepth, float underwaterFog, float dlFactor, float dlOffset, const osg::Vec4f& colour);
+        void configureFog(
+            float fogDepth, float underwaterFog, float dlFactor, float dlOffset, const osg::Vec4f& colour);
 
         void addCell(const MWWorld::CellStore* store);
         void removeCell(const MWWorld::CellStore* store);
@@ -174,14 +175,17 @@ namespace MWRender
             float mRatio;
         };
 
-        RayResult castRay(const osg::Vec3f& origin, const osg::Vec3f& dest, bool ignorePlayer, bool ignoreActors=false);
+        RayResult castRay(
+            const osg::Vec3f& origin, const osg::Vec3f& dest, bool ignorePlayer, bool ignoreActors = false);
 
-        /// Return the object under the mouse cursor / crosshair position, given by nX and nY normalized screen coordinates,
-        /// where (0,0) is the top left corner.
-        RayResult castCameraToViewportRay(const float nX, const float nY, float maxDistance, bool ignorePlayer, bool ignoreActors=false);
+        /// Return the object under the mouse cursor / crosshair position, given by nX and nY normalized screen
+        /// coordinates, where (0,0) is the top left corner.
+        RayResult castCameraToViewportRay(
+            const float nX, const float nY, float maxDistance, bool ignorePlayer, bool ignoreActors = false);
 
-        /// Get the bounding box of the given object in screen coordinates as (minX, minY, maxX, maxY), with (0,0) being the top left corner.
-        osg::Vec4f getScreenBounds(const osg::BoundingBox &worldbb);
+        /// Get the bounding box of the given object in screen coordinates as (minX, minY, maxX, maxY), with (0,0) being
+        /// the top left corner.
+        osg::Vec4f getScreenBounds(const osg::BoundingBox& worldbb);
 
         void setSkyEnabled(bool enabled);
 
@@ -189,7 +193,8 @@ namespace MWRender
 
         SkyManager* getSkyManager();
 
-        void spawnEffect(const std::string& model, std::string_view texture, const osg::Vec3f& worldPosition, float scale = 1.f, bool isMagicVFX = true);
+        void spawnEffect(const std::string& model, std::string_view texture, const osg::Vec3f& worldPosition,
+            float scale = 1.f, bool isMagicVFX = true);
 
         /// Clear all savegame-specific data
         void clear();
@@ -208,7 +213,7 @@ namespace MWRender
         void removeWaterRippleEmitter(const MWWorld::Ptr& ptr);
         void emitWaterRipple(const osg::Vec3f& pos);
 
-        void updatePlayerPtr(const MWWorld::Ptr &ptr);
+        void updatePlayerPtr(const MWWorld::Ptr& ptr);
 
         void removePlayer(const MWWorld::Ptr& player);
         void setupPlayer(const MWWorld::Ptr& player);
@@ -237,7 +242,8 @@ namespace MWRender
 
         osg::Vec3f getHalfExtents(const MWWorld::ConstPtr& object) const;
 
-        void exportSceneGraph(const MWWorld::Ptr& ptr, const std::filesystem::path& filename, const std::string& format);
+        void exportSceneGraph(
+            const MWWorld::Ptr& ptr, const std::filesystem::path& filename, const std::string& format);
 
         Debug::DebugDrawer& getDebugDrawer() const { return *mDebugDraw; }
 
@@ -252,12 +258,12 @@ namespace MWRender
 
         void setNavMeshNumber(const std::size_t value);
 
-        void setActiveGrid(const osg::Vec4i &grid);
+        void setActiveGrid(const osg::Vec4i& grid);
 
         bool pagingEnableObject(int type, const MWWorld::ConstPtr& ptr, bool enabled);
-        void pagingBlacklistObject(int type, const MWWorld::ConstPtr &ptr);
+        void pagingBlacklistObject(int type, const MWWorld::ConstPtr& ptr);
         bool pagingUnlockCache();
-        void getPagedRefnums(const osg::Vec4i &activeGrid, std::vector<ESM::RefNum>& out);
+        void getPagedRefnums(const osg::Vec4i& activeGrid, std::vector<ESM::RefNum>& out);
 
         void updateProjectionMatrix();
 
@@ -279,7 +285,8 @@ namespace MWRender
 
         const bool mSkyBlending;
 
-        osg::ref_ptr<osgUtil::IntersectionVisitor> getIntersectionVisitor(osgUtil::Intersector* intersector, bool ignorePlayer, bool ignoreActors);
+        osg::ref_ptr<osgUtil::IntersectionVisitor> getIntersectionVisitor(
+            osgUtil::Intersector* intersector, bool ignorePlayer, bool ignoreActors);
 
         osg::ref_ptr<osgUtil::IntersectionVisitor> mIntersectionVisitor;
 
@@ -332,7 +339,7 @@ namespace MWRender
         bool mUpdateProjectionMatrix = false;
         bool mNight = false;
 
-        void operator = (const RenderingManager&);
+        void operator=(const RenderingManager&);
         RenderingManager(const RenderingManager&);
     };
 
diff --git a/apps/openmw/mwrender/ripplesimulation.cpp b/apps/openmw/mwrender/ripplesimulation.cpp
index 0bb92cdd49..99d0023489 100644
--- a/apps/openmw/mwrender/ripplesimulation.cpp
+++ b/apps/openmw/mwrender/ripplesimulation.cpp
@@ -3,32 +3,32 @@
 #include <iomanip>
 #include <sstream>
 
-#include <osg/PolygonOffset>
-#include <osg/Texture2D>
-#include <osg/Material>
 #include <osg/Depth>
+#include <osg/Material>
+#include <osg/PolygonOffset>
 #include <osg/PositionAttitudeTransform>
+#include <osg/Texture2D>
 #include <osgParticle/ParticleSystem>
 #include <osgParticle/ParticleSystemUpdater>
 
+#include <components/fallback/fallback.hpp>
 #include <components/misc/rng.hpp>
 #include <components/nifosg/controller.hpp>
 #include <components/resource/imagemanager.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
-#include <components/fallback/fallback.hpp>
 #include <components/sceneutil/depth.hpp>
 
 #include "vismask.hpp"
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 
 namespace
 {
-    void createWaterRippleStateSet(Resource::ResourceSystem* resourceSystem,osg::Node* node)
+    void createWaterRippleStateSet(Resource::ResourceSystem* resourceSystem, osg::Node* node)
     {
         int rippleFrameCount = Fallback::Map::getInt("Water_RippleFrameCount");
         if (rippleFrameCount <= 0)
@@ -36,23 +36,25 @@ namespace
 
         std::string_view tex = Fallback::Map::getString("Water_RippleTexture");
 
-        std::vector<osg::ref_ptr<osg::Texture2D> > textures;
-        for (int i=0; i<rippleFrameCount; ++i)
+        std::vector<osg::ref_ptr<osg::Texture2D>> textures;
+        for (int i = 0; i < rippleFrameCount; ++i)
         {
             std::ostringstream texname;
             texname << "textures/water/" << tex << std::setw(2) << std::setfill('0') << i << ".dds";
-            osg::ref_ptr<osg::Texture2D> tex2 (new osg::Texture2D(resourceSystem->getImageManager()->getImage(texname.str())));
+            osg::ref_ptr<osg::Texture2D> tex2(
+                new osg::Texture2D(resourceSystem->getImageManager()->getImage(texname.str())));
             tex2->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
             tex2->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
             resourceSystem->getSceneManager()->applyFilterSettings(tex2);
             textures.push_back(tex2);
         }
 
-        osg::ref_ptr<NifOsg::FlipController> controller (new NifOsg::FlipController(0, 0.3f/rippleFrameCount, textures));
+        osg::ref_ptr<NifOsg::FlipController> controller(
+            new NifOsg::FlipController(0, 0.3f / rippleFrameCount, textures));
         controller->setSource(std::make_shared<SceneUtil::FrameTimeSource>());
         node->addUpdateCallback(controller);
 
-        osg::ref_ptr<osg::StateSet> stateset (new osg::StateSet);
+        osg::ref_ptr<osg::StateSet> stateset(new osg::StateSet);
         stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
         stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
         stateset->setTextureAttributeAndModes(0, textures[0], osg::StateAttribute::ON);
@@ -61,14 +63,14 @@ namespace
         depth->setWriteMask(false);
         stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
 
-        osg::ref_ptr<osg::PolygonOffset> polygonOffset (new osg::PolygonOffset);
+        osg::ref_ptr<osg::PolygonOffset> polygonOffset(new osg::PolygonOffset);
         polygonOffset->setUnits(SceneUtil::AutoDepth::isReversed() ? 1 : -1);
         polygonOffset->setFactor(SceneUtil::AutoDepth::isReversed() ? 1 : -1);
         stateset->setAttributeAndModes(polygonOffset, osg::StateAttribute::ON);
 
         stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
 
-        osg::ref_ptr<osg::Material> mat (new osg::Material);
+        osg::ref_ptr<osg::Material> mat(new osg::Material);
         mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 1.f));
         mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1.f, 1.f, 1.f, 1.f));
         mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 1.f));
@@ -83,143 +85,141 @@ namespace
 namespace MWRender
 {
 
-RippleSimulation::RippleSimulation(osg::Group *parent, Resource::ResourceSystem* resourceSystem)
-    : mParent(parent)
-{
-    mParticleSystem = new osgParticle::ParticleSystem;
+    RippleSimulation::RippleSimulation(osg::Group* parent, Resource::ResourceSystem* resourceSystem)
+        : mParent(parent)
+    {
+        mParticleSystem = new osgParticle::ParticleSystem;
 
-    mParticleSystem->setParticleAlignment(osgParticle::ParticleSystem::FIXED);
-    mParticleSystem->setAlignVectorX(osg::Vec3f(1,0,0));
-    mParticleSystem->setAlignVectorY(osg::Vec3f(0,1,0));
+        mParticleSystem->setParticleAlignment(osgParticle::ParticleSystem::FIXED);
+        mParticleSystem->setAlignVectorX(osg::Vec3f(1, 0, 0));
+        mParticleSystem->setAlignVectorY(osg::Vec3f(0, 1, 0));
 
-    osgParticle::Particle& particleTemplate = mParticleSystem->getDefaultParticleTemplate();
-    particleTemplate.setSizeRange(osgParticle::rangef(15, 180));
-    particleTemplate.setColorRange(osgParticle::rangev4(osg::Vec4f(1,1,1,0.7), osg::Vec4f(1,1,1,0.7)));
-    particleTemplate.setAlphaRange(osgParticle::rangef(1.f, 0.f));
-    particleTemplate.setAngularVelocity(osg::Vec3f(0,0,Fallback::Map::getFloat("Water_RippleRotSpeed")));
-    particleTemplate.setLifeTime(Fallback::Map::getFloat("Water_RippleLifetime"));
+        osgParticle::Particle& particleTemplate = mParticleSystem->getDefaultParticleTemplate();
+        particleTemplate.setSizeRange(osgParticle::rangef(15, 180));
+        particleTemplate.setColorRange(osgParticle::rangev4(osg::Vec4f(1, 1, 1, 0.7), osg::Vec4f(1, 1, 1, 0.7)));
+        particleTemplate.setAlphaRange(osgParticle::rangef(1.f, 0.f));
+        particleTemplate.setAngularVelocity(osg::Vec3f(0, 0, Fallback::Map::getFloat("Water_RippleRotSpeed")));
+        particleTemplate.setLifeTime(Fallback::Map::getFloat("Water_RippleLifetime"));
 
-    osg::ref_ptr<osgParticle::ParticleSystemUpdater> updater (new osgParticle::ParticleSystemUpdater);
-    updater->addParticleSystem(mParticleSystem);
+        osg::ref_ptr<osgParticle::ParticleSystemUpdater> updater(new osgParticle::ParticleSystemUpdater);
+        updater->addParticleSystem(mParticleSystem);
 
-    mParticleNode = new osg::PositionAttitudeTransform;
-    mParticleNode->setName("Ripple Root");
-    mParticleNode->addChild(updater);
-    mParticleNode->addChild(mParticleSystem);
-    mParticleNode->setNodeMask(Mask_Water);
+        mParticleNode = new osg::PositionAttitudeTransform;
+        mParticleNode->setName("Ripple Root");
+        mParticleNode->addChild(updater);
+        mParticleNode->addChild(mParticleSystem);
+        mParticleNode->setNodeMask(Mask_Water);
 
-    createWaterRippleStateSet(resourceSystem, mParticleNode);
+        createWaterRippleStateSet(resourceSystem, mParticleNode);
 
-    resourceSystem->getSceneManager()->recreateShaders(mParticleNode);
+        resourceSystem->getSceneManager()->recreateShaders(mParticleNode);
 
-    mParent->addChild(mParticleNode);
-}
+        mParent->addChild(mParticleNode);
+    }
 
-RippleSimulation::~RippleSimulation()
-{
-    mParent->removeChild(mParticleNode);
-}
+    RippleSimulation::~RippleSimulation()
+    {
+        mParent->removeChild(mParticleNode);
+    }
 
-void RippleSimulation::update(float dt)
-{
-    const MWBase::World* world = MWBase::Environment::get().getWorld();
-    for (Emitter& emitter : mEmitters)
+    void RippleSimulation::update(float dt)
     {
-        MWWorld::ConstPtr& ptr = emitter.mPtr;
-        if (ptr == MWBase::Environment::get().getWorld ()->getPlayerPtr())
+        const MWBase::World* world = MWBase::Environment::get().getWorld();
+        for (Emitter& emitter : mEmitters)
         {
-            // fetch a new ptr (to handle cell change etc)
-            // for non-player actors this is done in updateObjectCell
-            ptr = MWBase::Environment::get().getWorld ()->getPlayerPtr();
-        }
+            MWWorld::ConstPtr& ptr = emitter.mPtr;
+            if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
+            {
+                // fetch a new ptr (to handle cell change etc)
+                // for non-player actors this is done in updateObjectCell
+                ptr = MWBase::Environment::get().getWorld()->getPlayerPtr();
+            }
 
-        osg::Vec3f currentPos (ptr.getRefData().getPosition().asVec3());
+            osg::Vec3f currentPos(ptr.getRefData().getPosition().asVec3());
 
-        bool shouldEmit = (world->isUnderwater(ptr.getCell(), currentPos) && !world->isSubmerged(ptr)) || world->isWalkingOnWater(ptr);
-        if (shouldEmit && (currentPos - emitter.mLastEmitPosition).length() > 10)
-        {
-            emitter.mLastEmitPosition = currentPos;
+            bool shouldEmit = (world->isUnderwater(ptr.getCell(), currentPos) && !world->isSubmerged(ptr))
+                || world->isWalkingOnWater(ptr);
+            if (shouldEmit && (currentPos - emitter.mLastEmitPosition).length() > 10)
+            {
+                emitter.mLastEmitPosition = currentPos;
 
-            currentPos.z() = mParticleNode->getPosition().z();
+                currentPos.z() = mParticleNode->getPosition().z();
 
-            if (mParticleSystem->numParticles()-mParticleSystem->numDeadParticles() > 500)
-                continue; // TODO: remove the oldest particle to make room?
+                if (mParticleSystem->numParticles() - mParticleSystem->numDeadParticles() > 500)
+                    continue; // TODO: remove the oldest particle to make room?
 
-            emitRipple(currentPos);
+                emitRipple(currentPos);
+            }
         }
     }
-}
 
+    void RippleSimulation::addEmitter(const MWWorld::ConstPtr& ptr, float scale, float force)
+    {
+        Emitter newEmitter;
+        newEmitter.mPtr = ptr;
+        newEmitter.mScale = scale;
+        newEmitter.mForce = force;
+        newEmitter.mLastEmitPosition = osg::Vec3f(0, 0, 0);
+        mEmitters.push_back(newEmitter);
+    }
 
-void RippleSimulation::addEmitter(const MWWorld::ConstPtr& ptr, float scale, float force)
-{
-    Emitter newEmitter;
-    newEmitter.mPtr = ptr;
-    newEmitter.mScale = scale;
-    newEmitter.mForce = force;
-    newEmitter.mLastEmitPosition = osg::Vec3f(0,0,0);
-    mEmitters.push_back (newEmitter);
-}
-
-void RippleSimulation::removeEmitter (const MWWorld::ConstPtr& ptr)
-{
-    for (std::vector<Emitter>::iterator it = mEmitters.begin(); it != mEmitters.end(); ++it)
+    void RippleSimulation::removeEmitter(const MWWorld::ConstPtr& ptr)
     {
-        if (it->mPtr == ptr)
+        for (std::vector<Emitter>::iterator it = mEmitters.begin(); it != mEmitters.end(); ++it)
         {
-            mEmitters.erase(it);
-            return;
+            if (it->mPtr == ptr)
+            {
+                mEmitters.erase(it);
+                return;
+            }
         }
     }
-}
 
-void RippleSimulation::updateEmitterPtr (const MWWorld::ConstPtr& old, const MWWorld::ConstPtr& ptr)
-{
-    for (std::vector<Emitter>::iterator it = mEmitters.begin(); it != mEmitters.end(); ++it)
+    void RippleSimulation::updateEmitterPtr(const MWWorld::ConstPtr& old, const MWWorld::ConstPtr& ptr)
     {
-        if (it->mPtr == old)
+        for (std::vector<Emitter>::iterator it = mEmitters.begin(); it != mEmitters.end(); ++it)
         {
-            it->mPtr = ptr;
-            return;
+            if (it->mPtr == old)
+            {
+                it->mPtr = ptr;
+                return;
+            }
         }
     }
-}
 
-void RippleSimulation::removeCell(const MWWorld::CellStore *store)
-{
-    for (std::vector<Emitter>::iterator it = mEmitters.begin(); it != mEmitters.end();)
+    void RippleSimulation::removeCell(const MWWorld::CellStore* store)
     {
-        if ((it->mPtr.isInCell() && it->mPtr.getCell() == store) && it->mPtr != MWMechanics::getPlayer())
+        for (std::vector<Emitter>::iterator it = mEmitters.begin(); it != mEmitters.end();)
         {
-            it = mEmitters.erase(it);
+            if ((it->mPtr.isInCell() && it->mPtr.getCell() == store) && it->mPtr != MWMechanics::getPlayer())
+            {
+                it = mEmitters.erase(it);
+            }
+            else
+                ++it;
         }
-        else
-            ++it;
     }
-}
 
-void RippleSimulation::emitRipple(const osg::Vec3f &pos)
-{
-    if (std::abs(pos.z() - mParticleNode->getPosition().z()) < 20)
+    void RippleSimulation::emitRipple(const osg::Vec3f& pos)
     {
-        osgParticle::ParticleSystem::ScopedWriteLock lock(*mParticleSystem->getReadWriteMutex());
-        osgParticle::Particle* p = mParticleSystem->createParticle(nullptr);
-        p->setPosition(osg::Vec3f(pos.x(), pos.y(), 0.f));
-        p->setAngle(osg::Vec3f(0,0, Misc::Rng::rollProbability() * osg::PI * 2 - osg::PI));
+        if (std::abs(pos.z() - mParticleNode->getPosition().z()) < 20)
+        {
+            osgParticle::ParticleSystem::ScopedWriteLock lock(*mParticleSystem->getReadWriteMutex());
+            osgParticle::Particle* p = mParticleSystem->createParticle(nullptr);
+            p->setPosition(osg::Vec3f(pos.x(), pos.y(), 0.f));
+            p->setAngle(osg::Vec3f(0, 0, Misc::Rng::rollProbability() * osg::PI * 2 - osg::PI));
+        }
     }
-}
-
-void RippleSimulation::setWaterHeight(float height)
-{
-    mParticleNode->setPosition(osg::Vec3f(0,0,height));
-}
-
-void RippleSimulation::clear()
-{
-    for (int i=0; i<mParticleSystem->numParticles(); ++i)
-        mParticleSystem->destroyParticle(i);
-}
 
+    void RippleSimulation::setWaterHeight(float height)
+    {
+        mParticleNode->setPosition(osg::Vec3f(0, 0, height));
+    }
 
+    void RippleSimulation::clear()
+    {
+        for (int i = 0; i < mParticleSystem->numParticles(); ++i)
+            mParticleSystem->destroyParticle(i);
+    }
 
 }
diff --git a/apps/openmw/mwrender/ripplesimulation.hpp b/apps/openmw/mwrender/ripplesimulation.hpp
index 186a578ba8..7a5b2b8ae1 100644
--- a/apps/openmw/mwrender/ripplesimulation.hpp
+++ b/apps/openmw/mwrender/ripplesimulation.hpp
@@ -47,9 +47,9 @@ namespace MWRender
         void update(float dt);
 
         /// adds an emitter, position will be tracked automatically
-        void addEmitter (const MWWorld::ConstPtr& ptr, float scale = 1.f, float force = 1.f);
-        void removeEmitter (const MWWorld::ConstPtr& ptr);
-        void updateEmitterPtr (const MWWorld::ConstPtr& old, const MWWorld::ConstPtr& ptr);
+        void addEmitter(const MWWorld::ConstPtr& ptr, float scale = 1.f, float force = 1.f);
+        void removeEmitter(const MWWorld::ConstPtr& ptr);
+        void updateEmitterPtr(const MWWorld::ConstPtr& old, const MWWorld::ConstPtr& ptr);
         void removeCell(const MWWorld::CellStore* store);
 
         void emitRipple(const osg::Vec3f& pos);
diff --git a/apps/openmw/mwrender/rotatecontroller.cpp b/apps/openmw/mwrender/rotatecontroller.cpp
index d3df4364d0..d7f8bb902c 100644
--- a/apps/openmw/mwrender/rotatecontroller.cpp
+++ b/apps/openmw/mwrender/rotatecontroller.cpp
@@ -5,59 +5,58 @@
 namespace MWRender
 {
 
-RotateController::RotateController(osg::Node *relativeTo)
-    : mEnabled(true)
-    , mRelativeTo(relativeTo)
-{
-
-}
-
-void RotateController::setEnabled(bool enabled)
-{
-    mEnabled = enabled;
-}
+    RotateController::RotateController(osg::Node* relativeTo)
+        : mEnabled(true)
+        , mRelativeTo(relativeTo)
+    {
+    }
 
-void RotateController::setRotate(const osg::Quat &rotate)
-{
-    mRotate = rotate;
-}
+    void RotateController::setEnabled(bool enabled)
+    {
+        mEnabled = enabled;
+    }
 
-void RotateController::setOffset(const osg::Vec3f& offset)
-{
-    mOffset = offset;
-}
+    void RotateController::setRotate(const osg::Quat& rotate)
+    {
+        mRotate = rotate;
+    }
 
-void RotateController::operator()(osg::MatrixTransform *node, osg::NodeVisitor *nv)
-{
-    if (!mEnabled)
+    void RotateController::setOffset(const osg::Vec3f& offset)
     {
-        traverse(node, nv);
-        return;
+        mOffset = offset;
     }
-    osg::Matrix matrix = node->getMatrix();
-    osg::Quat worldOrient = getWorldOrientation(node);
-    osg::Quat worldOrientInverse = worldOrient.inverse();
 
-    osg::Quat orient = worldOrient * mRotate * worldOrientInverse * matrix.getRotate();
-    matrix.setRotate(orient);
-    matrix.setTrans(matrix.getTrans() + worldOrientInverse * mOffset);
+    void RotateController::operator()(osg::MatrixTransform* node, osg::NodeVisitor* nv)
+    {
+        if (!mEnabled)
+        {
+            traverse(node, nv);
+            return;
+        }
+        osg::Matrix matrix = node->getMatrix();
+        osg::Quat worldOrient = getWorldOrientation(node);
+        osg::Quat worldOrientInverse = worldOrient.inverse();
+
+        osg::Quat orient = worldOrient * mRotate * worldOrientInverse * matrix.getRotate();
+        matrix.setRotate(orient);
+        matrix.setTrans(matrix.getTrans() + worldOrientInverse * mOffset);
 
-    node->setMatrix(matrix);
+        node->setMatrix(matrix);
 
-    traverse(node,nv);
-}
+        traverse(node, nv);
+    }
 
-osg::Quat RotateController::getWorldOrientation(osg::Node *node)
-{
-    // this could be optimized later, we just need the world orientation, not the full matrix
-    osg::NodePathList nodepaths = node->getParentalNodePaths(mRelativeTo);
-    osg::Quat worldOrient;
-    if (!nodepaths.empty())
+    osg::Quat RotateController::getWorldOrientation(osg::Node* node)
     {
-        osg::Matrixf worldMat = osg::computeLocalToWorld(nodepaths[0]);
-        worldOrient = worldMat.getRotate();
+        // this could be optimized later, we just need the world orientation, not the full matrix
+        osg::NodePathList nodepaths = node->getParentalNodePaths(mRelativeTo);
+        osg::Quat worldOrient;
+        if (!nodepaths.empty())
+        {
+            osg::Matrixf worldMat = osg::computeLocalToWorld(nodepaths[0]);
+            worldOrient = worldMat.getRotate();
+        }
+        return worldOrient;
     }
-    return worldOrient;
-}
 
 }
diff --git a/apps/openmw/mwrender/rotatecontroller.hpp b/apps/openmw/mwrender/rotatecontroller.hpp
index 1f3ee0f845..87bf0adfe1 100644
--- a/apps/openmw/mwrender/rotatecontroller.hpp
+++ b/apps/openmw/mwrender/rotatecontroller.hpp
@@ -12,29 +12,28 @@ namespace osg
 namespace MWRender
 {
 
-/// Applies a rotation in \a relativeTo's space.
-/// @note Assumes that the node being rotated has its "original" orientation set every frame by a different controller.
-/// The rotation is then applied on top of that orientation.
-class RotateController : public SceneUtil::NodeCallback<RotateController, osg::MatrixTransform*>
-{
-public:
-    RotateController(osg::Node* relativeTo);
-
-    void setEnabled(bool enabled);
-    void setOffset(const osg::Vec3f& offset);
-    void setRotate(const osg::Quat& rotate);
-
-    void operator()(osg::MatrixTransform* node, osg::NodeVisitor* nv);
-
-protected:
-    osg::Quat getWorldOrientation(osg::Node* node);
-
-    bool mEnabled;
-    osg::Vec3f mOffset;
-    osg::Quat mRotate;
-    osg::Node* mRelativeTo;
-};
-
+    /// Applies a rotation in \a relativeTo's space.
+    /// @note Assumes that the node being rotated has its "original" orientation set every frame by a different
+    /// controller. The rotation is then applied on top of that orientation.
+    class RotateController : public SceneUtil::NodeCallback<RotateController, osg::MatrixTransform*>
+    {
+    public:
+        RotateController(osg::Node* relativeTo);
+
+        void setEnabled(bool enabled);
+        void setOffset(const osg::Vec3f& offset);
+        void setRotate(const osg::Quat& rotate);
+
+        void operator()(osg::MatrixTransform* node, osg::NodeVisitor* nv);
+
+    protected:
+        osg::Quat getWorldOrientation(osg::Node* node);
+
+        bool mEnabled;
+        osg::Vec3f mOffset;
+        osg::Quat mRotate;
+        osg::Node* mRelativeTo;
+    };
 
 }
 
diff --git a/apps/openmw/mwrender/screenshotmanager.cpp b/apps/openmw/mwrender/screenshotmanager.cpp
index f2457fecd8..f43a94a033 100644
--- a/apps/openmw/mwrender/screenshotmanager.cpp
+++ b/apps/openmw/mwrender/screenshotmanager.cpp
@@ -11,21 +11,21 @@
 #include <components/misc/strings/algorithm.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
-#include <components/shader/shadermanager.hpp>
 #include <components/sceneutil/depth.hpp>
-#include <components/stereo/stereomanager.hpp>
+#include <components/shader/shadermanager.hpp>
 #include <components/stereo/multiview.hpp>
+#include <components/stereo/stereomanager.hpp>
 
 #include <components/settings/settings.hpp>
 
-#include "../mwgui/loadingscreen.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwgui/loadingscreen.hpp"
 
+#include "postprocessor.hpp"
 #include "util.hpp"
 #include "vismask.hpp"
 #include "water.hpp"
-#include "postprocessor.hpp"
 
 namespace MWRender
 {
@@ -41,11 +41,12 @@ namespace MWRender
     {
     public:
         NotifyDrawCompletedCallback()
-            : mDone(false), mFrame(0)
+            : mDone(false)
+            , mFrame(0)
         {
         }
 
-        void operator () (osg::RenderInfo& renderInfo) const override
+        void operator()(osg::RenderInfo& renderInfo) const override
         {
             std::lock_guard<std::mutex> lock(mMutex);
             if (renderInfo.getState()->getFrameStamp()->getFrameNumber() >= mFrame && !mDone)
@@ -80,10 +81,12 @@ namespace MWRender
     {
     public:
         ReadImageFromFramebufferCallback(osg::Image* image, int width, int height)
-            : mWidth(width), mHeight(height), mImage(image)
+            : mWidth(width)
+            , mHeight(height)
+            , mImage(image)
         {
         }
-        void drawImplementation(osg::RenderInfo& renderInfo,const osg::Drawable* /*drawable*/) const override
+        void drawImplementation(osg::RenderInfo& renderInfo, const osg::Drawable* /*drawable*/) const override
         {
             int screenW = renderInfo.getCurrentCamera()->getViewport()->width();
             int screenH = renderInfo.getCurrentCamera()->getViewport()->height();
@@ -93,14 +96,15 @@ namespace MWRender
                 screenW = eyeRes.x();
                 screenH = eyeRes.y();
             }
-            double imageaspect = (double)mWidth/(double)mHeight;
+            double imageaspect = (double)mWidth / (double)mHeight;
             int leftPadding = std::max(0, static_cast<int>(screenW - screenH * imageaspect) / 2);
             int topPadding = std::max(0, static_cast<int>(screenH - screenW / imageaspect) / 2);
-            int width = screenW - leftPadding*2;
-            int height = screenH - topPadding*2;
+            int width = screenW - leftPadding * 2;
+            int height = screenH - topPadding * 2;
 
-            // Ensure we are reading from the resolved framebuffer and not the multisampled render buffer. Also ensure that the readbuffer is set correctly with rendeirng to FBO.
-            // glReadPixel() cannot read from multisampled targets
+            // Ensure we are reading from the resolved framebuffer and not the multisampled render buffer. Also ensure
+            // that the readbuffer is set correctly with rendeirng to FBO. glReadPixel() cannot read from multisampled
+            // targets
             PostProcessor* postProcessor = dynamic_cast<PostProcessor*>(renderInfo.getCurrentCamera()->getUserData());
             osg::GLExtensions* ext = osg::GLExtensions::Get(renderInfo.getContextID(), false);
 
@@ -119,13 +123,15 @@ namespace MWRender
             mImage->readPixels(leftPadding, topPadding, width, height, GL_RGB, GL_UNSIGNED_BYTE);
             mImage->scaleImage(mWidth, mHeight, 1);
         }
+
     private:
         int mWidth;
         int mHeight;
         osg::ref_ptr<osg::Image> mImage;
     };
 
-    ScreenshotManager::ScreenshotManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode, osg::ref_ptr<osg::Group> sceneRoot, Resource::ResourceSystem* resourceSystem, Water* water)
+    ScreenshotManager::ScreenshotManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode,
+        osg::ref_ptr<osg::Group> sceneRoot, Resource::ResourceSystem* resourceSystem, Water* water)
         : mViewer(viewer)
         , mRootNode(rootNode)
         , mSceneRoot(sceneRoot)
@@ -135,9 +141,7 @@ namespace MWRender
     {
     }
 
-    ScreenshotManager::~ScreenshotManager()
-    {
-    }
+    ScreenshotManager::~ScreenshotManager() {}
 
     void ScreenshotManager::screenshot(osg::Image* image, int w, int h)
     {
@@ -145,10 +149,12 @@ namespace MWRender
         osg::ref_ptr<osg::Drawable> tempDrw = new osg::Drawable;
         tempDrw->setDrawCallback(new ReadImageFromFramebufferCallback(image, w, h));
         tempDrw->setCullingActive(false);
-        tempDrw->getOrCreateStateSet()->setRenderBinDetails(100, "RenderBin", osg::StateSet::USE_RENDERBIN_DETAILS); // so its after all scene bins but before POST_RENDER gui camera
+        tempDrw->getOrCreateStateSet()->setRenderBinDetails(100, "RenderBin",
+            osg::StateSet::USE_RENDERBIN_DETAILS); // so its after all scene bins but before POST_RENDER gui camera
         camera->addChild(tempDrw);
         traversalsAndWait(mViewer->getFrameStamp()->getFrameNumber());
-        // now that we've "used up" the current frame, get a fresh frame number for the next frame() following after the screenshot is completed
+        // now that we've "used up" the current frame, get a fresh frame number for the next frame() following after the
+        // screenshot is completed
         mViewer->advance(mViewer->getFrameStamp()->getSimulationTime());
         camera->removeChild(tempDrw);
     }
@@ -165,7 +171,7 @@ namespace MWRender
 
         if (settingArgs.size() > 0)
         {
-            std::string typeStrings[4] = {"spherical", "cylindrical", "planet", "cubemap"};
+            std::string typeStrings[4] = { "spherical", "cylindrical", "planet", "cubemap" };
             bool found = false;
 
             for (int i = 0; i < 4; ++i)
@@ -200,9 +206,9 @@ namespace MWRender
         bool rawCubemap = screenshotMapping == RawCubemap;
 
         if (rawCubemap)
-            screenshotW = cubeSize * 6;  // the image will consist of 6 cube sides in a row
+            screenshotW = cubeSize * 6; // the image will consist of 6 cube sides in a row
         else if (screenshotMapping == Planet)
-            screenshotH = screenshotW;   // use square resolution for planet mapping
+            screenshotH = screenshotW; // use square resolution for planet mapping
 
         std::vector<osg::ref_ptr<osg::Image>> images;
         images.reserve(6);
@@ -210,30 +216,20 @@ namespace MWRender
         for (int i = 0; i < 6; ++i)
             images.push_back(new osg::Image);
 
-        osg::Vec3 directions[6] = {
-            rawCubemap ? osg::Vec3(1,0,0) : osg::Vec3(0,0,1),
-            osg::Vec3(0,0,-1),
-            osg::Vec3(-1,0,0),
-            rawCubemap ? osg::Vec3(0,0,1) : osg::Vec3(1,0,0),
-            osg::Vec3(0,1,0),
-            osg::Vec3(0,-1,0)};
-
-        double rotations[] = {
-            -osg::PI / 2.0,
-            osg::PI / 2.0,
-            osg::PI,
-            0,
-            osg::PI / 2.0,
-            osg::PI / 2.0 };
+        osg::Vec3 directions[6]
+            = { rawCubemap ? osg::Vec3(1, 0, 0) : osg::Vec3(0, 0, 1), osg::Vec3(0, 0, -1), osg::Vec3(-1, 0, 0),
+                  rawCubemap ? osg::Vec3(0, 0, 1) : osg::Vec3(1, 0, 0), osg::Vec3(0, 1, 0), osg::Vec3(0, -1, 0) };
+
+        double rotations[] = { -osg::PI / 2.0, osg::PI / 2.0, osg::PI, 0, osg::PI / 2.0, osg::PI / 2.0 };
 
         for (int i = 0; i < 6; ++i) // for each cubemap side
         {
-            osg::Matrixd transform = osg::Matrixd::rotate(osg::Vec3(0,0,-1), directions[i]);
+            osg::Matrixd transform = osg::Matrixd::rotate(osg::Vec3(0, 0, -1), directions[i]);
 
             if (!rawCubemap)
-                transform *= osg::Matrixd::rotate(rotations[i],osg::Vec3(0,0,-1));
+                transform *= osg::Matrixd::rotate(rotations[i], osg::Vec3(0, 0, -1));
 
-            osg::Image *sideImage = images[i].get();
+            osg::Image* sideImage = images[i].get();
             makeCubemapScreenshot(sideImage, cubeSize, cubeSize, transform);
 
             if (!rawCubemap)
@@ -242,20 +238,22 @@ namespace MWRender
 
         if (rawCubemap) // for raw cubemap don't run on GPU, just merge the images
         {
-            image->allocateImage(cubeSize * 6,cubeSize,images[0]->r(),images[0]->getPixelFormat(),images[0]->getDataType());
+            image->allocateImage(
+                cubeSize * 6, cubeSize, images[0]->r(), images[0]->getPixelFormat(), images[0]->getDataType());
 
             for (int i = 0; i < 6; ++i)
-                osg::copyImage(images[i].get(),0,0,0,images[i]->s(),images[i]->t(),images[i]->r(),image,i * cubeSize,0,0);
+                osg::copyImage(images[i].get(), 0, 0, 0, images[i]->s(), images[i]->t(), images[i]->r(), image,
+                    i * cubeSize, 0, 0);
 
             return true;
         }
 
         // run on GPU now:
-        osg::ref_ptr<osg::TextureCubeMap> cubeTexture (new osg::TextureCubeMap);
+        osg::ref_ptr<osg::TextureCubeMap> cubeTexture(new osg::TextureCubeMap);
         cubeTexture->setResizeNonPowerOfTwoHint(false);
 
-        cubeTexture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::NEAREST);
-        cubeTexture->setFilter(osg::Texture::MAG_FILTER,osg::Texture::NEAREST);
+        cubeTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::NEAREST);
+        cubeTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::NEAREST);
 
         cubeTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         cubeTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
@@ -264,12 +262,13 @@ namespace MWRender
             cubeTexture->setImage(i, images[i].get());
 
         osg::ref_ptr<osg::Camera> screenshotCamera(new osg::Camera);
-        osg::ref_ptr<osg::ShapeDrawable> quad(new osg::ShapeDrawable(new osg::Box(osg::Vec3(0,0,0), 2.0)));
+        osg::ref_ptr<osg::ShapeDrawable> quad(new osg::ShapeDrawable(new osg::Box(osg::Vec3(0, 0, 0), 2.0)));
 
         std::map<std::string, std::string> defineMap;
 
         Shader::ShaderManager& shaderMgr = mResourceSystem->getSceneManager()->getShaderManager();
-        osg::ref_ptr<osg::Shader> fragmentShader(shaderMgr.getShader("s360_fragment.glsl", defineMap,osg::Shader::FRAGMENT));
+        osg::ref_ptr<osg::Shader> fragmentShader(
+            shaderMgr.getShader("s360_fragment.glsl", defineMap, osg::Shader::FRAGMENT));
         osg::ref_ptr<osg::Shader> vertexShader(shaderMgr.getShader("s360_vertex.glsl", defineMap, osg::Shader::VERTEX));
         osg::ref_ptr<osg::StateSet> stateset = quad->getOrCreateStateSet();
 
@@ -301,24 +300,24 @@ namespace MWRender
         mDrawCompleteCallback->waitTillDone();
     }
 
-    void ScreenshotManager::renderCameraToImage(osg::Camera *camera, osg::Image *image, int w, int h)
+    void ScreenshotManager::renderCameraToImage(osg::Camera* camera, osg::Image* image, int w, int h)
     {
         camera->setNodeMask(Mask_RenderToTexture);
         camera->attach(osg::Camera::COLOR_BUFFER, image);
         camera->setRenderOrder(osg::Camera::PRE_RENDER);
         camera->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
-        camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT,osg::Camera::PIXEL_BUFFER_RTT);
+        camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT, osg::Camera::PIXEL_BUFFER_RTT);
         camera->setViewport(0, 0, w, h);
 
         SceneUtil::setCameraClearDepth(camera);
 
-        osg::ref_ptr<osg::Texture2D> texture (new osg::Texture2D);
+        osg::ref_ptr<osg::Texture2D> texture(new osg::Texture2D);
         texture->setInternalFormat(GL_RGB);
-        texture->setTextureSize(w,h);
+        texture->setTextureSize(w, h);
         texture->setResizeNonPowerOfTwoHint(false);
         texture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
         texture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-        camera->attach(osg::Camera::COLOR_BUFFER,texture);
+        camera->attach(osg::Camera::COLOR_BUFFER, texture);
 
         image->setDataType(GL_UNSIGNED_BYTE);
         image->setPixelFormat(texture->getInternalFormat());
@@ -332,23 +331,25 @@ namespace MWRender
 
         MWBase::Environment::get().getWindowManager()->getLoadingScreen()->loadingOff();
 
-        // now that we've "used up" the current frame, get a fresh framenumber for the next frame() following after the screenshot is completed
+        // now that we've "used up" the current frame, get a fresh framenumber for the next frame() following after the
+        // screenshot is completed
         mViewer->advance(mViewer->getFrameStamp()->getSimulationTime());
 
         camera->removeChildren(0, camera->getNumChildren());
         mRootNode->removeChild(camera);
     }
 
-    void ScreenshotManager::makeCubemapScreenshot(osg::Image *image, int w, int h, const osg::Matrixd& cameraTransform)
+    void ScreenshotManager::makeCubemapScreenshot(osg::Image* image, int w, int h, const osg::Matrixd& cameraTransform)
     {
-        osg::ref_ptr<osg::Camera> rttCamera (new osg::Camera);
+        osg::ref_ptr<osg::Camera> rttCamera(new osg::Camera);
         float nearClip = Settings::Manager::getFloat("near clip", "Camera");
         float viewDistance = Settings::Manager::getFloat("viewing distance", "Camera");
         // each cubemap side sees 90 degrees
         if (SceneUtil::AutoDepth::isReversed())
-            rttCamera->setProjectionMatrix(SceneUtil::getReversedZProjectionMatrixAsPerspectiveInf(90.0, w/float(h), nearClip));
+            rttCamera->setProjectionMatrix(
+                SceneUtil::getReversedZProjectionMatrixAsPerspectiveInf(90.0, w / float(h), nearClip));
         else
-            rttCamera->setProjectionMatrixAsPerspective(90.0, w/float(h), nearClip, viewDistance);
+            rttCamera->setProjectionMatrixAsPerspective(90.0, w / float(h), nearClip, viewDistance);
         rttCamera->setViewMatrix(mViewer->getCamera()->getViewMatrix() * cameraTransform);
 
         rttCamera->setUpdateCallback(new NoTraverseCallback);
@@ -357,10 +358,11 @@ namespace MWRender
         rttCamera->addChild(mWater->getReflectionNode());
         rttCamera->addChild(mWater->getRefractionNode());
 
-        rttCamera->setCullMask(MWBase::Environment::get().getWindowManager()->getCullMask() & ~(Mask_GUI|Mask_FirstPerson));
+        rttCamera->setCullMask(
+            MWBase::Environment::get().getWindowManager()->getCullMask() & ~(Mask_GUI | Mask_FirstPerson));
 
         rttCamera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 
-        renderCameraToImage(rttCamera.get(),image,w,h);
+        renderCameraToImage(rttCamera.get(), image, w, h);
     }
 }
diff --git a/apps/openmw/mwrender/screenshotmanager.hpp b/apps/openmw/mwrender/screenshotmanager.hpp
index 094a4a20f4..72e5b91637 100644
--- a/apps/openmw/mwrender/screenshotmanager.hpp
+++ b/apps/openmw/mwrender/screenshotmanager.hpp
@@ -21,7 +21,8 @@ namespace MWRender
     class ScreenshotManager
     {
     public:
-        ScreenshotManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode, osg::ref_ptr<osg::Group> sceneRoot, Resource::ResourceSystem* resourceSystem, Water* water);
+        ScreenshotManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode,
+            osg::ref_ptr<osg::Group> sceneRoot, Resource::ResourceSystem* resourceSystem, Water* water);
         ~ScreenshotManager();
 
         void screenshot(osg::Image* image, int w, int h);
@@ -36,8 +37,9 @@ namespace MWRender
         Water* mWater;
 
         void traversalsAndWait(unsigned int frame);
-        void renderCameraToImage(osg::Camera *camera, osg::Image *image, int w, int h);
-        void makeCubemapScreenshot(osg::Image* image, int w, int h, const osg::Matrixd &cameraTransform=osg::Matrixd());
+        void renderCameraToImage(osg::Camera* camera, osg::Image* image, int w, int h);
+        void makeCubemapScreenshot(
+            osg::Image* image, int w, int h, const osg::Matrixd& cameraTransform = osg::Matrixd());
     };
 }
 
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 592f3f7e86..87dfe49999 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -3,27 +3,27 @@
 #include <osg/Depth>
 #include <osg/PositionAttitudeTransform>
 
-#include <osgParticle/Operator>
 #include <osgParticle/BoxPlacer>
 #include <osgParticle/ModularEmitter>
 #include <osgParticle/ModularProgram>
+#include <osgParticle/Operator>
 #include <osgParticle/ParticleSystemUpdater>
 
 #include <components/settings/settings.hpp>
 
 #include <components/sceneutil/controller.hpp>
-#include <components/sceneutil/shadow.hpp>
-#include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/rtt.hpp>
+#include <components/sceneutil/shadow.hpp>
+#include <components/sceneutil/visitor.hpp>
 
-#include <components/resource/scenemanager.hpp>
 #include <components/resource/imagemanager.hpp>
+#include <components/resource/scenemanager.hpp>
 
 #include <components/vfs/manager.hpp>
 
-#include <components/misc/rng.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/misc/rng.hpp>
 #include <components/stereo/stereomanager.hpp>
 
 #include <components/nifosg/particle.hpp>
@@ -33,17 +33,17 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
-#include "vismask.hpp"
 #include "renderbin.hpp"
-#include "util.hpp"
 #include "skyutil.hpp"
+#include "util.hpp"
+#include "vismask.hpp"
 
 namespace
 {
     class WrapAroundOperator : public osgParticle::Operator
     {
     public:
-        WrapAroundOperator(osg::Camera *camera, const osg::Vec3 &wrapRange)
+        WrapAroundOperator(osg::Camera* camera, const osg::Vec3& wrapRange)
             : osgParticle::Operator()
             , mCamera(camera)
             , mWrapRange(wrapRange)
@@ -52,21 +52,13 @@ namespace
             mPreviousCameraPosition = getCameraPosition();
         }
 
-        osg::Object *cloneType() const override
-        {
-            return nullptr;
-        }
+        osg::Object* cloneType() const override { return nullptr; }
 
-        osg::Object *clone(const osg::CopyOp &op) const override
-        {
-            return nullptr;
-        }
+        osg::Object* clone(const osg::CopyOp& op) const override { return nullptr; }
 
-        void operate(osgParticle::Particle *P, double dt) override
-        {
-        }
+        void operate(osgParticle::Particle* P, double dt) override {}
 
-        void operateParticles(osgParticle::ParticleSystem *ps, double dt) override
+        void operateParticles(osgParticle::ParticleSystem* ps, double dt) override
         {
             osg::Vec3 position = getCameraPosition();
             osg::Vec3 positionDifference = position - mPreviousCameraPosition;
@@ -75,7 +67,6 @@ namespace
 
             std::vector<osg::Matrix> worldMatrices = ps->getWorldMatrices();
 
-
             if (!worldMatrices.empty())
             {
                 toWorld = worldMatrices[0];
@@ -84,18 +75,18 @@ namespace
 
             for (int i = 0; i < ps->numParticles(); ++i)
             {
-                osgParticle::Particle *p = ps->getParticle(i);
+                osgParticle::Particle* p = ps->getParticle(i);
                 p->setPosition(toWorld.preMult(p->getPosition()));
                 p->setPosition(p->getPosition() - positionDifference);
 
-                for (int j = 0; j < 3; ++j)  // wrap-around in all 3 dimensions
+                for (int j = 0; j < 3; ++j) // wrap-around in all 3 dimensions
                 {
                     osg::Vec3 pos = p->getPosition();
 
                     if (pos[j] < -mHalfWrapRange[j])
-                        pos[j] = mHalfWrapRange[j] + fmod(pos[j] - mHalfWrapRange[j],mWrapRange[j]);
+                        pos[j] = mHalfWrapRange[j] + fmod(pos[j] - mHalfWrapRange[j], mWrapRange[j]);
                     else if (pos[j] > mHalfWrapRange[j])
-                        pos[j] = fmod(pos[j] + mHalfWrapRange[j],mWrapRange[j]) - mHalfWrapRange[j];
+                        pos[j] = fmod(pos[j] + mHalfWrapRange[j], mWrapRange[j]) - mHalfWrapRange[j];
 
                     p->setPosition(pos);
                 }
@@ -107,15 +98,12 @@ namespace
         }
 
     protected:
-        osg::Camera *mCamera;
+        osg::Camera* mCamera;
         osg::Vec3 mPreviousCameraPosition;
         osg::Vec3 mWrapRange;
         osg::Vec3 mHalfWrapRange;
 
-        osg::Vec3 getCameraPosition()
-        {
-            return mCamera->getInverseViewMatrix().getTrans();
-        }
+        osg::Vec3 getCameraPosition() { return mCamera->getInverseViewMatrix().getTrans(); }
     };
 
     class WeatherAlphaOperator : public osgParticle::Operator
@@ -124,19 +112,14 @@ namespace
         WeatherAlphaOperator(float& alpha, bool rain)
             : mAlpha(alpha)
             , mIsRain(rain)
-        { }
-
-        osg::Object *cloneType() const override
         {
-            return nullptr;
         }
 
-        osg::Object *clone(const osg::CopyOp &op) const override
-        {
-            return nullptr;
-        }
+        osg::Object* cloneType() const override { return nullptr; }
+
+        osg::Object* clone(const osg::CopyOp& op) const override { return nullptr; }
 
-        void operate(osgParticle::Particle *particle, double dt) override
+        void operate(osgParticle::Particle* particle, double dt) override
         {
             constexpr float rainThreshold = 0.6f; // Rain_Threshold?
             float alpha = mIsRain ? mAlpha * rainThreshold : mAlpha;
@@ -144,7 +127,7 @@ namespace
         }
 
     private:
-        float &mAlpha;
+        float& mAlpha;
         bool mIsRain;
     };
 
@@ -155,7 +138,8 @@ namespace
         /// @param alpha the variable alpha value is recovered from
         AlphaFader(const float& alpha)
             : mAlpha(alpha)
-        { }
+        {
+        }
 
         void setDefaults(osg::StateSet* stateset) override
         {
@@ -171,19 +155,20 @@ namespace
         }
 
     protected:
-        const float &mAlpha;
+        const float& mAlpha;
     };
 
     // Helper for adding AlphaFaders to a subgraph
     class SetupVisitor : public osg::NodeVisitor
     {
     public:
-        SetupVisitor(const float &alpha)
+        SetupVisitor(const float& alpha)
             : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
             , mAlpha(alpha)
-        { }
+        {
+        }
 
-        void apply(osg::Node &node) override
+        void apply(osg::Node& node) override
         {
             if (osg::StateSet* stateset = node.getStateSet())
             {
@@ -214,15 +199,15 @@ namespace
         }
 
     private:
-        const float &mAlpha;
+        const float& mAlpha;
     };
 
     class SkyRTT : public SceneUtil::RTTNode
     {
     public:
-        SkyRTT(osg::Vec2f size, osg::Group* earlyRenderBinRoot) :
-            RTTNode(static_cast<int>(size.x()), static_cast<int>(size.y()), 0, false, 1, StereoAwareness::Aware),
-            mEarlyRenderBinRoot(earlyRenderBinRoot)
+        SkyRTT(osg::Vec2f size, osg::Group* earlyRenderBinRoot)
+            : RTTNode(static_cast<int>(size.x()), static_cast<int>(size.y()), 0, false, 1, StereoAwareness::Aware)
+            , mEarlyRenderBinRoot(earlyRenderBinRoot)
         {
             setDepthBufferInternalFormat(GL_DEPTH24_STENCIL8);
         }
@@ -282,7 +267,8 @@ namespace MWRender
         skyroot->setName("Sky Root");
         // Assign empty program to specify we don't want shaders when we are rendering in FFP pipeline
         if (!mSceneManager->getForceShaders())
-            skyroot->getOrCreateStateSet()->setAttributeAndModes(new osg::Program(), osg::StateAttribute::OVERRIDE|osg::StateAttribute::PROTECTED|osg::StateAttribute::ON);
+            skyroot->getOrCreateStateSet()->setAttributeAndModes(new osg::Program(),
+                osg::StateAttribute::OVERRIDE | osg::StateAttribute::PROTECTED | osg::StateAttribute::ON);
         SceneUtil::ShadowManager::disableShadowsForStateSet(skyroot->getOrCreateStateSet());
         parentNode->addChild(skyroot);
 
@@ -313,7 +299,8 @@ namespace MWRender
 
         bool forceShaders = mSceneManager->getForceShaders();
 
-        mAtmosphereDay = mSceneManager->getInstance(Settings::Manager::getString("skyatmosphere", "Models"), mEarlyRenderBinRoot);
+        mAtmosphereDay
+            = mSceneManager->getInstance(Settings::Manager::getString("skyatmosphere", "Models"), mEarlyRenderBinRoot);
         ModVertexAlphaVisitor modAtmosphere(ModVertexAlphaVisitor::Atmosphere);
         mAtmosphereDay->accept(modAtmosphere);
 
@@ -326,10 +313,13 @@ namespace MWRender
 
         osg::ref_ptr<osg::Node> atmosphereNight;
         if (mSceneManager->getVFS()->exists(Settings::Manager::getString("skynight02", "Models")))
-            atmosphereNight = mSceneManager->getInstance(Settings::Manager::getString("skynight02", "Models"), mAtmosphereNightNode);
+            atmosphereNight = mSceneManager->getInstance(
+                Settings::Manager::getString("skynight02", "Models"), mAtmosphereNightNode);
         else
-            atmosphereNight = mSceneManager->getInstance(Settings::Manager::getString("skynight01", "Models"), mAtmosphereNightNode);
-        atmosphereNight->getOrCreateStateSet()->setAttributeAndModes(createAlphaTrackingUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+            atmosphereNight = mSceneManager->getInstance(
+                Settings::Manager::getString("skynight01", "Models"), mAtmosphereNightNode);
+        atmosphereNight->getOrCreateStateSet()->setAttributeAndModes(
+            createAlphaTrackingUnlitMaterial(), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
 
         ModVertexAlphaVisitor modStars(ModVertexAlphaVisitor::Stars);
         atmosphereNight->accept(modStars);
@@ -338,21 +328,25 @@ namespace MWRender
 
         mSun = std::make_unique<Sun>(mEarlyRenderBinRoot, *mSceneManager);
         mSun->setSunglare(mSunglareEnabled);
-        mMasser = std::make_unique<Moon>(mEarlyRenderBinRoot, *mSceneManager, Fallback::Map::getFloat("Moons_Masser_Size")/125, Moon::Type_Masser);
-        mSecunda = std::make_unique<Moon>(mEarlyRenderBinRoot, *mSceneManager, Fallback::Map::getFloat("Moons_Secunda_Size")/125, Moon::Type_Secunda);
+        mMasser = std::make_unique<Moon>(
+            mEarlyRenderBinRoot, *mSceneManager, Fallback::Map::getFloat("Moons_Masser_Size") / 125, Moon::Type_Masser);
+        mSecunda = std::make_unique<Moon>(mEarlyRenderBinRoot, *mSceneManager,
+            Fallback::Map::getFloat("Moons_Secunda_Size") / 125, Moon::Type_Secunda);
 
         mCloudNode = new osg::Group;
         mEarlyRenderBinRoot->addChild(mCloudNode);
 
         mCloudMesh = new osg::PositionAttitudeTransform;
-        osg::ref_ptr<osg::Node> cloudMeshChild = mSceneManager->getInstance(Settings::Manager::getString("skyclouds", "Models"), mCloudMesh);
+        osg::ref_ptr<osg::Node> cloudMeshChild
+            = mSceneManager->getInstance(Settings::Manager::getString("skyclouds", "Models"), mCloudMesh);
         mCloudUpdater = new CloudUpdater(forceShaders);
         mCloudUpdater->setOpacity(1.f);
         cloudMeshChild->addUpdateCallback(mCloudUpdater);
         mCloudMesh->addChild(cloudMeshChild);
 
         mNextCloudMesh = new osg::PositionAttitudeTransform;
-        osg::ref_ptr<osg::Node> nextCloudMeshChild = mSceneManager->getInstance(Settings::Manager::getString("skyclouds", "Models"), mNextCloudMesh);
+        osg::ref_ptr<osg::Node> nextCloudMeshChild
+            = mSceneManager->getInstance(Settings::Manager::getString("skyclouds", "Models"), mNextCloudMesh);
         mNextCloudUpdater = new CloudUpdater(forceShaders);
         mNextCloudUpdater->setOpacity(0.f);
         nextCloudMeshChild->addUpdateCallback(mNextCloudUpdater);
@@ -371,10 +365,12 @@ namespace MWRender
             Shader::ShaderManager::DefineMap defines = {};
             Stereo::Manager::instance().shaderStereoDefines(defines);
             auto vertex = mSceneManager->getShaderManager().getShader("sky_vertex.glsl", defines, osg::Shader::VERTEX);
-            auto fragment = mSceneManager->getShaderManager().getShader("sky_fragment.glsl", defines, osg::Shader::FRAGMENT);
+            auto fragment
+                = mSceneManager->getShaderManager().getShader("sky_fragment.glsl", defines, osg::Shader::FRAGMENT);
             auto program = mSceneManager->getShaderManager().getProgram(vertex, fragment);
             mEarlyRenderBinRoot->getOrCreateStateSet()->addUniform(new osg::Uniform("pass", -1));
-            mEarlyRenderBinRoot->getOrCreateStateSet()->setAttributeAndModes(program, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+            mEarlyRenderBinRoot->getOrCreateStateSet()->setAttributeAndModes(
+                program, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
         }
 
         osg::ref_ptr<osg::Depth> depth = new SceneUtil::AutoDepth;
@@ -388,7 +384,7 @@ namespace MWRender
         mCreated = true;
     }
 
-    void SkyManager::setCamera(osg::Camera *camera)
+    void SkyManager::setCamera(osg::Camera* camera)
     {
         mCamera = camera;
     }
@@ -401,15 +397,16 @@ namespace MWRender
         mRainNode = new osg::Group;
 
         mRainParticleSystem = new NifOsg::ParticleSystem;
-        osg::Vec3 rainRange = osg::Vec3(mRainDiameter, mRainDiameter, (mRainMinHeight+mRainMaxHeight)/2.f);
+        osg::Vec3 rainRange = osg::Vec3(mRainDiameter, mRainDiameter, (mRainMinHeight + mRainMaxHeight) / 2.f);
 
         mRainParticleSystem->setParticleAlignment(osgParticle::ParticleSystem::FIXED);
-        mRainParticleSystem->setAlignVectorX(osg::Vec3f(0.1,0,0));
-        mRainParticleSystem->setAlignVectorY(osg::Vec3f(0,0,1));
+        mRainParticleSystem->setAlignVectorX(osg::Vec3f(0.1, 0, 0));
+        mRainParticleSystem->setAlignVectorY(osg::Vec3f(0, 0, 1));
 
         osg::ref_ptr<osg::StateSet> stateset = mRainParticleSystem->getOrCreateStateSet();
 
-        osg::ref_ptr<osg::Texture2D> raindropTex = new osg::Texture2D(mSceneManager->getImageManager()->getImage("textures/tx_raindrop_01.dds"));
+        osg::ref_ptr<osg::Texture2D> raindropTex
+            = new osg::Texture2D(mSceneManager->getImageManager()->getImage("textures/tx_raindrop_01.dds"));
         raindropTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         raindropTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
 
@@ -420,8 +417,8 @@ namespace MWRender
         stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
 
         osg::ref_ptr<osg::Material> mat = new osg::Material;
-        mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
-        mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
+        mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1, 1, 1, 1));
+        mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1, 1, 1, 1));
         mat->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
         stateset->setAttributeAndModes(mat);
 
@@ -440,11 +437,12 @@ namespace MWRender
         emitter->setPlacer(placer);
         mPlacer = placer;
 
-        // FIXME: vanilla engine does not use a particle system to handle rain, it uses a NIF-file with 20 raindrops in it.
-        // It spawns the (maxRaindrops-getParticleSystem()->numParticles())*dt/rainEntranceSpeed batches every frame (near 1-2).
-        // Since the rain is a regular geometry, it produces water ripples, also in theory it can be removed if collides with something.
+        // FIXME: vanilla engine does not use a particle system to handle rain, it uses a NIF-file with 20 raindrops in
+        // it. It spawns the (maxRaindrops-getParticleSystem()->numParticles())*dt/rainEntranceSpeed batches every frame
+        // (near 1-2). Since the rain is a regular geometry, it produces water ripples, also in theory it can be removed
+        // if collides with something.
         osg::ref_ptr<RainCounter> counter = new RainCounter;
-        counter->setNumberOfParticlesPerSecondToCreate(mRainMaxRaindrops/mRainEntranceSpeed*20);
+        counter->setNumberOfParticlesPerSecondToCreate(mRainMaxRaindrops / mRainEntranceSpeed * 20);
         emitter->setCounter(counter);
         mCounter = counter;
 
@@ -456,7 +454,7 @@ namespace MWRender
         updater->addParticleSystem(mRainParticleSystem);
 
         osg::ref_ptr<osgParticle::ModularProgram> program = new osgParticle::ModularProgram;
-        program->addOperator(new WrapAroundOperator(mCamera,rainRange));
+        program->addOperator(new WrapAroundOperator(mCamera, rainRange));
         program->addOperator(new WeatherAlphaOperator(mPrecipitationAlpha, true));
         program->setParticleSystem(mRainParticleSystem);
         mRainNode->addChild(program);
@@ -499,13 +497,15 @@ namespace MWRender
 
     int SkyManager::getMasserPhase() const
     {
-        if (!mCreated) return 0;
+        if (!mCreated)
+            return 0;
         return mMasser->getPhaseInt();
     }
 
     int SkyManager::getSecundaPhase() const
     {
-        if (!mCreated) return 0;
+        if (!mCreated)
+            return 0;
         return mSecunda->getPhaseInt();
     }
 
@@ -540,7 +540,7 @@ namespace MWRender
             quat.makeRotate(MWWorld::Weather::defaultDirection(), mStormParticleDirection);
             // Morrowind deliberately rotates the blizzard mesh, so so should we.
             if (mCurrentParticleEffect == Settings::Manager::getString("weatherblizzard", "Models"))
-                quat.makeRotate(osg::Vec3f(-1,0,0), mStormParticleDirection);
+                quat.makeRotate(osg::Vec3f(-1, 0, 0), mStormParticleDirection);
             mParticleNode->setAttitude(quat);
         }
 
@@ -561,9 +561,10 @@ namespace MWRender
         }
 
         // rotate the stars by 360 degrees every 4 days
-        mAtmosphereNightRoll += MWBase::Environment::get().getWorld()->getTimeScaleFactor()*duration*osg::DegreesToRadians(360.f) / (3600*96.f);
+        mAtmosphereNightRoll += MWBase::Environment::get().getWorld()->getTimeScaleFactor() * duration
+            * osg::DegreesToRadians(360.f) / (3600 * 96.f);
         if (mAtmosphereNightNode->getNodeMask() != 0)
-            mAtmosphereNightNode->setAttitude(osg::Quat(mAtmosphereNightRoll, osg::Vec3f(0,0,1)));
+            mAtmosphereNightNode->setAttitude(osg::Quat(mAtmosphereNightRoll, osg::Vec3f(0, 0, 1)));
     }
 
     void SkyManager::setEnabled(bool enabled)
@@ -585,27 +586,28 @@ namespace MWRender
         mEnabled = enabled;
     }
 
-    void SkyManager::setMoonColour (bool red)
+    void SkyManager::setMoonColour(bool red)
     {
-        if (!mCreated) return;
-        mSecunda->setColor(red ? mMoonScriptColor : osg::Vec4f(1,1,1,1));
+        if (!mCreated)
+            return;
+        mSecunda->setColor(red ? mMoonScriptColor : osg::Vec4f(1, 1, 1, 1));
     }
 
     void SkyManager::updateRainParameters()
     {
         if (mRainShooter)
         {
-            float angle = -std::atan(mWindSpeed/50.f);
-            mRainShooter->setVelocity(osg::Vec3f(0, mRainSpeed*std::sin(angle), -mRainSpeed/std::cos(angle)));
+            float angle = -std::atan(mWindSpeed / 50.f);
+            mRainShooter->setVelocity(osg::Vec3f(0, mRainSpeed * std::sin(angle), -mRainSpeed / std::cos(angle)));
             mRainShooter->setAngle(angle);
 
-            osg::Vec3 rainRange = osg::Vec3(mRainDiameter, mRainDiameter, (mRainMinHeight+mRainMaxHeight)/2.f);
+            osg::Vec3 rainRange = osg::Vec3(mRainDiameter, mRainDiameter, (mRainMinHeight + mRainMaxHeight) / 2.f);
 
             mPlacer->setXRange(-rainRange.x() / 2, rainRange.x() / 2);
             mPlacer->setYRange(-rainRange.y() / 2, rainRange.y() / 2);
             mPlacer->setZRange(-rainRange.z() / 2, rainRange.z() / 2);
 
-            mCounter->setNumberOfParticlesPerSecondToCreate(mRainMaxRaindrops/mRainEntranceSpeed*20);
+            mCounter->setNumberOfParticlesPerSecondToCreate(mRainMaxRaindrops / mRainEntranceSpeed * 20);
         }
     }
 
@@ -620,7 +622,8 @@ namespace MWRender
 
     void SkyManager::setWeather(const WeatherResult& weather)
     {
-        if (!mCreated) return;
+        if (!mCreated)
+            return;
 
         mRainEntranceSpeed = weather.mRainEntranceSpeed;
         mRainMaxRaindrops = weather.mRainMaxRaindrops;
@@ -694,18 +697,20 @@ namespace MWRender
 
                 for (unsigned int i = 0; i < findPSVisitor.mFoundNodes.size(); ++i)
                 {
-                    osgParticle::ParticleSystem *ps = static_cast<osgParticle::ParticleSystem *>(findPSVisitor.mFoundNodes[i]);
+                    osgParticle::ParticleSystem* ps
+                        = static_cast<osgParticle::ParticleSystem*>(findPSVisitor.mFoundNodes[i]);
 
                     osg::ref_ptr<osgParticle::ModularProgram> program = new osgParticle::ModularProgram;
                     if (!mIsStorm)
-                        program->addOperator(new WrapAroundOperator(mCamera,osg::Vec3(1024,1024,800)));
+                        program->addOperator(new WrapAroundOperator(mCamera, osg::Vec3(1024, 1024, 800)));
                     program->addOperator(new WeatherAlphaOperator(mPrecipitationAlpha, false));
                     program->setParticleSystem(ps);
                     mParticleNode->addChild(program);
 
                     for (int particleIndex = 0; particleIndex < ps->numParticles(); ++particleIndex)
                     {
-                        ps->getParticle(particleIndex)->setAlphaRange(osgParticle::rangef(mPrecipitationAlpha, mPrecipitationAlpha));
+                        ps->getParticle(particleIndex)
+                            ->setAlphaRange(osgParticle::rangef(mPrecipitationAlpha, mPrecipitationAlpha));
                         ps->getParticle(particleIndex)->update(0, true);
                     }
 
@@ -722,7 +727,8 @@ namespace MWRender
 
             std::string texture = Misc::ResourceHelpers::correctTexturePath(mClouds, mSceneManager->getVFS());
 
-            osg::ref_ptr<osg::Texture2D> cloudTex = new osg::Texture2D(mSceneManager->getImageManager()->getImage(texture));
+            osg::ref_ptr<osg::Texture2D> cloudTex
+                = new osg::Texture2D(mSceneManager->getImageManager()->getImage(texture));
             cloudTex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
             cloudTex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
 
@@ -743,7 +749,8 @@ namespace MWRender
             {
                 std::string texture = Misc::ResourceHelpers::correctTexturePath(mNextClouds, mSceneManager->getVFS());
 
-                osg::ref_ptr<osg::Texture2D> cloudTex = new osg::Texture2D(mSceneManager->getImageManager()->getImage(texture));
+                osg::ref_ptr<osg::Texture2D> cloudTex
+                    = new osg::Texture2D(mSceneManager->getImageManager()->getImage(texture));
                 cloudTex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
                 cloudTex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
 
@@ -763,7 +770,7 @@ namespace MWRender
 
         if (mCloudColour != weather.mFogColor)
         {
-            osg::Vec4f clr (weather.mFogColor);
+            osg::Vec4f clr(weather.mFogColor);
             clr += osg::Vec4f(0.13f, 0.13f, 0.13f, 0.f);
 
             mCloudUpdater->setEmissionColor(clr);
@@ -809,7 +816,8 @@ namespace MWRender
 
     float SkyManager::getBaseWindSpeed() const
     {
-        if (!mCreated) return 0.f;
+        if (!mCreated)
+            return 0.f;
 
         return mBaseWindSpeed;
     }
@@ -824,40 +832,45 @@ namespace MWRender
 
     void SkyManager::sunEnable()
     {
-        if (!mCreated) return;
+        if (!mCreated)
+            return;
 
         mSun->setVisible(true);
     }
 
     void SkyManager::sunDisable()
     {
-        if (!mCreated) return;
+        if (!mCreated)
+            return;
 
         mSun->setVisible(false);
     }
 
-    void SkyManager::setStormParticleDirection(const osg::Vec3f &direction)
+    void SkyManager::setStormParticleDirection(const osg::Vec3f& direction)
     {
         mStormParticleDirection = direction;
     }
 
     void SkyManager::setSunDirection(const osg::Vec3f& direction)
     {
-        if (!mCreated) return;
+        if (!mCreated)
+            return;
 
         mSun->setDirection(direction);
     }
 
     void SkyManager::setMasserState(const MoonState& state)
     {
-        if(!mCreated) return;
+        if (!mCreated)
+            return;
 
         mMasser->setState(state);
     }
 
     void SkyManager::setSecundaState(const MoonState& state)
     {
-        if(!mCreated) return;
+        if (!mCreated)
+            return;
 
         mSecunda->setState(state);
     }
diff --git a/apps/openmw/mwrender/sky.hpp b/apps/openmw/mwrender/sky.hpp
index 8682a6f17f..a365d32342 100644
--- a/apps/openmw/mwrender/sky.hpp
+++ b/apps/openmw/mwrender/sky.hpp
@@ -1,12 +1,12 @@
 #ifndef OPENMW_MWRENDER_SKY_H
 #define OPENMW_MWRENDER_SKY_H
 
-#include <string>
 #include <memory>
+#include <string>
 #include <vector>
 
-#include <osg/ref_ptr>
 #include <osg/Vec4f>
+#include <osg/ref_ptr>
 
 #include "skyutil.hpp"
 
@@ -37,7 +37,8 @@ namespace SceneUtil
 
 namespace MWRender
 {
-    ///@brief The SkyManager handles rendering of the sky domes, celestial bodies as well as other objects that need to be rendered
+    ///@brief The SkyManager handles rendering of the sky domes, celestial bodies as well as other objects that need to
+    /// be rendered
     /// relative to the camera (e.g. weather particle effects)
     class SkyManager
     {
@@ -49,10 +50,10 @@ namespace MWRender
 
         void setEnabled(bool enabled);
 
-        void setHour (double hour);
+        void setHour(double hour);
         ///< will be called even when sky is disabled.
 
-        void setDate (int day, int month);
+        void setDate(int day, int month);
         ///< will be called even when sky is disabled.
 
         int getMasserPhase() const;
@@ -63,7 +64,7 @@ namespace MWRender
         ///< 0 new moon, 1 waxing or waning cresecent, 2 waxing or waning half,
         /// 3 waxing or waning gibbous, 4 full moon
 
-        void setMoonColour (bool red);
+        void setMoonColour(bool red);
         ///< change Secunda colour to red
 
         void setWeather(const WeatherResult& weather);
@@ -97,7 +98,7 @@ namespace MWRender
 
         void listAssetsToPreload(std::vector<std::string>& models, std::vector<std::string>& textures);
 
-        void setCamera(osg::Camera *camera);
+        void setCamera(osg::Camera* camera);
 
         float getBaseWindSpeed() const;
 
@@ -116,7 +117,7 @@ namespace MWRender
 
         Resource::SceneManager* mSceneManager;
 
-        osg::Camera *mCamera;
+        osg::Camera* mCamera;
 
         osg::ref_ptr<osg::Group> mRootNode;
         osg::ref_ptr<osg::Group> mEarlyRenderBinRoot;
diff --git a/apps/openmw/mwrender/skyutil.cpp b/apps/openmw/mwrender/skyutil.cpp
index 3c2cd1c6e9..9f0d0ec54c 100644
--- a/apps/openmw/mwrender/skyutil.cpp
+++ b/apps/openmw/mwrender/skyutil.cpp
@@ -2,29 +2,29 @@
 
 #include <cmath>
 
-#include <osg/Transform>
+#include <osg/AlphaFunc>
+#include <osg/BlendFunc>
+#include <osg/ColorMask>
 #include <osg/Depth>
 #include <osg/Geometry>
 #include <osg/Material>
+#include <osg/OcclusionQueryNode>
+#include <osg/PositionAttitudeTransform>
 #include <osg/TexEnvCombine>
 #include <osg/TexMat>
-#include <osg/OcclusionQueryNode>
-#include <osg/ColorMask>
-#include <osg/BlendFunc>
-#include <osg/AlphaFunc>
+#include <osg/Transform>
 #include <osg/observer_ptr>
-#include <osg/PositionAttitudeTransform>
 
 #include <osgUtil/CullVisitor>
 
 #include <osgParticle/Particle>
 
 #include <components/misc/rng.hpp>
-#include <components/stereo/stereomanager.hpp>
 #include <components/stereo/multiview.hpp>
+#include <components/stereo/stereomanager.hpp>
 
-#include <components/resource/scenemanager.hpp>
 #include <components/resource/imagemanager.hpp>
+#include <components/resource/scenemanager.hpp>
 
 #include <components/sceneutil/depth.hpp>
 
@@ -37,8 +37,8 @@
 
 #include "../mwworld/weather.hpp"
 
-#include "vismask.hpp"
 #include "renderbin.hpp"
+#include "vismask.hpp"
 
 namespace
 {
@@ -75,20 +75,17 @@ namespace
         colors->push_back(osg::Vec4(1.f, 1.f, 1.f, 1.f));
         geom->setColorArray(colors, osg::Array::BIND_OVERALL);
 
-        for (int i=0; i<numUvSets; ++i)
+        for (int i = 0; i < numUvSets; ++i)
             geom->setTexCoordArray(i, texcoords, osg::Array::BIND_PER_VERTEX);
 
-        geom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::QUADS,0,4));
+        geom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::QUADS, 0, 4));
 
         return geom;
     }
 
     struct DummyComputeBoundCallback : osg::Node::ComputeBoundingSphereCallback
     {
-        osg::BoundingSphere computeBound(const osg::Node& node) const override
-        {
-            return osg::BoundingSphere();
-        }
+        osg::BoundingSphere computeBound(const osg::Node& node) const override { return osg::BoundingSphere(); }
     };
 }
 
@@ -117,27 +114,27 @@ namespace MWRender
 
         SunUpdater()
             : mColor(1.f, 1.f, 1.f, 1.f)
-        { }
-
-        void setDefaults(osg::StateSet* stateset) override
         {
-            stateset->setAttributeAndModes(createUnlitMaterial());
         }
 
+        void setDefaults(osg::StateSet* stateset) override { stateset->setAttributeAndModes(createUnlitMaterial()); }
+
         void apply(osg::StateSet* stateset, osg::NodeVisitor*) override
         {
             osg::Material* mat = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
-            mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,mColor.a()));
+            mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0, 0, 0, mColor.a()));
             mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(mColor.r(), mColor.g(), mColor.b(), 1));
         }
     };
 
-    OcclusionCallback::OcclusionCallback(osg::ref_ptr<osg::OcclusionQueryNode> oqnVisible, osg::ref_ptr<osg::OcclusionQueryNode> oqnTotal)
+    OcclusionCallback::OcclusionCallback(
+        osg::ref_ptr<osg::OcclusionQueryNode> oqnVisible, osg::ref_ptr<osg::OcclusionQueryNode> oqnTotal)
         : mOcclusionQueryVisiblePixels(oqnVisible)
         , mOcclusionQueryTotalPixels(oqnTotal)
-    { }
+    {
+    }
 
-    float OcclusionCallback::getVisibleRatio (osg::Camera* camera)
+    float OcclusionCallback::getVisibleRatio(osg::Camera* camera)
     {
         int visible = mOcclusionQueryVisiblePixels->getQueryGeometry()->getNumPixels(camera);
         int total = mOcclusionQueryTotalPixels->getQueryGeometry()->getNumPixels(camera);
@@ -150,7 +147,7 @@ namespace MWRender
 
         float lastRatio = mLastRatio[osg::observer_ptr<osg::Camera>(camera)];
 
-        float change = dt*10;
+        float change = dt * 10;
 
         if (visibleRatio > lastRatio)
             visibleRatio = std::min(visibleRatio, lastRatio + change);
@@ -162,14 +159,18 @@ namespace MWRender
         return visibleRatio;
     }
 
-    /// SunFlashCallback handles fading/scaling of a node depending on occlusion query result. Must be attached as a cull callback.
-    class SunFlashCallback : public OcclusionCallback, public SceneUtil::NodeCallback<SunFlashCallback, osg::Node*, osgUtil::CullVisitor*>
+    /// SunFlashCallback handles fading/scaling of a node depending on occlusion query result. Must be attached as a
+    /// cull callback.
+    class SunFlashCallback : public OcclusionCallback,
+                             public SceneUtil::NodeCallback<SunFlashCallback, osg::Node*, osgUtil::CullVisitor*>
     {
     public:
-        SunFlashCallback(osg::ref_ptr<osg::OcclusionQueryNode> oqnVisible, osg::ref_ptr<osg::OcclusionQueryNode> oqnTotal)
+        SunFlashCallback(
+            osg::ref_ptr<osg::OcclusionQueryNode> oqnVisible, osg::ref_ptr<osg::OcclusionQueryNode> oqnTotal)
             : OcclusionCallback(oqnVisible, oqnTotal)
             , mGlareView(1.f)
-        { }
+        {
+        }
 
         void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
         {
@@ -183,10 +184,10 @@ namespace MWRender
                 if (visibleRatio < fadeThreshold)
                 {
                     float fade = 1.f - (fadeThreshold - visibleRatio) / fadeThreshold;
-                    osg::ref_ptr<osg::Material> mat (createUnlitMaterial());
-                    mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,fade*mGlareView));
+                    osg::ref_ptr<osg::Material> mat(createUnlitMaterial());
+                    mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0, 0, 0, fade * mGlareView));
                     stateset = new osg::StateSet;
-                    stateset->setAttributeAndModes(mat, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+                    stateset->setAttributeAndModes(mat, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
                 }
                 else if (visibleRatio < 1.f)
                 {
@@ -224,22 +225,20 @@ namespace MWRender
             }
         }
 
-        void setGlareView(float value)
-        {
-            mGlareView = value;
-        }
+        void setGlareView(float value) { mGlareView = value; }
 
     private:
         float mGlareView;
     };
 
-    /// SunGlareCallback controls a full-screen glare effect depending on occlusion query result and the angle between sun and camera.
-    /// Must be attached as a cull callback to the node above the glare node.
-    class SunGlareCallback : public OcclusionCallback, public SceneUtil::NodeCallback<SunGlareCallback, osg::Node*, osgUtil::CullVisitor*>
+    /// SunGlareCallback controls a full-screen glare effect depending on occlusion query result and the angle between
+    /// sun and camera. Must be attached as a cull callback to the node above the glare node.
+    class SunGlareCallback : public OcclusionCallback,
+                             public SceneUtil::NodeCallback<SunGlareCallback, osg::Node*, osgUtil::CullVisitor*>
     {
     public:
-        SunGlareCallback(osg::ref_ptr<osg::OcclusionQueryNode> oqnVisible, osg::ref_ptr<osg::OcclusionQueryNode> oqnTotal,
-                        osg::ref_ptr<osg::PositionAttitudeTransform> sunTransform)
+        SunGlareCallback(osg::ref_ptr<osg::OcclusionQueryNode> oqnVisible,
+            osg::ref_ptr<osg::OcclusionQueryNode> oqnTotal, osg::ref_ptr<osg::PositionAttitudeTransform> sunTransform)
             : OcclusionCallback(oqnVisible, oqnTotal)
             , mSunTransform(sunTransform)
             , mTimeOfDayFade(1.f)
@@ -249,15 +248,15 @@ namespace MWRender
             mSunGlareFaderMax = Fallback::Map::getFloat("Weather_Sun_Glare_Fader_Max");
             mSunGlareFaderAngleMax = Fallback::Map::getFloat("Weather_Sun_Glare_Fader_Angle_Max");
 
-            // Replicating a design flaw in MW. The color was being set on both ambient and emissive properties, which multiplies the result by two,
-            // then finally gets clamped by the fixed function pipeline. With the default INI settings, only the red component gets clamped,
-            // so the resulting color looks more orange than red.
+            // Replicating a design flaw in MW. The color was being set on both ambient and emissive properties, which
+            // multiplies the result by two, then finally gets clamped by the fixed function pipeline. With the default
+            // INI settings, only the red component gets clamped, so the resulting color looks more orange than red.
             mColor *= 2;
-            for (int i=0; i<3; ++i)
+            for (int i = 0; i < 3; ++i)
                 mColor[i] = std::min(1.f, mColor[i]);
         }
 
-        void operator ()(osg::Node* node, osgUtil::CullVisitor* cv)
+        void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
         {
             float angleRadians = getAngleToSunInRadians(*cv->getCurrentRenderStage()->getInitialViewMatrix());
             float visibleRatio = getVisibleRatio(cv->getCurrentCamera());
@@ -280,7 +279,7 @@ namespace MWRender
 
                 osg::ref_ptr<osg::Material> mat = createUnlitMaterial();
 
-                mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,fade));
+                mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0, 0, 0, fade));
                 mat->setEmission(osg::Material::FRONT_AND_BACK, mColor);
 
                 stateset->setAttributeAndModes(mat);
@@ -291,15 +290,9 @@ namespace MWRender
             }
         }
 
-        void setTimeOfDayFade(float val)
-        {
-            mTimeOfDayFade = val;
-        }
+        void setTimeOfDayFade(float val) { mTimeOfDayFade = val; }
 
-        void setGlareView(float glareView)
-        {
-            mGlareView = glareView;
-        }
+        void setGlareView(float glareView) { mGlareView = glareView; }
 
     private:
         float getAngleToSunInRadians(const osg::Matrix& viewMatrix) const
@@ -344,7 +337,8 @@ namespace MWRender
             , mAtmosphereColor(1.0f, 1.0f, 1.0f, 1.0f)
             , mMoonColor(1.0f, 1.0f, 1.0f, 1.0f)
             , mForceShaders(forceShaders)
-        { }
+        {
+        }
 
         void setDefaults(osg::StateSet* stateset) override
         {
@@ -353,13 +347,14 @@ namespace MWRender
                 stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Moon)));
                 stateset->setTextureAttributeAndModes(0, mPhaseTex);
                 stateset->setTextureAttributeAndModes(1, mCircleTex);
-                stateset->setTextureMode(0, GL_TEXTURE_2D, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-                stateset->setTextureMode(1, GL_TEXTURE_2D, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+                stateset->setTextureMode(0, GL_TEXTURE_2D, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+                stateset->setTextureMode(1, GL_TEXTURE_2D, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
                 stateset->addUniform(new osg::Uniform("moonBlend", osg::Vec4f{}));
                 stateset->addUniform(new osg::Uniform("atmosphereFade", osg::Vec4f{}));
                 stateset->addUniform(new osg::Uniform("diffuseMap", 0));
                 stateset->addUniform(new osg::Uniform("maskMap", 1));
-                stateset->setAttributeAndModes(createUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+                stateset->setAttributeAndModes(
+                    createUnlitMaterial(), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
             }
             else
             {
@@ -381,7 +376,8 @@ namespace MWRender
                 texEnv2->setSource1_RGB(osg::TexEnvCombine::CONSTANT);
                 texEnv2->setConstantColor(osg::Vec4f(0.f, 0.f, 0.f, 1.f)); // mAtmosphereColor.rgb, mTransparency
                 stateset->setTextureAttributeAndModes(1, texEnv2);
-                stateset->setAttributeAndModes(createUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+                stateset->setAttributeAndModes(
+                    createUnlitMaterial(), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
             }
         }
 
@@ -389,21 +385,25 @@ namespace MWRender
         {
             if (mForceShaders)
             {
-                stateset->setTextureAttribute(0, mPhaseTex, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-                stateset->setTextureAttribute(1, mCircleTex, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+                stateset->setTextureAttribute(0, mPhaseTex, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+                stateset->setTextureAttribute(1, mCircleTex, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
 
                 if (auto* uMoonBlend = stateset->getUniform("moonBlend"))
                     uMoonBlend->set(mMoonColor * mShadowBlend);
                 if (auto* uAtmosphereFade = stateset->getUniform("atmosphereFade"))
-                    uAtmosphereFade->set(osg::Vec4f(mAtmosphereColor.x(), mAtmosphereColor.y(), mAtmosphereColor.z(), mTransparency));
+                    uAtmosphereFade->set(
+                        osg::Vec4f(mAtmosphereColor.x(), mAtmosphereColor.y(), mAtmosphereColor.z(), mTransparency));
             }
             else
             {
-                osg::TexEnvCombine* texEnv = static_cast<osg::TexEnvCombine*>(stateset->getTextureAttribute(0, osg::StateAttribute::TEXENV));
+                osg::TexEnvCombine* texEnv
+                    = static_cast<osg::TexEnvCombine*>(stateset->getTextureAttribute(0, osg::StateAttribute::TEXENV));
                 texEnv->setConstantColor(mMoonColor * mShadowBlend);
 
-                osg::TexEnvCombine* texEnv2 = static_cast<osg::TexEnvCombine*>(stateset->getTextureAttribute(1, osg::StateAttribute::TEXENV));
-                texEnv2->setConstantColor(osg::Vec4f(mAtmosphereColor.x(), mAtmosphereColor.y(), mAtmosphereColor.z(), mTransparency));
+                osg::TexEnvCombine* texEnv2
+                    = static_cast<osg::TexEnvCombine*>(stateset->getTextureAttribute(1, osg::StateAttribute::TEXENV));
+                texEnv2->setConstantColor(
+                    osg::Vec4f(mAtmosphereColor.x(), mAtmosphereColor.y(), mAtmosphereColor.z(), mTransparency));
             }
         }
 
@@ -420,10 +420,11 @@ namespace MWRender
         }
     };
 
-    class CameraRelativeTransformCullCallback : public SceneUtil::NodeCallback<CameraRelativeTransformCullCallback, osg::Node*, osgUtil::CullVisitor*>
+    class CameraRelativeTransformCullCallback
+        : public SceneUtil::NodeCallback<CameraRelativeTransformCullCallback, osg::Node*, osgUtil::CullVisitor*>
     {
     public:
-        void operator() (osg::Node* node, osgUtil::CullVisitor* cv)
+        void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
         {
             // XXX have to remove unwanted culling plane of the water reflection camera
 
@@ -436,7 +437,7 @@ namespace MWRender
 
             unsigned int mask = 0x1;
             unsigned int resultMask = cv->getProjectionCullingStack().back().getFrustum().getResultMask();
-            for (unsigned int i=0; i<cv->getProjectionCullingStack().back().getFrustum().getPlaneList().size(); ++i)
+            for (unsigned int i = 0; i < cv->getProjectionCullingStack().back().getFrustum().getPlaneList().size(); ++i)
             {
                 if (i >= numPlanes)
                 {
@@ -467,7 +468,8 @@ namespace MWRender
 
     void AtmosphereUpdater::setDefaults(osg::StateSet* stateset)
     {
-        stateset->setAttributeAndModes(createAlphaTrackingUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+        stateset->setAttributeAndModes(
+            createAlphaTrackingUnlitMaterial(), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
         stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Atmosphere)));
     }
 
@@ -478,10 +480,11 @@ namespace MWRender
     }
 
     AtmosphereNightUpdater::AtmosphereNightUpdater(Resource::ImageManager* imageManager, bool forceShaders)
-        : mColor(osg::Vec4f(0,0,0,0))
+        : mColor(osg::Vec4f(0, 0, 0, 0))
         , mTexture(new osg::Texture2D(imageManager->getWarningImage()))
         , mForceShaders(forceShaders)
-    { }
+    {
+    }
 
     void AtmosphereNightUpdater::setFade(float fade)
     {
@@ -504,8 +507,8 @@ namespace MWRender
             texEnv->setCombine_RGB(osg::TexEnvCombine::REPLACE);
             texEnv->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
 
-            stateset->setTextureAttributeAndModes(1, mTexture, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-            stateset->setTextureAttributeAndModes(1, texEnv, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+            stateset->setTextureAttributeAndModes(1, mTexture, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+            stateset->setTextureAttributeAndModes(1, texEnv, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
         }
     }
 
@@ -517,7 +520,8 @@ namespace MWRender
         }
         else
         {
-            osg::TexEnvCombine* texEnv = static_cast<osg::TexEnvCombine*>(stateset->getTextureAttribute(1, osg::StateAttribute::TEXENV));
+            osg::TexEnvCombine* texEnv
+                = static_cast<osg::TexEnvCombine*>(stateset->getTextureAttribute(1, osg::StateAttribute::TEXENV));
             texEnv->setConstantColor(mColor);
         }
     }
@@ -525,7 +529,8 @@ namespace MWRender
     CloudUpdater::CloudUpdater(bool forceShaders)
         : mOpacity(0.f)
         , mForceShaders(forceShaders)
-    { }
+    {
+    }
 
     void CloudUpdater::setTexture(osg::ref_ptr<osg::Texture2D> texture)
     {
@@ -547,16 +552,17 @@ namespace MWRender
         mTexMat = osg::Matrixf::translate(osg::Vec3f(0.f, -timer, 0.f));
     }
 
-    void CloudUpdater::setDefaults(osg::StateSet *stateset)
+    void CloudUpdater::setDefaults(osg::StateSet* stateset)
     {
-        stateset->setAttribute(createAlphaTrackingUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+        stateset->setAttribute(
+            createAlphaTrackingUnlitMaterial(), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
 
         osg::ref_ptr<osg::TexMat> texmat = new osg::TexMat;
         stateset->setTextureAttributeAndModes(0, texmat);
 
         if (mForceShaders)
         {
-            stateset->setTextureAttribute(0, mTexture, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+            stateset->setTextureAttribute(0, mTexture, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
 
             stateset->addUniform(new osg::Uniform("opacity", 1.f));
             stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Clouds)));
@@ -569,20 +575,20 @@ namespace MWRender
             texEnvCombine->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
             texEnvCombine->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
             texEnvCombine->setSource1_Alpha(osg::TexEnvCombine::CONSTANT);
-            texEnvCombine->setConstantColor(osg::Vec4f(1,1,1,1));
+            texEnvCombine->setConstantColor(osg::Vec4f(1, 1, 1, 1));
             texEnvCombine->setCombine_Alpha(osg::TexEnvCombine::MODULATE);
             texEnvCombine->setCombine_RGB(osg::TexEnvCombine::REPLACE);
 
             stateset->setTextureAttributeAndModes(1, texEnvCombine);
 
-            stateset->setTextureMode(0, GL_TEXTURE_2D, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-            stateset->setTextureMode(1, GL_TEXTURE_2D, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+            stateset->setTextureMode(0, GL_TEXTURE_2D, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+            stateset->setTextureMode(1, GL_TEXTURE_2D, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
         }
     }
 
-    void CloudUpdater::apply(osg::StateSet *stateset, osg::NodeVisitor *nv)
+    void CloudUpdater::apply(osg::StateSet* stateset, osg::NodeVisitor* nv)
     {
-        stateset->setTextureAttribute(0, mTexture, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+        stateset->setTextureAttribute(0, mTexture, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
 
         osg::Material* mat = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
         mat->setEmission(osg::Material::FRONT_AND_BACK, mEmissionColor);
@@ -596,27 +602,25 @@ namespace MWRender
         }
         else
         {
-            stateset->setTextureAttribute(1, mTexture, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+            stateset->setTextureAttribute(1, mTexture, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
 
-            osg::TexEnvCombine* texEnv = static_cast<osg::TexEnvCombine*>(stateset->getTextureAttribute(1, osg::StateAttribute::TEXENV));
-            texEnv->setConstantColor(osg::Vec4f(1,1,1,mOpacity));
+            osg::TexEnvCombine* texEnv
+                = static_cast<osg::TexEnvCombine*>(stateset->getTextureAttribute(1, osg::StateAttribute::TEXENV));
+            texEnv->setConstantColor(osg::Vec4f(1, 1, 1, mOpacity));
         }
     }
 
-
     class SkyStereoStatesetUpdater : public SceneUtil::StateSetUpdater
     {
     public:
-        SkyStereoStatesetUpdater()
-        {
-        }
+        SkyStereoStatesetUpdater() {}
 
     protected:
         void setDefaults(osg::StateSet* stateset) override
         {
             if (!Stereo::getMultiview())
-                stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "projectionMatrix"), osg::StateAttribute::OVERRIDE);
-
+                stateset->addUniform(
+                    new osg::Uniform(osg::Uniform::FLOAT_MAT4, "projectionMatrix"), osg::StateAttribute::OVERRIDE);
         }
 
         void apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/) override
@@ -626,11 +630,11 @@ namespace MWRender
                 std::array<osg::Matrix, 2> projectionMatrices;
                 auto& sm = Stereo::Manager::instance();
 
-                for (int view : {0, 1})
+                for (int view : { 0, 1 })
                 {
                     auto projectionMatrix = sm.computeEyeProjection(view, true);
                     auto viewOffsetMatrix = sm.computeEyeViewOffset(view);
-                    for (int col : {0, 1, 2})
+                    for (int col : { 0, 1, 2 })
                         viewOffsetMatrix(3, col) = 0;
 
                     projectionMatrices[view] = viewOffsetMatrix * projectionMatrix;
@@ -645,7 +649,7 @@ namespace MWRender
             auto* projectionMatrixUniform = stateset->getUniform("projectionMatrix");
             auto projectionMatrix = sm.computeEyeProjection(0, true);
             auto viewOffsetMatrix = sm.computeEyeViewOffset(0);
-            for (int col : {0, 1, 2})
+            for (int col : { 0, 1, 2 })
                 viewOffsetMatrix(3, col) = 0;
 
             projectionMatrixUniform->set(viewOffsetMatrix * projectionMatrix);
@@ -656,7 +660,7 @@ namespace MWRender
             auto* projectionMatrixUniform = stateset->getUniform("projectionMatrix");
             auto projectionMatrix = sm.computeEyeProjection(1, true);
             auto viewOffsetMatrix = sm.computeEyeViewOffset(1);
-            for (int col : {0, 1, 2})
+            for (int col : { 0, 1, 2 })
                 viewOffsetMatrix(3, col) = 0;
 
             projectionMatrixUniform->set(viewOffsetMatrix * projectionMatrix);
@@ -679,7 +683,8 @@ namespace MWRender
 
     CameraRelativeTransform::CameraRelativeTransform(const CameraRelativeTransform& copy, const osg::CopyOp& copyop)
         : osg::Transform(copy, copyop)
-    { }
+    {
+    }
 
     const osg::Vec3f& CameraRelativeTransform::getLastViewPoint() const
     {
@@ -693,9 +698,9 @@ namespace MWRender
             mViewPoint = static_cast<osgUtil::CullVisitor*>(nv)->getViewPoint();
         }
 
-        if (_referenceFrame==RELATIVE_RF)
+        if (_referenceFrame == RELATIVE_RF)
         {
-            matrix.setTrans(osg::Vec3f(0.f,0.f,0.f));
+            matrix.setTrans(osg::Vec3f(0.f, 0.f, 0.f));
             return false;
         }
         else // absolute
@@ -714,7 +719,8 @@ namespace MWRender
         : mCameraRelativeTransform(cameraRelativeTransform)
         , mEnabled(true)
         , mWaterLevel(0.f)
-    { }
+    {
+    }
 
     bool UnderwaterSwitchCallback::isUnderwater()
     {
@@ -748,7 +754,7 @@ namespace MWRender
         mGeom->getOrCreateStateSet();
         mTransform = new osg::PositionAttitudeTransform;
         mTransform->setNodeMask(mVisibleMask);
-        mTransform->setScale(osg::Vec3f(450,450,450) * scaleFactor);
+        mTransform->setScale(osg::Vec3f(450, 450, 450) * scaleFactor);
         mTransform->addChild(mGeom);
 
         parentNode->addChild(mTransform);
@@ -780,7 +786,8 @@ namespace MWRender
         osg::StateSet* stateset = queryNode->getOrCreateStateSet();
         stateset->setRenderBinDetails(RenderBin_OcclusionQuery, "RenderBin");
         stateset->setNestRenderBins(false);
-        // Set up alpha testing on the occlusion testing subgraph, that way we can get the occlusion tested fragments to match the circular shape of the sun
+        // Set up alpha testing on the occlusion testing subgraph, that way we can get the occlusion tested fragments to
+        // match the circular shape of the sun
         if (!sceneManager.getForceShaders())
         {
             osg::ref_ptr<osg::AlphaFunc> alphaFunc = new osg::AlphaFunc;
@@ -857,15 +864,15 @@ namespace MWRender
         // With OSG 3.6.5, the method of providing user defined query geometry has been completely replaced
         osg::ref_ptr<osg::QueryGeometry> queryGeom = new osg::QueryGeometry(oqn->getName());
 
-        // Make it fast! A DYNAMIC query geometry means we can't break frame until the flare is rendered (which is rendered after all the other geometry,
-        // so that would be pretty bad). STATIC should be safe, since our node's local bounds are static, thus computeBounds() which modifies the queryGeometry
-        // is only called once.
-        // Note the debug geometry setDebugDisplay(true) is always DYNAMIC and that can't be changed, not a big deal.
+        // Make it fast! A DYNAMIC query geometry means we can't break frame until the flare is rendered (which is
+        // rendered after all the other geometry, so that would be pretty bad). STATIC should be safe, since our node's
+        // local bounds are static, thus computeBounds() which modifies the queryGeometry is only called once. Note the
+        // debug geometry setDebugDisplay(true) is always DYNAMIC and that can't be changed, not a big deal.
         queryGeom->setDataVariance(osg::Object::STATIC);
 
-        // Set up the query geometry to match the actual sun's rendering shape. osg::OcclusionQueryNode wasn't originally intended to allow this,
-        // normally it would automatically adjust the query geometry to match the sub graph's bounding box. The below hack is needed to
-        // circumvent this.
+        // Set up the query geometry to match the actual sun's rendering shape. osg::OcclusionQueryNode wasn't
+        // originally intended to allow this, normally it would automatically adjust the query geometry to match the sub
+        // graph's bounding box. The below hack is needed to circumvent this.
         queryGeom->setVertexArray(mGeom->getVertexArray());
         queryGeom->setTexCoordArray(0, mGeom->getTexCoordArray(0), osg::Array::BIND_PER_VERTEX);
         queryGeom->removePrimitiveSet(0, queryGeom->getNumPrimitiveSets());
@@ -905,12 +912,13 @@ namespace MWRender
 
     void Sun::createSunFlash(Resource::ImageManager& imageManager)
     {
-        osg::ref_ptr<osg::Texture2D> tex = new osg::Texture2D(imageManager.getImage("textures/tx_sun_flash_grey_05.dds"));
+        osg::ref_ptr<osg::Texture2D> tex
+            = new osg::Texture2D(imageManager.getImage("textures/tx_sun_flash_grey_05.dds"));
         tex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         tex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
         tex->setName("diffuseMap");
 
-        osg::ref_ptr<osg::Group> group (new osg::Group);
+        osg::ref_ptr<osg::Group> group(new osg::Group);
 
         mTransform->addChild(group);
 
@@ -950,10 +958,12 @@ namespace MWRender
         camera->setClearMask(0);
         camera->setRenderOrder(osg::Camera::NESTED_RENDER);
         camera->setAllowEventFocus(false);
-        camera->getOrCreateStateSet()->addUniform(new osg::Uniform("projectionMatrix", static_cast<osg::Matrixf>(camera->getProjectionMatrix())));
+        camera->getOrCreateStateSet()->addUniform(
+            new osg::Uniform("projectionMatrix", static_cast<osg::Matrixf>(camera->getProjectionMatrix())));
         SceneUtil::setCameraClearDepth(camera);
 
-        osg::ref_ptr<osg::Geometry> geom = osg::createTexturedQuadGeometry(osg::Vec3f(-1,-1,0), osg::Vec3f(2,0,0), osg::Vec3f(0,2,0));
+        osg::ref_ptr<osg::Geometry> geom
+            = osg::createTexturedQuadGeometry(osg::Vec3f(-1, -1, 0), osg::Vec3f(2, 0, 0), osg::Vec3f(0, 2, 0));
         camera->addChild(geom);
 
         osg::StateSet* stateset = geom->getOrCreateStateSet();
@@ -1066,7 +1076,7 @@ namespace MWRender
 
     void Moon::setPhase(const MoonState::Phase& phase)
     {
-        if(mPhase == phase)
+        if (mPhase == phase)
             return;
 
         mPhase = phase;
@@ -1126,7 +1136,8 @@ namespace MWRender
 
     RainShooter::RainShooter()
         : mAngle(0.f)
-    { }
+    {
+    }
 
     void RainShooter::shoot(osgParticle::Particle* particle) const
     {
@@ -1149,7 +1160,7 @@ namespace MWRender
         return new RainShooter;
     }
 
-    osg::Object* RainShooter::clone(const osg::CopyOp &) const
+    osg::Object* RainShooter::clone(const osg::CopyOp&) const
     {
         return new RainShooter(*this);
     }
@@ -1157,12 +1168,13 @@ namespace MWRender
     ModVertexAlphaVisitor::ModVertexAlphaVisitor(ModVertexAlphaVisitor::MeshType type)
         : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
         , mType(type)
-    { }
+    {
+    }
 
     void ModVertexAlphaVisitor::apply(osg::Geometry& geometry)
     {
         osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array(geometry.getVertexArray()->getNumElements());
-        for (unsigned int i=0; i<colors->size(); ++i)
+        for (unsigned int i = 0; i < colors->size(); ++i)
         {
             float alpha = 1.f;
 
@@ -1171,14 +1183,14 @@ namespace MWRender
                 case ModVertexAlphaVisitor::Atmosphere:
                 {
                     // this is a cylinder, so every second vertex belongs to the bottom-most row
-                    alpha = (i%2) ? 0.f : 1.f;
+                    alpha = (i % 2) ? 0.f : 1.f;
                     break;
                 }
                 case ModVertexAlphaVisitor::Clouds:
                 {
-                    if (i>= 49 && i <= 64)
+                    if (i >= 49 && i <= 64)
                         alpha = 0.f; // bottom-most row
-                    else if (i>= 33 && i <= 48)
+                    else if (i >= 33 && i <= 48)
                         alpha = 0.25098; // second row
                     else
                         alpha = 1.f;
diff --git a/apps/openmw/mwrender/skyutil.hpp b/apps/openmw/mwrender/skyutil.hpp
index 604e5909e8..d2146e5ae6 100644
--- a/apps/openmw/mwrender/skyutil.hpp
+++ b/apps/openmw/mwrender/skyutil.hpp
@@ -1,17 +1,17 @@
 #ifndef OPENMW_MWRENDER_SKYUTIL_H
 #define OPENMW_MWRENDER_SKYUTIL_H
 
-#include <osg/Vec4f>
+#include <osg/Material>
 #include <osg/Matrixf>
 #include <osg/Texture2D>
 #include <osg/Transform>
-#include <osg/Material>
+#include <osg/Vec4f>
 
-#include <osgParticle/Shooter>
 #include <osgParticle/ConstantRateCounter>
+#include <osgParticle/Shooter>
 
-#include <components/sceneutil/statesetupdater.hpp>
 #include <components/sceneutil/nodecallback.hpp>
+#include <components/sceneutil/statesetupdater.hpp>
 
 namespace Resource
 {
@@ -109,10 +109,11 @@ namespace MWRender
     class OcclusionCallback
     {
     public:
-        OcclusionCallback(osg::ref_ptr<osg::OcclusionQueryNode> oqnVisible, osg::ref_ptr<osg::OcclusionQueryNode> oqnTotal);
+        OcclusionCallback(
+            osg::ref_ptr<osg::OcclusionQueryNode> oqnVisible, osg::ref_ptr<osg::OcclusionQueryNode> oqnTotal);
 
     protected:
-        float getVisibleRatio (osg::Camera* camera);
+        float getVisibleRatio(osg::Camera* camera);
 
     private:
         osg::ref_ptr<osg::OcclusionQueryNode> mOcclusionQueryVisiblePixels;
@@ -164,8 +165,8 @@ namespace MWRender
         void setTextureCoord(float timer);
 
     protected:
-        void setDefaults(osg::StateSet *stateset) override;
-        void apply(osg::StateSet *stateset, osg::NodeVisitor *nv) override;
+        void setDefaults(osg::StateSet* stateset) override;
+        void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override;
 
     private:
         osg::ref_ptr<osg::Texture2D> mTexture;
@@ -186,7 +187,7 @@ namespace MWRender
 
         META_Node(MWRender, CameraRelativeTransform)
 
-        const osg::Vec3f& getLastViewPoint() const;
+            const osg::Vec3f& getLastViewPoint() const;
 
         bool computeLocalToWorldMatrix(osg::Matrix& matrix, osg::NodeVisitor* nv) const override;
 
@@ -200,7 +201,8 @@ namespace MWRender
     /// @brief Hides the node subgraph if the eye point is below water.
     /// @note Must be added as cull callback.
     /// @note Meant to be used on a node that is child of a CameraRelativeTransform.
-    /// The current view point must be retrieved by the CameraRelativeTransform since we can't get it anymore once we are in camera-relative space.
+    /// The current view point must be retrieved by the CameraRelativeTransform since we can't get it anymore once we
+    /// are in camera-relative space.
     class UnderwaterSwitchCallback : public SceneUtil::NodeCallback<UnderwaterSwitchCallback>
     {
     public:
@@ -221,7 +223,7 @@ namespace MWRender
     class CelestialBody
     {
     public:
-        CelestialBody(osg::Group* parentNode, float scaleFactor, int numUvSets, unsigned int visibleMask=~0u);
+        CelestialBody(osg::Group* parentNode, float scaleFactor, int numUvSets, unsigned int visibleMask = ~0u);
 
         virtual ~CelestialBody() = default;
 
@@ -251,7 +253,8 @@ namespace MWRender
         void setSunglare(bool enabled);
 
     private:
-        /// @param queryVisible If true, queries the amount of visible pixels. If false, queries the total amount of pixels.
+        /// @param queryVisible If true, queries the amount of visible pixels. If false, queries the total amount of
+        /// pixels.
         osg::ref_ptr<osg::OcclusionQueryNode> createOcclusionQueryNode(osg::Group* parent, bool queryVisible);
 
         void createSunFlash(Resource::ImageManager& imageManager);
@@ -310,7 +313,7 @@ namespace MWRender
 
         osg::Object* cloneType() const override;
 
-        osg::Object* clone(const osg::CopyOp &) const override;
+        osg::Object* clone(const osg::CopyOp&) const override;
 
         void shoot(osgParticle::Particle* particle) const override;
 
diff --git a/apps/openmw/mwrender/terrainstorage.cpp b/apps/openmw/mwrender/terrainstorage.cpp
index 879a2ef68b..fc3b77a4e6 100644
--- a/apps/openmw/mwrender/terrainstorage.cpp
+++ b/apps/openmw/mwrender/terrainstorage.cpp
@@ -1,7 +1,7 @@
 #include "terrainstorage.hpp"
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 #include "../mwworld/esmstore.hpp"
 
 #include "landmanager.hpp"
@@ -9,9 +9,13 @@
 namespace MWRender
 {
 
-    TerrainStorage::TerrainStorage(Resource::ResourceSystem* resourceSystem, const std::string& normalMapPattern, const std::string& normalHeightMapPattern, bool autoUseNormalMaps, const std::string& specularMapPattern, bool autoUseSpecularMaps)
-        : ESMTerrain::Storage(resourceSystem->getVFS(), normalMapPattern, normalHeightMapPattern, autoUseNormalMaps, specularMapPattern, autoUseSpecularMaps)
-        , mLandManager(new LandManager(ESM::Land::DATA_VCLR|ESM::Land::DATA_VHGT|ESM::Land::DATA_VNML|ESM::Land::DATA_VTEX))
+    TerrainStorage::TerrainStorage(Resource::ResourceSystem* resourceSystem, const std::string& normalMapPattern,
+        const std::string& normalHeightMapPattern, bool autoUseNormalMaps, const std::string& specularMapPattern,
+        bool autoUseSpecularMaps)
+        : ESMTerrain::Storage(resourceSystem->getVFS(), normalMapPattern, normalHeightMapPattern, autoUseNormalMaps,
+            specularMapPattern, autoUseSpecularMaps)
+        , mLandManager(new LandManager(
+              ESM::Land::DATA_VCLR | ESM::Land::DATA_VHGT | ESM::Land::DATA_VNML | ESM::Land::DATA_VTEX))
         , mResourceSystem(resourceSystem)
     {
         mResourceSystem->addResourceManager(mLandManager.get());
@@ -24,8 +28,7 @@ namespace MWRender
 
     bool TerrainStorage::hasData(int cellX, int cellY)
     {
-        const MWWorld::ESMStore &esmStore =
-             MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
 
         const ESM::Land* land = esmStore.get<ESM::Land>().search(cellX, cellY);
         return land != nullptr;
@@ -38,8 +41,7 @@ namespace MWRender
         maxX = 0;
         maxY = 0;
 
-        const MWWorld::ESMStore &esmStore =
-            MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
 
         MWWorld::Store<ESM::Land>::iterator it = esmStore.get<ESM::Land>().begin();
         for (; it != esmStore.get<ESM::Land>().end(); ++it)
@@ -59,7 +61,7 @@ namespace MWRender
         maxY += 1;
     }
 
-    LandManager *TerrainStorage::getLandManager() const
+    LandManager* TerrainStorage::getLandManager() const
     {
         return mLandManager.get();
     }
@@ -71,10 +73,8 @@ namespace MWRender
 
     const ESM::LandTexture* TerrainStorage::getLandTexture(int index, short plugin)
     {
-        const MWWorld::ESMStore &esmStore =
-            MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
         return esmStore.get<ESM::LandTexture>().search(index, plugin);
     }
 
-
 }
diff --git a/apps/openmw/mwrender/terrainstorage.hpp b/apps/openmw/mwrender/terrainstorage.hpp
index edea556157..f79b195a63 100644
--- a/apps/openmw/mwrender/terrainstorage.hpp
+++ b/apps/openmw/mwrender/terrainstorage.hpp
@@ -16,11 +16,12 @@ namespace MWRender
     class TerrainStorage : public ESMTerrain::Storage
     {
     public:
-
-        TerrainStorage(Resource::ResourceSystem* resourceSystem, const std::string& normalMapPattern = "", const std::string& normalHeightMapPattern = "", bool autoUseNormalMaps = false, const std::string& specularMapPattern = "", bool autoUseSpecularMaps = false);
+        TerrainStorage(Resource::ResourceSystem* resourceSystem, const std::string& normalMapPattern = "",
+            const std::string& normalHeightMapPattern = "", bool autoUseNormalMaps = false,
+            const std::string& specularMapPattern = "", bool autoUseSpecularMaps = false);
         ~TerrainStorage();
 
-        osg::ref_ptr<const ESMTerrain::LandObject> getLand (int cellX, int cellY) override;
+        osg::ref_ptr<const ESMTerrain::LandObject> getLand(int cellX, int cellY) override;
         const ESM::LandTexture* getLandTexture(int index, short plugin) override;
 
         bool hasData(int cellX, int cellY) override;
@@ -31,12 +32,11 @@ namespace MWRender
         LandManager* getLandManager() const;
 
     private:
-       std::unique_ptr<LandManager> mLandManager;
+        std::unique_ptr<LandManager> mLandManager;
 
-       Resource::ResourceSystem* mResourceSystem;
+        Resource::ResourceSystem* mResourceSystem;
     };
 
 }
 
-
 #endif
diff --git a/apps/openmw/mwrender/transparentpass.cpp b/apps/openmw/mwrender/transparentpass.cpp
index 237ebdf9da..cd72f5b7d6 100644
--- a/apps/openmw/mwrender/transparentpass.cpp
+++ b/apps/openmw/mwrender/transparentpass.cpp
@@ -1,134 +1,147 @@
 #include "transparentpass.hpp"
 
+#include <osg/AlphaFunc>
 #include <osg/BlendFunc>
+#include <osg/Material>
 #include <osg/Texture2D>
 #include <osg/Texture2DArray>
-#include <osg/Material>
-#include <osg/AlphaFunc>
 
 #include <osgUtil/RenderStage>
 
+#include <components/sceneutil/depth.hpp>
 #include <components/shader/shadermanager.hpp>
 #include <components/stereo/multiview.hpp>
 #include <components/stereo/stereomanager.hpp>
-#include <components/sceneutil/depth.hpp>
 
 #include "vismask.hpp"
 
 namespace MWRender
 {
-        TransparentDepthBinCallback::TransparentDepthBinCallback(Shader::ShaderManager& shaderManager, bool postPass)
-            : mStateSet(new osg::StateSet)
-            , mPostPass(postPass)
+    TransparentDepthBinCallback::TransparentDepthBinCallback(Shader::ShaderManager& shaderManager, bool postPass)
+        : mStateSet(new osg::StateSet)
+        , mPostPass(postPass)
+    {
+        osg::ref_ptr<osg::Image> image = new osg::Image;
+        image->allocateImage(1, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE);
+        image->setColor(osg::Vec4(1, 1, 1, 1), 0, 0);
+
+        osg::ref_ptr<osg::Texture2D> dummyTexture = new osg::Texture2D(image);
+
+        constexpr osg::StateAttribute::OverrideValue modeOff = osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE;
+        constexpr osg::StateAttribute::OverrideValue modeOn = osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE;
+
+        mStateSet->setTextureAttributeAndModes(0, dummyTexture);
+
+        Shader::ShaderManager::DefineMap defines;
+        Stereo::Manager::instance().shaderStereoDefines(defines);
+        osg::ref_ptr<osg::Shader> vertex
+            = shaderManager.getShader("blended_depth_postpass_vertex.glsl", defines, osg::Shader::VERTEX);
+        osg::ref_ptr<osg::Shader> fragment
+            = shaderManager.getShader("blended_depth_postpass_fragment.glsl", defines, osg::Shader::FRAGMENT);
+
+        mStateSet->setAttributeAndModes(new osg::BlendFunc, modeOff);
+        mStateSet->setAttributeAndModes(shaderManager.getProgram(vertex, fragment), modeOn);
+        mStateSet->setAttributeAndModes(new SceneUtil::AutoDepth, modeOn);
+
+        for (unsigned int unit = 1; unit < 8; ++unit)
+            mStateSet->setTextureMode(unit, GL_TEXTURE_2D, modeOff);
+    }
+
+    void TransparentDepthBinCallback::drawImplementation(
+        osgUtil::RenderBin* bin, osg::RenderInfo& renderInfo, osgUtil::RenderLeaf*& previous)
+    {
+        osg::State& state = *renderInfo.getState();
+        osg::GLExtensions* ext = state.get<osg::GLExtensions>();
+
+        bool validFbo = false;
+        unsigned int frameId = state.getFrameStamp()->getFrameNumber() % 2;
+
+        const auto& fbo = mFbo[frameId];
+        const auto& msaaFbo = mMsaaFbo[frameId];
+        const auto& opaqueFbo = mOpaqueFbo[frameId];
+
+        if (bin->getStage()->getMultisampleResolveFramebufferObject()
+            && bin->getStage()->getMultisampleResolveFramebufferObject() == fbo)
+            validFbo = true;
+        else if (bin->getStage()->getFrameBufferObject()
+            && (bin->getStage()->getFrameBufferObject() == fbo || bin->getStage()->getFrameBufferObject() == msaaFbo))
+            validFbo = true;
+
+        if (!validFbo)
         {
-            osg::ref_ptr<osg::Image> image = new osg::Image;
-            image->allocateImage(1, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE);
-            image->setColor(osg::Vec4(1,1,1,1), 0, 0);
-
-            osg::ref_ptr<osg::Texture2D> dummyTexture = new osg::Texture2D(image);
-
-            constexpr osg::StateAttribute::OverrideValue modeOff = osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE;
-            constexpr osg::StateAttribute::OverrideValue modeOn = osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE;
-
-            mStateSet->setTextureAttributeAndModes(0, dummyTexture);
-
-            Shader::ShaderManager::DefineMap defines;
-            Stereo::Manager::instance().shaderStereoDefines(defines);
-            osg::ref_ptr<osg::Shader> vertex = shaderManager.getShader("blended_depth_postpass_vertex.glsl", defines, osg::Shader::VERTEX);
-            osg::ref_ptr<osg::Shader> fragment = shaderManager.getShader("blended_depth_postpass_fragment.glsl", defines, osg::Shader::FRAGMENT);
-
-            mStateSet->setAttributeAndModes(new osg::BlendFunc, modeOff);
-            mStateSet->setAttributeAndModes(shaderManager.getProgram(vertex, fragment), modeOn);
-            mStateSet->setAttributeAndModes(new SceneUtil::AutoDepth, modeOn);
-
-            for (unsigned int unit = 1; unit < 8; ++unit)
-                mStateSet->setTextureMode(unit, GL_TEXTURE_2D, modeOff);
+            bin->drawImplementation(renderInfo, previous);
+            return;
         }
 
-        void TransparentDepthBinCallback::drawImplementation(osgUtil::RenderBin* bin, osg::RenderInfo& renderInfo, osgUtil::RenderLeaf*& previous)
-        {
-            osg::State& state = *renderInfo.getState();
-            osg::GLExtensions* ext = state.get<osg::GLExtensions>();
+        const osg::Texture* tex
+            = opaqueFbo->getAttachment(osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER)
+                  .getTexture();
 
-            bool validFbo = false;
-            unsigned int frameId = state.getFrameStamp()->getFrameNumber() % 2;
-
-            const auto& fbo = mFbo[frameId];
-            const auto& msaaFbo = mMsaaFbo[frameId];
-            const auto& opaqueFbo = mOpaqueFbo[frameId];
-
-            if (bin->getStage()->getMultisampleResolveFramebufferObject() && bin->getStage()->getMultisampleResolveFramebufferObject() == fbo)
-                validFbo = true;
-            else if (bin->getStage()->getFrameBufferObject() && (bin->getStage()->getFrameBufferObject() == fbo || bin->getStage()->getFrameBufferObject() == msaaFbo))
-                validFbo = true;
-
-            if (!validFbo)
+        if (Stereo::getMultiview())
+        {
+            if (!mMultiviewResolve[frameId])
             {
-                bin->drawImplementation(renderInfo, previous);
-                return;
+                mMultiviewResolve[frameId] = std::make_unique<Stereo::MultiviewFramebufferResolve>(
+                    msaaFbo ? msaaFbo : fbo, opaqueFbo, GL_DEPTH_BUFFER_BIT);
             }
+            mMultiviewResolve[frameId]->resolveImplementation(state);
+        }
+        else
+        {
+            opaqueFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+            ext->glBlitFramebuffer(0, 0, tex->getTextureWidth(), tex->getTextureHeight(), 0, 0, tex->getTextureWidth(),
+                tex->getTextureHeight(), GL_DEPTH_BUFFER_BIT, GL_NEAREST);
+        }
 
-            const osg::Texture* tex = opaqueFbo->getAttachment(osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER).getTexture();
+        msaaFbo ? msaaFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER)
+                : fbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
 
-            if (Stereo::getMultiview())
-            {
-                if (!mMultiviewResolve[frameId])
-                {
-                    mMultiviewResolve[frameId] = std::make_unique<Stereo::MultiviewFramebufferResolve>(msaaFbo ? msaaFbo : fbo, opaqueFbo, GL_DEPTH_BUFFER_BIT);
-                }
-                mMultiviewResolve[frameId]->resolveImplementation(state);
-            }
-            else
-            {
-                opaqueFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
-                ext->glBlitFramebuffer(0, 0, tex->getTextureWidth(), tex->getTextureHeight(), 0, 0, tex->getTextureWidth(), tex->getTextureHeight(), GL_DEPTH_BUFFER_BIT, GL_NEAREST);
-            }
+        // draws scene into primary attachments
+        bin->drawImplementation(renderInfo, previous);
 
-            msaaFbo ? msaaFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER) : fbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+        if (!mPostPass)
+            return;
 
-            // draws scene into primary attachments
-            bin->drawImplementation(renderInfo, previous);
+        opaqueFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
 
-            if (!mPostPass)
-                return;
+        // draw transparent post-pass to populate a postprocess friendly depth texture with alpha-clipped geometry
 
-            opaqueFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+        unsigned int numToPop = previous ? osgUtil::StateGraph::numToPop(previous->_parent) : 0;
+        if (numToPop > 1)
+            numToPop--;
+        unsigned int insertStateSetPosition = state.getStateSetStackSize() - numToPop;
 
-            // draw transparent post-pass to populate a postprocess friendly depth texture with alpha-clipped geometry
+        state.insertStateSet(insertStateSetPosition, mStateSet);
+        for (auto rit = bin->getRenderLeafList().begin(); rit != bin->getRenderLeafList().end(); rit++)
+        {
+            osgUtil::RenderLeaf* rl = *rit;
+            const osg::StateSet* ss = rl->_parent->getStateSet();
 
-            unsigned int numToPop = previous ? osgUtil::StateGraph::numToPop(previous->_parent) : 0;
-            if (numToPop > 1)
-                 numToPop--;
-            unsigned int insertStateSetPosition = state.getStateSetStackSize() - numToPop;
+            if (rl->_drawable->getNodeMask() == Mask_ParticleSystem || rl->_drawable->getNodeMask() == Mask_Effect)
+                continue;
 
-            state.insertStateSet(insertStateSetPosition, mStateSet);
-            for(auto rit = bin->getRenderLeafList().begin(); rit != bin->getRenderLeafList().end(); rit++)
+            if (ss->getAttribute(osg::StateAttribute::MATERIAL))
             {
-                osgUtil::RenderLeaf* rl = *rit;
-                const osg::StateSet* ss = rl->_parent->getStateSet();
-
-                if (rl->_drawable->getNodeMask() == Mask_ParticleSystem || rl->_drawable->getNodeMask() == Mask_Effect)
+                const osg::Material* mat
+                    = static_cast<const osg::Material*>(ss->getAttribute(osg::StateAttribute::MATERIAL));
+                if (mat->getDiffuse(osg::Material::FRONT).a() < 0.5)
                     continue;
-
-                if (ss->getAttribute(osg::StateAttribute::MATERIAL)) {
-                    const osg::Material* mat = static_cast<const osg::Material*>(ss->getAttribute(osg::StateAttribute::MATERIAL));
-                    if (mat->getDiffuse(osg::Material::FRONT).a() < 0.5)
-                        continue;
-                }
-
-                rl->render(renderInfo,previous);
-                previous = rl;
             }
-            state.removeStateSet(insertStateSetPosition);
-
-            msaaFbo ? msaaFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER) : fbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
-            state.checkGLErrors("after TransparentDepthBinCallback::drawImplementation");
-        }
 
-        void TransparentDepthBinCallback::dirtyFrame(int frameId)
-        {
-            if (mMultiviewResolve[frameId])
-                mMultiviewResolve[frameId]->dirty();
+            rl->render(renderInfo, previous);
+            previous = rl;
         }
+        state.removeStateSet(insertStateSetPosition);
+
+        msaaFbo ? msaaFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER)
+                : fbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+        state.checkGLErrors("after TransparentDepthBinCallback::drawImplementation");
+    }
+
+    void TransparentDepthBinCallback::dirtyFrame(int frameId)
+    {
+        if (mMultiviewResolve[frameId])
+            mMultiviewResolve[frameId]->dirty();
+    }
 
 }
diff --git a/apps/openmw/mwrender/transparentpass.hpp b/apps/openmw/mwrender/transparentpass.hpp
index 0522ee4687..3af6eb5abd 100644
--- a/apps/openmw/mwrender/transparentpass.hpp
+++ b/apps/openmw/mwrender/transparentpass.hpp
@@ -26,7 +26,8 @@ namespace MWRender
     public:
         TransparentDepthBinCallback(Shader::ShaderManager& shaderManager, bool postPass);
 
-        void drawImplementation(osgUtil::RenderBin* bin, osg::RenderInfo& renderInfo, osgUtil::RenderLeaf*& previous) override;
+        void drawImplementation(
+            osgUtil::RenderBin* bin, osg::RenderInfo& renderInfo, osgUtil::RenderLeaf*& previous) override;
         void dirtyFrame(int frameId);
 
         std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mFbo;
diff --git a/apps/openmw/mwrender/util.cpp b/apps/openmw/mwrender/util.cpp
index 9b0d1b389d..647c1db335 100644
--- a/apps/openmw/mwrender/util.cpp
+++ b/apps/openmw/mwrender/util.cpp
@@ -3,15 +3,15 @@
 #include <osg/Node>
 #include <osg/ValueObject>
 
-#include <components/resource/resourcesystem.hpp>
-#include <components/resource/imagemanager.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/resource/imagemanager.hpp>
+#include <components/resource/resourcesystem.hpp>
 #include <components/sceneutil/visitor.hpp>
 
 namespace MWRender
 {
 
-class TextureOverrideVisitor : public osg::NodeVisitor
+    class TextureOverrideVisitor : public osg::NodeVisitor
     {
     public:
         TextureOverrideVisitor(std::string_view texture, Resource::ResourceSystem* resourcesystem)
@@ -27,41 +27,44 @@ class TextureOverrideVisitor : public osg::NodeVisitor
             osg::ref_ptr<osg::Node> nodePtr(&node);
             if (node.getUserValue("overrideFx", index))
             {
-                if (index == 1) 
+                if (index == 1)
                     overrideTexture(mTexture, mResourcesystem, nodePtr);
             }
             traverse(node);
         }
         std::string_view mTexture;
         Resource::ResourceSystem* mResourcesystem;
-};
+    };
 
-void overrideFirstRootTexture(std::string_view texture, Resource::ResourceSystem *resourceSystem, osg::ref_ptr<osg::Node> node)
-{
-    TextureOverrideVisitor overrideVisitor(texture, resourceSystem);
-    node->accept(overrideVisitor);
-}
+    void overrideFirstRootTexture(
+        std::string_view texture, Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Node> node)
+    {
+        TextureOverrideVisitor overrideVisitor(texture, resourceSystem);
+        node->accept(overrideVisitor);
+    }
 
-void overrideTexture(std::string_view texture, Resource::ResourceSystem *resourceSystem, osg::ref_ptr<osg::Node> node)
-{
-    if (texture.empty())
-        return;
-    std::string correctedTexture = Misc::ResourceHelpers::correctTexturePath(texture, resourceSystem->getVFS());
-    // Not sure if wrap settings should be pulled from the overridden texture?
-    osg::ref_ptr<osg::Texture2D> tex = new osg::Texture2D(resourceSystem->getImageManager()->getImage(correctedTexture));
-    tex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-    tex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-    tex->setName("diffuseMap");
+    void overrideTexture(
+        std::string_view texture, Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Node> node)
+    {
+        if (texture.empty())
+            return;
+        std::string correctedTexture = Misc::ResourceHelpers::correctTexturePath(texture, resourceSystem->getVFS());
+        // Not sure if wrap settings should be pulled from the overridden texture?
+        osg::ref_ptr<osg::Texture2D> tex
+            = new osg::Texture2D(resourceSystem->getImageManager()->getImage(correctedTexture));
+        tex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+        tex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+        tex->setName("diffuseMap");
 
-    osg::ref_ptr<osg::StateSet> stateset;
-    if (node->getStateSet())
-        stateset = new osg::StateSet(*node->getStateSet(), osg::CopyOp::SHALLOW_COPY);
-    else
-        stateset = new osg::StateSet;
+        osg::ref_ptr<osg::StateSet> stateset;
+        if (node->getStateSet())
+            stateset = new osg::StateSet(*node->getStateSet(), osg::CopyOp::SHALLOW_COPY);
+        else
+            stateset = new osg::StateSet;
 
-    stateset->setTextureAttribute(0, tex, osg::StateAttribute::OVERRIDE);
+        stateset->setTextureAttribute(0, tex, osg::StateAttribute::OVERRIDE);
 
-    node->setStateSet(stateset);
-}
+        node->setStateSet(stateset);
+    }
 
 }
diff --git a/apps/openmw/mwrender/util.hpp b/apps/openmw/mwrender/util.hpp
index 559df45c15..457b23f94b 100644
--- a/apps/openmw/mwrender/util.hpp
+++ b/apps/openmw/mwrender/util.hpp
@@ -17,11 +17,14 @@ namespace Resource
 
 namespace MWRender
 {
-    // Overrides the texture of nodes in the mesh that had the same NiTexturingProperty as the first NiTexturingProperty of the .NIF file's root node,
-    // if it had a NiTexturingProperty. Used for applying "particle textures" to magic effects.
-    void overrideFirstRootTexture(std::string_view texture, Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Node> node);
+    // Overrides the texture of nodes in the mesh that had the same NiTexturingProperty as the first NiTexturingProperty
+    // of the .NIF file's root node, if it had a NiTexturingProperty. Used for applying "particle textures" to magic
+    // effects.
+    void overrideFirstRootTexture(
+        std::string_view texture, Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Node> node);
 
-    void overrideTexture(std::string_view texture, Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Node> node);
+    void overrideTexture(
+        std::string_view texture, Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Node> node);
 
     // Node callback to entirely skip the traversal.
     class NoTraverseCallback : public osg::NodeCallback
diff --git a/apps/openmw/mwrender/vismask.hpp b/apps/openmw/mwrender/vismask.hpp
index a7a28614cb..1b25dfc366 100644
--- a/apps/openmw/mwrender/vismask.hpp
+++ b/apps/openmw/mwrender/vismask.hpp
@@ -24,42 +24,43 @@ namespace MWRender
         Mask_UpdateVisitor = 0x1, // reserved for separating UpdateVisitors from CullVisitors
 
         // child of Scene
-        Mask_Effect = (1<<1),
-        Mask_Debug = (1<<2),
-        Mask_Actor = (1<<3),
-        Mask_Player = (1<<4),
-        Mask_Sky = (1<<5),
-        Mask_Water = (1<<6), // choose Water or SimpleWater depending on detail required
-        Mask_SimpleWater = (1<<7),
-        Mask_Terrain = (1<<8),
-        Mask_FirstPerson = (1<<9),
-        Mask_Object = (1<<10),
-        Mask_Static = (1<<11),
+        Mask_Effect = (1 << 1),
+        Mask_Debug = (1 << 2),
+        Mask_Actor = (1 << 3),
+        Mask_Player = (1 << 4),
+        Mask_Sky = (1 << 5),
+        Mask_Water = (1 << 6), // choose Water or SimpleWater depending on detail required
+        Mask_SimpleWater = (1 << 7),
+        Mask_Terrain = (1 << 8),
+        Mask_FirstPerson = (1 << 9),
+        Mask_Object = (1 << 10),
+        Mask_Static = (1 << 11),
 
         // child of Sky
-        Mask_Sun = (1<<12),
-        Mask_WeatherParticles = (1<<13),
+        Mask_Sun = (1 << 12),
+        Mask_WeatherParticles = (1 << 13),
 
         // top level masks
-        Mask_Scene = (1<<14),
-        Mask_GUI = (1<<15),
+        Mask_Scene = (1 << 14),
+        Mask_GUI = (1 << 15),
 
         // Set on a ParticleSystem Drawable
-        Mask_ParticleSystem = (1<<16),
+        Mask_ParticleSystem = (1 << 16),
 
         // Set on cameras within the main scene graph
-        Mask_RenderToTexture = (1<<17),
+        Mask_RenderToTexture = (1 << 17),
 
-        Mask_PreCompile = (1<<18),
+        Mask_PreCompile = (1 << 18),
 
         // Set on a camera's cull mask to enable the LightManager
-        Mask_Lighting = (1<<19),
+        Mask_Lighting = (1 << 19),
 
-        Mask_Groundcover = (1<<20),
+        Mask_Groundcover = (1 << 20),
     };
 
     // Defines masks to remove when using ToggleWorld command
-    constexpr static unsigned int sToggleWorldMask = Mask_Debug | Mask_Actor | Mask_Terrain | Mask_Object | Mask_Static | Mask_Groundcover;
+    constexpr static unsigned int sToggleWorldMask
+        = Mask_Debug | Mask_Actor | Mask_Terrain | Mask_Object | Mask_Static | Mask_Groundcover;
 
 }
 
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index d57fbe731e..21a4e6cd9b 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -2,34 +2,34 @@
 
 #include <iomanip>
 
-#include <osg/Fog>
+#include <osg/ClipNode>
 #include <osg/Depth>
-#include <osg/Group>
+#include <osg/Fog>
+#include <osg/FrontFace>
 #include <osg/Geometry>
+#include <osg/Group>
 #include <osg/Material>
 #include <osg/PositionAttitudeTransform>
-#include <osg/ClipNode>
-#include <osg/FrontFace>
 #include <osg/ViewportIndexed>
 
 #include <osgDB/ReadFile>
 
 #include <fstream>
 
-#include <osgUtil/IncrementalCompileOperation>
 #include <osgUtil/CullVisitor>
+#include <osgUtil/IncrementalCompileOperation>
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/resource/resourcesystem.hpp>
 #include <components/resource/imagemanager.hpp>
+#include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 
+#include <components/sceneutil/depth.hpp>
+#include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/rtt.hpp>
 #include <components/sceneutil/shadow.hpp>
-#include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/waterutil.hpp>
-#include <components/sceneutil/lightmanager.hpp>
 
 #include <components/misc/constants.hpp>
 #include <components/stereo/stereomanager.hpp>
@@ -46,822 +46,840 @@
 
 #include "../mwbase/environment.hpp"
 
-#include "vismask.hpp"
-#include "ripplesimulation.hpp"
 #include "renderbin.hpp"
+#include "ripplesimulation.hpp"
 #include "util.hpp"
+#include "vismask.hpp"
 
 namespace MWRender
 {
 
-// --------------------------------------------------------------------------------------------------------------------------------
+    // --------------------------------------------------------------------------------------------------------------------------------
 
-/// @brief Allows to cull and clip meshes that are below a plane. Useful for reflection & refraction camera effects.
-/// Also handles flipping of the plane when the eye point goes below it.
-/// To use, simply create the scene as subgraph of this node, then do setPlane(const osg::Plane& plane);
-class ClipCullNode : public osg::Group
-{
-    class PlaneCullCallback : public SceneUtil::NodeCallback<PlaneCullCallback, osg::Node*, osgUtil::CullVisitor*>
+    /// @brief Allows to cull and clip meshes that are below a plane. Useful for reflection & refraction camera effects.
+    /// Also handles flipping of the plane when the eye point goes below it.
+    /// To use, simply create the scene as subgraph of this node, then do setPlane(const osg::Plane& plane);
+    class ClipCullNode : public osg::Group
     {
-    public:
-        /// @param cullPlane The culling plane (in world space).
-        PlaneCullCallback(const osg::Plane* cullPlane)
-            : mCullPlane(cullPlane)
+        class PlaneCullCallback : public SceneUtil::NodeCallback<PlaneCullCallback, osg::Node*, osgUtil::CullVisitor*>
         {
-        }
+        public:
+            /// @param cullPlane The culling plane (in world space).
+            PlaneCullCallback(const osg::Plane* cullPlane)
+                : mCullPlane(cullPlane)
+            {
+            }
 
-        void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
-        {
-            osg::Polytope::PlaneList origPlaneList = cv->getProjectionCullingStack().back().getFrustum().getPlaneList();
+            void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
+            {
+                osg::Polytope::PlaneList origPlaneList
+                    = cv->getProjectionCullingStack().back().getFrustum().getPlaneList();
 
-            osg::Plane plane = *mCullPlane;
-            plane.transform(*cv->getCurrentRenderStage()->getInitialViewMatrix());
+                osg::Plane plane = *mCullPlane;
+                plane.transform(*cv->getCurrentRenderStage()->getInitialViewMatrix());
 
-            osg::Vec3d eyePoint = cv->getEyePoint();
-            if (mCullPlane->intersect(osg::BoundingSphere(osg::Vec3d(0,0,eyePoint.z()), 0)) > 0)
-                plane.flip();
+                osg::Vec3d eyePoint = cv->getEyePoint();
+                if (mCullPlane->intersect(osg::BoundingSphere(osg::Vec3d(0, 0, eyePoint.z()), 0)) > 0)
+                    plane.flip();
 
-            cv->getProjectionCullingStack().back().getFrustum().add(plane);
+                cv->getProjectionCullingStack().back().getFrustum().add(plane);
 
-            traverse(node, cv);
+                traverse(node, cv);
 
-            // undo
-            cv->getProjectionCullingStack().back().getFrustum().set(origPlaneList);
-        }
+                // undo
+                cv->getProjectionCullingStack().back().getFrustum().set(origPlaneList);
+            }
 
-    private:
-        const osg::Plane* mCullPlane;
-    };
+        private:
+            const osg::Plane* mCullPlane;
+        };
 
-    class FlipCallback : public SceneUtil::NodeCallback<FlipCallback, osg::Node*, osgUtil::CullVisitor*>
-    {
-    public:
-        FlipCallback(const osg::Plane* cullPlane)
-            : mCullPlane(cullPlane)
+        class FlipCallback : public SceneUtil::NodeCallback<FlipCallback, osg::Node*, osgUtil::CullVisitor*>
         {
-        }
+        public:
+            FlipCallback(const osg::Plane* cullPlane)
+                : mCullPlane(cullPlane)
+            {
+            }
 
-        void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
-        {
-            osg::Vec3d eyePoint = cv->getEyePoint();
+            void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
+            {
+                osg::Vec3d eyePoint = cv->getEyePoint();
 
-            osg::RefMatrix* modelViewMatrix = new osg::RefMatrix(*cv->getModelViewMatrix());
+                osg::RefMatrix* modelViewMatrix = new osg::RefMatrix(*cv->getModelViewMatrix());
 
-            // apply the height of the plane
-            // we can't apply this height in the addClipPlane() since the "flip the below graph" function would otherwise flip the height as well
-            modelViewMatrix->preMultTranslate(mCullPlane->getNormal() * ((*mCullPlane)[3] * -1));
+                // apply the height of the plane
+                // we can't apply this height in the addClipPlane() since the "flip the below graph" function would
+                // otherwise flip the height as well
+                modelViewMatrix->preMultTranslate(mCullPlane->getNormal() * ((*mCullPlane)[3] * -1));
 
-            // flip the below graph if the eye point is above the plane
-            if (mCullPlane->intersect(osg::BoundingSphere(osg::Vec3d(0,0,eyePoint.z()), 0)) > 0)
-            {
-                modelViewMatrix->preMultScale(osg::Vec3(1,1,-1));
+                // flip the below graph if the eye point is above the plane
+                if (mCullPlane->intersect(osg::BoundingSphere(osg::Vec3d(0, 0, eyePoint.z()), 0)) > 0)
+                {
+                    modelViewMatrix->preMultScale(osg::Vec3(1, 1, -1));
+                }
+
+                // move the plane back along its normal a little bit to prevent bleeding at the water shore
+                const float clipFudge = -5;
+                modelViewMatrix->preMultTranslate(mCullPlane->getNormal() * clipFudge);
+
+                cv->pushModelViewMatrix(modelViewMatrix, osg::Transform::RELATIVE_RF);
+                traverse(node, cv);
+                cv->popModelViewMatrix();
             }
 
-            // move the plane back along its normal a little bit to prevent bleeding at the water shore
-            const float clipFudge = -5;
-            modelViewMatrix->preMultTranslate(mCullPlane->getNormal() * clipFudge);
+        private:
+            const osg::Plane* mCullPlane;
+        };
 
-            cv->pushModelViewMatrix(modelViewMatrix, osg::Transform::RELATIVE_RF);
-            traverse(node, cv);
-            cv->popModelViewMatrix();
+    public:
+        ClipCullNode()
+        {
+            addCullCallback(new PlaneCullCallback(&mPlane));
+
+            mClipNodeTransform = new osg::Group;
+            mClipNodeTransform->addCullCallback(new FlipCallback(&mPlane));
+            osg::Group::addChild(mClipNodeTransform);
+
+            mClipNode = new osg::ClipNode;
+
+            mClipNodeTransform->addChild(mClipNode);
+        }
+
+        void setPlane(const osg::Plane& plane)
+        {
+            if (plane == mPlane)
+                return;
+            mPlane = plane;
+
+            mClipNode->getClipPlaneList().clear();
+            mClipNode->addClipPlane(
+                new osg::ClipPlane(0, osg::Plane(mPlane.getNormal(), 0))); // mPlane.d() applied in FlipCallback
+            mClipNode->setStateSetModes(*getOrCreateStateSet(), osg::StateAttribute::ON);
+            mClipNode->setCullingActive(false);
         }
 
     private:
-        const osg::Plane* mCullPlane;
+        osg::ref_ptr<osg::Group> mClipNodeTransform;
+        osg::ref_ptr<osg::ClipNode> mClipNode;
+
+        osg::Plane mPlane;
     };
 
-public:
-    ClipCullNode()
+    /// This callback on the Camera has the effect of a RELATIVE_RF_INHERIT_VIEWPOINT transform mode (which does not
+    /// exist in OSG). We want to keep the View Point of the parent camera so we will not have to recreate LODs.
+    class InheritViewPointCallback
+        : public SceneUtil::NodeCallback<InheritViewPointCallback, osg::Node*, osgUtil::CullVisitor*>
     {
-        addCullCallback (new PlaneCullCallback(&mPlane));
+    public:
+        InheritViewPointCallback() {}
 
-        mClipNodeTransform = new osg::Group;
-        mClipNodeTransform->addCullCallback(new FlipCallback(&mPlane));
-        osg::Group::addChild(mClipNodeTransform);
+        void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
+        {
+            osg::ref_ptr<osg::RefMatrix> modelViewMatrix = new osg::RefMatrix(*cv->getModelViewMatrix());
+            cv->popModelViewMatrix();
+            cv->pushModelViewMatrix(modelViewMatrix, osg::Transform::ABSOLUTE_RF_INHERIT_VIEWPOINT);
+            traverse(node, cv);
+        }
+    };
 
-        mClipNode = new osg::ClipNode;
+    /// Moves water mesh away from the camera slightly if the camera gets too close on the Z axis.
+    /// The offset works around graphics artifacts that occurred with the GL_DEPTH_CLAMP when the camera gets extremely
+    /// close to the mesh (seen on NVIDIA at least). Must be added as a Cull callback.
+    class FudgeCallback : public SceneUtil::NodeCallback<FudgeCallback, osg::Node*, osgUtil::CullVisitor*>
+    {
+    public:
+        void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
+        {
+            const float fudge = 0.2;
+            if (std::abs(cv->getEyeLocal().z()) < fudge)
+            {
+                float diff = fudge - cv->getEyeLocal().z();
+                osg::RefMatrix* modelViewMatrix = new osg::RefMatrix(*cv->getModelViewMatrix());
 
-        mClipNodeTransform->addChild(mClipNode);
-    }
+                if (cv->getEyeLocal().z() > 0)
+                    modelViewMatrix->preMultTranslate(osg::Vec3f(0, 0, -diff));
+                else
+                    modelViewMatrix->preMultTranslate(osg::Vec3f(0, 0, diff));
+
+                cv->pushModelViewMatrix(modelViewMatrix, osg::Transform::RELATIVE_RF);
+                traverse(node, cv);
+                cv->popModelViewMatrix();
+            }
+            else
+                traverse(node, cv);
+        }
+    };
 
-    void setPlane (const osg::Plane& plane)
+    class RainIntensityUpdater : public SceneUtil::StateSetUpdater
     {
-        if (plane == mPlane)
-            return;
-        mPlane = plane;
+    public:
+        RainIntensityUpdater()
+            : mRainIntensity(0.f)
+        {
+        }
 
-        mClipNode->getClipPlaneList().clear();
-        mClipNode->addClipPlane(new osg::ClipPlane(0, osg::Plane(mPlane.getNormal(), 0))); // mPlane.d() applied in FlipCallback
-        mClipNode->setStateSetModes(*getOrCreateStateSet(), osg::StateAttribute::ON);
-        mClipNode->setCullingActive(false);
-    }
+        void setRainIntensity(float rainIntensity) { mRainIntensity = rainIntensity; }
 
-private:
-    osg::ref_ptr<osg::Group> mClipNodeTransform;
-    osg::ref_ptr<osg::ClipNode> mClipNode;
+    protected:
+        void setDefaults(osg::StateSet* stateset) override
+        {
+            osg::ref_ptr<osg::Uniform> rainIntensityUniform = new osg::Uniform("rainIntensity", 0.0f);
+            stateset->addUniform(rainIntensityUniform.get());
+        }
 
-    osg::Plane mPlane;
-};
+        void apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/) override
+        {
+            osg::ref_ptr<osg::Uniform> rainIntensityUniform = stateset->getUniform("rainIntensity");
+            if (rainIntensityUniform != nullptr)
+                rainIntensityUniform->set(mRainIntensity);
+        }
 
-/// This callback on the Camera has the effect of a RELATIVE_RF_INHERIT_VIEWPOINT transform mode (which does not exist in OSG).
-/// We want to keep the View Point of the parent camera so we will not have to recreate LODs.
-class InheritViewPointCallback : public SceneUtil::NodeCallback<InheritViewPointCallback, osg::Node*, osgUtil::CullVisitor*>
-{
-public:
-        InheritViewPointCallback() {}
+    private:
+        float mRainIntensity;
+    };
 
-    void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
+    osg::ref_ptr<osg::Image> readPngImage(const std::filesystem::path& file)
     {
-        osg::ref_ptr<osg::RefMatrix> modelViewMatrix = new osg::RefMatrix(*cv->getModelViewMatrix());
-        cv->popModelViewMatrix();
-        cv->pushModelViewMatrix(modelViewMatrix, osg::Transform::ABSOLUTE_RF_INHERIT_VIEWPOINT);
-        traverse(node, cv);
+        std::ifstream inStream;
+        inStream.open(file, std::ios_base::in | std::ios_base::binary);
+        if (inStream.fail())
+            Log(Debug::Error) << "Error: Failed to open " << file;
+        osgDB::ReaderWriter* reader = osgDB::Registry::instance()->getReaderWriterForExtension("png");
+        if (!reader)
+        {
+            Log(Debug::Error) << "Error: Failed to read " << file << ", no png readerwriter found";
+            return osg::ref_ptr<osg::Image>();
+        }
+        osgDB::ReaderWriter::ReadResult result = reader->readImage(inStream);
+        if (!result.success())
+            Log(Debug::Error) << "Error: Failed to read " << file << ": " << result.message() << " code "
+                              << result.status();
+
+        return result.getImage();
     }
-};
 
-/// Moves water mesh away from the camera slightly if the camera gets too close on the Z axis.
-/// The offset works around graphics artifacts that occurred with the GL_DEPTH_CLAMP when the camera gets extremely close to the mesh (seen on NVIDIA at least).
-/// Must be added as a Cull callback.
-class FudgeCallback : public SceneUtil::NodeCallback<FudgeCallback, osg::Node*, osgUtil::CullVisitor*>
-{
-public:
-    void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
+    class Refraction : public SceneUtil::RTTNode
     {
-        const float fudge = 0.2;
-        if (std::abs(cv->getEyeLocal().z()) < fudge)
+    public:
+        Refraction(uint32_t rttSize)
+            : RTTNode(rttSize, rttSize, 0, false, 1, StereoAwareness::Aware)
+            , mNodeMask(Refraction::sDefaultCullMask)
         {
-            float diff = fudge - cv->getEyeLocal().z();
-            osg::RefMatrix* modelViewMatrix = new osg::RefMatrix(*cv->getModelViewMatrix());
+            setDepthBufferInternalFormat(GL_DEPTH24_STENCIL8);
+            mClipCullNode = new ClipCullNode;
+        }
 
-            if (cv->getEyeLocal().z() > 0)
-                modelViewMatrix->preMultTranslate(osg::Vec3f(0,0,-diff));
-            else
-                modelViewMatrix->preMultTranslate(osg::Vec3f(0,0,diff));
+        void setDefaults(osg::Camera* camera) override
+        {
+            camera->setReferenceFrame(osg::Camera::RELATIVE_RF);
+            camera->setSmallFeatureCullingPixelSize(
+                Settings::Manager::getInt("small feature culling pixel size", "Water"));
+            camera->setName("RefractionCamera");
+            camera->addCullCallback(new InheritViewPointCallback);
+            camera->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
+
+            // No need for fog here, we are already applying fog on the water surface itself as well as underwater fog
+            // assign large value to effectively turn off fog
+            // shaders don't respect glDisable(GL_FOG)
+            osg::ref_ptr<osg::Fog> fog(new osg::Fog);
+            fog->setStart(10000000);
+            fog->setEnd(10000000);
+            camera->getOrCreateStateSet()->setAttributeAndModes(
+                fog, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE);
+
+            camera->addChild(mClipCullNode);
+            camera->setNodeMask(Mask_RenderToTexture);
+
+            if (Settings::Manager::getFloat("refraction scale", "Water") != 1) // TODO: to be removed with issue #5709
+                SceneUtil::ShadowManager::disableShadowsForStateSet(camera->getOrCreateStateSet());
+        }
 
-            cv->pushModelViewMatrix(modelViewMatrix, osg::Transform::RELATIVE_RF);
-            traverse(node, cv);
-            cv->popModelViewMatrix();
+        void apply(osg::Camera* camera) override
+        {
+            camera->setViewMatrix(mViewMatrix);
+            camera->setCullMask(mNodeMask);
         }
-        else
-            traverse(node, cv);
-    }
-};
 
-class RainIntensityUpdater : public SceneUtil::StateSetUpdater
-{
-public:
-    RainIntensityUpdater()
-        : mRainIntensity(0.f)
-    {
-    }
+        void setScene(osg::Node* scene)
+        {
+            if (mScene)
+                mClipCullNode->removeChild(mScene);
+            mScene = scene;
+            mClipCullNode->addChild(scene);
+        }
 
-    void setRainIntensity(float rainIntensity)
-    {
-        mRainIntensity = rainIntensity;
-    }
+        void setWaterLevel(float waterLevel)
+        {
+            const float refractionScale
+                = std::clamp(Settings::Manager::getFloat("refraction scale", "Water"), 0.f, 1.f);
 
-protected:
-    void setDefaults(osg::StateSet* stateset) override
-    {
-        osg::ref_ptr<osg::Uniform> rainIntensityUniform = new osg::Uniform("rainIntensity", 0.0f);
-        stateset->addUniform(rainIntensityUniform.get());
-    }
+            mViewMatrix = osg::Matrix::scale(1, 1, refractionScale)
+                * osg::Matrix::translate(0, 0, (1.0 - refractionScale) * waterLevel);
 
-    void apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/) override
-    {
-        osg::ref_ptr<osg::Uniform> rainIntensityUniform = stateset->getUniform("rainIntensity");
-        if (rainIntensityUniform != nullptr)
-            rainIntensityUniform->set(mRainIntensity);
-    }
+            mClipCullNode->setPlane(osg::Plane(osg::Vec3d(0, 0, -1), osg::Vec3d(0, 0, waterLevel)));
+        }
 
-private:
-    float mRainIntensity;
-};
+        void showWorld(bool show)
+        {
+            if (show)
+                mNodeMask = Refraction::sDefaultCullMask;
+            else
+                mNodeMask = Refraction::sDefaultCullMask & ~sToggleWorldMask;
+        }
 
-osg::ref_ptr<osg::Image> readPngImage (const std::filesystem::path& file)
-{
-    std::ifstream inStream;
-    inStream.open(file, std::ios_base::in | std::ios_base::binary);
-    if (inStream.fail())
-        Log(Debug::Error) << "Error: Failed to open " << file;
-    osgDB::ReaderWriter* reader = osgDB::Registry::instance()->getReaderWriterForExtension("png");
-    if (!reader)
-    {
-        Log(Debug::Error) << "Error: Failed to read " << file << ", no png readerwriter found";
-        return osg::ref_ptr<osg::Image>();
-    }
-    osgDB::ReaderWriter::ReadResult result = reader->readImage(inStream);
-    if (!result.success())
-        Log(Debug::Error) << "Error: Failed to read " << file << ": " << result.message() << " code " << result.status();
+    private:
+        osg::ref_ptr<ClipCullNode> mClipCullNode;
+        osg::ref_ptr<osg::Node> mScene;
+        osg::Matrix mViewMatrix{ osg::Matrix::identity() };
 
-    return result.getImage();
-}
+        unsigned int mNodeMask;
 
-class Refraction : public SceneUtil::RTTNode
-{
-public:
-    Refraction(uint32_t rttSize)
-        : RTTNode(rttSize, rttSize, 0, false, 1, StereoAwareness::Aware)
-        , mNodeMask(Refraction::sDefaultCullMask)
-    {
-        setDepthBufferInternalFormat(GL_DEPTH24_STENCIL8);
-        mClipCullNode = new ClipCullNode;
-    }
+        static constexpr unsigned int sDefaultCullMask = Mask_Effect | Mask_Scene | Mask_Object | Mask_Static
+            | Mask_Terrain | Mask_Actor | Mask_ParticleSystem | Mask_Sky | Mask_Sun | Mask_Player | Mask_Lighting
+            | Mask_Groundcover;
+    };
 
-    void setDefaults(osg::Camera* camera) override
+    class Reflection : public SceneUtil::RTTNode
     {
-        camera->setReferenceFrame(osg::Camera::RELATIVE_RF);
-        camera->setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water"));
-        camera->setName("RefractionCamera");
-        camera->addCullCallback(new InheritViewPointCallback);
-        camera->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
-
-        // No need for fog here, we are already applying fog on the water surface itself as well as underwater fog
-        // assign large value to effectively turn off fog
-        // shaders don't respect glDisable(GL_FOG)
-        osg::ref_ptr<osg::Fog> fog(new osg::Fog);
-        fog->setStart(10000000);
-        fog->setEnd(10000000);
-        camera->getOrCreateStateSet()->setAttributeAndModes(fog, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE);
+    public:
+        Reflection(uint32_t rttSize, bool isInterior)
+            : RTTNode(rttSize, rttSize, 0, false, 0, StereoAwareness::Aware)
+        {
+            setInterior(isInterior);
+            setDepthBufferInternalFormat(GL_DEPTH24_STENCIL8);
+            mClipCullNode = new ClipCullNode;
+        }
 
-        camera->addChild(mClipCullNode);
-        camera->setNodeMask(Mask_RenderToTexture);
+        void setDefaults(osg::Camera* camera) override
+        {
+            camera->setReferenceFrame(osg::Camera::RELATIVE_RF);
+            camera->setSmallFeatureCullingPixelSize(
+                Settings::Manager::getInt("small feature culling pixel size", "Water"));
+            camera->setName("ReflectionCamera");
+            camera->addCullCallback(new InheritViewPointCallback);
 
-        if (Settings::Manager::getFloat("refraction scale", "Water") != 1) // TODO: to be removed with issue #5709
-            SceneUtil::ShadowManager::disableShadowsForStateSet(camera->getOrCreateStateSet());
-    }
+            // Inform the shader that we're in a reflection
+            camera->getOrCreateStateSet()->addUniform(new osg::Uniform("isReflection", true));
 
-    void apply(osg::Camera* camera) override
-    {
-        camera->setViewMatrix(mViewMatrix);
-        camera->setCullMask(mNodeMask);
-    }
+            // XXX: should really flip the FrontFace on each renderable instead of forcing clockwise.
+            osg::ref_ptr<osg::FrontFace> frontFace(new osg::FrontFace);
+            frontFace->setMode(osg::FrontFace::CLOCKWISE);
+            camera->getOrCreateStateSet()->setAttributeAndModes(frontFace, osg::StateAttribute::ON);
 
-    void setScene(osg::Node* scene)
-    {
-        if (mScene)
-            mClipCullNode->removeChild(mScene);
-        mScene = scene;
-        mClipCullNode->addChild(scene);
-    }
+            camera->addChild(mClipCullNode);
+            camera->setNodeMask(Mask_RenderToTexture);
 
-    void setWaterLevel(float waterLevel)
-    {
-        const float refractionScale = std::clamp(Settings::Manager::getFloat("refraction scale", "Water"), 0.f, 1.f);
+            SceneUtil::ShadowManager::disableShadowsForStateSet(camera->getOrCreateStateSet());
+        }
 
-        mViewMatrix = osg::Matrix::scale(1, 1, refractionScale) *
-            osg::Matrix::translate(0, 0, (1.0 - refractionScale) * waterLevel);
+        void apply(osg::Camera* camera) override
+        {
+            camera->setViewMatrix(mViewMatrix);
+            camera->setCullMask(mNodeMask);
+        }
 
-        mClipCullNode->setPlane(osg::Plane(osg::Vec3d(0, 0, -1), osg::Vec3d(0, 0, waterLevel)));
-    }
+        void setInterior(bool isInterior)
+        {
+            mInterior = isInterior;
+            mNodeMask = calcNodeMask();
+        }
 
-    void showWorld(bool show)
-    {
-        if (show)
-            mNodeMask = Refraction::sDefaultCullMask;
-        else
-            mNodeMask = Refraction::sDefaultCullMask & ~sToggleWorldMask;
-    }
+        void setWaterLevel(float waterLevel)
+        {
+            mViewMatrix = osg::Matrix::scale(1, 1, -1) * osg::Matrix::translate(0, 0, 2 * waterLevel);
+            mClipCullNode->setPlane(osg::Plane(osg::Vec3d(0, 0, 1), osg::Vec3d(0, 0, waterLevel)));
+        }
 
-private:
-    osg::ref_ptr<ClipCullNode> mClipCullNode;
-    osg::ref_ptr<osg::Node> mScene;
-    osg::Matrix mViewMatrix{ osg::Matrix::identity() };
+        void setScene(osg::Node* scene)
+        {
+            if (mScene)
+                mClipCullNode->removeChild(mScene);
+            mScene = scene;
+            mClipCullNode->addChild(scene);
+        }
 
-    unsigned int mNodeMask;
+        void showWorld(bool show)
+        {
+            if (show)
+                mNodeMask = calcNodeMask();
+            else
+                mNodeMask = calcNodeMask() & ~sToggleWorldMask;
+        }
 
-    static constexpr unsigned int sDefaultCullMask = Mask_Effect | Mask_Scene | Mask_Object | Mask_Static | Mask_Terrain | Mask_Actor | Mask_ParticleSystem | Mask_Sky | Mask_Sun | Mask_Player | Mask_Lighting | Mask_Groundcover;
-};
+    private:
+        unsigned int calcNodeMask()
+        {
+            int reflectionDetail = Settings::Manager::getInt("reflection detail", "Water");
+            reflectionDetail = std::clamp(reflectionDetail, mInterior ? 2 : 0, 5);
+            unsigned int extraMask = 0;
+            if (reflectionDetail >= 1)
+                extraMask |= Mask_Terrain;
+            if (reflectionDetail >= 2)
+                extraMask |= Mask_Static;
+            if (reflectionDetail >= 3)
+                extraMask |= Mask_Effect | Mask_ParticleSystem | Mask_Object;
+            if (reflectionDetail >= 4)
+                extraMask |= Mask_Player | Mask_Actor;
+            if (reflectionDetail >= 5)
+                extraMask |= Mask_Groundcover;
+            return Mask_Scene | Mask_Sky | Mask_Lighting | extraMask;
+        }
 
-class Reflection : public SceneUtil::RTTNode
-{
-public:
-    Reflection(uint32_t rttSize, bool isInterior)
-        : RTTNode(rttSize, rttSize, 0, false, 0, StereoAwareness::Aware)
-    {
-        setInterior(isInterior);
-        setDepthBufferInternalFormat(GL_DEPTH24_STENCIL8);
-        mClipCullNode = new ClipCullNode;
-    }
+        osg::ref_ptr<ClipCullNode> mClipCullNode;
+        osg::ref_ptr<osg::Node> mScene;
+        osg::Node::NodeMask mNodeMask;
+        osg::Matrix mViewMatrix{ osg::Matrix::identity() };
+        bool mInterior;
+    };
 
-    void setDefaults(osg::Camera* camera) override
+    /// DepthClampCallback enables GL_DEPTH_CLAMP for the current draw, if supported.
+    class DepthClampCallback : public osg::Drawable::DrawCallback
     {
-        camera->setReferenceFrame(osg::Camera::RELATIVE_RF);
-        camera->setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water"));
-        camera->setName("ReflectionCamera");
-        camera->addCullCallback(new InheritViewPointCallback);
-
-        // Inform the shader that we're in a reflection
-        camera->getOrCreateStateSet()->addUniform(new osg::Uniform("isReflection", true));
+    public:
+        void drawImplementation(osg::RenderInfo& renderInfo, const osg::Drawable* drawable) const override
+        {
+            static bool supported = osg::isGLExtensionOrVersionSupported(
+                renderInfo.getState()->getContextID(), "GL_ARB_depth_clamp", 3.3);
+            if (!supported)
+            {
+                drawable->drawImplementation(renderInfo);
+                return;
+            }
 
-        // XXX: should really flip the FrontFace on each renderable instead of forcing clockwise.
-        osg::ref_ptr<osg::FrontFace> frontFace(new osg::FrontFace);
-        frontFace->setMode(osg::FrontFace::CLOCKWISE);
-        camera->getOrCreateStateSet()->setAttributeAndModes(frontFace, osg::StateAttribute::ON);
+            glEnable(GL_DEPTH_CLAMP);
 
-        camera->addChild(mClipCullNode);
-        camera->setNodeMask(Mask_RenderToTexture);
+            drawable->drawImplementation(renderInfo);
 
-        SceneUtil::ShadowManager::disableShadowsForStateSet(camera->getOrCreateStateSet());
-    }
+            // restore default
+            glDisable(GL_DEPTH_CLAMP);
+        }
+    };
 
-    void apply(osg::Camera* camera) override
+    Water::Water(osg::Group* parent, osg::Group* sceneRoot, Resource::ResourceSystem* resourceSystem,
+        osgUtil::IncrementalCompileOperation* ico, const std::filesystem::path& resourcePath)
+        : mRainIntensityUpdater(nullptr)
+        , mParent(parent)
+        , mSceneRoot(sceneRoot)
+        , mResourceSystem(resourceSystem)
+        , mResourcePath(resourcePath)
+        , mEnabled(true)
+        , mToggled(true)
+        , mTop(0)
+        , mInterior(false)
+        , mShowWorld(true)
+        , mCullCallback(nullptr)
+        , mShaderWaterStateSetUpdater(nullptr)
     {
-        camera->setViewMatrix(mViewMatrix);
-        camera->setCullMask(mNodeMask);
-    }
+        mSimulation = std::make_unique<RippleSimulation>(mSceneRoot, resourceSystem);
 
-    void setInterior(bool isInterior)
-    {
-        mInterior = isInterior;
-        mNodeMask = calcNodeMask();
-    }
+        mWaterGeom = SceneUtil::createWaterGeometry(Constants::CellSizeInUnits * 150, 40, 900);
+        mWaterGeom->setDrawCallback(new DepthClampCallback);
+        mWaterGeom->setNodeMask(Mask_Water);
+        mWaterGeom->setDataVariance(osg::Object::STATIC);
+        mWaterGeom->setName("Water Geometry");
 
-    void setWaterLevel(float waterLevel)
-    {
-        mViewMatrix = osg::Matrix::scale(1, 1, -1) * osg::Matrix::translate(0, 0, 2 * waterLevel);
-        mClipCullNode->setPlane(osg::Plane(osg::Vec3d(0, 0, 1), osg::Vec3d(0, 0, waterLevel)));
-    }
+        mWaterNode = new osg::PositionAttitudeTransform;
+        mWaterNode->setName("Water Root");
+        mWaterNode->addChild(mWaterGeom);
+        mWaterNode->addCullCallback(new FudgeCallback);
 
-    void setScene(osg::Node* scene)
-    {
-        if (mScene)
-            mClipCullNode->removeChild(mScene);
-        mScene = scene;
-        mClipCullNode->addChild(scene);
-    }
+        // simple water fallback for the local map
+        osg::ref_ptr<osg::Geometry> geom2(osg::clone(mWaterGeom.get(), osg::CopyOp::DEEP_COPY_NODES));
+        createSimpleWaterStateSet(geom2, Fallback::Map::getFloat("Water_Map_Alpha"));
+        geom2->setNodeMask(Mask_SimpleWater);
+        geom2->setName("Simple Water Geometry");
+        mWaterNode->addChild(geom2);
 
-    void showWorld(bool show)
-    {
-        if (show)
-            mNodeMask = calcNodeMask();
-        else
-            mNodeMask = calcNodeMask() & ~sToggleWorldMask;
-    }
+        mSceneRoot->addChild(mWaterNode);
 
-private:
+        setHeight(mTop);
 
-    unsigned int calcNodeMask()
-    {
-        int reflectionDetail = Settings::Manager::getInt("reflection detail", "Water");
-        reflectionDetail = std::clamp(reflectionDetail, mInterior ? 2 : 0, 5);
-        unsigned int extraMask = 0;
-        if(reflectionDetail >= 1) extraMask |= Mask_Terrain;
-        if(reflectionDetail >= 2) extraMask |= Mask_Static;
-        if(reflectionDetail >= 3) extraMask |= Mask_Effect | Mask_ParticleSystem | Mask_Object;
-        if(reflectionDetail >= 4) extraMask |= Mask_Player | Mask_Actor;
-        if(reflectionDetail >= 5) extraMask |= Mask_Groundcover;
-        return Mask_Scene | Mask_Sky | Mask_Lighting | extraMask;
-    }
+        updateWaterMaterial();
 
-    osg::ref_ptr<ClipCullNode> mClipCullNode;
-    osg::ref_ptr<osg::Node> mScene;
-    osg::Node::NodeMask mNodeMask;
-    osg::Matrix mViewMatrix{ osg::Matrix::identity() };
-    bool mInterior;
-};
+        if (ico)
+            ico->add(mWaterNode);
+    }
 
-/// DepthClampCallback enables GL_DEPTH_CLAMP for the current draw, if supported.
-class DepthClampCallback : public osg::Drawable::DrawCallback
-{
-public:
-    void drawImplementation(osg::RenderInfo& renderInfo,const osg::Drawable* drawable) const override
+    void Water::setCullCallback(osg::Callback* callback)
     {
-        static bool supported = osg::isGLExtensionOrVersionSupported(renderInfo.getState()->getContextID(), "GL_ARB_depth_clamp", 3.3);
-        if (!supported)
+        if (mCullCallback)
         {
-            drawable->drawImplementation(renderInfo);
-            return;
+            mWaterNode->removeCullCallback(mCullCallback);
+            if (mReflection)
+                mReflection->removeCullCallback(mCullCallback);
+            if (mRefraction)
+                mRefraction->removeCullCallback(mCullCallback);
         }
 
-        glEnable(GL_DEPTH_CLAMP);
-
-        drawable->drawImplementation(renderInfo);
+        mCullCallback = callback;
 
-        // restore default
-        glDisable(GL_DEPTH_CLAMP);
+        if (callback)
+        {
+            mWaterNode->addCullCallback(callback);
+            if (mReflection)
+                mReflection->addCullCallback(callback);
+            if (mRefraction)
+                mRefraction->addCullCallback(callback);
+        }
     }
-};
-
-Water::Water(osg::Group *parent, osg::Group* sceneRoot, Resource::ResourceSystem *resourceSystem,
-             osgUtil::IncrementalCompileOperation *ico, const std::filesystem::path& resourcePath)
-    : mRainIntensityUpdater(nullptr)
-    , mParent(parent)
-    , mSceneRoot(sceneRoot)
-    , mResourceSystem(resourceSystem)
-    , mResourcePath(resourcePath)
-    , mEnabled(true)
-    , mToggled(true)
-    , mTop(0)
-    , mInterior(false)
-    , mShowWorld(true)
-    , mCullCallback(nullptr)
-    , mShaderWaterStateSetUpdater(nullptr)
-{
-    mSimulation = std::make_unique<RippleSimulation>(mSceneRoot, resourceSystem);
 
-    mWaterGeom = SceneUtil::createWaterGeometry(Constants::CellSizeInUnits*150, 40, 900);
-    mWaterGeom->setDrawCallback(new DepthClampCallback);
-    mWaterGeom->setNodeMask(Mask_Water);
-    mWaterGeom->setDataVariance(osg::Object::STATIC);
-    mWaterGeom->setName("Water Geometry");
+    void Water::updateWaterMaterial()
+    {
+        if (mShaderWaterStateSetUpdater)
+        {
+            mWaterNode->removeCullCallback(mShaderWaterStateSetUpdater);
+            mShaderWaterStateSetUpdater = nullptr;
+        }
+        if (mReflection)
+        {
+            mParent->removeChild(mReflection);
+            mReflection = nullptr;
+        }
+        if (mRefraction)
+        {
+            mParent->removeChild(mRefraction);
+            mRefraction = nullptr;
+        }
 
-    mWaterNode = new osg::PositionAttitudeTransform;
-    mWaterNode->setName("Water Root");
-    mWaterNode->addChild(mWaterGeom);
-    mWaterNode->addCullCallback(new FudgeCallback);
+        mWaterNode->setStateSet(nullptr);
+        mWaterGeom->setStateSet(nullptr);
+        mWaterGeom->setUpdateCallback(nullptr);
 
-    // simple water fallback for the local map
-    osg::ref_ptr<osg::Geometry> geom2 (osg::clone(mWaterGeom.get(), osg::CopyOp::DEEP_COPY_NODES));
-    createSimpleWaterStateSet(geom2, Fallback::Map::getFloat("Water_Map_Alpha"));
-    geom2->setNodeMask(Mask_SimpleWater);
-    geom2->setName("Simple Water Geometry");
-    mWaterNode->addChild(geom2);
+        if (Settings::Manager::getBool("shader", "Water"))
+        {
+            unsigned int rttSize = Settings::Manager::getInt("rtt size", "Water");
 
-    mSceneRoot->addChild(mWaterNode);
+            mReflection = new Reflection(rttSize, mInterior);
+            mReflection->setWaterLevel(mTop);
+            mReflection->setScene(mSceneRoot);
+            if (mCullCallback)
+                mReflection->addCullCallback(mCullCallback);
+            mParent->addChild(mReflection);
 
-    setHeight(mTop);
+            if (Settings::Manager::getBool("refraction", "Water"))
+            {
+                mRefraction = new Refraction(rttSize);
+                mRefraction->setWaterLevel(mTop);
+                mRefraction->setScene(mSceneRoot);
+                if (mCullCallback)
+                    mRefraction->addCullCallback(mCullCallback);
+                mParent->addChild(mRefraction);
+            }
 
-    updateWaterMaterial();
+            showWorld(mShowWorld);
 
-    if (ico)
-        ico->add(mWaterNode);
-}
+            createShaderWaterStateSet(mWaterNode, mReflection, mRefraction);
+        }
+        else
+            createSimpleWaterStateSet(mWaterGeom, Fallback::Map::getFloat("Water_World_Alpha"));
 
-void Water::setCullCallback(osg::Callback* callback)
-{
-    if (mCullCallback)
-    {
-        mWaterNode->removeCullCallback(mCullCallback);
-        if (mReflection)
-            mReflection->removeCullCallback(mCullCallback);
-        if (mRefraction)
-            mRefraction->removeCullCallback(mCullCallback);
+        updateVisible();
     }
 
-    mCullCallback = callback;
-
-    if (callback)
+    osg::Node* Water::getReflectionNode()
     {
-        mWaterNode->addCullCallback(callback);
-        if (mReflection)
-            mReflection->addCullCallback(callback);
-        if (mRefraction)
-            mRefraction->addCullCallback(callback);
+        return mReflection;
     }
-}
 
-void Water::updateWaterMaterial()
-{
-    if (mShaderWaterStateSetUpdater)
+    osg::Node* Water::getRefractionNode()
     {
-        mWaterNode->removeCullCallback(mShaderWaterStateSetUpdater);
-        mShaderWaterStateSetUpdater = nullptr;
+        return mRefraction;
     }
-    if (mReflection)
-    {
-        mParent->removeChild(mReflection);
-        mReflection = nullptr;
-    }
-    if (mRefraction)
+
+    osg::Vec3d Water::getPosition() const
     {
-        mParent->removeChild(mRefraction);
-        mRefraction = nullptr;
+        return mWaterNode->getPosition();
     }
 
-    mWaterNode->setStateSet(nullptr);
-    mWaterGeom->setStateSet(nullptr);
-    mWaterGeom->setUpdateCallback(nullptr);
-
-    if (Settings::Manager::getBool("shader", "Water"))
+    void Water::createSimpleWaterStateSet(osg::Node* node, float alpha)
     {
-        unsigned int rttSize = Settings::Manager::getInt("rtt size", "Water");
+        osg::ref_ptr<osg::StateSet> stateset = SceneUtil::createSimpleWaterStateSet(alpha, MWRender::RenderBin_Water);
 
-        mReflection = new Reflection(rttSize, mInterior);
-        mReflection->setWaterLevel(mTop);
-        mReflection->setScene(mSceneRoot);
-        if (mCullCallback)
-            mReflection->addCullCallback(mCullCallback);
-        mParent->addChild(mReflection);
+        node->setStateSet(stateset);
+        node->setUpdateCallback(nullptr);
+        mRainIntensityUpdater = nullptr;
 
-        if (Settings::Manager::getBool("refraction", "Water"))
+        // Add animated textures
+        std::vector<osg::ref_ptr<osg::Texture2D>> textures;
+        const int frameCount = std::clamp(Fallback::Map::getInt("Water_SurfaceFrameCount"), 0, 320);
+        std::string_view texture = Fallback::Map::getString("Water_SurfaceTexture");
+        for (int i = 0; i < frameCount; ++i)
         {
-            mRefraction = new Refraction(rttSize);
-            mRefraction->setWaterLevel(mTop);
-            mRefraction->setScene(mSceneRoot);
-            if (mCullCallback)
-                mRefraction->addCullCallback(mCullCallback);
-            mParent->addChild(mRefraction);
+            std::ostringstream texname;
+            texname << "textures/water/" << texture << std::setw(2) << std::setfill('0') << i << ".dds";
+            osg::ref_ptr<osg::Texture2D> tex(
+                new osg::Texture2D(mResourceSystem->getImageManager()->getImage(texname.str())));
+            tex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
+            tex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
+            mResourceSystem->getSceneManager()->applyFilterSettings(tex);
+            textures.push_back(tex);
         }
 
-        showWorld(mShowWorld);
+        if (textures.empty())
+            return;
+
+        float fps = Fallback::Map::getFloat("Water_SurfaceFPS");
 
-        createShaderWaterStateSet(mWaterNode, mReflection, mRefraction);
+        osg::ref_ptr<NifOsg::FlipController> controller(new NifOsg::FlipController(0, 1.f / fps, textures));
+        controller->setSource(std::make_shared<SceneUtil::FrameTimeSource>());
+        node->setUpdateCallback(controller);
+
+        stateset->setTextureAttributeAndModes(0, textures[0], osg::StateAttribute::ON);
+
+        // use a shader to render the simple water, ensuring that fog is applied per pixel as required.
+        // this could be removed if a more detailed water mesh, using some sort of paging solution, is implemented.
+        Resource::SceneManager* sceneManager = mResourceSystem->getSceneManager();
+        bool oldValue = sceneManager->getForceShaders();
+        sceneManager->setForceShaders(true);
+        sceneManager->recreateShaders(node);
+        sceneManager->setForceShaders(oldValue);
     }
-    else
-        createSimpleWaterStateSet(mWaterGeom, Fallback::Map::getFloat("Water_World_Alpha"));
 
-    updateVisible();
-}
+    class ShaderWaterStateSetUpdater : public SceneUtil::StateSetUpdater
+    {
+    public:
+        ShaderWaterStateSetUpdater(Water* water, Reflection* reflection, Refraction* refraction,
+            osg::ref_ptr<osg::Program> program, osg::ref_ptr<osg::Texture2D> normalMap)
+            : mWater(water)
+            , mReflection(reflection)
+            , mRefraction(refraction)
+            , mProgram(program)
+            , mNormalMap(normalMap)
+        {
+        }
 
-osg::Node *Water::getReflectionNode()
-{
-    return mReflection;
-}
+        void setDefaults(osg::StateSet* stateset) override
+        {
+            stateset->addUniform(new osg::Uniform("normalMap", 0));
+            stateset->setTextureAttributeAndModes(0, mNormalMap, osg::StateAttribute::ON);
+            stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
+            stateset->setAttributeAndModes(mProgram, osg::StateAttribute::ON);
 
-osg::Node* Water::getRefractionNode()
-{
-    return mRefraction;
-}
+            stateset->addUniform(new osg::Uniform("reflectionMap", 1));
+            if (mRefraction)
+            {
+                stateset->addUniform(new osg::Uniform("refractionMap", 2));
+                stateset->addUniform(new osg::Uniform("refractionDepthMap", 3));
+                stateset->setRenderBinDetails(MWRender::RenderBin_Default, "RenderBin");
+            }
+            else
+            {
+                stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
+                stateset->setRenderBinDetails(MWRender::RenderBin_Water, "RenderBin");
+                osg::ref_ptr<osg::Depth> depth = new SceneUtil::AutoDepth;
+                depth->setWriteMask(false);
+                stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
+            }
+            stateset->addUniform(new osg::Uniform("nodePosition", osg::Vec3f(mWater->getPosition())));
+        }
 
-osg::Vec3d Water::getPosition() const
-{
-    return mWaterNode->getPosition();
-}
+        void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override
+        {
+            osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
+            stateset->setTextureAttributeAndModes(1, mReflection->getColorTexture(cv), osg::StateAttribute::ON);
 
-void Water::createSimpleWaterStateSet(osg::Node* node, float alpha)
-{
-    osg::ref_ptr<osg::StateSet> stateset = SceneUtil::createSimpleWaterStateSet(alpha, MWRender::RenderBin_Water);
-
-    node->setStateSet(stateset);
-    node->setUpdateCallback(nullptr);
-    mRainIntensityUpdater = nullptr;
-
-    // Add animated textures
-    std::vector<osg::ref_ptr<osg::Texture2D> > textures;
-    const int frameCount = std::clamp(Fallback::Map::getInt("Water_SurfaceFrameCount"), 0, 320);
-    std::string_view texture = Fallback::Map::getString("Water_SurfaceTexture");
-    for (int i=0; i<frameCount; ++i)
-    {
-        std::ostringstream texname;
-        texname << "textures/water/" << texture << std::setw(2) << std::setfill('0') << i << ".dds";
-        osg::ref_ptr<osg::Texture2D> tex (new osg::Texture2D(mResourceSystem->getImageManager()->getImage(texname.str())));
-        tex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
-        tex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
-        mResourceSystem->getSceneManager()->applyFilterSettings(tex);
-        textures.push_back(tex);
-    }
+            if (mRefraction)
+            {
+                stateset->setTextureAttributeAndModes(2, mRefraction->getColorTexture(cv), osg::StateAttribute::ON);
+                stateset->setTextureAttributeAndModes(3, mRefraction->getDepthTexture(cv), osg::StateAttribute::ON);
+            }
+            stateset->getUniform("nodePosition")->set(osg::Vec3f(mWater->getPosition()));
+        }
 
-    if (textures.empty())
-        return;
+    private:
+        Water* mWater;
+        Reflection* mReflection;
+        Refraction* mRefraction;
+        osg::ref_ptr<osg::Program> mProgram;
+        osg::ref_ptr<osg::Texture2D> mNormalMap;
+    };
 
-    float fps = Fallback::Map::getFloat("Water_SurfaceFPS");
+    void Water::createShaderWaterStateSet(osg::Node* node, Reflection* reflection, Refraction* refraction)
+    {
+        // use a define map to conditionally compile the shader
+        std::map<std::string, std::string> defineMap;
+        defineMap["refraction_enabled"] = std::string(mRefraction ? "1" : "0");
+        const auto rippleDetail = std::clamp(Settings::Manager::getInt("rain ripple detail", "Water"), 0, 2);
+        defineMap["rain_ripple_detail"] = std::to_string(rippleDetail);
 
-    osg::ref_ptr<NifOsg::FlipController> controller (new NifOsg::FlipController(0, 1.f/fps, textures));
-    controller->setSource(std::make_shared<SceneUtil::FrameTimeSource>());
-    node->setUpdateCallback(controller);
+        Stereo::Manager::instance().shaderStereoDefines(defineMap);
 
-    stateset->setTextureAttributeAndModes(0, textures[0], osg::StateAttribute::ON);
+        Shader::ShaderManager& shaderMgr = mResourceSystem->getSceneManager()->getShaderManager();
+        osg::ref_ptr<osg::Shader> vertexShader(
+            shaderMgr.getShader("water_vertex.glsl", defineMap, osg::Shader::VERTEX));
+        osg::ref_ptr<osg::Shader> fragmentShader(
+            shaderMgr.getShader("water_fragment.glsl", defineMap, osg::Shader::FRAGMENT));
+        osg::ref_ptr<osg::Program> program = shaderMgr.getProgram(vertexShader, fragmentShader);
 
-    // use a shader to render the simple water, ensuring that fog is applied per pixel as required.
-    // this could be removed if a more detailed water mesh, using some sort of paging solution, is implemented.
-    Resource::SceneManager* sceneManager = mResourceSystem->getSceneManager();
-    bool oldValue = sceneManager->getForceShaders();
-    sceneManager->setForceShaders(true);
-    sceneManager->recreateShaders(node);
-    sceneManager->setForceShaders(oldValue);
-}
+        osg::ref_ptr<osg::Texture2D> normalMap(
+            new osg::Texture2D(readPngImage(mResourcePath / "shaders" / "water_nm.png")));
 
-class ShaderWaterStateSetUpdater : public SceneUtil::StateSetUpdater
-{
-public:
-    ShaderWaterStateSetUpdater(Water* water, Reflection* reflection, Refraction* refraction, osg::ref_ptr<osg::Program> program, osg::ref_ptr<osg::Texture2D> normalMap)
-        : mWater(water)
-        , mReflection(reflection)
-        , mRefraction(refraction)
-        , mProgram(program)
-        , mNormalMap(normalMap)
+        if (normalMap->getImage())
+            normalMap->getImage()->flipVertical();
+        normalMap->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
+        normalMap->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
+        normalMap->setMaxAnisotropy(16);
+        normalMap->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR_MIPMAP_LINEAR);
+        normalMap->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+
+        mRainIntensityUpdater = new RainIntensityUpdater();
+        node->setUpdateCallback(mRainIntensityUpdater);
+
+        mShaderWaterStateSetUpdater
+            = new ShaderWaterStateSetUpdater(this, mReflection, mRefraction, program, normalMap);
+        node->addCullCallback(mShaderWaterStateSetUpdater);
+    }
+
+    void Water::processChangedSettings(const Settings::CategorySettingVector& settings)
     {
+        updateWaterMaterial();
     }
 
-    void setDefaults(osg::StateSet* stateset) override
+    Water::~Water()
     {
-        stateset->addUniform(new osg::Uniform("normalMap", 0));
-        stateset->setTextureAttributeAndModes(0, mNormalMap, osg::StateAttribute::ON);
-        stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
-        stateset->setAttributeAndModes(mProgram, osg::StateAttribute::ON);
+        mParent->removeChild(mWaterNode);
 
-        stateset->addUniform(new osg::Uniform("reflectionMap", 1));
-        if (mRefraction)
+        if (mReflection)
         {
-            stateset->addUniform(new osg::Uniform("refractionMap", 2));
-            stateset->addUniform(new osg::Uniform("refractionDepthMap", 3));
-            stateset->setRenderBinDetails(MWRender::RenderBin_Default, "RenderBin");
+            mParent->removeChild(mReflection);
+            mReflection = nullptr;
         }
-        else
+        if (mRefraction)
         {
-            stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
-            stateset->setRenderBinDetails(MWRender::RenderBin_Water, "RenderBin");
-            osg::ref_ptr<osg::Depth> depth = new SceneUtil::AutoDepth;
-            depth->setWriteMask(false);
-            stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
+            mParent->removeChild(mRefraction);
+            mRefraction = nullptr;
         }
-        stateset->addUniform(new osg::Uniform("nodePosition", osg::Vec3f(mWater->getPosition())));
     }
 
-    void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override
+    void Water::listAssetsToPreload(std::vector<std::string>& textures)
     {
-        osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
-        stateset->setTextureAttributeAndModes(1, mReflection->getColorTexture(cv), osg::StateAttribute::ON);
-
-        if (mRefraction)
+        const int frameCount = std::clamp(Fallback::Map::getInt("Water_SurfaceFrameCount"), 0, 320);
+        std::string_view texture = Fallback::Map::getString("Water_SurfaceTexture");
+        for (int i = 0; i < frameCount; ++i)
         {
-            stateset->setTextureAttributeAndModes(2, mRefraction->getColorTexture(cv), osg::StateAttribute::ON);
-            stateset->setTextureAttributeAndModes(3, mRefraction->getDepthTexture(cv), osg::StateAttribute::ON);
+            std::ostringstream texname;
+            texname << "textures/water/" << texture << std::setw(2) << std::setfill('0') << i << ".dds";
+            textures.push_back(texname.str());
         }
-        stateset->getUniform("nodePosition")->set(osg::Vec3f(mWater->getPosition()));
     }
 
-private:
-    Water* mWater;
-    Reflection* mReflection;
-    Refraction* mRefraction;
-    osg::ref_ptr<osg::Program> mProgram;
-    osg::ref_ptr<osg::Texture2D> mNormalMap;
-};
-
-void Water::createShaderWaterStateSet(osg::Node* node, Reflection* reflection, Refraction* refraction)
-{
-    // use a define map to conditionally compile the shader
-    std::map<std::string, std::string> defineMap;
-    defineMap["refraction_enabled"] = std::string(mRefraction ? "1" : "0");
-    const auto rippleDetail = std::clamp(Settings::Manager::getInt("rain ripple detail", "Water"), 0, 2);
-    defineMap["rain_ripple_detail"] = std::to_string(rippleDetail);
-
-    Stereo::Manager::instance().shaderStereoDefines(defineMap);
-
-    Shader::ShaderManager& shaderMgr = mResourceSystem->getSceneManager()->getShaderManager();
-    osg::ref_ptr<osg::Shader> vertexShader(shaderMgr.getShader("water_vertex.glsl", defineMap, osg::Shader::VERTEX));
-    osg::ref_ptr<osg::Shader> fragmentShader(shaderMgr.getShader("water_fragment.glsl", defineMap, osg::Shader::FRAGMENT));
-    osg::ref_ptr<osg::Program> program = shaderMgr.getProgram(vertexShader, fragmentShader);
-
-    osg::ref_ptr<osg::Texture2D> normalMap(new osg::Texture2D(readPngImage(mResourcePath / "shaders" / "water_nm.png")));
-
-    if (normalMap->getImage())
-        normalMap->getImage()->flipVertical();
-    normalMap->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
-    normalMap->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
-    normalMap->setMaxAnisotropy(16);
-    normalMap->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR_MIPMAP_LINEAR);
-    normalMap->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+    void Water::setEnabled(bool enabled)
+    {
+        mEnabled = enabled;
+        updateVisible();
+    }
 
+    void Water::changeCell(const MWWorld::CellStore* store)
+    {
+        bool isInterior = !store->getCell()->isExterior();
+        bool wasInterior = mInterior;
+        if (!isInterior)
+        {
+            mWaterNode->setPosition(getSceneNodeCoordinates(store->getCell()->mData.mX, store->getCell()->mData.mY));
+            mInterior = false;
+        }
+        else
+        {
+            mWaterNode->setPosition(osg::Vec3f(0, 0, mTop));
+            mInterior = true;
+        }
+        if (mInterior != wasInterior && mReflection)
+            mReflection->setInterior(mInterior);
+    }
 
-    mRainIntensityUpdater = new RainIntensityUpdater();
-    node->setUpdateCallback(mRainIntensityUpdater);
+    void Water::setHeight(const float height)
+    {
+        mTop = height;
 
-    mShaderWaterStateSetUpdater = new ShaderWaterStateSetUpdater(this, mReflection, mRefraction, program, normalMap);
-    node->addCullCallback(mShaderWaterStateSetUpdater);
-}
+        mSimulation->setWaterHeight(height);
 
-void Water::processChangedSettings(const Settings::CategorySettingVector& settings)
-{
-    updateWaterMaterial();
-}
+        osg::Vec3f pos = mWaterNode->getPosition();
+        pos.z() = height;
+        mWaterNode->setPosition(pos);
 
-Water::~Water()
-{
-    mParent->removeChild(mWaterNode);
+        if (mReflection)
+            mReflection->setWaterLevel(mTop);
+        if (mRefraction)
+            mRefraction->setWaterLevel(mTop);
+    }
 
-    if (mReflection)
+    void Water::setRainIntensity(float rainIntensity)
     {
-        mParent->removeChild(mReflection);
-        mReflection = nullptr;
+        if (mRainIntensityUpdater)
+            mRainIntensityUpdater->setRainIntensity(rainIntensity);
     }
-    if (mRefraction)
+
+    void Water::update(float dt)
     {
-        mParent->removeChild(mRefraction);
-        mRefraction = nullptr;
+        mSimulation->update(dt);
     }
-}
 
-void Water::listAssetsToPreload(std::vector<std::string> &textures)
-{
-    const int frameCount = std::clamp(Fallback::Map::getInt("Water_SurfaceFrameCount"), 0, 320);
-    std::string_view texture = Fallback::Map::getString("Water_SurfaceTexture");
-    for (int i=0; i<frameCount; ++i)
+    void Water::updateVisible()
     {
-        std::ostringstream texname;
-        texname << "textures/water/" << texture << std::setw(2) << std::setfill('0') << i << ".dds";
-        textures.push_back(texname.str());
+        bool visible = mEnabled && mToggled;
+        mWaterNode->setNodeMask(visible ? ~0u : 0u);
+        if (mRefraction)
+            mRefraction->setNodeMask(visible ? Mask_RenderToTexture : 0u);
+        if (mReflection)
+            mReflection->setNodeMask(visible ? Mask_RenderToTexture : 0u);
     }
-}
 
-void Water::setEnabled(bool enabled)
-{
-    mEnabled = enabled;
-    updateVisible();
-}
-
-void Water::changeCell(const MWWorld::CellStore* store)
-{
-    bool isInterior = !store->getCell()->isExterior();
-    bool wasInterior = mInterior;
-    if (!isInterior)
+    bool Water::toggle()
     {
-        mWaterNode->setPosition(getSceneNodeCoordinates(store->getCell()->mData.mX, store->getCell()->mData.mY));
-        mInterior = false;
+        mToggled = !mToggled;
+        updateVisible();
+        return mToggled;
     }
-    else
+
+    bool Water::isUnderwater(const osg::Vec3f& pos) const
     {
-        mWaterNode->setPosition(osg::Vec3f(0,0,mTop));
-        mInterior = true;
+        return pos.z() < mTop && mToggled && mEnabled;
     }
-    if(mInterior != wasInterior && mReflection)
-        mReflection->setInterior(mInterior);
-}
-
-void Water::setHeight(const float height)
-{
-    mTop = height;
-
-    mSimulation->setWaterHeight(height);
-
-    osg::Vec3f pos = mWaterNode->getPosition();
-    pos.z() = height;
-    mWaterNode->setPosition(pos);
-
-    if (mReflection)
-        mReflection->setWaterLevel(mTop);
-    if (mRefraction)
-        mRefraction->setWaterLevel(mTop);
-}
-
-void Water::setRainIntensity(float rainIntensity)
-{
-    if (mRainIntensityUpdater)
-        mRainIntensityUpdater->setRainIntensity(rainIntensity);
-}
-
-void Water::update(float dt)
-{
-    mSimulation->update(dt);
-}
-
-void Water::updateVisible()
-{
-    bool visible = mEnabled && mToggled;
-    mWaterNode->setNodeMask(visible ? ~0u : 0u);
-    if (mRefraction)
-        mRefraction->setNodeMask(visible ? Mask_RenderToTexture : 0u);
-    if (mReflection)
-        mReflection->setNodeMask(visible ? Mask_RenderToTexture : 0u);
-}
-
-bool Water::toggle()
-{
-    mToggled = !mToggled;
-    updateVisible();
-    return mToggled;
-}
-
-bool Water::isUnderwater(const osg::Vec3f &pos) const
-{
-    return pos.z() < mTop && mToggled && mEnabled;
-}
 
-osg::Vec3f Water::getSceneNodeCoordinates(int gridX, int gridY)
-{
-    return osg::Vec3f(static_cast<float>(gridX * Constants::CellSizeInUnits + (Constants::CellSizeInUnits / 2)),
-                      static_cast<float>(gridY * Constants::CellSizeInUnits + (Constants::CellSizeInUnits / 2)), mTop);
-}
+    osg::Vec3f Water::getSceneNodeCoordinates(int gridX, int gridY)
+    {
+        return osg::Vec3f(static_cast<float>(gridX * Constants::CellSizeInUnits + (Constants::CellSizeInUnits / 2)),
+            static_cast<float>(gridY * Constants::CellSizeInUnits + (Constants::CellSizeInUnits / 2)), mTop);
+    }
 
-void Water::addEmitter (const MWWorld::Ptr& ptr, float scale, float force)
-{
-    mSimulation->addEmitter (ptr, scale, force);
-}
+    void Water::addEmitter(const MWWorld::Ptr& ptr, float scale, float force)
+    {
+        mSimulation->addEmitter(ptr, scale, force);
+    }
 
-void Water::removeEmitter (const MWWorld::Ptr& ptr)
-{
-    mSimulation->removeEmitter (ptr);
-}
+    void Water::removeEmitter(const MWWorld::Ptr& ptr)
+    {
+        mSimulation->removeEmitter(ptr);
+    }
 
-void Water::updateEmitterPtr (const MWWorld::Ptr& old, const MWWorld::Ptr& ptr)
-{
-    mSimulation->updateEmitterPtr(old, ptr);
-}
+    void Water::updateEmitterPtr(const MWWorld::Ptr& old, const MWWorld::Ptr& ptr)
+    {
+        mSimulation->updateEmitterPtr(old, ptr);
+    }
 
-void Water::emitRipple(const osg::Vec3f &pos)
-{
-    mSimulation->emitRipple(pos);
-}
+    void Water::emitRipple(const osg::Vec3f& pos)
+    {
+        mSimulation->emitRipple(pos);
+    }
 
-void Water::removeCell(const MWWorld::CellStore *store)
-{
-    mSimulation->removeCell(store);
-}
+    void Water::removeCell(const MWWorld::CellStore* store)
+    {
+        mSimulation->removeCell(store);
+    }
 
-void Water::clearRipples()
-{
-    mSimulation->clear();
-}
+    void Water::clearRipples()
+    {
+        mSimulation->clear();
+    }
 
-void Water::showWorld(bool show)
-{
-    if (mReflection)
-        mReflection->showWorld(show);
-    if (mRefraction)
-        mRefraction->showWorld(show);
-    mShowWorld = show;
-}
+    void Water::showWorld(bool show)
+    {
+        if (mReflection)
+            mReflection->showWorld(show);
+        if (mRefraction)
+            mRefraction->showWorld(show);
+        mShowWorld = show;
+    }
 
 }
diff --git a/apps/openmw/mwrender/water.hpp b/apps/openmw/mwrender/water.hpp
index 8309566031..cfd311300d 100644
--- a/apps/openmw/mwrender/water.hpp
+++ b/apps/openmw/mwrender/water.hpp
@@ -4,9 +4,9 @@
 #include <memory>
 #include <vector>
 
-#include <osg/ref_ptr>
-#include <osg/Vec3f>
 #include <osg/Vec3d>
+#include <osg/Vec3f>
+#include <osg/ref_ptr>
 
 #include <components/settings/settings.hpp>
 
@@ -88,9 +88,8 @@ namespace MWRender
         void updateWaterMaterial();
 
     public:
-        Water(osg::Group* parent, osg::Group* sceneRoot,
-              Resource::ResourceSystem* resourceSystem, osgUtil::IncrementalCompileOperation* ico,
-              const std::filesystem::path& resourcePath);
+        Water(osg::Group* parent, osg::Group* sceneRoot, Resource::ResourceSystem* resourceSystem,
+            osgUtil::IncrementalCompileOperation* ico, const std::filesystem::path& resourcePath);
         ~Water();
 
         void setCullCallback(osg::Callback* callback);
@@ -104,9 +103,9 @@ namespace MWRender
         bool isUnderwater(const osg::Vec3f& pos) const;
 
         /// adds an emitter, position will be tracked automatically using its scene node
-        void addEmitter (const MWWorld::Ptr& ptr, float scale = 1.f, float force = 1.f);
-        void removeEmitter (const MWWorld::Ptr& ptr);
-        void updateEmitterPtr (const MWWorld::Ptr& old, const MWWorld::Ptr& ptr);
+        void addEmitter(const MWWorld::Ptr& ptr, float scale = 1.f, float force = 1.f);
+        void removeEmitter(const MWWorld::Ptr& ptr);
+        void updateEmitterPtr(const MWWorld::Ptr& old, const MWWorld::Ptr& ptr);
         void emitRipple(const osg::Vec3f& pos);
 
         void removeCell(const MWWorld::CellStore* store); ///< remove all emitters in this cell
diff --git a/apps/openmw/mwrender/weaponanimation.cpp b/apps/openmw/mwrender/weaponanimation.cpp
index c331235466..e2ce27f23d 100644
--- a/apps/openmw/mwrender/weaponanimation.cpp
+++ b/apps/openmw/mwrender/weaponanimation.cpp
@@ -5,16 +5,16 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/inventorystore.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/combat.hpp"
+#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/weapontype.hpp"
 
 #include "animation.hpp"
@@ -23,204 +23,206 @@
 namespace MWRender
 {
 
-float WeaponAnimationTime::getValue(osg::NodeVisitor*)
-{
-    if (mWeaponGroup.empty())
-        return 0;
-
-    float current = mAnimation->getCurrentTime(mWeaponGroup);
-    if (current == -1)
-        return 0;
-    return current - mStartTime;
-}
-
-void WeaponAnimationTime::setGroup(const std::string &group, bool relativeTime)
-{
-    mWeaponGroup = group;
-    mRelativeTime = relativeTime;
-
-    if (mRelativeTime)
-        mStartTime = mAnimation->getStartTime(mWeaponGroup);
-    else
-        mStartTime = 0;
-}
-
-void WeaponAnimationTime::updateStartTime()
-{
-    setGroup(mWeaponGroup, mRelativeTime);
-}
+    float WeaponAnimationTime::getValue(osg::NodeVisitor*)
+    {
+        if (mWeaponGroup.empty())
+            return 0;
 
-WeaponAnimation::WeaponAnimation()
-    : mPitchFactor(0)
-{
-}
+        float current = mAnimation->getCurrentTime(mWeaponGroup);
+        if (current == -1)
+            return 0;
+        return current - mStartTime;
+    }
 
-WeaponAnimation::~WeaponAnimation()
-{
+    void WeaponAnimationTime::setGroup(const std::string& group, bool relativeTime)
+    {
+        mWeaponGroup = group;
+        mRelativeTime = relativeTime;
 
-}
+        if (mRelativeTime)
+            mStartTime = mAnimation->getStartTime(mWeaponGroup);
+        else
+            mStartTime = 0;
+    }
 
-void WeaponAnimation::attachArrow(const MWWorld::Ptr& actor)
-{
-    const MWWorld::InventoryStore& inv = actor.getClass().getInventoryStore(actor);
-    MWWorld::ConstContainerStoreIterator weaponSlot = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-    if (weaponSlot == inv.end())
-        return;
-    if (weaponSlot->getType() != ESM::Weapon::sRecordId)
-        return;
-
-    int type = weaponSlot->get<ESM::Weapon>()->mBase->mData.mType;
-    ESM::WeaponType::Class weapclass = MWMechanics::getWeaponType(type)->mWeaponClass;
-    if (weapclass == ESM::WeaponType::Thrown)
+    void WeaponAnimationTime::updateStartTime()
     {
-        std::string_view soundid = weaponSlot->getClass().getUpSoundId(*weaponSlot);
-        if(!soundid.empty())
-        {
-            MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-            sndMgr->playSound3D(actor, soundid, 1.0f, 1.0f);
-        }
-        showWeapon(true);
+        setGroup(mWeaponGroup, mRelativeTime);
     }
-    else if (weapclass == ESM::WeaponType::Ranged)
-    {
-        osg::Group* parent = getArrowBone();
-        if (!parent)
-            return;
-
-        MWWorld::ConstContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
-        if (ammo == inv.end())
-            return;
-        std::string model = ammo->getClass().getModel(*ammo);
-
-        osg::ref_ptr<osg::Node> arrow = getResourceSystem()->getSceneManager()->getInstance(model, parent);
 
-        mAmmunition = std::make_unique<PartHolder>(arrow);
+    WeaponAnimation::WeaponAnimation()
+        : mPitchFactor(0)
+    {
     }
-}
-
-void WeaponAnimation::detachArrow(MWWorld::Ptr actor)
-{
-    mAmmunition.reset();
-}
-
-void WeaponAnimation::releaseArrow(MWWorld::Ptr actor, float attackStrength)
-{
-    MWWorld::InventoryStore& inv = actor.getClass().getInventoryStore(actor);
-    MWWorld::ContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-    if (weapon == inv.end())
-        return;
-    if (weapon->getType() != ESM::Weapon::sRecordId)
-        return;
-
-    // The orientation of the launched projectile. Always the same as the actor orientation, even if the ArrowBone's orientation dictates otherwise.
-    osg::Quat orient = osg::Quat(actor.getRefData().getPosition().rot[0], osg::Vec3f(-1,0,0))
-            * osg::Quat(actor.getRefData().getPosition().rot[2], osg::Vec3f(0,0,-1));
 
-    const MWWorld::Store<ESM::GameSetting> &gmst =
-        MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+    WeaponAnimation::~WeaponAnimation() {}
 
-    MWMechanics::applyFatigueLoss(actor, *weapon, attackStrength);
-
-    if (MWMechanics::getWeaponType(weapon->get<ESM::Weapon>()->mBase->mData.mType)->mWeaponClass == ESM::WeaponType::Thrown)
+    void WeaponAnimation::attachArrow(const MWWorld::Ptr& actor)
     {
-        // Thrown weapons get detached now
-        osg::Node* weaponNode = getWeaponNode();
-        if (!weaponNode)
+        const MWWorld::InventoryStore& inv = actor.getClass().getInventoryStore(actor);
+        MWWorld::ConstContainerStoreIterator weaponSlot = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+        if (weaponSlot == inv.end())
             return;
-        osg::NodePathList nodepaths = weaponNode->getParentalNodePaths();
-        if (nodepaths.empty())
+        if (weaponSlot->getType() != ESM::Weapon::sRecordId)
             return;
-        osg::Vec3f launchPos = osg::computeLocalToWorld(nodepaths[0]).getTrans();
 
-        float fThrownWeaponMinSpeed = gmst.find("fThrownWeaponMinSpeed")->mValue.getFloat();
-        float fThrownWeaponMaxSpeed = gmst.find("fThrownWeaponMaxSpeed")->mValue.getFloat();
-        float speed = fThrownWeaponMinSpeed + (fThrownWeaponMaxSpeed - fThrownWeaponMinSpeed) * attackStrength;
+        int type = weaponSlot->get<ESM::Weapon>()->mBase->mData.mType;
+        ESM::WeaponType::Class weapclass = MWMechanics::getWeaponType(type)->mWeaponClass;
+        if (weapclass == ESM::WeaponType::Thrown)
+        {
+            std::string_view soundid = weaponSlot->getClass().getUpSoundId(*weaponSlot);
+            if (!soundid.empty())
+            {
+                MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
+                sndMgr->playSound3D(actor, soundid, 1.0f, 1.0f);
+            }
+            showWeapon(true);
+        }
+        else if (weapclass == ESM::WeaponType::Ranged)
+        {
+            osg::Group* parent = getArrowBone();
+            if (!parent)
+                return;
 
-        MWWorld::Ptr weaponPtr = *weapon;
-        MWBase::Environment::get().getWorld()->launchProjectile(actor, weaponPtr, launchPos, orient, weaponPtr, speed, attackStrength);
+            MWWorld::ConstContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
+            if (ammo == inv.end())
+                return;
+            std::string model = ammo->getClass().getModel(*ammo);
 
-        showWeapon(false);
+            osg::ref_ptr<osg::Node> arrow = getResourceSystem()->getSceneManager()->getInstance(model, parent);
 
-        inv.remove(*weapon, 1, actor);
+            mAmmunition = std::make_unique<PartHolder>(arrow);
+        }
     }
-    else
+
+    void WeaponAnimation::detachArrow(MWWorld::Ptr actor)
     {
-        // With bows and crossbows only the used arrow/bolt gets detached
-        MWWorld::ContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
-        if (ammo == inv.end())
-            return;
+        mAmmunition.reset();
+    }
 
-        if (!mAmmunition)
+    void WeaponAnimation::releaseArrow(MWWorld::Ptr actor, float attackStrength)
+    {
+        MWWorld::InventoryStore& inv = actor.getClass().getInventoryStore(actor);
+        MWWorld::ContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+        if (weapon == inv.end())
             return;
-
-        osg::ref_ptr<osg::Node> ammoNode = mAmmunition->getNode();
-        osg::NodePathList nodepaths = ammoNode->getParentalNodePaths();
-        if (nodepaths.empty())
+        if (weapon->getType() != ESM::Weapon::sRecordId)
             return;
-        osg::Vec3f launchPos = osg::computeLocalToWorld(nodepaths[0]).getTrans();
 
-        float fProjectileMinSpeed = gmst.find("fProjectileMinSpeed")->mValue.getFloat();
-        float fProjectileMaxSpeed = gmst.find("fProjectileMaxSpeed")->mValue.getFloat();
-        float speed = fProjectileMinSpeed + (fProjectileMaxSpeed - fProjectileMinSpeed) * attackStrength;
+        // The orientation of the launched projectile. Always the same as the actor orientation, even if the ArrowBone's
+        // orientation dictates otherwise.
+        osg::Quat orient = osg::Quat(actor.getRefData().getPosition().rot[0], osg::Vec3f(-1, 0, 0))
+            * osg::Quat(actor.getRefData().getPosition().rot[2], osg::Vec3f(0, 0, -1));
 
-        MWWorld::Ptr weaponPtr = *weapon;
-        MWWorld::Ptr ammoPtr = *ammo;
-        MWBase::Environment::get().getWorld()->launchProjectile(actor, ammoPtr, launchPos, orient, weaponPtr, speed, attackStrength);
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
-        inv.remove(ammoPtr, 1, actor);
-        mAmmunition.reset();
+        MWMechanics::applyFatigueLoss(actor, *weapon, attackStrength);
+
+        if (MWMechanics::getWeaponType(weapon->get<ESM::Weapon>()->mBase->mData.mType)->mWeaponClass
+            == ESM::WeaponType::Thrown)
+        {
+            // Thrown weapons get detached now
+            osg::Node* weaponNode = getWeaponNode();
+            if (!weaponNode)
+                return;
+            osg::NodePathList nodepaths = weaponNode->getParentalNodePaths();
+            if (nodepaths.empty())
+                return;
+            osg::Vec3f launchPos = osg::computeLocalToWorld(nodepaths[0]).getTrans();
+
+            float fThrownWeaponMinSpeed = gmst.find("fThrownWeaponMinSpeed")->mValue.getFloat();
+            float fThrownWeaponMaxSpeed = gmst.find("fThrownWeaponMaxSpeed")->mValue.getFloat();
+            float speed = fThrownWeaponMinSpeed + (fThrownWeaponMaxSpeed - fThrownWeaponMinSpeed) * attackStrength;
+
+            MWWorld::Ptr weaponPtr = *weapon;
+            MWBase::Environment::get().getWorld()->launchProjectile(
+                actor, weaponPtr, launchPos, orient, weaponPtr, speed, attackStrength);
+
+            showWeapon(false);
+
+            inv.remove(*weapon, 1, actor);
+        }
+        else
+        {
+            // With bows and crossbows only the used arrow/bolt gets detached
+            MWWorld::ContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
+            if (ammo == inv.end())
+                return;
+
+            if (!mAmmunition)
+                return;
+
+            osg::ref_ptr<osg::Node> ammoNode = mAmmunition->getNode();
+            osg::NodePathList nodepaths = ammoNode->getParentalNodePaths();
+            if (nodepaths.empty())
+                return;
+            osg::Vec3f launchPos = osg::computeLocalToWorld(nodepaths[0]).getTrans();
+
+            float fProjectileMinSpeed = gmst.find("fProjectileMinSpeed")->mValue.getFloat();
+            float fProjectileMaxSpeed = gmst.find("fProjectileMaxSpeed")->mValue.getFloat();
+            float speed = fProjectileMinSpeed + (fProjectileMaxSpeed - fProjectileMinSpeed) * attackStrength;
+
+            MWWorld::Ptr weaponPtr = *weapon;
+            MWWorld::Ptr ammoPtr = *ammo;
+            MWBase::Environment::get().getWorld()->launchProjectile(
+                actor, ammoPtr, launchPos, orient, weaponPtr, speed, attackStrength);
+
+            inv.remove(ammoPtr, 1, actor);
+            mAmmunition.reset();
+        }
     }
-}
 
-void WeaponAnimation::addControllers(const Animation::NodeMap& nodes, std::vector<std::pair<osg::ref_ptr<osg::Node>, osg::ref_ptr<osg::Callback>>> &map, osg::Node* objectRoot)
-{
-    for (int i=0; i<2; ++i)
+    void WeaponAnimation::addControllers(const Animation::NodeMap& nodes,
+        std::vector<std::pair<osg::ref_ptr<osg::Node>, osg::ref_ptr<osg::Callback>>>& map, osg::Node* objectRoot)
     {
-        mSpineControllers[i] = nullptr;
-
-        Animation::NodeMap::const_iterator found = nodes.find(i == 0 ? "bip01 spine1" : "bip01 spine2");
-        if (found != nodes.end())
+        for (int i = 0; i < 2; ++i)
         {
-            osg::Node* node = found->second;
-            mSpineControllers[i] = new RotateController(objectRoot);
-            node->addUpdateCallback(mSpineControllers[i]);
-            map.emplace_back(node, mSpineControllers[i]);
+            mSpineControllers[i] = nullptr;
+
+            Animation::NodeMap::const_iterator found = nodes.find(i == 0 ? "bip01 spine1" : "bip01 spine2");
+            if (found != nodes.end())
+            {
+                osg::Node* node = found->second;
+                mSpineControllers[i] = new RotateController(objectRoot);
+                node->addUpdateCallback(mSpineControllers[i]);
+                map.emplace_back(node, mSpineControllers[i]);
+            }
         }
     }
-}
 
-void WeaponAnimation::deleteControllers()
-{
-    for (int i=0; i<2; ++i)
-        mSpineControllers[i] = nullptr;
-}
-
-void WeaponAnimation::configureControllers(float characterPitchRadians)
-{
-    if (mPitchFactor == 0.f || characterPitchRadians == 0.f)
+    void WeaponAnimation::deleteControllers()
     {
-        setControllerEnabled(false);
-        return;
+        for (int i = 0; i < 2; ++i)
+            mSpineControllers[i] = nullptr;
     }
 
-    float pitch = characterPitchRadians * mPitchFactor;
-    osg::Quat rotate (pitch/2, osg::Vec3f(-1,0,0));
-    setControllerRotate(rotate);
-    setControllerEnabled(true);
-}
+    void WeaponAnimation::configureControllers(float characterPitchRadians)
+    {
+        if (mPitchFactor == 0.f || characterPitchRadians == 0.f)
+        {
+            setControllerEnabled(false);
+            return;
+        }
 
-void WeaponAnimation::setControllerRotate(const osg::Quat& rotate)
-{
-    for (int i=0; i<2; ++i)
-        if (mSpineControllers[i])
-            mSpineControllers[i]->setRotate(rotate);
-}
+        float pitch = characterPitchRadians * mPitchFactor;
+        osg::Quat rotate(pitch / 2, osg::Vec3f(-1, 0, 0));
+        setControllerRotate(rotate);
+        setControllerEnabled(true);
+    }
 
-void WeaponAnimation::setControllerEnabled(bool enabled)
-{
-    for (int i=0; i<2; ++i)
-        if (mSpineControllers[i])
-            mSpineControllers[i]->setEnabled(enabled);
-}
+    void WeaponAnimation::setControllerRotate(const osg::Quat& rotate)
+    {
+        for (int i = 0; i < 2; ++i)
+            if (mSpineControllers[i])
+                mSpineControllers[i]->setRotate(rotate);
+    }
+
+    void WeaponAnimation::setControllerEnabled(bool enabled)
+    {
+        for (int i = 0; i < 2; ++i)
+            if (mSpineControllers[i])
+                mSpineControllers[i]->setEnabled(enabled);
+    }
 
 }
diff --git a/apps/openmw/mwrender/weaponanimation.hpp b/apps/openmw/mwrender/weaponanimation.hpp
index 125587c1bd..ac9babb85a 100644
--- a/apps/openmw/mwrender/weaponanimation.hpp
+++ b/apps/openmw/mwrender/weaponanimation.hpp
@@ -18,8 +18,14 @@ namespace MWRender
         std::string mWeaponGroup;
         float mStartTime;
         bool mRelativeTime;
+
     public:
-        WeaponAnimationTime(Animation* animation) : mAnimation(animation), mStartTime(0), mRelativeTime(false) {}
+        WeaponAnimationTime(Animation* animation)
+            : mAnimation(animation)
+            , mStartTime(0)
+            , mRelativeTime(false)
+        {
+        }
         void setGroup(const std::string& group, bool relativeTime);
         void updateStartTime();
 
@@ -34,7 +40,7 @@ namespace MWRender
         virtual ~WeaponAnimation();
 
         /// @note If no weapon (or an invalid weapon) is equipped, this function is a no-op.
-        void attachArrow(const MWWorld::Ptr &actor);
+        void attachArrow(const MWWorld::Ptr& actor);
 
         void detachArrow(MWWorld::Ptr actor);
 
@@ -42,7 +48,8 @@ namespace MWRender
         void releaseArrow(MWWorld::Ptr actor, float attackStrength);
 
         /// Add WeaponAnimation-related controllers to \a nodes and store the added controllers in \a map.
-        void addControllers(const Animation::NodeMap& nodes, std::vector<std::pair<osg::ref_ptr<osg::Node>, osg::ref_ptr<osg::Callback>>>& map, osg::Node* objectRoot);
+        void addControllers(const Animation::NodeMap& nodes,
+            std::vector<std::pair<osg::ref_ptr<osg::Node>, osg::ref_ptr<osg::Callback>>>& map, osg::Node* objectRoot);
 
         void deleteControllers();
 
diff --git a/apps/openmw/mwscript/aiextensions.cpp b/apps/openmw/mwscript/aiextensions.cpp
index ef4249b4e9..ea1062e1b2 100644
--- a/apps/openmw/mwscript/aiextensions.cpp
+++ b/apps/openmw/mwscript/aiextensions.cpp
@@ -8,527 +8,532 @@
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>
-#include <components/interpreter/runtime.hpp>
 #include <components/interpreter/opcodes.hpp>
+#include <components/interpreter/runtime.hpp>
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/aiactivate.hpp"
 #include "../mwmechanics/aiescort.hpp"
+#include "../mwmechanics/aiface.hpp"
 #include "../mwmechanics/aifollow.hpp"
 #include "../mwmechanics/aitravel.hpp"
 #include "../mwmechanics/aiwander.hpp"
-#include "../mwmechanics/aiface.hpp"
+#include "../mwmechanics/creaturestats.hpp"
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "interpretercontext.hpp"
 #include "ref.hpp"
 
-
 namespace MWScript
 {
     namespace Ai
     {
-        template<class R>
+        template <class R>
         class OpAiActivate : public Interpreter::Opcode1
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+                std::string_view objectID = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    std::string_view objectID = runtime.getStringLiteral(runtime[0].mInteger);
+                // The value of the reset argument doesn't actually matter
+                bool repeat = arg0;
+                for (unsigned int i = 0; i < arg0; ++i)
                     runtime.pop();
 
-                    // The value of the reset argument doesn't actually matter
-                    bool repeat = arg0;
-                    for (unsigned int i=0; i<arg0; ++i) runtime.pop();
-
-                    if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
-                        return;
+                if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
+                    return;
 
-                    MWMechanics::AiActivate activatePackage(objectID, repeat);
-                    ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(activatePackage, ptr);
-                    Log(Debug::Info) << "AiActivate";
-                }
+                MWMechanics::AiActivate activatePackage(objectID, repeat);
+                ptr.getClass().getCreatureStats(ptr).getAiSequence().stack(activatePackage, ptr);
+                Log(Debug::Info) << "AiActivate";
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpAiTravel : public Interpreter::Opcode1
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+                Interpreter::Type_Float x = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float x = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float y = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float y = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float z = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float z = runtime[0].mFloat;
+                // The value of the reset argument doesn't actually matter
+                bool repeat = arg0;
+                for (unsigned int i = 0; i < arg0; ++i)
                     runtime.pop();
 
-                    // The value of the reset argument doesn't actually matter
-                    bool repeat = arg0;
-                    for (unsigned int i=0; i<arg0; ++i) runtime.pop();
-
-                    if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
-                        return;
+                if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
+                    return;
 
-                    MWMechanics::AiTravel travelPackage(x, y, z, repeat);
-                    ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(travelPackage, ptr);
+                MWMechanics::AiTravel travelPackage(x, y, z, repeat);
+                ptr.getClass().getCreatureStats(ptr).getAiSequence().stack(travelPackage, ptr);
 
-                    Log(Debug::Info) << "AiTravel: " << x << ", " << y << ", " << z;
-                }
+                Log(Debug::Info) << "AiTravel: " << x << ", " << y << ", " << z;
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpAiEscort : public Interpreter::Opcode1
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+                std::string_view actorID = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    std::string_view actorID = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                Interpreter::Type_Float duration = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float duration = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float x = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float x = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float y = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float y = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float z = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float z = runtime[0].mFloat;
+                // The value of the reset argument doesn't actually matter
+                bool repeat = arg0;
+                for (unsigned int i = 0; i < arg0; ++i)
                     runtime.pop();
 
-                    // The value of the reset argument doesn't actually matter
-                    bool repeat = arg0;
-                    for (unsigned int i=0; i<arg0; ++i) runtime.pop();
-
-                    if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
-                        return;
+                if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
+                    return;
 
-                    MWMechanics::AiEscort escortPackage(actorID, static_cast<int>(duration), x, y, z, repeat);
-                    ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(escortPackage, ptr);
+                MWMechanics::AiEscort escortPackage(actorID, static_cast<int>(duration), x, y, z, repeat);
+                ptr.getClass().getCreatureStats(ptr).getAiSequence().stack(escortPackage, ptr);
 
-                    Log(Debug::Info) << "AiEscort: " << x << ", " << y << ", " << z << ", " << duration;
-                }
+                Log(Debug::Info) << "AiEscort: " << x << ", " << y << ", " << z << ", " << duration;
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpAiEscortCell : public Interpreter::Opcode1
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+                std::string_view actorID = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    std::string_view actorID = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view cellID = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    std::string_view cellID = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                Interpreter::Type_Float duration = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float duration = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float x = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float x = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float y = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float y = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float z = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float z = runtime[0].mFloat;
+                // The value of the reset argument doesn't actually matter
+                bool repeat = arg0;
+                for (unsigned int i = 0; i < arg0; ++i)
                     runtime.pop();
 
-                    // The value of the reset argument doesn't actually matter
-                    bool repeat = arg0;
-                    for (unsigned int i=0; i<arg0; ++i) runtime.pop();
-
-                    if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
-                        return;
+                if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
+                    return;
 
-                    if (cellID.empty())
-                        return;
+                if (cellID.empty())
+                    return;
 
-                    if (!MWBase::Environment::get().getWorld()->getStore().get<ESM::Cell>().search(cellID))
-                        return;
+                if (!MWBase::Environment::get().getWorld()->getStore().get<ESM::Cell>().search(cellID))
+                    return;
 
-                    MWMechanics::AiEscort escortPackage(actorID, cellID, static_cast<int>(duration), x, y, z, repeat);
-                    ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(escortPackage, ptr);
+                MWMechanics::AiEscort escortPackage(actorID, cellID, static_cast<int>(duration), x, y, z, repeat);
+                ptr.getClass().getCreatureStats(ptr).getAiSequence().stack(escortPackage, ptr);
 
-                    Log(Debug::Info) << "AiEscort: " << x << ", " << y << ", " << z << ", " << duration;
-                }
+                Log(Debug::Info) << "AiEscort: " << x << ", " << y << ", " << z << ", " << duration;
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetAiPackageDone : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    bool done = false;
-                    if (ptr.getClass().isActor())
-                        done = ptr.getClass().getCreatureStats(ptr).getAiSequence().isPackageDone();
+                bool done = false;
+                if (ptr.getClass().isActor())
+                    done = ptr.getClass().getCreatureStats(ptr).getAiSequence().isPackageDone();
 
-                    runtime.push(done);
-                }
+                runtime.push(done);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpAiWander : public Interpreter::Opcode1
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+                Interpreter::Type_Integer range = static_cast<Interpreter::Type_Integer>(runtime[0].mFloat);
+                runtime.pop();
 
-                    Interpreter::Type_Integer range = static_cast<Interpreter::Type_Integer>(runtime[0].mFloat);
-                    runtime.pop();
+                Interpreter::Type_Integer duration = static_cast<Interpreter::Type_Integer>(runtime[0].mFloat);
+                runtime.pop();
 
-                    Interpreter::Type_Integer duration = static_cast<Interpreter::Type_Integer>(runtime[0].mFloat);
-                    runtime.pop();
+                Interpreter::Type_Integer time = static_cast<Interpreter::Type_Integer>(runtime[0].mFloat);
+                runtime.pop();
 
-                    Interpreter::Type_Integer time = static_cast<Interpreter::Type_Integer>(runtime[0].mFloat);
+                // Chance for Idle is unused
+                if (arg0)
+                {
+                    --arg0;
                     runtime.pop();
+                }
 
-                    // Chance for Idle is unused
-                    if (arg0)
-                    {
-                        --arg0;
-                        runtime.pop();
-                    }
-
-                    std::vector<unsigned char> idleList;
-                    bool repeat = false;
+                std::vector<unsigned char> idleList;
+                bool repeat = false;
 
-                    // Chances for Idle2-Idle9
-                    for(int i=2; i<=9 && arg0; ++i)
-                    {
-                        if(!repeat)
-                            repeat = true;
-                        Interpreter::Type_Integer idleValue = std::clamp(runtime[0].mInteger, 0, 255);
-                        idleList.push_back(idleValue);
-                        runtime.pop();
-                        --arg0;
-                    }
+                // Chances for Idle2-Idle9
+                for (int i = 2; i <= 9 && arg0; ++i)
+                {
+                    if (!repeat)
+                        repeat = true;
+                    Interpreter::Type_Integer idleValue = std::clamp(runtime[0].mInteger, 0, 255);
+                    idleList.push_back(idleValue);
+                    runtime.pop();
+                    --arg0;
+                }
 
-                    if(arg0)
-                    {
-                        repeat = runtime[0].mInteger != 0;
-                        runtime.pop();
-                        --arg0;
-                    }
+                if (arg0)
+                {
+                    repeat = runtime[0].mInteger != 0;
+                    runtime.pop();
+                    --arg0;
+                }
 
-                    // discard additional arguments, because we have no idea what they mean.
-                    for (unsigned int i=0; i<arg0; ++i) runtime.pop();
+                // discard additional arguments, because we have no idea what they mean.
+                for (unsigned int i = 0; i < arg0; ++i)
+                    runtime.pop();
 
-                    if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
-                        return;
+                if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
+                    return;
 
-                    MWMechanics::AiWander wanderPackage(range, duration, time, idleList, repeat);
-                    ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(wanderPackage, ptr);
-                }
+                MWMechanics::AiWander wanderPackage(range, duration, time, idleList, repeat);
+                ptr.getClass().getCreatureStats(ptr).getAiSequence().stack(wanderPackage, ptr);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetAiSetting : public Interpreter::Opcode0
         {
             MWMechanics::AiSetting mIndex;
-            public:
-                OpGetAiSetting(MWMechanics::AiSetting index) : mIndex(index) {}
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            OpGetAiSetting(MWMechanics::AiSetting index)
+                : mIndex(index)
+            {
+            }
 
-                    Interpreter::Type_Integer value = 0;
-                    if (ptr.getClass().isActor())
-                        value = ptr.getClass().getCreatureStats (ptr).getAiSetting(mIndex).getModified(false);
-                    runtime.push(value);
-                }
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+
+                Interpreter::Type_Integer value = 0;
+                if (ptr.getClass().isActor())
+                    value = ptr.getClass().getCreatureStats(ptr).getAiSetting(mIndex).getModified(false);
+                runtime.push(value);
+            }
         };
-        template<class R>
+        template <class R>
         class OpModAiSetting : public Interpreter::Opcode0
         {
             MWMechanics::AiSetting mIndex;
-            public:
-                OpModAiSetting(MWMechanics::AiSetting index) : mIndex(index) {}
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-                    Interpreter::Type_Integer value = runtime[0].mInteger;
-                    runtime.pop();
+        public:
+            OpModAiSetting(MWMechanics::AiSetting index)
+                : mIndex(index)
+            {
+            }
 
-                    if (!ptr.getClass().isActor())
-                        return;
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                Interpreter::Type_Integer value = runtime[0].mInteger;
+                runtime.pop();
 
-                    int modified = ptr.getClass().getCreatureStats (ptr).getAiSetting (mIndex).getBase() + value;
+                if (!ptr.getClass().isActor())
+                    return;
 
-                    ptr.getClass().getCreatureStats (ptr).setAiSetting (mIndex, modified);
-                    ptr.getClass().setBaseAISetting(ptr.getCellRef().getRefId(), mIndex, modified);
-                }
+                int modified = ptr.getClass().getCreatureStats(ptr).getAiSetting(mIndex).getBase() + value;
+
+                ptr.getClass().getCreatureStats(ptr).setAiSetting(mIndex, modified);
+                ptr.getClass().setBaseAISetting(ptr.getCellRef().getRefId(), mIndex, modified);
+            }
         };
-        template<class R>
+        template <class R>
         class OpSetAiSetting : public Interpreter::Opcode0
         {
             MWMechanics::AiSetting mIndex;
-            public:
-                OpSetAiSetting(MWMechanics::AiSetting index) : mIndex(index) {}
 
-                void execute (Interpreter::Runtime& runtime) override
+        public:
+            OpSetAiSetting(MWMechanics::AiSetting index)
+                : mIndex(index)
+            {
+            }
+
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                Interpreter::Type_Integer value = runtime[0].mInteger;
+                runtime.pop();
+                if (ptr.getClass().isActor())
                 {
-                    MWWorld::Ptr ptr = R()(runtime);
-                    Interpreter::Type_Integer value = runtime[0].mInteger;
-                    runtime.pop();
-                    if(ptr.getClass().isActor())
-                    {
-                        ptr.getClass().getCreatureStats(ptr).setAiSetting(mIndex, value);
-                        ptr.getClass().setBaseAISetting(ptr.getCellRef().getRefId(), mIndex, value);
-                    }
+                    ptr.getClass().getCreatureStats(ptr).setAiSetting(mIndex, value);
+                    ptr.getClass().setBaseAISetting(ptr.getCellRef().getRefId(), mIndex, value);
                 }
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpAiFollow : public Interpreter::Opcode1
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+                std::string_view actorID = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    std::string_view actorID = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                Interpreter::Type_Float duration = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float duration = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float x = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float x = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float y = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float y = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float z = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float z = runtime[0].mFloat;
+                // The value of the reset argument doesn't actually matter
+                bool repeat = arg0;
+                for (unsigned int i = 0; i < arg0; ++i)
                     runtime.pop();
 
-                    // The value of the reset argument doesn't actually matter
-                    bool repeat = arg0;
-                    for (unsigned int i=0; i<arg0; ++i) runtime.pop();
-
-                    if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
-                        return;
+                if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
+                    return;
 
-                    MWMechanics::AiFollow followPackage(actorID, duration, x, y, z, repeat);
-                    ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(followPackage, ptr);
+                MWMechanics::AiFollow followPackage(actorID, duration, x, y, z, repeat);
+                ptr.getClass().getCreatureStats(ptr).getAiSequence().stack(followPackage, ptr);
 
-                    Log(Debug::Info) << "AiFollow: " << actorID << ", " << x << ", " << y << ", " << z << ", " << duration;
-                }
+                Log(Debug::Info) << "AiFollow: " << actorID << ", " << x << ", " << y << ", " << z << ", " << duration;
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpAiFollowCell : public Interpreter::Opcode1
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+                std::string_view actorID = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    std::string_view actorID = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view cellID = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    std::string_view cellID = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                Interpreter::Type_Float duration = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float duration = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float x = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float x = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float y = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float y = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float z = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float z = runtime[0].mFloat;
+                // The value of the reset argument doesn't actually matter
+                bool repeat = arg0;
+                for (unsigned int i = 0; i < arg0; ++i)
                     runtime.pop();
 
-                    // The value of the reset argument doesn't actually matter
-                    bool repeat = arg0;
-                    for (unsigned int i=0; i<arg0; ++i) runtime.pop();
-
-                    if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
-                        return;
+                if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
+                    return;
 
-                    MWMechanics::AiFollow followPackage(actorID, cellID, duration, x, y, z, repeat);
-                    ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(followPackage, ptr);
-                    Log(Debug::Info) << "AiFollow: " << actorID << ", " << x << ", " << y << ", " << z << ", " << duration;
-                }
+                MWMechanics::AiFollow followPackage(actorID, cellID, duration, x, y, z, repeat);
+                ptr.getClass().getCreatureStats(ptr).getAiSequence().stack(followPackage, ptr);
+                Log(Debug::Info) << "AiFollow: " << actorID << ", " << x << ", " << y << ", " << z << ", " << duration;
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetCurrentAIPackage : public Interpreter::Opcode0
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                void execute (Interpreter::Runtime& runtime) override
+                Interpreter::Type_Integer value = -1;
+                if (ptr.getClass().isActor())
                 {
-                    MWWorld::Ptr ptr = R()(runtime);
-
-                    Interpreter::Type_Integer value = -1;
-                    if(ptr.getClass().isActor())
+                    const auto& stats = ptr.getClass().getCreatureStats(ptr);
+                    if (!stats.isDead() || !stats.isDeathAnimationFinished())
                     {
-                        const auto& stats = ptr.getClass().getCreatureStats(ptr);
-                        if(!stats.isDead() || !stats.isDeathAnimationFinished())
-                        {
-                            value = static_cast<Interpreter::Type_Integer>(stats.getAiSequence().getLastRunTypeId());
-                        }
+                        value = static_cast<Interpreter::Type_Integer>(stats.getAiSequence().getLastRunTypeId());
                     }
-
-                    runtime.push (value);
                 }
+
+                runtime.push(value);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetDetected : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr observer = R()(runtime, false); // required=false
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr observer = R()(runtime, false); // required=false
 
-                    std::string_view actorID = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view actorID = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    MWWorld::Ptr actor = MWBase::Environment::get().getWorld()->searchPtr(actorID, true, false);
+                MWWorld::Ptr actor = MWBase::Environment::get().getWorld()->searchPtr(actorID, true, false);
 
-                    Interpreter::Type_Integer value = 0;
-                    if (!actor.isEmpty())
-                        value = MWBase::Environment::get().getMechanicsManager()->isActorDetected(actor, observer);
+                Interpreter::Type_Integer value = 0;
+                if (!actor.isEmpty())
+                    value = MWBase::Environment::get().getMechanicsManager()->isActorDetected(actor, observer);
 
-                    runtime.push (value);
-                }
+                runtime.push(value);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetLineOfSight : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-
-                    MWWorld::Ptr source = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
 
-                    std::string_view actorID = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                MWWorld::Ptr source = R()(runtime);
 
+                std::string_view actorID = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    MWWorld::Ptr dest = MWBase::Environment::get().getWorld()->searchPtr(actorID, true, false);
-                    bool value = false;
-                    if (!dest.isEmpty() && source.getClass().isActor() && dest.getClass().isActor())
-                    {
-                        value = MWBase::Environment::get().getWorld()->getLOS(source,dest);
-                    }
-                    runtime.push (value);
+                MWWorld::Ptr dest = MWBase::Environment::get().getWorld()->searchPtr(actorID, true, false);
+                bool value = false;
+                if (!dest.isEmpty() && source.getClass().isActor() && dest.getClass().isActor())
+                {
+                    value = MWBase::Environment::get().getWorld()->getLOS(source, dest);
                 }
+                runtime.push(value);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetTarget : public Interpreter::Opcode0
         {
-            public:
-                void execute (Interpreter::Runtime &runtime) override
-                {
-                    MWWorld::Ptr actor = R()(runtime);
-                    std::string_view testedTargetId = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr actor = R()(runtime);
+                std::string_view testedTargetId = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    bool targetsAreEqual = false;
-                    if (actor.getClass().isActor())
+                bool targetsAreEqual = false;
+                if (actor.getClass().isActor())
+                {
+                    const MWMechanics::CreatureStats& creatureStats = actor.getClass().getCreatureStats(actor);
+                    MWWorld::Ptr targetPtr;
+                    if (creatureStats.getAiSequence().getCombatTarget(targetPtr))
+                    {
+                        if (!targetPtr.isEmpty() && targetPtr.getCellRef().getRefId() == testedTargetId)
+                            targetsAreEqual = true;
+                    }
+                    else if (testedTargetId == "player") // Currently the player ID is hardcoded
                     {
-                        const MWMechanics::CreatureStats& creatureStats = actor.getClass().getCreatureStats(actor);
-                        MWWorld::Ptr targetPtr;
-                        if (creatureStats.getAiSequence().getCombatTarget(targetPtr))
-                        {
-                            if (!targetPtr.isEmpty() && targetPtr.getCellRef().getRefId() == testedTargetId)
-                                targetsAreEqual = true;
-                        }
-                        else if (testedTargetId == "player") // Currently the player ID is hardcoded
-                        {
-                            MWBase::MechanicsManager* mechMgr = MWBase::Environment::get().getMechanicsManager();
-                            bool greeting = mechMgr->getGreetingState(actor) == MWMechanics::Greet_InProgress;
-                            bool sayActive = MWBase::Environment::get().getSoundManager()->sayActive(actor);
-                            targetsAreEqual = (greeting && sayActive) || mechMgr->isTurningToPlayer(actor);
-                        }
+                        MWBase::MechanicsManager* mechMgr = MWBase::Environment::get().getMechanicsManager();
+                        bool greeting = mechMgr->getGreetingState(actor) == MWMechanics::Greet_InProgress;
+                        bool sayActive = MWBase::Environment::get().getSoundManager()->sayActive(actor);
+                        targetsAreEqual = (greeting && sayActive) || mechMgr->isTurningToPlayer(actor);
                     }
-                    runtime.push(targetsAreEqual);
                 }
+                runtime.push(targetsAreEqual);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpStartCombat : public Interpreter::Opcode0
         {
-            public:
-                void execute (Interpreter::Runtime &runtime) override
-                {
-                    MWWorld::Ptr actor = R()(runtime);
-                    std::string_view targetID = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr actor = R()(runtime);
+                std::string_view targetID = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtr(targetID, true, false);
-                    if (!target.isEmpty())
-                        MWBase::Environment::get().getMechanicsManager()->startCombat(actor, target);
-                }
+                MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtr(targetID, true, false);
+                if (!target.isEmpty())
+                    MWBase::Environment::get().getMechanicsManager()->startCombat(actor, target);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpStopCombat : public Interpreter::Opcode0
         {
-            public:
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr actor = R()(runtime);
-                    if (!actor.getClass().isActor())
-                        return;
-                    MWBase::Environment::get().getMechanicsManager()->stopCombat(actor);
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr actor = R()(runtime);
+                if (!actor.getClass().isActor())
+                    return;
+                MWBase::Environment::get().getMechanicsManager()->stopCombat(actor);
+            }
         };
 
         class OpToggleAI : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    bool enabled = MWBase::Environment::get().getMechanicsManager()->toggleAI();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                bool enabled = MWBase::Environment::get().getMechanicsManager()->toggleAI();
 
-                    runtime.getContext().report (enabled ? "AI -> On" : "AI -> Off");
-                }
+                runtime.getContext().report(enabled ? "AI -> On" : "AI -> Off");
+            }
         };
 
         template <class R>
@@ -573,7 +578,8 @@ namespace MWScript
 
             interpreter.installSegment5<OpGetAiPackageDone<ExplicitRef>>(Compiler::Ai::opcodeGetAiPackageDoneExplicit);
             interpreter.installSegment5<OpGetCurrentAIPackage<ImplicitRef>>(Compiler::Ai::opcodeGetCurrentAiPackage);
-            interpreter.installSegment5<OpGetCurrentAIPackage<ExplicitRef>>(Compiler::Ai::opcodeGetCurrentAiPackageExplicit);
+            interpreter.installSegment5<OpGetCurrentAIPackage<ExplicitRef>>(
+                Compiler::Ai::opcodeGetCurrentAiPackageExplicit);
             interpreter.installSegment5<OpGetDetected<ImplicitRef>>(Compiler::Ai::opcodeGetDetected);
             interpreter.installSegment5<OpGetDetected<ExplicitRef>>(Compiler::Ai::opcodeGetDetectedExplicit);
             interpreter.installSegment5<OpGetLineOfSight<ImplicitRef>>(Compiler::Ai::opcodeGetLineOfSight);
@@ -586,32 +592,56 @@ namespace MWScript
             interpreter.installSegment5<OpStopCombat<ExplicitRef>>(Compiler::Ai::opcodeStopCombatExplicit);
             interpreter.installSegment5<OpToggleAI>(Compiler::Ai::opcodeToggleAI);
 
-            interpreter.installSegment5<OpSetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeSetHello, MWMechanics::AiSetting::Hello);
-            interpreter.installSegment5<OpSetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeSetHelloExplicit, MWMechanics::AiSetting::Hello);
-            interpreter.installSegment5<OpSetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeSetFight, MWMechanics::AiSetting::Fight);
-            interpreter.installSegment5<OpSetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeSetFightExplicit, MWMechanics::AiSetting::Fight);
-            interpreter.installSegment5<OpSetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeSetFlee, MWMechanics::AiSetting::Flee);
-            interpreter.installSegment5<OpSetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeSetFleeExplicit, MWMechanics::AiSetting::Flee);
-            interpreter.installSegment5<OpSetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeSetAlarm, MWMechanics::AiSetting::Alarm);
-            interpreter.installSegment5<OpSetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeSetAlarmExplicit, MWMechanics::AiSetting::Alarm);
-
-            interpreter.installSegment5<OpModAiSetting<ImplicitRef>>(Compiler::Ai::opcodeModHello, MWMechanics::AiSetting::Hello);
-            interpreter.installSegment5<OpModAiSetting<ExplicitRef>>(Compiler::Ai::opcodeModHelloExplicit, MWMechanics::AiSetting::Hello);
-            interpreter.installSegment5<OpModAiSetting<ImplicitRef>>(Compiler::Ai::opcodeModFight, MWMechanics::AiSetting::Fight);
-            interpreter.installSegment5<OpModAiSetting<ExplicitRef>>(Compiler::Ai::opcodeModFightExplicit, MWMechanics::AiSetting::Fight);
-            interpreter.installSegment5<OpModAiSetting<ImplicitRef>>(Compiler::Ai::opcodeModFlee, MWMechanics::AiSetting::Flee);
-            interpreter.installSegment5<OpModAiSetting<ExplicitRef>>(Compiler::Ai::opcodeModFleeExplicit, MWMechanics::AiSetting::Flee);
-            interpreter.installSegment5<OpModAiSetting<ImplicitRef>>(Compiler::Ai::opcodeModAlarm, MWMechanics::AiSetting::Alarm);
-            interpreter.installSegment5<OpModAiSetting<ExplicitRef>>(Compiler::Ai::opcodeModAlarmExplicit, MWMechanics::AiSetting::Alarm);
-
-            interpreter.installSegment5<OpGetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeGetHello, MWMechanics::AiSetting::Hello);
-            interpreter.installSegment5<OpGetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeGetHelloExplicit, MWMechanics::AiSetting::Hello);
-            interpreter.installSegment5<OpGetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeGetFight, MWMechanics::AiSetting::Fight);
-            interpreter.installSegment5<OpGetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeGetFightExplicit, MWMechanics::AiSetting::Fight);
-            interpreter.installSegment5<OpGetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeGetFlee, MWMechanics::AiSetting::Flee);
-            interpreter.installSegment5<OpGetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeGetFleeExplicit, MWMechanics::AiSetting::Flee);
-            interpreter.installSegment5<OpGetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeGetAlarm, MWMechanics::AiSetting::Alarm);
-            interpreter.installSegment5<OpGetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeGetAlarmExplicit, MWMechanics::AiSetting::Alarm);
+            interpreter.installSegment5<OpSetAiSetting<ImplicitRef>>(
+                Compiler::Ai::opcodeSetHello, MWMechanics::AiSetting::Hello);
+            interpreter.installSegment5<OpSetAiSetting<ExplicitRef>>(
+                Compiler::Ai::opcodeSetHelloExplicit, MWMechanics::AiSetting::Hello);
+            interpreter.installSegment5<OpSetAiSetting<ImplicitRef>>(
+                Compiler::Ai::opcodeSetFight, MWMechanics::AiSetting::Fight);
+            interpreter.installSegment5<OpSetAiSetting<ExplicitRef>>(
+                Compiler::Ai::opcodeSetFightExplicit, MWMechanics::AiSetting::Fight);
+            interpreter.installSegment5<OpSetAiSetting<ImplicitRef>>(
+                Compiler::Ai::opcodeSetFlee, MWMechanics::AiSetting::Flee);
+            interpreter.installSegment5<OpSetAiSetting<ExplicitRef>>(
+                Compiler::Ai::opcodeSetFleeExplicit, MWMechanics::AiSetting::Flee);
+            interpreter.installSegment5<OpSetAiSetting<ImplicitRef>>(
+                Compiler::Ai::opcodeSetAlarm, MWMechanics::AiSetting::Alarm);
+            interpreter.installSegment5<OpSetAiSetting<ExplicitRef>>(
+                Compiler::Ai::opcodeSetAlarmExplicit, MWMechanics::AiSetting::Alarm);
+
+            interpreter.installSegment5<OpModAiSetting<ImplicitRef>>(
+                Compiler::Ai::opcodeModHello, MWMechanics::AiSetting::Hello);
+            interpreter.installSegment5<OpModAiSetting<ExplicitRef>>(
+                Compiler::Ai::opcodeModHelloExplicit, MWMechanics::AiSetting::Hello);
+            interpreter.installSegment5<OpModAiSetting<ImplicitRef>>(
+                Compiler::Ai::opcodeModFight, MWMechanics::AiSetting::Fight);
+            interpreter.installSegment5<OpModAiSetting<ExplicitRef>>(
+                Compiler::Ai::opcodeModFightExplicit, MWMechanics::AiSetting::Fight);
+            interpreter.installSegment5<OpModAiSetting<ImplicitRef>>(
+                Compiler::Ai::opcodeModFlee, MWMechanics::AiSetting::Flee);
+            interpreter.installSegment5<OpModAiSetting<ExplicitRef>>(
+                Compiler::Ai::opcodeModFleeExplicit, MWMechanics::AiSetting::Flee);
+            interpreter.installSegment5<OpModAiSetting<ImplicitRef>>(
+                Compiler::Ai::opcodeModAlarm, MWMechanics::AiSetting::Alarm);
+            interpreter.installSegment5<OpModAiSetting<ExplicitRef>>(
+                Compiler::Ai::opcodeModAlarmExplicit, MWMechanics::AiSetting::Alarm);
+
+            interpreter.installSegment5<OpGetAiSetting<ImplicitRef>>(
+                Compiler::Ai::opcodeGetHello, MWMechanics::AiSetting::Hello);
+            interpreter.installSegment5<OpGetAiSetting<ExplicitRef>>(
+                Compiler::Ai::opcodeGetHelloExplicit, MWMechanics::AiSetting::Hello);
+            interpreter.installSegment5<OpGetAiSetting<ImplicitRef>>(
+                Compiler::Ai::opcodeGetFight, MWMechanics::AiSetting::Fight);
+            interpreter.installSegment5<OpGetAiSetting<ExplicitRef>>(
+                Compiler::Ai::opcodeGetFightExplicit, MWMechanics::AiSetting::Fight);
+            interpreter.installSegment5<OpGetAiSetting<ImplicitRef>>(
+                Compiler::Ai::opcodeGetFlee, MWMechanics::AiSetting::Flee);
+            interpreter.installSegment5<OpGetAiSetting<ExplicitRef>>(
+                Compiler::Ai::opcodeGetFleeExplicit, MWMechanics::AiSetting::Flee);
+            interpreter.installSegment5<OpGetAiSetting<ImplicitRef>>(
+                Compiler::Ai::opcodeGetAlarm, MWMechanics::AiSetting::Alarm);
+            interpreter.installSegment5<OpGetAiSetting<ExplicitRef>>(
+                Compiler::Ai::opcodeGetAlarmExplicit, MWMechanics::AiSetting::Alarm);
 
             interpreter.installSegment5<OpFace<ImplicitRef>>(Compiler::Ai::opcodeFace);
             interpreter.installSegment5<OpFace<ExplicitRef>>(Compiler::Ai::opcodeFaceExplicit);
diff --git a/apps/openmw/mwscript/aiextensions.hpp b/apps/openmw/mwscript/aiextensions.hpp
index e9e36113cf..5fd0db7d23 100644
--- a/apps/openmw/mwscript/aiextensions.hpp
+++ b/apps/openmw/mwscript/aiextensions.hpp
@@ -16,7 +16,7 @@ namespace MWScript
     /// \brief AI-related script functionality
     namespace Ai
     {
-        void installOpcodes (Interpreter::Interpreter& interpreter);
+        void installOpcodes(Interpreter::Interpreter& interpreter);
     }
 }
 
diff --git a/apps/openmw/mwscript/animationextensions.cpp b/apps/openmw/mwscript/animationextensions.cpp
index de715f93ac..caef3e0e88 100644
--- a/apps/openmw/mwscript/animationextensions.cpp
+++ b/apps/openmw/mwscript/animationextensions.cpp
@@ -1,13 +1,13 @@
 #include "animationextensions.hpp"
 
-#include <stdexcept>
 #include <limits>
+#include <stdexcept>
 
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>
-#include <components/interpreter/runtime.hpp>
 #include <components/interpreter/opcodes.hpp>
+#include <components/interpreter/runtime.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
@@ -19,87 +19,84 @@ namespace MWScript
 {
     namespace Animation
     {
-        template<class R>
+        template <class R>
         class OpSkipAnim : public Interpreter::Opcode0
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-
-                    MWBase::Environment::get().getMechanicsManager()->skipAnimation (ptr);
-               }
+                MWBase::Environment::get().getMechanicsManager()->skipAnimation(ptr);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpPlayAnim : public Interpreter::Opcode1
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    if (!ptr.getRefData().isEnabled())
-                        return;
+                if (!ptr.getRefData().isEnabled())
+                    return;
 
-                    std::string_view group = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view group = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    Interpreter::Type_Integer mode = 0;
+                Interpreter::Type_Integer mode = 0;
 
-                    if (arg0==1)
-                    {
-                        mode = runtime[0].mInteger;
-                        runtime.pop();
+                if (arg0 == 1)
+                {
+                    mode = runtime[0].mInteger;
+                    runtime.pop();
 
-                        if (mode<0 || mode>2)
-                            throw std::runtime_error ("animation mode out of range");
-                    }
+                    if (mode < 0 || mode > 2)
+                        throw std::runtime_error("animation mode out of range");
+                }
 
-                    MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(ptr, group, mode, std::numeric_limits<int>::max(), true);
-               }
+                MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(
+                    ptr, group, mode, std::numeric_limits<int>::max(), true);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpLoopAnim : public Interpreter::Opcode1
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    if (!ptr.getRefData().isEnabled())
-                        return;
+                if (!ptr.getRefData().isEnabled())
+                    return;
 
-                    std::string_view group = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view group = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    Interpreter::Type_Integer loops = runtime[0].mInteger;
-                    runtime.pop();
+                Interpreter::Type_Integer loops = runtime[0].mInteger;
+                runtime.pop();
 
-                    if (loops<0)
-                        throw std::runtime_error ("number of animation loops must be non-negative");
+                if (loops < 0)
+                    throw std::runtime_error("number of animation loops must be non-negative");
 
-                    Interpreter::Type_Integer mode = 0;
+                Interpreter::Type_Integer mode = 0;
 
-                    if (arg0==1)
-                    {
-                        mode = runtime[0].mInteger;
-                        runtime.pop();
+                if (arg0 == 1)
+                {
+                    mode = runtime[0].mInteger;
+                    runtime.pop();
 
-                        if (mode<0 || mode>2)
-                            throw std::runtime_error ("animation mode out of range");
-                    }
+                    if (mode < 0 || mode > 2)
+                        throw std::runtime_error("animation mode out of range");
+                }
 
-                    MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(ptr, group, mode, loops + 1, true);
-               }
+                MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(ptr, group, mode, loops + 1, true);
+            }
         };
-        
 
-        void installOpcodes (Interpreter::Interpreter& interpreter)
+        void installOpcodes(Interpreter::Interpreter& interpreter)
         {
             interpreter.installSegment5<OpSkipAnim<ImplicitRef>>(Compiler::Animation::opcodeSkipAnim);
             interpreter.installSegment5<OpSkipAnim<ExplicitRef>>(Compiler::Animation::opcodeSkipAnimExplicit);
diff --git a/apps/openmw/mwscript/animationextensions.hpp b/apps/openmw/mwscript/animationextensions.hpp
index ff619ab73a..a6805f7ee3 100644
--- a/apps/openmw/mwscript/animationextensions.hpp
+++ b/apps/openmw/mwscript/animationextensions.hpp
@@ -15,9 +15,9 @@ namespace MWScript
 {
     namespace Animation
     {
-        void registerExtensions (Compiler::Extensions& extensions);
+        void registerExtensions(Compiler::Extensions& extensions);
 
-        void installOpcodes (Interpreter::Interpreter& interpreter);
+        void installOpcodes(Interpreter::Interpreter& interpreter);
     }
 }
 
diff --git a/apps/openmw/mwscript/cellextensions.cpp b/apps/openmw/mwscript/cellextensions.cpp
index 444e2dbced..6f5a4c97f0 100644
--- a/apps/openmw/mwscript/cellextensions.cpp
+++ b/apps/openmw/mwscript/cellextensions.cpp
@@ -7,15 +7,15 @@
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>
-#include <components/interpreter/runtime.hpp>
 #include <components/interpreter/opcodes.hpp>
+#include <components/interpreter/runtime.hpp>
 
-#include "../mwworld/actionteleport.hpp"
-#include "../mwworld/cellstore.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/statemanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
+#include "../mwworld/actionteleport.hpp"
+#include "../mwworld/cellstore.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 
@@ -27,227 +27,217 @@ namespace MWScript
     {
         class OpCellChanged : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    runtime.push (MWBase::Environment::get().getWorld()->hasCellChanged() ? 1 : 0);
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                runtime.push(MWBase::Environment::get().getWorld()->hasCellChanged() ? 1 : 0);
+            }
         };
 
         class OpTestCells : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                if (MWBase::Environment::get().getStateManager()->getState() != MWBase::StateManager::State_NoGame)
                 {
-                    if (MWBase::Environment::get().getStateManager()->getState() != MWBase::StateManager::State_NoGame)
-                    {
-                        runtime.getContext().report("Use TestCells from the main menu, when there is no active game session.");
-                        return;
-                    }
+                    runtime.getContext().report(
+                        "Use TestCells from the main menu, when there is no active game session.");
+                    return;
+                }
 
-                    bool wasConsole = MWBase::Environment::get().getWindowManager()->isConsoleMode();
-                    if (wasConsole)
-                        MWBase::Environment::get().getWindowManager()->toggleConsole();
+                bool wasConsole = MWBase::Environment::get().getWindowManager()->isConsoleMode();
+                if (wasConsole)
+                    MWBase::Environment::get().getWindowManager()->toggleConsole();
 
-                    MWBase::Environment::get().getWorld()->testExteriorCells();
+                MWBase::Environment::get().getWorld()->testExteriorCells();
 
-                    if (wasConsole)
-                        MWBase::Environment::get().getWindowManager()->toggleConsole();
-                }
+                if (wasConsole)
+                    MWBase::Environment::get().getWindowManager()->toggleConsole();
+            }
         };
 
         class OpTestInteriorCells : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                if (MWBase::Environment::get().getStateManager()->getState() != MWBase::StateManager::State_NoGame)
                 {
-                    if (MWBase::Environment::get().getStateManager()->getState() != MWBase::StateManager::State_NoGame)
-                    {
-                        runtime.getContext().report("Use TestInteriorCells from the main menu, when there is no active game session.");
-                        return;
-                    }
+                    runtime.getContext().report(
+                        "Use TestInteriorCells from the main menu, when there is no active game session.");
+                    return;
+                }
 
-                    bool wasConsole = MWBase::Environment::get().getWindowManager()->isConsoleMode();
-                    if (wasConsole)
-                        MWBase::Environment::get().getWindowManager()->toggleConsole();
+                bool wasConsole = MWBase::Environment::get().getWindowManager()->isConsoleMode();
+                if (wasConsole)
+                    MWBase::Environment::get().getWindowManager()->toggleConsole();
 
-                    MWBase::Environment::get().getWorld()->testInteriorCells();
+                MWBase::Environment::get().getWorld()->testInteriorCells();
 
-                    if (wasConsole)
-                        MWBase::Environment::get().getWindowManager()->toggleConsole();
-                }
+                if (wasConsole)
+                    MWBase::Environment::get().getWindowManager()->toggleConsole();
+            }
         };
 
         class OpCOC : public Interpreter::Opcode0
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                std::string_view cell = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                void execute (Interpreter::Runtime& runtime) override
+                ESM::Position pos;
+                MWBase::World* world = MWBase::Environment::get().getWorld();
+                const MWWorld::Ptr playerPtr = world->getPlayerPtr();
+
+                if (world->findExteriorPosition(cell, pos))
+                {
+                    MWWorld::ActionTeleport({}, pos, false).execute(playerPtr);
+                    world->adjustPosition(playerPtr, false);
+                }
+                else
                 {
-                    std::string_view cell = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
-
-                    ESM::Position pos;
-                    MWBase::World *world = MWBase::Environment::get().getWorld();
-                    const MWWorld::Ptr playerPtr = world->getPlayerPtr();
-
-                    if (world->findExteriorPosition(cell, pos))
-                    {
-                        MWWorld::ActionTeleport({}, pos, false).execute(playerPtr);
-                        world->adjustPosition(playerPtr, false);
-                    }
-                    else
-                    {
-                        // Change to interior even if findInteriorPosition()
-                        // yields false. In this case position will be zero-point.
-                        world->findInteriorPosition(cell, pos);
-                        MWWorld::ActionTeleport(cell, pos, false).execute(playerPtr);
-                    }
+                    // Change to interior even if findInteriorPosition()
+                    // yields false. In this case position will be zero-point.
+                    world->findInteriorPosition(cell, pos);
+                    MWWorld::ActionTeleport(cell, pos, false).execute(playerPtr);
                 }
+            }
         };
 
         class OpCOE : public Interpreter::Opcode0
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                Interpreter::Type_Integer x = runtime[0].mInteger;
+                runtime.pop();
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    Interpreter::Type_Integer x = runtime[0].mInteger;
-                    runtime.pop();
-
-                    Interpreter::Type_Integer y = runtime[0].mInteger;
-                    runtime.pop();
+                Interpreter::Type_Integer y = runtime[0].mInteger;
+                runtime.pop();
 
-                    ESM::Position pos;
-                    MWBase::World *world = MWBase::Environment::get().getWorld();
-                    const MWWorld::Ptr playerPtr = world->getPlayerPtr();
+                ESM::Position pos;
+                MWBase::World* world = MWBase::Environment::get().getWorld();
+                const MWWorld::Ptr playerPtr = world->getPlayerPtr();
 
-                    world->indexToPosition (x, y, pos.pos[0], pos.pos[1], true);
-                    pos.pos[2] = 0;
+                world->indexToPosition(x, y, pos.pos[0], pos.pos[1], true);
+                pos.pos[2] = 0;
 
-                    pos.rot[0] = pos.rot[1] = pos.rot[2] = 0;
+                pos.rot[0] = pos.rot[1] = pos.rot[2] = 0;
 
-                    MWWorld::ActionTeleport({}, pos, false).execute(playerPtr);
-                    world->adjustPosition(playerPtr, false);
-                }
+                MWWorld::ActionTeleport({}, pos, false).execute(playerPtr);
+                world->adjustPosition(playerPtr, false);
+            }
         };
 
         class OpGetInterior : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                if (!MWMechanics::getPlayer().isInCell())
                 {
-                    if (!MWMechanics::getPlayer().isInCell())
-                    {
-                        runtime.push (0);
-                        return;
-                    }
+                    runtime.push(0);
+                    return;
+                }
 
-                    bool interior =
-                        !MWMechanics::getPlayer().getCell()->getCell()->isExterior();
+                bool interior = !MWMechanics::getPlayer().getCell()->getCell()->isExterior();
 
-                    runtime.push (interior ? 1 : 0);
-                }
+                runtime.push(interior ? 1 : 0);
+            }
         };
 
         class OpGetPCCell : public Interpreter::Opcode0
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                std::string_view name = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                void execute (Interpreter::Runtime& runtime) override
+                if (!MWMechanics::getPlayer().isInCell())
                 {
-                    std::string_view name = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
-
-                    if (!MWMechanics::getPlayer().isInCell())
-                    {
-                        runtime.push(0);
-                        return;
-                    }
-                    const MWWorld::CellStore *cell = MWMechanics::getPlayer().getCell();
+                    runtime.push(0);
+                    return;
+                }
+                const MWWorld::CellStore* cell = MWMechanics::getPlayer().getCell();
 
-                    std::string_view current = MWBase::Environment::get().getWorld()->getCellName(cell);
-                    bool match = Misc::StringUtils::ciCompareLen(name, current, name.length()) == 0;
+                std::string_view current = MWBase::Environment::get().getWorld()->getCellName(cell);
+                bool match = Misc::StringUtils::ciCompareLen(name, current, name.length()) == 0;
 
-                    runtime.push (match ? 1 : 0);
-                }
+                runtime.push(match ? 1 : 0);
+            }
         };
 
         class OpGetWaterLevel : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                if (!MWMechanics::getPlayer().isInCell())
                 {
-                    if (!MWMechanics::getPlayer().isInCell())
-                    {
-                        runtime.push(0.f);
-                        return;
-                    }
-                    MWWorld::CellStore *cell = MWMechanics::getPlayer().getCell();
-                    if (cell->isExterior())
-                        runtime.push(0.f); // vanilla oddity, return 0 even though water is actually at -1
-                    else if (cell->getCell()->hasWater())
-                        runtime.push (cell->getWaterLevel());
-                    else
-                        runtime.push (-std::numeric_limits<float>::max());
+                    runtime.push(0.f);
+                    return;
                 }
+                MWWorld::CellStore* cell = MWMechanics::getPlayer().getCell();
+                if (cell->isExterior())
+                    runtime.push(0.f); // vanilla oddity, return 0 even though water is actually at -1
+                else if (cell->getCell()->hasWater())
+                    runtime.push(cell->getWaterLevel());
+                else
+                    runtime.push(-std::numeric_limits<float>::max());
+            }
         };
 
         class OpSetWaterLevel : public Interpreter::Opcode0
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                Interpreter::Type_Float level = runtime[0].mFloat;
+                runtime.pop();
 
-                void execute (Interpreter::Runtime& runtime) override
+                if (!MWMechanics::getPlayer().isInCell())
                 {
-                    Interpreter::Type_Float level = runtime[0].mFloat;
-                    runtime.pop();
-
-                    if (!MWMechanics::getPlayer().isInCell())
-                    {
-                        return;
-                    }
+                    return;
+                }
 
-                    MWWorld::CellStore *cell = MWMechanics::getPlayer().getCell();
+                MWWorld::CellStore* cell = MWMechanics::getPlayer().getCell();
 
-                    if (cell->getCell()->isExterior())
-                        throw std::runtime_error("Can't set water level in exterior cell");
+                if (cell->getCell()->isExterior())
+                    throw std::runtime_error("Can't set water level in exterior cell");
 
-                    cell->setWaterLevel (level);
-                    MWBase::Environment::get().getWorld()->setWaterHeight (cell->getWaterLevel());
-                }
+                cell->setWaterLevel(level);
+                MWBase::Environment::get().getWorld()->setWaterHeight(cell->getWaterLevel());
+            }
         };
 
         class OpModWaterLevel : public Interpreter::Opcode0
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                Interpreter::Type_Float level = runtime[0].mFloat;
+                runtime.pop();
 
-                void execute (Interpreter::Runtime& runtime) override
+                if (!MWMechanics::getPlayer().isInCell())
                 {
-                    Interpreter::Type_Float level = runtime[0].mFloat;
-                    runtime.pop();
-
-                    if (!MWMechanics::getPlayer().isInCell())
-                    {
-                        return;
-                    }
+                    return;
+                }
 
-                    MWWorld::CellStore *cell = MWMechanics::getPlayer().getCell();
+                MWWorld::CellStore* cell = MWMechanics::getPlayer().getCell();
 
-                    if (cell->getCell()->isExterior())
-                        throw std::runtime_error("Can't set water level in exterior cell");
+                if (cell->getCell()->isExterior())
+                    throw std::runtime_error("Can't set water level in exterior cell");
 
-                    cell->setWaterLevel (cell->getWaterLevel()+level);
-                    MWBase::Environment::get().getWorld()->setWaterHeight(cell->getWaterLevel());
-                }
+                cell->setWaterLevel(cell->getWaterLevel() + level);
+                MWBase::Environment::get().getWorld()->setWaterHeight(cell->getWaterLevel());
+            }
         };
 
-
-        void installOpcodes (Interpreter::Interpreter& interpreter)
+        void installOpcodes(Interpreter::Interpreter& interpreter)
         {
             interpreter.installSegment5<OpCellChanged>(Compiler::Cell::opcodeCellChanged);
             interpreter.installSegment5<OpTestCells>(Compiler::Cell::opcodeTestCells);
diff --git a/apps/openmw/mwscript/cellextensions.hpp b/apps/openmw/mwscript/cellextensions.hpp
index 0891cb9dc8..d3b8bc00b5 100644
--- a/apps/openmw/mwscript/cellextensions.hpp
+++ b/apps/openmw/mwscript/cellextensions.hpp
@@ -15,11 +15,9 @@ namespace MWScript
 {
     /// \brief cell-related script functionality
     namespace Cell
-    {        
-        void installOpcodes (Interpreter::Interpreter& interpreter);
+    {
+        void installOpcodes(Interpreter::Interpreter& interpreter);
     }
 }
 
 #endif
-
-
diff --git a/apps/openmw/mwscript/compilercontext.cpp b/apps/openmw/mwscript/compilercontext.cpp
index fcad0dd998..d817b93a23 100644
--- a/apps/openmw/mwscript/compilercontext.cpp
+++ b/apps/openmw/mwscript/compilercontext.cpp
@@ -2,89 +2,77 @@
 
 #include "../mwworld/esmstore.hpp"
 
+#include <components/compiler/locals.hpp>
+#include <components/esm/records.hpp>
 #include <components/esm3/loaddial.hpp>
 #include <components/esm3/loadscpt.hpp>
-#include <components/esm/records.hpp>
-#include <components/compiler/locals.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/scriptmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/ptr.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/manualref.hpp"
+#include "../mwworld/ptr.hpp"
 
 namespace MWScript
 {
-    CompilerContext::CompilerContext (Type type)
-    : mType (type)
-    {}
+    CompilerContext::CompilerContext(Type type)
+        : mType(type)
+    {
+    }
 
     bool CompilerContext::canDeclareLocals() const
     {
-        return mType==Type_Full;
+        return mType == Type_Full;
     }
 
-    char CompilerContext::getGlobalType (const std::string& name) const
+    char CompilerContext::getGlobalType(const std::string& name) const
     {
-        return MWBase::Environment::get().getWorld()->getGlobalVariableType (name);
+        return MWBase::Environment::get().getWorld()->getGlobalVariableType(name);
     }
 
-    std::pair<char, bool> CompilerContext::getMemberType (const std::string& name,
-        const std::string& id) const
+    std::pair<char, bool> CompilerContext::getMemberType(const std::string& name, const std::string& id) const
     {
         std::string_view script;
         bool reference = false;
 
-        if (const ESM::Script *scriptRecord =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Script>().search (id))
+        if (const ESM::Script* scriptRecord
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Script>().search(id))
         {
             script = scriptRecord->mId;
         }
         else
         {
-            MWWorld::ManualRef ref (MWBase::Environment::get().getWorld()->getStore(), id);
+            MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), id);
 
-            script = ref.getPtr().getClass().getScript (ref.getPtr());
+            script = ref.getPtr().getClass().getScript(ref.getPtr());
             reference = true;
         }
 
         char type = ' ';
 
         if (!script.empty())
-            type = MWBase::Environment::get().getScriptManager()->getLocals (script).getType (
-                Misc::StringUtils::lowerCase (name));
+            type = MWBase::Environment::get().getScriptManager()->getLocals(script).getType(
+                Misc::StringUtils::lowerCase(name));
 
-        return std::make_pair (type, reference);
+        return std::make_pair(type, reference);
     }
 
-    bool CompilerContext::isId (const std::string& name) const
+    bool CompilerContext::isId(const std::string& name) const
     {
-        const MWWorld::ESMStore &store =
-            MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
 
-        return
-            store.get<ESM::Activator>().search (name) ||
-            store.get<ESM::Potion>().search (name) ||
-            store.get<ESM::Apparatus>().search (name) ||
-            store.get<ESM::Armor>().search (name) ||
-            store.get<ESM::Book>().search (name) ||
-            store.get<ESM::Clothing>().search (name) ||
-            store.get<ESM::Container>().search (name) ||
-            store.get<ESM::Creature>().search (name) ||
-            store.get<ESM::Door>().search (name) ||
-            store.get<ESM::Ingredient>().search (name) ||
-            store.get<ESM::CreatureLevList>().search (name) ||
-            store.get<ESM::ItemLevList>().search (name) ||
-            store.get<ESM::Light>().search (name) ||
-            store.get<ESM::Lockpick>().search (name) ||
-            store.get<ESM::Miscellaneous>().search (name) ||
-            store.get<ESM::NPC>().search (name) ||
-            store.get<ESM::Probe>().search (name) ||
-            store.get<ESM::Repair>().search (name) ||
-            store.get<ESM::Static>().search (name) ||
-            store.get<ESM::Weapon>().search (name) ||
-            store.get<ESM::Script>().search (name);
+        return store.get<ESM::Activator>().search(name) || store.get<ESM::Potion>().search(name)
+            || store.get<ESM::Apparatus>().search(name) || store.get<ESM::Armor>().search(name)
+            || store.get<ESM::Book>().search(name) || store.get<ESM::Clothing>().search(name)
+            || store.get<ESM::Container>().search(name) || store.get<ESM::Creature>().search(name)
+            || store.get<ESM::Door>().search(name) || store.get<ESM::Ingredient>().search(name)
+            || store.get<ESM::CreatureLevList>().search(name) || store.get<ESM::ItemLevList>().search(name)
+            || store.get<ESM::Light>().search(name) || store.get<ESM::Lockpick>().search(name)
+            || store.get<ESM::Miscellaneous>().search(name) || store.get<ESM::NPC>().search(name)
+            || store.get<ESM::Probe>().search(name) || store.get<ESM::Repair>().search(name)
+            || store.get<ESM::Static>().search(name) || store.get<ESM::Weapon>().search(name)
+            || store.get<ESM::Script>().search(name);
     }
 }
diff --git a/apps/openmw/mwscript/compilercontext.hpp b/apps/openmw/mwscript/compilercontext.hpp
index d800781fd8..7b77f74a40 100644
--- a/apps/openmw/mwscript/compilercontext.hpp
+++ b/apps/openmw/mwscript/compilercontext.hpp
@@ -7,38 +7,34 @@ namespace MWScript
 {
     class CompilerContext : public Compiler::Context
     {
-        public:
-
-            enum Type
-            {
-                Type_Full, // global, local, targeted
-                Type_Dialogue,
-                Type_Console
-            };
-
-        private:
-
-            Type mType;
-
-        public:
-
-            CompilerContext (Type type);
-
-            /// Is the compiler allowed to declare local variables?
-            bool canDeclareLocals() const override;
-
-            /// 'l: long, 's': short, 'f': float, ' ': does not exist.
-            char getGlobalType (const std::string& name) const override;
-
-            std::pair<char, bool> getMemberType (const std::string& name,
-                const std::string& id) const override;
-            ///< Return type of member variable \a name in script \a id or in script of reference of
-            /// \a id
-            /// \return first: 'l: long, 's': short, 'f': float, ' ': does not exist.
-            /// second: true: script of reference
-
-            bool isId (const std::string& name) const override;
-            ///< Does \a name match an ID, that can be referenced?
+    public:
+        enum Type
+        {
+            Type_Full, // global, local, targeted
+            Type_Dialogue,
+            Type_Console
+        };
+
+    private:
+        Type mType;
+
+    public:
+        CompilerContext(Type type);
+
+        /// Is the compiler allowed to declare local variables?
+        bool canDeclareLocals() const override;
+
+        /// 'l: long, 's': short, 'f': float, ' ': does not exist.
+        char getGlobalType(const std::string& name) const override;
+
+        std::pair<char, bool> getMemberType(const std::string& name, const std::string& id) const override;
+        ///< Return type of member variable \a name in script \a id or in script of reference of
+        /// \a id
+        /// \return first: 'l: long, 's': short, 'f': float, ' ': does not exist.
+        /// second: true: script of reference
+
+        bool isId(const std::string& name) const override;
+        ///< Does \a name match an ID, that can be referenced?
     };
 }
 
diff --git a/apps/openmw/mwscript/consoleextensions.cpp b/apps/openmw/mwscript/consoleextensions.cpp
index 749ec80969..08a13e43ac 100644
--- a/apps/openmw/mwscript/consoleextensions.cpp
+++ b/apps/openmw/mwscript/consoleextensions.cpp
@@ -6,9 +6,6 @@ namespace MWScript
 {
     namespace Console
     {
-        void installOpcodes (Interpreter::Interpreter& interpreter)
-        {
-
-        }
+        void installOpcodes(Interpreter::Interpreter& interpreter) {}
     }
 }
diff --git a/apps/openmw/mwscript/consoleextensions.hpp b/apps/openmw/mwscript/consoleextensions.hpp
index 5571a54694..828557271a 100644
--- a/apps/openmw/mwscript/consoleextensions.hpp
+++ b/apps/openmw/mwscript/consoleextensions.hpp
@@ -16,7 +16,7 @@ namespace MWScript
     /// \brief Script functionality limited to the console
     namespace Console
     {
-        void installOpcodes (Interpreter::Interpreter& interpreter);
+        void installOpcodes(Interpreter::Interpreter& interpreter);
     }
 }
 
diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index 9f93e5853b..c9ef6785b6 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -13,8 +13,8 @@
 
 #include <components/misc/strings/format.hpp>
 
-#include <components/esm3/loadskil.hpp>
 #include <components/esm3/loadlevlist.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include <components/esm3/loadcrea.hpp>
 
@@ -27,9 +27,9 @@
 #include "../mwworld/action.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
+#include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/manualref.hpp"
-#include "../mwworld/esmstore.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/levelledlist.hpp"
@@ -38,35 +38,38 @@
 
 namespace
 {
-    void addToStore(const MWWorld::Ptr& itemPtr, int count, MWWorld::Ptr& ptr, MWWorld::ContainerStore& store, bool resolve = true)
+    void addToStore(
+        const MWWorld::Ptr& itemPtr, int count, MWWorld::Ptr& ptr, MWWorld::ContainerStore& store, bool resolve = true)
     {
         if (itemPtr.getClass().getScript(itemPtr).empty())
         {
-            store.add (itemPtr, count, ptr, true, resolve);
+            store.add(itemPtr, count, ptr, true, resolve);
         }
         else
         {
             // Adding just one item per time to make sure there isn't a stack of scripted items
             for (int i = 0; i < count; i++)
-                store.add (itemPtr, 1, ptr, true, resolve);
+                store.add(itemPtr, 1, ptr, true, resolve);
         }
     }
 
-    void addRandomToStore(const MWWorld::Ptr& itemPtr, int count, MWWorld::Ptr& owner, MWWorld::ContainerStore& store, bool topLevel = true)
+    void addRandomToStore(const MWWorld::Ptr& itemPtr, int count, MWWorld::Ptr& owner, MWWorld::ContainerStore& store,
+        bool topLevel = true)
     {
-        if(itemPtr.getType() == ESM::ItemLevList::sRecordId)
+        if (itemPtr.getType() == ESM::ItemLevList::sRecordId)
         {
             const ESM::ItemLevList* levItemList = itemPtr.get<ESM::ItemLevList>()->mBase;
 
-            if(topLevel && count > 1 && levItemList->mFlags & ESM::ItemLevList::Each)
+            if (topLevel && count > 1 && levItemList->mFlags & ESM::ItemLevList::Each)
             {
-                for(int i = 0; i < count; i++)
+                for (int i = 0; i < count; i++)
                     addRandomToStore(itemPtr, 1, owner, store, true);
             }
             else
             {
                 auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-                std::string_view itemId = MWMechanics::getLevelledItem(itemPtr.get<ESM::ItemLevList>()->mBase, false, prng);
+                std::string_view itemId
+                    = MWMechanics::getLevelledItem(itemPtr.get<ESM::ItemLevList>()->mBase, false, prng);
                 if (itemId.empty())
                     return;
                 MWWorld::ManualRef manualRef(MWBase::Environment::get().getWorld()->getStore(), itemId, 1);
@@ -82,425 +85,419 @@ namespace MWScript
 {
     namespace Container
     {
-        template<class R>
+        template <class R>
         class OpAddItem : public Interpreter::Opcode0
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+                std::string_view item = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    std::string_view item = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                Interpreter::Type_Integer count = runtime[0].mInteger;
+                runtime.pop();
 
-                    Interpreter::Type_Integer count = runtime[0].mInteger;
-                    runtime.pop();
+                if (count < 0)
+                    count = static_cast<uint16_t>(count);
 
-                    if (count<0)
-                        count = static_cast<uint16_t>(count);
+                // no-op
+                if (count == 0)
+                    return;
 
-                    // no-op
-                    if (count == 0)
-                        return;
+                if (::Misc::StringUtils::ciEqual(item, "gold_005") || ::Misc::StringUtils::ciEqual(item, "gold_010")
+                    || ::Misc::StringUtils::ciEqual(item, "gold_025") || ::Misc::StringUtils::ciEqual(item, "gold_100"))
+                    item = "gold_001";
 
-                    if(::Misc::StringUtils::ciEqual(item, "gold_005")
-                            || ::Misc::StringUtils::ciEqual(item, "gold_010")
-                            || ::Misc::StringUtils::ciEqual(item, "gold_025")
-                            || ::Misc::StringUtils::ciEqual(item, "gold_100"))
-                        item = "gold_001";
-
-                    // Check if "item" can be placed in a container
-                    MWWorld::ManualRef manualRef(MWBase::Environment::get().getWorld()->getStore(), item, 1);
-                    MWWorld::Ptr itemPtr = manualRef.getPtr();
-                    bool isLevelledList = itemPtr.getClass().getType() == ESM::ItemLevList::sRecordId;
-                    if(!isLevelledList)
-                        MWWorld::ContainerStore::getType(itemPtr);
-
-                    // Explicit calls to non-unique actors affect the base record
-                    if(!R::implicit && ptr.getClass().isActor() && MWBase::Environment::get().getWorld()->getStore().getRefCount(ptr.getCellRef().getRefId()) > 1)
-                    {
-                        ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), item, count);
-                        return;
-                    }
+                // Check if "item" can be placed in a container
+                MWWorld::ManualRef manualRef(MWBase::Environment::get().getWorld()->getStore(), item, 1);
+                MWWorld::Ptr itemPtr = manualRef.getPtr();
+                bool isLevelledList = itemPtr.getClass().getType() == ESM::ItemLevList::sRecordId;
+                if (!isLevelledList)
+                    MWWorld::ContainerStore::getType(itemPtr);
+
+                // Explicit calls to non-unique actors affect the base record
+                if (!R::implicit && ptr.getClass().isActor()
+                    && MWBase::Environment::get().getWorld()->getStore().getRefCount(ptr.getCellRef().getRefId()) > 1)
+                {
+                    ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), item, count);
+                    return;
+                }
 
-                    // Calls to unresolved containers affect the base record
-                    if(ptr.getClass().getType() == ESM::Container::sRecordId && (!ptr.getRefData().getCustomData() ||
-                    !ptr.getClass().getContainerStore(ptr).isResolved()))
+                // Calls to unresolved containers affect the base record
+                if (ptr.getClass().getType() == ESM::Container::sRecordId
+                    && (!ptr.getRefData().getCustomData() || !ptr.getClass().getContainerStore(ptr).isResolved()))
+                {
+                    ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), item, count);
+                    const ESM::Container* baseRecord
+                        = MWBase::Environment::get().getWorld()->getStore().get<ESM::Container>().find(
+                            ptr.getCellRef().getRefId());
+                    const auto& ptrs = MWBase::Environment::get().getWorld()->getAll(ptr.getCellRef().getRefId());
+                    for (const auto& container : ptrs)
                     {
-                        ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), item, count);
-                        const ESM::Container* baseRecord = MWBase::Environment::get().getWorld()->getStore().get<ESM::Container>().find(ptr.getCellRef().getRefId());
-                        const auto& ptrs = MWBase::Environment::get().getWorld()->getAll(ptr.getCellRef().getRefId());
-                        for(const auto& container : ptrs)
+                        // use the new base record
+                        container.get<ESM::Container>()->mBase = baseRecord;
+                        if (container.getRefData().getCustomData())
                         {
-                            // use the new base record
-                            container.get<ESM::Container>()->mBase = baseRecord;
-                            if(container.getRefData().getCustomData())
+                            auto& store = container.getClass().getContainerStore(container);
+                            if (isLevelledList)
                             {
-                                auto& store = container.getClass().getContainerStore(container);
-                                if(isLevelledList)
+                                if (store.isResolved())
                                 {
-                                    if(store.isResolved())
-                                    {
-                                        addRandomToStore(itemPtr, count, ptr, store);
-                                    }
+                                    addRandomToStore(itemPtr, count, ptr, store);
                                 }
-                                else
-                                    addToStore(itemPtr, count, ptr, store, store.isResolved());
                             }
+                            else
+                                addToStore(itemPtr, count, ptr, store, store.isResolved());
                         }
-                        return;
                     }
-                    MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
-                    if(isLevelledList)
-                        addRandomToStore(itemPtr, count, ptr, store);
+                    return;
+                }
+                MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
+                if (isLevelledList)
+                    addRandomToStore(itemPtr, count, ptr, store);
+                else
+                    addToStore(itemPtr, count, ptr, store);
+
+                // Spawn a messagebox (only for items added to player's inventory and if player is talking to someone)
+                if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
+                {
+                    // The two GMST entries below expand to strings informing the player of what, and how many of it has
+                    // been added to their inventory
+                    std::string msgBox;
+                    std::string_view itemName = itemPtr.getClass().getName(itemPtr);
+                    if (count == 1)
+                    {
+                        msgBox = MyGUI::LanguageManager::getInstance().replaceTags("#{sNotifyMessage60}");
+                        msgBox = ::Misc::StringUtils::format(msgBox, itemName);
+                    }
                     else
-                        addToStore(itemPtr, count, ptr, store);
-
-                    // Spawn a messagebox (only for items added to player's inventory and if player is talking to someone)
-                    if (ptr == MWBase::Environment::get().getWorld ()->getPlayerPtr() )
                     {
-                        // The two GMST entries below expand to strings informing the player of what, and how many of it has been added to their inventory
-                        std::string msgBox;
-                        std::string_view itemName = itemPtr.getClass().getName(itemPtr);
-                        if (count == 1)
-                        {
-                            msgBox = MyGUI::LanguageManager::getInstance().replaceTags("#{sNotifyMessage60}");
-                            msgBox = ::Misc::StringUtils::format(msgBox, itemName);
-                        }
-                        else
-                        {
-                            msgBox = MyGUI::LanguageManager::getInstance().replaceTags("#{sNotifyMessage61}");
-                            msgBox = ::Misc::StringUtils::format(msgBox, count, itemName);
-                        }
-                        MWBase::Environment::get().getWindowManager()->messageBox(msgBox, MWGui::ShowInDialogueMode_Only);
+                        msgBox = MyGUI::LanguageManager::getInstance().replaceTags("#{sNotifyMessage61}");
+                        msgBox = ::Misc::StringUtils::format(msgBox, count, itemName);
                     }
+                    MWBase::Environment::get().getWindowManager()->messageBox(msgBox, MWGui::ShowInDialogueMode_Only);
                 }
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetItemCount : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view item = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view item = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    if(::Misc::StringUtils::ciEqual(item, "gold_005")
-                            || ::Misc::StringUtils::ciEqual(item, "gold_010")
-                            || ::Misc::StringUtils::ciEqual(item, "gold_025")
-                            || ::Misc::StringUtils::ciEqual(item, "gold_100"))
-                        item = "gold_001";
+                if (::Misc::StringUtils::ciEqual(item, "gold_005") || ::Misc::StringUtils::ciEqual(item, "gold_010")
+                    || ::Misc::StringUtils::ciEqual(item, "gold_025") || ::Misc::StringUtils::ciEqual(item, "gold_100"))
+                    item = "gold_001";
 
-                    MWWorld::ContainerStore& store = ptr.getClass().getContainerStore (ptr);
+                MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
 
-                    runtime.push (store.count(item));
-                }
+                runtime.push(store.count(item));
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpRemoveItem : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view item = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view item = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    Interpreter::Type_Integer count = runtime[0].mInteger;
-                    runtime.pop();
+                Interpreter::Type_Integer count = runtime[0].mInteger;
+                runtime.pop();
 
-                    if (count<0)
-                        count = static_cast<uint16_t>(count);
+                if (count < 0)
+                    count = static_cast<uint16_t>(count);
 
-                    // no-op
-                    if (count == 0)
-                        return;
+                // no-op
+                if (count == 0)
+                    return;
 
-                    if(::Misc::StringUtils::ciEqual(item, "gold_005")
-                            || ::Misc::StringUtils::ciEqual(item, "gold_010")
-                            || ::Misc::StringUtils::ciEqual(item, "gold_025")
-                            || ::Misc::StringUtils::ciEqual(item, "gold_100"))
-                        item = "gold_001";
+                if (::Misc::StringUtils::ciEqual(item, "gold_005") || ::Misc::StringUtils::ciEqual(item, "gold_010")
+                    || ::Misc::StringUtils::ciEqual(item, "gold_025") || ::Misc::StringUtils::ciEqual(item, "gold_100"))
+                    item = "gold_001";
 
-                    // Explicit calls to non-unique actors affect the base record
-                    if(!R::implicit && ptr.getClass().isActor() && MWBase::Environment::get().getWorld()->getStore().getRefCount(ptr.getCellRef().getRefId()) > 1)
-                    {
-                        ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), item, -count);
-                        return;
-                    }
-                    // Calls to unresolved containers affect the base record instead
-                    else if(ptr.getClass().getType() == ESM::Container::sRecordId &&
-                        (!ptr.getRefData().getCustomData() || !ptr.getClass().getContainerStore(ptr).isResolved()))
+                // Explicit calls to non-unique actors affect the base record
+                if (!R::implicit && ptr.getClass().isActor()
+                    && MWBase::Environment::get().getWorld()->getStore().getRefCount(ptr.getCellRef().getRefId()) > 1)
+                {
+                    ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), item, -count);
+                    return;
+                }
+                // Calls to unresolved containers affect the base record instead
+                else if (ptr.getClass().getType() == ESM::Container::sRecordId
+                    && (!ptr.getRefData().getCustomData() || !ptr.getClass().getContainerStore(ptr).isResolved()))
+                {
+                    ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), item, -count);
+                    const ESM::Container* baseRecord
+                        = MWBase::Environment::get().getWorld()->getStore().get<ESM::Container>().find(
+                            ptr.getCellRef().getRefId());
+                    const auto& ptrs = MWBase::Environment::get().getWorld()->getAll(ptr.getCellRef().getRefId());
+                    for (const auto& container : ptrs)
                     {
-                        ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), item, -count);
-                        const ESM::Container* baseRecord = MWBase::Environment::get().getWorld()->getStore().get<ESM::Container>().find(ptr.getCellRef().getRefId());
-                        const auto& ptrs = MWBase::Environment::get().getWorld()->getAll(ptr.getCellRef().getRefId());
-                        for(const auto& container : ptrs)
+                        container.get<ESM::Container>()->mBase = baseRecord;
+                        if (container.getRefData().getCustomData())
                         {
-                            container.get<ESM::Container>()->mBase = baseRecord;
-                            if(container.getRefData().getCustomData())
-                            {
-                                auto& store = container.getClass().getContainerStore(container);
-                                // Note that unlike AddItem, RemoveItem only removes from unresolved containers
-                                if(!store.isResolved())
-                                    store.remove(item, count, ptr, false, false);
-                            }
+                            auto& store = container.getClass().getContainerStore(container);
+                            // Note that unlike AddItem, RemoveItem only removes from unresolved containers
+                            if (!store.isResolved())
+                                store.remove(item, count, ptr, false, false);
                         }
-                        return;
                     }
-                    MWWorld::ContainerStore& store = ptr.getClass().getContainerStore (ptr);
+                    return;
+                }
+                MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
 
-                    std::string_view itemName;
-                    for (MWWorld::ConstContainerStoreIterator iter(store.cbegin()); iter != store.cend(); ++iter)
+                std::string_view itemName;
+                for (MWWorld::ConstContainerStoreIterator iter(store.cbegin()); iter != store.cend(); ++iter)
+                {
+                    if (::Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), item))
                     {
-                        if (::Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), item))
-                        {
-                            itemName = iter->getClass().getName(*iter);
-                            break;
-                        }
+                        itemName = iter->getClass().getName(*iter);
+                        break;
                     }
+                }
 
-                    int numRemoved = store.remove(item, count, ptr);
+                int numRemoved = store.remove(item, count, ptr);
 
-                    // Spawn a messagebox (only for items removed from player's inventory)
-                    if ((numRemoved > 0)
-                        && (ptr == MWMechanics::getPlayer()))
-                    {
-                        // The two GMST entries below expand to strings informing the player of what, and how many of it has been removed from their inventory
-                        std::string msgBox;
+                // Spawn a messagebox (only for items removed from player's inventory)
+                if ((numRemoved > 0) && (ptr == MWMechanics::getPlayer()))
+                {
+                    // The two GMST entries below expand to strings informing the player of what, and how many of it has
+                    // been removed from their inventory
+                    std::string msgBox;
 
-                        if (numRemoved > 1)
-                        {
-                            msgBox = MyGUI::LanguageManager::getInstance().replaceTags("#{sNotifyMessage63}");
-                            msgBox = ::Misc::StringUtils::format(msgBox, numRemoved, itemName);
-                        }
-                        else
-                        {
-                            msgBox = MyGUI::LanguageManager::getInstance().replaceTags("#{sNotifyMessage62}");
-                            msgBox = ::Misc::StringUtils::format(msgBox, itemName);
-                        }
-                        MWBase::Environment::get().getWindowManager()->messageBox(msgBox, MWGui::ShowInDialogueMode_Only);
+                    if (numRemoved > 1)
+                    {
+                        msgBox = MyGUI::LanguageManager::getInstance().replaceTags("#{sNotifyMessage63}");
+                        msgBox = ::Misc::StringUtils::format(msgBox, numRemoved, itemName);
+                    }
+                    else
+                    {
+                        msgBox = MyGUI::LanguageManager::getInstance().replaceTags("#{sNotifyMessage62}");
+                        msgBox = ::Misc::StringUtils::format(msgBox, itemName);
                     }
+                    MWBase::Environment::get().getWindowManager()->messageBox(msgBox, MWGui::ShowInDialogueMode_Only);
                 }
+            }
         };
 
         template <class R>
         class OpEquip : public Interpreter::Opcode0
         {
-            public:
-
-                void execute(Interpreter::Runtime &runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view item = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view item = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore (ptr);
-                    auto found = invStore.end();
-                    const auto& store = MWBase::Environment::get().getWorld()->getStore();
+                MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr);
+                auto found = invStore.end();
+                const auto& store = MWBase::Environment::get().getWorld()->getStore();
 
-                    // With soul gems we prefer filled ones.
-                    for (auto it = invStore.begin(); it != invStore.end(); ++it)
+                // With soul gems we prefer filled ones.
+                for (auto it = invStore.begin(); it != invStore.end(); ++it)
+                {
+                    if (Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), item))
                     {
-                        if (Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), item))
-                        {
-                            found = it;
-                            const std::string& soul = it->getCellRef().getSoul();
-                            if (!it->getClass().isSoulGem(*it) || (!soul.empty() && store.get<ESM::Creature>().search(soul)))
-                                break;
-                        }
+                        found = it;
+                        const std::string& soul = it->getCellRef().getSoul();
+                        if (!it->getClass().isSoulGem(*it)
+                            || (!soul.empty() && store.get<ESM::Creature>().search(soul)))
+                            break;
                     }
+                }
 
-                    if (found == invStore.end())
-                    {
-                        MWWorld::ManualRef ref(store, item, 1);
-                        found = ptr.getClass().getContainerStore(ptr).add(ref.getPtr(), 1, ptr, false);
-                        Log(Debug::Warning) << "Implicitly adding one " << item << 
-                            " to the inventory store of " << ptr.getCellRef().getRefId() <<
-                            " to fulfill the requirements of Equip instruction";
-                    }
+                if (found == invStore.end())
+                {
+                    MWWorld::ManualRef ref(store, item, 1);
+                    found = ptr.getClass().getContainerStore(ptr).add(ref.getPtr(), 1, ptr, false);
+                    Log(Debug::Warning) << "Implicitly adding one " << item << " to the inventory store of "
+                                        << ptr.getCellRef().getRefId()
+                                        << " to fulfill the requirements of Equip instruction";
+                }
 
-                    if (ptr == MWMechanics::getPlayer())
-                        MWBase::Environment::get().getWindowManager()->useItem(*found, true);
-                    else
-                    {
-                        std::unique_ptr<MWWorld::Action> action = found->getClass().use(*found, true);
-                        action->execute(ptr, true);
-                    }
+                if (ptr == MWMechanics::getPlayer())
+                    MWBase::Environment::get().getWindowManager()->useItem(*found, true);
+                else
+                {
+                    std::unique_ptr<MWWorld::Action> action = found->getClass().use(*found, true);
+                    action->execute(ptr, true);
                 }
+            }
         };
 
         template <class R>
         class OpGetArmorType : public Interpreter::Opcode0
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                void execute(Interpreter::Runtime &runtime) override
+                Interpreter::Type_Integer location = runtime[0].mInteger;
+                runtime.pop();
+
+                int slot;
+                switch (location)
                 {
-                    MWWorld::Ptr ptr = R()(runtime);
+                    case 0:
+                        slot = MWWorld::InventoryStore::Slot_Helmet;
+                        break;
+                    case 1:
+                        slot = MWWorld::InventoryStore::Slot_Cuirass;
+                        break;
+                    case 2:
+                        slot = MWWorld::InventoryStore::Slot_LeftPauldron;
+                        break;
+                    case 3:
+                        slot = MWWorld::InventoryStore::Slot_RightPauldron;
+                        break;
+                    case 4:
+                        slot = MWWorld::InventoryStore::Slot_Greaves;
+                        break;
+                    case 5:
+                        slot = MWWorld::InventoryStore::Slot_Boots;
+                        break;
+                    case 6:
+                        slot = MWWorld::InventoryStore::Slot_LeftGauntlet;
+                        break;
+                    case 7:
+                        slot = MWWorld::InventoryStore::Slot_RightGauntlet;
+                        break;
+                    case 8:
+                        slot = MWWorld::InventoryStore::Slot_CarriedLeft; // shield
+                        break;
+                    case 9:
+                        slot = MWWorld::InventoryStore::Slot_LeftGauntlet;
+                        break;
+                    case 10:
+                        slot = MWWorld::InventoryStore::Slot_RightGauntlet;
+                        break;
+                    default:
+                        throw std::runtime_error("armor index out of range");
+                }
 
-                    Interpreter::Type_Integer location = runtime[0].mInteger;
-                    runtime.pop();
+                const MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr);
+                MWWorld::ConstContainerStoreIterator it = invStore.getSlot(slot);
 
-                    int slot;
-                    switch (location)
-                    {
-                        case 0:
-                            slot = MWWorld::InventoryStore::Slot_Helmet;
-                            break;
-                        case 1:
-                            slot = MWWorld::InventoryStore::Slot_Cuirass;
-                            break;
-                        case 2:
-                            slot = MWWorld::InventoryStore::Slot_LeftPauldron;
-                            break;
-                        case 3:
-                            slot = MWWorld::InventoryStore::Slot_RightPauldron;
-                            break;
-                        case 4:
-                            slot = MWWorld::InventoryStore::Slot_Greaves;
-                            break;
-                        case 5:
-                            slot = MWWorld::InventoryStore::Slot_Boots;
-                            break;
-                        case 6:
-                            slot = MWWorld::InventoryStore::Slot_LeftGauntlet;
-                            break;
-                        case 7:
-                            slot = MWWorld::InventoryStore::Slot_RightGauntlet;
-                            break;
-                        case 8:
-                            slot = MWWorld::InventoryStore::Slot_CarriedLeft; // shield
-                            break;
-                        case 9:
-                            slot = MWWorld::InventoryStore::Slot_LeftGauntlet;
-                            break;
-                        case 10:
-                            slot = MWWorld::InventoryStore::Slot_RightGauntlet;
-                            break;
-                        default:
-                            throw std::runtime_error ("armor index out of range");
-                    }
-
-                    const MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore (ptr);
-                    MWWorld::ConstContainerStoreIterator it = invStore.getSlot (slot);
-                    
-                    if (it == invStore.end() || it->getType () != ESM::Armor::sRecordId)
-                    {
-                        runtime.push(-1);
-                        return;
-                    }
+                if (it == invStore.end() || it->getType() != ESM::Armor::sRecordId)
+                {
+                    runtime.push(-1);
+                    return;
+                }
 
-                    int skill = it->getClass().getEquipmentSkill (*it) ;
-                    if (skill == ESM::Skill::HeavyArmor)
-                        runtime.push(2);
-                    else if (skill == ESM::Skill::MediumArmor)
-                        runtime.push(1);
-                    else if (skill == ESM::Skill::LightArmor)
-                        runtime.push(0);
-                    else
-                        runtime.push(-1);
+                int skill = it->getClass().getEquipmentSkill(*it);
+                if (skill == ESM::Skill::HeavyArmor)
+                    runtime.push(2);
+                else if (skill == ESM::Skill::MediumArmor)
+                    runtime.push(1);
+                else if (skill == ESM::Skill::LightArmor)
+                    runtime.push(0);
+                else
+                    runtime.push(-1);
             }
         };
 
         template <class R>
         class OpHasItemEquipped : public Interpreter::Opcode0
         {
-            public:
-
-                void execute(Interpreter::Runtime &runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view item = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view item = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    const MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore (ptr);
-                    for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
+                const MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr);
+                for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
+                {
+                    MWWorld::ConstContainerStoreIterator it = invStore.getSlot(slot);
+                    if (it != invStore.end() && ::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), item))
                     {
-                        MWWorld::ConstContainerStoreIterator it = invStore.getSlot (slot);
-                        if (it != invStore.end() && ::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), item))
-                        {
-                            runtime.push(1);
-                            return;
-                        }
+                        runtime.push(1);
+                        return;
                     }
-                    runtime.push(0);
                 }
+                runtime.push(0);
+            }
         };
 
         template <class R>
         class OpHasSoulGem : public Interpreter::Opcode0
         {
-            public:
-
-                void execute(Interpreter::Runtime &runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view name = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view name = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    int count = 0;
-                    const MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore (ptr);
-                    for (MWWorld::ConstContainerStoreIterator it = invStore.cbegin(MWWorld::ContainerStore::Type_Miscellaneous);
-                         it != invStore.cend(); ++it)
-                    {
-                        if (::Misc::StringUtils::ciEqual(it->getCellRef().getSoul(), name))
-                            count += it->getRefData().getCount();
-                    }
-                    runtime.push(count);
+                int count = 0;
+                const MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr);
+                for (MWWorld::ConstContainerStoreIterator it
+                     = invStore.cbegin(MWWorld::ContainerStore::Type_Miscellaneous);
+                     it != invStore.cend(); ++it)
+                {
+                    if (::Misc::StringUtils::ciEqual(it->getCellRef().getSoul(), name))
+                        count += it->getRefData().getCount();
                 }
+                runtime.push(count);
+            }
         };
 
         template <class R>
         class OpGetWeaponType : public Interpreter::Opcode0
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                void execute(Interpreter::Runtime &runtime) override
+                const MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr);
+                MWWorld::ConstContainerStoreIterator it = invStore.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+                if (it == invStore.end())
                 {
-                    MWWorld::Ptr ptr = R()(runtime);
-
-                    const MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore (ptr);
-                    MWWorld::ConstContainerStoreIterator it = invStore.getSlot (MWWorld::InventoryStore::Slot_CarriedRight);
-                    if (it == invStore.end())
+                    runtime.push(-1);
+                    return;
+                }
+                else if (it->getType() != ESM::Weapon::sRecordId)
+                {
+                    if (it->getType() == ESM::Lockpick::sRecordId)
                     {
-                        runtime.push(-1);
-                        return;
+                        runtime.push(-2);
                     }
-                    else if (it->getType() != ESM::Weapon::sRecordId)
+                    else if (it->getType() == ESM::Probe::sRecordId)
                     {
-                        if (it->getType() == ESM::Lockpick::sRecordId)
-                        {
-                            runtime.push(-2);
-                        }
-                        else if (it->getType() == ESM::Probe::sRecordId)
-                        {
-                            runtime.push(-3);
-                        }
-                        else
-                        {
-                            runtime.push(-1);
-                        }
-                        return;
+                        runtime.push(-3);
                     }
-
-                    runtime.push(it->get<ESM::Weapon>()->mBase->mData.mType);
+                    else
+                    {
+                        runtime.push(-1);
+                    }
+                    return;
                 }
-        };
 
+                runtime.push(it->get<ESM::Weapon>()->mBase->mData.mType);
+            }
+        };
 
-        void installOpcodes (Interpreter::Interpreter& interpreter)
+        void installOpcodes(Interpreter::Interpreter& interpreter)
         {
             interpreter.installSegment5<OpAddItem<ImplicitRef>>(Compiler::Container::opcodeAddItem);
             interpreter.installSegment5<OpAddItem<ExplicitRef>>(Compiler::Container::opcodeAddItemExplicit);
@@ -513,7 +510,8 @@ namespace MWScript
             interpreter.installSegment5<OpGetArmorType<ImplicitRef>>(Compiler::Container::opcodeGetArmorType);
             interpreter.installSegment5<OpGetArmorType<ExplicitRef>>(Compiler::Container::opcodeGetArmorTypeExplicit);
             interpreter.installSegment5<OpHasItemEquipped<ImplicitRef>>(Compiler::Container::opcodeHasItemEquipped);
-            interpreter.installSegment5<OpHasItemEquipped<ExplicitRef>>(Compiler::Container::opcodeHasItemEquippedExplicit);
+            interpreter.installSegment5<OpHasItemEquipped<ExplicitRef>>(
+                Compiler::Container::opcodeHasItemEquippedExplicit);
             interpreter.installSegment5<OpHasSoulGem<ImplicitRef>>(Compiler::Container::opcodeHasSoulGem);
             interpreter.installSegment5<OpHasSoulGem<ExplicitRef>>(Compiler::Container::opcodeHasSoulGemExplicit);
             interpreter.installSegment5<OpGetWeaponType<ImplicitRef>>(Compiler::Container::opcodeGetWeaponType);
diff --git a/apps/openmw/mwscript/containerextensions.hpp b/apps/openmw/mwscript/containerextensions.hpp
index d5be8fb2a6..c6b2434f33 100644
--- a/apps/openmw/mwscript/containerextensions.hpp
+++ b/apps/openmw/mwscript/containerextensions.hpp
@@ -16,7 +16,7 @@ namespace MWScript
     /// \brief Container-related script functionality (chests, NPCs, creatures)
     namespace Container
     {
-        void installOpcodes (Interpreter::Interpreter& interpreter);
+        void installOpcodes(Interpreter::Interpreter& interpreter);
     }
 }
 
diff --git a/apps/openmw/mwscript/controlextensions.cpp b/apps/openmw/mwscript/controlextensions.cpp
index d216474c6d..a69f2cd571 100644
--- a/apps/openmw/mwscript/controlextensions.cpp
+++ b/apps/openmw/mwscript/controlextensions.cpp
@@ -3,8 +3,8 @@
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>
-#include <components/interpreter/runtime.hpp>
 #include <components/interpreter/opcodes.hpp>
+#include <components/interpreter/runtime.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/inputmanager.hpp"
@@ -25,205 +25,219 @@ namespace MWScript
     {
         class OpSetControl : public Interpreter::Opcode0
         {
-                std::string mControl;
-                bool mEnable;
-
-            public:
+            std::string mControl;
+            bool mEnable;
 
-                OpSetControl (const std::string& control, bool enable)
-                : mControl (control), mEnable (enable)
-                {}
+        public:
+            OpSetControl(const std::string& control, bool enable)
+                : mControl(control)
+                , mEnable(enable)
+            {
+            }
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWBase::Environment::get()
-                        .getInputManager()
-                        ->toggleControlSwitch(mControl, mEnable);
-                }
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWBase::Environment::get().getInputManager()->toggleControlSwitch(mControl, mEnable);
+            }
         };
 
         class OpGetDisabled : public Interpreter::Opcode0
         {
-                std::string mControl;
-
-            public:
+            std::string mControl;
 
-                OpGetDisabled (const std::string& control)
-                : mControl (control)
-                {}
+        public:
+            OpGetDisabled(const std::string& control)
+                : mControl(control)
+            {
+            }
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    runtime.push(!MWBase::Environment::get().getInputManager()->getControlSwitch (mControl));
-                }
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                runtime.push(!MWBase::Environment::get().getInputManager()->getControlSwitch(mControl));
+            }
         };
 
         class OpToggleCollision : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    bool enabled = MWBase::Environment::get().getWorld()->toggleCollisionMode();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                bool enabled = MWBase::Environment::get().getWorld()->toggleCollisionMode();
 
-                    runtime.getContext().report (enabled ? "Collision -> On" : "Collision -> Off");
-                }
+                runtime.getContext().report(enabled ? "Collision -> On" : "Collision -> Off");
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpClearMovementFlag : public Interpreter::Opcode0
         {
-                MWMechanics::CreatureStats::Flag mFlag;
-
-            public:
+            MWMechanics::CreatureStats::Flag mFlag;
 
-                OpClearMovementFlag (MWMechanics::CreatureStats::Flag flag) : mFlag (flag) {}
+        public:
+            OpClearMovementFlag(MWMechanics::CreatureStats::Flag flag)
+                : mFlag(flag)
+            {
+            }
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    ptr.getClass().getCreatureStats(ptr).setMovementFlag (mFlag, false);
-                }
+                ptr.getClass().getCreatureStats(ptr).setMovementFlag(mFlag, false);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpSetMovementFlag : public Interpreter::Opcode0
         {
-                MWMechanics::CreatureStats::Flag mFlag;
-
-            public:
+            MWMechanics::CreatureStats::Flag mFlag;
 
-                OpSetMovementFlag (MWMechanics::CreatureStats::Flag flag) : mFlag (flag) {}
+        public:
+            OpSetMovementFlag(MWMechanics::CreatureStats::Flag flag)
+                : mFlag(flag)
+            {
+            }
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    ptr.getClass().getCreatureStats(ptr).setMovementFlag (mFlag, true);
-                }
+                ptr.getClass().getCreatureStats(ptr).setMovementFlag(mFlag, true);
+            }
         };
 
         template <class R>
         class OpGetForceRun : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats (ptr);
-                    runtime.push (stats.getMovementFlag (MWMechanics::CreatureStats::Flag_ForceRun));
-                }
+                MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
+                runtime.push(stats.getMovementFlag(MWMechanics::CreatureStats::Flag_ForceRun));
+            }
         };
 
         template <class R>
         class OpGetForceJump : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats (ptr);
-                    runtime.push (stats.getMovementFlag (MWMechanics::CreatureStats::Flag_ForceJump));
-                }
+                MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
+                runtime.push(stats.getMovementFlag(MWMechanics::CreatureStats::Flag_ForceJump));
+            }
         };
 
         template <class R>
         class OpGetForceMoveJump : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats (ptr);
-                    runtime.push (stats.getMovementFlag (MWMechanics::CreatureStats::Flag_ForceMoveJump));
-                }
+                MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
+                runtime.push(stats.getMovementFlag(MWMechanics::CreatureStats::Flag_ForceMoveJump));
+            }
         };
 
         template <class R>
         class OpGetForceSneak : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
-                    runtime.push (stats.getMovementFlag (MWMechanics::CreatureStats::Flag_ForceSneak));
-                }
+                MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
+                runtime.push(stats.getMovementFlag(MWMechanics::CreatureStats::Flag_ForceSneak));
+            }
         };
 
         class OpGetPcRunning : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPlayerPtr();
-                    MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
-                    MWBase::World* world = MWBase::Environment::get().getWorld();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPlayerPtr();
+                MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
+                MWBase::World* world = MWBase::Environment::get().getWorld();
 
-                    bool stanceOn = stats.getStance(MWMechanics::CreatureStats::Stance_Run);
-                    bool running = MWBase::Environment::get().getMechanicsManager()->isRunning(ptr);
-                    bool inair = !world->isOnGround(ptr) && !world->isSwimming(ptr) && !world->isFlying(ptr);
+                bool stanceOn = stats.getStance(MWMechanics::CreatureStats::Stance_Run);
+                bool running = MWBase::Environment::get().getMechanicsManager()->isRunning(ptr);
+                bool inair = !world->isOnGround(ptr) && !world->isSwimming(ptr) && !world->isFlying(ptr);
 
-                    runtime.push(stanceOn && (running || inair));
-                }
+                runtime.push(stanceOn && (running || inair));
+            }
         };
 
         class OpGetPcSneaking : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPlayerPtr();
-                    runtime.push(MWBase::Environment::get().getMechanicsManager()->isSneaking(ptr));
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPlayerPtr();
+                runtime.push(MWBase::Environment::get().getMechanicsManager()->isSneaking(ptr));
+            }
         };
 
-
         void installOpcodes(Interpreter::Interpreter& interpreter)
         {
             for (int i = 0; i < Compiler::Control::numberOfControls; ++i)
             {
-                interpreter.installSegment5<OpSetControl>(Compiler::Control::opcodeEnable + i, Compiler::Control::controls[i], true);
-                interpreter.installSegment5<OpSetControl>(Compiler::Control::opcodeDisable + i, Compiler::Control::controls[i], false);
-                interpreter.installSegment5<OpGetDisabled>(Compiler::Control::opcodeGetDisabled + i, Compiler::Control::controls[i]);
+                interpreter.installSegment5<OpSetControl>(
+                    Compiler::Control::opcodeEnable + i, Compiler::Control::controls[i], true);
+                interpreter.installSegment5<OpSetControl>(
+                    Compiler::Control::opcodeDisable + i, Compiler::Control::controls[i], false);
+                interpreter.installSegment5<OpGetDisabled>(
+                    Compiler::Control::opcodeGetDisabled + i, Compiler::Control::controls[i]);
             }
 
             interpreter.installSegment5<OpToggleCollision>(Compiler::Control::opcodeToggleCollision);
 
-            //Force Run
-            interpreter.installSegment5<OpClearMovementFlag<ImplicitRef>>(Compiler::Control::opcodeClearForceRun, MWMechanics::CreatureStats::Flag_ForceRun);
-            interpreter.installSegment5<OpClearMovementFlag<ExplicitRef>>(Compiler::Control::opcodeClearForceRunExplicit, MWMechanics::CreatureStats::Flag_ForceRun);
-            interpreter.installSegment5<OpSetMovementFlag<ImplicitRef>>(Compiler::Control::opcodeForceRun, MWMechanics::CreatureStats::Flag_ForceRun);
-            interpreter.installSegment5<OpSetMovementFlag<ExplicitRef>>(Compiler::Control::opcodeForceRunExplicit, MWMechanics::CreatureStats::Flag_ForceRun);
-
-            //Force Jump
-            interpreter.installSegment5<OpClearMovementFlag<ImplicitRef>>(Compiler::Control::opcodeClearForceJump, MWMechanics::CreatureStats::Flag_ForceJump);
-            interpreter.installSegment5<OpClearMovementFlag<ExplicitRef>>(Compiler::Control::opcodeClearForceJumpExplicit, MWMechanics::CreatureStats::Flag_ForceJump);
-            interpreter.installSegment5<OpSetMovementFlag<ImplicitRef>>(Compiler::Control::opcodeForceJump, MWMechanics::CreatureStats::Flag_ForceJump);
-            interpreter.installSegment5<OpSetMovementFlag<ExplicitRef>>(Compiler::Control::opcodeForceJumpExplicit, MWMechanics::CreatureStats::Flag_ForceJump);
-
-            //Force MoveJump
-            interpreter.installSegment5<OpClearMovementFlag<ImplicitRef>>(Compiler::Control::opcodeClearForceMoveJump, MWMechanics::CreatureStats::Flag_ForceMoveJump);
-            interpreter.installSegment5<OpClearMovementFlag<ExplicitRef>>(Compiler::Control::opcodeClearForceMoveJumpExplicit, MWMechanics::CreatureStats::Flag_ForceMoveJump);
-            interpreter.installSegment5<OpSetMovementFlag<ImplicitRef>>(Compiler::Control::opcodeForceMoveJump, MWMechanics::CreatureStats::Flag_ForceMoveJump);
-            interpreter.installSegment5<OpSetMovementFlag<ExplicitRef>>(Compiler::Control::opcodeForceMoveJumpExplicit, MWMechanics::CreatureStats::Flag_ForceMoveJump);
-
-            //Force Sneak
-            interpreter.installSegment5<OpClearMovementFlag<ImplicitRef>>(Compiler::Control::opcodeClearForceSneak, MWMechanics::CreatureStats::Flag_ForceSneak);
-            interpreter.installSegment5<OpClearMovementFlag<ExplicitRef>>(Compiler::Control::opcodeClearForceSneakExplicit, MWMechanics::CreatureStats::Flag_ForceSneak);
-            interpreter.installSegment5<OpSetMovementFlag<ImplicitRef>>(Compiler::Control::opcodeForceSneak, MWMechanics::CreatureStats::Flag_ForceSneak);
-            interpreter.installSegment5<OpSetMovementFlag<ExplicitRef>>(Compiler::Control::opcodeForceSneakExplicit, MWMechanics::CreatureStats::Flag_ForceSneak);
+            // Force Run
+            interpreter.installSegment5<OpClearMovementFlag<ImplicitRef>>(
+                Compiler::Control::opcodeClearForceRun, MWMechanics::CreatureStats::Flag_ForceRun);
+            interpreter.installSegment5<OpClearMovementFlag<ExplicitRef>>(
+                Compiler::Control::opcodeClearForceRunExplicit, MWMechanics::CreatureStats::Flag_ForceRun);
+            interpreter.installSegment5<OpSetMovementFlag<ImplicitRef>>(
+                Compiler::Control::opcodeForceRun, MWMechanics::CreatureStats::Flag_ForceRun);
+            interpreter.installSegment5<OpSetMovementFlag<ExplicitRef>>(
+                Compiler::Control::opcodeForceRunExplicit, MWMechanics::CreatureStats::Flag_ForceRun);
+
+            // Force Jump
+            interpreter.installSegment5<OpClearMovementFlag<ImplicitRef>>(
+                Compiler::Control::opcodeClearForceJump, MWMechanics::CreatureStats::Flag_ForceJump);
+            interpreter.installSegment5<OpClearMovementFlag<ExplicitRef>>(
+                Compiler::Control::opcodeClearForceJumpExplicit, MWMechanics::CreatureStats::Flag_ForceJump);
+            interpreter.installSegment5<OpSetMovementFlag<ImplicitRef>>(
+                Compiler::Control::opcodeForceJump, MWMechanics::CreatureStats::Flag_ForceJump);
+            interpreter.installSegment5<OpSetMovementFlag<ExplicitRef>>(
+                Compiler::Control::opcodeForceJumpExplicit, MWMechanics::CreatureStats::Flag_ForceJump);
+
+            // Force MoveJump
+            interpreter.installSegment5<OpClearMovementFlag<ImplicitRef>>(
+                Compiler::Control::opcodeClearForceMoveJump, MWMechanics::CreatureStats::Flag_ForceMoveJump);
+            interpreter.installSegment5<OpClearMovementFlag<ExplicitRef>>(
+                Compiler::Control::opcodeClearForceMoveJumpExplicit, MWMechanics::CreatureStats::Flag_ForceMoveJump);
+            interpreter.installSegment5<OpSetMovementFlag<ImplicitRef>>(
+                Compiler::Control::opcodeForceMoveJump, MWMechanics::CreatureStats::Flag_ForceMoveJump);
+            interpreter.installSegment5<OpSetMovementFlag<ExplicitRef>>(
+                Compiler::Control::opcodeForceMoveJumpExplicit, MWMechanics::CreatureStats::Flag_ForceMoveJump);
+
+            // Force Sneak
+            interpreter.installSegment5<OpClearMovementFlag<ImplicitRef>>(
+                Compiler::Control::opcodeClearForceSneak, MWMechanics::CreatureStats::Flag_ForceSneak);
+            interpreter.installSegment5<OpClearMovementFlag<ExplicitRef>>(
+                Compiler::Control::opcodeClearForceSneakExplicit, MWMechanics::CreatureStats::Flag_ForceSneak);
+            interpreter.installSegment5<OpSetMovementFlag<ImplicitRef>>(
+                Compiler::Control::opcodeForceSneak, MWMechanics::CreatureStats::Flag_ForceSneak);
+            interpreter.installSegment5<OpSetMovementFlag<ExplicitRef>>(
+                Compiler::Control::opcodeForceSneakExplicit, MWMechanics::CreatureStats::Flag_ForceSneak);
 
             interpreter.installSegment5<OpGetPcRunning>(Compiler::Control::opcodeGetPcRunning);
             interpreter.installSegment5<OpGetPcSneaking>(Compiler::Control::opcodeGetPcSneaking);
@@ -232,7 +246,8 @@ namespace MWScript
             interpreter.installSegment5<OpGetForceJump<ImplicitRef>>(Compiler::Control::opcodeGetForceJump);
             interpreter.installSegment5<OpGetForceJump<ExplicitRef>>(Compiler::Control::opcodeGetForceJumpExplicit);
             interpreter.installSegment5<OpGetForceMoveJump<ImplicitRef>>(Compiler::Control::opcodeGetForceMoveJump);
-            interpreter.installSegment5<OpGetForceMoveJump<ExplicitRef>>(Compiler::Control::opcodeGetForceMoveJumpExplicit);
+            interpreter.installSegment5<OpGetForceMoveJump<ExplicitRef>>(
+                Compiler::Control::opcodeGetForceMoveJumpExplicit);
             interpreter.installSegment5<OpGetForceSneak<ImplicitRef>>(Compiler::Control::opcodeGetForceSneak);
             interpreter.installSegment5<OpGetForceSneak<ExplicitRef>>(Compiler::Control::opcodeGetForceSneakExplicit);
         }
diff --git a/apps/openmw/mwscript/controlextensions.hpp b/apps/openmw/mwscript/controlextensions.hpp
index b9c6654fea..57051cf750 100644
--- a/apps/openmw/mwscript/controlextensions.hpp
+++ b/apps/openmw/mwscript/controlextensions.hpp
@@ -16,7 +16,7 @@ namespace MWScript
     /// \brief player controls-related script functionality
     namespace Control
     {
-        void installOpcodes (Interpreter::Interpreter& interpreter);
+        void installOpcodes(Interpreter::Interpreter& interpreter);
     }
 }
 
diff --git a/apps/openmw/mwscript/dialogueextensions.cpp b/apps/openmw/mwscript/dialogueextensions.cpp
index f06ee022e2..415a8f6d8b 100644
--- a/apps/openmw/mwscript/dialogueextensions.cpp
+++ b/apps/openmw/mwscript/dialogueextensions.cpp
@@ -4,17 +4,17 @@
 #include <components/compiler/opcodes.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/interpreter/interpreter.hpp>
-#include <components/interpreter/runtime.hpp>
 #include <components/interpreter/opcodes.hpp>
+#include <components/interpreter/runtime.hpp>
 
-#include "../mwbase/environment.hpp"
 #include "../mwbase/dialoguemanager.hpp"
+#include "../mwbase/environment.hpp"
 #include "../mwbase/journal.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/class.hpp"
 #include "../mwmechanics/npcstats.hpp"
+#include "../mwworld/class.hpp"
 
 #include "interpretercontext.hpp"
 #include "ref.hpp"
@@ -26,199 +26,186 @@ namespace MWScript
         template <class R>
         class OpJournal : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime, false); // required=false
-                    if (ptr.isEmpty())
-                        ptr = MWBase::Environment::get().getWorld()->getPlayerPtr();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime, false); // required=false
+                if (ptr.isEmpty())
+                    ptr = MWBase::Environment::get().getWorld()->getPlayerPtr();
 
-                    std::string quest{runtime.getStringLiteral(runtime[0].mInteger)};
-                    runtime.pop();
+                std::string quest{ runtime.getStringLiteral(runtime[0].mInteger) };
+                runtime.pop();
 
-                    Interpreter::Type_Integer index = runtime[0].mInteger;
-                    runtime.pop();
+                Interpreter::Type_Integer index = runtime[0].mInteger;
+                runtime.pop();
 
-                    // Invoking Journal with a non-existing index is allowed, and triggers no errors. Seriously? :(
-                    try
-                    {
-                        MWBase::Environment::get().getJournal()->addEntry (quest, index, ptr);
-                    }
-                    catch (...)
-                    {
-                        if (MWBase::Environment::get().getJournal()->getJournalIndex(quest) < index)
-                            MWBase::Environment::get().getJournal()->setJournalIndex(quest, index);
-                    }
+                // Invoking Journal with a non-existing index is allowed, and triggers no errors. Seriously? :(
+                try
+                {
+                    MWBase::Environment::get().getJournal()->addEntry(quest, index, ptr);
+                }
+                catch (...)
+                {
+                    if (MWBase::Environment::get().getJournal()->getJournalIndex(quest) < index)
+                        MWBase::Environment::get().getJournal()->setJournalIndex(quest, index);
                 }
+            }
         };
 
         class OpSetJournalIndex : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    std::string quest{runtime.getStringLiteral(runtime[0].mInteger)};
-                    runtime.pop();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                std::string quest{ runtime.getStringLiteral(runtime[0].mInteger) };
+                runtime.pop();
 
-                    Interpreter::Type_Integer index = runtime[0].mInteger;
-                    runtime.pop();
+                Interpreter::Type_Integer index = runtime[0].mInteger;
+                runtime.pop();
 
-                    MWBase::Environment::get().getJournal()->setJournalIndex (quest, index);
-                }
+                MWBase::Environment::get().getJournal()->setJournalIndex(quest, index);
+            }
         };
 
         class OpGetJournalIndex : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    std::string quest{runtime.getStringLiteral(runtime[0].mInteger)};
-                    runtime.pop();
-
-                    int index = MWBase::Environment::get().getJournal()->getJournalIndex (quest);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                std::string quest{ runtime.getStringLiteral(runtime[0].mInteger) };
+                runtime.pop();
 
-                    runtime.push (index);
+                int index = MWBase::Environment::get().getJournal()->getJournalIndex(quest);
 
-                }
+                runtime.push(index);
+            }
         };
 
         class OpAddTopic : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    std::string_view topic = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                std::string_view topic = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    MWBase::Environment::get().getDialogueManager()->addTopic(topic);
-                }
+                MWBase::Environment::get().getDialogueManager()->addTopic(topic);
+            }
         };
 
         class OpChoice : public Interpreter::Opcode1
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                MWBase::DialogueManager* dialogue = MWBase::Environment::get().getDialogueManager();
+                while (arg0 > 0)
                 {
-                    MWBase::DialogueManager* dialogue = MWBase::Environment::get().getDialogueManager();
-                    while(arg0>0)
+                    std::string_view question = runtime.getStringLiteral(runtime[0].mInteger);
+                    runtime.pop();
+                    arg0 = arg0 - 1;
+                    Interpreter::Type_Integer choice = 1;
+                    if (arg0 > 0)
                     {
-                        std::string_view question = runtime.getStringLiteral(runtime[0].mInteger);
+                        choice = runtime[0].mInteger;
                         runtime.pop();
-                        arg0 = arg0 -1;
-                        Interpreter::Type_Integer choice = 1;
-                        if(arg0>0)
-                        {
-                            choice = runtime[0].mInteger;
-                            runtime.pop();
-                            arg0 = arg0 -1;
-                        }
-                        dialogue->addChoice(question,choice);
+                        arg0 = arg0 - 1;
                     }
+                    dialogue->addChoice(question, choice);
                 }
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpForceGreeting : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-
-                    if (!ptr.getRefData().isEnabled())
-                        return;
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    if (!ptr.getClass().isActor())
-                    {
-                        const std::string error = "Warning: \"forcegreeting\" command works only for actors.";
-                        runtime.getContext().report(error);
-                        Log(Debug::Warning) << error;
-                        return;
-                    }
+                if (!ptr.getRefData().isEnabled())
+                    return;
 
-                    MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Dialogue, ptr);
+                if (!ptr.getClass().isActor())
+                {
+                    const std::string error = "Warning: \"forcegreeting\" command works only for actors.";
+                    runtime.getContext().report(error);
+                    Log(Debug::Warning) << error;
+                    return;
                 }
+
+                MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Dialogue, ptr);
+            }
         };
 
         class OpGoodbye : public Interpreter::Opcode0
         {
-            public:
-
-                void execute(Interpreter::Runtime& runtime) override
-                {
-                    MWBase::Environment::get().getDialogueManager()->goodbye();
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWBase::Environment::get().getDialogueManager()->goodbye();
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpModReputation : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-                    Interpreter::Type_Integer value = runtime[0].mInteger;
-                    runtime.pop();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                Interpreter::Type_Integer value = runtime[0].mInteger;
+                runtime.pop();
 
-                    ptr.getClass().getNpcStats (ptr).setReputation (ptr.getClass().getNpcStats (ptr).getReputation () + value);
-                }
+                ptr.getClass().getNpcStats(ptr).setReputation(ptr.getClass().getNpcStats(ptr).getReputation() + value);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpSetReputation : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-                    Interpreter::Type_Integer value = runtime[0].mInteger;
-                    runtime.pop();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                Interpreter::Type_Integer value = runtime[0].mInteger;
+                runtime.pop();
 
-                    ptr.getClass().getNpcStats (ptr).setReputation (value);
-                }
+                ptr.getClass().getNpcStats(ptr).setReputation(value);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetReputation : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    runtime.push (ptr.getClass().getNpcStats (ptr).getReputation ());
-                }
+                runtime.push(ptr.getClass().getNpcStats(ptr).getReputation());
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpSameFaction : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
+                MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
 
-                    runtime.push(player.getClass().getNpcStats (player).isInFaction(ptr.getClass().getPrimaryFaction(ptr)));
-                }
+                runtime.push(player.getClass().getNpcStats(player).isInFaction(ptr.getClass().getPrimaryFaction(ptr)));
+            }
         };
 
         class OpModFactionReaction : public Interpreter::Opcode0
         {
         public:
-
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 std::string_view faction1 = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
@@ -236,8 +223,7 @@ namespace MWScript
         class OpGetFactionReaction : public Interpreter::Opcode0
         {
         public:
-
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 std::string_view faction1 = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
@@ -245,16 +231,14 @@ namespace MWScript
                 std::string_view faction2 = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
 
-                runtime.push(MWBase::Environment::get().getDialogueManager()
-                             ->getFactionReaction(faction1, faction2));
+                runtime.push(MWBase::Environment::get().getDialogueManager()->getFactionReaction(faction1, faction2));
             }
         };
 
         class OpSetFactionReaction : public Interpreter::Opcode0
         {
         public:
-
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 std::string_view faction1 = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
@@ -273,7 +257,7 @@ namespace MWScript
         class OpClearInfoActor : public Interpreter::Opcode0
         {
         public:
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 MWWorld::Ptr ptr = R()(runtime);
 
@@ -281,8 +265,7 @@ namespace MWScript
             }
         };
 
-
-        void installOpcodes (Interpreter::Interpreter& interpreter)
+        void installOpcodes(Interpreter::Interpreter& interpreter)
         {
             interpreter.installSegment5<OpJournal<ImplicitRef>>(Compiler::Dialogue::opcodeJournal);
             interpreter.installSegment5<OpJournal<ExplicitRef>>(Compiler::Dialogue::opcodeJournalExplicit);
@@ -305,7 +288,8 @@ namespace MWScript
             interpreter.installSegment5<OpSetFactionReaction>(Compiler::Dialogue::opcodeSetFactionReaction);
             interpreter.installSegment5<OpGetFactionReaction>(Compiler::Dialogue::opcodeGetFactionReaction);
             interpreter.installSegment5<OpClearInfoActor<ImplicitRef>>(Compiler::Dialogue::opcodeClearInfoActor);
-            interpreter.installSegment5<OpClearInfoActor<ExplicitRef>>(Compiler::Dialogue::opcodeClearInfoActorExplicit);
+            interpreter.installSegment5<OpClearInfoActor<ExplicitRef>>(
+                Compiler::Dialogue::opcodeClearInfoActorExplicit);
         }
     }
 
diff --git a/apps/openmw/mwscript/dialogueextensions.hpp b/apps/openmw/mwscript/dialogueextensions.hpp
index 7b03154dfb..acb4e06838 100644
--- a/apps/openmw/mwscript/dialogueextensions.hpp
+++ b/apps/openmw/mwscript/dialogueextensions.hpp
@@ -16,7 +16,7 @@ namespace MWScript
     /// \brief Dialogue/Journal-related script functionality
     namespace Dialogue
     {
-        void installOpcodes (Interpreter::Interpreter& interpreter);
+        void installOpcodes(Interpreter::Interpreter& interpreter);
     }
 }
 
diff --git a/apps/openmw/mwscript/extensions.cpp b/apps/openmw/mwscript/extensions.cpp
index 12bf3413a0..0f42b49250 100644
--- a/apps/openmw/mwscript/extensions.cpp
+++ b/apps/openmw/mwscript/extensions.cpp
@@ -1,45 +1,45 @@
 #include "extensions.hpp"
 
-#include <components/interpreter/interpreter.hpp>
 #include <components/interpreter/installopcodes.hpp>
+#include <components/interpreter/interpreter.hpp>
 
-#include "soundextensions.hpp"
+#include "aiextensions.hpp"
+#include "animationextensions.hpp"
 #include "cellextensions.hpp"
-#include "miscextensions.hpp"
-#include "guiextensions.hpp"
-#include "skyextensions.hpp"
-#include "statsextensions.hpp"
+#include "consoleextensions.hpp"
 #include "containerextensions.hpp"
-#include "aiextensions.hpp"
 #include "controlextensions.hpp"
 #include "dialogueextensions.hpp"
-#include "animationextensions.hpp"
+#include "guiextensions.hpp"
+#include "miscextensions.hpp"
+#include "skyextensions.hpp"
+#include "soundextensions.hpp"
+#include "statsextensions.hpp"
 #include "transformationextensions.hpp"
-#include "consoleextensions.hpp"
 #include "userextensions.hpp"
 
 namespace MWScript
 {
-    void installOpcodes (Interpreter::Interpreter& interpreter, bool consoleOnly)
+    void installOpcodes(Interpreter::Interpreter& interpreter, bool consoleOnly)
     {
-        Interpreter::installOpcodes (interpreter);
-        Cell::installOpcodes (interpreter);
-        Misc::installOpcodes (interpreter);
-        Gui::installOpcodes (interpreter);
-        Sound::installOpcodes (interpreter);
-        Sky::installOpcodes (interpreter);
-        Stats::installOpcodes (interpreter);
-        Container::installOpcodes (interpreter);
-        Ai::installOpcodes (interpreter);
-        Control::installOpcodes (interpreter);
-        Dialogue::installOpcodes (interpreter);
-        Animation::installOpcodes (interpreter);
-        Transformation::installOpcodes (interpreter);
+        Interpreter::installOpcodes(interpreter);
+        Cell::installOpcodes(interpreter);
+        Misc::installOpcodes(interpreter);
+        Gui::installOpcodes(interpreter);
+        Sound::installOpcodes(interpreter);
+        Sky::installOpcodes(interpreter);
+        Stats::installOpcodes(interpreter);
+        Container::installOpcodes(interpreter);
+        Ai::installOpcodes(interpreter);
+        Control::installOpcodes(interpreter);
+        Dialogue::installOpcodes(interpreter);
+        Animation::installOpcodes(interpreter);
+        Transformation::installOpcodes(interpreter);
 
         if (consoleOnly)
         {
-            Console::installOpcodes (interpreter);
-            User::installOpcodes (interpreter);
+            Console::installOpcodes(interpreter);
+            User::installOpcodes(interpreter);
         }
     }
 }
diff --git a/apps/openmw/mwscript/extensions.hpp b/apps/openmw/mwscript/extensions.hpp
index 67f6de5c58..43c5bb3b0e 100644
--- a/apps/openmw/mwscript/extensions.hpp
+++ b/apps/openmw/mwscript/extensions.hpp
@@ -13,7 +13,7 @@ namespace Interpreter
 
 namespace MWScript
 {
-    void installOpcodes (Interpreter::Interpreter& interpreter, bool consoleOnly = false);
+    void installOpcodes(Interpreter::Interpreter& interpreter, bool consoleOnly = false);
     ///< \param consoleOnly include console only opcodes
 }
 
diff --git a/apps/openmw/mwscript/globalscripts.cpp b/apps/openmw/mwscript/globalscripts.cpp
index 17742a0f84..158fc5305b 100644
--- a/apps/openmw/mwscript/globalscripts.cpp
+++ b/apps/openmw/mwscript/globalscripts.cpp
@@ -1,18 +1,18 @@
 #include "globalscripts.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/misc/strings/lower.hpp>
 #include <components/esm3/esmwriter.hpp>
 #include <components/esm3/globalscript.hpp>
-#include <components/esm3/loadsscr.hpp>
 #include <components/esm3/loadscpt.hpp>
+#include <components/esm3/loadsscr.hpp>
+#include <components/misc/strings/lower.hpp>
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/scriptmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "interpretercontext.hpp"
 
@@ -20,7 +20,7 @@ namespace
 {
     struct ScriptCreatingVisitor
     {
-        ESM::GlobalScript operator()(const MWWorld::Ptr &ptr) const
+        ESM::GlobalScript operator()(const MWWorld::Ptr& ptr) const
         {
             ESM::GlobalScript script;
             script.mTargetRef.unset();
@@ -38,7 +38,7 @@ namespace
             return script;
         }
 
-        ESM::GlobalScript operator()(const std::pair<ESM::RefNum, std::string> &pair) const
+        ESM::GlobalScript operator()(const std::pair<ESM::RefNum, std::string>& pair) const
         {
             ESM::GlobalScript script;
             script.mTargetId = pair.second;
@@ -50,29 +50,20 @@ namespace
 
     struct PtrGettingVisitor
     {
-        const MWWorld::Ptr* operator()(const MWWorld::Ptr &ptr) const
-        {
-            return &ptr;
-        }
+        const MWWorld::Ptr* operator()(const MWWorld::Ptr& ptr) const { return &ptr; }
 
-        const MWWorld::Ptr* operator()(const std::pair<ESM::RefNum, std::string> &pair) const
-        {
-            return nullptr;
-        }
+        const MWWorld::Ptr* operator()(const std::pair<ESM::RefNum, std::string>& pair) const { return nullptr; }
     };
 
     struct PtrResolvingVisitor
     {
-        MWWorld::Ptr operator()(const MWWorld::Ptr &ptr) const
-        {
-            return ptr;
-        }
+        MWWorld::Ptr operator()(const MWWorld::Ptr& ptr) const { return ptr; }
 
-        MWWorld::Ptr operator()(const std::pair<ESM::RefNum, std::string> &pair) const
+        MWWorld::Ptr operator()(const std::pair<ESM::RefNum, std::string>& pair) const
         {
             if (pair.second.empty())
                 return MWWorld::Ptr();
-            else if(pair.first.hasContentFile())
+            else if (pair.first.hasContentFile())
                 return MWBase::Environment::get().getWorld()->searchPtrViaRefNum(pair.second, pair.first);
             return MWBase::Environment::get().getWorld()->searchPtr(pair.second, false);
         }
@@ -81,39 +72,37 @@ namespace
     class MatchPtrVisitor
     {
         const MWWorld::Ptr& mPtr;
-    public:
-        MatchPtrVisitor(const MWWorld::Ptr& ptr) : mPtr(ptr) {}
 
-        bool operator()(const MWWorld::Ptr &ptr) const
+    public:
+        MatchPtrVisitor(const MWWorld::Ptr& ptr)
+            : mPtr(ptr)
         {
-            return ptr == mPtr;
         }
 
-        bool operator()(const std::pair<ESM::RefNum, std::string> &pair) const
-        {
-            return false;
-        }
+        bool operator()(const MWWorld::Ptr& ptr) const { return ptr == mPtr; }
+
+        bool operator()(const std::pair<ESM::RefNum, std::string>& pair) const { return false; }
     };
 
     struct IdGettingVisitor
     {
         std::string_view operator()(const MWWorld::Ptr& ptr) const
         {
-            if(ptr.isEmpty())
+            if (ptr.isEmpty())
                 return {};
             return ptr.mRef->mRef.getRefId();
         }
 
-        std::string_view operator()(const std::pair<ESM::RefNum, std::string>& pair) const
-        {
-            return pair.second;
-        }
+        std::string_view operator()(const std::pair<ESM::RefNum, std::string>& pair) const { return pair.second; }
     };
 }
 
 namespace MWScript
 {
-    GlobalScriptDesc::GlobalScriptDesc() : mRunning (false) {}
+    GlobalScriptDesc::GlobalScriptDesc()
+        : mRunning(false)
+    {
+    }
 
     const MWWorld::Ptr* GlobalScriptDesc::getPtrIfPresent() const
     {
@@ -122,36 +111,36 @@ namespace MWScript
 
     MWWorld::Ptr GlobalScriptDesc::getPtr()
     {
-        MWWorld::Ptr ptr = std::visit(PtrResolvingVisitor {}, mTarget);
+        MWWorld::Ptr ptr = std::visit(PtrResolvingVisitor{}, mTarget);
         mTarget = ptr;
         return ptr;
     }
 
     std::string_view GlobalScriptDesc::getId() const
     {
-        return std::visit(IdGettingVisitor {}, mTarget);
+        return std::visit(IdGettingVisitor{}, mTarget);
     }
 
-
-    GlobalScripts::GlobalScripts (const MWWorld::ESMStore& store)
-    : mStore (store)
-    {}
+    GlobalScripts::GlobalScripts(const MWWorld::ESMStore& store)
+        : mStore(store)
+    {
+    }
 
     void GlobalScripts::addScript(std::string_view name, const MWWorld::Ptr& target)
     {
         std::string lowerName = ::Misc::StringUtils::lowerCase(name);
         const auto iter = mScripts.find(lowerName);
 
-        if (iter==mScripts.end())
+        if (iter == mScripts.end())
         {
-            if (const ESM::Script *script = mStore.get<ESM::Script>().search(lowerName))
+            if (const ESM::Script* script = mStore.get<ESM::Script>().search(lowerName))
             {
                 auto desc = std::make_shared<GlobalScriptDesc>();
                 MWWorld::Ptr ptr = target;
                 desc->mTarget = ptr;
                 desc->mRunning = true;
-                desc->mLocals.configure (*script);
-                mScripts.insert (std::make_pair(lowerName, desc));
+                desc->mLocals.configure(*script);
+                mScripts.insert(std::make_pair(lowerName, desc));
             }
             else
             {
@@ -166,19 +155,19 @@ namespace MWScript
         }
     }
 
-    void GlobalScripts::removeScript (std::string_view name)
+    void GlobalScripts::removeScript(std::string_view name)
     {
-        const auto iter = mScripts.find (::Misc::StringUtils::lowerCase (name));
+        const auto iter = mScripts.find(::Misc::StringUtils::lowerCase(name));
 
-        if (iter!=mScripts.end())
+        if (iter != mScripts.end())
             iter->second->mRunning = false;
     }
 
-    bool GlobalScripts::isRunning (std::string_view name) const
+    bool GlobalScripts::isRunning(std::string_view name) const
     {
-        const auto iter = mScripts.find (::Misc::StringUtils::lowerCase (name));
+        const auto iter = mScripts.find(::Misc::StringUtils::lowerCase(name));
 
-        if (iter==mScripts.end())
+        if (iter == mScripts.end())
             return false;
 
         return iter->second->mRunning;
@@ -209,26 +198,23 @@ namespace MWScript
 
         scripts.emplace_back("main");
 
-        for (MWWorld::Store<ESM::StartScript>::iterator iter =
-            mStore.get<ESM::StartScript>().begin();
-            iter != mStore.get<ESM::StartScript>().end(); ++iter)
+        for (MWWorld::Store<ESM::StartScript>::iterator iter = mStore.get<ESM::StartScript>().begin();
+             iter != mStore.get<ESM::StartScript>().end(); ++iter)
         {
-            scripts.push_back (iter->mId);
+            scripts.push_back(iter->mId);
         }
 
         // add scripts
-        for (std::vector<std::string>::const_iterator iter (scripts.begin());
-            iter!=scripts.end(); ++iter)
+        for (std::vector<std::string>::const_iterator iter(scripts.begin()); iter != scripts.end(); ++iter)
         {
             try
             {
-                addScript (*iter);
+                addScript(*iter);
             }
             catch (const std::exception& exception)
             {
-                Log(Debug::Error)
-                    << "Failed to add start script " << *iter << " because an exception has "
-                    << "been thrown: " << exception.what();
+                Log(Debug::Error) << "Failed to add start script " << *iter << " because an exception has "
+                                  << "been thrown: " << exception.what();
             }
         }
     }
@@ -238,11 +224,11 @@ namespace MWScript
         return mScripts.size();
     }
 
-    void GlobalScripts::write (ESM::ESMWriter& writer, Loading::Listener& progress) const
+    void GlobalScripts::write(ESM::ESMWriter& writer, Loading::Listener& progress) const
     {
         for (const auto& [id, desc] : mScripts)
         {
-            ESM::GlobalScript script = std::visit(ScriptCreatingVisitor {}, desc->mTarget);
+            ESM::GlobalScript script = std::visit(ScriptCreatingVisitor{}, desc->mTarget);
 
             script.mId = id;
 
@@ -250,18 +236,18 @@ namespace MWScript
 
             script.mRunning = desc->mRunning ? 1 : 0;
 
-            writer.startRecord (ESM::REC_GSCR);
-            script.save (writer);
-            writer.endRecord (ESM::REC_GSCR);
+            writer.startRecord(ESM::REC_GSCR);
+            script.save(writer);
+            writer.endRecord(ESM::REC_GSCR);
         }
     }
 
-    bool GlobalScripts::readRecord (ESM::ESMReader& reader, uint32_t type, const std::map<int, int>& contentFileMap)
+    bool GlobalScripts::readRecord(ESM::ESMReader& reader, uint32_t type, const std::map<int, int>& contentFileMap)
     {
-        if (type==ESM::REC_GSCR)
+        if (type == ESM::REC_GSCR)
         {
             ESM::GlobalScript script;
-            script.load (reader);
+            script.load(reader);
 
             if (script.mTargetRef.hasContentFile())
             {
@@ -270,11 +256,11 @@ namespace MWScript
                     script.mTargetRef.mContentFile = iter->second;
             }
 
-            auto iter = mScripts.find (script.mId);
+            auto iter = mScripts.find(script.mId);
 
-            if (iter==mScripts.end())
+            if (iter == mScripts.end())
             {
-                if (const ESM::Script *scriptRecord = mStore.get<ESM::Script>().search (script.mId))
+                if (const ESM::Script* scriptRecord = mStore.get<ESM::Script>().search(script.mId))
                 {
                     try
                     {
@@ -283,15 +269,14 @@ namespace MWScript
                         {
                             desc->mTarget = std::make_pair(script.mTargetRef, script.mTargetId);
                         }
-                        desc->mLocals.configure (*scriptRecord);
+                        desc->mLocals.configure(*scriptRecord);
 
-                        iter = mScripts.insert (std::make_pair (script.mId, desc)).first;
+                        iter = mScripts.insert(std::make_pair(script.mId, desc)).first;
                     }
                     catch (const std::exception& exception)
                     {
-                        Log(Debug::Error)
-                            << "Failed to add start script " << script.mId
-                            << " because an exception has been thrown: " << exception.what();
+                        Log(Debug::Error) << "Failed to add start script " << script.mId
+                                          << " because an exception has been thrown: " << exception.what();
 
                         return true;
                     }
@@ -300,8 +285,8 @@ namespace MWScript
                     return true;
             }
 
-            iter->second->mRunning = script.mRunning!=0;
-            iter->second->mLocals.read (script.mLocals, script.mId);
+            iter->second->mRunning = script.mRunning != 0;
+            iter->second->mLocals.read(script.mLocals, script.mId);
 
             return true;
         }
@@ -313,12 +298,12 @@ namespace MWScript
     {
         auto iter = mScripts.find(name);
 
-        if (iter==mScripts.end())
+        if (iter == mScripts.end())
         {
-            const ESM::Script *script = mStore.get<ESM::Script>().find(name);
+            const ESM::Script* script = mStore.get<ESM::Script>().find(name);
 
             auto desc = std::make_shared<GlobalScriptDesc>();
-            desc->mLocals.configure (*script);
+            desc->mLocals.configure(*script);
 
             iter = mScripts.emplace(name, desc).first;
         }
@@ -329,7 +314,7 @@ namespace MWScript
     const Locals* GlobalScripts::getLocalsIfPresent(std::string_view name) const
     {
         auto iter = mScripts.find(name);
-        if (iter==mScripts.end())
+        if (iter == mScripts.end())
             return nullptr;
         return &iter->second->mLocals;
     }
@@ -339,7 +324,7 @@ namespace MWScript
         MatchPtrVisitor visitor(base);
         for (const auto& script : mScripts)
         {
-            if (std::visit (visitor, script.second->mTarget))
+            if (std::visit(visitor, script.second->mTarget))
                 script.second->mTarget = updated;
         }
     }
diff --git a/apps/openmw/mwscript/globalscripts.hpp b/apps/openmw/mwscript/globalscripts.hpp
index bd8d879031..7839580090 100644
--- a/apps/openmw/mwscript/globalscripts.hpp
+++ b/apps/openmw/mwscript/globalscripts.hpp
@@ -1,14 +1,14 @@
 #ifndef GAME_SCRIPT_GLOBALSCRIPTS_H
 #define GAME_SCRIPT_GLOBALSCRIPTS_H
 
-#include <string>
-#include <string_view>
+#include <cstdint>
 #include <map>
 #include <memory>
+#include <string>
+#include <string_view>
 #include <unordered_map>
 #include <utility>
 #include <variant>
-#include <cstdint>
 
 #include <components/misc/algorithm.hpp>
 
@@ -52,44 +52,45 @@ namespace MWScript
 
     class GlobalScripts
     {
-            const MWWorld::ESMStore& mStore;
-            std::unordered_map<std::string, std::shared_ptr<GlobalScriptDesc>, ::Misc::StringUtils::CiHash, ::Misc::StringUtils::CiEqual> mScripts;
-
-        public:
+        const MWWorld::ESMStore& mStore;
+        std::unordered_map<std::string, std::shared_ptr<GlobalScriptDesc>, ::Misc::StringUtils::CiHash,
+            ::Misc::StringUtils::CiEqual>
+            mScripts;
 
-            GlobalScripts (const MWWorld::ESMStore& store);
+    public:
+        GlobalScripts(const MWWorld::ESMStore& store);
 
-            void addScript(std::string_view name, const MWWorld::Ptr& target = MWWorld::Ptr());
+        void addScript(std::string_view name, const MWWorld::Ptr& target = MWWorld::Ptr());
 
-            void removeScript (std::string_view name);
+        void removeScript(std::string_view name);
 
-            bool isRunning (std::string_view name) const;
+        bool isRunning(std::string_view name) const;
 
-            void run();
-            ///< run all active global scripts
+        void run();
+        ///< run all active global scripts
 
-            void clear();
+        void clear();
 
-            void addStartup();
-            ///< Add startup script
+        void addStartup();
+        ///< Add startup script
 
-            int countSavedGameRecords() const;
+        int countSavedGameRecords() const;
 
-            void write (ESM::ESMWriter& writer, Loading::Listener& progress) const;
+        void write(ESM::ESMWriter& writer, Loading::Listener& progress) const;
 
-            bool readRecord (ESM::ESMReader& reader, uint32_t type, const std::map<int, int>& contentFileMap);
-            ///< Records for variables that do not exist are dropped silently.
-            ///
-            /// \return Known type?
+        bool readRecord(ESM::ESMReader& reader, uint32_t type, const std::map<int, int>& contentFileMap);
+        ///< Records for variables that do not exist are dropped silently.
+        ///
+        /// \return Known type?
 
-            Locals& getLocals(std::string_view name);
-            ///< If the script \a name has not been added as a global script yet, it is added
-            /// automatically, but is not set to running state.
+        Locals& getLocals(std::string_view name);
+        ///< If the script \a name has not been added as a global script yet, it is added
+        /// automatically, but is not set to running state.
 
-            const Locals* getLocalsIfPresent(std::string_view name) const;
+        const Locals* getLocalsIfPresent(std::string_view name) const;
 
-            void updatePtrs(const MWWorld::Ptr& base, const MWWorld::Ptr& updated);
-            ///< Update the Ptrs stored in mTarget. Should be called after the reference has been moved to a new cell.
+        void updatePtrs(const MWWorld::Ptr& base, const MWWorld::Ptr& updated);
+        ///< Update the Ptrs stored in mTarget. Should be called after the reference has been moved to a new cell.
     };
 }
 
diff --git a/apps/openmw/mwscript/guiextensions.cpp b/apps/openmw/mwscript/guiextensions.cpp
index 36669f34ac..d183d45915 100644
--- a/apps/openmw/mwscript/guiextensions.cpp
+++ b/apps/openmw/mwscript/guiextensions.cpp
@@ -3,15 +3,15 @@
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>
-#include <components/interpreter/runtime.hpp>
 #include <components/interpreter/opcodes.hpp>
+#include <components/interpreter/runtime.hpp>
 
 #include "../mwworld/esmstore.hpp"
 
 #include "../mwbase/environment.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 
@@ -24,106 +24,105 @@ namespace MWScript
     {
         class OpEnableWindow : public Interpreter::Opcode0
         {
-                MWGui::GuiWindow mWindow;
-
-            public:
+            MWGui::GuiWindow mWindow;
 
-                OpEnableWindow (MWGui::GuiWindow window) : mWindow (window) {}
+        public:
+            OpEnableWindow(MWGui::GuiWindow window)
+                : mWindow(window)
+            {
+            }
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWBase::Environment::get().getWindowManager()->allow (mWindow);
-                }
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWBase::Environment::get().getWindowManager()->allow(mWindow);
+            }
         };
 
         class OpEnableRest : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWBase::Environment::get().getWindowManager()->enableRest();
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWBase::Environment::get().getWindowManager()->enableRest();
+            }
         };
 
         template <class R>
         class OpShowRestMenu : public Interpreter::Opcode0
         {
         public:
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 MWWorld::Ptr bed = R()(runtime, false);
 
-                if (bed.isEmpty() || !MWBase::Environment::get().getMechanicsManager()->sleepInBed(MWMechanics::getPlayer(),
-                                                                             bed))
+                if (bed.isEmpty()
+                    || !MWBase::Environment::get().getMechanicsManager()->sleepInBed(MWMechanics::getPlayer(), bed))
                     MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Rest, bed);
             }
         };
 
         class OpShowDialogue : public Interpreter::Opcode0
         {
-                MWGui::GuiMode mDialogue;
+            MWGui::GuiMode mDialogue;
 
-            public:
-
-                OpShowDialogue (MWGui::GuiMode dialogue)
-                : mDialogue (dialogue)
-                {}
+        public:
+            OpShowDialogue(MWGui::GuiMode dialogue)
+                : mDialogue(dialogue)
+            {
+            }
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWBase::Environment::get().getWindowManager()->pushGuiMode(mDialogue);
-                }
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWBase::Environment::get().getWindowManager()->pushGuiMode(mDialogue);
+            }
         };
 
         class OpGetButtonPressed : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    runtime.push (MWBase::Environment::get().getWindowManager()->readPressedButton());
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                runtime.push(MWBase::Environment::get().getWindowManager()->readPressedButton());
+            }
         };
 
         class OpToggleFogOfWar : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    runtime.getContext().report(MWBase::Environment::get().getWindowManager()->toggleFogOfWar() ? "Fog of war -> On"
-                                                                                                                : "Fog of war -> Off");
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                runtime.getContext().report(MWBase::Environment::get().getWindowManager()->toggleFogOfWar()
+                        ? "Fog of war -> On"
+                        : "Fog of war -> Off");
+            }
         };
 
         class OpToggleFullHelp : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    runtime.getContext().report(MWBase::Environment::get().getWindowManager()->toggleFullHelp() ? "Full help -> On"
-                                                                                                                : "Full help -> Off");
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                runtime.getContext().report(MWBase::Environment::get().getWindowManager()->toggleFullHelp()
+                        ? "Full help -> On"
+                        : "Full help -> Off");
+            }
         };
 
         class OpShowMap : public Interpreter::Opcode0
         {
         public:
-
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 std::string_view cell = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
 
-                // "Will match complete or partial cells, so ShowMap, "Vivec" will show cells Vivec and Vivec, Fred's House as well."
-                // http://www.uesp.net/wiki/Tes3Mod:ShowMap
+                // "Will match complete or partial cells, so ShowMap, "Vivec" will show cells Vivec and Vivec, Fred's
+                // House as well." http://www.uesp.net/wiki/Tes3Mod:ShowMap
 
-                const MWWorld::Store<ESM::Cell> &cells =
-                    MWBase::Environment::get().getWorld()->getStore().get<ESM::Cell>();
+                const MWWorld::Store<ESM::Cell>& cells
+                    = MWBase::Environment::get().getWorld()->getStore().get<ESM::Cell>();
 
-                MWBase::WindowManager *winMgr = MWBase::Environment::get().getWindowManager();
+                MWBase::WindowManager* winMgr = MWBase::Environment::get().getWindowManager();
 
                 for (auto it = cells.extBegin(); it != cells.extEnd(); ++it)
                 {
@@ -136,21 +135,17 @@ namespace MWScript
         class OpFillMap : public Interpreter::Opcode0
         {
         public:
-
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
-                const MWWorld::Store<ESM::Cell> &cells =
-                    MWBase::Environment::get().getWorld ()->getStore().get<ESM::Cell>();
+                const MWWorld::Store<ESM::Cell>& cells
+                    = MWBase::Environment::get().getWorld()->getStore().get<ESM::Cell>();
 
                 for (auto it = cells.extBegin(); it != cells.extEnd(); ++it)
                 {
                     const std::string& name = it->mName;
                     if (!name.empty())
-                        MWBase::Environment::get().getWindowManager()->addVisitedLocation (
-                            name,
-                            it->getGridX(),
-                            it->getGridY()
-                        );
+                        MWBase::Environment::get().getWindowManager()->addVisitedLocation(
+                            name, it->getGridX(), it->getGridY());
                 }
             }
         };
@@ -158,22 +153,20 @@ namespace MWScript
         class OpMenuTest : public Interpreter::Opcode1
         {
         public:
-
-            void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
             {
-                int arg=0;
-                if(arg0>0)
+                int arg = 0;
+                if (arg0 > 0)
                 {
                     arg = runtime[0].mInteger;
                     runtime.pop();
                 }
 
-
                 if (arg == 0)
                 {
                     MWGui::GuiMode modes[] = { MWGui::GM_Inventory, MWGui::GM_Container };
 
-                    for (int i=0; i<2; ++i)
+                    for (int i = 0; i < 2; ++i)
                     {
                         if (MWBase::Environment::get().getWindowManager()->containsMode(modes[i]))
                             MWBase::Environment::get().getWindowManager()->removeGuiMode(modes[i]);
@@ -199,20 +192,21 @@ namespace MWScript
         class OpToggleMenus : public Interpreter::Opcode0
         {
         public:
-            void execute(Interpreter::Runtime &runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 bool state = MWBase::Environment::get().getWindowManager()->toggleHud();
                 runtime.getContext().report(state ? "GUI -> On" : "GUI -> Off");
 
                 if (!state)
                 {
-                    while (MWBase::Environment::get().getWindowManager()->getMode() != MWGui::GM_None) // don't use isGuiMode, or we get an infinite loop for modal message boxes!
+                    while (MWBase::Environment::get().getWindowManager()->getMode()
+                        != MWGui::GM_None) // don't use isGuiMode, or we get an infinite loop for modal message boxes!
                         MWBase::Environment::get().getWindowManager()->popGuiMode();
                 }
             }
         };
 
-        void installOpcodes (Interpreter::Interpreter& interpreter)
+        void installOpcodes(Interpreter::Interpreter& interpreter)
         {
             interpreter.installSegment5<OpShowDialogue>(Compiler::Gui::opcodeEnableBirthMenu, MWGui::GM_Birth);
             interpreter.installSegment5<OpShowDialogue>(Compiler::Gui::opcodeEnableClassMenu, MWGui::GM_Class);
diff --git a/apps/openmw/mwscript/guiextensions.hpp b/apps/openmw/mwscript/guiextensions.hpp
index ec775a51c9..b44f954d6e 100644
--- a/apps/openmw/mwscript/guiextensions.hpp
+++ b/apps/openmw/mwscript/guiextensions.hpp
@@ -15,10 +15,9 @@ namespace MWScript
 {
     /// \brief GUI-related script functionality
     namespace Gui
-    {        
-        void installOpcodes (Interpreter::Interpreter& interpreter);
+    {
+        void installOpcodes(Interpreter::Interpreter& interpreter);
     }
 }
 
 #endif
-
diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index 0ca1443656..30eae77529 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -9,21 +9,21 @@
 #include "../mwworld/esmstore.hpp"
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-#include "../mwbase/scriptmanager.hpp"
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/inputmanager.hpp"
 #include "../mwbase/luamanager.hpp"
+#include "../mwbase/scriptmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/action.hpp"
-#include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
 
 #include "../mwmechanics/npcstats.hpp"
 
-#include "locals.hpp"
 #include "globalscripts.hpp"
+#include "locals.hpp"
 
 namespace MWScript
 {
@@ -31,7 +31,7 @@ namespace MWScript
     {
         if (!id.empty())
         {
-            return MWBase::Environment::get().getWorld()->getPtr (id, activeOnly);
+            return MWBase::Environment::get().getWorld()->getPtr(id, activeOnly);
         }
         else
         {
@@ -45,22 +45,19 @@ namespace MWScript
         }
     }
 
-    const Locals& InterpreterContext::getMemberLocals(std::string_view& id, bool global)
-        const
+    const Locals& InterpreterContext::getMemberLocals(std::string_view& id, bool global) const
     {
         if (global)
         {
-            return MWBase::Environment::get().getScriptManager()->getGlobalScripts().
-                getLocals (id);
+            return MWBase::Environment::get().getScriptManager()->getGlobalScripts().getLocals(id);
         }
         else
         {
-            const MWWorld::Ptr ptr = getReferenceImp (id, false);
+            const MWWorld::Ptr ptr = getReferenceImp(id, false);
 
-            id = ptr.getClass().getScript (ptr);
+            id = ptr.getClass().getScript(ptr);
 
-            ptr.getRefData().setLocals (
-                *MWBase::Environment::get().getWorld()->getStore().get<ESM::Script>().find (id));
+            ptr.getRefData().setLocals(*MWBase::Environment::get().getWorld()->getStore().get<ESM::Script>().find(id));
 
             return ptr.getRefData().getLocals();
         }
@@ -70,30 +67,30 @@ namespace MWScript
     {
         if (global)
         {
-            return MWBase::Environment::get().getScriptManager()->getGlobalScripts().
-                getLocals (id);
+            return MWBase::Environment::get().getScriptManager()->getGlobalScripts().getLocals(id);
         }
         else
         {
-            const MWWorld::Ptr ptr = getReferenceImp (id, false);
+            const MWWorld::Ptr ptr = getReferenceImp(id, false);
 
-            id = ptr.getClass().getScript (ptr);
+            id = ptr.getClass().getScript(ptr);
 
-            ptr.getRefData().setLocals (
-                *MWBase::Environment::get().getWorld()->getStore().get<ESM::Script>().find (id));
+            ptr.getRefData().setLocals(*MWBase::Environment::get().getWorld()->getStore().get<ESM::Script>().find(id));
 
             return ptr.getRefData().getLocals();
         }
     }
 
-    MissingImplicitRefError::MissingImplicitRefError() : std::runtime_error("no implicit reference") {}
+    MissingImplicitRefError::MissingImplicitRefError()
+        : std::runtime_error("no implicit reference")
+    {
+    }
 
     int InterpreterContext::findLocalVariableIndex(std::string_view scriptId, std::string_view name, char type) const
     {
-        int index = MWBase::Environment::get().getScriptManager()->getLocals (scriptId).
-            searchIndex (type, name);
+        int index = MWBase::Environment::get().getScriptManager()->getLocals(scriptId).searchIndex(type, name);
 
-        if (index!=-1)
+        if (index != -1)
             return index;
 
         std::ostringstream stream;
@@ -102,22 +99,30 @@ namespace MWScript
 
         switch (type)
         {
-            case 's': stream << "short"; break;
-            case 'l': stream << "long"; break;
-            case 'f': stream << "float"; break;
+            case 's':
+                stream << "short";
+                break;
+            case 'l':
+                stream << "long";
+                break;
+            case 'f':
+                stream << "float";
+                break;
         }
 
         stream << " member variable " << name << " in script " << scriptId;
 
-        throw std::runtime_error (stream.str().c_str());
+        throw std::runtime_error(stream.str().c_str());
     }
 
-    InterpreterContext::InterpreterContext (MWScript::Locals *locals, const MWWorld::Ptr& reference)
-    : mLocals (locals), mReference (reference)
-    {}
+    InterpreterContext::InterpreterContext(MWScript::Locals* locals, const MWWorld::Ptr& reference)
+        : mLocals(locals)
+        , mReference(reference)
+    {
+    }
 
-    InterpreterContext::InterpreterContext (std::shared_ptr<GlobalScriptDesc> globalScriptDesc)
-    : mLocals (&(globalScriptDesc->mLocals))
+    InterpreterContext::InterpreterContext(std::shared_ptr<GlobalScriptDesc> globalScriptDesc)
+        : mLocals(&(globalScriptDesc->mLocals))
     {
         const MWWorld::Ptr* ptr = globalScriptDesc->getPtrIfPresent();
         // A nullptr here signifies that the script's target has not yet been resolved after loading the game.
@@ -131,109 +136,106 @@ namespace MWScript
 
     std::string_view InterpreterContext::getTarget() const
     {
-        if(!mReference.isEmpty())
+        if (!mReference.isEmpty())
             return mReference.mRef->mRef.getRefId();
-        else if(mGlobalScriptDesc)
+        else if (mGlobalScriptDesc)
             return mGlobalScriptDesc->getId();
         return {};
     }
 
-    int InterpreterContext::getLocalShort (int index) const
+    int InterpreterContext::getLocalShort(int index) const
     {
         if (!mLocals)
-            throw std::runtime_error ("local variables not available in this context");
+            throw std::runtime_error("local variables not available in this context");
 
-        return mLocals->mShorts.at (index);
+        return mLocals->mShorts.at(index);
     }
 
-    int InterpreterContext::getLocalLong (int index) const
+    int InterpreterContext::getLocalLong(int index) const
     {
         if (!mLocals)
-            throw std::runtime_error ("local variables not available in this context");
+            throw std::runtime_error("local variables not available in this context");
 
-        return mLocals->mLongs.at (index);
+        return mLocals->mLongs.at(index);
     }
 
-    float InterpreterContext::getLocalFloat (int index) const
+    float InterpreterContext::getLocalFloat(int index) const
     {
         if (!mLocals)
-            throw std::runtime_error ("local variables not available in this context");
+            throw std::runtime_error("local variables not available in this context");
 
-        return mLocals->mFloats.at (index);
+        return mLocals->mFloats.at(index);
     }
 
-    void InterpreterContext::setLocalShort (int index, int value)
+    void InterpreterContext::setLocalShort(int index, int value)
     {
         if (!mLocals)
-            throw std::runtime_error ("local variables not available in this context");
+            throw std::runtime_error("local variables not available in this context");
 
-        mLocals->mShorts.at (index) = value;
+        mLocals->mShorts.at(index) = value;
     }
 
-    void InterpreterContext::setLocalLong (int index, int value)
+    void InterpreterContext::setLocalLong(int index, int value)
     {
         if (!mLocals)
-            throw std::runtime_error ("local variables not available in this context");
+            throw std::runtime_error("local variables not available in this context");
 
-        mLocals->mLongs.at (index) = value;
+        mLocals->mLongs.at(index) = value;
     }
 
-    void InterpreterContext::setLocalFloat (int index, float value)
+    void InterpreterContext::setLocalFloat(int index, float value)
     {
         if (!mLocals)
-            throw std::runtime_error ("local variables not available in this context");
+            throw std::runtime_error("local variables not available in this context");
 
-        mLocals->mFloats.at (index) = value;
+        mLocals->mFloats.at(index) = value;
     }
 
-    void InterpreterContext::messageBox(std::string_view message,
-        const std::vector<std::string>& buttons)
+    void InterpreterContext::messageBox(std::string_view message, const std::vector<std::string>& buttons)
     {
         if (buttons.empty())
-            MWBase::Environment::get().getWindowManager()->messageBox (message);
+            MWBase::Environment::get().getWindowManager()->messageBox(message);
         else
             MWBase::Environment::get().getWindowManager()->interactiveMessageBox(message, buttons);
     }
 
-    void InterpreterContext::report (const std::string& message)
-    {
-    }
+    void InterpreterContext::report(const std::string& message) {}
 
     int InterpreterContext::getGlobalShort(std::string_view name) const
     {
-        return MWBase::Environment::get().getWorld()->getGlobalInt (name);
+        return MWBase::Environment::get().getWorld()->getGlobalInt(name);
     }
 
     int InterpreterContext::getGlobalLong(std::string_view name) const
     {
         // a global long is internally a float.
-        return MWBase::Environment::get().getWorld()->getGlobalInt (name);
+        return MWBase::Environment::get().getWorld()->getGlobalInt(name);
     }
 
     float InterpreterContext::getGlobalFloat(std::string_view name) const
     {
-        return MWBase::Environment::get().getWorld()->getGlobalFloat (name);
+        return MWBase::Environment::get().getWorld()->getGlobalFloat(name);
     }
 
     void InterpreterContext::setGlobalShort(std::string_view name, int value)
     {
-        MWBase::Environment::get().getWorld()->setGlobalInt (name, value);
+        MWBase::Environment::get().getWorld()->setGlobalInt(name, value);
     }
 
     void InterpreterContext::setGlobalLong(std::string_view name, int value)
     {
-        MWBase::Environment::get().getWorld()->setGlobalInt (name, value);
+        MWBase::Environment::get().getWorld()->setGlobalInt(name, value);
     }
 
     void InterpreterContext::setGlobalFloat(std::string_view name, float value)
     {
-        MWBase::Environment::get().getWorld()->setGlobalFloat (name, value);
+        MWBase::Environment::get().getWorld()->setGlobalFloat(name, value);
     }
 
     std::vector<std::string> InterpreterContext::getGlobals() const
     {
-        const MWWorld::Store<ESM::Global>& globals =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Global>();
+        const MWWorld::Store<ESM::Global>& globals
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Global>();
 
         std::vector<std::string> ids;
         for (const auto& globalVariable : globals)
@@ -246,7 +248,7 @@ namespace MWScript
 
     char InterpreterContext::getGlobalType(std::string_view name) const
     {
-        MWBase::World *world = MWBase::Environment::get().getWorld();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
         return world->getGlobalVariableType(name);
     }
 
@@ -257,12 +259,12 @@ namespace MWScript
         for (const int action : actions)
         {
             std::string_view desc = input->getActionDescription(action);
-            if(desc.empty())
+            if (desc.empty())
                 continue;
 
-            if(desc == targetAction)
+            if (desc == targetAction)
             {
-                if(input->joystickLastUsed())
+                if (input->joystickLastUsed())
                     return input->getActionControllerBindingName(action);
                 else
                     return input->getActionKeyBindingName(action);
@@ -295,14 +297,16 @@ namespace MWScript
     std::string_view InterpreterContext::getNPCClass() const
     {
         const ESM::NPC* npc = getReferenceImp().get<ESM::NPC>()->mBase;
-        const ESM::Class* class_ = MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find(npc->mClass);
+        const ESM::Class* class_
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find(npc->mClass);
         return class_->mName;
     }
 
     std::string_view InterpreterContext::getNPCFaction() const
     {
         const ESM::NPC* npc = getReferenceImp().get<ESM::NPC>()->mBase;
-        const ESM::Faction* faction = MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(npc->mFaction);
+        const ESM::Faction* faction
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(npc->mFaction);
         return faction->mName;
     }
 
@@ -317,42 +321,42 @@ namespace MWScript
         if (rank < 0 || rank > 9)
             throw std::runtime_error("getNPCRank(): invalid rank");
 
-        MWBase::World *world = MWBase::Environment::get().getWorld();
-        const MWWorld::ESMStore &store = world->getStore();
-        const ESM::Faction *fact = store.get<ESM::Faction>().find(faction);
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+        const MWWorld::ESMStore& store = world->getStore();
+        const ESM::Faction* fact = store.get<ESM::Faction>().find(faction);
         return fact->mRanks[rank];
     }
 
     std::string_view InterpreterContext::getPCName() const
     {
-        MWBase::World *world = MWBase::Environment::get().getWorld();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
         return world->getPlayerPtr().get<ESM::NPC>()->mBase->mName;
     }
 
     std::string_view InterpreterContext::getPCRace() const
     {
-        MWBase::World *world = MWBase::Environment::get().getWorld();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
         const std::string& race = world->getPlayerPtr().get<ESM::NPC>()->mBase->mRace;
         return world->getStore().get<ESM::Race>().find(race)->mName;
     }
 
     std::string_view InterpreterContext::getPCClass() const
     {
-        MWBase::World *world = MWBase::Environment::get().getWorld();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
         const std::string& class_ = world->getPlayerPtr().get<ESM::NPC>()->mBase->mClass;
         return world->getStore().get<ESM::Class>().find(class_)->mName;
     }
 
     std::string_view InterpreterContext::getPCRank() const
     {
-        MWBase::World *world = MWBase::Environment::get().getWorld();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
         MWWorld::Ptr player = world->getPlayerPtr();
 
         std::string_view factionId = getReferenceImp().getClass().getPrimaryFaction(getReferenceImp());
         if (factionId.empty())
             throw std::runtime_error("getPCRank(): NPC is not in a faction");
 
-        const std::map<std::string, int>& ranks = player.getClass().getNpcStats (player).getFactionRanks();
+        const std::map<std::string, int>& ranks = player.getClass().getNpcStats(player).getFactionRanks();
         std::map<std::string, int>::const_iterator it = ranks.find(Misc::StringUtils::lowerCase(factionId));
         int rank = -1;
         if (it != ranks.end())
@@ -363,10 +367,10 @@ namespace MWScript
         if (rank == -1)
             rank = 0;
 
-        const MWWorld::ESMStore &store = world->getStore();
-        const ESM::Faction *faction = store.get<ESM::Faction>().find(factionId);
+        const MWWorld::ESMStore& store = world->getStore();
+        const ESM::Faction* faction = store.get<ESM::Faction>().find(factionId);
 
-        if(rank < 0 || rank > 9) // there are only 10 ranks
+        if (rank < 0 || rank > 9) // there are only 10 ranks
             return {};
 
         return faction->mRanks[rank];
@@ -374,14 +378,14 @@ namespace MWScript
 
     std::string_view InterpreterContext::getPCNextRank() const
     {
-        MWBase::World *world = MWBase::Environment::get().getWorld();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
         MWWorld::Ptr player = world->getPlayerPtr();
 
         std::string_view factionId = getReferenceImp().getClass().getPrimaryFaction(getReferenceImp());
         if (factionId.empty())
             throw std::runtime_error("getPCNextRank(): NPC is not in a faction");
 
-        const std::map<std::string, int>& ranks = player.getClass().getNpcStats (player).getFactionRanks();
+        const std::map<std::string, int>& ranks = player.getClass().getNpcStats(player).getFactionRanks();
         std::map<std::string, int>::const_iterator it = ranks.find(Misc::StringUtils::lowerCase(factionId));
         int rank = -1;
         if (it != ranks.end())
@@ -393,10 +397,10 @@ namespace MWScript
         if (rank > 9)
             rank = 9;
 
-        const MWWorld::ESMStore &store = world->getStore();
-        const ESM::Faction *faction = store.get<ESM::Faction>().find(factionId);
+        const MWWorld::ESMStore& store = world->getStore();
+        const ESM::Faction* faction = store.get<ESM::Faction>().find(factionId);
 
-        if(rank < 0)
+        if (rank < 0)
             return {};
 
         return faction->mRanks[rank];
@@ -404,9 +408,9 @@ namespace MWScript
 
     int InterpreterContext::getPCBounty() const
     {
-        MWBase::World *world = MWBase::Environment::get().getWorld();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
         MWWorld::Ptr player = world->getPlayerPtr();
-        return player.getClass().getNpcStats (player).getBounty();
+        return player.getClass().getNpcStats(player).getBounty();
     }
 
     std::string_view InterpreterContext::getCurrentCellName() const
@@ -418,39 +422,35 @@ namespace MWScript
     {
         MWBase::Environment::get().getLuaManager()->objectActivated(ptr, actor);
         std::unique_ptr<MWWorld::Action> action = (ptr.getClass().activate(ptr, actor));
-        action->execute (actor);
+        action->execute(actor);
         if (action->getTarget() != MWWorld::Ptr() && action->getTarget() != ptr)
         {
             updatePtr(ptr, action->getTarget());
         }
     }
 
-    int InterpreterContext::getMemberShort(std::string_view id, std::string_view name,
-        bool global) const
+    int InterpreterContext::getMemberShort(std::string_view id, std::string_view name, bool global) const
     {
         const Locals& locals = getMemberLocals(id, global);
 
         return locals.mShorts[findLocalVariableIndex(id, name, 's')];
     }
 
-    int InterpreterContext::getMemberLong(std::string_view id, std::string_view name,
-        bool global) const
+    int InterpreterContext::getMemberLong(std::string_view id, std::string_view name, bool global) const
     {
         const Locals& locals = getMemberLocals(id, global);
 
         return locals.mLongs[findLocalVariableIndex(id, name, 'l')];
     }
 
-    float InterpreterContext::getMemberFloat(std::string_view id, std::string_view name,
-        bool global) const
+    float InterpreterContext::getMemberFloat(std::string_view id, std::string_view name, bool global) const
     {
         const Locals& locals = getMemberLocals(id, global);
 
         return locals.mFloats[findLocalVariableIndex(id, name, 'f')];
     }
 
-    void InterpreterContext::setMemberShort(std::string_view id, std::string_view name,
-        int value, bool global)
+    void InterpreterContext::setMemberShort(std::string_view id, std::string_view name, int value, bool global)
     {
         Locals& locals = getMemberLocals(id, global);
 
diff --git a/apps/openmw/mwscript/interpretercontext.hpp b/apps/openmw/mwscript/interpretercontext.hpp
index d36671a7d2..89b8f626c0 100644
--- a/apps/openmw/mwscript/interpretercontext.hpp
+++ b/apps/openmw/mwscript/interpretercontext.hpp
@@ -16,119 +16,120 @@ namespace MWScript
 
     class MissingImplicitRefError : public std::runtime_error
     {
-        public:
-            MissingImplicitRefError();
+    public:
+        MissingImplicitRefError();
     };
 
     class InterpreterContext : public Interpreter::Context
     {
-            Locals *mLocals;
-            mutable MWWorld::Ptr mReference;
-            std::shared_ptr<GlobalScriptDesc> mGlobalScriptDesc;
+        Locals* mLocals;
+        mutable MWWorld::Ptr mReference;
+        std::shared_ptr<GlobalScriptDesc> mGlobalScriptDesc;
 
-            /// If \a id is empty, a reference the script is run from is returned or in case
-            /// of a non-local script the reference derived from the target ID.
-            const MWWorld::Ptr getReferenceImp(std::string_view id = {}, bool activeOnly = false, bool doThrow = true) const;
+        /// If \a id is empty, a reference the script is run from is returned or in case
+        /// of a non-local script the reference derived from the target ID.
+        const MWWorld::Ptr getReferenceImp(
+            std::string_view id = {}, bool activeOnly = false, bool doThrow = true) const;
 
-            const Locals& getMemberLocals(std::string_view& id, bool global) const;
-            ///< \a id is changed to the respective script ID, if \a id wasn't a script ID before
+        const Locals& getMemberLocals(std::string_view& id, bool global) const;
+        ///< \a id is changed to the respective script ID, if \a id wasn't a script ID before
 
-            Locals& getMemberLocals(std::string_view& id, bool global);
-            ///< \a id is changed to the respective script ID, if \a id wasn't a script ID before
+        Locals& getMemberLocals(std::string_view& id, bool global);
+        ///< \a id is changed to the respective script ID, if \a id wasn't a script ID before
 
-            /// Throws an exception if local variable can't be found.
-            int findLocalVariableIndex(std::string_view scriptId, std::string_view name, char type) const;
+        /// Throws an exception if local variable can't be found.
+        int findLocalVariableIndex(std::string_view scriptId, std::string_view name, char type) const;
 
-        public:
-            InterpreterContext (std::shared_ptr<GlobalScriptDesc> globalScriptDesc);
+    public:
+        InterpreterContext(std::shared_ptr<GlobalScriptDesc> globalScriptDesc);
 
-            InterpreterContext (MWScript::Locals *locals, const MWWorld::Ptr& reference);
-            ///< The ownership of \a locals is not transferred. 0-pointer allowed.
+        InterpreterContext(MWScript::Locals* locals, const MWWorld::Ptr& reference);
+        ///< The ownership of \a locals is not transferred. 0-pointer allowed.
 
-            std::string_view getTarget() const override;
+        std::string_view getTarget() const override;
 
-            int getLocalShort (int index) const override;
+        int getLocalShort(int index) const override;
 
-            int getLocalLong (int index) const override;
+        int getLocalLong(int index) const override;
 
-            float getLocalFloat (int index) const override;
+        float getLocalFloat(int index) const override;
 
-            void setLocalShort (int index, int value) override;
+        void setLocalShort(int index, int value) override;
 
-            void setLocalLong (int index, int value) override;
+        void setLocalLong(int index, int value) override;
 
-            void setLocalFloat (int index, float value) override;
+        void setLocalFloat(int index, float value) override;
 
-            using Interpreter::Context::messageBox;
+        using Interpreter::Context::messageBox;
 
-            void messageBox(std::string_view message,
-                const std::vector<std::string>& buttons) override;
+        void messageBox(std::string_view message, const std::vector<std::string>& buttons) override;
 
-            void report (const std::string& message) override;
-            ///< By default, do nothing.
+        void report(const std::string& message) override;
+        ///< By default, do nothing.
 
-            int getGlobalShort(std::string_view name) const override;
+        int getGlobalShort(std::string_view name) const override;
 
-            int getGlobalLong(std::string_view name) const override;
+        int getGlobalLong(std::string_view name) const override;
 
-            float getGlobalFloat(std::string_view name) const override;
+        float getGlobalFloat(std::string_view name) const override;
 
-            void setGlobalShort(std::string_view name, int value) override;
+        void setGlobalShort(std::string_view name, int value) override;
 
-            void setGlobalLong(std::string_view name, int value) override;
+        void setGlobalLong(std::string_view name, int value) override;
 
-            void setGlobalFloat(std::string_view name, float value) override;
+        void setGlobalFloat(std::string_view name, float value) override;
 
-            std::vector<std::string> getGlobals () const override;
+        std::vector<std::string> getGlobals() const override;
 
-            char getGlobalType(std::string_view name) const override;
+        char getGlobalType(std::string_view name) const override;
 
-            std::string getActionBinding(std::string_view action) const override;
+        std::string getActionBinding(std::string_view action) const override;
 
-            std::string_view getActorName() const override;
+        std::string_view getActorName() const override;
 
-            std::string_view getNPCRace() const override;
+        std::string_view getNPCRace() const override;
 
-            std::string_view getNPCClass() const override;
+        std::string_view getNPCClass() const override;
 
-            std::string_view getNPCFaction() const override;
+        std::string_view getNPCFaction() const override;
 
-            std::string_view getNPCRank() const override;
+        std::string_view getNPCRank() const override;
 
-            std::string_view getPCName() const override;
+        std::string_view getPCName() const override;
 
-            std::string_view getPCRace() const override;
+        std::string_view getPCRace() const override;
 
-            std::string_view getPCClass() const override;
+        std::string_view getPCClass() const override;
 
-            std::string_view getPCRank() const override;
+        std::string_view getPCRank() const override;
 
-            std::string_view getPCNextRank() const override;
+        std::string_view getPCNextRank() const override;
 
-            int getPCBounty() const override;
+        int getPCBounty() const override;
 
-            std::string_view getCurrentCellName() const override;
+        std::string_view getCurrentCellName() const override;
 
-            void executeActivation(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor);
-            ///< Execute the activation action for this ptr. If ptr is mActivated, mark activation as handled.
+        void executeActivation(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor);
+        ///< Execute the activation action for this ptr. If ptr is mActivated, mark activation as handled.
 
-            int getMemberShort(std::string_view id, std::string_view name, bool global) const override;
+        int getMemberShort(std::string_view id, std::string_view name, bool global) const override;
 
-            int getMemberLong(std::string_view id, std::string_view name, bool global) const override;
+        int getMemberLong(std::string_view id, std::string_view name, bool global) const override;
 
-            float getMemberFloat(std::string_view id, std::string_view name, bool global) const override;
+        float getMemberFloat(std::string_view id, std::string_view name, bool global) const override;
 
-            void setMemberShort(std::string_view id, std::string_view name, int value, bool global) override;
+        void setMemberShort(std::string_view id, std::string_view name, int value, bool global) override;
 
-            void setMemberLong(std::string_view id, std::string_view name, int value, bool global) override;
+        void setMemberLong(std::string_view id, std::string_view name, int value, bool global) override;
 
-            void setMemberFloat(std::string_view id, std::string_view name, float value, bool global) override;
+        void setMemberFloat(std::string_view id, std::string_view name, float value, bool global) override;
 
-            MWWorld::Ptr getReference(bool required=true) const;
-            ///< Reference, that the script is running from (can be empty)
+        MWWorld::Ptr getReference(bool required = true) const;
+        ///< Reference, that the script is running from (can be empty)
 
-            void updatePtr(const MWWorld::Ptr& base, const MWWorld::Ptr& updated);
-            ///< Update the Ptr stored in mReference, if there is one stored there. Should be called after the reference has been moved to a new cell.
+        void updatePtr(const MWWorld::Ptr& base, const MWWorld::Ptr& updated);
+        ///< Update the Ptr stored in mReference, if there is one stored there. Should be called after the reference has
+        ///< been moved to a new cell.
     };
 }
 
diff --git a/apps/openmw/mwscript/locals.cpp b/apps/openmw/mwscript/locals.cpp
index 3fa91bf5e2..a89d1a3057 100644
--- a/apps/openmw/mwscript/locals.cpp
+++ b/apps/openmw/mwscript/locals.cpp
@@ -1,11 +1,11 @@
 #include "locals.hpp"
 #include "globalscripts.hpp"
 
+#include <components/compiler/locals.hpp>
+#include <components/debug/debuglog.hpp>
 #include <components/esm3/loadscpt.hpp>
-#include <components/esm3/variant.hpp>
 #include <components/esm3/locals.hpp>
-#include <components/debug/debuglog.hpp>
-#include <components/compiler/locals.hpp>
+#include <components/esm3/variant.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/scriptmanager.hpp"
@@ -19,22 +19,26 @@ namespace MWScript
     {
         if (!mInitialised)
         {
-            const ESM::Script *script = MWBase::Environment::get().getWorld()->getStore().
-                get<ESM::Script>().find (scriptName);
+            const ESM::Script* script
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::Script>().find(scriptName);
 
-            configure (*script);
+            configure(*script);
         }
     }
 
-    Locals::Locals() : mInitialised (false) {}
+    Locals::Locals()
+        : mInitialised(false)
+    {
+    }
 
-    bool Locals::configure (const ESM::Script& script)
+    bool Locals::configure(const ESM::Script& script)
     {
         if (mInitialised)
             return false;
 
-        const Locals* global = MWBase::Environment::get().getScriptManager()->getGlobalScripts().getLocalsIfPresent(script.mId);
-        if(global)
+        const Locals* global
+            = MWBase::Environment::get().getScriptManager()->getGlobalScripts().getLocalsIfPresent(script.mId);
+        if (global)
         {
             mShorts = global->mShorts;
             mLongs = global->mLongs;
@@ -42,15 +46,14 @@ namespace MWScript
         }
         else
         {
-            const Compiler::Locals& locals =
-                MWBase::Environment::get().getScriptManager()->getLocals (script.mId);
+            const Compiler::Locals& locals = MWBase::Environment::get().getScriptManager()->getLocals(script.mId);
 
             mShorts.clear();
-            mShorts.resize (locals.get ('s').size(), 0);
+            mShorts.resize(locals.get('s').size(), 0);
             mLongs.clear();
-            mLongs.resize (locals.get ('l').size(), 0);
+            mLongs.resize(locals.get('l').size(), 0);
             mFloats.clear();
-            mFloats.resize (locals.get ('f').size(), 0);
+            mFloats.resize(locals.get('f').size(), 0);
         }
 
         mInitialised = true;
@@ -64,30 +67,29 @@ namespace MWScript
 
     bool Locals::hasVar(std::string_view script, std::string_view var)
     {
-        ensure (script);
+        ensure(script);
 
-        const Compiler::Locals& locals =
-            MWBase::Environment::get().getScriptManager()->getLocals(script);
+        const Compiler::Locals& locals = MWBase::Environment::get().getScriptManager()->getLocals(script);
         int index = locals.getIndex(var);
         return (index != -1);
     }
 
     int Locals::getIntVar(std::string_view script, std::string_view var)
     {
-        ensure (script);
+        ensure(script);
 
         const Compiler::Locals& locals = MWBase::Environment::get().getScriptManager()->getLocals(script);
         int index = locals.getIndex(var);
         char type = locals.getType(var);
-        if(index != -1)
+        if (index != -1)
         {
-            switch(type)
+            switch (type)
             {
                 case 's':
-                    return mShorts.at (index);
+                    return mShorts.at(index);
 
                 case 'l':
-                    return mLongs.at (index);
+                    return mLongs.at(index);
 
                 case 'f':
                     return static_cast<int>(mFloats.at(index));
@@ -100,20 +102,20 @@ namespace MWScript
 
     float Locals::getFloatVar(std::string_view script, std::string_view var)
     {
-        ensure (script);
+        ensure(script);
 
         const Compiler::Locals& locals = MWBase::Environment::get().getScriptManager()->getLocals(script);
         int index = locals.getIndex(var);
         char type = locals.getType(var);
-        if(index != -1)
+        if (index != -1)
         {
-            switch(type)
+            switch (type)
             {
                 case 's':
-                    return mShorts.at (index);
+                    return mShorts.at(index);
 
                 case 'l':
-                    return mLongs.at (index);
+                    return mLongs.at(index);
 
                 case 'f':
                     return mFloats.at(index);
@@ -126,23 +128,26 @@ namespace MWScript
 
     bool Locals::setVarByInt(std::string_view script, std::string_view var, int val)
     {
-        ensure (script);
+        ensure(script);
 
         const Compiler::Locals& locals = MWBase::Environment::get().getScriptManager()->getLocals(script);
         int index = locals.getIndex(var);
         char type = locals.getType(var);
-        if(index != -1)
+        if (index != -1)
         {
-            switch(type)
+            switch (type)
             {
                 case 's':
-                    mShorts.at (index) = val; break;
+                    mShorts.at(index) = val;
+                    break;
 
                 case 'l':
-                    mLongs.at (index) = val; break;
+                    mLongs.at(index) = val;
+                    break;
 
                 case 'f':
-                    mFloats.at(index) = static_cast<float>(val); break;
+                    mFloats.at(index) = static_cast<float>(val);
+                    break;
             }
             return true;
         }
@@ -154,34 +159,48 @@ namespace MWScript
         if (!mInitialised)
             return false;
 
-        const Compiler::Locals& declarations =
-            MWBase::Environment::get().getScriptManager()->getLocals(script);
+        const Compiler::Locals& declarations = MWBase::Environment::get().getScriptManager()->getLocals(script);
 
-        for (int i=0; i<3; ++i)
+        for (int i = 0; i < 3; ++i)
         {
             char type = 0;
 
             switch (i)
             {
-                case 0: type = 's'; break;
-                case 1: type = 'l'; break;
-                case 2: type = 'f'; break;
+                case 0:
+                    type = 's';
+                    break;
+                case 1:
+                    type = 'l';
+                    break;
+                case 2:
+                    type = 'f';
+                    break;
             }
 
-            const std::vector<std::string>& names = declarations.get (type);
+            const std::vector<std::string>& names = declarations.get(type);
 
-            for (int i2=0; i2<static_cast<int> (names.size()); ++i2)
+            for (int i2 = 0; i2 < static_cast<int>(names.size()); ++i2)
             {
                 ESM::Variant value;
 
                 switch (i)
                 {
-                    case 0: value.setType (ESM::VT_Int); value.setInteger (mShorts.at (i2)); break;
-                    case 1: value.setType (ESM::VT_Int); value.setInteger (mLongs.at (i2)); break;
-                    case 2: value.setType (ESM::VT_Float); value.setFloat (mFloats.at (i2)); break;
+                    case 0:
+                        value.setType(ESM::VT_Int);
+                        value.setInteger(mShorts.at(i2));
+                        break;
+                    case 1:
+                        value.setType(ESM::VT_Int);
+                        value.setInteger(mLongs.at(i2));
+                        break;
+                    case 2:
+                        value.setType(ESM::VT_Float);
+                        value.setFloat(mFloats.at(i2));
+                        break;
                 }
 
-                locals.mVariables.emplace_back (names[i2], value);
+                locals.mVariables.emplace_back(names[i2], value);
             }
         }
 
@@ -190,13 +209,12 @@ namespace MWScript
 
     void Locals::read(const ESM::Locals& locals, std::string_view script)
     {
-        ensure (script);
+        ensure(script);
 
-        const Compiler::Locals& declarations =
-            MWBase::Environment::get().getScriptManager()->getLocals(script);
+        const Compiler::Locals& declarations = MWBase::Environment::get().getScriptManager()->getLocals(script);
 
         int index = 0, numshorts = 0, numlongs = 0;
-        for (unsigned int v=0; v<locals.mVariables.size();++v)
+        for (unsigned int v = 0; v < locals.mVariables.size(); ++v)
         {
             ESM::VarType type = locals.mVariables[v].second.getType();
             if (type == ESM::VT_Short)
@@ -205,16 +223,16 @@ namespace MWScript
                 ++numlongs;
         }
 
-        for (std::vector<std::pair<std::string, ESM::Variant> >::const_iterator iter
-            = locals.mVariables.begin(); iter!=locals.mVariables.end(); ++iter,++index)
+        for (std::vector<std::pair<std::string, ESM::Variant>>::const_iterator iter = locals.mVariables.begin();
+             iter != locals.mVariables.end(); ++iter, ++index)
         {
             if (iter->first.empty())
             {
                 // no variable names available (this will happen for legacy, i.e. ESS-imported savegames only)
                 try
                 {
-                    if (index >= numshorts+numlongs)
-                        mFloats.at(index - (numshorts+numlongs)) = iter->second.getFloat();
+                    if (index >= numshorts + numlongs)
+                        mFloats.at(index - (numshorts + numlongs)) = iter->second.getFloat();
                     else if (index >= numshorts)
                         mLongs.at(index - numshorts) = iter->second.getInteger();
                     else
@@ -222,16 +240,15 @@ namespace MWScript
                 }
                 catch (std::exception& e)
                 {
-                    Log(Debug::Error) << "Failed to read local variable state for script '"
-                                        << script << "' (legacy format): " << e.what()
-                                        << "\nNum shorts: " << numshorts << " / " << mShorts.size()
-                                        << " Num longs: " << numlongs << " / " << mLongs.size();
+                    Log(Debug::Error) << "Failed to read local variable state for script '" << script
+                                      << "' (legacy format): " << e.what() << "\nNum shorts: " << numshorts << " / "
+                                      << mShorts.size() << " Num longs: " << numlongs << " / " << mLongs.size();
                 }
             }
             else
             {
-                char type =  declarations.getType (iter->first);
-                int index2 = declarations.getIndex (iter->first);
+                char type = declarations.getType(iter->first);
+                int index2 = declarations.getIndex(iter->first);
 
                 // silently ignore locals that don't exist anymore
                 if (type == ' ' || index2 == -1)
@@ -241,9 +258,15 @@ namespace MWScript
                 {
                     switch (type)
                     {
-                        case 's': mShorts.at (index2) = iter->second.getInteger(); break;
-                        case 'l': mLongs.at (index2) = iter->second.getInteger(); break;
-                        case 'f': mFloats.at (index2) = iter->second.getFloat(); break;
+                        case 's':
+                            mShorts.at(index2) = iter->second.getInteger();
+                            break;
+                        case 'l':
+                            mLongs.at(index2) = iter->second.getInteger();
+                            break;
+                        case 'f':
+                            mFloats.at(index2) = iter->second.getFloat();
+                            break;
                     }
                 }
                 catch (...)
diff --git a/apps/openmw/mwscript/locals.hpp b/apps/openmw/mwscript/locals.hpp
index 3eac2c71e6..dfb8e32fac 100644
--- a/apps/openmw/mwscript/locals.hpp
+++ b/apps/openmw/mwscript/locals.hpp
@@ -17,55 +17,55 @@ namespace MWScript
 {
     class Locals
     {
-            bool mInitialised;
-
-            void ensure(std::string_view scriptName);
-
-        public:
-            std::vector<Interpreter::Type_Short> mShorts;
-            std::vector<Interpreter::Type_Integer> mLongs;
-            std::vector<Interpreter::Type_Float> mFloats;
-
-            Locals();
-
-            /// Are there any locals?
-            ///
-            /// \note Will return false, if locals have not been configured yet.
-            bool isEmpty() const;
-
-            /// \return Did the state of *this change from uninitialised to initialised?
-            bool configure (const ESM::Script& script);
-
-            /// @note var needs to be in lowercase
-            ///
-            /// \note Locals will be automatically configured first, if necessary
-            bool setVarByInt(std::string_view script, std::string_view var, int val);
-
-            /// \note Locals will be automatically configured first, if necessary
-            //
-            // \note If it can not be determined if the variable exists, the error will be
-            // ignored and false will be returned.
-            bool hasVar(std::string_view script, std::string_view var);
-
-            /// if var does not exist, returns 0
-            /// @note var needs to be in lowercase
-            ///
-            /// \note Locals will be automatically configured first, if necessary
-            int getIntVar(std::string_view script, std::string_view var);
-
-            /// if var does not exist, returns 0
-            /// @note var needs to be in lowercase
-            ///
-            /// \note Locals will be automatically configured first, if necessary
-            float getFloatVar(std::string_view script, std::string_view var);
-
-            /// \note If locals have not been configured yet, no data is written.
-            ///
-            /// \return Locals written?
-            bool write(ESM::Locals& locals, std::string_view script) const;
-
-            /// \note Locals will be automatically configured first, if necessary
-            void read(const ESM::Locals& locals, std::string_view script);
+        bool mInitialised;
+
+        void ensure(std::string_view scriptName);
+
+    public:
+        std::vector<Interpreter::Type_Short> mShorts;
+        std::vector<Interpreter::Type_Integer> mLongs;
+        std::vector<Interpreter::Type_Float> mFloats;
+
+        Locals();
+
+        /// Are there any locals?
+        ///
+        /// \note Will return false, if locals have not been configured yet.
+        bool isEmpty() const;
+
+        /// \return Did the state of *this change from uninitialised to initialised?
+        bool configure(const ESM::Script& script);
+
+        /// @note var needs to be in lowercase
+        ///
+        /// \note Locals will be automatically configured first, if necessary
+        bool setVarByInt(std::string_view script, std::string_view var, int val);
+
+        /// \note Locals will be automatically configured first, if necessary
+        //
+        // \note If it can not be determined if the variable exists, the error will be
+        // ignored and false will be returned.
+        bool hasVar(std::string_view script, std::string_view var);
+
+        /// if var does not exist, returns 0
+        /// @note var needs to be in lowercase
+        ///
+        /// \note Locals will be automatically configured first, if necessary
+        int getIntVar(std::string_view script, std::string_view var);
+
+        /// if var does not exist, returns 0
+        /// @note var needs to be in lowercase
+        ///
+        /// \note Locals will be automatically configured first, if necessary
+        float getFloatVar(std::string_view script, std::string_view var);
+
+        /// \note If locals have not been configured yet, no data is written.
+        ///
+        /// \return Locals written?
+        bool write(ESM::Locals& locals, std::string_view script) const;
+
+        /// \note Locals will be automatically configured first, if necessary
+        void read(const ESM::Locals& locals, std::string_view script);
     };
 }
 
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 2f2ce1b9b1..604fc06fe4 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -1,54 +1,54 @@
 #include "miscextensions.hpp"
 
+#include <chrono>
 #include <cstdlib>
 #include <iomanip>
-#include <chrono>
 #include <sstream>
 
 #include <components/compiler/extensions.hpp>
-#include <components/compiler/opcodes.hpp>
 #include <components/compiler/locals.hpp>
+#include <components/compiler/opcodes.hpp>
 
 #include <components/debug/debuglog.hpp>
 
 #include <components/interpreter/interpreter.hpp>
-#include <components/interpreter/runtime.hpp>
 #include <components/interpreter/opcodes.hpp>
+#include <components/interpreter/runtime.hpp>
 
-#include <components/misc/rng.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/misc/rng.hpp>
 
 #include <components/resource/resourcesystem.hpp>
 
-#include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadcrea.hpp>
-#include <components/esm3/loadlevlist.hpp>
 #include <components/esm3/loaddoor.hpp>
+#include <components/esm3/loadlevlist.hpp>
+#include <components/esm3/loadmgef.hpp>
 
-#include <components/vfs/manager.hpp>
 #include <components/files/conversion.hpp>
+#include <components/vfs/manager.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/luamanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/scriptmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwbase/luamanager.hpp"
 
+#include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
-#include "../mwworld/player.hpp"
 #include "../mwworld/containerstore.hpp"
-#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/esmstore.hpp"
-#include "../mwworld/cellstore.hpp"
+#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/manualref.hpp"
+#include "../mwworld/player.hpp"
 
+#include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/aicast.hpp"
-#include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/creaturestats.hpp"
+#include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/spellcasting.hpp"
-#include "../mwmechanics/actorutil.hpp"
 
 #include "../mwrender/animation.hpp"
 
@@ -97,121 +97,110 @@ namespace MWScript
     {
         class OpMenuMode : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    runtime.push (MWBase::Environment::get().getWindowManager()->isGuiMode());
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                runtime.push(MWBase::Environment::get().getWindowManager()->isGuiMode());
+            }
         };
 
         class OpRandom : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    Interpreter::Type_Integer limit = runtime[0].mInteger;
-                    runtime.pop();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                Interpreter::Type_Integer limit = runtime[0].mInteger;
+                runtime.pop();
 
-                    if (limit<0)
-                        throw std::runtime_error (
-                            "random: argument out of range (Don't be so negative!)");
+                if (limit < 0)
+                    throw std::runtime_error("random: argument out of range (Don't be so negative!)");
 
-                    auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-                    runtime.push (static_cast<Interpreter::Type_Float>(::Misc::Rng::rollDice(limit, prng))); // [o, limit)
-                }
+                auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+                runtime.push(static_cast<Interpreter::Type_Float>(::Misc::Rng::rollDice(limit, prng))); // [o, limit)
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpStartScript : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr target = R()(runtime, false);
-                    std::string_view name = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
-                    MWBase::Environment::get().getScriptManager()->getGlobalScripts().addScript (name, target);
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr target = R()(runtime, false);
+                std::string_view name = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
+                MWBase::Environment::get().getScriptManager()->getGlobalScripts().addScript(name, target);
+            }
         };
 
         class OpScriptRunning : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    std::string_view name = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
-                    runtime.push(MWBase::Environment::get().getScriptManager()->getGlobalScripts().isRunning (name));
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                std::string_view name = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
+                runtime.push(MWBase::Environment::get().getScriptManager()->getGlobalScripts().isRunning(name));
+            }
         };
 
         class OpStopScript : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    std::string_view name = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
-                    MWBase::Environment::get().getScriptManager()->getGlobalScripts().removeScript (name);
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                std::string_view name = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
+                MWBase::Environment::get().getScriptManager()->getGlobalScripts().removeScript(name);
+            }
         };
 
         class OpGetSecondsPassed : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    runtime.push (MWBase::Environment::get().getFrameDuration());
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                runtime.push(MWBase::Environment::get().getFrameDuration());
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpEnable : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-                    MWBase::Environment::get().getWorld()->enable (ptr);
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                MWBase::Environment::get().getWorld()->enable(ptr);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpDisable : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-                    MWBase::Environment::get().getWorld()->disable (ptr);
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                MWBase::Environment::get().getWorld()->disable(ptr);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetDisabled : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-                    runtime.push (!ptr.getRefData().isEnabled());
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                runtime.push(!ptr.getRefData().isEnabled());
+            }
         };
 
         class OpPlayBink : public Interpreter::Opcode0
         {
         public:
-
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 std::string_view name = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
@@ -219,275 +208,244 @@ namespace MWScript
                 bool allowSkipping = runtime[0].mInteger != 0;
                 runtime.pop();
 
-                MWBase::Environment::get().getWindowManager()->playVideo (name, allowSkipping);
+                MWBase::Environment::get().getWindowManager()->playVideo(name, allowSkipping);
             }
         };
 
         class OpGetPcSleep : public Interpreter::Opcode0
         {
         public:
-
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
-                runtime.push (MWBase::Environment::get().getWindowManager ()->getPlayerSleeping());
+                runtime.push(MWBase::Environment::get().getWindowManager()->getPlayerSleeping());
             }
         };
 
         class OpGetPcJumping : public Interpreter::Opcode0
         {
         public:
-
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 MWBase::World* world = MWBase::Environment::get().getWorld();
-                runtime.push (world->getPlayer().getJumping());
+                runtime.push(world->getPlayer().getJumping());
             }
         };
 
         class OpWakeUpPc : public Interpreter::Opcode0
         {
         public:
-
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
-                MWBase::Environment::get().getWindowManager ()->wakeUpPlayer();
+                MWBase::Environment::get().getWindowManager()->wakeUpPlayer();
             }
         };
 
         class OpXBox : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    runtime.push (0);
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override { runtime.push(0); }
         };
 
         template <class R>
         class OpOnActivate : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    runtime.push (ptr.getRefData().onActivate());
-                }
+                runtime.push(ptr.getRefData().onActivate());
+            }
         };
 
         template <class R>
         class OpActivate : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    InterpreterContext& context =
-                        static_cast<InterpreterContext&> (runtime.getContext());
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                InterpreterContext& context = static_cast<InterpreterContext&>(runtime.getContext());
 
-                    MWWorld::Ptr ptr = R()(runtime);
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    if (ptr.getRefData().activateByScript() || ptr.getContainerStore())
-                        context.executeActivation(ptr, MWMechanics::getPlayer());
-                }
+                if (ptr.getRefData().activateByScript() || ptr.getContainerStore())
+                    context.executeActivation(ptr, MWMechanics::getPlayer());
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpLock : public Interpreter::Opcode1
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Integer lockLevel = ptr.getCellRef().getLockLevel();
-                    if(lockLevel==0) { //no lock level was ever set, set to 100 as default
-                        lockLevel = 100;
-                    }
+                Interpreter::Type_Integer lockLevel = ptr.getCellRef().getLockLevel();
+                if (lockLevel == 0)
+                { // no lock level was ever set, set to 100 as default
+                    lockLevel = 100;
+                }
 
-                    if (arg0==1)
-                    {
-                        lockLevel = runtime[0].mInteger;
-                        runtime.pop();
-                    }
+                if (arg0 == 1)
+                {
+                    lockLevel = runtime[0].mInteger;
+                    runtime.pop();
+                }
 
-                    ptr.getCellRef().lock (lockLevel);
+                ptr.getCellRef().lock(lockLevel);
 
-                    // Instantly reset door to closed state
-                    // This is done when using Lock in scripts, but not when using Lock spells.
-                    if (ptr.getType() == ESM::Door::sRecordId && !ptr.getCellRef().getTeleport())
-                    {
-                        MWBase::Environment::get().getWorld()->activateDoor(ptr, MWWorld::DoorState::Idle);
-                    }
+                // Instantly reset door to closed state
+                // This is done when using Lock in scripts, but not when using Lock spells.
+                if (ptr.getType() == ESM::Door::sRecordId && !ptr.getCellRef().getTeleport())
+                {
+                    MWBase::Environment::get().getWorld()->activateDoor(ptr, MWWorld::DoorState::Idle);
                 }
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpUnlock : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    ptr.getCellRef().unlock ();
-                }
+                ptr.getCellRef().unlock();
+            }
         };
 
         class OpToggleCollisionDebug : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    bool enabled =
-                        MWBase::Environment::get().getWorld()->toggleRenderMode (MWRender::Render_CollisionDebug);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                bool enabled = MWBase::Environment::get().getWorld()->toggleRenderMode(MWRender::Render_CollisionDebug);
 
-                    runtime.getContext().report (enabled ?
-                        "Collision Mesh Rendering -> On" : "Collision Mesh Rendering -> Off");
-                }
+                runtime.getContext().report(
+                    enabled ? "Collision Mesh Rendering -> On" : "Collision Mesh Rendering -> Off");
+            }
         };
 
-
         class OpToggleCollisionBoxes : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    bool enabled =
-                        MWBase::Environment::get().getWorld()->toggleRenderMode (MWRender::Render_CollisionDebug);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                bool enabled = MWBase::Environment::get().getWorld()->toggleRenderMode(MWRender::Render_CollisionDebug);
 
-                    runtime.getContext().report (enabled ?
-                        "Collision Mesh Rendering -> On" : "Collision Mesh Rendering -> Off");
-                }
+                runtime.getContext().report(
+                    enabled ? "Collision Mesh Rendering -> On" : "Collision Mesh Rendering -> Off");
+            }
         };
 
         class OpToggleWireframe : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    bool enabled =
-                        MWBase::Environment::get().getWorld()->toggleRenderMode (MWRender::Render_Wireframe);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                bool enabled = MWBase::Environment::get().getWorld()->toggleRenderMode(MWRender::Render_Wireframe);
 
-                    runtime.getContext().report (enabled ?
-                        "Wireframe Rendering -> On" : "Wireframe Rendering -> Off");
-                }
+                runtime.getContext().report(enabled ? "Wireframe Rendering -> On" : "Wireframe Rendering -> Off");
+            }
         };
 
         class OpToggleBorders : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    bool enabled =
-                        MWBase::Environment::get().getWorld()->toggleBorders();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                bool enabled = MWBase::Environment::get().getWorld()->toggleBorders();
 
-                    runtime.getContext().report (enabled ?
-                        "Border Rendering -> On" : "Border Rendering -> Off");
-                }
+                runtime.getContext().report(enabled ? "Border Rendering -> On" : "Border Rendering -> Off");
+            }
         };
 
         class OpTogglePathgrid : public Interpreter::Opcode0
         {
         public:
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
-                bool enabled =
-                    MWBase::Environment::get().getWorld()->toggleRenderMode (MWRender::Render_Pathgrid);
+                bool enabled = MWBase::Environment::get().getWorld()->toggleRenderMode(MWRender::Render_Pathgrid);
 
-                runtime.getContext().report (enabled ?
-                    "Path Grid rendering -> On" : "Path Grid Rendering -> Off");
+                runtime.getContext().report(enabled ? "Path Grid rendering -> On" : "Path Grid Rendering -> Off");
             }
         };
 
         class OpFadeIn : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    Interpreter::Type_Float time = runtime[0].mFloat;
-                    runtime.pop();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                Interpreter::Type_Float time = runtime[0].mFloat;
+                runtime.pop();
 
-                    MWBase::Environment::get().getWindowManager()->fadeScreenIn(time, false);
-                }
+                MWBase::Environment::get().getWindowManager()->fadeScreenIn(time, false);
+            }
         };
 
         class OpFadeOut : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    Interpreter::Type_Float time = runtime[0].mFloat;
-                    runtime.pop();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                Interpreter::Type_Float time = runtime[0].mFloat;
+                runtime.pop();
 
-                    MWBase::Environment::get().getWindowManager()->fadeScreenOut(time, false);
-                }
+                MWBase::Environment::get().getWindowManager()->fadeScreenOut(time, false);
+            }
         };
 
         class OpFadeTo : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    Interpreter::Type_Float alpha = runtime[0].mFloat;
-                    runtime.pop();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                Interpreter::Type_Float alpha = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float time = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float time = runtime[0].mFloat;
+                runtime.pop();
 
-                    MWBase::Environment::get().getWindowManager()->fadeScreenTo(static_cast<int>(alpha), time, false);
-                }
+                MWBase::Environment::get().getWindowManager()->fadeScreenTo(static_cast<int>(alpha), time, false);
+            }
         };
 
         class OpToggleWater : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    runtime.getContext().report(MWBase::Environment::get().getWorld()->toggleWater() ? "Water -> On"
-                                                                                                     : "Water -> Off");
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                runtime.getContext().report(
+                    MWBase::Environment::get().getWorld()->toggleWater() ? "Water -> On" : "Water -> Off");
+            }
         };
 
         class OpToggleWorld : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    runtime.getContext().report(MWBase::Environment::get().getWorld()->toggleWorld() ? "World -> On"
-                                                                                                     : "World -> Off");
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                runtime.getContext().report(
+                    MWBase::Environment::get().getWorld()->toggleWorld() ? "World -> On" : "World -> Off");
+            }
         };
 
         class OpDontSaveObject : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    // We are ignoring the DontSaveObject statement for now. Probably not worth
-                    // bothering with. The incompatibility we are creating should be marginal at most.
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                // We are ignoring the DontSaveObject statement for now. Probably not worth
+                // bothering with. The incompatibility we are creating should be marginal at most.
+            }
         };
 
         class OpPcForce1stPerson : public Interpreter::Opcode0
         {
         public:
-
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 if (!MWBase::Environment::get().getWorld()->isFirstPerson())
                     MWBase::Environment::get().getWorld()->togglePOV(true);
@@ -496,7 +454,7 @@ namespace MWScript
 
         class OpPcForce3rdPerson : public Interpreter::Opcode0
         {
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 if (MWBase::Environment::get().getWorld()->isFirstPerson())
                     MWBase::Environment::get().getWorld()->togglePOV(true);
@@ -517,16 +475,17 @@ namespace MWScript
             static bool sActivate;
 
         public:
-
-            void execute(Interpreter::Runtime &runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
-                MWBase::World *world =
-                    MWBase::Environment::get().getWorld();
+                MWBase::World* world = MWBase::Environment::get().getWorld();
 
-                if (world->toggleVanityMode(sActivate)) {
+                if (world->toggleVanityMode(sActivate))
+                {
                     runtime.getContext().report(sActivate ? "Vanity Mode -> On" : "Vanity Mode -> Off");
                     sActivate = !sActivate;
-                } else {
+                }
+                else
+                {
                     runtime.getContext().report("Vanity Mode -> No");
                 }
             }
@@ -536,314 +495,308 @@ namespace MWScript
         template <class R>
         class OpGetLocked : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    runtime.push (ptr.getCellRef().getLockLevel() > 0);
-                }
+                runtime.push(ptr.getCellRef().getLockLevel() > 0);
+            }
         };
 
         template <class R>
         class OpGetEffect : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view effect = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view effect = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    if (!ptr.getClass().isActor())
-                    {
-                        runtime.push(0);
-                        return;
-                    }
+                if (!ptr.getClass().isActor())
+                {
+                    runtime.push(0);
+                    return;
+                }
 
-                    char *end;
-                    long key = strtol(effect.data(), &end, 10);
-                    if(key < 0 || key > 32767 || *end != '\0')
-                        key = ESM::MagicEffect::effectStringToId({effect});
+                char* end;
+                long key = strtol(effect.data(), &end, 10);
+                if (key < 0 || key > 32767 || *end != '\0')
+                    key = ESM::MagicEffect::effectStringToId({ effect });
 
-                    const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
+                const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
 
-                    const MWMechanics::MagicEffects& effects = stats.getMagicEffects();
+                const MWMechanics::MagicEffects& effects = stats.getMagicEffects();
 
-                    for (const auto& activeEffect : effects)
+                for (const auto& activeEffect : effects)
+                {
+                    if (activeEffect.first.mId == key && activeEffect.second.getModifier() > 0)
                     {
-                        if (activeEffect.first.mId == key && activeEffect.second.getModifier() > 0)
-                        {
-                            runtime.push(1);
-                            return;
-                        }
+                        runtime.push(1);
+                        return;
                     }
-                    runtime.push(0);
-               }
+                }
+                runtime.push(0);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpAddSoulGem : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view creature = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view creature = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    std::string_view gem = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view gem = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    if (!ptr.getClass().hasInventoryStore(ptr))
-                        return;
+                if (!ptr.getClass().hasInventoryStore(ptr))
+                    return;
 
-                    const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
-                    store.get<ESM::Creature>().find(creature); // This line throws an exception if it can't find the creature
+                const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+                store.get<ESM::Creature>().find(
+                    creature); // This line throws an exception if it can't find the creature
 
-                    MWWorld::Ptr item = *ptr.getClass().getContainerStore(ptr).add(gem, 1, ptr);
+                MWWorld::Ptr item = *ptr.getClass().getContainerStore(ptr).add(gem, 1, ptr);
 
-                    // Set the soul on just one of the gems, not the whole stack
-                    item.getContainerStore()->unstack(item, ptr);
-                    item.getCellRef().setSoul(creature);
+                // Set the soul on just one of the gems, not the whole stack
+                item.getContainerStore()->unstack(item, ptr);
+                item.getCellRef().setSoul(creature);
 
-                    // Restack the gem with other gems with the same soul
-                    item.getContainerStore()->restack(item);
-                }
+                // Restack the gem with other gems with the same soul
+                item.getContainerStore()->restack(item);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpRemoveSoulGem : public Interpreter::Opcode1
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+                std::string_view soul = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    std::string_view soul = runtime.getStringLiteral(runtime[0].mInteger);
+                // throw away additional arguments
+                for (unsigned int i = 0; i < arg0; ++i)
                     runtime.pop();
 
-                    // throw away additional arguments
-                    for (unsigned int i=0; i<arg0; ++i)
-                        runtime.pop();
-
-                    if (!ptr.getClass().hasInventoryStore(ptr))
-                        return;
+                if (!ptr.getClass().hasInventoryStore(ptr))
+                    return;
 
-                    MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
-                    for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
+                MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
+                for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
+                {
+                    if (::Misc::StringUtils::ciEqual(it->getCellRef().getSoul(), soul))
                     {
-                        if (::Misc::StringUtils::ciEqual(it->getCellRef().getSoul(), soul))
-                        {
-                            store.remove(*it, 1, ptr);
-                            return;
-                        }
+                        store.remove(*it, 1, ptr);
+                        return;
                     }
                 }
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpDrop : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
 
-                    MWWorld::Ptr ptr = R()(runtime);
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view item = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view item = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    Interpreter::Type_Integer amount = runtime[0].mInteger;
-                    runtime.pop();
+                Interpreter::Type_Integer amount = runtime[0].mInteger;
+                runtime.pop();
 
-                    if (amount<0)
-                        throw std::runtime_error ("amount must be non-negative");
+                if (amount < 0)
+                    throw std::runtime_error("amount must be non-negative");
 
-                    // no-op
-                    if (amount == 0)
-                        return;
+                // no-op
+                if (amount == 0)
+                    return;
 
-                    if (!ptr.getClass().isActor())
-                        return;
+                if (!ptr.getClass().isActor())
+                    return;
 
-                    if (ptr.getClass().hasInventoryStore(ptr))
+                if (ptr.getClass().hasInventoryStore(ptr))
+                {
+                    // Prefer dropping unequipped items first; re-stack if possible by unequipping items before dropping
+                    // them.
+                    MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
+                    int numNotEquipped = store.count(item);
+                    for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
                     {
-                        // Prefer dropping unequipped items first; re-stack if possible by unequipping items before dropping them.
-                        MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
-                        int numNotEquipped = store.count(item);
-                        for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
+                        MWWorld::ConstContainerStoreIterator it = store.getSlot(slot);
+                        if (it != store.end() && ::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), item))
                         {
-                            MWWorld::ConstContainerStoreIterator it = store.getSlot (slot);
-                            if (it != store.end() && ::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), item))
-                            {
-                                numNotEquipped -= it->getRefData().getCount();
-                            }
+                            numNotEquipped -= it->getRefData().getCount();
                         }
+                    }
 
-                        for (int slot = 0; slot < MWWorld::InventoryStore::Slots && amount > numNotEquipped; ++slot)
+                    for (int slot = 0; slot < MWWorld::InventoryStore::Slots && amount > numNotEquipped; ++slot)
+                    {
+                        MWWorld::ContainerStoreIterator it = store.getSlot(slot);
+                        if (it != store.end() && ::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), item))
                         {
-                            MWWorld::ContainerStoreIterator it = store.getSlot (slot);
-                            if (it != store.end() && ::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), item))
-                            {
-                                int numToRemove = std::min(amount - numNotEquipped, it->getRefData().getCount());
-                                store.unequipItemQuantity(*it, ptr, numToRemove);
-                                numNotEquipped += numToRemove;
-                            }
+                            int numToRemove = std::min(amount - numNotEquipped, it->getRefData().getCount());
+                            store.unequipItemQuantity(*it, ptr, numToRemove);
+                            numNotEquipped += numToRemove;
                         }
+                    }
 
-                        for (MWWorld::ContainerStoreIterator iter (store.begin()); iter!=store.end(); ++iter)
+                    for (MWWorld::ContainerStoreIterator iter(store.begin()); iter != store.end(); ++iter)
+                    {
+                        if (::Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), item)
+                            && !store.isEquipped(*iter))
                         {
-                            if (::Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), item) && !store.isEquipped(*iter))
-                            {
-                                int removed = store.remove(*iter, amount, ptr);
-                                MWWorld::Ptr dropped = MWBase::Environment::get().getWorld()->dropObjectOnGround(ptr, *iter, removed);
-                                dropped.getCellRef().setOwner("");
+                            int removed = store.remove(*iter, amount, ptr);
+                            MWWorld::Ptr dropped
+                                = MWBase::Environment::get().getWorld()->dropObjectOnGround(ptr, *iter, removed);
+                            dropped.getCellRef().setOwner("");
 
-                                amount -= removed;
+                            amount -= removed;
 
-                                if (amount <= 0)
-                                    break;
-                            }
+                            if (amount <= 0)
+                                break;
                         }
                     }
+                }
 
-                    MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), item, 1);
-                    MWWorld::Ptr itemPtr(ref.getPtr());
-                    if (amount > 0)
+                MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), item, 1);
+                MWWorld::Ptr itemPtr(ref.getPtr());
+                if (amount > 0)
+                {
+                    if (itemPtr.getClass().getScript(itemPtr).empty())
                     {
-                        if (itemPtr.getClass().getScript(itemPtr).empty())
-                        {
-                            MWBase::Environment::get().getWorld()->dropObjectOnGround(ptr, itemPtr, amount);
-                        }
-                        else
-                        {
-                            // Dropping one item per time to prevent making stacks of scripted items
-                            for (int i = 0; i < amount; i++)
-                                MWBase::Environment::get().getWorld()->dropObjectOnGround(ptr, itemPtr, 1);
-                        }
+                        MWBase::Environment::get().getWorld()->dropObjectOnGround(ptr, itemPtr, amount);
+                    }
+                    else
+                    {
+                        // Dropping one item per time to prevent making stacks of scripted items
+                        for (int i = 0; i < amount; i++)
+                            MWBase::Environment::get().getWorld()->dropObjectOnGround(ptr, itemPtr, 1);
                     }
-
-                    MWBase::Environment::get().getSoundManager()->playSound3D(ptr, itemPtr.getClass().getDownSoundId(itemPtr), 1.f, 1.f);
                 }
+
+                MWBase::Environment::get().getSoundManager()->playSound3D(
+                    ptr, itemPtr.getClass().getDownSoundId(itemPtr), 1.f, 1.f);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpDropSoulGem : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
 
-                    MWWorld::Ptr ptr = R()(runtime);
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view soul = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view soul = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    if (!ptr.getClass().hasInventoryStore(ptr))
-                        return;
+                if (!ptr.getClass().hasInventoryStore(ptr))
+                    return;
 
-                    MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
+                MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
 
-                    for (MWWorld::ContainerStoreIterator iter (store.begin()); iter!=store.end(); ++iter)
+                for (MWWorld::ContainerStoreIterator iter(store.begin()); iter != store.end(); ++iter)
+                {
+                    if (::Misc::StringUtils::ciEqual(iter->getCellRef().getSoul(), soul))
                     {
-                        if (::Misc::StringUtils::ciEqual(iter->getCellRef().getSoul(), soul))
-                        {
-                            MWBase::Environment::get().getWorld()->dropObjectOnGround(ptr, *iter, 1);
-                            store.remove(*iter, 1, ptr);
-                            break;
-                        }
+                        MWBase::Environment::get().getWorld()->dropObjectOnGround(ptr, *iter, 1);
+                        store.remove(*iter, 1, ptr);
+                        break;
                     }
                 }
+            }
         };
 
         template <class R>
         class OpGetAttacked : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    runtime.push(ptr.getClass().getCreatureStats (ptr).getAttacked ());
-                }
+                runtime.push(ptr.getClass().getCreatureStats(ptr).getAttacked());
+            }
         };
 
         template <class R>
         class OpGetWeaponDrawn : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                auto& cls = ptr.getClass();
+                if (!cls.hasInventoryStore(ptr) && !cls.isBipedal(ptr))
                 {
-                    MWWorld::Ptr ptr = R()(runtime);
-                    auto& cls = ptr.getClass();
-                    if (!cls.hasInventoryStore(ptr) && !cls.isBipedal(ptr))
-                    {
-                        runtime.push(0);
-                        return;
-                    }
-
-                    if (cls.getCreatureStats(ptr).getDrawState () != MWMechanics::DrawState::Weapon)
-                    {
-                        runtime.push(0);
-                        return;
-                    }
+                    runtime.push(0);
+                    return;
+                }
 
-                    MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(ptr);
-                    runtime.push(anim && anim->getWeaponsShown());
+                if (cls.getCreatureStats(ptr).getDrawState() != MWMechanics::DrawState::Weapon)
+                {
+                    runtime.push(0);
+                    return;
                 }
+
+                MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(ptr);
+                runtime.push(anim && anim->getWeaponsShown());
+            }
         };
 
         template <class R>
         class OpGetSpellReadied : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    runtime.push(ptr.getClass().getCreatureStats (ptr).getDrawState () == MWMechanics::DrawState::Spell);
-                }
+                runtime.push(ptr.getClass().getCreatureStats(ptr).getDrawState() == MWMechanics::DrawState::Spell);
+            }
         };
 
         template <class R>
         class OpGetSpellEffects : public Interpreter::Opcode0
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                std::string_view id = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                void execute (Interpreter::Runtime& runtime) override
+                if (!ptr.getClass().isActor())
                 {
-                    MWWorld::Ptr ptr = R()(runtime);
-                    std::string_view id = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
-
-                    if (!ptr.getClass().isActor())
-                    {
-                        runtime.push(0);
-                        return;
-                    }
-
-                    const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
-                    runtime.push(stats.getActiveSpells().isSpellActive(id));
+                    runtime.push(0);
+                    return;
                 }
+
+                const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
+                runtime.push(stats.getActiveSpells().isSpellActive(id));
+            }
         };
 
         class OpGetCurrentTime : public Interpreter::Opcode0
         {
         public:
-
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 runtime.push(MWBase::Environment::get().getWorld()->getTimeStamp().getHour());
             }
@@ -852,207 +805,190 @@ namespace MWScript
         template <class R>
         class OpSetDelete : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-                    int parameter = runtime[0].mInteger;
-                    runtime.pop();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                int parameter = runtime[0].mInteger;
+                runtime.pop();
 
-                    if (parameter == 1)
-                        MWBase::Environment::get().getWorld()->deleteObject(ptr);
-                    else if (parameter == 0)
-                        MWBase::Environment::get().getWorld()->undeleteObject(ptr);
-                    else
-                        throw std::runtime_error("SetDelete: unexpected parameter");
-                }
+                if (parameter == 1)
+                    MWBase::Environment::get().getWorld()->deleteObject(ptr);
+                else if (parameter == 0)
+                    MWBase::Environment::get().getWorld()->undeleteObject(ptr);
+                else
+                    throw std::runtime_error("SetDelete: unexpected parameter");
+            }
         };
 
         class OpGetSquareRoot : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    float param = runtime[0].mFloat;
-                    runtime.pop();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                float param = runtime[0].mFloat;
+                runtime.pop();
 
-                    if (param < 0)
-                        throw std::runtime_error("square root of negative number (we aren't that imaginary)");
+                if (param < 0)
+                    throw std::runtime_error("square root of negative number (we aren't that imaginary)");
 
-                    runtime.push(std::sqrt (param));
-                }
+                runtime.push(std::sqrt(param));
+            }
         };
 
         template <class R>
         class OpFall : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override {}
         };
 
         template <class R>
         class OpGetStandingPc : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-                    runtime.push (MWBase::Environment::get().getWorld()->getPlayerStandingOn(ptr));
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                runtime.push(MWBase::Environment::get().getWorld()->getPlayerStandingOn(ptr));
+            }
         };
 
         template <class R>
         class OpGetStandingActor : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-                    runtime.push (MWBase::Environment::get().getWorld()->getActorStandingOn(ptr));
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                runtime.push(MWBase::Environment::get().getWorld()->getActorStandingOn(ptr));
+            }
         };
 
         template <class R>
         class OpGetCollidingPc : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-                    runtime.push (MWBase::Environment::get().getWorld()->getPlayerCollidingWith(ptr));
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                runtime.push(MWBase::Environment::get().getWorld()->getPlayerCollidingWith(ptr));
+            }
         };
 
         template <class R>
         class OpGetCollidingActor : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-                    runtime.push (MWBase::Environment::get().getWorld()->getActorCollidingWith(ptr));
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                runtime.push(MWBase::Environment::get().getWorld()->getActorCollidingWith(ptr));
+            }
         };
 
         template <class R>
         class OpHurtStandingActor : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-                    float healthDiffPerSecond = runtime[0].mFloat;
-                    runtime.pop();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                float healthDiffPerSecond = runtime[0].mFloat;
+                runtime.pop();
 
-                    MWBase::Environment::get().getWorld()->hurtStandingActors(ptr, healthDiffPerSecond);
-                }
+                MWBase::Environment::get().getWorld()->hurtStandingActors(ptr, healthDiffPerSecond);
+            }
         };
 
         template <class R>
         class OpHurtCollidingActor : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-                    float healthDiffPerSecond = runtime[0].mFloat;
-                    runtime.pop();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                float healthDiffPerSecond = runtime[0].mFloat;
+                runtime.pop();
 
-                    MWBase::Environment::get().getWorld()->hurtCollidingActors(ptr, healthDiffPerSecond);
-                }
+                MWBase::Environment::get().getWorld()->hurtCollidingActors(ptr, healthDiffPerSecond);
+            }
         };
 
         class OpGetWindSpeed : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    runtime.push(MWBase::Environment::get().getWorld()->getWindSpeed());
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                runtime.push(MWBase::Environment::get().getWorld()->getWindSpeed());
+            }
         };
 
         template <class R>
         class OpHitOnMe : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view objectID = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view objectID = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    MWMechanics::CreatureStats &stats = ptr.getClass().getCreatureStats(ptr);
-                    bool hit = ::Misc::StringUtils::ciEqual(objectID, stats.getLastHitObject());
-                    runtime.push(hit);
-                    if(hit)
-                        stats.clearLastHitObject();
-                }
+                MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
+                bool hit = ::Misc::StringUtils::ciEqual(objectID, stats.getLastHitObject());
+                runtime.push(hit);
+                if (hit)
+                    stats.clearLastHitObject();
+            }
         };
 
         template <class R>
         class OpHitAttemptOnMe : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view objectID = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view objectID = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    MWMechanics::CreatureStats &stats = ptr.getClass().getCreatureStats(ptr);
-                    bool hit = ::Misc::StringUtils::ciEqual(objectID, stats.getLastHitAttemptObject());
-                    runtime.push(hit);
-                    if(hit)
-                        stats.clearLastHitAttemptObject();
-                }
+                MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
+                bool hit = ::Misc::StringUtils::ciEqual(objectID, stats.getLastHitAttemptObject());
+                runtime.push(hit);
+                if (hit)
+                    stats.clearLastHitAttemptObject();
+            }
         };
 
         template <bool Enable>
         class OpEnableTeleporting : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWBase::World *world = MWBase::Environment::get().getWorld();
-                    world->enableTeleporting(Enable);
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWBase::World* world = MWBase::Environment::get().getWorld();
+                world->enableTeleporting(Enable);
+            }
         };
 
         template <bool Enable>
         class OpEnableLevitation : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWBase::World *world = MWBase::Environment::get().getWorld();
-                    world->enableLevitation(Enable);
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWBase::World* world = MWBase::Environment::get().getWorld();
+                world->enableLevitation(Enable);
+            }
         };
 
         template <class R>
         class OpShow : public Interpreter::Opcode0
         {
         public:
-
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 MWWorld::Ptr ptr = R()(runtime, false);
                 std::string_view var = runtime.getStringLiteral(runtime[0].mInteger);
@@ -1065,42 +1001,44 @@ namespace MWScript
                     std::string_view script = ptr.getClass().getScript(ptr);
                     if (!script.empty())
                     {
-                        const Compiler::Locals& locals =
-                            MWBase::Environment::get().getScriptManager()->getLocals(script);
+                        const Compiler::Locals& locals
+                            = MWBase::Environment::get().getScriptManager()->getLocals(script);
                         char type = locals.getType(var);
                         std::string refId = ptr.getCellRef().getRefId();
                         if (refId.find(' ') != std::string::npos)
                             refId = '"' + refId + '"';
                         switch (type)
                         {
-                        case 'l':
-                        case 's':
-                            output << refId << "." << var << " = " << ptr.getRefData().getLocals().getIntVar(script, var);
-                            break;
-                        case 'f':
-                            output << refId << "." << var << " = " << ptr.getRefData().getLocals().getFloatVar(script, var);
-                            break;
+                            case 'l':
+                            case 's':
+                                output << refId << "." << var << " = "
+                                       << ptr.getRefData().getLocals().getIntVar(script, var);
+                                break;
+                            case 'f':
+                                output << refId << "." << var << " = "
+                                       << ptr.getRefData().getLocals().getFloatVar(script, var);
+                                break;
                         }
                     }
                 }
                 if (output.rdbuf()->in_avail() == 0)
                 {
-                    MWBase::World *world = MWBase::Environment::get().getWorld();
-                    char type = world->getGlobalVariableType (var);
+                    MWBase::World* world = MWBase::Environment::get().getWorld();
+                    char type = world->getGlobalVariableType(var);
 
                     switch (type)
                     {
-                    case 's':
-                        output << var << " = " << runtime.getContext().getGlobalShort (var);
-                        break;
-                    case 'l':
-                        output << var << " = " << runtime.getContext().getGlobalLong (var);
-                        break;
-                    case 'f':
-                        output << var << " = " << runtime.getContext().getGlobalFloat (var);
-                        break;
-                    default:
-                        output << "unknown variable";
+                        case 's':
+                            output << var << " = " << runtime.getContext().getGlobalShort(var);
+                            break;
+                        case 'l':
+                            output << var << " = " << runtime.getContext().getGlobalLong(var);
+                            break;
+                        case 'f':
+                            output << var << " = " << runtime.getContext().getGlobalFloat(var);
+                            break;
+                        default:
+                            output << "unknown variable";
                     }
                 }
                 runtime.getContext().report(output.str());
@@ -1110,73 +1048,74 @@ namespace MWScript
         template <class R>
         class OpShowVars : public Interpreter::Opcode0
         {
-            void printLocalVars(Interpreter::Runtime &runtime, const MWWorld::Ptr &ptr)
+            void printLocalVars(Interpreter::Runtime& runtime, const MWWorld::Ptr& ptr)
             {
                 std::stringstream str;
 
                 std::string_view script = ptr.getClass().getScript(ptr);
-                if(script.empty())
-                    str<< ptr.getCellRef().getRefId()<<" does not have a script.";
+                if (script.empty())
+                    str << ptr.getCellRef().getRefId() << " does not have a script.";
                 else
                 {
-                    str<< "Local variables for "<<ptr.getCellRef().getRefId();
+                    str << "Local variables for " << ptr.getCellRef().getRefId();
 
-                    const Locals &locals = ptr.getRefData().getLocals();
-                    const Compiler::Locals &complocals = MWBase::Environment::get().getScriptManager()->getLocals(script);
+                    const Locals& locals = ptr.getRefData().getLocals();
+                    const Compiler::Locals& complocals
+                        = MWBase::Environment::get().getScriptManager()->getLocals(script);
 
-                    const std::vector<std::string> *names = &complocals.get('s');
-                    for(size_t i = 0;i < names->size();++i)
+                    const std::vector<std::string>* names = &complocals.get('s');
+                    for (size_t i = 0; i < names->size(); ++i)
                     {
-                        if(i >= locals.mShorts.size())
+                        if (i >= locals.mShorts.size())
                             break;
-                        str<<std::endl<< "  "<<(*names)[i]<<" = "<<locals.mShorts[i]<<" (short)";
+                        str << std::endl << "  " << (*names)[i] << " = " << locals.mShorts[i] << " (short)";
                     }
                     names = &complocals.get('l');
-                    for(size_t i = 0;i < names->size();++i)
+                    for (size_t i = 0; i < names->size(); ++i)
                     {
-                        if(i >= locals.mLongs.size())
+                        if (i >= locals.mLongs.size())
                             break;
-                        str<<std::endl<< "  "<<(*names)[i]<<" = "<<locals.mLongs[i]<<" (long)";
+                        str << std::endl << "  " << (*names)[i] << " = " << locals.mLongs[i] << " (long)";
                     }
                     names = &complocals.get('f');
-                    for(size_t i = 0;i < names->size();++i)
+                    for (size_t i = 0; i < names->size(); ++i)
                     {
-                        if(i >= locals.mFloats.size())
+                        if (i >= locals.mFloats.size())
                             break;
-                        str<<std::endl<< "  "<<(*names)[i]<<" = "<<locals.mFloats[i]<<" (float)";
+                        str << std::endl << "  " << (*names)[i] << " = " << locals.mFloats[i] << " (float)";
                     }
                 }
 
                 runtime.getContext().report(str.str());
             }
 
-            void printGlobalVars(Interpreter::Runtime &runtime)
+            void printGlobalVars(Interpreter::Runtime& runtime)
             {
                 std::stringstream str;
-                str<< "Global variables:";
+                str << "Global variables:";
 
-                MWBase::World *world = MWBase::Environment::get().getWorld();
+                MWBase::World* world = MWBase::Environment::get().getWorld();
                 std::vector<std::string> names = runtime.getContext().getGlobals();
-                for(size_t i = 0;i < names.size();++i)
+                for (size_t i = 0; i < names.size(); ++i)
                 {
-                    char type = world->getGlobalVariableType (names[i]);
+                    char type = world->getGlobalVariableType(names[i]);
                     str << std::endl << " " << names[i] << " = ";
 
                     switch (type)
                     {
                         case 's':
 
-                            str << runtime.getContext().getGlobalShort (names[i]) << " (short)";
+                            str << runtime.getContext().getGlobalShort(names[i]) << " (short)";
                             break;
 
                         case 'l':
 
-                            str << runtime.getContext().getGlobalLong (names[i]) << " (long)";
+                            str << runtime.getContext().getGlobalLong(names[i]) << " (long)";
                             break;
 
                         case 'f':
 
-                            str << runtime.getContext().getGlobalFloat (names[i]) << " (float)";
+                            str << runtime.getContext().getGlobalFloat(names[i]) << " (float)";
                             break;
 
                         default:
@@ -1185,7 +1124,7 @@ namespace MWScript
                     }
                 }
 
-                runtime.getContext().report (str.str());
+                runtime.getContext().report(str.str());
             }
 
         public:
@@ -1205,7 +1144,7 @@ namespace MWScript
         class OpToggleScripts : public Interpreter::Opcode0
         {
         public:
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 bool enabled = MWBase::Environment::get().getWorld()->toggleScripts();
 
@@ -1215,20 +1154,20 @@ namespace MWScript
 
         class OpToggleGodMode : public Interpreter::Opcode0
         {
-            public:
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    bool enabled = MWBase::Environment::get().getWorld()->toggleGodMode();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                bool enabled = MWBase::Environment::get().getWorld()->toggleGodMode();
 
-                    runtime.getContext().report (enabled ? "God Mode -> On" : "God Mode -> Off");
-                }
+                runtime.getContext().report(enabled ? "God Mode -> On" : "God Mode -> Off");
+            }
         };
 
         template <class R>
         class OpCast : public Interpreter::Opcode0
         {
         public:
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 MWWorld::Ptr ptr = R()(runtime);
 
@@ -1238,10 +1177,12 @@ namespace MWScript
                 std::string targetId = ::Misc::StringUtils::lowerCase(runtime.getStringLiteral(runtime[0].mInteger));
                 runtime.pop();
 
-                const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(spellId);
+                const ESM::Spell* spell
+                    = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(spellId);
                 if (!spell)
                 {
-                    runtime.getContext().report("spellcasting failed: cannot find spell \""+std::string(spellId)+"\"");
+                    runtime.getContext().report(
+                        "spellcasting failed: cannot find spell \"" + std::string(spellId) + "\"");
                     return;
                 }
 
@@ -1256,7 +1197,7 @@ namespace MWScript
                     if (!MWBase::Environment::get().getMechanicsManager()->isCastingSpell(ptr))
                     {
                         MWMechanics::AiCast castPackage(targetId, spell->mId, true);
-                        ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(castPackage, ptr);
+                        ptr.getClass().getCreatureStats(ptr).getAiSequence().stack(castPackage, ptr);
                     }
                     return;
                 }
@@ -1277,17 +1218,19 @@ namespace MWScript
         class OpExplodeSpell : public Interpreter::Opcode0
         {
         public:
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 MWWorld::Ptr ptr = R()(runtime);
 
                 std::string_view spellId = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
 
-                const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(spellId);
+                const ESM::Spell* spell
+                    = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(spellId);
                 if (!spell)
                 {
-                    runtime.getContext().report("spellcasting failed: cannot find spell \""+std::string(spellId)+"\"");
+                    runtime.getContext().report(
+                        "spellcasting failed: cannot find spell \"" + std::string(spellId) + "\"");
                     return;
                 }
 
@@ -1302,7 +1245,7 @@ namespace MWScript
                     if (!MWBase::Environment::get().getMechanicsManager()->isCastingSpell(ptr))
                     {
                         MWMechanics::AiCast castPackage(ptr.getCellRef().getRefId(), spell->mId, true);
-                        ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(castPackage, ptr);
+                        ptr.getClass().getCreatureStats(ptr).getAiSequence().stack(castPackage, ptr);
                     }
                     return;
                 }
@@ -1317,7 +1260,7 @@ namespace MWScript
         class OpGoToJail : public Interpreter::Opcode0
         {
         public:
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 MWBase::World* world = MWBase::Environment::get().getWorld();
                 world->goToJail();
@@ -1327,7 +1270,7 @@ namespace MWScript
         class OpPayFine : public Interpreter::Opcode0
         {
         public:
-            void execute(Interpreter::Runtime &runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 MWWorld::Ptr player = MWMechanics::getPlayer();
                 player.getClass().getNpcStats(player).setBounty(0);
@@ -1339,7 +1282,7 @@ namespace MWScript
         class OpPayFineThief : public Interpreter::Opcode0
         {
         public:
-            void execute(Interpreter::Runtime &runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 MWWorld::Ptr player = MWMechanics::getPlayer();
                 player.getClass().getNpcStats(player).setBounty(0);
@@ -1349,29 +1292,27 @@ namespace MWScript
 
         class OpGetPcInJail : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime &runtime) override
-                {
-                    runtime.push (MWBase::Environment::get().getWorld()->isPlayerInJail());
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                runtime.push(MWBase::Environment::get().getWorld()->isPlayerInJail());
+            }
         };
 
         class OpGetPcTraveling : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime &runtime) override
-                {
-                    runtime.push (MWBase::Environment::get().getWorld()->isPlayerTraveling());
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                runtime.push(MWBase::Environment::get().getWorld()->isPlayerTraveling());
+            }
         };
 
         template <class R>
         class OpBetaComment : public Interpreter::Opcode1
         {
         public:
-            void execute(Interpreter::Runtime &runtime, unsigned int arg0) override
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
             {
                 MWWorld::Ptr ptr = R()(runtime);
 
@@ -1390,7 +1331,7 @@ namespace MWScript
                 {
                     std::vector<std::string> contentFiles = MWBase::Environment::get().getWorld()->getContentFiles();
 
-                    msg << " [" << contentFiles.at (ptr.getCellRef().getRefNum().mContentFile) << "]" << std::endl;
+                    msg << " [" << contentFiles.at(ptr.getCellRef().getRefNum().mContentFile) << "]" << std::endl;
                 }
 
                 msg << "RefNum: " << ptr.getCellRef().getRefNum().mIndex << std::endl;
@@ -1408,16 +1349,18 @@ namespace MWScript
                     MWWorld::CellStore* cell = ptr.getCell();
                     msg << "Cell: " << MWBase::Environment::get().getWorld()->getCellName(cell) << std::endl;
                     if (cell->getCell()->isExterior())
-                        msg << "Grid: " << cell->getCell()->getGridX() << " " << cell->getCell()->getGridY() << std::endl;
-                    osg::Vec3f pos (ptr.getRefData().getPosition().asVec3());
+                        msg << "Grid: " << cell->getCell()->getGridX() << " " << cell->getCell()->getGridY()
+                            << std::endl;
+                    osg::Vec3f pos(ptr.getRefData().getPosition().asVec3());
                     msg << "Coordinates: " << pos.x() << " " << pos.y() << " " << pos.z() << std::endl;
                     auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-                    std::string model = ::Misc::ResourceHelpers::correctActorModelPath(ptr.getClass().getModel(ptr), vfs);
+                    std::string model
+                        = ::Misc::ResourceHelpers::correctActorModelPath(ptr.getClass().getModel(ptr), vfs);
                     msg << "Model: " << model << std::endl;
-                    if(!model.empty())
+                    if (!model.empty())
                     {
                         const std::string archive = vfs->getArchive(model);
-                        if(!archive.empty())
+                        if (!archive.empty())
                             msg << "(" << archive << ")" << std::endl;
                     }
                     if (!ptr.getClass().getScript(ptr).empty())
@@ -1442,7 +1385,7 @@ namespace MWScript
         class OpAddToLevCreature : public Interpreter::Opcode0
         {
         public:
-            void execute(Interpreter::Runtime &runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 std::string_view levId = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
@@ -1451,7 +1394,8 @@ namespace MWScript
                 int level = runtime[0].mInteger;
                 runtime.pop();
 
-                ESM::CreatureLevList listCopy = *MWBase::Environment::get().getWorld()->getStore().get<ESM::CreatureLevList>().find(levId);
+                ESM::CreatureLevList listCopy
+                    = *MWBase::Environment::get().getWorld()->getStore().get<ESM::CreatureLevList>().find(levId);
                 addToLevList(&listCopy, creatureId, level);
                 MWBase::Environment::get().getWorld()->createOverrideRecord(listCopy);
             }
@@ -1460,7 +1404,7 @@ namespace MWScript
         class OpRemoveFromLevCreature : public Interpreter::Opcode0
         {
         public:
-            void execute(Interpreter::Runtime &runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 std::string_view levId = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
@@ -1469,7 +1413,8 @@ namespace MWScript
                 int level = runtime[0].mInteger;
                 runtime.pop();
 
-                ESM::CreatureLevList listCopy = *MWBase::Environment::get().getWorld()->getStore().get<ESM::CreatureLevList>().find(levId);
+                ESM::CreatureLevList listCopy
+                    = *MWBase::Environment::get().getWorld()->getStore().get<ESM::CreatureLevList>().find(levId);
                 removeFromLevList(&listCopy, creatureId, level);
                 MWBase::Environment::get().getWorld()->createOverrideRecord(listCopy);
             }
@@ -1478,7 +1423,7 @@ namespace MWScript
         class OpAddToLevItem : public Interpreter::Opcode0
         {
         public:
-            void execute(Interpreter::Runtime &runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 std::string_view levId = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
@@ -1487,7 +1432,8 @@ namespace MWScript
                 int level = runtime[0].mInteger;
                 runtime.pop();
 
-                ESM::ItemLevList listCopy = *MWBase::Environment::get().getWorld()->getStore().get<ESM::ItemLevList>().find(levId);
+                ESM::ItemLevList listCopy
+                    = *MWBase::Environment::get().getWorld()->getStore().get<ESM::ItemLevList>().find(levId);
                 addToLevList(&listCopy, itemId, level);
                 MWBase::Environment::get().getWorld()->createOverrideRecord(listCopy);
             }
@@ -1496,7 +1442,7 @@ namespace MWScript
         class OpRemoveFromLevItem : public Interpreter::Opcode0
         {
         public:
-            void execute(Interpreter::Runtime &runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 std::string_view levId = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
@@ -1505,7 +1451,8 @@ namespace MWScript
                 int level = runtime[0].mInteger;
                 runtime.pop();
 
-                ESM::ItemLevList listCopy = *MWBase::Environment::get().getWorld()->getStore().get<ESM::ItemLevList>().find(levId);
+                ESM::ItemLevList listCopy
+                    = *MWBase::Environment::get().getWorld()->getStore().get<ESM::ItemLevList>().find(levId);
                 removeFromLevList(&listCopy, itemId, level);
                 MWBase::Environment::get().getWorld()->createOverrideRecord(listCopy);
             }
@@ -1515,19 +1462,21 @@ namespace MWScript
         class OpShowSceneGraph : public Interpreter::Opcode1
         {
         public:
-            void execute(Interpreter::Runtime &runtime, unsigned int arg0) override
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
             {
                 MWWorld::Ptr ptr = R()(runtime, false);
 
                 int confirmed = 0;
-                if (arg0==1)
+                if (arg0 == 1)
                 {
                     confirmed = runtime[0].mInteger;
                     runtime.pop();
                 }
 
                 if (ptr.isEmpty() && !confirmed)
-                    runtime.getContext().report("Exporting the entire scene graph will result in a large file. Confirm this action using 'showscenegraph 1' or select an object instead.");
+                    runtime.getContext().report(
+                        "Exporting the entire scene graph will result in a large file. Confirm this action using "
+                        "'showscenegraph 1' or select an object instead.");
                 else
                 {
                     const auto filename = MWBase::Environment::get().getWorld()->exportSceneGraph(ptr);
@@ -1538,105 +1487,94 @@ namespace MWScript
 
         class OpToggleNavMesh : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    bool enabled =
-                        MWBase::Environment::get().getWorld()->toggleRenderMode (MWRender::Render_NavMesh);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                bool enabled = MWBase::Environment::get().getWorld()->toggleRenderMode(MWRender::Render_NavMesh);
 
-                    runtime.getContext().report (enabled ?
-                        "Navigation Mesh Rendering -> On" : "Navigation Mesh Rendering -> Off");
-                }
+                runtime.getContext().report(
+                    enabled ? "Navigation Mesh Rendering -> On" : "Navigation Mesh Rendering -> Off");
+            }
         };
 
         class OpToggleActorsPaths : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    bool enabled =
-                        MWBase::Environment::get().getWorld()->toggleRenderMode (MWRender::Render_ActorsPaths);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                bool enabled = MWBase::Environment::get().getWorld()->toggleRenderMode(MWRender::Render_ActorsPaths);
 
-                    runtime.getContext().report (enabled ?
-                        "Agents Paths Rendering -> On" : "Agents Paths Rendering -> Off");
-                }
+                runtime.getContext().report(enabled ? "Agents Paths Rendering -> On" : "Agents Paths Rendering -> Off");
+            }
         };
 
         class OpSetNavMeshNumberToRender : public Interpreter::Opcode0
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                const auto navMeshNumber = runtime[0].mInteger;
+                runtime.pop();
 
-                void execute (Interpreter::Runtime& runtime) override
+                if (navMeshNumber < 0)
                 {
-                    const auto navMeshNumber = runtime[0].mInteger;
-                    runtime.pop();
-
-                    if (navMeshNumber < 0)
-                    {
-                        runtime.getContext().report("Invalid navmesh number: use not less than zero values");
-                        return;
-                    }
-
-                    MWBase::Environment::get().getWorld()->setNavMeshNumberToRender(static_cast<std::size_t>(navMeshNumber));
+                    runtime.getContext().report("Invalid navmesh number: use not less than zero values");
+                    return;
                 }
+
+                MWBase::Environment::get().getWorld()->setNavMeshNumberToRender(
+                    static_cast<std::size_t>(navMeshNumber));
+            }
         };
 
         template <class R>
         class OpRepairedOnMe : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    // Broken in vanilla and deliberately no-op.
-                    runtime.push(0);
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                // Broken in vanilla and deliberately no-op.
+                runtime.push(0);
+            }
         };
 
         class OpToggleRecastMesh : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    bool enabled =
-                        MWBase::Environment::get().getWorld()->toggleRenderMode (MWRender::Render_RecastMesh);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                bool enabled = MWBase::Environment::get().getWorld()->toggleRenderMode(MWRender::Render_RecastMesh);
 
-                    runtime.getContext().report (enabled ?
-                        "Recast Mesh Rendering -> On" : "Recast Mesh Rendering -> Off");
-                }
+                runtime.getContext().report(enabled ? "Recast Mesh Rendering -> On" : "Recast Mesh Rendering -> Off");
+            }
         };
 
         class OpHelp : public Interpreter::Opcode0
         {
-            public:
-
-                void execute(Interpreter::Runtime& runtime) override
-                {
-                    std::stringstream message;
-                    message << MWBase::Environment::get().getWindowManager()->getVersionDescription() << "\n\n";
-                    std::vector<std::string> commands;
-                    MWBase::Environment::get().getScriptManager()->getExtensions().listKeywords(commands);
-                    for(const auto& command : commands)
-                        message << command << "\n";
-                    runtime.getContext().report(message.str());
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                std::stringstream message;
+                message << MWBase::Environment::get().getWindowManager()->getVersionDescription() << "\n\n";
+                std::vector<std::string> commands;
+                MWBase::Environment::get().getScriptManager()->getExtensions().listKeywords(commands);
+                for (const auto& command : commands)
+                    message << command << "\n";
+                runtime.getContext().report(message.str());
+            }
         };
 
         class OpReloadLua : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWBase::Environment::get().getLuaManager()->reloadAllScripts();
-                    runtime.getContext().report("All Lua scripts are reloaded");
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWBase::Environment::get().getLuaManager()->reloadAllScripts();
+                runtime.getContext().report("All Lua scripts are reloaded");
+            }
         };
 
-        void installOpcodes (Interpreter::Interpreter& interpreter)
+        void installOpcodes(Interpreter::Interpreter& interpreter)
         {
             interpreter.installSegment5<OpMenuMode>(Compiler::Misc::opcodeMenuMode);
             interpreter.installSegment5<OpRandom>(Compiler::Misc::opcodeRandom);
@@ -1710,15 +1648,19 @@ namespace MWScript
             interpreter.installSegment5<OpGetStandingPc<ImplicitRef>>(Compiler::Misc::opcodeGetStandingPc);
             interpreter.installSegment5<OpGetStandingPc<ExplicitRef>>(Compiler::Misc::opcodeGetStandingPcExplicit);
             interpreter.installSegment5<OpGetStandingActor<ImplicitRef>>(Compiler::Misc::opcodeGetStandingActor);
-            interpreter.installSegment5<OpGetStandingActor<ExplicitRef>>(Compiler::Misc::opcodeGetStandingActorExplicit);
+            interpreter.installSegment5<OpGetStandingActor<ExplicitRef>>(
+                Compiler::Misc::opcodeGetStandingActorExplicit);
             interpreter.installSegment5<OpGetCollidingPc<ImplicitRef>>(Compiler::Misc::opcodeGetCollidingPc);
             interpreter.installSegment5<OpGetCollidingPc<ExplicitRef>>(Compiler::Misc::opcodeGetCollidingPcExplicit);
             interpreter.installSegment5<OpGetCollidingActor<ImplicitRef>>(Compiler::Misc::opcodeGetCollidingActor);
-            interpreter.installSegment5<OpGetCollidingActor<ExplicitRef>>(Compiler::Misc::opcodeGetCollidingActorExplicit);
+            interpreter.installSegment5<OpGetCollidingActor<ExplicitRef>>(
+                Compiler::Misc::opcodeGetCollidingActorExplicit);
             interpreter.installSegment5<OpHurtStandingActor<ImplicitRef>>(Compiler::Misc::opcodeHurtStandingActor);
-            interpreter.installSegment5<OpHurtStandingActor<ExplicitRef>>(Compiler::Misc::opcodeHurtStandingActorExplicit);
+            interpreter.installSegment5<OpHurtStandingActor<ExplicitRef>>(
+                Compiler::Misc::opcodeHurtStandingActorExplicit);
             interpreter.installSegment5<OpHurtCollidingActor<ImplicitRef>>(Compiler::Misc::opcodeHurtCollidingActor);
-            interpreter.installSegment5<OpHurtCollidingActor<ExplicitRef>>(Compiler::Misc::opcodeHurtCollidingActorExplicit);
+            interpreter.installSegment5<OpHurtCollidingActor<ExplicitRef>>(
+                Compiler::Misc::opcodeHurtCollidingActorExplicit);
             interpreter.installSegment5<OpGetWindSpeed>(Compiler::Misc::opcodeGetWindSpeed);
             interpreter.installSegment5<OpHitOnMe<ImplicitRef>>(Compiler::Misc::opcodeHitOnMe);
             interpreter.installSegment5<OpHitOnMe<ExplicitRef>>(Compiler::Misc::opcodeHitOnMeExplicit);
diff --git a/apps/openmw/mwscript/miscextensions.hpp b/apps/openmw/mwscript/miscextensions.hpp
index 16ed9301ed..0dbdd7ba50 100644
--- a/apps/openmw/mwscript/miscextensions.hpp
+++ b/apps/openmw/mwscript/miscextensions.hpp
@@ -14,11 +14,9 @@ namespace Interpreter
 namespace MWScript
 {
     namespace Misc
-    {        
-        void installOpcodes (Interpreter::Interpreter& interpreter);
+    {
+        void installOpcodes(Interpreter::Interpreter& interpreter);
     }
 }
 
 #endif
-
-
diff --git a/apps/openmw/mwscript/ref.cpp b/apps/openmw/mwscript/ref.cpp
index 145cd2cd25..c61eb64780 100644
--- a/apps/openmw/mwscript/ref.cpp
+++ b/apps/openmw/mwscript/ref.cpp
@@ -7,8 +7,7 @@
 
 #include "interpretercontext.hpp"
 
-MWWorld::Ptr MWScript::ExplicitRef::operator() (Interpreter::Runtime& runtime, bool required,
-    bool activeOnly) const
+MWWorld::Ptr MWScript::ExplicitRef::operator()(Interpreter::Runtime& runtime, bool required, bool activeOnly) const
 {
     std::string_view id = runtime.getStringLiteral(runtime[0].mInteger);
     runtime.pop();
@@ -19,11 +18,9 @@ MWWorld::Ptr MWScript::ExplicitRef::operator() (Interpreter::Runtime& runtime, b
         return MWBase::Environment::get().getWorld()->searchPtr(id, activeOnly);
 }
 
-MWWorld::Ptr MWScript::ImplicitRef::operator() (Interpreter::Runtime& runtime, bool required,
-    bool activeOnly) const
+MWWorld::Ptr MWScript::ImplicitRef::operator()(Interpreter::Runtime& runtime, bool required, bool activeOnly) const
 {
-    MWScript::InterpreterContext& context
-    = static_cast<MWScript::InterpreterContext&> (runtime.getContext());
+    MWScript::InterpreterContext& context = static_cast<MWScript::InterpreterContext&>(runtime.getContext());
 
     return context.getReference(required);
 }
diff --git a/apps/openmw/mwscript/ref.hpp b/apps/openmw/mwscript/ref.hpp
index 8c7657280f..166435b2c8 100644
--- a/apps/openmw/mwscript/ref.hpp
+++ b/apps/openmw/mwscript/ref.hpp
@@ -14,16 +14,14 @@ namespace MWScript
     {
         static constexpr bool implicit = false;
 
-        MWWorld::Ptr operator() (Interpreter::Runtime& runtime, bool required = true,
-            bool activeOnly = false) const;
+        MWWorld::Ptr operator()(Interpreter::Runtime& runtime, bool required = true, bool activeOnly = false) const;
     };
 
     struct ImplicitRef
     {
         static constexpr bool implicit = true;
 
-        MWWorld::Ptr operator() (Interpreter::Runtime& runtime, bool required = true,
-            bool activeOnly = false) const;
+        MWWorld::Ptr operator()(Interpreter::Runtime& runtime, bool required = true, bool activeOnly = false) const;
     };
 }
 
diff --git a/apps/openmw/mwscript/scriptmanagerimp.cpp b/apps/openmw/mwscript/scriptmanagerimp.cpp
index 35593efcba..f17b1a1c50 100644
--- a/apps/openmw/mwscript/scriptmanagerimp.cpp
+++ b/apps/openmw/mwscript/scriptmanagerimp.cpp
@@ -1,9 +1,9 @@
 #include "scriptmanagerimp.hpp"
 
+#include <algorithm>
 #include <cassert>
-#include <sstream>
 #include <exception>
-#include <algorithm>
+#include <sstream>
 
 #include <components/debug/debuglog.hpp>
 
@@ -11,10 +11,10 @@
 
 #include <components/misc/strings/lower.hpp>
 
-#include <components/compiler/scanner.hpp>
 #include <components/compiler/context.hpp>
 #include <components/compiler/exception.hpp>
 #include <components/compiler/quickfileparser.hpp>
+#include <components/compiler/scanner.hpp>
 
 #include "../mwworld/esmstore.hpp"
 
@@ -23,20 +23,22 @@
 
 namespace MWScript
 {
-    ScriptManager::ScriptManager (const MWWorld::ESMStore& store,
-        Compiler::Context& compilerContext, int warningsMode,
+    ScriptManager::ScriptManager(const MWWorld::ESMStore& store, Compiler::Context& compilerContext, int warningsMode,
         const std::vector<std::string>& scriptBlacklist)
-    : mErrorHandler(), mStore (store),
-      mCompilerContext (compilerContext), mParser (mErrorHandler, mCompilerContext),
-      mOpcodesInstalled (false), mGlobalScripts (store)
+        : mErrorHandler()
+        , mStore(store)
+        , mCompilerContext(compilerContext)
+        , mParser(mErrorHandler, mCompilerContext)
+        , mOpcodesInstalled(false)
+        , mGlobalScripts(store)
     {
-        mErrorHandler.setWarningsMode (warningsMode);
+        mErrorHandler.setWarningsMode(warningsMode);
 
-        mScriptBlacklist.resize (scriptBlacklist.size());
+        mScriptBlacklist.resize(scriptBlacklist.size());
 
-        std::transform (scriptBlacklist.begin(), scriptBlacklist.end(),
-            mScriptBlacklist.begin(), [](const std::string& s) { return Misc::StringUtils::lowerCase(s); });
-        std::sort (mScriptBlacklist.begin(), mScriptBlacklist.end());
+        std::transform(scriptBlacklist.begin(), scriptBlacklist.end(), mScriptBlacklist.begin(),
+            [](const std::string& s) { return Misc::StringUtils::lowerCase(s); });
+        std::sort(mScriptBlacklist.begin(), mScriptBlacklist.end());
     }
 
     bool ScriptManager::compile(std::string_view name)
@@ -44,18 +46,18 @@ namespace MWScript
         mParser.reset();
         mErrorHandler.reset();
 
-        if (const ESM::Script *script = mStore.get<ESM::Script>().find (name))
+        if (const ESM::Script* script = mStore.get<ESM::Script>().find(name))
         {
             mErrorHandler.setContext(script->mId);
 
             bool Success = true;
             try
             {
-                std::istringstream input (script->mScriptText);
+                std::istringstream input(script->mScriptText);
 
-                Compiler::Scanner scanner (mErrorHandler, input, mCompilerContext.getExtensions());
+                Compiler::Scanner scanner(mErrorHandler, input, mCompilerContext.getExtensions());
 
-                scanner.scan (mParser);
+                scanner.scan(mParser);
 
                 if (!mErrorHandler.isGood())
                     Success = false;
@@ -94,9 +96,9 @@ namespace MWScript
         // compile script
         auto iter = mScripts.find(name);
 
-        if (iter==mScripts.end())
+        if (iter == mScripts.end())
         {
-            if (!compile (name))
+            if (!compile(name))
             {
                 // failed -> ignore script from now on.
                 std::vector<Interpreter::Type_Code> empty;
@@ -104,8 +106,8 @@ namespace MWScript
                 return false;
             }
 
-            iter = mScripts.find (name);
-            assert (iter!=mScripts.end());
+            iter = mScripts.find(name);
+            assert(iter != mScripts.end());
         }
 
         // execute script
@@ -115,20 +117,20 @@ namespace MWScript
             {
                 if (!mOpcodesInstalled)
                 {
-                    installOpcodes (mInterpreter);
+                    installOpcodes(mInterpreter);
                     mOpcodesInstalled = true;
                 }
 
-                mInterpreter.run (&iter->second.mByteCode[0], iter->second.mByteCode.size(), interpreterContext);
+                mInterpreter.run(&iter->second.mByteCode[0], iter->second.mByteCode.size(), interpreterContext);
                 return true;
             }
             catch (const MissingImplicitRefError& e)
             {
-                Log(Debug::Error) << "Execution of script " << name << " failed: "  << e.what();
+                Log(Debug::Error) << "Execution of script " << name << " failed: " << e.what();
             }
             catch (const std::exception& e)
             {
-                Log(Debug::Error) << "Execution of script " << name << " failed: "  << e.what();
+                Log(Debug::Error) << "Execution of script " << name << " failed: " << e.what();
 
                 iter->second.mInactive.insert(target); // don't execute again.
             }
@@ -152,8 +154,8 @@ namespace MWScript
 
         for (auto& script : mStore.get<ESM::Script>())
         {
-            if (!std::binary_search (mScriptBlacklist.begin(), mScriptBlacklist.end(),
-                Misc::StringUtils::lowerCase(script.mId)))
+            if (!std::binary_search(
+                    mScriptBlacklist.begin(), mScriptBlacklist.end(), Misc::StringUtils::lowerCase(script.mId)))
             {
                 ++count;
 
@@ -162,7 +164,7 @@ namespace MWScript
             }
         }
 
-        return std::make_pair (count, success);
+        return std::make_pair(count, success);
     }
 
     const Compiler::Locals& ScriptManager::getLocals(std::string_view name)
@@ -170,14 +172,14 @@ namespace MWScript
         {
             auto iter = mScripts.find(name);
 
-            if (iter!=mScripts.end())
+            if (iter != mScripts.end())
                 return iter->second.mLocals;
         }
 
         {
             auto iter = mOtherLocals.find(name);
 
-            if (iter!=mOtherLocals.end())
+            if (iter != mOtherLocals.end())
                 return iter->second;
         }
 
@@ -185,14 +187,14 @@ namespace MWScript
         {
             Compiler::Locals locals;
 
-            const Compiler::ContextOverride override(mErrorHandler, std::string{name} + "[local variables]");
+            const Compiler::ContextOverride override(mErrorHandler, std::string{ name } + "[local variables]");
 
-            std::istringstream stream (script->mScriptText);
-            Compiler::QuickFileParser parser (mErrorHandler, mCompilerContext, locals);
-            Compiler::Scanner scanner (mErrorHandler, stream, mCompilerContext.getExtensions());
+            std::istringstream stream(script->mScriptText);
+            Compiler::QuickFileParser parser(mErrorHandler, mCompilerContext, locals);
+            Compiler::Scanner scanner(mErrorHandler, stream, mCompilerContext.getExtensions());
             try
             {
-                scanner.scan (parser);
+                scanner.scan(parser);
             }
             catch (const Compiler::SourceException&)
             {
@@ -210,7 +212,7 @@ namespace MWScript
             return iter->second;
         }
 
-        throw std::logic_error("script " + std::string{name} + " does not exist");
+        throw std::logic_error("script " + std::string{ name } + " does not exist");
     }
 
     GlobalScripts& ScriptManager::getGlobalScripts()
diff --git a/apps/openmw/mwscript/scriptmanagerimp.hpp b/apps/openmw/mwscript/scriptmanagerimp.hpp
index 4926f4b61f..7355edf240 100644
--- a/apps/openmw/mwscript/scriptmanagerimp.hpp
+++ b/apps/openmw/mwscript/scriptmanagerimp.hpp
@@ -5,8 +5,8 @@
 #include <set>
 #include <string>
 
-#include <components/compiler/streamerrorhandler.hpp>
 #include <components/compiler/fileparser.hpp>
+#include <components/compiler/streamerrorhandler.hpp>
 
 #include <components/interpreter/interpreter.hpp>
 #include <components/interpreter/types.hpp>
@@ -35,54 +35,56 @@ namespace MWScript
 {
     class ScriptManager : public MWBase::ScriptManager
     {
-            Compiler::StreamErrorHandler mErrorHandler;
-            const MWWorld::ESMStore& mStore;
-            Compiler::Context& mCompilerContext;
-            Compiler::FileParser mParser;
-            Interpreter::Interpreter mInterpreter;
-            bool mOpcodesInstalled;
-
-            struct CompiledScript
+        Compiler::StreamErrorHandler mErrorHandler;
+        const MWWorld::ESMStore& mStore;
+        Compiler::Context& mCompilerContext;
+        Compiler::FileParser mParser;
+        Interpreter::Interpreter mInterpreter;
+        bool mOpcodesInstalled;
+
+        struct CompiledScript
+        {
+            std::vector<Interpreter::Type_Code> mByteCode;
+            Compiler::Locals mLocals;
+            std::set<std::string> mInactive;
+
+            CompiledScript(const std::vector<Interpreter::Type_Code>& code, const Compiler::Locals& locals)
+                : mByteCode(code)
+                , mLocals(locals)
             {
-                std::vector<Interpreter::Type_Code> mByteCode;
-                Compiler::Locals mLocals;
-                std::set<std::string> mInactive;
-
-                CompiledScript(const std::vector<Interpreter::Type_Code>& code, const Compiler::Locals& locals):
-                    mByteCode(code), mLocals(locals)
-                {}
-            };
-
-            std::unordered_map<std::string, CompiledScript, ::Misc::StringUtils::CiHash, ::Misc::StringUtils::CiEqual> mScripts;
-            GlobalScripts mGlobalScripts;
-            std::unordered_map<std::string, Compiler::Locals, ::Misc::StringUtils::CiHash, ::Misc::StringUtils::CiEqual> mOtherLocals;
-            std::vector<std::string> mScriptBlacklist;
+            }
+        };
 
-        public:
+        std::unordered_map<std::string, CompiledScript, ::Misc::StringUtils::CiHash, ::Misc::StringUtils::CiEqual>
+            mScripts;
+        GlobalScripts mGlobalScripts;
+        std::unordered_map<std::string, Compiler::Locals, ::Misc::StringUtils::CiHash, ::Misc::StringUtils::CiEqual>
+            mOtherLocals;
+        std::vector<std::string> mScriptBlacklist;
 
-            ScriptManager (const MWWorld::ESMStore& store,
-                Compiler::Context& compilerContext, int warningsMode,
-                const std::vector<std::string>& scriptBlacklist);
+    public:
+        ScriptManager(const MWWorld::ESMStore& store, Compiler::Context& compilerContext, int warningsMode,
+            const std::vector<std::string>& scriptBlacklist);
 
-            void clear() override;
+        void clear() override;
 
-            bool run(std::string_view name, Interpreter::Context& interpreterContext) override;
-            ///< Run the script with the given name (compile first, if not compiled yet)
+        bool run(std::string_view name, Interpreter::Context& interpreterContext) override;
+        ///< Run the script with the given name (compile first, if not compiled yet)
 
-            bool compile(std::string_view name) override;
-            ///< Compile script with the given namen
-            /// \return Success?
+        bool compile(std::string_view name) override;
+        ///< Compile script with the given namen
+        /// \return Success?
 
-            std::pair<int, int> compileAll() override;
-            ///< Compile all scripts
-            /// \return count, success
+        std::pair<int, int> compileAll() override;
+        ///< Compile all scripts
+        /// \return count, success
 
-            const Compiler::Locals& getLocals(std::string_view name) override;
-            ///< Return locals for script \a name.
+        const Compiler::Locals& getLocals(std::string_view name) override;
+        ///< Return locals for script \a name.
 
-            GlobalScripts& getGlobalScripts() override;
+        GlobalScripts& getGlobalScripts() override;
 
-            const Compiler::Extensions& getExtensions() const override;
+        const Compiler::Extensions& getExtensions() const override;
     };
 }
 
diff --git a/apps/openmw/mwscript/skyextensions.cpp b/apps/openmw/mwscript/skyextensions.cpp
index 6ade880c7e..26cb1fabca 100644
--- a/apps/openmw/mwscript/skyextensions.cpp
+++ b/apps/openmw/mwscript/skyextensions.cpp
@@ -4,10 +4,10 @@
 
 #include <components/compiler/opcodes.hpp>
 
+#include <components/esm3/loadregn.hpp>
 #include <components/interpreter/interpreter.hpp>
-#include <components/interpreter/runtime.hpp>
 #include <components/interpreter/opcodes.hpp>
-#include <components/esm3/loadregn.hpp>
+#include <components/interpreter/runtime.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -22,110 +22,102 @@ namespace MWScript
     {
         class OpToggleSky : public Interpreter::Opcode0
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                bool enabled = MWBase::Environment::get().getWorld()->toggleSky();
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    bool enabled = MWBase::Environment::get().getWorld()->toggleSky();
-
-                    runtime.getContext().report (enabled ? "Sky -> On" : "Sky -> Off");
-                }
+                runtime.getContext().report(enabled ? "Sky -> On" : "Sky -> Off");
+            }
         };
 
         class OpTurnMoonWhite : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWBase::Environment::get().getWorld()->setMoonColour (false);
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWBase::Environment::get().getWorld()->setMoonColour(false);
+            }
         };
 
         class OpTurnMoonRed : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWBase::Environment::get().getWorld()->setMoonColour (true);
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWBase::Environment::get().getWorld()->setMoonColour(true);
+            }
         };
 
         class OpGetMasserPhase : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    runtime.push (MWBase::Environment::get().getWorld()->getMasserPhase());
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                runtime.push(MWBase::Environment::get().getWorld()->getMasserPhase());
+            }
         };
 
         class OpGetSecundaPhase : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    runtime.push (MWBase::Environment::get().getWorld()->getSecundaPhase());
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                runtime.push(MWBase::Environment::get().getWorld()->getSecundaPhase());
+            }
         };
 
         class OpGetCurrentWeather : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    runtime.push (MWBase::Environment::get().getWorld()->getCurrentWeather());
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                runtime.push(MWBase::Environment::get().getWorld()->getCurrentWeather());
+            }
         };
 
         class OpChangeWeather : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    std::string_view region{runtime.getStringLiteral(runtime[0].mInteger)};
-                    runtime.pop();
-
-                    Interpreter::Type_Integer id = runtime[0].mInteger;
-                    runtime.pop();
-
-                    const ESM::Region* reg = MWBase::Environment::get().getWorld()->getStore().get<ESM::Region>().search(region);
-                    if (reg)
-                        MWBase::Environment::get().getWorld()->changeWeather(region, id);
-                    else
-                        runtime.getContext().report("Warning: Region \"" + std::string(region) + "\" was not found");
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                std::string_view region{ runtime.getStringLiteral(runtime[0].mInteger) };
+                runtime.pop();
+
+                Interpreter::Type_Integer id = runtime[0].mInteger;
+                runtime.pop();
+
+                const ESM::Region* reg
+                    = MWBase::Environment::get().getWorld()->getStore().get<ESM::Region>().search(region);
+                if (reg)
+                    MWBase::Environment::get().getWorld()->changeWeather(region, id);
+                else
+                    runtime.getContext().report("Warning: Region \"" + std::string(region) + "\" was not found");
+            }
         };
 
         class OpModRegion : public Interpreter::Opcode1
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                std::string_view region{ runtime.getStringLiteral(runtime[0].mInteger) };
+                runtime.pop();
+
+                std::vector<char> chances;
+                chances.reserve(10);
+                while (arg0 > 0)
                 {
-                    std::string_view region{runtime.getStringLiteral(runtime[0].mInteger)};
+                    chances.push_back(std::clamp(runtime[0].mInteger, 0, 127));
                     runtime.pop();
-
-                    std::vector<char> chances;
-                    chances.reserve(10);
-                    while(arg0 > 0)
-                    {
-                        chances.push_back(std::clamp(runtime[0].mInteger, 0, 127));
-                        runtime.pop();
-                        arg0--;
-                    }
-
-                    MWBase::Environment::get().getWorld()->modRegion(region, chances);
+                    arg0--;
                 }
-        };
 
+                MWBase::Environment::get().getWorld()->modRegion(region, chances);
+            }
+        };
 
-        void installOpcodes (Interpreter::Interpreter& interpreter)
+        void installOpcodes(Interpreter::Interpreter& interpreter)
         {
             interpreter.installSegment5<OpToggleSky>(Compiler::Sky::opcodeToggleSky);
             interpreter.installSegment5<OpTurnMoonWhite>(Compiler::Sky::opcodeTurnMoonWhite);
diff --git a/apps/openmw/mwscript/skyextensions.hpp b/apps/openmw/mwscript/skyextensions.hpp
index 003f2fb190..f49aa04c95 100644
--- a/apps/openmw/mwscript/skyextensions.hpp
+++ b/apps/openmw/mwscript/skyextensions.hpp
@@ -15,8 +15,8 @@ namespace MWScript
 {
     /// \brief sky-related script functionality
     namespace Sky
-    {        
-        void installOpcodes (Interpreter::Interpreter& interpreter);
+    {
+        void installOpcodes(Interpreter::Interpreter& interpreter);
     }
 }
 
diff --git a/apps/openmw/mwscript/soundextensions.cpp b/apps/openmw/mwscript/soundextensions.cpp
index 744f94b02a..8ea1e89a23 100644
--- a/apps/openmw/mwscript/soundextensions.cpp
+++ b/apps/openmw/mwscript/soundextensions.cpp
@@ -3,16 +3,16 @@
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>
-#include <components/interpreter/runtime.hpp>
 #include <components/interpreter/opcodes.hpp>
+#include <components/interpreter/runtime.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/inventorystore.hpp"
 
 #include "interpretercontext.hpp"
 #include "ref.hpp"
@@ -21,181 +21,169 @@ namespace MWScript
 {
     namespace Sound
     {
-        template<class R>
+        template <class R>
         class OpSay : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    MWScript::InterpreterContext& context
-                        = static_cast<MWScript::InterpreterContext&> (runtime.getContext());
+                MWScript::InterpreterContext& context
+                    = static_cast<MWScript::InterpreterContext&>(runtime.getContext());
 
-                    std::string file{runtime.getStringLiteral(runtime[0].mInteger)};
-                    runtime.pop();
+                std::string file{ runtime.getStringLiteral(runtime[0].mInteger) };
+                runtime.pop();
 
-                    std::string_view text = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view text = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    MWBase::Environment::get().getSoundManager()->say (ptr, file);
+                MWBase::Environment::get().getSoundManager()->say(ptr, file);
 
-                    if (MWBase::Environment::get().getWindowManager ()->getSubtitlesEnabled())
-                        context.messageBox (text);
-                }
+                if (MWBase::Environment::get().getWindowManager()->getSubtitlesEnabled())
+                    context.messageBox(text);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpSayDone : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    runtime.push (MWBase::Environment::get().getSoundManager()->sayDone (ptr));
-                }
+                runtime.push(MWBase::Environment::get().getSoundManager()->sayDone(ptr));
+            }
         };
 
         class OpStreamMusic : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    std::string sound{runtime.getStringLiteral(runtime[0].mInteger)};
-                    runtime.pop();
-
-                    MWBase::Environment::get().getSoundManager()->streamMusic (sound);
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                std::string sound{ runtime.getStringLiteral(runtime[0].mInteger) };
+                runtime.pop();
+
+                MWBase::Environment::get().getSoundManager()->streamMusic(sound);
+            }
         };
 
         class OpPlaySound : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    std::string_view sound = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
-
-                    MWBase::Environment::get().getSoundManager()->playSound(sound, 1.0, 1.0, MWSound::Type::Sfx, MWSound::PlayMode::NoEnv);
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                std::string_view sound = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
+
+                MWBase::Environment::get().getSoundManager()->playSound(
+                    sound, 1.0, 1.0, MWSound::Type::Sfx, MWSound::PlayMode::NoEnv);
+            }
         };
 
         class OpPlaySoundVP : public Interpreter::Opcode0
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                std::string_view sound = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    std::string_view sound = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
-
-                    Interpreter::Type_Float volume = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float volume = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float pitch = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float pitch = runtime[0].mFloat;
+                runtime.pop();
 
-                    MWBase::Environment::get().getSoundManager()->playSound(sound, volume, pitch, MWSound::Type::Sfx, MWSound::PlayMode::NoEnv);
-                }
+                MWBase::Environment::get().getSoundManager()->playSound(
+                    sound, volume, pitch, MWSound::Type::Sfx, MWSound::PlayMode::NoEnv);
+            }
         };
 
-        template<class R, bool TLoop>
+        template <class R, bool TLoop>
         class OpPlaySound3D : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view sound = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view sound = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    MWBase::Environment::get().getSoundManager()->playSound3D(ptr, sound, 1.0, 1.0,
-                                                                              MWSound::Type::Sfx,
-                                                                              TLoop ? MWSound::PlayMode::LoopRemoveAtDistance
-                                                                                    : MWSound::PlayMode::Normal);
-                }
+                MWBase::Environment::get().getSoundManager()->playSound3D(ptr, sound, 1.0, 1.0, MWSound::Type::Sfx,
+                    TLoop ? MWSound::PlayMode::LoopRemoveAtDistance : MWSound::PlayMode::Normal);
+            }
         };
 
-        template<class R, bool TLoop>
+        template <class R, bool TLoop>
         class OpPlaySoundVP3D : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view sound = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view sound = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    Interpreter::Type_Float volume = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float volume = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float pitch = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float pitch = runtime[0].mFloat;
+                runtime.pop();
 
-                    MWBase::Environment::get().getSoundManager()->playSound3D(ptr, sound, volume, pitch,
-                                                                              MWSound::Type::Sfx,
-                                                                              TLoop ? MWSound::PlayMode::LoopRemoveAtDistance
-                                                                                    : MWSound::PlayMode::Normal);
-
-                }
+                MWBase::Environment::get().getSoundManager()->playSound3D(ptr, sound, volume, pitch, MWSound::Type::Sfx,
+                    TLoop ? MWSound::PlayMode::LoopRemoveAtDistance : MWSound::PlayMode::Normal);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpStopSound : public Interpreter::Opcode0
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-
-                    std::string_view sound = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view sound = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    MWBase::Environment::get().getSoundManager()->stopSound3D (ptr, sound);
-                }
+                MWBase::Environment::get().getSoundManager()->stopSound3D(ptr, sound);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetSoundPlaying : public Interpreter::Opcode0
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+                int index = runtime[0].mInteger;
+                runtime.pop();
 
-                    int index = runtime[0].mInteger;
-                    runtime.pop();
+                bool ret = MWBase::Environment::get().getSoundManager()->getSoundPlaying(
+                    ptr, runtime.getStringLiteral(index));
 
-                    bool ret = MWBase::Environment::get().getSoundManager()->getSoundPlaying (
-                                    ptr, runtime.getStringLiteral (index));
+                // GetSoundPlaying called on an equipped item should also look for sounds played by the equipping actor.
+                if (!ret && ptr.getContainerStore())
+                {
+                    MWWorld::Ptr cont = MWBase::Environment::get().getWorld()->findContainer(ptr);
 
-                    // GetSoundPlaying called on an equipped item should also look for sounds played by the equipping actor.
-                    if (!ret && ptr.getContainerStore())
+                    if (!cont.isEmpty() && cont.getClass().hasInventoryStore(cont)
+                        && cont.getClass().getInventoryStore(cont).isEquipped(ptr))
                     {
-                        MWWorld::Ptr cont = MWBase::Environment::get().getWorld()->findContainer(ptr);
-
-                        if (!cont.isEmpty() && cont.getClass().hasInventoryStore(cont) && cont.getClass().getInventoryStore(cont).isEquipped(ptr))
-                        {
-                            ret = MWBase::Environment::get().getSoundManager()->getSoundPlaying (
-                                        cont, runtime.getStringLiteral (index));
-                        }
+                        ret = MWBase::Environment::get().getSoundManager()->getSoundPlaying(
+                            cont, runtime.getStringLiteral(index));
                     }
-
-                    runtime.push(ret);
                 }
-        };
 
+                runtime.push(ret);
+            }
+        };
 
         void installOpcodes(Interpreter::Interpreter& interpreter)
         {
@@ -214,9 +202,12 @@ namespace MWScript
             interpreter.installSegment5<OpSay<ExplicitRef>>(Compiler::Sound::opcodeSayExplicit);
             interpreter.installSegment5<OpSayDone<ExplicitRef>>(Compiler::Sound::opcodeSayDoneExplicit);
             interpreter.installSegment5<OpPlaySound3D<ExplicitRef, false>>(Compiler::Sound::opcodePlaySound3DExplicit);
-            interpreter.installSegment5<OpPlaySoundVP3D<ExplicitRef, false>>(Compiler::Sound::opcodePlaySound3DVPExplicit);
-            interpreter.installSegment5<OpPlaySound3D<ExplicitRef, true>>(Compiler::Sound::opcodePlayLoopSound3DExplicit);
-            interpreter.installSegment5<OpPlaySoundVP3D<ExplicitRef, true>>(Compiler::Sound::opcodePlayLoopSound3DVPExplicit);
+            interpreter.installSegment5<OpPlaySoundVP3D<ExplicitRef, false>>(
+                Compiler::Sound::opcodePlaySound3DVPExplicit);
+            interpreter.installSegment5<OpPlaySound3D<ExplicitRef, true>>(
+                Compiler::Sound::opcodePlayLoopSound3DExplicit);
+            interpreter.installSegment5<OpPlaySoundVP3D<ExplicitRef, true>>(
+                Compiler::Sound::opcodePlayLoopSound3DVPExplicit);
             interpreter.installSegment5<OpStopSound<ExplicitRef>>(Compiler::Sound::opcodeStopSoundExplicit);
             interpreter.installSegment5<OpGetSoundPlaying<ExplicitRef>>(Compiler::Sound::opcodeGetSoundPlayingExplicit);
         }
diff --git a/apps/openmw/mwscript/soundextensions.hpp b/apps/openmw/mwscript/soundextensions.hpp
index b92d7ea1bb..a4aeacad64 100644
--- a/apps/openmw/mwscript/soundextensions.hpp
+++ b/apps/openmw/mwscript/soundextensions.hpp
@@ -15,10 +15,9 @@ namespace MWScript
 {
     namespace Sound
     {
-        // Script-extensions related to sound        
-        void installOpcodes (Interpreter::Interpreter& interpreter);
+        // Script-extensions related to sound
+        void installOpcodes(Interpreter::Interpreter& interpreter);
     }
 }
 
 #endif
-
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index 72f7304803..754d0e1d7b 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -9,10 +9,10 @@
 #include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 #include <components/debug/debuglog.hpp>
+#include <components/esm3/loadfact.hpp>
 #include <components/interpreter/interpreter.hpp>
-#include <components/interpreter/runtime.hpp>
 #include <components/interpreter/opcodes.hpp>
-#include <components/esm3/loadfact.hpp>
+#include <components/interpreter/runtime.hpp>
 
 #include <components/esm3/loadmgef.hpp>
 
@@ -25,9 +25,9 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/player.hpp"
 
+#include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
-#include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/spellcasting.hpp"
 
 #include "ref.hpp"
@@ -38,8 +38,7 @@ namespace
     {
         std::string_view factionId = actor.getClass().getPrimaryFaction(actor);
         if (factionId.empty())
-            throw std::runtime_error (
-                "failed to determine dialogue actors faction (because actor is factionless)");
+            throw std::runtime_error("failed to determine dialogue actors faction (because actor is factionless)");
 
         return factionId;
     }
@@ -50,15 +49,15 @@ namespace
         const float modifier = stat.getModifier() - stat.getDamage();
         const float modified = base + modifier;
         // Clamp to 100 unless base < 100 and we have a fortification going
-        if((modifier <= 0.f || base >= 100.f) && amount > 0.f)
+        if ((modifier <= 0.f || base >= 100.f) && amount > 0.f)
             amount = std::clamp(100.f - modified, 0.f, amount);
         // Clamp the modified value in a way that doesn't properly account for negative numbers
         float newModified = modified + amount;
-        if(newModified < 0.f)
+        if (newModified < 0.f)
         {
-            if(modified >= 0.f)
+            if (modified >= 0.f)
                 newModified = 0.f;
-            else if(newModified < modified)
+            else if (newModified < modified)
                 newModified = modified;
         }
         // Calculate damage/fortification based on the clamped base value
@@ -71,1130 +70,1091 @@ namespace MWScript
 {
     namespace Stats
     {
-        template<class R>
+        template <class R>
         class OpGetLevel : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Integer value =
-                        ptr.getClass()
-                            .getCreatureStats (ptr)
-                            .getLevel();
+                Interpreter::Type_Integer value = ptr.getClass().getCreatureStats(ptr).getLevel();
 
-                    runtime.push (value);
-                }
+                runtime.push(value);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpSetLevel : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Integer value = runtime[0].mInteger;
-                    runtime.pop();
+                Interpreter::Type_Integer value = runtime[0].mInteger;
+                runtime.pop();
 
-                    ptr.getClass()
-                        .getCreatureStats (ptr)
-                        .setLevel(value);
-                }
+                ptr.getClass().getCreatureStats(ptr).setLevel(value);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetAttribute : public Interpreter::Opcode0
         {
-                int mIndex;
-
-            public:
+            int mIndex;
 
-                OpGetAttribute (int index) : mIndex (index) {}
+        public:
+            OpGetAttribute(int index)
+                : mIndex(index)
+            {
+            }
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Float value =
-                        ptr.getClass()
-                            .getCreatureStats (ptr)
-                            .getAttribute(mIndex)
-                            .getModified();
+                Interpreter::Type_Float value = ptr.getClass().getCreatureStats(ptr).getAttribute(mIndex).getModified();
 
-                    runtime.push (value);
-                }
+                runtime.push(value);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpSetAttribute : public Interpreter::Opcode0
         {
-                int mIndex;
+            int mIndex;
 
-            public:
-
-                OpSetAttribute (int index) : mIndex (index) {}
+        public:
+            OpSetAttribute(int index)
+                : mIndex(index)
+            {
+            }
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Float value = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float value = runtime[0].mFloat;
+                runtime.pop();
 
-                    MWMechanics::AttributeValue attribute = ptr.getClass().getCreatureStats(ptr).getAttribute(mIndex);
-                    attribute.setBase(value, true);
-                    ptr.getClass().getCreatureStats(ptr).setAttribute(mIndex, attribute);
-                }
+                MWMechanics::AttributeValue attribute = ptr.getClass().getCreatureStats(ptr).getAttribute(mIndex);
+                attribute.setBase(value, true);
+                ptr.getClass().getCreatureStats(ptr).setAttribute(mIndex, attribute);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpModAttribute : public Interpreter::Opcode0
         {
-                int mIndex;
-
-            public:
+            int mIndex;
 
-                OpModAttribute (int index) : mIndex (index) {}
+        public:
+            OpModAttribute(int index)
+                : mIndex(index)
+            {
+            }
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Float value = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float value = runtime[0].mFloat;
+                runtime.pop();
 
-                    MWMechanics::AttributeValue attribute = ptr.getClass()
-                        .getCreatureStats(ptr)
-                        .getAttribute(mIndex);
-                    modStat(attribute, value);
-                    ptr.getClass().getCreatureStats(ptr).setAttribute(mIndex, attribute);
-                }
+                MWMechanics::AttributeValue attribute = ptr.getClass().getCreatureStats(ptr).getAttribute(mIndex);
+                modStat(attribute, value);
+                ptr.getClass().getCreatureStats(ptr).setAttribute(mIndex, attribute);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetDynamic : public Interpreter::Opcode0
         {
-                int mIndex;
+            int mIndex;
 
-            public:
+        public:
+            OpGetDynamic(int index)
+                : mIndex(index)
+            {
+            }
 
-                OpGetDynamic (int index) : mIndex (index) {}
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                Interpreter::Type_Float value;
 
-                void execute (Interpreter::Runtime& runtime) override
+                if (mIndex == 0 && ptr.getClass().hasItemHealth(ptr))
                 {
-                    MWWorld::Ptr ptr = R()(runtime);
-                    Interpreter::Type_Float value;
-
-                    if (mIndex==0 && ptr.getClass().hasItemHealth (ptr))
-                    {
-                        // health is a special case
-                        value = static_cast<Interpreter::Type_Float>(ptr.getClass().getItemMaxHealth(ptr));
-                    } else {
-                        value =
-                            ptr.getClass()
-                                .getCreatureStats(ptr)
-                                .getDynamic(mIndex)
-                                .getCurrent();
-                        // GetMagicka shouldn't return negative values
-                        if(mIndex == 1 && value < 0)
-                            value = 0;
-                    }
-                    runtime.push (value);
+                    // health is a special case
+                    value = static_cast<Interpreter::Type_Float>(ptr.getClass().getItemMaxHealth(ptr));
+                }
+                else
+                {
+                    value = ptr.getClass().getCreatureStats(ptr).getDynamic(mIndex).getCurrent();
+                    // GetMagicka shouldn't return negative values
+                    if (mIndex == 1 && value < 0)
+                        value = 0;
                 }
+                runtime.push(value);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpSetDynamic : public Interpreter::Opcode0
         {
-                int mIndex;
-
-            public:
+            int mIndex;
 
-                OpSetDynamic (int index) : mIndex (index) {}
+        public:
+            OpSetDynamic(int index)
+                : mIndex(index)
+            {
+            }
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Float value = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float value = runtime[0].mFloat;
+                runtime.pop();
 
-                    MWMechanics::DynamicStat<float> stat (ptr.getClass().getCreatureStats (ptr)
-                        .getDynamic (mIndex));
+                MWMechanics::DynamicStat<float> stat(ptr.getClass().getCreatureStats(ptr).getDynamic(mIndex));
 
-                    stat.setBase(value);
-                    stat.setCurrent(stat.getModified(false), true, true);
+                stat.setBase(value);
+                stat.setCurrent(stat.getModified(false), true, true);
 
-                    ptr.getClass().getCreatureStats (ptr).setDynamic (mIndex, stat);
-                }
+                ptr.getClass().getCreatureStats(ptr).setDynamic(mIndex, stat);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpModDynamic : public Interpreter::Opcode0
         {
-                int mIndex;
+            int mIndex;
 
-            public:
+        public:
+            OpModDynamic(int index)
+                : mIndex(index)
+            {
+            }
 
-                OpModDynamic (int index) : mIndex (index) {}
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                int peek = R::implicit ? 0 : runtime[0].mInteger;
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    int peek = R::implicit ? 0 : runtime[0].mInteger;
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    MWWorld::Ptr ptr = R()(runtime);
+                Interpreter::Type_Float diff = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float diff = runtime[0].mFloat;
-                    runtime.pop();
+                // workaround broken endgame scripts that kill dagoth ur
+                if (!R::implicit && ::Misc::StringUtils::ciEqual(ptr.getCellRef().getRefId(), "dagoth_ur_1"))
+                {
+                    runtime.push(peek);
 
-                    // workaround broken endgame scripts that kill dagoth ur
-                    if (!R::implicit &&
-                        ::Misc::StringUtils::ciEqual(ptr.getCellRef().getRefId(), "dagoth_ur_1"))
+                    if (R()(runtime, false, true).isEmpty())
                     {
-                        runtime.push (peek);
+                        Log(Debug::Warning) << "Warning: Compensating for broken script in Morrowind.esm by "
+                                            << "ignoring remote access to dagoth_ur_1";
 
-                        if (R()(runtime, false, true).isEmpty())
-                        {
-                            Log(Debug::Warning)
-                                << "Warning: Compensating for broken script in Morrowind.esm by "
-                                << "ignoring remote access to dagoth_ur_1";
-
-                            return;
-                        }
+                        return;
                     }
+                }
 
-                    MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
+                MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
 
-                    MWMechanics::DynamicStat<float> stat = stats.getDynamic(mIndex);
+                MWMechanics::DynamicStat<float> stat = stats.getDynamic(mIndex);
 
-                    float current = stat.getCurrent();
-                    float base = diff + stat.getBase();
-                    if(mIndex != 2)
-                        base = std::max(base, 0.f);
-                    stat.setBase(base);
-                    stat.setCurrent(diff + current, true, true);
+                float current = stat.getCurrent();
+                float base = diff + stat.getBase();
+                if (mIndex != 2)
+                    base = std::max(base, 0.f);
+                stat.setBase(base);
+                stat.setCurrent(diff + current, true, true);
 
-                    stats.setDynamic (mIndex, stat);
-                }
+                stats.setDynamic(mIndex, stat);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpModCurrentDynamic : public Interpreter::Opcode0
         {
-                int mIndex;
-
-            public:
-
-                OpModCurrentDynamic (int index) : mIndex (index) {}
+            int mIndex;
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            OpModCurrentDynamic(int index)
+                : mIndex(index)
+            {
+            }
 
-                    Interpreter::Type_Float diff = runtime[0].mFloat;
-                    runtime.pop();
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats (ptr);
+                Interpreter::Type_Float diff = runtime[0].mFloat;
+                runtime.pop();
 
-                    Interpreter::Type_Float current = stats.getDynamic(mIndex).getCurrent();
+                MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
 
-                    MWMechanics::DynamicStat<float> stat (ptr.getClass().getCreatureStats (ptr)
-                        .getDynamic (mIndex));
+                Interpreter::Type_Float current = stats.getDynamic(mIndex).getCurrent();
 
-                    bool allowDecreaseBelowZero = false;
-                    if (mIndex == 2) // Fatigue-specific logic
-                    {
-                        // For fatigue, a negative current value is allowed and means the actor will be knocked down
-                        allowDecreaseBelowZero = true;
-                        // Knock down the actor immediately if a non-positive new value is the case
-                        if (diff + current <= 0.f)
-                            ptr.getClass().getCreatureStats(ptr).setKnockedDown(true);
-                    }
-                    stat.setCurrent (diff + current, allowDecreaseBelowZero);
+                MWMechanics::DynamicStat<float> stat(ptr.getClass().getCreatureStats(ptr).getDynamic(mIndex));
 
-                    ptr.getClass().getCreatureStats (ptr).setDynamic (mIndex, stat);
+                bool allowDecreaseBelowZero = false;
+                if (mIndex == 2) // Fatigue-specific logic
+                {
+                    // For fatigue, a negative current value is allowed and means the actor will be knocked down
+                    allowDecreaseBelowZero = true;
+                    // Knock down the actor immediately if a non-positive new value is the case
+                    if (diff + current <= 0.f)
+                        ptr.getClass().getCreatureStats(ptr).setKnockedDown(true);
                 }
+                stat.setCurrent(diff + current, allowDecreaseBelowZero);
+
+                ptr.getClass().getCreatureStats(ptr).setDynamic(mIndex, stat);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetDynamicGetRatio : public Interpreter::Opcode0
         {
-                int mIndex;
-
-            public:
+            int mIndex;
 
-                OpGetDynamicGetRatio (int index) : mIndex (index) {}
+        public:
+            OpGetDynamicGetRatio(int index)
+                : mIndex(index)
+            {
+            }
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-                    const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
 
-                    runtime.push(stats.getDynamic(mIndex).getRatio());
-                }
+                runtime.push(stats.getDynamic(mIndex).getRatio());
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetSkill : public Interpreter::Opcode0
         {
-                int mIndex;
-
-            public:
+            int mIndex;
 
-                OpGetSkill (int index) : mIndex (index) {}
+        public:
+            OpGetSkill(int index)
+                : mIndex(index)
+            {
+            }
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Float value = ptr.getClass().getSkill(ptr, mIndex);
+                Interpreter::Type_Float value = ptr.getClass().getSkill(ptr, mIndex);
 
-                    runtime.push (value);
-                }
+                runtime.push(value);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpSetSkill : public Interpreter::Opcode0
         {
-                int mIndex;
-
-            public:
+            int mIndex;
 
-                OpSetSkill (int index) : mIndex (index) {}
+        public:
+            OpSetSkill(int index)
+                : mIndex(index)
+            {
+            }
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Float value = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float value = runtime[0].mFloat;
+                runtime.pop();
 
-                    MWMechanics::NpcStats& stats = ptr.getClass().getNpcStats (ptr);
+                MWMechanics::NpcStats& stats = ptr.getClass().getNpcStats(ptr);
 
-                    stats.getSkill(mIndex).setBase(value, true);
-                }
+                stats.getSkill(mIndex).setBase(value, true);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpModSkill : public Interpreter::Opcode0
         {
-                int mIndex;
+            int mIndex;
 
-            public:
-
-                OpModSkill (int index) : mIndex (index) {}
+        public:
+            OpModSkill(int index)
+                : mIndex(index)
+            {
+            }
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Float value = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float value = runtime[0].mFloat;
+                runtime.pop();
 
-                    MWMechanics::SkillValue &skill = ptr.getClass()
-                        .getNpcStats(ptr)
-                        .getSkill(mIndex);
-                    modStat(skill, value);
-                }
+                MWMechanics::SkillValue& skill = ptr.getClass().getNpcStats(ptr).getSkill(mIndex);
+                modStat(skill, value);
+            }
         };
 
         class OpGetPCCrimeLevel : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWBase::World *world = MWBase::Environment::get().getWorld();
-                    MWWorld::Ptr player = world->getPlayerPtr();
-                    runtime.push (static_cast <Interpreter::Type_Float> (player.getClass().getNpcStats (player).getBounty()));
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWBase::World* world = MWBase::Environment::get().getWorld();
+                MWWorld::Ptr player = world->getPlayerPtr();
+                runtime.push(static_cast<Interpreter::Type_Float>(player.getClass().getNpcStats(player).getBounty()));
+            }
         };
 
         class OpSetPCCrimeLevel : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWBase::World *world = MWBase::Environment::get().getWorld();
-                    MWWorld::Ptr player = world->getPlayerPtr();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWBase::World* world = MWBase::Environment::get().getWorld();
+                MWWorld::Ptr player = world->getPlayerPtr();
 
-                    int bounty = static_cast<int>(runtime[0].mFloat);
-                    runtime.pop();
-                    player.getClass().getNpcStats (player).setBounty(bounty);
+                int bounty = static_cast<int>(runtime[0].mFloat);
+                runtime.pop();
+                player.getClass().getNpcStats(player).setBounty(bounty);
 
-                    if (bounty == 0)
-                        MWBase::Environment::get().getWorld()->getPlayer().recordCrimeId();
-                }
+                if (bounty == 0)
+                    MWBase::Environment::get().getWorld()->getPlayer().recordCrimeId();
+            }
         };
 
         class OpModPCCrimeLevel : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWBase::World *world = MWBase::Environment::get().getWorld();
-                    MWWorld::Ptr player = world->getPlayerPtr();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWBase::World* world = MWBase::Environment::get().getWorld();
+                MWWorld::Ptr player = world->getPlayerPtr();
 
-                    player.getClass().getNpcStats(player).setBounty(static_cast<int>(runtime[0].mFloat) + player.getClass().getNpcStats(player).getBounty());
-                    runtime.pop();
-                }
+                player.getClass().getNpcStats(player).setBounty(
+                    static_cast<int>(runtime[0].mFloat) + player.getClass().getNpcStats(player).getBounty());
+                runtime.pop();
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpAddSpell : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view id = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view id = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (id);
+                const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(id);
 
-                    MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
-                    creatureStats.getSpells().add(spell);
-                    ESM::Spell::SpellType type = static_cast<ESM::Spell::SpellType>(spell->mData.mType);
-                    if (type != ESM::Spell::ST_Spell && type != ESM::Spell::ST_Power)
-                    {
-                        // Add spell effect to *this actor's* queue immediately
-                        creatureStats.getActiveSpells().addSpell(spell, ptr);
-                        // Apply looping particles immediately for constant effects
-                        MWBase::Environment::get().getWorld()->applyLoopingParticles(ptr);
-                    }
+                MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
+                creatureStats.getSpells().add(spell);
+                ESM::Spell::SpellType type = static_cast<ESM::Spell::SpellType>(spell->mData.mType);
+                if (type != ESM::Spell::ST_Spell && type != ESM::Spell::ST_Power)
+                {
+                    // Add spell effect to *this actor's* queue immediately
+                    creatureStats.getActiveSpells().addSpell(spell, ptr);
+                    // Apply looping particles immediately for constant effects
+                    MWBase::Environment::get().getWorld()->applyLoopingParticles(ptr);
                 }
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpRemoveSpell : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view id = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view id = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
-                    creatureStats.getSpells().remove (id);
+                MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
+                creatureStats.getSpells().remove(id);
 
-                    MWBase::WindowManager *wm = MWBase::Environment::get().getWindowManager();
+                MWBase::WindowManager* wm = MWBase::Environment::get().getWindowManager();
 
-                    if (ptr == MWMechanics::getPlayer() &&
-                        id == wm->getSelectedSpell())
-                    {
-                        wm->unsetSelectedSpell();
-                    }
+                if (ptr == MWMechanics::getPlayer() && id == wm->getSelectedSpell())
+                {
+                    wm->unsetSelectedSpell();
                 }
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpRemoveSpellEffects : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view spellid = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view spellid = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    ptr.getClass().getCreatureStats (ptr).getActiveSpells().removeEffects(ptr, spellid);
-                }
+                ptr.getClass().getCreatureStats(ptr).getActiveSpells().removeEffects(ptr, spellid);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpRemoveEffects : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Integer effectId = runtime[0].mInteger;
-                    runtime.pop();
+                Interpreter::Type_Integer effectId = runtime[0].mInteger;
+                runtime.pop();
 
-                    ptr.getClass().getCreatureStats (ptr).getActiveSpells().purgeEffect(ptr, effectId);
-                }
+                ptr.getClass().getCreatureStats(ptr).getActiveSpells().purgeEffect(ptr, effectId);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetSpell : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
 
-                    MWWorld::Ptr ptr = R()(runtime);
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view id = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view id = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    Interpreter::Type_Integer value = 0;
+                Interpreter::Type_Integer value = 0;
 
-                    if (ptr.getClass().isActor() && ptr.getClass().getCreatureStats(ptr).getSpells().hasSpell(id))
-                        value = 1;
+                if (ptr.getClass().isActor() && ptr.getClass().getCreatureStats(ptr).getSpells().hasSpell(id))
+                    value = 1;
 
-                    runtime.push (value);
-                }
+                runtime.push(value);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpPCJoinFaction : public Interpreter::Opcode1
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
-                {
-                    MWWorld::ConstPtr actor = R()(runtime, false);
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                MWWorld::ConstPtr actor = R()(runtime, false);
 
-                    std::string_view factionID;
+                std::string_view factionID;
 
-                    if(arg0==0)
-                    {
-                        factionID = getDialogueActorFaction(actor);
-                    }
-                    else
-                    {
-                        factionID = runtime.getStringLiteral (runtime[0].mInteger);
-                        runtime.pop();
-                    }
-                    // Make sure this faction exists
-                    MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(factionID);
+                if (arg0 == 0)
+                {
+                    factionID = getDialogueActorFaction(actor);
+                }
+                else
+                {
+                    factionID = runtime.getStringLiteral(runtime[0].mInteger);
+                    runtime.pop();
+                }
+                // Make sure this faction exists
+                MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(factionID);
 
-                    if(!factionID.empty())
-                    {
-                        MWWorld::Ptr player = MWMechanics::getPlayer();
-                        player.getClass().getNpcStats(player).joinFaction(factionID);
-                    }
+                if (!factionID.empty())
+                {
+                    MWWorld::Ptr player = MWMechanics::getPlayer();
+                    player.getClass().getNpcStats(player).joinFaction(factionID);
                 }
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpPCRaiseRank : public Interpreter::Opcode1
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                MWWorld::ConstPtr actor = R()(runtime, false);
 
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
-                {
-                    MWWorld::ConstPtr actor = R()(runtime, false);
+                std::string_view factionID;
 
-                    std::string_view factionID;
+                if (arg0 == 0)
+                {
+                    factionID = getDialogueActorFaction(actor);
+                }
+                else
+                {
+                    factionID = runtime.getStringLiteral(runtime[0].mInteger);
+                    runtime.pop();
+                }
+                // Make sure this faction exists
+                MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(factionID);
 
-                    if(arg0==0)
+                if (!factionID.empty())
+                {
+                    MWWorld::Ptr player = MWMechanics::getPlayer();
+                    if (!player.getClass().getNpcStats(player).isInFaction(factionID))
                     {
-                        factionID = getDialogueActorFaction(actor);
+                        player.getClass().getNpcStats(player).joinFaction(factionID);
                     }
                     else
                     {
-                        factionID = runtime.getStringLiteral (runtime[0].mInteger);
-                        runtime.pop();
-                    }
-                    // Make sure this faction exists
-                    MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(factionID);
-
-                    if(!factionID.empty())
-                    {
-                        MWWorld::Ptr player = MWMechanics::getPlayer();
-                        if(!player.getClass().getNpcStats(player).isInFaction(factionID))
-                        {
-                            player.getClass().getNpcStats(player).joinFaction(factionID);
-                        }
-                        else
-                        {
-                            player.getClass().getNpcStats(player).raiseRank(factionID);
-                        }
+                        player.getClass().getNpcStats(player).raiseRank(factionID);
                     }
                 }
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpPCLowerRank : public Interpreter::Opcode1
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
-                {
-                    MWWorld::ConstPtr actor = R()(runtime, false);
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                MWWorld::ConstPtr actor = R()(runtime, false);
 
-                    std::string_view factionID;
+                std::string_view factionID;
 
-                    if(arg0==0)
-                    {
-                        factionID = getDialogueActorFaction(actor);
-                    }
-                    else
-                    {
-                        factionID = runtime.getStringLiteral (runtime[0].mInteger);
-                        runtime.pop();
-                    }
-                    // Make sure this faction exists
-                    MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(factionID);
+                if (arg0 == 0)
+                {
+                    factionID = getDialogueActorFaction(actor);
+                }
+                else
+                {
+                    factionID = runtime.getStringLiteral(runtime[0].mInteger);
+                    runtime.pop();
+                }
+                // Make sure this faction exists
+                MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(factionID);
 
-                    if(!factionID.empty())
-                    {
-                        MWWorld::Ptr player = MWMechanics::getPlayer();
-                        player.getClass().getNpcStats(player).lowerRank(factionID);
-                    }
+                if (!factionID.empty())
+                {
+                    MWWorld::Ptr player = MWMechanics::getPlayer();
+                    player.getClass().getNpcStats(player).lowerRank(factionID);
                 }
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetPCRank : public Interpreter::Opcode1
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                MWWorld::ConstPtr ptr = R()(runtime, false);
 
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
+                std::string_view factionID;
+                if (arg0 > 0)
                 {
-                    MWWorld::ConstPtr ptr = R()(runtime, false);
-
-                    std::string_view factionID;
-                    if(arg0 >0)
-                    {
-                        factionID = runtime.getStringLiteral (runtime[0].mInteger);
-                        runtime.pop();
-                    }
-                    else
-                    {
-                        factionID = ptr.getClass().getPrimaryFaction(ptr);
-                    }
-                    // Make sure this faction exists
-                    MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(factionID);
+                    factionID = runtime.getStringLiteral(runtime[0].mInteger);
+                    runtime.pop();
+                }
+                else
+                {
+                    factionID = ptr.getClass().getPrimaryFaction(ptr);
+                }
+                // Make sure this faction exists
+                MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(factionID);
 
-                    if(!factionID.empty())
-                    {
-                        MWWorld::Ptr player = MWMechanics::getPlayer();
-                        runtime.push(player.getClass().getNpcStats(player).getFactionRank(factionID));
-                    }
-                    else
-                    {
-                        runtime.push(-1);
-                    }
+                if (!factionID.empty())
+                {
+                    MWWorld::Ptr player = MWMechanics::getPlayer();
+                    runtime.push(player.getClass().getNpcStats(player).getFactionRank(factionID));
+                }
+                else
+                {
+                    runtime.push(-1);
                 }
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpModDisposition : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Integer value = runtime[0].mInteger;
-                    runtime.pop();
+                Interpreter::Type_Integer value = runtime[0].mInteger;
+                runtime.pop();
 
-                    if (ptr.getClass().isNpc())
-                        ptr.getClass().getNpcStats (ptr).setBaseDisposition
-                            (ptr.getClass().getNpcStats (ptr).getBaseDisposition() + value);
+                if (ptr.getClass().isNpc())
+                    ptr.getClass().getNpcStats(ptr).setBaseDisposition(
+                        ptr.getClass().getNpcStats(ptr).getBaseDisposition() + value);
 
-                    // else: must not throw exception (used by an Almalexia dialogue script)
-                }
+                // else: must not throw exception (used by an Almalexia dialogue script)
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpSetDisposition : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Integer value = runtime[0].mInteger;
-                    runtime.pop();
+                Interpreter::Type_Integer value = runtime[0].mInteger;
+                runtime.pop();
 
-                    if (ptr.getClass().isNpc())
-                        ptr.getClass().getNpcStats (ptr).setBaseDisposition (value);
-                }
+                if (ptr.getClass().isNpc())
+                    ptr.getClass().getNpcStats(ptr).setBaseDisposition(value);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetDisposition : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    if (!ptr.getClass().isNpc())
-                        runtime.push(0);
-                    else
-                        runtime.push (MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(ptr));
-                }
+                if (!ptr.getClass().isNpc())
+                    runtime.push(0);
+                else
+                    runtime.push(MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(ptr));
+            }
         };
 
         class OpGetDeadCount : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    std::string id{runtime.getStringLiteral(runtime[0].mInteger)};
-                    runtime[0].mInteger = MWBase::Environment::get().getMechanicsManager()->countDeaths (id);
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                std::string id{ runtime.getStringLiteral(runtime[0].mInteger) };
+                runtime[0].mInteger = MWBase::Environment::get().getMechanicsManager()->countDeaths(id);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetPCFacRep : public Interpreter::Opcode1
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
-                {
-                    MWWorld::ConstPtr ptr = R()(runtime, false);
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                MWWorld::ConstPtr ptr = R()(runtime, false);
 
-                    std::string_view factionId;
+                std::string_view factionId;
 
-                    if (arg0==1)
-                    {
-                        factionId = runtime.getStringLiteral (runtime[0].mInteger);
-                        runtime.pop();
-                    }
-                    else
-                    {
-                        factionId = getDialogueActorFaction(ptr);
-                    }
+                if (arg0 == 1)
+                {
+                    factionId = runtime.getStringLiteral(runtime[0].mInteger);
+                    runtime.pop();
+                }
+                else
+                {
+                    factionId = getDialogueActorFaction(ptr);
+                }
 
-                    if (factionId.empty())
-                        throw std::runtime_error ("failed to determine faction");
+                if (factionId.empty())
+                    throw std::runtime_error("failed to determine faction");
 
-                    MWWorld::Ptr player = MWMechanics::getPlayer();
-                    runtime.push (
-                        player.getClass().getNpcStats (player).getFactionReputation (factionId));
-                }
+                MWWorld::Ptr player = MWMechanics::getPlayer();
+                runtime.push(player.getClass().getNpcStats(player).getFactionReputation(factionId));
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpSetPCFacRep : public Interpreter::Opcode1
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
-                {
-                    MWWorld::ConstPtr ptr = R()(runtime, false);
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                MWWorld::ConstPtr ptr = R()(runtime, false);
 
-                    Interpreter::Type_Integer value = runtime[0].mInteger;
-                    runtime.pop();
+                Interpreter::Type_Integer value = runtime[0].mInteger;
+                runtime.pop();
 
-                    std::string_view factionId;
+                std::string_view factionId;
 
-                    if (arg0==1)
-                    {
-                        factionId = runtime.getStringLiteral (runtime[0].mInteger);
-                        runtime.pop();
-                    }
-                    else
-                    {
-                        factionId = getDialogueActorFaction(ptr);
-                    }
+                if (arg0 == 1)
+                {
+                    factionId = runtime.getStringLiteral(runtime[0].mInteger);
+                    runtime.pop();
+                }
+                else
+                {
+                    factionId = getDialogueActorFaction(ptr);
+                }
 
-                    if (factionId.empty())
-                        throw std::runtime_error ("failed to determine faction");
+                if (factionId.empty())
+                    throw std::runtime_error("failed to determine faction");
 
-                    MWWorld::Ptr player = MWMechanics::getPlayer();
-                    player.getClass().getNpcStats (player).setFactionReputation (factionId, value);
-                }
+                MWWorld::Ptr player = MWMechanics::getPlayer();
+                player.getClass().getNpcStats(player).setFactionReputation(factionId, value);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpModPCFacRep : public Interpreter::Opcode1
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
-                {
-                    MWWorld::ConstPtr ptr = R()(runtime, false);
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                MWWorld::ConstPtr ptr = R()(runtime, false);
 
-                    Interpreter::Type_Integer value = runtime[0].mInteger;
-                    runtime.pop();
+                Interpreter::Type_Integer value = runtime[0].mInteger;
+                runtime.pop();
 
-                    std::string_view factionId;
+                std::string_view factionId;
 
-                    if (arg0==1)
-                    {
-                        factionId = runtime.getStringLiteral (runtime[0].mInteger);
-                        runtime.pop();
-                    }
-                    else
-                    {
-                        factionId = getDialogueActorFaction(ptr);
-                    }
+                if (arg0 == 1)
+                {
+                    factionId = runtime.getStringLiteral(runtime[0].mInteger);
+                    runtime.pop();
+                }
+                else
+                {
+                    factionId = getDialogueActorFaction(ptr);
+                }
 
-                    if (factionId.empty())
-                        throw std::runtime_error ("failed to determine faction");
+                if (factionId.empty())
+                    throw std::runtime_error("failed to determine faction");
 
-                    MWWorld::Ptr player = MWMechanics::getPlayer();
-                    player.getClass().getNpcStats (player).setFactionReputation (factionId,
-                        player.getClass().getNpcStats (player).getFactionReputation (factionId)+
-                        value);
-                }
+                MWWorld::Ptr player = MWMechanics::getPlayer();
+                player.getClass().getNpcStats(player).setFactionReputation(
+                    factionId, player.getClass().getNpcStats(player).getFactionReputation(factionId) + value);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetCommonDisease : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    runtime.push (ptr.getClass().getCreatureStats (ptr).hasCommonDisease());
-                }
+                runtime.push(ptr.getClass().getCreatureStats(ptr).hasCommonDisease());
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetBlightDisease : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    runtime.push (ptr.getClass().getCreatureStats (ptr).hasBlightDisease());
-                }
+                runtime.push(ptr.getClass().getCreatureStats(ptr).hasBlightDisease());
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetRace : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::ConstPtr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::ConstPtr ptr = R()(runtime);
 
-                    std::string_view race = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view race = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    const std::string& npcRace = ptr.get<ESM::NPC>()->mBase->mRace;
+                const std::string& npcRace = ptr.get<ESM::NPC>()->mBase->mRace;
 
-                    runtime.push(::Misc::StringUtils::ciEqual(race, npcRace));
+                runtime.push(::Misc::StringUtils::ciEqual(race, npcRace));
             }
         };
 
         class OpGetWerewolfKills : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = MWBase::Environment::get().getWorld ()->getPlayerPtr();
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPlayerPtr();
 
-                    runtime.push (ptr.getClass().getNpcStats (ptr).getWerewolfKills ());
-                }
+                runtime.push(ptr.getClass().getNpcStats(ptr).getWerewolfKills());
+            }
         };
 
         template <class R>
         class OpPcExpelled : public Interpreter::Opcode1
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                MWWorld::ConstPtr ptr = R()(runtime, false);
 
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
+                std::string_view factionID;
+                if (arg0 > 0)
                 {
-                    MWWorld::ConstPtr ptr = R()(runtime, false);
-
-                    std::string_view factionID;
-                    if(arg0 >0 )
-                    {
-                        factionID = runtime.getStringLiteral (runtime[0].mInteger);
-                        runtime.pop();
-                    }
-                    else
-                    {
-                        factionID = ptr.getClass().getPrimaryFaction(ptr);
-                    }
-                    MWWorld::Ptr player = MWMechanics::getPlayer();
-                    if(!factionID.empty())
-                    {
-                        runtime.push(player.getClass().getNpcStats(player).getExpelled(factionID));
-                    }
-                    else
-                    {
-                        runtime.push(0);
-                    }
+                    factionID = runtime.getStringLiteral(runtime[0].mInteger);
+                    runtime.pop();
                 }
+                else
+                {
+                    factionID = ptr.getClass().getPrimaryFaction(ptr);
+                }
+                MWWorld::Ptr player = MWMechanics::getPlayer();
+                if (!factionID.empty())
+                {
+                    runtime.push(player.getClass().getNpcStats(player).getExpelled(factionID));
+                }
+                else
+                {
+                    runtime.push(0);
+                }
+            }
         };
 
         template <class R>
         class OpPcExpell : public Interpreter::Opcode1
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                MWWorld::ConstPtr ptr = R()(runtime, false);
 
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
+                std::string_view factionID;
+                if (arg0 > 0)
                 {
-                    MWWorld::ConstPtr ptr = R()(runtime, false);
-
-                    std::string_view factionID;
-                    if(arg0 >0 )
-                    {
-                        factionID = runtime.getStringLiteral (runtime[0].mInteger);
-                        runtime.pop();
-                    }
-                    else
-                    {
-                        factionID = ptr.getClass().getPrimaryFaction(ptr);
-                    }
-                    MWWorld::Ptr player = MWMechanics::getPlayer();
-                    if(!factionID.empty())
-                    {
-                        player.getClass().getNpcStats(player).expell(factionID);
-                    }
+                    factionID = runtime.getStringLiteral(runtime[0].mInteger);
+                    runtime.pop();
+                }
+                else
+                {
+                    factionID = ptr.getClass().getPrimaryFaction(ptr);
+                }
+                MWWorld::Ptr player = MWMechanics::getPlayer();
+                if (!factionID.empty())
+                {
+                    player.getClass().getNpcStats(player).expell(factionID);
                 }
+            }
         };
 
         template <class R>
         class OpPcClearExpelled : public Interpreter::Opcode1
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime, unsigned int arg0) override
+            {
+                MWWorld::ConstPtr ptr = R()(runtime, false);
 
-                void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
+                std::string_view factionID;
+                if (arg0 > 0)
                 {
-                    MWWorld::ConstPtr ptr = R()(runtime, false);
-
-                    std::string_view factionID;
-                    if(arg0 >0 )
-                    {
-                        factionID = runtime.getStringLiteral (runtime[0].mInteger);
-                        runtime.pop();
-                    }
-                    else
-                    {
-                        factionID = ptr.getClass().getPrimaryFaction(ptr);
-                    }
-                    MWWorld::Ptr player = MWMechanics::getPlayer();
-                    if(!factionID.empty())
-                        player.getClass().getNpcStats(player).clearExpelled(factionID);
+                    factionID = runtime.getStringLiteral(runtime[0].mInteger);
+                    runtime.pop();
                 }
+                else
+                {
+                    factionID = ptr.getClass().getPrimaryFaction(ptr);
+                }
+                MWWorld::Ptr player = MWMechanics::getPlayer();
+                if (!factionID.empty())
+                    player.getClass().getNpcStats(player).clearExpelled(factionID);
+            }
         };
 
         template <class R>
         class OpRaiseRank : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view factionID = ptr.getClass().getPrimaryFaction(ptr);
-                    if(factionID.empty())
-                        return;
+                std::string_view factionID = ptr.getClass().getPrimaryFaction(ptr);
+                if (factionID.empty())
+                    return;
 
-                    MWWorld::Ptr player = MWMechanics::getPlayer();
+                MWWorld::Ptr player = MWMechanics::getPlayer();
 
-                    // no-op when executed on the player
-                    if (ptr == player)
-                        return;
+                // no-op when executed on the player
+                if (ptr == player)
+                    return;
 
-                    // If we already changed rank for this NPC, modify current rank in the NPC stats.
-                    // Otherwise take rank from base NPC record, increase it and put it to NPC data.
-                    int currentRank = ptr.getClass().getNpcStats(ptr).getFactionRank(factionID);
-                    if (currentRank >= 0)
+                // If we already changed rank for this NPC, modify current rank in the NPC stats.
+                // Otherwise take rank from base NPC record, increase it and put it to NPC data.
+                int currentRank = ptr.getClass().getNpcStats(ptr).getFactionRank(factionID);
+                if (currentRank >= 0)
+                    ptr.getClass().getNpcStats(ptr).raiseRank(factionID);
+                else
+                {
+                    int rank = ptr.getClass().getPrimaryFactionRank(ptr);
+                    rank++;
+                    ptr.getClass().getNpcStats(ptr).joinFaction(factionID);
+                    for (int i = 0; i < rank; i++)
                         ptr.getClass().getNpcStats(ptr).raiseRank(factionID);
-                    else
-                    {
-                        int rank = ptr.getClass().getPrimaryFactionRank(ptr);
-                        rank++;
-                        ptr.getClass().getNpcStats(ptr).joinFaction(factionID);
-                        for (int i=0; i<rank; i++)
-                            ptr.getClass().getNpcStats(ptr).raiseRank(factionID);
-                    }
                 }
+            }
         };
 
         template <class R>
         class OpLowerRank : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-
-                    std::string_view factionID = ptr.getClass().getPrimaryFaction(ptr);
-                    if(factionID.empty())
-                        return;
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    MWWorld::Ptr player = MWMechanics::getPlayer();
+                std::string_view factionID = ptr.getClass().getPrimaryFaction(ptr);
+                if (factionID.empty())
+                    return;
 
-                    // no-op when executed on the player
-                    if (ptr == player)
-                        return;
+                MWWorld::Ptr player = MWMechanics::getPlayer();
 
-                    // If we already changed rank for this NPC, modify current rank in the NPC stats.
-                    // Otherwise take rank from base NPC record, decrease it and put it to NPC data.
-                    int currentRank = ptr.getClass().getNpcStats(ptr).getFactionRank(factionID);
-                    if (currentRank == 0)
-                        return;
-                    else if (currentRank > 0)
-                        ptr.getClass().getNpcStats(ptr).lowerRank(factionID);
-                    else
-                    {
-                        int rank = ptr.getClass().getPrimaryFactionRank(ptr);
-                        rank--;
-                        ptr.getClass().getNpcStats(ptr).joinFaction(factionID);
-                        for (int i=0; i<rank; i++)
-                            ptr.getClass().getNpcStats(ptr).raiseRank(factionID);
-                    }
+                // no-op when executed on the player
+                if (ptr == player)
+                    return;
+
+                // If we already changed rank for this NPC, modify current rank in the NPC stats.
+                // Otherwise take rank from base NPC record, decrease it and put it to NPC data.
+                int currentRank = ptr.getClass().getNpcStats(ptr).getFactionRank(factionID);
+                if (currentRank == 0)
+                    return;
+                else if (currentRank > 0)
+                    ptr.getClass().getNpcStats(ptr).lowerRank(factionID);
+                else
+                {
+                    int rank = ptr.getClass().getPrimaryFactionRank(ptr);
+                    rank--;
+                    ptr.getClass().getNpcStats(ptr).joinFaction(factionID);
+                    for (int i = 0; i < rank; i++)
+                        ptr.getClass().getNpcStats(ptr).raiseRank(factionID);
                 }
+            }
         };
 
         template <class R>
         class OpOnDeath : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Integer value =
-                        ptr.getClass().getCreatureStats (ptr).hasDied();
+                Interpreter::Type_Integer value = ptr.getClass().getCreatureStats(ptr).hasDied();
 
-                    if (value)
-                        ptr.getClass().getCreatureStats (ptr).clearHasDied();
+                if (value)
+                    ptr.getClass().getCreatureStats(ptr).clearHasDied();
 
-                    runtime.push (value);
-                }
+                runtime.push(value);
+            }
         };
 
         template <class R>
         class OpOnMurder : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Integer value =
-                        ptr.getClass().getCreatureStats (ptr).hasBeenMurdered();
+                Interpreter::Type_Integer value = ptr.getClass().getCreatureStats(ptr).hasBeenMurdered();
 
-                    if (value)
-                        ptr.getClass().getCreatureStats (ptr).clearHasBeenMurdered();
+                if (value)
+                    ptr.getClass().getCreatureStats(ptr).clearHasBeenMurdered();
 
-                    runtime.push (value);
-                }
+                runtime.push(value);
+            }
         };
 
         template <class R>
         class OpOnKnockout : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Integer value =
-                        ptr.getClass().getCreatureStats (ptr).getKnockedDownOneFrame();
+                Interpreter::Type_Integer value = ptr.getClass().getCreatureStats(ptr).getKnockedDownOneFrame();
 
-                    runtime.push (value);
-                }
+                runtime.push(value);
+            }
         };
 
         template <class R>
         class OpIsWerewolf : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-                    runtime.push(ptr.getClass().getNpcStats(ptr).isWerewolf());
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                runtime.push(ptr.getClass().getNpcStats(ptr).isWerewolf());
+            }
         };
 
         template <class R, bool set>
         class OpSetWerewolf : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-                    MWBase::Environment::get().getMechanicsManager()->setWerewolf(ptr, set);
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                MWBase::Environment::get().getMechanicsManager()->setWerewolf(ptr, set);
+            }
         };
 
         template <class R>
         class OpSetWerewolfAcrobatics : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-                    MWBase::Environment::get().getMechanicsManager()->applyWerewolfAcrobatics(ptr);
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                MWBase::Environment::get().getMechanicsManager()->applyWerewolfAcrobatics(ptr);
+            }
         };
 
         template <class R>
         class OpResurrect : public Interpreter::Opcode0
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                void execute (Interpreter::Runtime& runtime) override
+                if (ptr == MWMechanics::getPlayer())
                 {
-                    MWWorld::Ptr ptr = R()(runtime);
-
-                    if (ptr == MWMechanics::getPlayer())
+                    MWBase::Environment::get().getMechanicsManager()->resurrect(ptr);
+                    if (MWBase::Environment::get().getStateManager()->getState() == MWBase::StateManager::State_Ended)
+                        MWBase::Environment::get().getStateManager()->resumeGame();
+                }
+                else if (ptr.getClass().getCreatureStats(ptr).isDead())
+                {
+                    bool wasEnabled = ptr.getRefData().isEnabled();
+                    MWBase::Environment::get().getWorld()->undeleteObject(ptr);
+                    auto windowManager = MWBase::Environment::get().getWindowManager();
+                    bool wasOpen = windowManager->containsMode(MWGui::GM_Container);
+                    windowManager->onDeleteCustomData(ptr);
+                    // HACK: disable/enable object to re-add it to the scene properly (need a new Animation).
+                    MWBase::Environment::get().getWorld()->disable(ptr);
+                    if (wasOpen && !windowManager->containsMode(MWGui::GM_Container))
                     {
+                        // Reopen the loot GUI if it was closed because we resurrected the actor we were looting
                         MWBase::Environment::get().getMechanicsManager()->resurrect(ptr);
-                        if (MWBase::Environment::get().getStateManager()->getState() == MWBase::StateManager::State_Ended)
-                            MWBase::Environment::get().getStateManager()->resumeGame();
+                        windowManager->forceLootMode(ptr);
                     }
-                    else if (ptr.getClass().getCreatureStats(ptr).isDead())
+                    else
                     {
-                        bool wasEnabled = ptr.getRefData().isEnabled();
-                        MWBase::Environment::get().getWorld()->undeleteObject(ptr);
-                        auto windowManager = MWBase::Environment::get().getWindowManager();
-                        bool wasOpen = windowManager->containsMode(MWGui::GM_Container);
-                        windowManager->onDeleteCustomData(ptr);
-                        // HACK: disable/enable object to re-add it to the scene properly (need a new Animation).
-                        MWBase::Environment::get().getWorld()->disable(ptr);
-                        if (wasOpen && !windowManager->containsMode(MWGui::GM_Container))
-                        {
-                            // Reopen the loot GUI if it was closed because we resurrected the actor we were looting
-                            MWBase::Environment::get().getMechanicsManager()->resurrect(ptr);
-                            windowManager->forceLootMode(ptr);
-                        }
-                        else
-                        {
-                            MWBase::Environment::get().getWorld()->removeContainerScripts(ptr);
-                            // resets runtime state such as inventory, stats and AI. does not reset position in the world
-                            ptr.getRefData().setCustomData(nullptr);
-                        }
-                        if (wasEnabled)
-                            MWBase::Environment::get().getWorld()->enable(ptr);
+                        MWBase::Environment::get().getWorld()->removeContainerScripts(ptr);
+                        // resets runtime state such as inventory, stats and AI. does not reset position in the world
+                        ptr.getRefData().setCustomData(nullptr);
                     }
+                    if (wasEnabled)
+                        MWBase::Environment::get().getWorld()->enable(ptr);
                 }
+            }
         };
 
         template <class R>
         class OpGetStat : public Interpreter::Opcode0
         {
         public:
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 // dummy
                 runtime.pop();
@@ -1209,13 +1169,13 @@ namespace MWScript
             int mNegativeEffect;
 
         public:
-            OpGetMagicEffect (int positiveEffect, int negativeEffect)
+            OpGetMagicEffect(int positiveEffect, int negativeEffect)
                 : mPositiveEffect(positiveEffect)
                 , mNegativeEffect(negativeEffect)
             {
             }
 
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 MWWorld::Ptr ptr = R()(runtime);
 
@@ -1244,13 +1204,13 @@ namespace MWScript
             int mNegativeEffect;
 
         public:
-            OpSetMagicEffect (int positiveEffect, int negativeEffect)
+            OpSetMagicEffect(int positiveEffect, int negativeEffect)
                 : mPositiveEffect(positiveEffect)
                 , mNegativeEffect(negativeEffect)
             {
             }
 
-            void execute(Interpreter::Runtime &runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 MWWorld::Ptr ptr = R()(runtime);
                 MWMechanics::MagicEffects& effects = ptr.getClass().getCreatureStats(ptr).getMagicEffects();
@@ -1279,13 +1239,13 @@ namespace MWScript
             int mNegativeEffect;
 
         public:
-            OpModMagicEffect (int positiveEffect, int negativeEffect)
+            OpModMagicEffect(int positiveEffect, int negativeEffect)
                 : mPositiveEffect(positiveEffect)
                 , mNegativeEffect(negativeEffect)
             {
             }
 
-            void execute(Interpreter::Runtime &runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 MWWorld::Ptr ptr = R()(runtime);
                 MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
@@ -1302,7 +1262,8 @@ namespace MWScript
             void execute(Interpreter::Runtime& runtime) override
             {
                 MWWorld::Ptr player = MWMechanics::getPlayer();
-                MWMechanics::EffectParam nightEye = player.getClass().getCreatureStats(player).getMagicEffects().get(ESM::MagicEffect::NightEye);
+                MWMechanics::EffectParam nightEye
+                    = player.getClass().getCreatureStats(player).getMagicEffects().get(ESM::MagicEffect::NightEye);
                 runtime.push(std::clamp(nightEye.getMagnitude() / 100.f, 0.f, 1.f));
             }
         };
@@ -1316,7 +1277,8 @@ namespace MWScript
                 runtime.pop();
                 MWWorld::Ptr player = MWMechanics::getPlayer();
                 auto& effects = player.getClass().getCreatureStats(player).getMagicEffects();
-                float delta = std::clamp(arg * 100.f, 0.f, 100.f) - effects.get(ESM::MagicEffect::NightEye).getMagnitude();
+                float delta
+                    = std::clamp(arg * 100.f, 0.f, 100.f) - effects.get(ESM::MagicEffect::NightEye).getMagnitude();
                 effects.modifyBase(ESM::MagicEffect::NightEye, static_cast<int>(delta));
             }
         };
@@ -1344,39 +1306,49 @@ namespace MWScript
             int mNegativeEffect;
         };
 
-        void installOpcodes (Interpreter::Interpreter& interpreter)
+        void installOpcodes(Interpreter::Interpreter& interpreter)
         {
-            for (int i=0; i<Compiler::Stats::numberOfAttributes; ++i)
+            for (int i = 0; i < Compiler::Stats::numberOfAttributes; ++i)
             {
                 interpreter.installSegment5<OpGetAttribute<ImplicitRef>>(Compiler::Stats::opcodeGetAttribute + i, i);
-                interpreter.installSegment5<OpGetAttribute<ExplicitRef>>(Compiler::Stats::opcodeGetAttributeExplicit + i, i);
+                interpreter.installSegment5<OpGetAttribute<ExplicitRef>>(
+                    Compiler::Stats::opcodeGetAttributeExplicit + i, i);
 
                 interpreter.installSegment5<OpSetAttribute<ImplicitRef>>(Compiler::Stats::opcodeSetAttribute + i, i);
-                interpreter.installSegment5<OpSetAttribute<ExplicitRef>>(Compiler::Stats::opcodeSetAttributeExplicit + i, i);
+                interpreter.installSegment5<OpSetAttribute<ExplicitRef>>(
+                    Compiler::Stats::opcodeSetAttributeExplicit + i, i);
 
                 interpreter.installSegment5<OpModAttribute<ImplicitRef>>(Compiler::Stats::opcodeModAttribute + i, i);
-                interpreter.installSegment5<OpModAttribute<ExplicitRef>>(Compiler::Stats::opcodeModAttributeExplicit + i, i);
+                interpreter.installSegment5<OpModAttribute<ExplicitRef>>(
+                    Compiler::Stats::opcodeModAttributeExplicit + i, i);
             }
 
-            for (int i=0; i<Compiler::Stats::numberOfDynamics; ++i)
+            for (int i = 0; i < Compiler::Stats::numberOfDynamics; ++i)
             {
                 interpreter.installSegment5<OpGetDynamic<ImplicitRef>>(Compiler::Stats::opcodeGetDynamic + i, i);
-                interpreter.installSegment5<OpGetDynamic<ExplicitRef>>(Compiler::Stats::opcodeGetDynamicExplicit + i, i);
+                interpreter.installSegment5<OpGetDynamic<ExplicitRef>>(
+                    Compiler::Stats::opcodeGetDynamicExplicit + i, i);
 
                 interpreter.installSegment5<OpSetDynamic<ImplicitRef>>(Compiler::Stats::opcodeSetDynamic + i, i);
-                interpreter.installSegment5<OpSetDynamic<ExplicitRef>>(Compiler::Stats::opcodeSetDynamicExplicit + i, i);
+                interpreter.installSegment5<OpSetDynamic<ExplicitRef>>(
+                    Compiler::Stats::opcodeSetDynamicExplicit + i, i);
 
                 interpreter.installSegment5<OpModDynamic<ImplicitRef>>(Compiler::Stats::opcodeModDynamic + i, i);
-                interpreter.installSegment5<OpModDynamic<ExplicitRef>>(Compiler::Stats::opcodeModDynamicExplicit + i, i);
-
-                interpreter.installSegment5<OpModCurrentDynamic<ImplicitRef>>(Compiler::Stats::opcodeModCurrentDynamic + i, i);
-                interpreter.installSegment5<OpModCurrentDynamic<ExplicitRef>>(Compiler::Stats::opcodeModCurrentDynamicExplicit + i, i);
-
-                interpreter.installSegment5<OpGetDynamicGetRatio<ImplicitRef>>(Compiler::Stats::opcodeGetDynamicGetRatio + i, i);
-                interpreter.installSegment5<OpGetDynamicGetRatio<ExplicitRef>>(Compiler::Stats::opcodeGetDynamicGetRatioExplicit + i, i);
+                interpreter.installSegment5<OpModDynamic<ExplicitRef>>(
+                    Compiler::Stats::opcodeModDynamicExplicit + i, i);
+
+                interpreter.installSegment5<OpModCurrentDynamic<ImplicitRef>>(
+                    Compiler::Stats::opcodeModCurrentDynamic + i, i);
+                interpreter.installSegment5<OpModCurrentDynamic<ExplicitRef>>(
+                    Compiler::Stats::opcodeModCurrentDynamicExplicit + i, i);
+
+                interpreter.installSegment5<OpGetDynamicGetRatio<ImplicitRef>>(
+                    Compiler::Stats::opcodeGetDynamicGetRatio + i, i);
+                interpreter.installSegment5<OpGetDynamicGetRatio<ExplicitRef>>(
+                    Compiler::Stats::opcodeGetDynamicGetRatioExplicit + i, i);
             }
 
-            for (int i=0; i<Compiler::Stats::numberOfSkills; ++i)
+            for (int i = 0; i < Compiler::Stats::numberOfSkills; ++i)
             {
                 interpreter.installSegment5<OpGetSkill<ImplicitRef>>(Compiler::Stats::opcodeGetSkill + i, i);
                 interpreter.installSegment5<OpGetSkill<ExplicitRef>>(Compiler::Stats::opcodeGetSkillExplicit + i, i);
@@ -1397,7 +1369,8 @@ namespace MWScript
             interpreter.installSegment5<OpRemoveSpell<ImplicitRef>>(Compiler::Stats::opcodeRemoveSpell);
             interpreter.installSegment5<OpRemoveSpell<ExplicitRef>>(Compiler::Stats::opcodeRemoveSpellExplicit);
             interpreter.installSegment5<OpRemoveSpellEffects<ImplicitRef>>(Compiler::Stats::opcodeRemoveSpellEffects);
-            interpreter.installSegment5<OpRemoveSpellEffects<ExplicitRef>>(Compiler::Stats::opcodeRemoveSpellEffectsExplicit);
+            interpreter.installSegment5<OpRemoveSpellEffects<ExplicitRef>>(
+                Compiler::Stats::opcodeRemoveSpellEffectsExplicit);
             interpreter.installSegment5<OpResurrect<ImplicitRef>>(Compiler::Stats::opcodeResurrect);
             interpreter.installSegment5<OpResurrect<ExplicitRef>>(Compiler::Stats::opcodeResurrectExplicit);
             interpreter.installSegment5<OpRemoveEffects<ImplicitRef>>(Compiler::Stats::opcodeRemoveEffects);
@@ -1437,9 +1410,11 @@ namespace MWScript
             interpreter.installSegment3<OpModPCFacRep<ExplicitRef>>(Compiler::Stats::opcodeModPCFacRepExplicit);
 
             interpreter.installSegment5<OpGetCommonDisease<ImplicitRef>>(Compiler::Stats::opcodeGetCommonDisease);
-            interpreter.installSegment5<OpGetCommonDisease<ExplicitRef>>(Compiler::Stats::opcodeGetCommonDiseaseExplicit);
+            interpreter.installSegment5<OpGetCommonDisease<ExplicitRef>>(
+                Compiler::Stats::opcodeGetCommonDiseaseExplicit);
             interpreter.installSegment5<OpGetBlightDisease<ImplicitRef>>(Compiler::Stats::opcodeGetBlightDisease);
-            interpreter.installSegment5<OpGetBlightDisease<ExplicitRef>>(Compiler::Stats::opcodeGetBlightDiseaseExplicit);
+            interpreter.installSegment5<OpGetBlightDisease<ExplicitRef>>(
+                Compiler::Stats::opcodeGetBlightDiseaseExplicit);
 
             interpreter.installSegment5<OpGetRace<ImplicitRef>>(Compiler::Stats::opcodeGetRace);
             interpreter.installSegment5<OpGetRace<ExplicitRef>>(Compiler::Stats::opcodeGetRaceExplicit);
@@ -1467,11 +1442,14 @@ namespace MWScript
             interpreter.installSegment5<OpIsWerewolf<ExplicitRef>>(Compiler::Stats::opcodeIsWerewolfExplicit);
 
             interpreter.installSegment5<OpSetWerewolf<ImplicitRef, true>>(Compiler::Stats::opcodeBecomeWerewolf);
-            interpreter.installSegment5<OpSetWerewolf<ExplicitRef, true>>(Compiler::Stats::opcodeBecomeWerewolfExplicit);
+            interpreter.installSegment5<OpSetWerewolf<ExplicitRef, true>>(
+                Compiler::Stats::opcodeBecomeWerewolfExplicit);
             interpreter.installSegment5<OpSetWerewolf<ImplicitRef, false>>(Compiler::Stats::opcodeUndoWerewolf);
             interpreter.installSegment5<OpSetWerewolf<ExplicitRef, false>>(Compiler::Stats::opcodeUndoWerewolfExplicit);
-            interpreter.installSegment5<OpSetWerewolfAcrobatics<ImplicitRef>>(Compiler::Stats::opcodeSetWerewolfAcrobatics);
-            interpreter.installSegment5<OpSetWerewolfAcrobatics<ExplicitRef>>(Compiler::Stats::opcodeSetWerewolfAcrobaticsExplicit);
+            interpreter.installSegment5<OpSetWerewolfAcrobatics<ImplicitRef>>(
+                Compiler::Stats::opcodeSetWerewolfAcrobatics);
+            interpreter.installSegment5<OpSetWerewolfAcrobatics<ExplicitRef>>(
+                Compiler::Stats::opcodeSetWerewolfAcrobaticsExplicit);
             interpreter.installSegment5<OpGetStat<ImplicitRef>>(Compiler::Stats::opcodeGetStat);
             interpreter.installSegment5<OpGetStat<ExplicitRef>>(Compiler::Stats::opcodeGetStatExplicit);
 
@@ -1502,19 +1480,25 @@ namespace MWScript
                 { ESM::MagicEffect::Sanctuary, -1 },
             };
 
-            for (int i=0; i<24; ++i)
+            for (int i = 0; i < 24; ++i)
             {
                 int positive = sMagicEffects[i].mPositiveEffect;
                 int negative = sMagicEffects[i].mNegativeEffect;
 
-                interpreter.installSegment5<OpGetMagicEffect<ImplicitRef>>(Compiler::Stats::opcodeGetMagicEffect + i, positive, negative);
-                interpreter.installSegment5<OpGetMagicEffect<ExplicitRef>>(Compiler::Stats::opcodeGetMagicEffectExplicit + i, positive, negative);
+                interpreter.installSegment5<OpGetMagicEffect<ImplicitRef>>(
+                    Compiler::Stats::opcodeGetMagicEffect + i, positive, negative);
+                interpreter.installSegment5<OpGetMagicEffect<ExplicitRef>>(
+                    Compiler::Stats::opcodeGetMagicEffectExplicit + i, positive, negative);
 
-                interpreter.installSegment5<OpSetMagicEffect<ImplicitRef>>(Compiler::Stats::opcodeSetMagicEffect + i, positive, negative);
-                interpreter.installSegment5<OpSetMagicEffect<ExplicitRef>>(Compiler::Stats::opcodeSetMagicEffectExplicit + i, positive, negative);
+                interpreter.installSegment5<OpSetMagicEffect<ImplicitRef>>(
+                    Compiler::Stats::opcodeSetMagicEffect + i, positive, negative);
+                interpreter.installSegment5<OpSetMagicEffect<ExplicitRef>>(
+                    Compiler::Stats::opcodeSetMagicEffectExplicit + i, positive, negative);
 
-                interpreter.installSegment5<OpModMagicEffect<ImplicitRef>>(Compiler::Stats::opcodeModMagicEffect + i, positive, negative);
-                interpreter.installSegment5<OpModMagicEffect<ExplicitRef>>(Compiler::Stats::opcodeModMagicEffectExplicit + i, positive, negative);
+                interpreter.installSegment5<OpModMagicEffect<ImplicitRef>>(
+                    Compiler::Stats::opcodeModMagicEffect + i, positive, negative);
+                interpreter.installSegment5<OpModMagicEffect<ExplicitRef>>(
+                    Compiler::Stats::opcodeModMagicEffectExplicit + i, positive, negative);
             }
 
             interpreter.installSegment5<OpGetPCVisionBonus>(Compiler::Stats::opcodeGetPCVisionBonus);
diff --git a/apps/openmw/mwscript/statsextensions.hpp b/apps/openmw/mwscript/statsextensions.hpp
index 213b549674..07d6a34f5b 100644
--- a/apps/openmw/mwscript/statsextensions.hpp
+++ b/apps/openmw/mwscript/statsextensions.hpp
@@ -15,8 +15,8 @@ namespace MWScript
 {
     /// \brief stats-related script functionality (creatures and NPCs)
     namespace Stats
-    {        
-        void installOpcodes (Interpreter::Interpreter& interpreter);
+    {
+        void installOpcodes(Interpreter::Interpreter& interpreter);
     }
 }
 
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 412e9fa01e..bf62a276b4 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -7,17 +7,17 @@
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>
-#include <components/interpreter/runtime.hpp>
 #include <components/interpreter/opcodes.hpp>
+#include <components/interpreter/runtime.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/cellutils.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/manualref.hpp"
 #include "../mwworld/player.hpp"
-#include "../mwworld/cellutils.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 
@@ -28,777 +28,772 @@ namespace MWScript
 {
     namespace Transformation
     {
-        void moveStandingActors(const MWWorld::Ptr &ptr, const osg::Vec3f& diff)
+        void moveStandingActors(const MWWorld::Ptr& ptr, const osg::Vec3f& diff)
         {
             std::vector<MWWorld::Ptr> actors;
-            MWBase::Environment::get().getWorld()->getActorsStandingOn (ptr, actors);
+            MWBase::Environment::get().getWorld()->getActorsStandingOn(ptr, actors);
             for (auto& actor : actors)
                 MWBase::Environment::get().getWorld()->moveObjectBy(actor, diff);
         }
 
-        template<class R>
+        template <class R>
         class OpGetDistance : public Interpreter::Opcode0
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr from = R()(runtime, !R::implicit);
+                std::string_view name = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                void execute (Interpreter::Runtime& runtime) override
+                if (from.isEmpty())
                 {
-                    MWWorld::Ptr from = R()(runtime, !R::implicit);
-                    std::string_view name = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
-
-                    if (from.isEmpty())
-                    {
-                        std::string error = "Missing implicit ref";
-                        runtime.getContext().report(error);
-                        Log(Debug::Error) << error;
-                        runtime.push(0.f);
-                        return;
-                    }
+                    std::string error = "Missing implicit ref";
+                    runtime.getContext().report(error);
+                    Log(Debug::Error) << error;
+                    runtime.push(0.f);
+                    return;
+                }
 
-                    if (from.getContainerStore()) // is the object contained?
-                    {
-                        MWWorld::Ptr container = MWBase::Environment::get().getWorld()->findContainer(from);
-
-                        if (!container.isEmpty())
-                            from = container;
-                        else
-                        {
-                            std::string error = "Failed to find the container of object '" + from.getCellRef().getRefId() + "'";
-                            runtime.getContext().report(error);
-                            Log(Debug::Error) << error;
-                            runtime.push(0.f);
-                            return;
-                        }
-                    }
+                if (from.getContainerStore()) // is the object contained?
+                {
+                    MWWorld::Ptr container = MWBase::Environment::get().getWorld()->findContainer(from);
 
-                    const MWWorld::Ptr to = MWBase::Environment::get().getWorld()->searchPtr(name, false);
-                    if (to.isEmpty())
+                    if (!container.isEmpty())
+                        from = container;
+                    else
                     {
-                        std::string error = "Failed to find an instance of object '" + std::string(name) + "'";
+                        std::string error
+                            = "Failed to find the container of object '" + from.getCellRef().getRefId() + "'";
                         runtime.getContext().report(error);
                         Log(Debug::Error) << error;
                         runtime.push(0.f);
                         return;
                     }
+                }
 
-                    float distance;
-                    // If the objects are in different worldspaces, return a large value (just like vanilla)
-                    if (!to.isInCell() || !from.isInCell() || to.getCell()->getCell()->getCellId().mWorldspace != from.getCell()->getCell()->getCellId().mWorldspace)
-                        distance = std::numeric_limits<float>::max();
-                    else
-                    {
-                        double diff[3];
+                const MWWorld::Ptr to = MWBase::Environment::get().getWorld()->searchPtr(name, false);
+                if (to.isEmpty())
+                {
+                    std::string error = "Failed to find an instance of object '" + std::string(name) + "'";
+                    runtime.getContext().report(error);
+                    Log(Debug::Error) << error;
+                    runtime.push(0.f);
+                    return;
+                }
 
-                        const float* const pos1 = to.getRefData().getPosition().pos;
-                        const float* const pos2 = from.getRefData().getPosition().pos;
-                        for (int i=0; i<3; ++i)
-                            diff[i] = pos1[i] - pos2[i];
+                float distance;
+                // If the objects are in different worldspaces, return a large value (just like vanilla)
+                if (!to.isInCell() || !from.isInCell()
+                    || to.getCell()->getCell()->getCellId().mWorldspace
+                        != from.getCell()->getCell()->getCellId().mWorldspace)
+                    distance = std::numeric_limits<float>::max();
+                else
+                {
+                    double diff[3];
 
-                        distance = static_cast<float>(std::sqrt(diff[0] * diff[0] + diff[1] * diff[1] + diff[2] * diff[2]));
-                    }
+                    const float* const pos1 = to.getRefData().getPosition().pos;
+                    const float* const pos2 = from.getRefData().getPosition().pos;
+                    for (int i = 0; i < 3; ++i)
+                        diff[i] = pos1[i] - pos2[i];
 
-                    runtime.push(distance);
+                    distance = static_cast<float>(std::sqrt(diff[0] * diff[0] + diff[1] * diff[1] + diff[2] * diff[2]));
                 }
+
+                runtime.push(distance);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpSetScale : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Float scale = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float scale = runtime[0].mFloat;
+                runtime.pop();
 
-                    MWBase::Environment::get().getWorld()->scaleObject(ptr,scale);
-                }
+                MWBase::Environment::get().getWorld()->scaleObject(ptr, scale);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetScale : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-                    runtime.push(ptr.getCellRef().getScale());
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                runtime.push(ptr.getCellRef().getScale());
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpModScale : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Float scale = runtime[0].mFloat;
-                    runtime.pop();
+                Interpreter::Type_Float scale = runtime[0].mFloat;
+                runtime.pop();
 
-                    // add the parameter to the object's scale.
-                    MWBase::Environment::get().getWorld()->scaleObject(ptr,ptr.getCellRef().getScale() + scale);
-                }
+                // add the parameter to the object's scale.
+                MWBase::Environment::get().getWorld()->scaleObject(ptr, ptr.getCellRef().getScale() + scale);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpSetAngle : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-
-                    std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
-                    Interpreter::Type_Float angle = osg::DegreesToRadians(runtime[0].mFloat);
-                    runtime.pop();
-
-                    float ax = ptr.getRefData().getPosition().rot[0];
-                    float ay = ptr.getRefData().getPosition().rot[1];
-                    float az = ptr.getRefData().getPosition().rot[2];
-
-                    // XYZ axis use the inverse (XYZ) rotation order like vanilla SetAngle.
-                    // UWV axis use the standard (ZYX) rotation order like TESCS/OpenMW-CS and the rest of the game.
-                    if (axis == "x")
-                        MWBase::Environment::get().getWorld()->rotateObject(ptr,osg::Vec3f(angle,ay,az),MWBase::RotationFlag_inverseOrder);
-                    else if (axis == "y")
-                        MWBase::Environment::get().getWorld()->rotateObject(ptr,osg::Vec3f(ax,angle,az),MWBase::RotationFlag_inverseOrder);
-                    else if (axis == "z")
-                        MWBase::Environment::get().getWorld()->rotateObject(ptr,osg::Vec3f(ax,ay,angle),MWBase::RotationFlag_inverseOrder);
-                    else if (axis == "u")
-                        MWBase::Environment::get().getWorld()->rotateObject(ptr,osg::Vec3f(angle,ay,az),MWBase::RotationFlag_none);
-                    else if (axis == "w")
-                        MWBase::Environment::get().getWorld()->rotateObject(ptr,osg::Vec3f(ax,angle,az),MWBase::RotationFlag_none);
-                    else if (axis == "v")
-                        MWBase::Environment::get().getWorld()->rotateObject(ptr,osg::Vec3f(ax,ay,angle),MWBase::RotationFlag_none);
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+
+                std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
+                Interpreter::Type_Float angle = osg::DegreesToRadians(runtime[0].mFloat);
+                runtime.pop();
+
+                float ax = ptr.getRefData().getPosition().rot[0];
+                float ay = ptr.getRefData().getPosition().rot[1];
+                float az = ptr.getRefData().getPosition().rot[2];
+
+                // XYZ axis use the inverse (XYZ) rotation order like vanilla SetAngle.
+                // UWV axis use the standard (ZYX) rotation order like TESCS/OpenMW-CS and the rest of the game.
+                if (axis == "x")
+                    MWBase::Environment::get().getWorld()->rotateObject(
+                        ptr, osg::Vec3f(angle, ay, az), MWBase::RotationFlag_inverseOrder);
+                else if (axis == "y")
+                    MWBase::Environment::get().getWorld()->rotateObject(
+                        ptr, osg::Vec3f(ax, angle, az), MWBase::RotationFlag_inverseOrder);
+                else if (axis == "z")
+                    MWBase::Environment::get().getWorld()->rotateObject(
+                        ptr, osg::Vec3f(ax, ay, angle), MWBase::RotationFlag_inverseOrder);
+                else if (axis == "u")
+                    MWBase::Environment::get().getWorld()->rotateObject(
+                        ptr, osg::Vec3f(angle, ay, az), MWBase::RotationFlag_none);
+                else if (axis == "w")
+                    MWBase::Environment::get().getWorld()->rotateObject(
+                        ptr, osg::Vec3f(ax, angle, az), MWBase::RotationFlag_none);
+                else if (axis == "v")
+                    MWBase::Environment::get().getWorld()->rotateObject(
+                        ptr, osg::Vec3f(ax, ay, angle), MWBase::RotationFlag_none);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetStartingAngle : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    float ret = 0.f;
-                    if (!axis.empty())
+                float ret = 0.f;
+                if (!axis.empty())
+                {
+                    if (axis[0] == 'x')
+                    {
+                        ret = osg::RadiansToDegrees(ptr.getCellRef().getPosition().rot[0]);
+                    }
+                    else if (axis[0] == 'y')
                     {
-                        if (axis[0] == 'x')
-                        {
-                            ret = osg::RadiansToDegrees(ptr.getCellRef().getPosition().rot[0]);
-                        }
-                        else if (axis[0] == 'y')
-                        {
-                            ret = osg::RadiansToDegrees(ptr.getCellRef().getPosition().rot[1]);
-                        }
-                        else if (axis[0] == 'z')
-                        {
-                            ret = osg::RadiansToDegrees(ptr.getCellRef().getPosition().rot[2]);
-                        }
+                        ret = osg::RadiansToDegrees(ptr.getCellRef().getPosition().rot[1]);
+                    }
+                    else if (axis[0] == 'z')
+                    {
+                        ret = osg::RadiansToDegrees(ptr.getCellRef().getPosition().rot[2]);
                     }
-                    runtime.push(ret);
                 }
+                runtime.push(ret);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpGetAngle : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    float ret = 0.f;
-                    if (!axis.empty())
+                float ret = 0.f;
+                if (!axis.empty())
+                {
+                    if (axis[0] == 'x')
                     {
-                        if (axis[0] == 'x')
-                        {
-                            ret = osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[0]);
-                        }
-                        else if (axis[0] == 'y')
-                        {
-                            ret = osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[1]);
-                        }
-                        else if (axis[0] == 'z')
-                        {
-                            ret = osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[2]);
-                        }
+                        ret = osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[0]);
                     }
-                    runtime.push(ret);
-                }
-        };
-
-        template<class R>
-        class OpGetPos : public Interpreter::Opcode0
-        {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-
-                    std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
-
-                    float ret = 0.f;
-                    if (!axis.empty())
+                    else if (axis[0] == 'y')
                     {
-                        if (axis[0] == 'x')
-                        {
-                            ret = ptr.getRefData().getPosition().pos[0];
-                        }
-                        else if (axis[0] == 'y')
-                        {
-                            ret = ptr.getRefData().getPosition().pos[1];
-                        }
-                        else if (axis[0] == 'z')
-                        {
-                            ret = ptr.getRefData().getPosition().pos[2];
-                        }
+                        ret = osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[1]);
+                    }
+                    else if (axis[0] == 'z')
+                    {
+                        ret = osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[2]);
                     }
-                    runtime.push(ret);
                 }
+                runtime.push(ret);
+            }
         };
 
-        template<class R>
-        class OpSetPos : public Interpreter::Opcode0
+        template <class R>
+        class OpGetPos : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-
-                    std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
-                    Interpreter::Type_Float pos = runtime[0].mFloat;
-                    runtime.pop();
-
-                    if (!ptr.isInCell())
-                        return;
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    // Note: SetPos does not skip weather transitions in vanilla engine, so we do not call setTeleported(true) here.
+                std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    const auto curPos = ptr.getRefData().getPosition().asVec3();
-                    auto newPos = curPos;
-                    if(axis == "x")
-                    {
-                        newPos[0] = pos;
-                    }
-                    else if(axis == "y")
+                float ret = 0.f;
+                if (!axis.empty())
+                {
+                    if (axis[0] == 'x')
                     {
-                        newPos[1] = pos;
+                        ret = ptr.getRefData().getPosition().pos[0];
                     }
-                    else if(axis == "z")
+                    else if (axis[0] == 'y')
                     {
-                        // We should not place actors under ground
-                        if (ptr.getClass().isActor())
-                        {
-                            float terrainHeight = -std::numeric_limits<float>::max();
-                            if (ptr.getCell()->isExterior())
-                                terrainHeight = MWBase::Environment::get().getWorld()->getTerrainHeightAt(curPos);
- 
-                            if (pos < terrainHeight)
-                                pos = terrainHeight;
-                        }
- 
-                        newPos[2] = pos;
+                        ret = ptr.getRefData().getPosition().pos[1];
                     }
-                    else
+                    else if (axis[0] == 'z')
                     {
-                        return;
+                        ret = ptr.getRefData().getPosition().pos[2];
                     }
-
-                    dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(ptr,
-                        MWBase::Environment::get().getWorld()->moveObject(ptr, newPos, true, true));
                 }
+                runtime.push(ret);
+            }
         };
 
-        template<class R>
-        class OpGetStartingPos : public Interpreter::Opcode0
+        template <class R>
+        class OpSetPos : public Interpreter::Opcode0
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
+                std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
+                Interpreter::Type_Float pos = runtime[0].mFloat;
+                runtime.pop();
 
-                    std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+                if (!ptr.isInCell())
+                    return;
 
-                    float ret = 0.f;
-                    if (!axis.empty())
+                // Note: SetPos does not skip weather transitions in vanilla engine, so we do not call
+                // setTeleported(true) here.
+
+                const auto curPos = ptr.getRefData().getPosition().asVec3();
+                auto newPos = curPos;
+                if (axis == "x")
+                {
+                    newPos[0] = pos;
+                }
+                else if (axis == "y")
+                {
+                    newPos[1] = pos;
+                }
+                else if (axis == "z")
+                {
+                    // We should not place actors under ground
+                    if (ptr.getClass().isActor())
                     {
-                        if (axis[0] == 'x')
-                        {
-                            ret = ptr.getCellRef().getPosition().pos[0];
-                        }
-                        else if (axis[0] == 'y')
-                        {
-                            ret = ptr.getCellRef().getPosition().pos[1];
-                        }
-                        else if (axis[0] == 'z')
-                        {
-                            ret = ptr.getCellRef().getPosition().pos[2];
-                        }
+                        float terrainHeight = -std::numeric_limits<float>::max();
+                        if (ptr.getCell()->isExterior())
+                            terrainHeight = MWBase::Environment::get().getWorld()->getTerrainHeightAt(curPos);
+
+                        if (pos < terrainHeight)
+                            pos = terrainHeight;
                     }
-                    runtime.push(ret);
+
+                    newPos[2] = pos;
+                }
+                else
+                {
+                    return;
                 }
+
+                dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext())
+                    .updatePtr(ptr, MWBase::Environment::get().getWorld()->moveObject(ptr, newPos, true, true));
+            }
         };
 
-        template<class R>
-        class OpPositionCell : public Interpreter::Opcode0
+        template <class R>
+        class OpGetStartingPos : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-
-                    Interpreter::Type_Float x = runtime[0].mFloat;
-                    runtime.pop();
-                    Interpreter::Type_Float y = runtime[0].mFloat;
-                    runtime.pop();
-                    Interpreter::Type_Float z = runtime[0].mFloat;
-                    runtime.pop();
-                    Interpreter::Type_Float zRot = runtime[0].mFloat;
-                    runtime.pop();
-                    std::string_view cellID = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
-
-                    if (ptr.getContainerStore())
-                        return;
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    bool isPlayer = ptr == MWMechanics::getPlayer();
-                    if (isPlayer)
-                    {
-                        MWBase::Environment::get().getWorld()->getPlayer().setTeleported(true);
-                    }
+                std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    MWWorld::CellStore* store = nullptr;
-                    try
+                float ret = 0.f;
+                if (!axis.empty())
+                {
+                    if (axis[0] == 'x')
                     {
-                        store = MWBase::Environment::get().getWorld()->getInterior(cellID);
+                        ret = ptr.getCellRef().getPosition().pos[0];
                     }
-                    catch(std::exception&)
+                    else if (axis[0] == 'y')
                     {
-                        // cell not found, move to exterior instead if moving the player (vanilla PositionCell compatibility)
-                        const ESM::Cell* cell = MWBase::Environment::get().getWorld()->getExterior(cellID);
-                        if(!cell)
-                        {
-                            std::string error = "Warning: PositionCell: unknown interior cell (" + std::string(cellID) + ")";
-                            if(isPlayer)
-                                error += ", moving to exterior instead";
-                            runtime.getContext().report (error);
-                            Log(Debug::Warning) << error;
-                            if(!isPlayer)
-                                return;
-                        }
-                        const osg::Vec2i cellIndex = MWWorld::positionToCellIndex(x, y);
-                        store = MWBase::Environment::get().getWorld()->getExterior(cellIndex.x(), cellIndex.y());
+                        ret = ptr.getCellRef().getPosition().pos[1];
                     }
-                    if(store)
+                    else if (axis[0] == 'z')
                     {
-                        MWWorld::Ptr base = ptr;
-                        ptr = MWBase::Environment::get().getWorld()->moveObject(ptr,store,osg::Vec3f(x,y,z));
-                        dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(base,ptr);
-
-                        auto rot = ptr.getRefData().getPosition().asRotationVec3();
-                        // Note that you must specify ZRot in minutes (1 degree = 60 minutes; north = 0, east = 5400, south = 10800, west = 16200)
-                        // except for when you position the player, then degrees must be used.
-                        // See "Morrowind Scripting for Dummies (9th Edition)" pages 50 and 54 for reference.
-                        if(!isPlayer)
-                            zRot = zRot/60.0f;
-                        rot.z() = osg::DegreesToRadians(zRot);
-                        MWBase::Environment::get().getWorld()->rotateObject(ptr,rot);
-
-                        ptr.getClass().adjustPosition(ptr, true);
+                        ret = ptr.getCellRef().getPosition().pos[2];
                     }
                 }
+                runtime.push(ret);
+            }
         };
 
-        template<class R>
-        class OpPosition : public Interpreter::Opcode0
+        template <class R>
+        class OpPositionCell : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+
+                Interpreter::Type_Float x = runtime[0].mFloat;
+                runtime.pop();
+                Interpreter::Type_Float y = runtime[0].mFloat;
+                runtime.pop();
+                Interpreter::Type_Float z = runtime[0].mFloat;
+                runtime.pop();
+                Interpreter::Type_Float zRot = runtime[0].mFloat;
+                runtime.pop();
+                std::string_view cellID = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
+
+                if (ptr.getContainerStore())
+                    return;
+
+                bool isPlayer = ptr == MWMechanics::getPlayer();
+                if (isPlayer)
                 {
-                    MWWorld::Ptr ptr = R()(runtime);
-
-                    Interpreter::Type_Float x = runtime[0].mFloat;
-                    runtime.pop();
-                    Interpreter::Type_Float y = runtime[0].mFloat;
-                    runtime.pop();
-                    Interpreter::Type_Float z = runtime[0].mFloat;
-                    runtime.pop();
-                    Interpreter::Type_Float zRot = runtime[0].mFloat;
-                    runtime.pop();
-
-                    if (!ptr.isInCell())
-                        return;
+                    MWBase::Environment::get().getWorld()->getPlayer().setTeleported(true);
+                }
 
-                    if (ptr == MWMechanics::getPlayer())
+                MWWorld::CellStore* store = nullptr;
+                try
+                {
+                    store = MWBase::Environment::get().getWorld()->getInterior(cellID);
+                }
+                catch (std::exception&)
+                {
+                    // cell not found, move to exterior instead if moving the player (vanilla PositionCell
+                    // compatibility)
+                    const ESM::Cell* cell = MWBase::Environment::get().getWorld()->getExterior(cellID);
+                    if (!cell)
                     {
-                        MWBase::Environment::get().getWorld()->getPlayer().setTeleported(true);
+                        std::string error
+                            = "Warning: PositionCell: unknown interior cell (" + std::string(cellID) + ")";
+                        if (isPlayer)
+                            error += ", moving to exterior instead";
+                        runtime.getContext().report(error);
+                        Log(Debug::Warning) << error;
+                        if (!isPlayer)
+                            return;
                     }
                     const osg::Vec2i cellIndex = MWWorld::positionToCellIndex(x, y);
-
-                    // another morrowind oddity: player will be moved to the exterior cell at this location,
-                    // non-player actors will move within the cell they are in.
+                    store = MWBase::Environment::get().getWorld()->getExterior(cellIndex.x(), cellIndex.y());
+                }
+                if (store)
+                {
                     MWWorld::Ptr base = ptr;
-                    if (ptr == MWMechanics::getPlayer())
-                    {
-                        MWWorld::CellStore* cell = MWBase::Environment::get().getWorld()->getExterior(cellIndex.x(), cellIndex.y());
-                        ptr = MWBase::Environment::get().getWorld()->moveObject(ptr, cell, osg::Vec3(x, y, z));
-                    }
-                    else
-                    {
-                        ptr = MWBase::Environment::get().getWorld()->moveObject(ptr, osg::Vec3f(x, y, z), true, true);
-                    }
-                    dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(base,ptr);
+                    ptr = MWBase::Environment::get().getWorld()->moveObject(ptr, store, osg::Vec3f(x, y, z));
+                    dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(base, ptr);
 
                     auto rot = ptr.getRefData().getPosition().asRotationVec3();
-                    // Note that you must specify ZRot in minutes (1 degree = 60 minutes; north = 0, east = 5400, south = 10800, west = 16200)
-                    // except for when you position the player, then degrees must be used.
-                    // See "Morrowind Scripting for Dummies (9th Edition)" pages 50 and 54 for reference.
-                    if(ptr != MWMechanics::getPlayer())
-                        zRot = zRot/60.0f;
+                    // Note that you must specify ZRot in minutes (1 degree = 60 minutes; north = 0, east = 5400, south
+                    // = 10800, west = 16200) except for when you position the player, then degrees must be used. See
+                    // "Morrowind Scripting for Dummies (9th Edition)" pages 50 and 54 for reference.
+                    if (!isPlayer)
+                        zRot = zRot / 60.0f;
                     rot.z() = osg::DegreesToRadians(zRot);
-                    MWBase::Environment::get().getWorld()->rotateObject(ptr,rot);
+                    MWBase::Environment::get().getWorld()->rotateObject(ptr, rot);
+
                     ptr.getClass().adjustPosition(ptr, true);
                 }
+            }
         };
 
-        class OpPlaceItemCell : public Interpreter::Opcode0
+        template <class R>
+        class OpPosition : public Interpreter::Opcode0
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                void execute (Interpreter::Runtime& runtime) override
+                Interpreter::Type_Float x = runtime[0].mFloat;
+                runtime.pop();
+                Interpreter::Type_Float y = runtime[0].mFloat;
+                runtime.pop();
+                Interpreter::Type_Float z = runtime[0].mFloat;
+                runtime.pop();
+                Interpreter::Type_Float zRot = runtime[0].mFloat;
+                runtime.pop();
+
+                if (!ptr.isInCell())
+                    return;
+
+                if (ptr == MWMechanics::getPlayer())
                 {
-                    std::string_view itemID = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
-                    std::string_view cellID = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
-
-                    Interpreter::Type_Float x = runtime[0].mFloat;
-                    runtime.pop();
-                    Interpreter::Type_Float y = runtime[0].mFloat;
-                    runtime.pop();
-                    Interpreter::Type_Float z = runtime[0].mFloat;
-                    runtime.pop();
-                    Interpreter::Type_Float zRotDegrees = runtime[0].mFloat;
-                    runtime.pop();
-
-                    MWWorld::CellStore* store = nullptr;
-                    try
-                    {
-                        store = MWBase::Environment::get().getWorld()->getInterior(cellID);
-                    }
-                    catch(std::exception&)
-                    {
-                        const ESM::Cell* cell = MWBase::Environment::get().getWorld()->getExterior(cellID);
-                        const osg::Vec2i cellIndex = MWWorld::positionToCellIndex(x, y);
-                        store = MWBase::Environment::get().getWorld()->getExterior(cellIndex.x(), cellIndex.y());
-                        if(!cell)
-                        {
-                            runtime.getContext().report("unknown cell (" + std::string(cellID) + ")");
-                            Log(Debug::Error) << "Error: unknown cell (" << cellID << ")";
-                        }
-                    }
-                    if(store)
-                    {
-                        ESM::Position pos;
-                        pos.pos[0] = x;
-                        pos.pos[1] = y;
-                        pos.pos[2] = z;
-                        pos.rot[0] = pos.rot[1] = 0;
-                        pos.rot[2] = osg::DegreesToRadians(zRotDegrees);
-                        MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(),itemID);
-                        ref.getPtr().mRef->mData.mPhysicsPostponed = !ref.getPtr().getClass().isActor();
-                        ref.getPtr().getCellRef().setPosition(pos);
-                        MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(ref.getPtr(),store,pos);
-                        placed.getClass().adjustPosition(placed, true);
-                    }
+                    MWBase::Environment::get().getWorld()->getPlayer().setTeleported(true);
+                }
+                const osg::Vec2i cellIndex = MWWorld::positionToCellIndex(x, y);
+
+                // another morrowind oddity: player will be moved to the exterior cell at this location,
+                // non-player actors will move within the cell they are in.
+                MWWorld::Ptr base = ptr;
+                if (ptr == MWMechanics::getPlayer())
+                {
+                    MWWorld::CellStore* cell
+                        = MWBase::Environment::get().getWorld()->getExterior(cellIndex.x(), cellIndex.y());
+                    ptr = MWBase::Environment::get().getWorld()->moveObject(ptr, cell, osg::Vec3(x, y, z));
+                }
+                else
+                {
+                    ptr = MWBase::Environment::get().getWorld()->moveObject(ptr, osg::Vec3f(x, y, z), true, true);
                 }
+                dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(base, ptr);
+
+                auto rot = ptr.getRefData().getPosition().asRotationVec3();
+                // Note that you must specify ZRot in minutes (1 degree = 60 minutes; north = 0, east = 5400, south =
+                // 10800, west = 16200) except for when you position the player, then degrees must be used. See
+                // "Morrowind Scripting for Dummies (9th Edition)" pages 50 and 54 for reference.
+                if (ptr != MWMechanics::getPlayer())
+                    zRot = zRot / 60.0f;
+                rot.z() = osg::DegreesToRadians(zRot);
+                MWBase::Environment::get().getWorld()->rotateObject(ptr, rot);
+                ptr.getClass().adjustPosition(ptr, true);
+            }
         };
 
-        class OpPlaceItem : public Interpreter::Opcode0
+        class OpPlaceItemCell : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                std::string_view itemID = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
+                std::string_view cellID = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
+
+                Interpreter::Type_Float x = runtime[0].mFloat;
+                runtime.pop();
+                Interpreter::Type_Float y = runtime[0].mFloat;
+                runtime.pop();
+                Interpreter::Type_Float z = runtime[0].mFloat;
+                runtime.pop();
+                Interpreter::Type_Float zRotDegrees = runtime[0].mFloat;
+                runtime.pop();
+
+                MWWorld::CellStore* store = nullptr;
+                try
                 {
-                    std::string_view itemID = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
-
-                    Interpreter::Type_Float x = runtime[0].mFloat;
-                    runtime.pop();
-                    Interpreter::Type_Float y = runtime[0].mFloat;
-                    runtime.pop();
-                    Interpreter::Type_Float z = runtime[0].mFloat;
-                    runtime.pop();
-                    Interpreter::Type_Float zRotDegrees = runtime[0].mFloat;
-                    runtime.pop();
-
-                    MWWorld::Ptr player = MWMechanics::getPlayer();
-
-                    if (!player.isInCell())
-                        throw std::runtime_error("player not in a cell");
-
-                    MWWorld::CellStore* store = nullptr;
-                    if (player.getCell()->isExterior())
+                    store = MWBase::Environment::get().getWorld()->getInterior(cellID);
+                }
+                catch (std::exception&)
+                {
+                    const ESM::Cell* cell = MWBase::Environment::get().getWorld()->getExterior(cellID);
+                    const osg::Vec2i cellIndex = MWWorld::positionToCellIndex(x, y);
+                    store = MWBase::Environment::get().getWorld()->getExterior(cellIndex.x(), cellIndex.y());
+                    if (!cell)
                     {
-                        const osg::Vec2i cellIndex = MWWorld::positionToCellIndex(x, y);
-                        store = MWBase::Environment::get().getWorld()->getExterior(cellIndex.x(), cellIndex.y());
+                        runtime.getContext().report("unknown cell (" + std::string(cellID) + ")");
+                        Log(Debug::Error) << "Error: unknown cell (" << cellID << ")";
                     }
-                    else
-                        store = player.getCell();
-
+                }
+                if (store)
+                {
                     ESM::Position pos;
                     pos.pos[0] = x;
                     pos.pos[1] = y;
                     pos.pos[2] = z;
                     pos.rot[0] = pos.rot[1] = 0;
                     pos.rot[2] = osg::DegreesToRadians(zRotDegrees);
-                    MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(),itemID);
+                    MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), itemID);
                     ref.getPtr().mRef->mData.mPhysicsPostponed = !ref.getPtr().getClass().isActor();
                     ref.getPtr().getCellRef().setPosition(pos);
-                    MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(ref.getPtr(),store,pos);
+                    MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(ref.getPtr(), store, pos);
                     placed.getClass().adjustPosition(placed, true);
                 }
+            }
         };
 
-        template<class R, bool pc>
-        class OpPlaceAt : public Interpreter::Opcode0
+        class OpPlaceItem : public Interpreter::Opcode0
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                std::string_view itemID = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
+
+                Interpreter::Type_Float x = runtime[0].mFloat;
+                runtime.pop();
+                Interpreter::Type_Float y = runtime[0].mFloat;
+                runtime.pop();
+                Interpreter::Type_Float z = runtime[0].mFloat;
+                runtime.pop();
+                Interpreter::Type_Float zRotDegrees = runtime[0].mFloat;
+                runtime.pop();
+
+                MWWorld::Ptr player = MWMechanics::getPlayer();
+
+                if (!player.isInCell())
+                    throw std::runtime_error("player not in a cell");
 
-                void execute (Interpreter::Runtime& runtime) override
+                MWWorld::CellStore* store = nullptr;
+                if (player.getCell()->isExterior())
                 {
-                    MWWorld::Ptr actor = pc
-                        ? MWMechanics::getPlayer()
-                        : R()(runtime);
+                    const osg::Vec2i cellIndex = MWWorld::positionToCellIndex(x, y);
+                    store = MWBase::Environment::get().getWorld()->getExterior(cellIndex.x(), cellIndex.y());
+                }
+                else
+                    store = player.getCell();
+
+                ESM::Position pos;
+                pos.pos[0] = x;
+                pos.pos[1] = y;
+                pos.pos[2] = z;
+                pos.rot[0] = pos.rot[1] = 0;
+                pos.rot[2] = osg::DegreesToRadians(zRotDegrees);
+                MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), itemID);
+                ref.getPtr().mRef->mData.mPhysicsPostponed = !ref.getPtr().getClass().isActor();
+                ref.getPtr().getCellRef().setPosition(pos);
+                MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(ref.getPtr(), store, pos);
+                placed.getClass().adjustPosition(placed, true);
+            }
+        };
 
-                    std::string_view itemID = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
+        template <class R, bool pc>
+        class OpPlaceAt : public Interpreter::Opcode0
+        {
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr actor = pc ? MWMechanics::getPlayer() : R()(runtime);
 
-                    Interpreter::Type_Integer count = runtime[0].mInteger;
-                    runtime.pop();
-                    Interpreter::Type_Float distance = runtime[0].mFloat;
-                    runtime.pop();
-                    Interpreter::Type_Integer direction = runtime[0].mInteger;
-                    runtime.pop();
+                std::string_view itemID = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
 
-                    if (direction < 0 || direction > 3)
-                        throw std::runtime_error ("invalid direction");
+                Interpreter::Type_Integer count = runtime[0].mInteger;
+                runtime.pop();
+                Interpreter::Type_Float distance = runtime[0].mFloat;
+                runtime.pop();
+                Interpreter::Type_Integer direction = runtime[0].mInteger;
+                runtime.pop();
 
-                    if (count<0)
-                        throw std::runtime_error ("count must be non-negative");
+                if (direction < 0 || direction > 3)
+                    throw std::runtime_error("invalid direction");
 
-                    if (!actor.isInCell())
-                        throw std::runtime_error ("actor is not in a cell");
+                if (count < 0)
+                    throw std::runtime_error("count must be non-negative");
 
-                    for (int i=0; i<count; ++i)
-                    {
-                        // create item
-                        MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), itemID, 1);
-                        ref.getPtr().mRef->mData.mPhysicsPostponed = !ref.getPtr().getClass().isActor();
+                if (!actor.isInCell())
+                    throw std::runtime_error("actor is not in a cell");
 
-                        MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(), actor, actor.getCell(), direction, distance);
-                        MWBase::Environment::get().getWorld()->scaleObject(ptr, actor.getCellRef().getScale());
-                    }
+                for (int i = 0; i < count; ++i)
+                {
+                    // create item
+                    MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), itemID, 1);
+                    ref.getPtr().mRef->mData.mPhysicsPostponed = !ref.getPtr().getClass().isActor();
+
+                    MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->safePlaceObject(
+                        ref.getPtr(), actor, actor.getCell(), direction, distance);
+                    MWBase::Environment::get().getWorld()->scaleObject(ptr, actor.getCellRef().getScale());
                 }
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpRotate : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    const MWWorld::Ptr& ptr = R()(runtime);
-
-                    std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
-                    Interpreter::Type_Float rotation = osg::DegreesToRadians(runtime[0].mFloat*MWBase::Environment::get().getFrameDuration());
-                    runtime.pop();
-
-                    auto rot = ptr.getRefData().getPosition().asRotationVec3();
-                    // Regardless of the axis argument, the player may only be rotated on Z
-                    if (axis == "z" || MWMechanics::getPlayer() == ptr)
-                        rot.z() += rotation;
-                    else if (axis == "x")
-                        rot.x() += rotation;
-                    else if (axis == "y")
-                        rot.y() += rotation;
-                    MWBase::Environment::get().getWorld()->rotateObject(ptr,rot);
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                const MWWorld::Ptr& ptr = R()(runtime);
+
+                std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
+                Interpreter::Type_Float rotation
+                    = osg::DegreesToRadians(runtime[0].mFloat * MWBase::Environment::get().getFrameDuration());
+                runtime.pop();
+
+                auto rot = ptr.getRefData().getPosition().asRotationVec3();
+                // Regardless of the axis argument, the player may only be rotated on Z
+                if (axis == "z" || MWMechanics::getPlayer() == ptr)
+                    rot.z() += rotation;
+                else if (axis == "x")
+                    rot.x() += rotation;
+                else if (axis == "y")
+                    rot.y() += rotation;
+                MWBase::Environment::get().getWorld()->rotateObject(ptr, rot);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpRotateWorld : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-
-                    std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
-                    Interpreter::Type_Float rotation = osg::DegreesToRadians(runtime[0].mFloat*MWBase::Environment::get().getFrameDuration());
-                    runtime.pop();
-
-                    if (!ptr.getRefData().getBaseNode())
-                        return;
-
-                    // We can rotate actors only around Z axis
-                    if (ptr.getClass().isActor() && (axis == "x" || axis == "y"))
-                        return;
-
-                    osg::Quat rot;
-                    if (axis == "x")
-                        rot = osg::Quat(rotation, -osg::X_AXIS);
-                    else if (axis == "y")
-                        rot = osg::Quat(rotation, -osg::Y_AXIS);
-                    else if (axis == "z")
-                        rot = osg::Quat(rotation, -osg::Z_AXIS);
-                    else
-                        return;
-
-                    osg::Quat attitude = ptr.getRefData().getBaseNode()->getAttitude();
-                    MWBase::Environment::get().getWorld()->rotateWorldObject(ptr, attitude * rot);
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+
+                std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
+                Interpreter::Type_Float rotation
+                    = osg::DegreesToRadians(runtime[0].mFloat * MWBase::Environment::get().getFrameDuration());
+                runtime.pop();
+
+                if (!ptr.getRefData().getBaseNode())
+                    return;
+
+                // We can rotate actors only around Z axis
+                if (ptr.getClass().isActor() && (axis == "x" || axis == "y"))
+                    return;
+
+                osg::Quat rot;
+                if (axis == "x")
+                    rot = osg::Quat(rotation, -osg::X_AXIS);
+                else if (axis == "y")
+                    rot = osg::Quat(rotation, -osg::Y_AXIS);
+                else if (axis == "z")
+                    rot = osg::Quat(rotation, -osg::Z_AXIS);
+                else
+                    return;
+
+                osg::Quat attitude = ptr.getRefData().getBaseNode()->getAttitude();
+                MWBase::Environment::get().getWorld()->rotateWorldObject(ptr, attitude * rot);
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpSetAtStart : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-
-                    if (!ptr.isInCell())
-                        return;
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
 
-                    MWBase::Environment::get().getWorld()->rotateObject(ptr, ptr.getCellRef().getPosition().asRotationVec3());
+                if (!ptr.isInCell())
+                    return;
 
-                    dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(ptr,
-                        MWBase::Environment::get().getWorld()->moveObject(ptr, ptr.getCellRef().getPosition().asVec3()));
+                MWBase::Environment::get().getWorld()->rotateObject(
+                    ptr, ptr.getCellRef().getPosition().asRotationVec3());
 
-                }
+                dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext())
+                    .updatePtr(ptr,
+                        MWBase::Environment::get().getWorld()->moveObject(
+                            ptr, ptr.getCellRef().getPosition().asVec3()));
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpMove : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    const MWWorld::Ptr& ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                const MWWorld::Ptr& ptr = R()(runtime);
 
-                    if (!ptr.isInCell())
-                        return;
+                if (!ptr.isInCell())
+                    return;
 
-                    std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
-                    Interpreter::Type_Float movement = (runtime[0].mFloat*MWBase::Environment::get().getFrameDuration());
-                    runtime.pop();
+                std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
+                Interpreter::Type_Float movement = (runtime[0].mFloat * MWBase::Environment::get().getFrameDuration());
+                runtime.pop();
 
-                    osg::Vec3f posChange;
-                    if (axis == "x")
-                    {
-                        posChange=osg::Vec3f(movement, 0, 0);
-                    }
-                    else if (axis == "y")
-                    {
-                        posChange=osg::Vec3f(0, movement, 0);
-                    }
-                    else if (axis == "z")
-                    {
-                        posChange=osg::Vec3f(0, 0, movement);
-                    }
-                    else
-                        return;
+                osg::Vec3f posChange;
+                if (axis == "x")
+                {
+                    posChange = osg::Vec3f(movement, 0, 0);
+                }
+                else if (axis == "y")
+                {
+                    posChange = osg::Vec3f(0, movement, 0);
+                }
+                else if (axis == "z")
+                {
+                    posChange = osg::Vec3f(0, 0, movement);
+                }
+                else
+                    return;
 
-                    // is it correct that disabled objects can't be Move-d?
-                    if (!ptr.getRefData().getBaseNode())
-                        return;
+                // is it correct that disabled objects can't be Move-d?
+                if (!ptr.getRefData().getBaseNode())
+                    return;
 
-                    osg::Vec3f diff = ptr.getRefData().getBaseNode()->getAttitude() * posChange;
+                osg::Vec3f diff = ptr.getRefData().getBaseNode()->getAttitude() * posChange;
 
-                    // We should move actors, standing on moving object, too.
-                    // This approach can be used to create elevators.
-                    moveStandingActors(ptr, diff);
-                    dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(ptr,
-                        MWBase::Environment::get().getWorld()->moveObjectBy(ptr, diff));
-                }
+                // We should move actors, standing on moving object, too.
+                // This approach can be used to create elevators.
+                moveStandingActors(ptr, diff);
+                dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext())
+                    .updatePtr(ptr, MWBase::Environment::get().getWorld()->moveObjectBy(ptr, diff));
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpMoveWorld : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-
-                    if (!ptr.isInCell())
-                        return;
-
-                    std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime.pop();
-                    Interpreter::Type_Float movement = (runtime[0].mFloat*MWBase::Environment::get().getFrameDuration());
-                    runtime.pop();
-
-                    osg::Vec3f diff;
-
-                    if (axis == "x")
-                        diff.x() = movement;
-                    else if (axis == "y")
-                        diff.y() = movement;
-                    else if (axis == "z")
-                        diff.z() = movement;
-                    else
-                        return;
-
-                    // We should move actors, standing on moving object, too.
-                    // This approach can be used to create elevators.
-                    moveStandingActors(ptr, diff);
-                    dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(ptr,
-                        MWBase::Environment::get().getWorld()->moveObjectBy(ptr, diff));
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+
+                if (!ptr.isInCell())
+                    return;
+
+                std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
+                Interpreter::Type_Float movement = (runtime[0].mFloat * MWBase::Environment::get().getFrameDuration());
+                runtime.pop();
+
+                osg::Vec3f diff;
+
+                if (axis == "x")
+                    diff.x() = movement;
+                else if (axis == "y")
+                    diff.y() = movement;
+                else if (axis == "z")
+                    diff.z() = movement;
+                else
+                    return;
+
+                // We should move actors, standing on moving object, too.
+                // This approach can be used to create elevators.
+                moveStandingActors(ptr, diff);
+                dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext())
+                    .updatePtr(ptr, MWBase::Environment::get().getWorld()->moveObjectBy(ptr, diff));
+            }
         };
 
         class OpResetActors : public Interpreter::Opcode0
         {
         public:
-
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 MWBase::Environment::get().getWorld()->resetActors();
             }
@@ -807,17 +802,17 @@ namespace MWScript
         class OpFixme : public Interpreter::Opcode0
         {
         public:
-
-            void execute (Interpreter::Runtime& runtime) override
+            void execute(Interpreter::Runtime& runtime) override
             {
                 MWBase::Environment::get().getWorld()->fixPosition();
             }
         };
 
-        void installOpcodes (Interpreter::Interpreter& interpreter)
+        void installOpcodes(Interpreter::Interpreter& interpreter)
         {
             interpreter.installSegment5<OpGetDistance<ImplicitRef>>(Compiler::Transformation::opcodeGetDistance);
-            interpreter.installSegment5<OpGetDistance<ExplicitRef>>(Compiler::Transformation::opcodeGetDistanceExplicit);
+            interpreter.installSegment5<OpGetDistance<ExplicitRef>>(
+                Compiler::Transformation::opcodeGetDistanceExplicit);
             interpreter.installSegment5<OpSetScale<ImplicitRef>>(Compiler::Transformation::opcodeSetScale);
             interpreter.installSegment5<OpSetScale<ExplicitRef>>(Compiler::Transformation::opcodeSetScaleExplicit);
             interpreter.installSegment5<OpSetAngle<ImplicitRef>>(Compiler::Transformation::opcodeSetAngle);
@@ -831,30 +826,36 @@ namespace MWScript
             interpreter.installSegment5<OpSetPos<ImplicitRef>>(Compiler::Transformation::opcodeSetPos);
             interpreter.installSegment5<OpSetPos<ExplicitRef>>(Compiler::Transformation::opcodeSetPosExplicit);
             interpreter.installSegment5<OpGetStartingPos<ImplicitRef>>(Compiler::Transformation::opcodeGetStartingPos);
-            interpreter.installSegment5<OpGetStartingPos<ExplicitRef>>(Compiler::Transformation::opcodeGetStartingPosExplicit);
+            interpreter.installSegment5<OpGetStartingPos<ExplicitRef>>(
+                Compiler::Transformation::opcodeGetStartingPosExplicit);
             interpreter.installSegment5<OpPosition<ImplicitRef>>(Compiler::Transformation::opcodePosition);
             interpreter.installSegment5<OpPosition<ExplicitRef>>(Compiler::Transformation::opcodePositionExplicit);
             interpreter.installSegment5<OpPositionCell<ImplicitRef>>(Compiler::Transformation::opcodePositionCell);
-            interpreter.installSegment5<OpPositionCell<ExplicitRef>>(Compiler::Transformation::opcodePositionCellExplicit);
+            interpreter.installSegment5<OpPositionCell<ExplicitRef>>(
+                Compiler::Transformation::opcodePositionCellExplicit);
             interpreter.installSegment5<OpPlaceItemCell>(Compiler::Transformation::opcodePlaceItemCell);
             interpreter.installSegment5<OpPlaceItem>(Compiler::Transformation::opcodePlaceItem);
             interpreter.installSegment5<OpPlaceAt<ImplicitRef, true>>(Compiler::Transformation::opcodePlaceAtPc);
             interpreter.installSegment5<OpPlaceAt<ImplicitRef, false>>(Compiler::Transformation::opcodePlaceAtMe);
-            interpreter.installSegment5<OpPlaceAt<ExplicitRef, false>>(Compiler::Transformation::opcodePlaceAtMeExplicit);
+            interpreter.installSegment5<OpPlaceAt<ExplicitRef, false>>(
+                Compiler::Transformation::opcodePlaceAtMeExplicit);
             interpreter.installSegment5<OpModScale<ImplicitRef>>(Compiler::Transformation::opcodeModScale);
             interpreter.installSegment5<OpModScale<ExplicitRef>>(Compiler::Transformation::opcodeModScaleExplicit);
             interpreter.installSegment5<OpRotate<ImplicitRef>>(Compiler::Transformation::opcodeRotate);
             interpreter.installSegment5<OpRotate<ExplicitRef>>(Compiler::Transformation::opcodeRotateExplicit);
             interpreter.installSegment5<OpRotateWorld<ImplicitRef>>(Compiler::Transformation::opcodeRotateWorld);
-            interpreter.installSegment5<OpRotateWorld<ExplicitRef>>(Compiler::Transformation::opcodeRotateWorldExplicit);
+            interpreter.installSegment5<OpRotateWorld<ExplicitRef>>(
+                Compiler::Transformation::opcodeRotateWorldExplicit);
             interpreter.installSegment5<OpSetAtStart<ImplicitRef>>(Compiler::Transformation::opcodeSetAtStart);
             interpreter.installSegment5<OpSetAtStart<ExplicitRef>>(Compiler::Transformation::opcodeSetAtStartExplicit);
             interpreter.installSegment5<OpMove<ImplicitRef>>(Compiler::Transformation::opcodeMove);
             interpreter.installSegment5<OpMove<ExplicitRef>>(Compiler::Transformation::opcodeMoveExplicit);
             interpreter.installSegment5<OpMoveWorld<ImplicitRef>>(Compiler::Transformation::opcodeMoveWorld);
             interpreter.installSegment5<OpMoveWorld<ExplicitRef>>(Compiler::Transformation::opcodeMoveWorldExplicit);
-            interpreter.installSegment5<OpGetStartingAngle<ImplicitRef>>(Compiler::Transformation::opcodeGetStartingAngle);
-            interpreter.installSegment5<OpGetStartingAngle<ExplicitRef>>(Compiler::Transformation::opcodeGetStartingAngleExplicit);
+            interpreter.installSegment5<OpGetStartingAngle<ImplicitRef>>(
+                Compiler::Transformation::opcodeGetStartingAngle);
+            interpreter.installSegment5<OpGetStartingAngle<ExplicitRef>>(
+                Compiler::Transformation::opcodeGetStartingAngleExplicit);
             interpreter.installSegment5<OpResetActors>(Compiler::Transformation::opcodeResetActors);
             interpreter.installSegment5<OpFixme>(Compiler::Transformation::opcodeFixme);
         }
diff --git a/apps/openmw/mwscript/transformationextensions.hpp b/apps/openmw/mwscript/transformationextensions.hpp
index 7a4d29e06c..949431b109 100644
--- a/apps/openmw/mwscript/transformationextensions.hpp
+++ b/apps/openmw/mwscript/transformationextensions.hpp
@@ -15,8 +15,8 @@ namespace MWScript
 {
     /// \brief stats-related script functionality (creatures and NPCs)
     namespace Transformation
-    {        
-        void installOpcodes (Interpreter::Interpreter& interpreter);
+    {
+        void installOpcodes(Interpreter::Interpreter& interpreter);
     }
 }
 
diff --git a/apps/openmw/mwscript/userextensions.cpp b/apps/openmw/mwscript/userextensions.cpp
index f929425a9c..c7dbb46061 100644
--- a/apps/openmw/mwscript/userextensions.cpp
+++ b/apps/openmw/mwscript/userextensions.cpp
@@ -3,10 +3,10 @@
 #include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 
+#include <components/interpreter/context.hpp>
 #include <components/interpreter/interpreter.hpp>
-#include <components/interpreter/runtime.hpp>
 #include <components/interpreter/opcodes.hpp>
-#include <components/interpreter/context.hpp>
+#include <components/interpreter/runtime.hpp>
 
 #include "ref.hpp"
 
@@ -19,52 +19,41 @@ namespace MWScript
     {
         class OpUser1 : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    runtime.getContext().report ("user1: not in use");
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override { runtime.getContext().report("user1: not in use"); }
         };
 
         class OpUser2 : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-                    runtime.getContext().report ("user2: not in use");
-                }
+        public:
+            void execute(Interpreter::Runtime& runtime) override { runtime.getContext().report("user2: not in use"); }
         };
 
-        template<class R>
+        template <class R>
         class OpUser3 : public Interpreter::Opcode0
         {
-            public:
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                //                    MWWorld::Ptr ptr = R()(runtime);
 
-                void execute (Interpreter::Runtime& runtime) override
-                {
-//                    MWWorld::Ptr ptr = R()(runtime);
-
-                    runtime.getContext().report ("user3: not in use");
-                }
+                runtime.getContext().report("user3: not in use");
+            }
         };
 
-        template<class R>
+        template <class R>
         class OpUser4 : public Interpreter::Opcode0
         {
-            public:
-
-                void execute (Interpreter::Runtime& runtime) override
-                {
-//                    MWWorld::Ptr ptr = R()(runtime);
+        public:
+            void execute(Interpreter::Runtime& runtime) override
+            {
+                //                    MWWorld::Ptr ptr = R()(runtime);
 
-                    runtime.getContext().report ("user4: not in use");
-                }
+                runtime.getContext().report("user4: not in use");
+            }
         };
-        
 
-        void installOpcodes (Interpreter::Interpreter& interpreter)
+        void installOpcodes(Interpreter::Interpreter& interpreter)
         {
             interpreter.installSegment5<OpUser1>(Compiler::User::opcodeUser1);
             interpreter.installSegment5<OpUser2>(Compiler::User::opcodeUser2);
diff --git a/apps/openmw/mwscript/userextensions.hpp b/apps/openmw/mwscript/userextensions.hpp
index da6e0faa66..2310c2e9a2 100644
--- a/apps/openmw/mwscript/userextensions.hpp
+++ b/apps/openmw/mwscript/userextensions.hpp
@@ -16,7 +16,7 @@ namespace MWScript
     /// \brief Temporary script functionality limited to the console
     namespace User
     {
-        void installOpcodes (Interpreter::Interpreter& interpreter);
+        void installOpcodes(Interpreter::Interpreter& interpreter);
     }
 }
 
diff --git a/apps/openmw/mwsound/alext.h b/apps/openmw/mwsound/alext.h
index 7162fa955d..9999665416 100644
--- a/apps/openmw/mwsound/alext.h
+++ b/apps/openmw/mwsound/alext.h
@@ -35,107 +35,109 @@ typedef unsigned __int64 uint64_t;
 #include <inttypes.h>
 #endif
 
-#include "alc.h"
 #include "al.h"
+#include "alc.h"
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #ifndef AL_LOKI_IMA_ADPCM_format
 #define AL_LOKI_IMA_ADPCM_format 1
-#define AL_FORMAT_IMA_ADPCM_MONO16_EXT           0x10000
-#define AL_FORMAT_IMA_ADPCM_STEREO16_EXT         0x10001
+#define AL_FORMAT_IMA_ADPCM_MONO16_EXT 0x10000
+#define AL_FORMAT_IMA_ADPCM_STEREO16_EXT 0x10001
 #endif
 
 #ifndef AL_LOKI_WAVE_format
 #define AL_LOKI_WAVE_format 1
-#define AL_FORMAT_WAVE_EXT                       0x10002
+#define AL_FORMAT_WAVE_EXT 0x10002
 #endif
 
 #ifndef AL_EXT_vorbis
 #define AL_EXT_vorbis 1
-#define AL_FORMAT_VORBIS_EXT                     0x10003
+#define AL_FORMAT_VORBIS_EXT 0x10003
 #endif
 
 #ifndef AL_LOKI_quadriphonic
 #define AL_LOKI_quadriphonic 1
-#define AL_FORMAT_QUAD8_LOKI                     0x10004
-#define AL_FORMAT_QUAD16_LOKI                    0x10005
+#define AL_FORMAT_QUAD8_LOKI 0x10004
+#define AL_FORMAT_QUAD16_LOKI 0x10005
 #endif
 
 #ifndef AL_EXT_float32
 #define AL_EXT_float32 1
-#define AL_FORMAT_MONO_FLOAT32                   0x10010
-#define AL_FORMAT_STEREO_FLOAT32                 0x10011
+#define AL_FORMAT_MONO_FLOAT32 0x10010
+#define AL_FORMAT_STEREO_FLOAT32 0x10011
 #endif
 
 #ifndef AL_EXT_double
 #define AL_EXT_double 1
-#define AL_FORMAT_MONO_DOUBLE_EXT                0x10012
-#define AL_FORMAT_STEREO_DOUBLE_EXT              0x10013
+#define AL_FORMAT_MONO_DOUBLE_EXT 0x10012
+#define AL_FORMAT_STEREO_DOUBLE_EXT 0x10013
 #endif
 
 #ifndef AL_EXT_MULAW
 #define AL_EXT_MULAW 1
-#define AL_FORMAT_MONO_MULAW_EXT                 0x10014
-#define AL_FORMAT_STEREO_MULAW_EXT               0x10015
+#define AL_FORMAT_MONO_MULAW_EXT 0x10014
+#define AL_FORMAT_STEREO_MULAW_EXT 0x10015
 #endif
 
 #ifndef AL_EXT_ALAW
 #define AL_EXT_ALAW 1
-#define AL_FORMAT_MONO_ALAW_EXT                  0x10016
-#define AL_FORMAT_STEREO_ALAW_EXT                0x10017
+#define AL_FORMAT_MONO_ALAW_EXT 0x10016
+#define AL_FORMAT_STEREO_ALAW_EXT 0x10017
 #endif
 
 #ifndef ALC_LOKI_audio_channel
 #define ALC_LOKI_audio_channel 1
-#define ALC_CHAN_MAIN_LOKI                       0x500001
-#define ALC_CHAN_PCM_LOKI                        0x500002
-#define ALC_CHAN_CD_LOKI                         0x500003
+#define ALC_CHAN_MAIN_LOKI 0x500001
+#define ALC_CHAN_PCM_LOKI 0x500002
+#define ALC_CHAN_CD_LOKI 0x500003
 #endif
 
 #ifndef AL_EXT_MCFORMATS
 #define AL_EXT_MCFORMATS 1
-#define AL_FORMAT_QUAD8                          0x1204
-#define AL_FORMAT_QUAD16                         0x1205
-#define AL_FORMAT_QUAD32                         0x1206
-#define AL_FORMAT_REAR8                          0x1207
-#define AL_FORMAT_REAR16                         0x1208
-#define AL_FORMAT_REAR32                         0x1209
-#define AL_FORMAT_51CHN8                         0x120A
-#define AL_FORMAT_51CHN16                        0x120B
-#define AL_FORMAT_51CHN32                        0x120C
-#define AL_FORMAT_61CHN8                         0x120D
-#define AL_FORMAT_61CHN16                        0x120E
-#define AL_FORMAT_61CHN32                        0x120F
-#define AL_FORMAT_71CHN8                         0x1210
-#define AL_FORMAT_71CHN16                        0x1211
-#define AL_FORMAT_71CHN32                        0x1212
+#define AL_FORMAT_QUAD8 0x1204
+#define AL_FORMAT_QUAD16 0x1205
+#define AL_FORMAT_QUAD32 0x1206
+#define AL_FORMAT_REAR8 0x1207
+#define AL_FORMAT_REAR16 0x1208
+#define AL_FORMAT_REAR32 0x1209
+#define AL_FORMAT_51CHN8 0x120A
+#define AL_FORMAT_51CHN16 0x120B
+#define AL_FORMAT_51CHN32 0x120C
+#define AL_FORMAT_61CHN8 0x120D
+#define AL_FORMAT_61CHN16 0x120E
+#define AL_FORMAT_61CHN32 0x120F
+#define AL_FORMAT_71CHN8 0x1210
+#define AL_FORMAT_71CHN16 0x1211
+#define AL_FORMAT_71CHN32 0x1212
 #endif
 
 #ifndef AL_EXT_MULAW_MCFORMATS
 #define AL_EXT_MULAW_MCFORMATS 1
-#define AL_FORMAT_MONO_MULAW                     0x10014
-#define AL_FORMAT_STEREO_MULAW                   0x10015
-#define AL_FORMAT_QUAD_MULAW                     0x10021
-#define AL_FORMAT_REAR_MULAW                     0x10022
-#define AL_FORMAT_51CHN_MULAW                    0x10023
-#define AL_FORMAT_61CHN_MULAW                    0x10024
-#define AL_FORMAT_71CHN_MULAW                    0x10025
+#define AL_FORMAT_MONO_MULAW 0x10014
+#define AL_FORMAT_STEREO_MULAW 0x10015
+#define AL_FORMAT_QUAD_MULAW 0x10021
+#define AL_FORMAT_REAR_MULAW 0x10022
+#define AL_FORMAT_51CHN_MULAW 0x10023
+#define AL_FORMAT_61CHN_MULAW 0x10024
+#define AL_FORMAT_71CHN_MULAW 0x10025
 #endif
 
 #ifndef AL_EXT_IMA4
 #define AL_EXT_IMA4 1
-#define AL_FORMAT_MONO_IMA4                      0x1300
-#define AL_FORMAT_STEREO_IMA4                    0x1301
+#define AL_FORMAT_MONO_IMA4 0x1300
+#define AL_FORMAT_STEREO_IMA4 0x1301
 #endif
 
 #ifndef AL_EXT_STATIC_BUFFER
 #define AL_EXT_STATIC_BUFFER 1
-typedef ALvoid (AL_APIENTRY*PFNALBUFFERDATASTATICPROC)(const ALint,ALenum,ALvoid*,ALsizei,ALsizei);
+    typedef ALvoid(AL_APIENTRY* PFNALBUFFERDATASTATICPROC)(const ALint, ALenum, ALvoid*, ALsizei, ALsizei);
 #ifdef AL_ALEXT_PROTOTYPES
-AL_API ALvoid AL_APIENTRY alBufferDataStatic(const ALint buffer, ALenum format, ALvoid *data, ALsizei len, ALsizei freq);
+    AL_API ALvoid AL_APIENTRY alBufferDataStatic(
+        const ALint buffer, ALenum format, ALvoid* data, ALsizei len, ALsizei freq);
 #endif
 #endif
 
@@ -146,234 +148,244 @@ AL_API ALvoid AL_APIENTRY alBufferDataStatic(const ALint buffer, ALenum format,
 
 #ifndef ALC_EXT_disconnect
 #define ALC_EXT_disconnect 1
-#define ALC_CONNECTED                            0x313
+#define ALC_CONNECTED 0x313
 #endif
 
 #ifndef ALC_EXT_thread_local_context
 #define ALC_EXT_thread_local_context 1
-typedef ALCboolean  (ALC_APIENTRY*PFNALCSETTHREADCONTEXTPROC)(ALCcontext *context);
-typedef ALCcontext* (ALC_APIENTRY*PFNALCGETTHREADCONTEXTPROC)(void);
+    typedef ALCboolean(ALC_APIENTRY* PFNALCSETTHREADCONTEXTPROC)(ALCcontext* context);
+    typedef ALCcontext*(ALC_APIENTRY* PFNALCGETTHREADCONTEXTPROC)(void);
 #ifdef AL_ALEXT_PROTOTYPES
-ALC_API ALCboolean  ALC_APIENTRY alcSetThreadContext(ALCcontext *context);
-ALC_API ALCcontext* ALC_APIENTRY alcGetThreadContext(void);
+    ALC_API ALCboolean ALC_APIENTRY alcSetThreadContext(ALCcontext* context);
+    ALC_API ALCcontext* ALC_APIENTRY alcGetThreadContext(void);
 #endif
 #endif
 
 #ifndef AL_EXT_source_distance_model
 #define AL_EXT_source_distance_model 1
-#define AL_SOURCE_DISTANCE_MODEL                 0x200
+#define AL_SOURCE_DISTANCE_MODEL 0x200
 #endif
 
 #ifndef AL_SOFT_buffer_sub_data
 #define AL_SOFT_buffer_sub_data 1
-#define AL_BYTE_RW_OFFSETS_SOFT                  0x1031
-#define AL_SAMPLE_RW_OFFSETS_SOFT                0x1032
-typedef ALvoid (AL_APIENTRY*PFNALBUFFERSUBDATASOFTPROC)(ALuint,ALenum,const ALvoid*,ALsizei,ALsizei);
+#define AL_BYTE_RW_OFFSETS_SOFT 0x1031
+#define AL_SAMPLE_RW_OFFSETS_SOFT 0x1032
+    typedef ALvoid(AL_APIENTRY* PFNALBUFFERSUBDATASOFTPROC)(ALuint, ALenum, const ALvoid*, ALsizei, ALsizei);
 #ifdef AL_ALEXT_PROTOTYPES
-AL_API ALvoid AL_APIENTRY alBufferSubDataSOFT(ALuint buffer,ALenum format,const ALvoid *data,ALsizei offset,ALsizei length);
+    AL_API ALvoid AL_APIENTRY alBufferSubDataSOFT(
+        ALuint buffer, ALenum format, const ALvoid* data, ALsizei offset, ALsizei length);
 #endif
 #endif
 
 #ifndef AL_SOFT_loop_points
 #define AL_SOFT_loop_points 1
-#define AL_LOOP_POINTS_SOFT                      0x2015
+#define AL_LOOP_POINTS_SOFT 0x2015
 #endif
 
 #ifndef AL_EXT_FOLDBACK
 #define AL_EXT_FOLDBACK 1
-#define AL_EXT_FOLDBACK_NAME                     "AL_EXT_FOLDBACK"
-#define AL_FOLDBACK_EVENT_BLOCK                  0x4112
-#define AL_FOLDBACK_EVENT_START                  0x4111
-#define AL_FOLDBACK_EVENT_STOP                   0x4113
-#define AL_FOLDBACK_MODE_MONO                    0x4101
-#define AL_FOLDBACK_MODE_STEREO                  0x4102
-typedef void (AL_APIENTRY*LPALFOLDBACKCALLBACK)(ALenum,ALsizei);
-typedef void (AL_APIENTRY*LPALREQUESTFOLDBACKSTART)(ALenum,ALsizei,ALsizei,ALfloat*,LPALFOLDBACKCALLBACK);
-typedef void (AL_APIENTRY*LPALREQUESTFOLDBACKSTOP)(void);
+#define AL_EXT_FOLDBACK_NAME "AL_EXT_FOLDBACK"
+#define AL_FOLDBACK_EVENT_BLOCK 0x4112
+#define AL_FOLDBACK_EVENT_START 0x4111
+#define AL_FOLDBACK_EVENT_STOP 0x4113
+#define AL_FOLDBACK_MODE_MONO 0x4101
+#define AL_FOLDBACK_MODE_STEREO 0x4102
+    typedef void(AL_APIENTRY* LPALFOLDBACKCALLBACK)(ALenum, ALsizei);
+    typedef void(AL_APIENTRY* LPALREQUESTFOLDBACKSTART)(ALenum, ALsizei, ALsizei, ALfloat*, LPALFOLDBACKCALLBACK);
+    typedef void(AL_APIENTRY* LPALREQUESTFOLDBACKSTOP)(void);
 #ifdef AL_ALEXT_PROTOTYPES
-AL_API void AL_APIENTRY alRequestFoldbackStart(ALenum mode,ALsizei count,ALsizei length,ALfloat *mem,LPALFOLDBACKCALLBACK callback);
-AL_API void AL_APIENTRY alRequestFoldbackStop(void);
+    AL_API void AL_APIENTRY alRequestFoldbackStart(
+        ALenum mode, ALsizei count, ALsizei length, ALfloat* mem, LPALFOLDBACKCALLBACK callback);
+    AL_API void AL_APIENTRY alRequestFoldbackStop(void);
 #endif
 #endif
 
 #ifndef ALC_EXT_DEDICATED
 #define ALC_EXT_DEDICATED 1
-#define AL_DEDICATED_GAIN                        0x0001
-#define AL_EFFECT_DEDICATED_DIALOGUE             0x9001
+#define AL_DEDICATED_GAIN 0x0001
+#define AL_EFFECT_DEDICATED_DIALOGUE 0x9001
 #define AL_EFFECT_DEDICATED_LOW_FREQUENCY_EFFECT 0x9000
 #endif
 
 #ifndef AL_SOFT_buffer_samples
 #define AL_SOFT_buffer_samples 1
 /* Channel configurations */
-#define AL_MONO_SOFT                             0x1500
-#define AL_STEREO_SOFT                           0x1501
-#define AL_REAR_SOFT                             0x1502
-#define AL_QUAD_SOFT                             0x1503
-#define AL_5POINT1_SOFT                          0x1504
-#define AL_6POINT1_SOFT                          0x1505
-#define AL_7POINT1_SOFT                          0x1506
+#define AL_MONO_SOFT 0x1500
+#define AL_STEREO_SOFT 0x1501
+#define AL_REAR_SOFT 0x1502
+#define AL_QUAD_SOFT 0x1503
+#define AL_5POINT1_SOFT 0x1504
+#define AL_6POINT1_SOFT 0x1505
+#define AL_7POINT1_SOFT 0x1506
 
 /* Sample types */
-#define AL_BYTE_SOFT                             0x1400
-#define AL_UNSIGNED_BYTE_SOFT                    0x1401
-#define AL_SHORT_SOFT                            0x1402
-#define AL_UNSIGNED_SHORT_SOFT                   0x1403
-#define AL_INT_SOFT                              0x1404
-#define AL_UNSIGNED_INT_SOFT                     0x1405
-#define AL_FLOAT_SOFT                            0x1406
-#define AL_DOUBLE_SOFT                           0x1407
-#define AL_BYTE3_SOFT                            0x1408
-#define AL_UNSIGNED_BYTE3_SOFT                   0x1409
+#define AL_BYTE_SOFT 0x1400
+#define AL_UNSIGNED_BYTE_SOFT 0x1401
+#define AL_SHORT_SOFT 0x1402
+#define AL_UNSIGNED_SHORT_SOFT 0x1403
+#define AL_INT_SOFT 0x1404
+#define AL_UNSIGNED_INT_SOFT 0x1405
+#define AL_FLOAT_SOFT 0x1406
+#define AL_DOUBLE_SOFT 0x1407
+#define AL_BYTE3_SOFT 0x1408
+#define AL_UNSIGNED_BYTE3_SOFT 0x1409
 
 /* Storage formats */
-#define AL_MONO8_SOFT                            0x1100
-#define AL_MONO16_SOFT                           0x1101
-#define AL_MONO32F_SOFT                          0x10010
-#define AL_STEREO8_SOFT                          0x1102
-#define AL_STEREO16_SOFT                         0x1103
-#define AL_STEREO32F_SOFT                        0x10011
-#define AL_QUAD8_SOFT                            0x1204
-#define AL_QUAD16_SOFT                           0x1205
-#define AL_QUAD32F_SOFT                          0x1206
-#define AL_REAR8_SOFT                            0x1207
-#define AL_REAR16_SOFT                           0x1208
-#define AL_REAR32F_SOFT                          0x1209
-#define AL_5POINT1_8_SOFT                        0x120A
-#define AL_5POINT1_16_SOFT                       0x120B
-#define AL_5POINT1_32F_SOFT                      0x120C
-#define AL_6POINT1_8_SOFT                        0x120D
-#define AL_6POINT1_16_SOFT                       0x120E
-#define AL_6POINT1_32F_SOFT                      0x120F
-#define AL_7POINT1_8_SOFT                        0x1210
-#define AL_7POINT1_16_SOFT                       0x1211
-#define AL_7POINT1_32F_SOFT                      0x1212
+#define AL_MONO8_SOFT 0x1100
+#define AL_MONO16_SOFT 0x1101
+#define AL_MONO32F_SOFT 0x10010
+#define AL_STEREO8_SOFT 0x1102
+#define AL_STEREO16_SOFT 0x1103
+#define AL_STEREO32F_SOFT 0x10011
+#define AL_QUAD8_SOFT 0x1204
+#define AL_QUAD16_SOFT 0x1205
+#define AL_QUAD32F_SOFT 0x1206
+#define AL_REAR8_SOFT 0x1207
+#define AL_REAR16_SOFT 0x1208
+#define AL_REAR32F_SOFT 0x1209
+#define AL_5POINT1_8_SOFT 0x120A
+#define AL_5POINT1_16_SOFT 0x120B
+#define AL_5POINT1_32F_SOFT 0x120C
+#define AL_6POINT1_8_SOFT 0x120D
+#define AL_6POINT1_16_SOFT 0x120E
+#define AL_6POINT1_32F_SOFT 0x120F
+#define AL_7POINT1_8_SOFT 0x1210
+#define AL_7POINT1_16_SOFT 0x1211
+#define AL_7POINT1_32F_SOFT 0x1212
 
 /* Buffer attributes */
-#define AL_INTERNAL_FORMAT_SOFT                  0x2008
-#define AL_BYTE_LENGTH_SOFT                      0x2009
-#define AL_SAMPLE_LENGTH_SOFT                    0x200A
-#define AL_SEC_LENGTH_SOFT                       0x200B
-
-typedef void (AL_APIENTRY*LPALBUFFERSAMPLESSOFT)(ALuint,ALuint,ALenum,ALsizei,ALenum,ALenum,const ALvoid*);
-typedef void (AL_APIENTRY*LPALBUFFERSUBSAMPLESSOFT)(ALuint,ALsizei,ALsizei,ALenum,ALenum,const ALvoid*);
-typedef void (AL_APIENTRY*LPALGETBUFFERSAMPLESSOFT)(ALuint,ALsizei,ALsizei,ALenum,ALenum,ALvoid*);
-typedef ALboolean (AL_APIENTRY*LPALISBUFFERFORMATSUPPORTEDSOFT)(ALenum);
+#define AL_INTERNAL_FORMAT_SOFT 0x2008
+#define AL_BYTE_LENGTH_SOFT 0x2009
+#define AL_SAMPLE_LENGTH_SOFT 0x200A
+#define AL_SEC_LENGTH_SOFT 0x200B
+
+    typedef void(AL_APIENTRY* LPALBUFFERSAMPLESSOFT)(ALuint, ALuint, ALenum, ALsizei, ALenum, ALenum, const ALvoid*);
+    typedef void(AL_APIENTRY* LPALBUFFERSUBSAMPLESSOFT)(ALuint, ALsizei, ALsizei, ALenum, ALenum, const ALvoid*);
+    typedef void(AL_APIENTRY* LPALGETBUFFERSAMPLESSOFT)(ALuint, ALsizei, ALsizei, ALenum, ALenum, ALvoid*);
+    typedef ALboolean(AL_APIENTRY* LPALISBUFFERFORMATSUPPORTEDSOFT)(ALenum);
 #ifdef AL_ALEXT_PROTOTYPES
-AL_API void AL_APIENTRY alBufferSamplesSOFT(ALuint buffer, ALuint samplerate, ALenum internalformat, ALsizei samples, ALenum channels, ALenum type, const ALvoid *data);
-AL_API void AL_APIENTRY alBufferSubSamplesSOFT(ALuint buffer, ALsizei offset, ALsizei samples, ALenum channels, ALenum type, const ALvoid *data);
-AL_API void AL_APIENTRY alGetBufferSamplesSOFT(ALuint buffer, ALsizei offset, ALsizei samples, ALenum channels, ALenum type, ALvoid *data);
-AL_API ALboolean AL_APIENTRY alIsBufferFormatSupportedSOFT(ALenum format);
+    AL_API void AL_APIENTRY alBufferSamplesSOFT(ALuint buffer, ALuint samplerate, ALenum internalformat,
+        ALsizei samples, ALenum channels, ALenum type, const ALvoid* data);
+    AL_API void AL_APIENTRY alBufferSubSamplesSOFT(
+        ALuint buffer, ALsizei offset, ALsizei samples, ALenum channels, ALenum type, const ALvoid* data);
+    AL_API void AL_APIENTRY alGetBufferSamplesSOFT(
+        ALuint buffer, ALsizei offset, ALsizei samples, ALenum channels, ALenum type, ALvoid* data);
+    AL_API ALboolean AL_APIENTRY alIsBufferFormatSupportedSOFT(ALenum format);
 #endif
 #endif
 
 #ifndef AL_SOFT_direct_channels
 #define AL_SOFT_direct_channels 1
-#define AL_DIRECT_CHANNELS_SOFT                  0x1033
+#define AL_DIRECT_CHANNELS_SOFT 0x1033
 #endif
 
 #ifndef ALC_SOFT_loopback
 #define ALC_SOFT_loopback 1
-#define ALC_FORMAT_CHANNELS_SOFT                 0x1990
-#define ALC_FORMAT_TYPE_SOFT                     0x1991
+#define ALC_FORMAT_CHANNELS_SOFT 0x1990
+#define ALC_FORMAT_TYPE_SOFT 0x1991
 
 /* Sample types */
-#define ALC_BYTE_SOFT                            0x1400
-#define ALC_UNSIGNED_BYTE_SOFT                   0x1401
-#define ALC_SHORT_SOFT                           0x1402
-#define ALC_UNSIGNED_SHORT_SOFT                  0x1403
-#define ALC_INT_SOFT                             0x1404
-#define ALC_UNSIGNED_INT_SOFT                    0x1405
-#define ALC_FLOAT_SOFT                           0x1406
+#define ALC_BYTE_SOFT 0x1400
+#define ALC_UNSIGNED_BYTE_SOFT 0x1401
+#define ALC_SHORT_SOFT 0x1402
+#define ALC_UNSIGNED_SHORT_SOFT 0x1403
+#define ALC_INT_SOFT 0x1404
+#define ALC_UNSIGNED_INT_SOFT 0x1405
+#define ALC_FLOAT_SOFT 0x1406
 
 /* Channel configurations */
-#define ALC_MONO_SOFT                            0x1500
-#define ALC_STEREO_SOFT                          0x1501
-#define ALC_QUAD_SOFT                            0x1503
-#define ALC_5POINT1_SOFT                         0x1504
-#define ALC_6POINT1_SOFT                         0x1505
-#define ALC_7POINT1_SOFT                         0x1506
-
-typedef ALCdevice* (ALC_APIENTRY*LPALCLOOPBACKOPENDEVICESOFT)(const ALCchar*);
-typedef ALCboolean (ALC_APIENTRY*LPALCISRENDERFORMATSUPPORTEDSOFT)(ALCdevice*,ALCsizei,ALCenum,ALCenum);
-typedef void (ALC_APIENTRY*LPALCRENDERSAMPLESSOFT)(ALCdevice*,ALCvoid*,ALCsizei);
+#define ALC_MONO_SOFT 0x1500
+#define ALC_STEREO_SOFT 0x1501
+#define ALC_QUAD_SOFT 0x1503
+#define ALC_5POINT1_SOFT 0x1504
+#define ALC_6POINT1_SOFT 0x1505
+#define ALC_7POINT1_SOFT 0x1506
+
+    typedef ALCdevice*(ALC_APIENTRY* LPALCLOOPBACKOPENDEVICESOFT)(const ALCchar*);
+    typedef ALCboolean(ALC_APIENTRY* LPALCISRENDERFORMATSUPPORTEDSOFT)(ALCdevice*, ALCsizei, ALCenum, ALCenum);
+    typedef void(ALC_APIENTRY* LPALCRENDERSAMPLESSOFT)(ALCdevice*, ALCvoid*, ALCsizei);
 #ifdef AL_ALEXT_PROTOTYPES
-ALC_API ALCdevice* ALC_APIENTRY alcLoopbackOpenDeviceSOFT(const ALCchar *deviceName);
-ALC_API ALCboolean ALC_APIENTRY alcIsRenderFormatSupportedSOFT(ALCdevice *device, ALCsizei freq, ALCenum channels, ALCenum type);
-ALC_API void ALC_APIENTRY alcRenderSamplesSOFT(ALCdevice *device, ALCvoid *buffer, ALCsizei samples);
+    ALC_API ALCdevice* ALC_APIENTRY alcLoopbackOpenDeviceSOFT(const ALCchar* deviceName);
+    ALC_API ALCboolean ALC_APIENTRY alcIsRenderFormatSupportedSOFT(
+        ALCdevice* device, ALCsizei freq, ALCenum channels, ALCenum type);
+    ALC_API void ALC_APIENTRY alcRenderSamplesSOFT(ALCdevice* device, ALCvoid* buffer, ALCsizei samples);
 #endif
 #endif
 
 #ifndef AL_EXT_STEREO_ANGLES
 #define AL_EXT_STEREO_ANGLES 1
-#define AL_STEREO_ANGLES                         0x1030
+#define AL_STEREO_ANGLES 0x1030
 #endif
 
 #ifndef AL_EXT_SOURCE_RADIUS
 #define AL_EXT_SOURCE_RADIUS 1
-#define AL_SOURCE_RADIUS                         0x1031
+#define AL_SOURCE_RADIUS 0x1031
 #endif
 
 #ifndef AL_SOFT_source_latency
 #define AL_SOFT_source_latency 1
-#define AL_SAMPLE_OFFSET_LATENCY_SOFT            0x1200
-#define AL_SEC_OFFSET_LATENCY_SOFT               0x1201
-typedef int64_t ALint64SOFT;
-typedef uint64_t ALuint64SOFT;
-typedef void (AL_APIENTRY*LPALSOURCEDSOFT)(ALuint,ALenum,ALdouble);
-typedef void (AL_APIENTRY*LPALSOURCE3DSOFT)(ALuint,ALenum,ALdouble,ALdouble,ALdouble);
-typedef void (AL_APIENTRY*LPALSOURCEDVSOFT)(ALuint,ALenum,const ALdouble*);
-typedef void (AL_APIENTRY*LPALGETSOURCEDSOFT)(ALuint,ALenum,ALdouble*);
-typedef void (AL_APIENTRY*LPALGETSOURCE3DSOFT)(ALuint,ALenum,ALdouble*,ALdouble*,ALdouble*);
-typedef void (AL_APIENTRY*LPALGETSOURCEDVSOFT)(ALuint,ALenum,ALdouble*);
-typedef void (AL_APIENTRY*LPALSOURCEI64SOFT)(ALuint,ALenum,ALint64SOFT);
-typedef void (AL_APIENTRY*LPALSOURCE3I64SOFT)(ALuint,ALenum,ALint64SOFT,ALint64SOFT,ALint64SOFT);
-typedef void (AL_APIENTRY*LPALSOURCEI64VSOFT)(ALuint,ALenum,const ALint64SOFT*);
-typedef void (AL_APIENTRY*LPALGETSOURCEI64SOFT)(ALuint,ALenum,ALint64SOFT*);
-typedef void (AL_APIENTRY*LPALGETSOURCE3I64SOFT)(ALuint,ALenum,ALint64SOFT*,ALint64SOFT*,ALint64SOFT*);
-typedef void (AL_APIENTRY*LPALGETSOURCEI64VSOFT)(ALuint,ALenum,ALint64SOFT*);
+#define AL_SAMPLE_OFFSET_LATENCY_SOFT 0x1200
+#define AL_SEC_OFFSET_LATENCY_SOFT 0x1201
+    typedef int64_t ALint64SOFT;
+    typedef uint64_t ALuint64SOFT;
+    typedef void(AL_APIENTRY* LPALSOURCEDSOFT)(ALuint, ALenum, ALdouble);
+    typedef void(AL_APIENTRY* LPALSOURCE3DSOFT)(ALuint, ALenum, ALdouble, ALdouble, ALdouble);
+    typedef void(AL_APIENTRY* LPALSOURCEDVSOFT)(ALuint, ALenum, const ALdouble*);
+    typedef void(AL_APIENTRY* LPALGETSOURCEDSOFT)(ALuint, ALenum, ALdouble*);
+    typedef void(AL_APIENTRY* LPALGETSOURCE3DSOFT)(ALuint, ALenum, ALdouble*, ALdouble*, ALdouble*);
+    typedef void(AL_APIENTRY* LPALGETSOURCEDVSOFT)(ALuint, ALenum, ALdouble*);
+    typedef void(AL_APIENTRY* LPALSOURCEI64SOFT)(ALuint, ALenum, ALint64SOFT);
+    typedef void(AL_APIENTRY* LPALSOURCE3I64SOFT)(ALuint, ALenum, ALint64SOFT, ALint64SOFT, ALint64SOFT);
+    typedef void(AL_APIENTRY* LPALSOURCEI64VSOFT)(ALuint, ALenum, const ALint64SOFT*);
+    typedef void(AL_APIENTRY* LPALGETSOURCEI64SOFT)(ALuint, ALenum, ALint64SOFT*);
+    typedef void(AL_APIENTRY* LPALGETSOURCE3I64SOFT)(ALuint, ALenum, ALint64SOFT*, ALint64SOFT*, ALint64SOFT*);
+    typedef void(AL_APIENTRY* LPALGETSOURCEI64VSOFT)(ALuint, ALenum, ALint64SOFT*);
 #ifdef AL_ALEXT_PROTOTYPES
-AL_API void AL_APIENTRY alSourcedSOFT(ALuint source, ALenum param, ALdouble value);
-AL_API void AL_APIENTRY alSource3dSOFT(ALuint source, ALenum param, ALdouble value1, ALdouble value2, ALdouble value3);
-AL_API void AL_APIENTRY alSourcedvSOFT(ALuint source, ALenum param, const ALdouble *values);
-AL_API void AL_APIENTRY alGetSourcedSOFT(ALuint source, ALenum param, ALdouble *value);
-AL_API void AL_APIENTRY alGetSource3dSOFT(ALuint source, ALenum param, ALdouble *value1, ALdouble *value2, ALdouble *value3);
-AL_API void AL_APIENTRY alGetSourcedvSOFT(ALuint source, ALenum param, ALdouble *values);
-AL_API void AL_APIENTRY alSourcei64SOFT(ALuint source, ALenum param, ALint64SOFT value);
-AL_API void AL_APIENTRY alSource3i64SOFT(ALuint source, ALenum param, ALint64SOFT value1, ALint64SOFT value2, ALint64SOFT value3);
-AL_API void AL_APIENTRY alSourcei64vSOFT(ALuint source, ALenum param, const ALint64SOFT *values);
-AL_API void AL_APIENTRY alGetSourcei64SOFT(ALuint source, ALenum param, ALint64SOFT *value);
-AL_API void AL_APIENTRY alGetSource3i64SOFT(ALuint source, ALenum param, ALint64SOFT *value1, ALint64SOFT *value2, ALint64SOFT *value3);
-AL_API void AL_APIENTRY alGetSourcei64vSOFT(ALuint source, ALenum param, ALint64SOFT *values);
+    AL_API void AL_APIENTRY alSourcedSOFT(ALuint source, ALenum param, ALdouble value);
+    AL_API void AL_APIENTRY alSource3dSOFT(
+        ALuint source, ALenum param, ALdouble value1, ALdouble value2, ALdouble value3);
+    AL_API void AL_APIENTRY alSourcedvSOFT(ALuint source, ALenum param, const ALdouble* values);
+    AL_API void AL_APIENTRY alGetSourcedSOFT(ALuint source, ALenum param, ALdouble* value);
+    AL_API void AL_APIENTRY alGetSource3dSOFT(
+        ALuint source, ALenum param, ALdouble* value1, ALdouble* value2, ALdouble* value3);
+    AL_API void AL_APIENTRY alGetSourcedvSOFT(ALuint source, ALenum param, ALdouble* values);
+    AL_API void AL_APIENTRY alSourcei64SOFT(ALuint source, ALenum param, ALint64SOFT value);
+    AL_API void AL_APIENTRY alSource3i64SOFT(
+        ALuint source, ALenum param, ALint64SOFT value1, ALint64SOFT value2, ALint64SOFT value3);
+    AL_API void AL_APIENTRY alSourcei64vSOFT(ALuint source, ALenum param, const ALint64SOFT* values);
+    AL_API void AL_APIENTRY alGetSourcei64SOFT(ALuint source, ALenum param, ALint64SOFT* value);
+    AL_API void AL_APIENTRY alGetSource3i64SOFT(
+        ALuint source, ALenum param, ALint64SOFT* value1, ALint64SOFT* value2, ALint64SOFT* value3);
+    AL_API void AL_APIENTRY alGetSourcei64vSOFT(ALuint source, ALenum param, ALint64SOFT* values);
 #endif
 #endif
 
 #ifndef ALC_EXT_DEFAULT_FILTER_ORDER
 #define ALC_EXT_DEFAULT_FILTER_ORDER 1
-#define ALC_DEFAULT_FILTER_ORDER                 0x1100
+#define ALC_DEFAULT_FILTER_ORDER 0x1100
 #endif
 
 #ifndef AL_SOFT_deferred_updates
 #define AL_SOFT_deferred_updates 1
-#define AL_DEFERRED_UPDATES_SOFT                 0xC002
-typedef ALvoid (AL_APIENTRY*LPALDEFERUPDATESSOFT)(void);
-typedef ALvoid (AL_APIENTRY*LPALPROCESSUPDATESSOFT)(void);
+#define AL_DEFERRED_UPDATES_SOFT 0xC002
+    typedef ALvoid(AL_APIENTRY* LPALDEFERUPDATESSOFT)(void);
+    typedef ALvoid(AL_APIENTRY* LPALPROCESSUPDATESSOFT)(void);
 #ifdef AL_ALEXT_PROTOTYPES
-AL_API ALvoid AL_APIENTRY alDeferUpdatesSOFT(void);
-AL_API ALvoid AL_APIENTRY alProcessUpdatesSOFT(void);
+    AL_API ALvoid AL_APIENTRY alDeferUpdatesSOFT(void);
+    AL_API ALvoid AL_APIENTRY alProcessUpdatesSOFT(void);
 #endif
 #endif
 
 #ifndef AL_SOFT_block_alignment
 #define AL_SOFT_block_alignment 1
-#define AL_UNPACK_BLOCK_ALIGNMENT_SOFT           0x200C
-#define AL_PACK_BLOCK_ALIGNMENT_SOFT             0x200D
+#define AL_UNPACK_BLOCK_ALIGNMENT_SOFT 0x200C
+#define AL_PACK_BLOCK_ALIGNMENT_SOFT 0x200D
 #endif
 
 #ifndef AL_SOFT_MSADPCM
 #define AL_SOFT_MSADPCM 1
-#define AL_FORMAT_MONO_MSADPCM_SOFT              0x1302
-#define AL_FORMAT_STEREO_MSADPCM_SOFT            0x1303
+#define AL_FORMAT_MONO_MSADPCM_SOFT 0x1302
+#define AL_FORMAT_STEREO_MSADPCM_SOFT 0x1303
 #endif
 
 #ifndef AL_SOFT_source_length
@@ -385,78 +397,78 @@ AL_API ALvoid AL_APIENTRY alProcessUpdatesSOFT(void);
 
 #ifndef ALC_SOFT_pause_device
 #define ALC_SOFT_pause_device 1
-typedef void (ALC_APIENTRY*LPALCDEVICEPAUSESOFT)(ALCdevice *device);
-typedef void (ALC_APIENTRY*LPALCDEVICERESUMESOFT)(ALCdevice *device);
+    typedef void(ALC_APIENTRY* LPALCDEVICEPAUSESOFT)(ALCdevice* device);
+    typedef void(ALC_APIENTRY* LPALCDEVICERESUMESOFT)(ALCdevice* device);
 #ifdef AL_ALEXT_PROTOTYPES
-ALC_API void ALC_APIENTRY alcDevicePauseSOFT(ALCdevice *device);
-ALC_API void ALC_APIENTRY alcDeviceResumeSOFT(ALCdevice *device);
+    ALC_API void ALC_APIENTRY alcDevicePauseSOFT(ALCdevice* device);
+    ALC_API void ALC_APIENTRY alcDeviceResumeSOFT(ALCdevice* device);
 #endif
 #endif
 
 #ifndef AL_EXT_BFORMAT
 #define AL_EXT_BFORMAT 1
-#define AL_FORMAT_BFORMAT2D_8                    0x20021
-#define AL_FORMAT_BFORMAT2D_16                   0x20022
-#define AL_FORMAT_BFORMAT2D_FLOAT32              0x20023
-#define AL_FORMAT_BFORMAT3D_8                    0x20031
-#define AL_FORMAT_BFORMAT3D_16                   0x20032
-#define AL_FORMAT_BFORMAT3D_FLOAT32              0x20033
+#define AL_FORMAT_BFORMAT2D_8 0x20021
+#define AL_FORMAT_BFORMAT2D_16 0x20022
+#define AL_FORMAT_BFORMAT2D_FLOAT32 0x20023
+#define AL_FORMAT_BFORMAT3D_8 0x20031
+#define AL_FORMAT_BFORMAT3D_16 0x20032
+#define AL_FORMAT_BFORMAT3D_FLOAT32 0x20033
 #endif
 
 #ifndef AL_EXT_MULAW_BFORMAT
 #define AL_EXT_MULAW_BFORMAT 1
-#define AL_FORMAT_BFORMAT2D_MULAW                0x10031
-#define AL_FORMAT_BFORMAT3D_MULAW                0x10032
+#define AL_FORMAT_BFORMAT2D_MULAW 0x10031
+#define AL_FORMAT_BFORMAT3D_MULAW 0x10032
 #endif
 
 #ifndef ALC_SOFT_HRTF
 #define ALC_SOFT_HRTF 1
-#define ALC_HRTF_SOFT                            0x1992
-#define ALC_DONT_CARE_SOFT                       0x0002
-#define ALC_HRTF_STATUS_SOFT                     0x1993
-#define ALC_HRTF_DISABLED_SOFT                   0x0000
-#define ALC_HRTF_ENABLED_SOFT                    0x0001
-#define ALC_HRTF_DENIED_SOFT                     0x0002
-#define ALC_HRTF_REQUIRED_SOFT                   0x0003
-#define ALC_HRTF_HEADPHONES_DETECTED_SOFT        0x0004
-#define ALC_HRTF_UNSUPPORTED_FORMAT_SOFT         0x0005
-#define ALC_NUM_HRTF_SPECIFIERS_SOFT             0x1994
-#define ALC_HRTF_SPECIFIER_SOFT                  0x1995
-#define ALC_HRTF_ID_SOFT                         0x1996
-typedef const ALCchar* (ALC_APIENTRY*LPALCGETSTRINGISOFT)(ALCdevice *device, ALCenum paramName, ALCsizei index);
-typedef ALCboolean (ALC_APIENTRY*LPALCRESETDEVICESOFT)(ALCdevice *device, const ALCint *attribs);
+#define ALC_HRTF_SOFT 0x1992
+#define ALC_DONT_CARE_SOFT 0x0002
+#define ALC_HRTF_STATUS_SOFT 0x1993
+#define ALC_HRTF_DISABLED_SOFT 0x0000
+#define ALC_HRTF_ENABLED_SOFT 0x0001
+#define ALC_HRTF_DENIED_SOFT 0x0002
+#define ALC_HRTF_REQUIRED_SOFT 0x0003
+#define ALC_HRTF_HEADPHONES_DETECTED_SOFT 0x0004
+#define ALC_HRTF_UNSUPPORTED_FORMAT_SOFT 0x0005
+#define ALC_NUM_HRTF_SPECIFIERS_SOFT 0x1994
+#define ALC_HRTF_SPECIFIER_SOFT 0x1995
+#define ALC_HRTF_ID_SOFT 0x1996
+    typedef const ALCchar*(ALC_APIENTRY* LPALCGETSTRINGISOFT)(ALCdevice* device, ALCenum paramName, ALCsizei index);
+    typedef ALCboolean(ALC_APIENTRY* LPALCRESETDEVICESOFT)(ALCdevice* device, const ALCint* attribs);
 #ifdef AL_ALEXT_PROTOTYPES
-ALC_API const ALCchar* ALC_APIENTRY alcGetStringiSOFT(ALCdevice *device, ALCenum paramName, ALCsizei index);
-ALC_API ALCboolean ALC_APIENTRY alcResetDeviceSOFT(ALCdevice *device, const ALCint *attribs);
+    ALC_API const ALCchar* ALC_APIENTRY alcGetStringiSOFT(ALCdevice* device, ALCenum paramName, ALCsizei index);
+    ALC_API ALCboolean ALC_APIENTRY alcResetDeviceSOFT(ALCdevice* device, const ALCint* attribs);
 #endif
 #endif
 
 #ifndef AL_SOFT_gain_clamp_ex
 #define AL_SOFT_gain_clamp_ex 1
-#define AL_GAIN_LIMIT_SOFT                       0x200E
+#define AL_GAIN_LIMIT_SOFT 0x200E
 #endif
 
 #ifndef AL_SOFT_source_resampler
 #define AL_SOFT_source_resampler
-#define AL_NUM_RESAMPLERS_SOFT                   0x1210
-#define AL_DEFAULT_RESAMPLER_SOFT                0x1211
-#define AL_SOURCE_RESAMPLER_SOFT                 0x1212
-#define AL_RESAMPLER_NAME_SOFT                   0x1213
-typedef const ALchar* (AL_APIENTRY*LPALGETSTRINGISOFT)(ALenum pname, ALsizei index);
+#define AL_NUM_RESAMPLERS_SOFT 0x1210
+#define AL_DEFAULT_RESAMPLER_SOFT 0x1211
+#define AL_SOURCE_RESAMPLER_SOFT 0x1212
+#define AL_RESAMPLER_NAME_SOFT 0x1213
+    typedef const ALchar*(AL_APIENTRY* LPALGETSTRINGISOFT)(ALenum pname, ALsizei index);
 #ifdef AL_ALEXT_PROTOTYPES
-AL_API const ALchar* AL_APIENTRY alGetStringiSOFT(ALenum pname, ALsizei index);
+    AL_API const ALchar* AL_APIENTRY alGetStringiSOFT(ALenum pname, ALsizei index);
 #endif
 #endif
 
 #ifndef AL_SOFT_source_spatialize
 #define AL_SOFT_source_spatialize
-#define AL_SOURCE_SPATIALIZE_SOFT                0x1214
-#define AL_AUTO_SOFT                             0x0002
+#define AL_SOURCE_SPATIALIZE_SOFT 0x1214
+#define AL_AUTO_SOFT 0x0002
 #endif
 
 #ifndef ALC_SOFT_output_limiter
 #define ALC_SOFT_output_limiter
-#define ALC_OUTPUT_LIMITER_SOFT                  0x199A
+#define ALC_OUTPUT_LIMITER_SOFT 0x199A
 #endif
 
 #ifdef __cplusplus
diff --git a/apps/openmw/mwsound/efx-presets.h b/apps/openmw/mwsound/efx-presets.h
index 8539fd5178..a9662936d5 100644
--- a/apps/openmw/mwsound/efx-presets.h
+++ b/apps/openmw/mwsound/efx-presets.h
@@ -5,7 +5,8 @@
 
 #ifndef EFXEAXREVERBPROPERTIES_DEFINED
 #define EFXEAXREVERBPROPERTIES_DEFINED
-typedef struct {
+typedef struct
+{
     float flDensity;
     float flDiffusion;
     float flGain;
@@ -28,375 +29,827 @@ typedef struct {
     float flHFReference;
     float flLFReference;
     float flRoomRolloffFactor;
-    int   iDecayHFLimit;
+    int iDecayHFLimit;
 } EFXEAXREVERBPROPERTIES, *LPEFXEAXREVERBPROPERTIES;
 #endif
 
 /* Default Presets */
 
-#define EFX_REVERB_PRESET_GENERIC \
-    { 1.0000f, 1.0000f, 0.3162f, 0.8913f, 1.0000f, 1.4900f, 0.8300f, 1.0000f, 0.0500f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_PADDEDCELL \
-    { 0.1715f, 1.0000f, 0.3162f, 0.0010f, 1.0000f, 0.1700f, 0.1000f, 1.0000f, 0.2500f, 0.0010f, { 0.0000f, 0.0000f, 0.0000f }, 1.2691f, 0.0020f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_ROOM \
-    { 0.4287f, 1.0000f, 0.3162f, 0.5929f, 1.0000f, 0.4000f, 0.8300f, 1.0000f, 0.1503f, 0.0020f, { 0.0000f, 0.0000f, 0.0000f }, 1.0629f, 0.0030f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_BATHROOM \
-    { 0.1715f, 1.0000f, 0.3162f, 0.2512f, 1.0000f, 1.4900f, 0.5400f, 1.0000f, 0.6531f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 3.2734f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_LIVINGROOM \
-    { 0.9766f, 1.0000f, 0.3162f, 0.0010f, 1.0000f, 0.5000f, 0.1000f, 1.0000f, 0.2051f, 0.0030f, { 0.0000f, 0.0000f, 0.0000f }, 0.2805f, 0.0040f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_STONEROOM \
-    { 1.0000f, 1.0000f, 0.3162f, 0.7079f, 1.0000f, 2.3100f, 0.6400f, 1.0000f, 0.4411f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.1003f, 0.0170f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_AUDITORIUM \
-    { 1.0000f, 1.0000f, 0.3162f, 0.5781f, 1.0000f, 4.3200f, 0.5900f, 1.0000f, 0.4032f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.7170f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_CONCERTHALL \
-    { 1.0000f, 1.0000f, 0.3162f, 0.5623f, 1.0000f, 3.9200f, 0.7000f, 1.0000f, 0.2427f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.9977f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_CAVE \
-    { 1.0000f, 1.0000f, 0.3162f, 1.0000f, 1.0000f, 2.9100f, 1.3000f, 1.0000f, 0.5000f, 0.0150f, { 0.0000f, 0.0000f, 0.0000f }, 0.7063f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
-
-#define EFX_REVERB_PRESET_ARENA \
-    { 1.0000f, 1.0000f, 0.3162f, 0.4477f, 1.0000f, 7.2400f, 0.3300f, 1.0000f, 0.2612f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.0186f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_HANGAR \
-    { 1.0000f, 1.0000f, 0.3162f, 0.3162f, 1.0000f, 10.0500f, 0.2300f, 1.0000f, 0.5000f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.2560f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_CARPETEDHALLWAY \
-    { 0.4287f, 1.0000f, 0.3162f, 0.0100f, 1.0000f, 0.3000f, 0.1000f, 1.0000f, 0.1215f, 0.0020f, { 0.0000f, 0.0000f, 0.0000f }, 0.1531f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_HALLWAY \
-    { 0.3645f, 1.0000f, 0.3162f, 0.7079f, 1.0000f, 1.4900f, 0.5900f, 1.0000f, 0.2458f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.6615f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_STONECORRIDOR \
-    { 1.0000f, 1.0000f, 0.3162f, 0.7612f, 1.0000f, 2.7000f, 0.7900f, 1.0000f, 0.2472f, 0.0130f, { 0.0000f, 0.0000f, 0.0000f }, 1.5758f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_ALLEY \
-    { 1.0000f, 0.3000f, 0.3162f, 0.7328f, 1.0000f, 1.4900f, 0.8600f, 1.0000f, 0.2500f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 0.9954f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1250f, 0.9500f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_FOREST \
-    { 1.0000f, 0.3000f, 0.3162f, 0.0224f, 1.0000f, 1.4900f, 0.5400f, 1.0000f, 0.0525f, 0.1620f, { 0.0000f, 0.0000f, 0.0000f }, 0.7682f, 0.0880f, { 0.0000f, 0.0000f, 0.0000f }, 0.1250f, 1.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_CITY \
-    { 1.0000f, 0.5000f, 0.3162f, 0.3981f, 1.0000f, 1.4900f, 0.6700f, 1.0000f, 0.0730f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 0.1427f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_MOUNTAINS \
-    { 1.0000f, 0.2700f, 0.3162f, 0.0562f, 1.0000f, 1.4900f, 0.2100f, 1.0000f, 0.0407f, 0.3000f, { 0.0000f, 0.0000f, 0.0000f }, 0.1919f, 0.1000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
-
-#define EFX_REVERB_PRESET_QUARRY \
-    { 1.0000f, 1.0000f, 0.3162f, 0.3162f, 1.0000f, 1.4900f, 0.8300f, 1.0000f, 0.0000f, 0.0610f, { 0.0000f, 0.0000f, 0.0000f }, 1.7783f, 0.0250f, { 0.0000f, 0.0000f, 0.0000f }, 0.1250f, 0.7000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_PLAIN \
-    { 1.0000f, 0.2100f, 0.3162f, 0.1000f, 1.0000f, 1.4900f, 0.5000f, 1.0000f, 0.0585f, 0.1790f, { 0.0000f, 0.0000f, 0.0000f }, 0.1089f, 0.1000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_PARKINGLOT \
-    { 1.0000f, 1.0000f, 0.3162f, 1.0000f, 1.0000f, 1.6500f, 1.5000f, 1.0000f, 0.2082f, 0.0080f, { 0.0000f, 0.0000f, 0.0000f }, 0.2652f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
-
-#define EFX_REVERB_PRESET_SEWERPIPE \
-    { 0.3071f, 0.8000f, 0.3162f, 0.3162f, 1.0000f, 2.8100f, 0.1400f, 1.0000f, 1.6387f, 0.0140f, { 0.0000f, 0.0000f, 0.0000f }, 3.2471f, 0.0210f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_UNDERWATER \
-    { 0.3645f, 1.0000f, 0.3162f, 0.0100f, 1.0000f, 1.4900f, 0.1000f, 1.0000f, 0.5963f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 7.0795f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 1.1800f, 0.3480f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_DRUGGED \
-    { 0.4287f, 0.5000f, 0.3162f, 1.0000f, 1.0000f, 8.3900f, 1.3900f, 1.0000f, 0.8760f, 0.0020f, { 0.0000f, 0.0000f, 0.0000f }, 3.1081f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 1.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
-
-#define EFX_REVERB_PRESET_DIZZY \
-    { 0.3645f, 0.6000f, 0.3162f, 0.6310f, 1.0000f, 17.2300f, 0.5600f, 1.0000f, 0.1392f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.4937f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.8100f, 0.3100f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
-
-#define EFX_REVERB_PRESET_PSYCHOTIC \
-    { 0.0625f, 0.5000f, 0.3162f, 0.8404f, 1.0000f, 7.5600f, 0.9100f, 1.0000f, 0.4864f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 2.4378f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 4.0000f, 1.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
+#define EFX_REVERB_PRESET_GENERIC                                                                                      \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 0.8913f, 1.0000f, 1.4900f, 0.8300f, 1.0000f, 0.0500f, 0.0070f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_PADDEDCELL                                                                                   \
+    {                                                                                                                  \
+        0.1715f, 1.0000f, 0.3162f, 0.0010f, 1.0000f, 0.1700f, 0.1000f, 1.0000f, 0.2500f, 0.0010f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.2691f, 0.0020f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_ROOM                                                                                         \
+    {                                                                                                                  \
+        0.4287f, 1.0000f, 0.3162f, 0.5929f, 1.0000f, 0.4000f, 0.8300f, 1.0000f, 0.1503f, 0.0020f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.0629f, 0.0030f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_BATHROOM                                                                                     \
+    {                                                                                                                  \
+        0.1715f, 1.0000f, 0.3162f, 0.2512f, 1.0000f, 1.4900f, 0.5400f, 1.0000f, 0.6531f, 0.0070f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 3.2734f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_LIVINGROOM                                                                                   \
+    {                                                                                                                  \
+        0.9766f, 1.0000f, 0.3162f, 0.0010f, 1.0000f, 0.5000f, 0.1000f, 1.0000f, 0.2051f, 0.0030f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.2805f, 0.0040f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_STONEROOM                                                                                    \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 0.7079f, 1.0000f, 2.3100f, 0.6400f, 1.0000f, 0.4411f, 0.0120f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.1003f, 0.0170f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_AUDITORIUM                                                                                   \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 0.5781f, 1.0000f, 4.3200f, 0.5900f, 1.0000f, 0.4032f, 0.0200f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.7170f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_CONCERTHALL                                                                                  \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 0.5623f, 1.0000f, 3.9200f, 0.7000f, 1.0000f, 0.2427f, 0.0200f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.9977f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_CAVE                                                                                         \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 1.0000f, 1.0000f, 2.9100f, 1.3000f, 1.0000f, 0.5000f, 0.0150f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.7063f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0                                                      \
+    }
+
+#define EFX_REVERB_PRESET_ARENA                                                                                        \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 0.4477f, 1.0000f, 7.2400f, 0.3300f, 1.0000f, 0.2612f, 0.0200f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.0186f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_HANGAR                                                                                       \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 0.3162f, 1.0000f, 10.0500f, 0.2300f, 1.0000f, 0.5000f, 0.0200f,                     \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.2560f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_CARPETEDHALLWAY                                                                              \
+    {                                                                                                                  \
+        0.4287f, 1.0000f, 0.3162f, 0.0100f, 1.0000f, 0.3000f, 0.1000f, 1.0000f, 0.1215f, 0.0020f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.1531f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_HALLWAY                                                                                      \
+    {                                                                                                                  \
+        0.3645f, 1.0000f, 0.3162f, 0.7079f, 1.0000f, 1.4900f, 0.5900f, 1.0000f, 0.2458f, 0.0070f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.6615f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_STONECORRIDOR                                                                                \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 0.7612f, 1.0000f, 2.7000f, 0.7900f, 1.0000f, 0.2472f, 0.0130f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.5758f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_ALLEY                                                                                        \
+    {                                                                                                                  \
+        1.0000f, 0.3000f, 0.3162f, 0.7328f, 1.0000f, 1.4900f, 0.8600f, 1.0000f, 0.2500f, 0.0070f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.9954f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1250f, 0.9500f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_FOREST                                                                                       \
+    {                                                                                                                  \
+        1.0000f, 0.3000f, 0.3162f, 0.0224f, 1.0000f, 1.4900f, 0.5400f, 1.0000f, 0.0525f, 0.1620f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.7682f, 0.0880f, { 0.0000f, 0.0000f, 0.0000f }, 0.1250f, 1.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_CITY                                                                                         \
+    {                                                                                                                  \
+        1.0000f, 0.5000f, 0.3162f, 0.3981f, 1.0000f, 1.4900f, 0.6700f, 1.0000f, 0.0730f, 0.0070f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.1427f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_MOUNTAINS                                                                                    \
+    {                                                                                                                  \
+        1.0000f, 0.2700f, 0.3162f, 0.0562f, 1.0000f, 1.4900f, 0.2100f, 1.0000f, 0.0407f, 0.3000f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.1919f, 0.1000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0                                                      \
+    }
+
+#define EFX_REVERB_PRESET_QUARRY                                                                                       \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 0.3162f, 1.0000f, 1.4900f, 0.8300f, 1.0000f, 0.0000f, 0.0610f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.7783f, 0.0250f, { 0.0000f, 0.0000f, 0.0000f }, 0.1250f, 0.7000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_PLAIN                                                                                        \
+    {                                                                                                                  \
+        1.0000f, 0.2100f, 0.3162f, 0.1000f, 1.0000f, 1.4900f, 0.5000f, 1.0000f, 0.0585f, 0.1790f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.1089f, 0.1000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_PARKINGLOT                                                                                   \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 1.0000f, 1.0000f, 1.6500f, 1.5000f, 1.0000f, 0.2082f, 0.0080f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.2652f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0                                                      \
+    }
+
+#define EFX_REVERB_PRESET_SEWERPIPE                                                                                    \
+    {                                                                                                                  \
+        0.3071f, 0.8000f, 0.3162f, 0.3162f, 1.0000f, 2.8100f, 0.1400f, 1.0000f, 1.6387f, 0.0140f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 3.2471f, 0.0210f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_UNDERWATER                                                                                   \
+    {                                                                                                                  \
+        0.3645f, 1.0000f, 0.3162f, 0.0100f, 1.0000f, 1.4900f, 0.1000f, 1.0000f, 0.5963f, 0.0070f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 7.0795f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 1.1800f, \
+            0.3480f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_DRUGGED                                                                                      \
+    {                                                                                                                  \
+        0.4287f, 0.5000f, 0.3162f, 1.0000f, 1.0000f, 8.3900f, 1.3900f, 1.0000f, 0.8760f, 0.0020f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 3.1081f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            1.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0                                                      \
+    }
+
+#define EFX_REVERB_PRESET_DIZZY                                                                                        \
+    {                                                                                                                  \
+        0.3645f, 0.6000f, 0.3162f, 0.6310f, 1.0000f, 17.2300f, 0.5600f, 1.0000f, 0.1392f, 0.0200f,                     \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.4937f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.8100f, \
+            0.3100f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0                                                      \
+    }
+
+#define EFX_REVERB_PRESET_PSYCHOTIC                                                                                    \
+    {                                                                                                                  \
+        0.0625f, 0.5000f, 0.3162f, 0.8404f, 1.0000f, 7.5600f, 0.9100f, 1.0000f, 0.4864f, 0.0200f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 2.4378f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 4.0000f, \
+            1.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0                                                      \
+    }
 
 /* Castle Presets */
 
-#define EFX_REVERB_PRESET_CASTLE_SMALLROOM \
-    { 1.0000f, 0.8900f, 0.3162f, 0.3981f, 0.1000f, 1.2200f, 0.8300f, 0.3100f, 0.8913f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 1.9953f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_CASTLE_SHORTPASSAGE \
-    { 1.0000f, 0.8900f, 0.3162f, 0.3162f, 0.1000f, 2.3200f, 0.8300f, 0.3100f, 0.8913f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_CASTLE_MEDIUMROOM \
-    { 1.0000f, 0.9300f, 0.3162f, 0.2818f, 0.1000f, 2.0400f, 0.8300f, 0.4600f, 0.6310f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 1.5849f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1550f, 0.0300f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_CASTLE_LARGEROOM \
-    { 1.0000f, 0.8200f, 0.3162f, 0.2818f, 0.1259f, 2.5300f, 0.8300f, 0.5000f, 0.4467f, 0.0340f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.1850f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_CASTLE_LONGPASSAGE \
-    { 1.0000f, 0.8900f, 0.3162f, 0.3981f, 0.1000f, 3.4200f, 0.8300f, 0.3100f, 0.8913f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_CASTLE_HALL \
-    { 1.0000f, 0.8100f, 0.3162f, 0.2818f, 0.1778f, 3.1400f, 0.7900f, 0.6200f, 0.1778f, 0.0560f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_CASTLE_CUPBOARD \
-    { 1.0000f, 0.8900f, 0.3162f, 0.2818f, 0.1000f, 0.6700f, 0.8700f, 0.3100f, 1.4125f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 3.5481f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_CASTLE_COURTYARD \
-    { 1.0000f, 0.4200f, 0.3162f, 0.4467f, 0.1995f, 2.1300f, 0.6100f, 0.2300f, 0.2239f, 0.1600f, { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0360f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.3700f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
-
-#define EFX_REVERB_PRESET_CASTLE_ALCOVE \
-    { 1.0000f, 0.8900f, 0.3162f, 0.5012f, 0.1000f, 1.6400f, 0.8700f, 0.3100f, 1.0000f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0340f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 }
+#define EFX_REVERB_PRESET_CASTLE_SMALLROOM                                                                             \
+    {                                                                                                                  \
+        1.0000f, 0.8900f, 0.3162f, 0.3981f, 0.1000f, 1.2200f, 0.8300f, 0.3100f, 0.8913f, 0.0220f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.9953f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, \
+            0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_CASTLE_SHORTPASSAGE                                                                          \
+    {                                                                                                                  \
+        1.0000f, 0.8900f, 0.3162f, 0.3162f, 0.1000f, 2.3200f, 0.8300f, 0.3100f, 0.8913f, 0.0070f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, \
+            0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_CASTLE_MEDIUMROOM                                                                            \
+    {                                                                                                                  \
+        1.0000f, 0.9300f, 0.3162f, 0.2818f, 0.1000f, 2.0400f, 0.8300f, 0.4600f, 0.6310f, 0.0220f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.5849f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1550f, 0.0300f, 0.2500f, \
+            0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_CASTLE_LARGEROOM                                                                             \
+    {                                                                                                                  \
+        1.0000f, 0.8200f, 0.3162f, 0.2818f, 0.1259f, 2.5300f, 0.8300f, 0.5000f, 0.4467f, 0.0340f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.1850f, 0.0700f, 0.2500f, \
+            0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_CASTLE_LONGPASSAGE                                                                           \
+    {                                                                                                                  \
+        1.0000f, 0.8900f, 0.3162f, 0.3981f, 0.1000f, 3.4200f, 0.8300f, 0.3100f, 0.8913f, 0.0070f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, \
+            0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_CASTLE_HALL                                                                                  \
+    {                                                                                                                  \
+        1.0000f, 0.8100f, 0.3162f, 0.2818f, 0.1778f, 3.1400f, 0.7900f, 0.6200f, 0.1778f, 0.0560f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_CASTLE_CUPBOARD                                                                              \
+    {                                                                                                                  \
+        1.0000f, 0.8900f, 0.3162f, 0.2818f, 0.1000f, 0.6700f, 0.8700f, 0.3100f, 1.4125f, 0.0100f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 3.5481f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, \
+            0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_CASTLE_COURTYARD                                                                             \
+    {                                                                                                                  \
+        1.0000f, 0.4200f, 0.3162f, 0.4467f, 0.1995f, 2.1300f, 0.6100f, 0.2300f, 0.2239f, 0.1600f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0360f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.3700f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0                                                      \
+    }
+
+#define EFX_REVERB_PRESET_CASTLE_ALCOVE                                                                                \
+    {                                                                                                                  \
+        1.0000f, 0.8900f, 0.3162f, 0.5012f, 0.1000f, 1.6400f, 0.8700f, 0.3100f, 1.0000f, 0.0070f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0340f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, \
+            0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1                                                      \
+    }
 
 /* Factory Presets */
 
-#define EFX_REVERB_PRESET_FACTORY_SMALLROOM \
-    { 0.3645f, 0.8200f, 0.3162f, 0.7943f, 0.5012f, 1.7200f, 0.6500f, 1.3100f, 0.7079f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.7783f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.1190f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_FACTORY_SHORTPASSAGE \
-    { 0.3645f, 0.6400f, 0.2512f, 0.7943f, 0.5012f, 2.5300f, 0.6500f, 1.3100f, 1.0000f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0380f, { 0.0000f, 0.0000f, 0.0000f }, 0.1350f, 0.2300f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_FACTORY_MEDIUMROOM \
-    { 0.4287f, 0.8200f, 0.2512f, 0.7943f, 0.5012f, 2.7600f, 0.6500f, 1.3100f, 0.2818f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.1740f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_FACTORY_LARGEROOM \
-    { 0.4287f, 0.7500f, 0.2512f, 0.7079f, 0.6310f, 4.2400f, 0.5100f, 1.3100f, 0.1778f, 0.0390f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.2310f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_FACTORY_LONGPASSAGE \
-    { 0.3645f, 0.6400f, 0.2512f, 0.7943f, 0.5012f, 4.0600f, 0.6500f, 1.3100f, 1.0000f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0370f, { 0.0000f, 0.0000f, 0.0000f }, 0.1350f, 0.2300f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_FACTORY_HALL \
-    { 0.4287f, 0.7500f, 0.3162f, 0.7079f, 0.6310f, 7.4300f, 0.5100f, 1.3100f, 0.0631f, 0.0730f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0270f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_FACTORY_CUPBOARD \
-    { 0.3071f, 0.6300f, 0.2512f, 0.7943f, 0.5012f, 0.4900f, 0.6500f, 1.3100f, 1.2589f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.9953f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.1070f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_FACTORY_COURTYARD \
-    { 0.3071f, 0.5700f, 0.3162f, 0.3162f, 0.6310f, 2.3200f, 0.2900f, 0.5600f, 0.2239f, 0.1400f, { 0.0000f, 0.0000f, 0.0000f }, 0.3981f, 0.0390f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2900f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_FACTORY_ALCOVE \
-    { 0.3645f, 0.5900f, 0.2512f, 0.7943f, 0.5012f, 3.1400f, 0.6500f, 1.3100f, 1.4125f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.0000f, 0.0380f, { 0.0000f, 0.0000f, 0.0000f }, 0.1140f, 0.1000f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 }
+#define EFX_REVERB_PRESET_FACTORY_SMALLROOM                                                                            \
+    {                                                                                                                  \
+        0.3645f, 0.8200f, 0.3162f, 0.7943f, 0.5012f, 1.7200f, 0.6500f, 1.3100f, 0.7079f, 0.0100f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.7783f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.1190f, 0.0700f, 0.2500f, \
+            0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_FACTORY_SHORTPASSAGE                                                                         \
+    {                                                                                                                  \
+        0.3645f, 0.6400f, 0.2512f, 0.7943f, 0.5012f, 2.5300f, 0.6500f, 1.3100f, 1.0000f, 0.0100f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0380f, { 0.0000f, 0.0000f, 0.0000f }, 0.1350f, 0.2300f, 0.2500f, \
+            0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_FACTORY_MEDIUMROOM                                                                           \
+    {                                                                                                                  \
+        0.4287f, 0.8200f, 0.2512f, 0.7943f, 0.5012f, 2.7600f, 0.6500f, 1.3100f, 0.2818f, 0.0220f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.1740f, 0.0700f, 0.2500f, \
+            0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_FACTORY_LARGEROOM                                                                            \
+    {                                                                                                                  \
+        0.4287f, 0.7500f, 0.2512f, 0.7079f, 0.6310f, 4.2400f, 0.5100f, 1.3100f, 0.1778f, 0.0390f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.2310f, 0.0700f, 0.2500f, \
+            0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_FACTORY_LONGPASSAGE                                                                          \
+    {                                                                                                                  \
+        0.3645f, 0.6400f, 0.2512f, 0.7943f, 0.5012f, 4.0600f, 0.6500f, 1.3100f, 1.0000f, 0.0200f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0370f, { 0.0000f, 0.0000f, 0.0000f }, 0.1350f, 0.2300f, 0.2500f, \
+            0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_FACTORY_HALL                                                                                 \
+    {                                                                                                                  \
+        0.4287f, 0.7500f, 0.3162f, 0.7079f, 0.6310f, 7.4300f, 0.5100f, 1.3100f, 0.0631f, 0.0730f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0270f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0700f, 0.2500f, \
+            0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_FACTORY_CUPBOARD                                                                             \
+    {                                                                                                                  \
+        0.3071f, 0.6300f, 0.2512f, 0.7943f, 0.5012f, 0.4900f, 0.6500f, 1.3100f, 1.2589f, 0.0100f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.9953f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.1070f, 0.0700f, 0.2500f, \
+            0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_FACTORY_COURTYARD                                                                            \
+    {                                                                                                                  \
+        0.3071f, 0.5700f, 0.3162f, 0.3162f, 0.6310f, 2.3200f, 0.2900f, 0.5600f, 0.2239f, 0.1400f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.3981f, 0.0390f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2900f, 0.2500f, \
+            0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_FACTORY_ALCOVE                                                                               \
+    {                                                                                                                  \
+        0.3645f, 0.5900f, 0.2512f, 0.7943f, 0.5012f, 3.1400f, 0.6500f, 1.3100f, 1.4125f, 0.0100f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.0000f, 0.0380f, { 0.0000f, 0.0000f, 0.0000f }, 0.1140f, 0.1000f, 0.2500f, \
+            0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1                                                      \
+    }
 
 /* Ice Palace Presets */
 
-#define EFX_REVERB_PRESET_ICEPALACE_SMALLROOM \
-    { 1.0000f, 0.8400f, 0.3162f, 0.5623f, 0.2818f, 1.5100f, 1.5300f, 0.2700f, 0.8913f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1640f, 0.1400f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_ICEPALACE_SHORTPASSAGE \
-    { 1.0000f, 0.7500f, 0.3162f, 0.5623f, 0.2818f, 1.7900f, 1.4600f, 0.2800f, 0.5012f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0190f, { 0.0000f, 0.0000f, 0.0000f }, 0.1770f, 0.0900f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_ICEPALACE_MEDIUMROOM \
-    { 1.0000f, 0.8700f, 0.3162f, 0.5623f, 0.4467f, 2.2200f, 1.5300f, 0.3200f, 0.3981f, 0.0390f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0270f, { 0.0000f, 0.0000f, 0.0000f }, 0.1860f, 0.1200f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_ICEPALACE_LARGEROOM \
-    { 1.0000f, 0.8100f, 0.3162f, 0.5623f, 0.4467f, 3.1400f, 1.5300f, 0.3200f, 0.2512f, 0.0390f, { 0.0000f, 0.0000f, 0.0000f }, 1.0000f, 0.0270f, { 0.0000f, 0.0000f, 0.0000f }, 0.2140f, 0.1100f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_ICEPALACE_LONGPASSAGE \
-    { 1.0000f, 0.7700f, 0.3162f, 0.5623f, 0.3981f, 3.0100f, 1.4600f, 0.2800f, 0.7943f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0250f, { 0.0000f, 0.0000f, 0.0000f }, 0.1860f, 0.0400f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_ICEPALACE_HALL \
-    { 1.0000f, 0.7600f, 0.3162f, 0.4467f, 0.5623f, 5.4900f, 1.5300f, 0.3800f, 0.1122f, 0.0540f, { 0.0000f, 0.0000f, 0.0000f }, 0.6310f, 0.0520f, { 0.0000f, 0.0000f, 0.0000f }, 0.2260f, 0.1100f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_ICEPALACE_CUPBOARD \
-    { 1.0000f, 0.8300f, 0.3162f, 0.5012f, 0.2239f, 0.7600f, 1.5300f, 0.2600f, 1.1220f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.9953f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.1430f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_ICEPALACE_COURTYARD \
-    { 1.0000f, 0.5900f, 0.3162f, 0.2818f, 0.3162f, 2.0400f, 1.2000f, 0.3800f, 0.3162f, 0.1730f, { 0.0000f, 0.0000f, 0.0000f }, 0.3162f, 0.0430f, { 0.0000f, 0.0000f, 0.0000f }, 0.2350f, 0.4800f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_ICEPALACE_ALCOVE \
-    { 1.0000f, 0.8400f, 0.3162f, 0.5623f, 0.2818f, 2.7600f, 1.4600f, 0.2800f, 1.1220f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.1610f, 0.0900f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 }
+#define EFX_REVERB_PRESET_ICEPALACE_SMALLROOM                                                                          \
+    {                                                                                                                  \
+        1.0000f, 0.8400f, 0.3162f, 0.5623f, 0.2818f, 1.5100f, 1.5300f, 0.2700f, 0.8913f, 0.0100f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1640f, 0.1400f, 0.2500f, \
+            0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_ICEPALACE_SHORTPASSAGE                                                                       \
+    {                                                                                                                  \
+        1.0000f, 0.7500f, 0.3162f, 0.5623f, 0.2818f, 1.7900f, 1.4600f, 0.2800f, 0.5012f, 0.0100f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0190f, { 0.0000f, 0.0000f, 0.0000f }, 0.1770f, 0.0900f, 0.2500f, \
+            0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_ICEPALACE_MEDIUMROOM                                                                         \
+    {                                                                                                                  \
+        1.0000f, 0.8700f, 0.3162f, 0.5623f, 0.4467f, 2.2200f, 1.5300f, 0.3200f, 0.3981f, 0.0390f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0270f, { 0.0000f, 0.0000f, 0.0000f }, 0.1860f, 0.1200f, 0.2500f, \
+            0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_ICEPALACE_LARGEROOM                                                                          \
+    {                                                                                                                  \
+        1.0000f, 0.8100f, 0.3162f, 0.5623f, 0.4467f, 3.1400f, 1.5300f, 0.3200f, 0.2512f, 0.0390f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.0000f, 0.0270f, { 0.0000f, 0.0000f, 0.0000f }, 0.2140f, 0.1100f, 0.2500f, \
+            0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_ICEPALACE_LONGPASSAGE                                                                        \
+    {                                                                                                                  \
+        1.0000f, 0.7700f, 0.3162f, 0.5623f, 0.3981f, 3.0100f, 1.4600f, 0.2800f, 0.7943f, 0.0120f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0250f, { 0.0000f, 0.0000f, 0.0000f }, 0.1860f, 0.0400f, 0.2500f, \
+            0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_ICEPALACE_HALL                                                                               \
+    {                                                                                                                  \
+        1.0000f, 0.7600f, 0.3162f, 0.4467f, 0.5623f, 5.4900f, 1.5300f, 0.3800f, 0.1122f, 0.0540f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.6310f, 0.0520f, { 0.0000f, 0.0000f, 0.0000f }, 0.2260f, 0.1100f, 0.2500f, \
+            0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_ICEPALACE_CUPBOARD                                                                           \
+    {                                                                                                                  \
+        1.0000f, 0.8300f, 0.3162f, 0.5012f, 0.2239f, 0.7600f, 1.5300f, 0.2600f, 1.1220f, 0.0120f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.9953f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.1430f, 0.0800f, 0.2500f, \
+            0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_ICEPALACE_COURTYARD                                                                          \
+    {                                                                                                                  \
+        1.0000f, 0.5900f, 0.3162f, 0.2818f, 0.3162f, 2.0400f, 1.2000f, 0.3800f, 0.3162f, 0.1730f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.3162f, 0.0430f, { 0.0000f, 0.0000f, 0.0000f }, 0.2350f, 0.4800f, 0.2500f, \
+            0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_ICEPALACE_ALCOVE                                                                             \
+    {                                                                                                                  \
+        1.0000f, 0.8400f, 0.3162f, 0.5623f, 0.2818f, 2.7600f, 1.4600f, 0.2800f, 1.1220f, 0.0100f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.1610f, 0.0900f, 0.2500f, \
+            0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1                                                      \
+    }
 
 /* Space Station Presets */
 
-#define EFX_REVERB_PRESET_SPACESTATION_SMALLROOM \
-    { 0.2109f, 0.7000f, 0.3162f, 0.7079f, 0.8913f, 1.7200f, 0.8200f, 0.5500f, 0.7943f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0130f, { 0.0000f, 0.0000f, 0.0000f }, 0.1880f, 0.2600f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_SPACESTATION_SHORTPASSAGE \
-    { 0.2109f, 0.8700f, 0.3162f, 0.6310f, 0.8913f, 3.5700f, 0.5000f, 0.5500f, 1.0000f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.1720f, 0.2000f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_SPACESTATION_MEDIUMROOM \
-    { 0.2109f, 0.7500f, 0.3162f, 0.6310f, 0.8913f, 3.0100f, 0.5000f, 0.5500f, 0.3981f, 0.0340f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0350f, { 0.0000f, 0.0000f, 0.0000f }, 0.2090f, 0.3100f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_SPACESTATION_LARGEROOM \
-    { 0.3645f, 0.8100f, 0.3162f, 0.6310f, 0.8913f, 3.8900f, 0.3800f, 0.6100f, 0.3162f, 0.0560f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0350f, { 0.0000f, 0.0000f, 0.0000f }, 0.2330f, 0.2800f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_SPACESTATION_LONGPASSAGE \
-    { 0.4287f, 0.8200f, 0.3162f, 0.6310f, 0.8913f, 4.6200f, 0.6200f, 0.5500f, 1.0000f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0310f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2300f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_SPACESTATION_HALL \
-    { 0.4287f, 0.8700f, 0.3162f, 0.6310f, 0.8913f, 7.1100f, 0.3800f, 0.6100f, 0.1778f, 0.1000f, { 0.0000f, 0.0000f, 0.0000f }, 0.6310f, 0.0470f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2500f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_SPACESTATION_CUPBOARD \
-    { 0.1715f, 0.5600f, 0.3162f, 0.7079f, 0.8913f, 0.7900f, 0.8100f, 0.5500f, 1.4125f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.7783f, 0.0180f, { 0.0000f, 0.0000f, 0.0000f }, 0.1810f, 0.3100f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_SPACESTATION_ALCOVE \
-    { 0.2109f, 0.7800f, 0.3162f, 0.7079f, 0.8913f, 1.1600f, 0.8100f, 0.5500f, 1.4125f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.0000f, 0.0180f, { 0.0000f, 0.0000f, 0.0000f }, 0.1920f, 0.2100f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 }
+#define EFX_REVERB_PRESET_SPACESTATION_SMALLROOM                                                                       \
+    {                                                                                                                  \
+        0.2109f, 0.7000f, 0.3162f, 0.7079f, 0.8913f, 1.7200f, 0.8200f, 0.5500f, 0.7943f, 0.0070f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0130f, { 0.0000f, 0.0000f, 0.0000f }, 0.1880f, 0.2600f, 0.2500f, \
+            0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_SPACESTATION_SHORTPASSAGE                                                                    \
+    {                                                                                                                  \
+        0.2109f, 0.8700f, 0.3162f, 0.6310f, 0.8913f, 3.5700f, 0.5000f, 0.5500f, 1.0000f, 0.0120f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.1720f, 0.2000f, 0.2500f, \
+            0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_SPACESTATION_MEDIUMROOM                                                                      \
+    {                                                                                                                  \
+        0.2109f, 0.7500f, 0.3162f, 0.6310f, 0.8913f, 3.0100f, 0.5000f, 0.5500f, 0.3981f, 0.0340f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0350f, { 0.0000f, 0.0000f, 0.0000f }, 0.2090f, 0.3100f, 0.2500f, \
+            0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_SPACESTATION_LARGEROOM                                                                       \
+    {                                                                                                                  \
+        0.3645f, 0.8100f, 0.3162f, 0.6310f, 0.8913f, 3.8900f, 0.3800f, 0.6100f, 0.3162f, 0.0560f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0350f, { 0.0000f, 0.0000f, 0.0000f }, 0.2330f, 0.2800f, 0.2500f, \
+            0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_SPACESTATION_LONGPASSAGE                                                                     \
+    {                                                                                                                  \
+        0.4287f, 0.8200f, 0.3162f, 0.6310f, 0.8913f, 4.6200f, 0.6200f, 0.5500f, 1.0000f, 0.0120f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0310f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2300f, 0.2500f, \
+            0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_SPACESTATION_HALL                                                                            \
+    {                                                                                                                  \
+        0.4287f, 0.8700f, 0.3162f, 0.6310f, 0.8913f, 7.1100f, 0.3800f, 0.6100f, 0.1778f, 0.1000f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.6310f, 0.0470f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2500f, 0.2500f, \
+            0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_SPACESTATION_CUPBOARD                                                                        \
+    {                                                                                                                  \
+        0.1715f, 0.5600f, 0.3162f, 0.7079f, 0.8913f, 0.7900f, 0.8100f, 0.5500f, 1.4125f, 0.0070f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.7783f, 0.0180f, { 0.0000f, 0.0000f, 0.0000f }, 0.1810f, 0.3100f, 0.2500f, \
+            0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_SPACESTATION_ALCOVE                                                                          \
+    {                                                                                                                  \
+        0.2109f, 0.7800f, 0.3162f, 0.7079f, 0.8913f, 1.1600f, 0.8100f, 0.5500f, 1.4125f, 0.0070f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.0000f, 0.0180f, { 0.0000f, 0.0000f, 0.0000f }, 0.1920f, 0.2100f, 0.2500f, \
+            0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1                                                      \
+    }
 
 /* Wooden Galleon Presets */
 
-#define EFX_REVERB_PRESET_WOODEN_SMALLROOM \
-    { 1.0000f, 1.0000f, 0.3162f, 0.1122f, 0.3162f, 0.7900f, 0.3200f, 0.8700f, 1.0000f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_WOODEN_SHORTPASSAGE \
-    { 1.0000f, 1.0000f, 0.3162f, 0.1259f, 0.3162f, 1.7500f, 0.5000f, 0.8700f, 0.8913f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.6310f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_WOODEN_MEDIUMROOM \
-    { 1.0000f, 1.0000f, 0.3162f, 0.1000f, 0.2818f, 1.4700f, 0.4200f, 0.8200f, 0.8913f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_WOODEN_LARGEROOM \
-    { 1.0000f, 1.0000f, 0.3162f, 0.0891f, 0.2818f, 2.6500f, 0.3300f, 0.8200f, 0.8913f, 0.0660f, { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_WOODEN_LONGPASSAGE \
-    { 1.0000f, 1.0000f, 0.3162f, 0.1000f, 0.3162f, 1.9900f, 0.4000f, 0.7900f, 1.0000f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.4467f, 0.0360f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_WOODEN_HALL \
-    { 1.0000f, 1.0000f, 0.3162f, 0.0794f, 0.2818f, 3.4500f, 0.3000f, 0.8200f, 0.8913f, 0.0880f, { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0630f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_WOODEN_CUPBOARD \
-    { 1.0000f, 1.0000f, 0.3162f, 0.1413f, 0.3162f, 0.5600f, 0.4600f, 0.9100f, 1.1220f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0280f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_WOODEN_COURTYARD \
-    { 1.0000f, 0.6500f, 0.3162f, 0.0794f, 0.3162f, 1.7900f, 0.3500f, 0.7900f, 0.5623f, 0.1230f, { 0.0000f, 0.0000f, 0.0000f }, 0.1000f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_WOODEN_ALCOVE \
-    { 1.0000f, 1.0000f, 0.3162f, 0.1259f, 0.3162f, 1.2200f, 0.6200f, 0.9100f, 1.1220f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 }
+#define EFX_REVERB_PRESET_WOODEN_SMALLROOM                                                                             \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 0.1122f, 0.3162f, 0.7900f, 0.3200f, 0.8700f, 1.0000f, 0.0320f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1                                                       \
+    }
+
+#define EFX_REVERB_PRESET_WOODEN_SHORTPASSAGE                                                                          \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 0.1259f, 0.3162f, 1.7500f, 0.5000f, 0.8700f, 0.8913f, 0.0120f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.6310f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1                                                       \
+    }
+
+#define EFX_REVERB_PRESET_WOODEN_MEDIUMROOM                                                                            \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 0.1000f, 0.2818f, 1.4700f, 0.4200f, 0.8200f, 0.8913f, 0.0490f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1                                                       \
+    }
+
+#define EFX_REVERB_PRESET_WOODEN_LARGEROOM                                                                             \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 0.0891f, 0.2818f, 2.6500f, 0.3300f, 0.8200f, 0.8913f, 0.0660f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1                                                       \
+    }
+
+#define EFX_REVERB_PRESET_WOODEN_LONGPASSAGE                                                                           \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 0.1000f, 0.3162f, 1.9900f, 0.4000f, 0.7900f, 1.0000f, 0.0200f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.4467f, 0.0360f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1                                                       \
+    }
+
+#define EFX_REVERB_PRESET_WOODEN_HALL                                                                                  \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 0.0794f, 0.2818f, 3.4500f, 0.3000f, 0.8200f, 0.8913f, 0.0880f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0630f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1                                                       \
+    }
+
+#define EFX_REVERB_PRESET_WOODEN_CUPBOARD                                                                              \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 0.1413f, 0.3162f, 0.5600f, 0.4600f, 0.9100f, 1.1220f, 0.0120f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0280f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1                                                       \
+    }
+
+#define EFX_REVERB_PRESET_WOODEN_COURTYARD                                                                             \
+    {                                                                                                                  \
+        1.0000f, 0.6500f, 0.3162f, 0.0794f, 0.3162f, 1.7900f, 0.3500f, 0.7900f, 0.5623f, 0.1230f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.1000f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1                                                       \
+    }
+
+#define EFX_REVERB_PRESET_WOODEN_ALCOVE                                                                                \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 0.1259f, 0.3162f, 1.2200f, 0.6200f, 0.9100f, 1.1220f, 0.0120f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1                                                       \
+    }
 
 /* Sports Presets */
 
-#define EFX_REVERB_PRESET_SPORT_EMPTYSTADIUM \
-    { 1.0000f, 1.0000f, 0.3162f, 0.4467f, 0.7943f, 6.2600f, 0.5100f, 1.1000f, 0.0631f, 0.1830f, { 0.0000f, 0.0000f, 0.0000f }, 0.3981f, 0.0380f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_SPORT_SQUASHCOURT \
-    { 1.0000f, 0.7500f, 0.3162f, 0.3162f, 0.7943f, 2.2200f, 0.9100f, 1.1600f, 0.4467f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1260f, 0.1900f, 0.2500f, 0.0000f, 0.9943f, 7176.8999f, 211.2000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_SPORT_SMALLSWIMMINGPOOL \
-    { 1.0000f, 0.7000f, 0.3162f, 0.7943f, 0.8913f, 2.7600f, 1.2500f, 1.1400f, 0.6310f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.1790f, 0.1500f, 0.8950f, 0.1900f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
-
-#define EFX_REVERB_PRESET_SPORT_LARGESWIMMINGPOOL \
-    { 1.0000f, 0.8200f, 0.3162f, 0.7943f, 1.0000f, 5.4900f, 1.3100f, 1.1400f, 0.4467f, 0.0390f, { 0.0000f, 0.0000f, 0.0000f }, 0.5012f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2220f, 0.5500f, 1.1590f, 0.2100f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
-
-#define EFX_REVERB_PRESET_SPORT_GYMNASIUM \
-    { 1.0000f, 0.8100f, 0.3162f, 0.4467f, 0.8913f, 3.1400f, 1.0600f, 1.3500f, 0.3981f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.5623f, 0.0450f, { 0.0000f, 0.0000f, 0.0000f }, 0.1460f, 0.1400f, 0.2500f, 0.0000f, 0.9943f, 7176.8999f, 211.2000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_SPORT_FULLSTADIUM \
-    { 1.0000f, 1.0000f, 0.3162f, 0.0708f, 0.7943f, 5.2500f, 0.1700f, 0.8000f, 0.1000f, 0.1880f, { 0.0000f, 0.0000f, 0.0000f }, 0.2818f, 0.0380f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_SPORT_STADIUMTANNOY \
-    { 1.0000f, 0.7800f, 0.3162f, 0.5623f, 0.5012f, 2.5300f, 0.8800f, 0.6800f, 0.2818f, 0.2300f, { 0.0000f, 0.0000f, 0.0000f }, 0.5012f, 0.0630f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+#define EFX_REVERB_PRESET_SPORT_EMPTYSTADIUM                                                                           \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 0.4467f, 0.7943f, 6.2600f, 0.5100f, 1.1000f, 0.0631f, 0.1830f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.3981f, 0.0380f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_SPORT_SQUASHCOURT                                                                            \
+    {                                                                                                                  \
+        1.0000f, 0.7500f, 0.3162f, 0.3162f, 0.7943f, 2.2200f, 0.9100f, 1.1600f, 0.4467f, 0.0070f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1260f, 0.1900f, 0.2500f, \
+            0.0000f, 0.9943f, 7176.8999f, 211.2000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_SPORT_SMALLSWIMMINGPOOL                                                                      \
+    {                                                                                                                  \
+        1.0000f, 0.7000f, 0.3162f, 0.7943f, 0.8913f, 2.7600f, 1.2500f, 1.1400f, 0.6310f, 0.0200f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.1790f, 0.1500f, 0.8950f, \
+            0.1900f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0                                                      \
+    }
+
+#define EFX_REVERB_PRESET_SPORT_LARGESWIMMINGPOOL                                                                      \
+    {                                                                                                                  \
+        1.0000f, 0.8200f, 0.3162f, 0.7943f, 1.0000f, 5.4900f, 1.3100f, 1.1400f, 0.4467f, 0.0390f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.5012f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2220f, 0.5500f, 1.1590f, \
+            0.2100f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0                                                      \
+    }
+
+#define EFX_REVERB_PRESET_SPORT_GYMNASIUM                                                                              \
+    {                                                                                                                  \
+        1.0000f, 0.8100f, 0.3162f, 0.4467f, 0.8913f, 3.1400f, 1.0600f, 1.3500f, 0.3981f, 0.0290f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.5623f, 0.0450f, { 0.0000f, 0.0000f, 0.0000f }, 0.1460f, 0.1400f, 0.2500f, \
+            0.0000f, 0.9943f, 7176.8999f, 211.2000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_SPORT_FULLSTADIUM                                                                            \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 0.0708f, 0.7943f, 5.2500f, 0.1700f, 0.8000f, 0.1000f, 0.1880f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.2818f, 0.0380f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_SPORT_STADIUMTANNOY                                                                          \
+    {                                                                                                                  \
+        1.0000f, 0.7800f, 0.3162f, 0.5623f, 0.5012f, 2.5300f, 0.8800f, 0.6800f, 0.2818f, 0.2300f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.5012f, 0.0630f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
 
 /* Prefab Presets */
 
-#define EFX_REVERB_PRESET_PREFAB_WORKSHOP \
-    { 0.4287f, 1.0000f, 0.3162f, 0.1413f, 0.3981f, 0.7600f, 1.0000f, 1.0000f, 1.0000f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
-
-#define EFX_REVERB_PRESET_PREFAB_SCHOOLROOM \
-    { 0.4022f, 0.6900f, 0.3162f, 0.6310f, 0.5012f, 0.9800f, 0.4500f, 0.1800f, 1.4125f, 0.0170f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0150f, { 0.0000f, 0.0000f, 0.0000f }, 0.0950f, 0.1400f, 0.2500f, 0.0000f, 0.9943f, 7176.8999f, 211.2000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_PREFAB_PRACTISEROOM \
-    { 0.4022f, 0.8700f, 0.3162f, 0.3981f, 0.5012f, 1.1200f, 0.5600f, 0.1800f, 1.2589f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.0950f, 0.1400f, 0.2500f, 0.0000f, 0.9943f, 7176.8999f, 211.2000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_PREFAB_OUTHOUSE \
-    { 1.0000f, 0.8200f, 0.3162f, 0.1122f, 0.1585f, 1.3800f, 0.3800f, 0.3500f, 0.8913f, 0.0240f, { 0.0000f, 0.0000f, -0.0000f }, 0.6310f, 0.0440f, { 0.0000f, 0.0000f, 0.0000f }, 0.1210f, 0.1700f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 107.5000f, 0.0000f, 0x0 }
-
-#define EFX_REVERB_PRESET_PREFAB_CARAVAN \
-    { 1.0000f, 1.0000f, 0.3162f, 0.0891f, 0.1259f, 0.4300f, 1.5000f, 1.0000f, 1.0000f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.9953f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
+#define EFX_REVERB_PRESET_PREFAB_WORKSHOP                                                                              \
+    {                                                                                                                  \
+        0.4287f, 1.0000f, 0.3162f, 0.1413f, 0.3981f, 0.7600f, 1.0000f, 1.0000f, 1.0000f, 0.0120f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0                                                      \
+    }
+
+#define EFX_REVERB_PRESET_PREFAB_SCHOOLROOM                                                                            \
+    {                                                                                                                  \
+        0.4022f, 0.6900f, 0.3162f, 0.6310f, 0.5012f, 0.9800f, 0.4500f, 0.1800f, 1.4125f, 0.0170f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0150f, { 0.0000f, 0.0000f, 0.0000f }, 0.0950f, 0.1400f, 0.2500f, \
+            0.0000f, 0.9943f, 7176.8999f, 211.2000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_PREFAB_PRACTISEROOM                                                                          \
+    {                                                                                                                  \
+        0.4022f, 0.8700f, 0.3162f, 0.3981f, 0.5012f, 1.1200f, 0.5600f, 0.1800f, 1.2589f, 0.0100f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.0950f, 0.1400f, 0.2500f, \
+            0.0000f, 0.9943f, 7176.8999f, 211.2000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_PREFAB_OUTHOUSE                                                                              \
+    {                                                                                                                  \
+        1.0000f, 0.8200f, 0.3162f, 0.1122f, 0.1585f, 1.3800f, 0.3800f, 0.3500f, 0.8913f, 0.0240f,                      \
+            { 0.0000f, 0.0000f, -0.0000f }, 0.6310f, 0.0440f, { 0.0000f, 0.0000f, 0.0000f }, 0.1210f, 0.1700f,         \
+            0.2500f, 0.0000f, 0.9943f, 2854.3999f, 107.5000f, 0.0000f, 0x0                                             \
+    }
+
+#define EFX_REVERB_PRESET_PREFAB_CARAVAN                                                                               \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 0.0891f, 0.1259f, 0.4300f, 1.5000f, 1.0000f, 1.0000f, 0.0120f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.9953f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0                                                      \
+    }
 
 /* Dome and Pipe Presets */
 
-#define EFX_REVERB_PRESET_DOME_TOMB \
-    { 1.0000f, 0.7900f, 0.3162f, 0.3548f, 0.2239f, 4.1800f, 0.2100f, 0.1000f, 0.3868f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 1.6788f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 0.1770f, 0.1900f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x0 }
-
-#define EFX_REVERB_PRESET_PIPE_SMALL \
-    { 1.0000f, 1.0000f, 0.3162f, 0.3548f, 0.2239f, 5.0400f, 0.1000f, 0.1000f, 0.5012f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 2.5119f, 0.0150f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_DOME_SAINTPAULS \
-    { 1.0000f, 0.8700f, 0.3162f, 0.3548f, 0.2239f, 10.4800f, 0.1900f, 0.1000f, 0.1778f, 0.0900f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0420f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.1200f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_PIPE_LONGTHIN \
-    { 0.2560f, 0.9100f, 0.3162f, 0.4467f, 0.2818f, 9.2100f, 0.1800f, 0.1000f, 0.7079f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x0 }
-
-#define EFX_REVERB_PRESET_PIPE_LARGE \
-    { 1.0000f, 1.0000f, 0.3162f, 0.3548f, 0.2239f, 8.4500f, 0.1000f, 0.1000f, 0.3981f, 0.0460f, { 0.0000f, 0.0000f, 0.0000f }, 1.5849f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_PIPE_RESONANT \
-    { 0.1373f, 0.9100f, 0.3162f, 0.4467f, 0.2818f, 6.8100f, 0.1800f, 0.1000f, 0.7079f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.0000f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x0 }
+#define EFX_REVERB_PRESET_DOME_TOMB                                                                                    \
+    {                                                                                                                  \
+        1.0000f, 0.7900f, 0.3162f, 0.3548f, 0.2239f, 4.1800f, 0.2100f, 0.1000f, 0.3868f, 0.0300f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.6788f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 0.1770f, 0.1900f, 0.2500f, \
+            0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x0                                                       \
+    }
+
+#define EFX_REVERB_PRESET_PIPE_SMALL                                                                                   \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 0.3548f, 0.2239f, 5.0400f, 0.1000f, 0.1000f, 0.5012f, 0.0320f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 2.5119f, 0.0150f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x1                                                       \
+    }
+
+#define EFX_REVERB_PRESET_DOME_SAINTPAULS                                                                              \
+    {                                                                                                                  \
+        1.0000f, 0.8700f, 0.3162f, 0.3548f, 0.2239f, 10.4800f, 0.1900f, 0.1000f, 0.1778f, 0.0900f,                     \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0420f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.1200f, 0.2500f, \
+            0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x1                                                       \
+    }
+
+#define EFX_REVERB_PRESET_PIPE_LONGTHIN                                                                                \
+    {                                                                                                                  \
+        0.2560f, 0.9100f, 0.3162f, 0.4467f, 0.2818f, 9.2100f, 0.1800f, 0.1000f, 0.7079f, 0.0100f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x0                                                       \
+    }
+
+#define EFX_REVERB_PRESET_PIPE_LARGE                                                                                   \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 0.3548f, 0.2239f, 8.4500f, 0.1000f, 0.1000f, 0.3981f, 0.0460f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.5849f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x1                                                       \
+    }
+
+#define EFX_REVERB_PRESET_PIPE_RESONANT                                                                                \
+    {                                                                                                                  \
+        0.1373f, 0.9100f, 0.3162f, 0.4467f, 0.2818f, 6.8100f, 0.1800f, 0.1000f, 0.7079f, 0.0100f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.0000f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x0                                                       \
+    }
 
 /* Outdoors Presets */
 
-#define EFX_REVERB_PRESET_OUTDOORS_BACKYARD \
-    { 1.0000f, 0.4500f, 0.3162f, 0.2512f, 0.5012f, 1.1200f, 0.3400f, 0.4600f, 0.4467f, 0.0690f, { 0.0000f, 0.0000f, -0.0000f }, 0.7079f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.2180f, 0.3400f, 0.2500f, 0.0000f, 0.9943f, 4399.1001f, 242.9000f, 0.0000f, 0x0 }
-
-#define EFX_REVERB_PRESET_OUTDOORS_ROLLINGPLAINS \
-    { 1.0000f, 0.0000f, 0.3162f, 0.0112f, 0.6310f, 2.1300f, 0.2100f, 0.4600f, 0.1778f, 0.3000f, { 0.0000f, 0.0000f, -0.0000f }, 0.4467f, 0.0190f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9943f, 4399.1001f, 242.9000f, 0.0000f, 0x0 }
-
-#define EFX_REVERB_PRESET_OUTDOORS_DEEPCANYON \
-    { 1.0000f, 0.7400f, 0.3162f, 0.1778f, 0.6310f, 3.8900f, 0.2100f, 0.4600f, 0.3162f, 0.2230f, { 0.0000f, 0.0000f, -0.0000f }, 0.3548f, 0.0190f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9943f, 4399.1001f, 242.9000f, 0.0000f, 0x0 }
-
-#define EFX_REVERB_PRESET_OUTDOORS_CREEK \
-    { 1.0000f, 0.3500f, 0.3162f, 0.1778f, 0.5012f, 2.1300f, 0.2100f, 0.4600f, 0.3981f, 0.1150f, { 0.0000f, 0.0000f, -0.0000f }, 0.1995f, 0.0310f, { 0.0000f, 0.0000f, 0.0000f }, 0.2180f, 0.3400f, 0.2500f, 0.0000f, 0.9943f, 4399.1001f, 242.9000f, 0.0000f, 0x0 }
-
-#define EFX_REVERB_PRESET_OUTDOORS_VALLEY \
-    { 1.0000f, 0.2800f, 0.3162f, 0.0282f, 0.1585f, 2.8800f, 0.2600f, 0.3500f, 0.1413f, 0.2630f, { 0.0000f, 0.0000f, -0.0000f }, 0.3981f, 0.1000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.3400f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 107.5000f, 0.0000f, 0x0 }
+#define EFX_REVERB_PRESET_OUTDOORS_BACKYARD                                                                            \
+    {                                                                                                                  \
+        1.0000f, 0.4500f, 0.3162f, 0.2512f, 0.5012f, 1.1200f, 0.3400f, 0.4600f, 0.4467f, 0.0690f,                      \
+            { 0.0000f, 0.0000f, -0.0000f }, 0.7079f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.2180f, 0.3400f,         \
+            0.2500f, 0.0000f, 0.9943f, 4399.1001f, 242.9000f, 0.0000f, 0x0                                             \
+    }
+
+#define EFX_REVERB_PRESET_OUTDOORS_ROLLINGPLAINS                                                                       \
+    {                                                                                                                  \
+        1.0000f, 0.0000f, 0.3162f, 0.0112f, 0.6310f, 2.1300f, 0.2100f, 0.4600f, 0.1778f, 0.3000f,                      \
+            { 0.0000f, 0.0000f, -0.0000f }, 0.4467f, 0.0190f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f,         \
+            0.2500f, 0.0000f, 0.9943f, 4399.1001f, 242.9000f, 0.0000f, 0x0                                             \
+    }
+
+#define EFX_REVERB_PRESET_OUTDOORS_DEEPCANYON                                                                          \
+    {                                                                                                                  \
+        1.0000f, 0.7400f, 0.3162f, 0.1778f, 0.6310f, 3.8900f, 0.2100f, 0.4600f, 0.3162f, 0.2230f,                      \
+            { 0.0000f, 0.0000f, -0.0000f }, 0.3548f, 0.0190f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f,         \
+            0.2500f, 0.0000f, 0.9943f, 4399.1001f, 242.9000f, 0.0000f, 0x0                                             \
+    }
+
+#define EFX_REVERB_PRESET_OUTDOORS_CREEK                                                                               \
+    {                                                                                                                  \
+        1.0000f, 0.3500f, 0.3162f, 0.1778f, 0.5012f, 2.1300f, 0.2100f, 0.4600f, 0.3981f, 0.1150f,                      \
+            { 0.0000f, 0.0000f, -0.0000f }, 0.1995f, 0.0310f, { 0.0000f, 0.0000f, 0.0000f }, 0.2180f, 0.3400f,         \
+            0.2500f, 0.0000f, 0.9943f, 4399.1001f, 242.9000f, 0.0000f, 0x0                                             \
+    }
+
+#define EFX_REVERB_PRESET_OUTDOORS_VALLEY                                                                              \
+    {                                                                                                                  \
+        1.0000f, 0.2800f, 0.3162f, 0.0282f, 0.1585f, 2.8800f, 0.2600f, 0.3500f, 0.1413f, 0.2630f,                      \
+            { 0.0000f, 0.0000f, -0.0000f }, 0.3981f, 0.1000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.3400f,         \
+            0.2500f, 0.0000f, 0.9943f, 2854.3999f, 107.5000f, 0.0000f, 0x0                                             \
+    }
 
 /* Mood Presets */
 
-#define EFX_REVERB_PRESET_MOOD_HEAVEN \
-    { 1.0000f, 0.9400f, 0.3162f, 0.7943f, 0.4467f, 5.0400f, 1.1200f, 0.5600f, 0.2427f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0800f, 2.7420f, 0.0500f, 0.9977f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_MOOD_HELL \
-    { 1.0000f, 0.5700f, 0.3162f, 0.3548f, 0.4467f, 3.5700f, 0.4900f, 2.0000f, 0.0000f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.1100f, 0.0400f, 2.1090f, 0.5200f, 0.9943f, 5000.0000f, 139.5000f, 0.0000f, 0x0 }
-
-#define EFX_REVERB_PRESET_MOOD_MEMORY \
-    { 1.0000f, 0.8500f, 0.3162f, 0.6310f, 0.3548f, 4.0600f, 0.8200f, 0.5600f, 0.0398f, 0.0000f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.4740f, 0.4500f, 0.9886f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
+#define EFX_REVERB_PRESET_MOOD_HEAVEN                                                                                  \
+    {                                                                                                                  \
+        1.0000f, 0.9400f, 0.3162f, 0.7943f, 0.4467f, 5.0400f, 1.1200f, 0.5600f, 0.2427f, 0.0200f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0800f, 2.7420f, \
+            0.0500f, 0.9977f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_MOOD_HELL                                                                                    \
+    {                                                                                                                  \
+        1.0000f, 0.5700f, 0.3162f, 0.3548f, 0.4467f, 3.5700f, 0.4900f, 2.0000f, 0.0000f, 0.0200f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.1100f, 0.0400f, 2.1090f, \
+            0.5200f, 0.9943f, 5000.0000f, 139.5000f, 0.0000f, 0x0                                                      \
+    }
+
+#define EFX_REVERB_PRESET_MOOD_MEMORY                                                                                  \
+    {                                                                                                                  \
+        1.0000f, 0.8500f, 0.3162f, 0.6310f, 0.3548f, 4.0600f, 0.8200f, 0.5600f, 0.0398f, 0.0000f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.4740f, \
+            0.4500f, 0.9886f, 5000.0000f, 250.0000f, 0.0000f, 0x0                                                      \
+    }
 
 /* Driving Presets */
 
-#define EFX_REVERB_PRESET_DRIVING_COMMENTATOR \
-    { 1.0000f, 0.0000f, 0.3162f, 0.5623f, 0.5012f, 2.4200f, 0.8800f, 0.6800f, 0.1995f, 0.0930f, { 0.0000f, 0.0000f, 0.0000f }, 0.2512f, 0.0170f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9886f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_DRIVING_PITGARAGE \
-    { 0.4287f, 0.5900f, 0.3162f, 0.7079f, 0.5623f, 1.7200f, 0.9300f, 0.8700f, 0.5623f, 0.0000f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.1100f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
-
-#define EFX_REVERB_PRESET_DRIVING_INCAR_RACER \
-    { 0.0832f, 0.8000f, 0.3162f, 1.0000f, 0.7943f, 0.1700f, 2.0000f, 0.4100f, 1.7783f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0150f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 10268.2002f, 251.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_DRIVING_INCAR_SPORTS \
-    { 0.0832f, 0.8000f, 0.3162f, 0.6310f, 1.0000f, 0.1700f, 0.7500f, 0.4100f, 1.0000f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 0.5623f, 0.0000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 10268.2002f, 251.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_DRIVING_INCAR_LUXURY \
-    { 0.2560f, 1.0000f, 0.3162f, 0.1000f, 0.5012f, 0.1300f, 0.4100f, 0.4600f, 0.7943f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.5849f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 10268.2002f, 251.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_DRIVING_FULLGRANDSTAND \
-    { 1.0000f, 1.0000f, 0.3162f, 0.2818f, 0.6310f, 3.0100f, 1.3700f, 1.2800f, 0.3548f, 0.0900f, { 0.0000f, 0.0000f, 0.0000f }, 0.1778f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 10420.2002f, 250.0000f, 0.0000f, 0x0 }
-
-#define EFX_REVERB_PRESET_DRIVING_EMPTYGRANDSTAND \
-    { 1.0000f, 1.0000f, 0.3162f, 1.0000f, 0.7943f, 4.6200f, 1.7500f, 1.4000f, 0.2082f, 0.0900f, { 0.0000f, 0.0000f, 0.0000f }, 0.2512f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 10420.2002f, 250.0000f, 0.0000f, 0x0 }
-
-#define EFX_REVERB_PRESET_DRIVING_TUNNEL \
-    { 1.0000f, 0.8100f, 0.3162f, 0.3981f, 0.8913f, 3.4200f, 0.9400f, 1.3100f, 0.7079f, 0.0510f, { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0470f, { 0.0000f, 0.0000f, 0.0000f }, 0.2140f, 0.0500f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 155.3000f, 0.0000f, 0x1 }
+#define EFX_REVERB_PRESET_DRIVING_COMMENTATOR                                                                          \
+    {                                                                                                                  \
+        1.0000f, 0.0000f, 0.3162f, 0.5623f, 0.5012f, 2.4200f, 0.8800f, 0.6800f, 0.1995f, 0.0930f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.2512f, 0.0170f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, \
+            0.0000f, 0.9886f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_DRIVING_PITGARAGE                                                                            \
+    {                                                                                                                  \
+        0.4287f, 0.5900f, 0.3162f, 0.7079f, 0.5623f, 1.7200f, 0.9300f, 0.8700f, 0.5623f, 0.0000f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.1100f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0                                                      \
+    }
+
+#define EFX_REVERB_PRESET_DRIVING_INCAR_RACER                                                                          \
+    {                                                                                                                  \
+        0.0832f, 0.8000f, 0.3162f, 1.0000f, 0.7943f, 0.1700f, 2.0000f, 0.4100f, 1.7783f, 0.0070f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0150f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 10268.2002f, 251.0000f, 0.0000f, 0x1                                                     \
+    }
+
+#define EFX_REVERB_PRESET_DRIVING_INCAR_SPORTS                                                                         \
+    {                                                                                                                  \
+        0.0832f, 0.8000f, 0.3162f, 0.6310f, 1.0000f, 0.1700f, 0.7500f, 0.4100f, 1.0000f, 0.0100f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.5623f, 0.0000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 10268.2002f, 251.0000f, 0.0000f, 0x1                                                     \
+    }
+
+#define EFX_REVERB_PRESET_DRIVING_INCAR_LUXURY                                                                         \
+    {                                                                                                                  \
+        0.2560f, 1.0000f, 0.3162f, 0.1000f, 0.5012f, 0.1300f, 0.4100f, 0.4600f, 0.7943f, 0.0100f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.5849f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 10268.2002f, 251.0000f, 0.0000f, 0x1                                                     \
+    }
+
+#define EFX_REVERB_PRESET_DRIVING_FULLGRANDSTAND                                                                       \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 0.2818f, 0.6310f, 3.0100f, 1.3700f, 1.2800f, 0.3548f, 0.0900f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.1778f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 10420.2002f, 250.0000f, 0.0000f, 0x0                                                     \
+    }
+
+#define EFX_REVERB_PRESET_DRIVING_EMPTYGRANDSTAND                                                                      \
+    {                                                                                                                  \
+        1.0000f, 1.0000f, 0.3162f, 1.0000f, 0.7943f, 4.6200f, 1.7500f, 1.4000f, 0.2082f, 0.0900f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.2512f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.0000f, 0.9943f, 10420.2002f, 250.0000f, 0.0000f, 0x0                                                     \
+    }
+
+#define EFX_REVERB_PRESET_DRIVING_TUNNEL                                                                               \
+    {                                                                                                                  \
+        1.0000f, 0.8100f, 0.3162f, 0.3981f, 0.8913f, 3.4200f, 0.9400f, 1.3100f, 0.7079f, 0.0510f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0470f, { 0.0000f, 0.0000f, 0.0000f }, 0.2140f, 0.0500f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 155.3000f, 0.0000f, 0x1                                                      \
+    }
 
 /* City Presets */
 
-#define EFX_REVERB_PRESET_CITY_STREETS \
-    { 1.0000f, 0.7800f, 0.3162f, 0.7079f, 0.8913f, 1.7900f, 1.1200f, 0.9100f, 0.2818f, 0.0460f, { 0.0000f, 0.0000f, 0.0000f }, 0.1995f, 0.0280f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_CITY_SUBWAY \
-    { 1.0000f, 0.7400f, 0.3162f, 0.7079f, 0.8913f, 3.0100f, 1.2300f, 0.9100f, 0.7079f, 0.0460f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0280f, { 0.0000f, 0.0000f, 0.0000f }, 0.1250f, 0.2100f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_CITY_MUSEUM \
-    { 1.0000f, 0.8200f, 0.3162f, 0.1778f, 0.1778f, 3.2800f, 1.4000f, 0.5700f, 0.2512f, 0.0390f, { 0.0000f, 0.0000f, -0.0000f }, 0.8913f, 0.0340f, { 0.0000f, 0.0000f, 0.0000f }, 0.1300f, 0.1700f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 107.5000f, 0.0000f, 0x0 }
-
-#define EFX_REVERB_PRESET_CITY_LIBRARY \
-    { 1.0000f, 0.8200f, 0.3162f, 0.2818f, 0.0891f, 2.7600f, 0.8900f, 0.4100f, 0.3548f, 0.0290f, { 0.0000f, 0.0000f, -0.0000f }, 0.8913f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.1300f, 0.1700f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 107.5000f, 0.0000f, 0x0 }
-
-#define EFX_REVERB_PRESET_CITY_UNDERPASS \
-    { 1.0000f, 0.8200f, 0.3162f, 0.4467f, 0.8913f, 3.5700f, 1.1200f, 0.9100f, 0.3981f, 0.0590f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0370f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.1400f, 0.2500f, 0.0000f, 0.9920f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_CITY_ABANDONED \
-    { 1.0000f, 0.6900f, 0.3162f, 0.7943f, 0.8913f, 3.2800f, 1.1700f, 0.9100f, 0.4467f, 0.0440f, { 0.0000f, 0.0000f, 0.0000f }, 0.2818f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2000f, 0.2500f, 0.0000f, 0.9966f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+#define EFX_REVERB_PRESET_CITY_STREETS                                                                                 \
+    {                                                                                                                  \
+        1.0000f, 0.7800f, 0.3162f, 0.7079f, 0.8913f, 1.7900f, 1.1200f, 0.9100f, 0.2818f, 0.0460f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.1995f, 0.0280f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2000f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_CITY_SUBWAY                                                                                  \
+    {                                                                                                                  \
+        1.0000f, 0.7400f, 0.3162f, 0.7079f, 0.8913f, 3.0100f, 1.2300f, 0.9100f, 0.7079f, 0.0460f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0280f, { 0.0000f, 0.0000f, 0.0000f }, 0.1250f, 0.2100f, 0.2500f, \
+            0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_CITY_MUSEUM                                                                                  \
+    {                                                                                                                  \
+        1.0000f, 0.8200f, 0.3162f, 0.1778f, 0.1778f, 3.2800f, 1.4000f, 0.5700f, 0.2512f, 0.0390f,                      \
+            { 0.0000f, 0.0000f, -0.0000f }, 0.8913f, 0.0340f, { 0.0000f, 0.0000f, 0.0000f }, 0.1300f, 0.1700f,         \
+            0.2500f, 0.0000f, 0.9943f, 2854.3999f, 107.5000f, 0.0000f, 0x0                                             \
+    }
+
+#define EFX_REVERB_PRESET_CITY_LIBRARY                                                                                 \
+    {                                                                                                                  \
+        1.0000f, 0.8200f, 0.3162f, 0.2818f, 0.0891f, 2.7600f, 0.8900f, 0.4100f, 0.3548f, 0.0290f,                      \
+            { 0.0000f, 0.0000f, -0.0000f }, 0.8913f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.1300f, 0.1700f,         \
+            0.2500f, 0.0000f, 0.9943f, 2854.3999f, 107.5000f, 0.0000f, 0x0                                             \
+    }
+
+#define EFX_REVERB_PRESET_CITY_UNDERPASS                                                                               \
+    {                                                                                                                  \
+        1.0000f, 0.8200f, 0.3162f, 0.4467f, 0.8913f, 3.5700f, 1.1200f, 0.9100f, 0.3981f, 0.0590f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0370f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.1400f, 0.2500f, \
+            0.0000f, 0.9920f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_CITY_ABANDONED                                                                               \
+    {                                                                                                                  \
+        1.0000f, 0.6900f, 0.3162f, 0.7943f, 0.8913f, 3.2800f, 1.1700f, 0.9100f, 0.4467f, 0.0440f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.2818f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2000f, 0.2500f, \
+            0.0000f, 0.9966f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
 
 /* Misc. Presets */
 
-#define EFX_REVERB_PRESET_DUSTYROOM \
-    { 0.3645f, 0.5600f, 0.3162f, 0.7943f, 0.7079f, 1.7900f, 0.3800f, 0.2100f, 0.5012f, 0.0020f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0060f, { 0.0000f, 0.0000f, 0.0000f }, 0.2020f, 0.0500f, 0.2500f, 0.0000f, 0.9886f, 13046.0000f, 163.3000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_CHAPEL \
-    { 1.0000f, 0.8400f, 0.3162f, 0.5623f, 1.0000f, 4.6200f, 0.6400f, 1.2300f, 0.4467f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.1100f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
-
-#define EFX_REVERB_PRESET_SMALLWATERROOM \
-    { 1.0000f, 0.7000f, 0.3162f, 0.4477f, 1.0000f, 1.5100f, 1.2500f, 1.1400f, 0.8913f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.1790f, 0.1500f, 0.8950f, 0.1900f, 0.9920f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
+#define EFX_REVERB_PRESET_DUSTYROOM                                                                                    \
+    {                                                                                                                  \
+        0.3645f, 0.5600f, 0.3162f, 0.7943f, 0.7079f, 1.7900f, 0.3800f, 0.2100f, 0.5012f, 0.0020f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0060f, { 0.0000f, 0.0000f, 0.0000f }, 0.2020f, 0.0500f, 0.2500f, \
+            0.0000f, 0.9886f, 13046.0000f, 163.3000f, 0.0000f, 0x1                                                     \
+    }
+
+#define EFX_REVERB_PRESET_CHAPEL                                                                                       \
+    {                                                                                                                  \
+        1.0000f, 0.8400f, 0.3162f, 0.5623f, 1.0000f, 4.6200f, 0.6400f, 1.2300f, 0.4467f, 0.0320f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, \
+            0.1100f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1                                                      \
+    }
+
+#define EFX_REVERB_PRESET_SMALLWATERROOM                                                                               \
+    {                                                                                                                  \
+        1.0000f, 0.7000f, 0.3162f, 0.4477f, 1.0000f, 1.5100f, 1.2500f, 1.1400f, 0.8913f, 0.0200f,                      \
+            { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.1790f, 0.1500f, 0.8950f, \
+            0.1900f, 0.9920f, 5000.0000f, 250.0000f, 0.0000f, 0x0                                                      \
+    }
 
 #endif /* EFX_PRESETS_H */
diff --git a/apps/openmw/mwsound/efx.h b/apps/openmw/mwsound/efx.h
index 57766983f6..83c827f885 100644
--- a/apps/openmw/mwsound/efx.h
+++ b/apps/openmw/mwsound/efx.h
@@ -1,761 +1,753 @@
 #ifndef AL_EFX_H
 #define AL_EFX_H
 
-
-#include "alc.h"
 #include "al.h"
+#include "alc.h"
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-#define ALC_EXT_EFX_NAME                         "ALC_EXT_EFX"
-
-#define ALC_EFX_MAJOR_VERSION                    0x20001
-#define ALC_EFX_MINOR_VERSION                    0x20002
-#define ALC_MAX_AUXILIARY_SENDS                  0x20003
+#define ALC_EXT_EFX_NAME "ALC_EXT_EFX"
 
+#define ALC_EFX_MAJOR_VERSION 0x20001
+#define ALC_EFX_MINOR_VERSION 0x20002
+#define ALC_MAX_AUXILIARY_SENDS 0x20003
 
 /* Listener properties. */
-#define AL_METERS_PER_UNIT                       0x20004
+#define AL_METERS_PER_UNIT 0x20004
 
 /* Source properties. */
-#define AL_DIRECT_FILTER                         0x20005
-#define AL_AUXILIARY_SEND_FILTER                 0x20006
-#define AL_AIR_ABSORPTION_FACTOR                 0x20007
-#define AL_ROOM_ROLLOFF_FACTOR                   0x20008
-#define AL_CONE_OUTER_GAINHF                     0x20009
-#define AL_DIRECT_FILTER_GAINHF_AUTO             0x2000A
-#define AL_AUXILIARY_SEND_FILTER_GAIN_AUTO       0x2000B
-#define AL_AUXILIARY_SEND_FILTER_GAINHF_AUTO     0x2000C
-
+#define AL_DIRECT_FILTER 0x20005
+#define AL_AUXILIARY_SEND_FILTER 0x20006
+#define AL_AIR_ABSORPTION_FACTOR 0x20007
+#define AL_ROOM_ROLLOFF_FACTOR 0x20008
+#define AL_CONE_OUTER_GAINHF 0x20009
+#define AL_DIRECT_FILTER_GAINHF_AUTO 0x2000A
+#define AL_AUXILIARY_SEND_FILTER_GAIN_AUTO 0x2000B
+#define AL_AUXILIARY_SEND_FILTER_GAINHF_AUTO 0x2000C
 
 /* Effect properties. */
 
 /* Reverb effect parameters */
-#define AL_REVERB_DENSITY                        0x0001
-#define AL_REVERB_DIFFUSION                      0x0002
-#define AL_REVERB_GAIN                           0x0003
-#define AL_REVERB_GAINHF                         0x0004
-#define AL_REVERB_DECAY_TIME                     0x0005
-#define AL_REVERB_DECAY_HFRATIO                  0x0006
-#define AL_REVERB_REFLECTIONS_GAIN               0x0007
-#define AL_REVERB_REFLECTIONS_DELAY              0x0008
-#define AL_REVERB_LATE_REVERB_GAIN               0x0009
-#define AL_REVERB_LATE_REVERB_DELAY              0x000A
-#define AL_REVERB_AIR_ABSORPTION_GAINHF          0x000B
-#define AL_REVERB_ROOM_ROLLOFF_FACTOR            0x000C
-#define AL_REVERB_DECAY_HFLIMIT                  0x000D
+#define AL_REVERB_DENSITY 0x0001
+#define AL_REVERB_DIFFUSION 0x0002
+#define AL_REVERB_GAIN 0x0003
+#define AL_REVERB_GAINHF 0x0004
+#define AL_REVERB_DECAY_TIME 0x0005
+#define AL_REVERB_DECAY_HFRATIO 0x0006
+#define AL_REVERB_REFLECTIONS_GAIN 0x0007
+#define AL_REVERB_REFLECTIONS_DELAY 0x0008
+#define AL_REVERB_LATE_REVERB_GAIN 0x0009
+#define AL_REVERB_LATE_REVERB_DELAY 0x000A
+#define AL_REVERB_AIR_ABSORPTION_GAINHF 0x000B
+#define AL_REVERB_ROOM_ROLLOFF_FACTOR 0x000C
+#define AL_REVERB_DECAY_HFLIMIT 0x000D
 
 /* EAX Reverb effect parameters */
-#define AL_EAXREVERB_DENSITY                     0x0001
-#define AL_EAXREVERB_DIFFUSION                   0x0002
-#define AL_EAXREVERB_GAIN                        0x0003
-#define AL_EAXREVERB_GAINHF                      0x0004
-#define AL_EAXREVERB_GAINLF                      0x0005
-#define AL_EAXREVERB_DECAY_TIME                  0x0006
-#define AL_EAXREVERB_DECAY_HFRATIO               0x0007
-#define AL_EAXREVERB_DECAY_LFRATIO               0x0008
-#define AL_EAXREVERB_REFLECTIONS_GAIN            0x0009
-#define AL_EAXREVERB_REFLECTIONS_DELAY           0x000A
-#define AL_EAXREVERB_REFLECTIONS_PAN             0x000B
-#define AL_EAXREVERB_LATE_REVERB_GAIN            0x000C
-#define AL_EAXREVERB_LATE_REVERB_DELAY           0x000D
-#define AL_EAXREVERB_LATE_REVERB_PAN             0x000E
-#define AL_EAXREVERB_ECHO_TIME                   0x000F
-#define AL_EAXREVERB_ECHO_DEPTH                  0x0010
-#define AL_EAXREVERB_MODULATION_TIME             0x0011
-#define AL_EAXREVERB_MODULATION_DEPTH            0x0012
-#define AL_EAXREVERB_AIR_ABSORPTION_GAINHF       0x0013
-#define AL_EAXREVERB_HFREFERENCE                 0x0014
-#define AL_EAXREVERB_LFREFERENCE                 0x0015
-#define AL_EAXREVERB_ROOM_ROLLOFF_FACTOR         0x0016
-#define AL_EAXREVERB_DECAY_HFLIMIT               0x0017
+#define AL_EAXREVERB_DENSITY 0x0001
+#define AL_EAXREVERB_DIFFUSION 0x0002
+#define AL_EAXREVERB_GAIN 0x0003
+#define AL_EAXREVERB_GAINHF 0x0004
+#define AL_EAXREVERB_GAINLF 0x0005
+#define AL_EAXREVERB_DECAY_TIME 0x0006
+#define AL_EAXREVERB_DECAY_HFRATIO 0x0007
+#define AL_EAXREVERB_DECAY_LFRATIO 0x0008
+#define AL_EAXREVERB_REFLECTIONS_GAIN 0x0009
+#define AL_EAXREVERB_REFLECTIONS_DELAY 0x000A
+#define AL_EAXREVERB_REFLECTIONS_PAN 0x000B
+#define AL_EAXREVERB_LATE_REVERB_GAIN 0x000C
+#define AL_EAXREVERB_LATE_REVERB_DELAY 0x000D
+#define AL_EAXREVERB_LATE_REVERB_PAN 0x000E
+#define AL_EAXREVERB_ECHO_TIME 0x000F
+#define AL_EAXREVERB_ECHO_DEPTH 0x0010
+#define AL_EAXREVERB_MODULATION_TIME 0x0011
+#define AL_EAXREVERB_MODULATION_DEPTH 0x0012
+#define AL_EAXREVERB_AIR_ABSORPTION_GAINHF 0x0013
+#define AL_EAXREVERB_HFREFERENCE 0x0014
+#define AL_EAXREVERB_LFREFERENCE 0x0015
+#define AL_EAXREVERB_ROOM_ROLLOFF_FACTOR 0x0016
+#define AL_EAXREVERB_DECAY_HFLIMIT 0x0017
 
 /* Chorus effect parameters */
-#define AL_CHORUS_WAVEFORM                       0x0001
-#define AL_CHORUS_PHASE                          0x0002
-#define AL_CHORUS_RATE                           0x0003
-#define AL_CHORUS_DEPTH                          0x0004
-#define AL_CHORUS_FEEDBACK                       0x0005
-#define AL_CHORUS_DELAY                          0x0006
+#define AL_CHORUS_WAVEFORM 0x0001
+#define AL_CHORUS_PHASE 0x0002
+#define AL_CHORUS_RATE 0x0003
+#define AL_CHORUS_DEPTH 0x0004
+#define AL_CHORUS_FEEDBACK 0x0005
+#define AL_CHORUS_DELAY 0x0006
 
 /* Distortion effect parameters */
-#define AL_DISTORTION_EDGE                       0x0001
-#define AL_DISTORTION_GAIN                       0x0002
-#define AL_DISTORTION_LOWPASS_CUTOFF             0x0003
-#define AL_DISTORTION_EQCENTER                   0x0004
-#define AL_DISTORTION_EQBANDWIDTH                0x0005
+#define AL_DISTORTION_EDGE 0x0001
+#define AL_DISTORTION_GAIN 0x0002
+#define AL_DISTORTION_LOWPASS_CUTOFF 0x0003
+#define AL_DISTORTION_EQCENTER 0x0004
+#define AL_DISTORTION_EQBANDWIDTH 0x0005
 
 /* Echo effect parameters */
-#define AL_ECHO_DELAY                            0x0001
-#define AL_ECHO_LRDELAY                          0x0002
-#define AL_ECHO_DAMPING                          0x0003
-#define AL_ECHO_FEEDBACK                         0x0004
-#define AL_ECHO_SPREAD                           0x0005
+#define AL_ECHO_DELAY 0x0001
+#define AL_ECHO_LRDELAY 0x0002
+#define AL_ECHO_DAMPING 0x0003
+#define AL_ECHO_FEEDBACK 0x0004
+#define AL_ECHO_SPREAD 0x0005
 
 /* Flanger effect parameters */
-#define AL_FLANGER_WAVEFORM                      0x0001
-#define AL_FLANGER_PHASE                         0x0002
-#define AL_FLANGER_RATE                          0x0003
-#define AL_FLANGER_DEPTH                         0x0004
-#define AL_FLANGER_FEEDBACK                      0x0005
-#define AL_FLANGER_DELAY                         0x0006
+#define AL_FLANGER_WAVEFORM 0x0001
+#define AL_FLANGER_PHASE 0x0002
+#define AL_FLANGER_RATE 0x0003
+#define AL_FLANGER_DEPTH 0x0004
+#define AL_FLANGER_FEEDBACK 0x0005
+#define AL_FLANGER_DELAY 0x0006
 
 /* Frequency shifter effect parameters */
-#define AL_FREQUENCY_SHIFTER_FREQUENCY           0x0001
-#define AL_FREQUENCY_SHIFTER_LEFT_DIRECTION      0x0002
-#define AL_FREQUENCY_SHIFTER_RIGHT_DIRECTION     0x0003
+#define AL_FREQUENCY_SHIFTER_FREQUENCY 0x0001
+#define AL_FREQUENCY_SHIFTER_LEFT_DIRECTION 0x0002
+#define AL_FREQUENCY_SHIFTER_RIGHT_DIRECTION 0x0003
 
 /* Vocal morpher effect parameters */
-#define AL_VOCAL_MORPHER_PHONEMEA                0x0001
-#define AL_VOCAL_MORPHER_PHONEMEA_COARSE_TUNING  0x0002
-#define AL_VOCAL_MORPHER_PHONEMEB                0x0003
-#define AL_VOCAL_MORPHER_PHONEMEB_COARSE_TUNING  0x0004
-#define AL_VOCAL_MORPHER_WAVEFORM                0x0005
-#define AL_VOCAL_MORPHER_RATE                    0x0006
+#define AL_VOCAL_MORPHER_PHONEMEA 0x0001
+#define AL_VOCAL_MORPHER_PHONEMEA_COARSE_TUNING 0x0002
+#define AL_VOCAL_MORPHER_PHONEMEB 0x0003
+#define AL_VOCAL_MORPHER_PHONEMEB_COARSE_TUNING 0x0004
+#define AL_VOCAL_MORPHER_WAVEFORM 0x0005
+#define AL_VOCAL_MORPHER_RATE 0x0006
 
 /* Pitchshifter effect parameters */
-#define AL_PITCH_SHIFTER_COARSE_TUNE             0x0001
-#define AL_PITCH_SHIFTER_FINE_TUNE               0x0002
+#define AL_PITCH_SHIFTER_COARSE_TUNE 0x0001
+#define AL_PITCH_SHIFTER_FINE_TUNE 0x0002
 
 /* Ringmodulator effect parameters */
-#define AL_RING_MODULATOR_FREQUENCY              0x0001
-#define AL_RING_MODULATOR_HIGHPASS_CUTOFF        0x0002
-#define AL_RING_MODULATOR_WAVEFORM               0x0003
+#define AL_RING_MODULATOR_FREQUENCY 0x0001
+#define AL_RING_MODULATOR_HIGHPASS_CUTOFF 0x0002
+#define AL_RING_MODULATOR_WAVEFORM 0x0003
 
 /* Autowah effect parameters */
-#define AL_AUTOWAH_ATTACK_TIME                   0x0001
-#define AL_AUTOWAH_RELEASE_TIME                  0x0002
-#define AL_AUTOWAH_RESONANCE                     0x0003
-#define AL_AUTOWAH_PEAK_GAIN                     0x0004
+#define AL_AUTOWAH_ATTACK_TIME 0x0001
+#define AL_AUTOWAH_RELEASE_TIME 0x0002
+#define AL_AUTOWAH_RESONANCE 0x0003
+#define AL_AUTOWAH_PEAK_GAIN 0x0004
 
 /* Compressor effect parameters */
-#define AL_COMPRESSOR_ONOFF                      0x0001
+#define AL_COMPRESSOR_ONOFF 0x0001
 
 /* Equalizer effect parameters */
-#define AL_EQUALIZER_LOW_GAIN                    0x0001
-#define AL_EQUALIZER_LOW_CUTOFF                  0x0002
-#define AL_EQUALIZER_MID1_GAIN                   0x0003
-#define AL_EQUALIZER_MID1_CENTER                 0x0004
-#define AL_EQUALIZER_MID1_WIDTH                  0x0005
-#define AL_EQUALIZER_MID2_GAIN                   0x0006
-#define AL_EQUALIZER_MID2_CENTER                 0x0007
-#define AL_EQUALIZER_MID2_WIDTH                  0x0008
-#define AL_EQUALIZER_HIGH_GAIN                   0x0009
-#define AL_EQUALIZER_HIGH_CUTOFF                 0x000A
+#define AL_EQUALIZER_LOW_GAIN 0x0001
+#define AL_EQUALIZER_LOW_CUTOFF 0x0002
+#define AL_EQUALIZER_MID1_GAIN 0x0003
+#define AL_EQUALIZER_MID1_CENTER 0x0004
+#define AL_EQUALIZER_MID1_WIDTH 0x0005
+#define AL_EQUALIZER_MID2_GAIN 0x0006
+#define AL_EQUALIZER_MID2_CENTER 0x0007
+#define AL_EQUALIZER_MID2_WIDTH 0x0008
+#define AL_EQUALIZER_HIGH_GAIN 0x0009
+#define AL_EQUALIZER_HIGH_CUTOFF 0x000A
 
 /* Effect type */
-#define AL_EFFECT_FIRST_PARAMETER                0x0000
-#define AL_EFFECT_LAST_PARAMETER                 0x8000
-#define AL_EFFECT_TYPE                           0x8001
+#define AL_EFFECT_FIRST_PARAMETER 0x0000
+#define AL_EFFECT_LAST_PARAMETER 0x8000
+#define AL_EFFECT_TYPE 0x8001
 
 /* Effect types, used with the AL_EFFECT_TYPE property */
-#define AL_EFFECT_NULL                           0x0000
-#define AL_EFFECT_REVERB                         0x0001
-#define AL_EFFECT_CHORUS                         0x0002
-#define AL_EFFECT_DISTORTION                     0x0003
-#define AL_EFFECT_ECHO                           0x0004
-#define AL_EFFECT_FLANGER                        0x0005
-#define AL_EFFECT_FREQUENCY_SHIFTER              0x0006
-#define AL_EFFECT_VOCAL_MORPHER                  0x0007
-#define AL_EFFECT_PITCH_SHIFTER                  0x0008
-#define AL_EFFECT_RING_MODULATOR                 0x0009
-#define AL_EFFECT_AUTOWAH                        0x000A
-#define AL_EFFECT_COMPRESSOR                     0x000B
-#define AL_EFFECT_EQUALIZER                      0x000C
-#define AL_EFFECT_EAXREVERB                      0x8000
+#define AL_EFFECT_NULL 0x0000
+#define AL_EFFECT_REVERB 0x0001
+#define AL_EFFECT_CHORUS 0x0002
+#define AL_EFFECT_DISTORTION 0x0003
+#define AL_EFFECT_ECHO 0x0004
+#define AL_EFFECT_FLANGER 0x0005
+#define AL_EFFECT_FREQUENCY_SHIFTER 0x0006
+#define AL_EFFECT_VOCAL_MORPHER 0x0007
+#define AL_EFFECT_PITCH_SHIFTER 0x0008
+#define AL_EFFECT_RING_MODULATOR 0x0009
+#define AL_EFFECT_AUTOWAH 0x000A
+#define AL_EFFECT_COMPRESSOR 0x000B
+#define AL_EFFECT_EQUALIZER 0x000C
+#define AL_EFFECT_EAXREVERB 0x8000
 
 /* Auxiliary Effect Slot properties. */
-#define AL_EFFECTSLOT_EFFECT                     0x0001
-#define AL_EFFECTSLOT_GAIN                       0x0002
-#define AL_EFFECTSLOT_AUXILIARY_SEND_AUTO        0x0003
+#define AL_EFFECTSLOT_EFFECT 0x0001
+#define AL_EFFECTSLOT_GAIN 0x0002
+#define AL_EFFECTSLOT_AUXILIARY_SEND_AUTO 0x0003
 
 /* NULL Auxiliary Slot ID to disable a source send. */
-#define AL_EFFECTSLOT_NULL                       0x0000
-
+#define AL_EFFECTSLOT_NULL 0x0000
 
 /* Filter properties. */
 
 /* Lowpass filter parameters */
-#define AL_LOWPASS_GAIN                          0x0001
-#define AL_LOWPASS_GAINHF                        0x0002
+#define AL_LOWPASS_GAIN 0x0001
+#define AL_LOWPASS_GAINHF 0x0002
 
 /* Highpass filter parameters */
-#define AL_HIGHPASS_GAIN                         0x0001
-#define AL_HIGHPASS_GAINLF                       0x0002
+#define AL_HIGHPASS_GAIN 0x0001
+#define AL_HIGHPASS_GAINLF 0x0002
 
 /* Bandpass filter parameters */
-#define AL_BANDPASS_GAIN                         0x0001
-#define AL_BANDPASS_GAINLF                       0x0002
-#define AL_BANDPASS_GAINHF                       0x0003
+#define AL_BANDPASS_GAIN 0x0001
+#define AL_BANDPASS_GAINLF 0x0002
+#define AL_BANDPASS_GAINHF 0x0003
 
 /* Filter type */
-#define AL_FILTER_FIRST_PARAMETER                0x0000
-#define AL_FILTER_LAST_PARAMETER                 0x8000
-#define AL_FILTER_TYPE                           0x8001
+#define AL_FILTER_FIRST_PARAMETER 0x0000
+#define AL_FILTER_LAST_PARAMETER 0x8000
+#define AL_FILTER_TYPE 0x8001
 
 /* Filter types, used with the AL_FILTER_TYPE property */
-#define AL_FILTER_NULL                           0x0000
-#define AL_FILTER_LOWPASS                        0x0001
-#define AL_FILTER_HIGHPASS                       0x0002
-#define AL_FILTER_BANDPASS                       0x0003
-
-
-/* Effect object function types. */
-typedef void (AL_APIENTRY *LPALGENEFFECTS)(ALsizei, ALuint*);
-typedef void (AL_APIENTRY *LPALDELETEEFFECTS)(ALsizei, const ALuint*);
-typedef ALboolean (AL_APIENTRY *LPALISEFFECT)(ALuint);
-typedef void (AL_APIENTRY *LPALEFFECTI)(ALuint, ALenum, ALint);
-typedef void (AL_APIENTRY *LPALEFFECTIV)(ALuint, ALenum, const ALint*);
-typedef void (AL_APIENTRY *LPALEFFECTF)(ALuint, ALenum, ALfloat);
-typedef void (AL_APIENTRY *LPALEFFECTFV)(ALuint, ALenum, const ALfloat*);
-typedef void (AL_APIENTRY *LPALGETEFFECTI)(ALuint, ALenum, ALint*);
-typedef void (AL_APIENTRY *LPALGETEFFECTIV)(ALuint, ALenum, ALint*);
-typedef void (AL_APIENTRY *LPALGETEFFECTF)(ALuint, ALenum, ALfloat*);
-typedef void (AL_APIENTRY *LPALGETEFFECTFV)(ALuint, ALenum, ALfloat*);
-
-/* Filter object function types. */
-typedef void (AL_APIENTRY *LPALGENFILTERS)(ALsizei, ALuint*);
-typedef void (AL_APIENTRY *LPALDELETEFILTERS)(ALsizei, const ALuint*);
-typedef ALboolean (AL_APIENTRY *LPALISFILTER)(ALuint);
-typedef void (AL_APIENTRY *LPALFILTERI)(ALuint, ALenum, ALint);
-typedef void (AL_APIENTRY *LPALFILTERIV)(ALuint, ALenum, const ALint*);
-typedef void (AL_APIENTRY *LPALFILTERF)(ALuint, ALenum, ALfloat);
-typedef void (AL_APIENTRY *LPALFILTERFV)(ALuint, ALenum, const ALfloat*);
-typedef void (AL_APIENTRY *LPALGETFILTERI)(ALuint, ALenum, ALint*);
-typedef void (AL_APIENTRY *LPALGETFILTERIV)(ALuint, ALenum, ALint*);
-typedef void (AL_APIENTRY *LPALGETFILTERF)(ALuint, ALenum, ALfloat*);
-typedef void (AL_APIENTRY *LPALGETFILTERFV)(ALuint, ALenum, ALfloat*);
-
-/* Auxiliary Effect Slot object function types. */
-typedef void (AL_APIENTRY *LPALGENAUXILIARYEFFECTSLOTS)(ALsizei, ALuint*);
-typedef void (AL_APIENTRY *LPALDELETEAUXILIARYEFFECTSLOTS)(ALsizei, const ALuint*);
-typedef ALboolean (AL_APIENTRY *LPALISAUXILIARYEFFECTSLOT)(ALuint);
-typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTI)(ALuint, ALenum, ALint);
-typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTIV)(ALuint, ALenum, const ALint*);
-typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTF)(ALuint, ALenum, ALfloat);
-typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTFV)(ALuint, ALenum, const ALfloat*);
-typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTI)(ALuint, ALenum, ALint*);
-typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTIV)(ALuint, ALenum, ALint*);
-typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTF)(ALuint, ALenum, ALfloat*);
-typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTFV)(ALuint, ALenum, ALfloat*);
+#define AL_FILTER_NULL 0x0000
+#define AL_FILTER_LOWPASS 0x0001
+#define AL_FILTER_HIGHPASS 0x0002
+#define AL_FILTER_BANDPASS 0x0003
+
+    /* Effect object function types. */
+    typedef void(AL_APIENTRY* LPALGENEFFECTS)(ALsizei, ALuint*);
+    typedef void(AL_APIENTRY* LPALDELETEEFFECTS)(ALsizei, const ALuint*);
+    typedef ALboolean(AL_APIENTRY* LPALISEFFECT)(ALuint);
+    typedef void(AL_APIENTRY* LPALEFFECTI)(ALuint, ALenum, ALint);
+    typedef void(AL_APIENTRY* LPALEFFECTIV)(ALuint, ALenum, const ALint*);
+    typedef void(AL_APIENTRY* LPALEFFECTF)(ALuint, ALenum, ALfloat);
+    typedef void(AL_APIENTRY* LPALEFFECTFV)(ALuint, ALenum, const ALfloat*);
+    typedef void(AL_APIENTRY* LPALGETEFFECTI)(ALuint, ALenum, ALint*);
+    typedef void(AL_APIENTRY* LPALGETEFFECTIV)(ALuint, ALenum, ALint*);
+    typedef void(AL_APIENTRY* LPALGETEFFECTF)(ALuint, ALenum, ALfloat*);
+    typedef void(AL_APIENTRY* LPALGETEFFECTFV)(ALuint, ALenum, ALfloat*);
+
+    /* Filter object function types. */
+    typedef void(AL_APIENTRY* LPALGENFILTERS)(ALsizei, ALuint*);
+    typedef void(AL_APIENTRY* LPALDELETEFILTERS)(ALsizei, const ALuint*);
+    typedef ALboolean(AL_APIENTRY* LPALISFILTER)(ALuint);
+    typedef void(AL_APIENTRY* LPALFILTERI)(ALuint, ALenum, ALint);
+    typedef void(AL_APIENTRY* LPALFILTERIV)(ALuint, ALenum, const ALint*);
+    typedef void(AL_APIENTRY* LPALFILTERF)(ALuint, ALenum, ALfloat);
+    typedef void(AL_APIENTRY* LPALFILTERFV)(ALuint, ALenum, const ALfloat*);
+    typedef void(AL_APIENTRY* LPALGETFILTERI)(ALuint, ALenum, ALint*);
+    typedef void(AL_APIENTRY* LPALGETFILTERIV)(ALuint, ALenum, ALint*);
+    typedef void(AL_APIENTRY* LPALGETFILTERF)(ALuint, ALenum, ALfloat*);
+    typedef void(AL_APIENTRY* LPALGETFILTERFV)(ALuint, ALenum, ALfloat*);
+
+    /* Auxiliary Effect Slot object function types. */
+    typedef void(AL_APIENTRY* LPALGENAUXILIARYEFFECTSLOTS)(ALsizei, ALuint*);
+    typedef void(AL_APIENTRY* LPALDELETEAUXILIARYEFFECTSLOTS)(ALsizei, const ALuint*);
+    typedef ALboolean(AL_APIENTRY* LPALISAUXILIARYEFFECTSLOT)(ALuint);
+    typedef void(AL_APIENTRY* LPALAUXILIARYEFFECTSLOTI)(ALuint, ALenum, ALint);
+    typedef void(AL_APIENTRY* LPALAUXILIARYEFFECTSLOTIV)(ALuint, ALenum, const ALint*);
+    typedef void(AL_APIENTRY* LPALAUXILIARYEFFECTSLOTF)(ALuint, ALenum, ALfloat);
+    typedef void(AL_APIENTRY* LPALAUXILIARYEFFECTSLOTFV)(ALuint, ALenum, const ALfloat*);
+    typedef void(AL_APIENTRY* LPALGETAUXILIARYEFFECTSLOTI)(ALuint, ALenum, ALint*);
+    typedef void(AL_APIENTRY* LPALGETAUXILIARYEFFECTSLOTIV)(ALuint, ALenum, ALint*);
+    typedef void(AL_APIENTRY* LPALGETAUXILIARYEFFECTSLOTF)(ALuint, ALenum, ALfloat*);
+    typedef void(AL_APIENTRY* LPALGETAUXILIARYEFFECTSLOTFV)(ALuint, ALenum, ALfloat*);
 
 #ifdef AL_ALEXT_PROTOTYPES
-AL_API ALvoid AL_APIENTRY alGenEffects(ALsizei n, ALuint *effects);
-AL_API ALvoid AL_APIENTRY alDeleteEffects(ALsizei n, const ALuint *effects);
-AL_API ALboolean AL_APIENTRY alIsEffect(ALuint effect);
-AL_API ALvoid AL_APIENTRY alEffecti(ALuint effect, ALenum param, ALint iValue);
-AL_API ALvoid AL_APIENTRY alEffectiv(ALuint effect, ALenum param, const ALint *piValues);
-AL_API ALvoid AL_APIENTRY alEffectf(ALuint effect, ALenum param, ALfloat flValue);
-AL_API ALvoid AL_APIENTRY alEffectfv(ALuint effect, ALenum param, const ALfloat *pflValues);
-AL_API ALvoid AL_APIENTRY alGetEffecti(ALuint effect, ALenum param, ALint *piValue);
-AL_API ALvoid AL_APIENTRY alGetEffectiv(ALuint effect, ALenum param, ALint *piValues);
-AL_API ALvoid AL_APIENTRY alGetEffectf(ALuint effect, ALenum param, ALfloat *pflValue);
-AL_API ALvoid AL_APIENTRY alGetEffectfv(ALuint effect, ALenum param, ALfloat *pflValues);
-
-AL_API ALvoid AL_APIENTRY alGenFilters(ALsizei n, ALuint *filters);
-AL_API ALvoid AL_APIENTRY alDeleteFilters(ALsizei n, const ALuint *filters);
-AL_API ALboolean AL_APIENTRY alIsFilter(ALuint filter);
-AL_API ALvoid AL_APIENTRY alFilteri(ALuint filter, ALenum param, ALint iValue);
-AL_API ALvoid AL_APIENTRY alFilteriv(ALuint filter, ALenum param, const ALint *piValues);
-AL_API ALvoid AL_APIENTRY alFilterf(ALuint filter, ALenum param, ALfloat flValue);
-AL_API ALvoid AL_APIENTRY alFilterfv(ALuint filter, ALenum param, const ALfloat *pflValues);
-AL_API ALvoid AL_APIENTRY alGetFilteri(ALuint filter, ALenum param, ALint *piValue);
-AL_API ALvoid AL_APIENTRY alGetFilteriv(ALuint filter, ALenum param, ALint *piValues);
-AL_API ALvoid AL_APIENTRY alGetFilterf(ALuint filter, ALenum param, ALfloat *pflValue);
-AL_API ALvoid AL_APIENTRY alGetFilterfv(ALuint filter, ALenum param, ALfloat *pflValues);
-
-AL_API ALvoid AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint *effectslots);
-AL_API ALvoid AL_APIENTRY alDeleteAuxiliaryEffectSlots(ALsizei n, const ALuint *effectslots);
-AL_API ALboolean AL_APIENTRY alIsAuxiliaryEffectSlot(ALuint effectslot);
-AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint iValue);
-AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, const ALint *piValues);
-AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat flValue);
-AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, const ALfloat *pflValues);
-AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint *piValue);
-AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, ALint *piValues);
-AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat *pflValue);
-AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, ALfloat *pflValues);
+    AL_API ALvoid AL_APIENTRY alGenEffects(ALsizei n, ALuint* effects);
+    AL_API ALvoid AL_APIENTRY alDeleteEffects(ALsizei n, const ALuint* effects);
+    AL_API ALboolean AL_APIENTRY alIsEffect(ALuint effect);
+    AL_API ALvoid AL_APIENTRY alEffecti(ALuint effect, ALenum param, ALint iValue);
+    AL_API ALvoid AL_APIENTRY alEffectiv(ALuint effect, ALenum param, const ALint* piValues);
+    AL_API ALvoid AL_APIENTRY alEffectf(ALuint effect, ALenum param, ALfloat flValue);
+    AL_API ALvoid AL_APIENTRY alEffectfv(ALuint effect, ALenum param, const ALfloat* pflValues);
+    AL_API ALvoid AL_APIENTRY alGetEffecti(ALuint effect, ALenum param, ALint* piValue);
+    AL_API ALvoid AL_APIENTRY alGetEffectiv(ALuint effect, ALenum param, ALint* piValues);
+    AL_API ALvoid AL_APIENTRY alGetEffectf(ALuint effect, ALenum param, ALfloat* pflValue);
+    AL_API ALvoid AL_APIENTRY alGetEffectfv(ALuint effect, ALenum param, ALfloat* pflValues);
+
+    AL_API ALvoid AL_APIENTRY alGenFilters(ALsizei n, ALuint* filters);
+    AL_API ALvoid AL_APIENTRY alDeleteFilters(ALsizei n, const ALuint* filters);
+    AL_API ALboolean AL_APIENTRY alIsFilter(ALuint filter);
+    AL_API ALvoid AL_APIENTRY alFilteri(ALuint filter, ALenum param, ALint iValue);
+    AL_API ALvoid AL_APIENTRY alFilteriv(ALuint filter, ALenum param, const ALint* piValues);
+    AL_API ALvoid AL_APIENTRY alFilterf(ALuint filter, ALenum param, ALfloat flValue);
+    AL_API ALvoid AL_APIENTRY alFilterfv(ALuint filter, ALenum param, const ALfloat* pflValues);
+    AL_API ALvoid AL_APIENTRY alGetFilteri(ALuint filter, ALenum param, ALint* piValue);
+    AL_API ALvoid AL_APIENTRY alGetFilteriv(ALuint filter, ALenum param, ALint* piValues);
+    AL_API ALvoid AL_APIENTRY alGetFilterf(ALuint filter, ALenum param, ALfloat* pflValue);
+    AL_API ALvoid AL_APIENTRY alGetFilterfv(ALuint filter, ALenum param, ALfloat* pflValues);
+
+    AL_API ALvoid AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint* effectslots);
+    AL_API ALvoid AL_APIENTRY alDeleteAuxiliaryEffectSlots(ALsizei n, const ALuint* effectslots);
+    AL_API ALboolean AL_APIENTRY alIsAuxiliaryEffectSlot(ALuint effectslot);
+    AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint iValue);
+    AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, const ALint* piValues);
+    AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat flValue);
+    AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, const ALfloat* pflValues);
+    AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint* piValue);
+    AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, ALint* piValues);
+    AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat* pflValue);
+    AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, ALfloat* pflValues);
 #endif
 
 /* Filter ranges and defaults. */
 
 /* Lowpass filter */
-#define AL_LOWPASS_MIN_GAIN                      (0.0f)
-#define AL_LOWPASS_MAX_GAIN                      (1.0f)
-#define AL_LOWPASS_DEFAULT_GAIN                  (1.0f)
+#define AL_LOWPASS_MIN_GAIN (0.0f)
+#define AL_LOWPASS_MAX_GAIN (1.0f)
+#define AL_LOWPASS_DEFAULT_GAIN (1.0f)
 
-#define AL_LOWPASS_MIN_GAINHF                    (0.0f)
-#define AL_LOWPASS_MAX_GAINHF                    (1.0f)
-#define AL_LOWPASS_DEFAULT_GAINHF                (1.0f)
+#define AL_LOWPASS_MIN_GAINHF (0.0f)
+#define AL_LOWPASS_MAX_GAINHF (1.0f)
+#define AL_LOWPASS_DEFAULT_GAINHF (1.0f)
 
 /* Highpass filter */
-#define AL_HIGHPASS_MIN_GAIN                     (0.0f)
-#define AL_HIGHPASS_MAX_GAIN                     (1.0f)
-#define AL_HIGHPASS_DEFAULT_GAIN                 (1.0f)
+#define AL_HIGHPASS_MIN_GAIN (0.0f)
+#define AL_HIGHPASS_MAX_GAIN (1.0f)
+#define AL_HIGHPASS_DEFAULT_GAIN (1.0f)
 
-#define AL_HIGHPASS_MIN_GAINLF                   (0.0f)
-#define AL_HIGHPASS_MAX_GAINLF                   (1.0f)
-#define AL_HIGHPASS_DEFAULT_GAINLF               (1.0f)
+#define AL_HIGHPASS_MIN_GAINLF (0.0f)
+#define AL_HIGHPASS_MAX_GAINLF (1.0f)
+#define AL_HIGHPASS_DEFAULT_GAINLF (1.0f)
 
 /* Bandpass filter */
-#define AL_BANDPASS_MIN_GAIN                     (0.0f)
-#define AL_BANDPASS_MAX_GAIN                     (1.0f)
-#define AL_BANDPASS_DEFAULT_GAIN                 (1.0f)
-
-#define AL_BANDPASS_MIN_GAINHF                   (0.0f)
-#define AL_BANDPASS_MAX_GAINHF                   (1.0f)
-#define AL_BANDPASS_DEFAULT_GAINHF               (1.0f)
+#define AL_BANDPASS_MIN_GAIN (0.0f)
+#define AL_BANDPASS_MAX_GAIN (1.0f)
+#define AL_BANDPASS_DEFAULT_GAIN (1.0f)
 
-#define AL_BANDPASS_MIN_GAINLF                   (0.0f)
-#define AL_BANDPASS_MAX_GAINLF                   (1.0f)
-#define AL_BANDPASS_DEFAULT_GAINLF               (1.0f)
+#define AL_BANDPASS_MIN_GAINHF (0.0f)
+#define AL_BANDPASS_MAX_GAINHF (1.0f)
+#define AL_BANDPASS_DEFAULT_GAINHF (1.0f)
 
+#define AL_BANDPASS_MIN_GAINLF (0.0f)
+#define AL_BANDPASS_MAX_GAINLF (1.0f)
+#define AL_BANDPASS_DEFAULT_GAINLF (1.0f)
 
 /* Effect parameter ranges and defaults. */
 
 /* Standard reverb effect */
-#define AL_REVERB_MIN_DENSITY                    (0.0f)
-#define AL_REVERB_MAX_DENSITY                    (1.0f)
-#define AL_REVERB_DEFAULT_DENSITY                (1.0f)
+#define AL_REVERB_MIN_DENSITY (0.0f)
+#define AL_REVERB_MAX_DENSITY (1.0f)
+#define AL_REVERB_DEFAULT_DENSITY (1.0f)
 
-#define AL_REVERB_MIN_DIFFUSION                  (0.0f)
-#define AL_REVERB_MAX_DIFFUSION                  (1.0f)
-#define AL_REVERB_DEFAULT_DIFFUSION              (1.0f)
+#define AL_REVERB_MIN_DIFFUSION (0.0f)
+#define AL_REVERB_MAX_DIFFUSION (1.0f)
+#define AL_REVERB_DEFAULT_DIFFUSION (1.0f)
 
-#define AL_REVERB_MIN_GAIN                       (0.0f)
-#define AL_REVERB_MAX_GAIN                       (1.0f)
-#define AL_REVERB_DEFAULT_GAIN                   (0.32f)
+#define AL_REVERB_MIN_GAIN (0.0f)
+#define AL_REVERB_MAX_GAIN (1.0f)
+#define AL_REVERB_DEFAULT_GAIN (0.32f)
 
-#define AL_REVERB_MIN_GAINHF                     (0.0f)
-#define AL_REVERB_MAX_GAINHF                     (1.0f)
-#define AL_REVERB_DEFAULT_GAINHF                 (0.89f)
+#define AL_REVERB_MIN_GAINHF (0.0f)
+#define AL_REVERB_MAX_GAINHF (1.0f)
+#define AL_REVERB_DEFAULT_GAINHF (0.89f)
 
-#define AL_REVERB_MIN_DECAY_TIME                 (0.1f)
-#define AL_REVERB_MAX_DECAY_TIME                 (20.0f)
-#define AL_REVERB_DEFAULT_DECAY_TIME             (1.49f)
+#define AL_REVERB_MIN_DECAY_TIME (0.1f)
+#define AL_REVERB_MAX_DECAY_TIME (20.0f)
+#define AL_REVERB_DEFAULT_DECAY_TIME (1.49f)
 
-#define AL_REVERB_MIN_DECAY_HFRATIO              (0.1f)
-#define AL_REVERB_MAX_DECAY_HFRATIO              (2.0f)
-#define AL_REVERB_DEFAULT_DECAY_HFRATIO          (0.83f)
+#define AL_REVERB_MIN_DECAY_HFRATIO (0.1f)
+#define AL_REVERB_MAX_DECAY_HFRATIO (2.0f)
+#define AL_REVERB_DEFAULT_DECAY_HFRATIO (0.83f)
 
-#define AL_REVERB_MIN_REFLECTIONS_GAIN           (0.0f)
-#define AL_REVERB_MAX_REFLECTIONS_GAIN           (3.16f)
-#define AL_REVERB_DEFAULT_REFLECTIONS_GAIN       (0.05f)
+#define AL_REVERB_MIN_REFLECTIONS_GAIN (0.0f)
+#define AL_REVERB_MAX_REFLECTIONS_GAIN (3.16f)
+#define AL_REVERB_DEFAULT_REFLECTIONS_GAIN (0.05f)
 
-#define AL_REVERB_MIN_REFLECTIONS_DELAY          (0.0f)
-#define AL_REVERB_MAX_REFLECTIONS_DELAY          (0.3f)
-#define AL_REVERB_DEFAULT_REFLECTIONS_DELAY      (0.007f)
+#define AL_REVERB_MIN_REFLECTIONS_DELAY (0.0f)
+#define AL_REVERB_MAX_REFLECTIONS_DELAY (0.3f)
+#define AL_REVERB_DEFAULT_REFLECTIONS_DELAY (0.007f)
 
-#define AL_REVERB_MIN_LATE_REVERB_GAIN           (0.0f)
-#define AL_REVERB_MAX_LATE_REVERB_GAIN           (10.0f)
-#define AL_REVERB_DEFAULT_LATE_REVERB_GAIN       (1.26f)
+#define AL_REVERB_MIN_LATE_REVERB_GAIN (0.0f)
+#define AL_REVERB_MAX_LATE_REVERB_GAIN (10.0f)
+#define AL_REVERB_DEFAULT_LATE_REVERB_GAIN (1.26f)
 
-#define AL_REVERB_MIN_LATE_REVERB_DELAY          (0.0f)
-#define AL_REVERB_MAX_LATE_REVERB_DELAY          (0.1f)
-#define AL_REVERB_DEFAULT_LATE_REVERB_DELAY      (0.011f)
+#define AL_REVERB_MIN_LATE_REVERB_DELAY (0.0f)
+#define AL_REVERB_MAX_LATE_REVERB_DELAY (0.1f)
+#define AL_REVERB_DEFAULT_LATE_REVERB_DELAY (0.011f)
 
-#define AL_REVERB_MIN_AIR_ABSORPTION_GAINHF      (0.892f)
-#define AL_REVERB_MAX_AIR_ABSORPTION_GAINHF      (1.0f)
-#define AL_REVERB_DEFAULT_AIR_ABSORPTION_GAINHF  (0.994f)
+#define AL_REVERB_MIN_AIR_ABSORPTION_GAINHF (0.892f)
+#define AL_REVERB_MAX_AIR_ABSORPTION_GAINHF (1.0f)
+#define AL_REVERB_DEFAULT_AIR_ABSORPTION_GAINHF (0.994f)
 
-#define AL_REVERB_MIN_ROOM_ROLLOFF_FACTOR        (0.0f)
-#define AL_REVERB_MAX_ROOM_ROLLOFF_FACTOR        (10.0f)
-#define AL_REVERB_DEFAULT_ROOM_ROLLOFF_FACTOR    (0.0f)
+#define AL_REVERB_MIN_ROOM_ROLLOFF_FACTOR (0.0f)
+#define AL_REVERB_MAX_ROOM_ROLLOFF_FACTOR (10.0f)
+#define AL_REVERB_DEFAULT_ROOM_ROLLOFF_FACTOR (0.0f)
 
-#define AL_REVERB_MIN_DECAY_HFLIMIT              AL_FALSE
-#define AL_REVERB_MAX_DECAY_HFLIMIT              AL_TRUE
-#define AL_REVERB_DEFAULT_DECAY_HFLIMIT          AL_TRUE
+#define AL_REVERB_MIN_DECAY_HFLIMIT AL_FALSE
+#define AL_REVERB_MAX_DECAY_HFLIMIT AL_TRUE
+#define AL_REVERB_DEFAULT_DECAY_HFLIMIT AL_TRUE
 
 /* EAX reverb effect */
-#define AL_EAXREVERB_MIN_DENSITY                 (0.0f)
-#define AL_EAXREVERB_MAX_DENSITY                 (1.0f)
-#define AL_EAXREVERB_DEFAULT_DENSITY             (1.0f)
+#define AL_EAXREVERB_MIN_DENSITY (0.0f)
+#define AL_EAXREVERB_MAX_DENSITY (1.0f)
+#define AL_EAXREVERB_DEFAULT_DENSITY (1.0f)
 
-#define AL_EAXREVERB_MIN_DIFFUSION               (0.0f)
-#define AL_EAXREVERB_MAX_DIFFUSION               (1.0f)
-#define AL_EAXREVERB_DEFAULT_DIFFUSION           (1.0f)
+#define AL_EAXREVERB_MIN_DIFFUSION (0.0f)
+#define AL_EAXREVERB_MAX_DIFFUSION (1.0f)
+#define AL_EAXREVERB_DEFAULT_DIFFUSION (1.0f)
 
-#define AL_EAXREVERB_MIN_GAIN                    (0.0f)
-#define AL_EAXREVERB_MAX_GAIN                    (1.0f)
-#define AL_EAXREVERB_DEFAULT_GAIN                (0.32f)
+#define AL_EAXREVERB_MIN_GAIN (0.0f)
+#define AL_EAXREVERB_MAX_GAIN (1.0f)
+#define AL_EAXREVERB_DEFAULT_GAIN (0.32f)
 
-#define AL_EAXREVERB_MIN_GAINHF                  (0.0f)
-#define AL_EAXREVERB_MAX_GAINHF                  (1.0f)
-#define AL_EAXREVERB_DEFAULT_GAINHF              (0.89f)
+#define AL_EAXREVERB_MIN_GAINHF (0.0f)
+#define AL_EAXREVERB_MAX_GAINHF (1.0f)
+#define AL_EAXREVERB_DEFAULT_GAINHF (0.89f)
 
-#define AL_EAXREVERB_MIN_GAINLF                  (0.0f)
-#define AL_EAXREVERB_MAX_GAINLF                  (1.0f)
-#define AL_EAXREVERB_DEFAULT_GAINLF              (1.0f)
+#define AL_EAXREVERB_MIN_GAINLF (0.0f)
+#define AL_EAXREVERB_MAX_GAINLF (1.0f)
+#define AL_EAXREVERB_DEFAULT_GAINLF (1.0f)
 
-#define AL_EAXREVERB_MIN_DECAY_TIME              (0.1f)
-#define AL_EAXREVERB_MAX_DECAY_TIME              (20.0f)
-#define AL_EAXREVERB_DEFAULT_DECAY_TIME          (1.49f)
+#define AL_EAXREVERB_MIN_DECAY_TIME (0.1f)
+#define AL_EAXREVERB_MAX_DECAY_TIME (20.0f)
+#define AL_EAXREVERB_DEFAULT_DECAY_TIME (1.49f)
 
-#define AL_EAXREVERB_MIN_DECAY_HFRATIO           (0.1f)
-#define AL_EAXREVERB_MAX_DECAY_HFRATIO           (2.0f)
-#define AL_EAXREVERB_DEFAULT_DECAY_HFRATIO       (0.83f)
+#define AL_EAXREVERB_MIN_DECAY_HFRATIO (0.1f)
+#define AL_EAXREVERB_MAX_DECAY_HFRATIO (2.0f)
+#define AL_EAXREVERB_DEFAULT_DECAY_HFRATIO (0.83f)
 
-#define AL_EAXREVERB_MIN_DECAY_LFRATIO           (0.1f)
-#define AL_EAXREVERB_MAX_DECAY_LFRATIO           (2.0f)
-#define AL_EAXREVERB_DEFAULT_DECAY_LFRATIO       (1.0f)
+#define AL_EAXREVERB_MIN_DECAY_LFRATIO (0.1f)
+#define AL_EAXREVERB_MAX_DECAY_LFRATIO (2.0f)
+#define AL_EAXREVERB_DEFAULT_DECAY_LFRATIO (1.0f)
 
-#define AL_EAXREVERB_MIN_REFLECTIONS_GAIN        (0.0f)
-#define AL_EAXREVERB_MAX_REFLECTIONS_GAIN        (3.16f)
-#define AL_EAXREVERB_DEFAULT_REFLECTIONS_GAIN    (0.05f)
+#define AL_EAXREVERB_MIN_REFLECTIONS_GAIN (0.0f)
+#define AL_EAXREVERB_MAX_REFLECTIONS_GAIN (3.16f)
+#define AL_EAXREVERB_DEFAULT_REFLECTIONS_GAIN (0.05f)
 
-#define AL_EAXREVERB_MIN_REFLECTIONS_DELAY       (0.0f)
-#define AL_EAXREVERB_MAX_REFLECTIONS_DELAY       (0.3f)
-#define AL_EAXREVERB_DEFAULT_REFLECTIONS_DELAY   (0.007f)
+#define AL_EAXREVERB_MIN_REFLECTIONS_DELAY (0.0f)
+#define AL_EAXREVERB_MAX_REFLECTIONS_DELAY (0.3f)
+#define AL_EAXREVERB_DEFAULT_REFLECTIONS_DELAY (0.007f)
 
 #define AL_EAXREVERB_DEFAULT_REFLECTIONS_PAN_XYZ (0.0f)
 
-#define AL_EAXREVERB_MIN_LATE_REVERB_GAIN        (0.0f)
-#define AL_EAXREVERB_MAX_LATE_REVERB_GAIN        (10.0f)
-#define AL_EAXREVERB_DEFAULT_LATE_REVERB_GAIN    (1.26f)
+#define AL_EAXREVERB_MIN_LATE_REVERB_GAIN (0.0f)
+#define AL_EAXREVERB_MAX_LATE_REVERB_GAIN (10.0f)
+#define AL_EAXREVERB_DEFAULT_LATE_REVERB_GAIN (1.26f)
 
-#define AL_EAXREVERB_MIN_LATE_REVERB_DELAY       (0.0f)
-#define AL_EAXREVERB_MAX_LATE_REVERB_DELAY       (0.1f)
-#define AL_EAXREVERB_DEFAULT_LATE_REVERB_DELAY   (0.011f)
+#define AL_EAXREVERB_MIN_LATE_REVERB_DELAY (0.0f)
+#define AL_EAXREVERB_MAX_LATE_REVERB_DELAY (0.1f)
+#define AL_EAXREVERB_DEFAULT_LATE_REVERB_DELAY (0.011f)
 
 #define AL_EAXREVERB_DEFAULT_LATE_REVERB_PAN_XYZ (0.0f)
 
-#define AL_EAXREVERB_MIN_ECHO_TIME               (0.075f)
-#define AL_EAXREVERB_MAX_ECHO_TIME               (0.25f)
-#define AL_EAXREVERB_DEFAULT_ECHO_TIME           (0.25f)
+#define AL_EAXREVERB_MIN_ECHO_TIME (0.075f)
+#define AL_EAXREVERB_MAX_ECHO_TIME (0.25f)
+#define AL_EAXREVERB_DEFAULT_ECHO_TIME (0.25f)
 
-#define AL_EAXREVERB_MIN_ECHO_DEPTH              (0.0f)
-#define AL_EAXREVERB_MAX_ECHO_DEPTH              (1.0f)
-#define AL_EAXREVERB_DEFAULT_ECHO_DEPTH          (0.0f)
+#define AL_EAXREVERB_MIN_ECHO_DEPTH (0.0f)
+#define AL_EAXREVERB_MAX_ECHO_DEPTH (1.0f)
+#define AL_EAXREVERB_DEFAULT_ECHO_DEPTH (0.0f)
 
-#define AL_EAXREVERB_MIN_MODULATION_TIME         (0.04f)
-#define AL_EAXREVERB_MAX_MODULATION_TIME         (4.0f)
-#define AL_EAXREVERB_DEFAULT_MODULATION_TIME     (0.25f)
+#define AL_EAXREVERB_MIN_MODULATION_TIME (0.04f)
+#define AL_EAXREVERB_MAX_MODULATION_TIME (4.0f)
+#define AL_EAXREVERB_DEFAULT_MODULATION_TIME (0.25f)
 
-#define AL_EAXREVERB_MIN_MODULATION_DEPTH        (0.0f)
-#define AL_EAXREVERB_MAX_MODULATION_DEPTH        (1.0f)
-#define AL_EAXREVERB_DEFAULT_MODULATION_DEPTH    (0.0f)
+#define AL_EAXREVERB_MIN_MODULATION_DEPTH (0.0f)
+#define AL_EAXREVERB_MAX_MODULATION_DEPTH (1.0f)
+#define AL_EAXREVERB_DEFAULT_MODULATION_DEPTH (0.0f)
 
-#define AL_EAXREVERB_MIN_AIR_ABSORPTION_GAINHF   (0.892f)
-#define AL_EAXREVERB_MAX_AIR_ABSORPTION_GAINHF   (1.0f)
+#define AL_EAXREVERB_MIN_AIR_ABSORPTION_GAINHF (0.892f)
+#define AL_EAXREVERB_MAX_AIR_ABSORPTION_GAINHF (1.0f)
 #define AL_EAXREVERB_DEFAULT_AIR_ABSORPTION_GAINHF (0.994f)
 
-#define AL_EAXREVERB_MIN_HFREFERENCE             (1000.0f)
-#define AL_EAXREVERB_MAX_HFREFERENCE             (20000.0f)
-#define AL_EAXREVERB_DEFAULT_HFREFERENCE         (5000.0f)
+#define AL_EAXREVERB_MIN_HFREFERENCE (1000.0f)
+#define AL_EAXREVERB_MAX_HFREFERENCE (20000.0f)
+#define AL_EAXREVERB_DEFAULT_HFREFERENCE (5000.0f)
 
-#define AL_EAXREVERB_MIN_LFREFERENCE             (20.0f)
-#define AL_EAXREVERB_MAX_LFREFERENCE             (1000.0f)
-#define AL_EAXREVERB_DEFAULT_LFREFERENCE         (250.0f)
+#define AL_EAXREVERB_MIN_LFREFERENCE (20.0f)
+#define AL_EAXREVERB_MAX_LFREFERENCE (1000.0f)
+#define AL_EAXREVERB_DEFAULT_LFREFERENCE (250.0f)
 
-#define AL_EAXREVERB_MIN_ROOM_ROLLOFF_FACTOR     (0.0f)
-#define AL_EAXREVERB_MAX_ROOM_ROLLOFF_FACTOR     (10.0f)
+#define AL_EAXREVERB_MIN_ROOM_ROLLOFF_FACTOR (0.0f)
+#define AL_EAXREVERB_MAX_ROOM_ROLLOFF_FACTOR (10.0f)
 #define AL_EAXREVERB_DEFAULT_ROOM_ROLLOFF_FACTOR (0.0f)
 
-#define AL_EAXREVERB_MIN_DECAY_HFLIMIT           AL_FALSE
-#define AL_EAXREVERB_MAX_DECAY_HFLIMIT           AL_TRUE
-#define AL_EAXREVERB_DEFAULT_DECAY_HFLIMIT       AL_TRUE
+#define AL_EAXREVERB_MIN_DECAY_HFLIMIT AL_FALSE
+#define AL_EAXREVERB_MAX_DECAY_HFLIMIT AL_TRUE
+#define AL_EAXREVERB_DEFAULT_DECAY_HFLIMIT AL_TRUE
 
 /* Chorus effect */
-#define AL_CHORUS_WAVEFORM_SINUSOID              (0)
-#define AL_CHORUS_WAVEFORM_TRIANGLE              (1)
+#define AL_CHORUS_WAVEFORM_SINUSOID (0)
+#define AL_CHORUS_WAVEFORM_TRIANGLE (1)
 
-#define AL_CHORUS_MIN_WAVEFORM                   (0)
-#define AL_CHORUS_MAX_WAVEFORM                   (1)
-#define AL_CHORUS_DEFAULT_WAVEFORM               (1)
+#define AL_CHORUS_MIN_WAVEFORM (0)
+#define AL_CHORUS_MAX_WAVEFORM (1)
+#define AL_CHORUS_DEFAULT_WAVEFORM (1)
 
-#define AL_CHORUS_MIN_PHASE                      (-180)
-#define AL_CHORUS_MAX_PHASE                      (180)
-#define AL_CHORUS_DEFAULT_PHASE                  (90)
+#define AL_CHORUS_MIN_PHASE (-180)
+#define AL_CHORUS_MAX_PHASE (180)
+#define AL_CHORUS_DEFAULT_PHASE (90)
 
-#define AL_CHORUS_MIN_RATE                       (0.0f)
-#define AL_CHORUS_MAX_RATE                       (10.0f)
-#define AL_CHORUS_DEFAULT_RATE                   (1.1f)
+#define AL_CHORUS_MIN_RATE (0.0f)
+#define AL_CHORUS_MAX_RATE (10.0f)
+#define AL_CHORUS_DEFAULT_RATE (1.1f)
 
-#define AL_CHORUS_MIN_DEPTH                      (0.0f)
-#define AL_CHORUS_MAX_DEPTH                      (1.0f)
-#define AL_CHORUS_DEFAULT_DEPTH                  (0.1f)
+#define AL_CHORUS_MIN_DEPTH (0.0f)
+#define AL_CHORUS_MAX_DEPTH (1.0f)
+#define AL_CHORUS_DEFAULT_DEPTH (0.1f)
 
-#define AL_CHORUS_MIN_FEEDBACK                   (-1.0f)
-#define AL_CHORUS_MAX_FEEDBACK                   (1.0f)
-#define AL_CHORUS_DEFAULT_FEEDBACK               (0.25f)
+#define AL_CHORUS_MIN_FEEDBACK (-1.0f)
+#define AL_CHORUS_MAX_FEEDBACK (1.0f)
+#define AL_CHORUS_DEFAULT_FEEDBACK (0.25f)
 
-#define AL_CHORUS_MIN_DELAY                      (0.0f)
-#define AL_CHORUS_MAX_DELAY                      (0.016f)
-#define AL_CHORUS_DEFAULT_DELAY                  (0.016f)
+#define AL_CHORUS_MIN_DELAY (0.0f)
+#define AL_CHORUS_MAX_DELAY (0.016f)
+#define AL_CHORUS_DEFAULT_DELAY (0.016f)
 
 /* Distortion effect */
-#define AL_DISTORTION_MIN_EDGE                   (0.0f)
-#define AL_DISTORTION_MAX_EDGE                   (1.0f)
-#define AL_DISTORTION_DEFAULT_EDGE               (0.2f)
+#define AL_DISTORTION_MIN_EDGE (0.0f)
+#define AL_DISTORTION_MAX_EDGE (1.0f)
+#define AL_DISTORTION_DEFAULT_EDGE (0.2f)
 
-#define AL_DISTORTION_MIN_GAIN                   (0.01f)
-#define AL_DISTORTION_MAX_GAIN                   (1.0f)
-#define AL_DISTORTION_DEFAULT_GAIN               (0.05f)
+#define AL_DISTORTION_MIN_GAIN (0.01f)
+#define AL_DISTORTION_MAX_GAIN (1.0f)
+#define AL_DISTORTION_DEFAULT_GAIN (0.05f)
 
-#define AL_DISTORTION_MIN_LOWPASS_CUTOFF         (80.0f)
-#define AL_DISTORTION_MAX_LOWPASS_CUTOFF         (24000.0f)
-#define AL_DISTORTION_DEFAULT_LOWPASS_CUTOFF     (8000.0f)
+#define AL_DISTORTION_MIN_LOWPASS_CUTOFF (80.0f)
+#define AL_DISTORTION_MAX_LOWPASS_CUTOFF (24000.0f)
+#define AL_DISTORTION_DEFAULT_LOWPASS_CUTOFF (8000.0f)
 
-#define AL_DISTORTION_MIN_EQCENTER               (80.0f)
-#define AL_DISTORTION_MAX_EQCENTER               (24000.0f)
-#define AL_DISTORTION_DEFAULT_EQCENTER           (3600.0f)
+#define AL_DISTORTION_MIN_EQCENTER (80.0f)
+#define AL_DISTORTION_MAX_EQCENTER (24000.0f)
+#define AL_DISTORTION_DEFAULT_EQCENTER (3600.0f)
 
-#define AL_DISTORTION_MIN_EQBANDWIDTH            (80.0f)
-#define AL_DISTORTION_MAX_EQBANDWIDTH            (24000.0f)
-#define AL_DISTORTION_DEFAULT_EQBANDWIDTH        (3600.0f)
+#define AL_DISTORTION_MIN_EQBANDWIDTH (80.0f)
+#define AL_DISTORTION_MAX_EQBANDWIDTH (24000.0f)
+#define AL_DISTORTION_DEFAULT_EQBANDWIDTH (3600.0f)
 
 /* Echo effect */
-#define AL_ECHO_MIN_DELAY                        (0.0f)
-#define AL_ECHO_MAX_DELAY                        (0.207f)
-#define AL_ECHO_DEFAULT_DELAY                    (0.1f)
+#define AL_ECHO_MIN_DELAY (0.0f)
+#define AL_ECHO_MAX_DELAY (0.207f)
+#define AL_ECHO_DEFAULT_DELAY (0.1f)
 
-#define AL_ECHO_MIN_LRDELAY                      (0.0f)
-#define AL_ECHO_MAX_LRDELAY                      (0.404f)
-#define AL_ECHO_DEFAULT_LRDELAY                  (0.1f)
+#define AL_ECHO_MIN_LRDELAY (0.0f)
+#define AL_ECHO_MAX_LRDELAY (0.404f)
+#define AL_ECHO_DEFAULT_LRDELAY (0.1f)
 
-#define AL_ECHO_MIN_DAMPING                      (0.0f)
-#define AL_ECHO_MAX_DAMPING                      (0.99f)
-#define AL_ECHO_DEFAULT_DAMPING                  (0.5f)
+#define AL_ECHO_MIN_DAMPING (0.0f)
+#define AL_ECHO_MAX_DAMPING (0.99f)
+#define AL_ECHO_DEFAULT_DAMPING (0.5f)
 
-#define AL_ECHO_MIN_FEEDBACK                     (0.0f)
-#define AL_ECHO_MAX_FEEDBACK                     (1.0f)
-#define AL_ECHO_DEFAULT_FEEDBACK                 (0.5f)
+#define AL_ECHO_MIN_FEEDBACK (0.0f)
+#define AL_ECHO_MAX_FEEDBACK (1.0f)
+#define AL_ECHO_DEFAULT_FEEDBACK (0.5f)
 
-#define AL_ECHO_MIN_SPREAD                       (-1.0f)
-#define AL_ECHO_MAX_SPREAD                       (1.0f)
-#define AL_ECHO_DEFAULT_SPREAD                   (-1.0f)
+#define AL_ECHO_MIN_SPREAD (-1.0f)
+#define AL_ECHO_MAX_SPREAD (1.0f)
+#define AL_ECHO_DEFAULT_SPREAD (-1.0f)
 
 /* Flanger effect */
-#define AL_FLANGER_WAVEFORM_SINUSOID             (0)
-#define AL_FLANGER_WAVEFORM_TRIANGLE             (1)
+#define AL_FLANGER_WAVEFORM_SINUSOID (0)
+#define AL_FLANGER_WAVEFORM_TRIANGLE (1)
 
-#define AL_FLANGER_MIN_WAVEFORM                  (0)
-#define AL_FLANGER_MAX_WAVEFORM                  (1)
-#define AL_FLANGER_DEFAULT_WAVEFORM              (1)
+#define AL_FLANGER_MIN_WAVEFORM (0)
+#define AL_FLANGER_MAX_WAVEFORM (1)
+#define AL_FLANGER_DEFAULT_WAVEFORM (1)
 
-#define AL_FLANGER_MIN_PHASE                     (-180)
-#define AL_FLANGER_MAX_PHASE                     (180)
-#define AL_FLANGER_DEFAULT_PHASE                 (0)
+#define AL_FLANGER_MIN_PHASE (-180)
+#define AL_FLANGER_MAX_PHASE (180)
+#define AL_FLANGER_DEFAULT_PHASE (0)
 
-#define AL_FLANGER_MIN_RATE                      (0.0f)
-#define AL_FLANGER_MAX_RATE                      (10.0f)
-#define AL_FLANGER_DEFAULT_RATE                  (0.27f)
+#define AL_FLANGER_MIN_RATE (0.0f)
+#define AL_FLANGER_MAX_RATE (10.0f)
+#define AL_FLANGER_DEFAULT_RATE (0.27f)
 
-#define AL_FLANGER_MIN_DEPTH                     (0.0f)
-#define AL_FLANGER_MAX_DEPTH                     (1.0f)
-#define AL_FLANGER_DEFAULT_DEPTH                 (1.0f)
+#define AL_FLANGER_MIN_DEPTH (0.0f)
+#define AL_FLANGER_MAX_DEPTH (1.0f)
+#define AL_FLANGER_DEFAULT_DEPTH (1.0f)
 
-#define AL_FLANGER_MIN_FEEDBACK                  (-1.0f)
-#define AL_FLANGER_MAX_FEEDBACK                  (1.0f)
-#define AL_FLANGER_DEFAULT_FEEDBACK              (-0.5f)
+#define AL_FLANGER_MIN_FEEDBACK (-1.0f)
+#define AL_FLANGER_MAX_FEEDBACK (1.0f)
+#define AL_FLANGER_DEFAULT_FEEDBACK (-0.5f)
 
-#define AL_FLANGER_MIN_DELAY                     (0.0f)
-#define AL_FLANGER_MAX_DELAY                     (0.004f)
-#define AL_FLANGER_DEFAULT_DELAY                 (0.002f)
+#define AL_FLANGER_MIN_DELAY (0.0f)
+#define AL_FLANGER_MAX_DELAY (0.004f)
+#define AL_FLANGER_DEFAULT_DELAY (0.002f)
 
 /* Frequency shifter effect */
-#define AL_FREQUENCY_SHIFTER_MIN_FREQUENCY       (0.0f)
-#define AL_FREQUENCY_SHIFTER_MAX_FREQUENCY       (24000.0f)
-#define AL_FREQUENCY_SHIFTER_DEFAULT_FREQUENCY   (0.0f)
+#define AL_FREQUENCY_SHIFTER_MIN_FREQUENCY (0.0f)
+#define AL_FREQUENCY_SHIFTER_MAX_FREQUENCY (24000.0f)
+#define AL_FREQUENCY_SHIFTER_DEFAULT_FREQUENCY (0.0f)
 
-#define AL_FREQUENCY_SHIFTER_MIN_LEFT_DIRECTION  (0)
-#define AL_FREQUENCY_SHIFTER_MAX_LEFT_DIRECTION  (2)
+#define AL_FREQUENCY_SHIFTER_MIN_LEFT_DIRECTION (0)
+#define AL_FREQUENCY_SHIFTER_MAX_LEFT_DIRECTION (2)
 #define AL_FREQUENCY_SHIFTER_DEFAULT_LEFT_DIRECTION (0)
 
-#define AL_FREQUENCY_SHIFTER_DIRECTION_DOWN      (0)
-#define AL_FREQUENCY_SHIFTER_DIRECTION_UP        (1)
-#define AL_FREQUENCY_SHIFTER_DIRECTION_OFF       (2)
+#define AL_FREQUENCY_SHIFTER_DIRECTION_DOWN (0)
+#define AL_FREQUENCY_SHIFTER_DIRECTION_UP (1)
+#define AL_FREQUENCY_SHIFTER_DIRECTION_OFF (2)
 
 #define AL_FREQUENCY_SHIFTER_MIN_RIGHT_DIRECTION (0)
 #define AL_FREQUENCY_SHIFTER_MAX_RIGHT_DIRECTION (2)
 #define AL_FREQUENCY_SHIFTER_DEFAULT_RIGHT_DIRECTION (0)
 
 /* Vocal morpher effect */
-#define AL_VOCAL_MORPHER_MIN_PHONEMEA            (0)
-#define AL_VOCAL_MORPHER_MAX_PHONEMEA            (29)
-#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEA        (0)
+#define AL_VOCAL_MORPHER_MIN_PHONEMEA (0)
+#define AL_VOCAL_MORPHER_MAX_PHONEMEA (29)
+#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEA (0)
 
 #define AL_VOCAL_MORPHER_MIN_PHONEMEA_COARSE_TUNING (-24)
 #define AL_VOCAL_MORPHER_MAX_PHONEMEA_COARSE_TUNING (24)
 #define AL_VOCAL_MORPHER_DEFAULT_PHONEMEA_COARSE_TUNING (0)
 
-#define AL_VOCAL_MORPHER_MIN_PHONEMEB            (0)
-#define AL_VOCAL_MORPHER_MAX_PHONEMEB            (29)
-#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEB        (10)
+#define AL_VOCAL_MORPHER_MIN_PHONEMEB (0)
+#define AL_VOCAL_MORPHER_MAX_PHONEMEB (29)
+#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEB (10)
 
 #define AL_VOCAL_MORPHER_MIN_PHONEMEB_COARSE_TUNING (-24)
 #define AL_VOCAL_MORPHER_MAX_PHONEMEB_COARSE_TUNING (24)
 #define AL_VOCAL_MORPHER_DEFAULT_PHONEMEB_COARSE_TUNING (0)
 
-#define AL_VOCAL_MORPHER_PHONEME_A               (0)
-#define AL_VOCAL_MORPHER_PHONEME_E               (1)
-#define AL_VOCAL_MORPHER_PHONEME_I               (2)
-#define AL_VOCAL_MORPHER_PHONEME_O               (3)
-#define AL_VOCAL_MORPHER_PHONEME_U               (4)
-#define AL_VOCAL_MORPHER_PHONEME_AA              (5)
-#define AL_VOCAL_MORPHER_PHONEME_AE              (6)
-#define AL_VOCAL_MORPHER_PHONEME_AH              (7)
-#define AL_VOCAL_MORPHER_PHONEME_AO              (8)
-#define AL_VOCAL_MORPHER_PHONEME_EH              (9)
-#define AL_VOCAL_MORPHER_PHONEME_ER              (10)
-#define AL_VOCAL_MORPHER_PHONEME_IH              (11)
-#define AL_VOCAL_MORPHER_PHONEME_IY              (12)
-#define AL_VOCAL_MORPHER_PHONEME_UH              (13)
-#define AL_VOCAL_MORPHER_PHONEME_UW              (14)
-#define AL_VOCAL_MORPHER_PHONEME_B               (15)
-#define AL_VOCAL_MORPHER_PHONEME_D               (16)
-#define AL_VOCAL_MORPHER_PHONEME_F               (17)
-#define AL_VOCAL_MORPHER_PHONEME_G               (18)
-#define AL_VOCAL_MORPHER_PHONEME_J               (19)
-#define AL_VOCAL_MORPHER_PHONEME_K               (20)
-#define AL_VOCAL_MORPHER_PHONEME_L               (21)
-#define AL_VOCAL_MORPHER_PHONEME_M               (22)
-#define AL_VOCAL_MORPHER_PHONEME_N               (23)
-#define AL_VOCAL_MORPHER_PHONEME_P               (24)
-#define AL_VOCAL_MORPHER_PHONEME_R               (25)
-#define AL_VOCAL_MORPHER_PHONEME_S               (26)
-#define AL_VOCAL_MORPHER_PHONEME_T               (27)
-#define AL_VOCAL_MORPHER_PHONEME_V               (28)
-#define AL_VOCAL_MORPHER_PHONEME_Z               (29)
-
-#define AL_VOCAL_MORPHER_WAVEFORM_SINUSOID       (0)
-#define AL_VOCAL_MORPHER_WAVEFORM_TRIANGLE       (1)
-#define AL_VOCAL_MORPHER_WAVEFORM_SAWTOOTH       (2)
-
-#define AL_VOCAL_MORPHER_MIN_WAVEFORM            (0)
-#define AL_VOCAL_MORPHER_MAX_WAVEFORM            (2)
-#define AL_VOCAL_MORPHER_DEFAULT_WAVEFORM        (0)
-
-#define AL_VOCAL_MORPHER_MIN_RATE                (0.0f)
-#define AL_VOCAL_MORPHER_MAX_RATE                (10.0f)
-#define AL_VOCAL_MORPHER_DEFAULT_RATE            (1.41f)
+#define AL_VOCAL_MORPHER_PHONEME_A (0)
+#define AL_VOCAL_MORPHER_PHONEME_E (1)
+#define AL_VOCAL_MORPHER_PHONEME_I (2)
+#define AL_VOCAL_MORPHER_PHONEME_O (3)
+#define AL_VOCAL_MORPHER_PHONEME_U (4)
+#define AL_VOCAL_MORPHER_PHONEME_AA (5)
+#define AL_VOCAL_MORPHER_PHONEME_AE (6)
+#define AL_VOCAL_MORPHER_PHONEME_AH (7)
+#define AL_VOCAL_MORPHER_PHONEME_AO (8)
+#define AL_VOCAL_MORPHER_PHONEME_EH (9)
+#define AL_VOCAL_MORPHER_PHONEME_ER (10)
+#define AL_VOCAL_MORPHER_PHONEME_IH (11)
+#define AL_VOCAL_MORPHER_PHONEME_IY (12)
+#define AL_VOCAL_MORPHER_PHONEME_UH (13)
+#define AL_VOCAL_MORPHER_PHONEME_UW (14)
+#define AL_VOCAL_MORPHER_PHONEME_B (15)
+#define AL_VOCAL_MORPHER_PHONEME_D (16)
+#define AL_VOCAL_MORPHER_PHONEME_F (17)
+#define AL_VOCAL_MORPHER_PHONEME_G (18)
+#define AL_VOCAL_MORPHER_PHONEME_J (19)
+#define AL_VOCAL_MORPHER_PHONEME_K (20)
+#define AL_VOCAL_MORPHER_PHONEME_L (21)
+#define AL_VOCAL_MORPHER_PHONEME_M (22)
+#define AL_VOCAL_MORPHER_PHONEME_N (23)
+#define AL_VOCAL_MORPHER_PHONEME_P (24)
+#define AL_VOCAL_MORPHER_PHONEME_R (25)
+#define AL_VOCAL_MORPHER_PHONEME_S (26)
+#define AL_VOCAL_MORPHER_PHONEME_T (27)
+#define AL_VOCAL_MORPHER_PHONEME_V (28)
+#define AL_VOCAL_MORPHER_PHONEME_Z (29)
+
+#define AL_VOCAL_MORPHER_WAVEFORM_SINUSOID (0)
+#define AL_VOCAL_MORPHER_WAVEFORM_TRIANGLE (1)
+#define AL_VOCAL_MORPHER_WAVEFORM_SAWTOOTH (2)
+
+#define AL_VOCAL_MORPHER_MIN_WAVEFORM (0)
+#define AL_VOCAL_MORPHER_MAX_WAVEFORM (2)
+#define AL_VOCAL_MORPHER_DEFAULT_WAVEFORM (0)
+
+#define AL_VOCAL_MORPHER_MIN_RATE (0.0f)
+#define AL_VOCAL_MORPHER_MAX_RATE (10.0f)
+#define AL_VOCAL_MORPHER_DEFAULT_RATE (1.41f)
 
 /* Pitch shifter effect */
-#define AL_PITCH_SHIFTER_MIN_COARSE_TUNE         (-12)
-#define AL_PITCH_SHIFTER_MAX_COARSE_TUNE         (12)
-#define AL_PITCH_SHIFTER_DEFAULT_COARSE_TUNE     (12)
+#define AL_PITCH_SHIFTER_MIN_COARSE_TUNE (-12)
+#define AL_PITCH_SHIFTER_MAX_COARSE_TUNE (12)
+#define AL_PITCH_SHIFTER_DEFAULT_COARSE_TUNE (12)
 
-#define AL_PITCH_SHIFTER_MIN_FINE_TUNE           (-50)
-#define AL_PITCH_SHIFTER_MAX_FINE_TUNE           (50)
-#define AL_PITCH_SHIFTER_DEFAULT_FINE_TUNE       (0)
+#define AL_PITCH_SHIFTER_MIN_FINE_TUNE (-50)
+#define AL_PITCH_SHIFTER_MAX_FINE_TUNE (50)
+#define AL_PITCH_SHIFTER_DEFAULT_FINE_TUNE (0)
 
 /* Ring modulator effect */
-#define AL_RING_MODULATOR_MIN_FREQUENCY          (0.0f)
-#define AL_RING_MODULATOR_MAX_FREQUENCY          (8000.0f)
-#define AL_RING_MODULATOR_DEFAULT_FREQUENCY      (440.0f)
+#define AL_RING_MODULATOR_MIN_FREQUENCY (0.0f)
+#define AL_RING_MODULATOR_MAX_FREQUENCY (8000.0f)
+#define AL_RING_MODULATOR_DEFAULT_FREQUENCY (440.0f)
 
-#define AL_RING_MODULATOR_MIN_HIGHPASS_CUTOFF    (0.0f)
-#define AL_RING_MODULATOR_MAX_HIGHPASS_CUTOFF    (24000.0f)
+#define AL_RING_MODULATOR_MIN_HIGHPASS_CUTOFF (0.0f)
+#define AL_RING_MODULATOR_MAX_HIGHPASS_CUTOFF (24000.0f)
 #define AL_RING_MODULATOR_DEFAULT_HIGHPASS_CUTOFF (800.0f)
 
-#define AL_RING_MODULATOR_SINUSOID               (0)
-#define AL_RING_MODULATOR_SAWTOOTH               (1)
-#define AL_RING_MODULATOR_SQUARE                 (2)
+#define AL_RING_MODULATOR_SINUSOID (0)
+#define AL_RING_MODULATOR_SAWTOOTH (1)
+#define AL_RING_MODULATOR_SQUARE (2)
 
-#define AL_RING_MODULATOR_MIN_WAVEFORM           (0)
-#define AL_RING_MODULATOR_MAX_WAVEFORM           (2)
-#define AL_RING_MODULATOR_DEFAULT_WAVEFORM       (0)
+#define AL_RING_MODULATOR_MIN_WAVEFORM (0)
+#define AL_RING_MODULATOR_MAX_WAVEFORM (2)
+#define AL_RING_MODULATOR_DEFAULT_WAVEFORM (0)
 
 /* Autowah effect */
-#define AL_AUTOWAH_MIN_ATTACK_TIME               (0.0001f)
-#define AL_AUTOWAH_MAX_ATTACK_TIME               (1.0f)
-#define AL_AUTOWAH_DEFAULT_ATTACK_TIME           (0.06f)
+#define AL_AUTOWAH_MIN_ATTACK_TIME (0.0001f)
+#define AL_AUTOWAH_MAX_ATTACK_TIME (1.0f)
+#define AL_AUTOWAH_DEFAULT_ATTACK_TIME (0.06f)
 
-#define AL_AUTOWAH_MIN_RELEASE_TIME              (0.0001f)
-#define AL_AUTOWAH_MAX_RELEASE_TIME              (1.0f)
-#define AL_AUTOWAH_DEFAULT_RELEASE_TIME          (0.06f)
+#define AL_AUTOWAH_MIN_RELEASE_TIME (0.0001f)
+#define AL_AUTOWAH_MAX_RELEASE_TIME (1.0f)
+#define AL_AUTOWAH_DEFAULT_RELEASE_TIME (0.06f)
 
-#define AL_AUTOWAH_MIN_RESONANCE                 (2.0f)
-#define AL_AUTOWAH_MAX_RESONANCE                 (1000.0f)
-#define AL_AUTOWAH_DEFAULT_RESONANCE             (1000.0f)
+#define AL_AUTOWAH_MIN_RESONANCE (2.0f)
+#define AL_AUTOWAH_MAX_RESONANCE (1000.0f)
+#define AL_AUTOWAH_DEFAULT_RESONANCE (1000.0f)
 
-#define AL_AUTOWAH_MIN_PEAK_GAIN                 (0.00003f)
-#define AL_AUTOWAH_MAX_PEAK_GAIN                 (31621.0f)
-#define AL_AUTOWAH_DEFAULT_PEAK_GAIN             (11.22f)
+#define AL_AUTOWAH_MIN_PEAK_GAIN (0.00003f)
+#define AL_AUTOWAH_MAX_PEAK_GAIN (31621.0f)
+#define AL_AUTOWAH_DEFAULT_PEAK_GAIN (11.22f)
 
 /* Compressor effect */
-#define AL_COMPRESSOR_MIN_ONOFF                  (0)
-#define AL_COMPRESSOR_MAX_ONOFF                  (1)
-#define AL_COMPRESSOR_DEFAULT_ONOFF              (1)
+#define AL_COMPRESSOR_MIN_ONOFF (0)
+#define AL_COMPRESSOR_MAX_ONOFF (1)
+#define AL_COMPRESSOR_DEFAULT_ONOFF (1)
 
 /* Equalizer effect */
-#define AL_EQUALIZER_MIN_LOW_GAIN                (0.126f)
-#define AL_EQUALIZER_MAX_LOW_GAIN                (7.943f)
-#define AL_EQUALIZER_DEFAULT_LOW_GAIN            (1.0f)
-
-#define AL_EQUALIZER_MIN_LOW_CUTOFF              (50.0f)
-#define AL_EQUALIZER_MAX_LOW_CUTOFF              (800.0f)
-#define AL_EQUALIZER_DEFAULT_LOW_CUTOFF          (200.0f)
+#define AL_EQUALIZER_MIN_LOW_GAIN (0.126f)
+#define AL_EQUALIZER_MAX_LOW_GAIN (7.943f)
+#define AL_EQUALIZER_DEFAULT_LOW_GAIN (1.0f)
 
-#define AL_EQUALIZER_MIN_MID1_GAIN               (0.126f)
-#define AL_EQUALIZER_MAX_MID1_GAIN               (7.943f)
-#define AL_EQUALIZER_DEFAULT_MID1_GAIN           (1.0f)
+#define AL_EQUALIZER_MIN_LOW_CUTOFF (50.0f)
+#define AL_EQUALIZER_MAX_LOW_CUTOFF (800.0f)
+#define AL_EQUALIZER_DEFAULT_LOW_CUTOFF (200.0f)
 
-#define AL_EQUALIZER_MIN_MID1_CENTER             (200.0f)
-#define AL_EQUALIZER_MAX_MID1_CENTER             (3000.0f)
-#define AL_EQUALIZER_DEFAULT_MID1_CENTER         (500.0f)
+#define AL_EQUALIZER_MIN_MID1_GAIN (0.126f)
+#define AL_EQUALIZER_MAX_MID1_GAIN (7.943f)
+#define AL_EQUALIZER_DEFAULT_MID1_GAIN (1.0f)
 
-#define AL_EQUALIZER_MIN_MID1_WIDTH              (0.01f)
-#define AL_EQUALIZER_MAX_MID1_WIDTH              (1.0f)
-#define AL_EQUALIZER_DEFAULT_MID1_WIDTH          (1.0f)
+#define AL_EQUALIZER_MIN_MID1_CENTER (200.0f)
+#define AL_EQUALIZER_MAX_MID1_CENTER (3000.0f)
+#define AL_EQUALIZER_DEFAULT_MID1_CENTER (500.0f)
 
-#define AL_EQUALIZER_MIN_MID2_GAIN               (0.126f)
-#define AL_EQUALIZER_MAX_MID2_GAIN               (7.943f)
-#define AL_EQUALIZER_DEFAULT_MID2_GAIN           (1.0f)
+#define AL_EQUALIZER_MIN_MID1_WIDTH (0.01f)
+#define AL_EQUALIZER_MAX_MID1_WIDTH (1.0f)
+#define AL_EQUALIZER_DEFAULT_MID1_WIDTH (1.0f)
 
-#define AL_EQUALIZER_MIN_MID2_CENTER             (1000.0f)
-#define AL_EQUALIZER_MAX_MID2_CENTER             (8000.0f)
-#define AL_EQUALIZER_DEFAULT_MID2_CENTER         (3000.0f)
+#define AL_EQUALIZER_MIN_MID2_GAIN (0.126f)
+#define AL_EQUALIZER_MAX_MID2_GAIN (7.943f)
+#define AL_EQUALIZER_DEFAULT_MID2_GAIN (1.0f)
 
-#define AL_EQUALIZER_MIN_MID2_WIDTH              (0.01f)
-#define AL_EQUALIZER_MAX_MID2_WIDTH              (1.0f)
-#define AL_EQUALIZER_DEFAULT_MID2_WIDTH          (1.0f)
+#define AL_EQUALIZER_MIN_MID2_CENTER (1000.0f)
+#define AL_EQUALIZER_MAX_MID2_CENTER (8000.0f)
+#define AL_EQUALIZER_DEFAULT_MID2_CENTER (3000.0f)
 
-#define AL_EQUALIZER_MIN_HIGH_GAIN               (0.126f)
-#define AL_EQUALIZER_MAX_HIGH_GAIN               (7.943f)
-#define AL_EQUALIZER_DEFAULT_HIGH_GAIN           (1.0f)
+#define AL_EQUALIZER_MIN_MID2_WIDTH (0.01f)
+#define AL_EQUALIZER_MAX_MID2_WIDTH (1.0f)
+#define AL_EQUALIZER_DEFAULT_MID2_WIDTH (1.0f)
 
-#define AL_EQUALIZER_MIN_HIGH_CUTOFF             (4000.0f)
-#define AL_EQUALIZER_MAX_HIGH_CUTOFF             (16000.0f)
-#define AL_EQUALIZER_DEFAULT_HIGH_CUTOFF         (6000.0f)
+#define AL_EQUALIZER_MIN_HIGH_GAIN (0.126f)
+#define AL_EQUALIZER_MAX_HIGH_GAIN (7.943f)
+#define AL_EQUALIZER_DEFAULT_HIGH_GAIN (1.0f)
 
+#define AL_EQUALIZER_MIN_HIGH_CUTOFF (4000.0f)
+#define AL_EQUALIZER_MAX_HIGH_CUTOFF (16000.0f)
+#define AL_EQUALIZER_DEFAULT_HIGH_CUTOFF (6000.0f)
 
 /* Source parameter value ranges and defaults. */
-#define AL_MIN_AIR_ABSORPTION_FACTOR             (0.0f)
-#define AL_MAX_AIR_ABSORPTION_FACTOR             (10.0f)
-#define AL_DEFAULT_AIR_ABSORPTION_FACTOR         (0.0f)
+#define AL_MIN_AIR_ABSORPTION_FACTOR (0.0f)
+#define AL_MAX_AIR_ABSORPTION_FACTOR (10.0f)
+#define AL_DEFAULT_AIR_ABSORPTION_FACTOR (0.0f)
 
-#define AL_MIN_ROOM_ROLLOFF_FACTOR               (0.0f)
-#define AL_MAX_ROOM_ROLLOFF_FACTOR               (10.0f)
-#define AL_DEFAULT_ROOM_ROLLOFF_FACTOR           (0.0f)
+#define AL_MIN_ROOM_ROLLOFF_FACTOR (0.0f)
+#define AL_MAX_ROOM_ROLLOFF_FACTOR (10.0f)
+#define AL_DEFAULT_ROOM_ROLLOFF_FACTOR (0.0f)
 
-#define AL_MIN_CONE_OUTER_GAINHF                 (0.0f)
-#define AL_MAX_CONE_OUTER_GAINHF                 (1.0f)
-#define AL_DEFAULT_CONE_OUTER_GAINHF             (1.0f)
+#define AL_MIN_CONE_OUTER_GAINHF (0.0f)
+#define AL_MAX_CONE_OUTER_GAINHF (1.0f)
+#define AL_DEFAULT_CONE_OUTER_GAINHF (1.0f)
 
-#define AL_MIN_DIRECT_FILTER_GAINHF_AUTO         AL_FALSE
-#define AL_MAX_DIRECT_FILTER_GAINHF_AUTO         AL_TRUE
-#define AL_DEFAULT_DIRECT_FILTER_GAINHF_AUTO     AL_TRUE
+#define AL_MIN_DIRECT_FILTER_GAINHF_AUTO AL_FALSE
+#define AL_MAX_DIRECT_FILTER_GAINHF_AUTO AL_TRUE
+#define AL_DEFAULT_DIRECT_FILTER_GAINHF_AUTO AL_TRUE
 
-#define AL_MIN_AUXILIARY_SEND_FILTER_GAIN_AUTO   AL_FALSE
-#define AL_MAX_AUXILIARY_SEND_FILTER_GAIN_AUTO   AL_TRUE
+#define AL_MIN_AUXILIARY_SEND_FILTER_GAIN_AUTO AL_FALSE
+#define AL_MAX_AUXILIARY_SEND_FILTER_GAIN_AUTO AL_TRUE
 #define AL_DEFAULT_AUXILIARY_SEND_FILTER_GAIN_AUTO AL_TRUE
 
 #define AL_MIN_AUXILIARY_SEND_FILTER_GAINHF_AUTO AL_FALSE
 #define AL_MAX_AUXILIARY_SEND_FILTER_GAINHF_AUTO AL_TRUE
 #define AL_DEFAULT_AUXILIARY_SEND_FILTER_GAINHF_AUTO AL_TRUE
 
-
 /* Listener parameter value ranges and defaults. */
-#define AL_MIN_METERS_PER_UNIT                   FLT_MIN
-#define AL_MAX_METERS_PER_UNIT                   FLT_MAX
-#define AL_DEFAULT_METERS_PER_UNIT               (1.0f)
-
+#define AL_MIN_METERS_PER_UNIT FLT_MIN
+#define AL_MAX_METERS_PER_UNIT FLT_MAX
+#define AL_DEFAULT_METERS_PER_UNIT (1.0f)
 
 #ifdef __cplusplus
-}  /* extern "C" */
+} /* extern "C" */
 #endif
 
 #endif /* AL_EFX_H */
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp
index 997b4e30c6..74b4fcaad0 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.cpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp
@@ -2,8 +2,8 @@
 
 #include <memory>
 
-#include <stdexcept>
 #include <algorithm>
+#include <stdexcept>
 
 #include <components/debug/debuglog.hpp>
 #include <components/vfs/manager.hpp>
@@ -11,463 +11,463 @@
 namespace MWSound
 {
 
-int FFmpeg_Decoder::readPacket(void *user_data, uint8_t *buf, int buf_size)
-{
-    try
+    int FFmpeg_Decoder::readPacket(void* user_data, uint8_t* buf, int buf_size)
     {
-        std::istream& stream = *static_cast<FFmpeg_Decoder*>(user_data)->mDataStream;
-        stream.clear();
-        stream.read((char*)buf, buf_size);
-        std::streamsize count = stream.gcount();
-        if (count == 0)
-            return AVERROR_EOF;
-        return count;
-    }
-    catch (std::exception& )
-    {
-        return AVERROR_UNKNOWN;
+        try
+        {
+            std::istream& stream = *static_cast<FFmpeg_Decoder*>(user_data)->mDataStream;
+            stream.clear();
+            stream.read((char*)buf, buf_size);
+            std::streamsize count = stream.gcount();
+            if (count == 0)
+                return AVERROR_EOF;
+            return count;
+        }
+        catch (std::exception&)
+        {
+            return AVERROR_UNKNOWN;
+        }
     }
-}
-
-int FFmpeg_Decoder::writePacket(void *, uint8_t *, int)
-{
-    Log(Debug::Error) << "can't write to read-only stream";
-    return -1;
-}
-
-int64_t FFmpeg_Decoder::seek(void *user_data, int64_t offset, int whence)
-{
-    std::istream& stream = *static_cast<FFmpeg_Decoder*>(user_data)->mDataStream;
-
-    whence &= ~AVSEEK_FORCE;
-
-    stream.clear();
 
-    if(whence == AVSEEK_SIZE)
+    int FFmpeg_Decoder::writePacket(void*, uint8_t*, int)
     {
-        size_t prev = stream.tellg();
-        stream.seekg(0, std::ios_base::end);
-        size_t size = stream.tellg();
-        stream.seekg(prev, std::ios_base::beg);
-        return size;
-    }
-
-    if(whence == SEEK_SET)
-        stream.seekg(offset, std::ios_base::beg);
-    else if(whence == SEEK_CUR)
-        stream.seekg(offset, std::ios_base::cur);
-    else if(whence == SEEK_END)
-        stream.seekg(offset, std::ios_base::end);
-    else
+        Log(Debug::Error) << "can't write to read-only stream";
         return -1;
+    }
 
-    return stream.tellg();
-}
+    int64_t FFmpeg_Decoder::seek(void* user_data, int64_t offset, int whence)
+    {
+        std::istream& stream = *static_cast<FFmpeg_Decoder*>(user_data)->mDataStream;
 
+        whence &= ~AVSEEK_FORCE;
 
-/* Used by getAV*Data to search for more compressed data, and buffer it in the
- * correct stream. It won't buffer data for streams that the app doesn't have a
- * handle for. */
-bool FFmpeg_Decoder::getNextPacket()
-{
-    if(!mStream)
-        return false;
+        stream.clear();
 
-    int stream_idx = mStream - mFormatCtx->streams;
-    while(av_read_frame(mFormatCtx, &mPacket) >= 0)
-    {
-        /* Check if the packet belongs to this stream */
-        if(stream_idx == mPacket.stream_index)
+        if (whence == AVSEEK_SIZE)
         {
-            if(mPacket.pts != (int64_t)AV_NOPTS_VALUE)
-                mNextPts = av_q2d((*mStream)->time_base)*mPacket.pts;
-            return true;
+            size_t prev = stream.tellg();
+            stream.seekg(0, std::ios_base::end);
+            size_t size = stream.tellg();
+            stream.seekg(prev, std::ios_base::beg);
+            return size;
         }
 
-        /* Free the packet and look for another */
-        av_packet_unref(&mPacket);
-    }
-
-    return false;
-}
+        if (whence == SEEK_SET)
+            stream.seekg(offset, std::ios_base::beg);
+        else if (whence == SEEK_CUR)
+            stream.seekg(offset, std::ios_base::cur);
+        else if (whence == SEEK_END)
+            stream.seekg(offset, std::ios_base::end);
+        else
+            return -1;
 
-bool FFmpeg_Decoder::getAVAudioData()
-{
-    bool got_frame = false;
+        return stream.tellg();
+    }
 
-    if(mCodecCtx->codec_type != AVMEDIA_TYPE_AUDIO)
-        return false;
+    /* Used by getAV*Data to search for more compressed data, and buffer it in the
+     * correct stream. It won't buffer data for streams that the app doesn't have a
+     * handle for. */
+    bool FFmpeg_Decoder::getNextPacket()
+    {
+        if (!mStream)
+            return false;
 
-    do {
-        /* Decode some data, and check for errors */
-        int ret = avcodec_receive_frame(mCodecCtx, mFrame);
-        if (ret == AVERROR(EAGAIN))
+        int stream_idx = mStream - mFormatCtx->streams;
+        while (av_read_frame(mFormatCtx, &mPacket) >= 0)
         {
-            if (mPacket.size == 0 && !getNextPacket())
-                return false;
-            ret = avcodec_send_packet(mCodecCtx, &mPacket);
+            /* Check if the packet belongs to this stream */
+            if (stream_idx == mPacket.stream_index)
+            {
+                if (mPacket.pts != (int64_t)AV_NOPTS_VALUE)
+                    mNextPts = av_q2d((*mStream)->time_base) * mPacket.pts;
+                return true;
+            }
+
+            /* Free the packet and look for another */
             av_packet_unref(&mPacket);
-            if (ret == 0)
-                continue;
         }
-        if (ret != 0)
-            return false;
 
-        av_packet_unref(&mPacket);
+        return false;
+    }
 
-        if (mFrame->nb_samples == 0)
-            continue;
-        got_frame = true;
+    bool FFmpeg_Decoder::getAVAudioData()
+    {
+        bool got_frame = false;
+
+        if (mCodecCtx->codec_type != AVMEDIA_TYPE_AUDIO)
+            return false;
 
-        if(mSwr)
+        do
         {
-            if(!mDataBuf || mDataBufLen < mFrame->nb_samples)
+            /* Decode some data, and check for errors */
+            int ret = avcodec_receive_frame(mCodecCtx, mFrame);
+            if (ret == AVERROR(EAGAIN))
             {
-                av_freep(&mDataBuf);
-                if(av_samples_alloc(&mDataBuf, nullptr, av_get_channel_layout_nb_channels(mOutputChannelLayout),
-                                    mFrame->nb_samples, mOutputSampleFormat, 0) < 0)
+                if (mPacket.size == 0 && !getNextPacket())
                     return false;
-                else
-                    mDataBufLen = mFrame->nb_samples;
+                ret = avcodec_send_packet(mCodecCtx, &mPacket);
+                av_packet_unref(&mPacket);
+                if (ret == 0)
+                    continue;
             }
+            if (ret != 0)
+                return false;
 
-            if(swr_convert(mSwr, (uint8_t**)&mDataBuf, mFrame->nb_samples,
-                (const uint8_t**)mFrame->extended_data, mFrame->nb_samples) < 0)
+            av_packet_unref(&mPacket);
+
+            if (mFrame->nb_samples == 0)
+                continue;
+            got_frame = true;
+
+            if (mSwr)
             {
-                return false;
-            }
-            mFrameData = &mDataBuf;
-        }
-        else
-            mFrameData = &mFrame->data[0];
+                if (!mDataBuf || mDataBufLen < mFrame->nb_samples)
+                {
+                    av_freep(&mDataBuf);
+                    if (av_samples_alloc(&mDataBuf, nullptr, av_get_channel_layout_nb_channels(mOutputChannelLayout),
+                            mFrame->nb_samples, mOutputSampleFormat, 0)
+                        < 0)
+                        return false;
+                    else
+                        mDataBufLen = mFrame->nb_samples;
+                }
 
-    } while(!got_frame);
-    mNextPts += (double)mFrame->nb_samples / mCodecCtx->sample_rate;
+                if (swr_convert(mSwr, (uint8_t**)&mDataBuf, mFrame->nb_samples, (const uint8_t**)mFrame->extended_data,
+                        mFrame->nb_samples)
+                    < 0)
+                {
+                    return false;
+                }
+                mFrameData = &mDataBuf;
+            }
+            else
+                mFrameData = &mFrame->data[0];
 
-    return true;
-}
+        } while (!got_frame);
+        mNextPts += (double)mFrame->nb_samples / mCodecCtx->sample_rate;
 
-size_t FFmpeg_Decoder::readAVAudioData(void *data, size_t length)
-{
-    size_t dec = 0;
+        return true;
+    }
 
-    while(dec < length)
+    size_t FFmpeg_Decoder::readAVAudioData(void* data, size_t length)
     {
-        /* If there's no decoded data, find some */
-        if(mFramePos >= mFrameSize)
+        size_t dec = 0;
+
+        while (dec < length)
         {
-            if(!getAVAudioData())
-                break;
-            mFramePos = 0;
-            mFrameSize = mFrame->nb_samples * av_get_channel_layout_nb_channels(mOutputChannelLayout) *
-                         av_get_bytes_per_sample(mOutputSampleFormat);
-        }
+            /* If there's no decoded data, find some */
+            if (mFramePos >= mFrameSize)
+            {
+                if (!getAVAudioData())
+                    break;
+                mFramePos = 0;
+                mFrameSize = mFrame->nb_samples * av_get_channel_layout_nb_channels(mOutputChannelLayout)
+                    * av_get_bytes_per_sample(mOutputSampleFormat);
+            }
 
-        /* Get the amount of bytes remaining to be written, and clamp to
-         * the amount of decoded data we have */
-        size_t rem = std::min<size_t>(length-dec, mFrameSize-mFramePos);
+            /* Get the amount of bytes remaining to be written, and clamp to
+             * the amount of decoded data we have */
+            size_t rem = std::min<size_t>(length - dec, mFrameSize - mFramePos);
 
-        /* Copy the data to the app's buffer and increment */
-        memcpy(data, mFrameData[0]+mFramePos, rem);
-        data = (char*)data + rem;
-        dec += rem;
-        mFramePos += rem;
-    }
+            /* Copy the data to the app's buffer and increment */
+            memcpy(data, mFrameData[0] + mFramePos, rem);
+            data = (char*)data + rem;
+            dec += rem;
+            mFramePos += rem;
+        }
 
-    /* Return the number of bytes we were able to get */
-    return dec;
-}
+        /* Return the number of bytes we were able to get */
+        return dec;
+    }
 
-void FFmpeg_Decoder::open(const std::string &fname)
-{
-    close();
-    mDataStream = mResourceMgr->get(fname);
+    void FFmpeg_Decoder::open(const std::string& fname)
+    {
+        close();
+        mDataStream = mResourceMgr->get(fname);
 
-    if((mFormatCtx=avformat_alloc_context()) == nullptr)
-        throw std::runtime_error("Failed to allocate context");
+        if ((mFormatCtx = avformat_alloc_context()) == nullptr)
+            throw std::runtime_error("Failed to allocate context");
 
-    try
-    {
-        mFormatCtx->pb = avio_alloc_context(nullptr, 0, 0, this, readPacket, writePacket, seek);
-        if(!mFormatCtx->pb || avformat_open_input(&mFormatCtx, fname.c_str(), nullptr, nullptr) != 0)
+        try
         {
-            // "Note that a user-supplied AVFormatContext will be freed on failure".
-            if (mFormatCtx)
+            mFormatCtx->pb = avio_alloc_context(nullptr, 0, 0, this, readPacket, writePacket, seek);
+            if (!mFormatCtx->pb || avformat_open_input(&mFormatCtx, fname.c_str(), nullptr, nullptr) != 0)
             {
-                if (mFormatCtx->pb != nullptr)
+                // "Note that a user-supplied AVFormatContext will be freed on failure".
+                if (mFormatCtx)
                 {
-                    if (mFormatCtx->pb->buffer != nullptr)
+                    if (mFormatCtx->pb != nullptr)
                     {
-                        av_free(mFormatCtx->pb->buffer);
-                        mFormatCtx->pb->buffer = nullptr;
+                        if (mFormatCtx->pb->buffer != nullptr)
+                        {
+                            av_free(mFormatCtx->pb->buffer);
+                            mFormatCtx->pb->buffer = nullptr;
+                        }
+                        av_free(mFormatCtx->pb);
+                        mFormatCtx->pb = nullptr;
                     }
-                    av_free(mFormatCtx->pb);
-                    mFormatCtx->pb = nullptr;
+                    avformat_free_context(mFormatCtx);
                 }
-                avformat_free_context(mFormatCtx);
+                mFormatCtx = nullptr;
+                throw std::runtime_error("Failed to allocate input stream");
             }
-            mFormatCtx = nullptr;
-            throw std::runtime_error("Failed to allocate input stream");
-        }
 
-        if(avformat_find_stream_info(mFormatCtx, nullptr) < 0)
-            throw std::runtime_error("Failed to find stream info in "+fname);
+            if (avformat_find_stream_info(mFormatCtx, nullptr) < 0)
+                throw std::runtime_error("Failed to find stream info in " + fname);
 
-        for(size_t j = 0;j < mFormatCtx->nb_streams;j++)
-        {
-            if(mFormatCtx->streams[j]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
+            for (size_t j = 0; j < mFormatCtx->nb_streams; j++)
             {
-                mStream = &mFormatCtx->streams[j];
-                break;
+                if (mFormatCtx->streams[j]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
+                {
+                    mStream = &mFormatCtx->streams[j];
+                    break;
+                }
             }
-        }
-        if(!mStream)
-            throw std::runtime_error("No audio streams in "+fname);
+            if (!mStream)
+                throw std::runtime_error("No audio streams in " + fname);
 
-        const AVCodec *codec = avcodec_find_decoder((*mStream)->codecpar->codec_id);
-        if(!codec)
-        {
-            std::string ss = "No codec found for id " +
-                                std::to_string((*mStream)->codecpar->codec_id);
-            throw std::runtime_error(ss);
-        }
+            const AVCodec* codec = avcodec_find_decoder((*mStream)->codecpar->codec_id);
+            if (!codec)
+            {
+                std::string ss = "No codec found for id " + std::to_string((*mStream)->codecpar->codec_id);
+                throw std::runtime_error(ss);
+            }
 
-        AVCodecContext *avctx = avcodec_alloc_context3(codec);
-        avcodec_parameters_to_context(avctx, (*mStream)->codecpar);
+            AVCodecContext* avctx = avcodec_alloc_context3(codec);
+            avcodec_parameters_to_context(avctx, (*mStream)->codecpar);
 
 // This is not needed anymore above FFMpeg version 4.0
 #if LIBAVCODEC_VERSION_INT < 3805796
-        av_codec_set_pkt_timebase(avctx, (*mStream)->time_base);
+            av_codec_set_pkt_timebase(avctx, (*mStream)->time_base);
 #endif
 
-        mCodecCtx = avctx;
+            mCodecCtx = avctx;
 
-        if(avcodec_open2(mCodecCtx, codec, nullptr) < 0)
-            throw std::runtime_error(std::string("Failed to open audio codec ") + codec->long_name);
+            if (avcodec_open2(mCodecCtx, codec, nullptr) < 0)
+                throw std::runtime_error(std::string("Failed to open audio codec ") + codec->long_name);
 
-        mFrame = av_frame_alloc();
+            mFrame = av_frame_alloc();
 
-        if(mCodecCtx->sample_fmt == AV_SAMPLE_FMT_FLT || mCodecCtx->sample_fmt == AV_SAMPLE_FMT_FLTP)
-            mOutputSampleFormat = AV_SAMPLE_FMT_S16; // FIXME: Check for AL_EXT_FLOAT32 support
-        else if(mCodecCtx->sample_fmt == AV_SAMPLE_FMT_U8P)
-            mOutputSampleFormat = AV_SAMPLE_FMT_U8;
-        else if(mCodecCtx->sample_fmt == AV_SAMPLE_FMT_S16P)
-            mOutputSampleFormat = AV_SAMPLE_FMT_S16;
-        else
-            mOutputSampleFormat = AV_SAMPLE_FMT_S16;
+            if (mCodecCtx->sample_fmt == AV_SAMPLE_FMT_FLT || mCodecCtx->sample_fmt == AV_SAMPLE_FMT_FLTP)
+                mOutputSampleFormat = AV_SAMPLE_FMT_S16; // FIXME: Check for AL_EXT_FLOAT32 support
+            else if (mCodecCtx->sample_fmt == AV_SAMPLE_FMT_U8P)
+                mOutputSampleFormat = AV_SAMPLE_FMT_U8;
+            else if (mCodecCtx->sample_fmt == AV_SAMPLE_FMT_S16P)
+                mOutputSampleFormat = AV_SAMPLE_FMT_S16;
+            else
+                mOutputSampleFormat = AV_SAMPLE_FMT_S16;
 
-        mOutputChannelLayout = (*mStream)->codecpar->channel_layout;
-        if(mOutputChannelLayout == 0)
-            mOutputChannelLayout = av_get_default_channel_layout(mCodecCtx->channels);
+            mOutputChannelLayout = (*mStream)->codecpar->channel_layout;
+            if (mOutputChannelLayout == 0)
+                mOutputChannelLayout = av_get_default_channel_layout(mCodecCtx->channels);
 
-        mCodecCtx->channel_layout = mOutputChannelLayout;
-    }
-    catch(...)
-    {
-        if(mStream)
-            avcodec_free_context(&mCodecCtx);
-        mStream = nullptr;
-
-        if (mFormatCtx != nullptr)
+            mCodecCtx->channel_layout = mOutputChannelLayout;
+        }
+        catch (...)
         {
-            if (mFormatCtx->pb->buffer != nullptr)
+            if (mStream)
+                avcodec_free_context(&mCodecCtx);
+            mStream = nullptr;
+
+            if (mFormatCtx != nullptr)
             {
-                av_free(mFormatCtx->pb->buffer);
-                mFormatCtx->pb->buffer = nullptr;
-            }
-            av_free(mFormatCtx->pb);
-            mFormatCtx->pb = nullptr;
+                if (mFormatCtx->pb->buffer != nullptr)
+                {
+                    av_free(mFormatCtx->pb->buffer);
+                    mFormatCtx->pb->buffer = nullptr;
+                }
+                av_free(mFormatCtx->pb);
+                mFormatCtx->pb = nullptr;
 
-            avformat_close_input(&mFormatCtx);
+                avformat_close_input(&mFormatCtx);
+            }
         }
     }
-}
 
-void FFmpeg_Decoder::close()
-{
-    if(mStream)
-        avcodec_free_context(&mCodecCtx);
-    mStream = nullptr;
+    void FFmpeg_Decoder::close()
+    {
+        if (mStream)
+            avcodec_free_context(&mCodecCtx);
+        mStream = nullptr;
 
-    av_packet_unref(&mPacket);
-    av_freep(&mDataBuf);
-    av_frame_free(&mFrame);
-    swr_free(&mSwr);
+        av_packet_unref(&mPacket);
+        av_freep(&mDataBuf);
+        av_frame_free(&mFrame);
+        swr_free(&mSwr);
 
-    if(mFormatCtx)
-    {
-        if (mFormatCtx->pb != nullptr)
+        if (mFormatCtx)
         {
-            // mFormatCtx->pb->buffer must be freed by hand,
-            // if not, valgrind will show memleak, see:
-            //
-            // https://trac.ffmpeg.org/ticket/1357
-            //
-            if (mFormatCtx->pb->buffer != nullptr)
+            if (mFormatCtx->pb != nullptr)
             {
-                av_freep(&mFormatCtx->pb->buffer);
-            }
+                // mFormatCtx->pb->buffer must be freed by hand,
+                // if not, valgrind will show memleak, see:
+                //
+                // https://trac.ffmpeg.org/ticket/1357
+                //
+                if (mFormatCtx->pb->buffer != nullptr)
+                {
+                    av_freep(&mFormatCtx->pb->buffer);
+                }
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 80, 100)
-            avio_context_free(&mFormatCtx->pb);
+                avio_context_free(&mFormatCtx->pb);
 #else
-            av_freep(&mFormatCtx->pb);
+                av_freep(&mFormatCtx->pb);
 #endif
+            }
+            avformat_close_input(&mFormatCtx);
         }
-        avformat_close_input(&mFormatCtx);
-    }
 
-    mDataStream.reset();
-}
+        mDataStream.reset();
+    }
 
-std::string FFmpeg_Decoder::getName()
-{
+    std::string FFmpeg_Decoder::getName()
+    {
 // In the FFMpeg 4.0 a "filename" field was replaced by "url"
 #if LIBAVCODEC_VERSION_INT < 3805796
-    return mFormatCtx->filename;
+        return mFormatCtx->filename;
 #else
-    return mFormatCtx->url;
+        return mFormatCtx->url;
 #endif
-}
-
-void FFmpeg_Decoder::getInfo(int *samplerate, ChannelConfig *chans, SampleType *type)
-{
-    if(!mStream)
-        throw std::runtime_error("No audio stream info");
-
-    if(mOutputSampleFormat == AV_SAMPLE_FMT_U8)
-        *type = SampleType_UInt8;
-    else if(mOutputSampleFormat == AV_SAMPLE_FMT_S16)
-        *type = SampleType_Int16;
-    else if(mOutputSampleFormat == AV_SAMPLE_FMT_FLT)
-        *type = SampleType_Float32;
-    else
-    {
-        mOutputSampleFormat = AV_SAMPLE_FMT_S16;
-        *type = SampleType_Int16;
     }
 
-    if(mOutputChannelLayout == AV_CH_LAYOUT_MONO)
-        *chans = ChannelConfig_Mono;
-    else if(mOutputChannelLayout == AV_CH_LAYOUT_STEREO)
-        *chans = ChannelConfig_Stereo;
-    else if(mOutputChannelLayout == AV_CH_LAYOUT_QUAD)
-        *chans = ChannelConfig_Quad;
-    else if(mOutputChannelLayout == AV_CH_LAYOUT_5POINT1)
-        *chans = ChannelConfig_5point1;
-    else if(mOutputChannelLayout == AV_CH_LAYOUT_7POINT1)
-        *chans = ChannelConfig_7point1;
-    else
+    void FFmpeg_Decoder::getInfo(int* samplerate, ChannelConfig* chans, SampleType* type)
     {
-        char str[1024];
-        av_get_channel_layout_string(str, sizeof(str), mCodecCtx->channels, mCodecCtx->channel_layout);
-        Log(Debug::Error) << "Unsupported channel layout: "<< str;
-
-        if(mCodecCtx->channels == 1)
+        if (!mStream)
+            throw std::runtime_error("No audio stream info");
+
+        if (mOutputSampleFormat == AV_SAMPLE_FMT_U8)
+            *type = SampleType_UInt8;
+        else if (mOutputSampleFormat == AV_SAMPLE_FMT_S16)
+            *type = SampleType_Int16;
+        else if (mOutputSampleFormat == AV_SAMPLE_FMT_FLT)
+            *type = SampleType_Float32;
+        else
         {
-            mOutputChannelLayout = AV_CH_LAYOUT_MONO;
-            *chans = ChannelConfig_Mono;
+            mOutputSampleFormat = AV_SAMPLE_FMT_S16;
+            *type = SampleType_Int16;
         }
+
+        if (mOutputChannelLayout == AV_CH_LAYOUT_MONO)
+            *chans = ChannelConfig_Mono;
+        else if (mOutputChannelLayout == AV_CH_LAYOUT_STEREO)
+            *chans = ChannelConfig_Stereo;
+        else if (mOutputChannelLayout == AV_CH_LAYOUT_QUAD)
+            *chans = ChannelConfig_Quad;
+        else if (mOutputChannelLayout == AV_CH_LAYOUT_5POINT1)
+            *chans = ChannelConfig_5point1;
+        else if (mOutputChannelLayout == AV_CH_LAYOUT_7POINT1)
+            *chans = ChannelConfig_7point1;
         else
         {
-            mOutputChannelLayout = AV_CH_LAYOUT_STEREO;
-            *chans = ChannelConfig_Stereo;
+            char str[1024];
+            av_get_channel_layout_string(str, sizeof(str), mCodecCtx->channels, mCodecCtx->channel_layout);
+            Log(Debug::Error) << "Unsupported channel layout: " << str;
+
+            if (mCodecCtx->channels == 1)
+            {
+                mOutputChannelLayout = AV_CH_LAYOUT_MONO;
+                *chans = ChannelConfig_Mono;
+            }
+            else
+            {
+                mOutputChannelLayout = AV_CH_LAYOUT_STEREO;
+                *chans = ChannelConfig_Stereo;
+            }
         }
-    }
 
-    *samplerate = mCodecCtx->sample_rate;
-    int64_t ch_layout = mCodecCtx->channel_layout;
-    if(ch_layout == 0)
-        ch_layout = av_get_default_channel_layout(mCodecCtx->channels);
+        *samplerate = mCodecCtx->sample_rate;
+        int64_t ch_layout = mCodecCtx->channel_layout;
+        if (ch_layout == 0)
+            ch_layout = av_get_default_channel_layout(mCodecCtx->channels);
 
-    if(mOutputSampleFormat != mCodecCtx->sample_fmt ||
-       mOutputChannelLayout != ch_layout)
-    {
-        mSwr = swr_alloc_set_opts(mSwr,                   // SwrContext
-                          mOutputChannelLayout,           // output ch layout
-                          mOutputSampleFormat,            // output sample format
-                          mCodecCtx->sample_rate, // output sample rate
-                          ch_layout,                      // input ch layout
-                          mCodecCtx->sample_fmt,         // input sample format
-                          mCodecCtx->sample_rate, // input sample rate
-                          0,                              // logging level offset
-                          nullptr);                          // log context
-        if(!mSwr)
-            throw std::runtime_error("Couldn't allocate SwrContext");
-        int init=swr_init(mSwr);
-        if(init < 0)
-            throw std::runtime_error("Couldn't initialize SwrContext: "+std::to_string(init));
+        if (mOutputSampleFormat != mCodecCtx->sample_fmt || mOutputChannelLayout != ch_layout)
+        {
+            mSwr = swr_alloc_set_opts(mSwr, // SwrContext
+                mOutputChannelLayout, // output ch layout
+                mOutputSampleFormat, // output sample format
+                mCodecCtx->sample_rate, // output sample rate
+                ch_layout, // input ch layout
+                mCodecCtx->sample_fmt, // input sample format
+                mCodecCtx->sample_rate, // input sample rate
+                0, // logging level offset
+                nullptr); // log context
+            if (!mSwr)
+                throw std::runtime_error("Couldn't allocate SwrContext");
+            int init = swr_init(mSwr);
+            if (init < 0)
+                throw std::runtime_error("Couldn't initialize SwrContext: " + std::to_string(init));
+        }
     }
-}
 
-size_t FFmpeg_Decoder::read(char *buffer, size_t bytes)
-{
-    if(!mStream)
+    size_t FFmpeg_Decoder::read(char* buffer, size_t bytes)
     {
-        Log(Debug::Error) << "No audio stream";
-        return 0;
+        if (!mStream)
+        {
+            Log(Debug::Error) << "No audio stream";
+            return 0;
+        }
+        return readAVAudioData(buffer, bytes);
     }
-    return readAVAudioData(buffer, bytes);
-}
 
-void FFmpeg_Decoder::readAll(std::vector<char> &output)
-{
-    if(!mStream)
+    void FFmpeg_Decoder::readAll(std::vector<char>& output)
     {
-        Log(Debug::Error) << "No audio stream";
-        return;
+        if (!mStream)
+        {
+            Log(Debug::Error) << "No audio stream";
+            return;
+        }
+
+        while (getAVAudioData())
+        {
+            size_t got = mFrame->nb_samples * av_get_channel_layout_nb_channels(mOutputChannelLayout)
+                * av_get_bytes_per_sample(mOutputSampleFormat);
+            const char* inbuf = reinterpret_cast<char*>(mFrameData[0]);
+            output.insert(output.end(), inbuf, inbuf + got);
+        }
     }
 
-    while(getAVAudioData())
+    size_t FFmpeg_Decoder::getSampleOffset()
     {
-        size_t got = mFrame->nb_samples * av_get_channel_layout_nb_channels(mOutputChannelLayout) *
-                     av_get_bytes_per_sample(mOutputSampleFormat);
-        const char *inbuf = reinterpret_cast<char*>(mFrameData[0]);
-        output.insert(output.end(), inbuf, inbuf+got);
+        int delay = (mFrameSize - mFramePos) / av_get_channel_layout_nb_channels(mOutputChannelLayout)
+            / av_get_bytes_per_sample(mOutputSampleFormat);
+        return (int)(mNextPts * mCodecCtx->sample_rate) - delay;
     }
-}
-
-size_t FFmpeg_Decoder::getSampleOffset()
-{
-    int delay = (mFrameSize-mFramePos) / av_get_channel_layout_nb_channels(mOutputChannelLayout) /
-                av_get_bytes_per_sample(mOutputSampleFormat);
-    return (int)(mNextPts*mCodecCtx->sample_rate) - delay;
-}
 
-FFmpeg_Decoder::FFmpeg_Decoder(const VFS::Manager* vfs)
-  : Sound_Decoder(vfs)
-  , mFormatCtx(nullptr)
-  , mCodecCtx(nullptr)
-  , mStream(nullptr)
-  , mFrame(nullptr)
-  , mFrameSize(0)
-  , mFramePos(0)
-  , mNextPts(0.0)
-  , mSwr(nullptr)
-  , mOutputSampleFormat(AV_SAMPLE_FMT_NONE)
-  , mOutputChannelLayout(0)
-  , mDataBuf(nullptr)
-  , mFrameData(nullptr)
-  , mDataBufLen(0)
-{
-    memset(&mPacket, 0, sizeof(mPacket));
-
-    /* We need to make sure ffmpeg is initialized. Optionally silence warning
-     * output from the lib */
-    static bool done_init = false;
-    if(!done_init)
+    FFmpeg_Decoder::FFmpeg_Decoder(const VFS::Manager* vfs)
+        : Sound_Decoder(vfs)
+        , mFormatCtx(nullptr)
+        , mCodecCtx(nullptr)
+        , mStream(nullptr)
+        , mFrame(nullptr)
+        , mFrameSize(0)
+        , mFramePos(0)
+        , mNextPts(0.0)
+        , mSwr(nullptr)
+        , mOutputSampleFormat(AV_SAMPLE_FMT_NONE)
+        , mOutputChannelLayout(0)
+        , mDataBuf(nullptr)
+        , mFrameData(nullptr)
+        , mDataBufLen(0)
     {
+        memset(&mPacket, 0, sizeof(mPacket));
+
+        /* We need to make sure ffmpeg is initialized. Optionally silence warning
+         * output from the lib */
+        static bool done_init = false;
+        if (!done_init)
+        {
 // This is not needed anymore above FFMpeg version 4.0
 #if LIBAVCODEC_VERSION_INT < 3805796
-        av_register_all();
+            av_register_all();
 #endif
-        av_log_set_level(AV_LOG_ERROR);
-        done_init = true;
+            av_log_set_level(AV_LOG_ERROR);
+            done_init = true;
+        }
     }
-}
 
-FFmpeg_Decoder::~FFmpeg_Decoder()
-{
-    close();
-}
+    FFmpeg_Decoder::~FFmpeg_Decoder()
+    {
+        close();
+    }
 
 }
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.hpp b/apps/openmw/mwsound/ffmpeg_decoder.hpp
index c51639a972..88dd3316f5 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.hpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.hpp
@@ -4,8 +4,8 @@
 #include <cstdint>
 
 #if defined(_MSC_VER)
-    #pragma warning (push)
-    #pragma warning (disable : 4244)
+#pragma warning(push)
+#pragma warning(disable : 4244)
 #endif
 
 extern "C"
@@ -21,7 +21,7 @@ extern "C"
 }
 
 #if defined(_MSC_VER)
-    #pragma warning (pop)
+#pragma warning(pop)
 #endif
 
 #include <components/files/istreamptr.hpp>
@@ -30,53 +30,52 @@ extern "C"
 
 #include "sound_decoder.hpp"
 
-
 namespace MWSound
 {
     class FFmpeg_Decoder final : public Sound_Decoder
     {
-        AVFormatContext *mFormatCtx;
-        AVCodecContext *mCodecCtx;
-        AVStream **mStream;
+        AVFormatContext* mFormatCtx;
+        AVCodecContext* mCodecCtx;
+        AVStream** mStream;
 
         AVPacket mPacket;
-        AVFrame *mFrame;
+        AVFrame* mFrame;
 
         int mFrameSize;
         int mFramePos;
 
         double mNextPts;
 
-        SwrContext *mSwr;
+        SwrContext* mSwr;
         enum AVSampleFormat mOutputSampleFormat;
         int64_t mOutputChannelLayout;
-        uint8_t *mDataBuf;
-        uint8_t **mFrameData;
+        uint8_t* mDataBuf;
+        uint8_t** mFrameData;
         int mDataBufLen;
 
         bool getNextPacket();
 
         Files::IStreamPtr mDataStream;
 
-        static int readPacket(void *user_data, uint8_t *buf, int buf_size);
-        static int writePacket(void *user_data, uint8_t *buf, int buf_size);
-        static int64_t seek(void *user_data, int64_t offset, int whence);
+        static int readPacket(void* user_data, uint8_t* buf, int buf_size);
+        static int writePacket(void* user_data, uint8_t* buf, int buf_size);
+        static int64_t seek(void* user_data, int64_t offset, int whence);
 
         bool getAVAudioData();
-        size_t readAVAudioData(void *data, size_t length);
+        size_t readAVAudioData(void* data, size_t length);
 
-        void open(const std::string &fname) override;
+        void open(const std::string& fname) override;
         void close() override;
 
         std::string getName() override;
-        void getInfo(int *samplerate, ChannelConfig *chans, SampleType *type) override;
+        void getInfo(int* samplerate, ChannelConfig* chans, SampleType* type) override;
 
-        size_t read(char *buffer, size_t bytes) override;
-        void readAll(std::vector<char> &output) override;
+        size_t read(char* buffer, size_t bytes) override;
+        void readAll(std::vector<char>& output) override;
         size_t getSampleOffset() override;
 
-        FFmpeg_Decoder& operator=(const FFmpeg_Decoder &rhs);
-        FFmpeg_Decoder(const FFmpeg_Decoder &rhs);
+        FFmpeg_Decoder& operator=(const FFmpeg_Decoder& rhs);
+        FFmpeg_Decoder(const FFmpeg_Decoder& rhs);
 
     public:
         explicit FFmpeg_Decoder(const VFS::Manager* vfs);
diff --git a/apps/openmw/mwsound/loudness.cpp b/apps/openmw/mwsound/loudness.cpp
index ac44d1b40e..6a5c14730f 100644
--- a/apps/openmw/mwsound/loudness.cpp
+++ b/apps/openmw/mwsound/loudness.cpp
@@ -1,71 +1,69 @@
 #include "loudness.hpp"
 
+#include <algorithm>
 #include <cstdint>
 #include <limits>
-#include <algorithm>
 
 #include "soundmanagerimp.hpp"
 
 namespace MWSound
 {
 
-void Sound_Loudness::analyzeLoudness(const std::vector< char >& data)
-{
-    mQueue.insert( mQueue.end(), data.begin(), data.end() );
-    if (!mQueue.size())
-        return;
-
-    int samplesPerSegment = static_cast<int>(mSampleRate / mSamplesPerSec);
-    int numSamples = bytesToFrames(mQueue.size(), mChannelConfig, mSampleType);
-    int advance = framesToBytes(1, mChannelConfig, mSampleType);
+    void Sound_Loudness::analyzeLoudness(const std::vector<char>& data)
+    {
+        mQueue.insert(mQueue.end(), data.begin(), data.end());
+        if (!mQueue.size())
+            return;
 
+        int samplesPerSegment = static_cast<int>(mSampleRate / mSamplesPerSec);
+        int numSamples = bytesToFrames(mQueue.size(), mChannelConfig, mSampleType);
+        int advance = framesToBytes(1, mChannelConfig, mSampleType);
 
-    int segment=0;
-    int sample=0;
-    while (segment < numSamples/samplesPerSegment)
-    {
-        float sum=0;
-        int samplesAdded = 0;
-        while (sample < numSamples && sample < (segment+1)*samplesPerSegment)
+        int segment = 0;
+        int sample = 0;
+        while (segment < numSamples / samplesPerSegment)
         {
-            // get sample on a scale from -1 to 1
-            float value = 0;
-            if (mSampleType == SampleType_UInt8)
-                value = ((char)(mQueue[sample*advance]^0x80))/128.f;
-            else if (mSampleType == SampleType_Int16)
-            {
-                value = *reinterpret_cast<const int16_t*>(&mQueue[sample*advance]);
-                value /= float(std::numeric_limits<int16_t>::max());
-            }
-            else if (mSampleType == SampleType_Float32)
+            float sum = 0;
+            int samplesAdded = 0;
+            while (sample < numSamples && sample < (segment + 1) * samplesPerSegment)
             {
-                value = *reinterpret_cast<const float*>(&mQueue[sample*advance]);
-                value = std::clamp(value, -1.f, 1.f); // Float samples *should* be scaled to [-1,1] already.
+                // get sample on a scale from -1 to 1
+                float value = 0;
+                if (mSampleType == SampleType_UInt8)
+                    value = ((char)(mQueue[sample * advance] ^ 0x80)) / 128.f;
+                else if (mSampleType == SampleType_Int16)
+                {
+                    value = *reinterpret_cast<const int16_t*>(&mQueue[sample * advance]);
+                    value /= float(std::numeric_limits<int16_t>::max());
+                }
+                else if (mSampleType == SampleType_Float32)
+                {
+                    value = *reinterpret_cast<const float*>(&mQueue[sample * advance]);
+                    value = std::clamp(value, -1.f, 1.f); // Float samples *should* be scaled to [-1,1] already.
+                }
+
+                sum += value * value;
+                ++samplesAdded;
+                ++sample;
             }
 
-            sum += value*value;
-            ++samplesAdded;
-            ++sample;
+            float rms = 0; // root mean square
+            if (samplesAdded > 0)
+                rms = std::sqrt(sum / samplesAdded);
+            mSamples.push_back(rms);
+            ++segment;
         }
 
-        float rms = 0; // root mean square
-        if (samplesAdded > 0)
-            rms = std::sqrt(sum / samplesAdded);
-        mSamples.push_back(rms);
-        ++segment;
+        mQueue.erase(mQueue.begin(), mQueue.begin() + sample * advance);
     }
 
-    mQueue.erase(mQueue.begin(), mQueue.begin() + sample*advance);
-}
-
-
-float Sound_Loudness::getLoudnessAtTime(float sec) const
-{
-    if(mSamplesPerSec <= 0.0f || mSamples.empty() || sec < 0.0f)
-        return 0.0f;
+    float Sound_Loudness::getLoudnessAtTime(float sec) const
+    {
+        if (mSamplesPerSec <= 0.0f || mSamples.empty() || sec < 0.0f)
+            return 0.0f;
 
-    size_t index = std::clamp<size_t>(sec * mSamplesPerSec, 0, mSamples.size() - 1);
-    return mSamples[index];
-}
+        size_t index = std::clamp<size_t>(sec * mSamplesPerSec, 0, mSamples.size() - 1);
+        return mSamples[index];
+    }
 
 }
diff --git a/apps/openmw/mwsound/loudness.hpp b/apps/openmw/mwsound/loudness.hpp
index 939d83dee3..1800ec246f 100644
--- a/apps/openmw/mwsound/loudness.hpp
+++ b/apps/openmw/mwsound/loudness.hpp
@@ -1,56 +1,59 @@
 #ifndef GAME_SOUND_LOUDNESS_H
 #define GAME_SOUND_LOUDNESS_H
 
-#include <vector>
 #include <deque>
+#include <vector>
 
 #include "sound_decoder.hpp"
 
 namespace MWSound
 {
 
-class Sound_Loudness {
-    float mSamplesPerSec;
-    int mSampleRate;
-    ChannelConfig mChannelConfig;
-    SampleType mSampleType;
-
-    // Loudness sample info
-    std::vector<float> mSamples;
-
-    std::deque<char> mQueue;
-
-public:
-    /**
-     * @param samplesPerSecond How many loudness values per second of audio to compute.
-     * @param sampleRate the sample rate of the sound buffer
-     * @param chans channel layout of the buffer
-     * @param type sample type of the buffer
-    */
-    Sound_Loudness(float samplesPerSecond, int sampleRate, ChannelConfig chans, SampleType type)
-        : mSamplesPerSec(samplesPerSecond)
-        , mSampleRate(sampleRate)
-        , mChannelConfig(chans)
-        , mSampleType(type)
-    { }
-
-    /**
-     * Analyzes the energy (closely related to loudness) of a sound buffer.
-     * The buffer will be divided into segments according to \a valuesPerSecond,
-     * and for each segment a loudness value in the range of [0,1] will be computed.
-     * The computed values are then added to the mSamples vector. This method should be called continuously
-     * with chunks of audio until the whole audio file is processed.
-     * If the size of \a data does not exactly fit a number of loudness samples, the remainder
-     * will be kept in the mQueue and used in the next call to analyzeLoudness.
-     * @param data the sound buffer to analyze, containing raw samples
-     */
-    void analyzeLoudness(const std::vector<char>& data);
-
-    /**
-     * Get loudness at a particular time. Before calling this, the stream has to be analyzed up to that point in time (see analyzeLoudness()).
-     */
-    float getLoudnessAtTime(float sec) const;
-};
+    class Sound_Loudness
+    {
+        float mSamplesPerSec;
+        int mSampleRate;
+        ChannelConfig mChannelConfig;
+        SampleType mSampleType;
+
+        // Loudness sample info
+        std::vector<float> mSamples;
+
+        std::deque<char> mQueue;
+
+    public:
+        /**
+         * @param samplesPerSecond How many loudness values per second of audio to compute.
+         * @param sampleRate the sample rate of the sound buffer
+         * @param chans channel layout of the buffer
+         * @param type sample type of the buffer
+         */
+        Sound_Loudness(float samplesPerSecond, int sampleRate, ChannelConfig chans, SampleType type)
+            : mSamplesPerSec(samplesPerSecond)
+            , mSampleRate(sampleRate)
+            , mChannelConfig(chans)
+            , mSampleType(type)
+        {
+        }
+
+        /**
+         * Analyzes the energy (closely related to loudness) of a sound buffer.
+         * The buffer will be divided into segments according to \a valuesPerSecond,
+         * and for each segment a loudness value in the range of [0,1] will be computed.
+         * The computed values are then added to the mSamples vector. This method should be called continuously
+         * with chunks of audio until the whole audio file is processed.
+         * If the size of \a data does not exactly fit a number of loudness samples, the remainder
+         * will be kept in the mQueue and used in the next call to analyzeLoudness.
+         * @param data the sound buffer to analyze, containing raw samples
+         */
+        void analyzeLoudness(const std::vector<char>& data);
+
+        /**
+         * Get loudness at a particular time. Before calling this, the stream has to be analyzed up to that point in
+         * time (see analyzeLoudness()).
+         */
+        float getLoudnessAtTime(float sec) const;
+    };
 
 }
 
diff --git a/apps/openmw/mwsound/movieaudiofactory.cpp b/apps/openmw/mwsound/movieaudiofactory.cpp
index aef8f7fe93..b770a9ffcc 100644
--- a/apps/openmw/mwsound/movieaudiofactory.cpp
+++ b/apps/openmw/mwsound/movieaudiofactory.cpp
@@ -6,8 +6,8 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
 
-#include "sound_decoder.hpp"
 #include "sound.hpp"
+#include "sound_decoder.hpp"
 
 namespace MWSound
 {
@@ -25,42 +25,40 @@ namespace MWSound
     private:
         MWSound::MovieAudioDecoder* mDecoder;
 
-        void open(const std::string &fname) override;
+        void open(const std::string& fname) override;
         void close() override;
         std::string getName() override;
-        void getInfo(int *samplerate, ChannelConfig *chans, SampleType *type) override;
-        size_t read(char *buffer, size_t bytes) override;
+        void getInfo(int* samplerate, ChannelConfig* chans, SampleType* type) override;
+        size_t read(char* buffer, size_t bytes) override;
         size_t getSampleOffset() override;
     };
 
     class MovieAudioDecoder : public Video::MovieAudioDecoder
     {
     public:
-        MovieAudioDecoder(Video::VideoState *videoState)
-            : Video::MovieAudioDecoder(videoState), mAudioTrack(nullptr)
+        MovieAudioDecoder(Video::VideoState* videoState)
+            : Video::MovieAudioDecoder(videoState)
+            , mAudioTrack(nullptr)
             , mDecoderBridge(std::make_shared<MWSoundDecoderBridge>(this))
         {
         }
 
         size_t getSampleOffset()
         {
-            ssize_t clock_delay = (mFrameSize-mFramePos) / av_get_channel_layout_nb_channels(mOutputChannelLayout) /
-                                  av_get_bytes_per_sample(mOutputSampleFormat);
-            return (size_t)(mAudioClock*mAudioContext->sample_rate) - clock_delay;
+            ssize_t clock_delay = (mFrameSize - mFramePos) / av_get_channel_layout_nb_channels(mOutputChannelLayout)
+                / av_get_bytes_per_sample(mOutputSampleFormat);
+            return (size_t)(mAudioClock * mAudioContext->sample_rate) - clock_delay;
         }
 
-        std::string getStreamName()
-        {
-            return std::string();
-        }
+        std::string getStreamName() { return std::string(); }
 
     private:
         // MovieAudioDecoder overrides
 
         double getAudioClock() override
         {
-            return (double)getSampleOffset()/(double)mAudioContext->sample_rate -
-                   MWBase::Environment::get().getSoundManager()->getTrackTimeDelay(mAudioTrack);
+            return (double)getSampleOffset() / (double)mAudioContext->sample_rate
+                - MWBase::Environment::get().getSoundManager()->getTrackTimeDelay(mAudioTrack);
         }
 
         void adjustAudioSettings(AVSampleFormat& sampleFormat, uint64_t& channelLayout, int& sampleRate) override
@@ -75,28 +73,26 @@ namespace MWSound
                 sampleFormat = AV_SAMPLE_FMT_S16;
 
             if (channelLayout == AV_CH_LAYOUT_5POINT1 || channelLayout == AV_CH_LAYOUT_7POINT1
-                    || channelLayout == AV_CH_LAYOUT_QUAD) // FIXME: check for AL_EXT_MCFORMATS support
+                || channelLayout == AV_CH_LAYOUT_QUAD) // FIXME: check for AL_EXT_MCFORMATS support
                 channelLayout = AV_CH_LAYOUT_STEREO;
-            else if (channelLayout != AV_CH_LAYOUT_MONO
-                     && channelLayout != AV_CH_LAYOUT_STEREO)
+            else if (channelLayout != AV_CH_LAYOUT_MONO && channelLayout != AV_CH_LAYOUT_STEREO)
                 channelLayout = AV_CH_LAYOUT_STEREO;
         }
 
     public:
         ~MovieAudioDecoder()
         {
-            if(mAudioTrack)
+            if (mAudioTrack)
                 MWBase::Environment::get().getSoundManager()->stopTrack(mAudioTrack);
             mAudioTrack = nullptr;
             mDecoderBridge.reset();
         }
 
-        MWBase::SoundStream *mAudioTrack;
+        MWBase::SoundStream* mAudioTrack;
         std::shared_ptr<MWSoundDecoderBridge> mDecoderBridge;
     };
 
-
-    void MWSoundDecoderBridge::open(const std::string &fname)
+    void MWSoundDecoderBridge::open(const std::string& fname)
     {
         throw std::runtime_error("Method not implemented");
     }
@@ -107,7 +103,7 @@ namespace MWSound
         return mDecoder->getStreamName();
     }
 
-    void MWSoundDecoderBridge::getInfo(int *samplerate, ChannelConfig *chans, SampleType *type)
+    void MWSoundDecoderBridge::getInfo(int* samplerate, ChannelConfig* chans, SampleType* type)
     {
         *samplerate = mDecoder->getOutputSampleRate();
 
@@ -123,8 +119,7 @@ namespace MWSound
         else if (outputChannelLayout == AV_CH_LAYOUT_QUAD)
             *chans = ChannelConfig_Quad;
         else
-            throw std::runtime_error("Unsupported channel layout: "+
-                                     std::to_string(outputChannelLayout));
+            throw std::runtime_error("Unsupported channel layout: " + std::to_string(outputChannelLayout));
 
         AVSampleFormat outputSampleFormat = mDecoder->getOutputSampleFormat();
         if (outputSampleFormat == AV_SAMPLE_FMT_U8)
@@ -137,11 +132,11 @@ namespace MWSound
         {
             char str[1024];
             av_get_sample_fmt_string(str, sizeof(str), outputSampleFormat);
-            throw std::runtime_error(std::string("Unsupported sample format: ")+str);
+            throw std::runtime_error(std::string("Unsupported sample format: ") + str);
         }
     }
 
-    size_t MWSoundDecoderBridge::read(char *buffer, size_t bytes)
+    size_t MWSoundDecoderBridge::read(char* buffer, size_t bytes)
     {
         return mDecoder->read(buffer, bytes);
     }
@@ -151,15 +146,13 @@ namespace MWSound
         return mDecoder->getSampleOffset();
     }
 
-
-
     std::unique_ptr<Video::MovieAudioDecoder> MovieAudioFactory::createDecoder(Video::VideoState* videoState)
     {
         auto decoder = std::make_unique<MWSound::MovieAudioDecoder>(videoState);
         decoder->setupFormat();
 
-        MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-        MWBase::SoundStream *sound = sndMgr->playTrack(decoder->mDecoderBridge, MWSound::Type::Movie);
+        MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
+        MWBase::SoundStream* sound = sndMgr->playTrack(decoder->mDecoderBridge, MWSound::Type::Movie);
         if (!sound)
         {
             decoder.reset();
diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp
index 47f90bbcf3..a1679d0501 100644
--- a/apps/openmw/mwsound/openal_output.cpp
+++ b/apps/openmw/mwsound/openal_output.cpp
@@ -1,12 +1,12 @@
 #include <algorithm>
-#include <cstring>
-#include <vector>
-#include <memory>
 #include <array>
 #include <atomic>
+#include <chrono>
 #include <condition_variable>
+#include <cstring>
+#include <memory>
 #include <thread>
-#include <chrono>
+#include <vector>
 
 #include <cstdint>
 
@@ -15,11 +15,11 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/vfs/manager.hpp>
 
+#include "loudness.hpp"
 #include "openal_output.hpp"
-#include "sound_decoder.hpp"
 #include "sound.hpp"
+#include "sound_decoder.hpp"
 #include "soundmanagerimp.hpp"
-#include "loudness.hpp"
 
 #include "efx-presets.h"
 
@@ -27,1493 +27,1512 @@
 #define ALC_ALL_DEVICES_SPECIFIER 0x1013
 #endif
 
-
 #define MAKE_PTRID(id) ((void*)(uintptr_t)id)
 #define GET_PTRID(ptr) ((ALuint)(uintptr_t)ptr)
 
 namespace
 {
 
-const int sLoudnessFPS = 20; // loudness values per second of audio
+    const int sLoudnessFPS = 20; // loudness values per second of audio
 
-ALCenum checkALCError(ALCdevice *device, const char *func, int line)
-{
-    ALCenum err = alcGetError(device);
-    if(err != ALC_NO_ERROR)
-        Log(Debug::Error) << "ALC error "<< alcGetString(device, err) << " (" << err << ") @ " << func << ":" << line;
-    return err;
-}
+    ALCenum checkALCError(ALCdevice* device, const char* func, int line)
+    {
+        ALCenum err = alcGetError(device);
+        if (err != ALC_NO_ERROR)
+            Log(Debug::Error) << "ALC error " << alcGetString(device, err) << " (" << err << ") @ " << func << ":"
+                              << line;
+        return err;
+    }
 #define getALCError(d) checkALCError((d), __FUNCTION__, __LINE__)
 
-ALenum checkALError(const char *func, int line)
-{
-    ALenum err = alGetError();
-    if(err != AL_NO_ERROR)
-        Log(Debug::Error) << "AL error " << alGetString(err) << " (" << err << ") @ " << func << ":" << line;
-    return err;
-}
+    ALenum checkALError(const char* func, int line)
+    {
+        ALenum err = alGetError();
+        if (err != AL_NO_ERROR)
+            Log(Debug::Error) << "AL error " << alGetString(err) << " (" << err << ") @ " << func << ":" << line;
+        return err;
+    }
 #define getALError() checkALError(__FUNCTION__, __LINE__)
 
-// Helper to get an OpenAL extension function
-template<typename T, typename R>
-void convertPointer(T& dest, R src)
-{
-    memcpy(&dest, &src, sizeof(src));
-}
-
-template<typename T>
-void getALCFunc(T& func, ALCdevice *device, const char *name)
-{
-    void* funcPtr = alcGetProcAddress(device, name);
-    convertPointer(func, funcPtr);
-}
-
-template<typename T>
-void getALFunc(T& func, const char *name)
-{
-    void* funcPtr = alGetProcAddress(name);
-    convertPointer(func, funcPtr);
-}
+    // Helper to get an OpenAL extension function
+    template <typename T, typename R>
+    void convertPointer(T& dest, R src)
+    {
+        memcpy(&dest, &src, sizeof(src));
+    }
 
-// Effect objects
-LPALGENEFFECTS alGenEffects;
-LPALDELETEEFFECTS alDeleteEffects;
-LPALISEFFECT alIsEffect;
-LPALEFFECTI alEffecti;
-LPALEFFECTIV alEffectiv;
-LPALEFFECTF alEffectf;
-LPALEFFECTFV alEffectfv;
-LPALGETEFFECTI alGetEffecti;
-LPALGETEFFECTIV alGetEffectiv;
-LPALGETEFFECTF alGetEffectf;
-LPALGETEFFECTFV alGetEffectfv;
-// Filter objects
-LPALGENFILTERS alGenFilters;
-LPALDELETEFILTERS alDeleteFilters;
-LPALISFILTER alIsFilter;
-LPALFILTERI alFilteri;
-LPALFILTERIV alFilteriv;
-LPALFILTERF alFilterf;
-LPALFILTERFV alFilterfv;
-LPALGETFILTERI alGetFilteri;
-LPALGETFILTERIV alGetFilteriv;
-LPALGETFILTERF alGetFilterf;
-LPALGETFILTERFV alGetFilterfv;
-// Auxiliary slot objects
-LPALGENAUXILIARYEFFECTSLOTS alGenAuxiliaryEffectSlots;
-LPALDELETEAUXILIARYEFFECTSLOTS alDeleteAuxiliaryEffectSlots;
-LPALISAUXILIARYEFFECTSLOT alIsAuxiliaryEffectSlot;
-LPALAUXILIARYEFFECTSLOTI alAuxiliaryEffectSloti;
-LPALAUXILIARYEFFECTSLOTIV alAuxiliaryEffectSlotiv;
-LPALAUXILIARYEFFECTSLOTF alAuxiliaryEffectSlotf;
-LPALAUXILIARYEFFECTSLOTFV alAuxiliaryEffectSlotfv;
-LPALGETAUXILIARYEFFECTSLOTI alGetAuxiliaryEffectSloti;
-LPALGETAUXILIARYEFFECTSLOTIV alGetAuxiliaryEffectSlotiv;
-LPALGETAUXILIARYEFFECTSLOTF alGetAuxiliaryEffectSlotf;
-LPALGETAUXILIARYEFFECTSLOTFV alGetAuxiliaryEffectSlotfv;
-
-
-void LoadEffect(ALuint effect, const EFXEAXREVERBPROPERTIES &props)
-{
-    ALint type = AL_NONE;
-    alGetEffecti(effect, AL_EFFECT_TYPE, &type);
-    if(type == AL_EFFECT_EAXREVERB)
+    template <typename T>
+    void getALCFunc(T& func, ALCdevice* device, const char* name)
     {
-        alEffectf(effect, AL_EAXREVERB_DIFFUSION, props.flDiffusion);
-        alEffectf(effect, AL_EAXREVERB_DENSITY, props.flDensity);
-        alEffectf(effect, AL_EAXREVERB_GAIN, props.flGain);
-        alEffectf(effect, AL_EAXREVERB_GAINHF, props.flGainHF);
-        alEffectf(effect, AL_EAXREVERB_GAINLF, props.flGainLF);
-        alEffectf(effect, AL_EAXREVERB_DECAY_TIME, props.flDecayTime);
-        alEffectf(effect, AL_EAXREVERB_DECAY_HFRATIO, props.flDecayHFRatio);
-        alEffectf(effect, AL_EAXREVERB_DECAY_LFRATIO, props.flDecayLFRatio);
-        alEffectf(effect, AL_EAXREVERB_REFLECTIONS_GAIN, props.flReflectionsGain);
-        alEffectf(effect, AL_EAXREVERB_REFLECTIONS_DELAY, props.flReflectionsDelay);
-        alEffectfv(effect, AL_EAXREVERB_REFLECTIONS_PAN, props.flReflectionsPan);
-        alEffectf(effect, AL_EAXREVERB_LATE_REVERB_GAIN, props.flLateReverbGain);
-        alEffectf(effect, AL_EAXREVERB_LATE_REVERB_DELAY, props.flLateReverbDelay);
-        alEffectfv(effect, AL_EAXREVERB_LATE_REVERB_PAN, props.flLateReverbPan);
-        alEffectf(effect, AL_EAXREVERB_ECHO_TIME, props.flEchoTime);
-        alEffectf(effect, AL_EAXREVERB_ECHO_DEPTH, props.flEchoDepth);
-        alEffectf(effect, AL_EAXREVERB_MODULATION_TIME, props.flModulationTime);
-        alEffectf(effect, AL_EAXREVERB_MODULATION_DEPTH, props.flModulationDepth);
-        alEffectf(effect, AL_EAXREVERB_AIR_ABSORPTION_GAINHF, props.flAirAbsorptionGainHF);
-        alEffectf(effect, AL_EAXREVERB_HFREFERENCE, props.flHFReference);
-        alEffectf(effect, AL_EAXREVERB_LFREFERENCE, props.flLFReference);
-        alEffectf(effect, AL_EAXREVERB_ROOM_ROLLOFF_FACTOR, props.flRoomRolloffFactor);
-        alEffecti(effect, AL_EAXREVERB_DECAY_HFLIMIT, props.iDecayHFLimit ? AL_TRUE : AL_FALSE);
+        void* funcPtr = alcGetProcAddress(device, name);
+        convertPointer(func, funcPtr);
     }
-    else if(type == AL_EFFECT_REVERB)
+
+    template <typename T>
+    void getALFunc(T& func, const char* name)
+    {
+        void* funcPtr = alGetProcAddress(name);
+        convertPointer(func, funcPtr);
+    }
+
+    // Effect objects
+    LPALGENEFFECTS alGenEffects;
+    LPALDELETEEFFECTS alDeleteEffects;
+    LPALISEFFECT alIsEffect;
+    LPALEFFECTI alEffecti;
+    LPALEFFECTIV alEffectiv;
+    LPALEFFECTF alEffectf;
+    LPALEFFECTFV alEffectfv;
+    LPALGETEFFECTI alGetEffecti;
+    LPALGETEFFECTIV alGetEffectiv;
+    LPALGETEFFECTF alGetEffectf;
+    LPALGETEFFECTFV alGetEffectfv;
+    // Filter objects
+    LPALGENFILTERS alGenFilters;
+    LPALDELETEFILTERS alDeleteFilters;
+    LPALISFILTER alIsFilter;
+    LPALFILTERI alFilteri;
+    LPALFILTERIV alFilteriv;
+    LPALFILTERF alFilterf;
+    LPALFILTERFV alFilterfv;
+    LPALGETFILTERI alGetFilteri;
+    LPALGETFILTERIV alGetFilteriv;
+    LPALGETFILTERF alGetFilterf;
+    LPALGETFILTERFV alGetFilterfv;
+    // Auxiliary slot objects
+    LPALGENAUXILIARYEFFECTSLOTS alGenAuxiliaryEffectSlots;
+    LPALDELETEAUXILIARYEFFECTSLOTS alDeleteAuxiliaryEffectSlots;
+    LPALISAUXILIARYEFFECTSLOT alIsAuxiliaryEffectSlot;
+    LPALAUXILIARYEFFECTSLOTI alAuxiliaryEffectSloti;
+    LPALAUXILIARYEFFECTSLOTIV alAuxiliaryEffectSlotiv;
+    LPALAUXILIARYEFFECTSLOTF alAuxiliaryEffectSlotf;
+    LPALAUXILIARYEFFECTSLOTFV alAuxiliaryEffectSlotfv;
+    LPALGETAUXILIARYEFFECTSLOTI alGetAuxiliaryEffectSloti;
+    LPALGETAUXILIARYEFFECTSLOTIV alGetAuxiliaryEffectSlotiv;
+    LPALGETAUXILIARYEFFECTSLOTF alGetAuxiliaryEffectSlotf;
+    LPALGETAUXILIARYEFFECTSLOTFV alGetAuxiliaryEffectSlotfv;
+
+    void LoadEffect(ALuint effect, const EFXEAXREVERBPROPERTIES& props)
     {
-        alEffectf(effect, AL_REVERB_DIFFUSION, props.flDiffusion);
-        alEffectf(effect, AL_REVERB_DENSITY, props.flDensity);
-        alEffectf(effect, AL_REVERB_GAIN, props.flGain);
-        alEffectf(effect, AL_REVERB_GAINHF, props.flGainHF);
-        alEffectf(effect, AL_REVERB_DECAY_TIME, props.flDecayTime);
-        alEffectf(effect, AL_REVERB_DECAY_HFRATIO, props.flDecayHFRatio);
-        alEffectf(effect, AL_REVERB_REFLECTIONS_GAIN, props.flReflectionsGain);
-        alEffectf(effect, AL_REVERB_REFLECTIONS_DELAY, props.flReflectionsDelay);
-        alEffectf(effect, AL_REVERB_LATE_REVERB_GAIN, props.flLateReverbGain);
-        alEffectf(effect, AL_REVERB_LATE_REVERB_DELAY, props.flLateReverbDelay);
-        alEffectf(effect, AL_REVERB_AIR_ABSORPTION_GAINHF, props.flAirAbsorptionGainHF);
-        alEffectf(effect, AL_REVERB_ROOM_ROLLOFF_FACTOR, props.flRoomRolloffFactor);
-        alEffecti(effect, AL_REVERB_DECAY_HFLIMIT, props.iDecayHFLimit ? AL_TRUE : AL_FALSE);
+        ALint type = AL_NONE;
+        alGetEffecti(effect, AL_EFFECT_TYPE, &type);
+        if (type == AL_EFFECT_EAXREVERB)
+        {
+            alEffectf(effect, AL_EAXREVERB_DIFFUSION, props.flDiffusion);
+            alEffectf(effect, AL_EAXREVERB_DENSITY, props.flDensity);
+            alEffectf(effect, AL_EAXREVERB_GAIN, props.flGain);
+            alEffectf(effect, AL_EAXREVERB_GAINHF, props.flGainHF);
+            alEffectf(effect, AL_EAXREVERB_GAINLF, props.flGainLF);
+            alEffectf(effect, AL_EAXREVERB_DECAY_TIME, props.flDecayTime);
+            alEffectf(effect, AL_EAXREVERB_DECAY_HFRATIO, props.flDecayHFRatio);
+            alEffectf(effect, AL_EAXREVERB_DECAY_LFRATIO, props.flDecayLFRatio);
+            alEffectf(effect, AL_EAXREVERB_REFLECTIONS_GAIN, props.flReflectionsGain);
+            alEffectf(effect, AL_EAXREVERB_REFLECTIONS_DELAY, props.flReflectionsDelay);
+            alEffectfv(effect, AL_EAXREVERB_REFLECTIONS_PAN, props.flReflectionsPan);
+            alEffectf(effect, AL_EAXREVERB_LATE_REVERB_GAIN, props.flLateReverbGain);
+            alEffectf(effect, AL_EAXREVERB_LATE_REVERB_DELAY, props.flLateReverbDelay);
+            alEffectfv(effect, AL_EAXREVERB_LATE_REVERB_PAN, props.flLateReverbPan);
+            alEffectf(effect, AL_EAXREVERB_ECHO_TIME, props.flEchoTime);
+            alEffectf(effect, AL_EAXREVERB_ECHO_DEPTH, props.flEchoDepth);
+            alEffectf(effect, AL_EAXREVERB_MODULATION_TIME, props.flModulationTime);
+            alEffectf(effect, AL_EAXREVERB_MODULATION_DEPTH, props.flModulationDepth);
+            alEffectf(effect, AL_EAXREVERB_AIR_ABSORPTION_GAINHF, props.flAirAbsorptionGainHF);
+            alEffectf(effect, AL_EAXREVERB_HFREFERENCE, props.flHFReference);
+            alEffectf(effect, AL_EAXREVERB_LFREFERENCE, props.flLFReference);
+            alEffectf(effect, AL_EAXREVERB_ROOM_ROLLOFF_FACTOR, props.flRoomRolloffFactor);
+            alEffecti(effect, AL_EAXREVERB_DECAY_HFLIMIT, props.iDecayHFLimit ? AL_TRUE : AL_FALSE);
+        }
+        else if (type == AL_EFFECT_REVERB)
+        {
+            alEffectf(effect, AL_REVERB_DIFFUSION, props.flDiffusion);
+            alEffectf(effect, AL_REVERB_DENSITY, props.flDensity);
+            alEffectf(effect, AL_REVERB_GAIN, props.flGain);
+            alEffectf(effect, AL_REVERB_GAINHF, props.flGainHF);
+            alEffectf(effect, AL_REVERB_DECAY_TIME, props.flDecayTime);
+            alEffectf(effect, AL_REVERB_DECAY_HFRATIO, props.flDecayHFRatio);
+            alEffectf(effect, AL_REVERB_REFLECTIONS_GAIN, props.flReflectionsGain);
+            alEffectf(effect, AL_REVERB_REFLECTIONS_DELAY, props.flReflectionsDelay);
+            alEffectf(effect, AL_REVERB_LATE_REVERB_GAIN, props.flLateReverbGain);
+            alEffectf(effect, AL_REVERB_LATE_REVERB_DELAY, props.flLateReverbDelay);
+            alEffectf(effect, AL_REVERB_AIR_ABSORPTION_GAINHF, props.flAirAbsorptionGainHF);
+            alEffectf(effect, AL_REVERB_ROOM_ROLLOFF_FACTOR, props.flRoomRolloffFactor);
+            alEffecti(effect, AL_REVERB_DECAY_HFLIMIT, props.iDecayHFLimit ? AL_TRUE : AL_FALSE);
+        }
+        getALError();
     }
-    getALError();
-}
 
 }
 
 namespace MWSound
 {
 
-static ALenum getALFormat(ChannelConfig chans, SampleType type)
-{
-    struct FormatEntry {
-        ALenum format;
-        ChannelConfig chans;
-        SampleType type;
-    };
-    struct FormatEntryExt {
-        const char name[32];
-        ChannelConfig chans;
-        SampleType type;
-    };
-    static const std::array<FormatEntry,4> fmtlist{{
-        { AL_FORMAT_MONO16,   ChannelConfig_Mono,   SampleType_Int16 },
-        { AL_FORMAT_MONO8,    ChannelConfig_Mono,   SampleType_UInt8 },
-        { AL_FORMAT_STEREO16, ChannelConfig_Stereo, SampleType_Int16 },
-        { AL_FORMAT_STEREO8,  ChannelConfig_Stereo, SampleType_UInt8 },
-    }};
-
-    for(auto &fmt : fmtlist)
-    {
-        if(fmt.chans == chans && fmt.type == type)
-            return fmt.format;
-    }
-
-    if(alIsExtensionPresent("AL_EXT_MCFORMATS"))
+    static ALenum getALFormat(ChannelConfig chans, SampleType type)
     {
-        static const std::array<FormatEntryExt,6> mcfmtlist{{
-            { "AL_FORMAT_QUAD16",   ChannelConfig_Quad,    SampleType_Int16 },
-            { "AL_FORMAT_QUAD8",    ChannelConfig_Quad,    SampleType_UInt8 },
-            { "AL_FORMAT_51CHN16",  ChannelConfig_5point1, SampleType_Int16 },
-            { "AL_FORMAT_51CHN8",   ChannelConfig_5point1, SampleType_UInt8 },
-            { "AL_FORMAT_71CHN16",  ChannelConfig_7point1, SampleType_Int16 },
-            { "AL_FORMAT_71CHN8",   ChannelConfig_7point1, SampleType_UInt8 },
-        }};
-
-        for(auto &fmt : mcfmtlist)
-        {
-            if(fmt.chans == chans && fmt.type == type)
-            {
-                ALenum format = alGetEnumValue(fmt.name);
-                if(format != 0 && format != -1)
-                    return format;
-            }
+        struct FormatEntry
+        {
+            ALenum format;
+            ChannelConfig chans;
+            SampleType type;
+        };
+        struct FormatEntryExt
+        {
+            const char name[32];
+            ChannelConfig chans;
+            SampleType type;
+        };
+        static const std::array<FormatEntry, 4> fmtlist{ {
+            { AL_FORMAT_MONO16, ChannelConfig_Mono, SampleType_Int16 },
+            { AL_FORMAT_MONO8, ChannelConfig_Mono, SampleType_UInt8 },
+            { AL_FORMAT_STEREO16, ChannelConfig_Stereo, SampleType_Int16 },
+            { AL_FORMAT_STEREO8, ChannelConfig_Stereo, SampleType_UInt8 },
+        } };
+
+        for (auto& fmt : fmtlist)
+        {
+            if (fmt.chans == chans && fmt.type == type)
+                return fmt.format;
         }
-    }
-    if(alIsExtensionPresent("AL_EXT_FLOAT32"))
-    {
-        static const std::array<FormatEntryExt,2> fltfmtlist{{
-            { "AL_FORMAT_MONO_FLOAT32",   ChannelConfig_Mono,   SampleType_Float32 },
-            { "AL_FORMAT_STEREO_FLOAT32", ChannelConfig_Stereo, SampleType_Float32 },
-        }};
 
-        for(auto &fmt : fltfmtlist)
+        if (alIsExtensionPresent("AL_EXT_MCFORMATS"))
         {
-            if(fmt.chans == chans && fmt.type == type)
+            static const std::array<FormatEntryExt, 6> mcfmtlist{ {
+                { "AL_FORMAT_QUAD16", ChannelConfig_Quad, SampleType_Int16 },
+                { "AL_FORMAT_QUAD8", ChannelConfig_Quad, SampleType_UInt8 },
+                { "AL_FORMAT_51CHN16", ChannelConfig_5point1, SampleType_Int16 },
+                { "AL_FORMAT_51CHN8", ChannelConfig_5point1, SampleType_UInt8 },
+                { "AL_FORMAT_71CHN16", ChannelConfig_7point1, SampleType_Int16 },
+                { "AL_FORMAT_71CHN8", ChannelConfig_7point1, SampleType_UInt8 },
+            } };
+
+            for (auto& fmt : mcfmtlist)
             {
-                ALenum format = alGetEnumValue(fmt.name);
-                if(format != 0 && format != -1)
-                    return format;
+                if (fmt.chans == chans && fmt.type == type)
+                {
+                    ALenum format = alGetEnumValue(fmt.name);
+                    if (format != 0 && format != -1)
+                        return format;
+                }
             }
         }
-
-        if(alIsExtensionPresent("AL_EXT_MCFORMATS"))
+        if (alIsExtensionPresent("AL_EXT_FLOAT32"))
         {
-            static const std::array<FormatEntryExt,3> fltmcfmtlist{{
-                { "AL_FORMAT_QUAD32",  ChannelConfig_Quad,    SampleType_Float32 },
-                { "AL_FORMAT_51CHN32", ChannelConfig_5point1, SampleType_Float32 },
-                { "AL_FORMAT_71CHN32", ChannelConfig_7point1, SampleType_Float32 },
-            }};
+            static const std::array<FormatEntryExt, 2> fltfmtlist{ {
+                { "AL_FORMAT_MONO_FLOAT32", ChannelConfig_Mono, SampleType_Float32 },
+                { "AL_FORMAT_STEREO_FLOAT32", ChannelConfig_Stereo, SampleType_Float32 },
+            } };
 
-            for(auto &fmt : fltmcfmtlist)
+            for (auto& fmt : fltfmtlist)
             {
-                if(fmt.chans == chans && fmt.type == type)
+                if (fmt.chans == chans && fmt.type == type)
                 {
                     ALenum format = alGetEnumValue(fmt.name);
-                    if(format != 0 && format != -1)
+                    if (format != 0 && format != -1)
                         return format;
                 }
             }
+
+            if (alIsExtensionPresent("AL_EXT_MCFORMATS"))
+            {
+                static const std::array<FormatEntryExt, 3> fltmcfmtlist{ {
+                    { "AL_FORMAT_QUAD32", ChannelConfig_Quad, SampleType_Float32 },
+                    { "AL_FORMAT_51CHN32", ChannelConfig_5point1, SampleType_Float32 },
+                    { "AL_FORMAT_71CHN32", ChannelConfig_7point1, SampleType_Float32 },
+                } };
+
+                for (auto& fmt : fltmcfmtlist)
+                {
+                    if (fmt.chans == chans && fmt.type == type)
+                    {
+                        ALenum format = alGetEnumValue(fmt.name);
+                        if (format != 0 && format != -1)
+                            return format;
+                    }
+                }
+            }
         }
-    }
 
-    Log(Debug::Warning) << "Unsupported sound format (" << getChannelConfigName(chans) << ", " << getSampleTypeName(type) << ")";
-    return AL_NONE;
-}
+        Log(Debug::Warning) << "Unsupported sound format (" << getChannelConfigName(chans) << ", "
+                            << getSampleTypeName(type) << ")";
+        return AL_NONE;
+    }
 
+    //
+    // A streaming OpenAL sound.
+    //
+    class OpenAL_SoundStream
+    {
+        static const ALfloat sBufferLength;
 
-//
-// A streaming OpenAL sound.
-//
-class OpenAL_SoundStream
-{
-    static const ALfloat sBufferLength;
+    private:
+        ALuint mSource;
 
-private:
-    ALuint mSource;
+        std::array<ALuint, 6> mBuffers;
+        ALint mCurrentBufIdx;
 
-    std::array<ALuint,6> mBuffers;
-    ALint mCurrentBufIdx;
+        ALenum mFormat;
+        ALsizei mSampleRate;
+        ALuint mBufferSize;
+        ALuint mFrameSize;
+        ALint mSilence;
 
-    ALenum mFormat;
-    ALsizei mSampleRate;
-    ALuint mBufferSize;
-    ALuint mFrameSize;
-    ALint mSilence;
+        DecoderPtr mDecoder;
 
-    DecoderPtr mDecoder;
+        std::unique_ptr<Sound_Loudness> mLoudnessAnalyzer;
 
-    std::unique_ptr<Sound_Loudness> mLoudnessAnalyzer;
+        std::atomic<bool> mIsFinished;
 
-    std::atomic<bool> mIsFinished;
+        void updateAll(bool local);
 
-    void updateAll(bool local);
+        OpenAL_SoundStream(const OpenAL_SoundStream& rhs);
+        OpenAL_SoundStream& operator=(const OpenAL_SoundStream& rhs);
 
-    OpenAL_SoundStream(const OpenAL_SoundStream &rhs);
-    OpenAL_SoundStream& operator=(const OpenAL_SoundStream &rhs);
+        friend class OpenAL_Output;
 
-    friend class OpenAL_Output;
+    public:
+        OpenAL_SoundStream(ALuint src, DecoderPtr decoder);
+        ~OpenAL_SoundStream();
 
-public:
-    OpenAL_SoundStream(ALuint src, DecoderPtr decoder);
-    ~OpenAL_SoundStream();
+        bool init(bool getLoudnessData = false);
 
-    bool init(bool getLoudnessData=false);
+        bool isPlaying();
+        double getStreamDelay() const;
+        double getStreamOffset() const;
 
-    bool isPlaying();
-    double getStreamDelay() const;
-    double getStreamOffset() const;
+        float getCurrentLoudness() const;
 
-    float getCurrentLoudness() const;
+        bool process();
+        ALint refillQueue();
+    };
+    const ALfloat OpenAL_SoundStream::sBufferLength = 0.125f;
 
-    bool process();
-    ALint refillQueue();
-};
-const ALfloat OpenAL_SoundStream::sBufferLength = 0.125f;
+    //
+    // A background streaming thread (keeps active streams processed)
+    //
+    struct OpenAL_Output::StreamThread
+    {
+        typedef std::vector<OpenAL_SoundStream*> StreamVec;
+        StreamVec mStreams;
 
+        std::atomic<bool> mQuitNow;
+        std::mutex mMutex;
+        std::condition_variable mCondVar;
+        std::thread mThread;
 
-//
-// A background streaming thread (keeps active streams processed)
-//
-struct OpenAL_Output::StreamThread
-{
-    typedef std::vector<OpenAL_SoundStream*> StreamVec;
-    StreamVec mStreams;
+        StreamThread()
+            : mQuitNow(false)
+            , mThread([this] { run(); })
+        {
+        }
+        ~StreamThread()
+        {
+            mQuitNow = true;
+            mMutex.lock();
+            mMutex.unlock();
+            mCondVar.notify_all();
+            mThread.join();
+        }
 
-    std::atomic<bool> mQuitNow;
-    std::mutex mMutex;
-    std::condition_variable mCondVar;
-    std::thread mThread;
+        // thread entry point
+        void run()
+        {
+            std::unique_lock<std::mutex> lock(mMutex);
+            while (!mQuitNow)
+            {
+                StreamVec::iterator iter = mStreams.begin();
+                while (iter != mStreams.end())
+                {
+                    if ((*iter)->process() == false)
+                        iter = mStreams.erase(iter);
+                    else
+                        ++iter;
+                }
 
-    StreamThread()
-      : mQuitNow(false)
-      , mThread([this] { run(); })
-    {
-    }
-    ~StreamThread()
-    {
-        mQuitNow = true;
-        mMutex.lock(); mMutex.unlock();
-        mCondVar.notify_all();
-        mThread.join();
-    }
+                mCondVar.wait_for(lock, std::chrono::milliseconds(50));
+            }
+        }
 
-    // thread entry point
-    void run()
-    {
-        std::unique_lock<std::mutex> lock(mMutex);
-        while(!mQuitNow)
+        void add(OpenAL_SoundStream* stream)
         {
-            StreamVec::iterator iter = mStreams.begin();
-            while(iter != mStreams.end())
+            std::lock_guard<std::mutex> lock(mMutex);
+            if (std::find(mStreams.begin(), mStreams.end(), stream) == mStreams.end())
             {
-                if((*iter)->process() == false)
-                    iter = mStreams.erase(iter);
-                else
-                    ++iter;
+                mStreams.push_back(stream);
+                mCondVar.notify_all();
             }
+        }
 
-            mCondVar.wait_for(lock, std::chrono::milliseconds(50));
+        void remove(OpenAL_SoundStream* stream)
+        {
+            std::lock_guard<std::mutex> lock(mMutex);
+            StreamVec::iterator iter = std::find(mStreams.begin(), mStreams.end(), stream);
+            if (iter != mStreams.end())
+                mStreams.erase(iter);
         }
-    }
 
-    void add(OpenAL_SoundStream *stream)
-    {
-        std::lock_guard<std::mutex> lock(mMutex);
-        if(std::find(mStreams.begin(), mStreams.end(), stream) == mStreams.end())
+        void removeAll()
         {
-            mStreams.push_back(stream);
-            mCondVar.notify_all();
+            std::lock_guard<std::mutex> lock(mMutex);
+            mStreams.clear();
         }
-    }
 
-    void remove(OpenAL_SoundStream *stream)
-    {
-        std::lock_guard<std::mutex> lock(mMutex);
-        StreamVec::iterator iter = std::find(mStreams.begin(), mStreams.end(), stream);
-        if(iter != mStreams.end()) mStreams.erase(iter);
-    }
+    private:
+        StreamThread(const StreamThread& rhs);
+        StreamThread& operator=(const StreamThread& rhs);
+    };
 
-    void removeAll()
+    OpenAL_SoundStream::OpenAL_SoundStream(ALuint src, DecoderPtr decoder)
+        : mSource(src)
+        , mCurrentBufIdx(0)
+        , mFormat(AL_NONE)
+        , mSampleRate(0)
+        , mBufferSize(0)
+        , mFrameSize(0)
+        , mSilence(0)
+        , mDecoder(std::move(decoder))
+        , mLoudnessAnalyzer(nullptr)
+        , mIsFinished(true)
     {
-        std::lock_guard<std::mutex> lock(mMutex);
-        mStreams.clear();
+        mBuffers.fill(0);
     }
 
-private:
-    StreamThread(const StreamThread &rhs);
-    StreamThread& operator=(const StreamThread &rhs);
-};
-
-
-OpenAL_SoundStream::OpenAL_SoundStream(ALuint src, DecoderPtr decoder)
-  : mSource(src), mCurrentBufIdx(0), mFormat(AL_NONE), mSampleRate(0)
-  , mBufferSize(0), mFrameSize(0), mSilence(0), mDecoder(std::move(decoder))
-  , mLoudnessAnalyzer(nullptr), mIsFinished(true)
-{
-    mBuffers.fill(0);
-}
-
-OpenAL_SoundStream::~OpenAL_SoundStream()
-{
-    if(mBuffers[0] && alIsBuffer(mBuffers[0]))
-        alDeleteBuffers(mBuffers.size(), mBuffers.data());
-    alGetError();
-
-    mDecoder->close();
-}
-
-bool OpenAL_SoundStream::init(bool getLoudnessData)
-{
-    alGenBuffers(mBuffers.size(), mBuffers.data());
-    ALenum err = getALError();
-    if(err != AL_NO_ERROR)
-        return false;
-
-    ChannelConfig chans;
-    SampleType type;
-
-    try {
-        mDecoder->getInfo(&mSampleRate, &chans, &type);
-        mFormat = getALFormat(chans, type);
-    }
-    catch(std::exception &e)
+    OpenAL_SoundStream::~OpenAL_SoundStream()
     {
-        Log(Debug::Error) << "Failed to get stream info: " << e.what();
-        return false;
+        if (mBuffers[0] && alIsBuffer(mBuffers[0]))
+            alDeleteBuffers(mBuffers.size(), mBuffers.data());
+        alGetError();
+
+        mDecoder->close();
     }
 
-    switch(type)
+    bool OpenAL_SoundStream::init(bool getLoudnessData)
     {
-        case SampleType_UInt8: mSilence = 0x80; break;
-        case SampleType_Int16: mSilence = 0x00; break;
-        case SampleType_Float32: mSilence = 0x00; break;
-    }
+        alGenBuffers(mBuffers.size(), mBuffers.data());
+        ALenum err = getALError();
+        if (err != AL_NO_ERROR)
+            return false;
 
-    mFrameSize = framesToBytes(1, chans, type);
-    mBufferSize = static_cast<ALuint>(sBufferLength*mSampleRate);
-    mBufferSize *= mFrameSize;
+        ChannelConfig chans;
+        SampleType type;
 
-    if (getLoudnessData)
-        mLoudnessAnalyzer = std::make_unique<Sound_Loudness>(sLoudnessFPS, mSampleRate, chans, type);
+        try
+        {
+            mDecoder->getInfo(&mSampleRate, &chans, &type);
+            mFormat = getALFormat(chans, type);
+        }
+        catch (std::exception& e)
+        {
+            Log(Debug::Error) << "Failed to get stream info: " << e.what();
+            return false;
+        }
 
-    mIsFinished = false;
-    return true;
-}
+        switch (type)
+        {
+            case SampleType_UInt8:
+                mSilence = 0x80;
+                break;
+            case SampleType_Int16:
+                mSilence = 0x00;
+                break;
+            case SampleType_Float32:
+                mSilence = 0x00;
+                break;
+        }
 
-bool OpenAL_SoundStream::isPlaying()
-{
-    ALint state;
+        mFrameSize = framesToBytes(1, chans, type);
+        mBufferSize = static_cast<ALuint>(sBufferLength * mSampleRate);
+        mBufferSize *= mFrameSize;
 
-    alGetSourcei(mSource, AL_SOURCE_STATE, &state);
-    getALError();
+        if (getLoudnessData)
+            mLoudnessAnalyzer = std::make_unique<Sound_Loudness>(sLoudnessFPS, mSampleRate, chans, type);
 
-    if(state == AL_PLAYING || state == AL_PAUSED)
+        mIsFinished = false;
         return true;
-    return !mIsFinished;
-}
-
-double OpenAL_SoundStream::getStreamDelay() const
-{
-    ALint state = AL_STOPPED;
-    double d = 0.0;
-    ALint offset;
-
-    alGetSourcei(mSource, AL_SAMPLE_OFFSET, &offset);
-    alGetSourcei(mSource, AL_SOURCE_STATE, &state);
-    if(state == AL_PLAYING || state == AL_PAUSED)
-    {
-        ALint queued;
-        alGetSourcei(mSource, AL_BUFFERS_QUEUED, &queued);
-        ALint inqueue = mBufferSize/mFrameSize*queued - offset;
-        d = (double)inqueue / (double)mSampleRate;
     }
 
-    getALError();
-    return d;
-}
+    bool OpenAL_SoundStream::isPlaying()
+    {
+        ALint state;
 
-double OpenAL_SoundStream::getStreamOffset() const
-{
-    ALint state = AL_STOPPED;
-    ALint offset;
-    double t;
+        alGetSourcei(mSource, AL_SOURCE_STATE, &state);
+        getALError();
 
-    alGetSourcei(mSource, AL_SAMPLE_OFFSET, &offset);
-    alGetSourcei(mSource, AL_SOURCE_STATE, &state);
-    if(state == AL_PLAYING || state == AL_PAUSED)
-    {
-        ALint queued;
-        alGetSourcei(mSource, AL_BUFFERS_QUEUED, &queued);
-        ALint inqueue = mBufferSize/mFrameSize*queued - offset;
-        t = (double)(mDecoder->getSampleOffset() - inqueue) / (double)mSampleRate;
+        if (state == AL_PLAYING || state == AL_PAUSED)
+            return true;
+        return !mIsFinished;
     }
-    else
+
+    double OpenAL_SoundStream::getStreamDelay() const
     {
-        /* Underrun, or not started yet. The decoder offset is where we'll play
-         * next. */
-        t = (double)mDecoder->getSampleOffset() / (double)mSampleRate;
-    }
+        ALint state = AL_STOPPED;
+        double d = 0.0;
+        ALint offset;
 
-    getALError();
-    return t;
-}
+        alGetSourcei(mSource, AL_SAMPLE_OFFSET, &offset);
+        alGetSourcei(mSource, AL_SOURCE_STATE, &state);
+        if (state == AL_PLAYING || state == AL_PAUSED)
+        {
+            ALint queued;
+            alGetSourcei(mSource, AL_BUFFERS_QUEUED, &queued);
+            ALint inqueue = mBufferSize / mFrameSize * queued - offset;
+            d = (double)inqueue / (double)mSampleRate;
+        }
 
-float OpenAL_SoundStream::getCurrentLoudness() const
-{
-    if (!mLoudnessAnalyzer.get())
-        return 0.f;
+        getALError();
+        return d;
+    }
 
-    float time = getStreamOffset();
-    return mLoudnessAnalyzer->getLoudnessAtTime(time);
-}
+    double OpenAL_SoundStream::getStreamOffset() const
+    {
+        ALint state = AL_STOPPED;
+        ALint offset;
+        double t;
 
-bool OpenAL_SoundStream::process()
-{
-    try {
-        if(refillQueue() > 0)
+        alGetSourcei(mSource, AL_SAMPLE_OFFSET, &offset);
+        alGetSourcei(mSource, AL_SOURCE_STATE, &state);
+        if (state == AL_PLAYING || state == AL_PAUSED)
         {
-            ALint state;
-            alGetSourcei(mSource, AL_SOURCE_STATE, &state);
-            if(state != AL_PLAYING && state != AL_PAUSED)
-            {
-                // Ensure all processed buffers are removed so we don't replay them.
-                refillQueue();
-
-                alSourcePlay(mSource);
-            }
+            ALint queued;
+            alGetSourcei(mSource, AL_BUFFERS_QUEUED, &queued);
+            ALint inqueue = mBufferSize / mFrameSize * queued - offset;
+            t = (double)(mDecoder->getSampleOffset() - inqueue) / (double)mSampleRate;
         }
+        else
+        {
+            /* Underrun, or not started yet. The decoder offset is where we'll play
+             * next. */
+            t = (double)mDecoder->getSampleOffset() / (double)mSampleRate;
+        }
+
+        getALError();
+        return t;
     }
-    catch(std::exception&) {
-        Log(Debug::Error) << "Error updating stream \"" << mDecoder->getName() << "\"";
-        mIsFinished = true;
-    }
-    return !mIsFinished;
-}
 
-ALint OpenAL_SoundStream::refillQueue()
-{
-    ALint processed;
-    alGetSourcei(mSource, AL_BUFFERS_PROCESSED, &processed);
-    while(processed > 0)
+    float OpenAL_SoundStream::getCurrentLoudness() const
     {
-        ALuint buf;
-        alSourceUnqueueBuffers(mSource, 1, &buf);
-        --processed;
+        if (!mLoudnessAnalyzer.get())
+            return 0.f;
+
+        float time = getStreamOffset();
+        return mLoudnessAnalyzer->getLoudnessAtTime(time);
     }
 
-    ALint queued;
-    alGetSourcei(mSource, AL_BUFFERS_QUEUED, &queued);
-    if(!mIsFinished && (ALuint)queued < mBuffers.size())
+    bool OpenAL_SoundStream::process()
     {
-        std::vector<char> data(mBufferSize);
-        for(;!mIsFinished && (ALuint)queued < mBuffers.size();++queued)
+        try
         {
-            size_t got = mDecoder->read(data.data(), data.size());
-            if(got < data.size())
-            {
-                mIsFinished = true;
-                std::fill(data.begin()+got, data.end(), mSilence);
-            }
-            if(got > 0)
+            if (refillQueue() > 0)
             {
-                if (mLoudnessAnalyzer.get())
-                    mLoudnessAnalyzer->analyzeLoudness(data);
+                ALint state;
+                alGetSourcei(mSource, AL_SOURCE_STATE, &state);
+                if (state != AL_PLAYING && state != AL_PAUSED)
+                {
+                    // Ensure all processed buffers are removed so we don't replay them.
+                    refillQueue();
 
-                ALuint bufid = mBuffers[mCurrentBufIdx];
-                alBufferData(bufid, mFormat, data.data(), data.size(), mSampleRate);
-                alSourceQueueBuffers(mSource, 1, &bufid);
-                mCurrentBufIdx = (mCurrentBufIdx+1) % mBuffers.size();
+                    alSourcePlay(mSource);
+                }
             }
         }
+        catch (std::exception&)
+        {
+            Log(Debug::Error) << "Error updating stream \"" << mDecoder->getName() << "\"";
+            mIsFinished = true;
+        }
+        return !mIsFinished;
     }
 
-    return queued;
-}
-
-
-//
-// An OpenAL output device
-//
-std::vector<std::string> OpenAL_Output::enumerate()
-{
-    std::vector<std::string> devlist;
-    const ALCchar *devnames;
-
-    if(alcIsExtensionPresent(nullptr, "ALC_ENUMERATE_ALL_EXT"))
-        devnames = alcGetString(nullptr, ALC_ALL_DEVICES_SPECIFIER);
-    else
-        devnames = alcGetString(nullptr, ALC_DEVICE_SPECIFIER);
-    while(devnames && *devnames)
-    {
-        devlist.emplace_back(devnames);
-        devnames += strlen(devnames)+1;
-    }
-    return devlist;
-}
-
-bool OpenAL_Output::init(const std::string &devname, const std::string &hrtfname, HrtfMode hrtfmode)
-{
-    deinit();
-
-    Log(Debug::Info) << "Initializing OpenAL...";
-
-    mDevice = alcOpenDevice(devname.c_str());
-    if(!mDevice && !devname.empty())
-    {
-        Log(Debug::Warning) << "Failed to open \"" << devname << "\", trying default";
-        mDevice = alcOpenDevice(nullptr);
-    }
-
-    if(!mDevice)
-    {
-        Log(Debug::Error) << "Failed to open default audio device";
-        return false;
-    }
-
-    const ALCchar *name = nullptr;
-    if(alcIsExtensionPresent(mDevice, "ALC_ENUMERATE_ALL_EXT"))
-        name = alcGetString(mDevice, ALC_ALL_DEVICES_SPECIFIER);
-    if(alcGetError(mDevice) != AL_NO_ERROR || !name)
-        name = alcGetString(mDevice, ALC_DEVICE_SPECIFIER);
-    Log(Debug::Info) << "Opened \"" << name << "\"";
-
-    ALCint major=0, minor=0;
-    alcGetIntegerv(mDevice, ALC_MAJOR_VERSION, 1, &major);
-    alcGetIntegerv(mDevice, ALC_MINOR_VERSION, 1, &minor);
-    Log(Debug::Info) << "  ALC Version: " << major << "." << minor <<"\n" <<
-                        "  ALC Extensions: " << alcGetString(mDevice, ALC_EXTENSIONS);
-
-    ALC.EXT_EFX = alcIsExtensionPresent(mDevice, "ALC_EXT_EFX");
-    ALC.SOFT_HRTF = alcIsExtensionPresent(mDevice, "ALC_SOFT_HRTF");
-
-    std::vector<ALCint> attrs;
-    attrs.reserve(15);
-    if(ALC.SOFT_HRTF)
+    ALint OpenAL_SoundStream::refillQueue()
     {
-        LPALCGETSTRINGISOFT alcGetStringiSOFT = nullptr;
-        getALCFunc(alcGetStringiSOFT, mDevice, "alcGetStringiSOFT");
+        ALint processed;
+        alGetSourcei(mSource, AL_BUFFERS_PROCESSED, &processed);
+        while (processed > 0)
+        {
+            ALuint buf;
+            alSourceUnqueueBuffers(mSource, 1, &buf);
+            --processed;
+        }
 
-        attrs.push_back(ALC_HRTF_SOFT);
-        attrs.push_back(hrtfmode == HrtfMode::Disable ? ALC_FALSE :
-                        hrtfmode == HrtfMode::Enable ? ALC_TRUE :
-                        /*hrtfmode == HrtfMode::Auto ?*/ ALC_DONT_CARE_SOFT);
-        if(!hrtfname.empty())
+        ALint queued;
+        alGetSourcei(mSource, AL_BUFFERS_QUEUED, &queued);
+        if (!mIsFinished && (ALuint)queued < mBuffers.size())
         {
-            ALCint index = -1;
-            ALCint num_hrtf;
-            alcGetIntegerv(mDevice, ALC_NUM_HRTF_SPECIFIERS_SOFT, 1, &num_hrtf);
-            for(ALCint i = 0;i < num_hrtf;++i)
+            std::vector<char> data(mBufferSize);
+            for (; !mIsFinished && (ALuint)queued < mBuffers.size(); ++queued)
             {
-                const ALCchar *entry = alcGetStringiSOFT(mDevice, ALC_HRTF_SPECIFIER_SOFT, i);
-                if(hrtfname == entry)
+                size_t got = mDecoder->read(data.data(), data.size());
+                if (got < data.size())
                 {
-                    index = i;
-                    break;
+                    mIsFinished = true;
+                    std::fill(data.begin() + got, data.end(), mSilence);
                 }
-            }
+                if (got > 0)
+                {
+                    if (mLoudnessAnalyzer.get())
+                        mLoudnessAnalyzer->analyzeLoudness(data);
 
-            if(index < 0)
-                Log(Debug::Warning) << "Failed to find HRTF \"" << hrtfname << "\", using default";
-            else
-            {
-                attrs.push_back(ALC_HRTF_ID_SOFT);
-                attrs.push_back(index);
+                    ALuint bufid = mBuffers[mCurrentBufIdx];
+                    alBufferData(bufid, mFormat, data.data(), data.size(), mSampleRate);
+                    alSourceQueueBuffers(mSource, 1, &bufid);
+                    mCurrentBufIdx = (mCurrentBufIdx + 1) % mBuffers.size();
+                }
             }
         }
-    }
-    attrs.push_back(0);
 
-    mContext = alcCreateContext(mDevice, attrs.data());
-    if(!mContext || alcMakeContextCurrent(mContext) == ALC_FALSE)
-    {
-        Log(Debug::Error) << "Failed to setup audio context: "<<alcGetString(mDevice, alcGetError(mDevice));
-        if(mContext)
-            alcDestroyContext(mContext);
-        mContext = nullptr;
-        alcCloseDevice(mDevice);
-        mDevice = nullptr;
-        return false;
+        return queued;
     }
 
-    Log(Debug::Info) << "  Vendor: "<<alGetString(AL_VENDOR)<<"\n"<<
-                        "  Renderer: "<<alGetString(AL_RENDERER)<<"\n"<<
-                        "  Version: "<<alGetString(AL_VERSION)<<"\n"<<
-                        "  Extensions: "<<alGetString(AL_EXTENSIONS);
-
-    if(!ALC.SOFT_HRTF)
-        Log(Debug::Warning) << "HRTF status unavailable";
-    else
+    //
+    // An OpenAL output device
+    //
+    std::vector<std::string> OpenAL_Output::enumerate()
     {
-        ALCint hrtf_state;
-        alcGetIntegerv(mDevice, ALC_HRTF_SOFT, 1, &hrtf_state);
-        if(!hrtf_state)
-            Log(Debug::Info) << "HRTF disabled";
+        std::vector<std::string> devlist;
+        const ALCchar* devnames;
+
+        if (alcIsExtensionPresent(nullptr, "ALC_ENUMERATE_ALL_EXT"))
+            devnames = alcGetString(nullptr, ALC_ALL_DEVICES_SPECIFIER);
         else
+            devnames = alcGetString(nullptr, ALC_DEVICE_SPECIFIER);
+        while (devnames && *devnames)
         {
-            const ALCchar *hrtf = alcGetString(mDevice, ALC_HRTF_SPECIFIER_SOFT);
-            Log(Debug::Info) << "Enabled HRTF " << hrtf;
+            devlist.emplace_back(devnames);
+            devnames += strlen(devnames) + 1;
         }
+        return devlist;
     }
 
-    AL.SOFT_source_spatialize = alIsExtensionPresent("AL_SOFT_source_spatialize");
-
-    ALCuint maxtotal;
-    ALCint maxmono = 0, maxstereo = 0;
-    alcGetIntegerv(mDevice, ALC_MONO_SOURCES, 1, &maxmono);
-    alcGetIntegerv(mDevice, ALC_STEREO_SOURCES, 1, &maxstereo);
-    if(getALCError(mDevice) != ALC_NO_ERROR)
-        maxtotal = 256;
-    else
+    bool OpenAL_Output::init(const std::string& devname, const std::string& hrtfname, HrtfMode hrtfmode)
     {
-        maxtotal = std::min<ALCuint>(maxmono+maxstereo, 256);
-        if (maxtotal == 0) // workaround for broken implementations
-            maxtotal = 256;
-    }
-    for(size_t i = 0;i < maxtotal;i++)
-    {
-        ALuint src = 0;
-        alGenSources(1, &src);
-        if(alGetError() != AL_NO_ERROR)
-            break;
-        mFreeSources.push_back(src);
-    }
-    if(mFreeSources.empty())
-    {
-        Log(Debug::Warning) << "Could not allocate any sound sourcess";
-        alcMakeContextCurrent(nullptr);
-        alcDestroyContext(mContext);
-        mContext = nullptr;
-        alcCloseDevice(mDevice);
-        mDevice = nullptr;
-        return false;
-    }
-    Log(Debug::Info) << "Allocated " << mFreeSources.size() << " sound sources";
+        deinit();
 
-    if(ALC.EXT_EFX)
-    {
-#define LOAD_FUNC(x) getALFunc(x, #x)
-        LOAD_FUNC(alGenEffects);
-        LOAD_FUNC(alDeleteEffects);
-        LOAD_FUNC(alIsEffect);
-        LOAD_FUNC(alEffecti);
-        LOAD_FUNC(alEffectiv);
-        LOAD_FUNC(alEffectf);
-        LOAD_FUNC(alEffectfv);
-        LOAD_FUNC(alGetEffecti);
-        LOAD_FUNC(alGetEffectiv);
-        LOAD_FUNC(alGetEffectf);
-        LOAD_FUNC(alGetEffectfv);
-        LOAD_FUNC(alGenFilters);
-        LOAD_FUNC(alDeleteFilters);
-        LOAD_FUNC(alIsFilter);
-        LOAD_FUNC(alFilteri);
-        LOAD_FUNC(alFilteriv);
-        LOAD_FUNC(alFilterf);
-        LOAD_FUNC(alFilterfv);
-        LOAD_FUNC(alGetFilteri);
-        LOAD_FUNC(alGetFilteriv);
-        LOAD_FUNC(alGetFilterf);
-        LOAD_FUNC(alGetFilterfv);
-        LOAD_FUNC(alGenAuxiliaryEffectSlots);
-        LOAD_FUNC(alDeleteAuxiliaryEffectSlots);
-        LOAD_FUNC(alIsAuxiliaryEffectSlot);
-        LOAD_FUNC(alAuxiliaryEffectSloti);
-        LOAD_FUNC(alAuxiliaryEffectSlotiv);
-        LOAD_FUNC(alAuxiliaryEffectSlotf);
-        LOAD_FUNC(alAuxiliaryEffectSlotfv);
-        LOAD_FUNC(alGetAuxiliaryEffectSloti);
-        LOAD_FUNC(alGetAuxiliaryEffectSlotiv);
-        LOAD_FUNC(alGetAuxiliaryEffectSlotf);
-        LOAD_FUNC(alGetAuxiliaryEffectSlotfv);
-#undef LOAD_FUNC
-        if(getALError() != AL_NO_ERROR)
+        Log(Debug::Info) << "Initializing OpenAL...";
+
+        mDevice = alcOpenDevice(devname.c_str());
+        if (!mDevice && !devname.empty())
         {
-            ALC.EXT_EFX = false;
-            goto skip_efx;
+            Log(Debug::Warning) << "Failed to open \"" << devname << "\", trying default";
+            mDevice = alcOpenDevice(nullptr);
         }
 
-        alGenFilters(1, &mWaterFilter);
-        if(alGetError() == AL_NO_ERROR)
+        if (!mDevice)
         {
-            alFilteri(mWaterFilter, AL_FILTER_TYPE, AL_FILTER_LOWPASS);
-            if(alGetError() == AL_NO_ERROR)
-            {
-                Log(Debug::Info) << "Low-pass filter supported";
-                alFilterf(mWaterFilter, AL_LOWPASS_GAIN, 0.9f);
-                alFilterf(mWaterFilter, AL_LOWPASS_GAINHF, 0.125f);
-            }
-            else
+            Log(Debug::Error) << "Failed to open default audio device";
+            return false;
+        }
+
+        const ALCchar* name = nullptr;
+        if (alcIsExtensionPresent(mDevice, "ALC_ENUMERATE_ALL_EXT"))
+            name = alcGetString(mDevice, ALC_ALL_DEVICES_SPECIFIER);
+        if (alcGetError(mDevice) != AL_NO_ERROR || !name)
+            name = alcGetString(mDevice, ALC_DEVICE_SPECIFIER);
+        Log(Debug::Info) << "Opened \"" << name << "\"";
+
+        ALCint major = 0, minor = 0;
+        alcGetIntegerv(mDevice, ALC_MAJOR_VERSION, 1, &major);
+        alcGetIntegerv(mDevice, ALC_MINOR_VERSION, 1, &minor);
+        Log(Debug::Info) << "  ALC Version: " << major << "." << minor << "\n"
+                         << "  ALC Extensions: " << alcGetString(mDevice, ALC_EXTENSIONS);
+
+        ALC.EXT_EFX = alcIsExtensionPresent(mDevice, "ALC_EXT_EFX");
+        ALC.SOFT_HRTF = alcIsExtensionPresent(mDevice, "ALC_SOFT_HRTF");
+
+        std::vector<ALCint> attrs;
+        attrs.reserve(15);
+        if (ALC.SOFT_HRTF)
+        {
+            LPALCGETSTRINGISOFT alcGetStringiSOFT = nullptr;
+            getALCFunc(alcGetStringiSOFT, mDevice, "alcGetStringiSOFT");
+
+            attrs.push_back(ALC_HRTF_SOFT);
+            attrs.push_back(hrtfmode == HrtfMode::Disable ? ALC_FALSE
+                    : hrtfmode == HrtfMode::Enable        ? ALC_TRUE
+                                                          :
+                                                   /*hrtfmode == HrtfMode::Auto ?*/ ALC_DONT_CARE_SOFT);
+            if (!hrtfname.empty())
             {
-                alDeleteFilters(1, &mWaterFilter);
-                mWaterFilter = 0;
+                ALCint index = -1;
+                ALCint num_hrtf;
+                alcGetIntegerv(mDevice, ALC_NUM_HRTF_SPECIFIERS_SOFT, 1, &num_hrtf);
+                for (ALCint i = 0; i < num_hrtf; ++i)
+                {
+                    const ALCchar* entry = alcGetStringiSOFT(mDevice, ALC_HRTF_SPECIFIER_SOFT, i);
+                    if (hrtfname == entry)
+                    {
+                        index = i;
+                        break;
+                    }
+                }
+
+                if (index < 0)
+                    Log(Debug::Warning) << "Failed to find HRTF \"" << hrtfname << "\", using default";
+                else
+                {
+                    attrs.push_back(ALC_HRTF_ID_SOFT);
+                    attrs.push_back(index);
+                }
             }
-            alGetError();
         }
+        attrs.push_back(0);
 
-        alGenAuxiliaryEffectSlots(1, &mEffectSlot);
-        alGetError();
+        mContext = alcCreateContext(mDevice, attrs.data());
+        if (!mContext || alcMakeContextCurrent(mContext) == ALC_FALSE)
+        {
+            Log(Debug::Error) << "Failed to setup audio context: " << alcGetString(mDevice, alcGetError(mDevice));
+            if (mContext)
+                alcDestroyContext(mContext);
+            mContext = nullptr;
+            alcCloseDevice(mDevice);
+            mDevice = nullptr;
+            return false;
+        }
+
+        Log(Debug::Info) << "  Vendor: " << alGetString(AL_VENDOR) << "\n"
+                         << "  Renderer: " << alGetString(AL_RENDERER) << "\n"
+                         << "  Version: " << alGetString(AL_VERSION) << "\n"
+                         << "  Extensions: " << alGetString(AL_EXTENSIONS);
 
-        alGenEffects(1, &mDefaultEffect);
-        if(alGetError() == AL_NO_ERROR)
+        if (!ALC.SOFT_HRTF)
+            Log(Debug::Warning) << "HRTF status unavailable";
+        else
         {
-            alEffecti(mDefaultEffect, AL_EFFECT_TYPE, AL_EFFECT_EAXREVERB);
-            if(alGetError() == AL_NO_ERROR)
-                Log(Debug::Info) << "EAX Reverb supported";
+            ALCint hrtf_state;
+            alcGetIntegerv(mDevice, ALC_HRTF_SOFT, 1, &hrtf_state);
+            if (!hrtf_state)
+                Log(Debug::Info) << "HRTF disabled";
             else
             {
-                alEffecti(mDefaultEffect, AL_EFFECT_TYPE, AL_EFFECT_REVERB);
-                if(alGetError() == AL_NO_ERROR)
-                    Log(Debug::Info) << "Standard Reverb supported";
+                const ALCchar* hrtf = alcGetString(mDevice, ALC_HRTF_SPECIFIER_SOFT);
+                Log(Debug::Info) << "Enabled HRTF " << hrtf;
             }
-            EFXEAXREVERBPROPERTIES props = EFX_REVERB_PRESET_LIVINGROOM;
-            props.flGain = 0.0f;
-            LoadEffect(mDefaultEffect, props);
         }
 
-        alGenEffects(1, &mWaterEffect);
-        if(alGetError() == AL_NO_ERROR)
-        {
-            alEffecti(mWaterEffect, AL_EFFECT_TYPE, AL_EFFECT_EAXREVERB);
-            if(alGetError() != AL_NO_ERROR)
+        AL.SOFT_source_spatialize = alIsExtensionPresent("AL_SOFT_source_spatialize");
+
+        ALCuint maxtotal;
+        ALCint maxmono = 0, maxstereo = 0;
+        alcGetIntegerv(mDevice, ALC_MONO_SOURCES, 1, &maxmono);
+        alcGetIntegerv(mDevice, ALC_STEREO_SOURCES, 1, &maxstereo);
+        if (getALCError(mDevice) != ALC_NO_ERROR)
+            maxtotal = 256;
+        else
+        {
+            maxtotal = std::min<ALCuint>(maxmono + maxstereo, 256);
+            if (maxtotal == 0) // workaround for broken implementations
+                maxtotal = 256;
+        }
+        for (size_t i = 0; i < maxtotal; i++)
+        {
+            ALuint src = 0;
+            alGenSources(1, &src);
+            if (alGetError() != AL_NO_ERROR)
+                break;
+            mFreeSources.push_back(src);
+        }
+        if (mFreeSources.empty())
+        {
+            Log(Debug::Warning) << "Could not allocate any sound sourcess";
+            alcMakeContextCurrent(nullptr);
+            alcDestroyContext(mContext);
+            mContext = nullptr;
+            alcCloseDevice(mDevice);
+            mDevice = nullptr;
+            return false;
+        }
+        Log(Debug::Info) << "Allocated " << mFreeSources.size() << " sound sources";
+
+        if (ALC.EXT_EFX)
+        {
+#define LOAD_FUNC(x) getALFunc(x, #x)
+            LOAD_FUNC(alGenEffects);
+            LOAD_FUNC(alDeleteEffects);
+            LOAD_FUNC(alIsEffect);
+            LOAD_FUNC(alEffecti);
+            LOAD_FUNC(alEffectiv);
+            LOAD_FUNC(alEffectf);
+            LOAD_FUNC(alEffectfv);
+            LOAD_FUNC(alGetEffecti);
+            LOAD_FUNC(alGetEffectiv);
+            LOAD_FUNC(alGetEffectf);
+            LOAD_FUNC(alGetEffectfv);
+            LOAD_FUNC(alGenFilters);
+            LOAD_FUNC(alDeleteFilters);
+            LOAD_FUNC(alIsFilter);
+            LOAD_FUNC(alFilteri);
+            LOAD_FUNC(alFilteriv);
+            LOAD_FUNC(alFilterf);
+            LOAD_FUNC(alFilterfv);
+            LOAD_FUNC(alGetFilteri);
+            LOAD_FUNC(alGetFilteriv);
+            LOAD_FUNC(alGetFilterf);
+            LOAD_FUNC(alGetFilterfv);
+            LOAD_FUNC(alGenAuxiliaryEffectSlots);
+            LOAD_FUNC(alDeleteAuxiliaryEffectSlots);
+            LOAD_FUNC(alIsAuxiliaryEffectSlot);
+            LOAD_FUNC(alAuxiliaryEffectSloti);
+            LOAD_FUNC(alAuxiliaryEffectSlotiv);
+            LOAD_FUNC(alAuxiliaryEffectSlotf);
+            LOAD_FUNC(alAuxiliaryEffectSlotfv);
+            LOAD_FUNC(alGetAuxiliaryEffectSloti);
+            LOAD_FUNC(alGetAuxiliaryEffectSlotiv);
+            LOAD_FUNC(alGetAuxiliaryEffectSlotf);
+            LOAD_FUNC(alGetAuxiliaryEffectSlotfv);
+#undef LOAD_FUNC
+            if (getALError() != AL_NO_ERROR)
             {
-                alEffecti(mWaterEffect, AL_EFFECT_TYPE, AL_EFFECT_REVERB);
-                alGetError();
+                ALC.EXT_EFX = false;
+                goto skip_efx;
             }
-            LoadEffect(mWaterEffect, EFX_REVERB_PRESET_UNDERWATER);
-        }
 
-        alListenerf(AL_METERS_PER_UNIT, 1.0f / Constants::UnitsPerMeter);
-    }
-skip_efx:
-    alDistanceModel(AL_INVERSE_DISTANCE_CLAMPED);
-    // Speed of sound is in units per second. Take the sound speed in air (assumed
-    // meters per second), multiply by the units per meter to get the speed in u/s.
-    alSpeedOfSound(Constants::SoundSpeedInAir * Constants::UnitsPerMeter);
-    alGetError();
-
-    mInitialized = true;
-    return true;
-}
+            alGenFilters(1, &mWaterFilter);
+            if (alGetError() == AL_NO_ERROR)
+            {
+                alFilteri(mWaterFilter, AL_FILTER_TYPE, AL_FILTER_LOWPASS);
+                if (alGetError() == AL_NO_ERROR)
+                {
+                    Log(Debug::Info) << "Low-pass filter supported";
+                    alFilterf(mWaterFilter, AL_LOWPASS_GAIN, 0.9f);
+                    alFilterf(mWaterFilter, AL_LOWPASS_GAINHF, 0.125f);
+                }
+                else
+                {
+                    alDeleteFilters(1, &mWaterFilter);
+                    mWaterFilter = 0;
+                }
+                alGetError();
+            }
 
-void OpenAL_Output::deinit()
-{
-    mStreamThread->removeAll();
-
-    for(ALuint source : mFreeSources)
-        alDeleteSources(1, &source);
-    mFreeSources.clear();
-
-    if(mEffectSlot)
-        alDeleteAuxiliaryEffectSlots(1, &mEffectSlot);
-    mEffectSlot = 0;
-    if(mDefaultEffect)
-        alDeleteEffects(1, &mDefaultEffect);
-    mDefaultEffect = 0;
-    if(mWaterEffect)
-        alDeleteEffects(1, &mWaterEffect);
-    mWaterEffect = 0;
-    if(mWaterFilter)
-        alDeleteFilters(1, &mWaterFilter);
-    mWaterFilter = 0;
-
-    alcMakeContextCurrent(nullptr);
-    if(mContext)
-        alcDestroyContext(mContext);
-    mContext = nullptr;
-    if(mDevice)
-        alcCloseDevice(mDevice);
-    mDevice = nullptr;
-
-    mInitialized = false;
-}
+            alGenAuxiliaryEffectSlots(1, &mEffectSlot);
+            alGetError();
 
+            alGenEffects(1, &mDefaultEffect);
+            if (alGetError() == AL_NO_ERROR)
+            {
+                alEffecti(mDefaultEffect, AL_EFFECT_TYPE, AL_EFFECT_EAXREVERB);
+                if (alGetError() == AL_NO_ERROR)
+                    Log(Debug::Info) << "EAX Reverb supported";
+                else
+                {
+                    alEffecti(mDefaultEffect, AL_EFFECT_TYPE, AL_EFFECT_REVERB);
+                    if (alGetError() == AL_NO_ERROR)
+                        Log(Debug::Info) << "Standard Reverb supported";
+                }
+                EFXEAXREVERBPROPERTIES props = EFX_REVERB_PRESET_LIVINGROOM;
+                props.flGain = 0.0f;
+                LoadEffect(mDefaultEffect, props);
+            }
 
-std::vector<std::string> OpenAL_Output::enumerateHrtf()
-{
-    std::vector<std::string> ret;
+            alGenEffects(1, &mWaterEffect);
+            if (alGetError() == AL_NO_ERROR)
+            {
+                alEffecti(mWaterEffect, AL_EFFECT_TYPE, AL_EFFECT_EAXREVERB);
+                if (alGetError() != AL_NO_ERROR)
+                {
+                    alEffecti(mWaterEffect, AL_EFFECT_TYPE, AL_EFFECT_REVERB);
+                    alGetError();
+                }
+                LoadEffect(mWaterEffect, EFX_REVERB_PRESET_UNDERWATER);
+            }
 
-    if(!mDevice || !ALC.SOFT_HRTF)
-        return ret;
+            alListenerf(AL_METERS_PER_UNIT, 1.0f / Constants::UnitsPerMeter);
+        }
+    skip_efx:
+        alDistanceModel(AL_INVERSE_DISTANCE_CLAMPED);
+        // Speed of sound is in units per second. Take the sound speed in air (assumed
+        // meters per second), multiply by the units per meter to get the speed in u/s.
+        alSpeedOfSound(Constants::SoundSpeedInAir * Constants::UnitsPerMeter);
+        alGetError();
 
-    LPALCGETSTRINGISOFT alcGetStringiSOFT = nullptr;
-    getALCFunc(alcGetStringiSOFT, mDevice, "alcGetStringiSOFT");
+        mInitialized = true;
+        return true;
+    }
 
-    ALCint num_hrtf;
-    alcGetIntegerv(mDevice, ALC_NUM_HRTF_SPECIFIERS_SOFT, 1, &num_hrtf);
-    ret.reserve(num_hrtf);
-    for(ALCint i = 0;i < num_hrtf;++i)
+    void OpenAL_Output::deinit()
     {
-        const ALCchar *entry = alcGetStringiSOFT(mDevice, ALC_HRTF_SPECIFIER_SOFT, i);
-        ret.emplace_back(entry);
-    }
+        mStreamThread->removeAll();
+
+        for (ALuint source : mFreeSources)
+            alDeleteSources(1, &source);
+        mFreeSources.clear();
+
+        if (mEffectSlot)
+            alDeleteAuxiliaryEffectSlots(1, &mEffectSlot);
+        mEffectSlot = 0;
+        if (mDefaultEffect)
+            alDeleteEffects(1, &mDefaultEffect);
+        mDefaultEffect = 0;
+        if (mWaterEffect)
+            alDeleteEffects(1, &mWaterEffect);
+        mWaterEffect = 0;
+        if (mWaterFilter)
+            alDeleteFilters(1, &mWaterFilter);
+        mWaterFilter = 0;
 
-    return ret;
-}
+        alcMakeContextCurrent(nullptr);
+        if (mContext)
+            alcDestroyContext(mContext);
+        mContext = nullptr;
+        if (mDevice)
+            alcCloseDevice(mDevice);
+        mDevice = nullptr;
 
-void OpenAL_Output::setHrtf(const std::string &hrtfname, HrtfMode hrtfmode)
-{
-    if(!mDevice || !ALC.SOFT_HRTF)
-    {
-        Log(Debug::Info) << "HRTF extension not present";
-        return;
+        mInitialized = false;
     }
 
-    LPALCGETSTRINGISOFT alcGetStringiSOFT = nullptr;
-    getALCFunc(alcGetStringiSOFT, mDevice, "alcGetStringiSOFT");
+    std::vector<std::string> OpenAL_Output::enumerateHrtf()
+    {
+        std::vector<std::string> ret;
 
-    LPALCRESETDEVICESOFT alcResetDeviceSOFT = nullptr;
-    getALCFunc(alcResetDeviceSOFT, mDevice, "alcResetDeviceSOFT");
+        if (!mDevice || !ALC.SOFT_HRTF)
+            return ret;
 
-    std::vector<ALCint> attrs;
-    attrs.reserve(15);
+        LPALCGETSTRINGISOFT alcGetStringiSOFT = nullptr;
+        getALCFunc(alcGetStringiSOFT, mDevice, "alcGetStringiSOFT");
 
-    attrs.push_back(ALC_HRTF_SOFT);
-    attrs.push_back(hrtfmode == HrtfMode::Disable ? ALC_FALSE :
-                    hrtfmode == HrtfMode::Enable ? ALC_TRUE :
-                    /*hrtfmode == HrtfMode::Auto ?*/ ALC_DONT_CARE_SOFT);
-    if(!hrtfname.empty())
-    {
-        ALCint index = -1;
         ALCint num_hrtf;
         alcGetIntegerv(mDevice, ALC_NUM_HRTF_SPECIFIERS_SOFT, 1, &num_hrtf);
-        for(ALCint i = 0;i < num_hrtf;++i)
+        ret.reserve(num_hrtf);
+        for (ALCint i = 0; i < num_hrtf; ++i)
+        {
+            const ALCchar* entry = alcGetStringiSOFT(mDevice, ALC_HRTF_SPECIFIER_SOFT, i);
+            ret.emplace_back(entry);
+        }
+
+        return ret;
+    }
+
+    void OpenAL_Output::setHrtf(const std::string& hrtfname, HrtfMode hrtfmode)
+    {
+        if (!mDevice || !ALC.SOFT_HRTF)
         {
-            const ALCchar *entry = alcGetStringiSOFT(mDevice, ALC_HRTF_SPECIFIER_SOFT, i);
-            if(hrtfname == entry)
+            Log(Debug::Info) << "HRTF extension not present";
+            return;
+        }
+
+        LPALCGETSTRINGISOFT alcGetStringiSOFT = nullptr;
+        getALCFunc(alcGetStringiSOFT, mDevice, "alcGetStringiSOFT");
+
+        LPALCRESETDEVICESOFT alcResetDeviceSOFT = nullptr;
+        getALCFunc(alcResetDeviceSOFT, mDevice, "alcResetDeviceSOFT");
+
+        std::vector<ALCint> attrs;
+        attrs.reserve(15);
+
+        attrs.push_back(ALC_HRTF_SOFT);
+        attrs.push_back(hrtfmode == HrtfMode::Disable ? ALC_FALSE
+                : hrtfmode == HrtfMode::Enable        ? ALC_TRUE
+                                                      :
+                                               /*hrtfmode == HrtfMode::Auto ?*/ ALC_DONT_CARE_SOFT);
+        if (!hrtfname.empty())
+        {
+            ALCint index = -1;
+            ALCint num_hrtf;
+            alcGetIntegerv(mDevice, ALC_NUM_HRTF_SPECIFIERS_SOFT, 1, &num_hrtf);
+            for (ALCint i = 0; i < num_hrtf; ++i)
             {
-                index = i;
-                break;
+                const ALCchar* entry = alcGetStringiSOFT(mDevice, ALC_HRTF_SPECIFIER_SOFT, i);
+                if (hrtfname == entry)
+                {
+                    index = i;
+                    break;
+                }
+            }
+
+            if (index < 0)
+                Log(Debug::Warning) << "Failed to find HRTF name \"" << hrtfname << "\", using default";
+            else
+            {
+                attrs.push_back(ALC_HRTF_ID_SOFT);
+                attrs.push_back(index);
             }
         }
+        attrs.push_back(0);
+        alcResetDeviceSOFT(mDevice, attrs.data());
 
-        if(index < 0)
-            Log(Debug::Warning) << "Failed to find HRTF name \"" << hrtfname << "\", using default";
+        ALCint hrtf_state;
+        alcGetIntegerv(mDevice, ALC_HRTF_SOFT, 1, &hrtf_state);
+        if (!hrtf_state)
+            Log(Debug::Info) << "HRTF disabled";
         else
         {
-            attrs.push_back(ALC_HRTF_ID_SOFT);
-            attrs.push_back(index);
+            const ALCchar* hrtf = alcGetString(mDevice, ALC_HRTF_SPECIFIER_SOFT);
+            Log(Debug::Info) << "Enabled HRTF " << hrtf;
         }
     }
-    attrs.push_back(0);
-    alcResetDeviceSOFT(mDevice, attrs.data());
-
-    ALCint hrtf_state;
-    alcGetIntegerv(mDevice, ALC_HRTF_SOFT, 1, &hrtf_state);
-    if(!hrtf_state)
-        Log(Debug::Info) << "HRTF disabled";
-    else
-    {
-        const ALCchar *hrtf = alcGetString(mDevice, ALC_HRTF_SPECIFIER_SOFT);
-        Log(Debug::Info) << "Enabled HRTF " << hrtf;
-    }
-}
 
+    std::pair<Sound_Handle, size_t> OpenAL_Output::loadSound(const std::string& fname)
+    {
+        getALError();
 
-std::pair<Sound_Handle,size_t> OpenAL_Output::loadSound(const std::string &fname)
-{
-    getALError();
+        std::vector<char> data;
+        ALenum format = AL_NONE;
+        int srate = 0;
 
-    std::vector<char> data;
-    ALenum format = AL_NONE;
-    int srate = 0;
+        try
+        {
+            DecoderPtr decoder = mManager.getDecoder();
+            decoder->open(Misc::ResourceHelpers::correctSoundPath(fname, decoder->mResourceMgr));
+
+            ChannelConfig chans;
+            SampleType type;
+            decoder->getInfo(&srate, &chans, &type);
+            format = getALFormat(chans, type);
+            if (format)
+                decoder->readAll(data);
+        }
+        catch (std::exception& e)
+        {
+            Log(Debug::Error) << "Failed to load audio from " << fname << ": " << e.what();
+        }
 
-    try
-    {
-        DecoderPtr decoder = mManager.getDecoder();
-        decoder->open(Misc::ResourceHelpers::correctSoundPath(fname, decoder->mResourceMgr));
+        if (data.empty())
+        {
+            // If we failed to get any usable audio, substitute with silence.
+            format = AL_FORMAT_MONO8;
+            srate = 8000;
+            data.assign(8000, -128);
+        }
 
-        ChannelConfig chans;
-        SampleType type;
-        decoder->getInfo(&srate, &chans, &type);
-        format = getALFormat(chans, type);
-        if(format) decoder->readAll(data);
-    }
-    catch(std::exception &e)
-    {
-        Log(Debug::Error) << "Failed to load audio from " << fname << ": " << e.what();
+        ALint size;
+        ALuint buf = 0;
+        alGenBuffers(1, &buf);
+        alBufferData(buf, format, data.data(), data.size(), srate);
+        alGetBufferi(buf, AL_SIZE, &size);
+        if (getALError() != AL_NO_ERROR)
+        {
+            if (buf && alIsBuffer(buf))
+                alDeleteBuffers(1, &buf);
+            getALError();
+            return std::make_pair(nullptr, 0);
+        }
+        return std::make_pair(MAKE_PTRID(buf), size);
     }
 
-    if(data.empty())
+    size_t OpenAL_Output::unloadSound(Sound_Handle data)
     {
-        // If we failed to get any usable audio, substitute with silence.
-        format = AL_FORMAT_MONO8;
-        srate = 8000;
-        data.assign(8000, -128);
-    }
+        ALuint buffer = GET_PTRID(data);
+        if (!buffer)
+            return 0;
 
-    ALint size;
-    ALuint buf = 0;
-    alGenBuffers(1, &buf);
-    alBufferData(buf, format, data.data(), data.size(), srate);
-    alGetBufferi(buf, AL_SIZE, &size);
-    if(getALError() != AL_NO_ERROR)
-    {
-        if(buf && alIsBuffer(buf))
-            alDeleteBuffers(1, &buf);
+        // Make sure no sources are playing this buffer before unloading it.
+        SoundVec::const_iterator iter = mActiveSounds.begin();
+        for (; iter != mActiveSounds.end(); ++iter)
+        {
+            if (!(*iter)->mHandle)
+                continue;
+
+            ALuint source = GET_PTRID((*iter)->mHandle);
+            ALint srcbuf;
+            alGetSourcei(source, AL_BUFFER, &srcbuf);
+            if ((ALuint)srcbuf == buffer)
+            {
+                alSourceStop(source);
+                alSourcei(source, AL_BUFFER, 0);
+            }
+        }
+        ALint size = 0;
+        alGetBufferi(buffer, AL_SIZE, &size);
+        alDeleteBuffers(1, &buffer);
         getALError();
-        return std::make_pair(nullptr, 0);
+        return size;
     }
-    return std::make_pair(MAKE_PTRID(buf), size);
-}
 
-size_t OpenAL_Output::unloadSound(Sound_Handle data)
-{
-    ALuint buffer = GET_PTRID(data);
-    if(!buffer) return 0;
-
-    // Make sure no sources are playing this buffer before unloading it.
-    SoundVec::const_iterator iter = mActiveSounds.begin();
-    for(;iter != mActiveSounds.end();++iter)
+    void OpenAL_Output::initCommon2D(
+        ALuint source, const osg::Vec3f& pos, ALfloat gain, ALfloat pitch, bool loop, bool useenv)
     {
-        if(!(*iter)->mHandle)
-            continue;
-
-        ALuint source = GET_PTRID((*iter)->mHandle);
-        ALint srcbuf;
-        alGetSourcei(source, AL_BUFFER, &srcbuf);
-        if((ALuint)srcbuf == buffer)
+        alSourcef(source, AL_REFERENCE_DISTANCE, 1.0f);
+        alSourcef(source, AL_MAX_DISTANCE, 1000.0f);
+        alSourcef(source, AL_ROLLOFF_FACTOR, 0.0f);
+        alSourcei(source, AL_SOURCE_RELATIVE, AL_TRUE);
+        alSourcei(source, AL_LOOPING, loop ? AL_TRUE : AL_FALSE);
+        if (AL.SOFT_source_spatialize)
+            alSourcei(source, AL_SOURCE_SPATIALIZE_SOFT, AL_FALSE);
+
+        if (useenv)
         {
-            alSourceStop(source);
-            alSourcei(source, AL_BUFFER, 0);
+            if (mWaterFilter)
+                alSourcei(source, AL_DIRECT_FILTER, (mListenerEnv == Env_Underwater) ? mWaterFilter : AL_FILTER_NULL);
+            else if (mListenerEnv == Env_Underwater)
+            {
+                gain *= 0.9f;
+                pitch *= 0.7f;
+            }
+            if (mEffectSlot)
+                alSource3i(source, AL_AUXILIARY_SEND_FILTER, mEffectSlot, 0, AL_FILTER_NULL);
+        }
+        else
+        {
+            if (mWaterFilter)
+                alSourcei(source, AL_DIRECT_FILTER, AL_FILTER_NULL);
+            if (mEffectSlot)
+                alSource3i(source, AL_AUXILIARY_SEND_FILTER, AL_EFFECTSLOT_NULL, 0, AL_FILTER_NULL);
         }
-    }
-    ALint size = 0;
-    alGetBufferi(buffer, AL_SIZE, &size);
-    alDeleteBuffers(1, &buffer);
-    getALError();
-    return size;
-}
 
+        alSourcef(source, AL_GAIN, gain);
+        alSourcef(source, AL_PITCH, pitch);
+        alSourcefv(source, AL_POSITION, pos.ptr());
+        alSource3f(source, AL_DIRECTION, 0.0f, 0.0f, 0.0f);
+        alSource3f(source, AL_VELOCITY, 0.0f, 0.0f, 0.0f);
+    }
 
-void OpenAL_Output::initCommon2D(ALuint source, const osg::Vec3f &pos, ALfloat gain, ALfloat pitch, bool loop, bool useenv)
-{
-    alSourcef(source, AL_REFERENCE_DISTANCE, 1.0f);
-    alSourcef(source, AL_MAX_DISTANCE, 1000.0f);
-    alSourcef(source, AL_ROLLOFF_FACTOR, 0.0f);
-    alSourcei(source, AL_SOURCE_RELATIVE, AL_TRUE);
-    alSourcei(source, AL_LOOPING, loop ? AL_TRUE : AL_FALSE);
-    if(AL.SOFT_source_spatialize)
-        alSourcei(source, AL_SOURCE_SPATIALIZE_SOFT, AL_FALSE);
-
-    if(useenv)
+    void OpenAL_Output::initCommon3D(ALuint source, const osg::Vec3f& pos, ALfloat mindist, ALfloat maxdist,
+        ALfloat gain, ALfloat pitch, bool loop, bool useenv)
     {
-        if(mWaterFilter)
-            alSourcei(source, AL_DIRECT_FILTER,
-                (mListenerEnv == Env_Underwater) ? mWaterFilter : AL_FILTER_NULL
-            );
-        else if(mListenerEnv == Env_Underwater)
+        alSourcef(source, AL_REFERENCE_DISTANCE, mindist);
+        alSourcef(source, AL_MAX_DISTANCE, maxdist);
+        alSourcef(source, AL_ROLLOFF_FACTOR, 1.0f);
+        alSourcei(source, AL_SOURCE_RELATIVE, AL_FALSE);
+        alSourcei(source, AL_LOOPING, loop ? AL_TRUE : AL_FALSE);
+        if (AL.SOFT_source_spatialize)
+            alSourcei(source, AL_SOURCE_SPATIALIZE_SOFT, AL_TRUE);
+
+        if ((pos - mListenerPos).length2() > maxdist * maxdist)
+            gain = 0.0f;
+        if (useenv)
         {
-            gain *= 0.9f;
-            pitch *= 0.7f;
+            if (mWaterFilter)
+                alSourcei(source, AL_DIRECT_FILTER, (mListenerEnv == Env_Underwater) ? mWaterFilter : AL_FILTER_NULL);
+            else if (mListenerEnv == Env_Underwater)
+            {
+                gain *= 0.9f;
+                pitch *= 0.7f;
+            }
+            if (mEffectSlot)
+                alSource3i(source, AL_AUXILIARY_SEND_FILTER, mEffectSlot, 0, AL_FILTER_NULL);
+        }
+        else
+        {
+            if (mWaterFilter)
+                alSourcei(source, AL_DIRECT_FILTER, AL_FILTER_NULL);
+            if (mEffectSlot)
+                alSource3i(source, AL_AUXILIARY_SEND_FILTER, AL_EFFECTSLOT_NULL, 0, AL_FILTER_NULL);
         }
-        if(mEffectSlot)
-            alSource3i(source, AL_AUXILIARY_SEND_FILTER, mEffectSlot, 0, AL_FILTER_NULL);
-    }
-    else
-    {
-        if(mWaterFilter)
-            alSourcei(source, AL_DIRECT_FILTER, AL_FILTER_NULL);
-        if(mEffectSlot)
-            alSource3i(source, AL_AUXILIARY_SEND_FILTER, AL_EFFECTSLOT_NULL, 0, AL_FILTER_NULL);
-    }
 
-    alSourcef(source, AL_GAIN, gain);
-    alSourcef(source, AL_PITCH, pitch);
-    alSourcefv(source, AL_POSITION, pos.ptr());
-    alSource3f(source, AL_DIRECTION, 0.0f, 0.0f, 0.0f);
-    alSource3f(source, AL_VELOCITY, 0.0f, 0.0f, 0.0f);
-}
+        alSourcef(source, AL_GAIN, gain);
+        alSourcef(source, AL_PITCH, pitch);
+        alSourcefv(source, AL_POSITION, pos.ptr());
+        alSource3f(source, AL_DIRECTION, 0.0f, 0.0f, 0.0f);
+        alSource3f(source, AL_VELOCITY, 0.0f, 0.0f, 0.0f);
+    }
 
-void OpenAL_Output::initCommon3D(ALuint source, const osg::Vec3f &pos, ALfloat mindist, ALfloat maxdist, ALfloat gain, ALfloat pitch, bool loop, bool useenv)
-{
-    alSourcef(source, AL_REFERENCE_DISTANCE, mindist);
-    alSourcef(source, AL_MAX_DISTANCE, maxdist);
-    alSourcef(source, AL_ROLLOFF_FACTOR, 1.0f);
-    alSourcei(source, AL_SOURCE_RELATIVE, AL_FALSE);
-    alSourcei(source, AL_LOOPING, loop ? AL_TRUE : AL_FALSE);
-    if(AL.SOFT_source_spatialize)
-        alSourcei(source, AL_SOURCE_SPATIALIZE_SOFT, AL_TRUE);
-
-    if((pos - mListenerPos).length2() > maxdist*maxdist)
-        gain = 0.0f;
-    if(useenv)
+    void OpenAL_Output::updateCommon(
+        ALuint source, const osg::Vec3f& pos, ALfloat maxdist, ALfloat gain, ALfloat pitch, bool useenv)
     {
-        if(mWaterFilter)
-            alSourcei(source, AL_DIRECT_FILTER,
-                (mListenerEnv == Env_Underwater) ? mWaterFilter : AL_FILTER_NULL
-            );
-        else if(mListenerEnv == Env_Underwater)
+        if (useenv && mListenerEnv == Env_Underwater && !mWaterFilter)
         {
             gain *= 0.9f;
             pitch *= 0.7f;
         }
-        if(mEffectSlot)
-            alSource3i(source, AL_AUXILIARY_SEND_FILTER, mEffectSlot, 0, AL_FILTER_NULL);
-    }
-    else
-    {
-        if(mWaterFilter)
-            alSourcei(source, AL_DIRECT_FILTER, AL_FILTER_NULL);
-        if(mEffectSlot)
-            alSource3i(source, AL_AUXILIARY_SEND_FILTER, AL_EFFECTSLOT_NULL, 0, AL_FILTER_NULL);
-    }
 
-    alSourcef(source, AL_GAIN, gain);
-    alSourcef(source, AL_PITCH, pitch);
-    alSourcefv(source, AL_POSITION, pos.ptr());
-    alSource3f(source, AL_DIRECTION, 0.0f, 0.0f, 0.0f);
-    alSource3f(source, AL_VELOCITY, 0.0f, 0.0f, 0.0f);
-}
+        alSourcef(source, AL_GAIN, gain);
+        alSourcef(source, AL_PITCH, pitch);
+        alSourcefv(source, AL_POSITION, pos.ptr());
+        alSource3f(source, AL_DIRECTION, 0.0f, 0.0f, 0.0f);
+        alSource3f(source, AL_VELOCITY, 0.0f, 0.0f, 0.0f);
+    }
 
-void OpenAL_Output::updateCommon(ALuint source, const osg::Vec3f& pos, ALfloat maxdist, ALfloat gain, ALfloat pitch, bool useenv)
-{
-    if(useenv && mListenerEnv == Env_Underwater && !mWaterFilter)
+    bool OpenAL_Output::playSound(Sound* sound, Sound_Handle data, float offset)
     {
-        gain *= 0.9f;
-        pitch *= 0.7f;
-    }
+        ALuint source;
 
-    alSourcef(source, AL_GAIN, gain);
-    alSourcef(source, AL_PITCH, pitch);
-    alSourcefv(source, AL_POSITION, pos.ptr());
-    alSource3f(source, AL_DIRECTION, 0.0f, 0.0f, 0.0f);
-    alSource3f(source, AL_VELOCITY, 0.0f, 0.0f, 0.0f);
-}
+        if (mFreeSources.empty())
+        {
+            Log(Debug::Warning) << "No free sources!";
+            return false;
+        }
+        source = mFreeSources.front();
 
+        initCommon2D(source, sound->getPosition(), sound->getRealVolume(), getTimeScaledPitch(sound),
+            sound->getIsLooping(), sound->getUseEnv());
+        alSourcei(source, AL_BUFFER, GET_PTRID(data));
+        alSourcef(source, AL_SEC_OFFSET, offset);
+        if (getALError() != AL_NO_ERROR)
+        {
+            alSourceRewind(source);
+            alSourcei(source, AL_BUFFER, 0);
+            alGetError();
+            return false;
+        }
 
-bool OpenAL_Output::playSound(Sound *sound, Sound_Handle data, float offset)
-{
-    ALuint source;
+        alSourcePlay(source);
+        if (getALError() != AL_NO_ERROR)
+        {
+            alSourceRewind(source);
+            alSourcei(source, AL_BUFFER, 0);
+            alGetError();
+            return false;
+        }
 
-    if(mFreeSources.empty())
-    {
-        Log(Debug::Warning) << "No free sources!";
-        return false;
-    }
-    source = mFreeSources.front();
+        mFreeSources.pop_front();
+        sound->mHandle = MAKE_PTRID(source);
+        mActiveSounds.push_back(sound);
 
-    initCommon2D(source, sound->getPosition(), sound->getRealVolume(), getTimeScaledPitch(sound),
-                 sound->getIsLooping(), sound->getUseEnv());
-    alSourcei(source, AL_BUFFER, GET_PTRID(data));
-    alSourcef(source, AL_SEC_OFFSET, offset);
-    if(getALError() != AL_NO_ERROR)
-    {
-        alSourceRewind(source);
-        alSourcei(source, AL_BUFFER, 0);
-        alGetError();
-        return false;
+        return true;
     }
 
-    alSourcePlay(source);
-    if(getALError() != AL_NO_ERROR)
+    bool OpenAL_Output::playSound3D(Sound* sound, Sound_Handle data, float offset)
     {
-        alSourceRewind(source);
-        alSourcei(source, AL_BUFFER, 0);
-        alGetError();
-        return false;
-    }
+        ALuint source;
 
-    mFreeSources.pop_front();
-    sound->mHandle = MAKE_PTRID(source);
-    mActiveSounds.push_back(sound);
+        if (mFreeSources.empty())
+        {
+            Log(Debug::Warning) << "No free sources!";
+            return false;
+        }
+        source = mFreeSources.front();
 
-    return true;
-}
+        initCommon3D(source, sound->getPosition(), sound->getMinDistance(), sound->getMaxDistance(),
+            sound->getRealVolume(), getTimeScaledPitch(sound), sound->getIsLooping(), sound->getUseEnv());
+        alSourcei(source, AL_BUFFER, GET_PTRID(data));
+        alSourcef(source, AL_SEC_OFFSET, offset);
+        if (getALError() != AL_NO_ERROR)
+        {
+            alSourceRewind(source);
+            alSourcei(source, AL_BUFFER, 0);
+            alGetError();
+            return false;
+        }
 
-bool OpenAL_Output::playSound3D(Sound *sound, Sound_Handle data, float offset)
-{
-    ALuint source;
+        alSourcePlay(source);
+        if (getALError() != AL_NO_ERROR)
+        {
+            alSourceRewind(source);
+            alSourcei(source, AL_BUFFER, 0);
+            alGetError();
+            return false;
+        }
 
-    if(mFreeSources.empty())
-    {
-        Log(Debug::Warning) << "No free sources!";
-        return false;
-    }
-    source = mFreeSources.front();
-
-    initCommon3D(source, sound->getPosition(), sound->getMinDistance(), sound->getMaxDistance(),
-                 sound->getRealVolume(), getTimeScaledPitch(sound), sound->getIsLooping(),
-                 sound->getUseEnv());
-    alSourcei(source, AL_BUFFER, GET_PTRID(data));
-    alSourcef(source, AL_SEC_OFFSET, offset);
-    if(getALError() != AL_NO_ERROR)
-    {
-        alSourceRewind(source);
-        alSourcei(source, AL_BUFFER, 0);
-        alGetError();
-        return false;
+        mFreeSources.pop_front();
+        sound->mHandle = MAKE_PTRID(source);
+        mActiveSounds.push_back(sound);
+
+        return true;
     }
 
-    alSourcePlay(source);
-    if(getALError() != AL_NO_ERROR)
+    void OpenAL_Output::finishSound(Sound* sound)
     {
+        if (!sound->mHandle)
+            return;
+        ALuint source = GET_PTRID(sound->mHandle);
+        sound->mHandle = nullptr;
+
+        // Rewind the stream to put the source back into an AL_INITIAL state, for
+        // the next time it's used.
         alSourceRewind(source);
         alSourcei(source, AL_BUFFER, 0);
-        alGetError();
-        return false;
-    }
-
-    mFreeSources.pop_front();
-    sound->mHandle = MAKE_PTRID(source);
-    mActiveSounds.push_back(sound);
-
-    return true;
-}
-
-void OpenAL_Output::finishSound(Sound *sound)
-{
-    if(!sound->mHandle) return;
-    ALuint source = GET_PTRID(sound->mHandle);
-    sound->mHandle = nullptr;
-
-    // Rewind the stream to put the source back into an AL_INITIAL state, for
-    // the next time it's used.
-    alSourceRewind(source);
-    alSourcei(source, AL_BUFFER, 0);
-    getALError();
-
-    mFreeSources.push_back(source);
-    mActiveSounds.erase(std::find(mActiveSounds.begin(), mActiveSounds.end(), sound));
-}
-
-bool OpenAL_Output::isSoundPlaying(Sound *sound)
-{
-    if(!sound->mHandle) return false;
-    ALuint source = GET_PTRID(sound->mHandle);
-    ALint state = AL_STOPPED;
-
-    alGetSourcei(source, AL_SOURCE_STATE, &state);
-    getALError();
-
-    return state == AL_PLAYING || state == AL_PAUSED;
-}
+        getALError();
 
-void OpenAL_Output::updateSound(Sound *sound)
-{
-    if(!sound->mHandle) return;
-    ALuint source = GET_PTRID(sound->mHandle);
+        mFreeSources.push_back(source);
+        mActiveSounds.erase(std::find(mActiveSounds.begin(), mActiveSounds.end(), sound));
+    }
 
-    updateCommon(source, sound->getPosition(), sound->getMaxDistance(), sound->getRealVolume(),
-                 getTimeScaledPitch(sound), sound->getUseEnv());
-    getALError();
-}
+    bool OpenAL_Output::isSoundPlaying(Sound* sound)
+    {
+        if (!sound->mHandle)
+            return false;
+        ALuint source = GET_PTRID(sound->mHandle);
+        ALint state = AL_STOPPED;
 
+        alGetSourcei(source, AL_SOURCE_STATE, &state);
+        getALError();
 
-bool OpenAL_Output::streamSound(DecoderPtr decoder, Stream *sound, bool getLoudnessData)
-{
-    if(mFreeSources.empty())
-    {
-        Log(Debug::Warning) << "No free sources!";
-        return false;
+        return state == AL_PLAYING || state == AL_PAUSED;
     }
-    ALuint source = mFreeSources.front();
 
-    if(sound->getIsLooping())
-        Log(Debug::Warning) << "Warning: cannot loop stream \"" << decoder->getName() << "\"";
+    void OpenAL_Output::updateSound(Sound* sound)
+    {
+        if (!sound->mHandle)
+            return;
+        ALuint source = GET_PTRID(sound->mHandle);
 
-    initCommon2D(source, sound->getPosition(), sound->getRealVolume(), getTimeScaledPitch(sound),
-                 false, sound->getUseEnv());
-    if(getALError() != AL_NO_ERROR)
-        return false;
+        updateCommon(source, sound->getPosition(), sound->getMaxDistance(), sound->getRealVolume(),
+            getTimeScaledPitch(sound), sound->getUseEnv());
+        getALError();
+    }
 
-    OpenAL_SoundStream *stream = new OpenAL_SoundStream(source, std::move(decoder));
-    if(!stream->init(getLoudnessData))
+    bool OpenAL_Output::streamSound(DecoderPtr decoder, Stream* sound, bool getLoudnessData)
     {
-        delete stream;
-        return false;
-    }
-    mStreamThread->add(stream);
+        if (mFreeSources.empty())
+        {
+            Log(Debug::Warning) << "No free sources!";
+            return false;
+        }
+        ALuint source = mFreeSources.front();
 
-    mFreeSources.pop_front();
-    sound->mHandle = stream;
-    mActiveStreams.push_back(sound);
-    return true;
-}
+        if (sound->getIsLooping())
+            Log(Debug::Warning) << "Warning: cannot loop stream \"" << decoder->getName() << "\"";
 
-bool OpenAL_Output::streamSound3D(DecoderPtr decoder, Stream *sound, bool getLoudnessData)
-{
-    if(mFreeSources.empty())
-    {
-        Log(Debug::Warning) << "No free sources!";
-        return false;
-    }
-    ALuint source = mFreeSources.front();
+        initCommon2D(
+            source, sound->getPosition(), sound->getRealVolume(), getTimeScaledPitch(sound), false, sound->getUseEnv());
+        if (getALError() != AL_NO_ERROR)
+            return false;
 
-    if(sound->getIsLooping())
-        Log(Debug::Warning) << "Warning: cannot loop stream \"" << decoder->getName() << "\"";
+        OpenAL_SoundStream* stream = new OpenAL_SoundStream(source, std::move(decoder));
+        if (!stream->init(getLoudnessData))
+        {
+            delete stream;
+            return false;
+        }
+        mStreamThread->add(stream);
 
-    initCommon3D(source, sound->getPosition(), sound->getMinDistance(), sound->getMaxDistance(),
-                 sound->getRealVolume(), getTimeScaledPitch(sound), false, sound->getUseEnv());
-    if(getALError() != AL_NO_ERROR)
-        return false;
+        mFreeSources.pop_front();
+        sound->mHandle = stream;
+        mActiveStreams.push_back(sound);
+        return true;
+    }
 
-    OpenAL_SoundStream *stream = new OpenAL_SoundStream(source, std::move(decoder));
-    if(!stream->init(getLoudnessData))
+    bool OpenAL_Output::streamSound3D(DecoderPtr decoder, Stream* sound, bool getLoudnessData)
     {
-        delete stream;
-        return false;
-    }
-    mStreamThread->add(stream);
+        if (mFreeSources.empty())
+        {
+            Log(Debug::Warning) << "No free sources!";
+            return false;
+        }
+        ALuint source = mFreeSources.front();
 
-    mFreeSources.pop_front();
-    sound->mHandle = stream;
-    mActiveStreams.push_back(sound);
-    return true;
-}
+        if (sound->getIsLooping())
+            Log(Debug::Warning) << "Warning: cannot loop stream \"" << decoder->getName() << "\"";
 
-void OpenAL_Output::finishStream(Stream *sound)
-{
-    if(!sound->mHandle) return;
-    OpenAL_SoundStream *stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle);
-    ALuint source = stream->mSource;
+        initCommon3D(source, sound->getPosition(), sound->getMinDistance(), sound->getMaxDistance(),
+            sound->getRealVolume(), getTimeScaledPitch(sound), false, sound->getUseEnv());
+        if (getALError() != AL_NO_ERROR)
+            return false;
 
-    sound->mHandle = nullptr;
-    mStreamThread->remove(stream);
+        OpenAL_SoundStream* stream = new OpenAL_SoundStream(source, std::move(decoder));
+        if (!stream->init(getLoudnessData))
+        {
+            delete stream;
+            return false;
+        }
+        mStreamThread->add(stream);
 
-    // Rewind the stream to put the source back into an AL_INITIAL state, for
-    // the next time it's used.
-    alSourceRewind(source);
-    alSourcei(source, AL_BUFFER, 0);
-    getALError();
+        mFreeSources.pop_front();
+        sound->mHandle = stream;
+        mActiveStreams.push_back(sound);
+        return true;
+    }
 
-    mFreeSources.push_back(source);
-    mActiveStreams.erase(std::find(mActiveStreams.begin(), mActiveStreams.end(), sound));
+    void OpenAL_Output::finishStream(Stream* sound)
+    {
+        if (!sound->mHandle)
+            return;
+        OpenAL_SoundStream* stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle);
+        ALuint source = stream->mSource;
 
-    delete stream;
-}
+        sound->mHandle = nullptr;
+        mStreamThread->remove(stream);
 
-double OpenAL_Output::getStreamDelay(Stream *sound)
-{
-    if(!sound->mHandle) return 0.0;
-    OpenAL_SoundStream *stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle);
-    return stream->getStreamDelay();
-}
+        // Rewind the stream to put the source back into an AL_INITIAL state, for
+        // the next time it's used.
+        alSourceRewind(source);
+        alSourcei(source, AL_BUFFER, 0);
+        getALError();
 
-double OpenAL_Output::getStreamOffset(Stream *sound)
-{
-    if(!sound->mHandle) return 0.0;
-    OpenAL_SoundStream *stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle);
-    std::lock_guard<std::mutex> lock(mStreamThread->mMutex);
-    return stream->getStreamOffset();
-}
+        mFreeSources.push_back(source);
+        mActiveStreams.erase(std::find(mActiveStreams.begin(), mActiveStreams.end(), sound));
 
-float OpenAL_Output::getStreamLoudness(Stream *sound)
-{
-    if(!sound->mHandle) return 0.0;
-    OpenAL_SoundStream *stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle);
-    std::lock_guard<std::mutex> lock(mStreamThread->mMutex);
-    return stream->getCurrentLoudness();
-}
+        delete stream;
+    }
 
-bool OpenAL_Output::isStreamPlaying(Stream *sound)
-{
-    if(!sound->mHandle) return false;
-    OpenAL_SoundStream *stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle);
-    std::lock_guard<std::mutex> lock(mStreamThread->mMutex);
-    return stream->isPlaying();
-}
+    double OpenAL_Output::getStreamDelay(Stream* sound)
+    {
+        if (!sound->mHandle)
+            return 0.0;
+        OpenAL_SoundStream* stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle);
+        return stream->getStreamDelay();
+    }
 
-void OpenAL_Output::updateStream(Stream *sound)
-{
-    if(!sound->mHandle) return;
-    OpenAL_SoundStream *stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle);
-    ALuint source = stream->mSource;
+    double OpenAL_Output::getStreamOffset(Stream* sound)
+    {
+        if (!sound->mHandle)
+            return 0.0;
+        OpenAL_SoundStream* stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle);
+        std::lock_guard<std::mutex> lock(mStreamThread->mMutex);
+        return stream->getStreamOffset();
+    }
 
-    updateCommon(source, sound->getPosition(), sound->getMaxDistance(), sound->getRealVolume(),
-                 getTimeScaledPitch(sound), sound->getUseEnv());
-    getALError();
-}
+    float OpenAL_Output::getStreamLoudness(Stream* sound)
+    {
+        if (!sound->mHandle)
+            return 0.0;
+        OpenAL_SoundStream* stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle);
+        std::lock_guard<std::mutex> lock(mStreamThread->mMutex);
+        return stream->getCurrentLoudness();
+    }
 
+    bool OpenAL_Output::isStreamPlaying(Stream* sound)
+    {
+        if (!sound->mHandle)
+            return false;
+        OpenAL_SoundStream* stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle);
+        std::lock_guard<std::mutex> lock(mStreamThread->mMutex);
+        return stream->isPlaying();
+    }
 
-void OpenAL_Output::startUpdate()
-{
-    alcSuspendContext(alcGetCurrentContext());
-}
+    void OpenAL_Output::updateStream(Stream* sound)
+    {
+        if (!sound->mHandle)
+            return;
+        OpenAL_SoundStream* stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle);
+        ALuint source = stream->mSource;
 
-void OpenAL_Output::finishUpdate()
-{
-    alcProcessContext(alcGetCurrentContext());
-}
+        updateCommon(source, sound->getPosition(), sound->getMaxDistance(), sound->getRealVolume(),
+            getTimeScaledPitch(sound), sound->getUseEnv());
+        getALError();
+    }
 
+    void OpenAL_Output::startUpdate()
+    {
+        alcSuspendContext(alcGetCurrentContext());
+    }
 
-void OpenAL_Output::updateListener(const osg::Vec3f &pos, const osg::Vec3f &atdir, const osg::Vec3f &updir, Environment env)
-{
-    if(mContext)
+    void OpenAL_Output::finishUpdate()
     {
-        ALfloat orient[6] = {
-            atdir.x(), atdir.y(), atdir.z(),
-            updir.x(), updir.y(), updir.z()
-        };
-        alListenerfv(AL_POSITION, pos.ptr());
-        alListenerfv(AL_ORIENTATION, orient);
+        alcProcessContext(alcGetCurrentContext());
+    }
 
-        if(env != mListenerEnv)
+    void OpenAL_Output::updateListener(
+        const osg::Vec3f& pos, const osg::Vec3f& atdir, const osg::Vec3f& updir, Environment env)
+    {
+        if (mContext)
         {
-            alSpeedOfSound(((env == Env_Underwater) ? Constants::SoundSpeedUnderwater : Constants::SoundSpeedInAir) * Constants::UnitsPerMeter);
+            ALfloat orient[6] = { atdir.x(), atdir.y(), atdir.z(), updir.x(), updir.y(), updir.z() };
+            alListenerfv(AL_POSITION, pos.ptr());
+            alListenerfv(AL_ORIENTATION, orient);
 
-            // Update active sources with the environment's direct filter
-            if(mWaterFilter)
+            if (env != mListenerEnv)
             {
-                ALuint filter = (env == Env_Underwater) ? mWaterFilter : AL_FILTER_NULL;
-                for(Sound *sound : mActiveSounds)
-                {
-                    if(sound->getUseEnv())
-                        alSourcei(GET_PTRID(sound->mHandle), AL_DIRECT_FILTER, filter);
-                }
-                for(Stream *sound : mActiveStreams)
+                alSpeedOfSound(((env == Env_Underwater) ? Constants::SoundSpeedUnderwater : Constants::SoundSpeedInAir)
+                    * Constants::UnitsPerMeter);
+
+                // Update active sources with the environment's direct filter
+                if (mWaterFilter)
                 {
-                    if(sound->getUseEnv())
-                        alSourcei(
-                            reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle)->mSource,
-                            AL_DIRECT_FILTER, filter
-                        );
+                    ALuint filter = (env == Env_Underwater) ? mWaterFilter : AL_FILTER_NULL;
+                    for (Sound* sound : mActiveSounds)
+                    {
+                        if (sound->getUseEnv())
+                            alSourcei(GET_PTRID(sound->mHandle), AL_DIRECT_FILTER, filter);
+                    }
+                    for (Stream* sound : mActiveStreams)
+                    {
+                        if (sound->getUseEnv())
+                            alSourcei(reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle)->mSource, AL_DIRECT_FILTER,
+                                filter);
+                    }
                 }
+                // Update the environment effect
+                if (mEffectSlot)
+                    alAuxiliaryEffectSloti(
+                        mEffectSlot, AL_EFFECTSLOT_EFFECT, (env == Env_Underwater) ? mWaterEffect : mDefaultEffect);
             }
-            // Update the environment effect
-            if(mEffectSlot)
-                alAuxiliaryEffectSloti(mEffectSlot, AL_EFFECTSLOT_EFFECT,
-                    (env == Env_Underwater) ? mWaterEffect : mDefaultEffect
-                );
+            getALError();
         }
-        getALError();
-    }
 
-    mListenerPos = pos;
-    mListenerEnv = env;
-}
-
-
-void OpenAL_Output::pauseSounds(int types)
-{
-    std::vector<ALuint> sources;
-    for(Sound *sound : mActiveSounds)
-    {
-        if((types&sound->getPlayType()))
-            sources.push_back(GET_PTRID(sound->mHandle));
+        mListenerPos = pos;
+        mListenerEnv = env;
     }
-    for(Stream *sound : mActiveStreams)
+
+    void OpenAL_Output::pauseSounds(int types)
     {
-        if((types&sound->getPlayType()))
+        std::vector<ALuint> sources;
+        for (Sound* sound : mActiveSounds)
         {
-            OpenAL_SoundStream *stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle);
-            sources.push_back(stream->mSource);
+            if ((types & sound->getPlayType()))
+                sources.push_back(GET_PTRID(sound->mHandle));
+        }
+        for (Stream* sound : mActiveStreams)
+        {
+            if ((types & sound->getPlayType()))
+            {
+                OpenAL_SoundStream* stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle);
+                sources.push_back(stream->mSource);
+            }
+        }
+        if (!sources.empty())
+        {
+            alSourcePausev(sources.size(), sources.data());
+            getALError();
         }
     }
-    if(!sources.empty())
-    {
-        alSourcePausev(sources.size(), sources.data());
-        getALError();
-    }
-}
 
-void OpenAL_Output::pauseActiveDevice()
-{
-    if (mDevice == nullptr)
-        return;
-
-    if(alcIsExtensionPresent(mDevice, "ALC_SOFT_PAUSE_DEVICE"))
+    void OpenAL_Output::pauseActiveDevice()
     {
-        LPALCDEVICEPAUSESOFT alcDevicePauseSOFT = nullptr;
-        getALCFunc(alcDevicePauseSOFT, mDevice, "alcDevicePauseSOFT");
-        alcDevicePauseSOFT(mDevice);
-        getALCError(mDevice);
-    }
+        if (mDevice == nullptr)
+            return;
 
-    alListenerf(AL_GAIN, 0.0f);
-}
+        if (alcIsExtensionPresent(mDevice, "ALC_SOFT_PAUSE_DEVICE"))
+        {
+            LPALCDEVICEPAUSESOFT alcDevicePauseSOFT = nullptr;
+            getALCFunc(alcDevicePauseSOFT, mDevice, "alcDevicePauseSOFT");
+            alcDevicePauseSOFT(mDevice);
+            getALCError(mDevice);
+        }
 
-void OpenAL_Output::resumeActiveDevice()
-{
-    if (mDevice == nullptr)
-        return;
+        alListenerf(AL_GAIN, 0.0f);
+    }
 
-    if(alcIsExtensionPresent(mDevice, "ALC_SOFT_PAUSE_DEVICE"))
+    void OpenAL_Output::resumeActiveDevice()
     {
-        LPALCDEVICERESUMESOFT alcDeviceResumeSOFT = nullptr;
-        getALCFunc(alcDeviceResumeSOFT, mDevice, "alcDeviceResumeSOFT");
-        alcDeviceResumeSOFT(mDevice);
-        getALCError(mDevice);
-    }
+        if (mDevice == nullptr)
+            return;
 
-    alListenerf(AL_GAIN, 1.0f);
-}
+        if (alcIsExtensionPresent(mDevice, "ALC_SOFT_PAUSE_DEVICE"))
+        {
+            LPALCDEVICERESUMESOFT alcDeviceResumeSOFT = nullptr;
+            getALCFunc(alcDeviceResumeSOFT, mDevice, "alcDeviceResumeSOFT");
+            alcDeviceResumeSOFT(mDevice);
+            getALCError(mDevice);
+        }
 
-void OpenAL_Output::resumeSounds(int types)
-{
-    std::vector<ALuint> sources;
-    for(Sound *sound : mActiveSounds)
-    {
-        if((types&sound->getPlayType()))
-            sources.push_back(GET_PTRID(sound->mHandle));
+        alListenerf(AL_GAIN, 1.0f);
     }
-    for(Stream *sound : mActiveStreams)
+
+    void OpenAL_Output::resumeSounds(int types)
     {
-        if((types&sound->getPlayType()))
+        std::vector<ALuint> sources;
+        for (Sound* sound : mActiveSounds)
         {
-            OpenAL_SoundStream *stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle);
-            sources.push_back(stream->mSource);
+            if ((types & sound->getPlayType()))
+                sources.push_back(GET_PTRID(sound->mHandle));
+        }
+        for (Stream* sound : mActiveStreams)
+        {
+            if ((types & sound->getPlayType()))
+            {
+                OpenAL_SoundStream* stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle);
+                sources.push_back(stream->mSource);
+            }
+        }
+        if (!sources.empty())
+        {
+            alSourcePlayv(sources.size(), sources.data());
+            getALError();
         }
     }
-    if(!sources.empty())
+
+    OpenAL_Output::OpenAL_Output(SoundManager& mgr)
+        : Sound_Output(mgr)
+        , mDevice(nullptr)
+        , mContext(nullptr)
+        , mListenerPos(0.0f, 0.0f, 0.0f)
+        , mListenerEnv(Env_Normal)
+        , mWaterFilter(0)
+        , mWaterEffect(0)
+        , mDefaultEffect(0)
+        , mEffectSlot(0)
+        , mStreamThread(std::make_unique<StreamThread>())
     {
-        alSourcePlayv(sources.size(), sources.data());
-        getALError();
     }
-}
 
+    OpenAL_Output::~OpenAL_Output()
+    {
+        OpenAL_Output::deinit();
+    }
 
-OpenAL_Output::OpenAL_Output(SoundManager &mgr)
-  : Sound_Output(mgr)
-  , mDevice(nullptr), mContext(nullptr)
-  , mListenerPos(0.0f, 0.0f, 0.0f), mListenerEnv(Env_Normal)
-  , mWaterFilter(0), mWaterEffect(0), mDefaultEffect(0), mEffectSlot(0)
-  , mStreamThread(std::make_unique<StreamThread>())
-{
-}
-
-OpenAL_Output::~OpenAL_Output()
-{
-    OpenAL_Output::deinit();
-}
-
-float OpenAL_Output::getTimeScaledPitch(SoundBase *sound)
-{
-    const bool shouldScale = !(sound->mParams.mFlags & PlayMode::NoScaling);
-    return shouldScale ? sound->getPitch() * mManager.getSimulationTimeScale() : sound->getPitch();
-}
+    float OpenAL_Output::getTimeScaledPitch(SoundBase* sound)
+    {
+        const bool shouldScale = !(sound->mParams.mFlags & PlayMode::NoScaling);
+        return shouldScale ? sound->getPitch() * mManager.getSimulationTimeScale() : sound->getPitch();
+    }
 
 }
diff --git a/apps/openmw/mwsound/openal_output.hpp b/apps/openmw/mwsound/openal_output.hpp
index c68c65c165..b2d85f43a4 100644
--- a/apps/openmw/mwsound/openal_output.hpp
+++ b/apps/openmw/mwsound/openal_output.hpp
@@ -1,13 +1,13 @@
 #ifndef GAME_SOUND_OPENAL_OUTPUT_H
 #define GAME_SOUND_OPENAL_OUTPUT_H
 
+#include <deque>
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
-#include <deque>
 
-#include "alc.h"
 #include "al.h"
+#include "alc.h"
 #include "alext.h"
 
 #include "sound_output.hpp"
@@ -21,16 +21,18 @@ namespace MWSound
 
     class OpenAL_Output : public Sound_Output
     {
-        ALCdevice *mDevice;
-        ALCcontext *mContext;
+        ALCdevice* mDevice;
+        ALCcontext* mContext;
 
-        struct {
+        struct
+        {
             bool EXT_EFX : 1;
             bool SOFT_HRTF : 1;
-        } ALC = {false, false};
-        struct {
+        } ALC = { false, false };
+        struct
+        {
             bool SOFT_source_spatialize : 1;
-        } AL = {false};
+        } AL = { false };
 
         typedef std::deque<ALuint> IDDq;
         IDDq mFreeSources;
@@ -51,46 +53,49 @@ namespace MWSound
         struct StreamThread;
         std::unique_ptr<StreamThread> mStreamThread;
 
-        void initCommon2D(ALuint source, const osg::Vec3f &pos, ALfloat gain, ALfloat pitch, bool loop, bool useenv);
-        void initCommon3D(ALuint source, const osg::Vec3f &pos, ALfloat mindist, ALfloat maxdist, ALfloat gain, ALfloat pitch, bool loop, bool useenv);
+        void initCommon2D(ALuint source, const osg::Vec3f& pos, ALfloat gain, ALfloat pitch, bool loop, bool useenv);
+        void initCommon3D(ALuint source, const osg::Vec3f& pos, ALfloat mindist, ALfloat maxdist, ALfloat gain,
+            ALfloat pitch, bool loop, bool useenv);
 
-        void updateCommon(ALuint source, const osg::Vec3f &pos, ALfloat maxdist, ALfloat gain, ALfloat pitch, bool useenv);
+        void updateCommon(
+            ALuint source, const osg::Vec3f& pos, ALfloat maxdist, ALfloat gain, ALfloat pitch, bool useenv);
 
-        float getTimeScaledPitch(SoundBase *sound);
+        float getTimeScaledPitch(SoundBase* sound);
 
-        OpenAL_Output& operator=(const OpenAL_Output &rhs);
-        OpenAL_Output(const OpenAL_Output &rhs);
+        OpenAL_Output& operator=(const OpenAL_Output& rhs);
+        OpenAL_Output(const OpenAL_Output& rhs);
 
     public:
         std::vector<std::string> enumerate() override;
-        bool init(const std::string &devname, const std::string &hrtfname, HrtfMode hrtfmode) override;
+        bool init(const std::string& devname, const std::string& hrtfname, HrtfMode hrtfmode) override;
         void deinit() override;
 
         std::vector<std::string> enumerateHrtf() override;
-        void setHrtf(const std::string &hrtfname, HrtfMode hrtfmode) override;
+        void setHrtf(const std::string& hrtfname, HrtfMode hrtfmode) override;
 
-        std::pair<Sound_Handle,size_t> loadSound(const std::string &fname) override;
+        std::pair<Sound_Handle, size_t> loadSound(const std::string& fname) override;
         size_t unloadSound(Sound_Handle data) override;
 
-        bool playSound(Sound *sound, Sound_Handle data, float offset) override;
-        bool playSound3D(Sound *sound, Sound_Handle data, float offset) override;
-        void finishSound(Sound *sound) override;
-        bool isSoundPlaying(Sound *sound) override;
-        void updateSound(Sound *sound) override;
-
-        bool streamSound(DecoderPtr decoder, Stream *sound, bool getLoudnessData=false) override;
-        bool streamSound3D(DecoderPtr decoder, Stream *sound, bool getLoudnessData) override;
-        void finishStream(Stream *sound) override;
-        double getStreamDelay(Stream *sound) override;
-        double getStreamOffset(Stream *sound) override;
-        float getStreamLoudness(Stream *sound) override;
-        bool isStreamPlaying(Stream *sound) override;
-        void updateStream(Stream *sound) override;
+        bool playSound(Sound* sound, Sound_Handle data, float offset) override;
+        bool playSound3D(Sound* sound, Sound_Handle data, float offset) override;
+        void finishSound(Sound* sound) override;
+        bool isSoundPlaying(Sound* sound) override;
+        void updateSound(Sound* sound) override;
+
+        bool streamSound(DecoderPtr decoder, Stream* sound, bool getLoudnessData = false) override;
+        bool streamSound3D(DecoderPtr decoder, Stream* sound, bool getLoudnessData) override;
+        void finishStream(Stream* sound) override;
+        double getStreamDelay(Stream* sound) override;
+        double getStreamOffset(Stream* sound) override;
+        float getStreamLoudness(Stream* sound) override;
+        bool isStreamPlaying(Stream* sound) override;
+        void updateStream(Stream* sound) override;
 
         void startUpdate() override;
         void finishUpdate() override;
 
-        void updateListener(const osg::Vec3f &pos, const osg::Vec3f &atdir, const osg::Vec3f &updir, Environment env) override;
+        void updateListener(
+            const osg::Vec3f& pos, const osg::Vec3f& atdir, const osg::Vec3f& updir, Environment env) override;
 
         void pauseSounds(int types) override;
         void resumeSounds(int types) override;
@@ -98,7 +103,7 @@ namespace MWSound
         void pauseActiveDevice() override;
         void resumeActiveDevice() override;
 
-        OpenAL_Output(SoundManager &mgr);
+        OpenAL_Output(SoundManager& mgr);
         virtual ~OpenAL_Output();
     };
 }
diff --git a/apps/openmw/mwsound/regionsoundselector.cpp b/apps/openmw/mwsound/regionsoundselector.cpp
index 1553344913..fd5f6f521c 100644
--- a/apps/openmw/mwsound/regionsoundselector.cpp
+++ b/apps/openmw/mwsound/regionsoundselector.cpp
@@ -1,8 +1,8 @@
 #include "regionsoundselector.hpp"
 
+#include <components/esm3/loadregn.hpp>
 #include <components/fallback/fallback.hpp>
 #include <components/misc/rng.hpp>
-#include <components/esm3/loadregn.hpp>
 
 #include <algorithm>
 #include <numeric>
@@ -14,19 +14,20 @@ namespace MWSound
 {
     namespace
     {
-        int addChance(int result, const ESM::Region::SoundRef &v)
+        int addChance(int result, const ESM::Region::SoundRef& v)
         {
             return result + v.mChance;
         }
     }
 
     RegionSoundSelector::RegionSoundSelector()
-    : mMinTimeBetweenSounds(Fallback::Map::getFloat("Weather_Minimum_Time_Between_Environmental_Sounds"))
-    , mMaxTimeBetweenSounds(Fallback::Map::getFloat("Weather_Maximum_Time_Between_Environmental_Sounds"))
-    {}
+        : mMinTimeBetweenSounds(Fallback::Map::getFloat("Weather_Minimum_Time_Between_Environmental_Sounds"))
+        , mMaxTimeBetweenSounds(Fallback::Map::getFloat("Weather_Maximum_Time_Between_Environmental_Sounds"))
+    {
+    }
 
-    std::optional<std::string> RegionSoundSelector::getNextRandom(float duration, const std::string& regionName,
-                                                                    const MWBase::World& world)
+    std::optional<std::string> RegionSoundSelector::getNextRandom(
+        float duration, const std::string& regionName, const MWBase::World& world)
     {
         mTimePassed += duration;
 
@@ -58,8 +59,7 @@ namespace MWSound
         const int r = Misc::Rng::rollDice(std::max(mSumChance, 100));
         int pos = 0;
 
-        const auto isSelected = [&] (const ESM::Region::SoundRef& sound)
-        {
+        const auto isSelected = [&](const ESM::Region::SoundRef& sound) {
             if (r - pos < sound.mChance)
                 return true;
             pos += sound.mChance;
diff --git a/apps/openmw/mwsound/regionsoundselector.hpp b/apps/openmw/mwsound/regionsoundselector.hpp
index 35df8a531b..586c3b07ea 100644
--- a/apps/openmw/mwsound/regionsoundselector.hpp
+++ b/apps/openmw/mwsound/regionsoundselector.hpp
@@ -13,19 +13,19 @@ namespace MWSound
 {
     class RegionSoundSelector
     {
-        public:
-            std::optional<std::string> getNextRandom(float duration, const std::string& regionName,
-                                                       const MWBase::World& world);
+    public:
+        std::optional<std::string> getNextRandom(
+            float duration, const std::string& regionName, const MWBase::World& world);
 
-            RegionSoundSelector();
+        RegionSoundSelector();
 
-        private:
-            float mTimeToNextEnvSound = 0.0f;
-            int mSumChance = 0;
-            std::string mLastRegionName;
-            float mTimePassed = 0.0;
-            float mMinTimeBetweenSounds;
-            float mMaxTimeBetweenSounds;
+    private:
+        float mTimeToNextEnvSound = 0.0f;
+        int mSumChance = 0;
+        std::string mLastRegionName;
+        float mTimePassed = 0.0;
+        float mMinTimeBetweenSounds;
+        float mMaxTimeBetweenSounds;
     };
 }
 
diff --git a/apps/openmw/mwsound/sound.hpp b/apps/openmw/mwsound/sound.hpp
index 2a07f05779..48e8975340 100644
--- a/apps/openmw/mwsound/sound.hpp
+++ b/apps/openmw/mwsound/sound.hpp
@@ -19,8 +19,14 @@ namespace MWSound
     };
 
     // For testing individual PlayMode flags
-    inline int operator&(int a, PlayMode b) { return a & static_cast<int>(b); }
-    inline int operator&(PlayMode a, PlayMode b) { return static_cast<int>(a) & static_cast<int>(b); }
+    inline int operator&(int a, PlayMode b)
+    {
+        return a & static_cast<int>(b);
+    }
+    inline int operator&(PlayMode a, PlayMode b)
+    {
+        return static_cast<int>(a) & static_cast<int>(b);
+    }
 
     struct SoundParams
     {
@@ -36,7 +42,8 @@ namespace MWSound
         float mFadeStep = 0.0f;
     };
 
-    class SoundBase {
+    class SoundBase
+    {
         SoundBase& operator=(const SoundBase&) = delete;
         SoundBase(const SoundBase&) = delete;
         SoundBase(SoundBase&&) = delete;
@@ -49,7 +56,7 @@ namespace MWSound
         friend class OpenAL_Output;
 
     public:
-        void setPosition(const osg::Vec3f &pos) { mParams.mPos = pos; }
+        void setPosition(const osg::Vec3f& pos) { mParams.mPos = pos; }
         void setVolume(float volume) { mParams.mVolume = volume; }
         void setBaseVolume(float volume) { mParams.mBaseVolume = volume; }
         void setFadeout(float duration) { setFade(duration, 0.0, Play_StopAtFadeEnd); }
@@ -85,7 +92,8 @@ namespace MWSound
         /// once the fade duration has passed or the target volume has been
         /// reached. If Play_FadeExponential is set, enables the exponential
         /// fade mode (see above).
-        void setFade(float duration, float targetVolume, int flags = 0) {
+        void setFade(float duration, float targetVolume, int flags = 0)
+        {
             // Approximation of log(1%) (i.e., -40 dB).
             constexpr float minus40Decibel = -4.6f;
 
@@ -141,14 +149,13 @@ namespace MWSound
             return getInFade() || !(mParams.mFlags & Play_StopAtFadeEnd);
         }
 
-        const osg::Vec3f &getPosition() const { return mParams.mPos; }
+        const osg::Vec3f& getPosition() const { return mParams.mPos; }
         float getRealVolume() const { return mParams.mVolume * mParams.mBaseVolume * mParams.mFadeVolume; }
         float getPitch() const { return mParams.mPitch; }
         float getMinDistance() const { return mParams.mMinDistance; }
         float getMaxDistance() const { return mParams.mMaxDistance; }
 
-        MWSound::Type getPlayType() const
-        { return static_cast<MWSound::Type>(mParams.mFlags & MWSound::Type::Mask); }
+        MWSound::Type getPlayType() const { return static_cast<MWSound::Type>(mParams.mFlags & MWSound::Type::Mask); }
         bool getUseEnv() const { return !(mParams.mFlags & MWSound::PlayMode::NoEnv); }
         bool getIsLooping() const { return mParams.mFlags & MWSound::PlayMode::Loop; }
         bool getDistanceCull() const { return mParams.mFlags & MWSound::PlayMode::RemoveAtDistance; }
@@ -164,7 +171,8 @@ namespace MWSound
         SoundBase() = default;
     };
 
-    class Sound : public SoundBase {
+    class Sound : public SoundBase
+    {
         Sound& operator=(const Sound&) = delete;
         Sound(const Sound&) = delete;
         Sound(Sound&&) = delete;
@@ -173,7 +181,8 @@ namespace MWSound
         Sound() = default;
     };
 
-    class Stream : public SoundBase {
+    class Stream : public SoundBase
+    {
         Stream& operator=(const Stream&) = delete;
         Stream(const Stream&) = delete;
         Stream(Stream&&) = delete;
diff --git a/apps/openmw/mwsound/sound_buffer.cpp b/apps/openmw/mwsound/sound_buffer.cpp
index 814e400305..0a1058f16e 100644
--- a/apps/openmw/mwsound/sound_buffer.cpp
+++ b/apps/openmw/mwsound/sound_buffer.cpp
@@ -5,9 +5,9 @@
 #include "../mwworld/esmstore.hpp"
 
 #include <components/debug/debuglog.hpp>
+#include <components/esm3/loadsoun.hpp>
 #include <components/settings/settings.hpp>
 #include <components/vfs/manager.hpp>
-#include <components/esm3/loadsoun.hpp>
 
 #include <algorithm>
 #include <cmath>
@@ -36,11 +36,14 @@ namespace MWSound
         }
     }
 
-    SoundBufferPool::SoundBufferPool(const VFS::Manager& vfs, Sound_Output& output) :
-        mVfs(&vfs),
-        mOutput(&output),
-        mBufferCacheMax(std::max(Settings::Manager::getInt("buffer cache max", "Sound"), 1) * 1024 * 1024),
-        mBufferCacheMin(std::min(static_cast<std::size_t>(std::max(Settings::Manager::getInt("buffer cache min", "Sound"), 1)) * 1024 * 1024, mBufferCacheMax))
+    SoundBufferPool::SoundBufferPool(const VFS::Manager& vfs, Sound_Output& output)
+        : mVfs(&vfs)
+        , mOutput(&output)
+        , mBufferCacheMax(std::max(Settings::Manager::getInt("buffer cache max", "Sound"), 1) * 1024 * 1024)
+        , mBufferCacheMin(
+              std::min(static_cast<std::size_t>(std::max(Settings::Manager::getInt("buffer cache min", "Sound"), 1))
+                      * 1024 * 1024,
+                  mBufferCacheMax))
     {
     }
 
@@ -75,7 +78,8 @@ namespace MWSound
             sfx = it->second;
         else
         {
-            const ESM::Sound *sound = MWBase::Environment::get().getWorld()->getStore().get<ESM::Sound>().search(soundId);
+            const ESM::Sound* sound
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::Sound>().search(soundId);
             if (sound == nullptr)
                 return {};
             sfx = insertSound(soundId, *sound);
@@ -104,9 +108,9 @@ namespace MWSound
 
     void SoundBufferPool::clear()
     {
-        for (auto &sfx : mSoundBuffers)
+        for (auto& sfx : mSoundBuffers)
         {
-            if(sfx.mHandle)
+            if (sfx.mHandle)
                 mOutput->unloadSound(sfx.mHandle);
             sfx.mHandle = nullptr;
         }
diff --git a/apps/openmw/mwsound/sound_buffer.hpp b/apps/openmw/mwsound/sound_buffer.hpp
index 5c45ac08aa..1b9960eded 100644
--- a/apps/openmw/mwsound/sound_buffer.hpp
+++ b/apps/openmw/mwsound/sound_buffer.hpp
@@ -2,8 +2,8 @@
 #define GAME_SOUND_SOUND_BUFFER_H
 
 #include <algorithm>
-#include <string>
 #include <deque>
+#include <string>
 #include <unordered_map>
 
 #include "sound_output.hpp"
@@ -24,82 +24,86 @@ namespace MWSound
 
     class Sound_Buffer
     {
-        public:
-            template <class T>
-            Sound_Buffer(T&& resname, float volume, float mindist, float maxdist)
-                : mResourceName(std::forward<T>(resname)), mVolume(volume), mMinDist(mindist), mMaxDist(maxdist)
-            {}
+    public:
+        template <class T>
+        Sound_Buffer(T&& resname, float volume, float mindist, float maxdist)
+            : mResourceName(std::forward<T>(resname))
+            , mVolume(volume)
+            , mMinDist(mindist)
+            , mMaxDist(maxdist)
+        {
+        }
 
-            const std::string& getResourceName() const noexcept { return mResourceName; }
+        const std::string& getResourceName() const noexcept { return mResourceName; }
 
-            Sound_Handle getHandle() const noexcept { return mHandle; }
+        Sound_Handle getHandle() const noexcept { return mHandle; }
 
-            float getVolume() const noexcept { return mVolume; }
+        float getVolume() const noexcept { return mVolume; }
 
-            float getMinDist() const noexcept { return mMinDist; }
+        float getMinDist() const noexcept { return mMinDist; }
 
-            float getMaxDist() const noexcept { return mMaxDist; }
+        float getMaxDist() const noexcept { return mMaxDist; }
 
-        private:
-            std::string mResourceName;
-            float mVolume;
-            float mMinDist;
-            float mMaxDist;
-            Sound_Handle mHandle = nullptr;
-            std::size_t mUses = 0;
+    private:
+        std::string mResourceName;
+        float mVolume;
+        float mMinDist;
+        float mMaxDist;
+        Sound_Handle mHandle = nullptr;
+        std::size_t mUses = 0;
 
-            friend class SoundBufferPool;
+        friend class SoundBufferPool;
     };
 
     class SoundBufferPool
     {
-        public:
-            SoundBufferPool(const VFS::Manager& vfs, Sound_Output& output);
-
-            SoundBufferPool(const SoundBufferPool&) = delete;
+    public:
+        SoundBufferPool(const VFS::Manager& vfs, Sound_Output& output);
 
-            ~SoundBufferPool();
+        SoundBufferPool(const SoundBufferPool&) = delete;
 
-            /// Lookup a soundId for its sound data (resource name, local volume,
-            /// minRange, and maxRange)
-            Sound_Buffer* lookup(const std::string& soundId) const;
+        ~SoundBufferPool();
 
-            /// Lookup a soundId for its sound data (resource name, local volume,
-            /// minRange, and maxRange), and ensure it's ready for use.
-            Sound_Buffer* load(const std::string& soundId);
+        /// Lookup a soundId for its sound data (resource name, local volume,
+        /// minRange, and maxRange)
+        Sound_Buffer* lookup(const std::string& soundId) const;
 
-            void use(Sound_Buffer& sfx)
-            {
-                if (sfx.mUses++ == 0)
-                {
-                    const auto it = std::find(mUnusedBuffers.begin(), mUnusedBuffers.end(), &sfx);
-                    if (it != mUnusedBuffers.end())
-                        mUnusedBuffers.erase(it);
-                }
-            }
+        /// Lookup a soundId for its sound data (resource name, local volume,
+        /// minRange, and maxRange), and ensure it's ready for use.
+        Sound_Buffer* load(const std::string& soundId);
 
-            void release(Sound_Buffer& sfx)
+        void use(Sound_Buffer& sfx)
+        {
+            if (sfx.mUses++ == 0)
             {
-                if (--sfx.mUses == 0)
-                    mUnusedBuffers.push_front(&sfx);
+                const auto it = std::find(mUnusedBuffers.begin(), mUnusedBuffers.end(), &sfx);
+                if (it != mUnusedBuffers.end())
+                    mUnusedBuffers.erase(it);
             }
-
-            void clear();
-
-        private:
-            const VFS::Manager* const mVfs;
-            Sound_Output* mOutput;
-            std::deque<Sound_Buffer> mSoundBuffers;
-            std::unordered_map<std::string, Sound_Buffer*> mBufferNameMap;
-            std::size_t mBufferCacheMax;
-            std::size_t mBufferCacheMin;
-            std::size_t mBufferCacheSize = 0;
-            // NOTE: unused buffers are stored in front-newest order.
-            std::deque<Sound_Buffer*> mUnusedBuffers;
-
-            inline Sound_Buffer* insertSound(const std::string& soundId, const ESM::Sound& sound);
-
-            inline void unloadUnused();
+        }
+
+        void release(Sound_Buffer& sfx)
+        {
+            if (--sfx.mUses == 0)
+                mUnusedBuffers.push_front(&sfx);
+        }
+
+        void clear();
+
+    private:
+        const VFS::Manager* const mVfs;
+        Sound_Output* mOutput;
+        std::deque<Sound_Buffer> mSoundBuffers;
+        std::unordered_map<std::string, Sound_Buffer*> mBufferNameMap;
+        std::size_t mBufferCacheMax;
+        std::size_t mBufferCacheMin;
+        std::size_t mBufferCacheSize = 0;
+        // NOTE: unused buffers are stored in front-newest order.
+        std::deque<Sound_Buffer*> mUnusedBuffers;
+
+        inline Sound_Buffer* insertSound(const std::string& soundId, const ESM::Sound& sound);
+
+        inline void unloadUnused();
     };
 }
 
diff --git a/apps/openmw/mwsound/sound_decoder.hpp b/apps/openmw/mwsound/sound_decoder.hpp
index 34bae87d74..f6dcdb7032 100644
--- a/apps/openmw/mwsound/sound_decoder.hpp
+++ b/apps/openmw/mwsound/sound_decoder.hpp
@@ -11,21 +11,23 @@ namespace VFS
 
 namespace MWSound
 {
-    enum SampleType {
+    enum SampleType
+    {
         SampleType_UInt8,
         SampleType_Int16,
         SampleType_Float32
     };
-    const char *getSampleTypeName(SampleType type);
+    const char* getSampleTypeName(SampleType type);
 
-    enum ChannelConfig {
+    enum ChannelConfig
+    {
         ChannelConfig_Mono,
         ChannelConfig_Stereo,
         ChannelConfig_Quad,
         ChannelConfig_5point1,
         ChannelConfig_7point1
     };
-    const char *getChannelConfigName(ChannelConfig config);
+    const char* getChannelConfigName(ChannelConfig config);
 
     size_t framesToBytes(size_t frames, ChannelConfig config, SampleType type);
     size_t bytesToFrames(size_t bytes, ChannelConfig config, SampleType type);
@@ -34,23 +36,25 @@ namespace MWSound
     {
         const VFS::Manager* mResourceMgr;
 
-        virtual void open(const std::string &fname) = 0;
+        virtual void open(const std::string& fname) = 0;
         virtual void close() = 0;
 
         virtual std::string getName() = 0;
-        virtual void getInfo(int *samplerate, ChannelConfig *chans, SampleType *type) = 0;
+        virtual void getInfo(int* samplerate, ChannelConfig* chans, SampleType* type) = 0;
 
-        virtual size_t read(char *buffer, size_t bytes) = 0;
-        virtual void readAll(std::vector<char> &output);
+        virtual size_t read(char* buffer, size_t bytes) = 0;
+        virtual void readAll(std::vector<char>& output);
         virtual size_t getSampleOffset() = 0;
 
-        Sound_Decoder(const VFS::Manager* resourceMgr) : mResourceMgr(resourceMgr)
-        { }
-        virtual ~Sound_Decoder() { }
+        Sound_Decoder(const VFS::Manager* resourceMgr)
+            : mResourceMgr(resourceMgr)
+        {
+        }
+        virtual ~Sound_Decoder() {}
 
     private:
-        Sound_Decoder(const Sound_Decoder &rhs);
-        Sound_Decoder& operator=(const Sound_Decoder &rhs);
+        Sound_Decoder(const Sound_Decoder& rhs);
+        Sound_Decoder& operator=(const Sound_Decoder& rhs);
     };
 }
 
diff --git a/apps/openmw/mwsound/sound_output.hpp b/apps/openmw/mwsound/sound_output.hpp
index 9ec8b17dc9..d7c35fbbc6 100644
--- a/apps/openmw/mwsound/sound_output.hpp
+++ b/apps/openmw/mwsound/sound_output.hpp
@@ -1,8 +1,8 @@
 #ifndef GAME_SOUND_SOUND_OUTPUT_H
 #define GAME_SOUND_SOUND_OUTPUT_H
 
-#include <string>
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "../mwbase/soundmanager.hpp"
@@ -15,11 +15,12 @@ namespace MWSound
     class Stream;
 
     // An opaque handle for the implementation's sound buffers.
-    typedef void *Sound_Handle;
+    typedef void* Sound_Handle;
     // An opaque handle for the implementation's sound instances.
-    typedef void *Sound_Instance;
+    typedef void* Sound_Instance;
 
-    enum class HrtfMode {
+    enum class HrtfMode
+    {
         Disable,
         Enable,
         Auto
@@ -33,37 +34,39 @@ namespace MWSound
 
     class Sound_Output
     {
-        SoundManager &mManager;
+        SoundManager& mManager;
 
         virtual std::vector<std::string> enumerate() = 0;
-        virtual bool init(const std::string &devname, const std::string &hrtfname, HrtfMode hrtfmode) = 0;
+        virtual bool init(const std::string& devname, const std::string& hrtfname, HrtfMode hrtfmode) = 0;
         virtual void deinit() = 0;
 
         virtual std::vector<std::string> enumerateHrtf() = 0;
-        virtual void setHrtf(const std::string &hrtfname, HrtfMode hrtfmode) = 0;
+        virtual void setHrtf(const std::string& hrtfname, HrtfMode hrtfmode) = 0;
 
-        virtual std::pair<Sound_Handle,size_t> loadSound(const std::string &fname) = 0;
+        virtual std::pair<Sound_Handle, size_t> loadSound(const std::string& fname) = 0;
         virtual size_t unloadSound(Sound_Handle data) = 0;
 
-        virtual bool playSound(Sound *sound, Sound_Handle data, float offset) = 0;
-        virtual bool playSound3D(Sound *sound, Sound_Handle data, float offset) = 0;
-        virtual void finishSound(Sound *sound) = 0;
-        virtual bool isSoundPlaying(Sound *sound) = 0;
-        virtual void updateSound(Sound *sound) = 0;
-
-        virtual bool streamSound(DecoderPtr decoder, Stream *sound, bool getLoudnessData=false) = 0;
-        virtual bool streamSound3D(DecoderPtr decoder, Stream *sound, bool getLoudnessData) = 0;
-        virtual void finishStream(Stream *sound) = 0;
-        virtual double getStreamDelay(Stream *sound) = 0;
-        virtual double getStreamOffset(Stream *sound) = 0;
-        virtual float getStreamLoudness(Stream *sound) = 0;
-        virtual bool isStreamPlaying(Stream *sound) = 0;
-        virtual void updateStream(Stream *sound) = 0;
+        virtual bool playSound(Sound* sound, Sound_Handle data, float offset) = 0;
+        virtual bool playSound3D(Sound* sound, Sound_Handle data, float offset) = 0;
+        virtual void finishSound(Sound* sound) = 0;
+        virtual bool isSoundPlaying(Sound* sound) = 0;
+        virtual void updateSound(Sound* sound) = 0;
+
+        virtual bool streamSound(DecoderPtr decoder, Stream* sound, bool getLoudnessData = false) = 0;
+        virtual bool streamSound3D(DecoderPtr decoder, Stream* sound, bool getLoudnessData) = 0;
+        virtual void finishStream(Stream* sound) = 0;
+        virtual double getStreamDelay(Stream* sound) = 0;
+        virtual double getStreamOffset(Stream* sound) = 0;
+        virtual float getStreamLoudness(Stream* sound) = 0;
+        virtual bool isStreamPlaying(Stream* sound) = 0;
+        virtual void updateStream(Stream* sound) = 0;
 
         virtual void startUpdate() = 0;
         virtual void finishUpdate() = 0;
 
-        virtual void updateListener(const osg::Vec3f &pos, const osg::Vec3f &atdir, const osg::Vec3f &updir, Environment env) = 0;
+        virtual void updateListener(
+            const osg::Vec3f& pos, const osg::Vec3f& atdir, const osg::Vec3f& updir, Environment env)
+            = 0;
 
         virtual void pauseSounds(int types) = 0;
         virtual void resumeSounds(int types) = 0;
@@ -71,17 +74,20 @@ namespace MWSound
         virtual void pauseActiveDevice() = 0;
         virtual void resumeActiveDevice() = 0;
 
-        Sound_Output& operator=(const Sound_Output &rhs);
-        Sound_Output(const Sound_Output &rhs);
+        Sound_Output& operator=(const Sound_Output& rhs);
+        Sound_Output(const Sound_Output& rhs);
 
     protected:
         bool mInitialized;
 
-        Sound_Output(SoundManager &mgr)
-          : mManager(mgr), mInitialized(false)
-        { }
+        Sound_Output(SoundManager& mgr)
+            : mManager(mgr)
+            , mInitialized(false)
+        {
+        }
+
     public:
-        virtual ~Sound_Output() { }
+        virtual ~Sound_Output() {}
 
         bool isInitialized() const { return mInitialized; }
 
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 3bd371ef8f..c19908b255 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -7,28 +7,27 @@
 
 #include <osg/Matrixf>
 
+#include <components/debug/debuglog.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/rng.hpp>
-#include <components/debug/debuglog.hpp>
 #include <components/vfs/manager.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/statemanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/esmstore.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 
+#include "sound.hpp"
 #include "sound_buffer.hpp"
 #include "sound_decoder.hpp"
 #include "sound_output.hpp"
-#include "sound.hpp"
 
-#include "openal_output.hpp"
 #include "ffmpeg_decoder.hpp"
-
+#include "openal_output.hpp"
 
 namespace MWSound
 {
@@ -46,13 +45,15 @@ namespace MWSound
             settings.mNearWaterPoints = Fallback::Map::getInt("Water_NearWaterPoints");
             settings.mNearWaterIndoorTolerance = Fallback::Map::getFloat("Water_NearWaterIndoorTolerance");
             settings.mNearWaterOutdoorTolerance = Fallback::Map::getFloat("Water_NearWaterOutdoorTolerance");
-            settings.mNearWaterIndoorID = Misc::StringUtils::lowerCase(Fallback::Map::getString("Water_NearWaterIndoorID"));
-            settings.mNearWaterOutdoorID = Misc::StringUtils::lowerCase(Fallback::Map::getString("Water_NearWaterOutdoorID"));
+            settings.mNearWaterIndoorID
+                = Misc::StringUtils::lowerCase(Fallback::Map::getString("Water_NearWaterIndoorID"));
+            settings.mNearWaterOutdoorID
+                = Misc::StringUtils::lowerCase(Fallback::Map::getString("Water_NearWaterOutdoorID"));
 
             return settings;
         }
 
-        float initialFadeVolume(float squaredDist, Sound_Buffer *sfx, Type type, PlayMode mode)
+        float initialFadeVolume(float squaredDist, Sound_Buffer* sfx, Type type, PlayMode mode)
         {
             // If a sound is farther away than its maximum distance, start playing it with a zero fade volume.
             // It can still become audible once the player moves closer.
@@ -72,7 +73,10 @@ namespace MWSound
     }
 
     // For combining PlayMode and Type flags
-    inline int operator|(PlayMode a, Type b) { return static_cast<int>(a) | static_cast<int>(b); }
+    inline int operator|(PlayMode a, Type b)
+    {
+        return static_cast<int>(a) | static_cast<int>(b);
+    }
 
     SoundManager::SoundManager(const VFS::Manager* vfs, bool useSound)
         : mVFS(vfs)
@@ -80,9 +84,9 @@ namespace MWSound
         , mWaterSoundUpdater(makeWaterSoundUpdaterSettings())
         , mSoundBuffers(*vfs, *mOutput)
         , mListenerUnderwater(false)
-        , mListenerPos(0,0,0)
-        , mListenerDir(1,0,0)
-        , mListenerUp(0,0,1)
+        , mListenerPos(0, 0, 0)
+        , mListenerDir(1, 0, 0)
+        , mListenerUp(0, 0, 1)
         , mUnderwaterSound(nullptr)
         , mNearWaterSound(nullptr)
         , mPlaybackPaused(false)
@@ -90,7 +94,7 @@ namespace MWSound
         , mLastCell(nullptr)
         , mCurrentRegionSound(nullptr)
     {
-        if(!useSound)
+        if (!useSound)
         {
             Log(Debug::Info) << "Sound disabled.";
             return;
@@ -98,11 +102,10 @@ namespace MWSound
 
         const std::string& hrtfname = Settings::Manager::getString("hrtf", "Sound");
         int hrtfstate = Settings::Manager::getInt("hrtf enable", "Sound");
-        HrtfMode hrtfmode = hrtfstate < 0 ? HrtfMode::Auto :
-                            hrtfstate > 0 ? HrtfMode::Enable : HrtfMode::Disable;
+        HrtfMode hrtfmode = hrtfstate < 0 ? HrtfMode::Auto : hrtfstate > 0 ? HrtfMode::Enable : HrtfMode::Disable;
 
         const std::string& devname = Settings::Manager::getString("device", "Sound");
-        if(!mOutput->init(devname, hrtfname, hrtfmode))
+        if (!mOutput->init(devname, hrtfname, hrtfmode))
         {
             Log(Debug::Error) << "Failed to initialize audio output, sound disabled";
             return;
@@ -112,17 +115,17 @@ namespace MWSound
         std::stringstream stream;
 
         stream << "Enumerated output devices:\n";
-        for(const std::string &name : names)
+        for (const std::string& name : names)
             stream << "  " << name;
 
         Log(Debug::Info) << stream.str();
         stream.str("");
 
         names = mOutput->enumerateHrtf();
-        if(!names.empty())
+        if (!names.empty())
         {
             stream << "Enumerated HRTF names:\n";
-            for(const std::string &name : names)
+            for (const std::string& name : names)
                 stream << "  " << name;
 
             Log(Debug::Info) << stream.str();
@@ -142,7 +145,7 @@ namespace MWSound
         return std::make_shared<FFmpeg_Decoder>(mVFS);
     }
 
-    DecoderPtr SoundManager::loadVoice(const std::string &voicefile)
+    DecoderPtr SoundManager::loadVoice(const std::string& voicefile)
     {
         try
         {
@@ -150,7 +153,7 @@ namespace MWSound
             decoder->open(Misc::ResourceHelpers::correctSoundPath(voicefile, decoder->mResourceMgr));
             return decoder;
         }
-        catch(std::exception &e)
+        catch (std::exception& e)
         {
             Log(Debug::Error) << "Failed to load audio from " << voicefile << ": " << e.what();
         }
@@ -168,27 +171,31 @@ namespace MWSound
         return mStreams.get();
     }
 
-    StreamPtr SoundManager::playVoice(DecoderPtr decoder, const osg::Vec3f &pos, bool playlocal)
+    StreamPtr SoundManager::playVoice(DecoderPtr decoder, const osg::Vec3f& pos, bool playlocal)
     {
         MWBase::World* world = MWBase::Environment::get().getWorld();
-        static const float fAudioMinDistanceMult = world->getStore().get<ESM::GameSetting>().find("fAudioMinDistanceMult")->mValue.getFloat();
-        static const float fAudioMaxDistanceMult = world->getStore().get<ESM::GameSetting>().find("fAudioMaxDistanceMult")->mValue.getFloat();
-        static const float fAudioVoiceDefaultMinDistance = world->getStore().get<ESM::GameSetting>().find("fAudioVoiceDefaultMinDistance")->mValue.getFloat();
-        static const float fAudioVoiceDefaultMaxDistance = world->getStore().get<ESM::GameSetting>().find("fAudioVoiceDefaultMaxDistance")->mValue.getFloat();
+        static const float fAudioMinDistanceMult
+            = world->getStore().get<ESM::GameSetting>().find("fAudioMinDistanceMult")->mValue.getFloat();
+        static const float fAudioMaxDistanceMult
+            = world->getStore().get<ESM::GameSetting>().find("fAudioMaxDistanceMult")->mValue.getFloat();
+        static const float fAudioVoiceDefaultMinDistance
+            = world->getStore().get<ESM::GameSetting>().find("fAudioVoiceDefaultMinDistance")->mValue.getFloat();
+        static const float fAudioVoiceDefaultMaxDistance
+            = world->getStore().get<ESM::GameSetting>().find("fAudioVoiceDefaultMaxDistance")->mValue.getFloat();
         static float minDistance = std::max(fAudioVoiceDefaultMinDistance * fAudioMinDistanceMult, 1.0f);
         static float maxDistance = std::max(fAudioVoiceDefaultMaxDistance * fAudioMaxDistanceMult, minDistance);
 
         bool played;
         float basevol = volumeFromType(Type::Voice);
         StreamPtr sound = getStreamRef();
-        if(playlocal)
+        if (playlocal)
         {
             sound->init([&] {
                 SoundParams params;
                 params.mBaseVolume = basevol;
                 params.mFlags = PlayMode::NoEnv | Type::Voice | Play_2D;
                 return params;
-            } ());
+            }());
             played = mOutput->streamSound(decoder, sound.get(), true);
         }
         else
@@ -201,10 +208,10 @@ namespace MWSound
                 params.mMaxDistance = maxDistance;
                 params.mFlags = PlayMode::Normal | Type::Voice | Play_3D;
                 return params;
-            } ());
+            }());
             played = mOutput->streamSound3D(decoder, sound.get(), true);
         }
-        if(!played)
+        if (!played)
             return nullptr;
         return sound;
     }
@@ -217,7 +224,7 @@ namespace MWSound
 
     void SoundManager::stopMusic()
     {
-        if(mMusic)
+        if (mMusic)
         {
             mOutput->finishStream(mMusic.get());
             mMusic = nullptr;
@@ -226,7 +233,7 @@ namespace MWSound
 
     void SoundManager::streamMusicFull(const std::string& filename)
     {
-        if(!mOutput->isInitialized())
+        if (!mOutput->isInitialized())
             return;
         Log(Debug::Info) << "Playing " << filename;
         mLastPlayedMusic = filename;
@@ -238,20 +245,19 @@ namespace MWSound
         {
             decoder->open(filename);
         }
-        catch(std::exception &e)
+        catch (std::exception& e)
         {
             Log(Debug::Error) << "Failed to load audio from " << filename << ": " << e.what();
             return;
         }
 
-
         mMusic = getStreamRef();
         mMusic->init([&] {
             SoundParams params;
             params.mBaseVolume = volumeFromType(Type::Music);
             params.mFlags = PlayMode::NoEnvNoScaling | Type::Music | Play_2D;
             return params;
-        } ());
+        }());
         mOutput->streamSound(decoder, mMusic.get());
     }
 
@@ -270,13 +276,13 @@ namespace MWSound
 
     void SoundManager::startRandomTitle()
     {
-        const std::vector<std::string> &filelist = mMusicFiles[mCurrentPlaylist];
-        auto &tracklist = mMusicToPlay[mCurrentPlaylist];
+        const std::vector<std::string>& filelist = mMusicFiles[mCurrentPlaylist];
+        auto& tracklist = mMusicToPlay[mCurrentPlaylist];
 
         // Do a Fisher-Yates shuffle
 
         // Repopulate if playlist is empty
-        if(tracklist.empty())
+        if (tracklist.empty())
         {
             tracklist.resize(filelist.size());
             std::iota(tracklist.begin(), tracklist.end(), 0);
@@ -285,8 +291,8 @@ namespace MWSound
         int i = Misc::Rng::rollDice(tracklist.size());
 
         // Reshuffle if last played music is the same after a repopulation
-        if(filelist[tracklist[i]] == mLastPlayedMusic)
-            i = (i+1) % tracklist.size();
+        if (filelist[tracklist[i]] == mLastPlayedMusic)
+            i = (i + 1) % tracklist.size();
 
         // Remove music from list after advancing music
         advanceMusic(filelist[tracklist[i]]);
@@ -294,10 +300,9 @@ namespace MWSound
         tracklist.pop_back();
     }
 
-
     void SoundManager::streamMusic(const std::string& filename)
     {
-        advanceMusic("Music/"+filename);
+        advanceMusic("Music/" + filename);
     }
 
     bool SoundManager::isMusicPlaying()
@@ -305,7 +310,7 @@ namespace MWSound
         return mMusic && mOutput->isStreamPlaying(mMusic.get());
     }
 
-    void SoundManager::playPlaylist(const std::string &playlist)
+    void SoundManager::playPlaylist(const std::string& playlist)
     {
         if (mCurrentPlaylist == playlist)
             return;
@@ -356,31 +361,32 @@ namespace MWSound
         startRandomTitle();
     }
 
-    void SoundManager::say(const MWWorld::ConstPtr &ptr, const std::string &filename)
+    void SoundManager::say(const MWWorld::ConstPtr& ptr, const std::string& filename)
     {
-        if(!mOutput->isInitialized())
+        if (!mOutput->isInitialized())
             return;
 
         DecoderPtr decoder = loadVoice(mVFS->normalizeFilename("Sound/" + filename));
         if (!decoder)
             return;
 
-        MWBase::World *world = MWBase::Environment::get().getWorld();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
         const osg::Vec3f pos = world->getActorHeadTransform(ptr).getTrans();
 
         stopSay(ptr);
         StreamPtr sound = playVoice(decoder, pos, (ptr == MWMechanics::getPlayer()));
-        if(!sound) return;
+        if (!sound)
+            return;
 
-        mSaySoundsQueue.emplace(ptr.mRef, SaySound {ptr.mCell, std::move(sound)});
+        mSaySoundsQueue.emplace(ptr.mRef, SaySound{ ptr.mCell, std::move(sound) });
     }
 
-    float SoundManager::getSaySoundLoudness(const MWWorld::ConstPtr &ptr) const
+    float SoundManager::getSaySoundLoudness(const MWWorld::ConstPtr& ptr) const
     {
         SaySoundMap::const_iterator snditer = mActiveSaySounds.find(ptr.mRef);
-        if(snditer != mActiveSaySounds.end())
+        if (snditer != mActiveSaySounds.end())
         {
-            Stream *sound = snditer->second.mStream.get();
+            Stream* sound = snditer->second.mStream.get();
             return mOutput->getStreamLoudness(sound);
         }
 
@@ -389,7 +395,7 @@ namespace MWSound
 
     void SoundManager::say(const std::string& filename)
     {
-        if(!mOutput->isInitialized())
+        if (!mOutput->isInitialized())
             return;
 
         DecoderPtr decoder = loadVoice(mVFS->normalizeFilename("Sound/" + filename));
@@ -398,37 +404,38 @@ namespace MWSound
 
         stopSay(MWWorld::ConstPtr());
         StreamPtr sound = playVoice(decoder, osg::Vec3f(), true);
-        if(!sound) return;
+        if (!sound)
+            return;
 
-        mActiveSaySounds.emplace(nullptr, SaySound {nullptr, std::move(sound)});
+        mActiveSaySounds.emplace(nullptr, SaySound{ nullptr, std::move(sound) });
     }
 
-    bool SoundManager::sayDone(const MWWorld::ConstPtr &ptr) const
+    bool SoundManager::sayDone(const MWWorld::ConstPtr& ptr) const
     {
         SaySoundMap::const_iterator snditer = mActiveSaySounds.find(ptr.mRef);
-        if(snditer != mActiveSaySounds.end())
+        if (snditer != mActiveSaySounds.end())
         {
-            if(mOutput->isStreamPlaying(snditer->second.mStream.get()))
+            if (mOutput->isStreamPlaying(snditer->second.mStream.get()))
                 return false;
             return true;
         }
         return true;
     }
 
-    bool SoundManager::sayActive(const MWWorld::ConstPtr &ptr) const
+    bool SoundManager::sayActive(const MWWorld::ConstPtr& ptr) const
     {
         SaySoundMap::const_iterator snditer = mSaySoundsQueue.find(ptr.mRef);
-        if(snditer != mSaySoundsQueue.end())
+        if (snditer != mSaySoundsQueue.end())
         {
-            if(mOutput->isStreamPlaying(snditer->second.mStream.get()))
+            if (mOutput->isStreamPlaying(snditer->second.mStream.get()))
                 return true;
             return false;
         }
 
         snditer = mActiveSaySounds.find(ptr.mRef);
-        if(snditer != mActiveSaySounds.end())
+        if (snditer != mActiveSaySounds.end())
         {
-            if(mOutput->isStreamPlaying(snditer->second.mStream.get()))
+            if (mOutput->isStreamPlaying(snditer->second.mStream.get()))
                 return true;
             return false;
         }
@@ -436,27 +443,26 @@ namespace MWSound
         return false;
     }
 
-    void SoundManager::stopSay(const MWWorld::ConstPtr &ptr)
+    void SoundManager::stopSay(const MWWorld::ConstPtr& ptr)
     {
         SaySoundMap::iterator snditer = mSaySoundsQueue.find(ptr.mRef);
-        if(snditer != mSaySoundsQueue.end())
+        if (snditer != mSaySoundsQueue.end())
         {
             mOutput->finishStream(snditer->second.mStream.get());
             mSaySoundsQueue.erase(snditer);
         }
 
         snditer = mActiveSaySounds.find(ptr.mRef);
-        if(snditer != mActiveSaySounds.end())
+        if (snditer != mActiveSaySounds.end())
         {
             mOutput->finishStream(snditer->second.mStream.get());
             mActiveSaySounds.erase(snditer);
         }
     }
 
-
-    Stream *SoundManager::playTrack(const DecoderPtr& decoder, Type type)
+    Stream* SoundManager::playTrack(const DecoderPtr& decoder, Type type)
     {
-        if(!mOutput->isInitialized())
+        if (!mOutput->isInitialized())
             return nullptr;
 
         StreamPtr track = getStreamRef();
@@ -465,8 +471,8 @@ namespace MWSound
             params.mBaseVolume = volumeFromType(type);
             params.mFlags = PlayMode::NoEnvNoScaling | type | Play_2D;
             return params;
-        } ());
-        if(!mOutput->streamSound(decoder, track.get()))
+        }());
+        if (!mOutput->streamSound(decoder, track.get()))
             return nullptr;
 
         Stream* result = track.get();
@@ -475,28 +481,29 @@ namespace MWSound
         return result;
     }
 
-    void SoundManager::stopTrack(Stream *stream)
+    void SoundManager::stopTrack(Stream* stream)
     {
         mOutput->finishStream(stream);
         TrackList::iterator iter = std::lower_bound(mActiveTracks.begin(), mActiveTracks.end(), stream,
-                                                    [] (const StreamPtr& lhs, Stream* rhs) { return lhs.get() < rhs; });
-        if(iter != mActiveTracks.end() && iter->get() == stream)
+            [](const StreamPtr& lhs, Stream* rhs) { return lhs.get() < rhs; });
+        if (iter != mActiveTracks.end() && iter->get() == stream)
             mActiveTracks.erase(iter);
     }
 
-    double SoundManager::getTrackTimeDelay(Stream *stream)
+    double SoundManager::getTrackTimeDelay(Stream* stream)
     {
         return mOutput->getStreamDelay(stream);
     }
 
-
-    Sound* SoundManager::playSound(std::string_view soundId, float volume, float pitch, Type type, PlayMode mode, float offset)
+    Sound* SoundManager::playSound(
+        std::string_view soundId, float volume, float pitch, Type type, PlayMode mode, float offset)
     {
-        if(!mOutput->isInitialized())
+        if (!mOutput->isInitialized())
             return nullptr;
 
-        Sound_Buffer *sfx = mSoundBuffers.load(Misc::StringUtils::lowerCase(soundId));
-        if(!sfx) return nullptr;
+        Sound_Buffer* sfx = mSoundBuffers.load(Misc::StringUtils::lowerCase(soundId));
+        if (!sfx)
+            return nullptr;
 
         // Only one copy of given sound can be played at time, so stop previous copy
         stopSound(sfx, MWWorld::ConstPtr());
@@ -509,8 +516,8 @@ namespace MWSound
             params.mPitch = pitch;
             params.mFlags = mode | type | Play_2D;
             return params;
-        } ());
-        if(!mOutput->playSound(sound.get(), sfx->getHandle(), offset))
+        }());
+        if (!mOutput->playSound(sound.get(), sfx->getHandle(), offset))
             return nullptr;
 
         Sound* result = sound.get();
@@ -519,11 +526,10 @@ namespace MWSound
         return result;
     }
 
-    Sound *SoundManager::playSound3D(const MWWorld::ConstPtr &ptr, std::string_view soundId,
-                                     float volume, float pitch, Type type, PlayMode mode,
-                                     float offset)
+    Sound* SoundManager::playSound3D(const MWWorld::ConstPtr& ptr, std::string_view soundId, float volume, float pitch,
+        Type type, PlayMode mode, float offset)
     {
-        if(!mOutput->isInitialized())
+        if (!mOutput->isInitialized())
             return nullptr;
 
         const osg::Vec3f objpos(ptr.getRefData().getPosition().asVec3());
@@ -532,15 +538,16 @@ namespace MWSound
             return nullptr;
 
         // Look up the sound in the ESM data
-        Sound_Buffer *sfx = mSoundBuffers.load(Misc::StringUtils::lowerCase(soundId));
-        if(!sfx) return nullptr;
+        Sound_Buffer* sfx = mSoundBuffers.load(Misc::StringUtils::lowerCase(soundId));
+        if (!sfx)
+            return nullptr;
 
         // Only one copy of given sound can be played at time on ptr, so stop previous copy
         stopSound(sfx, ptr);
 
         bool played;
         SoundPtr sound = getSoundRef();
-        if(!(mode&PlayMode::NoPlayerLocal) && ptr == MWMechanics::getPlayer())
+        if (!(mode & PlayMode::NoPlayerLocal) && ptr == MWMechanics::getPlayer())
         {
             sound->init([&] {
                 SoundParams params;
@@ -549,7 +556,7 @@ namespace MWSound
                 params.mPitch = pitch;
                 params.mFlags = mode | type | Play_2D;
                 return params;
-            } ());
+            }());
             played = mOutput->playSound(sound.get(), sfx->getHandle(), offset);
         }
         else
@@ -565,31 +572,31 @@ namespace MWSound
                 params.mMaxDistance = sfx->getMaxDist();
                 params.mFlags = mode | type | Play_3D;
                 return params;
-            } ());
+            }());
             played = mOutput->playSound3D(sound.get(), sfx->getHandle(), offset);
         }
-        if(!played)
+        if (!played)
             return nullptr;
 
         Sound* result = sound.get();
         auto it = mActiveSounds.find(ptr.mRef);
         if (it == mActiveSounds.end())
-            it = mActiveSounds.emplace(ptr.mRef, ActiveSound {ptr.mCell, {}}).first;
+            it = mActiveSounds.emplace(ptr.mRef, ActiveSound{ ptr.mCell, {} }).first;
         it->second.mList.emplace_back(std::move(sound), sfx);
         mSoundBuffers.use(*sfx);
         return result;
     }
 
-    Sound *SoundManager::playSound3D(const osg::Vec3f& initialPos, std::string_view soundId,
-                                     float volume, float pitch, Type type, PlayMode mode,
-                                     float offset)
+    Sound* SoundManager::playSound3D(const osg::Vec3f& initialPos, std::string_view soundId, float volume, float pitch,
+        Type type, PlayMode mode, float offset)
     {
-        if(!mOutput->isInitialized())
+        if (!mOutput->isInitialized())
             return nullptr;
 
         // Look up the sound in the ESM data
-        Sound_Buffer *sfx = mSoundBuffers.load(Misc::StringUtils::lowerCase(soundId));
-        if(!sfx) return nullptr;
+        Sound_Buffer* sfx = mSoundBuffers.load(Misc::StringUtils::lowerCase(soundId));
+        if (!sfx)
+            return nullptr;
 
         const float squaredDist = (mListenerPos - initialPos).length2();
 
@@ -605,8 +612,8 @@ namespace MWSound
             params.mMaxDistance = sfx->getMaxDist();
             params.mFlags = mode | type | Play_3D;
             return params;
-        } ());
-        if(!mOutput->playSound3D(sound.get(), sfx->getHandle(), offset))
+        }());
+        if (!mOutput->playSound3D(sound.get(), sfx->getHandle(), offset))
             return nullptr;
 
         Sound* result = sound.get();
@@ -615,53 +622,54 @@ namespace MWSound
         return result;
     }
 
-    void SoundManager::stopSound(Sound *sound)
+    void SoundManager::stopSound(Sound* sound)
     {
-        if(sound)
+        if (sound)
             mOutput->finishSound(sound);
     }
 
-    void SoundManager::stopSound(Sound_Buffer *sfx, const MWWorld::ConstPtr &ptr)
+    void SoundManager::stopSound(Sound_Buffer* sfx, const MWWorld::ConstPtr& ptr)
     {
         SoundMap::iterator snditer = mActiveSounds.find(ptr.mRef);
-        if(snditer != mActiveSounds.end())
+        if (snditer != mActiveSounds.end())
         {
-            for (SoundBufferRefPair &snd : snditer->second.mList)
+            for (SoundBufferRefPair& snd : snditer->second.mList)
             {
-                if(snd.second == sfx)
+                if (snd.second == sfx)
                     mOutput->finishSound(snd.first.get());
             }
         }
     }
 
-    void SoundManager::stopSound3D(const MWWorld::ConstPtr &ptr, std::string_view soundId)
+    void SoundManager::stopSound3D(const MWWorld::ConstPtr& ptr, std::string_view soundId)
     {
-        if(!mOutput->isInitialized())
+        if (!mOutput->isInitialized())
             return;
 
-        Sound_Buffer *sfx = mSoundBuffers.lookup(Misc::StringUtils::lowerCase(soundId));
-        if (!sfx) return;
+        Sound_Buffer* sfx = mSoundBuffers.lookup(Misc::StringUtils::lowerCase(soundId));
+        if (!sfx)
+            return;
 
         stopSound(sfx, ptr);
     }
 
-    void SoundManager::stopSound3D(const MWWorld::ConstPtr &ptr)
+    void SoundManager::stopSound3D(const MWWorld::ConstPtr& ptr)
     {
         SoundMap::iterator snditer = mActiveSounds.find(ptr.mRef);
-        if(snditer != mActiveSounds.end())
+        if (snditer != mActiveSounds.end())
         {
-            for (SoundBufferRefPair &snd : snditer->second.mList)
+            for (SoundBufferRefPair& snd : snditer->second.mList)
                 mOutput->finishSound(snd.first.get());
         }
         SaySoundMap::iterator sayiter = mSaySoundsQueue.find(ptr.mRef);
-        if(sayiter != mSaySoundsQueue.end())
+        if (sayiter != mSaySoundsQueue.end())
             mOutput->finishStream(sayiter->second.mStream.get());
         sayiter = mActiveSaySounds.find(ptr.mRef);
-        if(sayiter != mActiveSaySounds.end())
+        if (sayiter != mActiveSaySounds.end())
             mOutput->finishStream(sayiter->second.mStream.get());
     }
 
-    void SoundManager::stopSound(const MWWorld::CellStore *cell)
+    void SoundManager::stopSound(const MWWorld::CellStore* cell)
     {
         for (auto& [ref, sound] : mActiveSounds)
         {
@@ -678,47 +686,47 @@ namespace MWSound
                 mOutput->finishStream(sound.mStream.get());
         }
 
-        for (const auto& [ref, sound]: mActiveSaySounds)
+        for (const auto& [ref, sound] : mActiveSaySounds)
         {
             if (ref != nullptr && ref != MWMechanics::getPlayer().mRef && sound.mCell == cell)
                 mOutput->finishStream(sound.mStream.get());
         }
     }
 
-    void SoundManager::fadeOutSound3D(const MWWorld::ConstPtr &ptr,
-            std::string_view soundId, float duration)
+    void SoundManager::fadeOutSound3D(const MWWorld::ConstPtr& ptr, std::string_view soundId, float duration)
     {
         SoundMap::iterator snditer = mActiveSounds.find(ptr.mRef);
-        if(snditer != mActiveSounds.end())
+        if (snditer != mActiveSounds.end())
         {
-            Sound_Buffer *sfx = mSoundBuffers.lookup(Misc::StringUtils::lowerCase(soundId));
+            Sound_Buffer* sfx = mSoundBuffers.lookup(Misc::StringUtils::lowerCase(soundId));
             if (sfx == nullptr)
                 return;
-            for (SoundBufferRefPair &sndbuf : snditer->second.mList)
+            for (SoundBufferRefPair& sndbuf : snditer->second.mList)
             {
-                if(sndbuf.second == sfx)
+                if (sndbuf.second == sfx)
                     sndbuf.first->setFadeout(duration);
             }
         }
     }
 
-    bool SoundManager::getSoundPlaying(const MWWorld::ConstPtr &ptr, std::string_view soundId) const
+    bool SoundManager::getSoundPlaying(const MWWorld::ConstPtr& ptr, std::string_view soundId) const
     {
         SoundMap::const_iterator snditer = mActiveSounds.find(ptr.mRef);
-        if(snditer != mActiveSounds.end())
+        if (snditer != mActiveSounds.end())
         {
-            Sound_Buffer *sfx = mSoundBuffers.lookup(Misc::StringUtils::lowerCase(soundId));
+            Sound_Buffer* sfx = mSoundBuffers.lookup(Misc::StringUtils::lowerCase(soundId));
             return std::find_if(snditer->second.mList.cbegin(), snditer->second.mList.cend(),
-                [this,sfx](const SoundBufferRefPair &snd) -> bool
-                { return snd.second == sfx && mOutput->isSoundPlaying(snd.first.get()); }
-            ) != snditer->second.mList.cend();
+                       [this, sfx](const SoundBufferRefPair& snd) -> bool {
+                           return snd.second == sfx && mOutput->isSoundPlaying(snd.first.get());
+                       })
+                != snditer->second.mList.cend();
         }
         return false;
     }
 
     void SoundManager::pauseSounds(BlockerType blocker, int types)
     {
-        if(mOutput->isInitialized())
+        if (mOutput->isInitialized())
         {
             if (mPausedSoundTypes[blocker] != 0)
                 resumeSounds(blocker);
@@ -731,7 +739,7 @@ namespace MWSound
 
     void SoundManager::resumeSounds(BlockerType blocker)
     {
-        if(mOutput->isInitialized())
+        if (mOutput->isInitialized())
         {
             mPausedSoundTypes[blocker] = 0;
             int types = int(Type::Mask);
@@ -765,9 +773,9 @@ namespace MWSound
 
     void SoundManager::updateRegionSound(float duration)
     {
-        MWBase::World *world = MWBase::Environment::get().getWorld();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
         const MWWorld::ConstPtr player = world->getPlayerPtr();
-        const ESM::Cell *cell = player.getCell()->getCell();
+        const ESM::Cell* cell = player.getCell()->getCell();
 
         if (!cell->isExterior())
             return;
@@ -782,7 +790,7 @@ namespace MWSound
     {
         MWBase::World* world = MWBase::Environment::get().getWorld();
         const MWWorld::ConstPtr player = world->getPlayerPtr();
-        const ESM::Cell *curcell = player.getCell()->getCell();
+        const ESM::Cell* curcell = player.getCell()->getCell();
         const auto update = mWaterSoundUpdater.update(player, *world);
 
         WaterSoundAction action;
@@ -811,12 +819,12 @@ namespace MWSound
     }
 
     std::pair<SoundManager::WaterSoundAction, Sound_Buffer*> SoundManager::getWaterSoundAction(
-            const WaterSoundUpdate& update, const ESM::Cell* cell) const
+        const WaterSoundUpdate& update, const ESM::Cell* cell) const
     {
         if (mNearWaterSound)
         {
             if (update.mVolume == 0.0f)
-                return {WaterSoundAction::FinishSound, nullptr};
+                return { WaterSoundAction::FinishSound, nullptr };
 
             bool soundIdChanged = false;
 
@@ -826,29 +834,28 @@ namespace MWSound
                 const auto snditer = mActiveSounds.find(nullptr);
                 if (snditer != mActiveSounds.end())
                 {
-                    const auto pairiter = std::find_if(
-                        snditer->second.mList.begin(), snditer->second.mList.end(),
-                        [this](const SoundBufferRefPairList::value_type &item) -> bool
-                        { return mNearWaterSound == item.first.get(); }
-                    );
+                    const auto pairiter = std::find_if(snditer->second.mList.begin(), snditer->second.mList.end(),
+                        [this](const SoundBufferRefPairList::value_type& item) -> bool {
+                            return mNearWaterSound == item.first.get();
+                        });
                     if (pairiter != snditer->second.mList.end() && pairiter->second != sfx)
                         soundIdChanged = true;
                 }
             }
 
             if (soundIdChanged)
-                return {WaterSoundAction::PlaySound, nullptr};
+                return { WaterSoundAction::PlaySound, nullptr };
 
             if (sfx)
-                return {WaterSoundAction::SetVolume, sfx};
+                return { WaterSoundAction::SetVolume, sfx };
         }
         else if (update.mVolume > 0.0f)
-            return {WaterSoundAction::PlaySound, nullptr};
+            return { WaterSoundAction::PlaySound, nullptr };
 
-        return {WaterSoundAction::DoNothing, nullptr};
+        return { WaterSoundAction::DoNothing, nullptr };
     }
 
-    void SoundManager::cull3DSound(SoundBase *sound)
+    void SoundManager::cull3DSound(SoundBase* sound)
     {
         // Hard-coded distance of 2000.0f is from vanilla Morrowind
         const float maxDist = sound->getDistanceCull() ? 2000.0f : sound->getMaxDistance();
@@ -860,7 +867,8 @@ namespace MWSound
         if (squaredDist > squaredMaxDist)
         {
             // If getDistanceCull() is set, delete the sound after it has faded out
-            sound->setFade(sSfxFadeOutDuration, 0.0f, Play_FadeExponential | (sound->getDistanceCull() ? Play_StopAtFadeEnd : 0));
+            sound->setFade(
+                sSfxFadeOutDuration, 0.0f, Play_FadeExponential | (sound->getDistanceCull() ? Play_StopAtFadeEnd : 0));
         }
         else
         {
@@ -869,7 +877,6 @@ namespace MWSound
         }
     }
 
-
     void SoundManager::updateSounds(float duration)
     {
         // We update active say sounds map for specific actors here
@@ -892,37 +899,32 @@ namespace MWSound
         mTimePassed = 0.0f;
 
         // Make sure music is still playing
-        if(!isMusicPlaying() && !mCurrentPlaylist.empty())
+        if (!isMusicPlaying() && !mCurrentPlaylist.empty())
             startRandomTitle();
 
         Environment env = Env_Normal;
         if (mListenerUnderwater)
             env = Env_Underwater;
-        else if(mUnderwaterSound)
+        else if (mUnderwaterSound)
         {
             mOutput->finishSound(mUnderwaterSound);
             mUnderwaterSound = nullptr;
         }
 
         mOutput->startUpdate();
-        mOutput->updateListener(
-            mListenerPos,
-            mListenerDir,
-            mListenerUp,
-            env
-        );
+        mOutput->updateListener(mListenerPos, mListenerDir, mListenerUp, env);
 
         updateMusic(duration);
 
         // Check if any sounds are finished playing, and trash them
         SoundMap::iterator snditer = mActiveSounds.begin();
-        while(snditer != mActiveSounds.end())
+        while (snditer != mActiveSounds.end())
         {
             MWWorld::ConstPtr ptr = snditer->first;
             SoundBufferRefPairList::iterator sndidx = snditer->second.mList.begin();
-            while(sndidx != snditer->second.mList.end())
+            while (sndidx != snditer->second.mList.end())
             {
-                Sound *sound = sndidx->first.get();
+                Sound* sound = sndidx->first.get();
 
                 if (sound->getIs3D())
                 {
@@ -932,7 +934,7 @@ namespace MWSound
                     cull3DSound(sound);
                 }
 
-                if(!sound->updateFade(duration) || !mOutput->isSoundPlaying(sound))
+                if (!sound->updateFade(duration) || !mOutput->isSoundPlaying(sound))
                 {
                     mOutput->finishSound(sound);
                     if (sound == mUnderwaterSound)
@@ -948,29 +950,29 @@ namespace MWSound
                     ++sndidx;
                 }
             }
-            if(snditer->second.mList.empty())
+            if (snditer->second.mList.empty())
                 snditer = mActiveSounds.erase(snditer);
             else
                 ++snditer;
         }
 
         SaySoundMap::iterator sayiter = mActiveSaySounds.begin();
-        while(sayiter != mActiveSaySounds.end())
+        while (sayiter != mActiveSaySounds.end())
         {
             MWWorld::ConstPtr ptr = sayiter->first;
-            Stream *sound = sayiter->second.mStream.get();
+            Stream* sound = sayiter->second.mStream.get();
             if (sound->getIs3D())
             {
                 if (!ptr.isEmpty())
                 {
-                    MWBase::World *world = MWBase::Environment::get().getWorld();
+                    MWBase::World* world = MWBase::Environment::get().getWorld();
                     sound->setPosition(world->getActorHeadTransform(ptr).getTrans());
                 }
 
                 cull3DSound(sound);
             }
 
-            if(!sound->updateFade(duration) || !mOutput->isStreamPlaying(sound))
+            if (!sound->updateFade(duration) || !mOutput->isStreamPlaying(sound))
             {
                 mOutput->finishStream(sound);
                 sayiter = mActiveSaySounds.erase(sayiter);
@@ -985,8 +987,8 @@ namespace MWSound
         TrackList::iterator trkiter = mActiveTracks.begin();
         while (trkiter != mActiveTracks.end())
         {
-            Stream *sound = trkiter->get();
-            if(!mOutput->isStreamPlaying(sound))
+            Stream* sound = trkiter->get();
+            if (!mOutput->isStreamPlaying(sound))
             {
                 mOutput->finishStream(sound);
                 trkiter = mActiveTracks.erase(trkiter);
@@ -1000,16 +1002,15 @@ namespace MWSound
             }
         }
 
-        if(mListenerUnderwater)
+        if (mListenerUnderwater)
         {
             // Play underwater sound (after updating sounds)
-            if(!mUnderwaterSound)
+            if (!mUnderwaterSound)
                 mUnderwaterSound = playSound("Underwater", 1.0f, 1.0f, Type::Sfx, PlayMode::LoopNoEnv);
         }
         mOutput->finishUpdate();
     }
 
-
     void SoundManager::updateMusic(float duration)
     {
         if (!mNextMusic.empty())
@@ -1026,47 +1027,44 @@ namespace MWSound
         }
     }
 
-
     void SoundManager::update(float duration)
     {
-        if(!mOutput->isInitialized() || mPlaybackPaused)
+        if (!mOutput->isInitialized() || mPlaybackPaused)
             return;
 
         updateSounds(duration);
-        if (MWBase::Environment::get().getStateManager()->getState()!=
-            MWBase::StateManager::State_NoGame)
+        if (MWBase::Environment::get().getStateManager()->getState() != MWBase::StateManager::State_NoGame)
         {
             updateRegionSound(duration);
             updateWaterSound();
         }
     }
 
-
     void SoundManager::processChangedSettings(const Settings::CategorySettingVector& settings)
     {
         mVolumeSettings.update();
 
-        if(!mOutput->isInitialized())
+        if (!mOutput->isInitialized())
             return;
         mOutput->startUpdate();
-        for(SoundMap::value_type &snd : mActiveSounds)
+        for (SoundMap::value_type& snd : mActiveSounds)
         {
             for (SoundBufferRefPair& sndbuf : snd.second.mList)
             {
-                Sound *sound = sndbuf.first.get();
+                Sound* sound = sndbuf.first.get();
                 sound->setBaseVolume(volumeFromType(sound->getPlayType()));
                 mOutput->updateSound(sound);
             }
         }
-        for(SaySoundMap::value_type &snd : mActiveSaySounds)
+        for (SaySoundMap::value_type& snd : mActiveSaySounds)
         {
-            Stream *sound = snd.second.mStream.get();
+            Stream* sound = snd.second.mStream.get();
             sound->setBaseVolume(volumeFromType(sound->getPlayType()));
             mOutput->updateStream(sound);
         }
-        for(SaySoundMap::value_type &snd : mSaySoundsQueue)
+        for (SaySoundMap::value_type& snd : mSaySoundsQueue)
         {
-            Stream *sound = snd.second.mStream.get();
+            Stream* sound = snd.second.mStream.get();
             sound->setBaseVolume(volumeFromType(sound->getPlayType()));
             mOutput->updateStream(sound);
         }
@@ -1075,7 +1073,7 @@ namespace MWSound
             sound->setBaseVolume(volumeFromType(sound->getPlayType()));
             mOutput->updateStream(sound.get());
         }
-        if(mMusic)
+        if (mMusic)
         {
             mMusic->setBaseVolume(volumeFromType(mMusic->getPlayType()));
             mOutput->updateStream(mMusic.get());
@@ -1083,21 +1081,22 @@ namespace MWSound
         mOutput->finishUpdate();
     }
 
-    void SoundManager::setListenerPosDir(const osg::Vec3f &pos, const osg::Vec3f &dir, const osg::Vec3f &up, bool underwater)
+    void SoundManager::setListenerPosDir(
+        const osg::Vec3f& pos, const osg::Vec3f& dir, const osg::Vec3f& up, bool underwater)
     {
         mListenerPos = pos;
         mListenerDir = dir;
-        mListenerUp  = up;
+        mListenerUp = up;
 
         mListenerUnderwater = underwater;
 
         mWaterSoundUpdater.setUnderwater(underwater);
     }
 
-    void SoundManager::updatePtr(const MWWorld::ConstPtr &old, const MWWorld::ConstPtr &updated)
+    void SoundManager::updatePtr(const MWWorld::ConstPtr& old, const MWWorld::ConstPtr& updated)
     {
         SoundMap::iterator snditer = mActiveSounds.find(old.mRef);
-        if(snditer != mActiveSounds.end())
+        if (snditer != mActiveSounds.end())
             snditer->second.mCell = updated.mCell;
 
         if (const auto it = mSaySoundsQueue.find(old.mRef); it != mSaySoundsQueue.end())
@@ -1109,60 +1108,83 @@ namespace MWSound
 
     // Default readAll implementation, for decoders that can't do anything
     // better
-    void Sound_Decoder::readAll(std::vector<char> &output)
+    void Sound_Decoder::readAll(std::vector<char>& output)
     {
         size_t total = output.size();
         size_t got;
 
-        output.resize(total+32768);
-        while((got=read(&output[total], output.size()-total)) > 0)
+        output.resize(total + 32768);
+        while ((got = read(&output[total], output.size() - total)) > 0)
         {
             total += got;
-            output.resize(total*2);
+            output.resize(total * 2);
         }
         output.resize(total);
     }
 
-
-    const char *getSampleTypeName(SampleType type)
+    const char* getSampleTypeName(SampleType type)
     {
-        switch(type)
+        switch (type)
         {
-            case SampleType_UInt8: return "U8";
-            case SampleType_Int16: return "S16";
-            case SampleType_Float32: return "Float32";
+            case SampleType_UInt8:
+                return "U8";
+            case SampleType_Int16:
+                return "S16";
+            case SampleType_Float32:
+                return "Float32";
         }
         return "(unknown sample type)";
     }
 
-    const char *getChannelConfigName(ChannelConfig config)
+    const char* getChannelConfigName(ChannelConfig config)
     {
-        switch(config)
+        switch (config)
         {
-            case ChannelConfig_Mono:    return "Mono";
-            case ChannelConfig_Stereo:  return "Stereo";
-            case ChannelConfig_Quad:    return "Quad";
-            case ChannelConfig_5point1: return "5.1 Surround";
-            case ChannelConfig_7point1: return "7.1 Surround";
+            case ChannelConfig_Mono:
+                return "Mono";
+            case ChannelConfig_Stereo:
+                return "Stereo";
+            case ChannelConfig_Quad:
+                return "Quad";
+            case ChannelConfig_5point1:
+                return "5.1 Surround";
+            case ChannelConfig_7point1:
+                return "7.1 Surround";
         }
         return "(unknown channel config)";
     }
 
     size_t framesToBytes(size_t frames, ChannelConfig config, SampleType type)
     {
-        switch(config)
+        switch (config)
         {
-            case ChannelConfig_Mono:    frames *= 1; break;
-            case ChannelConfig_Stereo:  frames *= 2; break;
-            case ChannelConfig_Quad:    frames *= 4; break;
-            case ChannelConfig_5point1: frames *= 6; break;
-            case ChannelConfig_7point1: frames *= 8; break;
+            case ChannelConfig_Mono:
+                frames *= 1;
+                break;
+            case ChannelConfig_Stereo:
+                frames *= 2;
+                break;
+            case ChannelConfig_Quad:
+                frames *= 4;
+                break;
+            case ChannelConfig_5point1:
+                frames *= 6;
+                break;
+            case ChannelConfig_7point1:
+                frames *= 8;
+                break;
         }
-        switch(type)
+        switch (type)
         {
-            case SampleType_UInt8: frames *= 1; break;
-            case SampleType_Int16: frames *= 2; break;
-            case SampleType_Float32: frames *= 4; break;
+            case SampleType_UInt8:
+                frames *= 1;
+                break;
+            case SampleType_Int16:
+                frames *= 2;
+                break;
+            case SampleType_Float32:
+                frames *= 4;
+                break;
         }
         return frames;
     }
@@ -1176,9 +1198,9 @@ namespace MWSound
     {
         SoundManager::stopMusic();
 
-        for(SoundMap::value_type &snd : mActiveSounds)
+        for (SoundMap::value_type& snd : mActiveSounds)
         {
-            for (SoundBufferRefPair &sndbuf : snd.second.mList)
+            for (SoundBufferRefPair& sndbuf : snd.second.mList)
             {
                 mOutput->finishSound(sndbuf.first.get());
                 mSoundBuffers.release(*sndbuf.second);
@@ -1188,15 +1210,15 @@ namespace MWSound
         mUnderwaterSound = nullptr;
         mNearWaterSound = nullptr;
 
-        for(SaySoundMap::value_type &snd : mSaySoundsQueue)
+        for (SaySoundMap::value_type& snd : mSaySoundsQueue)
             mOutput->finishStream(snd.second.mStream.get());
         mSaySoundsQueue.clear();
 
-        for(SaySoundMap::value_type &snd : mActiveSaySounds)
+        for (SaySoundMap::value_type& snd : mActiveSaySounds)
             mOutput->finishStream(snd.second.mStream.get());
         mActiveSaySounds.clear();
 
-        for(StreamPtr& sound : mActiveTracks)
+        for (StreamPtr& sound : mActiveTracks)
             mOutput->finishStream(sound.get());
         mActiveTracks.clear();
         mPlaybackPaused = false;
diff --git a/apps/openmw/mwsound/soundmanagerimp.hpp b/apps/openmw/mwsound/soundmanagerimp.hpp
index ab74d4acd3..64ff8117fb 100644
--- a/apps/openmw/mwsound/soundmanagerimp.hpp
+++ b/apps/openmw/mwsound/soundmanagerimp.hpp
@@ -1,23 +1,23 @@
 #ifndef GAME_SOUND_SOUNDMANAGER_H
 #define GAME_SOUND_SOUNDMANAGER_H
 
+#include <map>
 #include <memory>
 #include <string>
-#include <utility>
-#include <map>
 #include <unordered_map>
+#include <utility>
 
-#include <components/settings/settings.hpp>
-#include <components/misc/objectpool.hpp>
 #include <components/fallback/fallback.hpp>
+#include <components/misc/objectpool.hpp>
+#include <components/settings/settings.hpp>
 
 #include "../mwbase/soundmanager.hpp"
 
 #include "regionsoundselector.hpp"
-#include "watersoundupdater.hpp"
+#include "sound_buffer.hpp"
 #include "type.hpp"
 #include "volumesettings.hpp"
-#include "sound_buffer.hpp"
+#include "watersoundupdater.hpp"
 
 namespace VFS
 {
@@ -97,8 +97,8 @@ namespace MWSound
 
         int mPausedSoundTypes[BlockerType::MaxCount] = {};
 
-        Sound *mUnderwaterSound;
-        Sound *mNearWaterSound;
+        Sound* mUnderwaterSound;
+        Sound* mNearWaterSound;
 
         std::string mNextMusic;
         bool mPlaybackPaused;
@@ -107,25 +107,25 @@ namespace MWSound
 
         float mTimePassed;
 
-        const ESM::Cell *mLastCell;
+        const ESM::Cell* mLastCell;
 
         Sound* mCurrentRegionSound;
 
-        Sound_Buffer *insertSound(const std::string &soundId, const ESM::Sound *sound);
+        Sound_Buffer* insertSound(const std::string& soundId, const ESM::Sound* sound);
 
         // returns a decoder to start streaming, or nullptr if the sound was not found
-        DecoderPtr loadVoice(const std::string &voicefile);
+        DecoderPtr loadVoice(const std::string& voicefile);
 
         SoundPtr getSoundRef();
         StreamPtr getStreamRef();
 
-        StreamPtr playVoice(DecoderPtr decoder, const osg::Vec3f &pos, bool playlocal);
+        StreamPtr playVoice(DecoderPtr decoder, const osg::Vec3f& pos, bool playlocal);
 
         void streamMusicFull(const std::string& filename);
         void advanceMusic(const std::string& filename);
         void startRandomTitle();
 
-        void cull3DSound(SoundBase *sound);
+        void cull3DSound(SoundBase* sound);
 
         void updateSounds(float duration);
         void updateRegionSound(float duration);
@@ -142,17 +142,17 @@ namespace MWSound
             PlaySound,
         };
 
-        std::pair<WaterSoundAction, Sound_Buffer*> getWaterSoundAction(const WaterSoundUpdate& update,
-                                                                       const ESM::Cell* cell) const;
+        std::pair<WaterSoundAction, Sound_Buffer*> getWaterSoundAction(
+            const WaterSoundUpdate& update, const ESM::Cell* cell) const;
 
-        SoundManager(const SoundManager &rhs);
-        SoundManager& operator=(const SoundManager &rhs);
+        SoundManager(const SoundManager& rhs);
+        SoundManager& operator=(const SoundManager& rhs);
 
     protected:
         DecoderPtr getDecoder();
         friend class OpenAL_Output;
 
-        void stopSound(Sound_Buffer *sfx, const MWWorld::ConstPtr &ptr);
+        void stopSound(Sound_Buffer* sfx, const MWWorld::ConstPtr& ptr);
         ///< Stop the given object from playing given sound buffer.
 
     public:
@@ -171,14 +171,14 @@ namespace MWSound
         bool isMusicPlaying() override;
         ///< Returns true if music is playing
 
-        void playPlaylist(const std::string &playlist) override;
+        void playPlaylist(const std::string& playlist) override;
         ///< Start playing music from the selected folder
         /// \param name of the folder that contains the playlist
 
         void playTitleMusic() override;
         ///< Start playing title music
 
-        void say(const MWWorld::ConstPtr &reference, const std::string& filename) override;
+        void say(const MWWorld::ConstPtr& reference, const std::string& filename) override;
         ///< Make an actor say some text.
         /// \param filename name of a sound file in "Sound/" in the data directory.
 
@@ -186,13 +186,13 @@ namespace MWSound
         ///< Say some text, without an actor ref
         /// \param filename name of a sound file in "Sound/" in the data directory.
 
-        bool sayActive(const MWWorld::ConstPtr &reference=MWWorld::ConstPtr()) const override;
+        bool sayActive(const MWWorld::ConstPtr& reference = MWWorld::ConstPtr()) const override;
         ///< Is actor not speaking?
 
-        bool sayDone(const MWWorld::ConstPtr &reference=MWWorld::ConstPtr()) const override;
+        bool sayDone(const MWWorld::ConstPtr& reference = MWWorld::ConstPtr()) const override;
         ///< For scripting backward compatibility
 
-        void stopSay(const MWWorld::ConstPtr &reference=MWWorld::ConstPtr()) override;
+        void stopSay(const MWWorld::ConstPtr& reference = MWWorld::ConstPtr()) override;
         ///< Stop an actor speaking
 
         float getSaySoundLoudness(const MWWorld::ConstPtr& reference) const override;
@@ -200,55 +200,57 @@ namespace MWSound
         /// and get an average loudness value (scale [0,1]) at the current time position.
         /// If the actor is not saying anything, returns 0.
 
-        Stream *playTrack(const DecoderPtr& decoder, Type type) override;
+        Stream* playTrack(const DecoderPtr& decoder, Type type) override;
         ///< Play a 2D audio track, using a custom decoder
 
-        void stopTrack(Stream *stream) override;
+        void stopTrack(Stream* stream) override;
         ///< Stop the given audio track from playing
 
-        double getTrackTimeDelay(Stream *stream) override;
+        double getTrackTimeDelay(Stream* stream) override;
         ///< Retives the time delay, in seconds, of the audio track (must be a sound
         /// returned by \ref playTrack). Only intended to be called by the track
         /// decoder's read method.
 
-        Sound *playSound(std::string_view soundId, float volume, float pitch, Type type=Type::Sfx, PlayMode mode=PlayMode::Normal, float offset=0) override;
+        Sound* playSound(std::string_view soundId, float volume, float pitch, Type type = Type::Sfx,
+            PlayMode mode = PlayMode::Normal, float offset = 0) override;
         ///< Play a sound, independently of 3D-position
         ///< @param offset Number of seconds into the sound to start playback.
 
-        Sound *playSound3D(const MWWorld::ConstPtr &reference, std::string_view soundId,
-                                   float volume, float pitch, Type type=Type::Sfx,
-                                   PlayMode mode=PlayMode::Normal, float offset=0) override;
-        ///< Play a 3D sound attached to an MWWorld::Ptr. Will be updated automatically with the Ptr's position, unless Play_NoTrack is specified.
+        Sound* playSound3D(const MWWorld::ConstPtr& reference, std::string_view soundId, float volume, float pitch,
+            Type type = Type::Sfx, PlayMode mode = PlayMode::Normal, float offset = 0) override;
+        ///< Play a 3D sound attached to an MWWorld::Ptr. Will be updated automatically with the Ptr's position, unless
+        ///< Play_NoTrack is specified.
         ///< @param offset Number of seconds into the sound to start playback.
 
-        Sound *playSound3D(const osg::Vec3f& initialPos, std::string_view soundId,
-                                   float volume, float pitch, Type type, PlayMode mode, float offset=0) override;
-        ///< Play a 3D sound at \a initialPos. If the sound should be moving, it must be updated using Sound::setPosition.
+        Sound* playSound3D(const osg::Vec3f& initialPos, std::string_view soundId, float volume, float pitch, Type type,
+            PlayMode mode, float offset = 0) override;
+        ///< Play a 3D sound at \a initialPos. If the sound should be moving, it must be updated using
+        ///< Sound::setPosition.
         ///< @param offset Number of seconds into the sound to start playback.
 
-        void stopSound(Sound *sound) override;
+        void stopSound(Sound* sound) override;
         ///< Stop the given sound from playing
         /// @note no-op if \a sound is null
 
-        void stopSound3D(const MWWorld::ConstPtr &reference, std::string_view soundId) override;
+        void stopSound3D(const MWWorld::ConstPtr& reference, std::string_view soundId) override;
         ///< Stop the given object from playing the given sound,
 
-        void stopSound3D(const MWWorld::ConstPtr &reference) override;
+        void stopSound3D(const MWWorld::ConstPtr& reference) override;
         ///< Stop the given object from playing all sounds.
 
-        void stopSound(const MWWorld::CellStore *cell) override;
+        void stopSound(const MWWorld::CellStore* cell) override;
         ///< Stop all sounds for the given cell.
 
-        void fadeOutSound3D(const MWWorld::ConstPtr &reference, std::string_view soundId, float duration) override;
+        void fadeOutSound3D(const MWWorld::ConstPtr& reference, std::string_view soundId, float duration) override;
         ///< Fade out given sound (that is already playing) of given object
         ///< @param reference Reference to object, whose sound is faded out
         ///< @param soundId ID of the sound to fade out.
         ///< @param duration Time until volume reaches 0.
 
-        bool getSoundPlaying(const MWWorld::ConstPtr &reference, std::string_view soundId) const override;
+        bool getSoundPlaying(const MWWorld::ConstPtr& reference, std::string_view soundId) const override;
         ///< Is the given sound currently playing on the given object?
 
-        void pauseSounds(MWSound::BlockerType blocker, int types=int(Type::Mask)) override;
+        void pauseSounds(MWSound::BlockerType blocker, int types = int(Type::Mask)) override;
         ///< Pauses all currently playing sounds, including music.
 
         void resumeSounds(MWSound::BlockerType blocker) override;
@@ -259,9 +261,10 @@ namespace MWSound
 
         void update(float duration);
 
-        void setListenerPosDir(const osg::Vec3f &pos, const osg::Vec3f &dir, const osg::Vec3f &up, bool underwater) override;
+        void setListenerPosDir(
+            const osg::Vec3f& pos, const osg::Vec3f& dir, const osg::Vec3f& up, bool underwater) override;
 
-        void updatePtr (const MWWorld::ConstPtr& old, const MWWorld::ConstPtr& updated) override;
+        void updatePtr(const MWWorld::ConstPtr& old, const MWWorld::ConstPtr& updated) override;
 
         void clear() override;
     };
diff --git a/apps/openmw/mwsound/type.hpp b/apps/openmw/mwsound/type.hpp
index 5f063c3954..d7bc6dd05c 100644
--- a/apps/openmw/mwsound/type.hpp
+++ b/apps/openmw/mwsound/type.hpp
@@ -5,12 +5,12 @@ namespace MWSound
 {
     enum class Type
     {
-        Sfx   = 1 << 5, /* Normal SFX sound */
+        Sfx = 1 << 5, /* Normal SFX sound */
         Voice = 1 << 6, /* Voice sound */
-        Foot  = 1 << 7, /* Footstep sound */
+        Foot = 1 << 7, /* Footstep sound */
         Music = 1 << 8, /* Music track */
         Movie = 1 << 9, /* Movie audio track */
-        Mask  = Sfx | Voice | Foot | Music | Movie
+        Mask = Sfx | Voice | Foot | Music | Movie
     };
 }
 
diff --git a/apps/openmw/mwsound/volumesettings.cpp b/apps/openmw/mwsound/volumesettings.cpp
index fd79b97e9b..4306bc5268 100644
--- a/apps/openmw/mwsound/volumesettings.cpp
+++ b/apps/openmw/mwsound/volumesettings.cpp
@@ -15,11 +15,11 @@ namespace MWSound
     }
 
     VolumeSettings::VolumeSettings()
-        : mMasterVolume(clamp(Settings::Manager::getFloat("master volume", "Sound"))),
-          mSFXVolume(clamp(Settings::Manager::getFloat("sfx volume", "Sound"))),
-          mMusicVolume(clamp(Settings::Manager::getFloat("music volume", "Sound"))),
-          mVoiceVolume(clamp(Settings::Manager::getFloat("voice volume", "Sound"))),
-          mFootstepsVolume(clamp(Settings::Manager::getFloat("footsteps volume", "Sound")))
+        : mMasterVolume(clamp(Settings::Manager::getFloat("master volume", "Sound")))
+        , mSFXVolume(clamp(Settings::Manager::getFloat("sfx volume", "Sound")))
+        , mMusicVolume(clamp(Settings::Manager::getFloat("music volume", "Sound")))
+        , mVoiceVolume(clamp(Settings::Manager::getFloat("voice volume", "Sound")))
+        , mFootstepsVolume(clamp(Settings::Manager::getFloat("footsteps volume", "Sound")))
     {
     }
 
@@ -27,7 +27,7 @@ namespace MWSound
     {
         float volume = mMasterVolume;
 
-        switch(type)
+        switch (type)
         {
             case Type::Sfx:
                 volume *= mSFXVolume;
diff --git a/apps/openmw/mwsound/volumesettings.hpp b/apps/openmw/mwsound/volumesettings.hpp
index eec5f5c1bf..884a3e1bca 100644
--- a/apps/openmw/mwsound/volumesettings.hpp
+++ b/apps/openmw/mwsound/volumesettings.hpp
@@ -7,19 +7,19 @@ namespace MWSound
 {
     class VolumeSettings
     {
-        public:
-            VolumeSettings();
+    public:
+        VolumeSettings();
 
-            float getVolumeFromType(Type type) const;
+        float getVolumeFromType(Type type) const;
 
-            void update();
+        void update();
 
-        private:
-            float mMasterVolume;
-            float mSFXVolume;
-            float mMusicVolume;
-            float mVoiceVolume;
-            float mFootstepsVolume;
+    private:
+        float mMasterVolume;
+        float mSFXVolume;
+        float mMusicVolume;
+        float mVoiceVolume;
+        float mFootstepsVolume;
     };
 }
 
diff --git a/apps/openmw/mwsound/watersoundupdater.hpp b/apps/openmw/mwsound/watersoundupdater.hpp
index b20b9db6c0..3994cb4af5 100644
--- a/apps/openmw/mwsound/watersoundupdater.hpp
+++ b/apps/openmw/mwsound/watersoundupdater.hpp
@@ -33,21 +33,18 @@ namespace MWSound
 
     class WaterSoundUpdater
     {
-        public:
-            explicit WaterSoundUpdater(const WaterSoundUpdaterSettings& settings);
+    public:
+        explicit WaterSoundUpdater(const WaterSoundUpdaterSettings& settings);
 
-            WaterSoundUpdate update(const MWWorld::ConstPtr& player, const MWBase::World& world) const;
+        WaterSoundUpdate update(const MWWorld::ConstPtr& player, const MWBase::World& world) const;
 
-            void setUnderwater(bool value)
-            {
-                mListenerUnderwater = value;
-            }
+        void setUnderwater(bool value) { mListenerUnderwater = value; }
 
-        private:
-            const WaterSoundUpdaterSettings mSettings;
-            bool mListenerUnderwater = false;
+    private:
+        const WaterSoundUpdaterSettings mSettings;
+        bool mListenerUnderwater = false;
 
-            float getVolume(const MWWorld::ConstPtr& player, const MWBase::World& world) const;
+        float getVolume(const MWWorld::ConstPtr& player, const MWBase::World& world) const;
     };
 }
 
diff --git a/apps/openmw/mwstate/character.cpp b/apps/openmw/mwstate/character.cpp
index 842a6f967d..847f82942d 100644
--- a/apps/openmw/mwstate/character.cpp
+++ b/apps/openmw/mwstate/character.cpp
@@ -1,11 +1,11 @@
 #include "character.hpp"
 
+#include <algorithm>
 #include <cctype>
 #include <filesystem>
 #include <sstream>
-#include <utility>
-#include <algorithm>
 #include <tuple>
+#include <utility>
 
 #include <components/esm/defs.hpp>
 #include <components/esm3/esmreader.hpp>
@@ -13,9 +13,9 @@
 
 #include <components/misc/strings/algorithm.hpp>
 
-bool MWState::operator< (const Slot& left, const Slot& right)
+bool MWState::operator<(const Slot& left, const Slot& right)
 {
-    return left.mTimeStamp<right.mTimeStamp;
+    return left.mTimeStamp < right.mTimeStamp;
 }
 
 std::string MWState::getFirstGameFile(const std::vector<std::string>& contentFiles)
@@ -28,29 +28,29 @@ std::string MWState::getFirstGameFile(const std::vector<std::string>& contentFil
     return "";
 }
 
-void MWState::Character::addSlot (const std::filesystem::path& path, const std::string& game)
+void MWState::Character::addSlot(const std::filesystem::path& path, const std::string& game)
 {
     Slot slot;
     slot.mPath = path;
-    slot.mTimeStamp = std::filesystem::last_write_time (path);
+    slot.mTimeStamp = std::filesystem::last_write_time(path);
 
     ESM::ESMReader reader;
-    reader.open (slot.mPath);
+    reader.open(slot.mPath);
 
-    if (reader.getRecName()!=ESM::REC_SAVE)
+    if (reader.getRecName() != ESM::REC_SAVE)
         return; // invalid save file -> ignore
 
     reader.getRecHeader();
 
-    slot.mProfile.load (reader);
+    slot.mProfile.load(reader);
 
     if (!Misc::StringUtils::ciEqual(getFirstGameFile(slot.mProfile.mContentFiles), game))
         return; // this file is for a different game -> ignore
 
-    mSlots.push_back (slot);
+    mSlots.push_back(slot);
 }
 
-void MWState::Character::addSlot (const ESM::SavedGame& profile)
+void MWState::Character::addSlot(const ESM::SavedGame& profile)
 {
     Slot slot;
 
@@ -58,10 +58,10 @@ void MWState::Character::addSlot (const ESM::SavedGame& profile)
 
     // The profile description is user-supplied, so we need to escape the path
     Utf8Stream description(profile.mDescription);
-    while(!description.eof())
+    while (!description.eof())
     {
         auto c = description.consume();
-        if(c <= 0x7F && std::isalnum(c)) // Ignore multibyte characters and non alphanumeric characters
+        if (c <= 0x7F && std::isalnum(c)) // Ignore multibyte characters and non alphanumeric characters
             stream << static_cast<char>(c);
         else
             stream << '_';
@@ -71,7 +71,7 @@ void MWState::Character::addSlot (const ESM::SavedGame& profile)
     slot.mPath = mPath / (stream.str() + ext);
 
     // Append an index if necessary to ensure a unique file
-    int i=0;
+    int i = 0;
     while (std::filesystem::exists(slot.mPath))
     {
         const std::string test = stream.str() + " - " + std::to_string(++i);
@@ -79,30 +79,32 @@ void MWState::Character::addSlot (const ESM::SavedGame& profile)
     }
 
     slot.mProfile = profile;
-    slot.mTimeStamp = std::filesystem::file_time_type ();
+    slot.mTimeStamp = std::filesystem::file_time_type();
 
-    mSlots.push_back (slot);
+    mSlots.push_back(slot);
 }
 
-MWState::Character::Character (std::filesystem::path saves, const std::string& game)
-: mPath (std::move(saves))
+MWState::Character::Character(std::filesystem::path saves, const std::string& game)
+    : mPath(std::move(saves))
 {
-    if (!std::filesystem::is_directory (mPath))
+    if (!std::filesystem::is_directory(mPath))
     {
-        std::filesystem::create_directories (mPath);
+        std::filesystem::create_directories(mPath);
     }
     else
     {
-        for (const auto& iter : std::filesystem::directory_iterator (mPath))
+        for (const auto& iter : std::filesystem::directory_iterator(mPath))
         {
             try
             {
-                addSlot (iter, game);
+                addSlot(iter, game);
             }
-            catch (...) {} // ignoring bad saved game files for now
+            catch (...)
+            {
+            } // ignoring bad saved game files for now
         }
 
-        std::sort (mSlots.begin(), mSlots.end());
+        std::sort(mSlots.begin(), mSlots.end());
     }
 }
 
@@ -111,7 +113,7 @@ void MWState::Character::cleanup()
     if (mSlots.empty())
     {
         // All slots are gone, no need to keep the empty directory
-        if (std::filesystem::is_directory (mPath))
+        if (std::filesystem::is_directory(mPath))
         {
             // Extra safety check to make sure the directory is empty (e.g. slots failed to parse header)
             std::filesystem::directory_iterator it(mPath);
@@ -121,45 +123,45 @@ void MWState::Character::cleanup()
     }
 }
 
-const MWState::Slot *MWState::Character::createSlot (const ESM::SavedGame& profile)
+const MWState::Slot* MWState::Character::createSlot(const ESM::SavedGame& profile)
 {
-    addSlot (profile);
+    addSlot(profile);
 
     return &mSlots.back();
 }
 
-void MWState::Character::deleteSlot (const Slot *slot)
+void MWState::Character::deleteSlot(const Slot* slot)
 {
     int index = slot - mSlots.data();
 
-    if (index<0 || index>=static_cast<int> (mSlots.size()))
+    if (index < 0 || index >= static_cast<int>(mSlots.size()))
     {
         // sanity check; not entirely reliable
-        throw std::logic_error ("slot not found");
+        throw std::logic_error("slot not found");
     }
 
     std::filesystem::remove(slot->mPath);
 
-    mSlots.erase (mSlots.begin()+index);
+    mSlots.erase(mSlots.begin() + index);
 }
 
-const MWState::Slot *MWState::Character::updateSlot (const Slot *slot, const ESM::SavedGame& profile)
+const MWState::Slot* MWState::Character::updateSlot(const Slot* slot, const ESM::SavedGame& profile)
 {
     int index = slot - mSlots.data();
 
-    if (index<0 || index>=static_cast<int> (mSlots.size()))
+    if (index < 0 || index >= static_cast<int>(mSlots.size()))
     {
         // sanity check; not entirely reliable
-        throw std::logic_error ("slot not found");
+        throw std::logic_error("slot not found");
     }
 
     Slot newSlot = *slot;
     newSlot.mProfile = profile;
-    newSlot.mTimeStamp = std::filesystem::file_time_type ();
+    newSlot.mTimeStamp = std::filesystem::file_time_type();
 
-    mSlots.erase (mSlots.begin()+index);
+    mSlots.erase(mSlots.begin() + index);
 
-    mSlots.push_back (newSlot);
+    mSlots.push_back(newSlot);
 
     return &mSlots.back();
 }
@@ -177,17 +179,13 @@ MWState::Character::SlotIterator MWState::Character::end() const
 const ESM::SavedGame& MWState::Character::getSignature() const
 {
     if (mSlots.empty())
-        throw std::logic_error ("character signature not available");
+        throw std::logic_error("character signature not available");
 
-    const auto tiePlayerLevelAndTimeStamp = [] (const Slot& v)
-    {
-        return std::tie(v.mProfile.mPlayerLevel, v.mTimeStamp);
-    };
+    const auto tiePlayerLevelAndTimeStamp
+        = [](const Slot& v) { return std::tie(v.mProfile.mPlayerLevel, v.mTimeStamp); };
 
-    const auto lessByPlayerLevelAndTimeStamp = [&] (const Slot& l, const Slot& r)
-    {
-        return tiePlayerLevelAndTimeStamp(l) < tiePlayerLevelAndTimeStamp(r);
-    };
+    const auto lessByPlayerLevelAndTimeStamp
+        = [&](const Slot& l, const Slot& r) { return tiePlayerLevelAndTimeStamp(l) < tiePlayerLevelAndTimeStamp(r); };
 
     return std::max_element(mSlots.begin(), mSlots.end(), lessByPlayerLevelAndTimeStamp)->mProfile;
 }
diff --git a/apps/openmw/mwstate/character.hpp b/apps/openmw/mwstate/character.hpp
index 1f3f6debf5..7b9eba2fee 100644
--- a/apps/openmw/mwstate/character.hpp
+++ b/apps/openmw/mwstate/character.hpp
@@ -14,58 +14,55 @@ namespace MWState
         std::filesystem::file_time_type mTimeStamp;
     };
 
-    bool operator< (const Slot& left, const Slot& right);
+    bool operator<(const Slot& left, const Slot& right);
 
     std::string getFirstGameFile(const std::vector<std::string>& contentFiles);
 
     class Character
     {
-        public:
+    public:
+        typedef std::vector<Slot>::const_reverse_iterator SlotIterator;
 
-            typedef std::vector<Slot>::const_reverse_iterator SlotIterator;
-
-        private:
-
-            std::filesystem::path mPath;
-            std::vector<Slot> mSlots;
-
-            void addSlot (const std::filesystem::path& path, const std::string& game);
+    private:
+        std::filesystem::path mPath;
+        std::vector<Slot> mSlots;
 
-            void addSlot (const ESM::SavedGame& profile);
+        void addSlot(const std::filesystem::path& path, const std::string& game);
 
-        public:
+        void addSlot(const ESM::SavedGame& profile);
 
-            Character (std::filesystem::path  saves, const std::string& game);
+    public:
+        Character(std::filesystem::path saves, const std::string& game);
 
-            void cleanup();
-            ///< Delete the directory we used, if it is empty
+        void cleanup();
+        ///< Delete the directory we used, if it is empty
 
-            const Slot *createSlot (const ESM::SavedGame& profile);
-            ///< Create new slot.
-            ///
-            /// \attention The ownership of the slot is not transferred.
+        const Slot* createSlot(const ESM::SavedGame& profile);
+        ///< Create new slot.
+        ///
+        /// \attention The ownership of the slot is not transferred.
 
-            /// \note Slot must belong to this character.
-            ///
-            /// \attention The \a slot pointer will be invalidated by this call.
-            void deleteSlot (const Slot *slot);
+        /// \note Slot must belong to this character.
+        ///
+        /// \attention The \a slot pointer will be invalidated by this call.
+        void deleteSlot(const Slot* slot);
 
-            const Slot *updateSlot (const Slot *slot, const ESM::SavedGame& profile);
-            /// \note Slot must belong to this character.
-            ///
-            /// \attention The \a slot pointer will be invalidated by this call.
+        const Slot* updateSlot(const Slot* slot, const ESM::SavedGame& profile);
+        /// \note Slot must belong to this character.
+        ///
+        /// \attention The \a slot pointer will be invalidated by this call.
 
-            SlotIterator begin() const;
-            ///<  Any call to createSlot and updateSlot can invalidate the returned iterator.
+        SlotIterator begin() const;
+        ///<  Any call to createSlot and updateSlot can invalidate the returned iterator.
 
-            SlotIterator end() const;
+        SlotIterator end() const;
 
-            const std::filesystem::path& getPath() const;
+        const std::filesystem::path& getPath() const;
 
-            const ESM::SavedGame& getSignature() const;
-            ///< Return signature information for this character.
-            ///
-            /// \attention This function must not be called if there are no slots.
+        const ESM::SavedGame& getSignature() const;
+        ///< Return signature information for this character.
+        ///
+        /// \attention This function must not be called if there are no slots.
     };
 }
 
diff --git a/apps/openmw/mwstate/charactermanager.cpp b/apps/openmw/mwstate/charactermanager.cpp
index c9bcb0b139..c41ddd42c0 100644
--- a/apps/openmw/mwstate/charactermanager.cpp
+++ b/apps/openmw/mwstate/charactermanager.cpp
@@ -1,44 +1,44 @@
 #include "charactermanager.hpp"
 
 #include <cctype>
-#include <sstream>
 #include <filesystem>
+#include <sstream>
 #include <utility>
 
 #include <components/misc/utf8stream.hpp>
 
-MWState::CharacterManager::CharacterManager (std::filesystem::path  saves,
-    const std::vector<std::string>& contentFiles)
-: mPath (std::move(saves)), mCurrent (nullptr), mGame (getFirstGameFile(contentFiles))
+MWState::CharacterManager::CharacterManager(std::filesystem::path saves, const std::vector<std::string>& contentFiles)
+    : mPath(std::move(saves))
+    , mCurrent(nullptr)
+    , mGame(getFirstGameFile(contentFiles))
 {
-    if (!std::filesystem::is_directory (mPath))
+    if (!std::filesystem::is_directory(mPath))
     {
-        std::filesystem::create_directories (mPath);
+        std::filesystem::create_directories(mPath);
     }
     else
     {
-        for (std::filesystem::directory_iterator iter (mPath);
-            iter!=std::filesystem::directory_iterator(); ++iter)
+        for (std::filesystem::directory_iterator iter(mPath); iter != std::filesystem::directory_iterator(); ++iter)
         {
             std::filesystem::path characterDir = *iter;
 
-            if (std::filesystem::is_directory (characterDir))
+            if (std::filesystem::is_directory(characterDir))
             {
-                Character character (characterDir, mGame);
+                Character character(characterDir, mGame);
 
-                if (character.begin()!=character.end())
-                    mCharacters.push_back (character);
+                if (character.begin() != character.end())
+                    mCharacters.push_back(character);
             }
         }
     }
 }
 
-MWState::Character *MWState::CharacterManager::getCurrentCharacter ()
+MWState::Character* MWState::CharacterManager::getCurrentCharacter()
 {
     return mCurrent;
 }
 
-void MWState::CharacterManager::deleteSlot(const MWState::Character *character, const MWState::Slot *slot)
+void MWState::CharacterManager::deleteSlot(const MWState::Character* character, const MWState::Slot* slot)
 {
     std::list<Character>::iterator it = findCharacter(character);
 
@@ -60,10 +60,10 @@ MWState::Character* MWState::CharacterManager::createCharacter(const std::string
 
     // The character name is user-supplied, so we need to escape the path
     Utf8Stream nameStream(name);
-    while(!nameStream.eof())
+    while (!nameStream.eof())
     {
         auto c = nameStream.consume();
-        if(c <= 0x7F && std::isalnum(c)) // Ignore multibyte characters and non alphanumeric characters
+        if (c <= 0x7F && std::isalnum(c)) // Ignore multibyte characters and non alphanumeric characters
             stream << static_cast<char>(c);
         else
             stream << '_';
@@ -72,13 +72,13 @@ MWState::Character* MWState::CharacterManager::createCharacter(const std::string
     std::filesystem::path path = mPath / stream.str();
 
     // Append an index if necessary to ensure a unique directory
-    int i=0;
+    int i = 0;
     while (std::filesystem::exists(path))
     {
-           std::ostringstream test;
-           test << stream.str();
-           test << " - " << ++i;
-           path = mPath / test.str();
+        std::ostringstream test;
+        test << stream.str();
+        test << " - " << ++i;
+        path = mPath / test.str();
     }
 
     mCharacters.emplace_back(path, mGame);
@@ -94,11 +94,11 @@ std::list<MWState::Character>::iterator MWState::CharacterManager::findCharacter
             break;
     }
     if (it == mCharacters.end())
-        throw std::logic_error ("invalid character");
+        throw std::logic_error("invalid character");
     return it;
 }
 
-void MWState::CharacterManager::setCurrentCharacter (const Character *character)
+void MWState::CharacterManager::setCurrentCharacter(const Character* character)
 {
     if (!character)
         mCurrent = nullptr;
@@ -110,7 +110,6 @@ void MWState::CharacterManager::setCurrentCharacter (const Character *character)
     }
 }
 
-
 std::list<MWState::Character>::const_iterator MWState::CharacterManager::begin() const
 {
     return mCharacters.begin();
diff --git a/apps/openmw/mwstate/charactermanager.hpp b/apps/openmw/mwstate/charactermanager.hpp
index f2cd45cd10..dac189e68a 100644
--- a/apps/openmw/mwstate/charactermanager.hpp
+++ b/apps/openmw/mwstate/charactermanager.hpp
@@ -10,42 +10,40 @@ namespace MWState
 {
     class CharacterManager
     {
-            std::filesystem::path mPath;
+        std::filesystem::path mPath;
 
-            // Uses std::list, so that mCurrent stays valid when characters are deleted
-            std::list<Character> mCharacters;
+        // Uses std::list, so that mCurrent stays valid when characters are deleted
+        std::list<Character> mCharacters;
 
-            Character *mCurrent;
-            std::string mGame;
+        Character* mCurrent;
+        std::string mGame;
 
-        private:
+    private:
+        CharacterManager(const CharacterManager&);
+        ///< Not implemented
 
-            CharacterManager (const CharacterManager&);
-            ///< Not implemented
+        CharacterManager& operator=(const CharacterManager&);
+        ///< Not implemented
 
-            CharacterManager& operator= (const CharacterManager&);
-            ///< Not implemented
+        std::list<Character>::iterator findCharacter(const MWState::Character* character);
 
-            std::list<Character>::iterator findCharacter(const MWState::Character* character);
+    public:
+        CharacterManager(std::filesystem::path saves, const std::vector<std::string>& contentFiles);
 
-        public:
+        Character* getCurrentCharacter();
+        ///< @note May return null
 
-            CharacterManager (std::filesystem::path  saves, const std::vector<std::string>& contentFiles);
+        void deleteSlot(const MWState::Character* character, const MWState::Slot* slot);
 
-            Character *getCurrentCharacter ();
-            ///< @note May return null
+        Character* createCharacter(const std::string& name);
+        ///< Create new character within saved game management
+        /// \param name Name for the character (does not need to be unique)
 
-            void deleteSlot(const MWState::Character *character, const MWState::Slot *slot);
+        void setCurrentCharacter(const Character* character);
 
-            Character* createCharacter(const std::string& name);
-            ///< Create new character within saved game management
-            /// \param name Name for the character (does not need to be unique)
+        std::list<Character>::const_iterator begin() const;
 
-            void setCurrentCharacter (const Character *character);
-
-            std::list<Character>::const_iterator begin() const;
-
-            std::list<Character>::const_iterator end() const;
+        std::list<Character>::const_iterator end() const;
     };
 }
 
diff --git a/apps/openmw/mwstate/quicksavemanager.cpp b/apps/openmw/mwstate/quicksavemanager.cpp
index bf17815207..1028866aac 100644
--- a/apps/openmw/mwstate/quicksavemanager.cpp
+++ b/apps/openmw/mwstate/quicksavemanager.cpp
@@ -1,26 +1,26 @@
 #include "quicksavemanager.hpp"
 
-MWState::QuickSaveManager::QuickSaveManager(std::string &saveName, unsigned int maxSaves)
-  : mSaveName(saveName)
-  , mMaxSaves(maxSaves)
-  , mSlotsVisited(0)
-  , mOldestSlotVisited(nullptr)
+MWState::QuickSaveManager::QuickSaveManager(std::string& saveName, unsigned int maxSaves)
+    : mSaveName(saveName)
+    , mMaxSaves(maxSaves)
+    , mSlotsVisited(0)
+    , mOldestSlotVisited(nullptr)
 {
 }
 
-void MWState::QuickSaveManager::visitSave(const Slot *saveSlot)
+void MWState::QuickSaveManager::visitSave(const Slot* saveSlot)
 {
-    if(mSaveName == saveSlot->mProfile.mDescription)
+    if (mSaveName == saveSlot->mProfile.mDescription)
     {
         ++mSlotsVisited;
-        if(isOldestSave(saveSlot))
+        if (isOldestSave(saveSlot))
             mOldestSlotVisited = saveSlot;
     }
 }
 
-bool MWState::QuickSaveManager::isOldestSave(const Slot *compare) const
+bool MWState::QuickSaveManager::isOldestSave(const Slot* compare) const
 {
-    if(mOldestSlotVisited == nullptr)
+    if (mOldestSlotVisited == nullptr)
         return true;
     return (compare->mTimeStamp <= mOldestSlotVisited->mTimeStamp);
 }
@@ -30,9 +30,9 @@ bool MWState::QuickSaveManager::shouldCreateNewSlot() const
     return (mSlotsVisited < mMaxSaves);
 }
 
-const MWState::Slot *MWState::QuickSaveManager::getNextQuickSaveSlot()
+const MWState::Slot* MWState::QuickSaveManager::getNextQuickSaveSlot()
 {
-    if(shouldCreateNewSlot())
+    if (shouldCreateNewSlot())
         return nullptr;
     return mOldestSlotVisited;
 }
diff --git a/apps/openmw/mwstate/quicksavemanager.hpp b/apps/openmw/mwstate/quicksavemanager.hpp
index 3272b24b51..3fa24d34d4 100644
--- a/apps/openmw/mwstate/quicksavemanager.hpp
+++ b/apps/openmw/mwstate/quicksavemanager.hpp
@@ -5,26 +5,30 @@
 
 #include "character.hpp"
 
-namespace MWState{
-    class QuickSaveManager{
+namespace MWState
+{
+    class QuickSaveManager
+    {
         std::string mSaveName;
         unsigned int mMaxSaves;
         unsigned int mSlotsVisited;
-        const Slot *mOldestSlotVisited;
+        const Slot* mOldestSlotVisited;
+
     private:
         bool shouldCreateNewSlot() const;
-        bool isOldestSave(const Slot *compare) const;
+        bool isOldestSave(const Slot* compare) const;
+
     public:
-        QuickSaveManager(std::string &saveName, unsigned int maxSaves);
+        QuickSaveManager(std::string& saveName, unsigned int maxSaves);
         ///< A utility class to manage multiple quicksave slots
         ///
         /// \param saveName The name of the save ("QuickSave", "AutoSave", etc)
         /// \param maxSaves The maximum number of save slots to create before recycling old ones
 
-        void visitSave(const Slot *saveSlot);
+        void visitSave(const Slot* saveSlot);
         ///< Visits the given \a slot \a
 
-        const Slot *getNextQuickSaveSlot();
+        const Slot* getNextQuickSaveSlot();
         ///< Get the slot that the next quicksave should use.
         ///
         ///\return Either the oldest quicksave slot visited, or nullptr if a new slot can be made
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 814535489e..2f29771eef 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -4,47 +4,47 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm3/esmwriter.hpp>
-#include <components/esm3/esmreader.hpp>
 #include <components/esm3/cellid.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/esm3/loadcell.hpp>
 #include <components/esm3/loadclas.hpp>
 
 #include <components/loadinglistener/loadinglistener.hpp>
 
-#include <components/settings/settings.hpp>
 #include <components/files/conversion.hpp>
+#include <components/settings/settings.hpp>
 
 #include <osg/Image>
 
 #include <osgDB/Registry>
 
+#include "../mwbase/dialoguemanager.hpp"
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
+#include "../mwbase/inputmanager.hpp"
 #include "../mwbase/journal.hpp"
-#include "../mwbase/dialoguemanager.hpp"
-#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/luamanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/scriptmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
-#include "../mwbase/inputmanager.hpp"
-#include "../mwbase/luamanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwworld/player.hpp"
-#include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/player.hpp"
 
-#include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/npcstats.hpp"
 
 #include "../mwscript/globalscripts.hpp"
 
 #include "quicksavemanager.hpp"
 
-void MWState::StateManager::cleanup (bool force)
+void MWState::StateManager::cleanup(bool force)
 {
-    if (mState!=State_NoGame || force)
+    if (mState != State_NoGame || force)
     {
         MWBase::Environment::get().getSoundManager()->clear();
         MWBase::Environment::get().getDialogueManager()->clear();
@@ -64,24 +64,22 @@ void MWState::StateManager::cleanup (bool force)
     MWBase::Environment::get().getLuaManager()->clear();
 }
 
-std::map<int, int> MWState::StateManager::buildContentFileIndexMap (const ESM::ESMReader& reader)
-    const
+std::map<int, int> MWState::StateManager::buildContentFileIndexMap(const ESM::ESMReader& reader) const
 {
-    const std::vector<std::string>& current =
-        MWBase::Environment::get().getWorld()->getContentFiles();
+    const std::vector<std::string>& current = MWBase::Environment::get().getWorld()->getContentFiles();
 
     const std::vector<ESM::Header::MasterData>& prev = reader.getGameFiles();
 
     std::map<int, int> map;
 
-    for (int iPrev = 0; iPrev<static_cast<int> (prev.size()); ++iPrev)
+    for (int iPrev = 0; iPrev < static_cast<int>(prev.size()); ++iPrev)
     {
-        std::string id = Misc::StringUtils::lowerCase (prev[iPrev].name);
+        std::string id = Misc::StringUtils::lowerCase(prev[iPrev].name);
 
-        for (int iCurrent = 0; iCurrent<static_cast<int> (current.size()); ++iCurrent)
-            if (id==Misc::StringUtils::lowerCase (current[iCurrent]))
+        for (int iCurrent = 0; iCurrent < static_cast<int>(current.size()); ++iCurrent)
+            if (id == Misc::StringUtils::lowerCase(current[iCurrent]))
             {
-                map.insert (std::make_pair (iPrev, iCurrent));
+                map.insert(std::make_pair(iPrev, iCurrent));
                 break;
             }
     }
@@ -89,10 +87,13 @@ std::map<int, int> MWState::StateManager::buildContentFileIndexMap (const ESM::E
     return map;
 }
 
-MWState::StateManager::StateManager (const std::filesystem::path& saves, const std::vector<std::string>& contentFiles)
-: mQuitRequest (false), mAskLoadRecent(false), mState (State_NoGame), mCharacterManager (saves, contentFiles), mTimePlayed (0)
+MWState::StateManager::StateManager(const std::filesystem::path& saves, const std::vector<std::string>& contentFiles)
+    : mQuitRequest(false)
+    , mAskLoadRecent(false)
+    , mState(State_NoGame)
+    , mCharacterManager(saves, contentFiles)
+    , mTimePlayed(0)
 {
-
 }
 
 void MWState::StateManager::requestQuit()
@@ -110,12 +111,12 @@ void MWState::StateManager::askLoadRecent()
     if (MWBase::Environment::get().getWindowManager()->getMode() == MWGui::GM_MainMenu)
         return;
 
-    if( !mAskLoadRecent )
+    if (!mAskLoadRecent)
     {
         const MWState::Character* character = getCurrentCharacter();
-        if(!character || character->begin() == character->end())//no saves
+        if (!character || character->begin() == character->end()) // no saves
         {
-            MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
+            MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_MainMenu);
         }
         else
         {
@@ -124,7 +125,8 @@ void MWState::StateManager::askLoadRecent()
             buttons.emplace_back("#{sYes}");
             buttons.emplace_back("#{sNo}");
             std::string_view tag = "%s";
-            std::string message{MWBase::Environment::get().getWindowManager()->getGameSettingString("sLoadLastSaveMsg", tag)};
+            std::string message{ MWBase::Environment::get().getWindowManager()->getGameSettingString(
+                "sLoadLastSaveMsg", tag) };
             size_t pos = message.find(tag);
             message.replace(pos, tag.length(), lastSave.mProfile.mDescription);
             MWBase::Environment::get().getWindowManager()->interactiveMessageBox(message, buttons);
@@ -138,19 +140,19 @@ MWState::StateManager::State MWState::StateManager::getState() const
     return mState;
 }
 
-void MWState::StateManager::newGame (bool bypass)
+void MWState::StateManager::newGame(bool bypass)
 {
     cleanup();
 
     if (!bypass)
-        MWBase::Environment::get().getWindowManager()->setNewGame (true);
+        MWBase::Environment::get().getWindowManager()->setNewGame(true);
 
     try
     {
         Log(Debug::Info) << "Starting a new game";
         MWBase::Environment::get().getScriptManager()->getGlobalScripts().addStartup();
         MWBase::Environment::get().getLuaManager()->newGameStarted();
-        MWBase::Environment::get().getWorld()->startNewGame (bypass);
+        MWBase::Environment::get().getWorld()->startNewGame(bypass);
 
         mState = State_Running;
 
@@ -163,9 +165,9 @@ void MWState::StateManager::newGame (bool bypass)
         error << "Failed to start new game: " << e.what();
 
         Log(Debug::Error) << error.str();
-        cleanup (true);
+        cleanup(true);
 
-        MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
+        MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_MainMenu);
 
         std::vector<std::string> buttons;
         buttons.emplace_back("#{sOk}");
@@ -183,7 +185,7 @@ void MWState::StateManager::resumeGame()
     mState = State_Running;
 }
 
-void MWState::StateManager::saveGame (const std::string& description, const Slot *slot)
+void MWState::StateManager::saveGame(const std::string& description, const Slot* slot)
 {
     MWState::Character* character = getCurrentCharacter();
 
@@ -211,7 +213,7 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
         profile.mContentFiles = world.getContentFiles();
 
         profile.mPlayerName = player.get<ESM::NPC>()->mBase->mName;
-        profile.mPlayerLevel = player.getClass().getNpcStats (player).getLevel();
+        profile.mPlayerLevel = player.getClass().getNpcStats(player).getLevel();
 
         const std::string& classId = player.get<ESM::NPC>()->mBase->mClass;
         if (world.getStore().get<ESM::Class>().isDynamic(classId))
@@ -228,9 +230,9 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
         writeScreenshot(profile.mScreenshot);
 
         if (!slot)
-            slot = character->createSlot (profile);
+            slot = character->createSlot(profile);
         else
-            slot = character->updateSlot (slot, profile);
+            slot = character->updateSlot(slot, profile);
 
         // Make sure the animation state held by references is up to date before saving the game.
         MWBase::Environment::get().getMechanicsManager()->persistAnimationStates();
@@ -246,7 +248,7 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
         for (const std::string& contentFile : MWBase::Environment::get().getWorld()->getContentFiles())
             writer.addMaster(contentFile, 0); // not using the size information anyway -> use value of 0
 
-        writer.setFormat (ESM::SavedGame::sCurrentFormat);
+        writer.setFormat(ESM::SavedGame::sCurrentFormat);
 
         // all unused
         writer.setVersion(0);
@@ -254,18 +256,18 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
         writer.setAuthor("");
         writer.setDescription("");
 
-        int recordCount =         1 // saved game header
-                +MWBase::Environment::get().getJournal()->countSavedGameRecords()
-                +MWBase::Environment::get().getLuaManager()->countSavedGameRecords()
-                +MWBase::Environment::get().getWorld()->countSavedGameRecords()
-                +MWBase::Environment::get().getScriptManager()->getGlobalScripts().countSavedGameRecords()
-                +MWBase::Environment::get().getDialogueManager()->countSavedGameRecords()
-                +MWBase::Environment::get().getMechanicsManager()->countSavedGameRecords()
-                +MWBase::Environment::get().getInputManager()->countSavedGameRecords()
-                +MWBase::Environment::get().getWindowManager()->countSavedGameRecords();
-        writer.setRecordCount (recordCount);
+        int recordCount = 1 // saved game header
+            + MWBase::Environment::get().getJournal()->countSavedGameRecords()
+            + MWBase::Environment::get().getLuaManager()->countSavedGameRecords()
+            + MWBase::Environment::get().getWorld()->countSavedGameRecords()
+            + MWBase::Environment::get().getScriptManager()->getGlobalScripts().countSavedGameRecords()
+            + MWBase::Environment::get().getDialogueManager()->countSavedGameRecords()
+            + MWBase::Environment::get().getMechanicsManager()->countSavedGameRecords()
+            + MWBase::Environment::get().getInputManager()->countSavedGameRecords()
+            + MWBase::Environment::get().getWindowManager()->countSavedGameRecords();
+        writer.setRecordCount(recordCount);
 
-        writer.save (stream);
+        writer.save(stream);
 
         Loading::Listener& listener = *MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         // Using only Cells for progress information, since they typically have the largest records by far
@@ -274,24 +276,25 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
 
         Loading::ScopedLoad load(&listener);
 
-        writer.startRecord (ESM::REC_SAVE);
-        slot->mProfile.save (writer);
-        writer.endRecord (ESM::REC_SAVE);
+        writer.startRecord(ESM::REC_SAVE);
+        slot->mProfile.save(writer);
+        writer.endRecord(ESM::REC_SAVE);
 
-        MWBase::Environment::get().getJournal()->write (writer, listener);
-        MWBase::Environment::get().getDialogueManager()->write (writer, listener);
+        MWBase::Environment::get().getJournal()->write(writer, listener);
+        MWBase::Environment::get().getDialogueManager()->write(writer, listener);
         // LuaManager::write should be called before World::write because world also saves
         // local scripts that depend on LuaManager.
         MWBase::Environment::get().getLuaManager()->write(writer, listener);
-        MWBase::Environment::get().getWorld()->write (writer, listener);
-        MWBase::Environment::get().getScriptManager()->getGlobalScripts().write (writer, listener);
+        MWBase::Environment::get().getWorld()->write(writer, listener);
+        MWBase::Environment::get().getScriptManager()->getGlobalScripts().write(writer, listener);
         MWBase::Environment::get().getMechanicsManager()->write(writer, listener);
         MWBase::Environment::get().getInputManager()->write(writer, listener);
         MWBase::Environment::get().getWindowManager()->write(writer, listener);
 
         // Ensure we have written the number of records that was estimated
-        if (writer.getRecordCount() != recordCount+1) // 1 extra for TES3 record
-            Log(Debug::Warning) << "Warning: number of written savegame records does not match. Estimated: " << recordCount+1 << ", written: " << writer.getRecordCount();
+        if (writer.getRecordCount() != recordCount + 1) // 1 extra for TES3 record
+            Log(Debug::Warning) << "Warning: number of written savegame records does not match. Estimated: "
+                                << recordCount + 1 << ", written: " << writer.getRecordCount();
 
         writer.close();
 
@@ -299,19 +302,20 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
             throw std::runtime_error("Write operation failed (memory stream)");
 
         // All good, write to file
-        std::ofstream filestream (slot->mPath, std::ios::binary);
+        std::ofstream filestream(slot->mPath, std::ios::binary);
         filestream << stream.rdbuf();
 
         if (filestream.fail())
             throw std::runtime_error("Write operation failed (file stream)");
 
-        Settings::Manager::setString ("character", "Saves",
-            Files::pathToUnicodeString(slot->mPath.parent_path().filename()));
+        Settings::Manager::setString(
+            "character", "Saves", Files::pathToUnicodeString(slot->mPath.parent_path().filename()));
 
         const auto finish = std::chrono::steady_clock::now();
 
         Log(Debug::Info) << '\'' << description << "' is saved in "
-            << std::chrono::duration_cast<std::chrono::duration<float, std::milli>>(finish - start).count() << "ms";
+                         << std::chrono::duration_cast<std::chrono::duration<float, std::milli>>(finish - start).count()
+                         << "ms";
     }
     catch (const std::exception& e)
     {
@@ -333,39 +337,39 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
     }
 }
 
-void MWState::StateManager::quickSave (std::string name)
+void MWState::StateManager::quickSave(std::string name)
 {
-    if (!(mState==State_Running &&
-        MWBase::Environment::get().getWorld()->getGlobalInt ("chargenstate")==-1 // char gen
+    if (!(mState == State_Running
+            && MWBase::Environment::get().getWorld()->getGlobalInt("chargenstate") == -1 // char gen
             && MWBase::Environment::get().getWindowManager()->isSavingAllowed()))
     {
-        //You can not save your game right now
+        // You can not save your game right now
         MWBase::Environment::get().getWindowManager()->messageBox("#{sSaveGameDenied}");
         return;
     }
 
     int maxSaves = Settings::Manager::getInt("max quicksaves", "Saves");
-    if(maxSaves < 1)
+    if (maxSaves < 1)
         maxSaves = 1;
 
-    Character* currentCharacter = getCurrentCharacter(); //Get current character
+    Character* currentCharacter = getCurrentCharacter(); // Get current character
     QuickSaveManager saveFinder = QuickSaveManager(name, maxSaves);
 
     if (currentCharacter)
     {
         for (auto& save : *currentCharacter)
         {
-            //Visiting slots allows the quicksave finder to find the oldest quicksave
+            // Visiting slots allows the quicksave finder to find the oldest quicksave
             saveFinder.visitSave(&save);
         }
     }
 
-    //Once all the saves have been visited, the save finder can tell us which
-    //one to replace (or create)
+    // Once all the saves have been visited, the save finder can tell us which
+    // one to replace (or create)
     saveGame(name, saveFinder.getNextQuickSaveSlot());
 }
 
-void MWState::StateManager::loadGame(const std::filesystem::path &filepath)
+void MWState::StateManager::loadGame(const std::filesystem::path& filepath)
 {
     for (const auto& character : mCharacterManager)
     {
@@ -383,7 +387,7 @@ void MWState::StateManager::loadGame(const std::filesystem::path &filepath)
     loadGame(character, filepath);
 }
 
-void MWState::StateManager::loadGame (const Character *character, const std::filesystem::path &filepath)
+void MWState::StateManager::loadGame(const Character* character, const std::filesystem::path& filepath)
 {
     try
     {
@@ -392,12 +396,14 @@ void MWState::StateManager::loadGame (const Character *character, const std::fil
         Log(Debug::Info) << "Reading save file " << filepath.filename();
 
         ESM::ESMReader reader;
-        reader.open (filepath);
+        reader.open(filepath);
 
         if (reader.getFormat() > ESM::SavedGame::sCurrentFormat)
-            throw std::runtime_error("This save file was created using a newer version of OpenMW and is thus not supported. Please upgrade to the newest OpenMW version to load this file.");
+            throw std::runtime_error(
+                "This save file was created using a newer version of OpenMW and is thus not supported. Please upgrade "
+                "to the newest OpenMW version to load this file.");
 
-        std::map<int, int> contentFileMap = buildContentFileIndexMap (reader);
+        std::map<int, int> contentFileMap = buildContentFileIndexMap(reader);
         MWBase::Environment::get().getLuaManager()->setContentFileMapping(contentFileMap);
 
         Loading::Listener& listener = *MWBase::Environment::get().getWindowManager()->getLoadingScreen();
@@ -419,30 +425,31 @@ void MWState::StateManager::loadGame (const Character *character, const std::fil
             switch (n.toInt())
             {
                 case ESM::REC_SAVE:
+                {
+                    ESM::SavedGame profile;
+                    profile.load(reader);
+                    if (!verifyProfile(profile))
                     {
-                        ESM::SavedGame profile;
-                        profile.load(reader);
-                        if (!verifyProfile(profile))
-                        {
-                            cleanup (true);
-                            MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
-                            return;
-                        }
-                        mTimePlayed = profile.mTimePlayed;
-                        Log(Debug::Info) << "Loading saved game '" << profile.mDescription << "' for character '" << profile.mPlayerName << "'";
+                        cleanup(true);
+                        MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_MainMenu);
+                        return;
                     }
-                    break;
+                    mTimePlayed = profile.mTimePlayed;
+                    Log(Debug::Info) << "Loading saved game '" << profile.mDescription << "' for character '"
+                                     << profile.mPlayerName << "'";
+                }
+                break;
 
                 case ESM::REC_JOUR:
                 case ESM::REC_JOUR_LEGACY:
                 case ESM::REC_QUES:
 
-                    MWBase::Environment::get().getJournal()->readRecord (reader, n.toInt());
+                    MWBase::Environment::get().getJournal()->readRecord(reader, n.toInt());
                     break;
 
                 case ESM::REC_DIAS:
 
-                    MWBase::Environment::get().getDialogueManager()->readRecord (reader, n.toInt());
+                    MWBase::Environment::get().getDialogueManager()->readRecord(reader, n.toInt());
                     break;
 
                 case ESM::REC_ALCH:
@@ -477,7 +484,8 @@ void MWState::StateManager::loadGame (const Character *character, const std::fil
 
                 case ESM::REC_GSCR:
 
-                    MWBase::Environment::get().getScriptManager()->getGlobalScripts().readRecord (reader, n.toInt(), contentFileMap);
+                    MWBase::Environment::get().getScriptManager()->getGlobalScripts().readRecord(
+                        reader, n.toInt(), contentFileMap);
                     break;
 
                 case ESM::REC_GMAP:
@@ -508,10 +516,10 @@ void MWState::StateManager::loadGame (const Character *character, const std::fil
                     Log(Debug::Warning) << "Warning: Ignoring unknown record: " << n.toStringView();
                     reader.skipRecord();
             }
-            int progressPercent = static_cast<int>(float(reader.getFileOffset())/total*100);
+            int progressPercent = static_cast<int>(float(reader.getFileOffset()) / total * 100);
             if (progressPercent > currentPercent)
             {
-                listener.increaseProgress(progressPercent-currentPercent);
+                listener.increaseProgress(progressPercent - currentPercent);
                 currentPercent = progressPercent;
             }
         }
@@ -521,8 +529,8 @@ void MWState::StateManager::loadGame (const Character *character, const std::fil
         mState = State_Running;
 
         if (character)
-            Settings::Manager::setString ("character", "Saves",
-                                      Files::pathToUnicodeString(character->getPath().filename()));
+            Settings::Manager::setString(
+                "character", "Saves", Files::pathToUnicodeString(character->getPath().filename()));
 
         MWBase::Environment::get().getWindowManager()->setNewGame(false);
         MWBase::Environment::get().getWorld()->saveLoaded();
@@ -541,15 +549,15 @@ void MWState::StateManager::loadGame (const Character *character, const std::fil
             const ESM::CellId& cellId = ptr.getCell()->getCell()->getCellId();
 
             // Use detectWorldSpaceChange=false, otherwise some of the data we just loaded would be cleared again
-            MWBase::Environment::get().getWorld()->changeToCell (cellId, ptr.getRefData().getPosition(), false, false);
+            MWBase::Environment::get().getWorld()->changeToCell(cellId, ptr.getRefData().getPosition(), false, false);
         }
         else
         {
             // Cell no longer exists (i.e. changed game files), choose a default cell
             Log(Debug::Warning) << "Warning: Player character's cell no longer exists, changing to the default cell";
-            MWWorld::CellStore* cell = MWBase::Environment::get().getWorld()->getExterior(0,0);
-            float x,y;
-            MWBase::Environment::get().getWorld()->indexToPosition(0,0,x,y,false);
+            MWWorld::CellStore* cell = MWBase::Environment::get().getWorld()->getExterior(0, 0);
+            float x, y;
+            MWBase::Environment::get().getWorld()->indexToPosition(0, 0, x, y, false);
             ESM::Position pos;
             pos.pos[0] = x;
             pos.pos[1] = y;
@@ -578,9 +586,9 @@ void MWState::StateManager::loadGame (const Character *character, const std::fil
         error << "Failed to load saved game: " << e.what();
 
         Log(Debug::Error) << error.str();
-        cleanup (true);
+        cleanup(true);
 
-        MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
+        MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_MainMenu);
 
         std::vector<std::string> buttons;
         buttons.emplace_back("#{sOk}");
@@ -590,20 +598,20 @@ void MWState::StateManager::loadGame (const Character *character, const std::fil
 
 void MWState::StateManager::quickLoad()
 {
-    if (Character* currentCharacter = getCurrentCharacter ())
+    if (Character* currentCharacter = getCurrentCharacter())
     {
         if (currentCharacter->begin() == currentCharacter->end())
             return;
-        loadGame (currentCharacter, currentCharacter->begin()->mPath); //Get newest save
+        loadGame(currentCharacter, currentCharacter->begin()->mPath); // Get newest save
     }
 }
 
-void MWState::StateManager::deleteGame(const MWState::Character *character, const MWState::Slot *slot)
+void MWState::StateManager::deleteGame(const MWState::Character* character, const MWState::Slot* slot)
 {
     mCharacterManager.deleteSlot(character, slot);
 }
 
-MWState::Character *MWState::StateManager::getCurrentCharacter ()
+MWState::Character* MWState::StateManager::getCurrentCharacter()
 {
     return mCharacterManager.getCurrentCharacter();
 }
@@ -618,7 +626,7 @@ MWState::StateManager::CharacterIterator MWState::StateManager::characterEnd()
     return mCharacterManager.end();
 }
 
-void MWState::StateManager::update (float duration)
+void MWState::StateManager::update(float duration)
 {
     mTimePlayed += duration;
 
@@ -626,19 +634,19 @@ void MWState::StateManager::update (float duration)
     if (mAskLoadRecent)
     {
         int iButton = MWBase::Environment::get().getWindowManager()->readPressedButton();
-        MWState::Character *curCharacter = getCurrentCharacter();
-        if(iButton==0 && curCharacter)
+        MWState::Character* curCharacter = getCurrentCharacter();
+        if (iButton == 0 && curCharacter)
         {
             mAskLoadRecent = false;
-            //Load last saved game for current character
+            // Load last saved game for current character
 
             MWState::Slot lastSave = *curCharacter->begin();
             loadGame(curCharacter, lastSave.mPath);
         }
-        else if(iButton==1)
+        else if (iButton == 1)
         {
             mAskLoadRecent = false;
-            MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
+            MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_MainMenu);
         }
     }
 }
@@ -650,7 +658,7 @@ bool MWState::StateManager::verifyProfile(const ESM::SavedGame& profile) const
     for (const std::string& contentFile : profile.mContentFiles)
     {
         if (std::find(selectedContentFiles.begin(), selectedContentFiles.end(), contentFile)
-                == selectedContentFiles.end())
+            == selectedContentFiles.end())
         {
             Log(Debug::Warning) << "Warning: Saved game dependency " << contentFile << " is missing.";
             notFound = true;
@@ -669,11 +677,11 @@ bool MWState::StateManager::verifyProfile(const ESM::SavedGame& profile) const
     return true;
 }
 
-void MWState::StateManager::writeScreenshot(std::vector<char> &imageData) const
+void MWState::StateManager::writeScreenshot(std::vector<char>& imageData) const
 {
-    int screenshotW = 259*2, screenshotH = 133*2; // *2 to get some nice antialiasing
+    int screenshotW = 259 * 2, screenshotH = 133 * 2; // *2 to get some nice antialiasing
 
-    osg::ref_ptr<osg::Image> screenshot (new osg::Image);
+    osg::ref_ptr<osg::Image> screenshot(new osg::Image);
 
     MWBase::Environment::get().getWorld()->screenshot(screenshot.get(), screenshotW, screenshotH);
 
@@ -694,5 +702,4 @@ void MWState::StateManager::writeScreenshot(std::vector<char> &imageData) const
 
     std::string data = ostream.str();
     imageData = std::vector<char>(data.begin(), data.end());
-
 }
diff --git a/apps/openmw/mwstate/statemanagerimp.hpp b/apps/openmw/mwstate/statemanagerimp.hpp
index 0097a9c490..f9ba51d456 100644
--- a/apps/openmw/mwstate/statemanagerimp.hpp
+++ b/apps/openmw/mwstate/statemanagerimp.hpp
@@ -1,8 +1,8 @@
 #ifndef GAME_STATE_STATEMANAGER_H
 #define GAME_STATE_STATEMANAGER_H
 
-#include <map>
 #include <filesystem>
+#include <map>
 
 #include "../mwbase/statemanager.hpp"
 
@@ -12,78 +12,77 @@ namespace MWState
 {
     class StateManager : public MWBase::StateManager
     {
-            bool mQuitRequest;
-            bool mAskLoadRecent;
-            State mState;
-            CharacterManager mCharacterManager;
-            double mTimePlayed;
-
-        private:
-
-            void cleanup (bool force = false);
+        bool mQuitRequest;
+        bool mAskLoadRecent;
+        State mState;
+        CharacterManager mCharacterManager;
+        double mTimePlayed;
 
-            bool verifyProfile (const ESM::SavedGame& profile) const;
+    private:
+        void cleanup(bool force = false);
 
-            void writeScreenshot (std::vector<char>& imageData) const;
+        bool verifyProfile(const ESM::SavedGame& profile) const;
 
-            std::map<int, int> buildContentFileIndexMap (const ESM::ESMReader& reader) const;
+        void writeScreenshot(std::vector<char>& imageData) const;
 
-        public:
+        std::map<int, int> buildContentFileIndexMap(const ESM::ESMReader& reader) const;
 
-            StateManager (const std::filesystem::path& saves, const std::vector<std::string>& contentFiles);
+    public:
+        StateManager(const std::filesystem::path& saves, const std::vector<std::string>& contentFiles);
 
-            void requestQuit() override;
+        void requestQuit() override;
 
-            bool hasQuitRequest() const override;
+        bool hasQuitRequest() const override;
 
-            void askLoadRecent() override;
+        void askLoadRecent() override;
 
-            State getState() const override;
+        State getState() const override;
 
-            void newGame (bool bypass = false) override;
-            ///< Start a new game.
-            ///
-            /// \param bypass Skip new game mechanics.
+        void newGame(bool bypass = false) override;
+        ///< Start a new game.
+        ///
+        /// \param bypass Skip new game mechanics.
 
-            void endGame();
+        void endGame();
 
-            void resumeGame() override;
+        void resumeGame() override;
 
-            void deleteGame (const MWState::Character *character, const MWState::Slot *slot) override;
-            ///< Delete a saved game slot from this character. If all save slots are deleted, the character will be deleted too.
+        void deleteGame(const MWState::Character* character, const MWState::Slot* slot) override;
+        ///< Delete a saved game slot from this character. If all save slots are deleted, the character will be deleted
+        ///< too.
 
-            void saveGame (const std::string& description, const Slot *slot = nullptr) override;
-            ///< Write a saved game to \a slot or create a new slot if \a slot == 0.
-            ///
-            /// \note Slot must belong to the current character.
+        void saveGame(const std::string& description, const Slot* slot = nullptr) override;
+        ///< Write a saved game to \a slot or create a new slot if \a slot == 0.
+        ///
+        /// \note Slot must belong to the current character.
 
-            ///Saves a file, using supplied filename, overwritting if needed
-            /** This is mostly used for quicksaving and autosaving, for they use the same name over and over again
-                \param name Name of save, defaults to "Quicksave"**/
-            void quickSave(std::string name = "Quicksave") override;
+        /// Saves a file, using supplied filename, overwritting if needed
+        /** This is mostly used for quicksaving and autosaving, for they use the same name over and over again
+            \param name Name of save, defaults to "Quicksave"**/
+        void quickSave(std::string name = "Quicksave") override;
 
-            ///Loads the last saved file
-            /** Used for quickload **/
-            void quickLoad() override;
+        /// Loads the last saved file
+        /** Used for quickload **/
+        void quickLoad() override;
 
-            void loadGame (const std::filesystem::path &filepath) override;
-            ///< Load a saved game directly from the given file path. This will search the CharacterManager
-            /// for a Character containing this save file, and set this Character current if one was found.
-            /// Otherwise, a new Character will be created.
+        void loadGame(const std::filesystem::path& filepath) override;
+        ///< Load a saved game directly from the given file path. This will search the CharacterManager
+        /// for a Character containing this save file, and set this Character current if one was found.
+        /// Otherwise, a new Character will be created.
 
-            void loadGame (const Character *character, const std::filesystem::path &filepath) override;
-            ///< Load a saved game file belonging to the given character.
+        void loadGame(const Character* character, const std::filesystem::path& filepath) override;
+        ///< Load a saved game file belonging to the given character.
 
-            Character *getCurrentCharacter () override;
-            ///< @note May return null.
+        Character* getCurrentCharacter() override;
+        ///< @note May return null.
 
-            CharacterIterator characterBegin() override;
-            ///< Any call to SaveGame and getCurrentCharacter can invalidate the returned
-            /// iterator.
+        CharacterIterator characterBegin() override;
+        ///< Any call to SaveGame and getCurrentCharacter can invalidate the returned
+        /// iterator.
 
-            CharacterIterator characterEnd() override;
+        CharacterIterator characterEnd() override;
 
-            void update(float duration);
+        void update(float duration);
     };
 }
 
diff --git a/apps/openmw/mwworld/action.cpp b/apps/openmw/mwworld/action.cpp
index 16edea93d6..ce73039ca5 100644
--- a/apps/openmw/mwworld/action.cpp
+++ b/apps/openmw/mwworld/action.cpp
@@ -17,14 +17,18 @@ void MWWorld::Action::setTarget(const MWWorld::Ptr& target)
     mTarget = target;
 }
 
-MWWorld::Action::Action (bool keepSound, const Ptr& target) : mKeepSound (keepSound), mSoundOffset(0), mTarget (target)
-{}
+MWWorld::Action::Action(bool keepSound, const Ptr& target)
+    : mKeepSound(keepSound)
+    , mSoundOffset(0)
+    , mTarget(target)
+{
+}
 
 MWWorld::Action::~Action() {}
 
-void MWWorld::Action::execute (const Ptr& actor, bool noSound)
+void MWWorld::Action::execute(const Ptr& actor, bool noSound)
 {
-    if(!mSoundId.empty() && !noSound)
+    if (!mSoundId.empty() && !noSound)
     {
         MWSound::PlayMode envType = MWSound::PlayMode::Normal;
 
@@ -35,26 +39,23 @@ void MWWorld::Action::execute (const Ptr& actor, bool noSound)
             envType = MWSound::PlayMode::NoEnv;
         }
 
-        if(mKeepSound && actor == MWMechanics::getPlayer())
-            MWBase::Environment::get().getSoundManager()->playSound(mSoundId, 1.0, 1.0,
-                MWSound::Type::Sfx, envType, mSoundOffset
-            );
+        if (mKeepSound && actor == MWMechanics::getPlayer())
+            MWBase::Environment::get().getSoundManager()->playSound(
+                mSoundId, 1.0, 1.0, MWSound::Type::Sfx, envType, mSoundOffset);
         else
         {
             bool local = mTarget.isEmpty() || !mTarget.isInCell(); // no usable target
-            if(mKeepSound)
+            if (mKeepSound)
                 MWBase::Environment::get().getSoundManager()->playSound3D(
-                    (local ? actor : mTarget).getRefData().getPosition().asVec3(),
-                    mSoundId, 1.0, 1.0, MWSound::Type::Sfx, envType, mSoundOffset
-                );
+                    (local ? actor : mTarget).getRefData().getPosition().asVec3(), mSoundId, 1.0, 1.0,
+                    MWSound::Type::Sfx, envType, mSoundOffset);
             else
-                MWBase::Environment::get().getSoundManager()->playSound3D(local ? actor : mTarget,
-                    mSoundId, 1.0, 1.0, MWSound::Type::Sfx, envType, mSoundOffset
-                );
+                MWBase::Environment::get().getSoundManager()->playSound3D(
+                    local ? actor : mTarget, mSoundId, 1.0, 1.0, MWSound::Type::Sfx, envType, mSoundOffset);
         }
     }
 
-    executeImp (actor);
+    executeImp(actor);
 }
 
 void MWWorld::Action::setSound(std::string_view id)
@@ -64,5 +65,5 @@ void MWWorld::Action::setSound(std::string_view id)
 
 void MWWorld::Action::setSoundOffset(float offset)
 {
-    mSoundOffset=offset;
+    mSoundOffset = offset;
 }
diff --git a/apps/openmw/mwworld/action.hpp b/apps/openmw/mwworld/action.hpp
index df1f848a47..01e036c0ba 100644
--- a/apps/openmw/mwworld/action.hpp
+++ b/apps/openmw/mwworld/action.hpp
@@ -11,37 +11,35 @@ namespace MWWorld
     /// \brief Abstract base for actions
     class Action
     {
-            std::string mSoundId;
-            bool mKeepSound;
-            float mSoundOffset;
-            Ptr mTarget;
+        std::string mSoundId;
+        bool mKeepSound;
+        float mSoundOffset;
+        Ptr mTarget;
 
-            // not implemented
-            Action (const Action& action);
-            Action& operator= (const Action& action);
+        // not implemented
+        Action(const Action& action);
+        Action& operator=(const Action& action);
 
-            virtual void executeImp (const Ptr& actor) = 0;
+        virtual void executeImp(const Ptr& actor) = 0;
 
-        protected:
+    protected:
+        void setTarget(const Ptr&);
 
-            void setTarget(const Ptr&);
+    public:
+        const Ptr& getTarget() const;
 
-        public:
+        Action(bool keepSound = false, const Ptr& target = Ptr());
+        ///< \param keepSound Keep playing the sound even if the object the sound is played on is removed.
 
-            const Ptr& getTarget() const;
+        virtual ~Action();
 
-            Action (bool keepSound = false, const Ptr& target = Ptr());
-            ///< \param keepSound Keep playing the sound even if the object the sound is played on is removed.
+        virtual bool isNullAction() { return false; }
+        ///< Is running this action a no-op? (default false)
 
-            virtual ~Action();
+        void execute(const Ptr& actor, bool noSound = false);
 
-            virtual bool isNullAction() { return false; }
-            ///< Is running this action a no-op? (default false)
-
-            void execute (const Ptr& actor, bool noSound = false);
-
-            void setSound(std::string_view id);
-            void setSoundOffset(float offset);
+        void setSound(std::string_view id);
+        void setSoundOffset(float offset);
     };
 }
 
diff --git a/apps/openmw/mwworld/actionalchemy.cpp b/apps/openmw/mwworld/actionalchemy.cpp
index 62b673dd23..3348dbbfb3 100644
--- a/apps/openmw/mwworld/actionalchemy.cpp
+++ b/apps/openmw/mwworld/actionalchemy.cpp
@@ -8,18 +8,18 @@
 namespace MWWorld
 {
     ActionAlchemy::ActionAlchemy(bool force)
-    : Action (false)
-    , mForce(force)
+        : Action(false)
+        , mForce(force)
     {
     }
 
-    void ActionAlchemy::executeImp (const Ptr& actor)
+    void ActionAlchemy::executeImp(const Ptr& actor)
     {
         if (actor != MWMechanics::getPlayer())
             return;
 
-        if(!mForce && MWMechanics::isPlayerInCombat())
-        { //Ensure we're not in combat
+        if (!mForce && MWMechanics::isPlayerInCombat())
+        { // Ensure we're not in combat
             MWBase::Environment::get().getWindowManager()->messageBox("#{sInventoryMessage3}");
             return;
         }
diff --git a/apps/openmw/mwworld/actionalchemy.hpp b/apps/openmw/mwworld/actionalchemy.hpp
index 194ef308b9..d37850e6ae 100644
--- a/apps/openmw/mwworld/actionalchemy.hpp
+++ b/apps/openmw/mwworld/actionalchemy.hpp
@@ -8,10 +8,10 @@ namespace MWWorld
     class ActionAlchemy : public Action
     {
         bool mForce;
-        void executeImp (const Ptr& actor) override;
+        void executeImp(const Ptr& actor) override;
 
     public:
-        ActionAlchemy(bool force=false);
+        ActionAlchemy(bool force = false);
     };
 }
 
diff --git a/apps/openmw/mwworld/actionapply.cpp b/apps/openmw/mwworld/actionapply.cpp
index 1699a6aa53..a05d29bc59 100644
--- a/apps/openmw/mwworld/actionapply.cpp
+++ b/apps/openmw/mwworld/actionapply.cpp
@@ -11,25 +11,29 @@
 
 namespace MWWorld
 {
-    ActionApply::ActionApply (const Ptr& object, const std::string& id)
-    : Action (false, object), mId (id)
-    {}
+    ActionApply::ActionApply(const Ptr& object, const std::string& id)
+        : Action(false, object)
+        , mId(id)
+    {
+    }
 
-    void ActionApply::executeImp (const Ptr& actor)
+    void ActionApply::executeImp(const Ptr& actor)
     {
         actor.getClass().consume(getTarget(), actor);
     }
 
+    ActionApplyWithSkill::ActionApplyWithSkill(const Ptr& object, const std::string& id, int skillIndex, int usageType)
+        : Action(false, object)
+        , mId(id)
+        , mSkillIndex(skillIndex)
+        , mUsageType(usageType)
+    {
+    }
 
-    ActionApplyWithSkill::ActionApplyWithSkill (const Ptr& object, const std::string& id,
-        int skillIndex, int usageType)
-    : Action (false, object), mId (id), mSkillIndex (skillIndex), mUsageType (usageType)
-    {}
-
-    void ActionApplyWithSkill::executeImp (const Ptr& actor)
+    void ActionApplyWithSkill::executeImp(const Ptr& actor)
     {
         bool consumed = actor.getClass().consume(getTarget(), actor);
         if (consumed && mUsageType != -1 && actor == MWMechanics::getPlayer())
-            actor.getClass().skillUsageSucceeded (actor, mSkillIndex, mUsageType);
+            actor.getClass().skillUsageSucceeded(actor, mSkillIndex, mUsageType);
     }
 }
diff --git a/apps/openmw/mwworld/actionapply.hpp b/apps/openmw/mwworld/actionapply.hpp
index 4350b7af4f..02862bd3f3 100644
--- a/apps/openmw/mwworld/actionapply.hpp
+++ b/apps/openmw/mwworld/actionapply.hpp
@@ -9,27 +9,24 @@ namespace MWWorld
 {
     class ActionApply : public Action
     {
-            std::string mId;
+        std::string mId;
 
-            void executeImp (const Ptr& actor) override;
+        void executeImp(const Ptr& actor) override;
 
-        public:
-
-            ActionApply (const Ptr& object, const std::string& id);
+    public:
+        ActionApply(const Ptr& object, const std::string& id);
     };
 
     class ActionApplyWithSkill : public Action
     {
-            std::string mId;
-            int mSkillIndex;
-            int mUsageType;
-
-            void executeImp (const Ptr& actor) override;
+        std::string mId;
+        int mSkillIndex;
+        int mUsageType;
 
-        public:
+        void executeImp(const Ptr& actor) override;
 
-            ActionApplyWithSkill (const Ptr& object, const std::string& id,
-                int skillIndex, int usageType);
+    public:
+        ActionApplyWithSkill(const Ptr& object, const std::string& id, int skillIndex, int usageType);
     };
 }
 
diff --git a/apps/openmw/mwworld/actiondoor.cpp b/apps/openmw/mwworld/actiondoor.cpp
index 6e3441e220..be0d5f3298 100644
--- a/apps/openmw/mwworld/actiondoor.cpp
+++ b/apps/openmw/mwworld/actiondoor.cpp
@@ -5,11 +5,12 @@
 
 namespace MWWorld
 {
-    ActionDoor::ActionDoor (const MWWorld::Ptr& object) : Action (false, object)
+    ActionDoor::ActionDoor(const MWWorld::Ptr& object)
+        : Action(false, object)
     {
     }
 
-    void ActionDoor::executeImp (const MWWorld::Ptr& actor)
+    void ActionDoor::executeImp(const MWWorld::Ptr& actor)
     {
         MWBase::Environment::get().getWorld()->activateDoor(getTarget());
     }
diff --git a/apps/openmw/mwworld/actiondoor.hpp b/apps/openmw/mwworld/actiondoor.hpp
index 4be61f5760..16b85b90ae 100644
--- a/apps/openmw/mwworld/actiondoor.hpp
+++ b/apps/openmw/mwworld/actiondoor.hpp
@@ -8,10 +8,10 @@ namespace MWWorld
 {
     class ActionDoor : public Action
     {
-            void executeImp (const MWWorld::Ptr& actor) override;
+        void executeImp(const MWWorld::Ptr& actor) override;
 
-        public:
-            ActionDoor (const Ptr& object);
+    public:
+        ActionDoor(const Ptr& object);
     };
 }
 
diff --git a/apps/openmw/mwworld/actioneat.cpp b/apps/openmw/mwworld/actioneat.cpp
index c97c83c0c2..e7921bf4e6 100644
--- a/apps/openmw/mwworld/actioneat.cpp
+++ b/apps/openmw/mwworld/actioneat.cpp
@@ -10,11 +10,14 @@
 
 namespace MWWorld
 {
-    void ActionEat::executeImp (const Ptr& actor)
+    void ActionEat::executeImp(const Ptr& actor)
     {
         if (actor.getClass().consume(getTarget(), actor) && actor == MWMechanics::getPlayer())
-            actor.getClass().skillUsageSucceeded (actor, ESM::Skill::Alchemy, 1);
+            actor.getClass().skillUsageSucceeded(actor, ESM::Skill::Alchemy, 1);
     }
 
-    ActionEat::ActionEat (const MWWorld::Ptr& object) : Action (false, object) {}
+    ActionEat::ActionEat(const MWWorld::Ptr& object)
+        : Action(false, object)
+    {
+    }
 }
diff --git a/apps/openmw/mwworld/actioneat.hpp b/apps/openmw/mwworld/actioneat.hpp
index ddc231d99a..428635e4d6 100644
--- a/apps/openmw/mwworld/actioneat.hpp
+++ b/apps/openmw/mwworld/actioneat.hpp
@@ -7,11 +7,10 @@ namespace MWWorld
 {
     class ActionEat : public Action
     {
-            void executeImp (const Ptr& actor) override;
+        void executeImp(const Ptr& actor) override;
 
-        public:
-
-            ActionEat (const MWWorld::Ptr& object);
+    public:
+        ActionEat(const MWWorld::Ptr& object);
     };
 }
 
diff --git a/apps/openmw/mwworld/actionequip.cpp b/apps/openmw/mwworld/actionequip.cpp
index 426f4dd7b8..352a8fa2b5 100644
--- a/apps/openmw/mwworld/actionequip.cpp
+++ b/apps/openmw/mwworld/actionequip.cpp
@@ -7,19 +7,19 @@
 
 #include <components/compiler/locals.hpp>
 
+#include "class.hpp"
 #include "inventorystore.hpp"
 #include "player.hpp"
-#include "class.hpp"
 
 namespace MWWorld
 {
-    ActionEquip::ActionEquip (const MWWorld::Ptr& object, bool force)
-    : Action (false, object)
-    , mForce(force)
+    ActionEquip::ActionEquip(const MWWorld::Ptr& object, bool force)
+        : Action(false, object)
+        , mForce(force)
     {
     }
 
-    void ActionEquip::executeImp (const Ptr& actor)
+    void ActionEquip::executeImp(const Ptr& actor)
     {
         MWWorld::Ptr object = getTarget();
         MWWorld::InventoryStore& invStore = actor.getClass().getInventoryStore(actor);
@@ -34,13 +34,13 @@ namespace MWWorld
 
         if (!mForce)
         {
-            auto result = object.getClass().canBeEquipped (object, actor);
+            auto result = object.getClass().canBeEquipped(object, actor);
 
             // display error message if the player tried to equip something
             if (!result.second.empty() && actor == MWMechanics::getPlayer())
                 MWBase::Environment::get().getWindowManager()->messageBox(result.second);
 
-            switch(result.first)
+            switch (result.first)
             {
                 case 0:
                     return;
@@ -68,8 +68,8 @@ namespace MWWorld
             throw std::runtime_error("ActionEquip can't find item " + object.getCellRef().getRefId());
 
         // equip the item in the first free slot
-        std::vector<int>::const_iterator slot=slots_.first.begin();
-        for (;slot!=slots_.first.end(); ++slot)
+        std::vector<int>::const_iterator slot = slots_.first.begin();
+        for (; slot != slots_.first.end(); ++slot)
         {
             // if the item is equipped already, nothing to do
             if (invStore.getSlot(*slot) == it)
@@ -101,7 +101,7 @@ namespace MWWorld
                     invStore.equip(*slot, it, actor);
                 }
 
-                //Fix for issue of selected enchated item getting remmoved on cycle
+                // Fix for issue of selected enchated item getting remmoved on cycle
                 if (invStore.getSlot(*slot) == enchItem)
                 {
                     reEquip = true;
diff --git a/apps/openmw/mwworld/actionequip.hpp b/apps/openmw/mwworld/actionequip.hpp
index 1ac3cb2360..863d281644 100644
--- a/apps/openmw/mwworld/actionequip.hpp
+++ b/apps/openmw/mwworld/actionequip.hpp
@@ -9,11 +9,11 @@ namespace MWWorld
     {
         bool mForce;
 
-        void executeImp (const Ptr& actor) override;
+        void executeImp(const Ptr& actor) override;
 
     public:
         /// @param item to equip
-        ActionEquip (const Ptr& object, bool force=false);
+        ActionEquip(const Ptr& object, bool force = false);
     };
 }
 
diff --git a/apps/openmw/mwworld/actionharvest.cpp b/apps/openmw/mwworld/actionharvest.cpp
index aecb62a3ff..e14bd43aac 100644
--- a/apps/openmw/mwworld/actionharvest.cpp
+++ b/apps/openmw/mwworld/actionharvest.cpp
@@ -16,19 +16,19 @@
 
 namespace MWWorld
 {
-    ActionHarvest::ActionHarvest (const MWWorld::Ptr& container)
-        : Action (true, container)
+    ActionHarvest::ActionHarvest(const MWWorld::Ptr& container)
+        : Action(true, container)
     {
         setSound("Item Ingredient Up");
     }
 
-    void ActionHarvest::executeImp (const MWWorld::Ptr& actor)
+    void ActionHarvest::executeImp(const MWWorld::Ptr& actor)
     {
         if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
             return;
 
         MWWorld::Ptr target = getTarget();
-        MWWorld::ContainerStore& store = target.getClass().getContainerStore (target);
+        MWWorld::ContainerStore& store = target.getClass().getContainerStore(target);
         store.resolve();
         MWWorld::ContainerStore& actorStore = actor.getClass().getContainerStore(actor);
         std::map<std::string, int> takenMap;
@@ -38,13 +38,14 @@ namespace MWWorld
                 continue;
 
             int itemCount = it->getRefData().getCount();
-            // Note: it is important to check for crime before move an item from container. Otherwise owner check will not work
-            // for a last item in the container - empty harvested containers are considered as "allowed to use".
+            // Note: it is important to check for crime before move an item from container. Otherwise owner check will
+            // not work for a last item in the container - empty harvested containers are considered as "allowed to
+            // use".
             MWBase::Environment::get().getMechanicsManager()->itemTaken(actor, *it, target, itemCount);
             actorStore.add(*it, itemCount, actor);
             store.remove(*it, itemCount, getTarget());
-            std::string name{it->getClass().getName(*it)};
-            takenMap[name]+=itemCount;
+            std::string name{ it->getClass().getName(*it) };
+            takenMap[name] += itemCount;
         }
 
         // Spawn a messagebox (only for items added to player's inventory)
@@ -63,7 +64,8 @@ namespace MWWorld
                 else if (lineCount > maxLines)
                     break;
 
-                // The two GMST entries below expand to strings informing the player of what, and how many of it has been added to their inventory
+                // The two GMST entries below expand to strings informing the player of what, and how many of it has
+                // been added to their inventory
                 std::string msgBox;
                 if (itemCount == 1)
                 {
diff --git a/apps/openmw/mwworld/actionharvest.hpp b/apps/openmw/mwworld/actionharvest.hpp
index 2edc2f34e5..0c0596a691 100644
--- a/apps/openmw/mwworld/actionharvest.hpp
+++ b/apps/openmw/mwworld/actionharvest.hpp
@@ -8,11 +8,11 @@ namespace MWWorld
 {
     class ActionHarvest : public Action
     {
-            void executeImp (const MWWorld::Ptr& actor) override;
+        void executeImp(const MWWorld::Ptr& actor) override;
 
-        public:
-            ActionHarvest (const Ptr& container);
-            ///< \param container The Container the Player has activated.
+    public:
+        ActionHarvest(const Ptr& container);
+        ///< \param container The Container the Player has activated.
     };
 }
 
diff --git a/apps/openmw/mwworld/actionopen.cpp b/apps/openmw/mwworld/actionopen.cpp
index 61f2f3e30c..f0d101be99 100644
--- a/apps/openmw/mwworld/actionopen.cpp
+++ b/apps/openmw/mwworld/actionopen.cpp
@@ -4,17 +4,17 @@
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwmechanics/disease.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/disease.hpp"
 
 namespace MWWorld
 {
-    ActionOpen::ActionOpen (const MWWorld::Ptr& container)
-        : Action (false, container)
+    ActionOpen::ActionOpen(const MWWorld::Ptr& container)
+        : Action(false, container)
     {
     }
 
-    void ActionOpen::executeImp (const MWWorld::Ptr& actor)
+    void ActionOpen::executeImp(const MWWorld::Ptr& actor)
     {
         if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
             return;
diff --git a/apps/openmw/mwworld/actionopen.hpp b/apps/openmw/mwworld/actionopen.hpp
index e9f76c4d71..b6d41f9a3d 100644
--- a/apps/openmw/mwworld/actionopen.hpp
+++ b/apps/openmw/mwworld/actionopen.hpp
@@ -7,12 +7,11 @@ namespace MWWorld
 {
     class ActionOpen : public Action
     {
-            void executeImp (const MWWorld::Ptr& actor) override;
-
-        public:
-            ActionOpen (const Ptr& container);
-            ///< \param container The Container the Player has activated.
+        void executeImp(const MWWorld::Ptr& actor) override;
 
+    public:
+        ActionOpen(const Ptr& container);
+        ///< \param container The Container the Player has activated.
     };
 }
 
diff --git a/apps/openmw/mwworld/actionread.cpp b/apps/openmw/mwworld/actionread.cpp
index 442078b18c..52ca77c528 100644
--- a/apps/openmw/mwworld/actionread.cpp
+++ b/apps/openmw/mwworld/actionread.cpp
@@ -7,58 +7,57 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
-#include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/npcstats.hpp"
 
-#include "player.hpp"
 #include "class.hpp"
 #include "esmstore.hpp"
+#include "player.hpp"
 
 namespace MWWorld
 {
-    ActionRead::ActionRead (const MWWorld::Ptr& object) : Action (false, object)
+    ActionRead::ActionRead(const MWWorld::Ptr& object)
+        : Action(false, object)
     {
     }
 
-    void ActionRead::executeImp (const MWWorld::Ptr& actor) {
+    void ActionRead::executeImp(const MWWorld::Ptr& actor)
+    {
 
         if (actor != MWMechanics::getPlayer())
             return;
 
-        //Ensure we're not in combat
-        if(MWMechanics::isPlayerInCombat()
-                // Reading in combat is still allowed if the scroll/book is not in the player inventory yet
-                // (since otherwise, there would be no way to pick it up)
-                && getTarget().getContainerStore() == &actor.getClass().getContainerStore(actor)
-                ) {
+        // Ensure we're not in combat
+        if (MWMechanics::isPlayerInCombat()
+            // Reading in combat is still allowed if the scroll/book is not in the player inventory yet
+            // (since otherwise, there would be no way to pick it up)
+            && getTarget().getContainerStore() == &actor.getClass().getContainerStore(actor))
+        {
             MWBase::Environment::get().getWindowManager()->messageBox("#{sInventoryMessage4}");
             return;
         }
 
-        LiveCellRef<ESM::Book> *ref = getTarget().get<ESM::Book>();
+        LiveCellRef<ESM::Book>* ref = getTarget().get<ESM::Book>();
 
         if (ref->mBase->mData.mIsScroll)
             MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Scroll, getTarget());
         else
             MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Book, getTarget());
 
-        MWMechanics::NpcStats& npcStats = actor.getClass().getNpcStats (actor);
+        MWMechanics::NpcStats& npcStats = actor.getClass().getNpcStats(actor);
 
         // Skill gain from books
         if (ref->mBase->mData.mSkillId >= 0 && ref->mBase->mData.mSkillId < ESM::Skill::Length
-                && !npcStats.hasBeenUsed (ref->mBase->mId))
+            && !npcStats.hasBeenUsed(ref->mBase->mId))
         {
-            MWWorld::LiveCellRef<ESM::NPC> *playerRef = actor.get<ESM::NPC>();
+            MWWorld::LiveCellRef<ESM::NPC>* playerRef = actor.get<ESM::NPC>();
 
-            const ESM::Class *class_ =
-                MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find (
-                    playerRef->mBase->mClass
-                );
+            const ESM::Class* class_
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find(playerRef->mBase->mClass);
 
-            npcStats.increaseSkill (ref->mBase->mData.mSkillId, *class_, true, true);
+            npcStats.increaseSkill(ref->mBase->mData.mSkillId, *class_, true, true);
 
-            npcStats.flagAsUsed (ref->mBase->mId);
+            npcStats.flagAsUsed(ref->mBase->mId);
         }
-
     }
 }
diff --git a/apps/openmw/mwworld/actionread.hpp b/apps/openmw/mwworld/actionread.hpp
index 6387933eba..194aca9f59 100644
--- a/apps/openmw/mwworld/actionread.hpp
+++ b/apps/openmw/mwworld/actionread.hpp
@@ -7,11 +7,11 @@ namespace MWWorld
 {
     class ActionRead : public Action
     {
-            void executeImp (const MWWorld::Ptr& actor) override;
+        void executeImp(const MWWorld::Ptr& actor) override;
 
-        public:
-            /// @param book or scroll to read
-            ActionRead (const Ptr& object);
+    public:
+        /// @param book or scroll to read
+        ActionRead(const Ptr& object);
     };
 }
 
diff --git a/apps/openmw/mwworld/actionrepair.cpp b/apps/openmw/mwworld/actionrepair.cpp
index 4fe48b4b4c..132587cc3e 100644
--- a/apps/openmw/mwworld/actionrepair.cpp
+++ b/apps/openmw/mwworld/actionrepair.cpp
@@ -8,17 +8,17 @@
 namespace MWWorld
 {
     ActionRepair::ActionRepair(const Ptr& item, bool force)
-        : Action (false, item)
+        : Action(false, item)
         , mForce(force)
     {
     }
 
-    void ActionRepair::executeImp (const Ptr& actor)
+    void ActionRepair::executeImp(const Ptr& actor)
     {
         if (actor != MWMechanics::getPlayer())
             return;
 
-        if(!mForce && MWMechanics::isPlayerInCombat())
+        if (!mForce && MWMechanics::isPlayerInCombat())
         {
             MWBase::Environment::get().getWindowManager()->messageBox("#{sInventoryMessage2}");
             return;
diff --git a/apps/openmw/mwworld/actionrepair.hpp b/apps/openmw/mwworld/actionrepair.hpp
index 218077f5de..54611ff320 100644
--- a/apps/openmw/mwworld/actionrepair.hpp
+++ b/apps/openmw/mwworld/actionrepair.hpp
@@ -9,11 +9,11 @@ namespace MWWorld
     {
         bool mForce;
 
-        void executeImp (const Ptr& actor) override;
+        void executeImp(const Ptr& actor) override;
 
     public:
         /// @param item repair hammer
-        ActionRepair(const Ptr& item, bool force=false);
+        ActionRepair(const Ptr& item, bool force = false);
     };
 }
 
diff --git a/apps/openmw/mwworld/actionsoulgem.cpp b/apps/openmw/mwworld/actionsoulgem.cpp
index 161d923358..187f399e09 100644
--- a/apps/openmw/mwworld/actionsoulgem.cpp
+++ b/apps/openmw/mwworld/actionsoulgem.cpp
@@ -3,8 +3,8 @@
 #include <components/debug/debuglog.hpp>
 #include <components/esm3/loadcrea.hpp>
 
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
@@ -14,18 +14,18 @@
 namespace MWWorld
 {
 
-    ActionSoulgem::ActionSoulgem(const Ptr &object)
+    ActionSoulgem::ActionSoulgem(const Ptr& object)
         : Action(false, object)
     {
-
     }
 
-    void ActionSoulgem::executeImp(const Ptr &actor)
+    void ActionSoulgem::executeImp(const Ptr& actor)
     {
         if (actor != MWMechanics::getPlayer())
             return;
 
-        if(MWMechanics::isPlayerInCombat()) { //Ensure we're not in combat
+        if (MWMechanics::isPlayerInCombat())
+        { // Ensure we're not in combat
             MWBase::Environment::get().getWindowManager()->messageBox("#{sInventoryMessage5}");
             return;
         }
@@ -41,12 +41,12 @@ namespace MWWorld
 
         if (!MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>().search(targetSoul))
         {
-            Log(Debug::Warning) << "Soul '" << targetSoul << "' not found (item: '" << target.getCellRef().getRefId() << "')";
+            Log(Debug::Warning) << "Soul '" << targetSoul << "' not found (item: '" << target.getCellRef().getRefId()
+                                << "')";
             return;
         }
 
         MWBase::Environment::get().getWindowManager()->showSoulgemDialog(target);
     }
 
-
 }
diff --git a/apps/openmw/mwworld/actionsoulgem.hpp b/apps/openmw/mwworld/actionsoulgem.hpp
index d2b14c9122..f17ddb7bdc 100644
--- a/apps/openmw/mwworld/actionsoulgem.hpp
+++ b/apps/openmw/mwworld/actionsoulgem.hpp
@@ -7,11 +7,11 @@ namespace MWWorld
 {
     class ActionSoulgem : public Action
     {
-            void executeImp (const MWWorld::Ptr& actor) override;
+        void executeImp(const MWWorld::Ptr& actor) override;
 
-        public:
-            /// @param soulgem to use
-            ActionSoulgem (const Ptr& object);
+    public:
+        /// @param soulgem to use
+        ActionSoulgem(const Ptr& object);
     };
 }
 
diff --git a/apps/openmw/mwworld/actiontake.cpp b/apps/openmw/mwworld/actiontake.cpp
index a173e87fbc..c8db98e1fe 100644
--- a/apps/openmw/mwworld/actiontake.cpp
+++ b/apps/openmw/mwworld/actiontake.cpp
@@ -1,9 +1,9 @@
 #include "actiontake.hpp"
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwgui/inventorywindow.hpp"
 
@@ -12,9 +12,12 @@
 
 namespace MWWorld
 {
-    ActionTake::ActionTake (const MWWorld::Ptr& object) : Action (true, object) {}
+    ActionTake::ActionTake(const MWWorld::Ptr& object)
+        : Action(true, object)
+    {
+    }
 
-    void ActionTake::executeImp (const Ptr& actor)
+    void ActionTake::executeImp(const Ptr& actor)
     {
         // When in GUI mode, we should use drag and drop
         if (actor == MWBase::Environment::get().getWorld()->getPlayerPtr())
@@ -28,9 +31,10 @@ namespace MWWorld
         }
 
         MWBase::Environment::get().getMechanicsManager()->itemTaken(
-                    actor, getTarget(), MWWorld::Ptr(), getTarget().getRefData().getCount());
-        MWWorld::Ptr newitem = *actor.getClass().getContainerStore (actor).add (getTarget(), getTarget().getRefData().getCount(), actor);
-        MWBase::Environment::get().getWorld()->deleteObject (getTarget());
+            actor, getTarget(), MWWorld::Ptr(), getTarget().getRefData().getCount());
+        MWWorld::Ptr newitem
+            = *actor.getClass().getContainerStore(actor).add(getTarget(), getTarget().getRefData().getCount(), actor);
+        MWBase::Environment::get().getWorld()->deleteObject(getTarget());
         setTarget(newitem);
     }
 }
diff --git a/apps/openmw/mwworld/actiontake.hpp b/apps/openmw/mwworld/actiontake.hpp
index bb9c0d3800..7cb0e03dd2 100644
--- a/apps/openmw/mwworld/actiontake.hpp
+++ b/apps/openmw/mwworld/actiontake.hpp
@@ -7,11 +7,10 @@ namespace MWWorld
 {
     class ActionTake : public Action
     {
-            void executeImp (const Ptr& actor) override;
+        void executeImp(const Ptr& actor) override;
 
-        public:
-
-            ActionTake (const MWWorld::Ptr& object);
+    public:
+        ActionTake(const MWWorld::Ptr& object);
     };
 }
 
diff --git a/apps/openmw/mwworld/actiontalk.cpp b/apps/openmw/mwworld/actiontalk.cpp
index 7fe623b8e4..e17c0830a8 100644
--- a/apps/openmw/mwworld/actiontalk.cpp
+++ b/apps/openmw/mwworld/actiontalk.cpp
@@ -7,9 +7,12 @@
 
 namespace MWWorld
 {
-    ActionTalk::ActionTalk (const Ptr& actor) : Action (false, actor) {}
+    ActionTalk::ActionTalk(const Ptr& actor)
+        : Action(false, actor)
+    {
+    }
 
-    void ActionTalk::executeImp (const Ptr& actor)
+    void ActionTalk::executeImp(const Ptr& actor)
     {
         if (actor == MWMechanics::getPlayer())
             MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Dialogue, getTarget());
diff --git a/apps/openmw/mwworld/actiontalk.hpp b/apps/openmw/mwworld/actiontalk.hpp
index 6dd70380ff..f2d2843a64 100644
--- a/apps/openmw/mwworld/actiontalk.hpp
+++ b/apps/openmw/mwworld/actiontalk.hpp
@@ -7,12 +7,11 @@ namespace MWWorld
 {
     class ActionTalk : public Action
     {
-            void executeImp (const Ptr& actor) override;
+        void executeImp(const Ptr& actor) override;
 
-        public:
-
-            ActionTalk (const Ptr& actor);
-            ///< \param actor The actor the player is talking to
+    public:
+        ActionTalk(const Ptr& actor);
+        ///< \param actor The actor the player is talking to
     };
 }
 
diff --git a/apps/openmw/mwworld/actionteleport.cpp b/apps/openmw/mwworld/actionteleport.cpp
index 17370671a1..8754e2ba0e 100644
--- a/apps/openmw/mwworld/actionteleport.cpp
+++ b/apps/openmw/mwworld/actionteleport.cpp
@@ -3,26 +3,28 @@
 #include <components/esm3/loadcell.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
 
 #include "../mwworld/cellstore.hpp"
-#include "../mwworld/class.hpp"
 #include "../mwworld/cellutils.hpp"
+#include "../mwworld/class.hpp"
 
 #include "player.hpp"
 
 namespace MWWorld
 {
-    ActionTeleport::ActionTeleport(std::string_view cellName,
-        const ESM::Position& position, bool teleportFollowers)
-    : Action (true), mCellName (cellName), mPosition (position), mTeleportFollowers(teleportFollowers)
+    ActionTeleport::ActionTeleport(std::string_view cellName, const ESM::Position& position, bool teleportFollowers)
+        : Action(true)
+        , mCellName(cellName)
+        , mPosition(position)
+        , mTeleportFollowers(teleportFollowers)
     {
     }
 
-    void ActionTeleport::executeImp (const Ptr& actor)
+    void ActionTeleport::executeImp(const Ptr& actor)
     {
         if (mTeleportFollowers)
         {
@@ -37,17 +39,17 @@ namespace MWWorld
         teleport(actor);
     }
 
-    void ActionTeleport::teleport(const Ptr &actor)
+    void ActionTeleport::teleport(const Ptr& actor)
     {
         MWBase::World* world = MWBase::Environment::get().getWorld();
         actor.getClass().getCreatureStats(actor).land(actor == world->getPlayerPtr());
-        if(actor == world->getPlayerPtr())
+        if (actor == world->getPlayerPtr())
         {
             world->getPlayer().setTeleported(true);
             if (mCellName.empty())
-                world->changeToExteriorCell (mPosition, true);
+                world->changeToExteriorCell(mPosition, true);
             else
-                world->changeToInteriorCell (mCellName, mPosition, true);
+                world->changeToInteriorCell(mCellName, mPosition, true);
         }
         else
         {
@@ -59,15 +61,17 @@ namespace MWWorld
                 world->moveObject(actor, world->getExterior(index.x(), index.y()), mPosition.asVec3(), true, true);
             }
             else
-                world->moveObject(actor,world->getInterior(mCellName),mPosition.asVec3(), true, true);
+                world->moveObject(actor, world->getInterior(mCellName), mPosition.asVec3(), true, true);
         }
     }
 
-    void ActionTeleport::getFollowers(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out, bool toExterior, bool includeHostiles) {
+    void ActionTeleport::getFollowers(
+        const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out, bool toExterior, bool includeHostiles)
+    {
         std::set<MWWorld::Ptr> followers;
         MWBase::Environment::get().getMechanicsManager()->getActorsFollowing(actor, followers);
 
-        for(std::set<MWWorld::Ptr>::iterator it = followers.begin();it != followers.end();++it)
+        for (std::set<MWWorld::Ptr>::iterator it = followers.begin(); it != followers.end(); ++it)
         {
             MWWorld::Ptr follower = *it;
 
@@ -76,10 +80,13 @@ namespace MWWorld
             if (!includeHostiles && follower.getClass().getCreatureStats(follower).getAiSequence().isInCombat(actor))
                 continue;
 
-            if (!toExterior && !script.empty() && follower.getRefData().getLocals().getIntVar(script, "stayoutside") == 1 && follower.getCell()->getCell()->isExterior())
+            if (!toExterior && !script.empty()
+                && follower.getRefData().getLocals().getIntVar(script, "stayoutside") == 1
+                && follower.getCell()->getCell()->isExterior())
                 continue;
 
-            if ((follower.getRefData().getPosition().asVec3() - actor.getRefData().getPosition().asVec3()).length2() > 800 * 800)
+            if ((follower.getRefData().getPosition().asVec3() - actor.getRefData().getPosition().asVec3()).length2()
+                > 800 * 800)
                 continue;
 
             out.emplace(follower);
diff --git a/apps/openmw/mwworld/actionteleport.hpp b/apps/openmw/mwworld/actionteleport.hpp
index b467e1db0f..cbdd59cc87 100644
--- a/apps/openmw/mwworld/actionteleport.hpp
+++ b/apps/openmw/mwworld/actionteleport.hpp
@@ -13,25 +13,26 @@ namespace MWWorld
 {
     class ActionTeleport : public Action
     {
-            std::string mCellName;
-            ESM::Position mPosition;
-            bool mTeleportFollowers;
-
-            /// Teleports this actor and also teleports anyone following that actor.
-            void executeImp (const Ptr& actor) override;
-
-            /// Teleports only the given actor (internal use).
-            void teleport(const Ptr &actor);
-
-        public:
-
-            /// If cellName is empty, an exterior cell is assumed.
-            /// @param teleportFollowers Whether to teleport any following actors of the target actor as well.
-            ActionTeleport(std::string_view cellName, const ESM::Position& position, bool teleportFollowers);
-
-            /// @param includeHostiles If true, include hostile followers (which won't actually be teleported) in the output,
-            ///                        e.g. so that the teleport action can calm them.
-            static void getFollowers(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out, bool toExterior, bool includeHostiles = false);
+        std::string mCellName;
+        ESM::Position mPosition;
+        bool mTeleportFollowers;
+
+        /// Teleports this actor and also teleports anyone following that actor.
+        void executeImp(const Ptr& actor) override;
+
+        /// Teleports only the given actor (internal use).
+        void teleport(const Ptr& actor);
+
+    public:
+        /// If cellName is empty, an exterior cell is assumed.
+        /// @param teleportFollowers Whether to teleport any following actors of the target actor as well.
+        ActionTeleport(std::string_view cellName, const ESM::Position& position, bool teleportFollowers);
+
+        /// @param includeHostiles If true, include hostile followers (which won't actually be teleported) in the
+        /// output,
+        ///                        e.g. so that the teleport action can calm them.
+        static void getFollowers(
+            const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out, bool toExterior, bool includeHostiles = false);
     };
 }
 
diff --git a/apps/openmw/mwworld/actiontrap.cpp b/apps/openmw/mwworld/actiontrap.cpp
index cdabaf8c84..e7dd0d98f9 100644
--- a/apps/openmw/mwworld/actiontrap.cpp
+++ b/apps/openmw/mwworld/actiontrap.cpp
@@ -7,7 +7,7 @@
 
 namespace MWWorld
 {
-    void ActionTrap::executeImp(const Ptr &actor)
+    void ActionTrap::executeImp(const Ptr& actor)
     {
         osg::Vec3f actorPosition(actor.getRefData().getPosition().asVec3());
         osg::Vec3f trapPosition(mTrapSource.getRefData().getPosition().asVec3());
@@ -17,7 +17,9 @@ namespace MWWorld
         // radius, because for most trap spells this is 1 foot, much less than the activation distance.
         // Using activation distance as the trap range.
 
-        if (actor == MWBase::Environment::get().getWorld()->getPlayerPtr() && MWBase::Environment::get().getWorld()->getDistanceToFacedObject() > trapRange) // player activated object outside range of trap
+        if (actor == MWBase::Environment::get().getWorld()->getPlayerPtr()
+            && MWBase::Environment::get().getWorld()->getDistanceToFacedObject()
+                > trapRange) // player activated object outside range of trap
         {
             MWMechanics::CastSpell cast(mTrapSource, mTrapSource);
             cast.mHitPosition = trapPosition;
@@ -28,7 +30,7 @@ namespace MWWorld
             MWMechanics::CastSpell cast(mTrapSource, actor);
             cast.mHitPosition = actorPosition;
             cast.cast(mSpellId);
-        }   
+        }
         mTrapSource.getCellRef().setTrap("");
     }
 }
diff --git a/apps/openmw/mwworld/actiontrap.hpp b/apps/openmw/mwworld/actiontrap.hpp
index fe51959d1b..6119856708 100644
--- a/apps/openmw/mwworld/actiontrap.hpp
+++ b/apps/openmw/mwworld/actiontrap.hpp
@@ -9,19 +9,21 @@ namespace MWWorld
 {
     class ActionTrap : public Action
     {
-            std::string mSpellId;
-            MWWorld::Ptr mTrapSource;
-
-            void executeImp (const Ptr& actor) override;
-
-        public:
-
-            /// @param spellId
-            /// @param trapSource
-            ActionTrap (const std::string& spellId, const Ptr& trapSource)
-                : Action(false, trapSource), mSpellId(spellId), mTrapSource(trapSource) {}
+        std::string mSpellId;
+        MWWorld::Ptr mTrapSource;
+
+        void executeImp(const Ptr& actor) override;
+
+    public:
+        /// @param spellId
+        /// @param trapSource
+        ActionTrap(const std::string& spellId, const Ptr& trapSource)
+            : Action(false, trapSource)
+            , mSpellId(spellId)
+            , mTrapSource(trapSource)
+        {
+        }
     };
 }
 
-
 #endif
diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index daaab46c8f..713fbbf05f 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -4,17 +4,17 @@
 #include <limits>
 
 #include <components/debug/debuglog.hpp>
-#include <components/resource/scenemanager.hpp>
-#include <components/resource/resourcesystem.hpp>
-#include <components/resource/bulletshapemanager.hpp>
-#include <components/resource/keyframemanager.hpp>
-#include <components/vfs/manager.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/loadinglistener/reporter.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/strings/lower.hpp>
-#include <components/terrain/world.hpp>
+#include <components/resource/bulletshapemanager.hpp>
+#include <components/resource/keyframemanager.hpp>
+#include <components/resource/resourcesystem.hpp>
+#include <components/resource/scenemanager.hpp>
 #include <components/terrain/view.hpp>
-#include <components/esm3/loadcell.hpp>
-#include <components/loadinglistener/reporter.hpp>
+#include <components/terrain/world.hpp>
+#include <components/vfs/manager.hpp>
 
 #include "../mwrender/landmanager.hpp"
 
@@ -24,21 +24,22 @@
 namespace
 {
     template <class Contained>
-    bool contains(const std::vector<MWWorld::CellPreloader::PositionCellGrid>& container,
-           const Contained& contained, float tolerance)
+    bool contains(const std::vector<MWWorld::CellPreloader::PositionCellGrid>& container, const Contained& contained,
+        float tolerance)
     {
         for (const auto& pos : contained)
         {
             bool found = false;
             for (const auto& pos2 : container)
             {
-                if ((pos.first-pos2.first).length2() < tolerance*tolerance && pos.second == pos2.second)
+                if ((pos.first - pos2.first).length2() < tolerance * tolerance && pos.second == pos2.second)
                 {
                     found = true;
                     break;
                 }
             }
-            if (!found) return false;
+            if (!found)
+                return false;
         }
         return true;
     }
@@ -71,7 +72,9 @@ namespace MWWorld
     {
     public:
         /// Constructor to be called from the main thread.
-        PreloadItem(MWWorld::CellStore* cell, Resource::SceneManager* sceneManager, Resource::BulletShapeManager* bulletShapeManager, Resource::KeyframeManager* keyframeManager, Terrain::World* terrain, MWRender::LandManager* landManager, bool preloadInstances)
+        PreloadItem(MWWorld::CellStore* cell, Resource::SceneManager* sceneManager,
+            Resource::BulletShapeManager* bulletShapeManager, Resource::KeyframeManager* keyframeManager,
+            Terrain::World* terrain, MWRender::LandManager* landManager, bool preloadInstances)
             : mIsExterior(cell->getCell()->isExterior())
             , mX(cell->getCell()->getGridX())
             , mY(cell->getCell()->getGridY())
@@ -85,14 +88,11 @@ namespace MWWorld
         {
             mTerrainView = mTerrain->createView();
 
-            ListModelsVisitor visitor (mMeshes);
+            ListModelsVisitor visitor(mMeshes);
             cell->forEach(visitor);
         }
 
-        void abort() override
-        {
-            mAbort = true;
-        }
+        void abort() override { mAbort = true; }
 
         /// Preload work to be called from the worker thread.
         void doWork() override
@@ -104,12 +104,12 @@ namespace MWWorld
                     mTerrain->cacheCell(mTerrainView.get(), mX, mY);
                     mPreloadedObjects.insert(mLandManager->getLand(mX, mY));
                 }
-                catch(std::exception&)
+                catch (std::exception&)
                 {
                 }
             }
 
-            for (std::string& mesh: mMeshes)
+            for (std::string& mesh : mMeshes)
             {
                 if (mAbort)
                     break;
@@ -119,15 +119,15 @@ namespace MWWorld
                     mesh = Misc::ResourceHelpers::correctActorModelPath(mesh, mSceneManager->getVFS());
 
                     size_t slashpos = mesh.find_last_of("/\\");
-                    if (slashpos != std::string::npos && slashpos != mesh.size()-1)
+                    if (slashpos != std::string::npos && slashpos != mesh.size() - 1)
                     {
                         Misc::StringUtils::lowerCaseInPlace(mesh);
-                        if (mesh[slashpos+1] == 'x')
+                        if (mesh[slashpos + 1] == 'x')
                         {
                             std::string kfname = mesh;
-                            if(kfname.size() > 4 && kfname.compare(kfname.size()-4, 4, ".nif") == 0)
+                            if (kfname.size() > 4 && kfname.compare(kfname.size() - 4, 4, ".nif") == 0)
                             {
-                                kfname.replace(kfname.size()-4, 4, ".kf");
+                                kfname.replace(kfname.size() - 4, 4, ".kf");
                                 if (mSceneManager->getVFS()->exists(kfname))
                                     mPreloadedObjects.insert(mKeyframeManager->get(kfname));
                             }
@@ -138,7 +138,6 @@ namespace MWWorld
                         mPreloadedObjects.insert(mBulletShapeManager->cacheInstance(mesh));
                     else
                         mPreloadedObjects.insert(mBulletShapeManager->getShape(mesh));
-
                 }
                 catch (std::exception&)
                 {
@@ -166,13 +165,14 @@ namespace MWWorld
         osg::ref_ptr<Terrain::View> mTerrainView;
 
         // keep a ref to the loaded objects to make sure it stays loaded as long as this cell is in the preloaded state
-        std::set<osg::ref_ptr<const osg::Object> > mPreloadedObjects;
+        std::set<osg::ref_ptr<const osg::Object>> mPreloadedObjects;
     };
 
     class TerrainPreloadItem : public SceneUtil::WorkItem
     {
     public:
-        TerrainPreloadItem(const std::vector<osg::ref_ptr<Terrain::View> >& views, Terrain::World* world, const std::vector<CellPreloader::PositionCellGrid>& preloadPositions)
+        TerrainPreloadItem(const std::vector<osg::ref_ptr<Terrain::View>>& views, Terrain::World* world,
+            const std::vector<CellPreloader::PositionCellGrid>& preloadPositions)
             : mAbort(false)
             , mTerrainViews(views)
             , mWorld(world)
@@ -182,27 +182,22 @@ namespace MWWorld
 
         void doWork() override
         {
-            for (unsigned int i=0; i<mTerrainViews.size() && i<mPreloadPositions.size() && !mAbort; ++i)
+            for (unsigned int i = 0; i < mTerrainViews.size() && i < mPreloadPositions.size() && !mAbort; ++i)
             {
                 mTerrainViews[i]->reset();
-                mWorld->preload(mTerrainViews[i], mPreloadPositions[i].first, mPreloadPositions[i].second, mAbort, mLoadingReporter);
+                mWorld->preload(mTerrainViews[i], mPreloadPositions[i].first, mPreloadPositions[i].second, mAbort,
+                    mLoadingReporter);
             }
             mLoadingReporter.complete();
         }
 
-        void abort() override
-        {
-            mAbort = true;
-        }
+        void abort() override { mAbort = true; }
 
-        void wait(Loading::Listener& listener) const
-        {
-            mLoadingReporter.wait(listener);
-        }
+        void wait(Loading::Listener& listener) const { mLoadingReporter.wait(listener); }
 
     private:
         std::atomic<bool> mAbort;
-        std::vector<osg::ref_ptr<Terrain::View> > mTerrainViews;
+        std::vector<osg::ref_ptr<Terrain::View>> mTerrainViews;
         Terrain::World* mWorld;
         std::vector<CellPreloader::PositionCellGrid> mPreloadPositions;
         Loading::Reporter mLoadingReporter;
@@ -218,17 +213,15 @@ namespace MWWorld
         {
         }
 
-        void doWork() override
-        {
-            mResourceSystem->updateCache(mReferenceTime);
-        }
+        void doWork() override { mResourceSystem->updateCache(mReferenceTime); }
 
     private:
         double mReferenceTime;
         Resource::ResourceSystem* mResourceSystem;
     };
 
-    CellPreloader::CellPreloader(Resource::ResourceSystem* resourceSystem, Resource::BulletShapeManager* bulletShapeManager, Terrain::World* terrain, MWRender::LandManager* landManager)
+    CellPreloader::CellPreloader(Resource::ResourceSystem* resourceSystem,
+        Resource::BulletShapeManager* bulletShapeManager, Terrain::World* terrain, MWRender::LandManager* landManager)
         : mResourceSystem(resourceSystem)
         , mBulletShapeManager(bulletShapeManager)
         , mTerrain(terrain)
@@ -257,16 +250,16 @@ namespace MWWorld
             mUpdateCacheItem = nullptr;
         }
 
-        for (PreloadMap::iterator it = mPreloadCells.begin(); it != mPreloadCells.end();++it)
+        for (PreloadMap::iterator it = mPreloadCells.begin(); it != mPreloadCells.end(); ++it)
             it->second.mWorkItem->abort();
 
-        for (PreloadMap::iterator it = mPreloadCells.begin(); it != mPreloadCells.end();++it)
+        for (PreloadMap::iterator it = mPreloadCells.begin(); it != mPreloadCells.end(); ++it)
             it->second.mWorkItem->waitTillDone();
 
         mPreloadCells.clear();
     }
 
-    void CellPreloader::preload(CellStore *cell, double timestamp)
+    void CellPreloader::preload(CellStore* cell, double timestamp)
     {
         if (!mWorkQueue)
         {
@@ -311,13 +304,14 @@ namespace MWWorld
                 return;
         }
 
-        osg::ref_ptr<PreloadItem> item (new PreloadItem(cell, mResourceSystem->getSceneManager(), mBulletShapeManager, mResourceSystem->getKeyframeManager(), mTerrain, mLandManager, mPreloadInstances));
+        osg::ref_ptr<PreloadItem> item(new PreloadItem(cell, mResourceSystem->getSceneManager(), mBulletShapeManager,
+            mResourceSystem->getKeyframeManager(), mTerrain, mLandManager, mPreloadInstances));
         mWorkQueue->addWorkItem(item);
 
         mPreloadCells[cell] = PreloadEntry(timestamp, item);
     }
 
-    void CellPreloader::notifyLoaded(CellStore *cell)
+    void CellPreloader::notifyLoaded(CellStore* cell)
     {
         PreloadMap::iterator found = mPreloadCells.find(cell);
         if (found != mPreloadCells.end())
@@ -365,7 +359,8 @@ namespace MWWorld
 
         if (timestamp - mLastResourceCacheUpdate > 1.0 && (!mUpdateCacheItem || mUpdateCacheItem->isDone()))
         {
-            // the resource cache is cleared from the worker thread so that we're not holding up the main thread with delete operations
+            // the resource cache is cleared from the worker thread so that we're not holding up the main thread with
+            // delete operations
             mUpdateCacheItem = new UpdateCacheItem(mResourceSystem, timestamp);
             mWorkQueue->addWorkItem(mUpdateCacheItem, true);
             mLastResourceCacheUpdate = timestamp;
@@ -408,7 +403,8 @@ namespace MWWorld
         mWorkQueue = workQueue;
     }
 
-    bool CellPreloader::syncTerrainLoad(const std::vector<CellPreloader::PositionCellGrid> &positions, double timestamp, Loading::Listener& listener)
+    bool CellPreloader::syncTerrainLoad(
+        const std::vector<CellPreloader::PositionCellGrid>& positions, double timestamp, Loading::Listener& listener)
     {
         if (!mTerrainPreloadItem)
             return true;
@@ -423,9 +419,9 @@ namespace MWWorld
         }
     }
 
-    void CellPreloader::abortTerrainPreloadExcept(const CellPreloader::PositionCellGrid *exceptPos)
+    void CellPreloader::abortTerrainPreloadExcept(const CellPreloader::PositionCellGrid* exceptPos)
     {
-        if (exceptPos && contains(mTerrainPreloadPositions, std::array {*exceptPos}, ESM::Land::REAL_SIZE))
+        if (exceptPos && contains(mTerrainPreloadPositions, std::array{ *exceptPos }, ESM::Land::REAL_SIZE))
             return;
         if (mTerrainPreloadItem && !mTerrainPreloadItem->isDone())
         {
@@ -435,7 +431,7 @@ namespace MWWorld
         setTerrainPreloadPositions(std::vector<CellPreloader::PositionCellGrid>());
     }
 
-    void CellPreloader::setTerrainPreloadPositions(const std::vector<CellPreloader::PositionCellGrid> &positions)
+    void CellPreloader::setTerrainPreloadPositions(const std::vector<CellPreloader::PositionCellGrid>& positions)
     {
         if (positions.empty())
         {
@@ -452,7 +448,7 @@ namespace MWWorld
                 mTerrainViews.resize(positions.size());
             else if (mTerrainViews.size() < positions.size())
             {
-                for (unsigned int i=mTerrainViews.size(); i<positions.size(); ++i)
+                for (unsigned int i = mTerrainViews.size(); i < positions.size(); ++i)
                     mTerrainViews.emplace_back(mTerrain->createView());
             }
 
@@ -464,10 +460,11 @@ namespace MWWorld
             }
         }
     }
-    
-    bool CellPreloader::isTerrainLoaded(const CellPreloader::PositionCellGrid &position, double referenceTime) const
+
+    bool CellPreloader::isTerrainLoaded(const CellPreloader::PositionCellGrid& position, double referenceTime) const
     {
-        return mLoadedTerrainTimestamp + mResourceSystem->getSceneManager()->getExpiryDelay() > referenceTime && contains(mLoadedTerrainPositions, std::array {position}, ESM::Land::REAL_SIZE);
+        return mLoadedTerrainTimestamp + mResourceSystem->getSceneManager()->getExpiryDelay() > referenceTime
+            && contains(mLoadedTerrainPositions, std::array{ position }, ESM::Land::REAL_SIZE);
     }
 
 }
diff --git a/apps/openmw/mwworld/cellpreloader.hpp b/apps/openmw/mwworld/cellpreloader.hpp
index 185a25276b..bd4d712c39 100644
--- a/apps/openmw/mwworld/cellpreloader.hpp
+++ b/apps/openmw/mwworld/cellpreloader.hpp
@@ -1,11 +1,11 @@
 #ifndef OPENMW_MWWORLD_CELLPRELOADER_H
 #define OPENMW_MWWORLD_CELLPRELOADER_H
 
+#include <components/sceneutil/workqueue.hpp>
 #include <map>
-#include <osg/ref_ptr>
 #include <osg/Vec3f>
 #include <osg/Vec4i>
-#include <components/sceneutil/workqueue.hpp>
+#include <osg/ref_ptr>
 
 namespace Resource
 {
@@ -37,7 +37,8 @@ namespace MWWorld
     class CellPreloader
     {
     public:
-        CellPreloader(Resource::ResourceSystem* resourceSystem, Resource::BulletShapeManager* bulletShapeManager, Terrain::World* terrain, MWRender::LandManager* landManager);
+        CellPreloader(Resource::ResourceSystem* resourceSystem, Resource::BulletShapeManager* bulletShapeManager,
+            Terrain::World* terrain, MWRender::LandManager* landManager);
         ~CellPreloader();
 
         /// Ask a background thread to preload rendering meshes and collision shapes for objects in this cell.
@@ -70,9 +71,10 @@ namespace MWWorld
         typedef std::pair<osg::Vec3f, osg::Vec4i> PositionCellGrid;
         void setTerrainPreloadPositions(const std::vector<PositionCellGrid>& positions);
 
-        bool syncTerrainLoad(const std::vector<CellPreloader::PositionCellGrid> &positions, double timestamp, Loading::Listener& listener);
-        void abortTerrainPreloadExcept(const PositionCellGrid *exceptPos);
-        bool isTerrainLoaded(const CellPreloader::PositionCellGrid &position, double referenceTime) const;
+        bool syncTerrainLoad(const std::vector<CellPreloader::PositionCellGrid>& positions, double timestamp,
+            Loading::Listener& listener);
+        void abortTerrainPreloadExcept(const PositionCellGrid* exceptPos);
+        bool isTerrainLoaded(const CellPreloader::PositionCellGrid& position, double referenceTime) const;
 
     private:
         Resource::ResourceSystem* mResourceSystem;
@@ -107,7 +109,7 @@ namespace MWWorld
         // Cells that are currently being preloaded, or have already finished preloading
         PreloadMap mPreloadCells;
 
-        std::vector<osg::ref_ptr<Terrain::View> > mTerrainViews;
+        std::vector<osg::ref_ptr<Terrain::View>> mTerrainViews;
         std::vector<PositionCellGrid> mTerrainPreloadPositions;
         osg::ref_ptr<TerrainPreloadItem> mTerrainPreloadItem;
         osg::ref_ptr<SceneUtil::WorkItem> mUpdateCacheItem;
diff --git a/apps/openmw/mwworld/cellref.cpp b/apps/openmw/mwworld/cellref.cpp
index 6e0e5351dd..b18e4b5a66 100644
--- a/apps/openmw/mwworld/cellref.cpp
+++ b/apps/openmw/mwworld/cellref.cpp
@@ -15,7 +15,7 @@ namespace MWWorld
             // Generated RefNums have negative mContentFile
             assert(lastAssignedRefNum.mContentFile < 0);
             lastAssignedRefNum.mIndex++;
-            if (lastAssignedRefNum.mIndex == 0)  // mIndex overflow, so mContentFile should be changed
+            if (lastAssignedRefNum.mIndex == 0) // mIndex overflow, so mContentFile should be changed
             {
                 if (lastAssignedRefNum.mContentFile > std::numeric_limits<int32_t>::min())
                     lastAssignedRefNum.mContentFile--;
@@ -42,7 +42,7 @@ namespace MWWorld
         }
     }
 
-    void CellRef::setPosition(const ESM::Position &position)
+    void CellRef::setPosition(const ESM::Position& position)
     {
         mChanged = true;
         mCellRef.mPos = position;
@@ -127,7 +127,7 @@ namespace MWWorld
         }
     }
 
-    void CellRef::setOwner(const std::string &owner)
+    void CellRef::setOwner(const std::string& owner)
     {
         if (owner != mCellRef.mOwner)
         {
@@ -145,7 +145,7 @@ namespace MWWorld
         }
     }
 
-    void CellRef::setFaction(const std::string &faction)
+    void CellRef::setFaction(const std::string& faction)
     {
         if (faction != mCellRef.mFaction)
         {
@@ -165,15 +165,15 @@ namespace MWWorld
 
     void CellRef::lock(int lockLevel)
     {
-        if(lockLevel != 0)
-            setLockLevel(abs(lockLevel)); //Changes lock to locklevel, if positive
+        if (lockLevel != 0)
+            setLockLevel(abs(lockLevel)); // Changes lock to locklevel, if positive
         else
             setLockLevel(ESM::UnbreakableLock); // If zero, set to max lock level
     }
 
     void CellRef::unlock()
     {
-        setLockLevel(-abs(mCellRef.mLockLevel)); //Makes lockLevel negative
+        setLockLevel(-abs(mCellRef.mLockLevel)); // Makes lockLevel negative
     }
 
     void CellRef::setTrap(const std::string& trap)
@@ -194,7 +194,7 @@ namespace MWWorld
         }
     }
 
-    void CellRef::writeState(ESM::ObjectState &state) const
+    void CellRef::writeState(ESM::ObjectState& state) const
     {
         state.mRef = mCellRef;
     }
diff --git a/apps/openmw/mwworld/cellref.hpp b/apps/openmw/mwworld/cellref.hpp
index 8f11542187..e8fa03a093 100644
--- a/apps/openmw/mwworld/cellref.hpp
+++ b/apps/openmw/mwworld/cellref.hpp
@@ -17,8 +17,7 @@ namespace MWWorld
     class CellRef
     {
     public:
-
-        CellRef (const ESM::CellRef& ref)
+        CellRef(const ESM::CellRef& ref)
             : mCellRef(ref)
         {
             mChanged = false;
@@ -57,7 +56,7 @@ namespace MWWorld
         // The *original* position and rotation as it was given in the Construction Set.
         // Current position and rotation of the object is stored in RefData.
         const ESM::Position& getPosition() const { return mCellRef.mPos; }
-        void setPosition (const ESM::Position& position);
+        void setPosition(const ESM::Position& position);
 
         // Remaining enchantment charge. This could be -1 if the charge was not touched yet (i.e. full).
         float getEnchantmentCharge() const { return mCellRef.mEnchantmentCharge; }
@@ -94,7 +93,7 @@ namespace MWWorld
         // The faction that owns this object (and will get angry if
         // you take it and are not a faction member)
         const std::string& getFaction() const { return mCellRef.mFaction; }
-        void setFaction (const std::string& faction);
+        void setFaction(const std::string& faction);
 
         // PC faction rank required to use the item. Sometimes is -1, which means "any rank".
         void setFactionRank(int factionRank);
@@ -107,7 +106,7 @@ namespace MWWorld
         void setLockLevel(int lockLevel);
         void lock(int lockLevel);
         void unlock();
-         // Key and trap ID names, if any
+        // Key and trap ID names, if any
         const std::string& getKey() const { return mCellRef.mKey; }
         const std::string& getTrap() const { return mCellRef.mTrap; }
         void setTrap(const std::string& trap);
@@ -117,7 +116,7 @@ namespace MWWorld
         void setGoldValue(int value);
 
         // Write the content of this CellRef into the given ObjectState
-        void writeState (ESM::ObjectState& state) const;
+        void writeState(ESM::ObjectState& state) const;
 
         // Has this CellRef changed since it was originally loaded?
         bool hasChanged() const { return mChanged; }
diff --git a/apps/openmw/mwworld/cellreflist.hpp b/apps/openmw/mwworld/cellreflist.hpp
index 9d6d63fb4f..8f0a31b5e3 100644
--- a/apps/openmw/mwworld/cellreflist.hpp
+++ b/apps/openmw/mwworld/cellreflist.hpp
@@ -7,7 +7,9 @@
 
 namespace MWWorld
 {
-    struct CellRefListBase {};
+    struct CellRefListBase
+    {
+    };
 
     /// \brief Collection of references of one type
     template <typename X>
@@ -24,16 +26,16 @@ namespace MWWorld
         /// and the build will fail with an ugly three-way cyclic header dependence
         /// so we need to pass the instantiation of the method to the linker, when
         /// all methods are known.
-        void load (ESM::CellRef &ref, bool deleted, const MWWorld::ESMStore &esmStore);
+        void load(ESM::CellRef& ref, bool deleted, const MWWorld::ESMStore& esmStore);
 
-        LiveRef &insert (const LiveRef &item)
+        LiveRef& insert(const LiveRef& item)
         {
             mList.push_back(item);
             return mList.back();
         }
 
         /// Remove all references with the given refNum from this list.
-        void remove (const ESM::RefNum &refNum)
+        void remove(const ESM::RefNum& refNum)
         {
             for (typename List::iterator it = mList.begin(); it != mList.end();)
             {
diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp
index 3ad8a1ee38..9c1fc97f30 100644
--- a/apps/openmw/mwworld/cells.cpp
+++ b/apps/openmw/mwworld/cells.cpp
@@ -1,48 +1,47 @@
 #include "cells.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm3/esmreader.hpp>
-#include <components/esm3/esmwriter.hpp>
 #include <components/esm/defs.hpp>
-#include <components/esm3/cellstate.hpp>
 #include <components/esm3/cellref.hpp>
+#include <components/esm3/cellstate.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
-#include "esmstore.hpp"
-#include "containerstore.hpp"
 #include "cellstore.hpp"
+#include "containerstore.hpp"
+#include "esmstore.hpp"
 
 namespace
 {
-    template<class Visitor, class Key>
+    template <class Visitor, class Key>
     bool forEachInStore(const std::string& id, Visitor&& visitor, std::map<Key, MWWorld::CellStore>& cellStore)
     {
-        for(auto& cell : cellStore)
+        for (auto& cell : cellStore)
         {
-            if(cell.second.getState() == MWWorld::CellStore::State_Unloaded)
+            if (cell.second.getState() == MWWorld::CellStore::State_Unloaded)
                 cell.second.preload();
-            if(cell.second.getState() == MWWorld::CellStore::State_Preloaded)
+            if (cell.second.getState() == MWWorld::CellStore::State_Preloaded)
             {
-                if(cell.second.hasId(id))
+                if (cell.second.hasId(id))
                 {
                     cell.second.load();
                 }
                 else
                     continue;
             }
-            bool cont = cell.second.forEach([&] (MWWorld::Ptr ptr)
-            {
+            bool cont = cell.second.forEach([&](MWWorld::Ptr ptr) {
                 if (ptr.getCellRef().getRefId() == id)
                 {
                     return visitor(ptr);
                 }
                 return true;
             });
-            if(!cont)
+            if (!cont)
                 return false;
         }
         return true;
@@ -60,26 +59,27 @@ namespace
     };
 }
 
-MWWorld::CellStore *MWWorld::Cells::getCellStore (const ESM::Cell *cell)
+MWWorld::CellStore* MWWorld::Cells::getCellStore(const ESM::Cell* cell)
 {
     if (cell->mData.mFlags & ESM::Cell::Interior)
     {
         std::string lowerName(Misc::StringUtils::lowerCase(cell->mName));
-        std::map<std::string, CellStore>::iterator result = mInteriors.find (lowerName);
+        std::map<std::string, CellStore>::iterator result = mInteriors.find(lowerName);
 
-        if (result==mInteriors.end())
+        if (result == mInteriors.end())
             result = mInteriors.emplace(std::move(lowerName), CellStore(cell, mStore, mReaders)).first;
 
         return &result->second;
     }
     else
     {
-        std::map<std::pair<int, int>, CellStore>::iterator result =
-            mExteriors.find (std::make_pair (cell->getGridX(), cell->getGridY()));
+        std::map<std::pair<int, int>, CellStore>::iterator result
+            = mExteriors.find(std::make_pair(cell->getGridX(), cell->getGridY()));
 
-        if (result==mExteriors.end())
-            result = mExteriors.emplace(std::make_pair(cell->getGridX(), cell->getGridY()),
-                                        CellStore(cell, mStore, mReaders)).first;
+        if (result == mExteriors.end())
+            result = mExteriors
+                         .emplace(std::make_pair(cell->getGridX(), cell->getGridY()), CellStore(cell, mStore, mReaders))
+                         .first;
 
         return &result->second;
     }
@@ -95,53 +95,52 @@ void MWWorld::Cells::clear()
 
 MWWorld::Ptr MWWorld::Cells::getPtrAndCache(std::string_view name, CellStore& cellStore)
 {
-    Ptr ptr = getPtr (name, cellStore);
+    Ptr ptr = getPtr(name, cellStore);
 
     if (!ptr.isEmpty() && ptr.isInCell())
     {
         mIdCache[mIdCacheIndex].first = name;
         mIdCache[mIdCacheIndex].second = &cellStore;
-        if (++mIdCacheIndex>=mIdCache.size())
+        if (++mIdCacheIndex >= mIdCache.size())
             mIdCacheIndex = 0;
     }
 
     return ptr;
 }
 
-void MWWorld::Cells::writeCell (ESM::ESMWriter& writer, CellStore& cell) const
+void MWWorld::Cells::writeCell(ESM::ESMWriter& writer, CellStore& cell) const
 {
-    if (cell.getState()!=CellStore::State_Loaded)
-        cell.load ();
+    if (cell.getState() != CellStore::State_Loaded)
+        cell.load();
 
     ESM::CellState cellState;
 
-    cell.saveState (cellState);
+    cell.saveState(cellState);
 
-    writer.startRecord (ESM::REC_CSTA);
-    cellState.mId.save (writer);
-    cellState.save (writer);
+    writer.startRecord(ESM::REC_CSTA);
+    cellState.mId.save(writer);
+    cellState.save(writer);
     cell.writeFog(writer);
-    cell.writeReferences (writer);
-    writer.endRecord (ESM::REC_CSTA);
+    cell.writeReferences(writer);
+    writer.endRecord(ESM::REC_CSTA);
 }
 
-MWWorld::Cells::Cells (const MWWorld::ESMStore& store, ESM::ReadersCache& readers)
+MWWorld::Cells::Cells(const MWWorld::ESMStore& store, ESM::ReadersCache& readers)
     : mStore(store)
     , mReaders(readers)
     , mIdCacheIndex(0)
 {
     int cacheSize = std::clamp(Settings::Manager::getInt("pointers cache size", "Cells"), 40, 1000);
-    mIdCache = IdCache(cacheSize, std::pair<std::string, CellStore *> ("", (CellStore*)nullptr));
+    mIdCache = IdCache(cacheSize, std::pair<std::string, CellStore*>("", (CellStore*)nullptr));
 }
 
-MWWorld::CellStore *MWWorld::Cells::getExterior (int x, int y)
+MWWorld::CellStore* MWWorld::Cells::getExterior(int x, int y)
 {
-    std::map<std::pair<int, int>, CellStore>::iterator result =
-        mExteriors.find (std::make_pair (x, y));
+    std::map<std::pair<int, int>, CellStore>::iterator result = mExteriors.find(std::make_pair(x, y));
 
-    if (result==mExteriors.end())
+    if (result == mExteriors.end())
     {
-        const ESM::Cell *cell = mStore.get<ESM::Cell>().search(x, y);
+        const ESM::Cell* cell = mStore.get<ESM::Cell>().search(x, y);
 
         if (!cell)
         {
@@ -158,15 +157,15 @@ MWWorld::CellStore *MWWorld::Cells::getExterior (int x, int y)
             record.mWater = 0;
             record.mMapColor = 0;
 
-            cell = MWBase::Environment::get().getWorld()->createRecord (record);
+            cell = MWBase::Environment::get().getWorld()->createRecord(record);
         }
 
         result = mExteriors.emplace(std::make_pair(x, y), CellStore(cell, mStore, mReaders)).first;
     }
 
-    if (result->second.getState()!=CellStore::State_Loaded)
+    if (result->second.getState() != CellStore::State_Loaded)
     {
-        result->second.load ();
+        result->second.load();
     }
 
     return &result->second;
@@ -175,91 +174,90 @@ MWWorld::CellStore *MWWorld::Cells::getExterior (int x, int y)
 MWWorld::CellStore* MWWorld::Cells::getInterior(std::string_view name)
 {
     std::string lowerName = Misc::StringUtils::lowerCase(name);
-    std::map<std::string, CellStore>::iterator result = mInteriors.find (lowerName);
+    std::map<std::string, CellStore>::iterator result = mInteriors.find(lowerName);
 
-    if (result==mInteriors.end())
+    if (result == mInteriors.end())
     {
-        const ESM::Cell *cell = mStore.get<ESM::Cell>().find(lowerName);
+        const ESM::Cell* cell = mStore.get<ESM::Cell>().find(lowerName);
 
         result = mInteriors.emplace(std::move(lowerName), CellStore(cell, mStore, mReaders)).first;
     }
 
-    if (result->second.getState()!=CellStore::State_Loaded)
+    if (result->second.getState() != CellStore::State_Loaded)
     {
-        result->second.load ();
+        result->second.load();
     }
 
     return &result->second;
 }
 
-void MWWorld::Cells::rest (double hours)
+void MWWorld::Cells::rest(double hours)
 {
-    for (auto &interior : mInteriors)
+    for (auto& interior : mInteriors)
     {
         interior.second.rest(hours);
     }
 
-    for (auto &exterior : mExteriors)
+    for (auto& exterior : mExteriors)
     {
         exterior.second.rest(hours);
     }
 }
 
-void MWWorld::Cells::recharge (float duration)
+void MWWorld::Cells::recharge(float duration)
 {
-    for (auto &interior : mInteriors)
+    for (auto& interior : mInteriors)
     {
         interior.second.recharge(duration);
     }
 
-    for (auto &exterior : mExteriors)
+    for (auto& exterior : mExteriors)
     {
         exterior.second.recharge(duration);
     }
 }
 
-MWWorld::CellStore *MWWorld::Cells::getCell (const ESM::CellId& id)
+MWWorld::CellStore* MWWorld::Cells::getCell(const ESM::CellId& id)
 {
     if (id.mPaged)
-        return getExterior (id.mIndex.mX, id.mIndex.mY);
+        return getExterior(id.mIndex.mX, id.mIndex.mY);
 
-    return getInterior (id.mWorldspace);
+    return getInterior(id.mWorldspace);
 }
 
-MWWorld::Ptr MWWorld::Cells::getPtr(std::string_view name, CellStore& cell,
-    bool searchInContainers)
+MWWorld::Ptr MWWorld::Cells::getPtr(std::string_view name, CellStore& cell, bool searchInContainers)
 {
-    if (cell.getState()==CellStore::State_Unloaded)
-        cell.preload ();
+    if (cell.getState() == CellStore::State_Unloaded)
+        cell.preload();
 
-    if (cell.getState()==CellStore::State_Preloaded)
+    if (cell.getState() == CellStore::State_Preloaded)
     {
-        if (cell.hasId (name))
+        if (cell.hasId(name))
         {
-            cell.load ();
+            cell.load();
         }
         else
             return Ptr();
     }
 
-    Ptr ptr = cell.search (name);
+    Ptr ptr = cell.search(name);
 
     if (!ptr.isEmpty() && MWWorld::CellStore::isAccessible(ptr.getRefData(), ptr.getCellRef()))
         return ptr;
 
     if (searchInContainers)
-        return cell.searchInContainer (name);
+        return cell.searchInContainer(name);
 
     return Ptr();
 }
 
-MWWorld::Ptr MWWorld::Cells::getPtr (const std::string& name)
+MWWorld::Ptr MWWorld::Cells::getPtr(const std::string& name)
 {
     // First check the cache
-    for (IdCache::iterator iter (mIdCache.begin()); iter!=mIdCache.end(); ++iter)
-        if (iter->first==name && iter->second)
+    for (IdCache::iterator iter(mIdCache.begin()); iter != mIdCache.end(); ++iter)
+        if (iter->first == name && iter->second)
         {
-            Ptr ptr = getPtr (name, *iter->second);
+            Ptr ptr = getPtr(name, *iter->second);
             if (!ptr.isEmpty())
                 return ptr;
         }
@@ -268,30 +266,29 @@ MWWorld::Ptr MWWorld::Cells::getPtr (const std::string& name)
     // Search in reverse, this is a workaround for an ambiguous chargen_plank reference in the vanilla game.
     // there is one at -22,16 and one at -2,-9, the latter should be used.
     for (std::map<std::pair<int, int>, CellStore>::reverse_iterator iter = mExteriors.rbegin();
-        iter!=mExteriors.rend(); ++iter)
+         iter != mExteriors.rend(); ++iter)
     {
-        Ptr ptr = getPtrAndCache (name, iter->second);
+        Ptr ptr = getPtrAndCache(name, iter->second);
         if (!ptr.isEmpty())
             return ptr;
     }
 
-    for (std::map<std::string, CellStore>::iterator iter = mInteriors.begin();
-        iter!=mInteriors.end(); ++iter)
+    for (std::map<std::string, CellStore>::iterator iter = mInteriors.begin(); iter != mInteriors.end(); ++iter)
     {
-        Ptr ptr = getPtrAndCache (name, iter->second);
+        Ptr ptr = getPtrAndCache(name, iter->second);
         if (!ptr.isEmpty())
             return ptr;
     }
 
     // Now try the other cells
-    const MWWorld::Store<ESM::Cell> &cells = mStore.get<ESM::Cell>();
+    const MWWorld::Store<ESM::Cell>& cells = mStore.get<ESM::Cell>();
     MWWorld::Store<ESM::Cell>::iterator iter;
 
     for (iter = cells.extBegin(); iter != cells.extEnd(); ++iter)
     {
-        CellStore *cellStore = getCellStore (&(*iter));
+        CellStore* cellStore = getCellStore(&(*iter));
 
-        Ptr ptr = getPtrAndCache (name, *cellStore);
+        Ptr ptr = getPtrAndCache(name, *cellStore);
 
         if (!ptr.isEmpty())
             return ptr;
@@ -299,9 +296,9 @@ MWWorld::Ptr MWWorld::Cells::getPtr (const std::string& name)
 
     for (iter = cells.intBegin(); iter != cells.intEnd(); ++iter)
     {
-        CellStore *cellStore = getCellStore (&(*iter));
+        CellStore* cellStore = getCellStore(&(*iter));
 
-        Ptr ptr = getPtrAndCache (name, *cellStore);
+        Ptr ptr = getPtrAndCache(name, *cellStore);
 
         if (!ptr.isEmpty())
             return ptr;
@@ -311,7 +308,7 @@ MWWorld::Ptr MWWorld::Cells::getPtr (const std::string& name)
     return Ptr();
 }
 
-MWWorld::Ptr MWWorld::Cells::getPtr (const std::string& id, const ESM::RefNum& refNum)
+MWWorld::Ptr MWWorld::Cells::getPtr(const std::string& id, const ESM::RefNum& refNum)
 {
     for (auto& pair : mInteriors)
     {
@@ -344,26 +341,26 @@ MWWorld::Ptr MWWorld::Cells::getPtr(CellStore& cellStore, const std::string& id,
 
 void MWWorld::Cells::getExteriorPtrs(std::string_view name, std::vector<MWWorld::Ptr>& out)
 {
-    const MWWorld::Store<ESM::Cell> &cells = mStore.get<ESM::Cell>();
+    const MWWorld::Store<ESM::Cell>& cells = mStore.get<ESM::Cell>();
     for (MWWorld::Store<ESM::Cell>::iterator iter = cells.extBegin(); iter != cells.extEnd(); ++iter)
     {
-        CellStore *cellStore = getCellStore (&(*iter));
+        CellStore* cellStore = getCellStore(&(*iter));
 
-        Ptr ptr = getPtrAndCache (name, *cellStore);
+        Ptr ptr = getPtrAndCache(name, *cellStore);
 
         if (!ptr.isEmpty())
             out.push_back(ptr);
     }
 }
 
-void MWWorld::Cells::getInteriorPtrs(const std::string &name, std::vector<MWWorld::Ptr> &out)
+void MWWorld::Cells::getInteriorPtrs(const std::string& name, std::vector<MWWorld::Ptr>& out)
 {
-    const MWWorld::Store<ESM::Cell> &cells = mStore.get<ESM::Cell>();
+    const MWWorld::Store<ESM::Cell>& cells = mStore.get<ESM::Cell>();
     for (MWWorld::Store<ESM::Cell>::iterator iter = cells.intBegin(); iter != cells.intEnd(); ++iter)
     {
-        CellStore *cellStore = getCellStore (&(*iter));
+        CellStore* cellStore = getCellStore(&(*iter));
 
-        Ptr ptr = getPtrAndCache (name, *cellStore);
+        Ptr ptr = getPtrAndCache(name, *cellStore);
 
         if (!ptr.isEmpty())
             out.push_back(ptr);
@@ -373,7 +370,7 @@ void MWWorld::Cells::getInteriorPtrs(const std::string &name, std::vector<MWWorl
 std::vector<MWWorld::Ptr> MWWorld::Cells::getAll(const std::string& id)
 {
     PtrCollector visitor;
-    if(forEachInStore(id, visitor, mInteriors))
+    if (forEachInStore(id, visitor, mInteriors))
         forEachInStore(id, visitor, mExteriors);
     return visitor.mPtrs;
 }
@@ -382,34 +379,31 @@ int MWWorld::Cells::countSavedGameRecords() const
 {
     int count = 0;
 
-    for (std::map<std::string, CellStore>::const_iterator iter (mInteriors.begin());
-        iter!=mInteriors.end(); ++iter)
+    for (std::map<std::string, CellStore>::const_iterator iter(mInteriors.begin()); iter != mInteriors.end(); ++iter)
         if (iter->second.hasState())
             ++count;
 
-    for (std::map<std::pair<int, int>, CellStore>::const_iterator iter (mExteriors.begin());
-        iter!=mExteriors.end(); ++iter)
+    for (std::map<std::pair<int, int>, CellStore>::const_iterator iter(mExteriors.begin()); iter != mExteriors.end();
+         ++iter)
         if (iter->second.hasState())
             ++count;
 
     return count;
 }
 
-void MWWorld::Cells::write (ESM::ESMWriter& writer, Loading::Listener& progress) const
+void MWWorld::Cells::write(ESM::ESMWriter& writer, Loading::Listener& progress) const
 {
-    for (std::map<std::pair<int, int>, CellStore>::iterator iter (mExteriors.begin());
-        iter!=mExteriors.end(); ++iter)
+    for (std::map<std::pair<int, int>, CellStore>::iterator iter(mExteriors.begin()); iter != mExteriors.end(); ++iter)
         if (iter->second.hasState())
         {
-            writeCell (writer, iter->second);
+            writeCell(writer, iter->second);
             progress.increaseProgress();
         }
 
-    for (std::map<std::string, CellStore>::iterator iter (mInteriors.begin());
-        iter!=mInteriors.end(); ++iter)
+    for (std::map<std::string, CellStore>::iterator iter(mInteriors.begin()); iter != mInteriors.end(); ++iter)
         if (iter->second.hasState())
         {
-            writeCell (writer, iter->second);
+            writeCell(writer, iter->second);
             progress.increaseProgress();
         }
 }
@@ -437,40 +431,40 @@ public:
     }
 };
 
-bool MWWorld::Cells::readRecord (ESM::ESMReader& reader, uint32_t type,
-    const std::map<int, int>& contentFileMap)
+bool MWWorld::Cells::readRecord(ESM::ESMReader& reader, uint32_t type, const std::map<int, int>& contentFileMap)
 {
-    if (type==ESM::REC_CSTA)
+    if (type == ESM::REC_CSTA)
     {
         ESM::CellState state;
-        state.mId.load (reader);
+        state.mId.load(reader);
 
-        CellStore *cellStore = nullptr;
+        CellStore* cellStore = nullptr;
 
         try
         {
-            cellStore = getCell (state.mId);
+            cellStore = getCell(state.mId);
         }
         catch (...)
         {
             // silently drop cells that don't exist anymore
-            Log(Debug::Warning) << "Warning: Dropping state for cell " << state.mId.mWorldspace << " (cell no longer exists)";
+            Log(Debug::Warning) << "Warning: Dropping state for cell " << state.mId.mWorldspace
+                                << " (cell no longer exists)";
             reader.skipRecord();
             return true;
         }
 
-        state.load (reader);
-        cellStore->loadState (state);
+        state.load(reader);
+        cellStore->loadState(state);
 
         if (state.mHasFogOfWar)
             cellStore->readFog(reader);
 
-        if (cellStore->getState()!=CellStore::State_Loaded)
-            cellStore->load ();
+        if (cellStore->getState() != CellStore::State_Loaded)
+            cellStore->load();
 
         GetCellStoreCallback callback(*this);
 
-        cellStore->readReferences (reader, contentFileMap, &callback);
+        cellStore->readReferences(reader, contentFileMap, &callback);
 
         return true;
     }
diff --git a/apps/openmw/mwworld/cells.hpp b/apps/openmw/mwworld/cells.hpp
index 65567912f3..d35ecc9b79 100644
--- a/apps/openmw/mwworld/cells.hpp
+++ b/apps/openmw/mwworld/cells.hpp
@@ -1,8 +1,8 @@
 #ifndef GAME_MWWORLD_CELLS_H
 #define GAME_MWWORLD_CELLS_H
 
-#include <map>
 #include <list>
+#include <map>
 #include <string>
 
 #include "ptr.hpp"
@@ -29,67 +29,65 @@ namespace MWWorld
     /// \brief Cell container
     class Cells
     {
-            typedef std::vector<std::pair<std::string, CellStore *> > IdCache;
-            const MWWorld::ESMStore& mStore;
-            ESM::ReadersCache& mReaders;
-            mutable std::map<std::string, CellStore> mInteriors;
-            mutable std::map<std::pair<int, int>, CellStore> mExteriors;
-            IdCache mIdCache;
-            std::size_t mIdCacheIndex;
-
-            Cells (const Cells&);
-            Cells& operator= (const Cells&);
+        typedef std::vector<std::pair<std::string, CellStore*>> IdCache;
+        const MWWorld::ESMStore& mStore;
+        ESM::ReadersCache& mReaders;
+        mutable std::map<std::string, CellStore> mInteriors;
+        mutable std::map<std::pair<int, int>, CellStore> mExteriors;
+        IdCache mIdCache;
+        std::size_t mIdCacheIndex;
 
-            CellStore *getCellStore (const ESM::Cell *cell);
+        Cells(const Cells&);
+        Cells& operator=(const Cells&);
 
-            Ptr getPtrAndCache(std::string_view name, CellStore& cellStore);
+        CellStore* getCellStore(const ESM::Cell* cell);
 
-            Ptr getPtr(CellStore& cellStore, const std::string& id, const ESM::RefNum& refNum);
+        Ptr getPtrAndCache(std::string_view name, CellStore& cellStore);
 
-            void writeCell (ESM::ESMWriter& writer, CellStore& cell) const;
+        Ptr getPtr(CellStore& cellStore, const std::string& id, const ESM::RefNum& refNum);
 
-        public:
+        void writeCell(ESM::ESMWriter& writer, CellStore& cell) const;
 
-            void clear();
+    public:
+        void clear();
 
-            explicit Cells(const MWWorld::ESMStore& store, ESM::ReadersCache& reader);
+        explicit Cells(const MWWorld::ESMStore& store, ESM::ReadersCache& reader);
 
-            CellStore *getExterior (int x, int y);
+        CellStore* getExterior(int x, int y);
 
-            CellStore* getInterior(std::string_view name);
+        CellStore* getInterior(std::string_view name);
 
-            CellStore *getCell (const ESM::CellId& id);
+        CellStore* getCell(const ESM::CellId& id);
 
-            Ptr getPtr(std::string_view name, CellStore& cellStore, bool searchInContainers = false);
-            ///< \param searchInContainers Only affect loaded cells.
-            /// @note name must be lower case
+        Ptr getPtr(std::string_view name, CellStore& cellStore, bool searchInContainers = false);
+        ///< \param searchInContainers Only affect loaded cells.
+        /// @note name must be lower case
 
-            /// @note name must be lower case
-            Ptr getPtr (const std::string& name);
+        /// @note name must be lower case
+        Ptr getPtr(const std::string& name);
 
-            Ptr getPtr(const std::string& id, const ESM::RefNum& refNum);
+        Ptr getPtr(const std::string& id, const ESM::RefNum& refNum);
 
-            void rest (double hours);
-            void recharge (float duration);
+        void rest(double hours);
+        void recharge(float duration);
 
-            /// Get all Ptrs referencing \a name in exterior cells
-            /// @note Due to the current implementation of getPtr this only supports one Ptr per cell.
-            /// @note name must be lower case
-            void getExteriorPtrs(std::string_view name, std::vector<MWWorld::Ptr>& out);
+        /// Get all Ptrs referencing \a name in exterior cells
+        /// @note Due to the current implementation of getPtr this only supports one Ptr per cell.
+        /// @note name must be lower case
+        void getExteriorPtrs(std::string_view name, std::vector<MWWorld::Ptr>& out);
 
-            /// Get all Ptrs referencing \a name in interior cells
-            /// @note Due to the current implementation of getPtr this only supports one Ptr per cell.
-            /// @note name must be lower case
-            void getInteriorPtrs (const std::string& name, std::vector<MWWorld::Ptr>& out);
+        /// Get all Ptrs referencing \a name in interior cells
+        /// @note Due to the current implementation of getPtr this only supports one Ptr per cell.
+        /// @note name must be lower case
+        void getInteriorPtrs(const std::string& name, std::vector<MWWorld::Ptr>& out);
 
-            std::vector<MWWorld::Ptr> getAll(const std::string& id);
+        std::vector<MWWorld::Ptr> getAll(const std::string& id);
 
-            int countSavedGameRecords() const;
+        int countSavedGameRecords() const;
 
-            void write (ESM::ESMWriter& writer, Loading::Listener& progress) const;
+        void write(ESM::ESMWriter& writer, Loading::Listener& progress) const;
 
-            bool readRecord (ESM::ESMReader& reader, uint32_t type,
-                const std::map<int, int>& contentFileMap);
+        bool readRecord(ESM::ESMReader& reader, uint32_t type, const std::map<int, int>& contentFileMap);
     };
 }
 
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index bfd7cf966c..c4430fbc2a 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -5,41 +5,41 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/misc/tuplehelpers.hpp>
-#include <components/esm3/cellstate.hpp>
 #include <components/esm3/cellid.hpp>
 #include <components/esm3/cellref.hpp>
-#include <components/esm3/esmreader.hpp>
-#include <components/esm3/esmwriter.hpp>
-#include <components/esm3/objectstate.hpp>
+#include <components/esm3/cellstate.hpp>
 #include <components/esm3/containerstate.hpp>
-#include <components/esm3/npcstate.hpp>
-#include <components/esm3/creaturestate.hpp>
-#include <components/esm3/fogstate.hpp>
 #include <components/esm3/creaturelevliststate.hpp>
+#include <components/esm3/creaturestate.hpp>
 #include <components/esm3/doorstate.hpp>
-#include <components/esm3/readerscache.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/fogstate.hpp>
 #include <components/esm3/loadacti.hpp>
 #include <components/esm3/loadalch.hpp>
 #include <components/esm3/loadappa.hpp>
 #include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadbody.hpp>
 #include <components/esm3/loadbook.hpp>
 #include <components/esm3/loadclot.hpp>
 #include <components/esm3/loadcont.hpp>
 #include <components/esm3/loadcrea.hpp>
 #include <components/esm3/loaddoor.hpp>
+#include <components/esm3/loadench.hpp>
 #include <components/esm3/loadingr.hpp>
 #include <components/esm3/loadlevlist.hpp>
 #include <components/esm3/loadligh.hpp>
 #include <components/esm3/loadlock.hpp>
+#include <components/esm3/loadmisc.hpp>
+#include <components/esm3/loadnpc.hpp>
 #include <components/esm3/loadprob.hpp>
 #include <components/esm3/loadrepa.hpp>
 #include <components/esm3/loadstat.hpp>
 #include <components/esm3/loadweap.hpp>
-#include <components/esm3/loadnpc.hpp>
-#include <components/esm3/loadmisc.hpp>
-#include <components/esm3/loadbody.hpp>
-#include <components/esm3/loadench.hpp>
+#include <components/esm3/npcstate.hpp>
+#include <components/esm3/objectstate.hpp>
+#include <components/esm3/readerscache.hpp>
+#include <components/misc/tuplehelpers.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/luamanager.hpp"
@@ -49,11 +49,11 @@
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/recharge.hpp"
 
-#include "ptr.hpp"
-#include "esmloader.hpp"
-#include "esmstore.hpp"
 #include "class.hpp"
 #include "containerstore.hpp"
+#include "esmloader.hpp"
+#include "esmstore.hpp"
+#include "ptr.hpp"
 
 namespace
 {
@@ -90,19 +90,18 @@ namespace
         using StateType = ESM::CreatureLevListState;
     };
 
-    template<typename T>
+    template <typename T>
     MWWorld::Ptr searchInContainerList(MWWorld::CellRefList<T>& containerList, std::string_view id)
     {
-        for (typename MWWorld::CellRefList<T>::List::iterator iter (containerList.mList.begin());
-             iter!=containerList.mList.end(); ++iter)
+        for (typename MWWorld::CellRefList<T>::List::iterator iter(containerList.mList.begin());
+             iter != containerList.mList.end(); ++iter)
         {
-            MWWorld::Ptr container (&*iter, nullptr);
+            MWWorld::Ptr container(&*iter, nullptr);
 
             if (container.getRefData().getCustomData() == nullptr)
                 continue;
 
-            MWWorld::Ptr ptr =
-                container.getClass().getContainerStore (container).search (id);
+            MWWorld::Ptr ptr = container.getClass().getContainerStore(container).search(id);
 
             if (!ptr.isEmpty())
                 return ptr;
@@ -111,100 +110,99 @@ namespace
         return MWWorld::Ptr();
     }
 
-    template<typename T>
-    MWWorld::Ptr searchViaActorId (MWWorld::CellRefList<T>& actorList, int actorId,
-        MWWorld::CellStore *cell, const std::map<MWWorld::LiveCellRefBase*, MWWorld::CellStore*>& toIgnore)
+    template <typename T>
+    MWWorld::Ptr searchViaActorId(MWWorld::CellRefList<T>& actorList, int actorId, MWWorld::CellStore* cell,
+        const std::map<MWWorld::LiveCellRefBase*, MWWorld::CellStore*>& toIgnore)
     {
-        for (typename MWWorld::CellRefList<T>::List::iterator iter (actorList.mList.begin());
-             iter!=actorList.mList.end(); ++iter)
+        for (typename MWWorld::CellRefList<T>::List::iterator iter(actorList.mList.begin());
+             iter != actorList.mList.end(); ++iter)
         {
-            MWWorld::Ptr actor (&*iter, cell);
+            MWWorld::Ptr actor(&*iter, cell);
 
             if (toIgnore.find(&*iter) != toIgnore.end())
                 continue;
 
-            if (actor.getClass().getCreatureStats (actor).matchesActorId (actorId) && actor.getRefData().getCount() > 0)
+            if (actor.getClass().getCreatureStats(actor).matchesActorId(actorId) && actor.getRefData().getCount() > 0)
                 return actor;
         }
 
         return MWWorld::Ptr();
     }
 
-    template<typename T>
-    void writeReferenceCollection (ESM::ESMWriter& writer,
-        const MWWorld::CellRefList<T>& collection)
+    template <typename T>
+    void writeReferenceCollection(ESM::ESMWriter& writer, const MWWorld::CellRefList<T>& collection)
     {
         if (!collection.mList.empty())
         {
             // references
-            for (typename MWWorld::CellRefList<T>::List::const_iterator
-                iter (collection.mList.begin());
-                iter!=collection.mList.end(); ++iter)
+            for (typename MWWorld::CellRefList<T>::List::const_iterator iter(collection.mList.begin());
+                 iter != collection.mList.end(); ++iter)
             {
                 if (!iter->mData.hasChanged() && !iter->mRef.hasChanged() && iter->mRef.hasContentFile())
                 {
                     // Reference that came from a content file and has not been changed -> ignore
                     continue;
                 }
-                if (iter->mData.getCount()==0 && !iter->mRef.hasContentFile())
+                if (iter->mData.getCount() == 0 && !iter->mRef.hasContentFile())
                 {
                     // Deleted reference that did not come from a content file -> ignore
                     continue;
                 }
                 using StateType = typename RecordToState<T>::StateType;
                 StateType state;
-                iter->save (state);
+                iter->save(state);
 
                 // recordId currently unused
-                writer.writeHNT ("OBJE", collection.mList.front().mBase->sRecordId);
+                writer.writeHNT("OBJE", collection.mList.front().mBase->sRecordId);
 
-                state.save (writer);
+                state.save(writer);
             }
         }
     }
 
-    template<class RecordType, class T>
+    template <class RecordType, class T>
     void fixRestockingImpl(const T* base, RecordType& state)
     {
         // Workaround for old saves not containing negative quantities
-        for(const auto& baseItem : base->mInventory.mList)
+        for (const auto& baseItem : base->mInventory.mList)
         {
-            if(baseItem.mCount < 0)
+            if (baseItem.mCount < 0)
             {
-                for(auto& item : state.mInventory.mItems)
+                for (auto& item : state.mInventory.mItems)
                 {
-                    if(item.mCount > 0 && Misc::StringUtils::ciEqual(baseItem.mItem, item.mRef.mRefID))
+                    if (item.mCount > 0 && Misc::StringUtils::ciEqual(baseItem.mItem, item.mRef.mRefID))
                         item.mCount = -item.mCount;
                 }
             }
         }
     }
 
-    template<class RecordType, class T>
+    template <class RecordType, class T>
     void fixRestocking(const T* base, RecordType& state)
-    {}
+    {
+    }
 
-    template<>
+    template <>
     void fixRestocking<>(const ESM::Creature* base, ESM::CreatureState& state)
     {
         fixRestockingImpl(base, state);
     }
 
-    template<>
+    template <>
     void fixRestocking<>(const ESM::NPC* base, ESM::NpcState& state)
     {
         fixRestockingImpl(base, state);
     }
 
-    template<>
+    template <>
     void fixRestocking<>(const ESM::Container* base, ESM::ContainerState& state)
     {
         fixRestockingImpl(base, state);
     }
 
-    template<typename T>
-    void readReferenceCollection (ESM::ESMReader& reader,
-        MWWorld::CellRefList<T>& collection, const ESM::CellRef& cref, const std::map<int, int>& contentFileMap, MWWorld::CellStore* cellstore)
+    template <typename T>
+    void readReferenceCollection(ESM::ESMReader& reader, MWWorld::CellRefList<T>& collection, const ESM::CellRef& cref,
+        const std::map<int, int>& contentFileMap, MWWorld::CellStore* cellstore)
     {
         const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
 
@@ -216,19 +214,18 @@ namespace
         // If the reference came from a content file, make sure this content file is loaded
         if (state.mRef.mRefNum.hasContentFile())
         {
-            std::map<int, int>::const_iterator iter =
-                contentFileMap.find (state.mRef.mRefNum.mContentFile);
+            std::map<int, int>::const_iterator iter = contentFileMap.find(state.mRef.mRefNum.mContentFile);
 
-            if (iter==contentFileMap.end())
+            if (iter == contentFileMap.end())
                 return; // content file has been removed -> skip
 
             state.mRef.mRefNum.mContentFile = iter->second;
         }
 
-        if (!MWWorld::LiveCellRef<T>::checkState (state))
+        if (!MWWorld::LiveCellRef<T>::checkState(state))
             return; // not valid anymore with current content files -> skip
 
-        const T *record = esmStore.get<T>().search (state.mRef.mRefID);
+        const T* record = esmStore.get<T>().search(state.mRef.mRefID);
 
         if (!record)
             return;
@@ -242,7 +239,7 @@ namespace
             else if constexpr (std::is_same_v<T, ESM::NPC>)
                 MWWorld::convertMagicEffects(state.mCreatureStats, state.mInventory, &state.mNpcStats);
         }
-        else if(state.mVersion < 20)
+        else if (state.mVersion < 20)
         {
             if constexpr (std::is_same_v<T, ESM::Creature> || std::is_same_v<T, ESM::NPC>)
                 MWWorld::convertStats(state.mCreatureStats);
@@ -250,17 +247,20 @@ namespace
 
         if (state.mRef.mRefNum.hasContentFile())
         {
-            for (typename MWWorld::CellRefList<T>::List::iterator iter (collection.mList.begin());
-                iter!=collection.mList.end(); ++iter)
-                if (iter->mRef.getRefNum()==state.mRef.mRefNum && iter->mRef.getRefId() == state.mRef.mRefID)
+            for (typename MWWorld::CellRefList<T>::List::iterator iter(collection.mList.begin());
+                 iter != collection.mList.end(); ++iter)
+                if (iter->mRef.getRefNum() == state.mRef.mRefNum && iter->mRef.getRefId() == state.mRef.mRefID)
                 {
                     // overwrite existing reference
                     float oldscale = iter->mRef.getScale();
-                    iter->load (state);
-                    const ESM::Position & oldpos = iter->mRef.getPosition();
-                    const ESM::Position & newpos = iter->mData.getPosition();
+                    iter->load(state);
+                    const ESM::Position& oldpos = iter->mRef.getPosition();
+                    const ESM::Position& newpos = iter->mData.getPosition();
                     const MWWorld::Ptr ptr(&*iter, cellstore);
-                    if ((oldscale != iter->mRef.getScale() || oldpos.asVec3() != newpos.asVec3() || oldpos.rot[0] != newpos.rot[0] || oldpos.rot[1] != newpos.rot[1] || oldpos.rot[2] != newpos.rot[2]) && !ptr.getClass().isActor())
+                    if ((oldscale != iter->mRef.getScale() || oldpos.asVec3() != newpos.asVec3()
+                            || oldpos.rot[0] != newpos.rot[0] || oldpos.rot[1] != newpos.rot[1]
+                            || oldpos.rot[2] != newpos.rot[2])
+                        && !ptr.getClass().isActor())
                         MWBase::Environment::get().getWorld()->moveObject(ptr, newpos.asVec3());
                     if (!iter->mData.isEnabled())
                     {
@@ -272,21 +272,22 @@ namespace
                     return;
                 }
 
-            Log(Debug::Warning) << "Warning: Dropping reference to " << state.mRef.mRefID << " (invalid content file link)";
+            Log(Debug::Warning) << "Warning: Dropping reference to " << state.mRef.mRefID
+                                << " (invalid content file link)";
             return;
         }
 
         // new reference
-        MWWorld::LiveCellRef<T> ref (record);
-        ref.load (state);
-        collection.mList.push_back (ref);
+        MWWorld::LiveCellRef<T> ref(record);
+        ref.load(state);
+        collection.mList.push_back(ref);
 
         MWWorld::LiveCellRefBase* base = &collection.mList.back();
         MWBase::Environment::get().getLuaManager()->registerObject(MWWorld::Ptr(base, cellstore));
     }
 
-    //this function allows us to link a CellRefList<T> to the associated recNameInt, and apply a function
-    template<typename RecordType, typename Callable>
+    // this function allows us to link a CellRefList<T> to the associated recNameInt, and apply a function
+    template <typename RecordType, typename Callable>
     static void recNameSwitcher(MWWorld::CellRefList<RecordType>& store, ESM::RecNameInts recnNameInt, Callable&& f)
     {
         if (RecordType::sRecordId == recnNameInt)
@@ -296,15 +297,14 @@ namespace
     }
 
     // helper function for forEachInternal
-    template<class Visitor, class List>
-    bool forEachImp (Visitor& visitor, List& list, MWWorld::CellStore* cellStore)
+    template <class Visitor, class List>
+    bool forEachImp(Visitor& visitor, List& list, MWWorld::CellStore* cellStore)
     {
-        for (typename List::List::iterator iter (list.mList.begin()); iter!=list.mList.end();
-            ++iter)
+        for (typename List::List::iterator iter(list.mList.begin()); iter != list.mList.end(); ++iter)
         {
             if (!MWWorld::CellStore::isAccessible(iter->mData, iter->mRef))
                 continue;
-            if (!visitor (MWWorld::Ptr(&*iter, cellStore)))
+            if (!visitor(MWWorld::Ptr(&*iter, cellStore)))
                 return false;
         }
         return true;
@@ -315,9 +315,9 @@ namespace MWWorld
 {
     struct CellStoreImp
     {
-        CellStoreTuple  mRefLists;
+        CellStoreTuple mRefLists;
 
-        template<typename T>  
+        template <typename T>
         static void assignStoreToIndex(CellStore& stores, CellRefList<T>& refList)
         {
             const std::size_t storeIndex = CellStore::getTypeIndex<T>();
@@ -329,30 +329,31 @@ namespace MWWorld
             stores.mCellRefLists[storeIndex] = &refList;
         }
 
-
-        // listing only objects owned by this cell. Internal use only, you probably want to use forEach() so that moved objects are accounted for.
-        template<class Visitor>
-        static bool forEachInternal (Visitor& visitor, MWWorld::CellStore& cellStore)
+        // listing only objects owned by this cell. Internal use only, you probably want to use forEach() so that moved
+        // objects are accounted for.
+        template <class Visitor>
+        static bool forEachInternal(Visitor& visitor, MWWorld::CellStore& cellStore)
         {
             bool returnValue = true;
 
-            Misc::tupleForEach(cellStore.mCellStoreImp->mRefLists, [&visitor, &returnValue, &cellStore](auto& store) { returnValue = returnValue && forEachImp(visitor, store, &cellStore); });
+            Misc::tupleForEach(cellStore.mCellStoreImp->mRefLists, [&visitor, &returnValue, &cellStore](auto& store) {
+                returnValue = returnValue && forEachImp(visitor, store, &cellStore);
+            });
 
             return returnValue;
         }
     };
 
     template <typename X>
-    void CellRefList<X>::load(ESM::CellRef &ref, bool deleted, const MWWorld::ESMStore &esmStore)
+    void CellRefList<X>::load(ESM::CellRef& ref, bool deleted, const MWWorld::ESMStore& esmStore)
     {
-        const MWWorld::Store<X> &store = esmStore.get<X>();
+        const MWWorld::Store<X>& store = esmStore.get<X>();
 
-        if (const X *ptr = store.search (ref.mRefID))
+        if (const X* ptr = store.search(ref.mRefID))
         {
-            typename std::list<LiveRef>::iterator iter =
-                std::find(mList.begin(), mList.end(), ref.mRefNum);
+            typename std::list<LiveRef>::iterator iter = std::find(mList.begin(), mList.end(), ref.mRefNum);
 
-            LiveRef liveCellRef (ref, ptr);
+            LiveRef liveCellRef(ref, ptr);
 
             if (deleted)
                 liveCellRef.mData.setDeletedByContentFile(true);
@@ -360,22 +361,22 @@ namespace MWWorld
             if (iter != mList.end())
                 *iter = liveCellRef;
             else
-                mList.push_back (liveCellRef);
+                mList.push_back(liveCellRef);
         }
         else
         {
-            Log(Debug::Warning)
-                << "Warning: could not resolve cell reference '" << ref.mRefID << "'"
-                << " (dropping reference)";
+            Log(Debug::Warning) << "Warning: could not resolve cell reference '" << ref.mRefID << "'"
+                                << " (dropping reference)";
         }
     }
 
-    template<typename X> bool operator==(const LiveCellRef<X>& ref, int pRefnum)
+    template <typename X>
+    bool operator==(const LiveCellRef<X>& ref, int pRefnum)
     {
         return (ref.mRef.mRefnum == pRefnum);
     }
 
-    Ptr CellStore::getCurrentPtr(LiveCellRefBase *ref)
+    Ptr CellStore::getCurrentPtr(LiveCellRefBase* ref)
     {
         MovedRefTracker::iterator found = mMovedToAnotherCell.find(ref);
         if (found != mMovedToAnotherCell.end())
@@ -383,7 +384,7 @@ namespace MWWorld
         return Ptr(ref, this);
     }
 
-    void CellStore::moveFrom(const Ptr &object, CellStore *from)
+    void CellStore::moveFrom(const Ptr& object, CellStore* from)
     {
         if (mState != State_Loaded)
             load();
@@ -393,7 +394,7 @@ namespace MWWorld
         if (found != mMovedToAnotherCell.end())
         {
             // A cell we had previously moved an object to is returning it to us.
-            assert (found->second == from);
+            assert(found->second == from);
             mMovedToAnotherCell.erase(found);
         }
         else
@@ -403,14 +404,15 @@ namespace MWWorld
         updateMergedRefs();
     }
 
-    MWWorld::Ptr CellStore::moveTo(const Ptr &object, CellStore *cellToMoveTo)
+    MWWorld::Ptr CellStore::moveTo(const Ptr& object, CellStore* cellToMoveTo)
     {
         if (cellToMoveTo == this)
             throw std::runtime_error("moveTo: object is already in this cell");
 
         // We assume that *this is in State_Loaded since we could hardly have reference to a live object otherwise.
         if (mState != State_Loaded)
-            throw std::runtime_error("moveTo: can't move object from a non-loaded cell (how did you get this object anyway?)");
+            throw std::runtime_error(
+                "moveTo: can't move object from a non-loaded cell (how did you get this object anyway?)");
 
         // Ensure that the object actually exists in the cell
         if (searchViaRefNum(object.getCellRef().getRefNum()).isEmpty())
@@ -424,7 +426,7 @@ namespace MWWorld
             // Special case - object didn't originate in this cell
             // Move it back to its original cell first
             CellStore* originalCell = found->second;
-            assert (originalCell != this);
+            assert(originalCell != this);
             originalCell->moveFrom(object, this);
 
             mMovedHere.erase(found);
@@ -448,15 +450,16 @@ namespace MWWorld
 
     struct MergeVisitor
     {
-        MergeVisitor(std::vector<LiveCellRefBase*>& mergeTo, const std::map<LiveCellRefBase*, MWWorld::CellStore*>& movedHere,
-                     const std::map<LiveCellRefBase*, MWWorld::CellStore*>& movedToAnotherCell)
+        MergeVisitor(std::vector<LiveCellRefBase*>& mergeTo,
+            const std::map<LiveCellRefBase*, MWWorld::CellStore*>& movedHere,
+            const std::map<LiveCellRefBase*, MWWorld::CellStore*>& movedToAnotherCell)
             : mMergeTo(mergeTo)
             , mMovedHere(movedHere)
             , mMovedToAnotherCell(movedToAnotherCell)
         {
         }
 
-        bool operator() (const MWWorld::Ptr& ptr)
+        bool operator()(const MWWorld::Ptr& ptr)
         {
             if (mMovedToAnotherCell.find(ptr.getBase()) != mMovedToAnotherCell.end())
                 return true;
@@ -466,7 +469,7 @@ namespace MWWorld
 
         void merge()
         {
-            for (const auto & [base, _] : mMovedHere)
+            for (const auto& [base, _] : mMovedHere)
                 mMergeTo.push_back(base);
         }
 
@@ -507,14 +510,14 @@ namespace MWWorld
         , mCellStoreImp(std::make_unique<CellStoreImp>())
         , mRechargingItemsUpToDate(false)
     {
-        std::apply([this](auto& ...x) {(CellStoreImp::assignStoreToIndex(*this, x), ...); }, mCellStoreImp->mRefLists);
+        std::apply([this](auto&... x) { (CellStoreImp::assignStoreToIndex(*this, x), ...); }, mCellStoreImp->mRefLists);
         mWaterLevel = cell->mWater;
     }
 
     CellStore::~CellStore() = default;
     CellStore::CellStore(CellStore&&) = default;
 
-    const ESM::Cell *CellStore::getCell() const
+    const ESM::Cell* CellStore::getCell() const
     {
         return mCell;
     }
@@ -524,7 +527,7 @@ namespace MWWorld
         return mState;
     }
 
-    const std::vector<std::string> &CellStore::getPreloadedIds() const
+    const std::vector<std::string>& CellStore::getPreloadedIds() const
     {
         return mIds;
     }
@@ -536,13 +539,13 @@ namespace MWWorld
 
     bool CellStore::hasId(std::string_view id) const
     {
-        if (mState==State_Unloaded)
+        if (mState == State_Unloaded)
             return false;
 
-        if (mState==State_Preloaded)
-            return std::binary_search (mIds.begin(), mIds.end(), id);
+        if (mState == State_Preloaded)
+            return std::binary_search(mIds.begin(), mIds.end(), id);
 
-        return searchConst (id).isEmpty();
+        return searchConst(id).isEmpty();
     }
 
     template <typename PtrType>
@@ -577,20 +580,20 @@ namespace MWWorld
         return searchVisitor.mFound;
     }
 
-    Ptr CellStore::searchViaActorId (int id)
+    Ptr CellStore::searchViaActorId(int id)
     {
-        if (Ptr ptr = ::searchViaActorId (get<ESM::NPC>(), id, this, mMovedToAnotherCell))
+        if (Ptr ptr = ::searchViaActorId(get<ESM::NPC>(), id, this, mMovedToAnotherCell))
             return ptr;
 
-        if (Ptr ptr = ::searchViaActorId (get<ESM::Creature>(), id, this, mMovedToAnotherCell))
+        if (Ptr ptr = ::searchViaActorId(get<ESM::Creature>(), id, this, mMovedToAnotherCell))
             return ptr;
 
         for (const auto& [base, _] : mMovedHere)
         {
-            MWWorld::Ptr actor (base, this);
+            MWWorld::Ptr actor(base, this);
             if (!actor.getClass().isActor())
                 continue;
-            if (actor.getClass().getCreatureStats (actor).matchesActorId (id) && actor.getRefData().getCount() > 0)
+            if (actor.getClass().getCreatureStats(actor).matchesActorId(id) && actor.getRefData().getCount() > 0)
                 return actor;
         }
 
@@ -600,8 +603,12 @@ namespace MWWorld
     class RefNumSearchVisitor
     {
         const ESM::RefNum& mRefNum;
+
     public:
-        RefNumSearchVisitor(const ESM::RefNum& refNum) : mRefNum(refNum) {}
+        RefNumSearchVisitor(const ESM::RefNum& refNum)
+            : mRefNum(refNum)
+        {
+        }
 
         Ptr mFound;
 
@@ -616,7 +623,7 @@ namespace MWWorld
         }
     };
 
-    Ptr CellStore::searchViaRefNum (const ESM::RefNum& refNum)
+    Ptr CellStore::searchViaRefNum(const ESM::RefNum& refNum)
     {
         RefNumSearchVisitor searchVisitor(refNum);
         forEach(searchVisitor);
@@ -630,7 +637,7 @@ namespace MWWorld
         return mWaterLevel;
     }
 
-    void CellStore::setWaterLevel (float level)
+    void CellStore::setWaterLevel(float level)
     {
         mWaterLevel = level;
         mHasState = true;
@@ -641,24 +648,24 @@ namespace MWWorld
         return mMergedRefs.size();
     }
 
-    void CellStore::load ()
+    void CellStore::load()
     {
-        if (mState!=State_Loaded)
+        if (mState != State_Loaded)
         {
-            if (mState==State_Preloaded)
+            if (mState == State_Preloaded)
                 mIds.clear();
 
-            loadRefs ();
+            loadRefs();
 
             mState = State_Loaded;
         }
     }
 
-    void CellStore::preload ()
+    void CellStore::preload()
     {
-        if (mState==State_Unloaded)
+        if (mState == State_Unloaded)
         {
-            listRefs ();
+            listRefs();
 
             mState = State_Preloaded;
         }
@@ -666,7 +673,7 @@ namespace MWWorld
 
     void CellStore::listRefs()
     {
-        assert (mCell);
+        assert(mCell);
 
         if (mCell->mContextList.empty())
             return; // this is a dynamically generated cell -> skipping.
@@ -688,15 +695,17 @@ namespace MWWorld
                 cMRef.mRefNum.mIndex = 0;
                 bool deleted = false;
                 bool moved = false;
-                while (ESM::Cell::getNextRef(*reader, ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyNotMoved))
+                while (ESM::Cell::getNextRef(
+                    *reader, ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyNotMoved))
                 {
                     if (deleted || moved)
                         continue;
 
                     // Don't list reference if it was moved to a different cell.
-                    ESM::MovedCellRefTracker::const_iterator iter =
-                        std::find(mCell->mMovedRefs.begin(), mCell->mMovedRefs.end(), ref.mRefNum);
-                    if (iter != mCell->mMovedRefs.end()) {
+                    ESM::MovedCellRefTracker::const_iterator iter
+                        = std::find(mCell->mMovedRefs.begin(), mCell->mMovedRefs.end(), ref.mRefNum);
+                    if (iter != mCell->mMovedRefs.end())
+                    {
                         continue;
                     }
 
@@ -706,23 +715,24 @@ namespace MWWorld
             }
             catch (std::exception& e)
             {
-                Log(Debug::Error) << "An error occurred listing references for cell " << getCell()->getDescription() << ": " << e.what();
+                Log(Debug::Error) << "An error occurred listing references for cell " << getCell()->getDescription()
+                                  << ": " << e.what();
             }
         }
 
         // List moved references, from separately tracked list.
-        for (const auto& [ref, deleted]: mCell->mLeasedRefs)
+        for (const auto& [ref, deleted] : mCell->mLeasedRefs)
         {
             if (!deleted)
                 mIds.push_back(Misc::StringUtils::lowerCase(ref.mRefID));
         }
 
-        std::sort (mIds.begin(), mIds.end());
+        std::sort(mIds.begin(), mIds.end());
     }
 
     void CellStore::loadRefs()
     {
-        assert (mCell);
+        assert(mCell);
 
         if (mCell->mContextList.empty())
             return; // this is a dynamically generated cell -> skipping.
@@ -747,34 +757,37 @@ namespace MWWorld
                 cMRef.mRefNum.mIndex = 0;
                 bool deleted = false;
                 bool moved = false;
-                while (ESM::Cell::getNextRef(*reader, ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyNotMoved))
+                while (ESM::Cell::getNextRef(
+                    *reader, ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyNotMoved))
                 {
                     if (moved)
                         continue;
 
                     // Don't load reference if it was moved to a different cell.
-                    ESM::MovedCellRefTracker::const_iterator iter =
-                        std::find(mCell->mMovedRefs.begin(), mCell->mMovedRefs.end(), ref.mRefNum);
-                    if (iter != mCell->mMovedRefs.end()) {
+                    ESM::MovedCellRefTracker::const_iterator iter
+                        = std::find(mCell->mMovedRefs.begin(), mCell->mMovedRefs.end(), ref.mRefNum);
+                    if (iter != mCell->mMovedRefs.end())
+                    {
                         continue;
                     }
 
-                    loadRef (ref, deleted, refNumToID);
+                    loadRef(ref, deleted, refNumToID);
                 }
             }
             catch (std::exception& e)
             {
-                Log(Debug::Error) << "An error occurred loading references for cell " << getCell()->getDescription() << ": " << e.what();
+                Log(Debug::Error) << "An error occurred loading references for cell " << getCell()->getDescription()
+                                  << ": " << e.what();
             }
         }
 
         // Load moved references, from separately tracked list.
         for (const auto& leasedRef : mCell->mLeasedRefs)
         {
-            ESM::CellRef &ref = const_cast<ESM::CellRef&>(leasedRef.first);
+            ESM::CellRef& ref = const_cast<ESM::CellRef&>(leasedRef.first);
             bool deleted = leasedRef.second;
 
-            loadRef (ref, deleted, refNumToID);
+            loadRef(ref, deleted, refNumToID);
         }
 
         updateMergedRefs();
@@ -796,13 +809,13 @@ namespace MWWorld
 
         mHasState = true;
 
-        if (Ptr ptr = searchInContainerList (get<ESM::Container>(), id))
+        if (Ptr ptr = searchInContainerList(get<ESM::Container>(), id))
             return ptr;
 
-        if (Ptr ptr = searchInContainerList (get<ESM::Creature>(), id))
+        if (Ptr ptr = searchInContainerList(get<ESM::Creature>(), id))
             return ptr;
 
-        if (Ptr ptr = searchInContainerList (get<ESM::NPC>(), id))
+        if (Ptr ptr = searchInContainerList(get<ESM::NPC>(), id))
             return ptr;
 
         mHasState = oldState;
@@ -810,9 +823,9 @@ namespace MWWorld
         return Ptr();
     }
 
-    void CellStore::loadRef (ESM::CellRef& ref, bool deleted, std::map<ESM::RefNum, std::string>& refNumToID)
+    void CellStore::loadRef(ESM::CellRef& ref, bool deleted, std::map<ESM::RefNum, std::string>& refNumToID)
     {
-        Misc::StringUtils::lowerCaseInPlace (ref.mRefID);
+        Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
 
         const MWWorld::ESMStore& store = mStore;
 
@@ -825,8 +838,9 @@ namespace MWWorld
                 ESM::RecNameInts foundType = static_cast<ESM::RecNameInts>(store.find(it->second));
                 if (foundType != 0)
                 {
-                    Misc::tupleForEach(this->mCellStoreImp->mRefLists,
-                        [&ref, foundType](auto& x) { recNameSwitcher(x, foundType, [&ref](auto& storeIn) { storeIn.remove(ref.mRefNum); }); });
+                    Misc::tupleForEach(this->mCellStoreImp->mRefLists, [&ref, foundType](auto& x) {
+                        recNameSwitcher(x, foundType, [&ref](auto& storeIn) { storeIn.remove(ref.mRefNum); });
+                    });
                 }
             }
         }
@@ -835,16 +849,18 @@ namespace MWWorld
         bool handledType = false;
         if (foundType != 0)
         {
-            Misc::tupleForEach(this->mCellStoreImp->mRefLists, [&ref, &deleted, &store, foundType, &handledType](auto& x) {
-                recNameSwitcher(x, foundType, [&ref, &deleted, &store, &handledType](auto& storeIn) {
-                    handledType = true;
-                    storeIn.load(ref, deleted, store);
+            Misc::tupleForEach(
+                this->mCellStoreImp->mRefLists, [&ref, &deleted, &store, foundType, &handledType](auto& x) {
+                    recNameSwitcher(x, foundType, [&ref, &deleted, &store, &handledType](auto& storeIn) {
+                        handledType = true;
+                        storeIn.load(ref, deleted, store);
+                    });
                 });
-            });
         }
         else
         {
-            Log(Debug::Error) << "Cell reference '" + ref.mRefID + "' not found!"; return;
+            Log(Debug::Error) << "Cell reference '" + ref.mRefID + "' not found!";
+            return;
         }
 
         if (!handledType)
@@ -856,7 +872,7 @@ namespace MWWorld
         refNumToID[ref.mRefNum] = ref.mRefID;
     }
 
-    void CellStore::loadState (const ESM::CellState& state)
+    void CellStore::loadState(const ESM::CellState& state)
     {
         mHasState = true;
 
@@ -866,7 +882,7 @@ namespace MWWorld
         mLastRespawn = MWWorld::TimeStamp(state.mLastRespawn);
     }
 
-    void CellStore::saveState (ESM::CellState& state) const
+    void CellStore::saveState(ESM::CellState& state) const
     {
         state.mId = mCell->getCellId();
 
@@ -877,7 +893,7 @@ namespace MWWorld
         state.mLastRespawn = mLastRespawn.toEsm();
     }
 
-    void CellStore::writeFog(ESM::ESMWriter &writer) const
+    void CellStore::writeFog(ESM::ESMWriter& writer) const
     {
         if (mFogState.get())
         {
@@ -885,15 +901,16 @@ namespace MWWorld
         }
     }
 
-    void CellStore::readFog(ESM::ESMReader &reader)
+    void CellStore::readFog(ESM::ESMReader& reader)
     {
         mFogState = std::make_unique<ESM::FogState>();
         mFogState->load(reader);
     }
 
-    void CellStore::writeReferences (ESM::ESMWriter& writer) const
+    void CellStore::writeReferences(ESM::ESMWriter& writer) const
     {
-        Misc::tupleForEach(this->mCellStoreImp->mRefLists, [&writer](auto& cellRefList) { writeReferenceCollection(writer, cellRefList); });
+        Misc::tupleForEach(this->mCellStoreImp->mRefLists,
+            [&writer](auto& cellRefList) { writeReferenceCollection(writer, cellRefList); });
 
         for (const auto& [base, store] : mMovedToAnotherCell)
         {
@@ -905,14 +922,15 @@ namespace MWWorld
         }
     }
 
-    void CellStore::readReferences (ESM::ESMReader& reader, const std::map<int, int>& contentFileMap, GetCellStoreCallback* callback)
+    void CellStore::readReferences(
+        ESM::ESMReader& reader, const std::map<int, int>& contentFileMap, GetCellStoreCallback* callback)
     {
         mHasState = true;
 
-        while (reader.isNextSub ("OBJE"))
+        while (reader.isNextSub("OBJE"))
         {
             unsigned int unused;
-            reader.getHT (unused);
+            reader.getHT(unused);
 
             // load the RefID first so we know what type of object it is
             ESM::CellRef cref;
@@ -923,7 +941,7 @@ namespace MWWorld
             {
                 Log(Debug::Warning) << "Dropping reference to '" << cref.mRefID << "' (object no longer exists)";
                 // Skip until the next OBJE or MVRF
-                while(reader.hasMoreSubs() && !reader.peekNextSub("OBJE") && !reader.peekNextSub("MVRF"))
+                while (reader.hasMoreSubs() && !reader.peekNextSub("OBJE") && !reader.peekNextSub("MVRF"))
                 {
                     reader.getSubName();
                     reader.skipHSub();
@@ -934,11 +952,13 @@ namespace MWWorld
             if (type != 0)
             {
                 bool foundCorrespondingStore = false;
-                Misc::tupleForEach(this->mCellStoreImp->mRefLists, [&reader, this, &cref, &contentFileMap, &foundCorrespondingStore, type](auto&& x) {
-                    recNameSwitcher(x, static_cast<ESM::RecNameInts>(type), [&reader, this, &cref, &contentFileMap, &foundCorrespondingStore](auto& store) {
-                        foundCorrespondingStore = true;
-                        readReferenceCollection(reader, store, cref, contentFileMap, this);
-                        });
+                Misc::tupleForEach(this->mCellStoreImp->mRefLists,
+                    [&reader, this, &cref, &contentFileMap, &foundCorrespondingStore, type](auto&& x) {
+                        recNameSwitcher(x, static_cast<ESM::RecNameInts>(type),
+                            [&reader, this, &cref, &contentFileMap, &foundCorrespondingStore](auto& store) {
+                                foundCorrespondingStore = true;
+                                readReferenceCollection(reader, store, cref, contentFileMap, this);
+                            });
                     });
 
                 if (!foundCorrespondingStore)
@@ -969,7 +989,8 @@ namespace MWWorld
             Ptr movedRef = searchViaRefNum(refnum);
             if (movedRef.isEmpty())
             {
-                Log(Debug::Warning) << "Warning: Dropping moved ref tag for " << refnum.mIndex << " (moved object no longer exists)";
+                Log(Debug::Warning) << "Warning: Dropping moved ref tag for " << refnum.mIndex
+                                    << " (moved object no longer exists)";
                 continue;
             }
 
@@ -978,9 +999,10 @@ namespace MWWorld
             if (otherCell == nullptr)
             {
                 Log(Debug::Warning) << "Warning: Dropping moved ref tag for " << movedRef.getCellRef().getRefId()
-                                    << " (target cell " << movedTo.mWorldspace << " no longer exists). Reference moved back to its original location.";
-                // Note by dropping tag the object will automatically re-appear in its original cell, though potentially at inapproriate coordinates.
-                // Restore original coordinates:
+                                    << " (target cell " << movedTo.mWorldspace
+                                    << " no longer exists). Reference moved back to its original location.";
+                // Note by dropping tag the object will automatically re-appear in its original cell, though potentially
+                // at inapproriate coordinates. Restore original coordinates:
                 movedRef.getRefData().setPosition(movedRef.getCellRef().getPosition());
                 continue;
             }
@@ -996,14 +1018,14 @@ namespace MWWorld
         }
     }
 
-    bool operator== (const CellStore& left, const CellStore& right)
+    bool operator==(const CellStore& left, const CellStore& right)
     {
-        return left.getCell()->getCellId()==right.getCell()->getCellId();
+        return left.getCell()->getCellId() == right.getCell()->getCellId();
     }
 
-    bool operator!= (const CellStore& left, const CellStore& right)
+    bool operator!=(const CellStore& left, const CellStore& right)
     {
-        return !(left==right);
+        return !(left == right);
     }
 
     void CellStore::setFog(std::unique_ptr<ESM::FogState>&& fog)
@@ -1019,11 +1041,15 @@ namespace MWWorld
     void clearCorpse(const MWWorld::Ptr& ptr)
     {
         const MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
-        static const float fCorpseClearDelay = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fCorpseClearDelay")->mValue.getFloat();
-        if (creatureStats.isDead() &&
-            creatureStats.isDeathAnimationFinished() &&
-            !ptr.getClass().isPersistent(ptr) &&
-            creatureStats.getTimeOfDeath() + fCorpseClearDelay <= MWBase::Environment::get().getWorld()->getTimeStamp())
+        static const float fCorpseClearDelay = MWBase::Environment::get()
+                                                   .getWorld()
+                                                   ->getStore()
+                                                   .get<ESM::GameSetting>()
+                                                   .find("fCorpseClearDelay")
+                                                   ->mValue.getFloat();
+        if (creatureStats.isDead() && creatureStats.isDeathAnimationFinished() && !ptr.getClass().isPersistent(ptr)
+            && creatureStats.getTimeOfDeath() + fCorpseClearDelay
+                <= MWBase::Environment::get().getWorld()->getTimeStamp())
         {
             MWBase::Environment::get().getWorld()->deleteObject(ptr);
         }
@@ -1033,7 +1059,8 @@ namespace MWWorld
     {
         if (mState == State_Loaded)
         {
-            for (CellRefList<ESM::Creature>::List::iterator it (get<ESM::Creature>().mList.begin()); it!=get<ESM::Creature>().mList.end(); ++it)
+            for (CellRefList<ESM::Creature>::List::iterator it(get<ESM::Creature>().mList.begin());
+                 it != get<ESM::Creature>().mList.end(); ++it)
             {
                 Ptr ptr = getCurrentPtr(&*it);
                 if (!ptr.isEmpty() && ptr.getRefData().getCount() > 0)
@@ -1041,7 +1068,8 @@ namespace MWWorld
                     MWBase::Environment::get().getMechanicsManager()->restoreDynamicStats(ptr, hours, true);
                 }
             }
-            for (CellRefList<ESM::NPC>::List::iterator it (get<ESM::NPC>().mList.begin()); it!=get<ESM::NPC>().mList.end(); ++it)
+            for (CellRefList<ESM::NPC>::List::iterator it(get<ESM::NPC>().mList.begin());
+                 it != get<ESM::NPC>().mList.end(); ++it)
             {
                 Ptr ptr = getCurrentPtr(&*it);
                 if (!ptr.isEmpty() && ptr.getRefData().getCount() > 0)
@@ -1059,7 +1087,8 @@ namespace MWWorld
 
         if (mState == State_Loaded)
         {
-            for (CellRefList<ESM::Creature>::List::iterator it (get<ESM::Creature>().mList.begin()); it!=get<ESM::Creature>().mList.end(); ++it)
+            for (CellRefList<ESM::Creature>::List::iterator it(get<ESM::Creature>().mList.begin());
+                 it != get<ESM::Creature>().mList.end(); ++it)
             {
                 Ptr ptr = getCurrentPtr(&*it);
                 if (!ptr.isEmpty() && ptr.getRefData().getCount() > 0)
@@ -1067,7 +1096,8 @@ namespace MWWorld
                     ptr.getClass().getContainerStore(ptr).rechargeItems(duration);
                 }
             }
-            for (CellRefList<ESM::NPC>::List::iterator it (get<ESM::NPC>().mList.begin()); it!=get<ESM::NPC>().mList.end(); ++it)
+            for (CellRefList<ESM::NPC>::List::iterator it(get<ESM::NPC>().mList.begin());
+                 it != get<ESM::NPC>().mList.end(); ++it)
             {
                 Ptr ptr = getCurrentPtr(&*it);
                 if (!ptr.isEmpty() && ptr.getRefData().getCount() > 0)
@@ -1075,11 +1105,12 @@ namespace MWWorld
                     ptr.getClass().getContainerStore(ptr).rechargeItems(duration);
                 }
             }
-            for (CellRefList<ESM::Container>::List::iterator it (get<ESM::Container>().mList.begin()); it!=get<ESM::Container>().mList.end(); ++it)
+            for (CellRefList<ESM::Container>::List::iterator it(get<ESM::Container>().mList.begin());
+                 it != get<ESM::Container>().mList.end(); ++it)
             {
                 Ptr ptr = getCurrentPtr(&*it);
                 if (!ptr.isEmpty() && ptr.getRefData().getCustomData() != nullptr && ptr.getRefData().getCount() > 0
-                && ptr.getClass().getContainerStore(ptr).isResolved())
+                    && ptr.getClass().getContainerStore(ptr).isResolved())
                 {
                     ptr.getClass().getContainerStore(ptr).rechargeItems(duration);
                 }
@@ -1093,30 +1124,39 @@ namespace MWWorld
     {
         if (mState == State_Loaded)
         {
-            static const int iMonthsToRespawn = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("iMonthsToRespawn")->mValue.getInteger();
-            if (MWBase::Environment::get().getWorld()->getTimeStamp() - mLastRespawn > 24*30*iMonthsToRespawn)
+            static const int iMonthsToRespawn = MWBase::Environment::get()
+                                                    .getWorld()
+                                                    ->getStore()
+                                                    .get<ESM::GameSetting>()
+                                                    .find("iMonthsToRespawn")
+                                                    ->mValue.getInteger();
+            if (MWBase::Environment::get().getWorld()->getTimeStamp() - mLastRespawn > 24 * 30 * iMonthsToRespawn)
             {
                 mLastRespawn = MWBase::Environment::get().getWorld()->getTimeStamp();
-                for (CellRefList<ESM::Container>::List::iterator it (get<ESM::Container>().mList.begin()); it!=get<ESM::Container>().mList.end(); ++it)
+                for (CellRefList<ESM::Container>::List::iterator it(get<ESM::Container>().mList.begin());
+                     it != get<ESM::Container>().mList.end(); ++it)
                 {
                     Ptr ptr = getCurrentPtr(&*it);
                     ptr.getClass().respawn(ptr);
                 }
             }
 
-            for (CellRefList<ESM::Creature>::List::iterator it (get<ESM::Creature>().mList.begin()); it!=get<ESM::Creature>().mList.end(); ++it)
+            for (CellRefList<ESM::Creature>::List::iterator it(get<ESM::Creature>().mList.begin());
+                 it != get<ESM::Creature>().mList.end(); ++it)
             {
                 Ptr ptr = getCurrentPtr(&*it);
                 clearCorpse(ptr);
                 ptr.getClass().respawn(ptr);
             }
-            for (CellRefList<ESM::NPC>::List::iterator it (get<ESM::NPC>().mList.begin()); it!=get<ESM::NPC>().mList.end(); ++it)
+            for (CellRefList<ESM::NPC>::List::iterator it(get<ESM::NPC>().mList.begin());
+                 it != get<ESM::NPC>().mList.end(); ++it)
             {
                 Ptr ptr = getCurrentPtr(&*it);
                 clearCorpse(ptr);
                 ptr.getClass().respawn(ptr);
             }
-            for (CellRefList<ESM::CreatureLevList>::List::iterator it (get<ESM::CreatureLevList>().mList.begin()); it!=get<ESM::CreatureLevList>().mList.end(); ++it)
+            for (CellRefList<ESM::CreatureLevList>::List::iterator it(get<ESM::CreatureLevList>().mList.begin());
+                 it != get<ESM::CreatureLevList>().mList.end(); ++it)
             {
                 Ptr ptr = getCurrentPtr(&*it);
                 // no need to clearCorpse, handled as part of get<ESM::Creature>()
@@ -1142,9 +1182,8 @@ namespace MWWorld
     {
         mRechargingItems.clear();
 
-        const auto update = [this](auto& list)
-        {
-            for (auto & item : list)
+        const auto update = [this](auto& list) {
+            for (auto& item : list)
             {
                 Ptr ptr = getCurrentPtr(&item);
                 if (!ptr.isEmpty() && ptr.getRefData().getCount() > 0)
@@ -1166,26 +1205,28 @@ namespace MWWorld
         if (enchantmentId.empty())
             return;
 
-        const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().search(enchantmentId);
+        const ESM::Enchantment* enchantment
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().search(enchantmentId);
         if (!enchantment)
         {
-            Log(Debug::Warning) << "Warning: Can't find enchantment '" << enchantmentId << "' on item " << ptr.getCellRef().getRefId();
+            Log(Debug::Warning) << "Warning: Can't find enchantment '" << enchantmentId << "' on item "
+                                << ptr.getCellRef().getRefId();
             return;
         }
 
         if (enchantment->mData.mType == ESM::Enchantment::WhenUsed
-                || enchantment->mData.mType == ESM::Enchantment::WhenStrikes)
+            || enchantment->mData.mType == ESM::Enchantment::WhenStrikes)
             mRechargingItems.emplace_back(ptr.getBase(), static_cast<float>(enchantment->mData.mCharge));
     }
 
     Ptr MWWorld::CellStore::getMovedActor(int actorId) const
     {
-        for(const auto& [cellRef, cell] : mMovedToAnotherCell)
+        for (const auto& [cellRef, cell] : mMovedToAnotherCell)
         {
-            if(cellRef->mClass->isActor() && cellRef->mData.getCustomData())
+            if (cellRef->mClass->isActor() && cellRef->mData.getCustomData())
             {
                 Ptr actor(cellRef, cell);
-                if(actor.getClass().getCreatureStats(actor).getActorId() == actorId)
+                if (actor.getClass().getCreatureStats(actor).getActorId() == actorId)
                     return actor;
             }
         }
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index 7897d8587c..dc0d6140c3 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -2,23 +2,23 @@
 #define GAME_MWWORLD_CELLSTORE_H
 
 #include <algorithm>
-#include <tuple>
+#include <map>
+#include <memory>
 #include <stdexcept>
 #include <string>
 #include <string_view>
+#include <tuple>
 #include <typeinfo>
-#include <map>
-#include <memory>
 #include <vector>
 
-#include "livecellref.hpp"
 #include "cellreflist.hpp"
+#include "livecellref.hpp"
 
-#include <components/misc/tuplemeta.hpp>
 #include <components/esm3/fogstate.hpp>
+#include <components/misc/tuplemeta.hpp>
 
-#include "timestamp.hpp"
 #include "ptr.hpp"
+#include "timestamp.hpp"
 
 namespace ESM
 {
@@ -55,352 +55,330 @@ namespace MWWorld
     class ESMStore;
     struct CellStoreImp;
 
-    using CellStoreTuple = std::tuple <
-        CellRefList<ESM::Activator>,
-        CellRefList<ESM::Potion>,
-        CellRefList<ESM::Apparatus>,
-        CellRefList<ESM::Armor>,
-        CellRefList<ESM::Book>,
-        CellRefList<ESM::Clothing>,
-        CellRefList<ESM::Container>,
-        CellRefList<ESM::Creature>,
-        CellRefList<ESM::Door>,
-        CellRefList<ESM::Ingredient>,
-        CellRefList<ESM::CreatureLevList>,
-        CellRefList<ESM::ItemLevList>,
-        CellRefList<ESM::Light>,
-        CellRefList<ESM::Lockpick>,
-        CellRefList<ESM::Miscellaneous>,
-        CellRefList<ESM::NPC>,
-        CellRefList<ESM::Probe>,
-        CellRefList<ESM::Repair>,
-        CellRefList<ESM::Static>,
-        CellRefList<ESM::Weapon>,
-        CellRefList<ESM::BodyPart>>;
+    using CellStoreTuple = std::tuple<CellRefList<ESM::Activator>, CellRefList<ESM::Potion>,
+        CellRefList<ESM::Apparatus>, CellRefList<ESM::Armor>, CellRefList<ESM::Book>, CellRefList<ESM::Clothing>,
+        CellRefList<ESM::Container>, CellRefList<ESM::Creature>, CellRefList<ESM::Door>, CellRefList<ESM::Ingredient>,
+        CellRefList<ESM::CreatureLevList>, CellRefList<ESM::ItemLevList>, CellRefList<ESM::Light>,
+        CellRefList<ESM::Lockpick>, CellRefList<ESM::Miscellaneous>, CellRefList<ESM::NPC>, CellRefList<ESM::Probe>,
+        CellRefList<ESM::Repair>, CellRefList<ESM::Static>, CellRefList<ESM::Weapon>, CellRefList<ESM::BodyPart>>;
 
     /// \brief Mutable state of a cell
     class CellStore
     {
         friend struct CellStoreImp;
-        public:
-
-            enum State
-            {
-                State_Unloaded, State_Preloaded, State_Loaded
-            };
-
-        private:
-
-            const MWWorld::ESMStore& mStore;
-            ESM::ReadersCache& mReaders;
-
-            // Even though fog actually belongs to the player and not cells,
-            // it makes sense to store it here since we need it once for each cell.
-            // Note this is nullptr until the cell is explored to save some memory
-            std::unique_ptr<ESM::FogState> mFogState;
-
-            const ESM::Cell *mCell;
-            State mState;
-            bool mHasState;
-            std::vector<std::string> mIds;
-            float mWaterLevel;
-
-            MWWorld::TimeStamp mLastRespawn;
-
-            template<typename T> 
-            static constexpr std::size_t getTypeIndex()
-            {
-                static_assert(Misc::TupleHasType<CellRefList<T>, CellStoreTuple>::value);
-                return Misc::TupleTypeIndex<CellRefList<T>, CellStoreTuple>::value;
-            }
-
-            std::unique_ptr<CellStoreImp>       mCellStoreImp;
-            std::vector<CellRefListBase*>        mCellRefLists;
 
+    public:
+        enum State
+        {
+            State_Unloaded,
+            State_Preloaded,
+            State_Loaded
+        };
+
+    private:
+        const MWWorld::ESMStore& mStore;
+        ESM::ReadersCache& mReaders;
+
+        // Even though fog actually belongs to the player and not cells,
+        // it makes sense to store it here since we need it once for each cell.
+        // Note this is nullptr until the cell is explored to save some memory
+        std::unique_ptr<ESM::FogState> mFogState;
+
+        const ESM::Cell* mCell;
+        State mState;
+        bool mHasState;
+        std::vector<std::string> mIds;
+        float mWaterLevel;
+
+        MWWorld::TimeStamp mLastRespawn;
+
+        template <typename T>
+        static constexpr std::size_t getTypeIndex()
+        {
+            static_assert(Misc::TupleHasType<CellRefList<T>, CellStoreTuple>::value);
+            return Misc::TupleTypeIndex<CellRefList<T>, CellStoreTuple>::value;
+        }
+
+        std::unique_ptr<CellStoreImp> mCellStoreImp;
+        std::vector<CellRefListBase*> mCellRefLists;
+
+        template <class T>
+        CellRefList<T>& get()
+        {
+            mHasState = true;
+            return static_cast<CellRefList<T>&>(*mCellRefLists[getTypeIndex<T>()]);
+        }
+
+        template <class T>
+        const CellRefList<T>& get() const
+        {
+            return static_cast<const CellRefList<T>&>(*mCellRefLists[getTypeIndex<T>()]);
+        }
+
+        typedef std::map<LiveCellRefBase*, MWWorld::CellStore*> MovedRefTracker;
+        // References owned by a different cell that have been moved here.
+        // <reference, cell the reference originally came from>
+        MovedRefTracker mMovedHere;
+        // References owned by this cell that have been moved to another cell.
+        // <reference, cell the reference was moved to>
+        MovedRefTracker mMovedToAnotherCell;
+
+        // Merged list of ref's currently in this cell - i.e. with added refs from mMovedHere, removed refs from
+        // mMovedToAnotherCell
+        std::vector<LiveCellRefBase*> mMergedRefs;
+
+        // Get the Ptr for the given ref which originated from this cell (possibly moved to another cell at this point).
+        Ptr getCurrentPtr(MWWorld::LiveCellRefBase* ref);
+
+        /// Moves object from the given cell to this cell.
+        void moveFrom(const MWWorld::Ptr& object, MWWorld::CellStore* from);
+
+        /// Repopulate mMergedRefs.
+        void updateMergedRefs();
+
+        // (item, max charge)
+        typedef std::vector<std::pair<LiveCellRefBase*, float>> TRechargingItems;
+        TRechargingItems mRechargingItems;
+
+        bool mRechargingItemsUpToDate;
+
+        void updateRechargingItems();
+        void rechargeItems(float duration);
+        void checkItem(const Ptr& ptr);
+
+    public:
+        /// Should this reference be accessible to the outside world (i.e. to scripts / game logic)?
+        /// Determined based on the deletion flags. By default, objects deleted by content files are never accessible;
+        /// objects deleted by setCount(0) are still accessible *if* they came from a content file (needed for vanilla
+        /// scripting compatibility, and the fact that objects may be "un-deleted" in the original game).
+        static bool isAccessible(const MWWorld::RefData& refdata, const MWWorld::CellRef& cref)
+        {
+            return !refdata.isDeletedByContentFile() && (cref.hasContentFile() || refdata.getCount() > 0);
+        }
+
+        /// Moves object from this cell to the given cell.
+        /// @note automatically updates given cell by calling cellToMoveTo->moveFrom(...)
+        /// @note throws exception if cellToMoveTo == this
+        /// @return updated MWWorld::Ptr with the new CellStore pointer set.
+        MWWorld::Ptr moveTo(const MWWorld::Ptr& object, MWWorld::CellStore* cellToMoveTo);
+
+        void rest(double hours);
+        void recharge(float duration);
+
+        /// Make a copy of the given object and insert it into this cell.
+        /// @note If you get a linker error here, this means the given type can not be inserted into a cell.
+        /// The supported types are defined at the bottom of this file.
+        template <typename T>
+        LiveCellRefBase* insert(const LiveCellRef<T>* ref)
+        {
+            mHasState = true;
+            CellRefList<T>& list = get<T>();
+            LiveCellRefBase* ret = &list.insert(*ref);
+            updateMergedRefs();
+            return ret;
+        }
+
+        /// @param readerList The readers to use for loading of the cell on-demand.
+        CellStore(const ESM::Cell* cell, const MWWorld::ESMStore& store, ESM::ReadersCache& readers);
+        CellStore(CellStore&&);
+        ~CellStore();
+
+        const ESM::Cell* getCell() const;
+
+        State getState() const;
+
+        const std::vector<std::string>& getPreloadedIds() const;
+        ///< Get Ids of objects in this cell, only valid in State_Preloaded
+
+        bool hasState() const;
+        ///< Does this cell have state that needs to be stored in a saved game file?
+
+        bool hasId(std::string_view id) const;
+        ///< May return true for deleted IDs when in preload state. Will return false, if cell is
+        /// unloaded.
+        /// @note Will not account for moved references which may exist in Loaded state. Use search() instead if the
+        /// cell is loaded.
+
+        Ptr search(std::string_view id);
+        ///< Will return an empty Ptr if cell is not loaded. Does not check references in
+        /// containers.
+        /// @note Triggers CellStore hasState flag.
+
+        ConstPtr searchConst(std::string_view id) const;
+        ///< Will return an empty Ptr if cell is not loaded. Does not check references in
+        /// containers.
+        /// @note Does not trigger CellStore hasState flag.
+
+        Ptr searchViaActorId(int id);
+        ///< Will return an empty Ptr if cell is not loaded.
+
+        Ptr searchViaRefNum(const ESM::RefNum& refNum);
+        ///< Will return an empty Ptr if cell is not loaded. Does not check references in
+        /// containers.
+        /// @note Triggers CellStore hasState flag.
+
+        float getWaterLevel() const;
+
+        bool movedHere(const MWWorld::Ptr& ptr) const;
+
+        void setWaterLevel(float level);
+
+        void setFog(std::unique_ptr<ESM::FogState>&& fog);
+        ///< \note Takes ownership of the pointer
+
+        ESM::FogState* getFog() const;
+
+        std::size_t count() const;
+        ///< Return total number of references, including deleted ones.
+
+        void load();
+        ///< Load references from content file.
+
+        void preload();
+        ///< Build ID list from content file.
+
+        /// Call visitor (MWWorld::Ptr) for each reference. visitor must return a bool. Returning
+        /// false will abort the iteration.
+        /// \note Prefer using forEachConst when possible.
+        /// \note Do not modify this cell (i.e. remove/add objects) during the forEach, doing this may result in
+        /// unintended behaviour. \attention This function also lists deleted (count 0) objects! \return Iteration
+        /// completed?
+        template <class Visitor>
+        bool forEach(Visitor&& visitor)
+        {
+            if (mState != State_Loaded)
+                return false;
+
+            if (mMergedRefs.empty())
+                return true;
 
-            template <class T>
-            CellRefList<T>& get()
-            {
-                mHasState = true;
-                return static_cast<CellRefList<T>&>(*mCellRefLists[getTypeIndex<T>()]);
-            }
+            mHasState = true;
 
-            template <class T>
-            const CellRefList<T>& get() const
+            for (unsigned int i = 0; i < mMergedRefs.size(); ++i)
             {
-                return static_cast<const CellRefList<T>&>(*mCellRefLists[getTypeIndex<T>()]);
-            }
-
-            typedef std::map<LiveCellRefBase*, MWWorld::CellStore*> MovedRefTracker;
-            // References owned by a different cell that have been moved here.
-            // <reference, cell the reference originally came from>
-            MovedRefTracker mMovedHere;
-            // References owned by this cell that have been moved to another cell.
-            // <reference, cell the reference was moved to>
-            MovedRefTracker mMovedToAnotherCell;
-
-            // Merged list of ref's currently in this cell - i.e. with added refs from mMovedHere, removed refs from mMovedToAnotherCell
-            std::vector<LiveCellRefBase*> mMergedRefs;
-
-            // Get the Ptr for the given ref which originated from this cell (possibly moved to another cell at this point).
-            Ptr getCurrentPtr(MWWorld::LiveCellRefBase* ref);
-
-            /// Moves object from the given cell to this cell.
-            void moveFrom(const MWWorld::Ptr& object, MWWorld::CellStore* from);
-
-            /// Repopulate mMergedRefs.
-            void updateMergedRefs();
-
-            // (item, max charge)
-            typedef std::vector<std::pair<LiveCellRefBase*, float> > TRechargingItems;
-            TRechargingItems mRechargingItems;
+                if (!isAccessible(mMergedRefs[i]->mData, mMergedRefs[i]->mRef))
+                    continue;
 
-            bool mRechargingItemsUpToDate;
-
-            void updateRechargingItems();
-            void rechargeItems(float duration);
-            void checkItem(const Ptr& ptr);
-
-
-        public:
-
-            /// Should this reference be accessible to the outside world (i.e. to scripts / game logic)?
-            /// Determined based on the deletion flags. By default, objects deleted by content files are never accessible;
-            /// objects deleted by setCount(0) are still accessible *if* they came from a content file (needed for vanilla
-            /// scripting compatibility, and the fact that objects may be "un-deleted" in the original game).
-            static bool isAccessible(const MWWorld::RefData& refdata, const MWWorld::CellRef& cref)
-            {
-                return !refdata.isDeletedByContentFile() && (cref.hasContentFile() || refdata.getCount() > 0);
+                if (!visitor(MWWorld::Ptr(mMergedRefs[i], this)))
+                    return false;
             }
-
-            /// Moves object from this cell to the given cell.
-            /// @note automatically updates given cell by calling cellToMoveTo->moveFrom(...)
-            /// @note throws exception if cellToMoveTo == this
-            /// @return updated MWWorld::Ptr with the new CellStore pointer set.
-            MWWorld::Ptr moveTo(const MWWorld::Ptr& object, MWWorld::CellStore* cellToMoveTo);
-
-            void rest(double hours);
-            void recharge(float duration);
-
-            /// Make a copy of the given object and insert it into this cell.
-            /// @note If you get a linker error here, this means the given type can not be inserted into a cell.
-            /// The supported types are defined at the bottom of this file.
-            template <typename T>
-            LiveCellRefBase* insert(const LiveCellRef<T>* ref)
+            return true;
+        }
+
+        /// Call visitor (MWWorld::ConstPtr) for each reference. visitor must return a bool. Returning
+        /// false will abort the iteration.
+        /// \note Do not modify this cell (i.e. remove/add objects) during the forEach, doing this may result in
+        /// unintended behaviour. \attention This function also lists deleted (count 0) objects! \return Iteration
+        /// completed?
+        template <class Visitor>
+        bool forEachConst(Visitor&& visitor) const
+        {
+            if (mState != State_Loaded)
+                return false;
+
+            for (unsigned int i = 0; i < mMergedRefs.size(); ++i)
             {
-                mHasState = true;
-                CellRefList<T>& list = get<T>();
-                LiveCellRefBase* ret = &list.insert(*ref);
-                updateMergedRefs();
-                return ret;
-            }
+                if (!isAccessible(mMergedRefs[i]->mData, mMergedRefs[i]->mRef))
+                    continue;
 
-            /// @param readerList The readers to use for loading of the cell on-demand.
-            CellStore(const ESM::Cell* cell, const MWWorld::ESMStore& store, ESM::ReadersCache& readers);
-            CellStore(CellStore&&);
-            ~CellStore();
-
-            const ESM::Cell *getCell() const;
-
-            State getState() const;
-
-            const std::vector<std::string>& getPreloadedIds() const;
-            ///< Get Ids of objects in this cell, only valid in State_Preloaded
-
-            bool hasState() const;
-            ///< Does this cell have state that needs to be stored in a saved game file?
-
-            bool hasId(std::string_view id) const;
-            ///< May return true for deleted IDs when in preload state. Will return false, if cell is
-            /// unloaded.
-            /// @note Will not account for moved references which may exist in Loaded state. Use search() instead if the cell is loaded.
-
-            Ptr search(std::string_view id);
-            ///< Will return an empty Ptr if cell is not loaded. Does not check references in
-            /// containers.
-            /// @note Triggers CellStore hasState flag.
-
-            ConstPtr searchConst(std::string_view id) const;
-            ///< Will return an empty Ptr if cell is not loaded. Does not check references in
-            /// containers.
-            /// @note Does not trigger CellStore hasState flag.
-
-            Ptr searchViaActorId (int id);
-            ///< Will return an empty Ptr if cell is not loaded.
-
-            Ptr searchViaRefNum (const ESM::RefNum& refNum);
-            ///< Will return an empty Ptr if cell is not loaded. Does not check references in
-            /// containers.
-            /// @note Triggers CellStore hasState flag.
-
-            float getWaterLevel() const;
-
-            bool movedHere(const MWWorld::Ptr& ptr) const;
-
-            void setWaterLevel (float level);
-
-            void setFog(std::unique_ptr<ESM::FogState>&& fog);
-            ///< \note Takes ownership of the pointer
-
-            ESM::FogState* getFog () const;
-
-            std::size_t count() const;
-            ///< Return total number of references, including deleted ones.
-
-            void load ();
-            ///< Load references from content file.
-
-            void preload ();
-            ///< Build ID list from content file.
-
-            /// Call visitor (MWWorld::Ptr) for each reference. visitor must return a bool. Returning
-            /// false will abort the iteration.
-            /// \note Prefer using forEachConst when possible.
-            /// \note Do not modify this cell (i.e. remove/add objects) during the forEach, doing this may result in unintended behaviour.
-            /// \attention This function also lists deleted (count 0) objects!
-            /// \return Iteration completed?
-            template<class Visitor>
-            bool forEach (Visitor&& visitor)
-            {
-                if (mState != State_Loaded)
+                if (!visitor(MWWorld::ConstPtr(mMergedRefs[i], this)))
                     return false;
+            }
+            return true;
+        }
+
+        /// Call visitor (ref) for each reference of given type. visitor must return a bool. Returning
+        /// false will abort the iteration.
+        /// \note Do not modify this cell (i.e. remove/add objects) during the forEach, doing this may result in
+        /// unintended behaviour. \attention This function also lists deleted (count 0) objects! \return Iteration
+        /// completed?
+        template <class T, class Visitor>
+        bool forEachType(Visitor& visitor)
+        {
+            if (mState != State_Loaded)
+                return false;
+
+            if (mMergedRefs.empty())
+                return true;
 
-                if (mMergedRefs.empty())
-                    return true;
-
-                mHasState = true;
-
-                for (unsigned int i=0; i<mMergedRefs.size(); ++i)
-                {
-                    if (!isAccessible(mMergedRefs[i]->mData, mMergedRefs[i]->mRef))
-                        continue;
+            mHasState = true;
 
-                    if (!visitor(MWWorld::Ptr(mMergedRefs[i], this)))
-                        return false;
-                }
-                return true;
-            }
+            CellRefList<T>& list = get<T>();
 
-            /// Call visitor (MWWorld::ConstPtr) for each reference. visitor must return a bool. Returning
-            /// false will abort the iteration.
-            /// \note Do not modify this cell (i.e. remove/add objects) during the forEach, doing this may result in unintended behaviour.
-            /// \attention This function also lists deleted (count 0) objects!
-            /// \return Iteration completed?
-            template<class Visitor>
-            bool forEachConst (Visitor&& visitor) const
+            for (typename CellRefList<T>::List::iterator it(list.mList.begin()); it != list.mList.end(); ++it)
             {
-                if (mState != State_Loaded)
+                LiveCellRefBase* base = &*it;
+                if (mMovedToAnotherCell.find(base) != mMovedToAnotherCell.end())
+                    continue;
+                if (!isAccessible(base->mData, base->mRef))
+                    continue;
+                if (!visitor(MWWorld::Ptr(base, this)))
                     return false;
-
-                for (unsigned int i=0; i<mMergedRefs.size(); ++i)
-                {
-                    if (!isAccessible(mMergedRefs[i]->mData, mMergedRefs[i]->mRef))
-                        continue;
-
-                    if (!visitor(MWWorld::ConstPtr(mMergedRefs[i], this)))
-                        return false;
-                }
-                return true;
             }
 
-
-            /// Call visitor (ref) for each reference of given type. visitor must return a bool. Returning
-            /// false will abort the iteration.
-            /// \note Do not modify this cell (i.e. remove/add objects) during the forEach, doing this may result in unintended behaviour.
-            /// \attention This function also lists deleted (count 0) objects!
-            /// \return Iteration completed?
-            template <class T, class Visitor>
-            bool forEachType(Visitor& visitor)
+            for (MovedRefTracker::const_iterator it = mMovedHere.begin(); it != mMovedHere.end(); ++it)
             {
-                if (mState != State_Loaded)
-                    return false;
-
-                if (mMergedRefs.empty())
-                    return true;
-
-                mHasState = true;
-
-                CellRefList<T>& list = get<T>();
-
-                for (typename CellRefList<T>::List::iterator it (list.mList.begin()); it!=list.mList.end(); ++it)
-                {
-                    LiveCellRefBase* base = &*it;
-                    if (mMovedToAnotherCell.find(base) != mMovedToAnotherCell.end())
-                        continue;
-                    if (!isAccessible(base->mData, base->mRef))
-                        continue;
+                LiveCellRefBase* base = it->first;
+                if (dynamic_cast<LiveCellRef<T>*>(base))
                     if (!visitor(MWWorld::Ptr(base, this)))
                         return false;
-                }
-
-                for (MovedRefTracker::const_iterator it = mMovedHere.begin(); it != mMovedHere.end(); ++it)
-                {
-                    LiveCellRefBase* base = it->first;
-                    if (dynamic_cast<LiveCellRef<T>*>(base))
-                        if (!visitor(MWWorld::Ptr(base, this)))
-                            return false;
-                }
-                return true;
             }
+            return true;
+        }
 
-            // NOTE: does not account for moved references
-            // Should be phased out when we have const version of forEach
-            inline const CellRefList<ESM::Door>& getReadOnlyDoors() const
-            {
-                return get<ESM::Door>();
-            }
-            inline const CellRefList<ESM::Static>& getReadOnlyStatics() const
-            {
-                return get<ESM::Static>();
-            }
+        // NOTE: does not account for moved references
+        // Should be phased out when we have const version of forEach
+        inline const CellRefList<ESM::Door>& getReadOnlyDoors() const { return get<ESM::Door>(); }
+        inline const CellRefList<ESM::Static>& getReadOnlyStatics() const { return get<ESM::Static>(); }
 
-            bool isExterior() const;
+        bool isExterior() const;
 
-            bool isQuasiExterior() const;
+        bool isQuasiExterior() const;
 
-            Ptr searchInContainer(std::string_view id);
+        Ptr searchInContainer(std::string_view id);
 
-            void loadState (const ESM::CellState& state);
+        void loadState(const ESM::CellState& state);
 
-            void saveState (ESM::CellState& state) const;
+        void saveState(ESM::CellState& state) const;
 
-            void writeFog (ESM::ESMWriter& writer) const;
+        void writeFog(ESM::ESMWriter& writer) const;
 
-            void readFog (ESM::ESMReader& reader);
+        void readFog(ESM::ESMReader& reader);
 
-            void writeReferences (ESM::ESMWriter& writer) const;
+        void writeReferences(ESM::ESMWriter& writer) const;
 
-            struct GetCellStoreCallback
-            {
-            public:
-                ///@note must return nullptr if the cell is not found
-                virtual CellStore* getCellStore(const ESM::CellId& cellId) = 0;
-                virtual ~GetCellStoreCallback() = default;
-            };
-
-            /// @param callback to use for retrieving of additional CellStore objects by ID (required for resolving moved references)
-            void readReferences (ESM::ESMReader& reader, const std::map<int, int>& contentFileMap, GetCellStoreCallback* callback);
+        struct GetCellStoreCallback
+        {
+        public:
+            ///@note must return nullptr if the cell is not found
+            virtual CellStore* getCellStore(const ESM::CellId& cellId) = 0;
+            virtual ~GetCellStoreCallback() = default;
+        };
 
-            void respawn ();
-            ///< Check mLastRespawn and respawn references if necessary. This is a no-op if the cell is not loaded.
+        /// @param callback to use for retrieving of additional CellStore objects by ID (required for resolving moved
+        /// references)
+        void readReferences(
+            ESM::ESMReader& reader, const std::map<int, int>& contentFileMap, GetCellStoreCallback* callback);
 
-            Ptr getMovedActor(int actorId) const;
+        void respawn();
+        ///< Check mLastRespawn and respawn references if necessary. This is a no-op if the cell is not loaded.
 
-        private:
+        Ptr getMovedActor(int actorId) const;
 
-            /// Run through references and store IDs
-            void listRefs();
+    private:
+        /// Run through references and store IDs
+        void listRefs();
 
-            void loadRefs();
+        void loadRefs();
 
-            void loadRef (ESM::CellRef& ref, bool deleted, std::map<ESM::RefNum, std::string>& refNumToID);
-            ///< Make case-adjustments to \a ref and insert it into the respective container.
-            ///
-            /// Invalid \a ref objects are silently dropped.
+        void loadRef(ESM::CellRef& ref, bool deleted, std::map<ESM::RefNum, std::string>& refNumToID);
+        ///< Make case-adjustments to \a ref and insert it into the respective container.
+        ///
+        /// Invalid \a ref objects are silently dropped.
     };
 
-    bool operator== (const CellStore& left, const CellStore& right);
-    bool operator!= (const CellStore& left, const CellStore& right);
+    bool operator==(const CellStore& left, const CellStore& right);
+    bool operator!=(const CellStore& left, const CellStore& right);
 }
 
 #endif
diff --git a/apps/openmw/mwworld/cellutils.hpp b/apps/openmw/mwworld/cellutils.hpp
index c827974c35..a7e8e88c78 100644
--- a/apps/openmw/mwworld/cellutils.hpp
+++ b/apps/openmw/mwworld/cellutils.hpp
@@ -11,10 +11,8 @@ namespace MWWorld
 {
     inline osg::Vec2i positionToCellIndex(float x, float y)
     {
-        return {
-            static_cast<int>(std::floor(x / Constants::CellSizeInUnits)),
-            static_cast<int>(std::floor(y / Constants::CellSizeInUnits))
-        };
+        return { static_cast<int>(std::floor(x / Constants::CellSizeInUnits)),
+            static_cast<int>(std::floor(y / Constants::CellSizeInUnits)) };
     }
 }
 
diff --git a/apps/openmw/mwworld/cellvisitors.hpp b/apps/openmw/mwworld/cellvisitors.hpp
index 77f33fa84b..f4d606d02d 100644
--- a/apps/openmw/mwworld/cellvisitors.hpp
+++ b/apps/openmw/mwworld/cellvisitors.hpp
@@ -1,25 +1,24 @@
 #ifndef GAME_MWWORLD_CELLVISITORS_H
 #define GAME_MWWORLD_CELLVISITORS_H
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "ptr.hpp"
 
-
 namespace MWWorld
 {
     struct ListAndResetObjectsVisitor
     {
         std::vector<MWWorld::Ptr> mObjects;
 
-        bool operator() (const MWWorld::Ptr& ptr)
+        bool operator()(const MWWorld::Ptr& ptr)
         {
             if (ptr.getRefData().getBaseNode())
             {
                 ptr.getRefData().setBaseNode(nullptr);
             }
-            mObjects.push_back (ptr);
+            mObjects.push_back(ptr);
 
             return true;
         }
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 46c5bb81ab..0798d72e11 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -3,20 +3,20 @@
 #include <stdexcept>
 
 #include <components/esm/defs.hpp>
-#include <components/esm3/loadsoun.hpp>
 #include <components/esm3/loadench.hpp>
 #include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadsoun.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwworld/esmstore.hpp"
 
-#include "ptr.hpp"
-#include "nullaction.hpp"
-#include "failedaction.hpp"
 #include "actiontake.hpp"
 #include "containerstore.hpp"
+#include "failedaction.hpp"
+#include "nullaction.hpp"
+#include "ptr.hpp"
 
 #include "../mwgui/tooltips.hpp"
 
@@ -30,55 +30,57 @@ namespace MWWorld
         return values;
     }
 
-    void Class::insertObjectRendering (const Ptr& ptr, const std::string& mesh, MWRender::RenderingInterface& renderingInterface) const
+    void Class::insertObjectRendering(
+        const Ptr& ptr, const std::string& mesh, MWRender::RenderingInterface& renderingInterface) const
     {
-
     }
 
-    void Class::insertObject(const Ptr& ptr, const std::string& mesh, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
+    void Class::insertObject(
+        const Ptr& ptr, const std::string& mesh, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
     {
-
     }
 
-    void Class::insertObjectPhysics(const Ptr& ptr, const std::string& mesh, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
-    {}
+    void Class::insertObjectPhysics(
+        const Ptr& ptr, const std::string& mesh, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
+    {
+    }
 
     bool Class::consume(const MWWorld::Ptr& consumable, const MWWorld::Ptr& actor) const
     {
         return false;
     }
 
-    void Class::skillUsageSucceeded (const MWWorld::Ptr& ptr, int skill, int usageType, float extraFactor) const
+    void Class::skillUsageSucceeded(const MWWorld::Ptr& ptr, int skill, int usageType, float extraFactor) const
     {
-        throw std::runtime_error ("class does not represent an actor");
+        throw std::runtime_error("class does not represent an actor");
     }
 
-    bool Class::canSell (const MWWorld::ConstPtr& item, int npcServices) const
+    bool Class::canSell(const MWWorld::ConstPtr& item, int npcServices) const
     {
         return false;
     }
 
-    int Class::getServices(const ConstPtr &actor) const
+    int Class::getServices(const ConstPtr& actor) const
     {
-        throw std::runtime_error ("class does not have services");
+        throw std::runtime_error("class does not have services");
     }
 
-    MWMechanics::CreatureStats& Class::getCreatureStats (const Ptr& ptr) const
+    MWMechanics::CreatureStats& Class::getCreatureStats(const Ptr& ptr) const
     {
-        throw std::runtime_error ("class does not have creature stats");
+        throw std::runtime_error("class does not have creature stats");
     }
 
-    MWMechanics::NpcStats& Class::getNpcStats (const Ptr& ptr) const
+    MWMechanics::NpcStats& Class::getNpcStats(const Ptr& ptr) const
     {
-        throw std::runtime_error ("class does not have NPC stats");
+        throw std::runtime_error("class does not have NPC stats");
     }
 
-    bool Class::hasItemHealth (const ConstPtr& ptr) const
+    bool Class::hasItemHealth(const ConstPtr& ptr) const
     {
         return false;
     }
 
-    int Class::getItemHealth(const ConstPtr &ptr) const
+    int Class::getItemHealth(const ConstPtr& ptr) const
     {
         if (ptr.getCellRef().getCharge() == -1)
             return getItemMaxHealth(ptr);
@@ -86,7 +88,7 @@ namespace MWWorld
             return ptr.getCellRef().getCharge();
     }
 
-    float Class::getItemNormalizedHealth (const ConstPtr& ptr) const
+    float Class::getItemNormalizedHealth(const ConstPtr& ptr) const
     {
         if (getItemMaxHealth(ptr) == 0)
         {
@@ -98,9 +100,9 @@ namespace MWWorld
         }
     }
 
-    int Class::getItemMaxHealth (const ConstPtr& ptr) const
+    int Class::getItemMaxHealth(const ConstPtr& ptr) const
     {
-        throw std::runtime_error ("class does not have item health");
+        throw std::runtime_error("class does not have item health");
     }
 
     bool Class::evaluateHit(const Ptr& ptr, Ptr& victim, osg::Vec3f& hitPosition) const
@@ -108,57 +110,59 @@ namespace MWWorld
         throw std::runtime_error("class cannot hit");
     }
 
-    void Class::hit(const Ptr& ptr, float attackStrength, int type, const Ptr& victim, const osg::Vec3f& hitPosition, bool success) const
+    void Class::hit(const Ptr& ptr, float attackStrength, int type, const Ptr& victim, const osg::Vec3f& hitPosition,
+        bool success) const
     {
         throw std::runtime_error("class cannot hit");
     }
 
-    void Class::block(const Ptr &ptr) const
+    void Class::block(const Ptr& ptr) const
     {
         throw std::runtime_error("class cannot block");
     }
 
-    void Class::onHit(const Ptr& ptr, float damage, bool ishealth, const Ptr& object, const Ptr& attacker, const osg::Vec3f& hitPosition, bool successful) const
+    void Class::onHit(const Ptr& ptr, float damage, bool ishealth, const Ptr& object, const Ptr& attacker,
+        const osg::Vec3f& hitPosition, bool successful) const
     {
         throw std::runtime_error("class cannot be hit");
     }
 
-    std::unique_ptr<Action> Class::activate (const Ptr& ptr, const Ptr& actor) const
+    std::unique_ptr<Action> Class::activate(const Ptr& ptr, const Ptr& actor) const
     {
         return std::make_unique<NullAction>();
     }
 
-    std::unique_ptr<Action> Class::use (const Ptr& ptr, bool force) const
+    std::unique_ptr<Action> Class::use(const Ptr& ptr, bool force) const
     {
         return std::make_unique<NullAction>();
     }
 
-    ContainerStore& Class::getContainerStore (const Ptr& ptr) const
+    ContainerStore& Class::getContainerStore(const Ptr& ptr) const
     {
-        throw std::runtime_error ("class does not have a container store");
+        throw std::runtime_error("class does not have a container store");
     }
 
-    InventoryStore& Class::getInventoryStore (const Ptr& ptr) const
+    InventoryStore& Class::getInventoryStore(const Ptr& ptr) const
     {
-        throw std::runtime_error ("class does not have an inventory store");
+        throw std::runtime_error("class does not have an inventory store");
     }
 
-    bool Class::hasInventoryStore(const Ptr &ptr) const
+    bool Class::hasInventoryStore(const Ptr& ptr) const
     {
         return false;
     }
 
-    bool Class::canLock(const ConstPtr &ptr) const
+    bool Class::canLock(const ConstPtr& ptr) const
     {
         return false;
     }
 
-    void Class::setRemainingUsageTime (const Ptr& ptr, float duration) const
+    void Class::setRemainingUsageTime(const Ptr& ptr, float duration) const
     {
-        throw std::runtime_error ("class does not support time-based uses");
+        throw std::runtime_error("class does not support time-based uses");
     }
 
-    float Class::getRemainingUsageTime (const ConstPtr& ptr) const
+    float Class::getRemainingUsageTime(const ConstPtr& ptr) const
     {
         return -1;
     }
@@ -168,90 +172,90 @@ namespace MWWorld
         return {};
     }
 
-    float Class::getMaxSpeed (const Ptr& ptr) const
+    float Class::getMaxSpeed(const Ptr& ptr) const
     {
         return 0;
     }
-    
-    float Class::getCurrentSpeed (const Ptr& ptr) const
+
+    float Class::getCurrentSpeed(const Ptr& ptr) const
     {
         return 0;
     }
 
-    float Class::getJump (const Ptr& ptr) const
+    float Class::getJump(const Ptr& ptr) const
     {
         return 0;
     }
 
-    int Class::getEnchantmentPoints (const MWWorld::ConstPtr& ptr) const
+    int Class::getEnchantmentPoints(const MWWorld::ConstPtr& ptr) const
     {
-        throw std::runtime_error ("class does not support enchanting");
+        throw std::runtime_error("class does not support enchanting");
     }
 
-    MWMechanics::Movement& Class::getMovementSettings (const Ptr& ptr) const
+    MWMechanics::Movement& Class::getMovementSettings(const Ptr& ptr) const
     {
-        throw std::runtime_error ("movement settings not supported by class");
+        throw std::runtime_error("movement settings not supported by class");
     }
 
-    osg::Vec3f Class::getRotationVector (const Ptr& ptr) const
+    osg::Vec3f Class::getRotationVector(const Ptr& ptr) const
     {
-        return osg::Vec3f (0, 0, 0);
+        return osg::Vec3f(0, 0, 0);
     }
 
-    std::pair<std::vector<int>, bool> Class::getEquipmentSlots (const ConstPtr& ptr) const
+    std::pair<std::vector<int>, bool> Class::getEquipmentSlots(const ConstPtr& ptr) const
     {
-        return std::make_pair (std::vector<int>(), false);
+        return std::make_pair(std::vector<int>(), false);
     }
 
-    int Class::getEquipmentSkill (const ConstPtr& ptr) const
+    int Class::getEquipmentSkill(const ConstPtr& ptr) const
     {
         return -1;
     }
 
-    int Class::getValue (const ConstPtr& ptr) const
+    int Class::getValue(const ConstPtr& ptr) const
     {
-        throw std::logic_error ("value not supported by this class");
+        throw std::logic_error("value not supported by this class");
     }
 
-    float Class::getCapacity (const MWWorld::Ptr& ptr) const
+    float Class::getCapacity(const MWWorld::Ptr& ptr) const
     {
-        throw std::runtime_error ("capacity not supported by this class");
+        throw std::runtime_error("capacity not supported by this class");
     }
 
-    float Class::getWeight(const ConstPtr &ptr) const
+    float Class::getWeight(const ConstPtr& ptr) const
     {
-        throw std::runtime_error ("weight not supported by this class");
+        throw std::runtime_error("weight not supported by this class");
     }
 
-    float Class::getEncumbrance (const MWWorld::Ptr& ptr) const
+    float Class::getEncumbrance(const MWWorld::Ptr& ptr) const
     {
-        throw std::runtime_error ("encumbrance not supported by class");
+        throw std::runtime_error("encumbrance not supported by class");
     }
 
-    bool Class::isEssential (const MWWorld::ConstPtr& ptr) const
+    bool Class::isEssential(const MWWorld::ConstPtr& ptr) const
     {
         return false;
     }
 
-    float Class::getArmorRating (const MWWorld::Ptr& ptr) const
+    float Class::getArmorRating(const MWWorld::Ptr& ptr) const
     {
         throw std::runtime_error("Class does not support armor rating");
     }
 
-    const Class& Class::get (unsigned int key)
+    const Class& Class::get(unsigned int key)
     {
         const auto& classes = getClasses();
         auto iter = classes.find(key);
 
         if (iter == classes.end())
-            throw std::logic_error ("Class::get(): unknown class key: " + std::to_string(key));
+            throw std::logic_error("Class::get(): unknown class key: " + std::to_string(key));
 
         return *iter->second;
     }
 
-    bool Class::isPersistent(const ConstPtr &ptr) const
+    bool Class::isPersistent(const ConstPtr& ptr) const
     {
-        throw std::runtime_error ("class does not support persistence");
+        throw std::runtime_error("class does not support persistence");
     }
 
     void Class::registerClass(Class& instance)
@@ -259,14 +263,14 @@ namespace MWWorld
         getClasses().emplace(instance.getType(), &instance);
     }
 
-    std::string_view Class::getUpSoundId (const ConstPtr& ptr) const
+    std::string_view Class::getUpSoundId(const ConstPtr& ptr) const
     {
-        throw std::runtime_error ("class does not have an up sound");
+        throw std::runtime_error("class does not have an up sound");
     }
 
-    std::string_view Class::getDownSoundId (const ConstPtr& ptr) const
+    std::string_view Class::getDownSoundId(const ConstPtr& ptr) const
     {
-        throw std::runtime_error ("class does not have an down sound");
+        throw std::runtime_error("class does not have an down sound");
     }
 
     std::string_view Class::getSoundIdFromSndGen(const Ptr& ptr, std::string_view type) const
@@ -276,15 +280,15 @@ namespace MWWorld
 
     const std::string& Class::getInventoryIcon(const MWWorld::ConstPtr& ptr) const
     {
-        throw std::runtime_error ("class does not have any inventory icon");
+        throw std::runtime_error("class does not have any inventory icon");
     }
 
-    MWGui::ToolTipInfo Class::getToolTipInfo (const ConstPtr& ptr, int count) const
+    MWGui::ToolTipInfo Class::getToolTipInfo(const ConstPtr& ptr, int count) const
     {
-        throw std::runtime_error ("class does not have a tool tip");
+        throw std::runtime_error("class does not have a tool tip");
     }
 
-    bool Class::showsInInventory (const ConstPtr& ptr) const
+    bool Class::showsInInventory(const ConstPtr& ptr) const
     {
         // NOTE: Don't show WerewolfRobe objects in the inventory, or allow them to be taken.
         // Vanilla likely uses a hack like this since there's no other way to prevent it from
@@ -292,7 +296,7 @@ namespace MWWorld
         return (ptr.getCellRef().getRefId() != "werewolfrobe");
     }
 
-    bool Class::hasToolTip (const ConstPtr& ptr) const
+    bool Class::hasToolTip(const ConstPtr& ptr) const
     {
         return true;
     }
@@ -302,11 +306,9 @@ namespace MWWorld
         return {};
     }
 
-    void Class::adjustScale(const MWWorld::ConstPtr& ptr, osg::Vec3f& scale, bool rendering) const
-    {
-    }
+    void Class::adjustScale(const MWWorld::ConstPtr& ptr, osg::Vec3f& scale, bool rendering) const {}
 
-    std::string Class::getModel(const MWWorld::ConstPtr &ptr) const
+    std::string Class::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return {};
     }
@@ -316,40 +318,40 @@ namespace MWWorld
         return false;
     }
 
-    void Class::getModelsToPreload(const Ptr &ptr, std::vector<std::string> &models) const
+    void Class::getModelsToPreload(const Ptr& ptr, std::vector<std::string>& models) const
     {
         std::string model = getModel(ptr);
         if (!model.empty())
             models.push_back(model);
     }
 
-    const std::string& Class::applyEnchantment(const MWWorld::ConstPtr& ptr, const std::string& enchId, int enchCharge, const std::string& newName) const
+    const std::string& Class::applyEnchantment(
+        const MWWorld::ConstPtr& ptr, const std::string& enchId, int enchCharge, const std::string& newName) const
     {
-        throw std::runtime_error ("class can't be enchanted");
+        throw std::runtime_error("class can't be enchanted");
     }
 
     std::pair<int, std::string_view> Class::canBeEquipped(const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& npc) const
     {
-        return {1, {}};
+        return { 1, {} };
     }
 
-    void Class::adjustPosition(const MWWorld::Ptr& ptr, bool force) const
-    {
-    }
+    void Class::adjustPosition(const MWWorld::Ptr& ptr, bool force) const {}
 
-    std::unique_ptr<Action> Class::defaultItemActivate(const Ptr &ptr, const Ptr &actor) const
+    std::unique_ptr<Action> Class::defaultItemActivate(const Ptr& ptr, const Ptr& actor) const
     {
-        if(!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
+        if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
             return std::make_unique<NullAction>();
 
-        if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
+        if (actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
-            const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
+            const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-            const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfItem", prng);
+            const ESM::Sound* sound = store.get<ESM::Sound>().searchRandom("WolfItem", prng);
 
             std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::FailedAction>("#{sWerewolfRefusal}");
-            if(sound) action->setSound(sound->mId);
+            if (sound)
+                action->setSound(sound->mId);
 
             return action;
         }
@@ -360,14 +362,12 @@ namespace MWWorld
         return action;
     }
 
-    MWWorld::Ptr
-    Class::copyToCellImpl(const ConstPtr &ptr, CellStore &cell) const
+    MWWorld::Ptr Class::copyToCellImpl(const ConstPtr& ptr, CellStore& cell) const
     {
         throw std::runtime_error("unable to copy class to cell");
     }
 
-    MWWorld::Ptr
-    Class::copyToCell(const ConstPtr &ptr, CellStore &cell, int count) const
+    MWWorld::Ptr Class::copyToCell(const ConstPtr& ptr, CellStore& cell, int count) const
     {
         Ptr newPtr = copyToCellImpl(ptr, cell);
         newPtr.getCellRef().unsetRefNum(); // This RefNum is only valid within the original cell of the reference
@@ -375,8 +375,7 @@ namespace MWWorld
         return newPtr;
     }
 
-    MWWorld::Ptr
-    Class::copyToCell(const ConstPtr &ptr, CellStore &cell, const ESM::Position &pos, int count) const
+    MWWorld::Ptr Class::copyToCell(const ConstPtr& ptr, CellStore& cell, const ESM::Position& pos, int count) const
     {
         Ptr newPtr = copyToCell(ptr, cell, count);
         newPtr.getRefData().setPosition(pos);
@@ -384,48 +383,39 @@ namespace MWWorld
         return newPtr;
     }
 
-    bool Class::isBipedal(const ConstPtr &ptr) const
+    bool Class::isBipedal(const ConstPtr& ptr) const
     {
         return false;
     }
 
-    bool Class::canFly(const ConstPtr &ptr) const
+    bool Class::canFly(const ConstPtr& ptr) const
     {
         return false;
     }
 
-    bool Class::canSwim(const ConstPtr &ptr) const
+    bool Class::canSwim(const ConstPtr& ptr) const
     {
         return false;
     }
 
-    bool Class::canWalk(const ConstPtr &ptr) const
+    bool Class::canWalk(const ConstPtr& ptr) const
     {
         return false;
     }
 
     bool Class::isPureWaterCreature(const ConstPtr& ptr) const
     {
-        return canSwim(ptr)
-                && !isBipedal(ptr)
-                && !canFly(ptr)
-                && !canWalk(ptr);
+        return canSwim(ptr) && !isBipedal(ptr) && !canFly(ptr) && !canWalk(ptr);
     }
 
     bool Class::isPureFlyingCreature(const ConstPtr& ptr) const
     {
-        return canFly(ptr)
-                && !isBipedal(ptr)
-                && !canSwim(ptr)
-                && !canWalk(ptr);
+        return canFly(ptr) && !isBipedal(ptr) && !canSwim(ptr) && !canWalk(ptr);
     }
 
     bool Class::isPureLandCreature(const Ptr& ptr) const
     {
-        return canWalk(ptr)
-                && !isBipedal(ptr)
-                && !canFly(ptr)
-                && !canSwim(ptr);
+        return canWalk(ptr) && !isBipedal(ptr) && !canFly(ptr) && !canSwim(ptr);
     }
 
     bool Class::isMobile(const MWWorld::Ptr& ptr) const
@@ -438,14 +428,14 @@ namespace MWWorld
         throw std::runtime_error("class does not support skills");
     }
 
-    int Class::getBloodTexture (const MWWorld::ConstPtr& ptr) const
+    int Class::getBloodTexture(const MWWorld::ConstPtr& ptr) const
     {
         throw std::runtime_error("class does not support gore");
     }
 
-    void Class::readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const {}
+    void Class::readAdditionalState(const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const {}
 
-    void Class::writeAdditionalState (const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const {}
+    void Class::writeAdditionalState(const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const {}
 
     int Class::getBaseGold(const MWWorld::ConstPtr& ptr) const
     {
@@ -457,17 +447,17 @@ namespace MWWorld
         return false;
     }
 
-    MWWorld::DoorState Class::getDoorState (const MWWorld::ConstPtr &ptr) const
+    MWWorld::DoorState Class::getDoorState(const MWWorld::ConstPtr& ptr) const
     {
         throw std::runtime_error("this is not a door");
     }
 
-    void Class::setDoorState (const MWWorld::Ptr &ptr, MWWorld::DoorState state) const
+    void Class::setDoorState(const MWWorld::Ptr& ptr, MWWorld::DoorState state) const
     {
         throw std::runtime_error("this is not a door");
     }
 
-    float Class::getNormalizedEncumbrance(const Ptr &ptr) const
+    float Class::getNormalizedEncumbrance(const Ptr& ptr) const
     {
         float capacity = getCapacity(ptr);
         float encumbrance = getEncumbrance(ptr);
@@ -483,10 +473,10 @@ namespace MWWorld
 
     std::string_view Class::getSound(const MWWorld::ConstPtr&) const
     {
-      return {};
+        return {};
     }
 
-    int Class::getBaseFightRating(const ConstPtr &ptr) const
+    int Class::getBaseFightRating(const ConstPtr& ptr) const
     {
         throw std::runtime_error("class does not support fight rating");
     }
@@ -495,30 +485,32 @@ namespace MWWorld
     {
         return {};
     }
-    int Class::getPrimaryFactionRank (const MWWorld::ConstPtr& ptr) const
+    int Class::getPrimaryFactionRank(const MWWorld::ConstPtr& ptr) const
     {
         return -1;
     }
 
-    float Class::getEffectiveArmorRating(const ConstPtr &armor, const Ptr &actor) const
+    float Class::getEffectiveArmorRating(const ConstPtr& armor, const Ptr& actor) const
     {
         throw std::runtime_error("class does not support armor ratings");
     }
 
     osg::Vec4f Class::getEnchantmentColor(const MWWorld::ConstPtr& item) const
     {
-        osg::Vec4f result(1,1,1,1);
+        osg::Vec4f result(1, 1, 1, 1);
         std::string_view enchantmentName = item.getClass().getEnchantment(item);
         if (enchantmentName.empty())
             return result;
 
-        const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().search(enchantmentName);
+        const ESM::Enchantment* enchantment
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().search(enchantmentName);
         if (!enchantment)
             return result;
 
-        assert (enchantment->mEffects.mList.size());
+        assert(enchantment->mEffects.mList.size());
 
-        const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().search(
+        const ESM::MagicEffect* magicEffect
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().search(
                 enchantment->mEffects.mList.front().mEffectID);
         if (!magicEffect)
             return result;
@@ -531,12 +523,12 @@ namespace MWWorld
 
     void Class::setBaseAISetting(const std::string& id, MWMechanics::AiSetting setting, int value) const
     {
-        throw std::runtime_error ("class does not have creature stats");
+        throw std::runtime_error("class does not have creature stats");
     }
 
     void Class::modifyBaseInventory(std::string_view actorId, std::string_view itemId, int amount) const
     {
-        throw std::runtime_error ("class does not have an inventory store");
+        throw std::runtime_error("class does not have an inventory store");
     }
 
     float Class::getWalkSpeed(const Ptr& /*ptr*/) const
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 7921cda0dc..a48cf90e4b 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -9,8 +9,8 @@
 #include <osg/Quat>
 #include <osg/Vec4f>
 
-#include "ptr.hpp"
 #include "doorstate.hpp"
+#include "ptr.hpp"
 
 #include "../mwmechanics/aisetting.hpp"
 
@@ -56,321 +56,320 @@ namespace MWWorld
     /// \brief Base class for referenceable esm records
     class Class
     {
-            const unsigned mType;
-
-            static std::map<unsigned, Class*>& getClasses();
-
-        protected:
-
-            explicit Class(unsigned type) : mType(type) {}
+        const unsigned mType;
 
-            std::unique_ptr<Action> defaultItemActivate(const Ptr &ptr, const Ptr &actor) const;
-            ///< Generate default action for activating inventory items
+        static std::map<unsigned, Class*>& getClasses();
+
+    protected:
+        explicit Class(unsigned type)
+            : mType(type)
+        {
+        }
 
-            virtual Ptr copyToCellImpl(const ConstPtr &ptr, CellStore &cell) const;
+        std::unique_ptr<Action> defaultItemActivate(const Ptr& ptr, const Ptr& actor) const;
+        ///< Generate default action for activating inventory items
 
-        public:
+        virtual Ptr copyToCellImpl(const ConstPtr& ptr, CellStore& cell) const;
 
-            virtual ~Class() = default;
-            Class (const Class&) = delete;
-            Class& operator= (const Class&) = delete;
+    public:
+        virtual ~Class() = default;
+        Class(const Class&) = delete;
+        Class& operator=(const Class&) = delete;
 
-            unsigned int getType() const {
-                return mType;
-            }
+        unsigned int getType() const { return mType; }
 
-            virtual void insertObjectRendering (const Ptr& ptr, const std::string& mesh, MWRender::RenderingInterface& renderingInterface) const;
-            virtual void insertObject(const Ptr& ptr, const std::string& mesh, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const;
-            ///< Add reference into a cell for rendering (default implementation: don't render anything).
-            virtual void insertObjectPhysics(const Ptr& ptr, const std::string& mesh, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const;
+        virtual void insertObjectRendering(
+            const Ptr& ptr, const std::string& mesh, MWRender::RenderingInterface& renderingInterface) const;
+        virtual void insertObject(const Ptr& ptr, const std::string& mesh, const osg::Quat& rotation,
+            MWPhysics::PhysicsSystem& physics) const;
+        ///< Add reference into a cell for rendering (default implementation: don't render anything).
+        virtual void insertObjectPhysics(const Ptr& ptr, const std::string& mesh, const osg::Quat& rotation,
+            MWPhysics::PhysicsSystem& physics) const;
 
-            virtual std::string_view getName(const ConstPtr& ptr) const = 0;
-            ///< \return name or ID; can return an empty string.
+        virtual std::string_view getName(const ConstPtr& ptr) const = 0;
+        ///< \return name or ID; can return an empty string.
 
-            virtual void adjustPosition(const MWWorld::Ptr& ptr, bool force) const;
-            ///< Adjust position to stand on ground. Must be called post model load
-            /// @param force do this even if the ptr is flying
+        virtual void adjustPosition(const MWWorld::Ptr& ptr, bool force) const;
+        ///< Adjust position to stand on ground. Must be called post model load
+        /// @param force do this even if the ptr is flying
 
-            virtual MWMechanics::CreatureStats& getCreatureStats (const Ptr& ptr) const;
-            ///< Return creature stats or throw an exception, if class does not have creature stats
-            /// (default implementation: throw an exception)
+        virtual MWMechanics::CreatureStats& getCreatureStats(const Ptr& ptr) const;
+        ///< Return creature stats or throw an exception, if class does not have creature stats
+        /// (default implementation: throw an exception)
 
-            virtual bool hasToolTip (const ConstPtr& ptr) const;
-            ///< @return true if this object has a tooltip when focused (default implementation: true)
+        virtual bool hasToolTip(const ConstPtr& ptr) const;
+        ///< @return true if this object has a tooltip when focused (default implementation: true)
 
-            virtual MWGui::ToolTipInfo getToolTipInfo (const ConstPtr& ptr, int count) const;
-            ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
+        virtual MWGui::ToolTipInfo getToolTipInfo(const ConstPtr& ptr, int count) const;
+        ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
-            virtual bool showsInInventory (const ConstPtr& ptr) const;
-            ///< Return whether ptr shows in inventory views.
-            /// Hidden items are not displayed and cannot be (re)moved by the user.
-            /// \return True if shown, false if hidden.
+        virtual bool showsInInventory(const ConstPtr& ptr) const;
+        ///< Return whether ptr shows in inventory views.
+        /// Hidden items are not displayed and cannot be (re)moved by the user.
+        /// \return True if shown, false if hidden.
 
-            virtual MWMechanics::NpcStats& getNpcStats (const Ptr& ptr) const;
-            ///< Return NPC stats or throw an exception, if class does not have NPC stats
-            /// (default implementation: throw an exception)
+        virtual MWMechanics::NpcStats& getNpcStats(const Ptr& ptr) const;
+        ///< Return NPC stats or throw an exception, if class does not have NPC stats
+        /// (default implementation: throw an exception)
 
-            virtual bool hasItemHealth (const ConstPtr& ptr) const;
-            ///< \return Item health data available? (default implementation: false)
+        virtual bool hasItemHealth(const ConstPtr& ptr) const;
+        ///< \return Item health data available? (default implementation: false)
 
-            virtual int getItemHealth (const ConstPtr& ptr) const;
-            ///< Return current item health or throw an exception if class does not have item health
+        virtual int getItemHealth(const ConstPtr& ptr) const;
+        ///< Return current item health or throw an exception if class does not have item health
 
-            virtual float getItemNormalizedHealth (const ConstPtr& ptr) const;
-            ///< Return current item health re-scaled to maximum health
+        virtual float getItemNormalizedHealth(const ConstPtr& ptr) const;
+        ///< Return current item health re-scaled to maximum health
 
-            virtual int getItemMaxHealth (const ConstPtr& ptr) const;
-            ///< Return item max health or throw an exception, if class does not have item health
-            /// (default implementation: throw an exception)
+        virtual int getItemMaxHealth(const ConstPtr& ptr) const;
+        ///< Return item max health or throw an exception, if class does not have item health
+        /// (default implementation: throw an exception)
 
-            virtual bool evaluateHit(const Ptr& ptr, Ptr& victim, osg::Vec3f& hitPosition) const;
-            ///< Evaluate the victim of a melee hit produced by ptr in the current circumstances and return dice roll success.
-            /// (default implementation: throw an exception)
+        virtual bool evaluateHit(const Ptr& ptr, Ptr& victim, osg::Vec3f& hitPosition) const;
+        ///< Evaluate the victim of a melee hit produced by ptr in the current circumstances and return dice roll
+        ///< success.
+        /// (default implementation: throw an exception)
 
-            virtual void hit(const Ptr& ptr, float attackStrength, int type=-1, const Ptr& victim = Ptr(), const osg::Vec3f& hitPosition = osg::Vec3f(), bool success = false) const;
-            ///< Execute a melee hit on the victim at hitPosition, using the current weapon. If the hit was successful, apply damage and process corresponding events.
-            /// \param attackStrength how long the attack was charged for, a value in 0-1 range.
-            /// \param type - type of attack, one of the MWMechanics::CreatureStats::AttackType
-            ///               enums. ignored for creature attacks.
-            /// (default implementation: throw an exception)
+        virtual void hit(const Ptr& ptr, float attackStrength, int type = -1, const Ptr& victim = Ptr(),
+            const osg::Vec3f& hitPosition = osg::Vec3f(), bool success = false) const;
+        ///< Execute a melee hit on the victim at hitPosition, using the current weapon. If the hit was successful,
+        ///< apply damage and process corresponding events.
+        /// \param attackStrength how long the attack was charged for, a value in 0-1 range.
+        /// \param type - type of attack, one of the MWMechanics::CreatureStats::AttackType
+        ///               enums. ignored for creature attacks.
+        /// (default implementation: throw an exception)
 
-            virtual void onHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object, const MWWorld::Ptr &attacker, const osg::Vec3f &hitPosition, bool successful) const;
-            ///< Alerts \a ptr that it's being hit for \a damage points to health if \a ishealth is
-            /// true (else fatigue) by \a object (sword, arrow, etc). \a attacker specifies the
-            /// actor responsible for the attack, and \a successful specifies if the hit is
-            /// successful or not.
+        virtual void onHit(const MWWorld::Ptr& ptr, float damage, bool ishealth, const MWWorld::Ptr& object,
+            const MWWorld::Ptr& attacker, const osg::Vec3f& hitPosition, bool successful) const;
+        ///< Alerts \a ptr that it's being hit for \a damage points to health if \a ishealth is
+        /// true (else fatigue) by \a object (sword, arrow, etc). \a attacker specifies the
+        /// actor responsible for the attack, and \a successful specifies if the hit is
+        /// successful or not.
 
-            virtual void block (const Ptr& ptr) const;
-            ///< Play the appropriate sound for a blocked attack, depending on the currently equipped shield
-            /// (default implementation: throw an exception)
+        virtual void block(const Ptr& ptr) const;
+        ///< Play the appropriate sound for a blocked attack, depending on the currently equipped shield
+        /// (default implementation: throw an exception)
 
-            virtual std::unique_ptr<Action> activate (const Ptr& ptr, const Ptr& actor) const;
-            ///< Generate action for activation (default implementation: return a null action).
+        virtual std::unique_ptr<Action> activate(const Ptr& ptr, const Ptr& actor) const;
+        ///< Generate action for activation (default implementation: return a null action).
 
-            virtual std::unique_ptr<Action> use (const Ptr& ptr, bool force=false)
-                const;
-            ///< Generate action for using via inventory menu (default implementation: return a
-            /// null action).
+        virtual std::unique_ptr<Action> use(const Ptr& ptr, bool force = false) const;
+        ///< Generate action for using via inventory menu (default implementation: return a
+        /// null action).
 
-            virtual ContainerStore& getContainerStore (const Ptr& ptr) const;
-            ///< Return container store or throw an exception, if class does not have a
-            /// container store (default implementation: throw an exception)
+        virtual ContainerStore& getContainerStore(const Ptr& ptr) const;
+        ///< Return container store or throw an exception, if class does not have a
+        /// container store (default implementation: throw an exception)
 
-            virtual InventoryStore& getInventoryStore (const Ptr& ptr) const;
-            ///< Return inventory store or throw an exception, if class does not have a
-            /// inventory store (default implementation: throw an exception)
+        virtual InventoryStore& getInventoryStore(const Ptr& ptr) const;
+        ///< Return inventory store or throw an exception, if class does not have a
+        /// inventory store (default implementation: throw an exception)
 
-            virtual bool hasInventoryStore (const Ptr& ptr) const;
-            ///< Does this object have an inventory store, i.e. equipment slots? (default implementation: false)
+        virtual bool hasInventoryStore(const Ptr& ptr) const;
+        ///< Does this object have an inventory store, i.e. equipment slots? (default implementation: false)
 
-            virtual bool canLock (const ConstPtr& ptr) const;
+        virtual bool canLock(const ConstPtr& ptr) const;
 
-            virtual void setRemainingUsageTime (const Ptr& ptr, float duration) const;
-            ///< Sets the remaining duration of the object, such as an equippable light
-            /// source. (default implementation: throw an exception)
+        virtual void setRemainingUsageTime(const Ptr& ptr, float duration) const;
+        ///< Sets the remaining duration of the object, such as an equippable light
+        /// source. (default implementation: throw an exception)
 
-            virtual float getRemainingUsageTime (const ConstPtr& ptr) const;
-            ///< Returns the remaining duration of the object, such as an equippable light
-            /// source. (default implementation: -1, i.e. infinite)
+        virtual float getRemainingUsageTime(const ConstPtr& ptr) const;
+        ///< Returns the remaining duration of the object, such as an equippable light
+        /// source. (default implementation: -1, i.e. infinite)
 
-            virtual std::string_view getScript(const ConstPtr& ptr) const;
-            ///< Return name of the script attached to ptr (default implementation: return an empty
-            /// string).
+        virtual std::string_view getScript(const ConstPtr& ptr) const;
+        ///< Return name of the script attached to ptr (default implementation: return an empty
+        /// string).
 
-            virtual float getWalkSpeed(const Ptr& ptr) const;
-            virtual float getRunSpeed(const Ptr& ptr) const;
-            virtual float getSwimSpeed(const Ptr& ptr) const;
+        virtual float getWalkSpeed(const Ptr& ptr) const;
+        virtual float getRunSpeed(const Ptr& ptr) const;
+        virtual float getSwimSpeed(const Ptr& ptr) const;
 
-            /// Return maximal movement speed for the current state.
-            virtual float getMaxSpeed(const Ptr& ptr) const;
+        /// Return maximal movement speed for the current state.
+        virtual float getMaxSpeed(const Ptr& ptr) const;
 
-            /// Return current movement speed.
-            virtual float getCurrentSpeed(const Ptr& ptr) const;
+        /// Return current movement speed.
+        virtual float getCurrentSpeed(const Ptr& ptr) const;
 
-            virtual float getJump(const MWWorld::Ptr &ptr) const;
-            ///< Return jump velocity (not accounting for movement)
+        virtual float getJump(const MWWorld::Ptr& ptr) const;
+        ///< Return jump velocity (not accounting for movement)
 
-            virtual MWMechanics::Movement& getMovementSettings (const Ptr& ptr) const;
-            ///< Return desired movement.
+        virtual MWMechanics::Movement& getMovementSettings(const Ptr& ptr) const;
+        ///< Return desired movement.
 
-            virtual osg::Vec3f getRotationVector (const Ptr& ptr) const;
-            ///< Return desired rotations, as euler angles. Sets getMovementSettings(ptr).mRotation to zero.
+        virtual osg::Vec3f getRotationVector(const Ptr& ptr) const;
+        ///< Return desired rotations, as euler angles. Sets getMovementSettings(ptr).mRotation to zero.
 
-            virtual std::pair<std::vector<int>, bool> getEquipmentSlots (const ConstPtr& ptr) const;
-            ///< \return first: Return IDs of the slot this object can be equipped in; second: can object
-            /// stay stacked when equipped?
-            ///
-            /// Default implementation: return (empty vector, false).
+        virtual std::pair<std::vector<int>, bool> getEquipmentSlots(const ConstPtr& ptr) const;
+        ///< \return first: Return IDs of the slot this object can be equipped in; second: can object
+        /// stay stacked when equipped?
+        ///
+        /// Default implementation: return (empty vector, false).
 
-            virtual int getEquipmentSkill (const ConstPtr& ptr)
-                const;
-            /// Return the index of the skill this item corresponds to when equipped or -1, if there is
-            /// no such skill.
-            /// (default implementation: return -1)
+        virtual int getEquipmentSkill(const ConstPtr& ptr) const;
+        /// Return the index of the skill this item corresponds to when equipped or -1, if there is
+        /// no such skill.
+        /// (default implementation: return -1)
 
-            virtual int getValue (const ConstPtr& ptr) const;
-            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
-            /// (default implementation: throws an exception)
+        virtual int getValue(const ConstPtr& ptr) const;
+        ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+        /// (default implementation: throws an exception)
 
-            virtual float getCapacity (const MWWorld::Ptr& ptr) const;
-            ///< Return total weight that fits into the object. Throws an exception, if the object can't
-            /// hold other objects.
-            /// (default implementation: throws an exception)
+        virtual float getCapacity(const MWWorld::Ptr& ptr) const;
+        ///< Return total weight that fits into the object. Throws an exception, if the object can't
+        /// hold other objects.
+        /// (default implementation: throws an exception)
 
-            virtual float getEncumbrance (const MWWorld::Ptr& ptr) const;
-            ///< Returns total weight of objects inside this object (including modifications from magic
-            /// effects). Throws an exception, if the object can't hold other objects.
-            /// (default implementation: throws an exception)
+        virtual float getEncumbrance(const MWWorld::Ptr& ptr) const;
+        ///< Returns total weight of objects inside this object (including modifications from magic
+        /// effects). Throws an exception, if the object can't hold other objects.
+        /// (default implementation: throws an exception)
 
-            virtual float getNormalizedEncumbrance (const MWWorld::Ptr& ptr) const;
-            ///< Returns encumbrance re-scaled to capacity
+        virtual float getNormalizedEncumbrance(const MWWorld::Ptr& ptr) const;
+        ///< Returns encumbrance re-scaled to capacity
 
-            virtual bool consume(const MWWorld::Ptr& consumable, const MWWorld::Ptr& actor) const;
-            ///< Consume an item, e. g. a potion.
+        virtual bool consume(const MWWorld::Ptr& consumable, const MWWorld::Ptr& actor) const;
+        ///< Consume an item, e. g. a potion.
 
-            virtual void skillUsageSucceeded (const MWWorld::Ptr& ptr, int skill, int usageType, float extraFactor=1.f) const;
-            ///< Inform actor \a ptr that a skill use has succeeded.
-            ///
-            /// (default implementations: throws an exception)
+        virtual void skillUsageSucceeded(
+            const MWWorld::Ptr& ptr, int skill, int usageType, float extraFactor = 1.f) const;
+        ///< Inform actor \a ptr that a skill use has succeeded.
+        ///
+        /// (default implementations: throws an exception)
 
-            virtual bool isEssential (const MWWorld::ConstPtr& ptr) const;
-            ///< Is \a ptr essential? (i.e. may losing \a ptr make the game unwinnable)
-            ///
-            /// (default implementation: return false)
+        virtual bool isEssential(const MWWorld::ConstPtr& ptr) const;
+        ///< Is \a ptr essential? (i.e. may losing \a ptr make the game unwinnable)
+        ///
+        /// (default implementation: return false)
 
-            virtual std::string_view getUpSoundId(const ConstPtr& ptr) const;
-            ///< Return the up sound ID of \a ptr or throw an exception, if class does not support ID retrieval
-            /// (default implementation: throw an exception)
+        virtual std::string_view getUpSoundId(const ConstPtr& ptr) const;
+        ///< Return the up sound ID of \a ptr or throw an exception, if class does not support ID retrieval
+        /// (default implementation: throw an exception)
 
-            virtual std::string_view getDownSoundId(const ConstPtr& ptr) const;
-            ///< Return the down sound ID of \a ptr or throw an exception, if class does not support ID retrieval
-            /// (default implementation: throw an exception)
+        virtual std::string_view getDownSoundId(const ConstPtr& ptr) const;
+        ///< Return the down sound ID of \a ptr or throw an exception, if class does not support ID retrieval
+        /// (default implementation: throw an exception)
 
-            virtual std::string_view getSoundIdFromSndGen(const Ptr& ptr, std::string_view type) const;
-            ///< Returns the sound ID for \a ptr of the given soundgen \a type.
+        virtual std::string_view getSoundIdFromSndGen(const Ptr& ptr, std::string_view type) const;
+        ///< Returns the sound ID for \a ptr of the given soundgen \a type.
 
-            virtual float getArmorRating (const MWWorld::Ptr& ptr) const;
-            ///< @return combined armor rating of this actor
+        virtual float getArmorRating(const MWWorld::Ptr& ptr) const;
+        ///< @return combined armor rating of this actor
 
-            virtual const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const;
-            ///< Return name of inventory icon.
+        virtual const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const;
+        ///< Return name of inventory icon.
 
-            virtual std::string_view getEnchantment(const MWWorld::ConstPtr& ptr) const;
-            ///< @return the enchantment ID if the object is enchanted, otherwise an empty string
-            /// (default implementation: return empty string)
+        virtual std::string_view getEnchantment(const MWWorld::ConstPtr& ptr) const;
+        ///< @return the enchantment ID if the object is enchanted, otherwise an empty string
+        /// (default implementation: return empty string)
 
-            virtual int getEnchantmentPoints (const MWWorld::ConstPtr& ptr) const;
-            ///< @return the number of enchantment points available for possible enchanting
+        virtual int getEnchantmentPoints(const MWWorld::ConstPtr& ptr) const;
+        ///< @return the number of enchantment points available for possible enchanting
 
-            virtual void adjustScale(const MWWorld::ConstPtr& ptr, osg::Vec3f& scale, bool rendering) const;
-            /// @param rendering Indicates if the scale to adjust is for the rendering mesh, or for the collision mesh
+        virtual void adjustScale(const MWWorld::ConstPtr& ptr, osg::Vec3f& scale, bool rendering) const;
+        /// @param rendering Indicates if the scale to adjust is for the rendering mesh, or for the collision mesh
 
-            virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const;
-            ///< Determine whether or not \a item can be sold to an npc with the given \a npcServices
+        virtual bool canSell(const MWWorld::ConstPtr& item, int npcServices) const;
+        ///< Determine whether or not \a item can be sold to an npc with the given \a npcServices
 
-            virtual int getServices (const MWWorld::ConstPtr& actor) const;
+        virtual int getServices(const MWWorld::ConstPtr& actor) const;
 
-            virtual std::string getModel(const MWWorld::ConstPtr &ptr) const;
+        virtual std::string getModel(const MWWorld::ConstPtr& ptr) const;
 
-            virtual bool useAnim() const;
-            ///< Whether or not to use animated variant of model (default false)
+        virtual bool useAnim() const;
+        ///< Whether or not to use animated variant of model (default false)
 
-            virtual void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const;
-            ///< Get a list of models to preload that this object may use (directly or indirectly). default implementation: list getModel().
+        virtual void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const;
+        ///< Get a list of models to preload that this object may use (directly or indirectly). default implementation:
+        ///< list getModel().
 
-            virtual const std::string& applyEnchantment(const MWWorld::ConstPtr& ptr, const std::string& enchId, int enchCharge, const std::string& newName) const;
-            ///< Creates a new record using \a ptr as template, with the given name and the given enchantment applied to it.
+        virtual const std::string& applyEnchantment(
+            const MWWorld::ConstPtr& ptr, const std::string& enchId, int enchCharge, const std::string& newName) const;
+        ///< Creates a new record using \a ptr as template, with the given name and the given enchantment applied to it.
 
-            virtual std::pair<int, std::string_view> canBeEquipped(const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& npc) const;
-            ///< Return 0 if player cannot equip item. 1 if can equip. 2 if it's twohanded weapon. 3 if twohanded weapon conflicts with that.
-            ///  Second item in the pair specifies the error message
+        virtual std::pair<int, std::string_view> canBeEquipped(
+            const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& npc) const;
+        ///< Return 0 if player cannot equip item. 1 if can equip. 2 if it's twohanded weapon. 3 if twohanded weapon
+        ///< conflicts with that.
+        ///  Second item in the pair specifies the error message
 
-            virtual float getWeight (const MWWorld::ConstPtr& ptr) const;
+        virtual float getWeight(const MWWorld::ConstPtr& ptr) const;
 
-            virtual bool isPersistent (const MWWorld::ConstPtr& ptr) const;
+        virtual bool isPersistent(const MWWorld::ConstPtr& ptr) const;
 
-            virtual bool isKey (const MWWorld::ConstPtr& ptr) const { return false; }
+        virtual bool isKey(const MWWorld::ConstPtr& ptr) const { return false; }
 
-            virtual bool isGold(const MWWorld::ConstPtr& ptr) const { return false; }
+        virtual bool isGold(const MWWorld::ConstPtr& ptr) const { return false; }
 
-            virtual bool isSoulGem(const MWWorld::ConstPtr& ptr) const { return false; }
+        virtual bool isSoulGem(const MWWorld::ConstPtr& ptr) const { return false; }
 
-            virtual bool allowTelekinesis(const MWWorld::ConstPtr& ptr) const { return true; }
-            ///< Return whether this class of object can be activated with telekinesis
+        virtual bool allowTelekinesis(const MWWorld::ConstPtr& ptr) const { return true; }
+        ///< Return whether this class of object can be activated with telekinesis
 
-            /// Get a blood texture suitable for \a ptr (see Blood Texture 0-2 in Morrowind.ini)
-            virtual int getBloodTexture (const MWWorld::ConstPtr& ptr) const;
+        /// Get a blood texture suitable for \a ptr (see Blood Texture 0-2 in Morrowind.ini)
+        virtual int getBloodTexture(const MWWorld::ConstPtr& ptr) const;
 
-            virtual Ptr copyToCell(const ConstPtr &ptr, CellStore &cell, int count) const;
+        virtual Ptr copyToCell(const ConstPtr& ptr, CellStore& cell, int count) const;
 
-            virtual Ptr copyToCell(const ConstPtr &ptr, CellStore &cell, const ESM::Position &pos, int count) const;
+        virtual Ptr copyToCell(const ConstPtr& ptr, CellStore& cell, const ESM::Position& pos, int count) const;
 
-            virtual bool isActivator() const {
-                return false;
-            }
+        virtual bool isActivator() const { return false; }
 
-            virtual bool isActor() const {
-                return false;
-            }
+        virtual bool isActor() const { return false; }
 
-            virtual bool isNpc() const {
-                return false;
-            }
+        virtual bool isNpc() const { return false; }
 
-            virtual bool isDoor() const {
-                return false;
-            }
+        virtual bool isDoor() const { return false; }
 
-            virtual bool isBipedal(const MWWorld::ConstPtr& ptr) const;
-            virtual bool canFly(const MWWorld::ConstPtr& ptr) const;
-            virtual bool canSwim(const MWWorld::ConstPtr& ptr) const;
-            virtual bool canWalk(const MWWorld::ConstPtr& ptr) const;
-            bool isPureWaterCreature(const MWWorld::ConstPtr& ptr) const;
-            bool isPureFlyingCreature(const MWWorld::ConstPtr& ptr) const;
-            bool isPureLandCreature(const MWWorld::Ptr& ptr) const;
-            bool isMobile(const MWWorld::Ptr& ptr) const;
+        virtual bool isBipedal(const MWWorld::ConstPtr& ptr) const;
+        virtual bool canFly(const MWWorld::ConstPtr& ptr) const;
+        virtual bool canSwim(const MWWorld::ConstPtr& ptr) const;
+        virtual bool canWalk(const MWWorld::ConstPtr& ptr) const;
+        bool isPureWaterCreature(const MWWorld::ConstPtr& ptr) const;
+        bool isPureFlyingCreature(const MWWorld::ConstPtr& ptr) const;
+        bool isPureLandCreature(const MWWorld::Ptr& ptr) const;
+        bool isMobile(const MWWorld::Ptr& ptr) const;
 
-            virtual float getSkill(const MWWorld::Ptr& ptr, int skill) const;
+        virtual float getSkill(const MWWorld::Ptr& ptr, int skill) const;
 
-            virtual void readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state)
-                const;
-            ///< Read additional state from \a state into \a ptr.
+        virtual void readAdditionalState(const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const;
+        ///< Read additional state from \a state into \a ptr.
 
-            virtual void writeAdditionalState (const MWWorld::ConstPtr& ptr, ESM::ObjectState& state)
-                const;
-            ///< Write additional state from \a ptr into \a state.
+        virtual void writeAdditionalState(const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const;
+        ///< Write additional state from \a ptr into \a state.
 
-            static const Class& get (unsigned int key);
-            ///< If there is no class for this \a key, an exception is thrown.
+        static const Class& get(unsigned int key);
+        ///< If there is no class for this \a key, an exception is thrown.
 
-            static void registerClass(Class& instance);
+        static void registerClass(Class& instance);
 
-            virtual int getBaseGold(const MWWorld::ConstPtr& ptr) const;
+        virtual int getBaseGold(const MWWorld::ConstPtr& ptr) const;
 
-            virtual bool isClass(const MWWorld::ConstPtr& ptr, std::string_view className) const;
+        virtual bool isClass(const MWWorld::ConstPtr& ptr, std::string_view className) const;
 
-            virtual DoorState getDoorState (const MWWorld::ConstPtr &ptr) const;
-            /// This does not actually cause the door to move. Use World::activateDoor instead.
-            virtual void setDoorState (const MWWorld::Ptr &ptr, DoorState state) const;
+        virtual DoorState getDoorState(const MWWorld::ConstPtr& ptr) const;
+        /// This does not actually cause the door to move. Use World::activateDoor instead.
+        virtual void setDoorState(const MWWorld::Ptr& ptr, DoorState state) const;
 
-            virtual void respawn (const MWWorld::Ptr& ptr) const {}
+        virtual void respawn(const MWWorld::Ptr& ptr) const {}
 
-            /// Returns sound id
-            virtual std::string_view getSound(const MWWorld::ConstPtr& ptr) const;
+        /// Returns sound id
+        virtual std::string_view getSound(const MWWorld::ConstPtr& ptr) const;
 
-            virtual int getBaseFightRating (const MWWorld::ConstPtr& ptr) const;
+        virtual int getBaseFightRating(const MWWorld::ConstPtr& ptr) const;
 
-            virtual std::string_view getPrimaryFaction(const MWWorld::ConstPtr& ptr) const;
-            virtual int getPrimaryFactionRank (const MWWorld::ConstPtr& ptr) const;
+        virtual std::string_view getPrimaryFaction(const MWWorld::ConstPtr& ptr) const;
+        virtual int getPrimaryFactionRank(const MWWorld::ConstPtr& ptr) const;
 
-            /// Get the effective armor rating, factoring in the actor's skills, for the given armor.
-            virtual float getEffectiveArmorRating(const MWWorld::ConstPtr& armor, const MWWorld::Ptr& actor) const;
+        /// Get the effective armor rating, factoring in the actor's skills, for the given armor.
+        virtual float getEffectiveArmorRating(const MWWorld::ConstPtr& armor, const MWWorld::Ptr& actor) const;
 
-            virtual osg::Vec4f getEnchantmentColor(const MWWorld::ConstPtr& item) const;
+        virtual osg::Vec4f getEnchantmentColor(const MWWorld::ConstPtr& item) const;
 
-            virtual void setBaseAISetting(const std::string& id, MWMechanics::AiSetting setting, int value) const;
+        virtual void setBaseAISetting(const std::string& id, MWMechanics::AiSetting setting, int value) const;
 
-            virtual void modifyBaseInventory(std::string_view actorId, std::string_view itemId, int amount) const;
+        virtual void modifyBaseInventory(std::string_view actorId, std::string_view itemId, int amount) const;
     };
 }
 
diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 91b0c9e9cb..1124267caa 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -5,35 +5,35 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/esm3/inventorystate.hpp>
+#include <components/esm3/loadench.hpp>
 #include <components/misc/strings/algorithm.hpp>
 #include <components/misc/strings/lower.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
-#include <components/esm3/loadench.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
+#include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/levelledlist.hpp"
-#include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/recharge.hpp"
 
-#include "manualref.hpp"
-#include "refdata.hpp"
 #include "class.hpp"
+#include "esmstore.hpp"
 #include "localscripts.hpp"
+#include "manualref.hpp"
 #include "player.hpp"
-#include "esmstore.hpp"
+#include "refdata.hpp"
 
 namespace
 {
     void addScripts(MWWorld::ContainerStore& store, MWWorld::CellStore* cell)
     {
         auto& scripts = MWBase::Environment::get().getWorld()->getLocalScripts();
-        for(const auto&& ptr : store)
+        for (const auto&& ptr : store)
         {
             std::string_view script = ptr.getClass().getScript(ptr);
-            if(!script.empty())
+            if (!script.empty())
             {
                 MWWorld::Ptr item = ptr;
                 item.mCell = cell;
@@ -42,8 +42,8 @@ namespace
         }
     }
 
-    template<typename T>
-    float getTotalWeight (const MWWorld::CellRefList<T>& cellRefList)
+    template <typename T>
+    float getTotalWeight(const MWWorld::CellRefList<T>& cellRefList)
     {
         float sum = 0;
 
@@ -56,7 +56,7 @@ namespace
         return sum;
     }
 
-    template<typename T>
+    template <typename T>
     MWWorld::Ptr searchId(MWWorld::CellRefList<T>& list, std::string_view id, MWWorld::ContainerStore* store)
     {
         store->resolve();
@@ -66,7 +66,7 @@ namespace
             if (Misc::StringUtils::ciEqual(liveCellRef.mBase->mId, id) && liveCellRef.mData.getCount())
             {
                 MWWorld::Ptr ptr(&liveCellRef, nullptr);
-                ptr.setContainerStore (store);
+                ptr.setContainerStore(store);
                 return ptr;
             }
         }
@@ -81,49 +81,50 @@ MWWorld::ResolutionListener::~ResolutionListener()
     {
         mStore.unresolve();
     }
-    catch(const std::exception& e)
+    catch (const std::exception& e)
     {
         Log(Debug::Error) << "Failed to clear temporary container contents: " << e.what();
     }
 }
 
-template<typename T>
-MWWorld::ContainerStoreIterator MWWorld::ContainerStore::getState (CellRefList<T>& collection,
-    const ESM::ObjectState& state)
+template <typename T>
+MWWorld::ContainerStoreIterator MWWorld::ContainerStore::getState(
+    CellRefList<T>& collection, const ESM::ObjectState& state)
 {
-    if (!LiveCellRef<T>::checkState (state))
-        return ContainerStoreIterator (this); // not valid anymore with current content files -> skip
+    if (!LiveCellRef<T>::checkState(state))
+        return ContainerStoreIterator(this); // not valid anymore with current content files -> skip
 
-    const T *record = MWBase::Environment::get().getWorld()->getStore().
-        get<T>().search (state.mRef.mRefID);
+    const T* record = MWBase::Environment::get().getWorld()->getStore().get<T>().search(state.mRef.mRefID);
 
     if (!record)
-        return ContainerStoreIterator (this);
+        return ContainerStoreIterator(this);
 
-    LiveCellRef<T> ref (record);
-    ref.load (state);
-    collection.mList.push_back (ref);
+    LiveCellRef<T> ref(record);
+    ref.load(state);
+    collection.mList.push_back(ref);
 
-    return ContainerStoreIterator (this, --collection.mList.end());
+    return ContainerStoreIterator(this, --collection.mList.end());
 }
 
-void MWWorld::ContainerStore::storeEquipmentState(const MWWorld::LiveCellRefBase &ref, int index, ESM::InventoryState &inventory) const
+void MWWorld::ContainerStore::storeEquipmentState(
+    const MWWorld::LiveCellRefBase& ref, int index, ESM::InventoryState& inventory) const
 {
 }
 
-void MWWorld::ContainerStore::readEquipmentState(const MWWorld::ContainerStoreIterator& iter, int index, const ESM::InventoryState &inventory)
+void MWWorld::ContainerStore::readEquipmentState(
+    const MWWorld::ContainerStoreIterator& iter, int index, const ESM::InventoryState& inventory)
 {
 }
 
-template<typename T>
-void MWWorld::ContainerStore::storeState (const LiveCellRef<T>& ref, ESM::ObjectState& state) const
+template <typename T>
+void MWWorld::ContainerStore::storeState(const LiveCellRef<T>& ref, ESM::ObjectState& state) const
 {
-    ref.save (state);
+    ref.save(state);
 }
 
-template<typename T>
-void MWWorld::ContainerStore::storeStates (const CellRefList<T>& collection,
-    ESM::InventoryState& inventory, int& index, bool equipable) const
+template <typename T>
+void MWWorld::ContainerStore::storeStates(
+    const CellRefList<T>& collection, ESM::InventoryState& inventory, int& index, bool equipable) const
 {
     for (const LiveCellRef<T>& liveCellRef : collection.mList)
     {
@@ -143,26 +144,28 @@ const std::string_view MWWorld::ContainerStore::sGoldId = "gold_001";
 MWWorld::ContainerStore::ContainerStore()
     : mListener(nullptr)
     , mRechargingItemsUpToDate(false)
-    , mCachedWeight (0)
-    , mWeightUpToDate (false)
+    , mCachedWeight(0)
+    , mWeightUpToDate(false)
     , mModified(false)
     , mResolved(false)
     , mSeed()
-    , mPtr() {}
+    , mPtr()
+{
+}
 
 MWWorld::ContainerStore::~ContainerStore() {}
 
-MWWorld::ConstContainerStoreIterator MWWorld::ContainerStore::cbegin (int mask) const
+MWWorld::ConstContainerStoreIterator MWWorld::ContainerStore::cbegin(int mask) const
 {
-    return ConstContainerStoreIterator (mask, this);
+    return ConstContainerStoreIterator(mask, this);
 }
 
 MWWorld::ConstContainerStoreIterator MWWorld::ContainerStore::cend() const
 {
-    return ConstContainerStoreIterator (this);
+    return ConstContainerStoreIterator(this);
 }
 
-MWWorld::ConstContainerStoreIterator MWWorld::ContainerStore::begin (int mask) const
+MWWorld::ConstContainerStoreIterator MWWorld::ContainerStore::begin(int mask) const
 {
     return cbegin(mask);
 }
@@ -172,19 +175,19 @@ MWWorld::ConstContainerStoreIterator MWWorld::ContainerStore::end() const
     return cend();
 }
 
-MWWorld::ContainerStoreIterator MWWorld::ContainerStore::begin (int mask)
+MWWorld::ContainerStoreIterator MWWorld::ContainerStore::begin(int mask)
 {
-    return ContainerStoreIterator (mask, this);
+    return ContainerStoreIterator(mask, this);
 }
 
 MWWorld::ContainerStoreIterator MWWorld::ContainerStore::end()
 {
-    return ContainerStoreIterator (this);
+    return ContainerStoreIterator(this);
 }
 
 int MWWorld::ContainerStore::count(std::string_view id) const
 {
-    int total=0;
+    int total = 0;
     for (const auto&& iter : *this)
         if (Misc::StringUtils::ciEqual(iter.getCellRef().getRefId(), id))
             total += iter.getRefData().getCount();
@@ -196,13 +199,12 @@ MWWorld::ContainerStoreListener* MWWorld::ContainerStore::getContListener() cons
     return mListener;
 }
 
-
 void MWWorld::ContainerStore::setContListener(MWWorld::ContainerStoreListener* listener)
 {
     mListener = listener;
 }
 
-MWWorld::ContainerStoreIterator MWWorld::ContainerStore::unstack(const Ptr &ptr, const Ptr& container, int count)
+MWWorld::ContainerStoreIterator MWWorld::ContainerStore::unstack(const Ptr& ptr, const Ptr& container, int count)
 {
     resolve();
     if (ptr.getRefData().getCount() <= count)
@@ -212,7 +214,7 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::unstack(const Ptr &ptr,
     if (!script.empty())
         MWBase::Environment::get().getWorld()->getLocalScripts().add(script, *it);
 
-    remove(ptr, ptr.getRefData().getCount()-count, container);
+    remove(ptr, ptr.getRefData().getCount() - count, container);
 
     return it;
 }
@@ -221,7 +223,7 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::restack(const MWWorld::
 {
     resolve();
     MWWorld::ContainerStoreIterator retval = end();
-    for (MWWorld::ContainerStoreIterator iter (begin()); iter != end(); ++iter)
+    for (MWWorld::ContainerStoreIterator iter(begin()); iter != end(); ++iter)
     {
         if (item == *iter)
         {
@@ -233,11 +235,12 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::restack(const MWWorld::
     if (retval == end())
         throw std::runtime_error("item is not from this container");
 
-    for (MWWorld::ContainerStoreIterator iter (begin()); iter != end(); ++iter)
+    for (MWWorld::ContainerStoreIterator iter(begin()); iter != end(); ++iter)
     {
         if (stacks(*iter, item))
         {
-            iter->getRefData().setCount(addItems(iter->getRefData().getCount(false), item.getRefData().getCount(false)));
+            iter->getRefData().setCount(
+                addItems(iter->getRefData().getCount(false), item.getRefData().getCount(false)));
             item.getRefData().setCount(0);
             retval = iter;
             break;
@@ -257,11 +260,14 @@ bool MWWorld::ContainerStore::stacks(const ConstPtr& ptr1, const ConstPtr& ptr2)
     // If it has an enchantment, don't stack when some of the charge is already used
     if (!ptr1.getClass().getEnchantment(ptr1).empty())
     {
-        const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(
-                    ptr1.getClass().getEnchantment(ptr1));
+        const ESM::Enchantment* enchantment
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(
+                ptr1.getClass().getEnchantment(ptr1));
         float maxCharge = static_cast<float>(enchantment->mData.mCharge);
-        float enchantCharge1 = ptr1.getCellRef().getEnchantmentCharge() == -1 ? maxCharge : ptr1.getCellRef().getEnchantmentCharge();
-        float enchantCharge2 = ptr2.getCellRef().getEnchantmentCharge() == -1 ? maxCharge : ptr2.getCellRef().getEnchantmentCharge();
+        float enchantCharge1
+            = ptr1.getCellRef().getEnchantmentCharge() == -1 ? maxCharge : ptr1.getCellRef().getEnchantmentCharge();
+        float enchantCharge2
+            = ptr2.getCellRef().getEnchantmentCharge() == -1 ? maxCharge : ptr2.getCellRef().getEnchantmentCharge();
         if (enchantCharge1 != maxCharge || enchantCharge2 != maxCharge)
             return false;
     }
@@ -276,20 +282,21 @@ bool MWWorld::ContainerStore::stacks(const ConstPtr& ptr1, const ConstPtr& ptr2)
         && cls2.getScript(ptr2).empty()
 
         // item that is already partly used up never stacks
-        && (!cls1.hasItemHealth(ptr1) || (
-                cls1.getItemHealth(ptr1) == cls1.getItemMaxHealth(ptr1)
-            && cls2.getItemHealth(ptr2) == cls2.getItemMaxHealth(ptr2)));
+        && (!cls1.hasItemHealth(ptr1)
+            || (cls1.getItemHealth(ptr1) == cls1.getItemMaxHealth(ptr1)
+                && cls2.getItemHealth(ptr2) == cls2.getItemMaxHealth(ptr2)));
 }
 
-MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add(std::string_view id, int count, const Ptr &actorPtr)
+MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add(std::string_view id, int count, const Ptr& actorPtr)
 {
     MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), id, count);
     return add(ref.getPtr(), count, actorPtr);
 }
 
-MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add (const Ptr& itemPtr, int count, const Ptr& actorPtr, bool /*allowAutoEquip*/, bool resolve)
+MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add(
+    const Ptr& itemPtr, int count, const Ptr& actorPtr, bool /*allowAutoEquip*/, bool resolve)
 {
-    Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
+    Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
 
     MWWorld::ContainerStoreIterator it = addImp(itemPtr, count, resolve);
 
@@ -297,7 +304,8 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add (const Ptr& itemPtr
     MWWorld::Ptr item = *it;
 
     // we may have copied an item from the world, so reset a few things first
-    item.getRefData().setBaseNode(nullptr); // Especially important, otherwise scripts on the item could think that it's actually in a cell
+    item.getRefData().setBaseNode(
+        nullptr); // Especially important, otherwise scripts on the item could think that it's actually in a cell
     ESM::Position pos;
     pos.rot[0] = 0;
     pos.rot[1] = 0;
@@ -349,22 +357,22 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add (const Ptr& itemPtr
     return it;
 }
 
-MWWorld::ContainerStoreIterator MWWorld::ContainerStore::addImp (const Ptr& ptr, int count, bool markModified)
+MWWorld::ContainerStoreIterator MWWorld::ContainerStore::addImp(const Ptr& ptr, int count, bool markModified)
 {
-    if(markModified)
+    if (markModified)
         resolve();
     int type = getType(ptr);
 
-    const MWWorld::ESMStore &esmStore =
-        MWBase::Environment::get().getWorld()->getStore();
+    const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
 
     // gold needs special handling: when it is inserted into a container, the base object automatically becomes Gold_001
-    // this ensures that gold piles of different sizes stack with each other (also, several scripts rely on Gold_001 for detecting player gold)
-    if(ptr.getClass().isGold(ptr))
+    // this ensures that gold piles of different sizes stack with each other (also, several scripts rely on Gold_001 for
+    // detecting player gold)
+    if (ptr.getClass().isGold(ptr))
     {
         int realCount = count * ptr.getClass().getValue(ptr);
 
-        for (MWWorld::ContainerStoreIterator iter (begin(type)); iter!=end(); ++iter)
+        for (MWWorld::ContainerStoreIterator iter(begin(type)); iter != end(); ++iter)
         {
             if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), MWWorld::ContainerStore::sGoldId))
             {
@@ -379,7 +387,7 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::addImp (const Ptr& ptr,
     }
 
     // determine whether to stack or not
-    for (MWWorld::ContainerStoreIterator iter (begin(type)); iter!=end(); ++iter)
+    for (MWWorld::ContainerStoreIterator iter(begin(type)); iter != end(); ++iter)
     {
         if (stacks(*iter, ptr))
         {
@@ -394,24 +402,60 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::addImp (const Ptr& ptr,
     return addNewStack(ptr, count);
 }
 
-MWWorld::ContainerStoreIterator MWWorld::ContainerStore::addNewStack (const ConstPtr& ptr, int count)
+MWWorld::ContainerStoreIterator MWWorld::ContainerStore::addNewStack(const ConstPtr& ptr, int count)
 {
     ContainerStoreIterator it = begin();
 
     switch (getType(ptr))
     {
-        case Type_Potion: potions.mList.push_back (*ptr.get<ESM::Potion>()); it = ContainerStoreIterator(this, --potions.mList.end()); break;
-        case Type_Apparatus: appas.mList.push_back (*ptr.get<ESM::Apparatus>()); it = ContainerStoreIterator(this, --appas.mList.end()); break;
-        case Type_Armor: armors.mList.push_back (*ptr.get<ESM::Armor>()); it = ContainerStoreIterator(this, --armors.mList.end()); break;
-        case Type_Book: books.mList.push_back (*ptr.get<ESM::Book>()); it = ContainerStoreIterator(this, --books.mList.end()); break;
-        case Type_Clothing: clothes.mList.push_back (*ptr.get<ESM::Clothing>()); it = ContainerStoreIterator(this, --clothes.mList.end()); break;
-        case Type_Ingredient: ingreds.mList.push_back (*ptr.get<ESM::Ingredient>()); it = ContainerStoreIterator(this, --ingreds.mList.end()); break;
-        case Type_Light: lights.mList.push_back (*ptr.get<ESM::Light>()); it = ContainerStoreIterator(this, --lights.mList.end()); break;
-        case Type_Lockpick: lockpicks.mList.push_back (*ptr.get<ESM::Lockpick>()); it = ContainerStoreIterator(this, --lockpicks.mList.end()); break;
-        case Type_Miscellaneous: miscItems.mList.push_back (*ptr.get<ESM::Miscellaneous>()); it = ContainerStoreIterator(this, --miscItems.mList.end()); break;
-        case Type_Probe: probes.mList.push_back (*ptr.get<ESM::Probe>()); it = ContainerStoreIterator(this, --probes.mList.end()); break;
-        case Type_Repair: repairs.mList.push_back (*ptr.get<ESM::Repair>()); it = ContainerStoreIterator(this, --repairs.mList.end()); break;
-        case Type_Weapon: weapons.mList.push_back (*ptr.get<ESM::Weapon>()); it = ContainerStoreIterator(this, --weapons.mList.end()); break;
+        case Type_Potion:
+            potions.mList.push_back(*ptr.get<ESM::Potion>());
+            it = ContainerStoreIterator(this, --potions.mList.end());
+            break;
+        case Type_Apparatus:
+            appas.mList.push_back(*ptr.get<ESM::Apparatus>());
+            it = ContainerStoreIterator(this, --appas.mList.end());
+            break;
+        case Type_Armor:
+            armors.mList.push_back(*ptr.get<ESM::Armor>());
+            it = ContainerStoreIterator(this, --armors.mList.end());
+            break;
+        case Type_Book:
+            books.mList.push_back(*ptr.get<ESM::Book>());
+            it = ContainerStoreIterator(this, --books.mList.end());
+            break;
+        case Type_Clothing:
+            clothes.mList.push_back(*ptr.get<ESM::Clothing>());
+            it = ContainerStoreIterator(this, --clothes.mList.end());
+            break;
+        case Type_Ingredient:
+            ingreds.mList.push_back(*ptr.get<ESM::Ingredient>());
+            it = ContainerStoreIterator(this, --ingreds.mList.end());
+            break;
+        case Type_Light:
+            lights.mList.push_back(*ptr.get<ESM::Light>());
+            it = ContainerStoreIterator(this, --lights.mList.end());
+            break;
+        case Type_Lockpick:
+            lockpicks.mList.push_back(*ptr.get<ESM::Lockpick>());
+            it = ContainerStoreIterator(this, --lockpicks.mList.end());
+            break;
+        case Type_Miscellaneous:
+            miscItems.mList.push_back(*ptr.get<ESM::Miscellaneous>());
+            it = ContainerStoreIterator(this, --miscItems.mList.end());
+            break;
+        case Type_Probe:
+            probes.mList.push_back(*ptr.get<ESM::Probe>());
+            it = ContainerStoreIterator(this, --probes.mList.end());
+            break;
+        case Type_Repair:
+            repairs.mList.push_back(*ptr.get<ESM::Repair>());
+            it = ContainerStoreIterator(this, --repairs.mList.end());
+            break;
+        case Type_Weapon:
+            weapons.mList.push_back(*ptr.get<ESM::Weapon>());
+            it = ContainerStoreIterator(this, --weapons.mList.end());
+            break;
     }
 
     it->getRefData().setCount(count);
@@ -446,23 +490,26 @@ void MWWorld::ContainerStore::updateRechargingItems()
         std::string_view enchantmentId = it->getClass().getEnchantment(*it);
         if (!enchantmentId.empty())
         {
-            const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().search(enchantmentId);
+            const ESM::Enchantment* enchantment
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().search(enchantmentId);
             if (!enchantment)
             {
-                Log(Debug::Warning) << "Warning: Can't find enchantment '" << enchantmentId << "' on item " << it->getCellRef().getRefId();
+                Log(Debug::Warning) << "Warning: Can't find enchantment '" << enchantmentId << "' on item "
+                                    << it->getCellRef().getRefId();
                 continue;
             }
 
             if (enchantment->mData.mType == ESM::Enchantment::WhenUsed
-                    || enchantment->mData.mType == ESM::Enchantment::WhenStrikes)
+                || enchantment->mData.mType == ESM::Enchantment::WhenStrikes)
                 mRechargingItems.emplace_back(it, static_cast<float>(enchantment->mData.mCharge));
         }
     }
 }
 
-int MWWorld::ContainerStore::remove(std::string_view itemId, int count, const Ptr& actor, bool equipReplacement, bool resolveFirst)
+int MWWorld::ContainerStore::remove(
+    std::string_view itemId, int count, const Ptr& actor, bool equipReplacement, bool resolveFirst)
 {
-    if(resolveFirst)
+    if (resolveFirst)
         resolve();
     int toRemove = count;
 
@@ -487,10 +534,11 @@ bool MWWorld::ContainerStore::hasVisibleItems() const
     return false;
 }
 
-int MWWorld::ContainerStore::remove(const Ptr& item, int count, const Ptr& actor, bool equipReplacement, bool resolveFirst)
+int MWWorld::ContainerStore::remove(
+    const Ptr& item, int count, const Ptr& actor, bool equipReplacement, bool resolveFirst)
 {
     assert(this == item.getContainerStore());
-    if(resolveFirst)
+    if (resolveFirst)
         resolve();
 
     int toRemove = count;
@@ -517,7 +565,8 @@ int MWWorld::ContainerStore::remove(const Ptr& item, int count, const Ptr& actor
     return count - toRemove;
 }
 
-void MWWorld::ContainerStore::fill (const ESM::InventoryList& items, const std::string& owner, Misc::Rng::Generator& prng)
+void MWWorld::ContainerStore::fill(
+    const ESM::InventoryList& items, const std::string& owner, Misc::Rng::Generator& prng)
 {
     for (const ESM::ContItem& iter : items.mList)
     {
@@ -529,7 +578,8 @@ void MWWorld::ContainerStore::fill (const ESM::InventoryList& items, const std::
     mResolved = true;
 }
 
-void MWWorld::ContainerStore::fillNonRandom (const ESM::InventoryList& items, const std::string& owner, unsigned int seed)
+void MWWorld::ContainerStore::fillNonRandom(
+    const ESM::InventoryList& items, const std::string& owner, unsigned int seed)
 {
     mSeed = seed;
     for (const ESM::ContItem& iter : items.mList)
@@ -542,13 +592,14 @@ void MWWorld::ContainerStore::fillNonRandom (const ESM::InventoryList& items, co
     mResolved = false;
 }
 
-void MWWorld::ContainerStore::addInitialItem(std::string_view id, const std::string& owner, int count,
-                                            Misc::Rng::Generator* prng, bool topLevel)
+void MWWorld::ContainerStore::addInitialItem(
+    std::string_view id, const std::string& owner, int count, Misc::Rng::Generator* prng, bool topLevel)
 {
-    if (count == 0) return; //Don't restock with nothing.
+    if (count == 0)
+        return; // Don't restock with nothing.
     try
     {
-        ManualRef ref (MWBase::Environment::get().getWorld()->getStore(), id, count);
+        ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), id, count);
         if (ref.getPtr().getClass().getScript(ref.getPtr()).empty())
         {
             addInitialItemImp(ref.getPtr(), owner, count, prng, topLevel);
@@ -566,18 +617,18 @@ void MWWorld::ContainerStore::addInitialItem(std::string_view id, const std::str
     }
 }
 
-void MWWorld::ContainerStore::addInitialItemImp(const MWWorld::Ptr& ptr, const std::string& owner, int count,
-                                               Misc::Rng::Generator* prng, bool topLevel)
+void MWWorld::ContainerStore::addInitialItemImp(
+    const MWWorld::Ptr& ptr, const std::string& owner, int count, Misc::Rng::Generator* prng, bool topLevel)
 {
-    if (ptr.getType()==ESM::ItemLevList::sRecordId)
+    if (ptr.getType() == ESM::ItemLevList::sRecordId)
     {
-        if(!prng)
+        if (!prng)
             return;
         const ESM::ItemLevList* levItemList = ptr.get<ESM::ItemLevList>()->mBase;
 
         if (topLevel && std::abs(count) > 1 && levItemList->mFlags & ESM::ItemLevList::Each)
         {
-            for (int i=0; i<std::abs(count); ++i)
+            for (int i = 0; i < std::abs(count); ++i)
                 addInitialItem(ptr.getCellRef().getRefId(), owner, count > 0 ? 1 : -1, prng, true);
             return;
         }
@@ -592,14 +643,14 @@ void MWWorld::ContainerStore::addInitialItemImp(const MWWorld::Ptr& ptr, const s
     else
     {
         ptr.getCellRef().setOwner(owner);
-        addImp (ptr, count, false);
+        addImp(ptr, count, false);
     }
 }
 
 void MWWorld::ContainerStore::clear()
 {
     for (auto&& iter : *this)
-        iter.getRefData().setCount (0);
+        iter.getRefData().setCount(0);
 
     flagAsModified();
     mModified = true;
@@ -618,11 +669,11 @@ bool MWWorld::ContainerStore::isResolved() const
 
 void MWWorld::ContainerStore::resolve()
 {
-    if(!mResolved && !mPtr.isEmpty())
+    if (!mResolved && !mPtr.isEmpty())
     {
-        for(const auto&& ptr : *this)
+        for (const auto&& ptr : *this)
             ptr.getRefData().setCount(0);
-        Misc::Rng::Generator prng{mSeed};
+        Misc::Rng::Generator prng{ mSeed };
         fill(mPtr.get<ESM::Container>()->mBase->mInventory, "", prng);
         addScripts(*this, mPtr.mCell);
     }
@@ -631,23 +682,23 @@ void MWWorld::ContainerStore::resolve()
 
 MWWorld::ResolutionHandle MWWorld::ContainerStore::resolveTemporarily()
 {
-    if(mModified)
+    if (mModified)
         return {};
     std::shared_ptr<ResolutionListener> listener = mResolutionListener.lock();
-    if(!listener)
+    if (!listener)
     {
         listener = std::make_shared<ResolutionListener>(*this);
         mResolutionListener = listener;
     }
-    if(!mResolved && !mPtr.isEmpty())
+    if (!mResolved && !mPtr.isEmpty())
     {
-        for(const auto&& ptr : *this)
+        for (const auto&& ptr : *this)
             ptr.getRefData().setCount(0);
-        Misc::Rng::Generator prng{mSeed};
+        Misc::Rng::Generator prng{ mSeed };
         fill(mPtr.get<ESM::Container>()->mBase->mInventory, "", prng);
         addScripts(*this, mPtr.mCell);
     }
-    return {listener};
+    return { listener };
 }
 
 void MWWorld::ContainerStore::unresolve()
@@ -657,7 +708,7 @@ void MWWorld::ContainerStore::unresolve()
 
     if (mResolved && !mPtr.isEmpty())
     {
-        for(const auto&& ptr : *this)
+        for (const auto&& ptr : *this)
             ptr.getRefData().setCount(0);
         fillNonRandom(mPtr.get<ESM::Container>()->mBase->mInventory, "", mSeed);
         addScripts(*this, mPtr.mCell);
@@ -671,18 +722,18 @@ float MWWorld::ContainerStore::getWeight() const
     {
         mCachedWeight = 0;
 
-        mCachedWeight += getTotalWeight (potions);
-        mCachedWeight += getTotalWeight (appas);
-        mCachedWeight += getTotalWeight (armors);
-        mCachedWeight += getTotalWeight (books);
-        mCachedWeight += getTotalWeight (clothes);
-        mCachedWeight += getTotalWeight (ingreds);
-        mCachedWeight += getTotalWeight (lights);
-        mCachedWeight += getTotalWeight (lockpicks);
-        mCachedWeight += getTotalWeight (miscItems);
-        mCachedWeight += getTotalWeight (probes);
-        mCachedWeight += getTotalWeight (repairs);
-        mCachedWeight += getTotalWeight (weapons);
+        mCachedWeight += getTotalWeight(potions);
+        mCachedWeight += getTotalWeight(appas);
+        mCachedWeight += getTotalWeight(armors);
+        mCachedWeight += getTotalWeight(books);
+        mCachedWeight += getTotalWeight(clothes);
+        mCachedWeight += getTotalWeight(ingreds);
+        mCachedWeight += getTotalWeight(lights);
+        mCachedWeight += getTotalWeight(lockpicks);
+        mCachedWeight += getTotalWeight(miscItems);
+        mCachedWeight += getTotalWeight(probes);
+        mCachedWeight += getTotalWeight(repairs);
+        mCachedWeight += getTotalWeight(weapons);
 
         mWeightUpToDate = true;
     }
@@ -690,49 +741,49 @@ float MWWorld::ContainerStore::getWeight() const
     return mCachedWeight;
 }
 
-int MWWorld::ContainerStore::getType (const ConstPtr& ptr)
+int MWWorld::ContainerStore::getType(const ConstPtr& ptr)
 {
     if (ptr.isEmpty())
-        throw std::runtime_error ("can't put a non-existent object into a container");
+        throw std::runtime_error("can't put a non-existent object into a container");
 
-    if (ptr.getType()==ESM::Potion::sRecordId)
+    if (ptr.getType() == ESM::Potion::sRecordId)
         return Type_Potion;
 
-    if (ptr.getType()==ESM::Apparatus::sRecordId)
+    if (ptr.getType() == ESM::Apparatus::sRecordId)
         return Type_Apparatus;
 
-    if (ptr.getType()==ESM::Armor::sRecordId)
+    if (ptr.getType() == ESM::Armor::sRecordId)
         return Type_Armor;
 
-    if (ptr.getType()==ESM::Book::sRecordId)
+    if (ptr.getType() == ESM::Book::sRecordId)
         return Type_Book;
 
-    if (ptr.getType()==ESM::Clothing::sRecordId)
+    if (ptr.getType() == ESM::Clothing::sRecordId)
         return Type_Clothing;
 
-    if (ptr.getType()==ESM::Ingredient::sRecordId)
+    if (ptr.getType() == ESM::Ingredient::sRecordId)
         return Type_Ingredient;
 
-    if (ptr.getType()==ESM::Light::sRecordId)
+    if (ptr.getType() == ESM::Light::sRecordId)
         return Type_Light;
 
-    if (ptr.getType()==ESM::Lockpick::sRecordId)
+    if (ptr.getType() == ESM::Lockpick::sRecordId)
         return Type_Lockpick;
 
-    if (ptr.getType()==ESM::Miscellaneous::sRecordId)
+    if (ptr.getType() == ESM::Miscellaneous::sRecordId)
         return Type_Miscellaneous;
 
-    if (ptr.getType()==ESM::Probe::sRecordId)
+    if (ptr.getType() == ESM::Probe::sRecordId)
         return Type_Probe;
 
-    if (ptr.getType()==ESM::Repair::sRecordId)
+    if (ptr.getType() == ESM::Repair::sRecordId)
         return Type_Repair;
 
-    if (ptr.getType()==ESM::Weapon::sRecordId)
+    if (ptr.getType() == ESM::Weapon::sRecordId)
         return Type_Weapon;
 
-    throw std::runtime_error("Object '" + ptr.getCellRef().getRefId() + "' of type " +
-                             std::string(ptr.getTypeDescription()) + " can not be placed into a container");
+    throw std::runtime_error("Object '" + ptr.getCellRef().getRefId() + "' of type "
+        + std::string(ptr.getTypeDescription()) + " can not be placed into a container");
 }
 
 MWWorld::Ptr MWWorld::ContainerStore::findReplacement(const std::string& id)
@@ -746,9 +797,7 @@ MWWorld::Ptr MWWorld::ContainerStore::findReplacement(const std::string& id)
         {
             // Prefer the stack with the lowest remaining uses
             // Try to get item with zero durability only if there are no other items found
-            if (item.isEmpty() ||
-                (iterHealth > 0 && iterHealth < itemHealth) ||
-                (itemHealth <= 0 && iterHealth > 0))
+            if (item.isEmpty() || (iterHealth > 0 && iterHealth < itemHealth) || (itemHealth <= 0 && iterHealth > 0))
             {
                 item = iter;
                 itemHealth = iterHealth;
@@ -763,73 +812,73 @@ MWWorld::Ptr MWWorld::ContainerStore::search(std::string_view id)
 {
     resolve();
     {
-        Ptr ptr = searchId (potions, id, this);
+        Ptr ptr = searchId(potions, id, this);
         if (!ptr.isEmpty())
             return ptr;
     }
 
     {
-        Ptr ptr = searchId (appas, id, this);
+        Ptr ptr = searchId(appas, id, this);
         if (!ptr.isEmpty())
             return ptr;
     }
 
     {
-        Ptr ptr = searchId (armors, id, this);
+        Ptr ptr = searchId(armors, id, this);
         if (!ptr.isEmpty())
             return ptr;
     }
 
     {
-        Ptr ptr = searchId (books, id, this);
+        Ptr ptr = searchId(books, id, this);
         if (!ptr.isEmpty())
             return ptr;
     }
 
     {
-        Ptr ptr = searchId (clothes, id, this);
+        Ptr ptr = searchId(clothes, id, this);
         if (!ptr.isEmpty())
             return ptr;
     }
 
     {
-        Ptr ptr = searchId (ingreds, id, this);
+        Ptr ptr = searchId(ingreds, id, this);
         if (!ptr.isEmpty())
             return ptr;
     }
 
     {
-        Ptr ptr = searchId (lights, id, this);
+        Ptr ptr = searchId(lights, id, this);
         if (!ptr.isEmpty())
             return ptr;
     }
 
     {
-        Ptr ptr = searchId (lockpicks, id, this);
+        Ptr ptr = searchId(lockpicks, id, this);
         if (!ptr.isEmpty())
             return ptr;
     }
 
     {
-        Ptr ptr = searchId (miscItems, id, this);
+        Ptr ptr = searchId(miscItems, id, this);
         if (!ptr.isEmpty())
             return ptr;
     }
 
     {
-        Ptr ptr = searchId (probes, id, this);
+        Ptr ptr = searchId(probes, id, this);
         if (!ptr.isEmpty())
             return ptr;
     }
 
     {
-        Ptr ptr = searchId (repairs, id, this);
+        Ptr ptr = searchId(repairs, id, this);
         if (!ptr.isEmpty())
             return ptr;
     }
 
     {
-        Ptr ptr = searchId (weapons, id, this);
+        Ptr ptr = searchId(weapons, id, this);
         if (!ptr.isEmpty())
             return ptr;
     }
@@ -840,7 +889,7 @@ MWWorld::Ptr MWWorld::ContainerStore::search(std::string_view id)
 int MWWorld::ContainerStore::addItems(int count1, int count2)
 {
     int sum = std::abs(count1) + std::abs(count2);
-    if(count1 < 0 || count2 < 0)
+    if (count1 < 0 || count2 < 0)
         return -sum;
     return sum;
 }
@@ -848,31 +897,31 @@ int MWWorld::ContainerStore::addItems(int count1, int count2)
 int MWWorld::ContainerStore::subtractItems(int count1, int count2)
 {
     int sum = std::abs(count1) - std::abs(count2);
-    if(count1 < 0 || count2 < 0)
+    if (count1 < 0 || count2 < 0)
         return -sum;
     return sum;
 }
 
-void MWWorld::ContainerStore::writeState (ESM::InventoryState& state) const
+void MWWorld::ContainerStore::writeState(ESM::InventoryState& state) const
 {
     state.mItems.clear();
 
     int index = 0;
-    storeStates (potions, state, index);
-    storeStates (appas, state, index);
-    storeStates (armors, state, index, true);
-    storeStates (books, state, index, true); // not equipable as such, but for selectedEnchantItem
-    storeStates (clothes, state, index, true);
-    storeStates (ingreds, state, index);
-    storeStates (lockpicks, state, index, true);
-    storeStates (miscItems, state, index);
-    storeStates (probes, state, index, true);
-    storeStates (repairs, state, index);
-    storeStates (weapons, state, index, true);
-    storeStates (lights, state, index, true);
-}
-
-void MWWorld::ContainerStore::readState (const ESM::InventoryState& inventory)
+    storeStates(potions, state, index);
+    storeStates(appas, state, index);
+    storeStates(armors, state, index, true);
+    storeStates(books, state, index, true); // not equipable as such, but for selectedEnchantItem
+    storeStates(clothes, state, index, true);
+    storeStates(ingreds, state, index);
+    storeStates(lockpicks, state, index, true);
+    storeStates(miscItems, state, index);
+    storeStates(probes, state, index, true);
+    storeStates(repairs, state, index);
+    storeStates(weapons, state, index, true);
+    storeStates(lights, state, index, true);
+}
+
+void MWWorld::ContainerStore::readState(const ESM::InventoryState& inventory)
 {
     clear();
     mModified = true;
@@ -887,20 +936,45 @@ void MWWorld::ContainerStore::readState (const ESM::InventoryState& inventory)
 
         switch (type)
         {
-            case ESM::REC_ALCH: getState (potions, state); break;
-            case ESM::REC_APPA: getState (appas, state); break;
-            case ESM::REC_ARMO: readEquipmentState (getState (armors, state), thisIndex, inventory); break;
-            case ESM::REC_BOOK: readEquipmentState (getState (books, state), thisIndex, inventory); break; // not equipable as such, but for selectedEnchantItem
-            case ESM::REC_CLOT: readEquipmentState (getState (clothes, state), thisIndex, inventory); break;
-            case ESM::REC_INGR: getState (ingreds, state); break;
-            case ESM::REC_LOCK: readEquipmentState (getState (lockpicks, state), thisIndex, inventory); break;
-            case ESM::REC_MISC: getState (miscItems, state); break;
-            case ESM::REC_PROB: readEquipmentState (getState (probes, state), thisIndex, inventory); break;
-            case ESM::REC_REPA: getState (repairs, state); break;
-            case ESM::REC_WEAP: readEquipmentState (getState (weapons, state), thisIndex, inventory); break;
-            case ESM::REC_LIGH: readEquipmentState (getState (lights, state), thisIndex, inventory); break;
+            case ESM::REC_ALCH:
+                getState(potions, state);
+                break;
+            case ESM::REC_APPA:
+                getState(appas, state);
+                break;
+            case ESM::REC_ARMO:
+                readEquipmentState(getState(armors, state), thisIndex, inventory);
+                break;
+            case ESM::REC_BOOK:
+                readEquipmentState(getState(books, state), thisIndex, inventory);
+                break; // not equipable as such, but for selectedEnchantItem
+            case ESM::REC_CLOT:
+                readEquipmentState(getState(clothes, state), thisIndex, inventory);
+                break;
+            case ESM::REC_INGR:
+                getState(ingreds, state);
+                break;
+            case ESM::REC_LOCK:
+                readEquipmentState(getState(lockpicks, state), thisIndex, inventory);
+                break;
+            case ESM::REC_MISC:
+                getState(miscItems, state);
+                break;
+            case ESM::REC_PROB:
+                readEquipmentState(getState(probes, state), thisIndex, inventory);
+                break;
+            case ESM::REC_REPA:
+                getState(repairs, state);
+                break;
+            case ESM::REC_WEAP:
+                readEquipmentState(getState(weapons, state), thisIndex, inventory);
+                break;
+            case ESM::REC_LIGH:
+                readEquipmentState(getState(lights, state), thisIndex, inventory);
+                break;
             case 0:
-                Log(Debug::Warning) << "Dropping inventory reference to '" << state.mRef.mRefID << "' (object no longer exists)";
+                Log(Debug::Warning) << "Dropping inventory reference to '" << state.mRef.mRefID
+                                    << "' (object no longer exists)";
                 break;
             default:
                 Log(Debug::Warning) << "Warning: Invalid item type in inventory state, refid " << state.mRef.mRefID;
@@ -909,9 +983,9 @@ void MWWorld::ContainerStore::readState (const ESM::InventoryState& inventory)
     }
 }
 
-template<class PtrType>
-template<class T>
-void MWWorld::ContainerStoreIteratorBase<PtrType>::copy (const ContainerStoreIteratorBase<T>& src)
+template <class PtrType>
+template <class T>
+void MWWorld::ContainerStoreIteratorBase<PtrType>::copy(const ContainerStoreIteratorBase<T>& src)
 {
     mType = src.mType;
     mMask = src.mMask;
@@ -920,51 +994,77 @@ void MWWorld::ContainerStoreIteratorBase<PtrType>::copy (const ContainerStoreIte
 
     switch (src.mType)
     {
-        case MWWorld::ContainerStore::Type_Potion: mPotion = src.mPotion; break;
-        case MWWorld::ContainerStore::Type_Apparatus: mApparatus = src.mApparatus; break;
-        case MWWorld::ContainerStore::Type_Armor: mArmor = src.mArmor; break;
-        case MWWorld::ContainerStore::Type_Book: mBook = src.mBook; break;
-        case MWWorld::ContainerStore::Type_Clothing: mClothing = src.mClothing; break;
-        case MWWorld::ContainerStore::Type_Ingredient: mIngredient = src.mIngredient; break;
-        case MWWorld::ContainerStore::Type_Light: mLight = src.mLight; break;
-        case MWWorld::ContainerStore::Type_Lockpick: mLockpick = src.mLockpick; break;
-        case MWWorld::ContainerStore::Type_Miscellaneous: mMiscellaneous = src.mMiscellaneous; break;
-        case MWWorld::ContainerStore::Type_Probe: mProbe = src.mProbe; break;
-        case MWWorld::ContainerStore::Type_Repair: mRepair = src.mRepair; break;
-        case MWWorld::ContainerStore::Type_Weapon: mWeapon = src.mWeapon; break;
-        case -1: break;
-        default: assert(0);
+        case MWWorld::ContainerStore::Type_Potion:
+            mPotion = src.mPotion;
+            break;
+        case MWWorld::ContainerStore::Type_Apparatus:
+            mApparatus = src.mApparatus;
+            break;
+        case MWWorld::ContainerStore::Type_Armor:
+            mArmor = src.mArmor;
+            break;
+        case MWWorld::ContainerStore::Type_Book:
+            mBook = src.mBook;
+            break;
+        case MWWorld::ContainerStore::Type_Clothing:
+            mClothing = src.mClothing;
+            break;
+        case MWWorld::ContainerStore::Type_Ingredient:
+            mIngredient = src.mIngredient;
+            break;
+        case MWWorld::ContainerStore::Type_Light:
+            mLight = src.mLight;
+            break;
+        case MWWorld::ContainerStore::Type_Lockpick:
+            mLockpick = src.mLockpick;
+            break;
+        case MWWorld::ContainerStore::Type_Miscellaneous:
+            mMiscellaneous = src.mMiscellaneous;
+            break;
+        case MWWorld::ContainerStore::Type_Probe:
+            mProbe = src.mProbe;
+            break;
+        case MWWorld::ContainerStore::Type_Repair:
+            mRepair = src.mRepair;
+            break;
+        case MWWorld::ContainerStore::Type_Weapon:
+            mWeapon = src.mWeapon;
+            break;
+        case -1:
+            break;
+        default:
+            assert(0);
     }
 }
 
-template<class PtrType>
+template <class PtrType>
 void MWWorld::ContainerStoreIteratorBase<PtrType>::incType()
 {
-    if (mType==0)
+    if (mType == 0)
         mType = 1;
-    else if (mType!=-1)
+    else if (mType != -1)
     {
         mType <<= 1;
 
-        if (mType>ContainerStore::Type_Last)
+        if (mType > ContainerStore::Type_Last)
             mType = -1;
     }
 }
 
-template<class PtrType>
+template <class PtrType>
 void MWWorld::ContainerStoreIteratorBase<PtrType>::nextType()
 {
-    while (mType!=-1)
+    while (mType != -1)
     {
         incType();
 
-        if ((mType & mMask) && mType>0)
+        if ((mType & mMask) && mType > 0)
             if (resetIterator())
                 break;
     }
 }
 
-template<class PtrType>
+template <class PtrType>
 bool MWWorld::ContainerStoreIteratorBase<PtrType>::resetIterator()
 {
     switch (mType)
@@ -972,68 +1072,68 @@ bool MWWorld::ContainerStoreIteratorBase<PtrType>::resetIterator()
         case ContainerStore::Type_Potion:
 
             mPotion = mContainer->potions.mList.begin();
-            return mPotion!=mContainer->potions.mList.end();
+            return mPotion != mContainer->potions.mList.end();
 
         case ContainerStore::Type_Apparatus:
 
             mApparatus = mContainer->appas.mList.begin();
-            return mApparatus!=mContainer->appas.mList.end();
+            return mApparatus != mContainer->appas.mList.end();
 
         case ContainerStore::Type_Armor:
 
             mArmor = mContainer->armors.mList.begin();
-            return mArmor!=mContainer->armors.mList.end();
+            return mArmor != mContainer->armors.mList.end();
 
         case ContainerStore::Type_Book:
 
             mBook = mContainer->books.mList.begin();
-            return mBook!=mContainer->books.mList.end();
+            return mBook != mContainer->books.mList.end();
 
         case ContainerStore::Type_Clothing:
 
             mClothing = mContainer->clothes.mList.begin();
-            return mClothing!=mContainer->clothes.mList.end();
+            return mClothing != mContainer->clothes.mList.end();
 
         case ContainerStore::Type_Ingredient:
 
             mIngredient = mContainer->ingreds.mList.begin();
-            return mIngredient!=mContainer->ingreds.mList.end();
+            return mIngredient != mContainer->ingreds.mList.end();
 
         case ContainerStore::Type_Light:
 
             mLight = mContainer->lights.mList.begin();
-            return mLight!=mContainer->lights.mList.end();
+            return mLight != mContainer->lights.mList.end();
 
         case ContainerStore::Type_Lockpick:
 
             mLockpick = mContainer->lockpicks.mList.begin();
-            return mLockpick!=mContainer->lockpicks.mList.end();
+            return mLockpick != mContainer->lockpicks.mList.end();
 
         case ContainerStore::Type_Miscellaneous:
 
             mMiscellaneous = mContainer->miscItems.mList.begin();
-            return mMiscellaneous!=mContainer->miscItems.mList.end();
+            return mMiscellaneous != mContainer->miscItems.mList.end();
 
         case ContainerStore::Type_Probe:
 
             mProbe = mContainer->probes.mList.begin();
-            return mProbe!=mContainer->probes.mList.end();
+            return mProbe != mContainer->probes.mList.end();
 
         case ContainerStore::Type_Repair:
 
             mRepair = mContainer->repairs.mList.begin();
-            return mRepair!=mContainer->repairs.mList.end();
+            return mRepair != mContainer->repairs.mList.end();
 
         case ContainerStore::Type_Weapon:
 
             mWeapon = mContainer->weapons.mList.begin();
-            return mWeapon!=mContainer->weapons.mList.end();
+            return mWeapon != mContainer->weapons.mList.end();
     }
 
     return false;
 }
 
-template<class PtrType>
+template <class PtrType>
 bool MWWorld::ContainerStoreIteratorBase<PtrType>::incIterator()
 {
     switch (mType)
@@ -1041,267 +1141,388 @@ bool MWWorld::ContainerStoreIteratorBase<PtrType>::incIterator()
         case ContainerStore::Type_Potion:
 
             ++mPotion;
-            return mPotion==mContainer->potions.mList.end();
+            return mPotion == mContainer->potions.mList.end();
 
         case ContainerStore::Type_Apparatus:
 
             ++mApparatus;
-            return mApparatus==mContainer->appas.mList.end();
+            return mApparatus == mContainer->appas.mList.end();
 
         case ContainerStore::Type_Armor:
 
             ++mArmor;
-            return mArmor==mContainer->armors.mList.end();
+            return mArmor == mContainer->armors.mList.end();
 
         case ContainerStore::Type_Book:
 
             ++mBook;
-            return mBook==mContainer->books.mList.end();
+            return mBook == mContainer->books.mList.end();
 
         case ContainerStore::Type_Clothing:
 
             ++mClothing;
-            return mClothing==mContainer->clothes.mList.end();
+            return mClothing == mContainer->clothes.mList.end();
 
         case ContainerStore::Type_Ingredient:
 
             ++mIngredient;
-            return mIngredient==mContainer->ingreds.mList.end();
+            return mIngredient == mContainer->ingreds.mList.end();
 
         case ContainerStore::Type_Light:
 
             ++mLight;
-            return mLight==mContainer->lights.mList.end();
+            return mLight == mContainer->lights.mList.end();
 
         case ContainerStore::Type_Lockpick:
 
             ++mLockpick;
-            return mLockpick==mContainer->lockpicks.mList.end();
+            return mLockpick == mContainer->lockpicks.mList.end();
 
         case ContainerStore::Type_Miscellaneous:
 
             ++mMiscellaneous;
-            return mMiscellaneous==mContainer->miscItems.mList.end();
+            return mMiscellaneous == mContainer->miscItems.mList.end();
 
         case ContainerStore::Type_Probe:
 
             ++mProbe;
-            return mProbe==mContainer->probes.mList.end();
+            return mProbe == mContainer->probes.mList.end();
 
         case ContainerStore::Type_Repair:
 
             ++mRepair;
-            return mRepair==mContainer->repairs.mList.end();
+            return mRepair == mContainer->repairs.mList.end();
 
         case ContainerStore::Type_Weapon:
 
             ++mWeapon;
-            return mWeapon==mContainer->weapons.mList.end();
+            return mWeapon == mContainer->weapons.mList.end();
     }
 
     return true;
 }
 
-
-template<class PtrType>
-template<class T>
-bool MWWorld::ContainerStoreIteratorBase<PtrType>::isEqual (const ContainerStoreIteratorBase<T>& other) const
+template <class PtrType>
+template <class T>
+bool MWWorld::ContainerStoreIteratorBase<PtrType>::isEqual(const ContainerStoreIteratorBase<T>& other) const
 {
-    if (mContainer!=other.mContainer)
+    if (mContainer != other.mContainer)
         return false;
 
-    if (mType!=other.mType)
+    if (mType != other.mType)
         return false;
 
     switch (mType)
     {
-        case ContainerStore::Type_Potion: return mPotion==other.mPotion;
-        case ContainerStore::Type_Apparatus: return mApparatus==other.mApparatus;
-        case ContainerStore::Type_Armor: return mArmor==other.mArmor;
-        case ContainerStore::Type_Book: return mBook==other.mBook;
-        case ContainerStore::Type_Clothing: return mClothing==other.mClothing;
-        case ContainerStore::Type_Ingredient: return mIngredient==other.mIngredient;
-        case ContainerStore::Type_Light: return mLight==other.mLight;
-        case ContainerStore::Type_Lockpick: return mLockpick==other.mLockpick;
-        case ContainerStore::Type_Miscellaneous: return mMiscellaneous==other.mMiscellaneous;
-        case ContainerStore::Type_Probe: return mProbe==other.mProbe;
-        case ContainerStore::Type_Repair: return mRepair==other.mRepair;
-        case ContainerStore::Type_Weapon: return mWeapon==other.mWeapon;
-        case -1: return true;
+        case ContainerStore::Type_Potion:
+            return mPotion == other.mPotion;
+        case ContainerStore::Type_Apparatus:
+            return mApparatus == other.mApparatus;
+        case ContainerStore::Type_Armor:
+            return mArmor == other.mArmor;
+        case ContainerStore::Type_Book:
+            return mBook == other.mBook;
+        case ContainerStore::Type_Clothing:
+            return mClothing == other.mClothing;
+        case ContainerStore::Type_Ingredient:
+            return mIngredient == other.mIngredient;
+        case ContainerStore::Type_Light:
+            return mLight == other.mLight;
+        case ContainerStore::Type_Lockpick:
+            return mLockpick == other.mLockpick;
+        case ContainerStore::Type_Miscellaneous:
+            return mMiscellaneous == other.mMiscellaneous;
+        case ContainerStore::Type_Probe:
+            return mProbe == other.mProbe;
+        case ContainerStore::Type_Repair:
+            return mRepair == other.mRepair;
+        case ContainerStore::Type_Weapon:
+            return mWeapon == other.mWeapon;
+        case -1:
+            return true;
     }
 
-    return false;  
+    return false;
 }
 
-template<class PtrType>
-PtrType *MWWorld::ContainerStoreIteratorBase<PtrType>::operator->() const
+template <class PtrType>
+PtrType* MWWorld::ContainerStoreIteratorBase<PtrType>::operator->() const
 {
     mPtr = **this;
     return &mPtr;
 }
 
-template<class PtrType>
+template <class PtrType>
 PtrType MWWorld::ContainerStoreIteratorBase<PtrType>::operator*() const
 {
     PtrType ptr;
 
     switch (mType)
     {
-        case ContainerStore::Type_Potion: ptr = PtrType (&*mPotion, nullptr); break;
-        case ContainerStore::Type_Apparatus: ptr = PtrType (&*mApparatus, nullptr); break;
-        case ContainerStore::Type_Armor: ptr = PtrType (&*mArmor, nullptr); break;
-        case ContainerStore::Type_Book: ptr = PtrType (&*mBook, nullptr); break;
-        case ContainerStore::Type_Clothing: ptr = PtrType (&*mClothing, nullptr); break;
-        case ContainerStore::Type_Ingredient: ptr = PtrType (&*mIngredient, nullptr); break;
-        case ContainerStore::Type_Light: ptr = PtrType (&*mLight, nullptr); break;
-        case ContainerStore::Type_Lockpick: ptr = PtrType (&*mLockpick, nullptr); break;
-        case ContainerStore::Type_Miscellaneous: ptr = PtrType (&*mMiscellaneous, nullptr); break;
-        case ContainerStore::Type_Probe: ptr = PtrType (&*mProbe, nullptr); break;
-        case ContainerStore::Type_Repair: ptr = PtrType (&*mRepair, nullptr); break;
-        case ContainerStore::Type_Weapon: ptr = PtrType (&*mWeapon, nullptr); break;
+        case ContainerStore::Type_Potion:
+            ptr = PtrType(&*mPotion, nullptr);
+            break;
+        case ContainerStore::Type_Apparatus:
+            ptr = PtrType(&*mApparatus, nullptr);
+            break;
+        case ContainerStore::Type_Armor:
+            ptr = PtrType(&*mArmor, nullptr);
+            break;
+        case ContainerStore::Type_Book:
+            ptr = PtrType(&*mBook, nullptr);
+            break;
+        case ContainerStore::Type_Clothing:
+            ptr = PtrType(&*mClothing, nullptr);
+            break;
+        case ContainerStore::Type_Ingredient:
+            ptr = PtrType(&*mIngredient, nullptr);
+            break;
+        case ContainerStore::Type_Light:
+            ptr = PtrType(&*mLight, nullptr);
+            break;
+        case ContainerStore::Type_Lockpick:
+            ptr = PtrType(&*mLockpick, nullptr);
+            break;
+        case ContainerStore::Type_Miscellaneous:
+            ptr = PtrType(&*mMiscellaneous, nullptr);
+            break;
+        case ContainerStore::Type_Probe:
+            ptr = PtrType(&*mProbe, nullptr);
+            break;
+        case ContainerStore::Type_Repair:
+            ptr = PtrType(&*mRepair, nullptr);
+            break;
+        case ContainerStore::Type_Weapon:
+            ptr = PtrType(&*mWeapon, nullptr);
+            break;
     }
 
     if (ptr.isEmpty())
-        throw std::runtime_error ("invalid iterator");
+        throw std::runtime_error("invalid iterator");
 
-    ptr.setContainerStore (mContainer);
+    ptr.setContainerStore(mContainer);
 
     return ptr;
 }
 
-template<class PtrType>
+template <class PtrType>
 MWWorld::ContainerStoreIteratorBase<PtrType>& MWWorld::ContainerStoreIteratorBase<PtrType>::operator++()
 {
     do
     {
         if (incIterator())
             nextType();
-    }
-    while (mType!=-1 && !(**this).getRefData().getCount());
+    } while (mType != -1 && !(**this).getRefData().getCount());
 
     return *this;
 }
 
-template<class PtrType>
-MWWorld::ContainerStoreIteratorBase<PtrType> MWWorld::ContainerStoreIteratorBase<PtrType>::operator++ (int)
+template <class PtrType>
+MWWorld::ContainerStoreIteratorBase<PtrType> MWWorld::ContainerStoreIteratorBase<PtrType>::operator++(int)
 {
-    ContainerStoreIteratorBase<PtrType> iter (*this);
+    ContainerStoreIteratorBase<PtrType> iter(*this);
     ++*this;
     return iter;
 }
 
-template<class PtrType>
-MWWorld::ContainerStoreIteratorBase<PtrType>& MWWorld::ContainerStoreIteratorBase<PtrType>::operator= (const ContainerStoreIteratorBase<PtrType>& rhs)
+template <class PtrType>
+MWWorld::ContainerStoreIteratorBase<PtrType>& MWWorld::ContainerStoreIteratorBase<PtrType>::operator=(
+    const ContainerStoreIteratorBase<PtrType>& rhs)
 {
-    if (this!=&rhs)
+    if (this != &rhs)
     {
         copy(rhs);
     }
     return *this;
 }
 
-template<class PtrType>
+template <class PtrType>
 int MWWorld::ContainerStoreIteratorBase<PtrType>::getType() const
 {
     return mType;
 }
 
-template<class PtrType>
-const MWWorld::ContainerStore *MWWorld::ContainerStoreIteratorBase<PtrType>::getContainerStore() const
+template <class PtrType>
+const MWWorld::ContainerStore* MWWorld::ContainerStoreIteratorBase<PtrType>::getContainerStore() const
 {
     return mContainer;
 }
 
-template<class PtrType>
-MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase (ContainerStoreType container)
-: mType (-1), mMask (0), mContainer (container)
-{}
+template <class PtrType>
+MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase(ContainerStoreType container)
+    : mType(-1)
+    , mMask(0)
+    , mContainer(container)
+{
+}
 
-template<class PtrType>
-MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase (int mask, ContainerStoreType container)
-: mType (0), mMask (mask), mContainer (container)
+template <class PtrType>
+MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase(int mask, ContainerStoreType container)
+    : mType(0)
+    , mMask(mask)
+    , mContainer(container)
 {
     nextType();
 
-    if (mType==-1 || (**this).getRefData().getCount())
+    if (mType == -1 || (**this).getRefData().getCount())
         return;
 
     ++*this;
 }
 
-template<class PtrType>
-MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Potion>::type iterator)
-    : mType(MWWorld::ContainerStore::Type_Potion), mMask(MWWorld::ContainerStore::Type_All), mContainer(container), mPotion(iterator){}
-
-template<class PtrType>
-MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Apparatus>::type iterator)
-    : mType(MWWorld::ContainerStore::Type_Apparatus), mMask(MWWorld::ContainerStore::Type_All), mContainer(container), mApparatus(iterator){}
+template <class PtrType>
+MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase(
+    ContainerStoreType container, typename Iterator<ESM::Potion>::type iterator)
+    : mType(MWWorld::ContainerStore::Type_Potion)
+    , mMask(MWWorld::ContainerStore::Type_All)
+    , mContainer(container)
+    , mPotion(iterator)
+{
+}
 
-template<class PtrType>
-MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Armor>::type iterator)
-    : mType(MWWorld::ContainerStore::Type_Armor), mMask(MWWorld::ContainerStore::Type_All), mContainer(container), mArmor(iterator){}
+template <class PtrType>
+MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase(
+    ContainerStoreType container, typename Iterator<ESM::Apparatus>::type iterator)
+    : mType(MWWorld::ContainerStore::Type_Apparatus)
+    , mMask(MWWorld::ContainerStore::Type_All)
+    , mContainer(container)
+    , mApparatus(iterator)
+{
+}
 
-template<class PtrType>
-MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Book>::type iterator)
-    : mType(MWWorld::ContainerStore::Type_Book), mMask(MWWorld::ContainerStore::Type_All), mContainer(container), mBook(iterator){}
+template <class PtrType>
+MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase(
+    ContainerStoreType container, typename Iterator<ESM::Armor>::type iterator)
+    : mType(MWWorld::ContainerStore::Type_Armor)
+    , mMask(MWWorld::ContainerStore::Type_All)
+    , mContainer(container)
+    , mArmor(iterator)
+{
+}
 
-template<class PtrType>
-MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Clothing>::type iterator)
-    : mType(MWWorld::ContainerStore::Type_Clothing), mMask(MWWorld::ContainerStore::Type_All), mContainer(container), mClothing(iterator){}
+template <class PtrType>
+MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase(
+    ContainerStoreType container, typename Iterator<ESM::Book>::type iterator)
+    : mType(MWWorld::ContainerStore::Type_Book)
+    , mMask(MWWorld::ContainerStore::Type_All)
+    , mContainer(container)
+    , mBook(iterator)
+{
+}
 
-template<class PtrType>
-MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Ingredient>::type iterator)
-    : mType(MWWorld::ContainerStore::Type_Ingredient), mMask(MWWorld::ContainerStore::Type_All), mContainer(container), mIngredient(iterator){}
+template <class PtrType>
+MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase(
+    ContainerStoreType container, typename Iterator<ESM::Clothing>::type iterator)
+    : mType(MWWorld::ContainerStore::Type_Clothing)
+    , mMask(MWWorld::ContainerStore::Type_All)
+    , mContainer(container)
+    , mClothing(iterator)
+{
+}
 
-template<class PtrType>
-MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Light>::type iterator)
-    : mType(MWWorld::ContainerStore::Type_Light), mMask(MWWorld::ContainerStore::Type_All), mContainer(container), mLight(iterator){}
+template <class PtrType>
+MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase(
+    ContainerStoreType container, typename Iterator<ESM::Ingredient>::type iterator)
+    : mType(MWWorld::ContainerStore::Type_Ingredient)
+    , mMask(MWWorld::ContainerStore::Type_All)
+    , mContainer(container)
+    , mIngredient(iterator)
+{
+}
 
-template<class PtrType>
-MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Lockpick>::type iterator)
-    : mType(MWWorld::ContainerStore::Type_Lockpick), mMask(MWWorld::ContainerStore::Type_All), mContainer(container), mLockpick(iterator){}
+template <class PtrType>
+MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase(
+    ContainerStoreType container, typename Iterator<ESM::Light>::type iterator)
+    : mType(MWWorld::ContainerStore::Type_Light)
+    , mMask(MWWorld::ContainerStore::Type_All)
+    , mContainer(container)
+    , mLight(iterator)
+{
+}
 
-template<class PtrType>
-MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Miscellaneous>::type iterator)
-    : mType(MWWorld::ContainerStore::Type_Miscellaneous), mMask(MWWorld::ContainerStore::Type_All), mContainer(container), mMiscellaneous(iterator){}
+template <class PtrType>
+MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase(
+    ContainerStoreType container, typename Iterator<ESM::Lockpick>::type iterator)
+    : mType(MWWorld::ContainerStore::Type_Lockpick)
+    , mMask(MWWorld::ContainerStore::Type_All)
+    , mContainer(container)
+    , mLockpick(iterator)
+{
+}
 
-template<class PtrType>
-MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Probe>::type iterator)
-    : mType(MWWorld::ContainerStore::Type_Probe), mMask(MWWorld::ContainerStore::Type_All), mContainer(container), mProbe(iterator){}
+template <class PtrType>
+MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase(
+    ContainerStoreType container, typename Iterator<ESM::Miscellaneous>::type iterator)
+    : mType(MWWorld::ContainerStore::Type_Miscellaneous)
+    , mMask(MWWorld::ContainerStore::Type_All)
+    , mContainer(container)
+    , mMiscellaneous(iterator)
+{
+}
 
-template<class PtrType>
-MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Repair>::type iterator)
-    : mType(MWWorld::ContainerStore::Type_Repair), mMask(MWWorld::ContainerStore::Type_All), mContainer(container), mRepair(iterator){}
+template <class PtrType>
+MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase(
+    ContainerStoreType container, typename Iterator<ESM::Probe>::type iterator)
+    : mType(MWWorld::ContainerStore::Type_Probe)
+    , mMask(MWWorld::ContainerStore::Type_All)
+    , mContainer(container)
+    , mProbe(iterator)
+{
+}
 
-template<class PtrType>
-MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Weapon>::type iterator)
-    : mType(MWWorld::ContainerStore::Type_Weapon), mMask(MWWorld::ContainerStore::Type_All), mContainer(container), mWeapon(iterator){}
+template <class PtrType>
+MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase(
+    ContainerStoreType container, typename Iterator<ESM::Repair>::type iterator)
+    : mType(MWWorld::ContainerStore::Type_Repair)
+    , mMask(MWWorld::ContainerStore::Type_All)
+    , mContainer(container)
+    , mRepair(iterator)
+{
+}
 
+template <class PtrType>
+MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase(
+    ContainerStoreType container, typename Iterator<ESM::Weapon>::type iterator)
+    : mType(MWWorld::ContainerStore::Type_Weapon)
+    , mMask(MWWorld::ContainerStore::Type_All)
+    , mContainer(container)
+    , mWeapon(iterator)
+{
+}
 
-template<class T, class U>
-bool MWWorld::operator== (const ContainerStoreIteratorBase<T>& left, const ContainerStoreIteratorBase<U>& right)
+template <class T, class U>
+bool MWWorld::operator==(const ContainerStoreIteratorBase<T>& left, const ContainerStoreIteratorBase<U>& right)
 {
-    return left.isEqual (right);
+    return left.isEqual(right);
 }
 
-template<class T, class U>
-bool MWWorld::operator!= (const ContainerStoreIteratorBase<T>& left, const ContainerStoreIteratorBase<U>& right)
+template <class T, class U>
+bool MWWorld::operator!=(const ContainerStoreIteratorBase<T>& left, const ContainerStoreIteratorBase<U>& right)
 {
-    return !(left==right);
+    return !(left == right);
 }
 
 template class MWWorld::ContainerStoreIteratorBase<MWWorld::Ptr>;
 template class MWWorld::ContainerStoreIteratorBase<MWWorld::ConstPtr>;
 
-template bool MWWorld::operator== (const ContainerStoreIteratorBase<Ptr>& left, const ContainerStoreIteratorBase<Ptr>& right);
-template bool MWWorld::operator!= (const ContainerStoreIteratorBase<Ptr>& left, const ContainerStoreIteratorBase<Ptr>& right);
-template bool MWWorld::operator== (const ContainerStoreIteratorBase<ConstPtr>& left, const ContainerStoreIteratorBase<ConstPtr>& right);
-template bool MWWorld::operator!= (const ContainerStoreIteratorBase<ConstPtr>& left, const ContainerStoreIteratorBase<ConstPtr>& right);
-template bool MWWorld::operator== (const ContainerStoreIteratorBase<ConstPtr>& left, const ContainerStoreIteratorBase<Ptr>& right);
-template bool MWWorld::operator!= (const ContainerStoreIteratorBase<ConstPtr>& left, const ContainerStoreIteratorBase<Ptr>& right);
-template bool MWWorld::operator== (const ContainerStoreIteratorBase<Ptr>& left, const ContainerStoreIteratorBase<ConstPtr>& right);
-template bool MWWorld::operator!= (const ContainerStoreIteratorBase<Ptr>& left, const ContainerStoreIteratorBase<ConstPtr>& right);
+template bool MWWorld::operator==(
+    const ContainerStoreIteratorBase<Ptr>& left, const ContainerStoreIteratorBase<Ptr>& right);
+template bool MWWorld::operator!=(
+    const ContainerStoreIteratorBase<Ptr>& left, const ContainerStoreIteratorBase<Ptr>& right);
+template bool MWWorld::operator==(
+    const ContainerStoreIteratorBase<ConstPtr>& left, const ContainerStoreIteratorBase<ConstPtr>& right);
+template bool MWWorld::operator!=(
+    const ContainerStoreIteratorBase<ConstPtr>& left, const ContainerStoreIteratorBase<ConstPtr>& right);
+template bool MWWorld::operator==(
+    const ContainerStoreIteratorBase<ConstPtr>& left, const ContainerStoreIteratorBase<Ptr>& right);
+template bool MWWorld::operator!=(
+    const ContainerStoreIteratorBase<ConstPtr>& left, const ContainerStoreIteratorBase<Ptr>& right);
+template bool MWWorld::operator==(
+    const ContainerStoreIteratorBase<Ptr>& left, const ContainerStoreIteratorBase<ConstPtr>& right);
+template bool MWWorld::operator!=(
+    const ContainerStoreIteratorBase<Ptr>& left, const ContainerStoreIteratorBase<ConstPtr>& right);
 
 template void MWWorld::ContainerStoreIteratorBase<MWWorld::Ptr>::copy(const ContainerStoreIteratorBase<Ptr>& src);
 template void MWWorld::ContainerStoreIteratorBase<MWWorld::ConstPtr>::copy(const ContainerStoreIteratorBase<Ptr>& src);
-template void MWWorld::ContainerStoreIteratorBase<MWWorld::ConstPtr>::copy(const ContainerStoreIteratorBase<ConstPtr>& src);
+template void MWWorld::ContainerStoreIteratorBase<MWWorld::ConstPtr>::copy(
+    const ContainerStoreIteratorBase<ConstPtr>& src);
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index 94207e1df2..486993c308 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -12,8 +12,8 @@
 #include <components/esm3/loadbook.hpp>
 #include <components/esm3/loadclot.hpp>
 #include <components/esm3/loadingr.hpp>
-#include <components/esm3/loadlock.hpp>
 #include <components/esm3/loadligh.hpp>
+#include <components/esm3/loadlock.hpp>
 #include <components/esm3/loadmisc.hpp>
 #include <components/esm3/loadprob.hpp>
 #include <components/esm3/loadrepa.hpp>
@@ -21,8 +21,8 @@
 
 #include <components/misc/rng.hpp>
 
-#include "ptr.hpp"
 #include "cellreflist.hpp"
+#include "ptr.hpp"
 
 namespace ESM
 {
@@ -39,7 +39,7 @@ namespace MWWorld
 {
     class ContainerStore;
 
-    template<class PtrType>
+    template <class PtrType>
     class ContainerStoreIteratorBase;
 
     typedef ContainerStoreIteratorBase<Ptr> ContainerStoreIterator;
@@ -47,256 +47,269 @@ namespace MWWorld
 
     class ResolutionListener
     {
-            ContainerStore& mStore;
-        public:
-            ResolutionListener(ContainerStore& store) : mStore(store) {}
-            ~ResolutionListener();
+        ContainerStore& mStore;
+
+    public:
+        ResolutionListener(ContainerStore& store)
+            : mStore(store)
+        {
+        }
+        ~ResolutionListener();
     };
 
     class ResolutionHandle
     {
-            std::shared_ptr<ResolutionListener> mListener;
-        public:
-            ResolutionHandle(std::shared_ptr<ResolutionListener> listener) : mListener(listener) {}
-            ResolutionHandle() = default;
+        std::shared_ptr<ResolutionListener> mListener;
+
+    public:
+        ResolutionHandle(std::shared_ptr<ResolutionListener> listener)
+            : mListener(listener)
+        {
+        }
+        ResolutionHandle() = default;
     };
-    
+
     class ContainerStoreListener
     {
-        public:
-            virtual void itemAdded(const ConstPtr& item, int count) {}
-            virtual void itemRemoved(const ConstPtr& item, int count) {}
-            virtual ~ContainerStoreListener() = default;
+    public:
+        virtual void itemAdded(const ConstPtr& item, int count) {}
+        virtual void itemRemoved(const ConstPtr& item, int count) {}
+        virtual ~ContainerStoreListener() = default;
     };
 
     class ContainerStore
     {
-        public:
-
-            static constexpr int Type_Potion = 0x0001;
-            static constexpr int Type_Apparatus = 0x0002;
-            static constexpr int Type_Armor = 0x0004;
-            static constexpr int Type_Book = 0x0008;
-            static constexpr int Type_Clothing = 0x0010;
-            static constexpr int Type_Ingredient = 0x0020;
-            static constexpr int Type_Light = 0x0040;
-            static constexpr int Type_Lockpick = 0x0080;
-            static constexpr int Type_Miscellaneous = 0x0100;
-            static constexpr int Type_Probe = 0x0200;
-            static constexpr int Type_Repair = 0x0400;
-            static constexpr int Type_Weapon = 0x0800;
-
-            static constexpr int Type_Last = Type_Weapon;
-
-            static constexpr int Type_All = 0xffff;
-
-            static const std::string_view sGoldId;
-
-        protected:
-            ContainerStoreListener* mListener;
-
-            // (item, max charge)
-            typedef std::vector<std::pair<ContainerStoreIterator, float> > TRechargingItems;
-            TRechargingItems mRechargingItems;
-
-            bool mRechargingItemsUpToDate;
-
-        private:
-
-            MWWorld::CellRefList<ESM::Potion>            potions;
-            MWWorld::CellRefList<ESM::Apparatus>         appas;
-            MWWorld::CellRefList<ESM::Armor>             armors;
-            MWWorld::CellRefList<ESM::Book>              books;
-            MWWorld::CellRefList<ESM::Clothing>          clothes;
-            MWWorld::CellRefList<ESM::Ingredient>        ingreds;
-            MWWorld::CellRefList<ESM::Light>             lights;
-            MWWorld::CellRefList<ESM::Lockpick>          lockpicks;
-            MWWorld::CellRefList<ESM::Miscellaneous>     miscItems;
-            MWWorld::CellRefList<ESM::Probe>             probes;
-            MWWorld::CellRefList<ESM::Repair>            repairs;
-            MWWorld::CellRefList<ESM::Weapon>            weapons;
-
-            mutable float mCachedWeight;
-            mutable bool mWeightUpToDate;
-
-            bool mModified;
-            bool mResolved;
-            unsigned int mSeed;
-            MWWorld::Ptr mPtr;
-            std::weak_ptr<ResolutionListener> mResolutionListener;
-
-            ContainerStoreIterator addImp (const Ptr& ptr, int count, bool markModified = true);
-            void addInitialItem(std::string_view id, const std::string& owner, int count, Misc::Rng::Generator* prng, bool topLevel=true);
-            void addInitialItemImp (const MWWorld::Ptr& ptr, const std::string& owner, int count, Misc::Rng::Generator* prng, bool topLevel=true);
-
-            template<typename T>
-            ContainerStoreIterator getState (CellRefList<T>& collection,
-                const ESM::ObjectState& state);
-
-            template<typename T>
-            void storeState (const LiveCellRef<T>& ref, ESM::ObjectState& state) const;
-
-            template<typename T>
-            void storeStates (const CellRefList<T>& collection,
-                ESM::InventoryState& inventory, int& index,
-                bool equipable = false) const;
-
-            void updateRechargingItems();
-
-            virtual void storeEquipmentState (const MWWorld::LiveCellRefBase& ref, int index, ESM::InventoryState& inventory) const;
-
-            virtual void readEquipmentState (const MWWorld::ContainerStoreIterator& iter, int index, const ESM::InventoryState& inventory);
-
-        public:
-
-            ContainerStore();
-
-            virtual ~ContainerStore();
-
-            virtual std::unique_ptr<ContainerStore> clone() { return std::make_unique<ContainerStore>(*this); }
-
-            ConstContainerStoreIterator cbegin (int mask = Type_All) const;
-            ConstContainerStoreIterator cend() const;
-            ConstContainerStoreIterator begin (int mask = Type_All) const;
-            ConstContainerStoreIterator end() const;
-            
-            ContainerStoreIterator begin (int mask = Type_All);
-            ContainerStoreIterator end();
-
-            bool hasVisibleItems() const;
+    public:
+        static constexpr int Type_Potion = 0x0001;
+        static constexpr int Type_Apparatus = 0x0002;
+        static constexpr int Type_Armor = 0x0004;
+        static constexpr int Type_Book = 0x0008;
+        static constexpr int Type_Clothing = 0x0010;
+        static constexpr int Type_Ingredient = 0x0020;
+        static constexpr int Type_Light = 0x0040;
+        static constexpr int Type_Lockpick = 0x0080;
+        static constexpr int Type_Miscellaneous = 0x0100;
+        static constexpr int Type_Probe = 0x0200;
+        static constexpr int Type_Repair = 0x0400;
+        static constexpr int Type_Weapon = 0x0800;
+
+        static constexpr int Type_Last = Type_Weapon;
+
+        static constexpr int Type_All = 0xffff;
+
+        static const std::string_view sGoldId;
+
+    protected:
+        ContainerStoreListener* mListener;
+
+        // (item, max charge)
+        typedef std::vector<std::pair<ContainerStoreIterator, float>> TRechargingItems;
+        TRechargingItems mRechargingItems;
+
+        bool mRechargingItemsUpToDate;
+
+    private:
+        MWWorld::CellRefList<ESM::Potion> potions;
+        MWWorld::CellRefList<ESM::Apparatus> appas;
+        MWWorld::CellRefList<ESM::Armor> armors;
+        MWWorld::CellRefList<ESM::Book> books;
+        MWWorld::CellRefList<ESM::Clothing> clothes;
+        MWWorld::CellRefList<ESM::Ingredient> ingreds;
+        MWWorld::CellRefList<ESM::Light> lights;
+        MWWorld::CellRefList<ESM::Lockpick> lockpicks;
+        MWWorld::CellRefList<ESM::Miscellaneous> miscItems;
+        MWWorld::CellRefList<ESM::Probe> probes;
+        MWWorld::CellRefList<ESM::Repair> repairs;
+        MWWorld::CellRefList<ESM::Weapon> weapons;
+
+        mutable float mCachedWeight;
+        mutable bool mWeightUpToDate;
+
+        bool mModified;
+        bool mResolved;
+        unsigned int mSeed;
+        MWWorld::Ptr mPtr;
+        std::weak_ptr<ResolutionListener> mResolutionListener;
+
+        ContainerStoreIterator addImp(const Ptr& ptr, int count, bool markModified = true);
+        void addInitialItem(
+            std::string_view id, const std::string& owner, int count, Misc::Rng::Generator* prng, bool topLevel = true);
+        void addInitialItemImp(const MWWorld::Ptr& ptr, const std::string& owner, int count, Misc::Rng::Generator* prng,
+            bool topLevel = true);
+
+        template <typename T>
+        ContainerStoreIterator getState(CellRefList<T>& collection, const ESM::ObjectState& state);
+
+        template <typename T>
+        void storeState(const LiveCellRef<T>& ref, ESM::ObjectState& state) const;
+
+        template <typename T>
+        void storeStates(
+            const CellRefList<T>& collection, ESM::InventoryState& inventory, int& index, bool equipable = false) const;
+
+        void updateRechargingItems();
+
+        virtual void storeEquipmentState(
+            const MWWorld::LiveCellRefBase& ref, int index, ESM::InventoryState& inventory) const;
+
+        virtual void readEquipmentState(
+            const MWWorld::ContainerStoreIterator& iter, int index, const ESM::InventoryState& inventory);
+
+    public:
+        ContainerStore();
+
+        virtual ~ContainerStore();
+
+        virtual std::unique_ptr<ContainerStore> clone() { return std::make_unique<ContainerStore>(*this); }
+
+        ConstContainerStoreIterator cbegin(int mask = Type_All) const;
+        ConstContainerStoreIterator cend() const;
+        ConstContainerStoreIterator begin(int mask = Type_All) const;
+        ConstContainerStoreIterator end() const;
+
+        ContainerStoreIterator begin(int mask = Type_All);
+        ContainerStoreIterator end();
+
+        bool hasVisibleItems() const;
+
+        virtual ContainerStoreIterator add(
+            const Ptr& itemPtr, int count, const Ptr& actorPtr, bool allowAutoEquip = true, bool resolve = true);
+        ///< Add the item pointed to by \a ptr to this container. (Stacks automatically if needed)
+        ///
+        /// \note The item pointed to is not required to exist beyond this function call.
+        ///
+        /// \attention Do not add items to an existing stack by increasing the count instead of
+        /// calling this function!
+        ///
+        /// @return if stacking happened, return iterator to the item that was stacked against, otherwise iterator to
+        /// the newly inserted item.
 
-            virtual ContainerStoreIterator add (const Ptr& itemPtr, int count, const Ptr& actorPtr, bool allowAutoEquip = true, bool resolve = true);
-            ///< Add the item pointed to by \a ptr to this container. (Stacks automatically if needed)
-            ///
-            /// \note The item pointed to is not required to exist beyond this function call.
-            ///
-            /// \attention Do not add items to an existing stack by increasing the count instead of
-            /// calling this function!
-            ///
-            /// @return if stacking happened, return iterator to the item that was stacked against, otherwise iterator to the newly inserted item.
+        ContainerStoreIterator add(std::string_view id, int count, const Ptr& actorPtr);
+        ///< Utility to construct a ManualRef and call add(ptr, count, actorPtr, true)
 
-            ContainerStoreIterator add(std::string_view id, int count, const Ptr& actorPtr);
-            ///< Utility to construct a ManualRef and call add(ptr, count, actorPtr, true)
+        int remove(
+            std::string_view itemId, int count, const Ptr& actor, bool equipReplacement = 0, bool resolve = true);
+        ///< Remove \a count item(s) designated by \a itemId from this container.
+        ///
+        /// @return the number of items actually removed
 
-            int remove(std::string_view itemId, int count, const Ptr& actor, bool equipReplacement = 0, bool resolve = true);
-            ///< Remove \a count item(s) designated by \a itemId from this container.
-            ///
-            /// @return the number of items actually removed
+        virtual int remove(
+            const Ptr& item, int count, const Ptr& actor, bool equipReplacement = 0, bool resolve = true);
+        ///< Remove \a count item(s) designated by \a item from this inventory.
+        ///
+        /// @return the number of items actually removed
 
-            virtual int remove(const Ptr& item, int count, const Ptr& actor, bool equipReplacement = 0, bool resolve = true);
-            ///< Remove \a count item(s) designated by \a item from this inventory.
-            ///
-            /// @return the number of items actually removed
+        void rechargeItems(float duration);
+        ///< Restore charge on enchanted items. Note this should only be done for the player.
 
-            void rechargeItems (float duration);
-            ///< Restore charge on enchanted items. Note this should only be done for the player.
+        ContainerStoreIterator unstack(const Ptr& ptr, const Ptr& container, int count = 1);
+        ///< Unstack an item in this container. The item's count will be set to count, then a new stack will be added
+        ///< with (origCount-count).
+        ///
+        /// @return an iterator to the new stack, or end() if no new stack was created.
 
-            ContainerStoreIterator unstack (const Ptr& ptr, const Ptr& container, int count = 1);
-            ///< Unstack an item in this container. The item's count will be set to count, then a new stack will be added with (origCount-count).
-            ///
-            /// @return an iterator to the new stack, or end() if no new stack was created.
+        MWWorld::ContainerStoreIterator restack(const MWWorld::Ptr& item);
+        ///< Attempt to re-stack an item in this container.
+        /// If a compatible stack is found, the item's count is added to that stack, then the original is deleted.
+        /// @return If the item was stacked, return the stack, otherwise return the old (untouched) item.
 
-            MWWorld::ContainerStoreIterator restack (const MWWorld::Ptr& item);
-            ///< Attempt to re-stack an item in this container.
-            /// If a compatible stack is found, the item's count is added to that stack, then the original is deleted.
-            /// @return If the item was stacked, return the stack, otherwise return the old (untouched) item.
+        int count(std::string_view id) const;
+        ///< @return How many items with refID \a id are in this container?
 
-            int count(std::string_view id) const;
-            ///< @return How many items with refID \a id are in this container?
+        ContainerStoreListener* getContListener() const;
+        void setContListener(ContainerStoreListener* listener);
 
-            ContainerStoreListener* getContListener() const;
-            void setContListener(ContainerStoreListener* listener);
-        protected:
-            ContainerStoreIterator addNewStack (const ConstPtr& ptr, int count);
-            ///< Add the item to this container (do not try to stack it onto existing items)
+    protected:
+        ContainerStoreIterator addNewStack(const ConstPtr& ptr, int count);
+        ///< Add the item to this container (do not try to stack it onto existing items)
 
-            virtual void flagAsModified();
+        virtual void flagAsModified();
 
-            /// + and - operations that can deal with negative stacks
-            /// Note that negativity is infectious
-            static int addItems(int count1, int count2);
-            static int subtractItems(int count1, int count2);
-        public:
+        /// + and - operations that can deal with negative stacks
+        /// Note that negativity is infectious
+        static int addItems(int count1, int count2);
+        static int subtractItems(int count1, int count2);
 
-            virtual bool stacks (const ConstPtr& ptr1, const ConstPtr& ptr2) const;
-            ///< @return true if the two specified objects can stack with each other
+    public:
+        virtual bool stacks(const ConstPtr& ptr1, const ConstPtr& ptr2) const;
+        ///< @return true if the two specified objects can stack with each other
 
-            void fill (const ESM::InventoryList& items, const std::string& owner, Misc::Rng::Generator& seed);
-            ///< Insert items into *this.
+        void fill(const ESM::InventoryList& items, const std::string& owner, Misc::Rng::Generator& seed);
+        ///< Insert items into *this.
 
-            void fillNonRandom (const ESM::InventoryList& items, const std::string& owner, unsigned int seed);
-            ///< Insert items into *this, excluding leveled items
+        void fillNonRandom(const ESM::InventoryList& items, const std::string& owner, unsigned int seed);
+        ///< Insert items into *this, excluding leveled items
 
-            virtual void clear();
-            ///< Empty container.
+        virtual void clear();
+        ///< Empty container.
 
-            float getWeight() const;
-            ///< Return total weight of the items contained in *this.
+        float getWeight() const;
+        ///< Return total weight of the items contained in *this.
 
-            static int getType (const ConstPtr& ptr);
-            ///< This function throws an exception, if ptr does not point to an object, that can be
-            /// put into a container.
+        static int getType(const ConstPtr& ptr);
+        ///< This function throws an exception, if ptr does not point to an object, that can be
+        /// put into a container.
 
-            Ptr findReplacement(const std::string& id);
-            ///< Returns replacement for object with given id. Prefer used items (with low durability left).
+        Ptr findReplacement(const std::string& id);
+        ///< Returns replacement for object with given id. Prefer used items (with low durability left).
 
-            Ptr search(std::string_view id);
+        Ptr search(std::string_view id);
 
-            virtual void writeState (ESM::InventoryState& state) const;
+        virtual void writeState(ESM::InventoryState& state) const;
 
-            virtual void readState (const ESM::InventoryState& state);
+        virtual void readState(const ESM::InventoryState& state);
 
-            bool isResolved() const;
+        bool isResolved() const;
 
-            void resolve();
-            ResolutionHandle resolveTemporarily();
-            void unresolve();
+        void resolve();
+        ResolutionHandle resolveTemporarily();
+        void unresolve();
 
-            friend class ContainerStoreIteratorBase<Ptr>;
-            friend class ContainerStoreIteratorBase<ConstPtr>;
-            friend class ResolutionListener;
-            friend class MWClass::Container;
+        friend class ContainerStoreIteratorBase<Ptr>;
+        friend class ContainerStoreIteratorBase<ConstPtr>;
+        friend class ResolutionListener;
+        friend class MWClass::Container;
     };
 
-    template<class PtrType>
+    template <class PtrType>
     class ContainerStoreIteratorBase
     {
-        template<class From, class To, class Dummy>
+        template <class From, class To, class Dummy>
         struct IsConvertible
         {
             static constexpr bool value = true;
         };
 
-        template<class Dummy>
+        template <class Dummy>
         struct IsConvertible<ConstPtr, Ptr, Dummy>
         {
             static constexpr bool value = false;
         };
 
-        template<class T, class U>
+        template <class T, class U>
         struct IteratorTrait
         {
             typedef typename MWWorld::CellRefList<T>::List::iterator type;
         };
 
-        template<class T>
+        template <class T>
         struct IteratorTrait<T, ConstPtr>
         {
             typedef typename MWWorld::CellRefList<T>::List::const_iterator type;
         };
 
-        template<class T>
+        template <class T>
         struct Iterator : IteratorTrait<T, PtrType>
         {
         };
 
-        template<class T, class Dummy>
+        template <class T, class Dummy>
         struct ContainerStoreTrait
         {
             typedef ContainerStore* type;
         };
-        
-        template<class Dummy>
+
+        template <class Dummy>
         struct ContainerStoreTrait<ConstPtr, Dummy>
         {
             typedef const ContainerStore* type;
@@ -322,80 +335,80 @@ namespace MWWorld
         typename Iterator<ESM::Repair>::type mRepair;
         typename Iterator<ESM::Weapon>::type mWeapon;
 
-        ContainerStoreIteratorBase (ContainerStoreType container);
+        ContainerStoreIteratorBase(ContainerStoreType container);
         ///< End-iterator
 
-        ContainerStoreIteratorBase (int mask, ContainerStoreType container);
+        ContainerStoreIteratorBase(int mask, ContainerStoreType container);
         ///< Begin-iterator
 
         // construct iterator using a CellRefList iterator
-        ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Potion>::type);
-        ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Apparatus>::type);
-        ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Armor>::type);
-        ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Book>::type);
-        ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Clothing>::type);
-        ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Ingredient>::type);
-        ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Light>::type);
-        ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Lockpick>::type);
-        ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Miscellaneous>::type);
-        ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Probe>::type);
-        ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Repair>::type);
-        ContainerStoreIteratorBase (ContainerStoreType container, typename Iterator<ESM::Weapon>::type);
-
-        template<class T>
-        void copy (const ContainerStoreIteratorBase<T>& src);
-        
-        void incType ();
-        
-        void nextType ();
-
-        bool resetIterator ();
+        ContainerStoreIteratorBase(ContainerStoreType container, typename Iterator<ESM::Potion>::type);
+        ContainerStoreIteratorBase(ContainerStoreType container, typename Iterator<ESM::Apparatus>::type);
+        ContainerStoreIteratorBase(ContainerStoreType container, typename Iterator<ESM::Armor>::type);
+        ContainerStoreIteratorBase(ContainerStoreType container, typename Iterator<ESM::Book>::type);
+        ContainerStoreIteratorBase(ContainerStoreType container, typename Iterator<ESM::Clothing>::type);
+        ContainerStoreIteratorBase(ContainerStoreType container, typename Iterator<ESM::Ingredient>::type);
+        ContainerStoreIteratorBase(ContainerStoreType container, typename Iterator<ESM::Light>::type);
+        ContainerStoreIteratorBase(ContainerStoreType container, typename Iterator<ESM::Lockpick>::type);
+        ContainerStoreIteratorBase(ContainerStoreType container, typename Iterator<ESM::Miscellaneous>::type);
+        ContainerStoreIteratorBase(ContainerStoreType container, typename Iterator<ESM::Probe>::type);
+        ContainerStoreIteratorBase(ContainerStoreType container, typename Iterator<ESM::Repair>::type);
+        ContainerStoreIteratorBase(ContainerStoreType container, typename Iterator<ESM::Weapon>::type);
+
+        template <class T>
+        void copy(const ContainerStoreIteratorBase<T>& src);
+
+        void incType();
+
+        void nextType();
+
+        bool resetIterator();
         ///< Reset iterator for selected type.
         ///
         /// \return Type not empty?
 
-        bool incIterator ();
+        bool incIterator();
         ///< Increment iterator for selected type.
         ///
         /// \return reached the end?
 
-        public:
-            using iterator_category = std::forward_iterator_tag;
-            using value_type = PtrType;
-            using difference_type = std::ptrdiff_t;
-            using pointer = PtrType*;
-            using reference = PtrType&;
-
-            template<class T>
-            ContainerStoreIteratorBase (const ContainerStoreIteratorBase<T>& other)
-            {
-                char CANNOT_CONVERT_CONST_ITERATOR_TO_ITERATOR[IsConvertible<T, PtrType, void>::value ? 1 : -1];
-                ((void)CANNOT_CONVERT_CONST_ITERATOR_TO_ITERATOR);
-                copy (other);
-            }
-
-            template<class T>
-            bool isEqual(const ContainerStoreIteratorBase<T>& other) const;
-
-            PtrType *operator->() const;
-            PtrType operator*() const;
-
-            ContainerStoreIteratorBase& operator++ ();
-            ContainerStoreIteratorBase operator++ (int);
-            ContainerStoreIteratorBase& operator= (const ContainerStoreIteratorBase& rhs);
-            ContainerStoreIteratorBase (const ContainerStoreIteratorBase& rhs) = default;
-
-            int getType() const;
-            const ContainerStore *getContainerStore() const;
-
-            friend class ContainerStore;
-            friend class ContainerStoreIteratorBase<Ptr>;
-            friend class ContainerStoreIteratorBase<ConstPtr>;
+    public:
+        using iterator_category = std::forward_iterator_tag;
+        using value_type = PtrType;
+        using difference_type = std::ptrdiff_t;
+        using pointer = PtrType*;
+        using reference = PtrType&;
+
+        template <class T>
+        ContainerStoreIteratorBase(const ContainerStoreIteratorBase<T>& other)
+        {
+            char CANNOT_CONVERT_CONST_ITERATOR_TO_ITERATOR[IsConvertible<T, PtrType, void>::value ? 1 : -1];
+            ((void)CANNOT_CONVERT_CONST_ITERATOR_TO_ITERATOR);
+            copy(other);
+        }
+
+        template <class T>
+        bool isEqual(const ContainerStoreIteratorBase<T>& other) const;
+
+        PtrType* operator->() const;
+        PtrType operator*() const;
+
+        ContainerStoreIteratorBase& operator++();
+        ContainerStoreIteratorBase operator++(int);
+        ContainerStoreIteratorBase& operator=(const ContainerStoreIteratorBase& rhs);
+        ContainerStoreIteratorBase(const ContainerStoreIteratorBase& rhs) = default;
+
+        int getType() const;
+        const ContainerStore* getContainerStore() const;
+
+        friend class ContainerStore;
+        friend class ContainerStoreIteratorBase<Ptr>;
+        friend class ContainerStoreIteratorBase<ConstPtr>;
     };
 
-    template<class T, class U>
-    bool operator== (const ContainerStoreIteratorBase<T>& left, const ContainerStoreIteratorBase<U>& right);
-    template<class T, class U>
-    bool operator!= (const ContainerStoreIteratorBase<T>& left, const ContainerStoreIteratorBase<U>& right);
+    template <class T, class U>
+    bool operator==(const ContainerStoreIteratorBase<T>& left, const ContainerStoreIteratorBase<U>& right);
+    template <class T, class U>
+    bool operator!=(const ContainerStoreIteratorBase<T>& left, const ContainerStoreIteratorBase<U>& right);
 }
 #endif
diff --git a/apps/openmw/mwworld/contentloader.hpp b/apps/openmw/mwworld/contentloader.hpp
index cb228a9ecb..70150ec33a 100644
--- a/apps/openmw/mwworld/contentloader.hpp
+++ b/apps/openmw/mwworld/contentloader.hpp
@@ -11,12 +11,12 @@ namespace Loading
 namespace MWWorld
 {
 
-struct ContentLoader
-{
-    virtual ~ContentLoader() = default;
+    struct ContentLoader
+    {
+        virtual ~ContentLoader() = default;
 
-    virtual void load(const std::filesystem::path& filepath, int& index, Loading::Listener* listener) = 0;
-};
+        virtual void load(const std::filesystem::path& filepath, int& index, Loading::Listener* listener) = 0;
+    };
 
 } /* namespace MWWorld */
 
diff --git a/apps/openmw/mwworld/customdata.cpp b/apps/openmw/mwworld/customdata.cpp
index 5080c09230..395d230a1a 100644
--- a/apps/openmw/mwworld/customdata.cpp
+++ b/apps/openmw/mwworld/customdata.cpp
@@ -1,81 +1,80 @@
 #include "customdata.hpp"
 
-#include <stdexcept>
 #include <sstream>
+#include <stdexcept>
 #include <typeinfo>
 
 namespace MWWorld
 {
 
-MWClass::CreatureCustomData &CustomData::asCreatureCustomData()
-{
-    std::stringstream error;
-    error << "bad cast " << typeid(this).name() << " to CreatureCustomData";
-    throw std::logic_error(error.str());
-}
+    MWClass::CreatureCustomData& CustomData::asCreatureCustomData()
+    {
+        std::stringstream error;
+        error << "bad cast " << typeid(this).name() << " to CreatureCustomData";
+        throw std::logic_error(error.str());
+    }
 
-const MWClass::CreatureCustomData &CustomData::asCreatureCustomData() const
-{
-    std::stringstream error;
-    error << "bad cast " << typeid(this).name() << " to CreatureCustomData";
-    throw std::logic_error(error.str());
-}
+    const MWClass::CreatureCustomData& CustomData::asCreatureCustomData() const
+    {
+        std::stringstream error;
+        error << "bad cast " << typeid(this).name() << " to CreatureCustomData";
+        throw std::logic_error(error.str());
+    }
 
-MWClass::NpcCustomData &CustomData::asNpcCustomData()
-{
-    std::stringstream error;
-    error << "bad cast " << typeid(this).name() << " to NpcCustomData";
-    throw std::logic_error(error.str());
-}
+    MWClass::NpcCustomData& CustomData::asNpcCustomData()
+    {
+        std::stringstream error;
+        error << "bad cast " << typeid(this).name() << " to NpcCustomData";
+        throw std::logic_error(error.str());
+    }
 
-const MWClass::NpcCustomData &CustomData::asNpcCustomData() const
-{
-    std::stringstream error;
-    error << "bad cast " << typeid(this).name() << " to NpcCustomData";
-    throw std::logic_error(error.str());
-}
+    const MWClass::NpcCustomData& CustomData::asNpcCustomData() const
+    {
+        std::stringstream error;
+        error << "bad cast " << typeid(this).name() << " to NpcCustomData";
+        throw std::logic_error(error.str());
+    }
 
-MWClass::ContainerCustomData &CustomData::asContainerCustomData()
-{
-    std::stringstream error;
-    error << "bad cast " << typeid(this).name() << " to ContainerCustomData";
-    throw std::logic_error(error.str());
-}
+    MWClass::ContainerCustomData& CustomData::asContainerCustomData()
+    {
+        std::stringstream error;
+        error << "bad cast " << typeid(this).name() << " to ContainerCustomData";
+        throw std::logic_error(error.str());
+    }
 
-const MWClass::ContainerCustomData &CustomData::asContainerCustomData() const
-{
-    std::stringstream error;
-    error << "bad cast " << typeid(this).name() << " to ContainerCustomData";
-    throw std::logic_error(error.str());
-}
+    const MWClass::ContainerCustomData& CustomData::asContainerCustomData() const
+    {
+        std::stringstream error;
+        error << "bad cast " << typeid(this).name() << " to ContainerCustomData";
+        throw std::logic_error(error.str());
+    }
 
-MWClass::DoorCustomData &CustomData::asDoorCustomData()
-{
-    std::stringstream error;
-    error << "bad cast " << typeid(this).name() << " to DoorCustomData";
-    throw std::logic_error(error.str());
-}
+    MWClass::DoorCustomData& CustomData::asDoorCustomData()
+    {
+        std::stringstream error;
+        error << "bad cast " << typeid(this).name() << " to DoorCustomData";
+        throw std::logic_error(error.str());
+    }
 
-const MWClass::DoorCustomData &CustomData::asDoorCustomData() const
-{
-    std::stringstream error;
-    error << "bad cast " << typeid(this).name() << " to DoorCustomData";
-    throw std::logic_error(error.str());
-}
+    const MWClass::DoorCustomData& CustomData::asDoorCustomData() const
+    {
+        std::stringstream error;
+        error << "bad cast " << typeid(this).name() << " to DoorCustomData";
+        throw std::logic_error(error.str());
+    }
 
-MWClass::CreatureLevListCustomData &CustomData::asCreatureLevListCustomData()
-{
-    std::stringstream error;
-    error << "bad cast " << typeid(this).name() << " to CreatureLevListCustomData";
-    throw std::logic_error(error.str());
-}
-
-const MWClass::CreatureLevListCustomData &CustomData::asCreatureLevListCustomData() const
-{
-    std::stringstream error;
-    error << "bad cast " << typeid(this).name() << " to CreatureLevListCustomData";
-    throw std::logic_error(error.str());
-}
+    MWClass::CreatureLevListCustomData& CustomData::asCreatureLevListCustomData()
+    {
+        std::stringstream error;
+        error << "bad cast " << typeid(this).name() << " to CreatureLevListCustomData";
+        throw std::logic_error(error.str());
+    }
 
+    const MWClass::CreatureLevListCustomData& CustomData::asCreatureLevListCustomData() const
+    {
+        std::stringstream error;
+        error << "bad cast " << typeid(this).name() << " to CreatureLevListCustomData";
+        throw std::logic_error(error.str());
+    }
 
 }
diff --git a/apps/openmw/mwworld/customdata.hpp b/apps/openmw/mwworld/customdata.hpp
index 7200e7684c..9d9283f085 100644
--- a/apps/openmw/mwworld/customdata.hpp
+++ b/apps/openmw/mwworld/customdata.hpp
@@ -17,37 +17,33 @@ namespace MWWorld
     /// \brief Base class for the MW-class-specific part of RefData
     class CustomData
     {
-        public:
+    public:
+        virtual ~CustomData() {}
 
-            virtual ~CustomData() {}
+        virtual std::unique_ptr<CustomData> clone() const = 0;
 
-            virtual std::unique_ptr<CustomData> clone() const = 0;
+        // Fast version of dynamic_cast<X&>. Needs to be overridden in the respective class.
 
-            // Fast version of dynamic_cast<X&>. Needs to be overridden in the respective class.
+        virtual MWClass::CreatureCustomData& asCreatureCustomData();
+        virtual const MWClass::CreatureCustomData& asCreatureCustomData() const;
 
-            virtual MWClass::CreatureCustomData& asCreatureCustomData();
-            virtual const MWClass::CreatureCustomData& asCreatureCustomData() const;
+        virtual MWClass::NpcCustomData& asNpcCustomData();
+        virtual const MWClass::NpcCustomData& asNpcCustomData() const;
 
-            virtual MWClass::NpcCustomData& asNpcCustomData();
-            virtual const MWClass::NpcCustomData& asNpcCustomData() const;
+        virtual MWClass::ContainerCustomData& asContainerCustomData();
+        virtual const MWClass::ContainerCustomData& asContainerCustomData() const;
 
-            virtual MWClass::ContainerCustomData& asContainerCustomData();
-            virtual const MWClass::ContainerCustomData& asContainerCustomData() const;
+        virtual MWClass::DoorCustomData& asDoorCustomData();
+        virtual const MWClass::DoorCustomData& asDoorCustomData() const;
 
-            virtual MWClass::DoorCustomData& asDoorCustomData();
-            virtual const MWClass::DoorCustomData& asDoorCustomData() const;
-
-            virtual MWClass::CreatureLevListCustomData& asCreatureLevListCustomData();
-            virtual const MWClass::CreatureLevListCustomData& asCreatureLevListCustomData() const;
+        virtual MWClass::CreatureLevListCustomData& asCreatureLevListCustomData();
+        virtual const MWClass::CreatureLevListCustomData& asCreatureLevListCustomData() const;
     };
 
     template <class T>
     struct TypedCustomData : CustomData
     {
-        std::unique_ptr<CustomData> clone() const final
-        {
-            return std::make_unique<T>(*static_cast<const T*>(this));
-        }
+        std::unique_ptr<CustomData> clone() const final { return std::make_unique<T>(*static_cast<const T*>(this)); }
     };
 }
 
diff --git a/apps/openmw/mwworld/datetimemanager.cpp b/apps/openmw/mwworld/datetimemanager.cpp
index 1f62a016fd..2d137518cf 100644
--- a/apps/openmw/mwworld/datetimemanager.cpp
+++ b/apps/openmw/mwworld/datetimemanager.cpp
@@ -13,21 +13,33 @@ namespace
     {
         switch (month)
         {
-            case 0: return 31;
-            case 1: return 28;
-            case 2: return 31;
-            case 3: return 30;
-            case 4: return 31;
-            case 5: return 30;
-            case 6: return 31;
-            case 7: return 31;
-            case 8: return 30;
-            case 9: return 31;
-            case 10: return 30;
-            case 11: return 31;
+            case 0:
+                return 31;
+            case 1:
+                return 28;
+            case 2:
+                return 31;
+            case 3:
+                return 30;
+            case 4:
+                return 31;
+            case 5:
+                return 30;
+            case 6:
+                return 31;
+            case 7:
+                return 31;
+            case 8:
+                return 30;
+            case 9:
+                return 31;
+            case 10:
+                return 30;
+            case 11:
+                return 31;
         }
 
-        throw std::runtime_error ("month out of range");
+        throw std::runtime_error("month out of range");
     }
 }
 
@@ -148,43 +160,41 @@ namespace MWWorld
         if (month < 0 || month >= months)
             return {};
 
-        static const std::string_view monthNames[months] =
-        {
-            "sMonthMorningstar", "sMonthSunsdawn", "sMonthFirstseed", "sMonthRainshand",
-            "sMonthSecondseed", "sMonthMidyear", "sMonthSunsheight", "sMonthLastseed",
-            "sMonthHeartfire", "sMonthFrostfall", "sMonthSunsdusk", "sMonthEveningstar"
-        };
+        static const std::string_view monthNames[months] = { "sMonthMorningstar", "sMonthSunsdawn", "sMonthFirstseed",
+            "sMonthRainshand", "sMonthSecondseed", "sMonthMidyear", "sMonthSunsheight", "sMonthLastseed",
+            "sMonthHeartfire", "sMonthFrostfall", "sMonthSunsdusk", "sMonthEveningstar" };
 
-        const ESM::GameSetting *setting = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(monthNames[month]);
+        const ESM::GameSetting* setting
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(monthNames[month]);
         return setting->mValue.getString();
     }
 
     bool DateTimeManager::updateGlobalFloat(std::string_view name, float value)
     {
-        if (name=="gamehour")
+        if (name == "gamehour")
         {
             setHour(value);
             return true;
         }
-        else if (name=="day")
+        else if (name == "day")
         {
             setDay(static_cast<int>(value));
             return true;
         }
-        else if (name=="month")
+        else if (name == "month")
         {
             setMonth(static_cast<int>(value));
             return true;
         }
-        else if (name=="year")
+        else if (name == "year")
         {
             mYear = static_cast<int>(value);
         }
-        else if (name=="timescale")
+        else if (name == "timescale")
         {
             mTimeScale = value;
         }
-        else if (name=="dayspassed")
+        else if (name == "dayspassed")
         {
             mDaysPassed = static_cast<int>(value);
         }
@@ -194,30 +204,30 @@ namespace MWWorld
 
     bool DateTimeManager::updateGlobalInt(std::string_view name, int value)
     {
-        if (name=="gamehour")
+        if (name == "gamehour")
         {
             setHour(static_cast<float>(value));
             return true;
         }
-        else if (name=="day")
+        else if (name == "day")
         {
             setDay(value);
             return true;
         }
-        else if (name=="month")
+        else if (name == "month")
         {
             setMonth(value);
             return true;
         }
-        else if (name=="year")
+        else if (name == "year")
         {
             mYear = value;
         }
-        else if (name=="timescale")
+        else if (name == "timescale")
         {
             mTimeScale = static_cast<float>(value);
         }
-        else if (name=="dayspassed")
+        else if (name == "dayspassed")
         {
             mDaysPassed = value;
         }
diff --git a/apps/openmw/mwworld/esmloader.cpp b/apps/openmw/mwworld/esmloader.cpp
index 66dd5b856e..3c1b6acc47 100644
--- a/apps/openmw/mwworld/esmloader.cpp
+++ b/apps/openmw/mwworld/esmloader.cpp
@@ -8,38 +8,41 @@
 namespace MWWorld
 {
 
-EsmLoader::EsmLoader(MWWorld::ESMStore& store, ESM::ReadersCache& readers, ToUTF8::Utf8Encoder* encoder, std::vector<int>& esmVersions)
-    : mReaders(readers)
-    , mStore(store)
-    , mEncoder(encoder)
-    , mDialogue(nullptr) // A content file containing INFO records without a DIAL record appends them to the previous file's dialogue
-    , mESMVersions(esmVersions)
-{
-}
-
-void EsmLoader::load(const std::filesystem::path& filepath, int& index, Loading::Listener* listener)
-{
-    const ESM::ReadersCache::BusyItem reader = mReaders.get(static_cast<std::size_t>(index));
-
-    reader->setEncoder(mEncoder);
-    reader->setIndex(index);
-    reader->open(filepath);
-    reader->resolveParentFileIndices(mReaders);
-
-    assert(reader->getGameFiles().size() == reader->getParentFileIndices().size());
-    for (std::size_t i = 0, n = reader->getParentFileIndices().size(); i < n; ++i)
-        if (i == static_cast<std::size_t>(reader->getIndex()))
-            throw std::runtime_error("File " + Files::pathToUnicodeString(reader->getName()) + " asks for parent file "
+    EsmLoader::EsmLoader(MWWorld::ESMStore& store, ESM::ReadersCache& readers, ToUTF8::Utf8Encoder* encoder,
+        std::vector<int>& esmVersions)
+        : mReaders(readers)
+        , mStore(store)
+        , mEncoder(encoder)
+        , mDialogue(nullptr) // A content file containing INFO records without a DIAL record appends them to the
+                             // previous file's dialogue
+        , mESMVersions(esmVersions)
+    {
+    }
+
+    void EsmLoader::load(const std::filesystem::path& filepath, int& index, Loading::Listener* listener)
+    {
+        const ESM::ReadersCache::BusyItem reader = mReaders.get(static_cast<std::size_t>(index));
+
+        reader->setEncoder(mEncoder);
+        reader->setIndex(index);
+        reader->open(filepath);
+        reader->resolveParentFileIndices(mReaders);
+
+        assert(reader->getGameFiles().size() == reader->getParentFileIndices().size());
+        for (std::size_t i = 0, n = reader->getParentFileIndices().size(); i < n; ++i)
+            if (i == static_cast<std::size_t>(reader->getIndex()))
+                throw std::runtime_error("File " + Files::pathToUnicodeString(reader->getName()) + " asks for parent file "
                 + reader->getGameFiles()[i].name
                 + ", but it is not available or has been loaded in the wrong order. "
                   "Please run the launcher to fix this issue.");
 
-    mESMVersions[index] = reader->getVer();
-    mStore.load(*reader, listener, mDialogue);
+        mESMVersions[index] = reader->getVer();
+        mStore.load(*reader, listener, mDialogue);
 
-    if (!mMasterFileFormat.has_value() && (Misc::StringUtils::ciEndsWith(reader->getName().u8string(), u8".esm")
-                                           || Misc::StringUtils::ciEndsWith(reader->getName().u8string(), u8".omwgame")))
-        mMasterFileFormat = reader->getFormat();
-}
+        if (!mMasterFileFormat.has_value()
+            && (Misc::StringUtils::ciEndsWith(reader->getName().u8string(), u8".esm")
+                || Misc::StringUtils::ciEndsWith(reader->getName().u8string(), u8".omwgame")))
+            mMasterFileFormat = reader->getFormat();
+    }
 
 } /* namespace MWWorld */
diff --git a/apps/openmw/mwworld/esmloader.hpp b/apps/openmw/mwworld/esmloader.hpp
index 5f2fc94bf4..253c58db70 100644
--- a/apps/openmw/mwworld/esmloader.hpp
+++ b/apps/openmw/mwworld/esmloader.hpp
@@ -8,7 +8,7 @@
 
 namespace ToUTF8
 {
-  class Utf8Encoder;
+    class Utf8Encoder;
 }
 
 namespace ESM
@@ -20,15 +20,16 @@ namespace ESM
 namespace MWWorld
 {
 
-class ESMStore;
+    class ESMStore;
 
-struct EsmLoader : public ContentLoader
-{
-    explicit EsmLoader(MWWorld::ESMStore& store, ESM::ReadersCache& readers, ToUTF8::Utf8Encoder* encoder, std::vector<int>& esmVersions);
+    struct EsmLoader : public ContentLoader
+    {
+        explicit EsmLoader(MWWorld::ESMStore& store, ESM::ReadersCache& readers, ToUTF8::Utf8Encoder* encoder,
+            std::vector<int>& esmVersions);
 
-    std::optional<int> getMasterFileFormat() const { return mMasterFileFormat; }
+        std::optional<int> getMasterFileFormat() const { return mMasterFileFormat; }
 
-    void load(const std::filesystem::path& filepath, int& index, Loading::Listener* listener) override;
+        void load(const std::filesystem::path& filepath, int& index, Loading::Listener* listener) override;
 
     private:
         ESM::ReadersCache& mReaders;
@@ -37,7 +38,7 @@ struct EsmLoader : public ContentLoader
         ESM::Dialogue* mDialogue;
         std::optional<int> mMasterFileFormat;
         std::vector<int>& mESMVersions;
-};
+    };
 
 } /* namespace MWWorld */
 
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index d133efd2ac..3fd5980abe 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -5,16 +5,16 @@
 #include <tuple>
 
 #include <components/debug/debuglog.hpp>
+#include <components/esm/records.hpp>
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/esmwriter.hpp>
+#include <components/esm3/readerscache.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/lua/configuration.hpp>
 #include <components/misc/algorithm.hpp>
-#include <components/esm3/readerscache.hpp>
-#include <components/esm/records.hpp>
 
-#include <components/esmloader/load.hpp>
 #include <components/esm4/common.hpp>
+#include <components/esmloader/load.hpp>
 
 #include "../mwmechanics/spelllist.hpp"
 
@@ -25,12 +25,17 @@ namespace
         ESM::RefNum mRefNum;
         std::size_t mRefID;
 
-        Ref(ESM::RefNum refNum, std::size_t refID) : mRefNum(refNum), mRefID(refID) {}
+        Ref(ESM::RefNum refNum, std::size_t refID)
+            : mRefNum(refNum)
+            , mRefID(refID)
+        {
+        }
     };
 
     constexpr std::size_t deletedRefID = std::numeric_limits<std::size_t>::max();
 
-    void readRefs(const ESM::Cell& cell, std::vector<Ref>& refs, std::vector<std::string>& refIDs, ESM::ReadersCache& readers)
+    void readRefs(
+        const ESM::Cell& cell, std::vector<Ref>& refs, std::vector<std::string>& refIDs, ESM::ReadersCache& readers)
     {
         // TODO: we have many similar copies of this code.
         for (size_t i = 0; i < cell.mContextList.size(); i++)
@@ -43,18 +48,19 @@ namespace
             bool deleted = false;
             while (cell.getNextRef(*reader, ref, deleted))
             {
-                if(deleted)
+                if (deleted)
                     refs.emplace_back(ref.mRefNum, deletedRefID);
-                else if (std::find(cell.mMovedRefs.begin(), cell.mMovedRefs.end(), ref.mRefNum) == cell.mMovedRefs.end())
+                else if (std::find(cell.mMovedRefs.begin(), cell.mMovedRefs.end(), ref.mRefNum)
+                    == cell.mMovedRefs.end())
                 {
                     refs.emplace_back(ref.mRefNum, refIDs.size());
                     refIDs.push_back(std::move(ref.mRefID));
                 }
             }
         }
-        for(const auto& [value, deleted] : cell.mLeasedRefs)
+        for (const auto& [value, deleted] : cell.mLeasedRefs)
         {
-            if(deleted)
+            if (deleted)
                 refs.emplace_back(value.mRefNum, deletedRefID);
             else
             {
@@ -72,7 +78,9 @@ namespace
         throw std::runtime_error("List of NPC classes is empty!");
     }
 
-    std::vector<ESM::NPC> getNPCsToReplace(const MWWorld::Store<ESM::Faction>& factions, const MWWorld::Store<ESM::Class>& classes, const std::unordered_map<std::string, ESM::NPC, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual>& npcs)
+    std::vector<ESM::NPC> getNPCsToReplace(const MWWorld::Store<ESM::Faction>& factions,
+        const MWWorld::Store<ESM::Class>& classes,
+        const std::unordered_map<std::string, ESM::NPC, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual>& npcs)
     {
         // Cache first class from store - we will use it if current class is not found
         const std::string& defaultCls = getDefaultClass(classes);
@@ -89,10 +97,11 @@ namespace
             const std::string& npcFaction = npc.mFaction;
             if (!npcFaction.empty())
             {
-                const ESM::Faction *fact = factions.search(npcFaction);
+                const ESM::Faction* fact = factions.search(npcFaction);
                 if (!fact)
                 {
-                    Log(Debug::Verbose) << "NPC '" << npc.mId << "' (" << npc.mName << ") has nonexistent faction '" << npc.mFaction << "', ignoring it.";
+                    Log(Debug::Verbose) << "NPC '" << npc.mId << "' (" << npc.mName << ") has nonexistent faction '"
+                                        << npc.mFaction << "', ignoring it.";
                     npc.mFaction.clear();
                     npc.mNpdt.mRank = 0;
                     changed = true;
@@ -100,10 +109,11 @@ namespace
             }
 
             const std::string& npcClass = npc.mClass;
-            const ESM::Class *cls = classes.search(npcClass);
+            const ESM::Class* cls = classes.search(npcClass);
             if (!cls)
             {
-                Log(Debug::Verbose) << "NPC '" << npc.mId << "' (" << npc.mName << ") has nonexistent class '" << npc.mClass << "', using '" << defaultCls << "' class as replacement.";
+                Log(Debug::Verbose) << "NPC '" << npc.mId << "' (" << npc.mName << ") has nonexistent class '"
+                                    << npc.mClass << "', using '" << defaultCls << "' class as replacement.";
                 npc.mClass = defaultCls;
                 changed = true;
             }
@@ -115,17 +125,18 @@ namespace
         return npcsToReplace;
     }
 
-    // Custom enchanted items can reference scripts that no longer exist, this doesn't necessarily mean the base item no longer exists however.
-    // So instead of removing the item altogether, we're only removing the script.
-    template<class MapT>
+    // Custom enchanted items can reference scripts that no longer exist, this doesn't necessarily mean the base item no
+    // longer exists however. So instead of removing the item altogether, we're only removing the script.
+    template <class MapT>
     void removeMissingScripts(const MWWorld::Store<ESM::Script>& scripts, MapT& items)
     {
-        for(auto& [id, item] : items)
+        for (auto& [id, item] : items)
         {
-            if(!item.mScript.empty() && !scripts.search(item.mScript))
+            if (!item.mScript.empty() && !scripts.search(item.mScript))
             {
                 item.mScript.clear();
-                Log(Debug::Verbose) << "Item '" << id << "' (" << item.mName << ") has nonexistent script '" << item.mScript << "', ignoring it.";
+                Log(Debug::Verbose) << "Item '" << id << "' (" << item.mName << ") has nonexistent script '"
+                                    << item.mScript << "', ignoring it.";
             }
         }
     }
@@ -139,14 +150,14 @@ namespace MWWorld
     {
         ESMStore::StoreTuple mStores;
 
-        std::map<ESM::RecNameInts, DynamicStore*>                   mRecNameToStore;
+        std::map<ESM::RecNameInts, DynamicStore*> mRecNameToStore;
 
         // Lookup of all IDs. Makes looking up references faster. Just
         // maps the id name to the record type.
         IDMap mIds;
         IDMap mStaticIds;
 
-        template<typename T>  
+        template <typename T>
         static void assignStoreToIndex(ESMStore& stores, Store<T>& store)
         {
             const std::size_t storeIndex = ESMStore::getTypeIndex<T>();
@@ -168,11 +179,11 @@ namespace MWWorld
         }
     };
 
-
     int ESMStore::find(const std::string_view id) const
     {
         IDMap::const_iterator it = mStoreImp->mIds.find(id);
-        if (it == mStoreImp->mIds.end()) {
+        if (it == mStoreImp->mIds.end())
+        {
             return 0;
         }
         return it->second;
@@ -180,8 +191,9 @@ namespace MWWorld
 
     int ESMStore::findStatic(const std::string_view id) const
     {
-        IDMap::const_iterator it = mStoreImp-> mStaticIds.find(id);
-        if (it == mStoreImp->mStaticIds.end()) {
+        IDMap::const_iterator it = mStoreImp->mStaticIds.find(id);
+        if (it == mStoreImp->mStaticIds.end())
+        {
             return 0;
         }
         return it->second;
@@ -190,7 +202,7 @@ namespace MWWorld
     ESMStore::ESMStore()
     {
         mStoreImp = std::make_unique<ESMStoreImp>();
-        std::apply([this](auto& ...x) {(ESMStoreImp::assignStoreToIndex(*this, x), ...); }, mStoreImp->mStores);
+        std::apply([this](auto&... x) { (ESMStoreImp::assignStoreToIndex(*this, x), ...); }, mStoreImp->mStores);
         mDynamicCount = 0;
         getWritable<ESM::Pathgrid>().setCells(getWritable<ESM::Cell>());
     }
@@ -205,355 +217,371 @@ namespace MWWorld
         movePlayerRecord();
     }
 
-static bool isCacheableRecord(int id)
-{
-    switch (id)
+    static bool isCacheableRecord(int id)
     {
-        case ESM::REC_ACTI:
-        case ESM::REC_ALCH:
-        case ESM::REC_APPA:
-        case ESM::REC_ARMO:
-        case ESM::REC_BOOK:
-        case ESM::REC_CLOT:
-        case ESM::REC_CONT:
-        case ESM::REC_CREA:
-        case ESM::REC_DOOR:
-        case ESM::REC_INGR:
-        case ESM::REC_LEVC:
-        case ESM::REC_LEVI:
-        case ESM::REC_LIGH:
-        case ESM::REC_LOCK:
-        case ESM::REC_MISC:
-        case ESM::REC_NPC_:
-        case ESM::REC_PROB:
-        case ESM::REC_REPA:
-        case ESM::REC_STAT:
-        case ESM::REC_WEAP:
-        case ESM::REC_BODY:
-            return true;
-            break;
+        switch (id)
+        {
+            case ESM::REC_ACTI:
+            case ESM::REC_ALCH:
+            case ESM::REC_APPA:
+            case ESM::REC_ARMO:
+            case ESM::REC_BOOK:
+            case ESM::REC_CLOT:
+            case ESM::REC_CONT:
+            case ESM::REC_CREA:
+            case ESM::REC_DOOR:
+            case ESM::REC_INGR:
+            case ESM::REC_LEVC:
+            case ESM::REC_LEVI:
+            case ESM::REC_LIGH:
+            case ESM::REC_LOCK:
+            case ESM::REC_MISC:
+            case ESM::REC_NPC_:
+            case ESM::REC_PROB:
+            case ESM::REC_REPA:
+            case ESM::REC_STAT:
+            case ESM::REC_WEAP:
+            case ESM::REC_BODY:
+                return true;
+                break;
+        }
+        return false;
     }
-    return false;
-}
 
-void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener, ESM::Dialogue*& dialogue)
-{
-    if (listener != nullptr)
-        listener->setProgressRange(::EsmLoader::fileProgress);
+    void ESMStore::load(ESM::ESMReader& esm, Loading::Listener* listener, ESM::Dialogue*& dialogue)
+    {
+        if (listener != nullptr)
+            listener->setProgressRange(::EsmLoader::fileProgress);
 
-    // Land texture loading needs to use a separate internal store for each plugin.
-    // We set the number of plugins here so we can properly verify if valid plugin
-    // indices are being passed to the LandTexture Store retrieval methods.
-    getWritable<ESM::LandTexture>().resize(esm.getIndex()+1);
+        // Land texture loading needs to use a separate internal store for each plugin.
+        // We set the number of plugins here so we can properly verify if valid plugin
+        // indices are being passed to the LandTexture Store retrieval methods.
+        getWritable<ESM::LandTexture>().resize(esm.getIndex() + 1);
 
-    // Loop through all records
-    while(esm.hasMoreRecs())
-    {
-        ESM::NAME n = esm.getRecName();
-        esm.getRecHeader();
-        if (esm.getRecordFlags() & ESM::FLAG_Ignored)
+        // Loop through all records
+        while (esm.hasMoreRecs())
         {
-            esm.skipRecord();
-            continue;
-        }
+            ESM::NAME n = esm.getRecName();
+            esm.getRecHeader();
+            if (esm.getRecordFlags() & ESM::FLAG_Ignored)
+            {
+                esm.skipRecord();
+                continue;
+            }
 
-        // Look up the record type.
-        ESM::RecNameInts recName = static_cast<ESM::RecNameInts>(n.toInt());
-        const auto& it = mStoreImp->mRecNameToStore.find(recName);
+            // Look up the record type.
+            ESM::RecNameInts recName = static_cast<ESM::RecNameInts>(n.toInt());
+            const auto& it = mStoreImp->mRecNameToStore.find(recName);
 
-        if (it == mStoreImp->mRecNameToStore.end()) {
-            if (recName == ESM::REC_INFO) {
-                if (dialogue)
+            if (it == mStoreImp->mRecNameToStore.end())
+            {
+                if (recName == ESM::REC_INFO)
                 {
-                    dialogue->readInfo(esm, esm.getIndex() != 0);
+                    if (dialogue)
+                    {
+                        dialogue->readInfo(esm, esm.getIndex() != 0);
+                    }
+                    else
+                    {
+                        Log(Debug::Error) << "Error: info record without dialog";
+                        esm.skipRecord();
+                    }
                 }
-                else
+                else if (n.toInt() == ESM::REC_MGEF)
+                {
+                    getWritable<ESM::MagicEffect>().load(esm);
+                }
+                else if (n.toInt() == ESM::REC_SKIL)
                 {
-                    Log(Debug::Error) << "Error: info record without dialog";
+                    getWritable<ESM::Skill>().load(esm);
+                }
+                else if (n.toInt() == ESM::REC_FILT || n.toInt() == ESM::REC_DBGP)
+                {
+                    // ignore project file only records
                     esm.skipRecord();
                 }
-            } else if (n.toInt() == ESM::REC_MGEF) {
-                getWritable<ESM::MagicEffect>().load (esm);
-            } else if (n.toInt() == ESM::REC_SKIL) {
-                getWritable<ESM::Skill>().load (esm);
-            }
-            else if (n.toInt() == ESM::REC_FILT || n.toInt() == ESM::REC_DBGP)
-            {
-                // ignore project file only records
-                esm.skipRecord();
-            }
-            else if (n.toInt() == ESM::REC_LUAL)
-            {
-                ESM::LuaScriptsCfg cfg;
-                cfg.load(esm);
-                cfg.adjustRefNums(esm);
-                mLuaContent.push_back(std::move(cfg));
-            }
-            else {
-                throw std::runtime_error("Unknown record: " + n.toString());
+                else if (n.toInt() == ESM::REC_LUAL)
+                {
+                    ESM::LuaScriptsCfg cfg;
+                    cfg.load(esm);
+                    cfg.adjustRefNums(esm);
+                    mLuaContent.push_back(std::move(cfg));
+                }
+                else
+                {
+                    throw std::runtime_error("Unknown record: " + n.toString());
+                }
             }
-        } else {
-            RecordId id = it->second->load(esm);
-            if (id.mIsDeleted)
+            else
             {
-                it->second->eraseStatic(id.mId);
-                continue;
-            }
+                RecordId id = it->second->load(esm);
+                if (id.mIsDeleted)
+                {
+                    it->second->eraseStatic(id.mId);
+                    continue;
+                }
 
-            if (n.toInt() == ESM::REC_DIAL) {
-                dialogue = const_cast<ESM::Dialogue*>(getWritable<ESM::Dialogue>().find(id.mId));
-            } else {
-                dialogue = nullptr;
+                if (n.toInt() == ESM::REC_DIAL)
+                {
+                    dialogue = const_cast<ESM::Dialogue*>(getWritable<ESM::Dialogue>().find(id.mId));
+                }
+                else
+                {
+                    dialogue = nullptr;
+                }
             }
+            if (listener != nullptr)
+                listener->setProgress(::EsmLoader::fileProgress * esm.getFileOffset() / esm.getFileSize());
         }
-        if (listener != nullptr)
-            listener->setProgress(::EsmLoader::fileProgress * esm.getFileOffset() / esm.getFileSize());
     }
-}
 
-void ESMStore::setIdType(const std::string& id, ESM::RecNameInts type)
-{
-    mStoreImp->mIds[id] = type;
-}
+    void ESMStore::setIdType(const std::string& id, ESM::RecNameInts type)
+    {
+        mStoreImp->mIds[id] = type;
+    }
 
-ESM::LuaScriptsCfg ESMStore::getLuaScriptsCfg() const
-{
-    ESM::LuaScriptsCfg cfg;
-    for (const LuaContent& c : mLuaContent)
+    ESM::LuaScriptsCfg ESMStore::getLuaScriptsCfg() const
     {
-        if (std::holds_alternative<std::filesystem::path>(c))
+        ESM::LuaScriptsCfg cfg;
+        for (const LuaContent& c : mLuaContent)
         {
-            // *.omwscripts are intentionally reloaded every time when `getLuaScriptsCfg` is called.
-            // It is important for the `reloadlua` console command.
-            try
+            if (std::holds_alternative<std::filesystem::path>(c))
             {
-                auto file = std::ifstream(std::get<std::filesystem::path>(c));
-                std::string fileContent(std::istreambuf_iterator<char>(file), {});
-                LuaUtil::parseOMWScripts(cfg, fileContent);
+                // *.omwscripts are intentionally reloaded every time when `getLuaScriptsCfg` is called.
+                // It is important for the `reloadlua` console command.
+                try
+                {
+                    auto file = std::ifstream(std::get<std::filesystem::path>(c));
+                    std::string fileContent(std::istreambuf_iterator<char>(file), {});
+                    LuaUtil::parseOMWScripts(cfg, fileContent);
+                }
+                catch (std::exception& e)
+                {
+                    Log(Debug::Error) << e.what();
+                }
+            }
+            else
+            {
+                const ESM::LuaScriptsCfg& addition = std::get<ESM::LuaScriptsCfg>(c);
+                cfg.mScripts.insert(cfg.mScripts.end(), addition.mScripts.begin(), addition.mScripts.end());
             }
-            catch (std::exception& e) { Log(Debug::Error) << e.what(); }
-        }
-        else
-        {
-            const ESM::LuaScriptsCfg& addition = std::get<ESM::LuaScriptsCfg>(c);
-            cfg.mScripts.insert(cfg.mScripts.end(), addition.mScripts.begin(), addition.mScripts.end());
         }
+        return cfg;
     }
-    return cfg;
-}
 
-void ESMStore::setUp()
-{
-    mStoreImp->mIds.clear();
-
-    std::map<ESM::RecNameInts, DynamicStore*>::iterator storeIt = mStoreImp->mRecNameToStore.begin();
-    for (; storeIt != mStoreImp->mRecNameToStore.end(); ++storeIt) {
-        storeIt->second->setUp();
+    void ESMStore::setUp()
+    {
+        mStoreImp->mIds.clear();
 
-        if (isCacheableRecord(storeIt->first))
+        std::map<ESM::RecNameInts, DynamicStore*>::iterator storeIt = mStoreImp->mRecNameToStore.begin();
+        for (; storeIt != mStoreImp->mRecNameToStore.end(); ++storeIt)
         {
-            std::vector<std::string> identifiers;
-            storeIt->second->listIdentifier(identifiers);
+            storeIt->second->setUp();
 
-            for (std::vector<std::string>::const_iterator record = identifiers.begin(); record != identifiers.end(); ++record)
-                mStoreImp->mIds[*record] = storeIt->first;
+            if (isCacheableRecord(storeIt->first))
+            {
+                std::vector<std::string> identifiers;
+                storeIt->second->listIdentifier(identifiers);
+
+                for (std::vector<std::string>::const_iterator record = identifiers.begin(); record != identifiers.end();
+                     ++record)
+                    mStoreImp->mIds[*record] = storeIt->first;
+            }
         }
-    }
 
-    if (mStoreImp->mStaticIds.empty())
-        for (const auto& [k, v] : mStoreImp->mIds)
-            mStoreImp->mStaticIds.emplace(Misc::StringUtils::lowerCase(k), v);
+        if (mStoreImp->mStaticIds.empty())
+            for (const auto& [k, v] : mStoreImp->mIds)
+                mStoreImp->mStaticIds.emplace(Misc::StringUtils::lowerCase(k), v);
 
-    getWritable<ESM::Skill>().setUp();
-    getWritable<ESM::MagicEffect>().setUp();;
-    getWritable<ESM::Attribute>().setUp();
-    getWritable<ESM::Dialogue>().setUp();
-}
-
-void ESMStore::validateRecords(ESM::ReadersCache& readers)
-{
-    validate();
-    countAllCellRefs(readers);
-}
+        getWritable<ESM::Skill>().setUp();
+        getWritable<ESM::MagicEffect>().setUp();
+        ;
+        getWritable<ESM::Attribute>().setUp();
+        getWritable<ESM::Dialogue>().setUp();
+    }
 
-void ESMStore::countAllCellRefs(ESM::ReadersCache& readers)
-{
-    // TODO: We currently need to read entire files here again.
-    // We should consider consolidating or deferring this reading.
-    if(!mRefCount.empty())
-        return;
-    std::vector<Ref> refs;
-    std::vector<std::string> refIDs;
-    Store<ESM::Cell> Cells = getWritable < ESM::Cell>();
-    for(auto it = Cells.intBegin(); it != Cells.intEnd(); ++it)
-        readRefs(*it, refs, refIDs, readers);
-    for(auto it = Cells.extBegin(); it != Cells.extEnd(); ++it)
-        readRefs(*it, refs, refIDs, readers);
-    const auto lessByRefNum = [] (const Ref& l, const Ref& r) { return l.mRefNum < r.mRefNum; };
-    std::stable_sort(refs.begin(), refs.end(), lessByRefNum);
-    const auto equalByRefNum = [] (const Ref& l, const Ref& r) { return l.mRefNum == r.mRefNum; };
-    const auto incrementRefCount = [&] (const Ref& value)
+    void ESMStore::validateRecords(ESM::ReadersCache& readers)
     {
-        if (value.mRefID != deletedRefID)
-        {
-            std::string& refId = refIDs[value.mRefID];
-            // We manually lower case IDs here for the time being to improve performance.
-            Misc::StringUtils::lowerCaseInPlace(refId);
-            ++mRefCount[std::move(refId)];
-        }
-    };
-    Misc::forEachUnique(refs.rbegin(), refs.rend(), equalByRefNum, incrementRefCount);
-}
-
-int ESMStore::getRefCount(std::string_view id) const
-{
-    const std::string lowerId = Misc::StringUtils::lowerCase(id);
-    auto it = mRefCount.find(lowerId);
-    if(it == mRefCount.end())
-        return 0;
-    return it->second;
-}
+        validate();
+        countAllCellRefs(readers);
+    }
 
-void ESMStore::validate()
-{
-    auto& npcs = getWritable<ESM::NPC>();
-    std::vector<ESM::NPC> npcsToReplace = getNPCsToReplace(getWritable<ESM::Faction>(),  getWritable<ESM::Class>(),  npcs.mStatic);
+    void ESMStore::countAllCellRefs(ESM::ReadersCache& readers)
+    {
+        // TODO: We currently need to read entire files here again.
+        // We should consider consolidating or deferring this reading.
+        if (!mRefCount.empty())
+            return;
+        std::vector<Ref> refs;
+        std::vector<std::string> refIDs;
+        Store<ESM::Cell> Cells = getWritable<ESM::Cell>();
+        for (auto it = Cells.intBegin(); it != Cells.intEnd(); ++it)
+            readRefs(*it, refs, refIDs, readers);
+        for (auto it = Cells.extBegin(); it != Cells.extEnd(); ++it)
+            readRefs(*it, refs, refIDs, readers);
+        const auto lessByRefNum = [](const Ref& l, const Ref& r) { return l.mRefNum < r.mRefNum; };
+        std::stable_sort(refs.begin(), refs.end(), lessByRefNum);
+        const auto equalByRefNum = [](const Ref& l, const Ref& r) { return l.mRefNum == r.mRefNum; };
+        const auto incrementRefCount = [&](const Ref& value) {
+            if (value.mRefID != deletedRefID)
+            {
+                std::string& refId = refIDs[value.mRefID];
+                // We manually lower case IDs here for the time being to improve performance.
+                Misc::StringUtils::lowerCaseInPlace(refId);
+                ++mRefCount[std::move(refId)];
+            }
+        };
+        Misc::forEachUnique(refs.rbegin(), refs.rend(), equalByRefNum, incrementRefCount);
+    }
 
-    for (const ESM::NPC &npc : npcsToReplace)
+    int ESMStore::getRefCount(std::string_view id) const
     {
-        npcs.eraseStatic(npc.mId);
-        npcs.insertStatic(npc);
+        const std::string lowerId = Misc::StringUtils::lowerCase(id);
+        auto it = mRefCount.find(lowerId);
+        if (it == mRefCount.end())
+            return 0;
+        return it->second;
     }
 
-    // Validate spell effects for invalid arguments
-    std::vector<ESM::Spell> spellsToReplace;
-    auto& spells = getWritable<ESM::Spell>();
-    for (ESM::Spell spell : spells)
+    void ESMStore::validate()
     {
-        if (spell.mEffects.mList.empty())
-            continue;
+        auto& npcs = getWritable<ESM::NPC>();
+        std::vector<ESM::NPC> npcsToReplace
+            = getNPCsToReplace(getWritable<ESM::Faction>(), getWritable<ESM::Class>(), npcs.mStatic);
 
-        bool changed = false;
-        auto iter = spell.mEffects.mList.begin();
-        while (iter != spell.mEffects.mList.end())
+        for (const ESM::NPC& npc : npcsToReplace)
         {
-            const ESM::MagicEffect* mgef = getWritable<ESM::MagicEffect>().search(iter->mEffectID);
-            if (!mgef)
-            {
-                Log(Debug::Verbose) << "Spell '" << spell.mId << "' has an invalid effect (index " << iter->mEffectID << ") present. Dropping the effect.";
-                iter = spell.mEffects.mList.erase(iter);
-                changed = true;
+            npcs.eraseStatic(npc.mId);
+            npcs.insertStatic(npc);
+        }
+
+        // Validate spell effects for invalid arguments
+        std::vector<ESM::Spell> spellsToReplace;
+        auto& spells = getWritable<ESM::Spell>();
+        for (ESM::Spell spell : spells)
+        {
+            if (spell.mEffects.mList.empty())
                 continue;
-            }
 
-            if (mgef->mData.mFlags & ESM::MagicEffect::TargetSkill)
+            bool changed = false;
+            auto iter = spell.mEffects.mList.begin();
+            while (iter != spell.mEffects.mList.end())
             {
-                if (iter->mAttribute != -1)
+                const ESM::MagicEffect* mgef = getWritable<ESM::MagicEffect>().search(iter->mEffectID);
+                if (!mgef)
                 {
-                    iter->mAttribute = -1;
-                    Log(Debug::Verbose) << ESM::MagicEffect::effectIdToString(iter->mEffectID) <<
-                        " effect of spell '" << spell.mId << "' has an attribute argument present. Dropping the argument.";
+                    Log(Debug::Verbose) << "Spell '" << spell.mId << "' has an invalid effect (index "
+                                        << iter->mEffectID << ") present. Dropping the effect.";
+                    iter = spell.mEffects.mList.erase(iter);
                     changed = true;
+                    continue;
                 }
-            }
-            else if (mgef->mData.mFlags & ESM::MagicEffect::TargetAttribute)
-            {
-                if (iter->mSkill != -1)
+
+                if (mgef->mData.mFlags & ESM::MagicEffect::TargetSkill)
+                {
+                    if (iter->mAttribute != -1)
+                    {
+                        iter->mAttribute = -1;
+                        Log(Debug::Verbose)
+                            << ESM::MagicEffect::effectIdToString(iter->mEffectID) << " effect of spell '" << spell.mId
+                            << "' has an attribute argument present. Dropping the argument.";
+                        changed = true;
+                    }
+                }
+                else if (mgef->mData.mFlags & ESM::MagicEffect::TargetAttribute)
+                {
+                    if (iter->mSkill != -1)
+                    {
+                        iter->mSkill = -1;
+                        Log(Debug::Verbose)
+                            << ESM::MagicEffect::effectIdToString(iter->mEffectID) << " effect of spell '" << spell.mId
+                            << "' has a skill argument present. Dropping the argument.";
+                        changed = true;
+                    }
+                }
+                else if (iter->mSkill != -1 || iter->mAttribute != -1)
                 {
                     iter->mSkill = -1;
-                    Log(Debug::Verbose) << ESM::MagicEffect::effectIdToString(iter->mEffectID) <<
-                        " effect of spell '" << spell.mId << "' has a skill argument present. Dropping the argument.";
+                    iter->mAttribute = -1;
+                    Log(Debug::Verbose) << ESM::MagicEffect::effectIdToString(iter->mEffectID) << " effect of spell '"
+                                        << spell.mId << "' has argument(s) present. Dropping the argument(s).";
                     changed = true;
                 }
-            }
-            else if (iter->mSkill != -1 || iter->mAttribute != -1)
-            {
-                iter->mSkill = -1;
-                iter->mAttribute = -1;
-                Log(Debug::Verbose) << ESM::MagicEffect::effectIdToString(iter->mEffectID) <<
-                    " effect of spell '" << spell.mId << "' has argument(s) present. Dropping the argument(s).";
-                changed = true;
+
+                ++iter;
             }
 
-            ++iter;
+            if (changed)
+                spellsToReplace.emplace_back(spell);
         }
 
-        if (changed)
-            spellsToReplace.emplace_back(spell);
+        for (const ESM::Spell& spell : spellsToReplace)
+        {
+            spells.eraseStatic(spell.mId);
+            spells.insertStatic(spell);
+        }
     }
 
-    for (const ESM::Spell &spell : spellsToReplace)
+    void ESMStore::movePlayerRecord()
     {
-        spells.eraseStatic(spell.mId);
-        spells.insertStatic(spell);
+        auto& npcs = getWritable<ESM::NPC>();
+        auto player = npcs.find("player");
+        npcs.insert(*player);
     }
-}
-
-void ESMStore::movePlayerRecord()
-{
-    auto& npcs = getWritable<ESM::NPC>();
-    auto player = npcs.find("player");
-    npcs.insert(*player);
-}
 
-void ESMStore::validateDynamic()
-{
-    auto& npcs = getWritable<ESM::NPC>();
-    auto& scripts = getWritable<ESM::Script>();
+    void ESMStore::validateDynamic()
+    {
+        auto& npcs = getWritable<ESM::NPC>();
+        auto& scripts = getWritable<ESM::Script>();
 
-    std::vector<ESM::NPC> npcsToReplace = getNPCsToReplace(getWritable<ESM::Faction>(), getWritable<ESM::Class>(), npcs.mDynamic);
+        std::vector<ESM::NPC> npcsToReplace
+            = getNPCsToReplace(getWritable<ESM::Faction>(), getWritable<ESM::Class>(), npcs.mDynamic);
 
-    for (const ESM::NPC &npc : npcsToReplace)
-        npcs.insert(npc);
+        for (const ESM::NPC& npc : npcsToReplace)
+            npcs.insert(npc);
 
-    removeMissingScripts(scripts, getWritable<ESM::Armor>().mDynamic);
-    removeMissingScripts(scripts, getWritable<ESM::Book>().mDynamic);
-    removeMissingScripts(scripts, getWritable<ESM::Clothing>().mDynamic);
-    removeMissingScripts(scripts, getWritable<ESM::Weapon>().mDynamic);
+        removeMissingScripts(scripts, getWritable<ESM::Armor>().mDynamic);
+        removeMissingScripts(scripts, getWritable<ESM::Book>().mDynamic);
+        removeMissingScripts(scripts, getWritable<ESM::Clothing>().mDynamic);
+        removeMissingScripts(scripts, getWritable<ESM::Weapon>().mDynamic);
 
-    removeMissingObjects(getWritable<ESM::CreatureLevList>());
-    removeMissingObjects(getWritable<ESM::ItemLevList>());
-}
+        removeMissingObjects(getWritable<ESM::CreatureLevList>());
+        removeMissingObjects(getWritable<ESM::ItemLevList>());
+    }
 
-// Leveled lists can be modified by scripts. This removes items that no longer exist (presumably because the plugin was removed) from modified lists
-template<class T>
-void ESMStore::removeMissingObjects(Store<T>& store)
-{
-    for(auto& entry : store.mDynamic)
+    // Leveled lists can be modified by scripts. This removes items that no longer exist (presumably because the plugin
+    // was removed) from modified lists
+    template <class T>
+    void ESMStore::removeMissingObjects(Store<T>& store)
     {
-        auto first = std::remove_if(entry.second.mList.begin(), entry.second.mList.end(), [&] (const auto& item)
+        for (auto& entry : store.mDynamic)
         {
-            if(!find(item.mId))
-            {
-                Log(Debug::Verbose) << "Leveled list '" << entry.first << "' has nonexistent object '" << item.mId << "', ignoring it.";
-                return true;
-            }
-            return false;
-        });
-        entry.second.mList.erase(first, entry.second.mList.end());
+            auto first = std::remove_if(entry.second.mList.begin(), entry.second.mList.end(), [&](const auto& item) {
+                if (!find(item.mId))
+                {
+                    Log(Debug::Verbose) << "Leveled list '" << entry.first << "' has nonexistent object '" << item.mId
+                                        << "', ignoring it.";
+                    return true;
+                }
+                return false;
+            });
+            entry.second.mList.erase(first, entry.second.mList.end());
+        }
     }
-}
 
     int ESMStore::countSavedGameRecords() const
     {
         return 1 // DYNA (dynamic name counter)
-            + get<ESM::Potion>().getDynamicSize()
-            + get<ESM::Armor>().getDynamicSize()
-            + get<ESM::Book>().getDynamicSize()
-            + get<ESM::Class>().getDynamicSize()
-            + get<ESM::Clothing>().getDynamicSize()
-            + get<ESM::Enchantment>().getDynamicSize()
-            + get<ESM::NPC>().getDynamicSize()
-            + get<ESM::Spell>().getDynamicSize()
-            + get<ESM::Weapon>().getDynamicSize()
-            + get<ESM::CreatureLevList>().getDynamicSize()
-            + get<ESM::ItemLevList>().getDynamicSize()
-            + get<ESM::Creature>().getDynamicSize()
+            + get<ESM::Potion>().getDynamicSize() + get<ESM::Armor>().getDynamicSize()
+            + get<ESM::Book>().getDynamicSize() + get<ESM::Class>().getDynamicSize()
+            + get<ESM::Clothing>().getDynamicSize() + get<ESM::Enchantment>().getDynamicSize()
+            + get<ESM::NPC>().getDynamicSize() + get<ESM::Spell>().getDynamicSize()
+            + get<ESM::Weapon>().getDynamicSize() + get<ESM::CreatureLevList>().getDynamicSize()
+            + get<ESM::ItemLevList>().getDynamicSize() + get<ESM::Creature>().getDynamicSize()
             + get<ESM::Container>().getDynamicSize();
-
     }
 
-    void ESMStore::write (ESM::ESMWriter& writer, Loading::Listener& progress) const
+    void ESMStore::write(ESM::ESMWriter& writer, Loading::Listener& progress) const
     {
         writer.startRecord(ESM::REC_DYNA);
         writer.startSubRecord("COUN");
@@ -561,22 +589,22 @@ void ESMStore::removeMissingObjects(Store<T>& store)
         writer.endRecord("COUN");
         writer.endRecord(ESM::REC_DYNA);
 
-        get<ESM::Potion>().write (writer, progress);
-        get<ESM::Armor>().write (writer, progress);
-        get<ESM::Book>().write (writer, progress);
-        get<ESM::Class>().write (writer, progress);
-        get<ESM::Clothing>().write (writer, progress);
-        get<ESM::Enchantment>().write (writer, progress);
-        get<ESM::NPC>().write (writer, progress);
-        get<ESM::Spell>().write (writer, progress);
-        get<ESM::Weapon>().write (writer, progress);
-        get<ESM::CreatureLevList>().write (writer, progress);
-        get<ESM::ItemLevList>().write (writer, progress);
-        get<ESM::Creature>().write (writer, progress);
-        get<ESM::Container>().write (writer, progress);
+        get<ESM::Potion>().write(writer, progress);
+        get<ESM::Armor>().write(writer, progress);
+        get<ESM::Book>().write(writer, progress);
+        get<ESM::Class>().write(writer, progress);
+        get<ESM::Clothing>().write(writer, progress);
+        get<ESM::Enchantment>().write(writer, progress);
+        get<ESM::NPC>().write(writer, progress);
+        get<ESM::Spell>().write(writer, progress);
+        get<ESM::Weapon>().write(writer, progress);
+        get<ESM::CreatureLevList>().write(writer, progress);
+        get<ESM::ItemLevList>().write(writer, progress);
+        get<ESM::Creature>().write(writer, progress);
+        get<ESM::Container>().write(writer, progress);
     }
 
-    bool ESMStore::readRecord (ESM::ESMReader& reader, uint32_t type_id)
+    bool ESMStore::readRecord(ESM::ESMReader& reader, uint32_t type_id)
     {
         ESM::RecNameInts type = (ESM::RecNameInts)type_id;
         switch (type)
@@ -591,12 +619,12 @@ void ESMStore::removeMissingObjects(Store<T>& store)
             case ESM::REC_WEAP:
             case ESM::REC_LEVI:
             case ESM::REC_LEVC:
-                mStoreImp->mRecNameToStore[type]->read (reader);
+                mStoreImp->mRecNameToStore[type]->read(reader);
                 return true;
             case ESM::REC_NPC_:
             case ESM::REC_CREA:
             case ESM::REC_CONT:
-                mStoreImp->mRecNameToStore[type]->read (reader, true);
+                mStoreImp->mRecNameToStore[type]->read(reader, true);
                 return true;
 
             case ESM::REC_DYNA:
@@ -614,11 +642,10 @@ void ESMStore::removeMissingObjects(Store<T>& store)
     {
         setUp();
 
-        const ESM::NPC *player = get<ESM::NPC>().find ("player");
+        const ESM::NPC* player = get<ESM::NPC>().find("player");
 
-        if (!get<ESM::Race>().find (player->mRace) ||
-            !get<ESM::Class>().find (player->mClass))
-            throw std::runtime_error ("Invalid player record (race or class unavailable");
+        if (!get<ESM::Race>().find(player->mRace) || !get<ESM::Class>().find(player->mClass))
+            throw std::runtime_error("Invalid player record (race or class unavailable");
     }
 
     std::pair<std::shared_ptr<MWMechanics::SpellList>, bool> ESMStore::getSpellList(const std::string& id) const
@@ -634,21 +661,22 @@ void ESMStore::removeMissingObjects(Store<T>& store)
             if (result != mSpellListCache.end())
                 result->second = ptr;
             else
-                mSpellListCache.insert({id, ptr});
-            return {ptr, false};
+                mSpellListCache.insert({ id, ptr });
+            return { ptr, false };
         }
-        return {ptr, true};
+        return { ptr, true };
     }
 
     template <>
-    const ESM::Cell *ESMStore::insert<ESM::Cell>(const ESM::Cell &cell) {
+    const ESM::Cell* ESMStore::insert<ESM::Cell>(const ESM::Cell& cell)
+    {
         return getWritable<ESM::Cell>().insert(cell);
     }
 
     template <>
-    const ESM::NPC *ESMStore::insert<ESM::NPC>(const ESM::NPC &npc)
+    const ESM::NPC* ESMStore::insert<ESM::NPC>(const ESM::NPC& npc)
     {
-        
+
         auto& npcs = getWritable<ESM::NPC>();
         if (Misc::StringUtils::ciEqual(npc.mId, "player"))
         {
@@ -664,7 +692,7 @@ void ESMStore::removeMissingObjects(Store<T>& store)
 
         record.mId = id;
 
-        ESM::NPC *ptr = npcs.insert(record);
+        ESM::NPC* ptr = npcs.insert(record);
         mStoreImp->mIds[ptr->mId] = ESM::REC_NPC_;
         return ptr;
     }
diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
index c5a860a823..d41312ac4e 100644
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@@ -1,11 +1,11 @@
 #ifndef OPENMW_MWWORLD_ESMSTORE_H
 #define OPENMW_MWWORLD_ESMSTORE_H
 
+#include <filesystem>
 #include <memory>
 #include <stdexcept>
-#include <unordered_map>
 #include <tuple>
-#include <filesystem>
+#include <unordered_map>
 
 #include <components/esm/luascripts.hpp>
 #include <components/esm3/loadgmst.hpp>
@@ -76,58 +76,27 @@ namespace MWWorld
 
     class ESMStore
     {
-        friend struct ESMStoreImp; //This allows StoreImp to extend esmstore without beeing included everywhere
-
-        using StoreTuple = std::tuple < 
-            Store<ESM::Activator>,
-            Store<ESM::Potion>,
-            Store<ESM::Apparatus>,
-            Store<ESM::Armor>,
-            Store<ESM::BodyPart>,
-            Store<ESM::Book>,
-            Store<ESM::BirthSign>,
-            Store<ESM::Class>,
-            Store<ESM::Clothing>,
-            Store<ESM::Container>,
-            Store<ESM::Creature>,
-            Store<ESM::Dialogue>,
-            Store<ESM::Door>,
-            Store<ESM::Enchantment>,
-            Store<ESM::Faction>,
-            Store<ESM::Global>,
-            Store<ESM::Ingredient>,
-            Store<ESM::CreatureLevList>,
-            Store<ESM::ItemLevList>,
-            Store<ESM::Light>,
-            Store<ESM::Lockpick>,
-            Store<ESM::Miscellaneous>,
-            Store<ESM::NPC>,
-            Store<ESM::Probe>,
-            Store<ESM::Race>,
-            Store<ESM::Region>,
-            Store<ESM::Repair>,
-            Store<ESM::SoundGenerator>,
-            Store<ESM::Sound>,
-            Store<ESM::Spell>,
-            Store<ESM::StartScript>,
-            Store<ESM::Static>,
-            Store<ESM::Weapon>,
-            Store<ESM::GameSetting>,
+        friend struct ESMStoreImp; // This allows StoreImp to extend esmstore without beeing included everywhere
+
+        using StoreTuple = std::tuple<Store<ESM::Activator>, Store<ESM::Potion>, Store<ESM::Apparatus>,
+            Store<ESM::Armor>, Store<ESM::BodyPart>, Store<ESM::Book>, Store<ESM::BirthSign>, Store<ESM::Class>,
+            Store<ESM::Clothing>, Store<ESM::Container>, Store<ESM::Creature>, Store<ESM::Dialogue>, Store<ESM::Door>,
+            Store<ESM::Enchantment>, Store<ESM::Faction>, Store<ESM::Global>, Store<ESM::Ingredient>,
+            Store<ESM::CreatureLevList>, Store<ESM::ItemLevList>, Store<ESM::Light>, Store<ESM::Lockpick>,
+            Store<ESM::Miscellaneous>, Store<ESM::NPC>, Store<ESM::Probe>, Store<ESM::Race>, Store<ESM::Region>,
+            Store<ESM::Repair>, Store<ESM::SoundGenerator>, Store<ESM::Sound>, Store<ESM::Spell>,
+            Store<ESM::StartScript>, Store<ESM::Static>, Store<ESM::Weapon>, Store<ESM::GameSetting>,
             Store<ESM::Script>,
 
             // Lists that need special rules
-            Store<ESM::Cell>,
-            Store<ESM::Land>,
-            Store<ESM::LandTexture>,
-            Store<ESM::Pathgrid>,
+            Store<ESM::Cell>, Store<ESM::Land>, Store<ESM::LandTexture>, Store<ESM::Pathgrid>,
 
-            Store<ESM::MagicEffect>,
-            Store<ESM::Skill>,
+            Store<ESM::MagicEffect>, Store<ESM::Skill>,
 
             // Special entry which is hardcoded and not loaded from an ESM
-            Store<ESM::Attribute >>;
+            Store<ESM::Attribute>>;
 
-        template<typename T> 
+        template <typename T>
         static constexpr std::size_t getTypeIndex()
         {
             static_assert(Misc::TupleHasType<Store<T>, StoreTuple>::value);
@@ -143,24 +112,28 @@ namespace MWWorld
 
         unsigned int mDynamicCount;
 
-        mutable std::unordered_map<std::string, std::weak_ptr<MWMechanics::SpellList>, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual> mSpellListCache;
+        mutable std::unordered_map<std::string, std::weak_ptr<MWMechanics::SpellList>, Misc::StringUtils::CiHash,
+            Misc::StringUtils::CiEqual>
+            mSpellListCache;
 
         template <class T>
-        Store<T>& getWritable() {return static_cast<Store<T>&>(*mStores[getTypeIndex<T>()]);}
+        Store<T>& getWritable()
+        {
+            return static_cast<Store<T>&>(*mStores[getTypeIndex<T>()]);
+        }
 
         /// Validate entries in store after setup
         void validate();
 
         void countAllCellRefs(ESM::ReadersCache& readers);
 
-        template<class T>
+        template <class T>
         void removeMissingObjects(Store<T>& store);
 
         void setIdType(const std::string& id, ESM::RecNameInts type);
 
-        using LuaContent = std::variant<
-            ESM::LuaScriptsCfg,  // data from an omwaddon
-            std::filesystem::path>;  // path to an omwscripts file
+        using LuaContent = std::variant<ESM::LuaScriptsCfg, // data from an omwaddon
+            std::filesystem::path>; // path to an omwscripts file
         std::vector<LuaContent> mLuaContent;
 
     public:
@@ -170,20 +143,15 @@ namespace MWWorld
         /// \todo replace with SharedIterator<StoreBase>
         typedef std::vector<DynamicStore*>::const_iterator iterator;
 
-        iterator begin() const {
-            return mDynamicStores.begin();
-        }
+        iterator begin() const { return mDynamicStores.begin(); }
 
-        iterator end() const {
-            return mDynamicStores.end();
-        }
+        iterator end() const { return mDynamicStores.end(); }
 
         /// Look up the given ID in 'all'. Returns 0 if not found.
         int find(const std::string_view id) const;
 
         int findStatic(const std::string_view id) const;
 
-
         ESMStore();
         ~ESMStore();
 
@@ -194,18 +162,21 @@ namespace MWWorld
         /// Validate entries in store after loading a save
         void validateDynamic();
 
-        void load(ESM::ESMReader &esm, Loading::Listener* listener, ESM::Dialogue*& dialogue);
+        void load(ESM::ESMReader& esm, Loading::Listener* listener, ESM::Dialogue*& dialogue);
 
         template <class T>
-        const Store<T>& get() const {return static_cast<const Store<T>&>(*mStores[getTypeIndex<T>()]);}
+        const Store<T>& get() const
+        {
+            return static_cast<const Store<T>&>(*mStores[getTypeIndex<T>()]);
+        }
 
         /// Insert a custom record (i.e. with a generated ID that will not clash will pre-existing records)
         template <class T>
-        const T *insert(const T &x)
+        const T* insert(const T& x)
         {
             const std::string id = "$dynamic" + std::to_string(mDynamicCount++);
 
-            Store<T> &store = getWritable<T>();
+            Store<T>& store = getWritable<T>();
             if (store.search(id) != nullptr)
             {
                 const std::string msg = "Try to override existing record '" + id + "'";
@@ -215,7 +186,7 @@ namespace MWWorld
 
             record.mId = id;
 
-            T *ptr = store.insert(record);
+            T* ptr = store.insert(record);
             if constexpr (std::is_convertible_v<Store<T>*, DynamicStore*>)
             {
                 setIdType(ptr->mId, T::sRecordId);
@@ -225,10 +196,11 @@ namespace MWWorld
 
         /// Insert a record with set ID, and allow it to override a pre-existing static record.
         template <class T>
-        const T *overrideRecord(const T &x) {
-            Store<T> &store = getWritable<T>();
+        const T* overrideRecord(const T& x)
+        {
+            Store<T>& store = getWritable<T>();
 
-            T *ptr = store.insert(x);
+            T* ptr = store.insert(x);
             if constexpr (std::is_convertible_v<Store<T>*, DynamicStore*>)
             {
                 setIdType(ptr->mId, T::sRecordId);
@@ -237,7 +209,7 @@ namespace MWWorld
         }
 
         template <class T>
-        const T *insertStatic(const T &x)
+        const T* insertStatic(const T& x)
         {
             Store<T>& store = getWritable<T>();
             if (store.search(x.mId) != nullptr)
@@ -246,7 +218,7 @@ namespace MWWorld
                 throw std::runtime_error(msg);
             }
 
-            T *ptr = store.insertStatic(x);
+            T* ptr = store.insertStatic(x);
             if constexpr (std::is_convertible_v<Store<T>*, DynamicStore*>)
             {
                 setIdType(ptr->mId, T::sRecordId);
@@ -261,9 +233,9 @@ namespace MWWorld
 
         int countSavedGameRecords() const;
 
-        void write (ESM::ESMWriter& writer, Loading::Listener& progress) const;
+        void write(ESM::ESMWriter& writer, Loading::Listener& progress) const;
 
-        bool readRecord (ESM::ESMReader& reader, uint32_t type);
+        bool readRecord(ESM::ESMReader& reader, uint32_t type);
         ///< \return Known type?
 
         // To be called when we are done with dynamic record loading
@@ -275,7 +247,6 @@ namespace MWWorld
         /// Actors with the same ID share spells, abilities, etc.
         /// @return The shared spell list to use for this actor and whether or not it has already been initialized.
         std::pair<std::shared_ptr<MWMechanics::SpellList>, bool> getSpellList(const std::string& id) const;
-
     };
     template <>
     const ESM::Cell* ESMStore::insert<ESM::Cell>(const ESM::Cell& cell);
diff --git a/apps/openmw/mwworld/failedaction.cpp b/apps/openmw/mwworld/failedaction.cpp
index 3d5ca55690..05bec12074 100644
--- a/apps/openmw/mwworld/failedaction.cpp
+++ b/apps/openmw/mwworld/failedaction.cpp
@@ -8,12 +8,14 @@
 namespace MWWorld
 {
     FailedAction::FailedAction(std::string_view msg, const Ptr& target)
-      : Action(false, target), mMessage(msg)
-    {   }
+        : Action(false, target)
+        , mMessage(msg)
+    {
+    }
 
-    void FailedAction::executeImp(const Ptr &actor)
+    void FailedAction::executeImp(const Ptr& actor)
     {
-        if(actor == MWMechanics::getPlayer() && !mMessage.empty())
+        if (actor == MWMechanics::getPlayer() && !mMessage.empty())
             MWBase::Environment::get().getWindowManager()->messageBox(mMessage);
     }
 }
diff --git a/apps/openmw/mwworld/failedaction.hpp b/apps/openmw/mwworld/failedaction.hpp
index 80fd53cc79..329a59443a 100644
--- a/apps/openmw/mwworld/failedaction.hpp
+++ b/apps/openmw/mwworld/failedaction.hpp
@@ -10,7 +10,7 @@ namespace MWWorld
     {
         std::string_view mMessage;
 
-        void executeImp(const Ptr &actor) override;
+        void executeImp(const Ptr& actor) override;
 
     public:
         FailedAction(std::string_view message = {}, const Ptr& target = Ptr());
diff --git a/apps/openmw/mwworld/globals.cpp b/apps/openmw/mwworld/globals.cpp
index cbf2600e0e..485d03b071 100644
--- a/apps/openmw/mwworld/globals.cpp
+++ b/apps/openmw/mwworld/globals.cpp
@@ -2,35 +2,35 @@
 
 #include <stdexcept>
 
-#include <components/esm3/esmwriter.hpp>
 #include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/misc/strings/lower.hpp>
 
 #include "esmstore.hpp"
 
 namespace MWWorld
 {
-    Globals::Collection::const_iterator Globals::find (std::string_view name) const
+    Globals::Collection::const_iterator Globals::find(std::string_view name) const
     {
-        Collection::const_iterator iter = mVariables.find (Misc::StringUtils::lowerCase (name));
+        Collection::const_iterator iter = mVariables.find(Misc::StringUtils::lowerCase(name));
 
-        if (iter==mVariables.end())
-            throw std::runtime_error ("unknown global variable: " + std::string{name});
+        if (iter == mVariables.end())
+            throw std::runtime_error("unknown global variable: " + std::string{ name });
 
         return iter;
     }
 
-    Globals::Collection::iterator Globals::find (std::string_view name)
+    Globals::Collection::iterator Globals::find(std::string_view name)
     {
-        Collection::iterator iter = mVariables.find (Misc::StringUtils::lowerCase (name));
+        Collection::iterator iter = mVariables.find(Misc::StringUtils::lowerCase(name));
 
-        if (iter==mVariables.end())
-            throw std::runtime_error ("unknown global variable: " + std::string{name});
+        if (iter == mVariables.end())
+            throw std::runtime_error("unknown global variable: " + std::string{ name });
 
         return iter;
     }
 
-    void Globals::fill (const MWWorld::ESMStore& store)
+    void Globals::fill(const MWWorld::ESMStore& store)
     {
         mVariables.clear();
 
@@ -38,34 +38,38 @@ namespace MWWorld
 
         for (const ESM::Global& esmGlobal : globals)
         {
-            mVariables.insert (std::make_pair (Misc::StringUtils::lowerCase (esmGlobal.mId), esmGlobal));
+            mVariables.insert(std::make_pair(Misc::StringUtils::lowerCase(esmGlobal.mId), esmGlobal));
         }
     }
 
-    const ESM::Variant& Globals::operator[] (std::string_view name) const
+    const ESM::Variant& Globals::operator[](std::string_view name) const
     {
-        return find (Misc::StringUtils::lowerCase (name))->second.mValue;
+        return find(Misc::StringUtils::lowerCase(name))->second.mValue;
     }
 
-    ESM::Variant& Globals::operator[] (std::string_view name)
+    ESM::Variant& Globals::operator[](std::string_view name)
     {
-        return find (Misc::StringUtils::lowerCase (name))->second.mValue;
+        return find(Misc::StringUtils::lowerCase(name))->second.mValue;
     }
 
-    char Globals::getType (std::string_view name) const
+    char Globals::getType(std::string_view name) const
     {
-        Collection::const_iterator iter = mVariables.find (Misc::StringUtils::lowerCase (name));
+        Collection::const_iterator iter = mVariables.find(Misc::StringUtils::lowerCase(name));
 
-        if (iter==mVariables.end())
+        if (iter == mVariables.end())
             return ' ';
 
         switch (iter->second.mValue.getType())
         {
-            case ESM::VT_Short: return 's';
-            case ESM::VT_Long: return 'l';
-            case ESM::VT_Float: return 'f';
-
-            default: return ' ';
+            case ESM::VT_Short:
+                return 's';
+            case ESM::VT_Long:
+                return 'l';
+            case ESM::VT_Float:
+                return 'f';
+
+            default:
+                return ' ';
         }
     }
 
@@ -74,19 +78,19 @@ namespace MWWorld
         return mVariables.size();
     }
 
-    void Globals::write (ESM::ESMWriter& writer, Loading::Listener& progress) const
+    void Globals::write(ESM::ESMWriter& writer, Loading::Listener& progress) const
     {
-        for (Collection::const_iterator iter (mVariables.begin()); iter!=mVariables.end(); ++iter)
+        for (Collection::const_iterator iter(mVariables.begin()); iter != mVariables.end(); ++iter)
         {
-            writer.startRecord (ESM::REC_GLOB);
-            iter->second.save (writer);
-            writer.endRecord (ESM::REC_GLOB);
+            writer.startRecord(ESM::REC_GLOB);
+            iter->second.save(writer);
+            writer.endRecord(ESM::REC_GLOB);
         }
     }
 
-    bool Globals::readRecord (ESM::ESMReader& reader,  uint32_t type)
+    bool Globals::readRecord(ESM::ESMReader& reader, uint32_t type)
     {
-        if (type==ESM::REC_GLOB)
+        if (type == ESM::REC_GLOB)
         {
             ESM::Global global;
             bool isDeleted = false;
@@ -96,8 +100,8 @@ namespace MWWorld
             global.load(reader, isDeleted);
             Misc::StringUtils::lowerCaseInPlace(global.mId);
 
-            Collection::iterator iter = mVariables.find (global.mId);
-            if (iter!=mVariables.end())
+            Collection::iterator iter = mVariables.find(global.mId);
+            if (iter != mVariables.end())
                 iter->second = global;
 
             return true;
diff --git a/apps/openmw/mwworld/globals.hpp b/apps/openmw/mwworld/globals.hpp
index ff9caadd73..337226ce8e 100644
--- a/apps/openmw/mwworld/globals.hpp
+++ b/apps/openmw/mwworld/globals.hpp
@@ -1,9 +1,9 @@
 #ifndef GAME_MWWORLD_GLOBALS_H
 #define GAME_MWWORLD_GLOBALS_H
 
-#include <vector>
-#include <string>
 #include <map>
+#include <string>
+#include <vector>
 
 #include <cstdint>
 
@@ -26,37 +26,34 @@ namespace MWWorld
 
     class Globals
     {
-        private:
-
-            typedef std::map<std::string, ESM::Global> Collection;
-
-            Collection mVariables; // type, value
-
-            Collection::const_iterator find (std::string_view name) const;
+    private:
+        typedef std::map<std::string, ESM::Global> Collection;
 
-            Collection::iterator find (std::string_view name);
+        Collection mVariables; // type, value
 
-        public:
+        Collection::const_iterator find(std::string_view name) const;
 
-            const ESM::Variant& operator[] (std::string_view name) const;
+        Collection::iterator find(std::string_view name);
 
-            ESM::Variant& operator[] (std::string_view name);
+    public:
+        const ESM::Variant& operator[](std::string_view name) const;
 
-            char getType (std::string_view name) const;
-            ///< If there is no global variable with this name, ' ' is returned.
+        ESM::Variant& operator[](std::string_view name);
 
-            void fill (const MWWorld::ESMStore& store);
-            ///< Replace variables with variables from \a store with default values.
+        char getType(std::string_view name) const;
+        ///< If there is no global variable with this name, ' ' is returned.
 
-            int countSavedGameRecords() const;
+        void fill(const MWWorld::ESMStore& store);
+        ///< Replace variables with variables from \a store with default values.
 
-            void write (ESM::ESMWriter& writer, Loading::Listener& progress) const;
+        int countSavedGameRecords() const;
 
-            bool readRecord (ESM::ESMReader& reader, uint32_t type);
-            ///< Records for variables that do not exist are dropped silently.
-            ///
-            /// \return Known type?
+        void write(ESM::ESMWriter& writer, Loading::Listener& progress) const;
 
+        bool readRecord(ESM::ESMReader& reader, uint32_t type);
+        ///< Records for variables that do not exist are dropped silently.
+        ///
+        /// \return Known type?
     };
 }
 
diff --git a/apps/openmw/mwworld/groundcoverstore.cpp b/apps/openmw/mwworld/groundcoverstore.cpp
index 251e05225a..acf7fa7915 100644
--- a/apps/openmw/mwworld/groundcoverstore.cpp
+++ b/apps/openmw/mwworld/groundcoverstore.cpp
@@ -1,13 +1,13 @@
 #include "groundcoverstore.hpp"
 
-#include <components/esmloader/load.hpp>
-#include <components/esmloader/esmdata.hpp>
-#include <components/misc/strings/lower.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadstat.hpp>
 #include <components/esm3/readerscache.hpp>
+#include <components/esmloader/esmdata.hpp>
+#include <components/esmloader/load.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/misc/strings/lower.hpp>
 #include <components/resource/resourcesystem.hpp>
-#include <components/esm3/loadstat.hpp>
-#include <components/esm3/loadcell.hpp>
 
 #include <apps/openmw/mwbase/environment.hpp>
 
@@ -23,8 +23,8 @@ namespace MWWorld
         query.mLoadCells = true;
 
         ESM::ReadersCache readers;
-        const ::EsmLoader::EsmData content = ::EsmLoader::loadEsmData(query, groundcoverFiles, fileCollections,
-                                                                      readers, encoder, listener);
+        const ::EsmLoader::EsmData content
+            = ::EsmLoader::loadEsmData(query, groundcoverFiles, fileCollections, readers, encoder, listener);
 
         const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
@@ -51,7 +51,8 @@ namespace MWWorld
 
         for (const ESM::Cell& cell : content.mCells)
         {
-            if (!cell.isExterior()) continue;
+            if (!cell.isExterior())
+                continue;
             auto cellIndex = std::make_pair(cell.getCellId().mIndex.mX, cell.getCellId().mIndex.mY);
             mCellContexts[cellIndex] = std::move(cell.mContextList);
         }
@@ -61,7 +62,8 @@ namespace MWWorld
     {
         std::string idLower = Misc::StringUtils::lowerCase(id);
         auto search = mMeshCache.find(idLower);
-        if (search == mMeshCache.end()) return std::string();
+        if (search == mMeshCache.end())
+            return std::string();
 
         return search->second;
     }
diff --git a/apps/openmw/mwworld/groundcoverstore.hpp b/apps/openmw/mwworld/groundcoverstore.hpp
index d955f731fc..55cc232b50 100644
--- a/apps/openmw/mwworld/groundcoverstore.hpp
+++ b/apps/openmw/mwworld/groundcoverstore.hpp
@@ -1,9 +1,9 @@
 #ifndef GAME_MWWORLD_GROUNDCOVER_STORE_H
 #define GAME_MWWORLD_GROUNDCOVER_STORE_H
 
-#include <vector>
-#include <string>
 #include <map>
+#include <string>
+#include <vector>
 
 namespace ESM
 {
@@ -34,17 +34,17 @@ namespace MWWorld
 
     class GroundcoverStore
     {
-        private:
-            std::map<std::string, std::string> mMeshCache;
-            std::map<std::pair<int, int>, std::vector<ESM::ESM_Context>> mCellContexts;
+    private:
+        std::map<std::string, std::string> mMeshCache;
+        std::map<std::pair<int, int>, std::vector<ESM::ESM_Context>> mCellContexts;
 
-        public:
-            void init(const Store<ESM::Static>& statics, const Files::Collections& fileCollections,
-                const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder,
-                Loading::Listener* listener);
+    public:
+        void init(const Store<ESM::Static>& statics, const Files::Collections& fileCollections,
+            const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder,
+            Loading::Listener* listener);
 
-            std::string getGroundcoverModel(const std::string& id) const;
-            void initCell(ESM::Cell& cell, int cellX, int cellY) const;
+        std::string getGroundcoverModel(const std::string& id) const;
+        void initCell(ESM::Cell& cell, int cellX, int cellY) const;
     };
 }
 
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 3a46e022fb..78d4a460cf 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -1,70 +1,72 @@
 #include "inventorystore.hpp"
 
-#include <iterator>
 #include <algorithm>
+#include <iterator>
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm3/loadench.hpp>
 #include <components/esm3/inventorystate.hpp>
+#include <components/esm3/loadench.hpp>
 #include <components/misc/rng.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/world.hpp"
 
+#include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/spellresistance.hpp"
 #include "../mwmechanics/spellutil.hpp"
-#include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/weapontype.hpp"
 
-#include "esmstore.hpp"
 #include "class.hpp"
+#include "esmstore.hpp"
 
-void MWWorld::InventoryStore::copySlots (const InventoryStore& store)
+void MWWorld::InventoryStore::copySlots(const InventoryStore& store)
 {
     // some const-trickery, required because of a flaw in the handling of MW-references and the
     // resulting workarounds
-    for (std::vector<ContainerStoreIterator>::const_iterator iter (
-        const_cast<InventoryStore&> (store).mSlots.begin());
-        iter!=const_cast<InventoryStore&> (store).mSlots.end(); ++iter)
+    for (std::vector<ContainerStoreIterator>::const_iterator iter(const_cast<InventoryStore&>(store).mSlots.begin());
+         iter != const_cast<InventoryStore&>(store).mSlots.end(); ++iter)
     {
-        std::size_t distance = std::distance (const_cast<InventoryStore&> (store).begin(), *iter);
+        std::size_t distance = std::distance(const_cast<InventoryStore&>(store).begin(), *iter);
 
         ContainerStoreIterator slot = begin();
 
-        std::advance (slot, distance);
+        std::advance(slot, distance);
 
-        mSlots.push_back (slot);
+        mSlots.push_back(slot);
     }
 
     // some const-trickery, required because of a flaw in the handling of MW-references and the
     // resulting workarounds
-    std::size_t distance = std::distance (const_cast<InventoryStore&> (store).begin(), const_cast<InventoryStore&> (store).mSelectedEnchantItem);
+    std::size_t distance = std::distance(
+        const_cast<InventoryStore&>(store).begin(), const_cast<InventoryStore&>(store).mSelectedEnchantItem);
     ContainerStoreIterator slot = begin();
-    std::advance (slot, distance);
+    std::advance(slot, distance);
     mSelectedEnchantItem = slot;
 }
 
-void MWWorld::InventoryStore::initSlots (TSlots& slots_)
+void MWWorld::InventoryStore::initSlots(TSlots& slots_)
 {
-    for (int i=0; i<Slots; ++i)
-        slots_.push_back (end());
+    for (int i = 0; i < Slots; ++i)
+        slots_.push_back(end());
 }
 
-void MWWorld::InventoryStore::storeEquipmentState(const MWWorld::LiveCellRefBase &ref, int index, ESM::InventoryState &inventory) const
+void MWWorld::InventoryStore::storeEquipmentState(
+    const MWWorld::LiveCellRefBase& ref, int index, ESM::InventoryState& inventory) const
 {
-    for (int i = 0; i<static_cast<int> (mSlots.size()); ++i)
-        if (mSlots[i].getType()!=-1 && mSlots[i]->getBase()==&ref)
+    for (int i = 0; i < static_cast<int>(mSlots.size()); ++i)
+        if (mSlots[i].getType() != -1 && mSlots[i]->getBase() == &ref)
         {
             inventory.mEquipmentSlots[index] = i;
         }
 
-    if (mSelectedEnchantItem.getType()!=-1 && mSelectedEnchantItem->getBase() == &ref)
+    if (mSelectedEnchantItem.getType() != -1 && mSelectedEnchantItem->getBase() == &ref)
         inventory.mSelectedEnchantItem = index;
 }
 
-void MWWorld::InventoryStore::readEquipmentState(const MWWorld::ContainerStoreIterator &iter, int index, const ESM::InventoryState &inventory)
+void MWWorld::InventoryStore::readEquipmentState(
+    const MWWorld::ContainerStoreIterator& iter, int index, const ESM::InventoryState& inventory)
 {
     if (index == inventory.mSelectedEnchantItem)
         mSelectedEnchantItem = iter;
@@ -97,26 +99,26 @@ void MWWorld::InventoryStore::readEquipmentState(const MWWorld::ContainerStoreIt
 }
 
 MWWorld::InventoryStore::InventoryStore()
- : ContainerStore()
- , mInventoryListener(nullptr)
- , mUpdatesEnabled (true)
- , mFirstAutoEquip(true)
- , mSelectedEnchantItem(end())
+    : ContainerStore()
+    , mInventoryListener(nullptr)
+    , mUpdatesEnabled(true)
+    , mFirstAutoEquip(true)
+    , mSelectedEnchantItem(end())
 {
-    initSlots (mSlots);
+    initSlots(mSlots);
 }
 
-MWWorld::InventoryStore::InventoryStore (const InventoryStore& store)
- : ContainerStore (store)
- , mInventoryListener(store.mInventoryListener)
- , mUpdatesEnabled(store.mUpdatesEnabled)
- , mFirstAutoEquip(store.mFirstAutoEquip)
- , mSelectedEnchantItem(end())
+MWWorld::InventoryStore::InventoryStore(const InventoryStore& store)
+    : ContainerStore(store)
+    , mInventoryListener(store.mInventoryListener)
+    , mUpdatesEnabled(store.mUpdatesEnabled)
+    , mFirstAutoEquip(store.mFirstAutoEquip)
+    , mSelectedEnchantItem(end())
 {
-    copySlots (store);
+    copySlots(store);
 }
 
-MWWorld::InventoryStore& MWWorld::InventoryStore::operator= (const InventoryStore& store)
+MWWorld::InventoryStore& MWWorld::InventoryStore::operator=(const InventoryStore& store)
 {
     if (this == &store)
         return *this;
@@ -125,19 +127,21 @@ MWWorld::InventoryStore& MWWorld::InventoryStore::operator= (const InventoryStor
     mInventoryListener = store.mInventoryListener;
     mFirstAutoEquip = store.mFirstAutoEquip;
     mRechargingItemsUpToDate = false;
-    ContainerStore::operator= (store);
+    ContainerStore::operator=(store);
     mSlots.clear();
-    copySlots (store);
+    copySlots(store);
     return *this;
 }
 
-MWWorld::ContainerStoreIterator MWWorld::InventoryStore::add(const Ptr& itemPtr, int count, const Ptr& actorPtr, bool allowAutoEquip, bool resolve)
+MWWorld::ContainerStoreIterator MWWorld::InventoryStore::add(
+    const Ptr& itemPtr, int count, const Ptr& actorPtr, bool allowAutoEquip, bool resolve)
 {
-    const MWWorld::ContainerStoreIterator& retVal = MWWorld::ContainerStore::add(itemPtr, count, actorPtr, allowAutoEquip, resolve);
+    const MWWorld::ContainerStoreIterator& retVal
+        = MWWorld::ContainerStore::add(itemPtr, count, actorPtr, allowAutoEquip, resolve);
 
     // Auto-equip items if an armor/clothing item is added, but not for the player nor werewolves
-    if (allowAutoEquip && actorPtr != MWMechanics::getPlayer()
-            && actorPtr.getClass().isNpc() && !actorPtr.getClass().getNpcStats(actorPtr).isWerewolf())
+    if (allowAutoEquip && actorPtr != MWMechanics::getPlayer() && actorPtr.getClass().isNpc()
+        && !actorPtr.getClass().getNpcStats(actorPtr).isWerewolf())
     {
         auto type = itemPtr.getType();
         if (type == ESM::Armor::sRecordId || type == ESM::Clothing::sRecordId)
@@ -150,29 +154,30 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::add(const Ptr& itemPtr,
     return retVal;
 }
 
-void MWWorld::InventoryStore::equip (int slot, const ContainerStoreIterator& iterator, const Ptr& actor)
+void MWWorld::InventoryStore::equip(int slot, const ContainerStoreIterator& iterator, const Ptr& actor)
 {
     if (iterator == end())
-        throw std::runtime_error ("can't equip end() iterator, use unequip function instead");
+        throw std::runtime_error("can't equip end() iterator, use unequip function instead");
 
-    if (slot<0 || slot>=static_cast<int> (mSlots.size()))
-        throw std::runtime_error ("slot number out of range");
+    if (slot < 0 || slot >= static_cast<int>(mSlots.size()))
+        throw std::runtime_error("slot number out of range");
 
-    if (iterator.getContainerStore()!=this)
-        throw std::runtime_error ("attempt to equip an item that is not in the inventory");
+    if (iterator.getContainerStore() != this)
+        throw std::runtime_error("attempt to equip an item that is not in the inventory");
 
     std::pair<std::vector<int>, bool> slots_;
 
-    slots_ = iterator->getClass().getEquipmentSlots (*iterator);
+    slots_ = iterator->getClass().getEquipmentSlots(*iterator);
 
-    if (std::find (slots_.first.begin(), slots_.first.end(), slot)==slots_.first.end())
-        throw std::runtime_error ("invalid slot");
+    if (std::find(slots_.first.begin(), slots_.first.end(), slot) == slots_.first.end())
+        throw std::runtime_error("invalid slot");
 
     if (mSlots[slot] != end())
         unequipSlot(slot, actor);
 
     // unstack item pointed to by iterator if required
-    if (iterator!=end() && !slots_.second && iterator->getRefData().getCount() > 1) // if slots.second is true, item can stay stacked when equipped
+    if (iterator != end() && !slots_.second
+        && iterator->getRefData().getCount() > 1) // if slots.second is true, item can stay stacked when equipped
     {
         unstack(*iterator, actor);
     }
@@ -187,7 +192,7 @@ void MWWorld::InventoryStore::equip (int slot, const ContainerStoreIterator& ite
 void MWWorld::InventoryStore::unequipAll(const MWWorld::Ptr& actor)
 {
     mUpdatesEnabled = false;
-    for (int slot=0; slot < MWWorld::InventoryStore::Slots; ++slot)
+    for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
         unequipSlot(slot, actor);
 
     mUpdatesEnabled = true;
@@ -195,35 +200,36 @@ void MWWorld::InventoryStore::unequipAll(const MWWorld::Ptr& actor)
     fireEquipmentChangedEvent(actor);
 }
 
-MWWorld::ContainerStoreIterator MWWorld::InventoryStore::getSlot (int slot)
+MWWorld::ContainerStoreIterator MWWorld::InventoryStore::getSlot(int slot)
 {
-    return findSlot (slot);
+    return findSlot(slot);
 }
 
-MWWorld::ConstContainerStoreIterator MWWorld::InventoryStore::getSlot (int slot) const
+MWWorld::ConstContainerStoreIterator MWWorld::InventoryStore::getSlot(int slot) const
 {
-    return findSlot (slot);
+    return findSlot(slot);
 }
 
-MWWorld::ContainerStoreIterator MWWorld::InventoryStore::findSlot (int slot) const
+MWWorld::ContainerStoreIterator MWWorld::InventoryStore::findSlot(int slot) const
 {
-    if (slot<0 || slot>=static_cast<int> (mSlots.size()))
-        throw std::runtime_error ("slot number out of range");
+    if (slot < 0 || slot >= static_cast<int>(mSlots.size()))
+        throw std::runtime_error("slot number out of range");
 
-    if (mSlots[slot]==end())
+    if (mSlots[slot] == end())
         return mSlots[slot];
 
-    if (mSlots[slot]->getRefData().getCount()<1)
+    if (mSlots[slot]->getRefData().getCount() < 1)
     {
         // Object has been deleted
         // This should no longer happen, since the new remove function will unequip first
-        throw std::runtime_error("Invalid slot, make sure you are not calling RefData::setCount for a container object");
+        throw std::runtime_error(
+            "Invalid slot, make sure you are not calling RefData::setCount for a container object");
     }
 
     return mSlots[slot];
 }
 
-void MWWorld::InventoryStore::autoEquipWeapon (const MWWorld::Ptr& actor, TSlots& slots_)
+void MWWorld::InventoryStore::autoEquipWeapon(const MWWorld::Ptr& actor, TSlots& slots_)
 {
     if (!actor.getClass().isNpc())
     {
@@ -231,13 +237,12 @@ void MWWorld::InventoryStore::autoEquipWeapon (const MWWorld::Ptr& actor, TSlots
         // The only case when the difference is noticable - when this creature sells weapon.
         // So just disable weapon autoequipping for creatures which sells weapon.
         int services = actor.getClass().getServices(actor);
-        bool sellsWeapon = services & (ESM::NPC::Weapon|ESM::NPC::MagicItems);
+        bool sellsWeapon = services & (ESM::NPC::Weapon | ESM::NPC::MagicItems);
         if (sellsWeapon)
             return;
     }
 
-    static const ESM::Skill::SkillEnum weaponSkills[] =
-    {
+    static const ESM::Skill::SkillEnum weaponSkills[] = {
         ESM::Skill::LongBlade,
         ESM::Skill::Axe,
         ESM::Skill::Spear,
@@ -256,7 +261,7 @@ void MWWorld::InventoryStore::autoEquipWeapon (const MWWorld::Ptr& actor, TSlots
     ContainerStoreIterator bolt(end());
 
     // rate ammo
-    for (ContainerStoreIterator iter(begin(ContainerStore::Type_Weapon)); iter!=end(); ++iter)
+    for (ContainerStoreIterator iter(begin(ContainerStore::Type_Weapon)); iter != end(); ++iter)
     {
         const ESM::Weapon* esmWeapon = iter->get<ESM::Weapon>()->mBase;
 
@@ -300,7 +305,7 @@ void MWWorld::InventoryStore::autoEquipWeapon (const MWWorld::Ptr& actor, TSlots
         max = 0;
         ContainerStoreIterator weapon(end());
 
-        for (ContainerStoreIterator iter(begin(ContainerStore::Type_Weapon)); iter!=end(); ++iter)
+        for (ContainerStoreIterator iter(begin(ContainerStore::Type_Weapon)); iter != end(); ++iter)
         {
             const ESM::Weapon* esmWeapon = iter->get<ESM::Weapon>()->mBase;
 
@@ -333,7 +338,7 @@ void MWWorld::InventoryStore::autoEquipWeapon (const MWWorld::Ptr& actor, TSlots
         {
             // Do not equip ranged weapons, if there is no suitable ammo
             bool hasAmmo = true;
-            const MWWorld::LiveCellRef<ESM::Weapon> *ref = weapon->get<ESM::Weapon>();
+            const MWWorld::LiveCellRef<ESM::Weapon>* ref = weapon->get<ESM::Weapon>();
             int type = ref->mBase->mData.mType;
             int ammotype = MWMechanics::getWeaponType(type)->mAmmoType;
             if (ammotype == ESM::Weapon::Arrow)
@@ -353,7 +358,7 @@ void MWWorld::InventoryStore::autoEquipWeapon (const MWWorld::Ptr& actor, TSlots
 
             if (hasAmmo)
             {
-                std::pair<std::vector<int>, bool> itemsSlots = weapon->getClass().getEquipmentSlots (*weapon);
+                std::pair<std::vector<int>, bool> itemsSlots = weapon->getClass().getEquipmentSlots(*weapon);
 
                 if (!itemsSlots.first.empty())
                 {
@@ -380,7 +385,7 @@ void MWWorld::InventoryStore::autoEquipWeapon (const MWWorld::Ptr& actor, TSlots
     }
 }
 
-void MWWorld::InventoryStore::autoEquipArmor (const MWWorld::Ptr& actor, TSlots& slots_)
+void MWWorld::InventoryStore::autoEquipArmor(const MWWorld::Ptr& actor, TSlots& slots_)
 {
     // Only NPCs can wear armor for now.
     // For creatures we equip only shields.
@@ -390,8 +395,8 @@ void MWWorld::InventoryStore::autoEquipArmor (const MWWorld::Ptr& actor, TSlots&
         return;
     }
 
-    const MWBase::World *world = MWBase::Environment::get().getWorld();
-    const MWWorld::Store<ESM::GameSetting> &store = world->getStore().get<ESM::GameSetting>();
+    const MWBase::World* world = MWBase::Environment::get().getWorld();
+    const MWWorld::Store<ESM::GameSetting>& store = world->getStore().get<ESM::GameSetting>();
 
     static float fUnarmoredBase1 = store.find("fUnarmoredBase1")->mValue.getFloat();
     static float fUnarmoredBase2 = store.find("fUnarmoredBase2")->mValue.getFloat();
@@ -399,11 +404,12 @@ void MWWorld::InventoryStore::autoEquipArmor (const MWWorld::Ptr& actor, TSlots&
     float unarmoredSkill = actor.getClass().getSkill(actor, ESM::Skill::Unarmored);
     float unarmoredRating = (fUnarmoredBase1 * unarmoredSkill) * (fUnarmoredBase2 * unarmoredSkill);
 
-    for (ContainerStoreIterator iter (begin(ContainerStore::Type_Clothing | ContainerStore::Type_Armor)); iter!=end(); ++iter)
+    for (ContainerStoreIterator iter(begin(ContainerStore::Type_Clothing | ContainerStore::Type_Armor)); iter != end();
+         ++iter)
     {
         Ptr test = *iter;
 
-        switch(test.getClass().canBeEquipped (test, actor).first)
+        switch (test.getClass().canBeEquipped(test, actor).first)
         {
             case 0:
                 continue;
@@ -411,23 +417,22 @@ void MWWorld::InventoryStore::autoEquipArmor (const MWWorld::Ptr& actor, TSlots&
                 break;
         }
 
-        if (iter.getType() == ContainerStore::Type_Armor &&
-                test.getClass().getEffectiveArmorRating(test, actor) <= std::max(unarmoredRating, 0.f))
+        if (iter.getType() == ContainerStore::Type_Armor
+            && test.getClass().getEffectiveArmorRating(test, actor) <= std::max(unarmoredRating, 0.f))
         {
             continue;
         }
 
-        std::pair<std::vector<int>, bool> itemsSlots =
-            iter->getClass().getEquipmentSlots (*iter);
+        std::pair<std::vector<int>, bool> itemsSlots = iter->getClass().getEquipmentSlots(*iter);
 
         // checking if current item pointed by iter can be equipped
         for (int slot : itemsSlots.first)
         {
             // if true then it means slot is equipped already
             // check if slot may require swapping if current item is more valuable
-            if (slots_.at (slot)!=end())
+            if (slots_.at(slot) != end())
             {
-                Ptr old = *slots_.at (slot);
+                Ptr old = *slots_.at(slot);
 
                 if (iter.getType() == ContainerStore::Type_Armor)
                 {
@@ -438,7 +443,8 @@ void MWWorld::InventoryStore::autoEquipArmor (const MWWorld::Ptr& actor, TSlots&
 
                         if (old.get<ESM::Armor>()->mBase->mData.mType == test.get<ESM::Armor>()->mBase->mData.mType)
                         {
-                            if (old.getClass().getEffectiveArmorRating(old, actor) >= test.getClass().getEffectiveArmorRating(test, actor))
+                            if (old.getClass().getEffectiveArmorRating(old, actor)
+                                >= test.getClass().getEffectiveArmorRating(test, actor))
                                 // old armor had better armor rating
                                 continue;
                         }
@@ -460,7 +466,7 @@ void MWWorld::InventoryStore::autoEquipArmor (const MWWorld::Ptr& actor, TSlots&
                             Ptr rightRing = *slots_.at(Slot_RightRing);
 
                             // we want to swap cheaper ring only if both are equipped
-                            if (old.getClass().getValue (old) >= rightRing.getClass().getValue (rightRing))
+                            if (old.getClass().getValue(old) >= rightRing.getClass().getValue(rightRing))
                                 continue;
                         }
                     }
@@ -468,7 +474,7 @@ void MWWorld::InventoryStore::autoEquipArmor (const MWWorld::Ptr& actor, TSlots&
                     if (old.getType() == ESM::Clothing::sRecordId)
                     {
                         // check value
-                        if (old.getClass().getValue (old) >= test.getClass().getValue (test))
+                        if (old.getClass().getValue(old) >= test.getClass().getValue(test))
                             // old clothing was more valuable
                             continue;
                     }
@@ -502,12 +508,11 @@ void MWWorld::InventoryStore::autoEquipShield(const MWWorld::Ptr& actor, TSlots&
             continue;
         if (iter->getClass().canBeEquipped(*iter, actor).first != 1)
             continue;
-        std::pair<std::vector<int>, bool> shieldSlots =
-            iter->getClass().getEquipmentSlots(*iter);
+        std::pair<std::vector<int>, bool> shieldSlots = iter->getClass().getEquipmentSlots(*iter);
         int slot = shieldSlots.first[0];
         const ContainerStoreIterator& shield = slots_[slot];
-        if (shield != end()
-                && shield.getType() == Type_Armor && shield->get<ESM::Armor>()->mBase->mData.mType == ESM::Armor::Shield)
+        if (shield != end() && shield.getType() == Type_Armor
+            && shield->get<ESM::Armor>()->mBase->mData.mType == ESM::Armor::Shield)
         {
             if (shield->getClass().getItemHealth(*shield) >= iter->getClass().getItemHealth(*iter))
                 continue;
@@ -516,10 +521,10 @@ void MWWorld::InventoryStore::autoEquipShield(const MWWorld::Ptr& actor, TSlots&
     }
 }
 
-void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
+void MWWorld::InventoryStore::autoEquip(const MWWorld::Ptr& actor)
 {
     TSlots slots_;
-    initSlots (slots_);
+    initSlots(slots_);
 
     // Disable model update during auto-equip
     mUpdatesEnabled = false;
@@ -533,7 +538,7 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
 
     bool changed = false;
 
-    for (std::size_t i=0; i<slots_.size(); ++i)
+    for (std::size_t i = 0; i < slots_.size(); ++i)
     {
         if (slots_[i] != mSlots[i])
         {
@@ -545,7 +550,7 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
 
     if (changed)
     {
-        mSlots.swap (slots_);
+        mSlots.swap(slots_);
         fireEquipmentChangedEvent(actor);
         flagAsModified();
     }
@@ -554,7 +559,7 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
 MWWorld::ContainerStoreIterator MWWorld::InventoryStore::getPreferredShield(const MWWorld::Ptr& actor)
 {
     TSlots slots;
-    initSlots (slots);
+    initSlots(slots);
     autoEquipArmor(actor, slots);
     return slots[Slot_CarriedLeft];
 }
@@ -566,8 +571,7 @@ bool MWWorld::InventoryStore::stacks(const ConstPtr& ptr1, const ConstPtr& ptr2)
         return false;
 
     // don't stack if either item is currently equipped
-    for (TSlots::const_iterator iter (mSlots.begin());
-        iter!=mSlots.end(); ++iter)
+    for (TSlots::const_iterator iter(mSlots.begin()); iter != mSlots.end(); ++iter)
     {
         if (*iter != end() && (ptr1 == **iter || ptr2 == **iter))
         {
@@ -597,7 +601,7 @@ int MWWorld::InventoryStore::remove(const Ptr& item, int count, const Ptr& actor
     bool wasEquipped = false;
     if (!item.getRefData().getCount())
     {
-        for (int slot=0; slot < MWWorld::InventoryStore::Slots; ++slot)
+        for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
         {
             if (mSlots[slot] == end())
                 continue;
@@ -614,16 +618,15 @@ int MWWorld::InventoryStore::remove(const Ptr& item, int count, const Ptr& actor
     // If an armor/clothing item is removed, try to find a replacement,
     // but not for the player nor werewolves, and not if the RemoveItem script command
     // was used (equipReplacement is false)
-    if (equipReplacement && wasEquipped && (actor != MWMechanics::getPlayer())
-            && actor.getClass().isNpc() && !actor.getClass().getNpcStats(actor).isWerewolf())
+    if (equipReplacement && wasEquipped && (actor != MWMechanics::getPlayer()) && actor.getClass().isNpc()
+        && !actor.getClass().getNpcStats(actor).isWerewolf())
     {
         auto type = item.getType();
         if (type == ESM::Armor::sRecordId || type == ESM::Clothing::sRecordId)
             autoEquip(actor);
     }
 
-    if (item.getRefData().getCount() == 0 && mSelectedEnchantItem != end()
-            && *mSelectedEnchantItem == item)
+    if (item.getRefData().getCount() == 0 && mSelectedEnchantItem != end() && *mSelectedEnchantItem == item)
     {
         mSelectedEnchantItem = end();
     }
@@ -634,10 +637,11 @@ int MWWorld::InventoryStore::remove(const Ptr& item, int count, const Ptr& actor
     return retCount;
 }
 
-MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipSlot(int slot, const MWWorld::Ptr& actor, bool applyUpdates)
+MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipSlot(
+    int slot, const MWWorld::Ptr& actor, bool applyUpdates)
 {
-    if (slot<0 || slot>=static_cast<int> (mSlots.size()))
-        throw std::runtime_error ("slot number out of range");
+    if (slot < 0 || slot >= static_cast<int>(mSlots.size()))
+        throw std::runtime_error("slot number out of range");
 
     ContainerStoreIterator it = mSlots[slot];
 
@@ -677,33 +681,35 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipSlot(int slot, c
     return it;
 }
 
-MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipItem(const MWWorld::Ptr& item, const MWWorld::Ptr& actor)
+MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipItem(
+    const MWWorld::Ptr& item, const MWWorld::Ptr& actor)
 {
-    for (int slot=0; slot<MWWorld::InventoryStore::Slots; ++slot)
+    for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
     {
         MWWorld::ContainerStoreIterator equipped = getSlot(slot);
         if (equipped != end() && *equipped == item)
             return unequipSlot(slot, actor);
     }
 
-    throw std::runtime_error ("attempt to unequip an item that is not currently equipped");
+    throw std::runtime_error("attempt to unequip an item that is not currently equipped");
 }
 
-MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipItemQuantity(const Ptr& item, const Ptr& actor, int count)
+MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipItemQuantity(
+    const Ptr& item, const Ptr& actor, int count)
 {
     if (!isEquipped(item))
-        throw std::runtime_error ("attempt to unequip an item that is not currently equipped");
+        throw std::runtime_error("attempt to unequip an item that is not currently equipped");
     if (count <= 0)
-        throw std::runtime_error ("attempt to unequip nothing (count <= 0)");
+        throw std::runtime_error("attempt to unequip nothing (count <= 0)");
     if (count > item.getRefData().getCount())
-        throw std::runtime_error ("attempt to unequip more items than equipped");
+        throw std::runtime_error("attempt to unequip more items than equipped");
 
     if (count == item.getRefData().getCount())
         return unequipItem(item, actor);
 
     // Move items to an existing stack if possible, otherwise split count items out into a new stack.
     // Moving counts manually here, since ContainerStore's restack can't target unequipped stacks.
-    for (MWWorld::ContainerStoreIterator iter (begin()); iter != end(); ++iter)
+    for (MWWorld::ContainerStoreIterator iter(begin()); iter != end(); ++iter)
     {
         if (stacks(*iter, item) && !isEquipped(*iter))
         {
@@ -721,7 +727,7 @@ MWWorld::InventoryStoreListener* MWWorld::InventoryStore::getInvListener() const
     return mInventoryListener;
 }
 
-void MWWorld::InventoryStore::setInvListener(InventoryStoreListener *listener, const Ptr& actor)
+void MWWorld::InventoryStore::setInvListener(InventoryStoreListener* listener, const Ptr& actor)
 {
     mInventoryListener = listener;
 }
@@ -745,13 +751,13 @@ void MWWorld::InventoryStore::fireEquipmentChangedEvent(const Ptr& actor)
 void MWWorld::InventoryStore::clear()
 {
     mSlots.clear();
-    initSlots (mSlots);
+    initSlots(mSlots);
     ContainerStore::clear();
 }
 
-bool MWWorld::InventoryStore::isEquipped(const MWWorld::ConstPtr &item)
+bool MWWorld::InventoryStore::isEquipped(const MWWorld::ConstPtr& item)
 {
-    for (int i=0; i < MWWorld::InventoryStore::Slots; ++i)
+    for (int i = 0; i < MWWorld::InventoryStore::Slots; ++i)
     {
         if (getSlot(i) != end() && *getSlot(i) == item)
             return true;
diff --git a/apps/openmw/mwworld/inventorystore.hpp b/apps/openmw/mwworld/inventorystore.hpp
index 51eea3129d..53ca58440a 100644
--- a/apps/openmw/mwworld/inventorystore.hpp
+++ b/apps/openmw/mwworld/inventorystore.hpp
@@ -21,7 +21,7 @@ namespace MWWorld
         /**
          * Fired when items are equipped or unequipped
          */
-        virtual void equipmentChanged () {}
+        virtual void equipmentChanged() {}
 
         virtual ~InventoryStoreListener() = default;
     };
@@ -29,150 +29,152 @@ namespace MWWorld
     ///< \brief Variant of the ContainerStore for NPCs
     class InventoryStore : public ContainerStore
     {
-        public:
-
-            static constexpr int Slot_Helmet = 0;
-            static constexpr int Slot_Cuirass = 1;
-            static constexpr int Slot_Greaves = 2;
-            static constexpr int Slot_LeftPauldron = 3;
-            static constexpr int Slot_RightPauldron = 4;
-            static constexpr int Slot_LeftGauntlet = 5;
-            static constexpr int Slot_RightGauntlet = 6;
-            static constexpr int Slot_Boots = 7;
-            static constexpr int Slot_Shirt = 8;
-            static constexpr int Slot_Pants = 9;
-            static constexpr int Slot_Skirt = 10;
-            static constexpr int Slot_Robe = 11;
-            static constexpr int Slot_LeftRing = 12;
-            static constexpr int Slot_RightRing = 13;
-            static constexpr int Slot_Amulet = 14;
-            static constexpr int Slot_Belt = 15;
-            static constexpr int Slot_CarriedRight = 16;
-            static constexpr int Slot_CarriedLeft = 17;
-            static constexpr int Slot_Ammunition = 18;
-
-            static constexpr int Slots = 19;
-
-            static constexpr int Slot_NoSlot = -1;
+    public:
+        static constexpr int Slot_Helmet = 0;
+        static constexpr int Slot_Cuirass = 1;
+        static constexpr int Slot_Greaves = 2;
+        static constexpr int Slot_LeftPauldron = 3;
+        static constexpr int Slot_RightPauldron = 4;
+        static constexpr int Slot_LeftGauntlet = 5;
+        static constexpr int Slot_RightGauntlet = 6;
+        static constexpr int Slot_Boots = 7;
+        static constexpr int Slot_Shirt = 8;
+        static constexpr int Slot_Pants = 9;
+        static constexpr int Slot_Skirt = 10;
+        static constexpr int Slot_Robe = 11;
+        static constexpr int Slot_LeftRing = 12;
+        static constexpr int Slot_RightRing = 13;
+        static constexpr int Slot_Amulet = 14;
+        static constexpr int Slot_Belt = 15;
+        static constexpr int Slot_CarriedRight = 16;
+        static constexpr int Slot_CarriedLeft = 17;
+        static constexpr int Slot_Ammunition = 18;
 
-        private:
+        static constexpr int Slots = 19;
 
-            InventoryStoreListener* mInventoryListener;
+        static constexpr int Slot_NoSlot = -1;
 
-            // Enables updates of magic effects and actor model whenever items are equipped or unequipped.
-            // This is disabled during autoequip to avoid excessive updates
-            bool mUpdatesEnabled;
+    private:
+        InventoryStoreListener* mInventoryListener;
 
-            bool mFirstAutoEquip;
+        // Enables updates of magic effects and actor model whenever items are equipped or unequipped.
+        // This is disabled during autoequip to avoid excessive updates
+        bool mUpdatesEnabled;
 
-            typedef std::vector<ContainerStoreIterator> TSlots;
+        bool mFirstAutoEquip;
 
-            TSlots mSlots;
+        typedef std::vector<ContainerStoreIterator> TSlots;
 
-            void autoEquipWeapon(const MWWorld::Ptr& actor, TSlots& slots_);
-            void autoEquipArmor(const MWWorld::Ptr& actor, TSlots& slots_);
-            void autoEquipShield(const MWWorld::Ptr& actor, TSlots& slots_);
+        TSlots mSlots;
 
-            // selected magic item (for using enchantments of type "Cast once" or "Cast when used")
-            ContainerStoreIterator mSelectedEnchantItem;
+        void autoEquipWeapon(const MWWorld::Ptr& actor, TSlots& slots_);
+        void autoEquipArmor(const MWWorld::Ptr& actor, TSlots& slots_);
+        void autoEquipShield(const MWWorld::Ptr& actor, TSlots& slots_);
 
-            void copySlots (const InventoryStore& store);
+        // selected magic item (for using enchantments of type "Cast once" or "Cast when used")
+        ContainerStoreIterator mSelectedEnchantItem;
 
-            void initSlots (TSlots& slots_);
+        void copySlots(const InventoryStore& store);
 
-            void fireEquipmentChangedEvent(const Ptr& actor);
+        void initSlots(TSlots& slots_);
 
-            void storeEquipmentState (const MWWorld::LiveCellRefBase& ref, int index, ESM::InventoryState& inventory) const override;
-            void readEquipmentState (const MWWorld::ContainerStoreIterator& iter, int index, const ESM::InventoryState& inventory) override;
+        void fireEquipmentChangedEvent(const Ptr& actor);
 
-            ContainerStoreIterator findSlot (int slot) const;
+        void storeEquipmentState(
+            const MWWorld::LiveCellRefBase& ref, int index, ESM::InventoryState& inventory) const override;
+        void readEquipmentState(
+            const MWWorld::ContainerStoreIterator& iter, int index, const ESM::InventoryState& inventory) override;
 
-        public:
+        ContainerStoreIterator findSlot(int slot) const;
 
-            InventoryStore();
+    public:
+        InventoryStore();
 
-            InventoryStore (const InventoryStore& store);
+        InventoryStore(const InventoryStore& store);
 
-            InventoryStore& operator= (const InventoryStore& store);
+        InventoryStore& operator=(const InventoryStore& store);
 
-            std::unique_ptr<ContainerStore> clone() override { return std::make_unique<InventoryStore>(*this); }
+        std::unique_ptr<ContainerStore> clone() override { return std::make_unique<InventoryStore>(*this); }
 
-            ContainerStoreIterator add (const Ptr& itemPtr, int count, const Ptr& actorPtr, bool allowAutoEquip = true, bool resolve = true) override;
-            ///< Add the item pointed to by \a ptr to this container. (Stacks automatically if needed)
-            /// Auto-equip items if specific conditions are fulfilled and allowAutoEquip is true (see the implementation).
-            ///
-            /// \note The item pointed to is not required to exist beyond this function call.
-            ///
-            /// \attention Do not add items to an existing stack by increasing the count instead of
-            /// calling this function!
-            ///
-            /// @return if stacking happened, return iterator to the item that was stacked against, otherwise iterator to the newly inserted item.
+        ContainerStoreIterator add(const Ptr& itemPtr, int count, const Ptr& actorPtr, bool allowAutoEquip = true,
+            bool resolve = true) override;
+        ///< Add the item pointed to by \a ptr to this container. (Stacks automatically if needed)
+        /// Auto-equip items if specific conditions are fulfilled and allowAutoEquip is true (see the implementation).
+        ///
+        /// \note The item pointed to is not required to exist beyond this function call.
+        ///
+        /// \attention Do not add items to an existing stack by increasing the count instead of
+        /// calling this function!
+        ///
+        /// @return if stacking happened, return iterator to the item that was stacked against, otherwise iterator to
+        /// the newly inserted item.
 
-            void equip (int slot, const ContainerStoreIterator& iterator, const Ptr& actor);
-            ///< \warning \a iterator can not be an end()-iterator, use unequip function instead
+        void equip(int slot, const ContainerStoreIterator& iterator, const Ptr& actor);
+        ///< \warning \a iterator can not be an end()-iterator, use unequip function instead
 
-            bool isEquipped(const MWWorld::ConstPtr& item);
-            ///< Utility function, returns true if the given item is equipped in any slot
+        bool isEquipped(const MWWorld::ConstPtr& item);
+        ///< Utility function, returns true if the given item is equipped in any slot
 
-            void setSelectedEnchantItem(const ContainerStoreIterator& iterator);
-            ///< set the selected magic item (for using enchantments of type "Cast once" or "Cast when used")
-            /// \note to unset the selected item, call this method with end() iterator
+        void setSelectedEnchantItem(const ContainerStoreIterator& iterator);
+        ///< set the selected magic item (for using enchantments of type "Cast once" or "Cast when used")
+        /// \note to unset the selected item, call this method with end() iterator
 
-            ContainerStoreIterator getSelectedEnchantItem();
-            ///< @return selected magic item (for using enchantments of type "Cast once" or "Cast when used")
-            /// \note if no item selected, return end() iterator
+        ContainerStoreIterator getSelectedEnchantItem();
+        ///< @return selected magic item (for using enchantments of type "Cast once" or "Cast when used")
+        /// \note if no item selected, return end() iterator
 
-            ContainerStoreIterator getSlot (int slot);
-            ConstContainerStoreIterator getSlot(int slot) const;
+        ContainerStoreIterator getSlot(int slot);
+        ConstContainerStoreIterator getSlot(int slot) const;
 
-            ContainerStoreIterator getPreferredShield(const MWWorld::Ptr& actor);
+        ContainerStoreIterator getPreferredShield(const MWWorld::Ptr& actor);
 
-            void unequipAll(const MWWorld::Ptr& actor);
-            ///< Unequip all currently equipped items.
+        void unequipAll(const MWWorld::Ptr& actor);
+        ///< Unequip all currently equipped items.
 
-            void autoEquip (const MWWorld::Ptr& actor);
-            ///< Auto equip items according to stats and item value.
+        void autoEquip(const MWWorld::Ptr& actor);
+        ///< Auto equip items according to stats and item value.
 
-            bool stacks (const ConstPtr& ptr1, const ConstPtr& ptr2) const override;
-            ///< @return true if the two specified objects can stack with each other
+        bool stacks(const ConstPtr& ptr1, const ConstPtr& ptr2) const override;
+        ///< @return true if the two specified objects can stack with each other
 
-            using ContainerStore::remove;
-            int remove(const Ptr& item, int count, const Ptr& actor, bool equipReplacement = 0, bool resolve = true) override;
-            ///< Remove \a count item(s) designated by \a item from this inventory.
-            ///
-            /// @return the number of items actually removed
+        using ContainerStore::remove;
+        int remove(
+            const Ptr& item, int count, const Ptr& actor, bool equipReplacement = 0, bool resolve = true) override;
+        ///< Remove \a count item(s) designated by \a item from this inventory.
+        ///
+        /// @return the number of items actually removed
 
-            ContainerStoreIterator unequipSlot(int slot, const Ptr& actor, bool applyUpdates = true);
-            ///< Unequip \a slot.
-            ///
-            /// @return an iterator to the item that was previously in the slot
+        ContainerStoreIterator unequipSlot(int slot, const Ptr& actor, bool applyUpdates = true);
+        ///< Unequip \a slot.
+        ///
+        /// @return an iterator to the item that was previously in the slot
 
-            ContainerStoreIterator unequipItem(const Ptr& item, const Ptr& actor);
-            ///< Unequip an item identified by its Ptr. An exception is thrown
-            /// if the item is not currently equipped.
-            ///
-            /// @return an iterator to the item that was previously in the slot
-            /// (it can be re-stacked so its count may be different than when it
-            /// was equipped).
+        ContainerStoreIterator unequipItem(const Ptr& item, const Ptr& actor);
+        ///< Unequip an item identified by its Ptr. An exception is thrown
+        /// if the item is not currently equipped.
+        ///
+        /// @return an iterator to the item that was previously in the slot
+        /// (it can be re-stacked so its count may be different than when it
+        /// was equipped).
 
-            ContainerStoreIterator unequipItemQuantity(const Ptr& item, const Ptr& actor, int count);
-            ///< Unequip a specific quantity of an item identified by its Ptr.
-            /// An exception is thrown if the item is not currently equipped,
-            /// if count <= 0, or if count > the item stack size.
-            ///
-            /// @return an iterator to the unequipped items that were previously
-            /// in the slot (they can be re-stacked so its count may be different
-            /// than the requested count).
+        ContainerStoreIterator unequipItemQuantity(const Ptr& item, const Ptr& actor, int count);
+        ///< Unequip a specific quantity of an item identified by its Ptr.
+        /// An exception is thrown if the item is not currently equipped,
+        /// if count <= 0, or if count > the item stack size.
+        ///
+        /// @return an iterator to the unequipped items that were previously
+        /// in the slot (they can be re-stacked so its count may be different
+        /// than the requested count).
 
-            void setInvListener (InventoryStoreListener* listener, const Ptr& actor);
-            ///< Set a listener for various events, see \a InventoryStoreListener
+        void setInvListener(InventoryStoreListener* listener, const Ptr& actor);
+        ///< Set a listener for various events, see \a InventoryStoreListener
 
-            InventoryStoreListener* getInvListener() const;
+        InventoryStoreListener* getInvListener() const;
 
-            void clear() override;
-            ///< Empty container.
+        void clear() override;
+        ///< Empty container.
 
-            bool isFirstEquip();
+        bool isFirstEquip();
     };
 }
 
diff --git a/apps/openmw/mwworld/livecellref.cpp b/apps/openmw/mwworld/livecellref.cpp
index d69f314ef3..fd5343ba96 100644
--- a/apps/openmw/mwworld/livecellref.cpp
+++ b/apps/openmw/mwworld/livecellref.cpp
@@ -3,30 +3,32 @@
 #include <sstream>
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm3/objectstate.hpp>
-#include <components/esm3/loadcrea.hpp>
 #include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadcrea.hpp>
 #include <components/esm3/loadscpt.hpp>
+#include <components/esm3/objectstate.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/luamanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "ptr.hpp"
 #include "class.hpp"
 #include "esmstore.hpp"
+#include "ptr.hpp"
 
-MWWorld::LiveCellRefBase::LiveCellRefBase(unsigned int type, const ESM::CellRef &cref)
-  : mClass(&Class::get(type)), mRef(cref), mData(cref)
+MWWorld::LiveCellRefBase::LiveCellRefBase(unsigned int type, const ESM::CellRef& cref)
+    : mClass(&Class::get(type))
+    , mRef(cref)
+    , mData(cref)
 {
 }
 
-void MWWorld::LiveCellRefBase::loadImp (const ESM::ObjectState& state)
+void MWWorld::LiveCellRefBase::loadImp(const ESM::ObjectState& state)
 {
     mRef = state.mRef;
-    mData = RefData (state, mData.isDeletedByContentFile());
+    mData = RefData(state, mData.isDeletedByContentFile());
 
-    Ptr ptr (this);
+    Ptr ptr(this);
 
     if (state.mHasLocals)
     {
@@ -34,26 +36,27 @@ void MWWorld::LiveCellRefBase::loadImp (const ESM::ObjectState& state)
         // Make sure we still have a script. It could have been coming from a content file that is no longer active.
         if (!scriptId.empty())
         {
-            if (const ESM::Script* script = MWBase::Environment::get().getWorld()->getStore().get<ESM::Script>().search (scriptId))
+            if (const ESM::Script* script
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::Script>().search(scriptId))
             {
                 try
                 {
-                    mData.setLocals (*script);
-                    mData.getLocals().read (state.mLocals, scriptId);
+                    mData.setLocals(*script);
+                    mData.getLocals().read(state.mLocals, scriptId);
                 }
                 catch (const std::exception& exception)
                 {
-                    Log(Debug::Error)
-                        << "Error: failed to load state for local script " << scriptId
-                        << " because an exception has been thrown: " << exception.what();
+                    Log(Debug::Error) << "Error: failed to load state for local script " << scriptId
+                                      << " because an exception has been thrown: " << exception.what();
                 }
             }
         }
     }
 
-    mClass->readAdditionalState (ptr, state);
+    mClass->readAdditionalState(ptr, state);
 
-    if (!mRef.getSoul().empty() && !MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>().search(mRef.getSoul()))
+    if (!mRef.getSoul().empty()
+        && !MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>().search(mRef.getSoul()))
     {
         Log(Debug::Warning) << "Soul '" << mRef.getSoul() << "' not found, removing the soul from soul gem";
         mRef.setSoul(std::string());
@@ -62,19 +65,20 @@ void MWWorld::LiveCellRefBase::loadImp (const ESM::ObjectState& state)
     MWBase::Environment::get().getLuaManager()->loadLocalScripts(ptr, state.mLuaScripts);
 }
 
-void MWWorld::LiveCellRefBase::saveImp (ESM::ObjectState& state) const
+void MWWorld::LiveCellRefBase::saveImp(ESM::ObjectState& state) const
 {
     mRef.writeState(state);
 
-    ConstPtr ptr (this);
+    ConstPtr ptr(this);
 
-    mData.write (state, mClass->getScript (ptr));
-    MWBase::Environment::get().getLuaManager()->saveLocalScripts(Ptr(const_cast<LiveCellRefBase*>(this)), state.mLuaScripts);
+    mData.write(state, mClass->getScript(ptr));
+    MWBase::Environment::get().getLuaManager()->saveLocalScripts(
+        Ptr(const_cast<LiveCellRefBase*>(this)), state.mLuaScripts);
 
-    mClass->writeAdditionalState (ptr, state);
+    mClass->writeAdditionalState(ptr, state);
 }
 
-bool MWWorld::LiveCellRefBase::checkStateImp (const ESM::ObjectState& state)
+bool MWWorld::LiveCellRefBase::checkStateImp(const ESM::ObjectState& state)
 {
     return true;
 }
diff --git a/apps/openmw/mwworld/livecellref.hpp b/apps/openmw/mwworld/livecellref.hpp
index bee6f2ba57..128546bb65 100644
--- a/apps/openmw/mwworld/livecellref.hpp
+++ b/apps/openmw/mwworld/livecellref.hpp
@@ -24,7 +24,7 @@ namespace MWWorld
     /// Used to create pointers to hold any type of LiveCellRef<> object.
     struct LiveCellRefBase
     {
-        const Class *mClass;
+        const Class* mClass;
 
         /** Information about this instance, such as 3D location and rotation
          * and individual type-dependent data.
@@ -34,16 +34,16 @@ namespace MWWorld
         /** runtime-data */
         RefData mData;
 
-        LiveCellRefBase(unsigned int type, const ESM::CellRef &cref=ESM::CellRef());
+        LiveCellRefBase(unsigned int type, const ESM::CellRef& cref = ESM::CellRef());
         /* Need this for the class to be recognized as polymorphic */
-        virtual ~LiveCellRefBase() { }
+        virtual ~LiveCellRefBase() {}
 
-        virtual void load (const ESM::ObjectState& state) = 0;
+        virtual void load(const ESM::ObjectState& state) = 0;
         ///< Load state into a LiveCellRef, that has already been initialised with base and class.
         ///
         /// \attention Must not be called with an invalid \a state.
 
-        virtual void save (ESM::ObjectState& state) const = 0;
+        virtual void save(ESM::ObjectState& state) const = 0;
         ///< Save LiveCellRef state into \a state.
 
         virtual std::string_view getTypeDescription() const = 0;
@@ -57,28 +57,27 @@ namespace MWWorld
         template <class T>
         static LiveCellRef<T>* dynamicCast(LiveCellRefBase* value);
 
-        protected:
-
-            void loadImp (const ESM::ObjectState& state);
-            ///< Load state into a LiveCellRef, that has already been initialised with base and
-            /// class.
-            ///
-            /// \attention Must not be called with an invalid \a state.
+    protected:
+        void loadImp(const ESM::ObjectState& state);
+        ///< Load state into a LiveCellRef, that has already been initialised with base and
+        /// class.
+        ///
+        /// \attention Must not be called with an invalid \a state.
 
-            void saveImp (ESM::ObjectState& state) const;
-            ///< Save LiveCellRef state into \a state.
+        void saveImp(ESM::ObjectState& state) const;
+        ///< Save LiveCellRef state into \a state.
 
-            static bool checkStateImp (const ESM::ObjectState& state);
-            ///< Check if state is valid and report errors.
-            ///
-            /// \return Valid?
-            ///
-            /// \note Does not check if the RefId exists.
+        static bool checkStateImp(const ESM::ObjectState& state);
+        ///< Check if state is valid and report errors.
+        ///
+        /// \return Valid?
+        ///
+        /// \note Does not check if the RefId exists.
     };
 
-    inline bool operator== (const LiveCellRefBase& cellRef, const ESM::RefNum refNum)
+    inline bool operator==(const LiveCellRefBase& cellRef, const ESM::RefNum refNum)
     {
-        return cellRef.mRef.getRefNum()==refNum;
+        return cellRef.mRef.getRefNum() == refNum;
     }
 
     std::string makeDynamicCastErrorMessage(const LiveCellRefBase* value, std::string_view recordType);
@@ -109,27 +108,31 @@ namespace MWWorld
     struct LiveCellRef : public LiveCellRefBase
     {
         LiveCellRef(const ESM::CellRef& cref, const X* b = nullptr)
-            : LiveCellRefBase(X::sRecordId, cref), mBase(b)
-        {}
+            : LiveCellRefBase(X::sRecordId, cref)
+            , mBase(b)
+        {
+        }
 
         LiveCellRef(const X* b = nullptr)
-            : LiveCellRefBase(X::sRecordId), mBase(b)
-        {}
+            : LiveCellRefBase(X::sRecordId)
+            , mBase(b)
+        {
+        }
 
         // The object that this instance is based on.
         const X* mBase;
 
-        void load (const ESM::ObjectState& state) override;
+        void load(const ESM::ObjectState& state) override;
         ///< Load state into a LiveCellRef, that has already been initialised with base and class.
         ///
         /// \attention Must not be called with an invalid \a state.
 
-        void save (ESM::ObjectState& state) const override;
+        void save(ESM::ObjectState& state) const override;
         ///< Save LiveCellRef state into \a state.
 
         std::string_view getTypeDescription() const override { return X::getRecordType(); }
 
-        static bool checkState (const ESM::ObjectState& state);
+        static bool checkState(const ESM::ObjectState& state);
         ///< Check if state is valid and report errors.
         ///
         /// \return Valid?
@@ -138,21 +141,21 @@ namespace MWWorld
     };
 
     template <typename X>
-    void LiveCellRef<X>::load (const ESM::ObjectState& state)
+    void LiveCellRef<X>::load(const ESM::ObjectState& state)
     {
-        loadImp (state);
+        loadImp(state);
     }
 
     template <typename X>
-    void LiveCellRef<X>::save (ESM::ObjectState& state) const
+    void LiveCellRef<X>::save(ESM::ObjectState& state) const
     {
-        saveImp (state);
+        saveImp(state);
     }
 
     template <typename X>
-    bool LiveCellRef<X>::checkState (const ESM::ObjectState& state)
+    bool LiveCellRef<X>::checkState(const ESM::ObjectState& state)
     {
-        return checkStateImp (state);
+        return checkStateImp(state);
     }
 }
 
diff --git a/apps/openmw/mwworld/localscripts.cpp b/apps/openmw/mwworld/localscripts.cpp
index ec8706320a..297ef3fa2b 100644
--- a/apps/openmw/mwworld/localscripts.cpp
+++ b/apps/openmw/mwworld/localscripts.cpp
@@ -1,15 +1,15 @@
 #include "localscripts.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm3/loadscpt.hpp>
 #include <components/esm3/loadcont.hpp>
 #include <components/esm3/loadcrea.hpp>
 #include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadscpt.hpp>
 
-#include "esmstore.hpp"
 #include "cellstore.hpp"
 #include "class.hpp"
 #include "containerstore.hpp"
+#include "esmstore.hpp"
 
 namespace
 {
@@ -47,19 +47,19 @@ namespace
         bool operator()(const MWWorld::Ptr& containerPtr)
         {
             // Ignore containers without generated content
-            if (containerPtr.getType() == ESM::Container::sRecordId &&
-                containerPtr.getRefData().getCustomData() == nullptr)
+            if (containerPtr.getType() == ESM::Container::sRecordId
+                && containerPtr.getRefData().getCustomData() == nullptr)
                 return true;
 
             MWWorld::ContainerStore& container = containerPtr.getClass().getContainerStore(containerPtr);
-            for(const auto& ptr : container)
+            for (const auto& ptr : container)
             {
                 std::string_view script = ptr.getClass().getScript(ptr);
-                if(!script.empty())
+                if (!script.empty())
                 {
                     MWWorld::Ptr item = ptr;
                     item.mCell = containerPtr.getCell();
-                    mScripts.add (script, item);
+                    mScripts.add(script, item);
                 }
             }
             return true;
@@ -68,7 +68,8 @@ namespace
 
 }
 
-MWWorld::LocalScripts::LocalScripts (const MWWorld::ESMStore& store) : mStore (store)
+MWWorld::LocalScripts::LocalScripts(const MWWorld::ESMStore& store)
+    : mStore(store)
 {
     mIter = mScripts.end();
 }
@@ -80,9 +81,9 @@ void MWWorld::LocalScripts::startIteration()
 
 bool MWWorld::LocalScripts::getNext(std::pair<std::string, Ptr>& script)
 {
-    if (mIter!=mScripts.end())
+    if (mIter != mScripts.end())
     {
-        std::list<std::pair<std::string, Ptr> >::iterator iter = mIter++;
+        std::list<std::pair<std::string, Ptr>>::iterator iter = mIter++;
         script = *iter;
         return true;
     }
@@ -91,36 +92,34 @@ bool MWWorld::LocalScripts::getNext(std::pair<std::string, Ptr>& script)
 
 void MWWorld::LocalScripts::add(std::string_view scriptName, const Ptr& ptr)
 {
-    if (const ESM::Script *script = mStore.get<ESM::Script>().search (scriptName))
+    if (const ESM::Script* script = mStore.get<ESM::Script>().search(scriptName))
     {
         try
         {
-            ptr.getRefData().setLocals (*script);
+            ptr.getRefData().setLocals(*script);
 
-            for (std::list<std::pair<std::string, Ptr> >::iterator iter = mScripts.begin(); iter!=mScripts.end(); ++iter)
-                if (iter->second==ptr)
+            for (std::list<std::pair<std::string, Ptr>>::iterator iter = mScripts.begin(); iter != mScripts.end();
+                 ++iter)
+                if (iter->second == ptr)
                 {
                     Log(Debug::Warning) << "Error: tried to add local script twice for " << ptr.getCellRef().getRefId();
                     remove(ptr);
                     break;
                 }
 
-            mScripts.emplace_back (scriptName, ptr);
+            mScripts.emplace_back(scriptName, ptr);
         }
         catch (const std::exception& exception)
         {
-            Log(Debug::Error)
-                << "failed to add local script " << scriptName
-                << " because an exception has been thrown: " << exception.what();
+            Log(Debug::Error) << "failed to add local script " << scriptName
+                              << " because an exception has been thrown: " << exception.what();
         }
     }
     else
-        Log(Debug::Warning)
-            << "failed to add local script " << scriptName
-            << " because the script does not exist.";
+        Log(Debug::Warning) << "failed to add local script " << scriptName << " because the script does not exist.";
 }
 
-void MWWorld::LocalScripts::addCell (CellStore *cell)
+void MWWorld::LocalScripts::addCell(CellStore* cell)
 {
     AddScriptsVisitor addScriptsVisitor(*this);
     cell->forEach(addScriptsVisitor);
@@ -136,48 +135,46 @@ void MWWorld::LocalScripts::clear()
     mScripts.clear();
 }
 
-void MWWorld::LocalScripts::clearCell (CellStore *cell)
+void MWWorld::LocalScripts::clearCell(CellStore* cell)
 {
-    std::list<std::pair<std::string, Ptr> >::iterator iter = mScripts.begin();
+    std::list<std::pair<std::string, Ptr>>::iterator iter = mScripts.begin();
 
-    while (iter!=mScripts.end())
+    while (iter != mScripts.end())
     {
-        if (iter->second.mCell==cell)
+        if (iter->second.mCell == cell)
         {
-            if (iter==mIter)
-               ++mIter;
+            if (iter == mIter)
+                ++mIter;
 
-            mScripts.erase (iter++);
+            mScripts.erase(iter++);
         }
         else
             ++iter;
     }
 }
 
-void MWWorld::LocalScripts::remove (RefData *ref)
+void MWWorld::LocalScripts::remove(RefData* ref)
 {
-    for (std::list<std::pair<std::string, Ptr> >::iterator iter = mScripts.begin();
-        iter!=mScripts.end(); ++iter)
+    for (std::list<std::pair<std::string, Ptr>>::iterator iter = mScripts.begin(); iter != mScripts.end(); ++iter)
         if (&(iter->second.getRefData()) == ref)
         {
-            if (iter==mIter)
+            if (iter == mIter)
                 ++mIter;
 
-            mScripts.erase (iter);
+            mScripts.erase(iter);
             break;
         }
 }
 
-void MWWorld::LocalScripts::remove (const Ptr& ptr)
+void MWWorld::LocalScripts::remove(const Ptr& ptr)
 {
-    for (std::list<std::pair<std::string, Ptr> >::iterator iter = mScripts.begin();
-        iter!=mScripts.end(); ++iter)
-        if (iter->second==ptr)
+    for (std::list<std::pair<std::string, Ptr>>::iterator iter = mScripts.begin(); iter != mScripts.end(); ++iter)
+        if (iter->second == ptr)
         {
-            if (iter==mIter)
+            if (iter == mIter)
                 ++mIter;
 
-            mScripts.erase (iter);
+            mScripts.erase(iter);
             break;
         }
 }
diff --git a/apps/openmw/mwworld/localscripts.hpp b/apps/openmw/mwworld/localscripts.hpp
index cc4b5376e6..0266d921f6 100644
--- a/apps/openmw/mwworld/localscripts.hpp
+++ b/apps/openmw/mwworld/localscripts.hpp
@@ -15,37 +15,36 @@ namespace MWWorld
     /// \brief List of active local scripts
     class LocalScripts
     {
-            std::list<std::pair<std::string, Ptr> > mScripts;
-            std::list<std::pair<std::string, Ptr> >::iterator mIter;
-            const MWWorld::ESMStore& mStore;
+        std::list<std::pair<std::string, Ptr>> mScripts;
+        std::list<std::pair<std::string, Ptr>>::iterator mIter;
+        const MWWorld::ESMStore& mStore;
 
-        public:
+    public:
+        LocalScripts(const MWWorld::ESMStore& store);
 
-            LocalScripts (const MWWorld::ESMStore& store);
+        void startIteration();
+        ///< Set the iterator to the begin of the script list.
 
-            void startIteration();
-            ///< Set the iterator to the begin of the script list.
+        bool getNext(std::pair<std::string, Ptr>& script);
+        ///< Get next local script
+        /// @return Did we get a script?
 
-            bool getNext(std::pair<std::string, Ptr>& script);
-            ///< Get next local script
-            /// @return Did we get a script?
+        void add(std::string_view scriptName, const Ptr& ptr);
+        ///< Add script to collection of active local scripts.
 
-            void add(std::string_view scriptName, const Ptr& ptr);
-            ///< Add script to collection of active local scripts.
+        void addCell(CellStore* cell);
+        ///< Add all local scripts in a cell.
 
-            void addCell (CellStore *cell);
-            ///< Add all local scripts in a cell.
+        void clear();
+        ///< Clear active local scripts collection.
 
-            void clear();
-            ///< Clear active local scripts collection.
+        void clearCell(CellStore* cell);
+        ///< Remove all scripts belonging to \a cell.
 
-            void clearCell (CellStore *cell);
-            ///< Remove all scripts belonging to \a cell.
-            
-            void remove (RefData *ref);
+        void remove(RefData* ref);
 
-            void remove (const Ptr& ptr);
-            ///< Remove script for given reference (ignored if reference does not have a script listed).
+        void remove(const Ptr& ptr);
+        ///< Remove script for given reference (ignored if reference does not have a script listed).
     };
 }
 
diff --git a/apps/openmw/mwworld/magiceffects.cpp b/apps/openmw/mwworld/magiceffects.cpp
index e5e42b1a2d..b1ea8e5a0e 100644
--- a/apps/openmw/mwworld/magiceffects.cpp
+++ b/apps/openmw/mwworld/magiceffects.cpp
@@ -1,14 +1,14 @@
 #include "magiceffects.hpp"
 #include "esmstore.hpp"
 
-#include <components/esm3/npcstate.hpp>
-#include <components/esm3/loadspel.hpp>
-#include <components/esm3/loadskil.hpp>
-#include <components/esm3/loadench.hpp>
-#include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadarmo.hpp>
 #include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadskil.hpp>
+#include <components/esm3/loadspel.hpp>
 #include <components/esm3/loadweap.hpp>
+#include <components/esm3/npcstate.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -17,11 +17,11 @@
 
 namespace
 {
-    template<class T>
+    template <class T>
     void getEnchantedItem(const std::string& id, std::string& enchantment, std::string& itemName)
     {
         const T* item = MWBase::Environment::get().getWorld()->getStore().get<T>().search(id);
-        if(item)
+        if (item)
         {
             enchantment = item->mEnchant;
             itemName = item->mName;
@@ -43,7 +43,7 @@ namespace MWWorld
 
             ESM::CreatureStats::CorprusStats stats;
             stats.mNextWorsening = oldStats.mNextWorsening;
-            for (int i=0; i<ESM::Attribute::Length; ++i)
+            for (int i = 0; i < ESM::Attribute::Length; ++i)
                 stats.mWorsenings[i] = 0;
 
             for (auto& effect : spell->mEffects.mList)
@@ -54,7 +54,7 @@ namespace MWWorld
             creatureStats.mCorprusSpells[id] = stats;
         }
         // Convert to format 17
-        for(const auto& [id, oldParams] : creatureStats.mSpells.mSpellParams)
+        for (const auto& [id, oldParams] : creatureStats.mSpells.mSpellParams)
         {
             const ESM::Spell* spell = store.get<ESM::Spell>().search(id);
             if (!spell || spell->mData.mType == ESM::Spell::ST_Spell || spell->mData.mType == ESM::Spell::ST_Power)
@@ -64,16 +64,16 @@ namespace MWWorld
             params.mDisplayName = spell->mName;
             params.mItem.unset();
             params.mCasterActorId = creatureStats.mActorId;
-            if(spell->mData.mType == ESM::Spell::ST_Ability)
+            if (spell->mData.mType == ESM::Spell::ST_Ability)
                 params.mType = ESM::ActiveSpells::Type_Ability;
             else
                 params.mType = ESM::ActiveSpells::Type_Permanent;
             params.mWorsenings = -1;
             params.mNextWorsening = ESM::TimeStamp();
             int effectIndex = 0;
-            for(const auto& enam : spell->mEffects.mList)
+            for (const auto& enam : spell->mEffects.mList)
             {
-                if(oldParams.mPurgedEffects.find(effectIndex) == oldParams.mPurgedEffects.end())
+                if (oldParams.mPurgedEffects.find(effectIndex) == oldParams.mPurgedEffects.end())
                 {
                     ESM::ActiveEffect effect;
                     effect.mEffectId = enam.mEffectID;
@@ -82,14 +82,15 @@ namespace MWWorld
                     effect.mTimeLeft = -1;
                     effect.mEffectIndex = effectIndex;
                     auto rand = oldParams.mEffectRands.find(effectIndex);
-                    if(rand != oldParams.mEffectRands.end())
+                    if (rand != oldParams.mEffectRands.end())
                     {
                         float magnitude = (enam.mMagnMax - enam.mMagnMin) * rand->second + enam.mMagnMin;
                         effect.mMagnitude = magnitude;
                         effect.mMinMagnitude = magnitude;
                         effect.mMaxMagnitude = magnitude;
                         // Prevent recalculation of resistances and don't reflect or absorb the effect
-                        effect.mFlags = ESM::ActiveEffect::Flag_Ignore_Resistances | ESM::ActiveEffect::Flag_Ignore_Reflect | ESM::ActiveEffect::Flag_Ignore_SpellAbsorption;
+                        effect.mFlags = ESM::ActiveEffect::Flag_Ignore_Resistances
+                            | ESM::ActiveEffect::Flag_Ignore_Reflect | ESM::ActiveEffect::Flag_Ignore_SpellAbsorption;
                     }
                     else
                     {
@@ -105,18 +106,18 @@ namespace MWWorld
             creatureStats.mActiveSpells.mSpells.emplace_back(params);
         }
         std::multimap<std::string, int> equippedItems;
-        for(std::size_t i = 0; i < inventory.mItems.size(); ++i)
+        for (std::size_t i = 0; i < inventory.mItems.size(); ++i)
         {
             const ESM::ObjectState& item = inventory.mItems[i];
             auto slot = inventory.mEquipmentSlots.find(i);
-            if(slot != inventory.mEquipmentSlots.end())
+            if (slot != inventory.mEquipmentSlots.end())
                 equippedItems.emplace(item.mRef.mRefID, slot->second);
         }
-        for(const auto& [id, oldMagnitudes] : inventory.mPermanentMagicEffectMagnitudes)
+        for (const auto& [id, oldMagnitudes] : inventory.mPermanentMagicEffectMagnitudes)
         {
             std::string eId;
             std::string name;
-            switch(store.find(id))
+            switch (store.find(id))
             {
                 case ESM::REC_ARMO:
                     getEnchantedItem<ESM::Armor>(id, eId, name);
@@ -128,10 +129,10 @@ namespace MWWorld
                     getEnchantedItem<ESM::Weapon>(id, eId, name);
                     break;
             }
-            if(eId.empty())
+            if (eId.empty())
                 continue;
             const ESM::Enchantment* enchantment = store.get<ESM::Enchantment>().search(eId);
-            if(!enchantment)
+            if (!enchantment)
                 continue;
             ESM::ActiveSpells::ActiveSpellParams params;
             params.mId = id;
@@ -140,13 +141,14 @@ namespace MWWorld
             params.mType = ESM::ActiveSpells::Type_Enchantment;
             params.mWorsenings = -1;
             params.mNextWorsening = ESM::TimeStamp();
-            for(std::size_t effectIndex = 0; effectIndex < oldMagnitudes.size() && effectIndex < enchantment->mEffects.mList.size(); ++effectIndex)
+            for (std::size_t effectIndex = 0;
+                 effectIndex < oldMagnitudes.size() && effectIndex < enchantment->mEffects.mList.size(); ++effectIndex)
             {
                 const auto& enam = enchantment->mEffects.mList[effectIndex];
                 auto [random, multiplier] = oldMagnitudes[effectIndex];
                 float magnitude = (enam.mMagnMax - enam.mMagnMin) * random + enam.mMagnMin;
                 magnitude *= multiplier;
-                if(magnitude <= 0)
+                if (magnitude <= 0)
                     continue;
                 ESM::ActiveEffect effect;
                 effect.mEffectId = enam.mEffectID;
@@ -158,40 +160,43 @@ namespace MWWorld
                 effect.mTimeLeft = -1;
                 effect.mEffectIndex = static_cast<int>(effectIndex);
                 // Prevent recalculation of resistances and don't reflect or absorb the effect
-                effect.mFlags = ESM::ActiveEffect::Flag_Ignore_Resistances | ESM::ActiveEffect::Flag_Ignore_Reflect | ESM::ActiveEffect::Flag_Ignore_SpellAbsorption;
+                effect.mFlags = ESM::ActiveEffect::Flag_Ignore_Resistances | ESM::ActiveEffect::Flag_Ignore_Reflect
+                    | ESM::ActiveEffect::Flag_Ignore_SpellAbsorption;
                 params.mEffects.emplace_back(effect);
             }
             auto [begin, end] = equippedItems.equal_range(id);
-            for(auto it = begin; it != end; ++it)
+            for (auto it = begin; it != end; ++it)
             {
                 params.mItem = { static_cast<unsigned int>(it->second), 0 };
                 creatureStats.mActiveSpells.mSpells.emplace_back(params);
             }
         }
-        for(const auto& spell : creatureStats.mCorprusSpells)
+        for (const auto& spell : creatureStats.mCorprusSpells)
         {
-            auto it = std::find_if(creatureStats.mActiveSpells.mSpells.begin(), creatureStats.mActiveSpells.mSpells.end(), [&] (const auto& params) { return params.mId == spell.first; });
-            if(it != creatureStats.mActiveSpells.mSpells.end())
+            auto it
+                = std::find_if(creatureStats.mActiveSpells.mSpells.begin(), creatureStats.mActiveSpells.mSpells.end(),
+                    [&](const auto& params) { return params.mId == spell.first; });
+            if (it != creatureStats.mActiveSpells.mSpells.end())
             {
                 it->mNextWorsening = spell.second.mNextWorsening;
                 int worsenings = 0;
-                for(int i = 0; i < ESM::Attribute::Length; ++i)
+                for (int i = 0; i < ESM::Attribute::Length; ++i)
                     worsenings = std::max(spell.second.mWorsenings[i], worsenings);
                 it->mWorsenings = worsenings;
             }
         }
-        for(const auto& [key, actorId] : creatureStats.mSummonedCreatureMap)
+        for (const auto& [key, actorId] : creatureStats.mSummonedCreatureMap)
         {
-            if(actorId == -1)
+            if (actorId == -1)
                 continue;
-            for(auto& params : creatureStats.mActiveSpells.mSpells)
+            for (auto& params : creatureStats.mActiveSpells.mSpells)
             {
-                if(params.mId == key.mSourceId)
+                if (params.mId == key.mSourceId)
                 {
                     bool found = false;
-                    for(auto& effect : params.mEffects)
+                    for (auto& effect : params.mEffects)
                     {
-                        if(effect.mEffectId == key.mEffectId && effect.mEffectIndex == key.mEffectIndex)
+                        if (effect.mEffectId == key.mEffectId && effect.mEffectIndex == key.mEffectIndex)
                         {
                             effect.mArg = actorId;
                             effect.mFlags |= ESM::ActiveEffect::Flag_Applied | ESM::ActiveEffect::Flag_Remove;
@@ -199,35 +204,36 @@ namespace MWWorld
                             break;
                         }
                     }
-                    if(found)
+                    if (found)
                         break;
                 }
             }
         }
         // Reset modifiers that were previously recalculated each frame
-        for(std::size_t i = 0; i < ESM::Attribute::Length; ++i)
+        for (std::size_t i = 0; i < ESM::Attribute::Length; ++i)
             creatureStats.mAttributes[i].mMod = 0.f;
-        for(std::size_t i = 0; i < 3; ++i)
+        for (std::size_t i = 0; i < 3; ++i)
         {
             auto& dynamic = creatureStats.mDynamic[i];
             dynamic.mCurrent -= dynamic.mMod - dynamic.mBase;
             dynamic.mMod = 0.f;
         }
-        for(std::size_t i = 0; i < 4; ++i)
+        for (std::size_t i = 0; i < 4; ++i)
             creatureStats.mAiSettings[i].mMod = 0.f;
-        if(npcStats)
+        if (npcStats)
         {
-            for(std::size_t i = 0; i < ESM::Skill::Length; ++i)
+            for (std::size_t i = 0; i < ESM::Skill::Length; ++i)
                 npcStats->mSkills[i].mMod = 0.f;
         }
     }
 
-    // Versions 17-19 wrote different modifiers to the savegame depending on whether the save had upgraded from a pre-17 version or not
+    // Versions 17-19 wrote different modifiers to the savegame depending on whether the save had upgraded from a pre-17
+    // version or not
     void convertStats(ESM::CreatureStats& creatureStats)
     {
-        for(std::size_t i = 0; i < 3; ++i)
+        for (std::size_t i = 0; i < 3; ++i)
             creatureStats.mDynamic[i].mMod = 0.f;
-        for(std::size_t i = 0; i < 4; ++i)
+        for (std::size_t i = 0; i < 4; ++i)
             creatureStats.mAiSettings[i].mMod = 0.f;
     }
 }
diff --git a/apps/openmw/mwworld/magiceffects.hpp b/apps/openmw/mwworld/magiceffects.hpp
index fdcc578e53..aefcd056e0 100644
--- a/apps/openmw/mwworld/magiceffects.hpp
+++ b/apps/openmw/mwworld/magiceffects.hpp
@@ -10,8 +10,8 @@ namespace ESM
 
 namespace MWWorld
 {
-    void convertMagicEffects(ESM::CreatureStats& creatureStats, ESM::InventoryState& inventory,
-        ESM::NpcStats* npcStats = nullptr);
+    void convertMagicEffects(
+        ESM::CreatureStats& creatureStats, ESM::InventoryState& inventory, ESM::NpcStats* npcStats = nullptr);
 
     void convertStats(ESM::CreatureStats& creatureStats);
 }
diff --git a/apps/openmw/mwworld/manualref.cpp b/apps/openmw/mwworld/manualref.cpp
index 5c822483c5..89c8c91051 100644
--- a/apps/openmw/mwworld/manualref.cpp
+++ b/apps/openmw/mwworld/manualref.cpp
@@ -6,7 +6,7 @@
 namespace
 {
 
-    template<typename T>
+    template <typename T>
     void create(const MWWorld::Store<T>& list, const std::string& name, std::any& refValue, MWWorld::Ptr& ptrValue)
     {
         const T* base = list.find(name);
@@ -27,33 +27,75 @@ MWWorld::ManualRef::ManualRef(const MWWorld::ESMStore& store, std::string_view n
     std::string lowerName = Misc::StringUtils::lowerCase(name);
     switch (store.find(lowerName))
     {
-    case ESM::REC_ACTI: create(store.get<ESM::Activator>(), lowerName, mRef, mPtr); break;
-    case ESM::REC_ALCH: create(store.get<ESM::Potion>(), lowerName, mRef, mPtr); break;
-    case ESM::REC_APPA: create(store.get<ESM::Apparatus>(), lowerName, mRef, mPtr); break;
-    case ESM::REC_ARMO: create(store.get<ESM::Armor>(), lowerName, mRef, mPtr); break;
-    case ESM::REC_BOOK: create(store.get<ESM::Book>(), lowerName, mRef, mPtr); break;
-    case ESM::REC_CLOT: create(store.get<ESM::Clothing>(), lowerName, mRef, mPtr); break;
-    case ESM::REC_CONT: create(store.get<ESM::Container>(), lowerName, mRef, mPtr); break;
-    case ESM::REC_CREA: create(store.get<ESM::Creature>(), lowerName, mRef, mPtr); break;
-    case ESM::REC_DOOR: create(store.get<ESM::Door>(), lowerName, mRef, mPtr); break;
-    case ESM::REC_INGR: create(store.get<ESM::Ingredient>(), lowerName, mRef, mPtr); break;
-    case ESM::REC_LEVC: create(store.get<ESM::CreatureLevList>(), lowerName, mRef, mPtr); break;
-    case ESM::REC_LEVI: create(store.get<ESM::ItemLevList>(), lowerName, mRef, mPtr); break;
-    case ESM::REC_LIGH: create(store.get<ESM::Light>(), lowerName, mRef, mPtr); break;
-    case ESM::REC_LOCK: create(store.get<ESM::Lockpick>(), lowerName, mRef, mPtr); break;
-    case ESM::REC_MISC: create(store.get<ESM::Miscellaneous>(), lowerName, mRef, mPtr); break;
-    case ESM::REC_NPC_: create(store.get<ESM::NPC>(), lowerName, mRef, mPtr); break;
-    case ESM::REC_PROB: create(store.get<ESM::Probe>(), lowerName, mRef, mPtr); break;
-    case ESM::REC_REPA: create(store.get<ESM::Repair>(), lowerName, mRef, mPtr); break;
-    case ESM::REC_STAT: create(store.get<ESM::Static>(), lowerName, mRef, mPtr); break;
-    case ESM::REC_WEAP: create(store.get<ESM::Weapon>(), lowerName, mRef, mPtr); break;
-    case ESM::REC_BODY: create(store.get<ESM::BodyPart>(), lowerName, mRef, mPtr); break;
-
-    case 0:
-        throw std::logic_error("failed to create manual cell ref for " + lowerName + " (unknown ID)");
-
-    default:
-        throw std::logic_error("failed to create manual cell ref for " + lowerName + " (unknown type)");
+        case ESM::REC_ACTI:
+            create(store.get<ESM::Activator>(), lowerName, mRef, mPtr);
+            break;
+        case ESM::REC_ALCH:
+            create(store.get<ESM::Potion>(), lowerName, mRef, mPtr);
+            break;
+        case ESM::REC_APPA:
+            create(store.get<ESM::Apparatus>(), lowerName, mRef, mPtr);
+            break;
+        case ESM::REC_ARMO:
+            create(store.get<ESM::Armor>(), lowerName, mRef, mPtr);
+            break;
+        case ESM::REC_BOOK:
+            create(store.get<ESM::Book>(), lowerName, mRef, mPtr);
+            break;
+        case ESM::REC_CLOT:
+            create(store.get<ESM::Clothing>(), lowerName, mRef, mPtr);
+            break;
+        case ESM::REC_CONT:
+            create(store.get<ESM::Container>(), lowerName, mRef, mPtr);
+            break;
+        case ESM::REC_CREA:
+            create(store.get<ESM::Creature>(), lowerName, mRef, mPtr);
+            break;
+        case ESM::REC_DOOR:
+            create(store.get<ESM::Door>(), lowerName, mRef, mPtr);
+            break;
+        case ESM::REC_INGR:
+            create(store.get<ESM::Ingredient>(), lowerName, mRef, mPtr);
+            break;
+        case ESM::REC_LEVC:
+            create(store.get<ESM::CreatureLevList>(), lowerName, mRef, mPtr);
+            break;
+        case ESM::REC_LEVI:
+            create(store.get<ESM::ItemLevList>(), lowerName, mRef, mPtr);
+            break;
+        case ESM::REC_LIGH:
+            create(store.get<ESM::Light>(), lowerName, mRef, mPtr);
+            break;
+        case ESM::REC_LOCK:
+            create(store.get<ESM::Lockpick>(), lowerName, mRef, mPtr);
+            break;
+        case ESM::REC_MISC:
+            create(store.get<ESM::Miscellaneous>(), lowerName, mRef, mPtr);
+            break;
+        case ESM::REC_NPC_:
+            create(store.get<ESM::NPC>(), lowerName, mRef, mPtr);
+            break;
+        case ESM::REC_PROB:
+            create(store.get<ESM::Probe>(), lowerName, mRef, mPtr);
+            break;
+        case ESM::REC_REPA:
+            create(store.get<ESM::Repair>(), lowerName, mRef, mPtr);
+            break;
+        case ESM::REC_STAT:
+            create(store.get<ESM::Static>(), lowerName, mRef, mPtr);
+            break;
+        case ESM::REC_WEAP:
+            create(store.get<ESM::Weapon>(), lowerName, mRef, mPtr);
+            break;
+        case ESM::REC_BODY:
+            create(store.get<ESM::BodyPart>(), lowerName, mRef, mPtr);
+            break;
+
+        case 0:
+            throw std::logic_error("failed to create manual cell ref for " + lowerName + " (unknown ID)");
+
+        default:
+            throw std::logic_error("failed to create manual cell ref for " + lowerName + " (unknown type)");
     }
 
     mPtr.getRefData().setCount(count);
diff --git a/apps/openmw/mwworld/manualref.hpp b/apps/openmw/mwworld/manualref.hpp
index 593df9f24f..7f056bb681 100644
--- a/apps/openmw/mwworld/manualref.hpp
+++ b/apps/openmw/mwworld/manualref.hpp
@@ -10,19 +10,16 @@ namespace MWWorld
     /// \brief Manually constructed live cell ref
     class ManualRef
     {
-            std::any mRef;
-            Ptr mPtr;
+        std::any mRef;
+        Ptr mPtr;
 
-            ManualRef (const ManualRef&);
-            ManualRef& operator= (const ManualRef&);
+        ManualRef(const ManualRef&);
+        ManualRef& operator=(const ManualRef&);
 
-        public:
-            ManualRef(const MWWorld::ESMStore& store, std::string_view name, const int count = 1);
+    public:
+        ManualRef(const MWWorld::ESMStore& store, std::string_view name, const int count = 1);
 
-            const Ptr& getPtr() const
-            {
-                return mPtr;
-            }
+        const Ptr& getPtr() const { return mPtr; }
     };
 }
 
diff --git a/apps/openmw/mwworld/nullaction.hpp b/apps/openmw/mwworld/nullaction.hpp
index 4ee1115e50..2499655eff 100644
--- a/apps/openmw/mwworld/nullaction.hpp
+++ b/apps/openmw/mwworld/nullaction.hpp
@@ -8,9 +8,9 @@ namespace MWWorld
     /// \brief Action: do nothing
     class NullAction : public Action
     {
-            void executeImp (const Ptr& actor) override {}
+        void executeImp(const Ptr& actor) override {}
 
-            bool isNullAction() override { return true; }
+        bool isNullAction() override { return true; }
     };
 }
 
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index 45ae53712b..200f97e543 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -4,29 +4,29 @@
 
 #include <components/debug/debuglog.hpp>
 
+#include <components/esm/defs.hpp>
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/esmwriter.hpp>
-#include <components/esm3/player.hpp>
-#include <components/esm/defs.hpp>
 #include <components/esm3/loadbsgn.hpp>
-#include <components/fallback/fallback.hpp>
 #include <components/esm3/loadmgef.hpp>
+#include <components/esm3/player.hpp>
+#include <components/fallback/fallback.hpp>
 
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/magiceffects.hpp"
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwmechanics/movement.hpp"
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/spellutil.hpp"
 
-#include "../mwrender/renderingmanager.hpp"
 #include "../mwrender/camera.hpp"
+#include "../mwrender/renderingmanager.hpp"
 
 #include "cellstore.hpp"
 #include "class.hpp"
@@ -34,17 +34,17 @@
 
 namespace MWWorld
 {
-    Player::Player (const ESM::NPC *player)
-      : mCellStore(nullptr),
-        mLastKnownExteriorPosition(0,0,0),
-        mMarkedPosition(ESM::Position()),
-        mMarkedCell(nullptr),
-        mAutoMove(false),
-        mForwardBackward(0),
-        mTeleported(false),
-        mCurrentCrimeId(-1),
-        mPaidCrimeId(-1),
-        mJumping(false)
+    Player::Player(const ESM::NPC* player)
+        : mCellStore(nullptr)
+        , mLastKnownExteriorPosition(0, 0, 0)
+        , mMarkedPosition(ESM::Position())
+        , mMarkedCell(nullptr)
+        , mAutoMove(false)
+        , mForwardBackward(0)
+        , mTeleported(false)
+        , mCurrentCrimeId(-1)
+        , mPaidCrimeId(-1)
+        , mJumping(false)
     {
         ESM::CellRef cellRef;
         cellRef.blank();
@@ -60,26 +60,27 @@ namespace MWWorld
     {
         MWMechanics::NpcStats& stats = getPlayer().getClass().getNpcStats(getPlayer());
 
-        for (int i=0; i<ESM::Skill::Length; ++i)
+        for (int i = 0; i < ESM::Skill::Length; ++i)
             mSaveSkills[i] = stats.getSkill(i).getModified();
-        for (int i=0; i<ESM::Attribute::Length; ++i)
+        for (int i = 0; i < ESM::Attribute::Length; ++i)
             mSaveAttributes[i] = stats.getAttribute(i).getModified();
     }
 
     void Player::restoreStats()
     {
-        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
         MWMechanics::CreatureStats& creatureStats = getPlayer().getClass().getCreatureStats(getPlayer());
         MWMechanics::NpcStats& npcStats = getPlayer().getClass().getNpcStats(getPlayer());
         MWMechanics::DynamicStat<float> health = creatureStats.getDynamic(0);
         creatureStats.setHealth(health.getBase() / gmst.find("fWereWolfHealth")->mValue.getFloat());
-        for (int i=0; i<ESM::Skill::Length; ++i)
+        for (int i = 0; i < ESM::Skill::Length; ++i)
         {
             auto& skill = npcStats.getSkill(i);
             skill.restore(skill.getDamage());
             skill.setModifier(mSaveSkills[i] - skill.getBase());
         }
-        for (int i=0; i<ESM::Attribute::Length; ++i)
+        for (int i = 0; i < ESM::Attribute::Length; ++i)
         {
             auto attribute = npcStats.getAttribute(i);
             attribute.restore(attribute.getDamage());
@@ -90,60 +91,62 @@ namespace MWWorld
 
     void Player::setWerewolfStats()
     {
-        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
         MWMechanics::CreatureStats& creatureStats = getPlayer().getClass().getCreatureStats(getPlayer());
         MWMechanics::NpcStats& npcStats = getPlayer().getClass().getNpcStats(getPlayer());
         MWMechanics::DynamicStat<float> health = creatureStats.getDynamic(0);
         creatureStats.setHealth(health.getBase() * gmst.find("fWereWolfHealth")->mValue.getFloat());
-        for(size_t i = 0;i < ESM::Attribute::Length;++i)
+        for (size_t i = 0; i < ESM::Attribute::Length; ++i)
         {
             // Oh, Bethesda. It's "Intelligence".
-            std::string name = "fWerewolf"+((i==ESM::Attribute::Intelligence) ? std::string("Intellegence") :
-                                            ESM::Attribute::sAttributeNames[i]);
+            std::string name = "fWerewolf"
+                + ((i == ESM::Attribute::Intelligence) ? std::string("Intellegence")
+                                                       : ESM::Attribute::sAttributeNames[i]);
 
             MWMechanics::AttributeValue value = npcStats.getAttribute(i);
             value.setModifier(gmst.find(name)->mValue.getFloat() - value.getModified());
             npcStats.setAttribute(i, value);
         }
 
-        for(size_t i = 0;i < ESM::Skill::Length;i++)
+        for (size_t i = 0; i < ESM::Skill::Length; i++)
         {
             // Acrobatics is set separately for some reason.
-            if(i == ESM::Skill::Acrobatics)
+            if (i == ESM::Skill::Acrobatics)
                 continue;
 
             // "Mercantile"! >_<
-            std::string name = "fWerewolf"+((i==ESM::Skill::Mercantile) ? std::string("Merchantile") :
-                                            ESM::Skill::sSkillNames[i]);
+            std::string name = "fWerewolf"
+                + ((i == ESM::Skill::Mercantile) ? std::string("Merchantile") : ESM::Skill::sSkillNames[i]);
 
             MWMechanics::SkillValue& value = npcStats.getSkill(i);
             value.setModifier(gmst.find(name)->mValue.getFloat() - value.getModified());
         }
     }
 
-    void Player::set(const ESM::NPC *player)
+    void Player::set(const ESM::NPC* player)
     {
         mPlayer.mBase = player;
     }
 
-    void Player::setCell (MWWorld::CellStore *cellStore)
+    void Player::setCell(MWWorld::CellStore* cellStore)
     {
         mCellStore = cellStore;
     }
 
     MWWorld::Ptr Player::getPlayer()
     {
-        MWWorld::Ptr ptr (&mPlayer, mCellStore);
+        MWWorld::Ptr ptr(&mPlayer, mCellStore);
         return ptr;
     }
 
     MWWorld::ConstPtr Player::getConstPlayer() const
     {
-        MWWorld::ConstPtr ptr (&mPlayer, mCellStore);
+        MWWorld::ConstPtr ptr(&mPlayer, mCellStore);
         return ptr;
     }
 
-    void Player::setBirthSign (const std::string &sign)
+    void Player::setBirthSign(const std::string& sign)
     {
         mSign = sign;
     }
@@ -153,10 +156,10 @@ namespace MWWorld
         return mSign;
     }
 
-    void Player::setDrawState (MWMechanics::DrawState state)
+    void Player::setDrawState(MWMechanics::DrawState state)
     {
-         MWWorld::Ptr ptr = getPlayer();
-         ptr.getClass().getNpcStats(ptr).setDrawState (state);
+        MWWorld::Ptr ptr = getPlayer();
+        ptr.getClass().getNpcStats(ptr).setDrawState(state);
     }
 
     bool Player::getAutoMove() const
@@ -164,7 +167,7 @@ namespace MWWorld
         return mAutoMove;
     }
 
-    void Player::setAutoMove (bool enable)
+    void Player::setAutoMove(bool enable)
     {
         MWWorld::Ptr ptr = getPlayer();
 
@@ -178,13 +181,13 @@ namespace MWWorld
         ptr.getClass().getMovementSettings(ptr).mPosition[1] = value;
     }
 
-    void Player::setLeftRight (float value)
+    void Player::setLeftRight(float value)
     {
         MWWorld::Ptr ptr = getPlayer();
         ptr.getClass().getMovementSettings(ptr).mPosition[0] = value;
     }
 
-    void Player::setForwardBackward (float value)
+    void Player::setForwardBackward(float value)
     {
         MWWorld::Ptr ptr = getPlayer();
 
@@ -232,8 +235,8 @@ namespace MWWorld
 
     MWMechanics::DrawState Player::getDrawState()
     {
-         MWWorld::Ptr ptr = getPlayer();
-         return ptr.getClass().getNpcStats(ptr).getDrawState();
+        MWWorld::Ptr ptr = getPlayer();
+        return ptr.getClass().getNpcStats(ptr).getDrawState();
     }
 
     void Player::activate()
@@ -242,7 +245,7 @@ namespace MWWorld
             return;
 
         MWWorld::Ptr player = getPlayer();
-        const MWMechanics::NpcStats &playerStats = player.getClass().getNpcStats(player);
+        const MWMechanics::NpcStats& playerStats = player.getClass().getNpcStats(player);
         bool godmode = MWBase::Environment::get().getWorld()->getGodModeState();
         if ((!godmode && playerStats.isParalyzed()) || playerStats.getKnockedDown() || playerStats.isDead())
             return;
@@ -283,7 +286,8 @@ namespace MWWorld
         return mJumping;
     }
 
-    bool Player::isInCombat() {
+    bool Player::isInCombat()
+    {
         return MWBase::Environment::get().getMechanicsManager()->getActorsFighting(getPlayer()).size() != 0;
     }
 
@@ -292,13 +296,13 @@ namespace MWWorld
         return MWBase::Environment::get().getMechanicsManager()->getEnemiesNearby(getPlayer()).size() != 0;
     }
 
-    void Player::markPosition(CellStore *markedCell, const ESM::Position& markedPosition)
+    void Player::markPosition(CellStore* markedCell, const ESM::Position& markedPosition)
     {
         mMarkedCell = markedCell;
         mMarkedPosition = markedPosition;
     }
 
-    void Player::getMarkedPosition(CellStore*& markedCell, ESM::Position &markedPosition) const
+    void Player::getMarkedPosition(CellStore*& markedCell, ESM::Position& markedPosition) const
     {
         markedCell = mMarkedCell;
         if (mMarkedCell)
@@ -317,14 +321,14 @@ namespace MWWorld
         mCurrentCrimeId = -1;
         mPaidCrimeId = -1;
         mPreviousItems.clear();
-        mLastKnownExteriorPosition = osg::Vec3f(0,0,0);
+        mLastKnownExteriorPosition = osg::Vec3f(0, 0, 0);
 
-        for (int i=0; i<ESM::Skill::Length; ++i)
+        for (int i = 0; i < ESM::Skill::Length; ++i)
         {
             mSaveSkills[i] = 0.f;
         }
 
-        for (int i=0; i<ESM::Attribute::Length; ++i)
+        for (int i = 0; i < ESM::Attribute::Length; ++i)
         {
             mSaveAttributes[i] = 0.f;
         }
@@ -337,11 +341,11 @@ namespace MWWorld
         mMarkedPosition.rot[2] = 0;
     }
 
-    void Player::write (ESM::ESMWriter& writer, Loading::Listener& progress) const
+    void Player::write(ESM::ESMWriter& writer, Loading::Listener& progress) const
     {
         ESM::Player player;
 
-        mPlayer.save (player.mObject);
+        mPlayer.save(player.mObject);
         player.mCellId = mCellStore->getCell()->getCellId();
 
         player.mCurrentCrimeId = mCurrentCrimeId;
@@ -362,33 +366,34 @@ namespace MWWorld
         else
             player.mHasMark = false;
 
-        for (int i=0; i<ESM::Attribute::Length; ++i)
+        for (int i = 0; i < ESM::Attribute::Length; ++i)
             player.mSaveAttributes[i] = mSaveAttributes[i];
-        for (int i=0; i<ESM::Skill::Length; ++i)
+        for (int i = 0; i < ESM::Skill::Length; ++i)
             player.mSaveSkills[i] = mSaveSkills[i];
 
         player.mPreviousItems = mPreviousItems;
 
-        writer.startRecord (ESM::REC_PLAY);
-        player.save (writer);
-        writer.endRecord (ESM::REC_PLAY);
+        writer.startRecord(ESM::REC_PLAY);
+        player.save(writer);
+        writer.endRecord(ESM::REC_PLAY);
     }
 
-    bool Player::readRecord (ESM::ESMReader& reader, uint32_t type)
+    bool Player::readRecord(ESM::ESMReader& reader, uint32_t type)
     {
-        if (type==ESM::REC_PLAY)
+        if (type == ESM::REC_PLAY)
         {
             ESM::Player player;
-            player.load (reader);
+            player.load(reader);
 
-            if (!mPlayer.checkState (player.mObject))
+            if (!mPlayer.checkState(player.mObject))
             {
                 // this is the one object we can not silently drop.
-                throw std::runtime_error ("invalid player state record (object state)");
+                throw std::runtime_error("invalid player state record (object state)");
             }
             if (reader.getFormat() < 17)
-                convertMagicEffects(player.mObject.mCreatureStats, player.mObject.mInventory, &player.mObject.mNpcStats);
-            else if(reader.getFormat() < 20)
+                convertMagicEffects(
+                    player.mObject.mCreatureStats, player.mObject.mInventory, &player.mObject.mNpcStats);
+            else if (reader.getFormat() < 20)
                 convertStats(player.mObject.mCreatureStats);
 
             if (!player.mObject.mEnabled)
@@ -397,11 +402,11 @@ namespace MWWorld
                 player.mObject.mEnabled = true;
             }
 
-            mPlayer.load (player.mObject);
+            mPlayer.load(player.mObject);
 
-            for (int i=0; i<ESM::Attribute::Length; ++i)
+            for (int i = 0; i < ESM::Attribute::Length; ++i)
                 mSaveAttributes[i] = player.mSaveAttributes[i];
-            for (int i=0; i<ESM::Skill::Length; ++i)
+            for (int i = 0; i < ESM::Skill::Length; ++i)
                 mSaveSkills[i] = player.mSaveSkills[i];
 
             if (player.mObject.mNpcStats.mIsWerewolf)
@@ -425,7 +430,7 @@ namespace MWWorld
 
             try
             {
-                mCellStore = world.getCell (player.mCellId);
+                mCellStore = world.getCell(player.mCellId);
             }
             catch (...)
             {
@@ -436,9 +441,9 @@ namespace MWWorld
 
             if (!player.mBirthsign.empty())
             {
-                const ESM::BirthSign* sign = world.getStore().get<ESM::BirthSign>().search (player.mBirthsign);
+                const ESM::BirthSign* sign = world.getStore().get<ESM::BirthSign>().search(player.mBirthsign);
                 if (!sign)
-                    throw std::runtime_error ("invalid player state record (birthsign does not exist)");
+                    throw std::runtime_error("invalid player state record (birthsign does not exist)");
             }
 
             mCurrentCrimeId = player.mCurrentCrimeId;
@@ -455,14 +460,14 @@ namespace MWWorld
                 // interior cell -> need to check if it exists (exterior cell will be
                 // generated on the fly)
 
-                if (!world.getStore().get<ESM::Cell>().search (player.mMarkedCell.mWorldspace))
+                if (!world.getStore().get<ESM::Cell>().search(player.mMarkedCell.mWorldspace))
                     player.mHasMark = false; // drop mark silently
             }
 
             if (player.mHasMark)
             {
                 mMarkedPosition = player.mMarkedPosition;
-                mMarkedCell = world.getCell (player.mMarkedCell);
+                mMarkedCell = world.getCell(player.mMarkedCell);
             }
             else
             {
@@ -555,7 +560,8 @@ namespace MWWorld
         bool swimming = world->isSwimming(player);
         bool flying = world->isFlying(player);
 
-        static const float i1stPersonSneakDelta = store.get<ESM::GameSetting>().find("i1stPersonSneakDelta")->mValue.getFloat();
+        static const float i1stPersonSneakDelta
+            = store.get<ESM::GameSetting>().find("i1stPersonSneakDelta")->mValue.getFloat();
         if (sneaking && !swimming && !flying)
             rendering->getCamera()->setSneakOffset(i1stPersonSneakDelta);
         else
diff --git a/apps/openmw/mwworld/player.hpp b/apps/openmw/mwworld/player.hpp
index 6efdc2e00b..ea8c53bc19 100644
--- a/apps/openmw/mwworld/player.hpp
+++ b/apps/openmw/mwworld/player.hpp
@@ -7,9 +7,9 @@
 
 #include "../mwmechanics/drawstate.hpp"
 
-#include <components/esm3/loadskil.hpp>
 #include <components/esm/attr.hpp>
 #include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadskil.hpp>
 
 namespace ESM
 {
@@ -30,22 +30,22 @@ namespace MWWorld
     /// \brief NPC object representing the player and additional player data
     class Player
     {
-        LiveCellRef<ESM::NPC>   mPlayer;
-        MWWorld::CellStore      *mCellStore;
-        std::string             mSign;
+        LiveCellRef<ESM::NPC> mPlayer;
+        MWWorld::CellStore* mCellStore;
+        std::string mSign;
 
         osg::Vec3f mLastKnownExteriorPosition;
 
-        ESM::Position           mMarkedPosition;
+        ESM::Position mMarkedPosition;
         // If no position was marked, this is nullptr
-        CellStore*              mMarkedCell;
+        CellStore* mMarkedCell;
 
-        bool                    mAutoMove;
-        float                   mForwardBackward;
-        bool                    mTeleported;
+        bool mAutoMove;
+        float mForwardBackward;
+        bool mTeleported;
 
-        int                     mCurrentCrimeId;    // the id assigned witnesses
-        int                     mPaidCrimeId;      // the last id paid off (0 bounty)
+        int mCurrentCrimeId; // the id assigned witnesses
+        int mPaidCrimeId; // the last id paid off (0 bounty)
 
         typedef std::map<std::string, std::string> PreviousItems; // previous equipped items, needed for bound spells
         PreviousItems mPreviousItems;
@@ -57,45 +57,44 @@ namespace MWWorld
         bool mJumping;
 
     public:
-
-        Player(const ESM::NPC *player);
+        Player(const ESM::NPC* player);
 
         void saveStats();
         void restoreStats();
         void setWerewolfStats();
 
         // For mark/recall magic effects
-        void markPosition (CellStore* markedCell, const ESM::Position& markedPosition);
-        void getMarkedPosition (CellStore*& markedCell, ESM::Position& markedPosition) const;
+        void markPosition(CellStore* markedCell, const ESM::Position& markedPosition);
+        void getMarkedPosition(CellStore*& markedCell, ESM::Position& markedPosition) const;
 
         /// Interiors can not always be mapped to a world position. However
         /// world position is still required for divine / almsivi magic effects
         /// and the player arrow on the global map.
-        void setLastKnownExteriorPosition (const osg::Vec3f& position) { mLastKnownExteriorPosition = position; }
+        void setLastKnownExteriorPosition(const osg::Vec3f& position) { mLastKnownExteriorPosition = position; }
         osg::Vec3f getLastKnownExteriorPosition() const { return mLastKnownExteriorPosition; }
 
-        void set (const ESM::NPC *player);
+        void set(const ESM::NPC* player);
 
-        void setCell (MWWorld::CellStore *cellStore);
+        void setCell(MWWorld::CellStore* cellStore);
 
         MWWorld::Ptr getPlayer();
         MWWorld::ConstPtr getConstPlayer() const;
 
-        void setBirthSign(const std::string &sign);
-        const std::string &getBirthSign() const;
+        void setBirthSign(const std::string& sign);
+        const std::string& getBirthSign() const;
 
-        void setDrawState (MWMechanics::DrawState state);
+        void setDrawState(MWMechanics::DrawState state);
         MWMechanics::DrawState getDrawState(); /// \todo constness
 
         /// Activate the object under the crosshair, if any
         void activate();
 
         bool getAutoMove() const;
-        void setAutoMove (bool enable);
+        void setAutoMove(bool enable);
 
-        void setLeftRight (float value);
+        void setLeftRight(float value);
 
-        void setForwardBackward (float value);
+        void setForwardBackward(float value);
         void setUpDown(int value);
 
         void setRunState(bool run);
@@ -113,20 +112,20 @@ namespace MWWorld
         void setJumping(bool jumping);
         bool getJumping() const;
 
-        ///Checks all nearby actors to see if anyone has an aipackage against you
+        /// Checks all nearby actors to see if anyone has an aipackage against you
         bool isInCombat();
 
         bool enemiesNearby();
 
         void clear();
 
-        void write (ESM::ESMWriter& writer, Loading::Listener& progress) const;
+        void write(ESM::ESMWriter& writer, Loading::Listener& progress) const;
 
-        bool readRecord (ESM::ESMReader& reader, uint32_t type);
+        bool readRecord(ESM::ESMReader& reader, uint32_t type);
 
-        int getNewCrimeId();  // get new id for witnesses
+        int getNewCrimeId(); // get new id for witnesses
         void recordCrimeId(); // record the paid crime id when bounty is 0
-        int getCrimeId() const;     // get the last paid crime id
+        int getCrimeId() const; // get the last paid crime id
 
         void setPreviousItem(const std::string& boundItemId, const std::string& previousItemId);
         std::string getPreviousItem(const std::string& boundItemId);
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index d11cf47ce0..1bcc8e7560 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -1,19 +1,19 @@
 #include "projectilemanager.hpp"
 
 #include <iomanip>
-#include <sstream>
 #include <memory>
 #include <optional>
+#include <sstream>
 
 #include <osg/PositionAttitudeTransform>
 
 #include <components/debug/debuglog.hpp>
 
 #include <components/esm3/esmwriter.hpp>
-#include <components/esm3/projectilestate.hpp>
-#include <components/esm3/loadrace.hpp>
-#include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadench.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/projectilestate.hpp>
 
 #include <components/misc/constants.hpp>
 #include <components/misc/convert.hpp>
@@ -23,33 +23,33 @@
 #include <components/resource/scenemanager.hpp>
 
 #include <components/sceneutil/controller.hpp>
-#include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/nodecallback.hpp>
+#include <components/sceneutil/visitor.hpp>
 
 #include <components/settings/settings.hpp>
 
-#include "../mwworld/manualref.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
+#include "../mwworld/manualref.hpp"
 
-#include "../mwbase/soundmanager.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
+#include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/aipackage.hpp"
 #include "../mwmechanics/combat.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/spellcasting.hpp"
-#include "../mwmechanics/actorutil.hpp"
-#include "../mwmechanics/aipackage.hpp"
 #include "../mwmechanics/weapontype.hpp"
 
 #include "../mwrender/animation.hpp"
-#include "../mwrender/vismask.hpp"
 #include "../mwrender/renderingmanager.hpp"
 #include "../mwrender/util.hpp"
+#include "../mwrender/vismask.hpp"
 
 #include "../mwsound/sound.hpp"
 
@@ -58,7 +58,8 @@
 
 namespace
 {
-    ESM::EffectList getMagicBoltData(std::vector<std::string>& projectileIDs, std::set<std::string>& sounds, float& speed, std::string& texture, std::string& sourceName, const std::string& id)
+    ESM::EffectList getMagicBoltData(std::vector<std::string>& projectileIDs, std::set<std::string>& sounds,
+        float& speed, std::string& texture, std::string& sourceName, const std::string& id)
     {
         const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
         const ESM::EffectList* effects;
@@ -79,11 +80,11 @@ namespace
         int count = 0;
         speed = 0.0f;
         ESM::EffectList projectileEffects;
-        for (std::vector<ESM::ENAMstruct>::const_iterator iter (effects->mList.begin());
-            iter!=effects->mList.end(); ++iter)
+        for (std::vector<ESM::ENAMstruct>::const_iterator iter(effects->mList.begin()); iter != effects->mList.end();
+             ++iter)
         {
-            const ESM::MagicEffect *magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find (
-                iter->mEffectID);
+            const ESM::MagicEffect* magicEffect
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(iter->mEffectID);
 
             // Speed of multi-effect projectiles should be the average of the constituent effects,
             // based on observation of the original engine.
@@ -98,28 +99,29 @@ namespace
             else
                 projectileIDs.push_back(magicEffect->mBolt);
 
-            static const std::string schools[] = {
-                "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
-            };
+            static const std::string schools[]
+                = { "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration" };
             if (!magicEffect->mBoltSound.empty())
                 sounds.emplace(magicEffect->mBoltSound);
             else
                 sounds.emplace(schools[magicEffect->mData.mSchool] + " bolt");
             projectileEffects.mList.push_back(*iter);
         }
-        
+
         if (count != 0)
             speed /= count;
 
         // the particle texture is only used if there is only one projectile
-        if (projectileEffects.mList.size() == 1) 
+        if (projectileEffects.mList.size() == 1)
         {
-            const ESM::MagicEffect *magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find (
-                effects->mList.begin()->mEffectID);
+            const ESM::MagicEffect* magicEffect
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(
+                    effects->mList.begin()->mEffectID);
             texture = magicEffect->mParticle;
         }
-        
-        if (projectileEffects.mList.size() > 1) // insert a VFX_Multiple projectile if there are multiple projectile effects
+
+        if (projectileEffects.mList.size()
+            > 1) // insert a VFX_Multiple projectile if there are multiple projectile effects
         {
             const std::string ID = "VFX_Multiple" + std::to_string(effects->mList.size());
             std::vector<std::string>::iterator it;
@@ -136,20 +138,18 @@ namespace
         float lightDiffuseRed = 0.0f;
         float lightDiffuseGreen = 0.0f;
         float lightDiffuseBlue = 0.0f;
-        for (std::vector<ESM::ENAMstruct>::const_iterator iter(effects.mList.begin());
-            iter != effects.mList.end(); ++iter)
+        for (std::vector<ESM::ENAMstruct>::const_iterator iter(effects.mList.begin()); iter != effects.mList.end();
+             ++iter)
         {
-            const ESM::MagicEffect *magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(
-                iter->mEffectID);
+            const ESM::MagicEffect* magicEffect
+                = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(iter->mEffectID);
             lightDiffuseRed += (static_cast<float>(magicEffect->mData.mRed) / 255.f);
             lightDiffuseGreen += (static_cast<float>(magicEffect->mData.mGreen) / 255.f);
             lightDiffuseBlue += (static_cast<float>(magicEffect->mData.mBlue) / 255.f);
         }
         int numberOfEffects = effects.mList.size();
-        lightDiffuseColor = osg::Vec4(lightDiffuseRed / numberOfEffects
-            , lightDiffuseGreen / numberOfEffects
-            , lightDiffuseBlue / numberOfEffects
-            , 1.0f);
+        lightDiffuseColor = osg::Vec4(lightDiffuseRed / numberOfEffects, lightDiffuseGreen / numberOfEffects,
+            lightDiffuseBlue / numberOfEffects, 1.0f);
 
         return lightDiffuseColor;
     }
@@ -159,21 +159,20 @@ namespace MWWorld
 {
 
     ProjectileManager::ProjectileManager(osg::Group* parent, Resource::ResourceSystem* resourceSystem,
-                                         MWRender::RenderingManager* rendering, MWPhysics::PhysicsSystem* physics)
+        MWRender::RenderingManager* rendering, MWPhysics::PhysicsSystem* physics)
         : mParent(parent)
         , mResourceSystem(resourceSystem)
         , mRendering(rendering)
         , mPhysics(physics)
         , mCleanupTimer(0.0f)
     {
-
     }
 
     /// Rotates an osg::PositionAttitudeTransform over time.
     class RotateCallback : public SceneUtil::NodeCallback<RotateCallback, osg::PositionAttitudeTransform*>
     {
     public:
-        RotateCallback(const osg::Vec3f& axis = osg::Vec3f(0,-1,0), float rotateSpeed = osg::PI*2)
+        RotateCallback(const osg::Vec3f& axis = osg::Vec3f(0, -1, 0), float rotateSpeed = osg::PI * 2)
             : mAxis(axis)
             , mRotateSpeed(rotateSpeed)
         {
@@ -194,9 +193,8 @@ namespace MWWorld
         float mRotateSpeed;
     };
 
-
-    void ProjectileManager::createModel(State &state, const std::string &model, const osg::Vec3f& pos, const osg::Quat& orient,
-                                        bool rotate, bool createLight, osg::Vec4 lightDiffuseColor, std::string texture)
+    void ProjectileManager::createModel(State& state, const std::string& model, const osg::Vec3f& pos,
+        const osg::Quat& orient, bool rotate, bool createLight, osg::Vec4 lightDiffuseColor, std::string texture)
     {
         state.mNode = new osg::PositionAttitudeTransform;
         state.mNode->setNodeMask(MWRender::Mask_Effect);
@@ -207,7 +205,7 @@ namespace MWWorld
 
         if (rotate)
         {
-            osg::ref_ptr<osg::PositionAttitudeTransform> rotateNode (new osg::PositionAttitudeTransform);
+            osg::ref_ptr<osg::PositionAttitudeTransform> rotateNode(new osg::PositionAttitudeTransform);
             rotateNode->addUpdateCallback(new RotateCallback());
             state.mNode->addChild(rotateNode);
             attachTo = rotateNode;
@@ -223,7 +221,8 @@ namespace MWWorld
             {
                 std::ostringstream nodeName;
                 nodeName << "Dummy" << std::setw(2) << std::setfill('0') << iter;
-                const ESM::Weapon* weapon = MWBase::Environment::get().getWorld()->getStore().get<ESM::Weapon>().find (state.mIdMagic.at(iter));
+                const ESM::Weapon* weapon = MWBase::Environment::get().getWorld()->getStore().get<ESM::Weapon>().find(
+                    state.mIdMagic.at(iter));
                 std::string nameToFind = nodeName.str();
                 SceneUtil::FindByNameVisitor findVisitor(nameToFind);
                 attachTo->accept(findVisitor);
@@ -243,11 +242,11 @@ namespace MWWorld
             projectileLight->setLinearAttenuation(0.1f);
             projectileLight->setQuadraticAttenuation(0.f);
             projectileLight->setPosition(osg::Vec4(pos, 1.0));
-            
+
             SceneUtil::LightSource* projectileLightSource = new SceneUtil::LightSource;
             projectileLightSource->setNodeMask(MWRender::Mask_Lighting);
             projectileLightSource->setRadius(66.f);
-            
+
             state.mNode->addChild(projectileLightSource);
             projectileLightSource->setLight(projectileLight);
         }
@@ -258,7 +257,7 @@ namespace MWWorld
 
         state.mEffectAnimationTime = std::make_shared<MWRender::EffectAnimationTime>();
 
-        SceneUtil::AssignControllerSourcesVisitor assignVisitor (state.mEffectAnimationTime);
+        SceneUtil::AssignControllerSourcesVisitor assignVisitor(state.mEffectAnimationTime);
         state.mNode->accept(assignVisitor);
 
         MWRender::overrideFirstRootTexture(texture, mResourceSystem, projectile);
@@ -269,24 +268,27 @@ namespace MWWorld
         state.mEffectAnimationTime->addTime(duration);
     }
 
-    void ProjectileManager::launchMagicBolt(const std::string &spellId, const Ptr &caster, const osg::Vec3f& fallbackDirection, int slot)
+    void ProjectileManager::launchMagicBolt(
+        const std::string& spellId, const Ptr& caster, const osg::Vec3f& fallbackDirection, int slot)
     {
         osg::Vec3f pos = caster.getRefData().getPosition().asVec3();
         if (caster.getClass().isActor())
         {
-            // Note: we ignore the collision box offset, this is required to make some flying creatures work as intended.
+            // Note: we ignore the collision box offset, this is required to make some flying creatures work as
+            // intended.
             pos.z() += mPhysics->getRenderingHalfExtents(caster).z() * 2 * Constants::TorsoHeight;
         }
 
-        if (MWBase::Environment::get().getWorld()->isUnderwater(caster.getCell(), pos)) // Underwater casting not possible
+        if (MWBase::Environment::get().getWorld()->isUnderwater(
+                caster.getCell(), pos)) // Underwater casting not possible
             return;
 
         osg::Quat orient;
         if (caster.getClass().isActor())
-            orient = osg::Quat(caster.getRefData().getPosition().rot[0], osg::Vec3f(-1,0,0))
-                    * osg::Quat(caster.getRefData().getPosition().rot[2], osg::Vec3f(0,0,-1));
+            orient = osg::Quat(caster.getRefData().getPosition().rot[0], osg::Vec3f(-1, 0, 0))
+                * osg::Quat(caster.getRefData().getPosition().rot[2], osg::Vec3f(0, 0, -1));
         else
-            orient.makeRotate(osg::Vec3f(0,1,0), osg::Vec3f(fallbackDirection));
+            orient.makeRotate(osg::Vec3f(0, 1, 0), osg::Vec3f(fallbackDirection));
 
         MagicBoltState state;
         state.mSpellId = spellId;
@@ -299,7 +301,8 @@ namespace MWWorld
 
         std::string texture;
 
-        state.mEffects = getMagicBoltData(state.mIdMagic, state.mSoundIds, state.mSpeed, texture, state.mSourceName, state.mSpellId);
+        state.mEffects = getMagicBoltData(
+            state.mIdMagic, state.mSoundIds, state.mSpeed, texture, state.mSourceName, state.mSpellId);
 
         // Non-projectile should have been removed by getMagicBoltData
         if (state.mEffects.mList.empty())
@@ -319,16 +322,17 @@ namespace MWWorld
         auto model = ptr.getClass().getModel(ptr);
         createModel(state, model, pos, orient, true, true, lightDiffuseColor, texture);
 
-        MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-        for (const std::string &soundid : state.mSoundIds)
+        MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
+        for (const std::string& soundid : state.mSoundIds)
         {
-            MWBase::Sound *sound = sndMgr->playSound3D(pos, soundid, 1.0f, 1.0f,
-                                                       MWSound::Type::Sfx, MWSound::PlayMode::Loop);
+            MWBase::Sound* sound
+                = sndMgr->playSound3D(pos, soundid, 1.0f, 1.0f, MWSound::Type::Sfx, MWSound::PlayMode::Loop);
             if (sound)
                 state.mSounds.push_back(sound);
         }
 
-        // in case there are multiple effects, the model is a dummy without geometry. Use the second effect for physics shape
+        // in case there are multiple effects, the model is a dummy without geometry. Use the second effect for physics
+        // shape
         if (state.mIdMagic.size() > 1)
         {
             model = Misc::ResourceHelpers::correctMeshPath(
@@ -340,12 +344,13 @@ namespace MWWorld
         mMagicBolts.push_back(state);
     }
 
-    void ProjectileManager::launchProjectile(const Ptr& actor, const ConstPtr& projectile, const osg::Vec3f &pos, const osg::Quat &orient, const Ptr& bow, float speed, float attackStrength)
+    void ProjectileManager::launchProjectile(const Ptr& actor, const ConstPtr& projectile, const osg::Vec3f& pos,
+        const osg::Quat& orient, const Ptr& bow, float speed, float attackStrength)
     {
         ProjectileState state;
         state.mActorId = actor.getClass().getCreatureStats(actor).getActorId();
         state.mBowId = bow.getCellRef().getRefId();
-        state.mVelocity = orient * osg::Vec3f(0,1,0) * speed;
+        state.mVelocity = orient * osg::Vec3f(0, 1, 0) * speed;
         state.mIdArrow = projectile.getCellRef().getRefId();
         state.mCasterHandle = actor;
         state.mAttackStrength = attackStrength;
@@ -356,7 +361,7 @@ namespace MWWorld
         MWWorld::Ptr ptr = ref.getPtr();
 
         const auto model = ptr.getClass().getModel(ptr);
-        createModel(state, model, pos, orient, false, false, osg::Vec4(0,0,0,0));
+        createModel(state, model, pos, orient, false, false, osg::Vec4(0, 0, 0, 0));
         if (!ptr.getClass().getEnchantment(ptr).empty())
             SceneUtil::addEnchantedGlow(state.mNode, mResourceSystem, ptr.getClass().getEnchantmentColor(ptr));
 
@@ -372,7 +377,8 @@ namespace MWWorld
 
         for (auto& state : mMagicBolts)
         {
-            // casters are identified by actor id in the savegame. objects doesn't have one so they can't be identified back.
+            // casters are identified by actor id in the savegame. objects doesn't have one so they can't be identified
+            // back.
             // TODO: should object-type caster be restored from savegame?
             if (state.mActorId == -1)
                 continue;
@@ -402,11 +408,10 @@ namespace MWWorld
         {
             mCleanupTimer = 2.0f;
 
-            auto isCleanable = [](const ProjectileManager::State& state) -> bool
-            {
+            auto isCleanable = [](const ProjectileManager::State& state) -> bool {
                 const float farawayThreshold = 72000.0f;
                 osg::Vec3 playerPos = MWMechanics::getPlayer().getRefData().getPosition().asVec3();
-                return (state.mNode->getPosition() - playerPos).length2() >= farawayThreshold*farawayThreshold;
+                return (state.mNode->getPosition() - playerPos).length2() >= farawayThreshold * farawayThreshold;
             };
 
             for (auto& projectileState : mProjectiles)
@@ -447,7 +452,8 @@ namespace MWWorld
 
             const auto& store = MWBase::Environment::get().getWorld()->getStore();
             osg::Quat orient = magicBoltState.mNode->getAttitude();
-            static float fTargetSpellMaxSpeed = store.get<ESM::GameSetting>().find("fTargetSpellMaxSpeed")->mValue.getFloat();
+            static float fTargetSpellMaxSpeed
+                = store.get<ESM::GameSetting>().find("fTargetSpellMaxSpeed")->mValue.getFloat();
             float speed = fTargetSpellMaxSpeed * magicBoltState.mSpeed;
             if (!normaliseRaceSpeed && !caster.isEmpty() && caster.getClass().isNpc())
             {
@@ -455,13 +461,14 @@ namespace MWWorld
                 const auto race = store.get<ESM::Race>().find(npc->mRace);
                 speed *= npc->isMale() ? race->mData.mWeight.mMale : race->mData.mWeight.mFemale;
             }
-            osg::Vec3f direction = orient * osg::Vec3f(0,1,0);
+            osg::Vec3f direction = orient * osg::Vec3f(0, 1, 0);
             direction.normalize();
             projectile->setVelocity(direction * speed);
 
             update(magicBoltState, duration);
 
-            // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit result.
+            // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit
+            // result.
             std::vector<MWWorld::Ptr> targetActors;
             if (!caster.isEmpty() && caster.getClass().isActor() && caster != MWMechanics::getPlayer())
                 caster.getClass().getCreatureStats(caster).getAiSequence().getCombatTargets(targetActors);
@@ -481,15 +488,17 @@ namespace MWWorld
                 continue;
             // gravity constant - must be way lower than the gravity affecting actors, since we're not
             // simulating aerodynamics at all
-            projectileState.mVelocity -= osg::Vec3f(0, 0, Constants::GravityConst * Constants::UnitsPerMeter * 0.1f) * duration;
+            projectileState.mVelocity
+                -= osg::Vec3f(0, 0, Constants::GravityConst * Constants::UnitsPerMeter * 0.1f) * duration;
 
             projectile->setVelocity(projectileState.mVelocity);
 
-            // rotation does not work well for throwing projectiles - their roll angle will depend on shooting direction.
+            // rotation does not work well for throwing projectiles - their roll angle will depend on shooting
+            // direction.
             if (!projectileState.mThrown)
             {
                 osg::Quat orient;
-                orient.makeRotate(osg::Vec3f(0,1,0), projectileState.mVelocity);
+                orient.makeRotate(osg::Vec3f(0, 1, 0), projectileState.mVelocity);
                 projectileState.mNode->setAttitude(orient);
             }
 
@@ -497,7 +506,8 @@ namespace MWWorld
 
             MWWorld::Ptr caster = projectileState.getCaster();
 
-            // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit result.
+            // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit
+            // result.
             std::vector<MWWorld::Ptr> targetActors;
             if (!caster.isEmpty() && caster.getClass().isActor() && caster != MWMechanics::getPlayer())
                 caster.getClass().getCreatureStats(caster).getAiSequence().getCombatTargets(targetActors);
@@ -528,19 +538,22 @@ namespace MWWorld
                 caster = target;
 
             // Try to get a Ptr to the bow that was used. It might no longer exist.
-            MWWorld::ManualRef projectileRef(MWBase::Environment::get().getWorld()->getStore(), projectileState.mIdArrow);
+            MWWorld::ManualRef projectileRef(
+                MWBase::Environment::get().getWorld()->getStore(), projectileState.mIdArrow);
             MWWorld::Ptr bow = projectileRef.getPtr();
             if (!caster.isEmpty() && projectileState.mIdArrow != projectileState.mBowId)
             {
                 MWWorld::InventoryStore& inv = caster.getClass().getInventoryStore(caster);
                 MWWorld::ContainerStoreIterator invIt = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-                if (invIt != inv.end() && Misc::StringUtils::ciEqual(invIt->getCellRef().getRefId(), projectileState.mBowId))
+                if (invIt != inv.end()
+                    && Misc::StringUtils::ciEqual(invIt->getCellRef().getRefId(), projectileState.mBowId))
                     bow = *invIt;
             }
             if (projectile->getHitWater())
                 mRendering->emitWaterRipple(pos);
 
-            MWMechanics::projectileHit(caster, target, bow, projectileRef.getPtr(), pos, projectileState.mAttackStrength);
+            MWMechanics::projectileHit(
+                caster, target, bow, projectileRef.getPtr(), pos, projectileState.mAttackStrength);
             projectileState.mToDelete = true;
         }
         const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
@@ -594,10 +607,12 @@ namespace MWWorld
             if (magicBoltState.mToDelete)
                 cleanupMagicBolt(magicBoltState);
         }
-        mProjectiles.erase(std::remove_if(mProjectiles.begin(), mProjectiles.end(), [](const State& state) { return state.mToDelete; }),
-                mProjectiles.end());
-        mMagicBolts.erase(std::remove_if(mMagicBolts.begin(), mMagicBolts.end(), [](const State& state) { return state.mToDelete; }),
-                mMagicBolts.end());
+        mProjectiles.erase(std::remove_if(mProjectiles.begin(), mProjectiles.end(),
+                               [](const State& state) { return state.mToDelete; }),
+            mProjectiles.end());
+        mMagicBolts.erase(
+            std::remove_if(mMagicBolts.begin(), mMagicBolts.end(), [](const State& state) { return state.mToDelete; }),
+            mMagicBolts.end());
     }
 
     void ProjectileManager::cleanupProjectile(ProjectileManager::ProjectileState& state)
@@ -629,7 +644,7 @@ namespace MWWorld
         mMagicBolts.clear();
     }
 
-    void ProjectileManager::write(ESM::ESMWriter &writer, Loading::Listener &progress) const
+    void ProjectileManager::write(ESM::ESMWriter& writer, Loading::Listener& progress) const
     {
         for (std::vector<ProjectileState>::const_iterator it = mProjectiles.begin(); it != mProjectiles.end(); ++it)
         {
@@ -669,7 +684,7 @@ namespace MWWorld
         }
     }
 
-    bool ProjectileManager::readRecord(ESM::ESMReader &reader, uint32_t type)
+    bool ProjectileManager::readRecord(ESM::ESMReader& reader, uint32_t type)
     {
         if (type == ESM::REC_PROJ)
         {
@@ -693,14 +708,16 @@ namespace MWWorld
                 int weaponType = ptr.get<ESM::Weapon>()->mBase->mData.mType;
                 state.mThrown = MWMechanics::getWeaponType(weaponType)->mWeaponClass == ESM::WeaponType::Thrown;
 
-                state.mProjectileId = mPhysics->addProjectile(state.getCaster(), osg::Vec3f(esm.mPosition), model, false);
+                state.mProjectileId
+                    = mPhysics->addProjectile(state.getCaster(), osg::Vec3f(esm.mPosition), model, false);
             }
-            catch(...)
+            catch (...)
             {
                 return true;
             }
 
-            createModel(state, model, osg::Vec3f(esm.mPosition), osg::Quat(esm.mOrientation), false, false, osg::Vec4(0,0,0,0));
+            createModel(state, model, osg::Vec3f(esm.mPosition), osg::Quat(esm.mOrientation), false, false,
+                osg::Vec4(0, 0, 0, 0));
 
             mProjectiles.push_back(state);
             return true;
@@ -720,11 +737,13 @@ namespace MWWorld
 
             try
             {
-                state.mEffects = getMagicBoltData(state.mIdMagic, state.mSoundIds, state.mSpeed, texture, state.mSourceName, state.mSpellId);
+                state.mEffects = getMagicBoltData(
+                    state.mIdMagic, state.mSoundIds, state.mSpeed, texture, state.mSourceName, state.mSpellId);
             }
-            catch(...)
+            catch (...)
             {
-                Log(Debug::Warning) << "Warning: Failed to recreate magic projectile from saved data (id \"" << state.mSpellId << "\" no longer exists?)";
+                Log(Debug::Warning) << "Warning: Failed to recreate magic projectile from saved data (id \""
+                                    << state.mSpellId << "\" no longer exists?)";
                 return true;
             }
 
@@ -740,20 +759,21 @@ namespace MWWorld
                 MWWorld::Ptr ptr = ref.getPtr();
                 model = ptr.getClass().getModel(ptr);
             }
-            catch(...)
+            catch (...)
             {
                 return true;
             }
 
             osg::Vec4 lightDiffuseColor = getMagicBoltLightDiffuseColor(state.mEffects);
-            createModel(state, model, osg::Vec3f(esm.mPosition), osg::Quat(esm.mOrientation), true, true, lightDiffuseColor, texture);
+            createModel(state, model, osg::Vec3f(esm.mPosition), osg::Quat(esm.mOrientation), true, true,
+                lightDiffuseColor, texture);
             state.mProjectileId = mPhysics->addProjectile(state.getCaster(), osg::Vec3f(esm.mPosition), model, true);
 
-            MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-            for (const std::string &soundid : state.mSoundIds)
+            MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
+            for (const std::string& soundid : state.mSoundIds)
             {
-                MWBase::Sound *sound = sndMgr->playSound3D(esm.mPosition, soundid, 1.0f, 1.0f,
-                                                           MWSound::Type::Sfx, MWSound::PlayMode::Loop);
+                MWBase::Sound* sound = sndMgr->playSound3D(
+                    esm.mPosition, soundid, 1.0f, 1.0f, MWSound::Type::Sfx, MWSound::PlayMode::Loop);
                 if (sound)
                     state.mSounds.push_back(sound);
             }
diff --git a/apps/openmw/mwworld/projectilemanager.hpp b/apps/openmw/mwworld/projectilemanager.hpp
index 63a0dacc71..602d254046 100644
--- a/apps/openmw/mwworld/projectilemanager.hpp
+++ b/apps/openmw/mwworld/projectilemanager.hpp
@@ -3,8 +3,8 @@
 
 #include <string>
 
-#include <osg/ref_ptr>
 #include <osg/PositionAttitudeTransform>
+#include <osg/ref_ptr>
 
 #include <components/esm3/effectlist.hpp>
 
@@ -45,14 +45,15 @@ namespace MWWorld
     class ProjectileManager
     {
     public:
-        ProjectileManager (osg::Group* parent, Resource::ResourceSystem* resourceSystem,
-                MWRender::RenderingManager* rendering, MWPhysics::PhysicsSystem* physics);
+        ProjectileManager(osg::Group* parent, Resource::ResourceSystem* resourceSystem,
+            MWRender::RenderingManager* rendering, MWPhysics::PhysicsSystem* physics);
 
         /// If caster is an actor, the actor's facing orientation is used. Otherwise fallbackDirection is used.
-        void launchMagicBolt (const std::string &spellId, const MWWorld::Ptr& caster, const osg::Vec3f& fallbackDirection, int slot);
+        void launchMagicBolt(
+            const std::string& spellId, const MWWorld::Ptr& caster, const osg::Vec3f& fallbackDirection, int slot);
 
-        void launchProjectile (const MWWorld::Ptr& actor, const MWWorld::ConstPtr& projectile,
-                                       const osg::Vec3f& pos, const osg::Quat& orient, const MWWorld::Ptr& bow, float speed, float attackStrength);
+        void launchProjectile(const MWWorld::Ptr& actor, const MWWorld::ConstPtr& projectile, const osg::Vec3f& pos,
+            const osg::Quat& orient, const MWWorld::Ptr& bow, float speed, float attackStrength);
 
         void updateCasters();
 
@@ -63,8 +64,8 @@ namespace MWWorld
         /// Removes all current projectiles. Should be called when switching to a new worldspace.
         void clear();
 
-        void write (ESM::ESMWriter& writer, Loading::Listener& progress) const;
-        bool readRecord (ESM::ESMReader& reader, uint32_t type);
+        void write(ESM::ESMWriter& writer, Loading::Listener& progress) const;
+        bool readRecord(ESM::ESMReader& reader, uint32_t type);
         int countSavedGameRecords() const;
 
     private:
@@ -133,9 +134,9 @@ namespace MWWorld
         void moveProjectiles(float dt);
         void moveMagicBolts(float dt);
 
-        void createModel (State& state, const std::string& model, const osg::Vec3f& pos, const osg::Quat& orient,
-                            bool rotate, bool createLight, osg::Vec4 lightDiffuseColor, std::string texture = "");
-        void update (State& state, float duration);
+        void createModel(State& state, const std::string& model, const osg::Vec3f& pos, const osg::Quat& orient,
+            bool rotate, bool createLight, osg::Vec4 lightDiffuseColor, std::string texture = "");
+        void update(State& state, float duration);
 
         void operator=(const ProjectileManager&);
         ProjectileManager(const ProjectileManager&);
diff --git a/apps/openmw/mwworld/ptr.hpp b/apps/openmw/mwworld/ptr.hpp
index 0b8db5ac75..5dd6cf6b7b 100644
--- a/apps/openmw/mwworld/ptr.hpp
+++ b/apps/openmw/mwworld/ptr.hpp
@@ -2,9 +2,9 @@
 #define GAME_MWWORLD_PTR_H
 
 #include <cassert>
-#include <type_traits>
 #include <string>
 #include <string_view>
+#include <type_traits>
 
 #include "livecellref.hpp"
 
@@ -16,111 +16,112 @@ namespace MWWorld
 
     /// \brief Pointer to a LiveCellRef
     /// @note PtrBase is never used directly and needed only to define Ptr and ConstPtr
-    template <template<class> class TypeTransform>
+    template <template <class> class TypeTransform>
     class PtrBase
     {
-        public:
-
-            typedef TypeTransform<MWWorld::LiveCellRefBase> LiveCellRefBaseType;
-            typedef TypeTransform<CellStore> CellStoreType;
-            typedef TypeTransform<ContainerStore> ContainerStoreType;
-
-            LiveCellRefBaseType *mRef;
-            CellStoreType *mCell;
-            ContainerStoreType *mContainerStore;
-
-            bool isEmpty() const
-            {
-                return mRef == nullptr;
-            }
-
-            // Returns a 32-bit id of the ESM record this object is based on.
-            // Specific values of ids are defined in ESM::RecNameInts.
-            // Note 1: ids are not sequential. E.g. for a creature `getType` returns 0x41455243.
-            // Note 2: Life is not easy and full of surprises. For example
-            //         prison marker reuses ESM::Door record. Player is ESM::NPC.
-            unsigned int getType() const
-            {
-                if(mRef != nullptr)
-                    return mRef->getType();
-                throw std::runtime_error("Can't get type name from an empty object.");
-            }
-
-            std::string_view getTypeDescription() const
-            {
-                return mRef ? mRef->getTypeDescription() : "nullptr";
-            }
-
-            const Class& getClass() const
-            {
-                if(mRef != nullptr)
-                    return *(mRef->mClass);
-                throw std::runtime_error("Cannot get class of an empty object");
-            }
-
-            template <class T>
-            auto* get() const { return LiveCellRefBase::dynamicCast<T>(mRef); }
-
-            LiveCellRefBaseType *getBase() const
-            {
-                if (!mRef)
-                    throw std::runtime_error ("Can't access cell ref pointed to by null Ptr");
-                return mRef;
-            }
-
-            TypeTransform<MWWorld::CellRef>& getCellRef() const
-            {
-                assert(mRef);
-                return mRef->mRef;
-            }
-
-            TypeTransform<RefData>& getRefData() const
-            {
-                assert(mRef);
-                return mRef->mData;
-            }
-
-            CellStoreType *getCell() const
-            {
-                assert(mCell);
-                return mCell;
-            }
-
-            bool isInCell() const
-            {
-                return (mContainerStore == nullptr) && (mCell != nullptr);
-            }
-
-            void setContainerStore (ContainerStoreType *store)
-            ///< Must not be called on references that are in a cell.
-            {
-                assert (store);
-                assert (!mCell);
-                mContainerStore = store;
-            }
-
-            ContainerStoreType *getContainerStore() const
-            ///< May return a 0-pointer, if reference is not in a container.
-            {
-                return mContainerStore;
-            }
-
-            operator const void *() const
-            ///< Return a 0-pointer, if Ptr is empty; return a non-0-pointer, if Ptr is not empty
-            {
-                return mRef;
-            }
-
-        protected:
-            PtrBase(LiveCellRefBaseType *liveCellRef, CellStoreType *cell, ContainerStoreType* containerStore) : mRef(liveCellRef), mCell(cell), mContainerStore(containerStore) {}
+    public:
+        typedef TypeTransform<MWWorld::LiveCellRefBase> LiveCellRefBaseType;
+        typedef TypeTransform<CellStore> CellStoreType;
+        typedef TypeTransform<ContainerStore> ContainerStoreType;
+
+        LiveCellRefBaseType* mRef;
+        CellStoreType* mCell;
+        ContainerStoreType* mContainerStore;
+
+        bool isEmpty() const { return mRef == nullptr; }
+
+        // Returns a 32-bit id of the ESM record this object is based on.
+        // Specific values of ids are defined in ESM::RecNameInts.
+        // Note 1: ids are not sequential. E.g. for a creature `getType` returns 0x41455243.
+        // Note 2: Life is not easy and full of surprises. For example
+        //         prison marker reuses ESM::Door record. Player is ESM::NPC.
+        unsigned int getType() const
+        {
+            if (mRef != nullptr)
+                return mRef->getType();
+            throw std::runtime_error("Can't get type name from an empty object.");
+        }
+
+        std::string_view getTypeDescription() const { return mRef ? mRef->getTypeDescription() : "nullptr"; }
+
+        const Class& getClass() const
+        {
+            if (mRef != nullptr)
+                return *(mRef->mClass);
+            throw std::runtime_error("Cannot get class of an empty object");
+        }
+
+        template <class T>
+        auto* get() const
+        {
+            return LiveCellRefBase::dynamicCast<T>(mRef);
+        }
+
+        LiveCellRefBaseType* getBase() const
+        {
+            if (!mRef)
+                throw std::runtime_error("Can't access cell ref pointed to by null Ptr");
+            return mRef;
+        }
+
+        TypeTransform<MWWorld::CellRef>& getCellRef() const
+        {
+            assert(mRef);
+            return mRef->mRef;
+        }
+
+        TypeTransform<RefData>& getRefData() const
+        {
+            assert(mRef);
+            return mRef->mData;
+        }
+
+        CellStoreType* getCell() const
+        {
+            assert(mCell);
+            return mCell;
+        }
+
+        bool isInCell() const { return (mContainerStore == nullptr) && (mCell != nullptr); }
+
+        void setContainerStore(ContainerStoreType* store)
+        ///< Must not be called on references that are in a cell.
+        {
+            assert(store);
+            assert(!mCell);
+            mContainerStore = store;
+        }
+
+        ContainerStoreType* getContainerStore() const
+        ///< May return a 0-pointer, if reference is not in a container.
+        {
+            return mContainerStore;
+        }
+
+        operator const void*() const
+        ///< Return a 0-pointer, if Ptr is empty; return a non-0-pointer, if Ptr is not empty
+        {
+            return mRef;
+        }
+
+    protected:
+        PtrBase(LiveCellRefBaseType* liveCellRef, CellStoreType* cell, ContainerStoreType* containerStore)
+            : mRef(liveCellRef)
+            , mCell(cell)
+            , mContainerStore(containerStore)
+        {
+        }
     };
 
-    /// @note It is possible to get mutable values from const Ptr. So if a function accepts const Ptr&, the object is still mutable.
-    /// To make it really const the argument should be const ConstPtr&.
+    /// @note It is possible to get mutable values from const Ptr. So if a function accepts const Ptr&, the object is
+    /// still mutable. To make it really const the argument should be const ConstPtr&.
     class Ptr : public PtrBase<std::remove_const_t>
     {
     public:
-        Ptr(LiveCellRefBase *liveCellRef=nullptr, CellStoreType *cell=nullptr) : PtrBase(liveCellRef, cell, nullptr) {}
+        Ptr(LiveCellRefBase* liveCellRef = nullptr, CellStoreType* cell = nullptr)
+            : PtrBase(liveCellRef, cell, nullptr)
+        {
+        }
     };
 
     /// @note The difference between Ptr and ConstPtr is that the second one adds const to the underlying pointers.
@@ -128,8 +129,14 @@ namespace MWWorld
     class ConstPtr : public PtrBase<std::add_const_t>
     {
     public:
-        ConstPtr(const Ptr& ptr) : PtrBase(ptr.mRef, ptr.mCell, ptr.mContainerStore) {}
-        ConstPtr(const LiveCellRefBase *liveCellRef=nullptr, const CellStoreType *cell=nullptr) : PtrBase(liveCellRef, cell, nullptr) {}
+        ConstPtr(const Ptr& ptr)
+            : PtrBase(ptr.mRef, ptr.mCell, ptr.mContainerStore)
+        {
+        }
+        ConstPtr(const LiveCellRefBase* liveCellRef = nullptr, const CellStoreType* cell = nullptr)
+            : PtrBase(liveCellRef, cell, nullptr)
+        {
+        }
     };
 
 }
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index 87bae97cc3..8dd65361ee 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -3,8 +3,8 @@
 #include <components/esm3/objectstate.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 
-#include "customdata.hpp"
 #include "cellstore.hpp"
+#include "customdata.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -13,12 +13,13 @@
 
 namespace
 {
-enum RefDataFlags
-{
-    Flag_SuppressActivate = 1, // If set, activation will be suppressed and redirected to the OnActivate flag, which can then be handled by a script.
-    Flag_OnActivate = 2,
-    Flag_ActivationBuffered = 4
-};
+    enum RefDataFlags
+    {
+        Flag_SuppressActivate = 1, // If set, activation will be suppressed and redirected to the OnActivate flag, which
+                                   // can then be handled by a script.
+        Flag_OnActivate = 2,
+        Flag_ActivationBuffered = 4
+    };
 }
 
 namespace MWWorld
@@ -30,7 +31,7 @@ namespace MWWorld
         mLuaScripts = std::move(scripts);
     }
 
-    void RefData::copy (const RefData& refData)
+    void RefData::copy(const RefData& refData)
     {
         mBaseNode = refData.mBaseNode;
         mLocals = refData.mLocals;
@@ -56,45 +57,62 @@ namespace MWWorld
     }
 
     RefData::RefData()
-    : mBaseNode(nullptr), mDeletedByContentFile(false), mEnabled (true), mPhysicsPostponed(false), mCount (1), mCustomData (nullptr), mChanged(false), mFlags(0)
-    {
-        for (int i=0; i<3; ++i)
+        : mBaseNode(nullptr)
+        , mDeletedByContentFile(false)
+        , mEnabled(true)
+        , mPhysicsPostponed(false)
+        , mCount(1)
+        , mCustomData(nullptr)
+        , mChanged(false)
+        , mFlags(0)
+    {
+        for (int i = 0; i < 3; ++i)
         {
             mPosition.pos[i] = 0;
             mPosition.rot[i] = 0;
         }
     }
 
-    RefData::RefData (const ESM::CellRef& cellRef)
-    : mBaseNode(nullptr), mDeletedByContentFile(false), mEnabled (true), mPhysicsPostponed(false), 
-      mCount (1), mPosition (cellRef.mPos),
-      mCustomData (nullptr),
-      mChanged(false), mFlags(0) // Loading from ESM/ESP files -> assume unchanged
+    RefData::RefData(const ESM::CellRef& cellRef)
+        : mBaseNode(nullptr)
+        , mDeletedByContentFile(false)
+        , mEnabled(true)
+        , mPhysicsPostponed(false)
+        , mCount(1)
+        , mPosition(cellRef.mPos)
+        , mCustomData(nullptr)
+        , mChanged(false)
+        , mFlags(0) // Loading from ESM/ESP files -> assume unchanged
     {
     }
 
-    RefData::RefData (const ESM::ObjectState& objectState, bool deletedByContentFile)
-    : mBaseNode(nullptr), mDeletedByContentFile(deletedByContentFile),
-      mEnabled (objectState.mEnabled != 0), mPhysicsPostponed(false),
-      mCount (objectState.mCount),
-      mPosition (objectState.mPosition),
-      mAnimationState(objectState.mAnimationState),
-      mCustomData (nullptr),
-      mChanged(true), mFlags(objectState.mFlags) // Loading from a savegame -> assume changed
+    RefData::RefData(const ESM::ObjectState& objectState, bool deletedByContentFile)
+        : mBaseNode(nullptr)
+        , mDeletedByContentFile(deletedByContentFile)
+        , mEnabled(objectState.mEnabled != 0)
+        , mPhysicsPostponed(false)
+        , mCount(objectState.mCount)
+        , mPosition(objectState.mPosition)
+        , mAnimationState(objectState.mAnimationState)
+        , mCustomData(nullptr)
+        , mChanged(true)
+        , mFlags(objectState.mFlags) // Loading from a savegame -> assume changed
     {
         // "Note that the ActivationFlag_UseEnabled is saved to the reference,
         // which will result in permanently suppressed activation if the reference script is removed.
-        // This occurred when removing the animated containers mod, and the fix in MCP is to reset UseEnabled to true on loading a game."
+        // This occurred when removing the animated containers mod, and the fix in MCP is to reset UseEnabled to true on
+        // loading a game."
         mFlags &= (~Flag_SuppressActivate);
     }
 
-    RefData::RefData (const RefData& refData)
-    : mBaseNode(nullptr), mCustomData (nullptr)
+    RefData::RefData(const RefData& refData)
+        : mBaseNode(nullptr)
+        , mCustomData(nullptr)
     {
         try
         {
-            copy (refData);
-            mFlags &= ~(Flag_SuppressActivate|Flag_OnActivate|Flag_ActivationBuffered);
+            copy(refData);
+            mFlags &= ~(Flag_SuppressActivate | Flag_OnActivate | Flag_ActivationBuffered);
         }
         catch (...)
         {
@@ -105,7 +123,7 @@ namespace MWWorld
 
     void RefData::write(ESM::ObjectState& objectState, std::string_view scriptId) const
     {
-        objectState.mHasLocals = mLocals.write (objectState.mLocals, scriptId);
+        objectState.mHasLocals = mLocals.write(objectState.mLocals, scriptId);
 
         objectState.mEnabled = mEnabled;
         objectState.mCount = mCount;
@@ -115,12 +133,12 @@ namespace MWWorld
         objectState.mAnimationState = mAnimationState;
     }
 
-    RefData& RefData::operator= (const RefData& refData)
+    RefData& RefData::operator=(const RefData& refData)
     {
         try
         {
             cleanup();
-            copy (refData);
+            copy(refData);
         }
         catch (...)
         {
@@ -138,7 +156,8 @@ namespace MWWorld
             cleanup();
         }
         catch (...)
-        {}
+        {
+        }
     }
 
     RefData::RefData(RefData&& other) = default;
@@ -161,20 +180,20 @@ namespace MWWorld
 
     int RefData::getCount(bool absolute) const
     {
-        if(absolute)
+        if (absolute)
             return std::abs(mCount);
         return mCount;
     }
 
-    void RefData::setLocals (const ESM::Script& script)
+    void RefData::setLocals(const ESM::Script& script)
     {
-        if (mLocals.configure (script) && !mLocals.isEmpty())
+        if (mLocals.configure(script) && !mLocals.isEmpty())
             mChanged = true;
     }
 
-    void RefData::setCount (int count)
+    void RefData::setCount(int count)
     {
-        if(count == 0)
+        if (count == 0)
             MWBase::Environment::get().getWorld()->removeRefScript(this);
 
         mChanged = true;
@@ -242,12 +261,12 @@ namespace MWWorld
         mCustomData = std::move(value);
     }
 
-    CustomData *RefData::getCustomData()
+    CustomData* RefData::getCustomData()
     {
         return mCustomData.get();
     }
 
-    const CustomData *RefData::getCustomData() const
+    const CustomData* RefData::getCustomData() const
     {
         return mCustomData.get();
     }
@@ -260,7 +279,7 @@ namespace MWWorld
     bool RefData::activateByScript()
     {
         bool ret = (mFlags & Flag_ActivationBuffered);
-        mFlags &= ~(Flag_SuppressActivate|Flag_OnActivate);
+        mFlags &= ~(Flag_SuppressActivate | Flag_OnActivate);
         return ret;
     }
 
@@ -268,7 +287,7 @@ namespace MWWorld
     {
         if (mFlags & Flag_SuppressActivate)
         {
-            mFlags |= Flag_OnActivate|Flag_ActivationBuffered;
+            mFlags |= Flag_OnActivate | Flag_ActivationBuffered;
             return false;
         }
         else
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index 5174973d6d..194e307a2a 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -9,8 +9,8 @@
 
 #include <osg/ref_ptr>
 
-#include <string>
 #include <memory>
+#include <string>
 
 namespace SceneUtil
 {
@@ -36,124 +36,125 @@ namespace MWWorld
 
     class RefData
     {
-            osg::ref_ptr<SceneUtil::PositionAttitudeTransform> mBaseNode;
+        osg::ref_ptr<SceneUtil::PositionAttitudeTransform> mBaseNode;
+
+        MWScript::Locals mLocals;
+        std::shared_ptr<MWLua::LocalScripts> mLuaScripts;
 
-            MWScript::Locals mLocals;
-            std::shared_ptr<MWLua::LocalScripts> mLuaScripts;
+        /// separate delete flag used for deletion by a content file
+        /// @note not stored in the save game file.
+        bool mDeletedByContentFile : 1;
 
-            /// separate delete flag used for deletion by a content file
-            /// @note not stored in the save game file.
-            bool mDeletedByContentFile:1;
+        bool mEnabled : 1;
 
-            bool mEnabled:1;
-        public:
-            bool mPhysicsPostponed:1;
-        private:
+    public:
+        bool mPhysicsPostponed : 1;
 
-            /// 0: deleted
-            int mCount;
+    private:
+        /// 0: deleted
+        int mCount;
 
-            ESM::Position mPosition;
+        ESM::Position mPosition;
 
-            ESM::AnimationState mAnimationState;
+        ESM::AnimationState mAnimationState;
 
-            std::unique_ptr<CustomData> mCustomData;
+        std::unique_ptr<CustomData> mCustomData;
 
-            void copy (const RefData& refData);
+        void copy(const RefData& refData);
 
-            void cleanup();
+        void cleanup();
 
-            bool mChanged;
+        bool mChanged;
 
-            unsigned int mFlags;
+        unsigned int mFlags;
 
-        public:
-            RefData();
+    public:
+        RefData();
 
-            /// @param cellRef Used to copy constant data such as position into this class where it can
-            /// be altered without affecting the original data. This makes it possible
-            /// to reset the position as the original data is still held in the CellRef
-            RefData (const ESM::CellRef& cellRef);
+        /// @param cellRef Used to copy constant data such as position into this class where it can
+        /// be altered without affecting the original data. This makes it possible
+        /// to reset the position as the original data is still held in the CellRef
+        RefData(const ESM::CellRef& cellRef);
 
-            RefData (const ESM::ObjectState& objectState, bool deletedByContentFile);
-            ///< Ignores local variables and custom data (not enough context available here to
-            /// perform these operations).
+        RefData(const ESM::ObjectState& objectState, bool deletedByContentFile);
+        ///< Ignores local variables and custom data (not enough context available here to
+        /// perform these operations).
 
-            RefData (const RefData& refData);
-            RefData (RefData&& other);
+        RefData(const RefData& refData);
+        RefData(RefData&& other);
 
-            ~RefData();
+        ~RefData();
 
-            void write(ESM::ObjectState& objectState, std::string_view scriptId = {}) const;
-            ///< Ignores custom data (not enough context available here to
-            /// perform this operations).
+        void write(ESM::ObjectState& objectState, std::string_view scriptId = {}) const;
+        ///< Ignores custom data (not enough context available here to
+        /// perform this operations).
 
-            RefData& operator= (const RefData& refData);
-            RefData& operator= (RefData&& other);
+        RefData& operator=(const RefData& refData);
+        RefData& operator=(RefData&& other);
 
-            /// Return base node (can be a null pointer).
-            SceneUtil::PositionAttitudeTransform* getBaseNode();
+        /// Return base node (can be a null pointer).
+        SceneUtil::PositionAttitudeTransform* getBaseNode();
 
-            /// Return base node (can be a null pointer).
-            const SceneUtil::PositionAttitudeTransform* getBaseNode() const;
+        /// Return base node (can be a null pointer).
+        const SceneUtil::PositionAttitudeTransform* getBaseNode() const;
 
-            /// Set base node (can be a null pointer).
-            void setBaseNode(osg::ref_ptr<SceneUtil::PositionAttitudeTransform> base);
+        /// Set base node (can be a null pointer).
+        void setBaseNode(osg::ref_ptr<SceneUtil::PositionAttitudeTransform> base);
 
-            int getCount(bool absolute = true) const;
+        int getCount(bool absolute = true) const;
 
-            void setLocals (const ESM::Script& script);
+        void setLocals(const ESM::Script& script);
 
-            MWLua::LocalScripts* getLuaScripts() { return mLuaScripts.get(); }
-            void setLuaScripts(std::shared_ptr<MWLua::LocalScripts>&&);
+        MWLua::LocalScripts* getLuaScripts() { return mLuaScripts.get(); }
+        void setLuaScripts(std::shared_ptr<MWLua::LocalScripts>&&);
 
-            void setCount (int count);
-            ///< Set object count (an object pile is a simple object with a count >1).
-            ///
-            /// \warning Do not call setCount() to add or remove objects from a
-            /// container or an actor's inventory. Call ContainerStore::add() or
-            /// ContainerStore::remove() instead.
+        void setCount(int count);
+        ///< Set object count (an object pile is a simple object with a count >1).
+        ///
+        /// \warning Do not call setCount() to add or remove objects from a
+        /// container or an actor's inventory. Call ContainerStore::add() or
+        /// ContainerStore::remove() instead.
 
-            /// This flag is only used for content stack loading and will not be stored in the savegame.
-            /// If the object was deleted by gameplay, then use setCount(0) instead.
-            void setDeletedByContentFile(bool deleted);
+        /// This flag is only used for content stack loading and will not be stored in the savegame.
+        /// If the object was deleted by gameplay, then use setCount(0) instead.
+        void setDeletedByContentFile(bool deleted);
 
-            /// Returns true if the object was either deleted by the content file or by gameplay.
-            bool isDeleted() const;
-            /// Returns true if the object was deleted by a content file.
-            bool isDeletedByContentFile() const;
+        /// Returns true if the object was either deleted by the content file or by gameplay.
+        bool isDeleted() const;
+        /// Returns true if the object was deleted by a content file.
+        bool isDeletedByContentFile() const;
 
-            MWScript::Locals& getLocals();
+        MWScript::Locals& getLocals();
 
-            bool isEnabled() const;
+        bool isEnabled() const;
 
-            void enable();
+        void enable();
 
-            void disable();
+        void disable();
 
-            void setPosition (const ESM::Position& pos);
-            const ESM::Position& getPosition() const;
+        void setPosition(const ESM::Position& pos);
+        const ESM::Position& getPosition() const;
 
-            void setCustomData(std::unique_ptr<CustomData>&& value) noexcept;
-            ///< Set custom data (potentially replacing old custom data). The ownership of \a data is
-            /// transferred to this.
+        void setCustomData(std::unique_ptr<CustomData>&& value) noexcept;
+        ///< Set custom data (potentially replacing old custom data). The ownership of \a data is
+        /// transferred to this.
 
-            CustomData *getCustomData();
-            ///< May return a 0-pointer. The ownership of the return data object is not transferred.
+        CustomData* getCustomData();
+        ///< May return a 0-pointer. The ownership of the return data object is not transferred.
 
-            const CustomData *getCustomData() const;
+        const CustomData* getCustomData() const;
 
-            bool activate();
+        bool activate();
 
-            bool onActivate();
+        bool onActivate();
 
-            bool activateByScript();
+        bool activateByScript();
 
-            bool hasChanged() const;
-            ///< Has this RefData changed since it was originally loaded?
+        bool hasChanged() const;
+        ///< Has this RefData changed since it was originally loaded?
 
-            const ESM::AnimationState& getAnimationState() const;
-            ESM::AnimationState& getAnimationState();
+        const ESM::AnimationState& getAnimationState() const;
+        ESM::AnimationState& getAnimationState();
     };
 }
 
diff --git a/apps/openmw/mwworld/registeredclass.hpp b/apps/openmw/mwworld/registeredclass.hpp
index 7ed9632129..1d8cc75b28 100644
--- a/apps/openmw/mwworld/registeredclass.hpp
+++ b/apps/openmw/mwworld/registeredclass.hpp
@@ -8,15 +8,18 @@ namespace MWWorld
     template <class Derived, class Base = Class>
     class RegisteredClass : public Base
     {
-        public:
-            static void registerSelf()
-            {
-                static Derived instance;
-                Base::registerClass(instance);
-            }
+    public:
+        static void registerSelf()
+        {
+            static Derived instance;
+            Base::registerClass(instance);
+        }
 
-        protected:
-            explicit RegisteredClass(unsigned type) : Base(type) {}
+    protected:
+        explicit RegisteredClass(unsigned type)
+            : Base(type)
+        {
+        }
     };
 }
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 451102c50e..549f77b07a 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -1,50 +1,50 @@
 #include "scene.hpp"
 
-#include <limits>
-#include <chrono>
 #include <atomic>
+#include <chrono>
+#include <limits>
 
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 
 #include <components/debug/debuglog.hpp>
+#include <components/detournavigator/agentbounds.hpp>
+#include <components/detournavigator/heightfieldshape.hpp>
+#include <components/detournavigator/navigator.hpp>
+#include <components/detournavigator/navigatorimpl.hpp>
+#include <components/esm/records.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
+#include <components/misc/convert.hpp>
 #include <components/misc/resourcehelpers.hpp>
-#include <components/settings/settings.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
-#include <components/detournavigator/navigator.hpp>
-#include <components/detournavigator/agentbounds.hpp>
-#include <components/misc/convert.hpp>
-#include <components/detournavigator/heightfieldshape.hpp>
-#include <components/detournavigator/navigatorimpl.hpp>
-#include <components/esm/records.hpp>
+#include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-#include "../mwbase/soundmanager.hpp"
+#include "../mwbase/luamanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/luamanager.hpp"
+#include "../mwbase/world.hpp"
 
-#include "../mwrender/renderingmanager.hpp"
 #include "../mwrender/landmanager.hpp"
 #include "../mwrender/postprocessor.hpp"
+#include "../mwrender/renderingmanager.hpp"
 
-#include "../mwphysics/physicssystem.hpp"
 #include "../mwphysics/actor.hpp"
-#include "../mwphysics/object.hpp"
 #include "../mwphysics/heightfield.hpp"
+#include "../mwphysics/object.hpp"
+#include "../mwphysics/physicssystem.hpp"
 
-#include "player.hpp"
-#include "localscripts.hpp"
-#include "esmstore.hpp"
-#include "class.hpp"
-#include "cellvisitors.hpp"
-#include "cellstore.hpp"
 #include "cellpreloader.hpp"
-#include "worldimp.hpp"
+#include "cellstore.hpp"
 #include "cellutils.hpp"
+#include "cellvisitors.hpp"
+#include "class.hpp"
+#include "esmstore.hpp"
+#include "localscripts.hpp"
+#include "player.hpp"
+#include "worldimp.hpp"
 
 namespace
 {
@@ -61,9 +61,8 @@ namespace
         const float yr = position.rot[1];
         const float zr = position.rot[2];
 
-        return osg::Quat(xr, osg::Vec3(-1, 0, 0))
-                * osg::Quat(yr, osg::Vec3(0, -1, 0))
-                * osg::Quat(zr, osg::Vec3(0, 0, -1));
+        return osg::Quat(xr, osg::Vec3(-1, 0, 0)) * osg::Quat(yr, osg::Vec3(0, -1, 0))
+            * osg::Quat(zr, osg::Vec3(0, 0, -1));
     }
 
     osg::Quat makeInverseNodeRotation(const MWWorld::Ptr& ptr)
@@ -85,13 +84,13 @@ namespace
         return makeDirectNodeRotation(ptr);
     }
 
-    void setNodeRotation(const MWWorld::Ptr& ptr, MWRender::RenderingManager& rendering, const osg::Quat &rotation)
+    void setNodeRotation(const MWWorld::Ptr& ptr, MWRender::RenderingManager& rendering, const osg::Quat& rotation)
     {
         if (ptr.getRefData().getBaseNode())
             rendering.rotateObject(ptr, rotation);
     }
 
-    std::string getModel(const MWWorld::Ptr &ptr, const VFS::Manager *vfs)
+    std::string getModel(const MWWorld::Ptr& ptr, const VFS::Manager* vfs)
     {
         if (Misc::ResourceHelpers::isHiddenMarker(ptr.getCellRef().getRefId()))
             return {};
@@ -118,7 +117,9 @@ namespace
         if (!refnum.hasContentFile() || !std::binary_search(pagedRefs.begin(), pagedRefs.end(), refnum))
             ptr.getClass().insertObjectRendering(ptr, model, rendering);
         else
-            ptr.getRefData().setBaseNode(new SceneUtil::PositionAttitudeTransform); // FIXME remove this when physics code is fixed not to depend on basenode
+            ptr.getRefData().setBaseNode(
+                new SceneUtil::PositionAttitudeTransform); // FIXME remove this when physics code is fixed not to depend
+                                                           // on basenode
         setNodeRotation(ptr, rendering, rotation);
 
         if (ptr.getClass().useAnim())
@@ -141,7 +142,8 @@ namespace
     {
         if (const auto object = physics.getObject(ptr))
         {
-            const DetourNavigator::ObjectTransform objectTransform {ptr.getRefData().getPosition(), ptr.getCellRef().getScale()};
+            const DetourNavigator::ObjectTransform objectTransform{ ptr.getRefData().getPosition(),
+                ptr.getCellRef().getScale() };
 
             if (ptr.getClass().isDoor() && !ptr.getCellRef().getTeleport())
             {
@@ -153,40 +155,35 @@ namespace
 
                 const auto distanceFromDoor = world.getMaxActivationDistance() * 0.5f;
                 const auto toPoint = aabbMax.x() - aabbMin.x() < aabbMax.y() - aabbMin.y()
-                        ? btVector3(distanceFromDoor, 0, 0)
-                        : btVector3(0, distanceFromDoor, 0);
+                    ? btVector3(distanceFromDoor, 0, 0)
+                    : btVector3(0, distanceFromDoor, 0);
 
                 const auto transform = object->getTransform();
                 const btTransform closedDoorTransform(
-                    Misc::Convert::makeBulletQuaternion(ptr.getCellRef().getPosition()),
-                    transform.getOrigin()
-                );
+                    Misc::Convert::makeBulletQuaternion(ptr.getCellRef().getPosition()), transform.getOrigin());
 
                 const auto start = Misc::Convert::toOsg(closedDoorTransform(center + toPoint));
                 const auto startPoint = physics.castRay(start, start - osg::Vec3f(0, 0, 1000), ptr, {},
-                    MWPhysics::CollisionType_World | MWPhysics::CollisionType_HeightMap | MWPhysics::CollisionType_Water);
+                    MWPhysics::CollisionType_World | MWPhysics::CollisionType_HeightMap
+                        | MWPhysics::CollisionType_Water);
                 const auto connectionStart = startPoint.mHit ? startPoint.mHitPos : start;
 
                 const auto end = Misc::Convert::toOsg(closedDoorTransform(center - toPoint));
                 const auto endPoint = physics.castRay(end, end - osg::Vec3f(0, 0, 1000), ptr, {},
-                    MWPhysics::CollisionType_World | MWPhysics::CollisionType_HeightMap | MWPhysics::CollisionType_Water);
+                    MWPhysics::CollisionType_World | MWPhysics::CollisionType_HeightMap
+                        | MWPhysics::CollisionType_Water);
                 const auto connectionEnd = endPoint.mHit ? endPoint.mHitPos : end;
 
-                navigator.addObject(
-                    DetourNavigator::ObjectId(object),
-                    DetourNavigator::DoorShapes(object->getShapeInstance(), objectTransform, connectionStart, connectionEnd),
-                    transform,
-                    navigatorUpdateGuard
-                );
+                navigator.addObject(DetourNavigator::ObjectId(object),
+                    DetourNavigator::DoorShapes(
+                        object->getShapeInstance(), objectTransform, connectionStart, connectionEnd),
+                    transform, navigatorUpdateGuard);
             }
             else if (object->getShapeInstance()->mVisualCollisionType == Resource::VisualCollisionType::None)
             {
-                navigator.addObject(
-                    DetourNavigator::ObjectId(object),
-                    DetourNavigator::ObjectShapes(object->getShapeInstance(), objectTransform),
-                    object->getTransform(),
-                    navigatorUpdateGuard
-                );
+                navigator.addObject(DetourNavigator::ObjectId(object),
+                    DetourNavigator::ObjectShapes(object->getShapeInstance(), objectTransform), object->getTransform(),
+                    navigatorUpdateGuard);
             }
         }
         else if (physics.getActor(ptr))
@@ -202,19 +199,21 @@ namespace
 
         std::vector<MWWorld::Ptr> mToInsert;
 
-        InsertVisitor (MWWorld::CellStore& cell, Loading::Listener* loadingListener);
+        InsertVisitor(MWWorld::CellStore& cell, Loading::Listener* loadingListener);
 
-        bool operator() (const MWWorld::Ptr& ptr);
+        bool operator()(const MWWorld::Ptr& ptr);
 
         template <class AddObject>
         void insert(AddObject&& addObject);
     };
 
-    InsertVisitor::InsertVisitor (MWWorld::CellStore& cell, Loading::Listener* loadingListener)
-        : mCell(cell), mLoadingListener(loadingListener)
-    {}
+    InsertVisitor::InsertVisitor(MWWorld::CellStore& cell, Loading::Listener* loadingListener)
+        : mCell(cell)
+        , mLoadingListener(loadingListener)
+    {
+    }
 
-    bool InsertVisitor::operator() (const MWWorld::Ptr& ptr)
+    bool InsertVisitor::operator()(const MWWorld::Ptr& ptr)
     {
         // do not insert directly as we can't modify the cell from within the visitation
         // CreatureLevList::insertObjectRendering may spawn a new creature
@@ -251,7 +250,7 @@ namespace
 
     bool isCellInCollection(int x, int y, MWWorld::Scene::CellStoreCollection& collection)
     {
-        for (auto *cell : collection)
+        for (auto* cell : collection)
         {
             assert(cell->getCell()->isExterior());
             if (x == cell->getCell()->getGridX() && y == cell->getCell()->getGridY())
@@ -270,33 +269,34 @@ namespace
     }
 }
 
-
 namespace MWWorld
 {
 
-    void Scene::removeFromPagedRefs(const Ptr &ptr)
+    void Scene::removeFromPagedRefs(const Ptr& ptr)
     {
         const ESM::RefNum& refnum = ptr.getCellRef().getRefNum();
         if (refnum.hasContentFile() && removeFromSorted(refnum, mPagedRefs))
         {
-            if (!ptr.getRefData().getBaseNode()) return;
-            ptr.getClass().insertObjectRendering(ptr, getModel(ptr, mRendering.getResourceSystem()->getVFS()), mRendering);
+            if (!ptr.getRefData().getBaseNode())
+                return;
+            ptr.getClass().insertObjectRendering(
+                ptr, getModel(ptr, mRendering.getResourceSystem()->getVFS()), mRendering);
             setNodeRotation(ptr, mRendering, makeNodeRotation(ptr, RotationOrder::direct));
             reloadTerrain();
         }
     }
 
-    void Scene::updateObjectRotation(const Ptr &ptr, RotationOrder order)
+    void Scene::updateObjectRotation(const Ptr& ptr, RotationOrder order)
     {
         const auto rot = makeNodeRotation(ptr, order);
         setNodeRotation(ptr, mRendering, rot);
         mPhysics->updateRotation(ptr, rot);
     }
 
-    void Scene::updateObjectScale(const Ptr &ptr)
+    void Scene::updateObjectScale(const Ptr& ptr)
     {
         float scale = ptr.getCellRef().getScale();
-        osg::Vec3f scaleVec (scale, scale, scale);
+        osg::Vec3f scaleVec(scale, scale, scale);
         ptr.getClass().adjustScale(ptr, scaleVec, true);
         mRendering.scaleObject(ptr, scaleVec);
         mPhysics->updateScale(ptr);
@@ -307,7 +307,7 @@ namespace MWWorld
         if (mChangeCellGridRequest.has_value())
         {
             changeCellGrid(mChangeCellGridRequest->mPosition, mChangeCellGridRequest->mCell.x(),
-                           mChangeCellGridRequest->mCell.y(), mChangeCellGridRequest->mChangeEvent);
+                mChangeCellGridRequest->mCell.y(), mChangeCellGridRequest->mChangeEvent);
             mChangeCellGridRequest.reset();
         }
 
@@ -360,21 +360,21 @@ namespace MWWorld
         if (const auto pathgrid = mWorld.getStore().get<ESM::Pathgrid>().search(*cell->getCell()))
             mNavigator.removePathgrid(*pathgrid);
 
-        MWBase::Environment::get().getMechanicsManager()->drop (cell);
+        MWBase::Environment::get().getMechanicsManager()->drop(cell);
 
         mRendering.removeCell(cell);
         MWBase::Environment::get().getWindowManager()->removeCell(cell);
 
-        mWorld.getLocalScripts().clearCell (cell);
+        mWorld.getLocalScripts().clearCell(cell);
 
-        MWBase::Environment::get().getSoundManager()->stopSound (cell);
+        MWBase::Environment::get().getSoundManager()->stopSound(cell);
         mActiveCells.erase(cell);
         // Clean up any effects that may have been spawned while unloading all cells
-        if(mActiveCells.empty())
+        if (mActiveCells.empty())
             mRendering.notifyWorldSpaceChanged();
     }
 
-    void Scene::loadCell(CellStore *cell, Loading::Listener* loadingListener, bool respawn, const osg::Vec3f& position,
+    void Scene::loadCell(CellStore* cell, Loading::Listener* loadingListener, bool respawn, const osg::Vec3f& position,
         const DetourNavigator::UpdateGuard* navigatorUpdateGuard)
     {
         using DetourNavigator::HeightfieldShape;
@@ -395,24 +395,25 @@ namespace MWWorld
             const int worldsize = ESM::Land::REAL_SIZE;
             if (data)
             {
-                mPhysics->addHeightField(data->mHeights, cellX, cellY, worldsize, verts, data->mMinHeight, data->mMaxHeight, land.get());
+                mPhysics->addHeightField(
+                    data->mHeights, cellX, cellY, worldsize, verts, data->mMinHeight, data->mMaxHeight, land.get());
             }
             else
             {
                 static std::vector<float> defaultHeight;
-                defaultHeight.resize(verts*verts, ESM::Land::DEFAULT_HEIGHT);
-                mPhysics->addHeightField(defaultHeight.data(), cellX, cellY, worldsize, verts, ESM::Land::DEFAULT_HEIGHT, ESM::Land::DEFAULT_HEIGHT, land.get());
+                defaultHeight.resize(verts * verts, ESM::Land::DEFAULT_HEIGHT);
+                mPhysics->addHeightField(defaultHeight.data(), cellX, cellY, worldsize, verts,
+                    ESM::Land::DEFAULT_HEIGHT, ESM::Land::DEFAULT_HEIGHT, land.get());
             }
             if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
             {
                 const osg::Vec2i cellPosition(cellX, cellY);
                 const btVector3& origin = heightField->getCollisionObject()->getWorldTransform().getOrigin();
                 const osg::Vec3f shift(origin.x(), origin.y(), origin.z());
-                const HeightfieldShape shape = [&] () -> HeightfieldShape
-                {
+                const HeightfieldShape shape = [&]() -> HeightfieldShape {
                     if (data == nullptr)
                     {
-                        return DetourNavigator::HeightfieldPlane {static_cast<float>(ESM::Land::DEFAULT_HEIGHT)};
+                        return DetourNavigator::HeightfieldPlane{ static_cast<float>(ESM::Land::DEFAULT_HEIGHT) };
                     }
                     else
                     {
@@ -423,7 +424,7 @@ namespace MWWorld
                         heights.mMaxHeight = data->mMaxHeight;
                         return heights;
                     }
-                } ();
+                }();
                 mNavigator.addHeightfield(cellPosition, ESM::Land::REAL_SIZE, shape, navigatorUpdateGuard);
             }
         }
@@ -433,7 +434,7 @@ namespace MWWorld
 
         // register local scripts
         // do this before insertCell, to make sure we don't add scripts from levelled creature spawning twice
-        mWorld.getLocalScripts().addCell (cell);
+        mWorld.getLocalScripts().addCell(cell);
 
         if (respawn)
             cell->respawn();
@@ -454,13 +455,13 @@ namespace MWWorld
             if (cell->getCell()->isExterior())
             {
                 if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
-                    mNavigator.addWater(osg::Vec2i(cellX, cellY), ESM::Land::REAL_SIZE, waterLevel,
-                                        navigatorUpdateGuard);
+                    mNavigator.addWater(
+                        osg::Vec2i(cellX, cellY), ESM::Land::REAL_SIZE, waterLevel, navigatorUpdateGuard);
             }
             else
             {
-                mNavigator.addWater(osg::Vec2i(cellX, cellY), std::numeric_limits<int>::max(), waterLevel,
-                                    navigatorUpdateGuard);
+                mNavigator.addWater(
+                    osg::Vec2i(cellX, cellY), std::numeric_limits<int>::max(), waterLevel, navigatorUpdateGuard);
             }
         }
         else
@@ -475,7 +476,7 @@ namespace MWWorld
     void Scene::clear()
     {
         auto navigatorUpdateGuard = mNavigator.makeUpdateGuard();
-        for (auto iter = mActiveCells.begin(); iter!=mActiveCells.end(); )
+        for (auto iter = mActiveCells.begin(); iter != mActiveCells.end();)
         {
             auto* cell = *iter++;
             unloadCell(cell, navigatorUpdateGuard.get());
@@ -489,24 +490,26 @@ namespace MWWorld
 
     osg::Vec4i Scene::gridCenterToBounds(const osg::Vec2i& centerCell) const
     {
-        return osg::Vec4i(centerCell.x()-mHalfGridSize,centerCell.y()-mHalfGridSize,centerCell.x()+mHalfGridSize+1,centerCell.y()+mHalfGridSize+1);
+        return osg::Vec4i(centerCell.x() - mHalfGridSize, centerCell.y() - mHalfGridSize,
+            centerCell.x() + mHalfGridSize + 1, centerCell.y() + mHalfGridSize + 1);
     }
 
-    osg::Vec2i Scene::getNewGridCenter(const osg::Vec3f &pos, const osg::Vec2i* currentGridCenter) const
+    osg::Vec2i Scene::getNewGridCenter(const osg::Vec3f& pos, const osg::Vec2i* currentGridCenter) const
     {
         if (currentGridCenter)
         {
             float centerX, centerY;
             mWorld.indexToPosition(currentGridCenter->x(), currentGridCenter->y(), centerX, centerY, true);
-            float distance = std::max(std::abs(centerX-pos.x()), std::abs(centerY-pos.y()));
-            const float maxDistance = Constants::CellSizeInUnits / 2 + mCellLoadingThreshold; // 1/2 cell size + threshold
+            float distance = std::max(std::abs(centerX - pos.x()), std::abs(centerY - pos.y()));
+            const float maxDistance
+                = Constants::CellSizeInUnits / 2 + mCellLoadingThreshold; // 1/2 cell size + threshold
             if (distance <= maxDistance)
                 return *currentGridCenter;
         }
         return positionToCellIndex(pos.x(), pos.y());
     }
 
-    void Scene::playerMoved(const osg::Vec3f &pos)
+    void Scene::playerMoved(const osg::Vec3f& pos)
     {
         if (!mCurrentCell || !mCurrentCell->isExterior())
             return;
@@ -516,16 +519,16 @@ namespace MWWorld
             requestChangeCellGrid(pos, newCell);
     }
 
-    void Scene::requestChangeCellGrid(const osg::Vec3f &position, const osg::Vec2i& cell, bool changeEvent)
+    void Scene::requestChangeCellGrid(const osg::Vec3f& position, const osg::Vec2i& cell, bool changeEvent)
     {
-        mChangeCellGridRequest = ChangeCellGridRequest {position, cell, changeEvent};
+        mChangeCellGridRequest = ChangeCellGridRequest{ position, cell, changeEvent };
     }
 
-    void Scene::changeCellGrid (const osg::Vec3f &pos, int playerCellX, int playerCellY, bool changeEvent)
+    void Scene::changeCellGrid(const osg::Vec3f& pos, int playerCellX, int playerCellY, bool changeEvent)
     {
         auto navigatorUpdateGuard = mNavigator.makeUpdateGuard();
 
-        for (auto iter = mActiveCells.begin(); iter != mActiveCells.end(); )
+        for (auto iter = mActiveCells.begin(); iter != mActiveCells.end();)
         {
             auto* cell = *iter++;
             if (cell->getCell()->isExterior())
@@ -539,8 +542,8 @@ namespace MWWorld
                 unloadCell(cell, navigatorUpdateGuard.get());
         }
 
-        mNavigator.setWorldspace(mWorld.getExterior(playerCellX, playerCellY)->getCell()->mCellId.mWorldspace,
-                                 navigatorUpdateGuard.get());
+        mNavigator.setWorldspace(
+            mWorld.getExterior(playerCellX, playerCellY)->getCell()->mCellId.mWorldspace, navigatorUpdateGuard.get());
         mNavigator.updateBounds(pos, navigatorUpdateGuard.get());
 
         mCurrentGridCenter = osg::Vec2i(playerCellX, playerCellY);
@@ -555,8 +558,7 @@ namespace MWWorld
         mRendering.getPagedRefnums(newGrid, mPagedRefs);
 
         std::size_t refsToLoad = 0;
-        const auto cellsToLoad = [&] (CellStoreCollection& collection, int range) -> std::vector<std::pair<int,int>>
-        {
+        const auto cellsToLoad = [&](CellStoreCollection& collection, int range) -> std::vector<std::pair<int, int>> {
             std::vector<std::pair<int, int>> cellsPositionsToLoad;
             for (int x = playerCellX - range; x <= playerCellX + range; ++x)
             {
@@ -574,7 +576,7 @@ namespace MWWorld
 
         addPostponedPhysicsObjects();
 
-        auto cellsPositionsToLoad = cellsToLoad(mActiveCells,mHalfGridSize);
+        auto cellsPositionsToLoad = cellsToLoad(mActiveCells, mHalfGridSize);
 
         Loading::Listener* loadingListener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         Loading::ScopedLoad load(loadingListener);
@@ -582,26 +584,24 @@ namespace MWWorld
         loadingListener->setLabel(loadingExteriorText);
         loadingListener->setProgressRange(refsToLoad);
 
-        const auto getDistanceToPlayerCell = [&] (const std::pair<int, int>& cellPosition)
-        {
+        const auto getDistanceToPlayerCell = [&](const std::pair<int, int>& cellPosition) {
             return std::abs(cellPosition.first - playerCellX) + std::abs(cellPosition.second - playerCellY);
         };
 
-        const auto getCellPositionPriority = [&] (const std::pair<int, int>& cellPosition)
-        {
+        const auto getCellPositionPriority = [&](const std::pair<int, int>& cellPosition) {
             return std::make_pair(getDistanceToPlayerCell(cellPosition), getCellPositionDistanceToOrigin(cellPosition));
         };
 
         std::sort(cellsPositionsToLoad.begin(), cellsPositionsToLoad.end(),
-            [&] (const std::pair<int, int>& lhs, const std::pair<int, int>& rhs) {
+            [&](const std::pair<int, int>& lhs, const std::pair<int, int>& rhs) {
                 return getCellPositionPriority(lhs) < getCellPositionPriority(rhs);
             });
 
-        for (const auto& [x,y] : cellsPositionsToLoad)
+        for (const auto& [x, y] : cellsPositionsToLoad)
         {
             if (!isCellInCollection(x, y, mActiveCells))
             {
-                CellStore *cell = mWorld.getExterior(x, y);
+                CellStore* cell = mWorld.getExterior(x, y);
                 loadCell(cell, loadingListener, changeEvent, pos, navigatorUpdateGuard.get());
             }
         }
@@ -621,11 +621,10 @@ namespace MWWorld
 
     void Scene::addPostponedPhysicsObjects()
     {
-        for(const auto& cell : mActiveCells)
+        for (const auto& cell : mActiveCells)
         {
-            cell->forEach([&](const MWWorld::Ptr& ptr)
-            {
-                if(ptr.mRef->mData.mPhysicsPostponed)
+            cell->forEach([&](const MWWorld::Ptr& ptr) {
+                if (ptr.mRef->mData.mPhysicsPostponed)
                 {
                     ptr.mRef->mData.mPhysicsPostponed = false;
                     if (ptr.mRef->mData.isEnabled() && ptr.mRef->mData.getCount() > 0)
@@ -650,7 +649,7 @@ namespace MWWorld
 
         mRendering.getResourceSystem()->setExpiryDelay(1.f);
 
-        const MWWorld::Store<ESM::Cell> &cells = mWorld.getStore().get<ESM::Cell>();
+        const MWWorld::Store<ESM::Cell>& cells = mWorld.getStore().get<ESM::Cell>();
 
         Loading::Listener* loadingListener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         Loading::ScopedLoad load(loadingListener);
@@ -661,11 +660,13 @@ namespace MWWorld
         auto navigatorUpdateGuard = mNavigator.makeUpdateGuard();
         for (; it != cells.extEnd(); ++it)
         {
-            loadingListener->setLabel("Testing exterior cells ("+std::to_string(i)+"/"+std::to_string(cells.getExtSize())+")...");
+            loadingListener->setLabel(
+                "Testing exterior cells (" + std::to_string(i) + "/" + std::to_string(cells.getExtSize()) + ")...");
 
-            CellStore *cell = mWorld.getExterior(it->mData.mX, it->mData.mY);
+            CellStore* cell = mWorld.getExterior(it->mData.mX, it->mData.mY);
             mNavigator.setWorldspace(cell->getCell()->mCellId.mWorldspace, navigatorUpdateGuard.get());
-            const osg::Vec3f position = osg::Vec3f(it->mData.mX + 0.5f, it->mData.mY + 0.5f, 0) * Constants::CellSizeInUnits;
+            const osg::Vec3f position
+                = osg::Vec3f(it->mData.mX + 0.5f, it->mData.mY + 0.5f, 0) * Constants::CellSizeInUnits;
             mNavigator.updateBounds(position, navigatorUpdateGuard.get());
             loadCell(cell, nullptr, false, position, navigatorUpdateGuard.get());
 
@@ -677,8 +678,8 @@ namespace MWWorld
             auto iter = mActiveCells.begin();
             while (iter != mActiveCells.end())
             {
-                if (it->isExterior() && it->mData.mX == (*iter)->getCell()->getGridX() &&
-                    it->mData.mY == (*iter)->getCell()->getGridY())
+                if (it->isExterior() && it->mData.mX == (*iter)->getCell()->getGridX()
+                    && it->mData.mY == (*iter)->getCell()->getGridY())
                 {
                     unloadCell(*iter, navigatorUpdateGuard.get());
                     break;
@@ -689,11 +690,12 @@ namespace MWWorld
 
             mRendering.getResourceSystem()->updateCache(mRendering.getReferenceTime());
 
-            loadingListener->increaseProgress (1);
+            loadingListener->increaseProgress(1);
             i++;
         }
 
-        mRendering.getResourceSystem()->getSceneManager()->setIncrementalCompileOperation(mRendering.getIncrementalCompileOperation());
+        mRendering.getResourceSystem()->getSceneManager()->setIncrementalCompileOperation(
+            mRendering.getIncrementalCompileOperation());
         mRendering.getResourceSystem()->setExpiryDelay(Settings::Manager::getFloat("cache expiry delay", "Cells"));
     }
 
@@ -704,7 +706,7 @@ namespace MWWorld
 
         mRendering.getResourceSystem()->setExpiryDelay(1.f);
 
-        const MWWorld::Store<ESM::Cell> &cells = mWorld.getStore().get<ESM::Cell>();
+        const MWWorld::Store<ESM::Cell>& cells = mWorld.getStore().get<ESM::Cell>();
 
         Loading::Listener* loadingListener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         Loading::ScopedLoad load(loadingListener);
@@ -715,9 +717,10 @@ namespace MWWorld
         auto navigatorUpdateGuard = mNavigator.makeUpdateGuard();
         for (; it != cells.intEnd(); ++it)
         {
-            loadingListener->setLabel("Testing interior cells ("+std::to_string(i)+"/"+std::to_string(cells.getIntSize())+")...");
+            loadingListener->setLabel(
+                "Testing interior cells (" + std::to_string(i) + "/" + std::to_string(cells.getIntSize()) + ")...");
 
-            CellStore *cell = mWorld.getInterior(it->mName);
+            CellStore* cell = mWorld.getInterior(it->mName);
             mNavigator.setWorldspace(cell->getCell()->mCellId.mWorldspace, navigatorUpdateGuard.get());
             ESM::Position position;
             mWorld.findInteriorPosition(it->mName, position);
@@ -732,7 +735,7 @@ namespace MWWorld
             auto iter = mActiveCells.begin();
             while (iter != mActiveCells.end())
             {
-                assert (!(*iter)->getCell()->isExterior());
+                assert(!(*iter)->getCell()->isExterior());
 
                 if (it->mName == (*iter)->getCell()->mName)
                 {
@@ -745,15 +748,16 @@ namespace MWWorld
 
             mRendering.getResourceSystem()->updateCache(mRendering.getReferenceTime());
 
-            loadingListener->increaseProgress (1);
+            loadingListener->increaseProgress(1);
             i++;
         }
 
-        mRendering.getResourceSystem()->getSceneManager()->setIncrementalCompileOperation(mRendering.getIncrementalCompileOperation());
+        mRendering.getResourceSystem()->getSceneManager()->setIncrementalCompileOperation(
+            mRendering.getIncrementalCompileOperation());
         mRendering.getResourceSystem()->setExpiryDelay(Settings::Manager::getFloat("cache expiry delay", "Cells"));
     }
 
-    void Scene::changePlayerCell(CellStore *cell, const ESM::Position &pos, bool adjustPlayerPos)
+    void Scene::changePlayerCell(CellStore* cell, const ESM::Position& pos, bool adjustPlayerPos)
     {
         mCurrentCell = cell;
 
@@ -788,19 +792,24 @@ namespace MWWorld
         mLastPlayerPos = player.getRefData().getPosition().asVec3();
     }
 
-    Scene::Scene(MWWorld::World& world, MWRender::RenderingManager& rendering, MWPhysics::PhysicsSystem *physics,
-                  DetourNavigator::Navigator& navigator)
-    : mCurrentCell (nullptr), mCellChanged (false)
-    , mWorld(world), mPhysics(physics), mRendering(rendering), mNavigator(navigator)
-    , mCellLoadingThreshold(1024.f)
-    , mPreloadDistance(Settings::Manager::getInt("preload distance", "Cells"))
-    , mPreloadEnabled(Settings::Manager::getBool("preload enabled", "Cells"))
-    , mPreloadExteriorGrid(Settings::Manager::getBool("preload exterior grid", "Cells"))
-    , mPreloadDoors(Settings::Manager::getBool("preload doors", "Cells"))
-    , mPreloadFastTravel(Settings::Manager::getBool("preload fast travel", "Cells"))
-    , mPredictionTime(Settings::Manager::getFloat("prediction time", "Cells"))
+    Scene::Scene(MWWorld::World& world, MWRender::RenderingManager& rendering, MWPhysics::PhysicsSystem* physics,
+        DetourNavigator::Navigator& navigator)
+        : mCurrentCell(nullptr)
+        , mCellChanged(false)
+        , mWorld(world)
+        , mPhysics(physics)
+        , mRendering(rendering)
+        , mNavigator(navigator)
+        , mCellLoadingThreshold(1024.f)
+        , mPreloadDistance(Settings::Manager::getInt("preload distance", "Cells"))
+        , mPreloadEnabled(Settings::Manager::getBool("preload enabled", "Cells"))
+        , mPreloadExteriorGrid(Settings::Manager::getBool("preload exterior grid", "Cells"))
+        , mPreloadDoors(Settings::Manager::getBool("preload doors", "Cells"))
+        , mPreloadFastTravel(Settings::Manager::getBool("preload fast travel", "Cells"))
+        , mPredictionTime(Settings::Manager::getFloat("prediction time", "Cells"))
     {
-        mPreloader = std::make_unique<CellPreloader>(rendering.getResourceSystem(), physics->getShapeManager(), rendering.getTerrain(), rendering.getLandManager());
+        mPreloader = std::make_unique<CellPreloader>(rendering.getResourceSystem(), physics->getShapeManager(),
+            rendering.getTerrain(), rendering.getLandManager());
         mPreloader->setWorkQueue(mRendering.getWorkQueue());
 
         rendering.getResourceSystem()->setExpiryDelay(Settings::Manager::getFloat("cache expiry delay", "Cells"));
@@ -830,9 +839,10 @@ namespace MWWorld
         return mActiveCells;
     }
 
-    void Scene::changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
+    void Scene::changeToInteriorCell(
+        const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
     {
-        CellStore *cell = mWorld.getInterior(cellName);
+        CellStore* cell = mWorld.getInterior(cellName);
         bool useFading = (mCurrentCell != nullptr);
         if (useFading)
             MWBase::Environment::get().getWindowManager()->fadeScreenOut(0.5);
@@ -842,7 +852,7 @@ namespace MWWorld
         loadingListener->setLabel(loadingInteriorText);
         Loading::ScopedLoad load(loadingListener);
 
-        if(mCurrentCell != nullptr && *mCurrentCell == *cell)
+        if (mCurrentCell != nullptr && *mCurrentCell == *cell)
         {
             mWorld.moveObject(mWorld.getPlayerPtr(), position.asVec3());
             mWorld.rotateObject(mWorld.getPlayerPtr(), position.asRotationVec3());
@@ -858,7 +868,7 @@ namespace MWWorld
         auto navigatorUpdateGuard = mNavigator.makeUpdateGuard();
 
         // unload
-        for (auto iter = mActiveCells.begin(); iter!=mActiveCells.end(); )
+        for (auto iter = mActiveCells.begin(); iter != mActiveCells.end();)
         {
             auto* cellToUnload = *iter++;
             unloadCell(cellToUnload, navigatorUpdateGuard.get());
@@ -894,10 +904,11 @@ namespace MWWorld
 
         MWBase::Environment::get().getWindowManager()->changeCell(mCurrentCell);
 
-        MWBase::Environment::get().getWorld()->getPostProcessor()->setExteriorFlag(cell->getCell()->mData.mFlags & ESM::Cell::QuasiEx);
+        MWBase::Environment::get().getWorld()->getPostProcessor()->setExteriorFlag(
+            cell->getCell()->mData.mFlags & ESM::Cell::QuasiEx);
     }
 
-    void Scene::changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
+    void Scene::changeToExteriorCell(const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
     {
         const osg::Vec2i cellIndex = positionToCellIndex(position.pos[0], position.pos[1]);
 
@@ -915,7 +926,7 @@ namespace MWWorld
         MWBase::Environment::get().getWorld()->getPostProcessor()->setExteriorFlag(true);
     }
 
-    CellStore* Scene::getCurrentCell ()
+    CellStore* Scene::getCurrentCell()
     {
         return mCurrentCell;
     }
@@ -925,16 +936,18 @@ namespace MWWorld
         mCellChanged = false;
     }
 
-    void Scene::insertCell(CellStore &cell, Loading::Listener* loadingListener,
-        const DetourNavigator::UpdateGuard* navigatorUpdateGuard)
+    void Scene::insertCell(
+        CellStore& cell, Loading::Listener* loadingListener, const DetourNavigator::UpdateGuard* navigatorUpdateGuard)
     {
         InsertVisitor insertVisitor(cell, loadingListener);
-        cell.forEach (insertVisitor);
-        insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, mWorld, mPagedRefs, *mPhysics, mRendering); });
-        insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, mWorld, *mPhysics, mNavigator, navigatorUpdateGuard); });
+        cell.forEach(insertVisitor);
+        insertVisitor.insert(
+            [&](const MWWorld::Ptr& ptr) { addObject(ptr, mWorld, mPagedRefs, *mPhysics, mRendering); });
+        insertVisitor.insert(
+            [&](const MWWorld::Ptr& ptr) { addObject(ptr, mWorld, *mPhysics, mNavigator, navigatorUpdateGuard); });
     }
 
-    void Scene::addObjectToScene (const Ptr& ptr)
+    void Scene::addObjectToScene(const Ptr& ptr)
     {
         try
         {
@@ -948,9 +961,9 @@ namespace MWWorld
         }
     }
 
-    void Scene::removeObjectFromScene (const Ptr& ptr, bool keepActive)
+    void Scene::removeObjectFromScene(const Ptr& ptr, bool keepActive)
     {
-        MWBase::Environment::get().getMechanicsManager()->remove (ptr, keepActive);
+        MWBase::Environment::get().getMechanicsManager()->remove(ptr, keepActive);
         // You'd expect the sounds attached to the object to be stopped here
         // because the object is nowhere to be heard, but in Morrowind, they're not.
         // They're still stopped when the cell is unloaded
@@ -967,17 +980,19 @@ namespace MWWorld
             mNavigator.removeAgent(mWorld.getPathfindingAgentBounds(ptr));
         }
         mPhysics->remove(ptr);
-        mRendering.removeObject (ptr);
+        mRendering.removeObject(ptr);
         if (ptr.getClass().isActor())
             mRendering.removeWaterRippleEmitter(ptr);
         ptr.getRefData().setBaseNode(nullptr);
     }
 
-    bool Scene::isCellActive(const CellStore &cell)
+    bool Scene::isCellActive(const CellStore& cell)
     {
         CellStoreCollection::iterator active = mActiveCells.begin();
-        while (active != mActiveCells.end()) {
-            if (**active == cell) {
+        while (active != mActiveCells.end())
+        {
+            if (**active == cell)
+            {
                 return true;
             }
             ++active;
@@ -985,11 +1000,10 @@ namespace MWWorld
         return false;
     }
 
-    Ptr Scene::searchPtrViaActorId (int actorId)
+    Ptr Scene::searchPtrViaActorId(int actorId)
     {
-        for (CellStoreCollection::const_iterator iter (mActiveCells.begin());
-            iter!=mActiveCells.end(); ++iter)
-            if (Ptr ptr = (*iter)->searchViaActorId (actorId))
+        for (CellStoreCollection::const_iterator iter(mActiveCells.begin()); iter != mActiveCells.end(); ++iter)
+            if (Ptr ptr = (*iter)->searchViaActorId(actorId))
                 return ptr;
 
         return Ptr();
@@ -999,7 +1013,8 @@ namespace MWWorld
     {
     public:
         PreloadMeshItem(const std::string& mesh, Resource::SceneManager* sceneManager)
-            : mMesh(mesh), mSceneManager(sceneManager)
+            : mMesh(mesh)
+            , mSceneManager(sceneManager)
         {
         }
 
@@ -1017,18 +1032,15 @@ namespace MWWorld
             }
         }
 
-        void abort() override
-        {
-            mAborted = true;
-        }
+        void abort() override { mAborted = true; }
 
     private:
         std::string mMesh;
         Resource::SceneManager* mSceneManager;
-        std::atomic_bool mAborted {false};
+        std::atomic_bool mAborted{ false };
     };
 
-    void Scene::preload(const std::string &mesh, bool useAnim)
+    void Scene::preload(const std::string& mesh, bool useAnim)
     {
         std::string mesh_ = mesh;
         if (useAnim)
@@ -1036,9 +1048,10 @@ namespace MWWorld
 
         if (!mRendering.getResourceSystem()->getSceneManager()->checkLoaded(mesh_, mRendering.getReferenceTime()))
         {
-            osg::ref_ptr<PreloadMeshItem> item(new PreloadMeshItem(mesh_, mRendering.getResourceSystem()->getSceneManager()));
+            osg::ref_ptr<PreloadMeshItem> item(
+                new PreloadMeshItem(mesh_, mRendering.getResourceSystem()->getSceneManager()));
             mRendering.getWorkQueue()->addWorkItem(item);
-            const auto isDone = [] (const osg::ref_ptr<SceneUtil::WorkItem>& v) { return v->isDone(); };
+            const auto isDone = [](const osg::ref_ptr<SceneUtil::WorkItem>& v) { return v->isDone(); };
             mWorkItems.erase(std::remove_if(mWorkItems.begin(), mWorkItems.end(), isDone), mWorkItems.end());
             mWorkItems.emplace_back(std::move(item));
         }
@@ -1046,7 +1059,8 @@ namespace MWWorld
 
     void Scene::preloadCells(float dt)
     {
-        if (dt<=1e-06) return;
+        if (dt <= 1e-06)
+            return;
         std::vector<PositionCellGrid> exteriorPositions;
 
         const MWWorld::ConstPtr player = mWorld.getPlayerPtr();
@@ -1055,7 +1069,8 @@ namespace MWWorld
         osg::Vec3f predictedPos = playerPos + moved / dt * mPredictionTime;
 
         if (mCurrentCell->isExterior())
-            exteriorPositions.emplace_back(predictedPos, gridCenterToBounds(getNewGridCenter(predictedPos, &mCurrentGridCenter)));
+            exteriorPositions.emplace_back(
+                predictedPos, gridCenterToBounds(getNewGridCenter(predictedPos, &mCurrentGridCenter)));
 
         mLastPlayerPos = playerPos;
 
@@ -1072,13 +1087,14 @@ namespace MWWorld
         mPreloader->setTerrainPreloadPositions(exteriorPositions);
     }
 
-    void Scene::preloadTeleportDoorDestinations(const osg::Vec3f& playerPos, const osg::Vec3f& predictedPos, std::vector<PositionCellGrid>& exteriorPositions)
+    void Scene::preloadTeleportDoorDestinations(
+        const osg::Vec3f& playerPos, const osg::Vec3f& predictedPos, std::vector<PositionCellGrid>& exteriorPositions)
     {
         std::vector<MWWorld::ConstPtr> teleportDoors;
         for (const MWWorld::CellStore* cellStore : mActiveCells)
         {
             typedef MWWorld::CellRefList<ESM::Door>::List DoorList;
-            const DoorList &doors = cellStore->getReadOnlyDoors().mList;
+            const DoorList& doors = cellStore->getReadOnlyDoors().mList;
             for (auto& door : doors)
             {
                 if (!door.mRef.getTeleport())
@@ -1092,9 +1108,10 @@ namespace MWWorld
         for (const MWWorld::ConstPtr& door : teleportDoors)
         {
             float sqrDistToPlayer = (playerPos - door.getRefData().getPosition().asVec3()).length2();
-            sqrDistToPlayer = std::min(sqrDistToPlayer, (predictedPos - door.getRefData().getPosition().asVec3()).length2());
+            sqrDistToPlayer
+                = std::min(sqrDistToPlayer, (predictedPos - door.getRefData().getPosition().asVec3()).length2());
 
-            if (sqrDistToPlayer < mPreloadDistance*mPreloadDistance)
+            if (sqrDistToPlayer < mPreloadDistance * mPreloadDistance)
             {
                 try
                 {
@@ -1123,9 +1140,9 @@ namespace MWWorld
 
         int halfGridSizePlusOne = mHalfGridSize + 1;
 
-
-        int cellX,cellY;
-        cellX = mCurrentGridCenter.x(); cellY = mCurrentGridCenter.y();
+        int cellX, cellY;
+        cellX = mCurrentGridCenter.x();
+        cellY = mCurrentGridCenter.y();
 
         float centerX, centerY;
         mWorld.indexToPosition(cellX, cellY, centerX, centerY, true);
@@ -1134,23 +1151,28 @@ namespace MWWorld
         {
             for (int dy = -halfGridSizePlusOne; dy <= halfGridSizePlusOne; ++dy)
             {
-                if (dy != halfGridSizePlusOne && dy != -halfGridSizePlusOne && dx != halfGridSizePlusOne && dx != -halfGridSizePlusOne)
+                if (dy != halfGridSizePlusOne && dy != -halfGridSizePlusOne && dx != halfGridSizePlusOne
+                    && dx != -halfGridSizePlusOne)
                     continue; // only care about the outer (not yet loaded) part of the grid
 
                 float thisCellCenterX, thisCellCenterY;
-                mWorld.indexToPosition(cellX+dx, cellY+dy, thisCellCenterX, thisCellCenterY, true);
+                mWorld.indexToPosition(cellX + dx, cellY + dy, thisCellCenterX, thisCellCenterY, true);
 
-                float dist = std::max(std::abs(thisCellCenterX - playerPos.x()), std::abs(thisCellCenterY - playerPos.y()));
-                dist = std::min(dist,std::max(std::abs(thisCellCenterX - predictedPos.x()), std::abs(thisCellCenterY - predictedPos.y())));
-                float loadDist = Constants::CellSizeInUnits / 2 + Constants::CellSizeInUnits - mCellLoadingThreshold + mPreloadDistance;
+                float dist
+                    = std::max(std::abs(thisCellCenterX - playerPos.x()), std::abs(thisCellCenterY - playerPos.y()));
+                dist = std::min(dist,
+                    std::max(
+                        std::abs(thisCellCenterX - predictedPos.x()), std::abs(thisCellCenterY - predictedPos.y())));
+                float loadDist = Constants::CellSizeInUnits / 2 + Constants::CellSizeInUnits - mCellLoadingThreshold
+                    + mPreloadDistance;
 
                 if (dist < loadDist)
-                    preloadCell(mWorld.getExterior(cellX+dx, cellY+dy));
+                    preloadCell(mWorld.getExterior(cellX + dx, cellY + dy));
             }
         }
     }
 
-    void Scene::preloadCell(CellStore *cell, bool preloadSurrounding)
+    void Scene::preloadCell(CellStore* cell, bool preloadSurrounding)
     {
         if (preloadSurrounding && cell->isExterior())
         {
@@ -1161,7 +1183,7 @@ namespace MWWorld
             {
                 for (int dy = -mHalfGridSize; dy <= mHalfGridSize; ++dy)
                 {
-                    mPreloader->preload(mWorld.getExterior(x+dx, y+dy), mRendering.getReferenceTime());
+                    mPreloader->preload(mWorld.getExterior(x + dx, y + dy), mRendering.getReferenceTime());
                     if (++numpreloaded >= mPreloader->getMaxCacheSize())
                         break;
                 }
@@ -1171,20 +1193,23 @@ namespace MWWorld
             mPreloader->preload(cell, mRendering.getReferenceTime());
     }
 
-    void Scene::preloadTerrain(const osg::Vec3f &pos, bool sync)
+    void Scene::preloadTerrain(const osg::Vec3f& pos, bool sync)
     {
         std::vector<PositionCellGrid> vec;
         vec.emplace_back(pos, gridCenterToBounds(getNewGridCenter(pos)));
         mPreloader->abortTerrainPreloadExcept(vec.data());
         mPreloader->setTerrainPreloadPositions(vec);
-        if (!sync) return;
+        if (!sync)
+            return;
 
         Loading::Listener* loadingListener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         Loading::ScopedLoad load(loadingListener);
 
         loadingListener->setLabel("#{sLoadingMessage4}");
 
-        while (!mPreloader->syncTerrainLoad(vec, mRendering.getReferenceTime(), *loadingListener)) {}
+        while (!mPreloader->syncTerrainLoad(vec, mRendering.getReferenceTime(), *loadingListener))
+        {
+        }
     }
 
     void Scene::reloadTerrain()
@@ -1222,7 +1247,9 @@ namespace MWWorld
         std::vector<ESM::Transport::Dest> mList;
     };
 
-    void Scene::preloadFastTravelDestinations(const osg::Vec3f& playerPos, const osg::Vec3f& /*predictedPos*/, std::vector<PositionCellGrid>& exteriorPositions) // ignore predictedPos here since opening dialogue with travel service takes extra time
+    void Scene::preloadFastTravelDestinations(const osg::Vec3f& playerPos, const osg::Vec3f& /*predictedPos*/,
+        std::vector<PositionCellGrid>&
+            exteriorPositions) // ignore predictedPos here since opening dialogue with travel service takes extra time
     {
         const MWWorld::ConstPtr player = mWorld.getPlayerPtr();
         ListFastTravelDestinationsVisitor listVisitor(mPreloadDistance, player.getRefData().getPosition().asVec3());
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index d1f8611ea4..5b2fdca317 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -1,17 +1,17 @@
 #ifndef GAME_MWWORLD_SCENE_H
 #define GAME_MWWORLD_SCENE_H
 
-#include <osg/Vec4i>
 #include <osg/Vec2i>
+#include <osg/Vec4i>
 #include <osg/ref_ptr>
 
 #include "ptr.hpp"
 
-#include <set>
 #include <memory>
+#include <optional>
+#include <set>
 #include <unordered_map>
 #include <vector>
-#include <optional>
 
 #include <components/misc/constants.hpp>
 
@@ -72,131 +72,133 @@ namespace MWWorld
 
     class Scene
     {
-        public:
-            using CellStoreCollection = std::set<CellStore *>;
-
-        private:
-            struct ChangeCellGridRequest
-            {
-                osg::Vec3f mPosition;
-                osg::Vec2i mCell;
-                bool mChangeEvent;
-            };
+    public:
+        using CellStoreCollection = std::set<CellStore*>;
 
-            CellStore* mCurrentCell; // the cell the player is in
-            CellStoreCollection mActiveCells;
-            bool mCellChanged;
-            bool mCellLoaded = false;
-            MWWorld::World& mWorld;
-            MWPhysics::PhysicsSystem *mPhysics;
-            MWRender::RenderingManager& mRendering;
-            DetourNavigator::Navigator& mNavigator;
-            std::unique_ptr<CellPreloader> mPreloader;
-            float mCellLoadingThreshold;
-            float mPreloadDistance;
-            bool mPreloadEnabled;
+    private:
+        struct ChangeCellGridRequest
+        {
+            osg::Vec3f mPosition;
+            osg::Vec2i mCell;
+            bool mChangeEvent;
+        };
 
-            bool mPreloadExteriorGrid;
-            bool mPreloadDoors;
-            bool mPreloadFastTravel;
-            float mPredictionTime;
+        CellStore* mCurrentCell; // the cell the player is in
+        CellStoreCollection mActiveCells;
+        bool mCellChanged;
+        bool mCellLoaded = false;
+        MWWorld::World& mWorld;
+        MWPhysics::PhysicsSystem* mPhysics;
+        MWRender::RenderingManager& mRendering;
+        DetourNavigator::Navigator& mNavigator;
+        std::unique_ptr<CellPreloader> mPreloader;
+        float mCellLoadingThreshold;
+        float mPreloadDistance;
+        bool mPreloadEnabled;
 
-            static const int mHalfGridSize = Constants::CellGridRadius;
+        bool mPreloadExteriorGrid;
+        bool mPreloadDoors;
+        bool mPreloadFastTravel;
+        float mPredictionTime;
 
-            osg::Vec3f mLastPlayerPos;
+        static const int mHalfGridSize = Constants::CellGridRadius;
 
-            std::vector<ESM::RefNum> mPagedRefs;
+        osg::Vec3f mLastPlayerPos;
 
-            std::vector<osg::ref_ptr<SceneUtil::WorkItem>> mWorkItems;
+        std::vector<ESM::RefNum> mPagedRefs;
 
-            std::optional<ChangeCellGridRequest> mChangeCellGridRequest;
+        std::vector<osg::ref_ptr<SceneUtil::WorkItem>> mWorkItems;
 
-            void insertCell(CellStore &cell, Loading::Listener* loadingListener,
-                const DetourNavigator::UpdateGuard* navigatorUpdateGuard);
+        std::optional<ChangeCellGridRequest> mChangeCellGridRequest;
 
-            osg::Vec2i mCurrentGridCenter;
+        void insertCell(CellStore& cell, Loading::Listener* loadingListener,
+            const DetourNavigator::UpdateGuard* navigatorUpdateGuard);
 
-            // Load and unload cells as necessary to create a cell grid with "X" and "Y" in the center
-            void changeCellGrid (const osg::Vec3f &pos, int playerCellX, int playerCellY, bool changeEvent = true);
+        osg::Vec2i mCurrentGridCenter;
 
-            void requestChangeCellGrid(const osg::Vec3f &position, const osg::Vec2i& cell, bool changeEvent = true);
+        // Load and unload cells as necessary to create a cell grid with "X" and "Y" in the center
+        void changeCellGrid(const osg::Vec3f& pos, int playerCellX, int playerCellY, bool changeEvent = true);
 
-            typedef std::pair<osg::Vec3f, osg::Vec4i> PositionCellGrid;
+        void requestChangeCellGrid(const osg::Vec3f& position, const osg::Vec2i& cell, bool changeEvent = true);
 
-            void preloadCells(float dt);
-            void preloadTeleportDoorDestinations(const osg::Vec3f& playerPos, const osg::Vec3f& predictedPos, std::vector<PositionCellGrid>& exteriorPositions);
-            void preloadExteriorGrid(const osg::Vec3f& playerPos, const osg::Vec3f& predictedPos);
-            void preloadFastTravelDestinations(const osg::Vec3f& playerPos, const osg::Vec3f& predictedPos, std::vector<PositionCellGrid>& exteriorPositions);
+        typedef std::pair<osg::Vec3f, osg::Vec4i> PositionCellGrid;
 
-            osg::Vec4i gridCenterToBounds(const osg::Vec2i &centerCell) const;
-            osg::Vec2i getNewGridCenter(const osg::Vec3f &pos, const osg::Vec2i *currentGridCenter = nullptr) const;
+        void preloadCells(float dt);
+        void preloadTeleportDoorDestinations(const osg::Vec3f& playerPos, const osg::Vec3f& predictedPos,
+            std::vector<PositionCellGrid>& exteriorPositions);
+        void preloadExteriorGrid(const osg::Vec3f& playerPos, const osg::Vec3f& predictedPos);
+        void preloadFastTravelDestinations(const osg::Vec3f& playerPos, const osg::Vec3f& predictedPos,
+            std::vector<PositionCellGrid>& exteriorPositions);
 
-            void unloadCell(CellStore* cell, const DetourNavigator::UpdateGuard* navigatorUpdateGuard);
-            void loadCell(CellStore *cell, Loading::Listener* loadingListener, bool respawn, const osg::Vec3f& position,
-                const DetourNavigator::UpdateGuard* navigatorUpdateGuard);
+        osg::Vec4i gridCenterToBounds(const osg::Vec2i& centerCell) const;
+        osg::Vec2i getNewGridCenter(const osg::Vec3f& pos, const osg::Vec2i* currentGridCenter = nullptr) const;
 
-        public:
+        void unloadCell(CellStore* cell, const DetourNavigator::UpdateGuard* navigatorUpdateGuard);
+        void loadCell(CellStore* cell, Loading::Listener* loadingListener, bool respawn, const osg::Vec3f& position,
+            const DetourNavigator::UpdateGuard* navigatorUpdateGuard);
 
-            Scene(MWWorld::World& world, MWRender::RenderingManager& rendering, MWPhysics::PhysicsSystem *physics,
-                   DetourNavigator::Navigator& navigator);
+    public:
+        Scene(MWWorld::World& world, MWRender::RenderingManager& rendering, MWPhysics::PhysicsSystem* physics,
+            DetourNavigator::Navigator& navigator);
 
-            ~Scene();
+        ~Scene();
 
-            void preloadCell(MWWorld::CellStore* cell, bool preloadSurrounding=false);
-            void preloadTerrain(const osg::Vec3f& pos, bool sync=false);
-            void reloadTerrain();
+        void preloadCell(MWWorld::CellStore* cell, bool preloadSurrounding = false);
+        void preloadTerrain(const osg::Vec3f& pos, bool sync = false);
+        void reloadTerrain();
 
-            void playerMoved (const osg::Vec3f& pos);
+        void playerMoved(const osg::Vec3f& pos);
 
-            void changePlayerCell(CellStore* newCell, const ESM::Position& position, bool adjustPlayerPos);
+        void changePlayerCell(CellStore* newCell, const ESM::Position& position, bool adjustPlayerPos);
 
-            CellStore *getCurrentCell();
+        CellStore* getCurrentCell();
 
-            const CellStoreCollection& getActiveCells () const;
+        const CellStoreCollection& getActiveCells() const;
 
-            bool hasCellChanged() const;
-            ///< Has the set of active cells changed, since the last frame?
+        bool hasCellChanged() const;
+        ///< Has the set of active cells changed, since the last frame?
 
-            bool hasCellLoaded() const { return mCellLoaded; }
+        bool hasCellLoaded() const { return mCellLoaded; }
 
-            void resetCellLoaded() { mCellLoaded = false; }
+        void resetCellLoaded() { mCellLoaded = false; }
 
-            void changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent=true);
-            ///< Move to interior cell.
-            /// @param changeEvent Set cellChanged flag?
+        void changeToInteriorCell(
+            const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent = true);
+        ///< Move to interior cell.
+        /// @param changeEvent Set cellChanged flag?
 
-            void changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos, bool changeEvent=true);
-            ///< Move to exterior cell.
-            /// @param changeEvent Set cellChanged flag?
+        void changeToExteriorCell(const ESM::Position& position, bool adjustPlayerPos, bool changeEvent = true);
+        ///< Move to exterior cell.
+        /// @param changeEvent Set cellChanged flag?
 
-            void clear();
-            ///< Change into a void
+        void clear();
+        ///< Change into a void
 
-            void markCellAsUnchanged();
+        void markCellAsUnchanged();
 
-            void update(float duration);
+        void update(float duration);
 
-            void addObjectToScene (const Ptr& ptr);
-            ///< Add an object that already exists in the world model to the scene.
+        void addObjectToScene(const Ptr& ptr);
+        ///< Add an object that already exists in the world model to the scene.
 
-            void removeObjectFromScene (const Ptr& ptr, bool keepActive = false);
-            ///< Remove an object from the scene, but not from the world model.
+        void removeObjectFromScene(const Ptr& ptr, bool keepActive = false);
+        ///< Remove an object from the scene, but not from the world model.
 
-            void addPostponedPhysicsObjects();
+        void addPostponedPhysicsObjects();
 
-            void removeFromPagedRefs(const Ptr &ptr);
+        void removeFromPagedRefs(const Ptr& ptr);
 
-            void updateObjectRotation(const Ptr& ptr, RotationOrder order);
-            void updateObjectScale(const Ptr& ptr);
+        void updateObjectRotation(const Ptr& ptr, RotationOrder order);
+        void updateObjectScale(const Ptr& ptr);
 
-            bool isCellActive(const CellStore &cell);
+        bool isCellActive(const CellStore& cell);
 
-            Ptr searchPtrViaActorId (int actorId);
+        Ptr searchPtrViaActorId(int actorId);
 
-            void preload(const std::string& mesh, bool useAnim=false);
+        void preload(const std::string& mesh, bool useAnim = false);
 
-            void testExteriorCells();
-            void testInteriorCells();
+        void testExteriorCells();
+        void testInteriorCells();
     };
 }
 
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index a84f4d9de5..19fa792d8b 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -2,25 +2,25 @@
 
 #include <components/debug/debuglog.hpp>
 
+#include <components/esm/records.hpp>
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/esmwriter.hpp>
-#include <components/esm/records.hpp>
 
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/misc/rng.hpp>
 
 #include <iterator>
-#include <stdexcept>
 #include <sstream>
+#include <stdexcept>
 
 namespace
 {
     // TODO: Switch to C++23 to get a working version of std::unordered_map::erase
-    template<class T>
+    template <class T>
     bool eraseFromMap(T& map, std::string_view value)
     {
         auto it = map.find(value);
-        if(it != map.end())
+        if (it != map.end())
         {
             map.erase(it);
             return true;
@@ -31,26 +31,28 @@ namespace
 
 namespace MWWorld
 {
-    RecordId::RecordId(const std::string &id, bool isDeleted)
-        : mId(id), mIsDeleted(isDeleted)
-    {}
+    RecordId::RecordId(const std::string& id, bool isDeleted)
+        : mId(id)
+        , mIsDeleted(isDeleted)
+    {
+    }
 
-    template<typename T>
+    template <typename T>
     IndexedStore<T>::IndexedStore()
     {
     }
-    template<typename T>
+    template <typename T>
     typename IndexedStore<T>::iterator IndexedStore<T>::begin() const
     {
         return mStatic.begin();
     }
-    template<typename T>
+    template <typename T>
     typename IndexedStore<T>::iterator IndexedStore<T>::end() const
     {
         return mStatic.end();
     }
-    template<typename T>
-    void IndexedStore<T>::load(ESM::ESMReader &esm)
+    template <typename T>
+    void IndexedStore<T>::load(ESM::ESMReader& esm)
     {
         T record;
         bool isDeleted = false;
@@ -59,27 +61,27 @@ namespace MWWorld
         auto idx = record.mIndex;
         mStatic.insert_or_assign(idx, std::move(record));
     }
-    template<typename T>
+    template <typename T>
     int IndexedStore<T>::getSize() const
     {
         return mStatic.size();
     }
-    template<typename T>
+    template <typename T>
     void IndexedStore<T>::setUp()
     {
     }
-    template<typename T>
-    const T *IndexedStore<T>::search(int index) const
+    template <typename T>
+    const T* IndexedStore<T>::search(int index) const
     {
         typename Static::const_iterator it = mStatic.find(index);
         if (it != mStatic.end())
             return &(it->second);
         return nullptr;
     }
-    template<typename T>
-    const T *IndexedStore<T>::find(int index) const
+    template <typename T>
+    const T* IndexedStore<T>::find(int index) const
     {
-        const T *ptr = search(index);
+        const T* ptr = search(index);
         if (ptr == nullptr)
         {
             std::stringstream msg;
@@ -93,18 +95,18 @@ namespace MWWorld
     template class IndexedStore<ESM::MagicEffect>;
     template class IndexedStore<ESM::Skill>;
 
-    template<typename T>
+    template <typename T>
     Store<T>::Store()
     {
     }
 
-    template<typename T>
+    template <typename T>
     Store<T>::Store(const Store<T>& orig)
         : mStatic(orig.mStatic)
     {
     }
 
-    template<typename T>
+    template <typename T>
     void Store<T>::clearDynamic()
     {
         // remove the dynamic part of mShared
@@ -113,7 +115,7 @@ namespace MWWorld
         mDynamic.clear();
     }
 
-    template<typename T>
+    template <typename T>
     const T* Store<T>::search(std::string_view id) const
     {
         typename Dynamic::const_iterator dit = mDynamic.find(id);
@@ -126,7 +128,7 @@ namespace MWWorld
 
         return nullptr;
     }
-    template<typename T>
+    template <typename T>
     const T* Store<T>::searchStatic(std::string_view id) const
     {
         typename Static::const_iterator it = mStatic.find(id);
@@ -136,26 +138,26 @@ namespace MWWorld
         return nullptr;
     }
 
-    template<typename T>
+    template <typename T>
     bool Store<T>::isDynamic(std::string_view id) const
     {
         typename Dynamic::const_iterator dit = mDynamic.find(id);
         return (dit != mDynamic.end());
     }
-    template<typename T>
+    template <typename T>
     const T* Store<T>::searchRandom(std::string_view id, Misc::Rng::Generator& prng) const
     {
         std::vector<const T*> results;
         std::copy_if(mShared.begin(), mShared.end(), std::back_inserter(results),
-                [&id](const T* item) { return Misc::StringUtils::ciStartsWith(item->mId, id); });
-        if(!results.empty())
+            [&id](const T* item) { return Misc::StringUtils::ciStartsWith(item->mId, id); });
+        if (!results.empty())
             return results[Misc::Rng::rollDice(results.size(), prng)];
         return nullptr;
     }
-    template<typename T>
+    template <typename T>
     const T* Store<T>::find(std::string_view id) const
     {
-        const T *ptr = search(id);
+        const T* ptr = search(id);
         if (ptr == nullptr)
         {
             std::stringstream msg;
@@ -164,14 +166,15 @@ namespace MWWorld
         }
         return ptr;
     }
-    template<typename T>
-    RecordId Store<T>::load(ESM::ESMReader &esm)
+    template <typename T>
+    RecordId Store<T>::load(ESM::ESMReader& esm)
     {
         T record;
         bool isDeleted = false;
 
         record.load(esm, isDeleted);
-        Misc::StringUtils::lowerCaseInPlace(record.mId); // TODO: remove this line once we have ported our remaining code base to lowercase on lookup
+        Misc::StringUtils::lowerCaseInPlace(
+            record.mId); // TODO: remove this line once we have ported our remaining code base to lowercase on lookup
 
         std::pair<typename Static::iterator, bool> inserted = mStatic.insert_or_assign(record.mId, record);
         if (inserted.second)
@@ -179,78 +182,82 @@ namespace MWWorld
 
         return RecordId(record.mId, isDeleted);
     }
-    template<typename T>
+    template <typename T>
     void Store<T>::setUp()
     {
     }
 
-    template<typename T>
+    template <typename T>
     typename Store<T>::iterator Store<T>::begin() const
     {
         return mShared.begin();
     }
-    template<typename T>
+    template <typename T>
     typename Store<T>::iterator Store<T>::end() const
     {
         return mShared.end();
     }
 
-    template<typename T>
+    template <typename T>
     size_t Store<T>::getSize() const
     {
         return mShared.size();
     }
 
-    template<typename T>
+    template <typename T>
     int Store<T>::getDynamicSize() const
     {
         return mDynamic.size();
     }
-    template<typename T>
-    void Store<T>::listIdentifier(std::vector<std::string> &list) const
+    template <typename T>
+    void Store<T>::listIdentifier(std::vector<std::string>& list) const
     {
         list.reserve(list.size() + getSize());
-        typename std::vector<T *>::const_iterator it = mShared.begin();
-        for (; it != mShared.end(); ++it) {
+        typename std::vector<T*>::const_iterator it = mShared.begin();
+        for (; it != mShared.end(); ++it)
+        {
             list.push_back((*it)->mId);
         }
     }
-    template<typename T>
-    T *Store<T>::insert(const T &item, bool overrideOnly)
+    template <typename T>
+    T* Store<T>::insert(const T& item, bool overrideOnly)
     {
-        if(overrideOnly)
+        if (overrideOnly)
         {
             auto it = mStatic.find(item.mId);
-            if(it == mStatic.end())
+            if (it == mStatic.end())
                 return nullptr;
         }
         std::pair<typename Dynamic::iterator, bool> result = mDynamic.insert_or_assign(item.mId, item);
-        T *ptr = &result.first->second;
+        T* ptr = &result.first->second;
         if (result.second)
             mShared.push_back(ptr);
         return ptr;
     }
-    template<typename T>
-    T *Store<T>::insertStatic(const T &item)
+    template <typename T>
+    T* Store<T>::insertStatic(const T& item)
     {
         std::pair<typename Static::iterator, bool> result = mStatic.insert_or_assign(item.mId, item);
-        T *ptr = &result.first->second;
+        T* ptr = &result.first->second;
         if (result.second)
             mShared.push_back(ptr);
         return ptr;
     }
-    template<typename T>
+    template <typename T>
     bool Store<T>::eraseStatic(std::string_view id)
     {
         typename Static::iterator it = mStatic.find(id);
 
-        if (it != mStatic.end()) {
+        if (it != mStatic.end())
+        {
             // delete from the static part of mShared
-            typename std::vector<T *>::iterator sharedIter = mShared.begin();
-            typename std::vector<T *>::iterator end = sharedIter + mStatic.size();
+            typename std::vector<T*>::iterator sharedIter = mShared.begin();
+            typename std::vector<T*>::iterator end = sharedIter + mStatic.size();
 
-            while (sharedIter != mShared.end() && sharedIter != end) {
-                if(Misc::StringUtils::ciEqual((*sharedIter)->mId, id)) {
+            while (sharedIter != mShared.end() && sharedIter != end)
+            {
+                if (Misc::StringUtils::ciEqual((*sharedIter)->mId, id))
+                {
                     mShared.erase(sharedIter);
                     break;
                 }
@@ -262,7 +269,7 @@ namespace MWWorld
         return true;
     }
 
-    template<typename T>
+    template <typename T>
     bool Store<T>::erase(std::string_view id)
     {
         if (!eraseFromMap(mDynamic, id))
@@ -271,56 +278,54 @@ namespace MWWorld
         // have to reinit the whole shared part
         assert(mShared.size() >= mStatic.size());
         mShared.erase(mShared.begin() + mStatic.size(), mShared.end());
-        for (auto it = mDynamic.begin(); it != mDynamic.end(); ++it) {
+        for (auto it = mDynamic.begin(); it != mDynamic.end(); ++it)
+        {
             mShared.push_back(&it->second);
         }
         return true;
     }
-    template<typename T>
-    bool Store<T>::erase(const T &item)
+    template <typename T>
+    bool Store<T>::erase(const T& item)
     {
         return erase(item.mId);
     }
-    template<typename T>
-    void Store<T>::write (ESM::ESMWriter& writer, Loading::Listener& progress) const
+    template <typename T>
+    void Store<T>::write(ESM::ESMWriter& writer, Loading::Listener& progress) const
     {
-        for (typename Dynamic::const_iterator iter (mDynamic.begin()); iter!=mDynamic.end();
-             ++iter)
+        for (typename Dynamic::const_iterator iter(mDynamic.begin()); iter != mDynamic.end(); ++iter)
         {
-            writer.startRecord (T::sRecordId);
-            iter->second.save (writer);
-            writer.endRecord (T::sRecordId);
+            writer.startRecord(T::sRecordId);
+            iter->second.save(writer);
+            writer.endRecord(T::sRecordId);
         }
     }
-    template<typename T>
+    template <typename T>
     RecordId Store<T>::read(ESM::ESMReader& reader, bool overrideOnly)
     {
         T record;
         bool isDeleted = false;
 
-        record.load (reader, isDeleted);
-        insert (record, overrideOnly);
+        record.load(reader, isDeleted);
+        insert(record, overrideOnly);
 
         return RecordId(record.mId, isDeleted);
     }
 
     // LandTexture
     //=========================================================================
-    Store<ESM::LandTexture>::Store()
-    {
-    }
-    const ESM::LandTexture *Store<ESM::LandTexture>::search(size_t index, size_t plugin) const
+    Store<ESM::LandTexture>::Store() {}
+    const ESM::LandTexture* Store<ESM::LandTexture>::search(size_t index, size_t plugin) const
     {
         assert(plugin < mStatic.size());
-        const LandTextureList &ltexl = mStatic[plugin];
+        const LandTextureList& ltexl = mStatic[plugin];
 
         if (index >= ltexl.size())
             return nullptr;
         return &ltexl[index];
     }
-    const ESM::LandTexture *Store<ESM::LandTexture>::find(size_t index, size_t plugin) const
+    const ESM::LandTexture* Store<ESM::LandTexture>::find(size_t index, size_t plugin) const
     {
-        const ESM::LandTexture *ptr = search(index, plugin);
+        const ESM::LandTexture* ptr = search(index, plugin);
         if (ptr == nullptr)
         {
             const std::string msg = "Land texture with index " + std::to_string(index) + " not found";
@@ -329,7 +334,10 @@ namespace MWWorld
         return ptr;
     }
 
-    void Store<ESM::LandTexture>::resize(std::size_t num) { mStatic.resize(num); }
+    void Store<ESM::LandTexture>::resize(std::size_t num)
+    {
+        mStatic.resize(num);
+    }
 
     size_t Store<ESM::LandTexture>::getSize() const
     {
@@ -340,7 +348,7 @@ namespace MWWorld
         assert(plugin < mStatic.size());
         return mStatic[plugin].size();
     }
-    RecordId Store<ESM::LandTexture>::load(ESM::ESMReader &esm)
+    RecordId Store<ESM::LandTexture>::load(ESM::ESMReader& esm)
     {
         ESM::LandTexture lt;
         bool isDeleted = false;
@@ -348,7 +356,7 @@ namespace MWWorld
         lt.load(esm, isDeleted);
 
         // Replace texture for records with given ID and index from all plugins.
-        for (unsigned int i=0; i<mStatic.size(); i++)
+        for (unsigned int i = 0; i < mStatic.size(); i++)
         {
             ESM::LandTexture* tex = const_cast<ESM::LandTexture*>(search(lt.mIndex, i));
             if (tex)
@@ -358,9 +366,9 @@ namespace MWWorld
             }
         }
 
-        LandTextureList &ltexl = mStatic.back();
-        if(lt.mIndex + 1 > (int)ltexl.size())
-            ltexl.resize(lt.mIndex+1);
+        LandTextureList& ltexl = mStatic.back();
+        if (lt.mIndex + 1 > (int)ltexl.size())
+            ltexl.resize(lt.mIndex + 1);
 
         // Store it
         auto idx = lt.mIndex;
@@ -381,9 +389,7 @@ namespace MWWorld
 
     // Land
     //=========================================================================
-    Store<ESM::Land>::~Store()
-    {
-    }
+    Store<ESM::Land>::~Store() {}
     size_t Store<ESM::Land>::getSize() const
     {
         return mStatic.size();
@@ -396,16 +402,16 @@ namespace MWWorld
     {
         return iterator(mStatic.end());
     }
-    const ESM::Land *Store<ESM::Land>::search(int x, int y) const
+    const ESM::Land* Store<ESM::Land>::search(int x, int y) const
     {
-        std::pair<int, int> comp(x,y);
+        std::pair<int, int> comp(x, y);
         if (auto it = mStatic.find(comp); it != mStatic.end() && it->mX == x && it->mY == y)
             return &*it;
         return nullptr;
     }
-    const ESM::Land *Store<ESM::Land>::find(int x, int y) const
+    const ESM::Land* Store<ESM::Land>::find(int x, int y) const
     {
-        const ESM::Land *ptr = search(x, y);
+        const ESM::Land* ptr = search(x, y);
         if (ptr == nullptr)
         {
             const std::string msg = "Land at (" + std::to_string(x) + ", " + std::to_string(y) + ") not found";
@@ -413,7 +419,7 @@ namespace MWWorld
         }
         return ptr;
     }
-    RecordId Store<ESM::Land>::load(ESM::ESMReader &esm)
+    RecordId Store<ESM::Land>::load(ESM::ESMReader& esm)
     {
         ESM::Land land;
         bool isDeleted = false;
@@ -442,13 +448,13 @@ namespace MWWorld
         mBuilt = true;
     }
 
-
     // Cell
     //=========================================================================
 
-    const ESM::Cell *Store<ESM::Cell>::search(const ESM::Cell &cell) const
+    const ESM::Cell* Store<ESM::Cell>::search(const ESM::Cell& cell) const
     {
-        if (cell.isExterior()) {
+        if (cell.isExterior())
+        {
             return search(cell.getGridX(), cell.getGridY());
         }
         return search(cell.mName);
@@ -474,14 +480,15 @@ namespace MWWorld
             if (!moved)
                 continue;
 
-            ESM::Cell *cellAlt = const_cast<ESM::Cell*>(searchOrCreate(cMRef.mTarget[0], cMRef.mTarget[1]));
+            ESM::Cell* cellAlt = const_cast<ESM::Cell*>(searchOrCreate(cMRef.mTarget[0], cMRef.mTarget[1]));
 
             // Add data required to make reference appear in the correct cell.
             // We should not need to test for duplicates, as this part of the code is pre-cell merge.
             cell->mMovedRefs.push_back(cMRef);
 
             // But there may be duplicates here!
-            ESM::CellRefTracker::iterator iter = std::find_if(cellAlt->mLeasedRefs.begin(), cellAlt->mLeasedRefs.end(), ESM::CellRefTrackerPredicate(ref.mRefNum));
+            ESM::CellRefTracker::iterator iter = std::find_if(
+                cellAlt->mLeasedRefs.begin(), cellAlt->mLeasedRefs.end(), ESM::CellRefTrackerPredicate(ref.mRefNum));
             if (iter == cellAlt->mLeasedRefs.end())
                 cellAlt->mLeasedRefs.emplace_back(std::move(ref), deleted);
             else
@@ -495,18 +502,20 @@ namespace MWWorld
     const ESM::Cell* Store<ESM::Cell>::search(std::string_view id) const
     {
         DynamicInt::const_iterator it = mInt.find(id);
-        if (it != mInt.end()) {
+        if (it != mInt.end())
+        {
             return &(it->second);
         }
 
         DynamicInt::const_iterator dit = mDynamicInt.find(id);
-        if (dit != mDynamicInt.end()) {
+        if (dit != mDynamicInt.end())
+        {
             return &dit->second;
         }
 
         return nullptr;
     }
-    const ESM::Cell *Store<ESM::Cell>::search(int x, int y) const
+    const ESM::Cell* Store<ESM::Cell>::search(int x, int y) const
     {
         std::pair<int, int> key(x, y);
         DynamicExt::const_iterator it = mExt.find(key);
@@ -519,14 +528,14 @@ namespace MWWorld
 
         return nullptr;
     }
-    const ESM::Cell *Store<ESM::Cell>::searchStatic(int x, int y) const
+    const ESM::Cell* Store<ESM::Cell>::searchStatic(int x, int y) const
     {
-        DynamicExt::const_iterator it = mExt.find(std::make_pair(x,y));
+        DynamicExt::const_iterator it = mExt.find(std::make_pair(x, y));
         if (it != mExt.end())
             return &(it->second);
         return nullptr;
     }
-    const ESM::Cell *Store<ESM::Cell>::searchOrCreate(int x, int y)
+    const ESM::Cell* Store<ESM::Cell>::searchOrCreate(int x, int y)
     {
         std::pair<int, int> key(x, y);
         DynamicExt::const_iterator it = mExt.find(key);
@@ -553,7 +562,7 @@ namespace MWWorld
     }
     const ESM::Cell* Store<ESM::Cell>::find(std::string_view id) const
     {
-        const ESM::Cell *ptr = search(id);
+        const ESM::Cell* ptr = search(id);
         if (ptr == nullptr)
         {
             const std::string msg = "Cell '" + std::string(id) + "' not found";
@@ -561,9 +570,9 @@ namespace MWWorld
         }
         return ptr;
     }
-    const ESM::Cell *Store<ESM::Cell>::find(int x, int y) const
+    const ESM::Cell* Store<ESM::Cell>::find(int x, int y) const
     {
-        const ESM::Cell *ptr = search(x, y);
+        const ESM::Cell* ptr = search(x, y);
         if (ptr == nullptr)
         {
             const std::string msg = "Exterior at (" + std::to_string(x) + ", " + std::to_string(y) + ") not found";
@@ -580,15 +589,15 @@ namespace MWWorld
     {
         mSharedInt.clear();
         mSharedInt.reserve(mInt.size());
-        for (auto & [_, cell] : mInt)
+        for (auto& [_, cell] : mInt)
             mSharedInt.push_back(&cell);
 
         mSharedExt.clear();
         mSharedExt.reserve(mExt.size());
-        for (auto & [_, cell] : mExt)
+        for (auto& [_, cell] : mExt)
             mSharedExt.push_back(&cell);
     }
-    RecordId Store<ESM::Cell>::load(ESM::ESMReader &esm)
+    RecordId Store<ESM::Cell>::load(ESM::ESMReader& esm)
     {
         // Don't automatically assume that a new cell must be spawned. Multiple plugins write to the same cell,
         //  and we merge all this data into one Cell object. However, we can't simply search for the cell id,
@@ -603,17 +612,20 @@ namespace MWWorld
         // so we can find the cell we need to merge with
         cell.loadNameAndData(esm, isDeleted);
 
-        if(cell.mData.mFlags & ESM::Cell::Interior)
+        if (cell.mData.mFlags & ESM::Cell::Interior)
         {
             // Store interior cell by name, try to merge with existing parent data.
-            ESM::Cell *oldcell = const_cast<ESM::Cell*>(search(cell.mName));
-            if (oldcell) {
+            ESM::Cell* oldcell = const_cast<ESM::Cell*>(search(cell.mName));
+            if (oldcell)
+            {
                 // merge new cell into old cell
                 // push the new references on the list of references to manage (saveContext = true)
                 oldcell->mData = cell.mData;
-                oldcell->mName = cell.mName; // merge name just to be sure (ID will be the same, but case could have been changed)
+                oldcell->mName
+                    = cell.mName; // merge name just to be sure (ID will be the same, but case could have been changed)
                 oldcell->loadCell(esm, true);
-            } else
+            }
+            else
             {
                 // spawn a new cell
                 cell.loadCell(esm, true);
@@ -624,33 +636,39 @@ namespace MWWorld
         else
         {
             // Store exterior cells by grid position, try to merge with existing parent data.
-            ESM::Cell *oldcell = const_cast<ESM::Cell*>(search(cell.getGridX(), cell.getGridY()));
-            if (oldcell) {
+            ESM::Cell* oldcell = const_cast<ESM::Cell*>(search(cell.getGridX(), cell.getGridY()));
+            if (oldcell)
+            {
                 // merge new cell into old cell
                 oldcell->mData = cell.mData;
                 oldcell->mName = cell.mName;
                 oldcell->loadCell(esm, false);
 
                 // handle moved ref (MVRF) subrecords
-                handleMovedCellRefs (esm, &cell);
+                handleMovedCellRefs(esm, &cell);
 
                 // push the new references on the list of references to manage
                 oldcell->postLoad(esm);
 
                 // merge lists of leased references, use newer data in case of conflict
-                for (ESM::MovedCellRefTracker::const_iterator it = cell.mMovedRefs.begin(); it != cell.mMovedRefs.end(); ++it) {
+                for (ESM::MovedCellRefTracker::const_iterator it = cell.mMovedRefs.begin(); it != cell.mMovedRefs.end();
+                     ++it)
+                {
                     // remove reference from current leased ref tracker and add it to new cell
-                    ESM::MovedCellRefTracker::iterator itold = std::find(oldcell->mMovedRefs.begin(), oldcell->mMovedRefs.end(), it->mRefNum);
+                    ESM::MovedCellRefTracker::iterator itold
+                        = std::find(oldcell->mMovedRefs.begin(), oldcell->mMovedRefs.end(), it->mRefNum);
                     if (itold != oldcell->mMovedRefs.end())
                     {
                         if (it->mTarget[0] != itold->mTarget[0] || it->mTarget[1] != itold->mTarget[1])
                         {
-                            ESM::Cell *wipecell = const_cast<ESM::Cell*>(search(itold->mTarget[0], itold->mTarget[1]));
-                            ESM::CellRefTracker::iterator it_lease = std::find_if(wipecell->mLeasedRefs.begin(), wipecell->mLeasedRefs.end(), ESM::CellRefTrackerPredicate(it->mRefNum));
+                            ESM::Cell* wipecell = const_cast<ESM::Cell*>(search(itold->mTarget[0], itold->mTarget[1]));
+                            ESM::CellRefTracker::iterator it_lease = std::find_if(wipecell->mLeasedRefs.begin(),
+                                wipecell->mLeasedRefs.end(), ESM::CellRefTrackerPredicate(it->mRefNum));
                             if (it_lease != wipecell->mLeasedRefs.end())
                                 wipecell->mLeasedRefs.erase(it_lease);
                             else
-                                Log(Debug::Error) << "Error: can't find " << it->mRefNum.mIndex << " " << it->mRefNum.mContentFile  << " in leasedRefs";
+                                Log(Debug::Error) << "Error: can't find " << it->mRefNum.mIndex << " "
+                                                  << it->mRefNum.mContentFile << " in leasedRefs";
                         }
                         *itold = *it;
                     }
@@ -661,13 +679,14 @@ namespace MWWorld
                 // We don't need to merge mLeasedRefs of cell / oldcell. This list is filled when another cell moves a
                 // reference to this cell, so the list for the new cell should be empty. The list for oldcell,
                 // however, could have leased refs in it and so should be kept.
-            } else
+            }
+            else
             {
                 // spawn a new cell
                 cell.loadCell(esm, false);
 
                 // handle moved ref (MVRF) subrecords
-                handleMovedCellRefs (esm, &cell);
+                handleMovedCellRefs(esm, &cell);
 
                 // push the new references on the list of references to manage
                 cell.postLoad(esm);
@@ -696,14 +715,13 @@ namespace MWWorld
     }
     const ESM::Cell* Store<ESM::Cell>::searchExtByName(std::string_view id) const
     {
-        const ESM::Cell *cell = nullptr;
-        for (const ESM::Cell *sharedCell : mSharedExt)
+        const ESM::Cell* cell = nullptr;
+        for (const ESM::Cell* sharedCell : mSharedExt)
         {
             if (Misc::StringUtils::ciEqual(sharedCell->mName, id))
             {
-                if (cell == nullptr ||
-                    (sharedCell->mData.mX > cell->mData.mX) ||
-                    (sharedCell->mData.mX == cell->mData.mX && sharedCell->mData.mY > cell->mData.mY))
+                if (cell == nullptr || (sharedCell->mData.mX > cell->mData.mX)
+                    || (sharedCell->mData.mX == cell->mData.mX && sharedCell->mData.mY > cell->mData.mY))
                 {
                     cell = sharedCell;
                 }
@@ -713,14 +731,13 @@ namespace MWWorld
     }
     const ESM::Cell* Store<ESM::Cell>::searchExtByRegion(std::string_view id) const
     {
-        const ESM::Cell *cell = nullptr;
-        for (const ESM::Cell *sharedCell : mSharedExt)
+        const ESM::Cell* cell = nullptr;
+        for (const ESM::Cell* sharedCell : mSharedExt)
         {
             if (Misc::StringUtils::ciEqual(sharedCell->mRegion, id))
             {
-                if (cell == nullptr ||
-                    (sharedCell->mData.mX > cell->mData.mX) ||
-                    (sharedCell->mData.mX == cell->mData.mX && sharedCell->mData.mY > cell->mData.mY))
+                if (cell == nullptr || (sharedCell->mData.mX > cell->mData.mX)
+                    || (sharedCell->mData.mX == cell->mData.mX && sharedCell->mData.mY > cell->mData.mY))
                 {
                     cell = sharedCell;
                 }
@@ -740,39 +757,43 @@ namespace MWWorld
     {
         return mSharedInt.size();
     }
-    void Store<ESM::Cell>::listIdentifier(std::vector<std::string> &list) const
+    void Store<ESM::Cell>::listIdentifier(std::vector<std::string>& list) const
     {
         list.reserve(list.size() + mSharedInt.size());
 
-        for (const ESM::Cell *sharedCell : mSharedInt)
+        for (const ESM::Cell* sharedCell : mSharedInt)
         {
             list.push_back(sharedCell->mName);
         }
     }
-    ESM::Cell *Store<ESM::Cell>::insert(const ESM::Cell &cell)
+    ESM::Cell* Store<ESM::Cell>::insert(const ESM::Cell& cell)
     {
         if (search(cell) != nullptr)
         {
             const std::string cellType = (cell.isExterior()) ? "exterior" : "interior";
             throw std::runtime_error("Failed to create " + cellType + " cell");
         }
-        if (cell.isExterior()) {
+        if (cell.isExterior())
+        {
             std::pair<int, int> key(cell.getGridX(), cell.getGridY());
 
             // duplicate insertions are avoided by search(ESM::Cell &)
             DynamicExt::iterator result = mDynamicExt.emplace(key, cell).first;
             mSharedExt.push_back(&result->second);
             return &result->second;
-        } else {
+        }
+        else
+        {
             // duplicate insertions are avoided by search(ESM::Cell &)
             DynamicInt::iterator result = mDynamicInt.emplace(cell.mName, cell).first;
             mSharedInt.push_back(&result->second);
             return &result->second;
         }
     }
-    bool Store<ESM::Cell>::erase(const ESM::Cell &cell)
+    bool Store<ESM::Cell>::erase(const ESM::Cell& cell)
     {
-        if (cell.isExterior()) {
+        if (cell.isExterior())
+        {
             return erase(cell.getGridX(), cell.getGridY());
         }
         return erase(cell.mName);
@@ -781,16 +802,15 @@ namespace MWWorld
     {
         DynamicInt::iterator it = mDynamicInt.find(id);
 
-        if (it == mDynamicInt.end()) {
+        if (it == mDynamicInt.end())
+        {
             return false;
         }
         mDynamicInt.erase(it);
-        mSharedInt.erase(
-            mSharedInt.begin() + mSharedInt.size(),
-            mSharedInt.end()
-        );
+        mSharedInt.erase(mSharedInt.begin() + mSharedInt.size(), mSharedInt.end());
 
-        for (it = mDynamicInt.begin(); it != mDynamicInt.end(); ++it) {
+        for (it = mDynamicInt.begin(); it != mDynamicInt.end(); ++it)
+        {
             mSharedInt.push_back(&it->second);
         }
 
@@ -801,23 +821,21 @@ namespace MWWorld
         std::pair<int, int> key(x, y);
         DynamicExt::iterator it = mDynamicExt.find(key);
 
-        if (it == mDynamicExt.end()) {
+        if (it == mDynamicExt.end())
+        {
             return false;
         }
         mDynamicExt.erase(it);
-        mSharedExt.erase(
-            mSharedExt.begin() + mSharedExt.size(),
-            mSharedExt.end()
-        );
+        mSharedExt.erase(mSharedExt.begin() + mSharedExt.size(), mSharedExt.end());
 
-        for (it = mDynamicExt.begin(); it != mDynamicExt.end(); ++it) {
+        for (it = mDynamicExt.begin(); it != mDynamicExt.end(); ++it)
+        {
             mSharedExt.push_back(&it->second);
         }
 
         return true;
     }
 
-
     // Pathgrid
     //=========================================================================
 
@@ -830,18 +848,19 @@ namespace MWWorld
     {
         mCells = &cells;
     }
-    RecordId Store<ESM::Pathgrid>::load(ESM::ESMReader &esm)
+    RecordId Store<ESM::Pathgrid>::load(ESM::ESMReader& esm)
     {
         ESM::Pathgrid pathgrid;
         bool isDeleted = false;
 
         pathgrid.load(esm, isDeleted);
 
-        // Unfortunately the Pathgrid record model does not specify whether the pathgrid belongs to an interior or exterior cell.
-        // For interior cells, mCell is the cell name, but for exterior cells it is either the cell name or if that doesn't exist, the cell's region name.
-        // mX and mY will be (0,0) for interior cells, but there is also an exterior cell with the coordinates of (0,0), so that doesn't help.
-        // Check whether mCell is an interior cell. This isn't perfect, will break if a Region with the same name as an interior cell is created.
-        // A proper fix should be made for future versions of the file format.
+        // Unfortunately the Pathgrid record model does not specify whether the pathgrid belongs to an interior or
+        // exterior cell. For interior cells, mCell is the cell name, but for exterior cells it is either the cell name
+        // or if that doesn't exist, the cell's region name. mX and mY will be (0,0) for interior cells, but there is
+        // also an exterior cell with the coordinates of (0,0), so that doesn't help. Check whether mCell is an interior
+        // cell. This isn't perfect, will break if a Region with the same name as an interior cell is created. A proper
+        // fix should be made for future versions of the file format.
         bool interior = pathgrid.mData.mX == 0 && pathgrid.mData.mY == 0 && mCells->search(pathgrid.mCell) != nullptr;
 
         // deal with mods that have empty pathgrid records (Issue #6209)
@@ -873,7 +892,8 @@ namespace MWWorld
         }
         else
         {
-            std::pair<Exterior::iterator, bool> ret = mExt.insert(std::make_pair(std::make_pair(pathgrid.mData.mX, pathgrid.mData.mY), pathgrid));
+            std::pair<Exterior::iterator, bool> ret
+                = mExt.insert(std::make_pair(std::make_pair(pathgrid.mData.mX, pathgrid.mData.mY), pathgrid));
             if (!ret.second)
                 ret.first->second = pathgrid;
         }
@@ -884,12 +904,10 @@ namespace MWWorld
     {
         return mInt.size() + mExt.size();
     }
-    void Store<ESM::Pathgrid>::setUp()
+    void Store<ESM::Pathgrid>::setUp() {}
+    const ESM::Pathgrid* Store<ESM::Pathgrid>::search(int x, int y) const
     {
-    }
-    const ESM::Pathgrid *Store<ESM::Pathgrid>::search(int x, int y) const
-    {
-        Exterior::const_iterator it = mExt.find(std::make_pair(x,y));
+        Exterior::const_iterator it = mExt.find(std::make_pair(x, y));
         if (it != mExt.end())
             return &(it->second);
         return nullptr;
@@ -901,9 +919,9 @@ namespace MWWorld
             return &(it->second);
         return nullptr;
     }
-    const ESM::Pathgrid *Store<ESM::Pathgrid>::find(int x, int y) const
+    const ESM::Pathgrid* Store<ESM::Pathgrid>::find(int x, int y) const
     {
-        const ESM::Pathgrid* pathgrid = search(x,y);
+        const ESM::Pathgrid* pathgrid = search(x, y);
         if (!pathgrid)
         {
             const std::string msg = "Pathgrid in cell '" + std::to_string(x) + " " + std::to_string(y) + "' not found";
@@ -921,14 +939,14 @@ namespace MWWorld
         }
         return pathgrid;
     }
-    const ESM::Pathgrid *Store<ESM::Pathgrid>::search(const ESM::Cell &cell) const
+    const ESM::Pathgrid* Store<ESM::Pathgrid>::search(const ESM::Cell& cell) const
     {
         if (!(cell.mData.mFlags & ESM::Cell::Interior))
             return search(cell.mData.mX, cell.mData.mY);
         else
             return search(cell.mName);
     }
-    const ESM::Pathgrid *Store<ESM::Pathgrid>::find(const ESM::Cell &cell) const
+    const ESM::Pathgrid* Store<ESM::Pathgrid>::find(const ESM::Cell& cell) const
     {
         if (!(cell.mData.mFlags & ESM::Cell::Interior))
             return find(cell.mData.mX, cell.mData.mY);
@@ -936,22 +954,15 @@ namespace MWWorld
             return find(cell.mName);
     }
 
-
     // Skill
     //=========================================================================
 
-    Store<ESM::Skill>::Store()
-    {
-    }
-
+    Store<ESM::Skill>::Store() {}
 
     // Magic effect
     //=========================================================================
 
-    Store<ESM::MagicEffect>::Store()
-    {
-    }
-
+    Store<ESM::MagicEffect>::Store() {}
 
     // Attribute
     //=========================================================================
@@ -960,17 +971,18 @@ namespace MWWorld
     {
         mStatic.reserve(ESM::Attribute::Length);
     }
-    const ESM::Attribute *Store<ESM::Attribute>::search(size_t index) const
+    const ESM::Attribute* Store<ESM::Attribute>::search(size_t index) const
     {
-        if (index >= mStatic.size()) {
+        if (index >= mStatic.size())
+        {
             return nullptr;
         }
         return &mStatic[index];
     }
 
-    const ESM::Attribute *Store<ESM::Attribute>::find(size_t index) const
+    const ESM::Attribute* Store<ESM::Attribute>::find(size_t index) const
     {
-        const ESM::Attribute *ptr = search(index);
+        const ESM::Attribute* ptr = search(index);
         if (ptr == nullptr)
         {
             const std::string msg = "Attribute with index " + std::to_string(index) + " not found";
@@ -1002,7 +1014,6 @@ namespace MWWorld
         return mStatic.end();
     }
 
-
     // Dialogue
     //=========================================================================
 
@@ -1015,16 +1026,17 @@ namespace MWWorld
     {
         // DialInfos marked as deleted are kept during the loading phase, so that the linked list
         // structure is kept intact for inserting further INFOs. Delete them now that loading is done.
-        for (auto & [_, dial] : mStatic)
+        for (auto& [_, dial] : mStatic)
             dial.clearDeletedInfos();
 
         mShared.clear();
         mShared.reserve(mStatic.size());
-        for (auto & [_, dial] : mStatic)
+        for (auto& [_, dial] : mStatic)
             mShared.push_back(&dial);
         // TODO: verify and document this inconsistent behaviour
         // TODO: if we require this behaviour, maybe we should move it to the place that requires it
-        std::sort(mShared.begin(), mShared.end(), [](const ESM::Dialogue* l, const ESM::Dialogue* r) -> bool { return l->mId < r->mId; });
+        std::sort(mShared.begin(), mShared.end(),
+            [](const ESM::Dialogue* l, const ESM::Dialogue* r) -> bool { return l->mId < r->mId; });
 
         mKeywordSearchModFlag = true;
     }
@@ -1040,7 +1052,7 @@ namespace MWWorld
 
     const ESM::Dialogue* Store<ESM::Dialogue>::find(std::string_view id) const
     {
-        const ESM::Dialogue *ptr = search(id);
+        const ESM::Dialogue* ptr = search(id);
         if (ptr == nullptr)
         {
             std::stringstream msg;
@@ -1065,7 +1077,8 @@ namespace MWWorld
         return mShared.size();
     }
 
-    inline RecordId Store<ESM::Dialogue>::load(ESM::ESMReader &esm) {
+    inline RecordId Store<ESM::Dialogue>::load(ESM::ESMReader& esm)
+    {
         // The original letter case of a dialogue ID is saved, because it's printed
         ESM::Dialogue dialogue;
         bool isDeleted = false;
@@ -1083,7 +1096,7 @@ namespace MWWorld
             found->second.loadData(esm, isDeleted);
             dialogue.mId = found->second.mId;
         }
-        
+
         mKeywordSearchModFlag = true;
 
         return RecordId(dialogue.mId, isDeleted);
@@ -1129,17 +1142,17 @@ namespace MWWorld
 template class MWWorld::Store<ESM::Activator>;
 template class MWWorld::Store<ESM::Apparatus>;
 template class MWWorld::Store<ESM::Armor>;
-//template class MWWorld::Store<ESM::Attribute>;
+// template class MWWorld::Store<ESM::Attribute>;
 template class MWWorld::Store<ESM::BirthSign>;
 template class MWWorld::Store<ESM::BodyPart>;
 template class MWWorld::Store<ESM::Book>;
-//template class MWWorld::Store<ESM::Cell>;
+// template class MWWorld::Store<ESM::Cell>;
 template class MWWorld::Store<ESM::Class>;
 template class MWWorld::Store<ESM::Clothing>;
 template class MWWorld::Store<ESM::Container>;
 template class MWWorld::Store<ESM::Creature>;
 template class MWWorld::Store<ESM::CreatureLevList>;
-//template class MWWorld::Store<ESM::Dialogue>;
+// template class MWWorld::Store<ESM::Dialogue>;
 template class MWWorld::Store<ESM::Door>;
 template class MWWorld::Store<ESM::Enchantment>;
 template class MWWorld::Store<ESM::Faction>;
@@ -1147,25 +1160,24 @@ template class MWWorld::Store<ESM::GameSetting>;
 template class MWWorld::Store<ESM::Global>;
 template class MWWorld::Store<ESM::Ingredient>;
 template class MWWorld::Store<ESM::ItemLevList>;
-//template class MWWorld::Store<ESM::Land>;
-//template class MWWorld::Store<ESM::LandTexture>;
+// template class MWWorld::Store<ESM::Land>;
+// template class MWWorld::Store<ESM::LandTexture>;
 template class MWWorld::Store<ESM::Light>;
 template class MWWorld::Store<ESM::Lockpick>;
-//template class MWWorld::Store<ESM::MagicEffect>;
+// template class MWWorld::Store<ESM::MagicEffect>;
 template class MWWorld::Store<ESM::Miscellaneous>;
 template class MWWorld::Store<ESM::NPC>;
-//template class MWWorld::Store<ESM::Pathgrid>;
+// template class MWWorld::Store<ESM::Pathgrid>;
 template class MWWorld::Store<ESM::Potion>;
 template class MWWorld::Store<ESM::Probe>;
 template class MWWorld::Store<ESM::Race>;
 template class MWWorld::Store<ESM::Region>;
 template class MWWorld::Store<ESM::Repair>;
 template class MWWorld::Store<ESM::Script>;
-//template class MWWorld::Store<ESM::Skill>;
+// template class MWWorld::Store<ESM::Skill>;
 template class MWWorld::Store<ESM::Sound>;
 template class MWWorld::Store<ESM::SoundGenerator>;
 template class MWWorld::Store<ESM::Spell>;
 template class MWWorld::Store<ESM::StartScript>;
 template class MWWorld::Store<ESM::Static>;
 template class MWWorld::Store<ESM::Weapon>;
-
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index 7d1defad94..59ffd9f098 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -1,19 +1,19 @@
 #ifndef OPENMW_MWWORLD_STORE_H
 #define OPENMW_MWWORLD_STORE_H
 
-#include <string>
-#include <vector>
-#include <memory>
 #include <map>
-#include <unordered_map>
+#include <memory>
 #include <set>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
-#include <components/esm3/loadland.hpp>
+#include <components/esm3/loadcell.hpp>
 #include <components/esm3/loaddial.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/esm3/loadpgrd.hpp>
-#include <components/esm3/loadcell.hpp>
-#include <components/misc/strings/algorithm.hpp>
 #include <components/misc/rng.hpp>
+#include <components/misc/strings/algorithm.hpp>
 
 #include "../mwdialogue/keywordsearch.hpp"
 
@@ -40,10 +40,12 @@ namespace MWWorld
         std::string mId;
         bool mIsDeleted;
 
-        RecordId(const std::string &id = {}, bool isDeleted = false);
+        RecordId(const std::string& id = {}, bool isDeleted = false);
     };
 
-    class StoreBase {}; //Empty interface to be parent of all store types
+    class StoreBase
+    {
+    }; // Empty interface to be parent of all store types
 
     class DynamicStore : public StoreBase
     {
@@ -52,19 +54,20 @@ namespace MWWorld
 
         virtual void setUp() {}
 
-        /// List identifiers of records contained in this Store (case-smashed). No-op for Stores that don't use string IDs.
-        virtual void listIdentifier(std::vector<std::string> &list) const {}
+        /// List identifiers of records contained in this Store (case-smashed). No-op for Stores that don't use string
+        /// IDs.
+        virtual void listIdentifier(std::vector<std::string>& list) const {}
 
         virtual size_t getSize() const = 0;
         virtual int getDynamicSize() const { return 0; }
-        virtual RecordId load(ESM::ESMReader &esm) = 0;
+        virtual RecordId load(ESM::ESMReader& esm) = 0;
 
         virtual bool eraseStatic(std::string_view id) { return false; }
         virtual void clearDynamic() {}
 
-        virtual void write (ESM::ESMWriter& writer, Loading::Listener& progress) const {}
+        virtual void write(ESM::ESMWriter& writer, Loading::Listener& progress) const {}
 
-        virtual RecordId read (ESM::ESMReader& reader, bool overrideOnly = false) { return RecordId(); }
+        virtual RecordId read(ESM::ESMReader& reader, bool overrideOnly = false) { return RecordId(); }
         ///< Read into dynamic storage
     };
 
@@ -83,18 +86,18 @@ namespace MWWorld
         iterator begin() const;
         iterator end() const;
 
-        void load(ESM::ESMReader &esm);
+        void load(ESM::ESMReader& esm);
 
         int getSize() const;
         void setUp();
 
-        const T *search(int index) const;
+        const T* search(int index) const;
 
         // calls `search` and throws an exception if not found
-        const T *find(int index) const;
+        const T* find(int index) const;
     };
 
-    template <class T, class Container=std::vector<T*>>
+    template <class T, class Container = std::vector<T*>>
     class SharedIterator
     {
         typedef typename Container::const_iterator Iter;
@@ -104,60 +107,59 @@ namespace MWWorld
     public:
         SharedIterator() {}
 
-        SharedIterator(const SharedIterator &orig)
-          : mIter(orig.mIter)
-        {}
+        SharedIterator(const SharedIterator& orig)
+            : mIter(orig.mIter)
+        {
+        }
 
-        SharedIterator(const Iter &iter)
-          : mIter(iter)
-        {}
+        SharedIterator(const Iter& iter)
+            : mIter(iter)
+        {
+        }
 
         SharedIterator& operator=(const SharedIterator&) = default;
 
-        SharedIterator &operator++() {
+        SharedIterator& operator++()
+        {
             ++mIter;
             return *this;
         }
 
-        SharedIterator operator++(int) {
+        SharedIterator operator++(int)
+        {
             SharedIterator iter = *this;
             ++mIter;
 
             return iter;
         }
 
-        SharedIterator &operator+=(int advance) {
+        SharedIterator& operator+=(int advance)
+        {
             mIter += advance;
             return *this;
         }
 
-        SharedIterator &operator--() {
+        SharedIterator& operator--()
+        {
             --mIter;
             return *this;
         }
 
-        SharedIterator operator--(int) {
+        SharedIterator operator--(int)
+        {
             SharedIterator iter = *this;
             --mIter;
 
             return iter;
         }
 
-        bool operator==(const SharedIterator &x) const {
-            return mIter == x.mIter;
-        }
+        bool operator==(const SharedIterator& x) const { return mIter == x.mIter; }
 
-        bool operator!=(const SharedIterator &x) const {
-            return !(*this == x);
-        }
+        bool operator!=(const SharedIterator& x) const { return !(*this == x); }
 
-        const T &operator*() const {
-            return **mIter;
-        }
+        const T& operator*() const { return **mIter; }
 
-        const T *operator->() const {
-            return &(**mIter);
-        }
+        const T* operator->() const { return &(**mIter); }
     };
 
     class ESMStore;
@@ -178,7 +180,7 @@ namespace MWWorld
 
     public:
         Store();
-        Store(const Store<T> &orig);
+        Store(const Store<T>& orig);
 
         typedef SharedIterator<T> iterator;
 
@@ -207,16 +209,16 @@ namespace MWWorld
         int getDynamicSize() const override;
 
         /// @note The record identifiers are listed in the order that the records were defined by the content files.
-        void listIdentifier(std::vector<std::string> &list) const override;
+        void listIdentifier(std::vector<std::string>& list) const override;
 
-        T *insert(const T &item, bool overrideOnly = false);
-        T *insertStatic(const T &item);
+        T* insert(const T& item, bool overrideOnly = false);
+        T* insertStatic(const T& item);
 
         bool eraseStatic(std::string_view id) override;
         bool erase(std::string_view id);
-        bool erase(const T &item);
+        bool erase(const T& item);
 
-        RecordId load(ESM::ESMReader &esm) override;
+        RecordId load(ESM::ESMReader& esm) override;
         void write(ESM::ESMWriter& writer, Loading::Listener& progress) const override;
         RecordId read(ESM::ESMReader& reader, bool overrideOnly = false) override;
     };
@@ -235,15 +237,15 @@ namespace MWWorld
 
         // Must be threadsafe! Called from terrain background loading threads.
         // Not a big deal here, since ESM::LandTexture can never be modified or inserted/erased
-        const ESM::LandTexture *search(size_t index, size_t plugin) const;
-        const ESM::LandTexture *find(size_t index, size_t plugin) const;
+        const ESM::LandTexture* search(size_t index, size_t plugin) const;
+        const ESM::LandTexture* find(size_t index, size_t plugin) const;
 
         void resize(std::size_t num);
 
         size_t getSize() const override;
         size_t getSize(size_t plugin) const;
 
-        RecordId load(ESM::ESMReader &esm) override;
+        RecordId load(ESM::ESMReader& esm) override;
 
         iterator begin(size_t plugin) const;
         iterator end(size_t plugin) const;
@@ -283,11 +285,12 @@ namespace MWWorld
 
         // Must be threadsafe! Called from terrain background loading threads.
         // Not a big deal here, since ESM::Land can never be modified or inserted/erased
-        const ESM::Land *search(int x, int y) const;
-        const ESM::Land *find(int x, int y) const;
+        const ESM::Land* search(int x, int y) const;
+        const ESM::Land* find(int x, int y) const;
 
-        RecordId load(ESM::ESMReader &esm) override;
+        RecordId load(ESM::ESMReader& esm) override;
         void setUp() override;
+
     private:
         bool mBuilt = false;
     };
@@ -297,7 +300,8 @@ namespace MWWorld
     {
         struct DynamicExtCmp
         {
-            bool operator()(const std::pair<int, int> &left, const std::pair<int, int> &right) const {
+            bool operator()(const std::pair<int, int>& left, const std::pair<int, int>& right) const
+            {
                 if (left.first == right.first && left.second == right.second)
                     return false;
 
@@ -311,36 +315,37 @@ namespace MWWorld
             }
         };
 
-        typedef std::unordered_map<std::string, ESM::Cell, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual> DynamicInt;
-        typedef std::map<std::pair<int, int>, ESM::Cell, DynamicExtCmp>    DynamicExt;
+        typedef std::unordered_map<std::string, ESM::Cell, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual>
+            DynamicInt;
+        typedef std::map<std::pair<int, int>, ESM::Cell, DynamicExtCmp> DynamicExt;
 
-        DynamicInt      mInt;
-        DynamicExt      mExt;
+        DynamicInt mInt;
+        DynamicExt mExt;
 
-        std::vector<ESM::Cell *>    mSharedInt;
-        std::vector<ESM::Cell *>    mSharedExt;
+        std::vector<ESM::Cell*> mSharedInt;
+        std::vector<ESM::Cell*> mSharedExt;
 
         DynamicInt mDynamicInt;
         DynamicExt mDynamicExt;
 
-        const ESM::Cell *search(const ESM::Cell &cell) const;
+        const ESM::Cell* search(const ESM::Cell& cell) const;
         void handleMovedCellRefs(ESM::ESMReader& esm, ESM::Cell* cell);
 
     public:
         typedef SharedIterator<ESM::Cell> iterator;
 
         const ESM::Cell* search(std::string_view id) const;
-        const ESM::Cell *search(int x, int y) const;
-        const ESM::Cell *searchStatic(int x, int y) const;
-        const ESM::Cell *searchOrCreate(int x, int y);
+        const ESM::Cell* search(int x, int y) const;
+        const ESM::Cell* searchStatic(int x, int y) const;
+        const ESM::Cell* searchOrCreate(int x, int y);
 
         const ESM::Cell* find(std::string_view id) const;
-        const ESM::Cell *find(int x, int y) const;
+        const ESM::Cell* find(int x, int y) const;
 
         void clearDynamic() override;
         void setUp() override;
 
-        RecordId load(ESM::ESMReader &esm) override;
+        RecordId load(ESM::ESMReader& esm) override;
 
         iterator intBegin() const;
         iterator intEnd() const;
@@ -357,11 +362,11 @@ namespace MWWorld
         size_t getExtSize() const;
         size_t getIntSize() const;
 
-        void listIdentifier(std::vector<std::string> &list) const override;
+        void listIdentifier(std::vector<std::string>& list) const override;
 
-        ESM::Cell *insert(const ESM::Cell &cell);
+        ESM::Cell* insert(const ESM::Cell& cell);
 
-        bool erase(const ESM::Cell &cell);
+        bool erase(const ESM::Cell& cell);
         bool erase(std::string_view id);
 
         bool erase(int x, int y);
@@ -371,7 +376,8 @@ namespace MWWorld
     class Store<ESM::Pathgrid> : public DynamicStore
     {
     private:
-        typedef std::unordered_map<std::string, ESM::Pathgrid, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual> Interior;
+        typedef std::unordered_map<std::string, ESM::Pathgrid, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual>
+            Interior;
         typedef std::map<std::pair<int, int>, ESM::Pathgrid> Exterior;
 
         Interior mInt;
@@ -380,24 +386,22 @@ namespace MWWorld
         Store<ESM::Cell>* mCells;
 
     public:
-
         Store();
 
         void setCells(Store<ESM::Cell>& cells);
-        RecordId load(ESM::ESMReader &esm) override;
+        RecordId load(ESM::ESMReader& esm) override;
         size_t getSize() const override;
 
         void setUp() override;
 
-        const ESM::Pathgrid *search(int x, int y) const;
+        const ESM::Pathgrid* search(int x, int y) const;
         const ESM::Pathgrid* search(std::string_view name) const;
-        const ESM::Pathgrid *find(int x, int y) const;
+        const ESM::Pathgrid* find(int x, int y) const;
         const ESM::Pathgrid* find(std::string_view name) const;
-        const ESM::Pathgrid *search(const ESM::Cell &cell) const;
-        const ESM::Pathgrid *find(const ESM::Cell &cell) const;
+        const ESM::Pathgrid* search(const ESM::Cell& cell) const;
+        const ESM::Pathgrid* find(const ESM::Cell& cell) const;
     };
 
-
     template <>
     class Store<ESM::Skill> : public IndexedStore<ESM::Skill>
     {
@@ -422,10 +426,10 @@ namespace MWWorld
 
         Store();
 
-        const ESM::Attribute *search(size_t index) const;
+        const ESM::Attribute* search(size_t index) const;
 
         // calls `search` and throws an exception if not found
-        const ESM::Attribute *find(size_t index) const;
+        const ESM::Attribute* find(size_t index) const;
 
         void setUp();
 
@@ -444,14 +448,14 @@ namespace MWWorld
 
         Store();
 
-        const ESM::WeaponType *search(const int id) const;
+        const ESM::WeaponType* search(const int id) const;
 
         // calls `search` and throws an exception if not found
-        const ESM::WeaponType *find(const int id) const;
+        const ESM::WeaponType* find(const int id) const;
 
-        RecordId load(ESM::ESMReader &esm) override { return RecordId({}, false); }
+        RecordId load(ESM::ESMReader& esm) override { return RecordId({}, false); }
 
-        ESM::WeaponType* insert(const ESM::WeaponType &weaponType);
+        ESM::WeaponType* insert(const ESM::WeaponType& weaponType);
 
         void setUp() override;
 
@@ -463,7 +467,8 @@ namespace MWWorld
     template <>
     class Store<ESM::Dialogue> : public DynamicStore
     {
-        typedef std::unordered_map<std::string, ESM::Dialogue, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual> Static;
+        typedef std::unordered_map<std::string, ESM::Dialogue, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual>
+            Static;
         Static mStatic;
         /// @par mShared usually preserves the record order as it came from the content files (this
         /// is relevant for the spell autocalc code and selection order
@@ -491,13 +496,13 @@ namespace MWWorld
 
         bool eraseStatic(std::string_view id) override;
 
-        RecordId load(ESM::ESMReader &esm) override;
+        RecordId load(ESM::ESMReader& esm) override;
 
-        void listIdentifier(std::vector<std::string> &list) const override;
+        void listIdentifier(std::vector<std::string>& list) const override;
 
         const MWDialogue::KeywordSearch<std::string, int>& getDialogIdKeywordSearch() const;
     };
 
-} //end namespace
+} // end namespace
 
 #endif
diff --git a/apps/openmw/mwworld/timestamp.cpp b/apps/openmw/mwworld/timestamp.cpp
index ffb1cacb86..3ffb384967 100644
--- a/apps/openmw/mwworld/timestamp.cpp
+++ b/apps/openmw/mwworld/timestamp.cpp
@@ -7,11 +7,12 @@
 
 namespace MWWorld
 {
-    TimeStamp::TimeStamp (float hour, int day)
-    : mHour (hour), mDay (day)
+    TimeStamp::TimeStamp(float hour, int day)
+        : mHour(hour)
+        , mDay(day)
     {
-        if (hour<0 || hour>=24 || day<0)
-            throw std::runtime_error ("invalid time stamp");
+        if (hour < 0 || hour >= 24 || day < 0)
+            throw std::runtime_error("invalid time stamp");
     }
 
     float TimeStamp::getHour() const
@@ -24,86 +25,86 @@ namespace MWWorld
         return mDay;
     }
 
-    TimeStamp& TimeStamp::operator+= (double hours)
+    TimeStamp& TimeStamp::operator+=(double hours)
     {
-        if (hours<0)
-            throw std::runtime_error ("can't move time stamp backwards in time");
+        if (hours < 0)
+            throw std::runtime_error("can't move time stamp backwards in time");
 
         hours += mHour;
 
-        mHour = static_cast<float> (std::fmod (hours, 24));
+        mHour = static_cast<float>(std::fmod(hours, 24));
 
         mDay += static_cast<int>(hours / 24);
 
         return *this;
     }
 
-    bool operator== (const TimeStamp& left, const TimeStamp& right)
+    bool operator==(const TimeStamp& left, const TimeStamp& right)
     {
-        return left.getHour()==right.getHour() && left.getDay()==right.getDay();
+        return left.getHour() == right.getHour() && left.getDay() == right.getDay();
     }
 
-    bool operator!= (const TimeStamp& left, const TimeStamp& right)
+    bool operator!=(const TimeStamp& left, const TimeStamp& right)
     {
-        return !(left==right);
+        return !(left == right);
     }
 
-    bool operator< (const TimeStamp& left, const TimeStamp& right)
+    bool operator<(const TimeStamp& left, const TimeStamp& right)
     {
-        if (left.getDay()<right.getDay())
+        if (left.getDay() < right.getDay())
             return true;
 
-        if (left.getDay()>right.getDay())
+        if (left.getDay() > right.getDay())
             return false;
 
-        return left.getHour()<right.getHour();
+        return left.getHour() < right.getHour();
     }
 
-    bool operator<= (const TimeStamp& left, const TimeStamp& right)
+    bool operator<=(const TimeStamp& left, const TimeStamp& right)
     {
-        return left<right || left==right;
+        return left < right || left == right;
     }
 
-    bool operator> (const TimeStamp& left, const TimeStamp& right)
+    bool operator>(const TimeStamp& left, const TimeStamp& right)
     {
-        return !(left<=right);
+        return !(left <= right);
     }
 
-    bool operator>= (const TimeStamp& left, const TimeStamp& right)
+    bool operator>=(const TimeStamp& left, const TimeStamp& right)
     {
-        return !(left<right);
+        return !(left < right);
     }
 
-    TimeStamp operator+ (const TimeStamp& stamp, double hours)
+    TimeStamp operator+(const TimeStamp& stamp, double hours)
     {
-        return TimeStamp (stamp) += hours;
+        return TimeStamp(stamp) += hours;
     }
 
-    TimeStamp operator+ (double hours, const TimeStamp& stamp)
+    TimeStamp operator+(double hours, const TimeStamp& stamp)
     {
-        return TimeStamp (stamp) += hours;
+        return TimeStamp(stamp) += hours;
     }
 
-    double operator- (const TimeStamp& left, const TimeStamp& right)
+    double operator-(const TimeStamp& left, const TimeStamp& right)
     {
-        if (left<right)
-            return -(right-left);
+        if (left < right)
+            return -(right - left);
 
         int days = left.getDay() - right.getDay();
 
         double hours = 0;
 
-        if (left.getHour()<right.getHour())
+        if (left.getHour() < right.getHour())
         {
-            hours = 24-right.getHour()+left.getHour();
+            hours = 24 - right.getHour() + left.getHour();
             --days;
         }
         else
         {
-            hours = left.getHour()-right.getHour();
+            hours = left.getHour() - right.getHour();
         }
 
-        return hours + 24*days;
+        return hours + 24 * days;
     }
 
     ESM::TimeStamp TimeStamp::toEsm() const
@@ -114,7 +115,7 @@ namespace MWWorld
         return ret;
     }
 
-    TimeStamp::TimeStamp(const ESM::TimeStamp &esm)
+    TimeStamp::TimeStamp(const ESM::TimeStamp& esm)
     {
         mDay = esm.mDay;
         mHour = esm.mHour;
diff --git a/apps/openmw/mwworld/timestamp.hpp b/apps/openmw/mwworld/timestamp.hpp
index 36d11cee06..2f2813bdbf 100644
--- a/apps/openmw/mwworld/timestamp.hpp
+++ b/apps/openmw/mwworld/timestamp.hpp
@@ -13,39 +13,38 @@ namespace MWWorld
     /// This class is based on the global variables GameHour and DaysPassed.
     class TimeStamp
     {
-            float mHour;
-            int mDay;
+        float mHour;
+        int mDay;
 
-        public:
+    public:
+        explicit TimeStamp(float hour = 0, int day = 0);
+        ///< \param hour [0, 23)
+        /// \param day >=0
 
-            explicit TimeStamp (float hour = 0, int day = 0);
-            ///< \param hour [0, 23)
-            /// \param day >=0
+        explicit TimeStamp(const ESM::TimeStamp& esm);
+        ESM::TimeStamp toEsm() const;
 
-            explicit TimeStamp (const ESM::TimeStamp& esm);
-            ESM::TimeStamp toEsm () const;
+        float getHour() const;
 
-            float getHour() const;
+        int getDay() const;
 
-            int getDay() const;
-
-            TimeStamp& operator+= (double hours);
-            ///< \param hours >=0
+        TimeStamp& operator+=(double hours);
+        ///< \param hours >=0
     };
 
-    bool operator== (const TimeStamp& left, const TimeStamp& right);
-    bool operator!= (const TimeStamp& left, const TimeStamp& right);
+    bool operator==(const TimeStamp& left, const TimeStamp& right);
+    bool operator!=(const TimeStamp& left, const TimeStamp& right);
 
-    bool operator< (const TimeStamp& left, const TimeStamp& right);
-    bool operator<= (const TimeStamp& left, const TimeStamp& right);
+    bool operator<(const TimeStamp& left, const TimeStamp& right);
+    bool operator<=(const TimeStamp& left, const TimeStamp& right);
 
-    bool operator> (const TimeStamp& left, const TimeStamp& right);
-    bool operator>= (const TimeStamp& left, const TimeStamp& right);
+    bool operator>(const TimeStamp& left, const TimeStamp& right);
+    bool operator>=(const TimeStamp& left, const TimeStamp& right);
 
-    TimeStamp operator+ (const TimeStamp& stamp, double hours);
-    TimeStamp operator+ (double hours, const TimeStamp& stamp);
+    TimeStamp operator+(const TimeStamp& stamp, double hours);
+    TimeStamp operator+(double hours, const TimeStamp& stamp);
 
-    double operator- (const TimeStamp& left, const TimeStamp& right);
+    double operator-(const TimeStamp& left, const TimeStamp& right);
     ///< Returns the difference between \a left and \a right in in-game hours.
 }
 
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 66c3b9f2d5..237cfa742d 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -4,8 +4,8 @@
 
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/esmwriter.hpp>
-#include <components/esm3/weatherstate.hpp>
 #include <components/esm3/loadregn.hpp>
+#include <components/esm3/weatherstate.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
@@ -18,46 +18,47 @@
 #include "../mwrender/renderingmanager.hpp"
 #include "../mwrender/sky.hpp"
 
-#include "player.hpp"
-#include "esmstore.hpp"
 #include "cellstore.hpp"
+#include "esmstore.hpp"
+#include "player.hpp"
 
 #include <cmath>
 
 namespace MWWorld
 {
-namespace
-{
-    static const int invalidWeatherID = -1;
-
-    // linear interpolate between x and y based on factor.
-    float lerp (float x, float y, float factor)
-    {
-        return x * (1-factor) + y * factor;
-    }
-    // linear interpolate between x and y based on factor.
-    osg::Vec4f lerp (const osg::Vec4f& x, const osg::Vec4f& y, float factor)
+    namespace
     {
-        return x * (1-factor) + y * factor;
-    }
+        static const int invalidWeatherID = -1;
 
-    osg::Vec3f calculateStormDirection(const std::string& particleEffect)
-    {
-        osg::Vec3f stormDirection = MWWorld::Weather::defaultDirection();
-        if (particleEffect == "meshes\\ashcloud.nif" || particleEffect == "meshes\\blightcloud.nif")
+        // linear interpolate between x and y based on factor.
+        float lerp(float x, float y, float factor)
         {
-            osg::Vec3f playerPos = MWMechanics::getPlayer().getRefData().getPosition().asVec3();
-            playerPos.z() = 0;
-            osg::Vec3f redMountainPos = osg::Vec3f(25000.f, 70000.f, 0.f);
-            stormDirection = (playerPos - redMountainPos);
-            stormDirection.normalize();
+            return x * (1 - factor) + y * factor;
+        }
+        // linear interpolate between x and y based on factor.
+        osg::Vec4f lerp(const osg::Vec4f& x, const osg::Vec4f& y, float factor)
+        {
+            return x * (1 - factor) + y * factor;
+        }
+
+        osg::Vec3f calculateStormDirection(const std::string& particleEffect)
+        {
+            osg::Vec3f stormDirection = MWWorld::Weather::defaultDirection();
+            if (particleEffect == "meshes\\ashcloud.nif" || particleEffect == "meshes\\blightcloud.nif")
+            {
+                osg::Vec3f playerPos = MWMechanics::getPlayer().getRefData().getPosition().asVec3();
+                playerPos.z() = 0;
+                osg::Vec3f redMountainPos = osg::Vec3f(25000.f, 70000.f, 0.f);
+                stormDirection = (playerPos - redMountainPos);
+                stormDirection.normalize();
+            }
+            return stormDirection;
         }
-        return stormDirection;
     }
-}
 
     template <typename T>
-    T TimeOfDayInterpolator<T>::getValue(const float gameHour, const TimeOfDaySettings& timeSettings, const std::string& prefix) const
+    T TimeOfDayInterpolator<T>::getValue(
+        const float gameHour, const TimeOfDaySettings& timeSettings, const std::string& prefix) const
     {
         WeatherSetting setting = timeSettings.getSetting(prefix);
         float preSunriseTime = setting.mPreSunriseTime;
@@ -69,7 +70,8 @@ namespace
         if (gameHour < timeSettings.mNightEnd - preSunriseTime || gameHour > timeSettings.mNightStart + postSunsetTime)
             return mNightValue;
         // sunrise
-        else if (gameHour >= timeSettings.mNightEnd - preSunriseTime && gameHour <= timeSettings.mDayStart + postSunriseTime)
+        else if (gameHour >= timeSettings.mNightEnd - preSunriseTime
+            && gameHour <= timeSettings.mDayStart + postSunriseTime)
         {
             float duration = timeSettings.mDayStart + postSunriseTime - timeSettings.mNightEnd + preSunriseTime;
             float middle = timeSettings.mNightEnd - preSunriseTime + duration / 2.f;
@@ -97,7 +99,8 @@ namespace
         else if (gameHour > timeSettings.mDayStart + postSunriseTime && gameHour < timeSettings.mDayEnd - preSunsetTime)
             return mDayValue;
         // sunset
-        else if (gameHour >= timeSettings.mDayEnd - preSunsetTime && gameHour <= timeSettings.mNightStart + postSunsetTime)
+        else if (gameHour >= timeSettings.mDayEnd - preSunsetTime
+            && gameHour <= timeSettings.mNightStart + postSunsetTime)
         {
             float duration = timeSettings.mNightStart + postSunsetTime - timeSettings.mDayEnd + preSunsetTime;
             float middle = timeSettings.mDayEnd - preSunsetTime + duration / 2.f;
@@ -134,33 +137,29 @@ namespace
         return direction;
     }
 
-    Weather::Weather(const std::string& name,
-                    float stormWindSpeed,
-                    float rainSpeed,
-                    float dlFactor,
-                    float dlOffset,
-                    const std::string& particleEffect)
+    Weather::Weather(const std::string& name, float stormWindSpeed, float rainSpeed, float dlFactor, float dlOffset,
+        const std::string& particleEffect)
         : mCloudTexture(Fallback::Map::getString("Weather_" + name + "_Cloud_Texture"))
-        , mSkyColor(Fallback::Map::getColour("Weather_" + name +"_Sky_Sunrise_Color"),
-                    Fallback::Map::getColour("Weather_" + name + "_Sky_Day_Color"),
-                    Fallback::Map::getColour("Weather_" + name + "_Sky_Sunset_Color"),
-                    Fallback::Map::getColour("Weather_" + name + "_Sky_Night_Color"))
+        , mSkyColor(Fallback::Map::getColour("Weather_" + name + "_Sky_Sunrise_Color"),
+              Fallback::Map::getColour("Weather_" + name + "_Sky_Day_Color"),
+              Fallback::Map::getColour("Weather_" + name + "_Sky_Sunset_Color"),
+              Fallback::Map::getColour("Weather_" + name + "_Sky_Night_Color"))
         , mFogColor(Fallback::Map::getColour("Weather_" + name + "_Fog_Sunrise_Color"),
-                    Fallback::Map::getColour("Weather_" + name + "_Fog_Day_Color"),
-                    Fallback::Map::getColour("Weather_" + name + "_Fog_Sunset_Color"),
-                    Fallback::Map::getColour("Weather_" + name + "_Fog_Night_Color"))
+              Fallback::Map::getColour("Weather_" + name + "_Fog_Day_Color"),
+              Fallback::Map::getColour("Weather_" + name + "_Fog_Sunset_Color"),
+              Fallback::Map::getColour("Weather_" + name + "_Fog_Night_Color"))
         , mAmbientColor(Fallback::Map::getColour("Weather_" + name + "_Ambient_Sunrise_Color"),
-                        Fallback::Map::getColour("Weather_" + name + "_Ambient_Day_Color"),
-                        Fallback::Map::getColour("Weather_" + name + "_Ambient_Sunset_Color"),
-                        Fallback::Map::getColour("Weather_" + name + "_Ambient_Night_Color"))
+              Fallback::Map::getColour("Weather_" + name + "_Ambient_Day_Color"),
+              Fallback::Map::getColour("Weather_" + name + "_Ambient_Sunset_Color"),
+              Fallback::Map::getColour("Weather_" + name + "_Ambient_Night_Color"))
         , mSunColor(Fallback::Map::getColour("Weather_" + name + "_Sun_Sunrise_Color"),
-                    Fallback::Map::getColour("Weather_" + name + "_Sun_Day_Color"),
-                    Fallback::Map::getColour("Weather_" + name + "_Sun_Sunset_Color"),
-                    Fallback::Map::getColour("Weather_" + name + "_Sun_Night_Color"))
+              Fallback::Map::getColour("Weather_" + name + "_Sun_Day_Color"),
+              Fallback::Map::getColour("Weather_" + name + "_Sun_Sunset_Color"),
+              Fallback::Map::getColour("Weather_" + name + "_Sun_Night_Color"))
         , mLandFogDepth(Fallback::Map::getFloat("Weather_" + name + "_Land_Fog_Day_Depth"),
-                        Fallback::Map::getFloat("Weather_" + name + "_Land_Fog_Day_Depth"),
-                        Fallback::Map::getFloat("Weather_" + name + "_Land_Fog_Day_Depth"),
-                        Fallback::Map::getFloat("Weather_" + name + "_Land_Fog_Night_Depth"))
+              Fallback::Map::getFloat("Weather_" + name + "_Land_Fog_Day_Depth"),
+              Fallback::Map::getFloat("Weather_" + name + "_Land_Fog_Day_Depth"),
+              Fallback::Map::getFloat("Weather_" + name + "_Land_Fog_Night_Depth"))
         , mSunDiscSunsetColor(Fallback::Map::getColour("Weather_" + name + "_Sun_Disc_Sunset_Color"))
         , mWindSpeed(Fallback::Map::getFloat("Weather_" + name + "_Wind_Speed"))
         , mCloudSpeed(Fallback::Map::getFloat("Weather_" + name + "_Cloud_Speed"))
@@ -191,9 +190,11 @@ namespace
         mThunderSoundID[2] = Fallback::Map::getString("Weather_" + name + "_Thunder_Sound_ID_2");
         mThunderSoundID[3] = Fallback::Map::getString("Weather_" + name + "_Thunder_Sound_ID_3");
 
-        // TODO: support weathers that have both "Ambient Loop Sound ID" and "Rain Loop Sound ID", need to play both sounds at the same time.
+        // TODO: support weathers that have both "Ambient Loop Sound ID" and "Rain Loop Sound ID", need to play both
+        // sounds at the same time.
 
-        if (!mRainEffect.empty()) // NOTE: in vanilla, the weathers with rain seem to be hardcoded; changing Using_Precip has no effect
+        if (!mRainEffect.empty()) // NOTE: in vanilla, the weathers with rain seem to be hardcoded; changing
+                                  // Using_Precip has no effect
         {
             mAmbientLoopSoundID = Fallback::Map::getString("Weather_" + name + "_Rain_Loop_Sound_ID");
             if (mAmbientLoopSoundID.empty()) // default to "rain" if not set
@@ -208,8 +209,8 @@ namespace
 
     float Weather::transitionDelta() const
     {
-        // Transition Delta describes how quickly transitioning to the weather in question will take, in Hz. Note that the
-        // measurement is in real time, not in-game time.
+        // Transition Delta describes how quickly transitioning to the weather in question will take, in Hz. Note that
+        // the measurement is in real time, not in-game time.
         return mTransitionDelta;
     }
 
@@ -222,14 +223,15 @@ namespace
     float Weather::calculateThunder(const float transitionRatio, const float elapsedSeconds, const bool isPaused)
     {
         // When paused, the flash brightness remains the same and no new strikes can occur.
-        if(!isPaused)
+        if (!isPaused)
         {
-            // Morrowind doesn't appear to do any calculations unless the transition ratio is higher than the Thunder Threshold.
-            if(transitionRatio >= mThunderThreshold && mThunderFrequency > 0.0f)
+            // Morrowind doesn't appear to do any calculations unless the transition ratio is higher than the Thunder
+            // Threshold.
+            if (transitionRatio >= mThunderThreshold && mThunderFrequency > 0.0f)
             {
                 flashDecrement(elapsedSeconds);
                 auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-                if(Misc::Rng::rollProbability(prng) <= thunderChance(transitionRatio, elapsedSeconds))
+                if (Misc::Rng::rollProbability(prng) <= thunderChance(transitionRatio, elapsedSeconds))
                 {
                     lightningAndThunder();
                 }
@@ -253,10 +255,10 @@ namespace
 
     inline float Weather::thunderChance(const float transitionRatio, const float elapsedSeconds) const
     {
-        // This formula is reversed from the observation that with Thunder Frequency set to 1, there are roughly 10 strikes
-        // per minute. It doesn't appear to be tied to in game time as Timescale doesn't affect it. Various values of
-        // Thunder Frequency seem to change the average number of strikes in a linear fashion.. During a transition, it appears to
-        // scaled based on how far past it is past the Thunder Threshold.
+        // This formula is reversed from the observation that with Thunder Frequency set to 1, there are roughly 10
+        // strikes per minute. It doesn't appear to be tied to in game time as Timescale doesn't affect it. Various
+        // values of Thunder Frequency seem to change the average number of strikes in a linear fashion.. During a
+        // transition, it appears to scaled based on how far past it is past the Thunder Threshold.
         float scaleFactor = (transitionRatio - mThunderThreshold) / (1.0f - mThunderThreshold);
         return ((mThunderFrequency * 10.0f) / 60.0f) * elapsedSeconds * scaleFactor;
     }
@@ -299,31 +301,27 @@ namespace
 
     RegionWeather::operator ESM::RegionWeatherState() const
     {
-        ESM::RegionWeatherState state =
-            {
-                mWeather,
-                mChances
-            };
+        ESM::RegionWeatherState state = { mWeather, mChances };
 
         return state;
     }
 
     void RegionWeather::setChances(const std::vector<char>& chances)
     {
-        if(mChances.size() < chances.size())
+        if (mChances.size() < chances.size())
         {
             mChances.reserve(chances.size());
         }
 
         int i = 0;
-        for(char chance : chances)
+        for (char chance : chances)
         {
             mChances[i] = chance;
             i++;
         }
 
         // Regional weather no longer supports the current type, select a new weather pattern.
-        if((static_cast<size_t>(mWeather) >= mChances.size()) || (mChances[mWeather] == 0))
+        if ((static_cast<size_t>(mWeather) >= mChances.size()) || (mChances[mWeather] == 0))
         {
             chooseNewWeather();
         }
@@ -338,7 +336,7 @@ namespace
     {
         // If the region weather was already set (by ChangeWeather, or by a previous call) then just return that value.
         // Note that the region weather will be expired periodically when the weather update timer expires.
-        if(mWeather == invalidWeatherID)
+        if (mWeather == invalidWeatherID)
         {
             chooseNewWeather();
         }
@@ -355,10 +353,10 @@ namespace
         int chance = Misc::Rng::rollDice(100, prng) + 1; // 1..100
         int sum = 0;
         int i = 0;
-        for(; static_cast<size_t>(i) < mChances.size(); ++i)
+        for (; static_cast<size_t>(i) < mChances.size(); ++i)
         {
             sum += mChances[i];
-            if(chance <= sum)
+            if (chance <= sum)
             {
                 mWeather = i;
                 return;
@@ -370,16 +368,16 @@ namespace
     }
 
     MoonModel::MoonModel(const std::string& name)
-    : mFadeInStart(Fallback::Map::getFloat("Moons_" + name + "_Fade_In_Start"))
-    , mFadeInFinish(Fallback::Map::getFloat("Moons_" + name + "_Fade_In_Finish"))
-    , mFadeOutStart(Fallback::Map::getFloat("Moons_" + name + "_Fade_Out_Start"))
-    , mFadeOutFinish(Fallback::Map::getFloat("Moons_" + name + "_Fade_Out_Finish"))
-    , mAxisOffset(Fallback::Map::getFloat("Moons_" + name + "_Axis_Offset"))
-    , mSpeed(Fallback::Map::getFloat("Moons_" + name + "_Speed"))
-    , mDailyIncrement(Fallback::Map::getFloat("Moons_" + name + "_Daily_Increment"))
-    , mFadeStartAngle(Fallback::Map::getFloat("Moons_" + name + "_Fade_Start_Angle"))
-    , mFadeEndAngle(Fallback::Map::getFloat("Moons_" + name + "_Fade_End_Angle"))
-    , mMoonShadowEarlyFadeAngle(Fallback::Map::getFloat("Moons_" + name + "_Moon_Shadow_Early_Fade_Angle"))
+        : mFadeInStart(Fallback::Map::getFloat("Moons_" + name + "_Fade_In_Start"))
+        , mFadeInFinish(Fallback::Map::getFloat("Moons_" + name + "_Fade_In_Finish"))
+        , mFadeOutStart(Fallback::Map::getFloat("Moons_" + name + "_Fade_Out_Start"))
+        , mFadeOutFinish(Fallback::Map::getFloat("Moons_" + name + "_Fade_Out_Finish"))
+        , mAxisOffset(Fallback::Map::getFloat("Moons_" + name + "_Axis_Offset"))
+        , mSpeed(Fallback::Map::getFloat("Moons_" + name + "_Speed"))
+        , mDailyIncrement(Fallback::Map::getFloat("Moons_" + name + "_Daily_Increment"))
+        , mFadeStartAngle(Fallback::Map::getFloat("Moons_" + name + "_Fade_Start_Angle"))
+        , mFadeEndAngle(Fallback::Map::getFloat("Moons_" + name + "_Fade_End_Angle"))
+        , mMoonShadowEarlyFadeAngle(Fallback::Map::getFloat("Moons_" + name + "_Moon_Shadow_Early_Fade_Angle"))
     {
         // Morrowind appears to have a minimum speed in order to avoid situations where the moon couldn't conceivably
         // complete a rotation in a single 24 hour period. The value of 180/23 was deduced from reverse engineering.
@@ -389,22 +387,19 @@ namespace
     MWRender::MoonState MoonModel::calculateState(const TimeStamp& gameTime) const
     {
         float rotationFromHorizon = angle(gameTime);
-        MWRender::MoonState state =
-            {
-                rotationFromHorizon,
-                mAxisOffset, // Reverse engineered from Morrowind's scene graph rotation matrices.
-                phase(gameTime),
-                shadowBlend(rotationFromHorizon),
-                earlyMoonShadowAlpha(rotationFromHorizon) * hourlyAlpha(gameTime.getHour())
-            };
+        MWRender::MoonState state = { rotationFromHorizon,
+            mAxisOffset, // Reverse engineered from Morrowind's scene graph rotation matrices.
+            phase(gameTime), shadowBlend(rotationFromHorizon),
+            earlyMoonShadowAlpha(rotationFromHorizon) * hourlyAlpha(gameTime.getHour()) };
 
         return state;
     }
 
     inline float MoonModel::angle(const TimeStamp& gameTime) const
     {
-        // Morrowind's moons start travel on one side of the horizon (let's call it H-rise) and travel 180 degrees to the
-        // opposite horizon (let's call it H-set). Upon reaching H-set, they reset to H-rise until the next moon rise.
+        // Morrowind's moons start travel on one side of the horizon (let's call it H-rise) and travel 180 degrees to
+        // the opposite horizon (let's call it H-set). Upon reaching H-set, they reset to H-rise until the next moon
+        // rise.
 
         // When calculating the angle of the moon, several cases have to be taken into account:
         // 1. Moon rises and then sets in one day.
@@ -413,15 +408,16 @@ namespace
         float moonRiseHourToday = moonRiseHour(gameTime.getDay());
         float moonRiseAngleToday = 0;
 
-        if(gameTime.getHour() < moonRiseHourToday)
+        if (gameTime.getHour() < moonRiseHourToday)
         {
             float moonRiseHourYesterday = moonRiseHour(gameTime.getDay() - 1);
-            if(moonRiseHourYesterday < 24)
+            if (moonRiseHourYesterday < 24)
             {
                 float moonRiseAngleYesterday = rotation(24 - moonRiseHourYesterday);
-                if(moonRiseAngleYesterday < 180)
+                if (moonRiseAngleYesterday < 180)
                 {
-                    // The moon rose but did not set yesterday, so accumulate yesterday's angle with how much we've travelled today.
+                    // The moon rose but did not set yesterday, so accumulate yesterday's angle with how much we've
+                    // travelled today.
                     moonRiseAngleToday = rotation(gameTime.getHour()) + moonRiseAngleYesterday;
                 }
             }
@@ -431,7 +427,7 @@ namespace
             moonRiseAngleToday = rotation(gameTime.getHour() - moonRiseHourToday);
         }
 
-        if(moonRiseAngleToday >= 180)
+        if (moonRiseAngleToday >= 180)
         {
             // The moon set today, reset the angle to the horizon.
             moonRiseAngleToday = 0;
@@ -464,10 +460,11 @@ namespace
 
     MWRender::MoonState::Phase MoonModel::phase(const TimeStamp& gameTime) const
     {
-        // Morrowind starts with a full moon on 16 Last Seed and then begins to wane 17 Last Seed, working on 3 day phase cycle.
+        // Morrowind starts with a full moon on 16 Last Seed and then begins to wane 17 Last Seed, working on 3 day
+        // phase cycle.
 
         // If the moon didn't rise yet today, use yesterday's moon phase.
-        if(gameTime.getHour() < moonRiseHour(gameTime.getDay()))
+        if (gameTime.getHour() < moonRiseHour(gameTime.getDay()))
             return static_cast<MWRender::MoonState::Phase>((gameTime.getDay() / 3) % 8);
         else
             return static_cast<MWRender::MoonState::Phase>(((gameTime.getDay() + 1) / 3) % 8);
@@ -486,11 +483,11 @@ namespace
         float fadeAngle = mFadeStartAngle - mFadeEndAngle;
         float fadeEndAngle2 = 180.0f - mFadeEndAngle;
         float fadeStartAngle2 = 180.0f - mFadeStartAngle;
-        if((angle >= mFadeEndAngle) && (angle < mFadeStartAngle))
+        if ((angle >= mFadeEndAngle) && (angle < mFadeStartAngle))
             return (angle - mFadeEndAngle) / fadeAngle;
-        else if((angle >= mFadeStartAngle) && (angle < fadeStartAngle2))
+        else if ((angle >= mFadeStartAngle) && (angle < fadeStartAngle2))
             return 1.0f;
-        else if((angle >= fadeStartAngle2) && (angle < fadeEndAngle2))
+        else if ((angle >= fadeStartAngle2) && (angle < fadeEndAngle2))
             return (fadeEndAngle2 - angle) / fadeAngle;
         else
             return 0.0f;
@@ -505,11 +502,11 @@ namespace
         // 2. From Fade Out Finish to Fade In Start: 0 (transparent)
         // 3. From Fade In Start to Fade In Finish: 0..1
         // 4. From Fade In Finish to Fade Out Start: 1 (solid)
-        if((gameHour >= mFadeOutStart) && (gameHour < mFadeOutFinish))
+        if ((gameHour >= mFadeOutStart) && (gameHour < mFadeOutFinish))
             return (mFadeOutFinish - gameHour) / (mFadeOutFinish - mFadeOutStart);
-        else if((gameHour >= mFadeOutFinish) && (gameHour < mFadeInStart))
+        else if ((gameHour >= mFadeOutFinish) && (gameHour < mFadeInStart))
             return 0.0f;
-        else if((gameHour >= mFadeInStart) && (gameHour < mFadeInFinish))
+        else if ((gameHour >= mFadeInStart) && (gameHour < mFadeInFinish))
             return (gameHour - mFadeInStart) / (mFadeInFinish - mFadeInStart);
         else
             return 1.0f;
@@ -526,11 +523,11 @@ namespace
         float moonShadowEarlyFadeAngle1 = mFadeEndAngle - mMoonShadowEarlyFadeAngle;
         float fadeEndAngle2 = 180.0f - mFadeEndAngle;
         float moonShadowEarlyFadeAngle2 = fadeEndAngle2 + mMoonShadowEarlyFadeAngle;
-        if((angle >= moonShadowEarlyFadeAngle1) && (angle < mFadeEndAngle))
+        if ((angle >= moonShadowEarlyFadeAngle1) && (angle < mFadeEndAngle))
             return (angle - moonShadowEarlyFadeAngle1) / mMoonShadowEarlyFadeAngle;
-        else if((angle >= mFadeEndAngle) && (angle < fadeEndAngle2))
+        else if ((angle >= mFadeEndAngle) && (angle < fadeEndAngle2))
             return 1.0f;
-        else if((angle >= fadeEndAngle2) && (angle < moonShadowEarlyFadeAngle2))
+        else if ((angle >= fadeEndAngle2) && (angle < moonShadowEarlyFadeAngle2))
             return (moonShadowEarlyFadeAngle2 - angle) / mMoonShadowEarlyFadeAngle;
         else
             return 0.0f;
@@ -548,9 +545,8 @@ namespace
         , mHoursBetweenWeatherChanges(Fallback::Map::getFloat("Weather_Hours_Between_Weather_Changes"))
         , mRainSpeed(Fallback::Map::getFloat("Weather_Precip_Gravity"))
         , mUnderwaterFog(Fallback::Map::getFloat("Water_UnderwaterSunriseFog"),
-                        Fallback::Map::getFloat("Water_UnderwaterDayFog"),
-                        Fallback::Map::getFloat("Water_UnderwaterSunsetFog"),
-                        Fallback::Map::getFloat("Water_UnderwaterNightFog"))
+              Fallback::Map::getFloat("Water_UnderwaterDayFog"), Fallback::Map::getFloat("Water_UnderwaterSunsetFog"),
+              Fallback::Map::getFloat("Water_UnderwaterNightFog"))
         , mWeatherSettings()
         , mMasser("Masser")
         , mSecunda("Secunda")
@@ -589,12 +585,10 @@ namespace
         mTimeSettings.mStarsPreSunriseFinish = Fallback::Map::getFloat("Weather_Stars_Pre-Sunrise_Finish");
         mTimeSettings.mStarsFadingDuration = Fallback::Map::getFloat("Weather_Stars_Fading_Duration");
 
-        WeatherSetting starSetting = {
-            mTimeSettings.mStarsPreSunriseFinish,
+        WeatherSetting starSetting = { mTimeSettings.mStarsPreSunriseFinish,
             mTimeSettings.mStarsFadingDuration - mTimeSettings.mStarsPreSunriseFinish,
             mTimeSettings.mStarsPostSunsetStart,
-            mTimeSettings.mStarsFadingDuration - mTimeSettings.mStarsPostSunsetStart
-        };
+            mTimeSettings.mStarsFadingDuration - mTimeSettings.mStarsPostSunsetStart };
 
         mTimeSettings.mSunriseTransitions["Stars"] = starSetting;
 
@@ -613,7 +607,7 @@ namespace
         addWeather("Blizzard", 0.16f, 70.0f, "meshes\\blizzard.nif"); // 9
 
         Store<ESM::Region>::iterator it = store.get<ESM::Region>().begin();
-        for(; it != store.get<ESM::Region>().end(); ++it)
+        for (; it != store.get<ESM::Region>().end(); ++it)
         {
             std::string regionID = Misc::StringUtils::lowerCase(it->mId);
             mRegions.insert(std::make_pair(regionID, RegionWeather(*it)));
@@ -631,17 +625,18 @@ namespace
     {
         // In Morrowind, this seems to have the following behavior, when applied to the current region:
         // - When there is no transition in progress, start transitioning to the new weather.
-        // - If there is a transition in progress, queue up the transition and process it when the current one completes.
+        // - If there is a transition in progress, queue up the transition and process it when the current one
+        // completes.
         // - If there is a transition in progress, and a queued transition, overwrite the queued transition.
         // - If multiple calls to ChangeWeather are made while paused (console up), only the last call will be used,
         //   meaning that if there was no transition in progress, only the last ChangeWeather will be processed.
         // If the region isn't current, Morrowind will store the new weather for the region in question.
 
-        if(weatherID < mWeatherSettings.size())
+        if (weatherID < mWeatherSettings.size())
         {
             std::string lowerCaseRegionID = Misc::StringUtils::lowerCase(regionID);
             std::map<std::string, RegionWeather>::iterator it = mRegions.find(lowerCaseRegionID);
-            if(it != mRegions.end())
+            if (it != mRegions.end())
             {
                 it->second.setWeather(weatherID);
                 regionalWeatherChanged(it->first, it->second);
@@ -661,7 +656,7 @@ namespace
 
         std::string lowerCaseRegionID = Misc::StringUtils::lowerCase(regionID);
         std::map<std::string, RegionWeather>::iterator it = mRegions.find(lowerCaseRegionID);
-        if(it != mRegions.end())
+        if (it != mRegions.end())
         {
             it->second.setChances(chances);
             regionalWeatherChanged(it->first, it->second);
@@ -670,11 +665,11 @@ namespace
 
     void WeatherManager::playerTeleported(const std::string& playerRegion, bool isExterior)
     {
-        // If the player teleports to an outdoors cell in a new region (for instance, by travelling), the weather needs to
-        // be changed immediately, and any transitions for the previous region discarded.
+        // If the player teleports to an outdoors cell in a new region (for instance, by travelling), the weather needs
+        // to be changed immediately, and any transitions for the previous region discarded.
         {
             std::map<std::string, RegionWeather>::iterator it = mRegions.find(playerRegion);
-            if(it != mRegions.end() && playerRegion != mCurrentRegion)
+            if (it != mRegions.end() && playerRegion != mCurrentRegion)
             {
                 mCurrentRegion = playerRegion;
                 forceWeather(it->second.getWeather());
@@ -702,14 +697,14 @@ namespace
     {
         MWWorld::ConstPtr player = MWMechanics::getPlayer();
 
-        if(!paused || mFastForward)
+        if (!paused || mFastForward)
         {
             // Add new transitions when either the player's current external region changes.
             std::string playerRegion = Misc::StringUtils::lowerCase(player.getCell()->getCell()->mRegion);
-            if(updateWeatherTime() || updateWeatherRegion(playerRegion))
+            if (updateWeatherTime() || updateWeatherRegion(playerRegion))
             {
                 std::map<std::string, RegionWeather>::iterator it = mRegions.find(mCurrentRegion);
-                if(it != mRegions.end())
+                if (it != mRegions.end())
                 {
                     addWeatherTransition(it->second.getWeather());
                 }
@@ -726,7 +721,7 @@ namespace
         else
             mNightDayMode = Default;
 
-        if(!isExterior)
+        if (!isExterior)
         {
             mRendering.setSkyEnabled(false);
             stopSounds();
@@ -749,7 +744,7 @@ namespace
 
         // For some reason Ash Storm is not considered as a precipitation weather in game
         mPrecipitation = !(mResult.mParticleEffect.empty() && mResult.mRainEffect.empty())
-                                        && mResult.mParticleEffect != "meshes\\ashcloud.nif";
+            && mResult.mParticleEffect != "meshes\\ashcloud.nif";
 
         mStormDirection = calculateStormDirection(mResult.mParticleEffect);
         mRendering.getSkyManager()->setStormParticleDirection(mStormDirection);
@@ -767,9 +762,9 @@ namespace
             // Shift times into a 24-hour window beginning at mSunriseTime...
             float adjustedHour = time.getHour();
             float adjustedNightStart = mTimeSettings.mNightStart;
-            if ( time.getHour() < mSunriseTime )
+            if (time.getHour() < mSunriseTime)
                 adjustedHour += 24.f;
-            if ( mTimeSettings.mNightStart < mSunriseTime )
+            if (mTimeSettings.mNightStart < mSunriseTime)
                 adjustedNightStart += 24.f;
 
             const bool is_night = adjustedHour >= adjustedNightStart;
@@ -777,20 +772,20 @@ namespace
             const float nightDuration = 24.f - dayDuration;
 
             double theta;
-            if ( !is_night )
+            if (!is_night)
             {
                 theta = static_cast<float>(osg::PI) * (adjustedHour - mSunriseTime) / dayDuration;
             }
             else
             {
-                theta = static_cast<float>(osg::PI) - static_cast<float>(osg::PI) * (adjustedHour - adjustedNightStart) / nightDuration;
+                theta = static_cast<float>(osg::PI)
+                    - static_cast<float>(osg::PI) * (adjustedHour - adjustedNightStart) / nightDuration;
             }
 
-            osg::Vec3f final(
-                static_cast<float>(cos(theta)),
+            osg::Vec3f final(static_cast<float>(cos(theta)),
                 -0.268f, // approx tan( -15 degrees )
                 static_cast<float>(sin(theta)));
-            mRendering.setSunDirection( final * -1 );
+            mRendering.setSunDirection(final * -1);
             mRendering.setNight(is_night);
         }
 
@@ -810,10 +805,11 @@ namespace
         mRendering.getSkyManager()->setMasserState(mMasser.calculateState(time));
         mRendering.getSkyManager()->setSecundaState(mSecunda.calculateState(time));
 
-        mRendering.configureFog(mResult.mFogDepth, underwaterFog, mResult.mDLFogFactor,
-                                mResult.mDLFogOffset/100.0f, mResult.mFogColor);
+        mRendering.configureFog(
+            mResult.mFogDepth, underwaterFog, mResult.mDLFogFactor, mResult.mDLFogOffset / 100.0f, mResult.mFogColor);
         mRendering.setAmbientColour(mResult.mAmbientColor);
-        mRendering.setSunColour(mResult.mSunColor, mResult.mSunColor * mResult.mGlareView * glareFade, mResult.mGlareView * glareFade);
+        mRendering.setSunColour(
+            mResult.mSunColor, mResult.mSunColor * mResult.mGlareView * glareFade, mResult.mGlareView * glareFade);
 
         mRendering.getSkyManager()->setWeather(mResult);
 
@@ -822,10 +818,8 @@ namespace
         {
             stopSounds();
             if (!mResult.mAmbientLoopSoundID.empty())
-                mAmbientSound = MWBase::Environment::get().getSoundManager()->playSound(
-                    mResult.mAmbientLoopSoundID, mResult.mAmbientSoundVolume, 1.0,
-                    MWSound::Type::Sfx, MWSound::PlayMode::Loop
-                );
+                mAmbientSound = MWBase::Environment::get().getSoundManager()->playSound(mResult.mAmbientLoopSoundID,
+                    mResult.mAmbientSoundVolume, 1.0, MWSound::Type::Sfx, MWSound::PlayMode::Loop);
             mPlayingSoundID = mResult.mAmbientLoopSoundID;
         }
         else if (mAmbientSound)
@@ -891,7 +885,8 @@ namespace
         if (inTransition() && mTransitionFactor < mWeatherSettings[mNextWeather].mCloudsMaximumPercent)
         {
             float t = mTransitionFactor / mWeatherSettings[mNextWeather].mCloudsMaximumPercent;
-            return (1.f - t) * mWeatherSettings[mCurrentWeather].mGlareView + t * mWeatherSettings[mNextWeather].mGlareView;
+            return (1.f - t) * mWeatherSettings[mCurrentWeather].mGlareView
+                + t * mWeatherSettings[mNextWeather].mGlareView;
         }
         return mWeatherSettings[mCurrentWeather].mGlareView;
     }
@@ -909,7 +904,7 @@ namespace
         state.mQueuedWeather = mQueuedWeather;
 
         std::map<std::string, RegionWeather>::iterator it = mRegions.begin();
-        for(; it != mRegions.end(); ++it)
+        for (; it != mRegions.end(); ++it)
         {
             state.mRegions.insert(std::make_pair(it->first, it->second));
         }
@@ -921,13 +916,13 @@ namespace
 
     bool WeatherManager::readRecord(ESM::ESMReader& reader, uint32_t type)
     {
-        if(ESM::REC_WTHR == type)
+        if (ESM::REC_WTHR == type)
         {
             static const int oldestCompatibleSaveFormat = 2;
-            if(reader.getFormat() < oldestCompatibleSaveFormat)
+            if (reader.getFormat() < oldestCompatibleSaveFormat)
             {
-                // Weather state isn't really all that important, so to preserve older save games, we'll just discard the
-                // older weather records, rather than fail to handle the record.
+                // Weather state isn't really all that important, so to preserve older save games, we'll just discard
+                // the older weather records, rather than fail to handle the record.
                 reader.skipRecord();
             }
             else
@@ -947,7 +942,8 @@ namespace
                 mRegions.clear();
                 importRegions();
 
-                for(std::map<std::string, ESM::RegionWeatherState>::iterator it = state.mRegions.begin(); it != state.mRegions.end(); ++it)
+                for (std::map<std::string, ESM::RegionWeatherState>::iterator it = state.mRegions.begin();
+                     it != state.mRegions.end(); ++it)
                 {
                     std::map<std::string, RegionWeather>::iterator found = mRegions.find(it->first);
                     if (found != mRegions.end())
@@ -975,9 +971,8 @@ namespace
         importRegions();
     }
 
-    inline void WeatherManager::addWeather(const std::string& name,
-                                        float dlFactor, float dlOffset,
-                                        const std::string& particleEffect)
+    inline void WeatherManager::addWeather(
+        const std::string& name, float dlFactor, float dlOffset, const std::string& particleEffect)
     {
         static const float fStromWindSpeed = mStore.get<ESM::GameSetting>().find("fStromWindSpeed")->mValue.getFloat();
 
@@ -988,7 +983,7 @@ namespace
 
     inline void WeatherManager::importRegions()
     {
-        for(const ESM::Region& region : mStore.get<ESM::Region>())
+        for (const ESM::Region& region : mStore.get<ESM::Region>())
         {
             std::string regionID = Misc::StringUtils::lowerCase(region.mId);
             mRegions.insert(std::make_pair(regionID, RegionWeather(region)));
@@ -999,9 +994,9 @@ namespace
     {
         // If the region is current, then add a weather transition for it.
         MWWorld::ConstPtr player = MWMechanics::getPlayer();
-        if(player.isInCell())
+        if (player.isInCell())
         {
-            if(Misc::StringUtils::ciEqual(regionID, mCurrentRegion))
+            if (Misc::StringUtils::ciEqual(regionID, mCurrentRegion))
             {
                 addWeatherTransition(region.getWeather());
             }
@@ -1012,11 +1007,11 @@ namespace
     {
         mWeatherUpdateTime -= mTimePassed;
         mTimePassed = 0.0f;
-        if(mWeatherUpdateTime <= 0.0f)
+        if (mWeatherUpdateTime <= 0.0f)
         {
             // Expire all regional weather, so that any call to getWeather() will return a new weather ID.
             std::map<std::string, RegionWeather>::iterator it = mRegions.begin();
-            for(; it != mRegions.end(); ++it)
+            for (; it != mRegions.end(); ++it)
             {
                 it->second.setWeather(invalidWeatherID);
             }
@@ -1031,7 +1026,7 @@ namespace
 
     inline bool WeatherManager::updateWeatherRegion(const std::string& playerRegion)
     {
-        if(!playerRegion.empty() && playerRegion != mCurrentRegion)
+        if (!playerRegion.empty() && playerRegion != mCurrentRegion)
         {
             mCurrentRegion = playerRegion;
 
@@ -1045,18 +1040,19 @@ namespace
     {
         // When a player chooses to train, wait, or serves jail time, any transitions will be fast forwarded to the last
         // weather type set, regardless of the remaining transition time.
-        if(!mFastForward && inTransition())
+        if (!mFastForward && inTransition())
         {
             const float delta = mWeatherSettings[mNextWeather].transitionDelta();
             mTransitionFactor -= elapsedRealSeconds * delta;
-            if(mTransitionFactor <= 0.0f)
+            if (mTransitionFactor <= 0.0f)
             {
                 mCurrentWeather = mNextWeather;
                 mNextWeather = mQueuedWeather;
                 mQueuedWeather = invalidWeatherID;
 
-                // We may have begun processing the queued transition, so we need to apply the remaining time towards it.
-                if(inTransition())
+                // We may have begun processing the queued transition, so we need to apply the remaining time towards
+                // it.
+                if (inTransition())
                 {
                     const float newDelta = mWeatherSettings[mNextWeather].transitionDelta();
                     const float remainingSeconds = -(mTransitionFactor / delta);
@@ -1070,11 +1066,11 @@ namespace
         }
         else
         {
-            if(mQueuedWeather != invalidWeatherID)
+            if (mQueuedWeather != invalidWeatherID)
             {
                 mCurrentWeather = mQueuedWeather;
             }
-            else if(mNextWeather != invalidWeatherID)
+            else if (mNextWeather != invalidWeatherID)
             {
                 mCurrentWeather = mNextWeather;
             }
@@ -1100,28 +1096,27 @@ namespace
 
     inline void WeatherManager::addWeatherTransition(const int weatherID)
     {
-        // In order to work like ChangeWeather expects, this method begins transitioning to the new weather immediately if
-        // no transition is in progress, otherwise it queues it to be transitioned.
+        // In order to work like ChangeWeather expects, this method begins transitioning to the new weather immediately
+        // if no transition is in progress, otherwise it queues it to be transitioned.
 
         assert(weatherID >= 0 && static_cast<size_t>(weatherID) < mWeatherSettings.size());
 
-        if(!inTransition() && (weatherID != mCurrentWeather))
+        if (!inTransition() && (weatherID != mCurrentWeather))
         {
             mNextWeather = weatherID;
             mTransitionFactor = 1.0f;
         }
-        else if(inTransition() && (weatherID != mNextWeather))
+        else if (inTransition() && (weatherID != mNextWeather))
         {
             mQueuedWeather = weatherID;
         }
     }
 
-    inline void WeatherManager::calculateWeatherResult(const float gameHour,
-                                                    const float elapsedSeconds,
-                                                    const bool isPaused)
+    inline void WeatherManager::calculateWeatherResult(
+        const float gameHour, const float elapsedSeconds, const bool isPaused)
     {
         float flash = 0.0f;
-        if(!inTransition())
+        if (!inTransition())
         {
             calculateResult(mCurrentWeather, gameHour);
             flash = mWeatherSettings[mCurrentWeather].calculateThunder(1.0f, elapsedSeconds, isPaused);
@@ -1129,12 +1124,10 @@ namespace
         else
         {
             calculateTransitionResult(1 - mTransitionFactor, gameHour);
-            float currentFlash = mWeatherSettings[mCurrentWeather].calculateThunder(mTransitionFactor,
-                                                                                    elapsedSeconds,
-                                                                                    isPaused);
-            float nextFlash = mWeatherSettings[mNextWeather].calculateThunder(1 - mTransitionFactor,
-                                                                            elapsedSeconds,
-                                                                            isPaused);
+            float currentFlash
+                = mWeatherSettings[mCurrentWeather].calculateThunder(mTransitionFactor, elapsedSeconds, isPaused);
+            float nextFlash
+                = mWeatherSettings[mNextWeather].calculateThunder(1 - mTransitionFactor, elapsedSeconds, isPaused);
             flash = currentFlash + nextFlash;
         }
         osg::Vec4f flashColor(flash, flash, flash, 0.0f);
@@ -1172,7 +1165,9 @@ namespace
         mResult.mParticleEffect = current.mParticleEffect;
         mResult.mRainEffect = current.mRainEffect;
 
-        mResult.mNight = (gameHour < mSunriseTime || gameHour > mTimeSettings.mNightStart + mTimeSettings.mStarsPostSunsetStart - mTimeSettings.mStarsFadingDuration);
+        mResult.mNight = (gameHour < mSunriseTime
+            || gameHour
+                > mTimeSettings.mNightStart + mTimeSettings.mStarsPostSunsetStart - mTimeSettings.mStarsFadingDuration);
 
         mResult.mFogDepth = current.mLandFogDepth.getValue(gameHour, mTimeSettings, "Fog");
         mResult.mFogColor = current.mFogColor.getValue(gameHour, mTimeSettings, "Fog");
@@ -1192,23 +1187,26 @@ namespace
             if (preSunsetTime > 0)
                 factor = (gameHour - (mTimeSettings.mDayEnd - preSunsetTime)) / preSunsetTime;
             factor = std::min(1.f, factor);
-            mResult.mSunDiscColor = lerp(osg::Vec4f(1,1,1,1), current.mSunDiscSunsetColor, factor);
+            mResult.mSunDiscColor = lerp(osg::Vec4f(1, 1, 1, 1), current.mSunDiscSunsetColor, factor);
             // The SunDiscSunsetColor in the INI isn't exactly the resulting color on screen, most likely because
-            // MW applied the color to the ambient term as well. After the ambient and emissive terms are added together, the fixed pipeline
-            // would then clamp the total lighting to (1,1,1). A noticeable change in color tone can be observed when only one of the color components gets clamped.
-            // Unfortunately that means we can't use the INI color as is, have to replicate the above nonsense.
-            mResult.mSunDiscColor = mResult.mSunDiscColor + osg::componentMultiply(mResult.mSunDiscColor, mResult.mAmbientColor);
-            for (int i=0; i<3; ++i)
+            // MW applied the color to the ambient term as well. After the ambient and emissive terms are added
+            // together, the fixed pipeline would then clamp the total lighting to (1,1,1). A noticeable change in color
+            // tone can be observed when only one of the color components gets clamped. Unfortunately that means we
+            // can't use the INI color as is, have to replicate the above nonsense.
+            mResult.mSunDiscColor
+                = mResult.mSunDiscColor + osg::componentMultiply(mResult.mSunDiscColor, mResult.mAmbientColor);
+            for (int i = 0; i < 3; ++i)
                 mResult.mSunDiscColor[i] = std::min(1.f, mResult.mSunDiscColor[i]);
         }
         else
-            mResult.mSunDiscColor = osg::Vec4f(1,1,1,1);
+            mResult.mSunDiscColor = osg::Vec4f(1, 1, 1, 1);
 
         if (gameHour >= mTimeSettings.mDayEnd)
         {
             // sunset
-            float fade = std::min(1.f, (gameHour - mTimeSettings.mDayEnd) / (mTimeSettings.mNightStart - mTimeSettings.mDayEnd));
-            fade = fade*fade;
+            float fade = std::min(
+                1.f, (gameHour - mTimeSettings.mDayEnd) / (mTimeSettings.mNightStart - mTimeSettings.mDayEnd));
+            fade = fade * fade;
             mResult.mSunDiscColor.a() = 1.f - fade;
         }
         else if (gameHour >= mTimeSettings.mNightEnd && gameHour <= mTimeSettings.mNightEnd + mSunriseDuration / 2.f)
@@ -1261,7 +1259,7 @@ namespace
         if (threshold <= 0.f)
             threshold = 0.5f;
 
-        if(factor < threshold)
+        if (factor < threshold)
         {
             mResult.mIsStorm = current.mIsStorm;
             mResult.mParticleEffect = current.mParticleEffect;
@@ -1294,4 +1292,3 @@ namespace
         }
     }
 }
-
diff --git a/apps/openmw/mwworld/weather.hpp b/apps/openmw/mwworld/weather.hpp
index 5b706f598c..21fad8ea2b 100644
--- a/apps/openmw/mwworld/weather.hpp
+++ b/apps/openmw/mwworld/weather.hpp
@@ -2,8 +2,8 @@
 #define GAME_MWWORLD_WEATHER_H
 
 #include <cstdint>
-#include <string>
 #include <map>
+#include <string>
 
 #include <osg/Vec4f>
 
@@ -83,12 +83,10 @@ namespace MWWorld
 
         void addSetting(const std::string& type)
         {
-            WeatherSetting setting = {
-                Fallback::Map::getFloat("Weather_" + type + "_Pre-Sunrise_Time"),
+            WeatherSetting setting = { Fallback::Map::getFloat("Weather_" + type + "_Pre-Sunrise_Time"),
                 Fallback::Map::getFloat("Weather_" + type + "_Post-Sunrise_Time"),
                 Fallback::Map::getFloat("Weather_" + type + "_Pre-Sunset_Time"),
-                Fallback::Map::getFloat("Weather_" + type + "_Post-Sunset_Time")
-            };
+                Fallback::Map::getFloat("Weather_" + type + "_Post-Sunset_Time") };
 
             mSunriseTransitions[type] = setting;
         }
@@ -101,11 +99,14 @@ namespace MWWorld
     {
     public:
         TimeOfDayInterpolator(const T& sunrise, const T& day, const T& sunset, const T& night)
-            : mSunriseValue(sunrise), mDayValue(day), mSunsetValue(sunset), mNightValue(night)
+            : mSunriseValue(sunrise)
+            , mDayValue(day)
+            , mSunsetValue(sunset)
+            , mNightValue(night)
         {
         }
 
-        T getValue (const float gameHour, const TimeOfDaySettings& timeSettings, const std::string& prefix) const;
+        T getValue(const float gameHour, const TimeOfDaySettings& timeSettings, const std::string& prefix) const;
 
     private:
         T mSunriseValue, mDayValue, mSunsetValue, mNightValue;
@@ -117,12 +118,8 @@ namespace MWWorld
     public:
         static osg::Vec3f defaultDirection();
 
-        Weather(const std::string& name,
-                float stormWindSpeed,
-                float rainSpeed,
-                float dlFactor,
-                float dlOffset,
-                const std::string& particleEffect);
+        Weather(const std::string& name, float stormWindSpeed, float rainSpeed, float dlFactor, float dlOffset,
+            const std::string& particleEffect);
 
         std::string mCloudTexture;
 
@@ -152,7 +149,8 @@ namespace MWWorld
         float mGlareView;
 
         // Fog factor and offset used with distant land rendering.
-        struct {
+        struct
+        {
             float FogFactor;
             float FogOffset;
         } mDL;
@@ -163,7 +161,8 @@ namespace MWWorld
 
         // Is this an ash storm / blight storm? If so, the following will happen:
         // - The particles and clouds will be oriented so they appear to come from the Red Mountain.
-        // - Characters will animate their hand to protect eyes from the storm when looking in its direction (idlestorm animation)
+        // - Characters will animate their hand to protect eyes from the storm when looking in its direction (idlestorm
+        // animation)
         // - Slower movement when walking against the storm (fStromWalkMult)
         bool mIsStorm;
 
@@ -369,12 +368,11 @@ namespace MWWorld
         std::map<std::string, RegionWeather> mRegions;
         MWRender::WeatherResult mResult;
 
-        MWBase::Sound *mAmbientSound;
+        MWBase::Sound* mAmbientSound;
         std::string mPlayingSoundID;
 
-        void addWeather(const std::string& name,
-                        float dlFactor, float dlOffset,
-                        const std::string& particleEffect = "");
+        void addWeather(
+            const std::string& name, float dlFactor, float dlOffset, const std::string& particleEffect = "");
 
         void importRegions();
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index e82153c39b..026440d254 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2,8 +2,8 @@
 
 #include <charconv>
 
-#include <osg/Group>
 #include <osg/ComputeBoundsVisitor>
+#include <osg/Group>
 #include <osg/Timer>
 
 #include <MyGUI_TextIterator.h>
@@ -12,89 +12,89 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm3/esmreader.hpp>
-#include <components/esm3/esmwriter.hpp>
 #include <components/esm3/cellid.hpp>
 #include <components/esm3/cellref.hpp>
-#include <components/esm3/loadgmst.hpp>
-#include <components/esm3/loadregn.hpp>
-#include <components/esm3/loadench.hpp>
-#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/esm3/loadclas.hpp>
 #include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadregn.hpp>
 #include <components/esm3/loadstat.hpp>
 
 #include <components/misc/constants.hpp>
+#include <components/misc/convert.hpp>
 #include <components/misc/mathutil.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/rng.hpp>
-#include <components/misc/convert.hpp>
 
 #include <components/files/collections.hpp>
 
 #include <components/resource/bulletshape.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/sceneutil/lightmanager.hpp>
+#include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/sceneutil/workqueue.hpp>
 
+#include <components/detournavigator/agentbounds.hpp>
 #include <components/detournavigator/navigator.hpp>
+#include <components/detournavigator/navigatorimpl.hpp>
 #include <components/detournavigator/settings.hpp>
-#include <components/detournavigator/agentbounds.hpp>
 #include <components/detournavigator/stats.hpp>
-#include <components/detournavigator/navigatorimpl.hpp>
 
-#include <components/loadinglistener/loadinglistener.hpp>
 #include <components/files/conversion.hpp>
+#include <components/loadinglistener/loadinglistener.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/soundmanager.hpp"
+#include "../mwbase/luamanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/scriptmanager.hpp"
-#include "../mwbase/luamanager.hpp"
+#include "../mwbase/soundmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
 
+#include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/aiavoiddoor.hpp" //Used to tell actors to avoid doors
+#include "../mwmechanics/combat.hpp"
 #include "../mwmechanics/creaturestats.hpp"
+#include "../mwmechanics/levelledlist.hpp"
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/spellcasting.hpp"
 #include "../mwmechanics/spellutil.hpp"
-#include "../mwmechanics/levelledlist.hpp"
-#include "../mwmechanics/combat.hpp"
-#include "../mwmechanics/aiavoiddoor.hpp" //Used to tell actors to avoid doors
 #include "../mwmechanics/summoning.hpp"
-#include "../mwmechanics/actorutil.hpp"
 
 #include "../mwrender/animation.hpp"
+#include "../mwrender/camera.hpp"
 #include "../mwrender/npcanimation.hpp"
+#include "../mwrender/postprocessor.hpp"
 #include "../mwrender/renderingmanager.hpp"
-#include "../mwrender/camera.hpp"
 #include "../mwrender/vismask.hpp"
-#include "../mwrender/postprocessor.hpp"
 
 #include "../mwscript/globalscripts.hpp"
 
 #include "../mwclass/door.hpp"
 
-#include "../mwphysics/physicssystem.hpp"
 #include "../mwphysics/actor.hpp"
 #include "../mwphysics/collisiontype.hpp"
-#include "../mwphysics/object.hpp"
 #include "../mwphysics/constants.hpp"
+#include "../mwphysics/object.hpp"
+#include "../mwphysics/physicssystem.hpp"
 
-#include "datetimemanager.hpp"
-#include "player.hpp"
-#include "manualref.hpp"
+#include "actionteleport.hpp"
 #include "cellstore.hpp"
 #include "containerstore.hpp"
+#include "datetimemanager.hpp"
 #include "inventorystore.hpp"
-#include "actionteleport.hpp"
+#include "manualref.hpp"
+#include "player.hpp"
 #include "projectilemanager.hpp"
 #include "weather.hpp"
 
+#include "cellutils.hpp"
 #include "contentloader.hpp"
 #include "esmloader.hpp"
-#include "cellutils.hpp"
 
 namespace MWWorld
 {
@@ -107,7 +107,8 @@ namespace MWWorld
 
         void load(const std::filesystem::path& filepath, int& index, Loading::Listener* listener) override
         {
-            const auto it = mLoaders.find(Misc::StringUtils::lowerCase( Files::pathToUnicodeString(filepath.extension())));
+            const auto it
+                = mLoaders.find(Misc::StringUtils::lowerCase(Files::pathToUnicodeString(filepath.extension())));
             if (it != mLoaders.end())
             {
                 const auto filename = filepath.filename();
@@ -124,14 +125,17 @@ namespace MWWorld
             }
         }
 
-        private:
-            std::map<std::string, ContentLoader*> mLoaders;
+    private:
+        std::map<std::string, ContentLoader*> mLoaders;
     };
 
     struct OMWScriptsLoader : public ContentLoader
     {
         ESMStore& mStore;
-        OMWScriptsLoader(ESMStore& store) : mStore(store) {}
+        OMWScriptsLoader(ESMStore& store)
+            : mStore(store)
+        {
+        }
         void load(const std::filesystem::path& filepath, int& /*index*/, Loading::Listener* /*listener*/) override
         {
             mStore.addOMWScripts(filepath);
@@ -149,27 +153,34 @@ namespace MWWorld
             mRendering->setSkyEnabled(false);
     }
 
-    World::World (
-        osgViewer::Viewer* viewer,
-        osg::ref_ptr<osg::Group> rootNode,
-        Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
-        SceneUtil::UnrefQueue& unrefQueue,
-        const Files::Collections& fileCollections,
-        const std::vector<std::string>& contentFiles,
-        const std::vector<std::string>& groundcoverFiles,
-        ToUTF8::Utf8Encoder* encoder, int activationDistanceOverride,
-        const std::string& startCell, const std::string& startupScript,
-        const std::filesystem::path& resourcePath, const std::filesystem::path& userDataPath)
-    : mResourceSystem(resourceSystem), mLocalScripts(mStore),
-      mCells(mStore, mReaders), mSky(true),
-      mGodMode(false), mScriptsEnabled(true), mDiscardMovements(true), mContentFiles (contentFiles),
-      mUserDataPath(userDataPath),
-      mDefaultHalfExtents(Settings::Manager::getVector3("default actor pathfind half extents", "Game")),
-      mDefaultActorCollisionShapeType(DetourNavigator::toCollisionShapeType(Settings::Manager::getInt("actor collision shape type", "Game"))),
-      mActivationDistanceOverride (activationDistanceOverride),
-      mStartCell(startCell), mDistanceToFacedObject(-1.f), mTeleportEnabled(true),
-      mLevitationEnabled(true), mGoToJail(false), mDaysInPrison(0),
-      mPlayerTraveling(false), mPlayerInJail(false), mSpellPreloadTimer(0.f)
+    World::World(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode, Resource::ResourceSystem* resourceSystem,
+        SceneUtil::WorkQueue* workQueue, SceneUtil::UnrefQueue& unrefQueue, const Files::Collections& fileCollections,
+        const std::vector<std::string>& contentFiles, const std::vector<std::string>& groundcoverFiles,
+        ToUTF8::Utf8Encoder* encoder, int activationDistanceOverride, const std::string& startCell,
+        const std::string& startupScript, const std::filesystem::path& resourcePath,
+        const std::filesystem::path& userDataPath)
+        : mResourceSystem(resourceSystem)
+        , mLocalScripts(mStore)
+        , mCells(mStore, mReaders)
+        , mSky(true)
+        , mGodMode(false)
+        , mScriptsEnabled(true)
+        , mDiscardMovements(true)
+        , mContentFiles(contentFiles)
+        , mUserDataPath(userDataPath)
+        , mDefaultHalfExtents(Settings::Manager::getVector3("default actor pathfind half extents", "Game"))
+        , mDefaultActorCollisionShapeType(
+              DetourNavigator::toCollisionShapeType(Settings::Manager::getInt("actor collision shape type", "Game")))
+        , mActivationDistanceOverride(activationDistanceOverride)
+        , mStartCell(startCell)
+        , mDistanceToFacedObject(-1.f)
+        , mTeleportEnabled(true)
+        , mLevitationEnabled(true)
+        , mGoToJail(false)
+        , mDaysInPrison(0)
+        , mPlayerTraveling(false)
+        , mPlayerInJail(false)
+        , mSpellPreloadTimer(0.f)
     {
         mESMVersions.resize(mContentFiles.size(), -1);
         Loading::Listener* listener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
@@ -203,9 +214,10 @@ namespace MWWorld
             mNavigator = DetourNavigator::makeNavigatorStub();
         }
 
-        mRendering = std::make_unique<MWRender::RenderingManager>(viewer, rootNode, resourceSystem, workQueue,
-            resourcePath, *mNavigator, mGroundcoverStore, unrefQueue);
-        mProjectileManager = std::make_unique<ProjectileManager>(mRendering->getLightRoot()->asGroup(), resourceSystem, mRendering.get(), mPhysics.get());
+        mRendering = std::make_unique<MWRender::RenderingManager>(
+            viewer, rootNode, resourceSystem, workQueue, resourcePath, *mNavigator, mGroundcoverStore, unrefQueue);
+        mProjectileManager = std::make_unique<ProjectileManager>(
+            mRendering->getLightRoot()->asGroup(), resourceSystem, mRendering.get(), mPhysics.get());
         mRendering->preloadCommonAssets();
 
         mWeatherManager = std::make_unique<MWWorld::WeatherManager>(*mRendering, mStore);
@@ -215,11 +227,11 @@ namespace MWWorld
 
     void World::fillGlobalVariables()
     {
-        mGlobalVariables.fill (mStore);
+        mGlobalVariables.fill(mStore);
         mCurrentDate->setup(mGlobalVariables);
     }
 
-    void World::startNewGame (bool bypass)
+    void World::startNewGame(bool bypass)
     {
         mGoToJail = false;
         mLevitationEnabled = true;
@@ -243,35 +255,35 @@ namespace MWWorld
         if (!bypass)
         {
             // set new game mark
-            mGlobalVariables["chargenstate"].setInteger (1);
+            mGlobalVariables["chargenstate"].setInteger(1);
         }
         else
-            mGlobalVariables["chargenstate"].setInteger (-1);
+            mGlobalVariables["chargenstate"].setInteger(-1);
 
         if (bypass && !mStartCell.empty())
         {
             ESM::Position pos;
-            if (findExteriorPosition (mStartCell, pos))
+            if (findExteriorPosition(mStartCell, pos))
             {
-                changeToExteriorCell (pos, true);
+                changeToExteriorCell(pos, true);
                 adjustPosition(getPlayerPtr(), false);
             }
             else
             {
-                findInteriorPosition (mStartCell, pos);
-                changeToInteriorCell (mStartCell, pos, true);
+                findInteriorPosition(mStartCell, pos);
+                changeToInteriorCell(mStartCell, pos, true);
             }
         }
         else
         {
-            for (int i=0; i<5; ++i)
+            for (int i = 0; i < 5; ++i)
                 MWBase::Environment::get().getScriptManager()->getGlobalScripts().run();
             if (!getPlayerPtr().isInCell())
             {
                 ESM::Position pos;
                 const int cellSize = Constants::CellSizeInUnits;
-                pos.pos[0] = cellSize/2;
-                pos.pos[1] = cellSize/2;
+                pos.pos[0] = cellSize / 2;
+                pos.pos[1] = cellSize / 2;
                 pos.pos[2] = 0;
                 pos.rot[0] = 0;
                 pos.rot[1] = 0;
@@ -314,7 +326,7 @@ namespace MWWorld
             mPlayer->clear();
             mPlayer->setCell(nullptr);
             mPlayer->getPlayer().getRefData() = RefData();
-            mPlayer->set(mStore.get<ESM::NPC>().find ("player"));
+            mPlayer->set(mStore.get<ESM::NPC>().find("player"));
         }
 
         mCells.clear();
@@ -332,17 +344,14 @@ namespace MWWorld
 
     int World::countSavedGameRecords() const
     {
-        return
-            mCells.countSavedGameRecords()
-            +mStore.countSavedGameRecords()
-            +mGlobalVariables.countSavedGameRecords()
-            +mProjectileManager->countSavedGameRecords()
-            +1 // player record
-            +1 // weather record
-            +1 // actorId counter
-            +1 // levitation/teleport enabled state
-            +1 // camera
-            +1; // random state.
+        return mCells.countSavedGameRecords() + mStore.countSavedGameRecords()
+            + mGlobalVariables.countSavedGameRecords() + mProjectileManager->countSavedGameRecords()
+            + 1 // player record
+            + 1 // weather record
+            + 1 // actorId counter
+            + 1 // levitation/teleport enabled state
+            + 1 // camera
+            + 1; // random state.
     }
 
     int World::countSavedGameCells() const
@@ -350,7 +359,7 @@ namespace MWWorld
         return mCells.countSavedGameRecords();
     }
 
-    void World::write (ESM::ESMWriter& writer, Loading::Listener& progress) const
+    void World::write(ESM::ESMWriter& writer, Loading::Listener& progress) const
     {
         writer.startRecord(ESM::REC_RAND);
         writer.writeHNOString("RAND", Misc::Rng::serialize(mPrng));
@@ -364,13 +373,13 @@ namespace MWWorld
 
         MWMechanics::CreatureStats::writeActorIdCounter(writer);
 
-        mStore.write (writer, progress); // dynamic Store must be written (and read) before Cells, so that
-                                         // references to custom made records will be recognized
-        mPlayer->write (writer, progress);
-        mCells.write (writer, progress);
-        mGlobalVariables.write (writer, progress);
-        mWeatherManager->write (writer, progress);
-        mProjectileManager->write (writer, progress);
+        mStore.write(writer, progress); // dynamic Store must be written (and read) before Cells, so that
+                                        // references to custom made records will be recognized
+        mPlayer->write(writer, progress);
+        mCells.write(writer, progress);
+        mGlobalVariables.write(writer, progress);
+        mWeatherManager->write(writer, progress);
+        mProjectileManager->write(writer, progress);
 
         writer.startRecord(ESM::REC_ENAB);
         writer.writeHNT("TELE", mTeleportEnabled);
@@ -382,8 +391,7 @@ namespace MWWorld
         writer.endRecord(ESM::REC_CAM_);
     }
 
-    void World::readRecord (ESM::ESMReader& reader, uint32_t type,
-        const std::map<int, int>& contentFileMap)
+    void World::readRecord(ESM::ESMReader& reader, uint32_t type, const std::map<int, int>& contentFileMap)
     {
         switch (type)
         {
@@ -395,11 +403,11 @@ namespace MWWorld
                 reader.getHNT(mLevitationEnabled, "LEVT");
                 return;
             case ESM::REC_RAND:
-                {
-                    auto data = reader.getHNOString("RAND");
-                    Misc::Rng::deserialize(data, mPrng);
-                }
-                break;
+            {
+                auto data = reader.getHNOString("RAND");
+                Misc::Rng::deserialize(data, mPrng);
+            }
+            break;
             case ESM::REC_PLAY:
                 mStore.checkPlayer();
                 mPlayer->readRecord(reader, type);
@@ -411,14 +419,11 @@ namespace MWWorld
                 }
                 break;
             default:
-                if (!mStore.readRecord (reader, type) &&
-                    !mGlobalVariables.readRecord (reader, type) &&
-                    !mWeatherManager->readRecord (reader, type) &&
-                    !mCells.readRecord (reader, type, contentFileMap)
-                     && !mProjectileManager->readRecord (reader, type)
-                        )
+                if (!mStore.readRecord(reader, type) && !mGlobalVariables.readRecord(reader, type)
+                    && !mWeatherManager->readRecord(reader, type) && !mCells.readRecord(reader, type, contentFileMap)
+                    && !mProjectileManager->readRecord(reader, type))
                 {
-                    throw std::runtime_error ("unknown record in saved game");
+                    throw std::runtime_error("unknown record in saved game");
                 }
                 break;
         }
@@ -470,7 +475,7 @@ namespace MWWorld
         gmst["iWereWolfBounty"] = ESM::Variant(1000);
         gmst["fCombatDistanceWerewolfMod"] = ESM::Variant(0.3f);
 
-        for (const auto &params : gmst)
+        for (const auto& params : gmst)
         {
             if (!mStore.get<ESM::GameSetting>().search(params.first))
             {
@@ -501,7 +506,7 @@ namespace MWWorld
         globals["crimegoldturnin"] = ESM::Variant(0);
         globals["pchasturnin"] = ESM::Variant(0);
 
-        for (const auto &params : globals)
+        for (const auto& params : globals)
         {
             if (!mStore.get<ESM::Global>().search(params.first))
             {
@@ -521,7 +526,7 @@ namespace MWWorld
         statics["templemarker"] = "marker_temple.nif";
         statics["travelmarker"] = "marker_travel.nif";
 
-        for (const auto &params : statics)
+        for (const auto& params : statics)
         {
             if (!mStore.get<ESM::Static>().search(params.first))
             {
@@ -536,7 +541,7 @@ namespace MWWorld
         std::map<std::string, std::string> doors;
         doors["prisonmarker"] = "marker_prison.nif";
 
-        for (const auto &params : doors)
+        for (const auto& params : doors)
         {
             if (!mStore.get<ESM::Door>().search(params.first))
             {
@@ -563,11 +568,12 @@ namespace MWWorld
     const ESM::Cell* World::getExterior(std::string_view cellName) const
     {
         // first try named cells
-        const ESM::Cell *cell = mStore.get<ESM::Cell>().searchExtByName (cellName);
+        const ESM::Cell* cell = mStore.get<ESM::Cell>().searchExtByName(cellName);
         if (cell)
             return cell;
         // treat "Wilderness" like an empty string
-        static const std::string defaultName = mStore.get<ESM::GameSetting>().find("sDefaultCellname")->mValue.getString();
+        static const std::string defaultName
+            = mStore.get<ESM::GameSetting>().find("sDefaultCellname")->mValue.getString();
         if (Misc::StringUtils::ciEqual(cellName, defaultName))
         {
             cell = mStore.get<ESM::Cell>().searchExtByName("");
@@ -576,7 +582,7 @@ namespace MWWorld
         }
 
         // didn't work -> now check for regions
-        for (const ESM::Region &region : mStore.get<ESM::Region>())
+        for (const ESM::Region& region : mStore.get<ESM::Region>())
         {
             if (Misc::StringUtils::ciEqual(cellName, region.mName))
             {
@@ -587,22 +593,22 @@ namespace MWWorld
         return nullptr;
     }
 
-    CellStore *World::getExterior (int x, int y)
+    CellStore* World::getExterior(int x, int y)
     {
-        return mCells.getExterior (x, y);
+        return mCells.getExterior(x, y);
     }
 
-    CellStore *World::getInterior(std::string_view name)
+    CellStore* World::getInterior(std::string_view name)
     {
-        return mCells.getInterior (name);
+        return mCells.getInterior(name);
     }
 
-    CellStore *World::getCell (const ESM::CellId& id)
+    CellStore* World::getCell(const ESM::CellId& id)
     {
         if (id.mPaged)
-            return getExterior (id.mIndex.mX, id.mIndex.mY);
+            return getExterior(id.mIndex.mX, id.mIndex.mY);
         else
-            return getInterior (id.mWorldspace);
+            return getInterior(id.mWorldspace);
     }
 
     bool World::isCellActive(CellStore* cell) const
@@ -656,7 +662,7 @@ namespace MWWorld
         if (dateUpdated)
             updateSkyDate();
 
-        mGlobalVariables[name].setInteger (value);
+        mGlobalVariables[name].setInteger(value);
     }
 
     void World::setGlobalFloat(std::string_view name, float value)
@@ -678,9 +684,9 @@ namespace MWWorld
         return mGlobalVariables[name].getFloat();
     }
 
-    char World::getGlobalVariableType (std::string_view name) const
+    char World::getGlobalVariableType(std::string_view name) const
     {
-        return mGlobalVariables.getType (name);
+        return mGlobalVariables.getType(name);
     }
 
     std::string_view World::getMonthName(int month) const
@@ -702,22 +708,22 @@ namespace MWWorld
             if (!cell->isExterior() || !cell->mName.empty())
                 return cell->mName;
 
-            if (const ESM::Region* region = mStore.get<ESM::Region>().search (cell->mRegion))
+            if (const ESM::Region* region = mStore.get<ESM::Region>().search(cell->mRegion))
                 return region->mName;
         }
-        return mStore.get<ESM::GameSetting>().find ("sDefaultCellname")->mValue.getString();
+        return mStore.get<ESM::GameSetting>().find("sDefaultCellname")->mValue.getString();
     }
 
-    void World::removeRefScript (MWWorld::RefData *ref)
+    void World::removeRefScript(MWWorld::RefData* ref)
     {
-        mLocalScripts.remove (ref);
+        mLocalScripts.remove(ref);
     }
 
-    Ptr World::searchPtr (std::string_view name, bool activeOnly, bool searchInContainers)
+    Ptr World::searchPtr(std::string_view name, bool activeOnly, bool searchInContainers)
     {
         Ptr ret;
         // the player is always in an active cell.
-        if (name=="player")
+        if (name == "player")
         {
             return mPlayer->getPlayer();
         }
@@ -726,8 +732,9 @@ namespace MWWorld
 
         for (CellStore* cellstore : mWorldScene->getActiveCells())
         {
-            // TODO: caching still doesn't work efficiently here (only works for the one CellStore that the reference is in)
-            Ptr ptr = mCells.getPtr (lowerCaseName, *cellstore, false);
+            // TODO: caching still doesn't work efficiently here (only works for the one CellStore that the reference is
+            // in)
+            Ptr ptr = mCells.getPtr(lowerCaseName, *cellstore, false);
 
             if (!ptr.isEmpty())
                 return ptr;
@@ -735,7 +742,7 @@ namespace MWWorld
 
         if (!activeOnly)
         {
-            ret = mCells.getPtr (lowerCaseName);
+            ret = mCells.getPtr(lowerCaseName);
             if (!ret.isEmpty())
                 return ret;
         }
@@ -750,13 +757,12 @@ namespace MWWorld
             }
         }
 
-        Ptr ptr = mPlayer->getPlayer().getClass()
-            .getContainerStore(mPlayer->getPlayer()).search(lowerCaseName);
+        Ptr ptr = mPlayer->getPlayer().getClass().getContainerStore(mPlayer->getPlayer()).search(lowerCaseName);
 
         return ptr;
     }
 
-    Ptr World::getPtr (std::string_view name, bool activeOnly)
+    Ptr World::getPtr(std::string_view name, bool activeOnly)
     {
         Ptr ret = searchPtr(name, activeOnly);
         if (!ret.isEmpty())
@@ -767,18 +773,18 @@ namespace MWWorld
         throw std::runtime_error(error);
     }
 
-    Ptr World::searchPtrViaActorId (int actorId)
+    Ptr World::searchPtrViaActorId(int actorId)
     {
         // The player is not registered in any CellStore so must be checked manually
         if (actorId == getPlayerPtr().getClass().getCreatureStats(getPlayerPtr()).getActorId())
             return getPlayerPtr();
         // Now search cells
-        return mWorldScene->searchPtrViaActorId (actorId);
+        return mWorldScene->searchPtrViaActorId(actorId);
     }
 
-    Ptr World::searchPtrViaRefNum (const std::string& id, const ESM::RefNum& refNum)
+    Ptr World::searchPtrViaRefNum(const std::string& id, const ESM::RefNum& refNum)
     {
-        return mCells.getPtr (id, refNum);
+        return mCells.getPtr(id, refNum);
     }
 
     struct FindContainerVisitor
@@ -786,9 +792,12 @@ namespace MWWorld
         ConstPtr mContainedPtr;
         Ptr mResult;
 
-        FindContainerVisitor(const ConstPtr& containedPtr) : mContainedPtr(containedPtr) {}
+        FindContainerVisitor(const ConstPtr& containedPtr)
+            : mContainedPtr(containedPtr)
+        {
+        }
 
-        bool operator() (const Ptr& ptr)
+        bool operator()(const Ptr& ptr)
         {
             if (mContainedPtr.getContainerStore() == &ptr.getClass().getContainerStore(ptr))
             {
@@ -825,27 +834,26 @@ namespace MWWorld
         return Ptr();
     }
 
-    void World::addContainerScripts(const Ptr& reference, CellStore * cell)
+    void World::addContainerScripts(const Ptr& reference, CellStore* cell)
     {
-        if( reference.getType()==ESM::Container::sRecordId ||
-            reference.getType()==ESM::NPC::sRecordId ||
-            reference.getType()==ESM::Creature::sRecordId)
+        if (reference.getType() == ESM::Container::sRecordId || reference.getType() == ESM::NPC::sRecordId
+            || reference.getType() == ESM::Creature::sRecordId)
         {
             MWWorld::ContainerStore& container = reference.getClass().getContainerStore(reference);
-            for(MWWorld::ContainerStoreIterator it = container.begin(); it != container.end(); ++it)
+            for (MWWorld::ContainerStoreIterator it = container.begin(); it != container.end(); ++it)
             {
                 std::string_view script = it->getClass().getScript(*it);
-                if(!script.empty())
+                if (!script.empty())
                 {
                     MWWorld::Ptr item = *it;
                     item.mCell = cell;
-                    mLocalScripts.add (script, item);
+                    mLocalScripts.add(script, item);
                 }
             }
         }
     }
 
-    void World::enable (const Ptr& reference)
+    void World::enable(const Ptr& reference)
     {
         MWBase::Environment::get().getLuaManager()->registerObject(reference);
 
@@ -856,8 +864,9 @@ namespace MWWorld
         {
             reference.getRefData().enable();
 
-            if(mWorldScene->getActiveCells().find (reference.getCell()) != mWorldScene->getActiveCells().end() && reference.getRefData().getCount())
-                mWorldScene->addObjectToScene (reference);
+            if (mWorldScene->getActiveCells().find(reference.getCell()) != mWorldScene->getActiveCells().end()
+                && reference.getRefData().getCount())
+                mWorldScene->addObjectToScene(reference);
 
             if (reference.getCellRef().getRefNum().hasContentFile())
             {
@@ -870,24 +879,23 @@ namespace MWWorld
 
     void World::removeContainerScripts(const Ptr& reference)
     {
-        if( reference.getType()==ESM::Container::sRecordId ||
-            reference.getType()==ESM::NPC::sRecordId ||
-            reference.getType()==ESM::Creature::sRecordId)
+        if (reference.getType() == ESM::Container::sRecordId || reference.getType() == ESM::NPC::sRecordId
+            || reference.getType() == ESM::Creature::sRecordId)
         {
             MWWorld::ContainerStore& container = reference.getClass().getContainerStore(reference);
-            for(MWWorld::ContainerStoreIterator it = container.begin(); it != container.end(); ++it)
+            for (MWWorld::ContainerStoreIterator it = container.begin(); it != container.end(); ++it)
             {
                 std::string_view script = it->getClass().getScript(*it);
-                if(!script.empty())
+                if (!script.empty())
                 {
                     MWWorld::Ptr item = *it;
-                    mLocalScripts.remove (item);
+                    mLocalScripts.remove(item);
                 }
             }
         }
     }
 
-    void World::disable (const Ptr& reference)
+    void World::disable(const Ptr& reference)
     {
         if (!reference.getRefData().isEnabled())
             return;
@@ -909,14 +917,15 @@ namespace MWWorld
                 mWorldScene->reloadTerrain();
         }
 
-        if(mWorldScene->getActiveCells().find (reference.getCell())!=mWorldScene->getActiveCells().end() && reference.getRefData().getCount())
+        if (mWorldScene->getActiveCells().find(reference.getCell()) != mWorldScene->getActiveCells().end()
+            && reference.getRefData().getCount())
         {
-            mWorldScene->removeObjectFromScene (reference);
+            mWorldScene->removeObjectFromScene(reference);
             mWorldScene->addPostponedPhysicsObjects();
         }
     }
 
-    void World::advanceTime (double hours, bool incremental)
+    void World::advanceTime(double hours, bool incremental)
     {
         if (!incremental)
         {
@@ -930,7 +939,7 @@ namespace MWWorld
             rechargeItems(duration, false);
         }
 
-        mWeatherManager->advanceTime (hours, incremental);
+        mWeatherManager->advanceTime(hours, incremental);
         mCurrentDate->advanceTime(hours, mGlobalVariables);
         updateSkyDate();
 
@@ -980,12 +989,13 @@ namespace MWWorld
         return mRendering->skyGetSecundaPhase();
     }
 
-    void World::setMoonColour (bool red)
+    void World::setMoonColour(bool red)
     {
-        mRendering->skySetMoonColour (red);
+        mRendering->skySetMoonColour(red);
     }
 
-    void World::changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
+    void World::changeToInteriorCell(
+        const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
     {
         mPhysics->clearQueuedMovement();
         mDiscardMovements = true;
@@ -1005,7 +1015,7 @@ namespace MWWorld
         mRendering->getCamera()->instantTransition();
     }
 
-    void World::changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
+    void World::changeToExteriorCell(const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
     {
         mPhysics->clearQueuedMovement();
         mDiscardMovements = true;
@@ -1022,15 +1032,16 @@ namespace MWWorld
         mRendering->getCamera()->instantTransition();
     }
 
-    void World::changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
+    void World::changeToCell(
+        const ESM::CellId& cellId, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
     {
         if (!changeEvent)
             mCurrentWorldSpace = cellId.mWorldspace;
 
         if (cellId.mPaged)
-            changeToExteriorCell (position, adjustPlayerPos, changeEvent);
+            changeToExteriorCell(position, adjustPlayerPos, changeEvent);
         else
-            changeToInteriorCell (cellId.mWorldspace, position, adjustPlayerPos, changeEvent);
+            changeToInteriorCell(cellId.mWorldspace, position, adjustPlayerPos, changeEvent);
 
         mCurrentDate->setup(mGlobalVariables);
     }
@@ -1045,7 +1056,8 @@ namespace MWWorld
         if (mActivationDistanceOverride >= 0)
             return static_cast<float>(mActivationDistanceOverride);
 
-        static const int iMaxActivateDist = mStore.get<ESM::GameSetting>().find("iMaxActivateDist")->mValue.getInteger();
+        static const int iMaxActivateDist
+            = mStore.get<ESM::GameSetting>().find("iMaxActivateDist")->mValue.getInteger();
         return static_cast<float>(iMaxActivateDist);
     }
 
@@ -1053,8 +1065,8 @@ namespace MWWorld
     {
         MWWorld::Ptr facedObject;
 
-        if (MWBase::Environment::get().getWindowManager()->isGuiMode() &&
-                MWBase::Environment::get().getWindowManager()->isConsoleMode())
+        if (MWBase::Environment::get().getWindowManager()->isGuiMode()
+            && MWBase::Environment::get().getWindowManager()->isConsoleMode())
             facedObject = getFacedObject(getMaxActivationDistance() * 50, false);
         else
         {
@@ -1063,39 +1075,43 @@ namespace MWWorld
             facedObject = getFacedObject(activationDistance, true);
 
             if (!facedObject.isEmpty() && !facedObject.getClass().allowTelekinesis(facedObject)
-                && mDistanceToFacedObject > getMaxActivationDistance() && !MWBase::Environment::get().getWindowManager()->isGuiMode())
+                && mDistanceToFacedObject > getMaxActivationDistance()
+                && !MWBase::Environment::get().getWindowManager()->isGuiMode())
                 return nullptr;
         }
         return facedObject;
     }
 
-   float World::getDistanceToFacedObject()
-   {
+    float World::getDistanceToFacedObject()
+    {
         return mDistanceToFacedObject;
-   }
+    }
 
     osg::Matrixf World::getActorHeadTransform(const MWWorld::ConstPtr& actor) const
     {
-        const MWRender::Animation *anim = mRendering->getAnimation(actor);
-        if(anim)
+        const MWRender::Animation* anim = mRendering->getAnimation(actor);
+        if (anim)
         {
-            const osg::Node *node = anim->getNode("Head");
-            if(!node) node = anim->getNode("Bip01 Head");
-            if(node)
+            const osg::Node* node = anim->getNode("Head");
+            if (!node)
+                node = anim->getNode("Bip01 Head");
+            if (node)
             {
                 osg::NodePathList nodepaths = node->getParentalNodePaths();
-                if(!nodepaths.empty())
+                if (!nodepaths.empty())
                     return osg::computeLocalToWorld(nodepaths[0]);
             }
         }
         return osg::Matrixf::translate(actor.getRefData().getPosition().asVec3());
     }
 
-    std::pair<MWWorld::Ptr,osg::Vec3f> World::getHitContact(const MWWorld::ConstPtr &ptr, float distance, std::vector<MWWorld::Ptr> &targets)
+    std::pair<MWWorld::Ptr, osg::Vec3f> World::getHitContact(
+        const MWWorld::ConstPtr& ptr, float distance, std::vector<MWWorld::Ptr>& targets)
     {
-        const ESM::Position &posdata = ptr.getRefData().getPosition();
+        const ESM::Position& posdata = ptr.getRefData().getPosition();
 
-        osg::Quat rot = osg::Quat(posdata.rot[0], osg::Vec3f(-1,0,0)) * osg::Quat(posdata.rot[2], osg::Vec3f(0,0,-1));
+        osg::Quat rot
+            = osg::Quat(posdata.rot[0], osg::Vec3f(-1, 0, 0)) * osg::Quat(posdata.rot[2], osg::Vec3f(0, 0, -1));
 
         osg::Vec3f halfExtents = mPhysics->getHalfExtents(ptr);
 
@@ -1108,8 +1124,8 @@ namespace MWWorld
         {
             osg::Vec3f pos = getActorHeadTransform(ptr).getTrans();
 
-            std::pair<MWWorld::Ptr,osg::Vec3f> result = mPhysics->getHitContact(ptr, pos, rot, distance, targets);
-            if(!result.first.isEmpty())
+            std::pair<MWWorld::Ptr, osg::Vec3f> result = mPhysics->getHitContact(ptr, pos, rot, distance, targets);
+            if (!result.first.isEmpty())
                 return std::make_pair(result.first, result.second);
         }
 
@@ -1120,14 +1136,14 @@ namespace MWWorld
         // some flying creatures work that have their collision box offset in the air
         pos.z() += halfExtents.z();
 
-        std::pair<MWWorld::Ptr,osg::Vec3f> result = mPhysics->getHitContact(ptr, pos, rot, distance, targets);
-        if(result.first.isEmpty())
+        std::pair<MWWorld::Ptr, osg::Vec3f> result = mPhysics->getHitContact(ptr, pos, rot, distance, targets);
+        if (result.first.isEmpty())
             return std::make_pair(MWWorld::Ptr(), osg::Vec3f());
 
         return std::make_pair(result.first, result.second);
     }
 
-    void World::deleteObject (const Ptr& ptr)
+    void World::deleteObject(const Ptr& ptr)
     {
         if (!ptr.getRefData().isDeleted() && ptr.getContainerStore() == nullptr)
         {
@@ -1140,9 +1156,9 @@ namespace MWWorld
                 && mWorldScene->getActiveCells().find(ptr.getCell()) != mWorldScene->getActiveCells().end()
                 && ptr.getRefData().isEnabled())
             {
-                mWorldScene->removeObjectFromScene (ptr);
-                mLocalScripts.remove (ptr);
-                removeContainerScripts (ptr);
+                mWorldScene->removeObjectFromScene(ptr);
+                mLocalScripts.remove(ptr);
+                removeContainerScripts(ptr);
             }
         }
     }
@@ -1155,7 +1171,7 @@ namespace MWWorld
         {
             ptr.getRefData().setCount(1);
             if (mWorldScene->getActiveCells().find(ptr.getCell()) != mWorldScene->getActiveCells().end()
-                    && ptr.getRefData().isEnabled())
+                && ptr.getRefData().isEnabled())
             {
                 mWorldScene->addObjectToScene(ptr);
                 std::string_view script = ptr.getClass().getScript(ptr);
@@ -1166,22 +1182,27 @@ namespace MWWorld
         }
     }
 
-    MWWorld::Ptr World::moveObject(const Ptr &ptr, CellStore* newCell, const osg::Vec3f& position, bool movePhysics, bool keepActive)
+    MWWorld::Ptr World::moveObject(
+        const Ptr& ptr, CellStore* newCell, const osg::Vec3f& position, bool movePhysics, bool keepActive)
     {
         ESM::Position pos = ptr.getRefData().getPosition();
         std::memcpy(pos.pos, &position, sizeof(osg::Vec3f));
         ptr.getRefData().setPosition(pos);
 
-        CellStore *currCell = ptr.isInCell() ? ptr.getCell() : nullptr; // currCell == nullptr should only happen for player, during initial startup
+        CellStore* currCell = ptr.isInCell()
+            ? ptr.getCell()
+            : nullptr; // currCell == nullptr should only happen for player, during initial startup
         bool isPlayer = ptr == mPlayer->getPlayer();
         bool haveToMove = isPlayer || (currCell && mWorldScene->isCellActive(*currCell));
         MWWorld::Ptr newPtr = ptr;
 
         if (!isPlayer && !currCell)
-           throw std::runtime_error("Can not move actor \"" + ptr.getCellRef().getRefId() + "\" to another cell: current cell is nullptr");
+            throw std::runtime_error(
+                "Can not move actor \"" + ptr.getCellRef().getRefId() + "\" to another cell: current cell is nullptr");
 
         if (!newCell)
-           throw std::runtime_error("Can not move actor \"" + ptr.getCellRef().getRefId() + "\" to another cell: new cell is nullptr");
+            throw std::runtime_error(
+                "Can not move actor \"" + ptr.getCellRef().getRefId() + "\" to another cell: new cell is nullptr");
 
         if (currCell != newCell)
         {
@@ -1201,7 +1222,7 @@ namespace MWWorld
                     else
                         mWorldScene->changeToExteriorCell(pos, false);
                 }
-                addContainerScripts (getPlayerPtr(), newCell);
+                addContainerScripts(getPlayerPtr(), newCell);
                 newPtr = getPlayerPtr();
             }
             else
@@ -1211,7 +1232,7 @@ namespace MWWorld
                 if (!currCellActive && newCellActive)
                 {
                     newPtr = currCell->moveTo(ptr, newCell);
-                    if(newPtr.getRefData().isEnabled())
+                    if (newPtr.getRefData().isEnabled())
                         mWorldScene->addObjectToScene(newPtr);
 
                     std::string_view script = newPtr.getClass().getScript(newPtr);
@@ -1225,7 +1246,7 @@ namespace MWWorld
                 {
                     mWorldScene->removeObjectFromScene(ptr, keepActive);
                     mLocalScripts.remove(ptr);
-                    removeContainerScripts (ptr);
+                    removeContainerScripts(ptr);
                     haveToMove = false;
 
                     newPtr = currCell->moveTo(ptr, newCell);
@@ -1238,19 +1259,19 @@ namespace MWWorld
                     newPtr = currCell->moveTo(ptr, newCell);
 
                     mRendering->updatePtr(ptr, newPtr);
-                    MWBase::Environment::get().getSoundManager()->updatePtr (ptr, newPtr);
+                    MWBase::Environment::get().getSoundManager()->updatePtr(ptr, newPtr);
                     mPhysics->updatePtr(ptr, newPtr);
 
-                    MWBase::MechanicsManager *mechMgr = MWBase::Environment::get().getMechanicsManager();
+                    MWBase::MechanicsManager* mechMgr = MWBase::Environment::get().getMechanicsManager();
                     mechMgr->updateCell(ptr, newPtr);
 
                     std::string_view script = ptr.getClass().getScript(ptr);
                     if (!script.empty())
                     {
                         mLocalScripts.remove(ptr);
-                        removeContainerScripts (ptr);
+                        removeContainerScripts(ptr);
                         mLocalScripts.add(script, newPtr);
-                        addContainerScripts (newPtr, newCell);
+                        addContainerScripts(newPtr, newCell);
                     }
                 }
             }
@@ -1286,7 +1307,8 @@ namespace MWWorld
 
         CellStore* cell = ptr.getCell();
         CellStore* newCell = getExterior(index.x(), index.y());
-        bool isCellActive = getPlayerPtr().isInCell() && getPlayerPtr().getCell()->isExterior() && mWorldScene->isCellActive(*newCell);
+        bool isCellActive = getPlayerPtr().isInCell() && getPlayerPtr().getCell()->isExterior()
+            && mWorldScene->isCellActive(*newCell);
 
         if (cell->isExterior() || (moveToActive && isCellActive && ptr.getClass().isActor()))
             cell = newCell;
@@ -1305,7 +1327,7 @@ namespace MWWorld
         return moveObject(ptr, newpos);
     }
 
-    void World::scaleObject (const Ptr& ptr, float scale, bool force)
+    void World::scaleObject(const Ptr& ptr, float scale, bool force)
     {
         if (!force && scale == ptr.getCellRef().getScale())
             return;
@@ -1316,7 +1338,7 @@ namespace MWWorld
         mRendering->pagingBlacklistObject(mStore.find(ptr.getCellRef().getRefId()), ptr);
         mWorldScene->removeFromPagedRefs(ptr);
 
-        if(ptr.getRefData().getBaseNode() != nullptr)
+        if (ptr.getRefData().getBaseNode() != nullptr)
             mWorldScene->updateObjectScale(ptr);
 
         if (mPhysics->getActor(ptr))
@@ -1328,7 +1350,7 @@ namespace MWWorld
     void World::rotateObject(const Ptr& ptr, const osg::Vec3f& rot, MWBase::RotationFlags flags)
     {
         ESM::Position pos = ptr.getRefData().getPosition();
-        float *objRot = pos.rot;
+        float* objRot = pos.rot;
         if (flags & MWBase::RotationFlag_adjust)
         {
             objRot[0] += rot.x();
@@ -1342,7 +1364,7 @@ namespace MWWorld
             objRot[2] = rot.z();
         }
 
-        if(ptr.getClass().isActor())
+        if (ptr.getClass().isActor())
         {
             /* HACK? Actors shouldn't really be rotating around X (or Y), but
              * currently it's done so for rotating the camera, which needs
@@ -1358,10 +1380,10 @@ namespace MWWorld
         mRendering->pagingBlacklistObject(mStore.find(ptr.getCellRef().getRefId()), ptr);
         mWorldScene->removeFromPagedRefs(ptr);
 
-        if(ptr.getRefData().getBaseNode() != nullptr)
+        if (ptr.getRefData().getBaseNode() != nullptr)
         {
-            const auto order = flags & MWBase::RotationFlag_inverseOrder
-                ? RotationOrder::inverse : RotationOrder::direct;
+            const auto order
+                = flags & MWBase::RotationFlag_inverseOrder ? RotationOrder::inverse : RotationOrder::direct;
             mWorldScene->updateObjectRotation(ptr, order);
 
             if (const auto object = mPhysics->getObject(ptr))
@@ -1369,7 +1391,7 @@ namespace MWWorld
         }
     }
 
-    void World::adjustPosition(const Ptr &ptr, bool force)
+    void World::adjustPosition(const Ptr& ptr, bool force)
     {
         if (ptr.isEmpty())
         {
@@ -1377,9 +1399,9 @@ namespace MWWorld
             return;
         }
 
-        osg::Vec3f pos (ptr.getRefData().getPosition().asVec3());
+        osg::Vec3f pos(ptr.getRefData().getPosition().asVec3());
 
-        if(!ptr.getRefData().getBaseNode())
+        if (!ptr.getRefData().getBaseNode())
         {
             // will be adjusted when Ptr's cell becomes active
             return;
@@ -1387,15 +1409,19 @@ namespace MWWorld
 
         if (!ptr.isInCell())
         {
-            Log(Debug::Warning) << "Unable to adjust position for object '" << ptr.getCellRef().getRefId() << "' - it has no cell";
+            Log(Debug::Warning) << "Unable to adjust position for object '" << ptr.getCellRef().getRefId()
+                                << "' - it has no cell";
             return;
         }
 
-        const float terrainHeight = ptr.getCell()->isExterior() ? getTerrainHeightAt(pos) : -std::numeric_limits<float>::max();
-        pos.z() = std::max(pos.z(), terrainHeight) + 20; // place slightly above terrain. will snap down to ground with code below
+        const float terrainHeight
+            = ptr.getCell()->isExterior() ? getTerrainHeightAt(pos) : -std::numeric_limits<float>::max();
+        pos.z() = std::max(pos.z(), terrainHeight)
+            + 20; // place slightly above terrain. will snap down to ground with code below
 
         // We still should trace down dead persistent actors - they do not use the "swimdeath" animation.
-        bool swims = ptr.getClass().isActor() && isSwimming(ptr) && !(ptr.getClass().isPersistent(ptr) && ptr.getClass().getCreatureStats(ptr).isDeathAnimationFinished());
+        bool swims = ptr.getClass().isActor() && isSwimming(ptr)
+            && !(ptr.getClass().isPersistent(ptr) && ptr.getClass().getCreatureStats(ptr).isDeathAnimationFinished());
         if (force || !ptr.getClass().isActor() || (!isFlying(ptr) && !swims && isActorCollisionEnabled(ptr)))
         {
             osg::Vec3f traced = mPhysics->traceDown(ptr, pos, Constants::CellSizeInUnits);
@@ -1410,20 +1436,24 @@ namespace MWWorld
         const MWWorld::Ptr actor = getPlayerPtr();
         const float distance = 128.f;
         ESM::Position esmPos = actor.getRefData().getPosition();
-        osg::Quat orientation(esmPos.rot[2], osg::Vec3f(0,0,-1));
-        osg::Vec3f pos (esmPos.asVec3());
+        osg::Quat orientation(esmPos.rot[2], osg::Vec3f(0, 0, -1));
+        osg::Vec3f pos(esmPos.asVec3());
 
         int direction = 0;
-        int fallbackDirections[4] = {direction, (direction+3)%4, (direction+2)%4, (direction+1)%4};
+        int fallbackDirections[4] = { direction, (direction + 3) % 4, (direction + 2) % 4, (direction + 1) % 4 };
 
         osg::Vec3f targetPos = pos;
-        for (int i=0; i<4; ++i)
+        for (int i = 0; i < 4; ++i)
         {
             direction = fallbackDirections[i];
-            if (direction == 0) targetPos = pos + (orientation * osg::Vec3f(0,1,0)) * distance;
-            else if(direction == 1) targetPos = pos - (orientation * osg::Vec3f(0,1,0)) * distance;
-            else if(direction == 2) targetPos = pos - (orientation * osg::Vec3f(1,0,0)) * distance;
-            else if(direction == 3) targetPos = pos + (orientation * osg::Vec3f(1,0,0)) * distance;
+            if (direction == 0)
+                targetPos = pos + (orientation * osg::Vec3f(0, 1, 0)) * distance;
+            else if (direction == 1)
+                targetPos = pos - (orientation * osg::Vec3f(0, 1, 0)) * distance;
+            else if (direction == 2)
+                targetPos = pos - (orientation * osg::Vec3f(1, 0, 0)) * distance;
+            else if (direction == 3)
+                targetPos = pos + (orientation * osg::Vec3f(1, 0, 0)) * distance;
 
             // destination is free
             if (!castRay(pos.x(), pos.y(), pos.z(), targetPos.x(), targetPos.y(), targetPos.z()))
@@ -1444,9 +1474,9 @@ namespace MWWorld
         }
     }
 
-    void World::rotateWorldObject (const Ptr& ptr, const osg::Quat& rotate)
+    void World::rotateWorldObject(const Ptr& ptr, const osg::Quat& rotate)
     {
-        if(ptr.getRefData().getBaseNode() != nullptr)
+        if (ptr.getRefData().getBaseNode() != nullptr)
         {
             mRendering->pagingBlacklistObject(mStore.find(ptr.getCellRef().getRefId()), ptr);
             mWorldScene->removeFromPagedRefs(ptr);
@@ -1461,26 +1491,31 @@ namespace MWWorld
 
     MWWorld::Ptr World::placeObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, const ESM::Position& pos)
     {
-        return copyObjectToCell(ptr,cell,pos,ptr.getRefData().getCount(),false);
+        return copyObjectToCell(ptr, cell, pos, ptr.getRefData().getCount(), false);
     }
 
-    MWWorld::Ptr World::safePlaceObject(const ConstPtr &ptr, const ConstPtr &referenceObject, MWWorld::CellStore* referenceCell, int direction, float distance)
+    MWWorld::Ptr World::safePlaceObject(const ConstPtr& ptr, const ConstPtr& referenceObject,
+        MWWorld::CellStore* referenceCell, int direction, float distance)
     {
         ESM::Position ipos = referenceObject.getRefData().getPosition();
         osg::Vec3f pos(ipos.asVec3());
-        osg::Quat orientation(ipos.rot[2], osg::Vec3f(0,0,-1));
+        osg::Quat orientation(ipos.rot[2], osg::Vec3f(0, 0, -1));
 
-        int fallbackDirections[4] = {direction, (direction+3)%4, (direction+2)%4, (direction+1)%4};
+        int fallbackDirections[4] = { direction, (direction + 3) % 4, (direction + 2) % 4, (direction + 1) % 4 };
 
         osg::Vec3f spawnPoint = pos;
 
-        for (int i=0; i<4; ++i)
+        for (int i = 0; i < 4; ++i)
         {
             direction = fallbackDirections[i];
-            if (direction == 0) spawnPoint = pos + (orientation * osg::Vec3f(0,1,0)) * distance;
-            else if(direction == 1) spawnPoint = pos - (orientation * osg::Vec3f(0,1,0)) * distance;
-            else if(direction == 2) spawnPoint = pos - (orientation * osg::Vec3f(1,0,0)) * distance;
-            else if(direction == 3) spawnPoint = pos + (orientation * osg::Vec3f(1,0,0)) * distance;
+            if (direction == 0)
+                spawnPoint = pos + (orientation * osg::Vec3f(0, 1, 0)) * distance;
+            else if (direction == 1)
+                spawnPoint = pos - (orientation * osg::Vec3f(0, 1, 0)) * distance;
+            else if (direction == 2)
+                spawnPoint = pos - (orientation * osg::Vec3f(1, 0, 0)) * distance;
+            else if (direction == 3)
+                spawnPoint = pos + (orientation * osg::Vec3f(1, 0, 0)) * distance;
 
             if (!ptr.getClass().isActor())
                 break;
@@ -1488,8 +1523,7 @@ namespace MWWorld
             // check if spawn point is safe, fall back to another direction if not
             spawnPoint.z() += 30; // move up a little to account for slopes, will snap down later
 
-            if (!castRay(spawnPoint.x(), spawnPoint.y(), spawnPoint.z(),
-                                                               pos.x(), pos.y(), pos.z() + 20))
+            if (!castRay(spawnPoint.x(), spawnPoint.y(), spawnPoint.z(), pos.x(), pos.y(), pos.z() + 20))
             {
                 // safe
                 break;
@@ -1510,7 +1544,7 @@ namespace MWWorld
         return placed;
     }
 
-    void World::indexToPosition (int cellX, int cellY, float &x, float &y, bool centre) const
+    void World::indexToPosition(int cellX, int cellY, float& x, float& y, bool centre) const
     {
         const int cellSize = Constants::CellSizeInUnits;
 
@@ -1519,17 +1553,17 @@ namespace MWWorld
 
         if (centre)
         {
-            x += cellSize/2;
-            y += cellSize/2;
+            x += cellSize / 2;
+            y += cellSize / 2;
         }
     }
 
-    void World::queueMovement(const Ptr &ptr, const osg::Vec3f &velocity)
+    void World::queueMovement(const Ptr& ptr, const osg::Vec3f& velocity)
     {
         mPhysics->queueObjectMovement(ptr, velocity);
     }
 
-    void World::updateAnimatedCollisionShape(const Ptr &ptr)
+    void World::updateAnimatedCollisionShape(const Ptr& ptr)
     {
         mPhysics->updateAnimatedCollisionShape(ptr);
     }
@@ -1548,8 +1582,7 @@ namespace MWWorld
     {
         auto navigatorUpdateGuard = mNavigator->makeUpdateGuard();
 
-        mPhysics->forEachAnimatedObject([&] (const auto& pair)
-        {
+        mPhysics->forEachAnimatedObject([&](const auto& pair) {
             const auto [object, changed] = pair;
             if (changed)
                 updateNavigatorObject(*object, navigatorUpdateGuard.get());
@@ -1562,16 +1595,16 @@ namespace MWWorld
         mNavigator->update(getPlayerPtr().getRefData().getPosition().asVec3(), navigatorUpdateGuard.get());
     }
 
-    void World::updateNavigatorObject(const MWPhysics::Object& object,
-        const DetourNavigator::UpdateGuard* navigatorUpdateGuard)
+    void World::updateNavigatorObject(
+        const MWPhysics::Object& object, const DetourNavigator::UpdateGuard* navigatorUpdateGuard)
     {
         if (object.getShapeInstance()->mVisualCollisionType != Resource::VisualCollisionType::None)
             return;
         const MWWorld::Ptr ptr = object.getPtr();
         const DetourNavigator::ObjectShapes shapes(object.getShapeInstance(),
-            DetourNavigator::ObjectTransform {ptr.getRefData().getPosition(), ptr.getCellRef().getScale()});
-        mNavigator->updateObject(DetourNavigator::ObjectId(&object), shapes, object.getTransform(),
-            navigatorUpdateGuard);
+            DetourNavigator::ObjectTransform{ ptr.getRefData().getPosition(), ptr.getCellRef().getScale() });
+        mNavigator->updateObject(
+            DetourNavigator::ObjectId(&object), shapes, object.getTransform(), navigatorUpdateGuard);
     }
 
     const MWPhysics::RayCastingInterface* World::getRayCasting() const
@@ -1579,17 +1612,17 @@ namespace MWWorld
         return mPhysics.get();
     }
 
-    bool World::castRay (float x1, float y1, float z1, float x2, float y2, float z2)
+    bool World::castRay(float x1, float y1, float z1, float x2, float y2, float z2)
     {
         int mask = MWPhysics::CollisionType_World | MWPhysics::CollisionType_Door;
         bool result = castRay(x1, y1, z1, x2, y2, z2, mask);
         return result;
     }
 
-    bool World::castRay (float x1, float y1, float z1, float x2, float y2, float z2, int mask)
+    bool World::castRay(float x1, float y1, float z1, float x2, float y2, float z2, int mask)
     {
-        osg::Vec3f a(x1,y1,z1);
-        osg::Vec3f b(x2,y2,z2);
+        osg::Vec3f a(x1, y1, z1);
+        osg::Vec3f b(x2, y2, z2);
 
         MWPhysics::RayCastingResult result = mPhysics->castRay(a, b, MWWorld::Ptr(), std::vector<MWWorld::Ptr>(), mask);
         return result.mHit;
@@ -1618,7 +1651,8 @@ namespace MWWorld
 
         /// \todo should use convexSweepTest here
         bool collisionWithActor = false;
-        for (auto& [ptr, point, normal] : mPhysics->getCollisionsPoints(door, MWPhysics::CollisionType_Door, MWPhysics::CollisionType_Actor))
+        for (auto& [ptr, point, normal] :
+            mPhysics->getCollisionsPoints(door, MWPhysics::CollisionType_Door, MWPhysics::CollisionType_Actor))
         {
 
             if (ptr.getClass().isActor())
@@ -1633,11 +1667,11 @@ namespace MWWorld
                 collisionWithActor = true;
 
                 // Collided with actor, ask actor to try to avoid door
-                if(ptr != getPlayerPtr() )
+                if (ptr != getPlayerPtr())
                 {
                     MWMechanics::AiSequence& seq = ptr.getClass().getCreatureStats(ptr).getAiSequence();
-                    if(seq.getTypeId() != MWMechanics::AiPackageTypeId::AvoidDoor) //Only add it once
-                        seq.stack(MWMechanics::AiAvoidDoor(door),ptr);
+                    if (seq.getTypeId() != MWMechanics::AiPackageTypeId::AvoidDoor) // Only add it once
+                        seq.stack(MWMechanics::AiAvoidDoor(door), ptr);
                 }
 
                 // we need to undo the rotation
@@ -1653,13 +1687,15 @@ namespace MWWorld
             if (state == MWWorld::DoorState::Opening)
             {
                 const std::string& openSound = ref->mOpenSound;
-                if (!openSound.empty() && MWBase::Environment::get().getSoundManager()->getSoundPlaying(door, openSound))
+                if (!openSound.empty()
+                    && MWBase::Environment::get().getSoundManager()->getSoundPlaying(door, openSound))
                     MWBase::Environment::get().getSoundManager()->stopSound3D(door, openSound);
             }
             else if (state == MWWorld::DoorState::Closing)
             {
                 const std::string& closeSound = ref->mCloseSound;
-                if (!closeSound.empty() && MWBase::Environment::get().getSoundManager()->getSoundPlaying(door, closeSound))
+                if (!closeSound.empty()
+                    && MWBase::Environment::get().getSoundManager()->getSoundPlaying(door, closeSound))
                     MWBase::Environment::get().getSoundManager()->stopSound3D(door, closeSound);
             }
 
@@ -1678,7 +1714,8 @@ namespace MWWorld
             {
                 // The door is no longer in an active cell, or it was disabled.
                 // Erase from mDoorStates, since we no longer need to move it.
-                // Once we load the door's cell again (or re-enable the door), Door::insertObject will reinsert to mDoorStates.
+                // Once we load the door's cell again (or re-enable the door), Door::insertObject will reinsert to
+                // mDoorStates.
                 mDoorStates.erase(it++);
             }
             else
@@ -1699,7 +1736,7 @@ namespace MWWorld
 
     void World::setActorCollisionMode(const MWWorld::Ptr& ptr, bool internal, bool external)
     {
-        MWPhysics::Actor *physicActor = mPhysics->getActor(ptr);
+        MWPhysics::Actor* physicActor = mPhysics->getActor(ptr);
         if (physicActor && physicActor->getCollisionMode() != internal)
         {
             physicActor->enableCollisionMode(internal);
@@ -1709,7 +1746,7 @@ namespace MWWorld
 
     bool World::isActorCollisionEnabled(const MWWorld::Ptr& ptr)
     {
-        MWPhysics::Actor *physicActor = mPhysics->getActor(ptr);
+        MWPhysics::Actor* physicActor = mPhysics->getActor(ptr);
         return physicActor && physicActor->getCollisionMode();
     }
 
@@ -1724,7 +1761,7 @@ namespace MWWorld
         return false;
     }
 
-    bool World::toggleRenderMode (MWRender::RenderMode mode)
+    bool World::toggleRenderMode(MWRender::RenderMode mode)
     {
         switch (mode)
         {
@@ -1735,98 +1772,97 @@ namespace MWWorld
         }
     }
 
-    const ESM::Potion *World::createRecord (const ESM::Potion& record)
+    const ESM::Potion* World::createRecord(const ESM::Potion& record)
     {
         return mStore.insert(record);
     }
 
-    const ESM::Class *World::createRecord (const ESM::Class& record)
+    const ESM::Class* World::createRecord(const ESM::Class& record)
     {
         return mStore.insert(record);
     }
 
-    const ESM::Spell *World::createRecord (const ESM::Spell& record)
+    const ESM::Spell* World::createRecord(const ESM::Spell& record)
     {
         return mStore.insert(record);
     }
 
-    const ESM::Cell *World::createRecord (const ESM::Cell& record)
+    const ESM::Cell* World::createRecord(const ESM::Cell& record)
     {
         return mStore.insert(record);
     }
 
-    const ESM::CreatureLevList *World::createOverrideRecord(const ESM::CreatureLevList &record)
+    const ESM::CreatureLevList* World::createOverrideRecord(const ESM::CreatureLevList& record)
     {
         return mStore.overrideRecord(record);
     }
 
-    const ESM::ItemLevList *World::createOverrideRecord(const ESM::ItemLevList &record)
+    const ESM::ItemLevList* World::createOverrideRecord(const ESM::ItemLevList& record)
     {
         return mStore.overrideRecord(record);
     }
 
-    const ESM::Creature *World::createOverrideRecord(const ESM::Creature &record)
+    const ESM::Creature* World::createOverrideRecord(const ESM::Creature& record)
     {
         return mStore.overrideRecord(record);
     }
 
-    const ESM::NPC *World::createOverrideRecord(const ESM::NPC &record)
+    const ESM::NPC* World::createOverrideRecord(const ESM::NPC& record)
     {
         return mStore.overrideRecord(record);
     }
 
-    const ESM::Container *World::createOverrideRecord(const ESM::Container &record)
+    const ESM::Container* World::createOverrideRecord(const ESM::Container& record)
     {
         return mStore.overrideRecord(record);
     }
 
-    const ESM::NPC *World::createRecord(const ESM::NPC &record)
+    const ESM::NPC* World::createRecord(const ESM::NPC& record)
     {
         bool update = false;
 
         if (Misc::StringUtils::ciEqual(record.mId, "player"))
         {
-            const ESM::NPC *player =
-                mPlayer->getPlayer().get<ESM::NPC>()->mBase;
+            const ESM::NPC* player = mPlayer->getPlayer().get<ESM::NPC>()->mBase;
 
-            update = record.isMale() != player->isMale() ||
-                     !Misc::StringUtils::ciEqual(record.mRace, player->mRace) ||
-                     !Misc::StringUtils::ciEqual(record.mHead, player->mHead) ||
-                     !Misc::StringUtils::ciEqual(record.mHair, player->mHair);
+            update = record.isMale() != player->isMale() || !Misc::StringUtils::ciEqual(record.mRace, player->mRace)
+                || !Misc::StringUtils::ciEqual(record.mHead, player->mHead)
+                || !Misc::StringUtils::ciEqual(record.mHair, player->mHair);
         }
-        const ESM::NPC *ret = mStore.insert(record);
-        if (update) {
+        const ESM::NPC* ret = mStore.insert(record);
+        if (update)
+        {
             renderPlayer();
         }
         return ret;
     }
 
-    const ESM::Armor *World::createRecord (const ESM::Armor& record)
+    const ESM::Armor* World::createRecord(const ESM::Armor& record)
     {
         return mStore.insert(record);
     }
 
-    const ESM::Weapon *World::createRecord (const ESM::Weapon& record)
+    const ESM::Weapon* World::createRecord(const ESM::Weapon& record)
     {
         return mStore.insert(record);
     }
 
-    const ESM::Clothing *World::createRecord (const ESM::Clothing& record)
+    const ESM::Clothing* World::createRecord(const ESM::Clothing& record)
     {
         return mStore.insert(record);
     }
 
-    const ESM::Enchantment *World::createRecord (const ESM::Enchantment& record)
+    const ESM::Enchantment* World::createRecord(const ESM::Enchantment& record)
     {
         return mStore.insert(record);
     }
 
-    const ESM::Book *World::createRecord (const ESM::Book& record)
+    const ESM::Book* World::createRecord(const ESM::Book& record)
     {
         return mStore.insert(record);
     }
 
-    void World::update (float duration, bool paused)
+    void World::update(float duration, bool paused)
     {
         if (mGoToJail && !paused)
             goToJail();
@@ -1864,16 +1900,17 @@ namespace MWWorld
         if (mWorldScene->hasCellLoaded())
         {
             mNavigator->wait(DetourNavigator::WaitConditionType::requiredTilesPresent,
-                             MWBase::Environment::get().getWindowManager()->getLoadingScreen());
+                MWBase::Environment::get().getWindowManager()->getLoadingScreen());
             mWorldScene->resetCellLoaded();
         }
     }
 
-    void World::updatePhysics (float duration, bool paused, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
+    void World::updatePhysics(
+        float duration, bool paused, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
     {
         if (!paused)
         {
-            doPhysics (duration, frameStart, frameNumber, stats);
+            doPhysics(duration, frameStart, frameNumber, stats);
         }
         else
         {
@@ -1893,7 +1930,8 @@ namespace MWWorld
             if (spell)
                 preloadEffects(&spell->mEffects);
         }
-        const MWWorld::Ptr& selectedEnchantItem = MWBase::Environment::get().getWindowManager()->getSelectedEnchantItem();
+        const MWWorld::Ptr& selectedEnchantItem
+            = MWBase::Environment::get().getWindowManager()->getSelectedEnchantItem();
         if (!selectedEnchantItem.isEmpty())
         {
             std::string_view enchantId = selectedEnchantItem.getClass().getEnchantment(selectedEnchantItem);
@@ -1928,33 +1966,32 @@ namespace MWWorld
         else
             listenerPos = refpos.asVec3() + osg::Vec3f(0, 0, 1.85f * mPhysics->getHalfExtents(getPlayerPtr()).z());
 
-        osg::Quat listenerOrient = osg::Quat(refpos.rot[1], osg::Vec3f(0,-1,0)) *
-                osg::Quat(refpos.rot[0], osg::Vec3f(-1,0,0)) *
-                osg::Quat(refpos.rot[2], osg::Vec3f(0,0,-1));
+        osg::Quat listenerOrient = osg::Quat(refpos.rot[1], osg::Vec3f(0, -1, 0))
+            * osg::Quat(refpos.rot[0], osg::Vec3f(-1, 0, 0)) * osg::Quat(refpos.rot[2], osg::Vec3f(0, 0, -1));
 
-        osg::Vec3f forward = listenerOrient * osg::Vec3f(0,1,0);
-        osg::Vec3f up = listenerOrient * osg::Vec3f(0,0,1);
+        osg::Vec3f forward = listenerOrient * osg::Vec3f(0, 1, 0);
+        osg::Vec3f up = listenerOrient * osg::Vec3f(0, 0, 1);
 
         bool underwater = isUnderwater(getPlayerPtr().getCell(), cameraPosition);
 
         MWBase::Environment::get().getSoundManager()->setListenerPosDir(listenerPos, forward, up, underwater);
     }
 
-    void World::updateWindowManager ()
+    void World::updateWindowManager()
     {
         try
         {
             // inform the GUI about focused object
-            MWWorld::Ptr object = getFacedObject ();
+            MWWorld::Ptr object = getFacedObject();
 
             // retrieve object dimensions so we know where to place the floating label
-            if (!object.isEmpty ())
+            if (!object.isEmpty())
             {
                 osg::BoundingBox bb = mPhysics->getBoundingBox(object);
                 if (!bb.valid() && object.getRefData().getBaseNode())
                 {
                     osg::ComputeBoundsVisitor computeBoundsVisitor;
-                    computeBoundsVisitor.setTraversalMask(~(MWRender::Mask_ParticleSystem|MWRender::Mask_Effect));
+                    computeBoundsVisitor.setTraversalMask(~(MWRender::Mask_ParticleSystem | MWRender::Mask_Effect));
                     object.getRefData().getBaseNode()->accept(computeBoundsVisitor);
                     bb = computeBoundsVisitor.getBoundingBox();
                 }
@@ -1993,7 +2030,8 @@ namespace MWWorld
             for (CellStore* cellstore : mWorldScene->getActiveCells())
             {
                 facedObject = cellstore->searchViaRefNum(rayToObject.mHitRefnum);
-                if (!facedObject.isEmpty()) break;
+                if (!facedObject.isEmpty())
+                    break;
             }
         }
         if (rayToObject.mHit)
@@ -2004,7 +2042,7 @@ namespace MWWorld
     }
 
     bool World::castRenderingRay(MWPhysics::RayCastingResult& res, const osg::Vec3f& from, const osg::Vec3f& to,
-                                 bool ignorePlayer, bool ignoreActors)
+        bool ignorePlayer, bool ignoreActors)
     {
         MWRender::RenderingManager::RayResult rayRes = mRendering->castRay(from, to, ignorePlayer, ignoreActors);
         res.mHit = rayRes.mHit;
@@ -2016,7 +2054,8 @@ namespace MWWorld
             for (CellStore* cellstore : mWorldScene->getActiveCells())
             {
                 res.mHitObject = cellstore->searchViaRefNum(rayRes.mHitRefnum);
-                if (!res.mHitObject.isEmpty()) break;
+                if (!res.mHitObject.isEmpty())
+                    break;
             }
         }
         return res.mHit;
@@ -2024,7 +2063,7 @@ namespace MWWorld
 
     bool World::isCellExterior() const
     {
-        const CellStore *currentCell = mWorldScene->getCurrentCell();
+        const CellStore* currentCell = mWorldScene->getCurrentCell();
         if (currentCell)
         {
             return currentCell->getCell()->isExterior();
@@ -2034,7 +2073,7 @@ namespace MWWorld
 
     bool World::isCellQuasiExterior() const
     {
-        const CellStore *currentCell = mWorldScene->getCurrentCell();
+        const CellStore* currentCell = mWorldScene->getCurrentCell();
         if (currentCell)
         {
             if (!(currentCell->getCell()->mData.mFlags & ESM::Cell::QuasiEx))
@@ -2075,16 +2114,16 @@ namespace MWWorld
         mWeatherManager->modRegion(regionid, chances);
     }
 
-    osg::Vec2f World::getNorthVector (const CellStore* cell)
+    osg::Vec2f World::getNorthVector(const CellStore* cell)
     {
         MWWorld::ConstPtr northmarker = cell->searchConst("northmarker");
 
         if (northmarker.isEmpty())
             return osg::Vec2f(0, 1);
 
-        osg::Quat orient (-northmarker.getRefData().getPosition().rot[2], osg::Vec3f(0,0,1));
-        osg::Vec3f dir = orient * osg::Vec3f(0,1,0);
-        osg::Vec2f d (dir.x(), dir.y());
+        osg::Quat orient(-northmarker.getRefData().getPosition().rot[2], osg::Vec3f(0, 0, 1));
+        osg::Vec3f dir = orient * osg::Vec3f(0, 1, 0);
+        osg::Vec2f d(dir.x(), dir.y());
         return d;
     }
 
@@ -2094,7 +2133,7 @@ namespace MWWorld
 
         bool operator()(const MWWorld::Ptr& ptr)
         {
-            MWWorld::LiveCellRef<ESM::Door>& ref = *static_cast<MWWorld::LiveCellRef<ESM::Door>* >(ptr.getBase());
+            MWWorld::LiveCellRef<ESM::Door>& ref = *static_cast<MWWorld::LiveCellRef<ESM::Door>*>(ptr.getBase());
 
             if (!ref.mData.isEnabled() || ref.mData.isDeleted())
                 return true;
@@ -2115,13 +2154,14 @@ namespace MWWorld
                 else
                 {
                     cellid.mPaged = true;
-                    const osg::Vec2i index = positionToCellIndex(ref.mRef.getDoorDest().pos[0], ref.mRef.getDoorDest().pos[1]);
+                    const osg::Vec2i index
+                        = positionToCellIndex(ref.mRef.getDoorDest().pos[0], ref.mRef.getDoorDest().pos[1]);
                     cellid.mIndex.mX = index.x();
                     cellid.mIndex.mY = index.y();
                 }
                 newMarker.dest = cellid;
 
-                ESM::Position pos = ref.mData.getPosition ();
+                ESM::Position pos = ref.mData.getPosition();
 
                 newMarker.x = pos.pos[0];
                 newMarker.y = pos.pos[1];
@@ -2131,9 +2171,9 @@ namespace MWWorld
         }
     };
 
-    void World::getDoorMarkers (CellStore* cell, std::vector<World::DoorMarker>& out)
+    void World::getDoorMarkers(CellStore* cell, std::vector<World::DoorMarker>& out)
     {
-        GetDoorMarkerVisitor visitor {out};
+        GetDoorMarkerVisitor visitor{ out };
         cell->forEachType<ESM::Door>(visitor);
     }
 
@@ -2158,20 +2198,21 @@ namespace MWWorld
         return mRendering->toggleBorders();
     }
 
-    void World::PCDropped (const Ptr& item)
+    void World::PCDropped(const Ptr& item)
     {
         std::string_view script = item.getClass().getScript(item);
 
         // Set OnPCDrop Variable on item's script, if it has a script with that variable declared
-        if(!script.empty())
+        if (!script.empty())
             item.getRefData().getLocals().setVarByInt(script, "onpcdrop", 1);
     }
 
-    MWWorld::Ptr World::placeObject (const MWWorld::ConstPtr& object, float cursorX, float cursorY, int amount)
+    MWWorld::Ptr World::placeObject(const MWWorld::ConstPtr& object, float cursorX, float cursorY, int amount)
     {
         const float maxDist = 200.f;
 
-        MWRender::RenderingManager::RayResult result = mRendering->castCameraToViewportRay(cursorX, cursorY, maxDist, true, true);
+        MWRender::RenderingManager::RayResult result
+            = mRendering->castCameraToViewportRay(cursorX, cursorY, maxDist, true, true);
 
         CellStore* cell = getPlayerPtr().getCell();
 
@@ -2198,12 +2239,14 @@ namespace MWWorld
     bool World::canPlaceObject(float cursorX, float cursorY)
     {
         const float maxDist = 200.f;
-        MWRender::RenderingManager::RayResult result = mRendering->castCameraToViewportRay(cursorX, cursorY, maxDist, true, true);
+        MWRender::RenderingManager::RayResult result
+            = mRendering->castCameraToViewportRay(cursorX, cursorY, maxDist, true, true);
 
         if (result.mHit)
         {
             // check if the wanted position is on a flat surface, and not e.g. against a vertical wall
-            if (std::acos((result.mHitNormalWorld/result.mHitNormalWorld.length()) * osg::Vec3f(0,0,1)) >= osg::DegreesToRadians(30.f))
+            if (std::acos((result.mHitNormalWorld / result.mHitNormalWorld.length()) * osg::Vec3f(0, 0, 1))
+                >= osg::DegreesToRadians(30.f))
                 return false;
 
             return true;
@@ -2212,8 +2255,7 @@ namespace MWWorld
             return false;
     }
 
-
-    Ptr World::copyObjectToCell(const ConstPtr &object, CellStore* cell, ESM::Position pos, int count, bool adjustPos)
+    Ptr World::copyObjectToCell(const ConstPtr& object, CellStore* cell, ESM::Position pos, int count, bool adjustPos)
     {
         if (!cell)
             throw std::runtime_error("copyObjectToCell(): cannot copy object to null cell");
@@ -2223,19 +2265,21 @@ namespace MWWorld
             cell = mCells.getExterior(index.x(), index.y());
         }
 
-        MWWorld::Ptr dropped =
-            object.getClass().copyToCell(object, *cell, pos, count);
+        MWWorld::Ptr dropped = object.getClass().copyToCell(object, *cell, pos, count);
 
         // Reset some position values that could be uninitialized if this item came from a container
         dropped.getCellRef().setPosition(pos);
         dropped.getCellRef().unsetRefNum();
 
-        if (mWorldScene->isCellActive(*cell)) {
-            if (dropped.getRefData().isEnabled()) {
+        if (mWorldScene->isCellActive(*cell))
+        {
+            if (dropped.getRefData().isEnabled())
+            {
                 mWorldScene->addObjectToScene(dropped);
             }
             std::string_view script = dropped.getClass().getScript(dropped);
-            if (!script.empty()) {
+            if (!script.empty())
+            {
                 mLocalScripts.add(script, dropped);
             }
             addContainerScripts(dropped, cell);
@@ -2252,11 +2296,8 @@ namespace MWWorld
             {
                 bounds.set(bounds._min - pos.asVec3(), bounds._max - pos.asVec3());
 
-                osg::Vec3f adjust (
-                            (bounds.xMin() + bounds.xMax()) / 2,
-                           (bounds.yMin() + bounds.yMax()) / 2,
-                           bounds.zMin()
-                           );
+                osg::Vec3f adjust(
+                    (bounds.xMin() + bounds.xMax()) / 2, (bounds.yMin() + bounds.yMax()) / 2, bounds.zMin());
                 pos.pos[0] -= adjust.x();
                 pos.pos[1] -= adjust.y();
                 pos.pos[2] -= adjust.z();
@@ -2267,30 +2308,29 @@ namespace MWWorld
         return dropped;
     }
 
-    MWWorld::Ptr World::dropObjectOnGround (const Ptr& actor, const ConstPtr& object, int amount)
+    MWWorld::Ptr World::dropObjectOnGround(const Ptr& actor, const ConstPtr& object, int amount)
     {
         MWWorld::CellStore* cell = actor.getCell();
 
-        ESM::Position pos =
-            actor.getRefData().getPosition();
+        ESM::Position pos = actor.getRefData().getPosition();
         // We want only the Z part of the actor's rotation
         pos.rot[0] = 0;
         pos.rot[1] = 0;
 
         osg::Vec3f orig = pos.asVec3();
         orig.z() += 20;
-        osg::Vec3f dir (0, 0, -1);
+        osg::Vec3f dir(0, 0, -1);
 
         float len = 1000000.0;
 
-        MWRender::RenderingManager::RayResult result = mRendering->castRay(orig, orig+dir*len, true, true);
+        MWRender::RenderingManager::RayResult result = mRendering->castRay(orig, orig + dir * len, true, true);
         if (result.mHit)
             pos.pos[2] = result.mHitPointWorld.z();
 
         // copy the object and set its count
         Ptr dropped = copyObjectToCell(object, cell, pos, amount, true);
 
-        if(actor == mPlayer->getPlayer()) // Only call if dropped by player
+        if (actor == mPlayer->getPlayer()) // Only call if dropped by player
             PCDropped(dropped);
         return dropped;
     }
@@ -2300,12 +2340,12 @@ namespace MWWorld
         mRendering->processChangedSettings(settings);
     }
 
-    bool World::isFlying(const MWWorld::Ptr &ptr) const
+    bool World::isFlying(const MWWorld::Ptr& ptr) const
     {
-        if(!ptr.getClass().isActor())
+        if (!ptr.getClass().isActor())
             return false;
 
-        const MWMechanics::CreatureStats &stats = ptr.getClass().getCreatureStats(ptr);
+        const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
 
         if (stats.isDead())
             return false;
@@ -2317,68 +2357,70 @@ namespace MWWorld
         if (ptr.getClass().canFly(ptr))
             return true;
 
-        if(stats.getMagicEffects().get(ESM::MagicEffect::Levitate).getMagnitude() > 0
-                && isLevitationEnabled())
+        if (stats.getMagicEffects().get(ESM::MagicEffect::Levitate).getMagnitude() > 0 && isLevitationEnabled())
             return true;
 
         const MWPhysics::Actor* actor = mPhysics->getActor(ptr);
-        if(!actor)
+        if (!actor)
             return true;
 
         return false;
     }
 
-    bool World::isSlowFalling(const MWWorld::Ptr &ptr) const
+    bool World::isSlowFalling(const MWWorld::Ptr& ptr) const
     {
-        if(!ptr.getClass().isActor())
+        if (!ptr.getClass().isActor())
             return false;
 
-        const MWMechanics::CreatureStats &stats = ptr.getClass().getCreatureStats(ptr);
-        if(stats.getMagicEffects().get(ESM::MagicEffect::SlowFall).getMagnitude() > 0)
+        const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
+        if (stats.getMagicEffects().get(ESM::MagicEffect::SlowFall).getMagnitude() > 0)
             return true;
 
         return false;
     }
 
-    bool World::isSubmerged(const MWWorld::ConstPtr &object) const
+    bool World::isSubmerged(const MWWorld::ConstPtr& object) const
     {
-        return isUnderwater(object, 1.0f/mSwimHeightScale);
+        return isUnderwater(object, 1.0f / mSwimHeightScale);
     }
 
-    bool World::isSwimming(const MWWorld::ConstPtr &object) const
+    bool World::isSwimming(const MWWorld::ConstPtr& object) const
     {
         return isUnderwater(object, mSwimHeightScale);
     }
 
-    bool World::isWading(const MWWorld::ConstPtr &object) const
+    bool World::isWading(const MWWorld::ConstPtr& object) const
     {
         const float kneeDeep = 0.25f;
         return isUnderwater(object, kneeDeep);
     }
 
-    bool World::isUnderwater(const MWWorld::ConstPtr &object, const float heightRatio) const
+    bool World::isUnderwater(const MWWorld::ConstPtr& object, const float heightRatio) const
     {
-        osg::Vec3f pos (object.getRefData().getPosition().asVec3());
+        osg::Vec3f pos(object.getRefData().getPosition().asVec3());
 
-        pos.z() += heightRatio*2*mPhysics->getRenderingHalfExtents(object).z();
+        pos.z() += heightRatio * 2 * mPhysics->getRenderingHalfExtents(object).z();
 
-        const CellStore *currCell = object.isInCell() ? object.getCell() : nullptr; // currCell == nullptr should only happen for player, during initial startup
+        const CellStore* currCell = object.isInCell()
+            ? object.getCell()
+            : nullptr; // currCell == nullptr should only happen for player, during initial startup
 
         return isUnderwater(currCell, pos);
     }
 
-    bool World::isUnderwater(const MWWorld::CellStore* cell, const osg::Vec3f &pos) const
+    bool World::isUnderwater(const MWWorld::CellStore* cell, const osg::Vec3f& pos) const
     {
         if (!cell)
             return false;
 
-        if (!(cell->getCell()->hasWater())) {
+        if (!(cell->getCell()->hasWater()))
+        {
             return false;
         }
         return pos.z() < cell->getWaterLevel();
     }
 
-    bool World::isWaterWalkingCastableOnTarget(const MWWorld::ConstPtr &target) const
+    bool World::isWaterWalkingCastableOnTarget(const MWWorld::ConstPtr& target) const
     {
         const MWWorld::CellStore* cell = target.getCell();
         if (!cell->getCell()->hasWater())
@@ -2390,13 +2432,15 @@ namespace MWWorld
         // while in water. Based on observation from the original engine,
         // the upper z position you get with a +1 SwimHeightScale is the depth
         // limit for being able to cast water walking on an underwater target.
-        if (isUnderwater(target, mSwimHeightScale + 1) || (isUnderwater(cell, target.getRefData().getPosition().asVec3()) && !mPhysics->canMoveToWaterSurface(target, waterlevel)))
+        if (isUnderwater(target, mSwimHeightScale + 1)
+            || (isUnderwater(cell, target.getRefData().getPosition().asVec3())
+                && !mPhysics->canMoveToWaterSurface(target, waterlevel)))
             return false; // not castable if too deep or if not enough room to move actor to surface
         else
             return true;
     }
 
-    bool World::isOnGround(const MWWorld::Ptr &ptr) const
+    bool World::isOnGround(const MWWorld::Ptr& ptr) const
     {
         return mPhysics->isOnGround(ptr);
     }
@@ -2410,7 +2454,7 @@ namespace MWWorld
     {
         return mRendering->getCamera()->getMode() == MWRender::Camera::Mode::FirstPerson;
     }
-    
+
     bool World::isPreviewModeEnabled() const
     {
         return mRendering->getCamera()->getMode() == MWRender::Camera::Mode::Preview;
@@ -2431,12 +2475,15 @@ namespace MWWorld
         mRendering->getCamera()->applyDeferredPreviewRotationToPlayer(dt);
     }
 
-    MWRender::Camera* World::getCamera() { return mRendering->getCamera(); }
+    MWRender::Camera* World::getCamera()
+    {
+        return mRendering->getCamera();
+    }
 
-    bool World::vanityRotateCamera(float * rot)
+    bool World::vanityRotateCamera(float* rot)
     {
         auto* camera = mRendering->getCamera();
-        if(!camera->isVanityOrPreviewModeEnabled())
+        if (!camera->isVanityOrPreviewModeEnabled())
             return false;
 
         camera->setPitch(camera->getPitch() + rot[0]);
@@ -2451,7 +2498,7 @@ namespace MWWorld
 
     void World::setupPlayer()
     {
-        const ESM::NPC *player = mStore.get<ESM::NPC>().find("player");
+        const ESM::NPC* player = mStore.get<ESM::NPC>().find("player");
         if (!mPlayer)
             mPlayer = std::make_unique<MWWorld::Player>(player);
         else
@@ -2498,19 +2545,19 @@ namespace MWWorld
         mNavigator->addAgent(getPathfindingAgentBounds(getPlayerConstPtr()));
     }
 
-    World::RestPermitted World::canRest () const
+    World::RestPermitted World::canRest() const
     {
-        CellStore *currentCell = mWorldScene->getCurrentCell();
+        CellStore* currentCell = mWorldScene->getCurrentCell();
 
         Ptr player = mPlayer->getPlayer();
-        RefData &refdata = player.getRefData();
+        RefData& refdata = player.getRefData();
         osg::Vec3f playerPos(refdata.getPosition().asVec3());
 
         const MWPhysics::Actor* actor = mPhysics->getActor(player);
         if (!actor)
             throw std::runtime_error("can't find player");
 
-        if(mPlayer->enemiesNearby())
+        if (mPlayer->enemiesNearby())
             return Rest_EnemiesAreNearby;
 
         if (isUnderwater(currentCell, playerPos) || isWalkingOnWater(player))
@@ -2518,28 +2565,31 @@ namespace MWWorld
 
         float fallHeight = player.getClass().getCreatureStats(player).getFallHeight();
         float epsilon = 1e-4;
-        if ((actor->getCollisionMode() && (!mPhysics->isOnSolidGround(player) || fallHeight >= epsilon)) || isFlying(player))
+        if ((actor->getCollisionMode() && (!mPhysics->isOnSolidGround(player) || fallHeight >= epsilon))
+            || isFlying(player))
             return Rest_PlayerIsInAir;
 
-        if((currentCell->getCell()->mData.mFlags&ESM::Cell::NoSleep) || player.getClass().getNpcStats(player).isWerewolf())
+        if ((currentCell->getCell()->mData.mFlags & ESM::Cell::NoSleep)
+            || player.getClass().getNpcStats(player).isWerewolf())
             return Rest_OnlyWaiting;
 
         return Rest_Allowed;
     }
 
-    MWRender::Animation* World::getAnimation(const MWWorld::Ptr &ptr)
+    MWRender::Animation* World::getAnimation(const MWWorld::Ptr& ptr)
     {
         auto* animation = mRendering->getAnimation(ptr);
-        if(!animation) {
+        if (!animation)
+        {
             mWorldScene->removeFromPagedRefs(ptr);
             animation = mRendering->getAnimation(ptr);
-            if(animation)
+            if (animation)
                 mRendering->pagingBlacklistObject(mStore.find(ptr.getCellRef().getRefId()), ptr);
         }
         return animation;
     }
 
-    const MWRender::Animation* World::getAnimation(const MWWorld::ConstPtr &ptr) const
+    const MWRender::Animation* World::getAnimation(const MWWorld::ConstPtr& ptr) const
     {
         return mRendering->getAnimation(ptr);
     }
@@ -2559,25 +2609,25 @@ namespace MWWorld
         auto state = door.getClass().getDoorState(door);
         switch (state)
         {
-        case MWWorld::DoorState::Idle:
-            if (door.getRefData().getPosition().rot[2] == door.getCellRef().getPosition().rot[2])
-                state = MWWorld::DoorState::Opening; // if closed, then open
-            else
-                state = MWWorld::DoorState::Closing; // if open, then close
-            break;
-        case MWWorld::DoorState::Closing:
-            state = MWWorld::DoorState::Opening; // if closing, then open
-            break;
-        case MWWorld::DoorState::Opening:
-        default:
-            state = MWWorld::DoorState::Closing; // if opening, then close
-            break;
+            case MWWorld::DoorState::Idle:
+                if (door.getRefData().getPosition().rot[2] == door.getCellRef().getPosition().rot[2])
+                    state = MWWorld::DoorState::Opening; // if closed, then open
+                else
+                    state = MWWorld::DoorState::Closing; // if open, then close
+                break;
+            case MWWorld::DoorState::Closing:
+                state = MWWorld::DoorState::Opening; // if closing, then open
+                break;
+            case MWWorld::DoorState::Opening:
+            default:
+                state = MWWorld::DoorState::Closing; // if opening, then close
+                break;
         }
         door.getClass().setDoorState(door, state);
         mDoorStates[door] = state;
     }
 
-    void World::activateDoor(const Ptr &door, MWWorld::DoorState state)
+    void World::activateDoor(const Ptr& door, MWWorld::DoorState state)
     {
         door.getClass().setDoorState(door, state);
         mDoorStates[door] = state;
@@ -2588,57 +2638,57 @@ namespace MWWorld
         }
     }
 
-    bool World::getPlayerStandingOn (const MWWorld::ConstPtr& object)
+    bool World::getPlayerStandingOn(const MWWorld::ConstPtr& object)
     {
         MWWorld::Ptr player = getPlayerPtr();
         return mPhysics->isActorStandingOn(player, object);
     }
 
-    bool World::getActorStandingOn (const MWWorld::ConstPtr& object)
+    bool World::getActorStandingOn(const MWWorld::ConstPtr& object)
     {
         std::vector<MWWorld::Ptr> actors;
         mPhysics->getActorsStandingOn(object, actors);
         return !actors.empty();
     }
 
-    void World::getActorsStandingOn (const MWWorld::ConstPtr& object, std::vector<MWWorld::Ptr> &actors)
+    void World::getActorsStandingOn(const MWWorld::ConstPtr& object, std::vector<MWWorld::Ptr>& actors)
     {
         mPhysics->getActorsStandingOn(object, actors);
     }
 
-    bool World::getPlayerCollidingWith (const MWWorld::ConstPtr& object)
+    bool World::getPlayerCollidingWith(const MWWorld::ConstPtr& object)
     {
         MWWorld::Ptr player = getPlayerPtr();
         return mPhysics->isActorCollidingWith(player, object);
     }
 
-    bool World::getActorCollidingWith (const MWWorld::ConstPtr& object)
+    bool World::getActorCollidingWith(const MWWorld::ConstPtr& object)
     {
         std::vector<MWWorld::Ptr> actors;
         mPhysics->getActorsCollidingWith(object, actors);
         return !actors.empty();
     }
 
-    void World::hurtStandingActors(const ConstPtr &object, float healthPerSecond)
+    void World::hurtStandingActors(const ConstPtr& object, float healthPerSecond)
     {
         if (MWBase::Environment::get().getWindowManager()->isGuiMode())
             return;
 
         std::vector<MWWorld::Ptr> actors;
         mPhysics->getActorsStandingOn(object, actors);
-        for (const Ptr &actor : actors)
+        for (const Ptr& actor : actors)
         {
             MWMechanics::CreatureStats& stats = actor.getClass().getCreatureStats(actor);
             if (stats.isDead())
                 continue;
 
-            mPhysics->markAsNonSolid (object);
+            mPhysics->markAsNonSolid(object);
 
             if (actor == getPlayerPtr() && mGodMode)
                 continue;
 
             MWMechanics::DynamicStat<float> health = stats.getHealth();
-            health.setCurrent(health.getCurrent()-healthPerSecond*MWBase::Environment::get().getFrameDuration());
+            health.setCurrent(health.getCurrent() - healthPerSecond * MWBase::Environment::get().getFrameDuration());
             stats.setHealth(health);
 
             if (healthPerSecond > 0.0f)
@@ -2652,26 +2702,26 @@ namespace MWWorld
         }
     }
 
-    void World::hurtCollidingActors(const ConstPtr &object, float healthPerSecond)
+    void World::hurtCollidingActors(const ConstPtr& object, float healthPerSecond)
     {
         if (MWBase::Environment::get().getWindowManager()->isGuiMode())
             return;
 
         std::vector<Ptr> actors;
         mPhysics->getActorsCollidingWith(object, actors);
-        for (const Ptr &actor : actors)
+        for (const Ptr& actor : actors)
         {
             MWMechanics::CreatureStats& stats = actor.getClass().getCreatureStats(actor);
             if (stats.isDead())
                 continue;
 
-            mPhysics->markAsNonSolid (object);
+            mPhysics->markAsNonSolid(object);
 
             if (actor == getPlayerPtr() && mGodMode)
                 continue;
 
             MWMechanics::DynamicStat<float> health = stats.getHealth();
-            health.setCurrent(health.getCurrent()-healthPerSecond*MWBase::Environment::get().getFrameDuration());
+            health.setCurrent(health.getCurrent() - healthPerSecond * MWBase::Environment::get().getFrameDuration());
             stats.setHealth(health);
 
             if (healthPerSecond > 0.0f)
@@ -2706,7 +2756,7 @@ namespace MWWorld
         if (isCellExterior() || isCellQuasiExterior())
             return mWeatherManager->getStormDirection();
         else
-            return osg::Vec3f(0,1,0);
+            return osg::Vec3f(0, 1, 0);
     }
 
     struct GetContainersOwnedByVisitor
@@ -2736,21 +2786,22 @@ namespace MWWorld
         }
     };
 
-    void World::getContainersOwnedBy (const MWWorld::ConstPtr& owner, std::vector<MWWorld::Ptr>& out)
+    void World::getContainersOwnedBy(const MWWorld::ConstPtr& owner, std::vector<MWWorld::Ptr>& out)
     {
         for (CellStore* cellstore : mWorldScene->getActiveCells())
         {
-            GetContainersOwnedByVisitor visitor (owner, out);
+            GetContainersOwnedByVisitor visitor(owner, out);
             cellstore->forEachType<ESM::Container>(visitor);
         }
     }
 
-    void World::getItemsOwnedBy (const MWWorld::ConstPtr& npc, std::vector<MWWorld::Ptr>& out)
+    void World::getItemsOwnedBy(const MWWorld::ConstPtr& npc, std::vector<MWWorld::Ptr>& out)
     {
         for (CellStore* cellstore : mWorldScene->getActiveCells())
         {
-            cellstore->forEach([&] (const auto& ptr) {
-                if (ptr.getRefData().getBaseNode() && Misc::StringUtils::ciEqual(ptr.getCellRef().getOwner(), npc.getCellRef().getRefId()))
+            cellstore->forEach([&](const auto& ptr) {
+                if (ptr.getRefData().getBaseNode()
+                    && Misc::StringUtils::ciEqual(ptr.getCellRef().getOwner(), npc.getCellRef().getRefId()))
                     out.push_back(ptr);
                 return true;
             });
@@ -2769,15 +2820,18 @@ namespace MWWorld
 
     float World::getDistToNearestRayHit(const osg::Vec3f& from, const osg::Vec3f& dir, float maxDist, bool includeWater)
     {
-        osg::Vec3f to (dir);
+        osg::Vec3f to(dir);
         to.normalize();
         to = from + (to * maxDist);
 
-        int collisionTypes = MWPhysics::CollisionType_World | MWPhysics::CollisionType_HeightMap | MWPhysics::CollisionType_Door;
-        if (includeWater) {
+        int collisionTypes
+            = MWPhysics::CollisionType_World | MWPhysics::CollisionType_HeightMap | MWPhysics::CollisionType_Door;
+        if (includeWater)
+        {
             collisionTypes |= MWPhysics::CollisionType_Water;
         }
-        MWPhysics::RayCastingResult result = mPhysics->castRay(from, to, MWWorld::Ptr(), std::vector<MWWorld::Ptr>(), collisionTypes);
+        MWPhysics::RayCastingResult result
+            = mPhysics->castRay(from, to, MWWorld::Ptr(), std::vector<MWWorld::Ptr>(), collisionTypes);
 
         if (!result.mHit)
             return maxDist;
@@ -2787,7 +2841,7 @@ namespace MWWorld
 
     void World::enableActorCollision(const MWWorld::Ptr& actor, bool enable)
     {
-        MWPhysics::Actor *physicActor = mPhysics->getActor(actor);
+        MWPhysics::Actor* physicActor = mPhysics->getActor(actor);
         if (physicActor)
             physicActor->enableCollisionBody(enable);
     }
@@ -2797,12 +2851,12 @@ namespace MWWorld
         pos.rot[0] = pos.rot[1] = pos.rot[2] = 0;
         pos.pos[0] = pos.pos[1] = pos.pos[2] = 0;
 
-        MWWorld::CellStore *cellStore = getInterior(name);
+        MWWorld::CellStore* cellStore = getInterior(name);
 
         if (!cellStore)
             return false;
 
-        std::vector<const MWWorld::CellRef *> sortedDoors;
+        std::vector<const MWWorld::CellRef*> sortedDoors;
         for (const MWWorld::LiveCellRef<ESM::Door>& door : cellStore->getReadOnlyDoors().mList)
         {
             if (!door.mRef.getTeleport())
@@ -2812,8 +2866,7 @@ namespace MWWorld
         }
 
         // Sort teleporting doors alphabetically, first by ID, then by destination cell to make search consistent
-        std::sort(sortedDoors.begin(), sortedDoors.end(), [] (const MWWorld::CellRef *lhs, const MWWorld::CellRef *rhs)
-        {
+        std::sort(sortedDoors.begin(), sortedDoors.end(), [](const MWWorld::CellRef* lhs, const MWWorld::CellRef* rhs) {
             if (lhs->getRefId() != rhs->getRefId())
                 return lhs->getRefId() < rhs->getRefId();
 
@@ -2822,7 +2875,7 @@ namespace MWWorld
 
         for (const MWWorld::CellRef* door : sortedDoors)
         {
-            MWWorld::CellStore *source = nullptr;
+            MWWorld::CellStore* source = nullptr;
 
             // door to exterior
             if (door->getDestCell().empty())
@@ -2854,7 +2907,7 @@ namespace MWWorld
             }
         }
         // Fall back to the first static location.
-        const MWWorld::CellRefList<ESM::Static>::List &statics = cellStore->getReadOnlyStatics().mList;
+        const MWWorld::CellRefList<ESM::Static>::List& statics = cellStore->getReadOnlyStatics().mList;
         if (!statics.empty())
         {
             pos = statics.begin()->mRef.getPosition();
@@ -2869,7 +2922,7 @@ namespace MWWorld
     {
         pos.rot[0] = pos.rot[1] = pos.rot[2] = 0;
 
-        const ESM::Cell *ext = getExterior(name);
+        const ESM::Cell* ext = getExterior(name);
         if (!ext)
         {
             size_t comma = name.find(',');
@@ -2882,7 +2935,8 @@ namespace MWWorld
                     throw std::runtime_error("Cell coordinates out of range.");
                 else if (xResult.ec == std::errc{} && yResult.ec == std::errc{})
                     ext = getExterior(x, y)->getCell();
-                // ignore std::errc::invalid_argument, as this means that name probably refers to a interior cell instead of comma separated coordinates
+                // ignore std::errc::invalid_argument, as this means that name probably refers to a interior cell
+                // instead of comma separated coordinates
             }
         }
 
@@ -2965,10 +3019,11 @@ namespace MWWorld
         gameContentLoader.addLoader(".omwscripts", omwScriptsLoader);
 
         int idx = 0;
-        for (const std::string &file : content)
+        for (const std::string& file : content)
         {
-            const auto filename = Files::pathFromUnicodeString( file);
-            const Files::MultiDirCollection& col = fileCollections.getCollection(Files::pathToUnicodeString(filename.extension()));
+            const auto filename = Files::pathFromUnicodeString(file);
+            const Files::MultiDirCollection& col
+                = fileCollections.getCollection(Files::pathToUnicodeString(filename.extension()));
             if (col.doesExist(file))
             {
                 gameContentLoader.load(col.getPath(file), idx, listener);
@@ -2988,14 +3043,15 @@ namespace MWWorld
     void World::loadGroundcoverFiles(const Files::Collections& fileCollections,
         const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener)
     {
-        if (!Settings::Manager::getBool("enabled", "Groundcover")) return;
+        if (!Settings::Manager::getBool("enabled", "Groundcover"))
+            return;
 
         Log(Debug::Info) << "Loading groundcover:";
 
         mGroundcoverStore.init(mStore.get<ESM::Static>(), fileCollections, groundcoverFiles, encoder, listener);
     }
 
-    MWWorld::SpellCastState World::startSpellCast(const Ptr &actor)
+    MWWorld::SpellCastState World::startSpellCast(const Ptr& actor)
     {
         MWMechanics::CreatureStats& stats = actor.getClass().getCreatureStats(actor);
 
@@ -3020,21 +3076,24 @@ namespace MWWorld
             }
 
             // If this is a power, check if it was already used in the last 24h
-            if (result == MWWorld::SpellCastState::Success && spell->mData.mType == ESM::Spell::ST_Power && !stats.getSpells().canUsePower(spell))
+            if (result == MWWorld::SpellCastState::Success && spell->mData.mType == ESM::Spell::ST_Power
+                && !stats.getSpells().canUsePower(spell))
             {
                 message = "#{sPowerAlreadyUsed}";
                 result = MWWorld::SpellCastState::PowerAlreadyUsed;
             }
 
-            if (result ==  MWWorld::SpellCastState::Success && !godmode)
+            if (result == MWWorld::SpellCastState::Success && !godmode)
             {
                 // Reduce mana
                 magicka.setCurrent(magicka.getCurrent() - spellCost);
                 stats.setMagicka(magicka);
 
                 // Reduce fatigue (note that in the vanilla game, both GMSTs are 0, and there's no fatigue loss)
-                static const float fFatigueSpellBase = mStore.get<ESM::GameSetting>().find("fFatigueSpellBase")->mValue.getFloat();
-                static const float fFatigueSpellMult = mStore.get<ESM::GameSetting>().find("fFatigueSpellMult")->mValue.getFloat();
+                static const float fFatigueSpellBase
+                    = mStore.get<ESM::GameSetting>().find("fFatigueSpellBase")->mValue.getFloat();
+                static const float fFatigueSpellMult
+                    = mStore.get<ESM::GameSetting>().find("fFatigueSpellMult")->mValue.getFloat();
                 MWMechanics::DynamicStat<float> fatigue = stats.getFatigue();
                 const float normalizedEncumbrance = actor.getClass().getNormalizedEncumbrance(actor);
 
@@ -3050,11 +3109,12 @@ namespace MWWorld
         return result;
     }
 
-    void World::castSpell(const Ptr &actor, bool manualSpell)
+    void World::castSpell(const Ptr& actor, bool manualSpell)
     {
         MWMechanics::CreatureStats& stats = actor.getClass().getCreatureStats(actor);
 
-        // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit result.
+        // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit
+        // result.
         std::vector<MWWorld::Ptr> targetActors;
         if (!actor.isEmpty() && actor != MWMechanics::getPlayer() && !manualSpell)
             stats.getAiSequence().getCombatTargets(targetActors);
@@ -3092,18 +3152,19 @@ namespace MWWorld
             else
             {
                 // For actor targets, we want to use hit contact with bounding boxes.
-                // This is to give a slight tolerance for errors, especially with creatures like the Skeleton that would be very hard to aim at otherwise.
-                // For object targets, we want the detailed shapes (rendering raycast).
-                // If we used the bounding boxes for static objects, then we would not be able to target e.g. objects lying on a shelf.
-                std::pair<MWWorld::Ptr,osg::Vec3f> result1 = getHitContact(actor, fCombatDistance, targetActors);
+                // This is to give a slight tolerance for errors, especially with creatures like the Skeleton that would
+                // be very hard to aim at otherwise. For object targets, we want the detailed shapes (rendering
+                // raycast). If we used the bounding boxes for static objects, then we would not be able to target e.g.
+                // objects lying on a shelf.
+                std::pair<MWWorld::Ptr, osg::Vec3f> result1 = getHitContact(actor, fCombatDistance, targetActors);
 
                 // Get the target to use for "on touch" effects, using the facing direction from Head node
                 osg::Vec3f origin = getActorHeadTransform(actor).getTrans();
 
-                osg::Quat orient = osg::Quat(actor.getRefData().getPosition().rot[0], osg::Vec3f(-1,0,0))
-                        * osg::Quat(actor.getRefData().getPosition().rot[2], osg::Vec3f(0,0,-1));
+                osg::Quat orient = osg::Quat(actor.getRefData().getPosition().rot[0], osg::Vec3f(-1, 0, 0))
+                    * osg::Quat(actor.getRefData().getPosition().rot[2], osg::Vec3f(0, 0, -1));
 
-                osg::Vec3f direction = orient * osg::Vec3f(0,1,0);
+                osg::Vec3f direction = orient * osg::Vec3f(0, 1, 0);
                 float distance = getMaxActivationDistance();
                 osg::Vec3f dest = origin + direction * distance;
 
@@ -3128,7 +3189,8 @@ namespace MWWorld
                 {
                     target = result2.mHitObject;
                     hitPosition = result2.mHitPointWorld;
-                    if (dist2 > getMaxActivationDistance() && !target.isEmpty() && !target.getClass().hasToolTip(target))
+                    if (dist2 > getMaxActivationDistance() && !target.isEmpty()
+                        && !target.getClass().hasToolTip(target))
                         target = nullptr;
                 }
             }
@@ -3152,9 +3214,9 @@ namespace MWWorld
                 const auto& itemPtr = *inv.getSelectedEnchantItem();
                 auto [slots, _] = itemPtr.getClass().getEquipmentSlots(itemPtr);
                 int slot = 0;
-                for(std::size_t i = 0; i < slots.size(); ++i)
+                for (std::size_t i = 0; i < slots.size(); ++i)
                 {
-                    if(inv.getSlot(slots[i]) == inv.getSelectedEnchantItem())
+                    if (inv.getSlot(slots[i]) == inv.getSelectedEnchantItem())
                     {
                         slot = slots[i];
                         break;
@@ -3165,14 +3227,15 @@ namespace MWWorld
         }
     }
 
-    void World::launchProjectile (MWWorld::Ptr& actor, MWWorld::Ptr& projectile,
-                                   const osg::Vec3f& worldPos, const osg::Quat& orient, MWWorld::Ptr& bow, float speed, float attackStrength)
+    void World::launchProjectile(MWWorld::Ptr& actor, MWWorld::Ptr& projectile, const osg::Vec3f& worldPos,
+        const osg::Quat& orient, MWWorld::Ptr& bow, float speed, float attackStrength)
     {
-        // An initial position of projectile can be outside shooter's collision box, so any object between shooter and launch position will be ignored.
-        // To avoid this issue, we should check for impact immediately before launch the projectile.
-        // So we cast a 1-yard-length ray from shooter to launch position and check if there are collisions in this area.
+        // An initial position of projectile can be outside shooter's collision box, so any object between shooter and
+        // launch position will be ignored. To avoid this issue, we should check for impact immediately before launch
+        // the projectile. So we cast a 1-yard-length ray from shooter to launch position and check if there are
+        // collisions in this area.
         // TODO: as a better solutuon we should handle projectiles during physics update, not during world update.
-        const osg::Vec3f sourcePos = worldPos + orient * osg::Vec3f(0,-1,0) * 64.f;
+        const osg::Vec3f sourcePos = worldPos + orient * osg::Vec3f(0, -1, 0) * 64.f;
 
         // Early out if the launch position is underwater
         bool underwater = isUnderwater(MWMechanics::getPlayer().getCell(), worldPos);
@@ -3183,20 +3246,23 @@ namespace MWWorld
             return;
         }
 
-        // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit result.
+        // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit
+        // result.
         std::vector<MWWorld::Ptr> targetActors;
         if (!actor.isEmpty() && actor.getClass().isActor() && actor != MWMechanics::getPlayer())
             actor.getClass().getCreatureStats(actor).getAiSequence().getCombatTargets(targetActors);
 
         // Check for impact, if yes, handle hit, if not, launch projectile
-        MWPhysics::RayCastingResult result = mPhysics->castRay(sourcePos, worldPos, actor, targetActors, 0xff, MWPhysics::CollisionType_Projectile);
+        MWPhysics::RayCastingResult result
+            = mPhysics->castRay(sourcePos, worldPos, actor, targetActors, 0xff, MWPhysics::CollisionType_Projectile);
         if (result.mHit)
             MWMechanics::projectileHit(actor, result.mHitObject, bow, projectile, result.mHitPos, attackStrength);
         else
             mProjectileManager->launchProjectile(actor, projectile, worldPos, orient, bow, speed, attackStrength);
     }
 
-    void World::launchMagicBolt (const std::string &spellId, const MWWorld::Ptr& caster, const osg::Vec3f& fallbackDirection, int slot)
+    void World::launchMagicBolt(
+        const std::string& spellId, const MWWorld::Ptr& caster, const osg::Vec3f& fallbackDirection, int slot)
     {
         mProjectileManager->launchMagicBolt(spellId, caster, fallbackDirection, slot);
     }
@@ -3208,18 +3274,18 @@ namespace MWWorld
 
     void World::applyLoopingParticles(const MWWorld::Ptr& ptr) const
     {
-        const MWWorld::Class &cls = ptr.getClass();
+        const MWWorld::Class& cls = ptr.getClass();
         if (cls.isActor())
         {
             std::set<int> playing;
-            for(const auto& params : cls.getCreatureStats(ptr).getActiveSpells())
+            for (const auto& params : cls.getCreatureStats(ptr).getActiveSpells())
             {
-                for(const auto& effect : params.getEffects())
+                for (const auto& effect : params.getEffects())
                 {
-                    if(playing.insert(effect.mEffectId).second)
+                    if (playing.insert(effect.mEffectId).second)
                     {
                         const auto magicEffect = getStore().get<ESM::MagicEffect>().find(effect.mEffectId);
-                        if(magicEffect->mData.mFlags & ESM::MagicEffect::ContinuousVfx)
+                        if (magicEffect->mData.mFlags & ESM::MagicEffect::ContinuousVfx)
                             MWMechanics::playEffects(ptr, *magicEffect, false);
                     }
                 }
@@ -3232,7 +3298,7 @@ namespace MWWorld
         return mContentFiles;
     }
 
-    void World::breakInvisibility(const Ptr &actor)
+    void World::breakInvisibility(const Ptr& actor)
     {
         actor.getClass().getCreatureStats(actor).getActiveSpells().purgeEffect(actor, ESM::MagicEffect::Invisibility);
 
@@ -3254,9 +3320,7 @@ namespace MWWorld
         else
         {
             uint32_t ambient = cell->getCell()->mAmbi.mAmbient;
-            int ambientTotal = (ambient & 0xff)
-                    + ((ambient>>8) & 0xff)
-                    + ((ambient>>16) & 0xff);
+            int ambientTotal = (ambient & 0xff) + ((ambient >> 8) & 0xff) + ((ambient >> 16) & 0xff);
             return !(cell->getCell()->mData.mFlags & ESM::Cell::NoSleep) && ambientTotal <= 201;
         }
     }
@@ -3278,23 +3342,26 @@ namespace MWWorld
 
         // Search for a 'nearest' exterior, counting each cell between the starting
         // cell and the exterior as a distance of 1.  Will fail for isolated interiors.
-        std::set< std::string >checkedCells;
-        std::set< std::string >currentCells;
-        std::set< std::string >nextCells;
-        nextCells.insert( cell->getCell()->mName );
+        std::set<std::string> checkedCells;
+        std::set<std::string> currentCells;
+        std::set<std::string> nextCells;
+        nextCells.insert(cell->getCell()->mName);
 
-        while ( !nextCells.empty() ) {
+        while (!nextCells.empty())
+        {
             currentCells = nextCells;
             nextCells.clear();
-            for (const std::string &currentCell : currentCells)
+            for (const std::string& currentCell : currentCells)
             {
-                MWWorld::CellStore *next = getInterior(currentCell);
-                if ( !next ) continue;
+                MWWorld::CellStore* next = getInterior(currentCell);
+                if (!next)
+                    continue;
 
                 // Check if any door in the cell leads to an exterior directly
                 for (const MWWorld::LiveCellRef<ESM::Door>& ref : next->getReadOnlyDoors().mList)
                 {
-                    if (!ref.mRef.getTeleport()) continue;
+                    if (!ref.mRef.getTeleport())
+                        continue;
 
                     if (ref.mRef.getDestCell().empty())
                     {
@@ -3305,7 +3372,7 @@ namespace MWWorld
                     else
                     {
                         const std::string& dest = ref.mRef.getDestCell();
-                        if ( !checkedCells.count(dest) && !currentCells.count(dest) )
+                        if (!checkedCells.count(dest) && !currentCells.count(dest))
                             nextCells.insert(dest);
                     }
                 }
@@ -3320,29 +3387,33 @@ namespace MWWorld
 
     MWWorld::ConstPtr World::getClosestMarker(const MWWorld::ConstPtr& ptr, std::string_view id)
     {
-        if ( ptr.getCell()->isExterior() ) {
+        if (ptr.getCell()->isExterior())
+        {
             return getClosestMarkerFromExteriorPosition(mPlayer->getLastKnownExteriorPosition(), id);
         }
 
         // Search for a 'nearest' marker, counting each cell between the starting
         // cell and the exterior as a distance of 1.  If an exterior is found, jump
         // to the nearest exterior marker, without further interior searching.
-        std::set< std::string >checkedCells;
-        std::set< std::string >currentCells;
-        std::set< std::string >nextCells;
+        std::set<std::string> checkedCells;
+        std::set<std::string> currentCells;
+        std::set<std::string> nextCells;
         MWWorld::ConstPtr closestMarker;
 
-        nextCells.insert( ptr.getCell()->getCell()->mName );
-        while ( !nextCells.empty() ) {
+        nextCells.insert(ptr.getCell()->getCell()->mName);
+        while (!nextCells.empty())
+        {
             currentCells = nextCells;
             nextCells.clear();
-            for (const std::string &cell : currentCells) {
-                MWWorld::CellStore *next = getInterior(cell);
+            for (const std::string& cell : currentCells)
+            {
+                MWWorld::CellStore* next = getInterior(cell);
                 checkedCells.insert(cell);
-                if ( !next ) continue;
+                if (!next)
+                    continue;
 
-                closestMarker = next->searchConst( id );
-                if ( !closestMarker.isEmpty() )
+                closestMarker = next->searchConst(id);
+                if (!closestMarker.isEmpty())
                 {
                     return closestMarker;
                 }
@@ -3350,7 +3421,8 @@ namespace MWWorld
                 // Check if any door in the cell leads to an exterior directly
                 for (const MWWorld::LiveCellRef<ESM::Door>& ref : next->getReadOnlyDoors().mList)
                 {
-                    if (!ref.mRef.getTeleport()) continue;
+                    if (!ref.mRef.getTeleport())
+                        continue;
 
                     if (ref.mRef.getDestCell().empty())
                     {
@@ -3360,7 +3432,7 @@ namespace MWWorld
                     else
                     {
                         const std::string& dest = ref.mRef.getDestCell();
-                        if ( !checkedCells.count(dest) && !currentCells.count(dest) )
+                        if (!checkedCells.count(dest) && !currentCells.count(dest))
                             nextCells.insert(dest);
                     }
                 }
@@ -3369,7 +3441,8 @@ namespace MWWorld
         return MWWorld::Ptr();
     }
 
-    MWWorld::ConstPtr World::getClosestMarkerFromExteriorPosition(const osg::Vec3f& worldPos, std::string_view id) {
+    MWWorld::ConstPtr World::getClosestMarkerFromExteriorPosition(const osg::Vec3f& worldPos, std::string_view id)
+    {
         MWWorld::ConstPtr closestMarker;
         float closestDistance = std::numeric_limits<float>::max();
 
@@ -3401,7 +3474,7 @@ namespace MWWorld
 
         if (activeOnly)
         {
-            for (auto &cell : mWorldScene->getActiveCells())
+            for (auto& cell : mWorldScene->getActiveCells())
             {
                 cell->recharge(duration);
             }
@@ -3412,16 +3485,16 @@ namespace MWWorld
 
     void World::teleportToClosestMarker(const MWWorld::Ptr& ptr, std::string_view id)
     {
-        MWWorld::ConstPtr closestMarker = getClosestMarker( ptr, id );
+        MWWorld::ConstPtr closestMarker = getClosestMarker(ptr, id);
 
-        if ( closestMarker.isEmpty() )
+        if (closestMarker.isEmpty())
         {
             Log(Debug::Warning) << "Failed to teleport: no closest marker found";
             return;
         }
 
         std::string_view cellName;
-        if ( !closestMarker.mCell->isExterior() )
+        if (!closestMarker.mCell->isExterior())
             cellName = closestMarker.mCell->getCell()->mName;
 
         MWWorld::ActionTeleport action(cellName, closestMarker.getRefData().getPosition(), false);
@@ -3451,29 +3524,31 @@ namespace MWWorld
         World::DetectionType mType;
         const MWWorld::ESMStore& mStore;
 
-        bool operator() (const MWWorld::Ptr& ptr)
+        bool operator()(const MWWorld::Ptr& ptr)
         {
-            if ((ptr.getRefData().getPosition().asVec3() - mDetector.getRefData().getPosition().asVec3()).length2() >= mSquaredDist)
+            if ((ptr.getRefData().getPosition().asVec3() - mDetector.getRefData().getPosition().asVec3()).length2()
+                >= mSquaredDist)
                 return true;
 
             if (!ptr.getRefData().isEnabled() || ptr.getRefData().isDeleted())
                 return true;
 
-            // Consider references inside containers as well (except if we are looking for a Creature, they cannot be in containers)
+            // Consider references inside containers as well (except if we are looking for a Creature, they cannot be in
+            // containers)
             bool isContainer = ptr.getClass().getType() == ESM::Container::sRecordId;
             if (mType != World::Detect_Creature && (ptr.getClass().isActor() || isContainer))
             {
                 // but ignore containers without resolved content
                 if (isContainer && ptr.getRefData().getCustomData() == nullptr)
                 {
-                    for(const auto& containerItem :  ptr.get<ESM::Container>()->mBase->mInventory.mList)
+                    for (const auto& containerItem : ptr.get<ESM::Container>()->mBase->mInventory.mList)
                     {
-                        if(containerItem.mCount)
+                        if (containerItem.mCount)
                         {
                             try
                             {
                                 ManualRef ref(mStore, containerItem.mItem, containerItem.mCount);
-                                if(needToAdd(ref.getPtr(), mDetector))
+                                if (needToAdd(ref.getPtr(), mDetector))
                                 {
                                     mOut.push_back(ptr);
                                     return true;
@@ -3507,7 +3582,7 @@ namespace MWWorld
             return true;
         }
 
-        bool needToAdd (const MWWorld::Ptr& ptr, const MWWorld::Ptr& detector)
+        bool needToAdd(const MWWorld::Ptr& ptr, const MWWorld::Ptr& detector)
         {
             if (mType == World::Detect_Creature)
             {
@@ -3531,10 +3606,10 @@ namespace MWWorld
         }
     };
 
-    void World::listDetectedReferences(const Ptr &ptr, std::vector<Ptr> &out, DetectionType type)
+    void World::listDetectedReferences(const Ptr& ptr, std::vector<Ptr>& out, DetectionType type)
     {
         const MWMechanics::MagicEffects& effects = ptr.getClass().getCreatureStats(ptr).getMagicEffects();
-        float dist=0;
+        float dist = 0;
         if (type == World::Detect_Creature)
             dist = effects.get(ESM::MagicEffect::DetectAnimal).getMagnitude();
         else if (type == World::Detect_Key)
@@ -3547,7 +3622,7 @@ namespace MWWorld
 
         dist = feetToGameUnits(dist);
 
-        AddDetectedReferenceVisitor visitor {out, ptr, dist * dist, type, mStore};
+        AddDetectedReferenceVisitor visitor{ out, ptr, dist * dist, type, mStore };
 
         for (CellStore* cellStore : mWorldScene->getActiveCells())
         {
@@ -3564,9 +3639,12 @@ namespace MWWorld
 
     float World::getActivationDistancePlusTelekinesis()
     {
-        float telekinesisRangeBonus =
-                    mPlayer->getPlayer().getClass().getCreatureStats(mPlayer->getPlayer()).getMagicEffects()
-                    .get(ESM::MagicEffect::Telekinesis).getMagnitude();
+        float telekinesisRangeBonus = mPlayer->getPlayer()
+                                          .getClass()
+                                          .getCreatureStats(mPlayer->getPlayer())
+                                          .getMagicEffects()
+                                          .get(ESM::MagicEffect::Telekinesis)
+                                          .getMagnitude();
         telekinesisRangeBonus = feetToGameUnits(telekinesisRangeBonus);
 
         float activationDistance = getMaxActivationDistance() + telekinesisRangeBonus;
@@ -3590,8 +3668,10 @@ namespace MWWorld
         int bounty = player.getClass().getNpcStats(player).getBounty();
         int playerGold = player.getClass().getContainerStore(player).count(ContainerStore::sGoldId);
 
-        static float fCrimeGoldDiscountMult = mStore.get<ESM::GameSetting>().find("fCrimeGoldDiscountMult")->mValue.getFloat();
-        static float fCrimeGoldTurnInMult = mStore.get<ESM::GameSetting>().find("fCrimeGoldTurnInMult")->mValue.getFloat();
+        static float fCrimeGoldDiscountMult
+            = mStore.get<ESM::GameSetting>().find("fCrimeGoldDiscountMult")->mValue.getFloat();
+        static float fCrimeGoldTurnInMult
+            = mStore.get<ESM::GameSetting>().find("fCrimeGoldTurnInMult")->mValue.getFloat();
 
         int discount = static_cast<int>(bounty * fCrimeGoldDiscountMult);
         int turnIn = static_cast<int>(bounty * fCrimeGoldTurnInMult);
@@ -3611,34 +3691,34 @@ namespace MWWorld
         mGlobalVariables["pchasturnin"].setInteger((turnIn <= playerGold) ? 1 : 0);
     }
 
-    void World::confiscateStolenItems(const Ptr &ptr)
+    void World::confiscateStolenItems(const Ptr& ptr)
     {
-        MWWorld::ConstPtr prisonMarker = getClosestMarker( ptr, "prisonmarker" );
-        if ( prisonMarker.isEmpty() )
+        MWWorld::ConstPtr prisonMarker = getClosestMarker(ptr, "prisonmarker");
+        if (prisonMarker.isEmpty())
         {
             Log(Debug::Warning) << "Failed to confiscate items: no closest prison marker found.";
             return;
         }
         const std::string& prisonName = prisonMarker.getCellRef().getDestCell();
-        if ( prisonName.empty() )
+        if (prisonName.empty())
         {
             Log(Debug::Warning) << "Failed to confiscate items: prison marker not linked to prison interior";
             return;
         }
-        MWWorld::CellStore *prison = getInterior( prisonName );
-        if ( !prison )
+        MWWorld::CellStore* prison = getInterior(prisonName);
+        if (!prison)
         {
             Log(Debug::Warning) << "Failed to confiscate items: failed to load cell " << prisonName;
             return;
         }
 
-        MWWorld::Ptr closestChest = prison->search( "stolen_goods" );
-        if (!closestChest.isEmpty()) //Found a close chest
+        MWWorld::Ptr closestChest = prison->search("stolen_goods");
+        if (!closestChest.isEmpty()) // Found a close chest
         {
             MWBase::Environment::get().getMechanicsManager()->confiscateStolenItems(ptr, closestChest);
         }
         else
-           Log(Debug::Warning) << "Failed to confiscate items: no stolen_goods container found";
+            Log(Debug::Warning) << "Failed to confiscate items: no stolen_goods container found";
     }
 
     void World::goToJail()
@@ -3646,7 +3726,8 @@ namespace MWWorld
         const MWWorld::Ptr player = getPlayerPtr();
         if (!mGoToJail)
         {
-            // Reset bounty and forget the crime now, but don't change cell yet (the player should be able to read the dialog text first)
+            // Reset bounty and forget the crime now, but don't change cell yet (the player should be able to read the
+            // dialog text first)
             mGoToJail = true;
             mPlayerInJail = true;
 
@@ -3727,7 +3808,7 @@ namespace MWWorld
         static int iNumberCreatures = mStore.get<ESM::GameSetting>().find("iNumberCreatures")->mValue.getInteger();
         int numCreatures = 1 + Misc::Rng::rollDice(iNumberCreatures, mPrng); // [1, iNumberCreatures]
 
-        for (int i=0; i<numCreatures; ++i)
+        for (int i = 0; i < numCreatures; ++i)
         {
             std::string_view selectedCreature = MWMechanics::getLevelledItem(list, true, mPrng);
             if (selectedCreature.empty())
@@ -3739,28 +3820,30 @@ namespace MWWorld
         }
     }
 
-    void World::spawnBloodEffect(const Ptr &ptr, const osg::Vec3f &worldPosition)
+    void World::spawnBloodEffect(const Ptr& ptr, const osg::Vec3f& worldPosition)
     {
         if (ptr == getPlayerPtr() && Settings::Manager::getBool("hit fader", "GUI"))
             return;
 
-        std::string_view texture = Fallback::Map::getString("Blood_Texture_" + std::to_string(ptr.getClass().getBloodTexture(ptr)));
+        std::string_view texture
+            = Fallback::Map::getString("Blood_Texture_" + std::to_string(ptr.getClass().getBloodTexture(ptr)));
         if (texture.empty())
             texture = Fallback::Map::getString("Blood_Texture_0");
 
         std::string model = Misc::ResourceHelpers::correctMeshPath(
-            std::string{Fallback::Map::getString("Blood_Model_" + std::to_string(Misc::Rng::rollDice(3)))}, // [0, 2]
+            std::string{ Fallback::Map::getString("Blood_Model_" + std::to_string(Misc::Rng::rollDice(3))) }, // [0, 2]
             mResourceSystem->getVFS());
 
         mRendering->spawnEffect(model, texture, worldPosition, 1.0f, false);
     }
 
-    void World::spawnEffect(const std::string &model, const std::string &textureOverride, const osg::Vec3f &worldPos, float scale, bool isMagicVFX)
+    void World::spawnEffect(const std::string& model, const std::string& textureOverride, const osg::Vec3f& worldPos,
+        float scale, bool isMagicVFX)
     {
         mRendering->spawnEffect(model, textureOverride, worldPos, scale, isMagicVFX);
     }
 
-    void World::activate(const Ptr &object, const Ptr &actor)
+    void World::activate(const Ptr& object, const Ptr& actor)
     {
         breakInvisibility(actor);
 
@@ -3768,7 +3851,7 @@ namespace MWWorld
         {
             MWBase::Environment::get().getLuaManager()->objectActivated(object, actor);
             std::unique_ptr<MWWorld::Action> action = object.getClass().activate(object, actor);
-            action->execute (actor);
+            action->execute(actor);
         }
     }
 
@@ -3776,7 +3859,7 @@ namespace MWWorld
     {
         World& mWorld;
 
-        bool operator() (const Ptr& ptr)
+        bool operator()(const Ptr& ptr)
         {
             if (ptr.getClass().isActor() && ptr.getCellRef().hasContentFile())
             {
@@ -3796,12 +3879,12 @@ namespace MWWorld
     {
         for (CellStore* cellstore : mWorldScene->getActiveCells())
         {
-            ResetActorsVisitor visitor {*this};
+            ResetActorsVisitor visitor{ *this };
             cellstore->forEach(visitor);
         }
     }
 
-    bool World::isWalkingOnWater(const ConstPtr &actor) const
+    bool World::isWalkingOnWater(const ConstPtr& actor) const
     {
         const MWPhysics::Actor* physicActor = mPhysics->getActor(actor);
         if (physicActor && physicActor->isWalkingOnWater())
@@ -3809,7 +3892,7 @@ namespace MWWorld
         return false;
     }
 
-    osg::Vec3f World::aimToTarget(const ConstPtr &actor, const ConstPtr &target, bool isRangedCombat)
+    osg::Vec3f World::aimToTarget(const ConstPtr& actor, const ConstPtr& target, bool isRangedCombat)
     {
         osg::Vec3f weaponPos = actor.getRefData().getPosition().asVec3();
         float heightRatio = isRangedCombat ? 2.f * Constants::TorsoHeight : 1.f;
@@ -3818,7 +3901,7 @@ namespace MWWorld
         return (targetPos - weaponPos);
     }
 
-    float World::getHitDistance(const ConstPtr &actor, const ConstPtr &target)
+    float World::getHitDistance(const ConstPtr& actor, const ConstPtr& target)
     {
         osg::Vec3f weaponPos = actor.getRefData().getPosition().asVec3();
         osg::Vec3f halfExtents = mPhysics->getHalfExtents(actor);
@@ -3838,16 +3921,16 @@ namespace MWWorld
             if (!model.empty())
                 scene->preload(model, ref.getPtr().getClass().useAnim());
         }
-        catch(std::exception&)
+        catch (std::exception&)
         {
         }
     }
 
-    void World::preloadEffects(const ESM::EffectList *effectList)
+    void World::preloadEffects(const ESM::EffectList* effectList)
     {
         for (const ESM::ENAMstruct& effectInfo : effectList->mList)
         {
-            const ESM::MagicEffect *effect = mStore.get<ESM::MagicEffect>().find(effectInfo.mEffectID);
+            const ESM::MagicEffect* effect = mStore.get<ESM::MagicEffect>().find(effectInfo.mEffectID);
 
             if (MWMechanics::isSummoningEffect(effectInfo.mEffectID))
             {
@@ -3890,12 +3973,14 @@ namespace MWWorld
     {
         const MWPhysics::Actor* physicsActor = mPhysics->getActor(actor);
         if (physicsActor == nullptr || !actor.isInCell() || actor.getCell()->isExterior())
-            return DetourNavigator::AgentBounds {mDefaultActorCollisionShapeType, mDefaultHalfExtents};
+            return DetourNavigator::AgentBounds{ mDefaultActorCollisionShapeType, mDefaultHalfExtents };
         else
-            return DetourNavigator::AgentBounds {physicsActor->getCollisionShapeType(), physicsActor->getHalfExtents()};
+            return DetourNavigator::AgentBounds{ physicsActor->getCollisionShapeType(),
+                physicsActor->getHalfExtents() };
     }
 
-    bool World::hasCollisionWithDoor(const MWWorld::ConstPtr& door, const osg::Vec3f& position, const osg::Vec3f& destination) const
+    bool World::hasCollisionWithDoor(
+        const MWWorld::ConstPtr& door, const osg::Vec3f& position, const osg::Vec3f& destination) const
     {
         const auto object = mPhysics->getObject(door);
 
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index b62a7581c2..a3a17128ae 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -3,22 +3,22 @@
 
 #include <osg/ref_ptr>
 
-#include <components/settings/settings.hpp>
-#include <components/misc/rng.hpp>
-#include <components/esm3/readerscache.hpp>
 #include <components/detournavigator/collisionshapetype.hpp>
+#include <components/esm3/readerscache.hpp>
+#include <components/misc/rng.hpp>
+#include <components/settings/settings.hpp>
 
 #include "../mwbase/world.hpp"
 
-#include "ptr.hpp"
-#include "scene.hpp"
-#include "esmstore.hpp"
 #include "cells.hpp"
-#include "localscripts.hpp"
-#include "timestamp.hpp"
-#include "globals.hpp"
 #include "contentloader.hpp"
+#include "esmstore.hpp"
+#include "globals.hpp"
 #include "groundcoverstore.hpp"
+#include "localscripts.hpp"
+#include "ptr.hpp"
+#include "scene.hpp"
+#include "timestamp.hpp"
 
 namespace osg
 {
@@ -79,692 +79,709 @@ namespace MWWorld
 
     /// \brief The game world and its visual representation
 
-    class World final: public MWBase::World
+    class World final : public MWBase::World
     {
-        private:
-            Resource::ResourceSystem* mResourceSystem;
+    private:
+        Resource::ResourceSystem* mResourceSystem;
 
-            ESM::ReadersCache mReaders;
-            MWWorld::ESMStore mStore;
-            GroundcoverStore mGroundcoverStore;
-            LocalScripts mLocalScripts;
-            MWWorld::Globals mGlobalVariables;
-            Misc::Rng::Generator mPrng;
-            Cells mCells;
+        ESM::ReadersCache mReaders;
+        MWWorld::ESMStore mStore;
+        GroundcoverStore mGroundcoverStore;
+        LocalScripts mLocalScripts;
+        MWWorld::Globals mGlobalVariables;
+        Misc::Rng::Generator mPrng;
+        Cells mCells;
 
-            std::string mCurrentWorldSpace;
+        std::string mCurrentWorldSpace;
 
-            std::unique_ptr<MWWorld::Player> mPlayer;
-            std::unique_ptr<MWPhysics::PhysicsSystem> mPhysics;
-            std::unique_ptr<DetourNavigator::Navigator> mNavigator;
-            std::unique_ptr<MWRender::RenderingManager> mRendering;
-            std::unique_ptr<MWWorld::Scene> mWorldScene;
-            std::unique_ptr<MWWorld::WeatherManager> mWeatherManager;
-            std::unique_ptr<MWWorld::DateTimeManager> mCurrentDate;
-            std::unique_ptr<ProjectileManager> mProjectileManager;
+        std::unique_ptr<MWWorld::Player> mPlayer;
+        std::unique_ptr<MWPhysics::PhysicsSystem> mPhysics;
+        std::unique_ptr<DetourNavigator::Navigator> mNavigator;
+        std::unique_ptr<MWRender::RenderingManager> mRendering;
+        std::unique_ptr<MWWorld::Scene> mWorldScene;
+        std::unique_ptr<MWWorld::WeatherManager> mWeatherManager;
+        std::unique_ptr<MWWorld::DateTimeManager> mCurrentDate;
+        std::unique_ptr<ProjectileManager> mProjectileManager;
 
-            bool mSky;
-            bool mGodMode;
-            bool mScriptsEnabled;
-            bool mDiscardMovements;
-            std::vector<std::string> mContentFiles;
+        bool mSky;
+        bool mGodMode;
+        bool mScriptsEnabled;
+        bool mDiscardMovements;
+        std::vector<std::string> mContentFiles;
 
-            std::filesystem::path mUserDataPath;
+        std::filesystem::path mUserDataPath;
 
-            osg::Vec3f mDefaultHalfExtents;
-            DetourNavigator::CollisionShapeType mDefaultActorCollisionShapeType;
+        osg::Vec3f mDefaultHalfExtents;
+        DetourNavigator::CollisionShapeType mDefaultActorCollisionShapeType;
 
-            int mActivationDistanceOverride;
+        int mActivationDistanceOverride;
 
-            std::string mStartCell;
+        std::string mStartCell;
 
-            float mSwimHeightScale;
+        float mSwimHeightScale;
 
-            float mDistanceToFacedObject;
+        float mDistanceToFacedObject;
 
-            bool mTeleportEnabled;
-            bool mLevitationEnabled;
-            bool mGoToJail;
-            int mDaysInPrison;
-            bool mPlayerTraveling;
-            bool mPlayerInJail;
+        bool mTeleportEnabled;
+        bool mLevitationEnabled;
+        bool mGoToJail;
+        int mDaysInPrison;
+        bool mPlayerTraveling;
+        bool mPlayerInJail;
 
-            float mSpellPreloadTimer;
+        float mSpellPreloadTimer;
 
-            std::map<MWWorld::Ptr, MWWorld::DoorState> mDoorStates;
-            ///< only holds doors that are currently moving. 1 = opening, 2 = closing
+        std::map<MWWorld::Ptr, MWWorld::DoorState> mDoorStates;
+        ///< only holds doors that are currently moving. 1 = opening, 2 = closing
 
-            uint32_t mRandomSeed{};
+        uint32_t mRandomSeed{};
 
-            float mSimulationTimeScale = 1.0;
+        float mSimulationTimeScale = 1.0;
 
-            std::vector<int> mESMVersions;  //the versions of esm files
+        std::vector<int> mESMVersions; // the versions of esm files
 
-            // not implemented
-            World (const World&);
-            World& operator= (const World&);
+        // not implemented
+        World(const World&);
+        World& operator=(const World&);
 
-            void updateWeather(float duration, bool paused = false);
+        void updateWeather(float duration, bool paused = false);
 
-            Ptr copyObjectToCell(const ConstPtr &ptr, CellStore* cell, ESM::Position pos, int count, bool adjustPos);
+        Ptr copyObjectToCell(const ConstPtr& ptr, CellStore* cell, ESM::Position pos, int count, bool adjustPos);
 
-            void updateSoundListener();
+        void updateSoundListener();
 
-            void preloadSpells();
+        void preloadSpells();
 
-            MWWorld::Ptr getFacedObject(float maxDistance, bool ignorePlayer=true);
+        MWWorld::Ptr getFacedObject(float maxDistance, bool ignorePlayer = true);
 
-            void PCDropped (const Ptr& item);
+        void PCDropped(const Ptr& item);
 
-            bool rotateDoor(const Ptr door, DoorState state, float duration);
+        bool rotateDoor(const Ptr door, DoorState state, float duration);
 
-            void processDoors(float duration);
-            ///< Run physics simulation and modify \a world accordingly.
+        void processDoors(float duration);
+        ///< Run physics simulation and modify \a world accordingly.
 
-            void doPhysics(float duration, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
-            ///< Run physics simulation and modify \a world accordingly.
+        void doPhysics(float duration, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
+        ///< Run physics simulation and modify \a world accordingly.
 
-            void updateNavigator();
+        void updateNavigator();
 
-            void updateNavigatorObject(const MWPhysics::Object& object,
-                const DetourNavigator::UpdateGuard* navigatorUpdateGuard = nullptr);
+        void updateNavigatorObject(
+            const MWPhysics::Object& object, const DetourNavigator::UpdateGuard* navigatorUpdateGuard = nullptr);
 
-            void ensureNeededRecords();
+        void ensureNeededRecords();
 
-            void fillGlobalVariables();
+        void fillGlobalVariables();
 
-            void updateSkyDate();
+        void updateSkyDate();
 
-            void loadContentFiles(const Files::Collections& fileCollections, const std::vector<std::string>& content,
-                ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener);
+        void loadContentFiles(const Files::Collections& fileCollections, const std::vector<std::string>& content,
+            ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener);
 
-            void loadGroundcoverFiles(const Files::Collections& fileCollections,
-                const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder,
-                Loading::Listener* listener);
+        void loadGroundcoverFiles(const Files::Collections& fileCollections,
+            const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder,
+            Loading::Listener* listener);
 
-            float feetToGameUnits(float feet);
-            float getActivationDistancePlusTelekinesis();
+        float feetToGameUnits(float feet);
+        float getActivationDistancePlusTelekinesis();
 
-            MWWorld::ConstPtr getClosestMarker(const MWWorld::ConstPtr& ptr, std::string_view id);
-            MWWorld::ConstPtr getClosestMarkerFromExteriorPosition(const osg::Vec3f& worldPos, std::string_view id);
+        MWWorld::ConstPtr getClosestMarker(const MWWorld::ConstPtr& ptr, std::string_view id);
+        MWWorld::ConstPtr getClosestMarkerFromExteriorPosition(const osg::Vec3f& worldPos, std::string_view id);
 
-        public:
-            // FIXME
-            void addContainerScripts(const Ptr& reference, CellStore* cell) override;
-            void removeContainerScripts(const Ptr& reference) override;
+    public:
+        // FIXME
+        void addContainerScripts(const Ptr& reference, CellStore* cell) override;
+        void removeContainerScripts(const Ptr& reference) override;
 
-            World (
-                osgViewer::Viewer* viewer,
-                osg::ref_ptr<osg::Group> rootNode,
-                Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
-                SceneUtil::UnrefQueue& unrefQueue,
-                const Files::Collections& fileCollections,
-                const std::vector<std::string>& contentFiles,
-                const std::vector<std::string>& groundcoverFiles,
-                ToUTF8::Utf8Encoder* encoder, int activationDistanceOverride,
-                const std::string& startCell, const std::string& startupScript,
-                const std::filesystem::path& resourcePath, const std::filesystem::path& userDataPath);
+        World(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode, Resource::ResourceSystem* resourceSystem,
+            SceneUtil::WorkQueue* workQueue, SceneUtil::UnrefQueue& unrefQueue,
+            const Files::Collections& fileCollections, const std::vector<std::string>& contentFiles,
+            const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder,
+            int activationDistanceOverride, const std::string& startCell, const std::string& startupScript,
+            const std::filesystem::path& resourcePath, const std::filesystem::path& userDataPath);
 
-            virtual ~World();
+        virtual ~World();
 
-            void setRandomSeed(uint32_t seed) override;
+        void setRandomSeed(uint32_t seed) override;
 
-            void startNewGame (bool bypass) override;
-            ///< \param bypass Bypass regular game start.
+        void startNewGame(bool bypass) override;
+        ///< \param bypass Bypass regular game start.
 
-            void clear() override;
+        void clear() override;
 
-            int countSavedGameRecords() const override;
-            int countSavedGameCells() const override;
+        int countSavedGameRecords() const override;
+        int countSavedGameCells() const override;
 
-            void write (ESM::ESMWriter& writer, Loading::Listener& progress) const override;
+        void write(ESM::ESMWriter& writer, Loading::Listener& progress) const override;
 
-            void readRecord (ESM::ESMReader& reader, uint32_t type,
-                const std::map<int, int>& contentFileMap) override;
+        void readRecord(ESM::ESMReader& reader, uint32_t type, const std::map<int, int>& contentFileMap) override;
 
-            CellStore *getExterior (int x, int y) override;
+        CellStore* getExterior(int x, int y) override;
 
-            CellStore* getInterior(std::string_view name) override;
+        CellStore* getInterior(std::string_view name) override;
 
-            CellStore *getCell (const ESM::CellId& id) override;
+        CellStore* getCell(const ESM::CellId& id) override;
 
-            bool isCellActive(CellStore* cell) const override;
+        bool isCellActive(CellStore* cell) const override;
 
-            void testExteriorCells() override;
-            void testInteriorCells() override;
+        void testExteriorCells() override;
+        void testInteriorCells() override;
 
-            //switch to POV before showing player's death animation
-            void useDeathCamera() override;
+        // switch to POV before showing player's death animation
+        void useDeathCamera() override;
 
-            void setWaterHeight(const float height) override;
+        void setWaterHeight(const float height) override;
 
-            void rotateWorldObject (const MWWorld::Ptr& ptr, const osg::Quat& rotate) override;
+        void rotateWorldObject(const MWWorld::Ptr& ptr, const osg::Quat& rotate) override;
 
-            bool toggleWater() override;
-            bool toggleWorld() override;
-            bool toggleBorders() override;
+        bool toggleWater() override;
+        bool toggleWorld() override;
+        bool toggleBorders() override;
 
-            void adjustSky();
+        void adjustSky();
 
-            Player& getPlayer() override;
-            MWWorld::Ptr getPlayerPtr() override;
-            MWWorld::ConstPtr getPlayerConstPtr() const override;
+        Player& getPlayer() override;
+        MWWorld::Ptr getPlayerPtr() override;
+        MWWorld::ConstPtr getPlayerConstPtr() const override;
 
-            const MWWorld::ESMStore& getStore() const override;
+        const MWWorld::ESMStore& getStore() const override;
 
-            const std::vector<int>& getESMVersions() const override;
+        const std::vector<int>& getESMVersions() const override;
 
-            LocalScripts& getLocalScripts() override;
+        LocalScripts& getLocalScripts() override;
 
-            bool hasCellChanged() const override;
-            ///< Has the set of active cells changed, since the last frame?
+        bool hasCellChanged() const override;
+        ///< Has the set of active cells changed, since the last frame?
 
-            bool isCellExterior() const override;
+        bool isCellExterior() const override;
 
-            bool isCellQuasiExterior() const override;
+        bool isCellQuasiExterior() const override;
 
-            osg::Vec2f getNorthVector (const CellStore* cell) override;
-            ///< get north vector for given interior cell
+        osg::Vec2f getNorthVector(const CellStore* cell) override;
+        ///< get north vector for given interior cell
 
-            void getDoorMarkers (MWWorld::CellStore* cell, std::vector<DoorMarker>& out) override;
-            ///< get a list of teleport door markers for a given cell, to be displayed on the local map
+        void getDoorMarkers(MWWorld::CellStore* cell, std::vector<DoorMarker>& out) override;
+        ///< get a list of teleport door markers for a given cell, to be displayed on the local map
 
-            void setGlobalInt(std::string_view name, int value) override;
-            ///< Set value independently from real type.
+        void setGlobalInt(std::string_view name, int value) override;
+        ///< Set value independently from real type.
 
-            void setGlobalFloat(std::string_view name, float value) override;
-            ///< Set value independently from real type.
+        void setGlobalFloat(std::string_view name, float value) override;
+        ///< Set value independently from real type.
 
-            int getGlobalInt(std::string_view name) const override;
-            ///< Get value independently from real type.
+        int getGlobalInt(std::string_view name) const override;
+        ///< Get value independently from real type.
 
-            float getGlobalFloat(std::string_view name) const override;
-            ///< Get value independently from real type.
+        float getGlobalFloat(std::string_view name) const override;
+        ///< Get value independently from real type.
 
-            char getGlobalVariableType(std::string_view name) const override;
-            ///< Return ' ', if there is no global variable with this name.
+        char getGlobalVariableType(std::string_view name) const override;
+        ///< Return ' ', if there is no global variable with this name.
 
-            std::string_view getCellName(const MWWorld::CellStore* cell = nullptr) const override;
-            ///< Return name of the cell.
-            ///
-            /// \note If cell==0, the cell the player is currently in will be used instead to
-            /// generate a name.
-            std::string_view getCellName(const ESM::Cell* cell) const override;
+        std::string_view getCellName(const MWWorld::CellStore* cell = nullptr) const override;
+        ///< Return name of the cell.
+        ///
+        /// \note If cell==0, the cell the player is currently in will be used instead to
+        /// generate a name.
+        std::string_view getCellName(const ESM::Cell* cell) const override;
 
-            void removeRefScript (MWWorld::RefData *ref) override;
-            //< Remove the script attached to ref from mLocalScripts
+        void removeRefScript(MWWorld::RefData* ref) override;
+        //< Remove the script attached to ref from mLocalScripts
 
-            Ptr getPtr (std::string_view name, bool activeOnly) override;
-            ///< Return a pointer to a liveCellRef with the given name.
-            /// \param activeOnly do non search inactive cells.
+        Ptr getPtr(std::string_view name, bool activeOnly) override;
+        ///< Return a pointer to a liveCellRef with the given name.
+        /// \param activeOnly do non search inactive cells.
 
-            Ptr searchPtr (std::string_view name, bool activeOnly, bool searchInContainers = false) override;
-            ///< Return a pointer to a liveCellRef with the given name.
-            /// \param activeOnly do not search inactive cells.
+        Ptr searchPtr(std::string_view name, bool activeOnly, bool searchInContainers = false) override;
+        ///< Return a pointer to a liveCellRef with the given name.
+        /// \param activeOnly do not search inactive cells.
 
-            Ptr searchPtrViaActorId (int actorId) override;
-            ///< Search is limited to the active cells.
+        Ptr searchPtrViaActorId(int actorId) override;
+        ///< Search is limited to the active cells.
 
-            Ptr searchPtrViaRefNum (const std::string& id, const ESM::RefNum& refNum) override;
+        Ptr searchPtrViaRefNum(const std::string& id, const ESM::RefNum& refNum) override;
 
-            MWWorld::Ptr findContainer (const MWWorld::ConstPtr& ptr) override;
-            ///< Return a pointer to a liveCellRef which contains \a ptr.
-            /// \note Search is limited to the active cells.
+        MWWorld::Ptr findContainer(const MWWorld::ConstPtr& ptr) override;
+        ///< Return a pointer to a liveCellRef which contains \a ptr.
+        /// \note Search is limited to the active cells.
 
-            void adjustPosition (const Ptr& ptr, bool force) override;
-            ///< Adjust position after load to be on ground. Must be called after model load.
-            /// @param force do this even if the ptr is flying
+        void adjustPosition(const Ptr& ptr, bool force) override;
+        ///< Adjust position after load to be on ground. Must be called after model load.
+        /// @param force do this even if the ptr is flying
 
-            void fixPosition () override;
-            ///< Attempt to fix position so that the player is not stuck inside the geometry.
+        void fixPosition() override;
+        ///< Attempt to fix position so that the player is not stuck inside the geometry.
 
-            void enable (const Ptr& ptr) override;
+        void enable(const Ptr& ptr) override;
 
-            void disable (const Ptr& ptr) override;
+        void disable(const Ptr& ptr) override;
 
-            void advanceTime (double hours, bool incremental = false) override;
-            ///< Advance in-game time.
+        void advanceTime(double hours, bool incremental = false) override;
+        ///< Advance in-game time.
 
-            std::string_view getMonthName(int month = -1) const override;
-            ///< Return name of month (-1: current month)
+        std::string_view getMonthName(int month = -1) const override;
+        ///< Return name of month (-1: current month)
 
-            TimeStamp getTimeStamp() const override;
-            ///< Return current in-game time and number of day since new game start.
+        TimeStamp getTimeStamp() const override;
+        ///< Return current in-game time and number of day since new game start.
 
-            ESM::EpochTimeStamp getEpochTimeStamp() const override;
-            ///< Return current in-game date and time.
+        ESM::EpochTimeStamp getEpochTimeStamp() const override;
+        ///< Return current in-game date and time.
 
-            bool toggleSky() override;
-            ///< \return Resulting mode
+        bool toggleSky() override;
+        ///< \return Resulting mode
 
-            void changeWeather(std::string_view region, const unsigned int id) override;
+        void changeWeather(std::string_view region, const unsigned int id) override;
 
-            int getCurrentWeather() const override;
+        int getCurrentWeather() const override;
 
-            int getNextWeather() const override;
+        int getNextWeather() const override;
 
-            float getWeatherTransition() const override;
+        float getWeatherTransition() const override;
 
-            unsigned int getNightDayMode() const override;
+        unsigned int getNightDayMode() const override;
 
-            int getMasserPhase() const override;
+        int getMasserPhase() const override;
 
-            int getSecundaPhase() const override;
+        int getSecundaPhase() const override;
 
-            void setMoonColour (bool red) override;
+        void setMoonColour(bool red) override;
 
-            void modRegion(std::string_view regionid, const std::vector<char> &chances) override;
+        void modRegion(std::string_view regionid, const std::vector<char>& chances) override;
 
-            float getTimeScaleFactor() const override;
+        float getTimeScaleFactor() const override;
 
-            float getSimulationTimeScale() const override { return mSimulationTimeScale; }
+        float getSimulationTimeScale() const override { return mSimulationTimeScale; }
 
-            void setSimulationTimeScale(float scale) override;
+        void setSimulationTimeScale(float scale) override;
 
-            void changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent = true) override;
-            ///< Move to interior cell.
-            ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
+        void changeToInteriorCell(const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos,
+            bool changeEvent = true) override;
+        ///< Move to interior cell.
+        ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
-            void changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos, bool changeEvent = true) override;
-            ///< Move to exterior cell.
-            ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
+        void changeToExteriorCell(
+            const ESM::Position& position, bool adjustPlayerPos, bool changeEvent = true) override;
+        ///< Move to exterior cell.
+        ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
-            void changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent=true) override;
-            ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
+        void changeToCell(const ESM::CellId& cellId, const ESM::Position& position, bool adjustPlayerPos,
+            bool changeEvent = true) override;
+        ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
-            const ESM::Cell* getExterior(std::string_view cellName) const override;
-            ///< Return a cell matching the given name or a 0-pointer, if there is no such cell.
+        const ESM::Cell* getExterior(std::string_view cellName) const override;
+        ///< Return a cell matching the given name or a 0-pointer, if there is no such cell.
 
-            void markCellAsUnchanged() override;
+        void markCellAsUnchanged() override;
 
-            MWWorld::Ptr getFacedObject() override;
-            ///< Return pointer to the object the player is looking at, if it is within activation range
+        MWWorld::Ptr getFacedObject() override;
+        ///< Return pointer to the object the player is looking at, if it is within activation range
 
-            float getDistanceToFacedObject() override;
+        float getDistanceToFacedObject() override;
 
-            /// Returns a pointer to the object the provided object would hit (if within the
-            /// specified distance), and the point where the hit occurs. This will attempt to
-            /// use the "Head" node as a basis.
-            std::pair<MWWorld::Ptr,osg::Vec3f> getHitContact(const MWWorld::ConstPtr &ptr, float distance, std::vector<MWWorld::Ptr> &targets) override;
+        /// Returns a pointer to the object the provided object would hit (if within the
+        /// specified distance), and the point where the hit occurs. This will attempt to
+        /// use the "Head" node as a basis.
+        std::pair<MWWorld::Ptr, osg::Vec3f> getHitContact(
+            const MWWorld::ConstPtr& ptr, float distance, std::vector<MWWorld::Ptr>& targets) override;
 
-            /// @note No-op for items in containers. Use ContainerStore::removeItem instead.
-            void deleteObject (const Ptr& ptr) override;
+        /// @note No-op for items in containers. Use ContainerStore::removeItem instead.
+        void deleteObject(const Ptr& ptr) override;
 
-            void undeleteObject (const Ptr& ptr) override;
+        void undeleteObject(const Ptr& ptr) override;
 
-            MWWorld::Ptr moveObject (const Ptr& ptr, const osg::Vec3f& position, bool movePhysics=true, bool moveToActive=false) override;
-            ///< @return an updated Ptr in case the Ptr's cell changes
+        MWWorld::Ptr moveObject(
+            const Ptr& ptr, const osg::Vec3f& position, bool movePhysics = true, bool moveToActive = false) override;
+        ///< @return an updated Ptr in case the Ptr's cell changes
 
-            MWWorld::Ptr moveObject (const Ptr& ptr, CellStore* newCell, const osg::Vec3f& position, bool movePhysics=true, bool keepActive=false) override;
-            ///< @return an updated Ptr
+        MWWorld::Ptr moveObject(const Ptr& ptr, CellStore* newCell, const osg::Vec3f& position, bool movePhysics = true,
+            bool keepActive = false) override;
+        ///< @return an updated Ptr
 
-            MWWorld::Ptr moveObjectBy(const Ptr& ptr, const osg::Vec3f& vec) override;
-            ///< @return an updated Ptr
+        MWWorld::Ptr moveObjectBy(const Ptr& ptr, const osg::Vec3f& vec) override;
+        ///< @return an updated Ptr
 
-            void scaleObject (const Ptr& ptr, float scale, bool force = false) override;
+        void scaleObject(const Ptr& ptr, float scale, bool force = false) override;
 
-            /// World rotates object, uses radians
-            /// @note Rotations via this method use a different rotation order than the initial rotations in the CS. This
-            /// could be considered a bug, but is needed for MW compatibility.
-            /// \param adjust indicates rotation should be set or adjusted
-            void rotateObject (const Ptr& ptr, const osg::Vec3f& rot, MWBase::RotationFlags flags = MWBase::RotationFlag_inverseOrder) override;
+        /// World rotates object, uses radians
+        /// @note Rotations via this method use a different rotation order than the initial rotations in the CS. This
+        /// could be considered a bug, but is needed for MW compatibility.
+        /// \param adjust indicates rotation should be set or adjusted
+        void rotateObject(const Ptr& ptr, const osg::Vec3f& rot,
+            MWBase::RotationFlags flags = MWBase::RotationFlag_inverseOrder) override;
 
-            MWWorld::Ptr placeObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, const ESM::Position& pos) override;
-            ///< Place an object. Makes a copy of the Ptr.
+        MWWorld::Ptr placeObject(
+            const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, const ESM::Position& pos) override;
+        ///< Place an object. Makes a copy of the Ptr.
 
-            MWWorld::Ptr safePlaceObject (const MWWorld::ConstPtr& ptr, const MWWorld::ConstPtr& referenceObject, MWWorld::CellStore* referenceCell, int direction, float distance) override;
-            ///< Place an object in a safe place next to \a referenceObject. \a direction and \a distance specify the wanted placement
-            /// relative to \a referenceObject (but the object may be placed somewhere else if the wanted location is obstructed).
+        MWWorld::Ptr safePlaceObject(const MWWorld::ConstPtr& ptr, const MWWorld::ConstPtr& referenceObject,
+            MWWorld::CellStore* referenceCell, int direction, float distance) override;
+        ///< Place an object in a safe place next to \a referenceObject. \a direction and \a distance specify the wanted
+        ///< placement
+        /// relative to \a referenceObject (but the object may be placed somewhere else if the wanted location is
+        /// obstructed).
 
-            float getMaxActivationDistance() const override;
+        float getMaxActivationDistance() const override;
 
-            void indexToPosition (int cellX, int cellY, float &x, float &y, bool centre = false)
-                const override;
-            ///< Convert cell numbers to position.
+        void indexToPosition(int cellX, int cellY, float& x, float& y, bool centre = false) const override;
+        ///< Convert cell numbers to position.
 
-            void queueMovement(const Ptr &ptr, const osg::Vec3f &velocity) override;
-            ///< Queues movement for \a ptr (in local space), to be applied in the next call to
-            /// doPhysics.
+        void queueMovement(const Ptr& ptr, const osg::Vec3f& velocity) override;
+        ///< Queues movement for \a ptr (in local space), to be applied in the next call to
+        /// doPhysics.
 
-            void updateAnimatedCollisionShape(const Ptr &ptr) override;
+        void updateAnimatedCollisionShape(const Ptr& ptr) override;
 
-            const MWPhysics::RayCastingInterface* getRayCasting() const override;
+        const MWPhysics::RayCastingInterface* getRayCasting() const override;
 
-            bool castRay (float x1, float y1, float z1, float x2, float y2, float z2, int mask) override;
-            ///< cast a Ray and return true if there is an object in the ray path.
+        bool castRay(float x1, float y1, float z1, float x2, float y2, float z2, int mask) override;
+        ///< cast a Ray and return true if there is an object in the ray path.
 
-            bool castRay (float x1, float y1, float z1, float x2, float y2, float z2) override;
+        bool castRay(float x1, float y1, float z1, float x2, float y2, float z2) override;
 
-            bool castRay(const osg::Vec3f& from, const osg::Vec3f& to, int mask, const MWWorld::ConstPtr& ignore) override;
+        bool castRay(const osg::Vec3f& from, const osg::Vec3f& to, int mask, const MWWorld::ConstPtr& ignore) override;
 
-            bool castRenderingRay(MWPhysics::RayCastingResult& res, const osg::Vec3f& from, const osg::Vec3f& to,
-                                  bool ignorePlayer, bool ignoreActors) override;
+        bool castRenderingRay(MWPhysics::RayCastingResult& res, const osg::Vec3f& from, const osg::Vec3f& to,
+            bool ignorePlayer, bool ignoreActors) override;
 
-            void setActorCollisionMode(const Ptr& ptr, bool internal, bool external) override;
-            bool isActorCollisionEnabled(const Ptr& ptr) override;
+        void setActorCollisionMode(const Ptr& ptr, bool internal, bool external) override;
+        bool isActorCollisionEnabled(const Ptr& ptr) override;
 
-            bool toggleCollisionMode() override;
-            ///< Toggle collision mode for player. If disabled player object should ignore
-            /// collisions and gravity.
-            ///< \return Resulting mode
+        bool toggleCollisionMode() override;
+        ///< Toggle collision mode for player. If disabled player object should ignore
+        /// collisions and gravity.
+        ///< \return Resulting mode
 
-            bool toggleRenderMode (MWRender::RenderMode mode) override;
-            ///< Toggle a render mode.
-            ///< \return Resulting mode
+        bool toggleRenderMode(MWRender::RenderMode mode) override;
+        ///< Toggle a render mode.
+        ///< \return Resulting mode
 
-            const ESM::Potion *createRecord (const ESM::Potion& record) override;
-            ///< Create a new record (of type potion) in the ESM store.
-            /// \return pointer to created record
+        const ESM::Potion* createRecord(const ESM::Potion& record) override;
+        ///< Create a new record (of type potion) in the ESM store.
+        /// \return pointer to created record
 
-            const ESM::Spell *createRecord (const ESM::Spell& record) override;
-            ///< Create a new record (of type spell) in the ESM store.
-            /// \return pointer to created record
+        const ESM::Spell* createRecord(const ESM::Spell& record) override;
+        ///< Create a new record (of type spell) in the ESM store.
+        /// \return pointer to created record
 
-            const ESM::Class *createRecord (const ESM::Class& record) override;
-            ///< Create a new record (of type class) in the ESM store.
-            /// \return pointer to created record
+        const ESM::Class* createRecord(const ESM::Class& record) override;
+        ///< Create a new record (of type class) in the ESM store.
+        /// \return pointer to created record
 
-            const ESM::Cell *createRecord (const ESM::Cell& record) override;
-            ///< Create a new record (of type cell) in the ESM store.
-            /// \return pointer to created record
+        const ESM::Cell* createRecord(const ESM::Cell& record) override;
+        ///< Create a new record (of type cell) in the ESM store.
+        /// \return pointer to created record
 
-            const ESM::NPC *createRecord(const ESM::NPC &record) override;
-            ///< Create a new record (of type npc) in the ESM store.
-            /// \return pointer to created record
+        const ESM::NPC* createRecord(const ESM::NPC& record) override;
+        ///< Create a new record (of type npc) in the ESM store.
+        /// \return pointer to created record
 
-            const ESM::Armor *createRecord (const ESM::Armor& record) override;
-            ///< Create a new record (of type armor) in the ESM store.
-            /// \return pointer to created record
+        const ESM::Armor* createRecord(const ESM::Armor& record) override;
+        ///< Create a new record (of type armor) in the ESM store.
+        /// \return pointer to created record
 
-            const ESM::Weapon *createRecord (const ESM::Weapon& record) override;
-            ///< Create a new record (of type weapon) in the ESM store.
-            /// \return pointer to created record
+        const ESM::Weapon* createRecord(const ESM::Weapon& record) override;
+        ///< Create a new record (of type weapon) in the ESM store.
+        /// \return pointer to created record
 
-            const ESM::Clothing *createRecord (const ESM::Clothing& record) override;
-            ///< Create a new record (of type clothing) in the ESM store.
-            /// \return pointer to created record
+        const ESM::Clothing* createRecord(const ESM::Clothing& record) override;
+        ///< Create a new record (of type clothing) in the ESM store.
+        /// \return pointer to created record
 
-            const ESM::Enchantment *createRecord (const ESM::Enchantment& record) override;
-            ///< Create a new record (of type enchantment) in the ESM store.
-            /// \return pointer to created record
+        const ESM::Enchantment* createRecord(const ESM::Enchantment& record) override;
+        ///< Create a new record (of type enchantment) in the ESM store.
+        /// \return pointer to created record
 
-            const ESM::Book *createRecord (const ESM::Book& record) override;
-            ///< Create a new record (of type book) in the ESM store.
-            /// \return pointer to created record
+        const ESM::Book* createRecord(const ESM::Book& record) override;
+        ///< Create a new record (of type book) in the ESM store.
+        /// \return pointer to created record
 
-            const ESM::CreatureLevList *createOverrideRecord (const ESM::CreatureLevList& record) override;
-            ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
-            /// \return pointer to created record
+        const ESM::CreatureLevList* createOverrideRecord(const ESM::CreatureLevList& record) override;
+        ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
+        /// \return pointer to created record
 
-            const ESM::ItemLevList *createOverrideRecord (const ESM::ItemLevList& record) override;
-            ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
-            /// \return pointer to created record
+        const ESM::ItemLevList* createOverrideRecord(const ESM::ItemLevList& record) override;
+        ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
+        /// \return pointer to created record
 
-            const ESM::Creature *createOverrideRecord (const ESM::Creature& record) override;
-            ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
-            /// \return pointer to created record
+        const ESM::Creature* createOverrideRecord(const ESM::Creature& record) override;
+        ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
+        /// \return pointer to created record
 
-            const ESM::NPC *createOverrideRecord (const ESM::NPC& record) override;
-            ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
-            /// \return pointer to created record
+        const ESM::NPC* createOverrideRecord(const ESM::NPC& record) override;
+        ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
+        /// \return pointer to created record
 
-            const ESM::Container *createOverrideRecord (const ESM::Container& record) override;
-            ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
-            /// \return pointer to created record
+        const ESM::Container* createOverrideRecord(const ESM::Container& record) override;
+        ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
+        /// \return pointer to created record
 
-            void update(float duration, bool paused);
-            void updatePhysics(float duration, bool paused, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
+        void update(float duration, bool paused);
+        void updatePhysics(
+            float duration, bool paused, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
 
-            void updateWindowManager();
+        void updateWindowManager();
 
-            MWWorld::Ptr placeObject (const MWWorld::ConstPtr& object, float cursorX, float cursorY, int amount) override;
-            ///< copy and place an object into the gameworld at the specified cursor position
-            /// @param object
-            /// @param cursor X (relative 0-1)
-            /// @param cursor Y (relative 0-1)
-            /// @param number of objects to place
+        MWWorld::Ptr placeObject(const MWWorld::ConstPtr& object, float cursorX, float cursorY, int amount) override;
+        ///< copy and place an object into the gameworld at the specified cursor position
+        /// @param object
+        /// @param cursor X (relative 0-1)
+        /// @param cursor Y (relative 0-1)
+        /// @param number of objects to place
 
-            MWWorld::Ptr dropObjectOnGround (const MWWorld::Ptr& actor, const MWWorld::ConstPtr& object, int amount) override;
-            ///< copy and place an object into the gameworld at the given actor's position
-            /// @param actor giving the dropped object position
-            /// @param object
-            /// @param number of objects to place
+        MWWorld::Ptr dropObjectOnGround(
+            const MWWorld::Ptr& actor, const MWWorld::ConstPtr& object, int amount) override;
+        ///< copy and place an object into the gameworld at the given actor's position
+        /// @param actor giving the dropped object position
+        /// @param object
+        /// @param number of objects to place
 
-            bool canPlaceObject(float cursorX, float cursorY) override;
-            ///< @return true if it is possible to place on object at specified cursor location
+        bool canPlaceObject(float cursorX, float cursorY) override;
+        ///< @return true if it is possible to place on object at specified cursor location
 
-            void processChangedSettings(const Settings::CategorySettingVector& settings) override;
+        void processChangedSettings(const Settings::CategorySettingVector& settings) override;
 
-            bool isFlying(const MWWorld::Ptr &ptr) const override;
-            bool isSlowFalling(const MWWorld::Ptr &ptr) const override;
-            ///Is the head of the creature underwater?
-            bool isSubmerged(const MWWorld::ConstPtr &object) const override;
-            bool isSwimming(const MWWorld::ConstPtr &object) const override;
-            bool isUnderwater(const MWWorld::CellStore* cell, const osg::Vec3f &pos) const override;
-            bool isUnderwater(const MWWorld::ConstPtr &object, const float heightRatio) const override;
-            bool isWading(const MWWorld::ConstPtr &object) const override;
-            bool isWaterWalkingCastableOnTarget(const MWWorld::ConstPtr &target) const override;
-            bool isOnGround(const MWWorld::Ptr &ptr) const override;
+        bool isFlying(const MWWorld::Ptr& ptr) const override;
+        bool isSlowFalling(const MWWorld::Ptr& ptr) const override;
+        /// Is the head of the creature underwater?
+        bool isSubmerged(const MWWorld::ConstPtr& object) const override;
+        bool isSwimming(const MWWorld::ConstPtr& object) const override;
+        bool isUnderwater(const MWWorld::CellStore* cell, const osg::Vec3f& pos) const override;
+        bool isUnderwater(const MWWorld::ConstPtr& object, const float heightRatio) const override;
+        bool isWading(const MWWorld::ConstPtr& object) const override;
+        bool isWaterWalkingCastableOnTarget(const MWWorld::ConstPtr& target) const override;
+        bool isOnGround(const MWWorld::Ptr& ptr) const override;
 
-            osg::Matrixf getActorHeadTransform(const MWWorld::ConstPtr& actor) const override;
+        osg::Matrixf getActorHeadTransform(const MWWorld::ConstPtr& actor) const override;
 
-            void togglePOV(bool force = false) override;
+        void togglePOV(bool force = false) override;
 
-            bool isFirstPerson() const override;
-            bool isPreviewModeEnabled() const override;
+        bool isFirstPerson() const override;
+        bool isPreviewModeEnabled() const override;
 
-            bool toggleVanityMode(bool enable) override;
+        bool toggleVanityMode(bool enable) override;
 
-            MWRender::Camera* getCamera() override;
-            bool vanityRotateCamera(float * rot) override;
+        MWRender::Camera* getCamera() override;
+        bool vanityRotateCamera(float* rot) override;
 
-            void applyDeferredPreviewRotationToPlayer(float dt) override;
-            void disableDeferredPreviewRotation() override;
+        void applyDeferredPreviewRotationToPlayer(float dt) override;
+        void disableDeferredPreviewRotation() override;
 
-            void saveLoaded() override;
+        void saveLoaded() override;
 
-            void setupPlayer() override;
-            void renderPlayer() override;
+        void setupPlayer() override;
+        void renderPlayer() override;
 
-            /// open or close a non-teleport door (depending on current state)
-            void activateDoor(const MWWorld::Ptr& door) override;
+        /// open or close a non-teleport door (depending on current state)
+        void activateDoor(const MWWorld::Ptr& door) override;
 
-            /// update movement state of a non-teleport door as specified
-            /// @param state see MWClass::setDoorState
-            /// @note throws an exception when invoked on a teleport door
-            void activateDoor(const MWWorld::Ptr& door, MWWorld::DoorState state) override;
+        /// update movement state of a non-teleport door as specified
+        /// @param state see MWClass::setDoorState
+        /// @note throws an exception when invoked on a teleport door
+        void activateDoor(const MWWorld::Ptr& door, MWWorld::DoorState state) override;
 
-            void getActorsStandingOn (const MWWorld::ConstPtr& object, std::vector<MWWorld::Ptr> &actors) override; ///< get a list of actors standing on \a object
-            bool getPlayerStandingOn (const MWWorld::ConstPtr& object) override; ///< @return true if the player is standing on \a object
-            bool getActorStandingOn (const MWWorld::ConstPtr& object) override; ///< @return true if any actor is standing on \a object
-            bool getPlayerCollidingWith(const MWWorld::ConstPtr& object) override; ///< @return true if the player is colliding with \a object
-            bool getActorCollidingWith (const MWWorld::ConstPtr& object) override; ///< @return true if any actor is colliding with \a object
-            void hurtStandingActors (const MWWorld::ConstPtr& object, float dmgPerSecond) override;
-            ///< Apply a health difference to any actors standing on \a object.
-            /// To hurt actors, healthPerSecond should be a positive value. For a negative value, actors will be healed.
-            void hurtCollidingActors (const MWWorld::ConstPtr& object, float dmgPerSecond) override;
-            ///< Apply a health difference to any actors colliding with \a object.
-            /// To hurt actors, healthPerSecond should be a positive value. For a negative value, actors will be healed.
+        void getActorsStandingOn(const MWWorld::ConstPtr& object,
+            std::vector<MWWorld::Ptr>& actors) override; ///< get a list of actors standing on \a object
+        bool getPlayerStandingOn(
+            const MWWorld::ConstPtr& object) override; ///< @return true if the player is standing on \a object
+        bool getActorStandingOn(
+            const MWWorld::ConstPtr& object) override; ///< @return true if any actor is standing on \a object
+        bool getPlayerCollidingWith(
+            const MWWorld::ConstPtr& object) override; ///< @return true if the player is colliding with \a object
+        bool getActorCollidingWith(
+            const MWWorld::ConstPtr& object) override; ///< @return true if any actor is colliding with \a object
+        void hurtStandingActors(const MWWorld::ConstPtr& object, float dmgPerSecond) override;
+        ///< Apply a health difference to any actors standing on \a object.
+        /// To hurt actors, healthPerSecond should be a positive value. For a negative value, actors will be healed.
+        void hurtCollidingActors(const MWWorld::ConstPtr& object, float dmgPerSecond) override;
+        ///< Apply a health difference to any actors colliding with \a object.
+        /// To hurt actors, healthPerSecond should be a positive value. For a negative value, actors will be healed.
 
-            float getWindSpeed() override;
+        float getWindSpeed() override;
 
-            void getContainersOwnedBy (const MWWorld::ConstPtr& npc, std::vector<MWWorld::Ptr>& out) override;
-            ///< get all containers in active cells owned by this Npc
-            void getItemsOwnedBy (const MWWorld::ConstPtr& npc, std::vector<MWWorld::Ptr>& out) override;
-            ///< get all items in active cells owned by this Npc
+        void getContainersOwnedBy(const MWWorld::ConstPtr& npc, std::vector<MWWorld::Ptr>& out) override;
+        ///< get all containers in active cells owned by this Npc
+        void getItemsOwnedBy(const MWWorld::ConstPtr& npc, std::vector<MWWorld::Ptr>& out) override;
+        ///< get all items in active cells owned by this Npc
 
-            bool getLOS(const MWWorld::ConstPtr& actor,const MWWorld::ConstPtr& targetActor) override;
-            ///< get Line of Sight (morrowind stupid implementation)
+        bool getLOS(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& targetActor) override;
+        ///< get Line of Sight (morrowind stupid implementation)
 
-            float getDistToNearestRayHit(const osg::Vec3f& from, const osg::Vec3f& dir, float maxDist, bool includeWater = false) override;
+        float getDistToNearestRayHit(
+            const osg::Vec3f& from, const osg::Vec3f& dir, float maxDist, bool includeWater = false) override;
 
-            void enableActorCollision(const MWWorld::Ptr& actor, bool enable) override;
+        void enableActorCollision(const MWWorld::Ptr& actor, bool enable) override;
 
-            RestPermitted canRest() const override;
-            ///< check if the player is allowed to rest
+        RestPermitted canRest() const override;
+        ///< check if the player is allowed to rest
 
-            void rest(double hours) override;
-            void rechargeItems(double duration, bool activeOnly);
+        void rest(double hours) override;
+        void rechargeItems(double duration, bool activeOnly);
 
-            /// \todo Probably shouldn't be here
-            MWRender::Animation* getAnimation(const MWWorld::Ptr &ptr) override;
-            const MWRender::Animation* getAnimation(const MWWorld::ConstPtr &ptr) const override;
-            void reattachPlayerCamera() override;
+        /// \todo Probably shouldn't be here
+        MWRender::Animation* getAnimation(const MWWorld::Ptr& ptr) override;
+        const MWRender::Animation* getAnimation(const MWWorld::ConstPtr& ptr) const override;
+        void reattachPlayerCamera() override;
 
-            /// \todo this does not belong here
-            void screenshot (osg::Image* image, int w, int h) override;
-            bool screenshot360 (osg::Image* image) override;
+        /// \todo this does not belong here
+        void screenshot(osg::Image* image, int w, int h) override;
+        bool screenshot360(osg::Image* image) override;
 
-            /// Find center of exterior cell above land surface
-            /// \return false if exterior with given name not exists, true otherwise
-            bool findExteriorPosition(std::string_view name, ESM::Position& pos) override;
+        /// Find center of exterior cell above land surface
+        /// \return false if exterior with given name not exists, true otherwise
+        bool findExteriorPosition(std::string_view name, ESM::Position& pos) override;
 
-            /// Find position in interior cell near door entrance
-            /// \return false if interior with given name not exists, true otherwise
-            bool findInteriorPosition(std::string_view name, ESM::Position &pos) override;
+        /// Find position in interior cell near door entrance
+        /// \return false if interior with given name not exists, true otherwise
+        bool findInteriorPosition(std::string_view name, ESM::Position& pos) override;
 
-            /// Enables or disables use of teleport spell effects (recall, intervention, etc).
-            void enableTeleporting(bool enable) override;
+        /// Enables or disables use of teleport spell effects (recall, intervention, etc).
+        void enableTeleporting(bool enable) override;
 
-            /// Returns true if teleport spell effects are allowed.
-            bool isTeleportingEnabled() const override;
+        /// Returns true if teleport spell effects are allowed.
+        bool isTeleportingEnabled() const override;
 
-            /// Enables or disables use of levitation spell effect.
-            void enableLevitation(bool enable) override;
+        /// Enables or disables use of levitation spell effect.
+        void enableLevitation(bool enable) override;
 
-            /// Returns true if levitation spell effect is allowed.
-            bool isLevitationEnabled() const override;
+        /// Returns true if levitation spell effect is allowed.
+        bool isLevitationEnabled() const override;
 
-            bool getGodModeState() const override;
+        bool getGodModeState() const override;
 
-            bool toggleGodMode() override;
+        bool toggleGodMode() override;
 
-            bool toggleScripts() override;
-            bool getScriptsEnabled() const override;
+        bool toggleScripts() override;
+        bool getScriptsEnabled() const override;
 
-            /**
-             * @brief startSpellCast attempt to start casting a spell. Might fail immediately if conditions are not met.
-             * @param actor
-             * @return Success or the failure condition.
-             */
-            MWWorld::SpellCastState startSpellCast (const MWWorld::Ptr& actor) override;
+        /**
+         * @brief startSpellCast attempt to start casting a spell. Might fail immediately if conditions are not met.
+         * @param actor
+         * @return Success or the failure condition.
+         */
+        MWWorld::SpellCastState startSpellCast(const MWWorld::Ptr& actor) override;
 
-            /**
-             * @brief Cast the actual spell, should be called mid-animation
-             * @param actor
-             */
-            void castSpell (const MWWorld::Ptr& actor, bool manualSpell=false) override;
+        /**
+         * @brief Cast the actual spell, should be called mid-animation
+         * @param actor
+         */
+        void castSpell(const MWWorld::Ptr& actor, bool manualSpell = false) override;
 
-            void launchMagicBolt (const std::string& spellId, const MWWorld::Ptr& caster, const osg::Vec3f& fallbackDirection, int slot) override;
-            void launchProjectile (MWWorld::Ptr& actor, MWWorld::Ptr& projectile,
-                                           const osg::Vec3f& worldPos, const osg::Quat& orient, MWWorld::Ptr& bow, float speed, float attackStrength) override;
-            void updateProjectilesCasters() override;
+        void launchMagicBolt(const std::string& spellId, const MWWorld::Ptr& caster,
+            const osg::Vec3f& fallbackDirection, int slot) override;
+        void launchProjectile(MWWorld::Ptr& actor, MWWorld::Ptr& projectile, const osg::Vec3f& worldPos,
+            const osg::Quat& orient, MWWorld::Ptr& bow, float speed, float attackStrength) override;
+        void updateProjectilesCasters() override;
 
-            void applyLoopingParticles(const MWWorld::Ptr& ptr) const override;
+        void applyLoopingParticles(const MWWorld::Ptr& ptr) const override;
 
-            const std::vector<std::string>& getContentFiles() const override;
-            void breakInvisibility (const MWWorld::Ptr& actor) override;
+        const std::vector<std::string>& getContentFiles() const override;
+        void breakInvisibility(const MWWorld::Ptr& actor) override;
 
-            // Allow NPCs to use torches?
-            bool useTorches() const override;
+        // Allow NPCs to use torches?
+        bool useTorches() const override;
 
-            float getSunVisibility() const override;
-            float getSunPercentage() const override;
+        float getSunVisibility() const override;
+        float getSunPercentage() const override;
 
-            bool findInteriorPositionInWorldSpace(const MWWorld::CellStore* cell, osg::Vec3f& result) override;
+        bool findInteriorPositionInWorldSpace(const MWWorld::CellStore* cell, osg::Vec3f& result) override;
 
-            /// Teleports \a ptr to the closest reference of \a id (e.g. DivineMarker, PrisonMarker, TempleMarker)
-            /// @note id must be lower case
-            void teleportToClosestMarker(const MWWorld::Ptr& ptr, std::string_view id) override;
+        /// Teleports \a ptr to the closest reference of \a id (e.g. DivineMarker, PrisonMarker, TempleMarker)
+        /// @note id must be lower case
+        void teleportToClosestMarker(const MWWorld::Ptr& ptr, std::string_view id) override;
 
-            /// List all references (filtered by \a type) detected by \a ptr. The range
-            /// is determined by the current magnitude of the "Detect X" magic effect belonging to \a type.
-            /// @note This also works for references in containers.
-            void listDetectedReferences (const MWWorld::Ptr& ptr, std::vector<MWWorld::Ptr>& out,
-                                                  DetectionType type) override;
+        /// List all references (filtered by \a type) detected by \a ptr. The range
+        /// is determined by the current magnitude of the "Detect X" magic effect belonging to \a type.
+        /// @note This also works for references in containers.
+        void listDetectedReferences(
+            const MWWorld::Ptr& ptr, std::vector<MWWorld::Ptr>& out, DetectionType type) override;
 
-            /// Update the value of some globals according to the world state, which may be used by dialogue entries.
-            /// This should be called when initiating a dialogue.
-            void updateDialogueGlobals() override;
+        /// Update the value of some globals according to the world state, which may be used by dialogue entries.
+        /// This should be called when initiating a dialogue.
+        void updateDialogueGlobals() override;
 
-            /// Moves all stolen items from \a ptr to the closest evidence chest.
-            void confiscateStolenItems(const MWWorld::Ptr& ptr) override;
+        /// Moves all stolen items from \a ptr to the closest evidence chest.
+        void confiscateStolenItems(const MWWorld::Ptr& ptr) override;
 
-            void goToJail () override;
+        void goToJail() override;
 
-            /// Spawn a random creature from a levelled list next to the player
-            void spawnRandomCreature(std::string_view creatureList) override;
+        /// Spawn a random creature from a levelled list next to the player
+        void spawnRandomCreature(std::string_view creatureList) override;
 
-            /// Spawn a blood effect for \a ptr at \a worldPosition
-            void spawnBloodEffect (const MWWorld::Ptr& ptr, const osg::Vec3f& worldPosition) override;
+        /// Spawn a blood effect for \a ptr at \a worldPosition
+        void spawnBloodEffect(const MWWorld::Ptr& ptr, const osg::Vec3f& worldPosition) override;
 
-            void spawnEffect (const std::string& model, const std::string& textureOverride, const osg::Vec3f& worldPos, float scale = 1.f, bool isMagicVFX = true) override;
+        void spawnEffect(const std::string& model, const std::string& textureOverride, const osg::Vec3f& worldPos,
+            float scale = 1.f, bool isMagicVFX = true) override;
 
-            void activate (const MWWorld::Ptr& object, const MWWorld::Ptr& actor) override;
+        void activate(const MWWorld::Ptr& object, const MWWorld::Ptr& actor) override;
 
-            /// @see MWWorld::WeatherManager::isInStorm
-            bool isInStorm() const override;
+        /// @see MWWorld::WeatherManager::isInStorm
+        bool isInStorm() const override;
 
-            /// @see MWWorld::WeatherManager::getStormDirection
-            osg::Vec3f getStormDirection() const override;
+        /// @see MWWorld::WeatherManager::getStormDirection
+        osg::Vec3f getStormDirection() const override;
 
-            /// Resets all actors in the current active cells to their original location within that cell.
-            void resetActors() override;
+        /// Resets all actors in the current active cells to their original location within that cell.
+        void resetActors() override;
 
-            bool isWalkingOnWater (const MWWorld::ConstPtr& actor) const override;
+        bool isWalkingOnWater(const MWWorld::ConstPtr& actor) const override;
 
-            /// Return a vector aiming the actor's weapon towards a target.
-            /// @note The length of the vector is the distance between actor and target.
-            osg::Vec3f aimToTarget(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target, bool isRangedCombat) override;
+        /// Return a vector aiming the actor's weapon towards a target.
+        /// @note The length of the vector is the distance between actor and target.
+        osg::Vec3f aimToTarget(
+            const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target, bool isRangedCombat) override;
 
-            /// Return the distance between actor's weapon and target's collision box.
-            float getHitDistance(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target) override;
+        /// Return the distance between actor's weapon and target's collision box.
+        float getHitDistance(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target) override;
 
-            bool isPlayerInJail() const override;
+        bool isPlayerInJail() const override;
 
-            void setPlayerTraveling(bool traveling) override;
-            bool isPlayerTraveling() const override;
+        void setPlayerTraveling(bool traveling) override;
+        bool isPlayerTraveling() const override;
 
-            /// Return terrain height at \a worldPos position.
-            float getTerrainHeightAt(const osg::Vec3f& worldPos) const override;
+        /// Return terrain height at \a worldPos position.
+        float getTerrainHeightAt(const osg::Vec3f& worldPos) const override;
 
-            /// Return physical or rendering half extents of the given actor.
-            osg::Vec3f getHalfExtents(const MWWorld::ConstPtr& actor, bool rendering=false) const override;
+        /// Return physical or rendering half extents of the given actor.
+        osg::Vec3f getHalfExtents(const MWWorld::ConstPtr& actor, bool rendering = false) const override;
 
-            /// Export scene graph to a file and return the filename.
-            /// \param ptr object to export scene graph for (if empty, export entire scene graph)
-            std::filesystem::path exportSceneGraph(const MWWorld::Ptr& ptr) override;
+        /// Export scene graph to a file and return the filename.
+        /// \param ptr object to export scene graph for (if empty, export entire scene graph)
+        std::filesystem::path exportSceneGraph(const MWWorld::Ptr& ptr) override;
 
-            /// Preload VFX associated with this effect list
-            void preloadEffects(const ESM::EffectList* effectList) override;
+        /// Preload VFX associated with this effect list
+        void preloadEffects(const ESM::EffectList* effectList) override;
 
-            DetourNavigator::Navigator* getNavigator() const override;
+        DetourNavigator::Navigator* getNavigator() const override;
 
-            void updateActorPath(const MWWorld::ConstPtr& actor, const std::deque<osg::Vec3f>& path,
-                const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end) const override;
+        void updateActorPath(const MWWorld::ConstPtr& actor, const std::deque<osg::Vec3f>& path,
+            const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start,
+            const osg::Vec3f& end) const override;
 
-            void removeActorPath(const MWWorld::ConstPtr& actor) const override;
+        void removeActorPath(const MWWorld::ConstPtr& actor) const override;
 
-            void setNavMeshNumberToRender(const std::size_t value) override;
+        void setNavMeshNumberToRender(const std::size_t value) override;
 
-            DetourNavigator::AgentBounds getPathfindingAgentBounds(const MWWorld::ConstPtr& actor) const override;
+        DetourNavigator::AgentBounds getPathfindingAgentBounds(const MWWorld::ConstPtr& actor) const override;
 
-            bool hasCollisionWithDoor(const MWWorld::ConstPtr& door, const osg::Vec3f& position, const osg::Vec3f& destination) const override;
+        bool hasCollisionWithDoor(
+            const MWWorld::ConstPtr& door, const osg::Vec3f& position, const osg::Vec3f& destination) const override;
 
-            bool isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
-                std::span<const MWWorld::ConstPtr> ignore, std::vector<MWWorld::Ptr>* occupyingActors) const override;
+        bool isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
+            std::span<const MWWorld::ConstPtr> ignore, std::vector<MWWorld::Ptr>* occupyingActors) const override;
 
-            void reportStats(unsigned int frameNumber, osg::Stats& stats) const override;
+        void reportStats(unsigned int frameNumber, osg::Stats& stats) const override;
 
-            std::vector<MWWorld::Ptr> getAll(const std::string& id) override;
+        std::vector<MWWorld::Ptr> getAll(const std::string& id) override;
 
-            Misc::Rng::Generator& getPrng() override;
+        Misc::Rng::Generator& getPrng() override;
 
-            MWRender::RenderingManager* getRenderingManager() override { return mRendering.get(); }
+        MWRender::RenderingManager* getRenderingManager() override { return mRendering.get(); }
 
-            MWRender::PostProcessor* getPostProcessor() override;
+        MWRender::PostProcessor* getPostProcessor() override;
 
-            void setActorActive(const MWWorld::Ptr& ptr, bool value) override;
+        void setActorActive(const MWWorld::Ptr& ptr, bool value) override;
     };
 }
 
diff --git a/apps/openmw/options.cpp b/apps/openmw/options.cpp
index 0cbfe2700a..3c0790f0a7 100644
--- a/apps/openmw/options.cpp
+++ b/apps/openmw/options.cpp
@@ -4,7 +4,6 @@
 #include <components/files/configurationmanager.hpp>
 #include <components/misc/rng.hpp>
 
-
 namespace
 {
     namespace bpo = boost::program_options;
@@ -22,87 +21,93 @@ namespace OpenMW
         addOption("help", "print help message");
         addOption("version", "print version information and quit");
 
-        addOption("data", bpo::value<Files::MaybeQuotedPathContainer>()->default_value(Files::MaybeQuotedPathContainer(), "data")
-                ->multitoken()->composing(), "set data directories (later directories have higher priority)");
+        addOption("data",
+            bpo::value<Files::MaybeQuotedPathContainer>()
+                ->default_value(Files::MaybeQuotedPathContainer(), "data")
+                ->multitoken()
+                ->composing(),
+            "set data directories (later directories have higher priority)");
 
         addOption("data-local", bpo::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), ""),
-                "set local data directory (highest priority)");
+            "set local data directory (highest priority)");
 
-        addOption("fallback-archive", bpo::value<StringsVector>()->default_value(StringsVector(), "fallback-archive")
-                ->multitoken()->composing(), "set fallback BSA archives (later archives have higher priority)");
+        addOption("fallback-archive",
+            bpo::value<StringsVector>()->default_value(StringsVector(), "fallback-archive")->multitoken()->composing(),
+            "set fallback BSA archives (later archives have higher priority)");
 
-        addOption("resources", bpo::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), "resources"),
-                "set resources directory");
+        addOption("resources",
+            bpo::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), "resources"),
+            "set resources directory");
 
-        addOption("start", bpo::value<std::string>()->default_value(""),
-                "set initial cell");
+        addOption("start", bpo::value<std::string>()->default_value(""), "set initial cell");
 
-        addOption("content", bpo::value<StringsVector>()->default_value(StringsVector(), "")
-                ->multitoken()->composing(), "content file(s): esm/esp, or omwgame/omwaddon/omwscripts");
+        addOption("content", bpo::value<StringsVector>()->default_value(StringsVector(), "")->multitoken()->composing(),
+            "content file(s): esm/esp, or omwgame/omwaddon/omwscripts");
 
-        addOption("groundcover", bpo::value<StringsVector>()->default_value(StringsVector(), "")
-                ->multitoken()->composing(), "groundcover content file(s): esm/esp, or omwgame/omwaddon");
+        addOption("groundcover",
+            bpo::value<StringsVector>()->default_value(StringsVector(), "")->multitoken()->composing(),
+            "groundcover content file(s): esm/esp, or omwgame/omwaddon");
 
-        addOption("no-sound", bpo::value<bool>()->implicit_value(true)
-                ->default_value(false), "disable all sounds");
+        addOption("no-sound", bpo::value<bool>()->implicit_value(true)->default_value(false), "disable all sounds");
 
-        addOption("script-all", bpo::value<bool>()->implicit_value(true)
-                ->default_value(false), "compile all scripts (excluding dialogue scripts) at startup");
+        addOption("script-all", bpo::value<bool>()->implicit_value(true)->default_value(false),
+            "compile all scripts (excluding dialogue scripts) at startup");
 
-        addOption("script-all-dialogue", bpo::value<bool>()->implicit_value(true)
-                ->default_value(false), "compile all dialogue scripts at startup");
+        addOption("script-all-dialogue", bpo::value<bool>()->implicit_value(true)->default_value(false),
+            "compile all dialogue scripts at startup");
 
-        addOption("script-console", bpo::value<bool>()->implicit_value(true)
-                ->default_value(false), "enable console-only script functionality");
+        addOption("script-console", bpo::value<bool>()->implicit_value(true)->default_value(false),
+            "enable console-only script functionality");
 
         addOption("script-run", bpo::value<std::string>()->default_value(""),
-                "select a file containing a list of console commands that is executed on startup");
+            "select a file containing a list of console commands that is executed on startup");
 
-        addOption("script-warn", bpo::value<int>()->implicit_value (1)
-                ->default_value (1),
-                "handling of warnings when compiling scripts\n"
-                "\t0 - ignore warning\n"
-                "\t1 - show warning but consider script as correctly compiled anyway\n"
-                "\t2 - treat warnings as errors");
+        addOption("script-warn", bpo::value<int>()->implicit_value(1)->default_value(1),
+            "handling of warnings when compiling scripts\n"
+            "\t0 - ignore warning\n"
+            "\t1 - show warning but consider script as correctly compiled anyway\n"
+            "\t2 - treat warnings as errors");
 
-        addOption("script-blacklist", bpo::value<StringsVector>()->default_value(StringsVector(), "")
-                ->multitoken()->composing(), "ignore the specified script (if the use of the blacklist is enabled)");
+        addOption("script-blacklist",
+            bpo::value<StringsVector>()->default_value(StringsVector(), "")->multitoken()->composing(),
+            "ignore the specified script (if the use of the blacklist is enabled)");
 
-        addOption("script-blacklist-use", bpo::value<bool>()->implicit_value(true)
-                ->default_value(true), "enable script blacklisting");
+        addOption("script-blacklist-use", bpo::value<bool>()->implicit_value(true)->default_value(true),
+            "enable script blacklisting");
 
         addOption("load-savegame", bpo::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), ""),
-                "load a save game file on game startup (specify an absolute filename or a filename relative to the current working directory)");
+            "load a save game file on game startup (specify an absolute filename or a filename relative to the current "
+            "working directory)");
 
-        addOption("skip-menu", bpo::value<bool>()->implicit_value(true)
-                ->default_value(false), "skip main menu on game startup");
+        addOption("skip-menu", bpo::value<bool>()->implicit_value(true)->default_value(false),
+            "skip main menu on game startup");
 
-        addOption("new-game", bpo::value<bool>()->implicit_value(true)
-                ->default_value(false), "run new game sequence (ignored if skip-menu=0)");
+        addOption("new-game", bpo::value<bool>()->implicit_value(true)->default_value(false),
+            "run new game sequence (ignored if skip-menu=0)");
 
-        addOption("fs-strict", bpo::value<bool>()->implicit_value(true)
-                ->default_value(false), "strict file system handling (no case folding)");
+        addOption("fs-strict", bpo::value<bool>()->implicit_value(true)->default_value(false),
+            "strict file system handling (no case folding)");
 
-        addOption("encoding", bpo::value<std::string>()->
-                default_value("win1252"),
-                "Character encoding used in OpenMW game messages:\n"
-                "\n\twin1250 - Central and Eastern European such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, Croatian, Serbian (Latin script), Romanian and Albanian languages\n"
-                "\n\twin1251 - Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic and other languages\n"
-                "\n\twin1252 - Western European (Latin) alphabet, used by default");
+        addOption("encoding", bpo::value<std::string>()->default_value("win1252"),
+            "Character encoding used in OpenMW game messages:\n"
+            "\n\twin1250 - Central and Eastern European such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, "
+            "Croatian, Serbian (Latin script), Romanian and Albanian languages\n"
+            "\n\twin1251 - Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic and other languages\n"
+            "\n\twin1252 - Western European (Latin) alphabet, used by default");
 
-        addOption("fallback", bpo::value<Fallback::FallbackMap>()->default_value(Fallback::FallbackMap(), "")
-                ->multitoken()->composing(), "fallback values");
+        addOption("fallback",
+            bpo::value<Fallback::FallbackMap>()->default_value(Fallback::FallbackMap(), "")->multitoken()->composing(),
+            "fallback values");
 
         addOption("no-grab", bpo::value<bool>()->implicit_value(true)->default_value(false), "Don't grab mouse cursor");
 
-        addOption("export-fonts", bpo::value<bool>()->implicit_value(true)
-                ->default_value(false), "Export Morrowind .fnt fonts to PNG image and XML file in current directory");
+        addOption("export-fonts", bpo::value<bool>()->implicit_value(true)->default_value(false),
+            "Export Morrowind .fnt fonts to PNG image and XML file in current directory");
 
-        addOption("activate-dist", bpo::value <int> ()->default_value (-1), "activation distance override");
+        addOption("activate-dist", bpo::value<int>()->default_value(-1), "activation distance override");
 
-        addOption("random-seed", bpo::value <unsigned int> ()
-                ->default_value(Misc::Rng::generateDefaultSeed()),
-                "seed value for random number generator");
+        addOption("random-seed", bpo::value<unsigned int>()->default_value(Misc::Rng::generateDefaultSeed()),
+            "seed value for random number generator");
 
         return desc;
     }
diff --git a/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp b/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
index 1c7db0d31d..1fa868f133 100644
--- a/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
+++ b/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
@@ -1,11 +1,11 @@
 #include "settings.hpp"
 
 #include <components/detournavigator/asyncnavmeshupdater.hpp>
+#include <components/detournavigator/dbrefgeometryobject.hpp>
 #include <components/detournavigator/makenavmesh.hpp>
+#include <components/detournavigator/navmeshdbutils.hpp>
 #include <components/detournavigator/serialization.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
-#include <components/detournavigator/navmeshdbutils.hpp>
-#include <components/detournavigator/dbrefgeometryobject.hpp>
 
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 
@@ -13,8 +13,8 @@
 
 #include <gtest/gtest.h>
 
-#include <map>
 #include <limits>
+#include <map>
 
 namespace
 {
@@ -22,10 +22,11 @@ namespace
     using namespace DetourNavigator;
     using namespace DetourNavigator::Tests;
 
-    void addHeightFieldPlane(TileCachedRecastMeshManager& recastMeshManager, const osg::Vec2i cellPosition = osg::Vec2i(0, 0))
+    void addHeightFieldPlane(
+        TileCachedRecastMeshManager& recastMeshManager, const osg::Vec2i cellPosition = osg::Vec2i(0, 0))
     {
         const int cellSize = 8192;
-        recastMeshManager.addHeightfield(cellPosition, cellSize, HeightfieldPlane {0}, nullptr);
+        recastMeshManager.addHeightfield(cellPosition, cellSize, HeightfieldPlane{ 0 }, nullptr);
     }
 
     void addObject(const btBoxShape& shape, TileCachedRecastMeshManager& recastMeshManager)
@@ -39,27 +40,26 @@ namespace
         std::fill(std::begin(objectTransform.mPosition.rot), std::end(objectTransform.mPosition.rot), 0.2f);
         objectTransform.mScale = 3.14f;
         const CollisionShape collisionShape(
-            osg::ref_ptr<Resource::BulletShapeInstance>(new Resource::BulletShapeInstance(bulletShape)),
-            shape, objectTransform
-        );
+            osg::ref_ptr<Resource::BulletShapeInstance>(new Resource::BulletShapeInstance(bulletShape)), shape,
+            objectTransform);
         recastMeshManager.addObject(id, collisionShape, btTransform::getIdentity(), AreaType_ground, nullptr);
     }
 
     struct DetourNavigatorAsyncNavMeshUpdaterTest : Test
     {
         Settings mSettings = makeSettings();
-        TileCachedRecastMeshManager mRecastMeshManager {mSettings.mRecast};
-        OffMeshConnectionsManager mOffMeshConnectionsManager {mSettings.mRecast};
-        const AgentBounds mAgentBounds {CollisionShapeType::Aabb, {29, 29, 66}};
-        const TilePosition mPlayerTile {0, 0};
+        TileCachedRecastMeshManager mRecastMeshManager{ mSettings.mRecast };
+        OffMeshConnectionsManager mOffMeshConnectionsManager{ mSettings.mRecast };
+        const AgentBounds mAgentBounds{ CollisionShapeType::Aabb, { 29, 29, 66 } };
+        const TilePosition mPlayerTile{ 0, 0 };
         const std::string mWorldspace = "sys::default";
-        const btBoxShape mBox {btVector3(100, 100, 20)};
+        const btBoxShape mBox{ btVector3(100, 100, 20) };
         Loading::Listener mListener;
     };
 
     TEST_F(DetourNavigatorAsyncNavMeshUpdaterTest, for_all_jobs_done_when_empty_wait_should_terminate)
     {
-        AsyncNavMeshUpdater updater {mSettings, mRecastMeshManager, mOffMeshConnectionsManager, nullptr};
+        AsyncNavMeshUpdater updater{ mSettings, mRecastMeshManager, mOffMeshConnectionsManager, nullptr };
         updater.wait(WaitConditionType::allJobsDone, &mListener);
     }
 
@@ -75,7 +75,7 @@ namespace
         addHeightFieldPlane(mRecastMeshManager);
         AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, nullptr);
         const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
-        const std::map<TilePosition, ChangeType> changedTiles {{TilePosition {0, 0}, ChangeType::add}};
+        const std::map<TilePosition, ChangeType> changedTiles{ { TilePosition{ 0, 0 }, ChangeType::add } };
         updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(WaitConditionType::allJobsDone, &mListener);
         EXPECT_NE(navMeshCacheItem->lockConst()->getImpl().getTileRefAt(0, 0, 0), 0u);
@@ -87,7 +87,7 @@ namespace
         addHeightFieldPlane(mRecastMeshManager);
         AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, nullptr);
         const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
-        const std::map<TilePosition, ChangeType> changedTiles {{TilePosition {0, 0}, ChangeType::add}};
+        const std::map<TilePosition, ChangeType> changedTiles{ { TilePosition{ 0, 0 }, ChangeType::add } };
         updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(WaitConditionType::allJobsDone, &mListener);
         {
@@ -110,7 +110,7 @@ namespace
         addHeightFieldPlane(mRecastMeshManager);
         AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, nullptr);
         const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
-        const std::map<TilePosition, ChangeType> changedTiles {{TilePosition {0, 0}, ChangeType::update}};
+        const std::map<TilePosition, ChangeType> changedTiles{ { TilePosition{ 0, 0 }, ChangeType::update } };
         updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(WaitConditionType::allJobsDone, &mListener);
         {
@@ -136,18 +136,18 @@ namespace
         NavMeshDb* const dbPtr = db.get();
         AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, std::move(db));
         const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
-        const TilePosition tilePosition {0, 0};
-        const std::map<TilePosition, ChangeType> changedTiles {{tilePosition, ChangeType::add}};
+        const TilePosition tilePosition{ 0, 0 };
+        const std::map<TilePosition, ChangeType> changedTiles{ { tilePosition, ChangeType::add } };
         updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(WaitConditionType::allJobsDone, &mListener);
         updater.stop();
         const auto recastMesh = mRecastMeshManager.getMesh(mWorldspace, tilePosition);
         ASSERT_NE(recastMesh, nullptr);
-        ShapeId nextShapeId {1};
+        ShapeId nextShapeId{ 1 };
         const std::vector<DbRefGeometryObject> objects = makeDbRefGeometryObjects(recastMesh->getMeshSources(),
-            [&] (const MeshSource& v) { return resolveMeshSource(*dbPtr, v, nextShapeId); });
-        const auto tile = dbPtr->findTile(mWorldspace, tilePosition,
-                                          serialize(mSettings.mRecast, mAgentBounds, *recastMesh, objects));
+            [&](const MeshSource& v) { return resolveMeshSource(*dbPtr, v, nextShapeId); });
+        const auto tile = dbPtr->findTile(
+            mWorldspace, tilePosition, serialize(mSettings.mRecast, mAgentBounds, *recastMesh, objects));
         ASSERT_TRUE(tile.has_value());
         EXPECT_EQ(tile->mTileId, 1);
         EXPECT_EQ(tile->mVersion, navMeshFormatVersion);
@@ -163,18 +163,18 @@ namespace
         mSettings.mWriteToNavMeshDb = false;
         AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, std::move(db));
         const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
-        const TilePosition tilePosition {0, 0};
-        const std::map<TilePosition, ChangeType> changedTiles {{tilePosition, ChangeType::add}};
+        const TilePosition tilePosition{ 0, 0 };
+        const std::map<TilePosition, ChangeType> changedTiles{ { tilePosition, ChangeType::add } };
         updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(WaitConditionType::allJobsDone, &mListener);
         updater.stop();
         const auto recastMesh = mRecastMeshManager.getMesh(mWorldspace, tilePosition);
         ASSERT_NE(recastMesh, nullptr);
-        ShapeId nextShapeId {1};
+        ShapeId nextShapeId{ 1 };
         const std::vector<DbRefGeometryObject> objects = makeDbRefGeometryObjects(recastMesh->getMeshSources(),
-            [&] (const MeshSource& v) { return resolveMeshSource(*dbPtr, v, nextShapeId); });
-        const auto tile = dbPtr->findTile(mWorldspace, tilePosition,
-                                          serialize(mSettings.mRecast, mAgentBounds, *recastMesh, objects));
+            [&](const MeshSource& v) { return resolveMeshSource(*dbPtr, v, nextShapeId); });
+        const auto tile = dbPtr->findTile(
+            mWorldspace, tilePosition, serialize(mSettings.mRecast, mAgentBounds, *recastMesh, objects));
         ASSERT_FALSE(tile.has_value());
     }
 
@@ -188,15 +188,15 @@ namespace
         mSettings.mWriteToNavMeshDb = false;
         AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, std::move(db));
         const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
-        const TilePosition tilePosition {0, 0};
-        const std::map<TilePosition, ChangeType> changedTiles {{tilePosition, ChangeType::add}};
+        const TilePosition tilePosition{ 0, 0 };
+        const std::map<TilePosition, ChangeType> changedTiles{ { tilePosition, ChangeType::add } };
         updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(WaitConditionType::allJobsDone, &mListener);
         updater.stop();
         const auto recastMesh = mRecastMeshManager.getMesh(mWorldspace, tilePosition);
         ASSERT_NE(recastMesh, nullptr);
-        const auto objects = makeDbRefGeometryObjects(recastMesh->getMeshSources(),
-            [&] (const MeshSource& v) { return resolveMeshSource(*dbPtr, v); });
+        const auto objects = makeDbRefGeometryObjects(
+            recastMesh->getMeshSources(), [&](const MeshSource& v) { return resolveMeshSource(*dbPtr, v); });
         EXPECT_FALSE(objects.has_value());
     }
 
@@ -206,9 +206,9 @@ namespace
         addHeightFieldPlane(mRecastMeshManager);
         mSettings.mMaxNavMeshTilesCacheSize = 0;
         AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager,
-                                    std::make_unique<NavMeshDb>(":memory:", std::numeric_limits<std::uint64_t>::max()));
+            std::make_unique<NavMeshDb>(":memory:", std::numeric_limits<std::uint64_t>::max()));
         const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
-        const std::map<TilePosition, ChangeType> changedTiles {{TilePosition {0, 0}, ChangeType::add}};
+        const std::map<TilePosition, ChangeType> changedTiles{ { TilePosition{ 0, 0 }, ChangeType::add } };
         updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(WaitConditionType::allJobsDone, &mListener);
         {
@@ -237,11 +237,11 @@ namespace
         addHeightFieldPlane(mRecastMeshManager);
         AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, nullptr);
         const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
-        const std::map<TilePosition, ChangeType> changedTilesAdd {{TilePosition {0, 0}, ChangeType::add}};
+        const std::map<TilePosition, ChangeType> changedTilesAdd{ { TilePosition{ 0, 0 }, ChangeType::add } };
         updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTilesAdd);
         updater.wait(WaitConditionType::allJobsDone, &mListener);
         ASSERT_NE(navMeshCacheItem->lockConst()->getImpl().getTileRefAt(0, 0, 0), 0u);
-        const std::map<TilePosition, ChangeType> changedTilesRemove {{TilePosition {0, 0}, ChangeType::remove}};
+        const std::map<TilePosition, ChangeType> changedTilesRemove{ { TilePosition{ 0, 0 }, ChangeType::remove } };
         const TilePosition playerTile(100, 100);
         updater.post(mAgentBounds, navMeshCacheItem, playerTile, mWorldspace, changedTilesRemove);
         updater.wait(WaitConditionType::allJobsDone, &mListener);
@@ -262,11 +262,11 @@ namespace
         std::map<TilePosition, ChangeType> changedTiles;
         for (int x = -5; x <= 5; ++x)
             for (int y = -5; y <= 5; ++y)
-                changedTiles.emplace(TilePosition {x, y}, ChangeType::add);
+                changedTiles.emplace(TilePosition{ x, y }, ChangeType::add);
         updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(WaitConditionType::allJobsDone, &mListener);
         updater.stop();
-        const std::set<TilePosition> present {
+        const std::set<TilePosition> present{
             TilePosition(-2, 0),
             TilePosition(-1, -1),
             TilePosition(-1, 0),
@@ -285,14 +285,17 @@ namespace
                 const TilePosition tilePosition(x, y);
                 const auto recastMesh = mRecastMeshManager.getMesh(mWorldspace, tilePosition);
                 ASSERT_NE(recastMesh, nullptr);
-                const std::optional<std::vector<DbRefGeometryObject>> objects = makeDbRefGeometryObjects(recastMesh->getMeshSources(),
-                    [&] (const MeshSource& v) { return resolveMeshSource(*dbPtr, v); });
+                const std::optional<std::vector<DbRefGeometryObject>> objects = makeDbRefGeometryObjects(
+                    recastMesh->getMeshSources(), [&](const MeshSource& v) { return resolveMeshSource(*dbPtr, v); });
                 if (!objects.has_value())
                     continue;
-                EXPECT_EQ(dbPtr->findTile(mWorldspace, tilePosition,
-                                          serialize(mSettings.mRecast, mAgentBounds, *recastMesh, *objects)).has_value(),
-                          present.find(tilePosition) != present.end())
-                    << tilePosition.x() << " " << tilePosition.y() << " present=" << (present.find(tilePosition) != present.end());
+                EXPECT_EQ(dbPtr
+                              ->findTile(mWorldspace, tilePosition,
+                                  serialize(mSettings.mRecast, mAgentBounds, *recastMesh, *objects))
+                              .has_value(),
+                    present.find(tilePosition) != present.end())
+                    << tilePosition.x() << " " << tilePosition.y()
+                    << " present=" << (present.find(tilePosition) != present.end());
             }
     }
 }
diff --git a/apps/openmw_test_suite/detournavigator/generate.hpp b/apps/openmw_test_suite/detournavigator/generate.hpp
index 52d04495a7..94acfc4673 100644
--- a/apps/openmw_test_suite/detournavigator/generate.hpp
+++ b/apps/openmw_test_suite/detournavigator/generate.hpp
@@ -11,21 +11,16 @@ namespace DetourNavigator
     namespace Tests
     {
         template <class T, class Random>
-        inline auto generateValue(T& value, Random& random)
-            -> std::enable_if_t<sizeof(T) >= 2>
+        inline auto generateValue(T& value, Random& random) -> std::enable_if_t<sizeof(T) >= 2>
         {
-            using Distribution = std::conditional_t<
-                std::is_floating_point_v<T>,
-                std::uniform_real_distribution<T>,
-                std::uniform_int_distribution<T>
-            >;
+            using Distribution = std::conditional_t<std::is_floating_point_v<T>, std::uniform_real_distribution<T>,
+                std::uniform_int_distribution<T>>;
             Distribution distribution(std::numeric_limits<T>::min(), std::numeric_limits<T>::max());
             value = distribution(random);
         }
 
         template <class T, class Random>
-        inline auto generateValue(T& value, Random& random)
-            -> std::enable_if_t<sizeof(T) == 1>
+        inline auto generateValue(T& value, Random& random) -> std::enable_if_t<sizeof(T) == 1>
         {
             unsigned short v;
             generateValue(v, random);
@@ -43,7 +38,7 @@ namespace DetourNavigator
         template <class I, class Random>
         inline void generateRange(I begin, I end, Random& random)
         {
-            std::for_each(begin, end, [&] (auto& v) { generateValue(v, random); });
+            std::for_each(begin, end, [&](auto& v) { generateValue(v, random); });
         }
     }
 }
diff --git a/apps/openmw_test_suite/detournavigator/gettilespositions.cpp b/apps/openmw_test_suite/detournavigator/gettilespositions.cpp
index 70c6ef9a09..31ec70fc33 100644
--- a/apps/openmw_test_suite/detournavigator/gettilespositions.cpp
+++ b/apps/openmw_test_suite/detournavigator/gettilespositions.cpp
@@ -1,9 +1,9 @@
-#include <components/detournavigator/gettilespositions.hpp>
 #include <components/detournavigator/debug.hpp>
+#include <components/detournavigator/gettilespositions.hpp>
 #include <components/detournavigator/settings.hpp>
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 namespace
 {
@@ -14,17 +14,14 @@ namespace
     {
         std::vector<TilePosition>& mTilesPositions;
 
-        void operator ()(const TilePosition& value)
-        {
-            mTilesPositions.push_back(value);
-        }
+        void operator()(const TilePosition& value) { mTilesPositions.push_back(value); }
     };
 
     struct DetourNavigatorGetTilesPositionsTest : Test
     {
         RecastSettings mSettings;
         std::vector<TilePosition> mTilesPositions;
-        CollectTilesPositions mCollect {mTilesPositions};
+        CollectTilesPositions mCollect{ mTilesPositions };
 
         DetourNavigatorGetTilesPositionsTest()
         {
@@ -67,12 +64,8 @@ namespace
     {
         getTilesPositions(makeTilesPositionsRange(osg::Vec2f(-31, -31), osg::Vec2f(31, 31), mSettings), mCollect);
 
-        EXPECT_THAT(mTilesPositions, ElementsAre(
-            TilePosition(-1, -1),
-            TilePosition(-1, 0),
-            TilePosition(0, -1),
-            TilePosition(0, 0)
-        ));
+        EXPECT_THAT(mTilesPositions,
+            ElementsAre(TilePosition(-1, -1), TilePosition(-1, 0), TilePosition(0, -1), TilePosition(0, 0)));
     }
 
     TEST_F(DetourNavigatorGetTilesPositionsTest, border_size_should_extend_tile_bounds)
@@ -81,17 +74,9 @@ namespace
 
         getTilesPositions(makeTilesPositionsRange(osg::Vec2f(0, 0), osg::Vec2f(31.5, 31.5), mSettings), mCollect);
 
-        EXPECT_THAT(mTilesPositions, ElementsAre(
-            TilePosition(-1, -1),
-            TilePosition(-1, 0),
-            TilePosition(-1, 1),
-            TilePosition(0, -1),
-            TilePosition(0, 0),
-            TilePosition(0, 1),
-            TilePosition(1, -1),
-            TilePosition(1, 0),
-            TilePosition(1, 1)
-        ));
+        EXPECT_THAT(mTilesPositions,
+            ElementsAre(TilePosition(-1, -1), TilePosition(-1, 0), TilePosition(-1, 1), TilePosition(0, -1),
+                TilePosition(0, 0), TilePosition(0, 1), TilePosition(1, -1), TilePosition(1, 0), TilePosition(1, 1)));
     }
 
     TEST_F(DetourNavigatorGetTilesPositionsTest, should_apply_recast_scale_factor)
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index 1fe0cfebf7..c8b07b715a 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -1,29 +1,29 @@
 #include "operators.hpp"
 #include "settings.hpp"
 
-#include <components/detournavigator/navigatorimpl.hpp>
+#include <components/bullethelpers/heightfield.hpp>
 #include <components/detournavigator/exceptions.hpp>
+#include <components/detournavigator/navigatorimpl.hpp>
 #include <components/detournavigator/navigatorutils.hpp>
 #include <components/detournavigator/navmeshdb.hpp>
-#include <components/misc/rng.hpp>
-#include <components/loadinglistener/loadinglistener.hpp>
 #include <components/esm3/loadland.hpp>
+#include <components/loadinglistener/loadinglistener.hpp>
+#include <components/misc/rng.hpp>
 #include <components/resource/bulletshape.hpp>
-#include <components/bullethelpers/heightfield.hpp>
 
 #include <osg/ref_ptr>
 
-#include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
+#include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 #include <array>
 #include <deque>
-#include <memory>
 #include <limits>
+#include <memory>
 
 MATCHER_P3(Vec3fEq, x, y, z, "")
 {
@@ -42,7 +42,7 @@ namespace
         std::unique_ptr<Navigator> mNavigator;
         const osg::Vec3f mPlayerPosition;
         const std::string mWorldspace;
-        const AgentBounds mAgentBounds {CollisionShapeType::Aabb, {29, 29, 66}};
+        const AgentBounds mAgentBounds{ CollisionShapeType::Aabb, { 29, 29, 66 } };
         osg::Vec3f mStart;
         osg::Vec3f mEnd;
         std::deque<osg::Vec3f> mPath;
@@ -50,11 +50,11 @@ namespace
         float mStepSize;
         AreaCosts mAreaCosts;
         Loading::Listener mListener;
-        const osg::Vec2i mCellPosition {0, 0};
+        const osg::Vec2i mCellPosition{ 0, 0 };
         const int mHeightfieldTileSize = ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1);
         const float mEndTolerance = 0;
-        const btTransform mTransform {btMatrix3x3::getIdentity(), btVector3(256, 256, 0)};
-        const ObjectTransform mObjectTransform {ESM::Position {{256, 256, 0}, {0, 0, 0}}, 0.0f};
+        const btTransform mTransform{ btMatrix3x3::getIdentity(), btVector3(256, 256, 0) };
+        const ObjectTransform mObjectTransform{ ESM::Position{ { 256, 256, 0 }, { 0, 0, 0 } }, 0.0f };
 
         DetourNavigatorNavigatorTest()
             : mPlayerPosition(256, 256, 0)
@@ -64,20 +64,22 @@ namespace
             , mOut(mPath)
             , mStepSize(28.333332061767578125f)
         {
-            mNavigator.reset(new NavigatorImpl(mSettings, std::make_unique<NavMeshDb>(":memory:", std::numeric_limits<std::uint64_t>::max())));
+            mNavigator.reset(new NavigatorImpl(
+                mSettings, std::make_unique<NavMeshDb>(":memory:", std::numeric_limits<std::uint64_t>::max())));
         }
     };
 
     template <std::size_t size>
-    std::unique_ptr<btHeightfieldTerrainShape> makeSquareHeightfieldTerrainShape(const std::array<btScalar, size>& values,
-        btScalar heightScale = 1, int upAxis = 2, PHY_ScalarType heightDataType = PHY_FLOAT, bool flipQuadEdges = false)
+    std::unique_ptr<btHeightfieldTerrainShape> makeSquareHeightfieldTerrainShape(
+        const std::array<btScalar, size>& values, btScalar heightScale = 1, int upAxis = 2,
+        PHY_ScalarType heightDataType = PHY_FLOAT, bool flipQuadEdges = false)
     {
         const int width = static_cast<int>(std::sqrt(size));
         const btScalar min = *std::min_element(values.begin(), values.end());
         const btScalar max = *std::max_element(values.begin(), values.end());
         const btScalar greater = std::max(std::abs(min), std::abs(max));
-        return std::make_unique<btHeightfieldTerrainShape>(width, width, values.data(), heightScale, -greater, greater,
-                                                           upAxis, heightDataType, flipQuadEdges);
+        return std::make_unique<btHeightfieldTerrainShape>(
+            width, width, values.data(), heightScale, -greater, greater, upAxis, heightDataType, flipQuadEdges);
     }
 
     template <std::size_t size>
@@ -105,7 +107,10 @@ namespace
     class CollisionShapeInstance
     {
     public:
-        CollisionShapeInstance(std::unique_ptr<T>&& shape) : mInstance(makeBulletShapeInstance(std::move(shape))) {}
+        CollisionShapeInstance(std::unique_ptr<T>&& shape)
+            : mInstance(makeBulletShapeInstance(std::move(shape)))
+        {
+        }
 
         T& shape() { return static_cast<T&>(*mInstance->mCollisionShape); }
         const osg::ref_ptr<const Resource::BulletShapeInstance>& instance() const { return mInstance; }
@@ -121,16 +126,18 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, find_path_for_empty_should_return_empty)
     {
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
-                  Status::NavMeshNotFound);
+        EXPECT_EQ(
+            findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+            Status::NavMeshNotFound);
         EXPECT_EQ(mPath, std::deque<osg::Vec3f>());
     }
 
     TEST_F(DetourNavigatorNavigatorTest, find_path_for_existing_agent_with_no_navmesh_should_throw_exception)
     {
         mNavigator->addAgent(mAgentBounds);
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
-                  Status::StartPolygonNotFound);
+        EXPECT_EQ(
+            findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+            Status::StartPolygonNotFound);
     }
 
     TEST_F(DetourNavigatorNavigatorTest, add_agent_should_count_each_agent)
@@ -138,19 +145,20 @@ namespace
         mNavigator->addAgent(mAgentBounds);
         mNavigator->addAgent(mAgentBounds);
         mNavigator->removeAgent(mAgentBounds);
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
-                  Status::StartPolygonNotFound);
+        EXPECT_EQ(
+            findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+            Status::StartPolygonNotFound);
     }
 
     TEST_F(DetourNavigatorNavigatorTest, update_then_find_path_should_return_path)
     {
-        constexpr std::array<float, 5 * 5> heightfieldData {{
-            0,   0,    0,    0,    0, // row 0
-            0, -25,  -25,  -25,  -25, // row 1
+        constexpr std::array<float, 5 * 5> heightfieldData{ {
+            0, 0, 0, 0, 0, // row 0
+            0, -25, -25, -25, -25, // row 1
             0, -25, -100, -100, -100, // row 2
             0, -25, -100, -100, -100, // row 3
             0, -25, -100, -100, -100, // row 4
-        }};
+        } };
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
 
@@ -161,288 +169,302 @@ namespace
         updateGuard.reset();
         mNavigator->wait(WaitConditionType::requiredTilesPresent, &mListener);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
-                  Status::Success);
-
-        EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
-            Vec3fEq(76.70135498046875, 439.965301513671875, -0.9659786224365234375),
-            Vec3fEq(96.73604583740234375, 419.93060302734375, -4.002437114715576171875),
-            Vec3fEq(116.770751953125, 399.89593505859375, -7.0388965606689453125),
-            Vec3fEq(136.8054351806640625, 379.861236572265625, -11.5593852996826171875),
-            Vec3fEq(156.840118408203125, 359.826568603515625, -20.7333812713623046875),
-            Vec3fEq(176.8748016357421875, 339.7918701171875, -34.014251708984375),
-            Vec3fEq(196.90948486328125, 319.757171630859375, -47.2951202392578125),
-            Vec3fEq(216.944183349609375, 299.722503662109375, -59.4111785888671875),
-            Vec3fEq(236.9788665771484375, 279.68780517578125, -65.76436614990234375),
-            Vec3fEq(257.0135498046875, 259.65313720703125, -68.12311553955078125),
-            Vec3fEq(277.048248291015625, 239.618438720703125, -66.5666656494140625),
-            Vec3fEq(297.082916259765625, 219.583740234375, -60.305889129638671875),
-            Vec3fEq(317.11761474609375, 199.549041748046875, -49.181324005126953125),
-            Vec3fEq(337.15228271484375, 179.5143585205078125, -35.742702484130859375),
-            Vec3fEq(357.186981201171875, 159.47967529296875, -22.304073333740234375),
-            Vec3fEq(377.221649169921875, 139.4449920654296875, -12.65070629119873046875),
-            Vec3fEq(397.25634765625, 119.41030120849609375, -7.41098117828369140625),
-            Vec3fEq(417.291046142578125, 99.3756103515625, -4.382833957672119140625),
-            Vec3fEq(437.325714111328125, 79.340911865234375, -1.354687213897705078125),
-            Vec3fEq(457.360443115234375, 59.3062286376953125, 1.624610424041748046875),
-            Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)
-        )) << mPath;
+        EXPECT_EQ(
+            findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+            Status::Success);
+
+        EXPECT_THAT(mPath,
+            ElementsAre(Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
+                Vec3fEq(76.70135498046875, 439.965301513671875, -0.9659786224365234375),
+                Vec3fEq(96.73604583740234375, 419.93060302734375, -4.002437114715576171875),
+                Vec3fEq(116.770751953125, 399.89593505859375, -7.0388965606689453125),
+                Vec3fEq(136.8054351806640625, 379.861236572265625, -11.5593852996826171875),
+                Vec3fEq(156.840118408203125, 359.826568603515625, -20.7333812713623046875),
+                Vec3fEq(176.8748016357421875, 339.7918701171875, -34.014251708984375),
+                Vec3fEq(196.90948486328125, 319.757171630859375, -47.2951202392578125),
+                Vec3fEq(216.944183349609375, 299.722503662109375, -59.4111785888671875),
+                Vec3fEq(236.9788665771484375, 279.68780517578125, -65.76436614990234375),
+                Vec3fEq(257.0135498046875, 259.65313720703125, -68.12311553955078125),
+                Vec3fEq(277.048248291015625, 239.618438720703125, -66.5666656494140625),
+                Vec3fEq(297.082916259765625, 219.583740234375, -60.305889129638671875),
+                Vec3fEq(317.11761474609375, 199.549041748046875, -49.181324005126953125),
+                Vec3fEq(337.15228271484375, 179.5143585205078125, -35.742702484130859375),
+                Vec3fEq(357.186981201171875, 159.47967529296875, -22.304073333740234375),
+                Vec3fEq(377.221649169921875, 139.4449920654296875, -12.65070629119873046875),
+                Vec3fEq(397.25634765625, 119.41030120849609375, -7.41098117828369140625),
+                Vec3fEq(417.291046142578125, 99.3756103515625, -4.382833957672119140625),
+                Vec3fEq(437.325714111328125, 79.340911865234375, -1.354687213897705078125),
+                Vec3fEq(457.360443115234375, 59.3062286376953125, 1.624610424041748046875),
+                Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)))
+            << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, add_object_should_change_navmesh)
     {
         mSettings.mWaitUntilMinDistanceToPlayer = 0;
-        mNavigator.reset(new NavigatorImpl(mSettings, std::make_unique<NavMeshDb>(":memory:", std::numeric_limits<std::uint64_t>::max())));
+        mNavigator.reset(new NavigatorImpl(
+            mSettings, std::make_unique<NavMeshDb>(":memory:", std::numeric_limits<std::uint64_t>::max())));
 
-        const std::array<float, 5 * 5> heightfieldData {{
-            0,   0,    0,    0,    0, // row 0
-            0, -25,  -25,  -25,  -25, // row 1
+        const std::array<float, 5 * 5> heightfieldData{ {
+            0, 0, 0, 0, 0, // row 0
+            0, -25, -25, -25, -25, // row 1
             0, -25, -100, -100, -100, // row 2
             0, -25, -100, -100, -100, // row 3
             0, -25, -100, -100, -100, // row 4
-        }};
+        } };
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
 
         CollisionShapeInstance compound(std::make_unique<btCompoundShape>());
-        compound.shape().addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(0, 0, 0)), new btBoxShape(btVector3(20, 20, 100)));
+        compound.shape().addChildShape(
+            btTransform(btMatrix3x3::getIdentity(), btVector3(0, 0, 0)), new btBoxShape(btVector3(20, 20, 100)));
 
         mNavigator->addAgent(mAgentBounds);
         mNavigator->addHeightfield(mCellPosition, cellSize, surface, nullptr);
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
-                  Status::Success);
-
-        EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
-            Vec3fEq(76.70135498046875, 439.965301513671875, -0.9659786224365234375),
-            Vec3fEq(96.73604583740234375, 419.93060302734375, -4.002437114715576171875),
-            Vec3fEq(116.770751953125, 399.89593505859375, -7.0388965606689453125),
-            Vec3fEq(136.8054351806640625, 379.861236572265625, -11.5593852996826171875),
-            Vec3fEq(156.840118408203125, 359.826568603515625, -20.7333812713623046875),
-            Vec3fEq(176.8748016357421875, 339.7918701171875, -34.014251708984375),
-            Vec3fEq(196.90948486328125, 319.757171630859375, -47.2951202392578125),
-            Vec3fEq(216.944183349609375, 299.722503662109375, -59.4111785888671875),
-            Vec3fEq(236.9788665771484375, 279.68780517578125, -65.76436614990234375),
-            Vec3fEq(257.0135498046875, 259.65313720703125, -68.12311553955078125),
-            Vec3fEq(277.048248291015625, 239.618438720703125, -66.5666656494140625),
-            Vec3fEq(297.082916259765625, 219.583740234375, -60.305889129638671875),
-            Vec3fEq(317.11761474609375, 199.549041748046875, -49.181324005126953125),
-            Vec3fEq(337.15228271484375, 179.5143585205078125, -35.742702484130859375),
-            Vec3fEq(357.186981201171875, 159.47967529296875, -22.304073333740234375),
-            Vec3fEq(377.221649169921875, 139.4449920654296875, -12.65070629119873046875),
-            Vec3fEq(397.25634765625, 119.41030120849609375, -7.41098117828369140625),
-            Vec3fEq(417.291046142578125, 99.3756103515625, -4.382833957672119140625),
-            Vec3fEq(437.325714111328125, 79.340911865234375, -1.354687213897705078125),
-            Vec3fEq(457.360443115234375, 59.3062286376953125, 1.624610424041748046875),
-            Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)
-        )) << mPath;
+        EXPECT_EQ(
+            findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+            Status::Success);
+
+        EXPECT_THAT(mPath,
+            ElementsAre(Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
+                Vec3fEq(76.70135498046875, 439.965301513671875, -0.9659786224365234375),
+                Vec3fEq(96.73604583740234375, 419.93060302734375, -4.002437114715576171875),
+                Vec3fEq(116.770751953125, 399.89593505859375, -7.0388965606689453125),
+                Vec3fEq(136.8054351806640625, 379.861236572265625, -11.5593852996826171875),
+                Vec3fEq(156.840118408203125, 359.826568603515625, -20.7333812713623046875),
+                Vec3fEq(176.8748016357421875, 339.7918701171875, -34.014251708984375),
+                Vec3fEq(196.90948486328125, 319.757171630859375, -47.2951202392578125),
+                Vec3fEq(216.944183349609375, 299.722503662109375, -59.4111785888671875),
+                Vec3fEq(236.9788665771484375, 279.68780517578125, -65.76436614990234375),
+                Vec3fEq(257.0135498046875, 259.65313720703125, -68.12311553955078125),
+                Vec3fEq(277.048248291015625, 239.618438720703125, -66.5666656494140625),
+                Vec3fEq(297.082916259765625, 219.583740234375, -60.305889129638671875),
+                Vec3fEq(317.11761474609375, 199.549041748046875, -49.181324005126953125),
+                Vec3fEq(337.15228271484375, 179.5143585205078125, -35.742702484130859375),
+                Vec3fEq(357.186981201171875, 159.47967529296875, -22.304073333740234375),
+                Vec3fEq(377.221649169921875, 139.4449920654296875, -12.65070629119873046875),
+                Vec3fEq(397.25634765625, 119.41030120849609375, -7.41098117828369140625),
+                Vec3fEq(417.291046142578125, 99.3756103515625, -4.382833957672119140625),
+                Vec3fEq(437.325714111328125, 79.340911865234375, -1.354687213897705078125),
+                Vec3fEq(457.360443115234375, 59.3062286376953125, 1.624610424041748046875),
+                Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)))
+            << mPath;
 
         {
             auto updateGuard = mNavigator->makeUpdateGuard();
-            mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance(), mObjectTransform), mTransform, updateGuard.get());
+            mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance(), mObjectTransform),
+                mTransform, updateGuard.get());
             mNavigator->update(mPlayerPosition, updateGuard.get());
         }
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
         mPath.clear();
         mOut = std::back_inserter(mPath);
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
-                  Status::Success);
-
-        EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
-            Vec3fEq(69.5299530029296875, 434.754913330078125, -2.6775772571563720703125),
-            Vec3fEq(82.39324951171875, 409.50982666015625, -7.355137348175048828125),
-            Vec3fEq(95.25653839111328125, 384.2647705078125, -12.0326976776123046875),
-            Vec3fEq(108.11983489990234375, 359.019683837890625, -16.71025848388671875),
-            Vec3fEq(120.983123779296875, 333.774627685546875, -21.3878192901611328125),
-            Vec3fEq(133.8464202880859375, 308.529541015625, -26.0653781890869140625),
-            Vec3fEq(146.7097015380859375, 283.284454345703125, -30.7429370880126953125),
-            Vec3fEq(159.572998046875, 258.039398193359375, -35.420497894287109375),
-            Vec3fEq(172.4362945556640625, 232.7943115234375, -27.2731761932373046875),
-            Vec3fEq(185.2996063232421875, 207.54925537109375, -19.575878143310546875),
-            Vec3fEq(206.6449737548828125, 188.917236328125, -20.3511219024658203125),
-            Vec3fEq(227.9903564453125, 170.28521728515625, -22.9776935577392578125),
-            Vec3fEq(253.4362640380859375, 157.8239593505859375, -31.1692962646484375),
-            Vec3fEq(278.8822021484375, 145.3627166748046875, -30.253124237060546875),
-            Vec3fEq(304.328094482421875, 132.9014739990234375, -22.219127655029296875),
-            Vec3fEq(329.774017333984375, 120.44022369384765625, -13.2701435089111328125),
-            Vec3fEq(355.219940185546875, 107.97898101806640625, -5.330339908599853515625),
-            Vec3fEq(380.665863037109375, 95.51773834228515625, -3.5501649379730224609375),
-            Vec3fEq(406.111785888671875, 83.05649566650390625, -1.76998889446258544921875),
-            Vec3fEq(431.557708740234375, 70.5952606201171875, 0.01018683053553104400634765625),
-            Vec3fEq(457.003662109375, 58.134021759033203125, 1.79036080837249755859375),
-            Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)
-        )) << mPath;
+        EXPECT_EQ(
+            findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+            Status::Success);
+
+        EXPECT_THAT(mPath,
+            ElementsAre(Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
+                Vec3fEq(69.5299530029296875, 434.754913330078125, -2.6775772571563720703125),
+                Vec3fEq(82.39324951171875, 409.50982666015625, -7.355137348175048828125),
+                Vec3fEq(95.25653839111328125, 384.2647705078125, -12.0326976776123046875),
+                Vec3fEq(108.11983489990234375, 359.019683837890625, -16.71025848388671875),
+                Vec3fEq(120.983123779296875, 333.774627685546875, -21.3878192901611328125),
+                Vec3fEq(133.8464202880859375, 308.529541015625, -26.0653781890869140625),
+                Vec3fEq(146.7097015380859375, 283.284454345703125, -30.7429370880126953125),
+                Vec3fEq(159.572998046875, 258.039398193359375, -35.420497894287109375),
+                Vec3fEq(172.4362945556640625, 232.7943115234375, -27.2731761932373046875),
+                Vec3fEq(185.2996063232421875, 207.54925537109375, -19.575878143310546875),
+                Vec3fEq(206.6449737548828125, 188.917236328125, -20.3511219024658203125),
+                Vec3fEq(227.9903564453125, 170.28521728515625, -22.9776935577392578125),
+                Vec3fEq(253.4362640380859375, 157.8239593505859375, -31.1692962646484375),
+                Vec3fEq(278.8822021484375, 145.3627166748046875, -30.253124237060546875),
+                Vec3fEq(304.328094482421875, 132.9014739990234375, -22.219127655029296875),
+                Vec3fEq(329.774017333984375, 120.44022369384765625, -13.2701435089111328125),
+                Vec3fEq(355.219940185546875, 107.97898101806640625, -5.330339908599853515625),
+                Vec3fEq(380.665863037109375, 95.51773834228515625, -3.5501649379730224609375),
+                Vec3fEq(406.111785888671875, 83.05649566650390625, -1.76998889446258544921875),
+                Vec3fEq(431.557708740234375, 70.5952606201171875, 0.01018683053553104400634765625),
+                Vec3fEq(457.003662109375, 58.134021759033203125, 1.79036080837249755859375),
+                Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)))
+            << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, update_changed_object_should_change_navmesh)
     {
-        const std::array<float, 5 * 5> heightfieldData {{
-            0,   0,    0,    0,    0, // row 0
-            0, -25,  -25,  -25,  -25, // row 1
+        const std::array<float, 5 * 5> heightfieldData{ {
+            0, 0, 0, 0, 0, // row 0
+            0, -25, -25, -25, -25, // row 1
             0, -25, -100, -100, -100, // row 2
             0, -25, -100, -100, -100, // row 3
             0, -25, -100, -100, -100, // row 4
-        }};
+        } };
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
 
         CollisionShapeInstance compound(std::make_unique<btCompoundShape>());
-        compound.shape().addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(0, 0, 0)), new btBoxShape(btVector3(20, 20, 100)));
+        compound.shape().addChildShape(
+            btTransform(btMatrix3x3::getIdentity(), btVector3(0, 0, 0)), new btBoxShape(btVector3(20, 20, 100)));
 
         mNavigator->addAgent(mAgentBounds);
         mNavigator->addHeightfield(mCellPosition, cellSize, surface, nullptr);
-        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance(), mObjectTransform), mTransform, nullptr);
+        mNavigator->addObject(
+            ObjectId(&compound.shape()), ObjectShapes(compound.instance(), mObjectTransform), mTransform, nullptr);
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
-                  Status::Success);
-
-        EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
-            Vec3fEq(69.5299530029296875, 434.754913330078125, -2.6775772571563720703125),
-            Vec3fEq(82.39324951171875, 409.50982666015625, -7.355137348175048828125),
-            Vec3fEq(95.25653839111328125, 384.2647705078125, -12.0326976776123046875),
-            Vec3fEq(108.11983489990234375, 359.019683837890625, -16.71025848388671875),
-            Vec3fEq(120.983123779296875, 333.774627685546875, -21.3878192901611328125),
-            Vec3fEq(133.8464202880859375, 308.529541015625, -26.0653781890869140625),
-            Vec3fEq(146.7097015380859375, 283.284454345703125, -30.7429370880126953125),
-            Vec3fEq(159.572998046875, 258.039398193359375, -35.420497894287109375),
-            Vec3fEq(172.4362945556640625, 232.7943115234375, -27.2731761932373046875),
-            Vec3fEq(185.2996063232421875, 207.54925537109375, -19.575878143310546875),
-            Vec3fEq(206.6449737548828125, 188.917236328125, -20.3511219024658203125),
-            Vec3fEq(227.9903564453125, 170.28521728515625, -22.9776935577392578125),
-            Vec3fEq(253.4362640380859375, 157.8239593505859375, -31.1692962646484375),
-            Vec3fEq(278.8822021484375, 145.3627166748046875, -30.253124237060546875),
-            Vec3fEq(304.328094482421875, 132.9014739990234375, -22.219127655029296875),
-            Vec3fEq(329.774017333984375, 120.44022369384765625, -13.2701435089111328125),
-            Vec3fEq(355.219940185546875, 107.97898101806640625, -5.330339908599853515625),
-            Vec3fEq(380.665863037109375, 95.51773834228515625, -3.5501649379730224609375),
-            Vec3fEq(406.111785888671875, 83.05649566650390625, -1.76998889446258544921875),
-            Vec3fEq(431.557708740234375, 70.5952606201171875, 0.01018683053553104400634765625),
-            Vec3fEq(457.003662109375, 58.134021759033203125, 1.79036080837249755859375),
-            Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)
-        )) << mPath;
+        EXPECT_EQ(
+            findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+            Status::Success);
+
+        EXPECT_THAT(mPath,
+            ElementsAre(Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
+                Vec3fEq(69.5299530029296875, 434.754913330078125, -2.6775772571563720703125),
+                Vec3fEq(82.39324951171875, 409.50982666015625, -7.355137348175048828125),
+                Vec3fEq(95.25653839111328125, 384.2647705078125, -12.0326976776123046875),
+                Vec3fEq(108.11983489990234375, 359.019683837890625, -16.71025848388671875),
+                Vec3fEq(120.983123779296875, 333.774627685546875, -21.3878192901611328125),
+                Vec3fEq(133.8464202880859375, 308.529541015625, -26.0653781890869140625),
+                Vec3fEq(146.7097015380859375, 283.284454345703125, -30.7429370880126953125),
+                Vec3fEq(159.572998046875, 258.039398193359375, -35.420497894287109375),
+                Vec3fEq(172.4362945556640625, 232.7943115234375, -27.2731761932373046875),
+                Vec3fEq(185.2996063232421875, 207.54925537109375, -19.575878143310546875),
+                Vec3fEq(206.6449737548828125, 188.917236328125, -20.3511219024658203125),
+                Vec3fEq(227.9903564453125, 170.28521728515625, -22.9776935577392578125),
+                Vec3fEq(253.4362640380859375, 157.8239593505859375, -31.1692962646484375),
+                Vec3fEq(278.8822021484375, 145.3627166748046875, -30.253124237060546875),
+                Vec3fEq(304.328094482421875, 132.9014739990234375, -22.219127655029296875),
+                Vec3fEq(329.774017333984375, 120.44022369384765625, -13.2701435089111328125),
+                Vec3fEq(355.219940185546875, 107.97898101806640625, -5.330339908599853515625),
+                Vec3fEq(380.665863037109375, 95.51773834228515625, -3.5501649379730224609375),
+                Vec3fEq(406.111785888671875, 83.05649566650390625, -1.76998889446258544921875),
+                Vec3fEq(431.557708740234375, 70.5952606201171875, 0.01018683053553104400634765625),
+                Vec3fEq(457.003662109375, 58.134021759033203125, 1.79036080837249755859375),
+                Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)))
+            << mPath;
 
         compound.shape().updateChildTransform(0, btTransform(btMatrix3x3::getIdentity(), btVector3(1000, 0, 0)));
 
-        mNavigator->updateObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance(), mObjectTransform), mTransform, nullptr);
+        mNavigator->updateObject(
+            ObjectId(&compound.shape()), ObjectShapes(compound.instance(), mObjectTransform), mTransform, nullptr);
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
         mPath.clear();
         mOut = std::back_inserter(mPath);
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
-                  Status::Success);
-
-        EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
-            Vec3fEq(76.70135498046875, 439.965301513671875, -0.9659786224365234375),
-            Vec3fEq(96.73604583740234375, 419.93060302734375, -4.002437114715576171875),
-            Vec3fEq(116.770751953125, 399.89593505859375, -7.0388965606689453125),
-            Vec3fEq(136.8054351806640625, 379.861236572265625, -11.5593852996826171875),
-            Vec3fEq(156.840118408203125, 359.826568603515625, -20.7333812713623046875),
-            Vec3fEq(176.8748016357421875, 339.7918701171875, -34.014251708984375),
-            Vec3fEq(196.90948486328125, 319.757171630859375, -47.2951202392578125),
-            Vec3fEq(216.944183349609375, 299.722503662109375, -59.4111785888671875),
-            Vec3fEq(236.9788665771484375, 279.68780517578125, -65.76436614990234375),
-            Vec3fEq(257.0135498046875, 259.65313720703125, -68.12311553955078125),
-            Vec3fEq(277.048248291015625, 239.618438720703125, -66.5666656494140625),
-            Vec3fEq(297.082916259765625, 219.583740234375, -60.305889129638671875),
-            Vec3fEq(317.11761474609375, 199.549041748046875, -49.181324005126953125),
-            Vec3fEq(337.15228271484375, 179.5143585205078125, -35.742702484130859375),
-            Vec3fEq(357.186981201171875, 159.47967529296875, -22.304073333740234375),
-            Vec3fEq(377.221649169921875, 139.4449920654296875, -12.65070629119873046875),
-            Vec3fEq(397.25634765625, 119.41030120849609375, -7.41098117828369140625),
-            Vec3fEq(417.291046142578125, 99.3756103515625, -4.382833957672119140625),
-            Vec3fEq(437.325714111328125, 79.340911865234375, -1.354687213897705078125),
-            Vec3fEq(457.360443115234375, 59.3062286376953125, 1.624610424041748046875),
-            Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)
-        )) << mPath;
+        EXPECT_EQ(
+            findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+            Status::Success);
+
+        EXPECT_THAT(mPath,
+            ElementsAre(Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
+                Vec3fEq(76.70135498046875, 439.965301513671875, -0.9659786224365234375),
+                Vec3fEq(96.73604583740234375, 419.93060302734375, -4.002437114715576171875),
+                Vec3fEq(116.770751953125, 399.89593505859375, -7.0388965606689453125),
+                Vec3fEq(136.8054351806640625, 379.861236572265625, -11.5593852996826171875),
+                Vec3fEq(156.840118408203125, 359.826568603515625, -20.7333812713623046875),
+                Vec3fEq(176.8748016357421875, 339.7918701171875, -34.014251708984375),
+                Vec3fEq(196.90948486328125, 319.757171630859375, -47.2951202392578125),
+                Vec3fEq(216.944183349609375, 299.722503662109375, -59.4111785888671875),
+                Vec3fEq(236.9788665771484375, 279.68780517578125, -65.76436614990234375),
+                Vec3fEq(257.0135498046875, 259.65313720703125, -68.12311553955078125),
+                Vec3fEq(277.048248291015625, 239.618438720703125, -66.5666656494140625),
+                Vec3fEq(297.082916259765625, 219.583740234375, -60.305889129638671875),
+                Vec3fEq(317.11761474609375, 199.549041748046875, -49.181324005126953125),
+                Vec3fEq(337.15228271484375, 179.5143585205078125, -35.742702484130859375),
+                Vec3fEq(357.186981201171875, 159.47967529296875, -22.304073333740234375),
+                Vec3fEq(377.221649169921875, 139.4449920654296875, -12.65070629119873046875),
+                Vec3fEq(397.25634765625, 119.41030120849609375, -7.41098117828369140625),
+                Vec3fEq(417.291046142578125, 99.3756103515625, -4.382833957672119140625),
+                Vec3fEq(437.325714111328125, 79.340911865234375, -1.354687213897705078125),
+                Vec3fEq(457.360443115234375, 59.3062286376953125, 1.624610424041748046875),
+                Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)))
+            << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, for_overlapping_heightfields_objects_should_use_higher)
     {
-        const std::array<btScalar, 5 * 5> heightfieldData1 {{
-            0,   0,    0,    0,    0, // row 0
-            0, -25,  -25,  -25,  -25, // row 1
+        const std::array<btScalar, 5 * 5> heightfieldData1{ {
+            0, 0, 0, 0, 0, // row 0
+            0, -25, -25, -25, -25, // row 1
             0, -25, -100, -100, -100, // row 2
             0, -25, -100, -100, -100, // row 3
             0, -25, -100, -100, -100, // row 4
-        }};
+        } };
         CollisionShapeInstance heightfield1(makeSquareHeightfieldTerrainShape(heightfieldData1));
         heightfield1.shape().setLocalScaling(btVector3(128, 128, 1));
 
-        const std::array<btScalar, 5 * 5> heightfieldData2 {{
+        const std::array<btScalar, 5 * 5> heightfieldData2{ {
             -25, -25, -25, -25, -25, // row 0
             -25, -25, -25, -25, -25, // row 1
             -25, -25, -25, -25, -25, // row 2
             -25, -25, -25, -25, -25, // row 3
             -25, -25, -25, -25, -25, // row 4
-        }};
+        } };
         CollisionShapeInstance heightfield2(makeSquareHeightfieldTerrainShape(heightfieldData2));
         heightfield2.shape().setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentBounds);
-        mNavigator->addObject(ObjectId(&heightfield1.shape()), ObjectShapes(heightfield1.instance(), mObjectTransform), mTransform, nullptr);
-        mNavigator->addObject(ObjectId(&heightfield2.shape()), ObjectShapes(heightfield2.instance(), mObjectTransform), mTransform, nullptr);
+        mNavigator->addObject(ObjectId(&heightfield1.shape()), ObjectShapes(heightfield1.instance(), mObjectTransform),
+            mTransform, nullptr);
+        mNavigator->addObject(ObjectId(&heightfield2.shape()), ObjectShapes(heightfield2.instance(), mObjectTransform),
+            mTransform, nullptr);
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
-                  Status::Success);
-
-        EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
-            Vec3fEq(76.70135498046875, 439.965301513671875, -0.903246104717254638671875),
-            Vec3fEq(96.73604583740234375, 419.93060302734375, -3.8064472675323486328125),
-            Vec3fEq(116.770751953125, 399.89593505859375, -6.709649562835693359375),
-            Vec3fEq(136.8054351806640625, 379.861236572265625, -9.33333873748779296875),
-            Vec3fEq(156.840118408203125, 359.826568603515625, -9.33333873748779296875),
-            Vec3fEq(176.8748016357421875, 339.7918701171875, -9.33333873748779296875),
-            Vec3fEq(196.90948486328125, 319.757171630859375, -9.33333873748779296875),
-            Vec3fEq(216.944183349609375, 299.722503662109375, -9.33333873748779296875),
-            Vec3fEq(236.9788665771484375, 279.68780517578125, -9.33333873748779296875),
-            Vec3fEq(257.0135498046875, 259.65313720703125, -9.33333873748779296875),
-            Vec3fEq(277.048248291015625, 239.618438720703125, -9.33333873748779296875),
-            Vec3fEq(297.082916259765625, 219.583740234375, -9.33333873748779296875),
-            Vec3fEq(317.11761474609375, 199.549041748046875, -9.33333873748779296875),
-            Vec3fEq(337.15228271484375, 179.5143585205078125, -9.33333873748779296875),
-            Vec3fEq(357.186981201171875, 159.47967529296875, -9.33333873748779296875),
-            Vec3fEq(377.221649169921875, 139.4449920654296875, -9.33333873748779296875),
-            Vec3fEq(397.25634765625, 119.41030120849609375, -6.891522884368896484375),
-            Vec3fEq(417.291046142578125, 99.3756103515625, -4.053897380828857421875),
-            Vec3fEq(437.325714111328125, 79.340911865234375, -1.21627247333526611328125),
-            Vec3fEq(457.360443115234375, 59.3062286376953125, 1.621352672576904296875),
-            Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)
-        )) << mPath;
+        EXPECT_EQ(
+            findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+            Status::Success);
+
+        EXPECT_THAT(mPath,
+            ElementsAre(Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
+                Vec3fEq(76.70135498046875, 439.965301513671875, -0.903246104717254638671875),
+                Vec3fEq(96.73604583740234375, 419.93060302734375, -3.8064472675323486328125),
+                Vec3fEq(116.770751953125, 399.89593505859375, -6.709649562835693359375),
+                Vec3fEq(136.8054351806640625, 379.861236572265625, -9.33333873748779296875),
+                Vec3fEq(156.840118408203125, 359.826568603515625, -9.33333873748779296875),
+                Vec3fEq(176.8748016357421875, 339.7918701171875, -9.33333873748779296875),
+                Vec3fEq(196.90948486328125, 319.757171630859375, -9.33333873748779296875),
+                Vec3fEq(216.944183349609375, 299.722503662109375, -9.33333873748779296875),
+                Vec3fEq(236.9788665771484375, 279.68780517578125, -9.33333873748779296875),
+                Vec3fEq(257.0135498046875, 259.65313720703125, -9.33333873748779296875),
+                Vec3fEq(277.048248291015625, 239.618438720703125, -9.33333873748779296875),
+                Vec3fEq(297.082916259765625, 219.583740234375, -9.33333873748779296875),
+                Vec3fEq(317.11761474609375, 199.549041748046875, -9.33333873748779296875),
+                Vec3fEq(337.15228271484375, 179.5143585205078125, -9.33333873748779296875),
+                Vec3fEq(357.186981201171875, 159.47967529296875, -9.33333873748779296875),
+                Vec3fEq(377.221649169921875, 139.4449920654296875, -9.33333873748779296875),
+                Vec3fEq(397.25634765625, 119.41030120849609375, -6.891522884368896484375),
+                Vec3fEq(417.291046142578125, 99.3756103515625, -4.053897380828857421875),
+                Vec3fEq(437.325714111328125, 79.340911865234375, -1.21627247333526611328125),
+                Vec3fEq(457.360443115234375, 59.3062286376953125, 1.621352672576904296875),
+                Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)))
+            << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, only_one_heightfield_per_cell_is_allowed)
     {
-        const std::array<float, 5 * 5> heightfieldData1 {{
-            0,   0,    0,    0,    0, // row 0
-            0, -25,  -25,  -25,  -25, // row 1
+        const std::array<float, 5 * 5> heightfieldData1{ {
+            0, 0, 0, 0, 0, // row 0
+            0, -25, -25, -25, -25, // row 1
             0, -25, -100, -100, -100, // row 2
             0, -25, -100, -100, -100, // row 3
             0, -25, -100, -100, -100, // row 4
-        }};
+        } };
         const HeightfieldSurface surface1 = makeSquareHeightfieldSurface(heightfieldData1);
         const int cellSize1 = mHeightfieldTileSize * (surface1.mSize - 1);
 
-        const std::array<float, 5 * 5> heightfieldData2 {{
+        const std::array<float, 5 * 5> heightfieldData2{ {
             -25, -25, -25, -25, -25, // row 0
             -25, -25, -25, -25, -25, // row 1
             -25, -25, -25, -25, -25, // row 2
             -25, -25, -25, -25, -25, // row 3
             -25, -25, -25, -25, -25, // row 4
-        }};
+        } };
         const HeightfieldSurface surface2 = makeSquareHeightfieldSurface(heightfieldData2);
         const int cellSize2 = mHeightfieldTileSize * (surface2.mSize - 1);
 
@@ -464,74 +486,77 @@ namespace
     {
         osg::ref_ptr<Resource::BulletShape> bulletShape(new Resource::BulletShape);
 
-        std::array<btScalar, 5 * 5> heightfieldData {{
-            0,   0,    0,    0,    0, // row 0
-            0, -25,  -25,  -25,  -25, // row 1
+        std::array<btScalar, 5 * 5> heightfieldData{ {
+            0, 0, 0, 0, 0, // row 0
+            0, -25, -25, -25, -25, // row 1
             0, -25, -100, -100, -100, // row 2
             0, -25, -100, -100, -100, // row 3
             0, -25, -100, -100, -100, // row 4
-        }};
+        } };
         std::unique_ptr<btHeightfieldTerrainShape> shapePtr = makeSquareHeightfieldTerrainShape(heightfieldData);
         shapePtr->setLocalScaling(btVector3(128, 128, 1));
         bulletShape->mCollisionShape.reset(shapePtr.release());
 
-        std::array<btScalar, 5 * 5> heightfieldDataAvoid {{
+        std::array<btScalar, 5 * 5> heightfieldDataAvoid{ {
             -25, -25, -25, -25, -25, // row 0
             -25, -25, -25, -25, -25, // row 1
             -25, -25, -25, -25, -25, // row 2
             -25, -25, -25, -25, -25, // row 3
             -25, -25, -25, -25, -25, // row 4
-        }};
-        std::unique_ptr<btHeightfieldTerrainShape> shapeAvoidPtr = makeSquareHeightfieldTerrainShape(heightfieldDataAvoid);
+        } };
+        std::unique_ptr<btHeightfieldTerrainShape> shapeAvoidPtr
+            = makeSquareHeightfieldTerrainShape(heightfieldDataAvoid);
         shapeAvoidPtr->setLocalScaling(btVector3(128, 128, 1));
         bulletShape->mAvoidCollisionShape.reset(shapeAvoidPtr.release());
 
         osg::ref_ptr<const Resource::BulletShapeInstance> instance(new Resource::BulletShapeInstance(bulletShape));
 
         mNavigator->addAgent(mAgentBounds);
-        mNavigator->addObject(ObjectId(instance->mCollisionShape.get()), ObjectShapes(instance, mObjectTransform), mTransform, nullptr);
+        mNavigator->addObject(
+            ObjectId(instance->mCollisionShape.get()), ObjectShapes(instance, mObjectTransform), mTransform, nullptr);
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
-                  Status::Success);
-
-        EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
-            Vec3fEq(69.013885498046875, 434.49853515625, -0.74384129047393798828125),
-            Vec3fEq(81.36110687255859375, 408.997100830078125, -3.4876689910888671875),
-            Vec3fEq(93.7083282470703125, 383.495635986328125, -6.2314929962158203125),
-            Vec3fEq(106.0555419921875, 357.99420166015625, -8.97531890869140625),
-            Vec3fEq(118.40276336669921875, 332.49273681640625, -11.7191448211669921875),
-            Vec3fEq(130.7499847412109375, 306.991302490234375, -14.4629726409912109375),
-            Vec3fEq(143.0972137451171875, 281.4898681640625, -17.206798553466796875),
-            Vec3fEq(155.4444122314453125, 255.9884033203125, -19.9506206512451171875),
-            Vec3fEq(167.7916412353515625, 230.4869537353515625, -19.91887664794921875),
-            Vec3fEq(189.053619384765625, 211.75982666015625, -20.1138629913330078125),
-            Vec3fEq(210.3155975341796875, 193.032684326171875, -20.3088512420654296875),
-            Vec3fEq(231.577606201171875, 174.3055419921875, -20.503841400146484375),
-            Vec3fEq(252.839599609375, 155.5784149169921875, -19.9803981781005859375),
-            Vec3fEq(278.407989501953125, 143.3704071044921875, -17.2675113677978515625),
-            Vec3fEq(303.976348876953125, 131.16241455078125, -14.55462360382080078125),
-            Vec3fEq(329.54473876953125, 118.9544219970703125, -11.84173583984375),
-            Vec3fEq(355.11309814453125, 106.74642181396484375, -9.12884807586669921875),
-            Vec3fEq(380.681488037109375, 94.538421630859375, -6.4159603118896484375),
-            Vec3fEq(406.249847412109375, 82.33042144775390625, -3.7030735015869140625),
-            Vec3fEq(431.8182373046875, 70.1224365234375, -0.990187108516693115234375),
-            Vec3fEq(457.38665771484375, 57.9144439697265625, 1.72269880771636962890625),
-            Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)
-        )) << mPath;
+        EXPECT_EQ(
+            findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+            Status::Success);
+
+        EXPECT_THAT(mPath,
+            ElementsAre(Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
+                Vec3fEq(69.013885498046875, 434.49853515625, -0.74384129047393798828125),
+                Vec3fEq(81.36110687255859375, 408.997100830078125, -3.4876689910888671875),
+                Vec3fEq(93.7083282470703125, 383.495635986328125, -6.2314929962158203125),
+                Vec3fEq(106.0555419921875, 357.99420166015625, -8.97531890869140625),
+                Vec3fEq(118.40276336669921875, 332.49273681640625, -11.7191448211669921875),
+                Vec3fEq(130.7499847412109375, 306.991302490234375, -14.4629726409912109375),
+                Vec3fEq(143.0972137451171875, 281.4898681640625, -17.206798553466796875),
+                Vec3fEq(155.4444122314453125, 255.9884033203125, -19.9506206512451171875),
+                Vec3fEq(167.7916412353515625, 230.4869537353515625, -19.91887664794921875),
+                Vec3fEq(189.053619384765625, 211.75982666015625, -20.1138629913330078125),
+                Vec3fEq(210.3155975341796875, 193.032684326171875, -20.3088512420654296875),
+                Vec3fEq(231.577606201171875, 174.3055419921875, -20.503841400146484375),
+                Vec3fEq(252.839599609375, 155.5784149169921875, -19.9803981781005859375),
+                Vec3fEq(278.407989501953125, 143.3704071044921875, -17.2675113677978515625),
+                Vec3fEq(303.976348876953125, 131.16241455078125, -14.55462360382080078125),
+                Vec3fEq(329.54473876953125, 118.9544219970703125, -11.84173583984375),
+                Vec3fEq(355.11309814453125, 106.74642181396484375, -9.12884807586669921875),
+                Vec3fEq(380.681488037109375, 94.538421630859375, -6.4159603118896484375),
+                Vec3fEq(406.249847412109375, 82.33042144775390625, -3.7030735015869140625),
+                Vec3fEq(431.8182373046875, 70.1224365234375, -0.990187108516693115234375),
+                Vec3fEq(457.38665771484375, 57.9144439697265625, 1.72269880771636962890625),
+                Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)))
+            << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, path_should_be_over_water_ground_lower_than_water_with_only_swim_flag)
     {
-        std::array<float, 5 * 5> heightfieldData {{
-            -50,  -50,  -50,  -50,    0, // row 0
-            -50, -100, -150, -100,  -50, // row 1
+        std::array<float, 5 * 5> heightfieldData{ {
+            -50, -50, -50, -50, 0, // row 0
+            -50, -100, -150, -100, -50, // row 1
             -50, -150, -200, -150, -100, // row 2
             -50, -100, -150, -100, -100, // row 3
-              0,  -50, -100, -100, -100, // row 4
-        }};
+            0, -50, -100, -100, -100, // row 4
+        } };
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
 
@@ -546,40 +571,36 @@ namespace
         mEnd.x() = 256;
         mEnd.z() = 300;
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_swim, mAreaCosts, mEndTolerance, mOut),
-                  Status::Success);
-
-        EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(256, 460, 185.33331298828125),
-            Vec3fEq(256, 431.666656494140625, 185.33331298828125),
-            Vec3fEq(256, 403.33331298828125, 185.33331298828125),
-            Vec3fEq(256, 375, 185.33331298828125),
-            Vec3fEq(256, 346.666656494140625, 185.33331298828125),
-            Vec3fEq(256, 318.33331298828125, 185.33331298828125),
-            Vec3fEq(256, 290, 185.33331298828125),
-            Vec3fEq(256, 261.666656494140625, 185.33331298828125),
-            Vec3fEq(256, 233.3333282470703125, 185.33331298828125),
-            Vec3fEq(256, 205, 185.33331298828125),
-            Vec3fEq(256, 176.6666717529296875, 185.33331298828125),
-            Vec3fEq(256, 148.3333282470703125, 185.33331298828125),
-            Vec3fEq(256, 120, 185.33331298828125),
-            Vec3fEq(256, 91.6666717529296875, 185.33331298828125),
-            Vec3fEq(255.999969482421875, 63.33333587646484375, 185.33331298828125),
-            Vec3fEq(255.999969482421875, 56.66666412353515625, 185.33331298828125)
-        )) << mPath;
+        EXPECT_EQ(
+            findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_swim, mAreaCosts, mEndTolerance, mOut),
+            Status::Success);
+
+        EXPECT_THAT(mPath,
+            ElementsAre(Vec3fEq(256, 460, 185.33331298828125), Vec3fEq(256, 431.666656494140625, 185.33331298828125),
+                Vec3fEq(256, 403.33331298828125, 185.33331298828125), Vec3fEq(256, 375, 185.33331298828125),
+                Vec3fEq(256, 346.666656494140625, 185.33331298828125),
+                Vec3fEq(256, 318.33331298828125, 185.33331298828125), Vec3fEq(256, 290, 185.33331298828125),
+                Vec3fEq(256, 261.666656494140625, 185.33331298828125),
+                Vec3fEq(256, 233.3333282470703125, 185.33331298828125), Vec3fEq(256, 205, 185.33331298828125),
+                Vec3fEq(256, 176.6666717529296875, 185.33331298828125),
+                Vec3fEq(256, 148.3333282470703125, 185.33331298828125), Vec3fEq(256, 120, 185.33331298828125),
+                Vec3fEq(256, 91.6666717529296875, 185.33331298828125),
+                Vec3fEq(255.999969482421875, 63.33333587646484375, 185.33331298828125),
+                Vec3fEq(255.999969482421875, 56.66666412353515625, 185.33331298828125)))
+            << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, path_should_be_over_water_when_ground_cross_water_with_swim_and_walk_flags)
     {
-        std::array<float, 7 * 7> heightfieldData {{
-            0,    0,    0,    0,    0,    0, 0, // row 0
+        std::array<float, 7 * 7> heightfieldData{ {
+            0, 0, 0, 0, 0, 0, 0, // row 0
             0, -100, -100, -100, -100, -100, 0, // row 1
             0, -100, -150, -150, -150, -100, 0, // row 2
             0, -100, -150, -200, -150, -100, 0, // row 3
             0, -100, -150, -150, -150, -100, 0, // row 4
             0, -100, -100, -100, -100, -100, 0, // row 5
-            0,    0,    0,    0,    0,    0, 0, // row 6
-        }};
+            0, 0, 0, 0, 0, 0, 0, // row 6
+        } };
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
 
@@ -592,40 +613,37 @@ namespace
         mStart.x() = 256;
         mEnd.x() = 256;
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mEndTolerance, mOut),
-                  Status::Success);
-
-        EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(256, 460, -129.4098663330078125),
-            Vec3fEq(256, 431.666656494140625, -129.6970062255859375),
-            Vec3fEq(256, 403.33331298828125, -129.6970062255859375),
-            Vec3fEq(256, 375, -129.4439239501953125),
-            Vec3fEq(256, 346.666656494140625, -129.02587890625),
-            Vec3fEq(256, 318.33331298828125, -128.6078338623046875),
-            Vec3fEq(256, 290, -128.1021728515625),
-            Vec3fEq(256, 261.666656494140625, -126.46875),
-            Vec3fEq(256, 233.3333282470703125, -119.4891357421875),
-            Vec3fEq(256, 205, -110.62021636962890625),
-            Vec3fEq(256, 176.6666717529296875, -101.7512969970703125),
-            Vec3fEq(256, 148.3333282470703125, -92.88237762451171875),
-            Vec3fEq(256, 120, -75.29378509521484375),
-            Vec3fEq(256, 91.6666717529296875, -55.201839447021484375),
-            Vec3fEq(256.000030517578125, 63.33333587646484375, -34.800380706787109375),
-            Vec3fEq(256.000030517578125, 56.66666412353515625, -30.00003814697265625)
-        )) << mPath;
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts,
+                      mEndTolerance, mOut),
+            Status::Success);
+
+        EXPECT_THAT(mPath,
+            ElementsAre(Vec3fEq(256, 460, -129.4098663330078125),
+                Vec3fEq(256, 431.666656494140625, -129.6970062255859375),
+                Vec3fEq(256, 403.33331298828125, -129.6970062255859375), Vec3fEq(256, 375, -129.4439239501953125),
+                Vec3fEq(256, 346.666656494140625, -129.02587890625),
+                Vec3fEq(256, 318.33331298828125, -128.6078338623046875), Vec3fEq(256, 290, -128.1021728515625),
+                Vec3fEq(256, 261.666656494140625, -126.46875), Vec3fEq(256, 233.3333282470703125, -119.4891357421875),
+                Vec3fEq(256, 205, -110.62021636962890625), Vec3fEq(256, 176.6666717529296875, -101.7512969970703125),
+                Vec3fEq(256, 148.3333282470703125, -92.88237762451171875), Vec3fEq(256, 120, -75.29378509521484375),
+                Vec3fEq(256, 91.6666717529296875, -55.201839447021484375),
+                Vec3fEq(256.000030517578125, 63.33333587646484375, -34.800380706787109375),
+                Vec3fEq(256.000030517578125, 56.66666412353515625, -30.00003814697265625)))
+            << mPath;
     }
 
-    TEST_F(DetourNavigatorNavigatorTest, path_should_be_over_water_when_ground_cross_water_with_max_int_cells_size_and_swim_and_walk_flags)
+    TEST_F(DetourNavigatorNavigatorTest,
+        path_should_be_over_water_when_ground_cross_water_with_max_int_cells_size_and_swim_and_walk_flags)
     {
-        std::array<float, 7 * 7> heightfieldData {{
-            0,    0,    0,    0,    0,    0, 0, // row 0
+        std::array<float, 7 * 7> heightfieldData{ {
+            0, 0, 0, 0, 0, 0, 0, // row 0
             0, -100, -100, -100, -100, -100, 0, // row 1
             0, -100, -150, -150, -150, -100, 0, // row 2
             0, -100, -150, -200, -150, -100, 0, // row 3
             0, -100, -150, -150, -150, -100, 0, // row 4
             0, -100, -100, -100, -100, -100, 0, // row 5
-            0,    0,    0,    0,    0,    0, 0, // row 6
-        }};
+            0, 0, 0, 0, 0, 0, 0, // row 6
+        } };
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
 
@@ -638,40 +656,36 @@ namespace
         mStart.x() = 256;
         mEnd.x() = 256;
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mEndTolerance, mOut),
-                  Status::Success);
-
-        EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(256, 460, -129.4098663330078125),
-            Vec3fEq(256, 431.666656494140625, -129.6970062255859375),
-            Vec3fEq(256, 403.33331298828125, -129.6970062255859375),
-            Vec3fEq(256, 375, -129.4439239501953125),
-            Vec3fEq(256, 346.666656494140625, -129.02587890625),
-            Vec3fEq(256, 318.33331298828125, -128.6078338623046875),
-            Vec3fEq(256, 290, -128.1021728515625),
-            Vec3fEq(256, 261.666656494140625, -126.46875),
-            Vec3fEq(256, 233.3333282470703125, -119.4891357421875),
-            Vec3fEq(256, 205, -110.62021636962890625),
-            Vec3fEq(256, 176.6666717529296875, -101.7512969970703125),
-            Vec3fEq(256, 148.3333282470703125, -92.88237762451171875),
-            Vec3fEq(256, 120, -75.29378509521484375),
-            Vec3fEq(256, 91.6666717529296875, -55.201839447021484375),
-            Vec3fEq(256.000030517578125, 63.33333587646484375, -34.800380706787109375),
-            Vec3fEq(256.000030517578125, 56.66666412353515625, -30.00003814697265625)
-        )) << mPath;
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts,
+                      mEndTolerance, mOut),
+            Status::Success);
+
+        EXPECT_THAT(mPath,
+            ElementsAre(Vec3fEq(256, 460, -129.4098663330078125),
+                Vec3fEq(256, 431.666656494140625, -129.6970062255859375),
+                Vec3fEq(256, 403.33331298828125, -129.6970062255859375), Vec3fEq(256, 375, -129.4439239501953125),
+                Vec3fEq(256, 346.666656494140625, -129.02587890625),
+                Vec3fEq(256, 318.33331298828125, -128.6078338623046875), Vec3fEq(256, 290, -128.1021728515625),
+                Vec3fEq(256, 261.666656494140625, -126.46875), Vec3fEq(256, 233.3333282470703125, -119.4891357421875),
+                Vec3fEq(256, 205, -110.62021636962890625), Vec3fEq(256, 176.6666717529296875, -101.7512969970703125),
+                Vec3fEq(256, 148.3333282470703125, -92.88237762451171875), Vec3fEq(256, 120, -75.29378509521484375),
+                Vec3fEq(256, 91.6666717529296875, -55.201839447021484375),
+                Vec3fEq(256.000030517578125, 63.33333587646484375, -34.800380706787109375),
+                Vec3fEq(256.000030517578125, 56.66666412353515625, -30.00003814697265625)))
+            << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, path_should_be_over_ground_when_ground_cross_water_with_only_walk_flag)
     {
-        std::array<float, 7 * 7> heightfieldData {{
-            0,    0,    0,    0,    0,    0, 0, // row 0
+        std::array<float, 7 * 7> heightfieldData{ {
+            0, 0, 0, 0, 0, 0, 0, // row 0
             0, -100, -100, -100, -100, -100, 0, // row 1
             0, -100, -150, -150, -150, -100, 0, // row 2
             0, -100, -150, -200, -150, -100, 0, // row 3
             0, -100, -150, -150, -150, -100, 0, // row 4
             0, -100, -100, -100, -100, -100, 0, // row 5
-            0,    0,    0,    0,    0,    0, 0, // row 6
-        }};
+            0, 0, 0, 0, 0, 0, 0, // row 6
+        } };
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
 
@@ -684,43 +698,40 @@ namespace
         mStart.x() = 256;
         mEnd.x() = 256;
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
-                  Status::Success);
-
-        EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(256, 460, -129.4098663330078125),
-            Vec3fEq(256, 431.666656494140625, -129.6970062255859375),
-            Vec3fEq(256, 403.33331298828125, -129.6970062255859375),
-            Vec3fEq(256, 375, -129.4439239501953125),
-            Vec3fEq(256, 346.666656494140625, -129.02587890625),
-            Vec3fEq(256, 318.33331298828125, -128.6078338623046875),
-            Vec3fEq(256, 290, -128.1021728515625),
-            Vec3fEq(256, 261.666656494140625, -126.46875),
-            Vec3fEq(256, 233.3333282470703125, -119.4891357421875),
-            Vec3fEq(256, 205, -110.62021636962890625),
-            Vec3fEq(256, 176.6666717529296875, -101.7512969970703125),
-            Vec3fEq(256, 148.3333282470703125, -92.88237762451171875),
-            Vec3fEq(256, 120, -75.29378509521484375),
-            Vec3fEq(256, 91.6666717529296875, -55.201839447021484375),
-            Vec3fEq(256.000030517578125, 63.33333587646484375, -34.800380706787109375),
-            Vec3fEq(256.000030517578125, 56.66666412353515625, -30.00003814697265625)
-        )) << mPath;
+        EXPECT_EQ(
+            findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+            Status::Success);
+
+        EXPECT_THAT(mPath,
+            ElementsAre(Vec3fEq(256, 460, -129.4098663330078125),
+                Vec3fEq(256, 431.666656494140625, -129.6970062255859375),
+                Vec3fEq(256, 403.33331298828125, -129.6970062255859375), Vec3fEq(256, 375, -129.4439239501953125),
+                Vec3fEq(256, 346.666656494140625, -129.02587890625),
+                Vec3fEq(256, 318.33331298828125, -128.6078338623046875), Vec3fEq(256, 290, -128.1021728515625),
+                Vec3fEq(256, 261.666656494140625, -126.46875), Vec3fEq(256, 233.3333282470703125, -119.4891357421875),
+                Vec3fEq(256, 205, -110.62021636962890625), Vec3fEq(256, 176.6666717529296875, -101.7512969970703125),
+                Vec3fEq(256, 148.3333282470703125, -92.88237762451171875), Vec3fEq(256, 120, -75.29378509521484375),
+                Vec3fEq(256, 91.6666717529296875, -55.201839447021484375),
+                Vec3fEq(256.000030517578125, 63.33333587646484375, -34.800380706787109375),
+                Vec3fEq(256.000030517578125, 56.66666412353515625, -30.00003814697265625)))
+            << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, update_object_remove_and_update_then_find_path_should_return_path)
     {
-        const std::array<btScalar, 5 * 5> heightfieldData {{
-            0,   0,    0,    0,    0, // row 0
-            0, -25,  -25,  -25,  -25, // row 1
+        const std::array<btScalar, 5 * 5> heightfieldData{ {
+            0, 0, 0, 0, 0, // row 0
+            0, -25, -25, -25, -25, // row 1
             0, -25, -100, -100, -100, // row 2
             0, -25, -100, -100, -100, // row 3
             0, -25, -100, -100, -100, // row 4
-        }};
+        } };
         CollisionShapeInstance heightfield(makeSquareHeightfieldTerrainShape(heightfieldData));
         heightfield.shape().setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentBounds);
-        mNavigator->addObject(ObjectId(&heightfield.shape()), ObjectShapes(heightfield.instance(), mObjectTransform), mTransform, nullptr);
+        mNavigator->addObject(ObjectId(&heightfield.shape()), ObjectShapes(heightfield.instance(), mObjectTransform),
+            mTransform, nullptr);
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
@@ -728,48 +739,50 @@ namespace
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
-        mNavigator->addObject(ObjectId(&heightfield.shape()), ObjectShapes(heightfield.instance(), mObjectTransform), mTransform, nullptr);
+        mNavigator->addObject(ObjectId(&heightfield.shape()), ObjectShapes(heightfield.instance(), mObjectTransform),
+            mTransform, nullptr);
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
-                  Status::Success);
-
-        EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
-            Vec3fEq(76.70135498046875, 439.965301513671875, -0.9659786224365234375),
-            Vec3fEq(96.73604583740234375, 419.93060302734375, -4.002437114715576171875),
-            Vec3fEq(116.770751953125, 399.89593505859375, -7.0388965606689453125),
-            Vec3fEq(136.8054351806640625, 379.861236572265625, -11.5593852996826171875),
-            Vec3fEq(156.840118408203125, 359.826568603515625, -20.7333812713623046875),
-            Vec3fEq(176.8748016357421875, 339.7918701171875, -34.014251708984375),
-            Vec3fEq(196.90948486328125, 319.757171630859375, -47.2951202392578125),
-            Vec3fEq(216.944183349609375, 299.722503662109375, -59.4111785888671875),
-            Vec3fEq(236.9788665771484375, 279.68780517578125, -65.76436614990234375),
-            Vec3fEq(257.0135498046875, 259.65313720703125, -68.12311553955078125),
-            Vec3fEq(277.048248291015625, 239.618438720703125, -66.5666656494140625),
-            Vec3fEq(297.082916259765625, 219.583740234375, -60.305889129638671875),
-            Vec3fEq(317.11761474609375, 199.549041748046875, -49.181324005126953125),
-            Vec3fEq(337.15228271484375, 179.5143585205078125, -35.742702484130859375),
-            Vec3fEq(357.186981201171875, 159.47967529296875, -22.304073333740234375),
-            Vec3fEq(377.221649169921875, 139.4449920654296875, -12.65070629119873046875),
-            Vec3fEq(397.25634765625, 119.41030120849609375, -7.41098117828369140625),
-            Vec3fEq(417.291046142578125, 99.3756103515625, -4.382833957672119140625),
-            Vec3fEq(437.325714111328125, 79.340911865234375, -1.354687213897705078125),
-            Vec3fEq(457.360443115234375, 59.3062286376953125, 1.624610424041748046875),
-            Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)
-        )) << mPath;
+        EXPECT_EQ(
+            findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+            Status::Success);
+
+        EXPECT_THAT(mPath,
+            ElementsAre(Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
+                Vec3fEq(76.70135498046875, 439.965301513671875, -0.9659786224365234375),
+                Vec3fEq(96.73604583740234375, 419.93060302734375, -4.002437114715576171875),
+                Vec3fEq(116.770751953125, 399.89593505859375, -7.0388965606689453125),
+                Vec3fEq(136.8054351806640625, 379.861236572265625, -11.5593852996826171875),
+                Vec3fEq(156.840118408203125, 359.826568603515625, -20.7333812713623046875),
+                Vec3fEq(176.8748016357421875, 339.7918701171875, -34.014251708984375),
+                Vec3fEq(196.90948486328125, 319.757171630859375, -47.2951202392578125),
+                Vec3fEq(216.944183349609375, 299.722503662109375, -59.4111785888671875),
+                Vec3fEq(236.9788665771484375, 279.68780517578125, -65.76436614990234375),
+                Vec3fEq(257.0135498046875, 259.65313720703125, -68.12311553955078125),
+                Vec3fEq(277.048248291015625, 239.618438720703125, -66.5666656494140625),
+                Vec3fEq(297.082916259765625, 219.583740234375, -60.305889129638671875),
+                Vec3fEq(317.11761474609375, 199.549041748046875, -49.181324005126953125),
+                Vec3fEq(337.15228271484375, 179.5143585205078125, -35.742702484130859375),
+                Vec3fEq(357.186981201171875, 159.47967529296875, -22.304073333740234375),
+                Vec3fEq(377.221649169921875, 139.4449920654296875, -12.65070629119873046875),
+                Vec3fEq(397.25634765625, 119.41030120849609375, -7.41098117828369140625),
+                Vec3fEq(417.291046142578125, 99.3756103515625, -4.382833957672119140625),
+                Vec3fEq(437.325714111328125, 79.340911865234375, -1.354687213897705078125),
+                Vec3fEq(457.360443115234375, 59.3062286376953125, 1.624610424041748046875),
+                Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)))
+            << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, update_heightfield_remove_and_update_then_find_path_should_return_path)
     {
-        const std::array<float, 5 * 5> heightfieldData {{
-            0,   0,    0,    0,    0, // row 0
-            0, -25,  -25,  -25,  -25, // row 1
+        const std::array<float, 5 * 5> heightfieldData{ {
+            0, 0, 0, 0, 0, // row 0
+            0, -25, -25, -25, -25, // row 1
             0, -25, -100, -100, -100, // row 2
             0, -25, -100, -100, -100, // row 3
             0, -25, -100, -100, -100, // row 4
-        }};
+        } };
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
 
@@ -786,45 +799,46 @@ namespace
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
-                  Status::Success);
-
-        EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
-            Vec3fEq(76.70135498046875, 439.965301513671875, -0.9659786224365234375),
-            Vec3fEq(96.73604583740234375, 419.93060302734375, -4.002437114715576171875),
-            Vec3fEq(116.770751953125, 399.89593505859375, -7.0388965606689453125),
-            Vec3fEq(136.8054351806640625, 379.861236572265625, -11.5593852996826171875),
-            Vec3fEq(156.840118408203125, 359.826568603515625, -20.7333812713623046875),
-            Vec3fEq(176.8748016357421875, 339.7918701171875, -34.014251708984375),
-            Vec3fEq(196.90948486328125, 319.757171630859375, -47.2951202392578125),
-            Vec3fEq(216.944183349609375, 299.722503662109375, -59.4111785888671875),
-            Vec3fEq(236.9788665771484375, 279.68780517578125, -65.76436614990234375),
-            Vec3fEq(257.0135498046875, 259.65313720703125, -68.12311553955078125),
-            Vec3fEq(277.048248291015625, 239.618438720703125, -66.5666656494140625),
-            Vec3fEq(297.082916259765625, 219.583740234375, -60.305889129638671875),
-            Vec3fEq(317.11761474609375, 199.549041748046875, -49.181324005126953125),
-            Vec3fEq(337.15228271484375, 179.5143585205078125, -35.742702484130859375),
-            Vec3fEq(357.186981201171875, 159.47967529296875, -22.304073333740234375),
-            Vec3fEq(377.221649169921875, 139.4449920654296875, -12.65070629119873046875),
-            Vec3fEq(397.25634765625, 119.41030120849609375, -7.41098117828369140625),
-            Vec3fEq(417.291046142578125, 99.3756103515625, -4.382833957672119140625),
-            Vec3fEq(437.325714111328125, 79.340911865234375, -1.354687213897705078125),
-            Vec3fEq(457.360443115234375, 59.3062286376953125, 1.624610424041748046875),
-            Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)
-        )) << mPath;
+        EXPECT_EQ(
+            findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+            Status::Success);
+
+        EXPECT_THAT(mPath,
+            ElementsAre(Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
+                Vec3fEq(76.70135498046875, 439.965301513671875, -0.9659786224365234375),
+                Vec3fEq(96.73604583740234375, 419.93060302734375, -4.002437114715576171875),
+                Vec3fEq(116.770751953125, 399.89593505859375, -7.0388965606689453125),
+                Vec3fEq(136.8054351806640625, 379.861236572265625, -11.5593852996826171875),
+                Vec3fEq(156.840118408203125, 359.826568603515625, -20.7333812713623046875),
+                Vec3fEq(176.8748016357421875, 339.7918701171875, -34.014251708984375),
+                Vec3fEq(196.90948486328125, 319.757171630859375, -47.2951202392578125),
+                Vec3fEq(216.944183349609375, 299.722503662109375, -59.4111785888671875),
+                Vec3fEq(236.9788665771484375, 279.68780517578125, -65.76436614990234375),
+                Vec3fEq(257.0135498046875, 259.65313720703125, -68.12311553955078125),
+                Vec3fEq(277.048248291015625, 239.618438720703125, -66.5666656494140625),
+                Vec3fEq(297.082916259765625, 219.583740234375, -60.305889129638671875),
+                Vec3fEq(317.11761474609375, 199.549041748046875, -49.181324005126953125),
+                Vec3fEq(337.15228271484375, 179.5143585205078125, -35.742702484130859375),
+                Vec3fEq(357.186981201171875, 159.47967529296875, -22.304073333740234375),
+                Vec3fEq(377.221649169921875, 139.4449920654296875, -12.65070629119873046875),
+                Vec3fEq(397.25634765625, 119.41030120849609375, -7.41098117828369140625),
+                Vec3fEq(417.291046142578125, 99.3756103515625, -4.382833957672119140625),
+                Vec3fEq(437.325714111328125, 79.340911865234375, -1.354687213897705078125),
+                Vec3fEq(457.360443115234375, 59.3062286376953125, 1.624610424041748046875),
+                Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)))
+            << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, update_then_find_random_point_around_circle_should_return_position)
     {
-        const std::array<float, 6 * 6> heightfieldData {{
-            0,   0,     0,     0,    0,    0, // row 0
-            0, -25,   -25,   -25,  -25,  -25, // row 1
+        const std::array<float, 6 * 6> heightfieldData{ {
+            0, 0, 0, 0, 0, 0, // row 0
+            0, -25, -25, -25, -25, -25, // row 1
             0, -25, -1000, -1000, -100, -100, // row 2
             0, -25, -1000, -1000, -100, -100, // row 3
-            0, -25,  -100,  -100, -100, -100, // row 4
-            0, -25,  -100,  -100, -100, -100, // row 5
-        }};
+            0, -25, -100, -100, -100, -100, // row 4
+            0, -25, -100, -100, -100, -100, // row 5
+        } };
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
 
@@ -835,8 +849,8 @@ namespace
 
         Misc::Rng::init(42);
 
-        const auto result = findRandomPointAroundCircle(*mNavigator, mAgentBounds, mStart, 100.0, Flag_walk,
-            []() { return Misc::Rng::rollClosedProbability(); });
+        const auto result = findRandomPointAroundCircle(
+            *mNavigator, mAgentBounds, mStart, 100.0, Flag_walk, []() { return Misc::Rng::rollClosedProbability(); });
 
         ASSERT_THAT(result, Optional(Vec3fEq(70.35845947265625, 335.592041015625, -2.6667339801788330078125)))
             << (result ? *result : osg::Vec3f());
@@ -849,21 +863,23 @@ namespace
     TEST_F(DetourNavigatorNavigatorTest, multiple_threads_should_lock_tiles)
     {
         mSettings.mAsyncNavMeshUpdaterThreads = 2;
-        mNavigator.reset(new NavigatorImpl(mSettings, std::make_unique<NavMeshDb>(":memory:", std::numeric_limits<std::uint64_t>::max())));
+        mNavigator.reset(new NavigatorImpl(
+            mSettings, std::make_unique<NavMeshDb>(":memory:", std::numeric_limits<std::uint64_t>::max())));
 
-        const std::array<float, 5 * 5> heightfieldData {{
-            0,   0,    0,    0,    0, // row 0
-            0, -25,  -25,  -25,  -25, // row 1
+        const std::array<float, 5 * 5> heightfieldData{ {
+            0, 0, 0, 0, 0, // row 0
+            0, -25, -25, -25, -25, // row 1
             0, -25, -100, -100, -100, // row 2
             0, -25, -100, -100, -100, // row 3
             0, -25, -100, -100, -100, // row 4
-        }};
+        } };
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
         const btVector3 shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         std::vector<CollisionShapeInstance<btBoxShape>> boxes;
-        std::generate_n(std::back_inserter(boxes), 100, [] { return std::make_unique<btBoxShape>(btVector3(20, 20, 100)); });
+        std::generate_n(
+            std::back_inserter(boxes), 100, [] { return std::make_unique<btBoxShape>(btVector3(20, 20, 100)); });
 
         mNavigator->addAgent(mAgentBounds);
 
@@ -871,62 +887,69 @@ namespace
 
         for (std::size_t i = 0; i < boxes.size(); ++i)
         {
-            const btTransform transform(btMatrix3x3::getIdentity(), btVector3(shift.x() + i * 10, shift.y() + i * 10, i * 10));
-            mNavigator->addObject(ObjectId(&boxes[i].shape()), ObjectShapes(boxes[i].instance(), mObjectTransform), transform, nullptr);
+            const btTransform transform(
+                btMatrix3x3::getIdentity(), btVector3(shift.x() + i * 10, shift.y() + i * 10, i * 10));
+            mNavigator->addObject(
+                ObjectId(&boxes[i].shape()), ObjectShapes(boxes[i].instance(), mObjectTransform), transform, nullptr);
         }
 
         std::this_thread::sleep_for(std::chrono::microseconds(1));
 
         for (std::size_t i = 0; i < boxes.size(); ++i)
         {
-            const btTransform transform(btMatrix3x3::getIdentity(), btVector3(shift.x() + i * 10 + 1, shift.y() + i * 10 + 1, i * 10 + 1));
-            mNavigator->updateObject(ObjectId(&boxes[i].shape()), ObjectShapes(boxes[i].instance(), mObjectTransform), transform, nullptr);
+            const btTransform transform(
+                btMatrix3x3::getIdentity(), btVector3(shift.x() + i * 10 + 1, shift.y() + i * 10 + 1, i * 10 + 1));
+            mNavigator->updateObject(
+                ObjectId(&boxes[i].shape()), ObjectShapes(boxes[i].instance(), mObjectTransform), transform, nullptr);
         }
 
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
-                  Status::Success);
-
-        EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
-            Vec3fEq(69.5299530029296875, 434.754913330078125, -2.6775772571563720703125),
-            Vec3fEq(82.39324951171875, 409.50982666015625, -7.355137348175048828125),
-            Vec3fEq(95.25653839111328125, 384.2647705078125, -12.0326976776123046875),
-            Vec3fEq(108.11983489990234375, 359.019683837890625, -16.71025848388671875),
-            Vec3fEq(120.983123779296875, 333.774627685546875, -21.3878192901611328125),
-            Vec3fEq(133.8464202880859375, 308.529541015625, -26.0653781890869140625),
-            Vec3fEq(146.7097015380859375, 283.284454345703125, -30.7429370880126953125),
-            Vec3fEq(159.572998046875, 258.039398193359375, -35.420497894287109375),
-            Vec3fEq(172.4362945556640625, 232.7943115234375, -27.2731761932373046875),
-            Vec3fEq(185.2996063232421875, 207.54925537109375, -20.3612518310546875),
-            Vec3fEq(206.6449737548828125, 188.917236328125, -20.578319549560546875),
-            Vec3fEq(227.9903564453125, 170.28521728515625, -26.291717529296875),
-            Vec3fEq(253.4362640380859375, 157.8239593505859375, -34.784488677978515625),
-            Vec3fEq(278.8822021484375, 145.3627166748046875, -30.253124237060546875),
-            Vec3fEq(304.328094482421875, 132.9014739990234375, -25.72176361083984375),
-            Vec3fEq(329.774017333984375, 120.44022369384765625, -21.1904010772705078125),
-            Vec3fEq(355.219940185546875, 107.97898101806640625, -16.6590404510498046875),
-            Vec3fEq(380.665863037109375, 95.51773834228515625, -12.127681732177734375),
-            Vec3fEq(406.111785888671875, 83.05649566650390625, -7.5963191986083984375),
-            Vec3fEq(431.557708740234375, 70.5952606201171875, -3.0649592876434326171875),
-            Vec3fEq(457.003662109375, 58.134021759033203125, 1.4664003849029541015625),
-            Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)
-        )) << mPath;
+        EXPECT_EQ(
+            findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+            Status::Success);
+
+        EXPECT_THAT(mPath,
+            ElementsAre(Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
+                Vec3fEq(69.5299530029296875, 434.754913330078125, -2.6775772571563720703125),
+                Vec3fEq(82.39324951171875, 409.50982666015625, -7.355137348175048828125),
+                Vec3fEq(95.25653839111328125, 384.2647705078125, -12.0326976776123046875),
+                Vec3fEq(108.11983489990234375, 359.019683837890625, -16.71025848388671875),
+                Vec3fEq(120.983123779296875, 333.774627685546875, -21.3878192901611328125),
+                Vec3fEq(133.8464202880859375, 308.529541015625, -26.0653781890869140625),
+                Vec3fEq(146.7097015380859375, 283.284454345703125, -30.7429370880126953125),
+                Vec3fEq(159.572998046875, 258.039398193359375, -35.420497894287109375),
+                Vec3fEq(172.4362945556640625, 232.7943115234375, -27.2731761932373046875),
+                Vec3fEq(185.2996063232421875, 207.54925537109375, -20.3612518310546875),
+                Vec3fEq(206.6449737548828125, 188.917236328125, -20.578319549560546875),
+                Vec3fEq(227.9903564453125, 170.28521728515625, -26.291717529296875),
+                Vec3fEq(253.4362640380859375, 157.8239593505859375, -34.784488677978515625),
+                Vec3fEq(278.8822021484375, 145.3627166748046875, -30.253124237060546875),
+                Vec3fEq(304.328094482421875, 132.9014739990234375, -25.72176361083984375),
+                Vec3fEq(329.774017333984375, 120.44022369384765625, -21.1904010772705078125),
+                Vec3fEq(355.219940185546875, 107.97898101806640625, -16.6590404510498046875),
+                Vec3fEq(380.665863037109375, 95.51773834228515625, -12.127681732177734375),
+                Vec3fEq(406.111785888671875, 83.05649566650390625, -7.5963191986083984375),
+                Vec3fEq(431.557708740234375, 70.5952606201171875, -3.0649592876434326171875),
+                Vec3fEq(457.003662109375, 58.134021759033203125, 1.4664003849029541015625),
+                Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)))
+            << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, update_changed_multiple_times_object_should_delay_navmesh_change)
     {
         std::vector<CollisionShapeInstance<btBoxShape>> shapes;
-        std::generate_n(std::back_inserter(shapes), 100, [] { return std::make_unique<btBoxShape>(btVector3(64, 64, 64)); });
+        std::generate_n(
+            std::back_inserter(shapes), 100, [] { return std::make_unique<btBoxShape>(btVector3(64, 64, 64)); });
 
         mNavigator->addAgent(mAgentBounds);
 
         for (std::size_t i = 0; i < shapes.size(); ++i)
         {
             const btTransform transform(btMatrix3x3::getIdentity(), btVector3(i * 32, i * 32, i * 32));
-            mNavigator->addObject(ObjectId(&shapes[i].shape()), ObjectShapes(shapes[i].instance(), mObjectTransform), transform, nullptr);
+            mNavigator->addObject(
+                ObjectId(&shapes[i].shape()), ObjectShapes(shapes[i].instance(), mObjectTransform), transform, nullptr);
         }
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
@@ -935,7 +958,8 @@ namespace
         for (std::size_t i = 0; i < shapes.size(); ++i)
         {
             const btTransform transform(btMatrix3x3::getIdentity(), btVector3(i * 32 + 1, i * 32 + 1, i * 32 + 1));
-            mNavigator->updateObject(ObjectId(&shapes[i].shape()), ObjectShapes(shapes[i].instance(), mObjectTransform), transform, nullptr);
+            mNavigator->updateObject(
+                ObjectId(&shapes[i].shape()), ObjectShapes(shapes[i].instance(), mObjectTransform), transform, nullptr);
         }
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
@@ -943,7 +967,8 @@ namespace
         for (std::size_t i = 0; i < shapes.size(); ++i)
         {
             const btTransform transform(btMatrix3x3::getIdentity(), btVector3(i * 32 + 2, i * 32 + 2, i * 32 + 2));
-            mNavigator->updateObject(ObjectId(&shapes[i].shape()), ObjectShapes(shapes[i].instance(), mObjectTransform), transform, nullptr);
+            mNavigator->updateObject(
+                ObjectId(&shapes[i].shape()), ObjectShapes(shapes[i].instance(), mObjectTransform), transform, nullptr);
         }
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
@@ -956,13 +981,13 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, update_then_raycast_should_return_position)
     {
-        const std::array<float, 5 * 5> heightfieldData {{
-            0,   0,    0,    0,    0, // row 0
-            0, -25,  -25,  -25,  -25, // row 1
+        const std::array<float, 5 * 5> heightfieldData{ {
+            0, 0, 0, 0, 0, // row 0
+            0, -25, -25, -25, -25, // row 1
             0, -25, -100, -100, -100, // row 2
             0, -25, -100, -100, -100, // row 3
             0, -25, -100, -100, -100, // row 4
-        }};
+        } };
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
 
@@ -979,15 +1004,16 @@ namespace
             << (result ? *result : osg::Vec3f());
     }
 
-    TEST_F(DetourNavigatorNavigatorTest, update_for_oscillating_object_that_does_not_change_navmesh_should_not_trigger_navmesh_update)
+    TEST_F(DetourNavigatorNavigatorTest,
+        update_for_oscillating_object_that_does_not_change_navmesh_should_not_trigger_navmesh_update)
     {
-        const std::array<float, 5 * 5> heightfieldData {{
-            0,   0,    0,    0,    0, // row 0
-            0, -25,  -25,  -25,  -25, // row 1
+        const std::array<float, 5 * 5> heightfieldData{ {
+            0, 0, 0, 0, 0, // row 0
+            0, -25, -25, -25, -25, // row 1
             0, -25, -100, -100, -100, // row 2
             0, -25, -100, -100, -100, // row 3
             0, -25, -100, -100, -100, // row 4
-        }};
+        } };
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
 
@@ -997,15 +1023,16 @@ namespace
 
         mNavigator->addAgent(mAgentBounds);
         mNavigator->addHeightfield(mCellPosition, cellSize, surface, nullptr);
-        mNavigator->addObject(ObjectId(&oscillatingBox.shape()), ObjectShapes(oscillatingBox.instance(), mObjectTransform),
-                              btTransform(btMatrix3x3::getIdentity(), oscillatingBoxShapePosition), nullptr);
+        mNavigator->addObject(ObjectId(&oscillatingBox.shape()),
+            ObjectShapes(oscillatingBox.instance(), mObjectTransform),
+            btTransform(btMatrix3x3::getIdentity(), oscillatingBoxShapePosition), nullptr);
         // add this box to make navmesh bound box independent from oscillatingBoxShape rotations
         mNavigator->addObject(ObjectId(&borderBox.shape()), ObjectShapes(borderBox.instance(), mObjectTransform),
-                              btTransform(btMatrix3x3::getIdentity(), oscillatingBoxShapePosition + btVector3(0, 0, 200)), nullptr);
+            btTransform(btMatrix3x3::getIdentity(), oscillatingBoxShapePosition + btVector3(0, 0, 200)), nullptr);
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
-        const Version expectedVersion {1, 4};
+        const Version expectedVersion{ 1, 4 };
 
         const auto navMeshes = mNavigator->getNavMeshes();
         ASSERT_EQ(navMeshes.size(), 1);
@@ -1013,9 +1040,10 @@ namespace
 
         for (int n = 0; n < 10; ++n)
         {
-            const btTransform transform(btQuaternion(btVector3(0, 0, 1), n * 2 * osg::PI / 10),
-                                        oscillatingBoxShapePosition);
-            mNavigator->updateObject(ObjectId(&oscillatingBox.shape()), ObjectShapes(oscillatingBox.instance(), mObjectTransform), transform, nullptr);
+            const btTransform transform(
+                btQuaternion(btVector3(0, 0, 1), n * 2 * osg::PI / 10), oscillatingBoxShapePosition);
+            mNavigator->updateObject(ObjectId(&oscillatingBox.shape()),
+                ObjectShapes(oscillatingBox.instance(), mObjectTransform), transform, nullptr);
             mNavigator->update(mPlayerPosition, nullptr);
             mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
         }
@@ -1026,7 +1054,7 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, should_provide_path_over_flat_heightfield)
     {
-        const HeightfieldPlane plane {100};
+        const HeightfieldPlane plane{ 100 };
         const int cellSize = mHeightfieldTileSize * 4;
 
         mNavigator->addAgent(mAgentBounds);
@@ -1034,121 +1062,126 @@ namespace
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::requiredTilesPresent, &mListener);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
-                  Status::Success);
-
-        EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(56.66666412353515625, 460, 101.99999237060546875),
-            Vec3fEq(76.70135498046875, 439.965301513671875, 101.99999237060546875),
-            Vec3fEq(96.73604583740234375, 419.93060302734375, 101.99999237060546875),
-            Vec3fEq(116.770751953125, 399.89593505859375, 101.99999237060546875),
-            Vec3fEq(136.8054351806640625, 379.861236572265625, 101.99999237060546875),
-            Vec3fEq(156.840118408203125, 359.826568603515625, 101.99999237060546875),
-            Vec3fEq(176.8748016357421875, 339.7918701171875, 101.99999237060546875),
-            Vec3fEq(196.90948486328125, 319.757171630859375, 101.99999237060546875),
-            Vec3fEq(216.944183349609375, 299.722503662109375, 101.99999237060546875),
-            Vec3fEq(236.9788665771484375, 279.68780517578125, 101.99999237060546875),
-            Vec3fEq(257.0135498046875, 259.65313720703125, 101.99999237060546875),
-            Vec3fEq(277.048248291015625, 239.618438720703125, 101.99999237060546875),
-            Vec3fEq(297.082916259765625, 219.583740234375, 101.99999237060546875),
-            Vec3fEq(317.11761474609375, 199.549041748046875, 101.99999237060546875),
-            Vec3fEq(337.15228271484375, 179.5143585205078125, 101.99999237060546875),
-            Vec3fEq(357.186981201171875, 159.47967529296875, 101.99999237060546875),
-            Vec3fEq(377.221649169921875, 139.4449920654296875, 101.99999237060546875),
-            Vec3fEq(397.25634765625, 119.41030120849609375, 101.99999237060546875),
-            Vec3fEq(417.291046142578125, 99.3756103515625, 101.99999237060546875),
-            Vec3fEq(437.325714111328125, 79.340911865234375, 101.99999237060546875),
-            Vec3fEq(457.360443115234375, 59.3062286376953125, 101.99999237060546875),
-            Vec3fEq(460, 56.66666412353515625, 101.99999237060546875)
-        )) << mPath;
+        EXPECT_EQ(
+            findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+            Status::Success);
+
+        EXPECT_THAT(mPath,
+            ElementsAre(Vec3fEq(56.66666412353515625, 460, 101.99999237060546875),
+                Vec3fEq(76.70135498046875, 439.965301513671875, 101.99999237060546875),
+                Vec3fEq(96.73604583740234375, 419.93060302734375, 101.99999237060546875),
+                Vec3fEq(116.770751953125, 399.89593505859375, 101.99999237060546875),
+                Vec3fEq(136.8054351806640625, 379.861236572265625, 101.99999237060546875),
+                Vec3fEq(156.840118408203125, 359.826568603515625, 101.99999237060546875),
+                Vec3fEq(176.8748016357421875, 339.7918701171875, 101.99999237060546875),
+                Vec3fEq(196.90948486328125, 319.757171630859375, 101.99999237060546875),
+                Vec3fEq(216.944183349609375, 299.722503662109375, 101.99999237060546875),
+                Vec3fEq(236.9788665771484375, 279.68780517578125, 101.99999237060546875),
+                Vec3fEq(257.0135498046875, 259.65313720703125, 101.99999237060546875),
+                Vec3fEq(277.048248291015625, 239.618438720703125, 101.99999237060546875),
+                Vec3fEq(297.082916259765625, 219.583740234375, 101.99999237060546875),
+                Vec3fEq(317.11761474609375, 199.549041748046875, 101.99999237060546875),
+                Vec3fEq(337.15228271484375, 179.5143585205078125, 101.99999237060546875),
+                Vec3fEq(357.186981201171875, 159.47967529296875, 101.99999237060546875),
+                Vec3fEq(377.221649169921875, 139.4449920654296875, 101.99999237060546875),
+                Vec3fEq(397.25634765625, 119.41030120849609375, 101.99999237060546875),
+                Vec3fEq(417.291046142578125, 99.3756103515625, 101.99999237060546875),
+                Vec3fEq(437.325714111328125, 79.340911865234375, 101.99999237060546875),
+                Vec3fEq(457.360443115234375, 59.3062286376953125, 101.99999237060546875),
+                Vec3fEq(460, 56.66666412353515625, 101.99999237060546875)))
+            << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, for_not_reachable_destination_find_path_should_provide_partial_path)
     {
-        const std::array<float, 5 * 5> heightfieldData {{
-            0,   0,    0,    0,    0, // row 0
-            0, -25,  -25,  -25,  -25, // row 1
+        const std::array<float, 5 * 5> heightfieldData{ {
+            0, 0, 0, 0, 0, // row 0
+            0, -25, -25, -25, -25, // row 1
             0, -25, -100, -100, -100, // row 2
             0, -25, -100, -100, -100, // row 3
             0, -25, -100, -100, -100, // row 4
-        }};
+        } };
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
 
         CollisionShapeInstance compound(std::make_unique<btCompoundShape>());
         compound.shape().addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(204, -204, 0)),
-                                       new btBoxShape(btVector3(200, 200, 1000)));
+            new btBoxShape(btVector3(200, 200, 1000)));
 
         mNavigator->addAgent(mAgentBounds);
         mNavigator->addHeightfield(mCellPosition, cellSize, surface, nullptr);
-        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance(), mObjectTransform), mTransform, nullptr);
+        mNavigator->addObject(
+            ObjectId(&compound.shape()), ObjectShapes(compound.instance(), mObjectTransform), mTransform, nullptr);
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
-                  Status::PartialPath);
-
-        EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(56.66664886474609375, 460, -2.5371043682098388671875),
-            Vec3fEq(76.42063140869140625, 439.6884765625, -2.9134314060211181640625),
-            Vec3fEq(96.17461395263671875, 419.376953125, -4.50826549530029296875),
-            Vec3fEq(115.9285888671875, 399.0654296875, -6.1030979156494140625),
-            Vec3fEq(135.6825714111328125, 378.753936767578125, -7.697928905487060546875),
-            Vec3fEq(155.436553955078125, 358.442413330078125, -20.9574985504150390625),
-            Vec3fEq(175.190521240234375, 338.130889892578125, -35.907512664794921875),
-            Vec3fEq(194.9445037841796875, 317.8193359375, -50.85752105712890625),
-            Vec3fEq(214.698486328125, 297.5078125, -65.807525634765625),
-            Vec3fEq(222.0001068115234375, 290.000091552734375, -71.333465576171875)
-        )) << mPath;
+        EXPECT_EQ(
+            findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+            Status::PartialPath);
+
+        EXPECT_THAT(mPath,
+            ElementsAre(Vec3fEq(56.66664886474609375, 460, -2.5371043682098388671875),
+                Vec3fEq(76.42063140869140625, 439.6884765625, -2.9134314060211181640625),
+                Vec3fEq(96.17461395263671875, 419.376953125, -4.50826549530029296875),
+                Vec3fEq(115.9285888671875, 399.0654296875, -6.1030979156494140625),
+                Vec3fEq(135.6825714111328125, 378.753936767578125, -7.697928905487060546875),
+                Vec3fEq(155.436553955078125, 358.442413330078125, -20.9574985504150390625),
+                Vec3fEq(175.190521240234375, 338.130889892578125, -35.907512664794921875),
+                Vec3fEq(194.9445037841796875, 317.8193359375, -50.85752105712890625),
+                Vec3fEq(214.698486328125, 297.5078125, -65.807525634765625),
+                Vec3fEq(222.0001068115234375, 290.000091552734375, -71.333465576171875)))
+            << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, end_tolerance_should_extent_available_destinations)
     {
-        const std::array<float, 5 * 5> heightfieldData {{
-            0,   0,    0,    0,    0, // row 0
-            0, -25,  -25,  -25,  -25, // row 1
+        const std::array<float, 5 * 5> heightfieldData{ {
+            0, 0, 0, 0, 0, // row 0
+            0, -25, -25, -25, -25, // row 1
             0, -25, -100, -100, -100, // row 2
             0, -25, -100, -100, -100, // row 3
             0, -25, -100, -100, -100, // row 4
-        }};
+        } };
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
 
         CollisionShapeInstance compound(std::make_unique<btCompoundShape>());
         compound.shape().addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(204, -204, 0)),
-                                       new btBoxShape(btVector3(100, 100, 1000)));
+            new btBoxShape(btVector3(100, 100, 1000)));
 
         mNavigator->addAgent(mAgentBounds);
         mNavigator->addHeightfield(mCellPosition, cellSize, surface, nullptr);
-        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance(), mObjectTransform), mTransform, nullptr);
+        mNavigator->addObject(
+            ObjectId(&compound.shape()), ObjectShapes(compound.instance(), mObjectTransform), mTransform, nullptr);
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
         const float endTolerance = 1000.0f;
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, endTolerance, mOut),
-                  Status::Success);
-
-        EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(56.66666412353515625, 460, -2.5371043682098388671875),
-            Vec3fEq(71.5649566650390625, 435.899810791015625, -5.817593097686767578125),
-            Vec3fEq(86.46324920654296875, 411.79962158203125, -9.66499996185302734375),
-            Vec3fEq(101.36154937744140625, 387.699462890625, -13.512401580810546875),
-            Vec3fEq(116.2598419189453125, 363.599273681640625, -17.359806060791015625),
-            Vec3fEq(131.1581268310546875, 339.499114990234375, -21.2072086334228515625),
-            Vec3fEq(146.056427001953125, 315.39892578125, -25.0546112060546875),
-            Vec3fEq(160.9547271728515625, 291.298736572265625, -28.9020137786865234375),
-            Vec3fEq(175.8530120849609375, 267.198577880859375, -32.749416351318359375),
-            Vec3fEq(190.751312255859375, 243.098388671875, -33.819454193115234375),
-            Vec3fEq(205.64959716796875, 218.9982147216796875, -31.020172119140625),
-            Vec3fEq(220.5478973388671875, 194.898040771484375, -26.844608306884765625),
-            Vec3fEq(235.446197509765625, 170.7978668212890625, -26.785541534423828125),
-            Vec3fEq(250.3444671630859375, 146.6976776123046875, -26.7264766693115234375),
-            Vec3fEq(265.242767333984375, 122.59751129150390625, -20.59339141845703125),
-            Vec3fEq(280.141021728515625, 98.4973297119140625, -14.040531158447265625),
-            Vec3fEq(295.039306640625, 74.39715576171875, -7.48766994476318359375),
-            Vec3fEq(306, 56.66666412353515625, -2.6667339801788330078125)
-        )) << mPath;
+        EXPECT_EQ(
+            findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, endTolerance, mOut),
+            Status::Success);
+
+        EXPECT_THAT(mPath,
+            ElementsAre(Vec3fEq(56.66666412353515625, 460, -2.5371043682098388671875),
+                Vec3fEq(71.5649566650390625, 435.899810791015625, -5.817593097686767578125),
+                Vec3fEq(86.46324920654296875, 411.79962158203125, -9.66499996185302734375),
+                Vec3fEq(101.36154937744140625, 387.699462890625, -13.512401580810546875),
+                Vec3fEq(116.2598419189453125, 363.599273681640625, -17.359806060791015625),
+                Vec3fEq(131.1581268310546875, 339.499114990234375, -21.2072086334228515625),
+                Vec3fEq(146.056427001953125, 315.39892578125, -25.0546112060546875),
+                Vec3fEq(160.9547271728515625, 291.298736572265625, -28.9020137786865234375),
+                Vec3fEq(175.8530120849609375, 267.198577880859375, -32.749416351318359375),
+                Vec3fEq(190.751312255859375, 243.098388671875, -33.819454193115234375),
+                Vec3fEq(205.64959716796875, 218.9982147216796875, -31.020172119140625),
+                Vec3fEq(220.5478973388671875, 194.898040771484375, -26.844608306884765625),
+                Vec3fEq(235.446197509765625, 170.7978668212890625, -26.785541534423828125),
+                Vec3fEq(250.3444671630859375, 146.6976776123046875, -26.7264766693115234375),
+                Vec3fEq(265.242767333984375, 122.59751129150390625, -20.59339141845703125),
+                Vec3fEq(280.141021728515625, 98.4973297119140625, -14.040531158447265625),
+                Vec3fEq(295.039306640625, 74.39715576171875, -7.48766994476318359375),
+                Vec3fEq(306, 56.66666412353515625, -2.6667339801788330078125)))
+            << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, only_one_water_per_cell_is_allowed)
diff --git a/apps/openmw_test_suite/detournavigator/navmeshdb.cpp b/apps/openmw_test_suite/detournavigator/navmeshdb.cpp
index 55d26e3b78..40d66e072f 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshdb.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshdb.cpp
@@ -5,12 +5,12 @@
 
 #include <DetourAlloc.h>
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
+#include <limits>
 #include <numeric>
 #include <random>
-#include <limits>
 
 namespace
 {
@@ -28,7 +28,7 @@ namespace
 
     struct DetourNavigatorNavMeshDbTest : Test
     {
-        NavMeshDb mDb {":memory:", std::numeric_limits<std::uint64_t>::max()};
+        NavMeshDb mDb{ ":memory:", std::numeric_limits<std::uint64_t>::max() };
         std::minstd_rand mRandom;
 
         std::vector<std::byte> generateData()
@@ -41,23 +41,23 @@ namespace
         Tile insertTile(TileId tileId, TileVersion version)
         {
             std::string worldspace = "sys::default";
-            const TilePosition tilePosition {3, 4};
+            const TilePosition tilePosition{ 3, 4 };
             std::vector<std::byte> input = generateData();
             std::vector<std::byte> data = generateData();
             EXPECT_EQ(mDb.insertTile(tileId, worldspace, tilePosition, version, input, data), 1);
-            return {std::move(worldspace), tilePosition, std::move(input), std::move(data)};
+            return { std::move(worldspace), tilePosition, std::move(input), std::move(data) };
         }
     };
 
     TEST_F(DetourNavigatorNavMeshDbTest, get_max_tile_id_for_empty_db_should_return_zero)
     {
-        EXPECT_EQ(mDb.getMaxTileId(), TileId {0});
+        EXPECT_EQ(mDb.getMaxTileId(), TileId{ 0 });
     }
 
     TEST_F(DetourNavigatorNavMeshDbTest, inserted_tile_should_be_found_by_key)
     {
-        const TileId tileId {146};
-        const TileVersion version {1};
+        const TileId tileId{ 146 };
+        const TileVersion version{ 1 };
         const auto [worldspace, tilePosition, input, data] = insertTile(tileId, version);
         const auto result = mDb.findTile(worldspace, tilePosition, input);
         ASSERT_TRUE(result.has_value());
@@ -67,14 +67,14 @@ namespace
 
     TEST_F(DetourNavigatorNavMeshDbTest, inserted_tile_should_change_max_tile_id)
     {
-        insertTile(TileId {53}, TileVersion {1});
-        EXPECT_EQ(mDb.getMaxTileId(), TileId {53});
+        insertTile(TileId{ 53 }, TileVersion{ 1 });
+        EXPECT_EQ(mDb.getMaxTileId(), TileId{ 53 });
     }
 
     TEST_F(DetourNavigatorNavMeshDbTest, updated_tile_should_change_data)
     {
-        const TileId tileId {13};
-        const TileVersion version {1};
+        const TileId tileId{ 13 };
+        const TileVersion version{ 1 };
         auto [worldspace, tilePosition, input, data] = insertTile(tileId, version);
         generateRange(data.begin(), data.end(), mRandom);
         ASSERT_EQ(mDb.updateTile(tileId, version, data), 1);
@@ -88,10 +88,10 @@ namespace
 
     TEST_F(DetourNavigatorNavMeshDbTest, on_inserted_duplicate_should_throw_exception)
     {
-        const TileId tileId {53};
-        const TileVersion version {1};
+        const TileId tileId{ 53 };
+        const TileVersion version{ 1 };
         const std::string worldspace = "sys::default";
-        const TilePosition tilePosition {3, 4};
+        const TilePosition tilePosition{ 3, 4 };
         const std::vector<std::byte> input = generateData();
         const std::vector<std::byte> data = generateData();
         ASSERT_EQ(mDb.insertTile(tileId, worldspace, tilePosition, version, input, data), 1);
@@ -100,27 +100,27 @@ namespace
 
     TEST_F(DetourNavigatorNavMeshDbTest, inserted_duplicate_leaves_db_in_correct_state)
     {
-        const TileId tileId {53};
-        const TileVersion version {1};
+        const TileId tileId{ 53 };
+        const TileVersion version{ 1 };
         const std::string worldspace = "sys::default";
-        const TilePosition tilePosition {3, 4};
+        const TilePosition tilePosition{ 3, 4 };
         const std::vector<std::byte> input = generateData();
         const std::vector<std::byte> data = generateData();
         ASSERT_EQ(mDb.insertTile(tileId, worldspace, tilePosition, version, input, data), 1);
         EXPECT_THROW(mDb.insertTile(tileId, worldspace, tilePosition, version, input, data), std::runtime_error);
-        EXPECT_NO_THROW(insertTile(TileId {54}, version));
+        EXPECT_NO_THROW(insertTile(TileId{ 54 }, version));
     }
 
     TEST_F(DetourNavigatorNavMeshDbTest, delete_tiles_at_should_remove_all_tiles_with_given_worldspace_and_position)
     {
-        const TileVersion version {1};
+        const TileVersion version{ 1 };
         const std::string worldspace = "sys::default";
-        const TilePosition tilePosition {3, 4};
+        const TilePosition tilePosition{ 3, 4 };
         const std::vector<std::byte> input1 = generateData();
         const std::vector<std::byte> input2 = generateData();
         const std::vector<std::byte> data = generateData();
-        ASSERT_EQ(mDb.insertTile(TileId {53}, worldspace, tilePosition, version, input1, data), 1);
-        ASSERT_EQ(mDb.insertTile(TileId {54}, worldspace, tilePosition, version, input2, data), 1);
+        ASSERT_EQ(mDb.insertTile(TileId{ 53 }, worldspace, tilePosition, version, input1, data), 1);
+        ASSERT_EQ(mDb.insertTile(TileId{ 54 }, worldspace, tilePosition, version, input2, data), 1);
         ASSERT_EQ(mDb.deleteTilesAt(worldspace, tilePosition), 2);
         EXPECT_FALSE(mDb.findTile(worldspace, tilePosition, input1).has_value());
         EXPECT_FALSE(mDb.findTile(worldspace, tilePosition, input2).has_value());
@@ -128,11 +128,11 @@ namespace
 
     TEST_F(DetourNavigatorNavMeshDbTest, delete_tiles_at_except_should_leave_tile_with_given_id)
     {
-        const TileId leftTileId {53};
-        const TileId removedTileId {54};
-        const TileVersion version {1};
+        const TileId leftTileId{ 53 };
+        const TileId removedTileId{ 54 };
+        const TileVersion version{ 1 };
         const std::string worldspace = "sys::default";
-        const TilePosition tilePosition {3, 4};
+        const TilePosition tilePosition{ 3, 4 };
         const std::vector<std::byte> leftInput = generateData();
         const std::vector<std::byte> removedInput = generateData();
         const std::vector<std::byte> data = generateData();
@@ -147,8 +147,8 @@ namespace
 
     TEST_F(DetourNavigatorNavMeshDbTest, delete_tiles_outside_range_should_leave_tiles_inside_given_rectangle)
     {
-        TileId tileId {1};
-        const TileVersion version {1};
+        TileId tileId{ 1 };
+        const TileVersion version{ 1 };
         const std::string worldspace = "sys::default";
         const std::vector<std::byte> input = generateData();
         const std::vector<std::byte> data = generateData();
@@ -156,25 +156,25 @@ namespace
         {
             for (int y = -2; y <= 2; ++y)
             {
-                ASSERT_EQ(mDb.insertTile(tileId, worldspace, TilePosition {x, y}, version, input, data), 1);
+                ASSERT_EQ(mDb.insertTile(tileId, worldspace, TilePosition{ x, y }, version, input, data), 1);
                 ++tileId;
             }
         }
-        const TilesPositionsRange range {TilePosition {-1, -1}, TilePosition {2, 2}};
+        const TilesPositionsRange range{ TilePosition{ -1, -1 }, TilePosition{ 2, 2 } };
         ASSERT_EQ(mDb.deleteTilesOutsideRange(worldspace, range), 16);
         for (int x = -2; x <= 2; ++x)
             for (int y = -2; y <= 2; ++y)
-                ASSERT_EQ(mDb.findTile(worldspace, TilePosition {x, y}, input).has_value(),
-                          -1 <= x && x <= 1 && -1 <= y && y <= 1) << "x=" << x << " y=" << y;
+                ASSERT_EQ(mDb.findTile(worldspace, TilePosition{ x, y }, input).has_value(),
+                    -1 <= x && x <= 1 && -1 <= y && y <= 1)
+                    << "x=" << x << " y=" << y;
     }
 
     TEST_F(DetourNavigatorNavMeshDbTest, should_support_file_size_limit)
     {
         mDb = NavMeshDb(":memory:", 4096);
-        const auto f = [&]
-        {
+        const auto f = [&] {
             for (std::int64_t i = 1; i <= 100; ++i)
-                insertTile(TileId {i}, TileVersion {1});
+                insertTile(TileId{ i }, TileVersion{ 1 });
         };
         EXPECT_THROW(f(), std::runtime_error);
     }
diff --git a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
index bc31b5be79..6cd3b506d9 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
@@ -1,13 +1,13 @@
-#include "operators.hpp"
 #include "generate.hpp"
+#include "operators.hpp"
 
-#include <components/detournavigator/navmeshtilescache.hpp>
 #include <components/detournavigator/exceptions.hpp>
-#include <components/detournavigator/recastmesh.hpp>
+#include <components/detournavigator/navmeshtilescache.hpp>
 #include <components/detournavigator/preparednavmeshdata.hpp>
-#include <components/detournavigator/ref.hpp>
 #include <components/detournavigator/preparednavmeshdatatuple.hpp>
 #include <components/detournavigator/recast.hpp>
+#include <components/detournavigator/recastmesh.hpp>
+#include <components/detournavigator/ref.hpp>
 
 #include <osg/Vec3f>
 
@@ -87,24 +87,24 @@ namespace
 
     Mesh makeMesh()
     {
-        std::vector<int> indices {{0, 1, 2}};
-        std::vector<float> vertices {{0, 0, 0, 1, 0, 0, 1, 1, 0}};
-        std::vector<AreaType> areaTypes {1, AreaType_ground};
+        std::vector<int> indices{ { 0, 1, 2 } };
+        std::vector<float> vertices{ { 0, 0, 0, 1, 0, 0, 1, 1, 0 } };
+        std::vector<AreaType> areaTypes{ 1, AreaType_ground };
         return Mesh(std::move(indices), std::move(vertices), std::move(areaTypes));
     }
 
     struct DetourNavigatorNavMeshTilesCacheTest : Test
     {
-        const AgentBounds mAgentBounds {CollisionShapeType::Aabb, {1, 2, 3}};
-        const TilePosition mTilePosition {0, 0};
-        const Version mVersion {0, 0};
-        const Mesh mMesh {makeMesh()};
-        const std::vector<CellWater> mWater {};
-        const std::vector<Heightfield> mHeightfields {};
-        const std::vector<FlatHeightfield> mFlatHeightfields {};
-        const std::vector<MeshSource> mSources {};
-        const RecastMesh mRecastMesh {mVersion, mMesh, mWater, mHeightfields, mFlatHeightfields, mSources};
-        std::unique_ptr<PreparedNavMeshData> mPreparedNavMeshData {makePeparedNavMeshData(3)};
+        const AgentBounds mAgentBounds{ CollisionShapeType::Aabb, { 1, 2, 3 } };
+        const TilePosition mTilePosition{ 0, 0 };
+        const Version mVersion{ 0, 0 };
+        const Mesh mMesh{ makeMesh() };
+        const std::vector<CellWater> mWater{};
+        const std::vector<Heightfield> mHeightfields{};
+        const std::vector<FlatHeightfield> mFlatHeightfields{};
+        const std::vector<MeshSource> mSources{};
+        const RecastMesh mRecastMesh{ mVersion, mMesh, mWater, mHeightfields, mFlatHeightfields, mSources };
+        std::unique_ptr<PreparedNavMeshData> mPreparedNavMeshData{ makePeparedNavMeshData(3) };
 
         const std::size_t mRecastMeshSize = sizeof(mRecastMesh) + getSize(mRecastMesh);
         const std::size_t mRecastMeshWithWaterSize = mRecastMeshSize + sizeof(CellWater);
@@ -170,7 +170,7 @@ namespace
     {
         const std::size_t maxSize = 1;
         NavMeshTilesCache cache(maxSize);
-        const AgentBounds absentAgentBounds {CollisionShapeType::Aabb, {1, 1, 1}};
+        const AgentBounds absentAgentBounds{ CollisionShapeType::Aabb, { 1, 1, 1 } };
 
         cache.set(mAgentBounds, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
         EXPECT_FALSE(cache.get(absentAgentBounds, mTilePosition, mRecastMesh));
@@ -180,7 +180,7 @@ namespace
     {
         const std::size_t maxSize = 1;
         NavMeshTilesCache cache(maxSize);
-        const TilePosition unexistentTilePosition {1, 1};
+        const TilePosition unexistentTilePosition{ 1, 1 };
 
         cache.set(mAgentBounds, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
         EXPECT_FALSE(cache.get(mAgentBounds, unexistentTilePosition, mRecastMesh));
@@ -190,7 +190,7 @@ namespace
     {
         const std::size_t maxSize = 1;
         NavMeshTilesCache cache(maxSize);
-        const std::vector<CellWater> water(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
+        const std::vector<CellWater> water(1, CellWater{ osg::Vec2i(), Water{ 1, 0.0f } });
         const RecastMesh unexistentRecastMesh(mVersion, mMesh, water, mHeightfields, mFlatHeightfields, mSources);
 
         cache.set(mAgentBounds, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
@@ -202,14 +202,14 @@ namespace
         const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<CellWater> water(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
+        const std::vector<CellWater> water(1, CellWater{ osg::Vec2i(), Water{ 1, 0.0f } });
         const RecastMesh anotherRecastMesh(mVersion, mMesh, water, mHeightfields, mFlatHeightfields, mSources);
         auto anotherPreparedNavMeshData = makePeparedNavMeshData(3);
         const auto copy = clone(*anotherPreparedNavMeshData);
 
         cache.set(mAgentBounds, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
-        const auto result = cache.set(mAgentBounds, mTilePosition, anotherRecastMesh,
-                                      std::move(anotherPreparedNavMeshData));
+        const auto result
+            = cache.set(mAgentBounds, mTilePosition, anotherRecastMesh, std::move(anotherPreparedNavMeshData));
         ASSERT_TRUE(result);
         EXPECT_EQ(result.get(), *copy);
         EXPECT_FALSE(cache.get(mAgentBounds, mTilePosition, mRecastMesh));
@@ -220,14 +220,12 @@ namespace
         const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<CellWater> water(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
+        const std::vector<CellWater> water(1, CellWater{ osg::Vec2i(), Water{ 1, 0.0f } });
         const RecastMesh anotherRecastMesh(mVersion, mMesh, water, mHeightfields, mFlatHeightfields, mSources);
         auto anotherPreparedNavMeshData = makePeparedNavMeshData(3);
 
-        const auto value = cache.set(mAgentBounds, mTilePosition, mRecastMesh,
-                                     std::move(mPreparedNavMeshData));
-        EXPECT_FALSE(cache.set(mAgentBounds, mTilePosition, anotherRecastMesh,
-                               std::move(anotherPreparedNavMeshData)));
+        const auto value = cache.set(mAgentBounds, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
+        EXPECT_FALSE(cache.set(mAgentBounds, mTilePosition, anotherRecastMesh, std::move(anotherPreparedNavMeshData)));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, set_should_replace_unused_least_recently_set_value)
@@ -236,23 +234,21 @@ namespace
         NavMeshTilesCache cache(maxSize);
         const auto copy = clone(*mPreparedNavMeshData);
 
-        const std::vector<CellWater> leastRecentlySetWater(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
-        const RecastMesh leastRecentlySetRecastMesh(mVersion, mMesh, leastRecentlySetWater,
-                    mHeightfields, mFlatHeightfields, mSources);
+        const std::vector<CellWater> leastRecentlySetWater(1, CellWater{ osg::Vec2i(), Water{ 1, 0.0f } });
+        const RecastMesh leastRecentlySetRecastMesh(
+            mVersion, mMesh, leastRecentlySetWater, mHeightfields, mFlatHeightfields, mSources);
         auto leastRecentlySetData = makePeparedNavMeshData(3);
 
-        const std::vector<CellWater> mostRecentlySetWater(1, CellWater {osg::Vec2i(), Water {2, 0.0f}});
-        const RecastMesh mostRecentlySetRecastMesh(mVersion, mMesh, mostRecentlySetWater,
-                    mHeightfields, mFlatHeightfields, mSources);
+        const std::vector<CellWater> mostRecentlySetWater(1, CellWater{ osg::Vec2i(), Water{ 2, 0.0f } });
+        const RecastMesh mostRecentlySetRecastMesh(
+            mVersion, mMesh, mostRecentlySetWater, mHeightfields, mFlatHeightfields, mSources);
         auto mostRecentlySetData = makePeparedNavMeshData(3);
 
-        ASSERT_TRUE(cache.set(mAgentBounds, mTilePosition, leastRecentlySetRecastMesh,
-                              std::move(leastRecentlySetData)));
-        ASSERT_TRUE(cache.set(mAgentBounds, mTilePosition, mostRecentlySetRecastMesh,
-                              std::move(mostRecentlySetData)));
+        ASSERT_TRUE(
+            cache.set(mAgentBounds, mTilePosition, leastRecentlySetRecastMesh, std::move(leastRecentlySetData)));
+        ASSERT_TRUE(cache.set(mAgentBounds, mTilePosition, mostRecentlySetRecastMesh, std::move(mostRecentlySetData)));
 
-        const auto result = cache.set(mAgentBounds, mTilePosition, mRecastMesh,
-                                      std::move(mPreparedNavMeshData));
+        const auto result = cache.set(mAgentBounds, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
         EXPECT_EQ(result.get(), *copy);
 
         EXPECT_FALSE(cache.get(mAgentBounds, mTilePosition, leastRecentlySetRecastMesh));
@@ -264,15 +260,15 @@ namespace
         const std::size_t maxSize = 2 * (mRecastMeshWithWaterSize + mPreparedNavMeshDataSize);
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<CellWater> leastRecentlyUsedWater(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
-        const RecastMesh leastRecentlyUsedRecastMesh(mVersion, mMesh, leastRecentlyUsedWater,
-                    mHeightfields, mFlatHeightfields, mSources);
+        const std::vector<CellWater> leastRecentlyUsedWater(1, CellWater{ osg::Vec2i(), Water{ 1, 0.0f } });
+        const RecastMesh leastRecentlyUsedRecastMesh(
+            mVersion, mMesh, leastRecentlyUsedWater, mHeightfields, mFlatHeightfields, mSources);
         auto leastRecentlyUsedData = makePeparedNavMeshData(3);
         const auto leastRecentlyUsedCopy = clone(*leastRecentlyUsedData);
 
-        const std::vector<CellWater> mostRecentlyUsedWater(1, CellWater {osg::Vec2i(), Water {2, 0.0f}});
-        const RecastMesh mostRecentlyUsedRecastMesh(mVersion, mMesh, mostRecentlyUsedWater,
-                    mHeightfields, mFlatHeightfields, mSources);
+        const std::vector<CellWater> mostRecentlyUsedWater(1, CellWater{ osg::Vec2i(), Water{ 2, 0.0f } });
+        const RecastMesh mostRecentlyUsedRecastMesh(
+            mVersion, mMesh, mostRecentlyUsedWater, mHeightfields, mFlatHeightfields, mSources);
         auto mostRecentlyUsedData = makePeparedNavMeshData(3);
         const auto mostRecentlyUsedCopy = clone(*mostRecentlyUsedData);
 
@@ -292,22 +288,21 @@ namespace
         }
 
         const auto copy = clone(*mPreparedNavMeshData);
-        const auto result = cache.set(mAgentBounds, mTilePosition, mRecastMesh,
-                                      std::move(mPreparedNavMeshData));
+        const auto result = cache.set(mAgentBounds, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
         EXPECT_EQ(result.get(), *copy);
 
         EXPECT_FALSE(cache.get(mAgentBounds, mTilePosition, leastRecentlyUsedRecastMesh));
         EXPECT_TRUE(cache.get(mAgentBounds, mTilePosition, mostRecentlyUsedRecastMesh));
     }
 
-    TEST_F(DetourNavigatorNavMeshTilesCacheTest, set_should_not_replace_unused_least_recently_used_value_when_item_does_not_not_fit_cache_max_size)
+    TEST_F(DetourNavigatorNavMeshTilesCacheTest,
+        set_should_not_replace_unused_least_recently_used_value_when_item_does_not_not_fit_cache_max_size)
     {
         const std::size_t maxSize = 2 * (mRecastMeshWithWaterSize + mPreparedNavMeshDataSize);
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<CellWater> water(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
-        const RecastMesh tooLargeRecastMesh(mVersion, mMesh, water,
-                    mHeightfields, mFlatHeightfields, mSources);
+        const std::vector<CellWater> water(1, CellWater{ osg::Vec2i(), Water{ 1, 0.0f } });
+        const RecastMesh tooLargeRecastMesh(mVersion, mMesh, water, mHeightfields, mFlatHeightfields, mSources);
         auto tooLargeData = makePeparedNavMeshData(10);
 
         cache.set(mAgentBounds, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
@@ -315,38 +310,35 @@ namespace
         EXPECT_TRUE(cache.get(mAgentBounds, mTilePosition, mRecastMesh));
     }
 
-    TEST_F(DetourNavigatorNavMeshTilesCacheTest, set_should_not_replace_unused_least_recently_used_value_when_item_does_not_not_fit_size_of_unused_items)
+    TEST_F(DetourNavigatorNavMeshTilesCacheTest,
+        set_should_not_replace_unused_least_recently_used_value_when_item_does_not_not_fit_size_of_unused_items)
     {
         const std::size_t maxSize = 2 * (mRecastMeshWithWaterSize + mPreparedNavMeshDataSize);
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<CellWater> anotherWater(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
-        const RecastMesh anotherRecastMesh(mVersion, mMesh, anotherWater,
-                    mHeightfields, mFlatHeightfields, mSources);
+        const std::vector<CellWater> anotherWater(1, CellWater{ osg::Vec2i(), Water{ 1, 0.0f } });
+        const RecastMesh anotherRecastMesh(mVersion, mMesh, anotherWater, mHeightfields, mFlatHeightfields, mSources);
         auto anotherData = makePeparedNavMeshData(3);
 
-        const std::vector<CellWater> tooLargeWater(1, CellWater {osg::Vec2i(), Water {2, 0.0f}});
-        const RecastMesh tooLargeRecastMesh(mVersion, mMesh, tooLargeWater,
-                    mHeightfields, mFlatHeightfields, mSources);
+        const std::vector<CellWater> tooLargeWater(1, CellWater{ osg::Vec2i(), Water{ 2, 0.0f } });
+        const RecastMesh tooLargeRecastMesh(mVersion, mMesh, tooLargeWater, mHeightfields, mFlatHeightfields, mSources);
         auto tooLargeData = makePeparedNavMeshData(10);
 
-        const auto value = cache.set(mAgentBounds, mTilePosition, mRecastMesh,
-                                     std::move(mPreparedNavMeshData));
+        const auto value = cache.set(mAgentBounds, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
         ASSERT_TRUE(value);
-        ASSERT_TRUE(cache.set(mAgentBounds, mTilePosition, anotherRecastMesh,
-                              std::move(anotherData)));
-        EXPECT_FALSE(cache.set(mAgentBounds, mTilePosition, tooLargeRecastMesh,
-                               std::move(tooLargeData)));
+        ASSERT_TRUE(cache.set(mAgentBounds, mTilePosition, anotherRecastMesh, std::move(anotherData)));
+        EXPECT_FALSE(cache.set(mAgentBounds, mTilePosition, tooLargeRecastMesh, std::move(tooLargeData)));
         EXPECT_TRUE(cache.get(mAgentBounds, mTilePosition, mRecastMesh));
         EXPECT_TRUE(cache.get(mAgentBounds, mTilePosition, anotherRecastMesh));
     }
 
-    TEST_F(DetourNavigatorNavMeshTilesCacheTest, release_used_after_set_then_used_by_get_item_should_left_this_item_available)
+    TEST_F(DetourNavigatorNavMeshTilesCacheTest,
+        release_used_after_set_then_used_by_get_item_should_left_this_item_available)
     {
         const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<CellWater> water(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
+        const std::vector<CellWater> water(1, CellWater{ osg::Vec2i(), Water{ 1, 0.0f } });
         const RecastMesh anotherRecastMesh(mVersion, mMesh, water, mHeightfields, mFlatHeightfields, mSources);
         auto anotherData = makePeparedNavMeshData(3);
 
@@ -365,7 +357,7 @@ namespace
         const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<CellWater> water(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
+        const std::vector<CellWater> water(1, CellWater{ osg::Vec2i(), Water{ 1, 0.0f } });
         const RecastMesh anotherRecastMesh(mVersion, mMesh, water, mHeightfields, mFlatHeightfields, mSources);
         auto anotherData = makePeparedNavMeshData(3);
 
diff --git a/apps/openmw_test_suite/detournavigator/operators.hpp b/apps/openmw_test_suite/detournavigator/operators.hpp
index c2d9424db2..356e5eca04 100644
--- a/apps/openmw_test_suite/detournavigator/operators.hpp
+++ b/apps/openmw_test_suite/detournavigator/operators.hpp
@@ -27,7 +27,7 @@ namespace
         {
             if (i++ % newLine == 0)
                 message << "\n";
-            message << Wrapper<typename std::decay<decltype(v)>::type> {v} << ", ";
+            message << Wrapper<typename std::decay<decltype(v)>::type>{ v } << ", ";
         }
         return message << "\n}";
     }
@@ -36,52 +36,51 @@ namespace
 namespace testing
 {
     template <>
-    inline testing::Message& Message::operator <<(const osg::Vec3f& value)
+    inline testing::Message& Message::operator<<(const osg::Vec3f& value)
     {
         return (*this) << "Vec3fEq(" << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.x()
-            << ", " << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.y()
-            << ", " << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.z()
-            << ')';
+                       << ", " << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.y() << ", "
+                       << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.z() << ')';
     }
 
     template <>
-    inline testing::Message& Message::operator <<(const Wrapper<osg::Vec3f>& value)
+    inline testing::Message& Message::operator<<(const Wrapper<osg::Vec3f>& value)
     {
         return (*this) << value.mValue;
     }
 
     template <>
-    inline testing::Message& Message::operator <<(const Wrapper<float>& value)
+    inline testing::Message& Message::operator<<(const Wrapper<float>& value)
     {
         return (*this) << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.mValue;
     }
 
     template <>
-    inline testing::Message& Message::operator <<(const Wrapper<int>& value)
+    inline testing::Message& Message::operator<<(const Wrapper<int>& value)
     {
         return (*this) << value.mValue;
     }
 
     template <>
-    inline testing::Message& Message::operator <<(const std::deque<osg::Vec3f>& value)
+    inline testing::Message& Message::operator<<(const std::deque<osg::Vec3f>& value)
     {
         return writeRange(*this, value, 1);
     }
 
     template <>
-    inline testing::Message& Message::operator <<(const std::vector<osg::Vec3f>& value)
+    inline testing::Message& Message::operator<<(const std::vector<osg::Vec3f>& value)
     {
         return writeRange(*this, value, 1);
     }
 
     template <>
-    inline testing::Message& Message::operator <<(const std::vector<float>& value)
+    inline testing::Message& Message::operator<<(const std::vector<float>& value)
     {
         return writeRange(*this, value, 3);
     }
 
     template <>
-    inline testing::Message& Message::operator <<(const std::vector<int>& value)
+    inline testing::Message& Message::operator<<(const std::vector<int>& value)
     {
         return writeRange(*this, value, 3);
     }
diff --git a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
index 818d7b8623..8405513354 100644
--- a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
+++ b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
@@ -1,37 +1,37 @@
 #include "operators.hpp"
 
-#include <components/detournavigator/recastmeshbuilder.hpp>
-#include <components/detournavigator/recastmesh.hpp>
+#include <components/debug/debuglog.hpp>
 #include <components/detournavigator/exceptions.hpp>
+#include <components/detournavigator/recastmesh.hpp>
+#include <components/detournavigator/recastmeshbuilder.hpp>
 #include <components/esm3/loadland.hpp>
 #include <components/misc/convert.hpp>
-#include <components/debug/debuglog.hpp>
 
+#include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h>
-#include <BulletCollision/CollisionShapes/btTriangleMesh.h>
-#include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
-#include <BulletCollision/CollisionDispatch/btCollisionObject.h>
+#include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
+#include <BulletCollision/CollisionShapes/btTriangleMesh.h>
 
 #include <DetourCommon.h>
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 #include <array>
 
 namespace DetourNavigator
 {
-    static inline bool operator ==(const Water& lhs, const Water& rhs)
+    static inline bool operator==(const Water& lhs, const Water& rhs)
     {
-        const auto tie = [] (const Water& v) { return std::tie(v.mCellSize, v.mLevel); };
+        const auto tie = [](const Water& v) { return std::tie(v.mCellSize, v.mLevel); };
         return tie(lhs) == tie(rhs);
     }
 
-    static inline bool operator ==(const CellWater& lhs, const CellWater& rhs)
+    static inline bool operator==(const CellWater& lhs, const CellWater& rhs)
     {
-        const auto tie = [] (const CellWater& v) { return std::tie(v.mCellPosition, v.mWater); };
+        const auto tie = [](const CellWater& v) { return std::tie(v.mCellPosition, v.mWater); };
         return tie(lhs) == tie(rhs);
     }
 
@@ -42,10 +42,7 @@ namespace DetourNavigator
 
     static inline bool operator==(const FlatHeightfield& lhs, const FlatHeightfield& rhs)
     {
-        const auto tie = [] (const FlatHeightfield& v)
-        {
-            return std::tie(v.mCellPosition, v.mCellSize, v.mHeight);
-        };
+        const auto tie = [](const FlatHeightfield& v) { return std::tie(v.mCellPosition, v.mCellSize, v.mHeight); };
         return tie(lhs) == tie(rhs);
     }
 }
@@ -58,16 +55,16 @@ namespace
     struct DetourNavigatorRecastMeshBuilderTest : Test
     {
         TileBounds mBounds;
-        const Version mVersion {0, 0};
-        const osg::ref_ptr<const Resource::BulletShape> mSource {nullptr};
-        const ObjectTransform mObjectTransform {ESM::Position {{0, 0, 0}, {0, 0, 0}}, 0.0f};
+        const Version mVersion{ 0, 0 };
+        const osg::ref_ptr<const Resource::BulletShape> mSource{ nullptr };
+        const ObjectTransform mObjectTransform{ ESM::Position{ { 0, 0, 0 }, { 0, 0, 0 } }, 0.0f };
 
         DetourNavigatorRecastMeshBuilderTest()
         {
             mBounds.mMin = osg::Vec2f(-std::numeric_limits<float>::max() * std::numeric_limits<float>::epsilon(),
-                                      -std::numeric_limits<float>::max() * std::numeric_limits<float>::epsilon());
+                -std::numeric_limits<float>::max() * std::numeric_limits<float>::epsilon());
             mBounds.mMax = osg::Vec2f(std::numeric_limits<float>::max() * std::numeric_limits<float>::epsilon(),
-                                      std::numeric_limits<float>::max() * std::numeric_limits<float>::epsilon());
+                std::numeric_limits<float>::max() * std::numeric_limits<float>::epsilon());
         }
     };
 
@@ -87,16 +84,18 @@ namespace
         btBvhTriangleMeshShape shape(&mesh, true);
 
         RecastMeshBuilder builder(mBounds);
-        builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(),
-                          AreaType_ground, mSource, mObjectTransform);
+        builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground,
+            mSource, mObjectTransform);
         const auto recastMesh = std::move(builder).create(mVersion);
-        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
-            -1, -1, 0, // vertex 0
-            -1, 1, 0, // vertex 1
-            1, -1, 0, // vertex 2
-        })) << recastMesh->getMesh().getVertices();
-        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0}));
-        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
+        EXPECT_EQ(recastMesh->getMesh().getVertices(),
+            std::vector<float>({
+                -1, -1, 0, // vertex 0
+                -1, 1, 0, // vertex 1
+                1, -1, 0, // vertex 2
+            }))
+            << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({ 2, 1, 0 }));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({ AreaType_ground }));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_transformed_bhv_triangle_mesh_shape)
@@ -105,70 +104,76 @@ namespace
         mesh.addTriangle(btVector3(-1, -1, 0), btVector3(-1, 1, 0), btVector3(1, -1, 0));
         btBvhTriangleMeshShape shape(&mesh, true);
         RecastMeshBuilder builder(mBounds);
-        builder.addObject(
-            static_cast<const btCollisionShape&>(shape),
-            btTransform(btMatrix3x3::getIdentity().scaled(btVector3(1, 2, 3)), btVector3(1, 2, 3)),
-            AreaType_ground, mSource, mObjectTransform
-        );
+        builder.addObject(static_cast<const btCollisionShape&>(shape),
+            btTransform(btMatrix3x3::getIdentity().scaled(btVector3(1, 2, 3)), btVector3(1, 2, 3)), AreaType_ground,
+            mSource, mObjectTransform);
         const auto recastMesh = std::move(builder).create(mVersion);
-        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
-            0, 0, 3, // vertex 0
-            0, 4, 3, // vertex 1
-            2, 0, 3, // vertex 2
-        })) << recastMesh->getMesh().getVertices();
-        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0}));
-        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
+        EXPECT_EQ(recastMesh->getMesh().getVertices(),
+            std::vector<float>({
+                0, 0, 3, // vertex 0
+                0, 4, 3, // vertex 1
+                2, 0, 3, // vertex 2
+            }))
+            << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({ 2, 1, 0 }));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({ AreaType_ground }));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_heightfield_terrian_shape)
     {
-        const std::array<btScalar, 4> heightfieldData {{0, 0, 0, 0}};
+        const std::array<btScalar, 4> heightfieldData{ { 0, 0, 0, 0 } };
         btHeightfieldTerrainShape shape(2, 2, heightfieldData.data(), 1, 0, 0, 2, PHY_FLOAT, false);
         RecastMeshBuilder builder(mBounds);
-        builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(),
-                          AreaType_ground, mSource, mObjectTransform);
+        builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground,
+            mSource, mObjectTransform);
         const auto recastMesh = std::move(builder).create(mVersion);
-        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
-            -0.5, -0.5, 0, // vertex 0
-            -0.5, 0.5, 0, // vertex 1
-            0.5, -0.5, 0, // vertex 2
-            0.5, 0.5, 0, // vertex 3
-        })) << recastMesh->getMesh().getVertices();
-        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({0, 1, 2, 2, 1, 3}));
-        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground, AreaType_ground}));
+        EXPECT_EQ(recastMesh->getMesh().getVertices(),
+            std::vector<float>({
+                -0.5, -0.5, 0, // vertex 0
+                -0.5, 0.5, 0, // vertex 1
+                0.5, -0.5, 0, // vertex 2
+                0.5, 0.5, 0, // vertex 3
+            }))
+            << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({ 0, 1, 2, 2, 1, 3 }));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({ AreaType_ground, AreaType_ground }));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_box_shape_should_produce_12_triangles)
     {
         btBoxShape shape(btVector3(1, 1, 2));
         RecastMeshBuilder builder(mBounds);
-        builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(),
-                          AreaType_ground, mSource, mObjectTransform);
+        builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground,
+            mSource, mObjectTransform);
         const auto recastMesh = std::move(builder).create(mVersion);
-        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
-            -1, -1, -2, // vertex 0
-            -1, -1, 2, // vertex 1
-            -1, 1, -2, // vertex 2
-            -1, 1, 2, // vertex 3
-            1, -1, -2, // vertex 4
-            1, -1, 2, // vertex 5
-            1, 1, -2, // vertex 6
-            1, 1, 2, // vertex 7
-        })) << recastMesh->getMesh().getVertices();
-        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({
-            0, 1, 5, // triangle 0
-            0, 2, 3, // triangle 1
-            0, 4, 6, // triangle 2
-            1, 3, 7, // triangle 3
-            2, 6, 7, // triangle 4
-            3, 1, 0, // triangle 5
-            4, 5, 7, // triangle 6
-            5, 4, 0, // triangle 7
-            6, 2, 0, // triangle 8
-            7, 3, 2, // triangle 9
-            7, 5, 1, // triangle 10
-            7, 6, 4, // triangle 11
-        })) << recastMesh->getMesh().getIndices();
+        EXPECT_EQ(recastMesh->getMesh().getVertices(),
+            std::vector<float>({
+                -1, -1, -2, // vertex 0
+                -1, -1, 2, // vertex 1
+                -1, 1, -2, // vertex 2
+                -1, 1, 2, // vertex 3
+                1, -1, -2, // vertex 4
+                1, -1, 2, // vertex 5
+                1, 1, -2, // vertex 6
+                1, 1, 2, // vertex 7
+            }))
+            << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(),
+            std::vector<int>({
+                0, 1, 5, // triangle 0
+                0, 2, 3, // triangle 1
+                0, 4, 6, // triangle 2
+                1, 3, 7, // triangle 3
+                2, 6, 7, // triangle 4
+                3, 1, 0, // triangle 5
+                4, 5, 7, // triangle 6
+                5, 4, 0, // triangle 7
+                6, 2, 0, // triangle 8
+                7, 3, 2, // triangle 9
+                7, 5, 1, // triangle 10
+                7, 6, 4, // triangle 11
+            }))
+            << recastMesh->getMesh().getIndices();
         EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>(12, AreaType_ground));
     }
 
@@ -186,42 +191,43 @@ namespace
         shape.addChildShape(btTransform::getIdentity(), &box);
         shape.addChildShape(btTransform::getIdentity(), &triangle2);
         RecastMeshBuilder builder(mBounds);
-        builder.addObject(
-            static_cast<const btCollisionShape&>(shape),
-            btTransform::getIdentity(),
-            AreaType_ground, mSource, mObjectTransform
-        );
+        builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground,
+            mSource, mObjectTransform);
         const auto recastMesh = std::move(builder).create(mVersion);
-        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
-            -1, -1, -2, // vertex 0
-            -1, -1, 0, // vertex 1
-            -1, -1, 2, // vertex 2
-            -1, 1, -2, // vertex 3
-            -1, 1, 0, // vertex 4
-            -1, 1, 2, // vertex 5
-            1, -1, -2, // vertex 6
-            1, -1, 0, // vertex 7
-            1, -1, 2, // vertex 8
-            1, 1, -2, // vertex 9
-            1, 1, 0, // vertex 10
-            1, 1, 2, // vertex 11
-        })) << recastMesh->getMesh().getVertices();
-        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({
-            0, 2, 8, // triangle 0
-            0, 3, 5, // triangle 1
-            0, 6, 9, // triangle 2
-            2, 5, 11, // triangle 3
-            3, 9, 11, // triangle 4
-            5, 2, 0, // triangle 5
-            6, 8, 11, // triangle 6
-            7, 4, 1, // triangle 7
-            7, 4, 10, // triangle 8
-            8, 6, 0, // triangle 9
-            9, 3, 0, // triangle 10
-            11, 5, 3, // triangle 11
-            11, 8, 2, // triangle 12
-            11, 9, 6, // triangle 13
-        })) << recastMesh->getMesh().getIndices();
+        EXPECT_EQ(recastMesh->getMesh().getVertices(),
+            std::vector<float>({
+                -1, -1, -2, // vertex 0
+                -1, -1, 0, // vertex 1
+                -1, -1, 2, // vertex 2
+                -1, 1, -2, // vertex 3
+                -1, 1, 0, // vertex 4
+                -1, 1, 2, // vertex 5
+                1, -1, -2, // vertex 6
+                1, -1, 0, // vertex 7
+                1, -1, 2, // vertex 8
+                1, 1, -2, // vertex 9
+                1, 1, 0, // vertex 10
+                1, 1, 2, // vertex 11
+            }))
+            << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(),
+            std::vector<int>({
+                0, 2, 8, // triangle 0
+                0, 3, 5, // triangle 1
+                0, 6, 9, // triangle 2
+                2, 5, 11, // triangle 3
+                3, 9, 11, // triangle 4
+                5, 2, 0, // triangle 5
+                6, 8, 11, // triangle 6
+                7, 4, 1, // triangle 7
+                7, 4, 10, // triangle 8
+                8, 6, 0, // triangle 9
+                9, 3, 0, // triangle 10
+                11, 5, 3, // triangle 11
+                11, 8, 2, // triangle 12
+                11, 9, 6, // triangle 13
+            }))
+            << recastMesh->getMesh().getIndices();
         EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>(14, AreaType_ground));
     }
 
@@ -233,19 +239,19 @@ namespace
         btCompoundShape shape;
         shape.addChildShape(btTransform::getIdentity(), &triangle);
         RecastMeshBuilder builder(mBounds);
-        builder.addObject(
-            static_cast<const btCollisionShape&>(shape),
-            btTransform(btMatrix3x3::getIdentity().scaled(btVector3(1, 2, 3)), btVector3(1, 2, 3)),
-            AreaType_ground, mSource, mObjectTransform
-        );
+        builder.addObject(static_cast<const btCollisionShape&>(shape),
+            btTransform(btMatrix3x3::getIdentity().scaled(btVector3(1, 2, 3)), btVector3(1, 2, 3)), AreaType_ground,
+            mSource, mObjectTransform);
         const auto recastMesh = std::move(builder).create(mVersion);
-        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
-            0, 0, 3, // vertex 0
-            0, 4, 3, // vertex 1
-            2, 0, 3, // vertex 2
-        })) << recastMesh->getMesh().getVertices();
-        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0}));
-        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
+        EXPECT_EQ(recastMesh->getMesh().getVertices(),
+            std::vector<float>({
+                0, 0, 3, // vertex 0
+                0, 4, 3, // vertex 1
+                2, 0, 3, // vertex 2
+            }))
+            << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({ 2, 1, 0 }));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({ AreaType_ground }));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_transformed_compound_shape_with_transformed_bhv_triangle_shape)
@@ -254,22 +260,22 @@ namespace
         mesh.addTriangle(btVector3(-1, -1, 0), btVector3(-1, 1, 0), btVector3(1, -1, 0));
         btBvhTriangleMeshShape triangle(&mesh, true);
         btCompoundShape shape;
-        shape.addChildShape(btTransform(btMatrix3x3::getIdentity().scaled(btVector3(1, 2, 3)), btVector3(1, 2, 3)),
-                            &triangle);
+        shape.addChildShape(
+            btTransform(btMatrix3x3::getIdentity().scaled(btVector3(1, 2, 3)), btVector3(1, 2, 3)), &triangle);
         RecastMeshBuilder builder(mBounds);
-        builder.addObject(
-            static_cast<const btCollisionShape&>(shape),
-            btTransform(btMatrix3x3::getIdentity().scaled(btVector3(1, 2, 3)), btVector3(1, 2, 3)),
-            AreaType_ground, mSource, mObjectTransform
-        );
+        builder.addObject(static_cast<const btCollisionShape&>(shape),
+            btTransform(btMatrix3x3::getIdentity().scaled(btVector3(1, 2, 3)), btVector3(1, 2, 3)), AreaType_ground,
+            mSource, mObjectTransform);
         const auto recastMesh = std::move(builder).create(mVersion);
-        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
-            1, 2, 12, // vertex 0
-            1, 10, 12, // vertex 1
-            3, 2, 12, // vertex 2
-        })) << recastMesh->getMesh().getVertices();
-        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0}));
-        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
+        EXPECT_EQ(recastMesh->getMesh().getVertices(),
+            std::vector<float>({
+                1, 2, 12, // vertex 0
+                1, 10, 12, // vertex 1
+                3, 2, 12, // vertex 2
+            }))
+            << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({ 2, 1, 0 }));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({ AreaType_ground }));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, without_bounds_add_bhv_triangle_shape_should_not_filter_by_bounds)
@@ -279,21 +285,20 @@ namespace
         mesh.addTriangle(btVector3(-3, -3, 0), btVector3(-3, -2, 0), btVector3(-2, -3, 0));
         btBvhTriangleMeshShape shape(&mesh, true);
         RecastMeshBuilder builder(mBounds);
-        builder.addObject(
-            static_cast<const btCollisionShape&>(shape),
-            btTransform::getIdentity(),
-            AreaType_ground, mSource, mObjectTransform
-        );
+        builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground,
+            mSource, mObjectTransform);
         const auto recastMesh = std::move(builder).create(mVersion);
-        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
-            -3, -3, 0, // vertex 0
-            -3, -2, 0, // vertex 1
-            -2, -3, 0, // vertex 2
-            -1, -1, 0, // vertex 3
-            -1, 1, 0, // vertex 4
-            1, -1, 0, // vertex 5
-        })) << recastMesh->getMesh().getVertices();
-        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0, 5, 4, 3}));
+        EXPECT_EQ(recastMesh->getMesh().getVertices(),
+            std::vector<float>({
+                -3, -3, 0, // vertex 0
+                -3, -2, 0, // vertex 1
+                -2, -3, 0, // vertex 2
+                -1, -1, 0, // vertex 3
+                -1, 1, 0, // vertex 4
+                1, -1, 0, // vertex 5
+            }))
+            << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({ 2, 1, 0, 5, 4, 3 }));
         EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>(2, AreaType_ground));
     }
 
@@ -306,22 +311,22 @@ namespace
         mesh.addTriangle(btVector3(-3, -3, 0), btVector3(-3, -2, 0), btVector3(-2, -3, 0));
         btBvhTriangleMeshShape shape(&mesh, true);
         RecastMeshBuilder builder(mBounds);
-        builder.addObject(
-            static_cast<const btCollisionShape&>(shape),
-            btTransform::getIdentity(),
-            AreaType_ground, mSource, mObjectTransform
-        );
+        builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground,
+            mSource, mObjectTransform);
         const auto recastMesh = std::move(builder).create(mVersion);
-        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
-            -3, -3, 0, // vertex 0
-            -3, -2, 0, // vertex 1
-            -2, -3, 0, // vertex 2
-        })) << recastMesh->getMesh().getVertices();
-        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0}));
-        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
+        EXPECT_EQ(recastMesh->getMesh().getVertices(),
+            std::vector<float>({
+                -3, -3, 0, // vertex 0
+                -3, -2, 0, // vertex 1
+                -2, -3, 0, // vertex 2
+            }))
+            << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({ 2, 1, 0 }));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({ AreaType_ground }));
     }
 
-    TEST_F(DetourNavigatorRecastMeshBuilderTest, with_bounds_add_rotated_by_x_bhv_triangle_shape_should_filter_by_bounds)
+    TEST_F(
+        DetourNavigatorRecastMeshBuilderTest, with_bounds_add_rotated_by_x_bhv_triangle_shape_should_filter_by_bounds)
     {
         mBounds.mMin = osg::Vec2f(-5, -5);
         mBounds.mMax = osg::Vec2f(5, -2);
@@ -330,23 +335,24 @@ namespace
         mesh.addTriangle(btVector3(0, -3, -3), btVector3(0, -3, -2), btVector3(0, -2, -3));
         btBvhTriangleMeshShape shape(&mesh, true);
         RecastMeshBuilder builder(mBounds);
-        builder.addObject(
-            static_cast<const btCollisionShape&>(shape),
-            btTransform(btQuaternion(btVector3(1, 0, 0),
-            static_cast<btScalar>(-osg::PI_4))),
-            AreaType_ground, mSource, mObjectTransform
-        );
+        builder.addObject(static_cast<const btCollisionShape&>(shape),
+            btTransform(btQuaternion(btVector3(1, 0, 0), static_cast<btScalar>(-osg::PI_4))), AreaType_ground, mSource,
+            mObjectTransform);
         const auto recastMesh = std::move(builder).create(mVersion);
-        EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5f), std::vector<float>({
-            0, -4.24264049530029296875f, 4.44089209850062616169452667236328125e-16f, // vertex 0
-            0, -3.535533905029296875f, -0.707106769084930419921875f, // vertex 1
-            0, -3.535533905029296875f, 0.707106769084930419921875f, // vertex 2
-        }))) << recastMesh->getMesh().getVertices();
-        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({1, 2, 0}));
-        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
+        EXPECT_THAT(recastMesh->getMesh().getVertices(),
+            Pointwise(FloatNear(1e-5f),
+                std::vector<float>({
+                    0, -4.24264049530029296875f, 4.44089209850062616169452667236328125e-16f, // vertex 0
+                    0, -3.535533905029296875f, -0.707106769084930419921875f, // vertex 1
+                    0, -3.535533905029296875f, 0.707106769084930419921875f, // vertex 2
+                })))
+            << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({ 1, 2, 0 }));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({ AreaType_ground }));
     }
 
-    TEST_F(DetourNavigatorRecastMeshBuilderTest, with_bounds_add_rotated_by_y_bhv_triangle_shape_should_filter_by_bounds)
+    TEST_F(
+        DetourNavigatorRecastMeshBuilderTest, with_bounds_add_rotated_by_y_bhv_triangle_shape_should_filter_by_bounds)
     {
         mBounds.mMin = osg::Vec2f(-5, -5);
         mBounds.mMax = osg::Vec2f(-3, 5);
@@ -355,23 +361,24 @@ namespace
         mesh.addTriangle(btVector3(-3, 0, -3), btVector3(-3, 0, -2), btVector3(-2, 0, -3));
         btBvhTriangleMeshShape shape(&mesh, true);
         RecastMeshBuilder builder(mBounds);
-        builder.addObject(
-            static_cast<const btCollisionShape&>(shape),
-            btTransform(btQuaternion(btVector3(0, 1, 0),
-            static_cast<btScalar>(osg::PI_4))),
-            AreaType_ground, mSource, mObjectTransform
-        );
+        builder.addObject(static_cast<const btCollisionShape&>(shape),
+            btTransform(btQuaternion(btVector3(0, 1, 0), static_cast<btScalar>(osg::PI_4))), AreaType_ground, mSource,
+            mObjectTransform);
         const auto recastMesh = std::move(builder).create(mVersion);
-        EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5f), std::vector<float>({
-            -4.24264049530029296875f, 0, 4.44089209850062616169452667236328125e-16f, // vertex 0
-            -3.535533905029296875f, 0, -0.707106769084930419921875f, // vertex 1
-            -3.535533905029296875f, 0, 0.707106769084930419921875f, // vertex 2
-        }))) << recastMesh->getMesh().getVertices();
-        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({1, 2, 0}));
-        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
+        EXPECT_THAT(recastMesh->getMesh().getVertices(),
+            Pointwise(FloatNear(1e-5f),
+                std::vector<float>({
+                    -4.24264049530029296875f, 0, 4.44089209850062616169452667236328125e-16f, // vertex 0
+                    -3.535533905029296875f, 0, -0.707106769084930419921875f, // vertex 1
+                    -3.535533905029296875f, 0, 0.707106769084930419921875f, // vertex 2
+                })))
+            << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({ 1, 2, 0 }));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({ AreaType_ground }));
     }
 
-    TEST_F(DetourNavigatorRecastMeshBuilderTest, with_bounds_add_rotated_by_z_bhv_triangle_shape_should_filter_by_bounds)
+    TEST_F(
+        DetourNavigatorRecastMeshBuilderTest, with_bounds_add_rotated_by_z_bhv_triangle_shape_should_filter_by_bounds)
     {
         mBounds.mMin = osg::Vec2f(-5, -5);
         mBounds.mMax = osg::Vec2f(-1, -1);
@@ -380,20 +387,20 @@ namespace
         mesh.addTriangle(btVector3(-3, -3, 0), btVector3(-3, -2, 0), btVector3(-2, -3, 0));
         btBvhTriangleMeshShape shape(&mesh, true);
         RecastMeshBuilder builder(mBounds);
-        builder.addObject(
-            static_cast<const btCollisionShape&>(shape),
-            btTransform(btQuaternion(btVector3(0, 0, 1),
-            static_cast<btScalar>(osg::PI_4))),
-            AreaType_ground, mSource, mObjectTransform
-        );
+        builder.addObject(static_cast<const btCollisionShape&>(shape),
+            btTransform(btQuaternion(btVector3(0, 0, 1), static_cast<btScalar>(osg::PI_4))), AreaType_ground, mSource,
+            mObjectTransform);
         const auto recastMesh = std::move(builder).create(mVersion);
-        EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5f), std::vector<float>({
-            -1.41421353816986083984375f, -1.1102230246251565404236316680908203125e-16f, 0, // vertex 0
-            1.1102230246251565404236316680908203125e-16f, -1.41421353816986083984375f, 0, // vertex 1
-            1.41421353816986083984375f, 1.1102230246251565404236316680908203125e-16f, 0, // vertex 2
-        }))) << recastMesh->getMesh().getVertices();
-        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 0, 1}));
-        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
+        EXPECT_THAT(recastMesh->getMesh().getVertices(),
+            Pointwise(FloatNear(1e-5f),
+                std::vector<float>({
+                    -1.41421353816986083984375f, -1.1102230246251565404236316680908203125e-16f, 0, // vertex 0
+                    1.1102230246251565404236316680908203125e-16f, -1.41421353816986083984375f, 0, // vertex 1
+                    1.41421353816986083984375f, 1.1102230246251565404236316680908203125e-16f, 0, // vertex 2
+                })))
+            << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({ 2, 0, 1 }));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({ AreaType_ground }));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, flags_values_should_be_corresponding_to_added_objects)
@@ -405,37 +412,32 @@ namespace
         mesh2.addTriangle(btVector3(-3, -3, 0), btVector3(-3, -2, 0), btVector3(-2, -3, 0));
         btBvhTriangleMeshShape shape2(&mesh2, true);
         RecastMeshBuilder builder(mBounds);
-        builder.addObject(
-            static_cast<const btCollisionShape&>(shape1),
-            btTransform::getIdentity(),
-            AreaType_ground, mSource, mObjectTransform
-        );
-        builder.addObject(
-            static_cast<const btCollisionShape&>(shape2),
-            btTransform::getIdentity(),
-            AreaType_null, mSource, mObjectTransform
-        );
+        builder.addObject(static_cast<const btCollisionShape&>(shape1), btTransform::getIdentity(), AreaType_ground,
+            mSource, mObjectTransform);
+        builder.addObject(static_cast<const btCollisionShape&>(shape2), btTransform::getIdentity(), AreaType_null,
+            mSource, mObjectTransform);
         const auto recastMesh = std::move(builder).create(mVersion);
-        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
-            -3, -3, 0, // vertex 0
-            -3, -2, 0, // vertex 1
-            -2, -3, 0, // vertex 2
-            -1, -1, 0, // vertex 3
-            -1, 1, 0, // vertex 4
-            1, -1, 0, // vertex 5
-        })) << recastMesh->getMesh().getVertices();
-        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0, 5, 4, 3}));
-        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_null, AreaType_ground}));
+        EXPECT_EQ(recastMesh->getMesh().getVertices(),
+            std::vector<float>({
+                -3, -3, 0, // vertex 0
+                -3, -2, 0, // vertex 1
+                -2, -3, 0, // vertex 2
+                -1, -1, 0, // vertex 3
+                -1, 1, 0, // vertex 4
+                1, -1, 0, // vertex 5
+            }))
+            << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({ 2, 1, 0, 5, 4, 3 }));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({ AreaType_null, AreaType_ground }));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_water_then_get_water_should_return_it)
     {
         RecastMeshBuilder builder(mBounds);
-        builder.addWater(osg::Vec2i(1, 2), Water {1000, 300.0f});
+        builder.addWater(osg::Vec2i(1, 2), Water{ 1000, 300.0f });
         const auto recastMesh = std::move(builder).create(mVersion);
-        EXPECT_EQ(recastMesh->getWater(), std::vector<CellWater>({
-            CellWater {osg::Vec2i(1, 2), Water {1000, 300.0f}}
-        }));
+        EXPECT_EQ(
+            recastMesh->getWater(), std::vector<CellWater>({ CellWater{ osg::Vec2i(1, 2), Water{ 1000, 300.0f } } }));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_bhv_triangle_mesh_shape_with_duplicated_vertices)
@@ -446,16 +448,19 @@ namespace
         btBvhTriangleMeshShape shape(&mesh, true);
 
         RecastMeshBuilder builder(mBounds);
-        builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground, mSource, mObjectTransform);
+        builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground,
+            mSource, mObjectTransform);
         const auto recastMesh = std::move(builder).create(mVersion);
-        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
-            -1, -1, 0, // vertex 0
-            -1, 1, 0, // vertex 1
-            1, -1, 0, // vertex 2
-            1, 1, 0, // vertex 3
-        })) << recastMesh->getMesh().getVertices();
-        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0, 2, 1, 3}));
-        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground, AreaType_ground}));
+        EXPECT_EQ(recastMesh->getMesh().getVertices(),
+            std::vector<float>({
+                -1, -1, 0, // vertex 0
+                -1, 1, 0, // vertex 1
+                1, -1, 0, // vertex 2
+                1, 1, 0, // vertex 3
+            }))
+            << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({ 2, 1, 0, 2, 1, 3 }));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({ AreaType_ground, AreaType_ground }));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_flat_heightfield_should_add_intersection)
@@ -467,19 +472,20 @@ namespace
         RecastMeshBuilder builder(mBounds);
         builder.addHeightfield(cellPosition, cellSize, height);
         const auto recastMesh = std::move(builder).create(mVersion);
-        EXPECT_EQ(recastMesh->getFlatHeightfields(), std::vector<FlatHeightfield>({
-            FlatHeightfield {cellPosition, cellSize, height},
-        }));
+        EXPECT_EQ(recastMesh->getFlatHeightfields(),
+            std::vector<FlatHeightfield>({
+                FlatHeightfield{ cellPosition, cellSize, height },
+            }));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_heightfield_inside_tile)
     {
         constexpr std::size_t size = 3;
-        constexpr std::array<float, size * size> heights {{
+        constexpr std::array<float, size * size> heights{ {
             0, 1, 2, // row 0
             3, 4, 5, // row 1
             6, 7, 8, // row 2
-        }};
+        } };
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 1000;
         const float minHeight = 0;
@@ -497,17 +503,17 @@ namespace
         expected.mOriginalSize = 3;
         expected.mMinX = 0;
         expected.mMinY = 0;
-        EXPECT_EQ(recastMesh->getHeightfields(), std::vector<Heightfield>({expected}));
+        EXPECT_EQ(recastMesh->getHeightfields(), std::vector<Heightfield>({ expected }));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_heightfield_to_shifted_cell_inside_tile)
     {
         constexpr std::size_t size = 3;
-        constexpr std::array<float, size * size> heights {{
+        constexpr std::array<float, size * size> heights{ {
             0, 1, 2, // row 0
             3, 4, 5, // row 1
             6, 7, 8, // row 2
-        }};
+        } };
         const osg::Vec2i cellPosition(1, 2);
         const int cellSize = 1000;
         const float minHeight = 0;
@@ -525,17 +531,17 @@ namespace
         expected.mOriginalSize = 3;
         expected.mMinX = 0;
         expected.mMinY = 0;
-        EXPECT_EQ(recastMesh->getHeightfields(), std::vector<Heightfield>({expected}));
+        EXPECT_EQ(recastMesh->getHeightfields(), std::vector<Heightfield>({ expected }));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_heightfield_should_add_intersection)
     {
         constexpr std::size_t size = 3;
-        constexpr std::array<float, 3 * 3> heights {{
+        constexpr std::array<float, 3 * 3> heights{ {
             0, 1, 2, // row 0
             3, 4, 5, // row 1
             6, 7, 8, // row 2
-        }};
+        } };
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 1000;
         const float minHeight = 0;
@@ -557,6 +563,6 @@ namespace
         expected.mOriginalSize = 3;
         expected.mMinX = 1;
         expected.mMinY = 1;
-        EXPECT_EQ(recastMesh->getHeightfields(), std::vector<Heightfield>({expected}));
+        EXPECT_EQ(recastMesh->getHeightfields(), std::vector<Heightfield>({ expected }));
     }
 }
diff --git a/apps/openmw_test_suite/detournavigator/recastmeshobject.cpp b/apps/openmw_test_suite/detournavigator/recastmeshobject.cpp
index ff0d3e519c..40d26a9fa0 100644
--- a/apps/openmw_test_suite/detournavigator/recastmeshobject.cpp
+++ b/apps/openmw_test_suite/detournavigator/recastmeshobject.cpp
@@ -15,12 +15,12 @@ namespace
 
     struct DetourNavigatorRecastMeshObjectTest : Test
     {
-        btBoxShape mBoxShapeImpl {btVector3(1, 2, 3)};
-        const ObjectTransform mObjectTransform {ESM::Position {{1, 2, 3}, {1, 2, 3}}, 0.5f};
-        CollisionShape mBoxShape {nullptr, mBoxShapeImpl, mObjectTransform};
-        btCompoundShape mCompoundShapeImpl {true};
-        CollisionShape mCompoundShape {nullptr, mCompoundShapeImpl, mObjectTransform};
-        btTransform mTransform {Misc::Convert::makeBulletTransform(mObjectTransform.mPosition)};
+        btBoxShape mBoxShapeImpl{ btVector3(1, 2, 3) };
+        const ObjectTransform mObjectTransform{ ESM::Position{ { 1, 2, 3 }, { 1, 2, 3 } }, 0.5f };
+        CollisionShape mBoxShape{ nullptr, mBoxShapeImpl, mObjectTransform };
+        btCompoundShape mCompoundShapeImpl{ true };
+        CollisionShape mCompoundShape{ nullptr, mCompoundShapeImpl, mObjectTransform };
+        btTransform mTransform{ Misc::Convert::makeBulletTransform(mObjectTransform.mPosition) };
 
         DetourNavigatorRecastMeshObjectTest()
         {
@@ -53,13 +53,15 @@ namespace
         EXPECT_TRUE(object.update(mTransform, AreaType_null));
     }
 
-    TEST_F(DetourNavigatorRecastMeshObjectTest, update_for_compound_shape_with_same_transform_and_not_changed_child_transform_should_return_false)
+    TEST_F(DetourNavigatorRecastMeshObjectTest,
+        update_for_compound_shape_with_same_transform_and_not_changed_child_transform_should_return_false)
     {
         RecastMeshObject object(mCompoundShape, mTransform, AreaType_ground);
         EXPECT_FALSE(object.update(mTransform, AreaType_ground));
     }
 
-    TEST_F(DetourNavigatorRecastMeshObjectTest, update_for_compound_shape_with_same_transform_and_changed_child_transform_should_return_true)
+    TEST_F(DetourNavigatorRecastMeshObjectTest,
+        update_for_compound_shape_with_same_transform_and_changed_child_transform_should_return_true)
     {
         RecastMeshObject object(mCompoundShape, mTransform, AreaType_ground);
         mCompoundShapeImpl.updateChildTransform(0, btTransform::getIdentity());
diff --git a/apps/openmw_test_suite/detournavigator/settingsutils.cpp b/apps/openmw_test_suite/detournavigator/settingsutils.cpp
index f06f3b3e32..31fb8b5fbb 100644
--- a/apps/openmw_test_suite/detournavigator/settingsutils.cpp
+++ b/apps/openmw_test_suite/detournavigator/settingsutils.cpp
@@ -58,11 +58,12 @@ namespace
 
     TEST_F(DetourNavigatorMakeTileBoundsTest, tile_bounds_depend_on_tile_size_and_cell_size)
     {
-        EXPECT_EQ(makeTileBounds(mSettings, TilePosition(0, 0)), (TileBounds {osg::Vec2f(0, 0), osg::Vec2f(32, 32)}));
+        EXPECT_EQ(makeTileBounds(mSettings, TilePosition(0, 0)), (TileBounds{ osg::Vec2f(0, 0), osg::Vec2f(32, 32) }));
     }
 
     TEST_F(DetourNavigatorMakeTileBoundsTest, tile_bounds_are_multiplied_by_tile_position)
     {
-        EXPECT_EQ(makeTileBounds(mSettings, TilePosition(1, 2)), (TileBounds {osg::Vec2f(32, 64), osg::Vec2f(64, 96)}));
+        EXPECT_EQ(
+            makeTileBounds(mSettings, TilePosition(1, 2)), (TileBounds{ osg::Vec2f(32, 64), osg::Vec2f(64, 96) }));
     }
 }
diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
index 1068bedea0..54ca8dda3a 100644
--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -1,14 +1,14 @@
 #include "operators.hpp"
 
-#include <components/detournavigator/tilecachedrecastmeshmanager.hpp>
 #include <components/detournavigator/settingsutils.hpp>
+#include <components/detournavigator/tilecachedrecastmeshmanager.hpp>
 
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 
 #include <osg/io_utils>
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 namespace
 {
@@ -18,7 +18,7 @@ namespace
     struct DetourNavigatorTileCachedRecastMeshManagerTest : Test
     {
         RecastSettings mSettings;
-        const ObjectTransform mObjectTransform {ESM::Position {{0, 0, 0}, {0, 0, 0}}, 0.0f};
+        const ObjectTransform mObjectTransform{ ESM::Position{ { 0, 0, 0 }, { 0, 0, 0 } }, 0.0f };
         const osg::ref_ptr<const Resource::BulletShape> mShape = new Resource::BulletShape;
         const osg::ref_ptr<const Resource::BulletShapeInstance> mInstance = new Resource::BulletShapeInstance(mShape);
 
@@ -48,7 +48,8 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        EXPECT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr));
+        EXPECT_TRUE(manager.addObject(
+            ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr));
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_object_for_existing_object_should_return_false)
@@ -57,7 +58,8 @@ namespace
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr);
-        EXPECT_FALSE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr));
+        EXPECT_FALSE(manager.addObject(
+            ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr));
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_object_should_add_tiles)
@@ -66,7 +68,8 @@ namespace
         manager.setWorldspace("worldspace", nullptr);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr));
+        ASSERT_TRUE(manager.addObject(
+            ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr));
         for (int x = -1; x < 1; ++x)
             for (int y = -1; y < 1; ++y)
                 ASSERT_NE(manager.getMesh("worldspace", TilePosition(x, y)), nullptr);
@@ -89,7 +92,8 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
+        const btTransform transform(
+            btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         TileBounds bounds;
         bounds.mMin = osg::Vec2f(-1000, -1000);
@@ -97,25 +101,25 @@ namespace
         manager.setBounds(bounds, nullptr);
         manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground, nullptr);
         manager.takeChangedTiles(nullptr);
-        EXPECT_TRUE(manager.updateObject(ObjectId(&boxShape), btTransform::getIdentity(), AreaType::AreaType_ground, nullptr));
-        EXPECT_THAT(manager.takeChangedTiles(nullptr), ElementsAre(
-            std::pair(TilePosition(-1, -1), ChangeType::add),
-            std::pair(TilePosition(-1, 0), ChangeType::add),
-            std::pair(TilePosition(0, -1), ChangeType::update),
-            std::pair(TilePosition(0, 0), ChangeType::update),
-            std::pair(TilePosition(1, -1), ChangeType::remove),
-            std::pair(TilePosition(1, 0), ChangeType::remove)
-        ));
+        EXPECT_TRUE(
+            manager.updateObject(ObjectId(&boxShape), btTransform::getIdentity(), AreaType::AreaType_ground, nullptr));
+        EXPECT_THAT(manager.takeChangedTiles(nullptr),
+            ElementsAre(std::pair(TilePosition(-1, -1), ChangeType::add),
+                std::pair(TilePosition(-1, 0), ChangeType::add), std::pair(TilePosition(0, -1), ChangeType::update),
+                std::pair(TilePosition(0, 0), ChangeType::update), std::pair(TilePosition(1, -1), ChangeType::remove),
+                std::pair(TilePosition(1, 0), ChangeType::remove)));
     }
 
-    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, update_object_for_not_changed_object_should_not_add_changed_tiles)
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest,
+        update_object_for_not_changed_object_should_not_add_changed_tiles)
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr);
         manager.takeChangedTiles(nullptr);
-        EXPECT_FALSE(manager.updateObject(ObjectId(&boxShape), btTransform::getIdentity(), AreaType::AreaType_ground, nullptr));
+        EXPECT_FALSE(
+            manager.updateObject(ObjectId(&boxShape), btTransform::getIdentity(), AreaType::AreaType_ground, nullptr));
         EXPECT_THAT(manager.takeChangedTiles(nullptr), IsEmpty());
     }
 
@@ -134,7 +138,8 @@ namespace
         EXPECT_THAT(manager.takeChangedTiles(nullptr), ElementsAre(std::pair(TilePosition(0, 0), ChangeType::remove)));
     }
 
-    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_after_add_object_should_return_recast_mesh_for_each_used_tile)
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest,
+        get_mesh_after_add_object_should_return_recast_mesh_for_each_used_tile)
     {
         TileCachedRecastMeshManager manager(mSettings);
         manager.setWorldspace("worldspace", nullptr);
@@ -147,7 +152,8 @@ namespace
         EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, 0)), nullptr);
     }
 
-    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_after_add_object_should_return_nullptr_for_unused_tile)
+    TEST_F(
+        DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_after_add_object_should_return_nullptr_for_unused_tile)
     {
         TileCachedRecastMeshManager manager(mSettings);
         manager.setWorldspace("worldspace", nullptr);
@@ -157,7 +163,8 @@ namespace
         EXPECT_EQ(manager.getMesh("worldspace", TilePosition(1, 0)), nullptr);
     }
 
-    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_for_moved_object_should_return_recast_mesh_for_each_used_tile)
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest,
+        get_mesh_for_moved_object_should_return_recast_mesh_for_each_used_tile)
     {
         TileCachedRecastMeshManager manager(mSettings);
         TileBounds bounds;
@@ -167,7 +174,8 @@ namespace
         manager.setWorldspace("worldspace", nullptr);
 
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
+        const btTransform transform(
+            btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
 
         manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground, nullptr);
@@ -183,13 +191,15 @@ namespace
         EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, 0)), nullptr);
     }
 
-    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_for_moved_object_should_return_nullptr_for_unused_tile)
+    TEST_F(
+        DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_for_moved_object_should_return_nullptr_for_unused_tile)
     {
         TileCachedRecastMeshManager manager(mSettings);
         manager.setWorldspace("worldspace", nullptr);
 
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
+        const btTransform transform(
+            btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
 
         manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground, nullptr);
@@ -201,7 +211,8 @@ namespace
         EXPECT_EQ(manager.getMesh("worldspace", TilePosition(1, -1)), nullptr);
     }
 
-    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_for_removed_object_should_return_nullptr_for_all_previously_used_tiles)
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest,
+        get_mesh_for_removed_object_should_return_nullptr_for_all_previously_used_tiles)
     {
         TileCachedRecastMeshManager manager(mSettings);
         manager.setWorldspace("worldspace", nullptr);
@@ -215,7 +226,8 @@ namespace
         EXPECT_EQ(manager.getMesh("worldspace", TilePosition(0, 0)), nullptr);
     }
 
-    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_for_not_changed_object_after_update_should_return_recast_mesh_for_same_tiles)
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest,
+        get_mesh_for_not_changed_object_after_update_should_return_recast_mesh_for_same_tiles)
     {
         TileCachedRecastMeshManager manager(mSettings);
         manager.setWorldspace("worldspace", nullptr);
@@ -235,7 +247,8 @@ namespace
         EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, 0)), nullptr);
     }
 
-    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_revision_after_add_object_new_should_return_incremented_value)
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest,
+        get_revision_after_add_object_new_should_return_incremented_value)
     {
         TileCachedRecastMeshManager manager(mSettings);
         const auto initialRevision = manager.getRevision();
@@ -245,22 +258,26 @@ namespace
         EXPECT_EQ(manager.getRevision(), initialRevision + 1);
     }
 
-    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_revision_after_add_object_existing_should_return_same_value)
+    TEST_F(
+        DetourNavigatorTileCachedRecastMeshManagerTest, get_revision_after_add_object_existing_should_return_same_value)
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr);
         const auto beforeAddRevision = manager.getRevision();
-        EXPECT_FALSE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr));
+        EXPECT_FALSE(manager.addObject(
+            ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr));
         EXPECT_EQ(manager.getRevision(), beforeAddRevision);
     }
 
-    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_revision_after_update_moved_object_should_return_incremented_value)
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest,
+        get_revision_after_update_moved_object_should_return_incremented_value)
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
+        const btTransform transform(
+            btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground, nullptr);
         const auto beforeUpdateRevision = manager.getRevision();
@@ -268,7 +285,8 @@ namespace
         EXPECT_EQ(manager.getRevision(), beforeUpdateRevision + 1);
     }
 
-    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_revision_after_update_not_changed_object_should_return_same_value)
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest,
+        get_revision_after_update_not_changed_object_should_return_same_value)
     {
         TileCachedRecastMeshManager manager(mSettings);
         manager.setWorldspace("worldspace", nullptr);
@@ -280,7 +298,8 @@ namespace
         EXPECT_EQ(manager.getRevision(), beforeUpdateRevision);
     }
 
-    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_revision_after_remove_existing_object_should_return_incremented_value)
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest,
+        get_revision_after_remove_existing_object_should_return_incremented_value)
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
@@ -291,7 +310,8 @@ namespace
         EXPECT_EQ(manager.getRevision(), beforeRemoveRevision + 1);
     }
 
-    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_revision_after_remove_absent_object_should_return_same_value)
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest,
+        get_revision_after_remove_absent_object_should_return_same_value)
     {
         TileCachedRecastMeshManager manager(mSettings);
         const auto beforeRemoveRevision = manager.getRevision();
@@ -330,13 +350,15 @@ namespace
         manager.setWorldspace("worldspace", nullptr);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr));
+        ASSERT_TRUE(manager.addObject(
+            ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr));
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = std::numeric_limits<int>::max();
         manager.addWater(cellPosition, cellSize, 0.0f, nullptr);
         for (int x = -6; x < 6; ++x)
             for (int y = -6; y < 6; ++y)
-                ASSERT_EQ(manager.getMesh("worldspace", TilePosition(x, y)) != nullptr, -1 <= x && x <= 0 && -1 <= y && y <= 0);
+                ASSERT_EQ(manager.getMesh("worldspace", TilePosition(x, y)) != nullptr,
+                    -1 <= x && x <= 0 && -1 <= y && y <= 0);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, remove_water_for_absent_cell_should_not_add_changed_tiles)
@@ -380,14 +402,16 @@ namespace
         manager.setWorldspace("worldspace", nullptr);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr));
+        ASSERT_TRUE(manager.addObject(
+            ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr));
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
         manager.addWater(cellPosition, cellSize, 0.0f, nullptr);
         manager.removeWater(cellPosition, nullptr);
         for (int x = -6; x < 6; ++x)
             for (int y = -6; y < 6; ++y)
-                ASSERT_EQ(manager.getMesh("worldspace", TilePosition(x, y)) != nullptr, -1 <= x && x <= 0 && -1 <= y && y <= 0);
+                ASSERT_EQ(manager.getMesh("worldspace", TilePosition(x, y)) != nullptr,
+                    -1 <= x && x <= 0 && -1 <= y && y <= 0);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, remove_object_should_not_remove_tile_with_water)
@@ -398,7 +422,8 @@ namespace
         const int cellSize = 8192;
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr));
+        ASSERT_TRUE(manager.addObject(
+            ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr));
         manager.addWater(cellPosition, cellSize, 0.0f, nullptr);
         manager.removeObject(ObjectId(&boxShape), nullptr);
         for (int x = -1; x < 12; ++x)
@@ -412,7 +437,8 @@ namespace
         manager.setWorldspace("worldspace", nullptr);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(nullptr, boxShape, mObjectTransform);
-        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr));
+        ASSERT_TRUE(manager.addObject(
+            ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr));
         manager.setWorldspace("other", nullptr);
         for (int x = -1; x < 1; ++x)
             for (int y = -1; y < 1; ++y)
@@ -433,9 +459,8 @@ namespace
         bounds.mMax = osg::Vec2f(0, -182);
         manager.takeChangedTiles(nullptr);
         manager.setBounds(bounds, nullptr);
-        EXPECT_THAT(manager.takeChangedTiles(nullptr), ElementsAre(
-            std::pair(TilePosition(-1, -1), ChangeType::add),
-            std::pair(TilePosition(0, 0), ChangeType::remove)
-        ));
+        EXPECT_THAT(manager.takeChangedTiles(nullptr),
+            ElementsAre(
+                std::pair(TilePosition(-1, -1), ChangeType::add), std::pair(TilePosition(0, 0), ChangeType::remove)));
     }
 }
diff --git a/apps/openmw_test_suite/esm/test_fixed_string.cpp b/apps/openmw_test_suite/esm/test_fixed_string.cpp
index 2a3e00d605..078cb8609e 100644
--- a/apps/openmw_test_suite/esm/test_fixed_string.cpp
+++ b/apps/openmw_test_suite/esm/test_fixed_string.cpp
@@ -1,13 +1,13 @@
-#include <gtest/gtest.h>
-#include "components/esm/esmcommon.hpp"
 #include "components/esm/defs.hpp"
+#include "components/esm/esmcommon.hpp"
+#include <gtest/gtest.h>
 
 TEST(EsmFixedString, operator__eq_ne)
 {
     {
         SCOPED_TRACE("asdc == asdc");
         constexpr ESM::NAME name("asdc");
-        char s[4] = {'a', 's', 'd', 'c'};
+        char s[4] = { 'a', 's', 'd', 'c' };
         std::string ss(s, 4);
 
         EXPECT_TRUE(name == s);
@@ -17,7 +17,7 @@ TEST(EsmFixedString, operator__eq_ne)
     {
         SCOPED_TRACE("asdc == asdcx");
         constexpr ESM::NAME name("asdc");
-        char s[5] = {'a', 's', 'd', 'c', 'x'};
+        char s[5] = { 'a', 's', 'd', 'c', 'x' };
         std::string ss(s, 5);
 
         EXPECT_TRUE(name != s);
@@ -27,7 +27,7 @@ TEST(EsmFixedString, operator__eq_ne)
     {
         SCOPED_TRACE("asdc == asdc[NULL]");
         const ESM::NAME name("asdc");
-        char s[5] = {'a', 's', 'd', 'c', '\0'};
+        char s[5] = { 'a', 's', 'd', 'c', '\0' };
         std::string ss(s, 5);
 
         EXPECT_TRUE(name == s);
diff --git a/apps/openmw_test_suite/esm/variant.cpp b/apps/openmw_test_suite/esm/variant.cpp
index 53f31cc1c9..2a59bf5ea6 100644
--- a/apps/openmw_test_suite/esm/variant.cpp
+++ b/apps/openmw_test_suite/esm/variant.cpp
@@ -1,10 +1,10 @@
-#include <components/esm3/variant.hpp>
-#include <components/esm3/esmwriter.hpp>
 #include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/esm3/loadglob.hpp>
+#include <components/esm3/variant.hpp>
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 #include <functional>
 
@@ -30,21 +30,21 @@ namespace
 
     TEST(ESMVariantTest, move_constructed_should_have_data)
     {
-        Variant a(int{42});
+        Variant a(int{ 42 });
         const Variant b(std::move(a));
         ASSERT_EQ(b.getInteger(), 42);
     }
 
     TEST(ESMVariantTest, copy_constructed_is_equal_to_source)
     {
-        const Variant a(int{42});
+        const Variant a(int{ 42 });
         const Variant b(a);
         ASSERT_EQ(a, b);
     }
 
     TEST(ESMVariantTest, copy_constructed_does_not_share_data_with_source)
     {
-        const Variant a(int{42});
+        const Variant a(int{ 42 });
         Variant b(a);
         b.setInteger(13);
         ASSERT_EQ(a.getInteger(), 42);
@@ -55,7 +55,7 @@ namespace
     {
         Variant b;
         {
-            Variant a(int{42});
+            Variant a(int{ 42 });
             b = std::move(a);
         }
         ASSERT_EQ(b.getInteger(), 42);
@@ -63,7 +63,7 @@ namespace
 
     TEST(ESMVariantTest, copy_assigned_is_equal_to_source)
     {
-        const Variant a(int{42});
+        const Variant a(int{ 42 });
         Variant b;
         b = a;
         ASSERT_EQ(a, b);
@@ -71,7 +71,7 @@ namespace
 
     TEST(ESMVariantTest, not_equal_is_negation_of_equal)
     {
-        const Variant a(int{42});
+        const Variant a(int{ 42 });
         Variant b;
         b = a;
         ASSERT_TRUE(!(a != b));
@@ -79,10 +79,12 @@ namespace
 
     TEST(ESMVariantTest, different_types_are_not_equal)
     {
-        ASSERT_NE(Variant(int{42}), Variant(float{2.7f}));
+        ASSERT_NE(Variant(int{ 42 }), Variant(float{ 2.7f }));
     }
 
-    struct ESMVariantWriteToOStreamTest : TestWithParam<std::tuple<Variant, std::string>> {};
+    struct ESMVariantWriteToOStreamTest : TestWithParam<std::tuple<Variant, std::string>>
+    {
+    };
 
     TEST_P(ESMVariantWriteToOStreamTest, should_write)
     {
@@ -92,17 +94,17 @@ namespace
         ASSERT_EQ(s.str(), result);
     }
 
-    INSTANTIATE_TEST_SUITE_P(VariantAsString, ESMVariantWriteToOStreamTest, Values(
-        std::make_tuple(Variant(), "variant none"),
-        std::make_tuple(Variant(int{42}), "variant long: 42"),
-        std::make_tuple(Variant(float{2.7f}), "variant float: 2.7"),
-        std::make_tuple(Variant(std::string("foo")), "variant string: \"foo\""),
-        std::make_tuple(makeVariant(VT_Unknown), "variant unknown"),
-        std::make_tuple(makeVariant(VT_Short, 42), "variant short: 42"),
-        std::make_tuple(makeVariant(VT_Int, 42), "variant int: 42")
-    ));
+    INSTANTIATE_TEST_SUITE_P(VariantAsString, ESMVariantWriteToOStreamTest,
+        Values(std::make_tuple(Variant(), "variant none"), std::make_tuple(Variant(int{ 42 }), "variant long: 42"),
+            std::make_tuple(Variant(float{ 2.7f }), "variant float: 2.7"),
+            std::make_tuple(Variant(std::string("foo")), "variant string: \"foo\""),
+            std::make_tuple(makeVariant(VT_Unknown), "variant unknown"),
+            std::make_tuple(makeVariant(VT_Short, 42), "variant short: 42"),
+            std::make_tuple(makeVariant(VT_Int, 42), "variant int: 42")));
 
-    struct ESMVariantGetTypeTest : Test {};
+    struct ESMVariantGetTypeTest : Test
+    {
+    };
 
     TEST(ESMVariantGetTypeTest, default_constructed_should_return_none)
     {
@@ -130,7 +132,9 @@ namespace
         ASSERT_EQ(Variant(std::string{}).getType(), VT_String);
     }
 
-    struct ESMVariantGetIntegerTest : Test {};
+    struct ESMVariantGetIntegerTest : Test
+    {
+    };
 
     TEST(ESMVariantGetIntegerTest, for_default_constructed_should_throw_exception)
     {
@@ -139,13 +143,13 @@ namespace
 
     TEST(ESMVariantGetIntegerTest, for_constructed_from_int_should_return_same_value)
     {
-        const Variant variant(int{42});
+        const Variant variant(int{ 42 });
         ASSERT_EQ(variant.getInteger(), 42);
     }
 
     TEST(ESMVariantGetIntegerTest, for_constructed_from_float_should_return_casted_to_int)
     {
-        const Variant variant(float{2.7});
+        const Variant variant(float{ 2.7 });
         ASSERT_EQ(variant.getInteger(), 2);
     }
 
@@ -162,13 +166,13 @@ namespace
 
     TEST(ESMVariantGetFloatTest, for_constructed_from_int_should_return_casted_to_float)
     {
-        const Variant variant(int{42});
+        const Variant variant(int{ 42 });
         ASSERT_EQ(variant.getFloat(), 42);
     }
 
     TEST(ESMVariantGetFloatTest, for_constructed_from_float_should_return_same_value)
     {
-        const Variant variant(float{2.7f});
+        const Variant variant(float{ 2.7f });
         ASSERT_EQ(variant.getFloat(), 2.7f);
     }
 
@@ -185,13 +189,13 @@ namespace
 
     TEST(ESMVariantGetStringTest, for_constructed_from_int_should_throw_exception)
     {
-        const Variant variant(int{42});
+        const Variant variant(int{ 42 });
         ASSERT_THROW(variant.getString(), std::bad_variant_access);
     }
 
     TEST(ESMVariantGetStringTest, for_constructed_from_float_should_throw_exception)
     {
-        const Variant variant(float{2.7});
+        const Variant variant(float{ 2.7 });
         ASSERT_THROW(variant.getString(), std::bad_variant_access);
     }
 
@@ -203,28 +207,28 @@ namespace
 
     TEST(ESMVariantSetTypeTest, for_unknown_should_reset_data)
     {
-        Variant variant(int{42});
+        Variant variant(int{ 42 });
         variant.setType(VT_Unknown);
         ASSERT_THROW(variant.getInteger(), std::runtime_error);
     }
 
     TEST(ESMVariantSetTypeTest, for_none_should_reset_data)
     {
-        Variant variant(int{42});
+        Variant variant(int{ 42 });
         variant.setType(VT_None);
         ASSERT_THROW(variant.getInteger(), std::runtime_error);
     }
 
     TEST(ESMVariantSetTypeTest, for_same_type_should_not_change_value)
     {
-        Variant variant(int{42});
+        Variant variant(int{ 42 });
         variant.setType(VT_Long);
         ASSERT_EQ(variant.getInteger(), 42);
     }
 
     TEST(ESMVariantSetTypeTest, for_float_replaced_by_int_should_cast_float_to_int)
     {
-        Variant variant(float{2.7f});
+        Variant variant(float{ 2.7f });
         variant.setType(VT_Int);
         ASSERT_EQ(variant.getInteger(), 2);
     }
@@ -245,28 +249,28 @@ namespace
 
     TEST(ESMVariantSetTypeTest, for_float_replaced_by_short_should_cast_data_to_int)
     {
-        Variant variant(float{2.7f});
+        Variant variant(float{ 2.7f });
         variant.setType(VT_Short);
         ASSERT_EQ(variant.getInteger(), 2);
     }
 
     TEST(ESMVariantSetTypeTest, for_float_replaced_by_long_should_cast_data_to_int)
     {
-        Variant variant(float{2.7f});
+        Variant variant(float{ 2.7f });
         variant.setType(VT_Long);
         ASSERT_EQ(variant.getInteger(), 2);
     }
 
     TEST(ESMVariantSetTypeTest, for_int_replaced_by_float_should_cast_data_to_float)
     {
-        Variant variant(int{42});
+        Variant variant(int{ 42 });
         variant.setType(VT_Float);
         ASSERT_EQ(variant.getFloat(), 42.0f);
     }
 
     TEST(ESMVariantSetTypeTest, for_int_replaced_by_string_should_set_default_initialized_data)
     {
-        Variant variant(int{42});
+        Variant variant(int{ 42 });
         variant.setType(VT_String);
         ASSERT_EQ(variant.getString(), "");
     }
@@ -286,7 +290,7 @@ namespace
 
     TEST(ESMVariantSetIntegerTest, for_default_int_should_change_value)
     {
-        Variant variant(int{13});
+        Variant variant(int{ 13 });
         variant.setInteger(42);
         ASSERT_EQ(variant.getInteger(), 42);
     }
@@ -309,7 +313,7 @@ namespace
 
     TEST(ESMVariantSetIntegerTest, for_float_should_change_value)
     {
-        Variant variant(float{2.7f});
+        Variant variant(float{ 2.7f });
         variant.setInteger(42);
         ASSERT_EQ(variant.getFloat(), 42.0f);
     }
@@ -335,7 +339,7 @@ namespace
 
     TEST(ESMVariantSetFloatTest, for_default_int_should_change_value)
     {
-        Variant variant(int{13});
+        Variant variant(int{ 13 });
         variant.setFloat(2.7f);
         ASSERT_EQ(variant.getInteger(), 2);
     }
@@ -358,7 +362,7 @@ namespace
 
     TEST(ESMVariantSetFloatTest, for_float_should_change_value)
     {
-        Variant variant(float{2.7f});
+        Variant variant(float{ 2.7f });
         variant.setFloat(3.14f);
         ASSERT_EQ(variant.getFloat(), 3.14f);
     }
@@ -384,7 +388,7 @@ namespace
 
     TEST(ESMVariantSetStringTest, for_default_int_should_throw_exception)
     {
-        Variant variant(int{13});
+        Variant variant(int{ 13 });
         ASSERT_THROW(variant.setString("foo"), std::bad_variant_access);
     }
 
@@ -404,7 +408,7 @@ namespace
 
     TEST(ESMVariantSetStringTest, for_float_should_throw_exception)
     {
-        Variant variant(float{2.7f});
+        Variant variant(float{ 2.7f });
         ASSERT_THROW(variant.setString("foo"), std::bad_variant_access);
     }
 
@@ -419,7 +423,7 @@ namespace
     {
         Variant mVariant;
         Variant::Format mFormat;
-        std::size_t mDataSize {};
+        std::size_t mDataSize{};
     };
 
     std::string write(const Variant& variant, const Variant::Format format)
@@ -448,7 +452,9 @@ namespace
         return read(format, data);
     }
 
-    struct ESMVariantToESMTest : TestWithParam<WriteToESMTestCase> {};
+    struct ESMVariantToESMTest : TestWithParam<WriteToESMTestCase>
+    {
+    };
 
     TEST_P(ESMVariantToESMTest, deserialized_is_equal_to_serialized)
     {
@@ -457,19 +463,20 @@ namespace
         ASSERT_EQ(param.mVariant, result);
     }
 
-    INSTANTIATE_TEST_SUITE_P(VariantAndData, ESMVariantToESMTest, Values(
-        WriteToESMTestCase {Variant(), Variant::Format_Gmst, 324},
-        WriteToESMTestCase {Variant(int{42}), Variant::Format_Global, 345},
-        WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Global, 345},
-        WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Info, 336},
-        WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Local, 336},
-        WriteToESMTestCase {makeVariant(VT_Short, 42), Variant::Format_Global, 345},
-        WriteToESMTestCase {makeVariant(VT_Short, 42), Variant::Format_Local, 334},
-        WriteToESMTestCase {makeVariant(VT_Int, 42), Variant::Format_Info, 336},
-        WriteToESMTestCase {makeVariant(VT_Int, 42), Variant::Format_Local, 336}
-    ));
+    INSTANTIATE_TEST_SUITE_P(VariantAndData, ESMVariantToESMTest,
+        Values(WriteToESMTestCase{ Variant(), Variant::Format_Gmst, 324 },
+            WriteToESMTestCase{ Variant(int{ 42 }), Variant::Format_Global, 345 },
+            WriteToESMTestCase{ Variant(float{ 2.7f }), Variant::Format_Global, 345 },
+            WriteToESMTestCase{ Variant(float{ 2.7f }), Variant::Format_Info, 336 },
+            WriteToESMTestCase{ Variant(float{ 2.7f }), Variant::Format_Local, 336 },
+            WriteToESMTestCase{ makeVariant(VT_Short, 42), Variant::Format_Global, 345 },
+            WriteToESMTestCase{ makeVariant(VT_Short, 42), Variant::Format_Local, 334 },
+            WriteToESMTestCase{ makeVariant(VT_Int, 42), Variant::Format_Info, 336 },
+            WriteToESMTestCase{ makeVariant(VT_Int, 42), Variant::Format_Local, 336 }));
 
-    struct ESMVariantToESMNoneTest : TestWithParam<WriteToESMTestCase> {};
+    struct ESMVariantToESMNoneTest : TestWithParam<WriteToESMTestCase>
+    {
+    };
 
     TEST_P(ESMVariantToESMNoneTest, deserialized_is_none)
     {
@@ -478,13 +485,14 @@ namespace
         ASSERT_EQ(Variant(), result);
     }
 
-    INSTANTIATE_TEST_SUITE_P(VariantAndData, ESMVariantToESMNoneTest, Values(
-        WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Gmst, 336},
-        WriteToESMTestCase {Variant(std::string("foo")), Variant::Format_Gmst, 335},
-        WriteToESMTestCase {makeVariant(VT_Int, 42), Variant::Format_Gmst, 336}
-    ));
+    INSTANTIATE_TEST_SUITE_P(VariantAndData, ESMVariantToESMNoneTest,
+        Values(WriteToESMTestCase{ Variant(float{ 2.7f }), Variant::Format_Gmst, 336 },
+            WriteToESMTestCase{ Variant(std::string("foo")), Variant::Format_Gmst, 335 },
+            WriteToESMTestCase{ makeVariant(VT_Int, 42), Variant::Format_Gmst, 336 }));
 
-    struct ESMVariantWriteToESMFailTest : TestWithParam<WriteToESMTestCase> {};
+    struct ESMVariantWriteToESMFailTest : TestWithParam<WriteToESMTestCase>
+    {
+    };
 
     TEST_P(ESMVariantWriteToESMFailTest, write_is_not_supported)
     {
@@ -495,19 +503,18 @@ namespace
         ASSERT_THROW(param.mVariant.write(writer, param.mFormat), std::runtime_error);
     }
 
-    INSTANTIATE_TEST_SUITE_P(VariantAndFormat, ESMVariantWriteToESMFailTest, Values(
-        WriteToESMTestCase {Variant(), Variant::Format_Global},
-        WriteToESMTestCase {Variant(), Variant::Format_Info},
-        WriteToESMTestCase {Variant(), Variant::Format_Local},
-        WriteToESMTestCase {Variant(int{42}), Variant::Format_Gmst},
-        WriteToESMTestCase {Variant(int{42}), Variant::Format_Info},
-        WriteToESMTestCase {Variant(int{42}), Variant::Format_Local},
-        WriteToESMTestCase {Variant(std::string("foo")), Variant::Format_Global},
-        WriteToESMTestCase {Variant(std::string("foo")), Variant::Format_Info},
-        WriteToESMTestCase {Variant(std::string("foo")), Variant::Format_Local},
-        WriteToESMTestCase {makeVariant(VT_Unknown), Variant::Format_Global},
-        WriteToESMTestCase {makeVariant(VT_Int, 42), Variant::Format_Global},
-        WriteToESMTestCase {makeVariant(VT_Short, 42), Variant::Format_Gmst},
-        WriteToESMTestCase {makeVariant(VT_Short, 42), Variant::Format_Info}
-    ));
+    INSTANTIATE_TEST_SUITE_P(VariantAndFormat, ESMVariantWriteToESMFailTest,
+        Values(WriteToESMTestCase{ Variant(), Variant::Format_Global },
+            WriteToESMTestCase{ Variant(), Variant::Format_Info },
+            WriteToESMTestCase{ Variant(), Variant::Format_Local },
+            WriteToESMTestCase{ Variant(int{ 42 }), Variant::Format_Gmst },
+            WriteToESMTestCase{ Variant(int{ 42 }), Variant::Format_Info },
+            WriteToESMTestCase{ Variant(int{ 42 }), Variant::Format_Local },
+            WriteToESMTestCase{ Variant(std::string("foo")), Variant::Format_Global },
+            WriteToESMTestCase{ Variant(std::string("foo")), Variant::Format_Info },
+            WriteToESMTestCase{ Variant(std::string("foo")), Variant::Format_Local },
+            WriteToESMTestCase{ makeVariant(VT_Unknown), Variant::Format_Global },
+            WriteToESMTestCase{ makeVariant(VT_Int, 42), Variant::Format_Global },
+            WriteToESMTestCase{ makeVariant(VT_Short, 42), Variant::Format_Gmst },
+            WriteToESMTestCase{ makeVariant(VT_Short, 42), Variant::Format_Info }));
 }
diff --git a/apps/openmw_test_suite/esm3/readerscache.cpp b/apps/openmw_test_suite/esm3/readerscache.cpp
index 019a18b0b3..ccb5c971ac 100644
--- a/apps/openmw_test_suite/esm3/readerscache.cpp
+++ b/apps/openmw_test_suite/esm3/readerscache.cpp
@@ -39,8 +39,8 @@ namespace
     {
         static constexpr std::size_t sInitialOffset = 324;
         static constexpr std::size_t sSkip = 100;
-        const Files::PathContainer mDataDirs {{std::filesystem::path{OPENMW_DATA_DIR}}};
-        const Files::Collections mFileCollections {mDataDirs, true};
+        const Files::PathContainer mDataDirs{ { std::filesystem::path{ OPENMW_DATA_DIR } } };
+        const Files::Collections mFileCollections{ mDataDirs, true };
         const std::string mContentFile = "template.omwgame";
         const std::filesystem::path mContentFilePath = mFileCollections.getCollection(".omwgame").getPath(mContentFile);
     };
diff --git a/apps/openmw_test_suite/esmloader/esmdata.cpp b/apps/openmw_test_suite/esmloader/esmdata.cpp
index a697aae531..cfe4092970 100644
--- a/apps/openmw_test_suite/esmloader/esmdata.cpp
+++ b/apps/openmw_test_suite/esmloader/esmdata.cpp
@@ -25,10 +25,12 @@ namespace
         std::string mRefId;
         ESM::RecNameInts mType;
         std::string mResult;
-        std::function<void (EsmData&)> mPushBack;
+        std::function<void(EsmData&)> mPushBack;
     };
 
-    struct EsmLoaderGetModelTest : TestWithParam<Params> {};
+    struct EsmLoaderGetModelTest : TestWithParam<Params>
+    {
+    };
 
     TEST_P(EsmLoaderGetModelTest, shouldReturnFoundModelName)
     {
@@ -73,20 +75,21 @@ namespace
     };
 
     const std::array params = {
-        Params {"acti_ref_id", ESM::REC_ACTI, "acti_model", PushBack<ESM::Activator> {"acti_ref_id", "acti_model"}},
-        Params {"cont_ref_id", ESM::REC_CONT, "cont_model", PushBack<ESM::Container> {"cont_ref_id", "cont_model"}},
-        Params {"door_ref_id", ESM::REC_DOOR, "door_model", PushBack<ESM::Door> {"door_ref_id", "door_model"}},
-        Params {"static_ref_id", ESM::REC_STAT, "static_model", PushBack<ESM::Static> {"static_ref_id", "static_model"}},
-        Params {"acti_ref_id_a", ESM::REC_ACTI, "", PushBack<ESM::Activator> {"acti_ref_id_z", "acti_model"}},
-        Params {"cont_ref_id_a", ESM::REC_CONT, "", PushBack<ESM::Container> {"cont_ref_id_z", "cont_model"}},
-        Params {"door_ref_id_a", ESM::REC_DOOR, "", PushBack<ESM::Door> {"door_ref_id_z", "door_model"}},
-        Params {"static_ref_id_a", ESM::REC_STAT, "", PushBack<ESM::Static> {"static_ref_id_z", "static_model"}},
-        Params {"acti_ref_id_z", ESM::REC_ACTI, "", PushBack<ESM::Activator> {"acti_ref_id_a", "acti_model"}},
-        Params {"cont_ref_id_z", ESM::REC_CONT, "", PushBack<ESM::Container> {"cont_ref_id_a", "cont_model"}},
-        Params {"door_ref_id_z", ESM::REC_DOOR, "", PushBack<ESM::Door> {"door_ref_id_a", "door_model"}},
-        Params {"static_ref_id_z", ESM::REC_STAT, "", PushBack<ESM::Static> {"static_ref_id_a", "static_model"}},
-        Params {"ref_id", ESM::REC_STAT, "", [] (EsmData&) {}},
-        Params {"ref_id", ESM::REC_BOOK, "", [] (EsmData&) {}},
+        Params{ "acti_ref_id", ESM::REC_ACTI, "acti_model", PushBack<ESM::Activator>{ "acti_ref_id", "acti_model" } },
+        Params{ "cont_ref_id", ESM::REC_CONT, "cont_model", PushBack<ESM::Container>{ "cont_ref_id", "cont_model" } },
+        Params{ "door_ref_id", ESM::REC_DOOR, "door_model", PushBack<ESM::Door>{ "door_ref_id", "door_model" } },
+        Params{
+            "static_ref_id", ESM::REC_STAT, "static_model", PushBack<ESM::Static>{ "static_ref_id", "static_model" } },
+        Params{ "acti_ref_id_a", ESM::REC_ACTI, "", PushBack<ESM::Activator>{ "acti_ref_id_z", "acti_model" } },
+        Params{ "cont_ref_id_a", ESM::REC_CONT, "", PushBack<ESM::Container>{ "cont_ref_id_z", "cont_model" } },
+        Params{ "door_ref_id_a", ESM::REC_DOOR, "", PushBack<ESM::Door>{ "door_ref_id_z", "door_model" } },
+        Params{ "static_ref_id_a", ESM::REC_STAT, "", PushBack<ESM::Static>{ "static_ref_id_z", "static_model" } },
+        Params{ "acti_ref_id_z", ESM::REC_ACTI, "", PushBack<ESM::Activator>{ "acti_ref_id_a", "acti_model" } },
+        Params{ "cont_ref_id_z", ESM::REC_CONT, "", PushBack<ESM::Container>{ "cont_ref_id_a", "cont_model" } },
+        Params{ "door_ref_id_z", ESM::REC_DOOR, "", PushBack<ESM::Door>{ "door_ref_id_a", "door_model" } },
+        Params{ "static_ref_id_z", ESM::REC_STAT, "", PushBack<ESM::Static>{ "static_ref_id_a", "static_model" } },
+        Params{ "ref_id", ESM::REC_STAT, "", [](EsmData&) {} },
+        Params{ "ref_id", ESM::REC_BOOK, "", [](EsmData&) {} },
     };
 
     INSTANTIATE_TEST_SUITE_P(Params, EsmLoaderGetModelTest, ValuesIn(params));
diff --git a/apps/openmw_test_suite/esmloader/load.cpp b/apps/openmw_test_suite/esmloader/load.cpp
index b1f3052ac2..8df24827be 100644
--- a/apps/openmw_test_suite/esmloader/load.cpp
+++ b/apps/openmw_test_suite/esmloader/load.cpp
@@ -5,12 +5,12 @@
 #include <components/esm3/loadgmst.hpp>
 #include <components/esm3/loadland.hpp>
 #include <components/esm3/loadstat.hpp>
+#include <components/esm3/readerscache.hpp>
 #include <components/esmloader/esmdata.hpp>
 #include <components/esmloader/load.hpp>
 #include <components/files/collections.hpp>
 #include <components/files/multidircollection.hpp>
 #include <components/to_utf8/to_utf8.hpp>
-#include <components/esm3/readerscache.hpp>
 
 #include <gtest/gtest.h>
 
@@ -25,9 +25,9 @@ namespace
 
     struct EsmLoaderTest : Test
     {
-        const Files::PathContainer mDataDirs {{std::filesystem::path{OPENMW_DATA_DIR}}};
-        const Files::Collections mFileCollections {mDataDirs, true};
-        const std::vector<std::string> mContentFiles {{"template.omwgame"}};
+        const Files::PathContainer mDataDirs{ { std::filesystem::path{ OPENMW_DATA_DIR } } };
+        const Files::Collections mFileCollections{ mDataDirs, true };
+        const std::vector<std::string> mContentFiles{ { "template.omwgame" } };
     };
 
     TEST_F(EsmLoaderTest, loadEsmDataShouldSupportOmwgame)
@@ -121,7 +121,7 @@ namespace
         query.mLoadGameSettings = true;
         query.mLoadLands = true;
         query.mLoadStatics = true;
-        const std::vector<std::string> contentFiles {{"script.omwscripts"}};
+        const std::vector<std::string> contentFiles{ { "script.omwscripts" } };
         ESM::ReadersCache readers;
         ToUTF8::Utf8Encoder* const encoder = nullptr;
         const EsmData esmData = loadEsmData(query, contentFiles, mFileCollections, readers, encoder);
diff --git a/apps/openmw_test_suite/esmloader/record.cpp b/apps/openmw_test_suite/esmloader/record.cpp
index fbbbdf18d8..361c714b7d 100644
--- a/apps/openmw_test_suite/esmloader/record.cpp
+++ b/apps/openmw_test_suite/esmloader/record.cpp
@@ -1,7 +1,7 @@
 #include <components/esmloader/record.hpp>
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 #include <array>
 #include <tuple>
@@ -48,57 +48,29 @@ namespace
         std::vector<Value> mResult;
     };
 
-    struct EsmLoaderPrepareRecordTest : TestWithParam<Params> {};
+    struct EsmLoaderPrepareRecordTest : TestWithParam<Params>
+    {
+    };
 
     TEST_P(EsmLoaderPrepareRecordTest, prepareRecords)
     {
         auto records = GetParam().mRecords;
-        const auto getKey = [&] (const Record<Value>& v) { return v.mValue.mKey; };
+        const auto getKey = [&](const Record<Value>& v) { return v.mValue.mKey; };
         EXPECT_THAT(prepareRecords(records, getKey), ElementsAreArray(GetParam().mResult));
     }
 
     const std::array params = {
-        Params {{}, {}},
-        Params {
-            {present(Value {1, 1})},
-            {Value {1, 1}}
-        },
-        Params {
-            {deleted(Value {1, 1})},
-            {}
-        },
-        Params {
-            {present(Value {1, 1}), present(Value {2, 2})},
-            {Value {1, 1}, Value {2, 2}}
-        },
-        Params {
-            {present(Value {2, 2}), present(Value {1, 1})},
-            {Value {1, 1}, Value {2, 2}}
-        },
-        Params {
-            {present(Value {1, 1}), present(Value {1, 2})},
-            {Value {1, 2}}
-        },
-        Params {
-            {present(Value {1, 2}), present(Value {1, 1})},
-            {Value {1, 1}}
-        },
-        Params {
-            {present(Value {1, 1}), deleted(Value {1, 2})},
-            {}
-        },
-        Params {
-            {deleted(Value {1, 1}), present(Value {1, 2})},
-            {Value {1, 2}}
-        },
-        Params {
-            {present(Value {1, 2}), deleted(Value {1, 1})},
-            {}
-        },
-        Params {
-            {deleted(Value {1, 2}), present(Value {1, 1})},
-            {Value {1, 1}}
-        },
+        Params{ {}, {} },
+        Params{ { present(Value{ 1, 1 }) }, { Value{ 1, 1 } } },
+        Params{ { deleted(Value{ 1, 1 }) }, {} },
+        Params{ { present(Value{ 1, 1 }), present(Value{ 2, 2 }) }, { Value{ 1, 1 }, Value{ 2, 2 } } },
+        Params{ { present(Value{ 2, 2 }), present(Value{ 1, 1 }) }, { Value{ 1, 1 }, Value{ 2, 2 } } },
+        Params{ { present(Value{ 1, 1 }), present(Value{ 1, 2 }) }, { Value{ 1, 2 } } },
+        Params{ { present(Value{ 1, 2 }), present(Value{ 1, 1 }) }, { Value{ 1, 1 } } },
+        Params{ { present(Value{ 1, 1 }), deleted(Value{ 1, 2 }) }, {} },
+        Params{ { deleted(Value{ 1, 1 }), present(Value{ 1, 2 }) }, { Value{ 1, 2 } } },
+        Params{ { present(Value{ 1, 2 }), deleted(Value{ 1, 1 }) }, {} },
+        Params{ { deleted(Value{ 1, 2 }), present(Value{ 1, 1 }) }, { Value{ 1, 1 } } },
     };
 
     INSTANTIATE_TEST_SUITE_P(Params, EsmLoaderPrepareRecordTest, ValuesIn(params));
diff --git a/apps/openmw_test_suite/files/hash.cpp b/apps/openmw_test_suite/files/hash.cpp
index ab18d20be7..3daf663735 100644
--- a/apps/openmw_test_suite/files/hash.cpp
+++ b/apps/openmw_test_suite/files/hash.cpp
@@ -1,9 +1,9 @@
-#include <components/files/hash.hpp>
 #include <components/files/constrainedfilestream.hpp>
 #include <components/files/conversion.hpp>
+#include <components/files/hash.hpp>
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 #include <algorithm>
 #include <fstream>
@@ -24,7 +24,9 @@ namespace
         std::array<std::uint64_t, 2> mHash;
     };
 
-    struct FilesGetHash : TestWithParam<Params> {};
+    struct FilesGetHash : TestWithParam<Params>
+    {
+    };
 
     TEST(FilesGetHash, shouldClearErrors)
     {
@@ -58,13 +60,11 @@ namespace
         EXPECT_EQ(getHash(file, *stream), GetParam().mHash);
     }
 
-    INSTANTIATE_TEST_SUITE_P(Params, FilesGetHash, Values(
-        Params {0, {0, 0}},
-        Params {1, {9607679276477937801ull, 16624257681780017498ull}},
-        Params {128, {15287858148353394424ull, 16818615825966581310ull}},
-        Params {1000, {11018119256083894017ull, 6631144854802791578ull}},
-        Params {4096, {11972283295181039100ull, 16027670129106775155ull}},
-        Params {4097, {16717956291025443060ull, 12856404199748778153ull}},
-        Params {5000, {15775925571142117787ull, 10322955217889622896ull}}
-    ));
+    INSTANTIATE_TEST_SUITE_P(Params, FilesGetHash,
+        Values(Params{ 0, { 0, 0 } }, Params{ 1, { 9607679276477937801ull, 16624257681780017498ull } },
+            Params{ 128, { 15287858148353394424ull, 16818615825966581310ull } },
+            Params{ 1000, { 11018119256083894017ull, 6631144854802791578ull } },
+            Params{ 4096, { 11972283295181039100ull, 16027670129106775155ull } },
+            Params{ 4097, { 16717956291025443060ull, 12856404199748778153ull } },
+            Params{ 5000, { 15775925571142117787ull, 10322955217889622896ull } }));
 }
diff --git a/apps/openmw_test_suite/fx/lexer.cpp b/apps/openmw_test_suite/fx/lexer.cpp
index f5df35c982..9c095a1f64 100644
--- a/apps/openmw_test_suite/fx/lexer.cpp
+++ b/apps/openmw_test_suite/fx/lexer.cpp
@@ -7,8 +7,10 @@ namespace
     using namespace testing;
     using namespace fx::Lexer;
 
-    struct LexerTest : Test {};
-    
+    struct LexerTest : Test
+    {
+    };
+
     struct LexerSingleTokenTest : Test
     {
         template <class Token>
@@ -21,20 +23,62 @@ namespace
         }
     };
 
-    TEST_F(LexerSingleTokenTest, single_token_shared) { test<Shared>(); }
-    TEST_F(LexerSingleTokenTest, single_token_technique) { test<Technique>(); }
-    TEST_F(LexerSingleTokenTest, single_token_render_target) { test<Render_Target>(); }
-    TEST_F(LexerSingleTokenTest, single_token_vertex) { test<Vertex>(); }
-    TEST_F(LexerSingleTokenTest, single_token_fragment) { test<Fragment>(); }
-    TEST_F(LexerSingleTokenTest, single_token_compute) { test<Compute>(); }
-    TEST_F(LexerSingleTokenTest, single_token_sampler_1d) { test<Sampler_1D>(); }
-    TEST_F(LexerSingleTokenTest, single_token_sampler_2d) { test<Sampler_2D>(); }
-    TEST_F(LexerSingleTokenTest, single_token_sampler_3d) { test<Sampler_3D>(); }
-    TEST_F(LexerSingleTokenTest, single_token_true) { test<True>(); }
-    TEST_F(LexerSingleTokenTest, single_token_false) { test<False>(); }
-    TEST_F(LexerSingleTokenTest, single_token_vec2) { test<Vec2>(); }
-    TEST_F(LexerSingleTokenTest, single_token_vec3) { test<Vec3>(); }
-    TEST_F(LexerSingleTokenTest, single_token_vec4) { test<Vec4>(); }
+    TEST_F(LexerSingleTokenTest, single_token_shared)
+    {
+        test<Shared>();
+    }
+    TEST_F(LexerSingleTokenTest, single_token_technique)
+    {
+        test<Technique>();
+    }
+    TEST_F(LexerSingleTokenTest, single_token_render_target)
+    {
+        test<Render_Target>();
+    }
+    TEST_F(LexerSingleTokenTest, single_token_vertex)
+    {
+        test<Vertex>();
+    }
+    TEST_F(LexerSingleTokenTest, single_token_fragment)
+    {
+        test<Fragment>();
+    }
+    TEST_F(LexerSingleTokenTest, single_token_compute)
+    {
+        test<Compute>();
+    }
+    TEST_F(LexerSingleTokenTest, single_token_sampler_1d)
+    {
+        test<Sampler_1D>();
+    }
+    TEST_F(LexerSingleTokenTest, single_token_sampler_2d)
+    {
+        test<Sampler_2D>();
+    }
+    TEST_F(LexerSingleTokenTest, single_token_sampler_3d)
+    {
+        test<Sampler_3D>();
+    }
+    TEST_F(LexerSingleTokenTest, single_token_true)
+    {
+        test<True>();
+    }
+    TEST_F(LexerSingleTokenTest, single_token_false)
+    {
+        test<False>();
+    }
+    TEST_F(LexerSingleTokenTest, single_token_vec2)
+    {
+        test<Vec2>();
+    }
+    TEST_F(LexerSingleTokenTest, single_token_vec3)
+    {
+        test<Vec3>();
+    }
+    TEST_F(LexerSingleTokenTest, single_token_vec4)
+    {
+        test<Vec4>();
+    }
 
     TEST(LexerTest, peek_whitespace_only_content_should_be_eof)
     {
@@ -151,7 +195,7 @@ namespace
         Lexer lexer(content);
 
         auto block = lexer.jump();
-    
+
         EXPECT_NE(block, std::nullopt);
         EXPECT_EQ(expected, std::string(block.value()));
     }
@@ -172,7 +216,7 @@ namespace
         Lexer lexer(content);
 
         auto block = lexer.jump();
-    
+
         EXPECT_NE(block, std::nullopt);
         EXPECT_EQ(expected, std::string(block.value()));
     }
@@ -195,7 +239,7 @@ namespace
         Lexer lexer(content);
 
         auto block = lexer.jump();
-    
+
         EXPECT_NE(block, std::nullopt);
         EXPECT_EQ(expected, std::string(block.value()));
     }
diff --git a/apps/openmw_test_suite/fx/technique.cpp b/apps/openmw_test_suite/fx/technique.cpp
index 8277b80ae0..ef0cfe948c 100644
--- a/apps/openmw_test_suite/fx/technique.cpp
+++ b/apps/openmw_test_suite/fx/technique.cpp
@@ -1,17 +1,17 @@
 #include "gmock/gmock.h"
 #include <gtest/gtest.h>
 
-#include <components/settings/settings.hpp>
+#include <components/files/configurationmanager.hpp>
 #include <components/fx/technique.hpp>
 #include <components/resource/imagemanager.hpp>
-#include <components/files/configurationmanager.hpp>
+#include <components/settings/settings.hpp>
 
 #include "../testing_util.hpp"
 
 namespace
 {
 
-TestingOpenMW::VFSTestFile technique_properties(R"(
+    TestingOpenMW::VFSTestFile technique_properties(R"(
     fragment main {}
     vertex main {}
     technique {
@@ -27,7 +27,7 @@ TestingOpenMW::VFSTestFile technique_properties(R"(
     }
 )");
 
-TestingOpenMW::VFSTestFile rendertarget_properties{R"(
+    TestingOpenMW::VFSTestFile rendertarget_properties{ R"(
     render_target rendertarget {
         width_ratio = 0.5;
         height_ratio = 0.5;
@@ -51,10 +51,9 @@ TestingOpenMW::VFSTestFile rendertarget_properties{R"(
     }
     fragment main { }
     technique { passes = downsample2x, main; }
-)"};
+)" };
 
-
-TestingOpenMW::VFSTestFile uniform_properties{R"(
+    TestingOpenMW::VFSTestFile uniform_properties{ R"(
     uniform_vec4 uVec4 {
         default = vec4(0,0,0,0);
         min = vec4(0,1,0,0);
@@ -66,24 +65,22 @@ TestingOpenMW::VFSTestFile uniform_properties{R"(
     }
     fragment main { }
     technique { passes = main; }
-)"};
-
+)" };
 
-TestingOpenMW::VFSTestFile missing_sampler_source{R"(
+    TestingOpenMW::VFSTestFile missing_sampler_source{ R"(
     sampler_1d mysampler1d { }
     fragment main { }
     technique { passes = main; }
-)"};
+)" };
 
-TestingOpenMW::VFSTestFile repeated_shared_block{R"(
+    TestingOpenMW::VFSTestFile repeated_shared_block{ R"(
     shared {
         float myfloat = 1.0;
     }
     shared {}
     fragment main { }
     technique { passes = main; }
-)"};
-
+)" };
 
     using namespace testing;
     using namespace fx;
@@ -96,11 +93,11 @@ TestingOpenMW::VFSTestFile repeated_shared_block{R"(
 
         TechniqueTest()
             : mVFS(TestingOpenMW::createTestVFS({
-                {"shaders/technique_properties.omwfx", &technique_properties},
-                {"shaders/rendertarget_properties.omwfx", &rendertarget_properties},
-                {"shaders/uniform_properties.omwfx", &uniform_properties},
-                {"shaders/missing_sampler_source.omwfx", &missing_sampler_source},
-                {"shaders/repeated_shared_block.omwfx", &repeated_shared_block},
+                { "shaders/technique_properties.omwfx", &technique_properties },
+                { "shaders/rendertarget_properties.omwfx", &rendertarget_properties },
+                { "shaders/uniform_properties.omwfx", &uniform_properties },
+                { "shaders/missing_sampler_source.omwfx", &missing_sampler_source },
+                { "shaders/repeated_shared_block.omwfx", &repeated_shared_block },
             }))
             , mImageManager(mVFS.get())
         {
@@ -118,10 +115,7 @@ TestingOpenMW::VFSTestFile repeated_shared_block{R"(
 
     TEST_F(TechniqueTest, technique_properties)
     {
-        std::unordered_set<std::string> targetExtensions = {
-            "GL_EXT_gpu_shader4",
-            "GL_ARB_uniform_buffer_object"
-        };
+        std::unordered_set<std::string> targetExtensions = { "GL_EXT_gpu_shader4", "GL_ARB_uniform_buffer_object" };
 
         compile("technique_properties");
 
@@ -173,9 +167,9 @@ TestingOpenMW::VFSTestFile repeated_shared_block{R"(
 
         EXPECT_TRUE(uniform->mStatic);
         EXPECT_DOUBLE_EQ(uniform->mStep, 0.5);
-        EXPECT_EQ(uniform->getDefault<osg::Vec4f>(), osg::Vec4f(0,0,0,0));
-        EXPECT_EQ(uniform->getMin<osg::Vec4f>(), osg::Vec4f(0,1,0,0));
-        EXPECT_EQ(uniform->getMax<osg::Vec4f>(), osg::Vec4f(0,0,1,0));
+        EXPECT_EQ(uniform->getDefault<osg::Vec4f>(), osg::Vec4f(0, 0, 0, 0));
+        EXPECT_EQ(uniform->getMin<osg::Vec4f>(), osg::Vec4f(0, 1, 0, 0));
+        EXPECT_EQ(uniform->getMax<osg::Vec4f>(), osg::Vec4f(0, 0, 1, 0));
         EXPECT_EQ(uniform->mHeader, "header");
         EXPECT_EQ(uniform->mDescription, "description");
         EXPECT_EQ(uniform->mName, "uVec4");
diff --git a/apps/openmw_test_suite/lua/test_configuration.cpp b/apps/openmw_test_suite/lua/test_configuration.cpp
index 39c4f06201..61c96703dd 100644
--- a/apps/openmw_test_suite/lua/test_configuration.cpp
+++ b/apps/openmw_test_suite/lua/test_configuration.cpp
@@ -60,7 +60,8 @@ namespace
         EXPECT_THAT(asVector(conf.getPlayerConf()), ElementsAre(Pair(1, "")));
         EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_CONT, "something", ESM::RefNum())), ElementsAre());
         EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_NPC_, "something", ESM::RefNum())), ElementsAre(Pair(1, "")));
-        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_CREA, "something", ESM::RefNum())), ElementsAre(Pair(1, ""), Pair(3, "")));
+        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_CREA, "something", ESM::RefNum())),
+            ElementsAre(Pair(1, ""), Pair(3, "")));
 
         // Check that initialization cleans old data
         cfg = ESM::LuaScriptsCfg();
@@ -72,9 +73,8 @@ namespace
     {
         ESM::LuaScriptsCfg cfg;
         EXPECT_ERROR(LuaUtil::parseOMWScripts(cfg, "GLOBAL: something"),
-                     "Lua script should have suffix '.lua', got: GLOBAL: something");
-        EXPECT_ERROR(LuaUtil::parseOMWScripts(cfg, "something.lua"),
-                     "No flags found in: something.lua");
+            "Lua script should have suffix '.lua', got: GLOBAL: something");
+        EXPECT_ERROR(LuaUtil::parseOMWScripts(cfg, "something.lua"), "No flags found in: something.lua");
 
         cfg.mScripts.clear();
         EXPECT_NO_THROW(LuaUtil::parseOMWScripts(cfg, "GLOBAL, PLAYER: something.lua"));
@@ -90,9 +90,9 @@ namespace
         script1.mInitializationData = "data1";
         script1.mFlags = ESM::LuaScriptCfg::sPlayer;
         script1.mTypes.push_back(ESM::REC_CREA);
-        script1.mRecords.push_back({true, "record1", "dataRecord1"});
-        script1.mRefs.push_back({true, 2, 3, ""});
-        script1.mRefs.push_back({true, 2, 4, ""});
+        script1.mRecords.push_back({ true, "record1", "dataRecord1" });
+        script1.mRefs.push_back({ true, 2, 3, "" });
+        script1.mRefs.push_back({ true, 2, 4, "" });
 
         ESM::LuaScriptCfg& script2 = cfg.mScripts.emplace_back();
         script2.mScriptPath = "Script2.lua";
@@ -103,28 +103,31 @@ namespace
         script1Extra.mScriptPath = "script1.LUA";
         script1Extra.mFlags = ESM::LuaScriptCfg::sCustom | ESM::LuaScriptCfg::sMerge;
         script1Extra.mTypes.push_back(ESM::REC_NPC_);
-        script1Extra.mRecords.push_back({false, "rat", ""});
-        script1Extra.mRecords.push_back({true, "record2", ""});
-        script1Extra.mRefs.push_back({true, 3, 5, "dataRef35"});
-        script1Extra.mRefs.push_back({false, 2, 3, ""});
+        script1Extra.mRecords.push_back({ false, "rat", "" });
+        script1Extra.mRecords.push_back({ true, "record2", "" });
+        script1Extra.mRefs.push_back({ true, 3, 5, "dataRef35" });
+        script1Extra.mRefs.push_back({ false, 2, 3, "" });
 
         LuaUtil::ScriptsConfiguration conf;
         conf.init(cfg);
         ASSERT_EQ(conf.size(), 2);
         EXPECT_EQ(LuaUtil::scriptCfgToString(conf[0]),
-                  "CUSTOM PLAYER CREATURE NPC : Script1.lua ; data 5 bytes ; 3 records ; 4 objects");
+            "CUSTOM PLAYER CREATURE NPC : Script1.lua ; data 5 bytes ; 3 records ; 4 objects");
         EXPECT_EQ(LuaUtil::scriptCfgToString(conf[1]), "CUSTOM CONTAINER : Script2.lua");
 
         EXPECT_THAT(asVector(conf.getPlayerConf()), ElementsAre(Pair(0, "data1")));
         EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_CONT, "something", ESM::RefNum())), ElementsAre(Pair(1, "")));
         EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_CREA, "guar", ESM::RefNum())), ElementsAre(Pair(0, "data1")));
         EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_CREA, "rat", ESM::RefNum())), ElementsAre());
-        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_DOOR, "record1", ESM::RefNum())), ElementsAre(Pair(0, "dataRecord1")));
-        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_DOOR, "record2", ESM::RefNum())), ElementsAre(Pair(0, "data1")));
-        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_NPC_, "record3", {1, 1})), ElementsAre(Pair(0, "data1")));
-        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_NPC_, "record3", {2, 3})), ElementsAre());
-        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_NPC_, "record3", {3, 5})), ElementsAre(Pair(0, "dataRef35")));
-        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_CONT, "record4", {2, 4})), ElementsAre(Pair(0, "data1"), Pair(1, "")));
+        EXPECT_THAT(
+            asVector(conf.getLocalConf(ESM::REC_DOOR, "record1", ESM::RefNum())), ElementsAre(Pair(0, "dataRecord1")));
+        EXPECT_THAT(
+            asVector(conf.getLocalConf(ESM::REC_DOOR, "record2", ESM::RefNum())), ElementsAre(Pair(0, "data1")));
+        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_NPC_, "record3", { 1, 1 })), ElementsAre(Pair(0, "data1")));
+        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_NPC_, "record3", { 2, 3 })), ElementsAre());
+        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_NPC_, "record3", { 3, 5 })), ElementsAre(Pair(0, "dataRef35")));
+        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_CONT, "record4", { 2, 4 })),
+            ElementsAre(Pair(0, "data1"), Pair(1, "")));
 
         ESM::LuaScriptCfg& script3 = cfg.mScripts.emplace_back();
         script3.mScriptPath = "script1.lua";
@@ -151,7 +154,7 @@ namespace
             sol::table data(lua, sol::create);
             data["number"] = 5;
             data["string"] = "some value";
-            data["fargoth"] = ESM::RefNum{128964, 1};
+            data["fargoth"] = ESM::RefNum{ 128964, 1 };
             luaData = LuaUtil::serialize(data, &serializer);
         }
         {
@@ -166,10 +169,10 @@ namespace
             script.mFlags = ESM::LuaScriptCfg::sMerge;
             script.mTypes.push_back(ESM::REC_DOOR);
             script.mTypes.push_back(ESM::REC_MISC);
-            script.mRecords.push_back({true, "rat", luaData});
-            script.mRecords.push_back({false, "chargendoorjournal", ""});
-            script.mRefs.push_back({true, 128964, 1, ""});
-            script.mRefs.push_back({true, 128962, 1, luaData});
+            script.mRecords.push_back({ true, "rat", luaData });
+            script.mRecords.push_back({ false, "chargendoorjournal", "" });
+            script.mRefs.push_back({ true, 128964, 1, "" });
+            script.mRefs.push_back({ true, 128962, 1, luaData });
         }
 
         std::stringstream stream;
@@ -209,15 +212,18 @@ namespace
             {
                 EXPECT_EQ(loadedCfg.mScripts[i].mRecords[j].mAttach, cfg.mScripts[i].mRecords[j].mAttach);
                 EXPECT_EQ(loadedCfg.mScripts[i].mRecords[j].mRecordId, cfg.mScripts[i].mRecords[j].mRecordId);
-                EXPECT_EQ(loadedCfg.mScripts[i].mRecords[j].mInitializationData, cfg.mScripts[i].mRecords[j].mInitializationData);
+                EXPECT_EQ(loadedCfg.mScripts[i].mRecords[j].mInitializationData,
+                    cfg.mScripts[i].mRecords[j].mInitializationData);
             }
             ASSERT_EQ(loadedCfg.mScripts[i].mRefs.size(), cfg.mScripts[i].mRefs.size());
             for (size_t j = 0; j < cfg.mScripts[i].mRefs.size(); ++j)
             {
                 EXPECT_EQ(loadedCfg.mScripts[i].mRefs[j].mAttach, cfg.mScripts[i].mRefs[j].mAttach);
                 EXPECT_EQ(loadedCfg.mScripts[i].mRefs[j].mRefnumIndex, cfg.mScripts[i].mRefs[j].mRefnumIndex);
-                EXPECT_EQ(loadedCfg.mScripts[i].mRefs[j].mRefnumContentFile, cfg.mScripts[i].mRefs[j].mRefnumContentFile);
-                EXPECT_EQ(loadedCfg.mScripts[i].mRefs[j].mInitializationData, cfg.mScripts[i].mRefs[j].mInitializationData);
+                EXPECT_EQ(
+                    loadedCfg.mScripts[i].mRefs[j].mRefnumContentFile, cfg.mScripts[i].mRefs[j].mRefnumContentFile);
+                EXPECT_EQ(
+                    loadedCfg.mScripts[i].mRefs[j].mInitializationData, cfg.mScripts[i].mRefs[j].mInitializationData);
             }
         }
 
@@ -234,7 +240,8 @@ namespace
         EXPECT_EQ(loadedCfg.mScripts[1].mRefs[0].mRefnumIndex, cfg.mScripts[1].mRefs[0].mRefnumIndex);
         EXPECT_EQ(loadedCfg.mScripts[1].mRefs[0].mRefnumContentFile, 2);
         {
-            sol::table data = LuaUtil::deserialize(lua.lua_state(), loadedCfg.mScripts[1].mRefs[1].mInitializationData, &serializer);
+            sol::table data = LuaUtil::deserialize(
+                lua.lua_state(), loadedCfg.mScripts[1].mRefs[1].mInitializationData, &serializer);
             ESM::RefNum adjustedRef = data["fargoth"].get<ESM::RefNum>();
             EXPECT_EQ(adjustedRef.mIndex, 128964u);
             EXPECT_EQ(adjustedRef.mContentFile, 2);
diff --git a/apps/openmw_test_suite/lua/test_l10n.cpp b/apps/openmw_test_suite/lua/test_l10n.cpp
index 6204a8022a..7a44dc9af2 100644
--- a/apps/openmw_test_suite/lua/test_l10n.cpp
+++ b/apps/openmw_test_suite/lua/test_l10n.cpp
@@ -3,8 +3,8 @@
 
 #include <components/files/fixedpath.hpp>
 
-#include <components/lua/luastate.hpp>
 #include <components/lua/l10n.hpp>
+#include <components/lua/luastate.hpp>
 
 #include "../testing_util.hpp"
 
@@ -20,9 +20,10 @@ namespace
     }
 
     VFSTestFile invalidScript("not a script");
-    VFSTestFile incorrectScript("return { incorrectSection = {}, engineHandlers = { incorrectHandler = function() end } }");
+    VFSTestFile incorrectScript(
+        "return { incorrectSection = {}, engineHandlers = { incorrectHandler = function() end } }");
     VFSTestFile emptyScript("");
-    
+
     VFSTestFile test1En(R"X(
 good_morning: "Good morning."
 you_have_arrows: |-
@@ -55,11 +56,11 @@ you_have_arrows: |-
 "Hello {name}!": "Hallo {name}!"
 )X");
 
-     VFSTestFile test1EnUS(R"X(
+    VFSTestFile test1EnUS(R"X(
 currency: "You have {money, number, currency}"
 )X");
 
-VFSTestFile test2En(R"X(
+    VFSTestFile test2En(R"X(
 good_morning: "Morning!"
 you_have_arrows: "Arrows count: {count}"
 )X");
@@ -67,12 +68,12 @@ you_have_arrows: "Arrows count: {count}"
     struct LuaL10nTest : Test
     {
         std::unique_ptr<VFS::Manager> mVFS = createTestVFS({
-            {"l10n/Test1/en.yaml", &test1En},
-            {"l10n/Test1/en_US.yaml", &test1EnUS},
-            {"l10n/Test1/de.yaml", &test1De},
-            {"l10n/Test2/en.yaml", &test2En},
-            {"l10n/Test3/en.yaml", &test1En},
-            {"l10n/Test3/de.yaml", &test1De},
+            { "l10n/Test1/en.yaml", &test1En },
+            { "l10n/Test1/en_US.yaml", &test1EnUS },
+            { "l10n/Test1/de.yaml", &test1De },
+            { "l10n/Test2/en.yaml", &test2En },
+            { "l10n/Test3/en.yaml", &test1En },
+            { "l10n/Test3/de.yaml", &test1De },
         });
 
         LuaUtil::ScriptsConfiguration mCfg;
@@ -81,11 +82,11 @@ you_have_arrows: "Arrows count: {count}"
     TEST_F(LuaL10nTest, L10n)
     {
         internal::CaptureStdout();
-        LuaUtil::LuaState lua{mVFS.get(), &mCfg};
+        LuaUtil::LuaState lua{ mVFS.get(), &mCfg };
         sol::state& l = lua.sol();
         LuaUtil::L10nManager l10n(mVFS.get(), &lua);
         l10n.init();
-        l10n.setPreferredLocales({"de", "en"});
+        l10n.setPreferredLocales({ "de", "en" });
         EXPECT_THAT(internal::GetCapturedStdout(), "Preferred locales: de en\n");
 
         internal::CaptureStdout();
@@ -110,7 +111,7 @@ you_have_arrows: "Arrows count: {count}"
         EXPECT_EQ(get<std::string>(l, "t2('you_have_arrows', {count=3})"), "Arrows count: 3");
 
         internal::CaptureStdout();
-        l10n.setPreferredLocales({"en", "de"});
+        l10n.setPreferredLocales({ "en", "de" });
         EXPECT_THAT(internal::GetCapturedStdout(),
             "Preferred locales: en de\n"
             "Language file \"l10n/Test1/en.yaml\" is enabled\n"
@@ -131,14 +132,15 @@ you_have_arrows: "Arrows count: {count}"
         EXPECT_EQ(get<std::string>(l, "t1('spellout', {num=1})"), "There is one thing.");
         EXPECT_EQ(get<std::string>(l, "t1('spellout', {num=100})"), "There are one hundred things.");
         EXPECT_EQ(get<std::string>(l, "t1('duration', {num=100})"), "It took 1:40");
-        EXPECT_EQ(get<std::string>(l, "t1('numbers', {int=123, double=123.456})"), "123 and 123 are integers, but 123.456 is a double");
+        EXPECT_EQ(get<std::string>(l, "t1('numbers', {int=123, double=123.456})"),
+            "123 and 123 are integers, but 123.456 is a double");
         EXPECT_EQ(get<std::string>(l, "t1('rounding', {value=123.456789})"), "123.46");
         // Check that failed messages display the key instead of an empty string
         EXPECT_EQ(get<std::string>(l, "t1('{mismatched_braces')"), "{mismatched_braces");
         EXPECT_EQ(get<std::string>(l, "t1('{unknown_arg}')"), "{unknown_arg}");
         EXPECT_EQ(get<std::string>(l, "t1('{num, integer}', {num=1})"), "{num, integer}");
         // Doesn't give a valid currency symbol with `en`. Not that openmw is designed for real world currency.
-        l10n.setPreferredLocales({"en-US", "de"});
+        l10n.setPreferredLocales({ "en-US", "de" });
         EXPECT_EQ(get<std::string>(l, "t1('currency', {money=10000.10})"), "You have $10,000.10");
         // Note: Not defined in English localisation file, so we fall back to the German before falling back to the key
         EXPECT_EQ(get<std::string>(l, "t1('Hello {name}!', {name='World'})"), "Hallo World!");
@@ -147,7 +149,7 @@ you_have_arrows: "Arrows count: {count}"
 
         // Test that locales with variants and country codes fall back to more generic locales
         internal::CaptureStdout();
-        l10n.setPreferredLocales({"en-GB-oed", "de"});
+        l10n.setPreferredLocales({ "en-GB-oed", "de" });
         EXPECT_THAT(internal::GetCapturedStdout(),
             "Preferred locales: en_GB_OED de\n"
             "Language file \"l10n/Test1/en.yaml\" is enabled\n"
@@ -157,7 +159,7 @@ you_have_arrows: "Arrows count: {count}"
 
         // Test setting fallback language
         l["t3"] = l10n.getContext("Test3", "de");
-        l10n.setPreferredLocales({"en"});
+        l10n.setPreferredLocales({ "en" });
         EXPECT_EQ(get<std::string>(l, "t3('Hello {name}!', {name='World'})"), "Hallo World!");
     }
 
diff --git a/apps/openmw_test_suite/lua/test_lua.cpp b/apps/openmw_test_suite/lua/test_lua.cpp
index 566fefa726..ebfb76eee1 100644
--- a/apps/openmw_test_suite/lua/test_lua.cpp
+++ b/apps/openmw_test_suite/lua/test_lua.cpp
@@ -53,14 +53,11 @@ return {
 
     struct LuaStateTest : Test
     {
-        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({
-            {"aaa/counter.lua", &counterFile},
-            {"bbb/tests.lua", &testsFile},
-            {"invalid.lua", &invalidScriptFile}
-        });
+        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({ { "aaa/counter.lua", &counterFile },
+            { "bbb/tests.lua", &testsFile }, { "invalid.lua", &invalidScriptFile } });
 
         LuaUtil::ScriptsConfiguration mCfg;
-        LuaUtil::LuaState mLua{mVFS.get(), &mCfg};
+        LuaUtil::LuaState mLua{ mVFS.get(), &mCfg };
     };
 
     TEST_F(LuaStateTest, Sandbox)
@@ -96,8 +93,8 @@ return {
     {
         sol::table script = mLua.runInNewSandbox("bbb/tests.lua");
 
-        EXPECT_FLOAT_EQ(LuaUtil::call(script["sin"], 1).get<float>(),
-                        -LuaUtil::call(script["requireMathSin"], -1).get<float>());
+        EXPECT_FLOAT_EQ(
+            LuaUtil::call(script["sin"], 1).get<float>(), -LuaUtil::call(script["requireMathSin"], -1).get<float>());
 
         EXPECT_EQ(LuaUtil::call(script["useCounter"]).get<int>(), 43);
         EXPECT_EQ(LuaUtil::call(script["useCounter"]).get<int>(), 44);
@@ -118,7 +115,8 @@ return {
         EXPECT_EQ(LuaUtil::call(script["callRawset"]).get<int>(), 3);
 
         // but read-only object can not be modified even with rawset
-        EXPECT_ERROR(LuaUtil::call(script["rawsetSystemLib"]), "bad argument #1 to 'rawset' (table expected, got userdata)");
+        EXPECT_ERROR(
+            LuaUtil::call(script["rawsetSystemLib"]), "bad argument #1 to 'rawset' (table expected, got userdata)");
         EXPECT_ERROR(LuaUtil::call(script["modifySystemLib"]), "a userdata value");
         EXPECT_ERROR(LuaUtil::call(script["modifySystemLib2"]), "a nil value");
 
@@ -137,7 +135,7 @@ return {
         {
             sol::table script = mLua.runInNewSandbox("bbb/tests.lua", "prefix");
             testing::internal::CaptureStdout();
-            LuaUtil::call(script["print"]);  // print with no arguments
+            LuaUtil::call(script["print"]); // print with no arguments
             std::string output = testing::internal::GetCapturedStdout();
             EXPECT_EQ(output, "prefix[bbb/tests.lua]:\n");
         }
@@ -156,12 +154,11 @@ return {
         sol::table api1 = LuaUtil::makeReadOnly(lua.sol().create_table_with("name", "api1"));
         sol::table api2 = LuaUtil::makeReadOnly(lua.sol().create_table_with("name", "api2"));
 
-        sol::table script1 = lua.runInNewSandbox("bbb/tests.lua", "", {{"test.api", api1}});
+        sol::table script1 = lua.runInNewSandbox("bbb/tests.lua", "", { { "test.api", api1 } });
 
-        lua.addCommonPackage(
-            "sqrlib", lua.sol().create_table_with("sqr", [](int x) { return x * x; }));
+        lua.addCommonPackage("sqrlib", lua.sol().create_table_with("sqr", [](int x) { return x * x; }));
 
-        sol::table script2 = lua.runInNewSandbox("bbb/tests.lua", "", {{"test.api", api2}});
+        sol::table script2 = lua.runInNewSandbox("bbb/tests.lua", "", { { "test.api", api2 } });
 
         EXPECT_ERROR(LuaUtil::call(script1["sqr"], 3), "module not found: sqrlib");
         EXPECT_EQ(LuaUtil::call(script2["sqr"], 3).get<int>(), 9);
diff --git a/apps/openmw_test_suite/lua/test_scriptscontainer.cpp b/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
index 84b632913c..92d28f72fc 100644
--- a/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
+++ b/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
@@ -14,9 +14,10 @@ namespace
     using namespace TestingOpenMW;
 
     VFSTestFile invalidScript("not a script");
-    VFSTestFile incorrectScript("return { incorrectSection = {}, engineHandlers = { incorrectHandler = function() end } }");
+    VFSTestFile incorrectScript(
+        "return { incorrectSection = {}, engineHandlers = { incorrectHandler = function() end } }");
     VFSTestFile emptyScript("");
-    
+
     VFSTestFile testScript(R"X(
 return {
     engineHandlers = {
@@ -116,21 +117,21 @@ return {
     struct LuaScriptsContainerTest : Test
     {
         std::unique_ptr<VFS::Manager> mVFS = createTestVFS({
-            {"invalid.lua", &invalidScript},
-            {"incorrect.lua", &incorrectScript},
-            {"empty.lua", &emptyScript},
-            {"test1.lua", &testScript},
-            {"test2.lua", &testScript},
-            {"stopEvent.lua", &stopEventScript},
-            {"loadSave1.lua", &loadSaveScript},
-            {"loadSave2.lua", &loadSaveScript},
-            {"testInterface.lua", &interfaceScript},
-            {"overrideInterface.lua", &overrideInterfaceScript},
-            {"useInterface.lua", &useInterfaceScript},
+            { "invalid.lua", &invalidScript },
+            { "incorrect.lua", &incorrectScript },
+            { "empty.lua", &emptyScript },
+            { "test1.lua", &testScript },
+            { "test2.lua", &testScript },
+            { "stopEvent.lua", &stopEventScript },
+            { "loadSave1.lua", &loadSaveScript },
+            { "loadSave2.lua", &loadSaveScript },
+            { "testInterface.lua", &interfaceScript },
+            { "overrideInterface.lua", &overrideInterfaceScript },
+            { "useInterface.lua", &useInterfaceScript },
         });
 
         LuaUtil::ScriptsConfiguration mCfg;
-        LuaUtil::LuaState mLua{mVFS.get(), &mCfg};
+        LuaUtil::LuaState mLua{ mVFS.get(), &mCfg };
 
         LuaScriptsContainerTest()
         {
@@ -171,7 +172,7 @@ CUSTOM, PLAYER: useInterface.lua
         {
             testing::internal::CaptureStdout();
             EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("empty.lua")));
-            EXPECT_FALSE(scripts.addCustomScript(*mCfg.findId("empty.lua")));  // already present
+            EXPECT_FALSE(scripts.addCustomScript(*mCfg.findId("empty.lua"))); // already present
             EXPECT_EQ(internal::GetCapturedStdout(), "");
         }
     }
@@ -184,8 +185,9 @@ CUSTOM, PLAYER: useInterface.lua
         EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("stopEvent.lua")));
         EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("test2.lua")));
         scripts.update(1.5f);
-        EXPECT_EQ(internal::GetCapturedStdout(), "Test[test1.lua]:\t update 1.5\n"
-                                                 "Test[test2.lua]:\t update 1.5\n");
+        EXPECT_EQ(internal::GetCapturedStdout(),
+            "Test[test1.lua]:\t update 1.5\n"
+            "Test[test2.lua]:\t update 1.5\n");
     }
 
     TEST_F(LuaScriptsContainerTest, CallEvent)
@@ -202,36 +204,36 @@ CUSTOM, PLAYER: useInterface.lua
             testing::internal::CaptureStdout();
             scripts.receiveEvent("SomeEvent", X1);
             EXPECT_EQ(internal::GetCapturedStdout(),
-                      "Test has received event 'SomeEvent', but there are no handlers for this event\n");
+                "Test has received event 'SomeEvent', but there are no handlers for this event\n");
         }
         {
             testing::internal::CaptureStdout();
             scripts.receiveEvent("Event1", X1);
             EXPECT_EQ(internal::GetCapturedStdout(),
-                      "Test[test2.lua]:\t event1 1.5\n"
-                      "Test[stopEvent.lua]:\t event1 1.5\n"
-                      "Test[test1.lua]:\t event1 1.5\n");
+                "Test[test2.lua]:\t event1 1.5\n"
+                "Test[stopEvent.lua]:\t event1 1.5\n"
+                "Test[test1.lua]:\t event1 1.5\n");
         }
         {
             testing::internal::CaptureStdout();
             scripts.receiveEvent("Event2", X1);
             EXPECT_EQ(internal::GetCapturedStdout(),
-                      "Test[test2.lua]:\t event2 1.5\n"
-                      "Test[test1.lua]:\t event2 1.5\n");
+                "Test[test2.lua]:\t event2 1.5\n"
+                "Test[test1.lua]:\t event2 1.5\n");
         }
         {
             testing::internal::CaptureStdout();
             scripts.receiveEvent("Event1", X0);
             EXPECT_EQ(internal::GetCapturedStdout(),
-                      "Test[test2.lua]:\t event1 0.5\n"
-                      "Test[stopEvent.lua]:\t event1 0.5\n");
+                "Test[test2.lua]:\t event1 0.5\n"
+                "Test[stopEvent.lua]:\t event1 0.5\n");
         }
         {
             testing::internal::CaptureStdout();
             scripts.receiveEvent("Event2", X0);
             EXPECT_EQ(internal::GetCapturedStdout(),
-                      "Test[test2.lua]:\t event2 0.5\n"
-                      "Test[test1.lua]:\t event2 0.5\n");
+                "Test[test2.lua]:\t event2 0.5\n"
+                "Test[test1.lua]:\t event2 0.5\n");
         }
     }
 
@@ -248,10 +250,10 @@ CUSTOM, PLAYER: useInterface.lua
             scripts.update(1.5f);
             scripts.receiveEvent("Event1", X);
             EXPECT_EQ(internal::GetCapturedStdout(),
-                      "Test[test1.lua]:\t update 1.5\n"
-                      "Test[test2.lua]:\t update 1.5\n"
-                      "Test[test2.lua]:\t event1 0.5\n"
-                      "Test[stopEvent.lua]:\t event1 0.5\n");
+                "Test[test1.lua]:\t update 1.5\n"
+                "Test[test2.lua]:\t update 1.5\n"
+                "Test[test2.lua]:\t event1 0.5\n"
+                "Test[stopEvent.lua]:\t event1 0.5\n");
         }
         {
             testing::internal::CaptureStdout();
@@ -262,10 +264,10 @@ CUSTOM, PLAYER: useInterface.lua
             scripts.update(1.5f);
             scripts.receiveEvent("Event1", X);
             EXPECT_EQ(internal::GetCapturedStdout(),
-                      "Test[test1.lua]:\t update 1.5\n"
-                      "Test[test2.lua]:\t update 1.5\n"
-                      "Test[test2.lua]:\t event1 0.5\n"
-                      "Test[test1.lua]:\t event1 0.5\n");
+                "Test[test1.lua]:\t update 1.5\n"
+                "Test[test2.lua]:\t update 1.5\n"
+                "Test[test2.lua]:\t event1 0.5\n"
+                "Test[test1.lua]:\t event1 0.5\n");
         }
         {
             testing::internal::CaptureStdout();
@@ -273,8 +275,8 @@ CUSTOM, PLAYER: useInterface.lua
             scripts.update(1.5f);
             scripts.receiveEvent("Event1", X);
             EXPECT_EQ(internal::GetCapturedStdout(),
-                      "Test[test2.lua]:\t update 1.5\n"
-                      "Test[test2.lua]:\t event1 0.5\n");
+                "Test[test2.lua]:\t update 1.5\n"
+                "Test[test2.lua]:\t event1 0.5\n");
         }
     }
 
@@ -332,14 +334,8 @@ CUSTOM, PLAYER: useInterface.lua
         scripts1.addAutoStartedScripts();
         EXPECT_TRUE(scripts1.addCustomScript(*mCfg.findId("test1.lua")));
 
-        scripts1.receiveEvent("Set", LuaUtil::serialize(mLua.sol().create_table_with(
-            "n", 1,
-            "x", 0.5,
-            "y", 3.5)));
-        scripts1.receiveEvent("Set", LuaUtil::serialize(mLua.sol().create_table_with(
-            "n", 2,
-            "x", 2.5,
-            "y", 1.5)));
+        scripts1.receiveEvent("Set", LuaUtil::serialize(mLua.sol().create_table_with("n", 1, "x", 0.5, "y", 3.5)));
+        scripts1.receiveEvent("Set", LuaUtil::serialize(mLua.sol().create_table_with("n", 2, "x", 2.5, "y", 1.5)));
 
         ESM::LuaScripts data;
         scripts1.save(data);
@@ -450,9 +446,10 @@ CUSTOM, PLAYER: useInterface.lua
 
     TEST_F(LuaScriptsContainerTest, CallbackWrapper)
     {
-        LuaUtil::Callback callback{mLua.sol()["print"], mLua.newTable()};
+        LuaUtil::Callback callback{ mLua.sol()["print"], mLua.newTable() };
         callback.mHiddenData[LuaUtil::ScriptsContainer::sScriptDebugNameKey] = "some_script.lua";
-        callback.mHiddenData[LuaUtil::ScriptsContainer::sScriptIdKey] = LuaUtil::ScriptsContainer::ScriptId{nullptr, 0};
+        callback.mHiddenData[LuaUtil::ScriptsContainer::sScriptIdKey]
+            = LuaUtil::ScriptsContainer::ScriptId{ nullptr, 0 };
 
         testing::internal::CaptureStdout();
         callback.call(1.5);
diff --git a/apps/openmw_test_suite/lua/test_serialization.cpp b/apps/openmw_test_suite/lua/test_serialization.cpp
index a74081266f..56a6210b28 100644
--- a/apps/openmw_test_suite/lua/test_serialization.cpp
+++ b/apps/openmw_test_suite/lua/test_serialization.cpp
@@ -10,8 +10,8 @@
 #include <components/lua/serialization.hpp>
 #include <components/lua/utilpackage.hpp>
 
-#include <components/misc/endianness.hpp>
 #include <components/misc/color.hpp>
+#include <components/misc/endianness.hpp>
 
 #include "../testing_util.hpp"
 
@@ -30,7 +30,7 @@ namespace
     {
         sol::state lua;
         std::string serialized = LuaUtil::serialize(sol::make_object<double>(lua, 3.14));
-        EXPECT_EQ(serialized.size(), 10);  // version, type, 8 bytes value
+        EXPECT_EQ(serialized.size(), 10); // version, type, 8 bytes value
         sol::object value = LuaUtil::deserialize(lua, serialized);
         ASSERT_TRUE(value.is<double>());
         EXPECT_DOUBLE_EQ(value.as<double>(), 3.14);
@@ -41,7 +41,7 @@ namespace
         sol::state lua;
         {
             std::string serialized = LuaUtil::serialize(sol::make_object<bool>(lua, true));
-            EXPECT_EQ(serialized.size(), 3);  // version, type, 1 byte value
+            EXPECT_EQ(serialized.size(), 3); // version, type, 1 byte value
             sol::object value = LuaUtil::deserialize(lua, serialized);
             EXPECT_FALSE(value.is<double>());
             ASSERT_TRUE(value.is<bool>());
@@ -49,7 +49,7 @@ namespace
         }
         {
             std::string serialized = LuaUtil::serialize(sol::make_object<bool>(lua, false));
-            EXPECT_EQ(serialized.size(), 3);  // version, type, 1 byte value
+            EXPECT_EQ(serialized.size(), 3); // version, type, 1 byte value
             sol::object value = LuaUtil::deserialize(lua, serialized);
             EXPECT_FALSE(value.is<double>());
             ASSERT_TRUE(value.is<bool>());
@@ -63,24 +63,24 @@ namespace
         std::string_view emptyString = "";
         std::string_view shortString = "abc";
         std::string_view longString = "It is a string with more than 32 characters...........................";
-        
+
         {
             std::string serialized = LuaUtil::serialize(sol::make_object<std::string_view>(lua, emptyString));
-            EXPECT_EQ(serialized.size(), 2);  // version, type
+            EXPECT_EQ(serialized.size(), 2); // version, type
             sol::object value = LuaUtil::deserialize(lua, serialized);
             ASSERT_TRUE(value.is<std::string>());
             EXPECT_EQ(value.as<std::string>(), emptyString);
         }
         {
             std::string serialized = LuaUtil::serialize(sol::make_object<std::string_view>(lua, shortString));
-            EXPECT_EQ(serialized.size(), 2 + shortString.size());  // version, type, str data
+            EXPECT_EQ(serialized.size(), 2 + shortString.size()); // version, type, str data
             sol::object value = LuaUtil::deserialize(lua, serialized);
             ASSERT_TRUE(value.is<std::string>());
             EXPECT_EQ(value.as<std::string>(), shortString);
         }
         {
             std::string serialized = LuaUtil::serialize(sol::make_object<std::string_view>(lua, longString));
-            EXPECT_EQ(serialized.size(), 6 + longString.size());  // version, type, size, str data
+            EXPECT_EQ(serialized.size(), 6 + longString.size()); // version, type, size, str data
             sol::object value = LuaUtil::deserialize(lua, serialized);
             ASSERT_TRUE(value.is<std::string>());
             EXPECT_EQ(value.as<std::string>(), longString);
@@ -96,14 +96,14 @@ namespace
 
         {
             std::string serialized = LuaUtil::serialize(sol::make_object(lua, vec2));
-            EXPECT_EQ(serialized.size(), 18);  // version, type, 2x double
+            EXPECT_EQ(serialized.size(), 18); // version, type, 2x double
             sol::object value = LuaUtil::deserialize(lua, serialized);
             ASSERT_TRUE(value.is<osg::Vec2f>());
             EXPECT_EQ(value.as<osg::Vec2f>(), vec2);
         }
         {
             std::string serialized = LuaUtil::serialize(sol::make_object(lua, vec3));
-            EXPECT_EQ(serialized.size(), 26);  // version, type, 3x double
+            EXPECT_EQ(serialized.size(), 26); // version, type, 3x double
             sol::object value = LuaUtil::deserialize(lua, serialized);
             ASSERT_TRUE(value.is<osg::Vec3f>());
             EXPECT_EQ(value.as<osg::Vec3f>(), vec3);
@@ -131,12 +131,10 @@ namespace
         }
     }
 
-    TEST(LuaSerializationTest, Transform) {
+    TEST(LuaSerializationTest, Transform)
+    {
         sol::state lua;
-        osg::Matrixf matrix(1, 2, 3, 4,
-                            5, 6, 7, 8,
-                            9, 10, 11, 12,
-                            13, 14, 15, 16);
+        osg::Matrixf matrix(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
         LuaUtil::TransformM transM = LuaUtil::asTransform(matrix);
         osg::Quat quat(1, 2, 3, 4);
         LuaUtil::TransformQ transQ = LuaUtil::asTransform(quat);
@@ -155,7 +153,6 @@ namespace
             ASSERT_TRUE(value.is<LuaUtil::TransformQ>());
             EXPECT_EQ(value.as<LuaUtil::TransformQ>().mQ, transQ.mQ);
         }
-
     }
 
     TEST(LuaSerializationTest, Table)
@@ -177,7 +174,7 @@ namespace
         sol::table res_table = LuaUtil::deserialize(lua, serialized);
         sol::table res_readonly_table = LuaUtil::deserialize(lua, serialized, nullptr, true);
 
-        for (auto t : {res_table, res_readonly_table})
+        for (auto t : { res_table, res_readonly_table })
         {
             EXPECT_EQ(t.get<int>("aa"), 1);
             EXPECT_EQ(t.get<bool>("ab"), true);
@@ -196,8 +193,14 @@ namespace
         EXPECT_ERROR(lua.safe_script("ro_t.nested.x = 5"), "userdata value");
     }
 
-    struct TestStruct1 { double a, b; };
-    struct TestStruct2 { int a, b; };
+    struct TestStruct1
+    {
+        double a, b;
+    };
+    struct TestStruct2
+    {
+        int a, b;
+    };
 
     class TestSerializer final : public LuaUtil::UserdataSerializer
     {
@@ -227,7 +230,8 @@ namespace
             if (typeName == "ts1")
             {
                 if (sizeof(TestStruct1) != binaryData.size())
-                    throw std::runtime_error("Incorrect binaryData.size() for TestStruct1: " + std::to_string(binaryData.size()));
+                    throw std::runtime_error(
+                        "Incorrect binaryData.size() for TestStruct1: " + std::to_string(binaryData.size()));
                 TestStruct1 t;
                 std::memcpy(&t, binaryData.data(), sizeof(t));
                 t.a = Misc::fromLittleEndian(t.a);
@@ -238,7 +242,8 @@ namespace
             if (typeName == "test_struct2")
             {
                 if (sizeof(TestStruct2) != binaryData.size())
-                    throw std::runtime_error("Incorrect binaryData.size() for TestStruct2: " + std::to_string(binaryData.size()));
+                    throw std::runtime_error(
+                        "Incorrect binaryData.size() for TestStruct2: " + std::to_string(binaryData.size()));
                 TestStruct2 t;
                 std::memcpy(&t, binaryData.data(), sizeof(t));
                 t.a = Misc::fromLittleEndian(t.a);
@@ -254,8 +259,8 @@ namespace
     {
         sol::state lua;
         sol::table table(lua, sol::create);
-        table["x"] = TestStruct1{1.5, 2.5};
-        table["y"] = TestStruct2{4, 3};
+        table["x"] = TestStruct1{ 1.5, 2.5 };
+        table["y"] = TestStruct2{ 4, 3 };
         TestSerializer serializer;
 
         EXPECT_ERROR(LuaUtil::serialize(table), "Value is not serializable.");
diff --git a/apps/openmw_test_suite/lua/test_storage.cpp b/apps/openmw_test_suite/lua/test_storage.cpp
index 364cb9d3f6..a340e0c930 100644
--- a/apps/openmw_test_suite/lua/test_storage.cpp
+++ b/apps/openmw_test_suite/lua/test_storage.cpp
@@ -22,16 +22,14 @@ namespace
         LuaUtil::LuaStorage storage(mLua);
 
         std::vector<std::string> callbackCalls;
-        LuaUtil::Callback callback{
-            sol::make_object(mLua, [&](const std::string& section, const sol::optional<std::string>& key)
-            {
-                if (key)
-                    callbackCalls.push_back(section + "_" + *key);
-                else
-                    callbackCalls.push_back(section + "_*");
-            }),
-            sol::table(mLua, sol::create)
-        };
+        LuaUtil::Callback callback{ sol::make_object(mLua,
+                                        [&](const std::string& section, const sol::optional<std::string>& key) {
+                                            if (key)
+                                                callbackCalls.push_back(section + "_" + *key);
+                                            else
+                                                callbackCalls.push_back(section + "_*");
+                                        }),
+            sol::table(mLua, sol::create) };
         callback.mHiddenData[LuaUtil::ScriptsContainer::sScriptIdKey] = "fakeId";
 
         mLua["mutable"] = storage.getMutableSection("test");
diff --git a/apps/openmw_test_suite/lua/test_utilpackage.cpp b/apps/openmw_test_suite/lua/test_utilpackage.cpp
index 2e8734a2df..864fa418a5 100644
--- a/apps/openmw_test_suite/lua/test_utilpackage.cpp
+++ b/apps/openmw_test_suite/lua/test_utilpackage.cpp
@@ -39,7 +39,8 @@ namespace
         EXPECT_TRUE(get<bool>(lua, "util.vector2(1, 2) * 2 == util.vector2(2, 4)"));
         EXPECT_FLOAT_EQ(get<float>(lua, "util.vector2(3, 2) * v"), 17);
         EXPECT_FLOAT_EQ(get<float>(lua, "util.vector2(3, 2):dot(v)"), 17);
-        EXPECT_ERROR(lua.safe_script("v2, len = v.normalize()"), "value is not a valid userdata");  // checks that it doesn't segfault
+        EXPECT_ERROR(lua.safe_script("v2, len = v.normalize()"),
+            "value is not a valid userdata"); // checks that it doesn't segfault
         lua.safe_script("v2, len = v:normalize()");
         EXPECT_FLOAT_EQ(get<float>(lua, "len"), 5);
         EXPECT_TRUE(get<bool>(lua, "v2 == util.vector2(3/5, 4/5)"));
@@ -69,8 +70,8 @@ namespace
         EXPECT_TRUE(get<bool>(lua, "util.vector3(1, 2, 3) - util.vector3(2, 5, 1) == -util.vector3(1, 3, -2)"));
         EXPECT_TRUE(get<bool>(lua, "util.vector3(1, 2, 3) == util.vector3(2, 4, 6) / 2"));
         EXPECT_TRUE(get<bool>(lua, "util.vector3(1, 2, 3) * 2 == util.vector3(2, 4, 6)"));
-        EXPECT_FLOAT_EQ(get<float>(lua, "util.vector3(3, 2, 1) * v"), 5*3 + 12*2 + 13*1);
-        EXPECT_FLOAT_EQ(get<float>(lua, "util.vector3(3, 2, 1):dot(v)"), 5*3 + 12*2 + 13*1);
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.vector3(3, 2, 1) * v"), 5 * 3 + 12 * 2 + 13 * 1);
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.vector3(3, 2, 1):dot(v)"), 5 * 3 + 12 * 2 + 13 * 1);
         EXPECT_TRUE(get<bool>(lua, "util.vector3(1, 0, 0) ^ util.vector3(0, 1, 0) == util.vector3(0, 0, 1)"));
         EXPECT_ERROR(lua.safe_script("v2, len = util.vector3(3, 4, 0).normalize()"), "value is not a valid userdata");
         lua.safe_script("v2, len = util.vector3(3, 4, 0):normalize()");
@@ -99,7 +100,8 @@ namespace
         EXPECT_FLOAT_EQ(get<float>(lua, "util.vector4(4, 0, 0, 3):length2()"), 25);
         EXPECT_FALSE(get<bool>(lua, "util.vector4(1, 2, 3, 4) == util.vector4(1, 3, 2, 4)"));
         EXPECT_TRUE(get<bool>(lua, "util.vector4(1, 2, 3, 4) + util.vector4(2, 5, 1, 2) == util.vector4(3, 7, 4, 6)"));
-        EXPECT_TRUE(get<bool>(lua, "util.vector4(1, 2, 3, 4) - util.vector4(2, 5, 1, 7) == -util.vector4(1, 3, -2, 3)"));
+        EXPECT_TRUE(
+            get<bool>(lua, "util.vector4(1, 2, 3, 4) - util.vector4(2, 5, 1, 7) == -util.vector4(1, 3, -2, 3)"));
         EXPECT_TRUE(get<bool>(lua, "util.vector4(1, 2, 3, 4) == util.vector4(2, 4, 6, 8) / 2"));
         EXPECT_TRUE(get<bool>(lua, "util.vector4(1, 2, 3, 4) * 2 == util.vector4(2, 4, 6, 8)"));
         EXPECT_FLOAT_EQ(get<float>(lua, "util.vector4(3, 2, 1, 4) * v"), 5 * 3 + 12 * 2 + 13 * 1 + 15 * 4);
@@ -111,8 +113,10 @@ namespace
         EXPECT_FLOAT_EQ(get<float>(lua, "len"), 0);
         lua.safe_script("ediv0 = util.vector4(1, 1, 1, -1):ediv(util.vector4(0, 0, 0, 0))");
         EXPECT_TRUE(get<bool>(lua, "ediv0.w == -math.huge"));
-        EXPECT_TRUE(get<bool>(lua, "util.vector4(1, 2, 3, 4):emul(util.vector4(3, 4, 5, 6)) == util.vector4(3, 8, 15, 24)"));
-        EXPECT_TRUE(get<bool>(lua, "util.vector4(4, 6, 8, 9):ediv(util.vector4(2, 3, 4, 3)) == util.vector4(2, 2, 2, 3)"));
+        EXPECT_TRUE(
+            get<bool>(lua, "util.vector4(1, 2, 3, 4):emul(util.vector4(3, 4, 5, 6)) == util.vector4(3, 8, 15, 24)"));
+        EXPECT_TRUE(
+            get<bool>(lua, "util.vector4(4, 6, 8, 9):ediv(util.vector4(2, 3, 4, 3)) == util.vector4(2, 2, 2, 3)"));
     }
 
     TEST(LuaUtilPackageTest, Color)
@@ -149,7 +153,8 @@ namespace
         lua.safe_script("moveAndScale = T.move(v(1, 2, 3)) * T.scale(0.5, 1, 0.5) * T.move(10, 20, 30)");
         EXPECT_EQ(getAsString(lua, "moveAndScale * v(0, 0, 0)"), "(6, 22, 18)");
         EXPECT_EQ(getAsString(lua, "moveAndScale * v(300, 200, 100)"), "(156, 222, 68)");
-        EXPECT_THAT(getAsString(lua, "moveAndScale"), AllOf(StartsWith("TransformM{ move(6, 22, 18) scale(0.5, 1, 0.5) "), EndsWith(" }")));
+        EXPECT_THAT(getAsString(lua, "moveAndScale"),
+            AllOf(StartsWith("TransformM{ move(6, 22, 18) scale(0.5, 1, 0.5) "), EndsWith(" }")));
         EXPECT_EQ(getAsString(lua, "T.identity"), "TransformM{ }");
         lua.safe_script("rx = T.rotateX(-math.pi / 2)");
         lua.safe_script("ry = T.rotateY(-math.pi / 2)");
diff --git a/apps/openmw_test_suite/misc/progressreporter.cpp b/apps/openmw_test_suite/misc/progressreporter.cpp
index cd5449acf7..d5f7c649f1 100644
--- a/apps/openmw_test_suite/misc/progressreporter.cpp
+++ b/apps/openmw_test_suite/misc/progressreporter.cpp
@@ -1,7 +1,7 @@
 #include <components/misc/progressreporter.hpp>
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 #include <chrono>
 
@@ -19,17 +19,14 @@ namespace
     {
         StrictMock<ReportMock>* mImpl;
 
-        void operator()(std::size_t provided, std::size_t expected)
-        {
-            mImpl->call(provided, expected);
-        }
+        void operator()(std::size_t provided, std::size_t expected) { mImpl->call(provided, expected); }
     };
 
     TEST(MiscProgressReporterTest, shouldCallReportWhenPassedInterval)
     {
         StrictMock<ReportMock> report;
         EXPECT_CALL(report, call(13, 42)).WillOnce(Return());
-        ProgressReporter reporter(std::chrono::steady_clock::duration(0), Report {&report});
+        ProgressReporter reporter(std::chrono::steady_clock::duration(0), Report{ &report });
         reporter(13, 42);
     }
 
@@ -37,7 +34,7 @@ namespace
     {
         StrictMock<ReportMock> report;
         EXPECT_CALL(report, call(13, 42)).Times(0);
-        ProgressReporter reporter(std::chrono::seconds(1000), Report {&report});
+        ProgressReporter reporter(std::chrono::seconds(1000), Report{ &report });
         reporter(13, 42);
     }
 }
diff --git a/apps/openmw_test_suite/misc/test_endianness.cpp b/apps/openmw_test_suite/misc/test_endianness.cpp
index 9c3bbf61a6..2d0b0bcdbc 100644
--- a/apps/openmw_test_suite/misc/test_endianness.cpp
+++ b/apps/openmw_test_suite/misc/test_endianness.cpp
@@ -1,122 +1,124 @@
-#include <gtest/gtest.h>
 #include "components/misc/endianness.hpp"
+#include <gtest/gtest.h>
 
-struct EndiannessTest : public ::testing::Test {};
+struct EndiannessTest : public ::testing::Test
+{
+};
 
 TEST_F(EndiannessTest, test_swap_endianness_inplace1)
 {
-  uint8_t zero=0x00;
-  uint8_t ff=0xFF;
-  uint8_t fortytwo=0x42;
-  uint8_t half=128;
+    uint8_t zero = 0x00;
+    uint8_t ff = 0xFF;
+    uint8_t fortytwo = 0x42;
+    uint8_t half = 128;
 
-  Misc::swapEndiannessInplace(zero);
-  EXPECT_EQ(zero, 0x00);
+    Misc::swapEndiannessInplace(zero);
+    EXPECT_EQ(zero, 0x00);
 
-  Misc::swapEndiannessInplace(ff);
-  EXPECT_EQ(ff, 0xFF);
+    Misc::swapEndiannessInplace(ff);
+    EXPECT_EQ(ff, 0xFF);
 
-  Misc::swapEndiannessInplace(fortytwo);
-  EXPECT_EQ(fortytwo, 0x42);
+    Misc::swapEndiannessInplace(fortytwo);
+    EXPECT_EQ(fortytwo, 0x42);
 
-  Misc::swapEndiannessInplace(half);
-  EXPECT_EQ(half, 128);
+    Misc::swapEndiannessInplace(half);
+    EXPECT_EQ(half, 128);
 }
 
 TEST_F(EndiannessTest, test_swap_endianness_inplace2)
 {
-  uint16_t zero = 0x0000;
-  uint16_t ffff = 0xFFFF;
-  uint16_t n12 = 0x0102;
-  uint16_t fortytwo = 0x0042;
-
-  Misc::swapEndiannessInplace(zero);
-  EXPECT_EQ(zero, 0x0000u);
-  Misc::swapEndiannessInplace(zero);
-  EXPECT_EQ(zero, 0x0000u);
-
-  Misc::swapEndiannessInplace(ffff);
-  EXPECT_EQ(ffff, 0xFFFFu);
-  Misc::swapEndiannessInplace(ffff);
-  EXPECT_EQ(ffff, 0xFFFFu);
-
-  Misc::swapEndiannessInplace(n12);
-  EXPECT_EQ(n12, 0x0201u);
-  Misc::swapEndiannessInplace(n12);
-  EXPECT_EQ(n12, 0x0102u);
-
-  Misc::swapEndiannessInplace(fortytwo);
-  EXPECT_EQ(fortytwo, 0x4200u);
-  Misc::swapEndiannessInplace(fortytwo);
-  EXPECT_EQ(fortytwo, 0x0042u);
+    uint16_t zero = 0x0000;
+    uint16_t ffff = 0xFFFF;
+    uint16_t n12 = 0x0102;
+    uint16_t fortytwo = 0x0042;
+
+    Misc::swapEndiannessInplace(zero);
+    EXPECT_EQ(zero, 0x0000u);
+    Misc::swapEndiannessInplace(zero);
+    EXPECT_EQ(zero, 0x0000u);
+
+    Misc::swapEndiannessInplace(ffff);
+    EXPECT_EQ(ffff, 0xFFFFu);
+    Misc::swapEndiannessInplace(ffff);
+    EXPECT_EQ(ffff, 0xFFFFu);
+
+    Misc::swapEndiannessInplace(n12);
+    EXPECT_EQ(n12, 0x0201u);
+    Misc::swapEndiannessInplace(n12);
+    EXPECT_EQ(n12, 0x0102u);
+
+    Misc::swapEndiannessInplace(fortytwo);
+    EXPECT_EQ(fortytwo, 0x4200u);
+    Misc::swapEndiannessInplace(fortytwo);
+    EXPECT_EQ(fortytwo, 0x0042u);
 }
 
 TEST_F(EndiannessTest, test_swap_endianness_inplace4)
 {
-  uint32_t zero = 0x00000000;
-  uint32_t n1234 = 0x01020304;
-  uint32_t ffff = 0xFFFFFFFF;
-
-  Misc::swapEndiannessInplace(zero);
-  EXPECT_EQ(zero, 0x00000000u);
-  Misc::swapEndiannessInplace(zero);
-  EXPECT_EQ(zero, 0x00000000u);
-
-  Misc::swapEndiannessInplace(n1234);
-  EXPECT_EQ(n1234, 0x04030201u);
-  Misc::swapEndiannessInplace(n1234);
-  EXPECT_EQ(n1234, 0x01020304u);
-  
-  Misc::swapEndiannessInplace(ffff);
-  EXPECT_EQ(ffff, 0xFFFFFFFFu);
-  Misc::swapEndiannessInplace(ffff);
-  EXPECT_EQ(ffff, 0xFFFFFFFFu);
+    uint32_t zero = 0x00000000;
+    uint32_t n1234 = 0x01020304;
+    uint32_t ffff = 0xFFFFFFFF;
+
+    Misc::swapEndiannessInplace(zero);
+    EXPECT_EQ(zero, 0x00000000u);
+    Misc::swapEndiannessInplace(zero);
+    EXPECT_EQ(zero, 0x00000000u);
+
+    Misc::swapEndiannessInplace(n1234);
+    EXPECT_EQ(n1234, 0x04030201u);
+    Misc::swapEndiannessInplace(n1234);
+    EXPECT_EQ(n1234, 0x01020304u);
+
+    Misc::swapEndiannessInplace(ffff);
+    EXPECT_EQ(ffff, 0xFFFFFFFFu);
+    Misc::swapEndiannessInplace(ffff);
+    EXPECT_EQ(ffff, 0xFFFFFFFFu);
 }
 
 TEST_F(EndiannessTest, test_swap_endianness_inplace8)
 {
-  uint64_t zero = 0x0000'0000'0000'0000;
-  uint64_t n1234 = 0x0102'0304'0506'0708;
-  uint64_t ffff = 0xFFFF'FFFF'FFFF'FFFF;
-
-  Misc::swapEndiannessInplace(zero);
-  EXPECT_EQ(zero, 0x0000'0000'0000'0000u);
-  Misc::swapEndiannessInplace(zero);
-  EXPECT_EQ(zero, 0x0000'0000'0000'0000u);
-  
-  Misc::swapEndiannessInplace(ffff);
-  EXPECT_EQ(ffff, 0xFFFF'FFFF'FFFF'FFFFu);
-  Misc::swapEndiannessInplace(ffff);
-  EXPECT_EQ(ffff, 0xFFFF'FFFF'FFFF'FFFFu);
-
-  Misc::swapEndiannessInplace(n1234);
-  EXPECT_EQ(n1234, 0x0807'0605'0403'0201u);
-  Misc::swapEndiannessInplace(n1234);
-  EXPECT_EQ(n1234, 0x0102'0304'0506'0708u);
+    uint64_t zero = 0x0000'0000'0000'0000;
+    uint64_t n1234 = 0x0102'0304'0506'0708;
+    uint64_t ffff = 0xFFFF'FFFF'FFFF'FFFF;
+
+    Misc::swapEndiannessInplace(zero);
+    EXPECT_EQ(zero, 0x0000'0000'0000'0000u);
+    Misc::swapEndiannessInplace(zero);
+    EXPECT_EQ(zero, 0x0000'0000'0000'0000u);
+
+    Misc::swapEndiannessInplace(ffff);
+    EXPECT_EQ(ffff, 0xFFFF'FFFF'FFFF'FFFFu);
+    Misc::swapEndiannessInplace(ffff);
+    EXPECT_EQ(ffff, 0xFFFF'FFFF'FFFF'FFFFu);
+
+    Misc::swapEndiannessInplace(n1234);
+    EXPECT_EQ(n1234, 0x0807'0605'0403'0201u);
+    Misc::swapEndiannessInplace(n1234);
+    EXPECT_EQ(n1234, 0x0102'0304'0506'0708u);
 }
 
 TEST_F(EndiannessTest, test_swap_endianness_inplace_float)
 {
-  const uint32_t original = 0x4023d70a;
-  const uint32_t expected = 0x0ad72340;
+    const uint32_t original = 0x4023d70a;
+    const uint32_t expected = 0x0ad72340;
 
-  float number;
-  memcpy(&number, &original, sizeof(original));
+    float number;
+    memcpy(&number, &original, sizeof(original));
 
-  Misc::swapEndiannessInplace(number);
+    Misc::swapEndiannessInplace(number);
 
-  EXPECT_TRUE(!memcmp(&number, &expected, sizeof(expected)));
+    EXPECT_TRUE(!memcmp(&number, &expected, sizeof(expected)));
 }
 
 TEST_F(EndiannessTest, test_swap_endianness_inplace_double)
 {
-  const uint64_t original = 0x040047ae147ae147ul;
-  const uint64_t expected = 0x47e17a14ae470004ul;
+    const uint64_t original = 0x040047ae147ae147ul;
+    const uint64_t expected = 0x47e17a14ae470004ul;
 
-  double number;
-  memcpy(&number, &original, sizeof(original));
+    double number;
+    memcpy(&number, &original, sizeof(original));
 
-  Misc::swapEndiannessInplace(number);
+    Misc::swapEndiannessInplace(number);
 
-  EXPECT_TRUE(!memcmp(&number, &expected, sizeof(expected)) );
+    EXPECT_TRUE(!memcmp(&number, &expected, sizeof(expected)));
 }
diff --git a/apps/openmw_test_suite/misc/test_resourcehelpers.cpp b/apps/openmw_test_suite/misc/test_resourcehelpers.cpp
index c4130b9cca..dda9ce4962 100644
--- a/apps/openmw_test_suite/misc/test_resourcehelpers.cpp
+++ b/apps/openmw_test_suite/misc/test_resourcehelpers.cpp
@@ -1,37 +1,31 @@
-#include <gtest/gtest.h>
-#include "components/misc/resourcehelpers.hpp"
 #include "../testing_util.hpp"
+#include "components/misc/resourcehelpers.hpp"
+#include <gtest/gtest.h>
 
 namespace
 {
     using namespace Misc::ResourceHelpers;
     TEST(CorrectSoundPath, wav_files_not_overridden_with_mp3_in_vfs_are_not_corrected)
     {
-        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({
-            {"sound/bar.wav", nullptr}
-        });
+        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({ { "sound/bar.wav", nullptr } });
         EXPECT_EQ(correctSoundPath("sound/bar.wav", mVFS.get()), "sound/bar.wav");
     }
 
     TEST(CorrectSoundPath, wav_files_overridden_with_mp3_in_vfs_are_corrected)
     {
-        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({
-            {"sound/foo.mp3", nullptr}
-        });
+        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({ { "sound/foo.mp3", nullptr } });
         EXPECT_EQ(correctSoundPath("sound/foo.wav", mVFS.get()), "sound/foo.mp3");
     }
 
     TEST(CorrectSoundPath, corrected_path_does_not_check_existence_in_vfs)
     {
-        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({
-        });
+        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({});
         EXPECT_EQ(correctSoundPath("sound/foo.wav", mVFS.get()), "sound/foo.mp3");
     }
 
     TEST(CorrectSoundPath, correct_path_normalize_paths)
     {
-        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({
-        });
+        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({});
         EXPECT_EQ(correctSoundPath("sound\\foo.wav", mVFS.get()), "sound/foo.mp3");
         EXPECT_EQ(correctSoundPath("SOUND\\foo.WAV", mVFS.get()), "SOUND/foo.mp3");
     }
diff --git a/apps/openmw_test_suite/misc/test_stringops.cpp b/apps/openmw_test_suite/misc/test_stringops.cpp
index 1cbbedc8b0..7ef13b3541 100644
--- a/apps/openmw_test_suite/misc/test_stringops.cpp
+++ b/apps/openmw_test_suite/misc/test_stringops.cpp
@@ -12,12 +12,12 @@
 
 struct PartialBinarySearchTest : public ::testing::Test
 {
-  protected:
+protected:
     std::vector<std::string> mDataVec;
     void SetUp() override
     {
         const char* data[] = { "Head", "Chest", "Tri Head", "Tri Chest", "Bip01", "Tri Bip01" };
-        mDataVec = std::vector<std::string>(data, data+sizeof(data)/sizeof(data[0]));
+        mDataVec = std::vector<std::string>(data, data + sizeof(data) / sizeof(data[0]));
         std::sort(mDataVec.begin(), mDataVec.end(), Misc::StringUtils::ciLess);
     }
 
@@ -29,32 +29,32 @@ struct PartialBinarySearchTest : public ::testing::Test
 
 TEST_F(PartialBinarySearchTest, partial_binary_search_test)
 {
-    EXPECT_TRUE( matches("Head 01") );
-    EXPECT_TRUE( matches("Head") );
-    EXPECT_TRUE( matches("Tri Head 01") );
-    EXPECT_TRUE( matches("Tri Head") );
-    EXPECT_TRUE( matches("tri head") );
-    EXPECT_TRUE( matches("Tri bip01") );
-    EXPECT_TRUE( matches("bip01") );
-    EXPECT_TRUE( matches("bip01 head") );
-    EXPECT_TRUE( matches("Bip01 L Hand") );
-    EXPECT_TRUE( matches("BIp01 r Clavicle") );
-    EXPECT_TRUE( matches("Bip01 SpiNe1") );
-
-    EXPECT_FALSE( matches("") );
-    EXPECT_FALSE( matches("Node Bip01") );
-    EXPECT_FALSE( matches("Hea") );
-    EXPECT_FALSE( matches(" Head") );
-    EXPECT_FALSE( matches("Tri  Head") );
+    EXPECT_TRUE(matches("Head 01"));
+    EXPECT_TRUE(matches("Head"));
+    EXPECT_TRUE(matches("Tri Head 01"));
+    EXPECT_TRUE(matches("Tri Head"));
+    EXPECT_TRUE(matches("tri head"));
+    EXPECT_TRUE(matches("Tri bip01"));
+    EXPECT_TRUE(matches("bip01"));
+    EXPECT_TRUE(matches("bip01 head"));
+    EXPECT_TRUE(matches("Bip01 L Hand"));
+    EXPECT_TRUE(matches("BIp01 r Clavicle"));
+    EXPECT_TRUE(matches("Bip01 SpiNe1"));
+
+    EXPECT_FALSE(matches(""));
+    EXPECT_FALSE(matches("Node Bip01"));
+    EXPECT_FALSE(matches("Hea"));
+    EXPECT_FALSE(matches(" Head"));
+    EXPECT_FALSE(matches("Tri  Head"));
 }
 
-TEST_F (PartialBinarySearchTest, ci_test)
+TEST_F(PartialBinarySearchTest, ci_test)
 {
-    EXPECT_TRUE (Misc::StringUtils::lowerCase("ASD") == "asd");
+    EXPECT_TRUE(Misc::StringUtils::lowerCase("ASD") == "asd");
 
     // test to make sure system locale is not used
     std::string unicode1 = "\u04151 \u0418"; // CYRILLIC CAPITAL LETTER IE, CYRILLIC CAPITAL LETTER I
-    EXPECT_TRUE( Misc::StringUtils::lowerCase(unicode1) == unicode1 );
+    EXPECT_TRUE(Misc::StringUtils::lowerCase(unicode1) == unicode1);
 }
 
 namespace
@@ -63,37 +63,33 @@ namespace
     using namespace ::testing;
 
     template <class T>
-    struct MiscStringUtilsCiEqualEmptyTest : Test {};
+    struct MiscStringUtilsCiEqualEmptyTest : Test
+    {
+    };
 
     TYPED_TEST_SUITE_P(MiscStringUtilsCiEqualEmptyTest);
 
     TYPED_TEST_P(MiscStringUtilsCiEqualEmptyTest, empty_strings_should_be_equal)
     {
-        const typename TypeParam::first_type a {};
-        const typename TypeParam::second_type b {};
+        const typename TypeParam::first_type a{};
+        const typename TypeParam::second_type b{};
         EXPECT_TRUE(ciEqual(a, b));
     }
 
-    REGISTER_TYPED_TEST_SUITE_P(MiscStringUtilsCiEqualEmptyTest,
-        empty_strings_should_be_equal
-    );
+    REGISTER_TYPED_TEST_SUITE_P(MiscStringUtilsCiEqualEmptyTest, empty_strings_should_be_equal);
 
-    using EmptyStringTypePairsTypes = Types<
-        std::pair<std::string, std::string>,
-        std::pair<std::string, std::string_view>,
-        std::pair<std::string, const char[1]>,
-        std::pair<std::string_view, std::string>,
-        std::pair<std::string_view, std::string_view>,
-        std::pair<std::string_view, const char[1]>,
-        std::pair<const char[1], std::string>,
-        std::pair<const char[1], std::string_view>,
-        std::pair<const char[1], const char[1]>
-    >;
+    using EmptyStringTypePairsTypes = Types<std::pair<std::string, std::string>,
+        std::pair<std::string, std::string_view>, std::pair<std::string, const char[1]>,
+        std::pair<std::string_view, std::string>, std::pair<std::string_view, std::string_view>,
+        std::pair<std::string_view, const char[1]>, std::pair<const char[1], std::string>,
+        std::pair<const char[1], std::string_view>, std::pair<const char[1], const char[1]>>;
 
     INSTANTIATE_TYPED_TEST_SUITE_P(EmptyStringTypePairs, MiscStringUtilsCiEqualEmptyTest, EmptyStringTypePairsTypes);
 
     template <class T>
-    struct MiscStringUtilsCiEqualNotEmptyTest : Test {};
+    struct MiscStringUtilsCiEqualNotEmptyTest : Test
+    {
+    };
 
     TYPED_TEST_SUITE_P(MiscStringUtilsCiEqualNotEmptyTest);
 
@@ -108,44 +104,36 @@ namespace
 
     TYPED_TEST_P(MiscStringUtilsCiEqualNotEmptyTest, same_strings_should_be_equal)
     {
-        const Value<typename TypeParam::first_type> a {foo};
-        const Value<typename TypeParam::second_type> b {foo};
+        const Value<typename TypeParam::first_type> a{ foo };
+        const Value<typename TypeParam::second_type> b{ foo };
         EXPECT_TRUE(ciEqual(a, b)) << a << "\n" << b;
     }
 
     TYPED_TEST_P(MiscStringUtilsCiEqualNotEmptyTest, same_strings_with_different_case_sensetivity_should_be_equal)
     {
-        const Value<typename TypeParam::first_type> a {foo};
-        const Value<typename TypeParam::second_type> b {fooUpper};
+        const Value<typename TypeParam::first_type> a{ foo };
+        const Value<typename TypeParam::second_type> b{ fooUpper };
         EXPECT_TRUE(ciEqual(a, b)) << a << "\n" << b;
     }
 
     TYPED_TEST_P(MiscStringUtilsCiEqualNotEmptyTest, different_strings_content_should_not_be_equal)
     {
-        const Value<typename TypeParam::first_type> a {foo};
-        const Value<typename TypeParam::second_type> b {bar};
+        const Value<typename TypeParam::first_type> a{ foo };
+        const Value<typename TypeParam::second_type> b{ bar };
         EXPECT_FALSE(ciEqual(a, b)) << a << "\n" << b;
     }
 
-    REGISTER_TYPED_TEST_SUITE_P(MiscStringUtilsCiEqualNotEmptyTest,
-        same_strings_should_be_equal,
-        same_strings_with_different_case_sensetivity_should_be_equal,
-        different_strings_content_should_not_be_equal
-    );
-
-    using NotEmptyStringTypePairsTypes = Types<
-        std::pair<std::string, std::string>,
-        std::pair<std::string, std::string_view>,
-        std::pair<std::string, const char[4]>,
-        std::pair<std::string_view, std::string>,
-        std::pair<std::string_view, std::string_view>,
-        std::pair<std::string_view, const char[4]>,
-        std::pair<const char[4], std::string>,
-        std::pair<const char[4], std::string_view>,
-        std::pair<const char[4], const char[4]>
-    >;
-
-    INSTANTIATE_TYPED_TEST_SUITE_P(NotEmptyStringTypePairs, MiscStringUtilsCiEqualNotEmptyTest, NotEmptyStringTypePairsTypes);
+    REGISTER_TYPED_TEST_SUITE_P(MiscStringUtilsCiEqualNotEmptyTest, same_strings_should_be_equal,
+        same_strings_with_different_case_sensetivity_should_be_equal, different_strings_content_should_not_be_equal);
+
+    using NotEmptyStringTypePairsTypes = Types<std::pair<std::string, std::string>,
+        std::pair<std::string, std::string_view>, std::pair<std::string, const char[4]>,
+        std::pair<std::string_view, std::string>, std::pair<std::string_view, std::string_view>,
+        std::pair<std::string_view, const char[4]>, std::pair<const char[4], std::string>,
+        std::pair<const char[4], std::string_view>, std::pair<const char[4], const char[4]>>;
+
+    INSTANTIATE_TYPED_TEST_SUITE_P(
+        NotEmptyStringTypePairs, MiscStringUtilsCiEqualNotEmptyTest, NotEmptyStringTypePairsTypes);
 
     TEST(MiscStringUtilsCiEqualTest, string_with_different_length_should_not_be_equal)
     {
diff --git a/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp b/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
index 6128c7e5dd..b886a8b620 100644
--- a/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
+++ b/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
@@ -1,16 +1,12 @@
-#include <gtest/gtest.h>
 #include "apps/openmw/mwdialogue/keywordsearch.hpp"
+#include <gtest/gtest.h>
 
 struct KeywordSearchTest : public ::testing::Test
 {
-  protected:
-    void SetUp() override
-    {
-    }
-
-    void TearDown() override
-    {
-    }
+protected:
+    void SetUp() override {}
+
+    void TearDown() override {}
 };
 
 TEST_F(KeywordSearchTest, keyword_test_conflict_resolution)
@@ -27,9 +23,9 @@ TEST_F(KeywordSearchTest, keyword_test_conflict_resolution)
     search.highlightKeywords(text.begin(), text.end(), matches);
 
     // Should contain: "foo bar", "lock switch"
-    EXPECT_EQ (matches.size() , 2);
-    EXPECT_EQ (std::string(matches.front().mBeg, matches.front().mEnd) , "foo bar");
-    EXPECT_EQ (std::string(matches.rbegin()->mBeg, matches.rbegin()->mEnd) , "lock switch");
+    EXPECT_EQ(matches.size(), 2);
+    EXPECT_EQ(std::string(matches.front().mBeg, matches.front().mEnd), "foo bar");
+    EXPECT_EQ(std::string(matches.rbegin()->mBeg, matches.rbegin()->mEnd), "lock switch");
 }
 
 TEST_F(KeywordSearchTest, keyword_test_conflict_resolution2)
@@ -43,11 +39,10 @@ TEST_F(KeywordSearchTest, keyword_test_conflict_resolution2)
     std::vector<MWDialogue::KeywordSearch<std::string, int>::Match> matches;
     search.highlightKeywords(text.begin(), text.end(), matches);
 
-    EXPECT_EQ (matches.size() , 1);
-    EXPECT_EQ (std::string(matches.front().mBeg, matches.front().mEnd) , "dwemer language");
+    EXPECT_EQ(matches.size(), 1);
+    EXPECT_EQ(std::string(matches.front().mBeg, matches.front().mEnd), "dwemer language");
 }
 
-
 TEST_F(KeywordSearchTest, keyword_test_conflict_resolution3)
 {
     // testing that the longest keyword is chosen, rather than maximizing the
@@ -62,11 +57,10 @@ TEST_F(KeywordSearchTest, keyword_test_conflict_resolution3)
     std::vector<MWDialogue::KeywordSearch<std::string, int>::Match> matches;
     search.highlightKeywords(text.begin(), text.end(), matches);
 
-    EXPECT_EQ (matches.size() , 1);
-    EXPECT_EQ (std::string(matches.front().mBeg, matches.front().mEnd) , "bar lock");
+    EXPECT_EQ(matches.size(), 1);
+    EXPECT_EQ(std::string(matches.front().mBeg, matches.front().mEnd), "bar lock");
 }
 
-
 TEST_F(KeywordSearchTest, keyword_test_utf8_word_begin)
 {
     // We make sure that the search works well even if the character is not ASCII
@@ -76,15 +70,17 @@ TEST_F(KeywordSearchTest, keyword_test_utf8_word_begin)
     search.seed("ça nous déçois", 0);
     search.seed("ois", 0);
 
-    std::string text = "les nations unis ont réunis le monde entier, états units inclus pour parler du problème des gens ïrradiés et ça nous déçois";
+    std::string text
+        = "les nations unis ont réunis le monde entier, états units inclus pour parler du problème des gens ïrradiés "
+          "et ça nous déçois";
 
     std::vector<MWDialogue::KeywordSearch<std::string, int>::Match> matches;
     search.highlightKeywords(text.begin(), text.end(), matches);
 
-    EXPECT_EQ (matches.size() , 3);
-    EXPECT_EQ (std::string( matches[0].mBeg, matches[0].mEnd) , "états");
-    EXPECT_EQ (std::string( matches[1].mBeg, matches[1].mEnd) , "ïrradiés");
-    EXPECT_EQ (std::string( matches[2].mBeg, matches[2].mEnd) , "ça nous déçois");
+    EXPECT_EQ(matches.size(), 3);
+    EXPECT_EQ(std::string(matches[0].mBeg, matches[0].mEnd), "états");
+    EXPECT_EQ(std::string(matches[1].mBeg, matches[1].mEnd), "ïrradiés");
+    EXPECT_EQ(std::string(matches[2].mBeg, matches[2].mEnd), "ça nous déçois");
 }
 
 TEST_F(KeywordSearchTest, keyword_test_non_alpha_non_whitespace_word_begin)
@@ -93,8 +89,6 @@ TEST_F(KeywordSearchTest, keyword_test_non_alpha_non_whitespace_word_begin)
     MWDialogue::KeywordSearch<std::string, int> search;
     search.seed("Report to caius cosades", 0);
 
-
-
     std::string text = "I was told to \"Report to caius cosades\"";
 
     std::vector<MWDialogue::KeywordSearch<std::string, int>::Match> matches;
@@ -110,7 +104,8 @@ TEST_F(KeywordSearchTest, keyword_test_russian_non_ascii_before)
     MWDialogue::KeywordSearch<std::string, int> search;
     search.seed("Доложить Каю Косадесу", 0);
 
-    std::string text = "Что? Да. Я Кай Косадес. То есть как это, вам велели «Доложить Каю Косадесу»? О чем вы говорите?";
+    std::string text
+        = "Что? Да. Я Кай Косадес. То есть как это, вам велели «Доложить Каю Косадесу»? О чем вы говорите?";
 
     std::vector<MWDialogue::KeywordSearch<std::string, int>::Match> matches;
     search.highlightKeywords(text.begin(), text.end(), matches);
@@ -125,7 +120,8 @@ TEST_F(KeywordSearchTest, keyword_test_russian_ascii_before)
     MWDialogue::KeywordSearch<std::string, int> search;
     search.seed("Доложить Каю Косадесу", 0);
 
-    std::string text = "Что? Да. Я Кай Косадес. То есть как это, вам велели 'Доложить Каю Косадесу'? О чем вы говорите?";
+    std::string text
+        = "Что? Да. Я Кай Косадес. То есть как это, вам велели 'Доложить Каю Косадесу'? О чем вы говорите?";
 
     std::vector<MWDialogue::KeywordSearch<std::string, int>::Match> matches;
     search.highlightKeywords(text.begin(), text.end(), matches);
@@ -133,4 +129,3 @@ TEST_F(KeywordSearchTest, keyword_test_russian_ascii_before)
     EXPECT_EQ(matches.size(), 1);
     EXPECT_EQ(std::string(matches[0].mBeg, matches[0].mEnd), "Доложить Каю Косадесу");
 }
-
diff --git a/apps/openmw_test_suite/mwscript/test_scripts.cpp b/apps/openmw_test_suite/mwscript/test_scripts.cpp
index dea2a0dc8a..9b6741475b 100644
--- a/apps/openmw_test_suite/mwscript/test_scripts.cpp
+++ b/apps/openmw_test_suite/mwscript/test_scripts.cpp
@@ -7,7 +7,11 @@ namespace
 {
     struct MWScriptTest : public ::testing::Test
     {
-        MWScriptTest() : mErrorHandler(), mParser(mErrorHandler, mCompilerContext) {}
+        MWScriptTest()
+            : mErrorHandler()
+            , mParser(mErrorHandler, mCompilerContext)
+        {
+        }
 
         std::optional<CompiledScript> compile(const std::string& scriptBody, bool shouldFail = false)
         {
@@ -16,23 +20,23 @@ namespace
             std::istringstream input(scriptBody);
             Compiler::Scanner scanner(mErrorHandler, input, mCompilerContext.getExtensions());
             scanner.scan(mParser);
-            if(mErrorHandler.isGood())
+            if (mErrorHandler.isGood())
             {
                 std::vector<Interpreter::Type_Code> code;
                 mParser.getCode(code);
                 return CompiledScript(code, mParser.getLocals());
             }
-            else if(!shouldFail)
+            else if (!shouldFail)
                 logErrors();
             return {};
         }
 
         void logErrors()
         {
-            for(const auto& [error, loc] : mErrorHandler.getErrors())
+            for (const auto& [error, loc] : mErrorHandler.getErrors())
             {
                 std::cout << error;
-                if(loc.mLine)
+                if (loc.mLine)
                     std::cout << " at line" << loc.mLine << " column " << loc.mColumn << " (" << loc.mLiteral << ")";
                 std::cout << "\n";
             }
@@ -49,19 +53,17 @@ namespace
             mInterpreter.run(&script.mByteCode[0], static_cast<int>(script.mByteCode.size()), context);
         }
 
-        template<typename T, typename ...TArgs>
-        void installOpcode(int code, TArgs&& ...args)
+        template <typename T, typename... TArgs>
+        void installOpcode(int code, TArgs&&... args)
         {
             mInterpreter.installSegment5<T>(code, std::forward<TArgs&&>(args)...);
         }
-		
+
     protected:
-        void SetUp() override
-        {
-            Interpreter::installOpcodes(mInterpreter);
-        }
+        void SetUp() override { Interpreter::installOpcodes(mInterpreter); }
 
         void TearDown() override {}
+
     private:
         TestErrorHandler mErrorHandler;
         TestCompilerContext mCompilerContext;
@@ -112,7 +114,7 @@ set e to ( d / a )
 
 End)mwscript";
 
-// https://forum.openmw.org/viewtopic.php?f=6&t=2262
+    // https://forum.openmw.org/viewtopic.php?f=6&t=2262
     const std::string sScript4 = R"mwscript(Begin scripting_once_again
 
 player -> addSpell "fire_bite", 645
@@ -458,13 +460,17 @@ messagebox,"this is a %g",a
     {
         registerExtensions();
         bool failed = true;
-        if(const auto script = compile(sScript2))
+        if (const auto script = compile(sScript2))
         {
             class AddTopic : public Interpreter::Opcode0
             {
                 bool& mFailed;
+
             public:
-                AddTopic(bool& failed) : mFailed(failed) {}
+                AddTopic(bool& failed)
+                    : mFailed(failed)
+                {
+                }
 
                 void execute(Interpreter::Runtime& runtime)
                 {
@@ -478,7 +484,7 @@ messagebox,"this is a %g",a
             TestInterpreterContext context;
             run(*script, context);
         }
-        if(failed)
+        if (failed)
         {
             FAIL();
         }
@@ -486,7 +492,7 @@ messagebox,"this is a %g",a
 
     TEST_F(MWScriptTest, mwscript_test_math)
     {
-        if(const auto script = compile(sScript3))
+        if (const auto script = compile(sScript3))
         {
             struct Algorithm
             {
@@ -515,7 +521,7 @@ messagebox,"this is a %g",a
                 }
             } algorithm;
             TestInterpreterContext context;
-            for(int i = 1; i < 1000; ++i)
+            for (int i = 1; i < 1000; ++i)
             {
                 context.setLocalShort(0, i);
                 run(*script, context);
@@ -558,7 +564,7 @@ messagebox,"this is a %g",a
 
     TEST_F(MWScriptTest, mwscript_test_1062)
     {
-        if(const auto script = compile(sIssue1062))
+        if (const auto script = compile(sIssue1062))
         {
             EXPECT_EQ(script->mLocals.getIndex("end"), 0);
         }
@@ -592,12 +598,12 @@ messagebox,"this is a %g",a
 
     TEST_F(MWScriptTest, mwscript_test_2185)
     {
-        if(const auto script = compile(sIssue2185))
+        if (const auto script = compile(sIssue2185))
         {
             TestInterpreterContext context;
-            for(int a = 0; a < 100; ++a)
+            for (int a = 0; a < 100; ++a)
             {
-                for(int b = 0; b < 100; ++b)
+                for (int b = 0; b < 100; ++b)
                 {
                     context.setLocalShort(0, a);
                     context.setLocalShort(1, b);
@@ -647,7 +653,7 @@ messagebox,"this is a %g",a
 
     TEST_F(MWScriptTest, mwscript_test_3006)
     {
-        if(const auto script = compile(sIssue3006))
+        if (const auto script = compile(sIssue3006))
         {
             TestInterpreterContext context;
             context.setLocalShort(0, 0);
@@ -671,12 +677,12 @@ messagebox,"this is a %g",a
 
     TEST_F(MWScriptTest, mwscript_test_3744)
     {
-        if(const auto script = compile(sIssue3744))
+        if (const auto script = compile(sIssue3744))
         {
             TestInterpreterContext context;
-            for(int a = 0; a < 100; ++a)
+            for (int a = 0; a < 100; ++a)
             {
-                for(int b = 0; b < 100; ++b)
+                for (int b = 0; b < 100; ++b)
                 {
                     context.setLocalShort(0, a);
                     context.setLocalShort(1, b);
@@ -700,14 +706,18 @@ messagebox,"this is a %g",a
     TEST_F(MWScriptTest, mwscript_test_3846)
     {
         registerExtensions();
-        if(const auto script = compile(sIssue3846))
+        if (const auto script = compile(sIssue3846))
         {
             std::vector<std::string> topics = { "-spells...", "-magicka..." };
             class AddTopic : public Interpreter::Opcode0
             {
                 std::vector<std::string>& mTopics;
+
             public:
-                AddTopic(std::vector<std::string>& topics) : mTopics(topics) {}
+                AddTopic(std::vector<std::string>& topics)
+                    : mTopics(topics)
+                {
+                }
 
                 void execute(Interpreter::Runtime& runtime)
                 {
@@ -740,12 +750,12 @@ messagebox,"this is a %g",a
 
     TEST_F(MWScriptTest, mwscript_test_4597)
     {
-        if(const auto script = compile(sIssue4597))
+        if (const auto script = compile(sIssue4597))
         {
             TestInterpreterContext context;
-            for(int a = 0; a < 100; ++a)
+            for (int a = 0; a < 100; ++a)
             {
-                for(int b = 0; b < 100; ++b)
+                for (int b = 0; b < 100; ++b)
                 {
                     context.setLocalShort(0, a);
                     context.setLocalShort(1, b);
@@ -814,18 +824,19 @@ messagebox,"this is a %g",a
     TEST_F(MWScriptTest, mwscript_test_6363)
     {
         registerExtensions();
-        if(const auto script = compile(sIssue6363))
+        if (const auto script = compile(sIssue6363))
         {
             class PositionCell : public Interpreter::Opcode0
             {
                 bool& mRan;
-            public:
-                PositionCell(bool& ran) : mRan(ran) {}
 
-                void execute(Interpreter::Runtime& runtime)
+            public:
+                PositionCell(bool& ran)
+                    : mRan(ran)
                 {
-                    mRan = true;
                 }
+
+                void execute(Interpreter::Runtime& runtime) { mRan = true; }
             };
             bool ran = false;
             installOpcode<PositionCell>(Compiler::Transformation::opcodePositionCell, ran);
diff --git a/apps/openmw_test_suite/mwscript/test_utils.hpp b/apps/openmw_test_suite/mwscript/test_utils.hpp
index 407572e961..f158ac62d5 100644
--- a/apps/openmw_test_suite/mwscript/test_utils.hpp
+++ b/apps/openmw_test_suite/mwscript/test_utils.hpp
@@ -29,7 +29,10 @@ namespace
     public:
         bool canDeclareLocals() const override { return true; }
         char getGlobalType(const std::string& name) const override { return ' '; }
-        std::pair<char, bool> getMemberType(const std::string& name, const std::string& id) const override { return {' ', false}; }
+        std::pair<char, bool> getMemberType(const std::string& name, const std::string& id) const override
+        {
+            return { ' ', false };
+        }
         bool isId(const std::string& name) const override { return Misc::StringUtils::ciEqual(name, "player"); }
     };
 
@@ -37,9 +40,10 @@ namespace
     {
         std::vector<std::pair<std::string, Compiler::TokenLoc>> mErrors;
 
-        void report(const std::string& message, const Compiler::TokenLoc& loc, Compiler::ErrorHandler::Type type) override
+        void report(
+            const std::string& message, const Compiler::TokenLoc& loc, Compiler::ErrorHandler::Type type) override
         {
-            if(type == Compiler::ErrorHandler::ErrorMessage)
+            if (type == Compiler::ErrorHandler::ErrorMessage)
                 mErrors.emplace_back(message, loc);
         }
 
@@ -64,21 +68,22 @@ namespace
         std::vector<int> mLongs;
         std::vector<float> mFloats;
 
-        template<class T>
+        template <class T>
         T getLocal(std::size_t index, const std::vector<T>& vector) const
         {
-            if(index < vector.size())
+            if (index < vector.size())
                 return vector[index];
             return {};
         }
 
-        template<class T>
+        template <class T>
         void setLocal(T value, std::size_t index, std::vector<T>& vector)
         {
-            if(index >= vector.size())
+            if (index >= vector.size())
                 vector.resize(index + 1);
             vector[index] = value;
         }
+
     public:
         void clear()
         {
@@ -106,14 +111,15 @@ namespace
         std::map<std::string, int, std::less<>> mLongs;
         std::map<std::string, float, std::less<>> mFloats;
 
-        template<class T>
+        template <class T>
         T getGlobal(std::string_view name, const std::map<std::string, T, std::less<>>& map) const
         {
             auto it = map.find(name);
-            if(it != map.end())
+            if (it != map.end())
                 return it->second;
             return {};
         }
+
     public:
         void clear()
         {
@@ -139,6 +145,7 @@ namespace
     {
         LocalVariables mLocals;
         std::map<std::string, GlobalVariables, std::less<>> mMembers;
+
     public:
         std::string_view getTarget() const override { return {}; };
 
@@ -154,9 +161,9 @@ namespace
 
         void setLocalFloat(int index, float value) override { mLocals.setFloat(index, value); };
 
-        void messageBox(std::string_view message, const std::vector<std::string>& buttons) override {};
+        void messageBox(std::string_view message, const std::vector<std::string>& buttons) override{};
 
-        void report(const std::string& message) override {};
+        void report(const std::string& message) override{};
 
         int getGlobalShort(std::string_view name) const override { return {}; };
 
@@ -164,11 +171,11 @@ namespace
 
         float getGlobalFloat(std::string_view name) const override { return {}; };
 
-        void setGlobalShort(std::string_view name, int value) override {};
+        void setGlobalShort(std::string_view name, int value) override{};
 
-        void setGlobalLong(std::string_view name, int value) override {};
+        void setGlobalLong(std::string_view name, int value) override{};
 
-        void setGlobalFloat(std::string_view name, float value) override {};
+        void setGlobalFloat(std::string_view name, float value) override{};
 
         std::vector<std::string> getGlobals() const override { return {}; };
 
@@ -203,7 +210,7 @@ namespace
         int getMemberShort(std::string_view id, std::string_view name, bool global) const override
         {
             auto it = mMembers.find(id);
-            if(it != mMembers.end())
+            if (it != mMembers.end())
                 return it->second.getShort(name);
             return {};
         };
@@ -211,7 +218,7 @@ namespace
         int getMemberLong(std::string_view id, std::string_view name, bool global) const override
         {
             auto it = mMembers.find(id);
-            if(it != mMembers.end())
+            if (it != mMembers.end())
                 return it->second.getLong(name);
             return {};
         };
@@ -219,16 +226,25 @@ namespace
         float getMemberFloat(std::string_view id, std::string_view name, bool global) const override
         {
             auto it = mMembers.find(id);
-            if(it != mMembers.end())
+            if (it != mMembers.end())
                 return it->second.getFloat(name);
             return {};
         };
 
-        void setMemberShort(std::string_view id, std::string_view name, int value, bool global) override { mMembers[std::string(id)].setShort(name, value); };
+        void setMemberShort(std::string_view id, std::string_view name, int value, bool global) override
+        {
+            mMembers[std::string(id)].setShort(name, value);
+        };
 
-        void setMemberLong(std::string_view id, std::string_view name, int value, bool global) override { mMembers[std::string(id)].setLong(name, value); };
+        void setMemberLong(std::string_view id, std::string_view name, int value, bool global) override
+        {
+            mMembers[std::string(id)].setLong(name, value);
+        };
 
-        void setMemberFloat(std::string_view id, std::string_view name, float value, bool global) override { mMembers[std::string(id)].setFloat(name, value); };
+        void setMemberFloat(std::string_view id, std::string_view name, float value, bool global) override
+        {
+            mMembers[std::string(id)].setFloat(name, value);
+        };
     };
 
     struct CompiledScript
@@ -236,7 +252,11 @@ namespace
         std::vector<Interpreter::Type_Code> mByteCode;
         Compiler::Locals mLocals;
 
-        CompiledScript(const std::vector<Interpreter::Type_Code>& code, const Compiler::Locals& locals) : mByteCode(code), mLocals(locals) {}
+        CompiledScript(const std::vector<Interpreter::Type_Code>& code, const Compiler::Locals& locals)
+            : mByteCode(code)
+            , mLocals(locals)
+        {
+        }
     };
 }
 
diff --git a/apps/openmw_test_suite/mwworld/test_store.cpp b/apps/openmw_test_suite/mwworld/test_store.cpp
index 07166e607c..c3aa7ecf23 100644
--- a/apps/openmw_test_suite/mwworld/test_store.cpp
+++ b/apps/openmw_test_suite/mwworld/test_store.cpp
@@ -5,22 +5,26 @@
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/variables_map.hpp>
 
-#include <components/files/configurationmanager.hpp>
+#include <components/esm/records.hpp>
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/esmwriter.hpp>
-#include <components/esm/records.hpp>
+#include <components/files/configurationmanager.hpp>
+#include <components/files/conversion.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/misc/strings/algorithm.hpp>
-#include <components/files/conversion.hpp>
 
-#include "apps/openmw/mwworld/esmstore.hpp"
 #include "apps/openmw/mwmechanics/spelllist.hpp"
+#include "apps/openmw/mwworld/esmstore.hpp"
 
 #include "../testing_util.hpp"
 
 namespace MWMechanics
 {
-    SpellList::SpellList(const std::string& id, int type) : mId(id), mType(type) {}
+    SpellList::SpellList(const std::string& id, int type)
+        : mId(id)
+        , mType(type)
+    {
+    }
 }
 
 static Loading::Listener dummyListener;
@@ -28,16 +32,15 @@ static Loading::Listener dummyListener;
 /// Base class for tests of ESMStore that rely on external content files to produce the test results
 struct ContentFileTest : public ::testing::Test
 {
-  protected:
-
+protected:
     void SetUp() override
     {
         readContentFiles();
 
         // load the content files
-        int index=0;
+        int index = 0;
         ESM::Dialogue* dialogue = nullptr;
-        for (const auto & mContentFile : mContentFiles)
+        for (const auto& mContentFile : mContentFiles)
         {
             ESM::ESMReader lEsm;
             lEsm.setEncoder(nullptr);
@@ -51,9 +54,7 @@ struct ContentFileTest : public ::testing::Test
         mEsmStore.setUp();
     }
 
-    void TearDown() override
-    {
-    }
+    void TearDown() override {}
 
     // read absolute path to content files from openmw.cfg
     void readContentFiles()
@@ -62,20 +63,32 @@ struct ContentFileTest : public ::testing::Test
 
         boost::program_options::options_description desc("Allowed options");
         auto addOption = desc.add_options();
-        addOption("data", boost::program_options::value<Files::MaybeQuotedPathContainer>()->default_value(Files::MaybeQuotedPathContainer(), "data")->multitoken()->composing());
-        addOption("content", boost::program_options::value<std::vector<std::string>>()->default_value(std::vector<std::string>(), "")
-            ->multitoken()->composing(), "content file(s): esm/esp, or omwgame/omwaddon");
-        addOption("data-local", boost::program_options::value<Files::MaybeQuotedPathContainer::value_type>()->default_value(Files::MaybeQuotedPathContainer::value_type(), ""));
+        addOption("data",
+            boost::program_options::value<Files::MaybeQuotedPathContainer>()
+                ->default_value(Files::MaybeQuotedPathContainer(), "data")
+                ->multitoken()
+                ->composing());
+        addOption("content",
+            boost::program_options::value<std::vector<std::string>>()
+                ->default_value(std::vector<std::string>(), "")
+                ->multitoken()
+                ->composing(),
+            "content file(s): esm/esp, or omwgame/omwaddon");
+        addOption("data-local",
+            boost::program_options::value<Files::MaybeQuotedPathContainer::value_type>()->default_value(
+                Files::MaybeQuotedPathContainer::value_type(), ""));
         Files::ConfigurationManager::addCommonOptions(desc);
 
         mConfigurationManager.readConfiguration(variables, desc, true);
 
         Files::PathContainer dataDirs, dataLocal;
-        if (!variables["data"].empty()) {
+        if (!variables["data"].empty())
+        {
             dataDirs = asPathContainer(variables["data"].as<Files::MaybeQuotedPathContainer>());
         }
 
-        Files::PathContainer::value_type local(variables["data-local"].as<Files::MaybeQuotedPathContainer::value_type>().u8string());
+        Files::PathContainer::value_type local(
+            variables["data-local"].as<Files::MaybeQuotedPathContainer::value_type>().u8string());
         if (!local.empty())
             dataLocal.push_back(local);
 
@@ -83,12 +96,12 @@ struct ContentFileTest : public ::testing::Test
         mConfigurationManager.filterOutNonExistingPaths(dataLocal);
 
         if (!dataLocal.empty())
-            dataDirs.insert (dataDirs.end(), dataLocal.begin(), dataLocal.end());
+            dataDirs.insert(dataDirs.end(), dataLocal.begin(), dataLocal.end());
 
-        Files::Collections collections (dataDirs, true);
+        Files::Collections collections(dataDirs, true);
 
         std::vector<std::string> contentFiles = variables["content"].as<std::vector<std::string>>();
-        for (auto & contentFile : contentFiles)
+        for (auto& contentFile : contentFiles)
         {
             if (!Misc::StringUtils::ciEndsWith(contentFile, ".omwscripts"))
                 mContentFiles.push_back(collections.getPath(contentFile));
@@ -114,55 +127,56 @@ TEST_F(ContentFileTest, dialogue_merging_test)
     std::ofstream stream(file);
 
     const MWWorld::Store<ESM::Dialogue>& dialStore = mEsmStore.get<ESM::Dialogue>();
-    for (const auto & dial : dialStore)
+    for (const auto& dial : dialStore)
     {
         stream << "Dialogue: " << dial.mId << std::endl;
 
-        for (const auto & info : dial.mInfo)
+        for (const auto& info : dial.mInfo)
         {
             stream << info.mId << std::endl;
         }
         stream << std::endl;
     }
 
-    std::cout << "dialogue_merging_test successful, results printed to " << Files::pathToUnicodeString(file) << std::endl;
+    std::cout << "dialogue_merging_test successful, results printed to " << Files::pathToUnicodeString(file)
+              << std::endl;
 }
 
 // Note: here we don't test records that don't use string names (e.g. Land, Pathgrid, Cell)
-#define RUN_TEST_FOR_TYPES(func, arg1, arg2) \
-    func<ESM::Activator>(arg1, arg2); \
-    func<ESM::Apparatus>(arg1, arg2); \
-    func<ESM::Armor>(arg1, arg2); \
-    func<ESM::BirthSign>(arg1, arg2); \
-    func<ESM::BodyPart>(arg1, arg2); \
-    func<ESM::Book>(arg1, arg2); \
-    func<ESM::Class>(arg1, arg2); \
-    func<ESM::Clothing>(arg1, arg2); \
-    func<ESM::Container>(arg1, arg2); \
-    func<ESM::Creature>(arg1, arg2); \
-    func<ESM::CreatureLevList>(arg1, arg2); \
-    func<ESM::Dialogue>(arg1, arg2); \
-    func<ESM::Door>(arg1, arg2); \
-    func<ESM::Enchantment>(arg1, arg2); \
-    func<ESM::Faction>(arg1, arg2); \
-    func<ESM::GameSetting>(arg1, arg2); \
-    func<ESM::Global>(arg1, arg2); \
-    func<ESM::Ingredient>(arg1, arg2); \
-    func<ESM::ItemLevList>(arg1, arg2); \
-    func<ESM::Light>(arg1, arg2); \
-    func<ESM::Lockpick>(arg1, arg2); \
-    func<ESM::Miscellaneous>(arg1, arg2); \
-    func<ESM::NPC>(arg1, arg2); \
-    func<ESM::Potion>(arg1, arg2); \
-    func<ESM::Probe>(arg1, arg2); \
-    func<ESM::Race>(arg1, arg2); \
-    func<ESM::Region>(arg1, arg2); \
-    func<ESM::Repair>(arg1, arg2); \
-    func<ESM::Script>(arg1, arg2); \
-    func<ESM::Sound>(arg1, arg2); \
-    func<ESM::SoundGenerator>(arg1, arg2); \
-    func<ESM::Spell>(arg1, arg2); \
-    func<ESM::StartScript>(arg1, arg2); \
+#define RUN_TEST_FOR_TYPES(func, arg1, arg2)                                                                           \
+    func<ESM::Activator>(arg1, arg2);                                                                                  \
+    func<ESM::Apparatus>(arg1, arg2);                                                                                  \
+    func<ESM::Armor>(arg1, arg2);                                                                                      \
+    func<ESM::BirthSign>(arg1, arg2);                                                                                  \
+    func<ESM::BodyPart>(arg1, arg2);                                                                                   \
+    func<ESM::Book>(arg1, arg2);                                                                                       \
+    func<ESM::Class>(arg1, arg2);                                                                                      \
+    func<ESM::Clothing>(arg1, arg2);                                                                                   \
+    func<ESM::Container>(arg1, arg2);                                                                                  \
+    func<ESM::Creature>(arg1, arg2);                                                                                   \
+    func<ESM::CreatureLevList>(arg1, arg2);                                                                            \
+    func<ESM::Dialogue>(arg1, arg2);                                                                                   \
+    func<ESM::Door>(arg1, arg2);                                                                                       \
+    func<ESM::Enchantment>(arg1, arg2);                                                                                \
+    func<ESM::Faction>(arg1, arg2);                                                                                    \
+    func<ESM::GameSetting>(arg1, arg2);                                                                                \
+    func<ESM::Global>(arg1, arg2);                                                                                     \
+    func<ESM::Ingredient>(arg1, arg2);                                                                                 \
+    func<ESM::ItemLevList>(arg1, arg2);                                                                                \
+    func<ESM::Light>(arg1, arg2);                                                                                      \
+    func<ESM::Lockpick>(arg1, arg2);                                                                                   \
+    func<ESM::Miscellaneous>(arg1, arg2);                                                                              \
+    func<ESM::NPC>(arg1, arg2);                                                                                        \
+    func<ESM::Potion>(arg1, arg2);                                                                                     \
+    func<ESM::Probe>(arg1, arg2);                                                                                      \
+    func<ESM::Race>(arg1, arg2);                                                                                       \
+    func<ESM::Region>(arg1, arg2);                                                                                     \
+    func<ESM::Repair>(arg1, arg2);                                                                                     \
+    func<ESM::Script>(arg1, arg2);                                                                                     \
+    func<ESM::Sound>(arg1, arg2);                                                                                      \
+    func<ESM::SoundGenerator>(arg1, arg2);                                                                             \
+    func<ESM::Spell>(arg1, arg2);                                                                                      \
+    func<ESM::StartScript>(arg1, arg2);                                                                                \
     func<ESM::Weapon>(arg1, arg2);
 
 template <typename T>
@@ -199,7 +213,8 @@ TEST_F(ContentFileTest, content_diagnostics_test)
 }
 
 // TODO:
-/// Print results of autocalculated NPC spell lists. Also serves as test for attribute/skill autocalculation which the spell autocalculation heavily relies on
+/// Print results of autocalculated NPC spell lists. Also serves as test for attribute/skill autocalculation which the
+/// spell autocalculation heavily relies on
 /// - even incorrect rounding modes can completely change the resulting spell lists.
 /*
 TEST_F(ContentFileTest, autocalc_test)
@@ -221,7 +236,6 @@ protected:
     MWWorld::ESMStore mEsmStore;
 };
 
-
 /// Create an ESM file in-memory containing the specified record.
 /// @param deleted Write record with deleted flag?
 template <typename T>
@@ -257,14 +271,14 @@ TEST_F(StoreTest, delete_test)
     mEsmStore.load(reader, &dummyListener, dialogue);
     mEsmStore.setUp();
 
-    ASSERT_TRUE (mEsmStore.get<RecordType>().getSize() == 1);
+    ASSERT_TRUE(mEsmStore.get<RecordType>().getSize() == 1);
 
     // now a plugin deletes it
     reader.open(getEsmFile(record, true), "filename");
     mEsmStore.load(reader, &dummyListener, dialogue);
     mEsmStore.setUp();
 
-    ASSERT_TRUE (mEsmStore.get<RecordType>().getSize() == 0);
+    ASSERT_TRUE(mEsmStore.get<RecordType>().getSize() == 0);
 
     // now another plugin inserts it again
     // expected behaviour is the record to reappear rather than staying deleted
@@ -272,7 +286,7 @@ TEST_F(StoreTest, delete_test)
     mEsmStore.load(reader, &dummyListener, dialogue);
     mEsmStore.setUp();
 
-    ASSERT_TRUE (mEsmStore.get<RecordType>().getSize() == 1);
+    ASSERT_TRUE(mEsmStore.get<RecordType>().getSize() == 1);
 }
 
 /// Tests overwriting of records.
@@ -305,7 +319,7 @@ TEST_F(StoreTest, overwrite_test)
     // verify that changes were actually applied
     const RecordType* overwrittenRec = mEsmStore.get<RecordType>().search(recordId);
 
-    ASSERT_TRUE (overwrittenRec != nullptr);
+    ASSERT_TRUE(overwrittenRec != nullptr);
 
-    ASSERT_TRUE (overwrittenRec && overwrittenRec->mModel == "the_new_model");
+    ASSERT_TRUE(overwrittenRec && overwrittenRec->mModel == "the_new_model");
 }
diff --git a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
index b2570f7704..1ad51573ea 100644
--- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
+++ b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
@@ -1,15 +1,15 @@
-#include <components/nifbullet/bulletnifloader.hpp>
 #include <components/bullethelpers/processtrianglecallback.hpp>
 #include <components/nif/data.hpp>
 #include <components/nif/extra.hpp>
 #include <components/nif/node.hpp>
+#include <components/nifbullet/bulletnifloader.hpp>
 
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
 #include <BulletCollision/CollisionShapes/btTriangleMesh.h>
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 #include <algorithm>
 #include <type_traits>
@@ -25,7 +25,7 @@ namespace
     std::vector<btVector3> getTriangles(const btBvhTriangleMeshShape& shape)
     {
         std::vector<btVector3> result;
-        auto callback = BulletHelpers::makeProcessTriangleCallback([&] (btVector3* triangle, int, int) {
+        auto callback = BulletHelpers::makeProcessTriangleCallback([&](btVector3* triangle, int, int) {
             for (std::size_t i = 0; i < 3; ++i)
                 result.push_back(triangle[i]);
         });
@@ -43,12 +43,8 @@ namespace
 
     bool isNear(const btVector3& lhs, const btVector3& rhs)
     {
-        return std::equal(
-            static_cast<const btScalar*>(lhs),
-            static_cast<const btScalar*>(lhs) + 3,
-            static_cast<const btScalar*>(rhs),
-            [] (btScalar lhs, btScalar rhs) { return isNear(lhs, rhs); }
-        );
+        return std::equal(static_cast<const btScalar*>(lhs), static_cast<const btScalar*>(lhs) + 3,
+            static_cast<const btScalar*>(rhs), [](btScalar lhs, btScalar rhs) { return isNear(lhs, rhs); });
     }
 
     bool isNear(const btMatrix3x3& lhs, const btMatrix3x3& rhs)
@@ -68,40 +64,39 @@ namespace
     {
         osg::Vec3f mValue;
 
-        friend std::ostream& operator <<(std::ostream& stream, const WriteVec3f& value)
+        friend std::ostream& operator<<(std::ostream& stream, const WriteVec3f& value)
         {
-            return stream << "osg::Vec3f {"
-                << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.mValue.x() << ", "
-                << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.mValue.y() << ", "
-                << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.mValue.z() << "}";
+            return stream << "osg::Vec3f {" << std::setprecision(std::numeric_limits<float>::max_exponent10)
+                          << value.mValue.x() << ", " << std::setprecision(std::numeric_limits<float>::max_exponent10)
+                          << value.mValue.y() << ", " << std::setprecision(std::numeric_limits<float>::max_exponent10)
+                          << value.mValue.z() << "}";
         }
     };
 }
 
-static std::ostream& operator <<(std::ostream& stream, const btVector3& value)
+static std::ostream& operator<<(std::ostream& stream, const btVector3& value)
 {
-    return stream << "btVector3 {"
-        << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.getX() << ", "
-        << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.getY() << ", "
-        << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.getZ() << "}";
+    return stream << "btVector3 {" << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.getX()
+                  << ", " << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.getY() << ", "
+                  << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.getZ() << "}";
 }
 
-static std::ostream& operator <<(std::ostream& stream, const btMatrix3x3& value)
+static std::ostream& operator<<(std::ostream& stream, const btMatrix3x3& value)
 {
     stream << "btMatrix3x3 {";
     for (int i = 0; i < 3; ++i)
-         stream << value.getRow(i) << ", ";
+        stream << value.getRow(i) << ", ";
     return stream << "}";
 }
 
-static std::ostream& operator <<(std::ostream& stream, const btTransform& value)
+static std::ostream& operator<<(std::ostream& stream, const btTransform& value)
 {
     return stream << "btTransform {" << value.getBasis() << ", " << value.getOrigin() << "}";
 }
 
-static std::ostream& operator <<(std::ostream& stream, const btCollisionShape* value);
+static std::ostream& operator<<(std::ostream& stream, const btCollisionShape* value);
 
-static std::ostream& operator <<(std::ostream& stream, const btCompoundShape& value)
+static std::ostream& operator<<(std::ostream& stream, const btCompoundShape& value)
 {
     stream << "btCompoundShape {" << value.getLocalScaling() << ", ";
     stream << "{";
@@ -115,7 +110,7 @@ static std::ostream& operator <<(std::ostream& stream, const btCompoundShape& va
     return stream << "}";
 }
 
-static std::ostream& operator <<(std::ostream& stream, const btBoxShape& value)
+static std::ostream& operator<<(std::ostream& stream, const btBoxShape& value)
 {
     return stream << "btBoxShape {" << value.getLocalScaling() << ", " << value.getHalfExtentsWithoutMargin() << "}";
 }
@@ -123,35 +118,35 @@ static std::ostream& operator <<(std::ostream& stream, const btBoxShape& value)
 namespace Resource
 {
 
-static std::ostream& operator <<(std::ostream& stream, const TriangleMeshShape& value)
-{
-    stream << "Resource::TriangleMeshShape {" << value.getLocalScaling() << ", "
-        << value.usesQuantizedAabbCompression() << ", " << value.getOwnsBvh() << ", {";
-    auto callback = BulletHelpers::makeProcessTriangleCallback([&] (btVector3* triangle, int, int) {
-        for (std::size_t i = 0; i < 3; ++i)
-            stream << triangle[i] << ", ";
-    });
-    btVector3 aabbMin;
-    btVector3 aabbMax;
-    value.getAabb(btTransform::getIdentity(), aabbMin, aabbMax);
-    value.processAllTriangles(&callback, aabbMin, aabbMax);
-    return stream << "}}";
-}
+    static std::ostream& operator<<(std::ostream& stream, const TriangleMeshShape& value)
+    {
+        stream << "Resource::TriangleMeshShape {" << value.getLocalScaling() << ", "
+               << value.usesQuantizedAabbCompression() << ", " << value.getOwnsBvh() << ", {";
+        auto callback = BulletHelpers::makeProcessTriangleCallback([&](btVector3* triangle, int, int) {
+            for (std::size_t i = 0; i < 3; ++i)
+                stream << triangle[i] << ", ";
+        });
+        btVector3 aabbMin;
+        btVector3 aabbMax;
+        value.getAabb(btTransform::getIdentity(), aabbMin, aabbMax);
+        value.processAllTriangles(&callback, aabbMin, aabbMax);
+        return stream << "}}";
+    }
 
-static bool operator ==(const CollisionBox& l, const CollisionBox& r)
-{
-    const auto tie = [] (const CollisionBox& v) { return std::tie(v.mExtents, v.mCenter); };
-    return tie(l) == tie(r);
-}
+    static bool operator==(const CollisionBox& l, const CollisionBox& r)
+    {
+        const auto tie = [](const CollisionBox& v) { return std::tie(v.mExtents, v.mCenter); };
+        return tie(l) == tie(r);
+    }
 
-static std::ostream& operator <<(std::ostream& stream, const CollisionBox& value)
-{
-    return stream << "CollisionBox {" << WriteVec3f {value.mExtents} << ", " << WriteVec3f {value.mCenter} << "}";
-}
+    static std::ostream& operator<<(std::ostream& stream, const CollisionBox& value)
+    {
+        return stream << "CollisionBox {" << WriteVec3f{ value.mExtents } << ", " << WriteVec3f{ value.mCenter } << "}";
+    }
 
 }
 
-static std::ostream& operator <<(std::ostream& stream, const btCollisionShape& value)
+static std::ostream& operator<<(std::ostream& stream, const btCollisionShape& value)
 {
     switch (value.getShapeType())
     {
@@ -167,14 +162,14 @@ static std::ostream& operator <<(std::ostream& stream, const btCollisionShape& v
     return stream << "btCollisionShape {" << value.getShapeType() << "}";
 }
 
-static std::ostream& operator <<(std::ostream& stream, const btCollisionShape* value)
+static std::ostream& operator<<(std::ostream& stream, const btCollisionShape* value)
 {
     return value ? stream << "&" << *value : stream << "nullptr";
 }
 
 namespace std
 {
-    static std::ostream& operator <<(std::ostream& stream, const map<int, int>& value)
+    static std::ostream& operator<<(std::ostream& stream, const map<int, int>& value)
     {
         stream << "std::map<int, int> {";
         for (const auto& v : value)
@@ -185,16 +180,15 @@ namespace std
 
 namespace Resource
 {
-    static bool operator ==(const Resource::BulletShape& lhs, const Resource::BulletShape& rhs)
+    static bool operator==(const Resource::BulletShape& lhs, const Resource::BulletShape& rhs)
     {
         return compareObjects(lhs.mCollisionShape.get(), rhs.mCollisionShape.get())
             && compareObjects(lhs.mAvoidCollisionShape.get(), rhs.mAvoidCollisionShape.get())
-            && lhs.mCollisionBox == rhs.mCollisionBox
-            && lhs.mVisualCollisionType == rhs.mVisualCollisionType
+            && lhs.mCollisionBox == rhs.mCollisionBox && lhs.mVisualCollisionType == rhs.mVisualCollisionType
             && lhs.mAnimatedShapes == rhs.mAnimatedShapes;
     }
 
-    static std::ostream& operator <<(std::ostream& stream, Resource::VisualCollisionType value)
+    static std::ostream& operator<<(std::ostream& stream, Resource::VisualCollisionType value)
     {
         switch (value)
         {
@@ -208,48 +202,43 @@ namespace Resource
         return stream << static_cast<std::underlying_type_t<Resource::VisualCollisionType>>(value);
     }
 
-    static std::ostream& operator <<(std::ostream& stream, const Resource::BulletShape& value)
+    static std::ostream& operator<<(std::ostream& stream, const Resource::BulletShape& value)
     {
-        return stream << "Resource::BulletShape {"
-            << value.mCollisionShape.get() << ", "
-            << value.mAvoidCollisionShape.get() << ", "
-            << value.mCollisionBox << ", "
-            << value.mAnimatedShapes<< ", "
-            << value.mVisualCollisionType
-            << "}";
+        return stream << "Resource::BulletShape {" << value.mCollisionShape.get() << ", "
+                      << value.mAvoidCollisionShape.get() << ", " << value.mCollisionBox << ", "
+                      << value.mAnimatedShapes << ", " << value.mVisualCollisionType << "}";
     }
 }
 
-static bool operator ==(const btCollisionShape& lhs, const btCollisionShape& rhs);
+static bool operator==(const btCollisionShape& lhs, const btCollisionShape& rhs);
 
-static bool operator ==(const btCompoundShape& lhs, const btCompoundShape& rhs)
+static bool operator==(const btCompoundShape& lhs, const btCompoundShape& rhs)
 {
     if (lhs.getNumChildShapes() != rhs.getNumChildShapes() || lhs.getLocalScaling() != rhs.getLocalScaling())
         return false;
     for (int i = 0; i < lhs.getNumChildShapes(); ++i)
     {
         if (!compareObjects(lhs.getChildShape(i), rhs.getChildShape(i))
-                || !isNear(lhs.getChildTransform(i), rhs.getChildTransform(i)))
+            || !isNear(lhs.getChildTransform(i), rhs.getChildTransform(i)))
             return false;
     }
     return true;
 }
 
-static bool operator ==(const btBoxShape& lhs, const btBoxShape& rhs)
+static bool operator==(const btBoxShape& lhs, const btBoxShape& rhs)
 {
     return isNear(lhs.getLocalScaling(), rhs.getLocalScaling())
         && lhs.getHalfExtentsWithoutMargin() == rhs.getHalfExtentsWithoutMargin();
 }
 
-static bool operator ==(const btBvhTriangleMeshShape& lhs, const btBvhTriangleMeshShape& rhs)
+static bool operator==(const btBvhTriangleMeshShape& lhs, const btBvhTriangleMeshShape& rhs)
 {
     return isNear(lhs.getLocalScaling(), rhs.getLocalScaling())
         && lhs.usesQuantizedAabbCompression() == rhs.usesQuantizedAabbCompression()
-        && lhs.getOwnsBvh() == rhs.getOwnsBvh()
-        && getTriangles(lhs) == getTriangles(rhs);
+        && lhs.getOwnsBvh() == rhs.getOwnsBvh() && getTriangles(lhs) == getTriangles(rhs);
 }
 
-static bool operator ==(const btCollisionShape& lhs, const btCollisionShape& rhs)
+static bool operator==(const btCollisionShape& lhs, const btCollisionShape& rhs)
 {
     if (lhs.getShapeType() != rhs.getShapeType())
         return false;
@@ -362,7 +351,7 @@ namespace
 
     struct RecordMock : Nif::Record
     {
-        MOCK_METHOD(void, read, (Nif::NIFStream *nif), (override));
+        MOCK_METHOD(void, read, (Nif::NIFStream * nif), (override));
     };
 
     struct TestBulletNifLoader : Test
@@ -384,23 +373,13 @@ namespace
         Nif::NiStringExtraData mNiStringExtraData;
         Nif::NiStringExtraData mNiStringExtraData2;
         Nif::Controller mController;
-        btTransform mTransform {btMatrix3x3(btQuaternion(btVector3(1, 0, 0), 0.5f)), btVector3(1, 2, 3)};
-        btTransform mResultTransform {
-            btMatrix3x3(
-                1, 0, 0,
-                0, 0.82417738437652587890625, 0.56633174419403076171875,
-                0, -0.56633174419403076171875, 0.82417738437652587890625
-            ),
-            btVector3(1, 2, 3)
-        };
-        btTransform mResultTransform2 {
-            btMatrix3x3(
-                1, 0, 0,
-                0, 0.7951543331146240234375, 0.606407105922698974609375,
-                0, -0.606407105922698974609375, 0.7951543331146240234375
-            ),
-            btVector3(4, 8, 12)
-        };
+        btTransform mTransform{ btMatrix3x3(btQuaternion(btVector3(1, 0, 0), 0.5f)), btVector3(1, 2, 3) };
+        btTransform mResultTransform{ btMatrix3x3(1, 0, 0, 0, 0.82417738437652587890625, 0.56633174419403076171875, 0,
+                                          -0.56633174419403076171875, 0.82417738437652587890625),
+            btVector3(1, 2, 3) };
+        btTransform mResultTransform2{ btMatrix3x3(1, 0, 0, 0, 0.7951543331146240234375, 0.606407105922698974609375, 0,
+                                           -0.606407105922698974609375, 0.7951543331146240234375),
+            btVector3(4, 8, 12) };
         const std::string mHash = "hash";
 
         TestBulletNifLoader()
@@ -419,18 +398,19 @@ namespace
             init(mController);
 
             mNiTriShapeData.recType = Nif::RC_NiTriShapeData;
-            mNiTriShapeData.vertices = {osg::Vec3f(0, 0, 0), osg::Vec3f(1, 0, 0), osg::Vec3f(1, 1, 0)};
-            mNiTriShapeData.triangles = {0, 1, 2};
+            mNiTriShapeData.vertices = { osg::Vec3f(0, 0, 0), osg::Vec3f(1, 0, 0), osg::Vec3f(1, 1, 0) };
+            mNiTriShapeData.triangles = { 0, 1, 2 };
             mNiTriShape.data = Nif::NiGeometryDataPtr(&mNiTriShapeData);
 
             mNiTriShapeData2.recType = Nif::RC_NiTriShapeData;
-            mNiTriShapeData2.vertices = {osg::Vec3f(0, 0, 1), osg::Vec3f(1, 0, 1), osg::Vec3f(1, 1, 1)};
-            mNiTriShapeData2.triangles = {0, 1, 2};
+            mNiTriShapeData2.vertices = { osg::Vec3f(0, 0, 1), osg::Vec3f(1, 0, 1), osg::Vec3f(1, 1, 1) };
+            mNiTriShapeData2.triangles = { 0, 1, 2 };
             mNiTriShape2.data = Nif::NiGeometryDataPtr(&mNiTriShapeData2);
 
             mNiTriStripsData.recType = Nif::RC_NiTriStripsData;
-            mNiTriStripsData.vertices = {osg::Vec3f(0, 0, 0), osg::Vec3f(1, 0, 0), osg::Vec3f(1, 1, 0), osg::Vec3f(0, 1, 0)};
-            mNiTriStripsData.strips = {{0, 1, 2, 3}};
+            mNiTriStripsData.vertices
+                = { osg::Vec3f(0, 0, 0), osg::Vec3f(1, 0, 0), osg::Vec3f(1, 1, 0), osg::Vec3f(0, 1, 0) };
+            mNiTriStripsData.strips = { { 0, 1, 2, 3 } };
             mNiTriStrips.data = Nif::NiGeometryDataPtr(&mNiTriStripsData);
 
             EXPECT_CALL(mNifFile, getHash()).WillOnce(Return(mHash));
@@ -500,7 +480,8 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, for_root_nif_node_with_bounding_box_should_return_shape_with_compound_shape_and_box_inside)
+    TEST_F(
+        TestBulletNifLoader, for_root_nif_node_with_bounding_box_should_return_shape_with_compound_shape_and_box_inside)
     {
         mNode.hasBounds = true;
         mNode.flags |= Nif::Node::Flag_BBoxCollision;
@@ -532,7 +513,7 @@ namespace
         mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
         mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
         mNode.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNode)}));
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNode) }));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
@@ -550,7 +531,8 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, for_root_and_child_nif_node_with_bounding_box_but_root_without_flag_should_use_child_bounds)
+    TEST_F(TestBulletNifLoader,
+        for_root_and_child_nif_node_with_bounding_box_but_root_without_flag_should_use_child_bounds)
     {
         mNode.hasBounds = true;
         mNode.flags |= Nif::Node::Flag_BBoxCollision;
@@ -563,7 +545,7 @@ namespace
         mNiNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
         mNiNode.bounds.box.extents = osg::Vec3f(4, 5, 6);
         mNiNode.bounds.box.center = osg::Vec3f(-4, -5, -6);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNode)}));
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNode) }));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
@@ -581,7 +563,8 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, for_root_and_two_children_where_both_with_bounds_but_only_first_with_flag_should_use_first_bounds)
+    TEST_F(TestBulletNifLoader,
+        for_root_and_two_children_where_both_with_bounds_but_only_first_with_flag_should_use_first_bounds)
     {
         mNode.hasBounds = true;
         mNode.flags |= Nif::Node::Flag_BBoxCollision;
@@ -600,7 +583,7 @@ namespace
         mNiNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
         mNiNode.bounds.box.extents = osg::Vec3f(7, 8, 9);
         mNiNode.bounds.box.center = osg::Vec3f(-7, -8, -9);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNode), Nif::NodePtr(&mNode2)}));
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNode), Nif::NodePtr(&mNode2) }));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
@@ -618,7 +601,8 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, for_root_and_two_children_where_both_with_bounds_but_only_second_with_flag_should_use_second_bounds)
+    TEST_F(TestBulletNifLoader,
+        for_root_and_two_children_where_both_with_bounds_but_only_second_with_flag_should_use_second_bounds)
     {
         mNode.hasBounds = true;
         mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
@@ -637,7 +621,7 @@ namespace
         mNiNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
         mNiNode.bounds.box.extents = osg::Vec3f(7, 8, 9);
         mNiNode.bounds.box.center = osg::Vec3f(-7, -8, -9);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNode), Nif::NodePtr(&mNode2)}));
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNode), Nif::NodePtr(&mNode2) }));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
@@ -655,7 +639,8 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, for_root_nif_node_with_bounds_but_without_flag_should_return_shape_with_bounds_but_with_null_collision_shape)
+    TEST_F(TestBulletNifLoader,
+        for_root_nif_node_with_bounds_but_without_flag_should_return_shape_with_bounds_but_with_null_collision_shape)
     {
         mNode.hasBounds = true;
         mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
@@ -689,7 +674,8 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, for_tri_shape_root_node_with_bounds_should_return_shape_with_bounds_but_with_null_collision_shape)
+    TEST_F(TestBulletNifLoader,
+        for_tri_shape_root_node_with_bounds_should_return_shape_with_bounds_but_with_null_collision_shape)
     {
         mNiTriShape.hasBounds = true;
         mNiTriShape.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
@@ -711,7 +697,7 @@ namespace
     TEST_F(TestBulletNifLoader, for_tri_shape_child_node_should_return_shape_with_triangle_mesh_shape)
     {
         mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
@@ -728,9 +714,9 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_nested_tri_shape_child_should_return_shape_with_triangle_mesh_shape)
     {
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiNode2)}));
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiNode2) }));
         mNiNode2.parents.push_back(&mNiNode);
-        mNiNode2.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiNode2.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
         mNiTriShape.parents.push_back(&mNiNode2);
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -750,10 +736,8 @@ namespace
     {
         mNiTriShape.parents.push_back(&mNiNode);
         mNiTriShape2.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({
-            Nif::NodePtr(&mNiTriShape),
-            Nif::NodePtr(&mNiTriShape2)
-        }));
+        mNiNode.children
+            = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape), Nif::NodePtr(&mNiTriShape2) }));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
@@ -769,11 +753,12 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, for_tri_shape_child_node_and_filename_starting_with_x_and_not_empty_skin_should_return_shape_with_triangle_mesh_shape)
+    TEST_F(TestBulletNifLoader,
+        for_tri_shape_child_node_and_filename_starting_with_x_and_not_empty_skin_should_return_shape_with_triangle_mesh_shape)
     {
         mNiTriShape.skin = Nif::NiSkinInstancePtr(&mNiSkinInstance);
         mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
@@ -788,7 +773,8 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, for_tri_shape_root_node_and_filename_starting_with_x_should_return_shape_with_compound_shape)
+    TEST_F(TestBulletNifLoader,
+        for_tri_shape_root_node_and_filename_starting_with_x_should_return_shape_with_compound_shape)
     {
         copy(mTransform, mNiTriShape.trafo);
         mNiTriShape.trafo.scale = 3;
@@ -806,17 +792,18 @@ namespace
         shape->addChildShape(mResultTransform, mesh.release());
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(shape.release());
-        expected.mAnimatedShapes = {{-1, 0}};
+        expected.mAnimatedShapes = { { -1, 0 } };
 
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, for_tri_shape_child_node_and_filename_starting_with_x_should_return_shape_with_compound_shape)
+    TEST_F(TestBulletNifLoader,
+        for_tri_shape_child_node_and_filename_starting_with_x_should_return_shape_with_compound_shape)
     {
         copy(mTransform, mNiTriShape.trafo);
         mNiTriShape.trafo.scale = 3;
         mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
         mNiNode.trafo.scale = 4;
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -832,12 +819,13 @@ namespace
         shape->addChildShape(mResultTransform2, mesh.release());
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(shape.release());
-        expected.mAnimatedShapes = {{-1, 0}};
+        expected.mAnimatedShapes = { { -1, 0 } };
 
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, for_two_tri_shape_children_nodes_and_filename_starting_with_x_should_return_shape_with_compound_shape)
+    TEST_F(TestBulletNifLoader,
+        for_two_tri_shape_children_nodes_and_filename_starting_with_x_should_return_shape_with_compound_shape)
     {
         copy(mTransform, mNiTriShape.trafo);
         mNiTriShape.trafo.scale = 3;
@@ -872,7 +860,7 @@ namespace
         shape->addChildShape(mResultTransform, mesh2.release());
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(shape.release());
-        expected.mAnimatedShapes = {{-1, 0}};
+        expected.mAnimatedShapes = { { -1, 0 } };
 
         EXPECT_EQ(*result, expected);
     }
@@ -885,7 +873,7 @@ namespace
         mNiTriShape.trafo.scale = 3;
         mNiTriShape.parents.push_back(&mNiNode);
         mNiTriShape.controller = Nif::ControllerPtr(&mController);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
         mNiNode.trafo.scale = 4;
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -901,12 +889,13 @@ namespace
         shape->addChildShape(mResultTransform2, mesh.release());
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(shape.release());
-        expected.mAnimatedShapes = {{-1, 0}};
+        expected.mAnimatedShapes = { { -1, 0 } };
 
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, for_two_tri_shape_children_nodes_where_one_with_controller_should_return_shape_with_compound_shape)
+    TEST_F(TestBulletNifLoader,
+        for_two_tri_shape_children_nodes_where_one_with_controller_should_return_shape_with_compound_shape)
     {
         mController.recType = Nif::RC_NiKeyframeController;
         mController.flags |= Nif::Controller::Flag_Active;
@@ -929,7 +918,8 @@ namespace
         const auto result = mLoader.load(mNifFile);
 
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
-        triangles->addTriangle(btVector3(4, 8, 12), btVector3(16, 8, 12), btVector3(16, 18.5309906005859375, 6.246893405914306640625));
+        triangles->addTriangle(
+            btVector3(4, 8, 12), btVector3(16, 8, 12), btVector3(16, 18.5309906005859375, 6.246893405914306640625));
         std::unique_ptr<Resource::TriangleMeshShape> mesh(new Resource::TriangleMeshShape(triangles.release(), true));
         mesh->setLocalScaling(btVector3(1, 1, 1));
 
@@ -943,7 +933,7 @@ namespace
         shape->addChildShape(btTransform::getIdentity(), mesh.release());
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(shape.release());
-        expected.mAnimatedShapes = {{-1, 0}};
+        expected.mAnimatedShapes = { { -1, 0 } };
 
         EXPECT_EQ(*result, expected);
     }
@@ -951,7 +941,7 @@ namespace
     TEST_F(TestBulletNifLoader, should_add_static_mesh_to_existing_compound_mesh)
     {
         mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(2));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
@@ -967,19 +957,21 @@ namespace
 
         std::unique_ptr<btCompoundShape> compound(new btCompoundShape);
         compound->addChildShape(btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles.release(), true));
-        compound->addChildShape(btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles2.release(), true));
+        compound->addChildShape(
+            btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles2.release(), true));
 
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(compound.release());
-        expected.mAnimatedShapes = {{-1, 0}};
+        expected.mAnimatedShapes = { { -1, 0 } };
 
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, for_root_avoid_node_and_tri_shape_child_node_should_return_shape_with_null_collision_shape)
+    TEST_F(
+        TestBulletNifLoader, for_root_avoid_node_and_tri_shape_child_node_should_return_shape_with_null_collision_shape)
     {
         mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
         mNiNode.recType = Nif::RC_AvoidNode;
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -999,7 +991,7 @@ namespace
     {
         mNiTriShape.data = Nif::NiGeometryDataPtr(nullptr);
         mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
@@ -1011,12 +1003,13 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_empty_data_triangles_should_return_shape_with_null_collision_shape)
+    TEST_F(TestBulletNifLoader,
+        for_tri_shape_child_node_with_empty_data_triangles_should_return_shape_with_null_collision_shape)
     {
         auto data = static_cast<Nif::NiTriShapeData*>(mNiTriShape.data.getPtr());
         data->triangles.clear();
         mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
@@ -1028,13 +1021,14 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_extra_data_string_equal_ncc_should_return_shape_with_cameraonly_collision)
+    TEST_F(TestBulletNifLoader,
+        for_tri_shape_child_node_with_extra_data_string_equal_ncc_should_return_shape_with_cameraonly_collision)
     {
         mNiStringExtraData.string = "NCC__";
         mNiStringExtraData.recType = Nif::RC_NiStringExtraData;
         mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
         mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
@@ -1050,14 +1044,15 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_not_first_extra_data_string_equal_ncc_should_return_shape_with_cameraonly_collision)
+    TEST_F(TestBulletNifLoader,
+        for_tri_shape_child_node_with_not_first_extra_data_string_equal_ncc_should_return_shape_with_cameraonly_collision)
     {
         mNiStringExtraData.next = Nif::ExtraPtr(&mNiStringExtraData2);
         mNiStringExtraData2.string = "NCC__";
         mNiStringExtraData2.recType = Nif::RC_NiStringExtraData;
         mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
         mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
@@ -1073,13 +1068,14 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_extra_data_string_starting_with_nc_should_return_shape_with_nocollision)
+    TEST_F(TestBulletNifLoader,
+        for_tri_shape_child_node_with_extra_data_string_starting_with_nc_should_return_shape_with_nocollision)
     {
         mNiStringExtraData.string = "NC___";
         mNiStringExtraData.recType = Nif::RC_NiStringExtraData;
         mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
         mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
@@ -1095,14 +1091,15 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_not_first_extra_data_string_starting_with_nc_should_return_shape_with_nocollision)
+    TEST_F(TestBulletNifLoader,
+        for_tri_shape_child_node_with_not_first_extra_data_string_starting_with_nc_should_return_shape_with_nocollision)
     {
         mNiStringExtraData.next = Nif::ExtraPtr(&mNiStringExtraData2);
         mNiStringExtraData2.string = "NC___";
         mNiStringExtraData2.recType = Nif::RC_NiStringExtraData;
         mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
         mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
@@ -1131,8 +1128,8 @@ namespace
         emptyCollisionNode.recType = Nif::RC_RootCollisionNode;
         emptyCollisionNode.parents.push_back(&mNiNode);
 
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>(
-            {Nif::NodePtr(&niTriShape), Nif::NodePtr(&emptyCollisionNode)}));
+        mNiNode.children = Nif::NodeList(
+            std::vector<Nif::NodePtr>({ Nif::NodePtr(&niTriShape), Nif::NodePtr(&emptyCollisionNode) }));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
@@ -1148,13 +1145,14 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_extra_data_string_mrk_should_return_shape_with_null_collision_shape)
+    TEST_F(TestBulletNifLoader,
+        for_tri_shape_child_node_with_extra_data_string_mrk_should_return_shape_with_null_collision_shape)
     {
         mNiStringExtraData.string = "MRK";
         mNiStringExtraData.recType = Nif::RC_NiStringExtraData;
         mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
         mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
@@ -1166,16 +1164,17 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_extra_data_string_mrk_and_other_collision_node_should_return_shape_with_triangle_mesh_shape_with_all_meshes)
+    TEST_F(TestBulletNifLoader,
+        for_tri_shape_child_node_with_extra_data_string_mrk_and_other_collision_node_should_return_shape_with_triangle_mesh_shape_with_all_meshes)
     {
         mNiStringExtraData.string = "MRK";
         mNiStringExtraData.recType = Nif::RC_NiStringExtraData;
         mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
         mNiTriShape.parents.push_back(&mNiNode2);
-        mNiNode2.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiNode2.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
         mNiNode2.recType = Nif::RC_RootCollisionNode;
         mNiNode2.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiNode2)}));
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiNode2) }));
         mNiNode.recType = Nif::RC_NiNode;
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -1251,7 +1250,7 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_static_mesh_should_ignore_tri_strips_data_with_less_than_3_strips)
     {
-        mNiTriStripsData.strips.front() = {0, 1};
+        mNiTriStripsData.strips.front() = { 0, 1 };
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiTriStrips));
@@ -1266,9 +1265,9 @@ namespace
     TEST_F(TestBulletNifLoader, for_avoid_collision_mesh_should_ignore_tri_strips_data_with_less_than_3_strips)
     {
         mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
         mNiNode.recType = Nif::RC_AvoidNode;
-        mNiTriStripsData.strips.front() = {0, 1};
+        mNiTriStripsData.strips.front() = { 0, 1 };
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiTriStrips));
@@ -1282,9 +1281,9 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_animated_mesh_should_ignore_tri_strips_data_with_less_than_3_strips)
     {
-        mNiTriStripsData.strips.front() = {0, 1};
+        mNiTriStripsData.strips.front() = { 0, 1 };
         mNiTriStrips.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriStrips)}));
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriStrips) }));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
@@ -1298,9 +1297,9 @@ namespace
 
     TEST_F(TestBulletNifLoader, should_not_add_static_mesh_with_no_triangles_to_compound_shape)
     {
-        mNiTriStripsData.strips.front() = {0, 1};
+        mNiTriStripsData.strips.front() = { 0, 1 };
         mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(2));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
@@ -1316,7 +1315,7 @@ namespace
 
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(compound.release());
-        expected.mAnimatedShapes = {{-1, 0}};
+        expected.mAnimatedShapes = { { -1, 0 } };
 
         EXPECT_EQ(*result, expected);
     }
@@ -1325,10 +1324,10 @@ namespace
     {
         copy(mTransform, mNiTriShape.trafo);
         mNiTriShape.trafo.scale = 4;
-        mNiTriShape.parents = {&mNiNode, &mNiNode2};
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiTriShape.parents = { &mNiNode, &mNiNode2 };
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
         mNiNode.trafo.scale = 2;
-        mNiNode2.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiNode2.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
         mNiNode2.trafo.scale = 3;
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(2));
@@ -1346,27 +1345,21 @@ namespace
         std::unique_ptr<Resource::TriangleMeshShape> mesh2(new Resource::TriangleMeshShape(triangles2.release(), true));
         mesh2->setLocalScaling(btVector3(12, 12, 12));
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
-        const btTransform transform1 {
-            btMatrix3x3(
-                1, 0, 0,
-                0, 0.8004512795493964327775415767973754555, 0.59939782204119995689950428641168400645,
-                0, -0.59939782204119995689950428641168400645, 0.8004512795493964327775415767973754555
-            ),
+        const btTransform transform1{
+            btMatrix3x3(1, 0, 0, 0, 0.8004512795493964327775415767973754555, 0.59939782204119995689950428641168400645,
+                0, -0.59939782204119995689950428641168400645, 0.8004512795493964327775415767973754555),
             btVector3(2, 4, 6)
         };
-        const btTransform transform2 {
-            btMatrix3x3(
-                1, 0, 0,
-                0, 0.79515431915808965079861536651151254773, 0.60640713116208888600056070572463795543,
-                0, -0.60640713116208888600056070572463795543, 0.79515431915808965079861536651151254773
-            ),
+        const btTransform transform2{
+            btMatrix3x3(1, 0, 0, 0, 0.79515431915808965079861536651151254773, 0.60640713116208888600056070572463795543,
+                0, -0.60640713116208888600056070572463795543, 0.79515431915808965079861536651151254773),
             btVector3(3, 6, 9)
         };
         shape->addChildShape(transform1, mesh1.release());
         shape->addChildShape(transform2, mesh2.release());
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(shape.release());
-        expected.mAnimatedShapes = {{-1, 0}};
+        expected.mAnimatedShapes = { { -1, 0 } };
 
         EXPECT_EQ(*result, expected);
     }
diff --git a/apps/openmw_test_suite/openmw/options.cpp b/apps/openmw_test_suite/openmw/options.cpp
index 06b848dd16..d79a387645 100644
--- a/apps/openmw_test_suite/openmw/options.cpp
+++ b/apps/openmw_test_suite/openmw/options.cpp
@@ -2,14 +2,14 @@
 #include <components/files/configurationmanager.hpp>
 #include <components/files/conversion.hpp>
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/variables_map.hpp>
 
-#include <array>
 #include <algorithm>
+#include <array>
 #include <string>
 #include <utility>
 #include <vector>
@@ -28,18 +28,21 @@ namespace
         return std::string(std::begin(range), std::end(range) - 1);
     }
 
-    template <class ... Args>
-    std::vector<std::string> generateSupportedCharacters(Args&& ... args)
+    template <class... Args>
+    std::vector<std::string> generateSupportedCharacters(Args&&... args)
     {
         std::vector<std::string> result;
-        (result.emplace_back(makeString(args)) , ...);
+        (result.emplace_back(makeString(args)), ...);
         for (int i = 1; i <= std::numeric_limits<char>::max(); ++i)
             if (i != '&' && i != '"' && i != ' ' && i != '\n')
                 result.push_back(std::string(1, i));
         return result;
     }
 
-    MATCHER_P(IsPath, v, "") { return Files::pathToUnicodeString(arg) == v; }
+    MATCHER_P(IsPath, v, "")
+    {
+        return Files::pathToUnicodeString(arg) == v;
+    }
 
     template <class T>
     void parseArgs(const T& arguments, bpo::variables_map& variables, bpo::options_description& description)
@@ -50,7 +53,7 @@ namespace
     TEST(OpenMWOptionsFromArguments, should_support_equality_to_separate_flag_and_value)
     {
         bpo::options_description description = makeOptionsDescription();
-        const std::array arguments {"openmw", "--load-savegame=save.omwsave"};
+        const std::array arguments{ "openmw", "--load-savegame=save.omwsave" };
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
         EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), "save.omwsave");
@@ -59,7 +62,7 @@ namespace
     TEST(OpenMWOptionsFromArguments, should_support_single_word_load_savegame_path)
     {
         bpo::options_description description = makeOptionsDescription();
-        const std::array arguments {"openmw", "--load-savegame", "save.omwsave"};
+        const std::array arguments{ "openmw", "--load-savegame", "save.omwsave" };
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
         EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), "save.omwsave");
@@ -68,61 +71,67 @@ namespace
     TEST(OpenMWOptionsFromArguments, should_support_multi_component_load_savegame_path)
     {
         bpo::options_description description = makeOptionsDescription();
-        const std::array arguments {"openmw", "--load-savegame", "/home/user/openmw/save.omwsave"};
+        const std::array arguments{ "openmw", "--load-savegame", "/home/user/openmw/save.omwsave" };
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), "/home/user/openmw/save.omwsave");
+        EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()),
+            "/home/user/openmw/save.omwsave");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_windows_multi_component_load_savegame_path)
     {
         bpo::options_description description = makeOptionsDescription();
-        const std::array arguments {"openmw", "--load-savegame", R"(C:\OpenMW\save.omwsave)"};
+        const std::array arguments{ "openmw", "--load-savegame", R"(C:\OpenMW\save.omwsave)" };
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), R"(C:\OpenMW\save.omwsave)");
+        EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()),
+            R"(C:\OpenMW\save.omwsave)");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_spaces)
     {
         bpo::options_description description = makeOptionsDescription();
-        const std::array arguments {"openmw", "--load-savegame", "my save.omwsave"};
+        const std::array arguments{ "openmw", "--load-savegame", "my save.omwsave" };
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), "my save.omwsave");
+        EXPECT_EQ(
+            Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), "my save.omwsave");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_octothorpe)
     {
         bpo::options_description description = makeOptionsDescription();
-        const std::array arguments {"openmw", "--load-savegame", "my#save.omwsave"};
+        const std::array arguments{ "openmw", "--load-savegame", "my#save.omwsave" };
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), "my#save.omwsave");
+        EXPECT_EQ(
+            Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), "my#save.omwsave");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_at_sign)
     {
         bpo::options_description description = makeOptionsDescription();
-        const std::array arguments {"openmw", "--load-savegame", "my@save.omwsave"};
+        const std::array arguments{ "openmw", "--load-savegame", "my@save.omwsave" };
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), "my@save.omwsave");
+        EXPECT_EQ(
+            Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), "my@save.omwsave");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_quote)
     {
         bpo::options_description description = makeOptionsDescription();
-        const std::array arguments {"openmw", "--load-savegame", R"(my"save.omwsave)"};
+        const std::array arguments{ "openmw", "--load-savegame", R"(my"save.omwsave)" };
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), R"(my"save.omwsave)");
+        EXPECT_EQ(
+            Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), R"(my"save.omwsave)");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_quoted_load_savegame_path)
     {
         bpo::options_description description = makeOptionsDescription();
-        const std::array arguments {"openmw", "--load-savegame", R"("save".omwsave)"};
+        const std::array arguments{ "openmw", "--load-savegame", R"("save".omwsave)" };
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
         EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), R"(save)");
@@ -131,16 +140,17 @@ namespace
     TEST(OpenMWOptionsFromArguments, should_support_quoted_load_savegame_path_with_escaped_quote_by_ampersand)
     {
         bpo::options_description description = makeOptionsDescription();
-        const std::array arguments {"openmw", "--load-savegame", R"("save&".omwsave")"};
+        const std::array arguments{ "openmw", "--load-savegame", R"("save&".omwsave")" };
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), R"(save".omwsave)");
+        EXPECT_EQ(
+            Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), R"(save".omwsave)");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_quoted_load_savegame_path_with_escaped_ampersand)
     {
         bpo::options_description description = makeOptionsDescription();
-        const std::array arguments {"openmw", "--load-savegame", R"("save.omwsave&&")"};
+        const std::array arguments{ "openmw", "--load-savegame", R"("save.omwsave&&")" };
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
         EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), "save.omwsave&");
@@ -149,7 +159,7 @@ namespace
     TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_ampersand)
     {
         bpo::options_description description = makeOptionsDescription();
-        const std::array arguments {"openmw", "--load-savegame", "save&.omwsave"};
+        const std::array arguments{ "openmw", "--load-savegame", "save&.omwsave" };
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
         EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), "save&.omwsave");
@@ -158,16 +168,17 @@ namespace
     TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_multiple_quotes)
     {
         bpo::options_description description = makeOptionsDescription();
-        const std::array arguments {"openmw", "--load-savegame", R"(my"save".omwsave)"};
+        const std::array arguments{ "openmw", "--load-savegame", R"(my"save".omwsave)" };
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), R"(my"save".omwsave)");
+        EXPECT_EQ(
+            Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), R"(my"save".omwsave)");
     }
 
     TEST(OpenMWOptionsFromArguments, should_compose_data)
     {
         bpo::options_description description = makeOptionsDescription();
-        const std::array arguments {"openmw", "--data", "1", "--data", "2"};
+        const std::array arguments{ "openmw", "--data", "1", "--data", "2" };
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
         EXPECT_THAT(variables["data"].as<Files::MaybeQuotedPathContainer>(), ElementsAre(IsPath("1"), IsPath("2")));
@@ -176,7 +187,7 @@ namespace
     TEST(OpenMWOptionsFromArguments, should_compose_data_from_single_flag)
     {
         bpo::options_description description = makeOptionsDescription();
-        const std::array arguments {"openmw", "--data", "1", "2"};
+        const std::array arguments{ "openmw", "--data", "1", "2" };
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
         EXPECT_THAT(variables["data"].as<Files::MaybeQuotedPathContainer>(), ElementsAre(IsPath("1"), IsPath("2")));
@@ -185,29 +196,28 @@ namespace
     TEST(OpenMWOptionsFromArguments, should_throw_on_multiple_load_savegame)
     {
         bpo::options_description description = makeOptionsDescription();
-        const std::array arguments {"openmw", "--load-savegame", "1.omwsave", "--load-savegame", "2.omwsave"};
+        const std::array arguments{ "openmw", "--load-savegame", "1.omwsave", "--load-savegame", "2.omwsave" };
         bpo::variables_map variables;
         EXPECT_THROW(parseArgs(arguments, variables, description), std::exception);
     }
 
-    struct OpenMWOptionsFromArgumentsStrings : TestWithParam<std::string> {};
+    struct OpenMWOptionsFromArgumentsStrings : TestWithParam<std::string>
+    {
+    };
 
     TEST_P(OpenMWOptionsFromArgumentsStrings, should_support_paths_with_certain_characters_in_load_savegame_path)
     {
         bpo::options_description description = makeOptionsDescription();
         const std::string path = "save_" + std::string(GetParam()) + ".omwsave";
         const std::string pathArgument = "\"" + path + "\"";
-        const std::array arguments {"openmw", "--load-savegame", pathArgument.c_str()};
+        const std::array arguments{ "openmw", "--load-savegame", pathArgument.c_str() };
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
         EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), path);
     }
 
-    INSTANTIATE_TEST_SUITE_P(
-        SupportedCharacters,
-        OpenMWOptionsFromArgumentsStrings,
-        ValuesIn(generateSupportedCharacters(u8"👍", u8"Ъ", u8"Ǽ", "\n"))
-    );
+    INSTANTIATE_TEST_SUITE_P(SupportedCharacters, OpenMWOptionsFromArgumentsStrings,
+        ValuesIn(generateSupportedCharacters(u8"👍", u8"Ъ", u8"Ǽ", "\n")));
 
     TEST(OpenMWOptionsFromConfig, should_support_single_word_load_savegame_path)
     {
@@ -242,7 +252,8 @@ namespace
         std::istringstream stream(R"(load-savegame="my save.omwsave")");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), "my save.omwsave");
+        EXPECT_EQ(
+            Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), "my save.omwsave");
     }
 
     TEST(OpenMWOptionsFromConfig, should_support_quoted_load_savegame_path_with_octothorpe)
@@ -269,7 +280,8 @@ namespace
         std::istringstream stream(R"(load-savegame=save".omwsave)");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), R"(save".omwsave)");
+        EXPECT_EQ(
+            Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), R"(save".omwsave)");
     }
 
     TEST(OpenMWOptionsFromConfig, should_support_confusing_savegame_path_with_lots_going_on)
@@ -331,7 +343,8 @@ namespace
         std::istringstream stream("load-savegame=/home/user/openmw/save.omwsave");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), "/home/user/openmw/save.omwsave");
+        EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()),
+            "/home/user/openmw/save.omwsave");
     }
 
     TEST(OpenMWOptionsFromConfig, should_support_windows_multi_component_load_savegame_path)
@@ -340,7 +353,8 @@ namespace
         std::istringstream stream(R"(load-savegame=C:\OpenMW\save.omwsave)");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), R"(C:\OpenMW\save.omwsave)");
+        EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()),
+            R"(C:\OpenMW\save.omwsave)");
     }
 
     TEST(OpenMWOptionsFromConfig, should_compose_data)
@@ -358,7 +372,8 @@ namespace
         std::istringstream stream(R"(load-savegame="save&".omwsave")");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), R"(save".omwsave)");
+        EXPECT_EQ(
+            Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), R"(save".omwsave)");
     }
 
     TEST(OpenMWOptionsFromConfig, should_support_quoted_load_savegame_path_with_escaped_ampersand)
@@ -379,7 +394,9 @@ namespace
         EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), "save&.omwsave");
     }
 
-    struct OpenMWOptionsFromConfigStrings : TestWithParam<std::string> {};
+    struct OpenMWOptionsFromConfigStrings : TestWithParam<std::string>
+    {
+    };
 
     TEST_P(OpenMWOptionsFromConfigStrings, should_support_paths_with_certain_characters_in_load_savegame_path)
     {
@@ -391,9 +408,6 @@ namespace
         EXPECT_EQ(Files::pathToUnicodeString(variables["load-savegame"].as<Files::MaybeQuotedPath>()), path);
     }
 
-    INSTANTIATE_TEST_SUITE_P(
-        SupportedCharacters,
-        OpenMWOptionsFromConfigStrings,
-        ValuesIn(generateSupportedCharacters(u8"👍", u8"Ъ", u8"Ǽ"))
-    );
+    INSTANTIATE_TEST_SUITE_P(SupportedCharacters, OpenMWOptionsFromConfigStrings,
+        ValuesIn(generateSupportedCharacters(u8"👍", u8"Ъ", u8"Ǽ")));
 }
diff --git a/apps/openmw_test_suite/openmw_test_suite.cpp b/apps/openmw_test_suite/openmw_test_suite.cpp
index 7364b20fdb..fb5c879fc1 100644
--- a/apps/openmw_test_suite/openmw_test_suite.cpp
+++ b/apps/openmw_test_suite/openmw_test_suite.cpp
@@ -1,11 +1,13 @@
 #include <gtest/gtest.h>
 
 #ifdef WIN32
-//we cannot use GTEST_API_ before main if we're building standalone exe application,
-//and we're linking GoogleTest / GoogleMock as DLLs and not linking gtest_main / gmock_main
-int main(int argc, char **argv) {
+// we cannot use GTEST_API_ before main if we're building standalone exe application,
+// and we're linking GoogleTest / GoogleMock as DLLs and not linking gtest_main / gmock_main
+int main(int argc, char** argv)
+{
 #else
-GTEST_API_ int main(int argc, char **argv) {
+GTEST_API_ int main(int argc, char** argv)
+{
 #endif
     testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();
diff --git a/apps/openmw_test_suite/serialization/binaryreader.cpp b/apps/openmw_test_suite/serialization/binaryreader.cpp
index b78c673d8f..e480d5587f 100644
--- a/apps/openmw_test_suite/serialization/binaryreader.cpp
+++ b/apps/openmw_test_suite/serialization/binaryreader.cpp
@@ -2,8 +2,8 @@
 
 #include <components/serialization/binaryreader.hpp>
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 #include <cstdint>
 #include <cstring>
diff --git a/apps/openmw_test_suite/serialization/binarywriter.cpp b/apps/openmw_test_suite/serialization/binarywriter.cpp
index cb0f29ba85..dde1440813 100644
--- a/apps/openmw_test_suite/serialization/binarywriter.cpp
+++ b/apps/openmw_test_suite/serialization/binarywriter.cpp
@@ -2,8 +2,8 @@
 
 #include <components/serialization/binarywriter.hpp>
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 #include <array>
 #include <cstdint>
@@ -28,12 +28,18 @@ namespace
     {
         std::vector<std::byte> result(8);
         BinaryWriter binaryWriter(result.data(), result.data() + result.size());
-        std::vector<std::uint32_t> values({42, 13});
+        std::vector<std::uint32_t> values({ 42, 13 });
         const TestFormat<Mode::Write> format;
         binaryWriter(format, values.data(), values.size());
-        constexpr std::array<std::byte, 8> expected {
-            std::byte(42), std::byte(0), std::byte(0), std::byte(0),
-            std::byte(13), std::byte(0), std::byte(0), std::byte(0),
+        constexpr std::array<std::byte, 8> expected{
+            std::byte(42),
+            std::byte(0),
+            std::byte(0),
+            std::byte(0),
+            std::byte(13),
+            std::byte(0),
+            std::byte(0),
+            std::byte(0),
         };
         EXPECT_THAT(result, ElementsAreArray(expected));
     }
@@ -50,7 +56,7 @@ namespace
     {
         std::vector<std::byte> result(7);
         BinaryWriter binaryWriter(result.data(), result.data() + result.size());
-        std::vector<std::uint32_t> values({42, 13});
+        std::vector<std::uint32_t> values({ 42, 13 });
         const TestFormat<Mode::Write> format;
         EXPECT_THROW(binaryWriter(format, values.data(), values.size()), std::runtime_error);
     }
diff --git a/apps/openmw_test_suite/serialization/format.hpp b/apps/openmw_test_suite/serialization/format.hpp
index 603d2790e0..680d6c1abc 100644
--- a/apps/openmw_test_suite/serialization/format.hpp
+++ b/apps/openmw_test_suite/serialization/format.hpp
@@ -3,9 +3,9 @@
 
 #include <components/serialization/format.hpp>
 
-#include <utility>
-#include <type_traits>
 #include <cstdint>
+#include <type_traits>
+#include <utility>
 
 namespace SerializationTesting
 {
@@ -16,7 +16,7 @@ namespace SerializationTesting
 
         friend bool operator==(const Pod& l, const Pod& r)
         {
-            const auto tuple = [] (const Pod& v) { return std::tuple(v.mInt, v.mDouble); };
+            const auto tuple = [](const Pod& v) { return std::tuple(v.mInt, v.mDouble); };
             return tuple(l) == tuple(r);
         }
     };
@@ -30,7 +30,7 @@ namespace SerializationTesting
 
     struct Composite
     {
-        short mFloatArray[3] = {0};
+        short mFloatArray[3] = { 0 };
         std::vector<std::int32_t> mIntVector;
         std::vector<Enum> mEnumVector;
         std::vector<Pod> mPodVector;
@@ -46,8 +46,7 @@ namespace SerializationTesting
         using Serialization::Format<mode, TestFormat<mode>>::operator();
 
         template <class Visitor, class T>
-        auto operator()(Visitor&& visitor, T& value) const
-            -> std::enable_if_t<std::is_same_v<std::decay_t<T>, Pod>>
+        auto operator()(Visitor&& visitor, T& value) const -> std::enable_if_t<std::is_same_v<std::decay_t<T>, Pod>>
         {
             visitor(*this, value.mInt);
             visitor(*this, value.mDouble);
diff --git a/apps/openmw_test_suite/serialization/integration.cpp b/apps/openmw_test_suite/serialization/integration.cpp
index cb8c711c67..e703f0f898 100644
--- a/apps/openmw_test_suite/serialization/integration.cpp
+++ b/apps/openmw_test_suite/serialization/integration.cpp
@@ -1,11 +1,11 @@
 #include "format.hpp"
 
-#include <components/serialization/sizeaccumulator.hpp>
-#include <components/serialization/binarywriter.hpp>
 #include <components/serialization/binaryreader.hpp>
+#include <components/serialization/binarywriter.hpp>
+#include <components/serialization/sizeaccumulator.hpp>
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 #include <vector>
 
@@ -21,13 +21,13 @@ namespace
 
         DetourNavigatorSerializationIntegrationTest()
         {
-            mComposite.mIntVector = {4, 5, 6};
-            mComposite.mEnumVector = {Enum::A, Enum::B, Enum::C};
-            mComposite.mPodVector = {Pod {4, 23.87}, Pod {5, -31.76}, Pod {6, 65.12}};
-            mComposite.mPodBuffer = {Pod {7, 456.123}, Pod {8, -628.346}};
+            mComposite.mIntVector = { 4, 5, 6 };
+            mComposite.mEnumVector = { Enum::A, Enum::B, Enum::C };
+            mComposite.mPodVector = { Pod{ 4, 23.87 }, Pod{ 5, -31.76 }, Pod{ 6, 65.12 } };
+            mComposite.mPodBuffer = { Pod{ 7, 456.123 }, Pod{ 8, -628.346 } };
             mComposite.mPodDataSize = mComposite.mPodBuffer.size();
             std::string charData = "serialization";
-            mComposite.mCharBuffer = {charData.begin(), charData.end()};
+            mComposite.mCharBuffer = { charData.begin(), charData.end() };
             mComposite.mCharDataSize = charData.size();
         }
     };
diff --git a/apps/openmw_test_suite/serialization/sizeaccumulator.cpp b/apps/openmw_test_suite/serialization/sizeaccumulator.cpp
index dce148468a..35ab3be4c4 100644
--- a/apps/openmw_test_suite/serialization/sizeaccumulator.cpp
+++ b/apps/openmw_test_suite/serialization/sizeaccumulator.cpp
@@ -37,7 +37,7 @@ namespace
     {
         SizeAccumulator sizeAccumulator;
         const TestFormat<Mode::Write> format;
-        sizeAccumulator(format, Pod {});
+        sizeAccumulator(format, Pod{});
         EXPECT_EQ(sizeAccumulator.value(), 12);
     }
 }
diff --git a/apps/openmw_test_suite/settings/parser.cpp b/apps/openmw_test_suite/settings/parser.cpp
index 33d6b24ded..3712ca6513 100644
--- a/apps/openmw_test_suite/settings/parser.cpp
+++ b/apps/openmw_test_suite/settings/parser.cpp
@@ -17,7 +17,7 @@ namespace
         SettingsFileParser mSaver;
 
         template <typename F>
-        void withSettingsFile( const std::string& content, F&& f)
+        void withSettingsFile(const std::string& content, F&& f)
         {
             auto path = TestingOpenMW::outputFilePath(
                 std::string(UnitTest::GetInstance()->current_test_info()->name()) + ".cfg");
@@ -36,7 +36,7 @@ namespace
     {
         const std::string content;
 
-        withSettingsFile(content, [this] (const auto& path) {
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             mLoader.loadSettingsFile(path, map);
 
@@ -46,11 +46,9 @@ namespace
 
     TEST_F(SettingsFileParserTest, file_with_single_empty_section)
     {
-        const std::string content =
-            "[Section]\n"
-        ;
+        const std::string content = "[Section]\n";
 
-        withSettingsFile(content, [this] (const auto& path) {
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             mLoader.loadSettingsFile(path, map);
 
@@ -60,49 +58,42 @@ namespace
 
     TEST_F(SettingsFileParserTest, file_with_single_section_and_key)
     {
-        const std::string content =
-            "[Section]\n"
-            "key = value\n"
-        ;
+        const std::string content
+            = "[Section]\n"
+              "key = value\n";
 
-        withSettingsFile(content, [this] (const auto& path) {
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             mLoader.loadSettingsFile(path, map);
 
-            EXPECT_EQ(map, CategorySettingValueMap({
-                {CategorySetting("Section", "key"), "value"}
-            }));
+            EXPECT_EQ(map, CategorySettingValueMap({ { CategorySetting("Section", "key"), "value" } }));
         });
     }
 
     TEST_F(SettingsFileParserTest, file_with_single_section_and_key_and_line_comments)
     {
-        const std::string content =
-            "# foo\n"
-            "[Section]\n"
-            "# bar\n"
-            "key = value\n"
-            "# baz\n"
-        ;
-
-        withSettingsFile(content, [this] (const auto& path) {
+        const std::string content
+            = "# foo\n"
+              "[Section]\n"
+              "# bar\n"
+              "key = value\n"
+              "# baz\n";
+
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             mLoader.loadSettingsFile(path, map);
 
-            EXPECT_EQ(map, CategorySettingValueMap({
-                {CategorySetting("Section", "key"), "value"}
-            }));
+            EXPECT_EQ(map, CategorySettingValueMap({ { CategorySetting("Section", "key"), "value" } }));
         });
     }
 
     TEST_F(SettingsFileParserTest, file_with_single_section_and_key_file_and_inline_section_comment)
     {
-        const std::string content =
-            "[Section] # foo\n"
-            "key = value\n"
-        ;
+        const std::string content
+            = "[Section] # foo\n"
+              "key = value\n";
 
-        withSettingsFile(content, [this] (const auto& path) {
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             EXPECT_THROW(mLoader.loadSettingsFile(path, map), std::runtime_error);
         });
@@ -110,198 +101,179 @@ namespace
 
     TEST_F(SettingsFileParserTest, file_single_section_and_key_and_inline_key_comment)
     {
-        const std::string content =
-            "[Section]\n"
-            "key = value # foo\n"
-        ;
+        const std::string content
+            = "[Section]\n"
+              "key = value # foo\n";
 
-        withSettingsFile(content, [this] (const auto& path) {
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             mLoader.loadSettingsFile(path, map);
 
-            EXPECT_EQ(map, CategorySettingValueMap({
-                {CategorySetting("Section", "key"), "value # foo"}
-            }));
+            EXPECT_EQ(map, CategorySettingValueMap({ { CategorySetting("Section", "key"), "value # foo" } }));
         });
     }
 
     TEST_F(SettingsFileParserTest, file_with_single_section_and_key_and_whitespaces)
     {
-        const std::string content =
-            " [ Section ] \n"
-            " key = value \n"
-        ;
+        const std::string content
+            = " [ Section ] \n"
+              " key = value \n";
 
-        withSettingsFile(content, [this] (const auto& path) {
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             mLoader.loadSettingsFile(path, map);
 
-            EXPECT_EQ(map, CategorySettingValueMap({
-                {CategorySetting("Section", "key"), "value"}
-            }));
+            EXPECT_EQ(map, CategorySettingValueMap({ { CategorySetting("Section", "key"), "value" } }));
         });
     }
 
     TEST_F(SettingsFileParserTest, file_with_quoted_string_value)
     {
-        const std::string content =
-            "[Section]\n"
-            R"(key = "value")"
-        ;
+        const std::string content
+            = "[Section]\n"
+              R"(key = "value")";
 
-        withSettingsFile(content, [this] (const auto& path) {
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             mLoader.loadSettingsFile(path, map);
 
-            EXPECT_EQ(map, CategorySettingValueMap({
-                {CategorySetting("Section", "key"), R"("value")"}
-            }));
+            EXPECT_EQ(map, CategorySettingValueMap({ { CategorySetting("Section", "key"), R"("value")" } }));
         });
     }
 
     TEST_F(SettingsFileParserTest, file_with_quoted_string_value_and_eol)
     {
-        const std::string content =
-            "[Section]\n"
-            R"(key = "value"\n)"
-        ;
+        const std::string content
+            = "[Section]\n"
+              R"(key = "value"\n)";
 
-        withSettingsFile(content, [this] (const auto& path) {
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             mLoader.loadSettingsFile(path, map);
 
-            EXPECT_EQ(map, CategorySettingValueMap({
-                {CategorySetting("Section", "key"), R"("value"\n)"}
-            }));
+            EXPECT_EQ(map, CategorySettingValueMap({ { CategorySetting("Section", "key"), R"("value"\n)" } }));
         });
     }
 
     TEST_F(SettingsFileParserTest, file_with_empty_value)
     {
-        const std::string content =
-            "[Section]\n"
-            "key =\n"
-        ;
+        const std::string content
+            = "[Section]\n"
+              "key =\n";
 
-        withSettingsFile(content, [this] (const auto& path) {
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             mLoader.loadSettingsFile(path, map);
 
-            EXPECT_EQ(map, CategorySettingValueMap({
-                {CategorySetting("Section", "key"), ""}
-            }));
+            EXPECT_EQ(map, CategorySettingValueMap({ { CategorySetting("Section", "key"), "" } }));
         });
     }
 
     TEST_F(SettingsFileParserTest, file_with_empty_key)
     {
-        const std::string content =
-            "[Section]\n"
-            "=\n"
-        ;
+        const std::string content
+            = "[Section]\n"
+              "=\n";
 
-        withSettingsFile(content, [this] (const auto& path) {
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             mLoader.loadSettingsFile(path, map);
 
-            EXPECT_EQ(map, CategorySettingValueMap({
-                {CategorySetting("Section", ""), ""}
-            }));
+            EXPECT_EQ(map, CategorySettingValueMap({ { CategorySetting("Section", ""), "" } }));
         });
     }
 
     TEST_F(SettingsFileParserTest, file_with_multiple_keys)
     {
-        const std::string content =
-            "[Section]\n"
-            "key1 = value1\n"
-            "key2 = value2\n"
-        ;
+        const std::string content
+            = "[Section]\n"
+              "key1 = value1\n"
+              "key2 = value2\n";
 
-        withSettingsFile(content, [this] (const auto& path) {
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             mLoader.loadSettingsFile(path, map);
 
-            EXPECT_EQ(map, CategorySettingValueMap({
-                {CategorySetting("Section", "key1"), "value1"},
-                {CategorySetting("Section", "key2"), "value2"},
-            }));
+            EXPECT_EQ(map,
+                CategorySettingValueMap({
+                    { CategorySetting("Section", "key1"), "value1" },
+                    { CategorySetting("Section", "key2"), "value2" },
+                }));
         });
     }
 
     TEST_F(SettingsFileParserTest, file_with_multiple_sections)
     {
-        const std::string content =
-            "[Section1]\n"
-            "key1 = value1\n"
-            "[Section2]\n"
-            "key2 = value2\n"
-        ;
-
-        withSettingsFile(content, [this] (const auto& path) {
+        const std::string content
+            = "[Section1]\n"
+              "key1 = value1\n"
+              "[Section2]\n"
+              "key2 = value2\n";
+
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             mLoader.loadSettingsFile(path, map);
 
-            EXPECT_EQ(map, CategorySettingValueMap({
-                {CategorySetting("Section1", "key1"), "value1"},
-                {CategorySetting("Section2", "key2"), "value2"},
-            }));
+            EXPECT_EQ(map,
+                CategorySettingValueMap({
+                    { CategorySetting("Section1", "key1"), "value1" },
+                    { CategorySetting("Section2", "key2"), "value2" },
+                }));
         });
     }
 
     TEST_F(SettingsFileParserTest, file_with_multiple_sections_and_keys)
     {
-        const std::string content =
-            "[Section1]\n"
-            "key1 = value1\n"
-            "key2 = value2\n"
-            "[Section2]\n"
-            "key3 = value3\n"
-            "key4 = value4\n"
-        ;
-
-        withSettingsFile(content, [this] (const auto& path) {
+        const std::string content
+            = "[Section1]\n"
+              "key1 = value1\n"
+              "key2 = value2\n"
+              "[Section2]\n"
+              "key3 = value3\n"
+              "key4 = value4\n";
+
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             mLoader.loadSettingsFile(path, map);
 
-            EXPECT_EQ(map, CategorySettingValueMap({
-                {CategorySetting("Section1", "key1"), "value1"},
-                {CategorySetting("Section1", "key2"), "value2"},
-                {CategorySetting("Section2", "key3"), "value3"},
-                {CategorySetting("Section2", "key4"), "value4"},
-            }));
+            EXPECT_EQ(map,
+                CategorySettingValueMap({
+                    { CategorySetting("Section1", "key1"), "value1" },
+                    { CategorySetting("Section1", "key2"), "value2" },
+                    { CategorySetting("Section2", "key3"), "value3" },
+                    { CategorySetting("Section2", "key4"), "value4" },
+                }));
         });
     }
 
     TEST_F(SettingsFileParserTest, file_with_repeated_sections)
     {
-        const std::string content =
-            "[Section]\n"
-            "key1 = value1\n"
-            "[Section]\n"
-            "key2 = value2\n"
-        ;
-
-        withSettingsFile(content, [this] (const auto& path) {
+        const std::string content
+            = "[Section]\n"
+              "key1 = value1\n"
+              "[Section]\n"
+              "key2 = value2\n";
+
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             mLoader.loadSettingsFile(path, map);
 
-            EXPECT_EQ(map, CategorySettingValueMap({
-                {CategorySetting("Section", "key1"), "value1"},
-                {CategorySetting("Section", "key2"), "value2"},
-            }));
+            EXPECT_EQ(map,
+                CategorySettingValueMap({
+                    { CategorySetting("Section", "key1"), "value1" },
+                    { CategorySetting("Section", "key2"), "value2" },
+                }));
         });
     }
 
     TEST_F(SettingsFileParserTest, file_with_repeated_keys)
     {
-        const std::string content =
-            "[Section]\n"
-            "key = value\n"
-            "key = value\n"
-        ;
+        const std::string content
+            = "[Section]\n"
+              "key = value\n"
+              "key = value\n";
 
-        withSettingsFile(content, [this] (const auto& path) {
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             EXPECT_THROW(mLoader.loadSettingsFile(path, map), std::runtime_error);
         });
@@ -309,31 +281,29 @@ namespace
 
     TEST_F(SettingsFileParserTest, file_with_repeated_keys_in_differrent_sections)
     {
-        const std::string content =
-            "[Section1]\n"
-            "key = value\n"
-            "[Section2]\n"
-            "key = value\n"
-        ;
-
-        withSettingsFile(content, [this] (const auto& path) {
+        const std::string content
+            = "[Section1]\n"
+              "key = value\n"
+              "[Section2]\n"
+              "key = value\n";
+
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             mLoader.loadSettingsFile(path, map);
 
-            EXPECT_EQ(map, CategorySettingValueMap({
-                {CategorySetting("Section1", "key"), "value"},
-                {CategorySetting("Section2", "key"), "value"},
-            }));
+            EXPECT_EQ(map,
+                CategorySettingValueMap({
+                    { CategorySetting("Section1", "key"), "value" },
+                    { CategorySetting("Section2", "key"), "value" },
+                }));
         });
     }
 
     TEST_F(SettingsFileParserTest, file_with_unterminated_section)
     {
-        const std::string content =
-            "[Section"
-        ;
+        const std::string content = "[Section";
 
-        withSettingsFile(content, [this] (const auto& path) {
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             EXPECT_THROW(mLoader.loadSettingsFile(path, map), std::runtime_error);
         });
@@ -341,11 +311,9 @@ namespace
 
     TEST_F(SettingsFileParserTest, file_with_single_empty_section_name)
     {
-        const std::string content =
-            "[]\n"
-        ;
+        const std::string content = "[]\n";
 
-        withSettingsFile(content, [this] (const auto& path) {
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             mLoader.loadSettingsFile(path, map);
 
@@ -355,11 +323,9 @@ namespace
 
     TEST_F(SettingsFileParserTest, file_with_key_and_without_section)
     {
-        const std::string content =
-            "key = value\n"
-        ;
+        const std::string content = "key = value\n";
 
-        withSettingsFile(content, [this] (const auto& path) {
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             EXPECT_THROW(mLoader.loadSettingsFile(path, map), std::runtime_error);
         });
@@ -367,12 +333,11 @@ namespace
 
     TEST_F(SettingsFileParserTest, file_with_key_in_empty_name_section)
     {
-        const std::string content =
-            "[]"
-            "key = value\n"
-        ;
+        const std::string content
+            = "[]"
+              "key = value\n";
 
-        withSettingsFile(content, [this] (const auto& path) {
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             EXPECT_THROW(mLoader.loadSettingsFile(path, map), std::runtime_error);
         });
@@ -380,12 +345,11 @@ namespace
 
     TEST_F(SettingsFileParserTest, file_with_unterminated_key)
     {
-        const std::string content =
-            "[Section]\n"
-            "key\n"
-        ;
+        const std::string content
+            = "[Section]\n"
+              "key\n";
 
-        withSettingsFile(content, [this] (const auto& path) {
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             EXPECT_THROW(mLoader.loadSettingsFile(path, map), std::runtime_error);
         });
@@ -393,21 +357,18 @@ namespace
 
     TEST_F(SettingsFileParserTest, file_with_empty_lines)
     {
-        const std::string content =
-            "\n"
-            "[Section]\n"
-            "\n"
-            "key = value\n"
-            "\n"
-        ;
-
-        withSettingsFile(content, [this] (const auto& path) {
+        const std::string content
+            = "\n"
+              "[Section]\n"
+              "\n"
+              "key = value\n"
+              "\n";
+
+        withSettingsFile(content, [this](const auto& path) {
             CategorySettingValueMap map;
             mLoader.loadSettingsFile(path, map);
 
-            EXPECT_EQ(map, CategorySettingValueMap({
-                {CategorySetting("Section", "key"), "value"}
-            }));
+            EXPECT_EQ(map, CategorySettingValueMap({ { CategorySetting("Section", "key"), "value" } }));
         });
     }
 }
diff --git a/apps/openmw_test_suite/settings/shadermanager.cpp b/apps/openmw_test_suite/settings/shadermanager.cpp
index 1ed3e7a48c..c252e08fc6 100644
--- a/apps/openmw_test_suite/settings/shadermanager.cpp
+++ b/apps/openmw_test_suite/settings/shadermanager.cpp
@@ -15,7 +15,7 @@ namespace
     struct ShaderSettingsTest : Test
     {
         template <typename F>
-        void withSettingsFile( const std::string& content, F&& f)
+        void withSettingsFile(const std::string& content, F&& f)
         {
             auto path = TestingOpenMW::outputFilePath(
                 std::string(UnitTest::GetInstance()->current_test_info()->name()) + ".yaml");
@@ -34,14 +34,13 @@ namespace
     TEST_F(ShaderSettingsTest, fail_to_fetch_then_set_and_succeed)
     {
         const std::string content =
-R"YAML(
+            R"YAML(
 config:
     shader:
         vec3_uniform: [1.0, 2.0]
 )YAML";
 
-        withSettingsFile(content, [] (const auto& path)
-        {
+        withSettingsFile(content, [](const auto& path) {
             EXPECT_TRUE(ShaderManager::get().load(path));
             EXPECT_FALSE(ShaderManager::get().getValue<osg::Vec3f>("shader", "vec3_uniform").has_value());
             EXPECT_TRUE(ShaderManager::get().setValue<osg::Vec3f>("shader", "vec3_uniform", osg::Vec3f(1, 2, 3)));
@@ -54,15 +53,14 @@ config:
     TEST_F(ShaderSettingsTest, fail_to_load_file_then_fail_to_set_and_get)
     {
         const std::string content =
-R"YAML(
+            R"YAML(
 config:
     shader:
         uniform: 12.0
  >Defeated by a sideways carrot
 )YAML";
 
-        withSettingsFile(content, [] (const auto& path)
-        {
+        withSettingsFile(content, [](const auto& path) {
             EXPECT_FALSE(ShaderManager::get().load(path));
             EXPECT_FALSE(ShaderManager::get().setValue("shader", "uniform", 12.0));
             EXPECT_FALSE(ShaderManager::get().getValue<float>("shader", "uniform").has_value());
diff --git a/apps/openmw_test_suite/shader/parsedefines.cpp b/apps/openmw_test_suite/shader/parsedefines.cpp
index 65b4380a71..441dab2bb6 100644
--- a/apps/openmw_test_suite/shader/parsedefines.cpp
+++ b/apps/openmw_test_suite/shader/parsedefines.cpp
@@ -1,7 +1,7 @@
 #include <components/shader/shadermanager.hpp>
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 namespace
 {
@@ -58,7 +58,9 @@ namespace
 
     namespace SupportedTerminals
     {
-        struct ShaderParseDefinesTest : ::ShaderParseDefinesTest, WithParamInterface<char> {};
+        struct ShaderParseDefinesTest : ::ShaderParseDefinesTest, WithParamInterface<char>
+        {
+        };
 
         TEST_P(ShaderParseDefinesTest, support_defines_terminated_by)
         {
@@ -69,10 +71,7 @@ namespace
         }
 
         INSTANTIATE_TEST_SUITE_P(
-            SupportedTerminals,
-            ShaderParseDefinesTest,
-            Values(' ', '\n', '\r', '(', ')', '[', ']', '.', ';', ',')
-        );
+            SupportedTerminals, ShaderParseDefinesTest, Values(' ', '\n', '\r', '(', ')', '[', ']', '.', ';', ','));
     }
 
     TEST_F(ShaderParseDefinesTest, should_not_support_define_ending_with_source)
diff --git a/apps/openmw_test_suite/shader/parsefors.cpp b/apps/openmw_test_suite/shader/parsefors.cpp
index 4e64042365..2e1869843d 100644
--- a/apps/openmw_test_suite/shader/parsefors.cpp
+++ b/apps/openmw_test_suite/shader/parsefors.cpp
@@ -1,7 +1,7 @@
 #include <components/shader/shadermanager.hpp>
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 #include <vector>
 
 namespace
diff --git a/apps/openmw_test_suite/shader/parselinks.cpp b/apps/openmw_test_suite/shader/parselinks.cpp
index 2e3697ba50..05396b2aeb 100644
--- a/apps/openmw_test_suite/shader/parselinks.cpp
+++ b/apps/openmw_test_suite/shader/parselinks.cpp
@@ -1,7 +1,7 @@
 #include <components/shader/shadermanager.hpp>
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 #include <vector>
 
 namespace
@@ -18,10 +18,7 @@ namespace
         ShaderManager::DefineMap mDefines;
         const std::string mName = "my_shader.glsl";
 
-        bool parseLinks()
-        {
-            return parseDirectives(mSource, mLinkTargets, mDefines, {}, mName);
-        }
+        bool parseLinks() { return parseDirectives(mSource, mLinkTargets, mDefines, {}, mName); }
     };
 
     TEST_F(ShaderParseLinksTest, empty_should_succeed)
@@ -83,14 +80,14 @@ namespace
 
     TEST_F(ShaderParseLinksTest, should_only_accept_on_true_condition)
     {
-        mSource = 
-R"glsl(
+        mSource =
+            R"glsl(
 $link "foo.glsl" if 1
 $link "bar.glsl" if 0
 )glsl";
         ASSERT_TRUE(parseLinks());
-        EXPECT_EQ(mSource, 
-R"glsl(
+        EXPECT_EQ(mSource,
+            R"glsl(
 
 
 )glsl");
diff --git a/apps/openmw_test_suite/shader/shadermanager.cpp b/apps/openmw_test_suite/shader/shadermanager.cpp
index 425f6d391f..25f7e55444 100644
--- a/apps/openmw_test_suite/shader/shadermanager.cpp
+++ b/apps/openmw_test_suite/shader/shadermanager.cpp
@@ -1,5 +1,5 @@
-#include <components/shader/shadermanager.hpp>
 #include <components/files/conversion.hpp>
+#include <components/shader/shadermanager.hpp>
 
 #include <fstream>
 
@@ -17,10 +17,7 @@ namespace
         ShaderManager mManager;
         ShaderManager::DefineMap mDefines;
 
-        ShaderManagerTest()
-        {
-            mManager.setShaderPath(".");
-        }
+        ShaderManagerTest() { mManager.setShaderPath("."); }
 
         template <class F>
         void withShaderFile(const std::string& content, F&& f)
@@ -48,19 +45,20 @@ namespace
     {
         const std::string content;
 
-        withShaderFile(content, [this] (const std::filesystem::path& templateName) {
+        withShaderFile(content, [this](const std::filesystem::path& templateName) {
             EXPECT_TRUE(mManager.getShader(Files::pathToUnicodeString(templateName), {}, osg::Shader::VERTEX));
         });
     }
 
     TEST_F(ShaderManagerTest, get_shader_should_not_change_source_without_template_parameters)
     {
-        const std::string content =
-            "#version 120\n"
-            "void main() {}\n";
+        const std::string content
+            = "#version 120\n"
+              "void main() {}\n";
 
-        withShaderFile(content, [&] (const std::filesystem::path& templateName) {
-            const auto shader = mManager.getShader(Files::pathToUnicodeString(templateName), mDefines, osg::Shader::VERTEX);
+        withShaderFile(content, [&](const std::filesystem::path& templateName) {
+            const auto shader
+                = mManager.getShader(Files::pathToUnicodeString(templateName), mDefines, osg::Shader::VERTEX);
             ASSERT_TRUE(shader);
             EXPECT_EQ(shader->getShaderSource(), content);
         });
@@ -68,36 +66,36 @@ namespace
 
     TEST_F(ShaderManagerTest, get_shader_should_replace_includes_with_content)
     {
-        const std::string content0 =
-            "void foo() {}\n";
+        const std::string content0 = "void foo() {}\n";
 
-        withShaderFile("_0", content0, [&] (const std::filesystem::path& templateName0) {
+        withShaderFile("_0", content0, [&](const std::filesystem::path& templateName0) {
             const std::string content1 =
                 "#include \"" + Files::pathToUnicodeString(templateName0) + "\"\n"
                 "void bar() { foo() }\n";
 
-            withShaderFile("_1", content1, [&] (const std::filesystem::path& templateName1) {
+            withShaderFile("_1", content1, [&](const std::filesystem::path& templateName1) {
                 const std::string content2 =
                     "#version 120\n"
                     "#include \"" + Files::pathToUnicodeString(templateName1) + "\"\n"
                     "void main() { bar() }\n";
 
-                withShaderFile(content2, [&] (const std::filesystem::path& templateName2) {
-                    const auto shader = mManager.getShader(Files::pathToUnicodeString(templateName2), mDefines, osg::Shader::VERTEX);
+                withShaderFile(content2, [&](const std::filesystem::path& templateName2) {
+                    const auto shader
+                        = mManager.getShader(Files::pathToUnicodeString(templateName2), mDefines, osg::Shader::VERTEX);
                     ASSERT_TRUE(shader);
-                    const std::string expected =
-                        "#version 120\n"
-                        "#line 0 1\n"
-                        "#line 0 2\n"
-                        "void foo() {}\n"
-                        "\n"
-                        "#line 0 0\n"
-                        "\n"
-                        "void bar() { foo() }\n"
-                        "\n"
-                        "#line 1 0\n"
-                        "\n"
-                        "void main() { bar() }\n";
+                    const std::string expected
+                        = "#version 120\n"
+                          "#line 0 1\n"
+                          "#line 0 2\n"
+                          "void foo() {}\n"
+                          "\n"
+                          "#line 0 0\n"
+                          "\n"
+                          "void bar() { foo() }\n"
+                          "\n"
+                          "#line 1 0\n"
+                          "\n"
+                          "void main() { bar() }\n";
                     EXPECT_EQ(shader->getShaderSource(), expected);
                 });
             });
@@ -106,137 +104,135 @@ namespace
 
     TEST_F(ShaderManagerTest, get_shader_should_replace_defines)
     {
-        const std::string content =
-            "#version 120\n"
-            "#define FLAG @flag\n"
-            "void main() {}\n"
-        ;
+        const std::string content
+            = "#version 120\n"
+              "#define FLAG @flag\n"
+              "void main() {}\n";
 
-        withShaderFile(content, [&] (const std::filesystem::path& templateName) {
+        withShaderFile(content, [&](const std::filesystem::path& templateName) {
             mDefines["flag"] = "1";
-            const auto shader = mManager.getShader(Files::pathToUnicodeString(templateName), mDefines, osg::Shader::VERTEX);
+            const auto shader
+                = mManager.getShader(Files::pathToUnicodeString(templateName), mDefines, osg::Shader::VERTEX);
             ASSERT_TRUE(shader);
-            const std::string expected =
-                "#version 120\n"
-                "#define FLAG 1\n"
-                "void main() {}\n";
+            const std::string expected
+                = "#version 120\n"
+                  "#define FLAG 1\n"
+                  "void main() {}\n";
             EXPECT_EQ(shader->getShaderSource(), expected);
         });
     }
 
     TEST_F(ShaderManagerTest, get_shader_should_expand_loop)
     {
-        const std::string content =
-            "#version 120\n"
-            "@foreach index @list\n"
-            "    varying vec4 foo@index;\n"
-            "@endforeach\n"
-            "void main() {}\n"
-        ;
-
-        withShaderFile(content, [&] (const std::filesystem::path& templateName) {
+        const std::string content
+            = "#version 120\n"
+              "@foreach index @list\n"
+              "    varying vec4 foo@index;\n"
+              "@endforeach\n"
+              "void main() {}\n";
+
+        withShaderFile(content, [&](const std::filesystem::path& templateName) {
             mDefines["list"] = "1,2,3";
-            const auto shader = mManager.getShader(Files::pathToUnicodeString(templateName), mDefines, osg::Shader::VERTEX);
+            const auto shader
+                = mManager.getShader(Files::pathToUnicodeString(templateName), mDefines, osg::Shader::VERTEX);
             ASSERT_TRUE(shader);
-            const std::string expected =
-                "#version 120\n"
-                "    varying vec4 foo1;\n"
-                "    varying vec4 foo2;\n"
-                "    varying vec4 foo3;\n"
-                "\n"
-                "#line 5\n"
-                "void main() {}\n";
+            const std::string expected
+                = "#version 120\n"
+                  "    varying vec4 foo1;\n"
+                  "    varying vec4 foo2;\n"
+                  "    varying vec4 foo3;\n"
+                  "\n"
+                  "#line 5\n"
+                  "void main() {}\n";
             EXPECT_EQ(shader->getShaderSource(), expected);
         });
     }
 
     TEST_F(ShaderManagerTest, get_shader_should_replace_loops_with_conditions)
     {
-        const std::string content =
-            "#version 120\n"
-            "@foreach index @list\n"
-            "    varying vec4 foo@index;\n"
-            "@endforeach\n"
-            "void main()\n"
-            "{\n"
-            "#ifdef BAR\n"
-            "@foreach index @list\n"
-            "    foo@index = vec4(1.0);\n"
-            "@endforeach\n"
-            "#elif BAZ\n"
-            "@foreach index @list\n"
-            "    foo@index = vec4(2.0);\n"
-            "@endforeach\n"
-            "#else\n"
-            "@foreach index @list\n"
-            "    foo@index = vec4(3.0);\n"
-            "@endforeach\n"
-            "#endif\n"
-            "}\n"
-        ;
-
-        withShaderFile(content, [&] (const std::filesystem::path& templateName) {
+        const std::string content
+            = "#version 120\n"
+              "@foreach index @list\n"
+              "    varying vec4 foo@index;\n"
+              "@endforeach\n"
+              "void main()\n"
+              "{\n"
+              "#ifdef BAR\n"
+              "@foreach index @list\n"
+              "    foo@index = vec4(1.0);\n"
+              "@endforeach\n"
+              "#elif BAZ\n"
+              "@foreach index @list\n"
+              "    foo@index = vec4(2.0);\n"
+              "@endforeach\n"
+              "#else\n"
+              "@foreach index @list\n"
+              "    foo@index = vec4(3.0);\n"
+              "@endforeach\n"
+              "#endif\n"
+              "}\n";
+
+        withShaderFile(content, [&](const std::filesystem::path& templateName) {
             mDefines["list"] = "1,2,3";
-            const auto shader = mManager.getShader(Files::pathToUnicodeString(templateName), mDefines, osg::Shader::VERTEX);
+            const auto shader
+                = mManager.getShader(Files::pathToUnicodeString(templateName), mDefines, osg::Shader::VERTEX);
             ASSERT_TRUE(shader);
-            const std::string expected =
-                "#version 120\n"
-                "    varying vec4 foo1;\n"
-                "    varying vec4 foo2;\n"
-                "    varying vec4 foo3;\n"
-                "\n"
-                "#line 5\n"
-                "void main()\n"
-                "{\n"
-                "#ifdef BAR\n"
-                "    foo1 = vec4(1.0);\n"
-                "    foo2 = vec4(1.0);\n"
-                "    foo3 = vec4(1.0);\n"
-                "\n"
-                "#line 11\n"
-                "#elif BAZ\n"
-                "#line 12\n"
-                "    foo1 = vec4(2.0);\n"
-                "    foo2 = vec4(2.0);\n"
-                "    foo3 = vec4(2.0);\n"
-                "\n"
-                "#line 15\n"
-                "#else\n"
-                "#line 16\n"
-                "    foo1 = vec4(3.0);\n"
-                "    foo2 = vec4(3.0);\n"
-                "    foo3 = vec4(3.0);\n"
-                "\n"
-                "#line 19\n"
-                "#endif\n"
-                "#line 20\n"
-                "}\n";
+            const std::string expected
+                = "#version 120\n"
+                  "    varying vec4 foo1;\n"
+                  "    varying vec4 foo2;\n"
+                  "    varying vec4 foo3;\n"
+                  "\n"
+                  "#line 5\n"
+                  "void main()\n"
+                  "{\n"
+                  "#ifdef BAR\n"
+                  "    foo1 = vec4(1.0);\n"
+                  "    foo2 = vec4(1.0);\n"
+                  "    foo3 = vec4(1.0);\n"
+                  "\n"
+                  "#line 11\n"
+                  "#elif BAZ\n"
+                  "#line 12\n"
+                  "    foo1 = vec4(2.0);\n"
+                  "    foo2 = vec4(2.0);\n"
+                  "    foo3 = vec4(2.0);\n"
+                  "\n"
+                  "#line 15\n"
+                  "#else\n"
+                  "#line 16\n"
+                  "    foo1 = vec4(3.0);\n"
+                  "    foo2 = vec4(3.0);\n"
+                  "    foo3 = vec4(3.0);\n"
+                  "\n"
+                  "#line 19\n"
+                  "#endif\n"
+                  "#line 20\n"
+                  "}\n";
             EXPECT_EQ(shader->getShaderSource(), expected);
         });
     }
 
     TEST_F(ShaderManagerTest, get_shader_should_fail_on_absent_template_parameters_in_single_line_comments)
     {
-        const std::string content =
-            "#version 120\n"
-            "// #define FLAG @flag\n"
-            "void main() {}\n"
-        ;
+        const std::string content
+            = "#version 120\n"
+              "// #define FLAG @flag\n"
+              "void main() {}\n";
 
-        withShaderFile(content, [&] (const std::filesystem::path& templateName) {
+        withShaderFile(content, [&](const std::filesystem::path& templateName) {
             EXPECT_FALSE(mManager.getShader(Files::pathToUnicodeString(templateName), mDefines, osg::Shader::VERTEX));
         });
     }
 
     TEST_F(ShaderManagerTest, get_shader_should_fail_on_absent_template_parameter_in_multi_line_comments)
     {
-        const std::string content =
-            "#version 120\n"
-            "/* #define FLAG @flag */\n"
-            "void main() {}\n"
-        ;
+        const std::string content
+            = "#version 120\n"
+              "/* #define FLAG @flag */\n"
+              "void main() {}\n";
 
-        withShaderFile(content, [&] (const std::filesystem::path& templateName) {
+        withShaderFile(content, [&](const std::filesystem::path& templateName) {
             EXPECT_FALSE(mManager.getShader(Files::pathToUnicodeString(templateName), mDefines, osg::Shader::VERTEX));
         });
     }
diff --git a/apps/openmw_test_suite/sqlite3/request.cpp b/apps/openmw_test_suite/sqlite3/request.cpp
index 3bcf658c0d..23efe9dc2e 100644
--- a/apps/openmw_test_suite/sqlite3/request.cpp
+++ b/apps/openmw_test_suite/sqlite3/request.cpp
@@ -2,8 +2,8 @@
 #include <components/sqlite3/request.hpp>
 #include <components/sqlite3/statement.hpp>
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 #include <limits>
 #include <tuple>
@@ -59,7 +59,10 @@ namespace
     {
         std::string mQuery;
 
-        explicit GetAll(const std::string& table) : mQuery("SELECT value FROM " + table + " ORDER BY value") {}
+        explicit GetAll(const std::string& table)
+            : mQuery("SELECT value FROM " + table + " ORDER BY value")
+        {
+        }
 
         std::string_view text() noexcept { return mQuery; }
         static void bind(sqlite3&, sqlite3_stmt&) {}
@@ -70,7 +73,10 @@ namespace
     {
         std::string mQuery;
 
-        explicit GetExact(const std::string& table) : mQuery("SELECT value FROM " + table + " WHERE value = :value") {}
+        explicit GetExact(const std::string& table)
+            : mQuery("SELECT value FROM " + table + " WHERE value = :value")
+        {
+        }
 
         std::string_view text() noexcept { return mQuery; }
 
@@ -102,7 +108,10 @@ namespace
 
         Int() = default;
 
-        explicit Int(int value) : mValue(value) {}
+        explicit Int(int value)
+            : mValue(value)
+        {
+        }
 
         Int& operator=(int value)
         {
@@ -110,10 +119,7 @@ namespace
             return *this;
         }
 
-        friend bool operator==(const Int& l, const Int& r)
-        {
-            return l.mValue == r.mValue;
-        }
+        friend bool operator==(const Int& l, const Int& r) { return l.mValue == r.mValue; }
     };
 
     constexpr const char schema[] = R"(
@@ -130,7 +136,7 @@ namespace
 
     TEST_F(Sqlite3RequestTest, executeShouldSupportInt)
     {
-        Statement insert(*mDb, InsertInt<int> {});
+        Statement insert(*mDb, InsertInt<int>{});
         EXPECT_EQ(execute(*mDb, insert, 13), 1);
         EXPECT_EQ(execute(*mDb, insert, 42), 1);
         Statement select(*mDb, GetAll("ints"));
@@ -141,7 +147,7 @@ namespace
 
     TEST_F(Sqlite3RequestTest, executeShouldSupportInt64)
     {
-        Statement insert(*mDb, InsertInt<std::int64_t> {});
+        Statement insert(*mDb, InsertInt<std::int64_t>{});
         const std::int64_t value = 1099511627776;
         EXPECT_EQ(execute(*mDb, insert, value), 1);
         Statement select(*mDb, GetAll("ints"));
@@ -152,7 +158,7 @@ namespace
 
     TEST_F(Sqlite3RequestTest, executeShouldSupportReal)
     {
-        Statement insert(*mDb, InsertReal {});
+        Statement insert(*mDb, InsertReal{});
         EXPECT_EQ(execute(*mDb, insert, 3.14), 1);
         Statement select(*mDb, GetAll("reals"));
         std::vector<std::tuple<double>> result;
@@ -162,7 +168,7 @@ namespace
 
     TEST_F(Sqlite3RequestTest, executeShouldSupportText)
     {
-        Statement insert(*mDb, InsertText {});
+        Statement insert(*mDb, InsertText{});
         const std::string text = "foo";
         EXPECT_EQ(execute(*mDb, insert, text), 1);
         Statement select(*mDb, GetAll("texts"));
@@ -173,8 +179,8 @@ namespace
 
     TEST_F(Sqlite3RequestTest, executeShouldSupportBlob)
     {
-        Statement insert(*mDb, InsertBlob {});
-        const std::vector<std::byte> blob({std::byte(42), std::byte(13)});
+        Statement insert(*mDb, InsertBlob{});
+        const std::vector<std::byte> blob({ std::byte(42), std::byte(13) });
         EXPECT_EQ(execute(*mDb, insert, blob), 1);
         Statement select(*mDb, GetAll("blobs"));
         std::vector<std::tuple<std::vector<std::byte>>> result;
@@ -184,7 +190,7 @@ namespace
 
     TEST_F(Sqlite3RequestTest, requestShouldSupportInt)
     {
-        Statement insert(*mDb, InsertInt<int> {});
+        Statement insert(*mDb, InsertInt<int>{});
         const int value = 42;
         EXPECT_EQ(execute(*mDb, insert, value), 1);
         Statement select(*mDb, GetExact<int>("ints"));
@@ -195,7 +201,7 @@ namespace
 
     TEST_F(Sqlite3RequestTest, requestShouldSupportInt64)
     {
-        Statement insert(*mDb, InsertInt<std::int64_t> {});
+        Statement insert(*mDb, InsertInt<std::int64_t>{});
         const std::int64_t value = 1099511627776;
         EXPECT_EQ(execute(*mDb, insert, value), 1);
         Statement select(*mDb, GetExact<std::int64_t>("ints"));
@@ -206,7 +212,7 @@ namespace
 
     TEST_F(Sqlite3RequestTest, requestShouldSupportReal)
     {
-        Statement insert(*mDb, InsertReal {});
+        Statement insert(*mDb, InsertReal{});
         const double value = 3.14;
         EXPECT_EQ(execute(*mDb, insert, value), 1);
         Statement select(*mDb, GetExact<double>("reals"));
@@ -217,7 +223,7 @@ namespace
 
     TEST_F(Sqlite3RequestTest, requestShouldSupportText)
     {
-        Statement insert(*mDb, InsertText {});
+        Statement insert(*mDb, InsertText{});
         const std::string text = "foo";
         EXPECT_EQ(execute(*mDb, insert, text), 1);
         Statement select(*mDb, GetExact<std::string>("texts"));
@@ -228,8 +234,8 @@ namespace
 
     TEST_F(Sqlite3RequestTest, requestShouldSupportBlob)
     {
-        Statement insert(*mDb, InsertBlob {});
-        const std::vector<std::byte> blob({std::byte(42), std::byte(13)});
+        Statement insert(*mDb, InsertBlob{});
+        const std::vector<std::byte> blob({ std::byte(42), std::byte(13) });
         EXPECT_EQ(execute(*mDb, insert, blob), 1);
         Statement select(*mDb, GetExact<std::vector<std::byte>>("blobs"));
         std::vector<std::tuple<std::vector<std::byte>>> result;
@@ -239,7 +245,7 @@ namespace
 
     TEST_F(Sqlite3RequestTest, requestResultShouldSupportNull)
     {
-        Statement select(*mDb, GetNull {});
+        Statement select(*mDb, GetNull{});
         std::vector<std::tuple<void*>> result;
         request(*mDb, select, std::back_inserter(result), std::numeric_limits<std::size_t>::max());
         EXPECT_THAT(result, ElementsAre(std::tuple(nullptr)));
@@ -247,7 +253,7 @@ namespace
 
     TEST_F(Sqlite3RequestTest, requestResultShouldSupportConstructibleFromInt)
     {
-        Statement insert(*mDb, InsertInt<int> {});
+        Statement insert(*mDb, InsertInt<int>{});
         const int value = 42;
         EXPECT_EQ(execute(*mDb, insert, value), 1);
         Statement select(*mDb, GetExact<int>("ints"));
@@ -258,7 +264,7 @@ namespace
 
     TEST_F(Sqlite3RequestTest, requestShouldLimitOutput)
     {
-        Statement insert(*mDb, InsertInt<int> {});
+        Statement insert(*mDb, InsertInt<int>{});
         EXPECT_EQ(execute(*mDb, insert, 13), 1);
         EXPECT_EQ(execute(*mDb, insert, 42), 1);
         Statement select(*mDb, GetAll("ints"));
diff --git a/apps/openmw_test_suite/sqlite3/statement.cpp b/apps/openmw_test_suite/sqlite3/statement.cpp
index fb53ceebb2..6dae43fe17 100644
--- a/apps/openmw_test_suite/sqlite3/statement.cpp
+++ b/apps/openmw_test_suite/sqlite3/statement.cpp
@@ -17,7 +17,7 @@ namespace
     TEST(Sqlite3StatementTest, makeStatementShouldCreateStatementWithPreparedQuery)
     {
         const auto db = makeDb(":memory:", "CREATE TABLE test ( id INTEGER )");
-        const Statement statement(*db, Query {});
+        const Statement statement(*db, Query{});
         EXPECT_FALSE(statement.mNeedReset);
         EXPECT_NE(statement.mHandle, nullptr);
         EXPECT_EQ(statement.mQuery.text(), "SELECT 1");
diff --git a/apps/openmw_test_suite/sqlite3/transaction.cpp b/apps/openmw_test_suite/sqlite3/transaction.cpp
index 913fd34bce..c994273b5e 100644
--- a/apps/openmw_test_suite/sqlite3/transaction.cpp
+++ b/apps/openmw_test_suite/sqlite3/transaction.cpp
@@ -3,8 +3,8 @@
 #include <components/sqlite3/statement.hpp>
 #include <components/sqlite3/transaction.hpp>
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 #include <limits>
 #include <tuple>
@@ -33,13 +33,13 @@ namespace
 
         void insertId() const
         {
-            Statement insertId(*mDb, InsertId {});
+            Statement insertId(*mDb, InsertId{});
             EXPECT_EQ(execute(*mDb, insertId), 1);
         }
 
         std::vector<std::tuple<int>> getIds() const
         {
-            Statement getIds(*mDb, GetIds {});
+            Statement getIds(*mDb, GetIds{});
             std::vector<std::tuple<int>> result;
             request(*mDb, getIds, std::back_inserter(result), std::numeric_limits<std::size_t>::max());
             return result;
diff --git a/apps/openmw_test_suite/testing_util.hpp b/apps/openmw_test_suite/testing_util.hpp
index 767f775c6b..39eacc3736 100644
--- a/apps/openmw_test_suite/testing_util.hpp
+++ b/apps/openmw_test_suite/testing_util.hpp
@@ -4,9 +4,9 @@
 #include <filesystem>
 #include <sstream>
 
+#include <components/misc/strings/conversion.hpp>
 #include <components/vfs/archive.hpp>
 #include <components/vfs/manager.hpp>
-#include <components/misc/strings/conversion.hpp>
 
 namespace TestingOpenMW
 {
@@ -26,17 +26,14 @@ namespace TestingOpenMW
     class VFSTestFile : public VFS::File
     {
     public:
-        explicit VFSTestFile(std::string content) : mContent(std::move(content)) {}
-
-        Files::IStreamPtr open() override
+        explicit VFSTestFile(std::string content)
+            : mContent(std::move(content))
         {
-            return std::make_unique<std::stringstream>(mContent, std::ios_base::in);
         }
 
-        std::filesystem::path getPath() override
-        {
-            return "TestFile";
-        }
+        Files::IStreamPtr open() override { return std::make_unique<std::stringstream>(mContent, std::ios_base::in); }
+
+        std::filesystem::path getPath() override { return "TestFile"; }
 
     private:
         const std::string mContent;
@@ -46,20 +43,22 @@ namespace TestingOpenMW
     {
         std::map<std::string, VFS::File*> mFiles;
 
-        VFSTestData(std::map<std::string, VFS::File*> files) : mFiles(std::move(files)) {}
+        VFSTestData(std::map<std::string, VFS::File*> files)
+            : mFiles(std::move(files))
+        {
+        }
 
-        void listResources(std::map<std::string, VFS::File*>& out, char (*normalize_function) (char)) override
+        void listResources(std::map<std::string, VFS::File*>& out, char (*normalize_function)(char)) override
         {
             out = mFiles;
         }
 
-        bool contains(const std::string& file, char (*normalize_function) (char)) const override
+        bool contains(const std::string& file, char (*normalize_function)(char)) const override
         {
             return mFiles.count(file) != 0;
         }
 
         std::string getDescription() const override { return "TestData"; }
-
     };
 
     inline std::unique_ptr<VFS::Manager> createTestVFS(std::map<std::string, VFS::File*> files)
@@ -70,8 +69,16 @@ namespace TestingOpenMW
         return vfs;
     }
 
-    #define EXPECT_ERROR(X, ERR_SUBSTR) try { X; FAIL() << "Expected error"; } \
-        catch (std::exception& e) { EXPECT_THAT(e.what(), ::testing::HasSubstr(ERR_SUBSTR)); }
+#define EXPECT_ERROR(X, ERR_SUBSTR)                                                                                    \
+    try                                                                                                                \
+    {                                                                                                                  \
+        X;                                                                                                             \
+        FAIL() << "Expected error";                                                                                    \
+    }                                                                                                                  \
+    catch (std::exception & e)                                                                                         \
+    {                                                                                                                  \
+        EXPECT_THAT(e.what(), ::testing::HasSubstr(ERR_SUBSTR));                                                       \
+    }
 
 }
 
diff --git a/apps/openmw_test_suite/toutf8/toutf8.cpp b/apps/openmw_test_suite/toutf8/toutf8.cpp
index d34a88e087..202c0e4890 100644
--- a/apps/openmw_test_suite/toutf8/toutf8.cpp
+++ b/apps/openmw_test_suite/toutf8/toutf8.cpp
@@ -1,10 +1,10 @@
-#include <components/to_utf8/to_utf8.hpp>
 #include <components/misc/strings/conversion.hpp>
+#include <components/to_utf8/to_utf8.hpp>
 
 #include <gtest/gtest.h>
 
-#include <fstream>
 #include <filesystem>
+#include <fstream>
 
 #ifndef OPENMW_TEST_SUITE_SOURCE_DIR
 #define OPENMW_TEST_SUITE_SOURCE_DIR ""
@@ -26,13 +26,16 @@ namespace
     {
         std::ifstream file;
         file.exceptions(std::ios::failbit | std::ios::badbit);
-        file.open(std::filesystem::path{ OPENMW_TEST_SUITE_SOURCE_DIR } / "toutf8" / "data" / Misc::StringUtils::stringToU8String(fileName));
+        file.open(std::filesystem::path{ OPENMW_TEST_SUITE_SOURCE_DIR } / "toutf8" / "data"
+            / Misc::StringUtils::stringToU8String(fileName));
         std::stringstream buffer;
         buffer << file.rdbuf();
         return buffer.str();
     }
 
-    struct Utf8EncoderTest : TestWithParam<Params> {};
+    struct Utf8EncoderTest : TestWithParam<Params>
+    {
+    };
 
     TEST(Utf8EncoderTest, getUtf8ShouldReturnEmptyAsIs)
     {
@@ -69,7 +72,9 @@ namespace
 
     TEST(Utf8EncoderTest, getUtf8ShouldLookUpUntilEndOfInputForNonAscii)
     {
-        const std::string input("a\x92" "b");
+        const std::string input(
+            "a\x92"
+            "b");
         Utf8Encoder encoder(FromType::WINDOWS_1252);
         const std::string_view result = encoder.getUtf8(std::string_view(input.data(), 2));
         EXPECT_EQ(result, "a\xE2\x80\x99");
@@ -134,10 +139,9 @@ namespace
         EXPECT_EQ(result, expected);
     }
 
-    INSTANTIATE_TEST_SUITE_P(Files, Utf8EncoderTest, Values(
-        Params {ToUTF8::WINDOWS_1251, "russian-win1251.txt", "russian-utf8.txt"},
-        Params {ToUTF8::WINDOWS_1252, "french-win1252.txt", "french-utf8.txt"}
-    ));
+    INSTANTIATE_TEST_SUITE_P(Files, Utf8EncoderTest,
+        Values(Params{ ToUTF8::WINDOWS_1251, "russian-win1251.txt", "russian-utf8.txt" },
+            Params{ ToUTF8::WINDOWS_1252, "french-win1252.txt", "french-utf8.txt" }));
 
     TEST(StatelessUtf8EncoderTest, shouldCleanupBuffer)
     {
@@ -155,7 +159,8 @@ namespace
     {
         std::string buffer;
         StatelessUtf8Encoder encoder(FromType::WINDOWS_1252);
-        const std::string_view utf8 = encoder.getUtf8(std::string_view("long string\x92"), BufferAllocationPolicy::FitToRequiredSize, buffer);
+        const std::string_view utf8
+            = encoder.getUtf8(std::string_view("long string\x92"), BufferAllocationPolicy::FitToRequiredSize, buffer);
         EXPECT_EQ(buffer.size(), utf8.size());
     }
 }
diff --git a/apps/wizard/componentselectionpage.cpp b/apps/wizard/componentselectionpage.cpp
index 207eb59ce5..8104fdc58e 100644
--- a/apps/wizard/componentselectionpage.cpp
+++ b/apps/wizard/componentselectionpage.cpp
@@ -1,13 +1,13 @@
 #include "componentselectionpage.hpp"
 
 #include <QDebug>
-#include <QPushButton>
 #include <QMessageBox>
+#include <QPushButton>
 
 #include "mainwizard.hpp"
 
-Wizard::ComponentSelectionPage::ComponentSelectionPage(QWidget *parent) :
-    QWizardPage(parent)
+Wizard::ComponentSelectionPage::ComponentSelectionPage(QWidget* parent)
+    : QWizardPage(parent)
 {
     mWizard = qobject_cast<MainWizard*>(parent);
 
@@ -18,9 +18,7 @@ Wizard::ComponentSelectionPage::ComponentSelectionPage(QWidget *parent) :
 
     registerField(QLatin1String("installation.components"), componentsList);
 
-    connect(componentsList, &ComponentListWidget::itemChanged,
-            this, &ComponentSelectionPage::updateButton);
-
+    connect(componentsList, &ComponentListWidget::itemChanged, this, &ComponentSelectionPage::updateButton);
 }
 
 void Wizard::ComponentSelectionPage::updateButton(QListWidgetItem*)
@@ -30,21 +28,26 @@ void Wizard::ComponentSelectionPage::updateButton(QListWidgetItem*)
 
     bool unchecked = true;
 
-    for (int i =0; i < componentsList->count(); ++i) {
-        QListWidgetItem *item = componentsList->item(i);
+    for (int i = 0; i < componentsList->count(); ++i)
+    {
+        QListWidgetItem* item = componentsList->item(i);
 
         if (!item)
             continue;
 
-        if (item->checkState() == Qt::Checked) {
+        if (item->checkState() == Qt::Checked)
+        {
             unchecked = false;
         }
     }
 
-    if (unchecked) {
+    if (unchecked)
+    {
         setCommitPage(false);
         setButtonText(QWizard::NextButton, tr("&Skip"));
-    } else {
+    }
+    else
+    {
         setCommitPage(true);
     }
 }
@@ -55,9 +58,9 @@ void Wizard::ComponentSelectionPage::initializePage()
 
     QString path(field(QLatin1String("installation.path")).toString());
 
-    QListWidgetItem *morrowindItem = new QListWidgetItem(QLatin1String("Morrowind"));
-    QListWidgetItem *tribunalItem = new QListWidgetItem(QLatin1String("Tribunal"));
-    QListWidgetItem *bloodmoonItem = new QListWidgetItem(QLatin1String("Bloodmoon"));
+    QListWidgetItem* morrowindItem = new QListWidgetItem(QLatin1String("Morrowind"));
+    QListWidgetItem* tribunalItem = new QListWidgetItem(QLatin1String("Tribunal"));
+    QListWidgetItem* bloodmoonItem = new QListWidgetItem(QLatin1String("Bloodmoon"));
 
     if (field(QLatin1String("installation.retailDisc")).toBool() == true)
     {
@@ -72,35 +75,46 @@ void Wizard::ComponentSelectionPage::initializePage()
         bloodmoonItem->setFlags(bloodmoonItem->flags() | Qt::ItemIsUserCheckable);
         bloodmoonItem->setData(Qt::CheckStateRole, Qt::Checked);
         componentsList->addItem(bloodmoonItem);
-    } else {
+    }
+    else
+    {
 
-        if (mWizard->mInstallations[path].hasMorrowind) {
+        if (mWizard->mInstallations[path].hasMorrowind)
+        {
             morrowindItem->setText(tr("Morrowind\t\t(installed)"));
             morrowindItem->setFlags((morrowindItem->flags() & ~Qt::ItemIsEnabled) | Qt::ItemIsUserCheckable);
             morrowindItem->setData(Qt::CheckStateRole, Qt::Unchecked);
-        } else {
+        }
+        else
+        {
             morrowindItem->setText(tr("Morrowind"));
             morrowindItem->setData(Qt::CheckStateRole, Qt::Checked);
         }
 
         componentsList->addItem(morrowindItem);
 
-        if (mWizard->mInstallations[path].hasTribunal) {
+        if (mWizard->mInstallations[path].hasTribunal)
+        {
             tribunalItem->setText(tr("Tribunal\t\t(installed)"));
             tribunalItem->setFlags((tribunalItem->flags() & ~Qt::ItemIsEnabled) | Qt::ItemIsUserCheckable);
             tribunalItem->setData(Qt::CheckStateRole, Qt::Unchecked);
-        } else {
+        }
+        else
+        {
             tribunalItem->setText(tr("Tribunal"));
             tribunalItem->setData(Qt::CheckStateRole, Qt::Checked);
         }
 
         componentsList->addItem(tribunalItem);
 
-        if (mWizard->mInstallations[path].hasBloodmoon) {
+        if (mWizard->mInstallations[path].hasBloodmoon)
+        {
             bloodmoonItem->setText(tr("Bloodmoon\t\t(installed)"));
             bloodmoonItem->setFlags((bloodmoonItem->flags() & ~Qt::ItemIsEnabled) | Qt::ItemIsUserCheckable);
             bloodmoonItem->setData(Qt::CheckStateRole, Qt::Unchecked);
-        } else {
+        }
+        else
+        {
             bloodmoonItem->setText(tr("Bloodmoon"));
             bloodmoonItem->setData(Qt::CheckStateRole, Qt::Checked);
         }
@@ -114,9 +128,10 @@ bool Wizard::ComponentSelectionPage::validatePage()
     QStringList components(field(QLatin1String("installation.components")).toStringList());
     QString path(field(QLatin1String("installation.path")).toString());
 
-//    qDebug() << components << path << mWizard->mInstallations[path];
+    //    qDebug() << components << path << mWizard->mInstallations[path];
 
-    if (field(QLatin1String("installation.retailDisc")).toBool() == false) {
+    if (field(QLatin1String("installation.retailDisc")).toBool() == false)
+    {
         if (components.contains(QLatin1String("Tribunal")) && !components.contains(QLatin1String("Bloodmoon")))
         {
             if (mWizard->mInstallations[path].hasBloodmoon)
@@ -125,21 +140,24 @@ bool Wizard::ComponentSelectionPage::validatePage()
                 msgBox.setWindowTitle(tr("About to install Tribunal after Bloodmoon"));
                 msgBox.setIcon(QMessageBox::Information);
                 msgBox.setStandardButtons(QMessageBox::Cancel);
-                msgBox.setText(tr("<html><head/><body><p><b>You are about to install Tribunal</b></p> \
+                msgBox.setText(
+                    tr("<html><head/><body><p><b>You are about to install Tribunal</b></p> \
                                   <p>Bloodmoon is already installed on your computer.</p> \
                                   <p>However, it is recommended that you install Tribunal before Bloodmoon.</p> \
                                   <p>Would you like to re-install Bloodmoon?</p></body></html>"));
 
-                QAbstractButton *reinstallButton = msgBox.addButton(tr("Re-install &Bloodmoon"), QMessageBox::ActionRole);
+                QAbstractButton* reinstallButton
+                    = msgBox.addButton(tr("Re-install &Bloodmoon"), QMessageBox::ActionRole);
                 msgBox.exec();
 
-
-                if (msgBox.clickedButton() == reinstallButton) {
+                if (msgBox.clickedButton() == reinstallButton)
+                {
                     // Force reinstallation
                     mWizard->mInstallations[path].hasBloodmoon = false;
-                    QList<QListWidgetItem*> items = componentsList->findItems(QLatin1String("Bloodmoon"), Qt::MatchStartsWith);
+                    QList<QListWidgetItem*> items
+                        = componentsList->findItems(QLatin1String("Bloodmoon"), Qt::MatchStartsWith);
 
-                    for (QListWidgetItem *item : items)
+                    for (QListWidgetItem* item : items)
                     {
                         item->setText(QLatin1String("Bloodmoon"));
                         item->setCheckState(Qt::Checked);
@@ -157,9 +175,12 @@ bool Wizard::ComponentSelectionPage::validatePage()
 int Wizard::ComponentSelectionPage::nextId() const
 {
 #ifdef OPENMW_USE_UNSHIELD
-    if (isCommitPage()) {
+    if (isCommitPage())
+    {
         return MainWizard::Page_Installation;
-    } else {
+    }
+    else
+    {
         return MainWizard::Page_Import;
     }
 #else
diff --git a/apps/wizard/componentselectionpage.hpp b/apps/wizard/componentselectionpage.hpp
index 961669ab57..eae2dc23bf 100644
--- a/apps/wizard/componentselectionpage.hpp
+++ b/apps/wizard/componentselectionpage.hpp
@@ -11,20 +11,19 @@ namespace Wizard
     {
         Q_OBJECT
     public:
-        ComponentSelectionPage(QWidget *parent);
+        ComponentSelectionPage(QWidget* parent);
 
         int nextId() const override;
         bool validatePage() override;
 
     private slots:
-        void updateButton(QListWidgetItem *item);
+        void updateButton(QListWidgetItem* item);
 
     private:
-        MainWizard *mWizard;
+        MainWizard* mWizard;
 
     protected:
         void initializePage() override;
-
     };
 
 }
diff --git a/apps/wizard/conclusionpage.cpp b/apps/wizard/conclusionpage.cpp
index b1341374d9..a184c745ee 100644
--- a/apps/wizard/conclusionpage.cpp
+++ b/apps/wizard/conclusionpage.cpp
@@ -4,8 +4,8 @@
 
 #include "mainwizard.hpp"
 
-Wizard::ConclusionPage::ConclusionPage(QWidget *parent) :
-    QWizardPage(parent)
+Wizard::ConclusionPage::ConclusionPage(QWidget* parent)
+    : QWizardPage(parent)
 {
     mWizard = qobject_cast<MainWizard*>(parent);
 
@@ -16,7 +16,8 @@ Wizard::ConclusionPage::ConclusionPage(QWidget *parent) :
 void Wizard::ConclusionPage::initializePage()
 {
     // Write the path to openmw.cfg
-    if (field(QLatin1String("installation.retailDisc")).toBool() == true) {
+    if (field(QLatin1String("installation.retailDisc")).toBool() == true)
+    {
         QString path(field(QLatin1String("installation.path")).toString());
         mWizard->addInstallation(path);
     }
@@ -24,7 +25,7 @@ void Wizard::ConclusionPage::initializePage()
     if (!mWizard->mError)
     {
         if ((field(QLatin1String("installation.retailDisc")).toBool() == true)
-                || (field(QLatin1String("installation.import-settings")).toBool() == true))
+            || (field(QLatin1String("installation.import-settings")).toBool() == true))
         {
             qDebug() << "IMPORT SETTINGS";
             mWizard->runSettingsImporter();
@@ -35,14 +36,21 @@ void Wizard::ConclusionPage::initializePage()
     {
         if (field(QLatin1String("installation.retailDisc")).toBool() == true)
         {
-            textLabel->setText(tr("<html><head/><body><p>The OpenMW Wizard successfully installed Morrowind on your computer.</p> \
+            textLabel->setText(
+                tr("<html><head/><body><p>The OpenMW Wizard successfully installed Morrowind on your computer.</p> \
                                   <p>Click Finish to close the Wizard.</p></body></html>"));
-        } else {
-            textLabel->setText(tr("<html><head/><body><p>The OpenMW Wizard successfully modified your existing Morrowind installation.</p> \
+        }
+        else
+        {
+            textLabel->setText(tr(
+                "<html><head/><body><p>The OpenMW Wizard successfully modified your existing Morrowind installation.</p> \
                                   <p>Click Finish to close the Wizard.</p></body></html>"));
         }
-    } else {
-        textLabel->setText(tr("<html><head/><body><p>The OpenMW Wizard failed to install Morrowind on your computer.</p> \
+    }
+    else
+    {
+        textLabel->setText(
+            tr("<html><head/><body><p>The OpenMW Wizard failed to install Morrowind on your computer.</p> \
                               <p>Please report any bugs you might have encountered to our \
                               <a href=\"https://gitlab.com/OpenMW/openmw/issues\">bug tracker</a>.<br/>Make sure to include the installation log.</p><br/></body></html>"));
     }
diff --git a/apps/wizard/conclusionpage.hpp b/apps/wizard/conclusionpage.hpp
index 72af2cceb1..90a1891119 100644
--- a/apps/wizard/conclusionpage.hpp
+++ b/apps/wizard/conclusionpage.hpp
@@ -11,16 +11,15 @@ namespace Wizard
     {
         Q_OBJECT
     public:
-        ConclusionPage(QWidget *parent);
+        ConclusionPage(QWidget* parent);
 
         int nextId() const override;
 
     private:
-        MainWizard *mWizard;
+        MainWizard* mWizard;
 
     protected:
         void initializePage() override;
-
     };
 
 }
diff --git a/apps/wizard/existinginstallationpage.cpp b/apps/wizard/existinginstallationpage.cpp
index fde4a4846b..1f97ad88e0 100644
--- a/apps/wizard/existinginstallationpage.cpp
+++ b/apps/wizard/existinginstallationpage.cpp
@@ -1,25 +1,24 @@
 #include "existinginstallationpage.hpp"
 
-#include <QMessageBox>
+#include <QFile>
 #include <QFileDialog>
 #include <QFileInfo>
-#include <QFile>
+#include <QMessageBox>
 
 #include "mainwizard.hpp"
 
-Wizard::ExistingInstallationPage::ExistingInstallationPage(QWidget *parent) :
-    QWizardPage(parent)
+Wizard::ExistingInstallationPage::ExistingInstallationPage(QWidget* parent)
+    : QWizardPage(parent)
 {
     mWizard = qobject_cast<MainWizard*>(parent);
 
     setupUi(this);
 
     // Add a placeholder item to the list of installations
-    QListWidgetItem *emptyItem = new QListWidgetItem(tr("No existing installations detected"));
+    QListWidgetItem* emptyItem = new QListWidgetItem(tr("No existing installations detected"));
     emptyItem->setFlags(Qt::NoItemFlags);
 
     installationsList->insertItem(0, emptyItem);
-
 }
 
 void Wizard::ExistingInstallationPage::initializePage()
@@ -30,20 +29,18 @@ void Wizard::ExistingInstallationPage::initializePage()
     // Hide the default item if there are installations to choose from
     installationsList->item(0)->setHidden(!paths.isEmpty());
 
-    for (const QString &path : paths)
+    for (const QString& path : paths)
     {
         if (installationsList->findItems(path, Qt::MatchExactly).isEmpty())
         {
-            QListWidgetItem *item = new QListWidgetItem(path);
+            QListWidgetItem* item = new QListWidgetItem(path);
             installationsList->addItem(item);
         }
     }
 
-    connect(installationsList, &QListWidget::currentTextChanged,
-            this, &ExistingInstallationPage::textChanged);
+    connect(installationsList, &QListWidget::currentTextChanged, this, &ExistingInstallationPage::textChanged);
 
-    connect(installationsList, &QListWidget::itemSelectionChanged,
-            this, &ExistingInstallationPage::completeChanged);
+    connect(installationsList, &QListWidget::itemSelectionChanged, this, &ExistingInstallationPage::completeChanged);
 }
 
 bool Wizard::ExistingInstallationPage::validatePage()
@@ -55,30 +52,30 @@ bool Wizard::ExistingInstallationPage::validatePage()
     QString path(field(QLatin1String("installation.path")).toString());
     QFile file(mWizard->mInstallations[path].iniPath);
 
-    if (!file.exists()) {
+    if (!file.exists())
+    {
         QMessageBox msgBox;
         msgBox.setWindowTitle(tr("Error detecting Morrowind configuration"));
         msgBox.setIcon(QMessageBox::Warning);
         msgBox.setStandardButtons(QMessageBox::Cancel);
-        msgBox.setText(QObject::tr("<br><b>Could not find Morrowind.ini</b><br><br> \
+        msgBox.setText(
+            QObject::tr("<br><b>Could not find Morrowind.ini</b><br><br> \
                                    The Wizard needs to update settings in this file.<br><br> \
                                    Press \"Browse...\" to specify the location manually.<br>"));
 
-        QAbstractButton *browseButton2 =
-                msgBox.addButton(QObject::tr("B&rowse..."), QMessageBox::ActionRole);
+        QAbstractButton* browseButton2 = msgBox.addButton(QObject::tr("B&rowse..."), QMessageBox::ActionRole);
 
         msgBox.exec();
 
         QString iniFile;
-        if (msgBox.clickedButton() == browseButton2) {
-            iniFile = QFileDialog::getOpenFileName(
-                        this,
-                        QObject::tr("Select configuration file"),
-                        QDir::currentPath(),
-                        QString(tr("Morrowind configuration file (*.ini)")));
+        if (msgBox.clickedButton() == browseButton2)
+        {
+            iniFile = QFileDialog::getOpenFileName(this, QObject::tr("Select configuration file"), QDir::currentPath(),
+                QString(tr("Morrowind configuration file (*.ini)")));
         }
 
-        if (iniFile.isEmpty()) {
+        if (iniFile.isEmpty())
+        {
             return false; // Cancel was clicked;
         }
 
@@ -92,13 +89,9 @@ bool Wizard::ExistingInstallationPage::validatePage()
 
 void Wizard::ExistingInstallationPage::on_browseButton_clicked()
 {
-    QString selectedFile = QFileDialog::getOpenFileName(
-                this,
-                tr("Select Morrowind.esm (located in Data Files)"),
-                QDir::currentPath(),
-                QString(tr("Morrowind master file (Morrowind.esm)")),
-                nullptr,
-                QFileDialog::DontResolveSymlinks);
+    QString selectedFile
+        = QFileDialog::getOpenFileName(this, tr("Select Morrowind.esm (located in Data Files)"), QDir::currentPath(),
+            QString(tr("Morrowind master file (Morrowind.esm)")), nullptr, QFileDialog::DontResolveSymlinks);
 
     if (selectedFile.isEmpty())
         return;
@@ -114,10 +107,9 @@ void Wizard::ExistingInstallationPage::on_browseButton_clicked()
         msgBox.setWindowTitle(tr("Error detecting Morrowind files"));
         msgBox.setIcon(QMessageBox::Warning);
         msgBox.setStandardButtons(QMessageBox::Ok);
-        msgBox.setText(QObject::tr(
-            "<b>Morrowind.bsa</b> is missing!<br>\
-            Make sure your Morrowind installation is complete."
-        ));
+        msgBox.setText(
+            QObject::tr("<b>Morrowind.bsa</b> is missing!<br>\
+            Make sure your Morrowind installation is complete."));
         msgBox.exec();
         return;
     }
@@ -130,17 +122,20 @@ void Wizard::ExistingInstallationPage::on_browseButton_clicked()
     QString path(QDir::toNativeSeparators(info.absolutePath()));
     QList<QListWidgetItem*> items = installationsList->findItems(path, Qt::MatchExactly);
 
-    if (items.isEmpty()) {
+    if (items.isEmpty())
+    {
         // Path is not yet in the list, add it
         mWizard->addInstallation(path);
 
         // Hide the default item
         installationsList->item(0)->setHidden(true);
 
-        QListWidgetItem *item = new QListWidgetItem(path);
+        QListWidgetItem* item = new QListWidgetItem(path);
         installationsList->addItem(item);
         installationsList->setCurrentItem(item); // Select it too
-    } else {
+    }
+    else
+    {
         installationsList->setCurrentItem(items.first());
     }
 
@@ -148,7 +143,7 @@ void Wizard::ExistingInstallationPage::on_browseButton_clicked()
     emit completeChanged();
 }
 
-void Wizard::ExistingInstallationPage::textChanged(const QString &text)
+void Wizard::ExistingInstallationPage::textChanged(const QString& text)
 {
     // Set the installation path manually, as registerField doesn't work
     // Because it doesn't accept two widgets operating on a single field
@@ -158,9 +153,12 @@ void Wizard::ExistingInstallationPage::textChanged(const QString &text)
 
 bool Wizard::ExistingInstallationPage::isComplete() const
 {
-    if (installationsList->selectionModel()->hasSelection()) {
+    if (installationsList->selectionModel()->hasSelection())
+    {
         return true;
-    } else {
+    }
+    else
+    {
         return false;
     }
 }
@@ -189,7 +187,8 @@ bool Wizard::ExistingInstallationPage::versionIsOK(QString directory_name)
         msgBox.setIcon(QMessageBox::Warning);
         msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
         msgBox.setDefaultButton(QMessageBox::No);
-        msgBox.setText(QObject::tr("<br><b>There may be a more recent version of Morrowind available.</b><br><br>\
+        msgBox.setText(
+            QObject::tr("<br><b>There may be a more recent version of Morrowind available.</b><br><br>\
                               Do you wish to continue anyway?<br>"));
         int ret = msgBox.exec();
         if (ret == QMessageBox::Yes)
diff --git a/apps/wizard/existinginstallationpage.hpp b/apps/wizard/existinginstallationpage.hpp
index 6bdc5df134..c7072217a2 100644
--- a/apps/wizard/existinginstallationpage.hpp
+++ b/apps/wizard/existinginstallationpage.hpp
@@ -13,7 +13,7 @@ namespace Wizard
     {
         Q_OBJECT
     public:
-        ExistingInstallationPage(QWidget *parent);
+        ExistingInstallationPage(QWidget* parent);
 
         int nextId() const override;
         bool isComplete() const override;
@@ -21,11 +21,10 @@ namespace Wizard
 
     private slots:
         void on_browseButton_clicked();
-        void textChanged(const QString &text);
-
+        void textChanged(const QString& text);
 
     private:
-        MainWizard *mWizard;
+        MainWizard* mWizard;
 
         bool versionIsOK(QString directory_name);
 
diff --git a/apps/wizard/importpage.cpp b/apps/wizard/importpage.cpp
index c59ba48e33..008ff060cd 100644
--- a/apps/wizard/importpage.cpp
+++ b/apps/wizard/importpage.cpp
@@ -2,8 +2,8 @@
 
 #include "mainwizard.hpp"
 
-Wizard::ImportPage::ImportPage(QWidget *parent) :
-    QWizardPage(parent)
+Wizard::ImportPage::ImportPage(QWidget* parent)
+    : QWizardPage(parent)
 {
     mWizard = qobject_cast<MainWizard*>(parent);
 
diff --git a/apps/wizard/importpage.hpp b/apps/wizard/importpage.hpp
index b1f26409a3..f76f915848 100644
--- a/apps/wizard/importpage.hpp
+++ b/apps/wizard/importpage.hpp
@@ -11,13 +11,12 @@ namespace Wizard
     {
         Q_OBJECT
     public:
-        ImportPage(QWidget *parent);
+        ImportPage(QWidget* parent);
 
         int nextId() const override;
 
     private:
-        MainWizard *mWizard;
-
+        MainWizard* mWizard;
     };
 
 }
diff --git a/apps/wizard/inisettings.cpp b/apps/wizard/inisettings.cpp
index 198d1df6e7..1521a50e76 100644
--- a/apps/wizard/inisettings.cpp
+++ b/apps/wizard/inisettings.cpp
@@ -1,36 +1,31 @@
 #include "inisettings.hpp"
 
-#include <QTextStream>
+#include <QDebug>
 #include <QFile>
-#include <QStringList>
-#include <QString>
 #include <QRegExp>
-#include <QDebug>
+#include <QString>
+#include <QStringList>
+#include <QTextStream>
 
-Wizard::IniSettings::IniSettings()
-{
-}
+Wizard::IniSettings::IniSettings() {}
 
-Wizard::IniSettings::~IniSettings()
-{
-}
+Wizard::IniSettings::~IniSettings() {}
 
-QStringList Wizard::IniSettings::findKeys(const QString &text)
+QStringList Wizard::IniSettings::findKeys(const QString& text)
 {
     QStringList result;
 
-    for (const QString &key : mSettings.keys())
+    for (const QString& key : mSettings.keys())
     {
 
         if (key.startsWith(text))
             result << key;
-
     }
 
     return result;
 }
 
-bool Wizard::IniSettings::readFile(QTextStream &stream)
+bool Wizard::IniSettings::readFile(QTextStream& stream)
 {
     // Look for a square bracket, "'\\["
     // that has one or more "not nothing" in it, "([^]]+)"
@@ -71,7 +66,7 @@ bool Wizard::IniSettings::readFile(QTextStream &stream)
     return true;
 }
 
-bool Wizard::IniSettings::writeFile(const QString &path, QTextStream &stream)
+bool Wizard::IniSettings::writeFile(const QString& path, QTextStream& stream)
 {
     // Look for a square bracket, "'\\["
     // that has one or more "not nothing" in it, "([^]]+)"
@@ -88,19 +83,24 @@ bool Wizard::IniSettings::writeFile(const QString &path, QTextStream &stream)
     QString currentSection;
     QString buffer;
 
-    while (!stream.atEnd()) {
+    while (!stream.atEnd())
+    {
 
         const QString line(stream.readLine());
 
-        if (line.isEmpty() || line.startsWith(QLatin1Char(';'))) {
+        if (line.isEmpty() || line.startsWith(QLatin1Char(';')))
+        {
             buffer.append(line + QLatin1String("\n"));
             continue;
         }
 
-        if (sectionRe.exactMatch(line)) {
+        if (sectionRe.exactMatch(line))
+        {
             buffer.append(line + QLatin1String("\n"));
             currentSection = sectionRe.cap(1);
-        } else  if (keyRe.indexIn(line) != -1) {
+        }
+        else if (keyRe.indexIn(line) != -1)
+        {
             QString key(keyRe.cap(1).trimmed());
             QString lookupKey(key);
 
@@ -115,7 +115,8 @@ bool Wizard::IniSettings::writeFile(const QString &path, QTextStream &stream)
 
     // Add the new settings to the buffer
     QHashIterator<QString, QVariant> i(mSettings);
-    while (i.hasNext()) {
+    while (i.hasNext())
+    {
         i.next();
 
         QStringList fullKey(i.key().split(QLatin1Char('/')));
@@ -125,7 +126,8 @@ bool Wizard::IniSettings::writeFile(const QString &path, QTextStream &stream)
         const QString& key(fullKey.at(1));
 
         int index = buffer.lastIndexOf(section);
-        if (index == -1) {
+        if (index == -1)
+        {
             // Add the section to the end of the file, because it's not found
             buffer.append(QString("\n%1\n").arg(section));
             index = buffer.lastIndexOf(section);
@@ -134,12 +136,15 @@ bool Wizard::IniSettings::writeFile(const QString &path, QTextStream &stream)
         // Look for the next section
         index = buffer.indexOf(QLatin1Char('['), index + 1);
 
-        if (index == -1 ) {
+        if (index == -1)
+        {
             // We are at the last section, append it to the bottom of the file
             buffer.append(QString("\n%1=%2").arg(key, i.value().toString()));
             mSettings.remove(i.key());
             continue;
-        } else {
+        }
+        else
+        {
             // Not at last section, add the key at the index
             buffer.insert(index - 1, QString("\n%1=%2").arg(key, i.value().toString()));
             mSettings.remove(i.key());
@@ -149,7 +154,8 @@ bool Wizard::IniSettings::writeFile(const QString &path, QTextStream &stream)
     // Now we reopen the file, this time we write
     QFile file(path);
 
-    if (file.open(QIODevice::ReadWrite | QIODevice::Truncate | QIODevice::Text)) {
+    if (file.open(QIODevice::ReadWrite | QIODevice::Truncate | QIODevice::Text))
+    {
         QTextStream in(&file);
         in.setCodec(stream.codec());
 
@@ -157,14 +163,16 @@ bool Wizard::IniSettings::writeFile(const QString &path, QTextStream &stream)
         in << buffer;
         file.flush();
         file.close();
-    } else {
+    }
+    else
+    {
         return false;
     }
 
     return true;
 }
 
-bool Wizard::IniSettings::parseInx(const QString &path)
+bool Wizard::IniSettings::parseInx(const QString& path)
 {
     QFile file(path);
 
@@ -175,7 +183,8 @@ bool Wizard::IniSettings::parseInx(const QString &path)
         const QByteArray pattern("\x21\x00\x1A\x01\x04\x00\x04\x97\xFF\x06", 10);
 
         int i = 0;
-        while ((i = data.indexOf(pattern, i)) != -1) {
+        while ((i = data.indexOf(pattern, i)) != -1)
+        {
 
             int next = data.indexOf(pattern, i + 1);
             if (next == -1)
@@ -184,7 +193,8 @@ bool Wizard::IniSettings::parseInx(const QString &path)
             QByteArray array(data.mid(i, (next - i)));
 
             // Skip some invalid entries
-            if (array.contains("\x04\x96\xFF")) {
+            if (array.contains("\x04\x96\xFF"))
+            {
                 ++i;
                 continue;
             }
@@ -208,7 +218,9 @@ bool Wizard::IniSettings::parseInx(const QString &path)
         }
 
         file.close();
-    } else {
+    }
+    else
+    {
         qDebug() << "Failed to open INX file: " << path;
         return false;
     }
diff --git a/apps/wizard/inisettings.hpp b/apps/wizard/inisettings.hpp
index d425a9b1b3..7552109b79 100644
--- a/apps/wizard/inisettings.hpp
+++ b/apps/wizard/inisettings.hpp
@@ -17,36 +17,26 @@ namespace Wizard
         explicit IniSettings();
         ~IniSettings();
 
-        inline QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const
+        inline QVariant value(const QString& key, const QVariant& defaultValue = QVariant()) const
         {
             return mSettings.value(key, defaultValue);
         }
 
-        inline QList<QVariant> values() const
-        {
-            return mSettings.values();
-        }
+        inline QList<QVariant> values() const { return mSettings.values(); }
 
-        inline void setValue(const QString &key, const QVariant &value)
-        {
-            mSettings.insert(key, value);
-        }
+        inline void setValue(const QString& key, const QVariant& value) { mSettings.insert(key, value); }
 
-        inline void remove(const QString &key)
-        {
-            mSettings.remove(key);
-        }
+        inline void remove(const QString& key) { mSettings.remove(key); }
 
-        QStringList findKeys(const QString &text);
+        QStringList findKeys(const QString& text);
 
-        bool readFile(QTextStream &stream);
-        bool writeFile(const QString &path, QTextStream &stream);
+        bool readFile(QTextStream& stream);
+        bool writeFile(const QString& path, QTextStream& stream);
 
-        bool parseInx(const QString &path);
+        bool parseInx(const QString& path);
 
     private:
-
-        int getLastNewline(const QString &buffer, int from);
+        int getLastNewline(const QString& buffer, int from);
 
         SettingsMap mSettings;
     };
diff --git a/apps/wizard/installationpage.cpp b/apps/wizard/installationpage.cpp
index 4d330d4893..0f9860da9a 100644
--- a/apps/wizard/installationpage.cpp
+++ b/apps/wizard/installationpage.cpp
@@ -1,15 +1,15 @@
 #include "installationpage.hpp"
 
-#include <QTextCodec>
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QTextCodec>
 #include <QThread>
 
 #include "mainwizard.hpp"
 
-Wizard::InstallationPage::InstallationPage(QWidget *parent, Config::GameSettings &gameSettings) :
-    QWizardPage(parent),
-    mGameSettings(gameSettings)
+Wizard::InstallationPage::InstallationPage(QWidget* parent, Config::GameSettings& gameSettings)
+    : QWizardPage(parent)
+    , mGameSettings(gameSettings)
 {
     mWizard = qobject_cast<MainWizard*>(parent);
 
@@ -21,40 +21,37 @@ Wizard::InstallationPage::InstallationPage(QWidget *parent, Config::GameSettings
     mUnshield = std::make_unique<UnshieldWorker>(mGameSettings.value("morrowind-bsa-filesize").toLongLong());
     mUnshield->moveToThread(mThread.get());
 
-    connect(mThread.get(), &QThread::started,
-            mUnshield.get(), &UnshieldWorker::extract);
+    connect(mThread.get(), &QThread::started, mUnshield.get(), &UnshieldWorker::extract);
 
-    connect(mUnshield.get(), &UnshieldWorker::finished,
-            mThread.get(), &QThread::quit);
+    connect(mUnshield.get(), &UnshieldWorker::finished, mThread.get(), &QThread::quit);
 
-    connect(mUnshield.get(), &UnshieldWorker::finished,
-            this, &InstallationPage::installationFinished, Qt::QueuedConnection);
+    connect(mUnshield.get(), &UnshieldWorker::finished, this, &InstallationPage::installationFinished,
+        Qt::QueuedConnection);
 
-    connect(mUnshield.get(), &UnshieldWorker::error,
-            this, &InstallationPage::installationError, Qt::QueuedConnection);
+    connect(mUnshield.get(), &UnshieldWorker::error, this, &InstallationPage::installationError, Qt::QueuedConnection);
 
-    connect(mUnshield.get(), &UnshieldWorker::textChanged,
-            installProgressLabel, &QLabel::setText, Qt::QueuedConnection);
+    connect(
+        mUnshield.get(), &UnshieldWorker::textChanged, installProgressLabel, &QLabel::setText, Qt::QueuedConnection);
 
-    connect(mUnshield.get(), &UnshieldWorker::textChanged,
-            logTextEdit, &QPlainTextEdit::appendPlainText,  Qt::QueuedConnection);
+    connect(mUnshield.get(), &UnshieldWorker::textChanged, logTextEdit, &QPlainTextEdit::appendPlainText,
+        Qt::QueuedConnection);
 
-    connect(mUnshield.get(), &UnshieldWorker::textChanged,
-            mWizard, &MainWizard::addLogText,  Qt::QueuedConnection);
+    connect(mUnshield.get(), &UnshieldWorker::textChanged, mWizard, &MainWizard::addLogText, Qt::QueuedConnection);
 
-    connect(mUnshield.get(), &UnshieldWorker::progressChanged,
-            installProgressBar, &QProgressBar::setValue,  Qt::QueuedConnection);
+    connect(mUnshield.get(), &UnshieldWorker::progressChanged, installProgressBar, &QProgressBar::setValue,
+        Qt::QueuedConnection);
 
-    connect(mUnshield.get(), &UnshieldWorker::requestFileDialog,
-            this, &InstallationPage::showFileDialog, Qt::QueuedConnection);
+    connect(mUnshield.get(), &UnshieldWorker::requestFileDialog, this, &InstallationPage::showFileDialog,
+        Qt::QueuedConnection);
 
-    connect(mUnshield.get(), &UnshieldWorker::requestOldVersionDialog,
-                this, &InstallationPage::showOldVersionDialog, Qt::QueuedConnection);
+    connect(mUnshield.get(), &UnshieldWorker::requestOldVersionDialog, this, &InstallationPage::showOldVersionDialog,
+        Qt::QueuedConnection);
 }
 
 Wizard::InstallationPage::~InstallationPage()
 {
-    if (mThread->isRunning()) {
+    if (mThread->isRunning())
+    {
         mUnshield->stopWorker();
         mThread->quit();
         mThread->wait();
@@ -75,15 +72,16 @@ void Wizard::InstallationPage::initializePage()
     // That way installing all three components would yield 300%
     // When one component is done the bar will be filled by 33%
 
-    if (field(QLatin1String("installation.retailDisc")).toBool() == true) {
+    if (field(QLatin1String("installation.retailDisc")).toBool() == true)
+    {
         installProgressBar->setMaximum((components.count() * 100));
-    } else {
-        if (components.contains(QLatin1String("Tribunal"))
-                && !mWizard->mInstallations[path].hasTribunal)
+    }
+    else
+    {
+        if (components.contains(QLatin1String("Tribunal")) && !mWizard->mInstallations[path].hasTribunal)
             installProgressBar->setMaximum(100);
 
-        if (components.contains(QLatin1String("Bloodmoon"))
-                && !mWizard->mInstallations[path].hasBloodmoon)
+        if (components.contains(QLatin1String("Bloodmoon")) && !mWizard->mInstallations[path].hasBloodmoon)
             installProgressBar->setMaximum(installProgressBar->maximum() + 100);
     }
 
@@ -105,16 +103,16 @@ void Wizard::InstallationPage::startInstallation()
 
         if (components.contains(QLatin1String("Bloodmoon")))
             mUnshield->setInstallComponent(Wizard::Component_Bloodmoon, true);
-    } else {
+    }
+    else
+    {
         // Morrowind should already be installed
         mUnshield->setInstallComponent(Wizard::Component_Morrowind, false);
 
-        if (components.contains(QLatin1String("Tribunal"))
-                && !mWizard->mInstallations[path].hasTribunal)
+        if (components.contains(QLatin1String("Tribunal")) && !mWizard->mInstallations[path].hasTribunal)
             mUnshield->setInstallComponent(Wizard::Component_Tribunal, true);
 
-        if (components.contains(QLatin1String("Bloodmoon"))
-                && !mWizard->mInstallations[path].hasBloodmoon)
+        if (components.contains(QLatin1String("Bloodmoon")) && !mWizard->mInstallations[path].hasBloodmoon)
             mUnshield->setInstallComponent(Wizard::Component_Bloodmoon, true);
 
         // Set the location of the Morrowind.ini to update
@@ -128,11 +126,16 @@ void Wizard::InstallationPage::startInstallation()
     // Set the right codec to use for Morrowind.ini
     QString language(field(QLatin1String("installation.language")).toString());
 
-    if (language == QLatin1String("Polish")) {
+    if (language == QLatin1String("Polish"))
+    {
         mUnshield->setIniCodec(QTextCodec::codecForName("windows-1250"));
-    } else if (language == QLatin1String("Russian")) {
+    }
+    else if (language == QLatin1String("Russian"))
+    {
         mUnshield->setIniCodec(QTextCodec::codecForName("windows-1251"));
-    }  else {
+    }
+    else
+    {
         mUnshield->setIniCodec(QTextCodec::codecForName("windows-1252"));
     }
 
@@ -142,17 +145,18 @@ void Wizard::InstallationPage::startInstallation()
 void Wizard::InstallationPage::showFileDialog(Wizard::Component component)
 {
     QString name;
-    switch (component) {
-
-    case Wizard::Component_Morrowind:
-        name = QLatin1String("Morrowind");
-        break;
-    case Wizard::Component_Tribunal:
-        name = QLatin1String("Tribunal");
-        break;
-    case Wizard::Component_Bloodmoon:
-        name = QLatin1String("Bloodmoon");
-        break;
+    switch (component)
+    {
+
+        case Wizard::Component_Morrowind:
+            name = QLatin1String("Morrowind");
+            break;
+        case Wizard::Component_Tribunal:
+            name = QLatin1String("Tribunal");
+            break;
+        case Wizard::Component_Bloodmoon:
+            name = QLatin1String("Bloodmoon");
+            break;
     }
     logTextEdit->appendHtml(tr("<p>Attempting to install component %1.</p>").arg(name));
     mWizard->addLogText(tr("Attempting to install component %1.").arg(name));
@@ -160,15 +164,19 @@ void Wizard::InstallationPage::showFileDialog(Wizard::Component component)
     QMessageBox msgBox;
     msgBox.setWindowTitle(tr("%1 Installation").arg(name));
     msgBox.setIcon(QMessageBox::Information);
-    msgBox.setText(QObject::tr("Select a valid %1 installation media.<br><b>Hint</b>: make sure that it contains at least one <b>.cab</b> file.").arg(name));
+    msgBox.setText(
+        QObject::tr("Select a valid %1 installation media.<br><b>Hint</b>: make sure that it contains at least one "
+                    "<b>.cab</b> file.")
+            .arg(name));
     msgBox.exec();
 
-    QString path = QFileDialog::getExistingDirectory(this,
-                                                     tr("Select %1 installation media").arg(name),
-                                                     QDir::rootPath());
+    QString path
+        = QFileDialog::getExistingDirectory(this, tr("Select %1 installation media").arg(name), QDir::rootPath());
 
-    if (path.isEmpty()) {
-        logTextEdit->appendHtml(tr("<p><br/><span style=\"color:red;\"> \
+    if (path.isEmpty())
+    {
+        logTextEdit->appendHtml(
+            tr("<p><br/><span style=\"color:red;\"> \
                                     <b>Error: The installation was aborted by the user</b></span></p>"));
 
         mWizard->addLogText(QLatin1String("Error: The installation was aborted by the user"));
@@ -189,14 +197,16 @@ void Wizard::InstallationPage::showOldVersionDialog()
     QMessageBox msgBox;
     msgBox.setWindowTitle(tr("Morrowind Installation"));
     msgBox.setIcon(QMessageBox::Information);
-    msgBox.setText(QObject::tr("There may be a more recent version of Morrowind available.<br><br>Do you wish to continue anyway?"));
+    msgBox.setText(QObject::tr(
+        "There may be a more recent version of Morrowind available.<br><br>Do you wish to continue anyway?"));
     msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
     msgBox.setDefaultButton(QMessageBox::No);
 
     int ret = msgBox.exec();
     if (ret == QMessageBox::No)
     {
-        logTextEdit->appendHtml(tr("<p><br/><span style=\"color:red;\"> \
+        logTextEdit->appendHtml(
+            tr("<p><br/><span style=\"color:red;\"> \
                                     <b>Error: The installation was aborted by the user</b></span></p>"));
 
         mWizard->addLogText(QLatin1String("Error: The installation was aborted by the user"));
@@ -223,14 +233,18 @@ void Wizard::InstallationPage::installationFinished()
     emit completeChanged();
 }
 
-void Wizard::InstallationPage::installationError(const QString &text, const QString &details)
+void Wizard::InstallationPage::installationError(const QString& text, const QString& details)
 {
     installProgressLabel->setText(tr("Installation failed!"));
 
-    logTextEdit->appendHtml(tr("<p><br/><span style=\"color:red;\"> \
-                               <b>Error: %1</b></p>").arg(text));
-    logTextEdit->appendHtml(tr("<p><span style=\"color:red;\"> \
-                               <b>%1</b></p>").arg(details));
+    logTextEdit->appendHtml(
+        tr("<p><br/><span style=\"color:red;\"> \
+                               <b>Error: %1</b></p>")
+            .arg(text));
+    logTextEdit->appendHtml(
+        tr("<p><span style=\"color:red;\"> \
+                               <b>%1</b></p>")
+            .arg(details));
 
     mWizard->addLogText(QLatin1String("Error: ") + text);
     mWizard->addLogText(details);
@@ -240,34 +254,44 @@ void Wizard::InstallationPage::installationError(const QString &text, const QStr
     msgBox.setWindowTitle(tr("An error occurred"));
     msgBox.setIcon(QMessageBox::Critical);
     msgBox.setStandardButtons(QMessageBox::Ok);
-    msgBox.setText(tr("<html><head/><body><p><b>The Wizard has encountered an error</b></p> \
+    msgBox.setText(
+        tr("<html><head/><body><p><b>The Wizard has encountered an error</b></p> \
                       <p>The error reported was:</p><p>%1</p> \
-                      <p>Press &quot;Show Details...&quot; for more information.</p></body></html>").arg(text));
+                      <p>Press &quot;Show Details...&quot; for more information.</p></body></html>")
+            .arg(text));
 
     msgBox.setDetailedText(details);
     msgBox.exec();
 
-
     emit completeChanged();
 }
 
 bool Wizard::InstallationPage::isComplete() const
 {
-    if (!mWizard->mError) {
+    if (!mWizard->mError)
+    {
         return mFinished;
-    } else {
+    }
+    else
+    {
         return true;
     }
 }
 
 int Wizard::InstallationPage::nextId() const
 {
-    if (field(QLatin1String("installation.retailDisc")).toBool() == true) {
+    if (field(QLatin1String("installation.retailDisc")).toBool() == true)
+    {
         return MainWizard::Page_Conclusion;
-    } else {
-        if (!mWizard->mError) {
+    }
+    else
+    {
+        if (!mWizard->mError)
+        {
             return MainWizard::Page_Import;
-        } else {
+        }
+        else
+        {
             return MainWizard::Page_Conclusion;
         }
     }
diff --git a/apps/wizard/installationpage.hpp b/apps/wizard/installationpage.hpp
index d2380956cc..d7f04fe412 100644
--- a/apps/wizard/installationpage.hpp
+++ b/apps/wizard/installationpage.hpp
@@ -5,9 +5,9 @@
 
 #include <QWizardPage>
 
-#include "unshield/unshieldworker.hpp"
-#include "ui_installationpage.h"
 #include "inisettings.hpp"
+#include "ui_installationpage.h"
+#include "unshield/unshieldworker.hpp"
 #include <components/config/gamesettings.hpp>
 
 class QThread;
@@ -22,14 +22,14 @@ namespace Wizard
     {
         Q_OBJECT
     public:
-        InstallationPage(QWidget *parent, Config::GameSettings &gameSettings);
+        InstallationPage(QWidget* parent, Config::GameSettings& gameSettings);
         ~InstallationPage() override;
 
         int nextId() const override;
-         bool isComplete() const override;
+        bool isComplete() const override;
 
     private:
-        MainWizard *mWizard;
+        MainWizard* mWizard;
         bool mFinished;
 
         std::unique_ptr<QThread> mThread;
@@ -37,18 +37,17 @@ namespace Wizard
 
         void startInstallation();
 
-        Config::GameSettings &mGameSettings;
+        Config::GameSettings& mGameSettings;
 
     private slots:
         void showFileDialog(Wizard::Component component);
         void showOldVersionDialog();
 
         void installationFinished();
-        void installationError(const QString &text, const QString &details);
+        void installationError(const QString& text, const QString& details);
 
     protected:
         void initializePage() override;
-
     };
 
 }
diff --git a/apps/wizard/installationtargetpage.cpp b/apps/wizard/installationtargetpage.cpp
index 521395f632..7e23a19d37 100644
--- a/apps/wizard/installationtargetpage.cpp
+++ b/apps/wizard/installationtargetpage.cpp
@@ -8,9 +8,9 @@
 
 #include "mainwizard.hpp"
 
-Wizard::InstallationTargetPage::InstallationTargetPage(QWidget *parent, const Files::ConfigurationManager &cfg) :
-    QWizardPage(parent),
-    mCfgMgr(cfg)
+Wizard::InstallationTargetPage::InstallationTargetPage(QWidget* parent, const Files::ConfigurationManager& cfg)
+    : QWizardPage(parent)
+    , mCfgMgr(cfg)
 {
     mWizard = qobject_cast<MainWizard*>(parent);
 
@@ -34,15 +34,18 @@ bool Wizard::InstallationTargetPage::validatePage()
 
     qDebug() << "Validating path: " << path;
 
-    if (!QFile::exists(path)) {
+    if (!QFile::exists(path))
+    {
         QDir dir;
 
-        if (!dir.mkpath(path)) {
+        if (!dir.mkpath(path))
+        {
             QMessageBox msgBox;
             msgBox.setWindowTitle(tr("Error creating destination"));
             msgBox.setIcon(QMessageBox::Warning);
             msgBox.setStandardButtons(QMessageBox::Ok);
-            msgBox.setText(tr("<html><head/><body><p><b>Could not create the destination directory</b></p> \
+            msgBox.setText(
+                tr("<html><head/><body><p><b>Could not create the destination directory</b></p> \
                               <p>Please make sure you have the right permissions \
                               and try again, or specify a different location.</p></body></html>"));
             msgBox.exec();
@@ -52,24 +55,28 @@ bool Wizard::InstallationTargetPage::validatePage()
 
     QFileInfo info(path);
 
-    if (!info.isWritable()) {
+    if (!info.isWritable())
+    {
         QMessageBox msgBox;
         msgBox.setWindowTitle(tr("Insufficient permissions"));
         msgBox.setIcon(QMessageBox::Warning);
         msgBox.setStandardButtons(QMessageBox::Ok);
-        msgBox.setText(tr("<html><head/><body><p><b>Could not write to the destination directory</b></p> \
+        msgBox.setText(
+            tr("<html><head/><body><p><b>Could not write to the destination directory</b></p> \
                           <p>Please make sure you have the right permissions \
                           and try again, or specify a different location.</p></body></html>"));
         msgBox.exec();
         return false;
     }
 
-    if (mWizard->findFiles(QLatin1String("Morrowind"), path)) {
+    if (mWizard->findFiles(QLatin1String("Morrowind"), path))
+    {
         QMessageBox msgBox;
         msgBox.setWindowTitle(tr("Destination not empty"));
         msgBox.setIcon(QMessageBox::Warning);
         msgBox.setStandardButtons(QMessageBox::Ok);
-        msgBox.setText(tr("<html><head/><body><p><b>The destination directory is not empty</b></p> \
+        msgBox.setText(
+            tr("<html><head/><body><p><b>The destination directory is not empty</b></p> \
                           <p>An existing Morrowind installation is present in the specified location.</p> \
                           <p>Please specify a different location, or go back and select the location as an existing installation.</p></body></html>"));
         msgBox.exec();
@@ -81,11 +88,8 @@ bool Wizard::InstallationTargetPage::validatePage()
 
 void Wizard::InstallationTargetPage::on_browseButton_clicked()
 {
-    QString selectedPath = QFileDialog::getExistingDirectory(
-                this,
-                tr("Select where to install Morrowind"),
-                QDir::homePath(),
-                QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
+    QString selectedPath = QFileDialog::getExistingDirectory(this, tr("Select where to install Morrowind"),
+        QDir::homePath(), QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
 
     qDebug() << selectedPath;
     QFileInfo info(selectedPath);
@@ -94,7 +98,6 @@ void Wizard::InstallationTargetPage::on_browseButton_clicked()
 
     if (info.isWritable())
         targetLineEdit->setText(info.absoluteFilePath());
-
 }
 
 int Wizard::InstallationTargetPage::nextId() const
diff --git a/apps/wizard/installationtargetpage.hpp b/apps/wizard/installationtargetpage.hpp
index 1f1e952280..6d5d066636 100644
--- a/apps/wizard/installationtargetpage.hpp
+++ b/apps/wizard/installationtargetpage.hpp
@@ -16,7 +16,7 @@ namespace Wizard
     {
         Q_OBJECT
     public:
-        InstallationTargetPage(QWidget *parent, const Files::ConfigurationManager &cfg);
+        InstallationTargetPage(QWidget* parent, const Files::ConfigurationManager& cfg);
 
         int nextId() const override;
         bool validatePage() override;
@@ -25,12 +25,11 @@ namespace Wizard
         void on_browseButton_clicked();
 
     private:
-        MainWizard *mWizard;
-        const Files::ConfigurationManager &mCfgMgr;
+        MainWizard* mWizard;
+        const Files::ConfigurationManager& mCfgMgr;
 
     protected:
         void initializePage() override;
-
     };
 
 }
diff --git a/apps/wizard/intropage.cpp b/apps/wizard/intropage.cpp
index 0a98ae5f3f..50692e20a2 100644
--- a/apps/wizard/intropage.cpp
+++ b/apps/wizard/intropage.cpp
@@ -2,8 +2,8 @@
 
 #include "mainwizard.hpp"
 
-Wizard::IntroPage::IntroPage(QWidget *parent) :
-    QWizardPage(parent)
+Wizard::IntroPage::IntroPage(QWidget* parent)
+    : QWizardPage(parent)
 {
     mWizard = qobject_cast<MainWizard*>(parent);
 
diff --git a/apps/wizard/intropage.hpp b/apps/wizard/intropage.hpp
index 3fae6a747f..e9031b0a3c 100644
--- a/apps/wizard/intropage.hpp
+++ b/apps/wizard/intropage.hpp
@@ -11,12 +11,12 @@ namespace Wizard
     {
         Q_OBJECT
     public:
-        IntroPage(QWidget *parent);
+        IntroPage(QWidget* parent);
 
         int nextId() const override;
 
     private:
-        MainWizard *mWizard;
+        MainWizard* mWizard;
     };
 
 }
diff --git a/apps/wizard/languageselectionpage.cpp b/apps/wizard/languageselectionpage.cpp
index 4c10bf38c6..60ab869c1d 100644
--- a/apps/wizard/languageselectionpage.cpp
+++ b/apps/wizard/languageselectionpage.cpp
@@ -4,8 +4,8 @@
 
 #include <QDebug>
 
-Wizard::LanguageSelectionPage::LanguageSelectionPage(QWidget *parent) :
-    QWizardPage(parent)
+Wizard::LanguageSelectionPage::LanguageSelectionPage(QWidget* parent)
+    : QWizardPage(parent)
 {
     mWizard = qobject_cast<MainWizard*>(parent);
 
@@ -17,12 +17,8 @@ Wizard::LanguageSelectionPage::LanguageSelectionPage(QWidget *parent) :
 void Wizard::LanguageSelectionPage::initializePage()
 {
     QStringList languages;
-    languages << QLatin1String("English")
-              << QLatin1String("French")
-              << QLatin1String("German")
-              << QLatin1String("Italian")
-              << QLatin1String("Polish")
-              << QLatin1String("Russian")
+    languages << QLatin1String("English") << QLatin1String("French") << QLatin1String("German")
+              << QLatin1String("Italian") << QLatin1String("Polish") << QLatin1String("Russian")
               << QLatin1String("Spanish");
 
     languageComboBox->addItems(languages);
@@ -30,21 +26,25 @@ void Wizard::LanguageSelectionPage::initializePage()
 
 int Wizard::LanguageSelectionPage::nextId() const
 {
-    if (field(QLatin1String("installation.retailDisc")).toBool() == true) {
+    if (field(QLatin1String("installation.retailDisc")).toBool() == true)
+    {
         return MainWizard::Page_ComponentSelection;
-    } else {
+    }
+    else
+    {
         QString path(field(QLatin1String("installation.path")).toString());
 
         if (path.isEmpty())
             return MainWizard::Page_ComponentSelection;
 
         // Check if we have to install something
-        if (mWizard->mInstallations[path].hasMorrowind == true &&
-                mWizard->mInstallations[path].hasTribunal == true &&
-                mWizard->mInstallations[path].hasBloodmoon == true)
+        if (mWizard->mInstallations[path].hasMorrowind == true && mWizard->mInstallations[path].hasTribunal == true
+            && mWizard->mInstallations[path].hasBloodmoon == true)
         {
             return MainWizard::Page_Import;
-        } else {
+        }
+        else
+        {
             return MainWizard::Page_ComponentSelection;
         }
     }
diff --git a/apps/wizard/languageselectionpage.hpp b/apps/wizard/languageselectionpage.hpp
index 81f8faa485..5159409292 100644
--- a/apps/wizard/languageselectionpage.hpp
+++ b/apps/wizard/languageselectionpage.hpp
@@ -11,12 +11,12 @@ namespace Wizard
     {
         Q_OBJECT
     public:
-        LanguageSelectionPage(QWidget *parent);
+        LanguageSelectionPage(QWidget* parent);
 
         int nextId() const override;
 
     private:
-        MainWizard *mWizard;
+        MainWizard* mWizard;
 
     protected:
         void initializePage() override;
diff --git a/apps/wizard/main.cpp b/apps/wizard/main.cpp
index 67410df147..e2b0d3874b 100644
--- a/apps/wizard/main.cpp
+++ b/apps/wizard/main.cpp
@@ -9,7 +9,7 @@
 #define MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
 #endif // MAC_OS_X_VERSION_MIN_REQUIRED
 
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 {
 
     QApplication app(argc, argv);
@@ -17,7 +17,7 @@ int main(int argc, char *argv[])
     // Now we make sure the current dir is set to application path
     QDir dir(QCoreApplication::applicationDirPath());
 
-    #ifdef Q_OS_MAC
+#ifdef Q_OS_MAC
     // force Qt to load only LOCAL plugins, don't touch system Qt installation
     QDir pluginsPath(QCoreApplication::applicationDirPath());
     pluginsPath.cdUp();
@@ -26,7 +26,7 @@ int main(int argc, char *argv[])
     QStringList libraryPaths;
     libraryPaths << pluginsPath.path() << QCoreApplication::applicationDirPath();
     app.setLibraryPaths(libraryPaths);
-    #endif
+#endif
 
     QDir::setCurrent(dir.absolutePath());
 
diff --git a/apps/wizard/mainwizard.cpp b/apps/wizard/mainwizard.cpp
index 39d0c4a90a..7710f8bb5c 100644
--- a/apps/wizard/mainwizard.cpp
+++ b/apps/wizard/mainwizard.cpp
@@ -24,11 +24,11 @@
 
 using namespace Process;
 
-Wizard::MainWizard::MainWizard(QWidget *parent) :
-    QWizard(parent),
-    mInstallations(),
-    mError(false),
-    mGameSettings(mCfgMgr)
+Wizard::MainWizard::MainWizard(QWidget* parent)
+    : QWizard(parent)
+    , mInstallations()
+    , mError(false)
+    , mGameSettings(mCfgMgr)
 {
 #ifndef Q_OS_MAC
     setWizardStyle(QWizard::ModernStyle);
@@ -47,13 +47,13 @@ Wizard::MainWizard::MainWizard(QWidget *parent) :
 
     mImporterInvoker = new ProcessInvoker();
 
-    connect(mImporterInvoker->getProcess(), &QProcess::started,
-            this, &MainWizard::importerStarted);
+    connect(mImporterInvoker->getProcess(), &QProcess::started, this, &MainWizard::importerStarted);
 
-    connect(mImporterInvoker->getProcess(), qOverload<int, QProcess::ExitStatus>(&QProcess::finished),
-            this, &MainWizard::importerFinished);
+    connect(mImporterInvoker->getProcess(), qOverload<int, QProcess::ExitStatus>(&QProcess::finished), this,
+        &MainWizard::importerFinished);
 
-    mLogError = tr("<html><head/><body><p><b>Could not open %1 for writing</b></p> \
+    mLogError = tr(
+        "<html><head/><body><p><b>Could not open %1 for writing</b></p> \
                    <p>Please make sure you have the right permissions \
                    and try again.</p></body></html>");
 
@@ -86,7 +86,8 @@ void Wizard::MainWizard::setupLog()
 
     QFile file(logPath);
 
-    if (!file.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate))
+    {
         QMessageBox msgBox;
         msgBox.setWindowTitle(tr("Error opening Wizard log file"));
         msgBox.setIcon(QMessageBox::Critical);
@@ -102,14 +103,15 @@ void Wizard::MainWizard::setupLog()
     qDebug() << logPath;
 }
 
-void Wizard::MainWizard::addLogText(const QString &text)
+void Wizard::MainWizard::addLogText(const QString& text)
 {
     QString logPath(Files::pathToQString(mCfgMgr.getLogPath()));
     logPath.append(QLatin1String("wizard.log"));
 
     QFile file(logPath);
 
-    if (!file.open(QIODevice::ReadWrite | QIODevice::Text)) {
+    if (!file.open(QIODevice::ReadWrite | QIODevice::Text))
+    {
         QMessageBox msgBox;
         msgBox.setWindowTitle(tr("Error opening Wizard log file"));
         msgBox.setIcon(QMessageBox::Critical);
@@ -136,7 +138,8 @@ void Wizard::MainWizard::setupGameSettings()
 {
     QString userPath(Files::pathToQString(mCfgMgr.getUserConfigPath()));
     QString globalPath(Files::pathToQString(mCfgMgr.getGlobalPath()));
-    QString message(tr("<html><head/><body><p><b>Could not open %1 for reading</b></p> \
+    QString message(
+        tr("<html><head/><body><p><b>Could not open %1 for reading</b></p> \
                     <p>Please make sure you have the right permissions \
                     and try again.</p></body></html>"));
 
@@ -147,8 +150,10 @@ void Wizard::MainWizard::setupGameSettings()
 
     qDebug() << "Loading config file:" << path.toUtf8().constData();
 
-    if (file.exists()) {
-        if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+    if (file.exists())
+    {
+        if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+        {
             QMessageBox msgBox;
             msgBox.setWindowTitle(tr("Error opening OpenMW configuration file"));
             msgBox.setIcon(QMessageBox::Critical);
@@ -172,13 +177,15 @@ void Wizard::MainWizard::setupGameSettings()
     paths.append(QLatin1String("openmw.cfg"));
     paths.append(globalPath + QLatin1String("openmw.cfg"));
 
-    for (const QString &path2 : paths)
+    for (const QString& path2 : paths)
     {
         qDebug() << "Loading config file:" << path2.toUtf8().constData();
 
         file.setFileName(path2);
-        if (file.exists()) {
-            if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        if (file.exists())
+        {
+            if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+            {
                 QMessageBox msgBox;
                 msgBox.setWindowTitle(tr("Error opening OpenMW configuration file"));
                 msgBox.setIcon(QMessageBox::Critical);
@@ -202,17 +209,19 @@ void Wizard::MainWizard::setupLauncherSettings()
     QString path(Files::pathToQString(mCfgMgr.getUserConfigPath()));
     path.append(QLatin1String(Config::LauncherSettings::sLauncherConfigFileName));
 
-    QString message(tr("<html><head/><body><p><b>Could not open %1 for reading</b></p> \
+    QString message(
+        tr("<html><head/><body><p><b>Could not open %1 for reading</b></p> \
                     <p>Please make sure you have the right permissions \
                     and try again.</p></body></html>"));
 
-
     QFile file(path);
 
     qDebug() << "Loading config file:" << path.toUtf8().constData();
 
-    if (file.exists()) {
-        if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+    if (file.exists())
+    {
+        if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+        {
             QMessageBox msgBox;
             msgBox.setWindowTitle(tr("Error opening OpenMW configuration file"));
             msgBox.setIcon(QMessageBox::Critical);
@@ -229,7 +238,6 @@ void Wizard::MainWizard::setupLauncherSettings()
     }
 
     file.close();
-
 }
 
 void Wizard::MainWizard::setupInstallations()
@@ -257,7 +265,7 @@ void Wizard::MainWizard::runSettingsImporter()
 
     // Import plugin selection?
     if (field(QLatin1String("installation.retailDisc")).toBool() == true
-            || field(QLatin1String("installation.import-addons")).toBool() == true)
+        || field(QLatin1String("installation.import-addons")).toBool() == true)
         arguments.append(QLatin1String("--game-files"));
 
     arguments.append(QLatin1String("--encoding"));
@@ -265,11 +273,16 @@ void Wizard::MainWizard::runSettingsImporter()
     // Set encoding
     QString language(field(QLatin1String("installation.language")).toString());
 
-    if (language == QLatin1String("Polish")) {
+    if (language == QLatin1String("Polish"))
+    {
         arguments.append(QLatin1String("win1250"));
-    } else if (language == QLatin1String("Russian")) {
+    }
+    else if (language == QLatin1String("Russian"))
+    {
         arguments.append(QLatin1String("win1251"));
-    }  else {
+    }
+    else
+    {
         arguments.append(QLatin1String("win1252"));
     }
 
@@ -280,9 +293,12 @@ void Wizard::MainWizard::runSettingsImporter()
     // Now the paths
     arguments.append(QLatin1String("--ini"));
 
-    if (field(QLatin1String("installation.retailDisc")).toBool() == true) {
+    if (field(QLatin1String("installation.retailDisc")).toBool() == true)
+    {
         arguments.append(path + QDir::separator() + QLatin1String("Morrowind.ini"));
-    } else {
+    }
+    else
+    {
         arguments.append(mInstallations[path].iniPath);
     }
 
@@ -293,10 +309,10 @@ void Wizard::MainWizard::runSettingsImporter()
         return qApp->quit();
 }
 
-void Wizard::MainWizard::addInstallation(const QString &path)
+void Wizard::MainWizard::addInstallation(const QString& path)
 {
     qDebug() << "add installation in: " << path;
-    Installation install;// = new Installation();
+    Installation install; // = new Installation();
 
     install.hasMorrowind = findFiles(QLatin1String("Morrowind"), path);
     install.hasTribunal = findFiles(QLatin1String("Tribunal"), path);
@@ -308,7 +324,8 @@ void Wizard::MainWizard::addInstallation(const QString &path)
 
     // Try the parent directory
     // In normal Morrowind installations that's where Morrowind.ini is
-    if (!file.exists()) {
+    if (!file.exists())
+    {
         dir.cdUp();
         file.setFileName(dir.filePath(QLatin1String("Morrowind.ini")));
     }
@@ -319,7 +336,8 @@ void Wizard::MainWizard::addInstallation(const QString &path)
     mInstallations.insert(QDir::toNativeSeparators(path), install);
 
     // Add it to the openmw.cfg too
-    if (!mGameSettings.getDataDirs().contains(path)) {
+    if (!mGameSettings.getDataDirs().contains(path))
+    {
         mGameSettings.setMultiValue(QLatin1String("data"), path);
         mGameSettings.addDataDir(path);
     }
@@ -339,12 +357,9 @@ void Wizard::MainWizard::setupPages()
     setPage(Page_Import, new ImportPage(this));
     setPage(Page_Conclusion, new ConclusionPage(this));
     setStartId(Page_Intro);
-
 }
 
-void Wizard::MainWizard::importerStarted()
-{
-}
+void Wizard::MainWizard::importerStarted() {}
 
 void Wizard::MainWizard::importerFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
@@ -369,7 +384,8 @@ void Wizard::MainWizard::reject()
     msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
     msgBox.setText(tr("Are you sure you want to exit the Wizard?"));
 
-    if (msgBox.exec() == QMessageBox::Yes) {
+    if (msgBox.exec() == QMessageBox::Yes)
+    {
         QWizard::reject();
     }
 }
@@ -380,11 +396,16 @@ void Wizard::MainWizard::writeSettings()
     QString language(field(QLatin1String("installation.language")).toString());
     mLauncherSettings.setValue(QLatin1String("Settings/language"), language);
 
-    if (language == QLatin1String("Polish")) {
+    if (language == QLatin1String("Polish"))
+    {
         mGameSettings.setValue(QLatin1String("encoding"), QLatin1String("win1250"));
-    } else if (language == QLatin1String("Russian")) {
+    }
+    else if (language == QLatin1String("Russian"))
+    {
         mGameSettings.setValue(QLatin1String("encoding"), QLatin1String("win1251"));
-    }  else {
+    }
+    else
+    {
         mGameSettings.setValue(QLatin1String("encoding"), QLatin1String("win1252"));
     }
 
@@ -398,15 +419,19 @@ void Wizard::MainWizard::writeSettings()
     QString userPath(Files::pathToQString(mCfgMgr.getUserConfigPath()));
     QDir dir(userPath);
 
-    if (!dir.exists()) {
-        if (!dir.mkpath(userPath)) {
+    if (!dir.exists())
+    {
+        if (!dir.mkpath(userPath))
+        {
             QMessageBox msgBox;
             msgBox.setWindowTitle(tr("Error creating OpenMW configuration directory"));
             msgBox.setIcon(QMessageBox::Critical);
             msgBox.setStandardButtons(QMessageBox::Ok);
-            msgBox.setText(tr("<html><head/><body><p><b>Could not create %1</b></p> \
+            msgBox.setText(
+                tr("<html><head/><body><p><b>Could not create %1</b></p> \
                               <p>Please make sure you have the right permissions \
-                              and try again.</p></body></html>").arg(userPath));
+                              and try again.</p></body></html>")
+                    .arg(userPath));
             connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection);
             msgBox.exec();
             return;
@@ -416,15 +441,18 @@ void Wizard::MainWizard::writeSettings()
     // Game settings
     QFile file(userPath + QLatin1String("openmw.cfg"));
 
-    if (!file.open(QIODevice::ReadWrite | QIODevice::Text | QIODevice::Truncate)) {
+    if (!file.open(QIODevice::ReadWrite | QIODevice::Text | QIODevice::Truncate))
+    {
         // File cannot be opened or created
         QMessageBox msgBox;
         msgBox.setWindowTitle(tr("Error writing OpenMW configuration file"));
         msgBox.setIcon(QMessageBox::Critical);
         msgBox.setStandardButtons(QMessageBox::Ok);
-        msgBox.setText(tr("<html><head/><body><p><b>Could not open %1 for writing</b></p> \
+        msgBox.setText(
+            tr("<html><head/><body><p><b>Could not open %1 for writing</b></p> \
                           <p>Please make sure you have the right permissions \
-                          and try again.</p></body></html>").arg(file.fileName()));
+                          and try again.</p></body></html>")
+                .arg(file.fileName()));
         connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection);
         msgBox.exec();
         return;
@@ -439,15 +467,18 @@ void Wizard::MainWizard::writeSettings()
     // Launcher settings
     file.setFileName(userPath + QLatin1String(Config::LauncherSettings::sLauncherConfigFileName));
 
-    if (!file.open(QIODevice::ReadWrite | QIODevice::Text | QIODevice::Truncate)) {
+    if (!file.open(QIODevice::ReadWrite | QIODevice::Text | QIODevice::Truncate))
+    {
         // File cannot be opened or created
         QMessageBox msgBox;
         msgBox.setWindowTitle(tr("Error writing OpenMW configuration file"));
         msgBox.setIcon(QMessageBox::Critical);
         msgBox.setStandardButtons(QMessageBox::Ok);
-        msgBox.setText(tr("<html><head/><body><p><b>Could not open %1 for writing</b></p> \
+        msgBox.setText(
+            tr("<html><head/><body><p><b>Could not open %1 for writing</b></p> \
                           <p>Please make sure you have the right permissions \
-                          and try again.</p></body></html>").arg(file.fileName()));
+                          and try again.</p></body></html>")
+                .arg(file.fileName()));
         connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection);
         msgBox.exec();
         return;
@@ -460,7 +491,7 @@ void Wizard::MainWizard::writeSettings()
     file.close();
 }
 
-bool Wizard::MainWizard::findFiles(const QString &name, const QString &path)
+bool Wizard::MainWizard::findFiles(const QString& name, const QString& path)
 {
     QDir dir(path);
 
@@ -469,5 +500,5 @@ bool Wizard::MainWizard::findFiles(const QString &name, const QString &path)
 
     // TODO: add MIME handling to make sure the files are real
     return (dir.entryList().contains(name + QLatin1String(".esm"), Qt::CaseInsensitive)
-            && dir.entryList().contains(name + QLatin1String(".bsa"), Qt::CaseInsensitive));
+        && dir.entryList().contains(name + QLatin1String(".bsa"), Qt::CaseInsensitive));
 }
diff --git a/apps/wizard/mainwizard.hpp b/apps/wizard/mainwizard.hpp
index cae446862b..9b58fbea2c 100644
--- a/apps/wizard/mainwizard.hpp
+++ b/apps/wizard/mainwizard.hpp
@@ -19,7 +19,8 @@ namespace Wizard
         Q_OBJECT
 
     public:
-        struct Installation {
+        struct Installation
+        {
             bool hasMorrowind;
             bool hasTribunal;
             bool hasBloodmoon;
@@ -27,7 +28,8 @@ namespace Wizard
             QString iniPath;
         };
 
-        enum {
+        enum
+        {
             Page_Intro,
             Page_MethodSelection,
             Page_LanguageSelection,
@@ -39,23 +41,23 @@ namespace Wizard
             Page_Conclusion
         };
 
-        MainWizard(QWidget *parent = nullptr);
+        MainWizard(QWidget* parent = nullptr);
         ~MainWizard() override;
 
-        bool findFiles(const QString &name, const QString &path);
-        void addInstallation(const QString &path);
+        bool findFiles(const QString& name, const QString& path);
+        void addInstallation(const QString& path);
         void runSettingsImporter();
 
         QMap<QString, Installation> mInstallations;
 
         Files::ConfigurationManager mCfgMgr;
 
-        Process::ProcessInvoker *mImporterInvoker;
+        Process::ProcessInvoker* mImporterInvoker;
 
         bool mError;
 
     public slots:
-        void addLogText(const QString &text);
+        void addLogText(const QString& text);
 
     private:
         void setupLog();
@@ -78,7 +80,6 @@ namespace Wizard
 
         void accept() override;
         void reject() override;
-
     };
 
 }
diff --git a/apps/wizard/methodselectionpage.cpp b/apps/wizard/methodselectionpage.cpp
index e4f8b79f08..b3a1c73635 100644
--- a/apps/wizard/methodselectionpage.cpp
+++ b/apps/wizard/methodselectionpage.cpp
@@ -1,11 +1,11 @@
 #include "methodselectionpage.hpp"
 #include "mainwizard.hpp"
 
-#include <QUrl>
 #include <QDesktopServices>
+#include <QUrl>
 
-Wizard::MethodSelectionPage::MethodSelectionPage(QWidget *parent) :
-    QWizardPage(parent)
+Wizard::MethodSelectionPage::MethodSelectionPage(QWidget* parent)
+    : QWizardPage(parent)
 {
     mWizard = qobject_cast<MainWizard*>(parent);
 
@@ -16,17 +16,20 @@ Wizard::MethodSelectionPage::MethodSelectionPage(QWidget *parent) :
     existingLocationRadioButton->setChecked(true);
     buyLinkButton->released();
 #endif
-    
+
     registerField(QLatin1String("installation.retailDisc"), retailDiscRadioButton);
-    
+
     connect(buyLinkButton, &QCommandLinkButton::released, this, &MethodSelectionPage::handleBuyButton);
 }
 
 int Wizard::MethodSelectionPage::nextId() const
 {
-    if (field(QLatin1String("installation.retailDisc")).toBool() == true) {
+    if (field(QLatin1String("installation.retailDisc")).toBool() == true)
+    {
         return MainWizard::Page_InstallationTarget;
-    } else {
+    }
+    else
+    {
         return MainWizard::Page_ExistingInstallation;
     }
 }
diff --git a/apps/wizard/methodselectionpage.hpp b/apps/wizard/methodselectionpage.hpp
index e844024b48..228ebfafd0 100644
--- a/apps/wizard/methodselectionpage.hpp
+++ b/apps/wizard/methodselectionpage.hpp
@@ -11,16 +11,15 @@ namespace Wizard
     {
         Q_OBJECT
     public:
-        MethodSelectionPage(QWidget *parent);
+        MethodSelectionPage(QWidget* parent);
 
         int nextId() const override;
 
     private slots:
         void handleBuyButton();
-        
-    private:
-        MainWizard *mWizard;
 
+    private:
+        MainWizard* mWizard;
     };
 
 }
diff --git a/apps/wizard/unshield/unshieldworker.cpp b/apps/wizard/unshield/unshieldworker.cpp
index 8ff0690667..a7e633357c 100644
--- a/apps/wizard/unshield/unshieldworker.cpp
+++ b/apps/wizard/unshield/unshieldworker.cpp
@@ -1,18 +1,18 @@
 #include "unshieldworker.hpp"
 
 #include <QDebug>
-#include <QReadLocker>
+#include <QDir>
+#include <QFile>
 #include <QFileInfo>
+#include <QReadLocker>
 #include <QStringList>
-#include <QTextStream>
 #include <QTextCodec>
-#include <QFile>
-#include <QDir>
+#include <QTextStream>
 
-Wizard::UnshieldWorker::UnshieldWorker(qint64 expectedMorrowindBsaSize, QObject *parent) :
-    QObject(parent),
-    mExpectedMorrowindBsaSize(expectedMorrowindBsaSize),
-    mIniSettings()
+Wizard::UnshieldWorker::UnshieldWorker(qint64 expectedMorrowindBsaSize, QObject* parent)
+    : QObject(parent)
+    , mExpectedMorrowindBsaSize(expectedMorrowindBsaSize)
+    , mIniSettings()
 {
     unshield_set_log_level(0);
 
@@ -36,9 +36,7 @@ Wizard::UnshieldWorker::UnshieldWorker(qint64 expectedMorrowindBsaSize, QObject
     qRegisterMetaType<Wizard::Component>("Wizard::Component");
 }
 
-Wizard::UnshieldWorker::~UnshieldWorker()
-{
-}
+Wizard::UnshieldWorker::~UnshieldWorker() {}
 
 void Wizard::UnshieldWorker::stopWorker()
 {
@@ -49,31 +47,33 @@ void Wizard::UnshieldWorker::stopWorker()
 void Wizard::UnshieldWorker::setInstallComponent(Wizard::Component component, bool install)
 {
     QWriteLocker writeLock(&mLock);
-    switch (component) {
+    switch (component)
+    {
 
-    case Wizard::Component_Morrowind:
-        mInstallMorrowind = install;
-        break;
-    case Wizard::Component_Tribunal:
-        mInstallTribunal = install;
-        break;
-    case Wizard::Component_Bloodmoon:
-        mInstallBloodmoon = install;
-        break;
+        case Wizard::Component_Morrowind:
+            mInstallMorrowind = install;
+            break;
+        case Wizard::Component_Tribunal:
+            mInstallTribunal = install;
+            break;
+        case Wizard::Component_Bloodmoon:
+            mInstallBloodmoon = install;
+            break;
     }
 }
 
 bool Wizard::UnshieldWorker::getInstallComponent(Component component)
 {
     QReadLocker readLock(&mLock);
-    switch (component) {
+    switch (component)
+    {
 
-    case Wizard::Component_Morrowind:
-        return mInstallMorrowind;
-    case Wizard::Component_Tribunal:
-        return mInstallTribunal;
-    case Wizard::Component_Bloodmoon:
-        return mInstallBloodmoon;
+        case Wizard::Component_Morrowind:
+            return mInstallMorrowind;
+        case Wizard::Component_Tribunal:
+            return mInstallTribunal;
+        case Wizard::Component_Bloodmoon:
+            return mInstallBloodmoon;
     }
 
     return false;
@@ -82,17 +82,18 @@ bool Wizard::UnshieldWorker::getInstallComponent(Component component)
 void Wizard::UnshieldWorker::setComponentDone(Component component, bool done)
 {
     QWriteLocker writeLock(&mLock);
-    switch (component) {
+    switch (component)
+    {
 
-    case Wizard::Component_Morrowind:
-        mMorrowindDone = done;
-        break;
-    case Wizard::Component_Tribunal:
-        mTribunalDone = done;
-        break;
-    case Wizard::Component_Bloodmoon:
-        mBloodmoonDone = done;
-        break;
+        case Wizard::Component_Morrowind:
+            mMorrowindDone = done;
+            break;
+        case Wizard::Component_Tribunal:
+            mTribunalDone = done;
+            break;
+        case Wizard::Component_Bloodmoon:
+            mBloodmoonDone = done;
+            break;
     }
 }
 
@@ -102,30 +103,30 @@ bool Wizard::UnshieldWorker::getComponentDone(Component component)
     switch (component)
     {
 
-    case Wizard::Component_Morrowind:
-        return mMorrowindDone;
-    case Wizard::Component_Tribunal:
-        return mTribunalDone;
-    case Wizard::Component_Bloodmoon:
-        return mBloodmoonDone;
+        case Wizard::Component_Morrowind:
+            return mMorrowindDone;
+        case Wizard::Component_Tribunal:
+            return mTribunalDone;
+        case Wizard::Component_Bloodmoon:
+            return mBloodmoonDone;
     }
 
     return false;
 }
 
-void Wizard::UnshieldWorker::setPath(const QString &path)
+void Wizard::UnshieldWorker::setPath(const QString& path)
 {
     QWriteLocker writeLock(&mLock);
     mPath = path;
 }
 
-void Wizard::UnshieldWorker::setIniPath(const QString &path)
+void Wizard::UnshieldWorker::setIniPath(const QString& path)
 {
     QWriteLocker writeLock(&mLock);
     mIniPath = path;
 }
 
-void Wizard::UnshieldWorker::setDiskPath(const QString &path)
+void Wizard::UnshieldWorker::setDiskPath(const QString& path)
 {
     QWriteLocker writeLock(&mLock);
     mDiskPath = path;
@@ -150,8 +151,7 @@ QString Wizard::UnshieldWorker::getDiskPath()
     return mDiskPath;
 }
 
-
-void Wizard::UnshieldWorker::setIniCodec(QTextCodec *codec)
+void Wizard::UnshieldWorker::setIniCodec(QTextCodec* codec)
 {
     QWriteLocker writeLock(&mLock);
     mIniCodec = codec;
@@ -170,9 +170,10 @@ bool Wizard::UnshieldWorker::setupSettings()
 
     QFile file(getIniPath());
 
-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
         emit error(tr("Failed to open Morrowind configuration file!"),
-                   tr("Opening %1 failed: %2.").arg(getIniPath(), file.errorString()));
+            tr("Opening %1 failed: %2.").arg(getIniPath(), file.errorString()));
         return false;
     }
 
@@ -191,39 +192,43 @@ bool Wizard::UnshieldWorker::writeSettings()
 
     QFile file(getIniPath());
 
-    if (!file.open(QIODevice::ReadWrite | QIODevice::Text)) {
+    if (!file.open(QIODevice::ReadWrite | QIODevice::Text))
+    {
         emit error(tr("Failed to open Morrowind configuration file!"),
-                   tr("Opening %1 failed: %2.").arg(getIniPath(), file.errorString()));
+            tr("Opening %1 failed: %2.").arg(getIniPath(), file.errorString()));
         return false;
     }
 
     QTextStream stream(&file);
     stream.setCodec(mIniCodec);
 
-    if (!mIniSettings.writeFile(getIniPath(), stream)) {
-         emit error(tr("Failed to write Morrowind configuration file!"),
-                    tr("Writing to %1 failed: %2.").arg(getIniPath(), file.errorString()));
-         return false;
+    if (!mIniSettings.writeFile(getIniPath(), stream))
+    {
+        emit error(tr("Failed to write Morrowind configuration file!"),
+            tr("Writing to %1 failed: %2.").arg(getIniPath(), file.errorString()));
+        return false;
     }
 
     return true;
 }
 
-bool Wizard::UnshieldWorker::removeDirectory(const QString &dirName)
+bool Wizard::UnshieldWorker::removeDirectory(const QString& dirName)
 {
     bool result = false;
     QDir dir(dirName);
 
     if (dir.exists(dirName))
     {
-        QFileInfoList list(dir.entryInfoList(QDir::NoDotAndDotDot |
-                                               QDir::System | QDir::Hidden |
-                                               QDir::AllDirs | QDir::Files, QDir::DirsFirst));
+        QFileInfoList list(dir.entryInfoList(
+            QDir::NoDotAndDotDot | QDir::System | QDir::Hidden | QDir::AllDirs | QDir::Files, QDir::DirsFirst));
         for (const QFileInfo& info : list)
         {
-            if (info.isDir()) {
+            if (info.isDir())
+            {
                 result = removeDirectory(info.absoluteFilePath());
-            } else {
+            }
+            else
+            {
                 result = QFile::remove(info.absoluteFilePath());
             }
 
@@ -236,39 +241,47 @@ bool Wizard::UnshieldWorker::removeDirectory(const QString &dirName)
     return result;
 }
 
-bool Wizard::UnshieldWorker::copyFile(const QString &source, const QString &destination, bool keepSource)
+bool Wizard::UnshieldWorker::copyFile(const QString& source, const QString& destination, bool keepSource)
 {
     QDir dir;
     QFile file;
 
     QFileInfo info(destination);
 
-    if (info.exists()) {
+    if (info.exists())
+    {
         if (!dir.remove(info.absoluteFilePath()))
             return false;
     }
 
-    if (file.copy(source, destination)) {
-        if (!keepSource) {
+    if (file.copy(source, destination))
+    {
+        if (!keepSource)
+        {
             if (!file.remove(source))
                 return false;
-        } else {
+        }
+        else
+        {
             return true;
         }
-    } else {
+    }
+    else
+    {
         return false;
     }
 
     return true;
 }
 
-bool Wizard::UnshieldWorker::copyDirectory(const QString &source, const QString &destination, bool keepSource)
+bool Wizard::UnshieldWorker::copyDirectory(const QString& source, const QString& destination, bool keepSource)
 {
     QDir sourceDir(source);
     QDir destDir(destination);
     bool result = true;
 
-    if (!destDir.exists()) {
+    if (!destDir.exists())
+    {
         if (!sourceDir.mkpath(destination))
             return false;
     }
@@ -278,11 +291,10 @@ bool Wizard::UnshieldWorker::copyDirectory(const QString &source, const QString
     if (!destDir.exists())
         return false;
 
-    QFileInfoList list(sourceDir.entryInfoList(QDir::NoDotAndDotDot |
-                                                 QDir::System | QDir::Hidden |
-                                                 QDir::AllDirs | QDir::Files, QDir::DirsFirst));
+    QFileInfoList list(sourceDir.entryInfoList(
+        QDir::NoDotAndDotDot | QDir::System | QDir::Hidden | QDir::AllDirs | QDir::Files, QDir::DirsFirst));
 
-    for (const QFileInfo &info : list)
+    for (const QFileInfo& info : list)
     {
         QString relativePath(info.absoluteFilePath());
         relativePath.remove(source);
@@ -292,9 +304,12 @@ bool Wizard::UnshieldWorker::copyDirectory(const QString &source, const QString
         if (info.isSymLink())
             continue;
 
-        if (info.isDir()) {
+        if (info.isDir())
+        {
             result = copyDirectory(info.absoluteFilePath(), destinationPath);
-        } else {
+        }
+        else
+        {
             result = copyFile(info.absoluteFilePath(), destinationPath);
         }
     }
@@ -305,12 +320,14 @@ bool Wizard::UnshieldWorker::copyDirectory(const QString &source, const QString
     return result;
 }
 
-bool Wizard::UnshieldWorker::installFile(const QString &fileName, const QString &path, Qt::MatchFlags flags, bool keepSource)
+bool Wizard::UnshieldWorker::installFile(
+    const QString& fileName, const QString& path, Qt::MatchFlags flags, bool keepSource)
 {
     return installFiles(fileName, path, flags, keepSource, true);
 }
 
-bool Wizard::UnshieldWorker::installFiles(const QString &fileName, const QString &path, Qt::MatchFlags flags, bool keepSource, bool single)
+bool Wizard::UnshieldWorker::installFiles(
+    const QString& fileName, const QString& path, Qt::MatchFlags flags, bool keepSource, bool single)
 {
     QDir dir(path);
 
@@ -319,14 +336,17 @@ bool Wizard::UnshieldWorker::installFiles(const QString &fileName, const QString
 
     QStringList files(findFiles(fileName, path, flags));
 
-    for (const QString &file : files)
+    for (const QString& file : files)
     {
         QFileInfo info(file);
         emit textChanged(tr("Installing: %1").arg(info.fileName()));
 
-        if (single) {
+        if (single)
+        {
             return copyFile(info.absoluteFilePath(), getPath() + QDir::separator() + info.fileName(), keepSource);
-        } else {
+        }
+        else
+        {
             if (!copyFile(info.absoluteFilePath(), getPath() + QDir::separator() + info.fileName(), keepSource))
                 return false;
         }
@@ -335,7 +355,8 @@ bool Wizard::UnshieldWorker::installFiles(const QString &fileName, const QString
     return true;
 }
 
-bool Wizard::UnshieldWorker::installDirectories(const QString &dirName, const QString &path, bool recursive, bool keepSource)
+bool Wizard::UnshieldWorker::installDirectories(
+    const QString& dirName, const QString& path, bool recursive, bool keepSource)
 {
     QDir dir(path);
 
@@ -344,7 +365,7 @@ bool Wizard::UnshieldWorker::installDirectories(const QString &dirName, const QS
 
     QStringList directories(findDirectories(dirName, path, recursive));
 
-    for (const QString &dir : directories)
+    for (const QString& dir : directories)
     {
         QFileInfo info(dir);
         emit textChanged(tr("Installing: %1 directory").arg(info.fileName()));
@@ -391,8 +412,7 @@ void Wizard::UnshieldWorker::extract()
         mIniSettings.setValue(QLatin1String("Game Files/GameFile1"), QVariant(QString("Bloodmoon.esm")));
     }
 
-    if (getInstallComponent(Wizard::Component_Tribunal) &&
-            getInstallComponent(Wizard::Component_Bloodmoon))
+    if (getInstallComponent(Wizard::Component_Tribunal) && getInstallComponent(Wizard::Component_Bloodmoon))
     {
         mIniSettings.setValue(QLatin1String("Archives/Archive 0"), QVariant(QString("Tribunal.bsa")));
         mIniSettings.setValue(QLatin1String("Archives/Archive 1"), QVariant(QString("Bloodmoon.bsa")));
@@ -427,20 +447,22 @@ void Wizard::UnshieldWorker::extract()
 bool Wizard::UnshieldWorker::setupComponent(Component component)
 {
     QString name;
-    switch (component) {
+    switch (component)
+    {
 
-    case Wizard::Component_Morrowind:
-        name = QLatin1String("Morrowind");
-        break;
-    case Wizard::Component_Tribunal:
-        name = QLatin1String("Tribunal");
-        break;
-    case Wizard::Component_Bloodmoon:
-        name = QLatin1String("Bloodmoon");
-        break;
+        case Wizard::Component_Morrowind:
+            name = QLatin1String("Morrowind");
+            break;
+        case Wizard::Component_Tribunal:
+            name = QLatin1String("Tribunal");
+            break;
+        case Wizard::Component_Bloodmoon:
+            name = QLatin1String("Bloodmoon");
+            break;
     }
 
-    if (name.isEmpty()) {
+    if (name.isEmpty())
+    {
         emit error(tr("Component parameter is invalid!"), tr("An invalid component parameter was supplied."));
         return false;
     }
@@ -450,23 +472,28 @@ bool Wizard::UnshieldWorker::setupComponent(Component component)
     QDir disk;
 
     // Keep showing the file dialog until we find the necessary install files
-    while (!found) {
-        if (getDiskPath().isEmpty()) {
+    while (!found)
+    {
+        if (getDiskPath().isEmpty())
+        {
             QReadLocker readLock(&mLock);
             emit requestFileDialog(component);
             mWait.wait(&mLock);
-            if(mStopped) {
+            if (mStopped)
+            {
                 qDebug() << "We are asked to stop !!";
                 break;
             }
             disk.setPath(getDiskPath());
-        } else {
+        }
+        else
+        {
             disk.setPath(getDiskPath());
         }
 
         QStringList list(findFiles(QLatin1String("data1.hdr"), disk.absolutePath()));
 
-        for (const QString &file : list)
+        for (const QString& file : list)
         {
 
             qDebug() << "current archive: " << file;
@@ -477,7 +504,8 @@ bool Wizard::UnshieldWorker::setupComponent(Component component)
                 bool tribunalFound = findInCab(QLatin1String("Tribunal.bsa"), file);
                 bool bloodmoonFound = findInCab(QLatin1String("Bloodmoon.bsa"), file);
 
-                if (morrowindFound) {
+                if (morrowindFound)
+                {
                     // Check if we have correct archive, other archives have Morrowind.bsa too
                     if (tribunalFound == bloodmoonFound)
                     {
@@ -497,14 +525,16 @@ bool Wizard::UnshieldWorker::setupComponent(Component component)
                         found = true; // We have a GoTY disk or a Morrowind-only disk
                     }
                 }
-            } else {
+            }
+            else
+            {
 
-                if (findInCab(name + QLatin1String(".bsa"), file)) {
+                if (findInCab(name + QLatin1String(".bsa"), file))
+                {
                     cabFile = file;
                     found = true;
                 }
             }
-
         }
 
         if (cabFile.isEmpty())
@@ -521,33 +551,38 @@ bool Wizard::UnshieldWorker::setupComponent(Component component)
         }
     }
 
-    if (installComponent(component, cabFile)) {
+    if (installComponent(component, cabFile))
+    {
         setComponentDone(component, true);
         return true;
-    } else {
+    }
+    else
+    {
         return false;
     }
 
     return true;
 }
 
-bool Wizard::UnshieldWorker::installComponent(Component component, const QString &path)
+bool Wizard::UnshieldWorker::installComponent(Component component, const QString& path)
 {
     QString name;
-    switch (component) {
+    switch (component)
+    {
 
-    case Wizard::Component_Morrowind:
-        name = QLatin1String("Morrowind");
-        break;
-    case Wizard::Component_Tribunal:
-        name = QLatin1String("Tribunal");
-        break;
-    case Wizard::Component_Bloodmoon:
-        name = QLatin1String("Bloodmoon");
-        break;
+        case Wizard::Component_Morrowind:
+            name = QLatin1String("Morrowind");
+            break;
+        case Wizard::Component_Tribunal:
+            name = QLatin1String("Tribunal");
+            break;
+        case Wizard::Component_Bloodmoon:
+            name = QLatin1String("Bloodmoon");
+            break;
     }
 
-    if (name.isEmpty()) {
+    if (name.isEmpty())
+    {
         emit error(tr("Component parameter is invalid!"), tr("An invalid component parameter was supplied."));
         return false;
     }
@@ -556,7 +591,8 @@ bool Wizard::UnshieldWorker::installComponent(Component component, const QString
 
     QFileInfo info(path);
 
-    if (!info.exists()) {
+    if (!info.exists())
+    {
         emit error(tr("Installation media path not set!"), tr("The source path for %1 was not set.").arg(name));
         return false;
     }
@@ -569,20 +605,25 @@ bool Wizard::UnshieldWorker::installComponent(Component component, const QString
     // Make sure the temporary folder is empty
     removeDirectory(tempPath);
 
-    if (!temp.mkpath(tempPath)) {
+    if (!temp.mkpath(tempPath))
+    {
         emit error(tr("Cannot create temporary directory!"), tr("Failed to create %1.").arg(tempPath));
         return false;
     }
 
     temp.setPath(tempPath);
 
-    if (!temp.mkdir(name)) {
-        emit error(tr("Cannot create temporary directory!"), tr("Failed to create %1.").arg(temp.absoluteFilePath(name)));
+    if (!temp.mkdir(name))
+    {
+        emit error(
+            tr("Cannot create temporary directory!"), tr("Failed to create %1.").arg(temp.absoluteFilePath(name)));
         return false;
     }
 
-    if (!temp.cd(name)) {
-        emit error(tr("Cannot move into temporary directory!"), tr("Failed to move into %1.").arg(temp.absoluteFilePath(name)));
+    if (!temp.cd(name))
+    {
+        emit error(tr("Cannot move into temporary directory!"),
+            tr("Failed to move into %1.").arg(temp.absoluteFilePath(name)));
         return false;
     }
 
@@ -595,47 +636,40 @@ bool Wizard::UnshieldWorker::installComponent(Component component, const QString
 
     // Install extracted directories
     QStringList directories;
-    directories << QLatin1String("BookArt")
-                << QLatin1String("Fonts")
-                << QLatin1String("Icons")
-                << QLatin1String("Meshes")
-                << QLatin1String("Music")
-                << QLatin1String("Sound")
-                << QLatin1String("Splash")
-                << QLatin1String("Textures")
-                << QLatin1String("Video");
-
-    for (const QString &dir : directories)
-    {
-        if (!installDirectories(dir, temp.absolutePath())) {
-            emit error(tr("Could not install directory!"),
-                       tr("Installing %1 to %2 failed.").arg(dir, temp.absolutePath()));
+    directories << QLatin1String("BookArt") << QLatin1String("Fonts") << QLatin1String("Icons")
+                << QLatin1String("Meshes") << QLatin1String("Music") << QLatin1String("Sound")
+                << QLatin1String("Splash") << QLatin1String("Textures") << QLatin1String("Video");
+
+    for (const QString& dir : directories)
+    {
+        if (!installDirectories(dir, temp.absolutePath()))
+        {
+            emit error(
+                tr("Could not install directory!"), tr("Installing %1 to %2 failed.").arg(dir, temp.absolutePath()));
             return false;
         }
     }
 
     // Install directories from disk
-    for (const QString &dir : directories)
+    for (const QString& dir : directories)
     {
-        if (!installDirectories(dir, info.absolutePath(), false, true)) {
-            emit error(tr("Could not install directory!"),
-                       tr("Installing %1 to %2 failed.").arg(dir, info.absolutePath()));
+        if (!installDirectories(dir, info.absolutePath(), false, true))
+        {
+            emit error(
+                tr("Could not install directory!"), tr("Installing %1 to %2 failed.").arg(dir, info.absolutePath()));
             return false;
         }
-
     }
 
     // Install translation files
     QStringList extensions;
-    extensions << QLatin1String(".cel")
-               << QLatin1String(".top")
-               << QLatin1String(".mrk");
+    extensions << QLatin1String(".cel") << QLatin1String(".top") << QLatin1String(".mrk");
 
-    for (const QString &extension : extensions)
+    for (const QString& extension : extensions)
     {
-        if (!installFiles(extension, info.absolutePath(), Qt::MatchEndsWith)) {
-            emit error(tr("Could not install translation file!"),
-                       tr("Failed to install *%1 files.").arg(extension));
+        if (!installFiles(extension, info.absolutePath(), Qt::MatchEndsWith))
+        {
+            emit error(tr("Could not install translation file!"), tr("Failed to install *%1 files.").arg(extension));
             return false;
         }
     }
@@ -643,22 +677,22 @@ bool Wizard::UnshieldWorker::installComponent(Component component, const QString
     if (component == Wizard::Component_Morrowind)
     {
         QStringList files;
-        files << QLatin1String("Morrowind.esm")
-              << QLatin1String("Morrowind.bsa");
+        files << QLatin1String("Morrowind.esm") << QLatin1String("Morrowind.bsa");
 
-        for (const QString &file : files)
+        for (const QString& file : files)
         {
-            if (!installFile(file, temp.absolutePath())) {
-                emit error(tr("Could not install Morrowind data file!"),
-                           tr("Failed to install %1.").arg(file));
+            if (!installFile(file, temp.absolutePath()))
+            {
+                emit error(tr("Could not install Morrowind data file!"), tr("Failed to install %1.").arg(file));
                 return false;
             }
         }
 
         // Copy Morrowind configuration file
-        if (!installFile(QLatin1String("Morrowind.ini"), temp.absolutePath())) {
+        if (!installFile(QLatin1String("Morrowind.ini"), temp.absolutePath()))
+        {
             emit error(tr("Could not install Morrowind configuration file!"),
-                       tr("Failed to install %1.").arg(QLatin1String("Morrowind.ini")));
+                tr("Failed to install %1.").arg(QLatin1String("Morrowind.ini")));
             return false;
         }
 
@@ -674,25 +708,25 @@ bool Wizard::UnshieldWorker::installComponent(Component component, const QString
         QFileInfo sounds(temp.absoluteFilePath(QLatin1String("Sounds")));
         QString dest(getPath() + QDir::separator() + QLatin1String("Sound"));
 
-        if (sounds.exists()) {
+        if (sounds.exists())
+        {
             emit textChanged(tr("Installing: Sound directory"));
-            if (!copyDirectory(sounds.absoluteFilePath(), dest)) {
+            if (!copyDirectory(sounds.absoluteFilePath(), dest))
+            {
                 emit error(tr("Could not install directory!"),
-                           tr("Installing %1 to %2 failed.").arg(sounds.absoluteFilePath(), dest));
+                    tr("Installing %1 to %2 failed.").arg(sounds.absoluteFilePath(), dest));
                 return false;
             }
-
         }
 
         QStringList files;
-        files << QLatin1String("Tribunal.esm")
-              << QLatin1String("Tribunal.bsa");
+        files << QLatin1String("Tribunal.esm") << QLatin1String("Tribunal.bsa");
 
-        for (const QString &file : files)
+        for (const QString& file : files)
         {
-            if (!installFile(file, temp.absolutePath())) {
-                emit error(tr("Could not find Tribunal data file!"),
-                           tr("Failed to find %1.").arg(file));
+            if (!installFile(file, temp.absolutePath()))
+            {
+                emit error(tr("Could not find Tribunal data file!"), tr("Failed to find %1.").arg(file));
                 return false;
             }
         }
@@ -702,23 +736,24 @@ bool Wizard::UnshieldWorker::installComponent(Component component, const QString
     {
         QFileInfo original(getPath() + QDir::separator() + QLatin1String("Tribunal.esm"));
 
-        if (original.exists()) {
-            if (!installFile(QLatin1String("Tribunal.esm"), temp.absolutePath())) {
+        if (original.exists())
+        {
+            if (!installFile(QLatin1String("Tribunal.esm"), temp.absolutePath()))
+            {
                 emit error(tr("Could not find Tribunal patch file!"),
-                           tr("Failed to find %1.").arg(QLatin1String("Tribunal.esm")));
+                    tr("Failed to find %1.").arg(QLatin1String("Tribunal.esm")));
                 return false;
             }
         }
 
         QStringList files;
-        files << QLatin1String("Bloodmoon.esm")
-              << QLatin1String("Bloodmoon.bsa");
+        files << QLatin1String("Bloodmoon.esm") << QLatin1String("Bloodmoon.bsa");
 
-        for (const QString &file : files)
+        for (const QString& file : files)
         {
-            if (!installFile(file, temp.absolutePath())) {
-                emit error(tr("Could not find Bloodmoon data file!"),
-                           tr("Failed to find %1.").arg(file));
+            if (!installFile(file, temp.absolutePath()))
+            {
+                emit error(tr("Could not find Bloodmoon data file!"), tr("Failed to find %1.").arg(file));
                 return false;
             }
         }
@@ -728,9 +763,9 @@ bool Wizard::UnshieldWorker::installComponent(Component component, const QString
 
         emit textChanged(tr("Updating Morrowind configuration file"));
 
-        for (const QString &inx : list)
+        for (const QString& inx : list)
         {
-             mIniSettings.parseInx(inx);
+            mIniSettings.parseInx(inx);
         }
     }
 
@@ -738,24 +773,25 @@ bool Wizard::UnshieldWorker::installComponent(Component component, const QString
     QStringList datafiles(findDirectories(QLatin1String("Data Files"), temp.absolutePath()));
     datafiles.append(findDirectories(QLatin1String("Data Files"), info.absolutePath()));
 
-    for (const QString &dir : datafiles)
+    for (const QString& dir : datafiles)
     {
         QFileInfo info(dir);
         emit textChanged(tr("Installing: %1 directory").arg(info.fileName()));
 
-        if (!copyDirectory(info.absoluteFilePath(), getPath())) {
+        if (!copyDirectory(info.absoluteFilePath(), getPath()))
+        {
             emit error(tr("Could not install directory!"),
-                       tr("Installing %1 to %2 failed.").arg(info.absoluteFilePath(), getPath()));
+                tr("Installing %1 to %2 failed.").arg(info.absoluteFilePath(), getPath()));
             return false;
         }
     }
 
     emit textChanged(tr("%1 installation finished!").arg(name));
     return true;
-
 }
 
-bool Wizard::UnshieldWorker::extractFile(Unshield *unshield, const QString &destination, const QString &prefix, int index, int counter)
+bool Wizard::UnshieldWorker::extractFile(
+    Unshield* unshield, const QString& destination, const QString& prefix, int index, int counter)
 {
     bool success = false;
     QString path(destination);
@@ -782,7 +818,7 @@ bool Wizard::UnshieldWorker::extractFile(Unshield *unshield, const QString &dest
     fileName.append(QString::fromUtf8(unshield_file_name(unshield, index)));
 
     // Calculate the percentage done
-    int progress = (((float) counter / (float) unshield_file_count(unshield)) * 100);
+    int progress = (((float)counter / (float)unshield_file_count(unshield)) * 100);
 
     if (getComponentDone(Wizard::Component_Morrowind))
         progress = progress + 100;
@@ -796,7 +832,8 @@ bool Wizard::UnshieldWorker::extractFile(Unshield *unshield, const QString &dest
     QByteArray array(fileName.toUtf8());
     success = unshield_file_save(unshield, index, array.constData());
 
-    if (!success) {
+    if (!success)
+    {
         qDebug() << "error";
         dir.remove(fileName);
     }
@@ -804,16 +841,17 @@ bool Wizard::UnshieldWorker::extractFile(Unshield *unshield, const QString &dest
     return success;
 }
 
-bool Wizard::UnshieldWorker::extractCab(const QString &cabFile, const QString &destination)
+bool Wizard::UnshieldWorker::extractCab(const QString& cabFile, const QString& destination)
 {
     bool success = false;
 
     QByteArray array(cabFile.toUtf8());
 
-    Unshield *unshield;
+    Unshield* unshield;
     unshield = unshield_open(array.constData());
 
-    if (!unshield) {
+    if (!unshield)
+    {
         emit error(tr("Failed to open InstallShield Cabinet File."), tr("Opening %1 failed.").arg(cabFile));
         unshield_close(unshield);
         return false;
@@ -821,27 +859,30 @@ bool Wizard::UnshieldWorker::extractCab(const QString &cabFile, const QString &d
 
     int counter = 0;
 
-    for (int i=0; i<unshield_file_group_count(unshield); ++i)
+    for (int i = 0; i < unshield_file_group_count(unshield); ++i)
     {
-        UnshieldFileGroup *group = unshield_file_group_get(unshield, i);
+        UnshieldFileGroup* group = unshield_file_group_get(unshield, i);
 
-        for (size_t j=group->first_file; j<=group->last_file; ++j)
+        for (size_t j = group->first_file; j <= group->last_file; ++j)
         {
-            if (mStopped) {
+            if (mStopped)
+            {
                 qDebug() << "We're asked to stop!";
 
                 unshield_close(unshield);
                 return true;
             }
 
-            if (unshield_file_is_valid(unshield, j)) {
+            if (unshield_file_is_valid(unshield, j))
+            {
                 success = extractFile(unshield, destination, group->name, j, counter);
 
-                if (!success) {
+                if (!success)
+                {
                     QString name(QString::fromUtf8(unshield_file_name(unshield, j)));
 
                     emit error(tr("Failed to extract %1.").arg(name),
-                               tr("Complete path: %1").arg(destination + QDir::separator() + name));
+                        tr("Complete path: %1").arg(destination + QDir::separator() + name));
 
                     unshield_close(unshield);
                     return false;
@@ -856,17 +897,18 @@ bool Wizard::UnshieldWorker::extractCab(const QString &cabFile, const QString &d
     return success;
 }
 
-QString Wizard::UnshieldWorker::findFile(const QString &fileName, const QString &path)
+QString Wizard::UnshieldWorker::findFile(const QString& fileName, const QString& path)
 {
     return findFiles(fileName, path).first();
 }
 
-QStringList Wizard::UnshieldWorker::findFiles(const QString &fileName, const QString &path, int depth, bool recursive,
-                                              bool directories, Qt::MatchFlags flags)
+QStringList Wizard::UnshieldWorker::findFiles(
+    const QString& fileName, const QString& path, int depth, bool recursive, bool directories, Qt::MatchFlags flags)
 {
     static const int MAXIMUM_DEPTH = 10;
 
-    if (depth >= MAXIMUM_DEPTH) {
+    if (depth >= MAXIMUM_DEPTH)
+    {
         qWarning("Maximum directory depth limit reached.");
         return QStringList();
     }
@@ -881,39 +923,47 @@ QStringList Wizard::UnshieldWorker::findFiles(const QString &fileName, const QSt
     if (!dir.exists())
         return QStringList();
 
-    QFileInfoList list(dir.entryInfoList(QDir::NoDotAndDotDot |
-                                         QDir::AllDirs | QDir::Files, QDir::DirsFirst));
+    QFileInfoList list(dir.entryInfoList(QDir::NoDotAndDotDot | QDir::AllDirs | QDir::Files, QDir::DirsFirst));
     for (const QFileInfo& info : list)
     {
         if (info.isSymLink())
             continue;
 
-        if (info.isDir()) {
+        if (info.isDir())
+        {
             if (directories)
             {
-                if (!info.fileName().compare(fileName, Qt::CaseInsensitive)) {
+                if (!info.fileName().compare(fileName, Qt::CaseInsensitive))
+                {
                     result.append(info.absoluteFilePath());
-                } else {
+                }
+                else
+                {
                     if (recursive)
                         result.append(findFiles(fileName, info.absoluteFilePath(), depth + 1, recursive, true));
                 }
-            } else {
+            }
+            else
+            {
                 if (recursive)
                     result.append(findFiles(fileName, info.absoluteFilePath(), depth + 1));
             }
-        } else {
+        }
+        else
+        {
             if (directories)
                 break;
 
-            switch (flags) {
-            case Qt::MatchExactly:
-                if (!info.fileName().compare(fileName, Qt::CaseInsensitive))
-                    result.append(info.absoluteFilePath());
-                break;
-            case Qt::MatchEndsWith:
-                if (info.fileName().endsWith(fileName, Qt::CaseInsensitive))
-                    result.append(info.absoluteFilePath());
-                break;
+            switch (flags)
+            {
+                case Qt::MatchExactly:
+                    if (!info.fileName().compare(fileName, Qt::CaseInsensitive))
+                        result.append(info.absoluteFilePath());
+                    break;
+                case Qt::MatchEndsWith:
+                    if (info.fileName().endsWith(fileName, Qt::CaseInsensitive))
+                        result.append(info.absoluteFilePath());
+                    break;
             }
         }
     }
@@ -921,34 +971,37 @@ QStringList Wizard::UnshieldWorker::findFiles(const QString &fileName, const QSt
     return result;
 }
 
-QStringList Wizard::UnshieldWorker::findDirectories(const QString &dirName, const QString &path, bool recursive)
+QStringList Wizard::UnshieldWorker::findDirectories(const QString& dirName, const QString& path, bool recursive)
 {
     return findFiles(dirName, path, 0, true, true);
 }
 
-bool Wizard::UnshieldWorker::findInCab(const QString &fileName, const QString &cabFile)
+bool Wizard::UnshieldWorker::findInCab(const QString& fileName, const QString& cabFile)
 {
     QByteArray array(cabFile.toUtf8());
 
-    Unshield *unshield;
+    Unshield* unshield;
     unshield = unshield_open(array.constData());
 
-    if (!unshield) {
+    if (!unshield)
+    {
         emit error(tr("Failed to open InstallShield Cabinet File."), tr("Opening %1 failed.").arg(cabFile));
         unshield_close(unshield);
         return false;
     }
 
-    for (int i=0; i<unshield_file_group_count(unshield); ++i)
+    for (int i = 0; i < unshield_file_group_count(unshield); ++i)
     {
-        UnshieldFileGroup *group = unshield_file_group_get(unshield, i);
+        UnshieldFileGroup* group = unshield_file_group_get(unshield, i);
 
-        for (size_t j=group->first_file; j<=group->last_file; ++j)
+        for (size_t j = group->first_file; j <= group->last_file; ++j)
         {
 
-            if (unshield_file_is_valid(unshield, j)) {
+            if (unshield_file_is_valid(unshield, j))
+            {
                 QString current(QString::fromUtf8(unshield_file_name(unshield, j)));
-                if (current.toLower() == fileName.toLower()) {
+                if (current.toLower() == fileName.toLower())
+                {
                     unshield_close(unshield);
                     return true; // File is found!
                 }
@@ -960,12 +1013,12 @@ bool Wizard::UnshieldWorker::findInCab(const QString &fileName, const QString &c
     return false;
 }
 
-size_t Wizard::UnshieldWorker::getMorrowindBsaFileSize(const QString &cabFile)
+size_t Wizard::UnshieldWorker::getMorrowindBsaFileSize(const QString& cabFile)
 {
     QString fileName = QString("Morrowind.bsa");
     QByteArray array(cabFile.toUtf8());
 
-    Unshield *unshield;
+    Unshield* unshield;
     unshield = unshield_open(array.constData());
 
     if (!unshield)
@@ -977,7 +1030,7 @@ size_t Wizard::UnshieldWorker::getMorrowindBsaFileSize(const QString &cabFile)
 
     for (int i = 0; i < unshield_file_group_count(unshield); ++i)
     {
-        UnshieldFileGroup *group = unshield_file_group_get(unshield, i);
+        UnshieldFileGroup* group = unshield_file_group_get(unshield, i);
 
         for (size_t j = group->first_file; j <= group->last_file; ++j)
         {
diff --git a/apps/wizard/unshield/unshieldworker.hpp b/apps/wizard/unshield/unshieldworker.hpp
index 6e37e734d6..f6bec7e744 100644
--- a/apps/wizard/unshield/unshieldworker.hpp
+++ b/apps/wizard/unshield/unshieldworker.hpp
@@ -2,9 +2,9 @@
 #define UNSHIELDWORKER_HPP
 
 #include <QObject>
-#include <QWaitCondition>
 #include <QReadWriteLock>
 #include <QStringList>
+#include <QWaitCondition>
 
 #include <libunshield.h>
 
@@ -14,7 +14,8 @@
 
 namespace Wizard
 {
-    enum Component {
+    enum Component
+    {
         Component_Morrowind,
         Component_Tribunal,
         Component_Bloodmoon
@@ -25,28 +26,28 @@ namespace Wizard
         Q_OBJECT
 
     public:
-        UnshieldWorker(qint64 expectedMorrowindBsaSize, QObject *parent = nullptr);
+        UnshieldWorker(qint64 expectedMorrowindBsaSize, QObject* parent = nullptr);
         ~UnshieldWorker() override;
 
         void stopWorker();
 
         void setInstallComponent(Wizard::Component component, bool install);
 
-        void setDiskPath(const QString &path);
+        void setDiskPath(const QString& path);
 
-        void setPath(const QString &path);
-        void setIniPath(const QString &path);
+        void setPath(const QString& path);
+        void setIniPath(const QString& path);
 
         void wakeAll();
 
         QString getPath();
         QString getIniPath();
 
-        void setIniCodec(QTextCodec *codec);
+        void setIniCodec(QTextCodec* codec);
 
         bool setupSettings();
 
-        size_t getMorrowindBsaFileSize(const QString &cabFile);
+        size_t getMorrowindBsaFileSize(const QString& cabFile);
 
     private:
         bool writeSettings();
@@ -58,33 +59,33 @@ namespace Wizard
         void setComponentDone(Component component, bool done = true);
         bool getComponentDone(Component component);
 
-        bool removeDirectory(const QString &dirName);
+        bool removeDirectory(const QString& dirName);
 
-        bool copyFile(const QString &source, const QString &destination, bool keepSource = true);
-        bool copyDirectory(const QString &source, const QString &destination, bool keepSource = true);
+        bool copyFile(const QString& source, const QString& destination, bool keepSource = true);
+        bool copyDirectory(const QString& source, const QString& destination, bool keepSource = true);
 
-        bool extractCab(const QString &cabFile, const QString &destination);
-        bool extractFile(Unshield *unshield, const QString &destination, const QString &prefix, int index, int counter);
+        bool extractCab(const QString& cabFile, const QString& destination);
+        bool extractFile(Unshield* unshield, const QString& destination, const QString& prefix, int index, int counter);
 
-        bool findInCab(const QString &fileName, const QString &cabFile);
+        bool findInCab(const QString& fileName, const QString& cabFile);
 
-        QString findFile(const QString &fileName, const QString &path);
+        QString findFile(const QString& fileName, const QString& path);
 
-        QStringList findFiles(const QString &fileName, const QString &path, int depth = 0, bool recursive = true,
-                              bool directories = false, Qt::MatchFlags flags = Qt::MatchExactly);
+        QStringList findFiles(const QString& fileName, const QString& path, int depth = 0, bool recursive = true,
+            bool directories = false, Qt::MatchFlags flags = Qt::MatchExactly);
 
-        QStringList findDirectories(const QString &dirName, const QString &path, bool recursive = true);
+        QStringList findDirectories(const QString& dirName, const QString& path, bool recursive = true);
 
-        bool installFile(const QString &fileName, const QString &path, Qt::MatchFlags flags = Qt::MatchExactly,
-                         bool keepSource = false);
+        bool installFile(const QString& fileName, const QString& path, Qt::MatchFlags flags = Qt::MatchExactly,
+            bool keepSource = false);
 
-        bool installFiles(const QString &fileName, const QString &path, Qt::MatchFlags flags = Qt::MatchExactly,
-                          bool keepSource = false, bool single = false);
+        bool installFiles(const QString& fileName, const QString& path, Qt::MatchFlags flags = Qt::MatchExactly,
+            bool keepSource = false, bool single = false);
 
-        bool installDirectories(const QString &dirName, const QString &path,
-                                bool recursive = true, bool keepSource = false);
+        bool installDirectories(
+            const QString& dirName, const QString& path, bool recursive = true, bool keepSource = false);
 
-        bool installComponent(Component component, const QString &path);
+        bool installComponent(Component component, const QString& path);
         bool setupComponent(Component component);
 
         bool mInstallMorrowind;
@@ -105,7 +106,7 @@ namespace Wizard
 
         IniSettings mIniSettings;
 
-        QTextCodec *mIniCodec;
+        QTextCodec* mIniCodec;
 
         QWaitCondition mWait;
 
@@ -119,11 +120,10 @@ namespace Wizard
         void requestFileDialog(Wizard::Component component);
         void requestOldVersionDialog();
 
-        void textChanged(const QString &text);
+        void textChanged(const QString& text);
 
-        void error(const QString &text, const QString &details);
+        void error(const QString& text, const QString& details);
         void progressChanged(int progress);
-
     };
 }
 
diff --git a/apps/wizard/utils/componentlistwidget.cpp b/apps/wizard/utils/componentlistwidget.cpp
index 7ebc6665b4..4124903b2d 100644
--- a/apps/wizard/utils/componentlistwidget.cpp
+++ b/apps/wizard/utils/componentlistwidget.cpp
@@ -2,16 +2,16 @@
 
 #include <QDebug>
 
-ComponentListWidget::ComponentListWidget(QWidget *parent) :
-    QListWidget(parent)
+ComponentListWidget::ComponentListWidget(QWidget* parent)
+    : QListWidget(parent)
 {
     mCheckedItems = QStringList();
 
-    connect(this, &ComponentListWidget::itemChanged,
-            this, qOverload<QListWidgetItem*>(&ComponentListWidget::updateCheckedItems));
+    connect(this, &ComponentListWidget::itemChanged, this,
+        qOverload<QListWidgetItem*>(&ComponentListWidget::updateCheckedItems));
 
-    connect(model(), &QAbstractItemModel::rowsInserted,
-            this,  qOverload<const QModelIndex &, int, int>(&ComponentListWidget::updateCheckedItems));
+    connect(model(), &QAbstractItemModel::rowsInserted, this,
+        qOverload<const QModelIndex&, int, int>(&ComponentListWidget::updateCheckedItems));
 }
 
 QStringList ComponentListWidget::checkedItems()
@@ -20,22 +20,25 @@ QStringList ComponentListWidget::checkedItems()
     return mCheckedItems;
 }
 
-void ComponentListWidget::updateCheckedItems(const QModelIndex &index, int start, int end)
+void ComponentListWidget::updateCheckedItems(const QModelIndex& index, int start, int end)
 {
     updateCheckedItems(item(start));
 }
 
-void ComponentListWidget::updateCheckedItems(QListWidgetItem *item)
+void ComponentListWidget::updateCheckedItems(QListWidgetItem* item)
 {
     if (!item)
         return;
 
     QString text = item->text();
 
-    if (item->checkState() == Qt::Checked) {
+    if (item->checkState() == Qt::Checked)
+    {
         if (!mCheckedItems.contains(text))
             mCheckedItems.append(text);
-    } else {
+    }
+    else
+    {
         if (mCheckedItems.contains(text))
             mCheckedItems.removeAll(text);
     }
@@ -43,5 +46,4 @@ void ComponentListWidget::updateCheckedItems(QListWidgetItem *item)
     mCheckedItems.removeDuplicates();
 
     emit checkedItemsChanged(mCheckedItems);
-
 }
diff --git a/apps/wizard/utils/componentlistwidget.hpp b/apps/wizard/utils/componentlistwidget.hpp
index be15ea49f7..62947f7b68 100644
--- a/apps/wizard/utils/componentlistwidget.hpp
+++ b/apps/wizard/utils/componentlistwidget.hpp
@@ -10,17 +10,17 @@ class ComponentListWidget : public QListWidget
     Q_PROPERTY(QStringList mCheckedItems READ checkedItems)
 
 public:
-    ComponentListWidget(QWidget *parent = nullptr);
+    ComponentListWidget(QWidget* parent = nullptr);
 
     QStringList mCheckedItems;
     QStringList checkedItems();
 
 signals:
-    void checkedItemsChanged(const QStringList &items);
+    void checkedItemsChanged(const QStringList& items);
 
 private slots:
-    void updateCheckedItems(QListWidgetItem *item);
-    void updateCheckedItems(const QModelIndex &index, int start, int end);
+    void updateCheckedItems(QListWidgetItem* item);
+    void updateCheckedItems(const QModelIndex& index, int start, int end);
 };
 
 #endif // COMPONENTLISTWIDGET_HPP
diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp
index 6a621d91a8..aae63746d5 100644
--- a/components/bsa/bsa_file.cpp
+++ b/components/bsa/bsa_file.cpp
@@ -33,32 +33,34 @@
 
 using namespace Bsa;
 
-
 /// Error handling
-[[noreturn]] void BSAFile::fail(const std::string &msg) const
+[[noreturn]] void BSAFile::fail(const std::string& msg) const
 {
     throw std::runtime_error("BSA Error: " + msg + "\nArchive: " + Files::pathToUnicodeString(mFilepath));
 }
 
-//the getHash code is from bsapack from ghostwheel
-//the code is also the same as in https://github.com/arviceblot/bsatool_rs/commit/67cb59ec3aaeedc0849222ea387f031c33e48c81
+// the getHash code is from bsapack from ghostwheel
+// the code is also the same as in
+// https://github.com/arviceblot/bsatool_rs/commit/67cb59ec3aaeedc0849222ea387f031c33e48c81
 BSAFile::Hash getHash(const std::string& name)
 {
     BSAFile::Hash hash;
     unsigned l = (static_cast<unsigned>(name.size()) >> 1);
     unsigned sum, off, temp, i, n;
 
-    for (sum = off = i = 0; i < l; i++) {
+    for (sum = off = i = 0; i < l; i++)
+    {
         sum ^= (((unsigned)(name[i])) << (off & 0x1F));
         off += 8;
     }
     hash.low = sum;
 
-    for (sum = off = 0; i < name.size(); i++) {
+    for (sum = off = 0; i < name.size(); i++)
+    {
         temp = (((unsigned)(name[i])) << (off & 0x1F));
         sum ^= temp;
         n = temp & 0x1F;
-        sum = (sum << (32 - n)) | (sum >> n);  // binary "rotate right"
+        sum = (sum << (32 - n)) | (sum >> n); // binary "rotate right"
         off += 8;
     }
     hash.high = sum;
@@ -104,13 +106,13 @@ void BSAFile::readHeader()
 
     // Total archive size
     std::streamoff fsize = 0;
-    if(input.seekg(0, std::ios_base::end))
+    if (input.seekg(0, std::ios_base::end))
     {
         fsize = input.tellg();
         input.seekg(0);
     }
 
-    if(fsize < 12)
+    if (fsize < 12)
         fail("File too small to be a valid BSA archive");
 
     // Get essential header numbers
@@ -121,7 +123,7 @@ void BSAFile::readHeader()
 
         input.read(reinterpret_cast<char*>(head), 12);
 
-        if(head[0] != 0x100)
+        if (head[0] != 0x100)
             fail("Unrecognized BSA header");
 
         // Total number of bytes used in size/offset-table + filename
@@ -135,60 +137,60 @@ void BSAFile::readHeader()
     // Each file must take up at least 21 bytes of data in the bsa. So
     // if files*21 overflows the file size then we are guaranteed that
     // the archive is corrupt.
-    if((filenum*21 > unsigned(fsize -12)) || (dirsize+8*filenum > unsigned(fsize -12)) )
+    if ((filenum * 21 > unsigned(fsize - 12)) || (dirsize + 8 * filenum > unsigned(fsize - 12)))
         fail("Directory information larger than entire archive");
 
     // Read the offset info into a temporary buffer
-    std::vector<uint32_t> offsets(3*filenum);
-    input.read(reinterpret_cast<char*>(offsets.data()), 12*filenum);
+    std::vector<uint32_t> offsets(3 * filenum);
+    input.read(reinterpret_cast<char*>(offsets.data()), 12 * filenum);
 
     // Read the string table
-    mStringBuf.resize(dirsize-12*filenum);
+    mStringBuf.resize(dirsize - 12 * filenum);
     input.read(mStringBuf.data(), mStringBuf.size());
 
     // Check our position
-    assert(input.tellg() == std::streampos(12+dirsize));
+    assert(input.tellg() == std::streampos(12 + dirsize));
     std::vector<Hash> hashes(filenum);
     static_assert(sizeof(Hash) == 8);
-    input.read(reinterpret_cast<char*>(hashes.data()), 8*filenum);
+    input.read(reinterpret_cast<char*>(hashes.data()), 8 * filenum);
 
     // Calculate the offset of the data buffer. All file offsets are
     // relative to this. 12 header bytes + directory + hash table
     // (skipped)
-    size_t fileDataOffset = 12 + dirsize + 8*filenum;
+    size_t fileDataOffset = 12 + dirsize + 8 * filenum;
 
     // Set up the the FileStruct table
     mFiles.resize(filenum);
     size_t endOfNameBuffer = 0;
-    for(size_t i=0;i<filenum;i++)
+    for (size_t i = 0; i < filenum; i++)
     {
-        FileStruct &fs = mFiles[i];
-        fs.fileSize = offsets[i*2];
-        fs.offset = static_cast<uint32_t>(offsets[i*2+1] + fileDataOffset);
-        auto namesOffset = offsets[2*filenum+i];
+        FileStruct& fs = mFiles[i];
+        fs.fileSize = offsets[i * 2];
+        fs.offset = static_cast<uint32_t>(offsets[i * 2 + 1] + fileDataOffset);
+        auto namesOffset = offsets[2 * filenum + i];
         fs.setNameInfos(namesOffset, &mStringBuf);
         fs.hash = hashes[i];
 
-        if (namesOffset >= mStringBuf.size()) {
+        if (namesOffset >= mStringBuf.size())
+        {
             fail("Archive contains names offset outside itself");
         }
-        const void* end = std::memchr(fs.name(), '\0', mStringBuf.size()-namesOffset);
-        if (!end) {
+        const void* end = std::memchr(fs.name(), '\0', mStringBuf.size() - namesOffset);
+        if (!end)
+        {
             fail("Archive contains non-zero terminated string");
         }
 
-        endOfNameBuffer = std::max(endOfNameBuffer, namesOffset + std::strlen(fs.name())+1);
+        endOfNameBuffer = std::max(endOfNameBuffer, namesOffset + std::strlen(fs.name()) + 1);
         assert(endOfNameBuffer <= mStringBuf.size());
 
-        if(fs.offset + fs.fileSize > fsize)
+        if (fs.offset + fs.fileSize > fsize)
             fail("Archive contains offsets outside itself");
-
     }
     mStringBuf.resize(endOfNameBuffer);
 
-    std::sort(mFiles.begin(), mFiles.end(), [](const FileStruct& left, const FileStruct& right) {
-        return left.offset < right.offset;
-    });
+    std::sort(mFiles.begin(), mFiles.end(),
+        [](const FileStruct& left, const FileStruct& right) { return left.offset < right.offset; });
 
     mIsLoaded = true;
 }
@@ -201,7 +203,7 @@ void Bsa::BSAFile::writeHeader()
     uint32_t head[3];
     head[0] = 0x100;
     auto fileDataOffset = mFiles.empty() ? 12 : mFiles.front().offset;
-    head[1] = static_cast<uint32_t>(fileDataOffset - 12 - 8*mFiles.size());
+    head[1] = static_cast<uint32_t>(fileDataOffset - 12 - 8 * mFiles.size());
 
     output.seekp(0, std::ios_base::end);
 
@@ -214,34 +216,36 @@ void Bsa::BSAFile::writeHeader()
     });
 
     size_t filenum = mFiles.size();
-    std::vector<uint32_t> offsets(3* filenum);
+    std::vector<uint32_t> offsets(3 * filenum);
     std::vector<Hash> hashes(filenum);
-    for(size_t i=0;i<filenum;i++)
+    for (size_t i = 0; i < filenum; i++)
     {
         auto& f = mFiles[i];
-        offsets[i*2] = f.fileSize;
-        offsets[i*2+1] = f.offset - fileDataOffset;
-        offsets[2*filenum+i] = f.namesOffset;
+        offsets[i * 2] = f.fileSize;
+        offsets[i * 2 + 1] = f.offset - fileDataOffset;
+        offsets[2 * filenum + i] = f.namesOffset;
         hashes[i] = f.hash;
     }
-    output.write(reinterpret_cast<char*>(offsets.data()), sizeof(uint32_t)*offsets.size());
+    output.write(reinterpret_cast<char*>(offsets.data()), sizeof(uint32_t) * offsets.size());
     output.write(reinterpret_cast<char*>(mStringBuf.data()), mStringBuf.size());
-    output.seekp(fileDataOffset - 8*mFiles.size(), std::ios_base::beg);
-    output.write(reinterpret_cast<char*>(hashes.data()), sizeof(Hash)*hashes.size());
+    output.seekp(fileDataOffset - 8 * mFiles.size(), std::ios_base::beg);
+    output.write(reinterpret_cast<char*>(hashes.data()), sizeof(Hash) * hashes.size());
 }
 
 /// Open an archive file.
-void BSAFile::open(const std::filesystem::path &file)
+void BSAFile::open(const std::filesystem::path& file)
 {
     if (mIsLoaded)
         close();
 
     mFilepath = file;
-    if(std::filesystem::exists(file))
+    if (std::filesystem::exists(file))
         readHeader();
     else
     {
-        { std::fstream(mFilepath, std::ios::binary | std::ios::out); }
+        {
+            std::fstream(mFilepath, std::ios::binary | std::ios::out);
+        }
         writeHeader();
         mIsLoaded = true;
     }
@@ -258,7 +262,7 @@ void Bsa::BSAFile::close()
     mIsLoaded = false;
 }
 
-Files::IStreamPtr Bsa::BSAFile::getFile(const FileStruct *file)
+Files::IStreamPtr Bsa::BSAFile::getFile(const FileStruct* file)
 {
     return Files::openConstrainedFileStream(mFilepath, file->offset, file->fileSize);
 }
@@ -280,12 +284,13 @@ void Bsa::BSAFile::addFile(const std::string& filename, std::istream& file)
     newFile.setNameInfos(mStringBuf.size(), &mStringBuf);
     newFile.hash = getHash(filename);
 
-    if(mFiles.empty())
+    if (mFiles.empty())
         newFile.offset = static_cast<uint32_t>(newStartOfDataBuffer);
     else
     {
         std::vector<char> buffer;
-        while (mFiles.front().offset < newStartOfDataBuffer) {
+        while (mFiles.front().offset < newStartOfDataBuffer)
+        {
             FileStruct& firstFile = mFiles.front();
             buffer.resize(firstFile.fileSize);
 
@@ -297,7 +302,7 @@ void Bsa::BSAFile::addFile(const std::string& filename, std::istream& file)
 
             stream.write(buffer.data(), firstFile.fileSize);
 
-            //ensure sort order is preserved
+            // ensure sort order is preserved
             std::rotate(mFiles.begin(), mFiles.begin() + 1, mFiles.end());
         }
         stream.seekp(0, std::ios::end);
diff --git a/components/bsa/bsa_file.hpp b/components/bsa/bsa_file.hpp
index b7f3b107fb..8c27e9548e 100644
--- a/components/bsa/bsa_file.hpp
+++ b/components/bsa/bsa_file.hpp
@@ -25,119 +25,120 @@
 #define BSA_BSA_FILE_H
 
 #include <cstdint>
+#include <filesystem>
 #include <string>
 #include <vector>
-#include <filesystem>
 
-#include <components/files/istreamptr.hpp>
 #include <components/files/conversion.hpp>
+#include <components/files/istreamptr.hpp>
 
 namespace Bsa
 {
 
-/**
-   This class is used to read "Bethesda Archive Files", or BSAs.
- */
-class BSAFile
-{
-public:
-
-    #pragma pack(push)
-    #pragma pack(1)
-    struct Hash
-    {
-        uint32_t low, high;
-    };
-    #pragma pack(pop)
-
-    /// Represents one file entry in the archive
-    struct FileStruct
+    /**
+       This class is used to read "Bethesda Archive Files", or BSAs.
+     */
+    class BSAFile
     {
-        void setNameInfos(size_t index,
-            std::vector<char>* stringBuf
-        ) {
-            namesOffset = static_cast<uint32_t>(index);
-            namesBuffer = stringBuf;
+    public:
+#pragma pack(push)
+#pragma pack(1)
+        struct Hash
+        {
+            uint32_t low, high;
+        };
+#pragma pack(pop)
+
+        /// Represents one file entry in the archive
+        struct FileStruct
+        {
+            void setNameInfos(size_t index, std::vector<char>* stringBuf)
+            {
+                namesOffset = static_cast<uint32_t>(index);
+                namesBuffer = stringBuf;
+            }
+
+            // File size and offset in file. We store the offset from the
+            // beginning of the file, not the offset into the data buffer
+            // (which is what is stored in the archive.)
+            uint32_t fileSize, offset;
+            Hash hash;
+
+            // Zero-terminated file name
+            const char* name() const { return &(*namesBuffer)[namesOffset]; };
+
+            uint32_t namesOffset = 0;
+            std::vector<char>* namesBuffer = nullptr;
+        };
+        typedef std::vector<FileStruct> FileList;
+
+    protected:
+        bool mHasChanged = false;
+
+        /// Table of files in this archive
+        FileList mFiles;
+
+        /// Filename string buffer
+        std::vector<char> mStringBuf;
+
+        /// True when an archive has been loaded
+        bool mIsLoaded;
+
+        /// Used for error messages
+        std::filesystem::path mFilepath;
+
+        /// Error handling
+        [[noreturn]] void fail(const std::string& msg) const;
+
+        /// Read header information from the input source
+        virtual void readHeader();
+        virtual void writeHeader();
+
+    public:
+        /* -----------------------------------
+         * BSA management methods
+         * -----------------------------------
+         */
+
+        BSAFile()
+            : mIsLoaded(false)
+        {
         }
 
-        // File size and offset in file. We store the offset from the
-        // beginning of the file, not the offset into the data buffer
-        // (which is what is stored in the archive.)
-        uint32_t fileSize, offset;
-        Hash hash;
-
-        // Zero-terminated file name
-        const char* name() const { return &(*namesBuffer)[namesOffset]; };
-
-        uint32_t namesOffset = 0;
-        std::vector<char>* namesBuffer = nullptr;
-    };
-    typedef std::vector<FileStruct> FileList;
-
-protected:
-    bool mHasChanged = false;
-
-    /// Table of files in this archive
-    FileList mFiles;
-
-    /// Filename string buffer
-    std::vector<char> mStringBuf;
-
-    /// True when an archive has been loaded
-    bool mIsLoaded;
-
-    /// Used for error messages
-    std::filesystem::path mFilepath;
-
-    /// Error handling
-    [[noreturn]] void fail(const std::string &msg) const;
-
-    /// Read header information from the input source
-    virtual void readHeader();
-    virtual void writeHeader();
-
-public:
-    /* -----------------------------------
-     * BSA management methods
-     * -----------------------------------
-     */
-
-    BSAFile()
-      : mIsLoaded(false)
-    { }
-
-    virtual ~BSAFile()
-    {
-        close();
-    }
+        virtual ~BSAFile()
+        {
+            close();
+        }
 
-    /// Open an archive file.
-    void open(const std::filesystem::path &file);
+        /// Open an archive file.
+        void open(const std::filesystem::path& file);
 
-    void close();
+        void close();
 
-    /* -----------------------------------
-     * Archive file routines
-     * -----------------------------------
-     */
+        /* -----------------------------------
+         * Archive file routines
+         * -----------------------------------
+         */
 
-    /** Open a file contained in the archive.
-     * @note Thread safe.
-    */
-    Files::IStreamPtr getFile(const FileStruct *file);
+        /** Open a file contained in the archive.
+         * @note Thread safe.
+         */
+        Files::IStreamPtr getFile(const FileStruct* file);
 
-    void addFile(const std::string& filename, std::istream& file);
+        void addFile(const std::string& filename, std::istream& file);
 
-    /// Get a list of all files
-    /// @note Thread safe.
-    const FileList &getList() const
-    { return mFiles; }
+        /// Get a list of all files
+        /// @note Thread safe.
+        const FileList& getList() const
+        {
+            return mFiles;
+        }
 
-    std::string getFilename() const
-    {
-        return Files::pathToUnicodeString(mFilepath);
-    }
-};
+        std::string getFilename() const
+        {
+            return Files::pathToUnicodeString(mFilepath);
+        }
+    };
 
 }
 
diff --git a/components/bsa/compressedbsafile.cpp b/components/bsa/compressedbsafile.cpp
index ac50ef0c22..8c1706ffe7 100644
--- a/components/bsa/compressedbsafile.cpp
+++ b/components/bsa/compressedbsafile.cpp
@@ -24,488 +24,514 @@
  */
 #include "compressedbsafile.hpp"
 
-#include <stdexcept>
 #include <cassert>
 #include <filesystem>
 #include <fstream>
+#include <stdexcept>
 
 #include <lz4frame.h>
 
-
-#include <boost/iostreams/filtering_streambuf.hpp>
 #include <boost/iostreams/copy.hpp>
+#include <boost/iostreams/filtering_streambuf.hpp>
 
 #if defined(_MSC_VER)
-    #pragma warning (push)
-    #pragma warning (disable : 4706)
-    #include <boost/iostreams/filter/zlib.hpp>
-    #pragma warning (pop)
+#pragma warning(push)
+#pragma warning(disable : 4706)
+#include <boost/iostreams/filter/zlib.hpp>
+#pragma warning(pop)
 #else
-    #include <boost/iostreams/filter/zlib.hpp>
+#include <boost/iostreams/filter/zlib.hpp>
 #endif
 
 #include <boost/iostreams/device/array.hpp>
 #include <components/bsa/memorystream.hpp>
-#include <components/misc/strings/lower.hpp>
 #include <components/files/constrainedfilestream.hpp>
 #include <components/files/conversion.hpp>
+#include <components/misc/strings/lower.hpp>
 
 namespace Bsa
 {
-//special marker for invalid records,
-//equal to max uint32_t value
-const uint32_t CompressedBSAFile::sInvalidOffset = std::numeric_limits<uint32_t>::max();
-
-//bit marking compression on file size
-const uint32_t CompressedBSAFile::sCompressedFlag = 1u << 30u;
-
-
-CompressedBSAFile::FileRecord::FileRecord() : size(0), offset(sInvalidOffset)
-{ }
-
-bool CompressedBSAFile::FileRecord::isValid() const
-{
-    return offset != sInvalidOffset;
-}
+    // special marker for invalid records,
+    // equal to max uint32_t value
+    const uint32_t CompressedBSAFile::sInvalidOffset = std::numeric_limits<uint32_t>::max();
 
-bool CompressedBSAFile::FileRecord::isCompressed(bool bsaCompressedByDefault) const
-{
-    bool recordCompressionFlagEnabled = ((size & sCompressedFlag) == sCompressedFlag);
-
-    //record is compressed when:
-    //- bsaCompressedByDefault flag is set and 30th bit is NOT set, or
-    //- bsaCompressedByDefault flag is NOT set and 30th bit is set
-    //record is NOT compressed when:
-    //- bsaCompressedByDefault flag is NOT set and 30th bit is NOT set, or
-    //- bsaCompressedByDefault flag is set and 30th bit is set
-    return (bsaCompressedByDefault != recordCompressionFlagEnabled);
-}
-
-std::uint32_t CompressedBSAFile::FileRecord::getSizeWithoutCompressionFlag() const {
-    return size & (~sCompressedFlag);
-}
-
-void CompressedBSAFile::getBZString(std::string& str, std::istream& filestream)
-{
-    char size = 0;
-    filestream.read(&size, 1);
+    // bit marking compression on file size
+    const uint32_t CompressedBSAFile::sCompressedFlag = 1u << 30u;
 
-    auto buf = std::vector<char>(size);
-    filestream.read(buf.data(), size);
+    CompressedBSAFile::FileRecord::FileRecord()
+        : size(0)
+        , offset(sInvalidOffset)
+    {
+    }
 
-    if (buf[size - 1] != 0)
+    bool CompressedBSAFile::FileRecord::isValid() const
     {
-        str.assign(buf.data(), size);
-        if (str.size() != ((size_t)size)) {
-            fail("getBZString string size mismatch");
-        }
+        return offset != sInvalidOffset;
     }
-    else
+
+    bool CompressedBSAFile::FileRecord::isCompressed(bool bsaCompressedByDefault) const
     {
-        str.assign(buf.data(), size - 1); // don't copy null terminator
-        if (str.size() != ((size_t)size - 1)) {
-            fail("getBZString string size mismatch (null terminator)");
-        }
+        bool recordCompressionFlagEnabled = ((size & sCompressedFlag) == sCompressedFlag);
+
+        // record is compressed when:
+        //- bsaCompressedByDefault flag is set and 30th bit is NOT set, or
+        //- bsaCompressedByDefault flag is NOT set and 30th bit is set
+        // record is NOT compressed when:
+        //- bsaCompressedByDefault flag is NOT set and 30th bit is NOT set, or
+        //- bsaCompressedByDefault flag is set and 30th bit is set
+        return (bsaCompressedByDefault != recordCompressionFlagEnabled);
     }
-}
 
-CompressedBSAFile::CompressedBSAFile()
-    : mCompressedByDefault(false), mEmbeddedFileNames(false)
-{ }
+    std::uint32_t CompressedBSAFile::FileRecord::getSizeWithoutCompressionFlag() const
+    {
+        return size & (~sCompressedFlag);
+    }
 
-CompressedBSAFile::~CompressedBSAFile() = default;
+    void CompressedBSAFile::getBZString(std::string& str, std::istream& filestream)
+    {
+        char size = 0;
+        filestream.read(&size, 1);
 
-/// Read header information from the input source
-void CompressedBSAFile::readHeader()
-{
-    assert(!mIsLoaded);
+        auto buf = std::vector<char>(size);
+        filestream.read(buf.data(), size);
 
-    std::ifstream input(mFilepath, std::ios_base::binary);
+        if (buf[size - 1] != 0)
+        {
+            str.assign(buf.data(), size);
+            if (str.size() != ((size_t)size))
+            {
+                fail("getBZString string size mismatch");
+            }
+        }
+        else
+        {
+            str.assign(buf.data(), size - 1); // don't copy null terminator
+            if (str.size() != ((size_t)size - 1))
+            {
+                fail("getBZString string size mismatch (null terminator)");
+            }
+        }
+    }
 
-    // Total archive size
-    std::streamoff fsize = 0;
-    if(input.seekg(0, std::ios_base::end))
+    CompressedBSAFile::CompressedBSAFile()
+        : mCompressedByDefault(false)
+        , mEmbeddedFileNames(false)
     {
-        fsize = input.tellg();
-        input.seekg(0);
     }
 
-    if(fsize < 36) // header is 36 bytes
-        fail("File too small to be a valid BSA archive");
+    CompressedBSAFile::~CompressedBSAFile() = default;
 
-    // Get essential header numbers
-    //size_t dirsize, filenum;
-    std::uint32_t archiveFlags, folderCount, totalFileNameLength;
+    /// Read header information from the input source
+    void CompressedBSAFile::readHeader()
     {
-        // First 36 bytes
-        std::uint32_t header[9];
-
-        input.read(reinterpret_cast<char*>(header), 36);
-
-        if (header[0] != 0x00415342) /*"BSA\x00"*/
-            fail("Unrecognized compressed BSA format");
-        mVersion = header[1];
-        if (mVersion != 0x67 /*TES4*/ && mVersion != 0x68 /*FO3, FNV, TES5*/ && mVersion != 0x69 /*SSE*/)
-            fail("Unrecognized compressed BSA version");
-
-        // header[2] is offset, should be 36 = 0x24 which is the size of the header
-
-        // Oblivion - Meshes.bsa
-        //
-        // 0111 1000 0111 = 0x0787
-        //  ^^^ ^     ^^^
-        //  ||| |     ||+-- has names for dirs  (mandatory?)
-        //  ||| |     |+--- has names for files (mandatory?)
-        //  ||| |     +---- files are compressed by default
-        //  ||| |
-        //  ||| +---------- unknown (TES5: retain strings during startup)
-        //  ||+------------ unknown (TES5: embedded file names)
-        //  |+------------- unknown
-        //  +-------------- unknown
-        //
-        archiveFlags          = header[3];
-        folderCount           = header[4];
-        // header[5] - fileCount
-        // totalFolderNameLength = header[6];
-        totalFileNameLength   = header[7];
-        // header[8]; // fileFlags : an opportunity to optimize here
-
-        mCompressedByDefault = (archiveFlags & 0x4) != 0;
-        if (mVersion == 0x68 || mVersion == 0x69) /*FO3, FNV, TES5, SSE*/
-            mEmbeddedFileNames = (archiveFlags & 0x100) != 0;
-    }
+        assert(!mIsLoaded);
 
-    // folder records
-    std::uint64_t hash;
-    FolderRecord fr;
-    for (std::uint32_t i = 0; i < folderCount; ++i)
-    {
-        input.read(reinterpret_cast<char*>(&hash), 8);
-        input.read(reinterpret_cast<char*>(&fr.count), 4); // not sure purpose of count
-        if (mVersion == 0x69) // SSE
+        std::ifstream input(mFilepath, std::ios_base::binary);
+
+        // Total archive size
+        std::streamoff fsize = 0;
+        if (input.seekg(0, std::ios_base::end))
         {
-            std::uint32_t unknown;
-            input.read(reinterpret_cast<char*>(&unknown), 4);
-            input.read(reinterpret_cast<char*>(&fr.offset), 8);
+            fsize = input.tellg();
+            input.seekg(0);
         }
-        else
-            input.read(reinterpret_cast<char*>(&fr.offset), 4); // not sure purpose of offset
 
-        auto lb = mFolders.lower_bound(hash);
-        if (lb != mFolders.end() && !(mFolders.key_comp()(hash, lb->first)))
-            fail("Archive found duplicate folder name hash");
-        else
-            mFolders.insert(lb, std::pair<std::uint64_t, FolderRecord>(hash, fr));
-    }
+        if (fsize < 36) // header is 36 bytes
+            fail("File too small to be a valid BSA archive");
 
-    // file record blocks
-    std::uint64_t fileHash;
-    FileRecord file;
+        // Get essential header numbers
+        // size_t dirsize, filenum;
+        std::uint32_t archiveFlags, folderCount, totalFileNameLength;
+        {
+            // First 36 bytes
+            std::uint32_t header[9];
+
+            input.read(reinterpret_cast<char*>(header), 36);
+
+            if (header[0] != 0x00415342) /*"BSA\x00"*/
+                fail("Unrecognized compressed BSA format");
+            mVersion = header[1];
+            if (mVersion != 0x67 /*TES4*/ && mVersion != 0x68 /*FO3, FNV, TES5*/ && mVersion != 0x69 /*SSE*/)
+                fail("Unrecognized compressed BSA version");
+
+            // header[2] is offset, should be 36 = 0x24 which is the size of the header
+
+            // Oblivion - Meshes.bsa
+            //
+            // 0111 1000 0111 = 0x0787
+            //  ^^^ ^     ^^^
+            //  ||| |     ||+-- has names for dirs  (mandatory?)
+            //  ||| |     |+--- has names for files (mandatory?)
+            //  ||| |     +---- files are compressed by default
+            //  ||| |
+            //  ||| +---------- unknown (TES5: retain strings during startup)
+            //  ||+------------ unknown (TES5: embedded file names)
+            //  |+------------- unknown
+            //  +-------------- unknown
+            //
+            archiveFlags = header[3];
+            folderCount = header[4];
+            // header[5] - fileCount
+            // totalFolderNameLength = header[6];
+            totalFileNameLength = header[7];
+            // header[8]; // fileFlags : an opportunity to optimize here
+
+            mCompressedByDefault = (archiveFlags & 0x4) != 0;
+            if (mVersion == 0x68 || mVersion == 0x69) /*FO3, FNV, TES5, SSE*/
+                mEmbeddedFileNames = (archiveFlags & 0x100) != 0;
+        }
 
-    std::string folder;
-    std::uint64_t folderHash;
-    if ((archiveFlags & 0x1) == 0)
-        folderCount = 1; // TODO: not tested - unit test necessary
+        // folder records
+        std::uint64_t hash;
+        FolderRecord fr;
+        for (std::uint32_t i = 0; i < folderCount; ++i)
+        {
+            input.read(reinterpret_cast<char*>(&hash), 8);
+            input.read(reinterpret_cast<char*>(&fr.count), 4); // not sure purpose of count
+            if (mVersion == 0x69) // SSE
+            {
+                std::uint32_t unknown;
+                input.read(reinterpret_cast<char*>(&unknown), 4);
+                input.read(reinterpret_cast<char*>(&fr.offset), 8);
+            }
+            else
+                input.read(reinterpret_cast<char*>(&fr.offset), 4); // not sure purpose of offset
+
+            auto lb = mFolders.lower_bound(hash);
+            if (lb != mFolders.end() && !(mFolders.key_comp()(hash, lb->first)))
+                fail("Archive found duplicate folder name hash");
+            else
+                mFolders.insert(lb, std::pair<std::uint64_t, FolderRecord>(hash, fr));
+        }
 
-    mFiles.clear();
-    std::vector<std::string> fullPaths;
-    
-    for (std::uint32_t i = 0; i < folderCount; ++i)
-    {
-        if ((archiveFlags & 0x1) != 0)
-            getBZString(folder, input);
+        // file record blocks
+        std::uint64_t fileHash;
+        FileRecord file;
 
-        folderHash = generateHash(folder, {});
+        std::string folder;
+        std::uint64_t folderHash;
+        if ((archiveFlags & 0x1) == 0)
+            folderCount = 1; // TODO: not tested - unit test necessary
 
-        auto iter = mFolders.find(folderHash);
-        if (iter == mFolders.end())
-            fail("Archive folder name hash not found");
+        mFiles.clear();
+        std::vector<std::string> fullPaths;
 
-        for (std::uint32_t j = 0; j < iter->second.count; ++j)
+        for (std::uint32_t i = 0; i < folderCount; ++i)
         {
-            input.read(reinterpret_cast<char*>(&fileHash), 8);
-            input.read(reinterpret_cast<char*>(&file.size), 4);
-            input.read(reinterpret_cast<char*>(&file.offset), 4);
+            if ((archiveFlags & 0x1) != 0)
+                getBZString(folder, input);
 
-            auto lb = iter->second.files.lower_bound(fileHash);
-            if (lb != iter->second.files.end() && !(iter->second.files.key_comp()(fileHash, lb->first)))
-                fail("Archive found duplicate file name hash");
+            folderHash = generateHash(folder, {});
 
-            iter->second.files.insert(lb, std::pair<std::uint64_t, FileRecord>(fileHash, file));
+            auto iter = mFolders.find(folderHash);
+            if (iter == mFolders.end())
+                fail("Archive folder name hash not found");
 
-            FileStruct fileStruct{};
-            fileStruct.fileSize = file.getSizeWithoutCompressionFlag();
-            fileStruct.offset = file.offset;
-            mFiles.push_back(fileStruct);
+            for (std::uint32_t j = 0; j < iter->second.count; ++j)
+            {
+                input.read(reinterpret_cast<char*>(&fileHash), 8);
+                input.read(reinterpret_cast<char*>(&file.size), 4);
+                input.read(reinterpret_cast<char*>(&file.offset), 4);
 
-            fullPaths.push_back(folder);
-        }
-    }
+                auto lb = iter->second.files.lower_bound(fileHash);
+                if (lb != iter->second.files.end() && !(iter->second.files.key_comp()(fileHash, lb->first)))
+                    fail("Archive found duplicate file name hash");
 
-    // file record blocks
-    if ((archiveFlags & 0x2) != 0)
-    {
-        mStringBuf.resize(totalFileNameLength);
-        input.read(mStringBuf.data(), mStringBuf.size()); // TODO: maybe useful in building a lookup map?
-    }
+                iter->second.files.insert(lb, std::pair<std::uint64_t, FileRecord>(fileHash, file));
 
-    size_t mStringBuffOffset = 0;
-    size_t totalStringsSize = 0;
-    for (std::uint32_t fileIndex = 0; fileIndex < mFiles.size(); ++fileIndex) {
+                FileStruct fileStruct{};
+                fileStruct.fileSize = file.getSizeWithoutCompressionFlag();
+                fileStruct.offset = file.offset;
+                mFiles.push_back(fileStruct);
 
-        if (mStringBuffOffset >= totalFileNameLength) {
-            fail("Corrupted names record in BSA file");
+                fullPaths.push_back(folder);
+            }
         }
 
-        //The vector guarantees that its elements occupy contiguous memory
-        mFiles[fileIndex].setNameInfos(mStringBuffOffset, &mStringBuf);
+        // file record blocks
+        if ((archiveFlags & 0x2) != 0)
+        {
+            mStringBuf.resize(totalFileNameLength);
+            input.read(mStringBuf.data(), mStringBuf.size()); // TODO: maybe useful in building a lookup map?
+        }
 
-        fullPaths.at(fileIndex) += "\\" + std::string(mStringBuf.data() + mStringBuffOffset);
+        size_t mStringBuffOffset = 0;
+        size_t totalStringsSize = 0;
+        for (std::uint32_t fileIndex = 0; fileIndex < mFiles.size(); ++fileIndex)
+        {
 
-        while (mStringBuffOffset < totalFileNameLength) {
-            if (mStringBuf[mStringBuffOffset] != '\0') {
-                mStringBuffOffset++;
+            if (mStringBuffOffset >= totalFileNameLength)
+            {
+                fail("Corrupted names record in BSA file");
             }
-            else {
-                mStringBuffOffset++;
-                break;
+
+            // The vector guarantees that its elements occupy contiguous memory
+            mFiles[fileIndex].setNameInfos(mStringBuffOffset, &mStringBuf);
+
+            fullPaths.at(fileIndex) += "\\" + std::string(mStringBuf.data() + mStringBuffOffset);
+
+            while (mStringBuffOffset < totalFileNameLength)
+            {
+                if (mStringBuf[mStringBuffOffset] != '\0')
+                {
+                    mStringBuffOffset++;
+                }
+                else
+                {
+                    mStringBuffOffset++;
+                    break;
+                }
             }
+            // we want to keep one more 0 character at the end of each string
+            totalStringsSize += fullPaths.at(fileIndex).length() + 1u;
         }
-        //we want to keep one more 0 character at the end of each string
-        totalStringsSize += fullPaths.at(fileIndex).length() + 1u;
-    }
-    mStringBuf.resize(totalStringsSize);
+        mStringBuf.resize(totalStringsSize);
 
-    mStringBuffOffset = 0;
-    for (std::uint32_t fileIndex = 0u; fileIndex < mFiles.size(); fileIndex++) {
-        size_t stringLength = fullPaths.at(fileIndex).length();
+        mStringBuffOffset = 0;
+        for (std::uint32_t fileIndex = 0u; fileIndex < mFiles.size(); fileIndex++)
+        {
+            size_t stringLength = fullPaths.at(fileIndex).length();
 
-        std::copy(fullPaths.at(fileIndex).c_str(),
-            //plus 1 because we also want to copy 0 at the end of the string
-            fullPaths.at(fileIndex).c_str() + stringLength + 1u,
-            mStringBuf.data() + mStringBuffOffset);
+            std::copy(fullPaths.at(fileIndex).c_str(),
+                // plus 1 because we also want to copy 0 at the end of the string
+                fullPaths.at(fileIndex).c_str() + stringLength + 1u, mStringBuf.data() + mStringBuffOffset);
 
-        mFiles[fileIndex].setNameInfos(mStringBuffOffset, &mStringBuf);
+            mFiles[fileIndex].setNameInfos(mStringBuffOffset, &mStringBuf);
 
-        mStringBuffOffset += stringLength + 1u;
-    }
+            mStringBuffOffset += stringLength + 1u;
+        }
 
-    if (mStringBuffOffset != mStringBuf.size()) {
-        fail("Could not resolve names of files in BSA file");
-    }
+        if (mStringBuffOffset != mStringBuf.size())
+        {
+            fail("Could not resolve names of files in BSA file");
+        }
 
-    convertCompressedSizesToUncompressed();
-    mIsLoaded = true;
-}
+        convertCompressedSizesToUncompressed();
+        mIsLoaded = true;
+    }
 
-CompressedBSAFile::FileRecord CompressedBSAFile::getFileRecord(const std::string& str) const
-{
-    for (const auto c : str)
+    CompressedBSAFile::FileRecord CompressedBSAFile::getFileRecord(const std::string& str) const
     {
-        if (((static_cast<unsigned>(c) >> 7U) & 1U) != 0U) {
-            fail("File record " + str + " contains unicode characters, refusing to load.");
+        for (const auto c : str)
+        {
+            if (((static_cast<unsigned>(c) >> 7U) & 1U) != 0U)
+            {
+                fail("File record " + str + " contains unicode characters, refusing to load.");
+            }
         }
-    }
 
 #ifdef _WIN32
-    const auto& path = str;
+        const auto& path = str;
 #else
-    // Force-convert the path into something UNIX can handle first
-    // to make sure std::filesystem::path doesn't think the entire path is the filename on Linux
-    // and subsequently purge it to determine the file folder.
-    std::string path = str;
-    std::replace(path.begin(), path.end(), '\\', '/');
+        // Force-convert the path into something UNIX can handle first
+        // to make sure std::filesystem::path doesn't think the entire path is the filename on Linux
+        // and subsequently purge it to determine the file folder.
+        std::string path = str;
+        std::replace(path.begin(), path.end(), '\\', '/');
 #endif
 
-    const auto p = std::filesystem::path{ path }; // Purposefully damage Unicode strings.
-    const auto stem = p.stem();
-    const auto ext = p.extension().string();  // Purposefully damage Unicode strings.
-
-    std::uint64_t folderHash = generateHash(p.parent_path(), {});
+        const auto p = std::filesystem::path{ path }; // Purposefully damage Unicode strings.
+        const auto stem = p.stem();
+        const auto ext = p.extension().string(); // Purposefully damage Unicode strings.
 
-    auto it = mFolders.find(folderHash);
-    if (it == mFolders.end())
-        return FileRecord(); // folder not found, return default which has offset of sInvalidOffset
+        std::uint64_t folderHash = generateHash(p.parent_path(), {});
 
-    std::uint64_t fileHash = generateHash(stem, ext);
-    auto iter = it->second.files.find(fileHash);
-    if (iter == it->second.files.end())
-        return FileRecord(); // file not found, return default which has offset of sInvalidOffset
+        auto it = mFolders.find(folderHash);
+        if (it == mFolders.end())
+            return FileRecord(); // folder not found, return default which has offset of sInvalidOffset
 
-    return iter->second;
-}
+        std::uint64_t fileHash = generateHash(stem, ext);
+        auto iter = it->second.files.find(fileHash);
+        if (iter == it->second.files.end())
+            return FileRecord(); // file not found, return default which has offset of sInvalidOffset
 
-Files::IStreamPtr CompressedBSAFile::getFile(const FileStruct* file) 
-{
-    FileRecord fileRec = getFileRecord(file->name());
-    if (!fileRec.isValid()) {
-        fail("File not found: " + std::string(file->name()));
+        return iter->second;
     }
-    return getFile(fileRec);
-}
-
-void CompressedBSAFile::addFile(const std::string& filename, std::istream& file)
-{
-    assert(false); //not implemented yet
-    fail("Add file is not implemented for compressed BSA: " + filename);
-}
 
-Files::IStreamPtr CompressedBSAFile::getFile(const char* file)
-{
-    FileRecord fileRec = getFileRecord(file);
-    if (!fileRec.isValid()) {
-        fail("File not found: " + std::string(file));
+    Files::IStreamPtr CompressedBSAFile::getFile(const FileStruct* file)
+    {
+        FileRecord fileRec = getFileRecord(file->name());
+        if (!fileRec.isValid())
+        {
+            fail("File not found: " + std::string(file->name()));
+        }
+        return getFile(fileRec);
     }
-    return getFile(fileRec);
-}
 
-Files::IStreamPtr CompressedBSAFile::getFile(const FileRecord& fileRecord)
-{
-    size_t size = fileRecord.getSizeWithoutCompressionFlag();
-    size_t uncompressedSize = size;
-    bool compressed = fileRecord.isCompressed(mCompressedByDefault);
-    Files::IStreamPtr streamPtr = Files::openConstrainedFileStream(mFilepath, fileRecord.offset, size);
-    std::istream* fileStream = streamPtr.get();
-    if (mEmbeddedFileNames)
+    void CompressedBSAFile::addFile(const std::string& filename, std::istream& file)
     {
-        // Skip over the embedded file name
-        char length = 0;
-        fileStream->read(&length, 1);
-        fileStream->ignore(length);
-        size -= length + sizeof(char);
+        assert(false); // not implemented yet
+        fail("Add file is not implemented for compressed BSA: " + filename);
     }
-    if (compressed)
+
+    Files::IStreamPtr CompressedBSAFile::getFile(const char* file)
     {
-        fileStream->read(reinterpret_cast<char*>(&uncompressedSize), sizeof(uint32_t));
-        size -= sizeof(uint32_t);
+        FileRecord fileRec = getFileRecord(file);
+        if (!fileRec.isValid())
+        {
+            fail("File not found: " + std::string(file));
+        }
+        return getFile(fileRec);
     }
-    auto memoryStreamPtr = std::make_unique<MemoryInputStream>(uncompressedSize);
 
-    if (compressed)
+    Files::IStreamPtr CompressedBSAFile::getFile(const FileRecord& fileRecord)
     {
-        if (mVersion != 0x69) // Non-SSE: zlib
+        size_t size = fileRecord.getSizeWithoutCompressionFlag();
+        size_t uncompressedSize = size;
+        bool compressed = fileRecord.isCompressed(mCompressedByDefault);
+        Files::IStreamPtr streamPtr = Files::openConstrainedFileStream(mFilepath, fileRecord.offset, size);
+        std::istream* fileStream = streamPtr.get();
+        if (mEmbeddedFileNames)
         {
-            boost::iostreams::filtering_streambuf<boost::iostreams::input> inputStreamBuf;
-            inputStreamBuf.push(boost::iostreams::zlib_decompressor());
-            inputStreamBuf.push(*fileStream);
-
-            boost::iostreams::basic_array_sink<char> sr(memoryStreamPtr->getRawData(), uncompressedSize);
-            boost::iostreams::copy(inputStreamBuf, sr);
+            // Skip over the embedded file name
+            char length = 0;
+            fileStream->read(&length, 1);
+            fileStream->ignore(length);
+            size -= length + sizeof(char);
         }
-        else // SSE: lz4
+        if (compressed)
         {
-            auto buffer = std::vector<char>(size);
-            fileStream->read(buffer.data(), size);
-            LZ4F_decompressionContext_t context = nullptr;
-            LZ4F_createDecompressionContext(&context, LZ4F_VERSION);
-            LZ4F_decompressOptions_t options = {};
-            LZ4F_errorCode_t errorCode = LZ4F_decompress(context, memoryStreamPtr->getRawData(), &uncompressedSize, buffer.data(), &size, &options);
-            if (LZ4F_isError(errorCode))
-                fail("LZ4 decompression error (file " + Files::pathToUnicodeString(mFilepath) + "): " + LZ4F_getErrorName(errorCode));
-            errorCode = LZ4F_freeDecompressionContext(context);
-            if (LZ4F_isError(errorCode))
-                fail("LZ4 decompression error (file " + Files::pathToUnicodeString(mFilepath) + "): " + LZ4F_getErrorName(errorCode));
+            fileStream->read(reinterpret_cast<char*>(&uncompressedSize), sizeof(uint32_t));
+            size -= sizeof(uint32_t);
         }
-    }
-    else
-    {
-        fileStream->read(memoryStreamPtr->getRawData(), size);
-    }
-
-    return std::make_unique<Files::StreamWithBuffer<MemoryInputStream>>(std::move(memoryStreamPtr));
-}
-
-BsaVersion CompressedBSAFile::detectVersion(const std::filesystem::path &filePath)
-{
-    std::ifstream input(filePath, std::ios_base::binary);
+        auto memoryStreamPtr = std::make_unique<MemoryInputStream>(uncompressedSize);
 
-    // Total archive size
-    std::streamoff fsize = 0;
-    if (input.seekg(0, std::ios_base::end))
-    {
-        fsize = input.tellg();
-        input.seekg(0);
-    }
+        if (compressed)
+        {
+            if (mVersion != 0x69) // Non-SSE: zlib
+            {
+                boost::iostreams::filtering_streambuf<boost::iostreams::input> inputStreamBuf;
+                inputStreamBuf.push(boost::iostreams::zlib_decompressor());
+                inputStreamBuf.push(*fileStream);
+
+                boost::iostreams::basic_array_sink<char> sr(memoryStreamPtr->getRawData(), uncompressedSize);
+                boost::iostreams::copy(inputStreamBuf, sr);
+            }
+            else // SSE: lz4
+            {
+                auto buffer = std::vector<char>(size);
+                fileStream->read(buffer.data(), size);
+                LZ4F_decompressionContext_t context = nullptr;
+                LZ4F_createDecompressionContext(&context, LZ4F_VERSION);
+                LZ4F_decompressOptions_t options = {};
+                LZ4F_errorCode_t errorCode = LZ4F_decompress(
+                    context, memoryStreamPtr->getRawData(), &uncompressedSize, buffer.data(), &size, &options);
+                if (LZ4F_isError(errorCode))
+                    fail("LZ4 decompression error (file " + Files::pathToUnicodeString(mFilepath)
+                        + "): " + LZ4F_getErrorName(errorCode));
+                errorCode = LZ4F_freeDecompressionContext(context);
+                if (LZ4F_isError(errorCode))
+                    fail("LZ4 decompression error (file " + Files::pathToUnicodeString(mFilepath)
+                        + "): " + LZ4F_getErrorName(errorCode));
+            }
+        }
+        else
+        {
+            fileStream->read(memoryStreamPtr->getRawData(), size);
+        }
 
-    if (fsize < 12) {
-        return BSAVER_UNKNOWN;
+        return std::make_unique<Files::StreamWithBuffer<MemoryInputStream>>(std::move(memoryStreamPtr));
     }
 
-    // Get essential header numbers
+    BsaVersion CompressedBSAFile::detectVersion(const std::filesystem::path& filePath)
+    {
+        std::ifstream input(filePath, std::ios_base::binary);
 
-    // First 12 bytes
-    uint32_t head[3];
+        // Total archive size
+        std::streamoff fsize = 0;
+        if (input.seekg(0, std::ios_base::end))
+        {
+            fsize = input.tellg();
+            input.seekg(0);
+        }
 
-    input.read(reinterpret_cast<char*>(head), 12);
+        if (fsize < 12)
+        {
+            return BSAVER_UNKNOWN;
+        }
 
-    if (head[0] == static_cast<uint32_t>(BSAVER_UNCOMPRESSED)) {
-        return BSAVER_UNCOMPRESSED;
-    }
+        // Get essential header numbers
 
-    if (head[0] == static_cast<uint32_t>(BSAVER_COMPRESSED)) {
-        return BSAVER_COMPRESSED;
-    }
+        // First 12 bytes
+        uint32_t head[3];
 
-    return BSAVER_UNKNOWN;
-}
+        input.read(reinterpret_cast<char*>(head), 12);
 
-//mFiles used by OpenMW expects uncompressed sizes
-void CompressedBSAFile::convertCompressedSizesToUncompressed()
-{
-    for (auto & mFile : mFiles)
-    {
-        const FileRecord& fileRecord = getFileRecord(mFile.name());
-        if (!fileRecord.isValid())
+        if (head[0] == static_cast<uint32_t>(BSAVER_UNCOMPRESSED))
         {
-            fail("Could not find file " + std::string(mFile.name()) + " in BSA");
+            return BSAVER_UNCOMPRESSED;
         }
 
-        if (!fileRecord.isCompressed(mCompressedByDefault))
+        if (head[0] == static_cast<uint32_t>(BSAVER_COMPRESSED))
         {
-            //no need to fix fileSize in mFiles - uncompressed size already set
-            continue;
+            return BSAVER_COMPRESSED;
         }
 
-        Files::IStreamPtr dataBegin = Files::openConstrainedFileStream(mFilepath, fileRecord.offset, fileRecord.getSizeWithoutCompressionFlag());
+        return BSAVER_UNKNOWN;
+    }
 
-        if (mEmbeddedFileNames)
+    // mFiles used by OpenMW expects uncompressed sizes
+    void CompressedBSAFile::convertCompressedSizesToUncompressed()
+    {
+        for (auto& mFile : mFiles)
         {
-            std::string embeddedFileName;
-            getBZString(embeddedFileName, *(dataBegin.get()));
-        }
+            const FileRecord& fileRecord = getFileRecord(mFile.name());
+            if (!fileRecord.isValid())
+            {
+                fail("Could not find file " + std::string(mFile.name()) + " in BSA");
+            }
+
+            if (!fileRecord.isCompressed(mCompressedByDefault))
+            {
+                // no need to fix fileSize in mFiles - uncompressed size already set
+                continue;
+            }
+
+            Files::IStreamPtr dataBegin = Files::openConstrainedFileStream(
+                mFilepath, fileRecord.offset, fileRecord.getSizeWithoutCompressionFlag());
+
+            if (mEmbeddedFileNames)
+            {
+                std::string embeddedFileName;
+                getBZString(embeddedFileName, *(dataBegin.get()));
+            }
 
-        dataBegin->read(reinterpret_cast<char*>(&(mFile.fileSize)), sizeof(mFile.fileSize));
+            dataBegin->read(reinterpret_cast<char*>(&(mFile.fileSize)), sizeof(mFile.fileSize));
+        }
     }
-}
 
-std::uint64_t CompressedBSAFile::generateHash(const std::filesystem::path& stem, std::string extension)
-{
-    auto str = stem.u8string();
-    size_t len = str.length();
-    if (len == 0)
-        return 0;
-    std::replace(str.begin(), str.end(), '/', '\\');
-    Misc::StringUtils::lowerCaseInPlace(str);
-    uint64_t result = str[len-1] | (len >= 3 ? (str[len-2] << 8) : 0) | (len << 16) | (str[0] << 24);
-    if (len >= 4)
+    std::uint64_t CompressedBSAFile::generateHash(const std::filesystem::path& stem, std::string extension)
     {
+        auto str = stem.u8string();
+        size_t len = str.length();
+        if (len == 0)
+            return 0;
+        std::replace(str.begin(), str.end(), '/', '\\');
+        Misc::StringUtils::lowerCaseInPlace(str);
+        uint64_t result = str[len - 1] | (len >= 3 ? (str[len - 2] << 8) : 0) | (len << 16) | (str[0] << 24);
+        if (len >= 4)
+        {
+            uint32_t hash = 0;
+            for (size_t i = 1; i <= len - 3; ++i)
+                hash = hash * 0x1003f + str[i];
+            result += static_cast<uint64_t>(hash) << 32;
+        }
+        if (extension.empty())
+            return result;
+        Misc::StringUtils::lowerCaseInPlace(extension);
+        if (extension == ".kf")
+            result |= 0x80;
+        else if (extension == ".nif")
+            result |= 0x8000;
+        else if (extension == ".dds")
+            result |= 0x8080;
+        else if (extension == ".wav")
+            result |= 0x80000000;
         uint32_t hash = 0;
-        for (size_t i = 1; i <= len-3; ++i)
-            hash = hash * 0x1003f + str[i];
+        for (const auto& c : extension)
+            hash = hash * 0x1003f + c;
         result += static_cast<uint64_t>(hash) << 32;
-    }
-    if (extension.empty())
         return result;
-    Misc::StringUtils::lowerCaseInPlace(extension);
-    if (extension == ".kf")       result |= 0x80;
-    else if (extension == ".nif") result |= 0x8000;
-    else if (extension == ".dds") result |= 0x8080;
-    else if (extension == ".wav") result |= 0x80000000;
-    uint32_t hash = 0;
-    for (const auto &c : extension)
-        hash = hash * 0x1003f + c;
-    result += static_cast<uint64_t>(hash) << 32;
-    return result;
-}
-
-} //namespace Bsa
+    }
+
+} // namespace Bsa
diff --git a/components/bsa/compressedbsafile.hpp b/components/bsa/compressedbsafile.hpp
index bad8551f09..9bafedeee9 100644
--- a/components/bsa/compressedbsafile.hpp
+++ b/components/bsa/compressedbsafile.hpp
@@ -37,17 +37,17 @@ namespace Bsa
     {
         BSAVER_UNKNOWN = 0x0,
         BSAVER_UNCOMPRESSED = 0x100,
-        BSAVER_COMPRESSED = 0x415342 //B, S, A
+        BSAVER_COMPRESSED = 0x415342 // B, S, A
     };
 
     class CompressedBSAFile : private BSAFile
     {
     private:
-        //special marker for invalid records,
-        //equal to max uint32_t value
+        // special marker for invalid records,
+        // equal to max uint32_t value
         static const uint32_t sInvalidOffset;
 
-        //bit marking compression on file size
+        // bit marking compression on file size
         static const uint32_t sCompressedFlag;
 
         struct FileRecord
@@ -60,14 +60,14 @@ namespace Bsa
             bool isValid() const;
             std::uint32_t getSizeWithoutCompressionFlag() const;
         };
-        
-        //if files in BSA  without 30th bit enabled are compressed
+
+        // if files in BSA  without 30th bit enabled are compressed
         bool mCompressedByDefault;
 
-        //if each file record begins with BZ string with file name
+        // if each file record begins with BZ string with file name
         bool mEmbeddedFileNames;
 
-        std::uint32_t mVersion{0u};
+        std::uint32_t mVersion{ 0u };
 
         struct FolderRecord
         {
@@ -78,27 +78,29 @@ namespace Bsa
         std::map<std::uint64_t, FolderRecord> mFolders;
 
         FileRecord getFileRecord(const std::string& str) const;
-        
+
         void getBZString(std::string& str, std::istream& filestream);
-        //mFiles used by OpenMW will contain uncompressed file sizes
+        // mFiles used by OpenMW will contain uncompressed file sizes
         void convertCompressedSizesToUncompressed();
-        /// \brief Normalizes given filename or folder and generates format-compatible hash. See https://en.uesp.net/wiki/Tes4Mod:Hash_Calculation.
-        static std::uint64_t generateHash(const std::filesystem::path& stem, std::string extension) ;
+        /// \brief Normalizes given filename or folder and generates format-compatible hash. See
+        /// https://en.uesp.net/wiki/Tes4Mod:Hash_Calculation.
+        static std::uint64_t generateHash(const std::filesystem::path& stem, std::string extension);
         Files::IStreamPtr getFile(const FileRecord& fileRecord);
+
     public:
-        using BSAFile::open;
-        using BSAFile::getList;
         using BSAFile::getFilename;
+        using BSAFile::getList;
+        using BSAFile::open;
 
         CompressedBSAFile();
         virtual ~CompressedBSAFile();
 
-        //checks version of BSA from file header
-        static BsaVersion detectVersion(const std::filesystem::path &filePath);
+        // checks version of BSA from file header
+        static BsaVersion detectVersion(const std::filesystem::path& filePath);
 
         /// Read header information from the input source
         void readHeader() override;
-       
+
         Files::IStreamPtr getFile(const char* filePath);
         Files::IStreamPtr getFile(const FileStruct* fileStruct);
         void addFile(const std::string& filename, std::istream& file);
diff --git a/components/bsa/memorystream.hpp b/components/bsa/memorystream.hpp
index f36f1e23f4..5662dde8ff 100644
--- a/components/bsa/memorystream.hpp
+++ b/components/bsa/memorystream.hpp
@@ -26,33 +26,32 @@
 #ifndef BSA_MEMORY_STREAM_H
 #define BSA_MEMORY_STREAM_H
 
-#include <vector>
-#include <istream>
 #include <components/files/memorystream.hpp>
+#include <istream>
+#include <vector>
 
 namespace Bsa
 {
-/**
-    Class replaces Ogre memory streams without introducing any new external dependencies
-    beyond standard library.
+    /**
+        Class replaces Ogre memory streams without introducing any new external dependencies
+        beyond standard library.
 
-    Allows to pass memory buffer as Files::IStreamPtr.
+        Allows to pass memory buffer as Files::IStreamPtr.
 
-    Memory buffer is freed once the class instance is destroyed.
- */
-class MemoryInputStream : private std::vector<char>, public Files::MemBuf, public std::istream {
-public:
-    explicit MemoryInputStream(size_t bufferSize)
-        : std::vector<char>(bufferSize)
-        , Files::MemBuf(this->data(), this->size())
-        , std::istream(static_cast<std::streambuf*>(this))
-    {}
-
-    char* getRawData()
+        Memory buffer is freed once the class instance is destroyed.
+     */
+    class MemoryInputStream : private std::vector<char>, public Files::MemBuf, public std::istream
     {
-        return this->data();
-    }
-};
+    public:
+        explicit MemoryInputStream(size_t bufferSize)
+            : std::vector<char>(bufferSize)
+            , Files::MemBuf(this->data(), this->size())
+            , std::istream(static_cast<std::streambuf*>(this))
+        {
+        }
+
+        char* getRawData() { return this->data(); }
+    };
 
 }
 #endif
diff --git a/components/bullethelpers/aabb.hpp b/components/bullethelpers/aabb.hpp
index c961c1d49a..0a9ebb6077 100644
--- a/components/bullethelpers/aabb.hpp
+++ b/components/bullethelpers/aabb.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_COMPONENTS_BULLETHELPERS_AABB_H
 #define OPENMW_COMPONENTS_BULLETHELPERS_AABB_H
 
-#include <LinearMath/btTransform.h>
 #include <BulletCollision/CollisionShapes/btCollisionShape.h>
 #include <BulletCollision/Gimpact/btBoxCollision.h>
+#include <LinearMath/btTransform.h>
 
 inline bool operator==(const btAABB& lhs, const btAABB& rhs)
 {
diff --git a/components/bullethelpers/collisionobject.hpp b/components/bullethelpers/collisionobject.hpp
index 0951c2af38..7aad534cf1 100644
--- a/components/bullethelpers/collisionobject.hpp
+++ b/components/bullethelpers/collisionobject.hpp
@@ -11,8 +11,8 @@
 
 namespace BulletHelpers
 {
-    inline std::unique_ptr<btCollisionObject> makeCollisionObject(btCollisionShape* shape,
-        const btVector3& position, const btQuaternion& rotation)
+    inline std::unique_ptr<btCollisionObject> makeCollisionObject(
+        btCollisionShape* shape, const btVector3& position, const btQuaternion& rotation)
     {
         std::unique_ptr<btCollisionObject> result = std::make_unique<btCollisionObject>();
         result->setCollisionShape(shape);
diff --git a/components/bullethelpers/debug.hpp b/components/bullethelpers/debug.hpp
index 564616043d..bea0cd7db7 100644
--- a/components/bullethelpers/debug.hpp
+++ b/components/bullethelpers/debug.hpp
@@ -9,20 +9,21 @@
 
 #include <LinearMath/btVector3.h>
 
-inline std::ostream& operator <<(std::ostream& stream, const btVector3& value)
+inline std::ostream& operator<<(std::ostream& stream, const btVector3& value)
 {
-    return stream << "btVector3(" << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.x()
-                  << ", " << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.y()
-                  << ", " << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.z()
-                  << ')';
+    return stream << "btVector3(" << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.x() << ", "
+                  << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.y() << ", "
+                  << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.z() << ')';
 }
 
-inline std::ostream& operator <<(std::ostream& stream, BroadphaseNativeTypes value)
+inline std::ostream& operator<<(std::ostream& stream, BroadphaseNativeTypes value)
 {
     switch (value)
     {
 #ifndef SHAPE_NAME
-#define SHAPE_NAME(name) case name: return stream << #name;
+#define SHAPE_NAME(name)                                                                                               \
+    case name:                                                                                                         \
+        return stream << #name;
         SHAPE_NAME(BOX_SHAPE_PROXYTYPE)
         SHAPE_NAME(TRIANGLE_SHAPE_PROXYTYPE)
         SHAPE_NAME(TETRAHEDRAL_SHAPE_PROXYTYPE)
diff --git a/components/bullethelpers/operators.hpp b/components/bullethelpers/operators.hpp
index f1e52938db..4de7b82b81 100644
--- a/components/bullethelpers/operators.hpp
+++ b/components/bullethelpers/operators.hpp
@@ -3,20 +3,20 @@
 
 #include <tuple>
 
-#include <LinearMath/btVector3.h>
 #include <LinearMath/btTransform.h>
+#include <LinearMath/btVector3.h>
 
-inline bool operator <(const btVector3& lhs, const btVector3& rhs)
+inline bool operator<(const btVector3& lhs, const btVector3& rhs)
 {
     return std::tie(lhs.x(), lhs.y(), lhs.z()) < std::tie(rhs.x(), rhs.y(), rhs.z());
 }
 
-inline bool operator <(const btMatrix3x3& lhs, const btMatrix3x3& rhs)
+inline bool operator<(const btMatrix3x3& lhs, const btMatrix3x3& rhs)
 {
     return std::tie(lhs[0], lhs[1], lhs[2]) < std::tie(rhs[0], rhs[1], rhs[2]);
 }
 
-inline bool operator <(const btTransform& lhs, const btTransform& rhs)
+inline bool operator<(const btTransform& lhs, const btTransform& rhs)
 {
     return std::tie(lhs.getBasis(), lhs.getOrigin()) < std::tie(rhs.getBasis(), rhs.getOrigin());
 }
diff --git a/components/bullethelpers/processtrianglecallback.hpp b/components/bullethelpers/processtrianglecallback.hpp
index c30ce0cb6a..09db240363 100644
--- a/components/bullethelpers/processtrianglecallback.hpp
+++ b/components/bullethelpers/processtrianglecallback.hpp
@@ -14,7 +14,8 @@ namespace BulletHelpers
     public:
         explicit ProcessTriangleCallback(Impl impl)
             : mImpl(std::move(impl))
-        {}
+        {
+        }
 
         void processTriangle(btVector3* triangle, int partId, int triangleIndex) override
         {
diff --git a/components/bullethelpers/transformboundingbox.hpp b/components/bullethelpers/transformboundingbox.hpp
index 05632eec72..a113a8e893 100644
--- a/components/bullethelpers/transformboundingbox.hpp
+++ b/components/bullethelpers/transformboundingbox.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_BULLETHELPERS_TRANSFORMBOUNDINGBOX_H
 #define OPENMW_COMPONENTS_BULLETHELPERS_TRANSFORMBOUNDINGBOX_H
 
-#include <LinearMath/btVector3.h>
 #include <LinearMath/btTransform.h>
+#include <LinearMath/btVector3.h>
 
 #include <algorithm>
 
diff --git a/components/compiler/context.hpp b/components/compiler/context.hpp
index d3caba7c53..b9b0aa477b 100644
--- a/components/compiler/context.hpp
+++ b/components/compiler/context.hpp
@@ -9,39 +9,34 @@ namespace Compiler
 
     class Context
     {
-            const Extensions *mExtensions;
+        const Extensions* mExtensions;
 
-        public:
+    public:
+        Context()
+            : mExtensions(nullptr)
+        {
+        }
 
-            Context() : mExtensions (nullptr) {}
+        virtual ~Context() = default;
 
-            virtual ~Context() = default;
+        virtual bool canDeclareLocals() const = 0;
+        ///< Is the compiler allowed to declare local variables?
 
-            virtual bool canDeclareLocals() const = 0;
-            ///< Is the compiler allowed to declare local variables?
+        void setExtensions(const Extensions* extensions = nullptr) { mExtensions = extensions; }
 
-            void setExtensions (const Extensions *extensions = nullptr)
-            {
-                mExtensions = extensions;
-            }
+        const Extensions* getExtensions() const { return mExtensions; }
 
-            const Extensions *getExtensions() const
-            {
-                return mExtensions;
-            }
+        virtual char getGlobalType(const std::string& name) const = 0;
+        ///< 'l: long, 's': short, 'f': float, ' ': does not exist.
 
-            virtual char getGlobalType (const std::string& name) const = 0;
-            ///< 'l: long, 's': short, 'f': float, ' ': does not exist.
+        virtual std::pair<char, bool> getMemberType(const std::string& name, const std::string& id) const = 0;
+        ///< Return type of member variable \a name in script \a id or in script of reference of
+        /// \a id
+        /// \return first: 'l: long, 's': short, 'f': float, ' ': does not exist.
+        /// second: true: script of reference
 
-            virtual std::pair<char, bool> getMemberType (const std::string& name,
-                const std::string& id) const = 0;
-            ///< Return type of member variable \a name in script \a id or in script of reference of
-            /// \a id
-            /// \return first: 'l: long, 's': short, 'f': float, ' ': does not exist.
-            /// second: true: script of reference
-
-            virtual bool isId (const std::string& name) const = 0;
-            ///< Does \a name match an ID, that can be referenced?
+        virtual bool isId(const std::string& name) const = 0;
+        ///< Does \a name match an ID, that can be referenced?
     };
 }
 
diff --git a/components/compiler/controlparser.cpp b/components/compiler/controlparser.cpp
index a5a68edbd5..a130695ae1 100644
--- a/components/compiler/controlparser.cpp
+++ b/components/compiler/controlparser.cpp
@@ -4,251 +4,255 @@
 #include <iterator>
 #include <stdexcept>
 
-#include "scanner.hpp"
-#include "generator.hpp"
 #include "errorhandler.hpp"
+#include "generator.hpp"
+#include "scanner.hpp"
 #include "skipparser.hpp"
 
 namespace Compiler
 {
-    bool ControlParser::parseIfBody (int keyword, const TokenLoc& loc, Scanner& scanner)
+    bool ControlParser::parseIfBody(int keyword, const TokenLoc& loc, Scanner& scanner)
     {
-        if (keyword==Scanner::K_endif || keyword==Scanner::K_elseif ||
-            keyword==Scanner::K_else)
+        if (keyword == Scanner::K_endif || keyword == Scanner::K_elseif || keyword == Scanner::K_else)
         {
             std::pair<Codes, Codes> entry;
 
-            if (mState!=IfElseBodyState)
-                mExprParser.append (entry.first);
+            if (mState != IfElseBodyState)
+                mExprParser.append(entry.first);
 
-            std::copy (mCodeBlock.begin(), mCodeBlock.end(),
-                std::back_inserter (entry.second));
+            std::copy(mCodeBlock.begin(), mCodeBlock.end(), std::back_inserter(entry.second));
 
-            mIfCode.push_back (entry);
+            mIfCode.push_back(entry);
 
             mCodeBlock.clear();
 
-            if (keyword==Scanner::K_endif)
+            if (keyword == Scanner::K_endif)
             {
                 // store code for if-cascade
                 Codes codes;
 
-                for (auto iter (mIfCode.rbegin());
-                    iter!=mIfCode.rend(); ++iter)
+                for (auto iter(mIfCode.rbegin()); iter != mIfCode.rend(); ++iter)
                 {
                     Codes block;
 
-                    if (iter!=mIfCode.rbegin())
-                        Generator::jump (iter->second, static_cast<int>(codes.size()+1));
+                    if (iter != mIfCode.rbegin())
+                        Generator::jump(iter->second, static_cast<int>(codes.size() + 1));
 
                     if (!iter->first.empty())
                     {
                         // if or elseif
-                        std::copy (iter->first.begin(), iter->first.end(),
-                            std::back_inserter (block));
-                        Generator::jumpOnZero (block, static_cast<int>(iter->second.size()+1));
+                        std::copy(iter->first.begin(), iter->first.end(), std::back_inserter(block));
+                        Generator::jumpOnZero(block, static_cast<int>(iter->second.size() + 1));
                     }
 
-                    std::copy (iter->second.begin(), iter->second.end(),
-                        std::back_inserter (block));
+                    std::copy(iter->second.begin(), iter->second.end(), std::back_inserter(block));
 
-                   std::swap (codes, block);
+                    std::swap(codes, block);
 
-                   std::copy (block.begin(), block.end(), std::back_inserter (codes));
+                    std::copy(block.begin(), block.end(), std::back_inserter(codes));
                 }
 
-                std::copy (codes.begin(), codes.end(), std::back_inserter (mCode));
+                std::copy(codes.begin(), codes.end(), std::back_inserter(mCode));
 
                 mIfCode.clear();
                 mState = IfEndifState;
             }
-            else if (keyword==Scanner::K_elseif)
+            else if (keyword == Scanner::K_elseif)
             {
                 mExprParser.reset();
-                scanner.scan (mExprParser);
+                scanner.scan(mExprParser);
 
                 mState = IfElseifEndState;
             }
-            else if (keyword==Scanner::K_else)
+            else if (keyword == Scanner::K_else)
             {
                 mState = IfElseJunkState; /// \todo should be IfElseEndState; add an option for that
             }
 
             return true;
         }
-        else if (keyword==Scanner::K_if || keyword==Scanner::K_while)
+        else if (keyword == Scanner::K_if || keyword == Scanner::K_while)
         {
             // nested
-            ControlParser parser (getErrorHandler(), getContext(), mLocals, mLiterals);
+            ControlParser parser(getErrorHandler(), getContext(), mLocals, mLiterals);
 
-            if (parser.parseKeyword (keyword, loc, scanner))
-                scanner.scan (parser);
+            if (parser.parseKeyword(keyword, loc, scanner))
+                scanner.scan(parser);
 
-            parser.appendCode (mCodeBlock);
+            parser.appendCode(mCodeBlock);
 
             return true;
         }
         else
         {
             mLineParser.reset();
-            if (mLineParser.parseKeyword (keyword, loc, scanner))
-                scanner.scan (mLineParser);
+            if (mLineParser.parseKeyword(keyword, loc, scanner))
+                scanner.scan(mLineParser);
 
             return true;
         }
     }
 
-    bool ControlParser::parseWhileBody (int keyword, const TokenLoc& loc, Scanner& scanner)
+    bool ControlParser::parseWhileBody(int keyword, const TokenLoc& loc, Scanner& scanner)
     {
-        if (keyword==Scanner::K_endwhile)
+        if (keyword == Scanner::K_endwhile)
         {
             Codes loop;
 
             Codes expr;
-            mExprParser.append (expr);
+            mExprParser.append(expr);
 
-            Generator::jump (loop, -static_cast<int> (mCodeBlock.size()+expr.size()));
+            Generator::jump(loop, -static_cast<int>(mCodeBlock.size() + expr.size()));
 
-            std::copy (expr.begin(), expr.end(), std::back_inserter (mCode));
+            std::copy(expr.begin(), expr.end(), std::back_inserter(mCode));
 
             Codes skip;
 
-            Generator::jumpOnZero (skip, static_cast<int> (mCodeBlock.size()+loop.size()+1));
+            Generator::jumpOnZero(skip, static_cast<int>(mCodeBlock.size() + loop.size() + 1));
 
-            std::copy (skip.begin(), skip.end(), std::back_inserter (mCode));
+            std::copy(skip.begin(), skip.end(), std::back_inserter(mCode));
 
-            std::copy (mCodeBlock.begin(), mCodeBlock.end(), std::back_inserter (mCode));
+            std::copy(mCodeBlock.begin(), mCodeBlock.end(), std::back_inserter(mCode));
 
             Codes loop2;
 
-            Generator::jump (loop2, -static_cast<int> (mCodeBlock.size()+expr.size()+skip.size()));
+            Generator::jump(loop2, -static_cast<int>(mCodeBlock.size() + expr.size() + skip.size()));
 
-            if (loop.size()!=loop2.size())
-                throw std::logic_error (
-                    "Internal compiler error: failed to generate a while loop");
+            if (loop.size() != loop2.size())
+                throw std::logic_error("Internal compiler error: failed to generate a while loop");
 
-            std::copy (loop2.begin(), loop2.end(), std::back_inserter (mCode));
+            std::copy(loop2.begin(), loop2.end(), std::back_inserter(mCode));
 
             mState = WhileEndwhileState;
             return true;
         }
-        else if (keyword==Scanner::K_if || keyword==Scanner::K_while)
+        else if (keyword == Scanner::K_if || keyword == Scanner::K_while)
         {
             // nested
-            ControlParser parser (getErrorHandler(), getContext(), mLocals, mLiterals);
+            ControlParser parser(getErrorHandler(), getContext(), mLocals, mLiterals);
 
-            if (parser.parseKeyword (keyword, loc, scanner))
-                scanner.scan (parser);
+            if (parser.parseKeyword(keyword, loc, scanner))
+                scanner.scan(parser);
 
-            parser.appendCode (mCodeBlock);
+            parser.appendCode(mCodeBlock);
 
             return true;
         }
         else
         {
             mLineParser.reset();
-            if (mLineParser.parseKeyword (keyword, loc, scanner))
-                scanner.scan (mLineParser);
+            if (mLineParser.parseKeyword(keyword, loc, scanner))
+                scanner.scan(mLineParser);
 
             return true;
         }
     }
 
-    ControlParser::ControlParser (ErrorHandler& errorHandler, const Context& context, Locals& locals,
-        Literals& literals)
-    : Parser (errorHandler, context), mLocals (locals), mLiterals (literals),
-      mLineParser (errorHandler, context, locals, literals, mCodeBlock),
-      mExprParser (errorHandler, context, locals, literals),
-      mState (StartState)
+    ControlParser::ControlParser(ErrorHandler& errorHandler, const Context& context, Locals& locals, Literals& literals)
+        : Parser(errorHandler, context)
+        , mLocals(locals)
+        , mLiterals(literals)
+        , mLineParser(errorHandler, context, locals, literals, mCodeBlock)
+        , mExprParser(errorHandler, context, locals, literals)
+        , mState(StartState)
     {
-
     }
 
-    void ControlParser::appendCode (std::vector<Interpreter::Type_Code>& code) const
+    void ControlParser::appendCode(std::vector<Interpreter::Type_Code>& code) const
     {
-        std::copy (mCode.begin(), mCode.end(), std::back_inserter (code));
+        std::copy(mCode.begin(), mCode.end(), std::back_inserter(code));
     }
 
-    bool ControlParser::parseName (const std::string& name, const TokenLoc& loc, Scanner& scanner)
+    bool ControlParser::parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner)
     {
-        if (mState==IfBodyState || mState==IfElseifBodyState || mState==IfElseBodyState ||
-            mState==WhileBodyState)
+        if (mState == IfBodyState || mState == IfElseifBodyState || mState == IfElseBodyState
+            || mState == WhileBodyState)
         {
-            scanner.putbackName (name, loc);
+            scanner.putbackName(name, loc);
             mLineParser.reset();
-            scanner.scan (mLineParser);
+            scanner.scan(mLineParser);
             return true;
         }
-        else if (mState==IfElseJunkState)
+        else if (mState == IfElseJunkState)
         {
-            getErrorHandler().warning ("Extra text after else", loc);
-            SkipParser skip (getErrorHandler(), getContext());
-            scanner.scan (skip);
+            getErrorHandler().warning("Extra text after else", loc);
+            SkipParser skip(getErrorHandler(), getContext());
+            scanner.scan(skip);
             mState = IfElseBodyState;
             return true;
         }
 
-        return Parser::parseName (name, loc, scanner);
+        return Parser::parseName(name, loc, scanner);
     }
 
-    bool ControlParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
+    bool ControlParser::parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner)
     {
-        if (mState==StartState)
+        if (mState == StartState)
         {
-            if (keyword==Scanner::K_if || keyword==Scanner::K_elseif)
+            if (keyword == Scanner::K_if || keyword == Scanner::K_elseif)
             {
-                if (keyword==Scanner::K_elseif)
-                    getErrorHandler().warning ("elseif without matching if", loc);
+                if (keyword == Scanner::K_elseif)
+                    getErrorHandler().warning("elseif without matching if", loc);
 
                 mExprParser.reset();
-                scanner.scan (mExprParser);
+                scanner.scan(mExprParser);
 
                 mState = IfEndState;
                 return true;
             }
-            else if (keyword==Scanner::K_while)
+            else if (keyword == Scanner::K_while)
             {
                 mExprParser.reset();
-                scanner.scan (mExprParser);
+                scanner.scan(mExprParser);
 
                 mState = WhileEndState;
                 return true;
             }
         }
-        else if (mState==IfBodyState || mState==IfElseifBodyState || mState==IfElseBodyState)
+        else if (mState == IfBodyState || mState == IfElseifBodyState || mState == IfElseBodyState)
         {
-            if (parseIfBody (keyword, loc, scanner))
+            if (parseIfBody(keyword, loc, scanner))
                 return true;
         }
-        else if (mState==WhileBodyState)
+        else if (mState == WhileBodyState)
         {
-            if ( parseWhileBody (keyword, loc, scanner))
+            if (parseWhileBody(keyword, loc, scanner))
                 return true;
         }
-        else if (mState==IfElseJunkState)
+        else if (mState == IfElseJunkState)
         {
-            getErrorHandler().warning ("Extra text after else", loc);
-            SkipParser skip (getErrorHandler(), getContext());
-            scanner.scan (skip);
+            getErrorHandler().warning("Extra text after else", loc);
+            SkipParser skip(getErrorHandler(), getContext());
+            scanner.scan(skip);
             mState = IfElseBodyState;
             return true;
         }
 
-        return Parser::parseKeyword (keyword, loc, scanner);
+        return Parser::parseKeyword(keyword, loc, scanner);
     }
 
-    bool ControlParser::parseSpecial (int code, const TokenLoc& loc, Scanner& scanner)
+    bool ControlParser::parseSpecial(int code, const TokenLoc& loc, Scanner& scanner)
     {
-        if (code==Scanner::S_newline)
+        if (code == Scanner::S_newline)
         {
             switch (mState)
             {
-                case IfEndState: mState = IfBodyState; return true;
-                case IfElseifEndState: mState = IfElseifBodyState; return true;
-                case IfElseEndState: mState = IfElseBodyState; return true;
-                case IfElseJunkState: mState = IfElseBodyState; return true;
-
-                case WhileEndState: mState = WhileBodyState; return true;
+                case IfEndState:
+                    mState = IfBodyState;
+                    return true;
+                case IfElseifEndState:
+                    mState = IfElseifBodyState;
+                    return true;
+                case IfElseEndState:
+                    mState = IfElseBodyState;
+                    return true;
+                case IfElseJunkState:
+                    mState = IfElseBodyState;
+                    return true;
+
+                case WhileEndState:
+                    mState = WhileBodyState;
+                    return true;
 
                 case IfBodyState:
                 case IfElseifBodyState:
@@ -262,19 +266,19 @@ namespace Compiler
 
                     return false;
 
-                default: ;
+                default:;
             }
         }
-        else if (mState==IfElseJunkState)
+        else if (mState == IfElseJunkState)
         {
-            getErrorHandler().warning ("Extra text after else", loc);
-            SkipParser skip (getErrorHandler(), getContext());
-            scanner.scan (skip);
+            getErrorHandler().warning("Extra text after else", loc);
+            SkipParser skip(getErrorHandler(), getContext());
+            scanner.scan(skip);
             mState = IfElseBodyState;
             return true;
         }
 
-        return Parser::parseSpecial (code, loc, scanner);
+        return Parser::parseSpecial(code, loc, scanner);
     }
 
     void ControlParser::reset()
diff --git a/components/compiler/controlparser.hpp b/components/compiler/controlparser.hpp
index fad8025b42..18cc10637f 100644
--- a/components/compiler/controlparser.hpp
+++ b/components/compiler/controlparser.hpp
@@ -5,9 +5,9 @@
 
 #include <components/interpreter/types.hpp>
 
-#include "parser.hpp"
 #include "exprparser.hpp"
 #include "lineparser.hpp"
+#include "parser.hpp"
 
 namespace Compiler
 {
@@ -18,57 +18,58 @@ namespace Compiler
 
     class ControlParser : public Parser
     {
-            enum State
-            {
-                StartState,
-                IfEndState, IfBodyState,
-                IfElseifEndState, IfElseifBodyState,
-                IfElseEndState, IfElseBodyState,
-                IfEndifState,
-                WhileEndState, WhileBodyState,
-                WhileEndwhileState,
-                IfElseJunkState
-            };
-
-            typedef std::vector<Interpreter::Type_Code> Codes;
-            typedef std::vector<std::pair<Codes, Codes> > IfCodes;
-
-            Locals& mLocals;
-            Literals& mLiterals;
-            Codes mCode;
-            Codes mCodeBlock;
-            IfCodes mIfCode; // condition, body
-            LineParser mLineParser;
-            ExprParser mExprParser;
-            State mState;
-
-            bool parseIfBody (int keyword, const TokenLoc& loc, Scanner& scanner);
-
-            bool parseWhileBody (int keyword, const TokenLoc& loc, Scanner& scanner);
-
-        public:
-
-            ControlParser (ErrorHandler& errorHandler, const Context& context, Locals& locals,
-                Literals& literals);
-
-            void appendCode (std::vector<Interpreter::Type_Code>& code) const;
-            ///< store generated code in \a code.
-
-            bool parseName (const std::string& name, const TokenLoc& loc,
-                Scanner& scanner) override;
-            ///< Handle a name token.
-            /// \return fetch another token?
-
-            bool parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a keyword token.
-            /// \return fetch another token?
-
-            bool parseSpecial (int code, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a special character token.
-            /// \return fetch another token?
-
-            void reset() override;
-            ///< Reset parser to clean state.
+        enum State
+        {
+            StartState,
+            IfEndState,
+            IfBodyState,
+            IfElseifEndState,
+            IfElseifBodyState,
+            IfElseEndState,
+            IfElseBodyState,
+            IfEndifState,
+            WhileEndState,
+            WhileBodyState,
+            WhileEndwhileState,
+            IfElseJunkState
+        };
+
+        typedef std::vector<Interpreter::Type_Code> Codes;
+        typedef std::vector<std::pair<Codes, Codes>> IfCodes;
+
+        Locals& mLocals;
+        Literals& mLiterals;
+        Codes mCode;
+        Codes mCodeBlock;
+        IfCodes mIfCode; // condition, body
+        LineParser mLineParser;
+        ExprParser mExprParser;
+        State mState;
+
+        bool parseIfBody(int keyword, const TokenLoc& loc, Scanner& scanner);
+
+        bool parseWhileBody(int keyword, const TokenLoc& loc, Scanner& scanner);
+
+    public:
+        ControlParser(ErrorHandler& errorHandler, const Context& context, Locals& locals, Literals& literals);
+
+        void appendCode(std::vector<Interpreter::Type_Code>& code) const;
+        ///< store generated code in \a code.
+
+        bool parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a name token.
+        /// \return fetch another token?
+
+        bool parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a keyword token.
+        /// \return fetch another token?
+
+        bool parseSpecial(int code, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a special character token.
+        /// \return fetch another token?
+
+        void reset() override;
+        ///< Reset parser to clean state.
     };
 }
 
diff --git a/components/compiler/declarationparser.cpp b/components/compiler/declarationparser.cpp
index e27e9681af..d23e3c141a 100644
--- a/components/compiler/declarationparser.cpp
+++ b/components/compiler/declarationparser.cpp
@@ -2,54 +2,63 @@
 
 #include <components/misc/strings/lower.hpp>
 
-#include "scanner.hpp"
 #include "errorhandler.hpp"
-#include "skipparser.hpp"
 #include "locals.hpp"
+#include "scanner.hpp"
+#include "skipparser.hpp"
 
-Compiler::DeclarationParser::DeclarationParser (ErrorHandler& errorHandler, const Context& context,
-    Locals& locals)
-: Parser (errorHandler, context), mLocals (locals), mState (State_Begin), mType (0)
-{}
+Compiler::DeclarationParser::DeclarationParser(ErrorHandler& errorHandler, const Context& context, Locals& locals)
+    : Parser(errorHandler, context)
+    , mLocals(locals)
+    , mState(State_Begin)
+    , mType(0)
+{
+}
 
-bool Compiler::DeclarationParser::parseName (const std::string& name, const TokenLoc& loc,
-    Scanner& scanner)
+bool Compiler::DeclarationParser::parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner)
 {
-    if (mState==State_Name)
+    if (mState == State_Name)
     {
-        std::string name2 = ::Misc::StringUtils::lowerCase (name);
+        std::string name2 = ::Misc::StringUtils::lowerCase(name);
 
-        char type = mLocals.getType (name2);
+        char type = mLocals.getType(name2);
 
-        if (type!=' ')
-            getErrorHandler().warning ("Local variable re-declaration", loc);
+        if (type != ' ')
+            getErrorHandler().warning("Local variable re-declaration", loc);
         else
-            mLocals.declare (mType, name2);
+            mLocals.declare(mType, name2);
 
         mState = State_End;
         return true;
     }
-    else if (mState==State_End)
+    else if (mState == State_End)
     {
-        getErrorHandler().warning ("Extra text after local variable declaration", loc);
-        SkipParser skip (getErrorHandler(), getContext());
-        scanner.scan (skip);
+        getErrorHandler().warning("Extra text after local variable declaration", loc);
+        SkipParser skip(getErrorHandler(), getContext());
+        scanner.scan(skip);
         return false;
     }
 
-    return Parser::parseName (name, loc, scanner);
+    return Parser::parseName(name, loc, scanner);
 }
 
-bool Compiler::DeclarationParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
+bool Compiler::DeclarationParser::parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner)
 {
-    if (mState==State_Begin)
+    if (mState == State_Begin)
     {
         switch (keyword)
         {
-            case Scanner::K_short: mType = 's'; break;
-            case Scanner::K_long: mType = 'l'; break;
-            case Scanner::K_float: mType = 'f'; break;
-            default: mType = 0;
+            case Scanner::K_short:
+                mType = 's';
+                break;
+            case Scanner::K_long:
+                mType = 'l';
+                break;
+            case Scanner::K_float:
+                mType = 'f';
+                break;
+            default:
+                mType = 0;
         }
 
         if (mType)
@@ -58,41 +67,41 @@ bool Compiler::DeclarationParser::parseKeyword (int keyword, const TokenLoc& loc
             return true;
         }
     }
-    else if (mState==State_Name)
+    else if (mState == State_Name)
     {
         // allow keywords to be used as local variable names. MW script compiler, you suck!
-        return parseName (loc.mLiteral, loc, scanner);
+        return parseName(loc.mLiteral, loc, scanner);
     }
-    else if (mState==State_End)
+    else if (mState == State_End)
     {
-        getErrorHandler().warning ("Extra text after local variable declaration", loc);
-        SkipParser skip (getErrorHandler(), getContext());
-        scanner.scan (skip);
+        getErrorHandler().warning("Extra text after local variable declaration", loc);
+        SkipParser skip(getErrorHandler(), getContext());
+        scanner.scan(skip);
         return false;
     }
 
-    return Parser::parseKeyword (keyword, loc, scanner);
+    return Parser::parseKeyword(keyword, loc, scanner);
 }
 
-bool Compiler::DeclarationParser::parseSpecial (int code, const TokenLoc& loc, Scanner& scanner)
+bool Compiler::DeclarationParser::parseSpecial(int code, const TokenLoc& loc, Scanner& scanner)
 {
-    if (mState==State_End)
+    if (mState == State_End)
     {
-        if (code!=Scanner::S_newline)
+        if (code != Scanner::S_newline)
         {
-            getErrorHandler().warning ("Extra text after local variable declaration", loc);
-            SkipParser skip (getErrorHandler(), getContext());
-            scanner.scan (skip);
+            getErrorHandler().warning("Extra text after local variable declaration", loc);
+            SkipParser skip(getErrorHandler(), getContext());
+            scanner.scan(skip);
         }
         return false;
     }
 
-    return Parser::parseSpecial (code, loc, scanner);
+    return Parser::parseSpecial(code, loc, scanner);
 }
 
 bool Compiler::DeclarationParser::parseInt(int value, const TokenLoc& loc, Scanner& scanner)
 {
-    if(mState == State_Name)
+    if (mState == State_Name)
     {
         // Allow integers to be used as variable names
         return parseName(loc.mLiteral, loc, scanner);
diff --git a/components/compiler/declarationparser.hpp b/components/compiler/declarationparser.hpp
index d08509fe50..a9179842ef 100644
--- a/components/compiler/declarationparser.hpp
+++ b/components/compiler/declarationparser.hpp
@@ -9,38 +9,37 @@ namespace Compiler
 
     class DeclarationParser : public Parser
     {
-            enum State
-            {
-                State_Begin, State_Name, State_End
-            };
+        enum State
+        {
+            State_Begin,
+            State_Name,
+            State_End
+        };
 
-            Locals& mLocals;
-            State mState;
-            char mType;
+        Locals& mLocals;
+        State mState;
+        char mType;
 
-        public:
+    public:
+        DeclarationParser(ErrorHandler& errorHandler, const Context& context, Locals& locals);
 
-            DeclarationParser (ErrorHandler& errorHandler, const Context& context, Locals& locals);
+        bool parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a name token.
+        /// \return fetch another token?
 
-            bool parseName (const std::string& name, const TokenLoc& loc,
-                Scanner& scanner) override;
-            ///< Handle a name token.
-            /// \return fetch another token?
+        bool parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a keyword token.
+        /// \return fetch another token?
 
-            bool parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a keyword token.
-            /// \return fetch another token?
+        bool parseSpecial(int code, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a special character token.
+        /// \return fetch another token?
 
-            bool parseSpecial (int code, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a special character token.
-            /// \return fetch another token?
-
-            bool parseInt (int value, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle an int token.
-            /// \return fetch another token?
-
-            void reset() override;
+        bool parseInt(int value, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle an int token.
+        /// \return fetch another token?
 
+        void reset() override;
     };
 }
 
diff --git a/components/compiler/discardparser.cpp b/components/compiler/discardparser.cpp
index 0a714d4eb6..f8ad181be7 100644
--- a/components/compiler/discardparser.cpp
+++ b/components/compiler/discardparser.cpp
@@ -4,15 +4,15 @@
 
 namespace Compiler
 {
-    DiscardParser::DiscardParser (ErrorHandler& errorHandler, const Context& context)
-    : Parser (errorHandler, context), mState (StartState)
+    DiscardParser::DiscardParser(ErrorHandler& errorHandler, const Context& context)
+        : Parser(errorHandler, context)
+        , mState(StartState)
     {
-
     }
 
-    bool DiscardParser::parseInt (int value, const TokenLoc& loc, Scanner& scanner)
+    bool DiscardParser::parseInt(int value, const TokenLoc& loc, Scanner& scanner)
     {
-        if (mState==StartState || mState==MinusState)
+        if (mState == StartState || mState == MinusState)
         {
             if (isEmpty())
                 mTokenLoc = loc;
@@ -21,12 +21,12 @@ namespace Compiler
             return false;
         }
 
-        return Parser::parseInt (value, loc, scanner);
+        return Parser::parseInt(value, loc, scanner);
     }
 
-    bool DiscardParser::parseFloat (float value, const TokenLoc& loc, Scanner& scanner)
+    bool DiscardParser::parseFloat(float value, const TokenLoc& loc, Scanner& scanner)
     {
-        if (mState==StartState || mState==MinusState)
+        if (mState == StartState || mState == MinusState)
         {
             if (isEmpty())
                 mTokenLoc = loc;
@@ -35,13 +35,12 @@ namespace Compiler
             return false;
         }
 
-        return Parser::parseFloat (value, loc, scanner);
+        return Parser::parseFloat(value, loc, scanner);
     }
 
-    bool DiscardParser::parseName (const std::string& name, const TokenLoc& loc,
-        Scanner& scanner)
+    bool DiscardParser::parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner)
     {
-        if (mState==StartState)
+        if (mState == StartState)
         {
             if (isEmpty())
                 mTokenLoc = loc;
@@ -50,12 +49,12 @@ namespace Compiler
             return false;
         }
 
-        return Parser::parseName (name, loc, scanner);
+        return Parser::parseName(name, loc, scanner);
     }
 
-    bool DiscardParser::parseSpecial (int code, const TokenLoc& loc, Scanner& scanner)
+    bool DiscardParser::parseSpecial(int code, const TokenLoc& loc, Scanner& scanner)
     {
-        if (code==Scanner::S_minus && mState==StartState)
+        if (code == Scanner::S_minus && mState == StartState)
         {
             if (isEmpty())
                 mTokenLoc = loc;
@@ -66,7 +65,7 @@ namespace Compiler
             return true;
         }
 
-        return Parser::parseSpecial (code, loc, scanner);
+        return Parser::parseSpecial(code, loc, scanner);
     }
 
     void DiscardParser::reset()
diff --git a/components/compiler/discardparser.hpp b/components/compiler/discardparser.hpp
index 5286676654..2c24eff44d 100644
--- a/components/compiler/discardparser.hpp
+++ b/components/compiler/discardparser.hpp
@@ -9,41 +9,40 @@ namespace Compiler
     /// \brief Parse a single optional numeric value or string and discard it
     class DiscardParser : public Parser
     {
-            enum State
-            {
-                StartState, MinusState
-            };
+        enum State
+        {
+            StartState,
+            MinusState
+        };
 
-            State mState;
-            TokenLoc mTokenLoc;
+        State mState;
+        TokenLoc mTokenLoc;
 
-        public:
+    public:
+        DiscardParser(ErrorHandler& errorHandler, const Context& context);
 
-            DiscardParser (ErrorHandler& errorHandler, const Context& context);
+        bool parseInt(int value, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle an int token.
+        /// \return fetch another token?
 
-            bool parseInt (int value, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle an int token.
-            /// \return fetch another token?
+        bool parseFloat(float value, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a float token.
+        /// \return fetch another token?
 
-            bool parseFloat (float value, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a float token.
-            /// \return fetch another token?
+        bool parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a name token.
+        /// \return fetch another token?
 
-            bool parseName (const std::string& name, const TokenLoc& loc,
-                Scanner& scanner) override;
-            ///< Handle a name token.
-            /// \return fetch another token?
+        bool parseSpecial(int code, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a special character token.
+        /// \return fetch another token?
 
-            bool parseSpecial (int code, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a special character token.
-            /// \return fetch another token?
+        void reset() override;
+        ///< Reset parser to clean state.
 
-            void reset() override;
-            ///< Reset parser to clean state.
-
-            /// Returns TokenLoc object for value. If no value has been parsed, the TokenLoc
-            /// object will be default initialised.
-            const TokenLoc& getTokenLoc() const;
+        /// Returns TokenLoc object for value. If no value has been parsed, the TokenLoc
+        /// object will be default initialised.
+        const TokenLoc& getTokenLoc() const;
     };
 }
 
diff --git a/components/compiler/errorhandler.cpp b/components/compiler/errorhandler.cpp
index f020977369..eb900998e6 100644
--- a/components/compiler/errorhandler.cpp
+++ b/components/compiler/errorhandler.cpp
@@ -3,7 +3,12 @@
 namespace Compiler
 {
     ErrorHandler::ErrorHandler()
-    : mWarnings (0), mErrors (0), mWarningsMode (1), mDowngradeErrors (false) {}
+        : mWarnings(0)
+        , mErrors(0)
+        , mWarningsMode(1)
+        , mDowngradeErrors(false)
+    {
+    }
 
     ErrorHandler::~ErrorHandler() = default;
 
@@ -11,7 +16,7 @@ namespace Compiler
 
     bool ErrorHandler::isGood() const
     {
-        return mErrors==0;
+        return mErrors == 0;
     }
 
     // Return number of errors
@@ -30,32 +35,32 @@ namespace Compiler
 
     // Generate a warning message.
 
-    void ErrorHandler::warning (const std::string& message, const TokenLoc& loc)
+    void ErrorHandler::warning(const std::string& message, const TokenLoc& loc)
     {
-        if (mWarningsMode==1 ||
+        if (mWarningsMode == 1 ||
             // temporarily change from mode 2 to mode 1 if error downgrading is enabled to
             // avoid infinite recursion
-            (mWarningsMode==2 && mDowngradeErrors))
+            (mWarningsMode == 2 && mDowngradeErrors))
         {
             ++mWarnings;
-            report (message, loc, WarningMessage);
+            report(message, loc, WarningMessage);
         }
-        else if (mWarningsMode==2)
-            error (message, loc);
+        else if (mWarningsMode == 2)
+            error(message, loc);
     }
 
     // Generate an error message.
 
-    void ErrorHandler::error (const std::string& message, const TokenLoc& loc)
+    void ErrorHandler::error(const std::string& message, const TokenLoc& loc)
     {
         if (mDowngradeErrors)
         {
-            warning (message, loc);
+            warning(message, loc);
             return;
         }
 
         ++mErrors;
-        report (message, loc, ErrorMessage);
+        report(message, loc, ErrorMessage);
     }
 
     // Generate an error message for an unexpected EOF.
@@ -63,7 +68,7 @@ namespace Compiler
     void ErrorHandler::endOfFile()
     {
         ++mErrors;
-        report ("unexpected end of file", ErrorMessage);
+        report("unexpected end of file", ErrorMessage);
     }
 
     // Remove all previous error/warning events
@@ -73,25 +78,25 @@ namespace Compiler
         mErrors = mWarnings = 0;
     }
 
-    void ErrorHandler::setWarningsMode (int mode)
+    void ErrorHandler::setWarningsMode(int mode)
     {
         mWarningsMode = mode;
     }
 
-    void ErrorHandler::downgradeErrors (bool downgrade)
+    void ErrorHandler::downgradeErrors(bool downgrade)
     {
         mDowngradeErrors = downgrade;
     }
 
-
-    ErrorDowngrade::ErrorDowngrade (ErrorHandler& handler) : mHandler (handler)
+    ErrorDowngrade::ErrorDowngrade(ErrorHandler& handler)
+        : mHandler(handler)
     {
-        mHandler.downgradeErrors (true);
+        mHandler.downgradeErrors(true);
     }
 
     ErrorDowngrade::~ErrorDowngrade()
     {
-        mHandler.downgradeErrors (false);
+        mHandler.downgradeErrors(false);
     }
 
 }
diff --git a/components/compiler/errorhandler.hpp b/components/compiler/errorhandler.hpp
index dfd29f2739..865d43f4e7 100644
--- a/components/compiler/errorhandler.hpp
+++ b/components/compiler/errorhandler.hpp
@@ -13,79 +13,76 @@ namespace Compiler
 
     class ErrorHandler
     {
-            int mWarnings;
-            int mErrors;
-            int mWarningsMode;
-            bool mDowngradeErrors;
-
-        protected:
-
-            enum Type
-            {
-                WarningMessage, ErrorMessage
-            };
-
-        private:
-
+        int mWarnings;
+        int mErrors;
+        int mWarningsMode;
+        bool mDowngradeErrors;
+
+    protected:
+        enum Type
+        {
+            WarningMessage,
+            ErrorMessage
+        };
+
+    private:
         // mutators
 
-            virtual void report (const std::string& message, const TokenLoc& loc, Type type) = 0;
-            ///< Report error to the user.
-
-            virtual void report (const std::string& message, Type type) = 0;
-            ///< Report a file related error
+        virtual void report(const std::string& message, const TokenLoc& loc, Type type) = 0;
+        ///< Report error to the user.
 
-        public:
+        virtual void report(const std::string& message, Type type) = 0;
+        ///< Report a file related error
 
-            ErrorHandler();
-            ///< constructor
+    public:
+        ErrorHandler();
+        ///< constructor
 
-            virtual ~ErrorHandler();
-            ///< destructor
+        virtual ~ErrorHandler();
+        ///< destructor
 
-            bool isGood() const;
-            ///< Was compiling successful?
+        bool isGood() const;
+        ///< Was compiling successful?
 
-            int countErrors() const;
-            ///< Return number of errors
+        int countErrors() const;
+        ///< Return number of errors
 
-            int countWarnings() const;
-            ///< Return number of warnings
+        int countWarnings() const;
+        ///< Return number of warnings
 
-            void warning (const std::string& message, const TokenLoc& loc);
-            ///< Generate a warning message.
+        void warning(const std::string& message, const TokenLoc& loc);
+        ///< Generate a warning message.
 
-            void error (const std::string& message, const TokenLoc& loc);
-            ///< Generate an error message.
+        void error(const std::string& message, const TokenLoc& loc);
+        ///< Generate an error message.
 
-            void endOfFile();
-            ///< Generate an error message for an unexpected EOF.
+        void endOfFile();
+        ///< Generate an error message for an unexpected EOF.
 
-            virtual void reset();
-            ///< Remove all previous error/warning events
+        virtual void reset();
+        ///< Remove all previous error/warning events
 
-            void setWarningsMode (int mode);
-            ///< // 0 ignore, 1 rate as warning, 2 rate as error
+        void setWarningsMode(int mode);
+        ///< // 0 ignore, 1 rate as warning, 2 rate as error
 
-            /// Treat errors as warnings.
-            void downgradeErrors (bool downgrade);
+        /// Treat errors as warnings.
+        void downgradeErrors(bool downgrade);
     };
 
     class ErrorDowngrade
     {
-            ErrorHandler& mHandler;
-
-            /// not implemented
-            ErrorDowngrade (const ErrorDowngrade&);
+        ErrorHandler& mHandler;
 
-            /// not implemented
-            ErrorDowngrade& operator= (const ErrorDowngrade&);
+        /// not implemented
+        ErrorDowngrade(const ErrorDowngrade&);
 
-        public:
+        /// not implemented
+        ErrorDowngrade& operator=(const ErrorDowngrade&);
 
-            explicit ErrorDowngrade (ErrorHandler& handler);
+    public:
+        explicit ErrorDowngrade(ErrorHandler& handler);
 
-            ~ErrorDowngrade();
+        ~ErrorDowngrade();
     };
 }
 
diff --git a/components/compiler/exception.hpp b/components/compiler/exception.hpp
index 3aa8997c7d..6c9f12836e 100644
--- a/components/compiler/exception.hpp
+++ b/components/compiler/exception.hpp
@@ -9,30 +9,27 @@ namespace Compiler
 
     class SourceException : public std::exception
     {
-        public:
-
-            const char *what() const noexcept override { return "Compile error";} 
-            ///< Return error message
+    public:
+        const char* what() const noexcept override { return "Compile error"; }
+        ///< Return error message
     };
 
     /// \brief Exception: File error
 
     class FileException : public SourceException
     {
-        public:
-
-            const char *what() const noexcept override { return "Can't read file"; }
-            ///< Return error message
+    public:
+        const char* what() const noexcept override { return "Can't read file"; }
+        ///< Return error message
     };
 
     /// \brief Exception: EOF condition encountered
 
     class EOFException : public SourceException
     {
-        public:
-
-            const char *what() const noexcept override { return "End of file"; }
-            ///< Return error message
+    public:
+        const char* what() const noexcept override { return "End of file"; }
+        ///< Return error message
     };
 }
 
diff --git a/components/compiler/exprparser.cpp b/components/compiler/exprparser.cpp
index 4d9dcf9a4f..dddd487c9d 100644
--- a/components/compiler/exprparser.cpp
+++ b/components/compiler/exprparser.cpp
@@ -1,27 +1,27 @@
 #include "exprparser.hpp"
 
-#include <stdexcept>
-#include <cassert>
 #include <algorithm>
-#include <stack>
+#include <cassert>
 #include <iterator>
 #include <sstream>
+#include <stack>
+#include <stdexcept>
 
 #include <components/misc/strings/lower.hpp>
 
-#include "generator.hpp"
-#include "scanner.hpp"
-#include "errorhandler.hpp"
-#include "locals.hpp"
-#include "stringparser.hpp"
-#include "extensions.hpp"
 #include "context.hpp"
 #include "discardparser.hpp"
+#include "errorhandler.hpp"
+#include "extensions.hpp"
+#include "generator.hpp"
 #include "junkparser.hpp"
+#include "locals.hpp"
+#include "scanner.hpp"
+#include "stringparser.hpp"
 
 namespace Compiler
 {
-    int ExprParser::getPriority (char op)
+    int ExprParser::getPriority(char op)
     {
         switch (op)
         {
@@ -56,51 +56,51 @@ namespace Compiler
         return 0;
     }
 
-    char ExprParser::getOperandType (int Index) const
+    char ExprParser::getOperandType(int Index) const
     {
-        assert (!mOperands.empty());
-        assert (Index>=0);
-        assert (Index<static_cast<int> (mOperands.size()));
-        return mOperands[mOperands.size()-1-Index];
+        assert(!mOperands.empty());
+        assert(Index >= 0);
+        assert(Index < static_cast<int>(mOperands.size()));
+        return mOperands[mOperands.size() - 1 - Index];
     }
 
     char ExprParser::getOperator() const
     {
-        assert (!mOperators.empty());
-        return mOperators[mOperators.size()-1];
+        assert(!mOperators.empty());
+        return mOperators[mOperators.size() - 1];
     }
 
     bool ExprParser::isOpen() const
     {
-        return std::find (mOperators.begin(), mOperators.end(), '(')!=mOperators.end();
+        return std::find(mOperators.begin(), mOperators.end(), '(') != mOperators.end();
     }
 
     void ExprParser::popOperator()
     {
-        assert (!mOperators.empty());
-        mOperators.resize (mOperators.size()-1);
+        assert(!mOperators.empty());
+        mOperators.resize(mOperators.size() - 1);
     }
 
     void ExprParser::popOperand()
     {
-        assert (!mOperands.empty());
-        mOperands.resize (mOperands.size()-1);
+        assert(!mOperands.empty());
+        mOperands.resize(mOperands.size() - 1);
     }
 
     void ExprParser::replaceBinaryOperands()
     {
-        char t1 = getOperandType (1);
+        char t1 = getOperandType(1);
         char t2 = getOperandType();
 
         popOperand();
         popOperand();
 
-        if (t1==t2)
-            mOperands.push_back (t1);
-        else if (t1=='f' || t2=='f')
-            mOperands.push_back ('f');
+        if (t1 == t2)
+            mOperands.push_back(t1);
+        else if (t1 == 'f' || t2 == 'f')
+            mOperands.push_back('f');
         else
-            throw std::logic_error ("Failed to determine result operand type");
+            throw std::logic_error("Failed to determine result operand type");
     }
 
     void ExprParser::pop()
@@ -111,34 +111,34 @@ namespace Compiler
         {
             case 'm':
 
-                Generator::negate (mCode, getOperandType());
+                Generator::negate(mCode, getOperandType());
                 popOperator();
                 break;
 
             case '+':
 
-                Generator::add (mCode, getOperandType (1), getOperandType());
+                Generator::add(mCode, getOperandType(1), getOperandType());
                 popOperator();
                 replaceBinaryOperands();
                 break;
 
             case '-':
 
-                Generator::sub (mCode, getOperandType (1), getOperandType());
+                Generator::sub(mCode, getOperandType(1), getOperandType());
                 popOperator();
                 replaceBinaryOperands();
                 break;
 
             case '*':
 
-                Generator::mul (mCode, getOperandType (1), getOperandType());
+                Generator::mul(mCode, getOperandType(1), getOperandType());
                 popOperator();
                 replaceBinaryOperands();
                 break;
 
             case '/':
 
-                Generator::div (mCode, getOperandType (1), getOperandType());
+                Generator::div(mCode, getOperandType(1), getOperandType());
                 popOperator();
                 replaceBinaryOperands();
                 break;
@@ -150,87 +150,94 @@ namespace Compiler
             case 'g':
             case 'G':
 
-                Generator::compare (mCode, op, getOperandType (1), getOperandType());
+                Generator::compare(mCode, op, getOperandType(1), getOperandType());
                 popOperator();
                 popOperand();
                 popOperand();
-                mOperands.push_back ('l');
+                mOperands.push_back('l');
                 break;
 
             default:
 
-                throw std::logic_error ("Unknown operator");
+                throw std::logic_error("Unknown operator");
         }
     }
 
-    void ExprParser::pushIntegerLiteral (int value)
+    void ExprParser::pushIntegerLiteral(int value)
     {
         mNextOperand = false;
-        mOperands.push_back ('l');
-        Generator::pushInt (mCode, mLiterals, value);
+        mOperands.push_back('l');
+        Generator::pushInt(mCode, mLiterals, value);
     }
 
-    void ExprParser::pushFloatLiteral (float value)
+    void ExprParser::pushFloatLiteral(float value)
     {
         mNextOperand = false;
-        mOperands.push_back ('f');
-        Generator::pushFloat (mCode, mLiterals, value);
+        mOperands.push_back('f');
+        Generator::pushFloat(mCode, mLiterals, value);
     }
 
-    void ExprParser::pushBinaryOperator (char c)
+    void ExprParser::pushBinaryOperator(char c)
     {
-        while (!mOperators.empty() && getPriority (getOperator())>=getPriority (c))
+        while (!mOperators.empty() && getPriority(getOperator()) >= getPriority(c))
             pop();
 
-        mOperators.push_back (c);
+        mOperators.push_back(c);
         mNextOperand = true;
     }
 
     void ExprParser::close()
     {
-        while (getOperator()!='(')
+        while (getOperator() != '(')
             pop();
 
         popOperator();
     }
 
-    int ExprParser::parseArguments (const std::string& arguments, Scanner& scanner)
+    int ExprParser::parseArguments(const std::string& arguments, Scanner& scanner)
     {
-        return parseArguments (arguments, scanner, mCode);
+        return parseArguments(arguments, scanner, mCode);
     }
 
-    bool ExprParser::handleMemberAccess (const std::string& name)
+    bool ExprParser::handleMemberAccess(const std::string& name)
     {
         mMemberOp = false;
 
-        std::string name2 = Misc::StringUtils::lowerCase (name);
-        std::string id = Misc::StringUtils::lowerCase (mExplicit);
+        std::string name2 = Misc::StringUtils::lowerCase(name);
+        std::string id = Misc::StringUtils::lowerCase(mExplicit);
 
-        std::pair<char, bool> type = getContext().getMemberType (name2, id);
+        std::pair<char, bool> type = getContext().getMemberType(name2, id);
 
-        if (type.first!=' ')
+        if (type.first != ' ')
         {
-            Generator::fetchMember (mCode, mLiterals, type.first, name2, id, !type.second);
+            Generator::fetchMember(mCode, mLiterals, type.first, name2, id, !type.second);
 
             mNextOperand = false;
             mExplicit.clear();
-            mOperands.push_back (type.first=='f' ? 'f' : 'l');
+            mOperands.push_back(type.first == 'f' ? 'f' : 'l');
             return true;
         }
 
         return false;
     }
 
-    ExprParser::ExprParser (ErrorHandler& errorHandler, const Context& context, Locals& locals,
-        Literals& literals, bool argument)
-    : Parser (errorHandler, context), mLocals (locals), mLiterals (literals),
-      mNextOperand (true), mFirst (true), mArgument (argument), mRefOp (false), mMemberOp (false)
-    {}
+    ExprParser::ExprParser(
+        ErrorHandler& errorHandler, const Context& context, Locals& locals, Literals& literals, bool argument)
+        : Parser(errorHandler, context)
+        , mLocals(locals)
+        , mLiterals(literals)
+        , mNextOperand(true)
+        , mFirst(true)
+        , mArgument(argument)
+        , mRefOp(false)
+        , mMemberOp(false)
+    {
+    }
 
-    bool ExprParser::parseInt (int value, const TokenLoc& loc, Scanner& scanner)
+    bool ExprParser::parseInt(int value, const TokenLoc& loc, Scanner& scanner)
     {
         if (!mExplicit.empty())
-            return Parser::parseInt (value, loc, scanner);
+            return Parser::parseInt(value, loc, scanner);
 
         mFirst = false;
 
@@ -238,21 +245,21 @@ namespace Compiler
         {
             start();
 
-            pushIntegerLiteral (value);
+            pushIntegerLiteral(value);
             mTokenLoc = loc;
             return true;
         }
         else
         {
-            scanner.putbackInt (value, loc);
+            scanner.putbackInt(value, loc);
             return false;
         }
     }
 
-    bool ExprParser::parseFloat (float value, const TokenLoc& loc, Scanner& scanner)
+    bool ExprParser::parseFloat(float value, const TokenLoc& loc, Scanner& scanner)
     {
         if (!mExplicit.empty())
-            return Parser::parseFloat (value, loc, scanner);
+            return Parser::parseFloat(value, loc, scanner);
 
         mFirst = false;
 
@@ -260,33 +267,32 @@ namespace Compiler
         {
             start();
 
-            pushFloatLiteral (value);
+            pushFloatLiteral(value);
             mTokenLoc = loc;
             return true;
         }
         else
         {
-            scanner.putbackFloat (value, loc);
+            scanner.putbackFloat(value, loc);
             return false;
         }
     }
 
-    bool ExprParser::parseName (const std::string& name, const TokenLoc& loc,
-        Scanner& scanner)
+    bool ExprParser::parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner)
     {
         if (!mExplicit.empty())
         {
             if (!mRefOp)
             {
-                if (mMemberOp && handleMemberAccess (name))
+                if (mMemberOp && handleMemberAccess(name))
                     return true;
 
-                return Parser::parseName (name, loc, scanner);
+                return Parser::parseName(name, loc, scanner);
             }
             else
             {
                 mExplicit.clear();
-                getErrorHandler().warning ("Stray explicit reference", loc);
+                getErrorHandler().warning("Stray explicit reference", loc);
             }
         }
 
@@ -296,29 +302,29 @@ namespace Compiler
         {
             start();
 
-            std::string name2 = Misc::StringUtils::lowerCase (name);
+            std::string name2 = Misc::StringUtils::lowerCase(name);
 
-            char type = mLocals.getType (name2);
+            char type = mLocals.getType(name2);
 
-            if (type!=' ')
+            if (type != ' ')
             {
-                Generator::fetchLocal (mCode, type, mLocals.getIndex (name2));
+                Generator::fetchLocal(mCode, type, mLocals.getIndex(name2));
                 mNextOperand = false;
-                mOperands.push_back (type=='f' ? 'f' : 'l');
+                mOperands.push_back(type == 'f' ? 'f' : 'l');
                 return true;
             }
 
-            type = getContext().getGlobalType (name2);
+            type = getContext().getGlobalType(name2);
 
-            if (type!=' ')
+            if (type != ' ')
             {
-                Generator::fetchGlobal (mCode, mLiterals, type, name2);
+                Generator::fetchGlobal(mCode, mLiterals, type, name2);
                 mNextOperand = false;
-                mOperands.push_back (type=='f' ? 'f' : 'l');
+                mOperands.push_back(type == 'f' ? 'f' : 'l');
                 return true;
             }
 
-            if (mExplicit.empty() && getContext().isId (name2))
+            if (mExplicit.empty() && getContext().isId(name2))
             {
                 mExplicit = name2;
                 return true;
@@ -336,48 +342,46 @@ namespace Compiler
 
             pushFloatLiteral(number);
             mTokenLoc = loc;
-            getErrorHandler().warning ("Parsing a non-variable string as a number: " + stream.str(), loc);
+            getErrorHandler().warning("Parsing a non-variable string as a number: " + stream.str(), loc);
             return true;
         }
         else
         {
-            scanner.putbackName (name, loc);
+            scanner.putbackName(name, loc);
             return false;
         }
     }
 
-    bool ExprParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
+    bool ExprParser::parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner)
     {
-        if (const Extensions *extensions = getContext().getExtensions())
+        if (const Extensions* extensions = getContext().getExtensions())
         {
             char returnType; // ignored
             std::string argumentType; // ignored
             bool hasExplicit = false; // ignored
-            bool isInstruction = extensions->isInstruction (keyword, argumentType, hasExplicit);
+            bool isInstruction = extensions->isInstruction(keyword, argumentType, hasExplicit);
 
-            if(isInstruction || (mExplicit.empty() && extensions->isFunction(keyword, returnType, argumentType, hasExplicit)))
+            if (isInstruction
+                || (mExplicit.empty() && extensions->isFunction(keyword, returnType, argumentType, hasExplicit)))
             {
                 std::string name = loc.mLiteral;
-                if (name.size()>=2 && name[0]=='"' && name[name.size()-1]=='"')
-                    name = name.substr (1, name.size()-2);
-                if(isInstruction || mLocals.getType(Misc::StringUtils::lowerCase(name)) != ' ')
+                if (name.size() >= 2 && name[0] == '"' && name[name.size() - 1] == '"')
+                    name = name.substr(1, name.size() - 2);
+                if (isInstruction || mLocals.getType(Misc::StringUtils::lowerCase(name)) != ' ')
                 {
                     // pretend this is not a keyword
-                    return parseName (name, loc, scanner);
+                    return parseName(name, loc, scanner);
                 }
             }
         }
 
-        if (keyword==Scanner::K_end || keyword==Scanner::K_begin ||
-            keyword==Scanner::K_short || keyword==Scanner::K_long ||
-            keyword==Scanner::K_float || keyword==Scanner::K_if ||
-            keyword==Scanner::K_endif || keyword==Scanner::K_else ||
-            keyword==Scanner::K_elseif || keyword==Scanner::K_while ||
-            keyword==Scanner::K_endwhile || keyword==Scanner::K_return ||
-            keyword==Scanner::K_messagebox || keyword==Scanner::K_set ||
-            keyword==Scanner::K_to)
+        if (keyword == Scanner::K_end || keyword == Scanner::K_begin || keyword == Scanner::K_short
+            || keyword == Scanner::K_long || keyword == Scanner::K_float || keyword == Scanner::K_if
+            || keyword == Scanner::K_endif || keyword == Scanner::K_else || keyword == Scanner::K_elseif
+            || keyword == Scanner::K_while || keyword == Scanner::K_endwhile || keyword == Scanner::K_return
+            || keyword == Scanner::K_messagebox || keyword == Scanner::K_set || keyword == Scanner::K_to)
         {
-            return parseName (loc.mLiteral, loc, scanner);
+            return parseName(loc.mLiteral, loc, scanner);
         }
 
         mFirst = false;
@@ -388,28 +392,27 @@ namespace Compiler
             {
 
                 // check for custom extensions
-                if (const Extensions *extensions = getContext().getExtensions())
+                if (const Extensions* extensions = getContext().getExtensions())
                 {
                     char returnType;
                     std::string argumentType;
 
                     bool hasExplicit = true;
-                    if (extensions->isFunction (keyword, returnType, argumentType, hasExplicit))
+                    if (extensions->isFunction(keyword, returnType, argumentType, hasExplicit))
                     {
                         if (!hasExplicit)
                         {
-                            getErrorHandler().warning ("Stray explicit reference", loc);
+                            getErrorHandler().warning("Stray explicit reference", loc);
                             mExplicit.clear();
                         }
 
                         start();
 
                         mTokenLoc = loc;
-                        int optionals = parseArguments (argumentType, scanner);
+                        int optionals = parseArguments(argumentType, scanner);
 
-                        extensions->generateFunctionCode (keyword, mCode, mLiterals, mExplicit,
-                            optionals);
-                        mOperands.push_back (returnType);
+                        extensions->generateFunctionCode(keyword, mCode, mLiterals, mExplicit, optionals);
+                        mOperands.push_back(returnType);
                         mExplicit.clear();
                         mRefOp = false;
 
@@ -419,13 +422,13 @@ namespace Compiler
                 }
             }
 
-            return Parser::parseKeyword (keyword, loc, scanner);
+            return Parser::parseKeyword(keyword, loc, scanner);
         }
 
         if (mNextOperand)
         {
             // check for custom extensions
-            if (const Extensions *extensions = getContext().getExtensions())
+            if (const Extensions* extensions = getContext().getExtensions())
             {
                 start();
 
@@ -434,13 +437,13 @@ namespace Compiler
 
                 bool hasExplicit = false;
 
-                if (extensions->isFunction (keyword, returnType, argumentType, hasExplicit))
+                if (extensions->isFunction(keyword, returnType, argumentType, hasExplicit))
                 {
                     mTokenLoc = loc;
-                    int optionals = parseArguments (argumentType, scanner);
+                    int optionals = parseArguments(argumentType, scanner);
 
-                    extensions->generateFunctionCode (keyword, mCode, mLiterals, "", optionals);
-                    mOperands.push_back (returnType);
+                    extensions->generateFunctionCode(keyword, mCode, mLiterals, "", optionals);
+                    mOperands.push_back(returnType);
 
                     mNextOperand = false;
                     return true;
@@ -449,82 +452,82 @@ namespace Compiler
         }
         else
         {
-            scanner.putbackKeyword (keyword, loc);
+            scanner.putbackKeyword(keyword, loc);
             return false;
         }
 
-        return Parser::parseKeyword (keyword, loc, scanner);
+        return Parser::parseKeyword(keyword, loc, scanner);
     }
 
-    bool ExprParser::parseSpecial (int code, const TokenLoc& loc, Scanner& scanner)
+    bool ExprParser::parseSpecial(int code, const TokenLoc& loc, Scanner& scanner)
     {
         if (!mExplicit.empty())
         {
-            if (mRefOp && code==Scanner::S_open)
+            if (mRefOp && code == Scanner::S_open)
             {
                 /// \todo add option to disable this workaround
-                mOperators.push_back ('(');
+                mOperators.push_back('(');
                 mTokenLoc = loc;
                 return true;
             }
 
-            if (!mRefOp && code==Scanner::S_ref)
+            if (!mRefOp && code == Scanner::S_ref)
             {
                 mRefOp = true;
                 return true;
             }
 
-            if (!mMemberOp && code==Scanner::S_member)
+            if (!mMemberOp && code == Scanner::S_member)
             {
                 mMemberOp = true;
                 return true;
             }
 
-            return Parser::parseSpecial (code, loc, scanner);
+            return Parser::parseSpecial(code, loc, scanner);
         }
 
         mFirst = false;
 
-        if (code==Scanner::S_newline)
+        if (code == Scanner::S_newline)
         {
             // end marker
             if (mTokenLoc.mLiteral.empty())
                 mTokenLoc = loc;
-            scanner.putbackSpecial (code, loc);
+            scanner.putbackSpecial(code, loc);
             return false;
         }
 
-        if (code==Scanner::S_minus && mNextOperand)
+        if (code == Scanner::S_minus && mNextOperand)
         {
             // unary
-            mOperators.push_back ('m');
+            mOperators.push_back('m');
             mTokenLoc = loc;
             return true;
         }
 
-        if (code ==Scanner::S_plus && mNextOperand)
+        if (code == Scanner::S_plus && mNextOperand)
         {
             // Also unary, but +, just ignore it
             mTokenLoc = loc;
             return true;
         }
 
-        if (code==Scanner::S_open)
+        if (code == Scanner::S_open)
         {
             if (mNextOperand)
             {
-                mOperators.push_back ('(');
+                mOperators.push_back('(');
                 mTokenLoc = loc;
                 return true;
             }
             else
             {
-                scanner.putbackSpecial (code, loc);
+                scanner.putbackSpecial(code, loc);
                 return false;
             }
         }
 
-        if (code==Scanner::S_close && !mNextOperand)
+        if (code == Scanner::S_close && !mNextOperand)
         {
             if (isOpen())
             {
@@ -533,7 +536,7 @@ namespace Compiler
             }
 
             mTokenLoc = loc;
-            scanner.putbackSpecial (code, loc);
+            scanner.putbackSpecial(code, loc);
             return false;
         }
 
@@ -544,16 +547,36 @@ namespace Compiler
 
             switch (code)
             {
-                case Scanner::S_plus: c = '+'; break;
-                case Scanner::S_minus: c = '-'; break;
-                case Scanner::S_mult: pushBinaryOperator ('*'); return true;
-                case Scanner::S_div: pushBinaryOperator ('/'); return true;
-                case Scanner::S_cmpEQ: c = 'e'; break;
-                case Scanner::S_cmpNE: c = 'n'; break;
-                case Scanner::S_cmpLT: c = 'l'; break;
-                case Scanner::S_cmpLE: c = 'L'; break;
-                case Scanner::S_cmpGT: c = 'g'; break;
-                case Scanner::S_cmpGE: c = 'G'; break;
+                case Scanner::S_plus:
+                    c = '+';
+                    break;
+                case Scanner::S_minus:
+                    c = '-';
+                    break;
+                case Scanner::S_mult:
+                    pushBinaryOperator('*');
+                    return true;
+                case Scanner::S_div:
+                    pushBinaryOperator('/');
+                    return true;
+                case Scanner::S_cmpEQ:
+                    c = 'e';
+                    break;
+                case Scanner::S_cmpNE:
+                    c = 'n';
+                    break;
+                case Scanner::S_cmpLT:
+                    c = 'l';
+                    break;
+                case Scanner::S_cmpLE:
+                    c = 'L';
+                    break;
+                case Scanner::S_cmpGT:
+                    c = 'g';
+                    break;
+                case Scanner::S_cmpGE:
+                    c = 'G';
+                    break;
             }
 
             if (c)
@@ -562,16 +585,16 @@ namespace Compiler
                 {
                     // expression ends here
                     // Thank you Morrowind for this rotten syntax :(
-                    scanner.putbackSpecial (code, loc);
+                    scanner.putbackSpecial(code, loc);
                     return false;
                 }
 
-                pushBinaryOperator (c);
+                pushBinaryOperator(c);
                 return true;
             }
         }
 
-        return Parser::parseSpecial (code, loc, scanner);
+        return Parser::parseSpecial(code, loc, scanner);
     }
 
     void ExprParser::reset()
@@ -587,131 +610,132 @@ namespace Compiler
         Parser::reset();
     }
 
-    char ExprParser::append (std::vector<Interpreter::Type_Code>& code)
+    char ExprParser::append(std::vector<Interpreter::Type_Code>& code)
     {
         if (mOperands.empty() && mOperators.empty())
         {
-            getErrorHandler().error ("Missing expression", mTokenLoc);
+            getErrorHandler().error("Missing expression", mTokenLoc);
             return 'l';
         }
 
         if (mNextOperand || mOperands.empty())
         {
-            getErrorHandler().error ("Syntax error in expression", mTokenLoc);
+            getErrorHandler().error("Syntax error in expression", mTokenLoc);
             return 'l';
         }
 
         while (!mOperators.empty())
             pop();
 
-        std::copy (mCode.begin(), mCode.end(), std::back_inserter (code));
+        std::copy(mCode.begin(), mCode.end(), std::back_inserter(code));
 
-        assert (mOperands.size()==1);
+        assert(mOperands.size() == 1);
         return mOperands[0];
     }
 
-    int ExprParser::parseArguments (const std::string& arguments, Scanner& scanner,
+    int ExprParser::parseArguments(const std::string& arguments, Scanner& scanner,
         std::vector<Interpreter::Type_Code>& code, int ignoreKeyword, bool expectNames)
     {
         bool optional = false;
         int optionalCount = 0;
 
-        ExprParser parser (getErrorHandler(), getContext(), mLocals, mLiterals, true);
-        StringParser stringParser (getErrorHandler(), getContext(), mLiterals);
-        DiscardParser discardParser (getErrorHandler(), getContext());
-        JunkParser junkParser (getErrorHandler(), getContext(), ignoreKeyword);
+        ExprParser parser(getErrorHandler(), getContext(), mLocals, mLiterals, true);
+        StringParser stringParser(getErrorHandler(), getContext(), mLiterals);
+        DiscardParser discardParser(getErrorHandler(), getContext());
+        JunkParser junkParser(getErrorHandler(), getContext(), ignoreKeyword);
 
-        std::stack<std::vector<Interpreter::Type_Code> > stack;
+        std::stack<std::vector<Interpreter::Type_Code>> stack;
 
         for (char argument : arguments)
         {
-            if (argument=='/')
+            if (argument == '/')
             {
                 optional = true;
             }
-            else if (argument=='S' || argument=='c' || argument=='x')
+            else if (argument == 'S' || argument == 'c' || argument == 'x')
             {
                 stringParser.reset();
 
-                if (optional || argument=='x')
-                    stringParser.setOptional (true);
+                if (optional || argument == 'x')
+                    stringParser.setOptional(true);
 
-                if (argument=='c') stringParser.smashCase();
-                if (argument=='x') stringParser.discard();
+                if (argument == 'c')
+                    stringParser.smashCase();
+                if (argument == 'x')
+                    stringParser.discard();
                 scanner.enableExpectName();
-                scanner.scan (stringParser);
+                scanner.scan(stringParser);
 
-                if ((optional || argument=='x') && stringParser.isEmpty())
+                if ((optional || argument == 'x') && stringParser.isEmpty())
                     break;
 
-                if (argument!='x')
+                if (argument != 'x')
                 {
                     std::vector<Interpreter::Type_Code> tmp;
-                    stringParser.append (tmp);
+                    stringParser.append(tmp);
 
-                    stack.push (tmp);
+                    stack.push(tmp);
 
                     if (optional)
                         ++optionalCount;
                 }
                 else
-                    getErrorHandler().warning ("Extra argument",
-                        stringParser.getTokenLoc());
+                    getErrorHandler().warning("Extra argument", stringParser.getTokenLoc());
             }
-            else if (argument=='X')
+            else if (argument == 'X')
             {
                 parser.reset();
 
-                parser.setOptional (true);
+                parser.setOptional(true);
 
-                scanner.scan (parser);
+                scanner.scan(parser);
 
                 if (parser.isEmpty())
                     break;
                 else
                     getErrorHandler().warning("Extra argument", parser.getTokenLoc());
             }
-            else if (argument=='z')
+            else if (argument == 'z')
             {
                 discardParser.reset();
-                discardParser.setOptional (true);
+                discardParser.setOptional(true);
 
-                scanner.scan (discardParser);
+                scanner.scan(discardParser);
 
                 if (discardParser.isEmpty())
                     break;
                 else
                     getErrorHandler().warning("Extra argument", discardParser.getTokenLoc());
             }
-            else if (argument=='j')
+            else if (argument == 'j')
             {
                 /// \todo disable this when operating in strict mode
                 junkParser.reset();
 
-                scanner.scan (junkParser);
+                scanner.scan(junkParser);
             }
             else
             {
                 parser.reset();
 
                 if (optional)
-                    parser.setOptional (true);
-                if(expectNames)
+                    parser.setOptional(true);
+                if (expectNames)
                     scanner.enableExpectName();
 
-                scanner.scan (parser);
+                scanner.scan(parser);
 
                 if (optional && parser.isEmpty())
                     break;
 
                 std::vector<Interpreter::Type_Code> tmp;
 
-                char type = parser.append (tmp);
+                char type = parser.append(tmp);
 
-                if (type!=argument)
-                    Generator::convert (tmp, type, argument);
+                if (type != argument)
+                    Generator::convert(tmp, type, argument);
 
-                stack.push (tmp);
+                stack.push(tmp);
 
                 if (optional)
                     ++optionalCount;
@@ -722,7 +746,7 @@ namespace Compiler
         {
             std::vector<Interpreter::Type_Code>& tmp = stack.top();
 
-            std::copy (tmp.begin(), tmp.end(), std::back_inserter (code));
+            std::copy(tmp.begin(), tmp.end(), std::back_inserter(code));
 
             stack.pop();
         }
diff --git a/components/compiler/exprparser.hpp b/components/compiler/exprparser.hpp
index 42739658ec..d71fd2e305 100644
--- a/components/compiler/exprparser.hpp
+++ b/components/compiler/exprparser.hpp
@@ -15,96 +15,94 @@ namespace Compiler
 
     class ExprParser : public Parser
     {
-            Locals& mLocals;
-            Literals& mLiterals;
-            std::vector<char> mOperands;
-            std::vector<char> mOperators;
-            bool mNextOperand;
-            TokenLoc mTokenLoc;
-            std::vector<Interpreter::Type_Code> mCode;
-            bool mFirst;
-            bool mArgument;
-            std::string mExplicit;
-            bool mRefOp;
-            bool mMemberOp;
+        Locals& mLocals;
+        Literals& mLiterals;
+        std::vector<char> mOperands;
+        std::vector<char> mOperators;
+        bool mNextOperand;
+        TokenLoc mTokenLoc;
+        std::vector<Interpreter::Type_Code> mCode;
+        bool mFirst;
+        bool mArgument;
+        std::string mExplicit;
+        bool mRefOp;
+        bool mMemberOp;
 
-            static int getPriority (char op) ;
+        static int getPriority(char op);
 
-            char getOperandType (int Index = 0) const;
+        char getOperandType(int Index = 0) const;
 
-            char getOperator() const;
+        char getOperator() const;
 
-            bool isOpen() const;
+        bool isOpen() const;
 
-            void popOperator();
+        void popOperator();
 
-            void popOperand();
+        void popOperand();
 
-            void replaceBinaryOperands();
+        void replaceBinaryOperands();
 
-            void pop();
+        void pop();
 
-            void pushIntegerLiteral (int value);
+        void pushIntegerLiteral(int value);
 
-            void pushFloatLiteral (float value);
+        void pushFloatLiteral(float value);
 
-            void pushBinaryOperator (char c);
+        void pushBinaryOperator(char c);
 
-            void close();
+        void close();
 
-            int parseArguments (const std::string& arguments, Scanner& scanner);
+        int parseArguments(const std::string& arguments, Scanner& scanner);
 
-            bool handleMemberAccess (const std::string& name);
+        bool handleMemberAccess(const std::string& name);
 
-        public:
+    public:
+        ExprParser(ErrorHandler& errorHandler, const Context& context, Locals& locals, Literals& literals,
+            bool argument = false);
+        ///< constructor
+        /// \param argument Parser is used to parse function- or instruction-
+        /// arguments (this influences the precedence rules).
 
-            ExprParser (ErrorHandler& errorHandler, const Context& context, Locals& locals,
-                Literals& literals, bool argument = false);
-            ///< constructor
-            /// \param argument Parser is used to parse function- or instruction-
-            /// arguments (this influences the precedence rules).
+        char getType() const;
+        ///< Return type of parsed expression ('l' integer, 'f' float)
 
-            char getType() const;
-            ///< Return type of parsed expression ('l' integer, 'f' float)
+        bool parseInt(int value, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle an int token.
+        /// \return fetch another token?
 
-            bool parseInt (int value, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle an int token.
-            /// \return fetch another token?
+        bool parseFloat(float value, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a float token.
+        /// \return fetch another token?
 
-            bool parseFloat (float value, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a float token.
-            /// \return fetch another token?
+        bool parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a name token.
+        /// \return fetch another token?
 
-            bool parseName (const std::string& name, const TokenLoc& loc,
-                Scanner& scanner) override;
-            ///< Handle a name token.
-            /// \return fetch another token?
+        bool parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a keyword token.
+        /// \return fetch another token?
 
-            bool parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a keyword token.
-            /// \return fetch another token?
+        bool parseSpecial(int code, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a special character token.
+        /// \return fetch another token?
 
-            bool parseSpecial (int code, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a special character token.
-            /// \return fetch another token?
+        void reset() override;
+        ///< Reset parser to clean state.
 
-            void reset() override;
-            ///< Reset parser to clean state.
+        char append(std::vector<Interpreter::Type_Code>& code);
+        ///< Generate code for parsed expression.
+        /// \return Type ('l': integer, 'f': float)
 
-            char append (std::vector<Interpreter::Type_Code>& code);
-            ///< Generate code for parsed expression.
-            /// \return Type ('l': integer, 'f': float)
+        int parseArguments(const std::string& arguments, Scanner& scanner, std::vector<Interpreter::Type_Code>& code,
+            int ignoreKeyword = -1, bool expectNames = false);
+        ///< Parse sequence of arguments specified by \a arguments.
+        /// \param arguments Uses ScriptArgs typedef
+        /// \see Compiler::ScriptArgs
+        /// \param invert Store arguments in reverted order.
+        /// \param ignoreKeyword A keyword that is seen as junk
+        /// \return number of optional arguments
 
-            int parseArguments (const std::string& arguments, Scanner& scanner,
-                std::vector<Interpreter::Type_Code>& code, int ignoreKeyword = -1, bool expectNames = false);
-            ///< Parse sequence of arguments specified by \a arguments.
-            /// \param arguments Uses ScriptArgs typedef
-            /// \see Compiler::ScriptArgs
-            /// \param invert Store arguments in reverted order.
-            /// \param ignoreKeyword A keyword that is seen as junk
-            /// \return number of optional arguments
-
-            const TokenLoc& getTokenLoc() const;
+        const TokenLoc& getTokenLoc() const;
     };
 }
 
diff --git a/components/compiler/extensions.cpp b/components/compiler/extensions.cpp
index 9646d54a7e..8431589769 100644
--- a/components/compiler/extensions.cpp
+++ b/components/compiler/extensions.cpp
@@ -8,25 +8,28 @@
 
 namespace Compiler
 {
-    Extensions::Extensions() : mNextKeywordIndex (-1) {}
+    Extensions::Extensions()
+        : mNextKeywordIndex(-1)
+    {
+    }
 
-    int Extensions::searchKeyword (const std::string& keyword) const
+    int Extensions::searchKeyword(const std::string& keyword) const
     {
-        auto iter = mKeywords.find (keyword);
-        if (iter==mKeywords.end())
+        auto iter = mKeywords.find(keyword);
+        if (iter == mKeywords.end())
             return 0;
 
         return iter->second;
     }
 
-    bool Extensions::isFunction (int keyword, ScriptReturn& returnType, ScriptArgs& argumentType,
-        bool& explicitReference) const
+    bool Extensions::isFunction(
+        int keyword, ScriptReturn& returnType, ScriptArgs& argumentType, bool& explicitReference) const
     {
-        auto iter = mFunctions.find (keyword);
-        if (iter==mFunctions.end())
+        auto iter = mFunctions.find(keyword);
+        if (iter == mFunctions.end())
             return false;
 
-        if (explicitReference && iter->second.mCodeExplicit==-1)
+        if (explicitReference && iter->second.mCodeExplicit == -1)
             explicitReference = false;
 
         returnType = iter->second.mReturn;
@@ -34,177 +37,171 @@ namespace Compiler
         return true;
     }
 
-    bool Extensions::isInstruction (int keyword, ScriptArgs& argumentType,
-        bool& explicitReference) const
+    bool Extensions::isInstruction(int keyword, ScriptArgs& argumentType, bool& explicitReference) const
     {
-        auto iter = mInstructions.find (keyword);
-        if (iter==mInstructions.end())
+        auto iter = mInstructions.find(keyword);
+        if (iter == mInstructions.end())
             return false;
 
-        if (explicitReference && iter->second.mCodeExplicit==-1)
+        if (explicitReference && iter->second.mCodeExplicit == -1)
             explicitReference = false;
 
         argumentType = iter->second.mArguments;
         return true;
     }
 
-    void Extensions::registerFunction (const std::string& keyword, ScriptReturn returnType,
-        const ScriptArgs& argumentType, int code, int codeExplicit)
+    void Extensions::registerFunction(
+        const std::string& keyword, ScriptReturn returnType, const ScriptArgs& argumentType, int code, int codeExplicit)
     {
         Function function;
 
-        if (argumentType.find ('/')==std::string::npos)
+        if (argumentType.find('/') == std::string::npos)
         {
             function.mSegment = 5;
-            assert (code>=33554432 && code<=67108863);
-            assert (codeExplicit==-1 || (codeExplicit>=33554432 && codeExplicit<=67108863));
+            assert(code >= 33554432 && code <= 67108863);
+            assert(codeExplicit == -1 || (codeExplicit >= 33554432 && codeExplicit <= 67108863));
         }
         else
         {
             function.mSegment = 3;
-            assert (code>=0x20000 && code<=0x2ffff);
-            assert (codeExplicit==-1 || (codeExplicit>=0x20000 && codeExplicit<=0x2ffff));
+            assert(code >= 0x20000 && code <= 0x2ffff);
+            assert(codeExplicit == -1 || (codeExplicit >= 0x20000 && codeExplicit <= 0x2ffff));
         }
 
         int keywordIndex = mNextKeywordIndex--;
 
-        mKeywords.insert (std::make_pair (keyword, keywordIndex));
+        mKeywords.insert(std::make_pair(keyword, keywordIndex));
 
         function.mReturn = returnType;
         function.mArguments = argumentType;
         function.mCode = code;
         function.mCodeExplicit = codeExplicit;
 
-        mFunctions.insert (std::make_pair (keywordIndex, function));
+        mFunctions.insert(std::make_pair(keywordIndex, function));
     }
 
-    void Extensions::registerInstruction (const std::string& keyword,
-        const ScriptArgs& argumentType, int code, int codeExplicit)
+    void Extensions::registerInstruction(
+        const std::string& keyword, const ScriptArgs& argumentType, int code, int codeExplicit)
     {
         Instruction instruction;
 
-        if (argumentType.find ('/')==std::string::npos)
+        if (argumentType.find('/') == std::string::npos)
         {
             instruction.mSegment = 5;
-            assert (code>=33554432 && code<=67108863);
-            assert (codeExplicit==-1 || (codeExplicit>=33554432 && codeExplicit<=67108863));
+            assert(code >= 33554432 && code <= 67108863);
+            assert(codeExplicit == -1 || (codeExplicit >= 33554432 && codeExplicit <= 67108863));
         }
         else
         {
             instruction.mSegment = 3;
-            assert (code>=0x20000 && code<=0x2ffff);
-            assert (codeExplicit==-1 || (codeExplicit>=0x20000 && codeExplicit<=0x2ffff));
+            assert(code >= 0x20000 && code <= 0x2ffff);
+            assert(codeExplicit == -1 || (codeExplicit >= 0x20000 && codeExplicit <= 0x2ffff));
         }
 
         int keywordIndex = mNextKeywordIndex--;
 
-        mKeywords.insert (std::make_pair (keyword, keywordIndex));
+        mKeywords.insert(std::make_pair(keyword, keywordIndex));
 
         instruction.mArguments = argumentType;
         instruction.mCode = code;
         instruction.mCodeExplicit = codeExplicit;
 
-        mInstructions.insert (std::make_pair (keywordIndex, instruction));
+        mInstructions.insert(std::make_pair(keywordIndex, instruction));
     }
 
-    void Extensions::generateFunctionCode (int keyword, std::vector<Interpreter::Type_Code>& code,
-        Literals& literals, const std::string& id, int optionalArguments) const
+    void Extensions::generateFunctionCode(int keyword, std::vector<Interpreter::Type_Code>& code, Literals& literals,
+        const std::string& id, int optionalArguments) const
     {
-        assert (optionalArguments>=0);
+        assert(optionalArguments >= 0);
 
-        auto iter = mFunctions.find (keyword);
-        if (iter==mFunctions.end())
-            throw std::logic_error ("unknown custom function keyword");
+        auto iter = mFunctions.find(keyword);
+        if (iter == mFunctions.end())
+            throw std::logic_error("unknown custom function keyword");
 
-        if (optionalArguments && iter->second.mSegment!=3)
-            throw std::logic_error ("functions with optional arguments must be placed into segment 3");
+        if (optionalArguments && iter->second.mSegment != 3)
+            throw std::logic_error("functions with optional arguments must be placed into segment 3");
 
         if (!id.empty())
         {
-            if (iter->second.mCodeExplicit==-1)
-                throw std::logic_error ("explicit references not supported");
+            if (iter->second.mCodeExplicit == -1)
+                throw std::logic_error("explicit references not supported");
 
-            int index = literals.addString (id);
-            Generator::pushInt (code, literals, index);
+            int index = literals.addString(id);
+            Generator::pushInt(code, literals, index);
         }
 
         switch (iter->second.mSegment)
         {
             case 3:
 
-                if (optionalArguments>=256)
-                    throw std::logic_error ("number of optional arguments is too large for segment 3");
+                if (optionalArguments >= 256)
+                    throw std::logic_error("number of optional arguments is too large for segment 3");
 
-                code.push_back (Generator::segment3 (
-                    id.empty() ? iter->second.mCode : iter->second.mCodeExplicit,
-                    optionalArguments));
+                code.push_back(Generator::segment3(
+                    id.empty() ? iter->second.mCode : iter->second.mCodeExplicit, optionalArguments));
 
                 break;
 
             case 5:
 
-                code.push_back (Generator::segment5 (
-                    id.empty() ? iter->second.mCode : iter->second.mCodeExplicit));
+                code.push_back(Generator::segment5(id.empty() ? iter->second.mCode : iter->second.mCodeExplicit));
 
                 break;
 
             default:
 
-                throw std::logic_error ("unsupported code segment");
+                throw std::logic_error("unsupported code segment");
         }
     }
 
-    void Extensions::generateInstructionCode (int keyword,
-        std::vector<Interpreter::Type_Code>& code, Literals& literals, const std::string& id,
-        int optionalArguments) const
+    void Extensions::generateInstructionCode(int keyword, std::vector<Interpreter::Type_Code>& code, Literals& literals,
+        const std::string& id, int optionalArguments) const
     {
-        assert (optionalArguments>=0);
+        assert(optionalArguments >= 0);
 
-        auto iter = mInstructions.find (keyword);
-        if (iter==mInstructions.end())
-            throw std::logic_error ("unknown custom instruction keyword");
+        auto iter = mInstructions.find(keyword);
+        if (iter == mInstructions.end())
+            throw std::logic_error("unknown custom instruction keyword");
 
-        if (optionalArguments && iter->second.mSegment!=3)
-            throw std::logic_error ("instructions with optional arguments must be placed into segment 3");
+        if (optionalArguments && iter->second.mSegment != 3)
+            throw std::logic_error("instructions with optional arguments must be placed into segment 3");
 
         if (!id.empty())
         {
-            if (iter->second.mCodeExplicit==-1)
-                throw std::logic_error ("explicit references not supported");
+            if (iter->second.mCodeExplicit == -1)
+                throw std::logic_error("explicit references not supported");
 
-            int index = literals.addString (id);
-            Generator::pushInt (code, literals, index);
+            int index = literals.addString(id);
+            Generator::pushInt(code, literals, index);
         }
 
         switch (iter->second.mSegment)
         {
             case 3:
 
-                if (optionalArguments>=256)
-                    throw std::logic_error ("number of optional arguments is too large for segment 3");
+                if (optionalArguments >= 256)
+                    throw std::logic_error("number of optional arguments is too large for segment 3");
 
-                code.push_back (Generator::segment3 (
-                    id.empty() ? iter->second.mCode : iter->second.mCodeExplicit,
-                    optionalArguments));
+                code.push_back(Generator::segment3(
+                    id.empty() ? iter->second.mCode : iter->second.mCodeExplicit, optionalArguments));
 
                 break;
 
             case 5:
 
-                code.push_back (Generator::segment5 (
-                    id.empty() ? iter->second.mCode : iter->second.mCodeExplicit));
+                code.push_back(Generator::segment5(id.empty() ? iter->second.mCode : iter->second.mCodeExplicit));
 
                 break;
 
             default:
 
-                throw std::logic_error ("unsupported code segment");
+                throw std::logic_error("unsupported code segment");
         }
     }
 
-    void Extensions::listKeywords (std::vector<std::string>& keywords) const
+    void Extensions::listKeywords(std::vector<std::string>& keywords) const
     {
-        for (const auto & mKeyword : mKeywords)
-            keywords.push_back (mKeyword.first);
+        for (const auto& mKeyword : mKeywords)
+            keywords.push_back(mKeyword.first);
     }
 }
diff --git a/components/compiler/extensions.hpp b/components/compiler/extensions.hpp
index 2adf25a57d..016a53d725 100644
--- a/components/compiler/extensions.hpp
+++ b/components/compiler/extensions.hpp
@@ -1,8 +1,8 @@
 #ifndef COMPILER_EXTENSIONS_H_INCLUDED
 #define COMPILER_EXTENSIONS_H_INCLUDED
 
-#include <string>
 #include <map>
+#include <string>
 #include <vector>
 
 #include <components/interpreter/types.hpp>
@@ -39,76 +39,73 @@ namespace Compiler
     class Extensions
     {
 
-            struct Function
-            {
-                char mReturn;
-                ScriptArgs mArguments;
-                int mCode;
-                int mCodeExplicit;
-                int mSegment;
-            };
-
-            struct Instruction
-            {
-                ScriptArgs mArguments;
-                int mCode;
-                int mCodeExplicit;
-                int mSegment;
-            };
-
-            int mNextKeywordIndex;
-            std::map<std::string, int> mKeywords;
-            std::map<int, Function> mFunctions;
-            std::map<int, Instruction> mInstructions;
-
-        public:
-
-            Extensions();
-
-            int searchKeyword (const std::string& keyword) const;
-            ///< Return extension keyword code, that is assigned to the string \a keyword.
-            /// - if no match is found 0 is returned.
-            /// - keyword must be all lower case.
-
-            bool isFunction (int keyword, ScriptReturn& returnType, ScriptArgs& argumentType,
-                bool& explicitReference) const;
-            ///< Is this keyword registered with a function? If yes, return return and argument
-            /// types.
-            /// \param explicitReference In: has explicit reference; Out: set to false, if
-            /// explicit reference is not available for this instruction.
-
-            bool isInstruction (int keyword, ScriptArgs& argumentType,
-                bool& explicitReference) const;
-            ///< Is this keyword registered with a function? If yes, return argument types.
-            /// \param explicitReference In: has explicit reference; Out: set to false, if
-            /// explicit reference is not available for this instruction.
-
-            void registerFunction (const std::string& keyword, ScriptReturn returnType,
-                const ScriptArgs& argumentType, int code, int codeExplicit = -1);
-            ///< Register a custom function
-            /// - keyword must be all lower case.
-            /// - keyword must be unique
-            /// - if explicit references are not supported, segment5codeExplicit must be set to -1
-            /// \note Currently only segment 3 and segment 5 opcodes are supported.
-
-            void registerInstruction (const std::string& keyword,
-                const ScriptArgs& argumentType, int code, int codeExplicit = -1);
-            ///< Register a custom instruction
-            /// - keyword must be all lower case.
-            /// - keyword must be unique
-            /// - if explicit references are not supported, segment5codeExplicit must be set to -1
-            /// \note Currently only segment 3 and segment 5 opcodes are supported.
-
-            void generateFunctionCode (int keyword, std::vector<Interpreter::Type_Code>& code,
-                Literals& literals, const std::string& id, int optionalArguments) const;
-            ///< Append code for function to \a code.
-
-            void generateInstructionCode (int keyword, std::vector<Interpreter::Type_Code>& code,
-                Literals& literals, const std::string& id, int optionalArguments) const;
-            ///< Append code for function to \a code.
-
-            void listKeywords (std::vector<std::string>& keywords) const;
-            ///< Append all known keywords to \a kaywords.
+        struct Function
+        {
+            char mReturn;
+            ScriptArgs mArguments;
+            int mCode;
+            int mCodeExplicit;
+            int mSegment;
+        };
+
+        struct Instruction
+        {
+            ScriptArgs mArguments;
+            int mCode;
+            int mCodeExplicit;
+            int mSegment;
+        };
+
+        int mNextKeywordIndex;
+        std::map<std::string, int> mKeywords;
+        std::map<int, Function> mFunctions;
+        std::map<int, Instruction> mInstructions;
+
+    public:
+        Extensions();
+
+        int searchKeyword(const std::string& keyword) const;
+        ///< Return extension keyword code, that is assigned to the string \a keyword.
+        /// - if no match is found 0 is returned.
+        /// - keyword must be all lower case.
+
+        bool isFunction(int keyword, ScriptReturn& returnType, ScriptArgs& argumentType, bool& explicitReference) const;
+        ///< Is this keyword registered with a function? If yes, return return and argument
+        /// types.
+        /// \param explicitReference In: has explicit reference; Out: set to false, if
+        /// explicit reference is not available for this instruction.
+
+        bool isInstruction(int keyword, ScriptArgs& argumentType, bool& explicitReference) const;
+        ///< Is this keyword registered with a function? If yes, return argument types.
+        /// \param explicitReference In: has explicit reference; Out: set to false, if
+        /// explicit reference is not available for this instruction.
+
+        void registerFunction(const std::string& keyword, ScriptReturn returnType, const ScriptArgs& argumentType,
+            int code, int codeExplicit = -1);
+        ///< Register a custom function
+        /// - keyword must be all lower case.
+        /// - keyword must be unique
+        /// - if explicit references are not supported, segment5codeExplicit must be set to -1
+        /// \note Currently only segment 3 and segment 5 opcodes are supported.
+
+        void registerInstruction(
+            const std::string& keyword, const ScriptArgs& argumentType, int code, int codeExplicit = -1);
+        ///< Register a custom instruction
+        /// - keyword must be all lower case.
+        /// - keyword must be unique
+        /// - if explicit references are not supported, segment5codeExplicit must be set to -1
+        /// \note Currently only segment 3 and segment 5 opcodes are supported.
+
+        void generateFunctionCode(int keyword, std::vector<Interpreter::Type_Code>& code, Literals& literals,
+            const std::string& id, int optionalArguments) const;
+        ///< Append code for function to \a code.
+
+        void generateInstructionCode(int keyword, std::vector<Interpreter::Type_Code>& code, Literals& literals,
+            const std::string& id, int optionalArguments) const;
+        ///< Append code for function to \a code.
+
+        void listKeywords(std::vector<std::string>& keywords) const;
+        ///< Append all known keywords to \a kaywords.
     };
 }
 
diff --git a/components/compiler/extensions0.cpp b/components/compiler/extensions0.cpp
index af2a287c48..13e4c63b1f 100644
--- a/components/compiler/extensions0.cpp
+++ b/components/compiler/extensions0.cpp
@@ -1,74 +1,66 @@
 #include "extensions0.hpp"
 
-#include "opcodes.hpp"
 #include "extensions.hpp"
+#include "opcodes.hpp"
 
 namespace Compiler
 {
-    void registerExtensions (Extensions& extensions, bool consoleOnly)
+    void registerExtensions(Extensions& extensions, bool consoleOnly)
     {
-        Ai::registerExtensions (extensions);
-        Animation::registerExtensions (extensions);
-        Cell::registerExtensions (extensions);
-        Container::registerExtensions (extensions);
-        Control::registerExtensions (extensions);
-        Dialogue::registerExtensions (extensions);
-        Gui::registerExtensions (extensions);
-        Misc::registerExtensions (extensions);
-        Sky::registerExtensions (extensions);
-        Sound::registerExtensions (extensions);
-        Stats::registerExtensions (extensions);
-        Transformation::registerExtensions (extensions);
+        Ai::registerExtensions(extensions);
+        Animation::registerExtensions(extensions);
+        Cell::registerExtensions(extensions);
+        Container::registerExtensions(extensions);
+        Control::registerExtensions(extensions);
+        Dialogue::registerExtensions(extensions);
+        Gui::registerExtensions(extensions);
+        Misc::registerExtensions(extensions);
+        Sky::registerExtensions(extensions);
+        Sound::registerExtensions(extensions);
+        Stats::registerExtensions(extensions);
+        Transformation::registerExtensions(extensions);
 
         if (consoleOnly)
         {
-            Console::registerExtensions (extensions);
-            User::registerExtensions (extensions);
+            Console::registerExtensions(extensions);
+            User::registerExtensions(extensions);
         }
     }
 
     namespace Ai
     {
-        void registerExtensions (Extensions& extensions)
+        void registerExtensions(Extensions& extensions)
         {
-            extensions.registerInstruction ("aiactivate", "c/l", opcodeAIActivate,
-                opcodeAIActivateExplicit);
-            extensions.registerInstruction ("aitravel", "fff/lx", opcodeAiTravel,
-                opcodeAiTravelExplicit);
-            extensions.registerInstruction ("aiescort", "cffff/l", opcodeAiEscort,
-                opcodeAiEscortExplicit);
-            extensions.registerInstruction ("aiescortcell", "ccffff/l", opcodeAiEscortCell,
-                opcodeAiEscortCellExplicit);
-            extensions.registerInstruction ("aiwander", "fff/llllllllll", opcodeAiWander,
-                opcodeAiWanderExplicit);
-            extensions.registerInstruction ("aifollow", "cffff/llllllll", opcodeAiFollow,
-                opcodeAiFollowExplicit);
-            extensions.registerInstruction ("aifollowcell", "ccffff/l", opcodeAiFollowCell,
-                opcodeAiFollowCellExplicit);
-            extensions.registerFunction ("getaipackagedone", 'l', "", opcodeGetAiPackageDone,
-                opcodeGetAiPackageDoneExplicit);
-            extensions.registerFunction ("getcurrentaipackage", 'l', "", opcodeGetCurrentAiPackage,
-                opcodeGetCurrentAiPackageExplicit);
-            extensions.registerFunction ("getdetected", 'l', "c", opcodeGetDetected,
-                opcodeGetDetectedExplicit);
-            extensions.registerInstruction ("sethello", "l", opcodeSetHello, opcodeSetHelloExplicit);
-            extensions.registerInstruction ("setfight", "l", opcodeSetFight, opcodeSetFightExplicit);
-            extensions.registerInstruction ("setflee", "l", opcodeSetFlee, opcodeSetFleeExplicit);
-            extensions.registerInstruction ("setalarm", "l", opcodeSetAlarm, opcodeSetAlarmExplicit);
-            extensions.registerInstruction ("modhello", "l", opcodeModHello, opcodeModHelloExplicit);
-            extensions.registerInstruction ("modfight", "l", opcodeModFight, opcodeModFightExplicit);
-            extensions.registerInstruction ("modflee", "l", opcodeModFlee, opcodeModFleeExplicit);
-            extensions.registerInstruction ("modalarm", "l", opcodeModAlarm, opcodeModAlarmExplicit);
-            extensions.registerInstruction ("toggleai", "", opcodeToggleAI);
-            extensions.registerInstruction ("tai", "", opcodeToggleAI);
+            extensions.registerInstruction("aiactivate", "c/l", opcodeAIActivate, opcodeAIActivateExplicit);
+            extensions.registerInstruction("aitravel", "fff/lx", opcodeAiTravel, opcodeAiTravelExplicit);
+            extensions.registerInstruction("aiescort", "cffff/l", opcodeAiEscort, opcodeAiEscortExplicit);
+            extensions.registerInstruction("aiescortcell", "ccffff/l", opcodeAiEscortCell, opcodeAiEscortCellExplicit);
+            extensions.registerInstruction("aiwander", "fff/llllllllll", opcodeAiWander, opcodeAiWanderExplicit);
+            extensions.registerInstruction("aifollow", "cffff/llllllll", opcodeAiFollow, opcodeAiFollowExplicit);
+            extensions.registerInstruction("aifollowcell", "ccffff/l", opcodeAiFollowCell, opcodeAiFollowCellExplicit);
+            extensions.registerFunction(
+                "getaipackagedone", 'l', "", opcodeGetAiPackageDone, opcodeGetAiPackageDoneExplicit);
+            extensions.registerFunction(
+                "getcurrentaipackage", 'l', "", opcodeGetCurrentAiPackage, opcodeGetCurrentAiPackageExplicit);
+            extensions.registerFunction("getdetected", 'l', "c", opcodeGetDetected, opcodeGetDetectedExplicit);
+            extensions.registerInstruction("sethello", "l", opcodeSetHello, opcodeSetHelloExplicit);
+            extensions.registerInstruction("setfight", "l", opcodeSetFight, opcodeSetFightExplicit);
+            extensions.registerInstruction("setflee", "l", opcodeSetFlee, opcodeSetFleeExplicit);
+            extensions.registerInstruction("setalarm", "l", opcodeSetAlarm, opcodeSetAlarmExplicit);
+            extensions.registerInstruction("modhello", "l", opcodeModHello, opcodeModHelloExplicit);
+            extensions.registerInstruction("modfight", "l", opcodeModFight, opcodeModFightExplicit);
+            extensions.registerInstruction("modflee", "l", opcodeModFlee, opcodeModFleeExplicit);
+            extensions.registerInstruction("modalarm", "l", opcodeModAlarm, opcodeModAlarmExplicit);
+            extensions.registerInstruction("toggleai", "", opcodeToggleAI);
+            extensions.registerInstruction("tai", "", opcodeToggleAI);
             extensions.registerInstruction("startcombat", "c", opcodeStartCombat, opcodeStartCombatExplicit);
             extensions.registerInstruction("stopcombat", "x", opcodeStopCombat, opcodeStopCombatExplicit);
-            extensions.registerFunction ("gethello", 'l', "", opcodeGetHello, opcodeGetHelloExplicit);
-            extensions.registerFunction ("getfight", 'l', "", opcodeGetFight, opcodeGetFightExplicit);
-            extensions.registerFunction ("getflee", 'l', "", opcodeGetFlee, opcodeGetFleeExplicit);
-            extensions.registerFunction ("getalarm", 'l', "", opcodeGetAlarm, opcodeGetAlarmExplicit);
-            extensions.registerFunction ("getlineofsight", 'l', "c", opcodeGetLineOfSight, opcodeGetLineOfSightExplicit);
-            extensions.registerFunction ("getlos", 'l', "c", opcodeGetLineOfSight, opcodeGetLineOfSightExplicit);
+            extensions.registerFunction("gethello", 'l', "", opcodeGetHello, opcodeGetHelloExplicit);
+            extensions.registerFunction("getfight", 'l', "", opcodeGetFight, opcodeGetFightExplicit);
+            extensions.registerFunction("getflee", 'l', "", opcodeGetFlee, opcodeGetFleeExplicit);
+            extensions.registerFunction("getalarm", 'l', "", opcodeGetAlarm, opcodeGetAlarmExplicit);
+            extensions.registerFunction("getlineofsight", 'l', "c", opcodeGetLineOfSight, opcodeGetLineOfSightExplicit);
+            extensions.registerFunction("getlos", 'l', "c", opcodeGetLineOfSight, opcodeGetLineOfSightExplicit);
             extensions.registerFunction("gettarget", 'l', "c", opcodeGetTarget, opcodeGetTargetExplicit);
             extensions.registerInstruction("face", "ffX", opcodeFace, opcodeFaceExplicit);
         }
@@ -76,123 +68,110 @@ namespace Compiler
 
     namespace Animation
     {
-        void registerExtensions (Extensions& extensions)
+        void registerExtensions(Extensions& extensions)
         {
-            extensions.registerInstruction ("skipanim", "", opcodeSkipAnim, opcodeSkipAnimExplicit);
-            extensions.registerInstruction ("playgroup", "c/l", opcodePlayAnim, opcodePlayAnimExplicit);
-            extensions.registerInstruction ("loopgroup", "cl/l", opcodeLoopAnim, opcodeLoopAnimExplicit);
+            extensions.registerInstruction("skipanim", "", opcodeSkipAnim, opcodeSkipAnimExplicit);
+            extensions.registerInstruction("playgroup", "c/l", opcodePlayAnim, opcodePlayAnimExplicit);
+            extensions.registerInstruction("loopgroup", "cl/l", opcodeLoopAnim, opcodeLoopAnimExplicit);
         }
     }
 
     namespace Cell
     {
-        void registerExtensions (Extensions& extensions)
+        void registerExtensions(Extensions& extensions)
         {
-            extensions.registerFunction ("cellchanged", 'l', "", opcodeCellChanged);
+            extensions.registerFunction("cellchanged", 'l', "", opcodeCellChanged);
             extensions.registerInstruction("testcells", "", opcodeTestCells);
             extensions.registerInstruction("testinteriorcells", "", opcodeTestInteriorCells);
-            extensions.registerInstruction ("coc", "S", opcodeCOC);
-            extensions.registerInstruction ("centeroncell", "S", opcodeCOC);
-            extensions.registerInstruction ("coe", "ll", opcodeCOE);
-            extensions.registerInstruction ("centeronexterior", "ll", opcodeCOE);
-            extensions.registerInstruction ("setwaterlevel", "f", opcodeSetWaterLevel);
-            extensions.registerInstruction ("modwaterlevel", "f", opcodeModWaterLevel);
-            extensions.registerFunction ("getinterior", 'l', "", opcodeGetInterior);
-            extensions.registerFunction ("getpccell", 'l', "c", opcodeGetPCCell);
-            extensions.registerFunction ("getwaterlevel", 'f', "", opcodeGetWaterLevel);
+            extensions.registerInstruction("coc", "S", opcodeCOC);
+            extensions.registerInstruction("centeroncell", "S", opcodeCOC);
+            extensions.registerInstruction("coe", "ll", opcodeCOE);
+            extensions.registerInstruction("centeronexterior", "ll", opcodeCOE);
+            extensions.registerInstruction("setwaterlevel", "f", opcodeSetWaterLevel);
+            extensions.registerInstruction("modwaterlevel", "f", opcodeModWaterLevel);
+            extensions.registerFunction("getinterior", 'l', "", opcodeGetInterior);
+            extensions.registerFunction("getpccell", 'l', "c", opcodeGetPCCell);
+            extensions.registerFunction("getwaterlevel", 'f', "", opcodeGetWaterLevel);
         }
     }
 
     namespace Console
     {
-        void registerExtensions (Extensions& extensions)
-        {
-
-        }
+        void registerExtensions(Extensions& extensions) {}
     }
 
     namespace Container
     {
-        void registerExtensions (Extensions& extensions)
+        void registerExtensions(Extensions& extensions)
         {
-            extensions.registerInstruction ("additem", "clX", opcodeAddItem, opcodeAddItemExplicit);
-            extensions.registerFunction ("getitemcount", 'l', "cX", opcodeGetItemCount,
-                opcodeGetItemCountExplicit);
-            extensions.registerInstruction ("removeitem", "clX", opcodeRemoveItem,
-                opcodeRemoveItemExplicit);
-            extensions.registerInstruction ("equip", "cX", opcodeEquip, opcodeEquipExplicit);
-            extensions.registerFunction ("getarmortype", 'l', "l", opcodeGetArmorType, opcodeGetArmorTypeExplicit);
-            extensions.registerFunction ("hasitemequipped", 'l', "c", opcodeHasItemEquipped, opcodeHasItemEquippedExplicit);
-            extensions.registerFunction ("hassoulgem", 'l', "c", opcodeHasSoulGem, opcodeHasSoulGemExplicit);
-            extensions.registerFunction ("getweapontype", 'l', "", opcodeGetWeaponType, opcodeGetWeaponTypeExplicit);
+            extensions.registerInstruction("additem", "clX", opcodeAddItem, opcodeAddItemExplicit);
+            extensions.registerFunction("getitemcount", 'l', "cX", opcodeGetItemCount, opcodeGetItemCountExplicit);
+            extensions.registerInstruction("removeitem", "clX", opcodeRemoveItem, opcodeRemoveItemExplicit);
+            extensions.registerInstruction("equip", "cX", opcodeEquip, opcodeEquipExplicit);
+            extensions.registerFunction("getarmortype", 'l', "l", opcodeGetArmorType, opcodeGetArmorTypeExplicit);
+            extensions.registerFunction(
+                "hasitemequipped", 'l', "c", opcodeHasItemEquipped, opcodeHasItemEquippedExplicit);
+            extensions.registerFunction("hassoulgem", 'l', "c", opcodeHasSoulGem, opcodeHasSoulGemExplicit);
+            extensions.registerFunction("getweapontype", 'l', "", opcodeGetWeaponType, opcodeGetWeaponTypeExplicit);
         }
     }
 
     namespace Control
     {
-        void registerExtensions (Extensions& extensions)
+        void registerExtensions(Extensions& extensions)
         {
-            std::string enable ("enable");
-            std::string disable ("disable");
+            std::string enable("enable");
+            std::string disable("disable");
 
-            for (int i=0; i<numberOfControls; ++i)
+            for (int i = 0; i < numberOfControls; ++i)
             {
-                extensions.registerInstruction (enable + controls[i], "", opcodeEnable+i);
-                extensions.registerInstruction (disable + controls[i], "", opcodeDisable+i);
-                extensions.registerFunction (std::string("get") + controls[i] + std::string("disabled"), 'l', "", opcodeGetDisabled+i);
+                extensions.registerInstruction(enable + controls[i], "", opcodeEnable + i);
+                extensions.registerInstruction(disable + controls[i], "", opcodeDisable + i);
+                extensions.registerFunction(
+                    std::string("get") + controls[i] + std::string("disabled"), 'l', "", opcodeGetDisabled + i);
             }
 
-            extensions.registerInstruction ("togglecollision", "", opcodeToggleCollision);
-            extensions.registerInstruction ("tcl", "", opcodeToggleCollision);
-
-            extensions.registerInstruction ("clearforcerun", "", opcodeClearForceRun,
-                opcodeClearForceRunExplicit);
-            extensions.registerInstruction ("forcerun", "", opcodeForceRun,
-                opcodeForceRunExplicit);
-
-            extensions.registerInstruction ("clearforcejump", "", opcodeClearForceJump,
-                opcodeClearForceJumpExplicit);
-            extensions.registerInstruction ("forcejump", "", opcodeForceJump,
-                opcodeForceJumpExplicit);
-
-            extensions.registerInstruction ("clearforcemovejump", "", opcodeClearForceMoveJump,
-                opcodeClearForceMoveJumpExplicit);
-            extensions.registerInstruction ("forcemovejump", "", opcodeForceMoveJump,
-                opcodeForceMoveJumpExplicit);
-
-            extensions.registerInstruction ("clearforcesneak", "", opcodeClearForceSneak,
-                opcodeClearForceSneakExplicit);
-            extensions.registerInstruction ("forcesneak", "", opcodeForceSneak,
-                opcodeForceSneakExplicit);
-            extensions.registerFunction ("getpcrunning", 'l', "", opcodeGetPcRunning);
-            extensions.registerFunction ("getpcsneaking", 'l', "", opcodeGetPcSneaking);
-            extensions.registerFunction ("getforcerun", 'l', "", opcodeGetForceRun, opcodeGetForceRunExplicit);
-            extensions.registerFunction ("getforcejump", 'l', "", opcodeGetForceJump, opcodeGetForceJumpExplicit);
-            extensions.registerFunction ("getforcemovejump", 'l', "", opcodeGetForceMoveJump, opcodeGetForceMoveJumpExplicit);
-            extensions.registerFunction ("getforcesneak", 'l', "", opcodeGetForceSneak, opcodeGetForceSneakExplicit);
+            extensions.registerInstruction("togglecollision", "", opcodeToggleCollision);
+            extensions.registerInstruction("tcl", "", opcodeToggleCollision);
+
+            extensions.registerInstruction("clearforcerun", "", opcodeClearForceRun, opcodeClearForceRunExplicit);
+            extensions.registerInstruction("forcerun", "", opcodeForceRun, opcodeForceRunExplicit);
+
+            extensions.registerInstruction("clearforcejump", "", opcodeClearForceJump, opcodeClearForceJumpExplicit);
+            extensions.registerInstruction("forcejump", "", opcodeForceJump, opcodeForceJumpExplicit);
+
+            extensions.registerInstruction(
+                "clearforcemovejump", "", opcodeClearForceMoveJump, opcodeClearForceMoveJumpExplicit);
+            extensions.registerInstruction("forcemovejump", "", opcodeForceMoveJump, opcodeForceMoveJumpExplicit);
+
+            extensions.registerInstruction("clearforcesneak", "", opcodeClearForceSneak, opcodeClearForceSneakExplicit);
+            extensions.registerInstruction("forcesneak", "", opcodeForceSneak, opcodeForceSneakExplicit);
+            extensions.registerFunction("getpcrunning", 'l', "", opcodeGetPcRunning);
+            extensions.registerFunction("getpcsneaking", 'l', "", opcodeGetPcSneaking);
+            extensions.registerFunction("getforcerun", 'l', "", opcodeGetForceRun, opcodeGetForceRunExplicit);
+            extensions.registerFunction("getforcejump", 'l', "", opcodeGetForceJump, opcodeGetForceJumpExplicit);
+            extensions.registerFunction(
+                "getforcemovejump", 'l', "", opcodeGetForceMoveJump, opcodeGetForceMoveJumpExplicit);
+            extensions.registerFunction("getforcesneak", 'l', "", opcodeGetForceSneak, opcodeGetForceSneakExplicit);
         }
     }
 
     namespace Dialogue
     {
-        void registerExtensions (Extensions& extensions)
+        void registerExtensions(Extensions& extensions)
         {
-            extensions.registerInstruction ("journal", "cl", opcodeJournal, opcodeJournalExplicit);
-            extensions.registerInstruction ("setjournalindex", "cl", opcodeSetJournalIndex);
-            extensions.registerFunction ("getjournalindex", 'l', "c", opcodeGetJournalIndex);
-            extensions.registerInstruction ("addtopic", "S" , opcodeAddTopic);
-            extensions.registerInstruction ("choice", "j/SlSlSlSlSlSlSlSlSlSlSlSlSlSlSlSlSlSlSlSlSlSlSlSl", opcodeChoice);
-            extensions.registerInstruction("forcegreeting","z",opcodeForceGreeting,
-                opcodeForceGreetingExplicit);
+            extensions.registerInstruction("journal", "cl", opcodeJournal, opcodeJournalExplicit);
+            extensions.registerInstruction("setjournalindex", "cl", opcodeSetJournalIndex);
+            extensions.registerFunction("getjournalindex", 'l', "c", opcodeGetJournalIndex);
+            extensions.registerInstruction("addtopic", "S", opcodeAddTopic);
+            extensions.registerInstruction(
+                "choice", "j/SlSlSlSlSlSlSlSlSlSlSlSlSlSlSlSlSlSlSlSlSlSlSlSl", opcodeChoice);
+            extensions.registerInstruction("forcegreeting", "z", opcodeForceGreeting, opcodeForceGreetingExplicit);
             extensions.registerInstruction("goodbye", "", opcodeGoodbye);
-            extensions.registerInstruction("setreputation", "l", opcodeSetReputation,
-                opcodeSetReputationExplicit);
-            extensions.registerInstruction("modreputation", "l", opcodeModReputation,
-                opcodeModReputationExplicit);
-            extensions.registerFunction("getreputation", 'l', "", opcodeGetReputation,
-                opcodeGetReputationExplicit);
-            extensions.registerFunction("samefaction", 'l', "", opcodeSameFaction,
-                opcodeSameFactionExplicit);
+            extensions.registerInstruction("setreputation", "l", opcodeSetReputation, opcodeSetReputationExplicit);
+            extensions.registerInstruction("modreputation", "l", opcodeModReputation, opcodeModReputationExplicit);
+            extensions.registerFunction("getreputation", 'l', "", opcodeGetReputation, opcodeGetReputationExplicit);
+            extensions.registerFunction("samefaction", 'l', "", opcodeSameFaction, opcodeSameFactionExplicit);
             extensions.registerInstruction("modfactionreaction", "ccl", opcodeModFactionReaction);
             extensions.registerInstruction("setfactionreaction", "ccl", opcodeSetFactionReaction);
             extensions.registerFunction("getfactionreaction", 'l', "ccX", opcodeGetFactionReaction);
@@ -202,342 +181,322 @@ namespace Compiler
 
     namespace Gui
     {
-        void registerExtensions (Extensions& extensions)
+        void registerExtensions(Extensions& extensions)
         {
-            extensions.registerInstruction ("enablebirthmenu", "", opcodeEnableBirthMenu);
-            extensions.registerInstruction ("enableclassmenu", "", opcodeEnableClassMenu);
-            extensions.registerInstruction ("enablenamemenu", "", opcodeEnableNameMenu);
-            extensions.registerInstruction ("enableracemenu", "", opcodeEnableRaceMenu);
-            extensions.registerInstruction ("enablestatreviewmenu", "",
-                opcodeEnableStatsReviewMenu);
+            extensions.registerInstruction("enablebirthmenu", "", opcodeEnableBirthMenu);
+            extensions.registerInstruction("enableclassmenu", "", opcodeEnableClassMenu);
+            extensions.registerInstruction("enablenamemenu", "", opcodeEnableNameMenu);
+            extensions.registerInstruction("enableracemenu", "", opcodeEnableRaceMenu);
+            extensions.registerInstruction("enablestatreviewmenu", "", opcodeEnableStatsReviewMenu);
 
-            extensions.registerInstruction ("enableinventorymenu", "", opcodeEnableInventoryMenu);
-            extensions.registerInstruction ("enablemagicmenu", "", opcodeEnableMagicMenu);
-            extensions.registerInstruction ("enablemapmenu", "", opcodeEnableMapMenu);
-            extensions.registerInstruction ("enablestatsmenu", "", opcodeEnableStatsMenu);
+            extensions.registerInstruction("enableinventorymenu", "", opcodeEnableInventoryMenu);
+            extensions.registerInstruction("enablemagicmenu", "", opcodeEnableMagicMenu);
+            extensions.registerInstruction("enablemapmenu", "", opcodeEnableMapMenu);
+            extensions.registerInstruction("enablestatsmenu", "", opcodeEnableStatsMenu);
 
-            extensions.registerInstruction ("enablerest", "", opcodeEnableRest);
-            extensions.registerInstruction ("enablelevelupmenu", "", opcodeEnableLevelupMenu);
+            extensions.registerInstruction("enablerest", "", opcodeEnableRest);
+            extensions.registerInstruction("enablelevelupmenu", "", opcodeEnableLevelupMenu);
 
-            extensions.registerInstruction ("showrestmenu", "", opcodeShowRestMenu, opcodeShowRestMenuExplicit);
+            extensions.registerInstruction("showrestmenu", "", opcodeShowRestMenu, opcodeShowRestMenuExplicit);
 
-            extensions.registerFunction ("getbuttonpressed", 'l', "", opcodeGetButtonPressed);
+            extensions.registerFunction("getbuttonpressed", 'l', "", opcodeGetButtonPressed);
 
-            extensions.registerInstruction ("togglefogofwar", "", opcodeToggleFogOfWar);
-            extensions.registerInstruction ("tfow", "", opcodeToggleFogOfWar);
+            extensions.registerInstruction("togglefogofwar", "", opcodeToggleFogOfWar);
+            extensions.registerInstruction("tfow", "", opcodeToggleFogOfWar);
 
-            extensions.registerInstruction ("togglefullhelp", "", opcodeToggleFullHelp);
-            extensions.registerInstruction ("tfh", "", opcodeToggleFullHelp);
+            extensions.registerInstruction("togglefullhelp", "", opcodeToggleFullHelp);
+            extensions.registerInstruction("tfh", "", opcodeToggleFullHelp);
 
-            extensions.registerInstruction ("showmap", "Sxxxx", opcodeShowMap);
-            extensions.registerInstruction ("fillmap", "", opcodeFillMap);
-            extensions.registerInstruction ("menutest", "/l", opcodeMenuTest);
-            extensions.registerInstruction ("togglemenus", "", opcodeToggleMenus);
-            extensions.registerInstruction ("tm", "", opcodeToggleMenus);
+            extensions.registerInstruction("showmap", "Sxxxx", opcodeShowMap);
+            extensions.registerInstruction("fillmap", "", opcodeFillMap);
+            extensions.registerInstruction("menutest", "/l", opcodeMenuTest);
+            extensions.registerInstruction("togglemenus", "", opcodeToggleMenus);
+            extensions.registerInstruction("tm", "", opcodeToggleMenus);
         }
     }
 
     namespace Misc
     {
-        void registerExtensions (Extensions& extensions)
+        void registerExtensions(Extensions& extensions)
         {
-            extensions.registerFunction ("menumode", 'l', "", opcodeMenuMode);
-            extensions.registerFunction ("random", 'f', "l", opcodeRandom);
-            extensions.registerFunction ("scriptrunning", 'l', "c", opcodeScriptRunning);
-            extensions.registerInstruction ("startscript", "c", opcodeStartScript, opcodeStartScriptExplicit);
-            extensions.registerInstruction ("stopscript", "c", opcodeStopScript);
-            extensions.registerFunction ("getsecondspassed", 'f', "", opcodeGetSecondsPassed);
-            extensions.registerInstruction ("enable", "x", opcodeEnable, opcodeEnableExplicit);
-            extensions.registerInstruction ("disable", "x", opcodeDisable, opcodeDisableExplicit);
-            extensions.registerFunction ("getdisabled", 'l', "x", opcodeGetDisabled, opcodeGetDisabledExplicit);
-            extensions.registerFunction ("xbox", 'l', "", opcodeXBox);
-            extensions.registerFunction ("onactivate", 'l', "", opcodeOnActivate, opcodeOnActivateExplicit);
-            extensions.registerInstruction ("activate", "x", opcodeActivate, opcodeActivateExplicit);
-            extensions.registerInstruction ("lock", "/l", opcodeLock, opcodeLockExplicit);
-            extensions.registerInstruction ("unlock", "", opcodeUnlock, opcodeUnlockExplicit);
-            extensions.registerInstruction ("cast", "SS", opcodeCast, opcodeCastExplicit);
-            extensions.registerInstruction ("explodespell", "S", opcodeExplodeSpell, opcodeExplodeSpellExplicit);
-            extensions.registerInstruction ("togglecollisionboxes", "", opcodeToggleCollisionBoxes);
-            extensions.registerInstruction ("togglecollisiongrid", "", opcodeToggleCollisionDebug);
-            extensions.registerInstruction ("tcb", "", opcodeToggleCollisionBoxes);
-            extensions.registerInstruction ("tcg", "", opcodeToggleCollisionDebug);
-            extensions.registerInstruction ("twf", "", opcodeToggleWireframe);
-            extensions.registerInstruction ("togglewireframe", "", opcodeToggleWireframe);
-            extensions.registerInstruction ("fadein", "f", opcodeFadeIn);
-            extensions.registerInstruction ("fadeout", "f", opcodeFadeOut);
-            extensions.registerInstruction ("fadeto", "ff", opcodeFadeTo);
-            extensions.registerInstruction ("togglewater", "", opcodeToggleWater);
-            extensions.registerInstruction ("twa", "", opcodeToggleWater);
-            extensions.registerInstruction ("toggleworld", "", opcodeToggleWorld);
-            extensions.registerInstruction ("tw", "", opcodeToggleWorld);
-            extensions.registerInstruction ("togglepathgrid", "", opcodeTogglePathgrid);
-            extensions.registerInstruction ("tpg", "", opcodeTogglePathgrid);
-            extensions.registerInstruction ("dontsaveobject", "", opcodeDontSaveObject);
-            extensions.registerInstruction ("pcforce1stperson", "", opcodePcForce1stPerson);
-            extensions.registerInstruction ("pcforce3rdperson", "", opcodePcForce3rdPerson);
-            extensions.registerFunction ("pcget3rdperson", 'l', "", opcodePcGet3rdPerson);
-            extensions.registerInstruction ("togglevanitymode", "", opcodeToggleVanityMode);
-            extensions.registerInstruction ("tvm", "", opcodeToggleVanityMode);
-            extensions.registerFunction ("getpcsleep", 'l', "", opcodeGetPcSleep);
-            extensions.registerFunction ("getpcjumping", 'l', "", opcodeGetPcJumping);
-            extensions.registerInstruction ("wakeuppc", "", opcodeWakeUpPc);
-            extensions.registerInstruction ("playbink", "Sl", opcodePlayBink);
-            extensions.registerInstruction ("payfine", "", opcodePayFine);
-            extensions.registerInstruction ("payfinethief", "", opcodePayFineThief);
-            extensions.registerInstruction ("gotojail", "", opcodeGoToJail);
-            extensions.registerFunction ("getlocked", 'l', "", opcodeGetLocked, opcodeGetLockedExplicit);
-            extensions.registerFunction ("geteffect", 'l', "S", opcodeGetEffect, opcodeGetEffectExplicit);
-            extensions.registerInstruction ("addsoulgem", "ccX", opcodeAddSoulGem, opcodeAddSoulGemExplicit);
-            extensions.registerInstruction ("removesoulgem", "c/l", opcodeRemoveSoulGem, opcodeRemoveSoulGemExplicit);
-            extensions.registerInstruction ("drop", "cl", opcodeDrop, opcodeDropExplicit);
-            extensions.registerInstruction ("dropsoulgem", "c", opcodeDropSoulGem, opcodeDropSoulGemExplicit);
-            extensions.registerFunction ("getattacked", 'l', "", opcodeGetAttacked, opcodeGetAttackedExplicit);
-            extensions.registerFunction ("getweapondrawn", 'l', "", opcodeGetWeaponDrawn, opcodeGetWeaponDrawnExplicit);
-            extensions.registerFunction ("getspellreadied", 'l', "", opcodeGetSpellReadied, opcodeGetSpellReadiedExplicit);
-            extensions.registerFunction ("getspelleffects", 'l', "c", opcodeGetSpellEffects, opcodeGetSpellEffectsExplicit);
-            extensions.registerFunction ("getcurrenttime", 'f', "", opcodeGetCurrentTime);
-            extensions.registerInstruction ("setdelete", "l", opcodeSetDelete, opcodeSetDeleteExplicit);
-            extensions.registerFunction ("getsquareroot", 'f', "f", opcodeGetSquareRoot);
-            extensions.registerInstruction ("fall", "", opcodeFall, opcodeFallExplicit);
-            extensions.registerFunction ("getstandingpc", 'l', "", opcodeGetStandingPc, opcodeGetStandingPcExplicit);
-            extensions.registerFunction ("getstandingactor", 'l', "", opcodeGetStandingActor, opcodeGetStandingActorExplicit);
-            extensions.registerFunction ("getcollidingpc", 'l', "", opcodeGetCollidingPc, opcodeGetCollidingPcExplicit);
-            extensions.registerFunction ("getcollidingactor", 'l', "", opcodeGetCollidingActor, opcodeGetCollidingActorExplicit);
-            extensions.registerInstruction ("hurtstandingactor", "f", opcodeHurtStandingActor, opcodeHurtStandingActorExplicit);
-            extensions.registerInstruction ("hurtcollidingactor", "f", opcodeHurtCollidingActor, opcodeHurtCollidingActorExplicit);
-            extensions.registerFunction ("getwindspeed", 'f', "", opcodeGetWindSpeed);
-            extensions.registerFunction ("hitonme", 'l', "S", opcodeHitOnMe, opcodeHitOnMeExplicit);
-            extensions.registerFunction ("hitattemptonme", 'l', "S", opcodeHitAttemptOnMe, opcodeHitAttemptOnMeExplicit);
-            extensions.registerInstruction ("disableteleporting", "", opcodeDisableTeleporting);
-            extensions.registerInstruction ("enableteleporting", "", opcodeEnableTeleporting);
-            extensions.registerInstruction ("showvars", "", opcodeShowVars, opcodeShowVarsExplicit);
-            extensions.registerInstruction ("show", "c", opcodeShow, opcodeShowExplicit);
-            extensions.registerInstruction ("sv", "", opcodeShowVars, opcodeShowVarsExplicit);
+            extensions.registerFunction("menumode", 'l', "", opcodeMenuMode);
+            extensions.registerFunction("random", 'f', "l", opcodeRandom);
+            extensions.registerFunction("scriptrunning", 'l', "c", opcodeScriptRunning);
+            extensions.registerInstruction("startscript", "c", opcodeStartScript, opcodeStartScriptExplicit);
+            extensions.registerInstruction("stopscript", "c", opcodeStopScript);
+            extensions.registerFunction("getsecondspassed", 'f', "", opcodeGetSecondsPassed);
+            extensions.registerInstruction("enable", "x", opcodeEnable, opcodeEnableExplicit);
+            extensions.registerInstruction("disable", "x", opcodeDisable, opcodeDisableExplicit);
+            extensions.registerFunction("getdisabled", 'l', "x", opcodeGetDisabled, opcodeGetDisabledExplicit);
+            extensions.registerFunction("xbox", 'l', "", opcodeXBox);
+            extensions.registerFunction("onactivate", 'l', "", opcodeOnActivate, opcodeOnActivateExplicit);
+            extensions.registerInstruction("activate", "x", opcodeActivate, opcodeActivateExplicit);
+            extensions.registerInstruction("lock", "/l", opcodeLock, opcodeLockExplicit);
+            extensions.registerInstruction("unlock", "", opcodeUnlock, opcodeUnlockExplicit);
+            extensions.registerInstruction("cast", "SS", opcodeCast, opcodeCastExplicit);
+            extensions.registerInstruction("explodespell", "S", opcodeExplodeSpell, opcodeExplodeSpellExplicit);
+            extensions.registerInstruction("togglecollisionboxes", "", opcodeToggleCollisionBoxes);
+            extensions.registerInstruction("togglecollisiongrid", "", opcodeToggleCollisionDebug);
+            extensions.registerInstruction("tcb", "", opcodeToggleCollisionBoxes);
+            extensions.registerInstruction("tcg", "", opcodeToggleCollisionDebug);
+            extensions.registerInstruction("twf", "", opcodeToggleWireframe);
+            extensions.registerInstruction("togglewireframe", "", opcodeToggleWireframe);
+            extensions.registerInstruction("fadein", "f", opcodeFadeIn);
+            extensions.registerInstruction("fadeout", "f", opcodeFadeOut);
+            extensions.registerInstruction("fadeto", "ff", opcodeFadeTo);
+            extensions.registerInstruction("togglewater", "", opcodeToggleWater);
+            extensions.registerInstruction("twa", "", opcodeToggleWater);
+            extensions.registerInstruction("toggleworld", "", opcodeToggleWorld);
+            extensions.registerInstruction("tw", "", opcodeToggleWorld);
+            extensions.registerInstruction("togglepathgrid", "", opcodeTogglePathgrid);
+            extensions.registerInstruction("tpg", "", opcodeTogglePathgrid);
+            extensions.registerInstruction("dontsaveobject", "", opcodeDontSaveObject);
+            extensions.registerInstruction("pcforce1stperson", "", opcodePcForce1stPerson);
+            extensions.registerInstruction("pcforce3rdperson", "", opcodePcForce3rdPerson);
+            extensions.registerFunction("pcget3rdperson", 'l', "", opcodePcGet3rdPerson);
+            extensions.registerInstruction("togglevanitymode", "", opcodeToggleVanityMode);
+            extensions.registerInstruction("tvm", "", opcodeToggleVanityMode);
+            extensions.registerFunction("getpcsleep", 'l', "", opcodeGetPcSleep);
+            extensions.registerFunction("getpcjumping", 'l', "", opcodeGetPcJumping);
+            extensions.registerInstruction("wakeuppc", "", opcodeWakeUpPc);
+            extensions.registerInstruction("playbink", "Sl", opcodePlayBink);
+            extensions.registerInstruction("payfine", "", opcodePayFine);
+            extensions.registerInstruction("payfinethief", "", opcodePayFineThief);
+            extensions.registerInstruction("gotojail", "", opcodeGoToJail);
+            extensions.registerFunction("getlocked", 'l', "", opcodeGetLocked, opcodeGetLockedExplicit);
+            extensions.registerFunction("geteffect", 'l', "S", opcodeGetEffect, opcodeGetEffectExplicit);
+            extensions.registerInstruction("addsoulgem", "ccX", opcodeAddSoulGem, opcodeAddSoulGemExplicit);
+            extensions.registerInstruction("removesoulgem", "c/l", opcodeRemoveSoulGem, opcodeRemoveSoulGemExplicit);
+            extensions.registerInstruction("drop", "cl", opcodeDrop, opcodeDropExplicit);
+            extensions.registerInstruction("dropsoulgem", "c", opcodeDropSoulGem, opcodeDropSoulGemExplicit);
+            extensions.registerFunction("getattacked", 'l', "", opcodeGetAttacked, opcodeGetAttackedExplicit);
+            extensions.registerFunction("getweapondrawn", 'l', "", opcodeGetWeaponDrawn, opcodeGetWeaponDrawnExplicit);
+            extensions.registerFunction(
+                "getspellreadied", 'l', "", opcodeGetSpellReadied, opcodeGetSpellReadiedExplicit);
+            extensions.registerFunction(
+                "getspelleffects", 'l', "c", opcodeGetSpellEffects, opcodeGetSpellEffectsExplicit);
+            extensions.registerFunction("getcurrenttime", 'f', "", opcodeGetCurrentTime);
+            extensions.registerInstruction("setdelete", "l", opcodeSetDelete, opcodeSetDeleteExplicit);
+            extensions.registerFunction("getsquareroot", 'f', "f", opcodeGetSquareRoot);
+            extensions.registerInstruction("fall", "", opcodeFall, opcodeFallExplicit);
+            extensions.registerFunction("getstandingpc", 'l', "", opcodeGetStandingPc, opcodeGetStandingPcExplicit);
+            extensions.registerFunction(
+                "getstandingactor", 'l', "", opcodeGetStandingActor, opcodeGetStandingActorExplicit);
+            extensions.registerFunction("getcollidingpc", 'l', "", opcodeGetCollidingPc, opcodeGetCollidingPcExplicit);
+            extensions.registerFunction(
+                "getcollidingactor", 'l', "", opcodeGetCollidingActor, opcodeGetCollidingActorExplicit);
+            extensions.registerInstruction(
+                "hurtstandingactor", "f", opcodeHurtStandingActor, opcodeHurtStandingActorExplicit);
+            extensions.registerInstruction(
+                "hurtcollidingactor", "f", opcodeHurtCollidingActor, opcodeHurtCollidingActorExplicit);
+            extensions.registerFunction("getwindspeed", 'f', "", opcodeGetWindSpeed);
+            extensions.registerFunction("hitonme", 'l', "S", opcodeHitOnMe, opcodeHitOnMeExplicit);
+            extensions.registerFunction("hitattemptonme", 'l', "S", opcodeHitAttemptOnMe, opcodeHitAttemptOnMeExplicit);
+            extensions.registerInstruction("disableteleporting", "", opcodeDisableTeleporting);
+            extensions.registerInstruction("enableteleporting", "", opcodeEnableTeleporting);
+            extensions.registerInstruction("showvars", "", opcodeShowVars, opcodeShowVarsExplicit);
+            extensions.registerInstruction("show", "c", opcodeShow, opcodeShowExplicit);
+            extensions.registerInstruction("sv", "", opcodeShowVars, opcodeShowVarsExplicit);
             extensions.registerInstruction("tgm", "", opcodeToggleGodMode);
             extensions.registerInstruction("togglegodmode", "", opcodeToggleGodMode);
             extensions.registerInstruction("togglescripts", "", opcodeToggleScripts);
-            extensions.registerInstruction ("disablelevitation", "", opcodeDisableLevitation);
-            extensions.registerInstruction ("enablelevitation", "", opcodeEnableLevitation);
-            extensions.registerFunction ("getpcinjail", 'l', "", opcodeGetPcInJail);
-            extensions.registerFunction ("getpctraveling", 'l', "", opcodeGetPcTraveling);
-            extensions.registerInstruction ("betacomment", "/S", opcodeBetaComment, opcodeBetaCommentExplicit);
-            extensions.registerInstruction ("bc", "/S", opcodeBetaComment, opcodeBetaCommentExplicit);
-            extensions.registerInstruction ("ori", "/S", opcodeBetaComment, opcodeBetaCommentExplicit); // 'ori' stands for 'OutputRefInfo'
-            extensions.registerInstruction ("outputrefinfo", "/S", opcodeBetaComment, opcodeBetaCommentExplicit);
-            extensions.registerInstruction ("showscenegraph", "/l", opcodeShowSceneGraph, opcodeShowSceneGraphExplicit);
-            extensions.registerInstruction ("ssg", "/l", opcodeShowSceneGraph, opcodeShowSceneGraphExplicit);
-            extensions.registerInstruction ("addtolevcreature", "ccl", opcodeAddToLevCreature);
-            extensions.registerInstruction ("removefromlevcreature", "ccl", opcodeRemoveFromLevCreature);
-            extensions.registerInstruction ("addtolevitem", "ccl", opcodeAddToLevItem);
-            extensions.registerInstruction ("removefromlevitem", "ccl", opcodeRemoveFromLevItem);
-            extensions.registerInstruction ("tb", "", opcodeToggleBorders);
-            extensions.registerInstruction ("toggleborders", "", opcodeToggleBorders);
-            extensions.registerInstruction ("togglenavmesh", "", opcodeToggleNavMesh);
-            extensions.registerInstruction ("tap", "", opcodeToggleActorsPaths);
-            extensions.registerInstruction ("toggleactorspaths", "", opcodeToggleActorsPaths);
-            extensions.registerInstruction ("setnavmeshnumber", "l", opcodeSetNavMeshNumberToRender);
-            extensions.registerFunction ("repairedonme", 'l', "S", opcodeRepairedOnMe, opcodeRepairedOnMeExplicit);
-            extensions.registerInstruction ("togglerecastmesh", "", opcodeToggleRecastMesh);
-            extensions.registerInstruction ("help", "", opcodeHelp);
-            extensions.registerInstruction ("reloadlua", "", opcodeReloadLua);
+            extensions.registerInstruction("disablelevitation", "", opcodeDisableLevitation);
+            extensions.registerInstruction("enablelevitation", "", opcodeEnableLevitation);
+            extensions.registerFunction("getpcinjail", 'l', "", opcodeGetPcInJail);
+            extensions.registerFunction("getpctraveling", 'l', "", opcodeGetPcTraveling);
+            extensions.registerInstruction("betacomment", "/S", opcodeBetaComment, opcodeBetaCommentExplicit);
+            extensions.registerInstruction("bc", "/S", opcodeBetaComment, opcodeBetaCommentExplicit);
+            extensions.registerInstruction(
+                "ori", "/S", opcodeBetaComment, opcodeBetaCommentExplicit); // 'ori' stands for 'OutputRefInfo'
+            extensions.registerInstruction("outputrefinfo", "/S", opcodeBetaComment, opcodeBetaCommentExplicit);
+            extensions.registerInstruction("showscenegraph", "/l", opcodeShowSceneGraph, opcodeShowSceneGraphExplicit);
+            extensions.registerInstruction("ssg", "/l", opcodeShowSceneGraph, opcodeShowSceneGraphExplicit);
+            extensions.registerInstruction("addtolevcreature", "ccl", opcodeAddToLevCreature);
+            extensions.registerInstruction("removefromlevcreature", "ccl", opcodeRemoveFromLevCreature);
+            extensions.registerInstruction("addtolevitem", "ccl", opcodeAddToLevItem);
+            extensions.registerInstruction("removefromlevitem", "ccl", opcodeRemoveFromLevItem);
+            extensions.registerInstruction("tb", "", opcodeToggleBorders);
+            extensions.registerInstruction("toggleborders", "", opcodeToggleBorders);
+            extensions.registerInstruction("togglenavmesh", "", opcodeToggleNavMesh);
+            extensions.registerInstruction("tap", "", opcodeToggleActorsPaths);
+            extensions.registerInstruction("toggleactorspaths", "", opcodeToggleActorsPaths);
+            extensions.registerInstruction("setnavmeshnumber", "l", opcodeSetNavMeshNumberToRender);
+            extensions.registerFunction("repairedonme", 'l', "S", opcodeRepairedOnMe, opcodeRepairedOnMeExplicit);
+            extensions.registerInstruction("togglerecastmesh", "", opcodeToggleRecastMesh);
+            extensions.registerInstruction("help", "", opcodeHelp);
+            extensions.registerInstruction("reloadlua", "", opcodeReloadLua);
         }
     }
 
     namespace Sky
     {
-        void registerExtensions (Extensions& extensions)
+        void registerExtensions(Extensions& extensions)
         {
-            extensions.registerInstruction ("togglesky", "", opcodeToggleSky);
-            extensions.registerInstruction ("ts", "", opcodeToggleSky);
-            extensions.registerInstruction ("turnmoonwhite", "", opcodeTurnMoonWhite);
-            extensions.registerInstruction ("turnmoonred", "", opcodeTurnMoonRed);
-            extensions.registerInstruction ("changeweather", "Sl", opcodeChangeWeather);
-            extensions.registerFunction ("getmasserphase", 'l', "", opcodeGetMasserPhase);
-            extensions.registerFunction ("getsecundaphase", 'l', "", opcodeGetSecundaPhase);
-            extensions.registerFunction ("getcurrentweather", 'l', "", opcodeGetCurrentWeather);
-            extensions.registerInstruction ("modregion", "S/llllllllllX", opcodeModRegion);
+            extensions.registerInstruction("togglesky", "", opcodeToggleSky);
+            extensions.registerInstruction("ts", "", opcodeToggleSky);
+            extensions.registerInstruction("turnmoonwhite", "", opcodeTurnMoonWhite);
+            extensions.registerInstruction("turnmoonred", "", opcodeTurnMoonRed);
+            extensions.registerInstruction("changeweather", "Sl", opcodeChangeWeather);
+            extensions.registerFunction("getmasserphase", 'l', "", opcodeGetMasserPhase);
+            extensions.registerFunction("getsecundaphase", 'l', "", opcodeGetSecundaPhase);
+            extensions.registerFunction("getcurrentweather", 'l', "", opcodeGetCurrentWeather);
+            extensions.registerInstruction("modregion", "S/llllllllllX", opcodeModRegion);
         }
     }
 
     namespace Sound
     {
-        void registerExtensions (Extensions& extensions)
+        void registerExtensions(Extensions& extensions)
         {
-            extensions.registerInstruction ("say", "SS", opcodeSay, opcodeSayExplicit);
-            extensions.registerFunction ("saydone", 'l', "", opcodeSayDone, opcodeSayDoneExplicit);
-            extensions.registerInstruction ("streammusic", "S", opcodeStreamMusic);
-            extensions.registerInstruction ("playsound", "cXX", opcodePlaySound);
-            extensions.registerInstruction ("playsoundvp", "cff", opcodePlaySoundVP);
-            extensions.registerInstruction ("playsound3d", "cXX", opcodePlaySound3D,
-                opcodePlaySound3DExplicit);
-            extensions.registerInstruction ("playsound3dvp", "cff", opcodePlaySound3DVP,
-                opcodePlaySound3DVPExplicit);
-            extensions.registerInstruction ("playloopsound3d", "cXX", opcodePlayLoopSound3D,
-                opcodePlayLoopSound3DExplicit);
-            extensions.registerInstruction ("playloopsound3dvp", "cff", opcodePlayLoopSound3DVP,
-                opcodePlayLoopSound3DVPExplicit);
-            extensions.registerInstruction ("stopsound", "cXX", opcodeStopSound,
-                opcodeStopSoundExplicit);
-            extensions.registerFunction ("getsoundplaying", 'l', "c", opcodeGetSoundPlaying,
-                opcodeGetSoundPlayingExplicit);
+            extensions.registerInstruction("say", "SS", opcodeSay, opcodeSayExplicit);
+            extensions.registerFunction("saydone", 'l', "", opcodeSayDone, opcodeSayDoneExplicit);
+            extensions.registerInstruction("streammusic", "S", opcodeStreamMusic);
+            extensions.registerInstruction("playsound", "cXX", opcodePlaySound);
+            extensions.registerInstruction("playsoundvp", "cff", opcodePlaySoundVP);
+            extensions.registerInstruction("playsound3d", "cXX", opcodePlaySound3D, opcodePlaySound3DExplicit);
+            extensions.registerInstruction("playsound3dvp", "cff", opcodePlaySound3DVP, opcodePlaySound3DVPExplicit);
+            extensions.registerInstruction(
+                "playloopsound3d", "cXX", opcodePlayLoopSound3D, opcodePlayLoopSound3DExplicit);
+            extensions.registerInstruction(
+                "playloopsound3dvp", "cff", opcodePlayLoopSound3DVP, opcodePlayLoopSound3DVPExplicit);
+            extensions.registerInstruction("stopsound", "cXX", opcodeStopSound, opcodeStopSoundExplicit);
+            extensions.registerFunction(
+                "getsoundplaying", 'l', "c", opcodeGetSoundPlaying, opcodeGetSoundPlayingExplicit);
         }
     }
 
     namespace Stats
     {
-        void registerExtensions (Extensions& extensions)
+        void registerExtensions(Extensions& extensions)
         {
-            static const char *attributes[numberOfAttributes] =
-            {
-                "strength", "intelligence", "willpower", "agility", "speed", "endurance",
-                "personality", "luck"
-            };
+            static const char* attributes[numberOfAttributes]
+                = { "strength", "intelligence", "willpower", "agility", "speed", "endurance", "personality", "luck" };
 
-            static const char *dynamics[numberOfDynamics] =
-            {
-                "health", "magicka", "fatigue"
-            };
+            static const char* dynamics[numberOfDynamics] = { "health", "magicka", "fatigue" };
 
-            static const char *skills[numberOfSkills] =
-            {
-                "block", "armorer", "mediumarmor", "heavyarmor", "bluntweapon",
-                "longblade", "axe", "spear", "athletics", "enchant", "destruction",
-                "alteration", "illusion", "conjuration", "mysticism",
-                "restoration", "alchemy", "unarmored", "security", "sneak",
-                "acrobatics", "lightarmor", "shortblade", "marksman",
-                "mercantile", "speechcraft", "handtohand"
-            };
-
-            static const char *magicEffects[numberOfMagicEffects] =
-            {
-                "resistmagicka", "resistfire", "resistfrost", "resistshock",
-                "resistdisease", "resistblight", "resistcorprus", "resistpoison",
-                "resistparalysis", "resistnormalweapons", "waterbreathing", "chameleon",
-                "waterwalking", "swimspeed", "superjump", "flying",
-                "armorbonus", "castpenalty", "silence", "blindness",
-                "paralysis", "invisible", "attackbonus", "defendbonus"
-            };
-
-            std::string get ("get");
-            std::string set ("set");
-            std::string mod ("mod");
-            std::string modCurrent ("modcurrent");
-            std::string getRatio ("getratio");
-
-            for (int i=0; i<numberOfAttributes; ++i)
+            static const char* skills[numberOfSkills] = { "block", "armorer", "mediumarmor", "heavyarmor",
+                "bluntweapon", "longblade", "axe", "spear", "athletics", "enchant", "destruction", "alteration",
+                "illusion", "conjuration", "mysticism", "restoration", "alchemy", "unarmored", "security", "sneak",
+                "acrobatics", "lightarmor", "shortblade", "marksman", "mercantile", "speechcraft", "handtohand" };
+
+            static const char* magicEffects[numberOfMagicEffects]
+                = { "resistmagicka", "resistfire", "resistfrost", "resistshock", "resistdisease", "resistblight",
+                      "resistcorprus", "resistpoison", "resistparalysis", "resistnormalweapons", "waterbreathing",
+                      "chameleon", "waterwalking", "swimspeed", "superjump", "flying", "armorbonus", "castpenalty",
+                      "silence", "blindness", "paralysis", "invisible", "attackbonus", "defendbonus" };
+
+            std::string get("get");
+            std::string set("set");
+            std::string mod("mod");
+            std::string modCurrent("modcurrent");
+            std::string getRatio("getratio");
+
+            for (int i = 0; i < numberOfAttributes; ++i)
             {
-                extensions.registerFunction (get + attributes[i], 'f', "",
-                    opcodeGetAttribute+i, opcodeGetAttributeExplicit+i);
+                extensions.registerFunction(
+                    get + attributes[i], 'f', "", opcodeGetAttribute + i, opcodeGetAttributeExplicit + i);
 
-                extensions.registerInstruction (set + attributes[i], "f",
-                    opcodeSetAttribute+i, opcodeSetAttributeExplicit+i);
+                extensions.registerInstruction(
+                    set + attributes[i], "f", opcodeSetAttribute + i, opcodeSetAttributeExplicit + i);
 
-                extensions.registerInstruction (mod + attributes[i], "f",
-                    opcodeModAttribute+i, opcodeModAttributeExplicit+i);
+                extensions.registerInstruction(
+                    mod + attributes[i], "f", opcodeModAttribute + i, opcodeModAttributeExplicit + i);
             }
 
-            for (int i=0; i<numberOfDynamics; ++i)
+            for (int i = 0; i < numberOfDynamics; ++i)
             {
-                extensions.registerFunction (get + dynamics[i], 'f', "x",
-                    opcodeGetDynamic+i, opcodeGetDynamicExplicit+i);
+                extensions.registerFunction(
+                    get + dynamics[i], 'f', "x", opcodeGetDynamic + i, opcodeGetDynamicExplicit + i);
 
-                extensions.registerInstruction (set + dynamics[i], "f",
-                    opcodeSetDynamic+i, opcodeSetDynamicExplicit+i);
+                extensions.registerInstruction(
+                    set + dynamics[i], "f", opcodeSetDynamic + i, opcodeSetDynamicExplicit + i);
 
-                extensions.registerInstruction (mod + dynamics[i], "f",
-                    opcodeModDynamic+i, opcodeModDynamicExplicit+i);
+                extensions.registerInstruction(
+                    mod + dynamics[i], "f", opcodeModDynamic + i, opcodeModDynamicExplicit + i);
 
-                extensions.registerInstruction (modCurrent + dynamics[i], "f",
-                    opcodeModCurrentDynamic+i, opcodeModCurrentDynamicExplicit+i);
+                extensions.registerInstruction(
+                    modCurrent + dynamics[i], "f", opcodeModCurrentDynamic + i, opcodeModCurrentDynamicExplicit + i);
 
-                extensions.registerFunction (get + dynamics[i] + getRatio, 'f', "",
-                    opcodeGetDynamicGetRatio+i, opcodeGetDynamicGetRatioExplicit+i);
+                extensions.registerFunction(get + dynamics[i] + getRatio, 'f', "", opcodeGetDynamicGetRatio + i,
+                    opcodeGetDynamicGetRatioExplicit + i);
             }
 
-            for (int i=0; i<numberOfSkills; ++i)
+            for (int i = 0; i < numberOfSkills; ++i)
             {
-                extensions.registerFunction (get + skills[i], 'f', "",
-                    opcodeGetSkill+i, opcodeGetSkillExplicit+i);
+                extensions.registerFunction(get + skills[i], 'f', "", opcodeGetSkill + i, opcodeGetSkillExplicit + i);
 
-                extensions.registerInstruction (set + skills[i], "f",
-                    opcodeSetSkill+i, opcodeSetSkillExplicit+i);
+                extensions.registerInstruction(set + skills[i], "f", opcodeSetSkill + i, opcodeSetSkillExplicit + i);
 
-                extensions.registerInstruction (mod + skills[i], "f",
-                    opcodeModSkill+i, opcodeModSkillExplicit+i);
+                extensions.registerInstruction(mod + skills[i], "f", opcodeModSkill + i, opcodeModSkillExplicit + i);
             }
 
-            for (int i=0; i<numberOfMagicEffects; ++i)
+            for (int i = 0; i < numberOfMagicEffects; ++i)
             {
-                extensions.registerFunction (get + magicEffects[i], 'l', "",
-                    opcodeGetMagicEffect+i, opcodeGetMagicEffectExplicit+i);
+                extensions.registerFunction(
+                    get + magicEffects[i], 'l', "", opcodeGetMagicEffect + i, opcodeGetMagicEffectExplicit + i);
 
-                extensions.registerInstruction (set + magicEffects[i], "l",
-                    opcodeSetMagicEffect+i, opcodeSetMagicEffectExplicit+i);
+                extensions.registerInstruction(
+                    set + magicEffects[i], "l", opcodeSetMagicEffect + i, opcodeSetMagicEffectExplicit + i);
 
-                extensions.registerInstruction(mod + magicEffects[i], "l",
-                    opcodeModMagicEffect+i, opcodeModMagicEffectExplicit+i);
+                extensions.registerInstruction(
+                    mod + magicEffects[i], "l", opcodeModMagicEffect + i, opcodeModMagicEffectExplicit + i);
             }
 
-            extensions.registerFunction ("getpccrimelevel", 'f', "", opcodeGetPCCrimeLevel);
-            extensions.registerInstruction ("setpccrimelevel", "f", opcodeSetPCCrimeLevel);
-            extensions.registerInstruction ("modpccrimelevel", "f", opcodeModPCCrimeLevel);
-
-            extensions.registerInstruction ("addspell", "cz", opcodeAddSpell, opcodeAddSpellExplicit);
-            extensions.registerInstruction ("removespell", "cz", opcodeRemoveSpell,
-                opcodeRemoveSpellExplicit);
-            extensions.registerInstruction ("removespelleffects", "c", opcodeRemoveSpellEffects,
-                opcodeRemoveSpellEffectsExplicit);
-            extensions.registerInstruction ("removeeffects", "l", opcodeRemoveEffects,
-                opcodeRemoveEffectsExplicit);
-            extensions.registerInstruction ("resurrect", "", opcodeResurrect,
-                opcodeResurrectExplicit);
-            extensions.registerFunction ("getspell", 'l', "c", opcodeGetSpell, opcodeGetSpellExplicit);
-
-            extensions.registerInstruction("pcraiserank","/S",opcodePCRaiseRank, opcodePCRaiseRankExplicit);
-            extensions.registerInstruction("pclowerrank","/S",opcodePCLowerRank, opcodePCLowerRankExplicit);
-            extensions.registerInstruction("pcjoinfaction","/S",opcodePCJoinFaction, opcodePCJoinFactionExplicit);
-            extensions.registerInstruction ("moddisposition","l",opcodeModDisposition,
-                opcodeModDispositionExplicit);
-            extensions.registerInstruction ("setdisposition","l",opcodeSetDisposition,
-                opcodeSetDispositionExplicit);
-            extensions.registerFunction ("getdisposition",'l', "",opcodeGetDisposition,
-                opcodeGetDispositionExplicit);
-            extensions.registerFunction("getpcrank",'l',"/S",opcodeGetPCRank,opcodeGetPCRankExplicit);
+            extensions.registerFunction("getpccrimelevel", 'f', "", opcodeGetPCCrimeLevel);
+            extensions.registerInstruction("setpccrimelevel", "f", opcodeSetPCCrimeLevel);
+            extensions.registerInstruction("modpccrimelevel", "f", opcodeModPCCrimeLevel);
+
+            extensions.registerInstruction("addspell", "cz", opcodeAddSpell, opcodeAddSpellExplicit);
+            extensions.registerInstruction("removespell", "cz", opcodeRemoveSpell, opcodeRemoveSpellExplicit);
+            extensions.registerInstruction(
+                "removespelleffects", "c", opcodeRemoveSpellEffects, opcodeRemoveSpellEffectsExplicit);
+            extensions.registerInstruction("removeeffects", "l", opcodeRemoveEffects, opcodeRemoveEffectsExplicit);
+            extensions.registerInstruction("resurrect", "", opcodeResurrect, opcodeResurrectExplicit);
+            extensions.registerFunction("getspell", 'l', "c", opcodeGetSpell, opcodeGetSpellExplicit);
+
+            extensions.registerInstruction("pcraiserank", "/S", opcodePCRaiseRank, opcodePCRaiseRankExplicit);
+            extensions.registerInstruction("pclowerrank", "/S", opcodePCLowerRank, opcodePCLowerRankExplicit);
+            extensions.registerInstruction("pcjoinfaction", "/S", opcodePCJoinFaction, opcodePCJoinFactionExplicit);
+            extensions.registerInstruction("moddisposition", "l", opcodeModDisposition, opcodeModDispositionExplicit);
+            extensions.registerInstruction("setdisposition", "l", opcodeSetDisposition, opcodeSetDispositionExplicit);
+            extensions.registerFunction("getdisposition", 'l', "", opcodeGetDisposition, opcodeGetDispositionExplicit);
+            extensions.registerFunction("getpcrank", 'l', "/S", opcodeGetPCRank, opcodeGetPCRankExplicit);
 
             extensions.registerInstruction("setlevel", "l", opcodeSetLevel, opcodeSetLevelExplicit);
             extensions.registerFunction("getlevel", 'l', "", opcodeGetLevel, opcodeGetLevelExplicit);
 
             extensions.registerFunction("getstat", 'l', "c", opcodeGetStat, opcodeGetStatExplicit);
 
-            extensions.registerFunction ("getdeadcount", 'l', "c", opcodeGetDeadCount);
+            extensions.registerFunction("getdeadcount", 'l', "c", opcodeGetDeadCount);
 
-            extensions.registerFunction ("getpcfacrep", 'l', "/c", opcodeGetPCFacRep, opcodeGetPCFacRepExplicit);
-            extensions.registerInstruction ("setpcfacrep", "l/c", opcodeSetPCFacRep, opcodeSetPCFacRepExplicit);
-            extensions.registerInstruction ("modpcfacrep", "l/c", opcodeModPCFacRep, opcodeModPCFacRepExplicit);
+            extensions.registerFunction("getpcfacrep", 'l', "/c", opcodeGetPCFacRep, opcodeGetPCFacRepExplicit);
+            extensions.registerInstruction("setpcfacrep", "l/c", opcodeSetPCFacRep, opcodeSetPCFacRepExplicit);
+            extensions.registerInstruction("modpcfacrep", "l/c", opcodeModPCFacRep, opcodeModPCFacRepExplicit);
 
-            extensions.registerFunction ("getcommondisease", 'l', "", opcodeGetCommonDisease,
-                opcodeGetCommonDiseaseExplicit);
-            extensions.registerFunction ("getblightdisease", 'l', "", opcodeGetBlightDisease,
-                opcodeGetBlightDiseaseExplicit);
+            extensions.registerFunction(
+                "getcommondisease", 'l', "", opcodeGetCommonDisease, opcodeGetCommonDiseaseExplicit);
+            extensions.registerFunction(
+                "getblightdisease", 'l', "", opcodeGetBlightDisease, opcodeGetBlightDiseaseExplicit);
 
-            extensions.registerFunction ("getrace", 'l', "c", opcodeGetRace,
-                opcodeGetRaceExplicit);
-            extensions.registerFunction ("getwerewolfkills", 'l', "", opcodeGetWerewolfKills);
-            extensions.registerFunction ("pcexpelled", 'l', "/S", opcodePcExpelled, opcodePcExpelledExplicit);
-            extensions.registerInstruction ("pcexpell", "/S", opcodePcExpell, opcodePcExpellExplicit);
-            extensions.registerInstruction ("pcclearexpelled", "/S", opcodePcClearExpelled, opcodePcClearExpelledExplicit);
-            extensions.registerInstruction ("raiserank", "x", opcodeRaiseRank, opcodeRaiseRankExplicit);
-            extensions.registerInstruction ("lowerrank", "x", opcodeLowerRank, opcodeLowerRankExplicit);
+            extensions.registerFunction("getrace", 'l', "c", opcodeGetRace, opcodeGetRaceExplicit);
+            extensions.registerFunction("getwerewolfkills", 'l', "", opcodeGetWerewolfKills);
+            extensions.registerFunction("pcexpelled", 'l', "/S", opcodePcExpelled, opcodePcExpelledExplicit);
+            extensions.registerInstruction("pcexpell", "/S", opcodePcExpell, opcodePcExpellExplicit);
+            extensions.registerInstruction(
+                "pcclearexpelled", "/S", opcodePcClearExpelled, opcodePcClearExpelledExplicit);
+            extensions.registerInstruction("raiserank", "x", opcodeRaiseRank, opcodeRaiseRankExplicit);
+            extensions.registerInstruction("lowerrank", "x", opcodeLowerRank, opcodeLowerRankExplicit);
 
-            extensions.registerFunction ("ondeath", 'l', "", opcodeOnDeath, opcodeOnDeathExplicit);
-            extensions.registerFunction ("onmurder", 'l', "", opcodeOnMurder, opcodeOnMurderExplicit);
-            extensions.registerFunction ("onknockout", 'l', "", opcodeOnKnockout, opcodeOnKnockoutExplicit);
+            extensions.registerFunction("ondeath", 'l', "", opcodeOnDeath, opcodeOnDeathExplicit);
+            extensions.registerFunction("onmurder", 'l', "", opcodeOnMurder, opcodeOnMurderExplicit);
+            extensions.registerFunction("onknockout", 'l', "", opcodeOnKnockout, opcodeOnKnockoutExplicit);
 
-            extensions.registerFunction ("iswerewolf", 'l', "", opcodeIsWerewolf, opcodeIsWerewolfExplicit);
+            extensions.registerFunction("iswerewolf", 'l', "", opcodeIsWerewolf, opcodeIsWerewolfExplicit);
 
             extensions.registerInstruction("becomewerewolf", "", opcodeBecomeWerewolf, opcodeBecomeWerewolfExplicit);
             extensions.registerInstruction("undowerewolf", "", opcodeUndoWerewolf, opcodeUndoWerewolfExplicit);
-            extensions.registerInstruction("setwerewolfacrobatics", "", opcodeSetWerewolfAcrobatics, opcodeSetWerewolfAcrobaticsExplicit);
+            extensions.registerInstruction(
+                "setwerewolfacrobatics", "", opcodeSetWerewolfAcrobatics, opcodeSetWerewolfAcrobaticsExplicit);
 
             extensions.registerFunction("getpcvisionbonus", 'f', "", opcodeGetPCVisionBonus);
             extensions.registerInstruction("setpcvisionbonus", "f", opcodeSetPCVisionBonus);
@@ -547,43 +506,44 @@ namespace Compiler
 
     namespace Transformation
     {
-        void registerExtensions (Extensions& extensions)
+        void registerExtensions(Extensions& extensions)
         {
-            extensions.registerFunction("getdistance",'f',"c",opcodeGetDistance,opcodeGetDistanceExplicit);
-            extensions.registerInstruction("setscale","f",opcodeSetScale,opcodeSetScaleExplicit);
-            extensions.registerFunction("getscale",'f',"",opcodeGetScale,opcodeGetScaleExplicit);
-            extensions.registerInstruction("setangle","cf",opcodeSetAngle,opcodeSetAngleExplicit);
-            extensions.registerFunction("getangle",'f',"c",opcodeGetAngle,opcodeGetAngleExplicit);
-            extensions.registerInstruction("setpos","cf",opcodeSetPos,opcodeSetPosExplicit);
-            extensions.registerFunction("getpos",'f',"c",opcodeGetPos,opcodeGetPosExplicit);
-            extensions.registerFunction("getstartingpos",'f',"c",opcodeGetStartingPos,opcodeGetStartingPosExplicit);
-            extensions.registerInstruction("position","ffffz",opcodePosition,opcodePositionExplicit);
-            extensions.registerInstruction("positioncell","ffffczz",opcodePositionCell,opcodePositionCellExplicit);
-            extensions.registerInstruction("placeitemcell","ccffffX",opcodePlaceItemCell);
-            extensions.registerInstruction("placeitem","cffffX",opcodePlaceItem);
-            extensions.registerInstruction("placeatpc","clflX",opcodePlaceAtPc);
-            extensions.registerInstruction("placeatme","clflX",opcodePlaceAtMe,opcodePlaceAtMeExplicit);
-            extensions.registerInstruction("modscale","f",opcodeModScale,opcodeModScaleExplicit);
-            extensions.registerInstruction("rotate","cf",opcodeRotate,opcodeRotateExplicit);
-            extensions.registerInstruction("rotateworld","cf",opcodeRotateWorld,opcodeRotateWorldExplicit);
-            extensions.registerInstruction("setatstart","",opcodeSetAtStart,opcodeSetAtStartExplicit);
-            extensions.registerInstruction("move","cf",opcodeMove,opcodeMoveExplicit);
-            extensions.registerInstruction("moveworld","cf",opcodeMoveWorld,opcodeMoveWorldExplicit);
-            extensions.registerFunction("getstartingangle",'f',"c",opcodeGetStartingAngle,opcodeGetStartingAngleExplicit);
-            extensions.registerInstruction("resetactors","",opcodeResetActors);
-            extensions.registerInstruction("fixme","",opcodeFixme);
-            extensions.registerInstruction("ra","",opcodeResetActors);
+            extensions.registerFunction("getdistance", 'f', "c", opcodeGetDistance, opcodeGetDistanceExplicit);
+            extensions.registerInstruction("setscale", "f", opcodeSetScale, opcodeSetScaleExplicit);
+            extensions.registerFunction("getscale", 'f', "", opcodeGetScale, opcodeGetScaleExplicit);
+            extensions.registerInstruction("setangle", "cf", opcodeSetAngle, opcodeSetAngleExplicit);
+            extensions.registerFunction("getangle", 'f', "c", opcodeGetAngle, opcodeGetAngleExplicit);
+            extensions.registerInstruction("setpos", "cf", opcodeSetPos, opcodeSetPosExplicit);
+            extensions.registerFunction("getpos", 'f', "c", opcodeGetPos, opcodeGetPosExplicit);
+            extensions.registerFunction("getstartingpos", 'f', "c", opcodeGetStartingPos, opcodeGetStartingPosExplicit);
+            extensions.registerInstruction("position", "ffffz", opcodePosition, opcodePositionExplicit);
+            extensions.registerInstruction("positioncell", "ffffczz", opcodePositionCell, opcodePositionCellExplicit);
+            extensions.registerInstruction("placeitemcell", "ccffffX", opcodePlaceItemCell);
+            extensions.registerInstruction("placeitem", "cffffX", opcodePlaceItem);
+            extensions.registerInstruction("placeatpc", "clflX", opcodePlaceAtPc);
+            extensions.registerInstruction("placeatme", "clflX", opcodePlaceAtMe, opcodePlaceAtMeExplicit);
+            extensions.registerInstruction("modscale", "f", opcodeModScale, opcodeModScaleExplicit);
+            extensions.registerInstruction("rotate", "cf", opcodeRotate, opcodeRotateExplicit);
+            extensions.registerInstruction("rotateworld", "cf", opcodeRotateWorld, opcodeRotateWorldExplicit);
+            extensions.registerInstruction("setatstart", "", opcodeSetAtStart, opcodeSetAtStartExplicit);
+            extensions.registerInstruction("move", "cf", opcodeMove, opcodeMoveExplicit);
+            extensions.registerInstruction("moveworld", "cf", opcodeMoveWorld, opcodeMoveWorldExplicit);
+            extensions.registerFunction(
+                "getstartingangle", 'f', "c", opcodeGetStartingAngle, opcodeGetStartingAngleExplicit);
+            extensions.registerInstruction("resetactors", "", opcodeResetActors);
+            extensions.registerInstruction("fixme", "", opcodeFixme);
+            extensions.registerInstruction("ra", "", opcodeResetActors);
         }
     }
 
     namespace User
     {
-        void registerExtensions (Extensions& extensions)
+        void registerExtensions(Extensions& extensions)
         {
-            extensions.registerInstruction ("user1", "", opcodeUser1);
-            extensions.registerInstruction ("user2", "", opcodeUser2);
-            extensions.registerInstruction ("user3", "", opcodeUser3, opcodeUser3);
-            extensions.registerInstruction ("user4", "", opcodeUser4, opcodeUser4);
+            extensions.registerInstruction("user1", "", opcodeUser1);
+            extensions.registerInstruction("user2", "", opcodeUser2);
+            extensions.registerInstruction("user3", "", opcodeUser3, opcodeUser3);
+            extensions.registerInstruction("user4", "", opcodeUser4, opcodeUser4);
         }
     }
 }
diff --git a/components/compiler/extensions0.hpp b/components/compiler/extensions0.hpp
index e9ce6a6d6a..955b37511a 100644
--- a/components/compiler/extensions0.hpp
+++ b/components/compiler/extensions0.hpp
@@ -5,76 +5,76 @@ namespace Compiler
 {
     class Extensions;
 
-    void registerExtensions (Extensions& extensions, bool consoleOnly = false);
+    void registerExtensions(Extensions& extensions, bool consoleOnly = false);
 
     namespace Ai
     {
-        void registerExtensions (Extensions& extensions);
+        void registerExtensions(Extensions& extensions);
     }
 
     namespace Animation
     {
-        void registerExtensions (Extensions& extensions);
+        void registerExtensions(Extensions& extensions);
     }
 
     namespace Cell
     {
-        void registerExtensions (Extensions& extensions);
+        void registerExtensions(Extensions& extensions);
     }
 
     namespace Console
     {
-        void registerExtensions (Extensions& extensions);
+        void registerExtensions(Extensions& extensions);
     }
 
     namespace Container
     {
-        void registerExtensions (Extensions& extensions);
+        void registerExtensions(Extensions& extensions);
     }
 
     namespace Control
     {
-        void registerExtensions (Extensions& extensions);
+        void registerExtensions(Extensions& extensions);
     }
 
     namespace Dialogue
     {
-        void registerExtensions (Extensions& extensions);
+        void registerExtensions(Extensions& extensions);
     }
 
     namespace Gui
     {
-        void registerExtensions (Extensions& extensions);
+        void registerExtensions(Extensions& extensions);
     }
 
     namespace Misc
     {
-        void registerExtensions (Extensions& extensions);
+        void registerExtensions(Extensions& extensions);
     }
 
     namespace Sky
     {
-        void registerExtensions (Extensions& extensions);
+        void registerExtensions(Extensions& extensions);
     }
 
     namespace Sound
     {
-        void registerExtensions (Extensions& extensions);
+        void registerExtensions(Extensions& extensions);
     }
 
     namespace Stats
     {
-        void registerExtensions (Extensions& extensions);
+        void registerExtensions(Extensions& extensions);
     }
 
     namespace Transformation
     {
-        void registerExtensions (Extensions& extensions);
+        void registerExtensions(Extensions& extensions);
     }
 
     namespace User
     {
-        void registerExtensions (Extensions& extensions);
+        void registerExtensions(Extensions& extensions);
     }
 }
 
diff --git a/components/compiler/fileparser.cpp b/components/compiler/fileparser.cpp
index 9d5c02785e..a2570ac5df 100644
--- a/components/compiler/fileparser.cpp
+++ b/components/compiler/fileparser.cpp
@@ -1,24 +1,25 @@
 #include "fileparser.hpp"
 
-#include "tokenloc.hpp"
 #include "scanner.hpp"
+#include "tokenloc.hpp"
 
 namespace Compiler
 {
-    FileParser::FileParser (ErrorHandler& errorHandler, Context& context)
-    : Parser (errorHandler, context),
-      mScriptParser (errorHandler, context, mLocals, true),
-      mState (BeginState)
-    {}
+    FileParser::FileParser(ErrorHandler& errorHandler, Context& context)
+        : Parser(errorHandler, context)
+        , mScriptParser(errorHandler, context, mLocals, true)
+        , mState(BeginState)
+    {
+    }
 
     std::string FileParser::getName() const
     {
         return mName;
     }
 
-    void FileParser::getCode (std::vector<Interpreter::Type_Code>& code) const
+    void FileParser::getCode(std::vector<Interpreter::Type_Code>& code) const
     {
-        mScriptParser.getCode (code);
+        mScriptParser.getCode(code);
     }
 
     const Locals& FileParser::getLocals() const
@@ -26,21 +27,20 @@ namespace Compiler
         return mLocals;
     }
 
-    bool FileParser::parseName (const std::string& name, const TokenLoc& loc,
-        Scanner& scanner)
+    bool FileParser::parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner)
     {
-        if (mState==NameState)
+        if (mState == NameState)
         {
             mName = name;
             mState = BeginCompleteState;
             return true;
         }
 
-        if (mState==EndNameState)
+        if (mState == EndNameState)
         {
             // optional repeated name after end statement
-            if (mName!=name)
-                reportWarning ("Names for script " + mName + " do not match", loc);
+            if (mName != name)
+                reportWarning("Names for script " + mName + " do not match", loc);
 
             mState = EndCompleteState;
             return false; // we are stopping here, because there might be more garbage on the end line,
@@ -49,25 +49,25 @@ namespace Compiler
                           /// \todo allow this workaround to be disabled for newer scripts
         }
 
-        if (mState==BeginCompleteState)
+        if (mState == BeginCompleteState)
         {
-            reportWarning ("Stray string (" + name + ") after begin statement", loc);
+            reportWarning("Stray string (" + name + ") after begin statement", loc);
             return true;
         }
 
-        return Parser::parseName (name, loc, scanner);
+        return Parser::parseName(name, loc, scanner);
     }
 
-    bool FileParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
+    bool FileParser::parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner)
     {
-        if (mState==BeginState && keyword==Scanner::K_begin)
+        if (mState == BeginState && keyword == Scanner::K_begin)
         {
             mState = NameState;
             scanner.enableTolerantNames(); /// \todo disable
             return true;
         }
 
-        if (mState==NameState)
+        if (mState == NameState)
         {
             // keywords can be used as script names too. Thank you Morrowind for another
             // syntactic perversity :(
@@ -76,11 +76,11 @@ namespace Compiler
             return true;
         }
 
-        if (mState==EndNameState)
+        if (mState == EndNameState)
         {
             // optional repeated name after end statement
-            if (mName!=loc.mLiteral)
-                reportWarning ("Names for script " + mName + " do not match", loc);
+            if (mName != loc.mLiteral)
+                reportWarning("Names for script " + mName + " do not match", loc);
 
             mState = EndCompleteState;
             return false; // we are stopping here, because there might be more garbage on the end line,
@@ -89,46 +89,46 @@ namespace Compiler
                           /// \todo allow this workaround to be disabled for newer scripts
         }
 
-        return Parser::parseKeyword (keyword, loc, scanner);
+        return Parser::parseKeyword(keyword, loc, scanner);
     }
 
-    bool FileParser::parseSpecial (int code, const TokenLoc& loc, Scanner& scanner)
+    bool FileParser::parseSpecial(int code, const TokenLoc& loc, Scanner& scanner)
     {
         // Ignore any junk special characters
         if (mState == BeginState)
         {
             if (code != Scanner::S_newline)
-                reportWarning ("Stray special character before begin statement", loc);
+                reportWarning("Stray special character before begin statement", loc);
             return true;
         }
 
-        if (code==Scanner::S_newline)
+        if (code == Scanner::S_newline)
         {
-            if (mState==BeginCompleteState)
+            if (mState == BeginCompleteState)
             {
                 // parse the script body
                 mScriptParser.reset();
 
-                scanner.scan (mScriptParser);
+                scanner.scan(mScriptParser);
 
                 mState = EndNameState;
                 return true;
             }
 
-            if (mState==EndCompleteState || mState==EndNameState)
+            if (mState == EndCompleteState || mState == EndNameState)
             {
                 // we are done here -> ignore the rest of the script
                 return false;
             }
         }
 
-        return Parser::parseSpecial (code, loc, scanner);
+        return Parser::parseSpecial(code, loc, scanner);
     }
 
-    void FileParser::parseEOF (Scanner& scanner)
+    void FileParser::parseEOF(Scanner& scanner)
     {
-        if (mState!=EndNameState && mState!=EndCompleteState)
-            Parser::parseEOF (scanner);
+        if (mState != EndNameState && mState != EndCompleteState)
+            Parser::parseEOF(scanner);
     }
 
     void FileParser::reset()
diff --git a/components/compiler/fileparser.hpp b/components/compiler/fileparser.hpp
index fa91dc631f..454f77fec0 100644
--- a/components/compiler/fileparser.hpp
+++ b/components/compiler/fileparser.hpp
@@ -1,58 +1,59 @@
 #ifndef COMPILER_FILEPARSER_H_INCLUDED
 #define COMPILER_FILEPARSER_H_INCLUDED
 
+#include "locals.hpp"
 #include "parser.hpp"
 #include "scriptparser.hpp"
-#include "locals.hpp"
 
 namespace Compiler
 {
     // Top-level parser, to be used for global scripts, local scripts and targeted scripts
-    
+
     class FileParser : public Parser
     {
-            enum State
-            {
-                BeginState, NameState, BeginCompleteState, EndNameState,
-                EndCompleteState
-            };
-            
-            ScriptParser mScriptParser;
-            State mState;
-            std::string mName;
-            Locals mLocals;
-
-        public:
-        
-            FileParser (ErrorHandler& errorHandler, Context& context);
-
-            std::string getName() const;
-            ///< Return script name.
-
-            void getCode (std::vector<Interpreter::Type_Code>& code) const;
-            ///< store generated code in \a code.
-            
-            const Locals& getLocals() const;
-            ///< get local variable declarations.
-
-            bool parseName (const std::string& name, const TokenLoc& loc,
-                Scanner& scanner) override;
-            ///< Handle a name token.
-            /// \return fetch another token?
-
-            bool parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a keyword token.
-            /// \return fetch another token?
-
-            bool parseSpecial (int code, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a special character token.
-            /// \return fetch another token?
-
-            void parseEOF (Scanner& scanner) override;
-            ///< Handle EOF token.    
-            
-            void reset() override;
-            ///< Reset parser to clean state.
+        enum State
+        {
+            BeginState,
+            NameState,
+            BeginCompleteState,
+            EndNameState,
+            EndCompleteState
+        };
+
+        ScriptParser mScriptParser;
+        State mState;
+        std::string mName;
+        Locals mLocals;
+
+    public:
+        FileParser(ErrorHandler& errorHandler, Context& context);
+
+        std::string getName() const;
+        ///< Return script name.
+
+        void getCode(std::vector<Interpreter::Type_Code>& code) const;
+        ///< store generated code in \a code.
+
+        const Locals& getLocals() const;
+        ///< get local variable declarations.
+
+        bool parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a name token.
+        /// \return fetch another token?
+
+        bool parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a keyword token.
+        /// \return fetch another token?
+
+        bool parseSpecial(int code, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a special character token.
+        /// \return fetch another token?
+
+        void parseEOF(Scanner& scanner) override;
+        ///< Handle EOF token.
+
+        void reset() override;
+        ///< Reset parser to clean state.
     };
 }
 
diff --git a/components/compiler/generator.cpp b/components/compiler/generator.cpp
index 3d8b87e69e..2d99b6079c 100644
--- a/components/compiler/generator.cpp
+++ b/components/compiler/generator.cpp
@@ -1,7 +1,7 @@
 #include "generator.hpp"
 
-#include <cassert>
 #include <algorithm>
+#include <cassert>
 #include <iterator>
 #include <stdexcept>
 
@@ -9,139 +9,139 @@
 
 namespace
 {
-    void opPushInt (Compiler::Generator::CodeContainer& code, int value)
+    void opPushInt(Compiler::Generator::CodeContainer& code, int value)
     {
-        code.push_back (Compiler::Generator::segment0 (0, value));
+        code.push_back(Compiler::Generator::segment0(0, value));
     }
 
-    void opFetchIntLiteral (Compiler::Generator::CodeContainer& code)
+    void opFetchIntLiteral(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (4));
+        code.push_back(Compiler::Generator::segment5(4));
     }
 
-    void opFetchFloatLiteral (Compiler::Generator::CodeContainer& code)
+    void opFetchFloatLiteral(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (5));
+        code.push_back(Compiler::Generator::segment5(5));
     }
 
-    void opIntToFloat (Compiler::Generator::CodeContainer& code)
+    void opIntToFloat(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (3));
+        code.push_back(Compiler::Generator::segment5(3));
     }
 
-    void opFloatToInt (Compiler::Generator::CodeContainer& code)
+    void opFloatToInt(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (6));
+        code.push_back(Compiler::Generator::segment5(6));
     }
 
-    void opStoreLocalShort (Compiler::Generator::CodeContainer& code)
+    void opStoreLocalShort(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (0));
+        code.push_back(Compiler::Generator::segment5(0));
     }
 
-    void opStoreLocalLong (Compiler::Generator::CodeContainer& code)
+    void opStoreLocalLong(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (1));
+        code.push_back(Compiler::Generator::segment5(1));
     }
 
-    void opStoreLocalFloat (Compiler::Generator::CodeContainer& code)
+    void opStoreLocalFloat(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (2));
+        code.push_back(Compiler::Generator::segment5(2));
     }
 
-    void opNegateInt (Compiler::Generator::CodeContainer& code)
+    void opNegateInt(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (7));
+        code.push_back(Compiler::Generator::segment5(7));
     }
 
-    void opNegateFloat (Compiler::Generator::CodeContainer& code)
+    void opNegateFloat(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (8));
+        code.push_back(Compiler::Generator::segment5(8));
     }
 
-    void opAddInt (Compiler::Generator::CodeContainer& code)
+    void opAddInt(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (9));
+        code.push_back(Compiler::Generator::segment5(9));
     }
 
-    void opAddFloat (Compiler::Generator::CodeContainer& code)
+    void opAddFloat(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (10));
+        code.push_back(Compiler::Generator::segment5(10));
     }
 
-    void opSubInt (Compiler::Generator::CodeContainer& code)
+    void opSubInt(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (11));
+        code.push_back(Compiler::Generator::segment5(11));
     }
 
-    void opSubFloat (Compiler::Generator::CodeContainer& code)
+    void opSubFloat(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (12));
+        code.push_back(Compiler::Generator::segment5(12));
     }
 
-    void opMulInt (Compiler::Generator::CodeContainer& code)
+    void opMulInt(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (13));
+        code.push_back(Compiler::Generator::segment5(13));
     }
 
-    void opMulFloat (Compiler::Generator::CodeContainer& code)
+    void opMulFloat(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (14));
+        code.push_back(Compiler::Generator::segment5(14));
     }
 
-    void opDivInt (Compiler::Generator::CodeContainer& code)
+    void opDivInt(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (15));
+        code.push_back(Compiler::Generator::segment5(15));
     }
 
-    void opDivFloat (Compiler::Generator::CodeContainer& code)
+    void opDivFloat(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (16));
+        code.push_back(Compiler::Generator::segment5(16));
     }
 
-    void opIntToFloat1 (Compiler::Generator::CodeContainer& code)
+    void opIntToFloat1(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (17));
+        code.push_back(Compiler::Generator::segment5(17));
     }
 
-    void opReturn (Compiler::Generator::CodeContainer& code)
+    void opReturn(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (20));
+        code.push_back(Compiler::Generator::segment5(20));
     }
 
-    void opMessageBox (Compiler::Generator::CodeContainer& code, int buttons)
+    void opMessageBox(Compiler::Generator::CodeContainer& code, int buttons)
     {
-        code.push_back (Compiler::Generator::segment3 (0, buttons));
+        code.push_back(Compiler::Generator::segment3(0, buttons));
     }
 
-    void opReport (Compiler::Generator::CodeContainer& code)
+    void opReport(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (58));
+        code.push_back(Compiler::Generator::segment5(58));
     }
 
-    void opFetchLocalShort (Compiler::Generator::CodeContainer& code)
+    void opFetchLocalShort(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (21));
+        code.push_back(Compiler::Generator::segment5(21));
     }
 
-    void opFetchLocalLong (Compiler::Generator::CodeContainer& code)
+    void opFetchLocalLong(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (22));
+        code.push_back(Compiler::Generator::segment5(22));
     }
 
-    void opFetchLocalFloat (Compiler::Generator::CodeContainer& code)
+    void opFetchLocalFloat(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (23));
+        code.push_back(Compiler::Generator::segment5(23));
     }
 
-    void opJumpForward (Compiler::Generator::CodeContainer& code, int offset)
+    void opJumpForward(Compiler::Generator::CodeContainer& code, int offset)
     {
-        code.push_back (Compiler::Generator::segment0 (1, offset));
+        code.push_back(Compiler::Generator::segment0(1, offset));
     }
 
-    void opJumpBackward (Compiler::Generator::CodeContainer& code, int offset)
+    void opJumpBackward(Compiler::Generator::CodeContainer& code, int offset)
     {
-        code.push_back (Compiler::Generator::segment0 (2, offset));
+        code.push_back(Compiler::Generator::segment0(2, offset));
     }
 
     /*
@@ -152,571 +152,591 @@ namespace
     }
     */
 
-    void opSkipOnNonZero (Compiler::Generator::CodeContainer& code)
+    void opSkipOnNonZero(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (25));
+        code.push_back(Compiler::Generator::segment5(25));
     }
 
-    void opEqualInt (Compiler::Generator::CodeContainer& code)
+    void opEqualInt(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (26));
+        code.push_back(Compiler::Generator::segment5(26));
     }
 
-    void opNonEqualInt (Compiler::Generator::CodeContainer& code)
+    void opNonEqualInt(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (27));
+        code.push_back(Compiler::Generator::segment5(27));
     }
 
-    void opLessThanInt (Compiler::Generator::CodeContainer& code)
+    void opLessThanInt(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (28));
+        code.push_back(Compiler::Generator::segment5(28));
     }
 
-    void opLessOrEqualInt (Compiler::Generator::CodeContainer& code)
+    void opLessOrEqualInt(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (29));
+        code.push_back(Compiler::Generator::segment5(29));
     }
 
-    void opGreaterThanInt (Compiler::Generator::CodeContainer& code)
+    void opGreaterThanInt(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (30));
+        code.push_back(Compiler::Generator::segment5(30));
     }
 
-    void opGreaterOrEqualInt (Compiler::Generator::CodeContainer& code)
+    void opGreaterOrEqualInt(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (31));
+        code.push_back(Compiler::Generator::segment5(31));
     }
 
-    void opEqualFloat (Compiler::Generator::CodeContainer& code)
+    void opEqualFloat(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (32));
+        code.push_back(Compiler::Generator::segment5(32));
     }
 
-    void opNonEqualFloat (Compiler::Generator::CodeContainer& code)
+    void opNonEqualFloat(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (33));
+        code.push_back(Compiler::Generator::segment5(33));
     }
 
-    void opLessThanFloat (Compiler::Generator::CodeContainer& code)
+    void opLessThanFloat(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (34));
+        code.push_back(Compiler::Generator::segment5(34));
     }
 
-    void opLessOrEqualFloat (Compiler::Generator::CodeContainer& code)
+    void opLessOrEqualFloat(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (35));
+        code.push_back(Compiler::Generator::segment5(35));
     }
 
-    void opGreaterThanFloat (Compiler::Generator::CodeContainer& code)
+    void opGreaterThanFloat(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (36));
+        code.push_back(Compiler::Generator::segment5(36));
     }
 
-    void opGreaterOrEqualFloat (Compiler::Generator::CodeContainer& code)
+    void opGreaterOrEqualFloat(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (37));
+        code.push_back(Compiler::Generator::segment5(37));
     }
 
-    void opStoreGlobalShort (Compiler::Generator::CodeContainer& code)
+    void opStoreGlobalShort(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (39));
+        code.push_back(Compiler::Generator::segment5(39));
     }
 
-    void opStoreGlobalLong (Compiler::Generator::CodeContainer& code)
+    void opStoreGlobalLong(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (40));
+        code.push_back(Compiler::Generator::segment5(40));
     }
 
-    void opStoreGlobalFloat (Compiler::Generator::CodeContainer& code)
+    void opStoreGlobalFloat(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (41));
+        code.push_back(Compiler::Generator::segment5(41));
     }
 
-    void opFetchGlobalShort (Compiler::Generator::CodeContainer& code)
+    void opFetchGlobalShort(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (42));
+        code.push_back(Compiler::Generator::segment5(42));
     }
 
-    void opFetchGlobalLong (Compiler::Generator::CodeContainer& code)
+    void opFetchGlobalLong(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (43));
+        code.push_back(Compiler::Generator::segment5(43));
     }
 
-    void opFetchGlobalFloat (Compiler::Generator::CodeContainer& code)
+    void opFetchGlobalFloat(Compiler::Generator::CodeContainer& code)
     {
-        code.push_back (Compiler::Generator::segment5 (44));
+        code.push_back(Compiler::Generator::segment5(44));
     }
 
-    void opStoreMemberShort (Compiler::Generator::CodeContainer& code, bool global)
+    void opStoreMemberShort(Compiler::Generator::CodeContainer& code, bool global)
     {
-        code.push_back (Compiler::Generator::segment5 (global ? 65 : 59));
+        code.push_back(Compiler::Generator::segment5(global ? 65 : 59));
     }
 
-    void opStoreMemberLong (Compiler::Generator::CodeContainer& code, bool global)
+    void opStoreMemberLong(Compiler::Generator::CodeContainer& code, bool global)
     {
-        code.push_back (Compiler::Generator::segment5 (global ? 66 : 60));
+        code.push_back(Compiler::Generator::segment5(global ? 66 : 60));
     }
 
-    void opStoreMemberFloat (Compiler::Generator::CodeContainer& code, bool global)
+    void opStoreMemberFloat(Compiler::Generator::CodeContainer& code, bool global)
     {
-        code.push_back (Compiler::Generator::segment5 (global ? 67 : 61));
+        code.push_back(Compiler::Generator::segment5(global ? 67 : 61));
     }
 
-    void opFetchMemberShort (Compiler::Generator::CodeContainer& code, bool global)
+    void opFetchMemberShort(Compiler::Generator::CodeContainer& code, bool global)
     {
-        code.push_back (Compiler::Generator::segment5 (global ? 68 : 62));
+        code.push_back(Compiler::Generator::segment5(global ? 68 : 62));
     }
 
-    void opFetchMemberLong (Compiler::Generator::CodeContainer& code, bool global)
+    void opFetchMemberLong(Compiler::Generator::CodeContainer& code, bool global)
     {
-        code.push_back (Compiler::Generator::segment5 (global ? 69 : 63));
+        code.push_back(Compiler::Generator::segment5(global ? 69 : 63));
     }
 
-    void opFetchMemberFloat (Compiler::Generator::CodeContainer& code, bool global)
+    void opFetchMemberFloat(Compiler::Generator::CodeContainer& code, bool global)
     {
-        code.push_back (Compiler::Generator::segment5 (global ? 70 : 64));
+        code.push_back(Compiler::Generator::segment5(global ? 70 : 64));
     }
 }
 
 namespace Compiler::Generator
+{
+    void pushInt(CodeContainer& code, Literals& literals, int value)
     {
-        void pushInt (CodeContainer& code, Literals& literals, int value)
-        {
-            int index = literals.addInteger (value);
-            opPushInt (code, index);
-            opFetchIntLiteral (code);
-        }
+        int index = literals.addInteger(value);
+        opPushInt(code, index);
+        opFetchIntLiteral(code);
+    }
 
-        void pushFloat (CodeContainer& code, Literals& literals, float value)
-        {
-            int index = literals.addFloat (value);
-            opPushInt (code, index);
-            opFetchFloatLiteral (code);
-        }
+    void pushFloat(CodeContainer& code, Literals& literals, float value)
+    {
+        int index = literals.addFloat(value);
+        opPushInt(code, index);
+        opFetchFloatLiteral(code);
+    }
 
-        void pushString (CodeContainer& code, Literals& literals, const std::string& value)
-        {
-            int index = literals.addString (value);
-            opPushInt (code, index);
-        }
+    void pushString(CodeContainer& code, Literals& literals, const std::string& value)
+    {
+        int index = literals.addString(value);
+        opPushInt(code, index);
+    }
 
-        void assignToLocal (CodeContainer& code, char localType,
-            int localIndex, const CodeContainer& value, char valueType)
-        {
-            opPushInt (code, localIndex);
+    void assignToLocal(CodeContainer& code, char localType, int localIndex, const CodeContainer& value, char valueType)
+    {
+        opPushInt(code, localIndex);
 
-            std::copy (value.begin(), value.end(), std::back_inserter (code));
+        std::copy(value.begin(), value.end(), std::back_inserter(code));
 
-            if (localType!=valueType)
+        if (localType != valueType)
+        {
+            if (localType == 'f' && valueType == 'l')
             {
-                if (localType=='f' && valueType=='l')
-                {
-                    opIntToFloat (code);
-                }
-                else if ((localType=='l' || localType=='s') && valueType=='f')
-                {
-                    opFloatToInt (code);
-                }
+                opIntToFloat(code);
             }
-
-            switch (localType)
+            else if ((localType == 'l' || localType == 's') && valueType == 'f')
             {
-                case 'f':
+                opFloatToInt(code);
+            }
+        }
 
-                    opStoreLocalFloat (code);
-                    break;
+        switch (localType)
+        {
+            case 'f':
 
-                case 's':
+                opStoreLocalFloat(code);
+                break;
 
-                    opStoreLocalShort (code);
-                    break;
+            case 's':
 
-                case 'l':
+                opStoreLocalShort(code);
+                break;
 
-                    opStoreLocalLong (code);
-                    break;
+            case 'l':
 
-                default:
+                opStoreLocalLong(code);
+                break;
 
-                    assert (0);
-            }
+            default:
+
+                assert(0);
         }
+    }
 
-        void negate (CodeContainer& code, char valueType)
+    void negate(CodeContainer& code, char valueType)
+    {
+        switch (valueType)
         {
-            switch (valueType)
-            {
-                case 'l':
+            case 'l':
 
-                    opNegateInt (code);
-                    break;
+                opNegateInt(code);
+                break;
 
-                case 'f':
+            case 'f':
 
-                    opNegateFloat (code);
-                    break;
+                opNegateFloat(code);
+                break;
 
-                default:
+            default:
 
-                    assert (0);
-            }
+                assert(0);
         }
+    }
 
-        void add (CodeContainer& code, char valueType1, char valueType2)
+    void add(CodeContainer& code, char valueType1, char valueType2)
+    {
+        if (valueType1 == 'l' && valueType2 == 'l')
         {
-            if (valueType1=='l' && valueType2=='l')
-            {
-                opAddInt (code);
-            }
-            else
-            {
-                if (valueType1=='l')
-                    opIntToFloat1 (code);
+            opAddInt(code);
+        }
+        else
+        {
+            if (valueType1 == 'l')
+                opIntToFloat1(code);
 
-                if (valueType2=='l')
-                    opIntToFloat (code);
+            if (valueType2 == 'l')
+                opIntToFloat(code);
 
-                opAddFloat (code);
-            }
+            opAddFloat(code);
         }
+    }
 
-        void sub (CodeContainer& code, char valueType1, char valueType2)
+    void sub(CodeContainer& code, char valueType1, char valueType2)
+    {
+        if (valueType1 == 'l' && valueType2 == 'l')
         {
-            if (valueType1=='l' && valueType2=='l')
-            {
-                opSubInt (code);
-            }
-            else
-            {
-                if (valueType1=='l')
-                    opIntToFloat1 (code);
+            opSubInt(code);
+        }
+        else
+        {
+            if (valueType1 == 'l')
+                opIntToFloat1(code);
 
-                if (valueType2=='l')
-                    opIntToFloat (code);
+            if (valueType2 == 'l')
+                opIntToFloat(code);
 
-                opSubFloat (code);
-            }
+            opSubFloat(code);
         }
+    }
 
-        void mul (CodeContainer& code, char valueType1, char valueType2)
+    void mul(CodeContainer& code, char valueType1, char valueType2)
+    {
+        if (valueType1 == 'l' && valueType2 == 'l')
         {
-            if (valueType1=='l' && valueType2=='l')
-            {
-                opMulInt (code);
-            }
-            else
-            {
-                if (valueType1=='l')
-                    opIntToFloat1 (code);
+            opMulInt(code);
+        }
+        else
+        {
+            if (valueType1 == 'l')
+                opIntToFloat1(code);
 
-                if (valueType2=='l')
-                    opIntToFloat (code);
+            if (valueType2 == 'l')
+                opIntToFloat(code);
 
-                opMulFloat (code);
-            }
+            opMulFloat(code);
         }
+    }
 
-        void div (CodeContainer& code, char valueType1, char valueType2)
+    void div(CodeContainer& code, char valueType1, char valueType2)
+    {
+        if (valueType1 == 'l' && valueType2 == 'l')
         {
-            if (valueType1=='l' && valueType2=='l')
-            {
-                opDivInt (code);
-            }
-            else
-            {
-                if (valueType1=='l')
-                    opIntToFloat1 (code);
+            opDivInt(code);
+        }
+        else
+        {
+            if (valueType1 == 'l')
+                opIntToFloat1(code);
 
-                if (valueType2=='l')
-                    opIntToFloat (code);
+            if (valueType2 == 'l')
+                opIntToFloat(code);
 
-                opDivFloat (code);
-            }
+            opDivFloat(code);
         }
+    }
 
-        void convert (CodeContainer& code, char fromType, char toType)
+    void convert(CodeContainer& code, char fromType, char toType)
+    {
+        if (fromType != toType)
         {
-            if (fromType!=toType)
-            {
-                if (fromType=='f' && toType=='l')
-                    opFloatToInt (code);
-                else if (fromType=='l' && toType=='f')
-                    opIntToFloat (code);
-                else
-                    throw std::logic_error ("illegal type conversion");
-            }
+            if (fromType == 'f' && toType == 'l')
+                opFloatToInt(code);
+            else if (fromType == 'l' && toType == 'f')
+                opIntToFloat(code);
+            else
+                throw std::logic_error("illegal type conversion");
         }
+    }
 
-        void exit (CodeContainer& code)
-        {
-            opReturn (code);
-        }
+    void exit(CodeContainer& code)
+    {
+        opReturn(code);
+    }
 
-        void message (CodeContainer& code, Literals& literals, const std::string& message,
-            int buttons)
-        {
-            assert (buttons>=0);
+    void message(CodeContainer& code, Literals& literals, const std::string& message, int buttons)
+    {
+        assert(buttons >= 0);
 
-            if (buttons>=256)
-                throw std::runtime_error ("A message box can't have more than 255 buttons");
+        if (buttons >= 256)
+            throw std::runtime_error("A message box can't have more than 255 buttons");
 
-            int index = literals.addString (message);
+        int index = literals.addString(message);
 
-            opPushInt (code, index);
-            opMessageBox (code, buttons);
-        }
+        opPushInt(code, index);
+        opMessageBox(code, buttons);
+    }
 
-        void report (CodeContainer& code, Literals& literals, const std::string& message)
-        {
-            int index = literals.addString (message);
+    void report(CodeContainer& code, Literals& literals, const std::string& message)
+    {
+        int index = literals.addString(message);
 
-            opPushInt (code, index);
-            opReport (code);
-        }
+        opPushInt(code, index);
+        opReport(code);
+    }
+
+    void fetchLocal(CodeContainer& code, char localType, int localIndex)
+    {
+        opPushInt(code, localIndex);
 
-        void fetchLocal (CodeContainer& code, char localType, int localIndex)
+        switch (localType)
         {
-            opPushInt (code, localIndex);
+            case 'f':
 
-            switch (localType)
-            {
-                case 'f':
+                opFetchLocalFloat(code);
+                break;
 
-                    opFetchLocalFloat (code);
-                    break;
+            case 's':
 
-                case 's':
+                opFetchLocalShort(code);
+                break;
 
-                    opFetchLocalShort (code);
-                    break;
-
-                case 'l':
+            case 'l':
 
-                    opFetchLocalLong (code);
-                    break;
+                opFetchLocalLong(code);
+                break;
 
-                default:
+            default:
 
-                    assert (0);
-            }
+                assert(0);
         }
+    }
 
-        void jump (CodeContainer& code, int offset)
-        {
-            if (offset>0)
-                opJumpForward (code, offset);
-            else if (offset<0)
-                opJumpBackward (code, -offset);
-            else
-                throw std::logic_error ("infinite loop");
-        }
+    void jump(CodeContainer& code, int offset)
+    {
+        if (offset > 0)
+            opJumpForward(code, offset);
+        else if (offset < 0)
+            opJumpBackward(code, -offset);
+        else
+            throw std::logic_error("infinite loop");
+    }
 
-        void jumpOnZero (CodeContainer& code, int offset)
-        {
-            opSkipOnNonZero (code);
+    void jumpOnZero(CodeContainer& code, int offset)
+    {
+        opSkipOnNonZero(code);
 
-            if (offset<0)
-                --offset; // compensate for skip instruction
+        if (offset < 0)
+            --offset; // compensate for skip instruction
 
-            jump (code, offset);
-        }
+        jump(code, offset);
+    }
 
-        void compare (CodeContainer& code, char op, char valueType1, char valueType2)
+    void compare(CodeContainer& code, char op, char valueType1, char valueType2)
+    {
+        if (valueType1 == 'l' && valueType2 == 'l')
         {
-            if (valueType1=='l' && valueType2=='l')
+            switch (op)
             {
-                switch (op)
-                {
-                    case 'e': opEqualInt (code); break;
-                    case 'n': opNonEqualInt (code); break;
-                    case 'l': opLessThanInt (code); break;
-                    case 'L': opLessOrEqualInt (code); break;
-                    case 'g': opGreaterThanInt (code); break;
-                    case 'G': opGreaterOrEqualInt (code); break;
-
-                    default:
-
-                        assert (0);
-                }
+                case 'e':
+                    opEqualInt(code);
+                    break;
+                case 'n':
+                    opNonEqualInt(code);
+                    break;
+                case 'l':
+                    opLessThanInt(code);
+                    break;
+                case 'L':
+                    opLessOrEqualInt(code);
+                    break;
+                case 'g':
+                    opGreaterThanInt(code);
+                    break;
+                case 'G':
+                    opGreaterOrEqualInt(code);
+                    break;
+
+                default:
+
+                    assert(0);
             }
-            else
-            {
-                if (valueType1=='l')
-                    opIntToFloat1 (code);
+        }
+        else
+        {
+            if (valueType1 == 'l')
+                opIntToFloat1(code);
 
-                if (valueType2=='l')
-                    opIntToFloat (code);
+            if (valueType2 == 'l')
+                opIntToFloat(code);
 
-                switch (op)
-                {
-                    case 'e': opEqualFloat (code); break;
-                    case 'n': opNonEqualFloat (code); break;
-                    case 'l': opLessThanFloat (code); break;
-                    case 'L': opLessOrEqualFloat (code); break;
-                    case 'g': opGreaterThanFloat (code); break;
-                    case 'G': opGreaterOrEqualFloat (code); break;
+            switch (op)
+            {
+                case 'e':
+                    opEqualFloat(code);
+                    break;
+                case 'n':
+                    opNonEqualFloat(code);
+                    break;
+                case 'l':
+                    opLessThanFloat(code);
+                    break;
+                case 'L':
+                    opLessOrEqualFloat(code);
+                    break;
+                case 'g':
+                    opGreaterThanFloat(code);
+                    break;
+                case 'G':
+                    opGreaterOrEqualFloat(code);
+                    break;
 
-                    default:
+                default:
 
-                        assert (0);
-                }
+                    assert(0);
             }
         }
+    }
 
-        void assignToGlobal (CodeContainer& code, Literals& literals, char localType,
-            const std::string& name, const CodeContainer& value, char valueType)
-        {
-            int index = literals.addString (name);
+    void assignToGlobal(CodeContainer& code, Literals& literals, char localType, const std::string& name,
+        const CodeContainer& value, char valueType)
+    {
+        int index = literals.addString(name);
 
-            opPushInt (code, index);
+        opPushInt(code, index);
 
-            std::copy (value.begin(), value.end(), std::back_inserter (code));
+        std::copy(value.begin(), value.end(), std::back_inserter(code));
 
-            if (localType!=valueType)
+        if (localType != valueType)
+        {
+            if (localType == 'f' && (valueType == 'l' || valueType == 's'))
             {
-                if (localType=='f' && (valueType=='l' || valueType=='s'))
-                {
-                    opIntToFloat (code);
-                }
-                else if ((localType=='l' || localType=='s') && valueType=='f')
-                {
-                    opFloatToInt (code);
-                }
+                opIntToFloat(code);
             }
-
-            switch (localType)
+            else if ((localType == 'l' || localType == 's') && valueType == 'f')
             {
-                case 'f':
+                opFloatToInt(code);
+            }
+        }
 
-                    opStoreGlobalFloat (code);
-                    break;
+        switch (localType)
+        {
+            case 'f':
 
-                case 's':
+                opStoreGlobalFloat(code);
+                break;
 
-                    opStoreGlobalShort (code);
-                    break;
+            case 's':
 
-                case 'l':
+                opStoreGlobalShort(code);
+                break;
 
-                    opStoreGlobalLong (code);
-                    break;
+            case 'l':
 
-                default:
+                opStoreGlobalLong(code);
+                break;
 
-                    assert (0);
-            }
+            default:
+
+                assert(0);
         }
+    }
 
-        void fetchGlobal (CodeContainer& code, Literals& literals, char localType,
-            const std::string& name)
-        {
-            int index = literals.addString (name);
+    void fetchGlobal(CodeContainer& code, Literals& literals, char localType, const std::string& name)
+    {
+        int index = literals.addString(name);
 
-            opPushInt (code, index);
+        opPushInt(code, index);
 
-            switch (localType)
-            {
-                case 'f':
+        switch (localType)
+        {
+            case 'f':
 
-                    opFetchGlobalFloat (code);
-                    break;
+                opFetchGlobalFloat(code);
+                break;
 
-                case 's':
+            case 's':
 
-                    opFetchGlobalShort (code);
-                    break;
+                opFetchGlobalShort(code);
+                break;
 
-                case 'l':
+            case 'l':
 
-                    opFetchGlobalLong (code);
-                    break;
+                opFetchGlobalLong(code);
+                break;
 
-                default:
+            default:
 
-                    assert (0);
-            }
+                assert(0);
         }
+    }
 
-        void assignToMember (CodeContainer& code, Literals& literals, char localType,
-            const std::string& name, const std::string& id, const CodeContainer& value,
-            char valueType, bool global)
-        {
-            int index = literals.addString (name);
+    void assignToMember(CodeContainer& code, Literals& literals, char localType, const std::string& name,
+        const std::string& id, const CodeContainer& value, char valueType, bool global)
+    {
+        int index = literals.addString(name);
 
-            opPushInt (code, index);
+        opPushInt(code, index);
 
-            index = literals.addString (id);
+        index = literals.addString(id);
 
-            opPushInt (code, index);
+        opPushInt(code, index);
 
-            std::copy (value.begin(), value.end(), std::back_inserter (code));
+        std::copy(value.begin(), value.end(), std::back_inserter(code));
 
-            if (localType!=valueType)
+        if (localType != valueType)
+        {
+            if (localType == 'f' && (valueType == 'l' || valueType == 's'))
             {
-                if (localType=='f' && (valueType=='l' || valueType=='s'))
-                {
-                    opIntToFloat (code);
-                }
-                else if ((localType=='l' || localType=='s') && valueType=='f')
-                {
-                    opFloatToInt (code);
-                }
+                opIntToFloat(code);
             }
-
-            switch (localType)
+            else if ((localType == 'l' || localType == 's') && valueType == 'f')
             {
-                case 'f':
+                opFloatToInt(code);
+            }
+        }
 
-                    opStoreMemberFloat (code, global);
-                    break;
+        switch (localType)
+        {
+            case 'f':
 
-                case 's':
+                opStoreMemberFloat(code, global);
+                break;
 
-                    opStoreMemberShort (code, global);
-                    break;
+            case 's':
 
-                case 'l':
+                opStoreMemberShort(code, global);
+                break;
 
-                    opStoreMemberLong (code, global);
-                    break;
+            case 'l':
 
-                default:
+                opStoreMemberLong(code, global);
+                break;
 
-                    assert (0);
-            }
+            default:
+
+                assert(0);
         }
+    }
 
-        void fetchMember (CodeContainer& code, Literals& literals, char localType,
-            const std::string& name, const std::string& id, bool global)
-        {
-            int index = literals.addString (name);
+    void fetchMember(CodeContainer& code, Literals& literals, char localType, const std::string& name,
+        const std::string& id, bool global)
+    {
+        int index = literals.addString(name);
 
-            opPushInt (code, index);
+        opPushInt(code, index);
 
-            index = literals.addString (id);
+        index = literals.addString(id);
 
-            opPushInt (code, index);
+        opPushInt(code, index);
 
-            switch (localType)
-            {
-                case 'f':
+        switch (localType)
+        {
+            case 'f':
 
-                    opFetchMemberFloat (code, global);
-                    break;
+                opFetchMemberFloat(code, global);
+                break;
 
-                case 's':
+            case 's':
 
-                    opFetchMemberShort (code, global);
-                    break;
+                opFetchMemberShort(code, global);
+                break;
 
-                case 'l':
+            case 'l':
 
-                    opFetchMemberLong (code, global);
-                    break;
+                opFetchMemberLong(code, global);
+                break;
 
-                default:
+            default:
 
-                    assert (0);
-            }
+                assert(0);
         }
     }
+}
diff --git a/components/compiler/generator.hpp b/components/compiler/generator.hpp
index 00c6e56825..1444f9977e 100644
--- a/components/compiler/generator.hpp
+++ b/components/compiler/generator.hpp
@@ -1,9 +1,9 @@
 #ifndef COMPILER_GENERATOR_H_INCLUDED
 #define COMPILER_GENERATOR_H_INCLUDED
 
-#include <vector>
-#include <string>
 #include <cassert>
+#include <string>
+#include <vector>
 
 #include <components/interpreter/types.hpp>
 
@@ -15,92 +15,88 @@ namespace Compiler
     {
         typedef std::vector<Interpreter::Type_Code> CodeContainer;
 
-        inline Interpreter::Type_Code segment0 (unsigned int c, unsigned int arg0)
+        inline Interpreter::Type_Code segment0(unsigned int c, unsigned int arg0)
         {
-            assert (c<64);
-            return (c<<24) | (arg0 & 0xffffff);
+            assert(c < 64);
+            return (c << 24) | (arg0 & 0xffffff);
         }
 
-        inline Interpreter::Type_Code segment1 (unsigned int c, unsigned int arg0,
-            unsigned int arg1)
+        inline Interpreter::Type_Code segment1(unsigned int c, unsigned int arg0, unsigned int arg1)
         {
-            assert (c<64);
-            return 0x40000000 | (c<<24) | ((arg0 & 0xfff)<<12) | (arg1 & 0xfff);
+            assert(c < 64);
+            return 0x40000000 | (c << 24) | ((arg0 & 0xfff) << 12) | (arg1 & 0xfff);
         }
 
-        inline Interpreter::Type_Code segment2 (unsigned int c, unsigned int arg0)
+        inline Interpreter::Type_Code segment2(unsigned int c, unsigned int arg0)
         {
-            assert (c<1024);
-            return 0x80000000 | (c<<20) | (arg0 & 0xfffff);
+            assert(c < 1024);
+            return 0x80000000 | (c << 20) | (arg0 & 0xfffff);
         }
 
-        inline Interpreter::Type_Code segment3 (unsigned int c, unsigned int arg0)
+        inline Interpreter::Type_Code segment3(unsigned int c, unsigned int arg0)
         {
-            assert (c<262144);
-            return 0xc0000000 | (c<<8) | (arg0 & 0xff);
+            assert(c < 262144);
+            return 0xc0000000 | (c << 8) | (arg0 & 0xff);
         }
 
-        inline Interpreter::Type_Code segment4 (unsigned int c, unsigned int arg0,
-            unsigned int arg1)
+        inline Interpreter::Type_Code segment4(unsigned int c, unsigned int arg0, unsigned int arg1)
         {
-            assert (c<1024);
-            return 0xc4000000 | (c<<16) | ((arg0 & 0xff)<<8) | (arg1 & 0xff);
+            assert(c < 1024);
+            return 0xc4000000 | (c << 16) | ((arg0 & 0xff) << 8) | (arg1 & 0xff);
         }
 
-        inline Interpreter::Type_Code segment5 (unsigned int c)
+        inline Interpreter::Type_Code segment5(unsigned int c)
         {
-            assert (c<67108864);
+            assert(c < 67108864);
             return 0xc8000000 | c;
         }
 
-        void pushInt (CodeContainer& code, Literals& literals, int value);
+        void pushInt(CodeContainer& code, Literals& literals, int value);
 
-        void pushFloat (CodeContainer& code, Literals& literals, float value);
+        void pushFloat(CodeContainer& code, Literals& literals, float value);
 
-        void pushString (CodeContainer& code, Literals& literals, const std::string& value);
+        void pushString(CodeContainer& code, Literals& literals, const std::string& value);
 
-        void assignToLocal (CodeContainer& code, char localType,
-            int localIndex, const CodeContainer& value, char valueType);
+        void assignToLocal(
+            CodeContainer& code, char localType, int localIndex, const CodeContainer& value, char valueType);
 
-        void negate (CodeContainer& code, char valueType);
+        void negate(CodeContainer& code, char valueType);
 
-        void add (CodeContainer& code, char valueType1, char valueType2);
+        void add(CodeContainer& code, char valueType1, char valueType2);
 
-        void sub (CodeContainer& code, char valueType1, char valueType2);
+        void sub(CodeContainer& code, char valueType1, char valueType2);
 
-        void mul (CodeContainer& code, char valueType1, char valueType2);
+        void mul(CodeContainer& code, char valueType1, char valueType2);
 
-        void div (CodeContainer& code, char valueType1, char valueType2);
+        void div(CodeContainer& code, char valueType1, char valueType2);
 
-        void convert (CodeContainer& code, char fromType, char toType);
+        void convert(CodeContainer& code, char fromType, char toType);
 
-        void exit (CodeContainer& code);
+        void exit(CodeContainer& code);
 
-        void message (CodeContainer& code, Literals& literals, const std::string& message,
-            int buttons);
+        void message(CodeContainer& code, Literals& literals, const std::string& message, int buttons);
 
-        void report (CodeContainer& code, Literals& literals, const std::string& message);
+        void report(CodeContainer& code, Literals& literals, const std::string& message);
 
-        void fetchLocal (CodeContainer& code, char localType, int localIndex);
+        void fetchLocal(CodeContainer& code, char localType, int localIndex);
 
-        void jump (CodeContainer& code, int offset);
+        void jump(CodeContainer& code, int offset);
 
-        void jumpOnZero (CodeContainer& code, int offset);
+        void jumpOnZero(CodeContainer& code, int offset);
 
-        void compare (CodeContainer& code, char op, char valueType1, char valueType2);
+        void compare(CodeContainer& code, char op, char valueType1, char valueType2);
 
-        void assignToGlobal (CodeContainer& code, Literals& literals, char localType,
-            const std::string& name, const CodeContainer& value, char valueType);
+        void assignToGlobal(CodeContainer& code, Literals& literals, char localType, const std::string& name,
+            const CodeContainer& value, char valueType);
 
-        void fetchGlobal (CodeContainer& code, Literals& literals, char localType,
-            const std::string& name);
+        void fetchGlobal(CodeContainer& code, Literals& literals, char localType, const std::string& name);
 
-        void assignToMember (CodeContainer& code, Literals& literals, char memberType,
-            const std::string& name, const std::string& id, const CodeContainer& value, char valueType, bool global);
+        void assignToMember(CodeContainer& code, Literals& literals, char memberType, const std::string& name,
+            const std::string& id, const CodeContainer& value, char valueType, bool global);
         ///< \param global Member of a global script instead of a script of a reference.
 
-        void fetchMember (CodeContainer& code, Literals& literals, char memberType,
-            const std::string& name, const std::string& id, bool global);
+        void fetchMember(CodeContainer& code, Literals& literals, char memberType, const std::string& name,
+            const std::string& id, bool global);
         ///< \param global Member of a global script instead of a script of a reference.
     }
 }
diff --git a/components/compiler/junkparser.cpp b/components/compiler/junkparser.cpp
index 5df5515355..0902bea42c 100644
--- a/components/compiler/junkparser.cpp
+++ b/components/compiler/junkparser.cpp
@@ -2,46 +2,46 @@
 
 #include "scanner.hpp"
 
-Compiler::JunkParser::JunkParser (ErrorHandler& errorHandler, const Context& context,
-    int ignoreKeyword)
-: Parser (errorHandler, context), mIgnoreKeyword (ignoreKeyword)
-{}
+Compiler::JunkParser::JunkParser(ErrorHandler& errorHandler, const Context& context, int ignoreKeyword)
+    : Parser(errorHandler, context)
+    , mIgnoreKeyword(ignoreKeyword)
+{
+}
 
-bool Compiler::JunkParser::parseInt (int value, const TokenLoc& loc, Scanner& scanner)
+bool Compiler::JunkParser::parseInt(int value, const TokenLoc& loc, Scanner& scanner)
 {
-    scanner.putbackInt (value, loc);
+    scanner.putbackInt(value, loc);
     return false;
 }
 
-bool Compiler::JunkParser::parseFloat (float value, const TokenLoc& loc, Scanner& scanner)
+bool Compiler::JunkParser::parseFloat(float value, const TokenLoc& loc, Scanner& scanner)
 {
-    scanner.putbackFloat (value, loc);
+    scanner.putbackFloat(value, loc);
     return false;
 }
 
-bool Compiler::JunkParser::parseName (const std::string& name, const TokenLoc& loc,
-    Scanner& scanner)
+bool Compiler::JunkParser::parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner)
 {
-    scanner.putbackName (name, loc);
+    scanner.putbackName(name, loc);
     return false;
 }
 
-bool Compiler::JunkParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
+bool Compiler::JunkParser::parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner)
 {
-    if (keyword==mIgnoreKeyword)
-        reportWarning ("Ignoring found junk", loc);
+    if (keyword == mIgnoreKeyword)
+        reportWarning("Ignoring found junk", loc);
     else
-        scanner.putbackKeyword (keyword, loc);
+        scanner.putbackKeyword(keyword, loc);
 
     return false;
 }
 
-bool Compiler::JunkParser::parseSpecial (int code, const TokenLoc& loc, Scanner& scanner)
+bool Compiler::JunkParser::parseSpecial(int code, const TokenLoc& loc, Scanner& scanner)
 {
-    if (code==Scanner::S_member)
-        reportWarning ("Ignoring found junk", loc);
+    if (code == Scanner::S_member)
+        reportWarning("Ignoring found junk", loc);
     else
-        scanner.putbackSpecial (code, loc);
+        scanner.putbackSpecial(code, loc);
 
     return false;
 }
diff --git a/components/compiler/junkparser.hpp b/components/compiler/junkparser.hpp
index 0b42d4693a..0173120498 100644
--- a/components/compiler/junkparser.hpp
+++ b/components/compiler/junkparser.hpp
@@ -8,33 +8,30 @@ namespace Compiler
     /// \brief Parse an optional single junk token
     class JunkParser : public Parser
     {
-            int mIgnoreKeyword;
+        int mIgnoreKeyword;
 
-        public:
+    public:
+        JunkParser(ErrorHandler& errorHandler, const Context& context, int ignoreKeyword = -1);
 
-            JunkParser (ErrorHandler& errorHandler, const Context& context,
-                int ignoreKeyword = -1);
+        bool parseInt(int value, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle an int token.
+        /// \return fetch another token?
 
-            bool parseInt (int value, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle an int token.
-            /// \return fetch another token?
+        bool parseFloat(float value, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a float token.
+        /// \return fetch another token?
 
-            bool parseFloat (float value, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a float token.
-            /// \return fetch another token?
+        bool parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a name token.
+        /// \return fetch another token?
 
-            bool parseName (const std::string& name, const TokenLoc& loc,
-                Scanner& scanner) override;
-            ///< Handle a name token.
-            /// \return fetch another token?
+        bool parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a keyword token.
+        /// \return fetch another token?
 
-            bool parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a keyword token.
-            /// \return fetch another token?
-
-            bool parseSpecial (int code, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a special character token.
-            /// \return fetch another token?
+        bool parseSpecial(int code, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a special character token.
+        /// \return fetch another token?
     };
 }
 
diff --git a/components/compiler/lineparser.cpp b/components/compiler/lineparser.cpp
index 405fdb3c2e..8a6074303c 100644
--- a/components/compiler/lineparser.cpp
+++ b/components/compiler/lineparser.cpp
@@ -4,66 +4,74 @@
 
 #include <components/misc/strings/lower.hpp>
 
-#include "scanner.hpp"
 #include "context.hpp"
+#include "declarationparser.hpp"
 #include "errorhandler.hpp"
-#include "skipparser.hpp"
-#include "locals.hpp"
-#include "generator.hpp"
 #include "extensions.hpp"
-#include "declarationparser.hpp"
+#include "generator.hpp"
+#include "locals.hpp"
+#include "scanner.hpp"
+#include "skipparser.hpp"
 
 namespace Compiler
 {
-    void LineParser::parseExpression (Scanner& scanner, const TokenLoc& loc)
+    void LineParser::parseExpression(Scanner& scanner, const TokenLoc& loc)
     {
         mExprParser.reset();
 
         if (!mExplicit.empty())
         {
-            mExprParser.parseName (mExplicit, loc, scanner);
-            if (mState==MemberState)
-                mExprParser.parseSpecial (Scanner::S_member, loc, scanner);
+            mExprParser.parseName(mExplicit, loc, scanner);
+            if (mState == MemberState)
+                mExprParser.parseSpecial(Scanner::S_member, loc, scanner);
             else
-                mExprParser.parseSpecial (Scanner::S_ref, loc, scanner);
+                mExprParser.parseSpecial(Scanner::S_ref, loc, scanner);
         }
 
-        scanner.scan (mExprParser);
+        scanner.scan(mExprParser);
 
-        char type = mExprParser.append (mCode);
+        char type = mExprParser.append(mCode);
         mState = EndState;
 
         switch (type)
         {
             case 'l':
 
-                Generator::report (mCode, mLiterals, "%d");
+                Generator::report(mCode, mLiterals, "%d");
                 break;
 
             case 'f':
 
-                Generator::report (mCode, mLiterals, "%f");
+                Generator::report(mCode, mLiterals, "%f");
                 break;
 
             default:
 
-                throw std::runtime_error ("Unknown expression result type");
+                throw std::runtime_error("Unknown expression result type");
         }
     }
 
-    LineParser::LineParser (ErrorHandler& errorHandler, const Context& context, Locals& locals,
-        Literals& literals, std::vector<Interpreter::Type_Code>& code, bool allowExpression)
-    : Parser (errorHandler, context), mLocals (locals), mLiterals (literals), mCode (code),
-       mState (BeginState), mReferenceMember(false), mButtons(0), mType(0),
-       mExprParser (errorHandler, context, locals, literals), mAllowExpression (allowExpression)
-    {}
+    LineParser::LineParser(ErrorHandler& errorHandler, const Context& context, Locals& locals, Literals& literals,
+        std::vector<Interpreter::Type_Code>& code, bool allowExpression)
+        : Parser(errorHandler, context)
+        , mLocals(locals)
+        , mLiterals(literals)
+        , mCode(code)
+        , mState(BeginState)
+        , mReferenceMember(false)
+        , mButtons(0)
+        , mType(0)
+        , mExprParser(errorHandler, context, locals, literals)
+        , mAllowExpression(allowExpression)
+    {
+    }
 
-    bool LineParser::parseInt (int value, const TokenLoc& loc, Scanner& scanner)
+    bool LineParser::parseInt(int value, const TokenLoc& loc, Scanner& scanner)
     {
-        if (mAllowExpression && mState==BeginState)
+        if (mAllowExpression && mState == BeginState)
         {
-            scanner.putbackInt (value, loc);
-            parseExpression (scanner, loc);
+            scanner.putbackInt(value, loc);
+            parseExpression(scanner, loc);
             return true;
         }
         else if (mState == SetState)
@@ -72,40 +80,39 @@ namespace Compiler
             return parseName(loc.mLiteral, loc, scanner);
         }
 
-        return Parser::parseInt (value, loc, scanner);
+        return Parser::parseInt(value, loc, scanner);
     }
 
-    bool LineParser::parseFloat (float value, const TokenLoc& loc, Scanner& scanner)
+    bool LineParser::parseFloat(float value, const TokenLoc& loc, Scanner& scanner)
     {
-        if (mAllowExpression && mState==BeginState)
+        if (mAllowExpression && mState == BeginState)
         {
-            scanner.putbackFloat (value, loc);
-            parseExpression (scanner, loc);
+            scanner.putbackFloat(value, loc);
+            parseExpression(scanner, loc);
             return true;
         }
 
-        return Parser::parseFloat (value, loc, scanner);
+        return Parser::parseFloat(value, loc, scanner);
     }
 
-    bool LineParser::parseName (const std::string& name, const TokenLoc& loc,
-        Scanner& scanner)
+    bool LineParser::parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner)
     {
-        if (mState==SetState)
+        if (mState == SetState)
         {
-            std::string name2 = Misc::StringUtils::lowerCase (name);
+            std::string name2 = Misc::StringUtils::lowerCase(name);
             mName = name2;
 
             // local variable?
-            char type = mLocals.getType (name2);
-            if (type!=' ')
+            char type = mLocals.getType(name2);
+            if (type != ' ')
             {
                 mType = type;
                 mState = SetLocalVarState;
                 return true;
             }
 
-            type = getContext().getGlobalType (name2);
-            if (type!=' ')
+            type = getContext().getGlobalType(name2);
+            if (type != ' ')
             {
                 mType = type;
                 mState = SetGlobalVarState;
@@ -116,12 +123,12 @@ namespace Compiler
             return true;
         }
 
-        if (mState==SetMemberVarState)
+        if (mState == SetMemberVarState)
         {
-            mMemberName = Misc::StringUtils::lowerCase (name);
-            std::pair<char, bool> type = getContext().getMemberType (mMemberName, mName);
+            mMemberName = Misc::StringUtils::lowerCase(name);
+            std::pair<char, bool> type = getContext().getMemberType(mMemberName, mName);
 
-            if (type.first!=' ')
+            if (type.first != ' ')
             {
                 mState = SetMemberVarState2;
                 mType = type.first;
@@ -129,13 +136,13 @@ namespace Compiler
                 return true;
             }
 
-            getErrorHandler().error ("Unknown variable", loc);
-            SkipParser skip (getErrorHandler(), getContext());
-            scanner.scan (skip);
+            getErrorHandler().error("Unknown variable", loc);
+            SkipParser skip(getErrorHandler(), getContext());
+            scanner.scan(skip);
             return false;
         }
 
-        if (mState==MessageState)
+        if (mState == MessageState)
         {
             GetArgumentsFromMessageFormat processor;
             processor.process(name);
@@ -144,7 +151,7 @@ namespace Compiler
             if (!arguments.empty())
             {
                 mExprParser.reset();
-                mExprParser.parseArguments (arguments, scanner, mCode, -1, true);
+                mExprParser.parseArguments(arguments, scanner, mCode, -1, true);
             }
 
             mName = name;
@@ -154,72 +161,72 @@ namespace Compiler
             return true;
         }
 
-        if (mState==MessageButtonState)
+        if (mState == MessageButtonState)
         {
-            Generator::pushString (mCode, mLiterals, name);
+            Generator::pushString(mCode, mLiterals, name);
             mState = MessageButtonState;
             ++mButtons;
             return true;
         }
 
-        if (mState==BeginState && getContext().isId (name))
+        if (mState == BeginState && getContext().isId(name))
         {
             mState = PotentialExplicitState;
-            mExplicit = Misc::StringUtils::lowerCase (name);
+            mExplicit = Misc::StringUtils::lowerCase(name);
             return true;
         }
 
-        if (mState==BeginState && mAllowExpression)
+        if (mState == BeginState && mAllowExpression)
         {
-            std::string name2 = Misc::StringUtils::lowerCase (name);
+            std::string name2 = Misc::StringUtils::lowerCase(name);
 
-            char type = mLocals.getType (name2);
+            char type = mLocals.getType(name2);
 
-            if (type!=' ')
+            if (type != ' ')
             {
-                scanner.putbackName (name, loc);
-                parseExpression (scanner, loc);
+                scanner.putbackName(name, loc);
+                parseExpression(scanner, loc);
                 return true;
             }
 
-            type = getContext().getGlobalType (name2);
+            type = getContext().getGlobalType(name2);
 
-            if (type!=' ')
+            if (type != ' ')
             {
-                scanner.putbackName (name, loc);
-                parseExpression (scanner, loc);
+                scanner.putbackName(name, loc);
+                parseExpression(scanner, loc);
                 return true;
             }
         }
 
-        return Parser::parseName (name, loc, scanner);
+        return Parser::parseName(name, loc, scanner);
     }
 
-    bool LineParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
+    bool LineParser::parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner)
     {
-        if (mState==MessageState)
+        if (mState == MessageState)
         {
-            if (const Extensions *extensions = getContext().getExtensions())
+            if (const Extensions* extensions = getContext().getExtensions())
             {
                 std::string argumentType; // ignored
                 bool hasExplicit = false; // ignored
-                if (extensions->isInstruction (keyword, argumentType, hasExplicit))
+                if (extensions->isInstruction(keyword, argumentType, hasExplicit))
                 {
                     // pretend this is not a keyword
                     std::string name = loc.mLiteral;
-                    if (name.size()>=2 && name[0]=='"' && name[name.size()-1]=='"')
-                        name = name.substr (1, name.size()-2);
-                    return parseName (name, loc, scanner);
+                    if (name.size() >= 2 && name[0] == '"' && name[name.size() - 1] == '"')
+                        name = name.substr(1, name.size() - 2);
+                    return parseName(name, loc, scanner);
                 }
             }
         }
 
-        if (mState==SetMemberVarState)
+        if (mState == SetMemberVarState)
         {
             mMemberName = loc.mLiteral;
-            std::pair<char, bool> type = getContext().getMemberType (mMemberName, mName);
+            std::pair<char, bool> type = getContext().getMemberType(mMemberName, mName);
 
-            if (type.first!=' ')
+            if (type.first != ' ')
             {
                 mState = SetMemberVarState2;
                 mType = type.first;
@@ -228,73 +235,72 @@ namespace Compiler
             }
         }
 
-        if (mState==SetPotentialMemberVarState && keyword==Scanner::K_to)
+        if (mState == SetPotentialMemberVarState && keyword == Scanner::K_to)
         {
-            getErrorHandler().warning ("Unknown variable", loc);
-            SkipParser skip (getErrorHandler(), getContext());
-            scanner.scan (skip);
+            getErrorHandler().warning("Unknown variable", loc);
+            SkipParser skip(getErrorHandler(), getContext());
+            scanner.scan(skip);
             return false;
         }
 
-        if (mState==SetState)
+        if (mState == SetState)
         {
             // allow keywords to be used as variable names when assigning a value to a variable.
-            return parseName (loc.mLiteral, loc, scanner);
+            return parseName(loc.mLiteral, loc, scanner);
         }
 
-        if (mState==BeginState || mState==ExplicitState)
+        if (mState == BeginState || mState == ExplicitState)
         {
             // check for custom extensions
-            if (const Extensions *extensions = getContext().getExtensions())
+            if (const Extensions* extensions = getContext().getExtensions())
             {
                 std::string argumentType;
 
-                bool hasExplicit = mState==ExplicitState;
-                if (extensions->isInstruction (keyword, argumentType, hasExplicit))
+                bool hasExplicit = mState == ExplicitState;
+                if (extensions->isInstruction(keyword, argumentType, hasExplicit))
                 {
-                    if (!hasExplicit && mState==ExplicitState)
+                    if (!hasExplicit && mState == ExplicitState)
                     {
-                        getErrorHandler().warning ("Stray explicit reference", loc);
+                        getErrorHandler().warning("Stray explicit reference", loc);
                         mExplicit.clear();
                     }
 
                     std::vector<Interpreter::Type_Code> code;
-                    int optionals = mExprParser.parseArguments (argumentType, scanner, code, keyword);
-                    mCode.insert (mCode.end(), code.begin(), code.end());
-                    extensions->generateInstructionCode (keyword, mCode, mLiterals,
-                        mExplicit, optionals);
+                    int optionals = mExprParser.parseArguments(argumentType, scanner, code, keyword);
+                    mCode.insert(mCode.end(), code.begin(), code.end());
+                    extensions->generateInstructionCode(keyword, mCode, mLiterals, mExplicit, optionals);
 
                     mState = EndState;
                     return true;
                 }
             }
 
-            if (const Extensions *extensions = getContext().getExtensions())
+            if (const Extensions* extensions = getContext().getExtensions())
             {
                 char returnType;
                 std::string argumentType;
 
-                bool hasExplicit = mState==ExplicitState;
+                bool hasExplicit = mState == ExplicitState;
 
-                if (extensions->isFunction (keyword, returnType, argumentType, hasExplicit))
+                if (extensions->isFunction(keyword, returnType, argumentType, hasExplicit))
                 {
-                    if (!hasExplicit && mState==ExplicitState)
+                    if (!hasExplicit && mState == ExplicitState)
                     {
-                        getErrorHandler().warning ("Stray explicit reference", loc);
+                        getErrorHandler().warning("Stray explicit reference", loc);
                         mExplicit.clear();
                     }
 
                     if (mAllowExpression)
                     {
-                        scanner.putbackKeyword (keyword, loc);
-                        parseExpression (scanner, loc);
+                        scanner.putbackKeyword(keyword, loc);
+                        parseExpression(scanner, loc);
                     }
                     else
                     {
                         std::vector<Interpreter::Type_Code> code;
-                        int optionals = mExprParser.parseArguments (argumentType, scanner, code, keyword);
+                        int optionals = mExprParser.parseArguments(argumentType, scanner, code, keyword);
                         mCode.insert(mCode.end(), code.begin(), code.end());
-                        extensions->generateFunctionCode (keyword, mCode, mLiterals, mExplicit, optionals);
+                        extensions->generateFunctionCode(keyword, mCode, mLiterals, mExplicit, optionals);
                     }
                     mState = EndState;
                     return true;
@@ -302,15 +308,15 @@ namespace Compiler
             }
         }
 
-        if (mState==ExplicitState)
+        if (mState == ExplicitState)
         {
             // drop stray explicit reference
-            getErrorHandler().warning ("Stray explicit reference", loc);
+            getErrorHandler().warning("Stray explicit reference", loc);
             mState = BeginState;
             mExplicit.clear();
         }
 
-        if (mState==BeginState)
+        if (mState == BeginState)
         {
             switch (keyword)
             {
@@ -321,19 +327,21 @@ namespace Compiler
                     if (!getContext().canDeclareLocals())
                     {
                         getErrorHandler().error("Local variables cannot be declared in this context", loc);
-                        SkipParser skip (getErrorHandler(), getContext());
-                        scanner.scan (skip);
+                        SkipParser skip(getErrorHandler(), getContext());
+                        scanner.scan(skip);
                         return true;
                     }
 
-                    DeclarationParser declaration (getErrorHandler(), getContext(), mLocals);
-                    if (declaration.parseKeyword (keyword, loc, scanner))
-                        scanner.scan (declaration);
+                    DeclarationParser declaration(getErrorHandler(), getContext(), mLocals);
+                    if (declaration.parseKeyword(keyword, loc, scanner))
+                        scanner.scan(declaration);
 
                     return false;
                 }
 
-                case Scanner::K_set: mState = SetState; return true;
+                case Scanner::K_set:
+                    mState = SetState;
+                    return true;
 
                 case Scanner::K_messagebox:
 
@@ -343,129 +351,126 @@ namespace Compiler
 
                 case Scanner::K_return:
 
-                    Generator::exit (mCode);
+                    Generator::exit(mCode);
                     mState = EndState;
                     return true;
 
                 case Scanner::K_else:
 
-                    getErrorHandler().warning ("Stray else", loc);
+                    getErrorHandler().warning("Stray else", loc);
                     mState = EndState;
                     return true;
 
                 case Scanner::K_endif:
 
-                    getErrorHandler().warning ("Stray endif", loc);
+                    getErrorHandler().warning("Stray endif", loc);
                     mState = EndState;
                     return true;
 
                 case Scanner::K_begin:
 
-                    getErrorHandler().warning ("Stray begin", loc);
+                    getErrorHandler().warning("Stray begin", loc);
                     mState = EndState;
                     return true;
             }
         }
-        else if (mState==SetLocalVarState && keyword==Scanner::K_to)
+        else if (mState == SetLocalVarState && keyword == Scanner::K_to)
         {
             mExprParser.reset();
-            scanner.scan (mExprParser);
+            scanner.scan(mExprParser);
 
             std::vector<Interpreter::Type_Code> code;
-            char type = mExprParser.append (code);
+            char type = mExprParser.append(code);
 
-            Generator::assignToLocal (mCode, mLocals.getType (mName),
-                mLocals.getIndex (mName), code, type);
+            Generator::assignToLocal(mCode, mLocals.getType(mName), mLocals.getIndex(mName), code, type);
 
             mState = EndState;
             return true;
         }
-        else if (mState==SetGlobalVarState && keyword==Scanner::K_to)
+        else if (mState == SetGlobalVarState && keyword == Scanner::K_to)
         {
             mExprParser.reset();
-            scanner.scan (mExprParser);
+            scanner.scan(mExprParser);
 
             std::vector<Interpreter::Type_Code> code;
-            char type = mExprParser.append (code);
+            char type = mExprParser.append(code);
 
-            Generator::assignToGlobal (mCode, mLiterals, mType, mName, code, type);
+            Generator::assignToGlobal(mCode, mLiterals, mType, mName, code, type);
 
             mState = EndState;
             return true;
         }
-        else if (mState==SetMemberVarState2 && keyword==Scanner::K_to)
+        else if (mState == SetMemberVarState2 && keyword == Scanner::K_to)
         {
             mExprParser.reset();
-            scanner.scan (mExprParser);
+            scanner.scan(mExprParser);
 
             std::vector<Interpreter::Type_Code> code;
-            char type = mExprParser.append (code);
+            char type = mExprParser.append(code);
 
-            Generator::assignToMember (mCode, mLiterals, mType, mMemberName, mName, code, type,
-                !mReferenceMember);
+            Generator::assignToMember(mCode, mLiterals, mType, mMemberName, mName, code, type, !mReferenceMember);
 
             mState = EndState;
             return true;
         }
 
-        return Parser::parseKeyword (keyword, loc, scanner);
+        return Parser::parseKeyword(keyword, loc, scanner);
     }
 
-    bool LineParser::parseSpecial (int code, const TokenLoc& loc, Scanner& scanner)
+    bool LineParser::parseSpecial(int code, const TokenLoc& loc, Scanner& scanner)
     {
-        if (mState==EndState && code==Scanner::S_open)
+        if (mState == EndState && code == Scanner::S_open)
         {
-            getErrorHandler().warning ("Stray '[' or '(' at the end of the line",
-                loc);
+            getErrorHandler().warning("Stray '[' or '(' at the end of the line", loc);
             return true;
         }
 
-        if (code==Scanner::S_newline && (mState==EndState || mState==BeginState))
+        if (code == Scanner::S_newline && (mState == EndState || mState == BeginState))
             return false;
 
-        if (code==Scanner::S_ref && mState==SetPotentialMemberVarState)
+        if (code == Scanner::S_ref && mState == SetPotentialMemberVarState)
         {
-            getErrorHandler().warning ("Stray explicit reference", loc);
+            getErrorHandler().warning("Stray explicit reference", loc);
             mState = SetState;
             return true;
         }
 
-        if (code==Scanner::S_ref && mState==PotentialExplicitState)
+        if (code == Scanner::S_ref && mState == PotentialExplicitState)
         {
             mState = ExplicitState;
             return true;
         }
 
-        if (code==Scanner::S_member && mState==PotentialExplicitState && mAllowExpression)
+        if (code == Scanner::S_member && mState == PotentialExplicitState && mAllowExpression)
         {
             mState = MemberState;
-            parseExpression (scanner, loc);
+            parseExpression(scanner, loc);
             mState = EndState;
             return true;
         }
 
-        if (code==Scanner::S_newline && mState==MessageButtonState)
+        if (code == Scanner::S_newline && mState == MessageButtonState)
         {
-            Generator::message (mCode, mLiterals, mName, mButtons);
+            Generator::message(mCode, mLiterals, mName, mButtons);
             return false;
         }
 
-        if (code==Scanner::S_member && mState==SetPotentialMemberVarState)
+        if (code == Scanner::S_member && mState == SetPotentialMemberVarState)
         {
             mState = SetMemberVarState;
             return true;
         }
 
-        if (mAllowExpression && mState==BeginState &&
-            (code==Scanner::S_open || code==Scanner::S_minus || code==Scanner::S_plus))
+        if (mAllowExpression && mState == BeginState
+            && (code == Scanner::S_open || code == Scanner::S_minus || code == Scanner::S_plus))
         {
-            scanner.putbackSpecial (code, loc);
-            parseExpression (scanner, loc);
+            scanner.putbackSpecial(code, loc);
+            parseExpression(scanner, loc);
             mState = EndState;
             return true;
         }
 
-        return Parser::parseSpecial (code, loc, scanner);
+        return Parser::parseSpecial(code, loc, scanner);
     }
 
     void LineParser::reset()
@@ -475,7 +480,8 @@ namespace Compiler
         mExplicit.clear();
     }
 
-    void GetArgumentsFromMessageFormat::visitedPlaceholder(Placeholder placeholder, char /*padding*/, int /*width*/, int /*precision*/, Notation /*notation*/)
+    void GetArgumentsFromMessageFormat::visitedPlaceholder(
+        Placeholder placeholder, char /*padding*/, int /*width*/, int /*precision*/, Notation /*notation*/)
     {
         switch (placeholder)
         {
diff --git a/components/compiler/lineparser.hpp b/components/compiler/lineparser.hpp
index 2fd113478f..68b3198ff2 100644
--- a/components/compiler/lineparser.hpp
+++ b/components/compiler/lineparser.hpp
@@ -1,14 +1,14 @@
 #ifndef COMPILER_LINEPARSER_H_INCLUDED
 #define COMPILER_LINEPARSER_H_INCLUDED
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <components/interpreter/types.hpp>
 #include <components/misc/messageformatparser.hpp>
 
-#include "parser.hpp"
 #include "exprparser.hpp"
+#include "parser.hpp"
 
 namespace Compiler
 {
@@ -19,79 +19,85 @@ namespace Compiler
 
     class LineParser : public Parser
     {
-            enum State
-            {
-                BeginState,
-                SetState, SetLocalVarState, SetGlobalVarState, SetPotentialMemberVarState,
-                SetMemberVarState, SetMemberVarState2,
-                MessageState, MessageButtonState,
-                EndState, PotentialExplicitState, ExplicitState, MemberState
-            };
-
-            Locals& mLocals;
-            Literals& mLiterals;
-            std::vector<Interpreter::Type_Code>& mCode;
-            State mState;
-            std::string mName;
-            std::string mMemberName;
-            bool mReferenceMember;
-            int mButtons;
-            std::string mExplicit;
-            char mType;
-            ExprParser mExprParser;
-            bool mAllowExpression;
-
-            void parseExpression (Scanner& scanner, const TokenLoc& loc);
-
-        public:
-
-            LineParser (ErrorHandler& errorHandler, const Context& context, Locals& locals,
-                Literals& literals, std::vector<Interpreter::Type_Code>& code,
-                bool allowExpression = false);
-            ///< \param allowExpression Allow lines consisting of a naked expression
-            /// (result is send to the messagebox interface)
-
-            bool parseInt (int value, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle an int token.
-            /// \return fetch another token?
-
-            bool parseFloat (float value, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a float token.
-            /// \return fetch another token?
-
-            bool parseName (const std::string& name, const TokenLoc& loc,
-                Scanner& scanner) override;
-            ///< Handle a name token.
-            /// \return fetch another token?
-
-            bool parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a keyword token.
-            /// \return fetch another token?
-
-            bool parseSpecial (int code, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a special character token.
-            /// \return fetch another token?
-
-            void reset() override;
-            ///< Reset parser to clean state.
+        enum State
+        {
+            BeginState,
+            SetState,
+            SetLocalVarState,
+            SetGlobalVarState,
+            SetPotentialMemberVarState,
+            SetMemberVarState,
+            SetMemberVarState2,
+            MessageState,
+            MessageButtonState,
+            EndState,
+            PotentialExplicitState,
+            ExplicitState,
+            MemberState
+        };
+
+        Locals& mLocals;
+        Literals& mLiterals;
+        std::vector<Interpreter::Type_Code>& mCode;
+        State mState;
+        std::string mName;
+        std::string mMemberName;
+        bool mReferenceMember;
+        int mButtons;
+        std::string mExplicit;
+        char mType;
+        ExprParser mExprParser;
+        bool mAllowExpression;
+
+        void parseExpression(Scanner& scanner, const TokenLoc& loc);
+
+    public:
+        LineParser(ErrorHandler& errorHandler, const Context& context, Locals& locals, Literals& literals,
+            std::vector<Interpreter::Type_Code>& code, bool allowExpression = false);
+        ///< \param allowExpression Allow lines consisting of a naked expression
+        /// (result is send to the messagebox interface)
+
+        bool parseInt(int value, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle an int token.
+        /// \return fetch another token?
+
+        bool parseFloat(float value, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a float token.
+        /// \return fetch another token?
+
+        bool parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a name token.
+        /// \return fetch another token?
+
+        bool parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a keyword token.
+        /// \return fetch another token?
+
+        bool parseSpecial(int code, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a special character token.
+        /// \return fetch another token?
+
+        void reset() override;
+        ///< Reset parser to clean state.
     };
 
     class GetArgumentsFromMessageFormat : public ::Misc::MessageFormatParser
     {
-        private:
-            std::string mArguments;
-
-        protected:
-            void visitedPlaceholder(Placeholder placeholder, char padding, int width, int precision, Notation notation) override;
-            void visitedCharacter(char c) override {}
-
-        public:
-            void process(std::string_view message) override
-            {
-                mArguments.clear();
-                ::Misc::MessageFormatParser::process(message);
-            }
-            std::string getArguments() const { return mArguments; }
+    private:
+        std::string mArguments;
+
+    protected:
+        void visitedPlaceholder(
+            Placeholder placeholder, char padding, int width, int precision, Notation notation) override;
+        void visitedCharacter(char c) override {}
+
+    public:
+        void process(std::string_view message) override
+        {
+            mArguments.clear();
+            ::Misc::MessageFormatParser::process(message);
+        }
+        std::string getArguments() const { return mArguments; }
     };
 }
 
diff --git a/components/compiler/literals.cpp b/components/compiler/literals.cpp
index a40ff2a02a..8bcb5bdd57 100644
--- a/components/compiler/literals.cpp
+++ b/components/compiler/literals.cpp
@@ -6,77 +6,75 @@ namespace Compiler
 {
     int Literals::getIntegerSize() const
     {
-        return static_cast<int>(mIntegers.size() * sizeof (Interpreter::Type_Integer));
+        return static_cast<int>(mIntegers.size() * sizeof(Interpreter::Type_Integer));
     }
 
     int Literals::getFloatSize() const
     {
-        return static_cast<int>(mFloats.size() * sizeof (Interpreter::Type_Float));
+        return static_cast<int>(mFloats.size() * sizeof(Interpreter::Type_Float));
     }
 
     int Literals::getStringSize() const
     {
         int size = 0;
-        
-        for (std::vector<std::string>::const_iterator iter (mStrings.begin());
-            iter!=mStrings.end(); ++iter)
-            size += static_cast<int> (iter->size()) + 1;
-            
+
+        for (std::vector<std::string>::const_iterator iter(mStrings.begin()); iter != mStrings.end(); ++iter)
+            size += static_cast<int>(iter->size()) + 1;
+
         if (size % 4) // padding
             size += 4 - size % 4;
-            
+
         return size;
     }
 
-    void Literals::append (std::vector<Interpreter::Type_Code>& code) const
+    void Literals::append(std::vector<Interpreter::Type_Code>& code) const
     {
-        for (const int & mInteger : mIntegers)
-            code.push_back (*reinterpret_cast<const Interpreter::Type_Code *> (&mInteger));
-            
-        for (const float & mFloat : mFloats)
-            code.push_back (*reinterpret_cast<const Interpreter::Type_Code *> (&mFloat));
-            
+        for (const int& mInteger : mIntegers)
+            code.push_back(*reinterpret_cast<const Interpreter::Type_Code*>(&mInteger));
+
+        for (const float& mFloat : mFloats)
+            code.push_back(*reinterpret_cast<const Interpreter::Type_Code*>(&mFloat));
+
         int stringBlockSize = getStringSize();
-        int size = static_cast<int> (code.size());
-        
-        code.resize (size+stringBlockSize/4);
-        
+        int size = static_cast<int>(code.size());
+
+        code.resize(size + stringBlockSize / 4);
+
         size_t offset = 0;
-        
-        for (const auto & mString : mStrings)
+
+        for (const auto& mString : mStrings)
         {
-            size_t stringSize = mString.size()+1;
-            
-            std::copy (mString.c_str(), mString.c_str()+stringSize,
-                reinterpret_cast<char *> (&code[size]) + offset);
+            size_t stringSize = mString.size() + 1;
+
+            std::copy(mString.c_str(), mString.c_str() + stringSize, reinterpret_cast<char*>(&code[size]) + offset);
             offset += stringSize;
         }
     }
 
-    int Literals::addInteger (Interpreter::Type_Integer value)
+    int Literals::addInteger(Interpreter::Type_Integer value)
     {
-        int index = static_cast<int> (mIntegers.size());
-        
-        mIntegers.push_back (value);
-        
-        return index;    
+        int index = static_cast<int>(mIntegers.size());
+
+        mIntegers.push_back(value);
+
+        return index;
     }
 
-    int Literals::addFloat (Interpreter::Type_Float value)
+    int Literals::addFloat(Interpreter::Type_Float value)
     {
-        int index = static_cast<int> (mFloats.size());
-        
-        mFloats.push_back (value);
-        
-        return index;    
+        int index = static_cast<int>(mFloats.size());
+
+        mFloats.push_back(value);
+
+        return index;
     }
 
-    int Literals::addString (const std::string& value)
+    int Literals::addString(const std::string& value)
     {
-        int index = static_cast<int> (mStrings.size());
-        
-        mStrings.push_back (value);
-        
+        int index = static_cast<int>(mStrings.size());
+
+        mStrings.push_back(value);
+
         return index;
     }
 
@@ -87,4 +85,3 @@ namespace Compiler
         mStrings.clear();
     }
 }
-
diff --git a/components/compiler/literals.hpp b/components/compiler/literals.hpp
index b18c864791..1dd7761d0d 100644
--- a/components/compiler/literals.hpp
+++ b/components/compiler/literals.hpp
@@ -9,41 +9,39 @@
 namespace Compiler
 {
     /// \brief Literal values.
-    
+
     class Literals
     {
-            std::vector<Interpreter::Type_Integer> mIntegers;
-            std::vector<Interpreter::Type_Float> mFloats;
-            std::vector<std::string> mStrings;
-    
-        public:
-        
-            int getIntegerSize() const;
-            ///< Return size of integer block (in bytes).
-
-            int getFloatSize() const;
-            ///< Return size of float block (in bytes).
-        
-            int getStringSize() const;
-            ///< Return size of string block (in bytes).
-        
-            void append (std::vector<Interpreter::Type_Code>& code) const;
-            ///< Apepnd literal blocks to code.
-            /// \note code blocks will be padded for 32-bit alignment.
-        
-            int addInteger (Interpreter::Type_Integer value);
-            ///< add integer liternal and return index.
-            
-            int addFloat (Interpreter::Type_Float value);
-            ///< add float literal and return value.
-            
-            int addString (const std::string& value);
-            ///< add string literal and return value.
-        
-            void clear();
-            ///< remove all literals.
+        std::vector<Interpreter::Type_Integer> mIntegers;
+        std::vector<Interpreter::Type_Float> mFloats;
+        std::vector<std::string> mStrings;
+
+    public:
+        int getIntegerSize() const;
+        ///< Return size of integer block (in bytes).
+
+        int getFloatSize() const;
+        ///< Return size of float block (in bytes).
+
+        int getStringSize() const;
+        ///< Return size of string block (in bytes).
+
+        void append(std::vector<Interpreter::Type_Code>& code) const;
+        ///< Apepnd literal blocks to code.
+        /// \note code blocks will be padded for 32-bit alignment.
+
+        int addInteger(Interpreter::Type_Integer value);
+        ///< add integer liternal and return index.
+
+        int addFloat(Interpreter::Type_Float value);
+        ///< add float literal and return value.
+
+        int addString(const std::string& value);
+        ///< add string literal and return value.
+
+        void clear();
+        ///< remove all literals.
     };
 }
 
 #endif
-
diff --git a/components/compiler/locals.cpp b/components/compiler/locals.cpp
index 4c5542a7d2..e65c972473 100644
--- a/components/compiler/locals.cpp
+++ b/components/compiler/locals.cpp
@@ -1,109 +1,108 @@
 #include "locals.hpp"
 
-#include <stdexcept>
 #include <algorithm>
-#include <ostream>
 #include <iterator>
+#include <ostream>
+#include <stdexcept>
 
 #include <components/misc/strings/lower.hpp>
 
 namespace Compiler
 {
-    const std::vector<std::string>& Locals::get (char type) const
+    const std::vector<std::string>& Locals::get(char type) const
     {
         switch (type)
         {
-            case 's': return mShorts;
-            case 'l': return mLongs;
-            case 'f': return mFloats;
+            case 's':
+                return mShorts;
+            case 'l':
+                return mLongs;
+            case 'f':
+                return mFloats;
         }
 
-        throw std::logic_error ("Unknown variable type");
+        throw std::logic_error("Unknown variable type");
     }
 
-    int Locals::searchIndex (char type, std::string_view name) const
+    int Locals::searchIndex(char type, std::string_view name) const
     {
-        const std::vector<std::string>& collection = get (type);
+        const std::vector<std::string>& collection = get(type);
 
-        auto iter = std::find (collection.begin(), collection.end(), name);
+        auto iter = std::find(collection.begin(), collection.end(), name);
 
-        if (iter==collection.end())
+        if (iter == collection.end())
             return -1;
 
-        return static_cast<int>(iter-collection.begin());
+        return static_cast<int>(iter - collection.begin());
     }
 
-    bool Locals::search (char type, std::string_view name) const
+    bool Locals::search(char type, std::string_view name) const
     {
-        return searchIndex (type, name)!=-1;
+        return searchIndex(type, name) != -1;
     }
 
-    std::vector<std::string>& Locals::get (char type)
+    std::vector<std::string>& Locals::get(char type)
     {
         switch (type)
         {
-            case 's': return mShorts;
-            case 'l': return mLongs;
-            case 'f': return mFloats;
+            case 's':
+                return mShorts;
+            case 'l':
+                return mLongs;
+            case 'f':
+                return mFloats;
         }
 
-        throw std::logic_error ("Unknown variable type");
+        throw std::logic_error("Unknown variable type");
     }
 
-    char Locals::getType (std::string_view name) const
+    char Locals::getType(std::string_view name) const
     {
-        if (search ('s', name))
+        if (search('s', name))
             return 's';
 
-        if (search ('l', name))
+        if (search('l', name))
             return 'l';
 
-        if (search ('f', name))
+        if (search('f', name))
             return 'f';
 
         return ' ';
     }
 
-    int Locals::getIndex (std::string_view name) const
+    int Locals::getIndex(std::string_view name) const
     {
-        int index = searchIndex ('s', name);
+        int index = searchIndex('s', name);
 
-        if (index!=-1)
+        if (index != -1)
             return index;
 
-        index = searchIndex ('l', name);
+        index = searchIndex('l', name);
 
-        if (index!=-1)
+        if (index != -1)
             return index;
 
-        return searchIndex ('f', name);
+        return searchIndex('f', name);
     }
 
-    void Locals::write (std::ostream& localFile) const
+    void Locals::write(std::ostream& localFile) const
     {
-        localFile
-            << get ('s').size() << ' '
-            << get ('l').size() << ' '
-            << get ('f').size() << std::endl;
-
-        std::copy (get ('s').begin(), get ('s').end(),
-            std::ostream_iterator<std::string> (localFile, " "));
-        std::copy (get ('l').begin(), get ('l').end(),
-            std::ostream_iterator<std::string> (localFile, " "));
-        std::copy (get ('f').begin(), get ('f').end(),
-            std::ostream_iterator<std::string> (localFile, " "));
+        localFile << get('s').size() << ' ' << get('l').size() << ' ' << get('f').size() << std::endl;
+
+        std::copy(get('s').begin(), get('s').end(), std::ostream_iterator<std::string>(localFile, " "));
+        std::copy(get('l').begin(), get('l').end(), std::ostream_iterator<std::string>(localFile, " "));
+        std::copy(get('f').begin(), get('f').end(), std::ostream_iterator<std::string>(localFile, " "));
     }
 
-    void Locals::declare (char type, std::string_view name)
+    void Locals::declare(char type, std::string_view name)
     {
-        get (type).push_back (Misc::StringUtils::lowerCase (name));
+        get(type).push_back(Misc::StringUtils::lowerCase(name));
     }
 
     void Locals::clear()
     {
-        get ('s').clear();
-        get ('l').clear();
-        get ('f').clear();
+        get('s').clear();
+        get('l').clear();
+        get('f').clear();
     }
 }
-
diff --git a/components/compiler/locals.hpp b/components/compiler/locals.hpp
index c7636ed2a0..00458df000 100644
--- a/components/compiler/locals.hpp
+++ b/components/compiler/locals.hpp
@@ -1,10 +1,10 @@
 #ifndef COMPILER_LOCALS_H_INCLUDED
 #define COMPILER_LOCALS_H_INCLUDED
 
-#include <vector>
+#include <iosfwd>
 #include <string>
 #include <string_view>
-#include <iosfwd>
+#include <vector>
 
 namespace Compiler
 {
@@ -12,36 +12,35 @@ namespace Compiler
 
     class Locals
     {
-            std::vector<std::string> mShorts;
-            std::vector<std::string> mLongs;
-            std::vector<std::string> mFloats;
-
-            std::vector<std::string>& get (char type);
+        std::vector<std::string> mShorts;
+        std::vector<std::string> mLongs;
+        std::vector<std::string> mFloats;
 
-        public:
+        std::vector<std::string>& get(char type);
 
-            char getType (std::string_view name) const;
-            ///< 's': short, 'l': long, 'f': float, ' ': does not exist.
+    public:
+        char getType(std::string_view name) const;
+        ///< 's': short, 'l': long, 'f': float, ' ': does not exist.
 
-            int getIndex (std::string_view name) const;
-            ///< return index for local variable \a name (-1: does not exist).
+        int getIndex(std::string_view name) const;
+        ///< return index for local variable \a name (-1: does not exist).
 
-            bool search (char type, std::string_view name) const;
+        bool search(char type, std::string_view name) const;
 
-            /// Return index for local variable \a name of type \a type (-1: variable does not
-            /// exit).
-            int searchIndex (char type, std::string_view name) const;
+        /// Return index for local variable \a name of type \a type (-1: variable does not
+        /// exit).
+        int searchIndex(char type, std::string_view name) const;
 
-            const std::vector<std::string>& get (char type) const;
+        const std::vector<std::string>& get(char type) const;
 
-            void write (std::ostream& localFile) const;
-            ///< write declarations to file.
+        void write(std::ostream& localFile) const;
+        ///< write declarations to file.
 
-            void declare (char type, std::string_view name);
-            ///< declares a variable.
+        void declare(char type, std::string_view name);
+        ///< declares a variable.
 
-            void clear();
-            ///< remove all declarations.
+        void clear();
+        ///< remove all declarations.
     };
 }
 
diff --git a/components/compiler/nullerrorhandler.cpp b/components/compiler/nullerrorhandler.cpp
index a0db53a002..96735366eb 100644
--- a/components/compiler/nullerrorhandler.cpp
+++ b/components/compiler/nullerrorhandler.cpp
@@ -1,5 +1,5 @@
 #include "nullerrorhandler.hpp"
 
-void Compiler::NullErrorHandler::report (const std::string& message, const TokenLoc& loc, Type type) {}
+void Compiler::NullErrorHandler::report(const std::string& message, const TokenLoc& loc, Type type) {}
 
-void Compiler::NullErrorHandler::report (const std::string& message, Type type) {}
+void Compiler::NullErrorHandler::report(const std::string& message, Type type) {}
diff --git a/components/compiler/nullerrorhandler.hpp b/components/compiler/nullerrorhandler.hpp
index d689fba630..7f2e086699 100644
--- a/components/compiler/nullerrorhandler.hpp
+++ b/components/compiler/nullerrorhandler.hpp
@@ -9,11 +9,11 @@ namespace Compiler
 
     class NullErrorHandler : public ErrorHandler
     {
-            void report (const std::string& message, const TokenLoc& loc, Type type) override;
-            ///< Report error to the user.
+        void report(const std::string& message, const TokenLoc& loc, Type type) override;
+        ///< Report error to the user.
 
-            void report (const std::string& message, Type type) override;
-            ///< Report a file related error
+        void report(const std::string& message, Type type) override;
+        ///< Report a file related error
     };
 }
 
diff --git a/components/compiler/opcodes.cpp b/components/compiler/opcodes.cpp
index 9e2356d0ee..eb57e28fd4 100644
--- a/components/compiler/opcodes.cpp
+++ b/components/compiler/opcodes.cpp
@@ -1,10 +1,7 @@
 #include "opcodes.hpp"
 
 namespace Compiler::Control
-    {
-        const char *controls[numberOfControls] =
-        {
-            "playercontrols", "playerfighting", "playerjumping", "playerlooking", "playermagic",
-            "playerviewswitch", "vanitymode"
-        };
-    }
+{
+    const char* controls[numberOfControls] = { "playercontrols", "playerfighting", "playerjumping", "playerlooking",
+        "playermagic", "playerviewswitch", "vanitymode" };
+}
diff --git a/components/compiler/opcodes.hpp b/components/compiler/opcodes.hpp
index 32e9aa8790..c0d35f0fac 100644
--- a/components/compiler/opcodes.hpp
+++ b/components/compiler/opcodes.hpp
@@ -115,7 +115,7 @@ namespace Compiler
     {
         const int numberOfControls = 7;
 
-        extern const char *controls[numberOfControls];
+        extern const char* controls[numberOfControls];
 
         const int opcodeEnable = 0x200007e;
         const int opcodeDisable = 0x2000085;
diff --git a/components/compiler/output.cpp b/components/compiler/output.cpp
index 785b2ce843..877d230258 100644
--- a/components/compiler/output.cpp
+++ b/components/compiler/output.cpp
@@ -1,48 +1,51 @@
 #include "output.hpp"
 
-#include <cassert>
 #include <algorithm>
+#include <cassert>
 #include <iterator>
 
 #include "locals.hpp"
 
 namespace Compiler
 {
-    Output::Output (Locals& locals) : mLocals (locals) {}
+    Output::Output(Locals& locals)
+        : mLocals(locals)
+    {
+    }
 
-    void Output::getCode (std::vector<Interpreter::Type_Code>& code) const
+    void Output::getCode(std::vector<Interpreter::Type_Code>& code) const
     {
         code.clear();
-        
+
         // header
-        code.push_back (static_cast<Interpreter::Type_Code> (mCode.size()));
-        
-        assert (mLiterals.getIntegerSize()%4==0);
-        code.push_back (static_cast<Interpreter::Type_Code> (mLiterals.getIntegerSize()/4));
-        
-        assert (mLiterals.getFloatSize()%4==0);
-        code.push_back (static_cast<Interpreter::Type_Code> (mLiterals.getFloatSize()/4));
-        
-        assert (mLiterals.getStringSize()%4==0);
-        code.push_back (static_cast<Interpreter::Type_Code> (mLiterals.getStringSize()/4));
-        
+        code.push_back(static_cast<Interpreter::Type_Code>(mCode.size()));
+
+        assert(mLiterals.getIntegerSize() % 4 == 0);
+        code.push_back(static_cast<Interpreter::Type_Code>(mLiterals.getIntegerSize() / 4));
+
+        assert(mLiterals.getFloatSize() % 4 == 0);
+        code.push_back(static_cast<Interpreter::Type_Code>(mLiterals.getFloatSize() / 4));
+
+        assert(mLiterals.getStringSize() % 4 == 0);
+        code.push_back(static_cast<Interpreter::Type_Code>(mLiterals.getStringSize() / 4));
+
         // code
-        std::copy (mCode.begin(), mCode.end(), std::back_inserter (code));
-        
+        std::copy(mCode.begin(), mCode.end(), std::back_inserter(code));
+
         // literals
-        mLiterals.append (code);
+        mLiterals.append(code);
     }
 
     const Literals& Output::getLiterals() const
     {
         return mLiterals;
     }
-            
+
     const std::vector<Interpreter::Type_Code>& Output::getCode() const
     {
         return mCode;
     }
-            
+
     const Locals& Output::getLocals() const
     {
         return mLocals;
@@ -52,17 +55,17 @@ namespace Compiler
     {
         return mLiterals;
     }
-    
+
     std::vector<Interpreter::Type_Code>& Output::getCode()
     {
         return mCode;
     }
-    
+
     Locals& Output::getLocals()
     {
         return mLocals;
     }
-    
+
     void Output::clear()
     {
         mLiterals.clear();
@@ -70,4 +73,3 @@ namespace Compiler
         mLocals.clear();
     }
 }
-
diff --git a/components/compiler/output.hpp b/components/compiler/output.hpp
index c544fb715e..1738f386cb 100644
--- a/components/compiler/output.hpp
+++ b/components/compiler/output.hpp
@@ -13,32 +13,30 @@ namespace Compiler
 
     class Output
     {
-            Literals mLiterals;
-            std::vector<Interpreter::Type_Code> mCode;            
-            Locals& mLocals;
-                
-        public:
-        
-            Output (Locals& locals);
-    
-            void getCode (std::vector<Interpreter::Type_Code>& code) const;
-            ///< store generated code in \a code.
-
-            const Literals& getLiterals() const;
-
-            const Locals& getLocals() const;
-            
-            const std::vector<Interpreter::Type_Code>& getCode() const;
-            
-            Literals& getLiterals();
-
-            std::vector<Interpreter::Type_Code>& getCode();
-            
-            Locals& getLocals();
-            
-            void clear();
+        Literals mLiterals;
+        std::vector<Interpreter::Type_Code> mCode;
+        Locals& mLocals;
+
+    public:
+        Output(Locals& locals);
+
+        void getCode(std::vector<Interpreter::Type_Code>& code) const;
+        ///< store generated code in \a code.
+
+        const Literals& getLiterals() const;
+
+        const Locals& getLocals() const;
+
+        const std::vector<Interpreter::Type_Code>& getCode() const;
+
+        Literals& getLiterals();
+
+        std::vector<Interpreter::Type_Code>& getCode();
+
+        Locals& getLocals();
+
+        void clear();
     };
 }
 
 #endif
-
diff --git a/components/compiler/parser.cpp b/components/compiler/parser.cpp
index cc7ae49b0c..e9c93534c8 100644
--- a/components/compiler/parser.cpp
+++ b/components/compiler/parser.cpp
@@ -10,17 +10,17 @@ namespace Compiler
 {
     // Report the error and throw an exception.
 
-    [[noreturn]] void Parser::reportSeriousError (const std::string& message, const TokenLoc& loc)
+    [[noreturn]] void Parser::reportSeriousError(const std::string& message, const TokenLoc& loc)
     {
-        mErrorHandler.error (message, loc);
+        mErrorHandler.error(message, loc);
         throw SourceException();
     }
 
     // Report the warning without throwing an exception.
 
-    void Parser::reportWarning (const std::string& message, const TokenLoc& loc)
+    void Parser::reportWarning(const std::string& message, const TokenLoc& loc)
     {
-        mErrorHandler.warning (message, loc);
+        mErrorHandler.warning(message, loc);
     }
 
     // Report an unexpected EOF condition.
@@ -45,16 +45,20 @@ namespace Compiler
         return mContext;
     }
 
-    std::string Parser::toLower (const std::string& name)
+    std::string Parser::toLower(const std::string& name)
     {
         std::string lowerCase = Misc::StringUtils::lowerCase(name);
 
         return lowerCase;
     }
 
-    Parser::Parser (ErrorHandler& errorHandler, const Context& context)
-    : mErrorHandler (errorHandler), mContext (context), mOptional (false), mEmpty (true)
-    {}
+    Parser::Parser(ErrorHandler& errorHandler, const Context& context)
+        : mErrorHandler(errorHandler)
+        , mContext(context)
+        , mOptional(false)
+        , mEmpty(true)
+    {
+    }
 
     // destructor
 
@@ -65,12 +69,12 @@ namespace Compiler
     //
     // - Default-implementation: Report an error.
 
-    bool Parser::parseInt (int value, const TokenLoc& loc, Scanner& scanner)
+    bool Parser::parseInt(int value, const TokenLoc& loc, Scanner& scanner)
     {
         if (!(mOptional && mEmpty))
-            reportSeriousError ("Unexpected numeric value", loc);
+            reportSeriousError("Unexpected numeric value", loc);
         else
-            scanner.putbackInt (value, loc);
+            scanner.putbackInt(value, loc);
 
         return false;
     }
@@ -80,12 +84,12 @@ namespace Compiler
     //
     // - Default-implementation: Report an error.
 
-    bool Parser::parseFloat (float value, const TokenLoc& loc, Scanner& scanner)
+    bool Parser::parseFloat(float value, const TokenLoc& loc, Scanner& scanner)
     {
         if (!(mOptional && mEmpty))
-            reportSeriousError ("Unexpected floating point value", loc);
+            reportSeriousError("Unexpected floating point value", loc);
         else
-            scanner.putbackFloat (value, loc);
+            scanner.putbackFloat(value, loc);
 
         return false;
     }
@@ -95,13 +99,12 @@ namespace Compiler
     //
     // - Default-implementation: Report an error.
 
-    bool Parser::parseName (const std::string& name, const TokenLoc& loc,
-        Scanner& scanner)
+    bool Parser::parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner)
     {
         if (!(mOptional && mEmpty))
-            reportSeriousError ("Unexpected name", loc);
+            reportSeriousError("Unexpected name", loc);
         else
-            scanner.putbackName (name, loc);
+            scanner.putbackName(name, loc);
 
         return false;
     }
@@ -111,12 +114,12 @@ namespace Compiler
     //
     // - Default-implementation: Report an error.
 
-    bool Parser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
+    bool Parser::parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner)
     {
         if (!(mOptional && mEmpty))
-            reportSeriousError ("Unexpected keyword", loc);
+            reportSeriousError("Unexpected keyword", loc);
         else
-            scanner.putbackKeyword (keyword, loc);
+            scanner.putbackKeyword(keyword, loc);
 
         return false;
     }
@@ -126,17 +129,17 @@ namespace Compiler
     //
     // - Default-implementation: Report an error.
 
-    bool Parser::parseSpecial (int code, const TokenLoc& loc, Scanner& scanner)
+    bool Parser::parseSpecial(int code, const TokenLoc& loc, Scanner& scanner)
     {
         if (!(mOptional && mEmpty))
-            reportSeriousError ("Unexpected special token", loc);
+            reportSeriousError("Unexpected special token", loc);
         else
-            scanner.putbackSpecial (code, loc);
+            scanner.putbackSpecial(code, loc);
 
         return false;
     }
 
-    bool Parser::parseComment (const std::string& comment, const TokenLoc& loc, Scanner& scanner)
+    bool Parser::parseComment(const std::string& comment, const TokenLoc& loc, Scanner& scanner)
     {
         return true;
     }
@@ -145,7 +148,7 @@ namespace Compiler
     //
     // - Default-implementation: Report an error.
 
-    void Parser::parseEOF (Scanner& scanner)
+    void Parser::parseEOF(Scanner& scanner)
     {
         reportEOF();
     }
@@ -156,7 +159,7 @@ namespace Compiler
         mEmpty = true;
     }
 
-    void Parser::setOptional (bool optional)
+    void Parser::setOptional(bool optional)
     {
         mOptional = optional;
     }
diff --git a/components/compiler/parser.hpp b/components/compiler/parser.hpp
index 1f2a57a489..79a9878093 100644
--- a/components/compiler/parser.hpp
+++ b/components/compiler/parser.hpp
@@ -16,93 +16,89 @@ namespace Compiler
 
     class Parser
     {
-            ErrorHandler& mErrorHandler;
-            const Context& mContext;
-            bool mOptional;
-            bool mEmpty;
-
-        protected:
-
-            [[noreturn]] void reportSeriousError (const std::string& message, const TokenLoc& loc);
-            ///< Report the error and throw a exception.
-
-            void reportWarning (const std::string& message, const TokenLoc& loc);
-            ///< Report the warning without throwing an exception.
-
-            [[noreturn]] void reportEOF();
-            ///< Report an unexpected EOF condition.
-
-            ErrorHandler& getErrorHandler();
-            ///< Return error handler
-
-            const Context& getContext() const;
-            ///< Return context
-
-            static std::string toLower (const std::string& name);
-
-        public:
-
-            Parser (ErrorHandler& errorHandler, const Context& context);
-            ///< constructor
-
-            virtual ~Parser();
-            ///< destructor
-
-            virtual bool parseInt (int value, const TokenLoc& loc, Scanner& scanner);
-            ///< Handle an int token.
-            /// \return fetch another token?
-            ///
-            /// - Default-implementation: Report an error.
-
-            virtual bool parseFloat (float value, const TokenLoc& loc, Scanner& scanner);
-            ///< Handle a float token.
-            /// \return fetch another token?
-            ///
-            /// - Default-implementation: Report an error.
-
-            virtual bool parseName (const std::string& name, const TokenLoc& loc,
-                Scanner& scanner);
-            ///< Handle a name token.
-            /// \return fetch another token?
-            ///
-            /// - Default-implementation: Report an error.
-
-            virtual bool parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner);
-            ///< Handle a keyword token.
-            /// \return fetch another token?
-            ///
-            /// - Default-implementation: Report an error.
-
-            virtual bool parseSpecial (int code, const TokenLoc& loc, Scanner& scanner);
-            ///< Handle a special character token.
-            /// \return fetch another token?
-            ///
-            /// - Default-implementation: Report an error.
-
-            virtual bool parseComment (const std::string& comment, const TokenLoc& loc,
-                Scanner& scanner);
-            ///< Handle comment token.
-            /// \return fetch another token?
-            ///
-            /// - Default-implementation: ignored (and return true).
-
-            virtual void parseEOF (Scanner& scanner);
-            ///< Handle EOF token.
-            ///
-            /// - Default-implementation: Report an error.
-
-            virtual void reset();
-            ///< Reset parser to clean state.
-
-            void setOptional (bool optional);
-            ///< Optional mode: If nothign has been parsed yet and an unexpected token is delivered, stop
-            /// parsing without raising an exception (after a reset the parser is in non-optional mode).
-
-            void start();
-            ///< Mark parser as non-empty (at least one token has been parser).
-
-            bool isEmpty() const;
-            ///< Has anything been parsed?
+        ErrorHandler& mErrorHandler;
+        const Context& mContext;
+        bool mOptional;
+        bool mEmpty;
+
+    protected:
+        [[noreturn]] void reportSeriousError(const std::string& message, const TokenLoc& loc);
+        ///< Report the error and throw a exception.
+
+        void reportWarning(const std::string& message, const TokenLoc& loc);
+        ///< Report the warning without throwing an exception.
+
+        [[noreturn]] void reportEOF();
+        ///< Report an unexpected EOF condition.
+
+        ErrorHandler& getErrorHandler();
+        ///< Return error handler
+
+        const Context& getContext() const;
+        ///< Return context
+
+        static std::string toLower(const std::string& name);
+
+    public:
+        Parser(ErrorHandler& errorHandler, const Context& context);
+        ///< constructor
+
+        virtual ~Parser();
+        ///< destructor
+
+        virtual bool parseInt(int value, const TokenLoc& loc, Scanner& scanner);
+        ///< Handle an int token.
+        /// \return fetch another token?
+        ///
+        /// - Default-implementation: Report an error.
+
+        virtual bool parseFloat(float value, const TokenLoc& loc, Scanner& scanner);
+        ///< Handle a float token.
+        /// \return fetch another token?
+        ///
+        /// - Default-implementation: Report an error.
+
+        virtual bool parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner);
+        ///< Handle a name token.
+        /// \return fetch another token?
+        ///
+        /// - Default-implementation: Report an error.
+
+        virtual bool parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner);
+        ///< Handle a keyword token.
+        /// \return fetch another token?
+        ///
+        /// - Default-implementation: Report an error.
+
+        virtual bool parseSpecial(int code, const TokenLoc& loc, Scanner& scanner);
+        ///< Handle a special character token.
+        /// \return fetch another token?
+        ///
+        /// - Default-implementation: Report an error.
+
+        virtual bool parseComment(const std::string& comment, const TokenLoc& loc, Scanner& scanner);
+        ///< Handle comment token.
+        /// \return fetch another token?
+        ///
+        /// - Default-implementation: ignored (and return true).
+
+        virtual void parseEOF(Scanner& scanner);
+        ///< Handle EOF token.
+        ///
+        /// - Default-implementation: Report an error.
+
+        virtual void reset();
+        ///< Reset parser to clean state.
+
+        void setOptional(bool optional);
+        ///< Optional mode: If nothign has been parsed yet and an unexpected token is delivered, stop
+        /// parsing without raising an exception (after a reset the parser is in non-optional mode).
+
+        void start();
+        ///< Mark parser as non-empty (at least one token has been parser).
+
+        bool isEmpty() const;
+        ///< Has anything been parsed?
     };
 }
 
diff --git a/components/compiler/quickfileparser.cpp b/components/compiler/quickfileparser.cpp
index 53aaf96e5d..e9ebf0e28e 100644
--- a/components/compiler/quickfileparser.cpp
+++ b/components/compiler/quickfileparser.cpp
@@ -1,51 +1,48 @@
 #include "quickfileparser.hpp"
 
-#include "skipparser.hpp"
 #include "scanner.hpp"
+#include "skipparser.hpp"
 
-Compiler::QuickFileParser::QuickFileParser (ErrorHandler& errorHandler, const Context& context,
-    Locals& locals)
-: Parser (errorHandler, context), mDeclarationParser (errorHandler, context, locals)
-{}
+Compiler::QuickFileParser::QuickFileParser(ErrorHandler& errorHandler, const Context& context, Locals& locals)
+    : Parser(errorHandler, context)
+    , mDeclarationParser(errorHandler, context, locals)
+{
+}
 
-bool Compiler::QuickFileParser::parseName (const std::string& name, const TokenLoc& loc,
-    Scanner& scanner)
+bool Compiler::QuickFileParser::parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner)
 {
-    SkipParser skip (getErrorHandler(), getContext());
-    scanner.scan (skip);
+    SkipParser skip(getErrorHandler(), getContext());
+    scanner.scan(skip);
     return true;
 }
 
-bool Compiler::QuickFileParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
+bool Compiler::QuickFileParser::parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner)
 {
-    if (keyword==Scanner::K_end)
+    if (keyword == Scanner::K_end)
         return false;
 
-    if (keyword==Scanner::K_short || keyword==Scanner::K_long || keyword==Scanner::K_float)
+    if (keyword == Scanner::K_short || keyword == Scanner::K_long || keyword == Scanner::K_float)
     {
         mDeclarationParser.reset();
-        scanner.putbackKeyword (keyword, loc);
-        scanner.scan (mDeclarationParser);
+        scanner.putbackKeyword(keyword, loc);
+        scanner.scan(mDeclarationParser);
         return true;
     }
 
-    SkipParser skip (getErrorHandler(), getContext());
-    scanner.scan (skip);
+    SkipParser skip(getErrorHandler(), getContext());
+    scanner.scan(skip);
     return true;
 }
 
-bool Compiler::QuickFileParser::parseSpecial (int code, const TokenLoc& loc, Scanner& scanner)
+bool Compiler::QuickFileParser::parseSpecial(int code, const TokenLoc& loc, Scanner& scanner)
 {
-    if (code!=Scanner::S_newline)
+    if (code != Scanner::S_newline)
     {
-        SkipParser skip (getErrorHandler(), getContext());
-        scanner.scan (skip);
+        SkipParser skip(getErrorHandler(), getContext());
+        scanner.scan(skip);
     }
 
     return true;
 }
 
-void Compiler::QuickFileParser::parseEOF (Scanner& scanner)
-{
-
-}
+void Compiler::QuickFileParser::parseEOF(Scanner& scanner) {}
diff --git a/components/compiler/quickfileparser.hpp b/components/compiler/quickfileparser.hpp
index 95e6b401ce..9d531ab492 100644
--- a/components/compiler/quickfileparser.hpp
+++ b/components/compiler/quickfileparser.hpp
@@ -1,8 +1,8 @@
 #ifndef COMPILER_QUICKFILEPARSER_H_INCLUDED
 #define COMPILER_QUICKFILEPARSER_H_INCLUDED
 
-#include "parser.hpp"
 #include "declarationparser.hpp"
+#include "parser.hpp"
 
 namespace Compiler
 {
@@ -11,29 +11,26 @@ namespace Compiler
     /// \brief File parser variant that ignores everything but variable declarations
     class QuickFileParser : public Parser
     {
-            DeclarationParser mDeclarationParser;
+        DeclarationParser mDeclarationParser;
 
-        public:
+    public:
+        QuickFileParser(ErrorHandler& errorHandler, const Context& context, Locals& locals);
 
-            QuickFileParser (ErrorHandler& errorHandler, const Context& context, Locals& locals);
+        bool parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a name token.
+        /// \return fetch another token?
 
-            bool parseName (const std::string& name, const TokenLoc& loc,
-                Scanner& scanner) override;
-            ///< Handle a name token.
-            /// \return fetch another token?
+        bool parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a keyword token.
+        /// \return fetch another token?
 
-            bool parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a keyword token.
-            /// \return fetch another token?
+        bool parseSpecial(int code, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a special character token.
+        /// \return fetch another token?
 
-            bool parseSpecial (int code, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a special character token.
-            /// \return fetch another token?
-
-            void parseEOF (Scanner& scanner) override;
-            ///< Handle EOF token.
+        void parseEOF(Scanner& scanner) override;
+        ///< Handle EOF token.
     };
 }
 
 #endif
-
diff --git a/components/compiler/scanner.cpp b/components/compiler/scanner.cpp
index 8a8e6f565d..6e0b4e8879 100644
--- a/components/compiler/scanner.cpp
+++ b/components/compiler/scanner.cpp
@@ -3,23 +3,23 @@
 #include <cassert>
 #include <sstream>
 
-#include "exception.hpp"
 #include "errorhandler.hpp"
-#include "parser.hpp"
+#include "exception.hpp"
 #include "extensions.hpp"
+#include "parser.hpp"
 
 #include <components/misc/strings/lower.hpp>
 
 namespace Compiler
 {
-    bool Scanner::get (MultiChar& c)
+    bool Scanner::get(MultiChar& c)
     {
         if (!c.getFrom(mStream))
             return false;
 
         mPrevLoc = mLoc;
 
-        if (c=='\n')
+        if (c == '\n')
         {
             mStrictKeywords = false;
             mTolerantNames = false;
@@ -37,40 +37,40 @@ namespace Compiler
         return true;
     }
 
-    void Scanner::putback (MultiChar& c)
+    void Scanner::putback(MultiChar& c)
     {
         c.putback(mStream);
         mLoc = mPrevLoc;
     }
 
-    bool Scanner::scanToken (Parser& parser)
+    bool Scanner::scanToken(Parser& parser)
     {
         switch (mPutback)
         {
             case Putback_Special:
 
                 mPutback = Putback_None;
-                return parser.parseSpecial (mPutbackCode, mPutbackLoc, *this);
+                return parser.parseSpecial(mPutbackCode, mPutbackLoc, *this);
 
             case Putback_Integer:
 
                 mPutback = Putback_None;
-                return parser.parseInt (mPutbackInteger, mPutbackLoc, *this);
+                return parser.parseInt(mPutbackInteger, mPutbackLoc, *this);
 
             case Putback_Float:
 
                 mPutback = Putback_None;
-                return parser.parseFloat (mPutbackFloat, mPutbackLoc, *this);
+                return parser.parseFloat(mPutbackFloat, mPutbackLoc, *this);
 
             case Putback_Name:
 
                 mPutback = Putback_None;
-                return parser.parseName (mPutbackName, mPutbackLoc, *this);
+                return parser.parseName(mPutbackName, mPutbackLoc, *this);
 
             case Putback_Keyword:
 
                 mPutback = Putback_None;
-                return parser.parseKeyword (mPutbackCode, mPutbackLoc, *this);
+                return parser.parseKeyword(mPutbackCode, mPutbackLoc, *this);
 
             case Putback_None:
 
@@ -79,49 +79,49 @@ namespace Compiler
 
         MultiChar c;
 
-        if (!get (c))
+        if (!get(c))
         {
-            parser.parseEOF (*this);
+            parser.parseEOF(*this);
             return false;
         }
-        else if (c==';')
+        else if (c == ';')
         {
             std::string comment;
 
             c.appendTo(comment);
 
-            while (get (c))
+            while (get(c))
             {
-                if (c=='\n')
+                if (c == '\n')
                 {
-                    putback (c);
+                    putback(c);
                     break;
                 }
                 else
                     c.appendTo(comment);
             }
 
-            TokenLoc loc (mLoc);
+            TokenLoc loc(mLoc);
             mLoc.mLiteral.clear();
 
-            return parser.parseComment (comment, loc, *this);
+            return parser.parseComment(comment, loc, *this);
         }
         else if (c.isWhitespace())
         {
             mLoc.mLiteral.clear();
             return true;
         }
-        else if (c==':')
+        else if (c == ':')
         {
             // treat : as a whitespace :(
             mLoc.mLiteral.clear();
             return true;
         }
-        else if (c.isAlpha() || c=='_' || c=='"')
+        else if (c.isAlpha() || c == '_' || c == '"')
         {
             bool cont = false;
 
-            if (scanName (c, parser, cont))
+            if (scanName(c, parser, cont))
             {
                 mLoc.mLiteral.clear();
                 return cont;
@@ -138,7 +138,7 @@ namespace Compiler
                 return cont;
             }
         }
-        else if (c==13) // linux compatibility hack
+        else if (c == 13) // linux compatibility hack
         {
             return true;
         }
@@ -146,81 +146,81 @@ namespace Compiler
         {
             bool cont = false;
 
-            if (scanSpecial (c, parser, cont))
+            if (scanSpecial(c, parser, cont))
             {
                 mLoc.mLiteral.clear();
                 return cont;
             }
         }
 
-        TokenLoc loc (mLoc);
+        TokenLoc loc(mLoc);
         mLoc.mLiteral.clear();
 
-        mErrorHandler.error ("Syntax error", loc);
+        mErrorHandler.error("Syntax error", loc);
         throw SourceException();
     }
 
-    bool Scanner::scanInt (MultiChar& c, Parser& parser, bool& cont)
+    bool Scanner::scanInt(MultiChar& c, Parser& parser, bool& cont)
     {
         assert(c != '\0');
         std::string value;
         c.appendTo(value);
 
-        while (get (c))
+        while (get(c))
         {
             if (c.isDigit())
             {
                 c.appendTo(value);
             }
-            else if (!c.isMinusSign() && isStringCharacter (c))
+            else if (!c.isMinusSign() && isStringCharacter(c))
             {
                 /// workaround that allows names to begin with digits
                 return scanName(c, parser, cont, value);
             }
-            else if (c=='.')
+            else if (c == '.')
             {
-                return scanFloat (value, parser, cont);
+                return scanFloat(value, parser, cont);
             }
             else
             {
-                putback (c);
+                putback(c);
                 break;
             }
         }
 
-        TokenLoc loc (mLoc);
+        TokenLoc loc(mLoc);
         mLoc.mLiteral.clear();
 
-        std::istringstream stream (value);
+        std::istringstream stream(value);
 
         int intValue = 0;
         stream >> intValue;
 
-        cont = parser.parseInt (intValue, loc, *this);
+        cont = parser.parseInt(intValue, loc, *this);
         return true;
     }
 
-    bool Scanner::scanFloat (const std::string& intValue, Parser& parser, bool& cont)
+    bool Scanner::scanFloat(const std::string& intValue, Parser& parser, bool& cont)
     {
         std::string value = intValue + ".";
 
         MultiChar c;
 
-        bool empty = intValue.empty() || intValue=="-";
+        bool empty = intValue.empty() || intValue == "-";
         bool error = false;
 
-        while (get (c))
+        while (get(c))
         {
             if (c.isDigit())
             {
                 c.appendTo(value);
                 empty = false;
             }
-            else if (c.isAlpha() || c=='_')
+            else if (c.isAlpha() || c == '_')
                 error = true;
             else
             {
-                putback (c);
+                putback(c);
                 break;
             }
         }
@@ -228,50 +228,57 @@ namespace Compiler
         if (empty || error)
             return false;
 
-        TokenLoc loc (mLoc);
+        TokenLoc loc(mLoc);
         mLoc.mLiteral.clear();
 
-        std::istringstream stream (value);
+        std::istringstream stream(value);
 
         float floatValue = 0;
         stream >> floatValue;
 
-        cont = parser.parseFloat (floatValue, loc, *this);
+        cont = parser.parseFloat(floatValue, loc, *this);
         return true;
     }
 
-    static const char *sKeywords[] =
-    {
-        "begin", "end",
-        "short", "long", "float",
-        "if", "endif", "else", "elseif",
-        "while", "endwhile",
+    static const char* sKeywords[] = {
+        "begin",
+        "end",
+        "short",
+        "long",
+        "float",
+        "if",
+        "endif",
+        "else",
+        "elseif",
+        "while",
+        "endwhile",
         "return",
         "messagebox",
-        "set", "to",
+        "set",
+        "to",
         nullptr,
     };
 
-    bool Scanner::scanName (MultiChar& c, Parser& parser, bool& cont, std::string name)
+    bool Scanner::scanName(MultiChar& c, Parser& parser, bool& cont, std::string name)
     {
         c.appendTo(name);
 
-        if (!scanName (name))
+        if (!scanName(name))
             return false;
-        else if(name.empty())
+        else if (name.empty())
             return true;
 
-        TokenLoc loc (mLoc);
+        TokenLoc loc(mLoc);
         mLoc.mLiteral.clear();
 
-        if (name.size()>=2 && name[0]=='"' && name[name.size()-1]=='"')
+        if (name.size() >= 2 && name[0] == '"' && name[name.size() - 1] == '"')
         {
-            name = name.substr (1, name.size()-2);
-// allow keywords enclosed in ""
-/// \todo optionally disable
+            name = name.substr(1, name.size() - 2);
+            // allow keywords enclosed in ""
+            /// \todo optionally disable
             if (mStrictKeywords)
             {
-                cont = parser.parseName (name, loc, *this);
+                cont = parser.parseName(name, loc, *this);
                 return true;
             }
         }
@@ -281,7 +288,7 @@ namespace Compiler
         std::string lowerCase = Misc::StringUtils::lowerCase(name);
         bool isKeyword = false;
         for (; sKeywords[i]; ++i)
-            if (lowerCase==sKeywords[i])
+            if (lowerCase == sKeywords[i])
             {
                 isKeyword = true;
                 break;
@@ -298,58 +305,58 @@ namespace Compiler
 
         if (sKeywords[i])
         {
-            cont = parser.parseKeyword (i, loc, *this);
+            cont = parser.parseKeyword(i, loc, *this);
             return true;
         }
 
         if (mExtensions)
         {
-            if (int keyword = mExtensions->searchKeyword (lowerCase))
+            if (int keyword = mExtensions->searchKeyword(lowerCase))
             {
-                cont = parser.parseKeyword (keyword, loc, *this);
+                cont = parser.parseKeyword(keyword, loc, *this);
                 return true;
             }
         }
 
-        cont = parser.parseName (name, loc, *this);
+        cont = parser.parseName(name, loc, *this);
 
         return true;
     }
 
-    bool Scanner::scanName (std::string& name)
+    bool Scanner::scanName(std::string& name)
     {
         MultiChar c;
         bool error = false;
 
-        while (get (c))
+        while (get(c))
         {
-            if (!name.empty() && name[0]=='"')
+            if (!name.empty() && name[0] == '"')
             {
-                if (c=='"')
+                if (c == '"')
                 {
                     c.appendTo(name);
                     break;
                 }
-// ignoring escape sequences for now, because they are messing up stupid Windows path names.
-//                else if (c=='\\')
-//                {
-//                    if (!get (c))
-//                    {
-//                        error = true;
-//                        mErrorHandler.error ("incomplete escape sequence", mLoc);
-//                        break;
-//                    }
-//                }
-                else if (c=='\n')
+                // ignoring escape sequences for now, because they are messing up stupid Windows path names.
+                //                else if (c=='\\')
+                //                {
+                //                    if (!get (c))
+                //                    {
+                //                        error = true;
+                //                        mErrorHandler.error ("incomplete escape sequence", mLoc);
+                //                        break;
+                //                    }
+                //                }
+                else if (c == '\n')
                 {
                     if (mIgnoreNewline)
-                        mErrorHandler.warning ("string contains newline character, make sure that it is intended", mLoc);
+                        mErrorHandler.warning("string contains newline character, make sure that it is intended", mLoc);
                     else
                     {
                         bool allWhitespace = true;
                         for (size_t i = 1; i < name.size(); i++)
                         {
-                            //ignore comments
+                            // ignore comments
                             if (name[i] == ';')
                                 break;
                             else if (name[i] != '\t' && name[i] != ' ' && name[i] != '\r')
@@ -362,21 +369,21 @@ namespace Compiler
                         {
                             name.clear();
                             mLoc.mLiteral.clear();
-                            mErrorHandler.warning ("unterminated empty string", mLoc);
+                            mErrorHandler.warning("unterminated empty string", mLoc);
                             return true;
                         }
 
                         error = true;
-                        mErrorHandler.error ("incomplete string or name", mLoc);
+                        mErrorHandler.error("incomplete string or name", mLoc);
                         break;
                     }
                 }
             }
-            else if (!(c=='"' && name.empty()))
+            else if (!(c == '"' && name.empty()))
             {
-                if (!isStringCharacter (c) && !(mTolerantNames && (c=='.' || c == '-')))
+                if (!isStringCharacter(c) && !(mTolerantNames && (c == '.' || c == '-')))
                 {
-                    putback (c);
+                    putback(c);
                     break;
                 }
             }
@@ -387,73 +394,73 @@ namespace Compiler
         return !error;
     }
 
-    bool Scanner::scanSpecial (MultiChar& c, Parser& parser, bool& cont)
+    bool Scanner::scanSpecial(MultiChar& c, Parser& parser, bool& cont)
     {
         bool expectName = mExpectName;
         mExpectName = false;
         int special = -1;
 
-        if (c=='\n')
+        if (c == '\n')
             special = S_newline;
-        else if (c=='(' || c=='[') /// \todo option to disable the use of [ as alias for (
+        else if (c == '(' || c == '[') /// \todo option to disable the use of [ as alias for (
             special = S_open;
-        else if (c==')' || c==']')  /// \todo option to disable the use of ] as alias for )
+        else if (c == ')' || c == ']') /// \todo option to disable the use of ] as alias for )
             special = S_close;
-        else if (c=='.')
+        else if (c == '.')
         {
             MultiChar next;
             // check, if this starts a float literal
-            if (get (next))
+            if (get(next))
             {
-                putback (next);
+                putback(next);
 
                 if (next.isDigit())
-                    return scanFloat ("", parser, cont);
+                    return scanFloat("", parser, cont);
             }
 
             special = S_member;
         }
-        else if (c=='=')
+        else if (c == '=')
         {
-            if (get (c))
+            if (get(c))
             {
                 /// \todo hack to allow a space in comparison operators (add option to disable)
-                if (c==' ' && !get (c))
+                if (c == ' ' && !get(c))
                     special = S_cmpEQ;
-                else if (c=='=')
+                else if (c == '=')
                     special = S_cmpEQ;
-                else if (c == '>' || c == '<')  // Treat => and =< as ==
+                else if (c == '>' || c == '<') // Treat => and =< as ==
                 {
                     special = S_cmpEQ;
-                    mErrorHandler.warning (std::string("invalid operator =") + c.data() + ", treating it as ==", mLoc);
+                    mErrorHandler.warning(std::string("invalid operator =") + c.data() + ", treating it as ==", mLoc);
                 }
                 else
                 {
                     special = S_cmpEQ;
-                    putback (c);
-//                    return false;
-/// Allow = as synonym for ==. \todo optionally disable for post-1.0 scripting improvements.
+                    putback(c);
+                    //                    return false;
+                    /// Allow = as synonym for ==. \todo optionally disable for post-1.0 scripting improvements.
                 }
             }
             else
             {
-                putback (c);
+                putback(c);
                 return false;
             }
         }
-        else if (c=='!')
+        else if (c == '!')
         {
-            if (get (c))
+            if (get(c))
             {
                 /// \todo hack to allow a space in comparison operators (add option to disable)
-                if (c==' ' && !get (c))
+                if (c == ' ' && !get(c))
                     return false;
 
-                if (c=='=')
+                if (c == '=')
                     special = S_cmpNE;
                 else
                 {
-                    putback (c);
+                    putback(c);
                     return false;
                 }
             }
@@ -463,85 +470,85 @@ namespace Compiler
         else if (c.isMinusSign())
         {
             MultiChar next;
-            if (get (next))
+            if (get(next))
             {
-                if (next=='>')
+                if (next == '>')
                     special = S_ref;
                 else
                 {
-                    putback (next);
+                    putback(next);
                     special = S_minus;
                 }
             }
             else
                 special = S_minus;
         }
-        else if (c=='<')
+        else if (c == '<')
         {
-            if (get (c))
+            if (get(c))
             {
                 /// \todo hack to allow a space in comparison operators (add option to disable)
-                if (c==' ' && !get (c))
+                if (c == ' ' && !get(c))
                     special = S_cmpLT;
-                else if (c=='=')
+                else if (c == '=')
                 {
                     special = S_cmpLE;
 
-                    if (get (c) && c!='=') // <== is a allowed as an alternative to <=  :(
-                        putback (c);
+                    if (get(c) && c != '=') // <== is a allowed as an alternative to <=  :(
+                        putback(c);
                 }
                 else if (c == '<' || c == '>') // Treat <> and << as <
                 {
                     special = S_cmpLT;
-                    mErrorHandler.warning ("Invalid operator, treating it as <", mLoc);
+                    mErrorHandler.warning("Invalid operator, treating it as <", mLoc);
                 }
                 else
                 {
-                    putback (c);
+                    putback(c);
                     special = S_cmpLT;
                 }
             }
             else
                 special = S_cmpLT;
         }
-        else if (c=='>')
+        else if (c == '>')
         {
-            if (get (c))
+            if (get(c))
             {
                 /// \todo hack to allow a space in comparison operators (add option to disable)
-                if (c==' ' && !get (c))
+                if (c == ' ' && !get(c))
                     special = S_cmpGT;
-                else if (c=='=')
+                else if (c == '=')
                 {
                     special = S_cmpGE;
 
-                    if (get (c) && c!='=') // >== is a allowed as an alternative to >=  :(
-                        putback (c);
+                    if (get(c) && c != '=') // >== is a allowed as an alternative to >=  :(
+                        putback(c);
                 }
                 else if (c == '<' || c == '>') // Treat >< and >> as >
                 {
                     special = S_cmpGT;
-                    mErrorHandler.warning ("Invalid operator, treating it as >", mLoc);
+                    mErrorHandler.warning("Invalid operator, treating it as >", mLoc);
                 }
                 else
                 {
-                    putback (c);
+                    putback(c);
                     special = S_cmpGT;
                 }
             }
             else
                 special = S_cmpGT;
         }
-        else if (c=='+')
+        else if (c == '+')
             special = S_plus;
-        else if (c=='*')
+        else if (c == '*')
             special = S_mult;
-        else if (c=='/')
+        else if (c == '/')
             special = S_div;
         else
             return false;
 
-        if (special==S_newline)
+        if (special == S_newline)
             mLoc.mLiteral = "<newline>";
         else if (expectName && (special == S_member || special == S_minus))
         {
@@ -552,15 +559,15 @@ namespace Compiler
             return out;
         }
 
-        TokenLoc loc (mLoc);
+        TokenLoc loc(mLoc);
         mLoc.mLiteral.clear();
 
-        cont = parser.parseSpecial (special, loc, *this);
+        cont = parser.parseSpecial(special, loc, *this);
 
         return true;
     }
 
-    bool Scanner::isStringCharacter (MultiChar& c, bool lookAhead)
+    bool Scanner::isStringCharacter(MultiChar& c, bool lookAhead)
     {
         if (lookAhead && c.isMinusSign())
         {
@@ -568,73 +575,81 @@ namespace Compiler
             /// responsible for allowing it in the first place and meet up with that person in
             /// a dark alley.
             MultiChar next;
-            if (next.peek(mStream) && isStringCharacter (next, false))
+            if (next.peek(mStream) && isStringCharacter(next, false))
                 return true;
         }
 
-        return c.isAlpha() || c.isDigit() || c=='_' ||
+        return c.isAlpha() || c.isDigit() || c == '_' ||
             /// \todo disable this when doing more stricter compiling
-            c=='`' || c=='\'';
+            c == '`' || c == '\'';
     }
 
     // constructor
 
-    Scanner::Scanner (ErrorHandler& errorHandler, std::istream& inputStream,
-        const Extensions *extensions)
-    : mErrorHandler (errorHandler), mStream (inputStream), mExtensions (extensions),
-      mPutback (Putback_None), mPutbackCode(0), mPutbackInteger(0), mPutbackFloat(0),
-      mStrictKeywords (false), mTolerantNames (false), mIgnoreNewline(false), mExpectName(false)
+    Scanner::Scanner(ErrorHandler& errorHandler, std::istream& inputStream, const Extensions* extensions)
+        : mErrorHandler(errorHandler)
+        , mStream(inputStream)
+        , mExtensions(extensions)
+        , mPutback(Putback_None)
+        , mPutbackCode(0)
+        , mPutbackInteger(0)
+        , mPutbackFloat(0)
+        , mStrictKeywords(false)
+        , mTolerantNames(false)
+        , mIgnoreNewline(false)
+        , mExpectName(false)
     {
     }
 
-    void Scanner::scan (Parser& parser)
+    void Scanner::scan(Parser& parser)
     {
-        while (scanToken (parser));
+        while (scanToken(parser))
+            ;
         mExpectName = false;
     }
 
-    void Scanner::putbackSpecial (int code, const TokenLoc& loc)
+    void Scanner::putbackSpecial(int code, const TokenLoc& loc)
     {
         mPutback = Putback_Special;
         mPutbackCode = code;
         mPutbackLoc = loc;
     }
 
-    void Scanner::putbackInt (int value, const TokenLoc& loc)
+    void Scanner::putbackInt(int value, const TokenLoc& loc)
     {
         mPutback = Putback_Integer;
         mPutbackInteger = value;
         mPutbackLoc = loc;
     }
 
-    void Scanner::putbackFloat (float value, const TokenLoc& loc)
+    void Scanner::putbackFloat(float value, const TokenLoc& loc)
     {
         mPutback = Putback_Float;
         mPutbackFloat = value;
         mPutbackLoc = loc;
     }
 
-    void Scanner::putbackName (const std::string& name, const TokenLoc& loc)
+    void Scanner::putbackName(const std::string& name, const TokenLoc& loc)
     {
         mPutback = Putback_Name;
         mPutbackName = name;
         mPutbackLoc = loc;
     }
 
-    void Scanner::putbackKeyword (int keyword, const TokenLoc& loc)
+    void Scanner::putbackKeyword(int keyword, const TokenLoc& loc)
     {
         mPutback = Putback_Keyword;
         mPutbackCode = keyword;
         mPutbackLoc = loc;
     }
 
-    void Scanner::listKeywords (std::vector<std::string>& keywords)
+    void Scanner::listKeywords(std::vector<std::string>& keywords)
     {
-        for (int i=0; Compiler::sKeywords[i]; ++i)
+        for (int i = 0; Compiler::sKeywords[i]; ++i)
             keywords.emplace_back(Compiler::sKeywords[i]);
 
         if (mExtensions)
-            mExtensions->listKeywords (keywords);
+            mExtensions->listKeywords(keywords);
     }
 
     void Scanner::enableIgnoreNewlines()
diff --git a/components/compiler/scanner.hpp b/components/compiler/scanner.hpp
index 7c80f622ee..c11381e9df 100644
--- a/components/compiler/scanner.hpp
+++ b/components/compiler/scanner.hpp
@@ -2,10 +2,10 @@
 #define COMPILER_SCANNER_H_INCLUDED
 
 #include <cctype>
-#include <string>
 #include <iosfwd>
-#include <vector>
 #include <istream>
+#include <string>
+#include <vector>
 
 #include "tokenloc.hpp"
 
@@ -23,10 +23,7 @@ namespace Compiler
     class MultiChar
     {
     public:
-        MultiChar()
-        {
-            blank();
-        }
+        MultiChar() { blank(); }
 
         explicit MultiChar(const char ch)
         {
@@ -39,37 +36,35 @@ namespace Compiler
         static int getCharLength(const char ch)
         {
             unsigned char c = ch;
-            if (c<=127) return 0;
-            else if ((c & 0xE0) == 0xC0) return 1;
-            else if ((c & 0xF0) == 0xE0) return 2;
-            else if ((c & 0xF8) == 0xF0) return 3;
-            else return -1;
+            if (c <= 127)
+                return 0;
+            else if ((c & 0xE0) == 0xC0)
+                return 1;
+            else if ((c & 0xF0) == 0xE0)
+                return 2;
+            else if ((c & 0xF8) == 0xF0)
+                return 3;
+            else
+                return -1;
         }
 
-        bool operator== (const char ch)
-        {
-            return mData[0]==ch && mData[1]==0 && mData[2]==0 && mData[3]==0;
-        }
+        bool operator==(const char ch) { return mData[0] == ch && mData[1] == 0 && mData[2] == 0 && mData[3] == 0; }
 
-        bool operator== (const MultiChar& ch)
+        bool operator==(const MultiChar& ch)
         {
-            return mData[0]==ch.mData[0] && mData[1]==ch.mData[1] && mData[2]==ch.mData[2] && mData[3]==ch.mData[3];
+            return mData[0] == ch.mData[0] && mData[1] == ch.mData[1] && mData[2] == ch.mData[2]
+                && mData[3] == ch.mData[3];
         }
 
-        bool operator!= (const char ch)
-        {
-            return mData[0]!=ch || mData[1]!=0 || mData[2]!=0 || mData[3]!=0;
-        }
+        bool operator!=(const char ch) { return mData[0] != ch || mData[1] != 0 || mData[2] != 0 || mData[3] != 0; }
 
         bool isWhitespace()
         {
-            return (mData[0]==' ' || mData[0]=='\t' || mData[0]==',') && mData[1]==0 && mData[2]==0 && mData[3]==0;
+            return (mData[0] == ' ' || mData[0] == '\t' || mData[0] == ',') && mData[1] == 0 && mData[2] == 0
+                && mData[3] == 0;
         }
 
-        bool isDigit()
-        {
-            return std::isdigit(mData[0]) && mData[1]==0 && mData[2]==0 && mData[3]==0;
-        }
+        bool isDigit() { return std::isdigit(mData[0]) && mData[1] == 0 && mData[2] == 0 && mData[3] == 0; }
 
         bool isMinusSign()
         {
@@ -84,7 +79,7 @@ namespace Compiler
             if (isMinusSign())
                 return false;
 
-            return std::isalpha(mData[0]) || mData[1]!=0 || mData[2]!=0 || mData[3]!=0;
+            return std::isalpha(mData[0]) || mData[1] != 0 || mData[2] != 0 || mData[3] != 0;
         }
 
         void appendTo(std::string& str)
@@ -93,10 +88,10 @@ namespace Compiler
                 str += mData[i];
         }
 
-        void putback (std::istream& in)
+        void putback(std::istream& in)
         {
             for (int i = mLength; i >= 0; i--)
-                in.putback (mData[i]);
+                in.putback(mData[i]);
         }
 
         bool getFrom(std::istream& in)
@@ -109,11 +104,12 @@ namespace Compiler
                 return false;
 
             int length = getCharLength(ch);
-            if (length < 0) return false;
+            if (length < 0)
+                return false;
 
             for (int i = 0; i <= length; i++)
             {
-                in.get (ch);
+                in.get(ch);
 
                 if (!in.good())
                     return false;
@@ -136,11 +132,12 @@ namespace Compiler
                 return false;
 
             int length = getCharLength(ch);
-            if (length < 0) return false;
+            if (length < 0)
+                return false;
 
             for (int i = 0; i <= length; i++)
             {
-                in.get (ch);
+                in.get(ch);
 
                 if (!in.good())
                     return false;
@@ -173,123 +170,140 @@ namespace Compiler
 
     class Scanner
     {
-            enum putback_type
-            {
-                Putback_None, Putback_Special, Putback_Integer, Putback_Float,
-                Putback_Name, Putback_Keyword
-            };
-
-            ErrorHandler& mErrorHandler;
-            TokenLoc mLoc;
-            TokenLoc mPrevLoc;
-            std::istream& mStream;
-            const Extensions *mExtensions;
-            putback_type mPutback;
-            int mPutbackCode;
-            int mPutbackInteger;
-            float mPutbackFloat;
-            std::string mPutbackName;
-            TokenLoc mPutbackLoc;
-            bool mStrictKeywords;
-            bool mTolerantNames;
-            bool mIgnoreNewline;
-            bool mExpectName;
-
-        public:
-
-            enum keyword
-            {
-                K_begin, K_end,
-                K_short, K_long, K_float,
-                K_if, K_endif, K_else, K_elseif,
-                K_while, K_endwhile,
-                K_return,
-                K_messagebox,
-                K_set, K_to
-            };
-
-            enum special
-            {
-                S_newline,
-                S_open, S_close,
-                S_cmpEQ, S_cmpNE, S_cmpLT, S_cmpLE, S_cmpGT, S_cmpGE,
-                S_plus, S_minus, S_mult, S_div,
-                S_ref,
-                S_member
-            };
+        enum putback_type
+        {
+            Putback_None,
+            Putback_Special,
+            Putback_Integer,
+            Putback_Float,
+            Putback_Name,
+            Putback_Keyword
+        };
 
-        private:
+        ErrorHandler& mErrorHandler;
+        TokenLoc mLoc;
+        TokenLoc mPrevLoc;
+        std::istream& mStream;
+        const Extensions* mExtensions;
+        putback_type mPutback;
+        int mPutbackCode;
+        int mPutbackInteger;
+        float mPutbackFloat;
+        std::string mPutbackName;
+        TokenLoc mPutbackLoc;
+        bool mStrictKeywords;
+        bool mTolerantNames;
+        bool mIgnoreNewline;
+        bool mExpectName;
 
-        // not implemented
+    public:
+        enum keyword
+        {
+            K_begin,
+            K_end,
+            K_short,
+            K_long,
+            K_float,
+            K_if,
+            K_endif,
+            K_else,
+            K_elseif,
+            K_while,
+            K_endwhile,
+            K_return,
+            K_messagebox,
+            K_set,
+            K_to
+        };
 
-            Scanner (const Scanner&);
-            Scanner& operator= (const Scanner&);
+        enum special
+        {
+            S_newline,
+            S_open,
+            S_close,
+            S_cmpEQ,
+            S_cmpNE,
+            S_cmpLT,
+            S_cmpLE,
+            S_cmpGT,
+            S_cmpGE,
+            S_plus,
+            S_minus,
+            S_mult,
+            S_div,
+            S_ref,
+            S_member
+        };
 
-            bool get (MultiChar& c);
+    private:
+        // not implemented
+
+        Scanner(const Scanner&);
+        Scanner& operator=(const Scanner&);
 
-            void putback (MultiChar& c);
+        bool get(MultiChar& c);
 
-            bool scanToken (Parser& parser);
+        void putback(MultiChar& c);
 
-            bool scanInt (MultiChar& c, Parser& parser, bool& cont);
+        bool scanToken(Parser& parser);
 
-            bool scanFloat (const std::string& intValue, Parser& parser, bool& cont);
+        bool scanInt(MultiChar& c, Parser& parser, bool& cont);
 
-            bool scanName (MultiChar& c, Parser& parser, bool& cont, std::string name = {});
+        bool scanFloat(const std::string& intValue, Parser& parser, bool& cont);
 
-            /// \param name May contain the start of the name (one or more characters)
-            bool scanName (std::string& name);
+        bool scanName(MultiChar& c, Parser& parser, bool& cont, std::string name = {});
 
-            bool scanSpecial (MultiChar& c, Parser& parser, bool& cont);
+        /// \param name May contain the start of the name (one or more characters)
+        bool scanName(std::string& name);
 
-            bool isStringCharacter (MultiChar& c, bool lookAhead = true);
+        bool scanSpecial(MultiChar& c, Parser& parser, bool& cont);
 
-        public:
+        bool isStringCharacter(MultiChar& c, bool lookAhead = true);
 
-            Scanner (ErrorHandler& errorHandler, std::istream& inputStream,
-                const Extensions *extensions = nullptr);
-            ///< constructor
+    public:
+        Scanner(ErrorHandler& errorHandler, std::istream& inputStream, const Extensions* extensions = nullptr);
+        ///< constructor
 
-            void scan (Parser& parser);
-            ///< Scan a token and deliver it to the parser.
+        void scan(Parser& parser);
+        ///< Scan a token and deliver it to the parser.
 
-            void putbackSpecial (int code, const TokenLoc& loc);
-            ///< put back a special token
+        void putbackSpecial(int code, const TokenLoc& loc);
+        ///< put back a special token
 
-            void putbackInt (int value, const TokenLoc& loc);
-            ///< put back an integer token
+        void putbackInt(int value, const TokenLoc& loc);
+        ///< put back an integer token
 
-            void putbackFloat (float value, const TokenLoc& loc);
-            ///< put back a float token
+        void putbackFloat(float value, const TokenLoc& loc);
+        ///< put back a float token
 
-            void putbackName (const std::string& name, const TokenLoc& loc);
-            ///< put back a name token
+        void putbackName(const std::string& name, const TokenLoc& loc);
+        ///< put back a name token
 
-            void putbackKeyword (int keyword, const TokenLoc& loc);
-            ///< put back a keyword token
+        void putbackKeyword(int keyword, const TokenLoc& loc);
+        ///< put back a keyword token
 
-            void listKeywords (std::vector<std::string>& keywords);
-            ///< Append all known keywords to \a keywords.
+        void listKeywords(std::vector<std::string>& keywords);
+        ///< Append all known keywords to \a keywords.
 
-            /// Treat newline character as a part of script command.
-            ///
-            /// \attention This mode lasts only until the next keyword is reached.
-            void enableIgnoreNewlines();
+        /// Treat newline character as a part of script command.
+        ///
+        /// \attention This mode lasts only until the next keyword is reached.
+        void enableIgnoreNewlines();
 
-            /// Do not accept keywords in quotation marks anymore.
-            ///
-            /// \attention This mode lasts only until the next newline is reached.
-            void enableStrictKeywords();
+        /// Do not accept keywords in quotation marks anymore.
+        ///
+        /// \attention This mode lasts only until the next newline is reached.
+        void enableStrictKeywords();
 
-            /// Continue parsing a name when hitting a '.' or a '-'
-            ///
-            /// \attention This mode lasts only until the next newline is reached.
-            void enableTolerantNames();
+        /// Continue parsing a name when hitting a '.' or a '-'
+        ///
+        /// \attention This mode lasts only until the next newline is reached.
+        void enableTolerantNames();
 
-            /// Treat '.' and '-' as the start of a name.
-            ///
-            /// \attention This mode lasts only until the next newline is reached or the call to scan ends.
-            void enableExpectName();
+        /// Treat '.' and '-' as the start of a name.
+        ///
+        /// \attention This mode lasts only until the next newline is reached or the call to scan ends.
+        void enableExpectName();
     };
 }
 
diff --git a/components/compiler/scriptparser.cpp b/components/compiler/scriptparser.cpp
index a3bf232888..1b64729a35 100644
--- a/components/compiler/scriptparser.cpp
+++ b/components/compiler/scriptparser.cpp
@@ -1,92 +1,92 @@
 #include "scriptparser.hpp"
 
+#include "errorhandler.hpp"
 #include "scanner.hpp"
 #include "skipparser.hpp"
-#include "errorhandler.hpp"
 
 namespace Compiler
 {
-    ScriptParser::ScriptParser (ErrorHandler& errorHandler, const Context& context,
-        Locals& locals, bool end)
-    : Parser (errorHandler, context), mOutput (locals),
-      mLineParser (errorHandler, context, locals, mOutput.getLiterals(), mOutput.getCode()),
-      mControlParser (errorHandler, context, locals, mOutput.getLiterals()),
-      mEnd (end)
-    {}
-
-    void ScriptParser::getCode (std::vector<Interpreter::Type_Code>& code) const
+    ScriptParser::ScriptParser(ErrorHandler& errorHandler, const Context& context, Locals& locals, bool end)
+        : Parser(errorHandler, context)
+        , mOutput(locals)
+        , mLineParser(errorHandler, context, locals, mOutput.getLiterals(), mOutput.getCode())
+        , mControlParser(errorHandler, context, locals, mOutput.getLiterals())
+        , mEnd(end)
+    {
+    }
+
+    void ScriptParser::getCode(std::vector<Interpreter::Type_Code>& code) const
     {
-        mOutput.getCode (code);
+        mOutput.getCode(code);
     }
 
-    bool ScriptParser::parseName (const std::string& name, const TokenLoc& loc,
-        Scanner& scanner)
+    bool ScriptParser::parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner)
     {
         mLineParser.reset();
-        if (mLineParser.parseName (name, loc, scanner))
-            scanner.scan (mLineParser);
+        if (mLineParser.parseName(name, loc, scanner))
+            scanner.scan(mLineParser);
 
         return true;
     }
 
-    bool ScriptParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
+    bool ScriptParser::parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner)
     {
-        if (keyword==Scanner::K_while || keyword==Scanner::K_if || keyword==Scanner::K_elseif)
+        if (keyword == Scanner::K_while || keyword == Scanner::K_if || keyword == Scanner::K_elseif)
         {
             mControlParser.reset();
-            if (mControlParser.parseKeyword (keyword, loc, scanner))
-                scanner.scan (mControlParser);
+            if (mControlParser.parseKeyword(keyword, loc, scanner))
+                scanner.scan(mControlParser);
 
-            mControlParser.appendCode (mOutput.getCode());
+            mControlParser.appendCode(mOutput.getCode());
 
             return true;
         }
 
         /// \todo add an option to disable this nonsense
-        if (keyword==Scanner::K_endif)
+        if (keyword == Scanner::K_endif)
         {
             // surplus endif
-            getErrorHandler().warning ("endif without matching if/elseif", loc);
+            getErrorHandler().warning("endif without matching if/elseif", loc);
 
-            SkipParser skip (getErrorHandler(), getContext());
-            scanner.scan (skip);
+            SkipParser skip(getErrorHandler(), getContext());
+            scanner.scan(skip);
             return true;
         }
 
-        if (keyword==Scanner::K_end && mEnd)
+        if (keyword == Scanner::K_end && mEnd)
         {
             return false;
         }
 
         mLineParser.reset();
-        if (mLineParser.parseKeyword (keyword, loc, scanner))
-            scanner.scan (mLineParser);
+        if (mLineParser.parseKeyword(keyword, loc, scanner))
+            scanner.scan(mLineParser);
 
         return true;
     }
 
-    bool ScriptParser::parseSpecial (int code, const TokenLoc& loc, Scanner& scanner)
+    bool ScriptParser::parseSpecial(int code, const TokenLoc& loc, Scanner& scanner)
     {
-        if (code==Scanner::S_newline) // empty line
+        if (code == Scanner::S_newline) // empty line
             return true;
 
-        if (code==Scanner::S_open) /// \todo Option to switch this off
+        if (code == Scanner::S_open) /// \todo Option to switch this off
         {
-            scanner.putbackSpecial (code, loc);
-            return parseKeyword (Scanner::K_if, loc, scanner);
+            scanner.putbackSpecial(code, loc);
+            return parseKeyword(Scanner::K_if, loc, scanner);
         }
 
         mLineParser.reset();
-        if (mLineParser.parseSpecial (code, loc, scanner))
-            scanner.scan (mLineParser);
+        if (mLineParser.parseSpecial(code, loc, scanner))
+            scanner.scan(mLineParser);
 
         return true;
     }
 
-    void ScriptParser::parseEOF (Scanner& scanner)
+    void ScriptParser::parseEOF(Scanner& scanner)
     {
         if (mEnd)
-            Parser::parseEOF (scanner);
+            Parser::parseEOF(scanner);
     }
 
     void ScriptParser::reset()
diff --git a/components/compiler/scriptparser.hpp b/components/compiler/scriptparser.hpp
index 0433a23a35..3a7a2738ee 100644
--- a/components/compiler/scriptparser.hpp
+++ b/components/compiler/scriptparser.hpp
@@ -1,10 +1,10 @@
 #ifndef COMPILER_SCRIPTPARSER_H_INCLUDED
 #define COMPILER_SCRIPTPARSER_H_INCLUDED
 
-#include "parser.hpp"
-#include "lineparser.hpp"
 #include "controlparser.hpp"
+#include "lineparser.hpp"
 #include "output.hpp"
+#include "parser.hpp"
 
 namespace Compiler
 {
@@ -14,40 +14,36 @@ namespace Compiler
 
     class ScriptParser : public Parser
     {
-            Output mOutput;
-            LineParser mLineParser;
-            ControlParser mControlParser;
-            bool mEnd;
-
-        public:
+        Output mOutput;
+        LineParser mLineParser;
+        ControlParser mControlParser;
+        bool mEnd;
 
-            /// \param end of script is marked by end keyword.
-            ScriptParser (ErrorHandler& errorHandler, const Context& context, Locals& locals,
-                bool end = false);
+    public:
+        /// \param end of script is marked by end keyword.
+        ScriptParser(ErrorHandler& errorHandler, const Context& context, Locals& locals, bool end = false);
 
-            void getCode (std::vector<Interpreter::Type_Code>& code) const;
-            ///< store generated code in \a code.
+        void getCode(std::vector<Interpreter::Type_Code>& code) const;
+        ///< store generated code in \a code.
 
-            bool parseName (const std::string& name, const TokenLoc& loc,
-                Scanner& scanner) override;
-            ///< Handle a name token.
-            /// \return fetch another token?
+        bool parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a name token.
+        /// \return fetch another token?
 
-            bool parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a keyword token.
-            /// \return fetch another token?
+        bool parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a keyword token.
+        /// \return fetch another token?
 
-            bool parseSpecial (int code, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a special character token.
-            /// \return fetch another token?
+        bool parseSpecial(int code, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a special character token.
+        /// \return fetch another token?
 
-            void parseEOF (Scanner& scanner) override;
-            ///< Handle EOF token.
+        void parseEOF(Scanner& scanner) override;
+        ///< Handle EOF token.
 
-            void reset() override;
-            ///< Reset parser to clean state.
+        void reset() override;
+        ///< Reset parser to clean state.
     };
 }
 
 #endif
-
diff --git a/components/compiler/skipparser.cpp b/components/compiler/skipparser.cpp
index 3e704253dd..0036e93dda 100644
--- a/components/compiler/skipparser.cpp
+++ b/components/compiler/skipparser.cpp
@@ -4,37 +4,36 @@
 
 namespace Compiler
 {
-    SkipParser::SkipParser (ErrorHandler& errorHandler, const Context& context)
-    : Parser (errorHandler, context)
-    {}
+    SkipParser::SkipParser(ErrorHandler& errorHandler, const Context& context)
+        : Parser(errorHandler, context)
+    {
+    }
 
-    bool SkipParser::parseInt (int value, const TokenLoc& loc, Scanner& scanner)
+    bool SkipParser::parseInt(int value, const TokenLoc& loc, Scanner& scanner)
     {
         return true;
     }
 
-    bool SkipParser::parseFloat (float value, const TokenLoc& loc, Scanner& scanner)
+    bool SkipParser::parseFloat(float value, const TokenLoc& loc, Scanner& scanner)
     {
         return true;
     }
 
-    bool SkipParser::parseName (const std::string& name, const TokenLoc& loc,
-        Scanner& scanner)
+    bool SkipParser::parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner)
     {
         return true;
     }
 
-    bool SkipParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
+    bool SkipParser::parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner)
     {
         return true;
     }
 
-    bool SkipParser::parseSpecial (int code, const TokenLoc& loc, Scanner& scanner)
+    bool SkipParser::parseSpecial(int code, const TokenLoc& loc, Scanner& scanner)
     {
-        if (code==Scanner::S_newline)
+        if (code == Scanner::S_newline)
             return false;
 
         return true;
     }
 }
-
diff --git a/components/compiler/skipparser.hpp b/components/compiler/skipparser.hpp
index 4be90f3a1e..fdc5effc13 100644
--- a/components/compiler/skipparser.hpp
+++ b/components/compiler/skipparser.hpp
@@ -11,32 +11,29 @@ namespace Compiler
 
     class SkipParser : public Parser
     {
-        public:
+    public:
+        SkipParser(ErrorHandler& errorHandler, const Context& context);
 
-            SkipParser (ErrorHandler& errorHandler, const Context& context);
+        bool parseInt(int value, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle an int token.
+        /// \return fetch another token?
 
-            bool parseInt (int value, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle an int token.
-            /// \return fetch another token?
+        bool parseFloat(float value, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a float token.
+        /// \return fetch another token?
 
-            bool parseFloat (float value, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a float token.
-            /// \return fetch another token?
+        bool parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a name token.
+        /// \return fetch another token?
 
-            bool parseName (const std::string& name, const TokenLoc& loc,
-                Scanner& scanner) override;
-            ///< Handle a name token.
-            /// \return fetch another token?
+        bool parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a keyword token.
+        /// \return fetch another token?
 
-            bool parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a keyword token.
-            /// \return fetch another token?
-
-            bool parseSpecial (int code, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a special character token.
-            /// \return fetch another token?
+        bool parseSpecial(int code, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a special character token.
+        /// \return fetch another token?
     };
 }
 
 #endif
-
diff --git a/components/compiler/streamerrorhandler.cpp b/components/compiler/streamerrorhandler.cpp
index 030d02d1db..e72eb6fdb1 100644
--- a/components/compiler/streamerrorhandler.cpp
+++ b/components/compiler/streamerrorhandler.cpp
@@ -10,8 +10,7 @@ namespace Compiler
 {
     // Report error to the user.
 
-    void StreamErrorHandler::report (const std::string& message, const TokenLoc& loc,
-        Type type)
+    void StreamErrorHandler::report(const std::string& message, const TokenLoc& loc, Type type)
     {
         Debug::Level logLevel = Debug::Info; // Usually script warnings are not too important
         if (type == ErrorMessage)
@@ -19,7 +18,7 @@ namespace Compiler
 
         std::stringstream text;
 
-        if (type==ErrorMessage)
+        if (type == ErrorMessage)
             text << "Error: ";
         else
             text << "Warning: ";
@@ -27,23 +26,22 @@ namespace Compiler
         if (!mContext.empty())
             text << mContext << " ";
 
-        text << "line " << loc.mLine+1 << ", column " << loc.mColumn+1
-             << " (" << loc.mLiteral << "): " << message;
+        text << "line " << loc.mLine + 1 << ", column " << loc.mColumn + 1 << " (" << loc.mLiteral << "): " << message;
 
         Log(logLevel) << text.str();
     }
 
     // Report a file related error
 
-    void StreamErrorHandler::report (const std::string& message, Type type)
+    void StreamErrorHandler::report(const std::string& message, Type type)
     {
         Debug::Level logLevel = Debug::Info;
-        if (type==ErrorMessage)
+        if (type == ErrorMessage)
             logLevel = Debug::Error;
 
         std::stringstream text;
 
-        if (type==ErrorMessage)
+        if (type == ErrorMessage)
             text << "Error: ";
         else
             text << "Warning: ";
@@ -56,14 +54,16 @@ namespace Compiler
         Log(logLevel) << text.str();
     }
 
-    void StreamErrorHandler::setContext(const std::string &context)
+    void StreamErrorHandler::setContext(const std::string& context)
     {
         mContext = context;
     }
 
     StreamErrorHandler::StreamErrorHandler() = default;
 
-    ContextOverride::ContextOverride(StreamErrorHandler& handler, const std::string& context) : mHandler(handler), mContext(handler.mContext)
+    ContextOverride::ContextOverride(StreamErrorHandler& handler, const std::string& context)
+        : mHandler(handler)
+        , mContext(handler.mContext)
     {
         mHandler.setContext(context);
     }
diff --git a/components/compiler/streamerrorhandler.hpp b/components/compiler/streamerrorhandler.hpp
index f70c64d25d..2bd8e16dad 100644
--- a/components/compiler/streamerrorhandler.hpp
+++ b/components/compiler/streamerrorhandler.hpp
@@ -10,41 +10,41 @@ namespace Compiler
 
     class StreamErrorHandler : public ErrorHandler
     {
-            std::string mContext;
+        std::string mContext;
 
-            friend class ContextOverride;
+        friend class ContextOverride;
         // not implemented
 
-            StreamErrorHandler (const StreamErrorHandler&);
-            StreamErrorHandler& operator= (const StreamErrorHandler&);
+        StreamErrorHandler(const StreamErrorHandler&);
+        StreamErrorHandler& operator=(const StreamErrorHandler&);
 
-            void report (const std::string& message, const TokenLoc& loc, Type type) override;
-            ///< Report error to the user.
+        void report(const std::string& message, const TokenLoc& loc, Type type) override;
+        ///< Report error to the user.
 
-            void report (const std::string& message, Type type) override;
-            ///< Report a file related error
+        void report(const std::string& message, Type type) override;
+        ///< Report a file related error
 
-        public:
-
-            void setContext(const std::string& context);
+    public:
+        void setContext(const std::string& context);
 
         // constructors
 
-            StreamErrorHandler ();
-            ///< constructor
+        StreamErrorHandler();
+        ///< constructor
     };
 
     class ContextOverride
     {
-            StreamErrorHandler& mHandler;
-            const std::string mContext;
-        public:
-            ContextOverride (StreamErrorHandler& handler, const std::string& context);
+        StreamErrorHandler& mHandler;
+        const std::string mContext;
+
+    public:
+        ContextOverride(StreamErrorHandler& handler, const std::string& context);
 
-            ContextOverride (const ContextOverride&) = delete;
-            ContextOverride& operator= (const ContextOverride&) = delete;
+        ContextOverride(const ContextOverride&) = delete;
+        ContextOverride& operator=(const ContextOverride&) = delete;
 
-            ~ContextOverride();
+        ~ContextOverride();
     };
 }
 
diff --git a/components/compiler/stringparser.cpp b/components/compiler/stringparser.cpp
index f6a0ca225f..0d6d7f3ff9 100644
--- a/components/compiler/stringparser.cpp
+++ b/components/compiler/stringparser.cpp
@@ -5,21 +5,22 @@
 
 #include <components/misc/strings/lower.hpp>
 
-#include "scanner.hpp"
-#include "generator.hpp"
 #include "context.hpp"
 #include "extensions.hpp"
+#include "generator.hpp"
+#include "scanner.hpp"
 
 namespace Compiler
 {
-    StringParser::StringParser (ErrorHandler& errorHandler, const Context& context, Literals& literals)
-    : Parser (errorHandler, context), mLiterals (literals), mSmashCase (false), mDiscard (false)
+    StringParser::StringParser(ErrorHandler& errorHandler, const Context& context, Literals& literals)
+        : Parser(errorHandler, context)
+        , mLiterals(literals)
+        , mSmashCase(false)
+        , mDiscard(false)
     {
-
     }
 
-    bool StringParser::parseName (const std::string& name, const TokenLoc& loc,
-        Scanner& scanner)
+    bool StringParser::parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner)
     {
         start();
         mTokenLoc = loc;
@@ -27,58 +28,55 @@ namespace Compiler
         if (!mDiscard)
         {
             if (mSmashCase)
-                Generator::pushString (mCode, mLiterals, Misc::StringUtils::lowerCase (name));
+                Generator::pushString(mCode, mLiterals, Misc::StringUtils::lowerCase(name));
             else
-                Generator::pushString (mCode, mLiterals, name);
+                Generator::pushString(mCode, mLiterals, name);
         }
 
         return false;
     }
 
-    bool StringParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
+    bool StringParser::parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner)
     {
-        if (const Extensions *extensions = getContext().getExtensions())
+        if (const Extensions* extensions = getContext().getExtensions())
         {
             std::string argumentType; // ignored
             bool hasExplicit = false; // ignored
-            if (extensions->isInstruction (keyword, argumentType, hasExplicit))
+            if (extensions->isInstruction(keyword, argumentType, hasExplicit))
             {
                 // pretend this is not a keyword
                 std::string name = loc.mLiteral;
-                if (name.size()>=2 && name[0]=='"' && name[name.size()-1]=='"')
-                    name = name.substr (1, name.size()-2);
-                return parseName (name, loc, scanner);
+                if (name.size() >= 2 && name[0] == '"' && name[name.size() - 1] == '"')
+                    name = name.substr(1, name.size() - 2);
+                return parseName(name, loc, scanner);
             }
         }
 
-        if (keyword==Scanner::K_end || keyword==Scanner::K_begin ||
-            keyword==Scanner::K_short || keyword==Scanner::K_long ||
-            keyword==Scanner::K_float || keyword==Scanner::K_if ||
-            keyword==Scanner::K_endif || keyword==Scanner::K_else ||
-            keyword==Scanner::K_elseif || keyword==Scanner::K_while ||
-            keyword==Scanner::K_endwhile || keyword==Scanner::K_return ||
-            keyword==Scanner::K_messagebox || keyword==Scanner::K_set ||
-            keyword==Scanner::K_to)
+        if (keyword == Scanner::K_end || keyword == Scanner::K_begin || keyword == Scanner::K_short
+            || keyword == Scanner::K_long || keyword == Scanner::K_float || keyword == Scanner::K_if
+            || keyword == Scanner::K_endif || keyword == Scanner::K_else || keyword == Scanner::K_elseif
+            || keyword == Scanner::K_while || keyword == Scanner::K_endwhile || keyword == Scanner::K_return
+            || keyword == Scanner::K_messagebox || keyword == Scanner::K_set || keyword == Scanner::K_to)
         {
             // pretend this is not a keyword
             std::string name = loc.mLiteral;
-            if (name.size()>=2 && name[0]=='"' && name[name.size()-1]=='"')
-                name = name.substr (1, name.size()-2);
-            return parseName (name, loc, scanner);
+            if (name.size() >= 2 && name[0] == '"' && name[name.size() - 1] == '"')
+                name = name.substr(1, name.size() - 2);
+            return parseName(name, loc, scanner);
         }
 
-        return Parser::parseKeyword (keyword, loc, scanner);
+        return Parser::parseKeyword(keyword, loc, scanner);
     }
 
-    bool StringParser::parseInt (int value, const TokenLoc& loc, Scanner& scanner)
+    bool StringParser::parseInt(int value, const TokenLoc& loc, Scanner& scanner)
     {
         reportWarning("Treating integer argument as a string", loc);
         return parseName(loc.mLiteral, loc, scanner);
     }
 
-    void StringParser::append (std::vector<Interpreter::Type_Code>& code)
+    void StringParser::append(std::vector<Interpreter::Type_Code>& code)
     {
-        std::copy (mCode.begin(), mCode.end(), std::back_inserter (code));
+        std::copy(mCode.begin(), mCode.end(), std::back_inserter(code));
     }
 
     void StringParser::reset()
diff --git a/components/compiler/stringparser.hpp b/components/compiler/stringparser.hpp
index cdc7c676a7..6e3849936a 100644
--- a/components/compiler/stringparser.hpp
+++ b/components/compiler/stringparser.hpp
@@ -14,45 +14,43 @@ namespace Compiler
 
     class StringParser : public Parser
     {
-            Literals& mLiterals;
-            std::vector<Interpreter::Type_Code> mCode;
-            bool mSmashCase;
-            TokenLoc mTokenLoc;
-            bool mDiscard;
+        Literals& mLiterals;
+        std::vector<Interpreter::Type_Code> mCode;
+        bool mSmashCase;
+        TokenLoc mTokenLoc;
+        bool mDiscard;
 
-        public:
+    public:
+        StringParser(ErrorHandler& errorHandler, const Context& context, Literals& literals);
 
-            StringParser (ErrorHandler& errorHandler, const Context& context, Literals& literals);
+        bool parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a name token.
+        /// \return fetch another token?
 
-            bool parseName (const std::string& name, const TokenLoc& loc,
-                Scanner& scanner) override;
-            ///< Handle a name token.
-            /// \return fetch another token?
+        bool parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle a keyword token.
+        /// \return fetch another token?
 
-            bool parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a keyword token.
-            /// \return fetch another token?
+        bool parseInt(int value, const TokenLoc& loc, Scanner& scanner) override;
+        ///< Handle an int token.
+        /// \return fetch another token?
 
-            bool parseInt (int value, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle an int token.
-            /// \return fetch another token?
+        void append(std::vector<Interpreter::Type_Code>& code);
+        ///< Append code for parsed string.
 
-            void append (std::vector<Interpreter::Type_Code>& code);
-            ///< Append code for parsed string.
+        void smashCase();
+        ///< Transform all scanned strings to lower case
 
-            void smashCase();
-            ///< Transform all scanned strings to lower case
+        void reset() override;
+        ///< Reset parser to clean state (this includes the smashCase function).
 
-            void reset() override;
-            ///< Reset parser to clean state (this includes the smashCase function).
+        /// Returns TokenLoc object for string. If no string has been parsed, the TokenLoc
+        /// object will be default initialised.
+        const TokenLoc& getTokenLoc() const;
 
-            /// Returns TokenLoc object for string. If no string has been parsed, the TokenLoc
-            /// object will be default initialised.
-            const TokenLoc& getTokenLoc() const;
-
-            /// If parsing a string, do not add it to the literal table and do not create code
-            /// for it.
-            void discard();
+        /// If parsing a string, do not add it to the literal table and do not create code
+        /// for it.
+        void discard();
     };
 }
 
diff --git a/components/compiler/tokenloc.hpp b/components/compiler/tokenloc.hpp
index ff715c5e9a..1669e9e04a 100644
--- a/components/compiler/tokenloc.hpp
+++ b/components/compiler/tokenloc.hpp
@@ -13,7 +13,12 @@ namespace Compiler
         int mLine;
         std::string mLiteral;
 
-        TokenLoc() : mColumn (0), mLine (0), mLiteral () {}
+        TokenLoc()
+            : mColumn(0)
+            , mLine(0)
+            , mLiteral()
+        {
+        }
     };
 }
 
diff --git a/components/config/gamesettings.cpp b/components/config/gamesettings.cpp
index 3f844e01b5..c720d6314f 100644
--- a/components/config/gamesettings.cpp
+++ b/components/config/gamesettings.cpp
@@ -1,9 +1,9 @@
 #include "gamesettings.hpp"
 #include "launchersettings.hpp"
 
-#include <QTextCodec>
 #include <QDir>
 #include <QRegExp>
+#include <QTextCodec>
 
 #include <components/files/configurationmanager.hpp>
 #include <components/files/conversion.hpp>
@@ -14,7 +14,7 @@ const char Config::GameSettings::sArchiveKey[] = "fallback-archive";
 const char Config::GameSettings::sContentKey[] = "content";
 const char Config::GameSettings::sDirectoryKey[] = "data";
 
-Config::GameSettings::GameSettings(Files::ConfigurationManager &cfg)
+Config::GameSettings::GameSettings(Files::ConfigurationManager& cfg)
     : mCfgMgr(cfg)
 {
 }
@@ -24,7 +24,7 @@ void Config::GameSettings::validatePaths()
     QStringList paths = mSettings.values(QString("data"));
     Files::PathContainer dataDirs;
 
-    for (const QString &path : paths)
+    for (const QString& path : paths)
     {
         dataDirs.emplace_back(Files::pathFromQString(path));
     }
@@ -33,7 +33,8 @@ void Config::GameSettings::validatePaths()
     mCfgMgr.processPaths(dataDirs, /*basePath=*/"");
     mDataDirs.clear();
 
-    for (const auto & dataDir : dataDirs) {
+    for (const auto& dataDir : dataDirs)
+    {
         if (is_directory(dataDir))
             mDataDirs.append(Files::pathToQString(dataDir));
     }
@@ -54,7 +55,8 @@ void Config::GameSettings::validatePaths()
 
     mCfgMgr.processPaths(dataDirs, /*basePath=*/"");
 
-    if (!dataDirs.empty()) {
+    if (!dataDirs.empty())
+    {
         const auto& path = dataDirs.front();
         if (is_directory(path))
             mDataLocal = Files::pathToQString(path);
@@ -70,54 +72,53 @@ std::filesystem::path Config::GameSettings::getGlobalDataDir() const
     return {};
 }
 
-QStringList Config::GameSettings::values(const QString &key, const QStringList &defaultValues) const
+QStringList Config::GameSettings::values(const QString& key, const QStringList& defaultValues) const
 {
     if (!mSettings.values(key).isEmpty())
         return mSettings.values(key);
     return defaultValues;
 }
 
-bool Config::GameSettings::readFile(QTextStream &stream, bool ignoreContent)
+bool Config::GameSettings::readFile(QTextStream& stream, bool ignoreContent)
 {
     return readFile(stream, mSettings, ignoreContent);
 }
 
-bool Config::GameSettings::readUserFile(QTextStream &stream, bool ignoreContent)
+bool Config::GameSettings::readUserFile(QTextStream& stream, bool ignoreContent)
 {
     return readFile(stream, mUserSettings, ignoreContent);
 }
 
-bool Config::GameSettings::readFile(QTextStream &stream, QMultiMap<QString, QString> &settings, bool ignoreContent)
+bool Config::GameSettings::readFile(QTextStream& stream, QMultiMap<QString, QString>& settings, bool ignoreContent)
 {
     QMultiMap<QString, QString> cache;
     QRegExp keyRe("^([^=]+)\\s*=\\s*(.+)$");
 
-    while (!stream.atEnd()) {
+    while (!stream.atEnd())
+    {
         QString line = stream.readLine();
 
         if (line.isEmpty() || line.startsWith("#"))
             continue;
 
-        if (keyRe.indexIn(line) != -1) {
+        if (keyRe.indexIn(line) != -1)
+        {
 
             QString key = keyRe.cap(1).trimmed();
             QString value = keyRe.cap(2).trimmed();
 
             // Don't remove composing entries
-            if (key != QLatin1String("data")
-                && key != QLatin1String("fallback-archive")
-                && key != QLatin1String("content")
-                && key != QLatin1String("groundcover")
+            if (key != QLatin1String("data") && key != QLatin1String("fallback-archive")
+                && key != QLatin1String("content") && key != QLatin1String("groundcover")
                 && key != QLatin1String("script-blacklist"))
                 settings.remove(key);
 
-            if (key == QLatin1String("data")
-                || key == QLatin1String("data-local")
-                || key == QLatin1String("resources")
+            if (key == QLatin1String("data") || key == QLatin1String("data-local") || key == QLatin1String("resources")
                 || key == QLatin1String("load-savegame"))
             {
                 // Path line (e.g. 'data=...'), so needs processing to deal with ampersands and quotes
-                // The following is based on boost::io::detail::quoted_manip.hpp, but calling those functions did not work as there are too may QStrings involved
+                // The following is based on boost::io::detail::quoted_manip.hpp, but calling those functions did not
+                // work as there are too may QStrings involved
                 QChar delim = '\"';
                 QChar escape = '&';
 
@@ -136,19 +137,21 @@ bool Config::GameSettings::readFile(QTextStream &stream, QMultiMap<QString, QStr
                     }
                 }
             }
-            else if(ignoreContent && key == QLatin1String("content"))
+            else if (ignoreContent && key == QLatin1String("content"))
                 continue;
 
             QStringList values = cache.values(key);
             values.append(settings.values(key));
 
-            if (!values.contains(value)) {
+            if (!values.contains(value))
+            {
                 cache.insert(key, value);
             }
         }
     }
 
-    if (settings.isEmpty()) {
+    if (settings.isEmpty())
+    {
         settings = cache; // This is the first time we read a file
         validatePaths();
         return true;
@@ -161,24 +164,25 @@ bool Config::GameSettings::readFile(QTextStream &stream, QMultiMap<QString, QStr
     return true;
 }
 
-bool Config::GameSettings::writeFile(QTextStream &stream)
+bool Config::GameSettings::writeFile(QTextStream& stream)
 {
     // Iterate in reverse order to preserve insertion order
     QMapIterator<QString, QString> i(mUserSettings);
     i.toBack();
 
-    while (i.hasPrevious()) {
+    while (i.hasPrevious())
+    {
         i.previous();
 
-        // path lines (e.g. 'data=...') need quotes and ampersands escaping to match how boost::filesystem::path uses boost::io::quoted
-        if (i.key() == QLatin1String("data")
-            || i.key() == QLatin1String("data-local")
-            || i.key() == QLatin1String("resources")
-            || i.key() == QLatin1String("load-savegame"))
+        // path lines (e.g. 'data=...') need quotes and ampersands escaping to match how boost::filesystem::path uses
+        // boost::io::quoted
+        if (i.key() == QLatin1String("data") || i.key() == QLatin1String("data-local")
+            || i.key() == QLatin1String("resources") || i.key() == QLatin1String("load-savegame"))
         {
             stream << i.key() << "=";
 
-            // The following is based on boost::io::detail::quoted_manip.hpp, but calling those functions did not work as there are too may QStrings involved
+            // The following is based on boost::io::detail::quoted_manip.hpp, but calling those functions did not work
+            // as there are too may QStrings involved
             QChar delim = '\"';
             QChar escape = '&';
             QString string = i.value();
@@ -197,7 +201,6 @@ bool Config::GameSettings::writeFile(QTextStream &stream)
         }
 
         stream << i.key() << "=" << i.value() << "\n";
-
     }
 
     return true;
@@ -205,13 +208,10 @@ bool Config::GameSettings::writeFile(QTextStream &stream)
 
 bool Config::GameSettings::isOrderedLine(const QString& line)
 {
-    return line.contains(QRegExp("^\\s*fallback-archive\\s*="))
-           || line.contains(QRegExp("^\\s*fallback\\s*="))
-           || line.contains(QRegExp("^\\s*data\\s*="))
-           || line.contains(QRegExp("^\\s*data-local\\s*="))
-           || line.contains(QRegExp("^\\s*resources\\s*="))
-           || line.contains(QRegExp("^\\s*groundcover\\s*="))
-           || line.contains(QRegExp("^\\s*content\\s*="));
+    return line.contains(QRegExp("^\\s*fallback-archive\\s*=")) || line.contains(QRegExp("^\\s*fallback\\s*="))
+        || line.contains(QRegExp("^\\s*data\\s*=")) || line.contains(QRegExp("^\\s*data-local\\s*="))
+        || line.contains(QRegExp("^\\s*resources\\s*=")) || line.contains(QRegExp("^\\s*groundcover\\s*="))
+        || line.contains(QRegExp("^\\s*content\\s*="));
 }
 
 // Policy:
@@ -228,7 +228,7 @@ bool Config::GameSettings::isOrderedLine(const QString& line)
 // - Removed content items are saved as comments if the item had any comments.
 //   Content items prepended with '##' are considered previously removed.
 //
-bool Config::GameSettings::writeFileWithComments(QFile &file)
+bool Config::GameSettings::writeFileWithComments(QFile& file)
 {
     QTextStream stream(&file);
     stream.setCodec(QTextCodec::codecForName("UTF-8"));
@@ -273,7 +273,7 @@ bool Config::GameSettings::writeFileWithComments(QFile &file)
     QRegExp settingRegex("^([^=]+)\\s*=\\s*([^,]+)(.*)$");
     std::vector<QString> comments;
     auto commentStart = fileCopy.end();
-    std::map<QString, std::vector<QString> > commentsMap;
+    std::map<QString, std::vector<QString>> commentsMap;
     for (auto iter = fileCopy.begin(); iter != fileCopy.end(); ++iter)
     {
         if (isOrderedLine(*iter))
@@ -283,7 +283,7 @@ bool Config::GameSettings::writeFileWithComments(QFile &file)
             {
                 if (settingRegex.indexIn(*iter) != -1)
                 {
-                    commentsMap[settingRegex.cap(1)+"="+settingRegex.cap(2)] = comments;
+                    commentsMap[settingRegex.cap(1) + "=" + settingRegex.cap(2)] = comments;
                     comments.clear();
                     commentStart = fileCopy.end();
                 }
@@ -318,13 +318,14 @@ bool Config::GameSettings::writeFileWithComments(QFile &file)
             int index = settingRegex.indexIn(*iter);
 
             // blank or non-"ordered" line, write saved comments
-            if (!comments.empty() && index != -1 && settingRegex.captureCount() >= 2 &&
-                mUserSettings.find(settingRegex.cap(1)) != mUserSettings.end())
+            if (!comments.empty() && index != -1 && settingRegex.captureCount() >= 2
+                && mUserSettings.find(settingRegex.cap(1)) != mUserSettings.end())
             {
                 if (commentStart == fileCopy.end())
-                    throw std::runtime_error("Config::GameSettings: failed to parse settings - iterator is past of end of settings file");
+                    throw std::runtime_error(
+                        "Config::GameSettings: failed to parse settings - iterator is past of end of settings file");
 
-                for (const auto & comment : comments)
+                for (const auto& comment : comments)
                 {
                     *commentStart = comment;
                     ++commentStart;
@@ -349,14 +350,14 @@ bool Config::GameSettings::writeFileWithComments(QFile &file)
             // look for a matching key in user settings
             *iter = QString(); // assume no match
             QString key = settingRegex.cap(1);
-            QString keyVal = settingRegex.cap(1)+"="+settingRegex.cap(2);
+            QString keyVal = settingRegex.cap(1) + "=" + settingRegex.cap(2);
             QMultiMap<QString, QString>::const_iterator i = mUserSettings.find(key);
             while (i != mUserSettings.end() && i.key() == key)
             {
                 QString settingLine = i.key() + "=" + i.value();
                 if (settingRegex.indexIn(settingLine) != -1)
                 {
-                    if ((settingRegex.cap(1)+"="+settingRegex.cap(2)) == keyVal)
+                    if ((settingRegex.cap(1) + "=" + settingRegex.cap(2)) == keyVal)
                     {
                         *iter = settingLine;
                         break;
@@ -368,7 +369,7 @@ bool Config::GameSettings::writeFileWithComments(QFile &file)
     }
 
     // comments at top of file
-    for (auto & iter : fileCopy)
+    for (auto& iter : fileCopy)
     {
         if (iter.isNull())
             continue;
@@ -391,14 +392,13 @@ bool Config::GameSettings::writeFileWithComments(QFile &file)
     {
         it.previous();
 
-        if (it.key() == QLatin1String("data")
-            || it.key() == QLatin1String("data-local")
-            || it.key() == QLatin1String("resources")
-            || it.key() == QLatin1String("load-savegame"))
+        if (it.key() == QLatin1String("data") || it.key() == QLatin1String("data-local")
+            || it.key() == QLatin1String("resources") || it.key() == QLatin1String("load-savegame"))
         {
             settingLine = it.key() + "=";
 
-            // The following is based on boost::io::detail::quoted_manip.hpp, but calling those functions did not work as there are too may QStrings involved
+            // The following is based on boost::io::detail::quoted_manip.hpp, but calling those functions did not work
+            // as there are too may QStrings involved
             QChar delim = '\"';
             QChar escape = '&';
             QString string = it.value();
@@ -417,16 +417,16 @@ bool Config::GameSettings::writeFileWithComments(QFile &file)
 
         if (settingRegex.indexIn(settingLine) != -1)
         {
-            auto i = commentsMap.find(settingRegex.cap(1)+"="+settingRegex.cap(2));
+            auto i = commentsMap.find(settingRegex.cap(1) + "=" + settingRegex.cap(2));
 
             // check if previous removed content item with comments
             if (i == commentsMap.end())
-                i = commentsMap.find("##"+settingRegex.cap(1)+"="+settingRegex.cap(2));
+                i = commentsMap.find("##" + settingRegex.cap(1) + "=" + settingRegex.cap(2));
 
             if (i != commentsMap.end())
             {
                 std::vector<QString> cLines = i->second;
-                for (const auto & cLine : cLines)
+                for (const auto& cLine : cLines)
                     stream << cLine << "\n";
 
                 commentsMap.erase(i);
@@ -445,13 +445,13 @@ bool Config::GameSettings::writeFileWithComments(QFile &file)
             if (i->first.contains(QRegExp("^\\s*content\\s*=")))
             {
                 std::vector<QString> cLines = i->second;
-                for (const auto & cLine : cLines)
+                for (const auto& cLine : cLines)
                     stream << cLine << "\n";
 
                 // mark the content line entry for future preocessing
                 stream << "##" << i->first << "\n";
 
-                //commentsMap.erase(i);
+                // commentsMap.erase(i);
             }
         }
     }
@@ -459,7 +459,7 @@ bool Config::GameSettings::writeFileWithComments(QFile &file)
     // flush any end comments
     if (!comments.empty())
     {
-        for (const auto & comment : comments)
+        for (const auto& comment : comments)
             stream << comment << "\n";
     }
 
@@ -472,9 +472,10 @@ bool Config::GameSettings::hasMaster()
 {
     bool result = false;
     QStringList content = mSettings.values(QString(Config::GameSettings::sContentKey));
-    for (int i = 0; i < content.count(); ++i) 
+    for (int i = 0; i < content.count(); ++i)
     {
-        if (content.at(i).endsWith(QLatin1String(".omwgame"), Qt::CaseInsensitive) || content.at(i).endsWith(QLatin1String(".esm"), Qt::CaseInsensitive))
+        if (content.at(i).endsWith(QLatin1String(".omwgame"), Qt::CaseInsensitive)
+            || content.at(i).endsWith(QLatin1String(".esm"), Qt::CaseInsensitive))
         {
             result = true;
             break;
@@ -484,10 +485,10 @@ bool Config::GameSettings::hasMaster()
     return result;
 }
 
-void Config::GameSettings::setContentList(const QStringList& dirNames, const QStringList& archiveNames, const QStringList& fileNames)
+void Config::GameSettings::setContentList(
+    const QStringList& dirNames, const QStringList& archiveNames, const QStringList& fileNames)
 {
-    auto const reset = [this](const char* key, const QStringList& list)
-    {
+    auto const reset = [this](const char* key, const QStringList& list) {
         remove(key);
         for (auto const& item : list)
             setMultiValue(key, item);
@@ -522,4 +523,3 @@ void Config::GameSettings::clear()
     mDataDirs.clear();
     mDataLocal.clear();
 }
-
diff --git a/components/config/gamesettings.hpp b/components/config/gamesettings.hpp
index c40cc92617..8df0d6aaca 100644
--- a/components/config/gamesettings.hpp
+++ b/components/config/gamesettings.hpp
@@ -1,18 +1,18 @@
 #ifndef GAMESETTINGS_HPP
 #define GAMESETTINGS_HPP
 
-#include <QTextStream>
-#include <QStringList>
-#include <QString>
 #include <QFile>
 #include <QMultiMap>
+#include <QString>
+#include <QStringList>
+#include <QTextStream>
 
 #include <filesystem>
 
 namespace Files
 {
-  typedef std::vector<std::filesystem::path> PathContainer;
-  struct ConfigurationManager;
+    typedef std::vector<std::filesystem::path> PathContainer;
+    struct ConfigurationManager;
 }
 
 namespace Config
@@ -20,15 +20,14 @@ namespace Config
     class GameSettings
     {
     public:
-        GameSettings(Files::ConfigurationManager &cfg);
+        GameSettings(Files::ConfigurationManager& cfg);
 
-        inline QString value(const QString &key, const QString &defaultValue = QString())
+        inline QString value(const QString& key, const QString& defaultValue = QString())
         {
             return mSettings.value(key).isEmpty() ? defaultValue : mSettings.value(key);
         }
 
-
-        inline void setValue(const QString &key, const QString &value)
+        inline void setValue(const QString& key, const QString& value)
         {
             mSettings.remove(key);
             mSettings.insert(key, value);
@@ -36,7 +35,7 @@ namespace Config
             mUserSettings.insert(key, value);
         }
 
-        inline void setMultiValue(const QString &key, const QString &value)
+        inline void setMultiValue(const QString& key, const QString& value)
         {
             QStringList values = mSettings.values(key);
             if (!values.contains(value))
@@ -47,7 +46,7 @@ namespace Config
                 mUserSettings.insert(key, value);
         }
 
-        inline void remove(const QString &key)
+        inline void remove(const QString& key)
         {
             mSettings.remove(key);
             mUserSettings.remove(key);
@@ -56,20 +55,28 @@ namespace Config
         QStringList getDataDirs() const;
         std::filesystem::path getGlobalDataDir() const;
 
-        inline void removeDataDir(const QString &dir) { if(!dir.isEmpty()) mDataDirs.removeAll(dir); }
-        inline void addDataDir(const QString &dir) { if(!dir.isEmpty()) mDataDirs.append(dir); }
-        inline QString getDataLocal() const {return mDataLocal; }
+        inline void removeDataDir(const QString& dir)
+        {
+            if (!dir.isEmpty())
+                mDataDirs.removeAll(dir);
+        }
+        inline void addDataDir(const QString& dir)
+        {
+            if (!dir.isEmpty())
+                mDataDirs.append(dir);
+        }
+        inline QString getDataLocal() const { return mDataLocal; }
 
         bool hasMaster();
 
-        QStringList values(const QString &key, const QStringList &defaultValues = QStringList()) const;
+        QStringList values(const QString& key, const QStringList& defaultValues = QStringList()) const;
 
-        bool readFile(QTextStream &stream, bool ignoreContent = false);
-        bool readFile(QTextStream &stream, QMultiMap<QString, QString> &settings, bool ignoreContent = false);
-        bool readUserFile(QTextStream &stream, bool ignoreContent = false);
+        bool readFile(QTextStream& stream, bool ignoreContent = false);
+        bool readFile(QTextStream& stream, QMultiMap<QString, QString>& settings, bool ignoreContent = false);
+        bool readUserFile(QTextStream& stream, bool ignoreContent = false);
 
-        bool writeFile(QTextStream &stream);
-        bool writeFileWithComments(QFile &file);
+        bool writeFile(QTextStream& stream);
+        bool writeFileWithComments(QFile& file);
 
         QStringList getArchiveList() const;
         void setContentList(const QStringList& dirNames, const QStringList& archiveNames, const QStringList& fileNames);
@@ -78,7 +85,7 @@ namespace Config
         void clear();
 
     private:
-        Files::ConfigurationManager &mCfgMgr;
+        Files::ConfigurationManager& mCfgMgr;
 
         void validatePaths();
         QMultiMap<QString, QString> mSettings;
@@ -91,7 +98,7 @@ namespace Config
         static const char sContentKey[];
         static const char sDirectoryKey[];
 
-        static bool isOrderedLine(const QString& line) ;
+        static bool isOrderedLine(const QString& line);
     };
 }
 #endif // GAMESETTINGS_HPP
diff --git a/components/config/launchersettings.cpp b/components/config/launchersettings.cpp
index f2f1275666..f56cbc93e3 100644
--- a/components/config/launchersettings.cpp
+++ b/components/config/launchersettings.cpp
@@ -1,9 +1,9 @@
 #include "launchersettings.hpp"
 
-#include <QTextStream>
-#include <QString>
-#include <QRegExp>
 #include <QMultiMap>
+#include <QRegExp>
+#include <QString>
+#include <QTextStream>
 
 #include <QDebug>
 
@@ -18,7 +18,7 @@ const char Config::LauncherSettings::sDirectoryListSuffix[] = "/data";
 const char Config::LauncherSettings::sArchiveListSuffix[] = "/fallback-archive";
 const char Config::LauncherSettings::sContentListSuffix[] = "/content";
 
-QStringList Config::LauncherSettings::subKeys(const QString &key)
+QStringList Config::LauncherSettings::subKeys(const QString& key)
 {
     QMultiMap<QString, QString> settings = SettingsBase::getSettings();
     QStringList keys = settings.uniqueKeys();
@@ -27,14 +27,14 @@ QStringList Config::LauncherSettings::subKeys(const QString &key)
 
     QStringList result;
 
-    for (const QString &currentKey : keys)
+    for (const QString& currentKey : keys)
     {
 
         if (keyRe.indexIn(currentKey) != -1)
         {
             QString prefixedKey = keyRe.cap(1);
 
-            if(prefixedKey.startsWith(key))
+            if (prefixedKey.startsWith(key))
             {
                 QString subKey = prefixedKey.remove(key);
                 if (!subKey.isEmpty())
@@ -47,8 +47,7 @@ QStringList Config::LauncherSettings::subKeys(const QString &key)
     return result;
 }
 
-
-bool Config::LauncherSettings::writeFile(QTextStream &stream)
+bool Config::LauncherSettings::writeFile(QTextStream& stream)
 {
     QString sectionPrefix;
     QRegExp sectionRe("([^/]+)/(.+)$");
@@ -57,15 +56,17 @@ bool Config::LauncherSettings::writeFile(QTextStream &stream)
     QMapIterator<QString, QString> i(settings);
     i.toBack();
 
-    while (i.hasPrevious()) {
+    while (i.hasPrevious())
+    {
         i.previous();
 
         QString prefix;
         QString key;
 
-        if (sectionRe.exactMatch(i.key())) {
-             prefix = sectionRe.cap(1);
-             key = sectionRe.cap(2);
+        if (sectionRe.exactMatch(i.key()))
+        {
+            prefix = sectionRe.cap(1);
+            key = sectionRe.cap(2);
         }
 
         // Get rid of legacy settings
@@ -75,7 +76,8 @@ bool Config::LauncherSettings::writeFile(QTextStream &stream)
         if (key == QLatin1String("CurrentProfile"))
             continue;
 
-        if (sectionPrefix != prefix) {
+        if (sectionPrefix != prefix)
+        {
             sectionPrefix = prefix;
             stream << "\n[" << prefix << "]\n";
         }
@@ -84,7 +86,6 @@ bool Config::LauncherSettings::writeFile(QTextStream &stream)
     }
 
     return true;
-
 }
 
 QStringList Config::LauncherSettings::getContentLists()
@@ -127,11 +128,10 @@ void Config::LauncherSettings::setContentList(const GameSettings& gameSettings)
     dirs.removeAll(dataLocal);
 
     // if any existing profile in launcher matches the content list, make that profile the default
-    for (const QString &listName : getContentLists())
+    for (const QString& listName : getContentLists())
     {
-        if (isEqual(files, getContentListFiles(listName)) &&
-            isEqual(archives, getArchiveList(listName)) &&
-            isEqual(dirs, getDataDirectoryList(listName)))
+        if (isEqual(files, getContentListFiles(listName)) && isEqual(archives, getArchiveList(listName))
+            && isEqual(dirs, getDataDirectoryList(listName)))
         {
             setCurrentContentListName(listName);
             return;
@@ -144,23 +144,23 @@ void Config::LauncherSettings::setContentList(const GameSettings& gameSettings)
     setContentList(newContentListName, dirs, archives, files);
 }
 
-void Config::LauncherSettings::removeContentList(const QString &contentListName)
+void Config::LauncherSettings::removeContentList(const QString& contentListName)
 {
     remove(makeDirectoryListKey(contentListName));
     remove(makeArchiveListKey(contentListName));
     remove(makeContentListKey(contentListName));
 }
 
-void Config::LauncherSettings::setCurrentContentListName(const QString &contentListName)
+void Config::LauncherSettings::setCurrentContentListName(const QString& contentListName)
 {
     remove(QString(sCurrentContentListKey));
     setValue(QString(sCurrentContentListKey), contentListName);
 }
 
-void Config::LauncherSettings::setContentList(const QString& contentListName, const QStringList& dirNames, const QStringList& archiveNames, const QStringList& fileNames)
+void Config::LauncherSettings::setContentList(const QString& contentListName, const QStringList& dirNames,
+    const QStringList& archiveNames, const QStringList& fileNames)
 {
-    auto const assign = [this](const QString key, const QStringList& list)
-    {
+    auto const assign = [this](const QString key, const QStringList& list) {
         for (auto const& item : list)
             setMultiValue(key, item);
     };
@@ -224,15 +224,17 @@ QString Config::LauncherSettings::makeNewContentListName()
 {
     // basically, use date and time as the name  e.g. YYYY-MM-DDThh:mm:ss
     time_t rawtime;
-    struct tm * timeinfo;
+    struct tm* timeinfo;
 
     time(&rawtime);
     timeinfo = localtime(&rawtime);
     int base = 10;
     QChar zeroPad('0');
     return QString("%1-%2-%3T%4:%5:%6")
-        .arg(timeinfo->tm_year + 1900, 4).arg(timeinfo->tm_mon + 1, 2, base, zeroPad).arg(timeinfo->tm_mday, 2, base, zeroPad)
-        .arg(timeinfo->tm_hour, 2, base, zeroPad).arg(timeinfo->tm_min, 2, base, zeroPad).arg(timeinfo->tm_sec, 2, base, zeroPad);
+        .arg(timeinfo->tm_year + 1900, 4)
+        .arg(timeinfo->tm_mon + 1, 2, base, zeroPad)
+        .arg(timeinfo->tm_mday, 2, base, zeroPad)
+        .arg(timeinfo->tm_hour, 2, base, zeroPad)
+        .arg(timeinfo->tm_min, 2, base, zeroPad)
+        .arg(timeinfo->tm_sec, 2, base, zeroPad);
 }
-
-
diff --git a/components/config/launchersettings.hpp b/components/config/launchersettings.hpp
index 06632423a8..8c2dc0d545 100644
--- a/components/config/launchersettings.hpp
+++ b/components/config/launchersettings.hpp
@@ -1,28 +1,29 @@
 #ifndef LAUNCHERSETTINGS_HPP
 #define LAUNCHERSETTINGS_HPP
 
-#include "settingsbase.hpp"
 #include "gamesettings.hpp"
+#include "settingsbase.hpp"
 
 namespace Config
 {
-    class LauncherSettings : public SettingsBase<QMultiMap<QString, QString> >
+    class LauncherSettings : public SettingsBase<QMultiMap<QString, QString>>
     {
     public:
-        bool writeFile(QTextStream &stream);
+        bool writeFile(QTextStream& stream);
 
-        /// \return names of all Content Lists in the launcher's .cfg file. 
+        /// \return names of all Content Lists in the launcher's .cfg file.
         QStringList getContentLists();
 
         /// Set initially selected content list to match values from openmw.cfg, creating if necessary
         void setContentList(const GameSettings& gameSettings);
 
         /// Create a Content List (or replace if it already exists)
-        void setContentList(const QString& contentListName, const QStringList& dirNames, const QStringList& archiveNames, const QStringList& fileNames);
+        void setContentList(const QString& contentListName, const QStringList& dirNames,
+            const QStringList& archiveNames, const QStringList& fileNames);
 
-        void removeContentList(const QString &contentListName);
+        void removeContentList(const QString& contentListName);
 
-        void setCurrentContentListName(const QString &contentListName);
+        void setCurrentContentListName(const QString& contentListName);
 
         QString getCurrentContentListName() const;
 
@@ -36,7 +37,6 @@ namespace Config
         static const char sLauncherConfigFileName[];
 
     private:
-
         /// \return key to use to get/set the files in the specified data Directory List
         static QString makeDirectoryListKey(const QString& contentListName);
 
@@ -51,7 +51,7 @@ namespace Config
 
         static QString makeNewContentListName();
 
-        QStringList subKeys(const QString &key);
+        QStringList subKeys(const QString& key);
 
         /// name of entry in launcher.cfg that holds name of currently selected Content List
         static const char sCurrentContentListKey[];
diff --git a/components/config/settingsbase.hpp b/components/config/settingsbase.hpp
index 595fb9d78f..acd4f5350e 100644
--- a/components/config/settingsbase.hpp
+++ b/components/config/settingsbase.hpp
@@ -1,10 +1,10 @@
 #ifndef SETTINGSBASE_HPP
 #define SETTINGSBASE_HPP
 
-#include <QTextStream>
-#include <QStringList>
-#include <QString>
 #include <QRegExp>
+#include <QString>
+#include <QStringList>
+#include <QTextStream>
 
 namespace Config
 {
@@ -16,36 +16,27 @@ namespace Config
         SettingsBase() { mMultiValue = false; }
         ~SettingsBase() = default;
 
-        inline QString value(const QString &key, const QString &defaultValue = QString()) const
+        inline QString value(const QString& key, const QString& defaultValue = QString()) const
         {
             return mSettings.value(key).isEmpty() ? defaultValue : mSettings.value(key);
         }
 
-        inline void setValue(const QString &key, const QString &value)
-        {
-            mSettings.replace(key, value);
-        }
+        inline void setValue(const QString& key, const QString& value) { mSettings.replace(key, value); }
 
-        inline void setMultiValue(const QString &key, const QString &value)
+        inline void setMultiValue(const QString& key, const QString& value)
         {
             QStringList values = mSettings.values(key);
             if (!values.contains(value))
                 mSettings.insert(key, value);
         }
 
-        inline void setMultiValueEnabled(bool enable)
-        {
-            mMultiValue = enable;
-        }
+        inline void setMultiValueEnabled(bool enable) { mMultiValue = enable; }
 
-        inline void remove(const QString &key)
-        {
-            mSettings.remove(key);
-        }
+        inline void remove(const QString& key) { mSettings.remove(key); }
 
-        Map getSettings() const {return mSettings;} 
+        Map getSettings() const { return mSettings; }
 
-        bool readFile(QTextStream &stream)
+        bool readFile(QTextStream& stream)
         {
             Map cache;
 
@@ -54,19 +45,22 @@ namespace Config
             QRegExp sectionRe("^\\[([^]]+)\\]");
             QRegExp keyRe("^([^=]+)\\s*=\\s*(.+)$");
 
-            while (!stream.atEnd()) {
+            while (!stream.atEnd())
+            {
                 QString line = stream.readLine();
 
                 if (line.isEmpty() || line.startsWith("#"))
                     continue;
 
-                if (sectionRe.exactMatch(line)) {
+                if (sectionRe.exactMatch(line))
+                {
                     sectionPrefix = sectionRe.cap(1);
                     sectionPrefix.append("/");
                     continue;
                 }
 
-                if (keyRe.indexIn(line) != -1) {
+                if (keyRe.indexIn(line) != -1)
+                {
 
                     QString key = keyRe.cap(1).trimmed();
                     QString value = keyRe.cap(2).trimmed();
@@ -78,10 +72,14 @@ namespace Config
 
                     QStringList values = cache.values(key);
 
-                    if (!values.contains(value)) {
-                        if (mMultiValue) {
+                    if (!values.contains(value))
+                    {
+                        if (mMultiValue)
+                        {
                             cache.insert(key, value);
-                        } else {
+                        }
+                        else
+                        {
                             cache.remove(key);
                             cache.insert(key, value);
                         }
@@ -89,7 +87,8 @@ namespace Config
                 }
             }
 
-            if (mSettings.isEmpty()) {
+            if (mSettings.isEmpty())
+            {
                 mSettings = cache; // This is the first time we read a file
                 return true;
             }
@@ -99,10 +98,7 @@ namespace Config
             return true;
         }
 
-        void clear()
-        {
-            mSettings.clear();
-        }
+        void clear() { mSettings.clear(); }
 
     private:
         Map mSettings;
diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index 8f69f6bc0f..9bdd277146 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -4,21 +4,21 @@
 #include <stdexcept>
 #include <unordered_set>
 
-#include <QDir>
 #include <QDebug>
+#include <QDir>
 
 #include <components/esm3/esmreader.hpp>
 
-ContentSelectorModel::ContentModel::ContentModel(QObject *parent, QIcon warningIcon, bool showOMWScripts) :
-    QAbstractTableModel(parent),
-    mWarningIcon(warningIcon),
-    mShowOMWScripts(showOMWScripts),
-    mMimeType ("application/omwcontent"),
-    mMimeTypes (QStringList() << mMimeType),
-    mColumnCount (1),
-    mDropActions (Qt::MoveAction)
+ContentSelectorModel::ContentModel::ContentModel(QObject* parent, QIcon warningIcon, bool showOMWScripts)
+    : QAbstractTableModel(parent)
+    , mWarningIcon(warningIcon)
+    , mShowOMWScripts(showOMWScripts)
+    , mMimeType("application/omwcontent")
+    , mMimeTypes(QStringList() << mMimeType)
+    , mColumnCount(1)
+    , mDropActions(Qt::MoveAction)
 {
-    setEncoding ("win1252");
+    setEncoding("win1252");
     uncheckAll();
 }
 
@@ -28,12 +28,12 @@ ContentSelectorModel::ContentModel::~ContentModel()
     mFiles.clear();
 }
 
-void ContentSelectorModel::ContentModel::setEncoding(const QString &encoding)
+void ContentSelectorModel::ContentModel::setEncoding(const QString& encoding)
 {
     mEncoding = encoding;
 }
 
-int ContentSelectorModel::ContentModel::columnCount(const QModelIndex &parent) const
+int ContentSelectorModel::ContentModel::columnCount(const QModelIndex& parent) const
 {
     if (parent.isValid())
         return 0;
@@ -41,15 +41,15 @@ int ContentSelectorModel::ContentModel::columnCount(const QModelIndex &parent) c
     return mColumnCount;
 }
 
-int ContentSelectorModel::ContentModel::rowCount(const QModelIndex &parent) const
+int ContentSelectorModel::ContentModel::rowCount(const QModelIndex& parent) const
 {
-    if(parent.isValid())
+    if (parent.isValid())
         return 0;
 
     return mFiles.size();
 }
 
-const ContentSelectorModel::EsmFile *ContentSelectorModel::ContentModel::item(int row) const
+const ContentSelectorModel::EsmFile* ContentSelectorModel::ContentModel::item(int row) const
 {
     if (row >= 0 && row < mFiles.size())
         return mFiles.at(row);
@@ -57,50 +57,50 @@ const ContentSelectorModel::EsmFile *ContentSelectorModel::ContentModel::item(in
     return nullptr;
 }
 
-ContentSelectorModel::EsmFile *ContentSelectorModel::ContentModel::item(int row)
+ContentSelectorModel::EsmFile* ContentSelectorModel::ContentModel::item(int row)
 {
     if (row >= 0 && row < mFiles.count())
         return mFiles.at(row);
 
     return nullptr;
 }
-const ContentSelectorModel::EsmFile *ContentSelectorModel::ContentModel::item(const QString &name) const
+const ContentSelectorModel::EsmFile* ContentSelectorModel::ContentModel::item(const QString& name) const
 {
     EsmFile::FileProperty fp = EsmFile::FileProperty_FileName;
 
-    if (name.contains ('/'))
+    if (name.contains('/'))
         fp = EsmFile::FileProperty_FilePath;
 
-    for (const EsmFile *file : mFiles)
+    for (const EsmFile* file : mFiles)
     {
-        if (name.compare(file->fileProperty (fp).toString(), Qt::CaseInsensitive) == 0)
+        if (name.compare(file->fileProperty(fp).toString(), Qt::CaseInsensitive) == 0)
             return file;
     }
     return nullptr;
 }
 
-QModelIndex ContentSelectorModel::ContentModel::indexFromItem(const EsmFile *item) const
+QModelIndex ContentSelectorModel::ContentModel::indexFromItem(const EsmFile* item) const
 {
-    //workaround: non-const pointer cast for calls from outside contentmodel/contentselector
-    EsmFile *non_const_file_ptr = const_cast<EsmFile *>(item);
+    // workaround: non-const pointer cast for calls from outside contentmodel/contentselector
+    EsmFile* non_const_file_ptr = const_cast<EsmFile*>(item);
 
     if (item)
-        return index(mFiles.indexOf(non_const_file_ptr),0);
+        return index(mFiles.indexOf(non_const_file_ptr), 0);
 
     return QModelIndex();
 }
 
-Qt::ItemFlags ContentSelectorModel::ContentModel::flags(const QModelIndex &index) const
+Qt::ItemFlags ContentSelectorModel::ContentModel::flags(const QModelIndex& index) const
 {
     if (!index.isValid())
         return Qt::ItemIsDropEnabled;
 
-    const EsmFile *file = item(index.row());
+    const EsmFile* file = item(index.row());
 
     if (!file)
         return Qt::NoItemFlags;
 
-    //game files can always be checked
+    // game files can always be checked
     if (file->isGameFile())
         return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable;
 
@@ -110,12 +110,12 @@ Qt::ItemFlags ContentSelectorModel::ContentModel::flags(const QModelIndex &index
     // ... special case, addon with no dependency can be used with any gamefile.
     bool gamefileChecked = false;
     bool noGameFiles = true;
-    for (const QString &fileName : file->gameFiles())
+    for (const QString& fileName : file->gameFiles())
     {
-        for (QListIterator<EsmFile *> dependencyIter(mFiles); dependencyIter.hasNext(); dependencyIter.next())
+        for (QListIterator<EsmFile*> dependencyIter(mFiles); dependencyIter.hasNext(); dependencyIter.next())
         {
-            //compare filenames only.  Multiple instances
-            //of the filename (with different paths) is not relevant here.
+            // compare filenames only.  Multiple instances
+            // of the filename (with different paths) is not relevant here.
             EsmFile* depFile = dependencyIter.peekNext();
             if (!depFile->isGameFile() || depFile->fileName().compare(fileName, Qt::CaseInsensitive) != 0)
                 continue;
@@ -137,7 +137,7 @@ Qt::ItemFlags ContentSelectorModel::ContentModel::flags(const QModelIndex &index
     return returnFlags;
 }
 
-QVariant ContentSelectorModel::ContentModel::data(const QModelIndex &index, int role) const
+QVariant ContentSelectorModel::ContentModel::data(const QModelIndex& index, int role) const
 {
     if (!index.isValid())
         return QVariant();
@@ -145,7 +145,7 @@ QVariant ContentSelectorModel::ContentModel::data(const QModelIndex &index, int
     if (index.row() >= mFiles.size())
         return QVariant();
 
-    const EsmFile *file = item(index.row());
+    const EsmFile* file = item(index.row());
 
     if (!file)
         return QVariant();
@@ -154,96 +154,95 @@ QVariant ContentSelectorModel::ContentModel::data(const QModelIndex &index, int
 
     switch (role)
     {
-    case Qt::DecorationRole:
-    {
-        return isLoadOrderError(file) ? mWarningIcon : QVariant();
-    }
+        case Qt::DecorationRole:
+        {
+            return isLoadOrderError(file) ? mWarningIcon : QVariant();
+        }
 
-    case Qt::BackgroundRole:
-    {
-        if (isNew(file->fileName()))
+        case Qt::BackgroundRole:
         {
-            return QVariant(QColor(Qt::green));
+            if (isNew(file->fileName()))
+            {
+                return QVariant(QColor(Qt::green));
+            }
+            return QVariant();
         }
-        return QVariant();
-    }
 
-    case Qt::ForegroundRole:
-    {
-        if (isNew(file->fileName()))
+        case Qt::ForegroundRole:
         {
-            return QVariant(QColor(Qt::black));
+            if (isNew(file->fileName()))
+            {
+                return QVariant(QColor(Qt::black));
+            }
+            return QVariant();
         }
-        return QVariant();
-    }
 
-    case Qt::EditRole:
-    case Qt::DisplayRole:
-    {
-        if (column >=0 && column <=EsmFile::FileProperty_GameFile)
-            return file->fileProperty(static_cast<EsmFile::FileProperty>(column));
+        case Qt::EditRole:
+        case Qt::DisplayRole:
+        {
+            if (column >= 0 && column <= EsmFile::FileProperty_GameFile)
+                return file->fileProperty(static_cast<EsmFile::FileProperty>(column));
 
-        return QVariant();
-    }
+            return QVariant();
+        }
 
-    case Qt::TextAlignmentRole:
-    {
-        switch (column)
+        case Qt::TextAlignmentRole:
         {
-        case 0:
-        case 1:
-            return Qt::AlignLeft + Qt::AlignVCenter;
-        case 2:
-        case 3:
-            return Qt::AlignRight + Qt::AlignVCenter;
-        default:
-            return Qt::AlignLeft + Qt::AlignVCenter;
+            switch (column)
+            {
+                case 0:
+                case 1:
+                    return Qt::AlignLeft + Qt::AlignVCenter;
+                case 2:
+                case 3:
+                    return Qt::AlignRight + Qt::AlignVCenter;
+                default:
+                    return Qt::AlignLeft + Qt::AlignVCenter;
+            }
         }
-    }
 
-    case Qt::ToolTipRole:
-    {
-        if (column != 0)
-            return QVariant();
+        case Qt::ToolTipRole:
+        {
+            if (column != 0)
+                return QVariant();
 
-        return toolTip(file);
-    }
+            return toolTip(file);
+        }
 
-    case Qt::CheckStateRole:
-    {
-        if (file->isGameFile())
-            return QVariant();
+        case Qt::CheckStateRole:
+        {
+            if (file->isGameFile())
+                return QVariant();
 
-        return mCheckStates[file->filePath()];
-    }
+            return mCheckStates[file->filePath()];
+        }
 
-    case Qt::UserRole:
-    {
-        if (file->isGameFile())
-            return ContentType_GameFile;
-        else
-            if (flags(index))
+        case Qt::UserRole:
+        {
+            if (file->isGameFile())
+                return ContentType_GameFile;
+            else if (flags(index))
                 return ContentType_Addon;
 
-        break;
-    }
+            break;
+        }
 
-    case Qt::UserRole + 1:
-        return isChecked(file->filePath());
+        case Qt::UserRole + 1:
+            return isChecked(file->filePath());
     }
     return QVariant();
 }
 
-bool ContentSelectorModel::ContentModel::setData(const QModelIndex &index, const QVariant &value, int role)
+bool ContentSelectorModel::ContentModel::setData(const QModelIndex& index, const QVariant& value, int role)
 {
-    if(!index.isValid())
+    if (!index.isValid())
         return false;
 
-    EsmFile *file = item(index.row());
+    EsmFile* file = item(index.row());
     QString fileName = file->fileName();
     bool success = false;
 
-    switch(role)
+    switch (role)
     {
         case Qt::EditRole:
         {
@@ -253,7 +252,7 @@ bool ContentSelectorModel::ContentModel::setData(const QModelIndex &index, const
                 file->setFileProperty(static_cast<EsmFile::FileProperty>(i), list.at(i));
 
             for (int i = EsmFile::FileProperty_GameFile; i < list.size(); i++)
-                file->setFileProperty (EsmFile::FileProperty_GameFile, list.at(i));
+                file->setFileProperty(EsmFile::FileProperty_GameFile, list.at(i));
 
             emit dataChanged(index, index);
 
@@ -261,9 +260,9 @@ bool ContentSelectorModel::ContentModel::setData(const QModelIndex &index, const
         }
         break;
 
-        case Qt::UserRole+1:
+        case Qt::UserRole + 1:
         {
-            success = (flags (index) & Qt::ItemIsEnabled);
+            success = (flags(index) & Qt::ItemIsEnabled);
 
             if (success)
             {
@@ -277,12 +276,12 @@ bool ContentSelectorModel::ContentModel::setData(const QModelIndex &index, const
         {
             int checkValue = value.toInt();
             bool setState = false;
-            if ((checkValue==Qt::Checked) && !isChecked(file->filePath()))
+            if ((checkValue == Qt::Checked) && !isChecked(file->filePath()))
             {
                 setState = true;
                 success = true;
             }
-            else if ((checkValue == Qt::Checked) && isChecked (file->filePath()))
+            else if ((checkValue == Qt::Checked) && isChecked(file->filePath()))
                 setState = true;
             else if (checkValue == Qt::Unchecked)
                 setState = true;
@@ -296,7 +295,7 @@ bool ContentSelectorModel::ContentModel::setData(const QModelIndex &index, const
             else
                 return success;
 
-            for (EsmFile *file2 : mFiles)
+            for (EsmFile* file2 : mFiles)
             {
                 if (file2->gameFiles().contains(fileName, Qt::CaseInsensitive))
                 {
@@ -305,7 +304,7 @@ bool ContentSelectorModel::ContentModel::setData(const QModelIndex &index, const
                 }
             }
 
-            success =  true;
+            success = true;
         }
         break;
     }
@@ -313,32 +312,32 @@ bool ContentSelectorModel::ContentModel::setData(const QModelIndex &index, const
     return success;
 }
 
-bool ContentSelectorModel::ContentModel::insertRows(int position, int rows, const QModelIndex &parent)
+bool ContentSelectorModel::ContentModel::insertRows(int position, int rows, const QModelIndex& parent)
 {
     if (parent.isValid())
         return false;
 
-    beginInsertRows(parent, position, position+rows-1);
+    beginInsertRows(parent, position, position + rows - 1);
     {
         for (int row = 0; row < rows; ++row)
             mFiles.insert(position, new EsmFile);
-
-    } endInsertRows();
+    }
+    endInsertRows();
 
     return true;
 }
 
-bool ContentSelectorModel::ContentModel::removeRows(int position, int rows, const QModelIndex &parent)
+bool ContentSelectorModel::ContentModel::removeRows(int position, int rows, const QModelIndex& parent)
 {
     if (parent.isValid())
         return false;
 
-    beginRemoveRows(parent, position, position+rows-1);
+    beginRemoveRows(parent, position, position + rows - 1);
     {
         for (int row = 0; row < rows; ++row)
             delete mFiles.takeAt(position);
-
-    } endRemoveRows();
+    }
+    endRemoveRows();
 
     // at this point we know that drag and drop has finished.
     checkForLoadOrderErrors();
@@ -355,11 +354,11 @@ QStringList ContentSelectorModel::ContentModel::mimeTypes() const
     return mMimeTypes;
 }
 
-QMimeData *ContentSelectorModel::ContentModel::mimeData(const QModelIndexList &indexes) const
+QMimeData* ContentSelectorModel::ContentModel::mimeData(const QModelIndexList& indexes) const
 {
     QByteArray encodedData;
 
-    for (const QModelIndex &index : indexes)
+    for (const QModelIndex& index : indexes)
     {
         if (!index.isValid())
             continue;
@@ -367,13 +366,14 @@ QMimeData *ContentSelectorModel::ContentModel::mimeData(const QModelIndexList &i
         encodedData.append(item(index.row())->encodedData());
     }
 
-    QMimeData *mimeData = new QMimeData();
+    QMimeData* mimeData = new QMimeData();
     mimeData->setData(mMimeType, encodedData);
 
     return mimeData;
 }
 
-bool ContentSelectorModel::ContentModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent)
+bool ContentSelectorModel::ContentModel::dropMimeData(
+    const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent)
 {
     if (action == Qt::IgnoreAction)
         return true;
@@ -419,28 +419,31 @@ bool ContentSelectorModel::ContentModel::dropMimeData(const QMimeData *data, Qt:
     return true;
 }
 
-void ContentSelectorModel::ContentModel::addFile(EsmFile *file)
+void ContentSelectorModel::ContentModel::addFile(EsmFile* file)
 {
     beginInsertRows(QModelIndex(), mFiles.count(), mFiles.count());
-        mFiles.append(file);
+    mFiles.append(file);
     endInsertRows();
 
-    QModelIndex idx = index (mFiles.size() - 2, 0, QModelIndex());
+    QModelIndex idx = index(mFiles.size() - 2, 0, QModelIndex());
 
-    emit dataChanged (idx, idx);
+    emit dataChanged(idx, idx);
 }
 
-void ContentSelectorModel::ContentModel::addFiles(const QString &path, bool newfiles)
+void ContentSelectorModel::ContentModel::addFiles(const QString& path, bool newfiles)
 {
     QDir dir(path);
     QStringList filters;
-    filters << "*.esp" << "*.esm" << "*.omwgame" << "*.omwaddon";
+    filters << "*.esp"
+            << "*.esm"
+            << "*.omwgame"
+            << "*.omwaddon";
     if (mShowOMWScripts)
         filters << "*.omwscripts";
     dir.setNameFilters(filters);
     dir.setSorting(QDir::Name);
 
-    for (const QString &path2 : dir.entryList())
+    for (const QString& path2 : dir.entryList())
     {
         QFileInfo info(dir.absoluteFilePath(path2));
 
@@ -453,29 +456,30 @@ void ContentSelectorModel::ContentModel::addFiles(const QString &path, bool newf
 
         if (info.fileName().endsWith(".omwscripts", Qt::CaseInsensitive))
         {
-            EsmFile *file = new EsmFile(path2);
+            EsmFile* file = new EsmFile(path2);
             file->setDate(info.lastModified());
             file->setFilePath(info.absoluteFilePath());
             addFile(file);
             continue;
         }
 
-        try {
+        try
+        {
             ESM::ESMReader fileReader;
             ToUTF8::Utf8Encoder encoder(ToUTF8::calculateEncoding(mEncoding.toStdString()));
             fileReader.setEncoder(&encoder);
             fileReader.open(std::string(dir.absoluteFilePath(path2).toUtf8().constData()));
 
-            EsmFile *file = new EsmFile(path2);
-         
+            EsmFile* file = new EsmFile(path2);
+
             for (std::vector<ESM::Header::MasterData>::const_iterator itemIter = fileReader.getGameFiles().begin();
-                itemIter != fileReader.getGameFiles().end(); ++itemIter)
+                 itemIter != fileReader.getGameFiles().end(); ++itemIter)
                 file->addGameFile(QString::fromUtf8(itemIter->name.c_str()));
 
-            file->setAuthor     (QString::fromUtf8(fileReader.getAuthor().c_str()));
-            file->setDate       (info.lastModified());
-            file->setFormat     (fileReader.getFormat());
-            file->setFilePath       (info.absoluteFilePath());
+            file->setAuthor(QString::fromUtf8(fileReader.getAuthor().c_str()));
+            file->setDate(info.lastModified());
+            file->setFormat(fileReader.getFormat());
+            file->setFilePath(info.absoluteFilePath());
             file->setDescription(QString::fromUtf8(fileReader.getDesc().c_str()));
 
             // HACK
@@ -489,21 +493,24 @@ void ContentSelectorModel::ContentModel::addFiles(const QString &path, bool newf
             // Put the file in the table
             addFile(file);
             setNew(file->fileName(), newfiles);
-
-        } catch(std::runtime_error &e) {
+        }
+        catch (std::runtime_error& e)
+        {
             // An error occurred while reading the .esp
             qWarning() << "Error reading addon file: " << e.what();
             continue;
         }
-
     }
 }
 
-bool ContentSelectorModel::ContentModel::containsDataFiles(const QString &path)
+bool ContentSelectorModel::ContentModel::containsDataFiles(const QString& path)
 {
     QDir dir(path);
     QStringList filters;
-    filters << "*.esp" << "*.esm" << "*.omwgame" << "*.omwaddon";
+    filters << "*.esp"
+            << "*.esm"
+            << "*.omwgame"
+            << "*.omwaddon";
     dir.setNameFilters(filters);
 
     return dir.entryList().count() != 0;
@@ -513,7 +520,8 @@ void ContentSelectorModel::ContentModel::clearFiles()
 {
     const int filesCount = mFiles.count();
 
-    if (filesCount > 0) {
+    if (filesCount > 0)
+    {
         beginRemoveRows(QModelIndex(), 0, filesCount - 1);
         mFiles.clear();
         endRemoveRows();
@@ -523,7 +531,7 @@ void ContentSelectorModel::ContentModel::clearFiles()
 QStringList ContentSelectorModel::ContentModel::gameFiles() const
 {
     QStringList gameFiles;
-    for (const ContentSelectorModel::EsmFile *file : mFiles)
+    for (const ContentSelectorModel::EsmFile* file : mFiles)
     {
         if (file->isGameFile())
         {
@@ -536,26 +544,27 @@ QStringList ContentSelectorModel::ContentModel::gameFiles() const
 void ContentSelectorModel::ContentModel::sortFiles()
 {
     emit layoutAboutToBeChanged();
-    //Dependency sort
+    // Dependency sort
     std::unordered_set<const EsmFile*> moved;
-    for(int i = mFiles.size() - 1; i > 0;)
+    for (int i = mFiles.size() - 1; i > 0;)
     {
         const auto file = mFiles.at(i);
-        if(moved.find(file) == moved.end())
+        if (moved.find(file) == moved.end())
         {
             int index = -1;
-            for(int j = 0; j < i; ++j)
+            for (int j = 0; j < i; ++j)
             {
                 const QStringList& gameFiles = mFiles.at(j)->gameFiles();
-                if(gameFiles.contains(file->fileName(), Qt::CaseInsensitive)
+                if (gameFiles.contains(file->fileName(), Qt::CaseInsensitive)
                     || (!mFiles.at(j)->isGameFile() && gameFiles.isEmpty()
-                    && file->fileName().compare("Morrowind.esm", Qt::CaseInsensitive) == 0)) // Hack: implicit dependency on Morrowind.esm for dependency-less files
+                        && file->fileName().compare("Morrowind.esm", Qt::CaseInsensitive)
+                            == 0)) // Hack: implicit dependency on Morrowind.esm for dependency-less files
                 {
                     index = j;
                     break;
                 }
             }
-            if(index >= 0)
+            if (index >= 0)
             {
                 mFiles.move(i, index);
                 moved.insert(file);
@@ -576,7 +585,7 @@ bool ContentSelectorModel::ContentModel::isChecked(const QString& filepath) cons
     return false;
 }
 
-bool ContentSelectorModel::ContentModel::isEnabled (const QModelIndex& index) const
+bool ContentSelectorModel::ContentModel::isEnabled(const QModelIndex& index) const
 {
     return (flags(index) & Qt::ItemIsEnabled);
 }
@@ -589,12 +598,12 @@ bool ContentSelectorModel::ContentModel::isNew(const QString& filepath) const
     return false;
 }
 
-void ContentSelectorModel::ContentModel::setNew(const QString &filepath, bool isNew)
+void ContentSelectorModel::ContentModel::setNew(const QString& filepath, bool isNew)
 {
     if (filepath.isEmpty())
         return;
 
-    const EsmFile *file = item(filepath);
+    const EsmFile* file = item(filepath);
 
     if (!file)
         return;
@@ -602,17 +611,16 @@ void ContentSelectorModel::ContentModel::setNew(const QString &filepath, bool is
     mNewFiles[filepath] = isNew;
 }
 
-
-bool ContentSelectorModel::ContentModel::isLoadOrderError(const EsmFile *file) const
+bool ContentSelectorModel::ContentModel::isLoadOrderError(const EsmFile* file) const
 {
     return mPluginsWithLoadOrderError.contains(file->filePath());
 }
 
-void ContentSelectorModel::ContentModel::setContentList(const QStringList &fileList)
+void ContentSelectorModel::ContentModel::setContentList(const QStringList& fileList)
 {
     mPluginsWithLoadOrderError.clear();
     int previousPosition = -1;
-    for (const QString &filepath : fileList)
+    for (const QString& filepath : fileList)
     {
         if (setCheckState(filepath, true))
         {
@@ -650,10 +658,11 @@ void ContentSelectorModel::ContentModel::checkForLoadOrderErrors()
     }
 }
 
-QList<ContentSelectorModel::LoadOrderError> ContentSelectorModel::ContentModel::checkForLoadOrderErrors(const EsmFile *file, int row) const
+QList<ContentSelectorModel::LoadOrderError> ContentSelectorModel::ContentModel::checkForLoadOrderErrors(
+    const EsmFile* file, int row) const
 {
     QList<LoadOrderError> errors = QList<LoadOrderError>();
-    for (const QString &dependentfileName : file->gameFiles())
+    for (const QString& dependentfileName : file->gameFiles())
     {
         const EsmFile* dependentFile = item(dependentfileName);
 
@@ -676,7 +685,7 @@ QList<ContentSelectorModel::LoadOrderError> ContentSelectorModel::ContentModel::
     return errors;
 }
 
-QString ContentSelectorModel::ContentModel::toolTip(const EsmFile *file) const
+QString ContentSelectorModel::ContentModel::toolTip(const EsmFile* file) const
 {
     if (isLoadOrderError(file))
     {
@@ -700,15 +709,15 @@ QString ContentSelectorModel::ContentModel::toolTip(const EsmFile *file) const
 
 void ContentSelectorModel::ContentModel::refreshModel()
 {
-    emit dataChanged (index(0,0), index(rowCount()-1,0));
+    emit dataChanged(index(0, 0), index(rowCount() - 1, 0));
 }
 
-bool ContentSelectorModel::ContentModel::setCheckState(const QString &filepath, bool checkState)
+bool ContentSelectorModel::ContentModel::setCheckState(const QString& filepath, bool checkState)
 {
     if (filepath.isEmpty())
         return false;
 
-    const EsmFile *file = item(filepath);
+    const EsmFile* file = item(filepath);
 
     if (!file)
         return false;
@@ -724,12 +733,12 @@ bool ContentSelectorModel::ContentModel::setCheckState(const QString &filepath,
     if (file->isGameFile())
         refreshModel();
 
-    //if we're checking an item, ensure all "upstream" files (dependencies) are checked as well.
+    // if we're checking an item, ensure all "upstream" files (dependencies) are checked as well.
     if (state == Qt::Checked)
     {
         for (const QString& upstreamName : file->gameFiles())
         {
-            const EsmFile *upstreamFile = item(upstreamName);
+            const EsmFile* upstreamFile = item(upstreamName);
 
             if (!upstreamFile)
                 continue;
@@ -738,13 +747,12 @@ bool ContentSelectorModel::ContentModel::setCheckState(const QString &filepath,
                 mCheckStates[upstreamFile->filePath()] = Qt::Checked;
 
             emit dataChanged(indexFromItem(upstreamFile), indexFromItem(upstreamFile));
-
         }
     }
-    //otherwise, if we're unchecking an item (or the file is a game file) ensure all downstream files are unchecked.
+    // otherwise, if we're unchecking an item (or the file is a game file) ensure all downstream files are unchecked.
     if (state == Qt::Unchecked)
     {
-        for (const EsmFile *downstreamFile : mFiles)
+        for (const EsmFile* downstreamFile : mFiles)
         {
             QFileInfo fileInfo(filepath);
             QString filename = fileInfo.fileName();
@@ -769,7 +777,7 @@ ContentSelectorModel::ContentFileList ContentSelectorModel::ContentModel::checke
     // TODO:
     // First search for game files and next addons,
     // so we get more or less correct game files vs addons order.
-    for (EsmFile *file : mFiles)
+    for (EsmFile* file : mFiles)
         if (isChecked(file->filePath()))
             list << file;
 
diff --git a/components/contentselector/model/contentmodel.hpp b/components/contentselector/model/contentmodel.hpp
index 9a3dddb1c7..09fed11519 100644
--- a/components/contentselector/model/contentmodel.hpp
+++ b/components/contentselector/model/contentmodel.hpp
@@ -1,17 +1,17 @@
 #ifndef CONTENTMODEL_HPP
 #define CONTENTMODEL_HPP
 
+#include "loadordererror.hpp"
 #include <QAbstractTableModel>
-#include <QStringList>
-#include <QSet>
 #include <QIcon>
-#include "loadordererror.hpp"
+#include <QSet>
+#include <QStringList>
 
 namespace ContentSelectorModel
 {
     class EsmFile;
 
-    typedef QList<EsmFile *> ContentFileList;
+    typedef QList<EsmFile*> ContentFileList;
 
     enum ContentType
     {
@@ -23,43 +23,44 @@ namespace ContentSelectorModel
     {
         Q_OBJECT
     public:
-        explicit ContentModel(QObject *parent, QIcon warningIcon, bool showOMWScripts);
+        explicit ContentModel(QObject* parent, QIcon warningIcon, bool showOMWScripts);
         ~ContentModel();
 
-        void setEncoding(const QString &encoding);
+        void setEncoding(const QString& encoding);
 
-        int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-        int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+        int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+        int columnCount(const QModelIndex& parent = QModelIndex()) const override;
 
-        QVariant data(const QModelIndex &index, int role) const override;
-        Qt::ItemFlags flags(const QModelIndex &index) const override;
-        bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
+        QVariant data(const QModelIndex& index, int role) const override;
+        Qt::ItemFlags flags(const QModelIndex& index) const override;
+        bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
 
-        bool insertRows(int position, int rows, const QModelIndex &index = QModelIndex()) override;
-        bool removeRows(int position, int rows, const QModelIndex &index = QModelIndex()) override;
+        bool insertRows(int position, int rows, const QModelIndex& index = QModelIndex()) override;
+        bool removeRows(int position, int rows, const QModelIndex& index = QModelIndex()) override;
 
         Qt::DropActions supportedDropActions() const override;
         QStringList mimeTypes() const override;
-        QMimeData *mimeData(const QModelIndexList &indexes) const override;
-        bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
+        QMimeData* mimeData(const QModelIndexList& indexes) const override;
+        bool dropMimeData(
+            const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) override;
 
-        void addFiles(const QString &path, bool newfiles);
+        void addFiles(const QString& path, bool newfiles);
         void sortFiles();
-        bool containsDataFiles(const QString &path);
+        bool containsDataFiles(const QString& path);
         void clearFiles();
 
-        QModelIndex indexFromItem(const EsmFile *item) const;
-        const EsmFile *item(const QString &name) const;
-        const EsmFile *item(int row) const;
-        EsmFile *item(int row);
+        QModelIndex indexFromItem(const EsmFile* item) const;
+        const EsmFile* item(const QString& name) const;
+        const EsmFile* item(int row) const;
+        EsmFile* item(int row);
         QStringList gameFiles() const;
 
-        bool isEnabled (const QModelIndex& index) const;
-        bool isChecked(const QString &filepath) const;
-        bool setCheckState(const QString &filepath, bool isChecked);
-        bool isNew(const QString &filepath) const;
-        void setNew(const QString &filepath, bool isChecked);
-        void setContentList(const QStringList &fileList);
+        bool isEnabled(const QModelIndex& index) const;
+        bool isChecked(const QString& filepath) const;
+        bool setCheckState(const QString& filepath, bool isChecked);
+        bool isNew(const QString& filepath) const;
+        void setNew(const QString& filepath, bool isChecked);
+        void setContentList(const QStringList& fileList);
         ContentFileList checkedItems() const;
         void uncheckAll();
 
@@ -69,17 +70,16 @@ namespace ContentSelectorModel
         void checkForLoadOrderErrors();
 
     private:
-
-        void addFile(EsmFile *file);
+        void addFile(EsmFile* file);
 
         /// Checks a specific plug-in for load order errors
         /// \return all errors found for specific plug-in
-        QList<LoadOrderError> checkForLoadOrderErrors(const EsmFile *file, int row) const;
+        QList<LoadOrderError> checkForLoadOrderErrors(const EsmFile* file, int row) const;
 
         ///  \return true if plug-in has a Load Order error
-        bool isLoadOrderError(const EsmFile *file) const;
+        bool isLoadOrderError(const EsmFile* file) const;
 
-        QString toolTip(const EsmFile *file) const;
+        QString toolTip(const EsmFile* file) const;
 
         ContentFileList mFiles;
         QStringList mArchives;
@@ -91,7 +91,6 @@ namespace ContentSelectorModel
         bool mShowOMWScripts;
 
     public:
-
         QString mMimeType;
         QStringList mMimeTypes;
         int mColumnCount;
diff --git a/components/contentselector/model/esmfile.cpp b/components/contentselector/model/esmfile.cpp
index 60ca199a3b..e1ae9c8cc8 100644
--- a/components/contentselector/model/esmfile.cpp
+++ b/components/contentselector/model/esmfile.cpp
@@ -3,29 +3,32 @@
 #include <QDataStream>
 
 int ContentSelectorModel::EsmFile::sPropertyCount = 7;
-QString ContentSelectorModel::EsmFile::sToolTip = QString("<b>Author:</b> %1<br/> \
+QString ContentSelectorModel::EsmFile::sToolTip = QString(
+    "<b>Author:</b> %1<br/> \
                                               <b>Version:</b> %2<br/> \
                                               <b>Modified:</b> %3<br/> \
                                               <b>Path:</b><br/>%4<br/> \
                                               <br/><b>Description:</b><br/>%5<br/> \
                                               <br/><b>Dependencies: </b>%6<br/>");
 
+ContentSelectorModel::EsmFile::EsmFile(QString fileName, ModelItem* parent)
+    : ModelItem(parent)
+    , mFileName(fileName)
+    , mFormat(0)
+{
+}
 
-ContentSelectorModel::EsmFile::EsmFile(QString fileName, ModelItem *parent)
-                : ModelItem(parent), mFileName(fileName), mFormat(0)
-{}
-
-void ContentSelectorModel::EsmFile::setFileName(const QString &fileName)
+void ContentSelectorModel::EsmFile::setFileName(const QString& fileName)
 {
     mFileName = fileName;
 }
 
-void ContentSelectorModel::EsmFile::setAuthor(const QString &author)
+void ContentSelectorModel::EsmFile::setAuthor(const QString& author)
 {
     mAuthor = author;
 }
 
-void ContentSelectorModel::EsmFile::setDate(const QDateTime &modified)
+void ContentSelectorModel::EsmFile::setDate(const QDateTime& modified)
 {
     mModified = modified;
 }
@@ -35,17 +38,17 @@ void ContentSelectorModel::EsmFile::setFormat(int format)
     mFormat = format;
 }
 
-void ContentSelectorModel::EsmFile::setFilePath(const QString &path)
+void ContentSelectorModel::EsmFile::setFilePath(const QString& path)
 {
     mPath = path;
 }
 
-void ContentSelectorModel::EsmFile::setGameFiles(const QStringList &gamefiles)
+void ContentSelectorModel::EsmFile::setGameFiles(const QStringList& gamefiles)
 {
     mGameFiles = gamefiles;
 }
 
-void ContentSelectorModel::EsmFile::setDescription(const QString &description)
+void ContentSelectorModel::EsmFile::setDescription(const QString& description)
 {
     mDescription = description;
 }
@@ -55,90 +58,89 @@ QByteArray ContentSelectorModel::EsmFile::encodedData() const
     QByteArray encodedData;
     QDataStream stream(&encodedData, QIODevice::WriteOnly);
 
-    stream << mFileName << mAuthor << QString::number(mFormat)
-           << mModified.toString() << mPath << mDescription
+    stream << mFileName << mAuthor << QString::number(mFormat) << mModified.toString() << mPath << mDescription
            << mGameFiles;
 
     return encodedData;
 }
 
 bool ContentSelectorModel::EsmFile::isGameFile() const
-{ 
-    return (mGameFiles.size() == 0) &&
-        (mFileName.endsWith(QLatin1String(".esm"), Qt::CaseInsensitive) ||
-        mFileName.endsWith(QLatin1String(".omwgame"), Qt::CaseInsensitive));
+{
+    return (mGameFiles.size() == 0)
+        && (mFileName.endsWith(QLatin1String(".esm"), Qt::CaseInsensitive)
+            || mFileName.endsWith(QLatin1String(".omwgame"), Qt::CaseInsensitive));
 }
 
 QVariant ContentSelectorModel::EsmFile::fileProperty(const FileProperty prop) const
 {
     switch (prop)
     {
-    case FileProperty_FileName:
-        return mFileName;
-        break;
+        case FileProperty_FileName:
+            return mFileName;
+            break;
 
-    case FileProperty_Author:
-        return mAuthor;
-        break;
+        case FileProperty_Author:
+            return mAuthor;
+            break;
 
-    case FileProperty_Format:
-        return mFormat;
-        break;
+        case FileProperty_Format:
+            return mFormat;
+            break;
 
-    case FileProperty_DateModified:
-        return mModified.toString(Qt::ISODate);
-        break;
+        case FileProperty_DateModified:
+            return mModified.toString(Qt::ISODate);
+            break;
 
-    case FileProperty_FilePath:
-        return mPath;
-        break;
+        case FileProperty_FilePath:
+            return mPath;
+            break;
 
-    case FileProperty_Description:
-        return mDescription;
-        break;
+        case FileProperty_Description:
+            return mDescription;
+            break;
 
-    case FileProperty_GameFile:
-        return mGameFiles;
-        break;
+        case FileProperty_GameFile:
+            return mGameFiles;
+            break;
 
-    default:
-        break;
+        default:
+            break;
     }
     return QVariant();
 }
-void ContentSelectorModel::EsmFile::setFileProperty (const FileProperty prop, const QString &value)
+void ContentSelectorModel::EsmFile::setFileProperty(const FileProperty prop, const QString& value)
 {
     switch (prop)
     {
-    case FileProperty_FileName:
-        mFileName = value;
-        break;
+        case FileProperty_FileName:
+            mFileName = value;
+            break;
 
-    case FileProperty_Author:
-        mAuthor = value;
-        break;
+        case FileProperty_Author:
+            mAuthor = value;
+            break;
 
-    case FileProperty_Format:
-        mFormat = value.toInt();
-        break;
+        case FileProperty_Format:
+            mFormat = value.toInt();
+            break;
 
-    case FileProperty_DateModified:
-        mModified = QDateTime::fromString(value);
-        break;
+        case FileProperty_DateModified:
+            mModified = QDateTime::fromString(value);
+            break;
 
-    case FileProperty_FilePath:
-        mPath = value;
-        break;
+        case FileProperty_FilePath:
+            mPath = value;
+            break;
 
-    case FileProperty_Description:
-        mDescription = value;
-        break;
+        case FileProperty_Description:
+            mDescription = value;
+            break;
 
-    case FileProperty_GameFile:
-        mGameFiles << value;
-        break;
+        case FileProperty_GameFile:
+            mGameFiles << value;
+            break;
 
-    default:
-        break;
+        default:
+            break;
     }
 }
diff --git a/components/contentselector/model/esmfile.hpp b/components/contentselector/model/esmfile.hpp
index 66863d7c61..a1fd5d68a7 100644
--- a/components/contentselector/model/esmfile.hpp
+++ b/components/contentselector/model/esmfile.hpp
@@ -16,54 +16,54 @@ namespace ContentSelectorModel
         Q_PROPERTY(QString filename READ fileName)
 
     public:
-
         enum FileProperty
         {
-            FileProperty_FileName       = 0,
-            FileProperty_Author         = 1,
-            FileProperty_Format         = 2,
-            FileProperty_DateModified   = 3,
-            FileProperty_FilePath       = 4,
-            FileProperty_Description    = 5,
-            FileProperty_GameFile       = 6
+            FileProperty_FileName = 0,
+            FileProperty_Author = 1,
+            FileProperty_Format = 2,
+            FileProperty_DateModified = 3,
+            FileProperty_FilePath = 4,
+            FileProperty_Description = 5,
+            FileProperty_GameFile = 6
         };
 
-        EsmFile(QString fileName = QString(), ModelItem *parent = nullptr);
-     //   EsmFile(const EsmFile &);
+        EsmFile(QString fileName = QString(), ModelItem* parent = nullptr);
+        //   EsmFile(const EsmFile &);
 
-        ~EsmFile()
-        {}
+        ~EsmFile() {}
 
-        void setFileProperty (const FileProperty prop, const QString &value);
+        void setFileProperty(const FileProperty prop, const QString& value);
 
-        void setFileName(const QString &fileName);
-        void setAuthor(const QString &author);
+        void setFileName(const QString& fileName);
+        void setAuthor(const QString& author);
         void setSize(const int size);
-        void setDate(const QDateTime &modified);
+        void setDate(const QDateTime& modified);
         void setFormat(const int format);
-        void setFilePath(const QString &path);
-        void setGameFiles(const QStringList &gameFiles);
-        void setDescription(const QString &description);
+        void setFilePath(const QString& path);
+        void setGameFiles(const QStringList& gameFiles);
+        void setDescription(const QString& description);
 
-        inline void addGameFile (const QString &name) {mGameFiles.append(name); }
-        QVariant fileProperty (const FileProperty prop) const;
+        inline void addGameFile(const QString& name) { mGameFiles.append(name); }
+        QVariant fileProperty(const FileProperty prop) const;
 
-        inline QString fileName() const             { return mFileName; }
-        inline QString author() const               { return mAuthor; }
-        inline QDateTime modified() const           { return mModified; }
-        inline float format() const                 { return mFormat; }
-        inline QString filePath() const                 { return mPath; }
+        inline QString fileName() const { return mFileName; }
+        inline QString author() const { return mAuthor; }
+        inline QDateTime modified() const { return mModified; }
+        inline float format() const { return mFormat; }
+        inline QString filePath() const { return mPath; }
 
         /// @note Contains file names, not paths.
-        inline const QStringList &gameFiles() const { return mGameFiles; }
-        inline QString description() const          { return mDescription; }
-        inline QString toolTip() const              { return sToolTip.arg(mAuthor)
-                                                             .arg(mFormat)
-                                                             .arg(mModified.toString(Qt::ISODate))
-                                                             .arg(mPath)
-                                                             .arg(mDescription)
-                                                             .arg(mGameFiles.join(", "));
-                                                    }
+        inline const QStringList& gameFiles() const { return mGameFiles; }
+        inline QString description() const { return mDescription; }
+        inline QString toolTip() const
+        {
+            return sToolTip.arg(mAuthor)
+                .arg(mFormat)
+                .arg(mModified.toString(Qt::ISODate))
+                .arg(mPath)
+                .arg(mDescription)
+                .arg(mGameFiles.join(", "));
+        }
 
         bool isGameFile() const;
         QByteArray encodedData() const;
@@ -73,7 +73,6 @@ namespace ContentSelectorModel
         static QString sToolTip;
 
     private:
-
         QString mFileName;
         QString mAuthor;
         QDateTime mModified;
@@ -82,7 +81,6 @@ namespace ContentSelectorModel
         QStringList mGameFiles;
         QString mDescription;
         QString mToolTip;
-
     };
 }
 
diff --git a/components/contentselector/model/loadordererror.cpp b/components/contentselector/model/loadordererror.cpp
index 7177e8ec1f..c1b2025588 100644
--- a/components/contentselector/model/loadordererror.cpp
+++ b/components/contentselector/model/loadordererror.cpp
@@ -1,12 +1,9 @@
 #include "loadordererror.hpp"
 #include <cassert>
 
-QString ContentSelectorModel::LoadOrderError::sErrorToolTips[ErrorCode_LoadOrder] =
-{
-    QString("Unable to find dependent file: %1"),
-    QString("Dependent file needs to be active: %1"),
-    QString("This file needs to load after %1")
-};
+QString ContentSelectorModel::LoadOrderError::sErrorToolTips[ErrorCode_LoadOrder]
+    = { QString("Unable to find dependent file: %1"), QString("Dependent file needs to be active: %1"),
+          QString("This file needs to load after %1") };
 
 QString ContentSelectorModel::LoadOrderError::toolTip() const
 {
diff --git a/components/contentselector/model/loadordererror.hpp b/components/contentselector/model/loadordererror.hpp
index 7067f1f22c..d33005827d 100644
--- a/components/contentselector/model/loadordererror.hpp
+++ b/components/contentselector/model/loadordererror.hpp
@@ -11,15 +11,21 @@ namespace ContentSelectorModel
     public:
         enum ErrorCode
         {
-            ErrorCode_None               = 0,
-            ErrorCode_MissingDependency  = 1,
+            ErrorCode_None = 0,
+            ErrorCode_MissingDependency = 1,
             ErrorCode_InactiveDependency = 2,
-            ErrorCode_LoadOrder          = 3
+            ErrorCode_LoadOrder = 3
         };
 
-        inline LoadOrderError() : mErrorCode(ErrorCode_None) {}
+        inline LoadOrderError()
+            : mErrorCode(ErrorCode_None)
+        {
+        }
         inline LoadOrderError(ErrorCode errorCode, QString fileName)
-            : mErrorCode(errorCode), mFileName(fileName) {}
+            : mErrorCode(errorCode)
+            , mFileName(fileName)
+        {
+        }
         inline ErrorCode errorCode() const { return mErrorCode; }
         inline QString fileName() const { return mFileName; }
         QString toolTip() const;
diff --git a/components/contentselector/model/modelitem.cpp b/components/contentselector/model/modelitem.cpp
index e1d737c2d4..8822da25a5 100644
--- a/components/contentselector/model/modelitem.cpp
+++ b/components/contentselector/model/modelitem.cpp
@@ -1,6 +1,6 @@
 #include "modelitem.hpp"
 
-ContentSelectorModel::ModelItem::ModelItem(ModelItem *parent)
+ContentSelectorModel::ModelItem::ModelItem(ModelItem* parent)
     : mParentItem(parent)
 {
 }
@@ -16,13 +16,12 @@ ContentSelectorModel::ModelItem::~ModelItem()
     qDeleteAll(mChildItems);
 }
 
-
-ContentSelectorModel::ModelItem *ContentSelectorModel::ModelItem::parent() const
+ContentSelectorModel::ModelItem* ContentSelectorModel::ModelItem::parent() const
 {
     return mParentItem;
 }
 
-bool ContentSelectorModel::ModelItem::hasFormat(const QString &mimetype) const
+bool ContentSelectorModel::ModelItem::hasFormat(const QString& mimetype) const
 {
     if (mimetype == "application/omwcontent")
         return true;
@@ -33,32 +32,30 @@ int ContentSelectorModel::ModelItem::row() const
 {
     if (mParentItem)
         return 1;
-        //return mParentItem->childRow(const_cast<ModelItem*>(this));
-        //return mParentItem->mChildItems.indexOf(const_cast<ModelItem*>(this));
+    // return mParentItem->childRow(const_cast<ModelItem*>(this));
+    // return mParentItem->mChildItems.indexOf(const_cast<ModelItem*>(this));
 
     return -1;
 }
 
-
 int ContentSelectorModel::ModelItem::childCount() const
 {
     return mChildItems.count();
 }
 
-int ContentSelectorModel::ModelItem::childRow(ModelItem *child) const
+int ContentSelectorModel::ModelItem::childRow(ModelItem* child) const
 {
     Q_ASSERT(child);
 
     return mChildItems.indexOf(child);
 }
 
-ContentSelectorModel::ModelItem *ContentSelectorModel::ModelItem::child(int row)
+ContentSelectorModel::ModelItem* ContentSelectorModel::ModelItem::child(int row)
 {
     return mChildItems.value(row);
 }
 
-
-void ContentSelectorModel::ModelItem::appendChild(ModelItem *item)
+void ContentSelectorModel::ModelItem::appendChild(ModelItem* item)
 {
     mChildItems.append(item);
 }
diff --git a/components/contentselector/model/modelitem.hpp b/components/contentselector/model/modelitem.hpp
index a860b1891a..adcbfa7e9d 100644
--- a/components/contentselector/model/modelitem.hpp
+++ b/components/contentselector/model/modelitem.hpp
@@ -1,8 +1,8 @@
 #ifndef MODELITEM_HPP
 #define MODELITEM_HPP
 
-#include <QMimeData>
 #include <QList>
+#include <QMimeData>
 
 namespace ContentSelectorModel
 {
@@ -11,27 +11,27 @@ namespace ContentSelectorModel
         Q_OBJECT
 
     public:
-        ModelItem(ModelItem *parent = nullptr);
-        //ModelItem(const ModelItem *parent = 0);
+        ModelItem(ModelItem* parent = nullptr);
+        // ModelItem(const ModelItem *parent = 0);
 
         ~ModelItem();
 
-        ModelItem *parent() const;
+        ModelItem* parent() const;
         int row() const;
 
         int childCount() const;
-        int childRow(ModelItem *child) const;
-        ModelItem *child(int row);
+        int childRow(ModelItem* child) const;
+        ModelItem* child(int row);
 
-        void appendChild(ModelItem *child);
+        void appendChild(ModelItem* child);
         void removeChild(int row);
 
-        bool hasFormat(const QString &mimetype) const override;
+        bool hasFormat(const QString& mimetype) const override;
 
-        //virtual bool acceptChild(ModelItem *child);
+        // virtual bool acceptChild(ModelItem *child);
 
     protected:
-        ModelItem *mParentItem;
+        ModelItem* mParentItem;
         QList<ModelItem*> mChildItems;
     };
 }
diff --git a/components/contentselector/model/naturalsort.cpp b/components/contentselector/model/naturalsort.cpp
index 50d1e77de0..b090137d97 100644
--- a/components/contentselector/model/naturalsort.cpp
+++ b/components/contentselector/model/naturalsort.cpp
@@ -5,7 +5,7 @@
 
 #include "naturalsort.hpp"
 
-static inline QChar getNextChar(const QString &s, int location)
+static inline QChar getNextChar(const QString& s, int location)
 {
     return (location < s.length()) ? s.at(location) : QChar();
 }
@@ -23,9 +23,10 @@ static inline QChar getNextChar(const QString &s, int location)
  *
  *   Slower then QString::compare() (of course)
  */
-int naturalCompare(const QString &s1, const QString &s2,  Qt::CaseSensitivity cs)
+int naturalCompare(const QString& s1, const QString& s2, Qt::CaseSensitivity cs)
 {
-    for (int l1 = 0, l2 = 0; l1 <= s1.count() && l2 <= s2.count(); ++l1, ++l2) {
+    for (int l1 = 0, l2 = 0; l1 <= s1.count() && l2 <= s2.count(); ++l1, ++l2)
+    {
         // skip spaces, tabs and 0's
         QChar c1 = getNextChar(s1, l1);
         while (c1.isSpace())
@@ -34,7 +35,8 @@ int naturalCompare(const QString &s1, const QString &s2,  Qt::CaseSensitivity cs
         while (c2.isSpace())
             c2 = getNextChar(s2, ++l2);
 
-        if (c1.isDigit() && c2.isDigit()) {
+        if (c1.isDigit() && c2.isDigit())
+        {
             while (c1.digitValue() == 0)
                 c1 = getNextChar(s1, ++l1);
             while (c2.digitValue() == 0)
@@ -44,12 +46,10 @@ int naturalCompare(const QString &s1, const QString &s2,  Qt::CaseSensitivity cs
             int lookAheadLocation2 = l2;
             int currentReturnValue = 0;
             // find the last digit, setting currentReturnValue as we go if it isn't equal
-            for (
-                QChar lookAhead1 = c1, lookAhead2 = c2;
-            (lookAheadLocation1 <= s1.length() && lookAheadLocation2 <= s2.length());
-            lookAhead1 = getNextChar(s1, ++lookAheadLocation1),
-                 lookAhead2 = getNextChar(s2, ++lookAheadLocation2)
-            ) {
+            for (QChar lookAhead1 = c1, lookAhead2 = c2;
+                 (lookAheadLocation1 <= s1.length() && lookAheadLocation2 <= s2.length());
+                 lookAhead1 = getNextChar(s1, ++lookAheadLocation1), lookAhead2 = getNextChar(s2, ++lookAheadLocation2))
+            {
                 bool is1ADigit = !lookAhead1.isNull() && lookAhead1.isDigit();
                 bool is2ADigit = !lookAhead2.isNull() && lookAhead2.isDigit();
                 if (!is1ADigit && !is2ADigit)
@@ -58,10 +58,14 @@ int naturalCompare(const QString &s1, const QString &s2,  Qt::CaseSensitivity cs
                     return -1;
                 if (!is2ADigit)
                     return 1;
-                if (currentReturnValue == 0) {
-                    if (lookAhead1 < lookAhead2) {
+                if (currentReturnValue == 0)
+                {
+                    if (lookAhead1 < lookAhead2)
+                    {
                         currentReturnValue = -1;
-                    } else if (lookAhead1 > lookAhead2) {
+                    }
+                    else if (lookAhead1 > lookAhead2)
+                    {
                         currentReturnValue = 1;
                     }
                 }
@@ -70,9 +74,12 @@ int naturalCompare(const QString &s1, const QString &s2,  Qt::CaseSensitivity cs
                 return currentReturnValue;
         }
 
-        if (cs == Qt::CaseInsensitive) {
-            if (!c1.isLower()) c1 = c1.toLower();
-            if (!c2.isLower()) c2 = c2.toLower();
+        if (cs == Qt::CaseInsensitive)
+        {
+            if (!c1.isLower())
+                c1 = c1.toLower();
+            if (!c2.isLower())
+                c2 = c2.toLower();
         }
         int r = QString::localeAwareCompare(c1, c2);
         if (r < 0)
@@ -84,22 +91,22 @@ int naturalCompare(const QString &s1, const QString &s2,  Qt::CaseSensitivity cs
     return QString::compare(s1, s2, cs);
 }
 
-bool naturalSortLessThanCS( const QString &left, const QString &right )
+bool naturalSortLessThanCS(const QString& left, const QString& right)
 {
-    return (naturalCompare( left, right, Qt::CaseSensitive ) < 0);
+    return (naturalCompare(left, right, Qt::CaseSensitive) < 0);
 }
 
-bool naturalSortLessThanCI( const QString &left, const QString &right )
+bool naturalSortLessThanCI(const QString& left, const QString& right)
 {
-    return (naturalCompare( left, right, Qt::CaseInsensitive ) < 0);
+    return (naturalCompare(left, right, Qt::CaseInsensitive) < 0);
 }
 
-bool naturalSortGreaterThanCS( const QString &left, const QString &right )
+bool naturalSortGreaterThanCS(const QString& left, const QString& right)
 {
-    return (naturalCompare( left, right, Qt::CaseSensitive ) > 0);
+    return (naturalCompare(left, right, Qt::CaseSensitive) > 0);
 }
 
-bool naturalSortGreaterThanCI( const QString &left, const QString &right )
+bool naturalSortGreaterThanCI(const QString& left, const QString& right)
 {
-    return (naturalCompare( left, right, Qt::CaseInsensitive ) > 0);
+    return (naturalCompare(left, right, Qt::CaseInsensitive) > 0);
 }
diff --git a/components/contentselector/model/naturalsort.hpp b/components/contentselector/model/naturalsort.hpp
index 8386e4e9f0..6973c55c2e 100644
--- a/components/contentselector/model/naturalsort.hpp
+++ b/components/contentselector/model/naturalsort.hpp
@@ -3,9 +3,9 @@
 
 #include <QString>
 
-    bool naturalSortLessThanCS( const QString &left, const QString &right );
-    bool naturalSortLessThanCI( const QString &left, const QString &right );
-    bool naturalSortGreaterThanCS( const QString &left, const QString &right );
-    bool naturalSortGreaterThanCI( const QString &left, const QString &right );
+bool naturalSortLessThanCS(const QString& left, const QString& right);
+bool naturalSortLessThanCI(const QString& left, const QString& right);
+bool naturalSortGreaterThanCS(const QString& left, const QString& right);
+bool naturalSortGreaterThanCI(const QString& left, const QString& right);
 
 #endif
diff --git a/components/contentselector/view/combobox.cpp b/components/contentselector/view/combobox.cpp
index 310806240d..276e7741d7 100644
--- a/components/contentselector/view/combobox.cpp
+++ b/components/contentselector/view/combobox.cpp
@@ -1,23 +1,23 @@
-#include <QString>
 #include <QKeyEvent>
+#include <QString>
 
 #include <QStylePainter>
 
 #include "combobox.hpp"
 
-ContentSelectorView::ComboBox::ComboBox(QWidget *parent) :
-    QComboBox(parent)
+ContentSelectorView::ComboBox::ComboBox(QWidget* parent)
+    : QComboBox(parent)
 {
     mValidator = new QRegExpValidator(QRegExp("^[a-zA-Z0-9_]*$"), this); // Alpha-numeric + underscore
     setValidator(mValidator);
     setEditable(true);
     setCompleter(nullptr);
-    setEnabled (true);
+    setEnabled(true);
 
     setInsertPolicy(QComboBox::NoInsert);
 }
 
-void ContentSelectorView::ComboBox::paintEvent(QPaintEvent *)
+void ContentSelectorView::ComboBox::paintEvent(QPaintEvent*)
 {
     QStylePainter painter(this);
     painter.setPen(palette().color(QPalette::Text));
@@ -33,7 +33,7 @@ void ContentSelectorView::ComboBox::paintEvent(QPaintEvent *)
     painter.drawControl(QStyle::CE_ComboBoxLabel, opt);
 }
 
-void ContentSelectorView::ComboBox::setPlaceholderText(const QString &text)
+void ContentSelectorView::ComboBox::setPlaceholderText(const QString& text)
 {
     mPlaceholderText = text;
 }
diff --git a/components/contentselector/view/combobox.hpp b/components/contentselector/view/combobox.hpp
index ebca824c3d..0be2736219 100644
--- a/components/contentselector/view/combobox.hpp
+++ b/components/contentselector/view/combobox.hpp
@@ -13,16 +13,16 @@ namespace ContentSelectorView
         Q_OBJECT
 
     public:
-        explicit ComboBox (QWidget *parent = nullptr);
+        explicit ComboBox(QWidget* parent = nullptr);
 
-        void setPlaceholderText(const QString &text);
+        void setPlaceholderText(const QString& text);
 
     private:
         QString mPlaceholderText;
 
     protected:
-        void paintEvent(QPaintEvent *) override;
-        QRegExpValidator *mValidator;
+        void paintEvent(QPaintEvent*) override;
+        QRegExpValidator* mValidator;
     };
 }
 
diff --git a/components/contentselector/view/contentselector.cpp b/components/contentselector/view/contentselector.cpp
index 0f79a4c59d..69f3459d5c 100644
--- a/components/contentselector/view/contentselector.cpp
+++ b/components/contentselector/view/contentselector.cpp
@@ -2,13 +2,13 @@
 
 #include <components/contentselector/model/esmfile.hpp>
 
-#include <QSortFilterProxyModel>
-#include <QMenu>
 #include <QClipboard>
+#include <QMenu>
 #include <QModelIndex>
+#include <QSortFilterProxyModel>
 
-ContentSelectorView::ContentSelector::ContentSelector(QWidget *parent, bool showOMWScripts) :
-    QObject(parent)
+ContentSelectorView::ContentSelector::ContentSelector(QWidget* parent, bool showOMWScripts)
+    : QObject(parent)
 {
     ui.setupUi(parent);
     ui.addonView->setDragDropMode(QAbstractItemView::InternalMove);
@@ -29,8 +29,8 @@ void ContentSelectorView::ContentSelector::buildGameFileView()
     ui.gameFileView->addItem("<No game file>");
     ui.gameFileView->setVisible(true);
 
-    connect (ui.gameFileView, qOverload<int>(&ComboBox::currentIndexChanged),
-             this, &ContentSelector::slotCurrentGameFileIndexChanged);
+    connect(ui.gameFileView, qOverload<int>(&ComboBox::currentIndexChanged), this,
+        &ContentSelector::slotCurrentGameFileIndexChanged);
 
     ui.gameFileView->setCurrentIndex(0);
 }
@@ -38,9 +38,10 @@ void ContentSelectorView::ContentSelector::buildGameFileView()
 class AddOnProxyModel : public QSortFilterProxyModel
 {
 public:
-    explicit AddOnProxyModel(QObject* parent = nullptr) :
-        QSortFilterProxyModel(parent)
-    {}
+    explicit AddOnProxyModel(QObject* parent = nullptr)
+        : QSortFilterProxyModel(parent)
+    {
+    }
 
     bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override
     {
@@ -55,13 +56,13 @@ public:
 
 void ContentSelectorView::ContentSelector::buildAddonView()
 {
-    ui.addonView->setVisible (true);
+    ui.addonView->setVisible(true);
 
     mAddonProxyModel = new AddOnProxyModel(this);
     mAddonProxyModel->setFilterRegExp(searchFilter()->text());
     mAddonProxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
-    mAddonProxyModel->setDynamicSortFilter (true);
-    mAddonProxyModel->setSourceModel (mContentModel);
+    mAddonProxyModel->setDynamicSortFilter(true);
+    mAddonProxyModel->setSourceModel(mContentModel);
 
     connect(ui.searchFilter, &QLineEdit::textEdited, mAddonProxyModel, &QSortFilterProxyModel::setFilterWildcard);
     connect(ui.searchFilter, &QLineEdit::textEdited, this, &ContentSelector::slotSearchFilterTextChanged);
@@ -69,15 +70,15 @@ void ContentSelectorView::ContentSelector::buildAddonView()
     ui.addonView->setModel(mAddonProxyModel);
 
     connect(ui.addonView, &QTableView::activated, this, &ContentSelector::slotAddonTableItemActivated);
-    connect(mContentModel, &ContentSelectorModel::ContentModel::dataChanged,
-            this, &ContentSelector::signalAddonDataChanged);
+    connect(mContentModel, &ContentSelectorModel::ContentModel::dataChanged, this,
+        &ContentSelector::signalAddonDataChanged);
     buildContextMenu();
 }
 
 void ContentSelectorView::ContentSelector::buildContextMenu()
 {
     ui.addonView->setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(ui.addonView, &QTableView::customContextMenuRequested, this,  &ContentSelector::slotShowContextMenu);
+    connect(ui.addonView, &QTableView::customContextMenuRequested, this, &ContentSelector::slotShowContextMenu);
 
     mContextMenu = new QMenu(ui.addonView);
     mContextMenu->addAction(tr("&Check Selected"), this, SLOT(slotCheckMultiSelectedItems()));
@@ -85,16 +86,16 @@ void ContentSelectorView::ContentSelector::buildContextMenu()
     mContextMenu->addAction(tr("&Copy Path(s) to Clipboard"), this, SLOT(slotCopySelectedItemsPaths()));
 }
 
-void ContentSelectorView::ContentSelector::setProfileContent(const QStringList &fileList)
+void ContentSelectorView::ContentSelector::setProfileContent(const QStringList& fileList)
 {
     clearCheckStates();
 
-    for (const QString &filepath : fileList)
+    for (const QString& filepath : fileList)
     {
-        const ContentSelectorModel::EsmFile *file = mContentModel->item(filepath);
+        const ContentSelectorModel::EsmFile* file = mContentModel->item(filepath);
         if (file && file->isGameFile())
         {
-            setGameFile (filepath);
+            setGameFile(filepath);
             break;
         }
     }
@@ -102,19 +103,19 @@ void ContentSelectorView::ContentSelector::setProfileContent(const QStringList &
     setContentList(fileList);
 }
 
-void ContentSelectorView::ContentSelector::setGameFile(const QString &filename)
+void ContentSelectorView::ContentSelector::setGameFile(const QString& filename)
 {
     int index = 0;
 
     if (!filename.isEmpty())
     {
-        const ContentSelectorModel::EsmFile *file = mContentModel->item (filename);
-        index = ui.gameFileView->findText (file->fileName());
+        const ContentSelectorModel::EsmFile* file = mContentModel->item(filename);
+        index = ui.gameFileView->findText(file->fileName());
 
-        //verify that the current index is also checked in the model
+        // verify that the current index is also checked in the model
         if (!mContentModel->setCheckState(filename, true))
         {
-            //throw error in case file not found?
+            // throw error in case file not found?
             return;
         }
     }
@@ -127,23 +128,22 @@ void ContentSelectorView::ContentSelector::clearCheckStates()
     mContentModel->uncheckAll();
 }
 
-void ContentSelectorView::ContentSelector::setEncoding(const QString &encoding)
+void ContentSelectorView::ContentSelector::setEncoding(const QString& encoding)
 {
     mContentModel->setEncoding(encoding);
 }
 
-void ContentSelectorView::ContentSelector::setContentList(const QStringList &list)
+void ContentSelectorView::ContentSelector::setContentList(const QStringList& list)
 {
     if (list.isEmpty())
     {
-        slotCurrentGameFileIndexChanged (ui.gameFileView->currentIndex());
+        slotCurrentGameFileIndexChanged(ui.gameFileView->currentIndex());
     }
     else
         mContentModel->setContentList(list);
 }
 
-ContentSelectorModel::ContentFileList
-        ContentSelectorView::ContentSelector::selectedFiles() const
+ContentSelectorModel::ContentFileList ContentSelectorView::ContentSelector::selectedFiles() const
 {
     if (!mContentModel)
         return ContentSelectorModel::ContentFileList();
@@ -151,7 +151,7 @@ ContentSelectorModel::ContentFileList
     return mContentModel->checkedItems();
 }
 
-void ContentSelectorView::ContentSelector::addFiles(const QString &path, bool newfiles)
+void ContentSelectorView::ContentSelector::addFiles(const QString& path, bool newfiles)
 {
     mContentModel->addFiles(path, newfiles);
 
@@ -176,7 +176,7 @@ void ContentSelectorView::ContentSelector::sortFiles()
     mContentModel->sortFiles();
 }
 
-bool ContentSelectorView::ContentSelector::containsDataFiles(const QString &path)
+bool ContentSelectorView::ContentSelector::containsDataFiles(const QString& path)
 {
     return mContentModel->containsDataFiles(path);
 }
@@ -214,7 +214,7 @@ void ContentSelectorView::ContentSelector::slotCurrentGameFileIndexChanged(int i
         mContentModel->checkForLoadOrderErrors();
     }
 
-    emit signalCurrentGamefileIndexChanged (index);
+    emit signalCurrentGamefileIndexChanged(index);
 }
 
 void ContentSelectorView::ContentSelector::setGameFileSelected(int index, bool selected)
@@ -228,12 +228,12 @@ void ContentSelectorView::ContentSelector::setGameFileSelected(int index, bool s
     }
 }
 
-void ContentSelectorView::ContentSelector::slotAddonTableItemActivated(const QModelIndex &index)
+void ContentSelectorView::ContentSelector::slotAddonTableItemActivated(const QModelIndex& index)
 {
     // toggles check state when an AddOn file is double clicked or activated by keyboard
-    QModelIndex sourceIndex = mAddonProxyModel->mapToSource (index);
+    QModelIndex sourceIndex = mAddonProxyModel->mapToSource(index);
 
-    if (!mContentModel->isEnabled (sourceIndex))
+    if (!mContentModel->isEnabled(sourceIndex))
         return;
 
     Qt::CheckState checkState = Qt::Unchecked;
@@ -275,12 +275,12 @@ void ContentSelectorView::ContentSelector::slotCheckMultiSelectedItems()
 
 void ContentSelectorView::ContentSelector::slotCopySelectedItemsPaths()
 {
-    QClipboard *clipboard = QApplication::clipboard();
+    QClipboard* clipboard = QApplication::clipboard();
     QString filepaths;
     for (const QModelIndex& index : ui.addonView->selectionModel()->selectedIndexes())
     {
         int row = mAddonProxyModel->mapToSource(index).row();
-        const ContentSelectorModel::EsmFile *file = mContentModel->item(row);
+        const ContentSelectorModel::EsmFile* file = mContentModel->item(row);
         filepaths += file->filePath() + "\n";
     }
 
diff --git a/components/contentselector/view/contentselector.hpp b/components/contentselector/view/contentselector.hpp
index 75ca3e17b4..98131ae52d 100644
--- a/components/contentselector/view/contentselector.hpp
+++ b/components/contentselector/view/contentselector.hpp
@@ -14,48 +14,40 @@ namespace ContentSelectorView
     {
         Q_OBJECT
 
-        QMenu *mContextMenu;
+        QMenu* mContextMenu;
 
     protected:
-
-        ContentSelectorModel::ContentModel *mContentModel;
-        QSortFilterProxyModel *mAddonProxyModel;
+        ContentSelectorModel::ContentModel* mContentModel;
+        QSortFilterProxyModel* mAddonProxyModel;
 
     public:
-
-        explicit ContentSelector(QWidget *parent = nullptr, bool showOMWScripts = false);
+        explicit ContentSelector(QWidget* parent = nullptr, bool showOMWScripts = false);
 
         QString currentFile() const;
 
-        void addFiles(const QString &path, bool newfiles = false);
+        void addFiles(const QString& path, bool newfiles = false);
         void sortFiles();
-        bool containsDataFiles(const QString &path);
+        bool containsDataFiles(const QString& path);
         void clearFiles();
-        void setProfileContent (const QStringList &fileList);
+        void setProfileContent(const QStringList& fileList);
 
         void clearCheckStates();
-        void setEncoding (const QString &encoding);
-        void setContentList(const QStringList &list);
+        void setEncoding(const QString& encoding);
+        void setContentList(const QStringList& list);
 
         ContentSelectorModel::ContentFileList selectedFiles() const;
 
-        void setGameFile (const QString &filename = QString(""));
-
-        bool isGamefileSelected() const
-            { return ui.gameFileView->currentIndex() > 0; }
+        void setGameFile(const QString& filename = QString(""));
 
-        QWidget *uiWidget() const
-            { return ui.contentGroupBox; }
-            
-        QToolButton *refreshButton() const  
-            { return ui.refreshButton; }        
+        bool isGamefileSelected() const { return ui.gameFileView->currentIndex() > 0; }
 
-        QLineEdit *searchFilter() const
-            { return ui.searchFilter; }
+        QWidget* uiWidget() const { return ui.contentGroupBox; }
 
+        QToolButton* refreshButton() const { return ui.refreshButton; }
 
-   private:
+        QLineEdit* searchFilter() const { return ui.searchFilter; }
 
+    private:
         Ui::ContentSelector ui;
 
         void buildContentModel(bool showOMWScripts);
@@ -66,9 +58,9 @@ namespace ContentSelectorView
         void setCheckStateForMultiSelectedItems(bool checked);
 
     signals:
-        void signalCurrentGamefileIndexChanged (int);
+        void signalCurrentGamefileIndexChanged(int);
 
-        void signalAddonDataChanged (const QModelIndex& topleft, const QModelIndex& bottomright);
+        void signalAddonDataChanged(const QModelIndex& topleft, const QModelIndex& bottomright);
         void signalSelectedFilesChanged(QStringList selectedFiles);
 
     private slots:
diff --git a/components/crashcatcher/crashcatcher.cpp b/components/crashcatcher/crashcatcher.cpp
index fa45fc259b..cd24b0e1f7 100644
--- a/components/crashcatcher/crashcatcher.cpp
+++ b/components/crashcatcher/crashcatcher.cpp
@@ -1,17 +1,17 @@
-#include <stdio.h>
 #include <cstring>
+#include <errno.h>
+#include <filesystem>
+#include <fstream>
+#include <limits.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
+#include <string.h>
 #include <sys/param.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <sys/utsname.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.h>
-#include <fstream>
-#include <filesystem>
+#include <sys/wait.h>
+#include <unistd.h>
 
 #include <pthread.h>
 #include <stdbool.h>
@@ -27,14 +27,14 @@
 #ifndef PR_SET_PTRACER
 #define PR_SET_PTRACER 0x59616d61
 #endif
-#elif defined (__APPLE__) || defined (__FreeBSD__) || defined(__OpenBSD__)
+#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
 #include <signal.h>
 #endif
 
 #if defined(__APPLE__)
-#include <sys/sysctl.h>
-#include <libproc.h>
 #include <cassert>
+#include <libproc.h>
+#include <sys/sysctl.h>
 #endif
 
 #if defined(__FreeBSD__)
@@ -50,13 +50,13 @@ static const char fork_err[] = "!!! Failed to fork debug process\n";
 static const char exec_err[] = "!!! Failed to exec debug process\n";
 
 #ifndef PATH_MAX /* Not all platforms (GNU Hurd) have this. */
-#   define PATH_MAX 256
+#define PATH_MAX 256
 #endif
 
 static char argv0[PATH_MAX];
 
-
-static struct {
+static struct
+{
     int signum;
     pid_t pid;
     int has_siginfo;
@@ -64,80 +64,64 @@ static struct {
     char buf[1024];
 } crash_info;
 
-
-static const struct {
-    const char *name;
+static const struct
+{
+    const char* name;
     int signum;
-} signals[] = {
-{ "Segmentation fault", SIGSEGV },
-{ "Illegal instruction", SIGILL },
-{ "FPU exception", SIGFPE },
-{ "System BUS error", SIGBUS },
-{ nullptr, 0 }
-};
+} signals[] = { { "Segmentation fault", SIGSEGV }, { "Illegal instruction", SIGILL }, { "FPU exception", SIGFPE },
+    { "System BUS error", SIGBUS }, { nullptr, 0 } };
 
-static const struct {
+static const struct
+{
     int code;
-    const char *name;
+    const char* name;
 } sigill_codes[] = {
-    #if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
-    { ILL_ILLOPC, "Illegal opcode" },
-    { ILL_ILLOPN, "Illegal operand" },
-    { ILL_ILLADR, "Illegal addressing mode" },
-    { ILL_ILLTRP, "Illegal trap" },
-    { ILL_PRVOPC, "Privileged opcode" },
-    { ILL_PRVREG, "Privileged register" },
-    { ILL_COPROC, "Coprocessor error" },
-    { ILL_BADSTK, "Internal stack error" },
-    #endif
+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
+    { ILL_ILLOPC, "Illegal opcode" }, { ILL_ILLOPN, "Illegal operand" }, { ILL_ILLADR, "Illegal addressing mode" },
+    { ILL_ILLTRP, "Illegal trap" }, { ILL_PRVOPC, "Privileged opcode" }, { ILL_PRVREG, "Privileged register" },
+    { ILL_COPROC, "Coprocessor error" }, { ILL_BADSTK, "Internal stack error" },
+#endif
     { 0, nullptr }
 };
 
-static const struct {
+static const struct
+{
     int code;
-    const char *name;
-} sigfpe_codes[] = {
-    { FPE_INTDIV, "Integer divide by zero" },
-    { FPE_INTOVF, "Integer overflow" },
-    { FPE_FLTDIV, "Floating point divide by zero" },
-    { FPE_FLTOVF, "Floating point overflow" },
-    { FPE_FLTUND, "Floating point underflow" },
-    { FPE_FLTRES, "Floating point inexact result" },
-    { FPE_FLTINV, "Floating point invalid operation" },
-    { FPE_FLTSUB, "Subscript out of range" },
-    { 0, nullptr }
-};
+    const char* name;
+} sigfpe_codes[] = { { FPE_INTDIV, "Integer divide by zero" }, { FPE_INTOVF, "Integer overflow" },
+    { FPE_FLTDIV, "Floating point divide by zero" }, { FPE_FLTOVF, "Floating point overflow" },
+    { FPE_FLTUND, "Floating point underflow" }, { FPE_FLTRES, "Floating point inexact result" },
+    { FPE_FLTINV, "Floating point invalid operation" }, { FPE_FLTSUB, "Subscript out of range" }, { 0, nullptr } };
 
-static const struct {
+static const struct
+{
     int code;
-    const char *name;
+    const char* name;
 } sigsegv_codes[] = {
-    #ifndef __FreeBSD__
-    { SEGV_MAPERR, "Address not mapped to object" },
-    { SEGV_ACCERR, "Invalid permissions for mapped object" },
-    #endif
+#ifndef __FreeBSD__
+    { SEGV_MAPERR, "Address not mapped to object" }, { SEGV_ACCERR, "Invalid permissions for mapped object" },
+#endif
     { 0, nullptr }
 };
 
-static const struct {
+static const struct
+{
     int code;
-    const char *name;
+    const char* name;
 } sigbus_codes[] = {
-    #ifndef __FreeBSD__
-    { BUS_ADRALN, "Invalid address alignment" },
-    { BUS_ADRERR, "Non-existent physical address" },
+#ifndef __FreeBSD__
+    { BUS_ADRALN, "Invalid address alignment" }, { BUS_ADRERR, "Non-existent physical address" },
     { BUS_OBJERR, "Object specific hardware error" },
-    #endif
+#endif
     { 0, nullptr }
 };
 
 static int (*cc_user_info)(char*, char*);
 
-
 static void gdb_info(pid_t pid)
 {
     char respfile[64];
-    FILE *f;
+    FILE* f;
     int fd;
 
     /*
@@ -145,31 +129,33 @@ static void gdb_info(pid_t pid)
      * Note: POSIX.1-2008 declares that the file should be already created with mode 0600 by default.
      * Modern systems implement it and suggest to do not touch masks in multithreaded applications.
      * So CoverityScan warning is valid only for ancient versions of stdlib.
-    */
+     */
     strcpy(respfile, "/tmp/gdb-respfile-XXXXXX");
 #ifdef __COVERITY__
     umask(0600);
 #endif
-    if((fd=mkstemp(respfile)) >= 0 && (f=fdopen(fd, "w")) != nullptr)
+    if ((fd = mkstemp(respfile)) >= 0 && (f = fdopen(fd, "w")) != nullptr)
     {
-        fprintf(f, "attach %d\n"
-                "shell echo \"\"\n"
-                "shell echo \"* Loaded Libraries\"\n"
-                "info sharedlibrary\n"
-                "shell echo \"\"\n"
-                "shell echo \"* Threads\"\n"
-                "info threads\n"
-                "shell echo \"\"\n"
-                "shell echo \"* FPU Status\"\n"
-                "info float\n"
-                "shell echo \"\"\n"
-                "shell echo \"* Registers\"\n"
-                "info registers\n"
-                "shell echo \"\"\n"
-                "shell echo \"* Backtrace\"\n"
-                "thread apply all backtrace full 1000\n"
-                "detach\n"
-                "quit\n", pid);
+        fprintf(f,
+            "attach %d\n"
+            "shell echo \"\"\n"
+            "shell echo \"* Loaded Libraries\"\n"
+            "info sharedlibrary\n"
+            "shell echo \"\"\n"
+            "shell echo \"* Threads\"\n"
+            "info threads\n"
+            "shell echo \"\"\n"
+            "shell echo \"* FPU Status\"\n"
+            "info float\n"
+            "shell echo \"\"\n"
+            "shell echo \"* Registers\"\n"
+            "info registers\n"
+            "shell echo \"\"\n"
+            "shell echo \"* Backtrace\"\n"
+            "thread apply all backtrace full 1000\n"
+            "detach\n"
+            "quit\n",
+            pid);
         fclose(f);
 
         /* Run gdb and print process info. */
@@ -181,8 +167,11 @@ static void gdb_info(pid_t pid)
         int ret = system(cmd_buf);
 
         if (ret != 0)
-            printf("\nFailed to create a crash report. Please make sure that 'gdb' is installed and present in PATH then crash again."
-                   "\nCurrent PATH: %s\n", getenv("PATH"));
+            printf(
+                "\nFailed to create a crash report. Please make sure that 'gdb' is installed and present in PATH then "
+                "crash again."
+                "\nCurrent PATH: %s\n",
+                getenv("PATH"));
         fflush(stdout);
 
         /* Clean up */
@@ -192,7 +181,7 @@ static void gdb_info(pid_t pid)
     else
     {
         /* Error creating temp file */
-        if(fd >= 0)
+        if (fd >= 0)
         {
             if (close(fd) != 0)
                 Log(Debug::Warning) << "Warning: can not close file '" << respfile << "': " << std::strerror(errno);
@@ -208,25 +197,24 @@ static void sys_info(void)
 {
 #ifdef __unix__
     struct utsname info;
-    if(uname(&info))
+    if (uname(&info))
         printf("!!! Failed to get system information\n");
     else
-        printf("System: %s %s %s %s %s\n",
-               info.sysname, info.nodename, info.release, info.version, info.machine);
+        printf("System: %s %s %s %s %s\n", info.sysname, info.nodename, info.release, info.version, info.machine);
 
     fflush(stdout);
 #endif
 }
 
-static size_t safe_write(int fd, const void *buf, size_t len)
+static size_t safe_write(int fd, const void* buf, size_t len)
 {
     size_t ret = 0;
-    while(ret < len)
+    while (ret < len)
     {
         ssize_t rem;
-        if((rem=write(fd, (const char*)buf+ret, len-ret)) == -1)
+        if ((rem = write(fd, (const char*)buf + ret, len - ret)) == -1)
         {
-            if(errno == EINTR)
+            if (errno == EINTR)
                 continue;
             break;
         }
@@ -235,23 +223,23 @@ static size_t safe_write(int fd, const void *buf, size_t len)
     return ret;
 }
 
-static void crash_catcher(int signum, siginfo_t *siginfo, void *context)
+static void crash_catcher(int signum, siginfo_t* siginfo, void* context)
 {
-    //ucontext_t *ucontext = (ucontext_t*)context;
+    // ucontext_t *ucontext = (ucontext_t*)context;
     pid_t dbg_pid;
     int fd[2];
 
     /* Make sure the effective uid is the real uid */
-    if(getuid() != geteuid())
+    if (getuid() != geteuid())
     {
         raise(signum);
         return;
     }
 
-    safe_write(STDERR_FILENO, fatal_err, sizeof(fatal_err)-1);
-    if(pipe(fd) == -1)
+    safe_write(STDERR_FILENO, fatal_err, sizeof(fatal_err) - 1);
+    if (pipe(fd) == -1)
     {
-        safe_write(STDERR_FILENO, pipe_err, sizeof(pipe_err)-1);
+        safe_write(STDERR_FILENO, pipe_err, sizeof(pipe_err) - 1);
         raise(signum);
         return;
     }
@@ -259,140 +247,142 @@ static void crash_catcher(int signum, siginfo_t *siginfo, void *context)
     crash_info.signum = signum;
     crash_info.pid = getpid();
     crash_info.has_siginfo = !!siginfo;
-    if(siginfo)
+    if (siginfo)
         crash_info.siginfo = *siginfo;
-    if(cc_user_info)
-        cc_user_info(crash_info.buf, crash_info.buf+sizeof(crash_info.buf));
+    if (cc_user_info)
+        cc_user_info(crash_info.buf, crash_info.buf + sizeof(crash_info.buf));
 
     /* Fork off to start a crash handler */
-    switch((dbg_pid=fork()))
+    switch ((dbg_pid = fork()))
     {
-    /* Error */
-    case -1:
-        safe_write(STDERR_FILENO, fork_err, sizeof(fork_err)-1);
-        raise(signum);
-        return;
+        /* Error */
+        case -1:
+            safe_write(STDERR_FILENO, fork_err, sizeof(fork_err) - 1);
+            raise(signum);
+            return;
 
-    case 0:
-        dup2(fd[0], STDIN_FILENO);
-        close(fd[0]);
-        close(fd[1]);
+        case 0:
+            dup2(fd[0], STDIN_FILENO);
+            close(fd[0]);
+            close(fd[1]);
 
-        execl(argv0, argv0, crash_switch, nullptr);
+            execl(argv0, argv0, crash_switch, nullptr);
 
-        safe_write(STDERR_FILENO, exec_err, sizeof(exec_err)-1);
-        _exit(1);
+            safe_write(STDERR_FILENO, exec_err, sizeof(exec_err) - 1);
+            _exit(1);
 
-    default:
+        default:
 #ifdef __linux__
-        prctl(PR_SET_PTRACER, dbg_pid, 0, 0, 0);
+            prctl(PR_SET_PTRACER, dbg_pid, 0, 0, 0);
 #endif
-        safe_write(fd[1], &crash_info, sizeof(crash_info));
-        close(fd[0]);
-        close(fd[1]);
-
-        /* Wait; we'll be killed when gdb is done */
-        do {
-            int status;
-            if(waitpid(dbg_pid, &status, 0) == dbg_pid &&
-                    (WIFEXITED(status) || WIFSIGNALED(status)))
+            safe_write(fd[1], &crash_info, sizeof(crash_info));
+            close(fd[0]);
+            close(fd[1]);
+
+            /* Wait; we'll be killed when gdb is done */
+            do
             {
-                /* The debug process died before it could kill us */
-                raise(signum);
-                break;
-            }
-        } while(1);
+                int status;
+                if (waitpid(dbg_pid, &status, 0) == dbg_pid && (WIFEXITED(status) || WIFSIGNALED(status)))
+                {
+                    /* The debug process died before it could kill us */
+                    raise(signum);
+                    break;
+                }
+            } while (1);
     }
 }
 
-static void crash_handler(const char *logfile)
+static void crash_handler(const char* logfile)
 {
-    const char *sigdesc = "";
+    const char* sigdesc = "";
     int i;
 
-    if(fread(&crash_info, sizeof(crash_info), 1, stdin) != 1)
+    if (fread(&crash_info, sizeof(crash_info), 1, stdin) != 1)
     {
         fprintf(stderr, "!!! Failed to retrieve info from crashed process\n");
         exit(1);
     }
 
     /* Get the signal description */
-    for(i = 0;signals[i].name;++i)
+    for (i = 0; signals[i].name; ++i)
     {
-        if(signals[i].signum == crash_info.signum)
+        if (signals[i].signum == crash_info.signum)
         {
             sigdesc = signals[i].name;
             break;
         }
     }
 
-    if(crash_info.has_siginfo)
+    if (crash_info.has_siginfo)
     {
-        switch(crash_info.signum)
+        switch (crash_info.signum)
         {
-        case SIGSEGV:
-            for(i = 0;sigsegv_codes[i].name;++i)
-            {
-                if(sigsegv_codes[i].code == crash_info.siginfo.si_code)
+            case SIGSEGV:
+                for (i = 0; sigsegv_codes[i].name; ++i)
                 {
-                    sigdesc = sigsegv_codes[i].name;
-                    break;
+                    if (sigsegv_codes[i].code == crash_info.siginfo.si_code)
+                    {
+                        sigdesc = sigsegv_codes[i].name;
+                        break;
+                    }
                 }
-            }
-            break;
+                break;
 
-        case SIGFPE:
-            for(i = 0;sigfpe_codes[i].name;++i)
-            {
-                if(sigfpe_codes[i].code == crash_info.siginfo.si_code)
+            case SIGFPE:
+                for (i = 0; sigfpe_codes[i].name; ++i)
                 {
-                    sigdesc = sigfpe_codes[i].name;
-                    break;
+                    if (sigfpe_codes[i].code == crash_info.siginfo.si_code)
+                    {
+                        sigdesc = sigfpe_codes[i].name;
+                        break;
+                    }
                 }
-            }
-            break;
+                break;
 
-        case SIGILL:
-            for(i = 0;sigill_codes[i].name;++i)
-            {
-                if(sigill_codes[i].code == crash_info.siginfo.si_code)
+            case SIGILL:
+                for (i = 0; sigill_codes[i].name; ++i)
                 {
-                    sigdesc = sigill_codes[i].name;
-                    break;
+                    if (sigill_codes[i].code == crash_info.siginfo.si_code)
+                    {
+                        sigdesc = sigill_codes[i].name;
+                        break;
+                    }
                 }
-            }
-            break;
+                break;
 
-        case SIGBUS:
-            for(i = 0;sigbus_codes[i].name;++i)
-            {
-                if(sigbus_codes[i].code == crash_info.siginfo.si_code)
+            case SIGBUS:
+                for (i = 0; sigbus_codes[i].name; ++i)
                 {
-                    sigdesc = sigbus_codes[i].name;
-                    break;
+                    if (sigbus_codes[i].code == crash_info.siginfo.si_code)
+                    {
+                        sigdesc = sigbus_codes[i].name;
+                        break;
+                    }
                 }
-            }
-            break;
+                break;
         }
     }
     fprintf(stderr, "%s (signal %i)\n", sigdesc, crash_info.signum);
-    if(crash_info.has_siginfo)
+    if (crash_info.has_siginfo)
         fprintf(stderr, "Address: %p\n", crash_info.siginfo.si_addr);
     fputc('\n', stderr);
 
-    if(logfile)
+    if (logfile)
     {
         /* Create crash log file and redirect shell output to it */
-        if(freopen(logfile, "wa", stdout) != stdout)
+        if (freopen(logfile, "wa", stdout) != stdout)
         {
             fprintf(stderr, "!!! Could not create %s following signal\n", logfile);
             exit(1);
         }
         fprintf(stderr, "Generating %s and killing process %d, please wait... ", logfile, crash_info.pid);
 
-        printf("*** Fatal Error ***\n"
-               "%s (signal %i)\n", sigdesc, crash_info.signum);
-        if(crash_info.has_siginfo)
+        printf(
+            "*** Fatal Error ***\n"
+            "%s (signal %i)\n",
+            sigdesc, crash_info.signum);
+        if (crash_info.has_siginfo)
             printf("Address: %p\n", crash_info.siginfo.si_addr);
         fputc('\n', stdout);
         fflush(stdout);
@@ -400,11 +390,11 @@ static void crash_handler(const char *logfile)
 
     sys_info();
 
-    crash_info.buf[sizeof(crash_info.buf)-1] = '\0';
+    crash_info.buf[sizeof(crash_info.buf) - 1] = '\0';
     printf("%s\n", crash_info.buf);
     fflush(stdout);
 
-    if(crash_info.pid > 0)
+    if (crash_info.pid > 0)
     {
         gdb_info(crash_info.pid);
         kill(crash_info.pid, SIGKILL);
@@ -415,18 +405,19 @@ static void crash_handler(const char *logfile)
     // even faulty applications shouldn't be able to freeze the X server.
     usleep(100000);
 
-    if(logfile)
+    if (logfile)
     {
-        std::string message = "OpenMW has encountered a fatal error.\nCrash log saved to '" + std::string(logfile) + "'.\n Please report this to https://gitlab.com/OpenMW/openmw/issues !";
+        std::string message = "OpenMW has encountered a fatal error.\nCrash log saved to '" + std::string(logfile)
+            + "'.\n Please report this to https://gitlab.com/OpenMW/openmw/issues !";
         SDL_ShowSimpleMessageBox(0, "Fatal Error", message.c_str(), nullptr);
     }
 
     exit(0);
 }
 
-static void getExecPath(char **argv)
+static void getExecPath(char** argv)
 {
-#if defined (__FreeBSD__)
+#if defined(__FreeBSD__)
     int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
     size_t size = sizeof(argv0);
 
@@ -434,36 +425,37 @@ static void getExecPath(char **argv)
         return;
 #endif
 
-#if defined (__APPLE__)
-    if(proc_pidpath(getpid(), argv0, sizeof(argv0)) > 0)
+#if defined(__APPLE__)
+    if (proc_pidpath(getpid(), argv0, sizeof(argv0)) > 0)
         return;
 #endif
     int cwdlen;
-    const char *statusPaths[] = {"/proc/self/exe", "/proc/self/file", "/proc/curproc/exe", "/proc/curproc/file"};
+    const char* statusPaths[] = { "/proc/self/exe", "/proc/self/file", "/proc/curproc/exe", "/proc/curproc/file" };
     memset(argv0, 0, sizeof(argv0));
 
-    for(const char *path : statusPaths)
+    for (const char* path : statusPaths)
     {
         if (readlink(path, argv0, sizeof(argv0)) != -1)
             return;
     }
 
-    if(argv[0][0] == '/')
+    if (argv[0][0] == '/')
         snprintf(argv0, sizeof(argv0), "%s", argv[0]);
     else if (getcwd(argv0, sizeof(argv0)) != nullptr)
     {
         cwdlen = strlen(argv0);
-        snprintf(argv0+cwdlen, sizeof(argv0)-cwdlen, "/%s", argv[0]);
+        snprintf(argv0 + cwdlen, sizeof(argv0) - cwdlen, "/%s", argv[0]);
     }
 }
 
-int crashCatcherInstallHandlers(int argc, char **argv, int num_signals, int *signals, const char *logfile, int (*user_info)(char*, char*))
+int crashCatcherInstallHandlers(
+    int argc, char** argv, int num_signals, int* signals, const char* logfile, int (*user_info)(char*, char*))
 {
     struct sigaction sa;
     stack_t altss;
     int retval;
 
-    if(argc == 2 && strcmp(argv[1], crash_switch) == 0)
+    if (argc == 2 && strcmp(argv[1], crash_switch) == 0)
         crash_handler(logfile);
 
     cc_user_info = user_info;
@@ -472,7 +464,7 @@ int crashCatcherInstallHandlers(int argc, char **argv, int num_signals, int *sig
 
     /* Set an alternate signal stack so SIGSEGVs caused by stack overflows
      * still run */
-    static char* altstack = new char [SIGSTKSZ];
+    static char* altstack = new char[SIGSTKSZ];
     altss.ss_sp = altstack;
     altss.ss_flags = 0;
     altss.ss_size = SIGSTKSZ;
@@ -484,10 +476,11 @@ int crashCatcherInstallHandlers(int argc, char **argv, int num_signals, int *sig
     sigemptyset(&sa.sa_mask);
 
     retval = 0;
-    while(num_signals--)
+    while (num_signals--)
     {
-        if((*signals != SIGSEGV && *signals != SIGILL && *signals != SIGFPE && *signals != SIGABRT &&
-            *signals != SIGBUS) || sigaction(*signals, &sa, nullptr) == -1)
+        if ((*signals != SIGSEGV && *signals != SIGILL && *signals != SIGFPE && *signals != SIGABRT
+                && *signals != SIGBUS)
+            || sigaction(*signals, &sa, nullptr) == -1)
         {
             *signals = 0;
             retval = -1;
@@ -499,7 +492,7 @@ int crashCatcherInstallHandlers(int argc, char **argv, int num_signals, int *sig
 
 static bool is_debugger_present()
 {
-#if defined (__linux__)
+#if defined(__linux__)
     std::filesystem::path procstatus = std::filesystem::path("/proc/self/status");
     if (std::filesystem::exists(procstatus))
     {
@@ -559,7 +552,7 @@ static bool is_debugger_present()
 #endif
 }
 
-void crashCatcherInstall(int argc, char **argv, const std::filesystem::path &crashLogPath)
+void crashCatcherInstall(int argc, char** argv, const std::filesystem::path& crashLogPath)
 {
     if ((argc == 2 && strcmp(argv[1], crash_switch) == 0) || !is_debugger_present())
     {
diff --git a/components/crashcatcher/crashcatcher.hpp b/components/crashcatcher/crashcatcher.hpp
index b029c5460b..393a6f5bf5 100644
--- a/components/crashcatcher/crashcatcher.hpp
+++ b/components/crashcatcher/crashcatcher.hpp
@@ -3,20 +3,19 @@
 
 #include <string>
 
-#if (defined(__APPLE__) || (defined(__linux)  &&  !defined(ANDROID)) || (defined(__unix) &&  !defined(ANDROID)) || defined(__posix))
-    #define USE_CRASH_CATCHER 1
+#if (defined(__APPLE__) || (defined(__linux) && !defined(ANDROID)) || (defined(__unix) && !defined(ANDROID))           \
+    || defined(__posix))
+#define USE_CRASH_CATCHER 1
 #else
-    #define USE_CRASH_CATCHER 0
+#define USE_CRASH_CATCHER 0
 #endif
 
 constexpr char crash_switch[] = "--cc-handle-crash";
 
 #if USE_CRASH_CATCHER
-extern void crashCatcherInstall(int argc, char **argv, const std::filesystem::path &crashLogPath);
+extern void crashCatcherInstall(int argc, char** argv, const std::filesystem::path& crashLogPath);
 #else
-inline void crashCatcherInstall(int, char **, const std::string &crashLogPath)
-{
-}
+inline void crashCatcherInstall(int, char**, const std::string& crashLogPath) {}
 #endif
 
 #endif
diff --git a/components/crashcatcher/windows_crashcatcher.cpp b/components/crashcatcher/windows_crashcatcher.cpp
index 46a09f43f6..af5125928a 100644
--- a/components/crashcatcher/windows_crashcatcher.cpp
+++ b/components/crashcatcher/windows_crashcatcher.cpp
@@ -17,9 +17,8 @@ namespace Crash
     HANDLE duplicateHandle(HANDLE handle)
     {
         HANDLE duplicate;
-        if (!DuplicateHandle(GetCurrentProcess(), handle,
-                             GetCurrentProcess(), &duplicate,
-                             0, TRUE, DUPLICATE_SAME_ACCESS))
+        if (!DuplicateHandle(
+                GetCurrentProcess(), handle, GetCurrentProcess(), &duplicate, 0, TRUE, DUPLICATE_SAME_ACCESS))
         {
             throw std::runtime_error("Crash monitor could not duplicate handle");
         }
@@ -28,14 +27,14 @@ namespace Crash
 
     CrashCatcher* CrashCatcher::sInstance = nullptr;
 
-    CrashCatcher::CrashCatcher(int argc, char **argv, const std::filesystem::path& crashLogPath)
+    CrashCatcher::CrashCatcher(int argc, char** argv, const std::filesystem::path& crashLogPath)
     {
         assert(sInstance == nullptr); // don't allow two instances
 
         sInstance = this;
 
         HANDLE shmHandle = nullptr;
-        for (int i=0; i<argc; ++i)
+        for (int i = 0; i < argc; ++i)
         {
             if (strcmp(argv[i], "--crash-monitor"))
                 continue;
@@ -86,7 +85,8 @@ namespace Crash
         mSignalAppEvent = CreateEventW(&attributes, FALSE, FALSE, NULL);
         mSignalMonitorEvent = CreateEventW(&attributes, FALSE, FALSE, NULL);
 
-        mShmHandle = CreateFileMappingW(INVALID_HANDLE_VALUE, &attributes, PAGE_READWRITE, HIWORD(sizeof(CrashSHM)), LOWORD(sizeof(CrashSHM)), NULL);
+        mShmHandle = CreateFileMappingW(INVALID_HANDLE_VALUE, &attributes, PAGE_READWRITE, HIWORD(sizeof(CrashSHM)),
+            LOWORD(sizeof(CrashSHM)), NULL);
         if (mShmHandle == nullptr)
             throw std::runtime_error("Failed to allocate crash catcher shared memory");
 
@@ -130,7 +130,8 @@ namespace Crash
     {
         std::wstring executablePath;
         DWORD copied = 0;
-        do {
+        do
+        {
             executablePath.resize(executablePath.size() + MAX_PATH);
             copied = GetModuleFileNameW(nullptr, executablePath.data(), static_cast<DWORD>(executablePath.size()));
         } while (copied >= executablePath.size());
@@ -139,8 +140,10 @@ namespace Crash
         memset(mShm->mStartup.mLogFilePath, 0, sizeof(mShm->mStartup.mLogFilePath));
         const auto str = crashLogPath.u8string();
         size_t length = str.length();
-        if (length >= MAX_LONG_PATH) length = MAX_LONG_PATH - 1;
-        strncpy_s(mShm->mStartup.mLogFilePath, sizeof mShm->mStartup.mLogFilePath, Misc::StringUtils::u8StringToString(str).c_str(), length);
+        if (length >= MAX_LONG_PATH)
+            length = MAX_LONG_PATH - 1;
+        strncpy_s(mShm->mStartup.mLogFilePath, sizeof mShm->mStartup.mLogFilePath,
+            Misc::StringUtils::u8StringToString(str).c_str(), length);
         mShm->mStartup.mLogFilePath[length] = '\0';
 
         // note that we don't need to lock the SHM here, the other process has not started yet
@@ -171,10 +174,10 @@ namespace Crash
     {
         switch (info->ExceptionRecord->ExceptionCode)
         {
-        case EXCEPTION_SINGLE_STEP:
-        case EXCEPTION_BREAKPOINT:
-        case DBG_PRINTEXCEPTION_C:
-            return EXCEPTION_EXECUTE_HANDLER;
+            case EXCEPTION_SINGLE_STEP:
+            case EXCEPTION_BREAKPOINT:
+            case DBG_PRINTEXCEPTION_C:
+                return EXCEPTION_EXECUTE_HANDLER;
         }
         if (!sInstance)
             return EXCEPTION_EXECUTE_HANDLER;
@@ -200,7 +203,9 @@ namespace Crash
         // must remain until monitor has finished
         waitMonitor();
 
-        std::string message = "OpenMW has encountered a fatal error.\nCrash log saved to '" + std::string(mShm->mStartup.mLogFilePath) + "'.\nPlease report this to https://gitlab.com/OpenMW/openmw/issues !";
+        std::string message = "OpenMW has encountered a fatal error.\nCrash log saved to '"
+            + std::string(mShm->mStartup.mLogFilePath)
+            + "'.\nPlease report this to https://gitlab.com/OpenMW/openmw/issues !";
         SDL_ShowSimpleMessageBox(0, "Fatal Error", message.c_str(), nullptr);
     }
 
diff --git a/components/crashcatcher/windows_crashcatcher.hpp b/components/crashcatcher/windows_crashcatcher.hpp
index 4379b34d71..2b0fc31e34 100644
--- a/components/crashcatcher/windows_crashcatcher.hpp
+++ b/components/crashcatcher/windows_crashcatcher.hpp
@@ -3,8 +3,8 @@
 
 #include <filesystem>
 
-#include <components/windows.hpp>
 #include <components/crashcatcher/crashcatcher.hpp>
+#include <components/windows.hpp>
 
 namespace Crash
 {
@@ -27,12 +27,10 @@ namespace Crash
     class CrashCatcher final
     {
     public:
-
-        CrashCatcher(int argc, char **argv, const std::filesystem::path& crashLogPath);
+        CrashCatcher(int argc, char** argv, const std::filesystem::path& crashLogPath);
         ~CrashCatcher();
 
     private:
-
         static CrashCatcher* sInstance;
 
         //  mapped SHM area
@@ -67,7 +65,6 @@ namespace Crash
         void handleVectoredException(PEXCEPTION_POINTERS info);
 
     public:
-
         static LONG WINAPI vectoredExceptionHandler(PEXCEPTION_POINTERS info);
     };
 
diff --git a/components/crashcatcher/windows_crashmonitor.cpp b/components/crashcatcher/windows_crashmonitor.cpp
index d2e5737949..8189515352 100644
--- a/components/crashcatcher/windows_crashmonitor.cpp
+++ b/components/crashcatcher/windows_crashmonitor.cpp
@@ -1,7 +1,7 @@
 #include "windows_crashmonitor.hpp"
 
-#include <components/windows.hpp>
 #include <Psapi.h>
+#include <components/windows.hpp>
 
 #include <DbgHelp.h>
 
@@ -17,7 +17,7 @@
 namespace Crash
 {
     std::unordered_map<HWINEVENTHOOK, CrashMonitor*> CrashMonitor::smEventHookOwners{};
-    
+
     using IsHungAppWindowFn = BOOL(WINAPI*)(HWND hwnd);
 
     // Obtains the pointer to user32.IsHungAppWindow, this function may be removed in the future.
@@ -32,7 +32,7 @@ namespace Crash
     }
 
     static const IsHungAppWindowFn sIsHungAppWindow = getIsHungAppWindow();
-    
+
     CrashMonitor::CrashMonitor(HANDLE shmHandle)
         : mShmHandle(shmHandle)
     {
@@ -105,34 +105,40 @@ namespace Crash
 
         if (!mAppWindowHandle)
         {
-            EnumWindows([](HWND handle, LPARAM param) -> BOOL {
-                CrashMonitor& crashMonitor = *(CrashMonitor*)param;
-                DWORD processId;
-                if (GetWindowThreadProcessId(handle, &processId) == crashMonitor.mAppMainThreadId && processId == GetProcessId(crashMonitor.mAppProcessHandle))
-                {
-                    if (GetWindow(handle, GW_OWNER) == 0)
+            EnumWindows(
+                [](HWND handle, LPARAM param) -> BOOL {
+                    CrashMonitor& crashMonitor = *(CrashMonitor*)param;
+                    DWORD processId;
+                    if (GetWindowThreadProcessId(handle, &processId) == crashMonitor.mAppMainThreadId
+                        && processId == GetProcessId(crashMonitor.mAppProcessHandle))
                     {
-                        crashMonitor.mAppWindowHandle = handle;
-                        return false;
+                        if (GetWindow(handle, GW_OWNER) == 0)
+                        {
+                            crashMonitor.mAppWindowHandle = handle;
+                            return false;
+                        }
                     }
-                }
-                return true;
-                }, (LPARAM)this);
+                    return true;
+                },
+                (LPARAM)this);
             if (mAppWindowHandle)
             {
                 DWORD processId;
                 GetWindowThreadProcessId(mAppWindowHandle, &processId);
-                HWINEVENTHOOK eventHookHandle = SetWinEventHook(EVENT_OBJECT_DESTROY, EVENT_OBJECT_DESTROY, nullptr,
-                    [](HWINEVENTHOOK hWinEventHook, DWORD event, HWND windowHandle, LONG objectId, LONG childId, DWORD eventThread, DWORD eventTime)
-                    {
+                HWINEVENTHOOK eventHookHandle = SetWinEventHook(
+                    EVENT_OBJECT_DESTROY, EVENT_OBJECT_DESTROY, nullptr,
+                    [](HWINEVENTHOOK hWinEventHook, DWORD event, HWND windowHandle, LONG objectId, LONG childId,
+                        DWORD eventThread, DWORD eventTime) {
                         CrashMonitor& crashMonitor = *smEventHookOwners[hWinEventHook];
-                        if (event == EVENT_OBJECT_DESTROY && windowHandle == crashMonitor.mAppWindowHandle && objectId == OBJID_WINDOW && childId == INDEXID_CONTAINER)
+                        if (event == EVENT_OBJECT_DESTROY && windowHandle == crashMonitor.mAppWindowHandle
+                            && objectId == OBJID_WINDOW && childId == INDEXID_CONTAINER)
                         {
                             crashMonitor.mAppWindowHandle = nullptr;
                             smEventHookOwners.erase(hWinEventHook);
                             UnhookWinEvent(hWinEventHook);
                         }
-                    }, processId, mAppMainThreadId, WINEVENT_OUTOFCONTEXT);
+                    },
+                    processId, mAppMainThreadId, WINEVENT_OUTOFCONTEXT);
                 smEventHookOwners[eventHookHandle] = this;
             }
             else
@@ -183,17 +189,17 @@ namespace Crash
 
                     switch (mShm->mEvent)
                     {
-                    case CrashSHM::Event::None:
-                        break;
-                    case CrashSHM::Event::Crashed:
-                        handleCrash();
-                        running = false;
-                        break;
-                    case CrashSHM::Event::Shutdown:
-                        running = false;
-                        break;
-                    case CrashSHM::Event::Startup:
-                        break;
+                        case CrashSHM::Event::None:
+                            break;
+                        case CrashSHM::Event::Crashed:
+                            handleCrash();
+                            running = false;
+                            break;
+                        case CrashSHM::Event::Shutdown:
+                            running = false;
+                            break;
+                        case CrashSHM::Event::Startup:
+                            break;
                     }
 
                     shmUnlock();
@@ -206,11 +212,12 @@ namespace Crash
             if (mFreezeAbort)
             {
                 TerminateProcess(mAppProcessHandle, 0xDEAD);
-                std::string message = "OpenMW appears to have frozen.\nCrash log saved to '" + std::string(mShm->mStartup.mLogFilePath) + "'.\nPlease report this to https://gitlab.com/OpenMW/openmw/issues !";
+                std::string message = "OpenMW appears to have frozen.\nCrash log saved to '"
+                    + std::string(mShm->mStartup.mLogFilePath)
+                    + "'.\nPlease report this to https://gitlab.com/OpenMW/openmw/issues !";
                 SDL_ShowSimpleMessageBox(0, "Fatal Error", message.c_str(), nullptr);
             }
-
-        } 
+        }
         catch (...)
         {
             Log(Debug::Error) << "Exception in crash monitor, exiting";
@@ -239,12 +246,11 @@ namespace Crash
             HMODULE dbghelp = LoadLibraryA("dbghelp.dll");
             if (dbghelp == NULL)
                 return;
-    
-            using MiniDumpWirteDumpFn = BOOL (WINAPI*)(
-                HANDLE hProcess, DWORD ProcessId, HANDLE hFile, MINIDUMP_TYPE DumpType, PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
-                PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam, PMINIDUMP_CALLBACK_INFORMATION CallbackParam
-            );
-    
+
+            using MiniDumpWirteDumpFn = BOOL(WINAPI*)(HANDLE hProcess, DWORD ProcessId, HANDLE hFile,
+                MINIDUMP_TYPE DumpType, PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
+                PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam, PMINIDUMP_CALLBACK_INFORMATION CallbackParam);
+
             MiniDumpWirteDumpFn miniDumpWriteDump = (MiniDumpWirteDumpFn)GetProcAddress(dbghelp, "MiniDumpWriteDump");
             if (miniDumpWriteDump == NULL)
                 return;
@@ -256,7 +262,8 @@ namespace Crash
             if (utf16Path.length() > MAX_PATH)
                 utf16Path = LR"(\\?\)" + utf16Path;
 
-            HANDLE hCrashLog = CreateFileW(utf16Path.c_str(), GENERIC_READ | GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
+            HANDLE hCrashLog = CreateFileW(utf16Path.c_str(), GENERIC_READ | GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS,
+                FILE_ATTRIBUTE_NORMAL, nullptr);
             if (hCrashLog == NULL || hCrashLog == INVALID_HANDLE_VALUE)
                 return;
             if (auto err = GetLastError(); err != ERROR_ALREADY_EXISTS && err != 0)
@@ -272,7 +279,7 @@ namespace Crash
             MINIDUMP_TYPE type = (MINIDUMP_TYPE)(MiniDumpWithDataSegs | MiniDumpWithHandleData);
             miniDumpWriteDump(mAppProcessHandle, processId, hCrashLog, type, &infos, 0, 0);
         }
-        catch (const std::exception&e)
+        catch (const std::exception& e)
         {
             Log(Debug::Error) << "CrashMonitor: " << e.what();
         }
@@ -286,20 +293,16 @@ namespace Crash
     {
         std::thread messageBoxThread([&]() {
             SDL_MessageBoxButtonData button = { SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT, 0, "Abort" };
-            SDL_MessageBoxData messageBoxData = {
-                SDL_MESSAGEBOX_ERROR,
-                nullptr,
-                "OpenMW appears to have frozen",
-                "OpenMW appears to have frozen. Press Abort to terminate it and generate a crash dump.\nIf OpenMW hasn't actually frozen, this message box will disappear a within a few seconds of it becoming responsive.",
-                1,
-                &button,
-                nullptr
-            };
+            SDL_MessageBoxData messageBoxData = { SDL_MESSAGEBOX_ERROR, nullptr, "OpenMW appears to have frozen",
+                "OpenMW appears to have frozen. Press Abort to terminate it and generate a crash dump.\nIf OpenMW "
+                "hasn't actually frozen, this message box will disappear a within a few seconds of it becoming "
+                "responsive.",
+                1, &button, nullptr };
 
             int buttonId;
             if (SDL_ShowMessageBox(&messageBoxData, &buttonId) == 0 && buttonId == 0)
                 mFreezeAbort = true;
-            });
+        });
 
         mFreezeMessageBoxThreadId = GetThreadId(messageBoxThread.native_handle());
         messageBoxThread.detach();
@@ -310,13 +313,16 @@ namespace Crash
         if (!mFreezeMessageBoxThreadId)
             return;
 
-        EnumWindows([](HWND handle, LPARAM param) -> BOOL {
-            CrashMonitor& crashMonitor = *(CrashMonitor*)param;
-            DWORD processId;
-            if (GetWindowThreadProcessId(handle, &processId) == crashMonitor.mFreezeMessageBoxThreadId && processId == GetCurrentProcessId())
-                PostMessage(handle, WM_CLOSE, 0, 0);
-            return true;
-            }, (LPARAM)this);
+        EnumWindows(
+            [](HWND handle, LPARAM param) -> BOOL {
+                CrashMonitor& crashMonitor = *(CrashMonitor*)param;
+                DWORD processId;
+                if (GetWindowThreadProcessId(handle, &processId) == crashMonitor.mFreezeMessageBoxThreadId
+                    && processId == GetCurrentProcessId())
+                    PostMessage(handle, WM_CLOSE, 0, 0);
+                return true;
+            },
+            (LPARAM)this);
 
         mFreezeMessageBoxThreadId = 0;
     }
diff --git a/components/crashcatcher/windows_crashmonitor.hpp b/components/crashcatcher/windows_crashmonitor.hpp
index d6a8dd7ac5..35ff91495d 100644
--- a/components/crashcatcher/windows_crashmonitor.hpp
+++ b/components/crashcatcher/windows_crashmonitor.hpp
@@ -9,56 +9,54 @@
 namespace Crash
 {
 
-struct CrashSHM;
+    struct CrashSHM;
 
-class CrashMonitor final
-{
-public:
-
-    CrashMonitor(HANDLE shmHandle);
-
-    ~CrashMonitor();
+    class CrashMonitor final
+    {
+    public:
+        CrashMonitor(HANDLE shmHandle);
 
-    void run();
+        ~CrashMonitor();
 
-private:
+        void run();
 
-    HANDLE mAppProcessHandle = nullptr;
-    DWORD mAppMainThreadId = 0;
-    HWND mAppWindowHandle = nullptr;
+    private:
+        HANDLE mAppProcessHandle = nullptr;
+        DWORD mAppMainThreadId = 0;
+        HWND mAppWindowHandle = nullptr;
 
-    // triggered when the monitor process wants to wake the parent process (received via SHM)
-    HANDLE mSignalAppEvent = nullptr;
-    // triggered when the application wants to wake the monitor process (received via SHM)
-    HANDLE mSignalMonitorEvent = nullptr;
+        // triggered when the monitor process wants to wake the parent process (received via SHM)
+        HANDLE mSignalAppEvent = nullptr;
+        // triggered when the application wants to wake the monitor process (received via SHM)
+        HANDLE mSignalMonitorEvent = nullptr;
 
-    CrashSHM* mShm = nullptr;
-    HANDLE mShmHandle = nullptr;
-    HANDLE mShmMutex = nullptr;
+        CrashSHM* mShm = nullptr;
+        HANDLE mShmHandle = nullptr;
+        HANDLE mShmMutex = nullptr;
 
-    DWORD mFreezeMessageBoxThreadId = 0;
-    std::atomic_bool mFreezeAbort;
+        DWORD mFreezeMessageBoxThreadId = 0;
+        std::atomic_bool mFreezeAbort;
 
-    static std::unordered_map<HWINEVENTHOOK, CrashMonitor*> smEventHookOwners;
+        static std::unordered_map<HWINEVENTHOOK, CrashMonitor*> smEventHookOwners;
 
-    void signalApp() const;
+        void signalApp() const;
 
-    bool waitApp() const;
+        bool waitApp() const;
 
-    bool isAppAlive() const;
+        bool isAppAlive() const;
 
-    bool isAppFrozen();
+        bool isAppFrozen();
 
-    void shmLock();
+        void shmLock();
 
-    void shmUnlock();
+        void shmUnlock();
 
-    void handleCrash();
+        void handleCrash();
 
-    void showFreezeMessageBox();
+        void showFreezeMessageBox();
 
-    void hideFreezeMessageBox();
-};
+        void hideFreezeMessageBox();
+    };
 
 } // namespace Crash
 
diff --git a/components/debug/debugdraw.cpp b/components/debug/debugdraw.cpp
index 6ee165c7ef..7aac5fd6ef 100644
--- a/components/debug/debugdraw.cpp
+++ b/components/debug/debugdraw.cpp
@@ -82,7 +82,9 @@ static void generateCube(osg::Geometry& geom, float dim)
 
         for (int i_point = 0; i_point < 4; i_point++)
         {
-            float iu = i_point % 2 == 1 ? float_dir : -float_dir; //This is to get the right triangle orientation when the normal changes*
+            float iu = i_point % 2 == 1
+                ? float_dir
+                : -float_dir; // This is to get the right triangle orientation when the normal changes*
             float iv = i_point / 2 == 1 ? 1.0 : -1.0;
             osg::Vec3f point = (u * iu) + (v * iv);
             point = (point + normale);
@@ -112,13 +114,13 @@ static void generateCylinder(osg::Geometry& geom, float radius, float height, in
     osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array;
     osg::ref_ptr<osg::Vec3Array> normals = new osg::Vec3Array;
     osg::ref_ptr<osg::DrawElementsUShort> indices = new osg::DrawElementsUShort(osg::DrawElementsUShort::TRIANGLES, 0);
-    int vertexCount = subdiv * 4 + 2; //2 discs + top and bottom + 2 center
+    int vertexCount = subdiv * 4 + 2; // 2 discs + top and bottom + 2 center
     indices->reserve(vertexCount);
     int iVertex = 0;
 
     int beginTop = iVertex;
     auto topNormal = osg::Vec3(0., 0., 1.);
-    //top disk
+    // top disk
     for (int i = 0; i < subdiv; i++)
     {
         float theta = (float(i) / float(subdiv)) * osg::PI * 2.;
@@ -130,20 +132,20 @@ static void generateCylinder(osg::Geometry& geom, float radius, float height, in
         iVertex += 1;
     }
     auto centerTop = iVertex;
-    //centerTop
+    // centerTop
     {
         vertices->push_back(osg::Vec3(0., 0., height / 2.));
         normals->push_back(topNormal);
         iVertex += 1;
     }
     auto centerBot = iVertex;
-    //centerBot
+    // centerBot
     {
         vertices->push_back(osg::Vec3(0., 0., -height / 2));
         normals->push_back(-topNormal);
         iVertex += 1;
     }
-    //bottom disk
+    // bottom disk
     auto begin_bot = iVertex;
     for (int i = 0; i < subdiv; i++)
     {
@@ -155,7 +157,7 @@ static void generateCylinder(osg::Geometry& geom, float radius, float height, in
         normals->push_back(-topNormal);
         iVertex += 1;
     }
-    //sides
+    // sides
     int beginSide = iVertex;
     for (int i = 0; i < subdiv; i++)
     {
@@ -174,7 +176,7 @@ static void generateCylinder(osg::Geometry& geom, float radius, float height, in
         iVertex += 1;
     }
 
-    //create triangles sides
+    // create triangles sides
     for (int i = 0; i < subdiv; i++)
     {
         auto next_vert = (i + 1) % subdiv;
@@ -240,7 +242,6 @@ namespace Debug
         lines.addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::LINES, 0, vertices->size()));
     }
 
-
     DebugCustomDraw::DebugCustomDraw()
     {
         mLinesToDraw = new osg::Geometry();
@@ -311,7 +312,10 @@ namespace Debug
     class DebugDrawCallback : public SceneUtil::NodeCallback<DebugDrawCallback>
     {
     public:
-        DebugDrawCallback(Debug::DebugDrawer& debugDrawer) : mDebugDrawer(debugDrawer) {}
+        DebugDrawCallback(Debug::DebugDrawer& debugDrawer)
+            : mDebugDrawer(debugDrawer)
+        {
+        }
 
         void operator()(osg::Node* node, osg::NodeVisitor* nv)
         {
@@ -319,7 +323,8 @@ namespace Debug
             int indexRead = getIdexBufferReadFromFrame(mDebugDrawer.mCurrentFrame);
             auto& lines = mDebugDrawer.mCustomDebugDrawer[indexRead]->mLinesToDraw;
             lines->removePrimitiveSet(0, 1);
-            lines->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::LINES, 0, static_cast<osg::Vec3Array*>(lines->getVertexArray())->size()));
+            lines->addPrimitiveSet(new osg::DrawArrays(
+                osg::PrimitiveSet::LINES, 0, static_cast<osg::Vec3Array*>(lines->getVertexArray())->size()));
 
             nv->pushOntoNodePath(mDebugDrawer.mCustomDebugDrawer[indexRead]);
             nv->apply(*mDebugDrawer.mCustomDebugDrawer[indexRead]);
@@ -330,11 +335,14 @@ namespace Debug
     };
 }
 
-Debug::DebugDrawer::DebugDrawer(Shader::ShaderManager& shaderManager, osg::ref_ptr<osg::Group> parentNode) : mParentNode(parentNode)
+Debug::DebugDrawer::DebugDrawer(Shader::ShaderManager& shaderManager, osg::ref_ptr<osg::Group> parentNode)
+    : mParentNode(parentNode)
 {
     mCurrentFrame = 0;
-    auto vertexShader = shaderManager.getShader("debug_vertex.glsl", Shader::ShaderManager::DefineMap(), osg::Shader::Type::VERTEX);
-    auto fragmentShader = shaderManager.getShader("debug_fragment.glsl", Shader::ShaderManager::DefineMap(), osg::Shader::Type::FRAGMENT);
+    auto vertexShader
+        = shaderManager.getShader("debug_vertex.glsl", Shader::ShaderManager::DefineMap(), osg::Shader::Type::VERTEX);
+    auto fragmentShader = shaderManager.getShader(
+        "debug_fragment.glsl", Shader::ShaderManager::DefineMap(), osg::Shader::Type::FRAGMENT);
 
     auto program = shaderManager.getProgram(vertexShader, fragmentShader);
 
@@ -382,11 +390,12 @@ Debug::DebugDrawer::DebugDrawer(Shader::ShaderManager& shaderManager, osg::ref_p
 Debug::DebugDrawer::~DebugDrawer()
 {
     mParentNode->removeChild(mDebugDrawSceneObjects);
-} 
+}
 
 void Debug::DebugDrawer::drawCube(osg::Vec3f mPosition, osg::Vec3f mDims, osg::Vec3f mColor)
 {
-    mCustomDebugDrawer[getIdexBufferWriteFromFrame(mCurrentFrame)]->mShapesToDraw.push_back({ mPosition, mDims, mColor, DrawShape::Cube });
+    mCustomDebugDrawer[getIdexBufferWriteFromFrame(mCurrentFrame)]->mShapesToDraw.push_back(
+        { mPosition, mDims, mColor, DrawShape::Cube });
 }
 
 void Debug::DebugDrawer::drawCubeMinMax(osg::Vec3f min, osg::Vec3f max, osg::Vec3f color)
diff --git a/components/debug/debugdraw.hpp b/components/debug/debugdraw.hpp
index 842a1ab753..659968d35a 100644
--- a/components/debug/debugdraw.hpp
+++ b/components/debug/debugdraw.hpp
@@ -50,9 +50,20 @@ namespace Debug
 
         DrawShape mDrawShape;
 
-        static DrawCall cube(osg::Vec3f pos, osg::Vec3 dims = osg::Vec3(50., 50., 50.), osg::Vec3 color = colorWhite) { return { pos, dims, color, DrawShape::Cube }; }
-        static DrawCall wireCube(osg::Vec3f pos, osg::Vec3 dims = osg::Vec3(50., 50., 50.), osg::Vec3 color = colorWhite) { return { pos, dims, color, DrawShape::WireCube }; }
-        static DrawCall cylinder(osg::Vec3f pos, osg::Vec3 dims = osg::Vec3(50., 50., 50.), osg::Vec3 color = colorWhite) { return { pos, dims, color, DrawShape::Cylinder }; }
+        static DrawCall cube(osg::Vec3f pos, osg::Vec3 dims = osg::Vec3(50., 50., 50.), osg::Vec3 color = colorWhite)
+        {
+            return { pos, dims, color, DrawShape::Cube };
+        }
+        static DrawCall wireCube(
+            osg::Vec3f pos, osg::Vec3 dims = osg::Vec3(50., 50., 50.), osg::Vec3 color = colorWhite)
+        {
+            return { pos, dims, color, DrawShape::WireCube };
+        }
+        static DrawCall cylinder(
+            osg::Vec3f pos, osg::Vec3 dims = osg::Vec3(50., 50., 50.), osg::Vec3 color = colorWhite)
+        {
+            return { pos, dims, color, DrawShape::Cylinder };
+        }
     };
 
     class DebugCustomDraw : public osg::Drawable
@@ -77,7 +88,8 @@ namespace Debug
         DebugDrawer(Shader::ShaderManager& shaderManager, osg::ref_ptr<osg::Group> parentNode);
         ~DebugDrawer();
 
-        void drawCube(osg::Vec3f mPosition, osg::Vec3f mDims = osg::Vec3(50., 50., 50.), osg::Vec3f mColor = colorWhite);
+        void drawCube(
+            osg::Vec3f mPosition, osg::Vec3f mDims = osg::Vec3(50., 50., 50.), osg::Vec3f mColor = colorWhite);
         void drawCubeMinMax(osg::Vec3f min, osg::Vec3f max, osg::Vec3f mColor = colorWhite);
         void addDrawCall(const DrawCall& draw);
         void addLine(const osg::Vec3& start, const osg::Vec3& end, const osg::Vec3 color = colorWhite);
diff --git a/components/debug/debugging.cpp b/components/debug/debugging.cpp
index 71f27036e8..a86e390d0a 100644
--- a/components/debug/debugging.cpp
+++ b/components/debug/debugging.cpp
@@ -1,8 +1,8 @@
 #include "debugging.hpp"
 
 #include <chrono>
-#include <memory>
 #include <fstream>
+#include <memory>
 
 #include <boost/iostreams/stream.hpp>
 
@@ -11,8 +11,8 @@
 #include <components/files/conversion.hpp>
 #ifdef _WIN32
 #include <components/crashcatcher/windows_crashcatcher.hpp>
-#include <components/windows.hpp>
 #include <components/files/conversion.hpp>
+#include <components/windows.hpp>
 #endif
 
 #include <SDL_messagebox.h>
@@ -68,7 +68,10 @@ namespace Debug
 #endif
 
     static LogListener logListener;
-    void setLogListener(LogListener listener) { logListener = std::move(listener); }
+    void setLogListener(LogListener listener)
+    {
+        logListener = std::move(listener);
+    }
 
     class DebugOutputBase : public boost::iostreams::sink
     {
@@ -99,8 +102,8 @@ namespace Debug
                 prefixSize = std::strftime(prefix + 1, sizeof(prefix) - 1, "%T", std::localtime(&time)) + 1;
                 char levelLetter = " EWIVD*"[int(level)];
                 const auto ms = std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()).count();
-                prefixSize += snprintf(prefix + prefixSize, sizeof(prefix) - prefixSize,
-                    ".%03u %c] ", static_cast<unsigned>(ms % 1000), levelLetter);
+                prefixSize += snprintf(prefix + prefixSize, sizeof(prefix) - prefixSize, ".%03u %c] ",
+                    static_cast<unsigned>(ms % 1000), levelLetter);
             }
 
             while (!msg.empty())
@@ -156,10 +159,7 @@ namespace Debug
             CurrentDebugLevel = Verbose;
         }
 
-        virtual std::streamsize writeImpl(const char* str, std::streamsize size, Level debugLevel)
-        {
-            return size;
-        }
+        virtual std::streamsize writeImpl(const char* str, std::streamsize size, Level debugLevel) { return size; }
     };
 
 #if defined _WIN32 && defined _DEBUG
@@ -183,7 +183,8 @@ namespace Debug
     {
     public:
         Tee(std::ostream& stream, std::ostream& stream2)
-            : out(stream), out2(stream2)
+            : out(stream)
+            , out2(stream2)
         {
             // TODO: check which stream is stderr?
             mUseColor = useColoredOutput();
@@ -219,7 +220,6 @@ namespace Debug
         virtual ~Tee() = default;
 
     private:
-
         static bool useColoredOutput()
         {
             // Note: cmd.exe in Win10 should support ANSI colors, but in its own way.
@@ -271,7 +271,7 @@ Misc::Locked<std::ostream&> getLockedRawStderr()
 }
 
 // Redirect cout and cerr to the log file
-void setupLogging(const std::filesystem::path &logDir, const std::string& appName, std::ios_base::openmode mode)
+void setupLogging(const std::filesystem::path& logDir, const std::string& appName, std::ios_base::openmode mode)
 {
 #if defined(_WIN32) && defined(_DEBUG)
     // Redirect cout and cerr to VS debug output when running in debug mode
@@ -290,8 +290,8 @@ void setupLogging(const std::filesystem::path &logDir, const std::string& appNam
 #endif
 }
 
-int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, char *argv[],
-                    const std::string& appName, bool autoSetupLogging)
+int wrapApplication(int (*innerApplication)(int argc, char* argv[]), int argc, char* argv[], const std::string& appName,
+    bool autoSetupLogging)
 {
 #if defined _WIN32
     (void)Debug::attachParentConsole();
diff --git a/components/debug/debugging.hpp b/components/debug/debugging.hpp
index c144000d3f..37e58696ae 100644
--- a/components/debug/debugging.hpp
+++ b/components/debug/debugging.hpp
@@ -34,9 +34,10 @@ std::ostream& getRawStderr();
 
 Misc::Locked<std::ostream&> getLockedRawStderr();
 
-void setupLogging(const std::filesystem::path &logDir, const std::string& appName, std::ios_base::openmode mode = std::ios::out);
+void setupLogging(
+    const std::filesystem::path& logDir, const std::string& appName, std::ios_base::openmode mode = std::ios::out);
 
-int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, char *argv[],
-                    const std::string& appName, bool autoSetupLogging = true);
+int wrapApplication(int (*innerApplication)(int argc, char* argv[]), int argc, char* argv[], const std::string& appName,
+    bool autoSetupLogging = true);
 
 #endif
diff --git a/components/debug/debuglog.hpp b/components/debug/debuglog.hpp
index f57ae96d12..8664a8a626 100644
--- a/components/debug/debuglog.hpp
+++ b/components/debug/debuglog.hpp
@@ -1,8 +1,8 @@
 #ifndef DEBUG_LOG_H
 #define DEBUG_LOG_H
 
-#include <iostream>
 #include <filesystem>
+#include <iostream>
 
 namespace Debug
 {
@@ -28,7 +28,7 @@ public:
     ~Log();
 
     // Perfect forwarding wrappers to give the chain of objects to cout
-    template<typename T>
+    template <typename T>
     Log& operator<<(T&& rhs)
     {
         if (mShouldLog)
diff --git a/components/debug/gldebug.cpp b/components/debug/gldebug.cpp
index 81bd7eb003..29036af162 100644
--- a/components/debug/gldebug.cpp
+++ b/components/debug/gldebug.cpp
@@ -1,5 +1,6 @@
-// This file is based heavily on code from https://github.com/ThermalPixel/osgdemos/blob/master/osgdebug/EnableGLDebugOperation.cpp
-// The original licence is included below:
+// This file is based heavily on code from
+// https://github.com/ThermalPixel/osgdemos/blob/master/osgdebug/EnableGLDebugOperation.cpp The original licence is
+// included below:
 /*
 Copyright (c) 2014, Andreas Klein
 All rights reserved.
@@ -42,33 +43,34 @@ either expressed or implied, of the FreeBSD Project.
 namespace Debug
 {
 
-    void GL_APIENTRY debugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam)
+    void GL_APIENTRY debugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length,
+        const GLchar* message, const void* userParam)
     {
 #ifdef GL_DEBUG_OUTPUT
         std::string srcStr;
         switch (source)
         {
-        case GL_DEBUG_SOURCE_API:
-            srcStr = "API";
-            break;
-        case GL_DEBUG_SOURCE_WINDOW_SYSTEM:
-            srcStr = "WINDOW_SYSTEM";
-            break;
-        case GL_DEBUG_SOURCE_SHADER_COMPILER:
-            srcStr = "SHADER_COMPILER";
-            break;
-        case GL_DEBUG_SOURCE_THIRD_PARTY:
-            srcStr = "THIRD_PARTY";
-            break;
-        case GL_DEBUG_SOURCE_APPLICATION:
-            srcStr = "APPLICATION";
-            break;
-        case GL_DEBUG_SOURCE_OTHER:
-            srcStr = "OTHER";
-            break;
-        default:
-            srcStr = "UNDEFINED";
-            break;
+            case GL_DEBUG_SOURCE_API:
+                srcStr = "API";
+                break;
+            case GL_DEBUG_SOURCE_WINDOW_SYSTEM:
+                srcStr = "WINDOW_SYSTEM";
+                break;
+            case GL_DEBUG_SOURCE_SHADER_COMPILER:
+                srcStr = "SHADER_COMPILER";
+                break;
+            case GL_DEBUG_SOURCE_THIRD_PARTY:
+                srcStr = "THIRD_PARTY";
+                break;
+            case GL_DEBUG_SOURCE_APPLICATION:
+                srcStr = "APPLICATION";
+                break;
+            case GL_DEBUG_SOURCE_OTHER:
+                srcStr = "OTHER";
+                break;
+            default:
+                srcStr = "UNDEFINED";
+                break;
         }
 
         std::string typeStr;
@@ -76,33 +78,33 @@ namespace Debug
         Level logSeverity = Warning;
         switch (type)
         {
-        case GL_DEBUG_TYPE_ERROR:
-            typeStr = "ERROR";
-            logSeverity = Error;
-            break;
-        case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR:
-            typeStr = "DEPRECATED_BEHAVIOR";
-            logSeverity = Warning;
-            break;
-        case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR:
-            typeStr = "UNDEFINED_BEHAVIOR";
-            logSeverity = Warning;
-            break;
-        case GL_DEBUG_TYPE_PORTABILITY:
-            typeStr = "PORTABILITY";
-            logSeverity = Debug;
-            break;
-        case GL_DEBUG_TYPE_PERFORMANCE:
-            typeStr = "PERFORMANCE";
-            logSeverity = Debug;
-            break;
-        case GL_DEBUG_TYPE_OTHER:
-            typeStr = "OTHER";
-            logSeverity = Debug;
-            break;
-        default:
-            typeStr = "UNDEFINED";
-            break;
+            case GL_DEBUG_TYPE_ERROR:
+                typeStr = "ERROR";
+                logSeverity = Error;
+                break;
+            case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR:
+                typeStr = "DEPRECATED_BEHAVIOR";
+                logSeverity = Warning;
+                break;
+            case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR:
+                typeStr = "UNDEFINED_BEHAVIOR";
+                logSeverity = Warning;
+                break;
+            case GL_DEBUG_TYPE_PORTABILITY:
+                typeStr = "PORTABILITY";
+                logSeverity = Debug;
+                break;
+            case GL_DEBUG_TYPE_PERFORMANCE:
+                typeStr = "PERFORMANCE";
+                logSeverity = Debug;
+                break;
+            case GL_DEBUG_TYPE_OTHER:
+                typeStr = "OTHER";
+                logSeverity = Debug;
+                break;
+            default:
+                typeStr = "UNDEFINED";
+                break;
         }
 
         Log(logSeverity) << "OpenGL " << typeStr << " [" << srcStr << "]: " << message;
@@ -114,19 +116,17 @@ namespace Debug
     public:
         static std::unique_ptr<PushDebugGroup> sInstance;
 
-        void (GL_APIENTRY * glPushDebugGroup) (GLenum source, GLuint id, GLsizei length, const GLchar * message);
+        void(GL_APIENTRY* glPushDebugGroup)(GLenum source, GLuint id, GLsizei length, const GLchar* message);
 
-        void (GL_APIENTRY * glPopDebugGroup) (void);
+        void(GL_APIENTRY* glPopDebugGroup)(void);
 
-        bool valid()
-        {
-            return glPushDebugGroup && glPopDebugGroup;
-        }
+        bool valid() { return glPushDebugGroup && glPopDebugGroup; }
     };
 
     std::unique_ptr<PushDebugGroup> PushDebugGroup::sInstance{ std::make_unique<PushDebugGroup>() };
 
-    EnableGLDebugOperation::EnableGLDebugOperation() : osg::GraphicsOperation("EnableGLDebugOperation", false)
+    EnableGLDebugOperation::EnableGLDebugOperation()
+        : osg::GraphicsOperation("EnableGLDebugOperation", false)
     {
     }
 
@@ -137,9 +137,11 @@ namespace Debug
 
         unsigned int contextID = graphicsContext->getState()->getContextID();
 
-        typedef void (GL_APIENTRY *DEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam);
-        typedef void (GL_APIENTRY *GLDebugMessageControlFunction)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
-        typedef void (GL_APIENTRY *GLDebugMessageCallbackFunction)(DEBUGPROC, const void* userParam);
+        typedef void(GL_APIENTRY * DEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length,
+            const GLchar* message, const void* userParam);
+        typedef void(GL_APIENTRY * GLDebugMessageControlFunction)(
+            GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled);
+        typedef void(GL_APIENTRY * GLDebugMessageCallbackFunction)(DEBUGPROC, const void* userParam);
 
         GLDebugMessageControlFunction glDebugMessageControl = nullptr;
         GLDebugMessageCallbackFunction glDebugMessageCallback = nullptr;
@@ -184,21 +186,22 @@ namespace Debug
         if (str.length() == 0)
             return true;
 
-        return str.find("OFF") == std::string::npos && str.find('0') == std::string::npos && str.find("NO") == std::string::npos;
+        return str.find("OFF") == std::string::npos && str.find('0') == std::string::npos
+            && str.find("NO") == std::string::npos;
     }
 
-    DebugGroup::DebugGroup(const std::string & message, GLuint id)
-    #ifdef GL_DEBUG_OUTPUT
+    DebugGroup::DebugGroup(const std::string& message, GLuint id)
+#ifdef GL_DEBUG_OUTPUT
         : mSource(GL_DEBUG_SOURCE_APPLICATION)
-    #else
+#else
         : mSource(0x824A)
-    #endif
+#endif
         , mId(id)
         , mMessage(message)
     {
     }
 
-    DebugGroup::DebugGroup(const DebugGroup & debugGroup, const osg::CopyOp & copyop)
+    DebugGroup::DebugGroup(const DebugGroup& debugGroup, const osg::CopyOp& copyop)
         : osg::StateAttribute(debugGroup, copyop)
         , mSource(debugGroup.mSource)
         , mId(debugGroup.mId)
@@ -206,11 +209,12 @@ namespace Debug
     {
     }
 
-    void DebugGroup::apply(osg::State & state) const
+    void DebugGroup::apply(osg::State& state) const
     {
         if (!PushDebugGroup::sInstance->valid())
         {
-            Log(Error) << "OpenGL debug groups not supported on this system, or OPENMW_DEBUG_OPENGL environment variable not set.";
+            Log(Error) << "OpenGL debug groups not supported on this system, or OPENMW_DEBUG_OPENGL environment "
+                          "variable not set.";
             return;
         }
 
@@ -219,8 +223,9 @@ namespace Debug
 
         size_t firstNonMatch = 0;
         while (firstNonMatch < lastAppliedStack.size()
-               && ((firstNonMatch < attributeVec.size() && lastAppliedStack[firstNonMatch] == attributeVec[firstNonMatch].first)
-                   || lastAppliedStack[firstNonMatch] == this))
+            && ((firstNonMatch < attributeVec.size()
+                    && lastAppliedStack[firstNonMatch] == attributeVec[firstNonMatch].first)
+                || lastAppliedStack[firstNonMatch] == this))
             firstNonMatch++;
 
         for (size_t i = lastAppliedStack.size(); i > firstNonMatch; --i)
@@ -241,7 +246,7 @@ namespace Debug
         }
     }
 
-    int DebugGroup::compare(const StateAttribute & sa) const
+    int DebugGroup::compare(const StateAttribute& sa) const
     {
         COMPARE_StateAttribute_Types(DebugGroup, sa);
 
@@ -252,7 +257,7 @@ namespace Debug
         return 0;
     }
 
-    void DebugGroup::releaseGLObjects(osg::State * state) const
+    void DebugGroup::releaseGLObjects(osg::State* state) const
     {
         if (state)
             sLastAppliedStack.erase(state->getContextID());
@@ -265,18 +270,18 @@ namespace Debug
         return mSource || mId || mMessage.length();
     }
 
-    void DebugGroup::push(osg::State & state) const
+    void DebugGroup::push(osg::State& state) const
     {
         if (isValid())
             PushDebugGroup::sInstance->glPushDebugGroup(mSource, mId, mMessage.size(), mMessage.c_str());
     }
 
-    void DebugGroup::pop(osg::State & state) const
+    void DebugGroup::pop(osg::State& state) const
     {
         if (isValid())
             PushDebugGroup::sInstance->glPopDebugGroup();
     }
 
-    std::map<unsigned int, std::vector<const DebugGroup *>> DebugGroup::sLastAppliedStack{};
+    std::map<unsigned int, std::vector<const DebugGroup*>> DebugGroup::sLastAppliedStack{};
 
 }
diff --git a/components/debug/gldebug.hpp b/components/debug/gldebug.hpp
index b6f32c9cff..1e1cd71a0c 100644
--- a/components/debug/gldebug.hpp
+++ b/components/debug/gldebug.hpp
@@ -18,7 +18,6 @@ namespace Debug
 
     bool shouldDebugOpenGL();
 
-
     /*
         Debug groups allow rendering to be annotated, making debugging via APITrace/CodeXL/NSight etc. much clearer.
 
@@ -29,9 +28,9 @@ namespace Debug
         You'll need OPENMW_DEBUG_OPENGL set to true, or shouldDebugOpenGL() redefined to just return true as otherwise
         the extension function pointers won't get set up. That can maybe be cleaned up in the future.
 
-        Beware that consecutive identical debug groups (i.e. pointers match) won't always get applied due to OSG thinking
-        it's already applied them. Either avoid nesting the same object, add dummy groups so they're not consecutive, or
-        ensure the leaf group isn't identical to its parent.
+        Beware that consecutive identical debug groups (i.e. pointers match) won't always get applied due to OSG
+       thinking it's already applied them. Either avoid nesting the same object, add dummy groups so they're not
+       consecutive, or ensure the leaf group isn't identical to its parent.
     */
     class DebugGroup : public osg::StateAttribute
     {
@@ -40,13 +39,15 @@ namespace Debug
             : mSource(0)
             , mId(0)
             , mMessage("")
-        {}
+        {
+        }
 
         DebugGroup(GLenum source, GLuint id, const std::string& message)
             : mSource(source)
             , mId(id)
             , mMessage(message)
-        {}
+        {
+        }
 
         DebugGroup(const std::string& message, GLuint id = 0);
 
@@ -73,7 +74,7 @@ namespace Debug
         GLuint mId;
         std::string mMessage;
 
-        static std::map<unsigned int, std::vector<const DebugGroup *>> sLastAppliedStack;
+        static std::map<unsigned int, std::vector<const DebugGroup*>> sLastAppliedStack;
 
         friend EnableGLDebugOperation;
     };
diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 933046798a..1f2ba8895b 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -1,15 +1,15 @@
 #include "asyncnavmeshupdater.hpp"
+#include "dbrefgeometryobject.hpp"
 #include "debug.hpp"
 #include "makenavmesh.hpp"
+#include "navmeshdbutils.hpp"
+#include "serialization.hpp"
 #include "settings.hpp"
 #include "version.hpp"
-#include "serialization.hpp"
-#include "navmeshdbutils.hpp"
-#include "dbrefgeometryobject.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/misc/thread.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
+#include <components/misc/thread.hpp>
 
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 
@@ -19,10 +19,10 @@
 
 #include <algorithm>
 #include <numeric>
-#include <set>
-#include <type_traits>
 #include <optional>
+#include <set>
 #include <tuple>
+#include <type_traits>
 
 namespace DetourNavigator
 {
@@ -38,8 +38,7 @@ namespace DetourNavigator
             const std::set<std::tuple<AgentBounds, TilePosition>>& presentTiles,
             const Misc::ScopeGuarded<std::set<std::tuple<AgentBounds, TilePosition>>>& processingTiles)
         {
-            const auto isAbsentAndCloserThan = [&] (const std::tuple<AgentBounds, TilePosition>& v)
-            {
+            const auto isAbsentAndCloserThan = [&](const std::tuple<AgentBounds, TilePosition>& v) {
                 return presentTiles.find(v) == presentTiles.end()
                     && getManhattanDistance(position, std::get<1>(v)) < distance;
             };
@@ -54,40 +53,34 @@ namespace DetourNavigator
         auto getPriority(const Job& job) noexcept
         {
             return std::make_tuple(-static_cast<std::underlying_type_t<JobState>>(job.mState), job.mProcessTime,
-                                   job.mChangeType, job.mTryNumber, job.mDistanceToPlayer, job.mDistanceToOrigin);
+                job.mChangeType, job.mTryNumber, job.mDistanceToPlayer, job.mDistanceToOrigin);
         }
 
         struct LessByJobPriority
         {
-            bool operator()(JobIt lhs, JobIt rhs) const noexcept
-            {
-                return getPriority(*lhs) < getPriority(*rhs);
-            }
+            bool operator()(JobIt lhs, JobIt rhs) const noexcept { return getPriority(*lhs) < getPriority(*rhs); }
         };
 
         void insertPrioritizedJob(JobIt job, std::deque<JobIt>& queue)
         {
-            const auto it = std::upper_bound(queue.begin(), queue.end(), job, LessByJobPriority {});
+            const auto it = std::upper_bound(queue.begin(), queue.end(), job, LessByJobPriority{});
             queue.insert(it, job);
         }
 
         auto getDbPriority(const Job& job) noexcept
         {
-            return std::make_tuple(static_cast<std::underlying_type_t<JobState>>(job.mState),
-                                   job.mChangeType, job.mDistanceToPlayer, job.mDistanceToOrigin);
+            return std::make_tuple(static_cast<std::underlying_type_t<JobState>>(job.mState), job.mChangeType,
+                job.mDistanceToPlayer, job.mDistanceToOrigin);
         }
 
         struct LessByJobDbPriority
         {
-            bool operator()(JobIt lhs, JobIt rhs) const noexcept
-            {
-                return getDbPriority(*lhs) < getDbPriority(*rhs);
-            }
+            bool operator()(JobIt lhs, JobIt rhs) const noexcept { return getDbPriority(*lhs) < getDbPriority(*rhs); }
         };
 
         void insertPrioritizedDbJob(JobIt job, std::deque<JobIt>& queue)
         {
-            const auto it = std::upper_bound(queue.begin(), queue.end(), job, LessByJobDbPriority {});
+            const auto it = std::upper_bound(queue.begin(), queue.end(), job, LessByJobDbPriority{});
             queue.insert(it, job);
         }
 
@@ -96,12 +89,13 @@ namespace DetourNavigator
             return std::make_tuple(job.mAgentBounds, job.mChangedTile);
         }
 
-        std::unique_ptr<DbWorker> makeDbWorker(AsyncNavMeshUpdater& updater, std::unique_ptr<NavMeshDb>&& db, const Settings& settings)
+        std::unique_ptr<DbWorker> makeDbWorker(
+            AsyncNavMeshUpdater& updater, std::unique_ptr<NavMeshDb>&& db, const Settings& settings)
         {
             if (db == nullptr)
                 return nullptr;
             return std::make_unique<DbWorker>(updater, std::move(db), TileVersion(navMeshFormatVersion),
-                                              settings.mRecast, settings.mWriteToNavMeshDb);
+                settings.mRecast, settings.mWriteToNavMeshDb);
         }
 
         void updateJobs(std::deque<JobIt>& jobs, TilePosition playerTile, int maxTiles)
@@ -116,7 +110,7 @@ namespace DetourNavigator
 
         std::size_t getNextJobId()
         {
-            static std::atomic_size_t nextJobId {1};
+            static std::atomic_size_t nextJobId{ 1 };
             return nextJobId.fetch_add(1);
         }
 
@@ -130,9 +124,12 @@ namespace DetourNavigator
     {
         switch (value)
         {
-            case JobStatus::Done: return stream << "JobStatus::Done";
-            case JobStatus::Fail: return stream << "JobStatus::Fail";
-            case JobStatus::MemoryCacheMiss: return stream << "JobStatus::MemoryCacheMiss";
+            case JobStatus::Done:
+                return stream << "JobStatus::Done";
+            case JobStatus::Fail:
+                return stream << "JobStatus::Fail";
+            case JobStatus::MemoryCacheMiss:
+                return stream << "JobStatus::MemoryCacheMiss";
         }
         return stream << "JobStatus::" << static_cast<std::underlying_type_t<JobStatus>>(value);
     }
@@ -148,12 +145,12 @@ namespace DetourNavigator
         , mProcessTime(processTime)
         , mChangeType(changeType)
         , mDistanceToPlayer(distanceToPlayer)
-        , mDistanceToOrigin(getManhattanDistance(changedTile, TilePosition {0, 0}))
+        , mDistanceToOrigin(getManhattanDistance(changedTile, TilePosition{ 0, 0 }))
     {
     }
 
     AsyncNavMeshUpdater::AsyncNavMeshUpdater(const Settings& settings, TileCachedRecastMeshManager& recastMeshManager,
-            OffMeshConnectionsManager& offMeshConnectionsManager, std::unique_ptr<NavMeshDb>&& db)
+        OffMeshConnectionsManager& offMeshConnectionsManager, std::unique_ptr<NavMeshDb>&& db)
         : mSettings(settings)
         , mRecastMeshManager(recastMeshManager)
         , mOffMeshConnectionsManager(offMeshConnectionsManager)
@@ -200,11 +197,11 @@ namespace DetourNavigator
                     ? mLastUpdates[std::tie(agentBounds, changedTile)] + mSettings.get().mMinUpdateInterval
                     : std::chrono::steady_clock::time_point();
 
-                const JobIt it = mJobs.emplace(mJobs.end(), agentBounds, navMeshCacheItem, worldspace,
-                    changedTile, changeType, getManhattanDistance(changedTile, playerTile), processTime);
+                const JobIt it = mJobs.emplace(mJobs.end(), agentBounds, navMeshCacheItem, worldspace, changedTile,
+                    changeType, getManhattanDistance(changedTile, playerTile), processTime);
 
                 Log(Debug::Debug) << "Post job " << it->mId << " for agent=(" << it->mAgentBounds << ")"
-                    << " changedTile=(" << it->mChangedTile << ")";
+                                  << " changedTile=(" << it->mChangedTile << ")";
 
                 if (playerTileChanged)
                     mWaiting.push_back(it);
@@ -214,7 +211,7 @@ namespace DetourNavigator
         }
 
         if (playerTileChanged)
-            std::sort(mWaiting.begin(), mWaiting.end(), LessByJobPriority {});
+            std::sort(mWaiting.begin(), mWaiting.end(), LessByJobPriority{});
 
         Log(Debug::Debug) << "Posted " << mJobs.size() << " navigator jobs";
 
@@ -265,8 +262,7 @@ namespace DetourNavigator
         std::size_t jobsDone = 0;
         std::size_t jobsLeft = 0;
         const TilePosition playerPosition = *mPlayerTile.lockConst();
-        const auto isDone = [&]
-        {
+        const auto isDone = [&] {
             jobsLeft = mJobs.size();
             if (jobsLeft == 0)
                 return true;
@@ -308,7 +304,7 @@ namespace DetourNavigator
             std::unique_lock<std::mutex> lock(mMutex);
             mDone.wait(lock, [this] { return mJobs.empty(); });
         }
-        mProcessingTiles.wait(mProcessed, [] (const auto& v) { return v.empty(); });
+        mProcessingTiles.wait(mProcessed, [](const auto& v) { return v.empty(); });
     }
 
     AsyncNavMeshUpdaterStats AsyncNavMeshUpdater::getStats() const
@@ -420,7 +416,8 @@ namespace DetourNavigator
             return JobStatus::Done;
         }
 
-        NavMeshTilesCache::Value cachedNavMeshData = mNavMeshTilesCache.get(job.mAgentBounds, job.mChangedTile, *recastMesh);
+        NavMeshTilesCache::Value cachedNavMeshData
+            = mNavMeshTilesCache.get(job.mAgentBounds, job.mChangedTile, *recastMesh);
         std::unique_ptr<PreparedNavMeshData> preparedNavMeshData;
         const PreparedNavMeshData* preparedNavMeshDataPtr = nullptr;
 
@@ -436,7 +433,8 @@ namespace DetourNavigator
                 return JobStatus::MemoryCacheMiss;
             }
 
-            preparedNavMeshData = prepareNavMeshTileData(*recastMesh, job.mChangedTile, job.mAgentBounds, mSettings.get().mRecast);
+            preparedNavMeshData
+                = prepareNavMeshTileData(*recastMesh, job.mChangedTile, job.mAgentBounds, mSettings.get().mRecast);
 
             if (preparedNavMeshData == nullptr)
             {
@@ -451,16 +449,18 @@ namespace DetourNavigator
             }
             else
             {
-                cachedNavMeshData = mNavMeshTilesCache.set(job.mAgentBounds, job.mChangedTile,
-                                                           *recastMesh, std::move(preparedNavMeshData));
+                cachedNavMeshData = mNavMeshTilesCache.set(
+                    job.mAgentBounds, job.mChangedTile, *recastMesh, std::move(preparedNavMeshData));
                 preparedNavMeshDataPtr = cachedNavMeshData ? &cachedNavMeshData.get() : preparedNavMeshData.get();
             }
         }
 
         const auto offMeshConnections = mOffMeshConnectionsManager.get().get(job.mChangedTile);
 
-        const UpdateNavMeshStatus status = navMeshCacheItem.lock()->updateTile(job.mChangedTile, std::move(cachedNavMeshData),
-            makeNavMeshTileData(*preparedNavMeshDataPtr, offMeshConnections, job.mAgentBounds, job.mChangedTile, mSettings.get().mRecast));
+        const UpdateNavMeshStatus status
+            = navMeshCacheItem.lock()->updateTile(job.mChangedTile, std::move(cachedNavMeshData),
+                makeNavMeshTileData(*preparedNavMeshDataPtr, offMeshConnections, job.mAgentBounds, job.mChangedTile,
+                    mSettings.get().mRecast));
 
         return handleUpdateNavMeshStatus(status, job, navMeshCacheItem, *recastMesh);
     }
@@ -483,7 +483,8 @@ namespace DetourNavigator
 
         if (preparedNavMeshData == nullptr)
         {
-            preparedNavMeshData = prepareNavMeshTileData(*job.mRecastMesh, job.mChangedTile, job.mAgentBounds, mSettings.get().mRecast);
+            preparedNavMeshData
+                = prepareNavMeshTileData(*job.mRecastMesh, job.mChangedTile, job.mAgentBounds, mSettings.get().mRecast);
             generatedNavMeshData = true;
         }
 
@@ -494,28 +495,31 @@ namespace DetourNavigator
             return JobStatus::Done;
         }
 
-        auto cachedNavMeshData = mNavMeshTilesCache.set(job.mAgentBounds, job.mChangedTile, *job.mRecastMesh,
-                                                        std::move(preparedNavMeshData));
+        auto cachedNavMeshData = mNavMeshTilesCache.set(
+            job.mAgentBounds, job.mChangedTile, *job.mRecastMesh, std::move(preparedNavMeshData));
 
         const auto offMeshConnections = mOffMeshConnectionsManager.get().get(job.mChangedTile);
 
-        const PreparedNavMeshData* preparedNavMeshDataPtr = cachedNavMeshData ? &cachedNavMeshData.get() : preparedNavMeshData.get();
-        assert (preparedNavMeshDataPtr != nullptr);
+        const PreparedNavMeshData* preparedNavMeshDataPtr
+            = cachedNavMeshData ? &cachedNavMeshData.get() : preparedNavMeshData.get();
+        assert(preparedNavMeshDataPtr != nullptr);
 
-        const UpdateNavMeshStatus status = navMeshCacheItem.lock()->updateTile(job.mChangedTile, std::move(cachedNavMeshData),
-            makeNavMeshTileData(*preparedNavMeshDataPtr, offMeshConnections, job.mAgentBounds, job.mChangedTile, mSettings.get().mRecast));
+        const UpdateNavMeshStatus status
+            = navMeshCacheItem.lock()->updateTile(job.mChangedTile, std::move(cachedNavMeshData),
+                makeNavMeshTileData(*preparedNavMeshDataPtr, offMeshConnections, job.mAgentBounds, job.mChangedTile,
+                    mSettings.get().mRecast));
 
         const JobStatus result = handleUpdateNavMeshStatus(status, job, navMeshCacheItem, *job.mRecastMesh);
 
-        if (result == JobStatus::Done && job.mChangeType != ChangeType::update
-                && mDbWorker != nullptr && mSettings.get().mWriteToNavMeshDb && generatedNavMeshData)
+        if (result == JobStatus::Done && job.mChangeType != ChangeType::update && mDbWorker != nullptr
+            && mSettings.get().mWriteToNavMeshDb && generatedNavMeshData)
             job.mGeneratedNavMeshData = std::make_unique<PreparedNavMeshData>(*preparedNavMeshDataPtr);
 
         return result;
     }
 
-    JobStatus AsyncNavMeshUpdater::handleUpdateNavMeshStatus(UpdateNavMeshStatus status,
-        const Job& job, const GuardedNavMeshCacheItem& navMeshCacheItem, const RecastMesh& recastMesh)
+    JobStatus AsyncNavMeshUpdater::handleUpdateNavMeshStatus(UpdateNavMeshStatus status, const Job& job,
+        const GuardedNavMeshCacheItem& navMeshCacheItem, const RecastMesh& recastMesh)
     {
         const Version navMeshVersion = navMeshCacheItem.lockConst()->getVersion();
         mRecastMeshManager.get().reportNavMeshChange(job.mChangedTile, recastMesh.getVersion(), navMeshVersion);
@@ -541,8 +545,7 @@ namespace DetourNavigator
         std::unique_lock<std::mutex> lock(mMutex);
 
         bool shouldStop = false;
-        const auto hasJob = [&]
-        {
+        const auto hasJob = [&] {
             shouldStop = mShouldStop;
             return shouldStop
                 || (!mWaiting.empty() && mWaiting.front()->mProcessTime <= std::chrono::steady_clock::now());
@@ -586,18 +589,20 @@ namespace DetourNavigator
         std::string recastMeshRevision;
         std::string navMeshRevision;
         if ((mSettings.get().mEnableWriteNavMeshToFile || mSettings.get().mEnableWriteRecastMeshToFile)
-                && (mSettings.get().mEnableRecastMeshFileNameRevision || mSettings.get().mEnableNavMeshFileNameRevision))
+            && (mSettings.get().mEnableRecastMeshFileNameRevision || mSettings.get().mEnableNavMeshFileNameRevision))
         {
-            revision = "." + std::to_string((std::chrono::steady_clock::now()
-                - std::chrono::steady_clock::time_point()).count());
+            revision = "."
+                + std::to_string((std::chrono::steady_clock::now() - std::chrono::steady_clock::time_point()).count());
             if (mSettings.get().mEnableRecastMeshFileNameRevision)
                 recastMeshRevision = revision;
             if (mSettings.get().mEnableNavMeshFileNameRevision)
                 navMeshRevision = revision;
         }
         if (recastMesh && mSettings.get().mEnableWriteRecastMeshToFile)
-            writeToFile(*recastMesh, mSettings.get().mRecastMeshPathPrefix + std::to_string(job.mChangedTile.x())
-                        + "_" + std::to_string(job.mChangedTile.y()) + "_", recastMeshRevision, mSettings.get().mRecast);
+            writeToFile(*recastMesh,
+                mSettings.get().mRecastMeshPathPrefix + std::to_string(job.mChangedTile.x()) + "_"
+                    + std::to_string(job.mChangedTile.y()) + "_",
+                recastMeshRevision, mSettings.get().mRecast);
         if (mSettings.get().mEnableWriteNavMeshToFile)
             if (const auto shared = job.mNavMeshCacheItem.lock())
                 writeToFile(shared->lockConst()->getImpl(), mSettings.get().mNavMeshPathPrefix, navMeshRevision);
@@ -704,7 +709,7 @@ namespace DetourNavigator
     {
         const std::lock_guard lock(mMutex);
         updateJobs(mJobs, playerTile, maxTiles);
-        std::sort(mJobs.begin(), mJobs.end(), LessByJobDbPriority {});
+        std::sort(mJobs.begin(), mJobs.end(), LessByJobDbPriority{});
     }
 
     void DbJobQueue::stop()
@@ -718,11 +723,11 @@ namespace DetourNavigator
     DbJobQueueStats DbJobQueue::getStats() const
     {
         const std::lock_guard lock(mMutex);
-        return DbJobQueueStats {.mWritingJobs = mWritingJobs, .mReadingJobs = mReadingJobs};
+        return DbJobQueueStats{ .mWritingJobs = mWritingJobs, .mReadingJobs = mReadingJobs };
     }
 
-    DbWorker::DbWorker(AsyncNavMeshUpdater& updater, std::unique_ptr<NavMeshDb>&& db,
-        TileVersion version, const RecastSettings& recastSettings, bool writeToDb)
+    DbWorker::DbWorker(AsyncNavMeshUpdater& updater, std::unique_ptr<NavMeshDb>&& db, TileVersion version,
+        const RecastSettings& recastSettings, bool writeToDb)
         : mUpdater(updater)
         , mRecastSettings(recastSettings)
         , mDb(std::move(db))
@@ -747,10 +752,8 @@ namespace DetourNavigator
 
     DbWorkerStats DbWorker::getStats() const
     {
-        return DbWorkerStats {
-            .mJobs = mQueue.getStats(),
-            .mGetTileCount = mGetTileCount.load(std::memory_order_relaxed)
-        };
+        return DbWorkerStats{ .mJobs = mQueue.getStats(),
+            .mGetTileCount = mGetTileCount.load(std::memory_order_relaxed) };
     }
 
     void DbWorker::stop()
@@ -779,8 +782,7 @@ namespace DetourNavigator
 
     void DbWorker::processJob(JobIt job)
     {
-        const auto process = [&] (auto f)
-        {
+        const auto process = [&](auto f) {
             try
             {
                 f(job);
@@ -794,12 +796,14 @@ namespace DetourNavigator
                     if (message.find("database or disk is full") != std::string_view::npos)
                     {
                         mWriteToDb = false;
-                        Log(Debug::Warning) << "Writes to navmeshdb are disabled because file size limit is reached or disk is full";
+                        Log(Debug::Warning)
+                            << "Writes to navmeshdb are disabled because file size limit is reached or disk is full";
                     }
                     else if (message.find("database is locked") != std::string_view::npos)
                     {
                         mWriteToDb = false;
-                        Log(Debug::Warning) << "Writes to navmeshdb are disabled to avoid concurrent writes from multiple processes";
+                        Log(Debug::Warning)
+                            << "Writes to navmeshdb are disabled to avoid concurrent writes from multiple processes";
                     }
                 }
             }
@@ -807,12 +811,12 @@ namespace DetourNavigator
 
         if (isWritingDbJob(*job))
         {
-            process([&] (JobIt job) { processWritingJob(job); });
+            process([&](JobIt job) { processWritingJob(job); });
             mUpdater.removeJob(job);
             return;
         }
 
-        process([&] (JobIt job) { processReadingJob(job); });
+        process([&](JobIt job) { processReadingJob(job); });
         job->mState = JobState::WithDbResult;
         mUpdater.enqueueJob(job);
     }
@@ -827,13 +831,13 @@ namespace DetourNavigator
             if (mWriteToDb)
             {
                 const auto objects = makeDbRefGeometryObjects(job->mRecastMesh->getMeshSources(),
-                    [&] (const MeshSource& v) { return resolveMeshSource(*mDb, v, mNextShapeId); });
+                    [&](const MeshSource& v) { return resolveMeshSource(*mDb, v, mNextShapeId); });
                 job->mInput = serialize(mRecastSettings, job->mAgentBounds, *job->mRecastMesh, objects);
             }
             else
             {
                 const auto objects = makeDbRefGeometryObjects(job->mRecastMesh->getMeshSources(),
-                    [&] (const MeshSource& v) { return resolveMeshSource(*mDb, v); });
+                    [&](const MeshSource& v) { return resolveMeshSource(*mDb, v); });
                 if (!objects.has_value())
                     return;
                 job->mInput = serialize(mRecastSettings, job->mAgentBounds, *job->mRecastMesh, *objects);
@@ -857,8 +861,9 @@ namespace DetourNavigator
         if (job->mInput.empty())
         {
             Log(Debug::Debug) << "Serializing input for job " << job->mId;
-            const std::vector<DbRefGeometryObject> objects = makeDbRefGeometryObjects(job->mRecastMesh->getMeshSources(),
-                [&] (const MeshSource& v) { return resolveMeshSource(*mDb, v, mNextShapeId); });
+            const std::vector<DbRefGeometryObject> objects
+                = makeDbRefGeometryObjects(job->mRecastMesh->getMeshSources(),
+                    [&](const MeshSource& v) { return resolveMeshSource(*mDb, v, mNextShapeId); });
             job->mInput = serialize(mRecastSettings, job->mAgentBounds, *job->mRecastMesh, objects);
         }
 
@@ -879,8 +884,8 @@ namespace DetourNavigator
 
         job->mGeneratedNavMeshData->mUserId = mNextTileId;
         Log(Debug::Debug) << "Insert db tile by job " << job->mId;
-        mDb->insertTile(mNextTileId, job->mWorldspace, job->mChangedTile,
-                        mVersion, job->mInput, serialize(*job->mGeneratedNavMeshData));
+        mDb->insertTile(mNextTileId, job->mWorldspace, job->mChangedTile, mVersion, job->mInput,
+            serialize(*job->mGeneratedNavMeshData));
         ++mNextTileId;
     }
 }
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index b19ef9006d..1991da15b7 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -1,33 +1,33 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_ASYNCNAVMESHUPDATER_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_ASYNCNAVMESHUPDATER_H
 
+#include "agentbounds.hpp"
+#include "changetype.hpp"
+#include "guardednavmeshcacheitem.hpp"
 #include "navmeshcacheitem.hpp"
+#include "navmeshdb.hpp"
+#include "navmeshtilescache.hpp"
 #include "offmeshconnectionsmanager.hpp"
+#include "sharednavmeshcacheitem.hpp"
+#include "stats.hpp"
 #include "tilecachedrecastmeshmanager.hpp"
 #include "tileposition.hpp"
-#include "navmeshtilescache.hpp"
 #include "waitconditiontype.hpp"
-#include "navmeshdb.hpp"
-#include "changetype.hpp"
-#include "agentbounds.hpp"
-#include "guardednavmeshcacheitem.hpp"
-#include "sharednavmeshcacheitem.hpp"
-#include "stats.hpp"
 
 #include <osg/Vec3f>
 
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
+#include <deque>
+#include <iosfwd>
+#include <list>
 #include <memory>
 #include <mutex>
-#include <deque>
+#include <optional>
 #include <set>
 #include <thread>
 #include <tuple>
-#include <list>
-#include <optional>
-#include <iosfwd>
 
 class dtNavMesh;
 
@@ -105,8 +105,8 @@ namespace DetourNavigator
     class DbWorker
     {
     public:
-        DbWorker(AsyncNavMeshUpdater& updater, std::unique_ptr<NavMeshDb>&& db,
-            TileVersion version, const RecastSettings& recastSettings, bool writeToDb);
+        DbWorker(AsyncNavMeshUpdater& updater, std::unique_ptr<NavMeshDb>&& db, TileVersion version,
+            const RecastSettings& recastSettings, bool writeToDb);
 
         ~DbWorker();
 
@@ -127,8 +127,8 @@ namespace DetourNavigator
         TileId mNextTileId;
         ShapeId mNextShapeId;
         DbJobQueue mQueue;
-        std::atomic_bool mShouldStop {false};
-        std::atomic_size_t mGetTileCount {0};
+        std::atomic_bool mShouldStop{ false };
+        std::atomic_size_t mGetTileCount{ 0 };
         std::thread mThread;
 
         inline void run() noexcept;
@@ -180,7 +180,7 @@ namespace DetourNavigator
         std::set<std::tuple<AgentBounds, TilePosition>> mPresentTiles;
         std::vector<std::thread> mThreads;
         std::unique_ptr<DbWorker> mDbWorker;
-        std::atomic_size_t mDbGetTileHits {0};
+        std::atomic_size_t mDbGetTileHits{ 0 };
 
         void process() noexcept;
 
diff --git a/components/detournavigator/dbrefgeometryobject.hpp b/components/detournavigator/dbrefgeometryobject.hpp
index acf2a58b19..0eb217a9ff 100644
--- a/components/detournavigator/dbrefgeometryobject.hpp
+++ b/components/detournavigator/dbrefgeometryobject.hpp
@@ -8,10 +8,10 @@
 
 #include <algorithm>
 #include <cstdint>
-#include <tuple>
-#include <vector>
 #include <optional>
+#include <tuple>
 #include <type_traits>
+#include <vector>
 
 namespace DetourNavigator
 {
@@ -20,10 +20,7 @@ namespace DetourNavigator
         std::int64_t mShapeId;
         ObjectTransform mObjectTransform;
 
-        friend inline auto tie(const DbRefGeometryObject& v)
-        {
-            return std::tie(v.mShapeId, v.mObjectTransform);
-        }
+        friend inline auto tie(const DbRefGeometryObject& v) { return std::tie(v.mShapeId, v.mObjectTransform); }
 
         friend inline bool operator<(const DbRefGeometryObject& l, const DbRefGeometryObject& r)
         {
@@ -32,12 +29,10 @@ namespace DetourNavigator
     };
 
     template <class ResolveMeshSource>
-    inline auto makeDbRefGeometryObjects(const std::vector<MeshSource>& meshSources, ResolveMeshSource&& resolveMeshSource)
-        -> std::conditional_t<
-            Misc::isOptional<std::decay_t<decltype(resolveMeshSource(meshSources.front()))>>,
-            std::optional<std::vector<DbRefGeometryObject>>,
-            std::vector<DbRefGeometryObject>
-        >
+    inline auto makeDbRefGeometryObjects(
+        const std::vector<MeshSource>& meshSources, ResolveMeshSource&& resolveMeshSource)
+        -> std::conditional_t<Misc::isOptional<std::decay_t<decltype(resolveMeshSource(meshSources.front()))>>,
+            std::optional<std::vector<DbRefGeometryObject>>, std::vector<DbRefGeometryObject>>
     {
         std::vector<DbRefGeometryObject> result;
         result.reserve(meshSources.size());
@@ -48,10 +43,10 @@ namespace DetourNavigator
             {
                 if (!shapeId.has_value())
                     return std::nullopt;
-                result.push_back(DbRefGeometryObject {*shapeId, meshSource.mObjectTransform});
+                result.push_back(DbRefGeometryObject{ *shapeId, meshSource.mObjectTransform });
             }
             else
-                result.push_back(DbRefGeometryObject {shapeId, meshSource.mObjectTransform});
+                result.push_back(DbRefGeometryObject{ shapeId, meshSource.mObjectTransform });
         }
         std::sort(result.begin(), result.end());
         return result;
diff --git a/components/detournavigator/debug.cpp b/components/detournavigator/debug.cpp
index 2c3cb998d7..f0098cc29c 100644
--- a/components/detournavigator/debug.cpp
+++ b/components/detournavigator/debug.cpp
@@ -3,8 +3,8 @@
 #include "recastmesh.hpp"
 #include "settings.hpp"
 #include "settingsutils.hpp"
-#include "version.hpp"
 #include "tilespositionsrange.hpp"
+#include "version.hpp"
 
 #include <components/bullethelpers/operators.hpp>
 
@@ -13,10 +13,10 @@
 
 #include <osg/io_utils>
 
+#include <array>
 #include <filesystem>
 #include <fstream>
 #include <ostream>
-#include <array>
 #include <string_view>
 
 namespace DetourNavigator
@@ -28,8 +28,9 @@ namespace DetourNavigator
 
     std::ostream& operator<<(std::ostream& stream, Status value)
     {
-#define OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(name) \
-    case Status::name: return stream << "DetourNavigator::Status::"#name;
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(name)                                                   \
+    case Status::name:                                                                                                 \
+        return stream << "DetourNavigator::Status::" #name;
         switch (value)
         {
             OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(Success)
@@ -62,12 +63,9 @@ namespace DetourNavigator
 
     std::ostream& operator<<(std::ostream& s, const Heightfield& v)
     {
-        s << "Heightfield {.mCellPosition=" << v.mCellPosition
-          << ", .mCellSize=" << v.mCellSize
-          << ", .mLength=" << static_cast<int>(v.mLength)
-          << ", .mMinHeight=" << v.mMinHeight
-          << ", .mMaxHeight=" << v.mMaxHeight
-          << ", .mHeights={";
+        s << "Heightfield {.mCellPosition=" << v.mCellPosition << ", .mCellSize=" << v.mCellSize
+          << ", .mLength=" << static_cast<int>(v.mLength) << ", .mMinHeight=" << v.mMinHeight
+          << ", .mMaxHeight=" << v.mMaxHeight << ", .mHeights={";
         for (float h : v.mHeights)
             s << h << ", ";
         s << "}";
@@ -78,9 +76,12 @@ namespace DetourNavigator
     {
         switch (v)
         {
-            case CollisionShapeType::Aabb: return s << "AgentShapeType::Aabb";
-            case CollisionShapeType::RotatingBox: return s << "AgentShapeType::RotatingBox";
-            case CollisionShapeType::Cylinder: return s << "AgentShapeType::Cylinder";
+            case CollisionShapeType::Aabb:
+                return s << "AgentShapeType::Aabb";
+            case CollisionShapeType::RotatingBox:
+                return s << "AgentShapeType::RotatingBox";
+            case CollisionShapeType::Cylinder:
+                return s << "AgentShapeType::Cylinder";
         }
         return s << "AgentShapeType::" << static_cast<std::underlying_type_t<CollisionShapeType>>(v);
     }
@@ -99,17 +100,17 @@ namespace DetourNavigator
         };
     }
 
-    static constexpr std::array dtStatuses {
-        StatusString {DT_FAILURE, "DT_FAILURE"},
-        StatusString {DT_SUCCESS, "DT_SUCCESS"},
-        StatusString {DT_IN_PROGRESS, "DT_IN_PROGRESS"},
-        StatusString {DT_WRONG_MAGIC, "DT_WRONG_MAGIC"},
-        StatusString {DT_WRONG_VERSION, "DT_WRONG_VERSION"},
-        StatusString {DT_OUT_OF_MEMORY, "DT_OUT_OF_MEMORY"},
-        StatusString {DT_INVALID_PARAM, "DT_INVALID_PARAM"},
-        StatusString {DT_BUFFER_TOO_SMALL, "DT_BUFFER_TOO_SMALL"},
-        StatusString {DT_OUT_OF_NODES, "DT_OUT_OF_NODES"},
-        StatusString {DT_PARTIAL_RESULT, "DT_PARTIAL_RESULT"},
+    static constexpr std::array dtStatuses{
+        StatusString{ DT_FAILURE, "DT_FAILURE" },
+        StatusString{ DT_SUCCESS, "DT_SUCCESS" },
+        StatusString{ DT_IN_PROGRESS, "DT_IN_PROGRESS" },
+        StatusString{ DT_WRONG_MAGIC, "DT_WRONG_MAGIC" },
+        StatusString{ DT_WRONG_VERSION, "DT_WRONG_VERSION" },
+        StatusString{ DT_OUT_OF_MEMORY, "DT_OUT_OF_MEMORY" },
+        StatusString{ DT_INVALID_PARAM, "DT_INVALID_PARAM" },
+        StatusString{ DT_BUFFER_TOO_SMALL, "DT_BUFFER_TOO_SMALL" },
+        StatusString{ DT_OUT_OF_NODES, "DT_OUT_OF_NODES" },
+        StatusString{ DT_PARTIAL_RESULT, "DT_PARTIAL_RESULT" },
     };
 
     std::ostream& operator<<(std::ostream& stream, const WriteDtStatus& value)
@@ -148,7 +149,7 @@ namespace DetourNavigator
         else
         {
             bool first = true;
-            for (const auto flag : {Flag_walk, Flag_swim, Flag_openDoor, Flag_usePathgrid})
+            for (const auto flag : { Flag_walk, Flag_swim, Flag_openDoor, Flag_usePathgrid })
             {
                 if (value.mValue & flag)
                 {
@@ -167,11 +168,16 @@ namespace DetourNavigator
     {
         switch (value)
         {
-            case AreaType_null: return stream << "null";
-            case AreaType_water: return stream << "water";
-            case AreaType_door: return stream << "door";
-            case AreaType_pathgrid: return stream << "pathgrid";
-            case AreaType_ground: return stream << "ground";
+            case AreaType_null:
+                return stream << "null";
+            case AreaType_water:
+                return stream << "water";
+            case AreaType_door:
+                return stream << "door";
+            case AreaType_pathgrid:
+                return stream << "pathgrid";
+            case AreaType_ground:
+                return stream << "ground";
         }
         return stream << "unknown area type (" << static_cast<std::underlying_type_t<AreaType>>(value) << ")";
     }
@@ -202,8 +208,8 @@ namespace DetourNavigator
         return stream << "TilesPositionsRange {" << value.mBegin << ", " << value.mEnd << "}";
     }
 
-    void writeToFile(const RecastMesh& recastMesh, const std::string& pathPrefix,
-        const std::string& revision, const RecastSettings& settings)
+    void writeToFile(const RecastMesh& recastMesh, const std::string& pathPrefix, const std::string& revision,
+        const RecastSettings& settings)
     {
         const auto path = pathPrefix + "recastmesh" + revision + ".obj";
         std::ofstream file(std::filesystem::path(path), std::ios::out);
diff --git a/components/detournavigator/debug.hpp b/components/detournavigator/debug.hpp
index 328eafa514..943e0d7b7d 100644
--- a/components/detournavigator/debug.hpp
+++ b/components/detournavigator/debug.hpp
@@ -1,18 +1,18 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_H
 
-#include "tilebounds.hpp"
-#include "status.hpp"
-#include "recastmesh.hpp"
 #include "agentbounds.hpp"
-#include "flags.hpp"
 #include "areatype.hpp"
 #include "changetype.hpp"
+#include "flags.hpp"
+#include "recastmesh.hpp"
+#include "status.hpp"
+#include "tilebounds.hpp"
 
 #include <DetourStatus.h>
 
-#include <string>
 #include <iosfwd>
+#include <string>
 
 class dtNavMesh;
 
@@ -64,8 +64,8 @@ namespace DetourNavigator
     class RecastMesh;
     struct RecastSettings;
 
-    void writeToFile(const RecastMesh& recastMesh, const std::string& pathPrefix,
-        const std::string& revision, const RecastSettings& settings);
+    void writeToFile(const RecastMesh& recastMesh, const std::string& pathPrefix, const std::string& revision,
+        const RecastSettings& settings);
     void writeToFile(const dtNavMesh& navMesh, const std::string& pathPrefix, const std::string& revision);
 }
 
diff --git a/components/detournavigator/exceptions.hpp b/components/detournavigator/exceptions.hpp
index fb31172eec..ca24effca1 100644
--- a/components/detournavigator/exceptions.hpp
+++ b/components/detournavigator/exceptions.hpp
@@ -7,14 +7,26 @@ namespace DetourNavigator
 {
     struct NavigatorException : std::runtime_error
     {
-        NavigatorException(const std::string& message) : std::runtime_error(message) {}
-        NavigatorException(const char* message) : std::runtime_error(message) {}
+        NavigatorException(const std::string& message)
+            : std::runtime_error(message)
+        {
+        }
+        NavigatorException(const char* message)
+            : std::runtime_error(message)
+        {
+        }
     };
 
     struct InvalidArgument : std::invalid_argument
     {
-        InvalidArgument(const std::string& message) : std::invalid_argument(message) {}
-        InvalidArgument(const char* message) : std::invalid_argument(message) {}
+        InvalidArgument(const std::string& message)
+            : std::invalid_argument(message)
+        {
+        }
+        InvalidArgument(const char* message)
+            : std::invalid_argument(message)
+        {
+        }
     };
 }
 
diff --git a/components/detournavigator/findrandompointaroundcircle.cpp b/components/detournavigator/findrandompointaroundcircle.cpp
index 6bd761c817..c39042edd5 100644
--- a/components/detournavigator/findrandompointaroundcircle.cpp
+++ b/components/detournavigator/findrandompointaroundcircle.cpp
@@ -1,6 +1,6 @@
 #include "findrandompointaroundcircle.hpp"
-#include "settings.hpp"
 #include "findsmoothpath.hpp"
+#include "settings.hpp"
 
 #include <components/misc/rng.hpp>
 
@@ -10,7 +10,8 @@
 namespace DetourNavigator
 {
     std::optional<osg::Vec3f> findRandomPointAroundCircle(const dtNavMesh& navMesh, const osg::Vec3f& halfExtents,
-        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags, const DetourSettings& settings, float(*prng)())
+        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags, const DetourSettings& settings,
+        float (*prng)())
     {
         dtNavMeshQuery navMeshQuery;
         if (!initNavMeshQuery(navMeshQuery, navMesh, settings.mMaxNavMeshQueryNodes))
@@ -26,8 +27,8 @@ namespace DetourNavigator
         dtPolyRef resultRef = 0;
         osg::Vec3f resultPosition;
 
-        navMeshQuery.findRandomPointAroundCircle(startRef, start.ptr(), maxRadius, &queryFilter,
-            prng, &resultRef, resultPosition.ptr());
+        navMeshQuery.findRandomPointAroundCircle(
+            startRef, start.ptr(), maxRadius, &queryFilter, prng, &resultRef, resultPosition.ptr());
 
         if (resultRef == 0)
             return std::optional<osg::Vec3f>();
diff --git a/components/detournavigator/findrandompointaroundcircle.hpp b/components/detournavigator/findrandompointaroundcircle.hpp
index 346ad36e4e..9374396eb0 100644
--- a/components/detournavigator/findrandompointaroundcircle.hpp
+++ b/components/detournavigator/findrandompointaroundcircle.hpp
@@ -13,7 +13,8 @@ namespace DetourNavigator
     struct DetourSettings;
 
     std::optional<osg::Vec3f> findRandomPointAroundCircle(const dtNavMesh& navMesh, const osg::Vec3f& halfExtents,
-        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags, const DetourSettings& settings, float(*prng)());
+        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags, const DetourSettings& settings,
+        float (*prng)());
 }
 
 #endif
diff --git a/components/detournavigator/findsmoothpath.cpp b/components/detournavigator/findsmoothpath.cpp
index cbaf12305c..6650890517 100644
--- a/components/detournavigator/findsmoothpath.cpp
+++ b/components/detournavigator/findsmoothpath.cpp
@@ -16,8 +16,7 @@ namespace DetourNavigator
         const auto end = path.begin() + pathSize;
         const std::reverse_iterator rbegin(end);
         const std::reverse_iterator rend(begin);
-        const auto it = std::find_if(rbegin, rend, [&] (dtPolyRef pathValue)
-        {
+        const auto it = std::find_if(rbegin, rend, [&](dtPolyRef pathValue) {
             const auto it = std::find(visited.rbegin(), visited.rend(), pathValue);
             if (it == visited.rend())
                 return false;
@@ -94,7 +93,7 @@ namespace DetourNavigator
     }
 
     std::optional<SteerTarget> getSteerTarget(const dtNavMeshQuery& navMeshQuery, const osg::Vec3f& startPos,
-            const osg::Vec3f& endPos, const float minTargetDist, const dtPolyRef* path, const std::size_t pathSize)
+        const osg::Vec3f& endPos, const float minTargetDist, const dtPolyRef* path, const std::size_t pathSize)
     {
         // Find steer target.
         SteerTarget result;
@@ -103,9 +102,9 @@ namespace DetourNavigator
         std::array<unsigned char, maxSteerPoints> steerPathFlags;
         std::array<dtPolyRef, maxSteerPoints> steerPathPolys;
         int nsteerPath = 0;
-        const dtStatus status = navMeshQuery.findStraightPath(startPos.ptr(), endPos.ptr(), path,
-            static_cast<int>(pathSize), steerPath.data(), steerPathFlags.data(), steerPathPolys.data(),
-            &nsteerPath, maxSteerPoints);
+        const dtStatus status
+            = navMeshQuery.findStraightPath(startPos.ptr(), endPos.ptr(), path, static_cast<int>(pathSize),
+                steerPath.data(), steerPathFlags.data(), steerPathPolys.data(), &nsteerPath, maxSteerPoints);
         if (dtStatusFailed(status))
             return std::nullopt;
         assert(nsteerPath >= 0);
@@ -117,8 +116,8 @@ namespace DetourNavigator
         while (ns < static_cast<std::size_t>(nsteerPath))
         {
             // Stop at Off-Mesh link or when point is further than slop away.
-            if ((steerPathFlags[ns] & DT_STRAIGHTPATH_OFFMESH_CONNECTION) ||
-                    !inRange(Misc::Convert::makeOsgVec3f(&steerPath[ns * 3]), startPos, minTargetDist))
+            if ((steerPathFlags[ns] & DT_STRAIGHTPATH_OFFMESH_CONNECTION)
+                || !inRange(Misc::Convert::makeOsgVec3f(&steerPath[ns * 3]), startPos, minTargetDist))
                 break;
             ns++;
         }
@@ -134,8 +133,8 @@ namespace DetourNavigator
         return result;
     }
 
-    dtPolyRef findNearestPoly(const dtNavMeshQuery& query, const dtQueryFilter& filter,
-            const osg::Vec3f& center, const osg::Vec3f& halfExtents)
+    dtPolyRef findNearestPoly(const dtNavMeshQuery& query, const dtQueryFilter& filter, const osg::Vec3f& center,
+        const osg::Vec3f& halfExtents)
     {
         dtPolyRef ref = 0;
         const dtStatus status = query.findNearestPoly(center.ptr(), halfExtents.ptr(), &filter, &ref, nullptr);
diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp
index 0fa756f3b7..b96b2a8139 100644
--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@@ -1,11 +1,11 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_FINDSMOOTHPATH_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_FINDSMOOTHPATH_H
 
+#include "areatype.hpp"
 #include "flags.hpp"
 #include "settings.hpp"
 #include "settingsutils.hpp"
 #include "status.hpp"
-#include "areatype.hpp"
 
 #include <DetourCommon.h>
 #include <DetourNavMesh.h>
@@ -14,8 +14,8 @@
 #include <osg/Vec3f>
 
 #include <cassert>
-#include <vector>
 #include <functional>
+#include <vector>
 
 class dtNavMesh;
 
@@ -28,7 +28,8 @@ namespace DetourNavigator
         return (osg::Vec2f(v1.x(), v1.z()) - osg::Vec2f(v2.x(), v2.z())).length() < r;
     }
 
-    std::size_t fixupCorridor(std::vector<dtPolyRef>& path, std::size_t pathSize, const std::vector<dtPolyRef>& visited);
+    std::size_t fixupCorridor(
+        std::vector<dtPolyRef>& path, std::size_t pathSize, const std::vector<dtPolyRef>& visited);
 
     // This function checks if the path has a small U-turn, that is,
     // a polygon further in the path is adjacent to the first polygon
@@ -51,36 +52,34 @@ namespace DetourNavigator
     };
 
     std::optional<SteerTarget> getSteerTarget(const dtNavMeshQuery& navQuery, const osg::Vec3f& startPos,
-            const osg::Vec3f& endPos, const float minTargetDist, const dtPolyRef* path, const std::size_t pathSize);
+        const osg::Vec3f& endPos, const float minTargetDist, const dtPolyRef* path, const std::size_t pathSize);
 
     template <class OutputIterator>
     class OutputTransformIterator
     {
     public:
         explicit OutputTransformIterator(OutputIterator& impl, const RecastSettings& settings)
-            : mImpl(impl), mSettings(settings)
+            : mImpl(impl)
+            , mSettings(settings)
         {
         }
 
-        OutputTransformIterator& operator *()
-        {
-            return *this;
-        }
+        OutputTransformIterator& operator*() { return *this; }
 
-        OutputTransformIterator& operator ++()
+        OutputTransformIterator& operator++()
         {
             ++mImpl.get();
             return *this;
         }
 
-        OutputTransformIterator operator ++(int)
+        OutputTransformIterator operator++(int)
         {
             const auto copy = *this;
             ++(*this);
             return copy;
         }
 
-        OutputTransformIterator& operator =(const osg::Vec3f& value)
+        OutputTransformIterator& operator=(const osg::Vec3f& value)
         {
             *mImpl.get() = fromNavMeshCoordinates(mSettings, value);
             return *this;
@@ -97,8 +96,8 @@ namespace DetourNavigator
         return dtStatusSucceed(status);
     }
 
-    dtPolyRef findNearestPoly(const dtNavMeshQuery& query, const dtQueryFilter& filter,
-            const osg::Vec3f& center, const osg::Vec3f& halfExtents);
+    dtPolyRef findNearestPoly(const dtNavMeshQuery& query, const dtQueryFilter& filter, const osg::Vec3f& center,
+        const osg::Vec3f& halfExtents);
 
     struct MoveAlongSurfaceResult
     {
@@ -113,14 +112,14 @@ namespace DetourNavigator
         MoveAlongSurfaceResult result;
         result.mVisited.resize(maxVisitedSize);
         int visitedNumber = 0;
-        const auto status = navMeshQuery.moveAlongSurface(startRef, startPos.ptr(), endPos.ptr(),
-            &filter, result.mResultPos.ptr(), result.mVisited.data(), &visitedNumber, static_cast<int>(maxVisitedSize));
+        const auto status = navMeshQuery.moveAlongSurface(startRef, startPos.ptr(), endPos.ptr(), &filter,
+            result.mResultPos.ptr(), result.mVisited.data(), &visitedNumber, static_cast<int>(maxVisitedSize));
         if (!dtStatusSucceed(status))
             return {};
         assert(visitedNumber >= 0);
         assert(visitedNumber <= static_cast<int>(maxVisitedSize));
         result.mVisited.resize(static_cast<std::size_t>(visitedNumber));
-        return {std::move(result)};
+        return { std::move(result) };
     }
 
     inline std::optional<std::size_t> findPath(const dtNavMeshQuery& navMeshQuery, const dtPolyRef startRef,
@@ -128,8 +127,8 @@ namespace DetourNavigator
         dtPolyRef* path, const std::size_t maxSize)
     {
         int pathLen = 0;
-        const auto status = navMeshQuery.findPath(startRef, endRef, startPos.ptr(), endPos.ptr(), &queryFilter,
-            path, &pathLen, static_cast<int>(maxSize));
+        const auto status = navMeshQuery.findPath(
+            startRef, endRef, startPos.ptr(), endPos.ptr(), &queryFilter, path, &pathLen, static_cast<int>(maxSize));
         if (!dtStatusSucceed(status))
             return {};
         assert(pathLen >= 0);
@@ -138,9 +137,9 @@ namespace DetourNavigator
     }
 
     template <class OutputIterator>
-    Status makeSmoothPath(const dtNavMesh& navMesh, const dtNavMeshQuery& navMeshQuery,
-            const dtQueryFilter& filter, const osg::Vec3f& start, const osg::Vec3f& end, const float stepSize,
-            std::vector<dtPolyRef>& polygonPath, std::size_t polygonPathSize, std::size_t maxSmoothPathSize, OutputIterator& out)
+    Status makeSmoothPath(const dtNavMesh& navMesh, const dtNavMeshQuery& navMeshQuery, const dtQueryFilter& filter,
+        const osg::Vec3f& start, const osg::Vec3f& end, const float stepSize, std::vector<dtPolyRef>& polygonPath,
+        std::size_t polygonPathSize, std::size_t maxSmoothPathSize, OutputIterator& out)
     {
         // Iterate over the path to find smooth path on the detail mesh surface.
         osg::Vec3f iterPos;
@@ -160,7 +159,8 @@ namespace DetourNavigator
         while (polygonPathSize > 0 && smoothPathSize < maxSmoothPathSize)
         {
             // Find location to steer towards.
-            const auto steerTarget = getSteerTarget(navMeshQuery, iterPos, targetPos, slop, polygonPath.data(), polygonPathSize);
+            const auto steerTarget
+                = getSteerTarget(navMeshQuery, iterPos, targetPos, slop, polygonPath.data(), polygonPathSize);
 
             if (!steerTarget)
                 break;
@@ -221,8 +221,8 @@ namespace DetourNavigator
                 osg::Vec3f endPos;
 
                 // Handle the connection.
-                if (dtStatusSucceed(navMesh.getOffMeshConnectionPolyEndPoints(prevRef, polyRef,
-                        startPos.ptr(), endPos.ptr())))
+                if (dtStatusSucceed(
+                        navMesh.getOffMeshConnectionPolyEndPoints(prevRef, polyRef, startPos.ptr(), endPos.ptr())))
                 {
                     *out++ = startPos;
                     ++smoothPathSize;
@@ -253,8 +253,8 @@ namespace DetourNavigator
 
     template <class OutputIterator>
     Status findSmoothPath(const dtNavMesh& navMesh, const osg::Vec3f& halfExtents, const float stepSize,
-            const osg::Vec3f& start, const osg::Vec3f& end, const Flags includeFlags, const AreaCosts& areaCosts,
-            const Settings& settings, float endTolerance, OutputIterator out)
+        const osg::Vec3f& start, const osg::Vec3f& end, const Flags includeFlags, const AreaCosts& areaCosts,
+        const Settings& settings, float endTolerance, OutputIterator out)
     {
         dtNavMeshQuery navMeshQuery;
         if (!initNavMeshQuery(navMeshQuery, navMesh, settings.mDetour.mMaxNavMeshQueryNodes))
@@ -274,14 +274,14 @@ namespace DetourNavigator
         if (startRef == 0)
             return Status::StartPolygonNotFound;
 
-        const dtPolyRef endRef = findNearestPoly(navMeshQuery, queryFilter, end,
-            polyHalfExtents + osg::Vec3f(endTolerance, endTolerance, endTolerance));
+        const dtPolyRef endRef = findNearestPoly(
+            navMeshQuery, queryFilter, end, polyHalfExtents + osg::Vec3f(endTolerance, endTolerance, endTolerance));
         if (endRef == 0)
             return Status::EndPolygonNotFound;
 
         std::vector<dtPolyRef> polygonPath(settings.mDetour.mMaxPolygonPathSize);
-        const auto polygonPathSize = findPath(navMeshQuery, startRef, endRef, start, end, queryFilter,
-                                              polygonPath.data(), polygonPath.size());
+        const auto polygonPathSize
+            = findPath(navMeshQuery, startRef, endRef, start, end, queryFilter, polygonPath.data(), polygonPath.size());
 
         if (!polygonPathSize.has_value())
             return Status::FindPathOverPolygonsFailed;
diff --git a/components/detournavigator/generatenavmeshtile.cpp b/components/detournavigator/generatenavmeshtile.cpp
index b47c723efc..3e3c88e694 100644
--- a/components/detournavigator/generatenavmeshtile.cpp
+++ b/components/detournavigator/generatenavmeshtile.cpp
@@ -11,11 +11,11 @@
 #include <osg/Vec3f>
 #include <osg/io_utils>
 
+#include <functional>
 #include <memory>
+#include <optional>
 #include <stdexcept>
 #include <vector>
-#include <optional>
-#include <functional>
 
 namespace DetourNavigator
 {
@@ -36,14 +36,16 @@ namespace DetourNavigator
     }
 
     GenerateNavMeshTile::GenerateNavMeshTile(std::string worldspace, const TilePosition& tilePosition,
-            RecastMeshProvider recastMeshProvider, const AgentBounds& agentBounds,
-            const DetourNavigator::Settings& settings, std::weak_ptr<NavMeshTileConsumer> consumer)
+        RecastMeshProvider recastMeshProvider, const AgentBounds& agentBounds,
+        const DetourNavigator::Settings& settings, std::weak_ptr<NavMeshTileConsumer> consumer)
         : mWorldspace(std::move(worldspace))
         , mTilePosition(tilePosition)
         , mRecastMeshProvider(recastMeshProvider)
         , mAgentBounds(agentBounds)
         , mSettings(settings)
-        , mConsumer(std::move(consumer)) {}
+        , mConsumer(std::move(consumer))
+    {
+    }
 
     void GenerateNavMeshTile::doWork()
     {
@@ -59,15 +61,15 @@ namespace DetourNavigator
 
         try
         {
-            Ignore ignore {mWorldspace, mTilePosition, consumer};
+            Ignore ignore{ mWorldspace, mTilePosition, consumer };
 
             const std::shared_ptr<RecastMesh> recastMesh = mRecastMeshProvider.getMesh(mWorldspace, mTilePosition);
 
             if (recastMesh == nullptr || isEmpty(*recastMesh))
                 return;
 
-            const std::vector<DbRefGeometryObject> objects = makeDbRefGeometryObjects(recastMesh->getMeshSources(),
-                [&] (const MeshSource& v) { return consumer->resolveMeshSource(v); });
+            const std::vector<DbRefGeometryObject> objects = makeDbRefGeometryObjects(
+                recastMesh->getMeshSources(), [&](const MeshSource& v) { return consumer->resolveMeshSource(v); });
             std::vector<std::byte> input = serialize(mSettings.mRecast, mAgentBounds, *recastMesh, objects);
             const std::optional<NavMeshTileInfo> info = consumer->find(mWorldspace, mTilePosition, input);
 
@@ -92,8 +94,8 @@ namespace DetourNavigator
         }
         catch (const std::exception& e)
         {
-            Log(Debug::Warning) << "Failed to generate navmesh for worldspace \"" << mWorldspace
-                                << "\" tile " << mTilePosition << ": " << e.what();
+            Log(Debug::Warning) << "Failed to generate navmesh for worldspace \"" << mWorldspace << "\" tile "
+                                << mTilePosition << ": " << e.what();
             consumer->cancel(e.what());
         }
     }
diff --git a/components/detournavigator/generatenavmeshtile.hpp b/components/detournavigator/generatenavmeshtile.hpp
index 0fc7341ff1..ad06ea071c 100644
--- a/components/detournavigator/generatenavmeshtile.hpp
+++ b/components/detournavigator/generatenavmeshtile.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_GENERATENAVMESHTILE_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_GENERATENAVMESHTILE_H
 
+#include "agentbounds.hpp"
 #include "recastmeshprovider.hpp"
 #include "tileposition.hpp"
-#include "agentbounds.hpp"
 
 #include <components/sceneutil/workqueue.hpp>
 
@@ -37,19 +37,21 @@ namespace DetourNavigator
 
         virtual std::int64_t resolveMeshSource(const MeshSource& source) = 0;
 
-        virtual std::optional<NavMeshTileInfo> find(std::string_view worldspace, const TilePosition& tilePosition,
-            const std::vector<std::byte>& input) = 0;
+        virtual std::optional<NavMeshTileInfo> find(
+            std::string_view worldspace, const TilePosition& tilePosition, const std::vector<std::byte>& input)
+            = 0;
 
         virtual void ignore(std::string_view worldspace, const TilePosition& tilePosition) = 0;
 
-        virtual void identity(std::string_view worldspace, const TilePosition& tilePosition,
-                              std::int64_t tileId) = 0;
+        virtual void identity(std::string_view worldspace, const TilePosition& tilePosition, std::int64_t tileId) = 0;
 
-        virtual void insert(std::string_view worldspace, const TilePosition& tilePosition,
-                            std::int64_t version, const std::vector<std::byte>& input, PreparedNavMeshData& data) = 0;
+        virtual void insert(std::string_view worldspace, const TilePosition& tilePosition, std::int64_t version,
+            const std::vector<std::byte>& input, PreparedNavMeshData& data)
+            = 0;
 
-        virtual void update(std::string_view worldspace, const TilePosition& tilePosition,
-                            std::int64_t tileId, std::int64_t version, PreparedNavMeshData& data) = 0;
+        virtual void update(std::string_view worldspace, const TilePosition& tilePosition, std::int64_t tileId,
+            std::int64_t version, PreparedNavMeshData& data)
+            = 0;
 
         virtual void cancel(std::string_view reason) = 0;
     };
@@ -58,8 +60,8 @@ namespace DetourNavigator
     {
     public:
         GenerateNavMeshTile(std::string worldspace, const TilePosition& tilePosition,
-                RecastMeshProvider recastMeshProvider, const AgentBounds& agentBounds, const Settings& settings,
-                std::weak_ptr<NavMeshTileConsumer> consumer);
+            RecastMeshProvider recastMeshProvider, const AgentBounds& agentBounds, const Settings& settings,
+            std::weak_ptr<NavMeshTileConsumer> consumer);
 
         void doWork() final;
 
diff --git a/components/detournavigator/gettilespositions.cpp b/components/detournavigator/gettilespositions.cpp
index 2d42ec25bb..a3f46f3f85 100644
--- a/components/detournavigator/gettilespositions.cpp
+++ b/components/detournavigator/gettilespositions.cpp
@@ -1,8 +1,8 @@
 #include "gettilespositions.hpp"
 #include "settings.hpp"
 #include "settingsutils.hpp"
-#include "tileposition.hpp"
 #include "tilebounds.hpp"
+#include "tileposition.hpp"
 
 #include <components/misc/convert.hpp>
 
@@ -10,8 +10,8 @@
 
 namespace DetourNavigator
 {
-    TilesPositionsRange makeTilesPositionsRange(const osg::Vec2f& aabbMin, const osg::Vec2f& aabbMax,
-        const RecastSettings& settings)
+    TilesPositionsRange makeTilesPositionsRange(
+        const osg::Vec2f& aabbMin, const osg::Vec2f& aabbMax, const RecastSettings& settings)
     {
         osg::Vec2f min = toNavMeshCoordinates(settings, aabbMin);
         osg::Vec2f max = toNavMeshCoordinates(settings, aabbMax);
@@ -29,11 +29,11 @@ namespace DetourNavigator
         if (minTile.y() > maxTile.y())
             std::swap(minTile.y(), maxTile.y());
 
-        return {minTile, maxTile + osg::Vec2i(1, 1)};
+        return { minTile, maxTile + osg::Vec2i(1, 1) };
     }
 
-    TilesPositionsRange makeTilesPositionsRange(const btCollisionShape& shape, const btTransform& transform,
-        const RecastSettings& settings)
+    TilesPositionsRange makeTilesPositionsRange(
+        const btCollisionShape& shape, const btTransform& transform, const RecastSettings& settings)
     {
         const TileBounds bounds = makeObjectTileBounds(shape, transform);
         return makeTilesPositionsRange(bounds.mMin, bounds.mMax, settings);
@@ -47,8 +47,8 @@ namespace DetourNavigator
         return {};
     }
 
-    TilesPositionsRange makeTilesPositionsRange(const int cellSize, const btVector3& shift,
-        const RecastSettings& settings)
+    TilesPositionsRange makeTilesPositionsRange(
+        const int cellSize, const btVector3& shift, const RecastSettings& settings)
     {
         const int halfCellSize = cellSize / 2;
         const btTransform transform(btMatrix3x3::getIdentity(), shift);
@@ -74,6 +74,6 @@ namespace DetourNavigator
         const int endY = std::min(a.mEnd.y(), b.mEnd.y());
         if (beginY > endY)
             return {};
-        return TilesPositionsRange {TilePosition(beginX, beginY), TilePosition(endX, endY)};
+        return TilesPositionsRange{ TilePosition(beginX, beginY), TilePosition(endX, endY) };
     }
 }
diff --git a/components/detournavigator/gettilespositions.hpp b/components/detournavigator/gettilespositions.hpp
index 33c1131176..32733224f3 100644
--- a/components/detournavigator/gettilespositions.hpp
+++ b/components/detournavigator/gettilespositions.hpp
@@ -18,24 +18,24 @@ namespace DetourNavigator
 {
     struct RecastSettings;
 
-    TilesPositionsRange makeTilesPositionsRange(const osg::Vec2f& aabbMin,
-        const osg::Vec2f& aabbMax, const RecastSettings& settings);
+    TilesPositionsRange makeTilesPositionsRange(
+        const osg::Vec2f& aabbMin, const osg::Vec2f& aabbMax, const RecastSettings& settings);
 
-    TilesPositionsRange makeTilesPositionsRange(const btCollisionShape& shape,
-        const btTransform& transform, const RecastSettings& settings);
+    TilesPositionsRange makeTilesPositionsRange(
+        const btCollisionShape& shape, const btTransform& transform, const RecastSettings& settings);
 
-    TilesPositionsRange makeTilesPositionsRange(const btCollisionShape& shape,
-        const btTransform& transform, const TileBounds& bounds, const RecastSettings& settings);
+    TilesPositionsRange makeTilesPositionsRange(const btCollisionShape& shape, const btTransform& transform,
+        const TileBounds& bounds, const RecastSettings& settings);
 
-    TilesPositionsRange makeTilesPositionsRange(const int cellSize, const btVector3& shift,
-        const RecastSettings& settings);
+    TilesPositionsRange makeTilesPositionsRange(
+        const int cellSize, const btVector3& shift, const RecastSettings& settings);
 
     template <class Callback>
     inline void getTilesPositions(const TilesPositionsRange& range, Callback&& callback)
     {
         for (int tileX = range.mBegin.x(); tileX < range.mEnd.x(); ++tileX)
             for (int tileY = range.mBegin.y(); tileY < range.mEnd.y(); ++tileY)
-                callback(TilePosition {tileX, tileY});
+                callback(TilePosition{ tileX, tileY });
     }
 
     inline bool isInTilesPositionsRange(int begin, int end, int coordinate)
diff --git a/components/detournavigator/heightfieldshape.hpp b/components/detournavigator/heightfieldshape.hpp
index 06770e9b3d..d8445b6004 100644
--- a/components/detournavigator/heightfieldshape.hpp
+++ b/components/detournavigator/heightfieldshape.hpp
@@ -32,12 +32,13 @@ namespace DetourNavigator
 
     inline btVector3 getHeightfieldShift(const HeightfieldSurface& v, const osg::Vec2i& cellPosition, int cellSize)
     {
-        return BulletHelpers::getHeightfieldShift(cellPosition.x(), cellPosition.y(), cellSize, v.mMinHeight, v.mMaxHeight);
+        return BulletHelpers::getHeightfieldShift(
+            cellPosition.x(), cellPosition.y(), cellSize, v.mMinHeight, v.mMaxHeight);
     }
 
     inline btVector3 getHeightfieldShift(const HeightfieldShape& v, const osg::Vec2i& cellPosition, int cellSize)
     {
-        return std::visit([&] (const auto& w) { return getHeightfieldShift(w, cellPosition, cellSize); }, v);
+        return std::visit([&](const auto& w) { return getHeightfieldShift(w, cellPosition, cellSize); }, v);
     }
 }
 
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 192e919334..b9cd9b26d3 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -1,20 +1,19 @@
 #include "makenavmesh.hpp"
 #include "debug.hpp"
 #include "exceptions.hpp"
-#include "recastmesh.hpp"
-#include "settings.hpp"
-#include "settingsutils.hpp"
-#include "sharednavmesh.hpp"
 #include "flags.hpp"
+#include "navmeshdata.hpp"
+#include "navmeshdb.hpp"
 #include "navmeshtilescache.hpp"
+#include "offmeshconnection.hpp"
 #include "preparednavmeshdata.hpp"
-#include "navmeshdata.hpp"
+#include "recastmesh.hpp"
 #include "recastmeshbuilder.hpp"
-#include "navmeshdb.hpp"
 #include "recastparams.hpp"
-#include "offmeshconnection.hpp"
+#include "settings.hpp"
+#include "settingsutils.hpp"
+#include "sharednavmesh.hpp"
 
-#include <components/misc/convert.hpp>
 #include <components/bullethelpers/processtrianglecallback.hpp>
 #include <components/misc/convert.hpp>
 #include <components/misc/guarded.hpp>
@@ -27,403 +26,401 @@
 #include <components/debug/debuglog.hpp>
 
 #include <algorithm>
+#include <array>
 #include <iomanip>
 #include <limits>
-#include <array>
 
 namespace DetourNavigator
 {
-namespace
-{
-    struct Rectangle
+    namespace
     {
-        TileBounds mBounds;
-        float mHeight;
-    };
+        struct Rectangle
+        {
+            TileBounds mBounds;
+            float mHeight;
+        };
 
-    std::vector<float> getOffMeshVerts(const std::vector<OffMeshConnection>& connections)
-    {
-        std::vector<float> result;
+        std::vector<float> getOffMeshVerts(const std::vector<OffMeshConnection>& connections)
+        {
+            std::vector<float> result;
 
-        result.reserve(connections.size() * 6);
+            result.reserve(connections.size() * 6);
 
-        const auto add = [&] (const osg::Vec3f& v)
-        {
-            result.push_back(v.x());
-            result.push_back(v.y());
-            result.push_back(v.z());
-        };
+            const auto add = [&](const osg::Vec3f& v) {
+                result.push_back(v.x());
+                result.push_back(v.y());
+                result.push_back(v.z());
+            };
+
+            for (const auto& v : connections)
+            {
+                add(v.mStart);
+                add(v.mEnd);
+            }
 
-        for (const auto& v : connections)
+            return result;
+        }
+
+        Flag getFlag(AreaType areaType)
         {
-            add(v.mStart);
-            add(v.mEnd);
+            switch (areaType)
+            {
+                case AreaType_null:
+                    return Flag_none;
+                case AreaType_ground:
+                    return Flag_walk;
+                case AreaType_water:
+                    return Flag_swim;
+                case AreaType_door:
+                    return Flag_openDoor;
+                case AreaType_pathgrid:
+                    return Flag_usePathgrid;
+            }
+            return Flag_none;
         }
 
-        return result;
-    }
+        std::vector<unsigned char> getOffMeshConAreas(const std::vector<OffMeshConnection>& connections)
+        {
+            std::vector<unsigned char> result;
+            result.reserve(connections.size());
+            std::transform(connections.begin(), connections.end(), std::back_inserter(result),
+                [](const OffMeshConnection& v) { return v.mAreaType; });
+            return result;
+        }
 
-    Flag getFlag(AreaType areaType)
-    {
-        switch (areaType)
+        std::vector<unsigned short> getOffMeshFlags(const std::vector<OffMeshConnection>& connections)
         {
-            case AreaType_null:
-                return Flag_none;
-            case AreaType_ground:
-                return Flag_walk;
-            case AreaType_water:
-                return Flag_swim;
-            case AreaType_door:
-                return Flag_openDoor;
-            case AreaType_pathgrid:
-                return Flag_usePathgrid;
+            std::vector<unsigned short> result;
+            result.reserve(connections.size());
+            std::transform(connections.begin(), connections.end(), std::back_inserter(result),
+                [](const OffMeshConnection& v) { return getFlag(v.mAreaType); });
+            return result;
         }
-        return Flag_none;
-    }
 
-    std::vector<unsigned char> getOffMeshConAreas(const std::vector<OffMeshConnection>& connections)
-    {
-        std::vector<unsigned char> result;
-        result.reserve(connections.size());
-        std::transform(connections.begin(), connections.end(), std::back_inserter(result),
-                       [] (const OffMeshConnection& v) { return v.mAreaType; });
-        return result;
-    }
+        float getHeight(const RecastSettings& settings, const AgentBounds& agentBounds)
+        {
+            return getAgentHeight(agentBounds) * settings.mRecastScaleFactor;
+        }
 
-    std::vector<unsigned short> getOffMeshFlags(const std::vector<OffMeshConnection>& connections)
-    {
-        std::vector<unsigned short> result;
-        result.reserve(connections.size());
-        std::transform(connections.begin(), connections.end(), std::back_inserter(result),
-                       [] (const OffMeshConnection& v) { return getFlag(v.mAreaType); });
-        return result;
-    }
+        float getMaxClimb(const RecastSettings& settings)
+        {
+            return settings.mMaxClimb * settings.mRecastScaleFactor;
+        }
 
-    float getHeight(const RecastSettings& settings,const AgentBounds& agentBounds)
-    {
-        return getAgentHeight(agentBounds) * settings.mRecastScaleFactor;
-    }
+        float getRadius(const RecastSettings& settings, const AgentBounds& agentBounds)
+        {
+            return getAgentRadius(agentBounds) * settings.mRecastScaleFactor;
+        }
 
-    float getMaxClimb(const RecastSettings& settings)
-    {
-        return settings.mMaxClimb * settings.mRecastScaleFactor;
-    }
+        float getSwimLevel(const RecastSettings& settings, const float waterLevel, const float agentHalfExtentsZ)
+        {
+            return waterLevel - settings.mSwimHeightScale * agentHalfExtentsZ - agentHalfExtentsZ;
+        }
 
-    float getRadius(const RecastSettings& settings, const AgentBounds& agentBounds)
-    {
-        return getAgentRadius(agentBounds) * settings.mRecastScaleFactor;
-    }
+        struct RecastParams
+        {
+            float mSampleDist = 0;
+            float mSampleMaxError = 0;
+            int mMaxEdgeLen = 0;
+            int mWalkableClimb = 0;
+            int mWalkableHeight = 0;
+            int mWalkableRadius = 0;
+        };
 
-    float getSwimLevel(const RecastSettings& settings, const float waterLevel, const float agentHalfExtentsZ)
-    {
-        return waterLevel - settings.mSwimHeightScale * agentHalfExtentsZ - agentHalfExtentsZ;
-    }
+        RecastParams makeRecastParams(const RecastSettings& settings, const AgentBounds& agentBounds)
+        {
+            RecastParams result;
+
+            result.mWalkableHeight
+                = static_cast<int>(std::ceil(getHeight(settings, agentBounds) / settings.mCellHeight));
+            result.mWalkableClimb = static_cast<int>(std::floor(getMaxClimb(settings) / settings.mCellHeight));
+            result.mWalkableRadius = static_cast<int>(std::ceil(getRadius(settings, agentBounds) / settings.mCellSize));
+            result.mMaxEdgeLen
+                = static_cast<int>(std::round(static_cast<float>(settings.mMaxEdgeLen) / settings.mCellSize));
+            result.mSampleDist
+                = settings.mDetailSampleDist < 0.9f ? 0 : settings.mCellSize * settings.mDetailSampleDist;
+            result.mSampleMaxError = settings.mCellHeight * settings.mDetailSampleMaxError;
+
+            return result;
+        }
 
-    struct RecastParams
-    {
-        float mSampleDist = 0;
-        float mSampleMaxError = 0;
-        int mMaxEdgeLen = 0;
-        int mWalkableClimb = 0;
-        int mWalkableHeight = 0;
-        int mWalkableRadius = 0;
-    };
-
-    RecastParams makeRecastParams(const RecastSettings& settings, const AgentBounds& agentBounds)
-    {
-        RecastParams result;
+        void initHeightfield(rcContext& context, const TilePosition& tilePosition, float minZ, float maxZ,
+            const RecastSettings& settings, rcHeightfield& solid)
+        {
+            const int size = settings.mTileSize + settings.mBorderSize * 2;
+            const int width = size;
+            const int height = size;
+            const float halfBoundsSize = size * settings.mCellSize * 0.5f;
+            const osg::Vec2f shift
+                = osg::Vec2f(tilePosition.x() + 0.5f, tilePosition.y() + 0.5f) * getTileSize(settings);
+            const osg::Vec3f bmin(shift.x() - halfBoundsSize, minZ, shift.y() - halfBoundsSize);
+            const osg::Vec3f bmax(shift.x() + halfBoundsSize, maxZ, shift.y() + halfBoundsSize);
+
+            const auto result = rcCreateHeightfield(
+                &context, solid, width, height, bmin.ptr(), bmax.ptr(), settings.mCellSize, settings.mCellHeight);
+
+            if (!result)
+                throw NavigatorException("Failed to create heightfield for navmesh");
+        }
 
-        result.mWalkableHeight = static_cast<int>(std::ceil(getHeight(settings, agentBounds) / settings.mCellHeight));
-        result.mWalkableClimb = static_cast<int>(std::floor(getMaxClimb(settings) / settings.mCellHeight));
-        result.mWalkableRadius = static_cast<int>(std::ceil(getRadius(settings, agentBounds) / settings.mCellSize));
-        result.mMaxEdgeLen = static_cast<int>(std::round(static_cast<float>(settings.mMaxEdgeLen) / settings.mCellSize));
-        result.mSampleDist = settings.mDetailSampleDist < 0.9f ? 0 : settings.mCellSize * settings.mDetailSampleDist;
-        result.mSampleMaxError = settings.mCellHeight * settings.mDetailSampleMaxError;
+        bool rasterizeTriangles(rcContext& context, const Mesh& mesh, const RecastSettings& settings,
+            const RecastParams& params, rcHeightfield& solid)
+        {
+            std::vector<unsigned char> areas(mesh.getAreaTypes().begin(), mesh.getAreaTypes().end());
+            std::vector<float> vertices = mesh.getVertices();
 
-        return result;
-    }
+            for (std::size_t i = 0; i < vertices.size(); i += 3)
+            {
+                for (std::size_t j = 0; j < 3; ++j)
+                    vertices[i + j] = toNavMeshCoordinates(settings, vertices[i + j]);
+                std::swap(vertices[i + 1], vertices[i + 2]);
+            }
 
-    void initHeightfield(rcContext& context, const TilePosition& tilePosition, float minZ, float maxZ,
-        const RecastSettings& settings, rcHeightfield& solid)
-    {
-        const int size = settings.mTileSize + settings.mBorderSize * 2;
-        const int width = size;
-        const int height = size;
-        const float halfBoundsSize = size * settings.mCellSize * 0.5f;
-        const osg::Vec2f shift = osg::Vec2f(tilePosition.x() + 0.5f, tilePosition.y() + 0.5f) * getTileSize(settings);
-        const osg::Vec3f bmin(shift.x() - halfBoundsSize, minZ, shift.y() - halfBoundsSize);
-        const osg::Vec3f bmax(shift.x() + halfBoundsSize, maxZ, shift.y() + halfBoundsSize);
-
-        const auto result = rcCreateHeightfield(&context, solid, width, height, bmin.ptr(), bmax.ptr(),
-                                                settings.mCellSize, settings.mCellHeight);
-
-        if (!result)
-            throw NavigatorException("Failed to create heightfield for navmesh");
-    }
+            rcClearUnwalkableTriangles(&context, settings.mMaxSlope, vertices.data(),
+                static_cast<int>(mesh.getVerticesCount()), mesh.getIndices().data(), static_cast<int>(areas.size()),
+                areas.data());
 
-    bool rasterizeTriangles(rcContext& context, const Mesh& mesh, const RecastSettings& settings,
-        const RecastParams& params, rcHeightfield& solid)
-    {
-        std::vector<unsigned char> areas(mesh.getAreaTypes().begin(), mesh.getAreaTypes().end());
-        std::vector<float> vertices = mesh.getVertices();
+            return rcRasterizeTriangles(&context, vertices.data(), static_cast<int>(mesh.getVerticesCount()),
+                mesh.getIndices().data(), areas.data(), static_cast<int>(areas.size()), solid, params.mWalkableClimb);
+        }
 
-        for (std::size_t i = 0; i < vertices.size(); i += 3)
+        bool rasterizeTriangles(rcContext& context, const Rectangle& rectangle, AreaType areaType,
+            const RecastParams& params, rcHeightfield& solid)
         {
-            for (std::size_t j = 0; j < 3; ++j)
-                vertices[i + j] = toNavMeshCoordinates(settings, vertices[i + j]);
-            std::swap(vertices[i + 1], vertices[i + 2]);
+            const std::array vertices{
+                rectangle.mBounds.mMin.x(),
+                rectangle.mHeight,
+                rectangle.mBounds.mMin.y(),
+                rectangle.mBounds.mMin.x(),
+                rectangle.mHeight,
+                rectangle.mBounds.mMax.y(),
+                rectangle.mBounds.mMax.x(),
+                rectangle.mHeight,
+                rectangle.mBounds.mMax.y(),
+                rectangle.mBounds.mMax.x(),
+                rectangle.mHeight,
+                rectangle.mBounds.mMin.y(),
+            };
+
+            const std::array indices{
+                0,
+                1,
+                2,
+                0,
+                2,
+                3,
+            };
+
+            const std::array<unsigned char, 2> areas{ areaType, areaType };
+
+            return rcRasterizeTriangles(&context, vertices.data(), static_cast<int>(vertices.size() / 3),
+                indices.data(), areas.data(), static_cast<int>(areas.size()), solid, params.mWalkableClimb);
         }
 
-        rcClearUnwalkableTriangles(
-            &context,
-            settings.mMaxSlope,
-            vertices.data(),
-            static_cast<int>(mesh.getVerticesCount()),
-            mesh.getIndices().data(),
-            static_cast<int>(areas.size()),
-            areas.data()
-        );
-
-        return rcRasterizeTriangles(
-            &context,
-            vertices.data(),
-            static_cast<int>(mesh.getVerticesCount()),
-            mesh.getIndices().data(),
-            areas.data(),
-            static_cast<int>(areas.size()),
-            solid,
-            params.mWalkableClimb
-        );
-    }
-
-    bool rasterizeTriangles(rcContext& context, const Rectangle& rectangle, AreaType areaType,
-        const RecastParams& params, rcHeightfield& solid)
-    {
-        const std::array vertices {
-            rectangle.mBounds.mMin.x(), rectangle.mHeight, rectangle.mBounds.mMin.y(),
-            rectangle.mBounds.mMin.x(), rectangle.mHeight, rectangle.mBounds.mMax.y(),
-            rectangle.mBounds.mMax.x(), rectangle.mHeight, rectangle.mBounds.mMax.y(),
-            rectangle.mBounds.mMax.x(), rectangle.mHeight, rectangle.mBounds.mMin.y(),
-        };
-
-        const std::array indices {
-            0, 1, 2,
-            0, 2, 3,
-        };
-
-        const std::array<unsigned char, 2> areas {areaType, areaType};
-
-        return rcRasterizeTriangles(
-            &context,
-            vertices.data(),
-            static_cast<int>(vertices.size() / 3),
-            indices.data(),
-            areas.data(),
-            static_cast<int>(areas.size()),
-            solid,
-            params.mWalkableClimb
-        );
-    }
+        bool rasterizeTriangles(rcContext& context, float agentHalfExtentsZ, const std::vector<CellWater>& water,
+            const RecastSettings& settings, const RecastParams& params, const TileBounds& realTileBounds,
+            rcHeightfield& solid)
+        {
+            for (const CellWater& cellWater : water)
+            {
+                const TileBounds cellTileBounds
+                    = maxCellTileBounds(cellWater.mCellPosition, cellWater.mWater.mCellSize);
+                if (auto intersection = getIntersection(realTileBounds, cellTileBounds))
+                {
+                    const Rectangle rectangle{ toNavMeshCoordinates(settings, *intersection),
+                        toNavMeshCoordinates(
+                            settings, getSwimLevel(settings, cellWater.mWater.mLevel, agentHalfExtentsZ)) };
+                    if (!rasterizeTriangles(context, rectangle, AreaType_water, params, solid))
+                        return false;
+                }
+            }
+            return true;
+        }
 
-    bool rasterizeTriangles(rcContext& context, float agentHalfExtentsZ, const std::vector<CellWater>& water,
-        const RecastSettings& settings, const RecastParams& params, const TileBounds& realTileBounds, rcHeightfield& solid)
-    {
-        for (const CellWater& cellWater : water)
+        bool rasterizeTriangles(rcContext& context, const TileBounds& realTileBounds,
+            const std::vector<FlatHeightfield>& heightfields, const RecastSettings& settings,
+            const RecastParams& params, rcHeightfield& solid)
         {
-            const TileBounds cellTileBounds = maxCellTileBounds(cellWater.mCellPosition, cellWater.mWater.mCellSize);
-            if (auto intersection = getIntersection(realTileBounds, cellTileBounds))
+            for (const FlatHeightfield& heightfield : heightfields)
             {
-                const Rectangle rectangle {
-                    toNavMeshCoordinates(settings, *intersection),
-                    toNavMeshCoordinates(settings, getSwimLevel(settings, cellWater.mWater.mLevel, agentHalfExtentsZ))
-                };
-                if (!rasterizeTriangles(context, rectangle, AreaType_water, params, solid))
-                    return false;
+                const TileBounds cellTileBounds = maxCellTileBounds(heightfield.mCellPosition, heightfield.mCellSize);
+                if (auto intersection = getIntersection(realTileBounds, cellTileBounds))
+                {
+                    const Rectangle rectangle{ toNavMeshCoordinates(settings, *intersection),
+                        toNavMeshCoordinates(settings, heightfield.mHeight) };
+                    if (!rasterizeTriangles(context, rectangle, AreaType_ground, params, solid))
+                        return false;
+                }
             }
+            return true;
         }
-        return true;
-    }
 
-    bool rasterizeTriangles(rcContext& context, const TileBounds& realTileBounds, const std::vector<FlatHeightfield>& heightfields,
-        const RecastSettings& settings, const RecastParams& params, rcHeightfield& solid)
-    {
-        for (const FlatHeightfield& heightfield : heightfields)
+        bool rasterizeTriangles(rcContext& context, const std::vector<Heightfield>& heightfields,
+            const RecastSettings& settings, const RecastParams& params, rcHeightfield& solid)
         {
-            const TileBounds cellTileBounds = maxCellTileBounds(heightfield.mCellPosition, heightfield.mCellSize);
-            if (auto intersection = getIntersection(realTileBounds, cellTileBounds))
+            for (const Heightfield& heightfield : heightfields)
             {
-                const Rectangle rectangle {
-                    toNavMeshCoordinates(settings, *intersection),
-                    toNavMeshCoordinates(settings, heightfield.mHeight)
-                };
-                if (!rasterizeTriangles(context, rectangle, AreaType_ground, params, solid))
+                const Mesh mesh = makeMesh(heightfield);
+                if (!rasterizeTriangles(context, mesh, settings, params, solid))
                     return false;
             }
+            return true;
         }
-        return true;
-    }
 
-    bool rasterizeTriangles(rcContext& context, const std::vector<Heightfield>& heightfields,
-        const RecastSettings& settings, const RecastParams& params, rcHeightfield& solid)
-    {
-        for (const Heightfield& heightfield : heightfields)
+        bool rasterizeTriangles(rcContext& context, const TilePosition& tilePosition, float agentHalfExtentsZ,
+            const RecastMesh& recastMesh, const RecastSettings& settings, const RecastParams& params,
+            rcHeightfield& solid)
         {
-            const Mesh mesh = makeMesh(heightfield);
-            if (!rasterizeTriangles(context, mesh, settings, params, solid))
-                return false;
+            const TileBounds realTileBounds = makeRealTileBoundsWithBorder(settings, tilePosition);
+            return rasterizeTriangles(context, recastMesh.getMesh(), settings, params, solid)
+                && rasterizeTriangles(
+                    context, agentHalfExtentsZ, recastMesh.getWater(), settings, params, realTileBounds, solid)
+                && rasterizeTriangles(context, recastMesh.getHeightfields(), settings, params, solid)
+                && rasterizeTriangles(
+                    context, realTileBounds, recastMesh.getFlatHeightfields(), settings, params, solid);
         }
-        return true;
-    }
-
-    bool rasterizeTriangles(rcContext& context, const TilePosition& tilePosition, float agentHalfExtentsZ,
-        const RecastMesh& recastMesh, const RecastSettings& settings, const RecastParams& params, rcHeightfield& solid)
-    {
-        const TileBounds realTileBounds = makeRealTileBoundsWithBorder(settings, tilePosition);
-        return rasterizeTriangles(context, recastMesh.getMesh(), settings, params, solid)
-            && rasterizeTriangles(context, agentHalfExtentsZ, recastMesh.getWater(), settings, params, realTileBounds, solid)
-            && rasterizeTriangles(context, recastMesh.getHeightfields(), settings, params, solid)
-            && rasterizeTriangles(context, realTileBounds, recastMesh.getFlatHeightfields(), settings, params, solid);
-    }
 
-    void buildCompactHeightfield(rcContext& context, const int walkableHeight, const int walkableClimb,
-                                 rcHeightfield& solid, rcCompactHeightfield& compact)
-    {
-        const auto result = rcBuildCompactHeightfield(&context, walkableHeight,
-            walkableClimb, solid, compact);
-
-        if (!result)
-            throw NavigatorException("Failed to build compact heightfield for navmesh");
-    }
-
-    void erodeWalkableArea(rcContext& context, int walkableRadius, rcCompactHeightfield& compact)
-    {
-        const auto result = rcErodeWalkableArea(&context, walkableRadius, compact);
-
-        if (!result)
-            throw NavigatorException("Failed to erode walkable area for navmesh");
-    }
+        void buildCompactHeightfield(rcContext& context, const int walkableHeight, const int walkableClimb,
+            rcHeightfield& solid, rcCompactHeightfield& compact)
+        {
+            const auto result = rcBuildCompactHeightfield(&context, walkableHeight, walkableClimb, solid, compact);
 
-    void buildDistanceField(rcContext& context, rcCompactHeightfield& compact)
-    {
-        const auto result = rcBuildDistanceField(&context, compact);
+            if (!result)
+                throw NavigatorException("Failed to build compact heightfield for navmesh");
+        }
 
-        if (!result)
-            throw NavigatorException("Failed to build distance field for navmesh");
-    }
+        void erodeWalkableArea(rcContext& context, int walkableRadius, rcCompactHeightfield& compact)
+        {
+            const auto result = rcErodeWalkableArea(&context, walkableRadius, compact);
 
-    void buildRegions(rcContext& context, rcCompactHeightfield& compact, const int borderSize,
-        const int minRegionArea, const int mergeRegionArea)
-    {
-        const auto result = rcBuildRegions(&context, compact, borderSize, minRegionArea, mergeRegionArea);
+            if (!result)
+                throw NavigatorException("Failed to erode walkable area for navmesh");
+        }
 
-        if (!result)
-            throw NavigatorException("Failed to build distance field for navmesh");
-    }
+        void buildDistanceField(rcContext& context, rcCompactHeightfield& compact)
+        {
+            const auto result = rcBuildDistanceField(&context, compact);
 
-    void buildContours(rcContext& context, rcCompactHeightfield& compact, const float maxError, const int maxEdgeLen,
-        rcContourSet& contourSet, const int buildFlags = RC_CONTOUR_TESS_WALL_EDGES)
-    {
-        const auto result = rcBuildContours(&context, compact, maxError, maxEdgeLen, contourSet, buildFlags);
+            if (!result)
+                throw NavigatorException("Failed to build distance field for navmesh");
+        }
 
-        if (!result)
-            throw NavigatorException("Failed to build contours for navmesh");
-    }
+        void buildRegions(rcContext& context, rcCompactHeightfield& compact, const int borderSize,
+            const int minRegionArea, const int mergeRegionArea)
+        {
+            const auto result = rcBuildRegions(&context, compact, borderSize, minRegionArea, mergeRegionArea);
 
-    void buildPolyMesh(rcContext& context, rcContourSet& contourSet, const int maxVertsPerPoly, rcPolyMesh& polyMesh)
-    {
-        const auto result = rcBuildPolyMesh(&context, contourSet, maxVertsPerPoly, polyMesh);
+            if (!result)
+                throw NavigatorException("Failed to build distance field for navmesh");
+        }
 
-        if (!result)
-            throw NavigatorException("Failed to build poly mesh for navmesh");
-    }
+        void buildContours(rcContext& context, rcCompactHeightfield& compact, const float maxError,
+            const int maxEdgeLen, rcContourSet& contourSet, const int buildFlags = RC_CONTOUR_TESS_WALL_EDGES)
+        {
+            const auto result = rcBuildContours(&context, compact, maxError, maxEdgeLen, contourSet, buildFlags);
 
-    void buildPolyMeshDetail(rcContext& context, const rcPolyMesh& polyMesh, const rcCompactHeightfield& compact,
-        const float sampleDist, const float sampleMaxError, rcPolyMeshDetail& polyMeshDetail)
-    {
-        const auto result = rcBuildPolyMeshDetail(&context, polyMesh, compact, sampleDist, sampleMaxError,
-                                                  polyMeshDetail);
+            if (!result)
+                throw NavigatorException("Failed to build contours for navmesh");
+        }
 
-        if (!result)
-            throw NavigatorException("Failed to build detail poly mesh for navmesh");
-    }
+        void buildPolyMesh(
+            rcContext& context, rcContourSet& contourSet, const int maxVertsPerPoly, rcPolyMesh& polyMesh)
+        {
+            const auto result = rcBuildPolyMesh(&context, contourSet, maxVertsPerPoly, polyMesh);
 
-    void setPolyMeshFlags(rcPolyMesh& polyMesh)
-    {
-        for (int i = 0; i < polyMesh.npolys; ++i)
-            polyMesh.flags[i] = getFlag(static_cast<AreaType>(polyMesh.areas[i]));
-    }
+            if (!result)
+                throw NavigatorException("Failed to build poly mesh for navmesh");
+        }
 
-    bool fillPolyMesh(rcContext& context, const RecastSettings& settings, const RecastParams& params,
-        rcHeightfield& solid, rcPolyMesh& polyMesh, rcPolyMeshDetail& polyMeshDetail)
-    {
-        rcCompactHeightfield compact;
-        buildCompactHeightfield(context, params.mWalkableHeight, params.mWalkableClimb, solid, compact);
+        void buildPolyMeshDetail(rcContext& context, const rcPolyMesh& polyMesh, const rcCompactHeightfield& compact,
+            const float sampleDist, const float sampleMaxError, rcPolyMeshDetail& polyMeshDetail)
+        {
+            const auto result
+                = rcBuildPolyMeshDetail(&context, polyMesh, compact, sampleDist, sampleMaxError, polyMeshDetail);
 
-        erodeWalkableArea(context, params.mWalkableRadius, compact);
-        buildDistanceField(context, compact);
-        buildRegions(context, compact, settings.mBorderSize, settings.mRegionMinArea, settings.mRegionMergeArea);
+            if (!result)
+                throw NavigatorException("Failed to build detail poly mesh for navmesh");
+        }
 
-        rcContourSet contourSet;
-        buildContours(context, compact, settings.mMaxSimplificationError, params.mMaxEdgeLen, contourSet);
+        void setPolyMeshFlags(rcPolyMesh& polyMesh)
+        {
+            for (int i = 0; i < polyMesh.npolys; ++i)
+                polyMesh.flags[i] = getFlag(static_cast<AreaType>(polyMesh.areas[i]));
+        }
 
-        if (contourSet.nconts == 0)
-            return false;
+        bool fillPolyMesh(rcContext& context, const RecastSettings& settings, const RecastParams& params,
+            rcHeightfield& solid, rcPolyMesh& polyMesh, rcPolyMeshDetail& polyMeshDetail)
+        {
+            rcCompactHeightfield compact;
+            buildCompactHeightfield(context, params.mWalkableHeight, params.mWalkableClimb, solid, compact);
 
-        buildPolyMesh(context, contourSet, settings.mMaxVertsPerPoly, polyMesh);
+            erodeWalkableArea(context, params.mWalkableRadius, compact);
+            buildDistanceField(context, compact);
+            buildRegions(context, compact, settings.mBorderSize, settings.mRegionMinArea, settings.mRegionMergeArea);
 
-        buildPolyMeshDetail(context, polyMesh, compact, params.mSampleDist, params.mSampleMaxError, polyMeshDetail);
+            rcContourSet contourSet;
+            buildContours(context, compact, settings.mMaxSimplificationError, params.mMaxEdgeLen, contourSet);
 
-        setPolyMeshFlags(polyMesh);
+            if (contourSet.nconts == 0)
+                return false;
 
-        return true;
-    }
+            buildPolyMesh(context, contourSet, settings.mMaxVertsPerPoly, polyMesh);
 
-    template <class T>
-    unsigned long getMinValuableBitsNumber(const T value)
-    {
-        unsigned long power = 0;
-        while (power < sizeof(T) * 8 && (static_cast<T>(1) << power) < value)
-            ++power;
-        return power;
-    }
+            buildPolyMeshDetail(context, polyMesh, compact, params.mSampleDist, params.mSampleMaxError, polyMeshDetail);
 
-    std::pair<float, float> getBoundsByZ(const RecastMesh& recastMesh, float agentHalfExtentsZ, const RecastSettings& settings)
-    {
-        float minZ = 0;
-        float maxZ = 0;
+            setPolyMeshFlags(polyMesh);
 
-        const std::vector<float>& vertices = recastMesh.getMesh().getVertices();
-        for (std::size_t i = 0, n = vertices.size(); i < n; i += 3)
-        {
-            minZ = std::min(minZ, vertices[i + 2]);
-            maxZ = std::max(maxZ, vertices[i + 2]);
+            return true;
         }
 
-        for (const CellWater& water : recastMesh.getWater())
+        template <class T>
+        unsigned long getMinValuableBitsNumber(const T value)
         {
-            const float swimLevel = getSwimLevel(settings, water.mWater.mLevel, agentHalfExtentsZ);
-            minZ = std::min(minZ, swimLevel);
-            maxZ = std::max(maxZ, swimLevel);
+            unsigned long power = 0;
+            while (power < sizeof(T) * 8 && (static_cast<T>(1) << power) < value)
+                ++power;
+            return power;
         }
 
-        for (const Heightfield& heightfield : recastMesh.getHeightfields())
+        std::pair<float, float> getBoundsByZ(
+            const RecastMesh& recastMesh, float agentHalfExtentsZ, const RecastSettings& settings)
         {
-            if (heightfield.mHeights.empty())
-                continue;
-            const auto [minHeight, maxHeight] = std::minmax_element(heightfield.mHeights.begin(), heightfield.mHeights.end());
-            minZ = std::min(minZ, *minHeight);
-            maxZ = std::max(maxZ, *maxHeight);
-        }
+            float minZ = 0;
+            float maxZ = 0;
 
-        for (const FlatHeightfield& heightfield : recastMesh.getFlatHeightfields())
-        {
-            minZ = std::min(minZ, heightfield.mHeight);
-            maxZ = std::max(maxZ, heightfield.mHeight);
-        }
+            const std::vector<float>& vertices = recastMesh.getMesh().getVertices();
+            for (std::size_t i = 0, n = vertices.size(); i < n; i += 3)
+            {
+                minZ = std::min(minZ, vertices[i + 2]);
+                maxZ = std::max(maxZ, vertices[i + 2]);
+            }
 
-        return {minZ, maxZ};
+            for (const CellWater& water : recastMesh.getWater())
+            {
+                const float swimLevel = getSwimLevel(settings, water.mWater.mLevel, agentHalfExtentsZ);
+                minZ = std::min(minZ, swimLevel);
+                maxZ = std::max(maxZ, swimLevel);
+            }
+
+            for (const Heightfield& heightfield : recastMesh.getHeightfields())
+            {
+                if (heightfield.mHeights.empty())
+                    continue;
+                const auto [minHeight, maxHeight]
+                    = std::minmax_element(heightfield.mHeights.begin(), heightfield.mHeights.end());
+                minZ = std::min(minZ, *minHeight);
+                maxZ = std::max(maxZ, *maxHeight);
+            }
+
+            for (const FlatHeightfield& heightfield : recastMesh.getFlatHeightfields())
+            {
+                minZ = std::min(minZ, heightfield.mHeight);
+                maxZ = std::max(maxZ, heightfield.mHeight);
+            }
+
+            return { minZ, maxZ };
+        }
     }
-}
 } // namespace DetourNavigator
 
 namespace DetourNavigator
@@ -437,11 +434,12 @@ namespace DetourNavigator
 
         rcHeightfield solid;
         initHeightfield(context, tilePosition, toNavMeshCoordinates(settings, minZ),
-                        toNavMeshCoordinates(settings, maxZ), settings, solid);
+            toNavMeshCoordinates(settings, maxZ), settings, solid);
 
         const RecastParams params = makeRecastParams(settings, agentBounds);
 
-        if (!rasterizeTriangles(context, tilePosition, agentBounds.mHalfExtents.z(), recastMesh, settings, params, solid))
+        if (!rasterizeTriangles(
+                context, tilePosition, agentBounds.mHalfExtents.z(), recastMesh, settings, params, solid))
             return nullptr;
 
         rcFilterLowHangingWalkableObstacles(&context, params.mWalkableClimb, solid);
diff --git a/components/detournavigator/makenavmesh.hpp b/components/detournavigator/makenavmesh.hpp
index 511cab747e..229e1e72a2 100644
--- a/components/detournavigator/makenavmesh.hpp
+++ b/components/detournavigator/makenavmesh.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_MAKENAVMESH_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_MAKENAVMESH_H
 
-#include "tileposition.hpp"
-#include "sharednavmesh.hpp"
 #include "recastmesh.hpp"
+#include "sharednavmesh.hpp"
+#include "tileposition.hpp"
 
 #include <memory>
 #include <vector>
@@ -38,10 +38,8 @@ namespace DetourNavigator
 
     inline bool isEmpty(const RecastMesh& recastMesh)
     {
-        return recastMesh.getMesh().getIndices().empty()
-                && recastMesh.getWater().empty()
-                && recastMesh.getHeightfields().empty()
-                && recastMesh.getFlatHeightfields().empty();
+        return recastMesh.getMesh().getIndices().empty() && recastMesh.getWater().empty()
+            && recastMesh.getHeightfields().empty() && recastMesh.getFlatHeightfields().empty();
     }
 
     std::unique_ptr<PreparedNavMeshData> prepareNavMeshTileData(const RecastMesh& recastMesh,
diff --git a/components/detournavigator/navigator.cpp b/components/detournavigator/navigator.cpp
index c473221322..a77703a559 100644
--- a/components/detournavigator/navigator.cpp
+++ b/components/detournavigator/navigator.cpp
@@ -17,7 +17,8 @@ namespace DetourNavigator
         {
             try
             {
-                db = std::make_unique<NavMeshDb>(Files::pathToUnicodeString(userDataPath / "navmesh.db"), settings.mMaxDbFileSize);
+                db = std::make_unique<NavMeshDb>(
+                    Files::pathToUnicodeString(userDataPath / "navmesh.db"), settings.mMaxDbFileSize);
             }
             catch (const std::exception& e)
             {
diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index f561f38cda..b34ec4e4d0 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -3,16 +3,15 @@
 
 #include <filesystem>
 
+#include "heightfieldshape.hpp"
 #include "objectid.hpp"
-#include "sharednavmeshcacheitem.hpp"
+#include "objecttransform.hpp"
 #include "recastmeshtiles.hpp"
+#include "sharednavmeshcacheitem.hpp"
 #include "waitconditiontype.hpp"
-#include "heightfieldshape.hpp"
-#include "objecttransform.hpp"
 
 #include <components/resource/bulletshape.hpp>
 
-
 namespace ESM
 {
     struct Cell;
@@ -35,7 +34,8 @@ namespace DetourNavigator
         osg::ref_ptr<const Resource::BulletShapeInstance> mShapeInstance;
         ObjectTransform mTransform;
 
-        ObjectShapes(const osg::ref_ptr<const Resource::BulletShapeInstance>& shapeInstance, const ObjectTransform& transform)
+        ObjectShapes(
+            const osg::ref_ptr<const Resource::BulletShapeInstance>& shapeInstance, const ObjectTransform& transform)
             : mShapeInstance(shapeInstance)
             , mTransform(transform)
         {
@@ -49,11 +49,12 @@ namespace DetourNavigator
         osg::Vec3f mConnectionEnd;
 
         DoorShapes(const osg::ref_ptr<const Resource::BulletShapeInstance>& shapeInstance,
-                   const ObjectTransform& transform, const osg::Vec3f& connectionStart, const osg::Vec3f& connectionEnd)
+            const ObjectTransform& transform, const osg::Vec3f& connectionStart, const osg::Vec3f& connectionEnd)
             : ObjectShapes(shapeInstance, transform)
             , mConnectionStart(connectionStart)
             , mConnectionEnd(connectionEnd)
-        {}
+        {
+        }
     };
 
     class UpdateGuard;
@@ -102,8 +103,9 @@ namespace DetourNavigator
          * @param shape members must live until object is updated by another shape removed from Navigator
          * @param transform allows to setup objects geometry according to its world state
          */
-        virtual void addObject(const ObjectId id, const ObjectShapes& shapes, const btTransform& transform,
-            const UpdateGuard* guard) = 0;
+        virtual void addObject(
+            const ObjectId id, const ObjectShapes& shapes, const btTransform& transform, const UpdateGuard* guard)
+            = 0;
 
         /**
          * @brief addObject is used to add doors.
@@ -111,8 +113,9 @@ namespace DetourNavigator
          * @param shape members must live until object is updated by another shape or removed from Navigator.
          * @param transform allows to setup objects geometry according to its world state.
          */
-        virtual void addObject(const ObjectId id, const DoorShapes& shapes, const btTransform& transform,
-            const UpdateGuard* guard) = 0;
+        virtual void addObject(
+            const ObjectId id, const DoorShapes& shapes, const btTransform& transform, const UpdateGuard* guard)
+            = 0;
 
         /**
          * @brief updateObject replace object geometry by given data.
@@ -120,8 +123,9 @@ namespace DetourNavigator
          * @param shape members must live until object is updated by another shape removed from Navigator.
          * @param transform allows to setup objects geometry according to its world state.
          */
-        virtual void updateObject(const ObjectId id, const ObjectShapes& shapes, const btTransform& transform,
-            const UpdateGuard* guard) = 0;
+        virtual void updateObject(
+            const ObjectId id, const ObjectShapes& shapes, const btTransform& transform, const UpdateGuard* guard)
+            = 0;
 
         /**
          * @brief updateObject replace object geometry by given data.
@@ -129,8 +133,9 @@ namespace DetourNavigator
          * @param shape members must live until object is updated by another shape removed from Navigator.
          * @param transform allows to setup objects geometry according to its world state.
          */
-        virtual void updateObject(const ObjectId id, const DoorShapes& shapes, const btTransform& transform,
-            const UpdateGuard* guard) = 0;
+        virtual void updateObject(
+            const ObjectId id, const DoorShapes& shapes, const btTransform& transform, const UpdateGuard* guard)
+            = 0;
 
         /**
          * @brief removeObject to make it no more available at the scene.
@@ -144,8 +149,7 @@ namespace DetourNavigator
          * @param cellSize set cell borders. std::numeric_limits<int>::max() disables cell borders.
          * @param shift set global shift of cell center.
          */
-        virtual void addWater(const osg::Vec2i& cellPosition, int cellSize, float level,
-            const UpdateGuard* guard) = 0;
+        virtual void addWater(const osg::Vec2i& cellPosition, int cellSize, float level, const UpdateGuard* guard) = 0;
 
         /**
          * @brief removeWater to make it no more available at the scene.
@@ -153,8 +157,9 @@ namespace DetourNavigator
          */
         virtual void removeWater(const osg::Vec2i& cellPosition, const UpdateGuard* guard) = 0;
 
-        virtual void addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const HeightfieldShape& shape,
-            const UpdateGuard* guard) = 0;
+        virtual void addHeightfield(
+            const osg::Vec2i& cellPosition, int cellSize, const HeightfieldShape& shape, const UpdateGuard* guard)
+            = 0;
 
         virtual void removeHeightfield(const osg::Vec2i& cellPosition, const UpdateGuard* guard) = 0;
 
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index f23da1eb22..69ad1797a8 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -4,8 +4,8 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/esm3/loadpgrd.hpp>
-#include <components/misc/coordinateconverter.hpp>
 #include <components/misc/convert.hpp>
+#include <components/misc/coordinateconverter.hpp>
 
 namespace DetourNavigator
 {
@@ -17,7 +17,7 @@ namespace DetourNavigator
 
     void NavigatorImpl::addAgent(const AgentBounds& agentBounds)
     {
-        if(agentBounds.mHalfExtents.length2() <= 0)
+        if (agentBounds.mHalfExtents.length2() <= 0)
             return;
         ++mAgents[agentBounds];
         mNavMeshManager.addAgent(agentBounds);
@@ -42,16 +42,17 @@ namespace DetourNavigator
         mNavMeshManager.updateBounds(playerPosition, getImpl(guard));
     }
 
-    void NavigatorImpl::addObject(const ObjectId id, const ObjectShapes& shapes, const btTransform& transform,
-        const UpdateGuard* guard)
+    void NavigatorImpl::addObject(
+        const ObjectId id, const ObjectShapes& shapes, const btTransform& transform, const UpdateGuard* guard)
     {
         addObjectImpl(id, shapes, transform, guard);
     }
 
-    bool NavigatorImpl::addObjectImpl(const ObjectId id, const ObjectShapes& shapes, const btTransform& transform,
-        const UpdateGuard* guard)
+    bool NavigatorImpl::addObjectImpl(
+        const ObjectId id, const ObjectShapes& shapes, const btTransform& transform, const UpdateGuard* guard)
     {
-        const CollisionShape collisionShape(shapes.mShapeInstance, *shapes.mShapeInstance->mCollisionShape, shapes.mTransform);
+        const CollisionShape collisionShape(
+            shapes.mShapeInstance, *shapes.mShapeInstance->mCollisionShape, shapes.mTransform);
         bool result = mNavMeshManager.addObject(id, collisionShape, transform, AreaType_ground, getImpl(guard));
         if (const btCollisionShape* const avoidShape = shapes.mShapeInstance->mAvoidCollisionShape.get())
         {
@@ -66,8 +67,8 @@ namespace DetourNavigator
         return result;
     }
 
-    void NavigatorImpl::addObject(const ObjectId id, const DoorShapes& shapes, const btTransform& transform,
-        const UpdateGuard* guard)
+    void NavigatorImpl::addObject(
+        const ObjectId id, const DoorShapes& shapes, const btTransform& transform, const UpdateGuard* guard)
     {
         if (addObjectImpl(id, static_cast<const ObjectShapes&>(shapes), transform, guard))
         {
@@ -78,8 +79,8 @@ namespace DetourNavigator
         }
     }
 
-    void NavigatorImpl::updateObject(const ObjectId id, const ObjectShapes& shapes, const btTransform& transform,
-        const UpdateGuard* guard)
+    void NavigatorImpl::updateObject(
+        const ObjectId id, const ObjectShapes& shapes, const btTransform& transform, const UpdateGuard* guard)
     {
         mNavMeshManager.updateObject(id, transform, AreaType_ground, getImpl(guard));
         if (const btCollisionShape* const avoidShape = shapes.mShapeInstance->mAvoidCollisionShape.get())
@@ -90,8 +91,8 @@ namespace DetourNavigator
         }
     }
 
-    void NavigatorImpl::updateObject(const ObjectId id, const DoorShapes& shapes, const btTransform& transform,
-        const UpdateGuard* guard)
+    void NavigatorImpl::updateObject(
+        const ObjectId id, const DoorShapes& shapes, const btTransform& transform, const UpdateGuard* guard)
     {
         return updateObject(id, static_cast<const ObjectShapes&>(shapes), transform, guard);
     }
@@ -118,8 +119,8 @@ namespace DetourNavigator
         mNavMeshManager.removeWater(cellPosition, getImpl(guard));
     }
 
-    void NavigatorImpl::addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const HeightfieldShape& shape,
-        const UpdateGuard* guard)
+    void NavigatorImpl::addHeightfield(
+        const osg::Vec2i& cellPosition, int cellSize, const HeightfieldShape& shape, const UpdateGuard* guard)
     {
         mNavMeshManager.addHeightfield(cellPosition, cellSize, shape, getImpl(guard));
     }
@@ -136,12 +137,8 @@ namespace DetourNavigator
         {
             const auto src = Misc::Convert::makeOsgVec3f(converter.toWorldPoint(pathgrid.mPoints[edge.mV0]));
             const auto dst = Misc::Convert::makeOsgVec3f(converter.toWorldPoint(pathgrid.mPoints[edge.mV1]));
-            mNavMeshManager.addOffMeshConnection(
-                ObjectId(&pathgrid),
-                toNavMeshCoordinates(mSettings.mRecast, src),
-                toNavMeshCoordinates(mSettings.mRecast, dst),
-                AreaType_pathgrid
-            );
+            mNavMeshManager.addOffMeshConnection(ObjectId(&pathgrid), toNavMeshCoordinates(mSettings.mRecast, src),
+                toNavMeshCoordinates(mSettings.mRecast, dst), AreaType_pathgrid);
         }
     }
 
diff --git a/components/detournavigator/navigatorimpl.hpp b/components/detournavigator/navigatorimpl.hpp
index a33197b8d4..200c67128a 100644
--- a/components/detournavigator/navigatorimpl.hpp
+++ b/components/detournavigator/navigatorimpl.hpp
@@ -4,8 +4,8 @@
 #include "navigator.hpp"
 #include "navmeshmanager.hpp"
 
-#include <set>
 #include <memory>
+#include <set>
 
 namespace DetourNavigator
 {
@@ -82,8 +82,8 @@ namespace DetourNavigator
         std::unordered_map<ObjectId, ObjectId> mAvoidIds;
         std::unordered_map<ObjectId, ObjectId> mWaterIds;
 
-        inline bool addObjectImpl(const ObjectId id, const ObjectShapes& shapes, const btTransform& transform,
-            const UpdateGuard* guard);
+        inline bool addObjectImpl(
+            const ObjectId id, const ObjectShapes& shapes, const btTransform& transform, const UpdateGuard* guard);
 
         inline void updateAvoidShapeId(const ObjectId id, const ObjectId avoidId, const UpdateGuard* guard);
 
@@ -98,7 +98,10 @@ namespace DetourNavigator
     class UpdateGuard
     {
     public:
-        explicit UpdateGuard(NavigatorImpl& navigator) : mImpl(navigator.mNavMeshManager) {}
+        explicit UpdateGuard(NavigatorImpl& navigator)
+            : mImpl(navigator.mNavMeshManager)
+        {
+        }
 
     private:
         NavMeshManager::UpdateGuard mImpl;
diff --git a/components/detournavigator/navigatorstub.hpp b/components/detournavigator/navigatorstub.hpp
index 8b3d3328d1..b0cd4ec387 100644
--- a/components/detournavigator/navigatorstub.hpp
+++ b/components/detournavigator/navigatorstub.hpp
@@ -26,26 +26,38 @@ namespace DetourNavigator
         void setWorldspace(std::string_view /*worldspace*/, const UpdateGuard* /*guard*/) override {}
 
         void addObject(const ObjectId /*id*/, const ObjectShapes& /*shapes*/, const btTransform& /*transform*/,
-            const UpdateGuard* /*guard*/) override {}
+            const UpdateGuard* /*guard*/) override
+        {
+        }
 
         void addObject(const ObjectId /*id*/, const DoorShapes& /*shapes*/, const btTransform& /*transform*/,
-            const UpdateGuard* /*guard*/) override {}
+            const UpdateGuard* /*guard*/) override
+        {
+        }
 
         void updateObject(const ObjectId /*id*/, const ObjectShapes& /*shapes*/, const btTransform& /*transform*/,
-            const UpdateGuard* /*guard*/) override {}
+            const UpdateGuard* /*guard*/) override
+        {
+        }
 
         void updateObject(const ObjectId /*id*/, const DoorShapes& /*shapes*/, const btTransform& /*transform*/,
-            const UpdateGuard* /*guard*/) override {}
+            const UpdateGuard* /*guard*/) override
+        {
+        }
 
         void removeObject(const ObjectId /*id*/, const UpdateGuard* /*guard*/) override {}
 
         void addWater(const osg::Vec2i& /*cellPosition*/, int /*cellSize*/, float /*level*/,
-            const UpdateGuard* /*guard*/) override {}
+            const UpdateGuard* /*guard*/) override
+        {
+        }
 
         void removeWater(const osg::Vec2i& /*cellPosition*/, const UpdateGuard* /*guard*/) override {}
 
         void addHeightfield(const osg::Vec2i& /*cellPosition*/, int /*cellSize*/, const HeightfieldShape& /*height*/,
-            const UpdateGuard* /*guard*/) override {}
+            const UpdateGuard* /*guard*/) override
+        {
+        }
 
         void removeHeightfield(const osg::Vec2i& /*cellPosition*/, const UpdateGuard* /*guard*/) override {}
 
@@ -64,30 +76,18 @@ namespace DetourNavigator
             return mEmptyNavMeshCacheItem;
         }
 
-        std::map<AgentBounds, SharedNavMeshCacheItem> getNavMeshes() const override
-        {
-            return {};
-        }
+        std::map<AgentBounds, SharedNavMeshCacheItem> getNavMeshes() const override { return {}; }
 
-        const Settings& getSettings() const override
-        {
-            return mDefaultSettings;
-        }
+        const Settings& getSettings() const override { return mDefaultSettings; }
 
-        Stats getStats() const override { return Stats {}; }
+        Stats getStats() const override { return Stats{}; }
 
-        RecastMeshTiles getRecastMeshTiles() const override
-        {
-            return {};
-        }
+        RecastMeshTiles getRecastMeshTiles() const override { return {}; }
 
-        float getMaxNavmeshAreaRealRadius() const override
-        {
-            return std::numeric_limits<float>::max();
-        }
+        float getMaxNavmeshAreaRealRadius() const override { return std::numeric_limits<float>::max(); }
 
     private:
-        Settings mDefaultSettings {};
+        Settings mDefaultSettings{};
         SharedNavMeshCacheItem mEmptyNavMeshCacheItem;
     };
 }
diff --git a/components/detournavigator/navigatorutils.cpp b/components/detournavigator/navigatorutils.cpp
index 450fab6a6d..a939d0b554 100644
--- a/components/detournavigator/navigatorutils.cpp
+++ b/components/detournavigator/navigatorutils.cpp
@@ -6,30 +6,32 @@
 namespace DetourNavigator
 {
     std::optional<osg::Vec3f> findRandomPointAroundCircle(const Navigator& navigator, const AgentBounds& agentBounds,
-        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags, float(*prng)())
+        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags, float (*prng)())
     {
         const auto navMesh = navigator.getNavMesh(agentBounds);
         if (!navMesh)
             return std::nullopt;
         const auto& settings = navigator.getSettings();
         const auto result = DetourNavigator::findRandomPointAroundCircle(navMesh->lockConst()->getImpl(),
-            toNavMeshCoordinates(settings.mRecast, agentBounds.mHalfExtents), toNavMeshCoordinates(settings.mRecast, start),
-            toNavMeshCoordinates(settings.mRecast, maxRadius), includeFlags, settings.mDetour, prng);
+            toNavMeshCoordinates(settings.mRecast, agentBounds.mHalfExtents),
+            toNavMeshCoordinates(settings.mRecast, start), toNavMeshCoordinates(settings.mRecast, maxRadius),
+            includeFlags, settings.mDetour, prng);
         if (!result)
             return std::nullopt;
         return std::optional<osg::Vec3f>(fromNavMeshCoordinates(settings.mRecast, *result));
     }
 
-    std::optional<osg::Vec3f> raycast(const Navigator& navigator, const AgentBounds& agentBounds, const osg::Vec3f& start,
-        const osg::Vec3f& end, const Flags includeFlags)
+    std::optional<osg::Vec3f> raycast(const Navigator& navigator, const AgentBounds& agentBounds,
+        const osg::Vec3f& start, const osg::Vec3f& end, const Flags includeFlags)
     {
         const auto navMesh = navigator.getNavMesh(agentBounds);
         if (navMesh == nullptr)
             return std::nullopt;
         const auto& settings = navigator.getSettings();
         const auto result = DetourNavigator::raycast(navMesh->lockConst()->getImpl(),
-            toNavMeshCoordinates(settings.mRecast, agentBounds.mHalfExtents), toNavMeshCoordinates(settings.mRecast, start),
-            toNavMeshCoordinates(settings.mRecast, end), includeFlags, settings.mDetour);
+            toNavMeshCoordinates(settings.mRecast, agentBounds.mHalfExtents),
+            toNavMeshCoordinates(settings.mRecast, start), toNavMeshCoordinates(settings.mRecast, end), includeFlags,
+            settings.mDetour);
         if (!result)
             return std::nullopt;
         return fromNavMeshCoordinates(settings.mRecast, *result);
diff --git a/components/detournavigator/navigatorutils.hpp b/components/detournavigator/navigatorutils.hpp
index 01a405d89e..f7f5a93194 100644
--- a/components/detournavigator/navigatorutils.hpp
+++ b/components/detournavigator/navigatorutils.hpp
@@ -3,9 +3,9 @@
 
 #include "findsmoothpath.hpp"
 #include "flags.hpp"
-#include "settings.hpp"
 #include "navigator.hpp"
 #include "navmeshcacheitem.hpp"
+#include "settings.hpp"
 
 #include <components/misc/guarded.hpp>
 
@@ -29,18 +29,15 @@ namespace DetourNavigator
         const osg::Vec3f& start, const osg::Vec3f& end, const Flags includeFlags, const AreaCosts& areaCosts,
         float endTolerance, OutputIterator out)
     {
-        static_assert(
-            std::is_same<
-                typename std::iterator_traits<OutputIterator>::iterator_category,
-                std::output_iterator_tag
-            >::value,
-            "out is not an OutputIterator"
-        );
+        static_assert(std::is_same<typename std::iterator_traits<OutputIterator>::iterator_category,
+                          std::output_iterator_tag>::value,
+            "out is not an OutputIterator");
         const auto navMesh = navigator.getNavMesh(agentBounds);
         if (navMesh == nullptr)
             return Status::NavMeshNotFound;
         const auto settings = navigator.getSettings();
-        return findSmoothPath(navMesh->lockConst()->getImpl(), toNavMeshCoordinates(settings.mRecast, agentBounds.mHalfExtents),
+        return findSmoothPath(navMesh->lockConst()->getImpl(),
+            toNavMeshCoordinates(settings.mRecast, agentBounds.mHalfExtents),
             toNavMeshCoordinates(settings.mRecast, stepSize), toNavMeshCoordinates(settings.mRecast, start),
             toNavMeshCoordinates(settings.mRecast, end), includeFlags, areaCosts, settings, endTolerance, out);
     }
@@ -54,7 +51,7 @@ namespace DetourNavigator
      * @return not empty optional with position if point is found and empty optional if point is not found.
      */
     std::optional<osg::Vec3f> findRandomPointAroundCircle(const Navigator& navigator, const AgentBounds& agentBounds,
-        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags, float(*prng)());
+        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags, float (*prng)());
 
     /**
      * @brief raycast finds farest navmesh point from start on a line from start to end that has path from start.
@@ -64,8 +61,8 @@ namespace DetourNavigator
      * @param includeFlags setup allowed surfaces for actor to walk.
      * @return not empty optional with position if point is found and empty optional if point is not found.
      */
-    std::optional<osg::Vec3f> raycast(const Navigator& navigator, const AgentBounds& agentBounds, const osg::Vec3f& start,
-        const osg::Vec3f& end, const Flags includeFlags);
+    std::optional<osg::Vec3f> raycast(const Navigator& navigator, const AgentBounds& agentBounds,
+        const osg::Vec3f& start, const osg::Vec3f& end, const Flags includeFlags);
 }
 
 #endif
diff --git a/components/detournavigator/navmeshcacheitem.cpp b/components/detournavigator/navmeshcacheitem.cpp
index 41a177a367..51fee2c21b 100644
--- a/components/detournavigator/navmeshcacheitem.cpp
+++ b/components/detournavigator/navmeshcacheitem.cpp
@@ -1,8 +1,8 @@
-#include "tileposition.hpp"
-#include "navmeshtilescache.hpp"
-#include "navmeshtileview.hpp"
 #include "navmeshcacheitem.hpp"
 #include "navmeshdata.hpp"
+#include "navmeshtilescache.hpp"
+#include "navmeshtileview.hpp"
+#include "tileposition.hpp"
 
 #include <components/misc/guarded.hpp>
 
@@ -68,8 +68,8 @@ namespace DetourNavigator
         return navMesh.getTileAt(position.x(), position.y(), layer);
     }
 
-    UpdateNavMeshStatus NavMeshCacheItem::updateTile(const TilePosition& position, NavMeshTilesCache::Value&& cached,
-        NavMeshData&& navMeshData)
+    UpdateNavMeshStatus NavMeshCacheItem::updateTile(
+        const TilePosition& position, NavMeshTilesCache::Value&& cached, NavMeshData&& navMeshData)
     {
         const dtMeshTile* currentTile = getTile(*mImpl, position);
         if (currentTile != nullptr
@@ -86,7 +86,7 @@ namespace DetourNavigator
             if (tile == mUsedTiles.end())
             {
                 mUsedTiles.emplace_hint(tile, position,
-                    Tile {Version {mVersion.mRevision, 1}, std::move(cached), std::move(navMeshData)});
+                    Tile{ Version{ mVersion.mRevision, 1 }, std::move(cached), std::move(navMeshData) });
             }
             else
             {
@@ -104,7 +104,10 @@ namespace DetourNavigator
                 mUsedTiles.erase(position);
                 ++mVersion.mRevision;
             }
-            return UpdateNavMeshStatusBuilder().removed(removed).failed((addStatus & DT_OUT_OF_MEMORY) != 0).getResult();
+            return UpdateNavMeshStatusBuilder()
+                .removed(removed)
+                .failed((addStatus & DT_OUT_OF_MEMORY) != 0)
+                .getResult();
         }
     }
 
diff --git a/components/detournavigator/navmeshcacheitem.hpp b/components/detournavigator/navmeshcacheitem.hpp
index 005c2a4263..ddf63368ba 100644
--- a/components/detournavigator/navmeshcacheitem.hpp
+++ b/components/detournavigator/navmeshcacheitem.hpp
@@ -1,14 +1,14 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVMESHCACHEITEM_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVMESHCACHEITEM_H
 
+#include "navmeshdata.hpp"
+#include "navmeshtilescache.hpp"
 #include "sharednavmesh.hpp"
 #include "tileposition.hpp"
-#include "navmeshtilescache.hpp"
-#include "navmeshdata.hpp"
 #include "version.hpp"
 
-#include <map>
 #include <iosfwd>
+#include <map>
 #include <set>
 
 struct dtMeshTile;
@@ -41,7 +41,9 @@ namespace DetourNavigator
         UpdateNavMeshStatusBuilder() = default;
 
         explicit UpdateNavMeshStatusBuilder(UpdateNavMeshStatus value)
-            : mResult(value) {}
+            : mResult(value)
+        {
+        }
 
         UpdateNavMeshStatusBuilder removed(bool value)
         {
@@ -79,10 +81,7 @@ namespace DetourNavigator
             return *this;
         }
 
-        UpdateNavMeshStatus getResult() const
-        {
-            return mResult;
-        }
+        UpdateNavMeshStatus getResult() const { return mResult; }
 
     private:
         UpdateNavMeshStatus mResult = UpdateNavMeshStatus::ignored;
@@ -105,19 +104,16 @@ namespace DetourNavigator
     public:
         NavMeshCacheItem(const NavMeshPtr& impl, std::size_t generation)
             : mImpl(impl)
-            , mVersion {generation, 0}
+            , mVersion{ generation, 0 }
         {
         }
 
-        const dtNavMesh& getImpl() const
-        {
-            return *mImpl;
-        }
+        const dtNavMesh& getImpl() const { return *mImpl; }
 
         const Version& getVersion() const { return mVersion; }
 
-        UpdateNavMeshStatus updateTile(const TilePosition& position, NavMeshTilesCache::Value&& cached,
-                                       NavMeshData&& navMeshData);
+        UpdateNavMeshStatus updateTile(
+            const TilePosition& position, NavMeshTilesCache::Value&& cached, NavMeshData&& navMeshData);
 
         UpdateNavMeshStatus removeTile(const TilePosition& position);
 
diff --git a/components/detournavigator/navmeshdata.hpp b/components/detournavigator/navmeshdata.hpp
index 6e400af3bc..a5063d7338 100644
--- a/components/detournavigator/navmeshdata.hpp
+++ b/components/detournavigator/navmeshdata.hpp
@@ -9,10 +9,7 @@ namespace DetourNavigator
 {
     struct NavMeshDataValueDeleter
     {
-        void operator ()(unsigned char* value) const
-        {
-            dtFree(value);
-        }
+        void operator()(unsigned char* value) const { dtFree(value); }
     };
 
     using NavMeshDataValue = std::unique_ptr<unsigned char, NavMeshDataValueDeleter>;
@@ -27,7 +24,8 @@ namespace DetourNavigator
         NavMeshData(unsigned char* value, int size)
             : mValue(value)
             , mSize(size)
-        {}
+        {
+        }
     };
 }
 
diff --git a/components/detournavigator/navmeshdb.cpp b/components/detournavigator/navmeshdb.cpp
index c1fcf07796..d5c6fdb46b 100644
--- a/components/detournavigator/navmeshdb.cpp
+++ b/components/detournavigator/navmeshdb.cpp
@@ -2,9 +2,9 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/compression.hpp>
+#include <components/misc/strings/format.hpp>
 #include <components/sqlite3/db.hpp>
 #include <components/sqlite3/request.hpp>
-#include <components/misc/strings/format.hpp>
 
 #include <DetourAlloc.h>
 
@@ -158,26 +158,28 @@ namespace DetourNavigator
     {
         switch (value)
         {
-            case ShapeType::Collision: return stream << "collision";
-            case ShapeType::Avoid: return stream << "avoid";
+            case ShapeType::Collision:
+                return stream << "collision";
+            case ShapeType::Avoid:
+                return stream << "avoid";
         }
         return stream << "unknown shape type (" << static_cast<std::underlying_type_t<ShapeType>>(value) << ")";
     }
 
     NavMeshDb::NavMeshDb(std::string_view path, std::uint64_t maxFileSize)
         : mDb(Sqlite3::makeDb(path, schema))
-        , mGetMaxTileId(*mDb, DbQueries::GetMaxTileId {})
-        , mFindTile(*mDb, DbQueries::FindTile {})
-        , mGetTileData(*mDb, DbQueries::GetTileData {})
-        , mInsertTile(*mDb, DbQueries::InsertTile {})
-        , mUpdateTile(*mDb, DbQueries::UpdateTile {})
-        , mDeleteTilesAt(*mDb, DbQueries::DeleteTilesAt {})
-        , mDeleteTilesAtExcept(*mDb, DbQueries::DeleteTilesAtExcept {})
-        , mDeleteTilesOutsideRange(*mDb, DbQueries::DeleteTilesOutsideRange {})
-        , mGetMaxShapeId(*mDb, DbQueries::GetMaxShapeId {})
-        , mFindShapeId(*mDb, DbQueries::FindShapeId {})
-        , mInsertShape(*mDb, DbQueries::InsertShape {})
-        , mVacuum(*mDb, DbQueries::Vacuum {})
+        , mGetMaxTileId(*mDb, DbQueries::GetMaxTileId{})
+        , mFindTile(*mDb, DbQueries::FindTile{})
+        , mGetTileData(*mDb, DbQueries::GetTileData{})
+        , mInsertTile(*mDb, DbQueries::InsertTile{})
+        , mUpdateTile(*mDb, DbQueries::UpdateTile{})
+        , mDeleteTilesAt(*mDb, DbQueries::DeleteTilesAt{})
+        , mDeleteTilesAtExcept(*mDb, DbQueries::DeleteTilesAtExcept{})
+        , mDeleteTilesOutsideRange(*mDb, DbQueries::DeleteTilesOutsideRange{})
+        , mGetMaxShapeId(*mDb, DbQueries::GetMaxShapeId{})
+        , mFindShapeId(*mDb, DbQueries::FindShapeId{})
+        , mInsertShape(*mDb, DbQueries::InsertShape{})
+        , mVacuum(*mDb, DbQueries::Vacuum{})
     {
         const std::uint64_t dbPageSize = getPageSize(*mDb);
         if (dbPageSize == 0)
@@ -192,13 +194,13 @@ namespace DetourNavigator
 
     TileId NavMeshDb::getMaxTileId()
     {
-        TileId tileId {0};
+        TileId tileId{ 0 };
         request(*mDb, mGetMaxTileId, &tileId, 1);
         return tileId;
     }
 
-    std::optional<Tile> NavMeshDb::findTile(std::string_view worldspace,
-        const TilePosition& tilePosition, const std::vector<std::byte>& input)
+    std::optional<Tile> NavMeshDb::findTile(
+        std::string_view worldspace, const TilePosition& tilePosition, const std::vector<std::byte>& input)
     {
         Tile result;
         auto row = std::tie(result.mTileId, result.mVersion);
@@ -208,8 +210,8 @@ namespace DetourNavigator
         return result;
     }
 
-    std::optional<TileData> NavMeshDb::getTileData(std::string_view worldspace,
-        const TilePosition& tilePosition, const std::vector<std::byte>& input)
+    std::optional<TileData> NavMeshDb::getTileData(
+        std::string_view worldspace, const TilePosition& tilePosition, const std::vector<std::byte>& input)
     {
         TileData result;
         auto row = std::tie(result.mTileId, result.mVersion, result.mData);
@@ -239,7 +241,8 @@ namespace DetourNavigator
         return execute(*mDb, mDeleteTilesAt, worldspace, tilePosition);
     }
 
-    int NavMeshDb::deleteTilesAtExcept(std::string_view worldspace, const TilePosition& tilePosition, TileId excludeTileId)
+    int NavMeshDb::deleteTilesAtExcept(
+        std::string_view worldspace, const TilePosition& tilePosition, TileId excludeTileId)
     {
         return execute(*mDb, mDeleteTilesAtExcept, worldspace, tilePosition, excludeTileId);
     }
@@ -251,13 +254,12 @@ namespace DetourNavigator
 
     ShapeId NavMeshDb::getMaxShapeId()
     {
-        ShapeId shapeId {0};
+        ShapeId shapeId{ 0 };
         request(*mDb, mGetMaxShapeId, &shapeId, 1);
         return shapeId;
     }
 
-    std::optional<ShapeId> NavMeshDb::findShapeId(std::string_view name, ShapeType type,
-        const Sqlite3::ConstBlob& hash)
+    std::optional<ShapeId> NavMeshDb::findShapeId(std::string_view name, ShapeType type, const Sqlite3::ConstBlob& hash)
     {
         ShapeId shapeId;
         if (&shapeId == request(*mDb, mFindShapeId, &shapeId, 1, name, type, hash))
@@ -265,8 +267,7 @@ namespace DetourNavigator
         return shapeId;
     }
 
-    int NavMeshDb::insertShape(ShapeId shapeId, std::string_view name, ShapeType type,
-        const Sqlite3::ConstBlob& hash)
+    int NavMeshDb::insertShape(ShapeId shapeId, std::string_view name, ShapeType type, const Sqlite3::ConstBlob& hash)
     {
         return execute(*mDb, mInsertShape, shapeId, name, type, hash);
     }
@@ -347,8 +348,8 @@ namespace DetourNavigator
             return deleteTilesAtQuery;
         }
 
-        void DeleteTilesAt::bind(sqlite3& db, sqlite3_stmt& statement, std::string_view worldspace,
-            const TilePosition& tilePosition)
+        void DeleteTilesAt::bind(
+            sqlite3& db, sqlite3_stmt& statement, std::string_view worldspace, const TilePosition& tilePosition)
         {
             Sqlite3::bindParameter(db, statement, ":worldspace", worldspace);
             Sqlite3::bindParameter(db, statement, ":tile_position_x", tilePosition.x());
@@ -374,8 +375,8 @@ namespace DetourNavigator
             return deleteTilesOutsideRangeQuery;
         }
 
-        void DeleteTilesOutsideRange::bind(sqlite3& db, sqlite3_stmt& statement, std::string_view worldspace,
-            const TilesPositionsRange& range)
+        void DeleteTilesOutsideRange::bind(
+            sqlite3& db, sqlite3_stmt& statement, std::string_view worldspace, const TilesPositionsRange& range)
         {
             Sqlite3::bindParameter(db, statement, ":worldspace", worldspace);
             Sqlite3::bindParameter(db, statement, ":begin_tile_position_x", range.mBegin.x());
@@ -394,8 +395,8 @@ namespace DetourNavigator
             return findShapeIdQuery;
         }
 
-        void FindShapeId::bind(sqlite3& db, sqlite3_stmt& statement, std::string_view name,
-            ShapeType type, const Sqlite3::ConstBlob& hash)
+        void FindShapeId::bind(
+            sqlite3& db, sqlite3_stmt& statement, std::string_view name, ShapeType type, const Sqlite3::ConstBlob& hash)
         {
             Sqlite3::bindParameter(db, statement, ":name", name);
             Sqlite3::bindParameter(db, statement, ":type", static_cast<int>(type));
diff --git a/components/detournavigator/navmeshdb.hpp b/components/detournavigator/navmeshdb.hpp
index 812452206e..3cf1bdcdca 100644
--- a/components/detournavigator/navmeshdb.hpp
+++ b/components/detournavigator/navmeshdb.hpp
@@ -14,13 +14,13 @@
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
+#include <memory>
 #include <optional>
 #include <stdexcept>
 #include <string_view>
 #include <tuple>
 #include <utility>
 #include <vector>
-#include <memory>
 
 struct sqlite3;
 struct sqlite3_stmt;
@@ -93,8 +93,8 @@ namespace DetourNavigator
         struct DeleteTilesAt
         {
             static std::string_view text() noexcept;
-            static void bind(sqlite3& db, sqlite3_stmt& statement, std::string_view worldspace,
-                const TilePosition& tilePosition);
+            static void bind(
+                sqlite3& db, sqlite3_stmt& statement, std::string_view worldspace, const TilePosition& tilePosition);
         };
 
         struct DeleteTilesAtExcept
@@ -107,8 +107,8 @@ namespace DetourNavigator
         struct DeleteTilesOutsideRange
         {
             static std::string_view text() noexcept;
-            static void bind(sqlite3& db, sqlite3_stmt& statement, std::string_view worldspace,
-                const TilesPositionsRange& range);
+            static void bind(
+                sqlite3& db, sqlite3_stmt& statement, std::string_view worldspace, const TilesPositionsRange& range);
         };
 
         struct GetMaxShapeId
@@ -120,8 +120,8 @@ namespace DetourNavigator
         struct FindShapeId
         {
             static std::string_view text() noexcept;
-            static void bind(sqlite3& db, sqlite3_stmt& statement, std::string_view name,
-                ShapeType type, const Sqlite3::ConstBlob& hash);
+            static void bind(sqlite3& db, sqlite3_stmt& statement, std::string_view name, ShapeType type,
+                const Sqlite3::ConstBlob& hash);
         };
 
         struct InsertShape
@@ -147,11 +147,11 @@ namespace DetourNavigator
 
         TileId getMaxTileId();
 
-        std::optional<Tile> findTile(std::string_view worldspace,
-            const TilePosition& tilePosition, const std::vector<std::byte>& input);
+        std::optional<Tile> findTile(
+            std::string_view worldspace, const TilePosition& tilePosition, const std::vector<std::byte>& input);
 
-        std::optional<TileData> getTileData(std::string_view worldspace,
-            const TilePosition& tilePosition, const std::vector<std::byte>& input);
+        std::optional<TileData> getTileData(
+            std::string_view worldspace, const TilePosition& tilePosition, const std::vector<std::byte>& input);
 
         int insertTile(TileId tileId, std::string_view worldspace, const TilePosition& tilePosition,
             TileVersion version, const std::vector<std::byte>& input, const std::vector<std::byte>& data);
diff --git a/components/detournavigator/navmeshdbutils.cpp b/components/detournavigator/navmeshdbutils.cpp
index d2379c4e53..001259b6ff 100644
--- a/components/detournavigator/navmeshdbutils.cpp
+++ b/components/detournavigator/navmeshdbutils.cpp
@@ -12,17 +12,17 @@ namespace DetourNavigator
 {
     namespace
     {
-        std::optional<ShapeId> findShapeId(NavMeshDb& db, std::string_view name, ShapeType type,
-            const std::string& hash)
+        std::optional<ShapeId> findShapeId(
+            NavMeshDb& db, std::string_view name, ShapeType type, const std::string& hash)
         {
-            const Sqlite3::ConstBlob hashData {hash.data(), static_cast<int>(hash.size())};
+            const Sqlite3::ConstBlob hashData{ hash.data(), static_cast<int>(hash.size()) };
             return db.findShapeId(name, type, hashData);
         }
 
-        ShapeId getShapeId(NavMeshDb& db, std::string_view name, ShapeType type,
-            const std::string& hash, ShapeId& nextShapeId)
+        ShapeId getShapeId(
+            NavMeshDb& db, std::string_view name, ShapeType type, const std::string& hash, ShapeId& nextShapeId)
         {
-            const Sqlite3::ConstBlob hashData {hash.data(), static_cast<int>(hash.size())};
+            const Sqlite3::ConstBlob hashData{ hash.data(), static_cast<int>(hash.size()) };
             if (const auto existingShapeId = db.findShapeId(name, type, hashData))
                 return *existingShapeId;
             const ShapeId newShapeId = nextShapeId;
@@ -38,11 +38,14 @@ namespace DetourNavigator
         switch (source.mAreaType)
         {
             case AreaType_null:
-                return getShapeId(db, source.mShape->mFileName, ShapeType::Avoid, source.mShape->mFileHash, nextShapeId);
+                return getShapeId(
+                    db, source.mShape->mFileName, ShapeType::Avoid, source.mShape->mFileHash, nextShapeId);
             case AreaType_ground:
-                return getShapeId(db, source.mShape->mFileName, ShapeType::Collision, source.mShape->mFileHash, nextShapeId);
+                return getShapeId(
+                    db, source.mShape->mFileName, ShapeType::Collision, source.mShape->mFileHash, nextShapeId);
             default:
-                Log(Debug::Warning) << "Trying to resolve recast mesh source with unsupported area type: " << source.mAreaType;
+                Log(Debug::Warning) << "Trying to resolve recast mesh source with unsupported area type: "
+                                    << source.mAreaType;
                 assert(false);
                 return ShapeId(0);
         }
@@ -57,7 +60,8 @@ namespace DetourNavigator
             case AreaType_ground:
                 return findShapeId(db, source.mShape->mFileName, ShapeType::Collision, source.mShape->mFileHash);
             default:
-                Log(Debug::Warning) << "Trying to resolve recast mesh source with unsupported area type: " << source.mAreaType;
+                Log(Debug::Warning) << "Trying to resolve recast mesh source with unsupported area type: "
+                                    << source.mAreaType;
                 return std::nullopt;
         }
     }
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index a86dae75e8..41fb4fe191 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -5,11 +5,11 @@
 #include "makenavmesh.hpp"
 #include "navmeshcacheitem.hpp"
 #include "settings.hpp"
-#include "waitconditiontype.hpp"
 #include "settingsutils.hpp"
+#include "waitconditiontype.hpp"
 
-#include <components/debug/debuglog.hpp>
 #include <components/bullethelpers/heightfield.hpp>
+#include <components/debug/debuglog.hpp>
 #include <components/misc/convert.hpp>
 
 #include <osg/io_utils>
@@ -42,7 +42,8 @@ namespace DetourNavigator
     {
         TileBounds makeBounds(const RecastSettings& settings, const osg::Vec2f& center, int maxTiles)
         {
-            const float radius = fromNavMeshCoordinates(settings, std::ceil(std::sqrt(static_cast<float>(maxTiles) / osg::PIf) + 1) * getTileSize(settings));
+            const float radius = fromNavMeshCoordinates(
+                settings, std::ceil(std::sqrt(static_cast<float>(maxTiles) / osg::PIf) + 1) * getTileSize(settings));
             TileBounds result;
             result.mMin = center - osg::Vec2f(radius, radius);
             result.mMax = center + osg::Vec2f(radius, radius);
@@ -55,7 +56,8 @@ namespace DetourNavigator
         , mRecastMeshManager(settings.mRecast)
         , mOffMeshConnectionsManager(settings.mRecast)
         , mAsyncNavMeshUpdater(settings, mRecastMeshManager, mOffMeshConnectionsManager, std::move(db))
-    {}
+    {
+    }
 
     void NavMeshManager::setWorldspace(std::string_view worldspace, const UpdateGuard* guard)
     {
@@ -69,18 +71,19 @@ namespace DetourNavigator
 
     void NavMeshManager::updateBounds(const osg::Vec3f& playerPosition, const UpdateGuard* guard)
     {
-        const TileBounds bounds = makeBounds(mSettings.mRecast, osg::Vec2f(playerPosition.x(), playerPosition.y()),
-                                             mSettings.mMaxTilesNumber);
+        const TileBounds bounds = makeBounds(
+            mSettings.mRecast, osg::Vec2f(playerPosition.x(), playerPosition.y()), mSettings.mMaxTilesNumber);
         mRecastMeshManager.setBounds(bounds, getImpl(guard));
     }
 
     bool NavMeshManager::addObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
-                                   const AreaType areaType, const UpdateGuard* guard)
+        const AreaType areaType, const UpdateGuard* guard)
     {
         return mRecastMeshManager.addObject(id, shape, transform, areaType, getImpl(guard));
     }
 
-    bool NavMeshManager::updateObject(const ObjectId id, const btTransform& transform, const AreaType areaType, const UpdateGuard* guard)
+    bool NavMeshManager::updateObject(
+        const ObjectId id, const btTransform& transform, const AreaType areaType, const UpdateGuard* guard)
     {
         return mRecastMeshManager.updateObject(id, transform, areaType, getImpl(guard));
     }
@@ -100,7 +103,8 @@ namespace DetourNavigator
         mRecastMeshManager.removeWater(cellPosition, getImpl(guard));
     }
 
-    void NavMeshManager::addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const HeightfieldShape& shape, const UpdateGuard* guard)
+    void NavMeshManager::addHeightfield(
+        const osg::Vec2i& cellPosition, int cellSize, const HeightfieldShape& shape, const UpdateGuard* guard)
     {
         mRecastMeshManager.addHeightfield(cellPosition, cellSize, shape, getImpl(guard));
     }
@@ -115,8 +119,8 @@ namespace DetourNavigator
         auto cached = mCache.find(agentBounds);
         if (cached != mCache.end())
             return;
-        mCache.insert(std::make_pair(agentBounds,
-            std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), ++mGenerationCounter)));
+        mCache.insert(std::make_pair(
+            agentBounds, std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), ++mGenerationCounter)));
         mPlayerTile.reset();
         Log(Debug::Debug) << "cache add for agent=" << agentBounds;
     }
@@ -133,9 +137,10 @@ namespace DetourNavigator
         return true;
     }
 
-    void NavMeshManager::addOffMeshConnection(const ObjectId id, const osg::Vec3f& start, const osg::Vec3f& end, const AreaType areaType)
+    void NavMeshManager::addOffMeshConnection(
+        const ObjectId id, const osg::Vec3f& start, const osg::Vec3f& end, const AreaType areaType)
     {
-        mOffMeshConnectionsManager.add(id, OffMeshConnection {start, end, areaType});
+        mOffMeshConnectionsManager.add(id, OffMeshConnection{ start, end, areaType });
 
         const auto startTilePosition = getTilePosition(mSettings.mRecast, start);
         const auto endTilePosition = getTilePosition(mSettings.mRecast, end);
@@ -155,10 +160,10 @@ namespace DetourNavigator
 
     void NavMeshManager::update(const osg::Vec3f& playerPosition, const UpdateGuard* guard)
     {
-        const auto playerTile = getTilePosition(mSettings.mRecast,
-            toNavMeshCoordinates(mSettings.mRecast, playerPosition));
-        if (mLastRecastMeshManagerRevision == mRecastMeshManager.getRevision()
-                && mPlayerTile.has_value() && *mPlayerTile == playerTile)
+        const auto playerTile
+            = getTilePosition(mSettings.mRecast, toNavMeshCoordinates(mSettings.mRecast, playerPosition));
+        if (mLastRecastMeshManagerRevision == mRecastMeshManager.getRevision() && mPlayerTile.has_value()
+            && *mPlayerTile == playerTile)
             return;
         mLastRecastMeshManagerRevision = mRecastMeshManager.getRevision();
         mPlayerTile = playerTile;
@@ -177,8 +182,7 @@ namespace DetourNavigator
             const auto locked = cached->lockConst();
             const auto& navMesh = locked->getImpl();
             const auto maxTiles = std::min(mSettings.mMaxTilesNumber, navMesh.getParams()->maxTiles);
-            getTilesPositions(range, [&] (const TilePosition& tile)
-            {
+            getTilesPositions(range, [&](const TilePosition& tile) {
                 if (changedTiles.find(tile) != changedTiles.end())
                     return;
                 const bool shouldAdd = shouldAddTile(tile, playerTile, maxTiles);
@@ -190,8 +194,8 @@ namespace DetourNavigator
             });
         }
         mAsyncNavMeshUpdater.post(agentBounds, cached, playerTile, mWorldspace, tilesToPost);
-        Log(Debug::Debug) << "Cache update posted for agent=" << agentBounds <<
-            " playerTile=" << playerTile << " recastMeshManagerRevision=" << mLastRecastMeshManagerRevision;
+        Log(Debug::Debug) << "Cache update posted for agent=" << agentBounds << " playerTile=" << playerTile
+                          << " recastMeshManagerRevision=" << mLastRecastMeshManagerRevision;
     }
 
     void NavMeshManager::wait(WaitConditionType waitConditionType, Loading::Listener* listener)
@@ -211,14 +215,13 @@ namespace DetourNavigator
 
     Stats NavMeshManager::getStats() const
     {
-        return Stats {.mUpdater = mAsyncNavMeshUpdater.getStats()};
+        return Stats{ .mUpdater = mAsyncNavMeshUpdater.getStats() };
     }
 
     RecastMeshTiles NavMeshManager::getRecastMeshTiles() const
     {
         RecastMeshTiles result;
-        getTilesPositions(mRecastMeshManager.getRange(), [&] (const TilePosition& v)
-        {
+        getTilesPositions(mRecastMeshManager.getRange(), [&](const TilePosition& v) {
             if (auto mesh = mRecastMeshManager.getCachedMesh(mWorldspace, v))
                 result.emplace(v, std::move(mesh));
         });
diff --git a/components/detournavigator/navmeshmanager.hpp b/components/detournavigator/navmeshmanager.hpp
index d9c378a19c..332d9e25f7 100644
--- a/components/detournavigator/navmeshmanager.hpp
+++ b/components/detournavigator/navmeshmanager.hpp
@@ -1,12 +1,12 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVMESHMANAGER_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVMESHMANAGER_H
 
+#include "agentbounds.hpp"
 #include "asyncnavmeshupdater.hpp"
+#include "heightfieldshape.hpp"
 #include "offmeshconnectionsmanager.hpp"
 #include "recastmeshtiles.hpp"
 #include "waitconditiontype.hpp"
-#include "heightfieldshape.hpp"
-#include "agentbounds.hpp"
 
 #include <osg/Vec3f>
 
@@ -23,7 +23,10 @@ namespace DetourNavigator
         class UpdateGuard
         {
         public:
-            explicit UpdateGuard(NavMeshManager& manager) : mImpl(manager.mRecastMeshManager) {}
+            explicit UpdateGuard(NavMeshManager& manager)
+                : mImpl(manager.mRecastMeshManager)
+            {
+            }
 
             friend const TileCachedRecastMeshManager::UpdateGuard* getImpl(const UpdateGuard* guard)
             {
@@ -43,8 +46,7 @@ namespace DetourNavigator
         bool addObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
             const AreaType areaType, const UpdateGuard* guard);
 
-        bool updateObject(ObjectId id, const btTransform& transform, AreaType areaType,
-            const UpdateGuard* guard);
+        bool updateObject(ObjectId id, const btTransform& transform, AreaType areaType, const UpdateGuard* guard);
 
         void removeObject(const ObjectId id, const UpdateGuard* guard);
 
@@ -54,14 +56,15 @@ namespace DetourNavigator
 
         void removeWater(const osg::Vec2i& cellPosition, const UpdateGuard* guard);
 
-        void addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const HeightfieldShape& shape,
-            const UpdateGuard* guard);
+        void addHeightfield(
+            const osg::Vec2i& cellPosition, int cellSize, const HeightfieldShape& shape, const UpdateGuard* guard);
 
         void removeHeightfield(const osg::Vec2i& cellPosition, const UpdateGuard* guard);
 
         bool reset(const AgentBounds& agentBounds);
 
-        void addOffMeshConnection(const ObjectId id, const osg::Vec3f& start, const osg::Vec3f& end, const AreaType areaType);
+        void addOffMeshConnection(
+            const ObjectId id, const osg::Vec3f& start, const osg::Vec3f& end, const AreaType areaType);
 
         void removeOffMeshConnections(const ObjectId id);
 
diff --git a/components/detournavigator/navmeshtilescache.cpp b/components/detournavigator/navmeshtilescache.cpp
index 0f6725cc72..0a7456d78b 100644
--- a/components/detournavigator/navmeshtilescache.cpp
+++ b/components/detournavigator/navmeshtilescache.cpp
@@ -6,11 +6,16 @@
 namespace DetourNavigator
 {
     NavMeshTilesCache::NavMeshTilesCache(const std::size_t maxNavMeshDataSize)
-        : mMaxNavMeshDataSize(maxNavMeshDataSize), mUsedNavMeshDataSize(0), mFreeNavMeshDataSize(0),
-          mHitCount(0), mGetCount(0) {}
+        : mMaxNavMeshDataSize(maxNavMeshDataSize)
+        , mUsedNavMeshDataSize(0)
+        , mFreeNavMeshDataSize(0)
+        , mHitCount(0)
+        , mGetCount(0)
+    {
+    }
 
-    NavMeshTilesCache::Value NavMeshTilesCache::get(const AgentBounds& agentBounds, const TilePosition& changedTile,
-        const RecastMesh& recastMesh)
+    NavMeshTilesCache::Value NavMeshTilesCache::get(
+        const AgentBounds& agentBounds, const TilePosition& changedTile, const RecastMesh& recastMesh)
     {
         const std::lock_guard<std::mutex> lock(mMutex);
 
@@ -41,11 +46,12 @@ namespace DetourNavigator
         while (!mFreeItems.empty() && mUsedNavMeshDataSize + itemSize > mMaxNavMeshDataSize)
             removeLeastRecentlyUsed();
 
-        RecastMeshData key {recastMesh.getMesh(), recastMesh.getWater(),
-                    recastMesh.getHeightfields(), recastMesh.getFlatHeightfields()};
+        RecastMeshData key{ recastMesh.getMesh(), recastMesh.getWater(), recastMesh.getHeightfields(),
+            recastMesh.getFlatHeightfields() };
 
         const auto iterator = mFreeItems.emplace(mFreeItems.end(), agentBounds, changedTile, std::move(key), itemSize);
-        const auto emplaced = mValues.emplace(std::make_tuple(agentBounds, changedTile, std::cref(iterator->mRecastMeshData)), iterator);
+        const auto emplaced = mValues.emplace(
+            std::make_tuple(agentBounds, changedTile, std::cref(iterator->mRecastMeshData)), iterator);
 
         if (!emplaced.second)
         {
diff --git a/components/detournavigator/navmeshtilescache.hpp b/components/detournavigator/navmeshtilescache.hpp
index 458f900854..51f9fcb94f 100644
--- a/components/detournavigator/navmeshtilescache.hpp
+++ b/components/detournavigator/navmeshtilescache.hpp
@@ -1,17 +1,17 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVMESHTILESCACHE_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVMESHTILESCACHE_H
 
+#include "agentbounds.hpp"
 #include "preparednavmeshdata.hpp"
 #include "recastmesh.hpp"
 #include "tileposition.hpp"
-#include "agentbounds.hpp"
 
 #include <atomic>
-#include <map>
-#include <list>
-#include <mutex>
 #include <cassert>
 #include <cstring>
+#include <list>
+#include <map>
+#include <mutex>
 #include <vector>
 
 namespace DetourNavigator
@@ -24,22 +24,22 @@ namespace DetourNavigator
         std::vector<FlatHeightfield> mFlatHeightfields;
     };
 
-    inline bool operator <(const RecastMeshData& lhs, const RecastMeshData& rhs)
+    inline bool operator<(const RecastMeshData& lhs, const RecastMeshData& rhs)
     {
         return std::tie(lhs.mMesh, lhs.mWater, lhs.mHeightfields, lhs.mFlatHeightfields)
-                < std::tie(rhs.mMesh, rhs.mWater, rhs.mHeightfields, rhs.mFlatHeightfields);
+            < std::tie(rhs.mMesh, rhs.mWater, rhs.mHeightfields, rhs.mFlatHeightfields);
     }
 
-    inline bool operator <(const RecastMeshData& lhs, const RecastMesh& rhs)
+    inline bool operator<(const RecastMeshData& lhs, const RecastMesh& rhs)
     {
         return std::tie(lhs.mMesh, lhs.mWater, lhs.mHeightfields, lhs.mFlatHeightfields)
-                < std::tie(rhs.getMesh(), rhs.getWater(), rhs.getHeightfields(), rhs.getFlatHeightfields());
+            < std::tie(rhs.getMesh(), rhs.getWater(), rhs.getHeightfields(), rhs.getFlatHeightfields());
     }
 
-    inline bool operator <(const RecastMesh& lhs, const RecastMeshData& rhs)
+    inline bool operator<(const RecastMesh& lhs, const RecastMeshData& rhs)
     {
         return std::tie(lhs.getMesh(), lhs.getWater(), lhs.getHeightfields(), lhs.getFlatHeightfields())
-                < std::tie(rhs.mMesh, rhs.mWater, rhs.mHeightfields, rhs.mFlatHeightfields);
+            < std::tie(rhs.mMesh, rhs.mWater, rhs.mHeightfields, rhs.mFlatHeightfields);
     }
 
     struct NavMeshTilesCacheStats;
@@ -56,14 +56,15 @@ namespace DetourNavigator
             std::unique_ptr<PreparedNavMeshData> mPreparedNavMeshData;
             std::size_t mSize;
 
-            Item(const AgentBounds& agentBounds, const TilePosition& changedTile,
-                 RecastMeshData&& recastMeshData, std::size_t size)
+            Item(const AgentBounds& agentBounds, const TilePosition& changedTile, RecastMeshData&& recastMeshData,
+                std::size_t size)
                 : mUseCount(0)
                 , mAgentBounds(agentBounds)
                 , mChangedTile(changedTile)
                 , mRecastMeshData(std::move(recastMeshData))
                 , mSize(size)
-            {}
+            {
+            }
         };
 
         using ItemIterator = std::list<Item>::iterator;
@@ -72,17 +73,22 @@ namespace DetourNavigator
         {
         public:
             Value()
-                : mOwner(nullptr), mIterator() {}
+                : mOwner(nullptr)
+                , mIterator()
+            {
+            }
 
             Value(NavMeshTilesCache& owner, ItemIterator iterator)
-                : mOwner(&owner), mIterator(iterator)
+                : mOwner(&owner)
+                , mIterator(iterator)
             {
             }
 
             Value(const Value& other) = delete;
 
             Value(Value&& other)
-                : mOwner(other.mOwner), mIterator(other.mIterator)
+                : mOwner(other.mOwner)
+                , mIterator(other.mIterator)
             {
                 other.mOwner = nullptr;
             }
@@ -93,9 +99,9 @@ namespace DetourNavigator
                     mOwner->releaseItem(mIterator);
             }
 
-            Value& operator =(const Value& other) = delete;
+            Value& operator=(const Value& other) = delete;
 
-            Value& operator =(Value&& other)
+            Value& operator=(Value&& other)
             {
                 if (mOwner)
                     mOwner->releaseItem(mIterator);
@@ -108,15 +114,9 @@ namespace DetourNavigator
                 return *this;
             }
 
-            const PreparedNavMeshData& get() const
-            {
-                return *mIterator->mPreparedNavMeshData;
-            }
+            const PreparedNavMeshData& get() const { return *mIterator->mPreparedNavMeshData; }
 
-            operator bool() const
-            {
-                return mOwner;
-            }
+            operator bool() const { return mOwner; }
 
         private:
             NavMeshTilesCache* mOwner;
@@ -125,11 +125,10 @@ namespace DetourNavigator
 
         NavMeshTilesCache(const std::size_t maxNavMeshDataSize);
 
-        Value get(const AgentBounds& agentBounds, const TilePosition& changedTile,
-            const RecastMesh& recastMesh);
+        Value get(const AgentBounds& agentBounds, const TilePosition& changedTile, const RecastMesh& recastMesh);
 
-        Value set(const AgentBounds& agentBounds, const TilePosition& changedTile,
-            const RecastMesh& recastMesh, std::unique_ptr<PreparedNavMeshData>&& value);
+        Value set(const AgentBounds& agentBounds, const TilePosition& changedTile, const RecastMesh& recastMesh,
+            std::unique_ptr<PreparedNavMeshData>&& value);
 
         NavMeshTilesCacheStats getStats() const;
 
@@ -142,7 +141,9 @@ namespace DetourNavigator
         std::size_t mGetCount;
         std::list<Item> mBusyItems;
         std::list<Item> mFreeItems;
-        std::map<std::tuple<AgentBounds, TilePosition, std::reference_wrapper<const RecastMeshData>>, ItemIterator, std::less<>> mValues;
+        std::map<std::tuple<AgentBounds, TilePosition, std::reference_wrapper<const RecastMeshData>>, ItemIterator,
+            std::less<>>
+            mValues;
 
         void removeLeastRecentlyUsed();
 
diff --git a/components/detournavigator/navmeshtileview.cpp b/components/detournavigator/navmeshtileview.cpp
index d12bcecd7e..d22efcbfff 100644
--- a/components/detournavigator/navmeshtileview.cpp
+++ b/components/detournavigator/navmeshtileview.cpp
@@ -11,39 +11,18 @@
 
 inline bool operator==(const dtMeshHeader& lhs, const dtMeshHeader& rhs) noexcept
 {
-    const auto makeTuple = [] (const dtMeshHeader& v)
-    {
+    const auto makeTuple = [](const dtMeshHeader& v) {
         using DetourNavigator::ArrayRef;
-        return std::tuple(
-            v.x,
-            v.y,
-            v.layer,
-            v.userId,
-            v.polyCount,
-            v.vertCount,
-            v.maxLinkCount,
-            v.detailMeshCount,
-            v.detailVertCount,
-            v.detailTriCount,
-            v.bvNodeCount,
-            v.offMeshConCount,
-            v.offMeshBase,
-            v.walkableHeight,
-            v.walkableRadius,
-            v.walkableClimb,
-            v.detailVertCount,
-            ArrayRef(v.bmin),
-            ArrayRef(v.bmax),
-            v.bvQuantFactor
-        );
+        return std::tuple(v.x, v.y, v.layer, v.userId, v.polyCount, v.vertCount, v.maxLinkCount, v.detailMeshCount,
+            v.detailVertCount, v.detailTriCount, v.bvNodeCount, v.offMeshConCount, v.offMeshBase, v.walkableHeight,
+            v.walkableRadius, v.walkableClimb, v.detailVertCount, ArrayRef(v.bmin), ArrayRef(v.bmax), v.bvQuantFactor);
     };
     return makeTuple(lhs) == makeTuple(rhs);
 }
 
 inline bool operator==(const dtPoly& lhs, const dtPoly& rhs) noexcept
 {
-    const auto makeTuple = [] (const dtPoly& v)
-    {
+    const auto makeTuple = [](const dtPoly& v) {
         using DetourNavigator::ArrayRef;
         return std::tuple(ArrayRef(v.verts), ArrayRef(v.neis), v.flags, v.vertCount, v.areaAndtype);
     };
@@ -52,17 +31,14 @@ inline bool operator==(const dtPoly& lhs, const dtPoly& rhs) noexcept
 
 inline bool operator==(const dtPolyDetail& lhs, const dtPolyDetail& rhs) noexcept
 {
-    const auto makeTuple = [] (const dtPolyDetail& v)
-    {
-        return std::tuple(v.vertBase, v.triBase, v.vertCount, v.triCount);
-    };
+    const auto makeTuple
+        = [](const dtPolyDetail& v) { return std::tuple(v.vertBase, v.triBase, v.vertCount, v.triCount); };
     return makeTuple(lhs) == makeTuple(rhs);
 }
 
 inline bool operator==(const dtBVNode& lhs, const dtBVNode& rhs) noexcept
 {
-    const auto makeTuple = [] (const dtBVNode& v)
-    {
+    const auto makeTuple = [](const dtBVNode& v) {
         using DetourNavigator::ArrayRef;
         return std::tuple(ArrayRef(v.bmin), ArrayRef(v.bmax), v.i);
     };
@@ -71,8 +47,7 @@ inline bool operator==(const dtBVNode& lhs, const dtBVNode& rhs) noexcept
 
 inline bool operator==(const dtOffMeshConnection& lhs, const dtOffMeshConnection& rhs) noexcept
 {
-    const auto makeTuple = [] (const dtOffMeshConnection& v)
-    {
+    const auto makeTuple = [](const dtOffMeshConnection& v) {
         using DetourNavigator::ArrayRef;
         return std::tuple(ArrayRef(v.pos), v.rad, v.poly, v.flags, v.side, v.userId);
     };
@@ -91,7 +66,8 @@ namespace DetourNavigator
         if (header->version != DT_NAVMESH_VERSION)
             throw std::logic_error("Invalid navmesh version");
 
-        // Similar code to https://github.com/recastnavigation/recastnavigation/blob/c5cbd53024c8a9d8d097a4371215e3342d2fdc87/Detour/Source/DetourNavMesh.cpp#L978-L996
+        // Similar code to
+        // https://github.com/recastnavigation/recastnavigation/blob/c5cbd53024c8a9d8d097a4371215e3342d2fdc87/Detour/Source/DetourNavMesh.cpp#L978-L996
         const int headerSize = dtAlign4(sizeof(dtMeshHeader));
         const int vertsSize = dtAlign4(sizeof(float) * 3 * header->vertCount);
         const int polysSize = dtAlign4(sizeof(dtPoly) * header->polyCount);
@@ -139,18 +115,11 @@ namespace DetourNavigator
     {
         using DetourNavigator::Ref;
         using DetourNavigator::Span;
-        const auto makeTuple = [] (const DetourNavigator::NavMeshTileConstView& v)
-        {
-            return std::tuple(
-                Ref(*v.mHeader),
-                Span(v.mPolys, v.mHeader->polyCount),
-                Span(v.mVerts, v.mHeader->vertCount),
-                Span(v.mDetailMeshes, v.mHeader->detailMeshCount),
-                Span(v.mDetailVerts, v.mHeader->detailVertCount),
-                Span(v.mDetailTris, v.mHeader->detailTriCount),
-                Span(v.mBvTree, v.mHeader->bvNodeCount),
-                Span(v.mOffMeshCons, v.mHeader->offMeshConCount)
-            );
+        const auto makeTuple = [](const DetourNavigator::NavMeshTileConstView& v) {
+            return std::tuple(Ref(*v.mHeader), Span(v.mPolys, v.mHeader->polyCount),
+                Span(v.mVerts, v.mHeader->vertCount), Span(v.mDetailMeshes, v.mHeader->detailMeshCount),
+                Span(v.mDetailVerts, v.mHeader->detailVertCount), Span(v.mDetailTris, v.mHeader->detailTriCount),
+                Span(v.mBvTree, v.mHeader->bvNodeCount), Span(v.mOffMeshCons, v.mHeader->offMeshConCount));
         };
         return makeTuple(lhs) == makeTuple(rhs);
     }
diff --git a/components/detournavigator/objectid.hpp b/components/detournavigator/objectid.hpp
index 22fc792c6f..75039bb09a 100644
--- a/components/detournavigator/objectid.hpp
+++ b/components/detournavigator/objectid.hpp
@@ -20,20 +20,11 @@ namespace DetourNavigator
         {
         }
 
-        std::size_t value() const noexcept
-        {
-            return mValue;
-        }
+        std::size_t value() const noexcept { return mValue; }
 
-        friend bool operator <(const ObjectId lhs, const ObjectId rhs) noexcept
-        {
-            return lhs.mValue < rhs.mValue;
-        }
+        friend bool operator<(const ObjectId lhs, const ObjectId rhs) noexcept { return lhs.mValue < rhs.mValue; }
 
-        friend bool operator ==(const ObjectId lhs, const ObjectId rhs) noexcept
-        {
-            return lhs.mValue == rhs.mValue;
-        }
+        friend bool operator==(const ObjectId lhs, const ObjectId rhs) noexcept { return lhs.mValue == rhs.mValue; }
 
     private:
         std::size_t mValue;
@@ -45,10 +36,7 @@ namespace std
     template <>
     struct hash<DetourNavigator::ObjectId>
     {
-        std::size_t operator ()(const DetourNavigator::ObjectId value) const noexcept
-        {
-            return value.value();
-        }
+        std::size_t operator()(const DetourNavigator::ObjectId value) const noexcept { return value.value(); }
     };
 }
 
diff --git a/components/detournavigator/objecttransform.hpp b/components/detournavigator/objecttransform.hpp
index 2da9a25348..e56f5dd392 100644
--- a/components/detournavigator/objecttransform.hpp
+++ b/components/detournavigator/objecttransform.hpp
@@ -12,15 +12,9 @@ namespace DetourNavigator
         ESM::Position mPosition;
         float mScale;
 
-        friend inline auto tie(const ObjectTransform& v)
-        {
-            return std::tie(v.mPosition, v.mScale);
-        }
+        friend inline auto tie(const ObjectTransform& v) { return std::tie(v.mPosition, v.mScale); }
 
-        friend inline bool operator<(const ObjectTransform& l, const ObjectTransform& r)
-        {
-            return tie(l) < tie(r);
-        }
+        friend inline bool operator<(const ObjectTransform& l, const ObjectTransform& r) { return tie(l) < tie(r); }
     };
 }
 
diff --git a/components/detournavigator/offmeshconnection.hpp b/components/detournavigator/offmeshconnection.hpp
index 9312bc6c48..fb8b166498 100644
--- a/components/detournavigator/offmeshconnection.hpp
+++ b/components/detournavigator/offmeshconnection.hpp
@@ -5,8 +5,8 @@
 
 #include <osg/Vec3f>
 
-#include <vector>
 #include <tuple>
+#include <vector>
 
 namespace DetourNavigator
 {
diff --git a/components/detournavigator/offmeshconnectionsmanager.cpp b/components/detournavigator/offmeshconnectionsmanager.cpp
index a11da21218..0cedd31241 100644
--- a/components/detournavigator/offmeshconnectionsmanager.cpp
+++ b/components/detournavigator/offmeshconnectionsmanager.cpp
@@ -1,19 +1,20 @@
 #include "offmeshconnectionsmanager.hpp"
+#include "objectid.hpp"
+#include "offmeshconnection.hpp"
 #include "settings.hpp"
 #include "settingsutils.hpp"
 #include "tileposition.hpp"
-#include "objectid.hpp"
-#include "offmeshconnection.hpp"
 
 #include <algorithm>
-#include <vector>
 #include <set>
+#include <vector>
 
 namespace DetourNavigator
 {
     OffMeshConnectionsManager::OffMeshConnectionsManager(const RecastSettings& settings)
         : mSettings(settings)
-    {}
+    {
+    }
 
     void OffMeshConnectionsManager::add(const ObjectId id, const OffMeshConnection& value)
     {
@@ -41,7 +42,7 @@ namespace DetourNavigator
 
         std::set<TilePosition> removed;
 
-        std::for_each(byId.first, byId.second, [&] (const auto& v) {
+        std::for_each(byId.first, byId.second, [&](const auto& v) {
             const auto startTilePosition = getTilePosition(mSettings, v.second.mStart);
             const auto endTilePosition = getTilePosition(mSettings, v.second.mEnd);
 
@@ -76,17 +77,14 @@ namespace DetourNavigator
         if (itByTilePosition == values->mByTilePosition.end())
             return result;
 
-        std::for_each(itByTilePosition->second.begin(), itByTilePosition->second.end(),
-            [&] (const ObjectId v)
-            {
-                const auto byId = values->mById.equal_range(v);
-                std::for_each(byId.first, byId.second, [&] (const auto& v)
-                {
-                    if (getTilePosition(mSettings, v.second.mStart) == tilePosition
-                            || getTilePosition(mSettings, v.second.mEnd) == tilePosition)
-                        result.push_back(v.second);
-                });
+        std::for_each(itByTilePosition->second.begin(), itByTilePosition->second.end(), [&](const ObjectId v) {
+            const auto byId = values->mById.equal_range(v);
+            std::for_each(byId.first, byId.second, [&](const auto& v) {
+                if (getTilePosition(mSettings, v.second.mStart) == tilePosition
+                    || getTilePosition(mSettings, v.second.mEnd) == tilePosition)
+                    result.push_back(v.second);
             });
+        });
 
         std::sort(result.begin(), result.end());
 
diff --git a/components/detournavigator/offmeshconnectionsmanager.hpp b/components/detournavigator/offmeshconnectionsmanager.hpp
index 455b03276a..39f4965170 100644
--- a/components/detournavigator/offmeshconnectionsmanager.hpp
+++ b/components/detournavigator/offmeshconnectionsmanager.hpp
@@ -1,17 +1,17 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_OFFMESHCONNECTIONSMANAGER_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_OFFMESHCONNECTIONSMANAGER_H
 
-#include "settings.hpp"
-#include "tileposition.hpp"
 #include "objectid.hpp"
 #include "offmeshconnection.hpp"
+#include "settings.hpp"
+#include "tileposition.hpp"
 
 #include <components/misc/guarded.hpp>
 
 #include <map>
+#include <set>
 #include <unordered_set>
 #include <vector>
-#include <set>
 
 namespace DetourNavigator
 {
diff --git a/components/detournavigator/preparednavmeshdata.hpp b/components/detournavigator/preparednavmeshdata.hpp
index 3c0e27c640..61914d9bc9 100644
--- a/components/detournavigator/preparednavmeshdata.hpp
+++ b/components/detournavigator/preparednavmeshdata.hpp
@@ -29,17 +29,14 @@ namespace DetourNavigator
 
     inline constexpr std::size_t getSize(const rcPolyMesh& value) noexcept
     {
-        return getVertsLength(value) * sizeof(*value.verts)
-            + getPolysLength(value) * sizeof(*value.polys)
-            + getRegsLength(value) * sizeof(*value.regs)
-            + getFlagsLength(value) * sizeof(*value.flags)
+        return getVertsLength(value) * sizeof(*value.verts) + getPolysLength(value) * sizeof(*value.polys)
+            + getRegsLength(value) * sizeof(*value.regs) + getFlagsLength(value) * sizeof(*value.flags)
             + getAreasLength(value) * sizeof(*value.areas);
     }
 
     inline constexpr std::size_t getSize(const rcPolyMeshDetail& value) noexcept
     {
-        return getMeshesLength(value) * sizeof(*value.meshes)
-            + getVertsLength(value) * sizeof(*value.verts)
+        return getMeshesLength(value) * sizeof(*value.meshes) + getVertsLength(value) * sizeof(*value.verts)
             + getTrisLength(value) * sizeof(*value.tris);
     }
 
diff --git a/components/detournavigator/preparednavmeshdatatuple.hpp b/components/detournavigator/preparednavmeshdatatuple.hpp
index 03b192ad38..77a81e61fc 100644
--- a/components/detournavigator/preparednavmeshdatatuple.hpp
+++ b/components/detournavigator/preparednavmeshdatatuple.hpp
@@ -2,8 +2,8 @@
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_PREPAREDNAVMESHDATATUPLE_H
 
 #include "preparednavmeshdata.hpp"
-#include "ref.hpp"
 #include "recast.hpp"
+#include "ref.hpp"
 
 #include <Recast.h>
 
@@ -11,36 +11,22 @@
 
 inline bool operator==(const rcPolyMesh& lhs, const rcPolyMesh& rhs) noexcept
 {
-    const auto makeTuple = [] (const rcPolyMesh& v)
-    {
+    const auto makeTuple = [](const rcPolyMesh& v) {
         using namespace DetourNavigator;
-        return std::tuple(
-            Span(v.verts, static_cast<int>(getVertsLength(v))),
-            Span(v.polys, static_cast<int>(getPolysLength(v))),
-            Span(v.regs, static_cast<int>(getRegsLength(v))),
-            Span(v.flags, static_cast<int>(getFlagsLength(v))),
-            Span(v.areas, static_cast<int>(getAreasLength(v))),
-            ArrayRef(v.bmin),
-            ArrayRef(v.bmax),
-            v.cs,
-            v.ch,
-            v.borderSize,
-            v.maxEdgeError
-        );
+        return std::tuple(Span(v.verts, static_cast<int>(getVertsLength(v))),
+            Span(v.polys, static_cast<int>(getPolysLength(v))), Span(v.regs, static_cast<int>(getRegsLength(v))),
+            Span(v.flags, static_cast<int>(getFlagsLength(v))), Span(v.areas, static_cast<int>(getAreasLength(v))),
+            ArrayRef(v.bmin), ArrayRef(v.bmax), v.cs, v.ch, v.borderSize, v.maxEdgeError);
     };
     return makeTuple(lhs) == makeTuple(rhs);
 }
 
 inline bool operator==(const rcPolyMeshDetail& lhs, const rcPolyMeshDetail& rhs) noexcept
 {
-    const auto makeTuple = [] (const rcPolyMeshDetail& v)
-    {
+    const auto makeTuple = [](const rcPolyMeshDetail& v) {
         using namespace DetourNavigator;
-        return std::tuple(
-            Span(v.meshes, static_cast<int>(getMeshesLength(v))),
-            Span(v.verts, static_cast<int>(getVertsLength(v))),
-            Span(v.tris, static_cast<int>(getTrisLength(v)))
-        );
+        return std::tuple(Span(v.meshes, static_cast<int>(getMeshesLength(v))),
+            Span(v.verts, static_cast<int>(getVertsLength(v))), Span(v.tris, static_cast<int>(getTrisLength(v))));
     };
     return makeTuple(lhs) == makeTuple(rhs);
 }
@@ -49,13 +35,7 @@ namespace DetourNavigator
 {
     inline auto makeTuple(const PreparedNavMeshData& v) noexcept
     {
-        return std::tuple(
-            v.mUserId,
-            v.mCellHeight,
-            v.mCellSize,
-            Ref(v.mPolyMesh),
-            Ref(v.mPolyMeshDetail)
-        );
+        return std::tuple(v.mUserId, v.mCellHeight, v.mCellSize, Ref(v.mPolyMesh), Ref(v.mPolyMeshDetail));
     }
 }
 
diff --git a/components/detournavigator/raycast.cpp b/components/detournavigator/raycast.cpp
index be3217ba40..665b2433c6 100644
--- a/components/detournavigator/raycast.cpp
+++ b/components/detournavigator/raycast.cpp
@@ -1,6 +1,6 @@
 #include "raycast.hpp"
-#include "settings.hpp"
 #include "findsmoothpath.hpp"
+#include "settings.hpp"
 
 #include <DetourNavMesh.h>
 #include <DetourNavMeshQuery.h>
@@ -9,8 +9,8 @@
 
 namespace DetourNavigator
 {
-    std::optional<osg::Vec3f> raycast(const dtNavMesh& navMesh, const osg::Vec3f& halfExtents,
-        const osg::Vec3f& start, const osg::Vec3f& end, const Flags includeFlags, const DetourSettings& settings)
+    std::optional<osg::Vec3f> raycast(const dtNavMesh& navMesh, const osg::Vec3f& halfExtents, const osg::Vec3f& start,
+        const osg::Vec3f& end, const Flags includeFlags, const DetourSettings& settings)
     {
         dtNavMeshQuery navMeshQuery;
         if (!initNavMeshQuery(navMeshQuery, navMesh, settings.mMaxNavMeshQueryNodes))
@@ -34,7 +34,8 @@ namespace DetourNavigator
             return {};
 
         osg::Vec3f hitPosition;
-        if (dtStatus status = navMeshQuery.closestPointOnPoly(path[hit.pathCount - 1], end.ptr(), hitPosition.ptr(), nullptr);
+        if (dtStatus status
+            = navMeshQuery.closestPointOnPoly(path[hit.pathCount - 1], end.ptr(), hitPosition.ptr(), nullptr);
             dtStatusFailed(status))
             return {};
 
diff --git a/components/detournavigator/raycast.hpp b/components/detournavigator/raycast.hpp
index 60cdf0a157..9b9125fb71 100644
--- a/components/detournavigator/raycast.hpp
+++ b/components/detournavigator/raycast.hpp
@@ -12,8 +12,8 @@ namespace DetourNavigator
 {
     struct DetourSettings;
 
-    std::optional<osg::Vec3f> raycast(const dtNavMesh& navMesh, const osg::Vec3f& halfExtents,
-        const osg::Vec3f& start, const osg::Vec3f& end, const Flags includeFlags, const DetourSettings& settings);
+    std::optional<osg::Vec3f> raycast(const dtNavMesh& navMesh, const osg::Vec3f& halfExtents, const osg::Vec3f& start,
+        const osg::Vec3f& end, const Flags includeFlags, const DetourSettings& settings);
 }
 
 #endif
diff --git a/components/detournavigator/recastglobalallocator.hpp b/components/detournavigator/recastglobalallocator.hpp
index 313d311009..1292926686 100644
--- a/components/detournavigator/recastglobalallocator.hpp
+++ b/components/detournavigator/recastglobalallocator.hpp
@@ -10,10 +10,7 @@ namespace DetourNavigator
     class RecastGlobalAllocator
     {
     public:
-        static void init()
-        {
-            instance();
-        }
+        static void init() { instance(); }
 
         static void* alloc(size_t size, rcAllocHint hint)
         {
@@ -39,10 +36,7 @@ namespace DetourNavigator
         }
 
     private:
-        RecastGlobalAllocator()
-        {
-            rcAllocSetCustom(&RecastGlobalAllocator::alloc, &RecastGlobalAllocator::free);
-        }
+        RecastGlobalAllocator() { rcAllocSetCustom(&RecastGlobalAllocator::alloc, &RecastGlobalAllocator::free); }
 
         static RecastGlobalAllocator& instance()
         {
diff --git a/components/detournavigator/recastmesh.cpp b/components/detournavigator/recastmesh.cpp
index 9f344d0918..5c5764f336 100644
--- a/components/detournavigator/recastmesh.cpp
+++ b/components/detournavigator/recastmesh.cpp
@@ -8,8 +8,8 @@ namespace DetourNavigator
     Mesh::Mesh(std::vector<int>&& indices, std::vector<float>&& vertices, std::vector<AreaType>&& areaTypes)
     {
         if (indices.size() / 3 != areaTypes.size())
-           throw InvalidArgument("Number of flags doesn't match number of triangles: triangles="
-               + std::to_string(indices.size() / 3) + ", areaTypes=" + std::to_string(areaTypes.size()));
+            throw InvalidArgument("Number of flags doesn't match number of triangles: triangles="
+                + std::to_string(indices.size() / 3) + ", areaTypes=" + std::to_string(areaTypes.size()));
         indices.shrink_to_fit();
         vertices.shrink_to_fit();
         areaTypes.shrink_to_fit();
diff --git a/components/detournavigator/recastmesh.hpp b/components/detournavigator/recastmesh.hpp
index 1ad1348136..f809c7866e 100644
--- a/components/detournavigator/recastmesh.hpp
+++ b/components/detournavigator/recastmesh.hpp
@@ -8,14 +8,14 @@
 #include <components/bullethelpers/operators.hpp>
 #include <components/resource/bulletshape.hpp>
 
-#include <osg/Vec3f>
 #include <osg/Vec2i>
+#include <osg/Vec3f>
 
 #include <memory>
+#include <numeric>
 #include <string>
-#include <vector>
 #include <tuple>
-#include <numeric>
+#include <vector>
 
 namespace DetourNavigator
 {
@@ -38,13 +38,12 @@ namespace DetourNavigator
         friend inline bool operator<(const Mesh& lhs, const Mesh& rhs) noexcept
         {
             return std::tie(lhs.mIndices, lhs.mVertices, lhs.mAreaTypes)
-                    < std::tie(rhs.mIndices, rhs.mVertices, rhs.mAreaTypes);
+                < std::tie(rhs.mIndices, rhs.mVertices, rhs.mAreaTypes);
         }
 
         friend inline std::size_t getSize(const Mesh& value) noexcept
         {
-            return value.mIndices.size() * sizeof(int)
-                + value.mVertices.size() * sizeof(float)
+            return value.mIndices.size() * sizeof(int) + value.mVertices.size() * sizeof(float)
                 + value.mAreaTypes.size() * sizeof(AreaType);
         }
     };
@@ -57,7 +56,7 @@ namespace DetourNavigator
 
     inline bool operator<(const Water& lhs, const Water& rhs) noexcept
     {
-        const auto tie = [] (const Water& v) { return std::tie(v.mCellSize, v.mLevel); };
+        const auto tie = [](const Water& v) { return std::tie(v.mCellSize, v.mLevel); };
         return tie(lhs) < tie(rhs);
     }
 
@@ -69,7 +68,7 @@ namespace DetourNavigator
 
     inline bool operator<(const CellWater& lhs, const CellWater& rhs) noexcept
     {
-        const auto tie = [] (const CellWater& v) { return std::tie(v.mCellPosition, v.mWater); };
+        const auto tie = [](const CellWater& v) { return std::tie(v.mCellPosition, v.mWater); };
         return tie(lhs) < tie(rhs);
     }
 
@@ -98,8 +97,8 @@ namespace DetourNavigator
 
     inline auto makeTuple(const Heightfield& v) noexcept
     {
-        return std::tie(v.mCellPosition, v.mCellSize, v.mLength, v.mMinHeight, v.mMaxHeight,
-                        v.mHeights, v.mOriginalSize, v.mMinX, v.mMinY);
+        return std::tie(v.mCellPosition, v.mCellSize, v.mLength, v.mMinHeight, v.mMaxHeight, v.mHeights,
+            v.mOriginalSize, v.mMinX, v.mMinY);
     }
 
     inline bool operator<(const Heightfield& lhs, const Heightfield& rhs) noexcept
@@ -116,7 +115,7 @@ namespace DetourNavigator
 
     inline bool operator<(const FlatHeightfield& lhs, const FlatHeightfield& rhs) noexcept
     {
-        const auto tie = [] (const FlatHeightfield& v) { return std::tie(v.mCellPosition, v.mCellSize, v.mHeight); };
+        const auto tie = [](const FlatHeightfield& v) { return std::tie(v.mCellPosition, v.mCellSize, v.mHeight); };
         return tie(lhs) < tie(rhs);
     }
 
@@ -138,20 +137,11 @@ namespace DetourNavigator
 
         const Mesh& getMesh() const noexcept { return mMesh; }
 
-        const std::vector<CellWater>& getWater() const
-        {
-            return mWater;
-        }
+        const std::vector<CellWater>& getWater() const { return mWater; }
 
-        const std::vector<Heightfield>& getHeightfields() const noexcept
-        {
-            return mHeightfields;
-        }
+        const std::vector<Heightfield>& getHeightfields() const noexcept { return mHeightfields; }
 
-        const std::vector<FlatHeightfield>& getFlatHeightfields() const noexcept
-        {
-            return mFlatHeightfields;
-        }
+        const std::vector<FlatHeightfield>& getFlatHeightfields() const noexcept { return mFlatHeightfields; }
 
         const std::vector<MeshSource>& getMeshSources() const noexcept { return mMeshSources; }
 
@@ -167,8 +157,8 @@ namespace DetourNavigator
         {
             return getSize(value.mMesh) + value.mWater.size() * sizeof(CellWater)
                 + value.mHeightfields.size() * sizeof(Heightfield)
-                + std::accumulate(value.mHeightfields.begin(), value.mHeightfields.end(), std::size_t {0},
-                                  [] (std::size_t r, const Heightfield& v) { return r + v.mHeights.size() * sizeof(float); })
+                + std::accumulate(value.mHeightfields.begin(), value.mHeightfields.end(), std::size_t{ 0 },
+                    [](std::size_t r, const Heightfield& v) { return r + v.mHeights.size() * sizeof(float); })
                 + value.mFlatHeightfields.size() * sizeof(FlatHeightfield);
         }
     };
diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index b8e455c732..c0d7873c78 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -1,25 +1,25 @@
 #include "recastmeshbuilder.hpp"
 #include "exceptions.hpp"
 
-#include <components/bullethelpers/transformboundingbox.hpp>
+#include <components/bullethelpers/heightfield.hpp>
 #include <components/bullethelpers/processtrianglecallback.hpp>
-#include <components/misc/convert.hpp>
+#include <components/bullethelpers/transformboundingbox.hpp>
 #include <components/debug/debuglog.hpp>
-#include <components/bullethelpers/heightfield.hpp>
+#include <components/misc/convert.hpp>
 
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
 #include <BulletCollision/CollisionShapes/btConcaveShape.h>
 #include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
-#include <LinearMath/btTransform.h>
 #include <LinearMath/btAabbUtil2.h>
+#include <LinearMath/btTransform.h>
 
 #include <algorithm>
-#include <cassert>
 #include <array>
-#include <vector>
-#include <sstream>
+#include <cassert>
 #include <cmath>
+#include <sstream>
+#include <vector>
 
 namespace DetourNavigator
 {
@@ -44,8 +44,7 @@ namespace DetourNavigator
         bool isNan(const RecastMeshTriangle& triangle)
         {
             for (std::size_t i = 0; i < 3; ++i)
-                if (std::isnan(triangle.mVertices[i].x())
-                    || std::isnan(triangle.mVertices[i].y())
+                if (std::isnan(triangle.mVertices[i].x()) || std::isnan(triangle.mVertices[i].y())
                     || std::isnan(triangle.mVertices[i].z()))
                     return true;
             return false;
@@ -107,13 +106,12 @@ namespace DetourNavigator
 #if BT_BULLET_VERSION < 310
         std::vector<btScalar> heights(heightfield.mHeights.begin(), heightfield.mHeights.end());
         btHeightfieldTerrainShape shape(static_cast<int>(heightfield.mHeights.size() / heightfield.mLength),
-            static_cast<int>(heightfield.mLength), heights.data(), 1,
-            heightfield.mMinHeight, heightfield.mMaxHeight, upAxis, PHY_FLOAT, flipQuadEdges
-        );
+            static_cast<int>(heightfield.mLength), heights.data(), 1, heightfield.mMinHeight, heightfield.mMaxHeight,
+            upAxis, PHY_FLOAT, flipQuadEdges);
 #else
         btHeightfieldTerrainShape shape(static_cast<int>(heightfield.mHeights.size() / heightfield.mLength),
-            static_cast<int>(heightfield.mLength), heightfield.mHeights.data(),
-            heightfield.mMinHeight, heightfield.mMaxHeight, upAxis, flipQuadEdges);
+            static_cast<int>(heightfield.mLength), heightfield.mHeights.data(), heightfield.mMinHeight,
+            heightfield.mMaxHeight, upAxis, flipQuadEdges);
 #endif
         const float scale = getHeightfieldScale(heightfield.mCellSize, heightfield.mOriginalSize);
         shape.setLocalScaling(btVector3(scale, scale, 1));
@@ -121,20 +119,17 @@ namespace DetourNavigator
         btVector3 aabbMax;
         shape.getAabb(btTransform::getIdentity(), aabbMin, aabbMax);
         std::vector<RecastMeshTriangle> triangles;
-        auto callback = makeProcessTriangleCallback([&] (btVector3* vertices, int, int)
-        {
+        auto callback = makeProcessTriangleCallback([&](btVector3* vertices, int, int) {
             triangles.emplace_back(makeRecastMeshTriangle(vertices, AreaType_ground));
         });
         shape.processAllTriangles(&callback, aabbMin, aabbMax);
-        const osg::Vec2f aabbShift = (osg::Vec2f(aabbMax.x(), aabbMax.y()) - osg::Vec2f(aabbMin.x(), aabbMin.y())) * 0.5;
+        const osg::Vec2f aabbShift
+            = (osg::Vec2f(aabbMax.x(), aabbMax.y()) - osg::Vec2f(aabbMin.x(), aabbMin.y())) * 0.5;
         const osg::Vec2f tileShift = osg::Vec2f(heightfield.mMinX, heightfield.mMinY) * scale;
         const osg::Vec2f localShift = aabbShift + tileShift;
         const float cellSize = static_cast<float>(heightfield.mCellSize);
-        const osg::Vec3f cellShift(
-            heightfield.mCellPosition.x() * cellSize,
-            heightfield.mCellPosition.y() * cellSize,
-            (heightfield.mMinHeight + heightfield.mMaxHeight) * 0.5f
-        );
+        const osg::Vec3f cellShift(heightfield.mCellPosition.x() * cellSize, heightfield.mCellPosition.y() * cellSize,
+            (heightfield.mMinHeight + heightfield.mMaxHeight) * 0.5f);
         return makeMesh(std::move(triangles), cellShift + osg::Vec3f(localShift.x(), localShift.y(), 0));
     }
 
@@ -144,14 +139,15 @@ namespace DetourNavigator
     }
 
     void RecastMeshBuilder::addObject(const btCollisionShape& shape, const btTransform& transform,
-        const AreaType areaType, osg::ref_ptr<const Resource::BulletShape> source, const ObjectTransform& objectTransform)
+        const AreaType areaType, osg::ref_ptr<const Resource::BulletShape> source,
+        const ObjectTransform& objectTransform)
     {
         addObject(shape, transform, areaType);
-        mSources.push_back(MeshSource {std::move(source), objectTransform, areaType});
+        mSources.push_back(MeshSource{ std::move(source), objectTransform, areaType });
     }
 
-    void RecastMeshBuilder::addObject(const btCollisionShape& shape, const btTransform& transform,
-                                      const AreaType areaType)
+    void RecastMeshBuilder::addObject(
+        const btCollisionShape& shape, const btTransform& transform, const AreaType areaType)
     {
         if (shape.isCompound())
             return addObject(static_cast<const btCompoundShape&>(shape), transform, areaType);
@@ -166,49 +162,71 @@ namespace DetourNavigator
         throw InvalidArgument(message.str());
     }
 
-    void RecastMeshBuilder::addObject(const btCompoundShape& shape, const btTransform& transform,
-                                      const AreaType areaType)
+    void RecastMeshBuilder::addObject(
+        const btCompoundShape& shape, const btTransform& transform, const AreaType areaType)
     {
         for (int i = 0, num = shape.getNumChildShapes(); i < num; ++i)
             addObject(*shape.getChildShape(i), transform * shape.getChildTransform(i), areaType);
     }
 
-    void RecastMeshBuilder::addObject(const btConcaveShape& shape, const btTransform& transform,
-                                      const AreaType areaType)
+    void RecastMeshBuilder::addObject(
+        const btConcaveShape& shape, const btTransform& transform, const AreaType areaType)
     {
-        return addObject(shape, transform, makeProcessTriangleCallback([&] (btVector3* vertices, int, int)
-        {
+        return addObject(shape, transform, makeProcessTriangleCallback([&](btVector3* vertices, int, int) {
             RecastMeshTriangle triangle = makeRecastMeshTriangle(vertices, areaType);
             std::reverse(triangle.mVertices.begin(), triangle.mVertices.end());
             mTriangles.emplace_back(triangle);
         }));
     }
 
-    void RecastMeshBuilder::addObject(const btHeightfieldTerrainShape& shape, const btTransform& transform,
-                                      const AreaType areaType)
+    void RecastMeshBuilder::addObject(
+        const btHeightfieldTerrainShape& shape, const btTransform& transform, const AreaType areaType)
     {
-        addObject(shape, transform, makeProcessTriangleCallback([&] (btVector3* vertices, int, int)
-        {
+        addObject(shape, transform, makeProcessTriangleCallback([&](btVector3* vertices, int, int) {
             mTriangles.emplace_back(makeRecastMeshTriangle(vertices, areaType));
         }));
     }
 
     void RecastMeshBuilder::addObject(const btBoxShape& shape, const btTransform& transform, const AreaType areaType)
     {
-        constexpr std::array<int, 36> indices {{
-            0, 2, 3,
-            3, 1, 0,
-            0, 4, 6,
-            6, 2, 0,
-            0, 1, 5,
-            5, 4, 0,
-            7, 5, 1,
-            1, 3, 7,
-            7, 3, 2,
-            2, 6, 7,
-            7, 6, 4,
-            4, 5, 7,
-        }};
+        constexpr std::array<int, 36> indices{ {
+            0,
+            2,
+            3,
+            3,
+            1,
+            0,
+            0,
+            4,
+            6,
+            6,
+            2,
+            0,
+            0,
+            1,
+            5,
+            5,
+            4,
+            0,
+            7,
+            5,
+            1,
+            1,
+            3,
+            7,
+            7,
+            3,
+            2,
+            2,
+            6,
+            7,
+            7,
+            6,
+            4,
+            4,
+            5,
+            7,
+        } };
 
         for (std::size_t i = 0; i < indices.size(); i += 3)
         {
@@ -225,13 +243,13 @@ namespace DetourNavigator
 
     void RecastMeshBuilder::addWater(const osg::Vec2i& cellPosition, const Water& water)
     {
-        mWater.push_back(CellWater {cellPosition, water});
+        mWater.push_back(CellWater{ cellPosition, water });
     }
 
     void RecastMeshBuilder::addHeightfield(const osg::Vec2i& cellPosition, int cellSize, float height)
     {
         if (const auto intersection = getIntersection(mBounds, maxCellTileBounds(cellPosition, cellSize)))
-            mFlatHeightfields.emplace_back(FlatHeightfield {cellPosition, cellSize, height});
+            mFlatHeightfields.emplace_back(FlatHeightfield{ cellPosition, cellSize, height });
     }
 
     void RecastMeshBuilder::addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const float* heights,
@@ -240,11 +258,12 @@ namespace DetourNavigator
         const auto intersection = getIntersection(mBounds, maxCellTileBounds(cellPosition, cellSize));
         if (!intersection.has_value())
             return;
-        const osg::Vec3f shift = Misc::Convert::toOsg(BulletHelpers::getHeightfieldShift(cellPosition.x(), cellPosition.y(), cellSize, minHeight, maxHeight));
+        const osg::Vec3f shift = Misc::Convert::toOsg(
+            BulletHelpers::getHeightfieldShift(cellPosition.x(), cellPosition.y(), cellSize, minHeight, maxHeight));
         const float stepSize = getHeightfieldScale(cellSize, size);
         const int halfCellSize = cellSize / 2;
-        const auto local = [&] (float v, float shift) { return (v - shift + halfCellSize) / stepSize; };
-        const auto index = [&] (float v, int add) { return std::clamp<int>(static_cast<int>(v) + add, 0, size); };
+        const auto local = [&](float v, float shift) { return (v - shift + halfCellSize) / stepSize; };
+        const auto index = [&](float v, int add) { return std::clamp<int>(static_cast<int>(v) + add, 0, size); };
         const std::size_t minX = index(std::round(local(intersection->mMin.x(), shift.x())), -1);
         const std::size_t minY = index(std::round(local(intersection->mMin.y(), shift.y())), -1);
         const std::size_t maxX = index(std::round(local(intersection->mMax.x(), shift.x())), 1);
@@ -280,13 +299,12 @@ namespace DetourNavigator
         std::sort(mHeightfields.begin(), mHeightfields.end());
         std::sort(mFlatHeightfields.begin(), mFlatHeightfields.end());
         Mesh mesh = makeMesh(std::move(mTriangles));
-        return std::make_shared<RecastMesh>(version, std::move(mesh), std::move(mWater),
-                                            std::move(mHeightfields), std::move(mFlatHeightfields),
-                                            std::move(mSources));
+        return std::make_shared<RecastMesh>(version, std::move(mesh), std::move(mWater), std::move(mHeightfields),
+            std::move(mFlatHeightfields), std::move(mSources));
     }
 
-    void RecastMeshBuilder::addObject(const btConcaveShape& shape, const btTransform& transform,
-                                      btTriangleCallback&& callback)
+    void RecastMeshBuilder::addObject(
+        const btConcaveShape& shape, const btTransform& transform, btTriangleCallback&& callback)
     {
         btVector3 aabbMin;
         btVector3 aabbMax;
@@ -298,8 +316,7 @@ namespace DetourNavigator
         const btVector3 boundsMax(mBounds.mMax.x(), mBounds.mMax.y(),
             std::numeric_limits<btScalar>::max() * std::numeric_limits<btScalar>::epsilon());
 
-        auto wrapper = makeProcessTriangleCallback([&] (btVector3* triangle, int partId, int triangleIndex)
-        {
+        auto wrapper = makeProcessTriangleCallback([&](btVector3* triangle, int partId, int triangleIndex) {
             std::array<btVector3, 3> transformed;
             for (std::size_t i = 0; i < 3; ++i)
                 transformed[i] = transform(triangle[i]);
@@ -310,8 +327,8 @@ namespace DetourNavigator
         shape.processAllTriangles(&wrapper, aabbMin, aabbMax);
     }
 
-    void RecastMeshBuilder::addObject(const btHeightfieldTerrainShape& shape, const btTransform& transform,
-                                      btTriangleCallback&& callback)
+    void RecastMeshBuilder::addObject(
+        const btHeightfieldTerrainShape& shape, const btTransform& transform, btTriangleCallback&& callback)
     {
         using BulletHelpers::transformBoundingBox;
 
@@ -334,8 +351,7 @@ namespace DetourNavigator
 
         transformBoundingBox(transform.inverse(), aabbMin, aabbMax);
 
-        auto wrapper = makeProcessTriangleCallback([&] (btVector3* triangle, int partId, int triangleIndex)
-        {
+        auto wrapper = makeProcessTriangleCallback([&](btVector3* triangle, int partId, int triangleIndex) {
             std::array<btVector3, 3> transformed;
             for (std::size_t i = 0; i < 3; ++i)
                 transformed[i] = transform(triangle[i]);
diff --git a/components/detournavigator/recastmeshbuilder.hpp b/components/detournavigator/recastmeshbuilder.hpp
index de5cd03967..31a773bd56 100644
--- a/components/detournavigator/recastmeshbuilder.hpp
+++ b/components/detournavigator/recastmeshbuilder.hpp
@@ -72,7 +72,8 @@ namespace DetourNavigator
 
         void addObject(const btConcaveShape& shape, const btTransform& transform, btTriangleCallback&& callback);
 
-        void addObject(const btHeightfieldTerrainShape& shape, const btTransform& transform, btTriangleCallback&& callback);
+        void addObject(
+            const btHeightfieldTerrainShape& shape, const btTransform& transform, btTriangleCallback&& callback);
     };
 
     Mesh makeMesh(std::vector<RecastMeshTriangle>&& triangles, const osg::Vec3f& shift = osg::Vec3f());
diff --git a/components/detournavigator/recastmeshobject.cpp b/components/detournavigator/recastmeshobject.cpp
index 343aeeb39e..827bb5806a 100644
--- a/components/detournavigator/recastmeshobject.cpp
+++ b/components/detournavigator/recastmeshobject.cpp
@@ -10,8 +10,8 @@ namespace DetourNavigator
 {
     namespace
     {
-        bool updateCompoundObject(const btCompoundShape& shape, const AreaType areaType,
-            std::vector<ChildRecastMeshObject>& children)
+        bool updateCompoundObject(
+            const btCompoundShape& shape, const AreaType areaType, std::vector<ChildRecastMeshObject>& children)
         {
             assert(static_cast<std::size_t>(shape.getNumChildShapes()) == children.size());
             bool result = false;
@@ -39,8 +39,8 @@ namespace DetourNavigator
         }
     }
 
-    ChildRecastMeshObject::ChildRecastMeshObject(const btCollisionShape& shape, const btTransform& transform,
-            const AreaType areaType)
+    ChildRecastMeshObject::ChildRecastMeshObject(
+        const btCollisionShape& shape, const btTransform& transform, const AreaType areaType)
         : mShape(shape)
         , mTransform(transform)
         , mAreaType(areaType)
@@ -69,12 +69,12 @@ namespace DetourNavigator
         }
         if (mShape.get().isCompound())
             result = updateCompoundObject(static_cast<const btCompoundShape&>(mShape.get()), mAreaType, mChildren)
-                    || result;
+                || result;
         return result;
     }
 
-    RecastMeshObject::RecastMeshObject(const CollisionShape& shape, const btTransform& transform,
-            const AreaType areaType)
+    RecastMeshObject::RecastMeshObject(
+        const CollisionShape& shape, const btTransform& transform, const AreaType areaType)
         : mInstance(shape.getInstance())
         , mObjectTransform(shape.getObjectTransform())
         , mImpl(shape.getShape(), transform, areaType)
diff --git a/components/detournavigator/recastmeshobject.hpp b/components/detournavigator/recastmeshobject.hpp
index 760774353c..e74b0d0d9d 100644
--- a/components/detournavigator/recastmeshobject.hpp
+++ b/components/detournavigator/recastmeshobject.hpp
@@ -8,8 +8,8 @@
 
 #include <LinearMath/btTransform.h>
 
-#include <osg/ref_ptr>
 #include <osg/Referenced>
+#include <osg/ref_ptr>
 
 #include <functional>
 #include <vector>
@@ -23,11 +23,12 @@ namespace DetourNavigator
     {
     public:
         CollisionShape(osg::ref_ptr<const Resource::BulletShapeInstance> instance, const btCollisionShape& shape,
-                       const ObjectTransform& transform)
+            const ObjectTransform& transform)
             : mInstance(std::move(instance))
             , mShape(shape)
             , mObjectTransform(transform)
-        {}
+        {
+        }
 
         const osg::ref_ptr<const Resource::BulletShapeInstance>& getInstance() const { return mInstance; }
         const btCollisionShape& getShape() const { return mShape; }
@@ -41,46 +42,46 @@ namespace DetourNavigator
 
     class ChildRecastMeshObject
     {
-        public:
-            ChildRecastMeshObject(const btCollisionShape& shape, const btTransform& transform, const AreaType areaType);
+    public:
+        ChildRecastMeshObject(const btCollisionShape& shape, const btTransform& transform, const AreaType areaType);
 
-            bool update(const btTransform& transform, const AreaType areaType);
+        bool update(const btTransform& transform, const AreaType areaType);
 
-            const btCollisionShape& getShape() const { return mShape; }
+        const btCollisionShape& getShape() const { return mShape; }
 
-            const btTransform& getTransform() const { return mTransform; }
+        const btTransform& getTransform() const { return mTransform; }
 
-            AreaType getAreaType() const { return mAreaType; }
+        AreaType getAreaType() const { return mAreaType; }
 
-        private:
-            std::reference_wrapper<const btCollisionShape> mShape;
-            btTransform mTransform;
-            AreaType mAreaType;
-            btVector3 mLocalScaling;
-            std::vector<ChildRecastMeshObject> mChildren;
+    private:
+        std::reference_wrapper<const btCollisionShape> mShape;
+        btTransform mTransform;
+        AreaType mAreaType;
+        btVector3 mLocalScaling;
+        std::vector<ChildRecastMeshObject> mChildren;
     };
 
     class RecastMeshObject
     {
-        public:
-            RecastMeshObject(const CollisionShape& shape, const btTransform& transform, const AreaType areaType);
+    public:
+        RecastMeshObject(const CollisionShape& shape, const btTransform& transform, const AreaType areaType);
 
-            bool update(const btTransform& transform, const AreaType areaType) { return mImpl.update(transform, areaType); }
+        bool update(const btTransform& transform, const AreaType areaType) { return mImpl.update(transform, areaType); }
 
-            const osg::ref_ptr<const Resource::BulletShapeInstance>& getInstance() const { return mInstance; }
+        const osg::ref_ptr<const Resource::BulletShapeInstance>& getInstance() const { return mInstance; }
 
-            const btCollisionShape& getShape() const { return mImpl.getShape(); }
+        const btCollisionShape& getShape() const { return mImpl.getShape(); }
 
-            const btTransform& getTransform() const { return mImpl.getTransform(); }
+        const btTransform& getTransform() const { return mImpl.getTransform(); }
 
-            AreaType getAreaType() const { return mImpl.getAreaType(); }
+        AreaType getAreaType() const { return mImpl.getAreaType(); }
 
-            const ObjectTransform& getObjectTransform() const { return mObjectTransform; }
+        const ObjectTransform& getObjectTransform() const { return mObjectTransform; }
 
-        private:
-            osg::ref_ptr<const Resource::BulletShapeInstance> mInstance;
-            ObjectTransform mObjectTransform;
-            ChildRecastMeshObject mImpl;
+    private:
+        osg::ref_ptr<const Resource::BulletShapeInstance> mInstance;
+        ObjectTransform mObjectTransform;
+        ChildRecastMeshObject mImpl;
     };
 }
 
diff --git a/components/detournavigator/recastmeshprovider.hpp b/components/detournavigator/recastmeshprovider.hpp
index 5b512646f9..d0cba1c348 100644
--- a/components/detournavigator/recastmeshprovider.hpp
+++ b/components/detournavigator/recastmeshprovider.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_RECASTMESHPROVIDER_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_RECASTMESHPROVIDER_H
 
-#include "tileposition.hpp"
 #include "recastmesh.hpp"
 #include "tilecachedrecastmeshmanager.hpp"
+#include "tileposition.hpp"
 
 #include <functional>
 #include <memory>
@@ -17,7 +17,8 @@ namespace DetourNavigator
     public:
         RecastMeshProvider(TileCachedRecastMeshManager& impl)
             : mImpl(impl)
-        {}
+        {
+        }
 
         std::shared_ptr<RecastMesh> getMesh(std::string_view worldspace, const TilePosition& tilePosition) const
         {
diff --git a/components/detournavigator/recastparams.hpp b/components/detournavigator/recastparams.hpp
index 02799950a6..74af132bf6 100644
--- a/components/detournavigator/recastparams.hpp
+++ b/components/detournavigator/recastparams.hpp
@@ -5,9 +5,9 @@
 
 #include <osg/Vec3f>
 
+#include <algorithm>
 #include <cassert>
 #include <cmath>
-#include <algorithm>
 
 namespace DetourNavigator
 {
diff --git a/components/detournavigator/recasttempallocator.hpp b/components/detournavigator/recasttempallocator.hpp
index fbf9fd62c1..290b088221 100644
--- a/components/detournavigator/recasttempallocator.hpp
+++ b/components/detournavigator/recasttempallocator.hpp
@@ -13,8 +13,11 @@ namespace DetourNavigator
     {
     public:
         RecastTempAllocator(std::size_t capacity)
-            : mStack(capacity), mTop(mStack.data()), mPrev(nullptr)
-        {}
+            : mStack(capacity)
+            , mTop(mStack.data())
+            , mPrev(nullptr)
+        {
+        }
 
         void* alloc(std::size_t size)
         {
@@ -55,10 +58,7 @@ namespace DetourNavigator
         void* mTop;
         void* mPrev;
 
-        std::size_t getUsedSize() const
-        {
-            return static_cast<std::size_t>(static_cast<char*>(mTop) - mStack.data());
-        }
+        std::size_t getUsedSize() const { return static_cast<std::size_t>(static_cast<char*>(mTop) - mStack.data()); }
     };
 }
 
diff --git a/components/detournavigator/ref.hpp b/components/detournavigator/ref.hpp
index 5a9e49e22a..ed8c874a4b 100644
--- a/components/detournavigator/ref.hpp
+++ b/components/detournavigator/ref.hpp
@@ -12,12 +12,12 @@ namespace DetourNavigator
     {
         T& mRef;
 
-        constexpr explicit Ref(T& ref) noexcept : mRef(ref) {}
-
-        friend bool operator==(const Ref& lhs, const Ref& rhs)
+        constexpr explicit Ref(T& ref) noexcept
+            : mRef(ref)
         {
-            return lhs.mRef == rhs.mRef;
         }
+
+        friend bool operator==(const Ref& lhs, const Ref& rhs) { return lhs.mRef == rhs.mRef; }
     };
 
     template <typename T, std::size_t size>
@@ -25,7 +25,10 @@ namespace DetourNavigator
     {
         T (&mRef)[size];
 
-        constexpr explicit ArrayRef(T (&ref)[size]) noexcept : mRef(ref) {}
+        constexpr explicit ArrayRef(T (&ref)[size]) noexcept
+            : mRef(ref)
+        {
+        }
 
         friend bool operator==(const ArrayRef& lhs, const ArrayRef& rhs)
         {
@@ -42,7 +45,8 @@ namespace DetourNavigator
         constexpr explicit Span(T* data, int size) noexcept
             : mBegin(data)
             , mEnd(data + static_cast<std::size_t>(size))
-        {}
+        {
+        }
 
         friend bool operator==(const Span& lhs, const Span& rhs)
         {
diff --git a/components/detournavigator/serialization.cpp b/components/detournavigator/serialization.cpp
index e0aa971b68..ac7d466ba5 100644
--- a/components/detournavigator/serialization.cpp
+++ b/components/detournavigator/serialization.cpp
@@ -1,11 +1,11 @@
 #include "serialization.hpp"
 
+#include "agentbounds.hpp"
 #include "dbrefgeometryobject.hpp"
 #include "preparednavmeshdata.hpp"
 #include "recast.hpp"
 #include "recastmesh.hpp"
 #include "settings.hpp"
-#include "agentbounds.hpp"
 #include "tilebounds.hpp"
 
 #include <components/serialization/binaryreader.hpp>
@@ -20,226 +20,226 @@
 
 namespace DetourNavigator
 {
-namespace
-{
-    template <Serialization::Mode mode>
-    struct Format : Serialization::Format<mode, Format<mode>>
+    namespace
     {
-        using Serialization::Format<mode, Format<mode>>::operator();
-
-        template <class Visitor>
-        void operator()(Visitor&& visitor, const osg::Vec2i& value) const
+        template <Serialization::Mode mode>
+        struct Format : Serialization::Format<mode, Format<mode>>
         {
-            visitor(*this, value.ptr(), 2);
-        }
+            using Serialization::Format<mode, Format<mode>>::operator();
 
-        template <class Visitor>
-        void operator()(Visitor&& visitor, const osg::Vec2f& value) const
-        {
-            visitor(*this, value.ptr(), 2);
-        }
+            template <class Visitor>
+            void operator()(Visitor&& visitor, const osg::Vec2i& value) const
+            {
+                visitor(*this, value.ptr(), 2);
+            }
 
-        template <class Visitor>
-        void operator()(Visitor&& visitor, const osg::Vec3f& value) const
-        {
-            visitor(*this, value.ptr(), 3);
-        }
+            template <class Visitor>
+            void operator()(Visitor&& visitor, const osg::Vec2f& value) const
+            {
+                visitor(*this, value.ptr(), 2);
+            }
 
-        template <class Visitor>
-        void operator()(Visitor&& visitor, const Water& value) const
-        {
-            visitor(*this, value.mCellSize);
-            visitor(*this, value.mLevel);
-        }
+            template <class Visitor>
+            void operator()(Visitor&& visitor, const osg::Vec3f& value) const
+            {
+                visitor(*this, value.ptr(), 3);
+            }
 
-        template <class Visitor>
-        void operator()(Visitor&& visitor, const CellWater& value) const
-        {
-            visitor(*this, value.mCellPosition);
-            visitor(*this, value.mWater);
-        }
+            template <class Visitor>
+            void operator()(Visitor&& visitor, const Water& value) const
+            {
+                visitor(*this, value.mCellSize);
+                visitor(*this, value.mLevel);
+            }
 
-        template <class Visitor>
-        void operator()(Visitor&& visitor, const RecastSettings& value) const
-        {
-            visitor(*this, value.mCellHeight);
-            visitor(*this, value.mCellSize);
-            visitor(*this, value.mDetailSampleDist);
-            visitor(*this, value.mDetailSampleMaxError);
-            visitor(*this, value.mMaxClimb);
-            visitor(*this, value.mMaxSimplificationError);
-            visitor(*this, value.mMaxSlope);
-            visitor(*this, value.mRecastScaleFactor);
-            visitor(*this, value.mSwimHeightScale);
-            visitor(*this, value.mBorderSize);
-            visitor(*this, value.mMaxEdgeLen);
-            visitor(*this, value.mMaxVertsPerPoly);
-            visitor(*this, value.mRegionMergeArea);
-            visitor(*this, value.mRegionMinArea);
-            visitor(*this, value.mTileSize);
-        }
+            template <class Visitor>
+            void operator()(Visitor&& visitor, const CellWater& value) const
+            {
+                visitor(*this, value.mCellPosition);
+                visitor(*this, value.mWater);
+            }
 
-        template <class Visitor>
-        void operator()(Visitor&& visitor, const TileBounds& value) const
-        {
-            visitor(*this, value.mMin);
-            visitor(*this, value.mMax);
-        }
+            template <class Visitor>
+            void operator()(Visitor&& visitor, const RecastSettings& value) const
+            {
+                visitor(*this, value.mCellHeight);
+                visitor(*this, value.mCellSize);
+                visitor(*this, value.mDetailSampleDist);
+                visitor(*this, value.mDetailSampleMaxError);
+                visitor(*this, value.mMaxClimb);
+                visitor(*this, value.mMaxSimplificationError);
+                visitor(*this, value.mMaxSlope);
+                visitor(*this, value.mRecastScaleFactor);
+                visitor(*this, value.mSwimHeightScale);
+                visitor(*this, value.mBorderSize);
+                visitor(*this, value.mMaxEdgeLen);
+                visitor(*this, value.mMaxVertsPerPoly);
+                visitor(*this, value.mRegionMergeArea);
+                visitor(*this, value.mRegionMinArea);
+                visitor(*this, value.mTileSize);
+            }
 
-        template <class Visitor>
-        void operator()(Visitor&& visitor, const Heightfield& value) const
-        {
-            visitor(*this, value.mCellPosition);
-            visitor(*this, value.mCellSize);
-            visitor(*this, value.mLength);
-            visitor(*this, value.mMinHeight);
-            visitor(*this, value.mMaxHeight);
-            visitor(*this, value.mHeights);
-            visitor(*this, value.mOriginalSize);
-            visitor(*this, value.mMinX);
-            visitor(*this, value.mMinY);
-        }
+            template <class Visitor>
+            void operator()(Visitor&& visitor, const TileBounds& value) const
+            {
+                visitor(*this, value.mMin);
+                visitor(*this, value.mMax);
+            }
 
-        template <class Visitor>
-        void operator()(Visitor&& visitor, const FlatHeightfield& value) const
-        {
-            visitor(*this, value.mCellPosition);
-            visitor(*this, value.mCellSize);
-            visitor(*this, value.mHeight);
-        }
+            template <class Visitor>
+            void operator()(Visitor&& visitor, const Heightfield& value) const
+            {
+                visitor(*this, value.mCellPosition);
+                visitor(*this, value.mCellSize);
+                visitor(*this, value.mLength);
+                visitor(*this, value.mMinHeight);
+                visitor(*this, value.mMaxHeight);
+                visitor(*this, value.mHeights);
+                visitor(*this, value.mOriginalSize);
+                visitor(*this, value.mMinX);
+                visitor(*this, value.mMinY);
+            }
 
-        template <class Visitor>
-        void operator()(Visitor&& visitor, const RecastMesh& value) const
-        {
-            visitor(*this, value.getWater());
-            visitor(*this, value.getHeightfields());
-            visitor(*this, value.getFlatHeightfields());
-        }
+            template <class Visitor>
+            void operator()(Visitor&& visitor, const FlatHeightfield& value) const
+            {
+                visitor(*this, value.mCellPosition);
+                visitor(*this, value.mCellSize);
+                visitor(*this, value.mHeight);
+            }
 
-        template <class Visitor>
-        void operator()(Visitor&& visitor, const ESM::Position& value) const
-        {
-            visitor(*this, value.pos);
-            visitor(*this, value.rot);
-        }
+            template <class Visitor>
+            void operator()(Visitor&& visitor, const RecastMesh& value) const
+            {
+                visitor(*this, value.getWater());
+                visitor(*this, value.getHeightfields());
+                visitor(*this, value.getFlatHeightfields());
+            }
 
-        template <class Visitor>
-        void operator()(Visitor&& visitor, const ObjectTransform& value) const
-        {
-            visitor(*this, value.mPosition);
-            visitor(*this, value.mScale);
-        }
+            template <class Visitor>
+            void operator()(Visitor&& visitor, const ESM::Position& value) const
+            {
+                visitor(*this, value.pos);
+                visitor(*this, value.rot);
+            }
 
-        template <class Visitor>
-        void operator()(Visitor&& visitor, const DbRefGeometryObject& value) const
-        {
-            visitor(*this, value.mShapeId);
-            visitor(*this, value.mObjectTransform);
-        }
+            template <class Visitor>
+            void operator()(Visitor&& visitor, const ObjectTransform& value) const
+            {
+                visitor(*this, value.mPosition);
+                visitor(*this, value.mScale);
+            }
 
-        template <class Visitor>
-        void operator()(Visitor&& visitor, const RecastSettings& settings, const AgentBounds& agentBounds,
-            const RecastMesh& recastMesh, const std::vector<DbRefGeometryObject>& dbRefGeometryObjects) const
-        {
-            visitor(*this, DetourNavigator::recastMeshMagic);
-            visitor(*this, DetourNavigator::recastMeshVersion);
-            visitor(*this, settings);
-            visitor(*this, agentBounds);
-            visitor(*this, recastMesh);
-            visitor(*this, dbRefGeometryObjects);
-        }
+            template <class Visitor>
+            void operator()(Visitor&& visitor, const DbRefGeometryObject& value) const
+            {
+                visitor(*this, value.mShapeId);
+                visitor(*this, value.mObjectTransform);
+            }
 
-        template <class Visitor, class T>
-        auto operator()(Visitor&& visitor, T& value) const
-            -> std::enable_if_t<std::is_same_v<std::decay_t<T>, rcPolyMesh>>
-        {
-            visitor(*this, value.nverts);
-            visitor(*this, value.npolys);
-            visitor(*this, value.maxpolys);
-            visitor(*this, value.nvp);
-            visitor(*this, value.bmin);
-            visitor(*this, value.bmax);
-            visitor(*this, value.cs);
-            visitor(*this, value.ch);
-            visitor(*this, value.borderSize);
-            visitor(*this, value.maxEdgeError);
-            if constexpr (mode == Serialization::Mode::Read)
+            template <class Visitor>
+            void operator()(Visitor&& visitor, const RecastSettings& settings, const AgentBounds& agentBounds,
+                const RecastMesh& recastMesh, const std::vector<DbRefGeometryObject>& dbRefGeometryObjects) const
             {
-                if (value.verts == nullptr)
-                    permRecastAlloc(value.verts, getVertsLength(value));
-                if (value.polys == nullptr)
-                    permRecastAlloc(value.polys, getPolysLength(value));
-                if (value.regs == nullptr)
-                    permRecastAlloc(value.regs, getRegsLength(value));
-                if (value.flags == nullptr)
-                    permRecastAlloc(value.flags, getFlagsLength(value));
-                if (value.areas == nullptr)
-                    permRecastAlloc(value.areas, getAreasLength(value));
+                visitor(*this, DetourNavigator::recastMeshMagic);
+                visitor(*this, DetourNavigator::recastMeshVersion);
+                visitor(*this, settings);
+                visitor(*this, agentBounds);
+                visitor(*this, recastMesh);
+                visitor(*this, dbRefGeometryObjects);
             }
-            visitor(*this, value.verts, getVertsLength(value));
-            visitor(*this, value.polys, getPolysLength(value));
-            visitor(*this, value.regs, getRegsLength(value));
-            visitor(*this, value.flags, getFlagsLength(value));
-            visitor(*this, value.areas, getAreasLength(value));
-        }
 
-        template <class Visitor, class T>
-        auto operator()(Visitor&& visitor, T& value) const
-            -> std::enable_if_t<std::is_same_v<std::decay_t<T>, rcPolyMeshDetail>>
-        {
-            visitor(*this, value.nmeshes);
-            if constexpr (mode == Serialization::Mode::Read)
-                if (value.meshes == nullptr)
-                    permRecastAlloc(value.meshes, getMeshesLength(value));
-            visitor(*this, value.meshes, getMeshesLength(value));
-            visitor(*this, value.nverts);
-            if constexpr (mode == Serialization::Mode::Read)
-                if (value.verts == nullptr)
-                    permRecastAlloc(value.verts, getVertsLength(value));
-            visitor(*this, value.verts, getVertsLength(value));
-            visitor(*this, value.ntris);
-            if constexpr (mode == Serialization::Mode::Read)
-                if (value.tris == nullptr)
-                    permRecastAlloc(value.tris, getTrisLength(value));
-            visitor(*this, value.tris, getTrisLength(value));
-        }
+            template <class Visitor, class T>
+            auto operator()(Visitor&& visitor, T& value) const
+                -> std::enable_if_t<std::is_same_v<std::decay_t<T>, rcPolyMesh>>
+            {
+                visitor(*this, value.nverts);
+                visitor(*this, value.npolys);
+                visitor(*this, value.maxpolys);
+                visitor(*this, value.nvp);
+                visitor(*this, value.bmin);
+                visitor(*this, value.bmax);
+                visitor(*this, value.cs);
+                visitor(*this, value.ch);
+                visitor(*this, value.borderSize);
+                visitor(*this, value.maxEdgeError);
+                if constexpr (mode == Serialization::Mode::Read)
+                {
+                    if (value.verts == nullptr)
+                        permRecastAlloc(value.verts, getVertsLength(value));
+                    if (value.polys == nullptr)
+                        permRecastAlloc(value.polys, getPolysLength(value));
+                    if (value.regs == nullptr)
+                        permRecastAlloc(value.regs, getRegsLength(value));
+                    if (value.flags == nullptr)
+                        permRecastAlloc(value.flags, getFlagsLength(value));
+                    if (value.areas == nullptr)
+                        permRecastAlloc(value.areas, getAreasLength(value));
+                }
+                visitor(*this, value.verts, getVertsLength(value));
+                visitor(*this, value.polys, getPolysLength(value));
+                visitor(*this, value.regs, getRegsLength(value));
+                visitor(*this, value.flags, getFlagsLength(value));
+                visitor(*this, value.areas, getAreasLength(value));
+            }
 
-        template <class Visitor, class T>
-        auto operator()(Visitor&& visitor, T& value) const
-            -> std::enable_if_t<std::is_same_v<std::decay_t<T>, PreparedNavMeshData>>
-        {
-            if constexpr (mode == Serialization::Mode::Write)
+            template <class Visitor, class T>
+            auto operator()(Visitor&& visitor, T& value) const
+                -> std::enable_if_t<std::is_same_v<std::decay_t<T>, rcPolyMeshDetail>>
             {
-                visitor(*this, DetourNavigator::preparedNavMeshDataMagic);
-                visitor(*this, DetourNavigator::preparedNavMeshDataVersion);
+                visitor(*this, value.nmeshes);
+                if constexpr (mode == Serialization::Mode::Read)
+                    if (value.meshes == nullptr)
+                        permRecastAlloc(value.meshes, getMeshesLength(value));
+                visitor(*this, value.meshes, getMeshesLength(value));
+                visitor(*this, value.nverts);
+                if constexpr (mode == Serialization::Mode::Read)
+                    if (value.verts == nullptr)
+                        permRecastAlloc(value.verts, getVertsLength(value));
+                visitor(*this, value.verts, getVertsLength(value));
+                visitor(*this, value.ntris);
+                if constexpr (mode == Serialization::Mode::Read)
+                    if (value.tris == nullptr)
+                        permRecastAlloc(value.tris, getTrisLength(value));
+                visitor(*this, value.tris, getTrisLength(value));
             }
-            else
+
+            template <class Visitor, class T>
+            auto operator()(Visitor&& visitor, T& value) const
+                -> std::enable_if_t<std::is_same_v<std::decay_t<T>, PreparedNavMeshData>>
             {
-                static_assert(mode == Serialization::Mode::Read);
-                char magic[std::size(DetourNavigator::preparedNavMeshDataMagic)];
-                visitor(*this, magic);
-                if (std::memcmp(magic, DetourNavigator::preparedNavMeshDataMagic, sizeof(magic)) != 0)
-                    throw std::runtime_error("Bad PreparedNavMeshData magic");
-                std::uint32_t version = 0;
-                visitor(*this, version);
-                if (version != DetourNavigator::preparedNavMeshDataVersion)
-                    throw std::runtime_error("Bad PreparedNavMeshData version");
+                if constexpr (mode == Serialization::Mode::Write)
+                {
+                    visitor(*this, DetourNavigator::preparedNavMeshDataMagic);
+                    visitor(*this, DetourNavigator::preparedNavMeshDataVersion);
+                }
+                else
+                {
+                    static_assert(mode == Serialization::Mode::Read);
+                    char magic[std::size(DetourNavigator::preparedNavMeshDataMagic)];
+                    visitor(*this, magic);
+                    if (std::memcmp(magic, DetourNavigator::preparedNavMeshDataMagic, sizeof(magic)) != 0)
+                        throw std::runtime_error("Bad PreparedNavMeshData magic");
+                    std::uint32_t version = 0;
+                    visitor(*this, version);
+                    if (version != DetourNavigator::preparedNavMeshDataVersion)
+                        throw std::runtime_error("Bad PreparedNavMeshData version");
+                }
+                visitor(*this, value.mUserId);
+                visitor(*this, value.mCellSize);
+                visitor(*this, value.mCellHeight);
+                visitor(*this, value.mPolyMesh);
+                visitor(*this, value.mPolyMeshDetail);
             }
-            visitor(*this, value.mUserId);
-            visitor(*this, value.mCellSize);
-            visitor(*this, value.mCellHeight);
-            visitor(*this, value.mPolyMesh);
-            visitor(*this, value.mPolyMeshDetail);
-        }
 
-        template <class Visitor>
-        void operator()(Visitor&& visitor, const AgentBounds& value) const
-        {
-            visitor(*this, value.mShapeType);
-            visitor(*this, value.mHalfExtents);
-        }
-    };
-}
+            template <class Visitor>
+            void operator()(Visitor&& visitor, const AgentBounds& value) const
+            {
+                visitor(*this, value.mShapeType);
+                visitor(*this, value.mHalfExtents);
+            }
+        };
+    }
 } // namespace DetourNavigator
 
 namespace DetourNavigator
@@ -251,8 +251,8 @@ namespace DetourNavigator
         Serialization::SizeAccumulator sizeAccumulator;
         format(sizeAccumulator, settings, agentBounds, recastMesh, dbRefGeometryObjects);
         std::vector<std::byte> result(sizeAccumulator.value());
-        format(Serialization::BinaryWriter(result.data(), result.data() + result.size()),
-               settings, agentBounds, recastMesh, dbRefGeometryObjects);
+        format(Serialization::BinaryWriter(result.data(), result.data() + result.size()), settings, agentBounds,
+            recastMesh, dbRefGeometryObjects);
         return result;
     }
 
diff --git a/components/detournavigator/serialization.hpp b/components/detournavigator/serialization.hpp
index 93022df97e..d704d95f80 100644
--- a/components/detournavigator/serialization.hpp
+++ b/components/detournavigator/serialization.hpp
@@ -13,10 +13,10 @@ namespace DetourNavigator
     struct RecastSettings;
     struct AgentBounds;
 
-    constexpr char recastMeshMagic[] = {'r', 'c', 's', 't'};
+    constexpr char recastMeshMagic[] = { 'r', 'c', 's', 't' };
     constexpr std::uint32_t recastMeshVersion = 2;
 
-    constexpr char preparedNavMeshDataMagic[] = {'p', 'n', 'a', 'v'};
+    constexpr char preparedNavMeshDataMagic[] = { 'p', 'n', 'a', 'v' };
     constexpr std::uint32_t preparedNavMeshDataVersion = 1;
 
     std::vector<std::byte> serialize(const RecastSettings& settings, const AgentBounds& agentBounds,
diff --git a/components/detournavigator/settings.cpp b/components/detournavigator/settings.cpp
index 178a1215a5..7467feb55f 100644
--- a/components/detournavigator/settings.cpp
+++ b/components/detournavigator/settings.cpp
@@ -1,7 +1,7 @@
 #include "settings.hpp"
 
-#include <components/settings/settings.hpp>
 #include <components/misc/constants.hpp>
+#include <components/settings/settings.hpp>
 
 #include <algorithm>
 
@@ -17,11 +17,14 @@ namespace DetourNavigator
         result.mCellHeight = std::max(epsilon, ::Settings::Manager::getFloat("cell height", "Navigator"));
         result.mCellSize = std::max(epsilon, ::Settings::Manager::getFloat("cell size", "Navigator"));
         result.mDetailSampleDist = std::max(0.0f, ::Settings::Manager::getFloat("detail sample dist", "Navigator"));
-        result.mDetailSampleMaxError = std::max(0.0f, ::Settings::Manager::getFloat("detail sample max error", "Navigator"));
+        result.mDetailSampleMaxError
+            = std::max(0.0f, ::Settings::Manager::getFloat("detail sample max error", "Navigator"));
         result.mMaxClimb = Constants::sStepSizeUp;
-        result.mMaxSimplificationError = std::max(0.0f, ::Settings::Manager::getFloat("max simplification error", "Navigator"));
+        result.mMaxSimplificationError
+            = std::max(0.0f, ::Settings::Manager::getFloat("max simplification error", "Navigator"));
         result.mMaxSlope = Constants::sMaxSlope;
-        result.mRecastScaleFactor = std::max(epsilon, ::Settings::Manager::getFloat("recast scale factor", "Navigator"));
+        result.mRecastScaleFactor
+            = std::max(epsilon, ::Settings::Manager::getFloat("recast scale factor", "Navigator"));
         result.mSwimHeightScale = 0;
         result.mMaxEdgeLen = std::max(0, ::Settings::Manager::getInt("max edge len", "Navigator"));
         result.mMaxVertsPerPoly = std::max(3, ::Settings::Manager::getInt("max verts per poly", "Navigator"));
@@ -36,10 +39,14 @@ namespace DetourNavigator
     {
         DetourSettings result;
 
-        result.mMaxNavMeshQueryNodes = std::clamp(::Settings::Manager::getInt("max nav mesh query nodes", "Navigator"), 1, 65535);
-        result.mMaxPolys = std::clamp(::Settings::Manager::getInt("max polygons per tile", "Navigator"), 1, (1 << 22) - 1);
-        result.mMaxPolygonPathSize = static_cast<std::size_t>(std::max(0, ::Settings::Manager::getInt("max polygon path size", "Navigator")));
-        result.mMaxSmoothPathSize = static_cast<std::size_t>(std::max(0, ::Settings::Manager::getInt("max smooth path size", "Navigator")));
+        result.mMaxNavMeshQueryNodes
+            = std::clamp(::Settings::Manager::getInt("max nav mesh query nodes", "Navigator"), 1, 65535);
+        result.mMaxPolys
+            = std::clamp(::Settings::Manager::getInt("max polygons per tile", "Navigator"), 1, (1 << 22) - 1);
+        result.mMaxPolygonPathSize
+            = static_cast<std::size_t>(std::max(0, ::Settings::Manager::getInt("max polygon path size", "Navigator")));
+        result.mMaxSmoothPathSize
+            = static_cast<std::size_t>(std::max(0, ::Settings::Manager::getInt("max smooth path size", "Navigator")));
 
         return result;
     }
@@ -51,19 +58,27 @@ namespace DetourNavigator
         result.mRecast = makeRecastSettingsFromSettingsManager();
         result.mDetour = makeDetourSettingsFromSettingsManager();
         result.mMaxTilesNumber = std::max(0, ::Settings::Manager::getInt("max tiles number", "Navigator"));
-        result.mWaitUntilMinDistanceToPlayer = ::Settings::Manager::getInt("wait until min distance to player", "Navigator");
-        result.mAsyncNavMeshUpdaterThreads = static_cast<std::size_t>(std::max(0, ::Settings::Manager::getInt("async nav mesh updater threads", "Navigator")));
-        result.mMaxNavMeshTilesCacheSize = static_cast<std::size_t>(std::max(std::int64_t {0}, ::Settings::Manager::getInt64("max nav mesh tiles cache size", "Navigator")));
-        result.mEnableWriteRecastMeshToFile = ::Settings::Manager::getBool("enable write recast mesh to file", "Navigator");
+        result.mWaitUntilMinDistanceToPlayer
+            = ::Settings::Manager::getInt("wait until min distance to player", "Navigator");
+        result.mAsyncNavMeshUpdaterThreads = static_cast<std::size_t>(
+            std::max(0, ::Settings::Manager::getInt("async nav mesh updater threads", "Navigator")));
+        result.mMaxNavMeshTilesCacheSize = static_cast<std::size_t>(
+            std::max(std::int64_t{ 0 }, ::Settings::Manager::getInt64("max nav mesh tiles cache size", "Navigator")));
+        result.mEnableWriteRecastMeshToFile
+            = ::Settings::Manager::getBool("enable write recast mesh to file", "Navigator");
         result.mEnableWriteNavMeshToFile = ::Settings::Manager::getBool("enable write nav mesh to file", "Navigator");
         result.mRecastMeshPathPrefix = ::Settings::Manager::getString("recast mesh path prefix", "Navigator");
         result.mNavMeshPathPrefix = ::Settings::Manager::getString("nav mesh path prefix", "Navigator");
-        result.mEnableRecastMeshFileNameRevision = ::Settings::Manager::getBool("enable recast mesh file name revision", "Navigator");
-        result.mEnableNavMeshFileNameRevision = ::Settings::Manager::getBool("enable nav mesh file name revision", "Navigator");
-        result.mMinUpdateInterval = std::chrono::milliseconds(::Settings::Manager::getInt("min update interval ms", "Navigator"));
+        result.mEnableRecastMeshFileNameRevision
+            = ::Settings::Manager::getBool("enable recast mesh file name revision", "Navigator");
+        result.mEnableNavMeshFileNameRevision
+            = ::Settings::Manager::getBool("enable nav mesh file name revision", "Navigator");
+        result.mMinUpdateInterval
+            = std::chrono::milliseconds(::Settings::Manager::getInt("min update interval ms", "Navigator"));
         result.mEnableNavMeshDiskCache = ::Settings::Manager::getBool("enable nav mesh disk cache", "Navigator");
         result.mWriteToNavMeshDb = ::Settings::Manager::getBool("write to navmeshdb", "Navigator");
-        result.mMaxDbFileSize = static_cast<std::uint64_t>(::Settings::Manager::getInt64("max navmeshdb file size", "Navigator"));
+        result.mMaxDbFileSize
+            = static_cast<std::uint64_t>(::Settings::Manager::getInt64("max navmeshdb file size", "Navigator"));
 
         return result;
     }
diff --git a/components/detournavigator/settingsutils.hpp b/components/detournavigator/settingsutils.hpp
index c1e611aaf8..10e99d002f 100644
--- a/components/detournavigator/settingsutils.hpp
+++ b/components/detournavigator/settingsutils.hpp
@@ -31,10 +31,7 @@ namespace DetourNavigator
 
     inline TileBounds toNavMeshCoordinates(const RecastSettings& settings, const TileBounds& value)
     {
-        return TileBounds {
-            toNavMeshCoordinates(settings, value.mMin),
-            toNavMeshCoordinates(settings, value.mMax)
-        };
+        return TileBounds{ toNavMeshCoordinates(settings, value.mMin), toNavMeshCoordinates(settings, value.mMax) };
     }
 
     inline float fromNavMeshCoordinates(const RecastSettings& settings, float value)
@@ -77,7 +74,7 @@ namespace DetourNavigator
 
     inline TileBounds makeTileBounds(const RecastSettings& settings, const TilePosition& tilePosition)
     {
-        return TileBounds {
+        return TileBounds{
             osg::Vec2f(tilePosition.x(), tilePosition.y()) * getTileSize(settings),
             osg::Vec2f(tilePosition.x() + 1, tilePosition.y() + 1) * getTileSize(settings),
         };
diff --git a/components/detournavigator/stats.cpp b/components/detournavigator/stats.cpp
index 6150210c16..bc307bc772 100644
--- a/components/detournavigator/stats.cpp
+++ b/components/detournavigator/stats.cpp
@@ -15,20 +15,23 @@ namespace DetourNavigator
 
             if (stats.mDb.has_value())
             {
-                out.setAttribute(frameNumber, "NavMesh DbJobs Write", static_cast<double>(stats.mDb->mJobs.mWritingJobs));
-                out.setAttribute(frameNumber, "NavMesh DbJobs Read", static_cast<double>(stats.mDb->mJobs.mReadingJobs));
+                out.setAttribute(
+                    frameNumber, "NavMesh DbJobs Write", static_cast<double>(stats.mDb->mJobs.mWritingJobs));
+                out.setAttribute(
+                    frameNumber, "NavMesh DbJobs Read", static_cast<double>(stats.mDb->mJobs.mReadingJobs));
 
                 if (stats.mDb->mGetTileCount > 0)
-                    out.setAttribute(frameNumber, "NavMesh DbCacheHitRate", static_cast<double>(stats.mDbGetTileHits)
-                                     / static_cast<double>(stats.mDb->mGetTileCount) * 100.0);
+                    out.setAttribute(frameNumber, "NavMesh DbCacheHitRate",
+                        static_cast<double>(stats.mDbGetTileHits) / static_cast<double>(stats.mDb->mGetTileCount)
+                            * 100.0);
             }
 
             out.setAttribute(frameNumber, "NavMesh CacheSize", static_cast<double>(stats.mCache.mNavMeshCacheSize));
             out.setAttribute(frameNumber, "NavMesh UsedTiles", static_cast<double>(stats.mCache.mUsedNavMeshTiles));
             out.setAttribute(frameNumber, "NavMesh CachedTiles", static_cast<double>(stats.mCache.mCachedNavMeshTiles));
             if (stats.mCache.mGetCount > 0)
-                out.setAttribute(frameNumber, "NavMesh CacheHitRate", static_cast<double>(stats.mCache.mHitCount)
-                                 / stats.mCache.mGetCount * 100.0);
+                out.setAttribute(frameNumber, "NavMesh CacheHitRate",
+                    static_cast<double>(stats.mCache.mHitCount) / stats.mCache.mGetCount * 100.0);
         }
     }
 
diff --git a/components/detournavigator/tilebounds.hpp b/components/detournavigator/tilebounds.hpp
index 2dc32292e8..ef1181307c 100644
--- a/components/detournavigator/tilebounds.hpp
+++ b/components/detournavigator/tilebounds.hpp
@@ -31,12 +31,12 @@ namespace DetourNavigator
         return tie(lhs) < tie(rhs);
     }
 
-    inline bool operator ==(const TileBounds& lhs, const TileBounds& rhs) noexcept
+    inline bool operator==(const TileBounds& lhs, const TileBounds& rhs) noexcept
     {
         return tie(lhs) == tie(rhs);
     }
 
-    inline bool operator !=(const TileBounds& lhs, const TileBounds& rhs) noexcept
+    inline bool operator!=(const TileBounds& lhs, const TileBounds& rhs) noexcept
     {
         return !(lhs == rhs);
     }
@@ -51,15 +51,13 @@ namespace DetourNavigator
         const float maxY = std::min(a.mMax.y(), b.mMax.y());
         if (minY > maxY)
             return std::nullopt;
-        return TileBounds {osg::Vec2f(minX, minY), osg::Vec2f(maxX, maxY)};
+        return TileBounds{ osg::Vec2f(minX, minY), osg::Vec2f(maxX, maxY) };
     }
 
     inline TileBounds maxCellTileBounds(const osg::Vec2i& position, int size)
     {
-        return TileBounds {
-            osg::Vec2f(position.x(), position.y()) * size,
-            osg::Vec2f(position.x() + 1, position.y() + 1) * size
-        };
+        return TileBounds{ osg::Vec2f(position.x(), position.y()) * size,
+            osg::Vec2f(position.x() + 1, position.y() + 1) * size };
     }
 
     inline TileBounds makeObjectTileBounds(const btCollisionShape& shape, const btTransform& transform)
@@ -67,7 +65,7 @@ namespace DetourNavigator
         btVector3 aabbMin;
         btVector3 aabbMax;
         shape.getAabb(transform, aabbMin, aabbMax);
-        return TileBounds {Misc::Convert::toOsgXY(aabbMin), Misc::Convert::toOsgXY(aabbMax)};
+        return TileBounds{ Misc::Convert::toOsgXY(aabbMin), Misc::Convert::toOsgXY(aabbMax) };
     }
 }
 
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index d8eb773e22..069798933d 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -1,26 +1,25 @@
 #include "tilecachedrecastmeshmanager.hpp"
-#include "gettilespositions.hpp"
-#include "settingsutils.hpp"
 #include "changetype.hpp"
+#include "gettilespositions.hpp"
 #include "recastmeshbuilder.hpp"
+#include "settingsutils.hpp"
 
-#include <components/misc/convert.hpp>
 #include <components/bullethelpers/aabb.hpp>
+#include <components/misc/convert.hpp>
 
 #include <boost/geometry/geometry.hpp>
 
 #include <algorithm>
-#include <vector>
 #include <limits>
+#include <vector>
 
 namespace DetourNavigator
 {
     namespace
     {
-        const TileBounds infiniteTileBounds {
-            osg::Vec2f(-std::numeric_limits<float>::max(), -std::numeric_limits<float>::max()),
-            osg::Vec2f(std::numeric_limits<float>::max(), std::numeric_limits<float>::max())
-        };
+        const TileBounds infiniteTileBounds{ osg::Vec2f(-std::numeric_limits<float>::max(),
+                                                 -std::numeric_limits<float>::max()),
+            osg::Vec2f(std::numeric_limits<float>::max(), std::numeric_limits<float>::max()) };
 
         struct AddHeightfield
         {
@@ -33,10 +32,7 @@ namespace DetourNavigator
                 mBuilder.addHeightfield(mCellPosition, mCellSize, v.mHeights, v.mSize, v.mMinHeight, v.mMaxHeight);
             }
 
-            void operator()(HeightfieldPlane v)
-            {
-                mBuilder.addHeightfield(mCellPosition, mCellSize, v.mHeight);
-            }
+            void operator()(HeightfieldPlane v) { mBuilder.addHeightfield(mCellPosition, mCellSize, v.mHeight); }
         };
 
         TilePosition makeTilePosition(const boost::geometry::model::point<int, 2, boost::geometry::cs::cartesian>& v)
@@ -50,7 +46,8 @@ namespace DetourNavigator
         public:
             explicit MaybeLockGuard(Mutex& mutex, const TileCachedRecastMeshManager::UpdateGuard* guard)
                 : mImpl(guard == nullptr ? std::optional<std::unique_lock<Mutex>>(mutex) : std::nullopt)
-            {}
+            {
+            }
 
         private:
             const std::optional<std::unique_lock<Mutex>> mImpl;
@@ -61,7 +58,8 @@ namespace DetourNavigator
         : mSettings(settings)
         , mBounds(infiniteTileBounds)
         , mRange(makeTilesPositionsRange(mBounds.mMin, mBounds.mMax, mSettings))
-    {}
+    {
+    }
 
     void TileCachedRecastMeshManager::setBounds(const TileBounds& bounds, const UpdateGuard* guard)
     {
@@ -74,11 +72,10 @@ namespace DetourNavigator
         {
             for (const auto& [id, data] : mObjects)
             {
-                const TilesPositionsRange objectRange = makeTilesPositionsRange(data->mObject.getShape(),
-                    data->mObject.getTransform(), mSettings);
+                const TilesPositionsRange objectRange
+                    = makeTilesPositionsRange(data->mObject.getShape(), data->mObject.getTransform(), mSettings);
 
-                getTilesPositions(getIntersection(mRange, objectRange), [&] (const TilePosition& v)
-                {
+                getTilesPositions(getIntersection(mRange, objectRange), [&](const TilePosition& v) {
                     if (!isInTilesPositionsRange(newRange, v))
                     {
                         addChangedTile(v, ChangeType::remove);
@@ -86,8 +83,7 @@ namespace DetourNavigator
                     }
                 });
 
-                getTilesPositions(getIntersection(newRange, objectRange), [&] (const TilePosition& v)
-                {
+                getTilesPositions(getIntersection(newRange, objectRange), [&](const TilePosition& v) {
                     if (!isInTilesPositionsRange(mRange, v))
                     {
                         addChangedTile(v, ChangeType::add);
@@ -110,7 +106,7 @@ namespace DetourNavigator
     TilesPositionsRange TileCachedRecastMeshManager::getRange() const
     {
         const auto bounds = mObjectIndex.bounds();
-        return TilesPositionsRange {
+        return TilesPositionsRange{
             .mBegin = makeTilePosition(bounds.min_corner()),
             .mEnd = makeTilePosition(bounds.max_corner()) + TilePosition(1, 1),
         };
@@ -141,25 +137,30 @@ namespace DetourNavigator
             if (it != mObjects.end())
                 return false;
             const std::size_t revision = mRevision + 1;
-            ObjectData* const dataPtr = mObjects.emplace_hint(it, id, std::unique_ptr<ObjectData>(new ObjectData {
-                .mObject = RecastMeshObject(shape, transform, areaType),
-                .mRange = range,
-                .mAabb = CommulativeAabb(revision, BulletHelpers::getAabb(shape.getShape(), transform)),
-                .mGeneration = mGeneration,
-                .mRevision = revision,
-                .mLastNavMeshReportedChange = {},
-                .mLastNavMeshReport = {},
-            }))->second.get();
+            ObjectData* const dataPtr
+                = mObjects
+                      .emplace_hint(it, id,
+                          std::unique_ptr<ObjectData>(new ObjectData{
+                              .mObject = RecastMeshObject(shape, transform, areaType),
+                              .mRange = range,
+                              .mAabb = CommulativeAabb(revision, BulletHelpers::getAabb(shape.getShape(), transform)),
+                              .mGeneration = mGeneration,
+                              .mRevision = revision,
+                              .mLastNavMeshReportedChange = {},
+                              .mLastNavMeshReport = {},
+                          }))
+                      ->second.get();
             assert(range.mBegin != range.mEnd);
             mObjectIndex.insert(makeObjectIndexValue(range, dataPtr));
             mRevision = revision;
         }
-        getTilesPositions(getIntersection(range, mRange),
-                          [&] (const TilePosition& v) { addChangedTile(v, ChangeType::add); });
+        getTilesPositions(
+            getIntersection(range, mRange), [&](const TilePosition& v) { addChangedTile(v, ChangeType::add); });
         return true;
     }
 
-    bool TileCachedRecastMeshManager::updateObject(ObjectId id, const btTransform& transform, const AreaType areaType, const UpdateGuard* guard)
+    bool TileCachedRecastMeshManager::updateObject(
+        ObjectId id, const btTransform& transform, const AreaType areaType, const UpdateGuard* guard)
     {
         TilesPositionsRange newRange;
         TilesPositionsRange oldRange;
@@ -171,7 +172,8 @@ namespace DetourNavigator
             if (!it->second->mObject.update(transform, areaType))
                 return false;
             const std::size_t lastChangeRevision = it->second->mLastNavMeshReportedChange.has_value()
-                    ? it->second->mLastNavMeshReportedChange->mRevision : mRevision;
+                ? it->second->mLastNavMeshReportedChange->mRevision
+                : mRevision;
             const btCollisionShape& shape = it->second->mObject.getShape();
             if (!it->second->mAabb.update(lastChangeRevision, BulletHelpers::getAabb(shape, transform)))
                 return false;
@@ -189,18 +191,16 @@ namespace DetourNavigator
         if (newRange == oldRange)
         {
             getTilesPositions(getIntersection(newRange, mRange),
-                              [&] (const TilePosition& v) { addChangedTile(v, ChangeType::update); });
+                [&](const TilePosition& v) { addChangedTile(v, ChangeType::update); });
         }
         else
         {
-            getTilesPositions(getIntersection(newRange, mRange), [&] (const TilePosition& v)
-            {
-                const ChangeType changeType = isInTilesPositionsRange(oldRange, v)
-                        ? ChangeType::update : ChangeType::add;
+            getTilesPositions(getIntersection(newRange, mRange), [&](const TilePosition& v) {
+                const ChangeType changeType
+                    = isInTilesPositionsRange(oldRange, v) ? ChangeType::update : ChangeType::add;
                 addChangedTile(v, changeType);
             });
-            getTilesPositions(getIntersection(oldRange, mRange), [&] (const TilePosition& v)
-            {
+            getTilesPositions(getIntersection(oldRange, mRange), [&](const TilePosition& v) {
                 if (!isInTilesPositionsRange(newRange, v))
                     addChangedTile(v, ChangeType::remove);
             });
@@ -221,27 +221,29 @@ namespace DetourNavigator
             mObjects.erase(it);
             ++mRevision;
         }
-        getTilesPositions(getIntersection(range, mRange),
-                          [&] (const TilePosition& v) { addChangedTile(v, ChangeType::remove); });
+        getTilesPositions(
+            getIntersection(range, mRange), [&](const TilePosition& v) { addChangedTile(v, ChangeType::remove); });
     }
 
-    void TileCachedRecastMeshManager::addWater(const osg::Vec2i& cellPosition, const int cellSize, const float level, const UpdateGuard* guard)
+    void TileCachedRecastMeshManager::addWater(
+        const osg::Vec2i& cellPosition, const int cellSize, const float level, const UpdateGuard* guard)
     {
         const btVector3 shift = Misc::Convert::toBullet(getWaterShift3d(cellPosition, cellSize, level));
         const std::optional<TilesPositionsRange> range = cellSize == std::numeric_limits<int>::max()
-                ? std::optional<TilesPositionsRange>()
-                : makeTilesPositionsRange(cellSize, shift, mSettings);
+            ? std::optional<TilesPositionsRange>()
+            : makeTilesPositionsRange(cellSize, shift, mSettings);
         {
             const MaybeLockGuard lock(mMutex, guard);
             auto it = mWater.find(cellPosition);
             if (it != mWater.end())
                 return;
             const std::size_t revision = mRevision + 1;
-            it = mWater.emplace_hint(it, cellPosition, WaterData {
-                .mWater = Water {.mCellSize = cellSize, .mLevel = level},
-                .mRange = range,
-                .mRevision = revision,
-            });
+            it = mWater.emplace_hint(it, cellPosition,
+                WaterData{
+                    .mWater = Water{ .mCellSize = cellSize, .mLevel = level },
+                    .mRange = range,
+                    .mRevision = revision,
+                });
             if (range.has_value())
                 mWaterIndex.insert(makeWaterIndexValue(*range, it));
             else
@@ -270,25 +272,26 @@ namespace DetourNavigator
         addChangedTiles(range, ChangeType::remove);
     }
 
-    void TileCachedRecastMeshManager::addHeightfield(const osg::Vec2i& cellPosition, const int cellSize,
-        const HeightfieldShape& shape, const UpdateGuard* guard)
+    void TileCachedRecastMeshManager::addHeightfield(
+        const osg::Vec2i& cellPosition, const int cellSize, const HeightfieldShape& shape, const UpdateGuard* guard)
     {
         const btVector3 shift = getHeightfieldShift(shape, cellPosition, cellSize);
         const std::optional<TilesPositionsRange> range = cellSize == std::numeric_limits<int>::max()
-                ? std::optional<TilesPositionsRange>()
-                : makeTilesPositionsRange(cellSize, shift, mSettings);
+            ? std::optional<TilesPositionsRange>()
+            : makeTilesPositionsRange(cellSize, shift, mSettings);
         {
             const MaybeLockGuard lock(mMutex, guard);
             auto it = mHeightfields.find(cellPosition);
             if (it != mHeightfields.end())
                 return;
             const std::size_t revision = mRevision + 1;
-            it = mHeightfields.emplace_hint(it, cellPosition, HeightfieldData {
-                .mCellSize = cellSize,
-                .mShape = shape,
-                .mRange = range,
-                .mRevision = revision,
-            });
+            it = mHeightfields.emplace_hint(it, cellPosition,
+                HeightfieldData{
+                    .mCellSize = cellSize,
+                    .mShape = shape,
+                    .mRange = range,
+                    .mRevision = revision,
+                });
             if (range.has_value())
                 mHeightfieldIndex.insert(makeHeightfieldIndexValue(*range, it));
             else
@@ -317,8 +320,8 @@ namespace DetourNavigator
         addChangedTiles(range, ChangeType::remove);
     }
 
-    std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::getMesh(std::string_view worldspace,
-        const TilePosition& tilePosition)
+    std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::getMesh(
+        std::string_view worldspace, const TilePosition& tilePosition)
     {
         {
             const std::lock_guard lock(mMutex);
@@ -332,16 +335,17 @@ namespace DetourNavigator
         if (result != nullptr)
         {
             const std::lock_guard lock(mMutex);
-            mCache.insert_or_assign(tilePosition, CachedTile {
-                .mVersion = result->getVersion(),
-                .mRecastMesh = result,
-            });
+            mCache.insert_or_assign(tilePosition,
+                CachedTile{
+                    .mVersion = result->getVersion(),
+                    .mRecastMesh = result,
+                });
         }
         return result;
     }
 
-    std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::getCachedMesh(std::string_view worldspace,
-        const TilePosition& tilePosition) const
+    std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::getCachedMesh(
+        std::string_view worldspace, const TilePosition& tilePosition) const
     {
         const std::lock_guard lock(mMutex);
         if (mWorldspace != worldspace)
@@ -352,8 +356,8 @@ namespace DetourNavigator
         return it->second.mRecastMesh;
     }
 
-    std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::getNewMesh(std::string_view worldspace,
-        const TilePosition& tilePosition) const
+    std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::getNewMesh(
+        std::string_view worldspace, const TilePosition& tilePosition) const
     {
         {
             const std::lock_guard lock(mMutex);
@@ -363,8 +367,8 @@ namespace DetourNavigator
         return makeMesh(tilePosition);
     }
 
-    void TileCachedRecastMeshManager::reportNavMeshChange(const TilePosition& tilePosition,
-        Version recastMeshVersion, Version navMeshVersion)
+    void TileCachedRecastMeshManager::reportNavMeshChange(
+        const TilePosition& tilePosition, Version recastMeshVersion, Version navMeshVersion)
     {
         const std::lock_guard lock(mMutex);
         for (auto it = mObjectIndex.qbegin(makeIndexQuery(tilePosition)); it != mObjectIndex.qend(); ++it)
@@ -374,9 +378,9 @@ namespace DetourNavigator
                 continue;
             if (object.mLastNavMeshReport.has_value() && navMeshVersion < object.mLastNavMeshReport->mNavMeshVersion)
                 continue;
-            object.mLastNavMeshReport = {recastMeshVersion.mRevision, navMeshVersion};
+            object.mLastNavMeshReport = { recastMeshVersion.mRevision, navMeshVersion };
             if (!object.mLastNavMeshReportedChange.has_value()
-                    || object.mLastNavMeshReportedChange->mNavMeshVersion < object.mLastNavMeshReport->mNavMeshVersion)
+                || object.mLastNavMeshReportedChange->mNavMeshVersion < object.mLastNavMeshReport->mNavMeshVersion)
                 object.mLastNavMeshReportedChange = object.mLastNavMeshReport;
         }
     }
@@ -401,7 +405,8 @@ namespace DetourNavigator
         return std::move(mChangedTiles);
     }
 
-    TileCachedRecastMeshManager::IndexPoint TileCachedRecastMeshManager::makeIndexPoint(const TilePosition& tilePosition)
+    TileCachedRecastMeshManager::IndexPoint TileCachedRecastMeshManager::makeIndexPoint(
+        const TilePosition& tilePosition)
     {
         return IndexPoint(tilePosition.x(), tilePosition.y());
     }
@@ -415,19 +420,19 @@ namespace DetourNavigator
     TileCachedRecastMeshManager::ObjectIndexValue TileCachedRecastMeshManager::makeObjectIndexValue(
         const TilesPositionsRange& range, ObjectData* id)
     {
-        return {makeIndexBox(range), id};
+        return { makeIndexBox(range), id };
     }
 
     TileCachedRecastMeshManager::WaterIndexValue TileCachedRecastMeshManager::makeWaterIndexValue(
         const TilesPositionsRange& range, std::map<osg::Vec2i, WaterData>::const_iterator it)
     {
-        return {makeIndexBox(range), it};
+        return { makeIndexBox(range), it };
     }
 
     TileCachedRecastMeshManager::HeightfieldIndexValue TileCachedRecastMeshManager::makeHeightfieldIndexValue(
         const TilesPositionsRange& range, std::map<osg::Vec2i, HeightfieldData>::const_iterator it)
     {
-        return {makeIndexBox(range), it};
+        return { makeIndexBox(range), it };
     }
 
     auto TileCachedRecastMeshManager::makeIndexQuery(const TilePosition& tilePosition)
@@ -440,13 +445,8 @@ namespace DetourNavigator
     std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::makeMesh(const TilePosition& tilePosition) const
     {
         RecastMeshBuilder builder(makeRealTileBoundsWithBorder(mSettings, tilePosition));
-        using Object = std::tuple<
-            osg::ref_ptr<const Resource::BulletShapeInstance>,
-            ObjectTransform,
-            std::reference_wrapper<const btCollisionShape>,
-            btTransform,
-            AreaType
-        >;
+        using Object = std::tuple<osg::ref_ptr<const Resource::BulletShapeInstance>, ObjectTransform,
+            std::reference_wrapper<const btCollisionShape>, btTransform, AreaType>;
         std::vector<Object> objects;
         Version version;
         bool hasInput = false;
@@ -461,7 +461,7 @@ namespace DetourNavigator
             for (auto it = mHeightfieldIndex.qbegin(makeIndexQuery(tilePosition)); it != mHeightfieldIndex.qend(); ++it)
             {
                 const auto& [cellPosition, data] = *it->second;
-                std::visit(AddHeightfield {cellPosition, data.mCellSize, builder}, data.mShape);
+                std::visit(AddHeightfield{ cellPosition, data.mCellSize, builder }, data.mShape);
                 hasInput = true;
             }
             objects.reserve(mObjects.size());
@@ -469,7 +469,7 @@ namespace DetourNavigator
             {
                 const auto& object = it->second->mObject;
                 objects.emplace_back(object.getInstance(), object.getObjectTransform(), object.getShape(),
-                                     object.getTransform(), object.getAreaType());
+                    object.getTransform(), object.getAreaType());
                 hasInput = true;
             }
             if (hasInput)
@@ -478,9 +478,8 @@ namespace DetourNavigator
                     builder.addWater(mInfiniteWater->first, mInfiniteWater->second.mWater);
                 if (mInfiniteHeightfield != mHeightfields.end())
                     std::visit(
-                        AddHeightfield {mInfiniteHeightfield->first, mInfiniteHeightfield->second.mCellSize, builder},
-                        mInfiniteHeightfield->second.mShape
-                    );
+                        AddHeightfield{ mInfiniteHeightfield->first, mInfiniteHeightfield->second.mCellSize, builder },
+                        mInfiniteHeightfield->second.mShape);
                 version.mGeneration = mGeneration;
                 version.mRevision = mRevision;
             }
@@ -492,10 +491,10 @@ namespace DetourNavigator
         return std::move(builder).create(version);
     }
 
-    void TileCachedRecastMeshManager::addChangedTiles(const std::optional<TilesPositionsRange>& range,
-        ChangeType changeType)
+    void TileCachedRecastMeshManager::addChangedTiles(
+        const std::optional<TilesPositionsRange>& range, ChangeType changeType)
     {
         if (range.has_value())
-            getTilesPositions(*range, [&] (const TilePosition& v) { addChangedTile(v, changeType); });
+            getTilesPositions(*range, [&](const TilePosition& v) { addChangedTile(v, changeType); });
     }
 }
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index 52fc1736cd..326d8a2a26 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -1,17 +1,16 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_TILECACHEDRECASTMESHMANAGER_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_TILECACHEDRECASTMESHMANAGER_H
 
-#include "tileposition.hpp"
+#include "areatype.hpp"
+#include "changetype.hpp"
+#include "commulativeaabb.hpp"
 #include "gettilespositions.hpp"
-#include "version.hpp"
 #include "heightfieldshape.hpp"
-#include "changetype.hpp"
 #include "objectid.hpp"
-#include "areatype.hpp"
+#include "recastmesh.hpp"
 #include "recastmeshobject.hpp"
-#include "commulativeaabb.hpp"
+#include "tileposition.hpp"
 #include "version.hpp"
-#include "recastmesh.hpp"
 
 #include <components/misc/guarded.hpp>
 
@@ -21,8 +20,8 @@
 
 #include <map>
 #include <mutex>
-#include <vector>
 #include <optional>
+#include <vector>
 
 namespace DetourNavigator
 {
@@ -34,7 +33,10 @@ namespace DetourNavigator
         class UpdateGuard
         {
         public:
-            explicit UpdateGuard(TileCachedRecastMeshManager& manager) : mImpl(manager.mMutex) {}
+            explicit UpdateGuard(TileCachedRecastMeshManager& manager)
+                : mImpl(manager.mMutex)
+            {
+            }
 
         private:
             const std::lock_guard<std::mutex> mImpl;
@@ -59,8 +61,8 @@ namespace DetourNavigator
 
         void removeWater(const osg::Vec2i& cellPosition, const UpdateGuard* guard);
 
-        void addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const HeightfieldShape& shape,
-            const UpdateGuard* guard);
+        void addHeightfield(
+            const osg::Vec2i& cellPosition, int cellSize, const HeightfieldShape& shape, const UpdateGuard* guard);
 
         void removeHeightfield(const osg::Vec2i& cellPosition, const UpdateGuard* guard);
 
@@ -147,11 +149,11 @@ namespace DetourNavigator
 
         inline static ObjectIndexValue makeObjectIndexValue(const TilesPositionsRange& range, ObjectData* data);
 
-        inline static WaterIndexValue makeWaterIndexValue(const TilesPositionsRange& range,
-            std::map<osg::Vec2i, WaterData>::const_iterator it);
+        inline static WaterIndexValue makeWaterIndexValue(
+            const TilesPositionsRange& range, std::map<osg::Vec2i, WaterData>::const_iterator it);
 
-        inline static HeightfieldIndexValue makeHeightfieldIndexValue(const TilesPositionsRange& range,
-            std::map<osg::Vec2i, HeightfieldData>::const_iterator it);
+        inline static HeightfieldIndexValue makeHeightfieldIndexValue(
+            const TilesPositionsRange& range, std::map<osg::Vec2i, HeightfieldData>::const_iterator it);
 
         inline static auto makeIndexQuery(const TilePosition& tilePosition)
             -> decltype(boost::geometry::index::intersects(IndexBox()));
diff --git a/components/detournavigator/version.hpp b/components/detournavigator/version.hpp
index 792680a7d5..1db8e1285d 100644
--- a/components/detournavigator/version.hpp
+++ b/components/detournavigator/version.hpp
@@ -11,30 +11,15 @@ namespace DetourNavigator
         std::size_t mGeneration = 0;
         std::size_t mRevision = 0;
 
-        friend inline auto tie(const Version& value)
-        {
-            return std::tie(value.mGeneration, value.mRevision);
-        }
-
-        friend inline bool operator<(const Version& lhs, const Version& rhs)
-        {
-            return tie(lhs) < tie(rhs);
-        }
-
-        friend inline bool operator<=(const Version& lhs, const Version& rhs)
-        {
-            return tie(lhs) <= tie(rhs);
-        }
-
-        friend inline bool operator==(const Version& lhs, const Version& rhs)
-        {
-            return tie(lhs) == tie(rhs);
-        }
-
-        friend inline bool operator!=(const Version& lhs, const Version& rhs)
-        {
-            return !(lhs == rhs);
-        }
+        friend inline auto tie(const Version& value) { return std::tie(value.mGeneration, value.mRevision); }
+
+        friend inline bool operator<(const Version& lhs, const Version& rhs) { return tie(lhs) < tie(rhs); }
+
+        friend inline bool operator<=(const Version& lhs, const Version& rhs) { return tie(lhs) <= tie(rhs); }
+
+        friend inline bool operator==(const Version& lhs, const Version& rhs) { return tie(lhs) == tie(rhs); }
+
+        friend inline bool operator!=(const Version& lhs, const Version& rhs) { return !(lhs == rhs); }
     };
 }
 
diff --git a/components/esm/attr.hpp b/components/esm/attr.hpp
index dd891a96d7..b49f68c874 100644
--- a/components/esm/attr.hpp
+++ b/components/esm/attr.hpp
@@ -3,35 +3,36 @@
 
 #include <string>
 
-namespace ESM {
+namespace ESM
+{
 
-/*
- * Attribute definitions
- */
+    /*
+     * Attribute definitions
+     */
 
-struct Attribute
-{
-    enum AttributeID
+    struct Attribute
     {
-        Strength = 0,
-        Intelligence = 1,
-        Willpower = 2,
-        Agility = 3,
-        Speed = 4,
-        Endurance = 5,
-        Personality = 6,
-        Luck = 7,
-        Length = 8
-    };
+        enum AttributeID
+        {
+            Strength = 0,
+            Intelligence = 1,
+            Willpower = 2,
+            Agility = 3,
+            Speed = 4,
+            Endurance = 5,
+            Personality = 6,
+            Luck = 7,
+            Length = 8
+        };
 
-    AttributeID mId;
-    std::string mName, mDescription;
+        AttributeID mId;
+        std::string mName, mDescription;
 
-    static const AttributeID sAttributeIds[Length];
-    static const std::string sAttributeNames[Length];
-    static const std::string sGmstAttributeIds[Length];
-    static const std::string sGmstAttributeDescIds[Length];
-    static const std::string sAttributeIcons[Length];
-};
+        static const AttributeID sAttributeIds[Length];
+        static const std::string sAttributeNames[Length];
+        static const std::string sGmstAttributeIds[Length];
+        static const std::string sGmstAttributeDescIds[Length];
+        static const std::string sAttributeIcons[Length];
+    };
 }
 #endif
diff --git a/components/esm/common.cpp b/components/esm/common.cpp
index d04033edef..179e1f5c4e 100644
--- a/components/esm/common.cpp
+++ b/components/esm/common.cpp
@@ -5,8 +5,8 @@ namespace ESM
     std::string printName(const std::uint32_t typeId)
     {
         unsigned char typeName[4];
-        typeName[0] =  typeId        & 0xff;
-        typeName[1] = (typeId >>  8) & 0xff;
+        typeName[0] = typeId & 0xff;
+        typeName[1] = (typeId >> 8) & 0xff;
         typeName[2] = (typeId >> 16) & 0xff;
         typeName[3] = (typeId >> 24) & 0xff;
 
diff --git a/components/esm/common.hpp b/components/esm/common.hpp
index af19572c03..c0e6151e24 100644
--- a/components/esm/common.hpp
+++ b/components/esm/common.hpp
@@ -9,7 +9,7 @@ namespace ESM
 #pragma pack(push, 1)
     union ESMVersion
     {
-        float         f;
+        float f;
         std::uint32_t ui;
     };
 
@@ -30,13 +30,13 @@ namespace ESM
         VER_133 = 0x3faa3d71, // FONV HonestHearts
         VER_134 = 0x3fab851f, // FONV, GunRunnersArsenal, LonesomeRoad, OldWorldBlues
         VER_094 = 0x3f70a3d7, // TES5/FO3
-        VER_170 = 0x3fd9999a  // TES5
+        VER_170 = 0x3fd9999a // TES5
     };
 
     // Defines another files (esm or esp) that this file depends upon.
     struct MasterData
     {
-        std::string   name;
+        std::string name;
         std::uint64_t size;
     };
 
diff --git a/components/esm/defs.hpp b/components/esm/defs.hpp
index 5063674aaa..1655766c79 100644
--- a/components/esm/defs.hpp
+++ b/components/esm/defs.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_ESM_DEFS_H
 #define OPENMW_ESM_DEFS_H
 
-#include <stdint.h>
 #include <stdexcept>
+#include <stdint.h>
 
 #include <tuple>
 
@@ -13,335 +13,331 @@
 namespace ESM
 {
 
-struct TimeStamp
-{
-    float mHour;
-    int mDay;
-};
+    struct TimeStamp
+    {
+        float mHour;
+        int mDay;
+    };
 
-struct EpochTimeStamp
-{
-    float mGameHour;
-    int mDay;
-    int mMonth;
-    int mYear;
-};
+    struct EpochTimeStamp
+    {
+        float mGameHour;
+        int mDay;
+        int mMonth;
+        int mYear;
+    };
 
-// Pixel color value. Standard four-byte rr,gg,bb,aa format.
-typedef uint32_t Color;
+    // Pixel color value. Standard four-byte rr,gg,bb,aa format.
+    typedef uint32_t Color;
 
-enum Specialization
-{
-    SPC_Combat = 0,
-    SPC_Magic = 1,
-    SPC_Stealth = 2
-};
+    enum Specialization
+    {
+        SPC_Combat = 0,
+        SPC_Magic = 1,
+        SPC_Stealth = 2
+    };
 
-enum RangeType
-{
-    RT_Self = 0,
-    RT_Touch = 1,
-    RT_Target = 2
-};
+    enum RangeType
+    {
+        RT_Self = 0,
+        RT_Touch = 1,
+        RT_Target = 2
+    };
 
-// Position and rotation
-struct Position
-{
-    float pos[3];
+    // Position and rotation
+    struct Position
+    {
+        float pos[3];
 
-    // In radians
-    float rot[3];
+        // In radians
+        float rot[3];
 
-    osg::Vec3f asVec3() const
-    {
-        return osg::Vec3f(pos[0], pos[1], pos[2]);
-    }
+        osg::Vec3f asVec3() const { return osg::Vec3f(pos[0], pos[1], pos[2]); }
+
+        osg::Vec3f asRotationVec3() const { return osg::Vec3f(rot[0], rot[1], rot[2]); }
+
+        friend inline bool operator<(const Position& l, const Position& r)
+        {
+            const auto tuple = [](const Position& v) { return std::tuple(v.asVec3(), v.asRotationVec3()); };
+            return tuple(l) < tuple(r);
+        }
+    };
 
-    osg::Vec3f asRotationVec3() const
+    bool inline operator==(const Position& left, const Position& right) noexcept
     {
-        return osg::Vec3f(rot[0], rot[1], rot[2]);
+        return left.pos[0] == right.pos[0] && left.pos[1] == right.pos[1] && left.pos[2] == right.pos[2]
+            && left.rot[0] == right.rot[0] && left.rot[1] == right.rot[1] && left.rot[2] == right.rot[2];
     }
 
-    friend inline bool operator<(const Position& l, const Position& r)
+    bool inline operator!=(const Position& left, const Position& right) noexcept
     {
-        const auto tuple = [](const Position& v) { return std::tuple(v.asVec3(), v.asRotationVec3()); };
-        return tuple(l) < tuple(r);
+        return left.pos[0] != right.pos[0] || left.pos[1] != right.pos[1] || left.pos[2] != right.pos[2]
+            || left.rot[0] != right.rot[0] || left.rot[1] != right.rot[1] || left.rot[2] != right.rot[2];
     }
-};
 
-bool inline operator== (const Position& left, const Position& right) noexcept
-{
-    return left.pos[0] == right.pos[0] &&
-           left.pos[1] == right.pos[1] &&
-           left.pos[2] == right.pos[2] &&
-           left.rot[0] == right.rot[0] &&
-           left.rot[1] == right.rot[1] &&
-           left.rot[2] == right.rot[2];
-}
-
-bool inline operator!= (const Position& left, const Position& right) noexcept
-{
-    return left.pos[0] != right.pos[0] ||
-           left.pos[1] != right.pos[1] ||
-           left.pos[2] != right.pos[2] ||
-           left.rot[0] != right.rot[0] ||
-           left.rot[1] != right.rot[1] ||
-           left.rot[2] != right.rot[2];
-}
-
-constexpr unsigned int sEsm4RecnameFlag = 0x00800000;
+    constexpr unsigned int sEsm4RecnameFlag = 0x00800000;
 
-constexpr unsigned int esm3Recname(const char(&name)[5]) {
-    if ((fourCC(name) & sEsm4RecnameFlag) == 0)
-        return fourCC(name);
-    else
-        throw std::logic_error("there must be no collision between esm3 records and esm4 records");//The throw errors ensures at compile time that no collision between ESM4 and ESM3 is possible
-}
+    constexpr unsigned int esm3Recname(const char (&name)[5])
+    {
+        if ((fourCC(name) & sEsm4RecnameFlag) == 0)
+            return fourCC(name);
+        else
+            throw std::logic_error(
+                "there must be no collision between esm3 records and esm4 records"); // The throw errors ensures at
+                                                                                     // compile time that no collision
+                                                                                     // between ESM4 and ESM3 is
+                                                                                     // possible
+    }
 
-constexpr unsigned int esm4Recname(const ESM4::RecordTypes recType) {
-    if ((recType & sEsm4RecnameFlag) == 0)
-        return (recType | sEsm4RecnameFlag);
-    else
-        throw std::logic_error("there must be no collision between esm3 records and esm4 records");//The throw errors ensures at compile time that no collision between ESM4 and ESM3 is possible
-}
+    constexpr unsigned int esm4Recname(const ESM4::RecordTypes recType)
+    {
+        if ((recType & sEsm4RecnameFlag) == 0)
+            return (recType | sEsm4RecnameFlag);
+        else
+            throw std::logic_error(
+                "there must be no collision between esm3 records and esm4 records"); // The throw errors ensures at
+                                                                                     // compile time that no collision
+                                                                                     // between ESM4 and ESM3 is
+                                                                                     // possible
+    }
 
-enum RecNameInts : unsigned int
-{
-    // Special values. Can not be used in any ESM.
-    // Added to this enum to guarantee that the values don't collide with any records.
-    REC_INTERNAL_PLAYER = 0,
-    REC_INTERNAL_MARKER = 1,
+    enum RecNameInts : unsigned int
+    {
+        // Special values. Can not be used in any ESM.
+        // Added to this enum to guarantee that the values don't collide with any records.
+        REC_INTERNAL_PLAYER = 0,
+        REC_INTERNAL_MARKER = 1,
 
-    // format 0 / legacy
-    REC_ACTI = esm3Recname("ACTI"),
-    REC_ALCH = esm3Recname("ALCH"),
-    REC_APPA = esm3Recname("APPA"),
-    REC_ARMO = esm3Recname("ARMO"),
-    REC_BODY = esm3Recname("BODY"),
-    REC_BOOK = esm3Recname("BOOK"),
-    REC_BSGN = esm3Recname("BSGN"),
-    REC_CELL = esm3Recname("CELL"),
-    REC_CLAS = esm3Recname("CLAS"),
-    REC_CLOT = esm3Recname("CLOT"),
-    REC_CNTC = esm3Recname("CNTC"),
-    REC_CONT = esm3Recname("CONT"),
-    REC_CREA = esm3Recname("CREA"),
-    REC_CREC = esm3Recname("CREC"),
-    REC_DIAL = esm3Recname("DIAL"),
-    REC_DOOR = esm3Recname("DOOR"),
-    REC_ENCH = esm3Recname("ENCH"),
-    REC_FACT = esm3Recname("FACT"),
-    REC_GLOB = esm3Recname("GLOB"),
-    REC_GMST = esm3Recname("GMST"),
-    REC_INFO = esm3Recname("INFO"),
-    REC_INGR = esm3Recname("INGR"),
-    REC_LAND = esm3Recname("LAND"),
-    REC_LEVC = esm3Recname("LEVC"),
-    REC_LEVI = esm3Recname("LEVI"),
-    REC_LIGH = esm3Recname("LIGH"),
-    REC_LOCK = esm3Recname("LOCK"),
-    REC_LTEX = esm3Recname("LTEX"),
-    REC_MGEF = esm3Recname("MGEF"),
-    REC_MISC = esm3Recname("MISC"),
-    REC_NPC_ = esm3Recname("NPC_"),
-    REC_NPCC = esm3Recname("NPCC"),
-    REC_PGRD = esm3Recname("PGRD"),
-    REC_PROB = esm3Recname("PROB"),
-    REC_RACE = esm3Recname("RACE"),
-    REC_REGN = esm3Recname("REGN"),
-    REC_REPA = esm3Recname("REPA"),
-    REC_SCPT = esm3Recname("SCPT"),
-    REC_SKIL = esm3Recname("SKIL"),
-    REC_SNDG = esm3Recname("SNDG"),
-    REC_SOUN = esm3Recname("SOUN"),
-    REC_SPEL = esm3Recname("SPEL"),
-    REC_SSCR = esm3Recname("SSCR"),
-    REC_STAT = esm3Recname("STAT"),
-    REC_WEAP = esm3Recname("WEAP"),
+        // format 0 / legacy
+        REC_ACTI = esm3Recname("ACTI"),
+        REC_ALCH = esm3Recname("ALCH"),
+        REC_APPA = esm3Recname("APPA"),
+        REC_ARMO = esm3Recname("ARMO"),
+        REC_BODY = esm3Recname("BODY"),
+        REC_BOOK = esm3Recname("BOOK"),
+        REC_BSGN = esm3Recname("BSGN"),
+        REC_CELL = esm3Recname("CELL"),
+        REC_CLAS = esm3Recname("CLAS"),
+        REC_CLOT = esm3Recname("CLOT"),
+        REC_CNTC = esm3Recname("CNTC"),
+        REC_CONT = esm3Recname("CONT"),
+        REC_CREA = esm3Recname("CREA"),
+        REC_CREC = esm3Recname("CREC"),
+        REC_DIAL = esm3Recname("DIAL"),
+        REC_DOOR = esm3Recname("DOOR"),
+        REC_ENCH = esm3Recname("ENCH"),
+        REC_FACT = esm3Recname("FACT"),
+        REC_GLOB = esm3Recname("GLOB"),
+        REC_GMST = esm3Recname("GMST"),
+        REC_INFO = esm3Recname("INFO"),
+        REC_INGR = esm3Recname("INGR"),
+        REC_LAND = esm3Recname("LAND"),
+        REC_LEVC = esm3Recname("LEVC"),
+        REC_LEVI = esm3Recname("LEVI"),
+        REC_LIGH = esm3Recname("LIGH"),
+        REC_LOCK = esm3Recname("LOCK"),
+        REC_LTEX = esm3Recname("LTEX"),
+        REC_MGEF = esm3Recname("MGEF"),
+        REC_MISC = esm3Recname("MISC"),
+        REC_NPC_ = esm3Recname("NPC_"),
+        REC_NPCC = esm3Recname("NPCC"),
+        REC_PGRD = esm3Recname("PGRD"),
+        REC_PROB = esm3Recname("PROB"),
+        REC_RACE = esm3Recname("RACE"),
+        REC_REGN = esm3Recname("REGN"),
+        REC_REPA = esm3Recname("REPA"),
+        REC_SCPT = esm3Recname("SCPT"),
+        REC_SKIL = esm3Recname("SKIL"),
+        REC_SNDG = esm3Recname("SNDG"),
+        REC_SOUN = esm3Recname("SOUN"),
+        REC_SPEL = esm3Recname("SPEL"),
+        REC_SSCR = esm3Recname("SSCR"),
+        REC_STAT = esm3Recname("STAT"),
+        REC_WEAP = esm3Recname("WEAP"),
 
-    // format 0 - saved games
-    REC_SAVE = esm3Recname("SAVE"),
-    REC_JOUR_LEGACY = esm3Recname("\xa4UOR"), // "\xa4UOR", rather than "JOUR", little oversight when magic numbers were
-                                         // calculated by hand, needs to be supported for older files now
-    REC_JOUR = esm3Recname("JOUR"),
-    REC_QUES = esm3Recname("QUES"),
-    REC_GSCR = esm3Recname("GSCR"),
-    REC_PLAY = esm3Recname("PLAY"),
-    REC_CSTA = esm3Recname("CSTA"),
-    REC_GMAP = esm3Recname("GMAP"),
-    REC_DIAS = esm3Recname("DIAS"),
-    REC_WTHR = esm3Recname("WTHR"),
-    REC_KEYS = esm3Recname("KEYS"),
-    REC_DYNA = esm3Recname("DYNA"),
-    REC_ASPL = esm3Recname("ASPL"),
-    REC_ACTC = esm3Recname("ACTC"),
-    REC_MPRJ = esm3Recname("MPRJ"),
-    REC_PROJ = esm3Recname("PROJ"),
-    REC_DCOU = esm3Recname("DCOU"),
-    REC_MARK = esm3Recname("MARK"),
-    REC_ENAB = esm3Recname("ENAB"),
-    REC_CAM_ = esm3Recname("CAM_"),
-    REC_STLN = esm3Recname("STLN"),
-    REC_INPU = esm3Recname("INPU"),
+        // format 0 - saved games
+        REC_SAVE = esm3Recname("SAVE"),
+        REC_JOUR_LEGACY = esm3Recname("\xa4UOR"), // "\xa4UOR", rather than "JOUR", little oversight when magic numbers
+                                                  // were calculated by hand, needs to be supported for older files now
+        REC_JOUR = esm3Recname("JOUR"),
+        REC_QUES = esm3Recname("QUES"),
+        REC_GSCR = esm3Recname("GSCR"),
+        REC_PLAY = esm3Recname("PLAY"),
+        REC_CSTA = esm3Recname("CSTA"),
+        REC_GMAP = esm3Recname("GMAP"),
+        REC_DIAS = esm3Recname("DIAS"),
+        REC_WTHR = esm3Recname("WTHR"),
+        REC_KEYS = esm3Recname("KEYS"),
+        REC_DYNA = esm3Recname("DYNA"),
+        REC_ASPL = esm3Recname("ASPL"),
+        REC_ACTC = esm3Recname("ACTC"),
+        REC_MPRJ = esm3Recname("MPRJ"),
+        REC_PROJ = esm3Recname("PROJ"),
+        REC_DCOU = esm3Recname("DCOU"),
+        REC_MARK = esm3Recname("MARK"),
+        REC_ENAB = esm3Recname("ENAB"),
+        REC_CAM_ = esm3Recname("CAM_"),
+        REC_STLN = esm3Recname("STLN"),
+        REC_INPU = esm3Recname("INPU"),
 
-    // format 1
-    REC_FILT = esm3Recname("FILT"),
-    REC_DBGP = esm3Recname("DBGP"), ///< only used in project files
-    REC_LUAL = esm3Recname("LUAL"),  // LuaScriptsCfg (only in omwgame or omwaddon)
+        // format 1
+        REC_FILT = esm3Recname("FILT"),
+        REC_DBGP = esm3Recname("DBGP"), ///< only used in project files
+        REC_LUAL = esm3Recname("LUAL"), // LuaScriptsCfg (only in omwgame or omwaddon)
 
-    // format 16 - Lua scripts in saved games
-    REC_LUAM = esm3Recname("LUAM"),  // LuaManager data
+        // format 16 - Lua scripts in saved games
+        REC_LUAM = esm3Recname("LUAM"), // LuaManager data
 
-    // format 21 - Random state in saved games.
-    REC_RAND = esm3Recname("RAND"),  // Random state.
+        // format 21 - Random state in saved games.
+        REC_RAND = esm3Recname("RAND"), // Random state.
 
-    REC_AACT4 = esm4Recname(ESM4::REC_AACT), // Action
-    REC_ACHR4 = esm4Recname(ESM4::REC_ACHR), // Actor Reference
-    REC_ACTI4 = esm4Recname(ESM4::REC_ACTI), // Activator
-    REC_ADDN4 = esm4Recname(ESM4::REC_ADDN), // Addon Node
-    REC_ALCH4 = esm4Recname(ESM4::REC_ALCH), // Potion
-    REC_AMMO4 = esm4Recname(ESM4::REC_AMMO), // Ammo
-    REC_ANIO4 = esm4Recname(ESM4::REC_ANIO), // Animated Object
-    REC_APPA4 = esm4Recname(ESM4::REC_APPA), // Apparatus (probably unused)
-    REC_ARMA4 = esm4Recname(ESM4::REC_ARMA), // Armature (Model)
-    REC_ARMO4 = esm4Recname(ESM4::REC_ARMO), // Armor
-    REC_ARTO4 = esm4Recname(ESM4::REC_ARTO), // Art Object
-    REC_ASPC4 = esm4Recname(ESM4::REC_ASPC), // Acoustic Space
-    REC_ASTP4 = esm4Recname(ESM4::REC_ASTP), // Association Type
-    REC_AVIF4 = esm4Recname(ESM4::REC_AVIF), // Actor Values/Perk Tree Graphics
-    REC_BOOK4 = esm4Recname(ESM4::REC_BOOK), // Book
-    REC_BPTD4 = esm4Recname(ESM4::REC_BPTD), // Body Part Data
-    REC_CAMS4 = esm4Recname(ESM4::REC_CAMS), // Camera Shot
-    REC_CELL4 = esm4Recname(ESM4::REC_CELL), // Cell
-    REC_CLAS4 = esm4Recname(ESM4::REC_CLAS), // Class
-    REC_CLFM4 = esm4Recname(ESM4::REC_CLFM), // Color
-    REC_CLMT4 = esm4Recname(ESM4::REC_CLMT), // Climate
-    REC_CLOT4 = esm4Recname(ESM4::REC_CLOT), // Clothing
-    REC_COBJ4 = esm4Recname(ESM4::REC_COBJ), // Constructible Object (recipes)
-    REC_COLL4 = esm4Recname(ESM4::REC_COLL), // Collision Layer
-    REC_CONT4 = esm4Recname(ESM4::REC_CONT), // Container
-    REC_CPTH4 = esm4Recname(ESM4::REC_CPTH), // Camera Path
-    REC_CREA4 = esm4Recname(ESM4::REC_CREA), // Creature
-    REC_CSTY4 = esm4Recname(ESM4::REC_CSTY), // Combat Style
-    REC_DEBR4 = esm4Recname(ESM4::REC_DEBR), // Debris
-    REC_DIAL4 = esm4Recname(ESM4::REC_DIAL), // Dialog Topic
-    REC_DLBR4 = esm4Recname(ESM4::REC_DLBR), // Dialog Branch
-    REC_DLVW4 = esm4Recname(ESM4::REC_DLVW), // Dialog View
-    REC_DOBJ4 = esm4Recname(ESM4::REC_DOBJ), // Default Object Manager
-    REC_DOOR4 = esm4Recname(ESM4::REC_DOOR), // Door
-    REC_DUAL4 = esm4Recname(ESM4::REC_DUAL), // Dual Cast Data (possibly unused)
-    REC_ECZN4 = esm4Recname(ESM4::REC_ECZN), // Encounter Zone
-    REC_EFSH4 = esm4Recname(ESM4::REC_EFSH), // Effect Shader
-    REC_ENCH4 = esm4Recname(ESM4::REC_ENCH), // Enchantment
-    REC_EQUP4 = esm4Recname(ESM4::REC_EQUP), // Equip Slot (flag-type values)
-    REC_EXPL4 = esm4Recname(ESM4::REC_EXPL), // Explosion
-    REC_EYES4 = esm4Recname(ESM4::REC_EYES), // Eyes
-    REC_FACT4 = esm4Recname(ESM4::REC_FACT), // Faction
-    REC_FLOR4 = esm4Recname(ESM4::REC_FLOR), // Flora
-    REC_FLST4 = esm4Recname(ESM4::REC_FLST), // Form List (non-levelled list)
-    REC_FSTP4 = esm4Recname(ESM4::REC_FSTP), // Footstep
-    REC_FSTS4 = esm4Recname(ESM4::REC_FSTS), // Footstep Set
-    REC_FURN4 = esm4Recname(ESM4::REC_FURN), // Furniture
-    REC_GLOB4 = esm4Recname(ESM4::REC_GLOB), // Global Variable
-    REC_GMST4 = esm4Recname(ESM4::REC_GMST), // Game Setting
-    REC_GRAS4 = esm4Recname(ESM4::REC_GRAS), // Grass
-    REC_GRUP4 = esm4Recname(ESM4::REC_GRUP), // Form Group
-    REC_HAIR4 = esm4Recname(ESM4::REC_HAIR), // Hair
-    REC_HAZD4 = esm4Recname(ESM4::REC_HAZD), // Hazard
-    REC_HDPT4 = esm4Recname(ESM4::REC_HDPT), // Head Part
-    REC_IDLE4 = esm4Recname(ESM4::REC_IDLE), // Idle Animation
-    REC_IDLM4 = esm4Recname(ESM4::REC_IDLM), // Idle Marker
-    REC_IMAD4 = esm4Recname(ESM4::REC_IMAD), // Image Space Modifier
-    REC_IMGS4 = esm4Recname(ESM4::REC_IMGS), // Image Space
-    REC_INFO4 = esm4Recname(ESM4::REC_INFO), // Dialog Topic Info
-    REC_INGR4 = esm4Recname(ESM4::REC_INGR), // Ingredient
-    REC_IPCT4 = esm4Recname(ESM4::REC_IPCT), // Impact Data
-    REC_IPDS4 = esm4Recname(ESM4::REC_IPDS), // Impact Data Set
-    REC_KEYM4 = esm4Recname(ESM4::REC_KEYM), // Key
-    REC_KYWD4 = esm4Recname(ESM4::REC_KYWD), // Keyword
-    REC_LAND4 = esm4Recname(ESM4::REC_LAND), // Land
-    REC_LCRT4 = esm4Recname(ESM4::REC_LCRT), // Location Reference Type
-    REC_LCTN4 = esm4Recname(ESM4::REC_LCTN), // Location
-    REC_LGTM4 = esm4Recname(ESM4::REC_LGTM), // Lighting Template
-    REC_LIGH4 = esm4Recname(ESM4::REC_LIGH), // Light
-    REC_LSCR4 = esm4Recname(ESM4::REC_LSCR), // Load Screen
-    REC_LTEX4 = esm4Recname(ESM4::REC_LTEX), // Land Texture
-    REC_LVLC4 = esm4Recname(ESM4::REC_LVLC), // Leveled Creature
-    REC_LVLI4 = esm4Recname(ESM4::REC_LVLI), // Leveled Item
-    REC_LVLN4 = esm4Recname(ESM4::REC_LVLN), // Leveled Actor
-    REC_LVSP4 = esm4Recname(ESM4::REC_LVSP), // Leveled Spell
-    REC_MATO4 = esm4Recname(ESM4::REC_MATO), // Material Object
-    REC_MATT4 = esm4Recname(ESM4::REC_MATT), // Material Type
-    REC_MESG4 = esm4Recname(ESM4::REC_MESG), // Message
-    REC_MGEF4 = esm4Recname(ESM4::REC_MGEF), // Magic Effect
-    REC_MISC4 = esm4Recname(ESM4::REC_MISC), // Misc. Object
-    REC_MOVT4 = esm4Recname(ESM4::REC_MOVT), // Movement Type
-    REC_MSTT4 = esm4Recname(ESM4::REC_MSTT), // Movable Static
-    REC_MUSC4 = esm4Recname(ESM4::REC_MUSC), // Music Type
-    REC_MUST4 = esm4Recname(ESM4::REC_MUST), // Music Track
-    REC_NAVI4 = esm4Recname(ESM4::REC_NAVI), // Navigation (master data)
-    REC_NAVM4 = esm4Recname(ESM4::REC_NAVM), // Nav Mesh
-    REC_NOTE4 = esm4Recname(ESM4::REC_NOTE), // Note
-    REC_NPC_4 = esm4Recname(ESM4::REC_NPC_), // Actor (NPC, Creature)
-    REC_OTFT4 = esm4Recname(ESM4::REC_OTFT), // Outfit
-    REC_PACK4 = esm4Recname(ESM4::REC_PACK), // AI Package
-    REC_PERK4 = esm4Recname(ESM4::REC_PERK), // Perk
-    REC_PGRE4 = esm4Recname(ESM4::REC_PGRE), // Placed grenade
-    REC_PHZD4 = esm4Recname(ESM4::REC_PHZD), // Placed hazard
-    REC_PROJ4 = esm4Recname(ESM4::REC_PROJ), // Projectile
-    REC_QUST4 = esm4Recname(ESM4::REC_QUST), // Quest
-    REC_RACE4 = esm4Recname(ESM4::REC_RACE), // Race / Creature type
-    REC_REFR4 = esm4Recname(ESM4::REC_REFR), // Object Reference
-    REC_REGN4 = esm4Recname(ESM4::REC_REGN), // Region (Audio/Weather)
-    REC_RELA4 = esm4Recname(ESM4::REC_RELA), // Relationship
-    REC_REVB4 = esm4Recname(ESM4::REC_REVB), // Reverb Parameters
-    REC_RFCT4 = esm4Recname(ESM4::REC_RFCT), // Visual Effect
-    REC_SBSP4 = esm4Recname(ESM4::REC_SBSP), // Subspace (TES4 only?)
-    REC_SCEN4 = esm4Recname(ESM4::REC_SCEN), // Scene
-    REC_SCPT4 = esm4Recname(ESM4::REC_SCPT), // Script
-    REC_SCRL4 = esm4Recname(ESM4::REC_SCRL), // Scroll
-    REC_SGST4 = esm4Recname(ESM4::REC_SGST), // Sigil Stone
-    REC_SHOU4 = esm4Recname(ESM4::REC_SHOU), // Shout
-    REC_SLGM4 = esm4Recname(ESM4::REC_SLGM), // Soul Gem
-    REC_SMBN4 = esm4Recname(ESM4::REC_SMBN), // Story Manager Branch Node
-    REC_SMEN4 = esm4Recname(ESM4::REC_SMEN), // Story Manager Event Node
-    REC_SMQN4 = esm4Recname(ESM4::REC_SMQN), // Story Manager Quest Node
-    REC_SNCT4 = esm4Recname(ESM4::REC_SNCT), // Sound Category
-    REC_SNDR4 = esm4Recname(ESM4::REC_SNDR), // Sound Reference
-    REC_SOPM4 = esm4Recname(ESM4::REC_SOPM), // Sound Output Model
-    REC_SOUN4 = esm4Recname(ESM4::REC_SOUN), // Sound
-    REC_SPEL4 = esm4Recname(ESM4::REC_SPEL), // Spell
-    REC_SPGD4 = esm4Recname(ESM4::REC_SPGD), // Shader Particle Geometry
-    REC_STAT4 = esm4Recname(ESM4::REC_STAT), // Static
-    REC_TACT4 = esm4Recname(ESM4::REC_TACT), // Talking Activator
-    REC_TERM4 = esm4Recname(ESM4::REC_TERM), // Terminal
-    REC_TES44 = esm4Recname(ESM4::REC_TES4), // Plugin info
-    REC_TREE4 = esm4Recname(ESM4::REC_TREE), // Tree
-    REC_TXST4 = esm4Recname(ESM4::REC_TXST), // Texture Set
-    REC_VTYP4 = esm4Recname(ESM4::REC_VTYP), // Voice Type
-    REC_WATR4 = esm4Recname(ESM4::REC_WATR), // Water Type
-    REC_WEAP4 = esm4Recname(ESM4::REC_WEAP), // Weapon
-    REC_WOOP4 = esm4Recname(ESM4::REC_WOOP), // Word Of Power
-    REC_WRLD4 = esm4Recname(ESM4::REC_WRLD), // World Space
-    REC_WTHR4 = esm4Recname(ESM4::REC_WTHR), // Weather
-    REC_ACRE4 = esm4Recname(ESM4::REC_ACRE), // Placed Creature (TES4 only?)
-    REC_PGRD4 = esm4Recname(ESM4::REC_PGRD), // Pathgrid (TES4 only?)
-    REC_ROAD4 = esm4Recname(ESM4::REC_ROAD), // Road (TES4 only?)
-    REC_IMOD4 = esm4Recname(ESM4::REC_IMOD), // Item Mod
-    REC_PWAT4 = esm4Recname(ESM4::REC_PWAT), // Placeable Water
-    REC_SCOL4 = esm4Recname(ESM4::REC_SCOL), // Static Collection
-    REC_CCRD4 = esm4Recname(ESM4::REC_CCRD), // Caravan Card
-    REC_CMNY4 = esm4Recname(ESM4::REC_CMNY), // Caravan Money
-    REC_ALOC4 = esm4Recname(ESM4::REC_ALOC), // Audio Location Controller
-    REC_MSET4 = esm4Recname(ESM4::REC_MSET)  // Media Set
-};
+        REC_AACT4 = esm4Recname(ESM4::REC_AACT), // Action
+        REC_ACHR4 = esm4Recname(ESM4::REC_ACHR), // Actor Reference
+        REC_ACTI4 = esm4Recname(ESM4::REC_ACTI), // Activator
+        REC_ADDN4 = esm4Recname(ESM4::REC_ADDN), // Addon Node
+        REC_ALCH4 = esm4Recname(ESM4::REC_ALCH), // Potion
+        REC_AMMO4 = esm4Recname(ESM4::REC_AMMO), // Ammo
+        REC_ANIO4 = esm4Recname(ESM4::REC_ANIO), // Animated Object
+        REC_APPA4 = esm4Recname(ESM4::REC_APPA), // Apparatus (probably unused)
+        REC_ARMA4 = esm4Recname(ESM4::REC_ARMA), // Armature (Model)
+        REC_ARMO4 = esm4Recname(ESM4::REC_ARMO), // Armor
+        REC_ARTO4 = esm4Recname(ESM4::REC_ARTO), // Art Object
+        REC_ASPC4 = esm4Recname(ESM4::REC_ASPC), // Acoustic Space
+        REC_ASTP4 = esm4Recname(ESM4::REC_ASTP), // Association Type
+        REC_AVIF4 = esm4Recname(ESM4::REC_AVIF), // Actor Values/Perk Tree Graphics
+        REC_BOOK4 = esm4Recname(ESM4::REC_BOOK), // Book
+        REC_BPTD4 = esm4Recname(ESM4::REC_BPTD), // Body Part Data
+        REC_CAMS4 = esm4Recname(ESM4::REC_CAMS), // Camera Shot
+        REC_CELL4 = esm4Recname(ESM4::REC_CELL), // Cell
+        REC_CLAS4 = esm4Recname(ESM4::REC_CLAS), // Class
+        REC_CLFM4 = esm4Recname(ESM4::REC_CLFM), // Color
+        REC_CLMT4 = esm4Recname(ESM4::REC_CLMT), // Climate
+        REC_CLOT4 = esm4Recname(ESM4::REC_CLOT), // Clothing
+        REC_COBJ4 = esm4Recname(ESM4::REC_COBJ), // Constructible Object (recipes)
+        REC_COLL4 = esm4Recname(ESM4::REC_COLL), // Collision Layer
+        REC_CONT4 = esm4Recname(ESM4::REC_CONT), // Container
+        REC_CPTH4 = esm4Recname(ESM4::REC_CPTH), // Camera Path
+        REC_CREA4 = esm4Recname(ESM4::REC_CREA), // Creature
+        REC_CSTY4 = esm4Recname(ESM4::REC_CSTY), // Combat Style
+        REC_DEBR4 = esm4Recname(ESM4::REC_DEBR), // Debris
+        REC_DIAL4 = esm4Recname(ESM4::REC_DIAL), // Dialog Topic
+        REC_DLBR4 = esm4Recname(ESM4::REC_DLBR), // Dialog Branch
+        REC_DLVW4 = esm4Recname(ESM4::REC_DLVW), // Dialog View
+        REC_DOBJ4 = esm4Recname(ESM4::REC_DOBJ), // Default Object Manager
+        REC_DOOR4 = esm4Recname(ESM4::REC_DOOR), // Door
+        REC_DUAL4 = esm4Recname(ESM4::REC_DUAL), // Dual Cast Data (possibly unused)
+        REC_ECZN4 = esm4Recname(ESM4::REC_ECZN), // Encounter Zone
+        REC_EFSH4 = esm4Recname(ESM4::REC_EFSH), // Effect Shader
+        REC_ENCH4 = esm4Recname(ESM4::REC_ENCH), // Enchantment
+        REC_EQUP4 = esm4Recname(ESM4::REC_EQUP), // Equip Slot (flag-type values)
+        REC_EXPL4 = esm4Recname(ESM4::REC_EXPL), // Explosion
+        REC_EYES4 = esm4Recname(ESM4::REC_EYES), // Eyes
+        REC_FACT4 = esm4Recname(ESM4::REC_FACT), // Faction
+        REC_FLOR4 = esm4Recname(ESM4::REC_FLOR), // Flora
+        REC_FLST4 = esm4Recname(ESM4::REC_FLST), // Form List (non-levelled list)
+        REC_FSTP4 = esm4Recname(ESM4::REC_FSTP), // Footstep
+        REC_FSTS4 = esm4Recname(ESM4::REC_FSTS), // Footstep Set
+        REC_FURN4 = esm4Recname(ESM4::REC_FURN), // Furniture
+        REC_GLOB4 = esm4Recname(ESM4::REC_GLOB), // Global Variable
+        REC_GMST4 = esm4Recname(ESM4::REC_GMST), // Game Setting
+        REC_GRAS4 = esm4Recname(ESM4::REC_GRAS), // Grass
+        REC_GRUP4 = esm4Recname(ESM4::REC_GRUP), // Form Group
+        REC_HAIR4 = esm4Recname(ESM4::REC_HAIR), // Hair
+        REC_HAZD4 = esm4Recname(ESM4::REC_HAZD), // Hazard
+        REC_HDPT4 = esm4Recname(ESM4::REC_HDPT), // Head Part
+        REC_IDLE4 = esm4Recname(ESM4::REC_IDLE), // Idle Animation
+        REC_IDLM4 = esm4Recname(ESM4::REC_IDLM), // Idle Marker
+        REC_IMAD4 = esm4Recname(ESM4::REC_IMAD), // Image Space Modifier
+        REC_IMGS4 = esm4Recname(ESM4::REC_IMGS), // Image Space
+        REC_INFO4 = esm4Recname(ESM4::REC_INFO), // Dialog Topic Info
+        REC_INGR4 = esm4Recname(ESM4::REC_INGR), // Ingredient
+        REC_IPCT4 = esm4Recname(ESM4::REC_IPCT), // Impact Data
+        REC_IPDS4 = esm4Recname(ESM4::REC_IPDS), // Impact Data Set
+        REC_KEYM4 = esm4Recname(ESM4::REC_KEYM), // Key
+        REC_KYWD4 = esm4Recname(ESM4::REC_KYWD), // Keyword
+        REC_LAND4 = esm4Recname(ESM4::REC_LAND), // Land
+        REC_LCRT4 = esm4Recname(ESM4::REC_LCRT), // Location Reference Type
+        REC_LCTN4 = esm4Recname(ESM4::REC_LCTN), // Location
+        REC_LGTM4 = esm4Recname(ESM4::REC_LGTM), // Lighting Template
+        REC_LIGH4 = esm4Recname(ESM4::REC_LIGH), // Light
+        REC_LSCR4 = esm4Recname(ESM4::REC_LSCR), // Load Screen
+        REC_LTEX4 = esm4Recname(ESM4::REC_LTEX), // Land Texture
+        REC_LVLC4 = esm4Recname(ESM4::REC_LVLC), // Leveled Creature
+        REC_LVLI4 = esm4Recname(ESM4::REC_LVLI), // Leveled Item
+        REC_LVLN4 = esm4Recname(ESM4::REC_LVLN), // Leveled Actor
+        REC_LVSP4 = esm4Recname(ESM4::REC_LVSP), // Leveled Spell
+        REC_MATO4 = esm4Recname(ESM4::REC_MATO), // Material Object
+        REC_MATT4 = esm4Recname(ESM4::REC_MATT), // Material Type
+        REC_MESG4 = esm4Recname(ESM4::REC_MESG), // Message
+        REC_MGEF4 = esm4Recname(ESM4::REC_MGEF), // Magic Effect
+        REC_MISC4 = esm4Recname(ESM4::REC_MISC), // Misc. Object
+        REC_MOVT4 = esm4Recname(ESM4::REC_MOVT), // Movement Type
+        REC_MSTT4 = esm4Recname(ESM4::REC_MSTT), // Movable Static
+        REC_MUSC4 = esm4Recname(ESM4::REC_MUSC), // Music Type
+        REC_MUST4 = esm4Recname(ESM4::REC_MUST), // Music Track
+        REC_NAVI4 = esm4Recname(ESM4::REC_NAVI), // Navigation (master data)
+        REC_NAVM4 = esm4Recname(ESM4::REC_NAVM), // Nav Mesh
+        REC_NOTE4 = esm4Recname(ESM4::REC_NOTE), // Note
+        REC_NPC_4 = esm4Recname(ESM4::REC_NPC_), // Actor (NPC, Creature)
+        REC_OTFT4 = esm4Recname(ESM4::REC_OTFT), // Outfit
+        REC_PACK4 = esm4Recname(ESM4::REC_PACK), // AI Package
+        REC_PERK4 = esm4Recname(ESM4::REC_PERK), // Perk
+        REC_PGRE4 = esm4Recname(ESM4::REC_PGRE), // Placed grenade
+        REC_PHZD4 = esm4Recname(ESM4::REC_PHZD), // Placed hazard
+        REC_PROJ4 = esm4Recname(ESM4::REC_PROJ), // Projectile
+        REC_QUST4 = esm4Recname(ESM4::REC_QUST), // Quest
+        REC_RACE4 = esm4Recname(ESM4::REC_RACE), // Race / Creature type
+        REC_REFR4 = esm4Recname(ESM4::REC_REFR), // Object Reference
+        REC_REGN4 = esm4Recname(ESM4::REC_REGN), // Region (Audio/Weather)
+        REC_RELA4 = esm4Recname(ESM4::REC_RELA), // Relationship
+        REC_REVB4 = esm4Recname(ESM4::REC_REVB), // Reverb Parameters
+        REC_RFCT4 = esm4Recname(ESM4::REC_RFCT), // Visual Effect
+        REC_SBSP4 = esm4Recname(ESM4::REC_SBSP), // Subspace (TES4 only?)
+        REC_SCEN4 = esm4Recname(ESM4::REC_SCEN), // Scene
+        REC_SCPT4 = esm4Recname(ESM4::REC_SCPT), // Script
+        REC_SCRL4 = esm4Recname(ESM4::REC_SCRL), // Scroll
+        REC_SGST4 = esm4Recname(ESM4::REC_SGST), // Sigil Stone
+        REC_SHOU4 = esm4Recname(ESM4::REC_SHOU), // Shout
+        REC_SLGM4 = esm4Recname(ESM4::REC_SLGM), // Soul Gem
+        REC_SMBN4 = esm4Recname(ESM4::REC_SMBN), // Story Manager Branch Node
+        REC_SMEN4 = esm4Recname(ESM4::REC_SMEN), // Story Manager Event Node
+        REC_SMQN4 = esm4Recname(ESM4::REC_SMQN), // Story Manager Quest Node
+        REC_SNCT4 = esm4Recname(ESM4::REC_SNCT), // Sound Category
+        REC_SNDR4 = esm4Recname(ESM4::REC_SNDR), // Sound Reference
+        REC_SOPM4 = esm4Recname(ESM4::REC_SOPM), // Sound Output Model
+        REC_SOUN4 = esm4Recname(ESM4::REC_SOUN), // Sound
+        REC_SPEL4 = esm4Recname(ESM4::REC_SPEL), // Spell
+        REC_SPGD4 = esm4Recname(ESM4::REC_SPGD), // Shader Particle Geometry
+        REC_STAT4 = esm4Recname(ESM4::REC_STAT), // Static
+        REC_TACT4 = esm4Recname(ESM4::REC_TACT), // Talking Activator
+        REC_TERM4 = esm4Recname(ESM4::REC_TERM), // Terminal
+        REC_TES44 = esm4Recname(ESM4::REC_TES4), // Plugin info
+        REC_TREE4 = esm4Recname(ESM4::REC_TREE), // Tree
+        REC_TXST4 = esm4Recname(ESM4::REC_TXST), // Texture Set
+        REC_VTYP4 = esm4Recname(ESM4::REC_VTYP), // Voice Type
+        REC_WATR4 = esm4Recname(ESM4::REC_WATR), // Water Type
+        REC_WEAP4 = esm4Recname(ESM4::REC_WEAP), // Weapon
+        REC_WOOP4 = esm4Recname(ESM4::REC_WOOP), // Word Of Power
+        REC_WRLD4 = esm4Recname(ESM4::REC_WRLD), // World Space
+        REC_WTHR4 = esm4Recname(ESM4::REC_WTHR), // Weather
+        REC_ACRE4 = esm4Recname(ESM4::REC_ACRE), // Placed Creature (TES4 only?)
+        REC_PGRD4 = esm4Recname(ESM4::REC_PGRD), // Pathgrid (TES4 only?)
+        REC_ROAD4 = esm4Recname(ESM4::REC_ROAD), // Road (TES4 only?)
+        REC_IMOD4 = esm4Recname(ESM4::REC_IMOD), // Item Mod
+        REC_PWAT4 = esm4Recname(ESM4::REC_PWAT), // Placeable Water
+        REC_SCOL4 = esm4Recname(ESM4::REC_SCOL), // Static Collection
+        REC_CCRD4 = esm4Recname(ESM4::REC_CCRD), // Caravan Card
+        REC_CMNY4 = esm4Recname(ESM4::REC_CMNY), // Caravan Money
+        REC_ALOC4 = esm4Recname(ESM4::REC_ALOC), // Audio Location Controller
+        REC_MSET4 = esm4Recname(ESM4::REC_MSET) // Media Set
+    };
 
-/// Common subrecords
-enum SubRecNameInts
-{
-    SREC_DELE = ESM::fourCC("DELE"),
-    SREC_NAME = ESM::fourCC("NAME")
-};
+    /// Common subrecords
+    enum SubRecNameInts
+    {
+        SREC_DELE = ESM::fourCC("DELE"),
+        SREC_NAME = ESM::fourCC("NAME")
+    };
 
 }
 #endif
diff --git a/components/esm/esmcommon.hpp b/components/esm/esmcommon.hpp
index 9d57a7304d..f272fa553e 100644
--- a/components/esm/esmcommon.hpp
+++ b/components/esm/esmcommon.hpp
@@ -1,210 +1,203 @@
 #ifndef OPENMW_ESM_COMMON_H
 #define OPENMW_ESM_COMMON_H
 
-#include <string>
-#include <cstring>
-#include <vector>
-#include <string_view>
-#include <cstdint>
 #include <cassert>
+#include <cstdint>
+#include <cstring>
+#include <filesystem>
 #include <limits>
+#include <string>
+#include <string_view>
 #include <type_traits>
-#include <filesystem>
+#include <vector>
 
 namespace ESM
 {
-enum Version
-  {
-    VER_12 = 0x3f99999a,
-    VER_13 = 0x3fa66666
-  };
-
-enum RecordFlag
-  {
-    // This flag exists, but is not used to determine if a record has been deleted while loading
-    FLAG_Deleted    = 0x00000020,
-    FLAG_Persistent = 0x00000400,
-    FLAG_Ignored    = 0x00001000,
-    FLAG_Blocked    = 0x00002000
-  };
-
-template <std::size_t capacity>
-struct FixedString
-{
-    static_assert(capacity > 0);
+    enum Version
+    {
+        VER_12 = 0x3f99999a,
+        VER_13 = 0x3fa66666
+    };
 
-    static constexpr std::size_t sCapacity = capacity;
+    enum RecordFlag
+    {
+        // This flag exists, but is not used to determine if a record has been deleted while loading
+        FLAG_Deleted = 0x00000020,
+        FLAG_Persistent = 0x00000400,
+        FLAG_Ignored = 0x00001000,
+        FLAG_Blocked = 0x00002000
+    };
+
+    template <std::size_t capacity>
+    struct FixedString
+    {
+        static_assert(capacity > 0);
 
-    char mData[capacity];
+        static constexpr std::size_t sCapacity = capacity;
 
-    FixedString() = default;
+        char mData[capacity];
 
-    template <std::size_t size>
-    constexpr FixedString(const char (&value)[size]) noexcept
-        : mData()
-    {
-        if constexpr (capacity == sizeof(std::uint32_t))
+        FixedString() = default;
+
+        template <std::size_t size>
+        constexpr FixedString(const char (&value)[size]) noexcept
+            : mData()
         {
-            static_assert(capacity == size || capacity + 1 == size);
-            if constexpr (capacity + 1 == size)
-                assert(value[capacity] == '\0');
+            if constexpr (capacity == sizeof(std::uint32_t))
+            {
+                static_assert(capacity == size || capacity + 1 == size);
+                if constexpr (capacity + 1 == size)
+                    assert(value[capacity] == '\0');
+                for (std::size_t i = 0; i < capacity; ++i)
+                    mData[i] = value[i];
+            }
+            else
+            {
+                const std::size_t length = std::min(capacity, size);
+                for (std::size_t i = 0; i < length; ++i)
+                    mData[i] = value[i];
+                mData[std::min(capacity - 1, length)] = '\0';
+            }
+        }
+
+        constexpr explicit FixedString(std::uint32_t value) noexcept
+            : mData()
+        {
+            static_assert(capacity == sizeof(std::uint32_t));
             for (std::size_t i = 0; i < capacity; ++i)
-                mData[i] = value[i];
+                mData[i] = static_cast<char>((value >> (i * std::numeric_limits<std::uint8_t>::digits))
+                    & std::numeric_limits<std::uint8_t>::max());
         }
-        else
+
+        template <class T>
+        constexpr explicit FixedString(T value) noexcept
+            : FixedString(static_cast<std::uint32_t>(value))
         {
-            const std::size_t length = std::min(capacity, size);
-            for (std::size_t i = 0; i < length; ++i)
-                mData[i] = value[i];
-            mData[std::min(capacity - 1, length)] = '\0';
         }
-    }
 
-    constexpr explicit FixedString(std::uint32_t value) noexcept
-        : mData()
-    {
-        static_assert(capacity == sizeof(std::uint32_t));
-        for (std::size_t i = 0; i < capacity; ++i)
-            mData[i] = static_cast<char>((value >> (i * std::numeric_limits<std::uint8_t>::digits)) & std::numeric_limits<std::uint8_t>::max());
-    }
+        std::string_view toStringView() const noexcept { return std::string_view(mData, strnlen(mData, capacity)); }
 
-    template <class T>
-    constexpr explicit FixedString(T value) noexcept
-        : FixedString(static_cast<std::uint32_t>(value)) {}
+        std::string toString() const { return std::string(toStringView()); }
 
-    std::string_view toStringView() const noexcept
-    {
-        return std::string_view(mData, strnlen(mData, capacity));
-    }
+        std::uint32_t toInt() const noexcept
+        {
+            static_assert(capacity == sizeof(std::uint32_t));
+            std::uint32_t value;
+            std::memcpy(&value, mData, capacity);
+            return value;
+        }
 
-    std::string toString() const
-    {
-        return std::string(toStringView());
-    }
+        void clear() noexcept { std::memset(mData, 0, capacity); }
 
-    std::uint32_t toInt() const noexcept
-    {
-        static_assert(capacity == sizeof(std::uint32_t));
-        std::uint32_t value;
-        std::memcpy(&value, mData, capacity);
-        return value;
-    }
+        void assign(std::string_view value) noexcept
+        {
+            if (value.empty())
+            {
+                clear();
+                return;
+            }
+
+            if (value.size() < capacity)
+            {
+                if constexpr (capacity == sizeof(std::uint32_t))
+                    std::memset(mData, 0, capacity);
+                std::memcpy(mData, value.data(), value.size());
+                if constexpr (capacity != sizeof(std::uint32_t))
+                    mData[value.size()] = '\0';
+                return;
+            }
+
+            std::memcpy(mData, value.data(), capacity);
 
-    void clear() noexcept
-    {
-        std::memset(mData, 0, capacity);
-    }
+            if constexpr (capacity != sizeof(std::uint32_t))
+                mData[capacity - 1] = '\0';
+        }
 
-    void assign(std::string_view value) noexcept
-    {
-        if (value.empty())
+        FixedString& operator=(std::uint32_t value) noexcept
         {
-            clear();
-            return;
+            static_assert(capacity == sizeof(value));
+            std::memcpy(&mData, &value, capacity);
+            return *this;
         }
+    };
 
-        if (value.size() < capacity)
+    template <std::size_t capacity, class T, typename = std::enable_if_t<std::is_same_v<T, char>>>
+    inline bool operator==(const FixedString<capacity>& lhs, const T* const& rhs) noexcept
+    {
+        for (std::size_t i = 0; i < capacity; ++i)
         {
-            if constexpr (capacity == sizeof(std::uint32_t))
-                std::memset(mData, 0, capacity);
-            std::memcpy(mData, value.data(), value.size());
-            if constexpr (capacity != sizeof(std::uint32_t))
-                mData[value.size()] = '\0';
-            return;
+            if (lhs.mData[i] != rhs[i])
+                return false;
+            if (lhs.mData[i] == '\0')
+                return true;
         }
-
-        std::memcpy(mData, value.data(), capacity);
-
-        if constexpr (capacity != sizeof(std::uint32_t))
-            mData[capacity - 1] = '\0';
+        return rhs[capacity] == '\0';
     }
 
-    FixedString& operator=(std::uint32_t value) noexcept
+    template <std::size_t capacity>
+    inline bool operator==(const FixedString<capacity>& lhs, const std::string& rhs) noexcept
     {
-        static_assert(capacity == sizeof(value));
-        std::memcpy(&mData, &value, capacity);
-        return *this;
+        return lhs == rhs.c_str();
     }
-};
 
-template <std::size_t capacity, class T, typename = std::enable_if_t<std::is_same_v<T, char>>>
-inline bool operator==(const FixedString<capacity>& lhs, const T* const& rhs) noexcept
-{
-    for (std::size_t i = 0; i < capacity; ++i)
+    template <std::size_t capacity, std::size_t rhsSize>
+    inline bool operator==(const FixedString<capacity>& lhs, const char (&rhs)[rhsSize]) noexcept
     {
-        if (lhs.mData[i] != rhs[i])
-            return false;
-        if (lhs.mData[i] == '\0')
-            return true;
+        return strnlen(rhs, rhsSize) == strnlen(lhs.mData, capacity) && std::strncmp(lhs.mData, rhs, capacity) == 0;
     }
-    return rhs[capacity] == '\0';
-}
-
-template <std::size_t capacity>
-inline bool operator==(const FixedString<capacity>& lhs, const std::string& rhs) noexcept
-{
-    return lhs == rhs.c_str();
-}
 
-template <std::size_t capacity, std::size_t rhsSize>
-inline bool operator==(const FixedString<capacity>& lhs, const char (&rhs)[rhsSize]) noexcept
-{
-    return strnlen(rhs, rhsSize) == strnlen(lhs.mData, capacity)
-        && std::strncmp(lhs.mData, rhs, capacity) == 0;
-}
-
-inline bool operator==(const FixedString<4>& lhs, std::uint32_t rhs) noexcept
-{
-    return lhs.toInt() == rhs;
-}
+    inline bool operator==(const FixedString<4>& lhs, std::uint32_t rhs) noexcept
+    {
+        return lhs.toInt() == rhs;
+    }
 
-inline bool operator==(const FixedString<4>& lhs, const FixedString<4>& rhs) noexcept
-{
-    return lhs.toInt() == rhs.toInt();
-}
+    inline bool operator==(const FixedString<4>& lhs, const FixedString<4>& rhs) noexcept
+    {
+        return lhs.toInt() == rhs.toInt();
+    }
 
-template <std::size_t capacity, class Rhs>
-inline bool operator!=(const FixedString<capacity>& lhs, const Rhs& rhs) noexcept
-{
-    return !(lhs == rhs);
-}
+    template <std::size_t capacity, class Rhs>
+    inline bool operator!=(const FixedString<capacity>& lhs, const Rhs& rhs) noexcept
+    {
+        return !(lhs == rhs);
+    }
 
-using NAME = FixedString<4>;
-using NAME32 = FixedString<32>;
-using NAME64 = FixedString<64>;
+    using NAME = FixedString<4>;
+    using NAME32 = FixedString<32>;
+    using NAME64 = FixedString<64>;
 
-static_assert(std::is_standard_layout_v<NAME> && std::is_trivial_v<NAME>);
-static_assert(std::is_standard_layout_v<NAME32> && std::is_trivial_v<NAME32>);
-static_assert(std::is_standard_layout_v<NAME64> && std::is_trivial_v<NAME64>);
+    static_assert(std::is_standard_layout_v<NAME> && std::is_trivial_v<NAME>);
+    static_assert(std::is_standard_layout_v<NAME32> && std::is_trivial_v<NAME32>);
+    static_assert(std::is_standard_layout_v<NAME64> && std::is_trivial_v<NAME64>);
 
-static_assert(sizeof(NAME) == 4);
-static_assert(sizeof(NAME32) == 32);
-static_assert(sizeof(NAME64) == 64);
+    static_assert(sizeof(NAME) == 4);
+    static_assert(sizeof(NAME32) == 32);
+    static_assert(sizeof(NAME64) == 64);
 
-/* This struct defines a file 'context' which can be saved and later
-   restored by an ESMReader instance. It will save the position within
-   a file, and when restored will let you read from that position as
-   if you never left it.
- */
-struct ESM_Context
-{
-  std::filesystem::path filename;
-  uint32_t leftRec, leftSub;
-  size_t leftFile;
-  NAME recName, subName;
-  // When working with multiple esX files, we will generate lists of all files that
-  //  actually contribute to a specific cell. Therefore, we need to store the index
-  //  of the file belonging to this contest. See CellStore::(list/load)refs for details.
-  int index;
-  std::vector<int> parentFileIndices;
-
-  // True if subName has been read but not used.
-  bool subCached;
-
-  // File position. Only used for stored contexts, not regularly
-  // updated within the reader itself.
-  size_t filePos;
-};
+    /* This struct defines a file 'context' which can be saved and later
+       restored by an ESMReader instance. It will save the position within
+       a file, and when restored will let you read from that position as
+       if you never left it.
+     */
+    struct ESM_Context
+    {
+        std::filesystem::path filename;
+        uint32_t leftRec, leftSub;
+        size_t leftFile;
+        NAME recName, subName;
+        // When working with multiple esX files, we will generate lists of all files that
+        //  actually contribute to a specific cell. Therefore, we need to store the index
+        //  of the file belonging to this contest. See CellStore::(list/load)refs for details.
+        int index;
+        std::vector<int> parentFileIndices;
+
+        // True if subName has been read but not used.
+        bool subCached;
+
+        // File position. Only used for stored contexts, not regularly
+        // updated within the reader itself.
+        size_t filePos;
+    };
 
 }
 
diff --git a/components/esm/luascripts.cpp b/components/esm/luascripts.cpp
index 6f8566c8a0..f37fcae5c6 100644
--- a/components/esm/luascripts.cpp
+++ b/components/esm/luascripts.cpp
@@ -94,8 +94,7 @@ void ESM::LuaScriptsCfg::load(ESMReader& esm)
 
 void ESM::LuaScriptsCfg::adjustRefNums(const ESMReader& esm)
 {
-    auto adjustRefNumFn = [&esm](int contentFile) -> int
-    {
+    auto adjustRefNumFn = [&esm](int contentFile) -> int {
         if (contentFile == 0)
             return esm.getIndex();
         else if (contentFile > 0 && contentFile <= static_cast<int>(esm.getParentFileIndices().size()))
@@ -107,8 +106,7 @@ void ESM::LuaScriptsCfg::adjustRefNums(const ESMReader& esm)
     lua_State* L = luaL_newstate();
     LuaUtil::BasicSerializer serializer(adjustRefNumFn);
 
-    auto adjustLuaData = [&](std::string& data)
-    {
+    auto adjustLuaData = [&](std::string& data) {
         if (data.empty())
             return;
         sol::object luaData = LuaUtil::deserialize(L, data, &serializer);
@@ -177,7 +175,7 @@ void ESM::LuaScripts::load(ESMReader& esm)
             timer.mCallbackArgument = loadLuaBinaryData(esm);
             timers.push_back(std::move(timer));
         }
-        mScripts.push_back({std::move(name), std::move(data), std::move(timers)});
+        mScripts.push_back({ std::move(name), std::move(data), std::move(timers) });
     }
 }
 
@@ -196,7 +194,6 @@ void ESM::LuaScripts::save(ESMWriter& esm) const
             esm.writeHNString("LUAC", timer.mCallbackName);
             if (!timer.mCallbackArgument.empty())
                 saveLuaBinaryData(esm, timer.mCallbackArgument);
-            
         }
     }
 }
diff --git a/components/esm/luascripts.hpp b/components/esm/luascripts.hpp
index c3bb94ac70..06ca5a65e5 100644
--- a/components/esm/luascripts.hpp
+++ b/components/esm/luascripts.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_ESM_LUASCRIPTS_H
 #define OPENMW_ESM_LUASCRIPTS_H
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace ESM
 {
@@ -14,23 +14,24 @@ namespace ESM
     struct LuaScriptCfg
     {
         using Flags = uint32_t;
-        static constexpr Flags sGlobal = 1ull << 0;  // start as a global script
-        static constexpr Flags sCustom = 1ull << 1;  // local; can be attached/detached by a global script
-        static constexpr Flags sPlayer = 1ull << 2;  // auto attach to players
+        static constexpr Flags sGlobal = 1ull << 0; // start as a global script
+        static constexpr Flags sCustom = 1ull << 1; // local; can be attached/detached by a global script
+        static constexpr Flags sPlayer = 1ull << 2; // auto attach to players
 
-        static constexpr Flags sMerge = 1ull << 3;  // merge with configuration for this script from previous content files.
+        static constexpr Flags sMerge = 1ull
+            << 3; // merge with configuration for this script from previous content files.
 
-        std::string mScriptPath;  // VFS path to the script.
-        std::string mInitializationData;  // Serialized Lua table. It is a binary data. Can contain '\0'.
-        Flags mFlags;  // bitwise OR of Flags.
+        std::string mScriptPath; // VFS path to the script.
+        std::string mInitializationData; // Serialized Lua table. It is a binary data. Can contain '\0'.
+        Flags mFlags; // bitwise OR of Flags.
 
         // Auto attach as a local script to objects of specific types (i.e. Container, Door, Activator, etc.)
-        std::vector<uint32_t> mTypes;  // values are ESM::RecNameInts
+        std::vector<uint32_t> mTypes; // values are ESM::RecNameInts
 
         // Auto attach as a local script to objects with specific recordIds (i.e. specific door type, or an unique NPC)
         struct PerRecordCfg
         {
-            bool mAttach;  // true - attach, false - don't attach (overrides previous attach)
+            bool mAttach; // true - attach, false - don't attach (overrides previous attach)
             std::string mRecordId;
             // Initialization data for this specific record. If empty than LuaScriptCfg::mInitializationData is used.
             std::string mInitializationData;
@@ -41,7 +42,7 @@ namespace ESM
         // content file as this LuaScriptCfg or in one of its deps.
         struct PerRefCfg
         {
-            bool mAttach;  // true - attach, false - don't attach (overrides previous attach)
+            bool mAttach; // true - attach, false - don't attach (overrides previous attach)
             uint32_t mRefnumIndex;
             int32_t mRefnumContentFile;
             // Initialization data for this specific refnum. If empty than LuaScriptCfg::mInitializationData is used.
@@ -54,10 +55,10 @@ namespace ESM
     {
         std::vector<LuaScriptCfg> mScripts;
 
-        void load(ESMReader &esm);
-        void adjustRefNums(const ESMReader &esm);
+        void load(ESMReader& esm);
+        void adjustRefNums(const ESMReader& esm);
 
-        void save(ESMWriter &esm) const;
+        void save(ESMWriter& esm) const;
     };
 
     // LuaTimer, LuaScript, LuaScripts are used in saved game files.
@@ -75,13 +76,13 @@ namespace ESM
         Type mType;
         double mTime;
         std::string mCallbackName;
-        std::string mCallbackArgument;  // Serialized Lua table. It is a binary data. Can contain '\0'.
+        std::string mCallbackArgument; // Serialized Lua table. It is a binary data. Can contain '\0'.
     };
 
     struct LuaScript
     {
         std::string mScriptPath;
-        std::string mData;  // Serialized Lua table. It is a binary data. Can contain '\0'.
+        std::string mData; // Serialized Lua table. It is a binary data. Can contain '\0'.
         std::vector<LuaTimer> mTimers;
     };
 
@@ -89,8 +90,8 @@ namespace ESM
     {
         std::vector<LuaScript> mScripts;
 
-        void load(ESMReader &esm);
-        void save(ESMWriter &esm) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 
     // Saves binary string `data` (can contain '\0') as LUAD record.
@@ -102,4 +103,3 @@ namespace ESM
 }
 
 #endif
-
diff --git a/components/esm/records.hpp b/components/esm/records.hpp
index 50d2f90263..7df0f6790f 100644
--- a/components/esm/records.hpp
+++ b/components/esm/records.hpp
@@ -1,7 +1,6 @@
 #ifndef OPENMW_ESM_RECORDS_H
 #define OPENMW_ESM_RECORDS_H
 
-#include "defs.hpp"
 #include "components/esm3/loadacti.hpp"
 #include "components/esm3/loadalch.hpp"
 #include "components/esm3/loadappa.hpp"
@@ -14,27 +13,27 @@
 #include "components/esm3/loadclot.hpp"
 #include "components/esm3/loadcont.hpp"
 #include "components/esm3/loadcrea.hpp"
-#include "components/esm3/loadinfo.hpp"
 #include "components/esm3/loaddial.hpp"
 #include "components/esm3/loaddoor.hpp"
 #include "components/esm3/loadench.hpp"
 #include "components/esm3/loadfact.hpp"
 #include "components/esm3/loadglob.hpp"
 #include "components/esm3/loadgmst.hpp"
+#include "components/esm3/loadinfo.hpp"
 #include "components/esm3/loadingr.hpp"
 #include "components/esm3/loadland.hpp"
 #include "components/esm3/loadlevlist.hpp"
 #include "components/esm3/loadligh.hpp"
 #include "components/esm3/loadlock.hpp"
-#include "components/esm3/loadrepa.hpp"
-#include "components/esm3/loadprob.hpp"
 #include "components/esm3/loadltex.hpp"
 #include "components/esm3/loadmgef.hpp"
 #include "components/esm3/loadmisc.hpp"
 #include "components/esm3/loadnpc.hpp"
 #include "components/esm3/loadpgrd.hpp"
+#include "components/esm3/loadprob.hpp"
 #include "components/esm3/loadrace.hpp"
 #include "components/esm3/loadregn.hpp"
+#include "components/esm3/loadrepa.hpp"
 #include "components/esm3/loadscpt.hpp"
 #include "components/esm3/loadskil.hpp"
 #include "components/esm3/loadsndg.hpp"
@@ -43,6 +42,7 @@
 #include "components/esm3/loadsscr.hpp"
 #include "components/esm3/loadstat.hpp"
 #include "components/esm3/loadweap.hpp"
+#include "defs.hpp"
 
 // Special records which are not loaded from ESM
 #include "components/esm/attr.hpp"
diff --git a/components/esm/util.hpp b/components/esm/util.hpp
index 204de371fb..b1a40bd015 100644
--- a/components/esm/util.hpp
+++ b/components/esm/util.hpp
@@ -1,52 +1,46 @@
 #ifndef OPENMW_ESM_UTIL_H
 #define OPENMW_ESM_UTIL_H
 
-#include <osg/Vec3f>
 #include <osg/Quat>
+#include <osg/Vec3f>
 
 namespace ESM
 {
 
-// format 0, savegames only
-
-struct Quaternion
-{
-    float mValues[4];
-
-    Quaternion() = default;
+    // format 0, savegames only
 
-    Quaternion(const osg::Quat& q)
+    struct Quaternion
     {
-        mValues[0] = q.w();
-        mValues[1] = q.x();
-        mValues[2] = q.y();
-        mValues[3] = q.z();
-    }
+        float mValues[4];
 
-    operator osg::Quat () const
-    {
-        return osg::Quat(mValues[1], mValues[2], mValues[3], mValues[0]);
-    }
-};
+        Quaternion() = default;
 
-struct Vector3
-{
-    float mValues[3];
+        Quaternion(const osg::Quat& q)
+        {
+            mValues[0] = q.w();
+            mValues[1] = q.x();
+            mValues[2] = q.y();
+            mValues[3] = q.z();
+        }
 
-    Vector3() = default;
+        operator osg::Quat() const { return osg::Quat(mValues[1], mValues[2], mValues[3], mValues[0]); }
+    };
 
-    Vector3(const osg::Vec3f& v)
+    struct Vector3
     {
-        mValues[0] = v.x();
-        mValues[1] = v.y();
-        mValues[2] = v.z();
-    }
+        float mValues[3];
 
-    operator osg::Vec3f () const
-    {
-        return osg::Vec3f(mValues[0], mValues[1], mValues[2]);
-    }
-};
+        Vector3() = default;
+
+        Vector3(const osg::Vec3f& v)
+        {
+            mValues[0] = v.x();
+            mValues[1] = v.y();
+            mValues[2] = v.z();
+        }
+
+        operator osg::Vec3f() const { return osg::Vec3f(mValues[0], mValues[1], mValues[2]); }
+    };
 
 }
 
diff --git a/components/esm3/activespells.cpp b/components/esm3/activespells.cpp
index fb41b5bf38..c2453ea399 100644
--- a/components/esm3/activespells.cpp
+++ b/components/esm3/activespells.cpp
@@ -5,118 +5,118 @@
 
 namespace ESM
 {
-namespace
-{
-    void saveImpl(ESMWriter& esm, const std::vector<ActiveSpells::ActiveSpellParams>& spells, NAME tag)
+    namespace
     {
-        for (const auto& params : spells)
+        void saveImpl(ESMWriter& esm, const std::vector<ActiveSpells::ActiveSpellParams>& spells, NAME tag)
         {
-            esm.writeHNString (tag, params.mId);
-
-            esm.writeHNT ("CAST", params.mCasterActorId);
-            esm.writeHNString ("DISP", params.mDisplayName);
-            esm.writeHNT ("TYPE", params.mType);
-            if(params.mItem.isSet())
-                params.mItem.save(esm, true, "ITEM");
-            if(params.mWorsenings >= 0)
+            for (const auto& params : spells)
             {
-                esm.writeHNT ("WORS", params.mWorsenings);
-                esm.writeHNT ("TIME", params.mNextWorsening);
-            }
+                esm.writeHNString(tag, params.mId);
 
-            for (auto& effect : params.mEffects)
-            {
-                esm.writeHNT ("MGEF", effect.mEffectId);
-                if (effect.mArg != -1)
-                    esm.writeHNT ("ARG_", effect.mArg);
-                esm.writeHNT ("MAGN", effect.mMagnitude);
-                esm.writeHNT ("MAGN", effect.mMinMagnitude);
-                esm.writeHNT ("MAGN", effect.mMaxMagnitude);
-                esm.writeHNT ("DURA", effect.mDuration);
-                esm.writeHNT ("EIND", effect.mEffectIndex);
-                esm.writeHNT ("LEFT", effect.mTimeLeft);
-                esm.writeHNT ("FLAG", effect.mFlags);
+                esm.writeHNT("CAST", params.mCasterActorId);
+                esm.writeHNString("DISP", params.mDisplayName);
+                esm.writeHNT("TYPE", params.mType);
+                if (params.mItem.isSet())
+                    params.mItem.save(esm, true, "ITEM");
+                if (params.mWorsenings >= 0)
+                {
+                    esm.writeHNT("WORS", params.mWorsenings);
+                    esm.writeHNT("TIME", params.mNextWorsening);
+                }
+
+                for (auto& effect : params.mEffects)
+                {
+                    esm.writeHNT("MGEF", effect.mEffectId);
+                    if (effect.mArg != -1)
+                        esm.writeHNT("ARG_", effect.mArg);
+                    esm.writeHNT("MAGN", effect.mMagnitude);
+                    esm.writeHNT("MAGN", effect.mMinMagnitude);
+                    esm.writeHNT("MAGN", effect.mMaxMagnitude);
+                    esm.writeHNT("DURA", effect.mDuration);
+                    esm.writeHNT("EIND", effect.mEffectIndex);
+                    esm.writeHNT("LEFT", effect.mTimeLeft);
+                    esm.writeHNT("FLAG", effect.mFlags);
+                }
             }
         }
-    }
 
-    void loadImpl(ESMReader& esm, std::vector<ActiveSpells::ActiveSpellParams>& spells, NAME tag)
-    {
-        int format = esm.getFormat();
-
-        while (esm.isNextSub(tag))
+        void loadImpl(ESMReader& esm, std::vector<ActiveSpells::ActiveSpellParams>& spells, NAME tag)
         {
-            ActiveSpells::ActiveSpellParams params;
-            params.mId = esm.getHString();
-            esm.getHNT (params.mCasterActorId, "CAST");
-            params.mDisplayName = esm.getHNString ("DISP");
-            params.mItem.unset();
-            if (format < 17)
-                params.mType = ActiveSpells::Type_Temporary;
-            else
-            {
-                esm.getHNT (params.mType, "TYPE");
-                if(esm.peekNextSub("ITEM"))
-                    params.mItem.load(esm, true, "ITEM");
-            }
-            if(esm.isNextSub("WORS"))
-            {
-                esm.getHT(params.mWorsenings);
-                esm.getHNT(params.mNextWorsening, "TIME");
-            }
-            else
-                params.mWorsenings = -1;
-
-            // spell casting timestamp, no longer used
-            if (esm.isNextSub("TIME"))
-                esm.skipHSub();
+            int format = esm.getFormat();
 
-            while (esm.isNextSub("MGEF"))
+            while (esm.isNextSub(tag))
             {
-                ActiveEffect effect;
-                esm.getHT(effect.mEffectId);
-                effect.mArg = -1;
-                esm.getHNOT(effect.mArg, "ARG_");
-                esm.getHNT (effect.mMagnitude, "MAGN");
+                ActiveSpells::ActiveSpellParams params;
+                params.mId = esm.getHString();
+                esm.getHNT(params.mCasterActorId, "CAST");
+                params.mDisplayName = esm.getHNString("DISP");
+                params.mItem.unset();
                 if (format < 17)
+                    params.mType = ActiveSpells::Type_Temporary;
+                else
                 {
-                    effect.mMinMagnitude = effect.mMagnitude;
-                    effect.mMaxMagnitude = effect.mMagnitude;
+                    esm.getHNT(params.mType, "TYPE");
+                    if (esm.peekNextSub("ITEM"))
+                        params.mItem.load(esm, true, "ITEM");
                 }
-                else
+                if (esm.isNextSub("WORS"))
                 {
-                    esm.getHNT (effect.mMinMagnitude, "MAGN");
-                    esm.getHNT (effect.mMaxMagnitude, "MAGN");
+                    esm.getHT(params.mWorsenings);
+                    esm.getHNT(params.mNextWorsening, "TIME");
                 }
-                esm.getHNT (effect.mDuration, "DURA");
-                effect.mEffectIndex = -1;
-                esm.getHNOT (effect.mEffectIndex, "EIND");
-                if (format < 9)
-                    effect.mTimeLeft = effect.mDuration;
                 else
-                    esm.getHNT (effect.mTimeLeft, "LEFT");
-                if (format < 17)
-                    effect.mFlags = ActiveEffect::Flag_None;
-                else
-                    esm.getHNT (effect.mFlags, "FLAG");
+                    params.mWorsenings = -1;
+
+                // spell casting timestamp, no longer used
+                if (esm.isNextSub("TIME"))
+                    esm.skipHSub();
+
+                while (esm.isNextSub("MGEF"))
+                {
+                    ActiveEffect effect;
+                    esm.getHT(effect.mEffectId);
+                    effect.mArg = -1;
+                    esm.getHNOT(effect.mArg, "ARG_");
+                    esm.getHNT(effect.mMagnitude, "MAGN");
+                    if (format < 17)
+                    {
+                        effect.mMinMagnitude = effect.mMagnitude;
+                        effect.mMaxMagnitude = effect.mMagnitude;
+                    }
+                    else
+                    {
+                        esm.getHNT(effect.mMinMagnitude, "MAGN");
+                        esm.getHNT(effect.mMaxMagnitude, "MAGN");
+                    }
+                    esm.getHNT(effect.mDuration, "DURA");
+                    effect.mEffectIndex = -1;
+                    esm.getHNOT(effect.mEffectIndex, "EIND");
+                    if (format < 9)
+                        effect.mTimeLeft = effect.mDuration;
+                    else
+                        esm.getHNT(effect.mTimeLeft, "LEFT");
+                    if (format < 17)
+                        effect.mFlags = ActiveEffect::Flag_None;
+                    else
+                        esm.getHNT(effect.mFlags, "FLAG");
 
-                params.mEffects.push_back(effect);
+                    params.mEffects.push_back(effect);
+                }
+                spells.emplace_back(params);
             }
-            spells.emplace_back(params);
         }
     }
 }
-}
 
 namespace ESM
 {
-    void ActiveSpells::save(ESMWriter &esm) const
+    void ActiveSpells::save(ESMWriter& esm) const
     {
         saveImpl(esm, mSpells, "ID__");
         saveImpl(esm, mQueue, "QID_");
     }
 
-    void ActiveSpells::load(ESMReader &esm)
+    void ActiveSpells::load(ESMReader& esm)
     {
         loadImpl(esm, mSpells, "ID__");
         loadImpl(esm, mQueue, "QID_");
diff --git a/components/esm3/activespells.hpp b/components/esm3/activespells.hpp
index 80544b4dbb..4b7e2bf72d 100644
--- a/components/esm3/activespells.hpp
+++ b/components/esm3/activespells.hpp
@@ -64,8 +64,8 @@ namespace ESM
         std::vector<ActiveSpellParams> mSpells;
         std::vector<ActiveSpellParams> mQueue;
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 }
 
diff --git a/components/esm3/aipackage.cpp b/components/esm3/aipackage.cpp
index 55ee64db9c..4d4c03c349 100644
--- a/components/esm3/aipackage.cpp
+++ b/components/esm3/aipackage.cpp
@@ -11,68 +11,80 @@ namespace ESM
         mServices = 0;
     }
 
-    void AIPackageList::add(ESMReader &esm)
+    void AIPackageList::add(ESMReader& esm)
     {
         AIPackage pack;
-        if (esm.retSubName() == AI_CNDT) {
-            if (mList.empty()) 
+        if (esm.retSubName() == AI_CNDT)
+        {
+            if (mList.empty())
             {
                 esm.fail("AIPackge with an AI_CNDT applying to no cell.");
-            } else {
+            }
+            else
+            {
                 mList.back().mCellName = esm.getHString();
             }
-        } else if (esm.retSubName() == AI_Wander) {
+        }
+        else if (esm.retSubName() == AI_Wander)
+        {
             pack.mType = AI_Wander;
             esm.getHExact(&pack.mWander, 14);
             mList.push_back(pack);
-        } else if (esm.retSubName() == AI_Travel) {
+        }
+        else if (esm.retSubName() == AI_Travel)
+        {
             pack.mType = AI_Travel;
             esm.getHExact(&pack.mTravel, 16);
             mList.push_back(pack);
-        } else if (esm.retSubName() == AI_Escort ||
-                   esm.retSubName() == AI_Follow)
+        }
+        else if (esm.retSubName() == AI_Escort || esm.retSubName() == AI_Follow)
         {
-            pack.mType =
-                (esm.retSubName() == AI_Escort) ? AI_Escort : AI_Follow;
-                esm.getHExact(&pack.mTarget, 48);
+            pack.mType = (esm.retSubName() == AI_Escort) ? AI_Escort : AI_Follow;
+            esm.getHExact(&pack.mTarget, 48);
             mList.push_back(pack);
-        } else if (esm.retSubName() == AI_Activate) {
+        }
+        else if (esm.retSubName() == AI_Activate)
+        {
             pack.mType = AI_Activate;
             esm.getHExact(&pack.mActivate, 33);
             mList.push_back(pack);
-        } else { // not AI package related data, so leave
-             return;
         }
-
+        else
+        { // not AI package related data, so leave
+            return;
+        }
     }
 
-    void AIPackageList::save(ESMWriter &esm) const
+    void AIPackageList::save(ESMWriter& esm) const
     {
         typedef std::vector<AIPackage>::const_iterator PackageIter;
-        for (PackageIter it = mList.begin(); it != mList.end(); ++it) {
-            switch (it->mType) {
-            case AI_Wander:
-                esm.writeHNT("AI_W", it->mWander, sizeof(it->mWander));
-                break;
+        for (PackageIter it = mList.begin(); it != mList.end(); ++it)
+        {
+            switch (it->mType)
+            {
+                case AI_Wander:
+                    esm.writeHNT("AI_W", it->mWander, sizeof(it->mWander));
+                    break;
 
-            case AI_Travel:
-                esm.writeHNT("AI_T", it->mTravel, sizeof(it->mTravel));
-                break;
+                case AI_Travel:
+                    esm.writeHNT("AI_T", it->mTravel, sizeof(it->mTravel));
+                    break;
 
-            case AI_Activate:
-                esm.writeHNT("AI_A", it->mActivate, sizeof(it->mActivate));
-                break;
+                case AI_Activate:
+                    esm.writeHNT("AI_A", it->mActivate, sizeof(it->mActivate));
+                    break;
 
-            case AI_Escort:
-            case AI_Follow: {
-                const NAME name = (it->mType == AI_Escort) ? NAME("AI_E") : NAME("AI_F");
-                esm.writeHNT(name, it->mTarget, sizeof(it->mTarget));
-                esm.writeHNOCString("CNDT", it->mCellName);
-                break;
-            }
+                case AI_Escort:
+                case AI_Follow:
+                {
+                    const NAME name = (it->mType == AI_Escort) ? NAME("AI_E") : NAME("AI_F");
+                    esm.writeHNT(name, it->mTarget, sizeof(it->mTarget));
+                    esm.writeHNOCString("CNDT", it->mCellName);
+                    break;
+                }
 
-            default:
-                break;
+                default:
+                    break;
             }
         }
     }
diff --git a/components/esm3/aipackage.hpp b/components/esm3/aipackage.hpp
index 516c1e6790..61aea2750a 100644
--- a/components/esm3/aipackage.hpp
+++ b/components/esm3/aipackage.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_ESM_AIPACKAGE_H
 #define OPENMW_ESM_AIPACKAGE_H
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "components/esm/esmcommon.hpp"
 
@@ -11,8 +11,8 @@ namespace ESM
     class ESMReader;
     class ESMWriter;
 
-    #pragma pack(push)
-    #pragma pack(1)
+#pragma pack(push)
+#pragma pack(1)
 
     struct AIData
     {
@@ -27,8 +27,8 @@ namespace ESM
 
     struct AIWander
     {
-        short   mDistance;
-        short   mDuration;
+        short mDistance;
+        short mDuration;
         unsigned char mTimeOfDay;
         unsigned char mIdle[8];
         unsigned char mShouldRepeat;
@@ -36,16 +36,16 @@ namespace ESM
 
     struct AITravel
     {
-        float   mX, mY, mZ;
+        float mX, mY, mZ;
         unsigned char mShouldRepeat;
         unsigned char mPadding[3];
     };
 
     struct AITarget
     {
-        float   mX, mY, mZ;
-        short   mDuration;
-        NAME32  mId;
+        float mX, mY, mZ;
+        short mDuration;
+        NAME32 mId;
         unsigned char mShouldRepeat;
         unsigned char mPadding;
     };
@@ -56,7 +56,7 @@ namespace ESM
         unsigned char mShouldRepeat;
     };
 
-    #pragma pack(pop)
+#pragma pack(pop)
 
     enum AiPackageType : std::uint32_t
     {
@@ -94,11 +94,10 @@ namespace ESM
         std::vector<AIPackage> mList;
 
         /// Add a single AIPackage, assumes subrecord name was already read
-        void add(ESMReader &esm);
+        void add(ESMReader& esm);
 
-        void save(ESMWriter &esm) const;
+        void save(ESMWriter& esm) const;
     };
 }
 
 #endif
-
diff --git a/components/esm3/aisequence.cpp b/components/esm3/aisequence.cpp
index a9670a598d..2fc00e2fb9 100644
--- a/components/esm3/aisequence.cpp
+++ b/components/esm3/aisequence.cpp
@@ -8,277 +8,279 @@
 
 namespace ESM
 {
-namespace AiSequence
-{
-
-    void AiWander::load(ESMReader &esm)
+    namespace AiSequence
     {
-        esm.getHNT (mData, "DATA");
-        esm.getHNT(mDurationData, "STAR"); // was mStartTime
-        mStoredInitialActorPosition = false;
-        if (esm.isNextSub("POS_"))
+
+        void AiWander::load(ESMReader& esm)
         {
-            mStoredInitialActorPosition = true;
-            esm.getHT(mInitialActorPosition);
+            esm.getHNT(mData, "DATA");
+            esm.getHNT(mDurationData, "STAR"); // was mStartTime
+            mStoredInitialActorPosition = false;
+            if (esm.isNextSub("POS_"))
+            {
+                mStoredInitialActorPosition = true;
+                esm.getHT(mInitialActorPosition);
+            }
         }
-    }
 
-    void AiWander::save(ESMWriter &esm) const
-    {
-        esm.writeHNT ("DATA", mData);
-        esm.writeHNT ("STAR", mDurationData);
-        if (mStoredInitialActorPosition)
-            esm.writeHNT ("POS_", mInitialActorPosition);
-    }
+        void AiWander::save(ESMWriter& esm) const
+        {
+            esm.writeHNT("DATA", mData);
+            esm.writeHNT("STAR", mDurationData);
+            if (mStoredInitialActorPosition)
+                esm.writeHNT("POS_", mInitialActorPosition);
+        }
 
-    void AiTravel::load(ESMReader &esm)
-    {
-        esm.getHNT (mData, "DATA");
-        esm.getHNOT (mHidden, "HIDD");
-        mRepeat = false;
-        esm.getHNOT(mRepeat, "REPT");
-    }
+        void AiTravel::load(ESMReader& esm)
+        {
+            esm.getHNT(mData, "DATA");
+            esm.getHNOT(mHidden, "HIDD");
+            mRepeat = false;
+            esm.getHNOT(mRepeat, "REPT");
+        }
 
-    void AiTravel::save(ESMWriter &esm) const
-    {
-        esm.writeHNT ("DATA", mData);
-        esm.writeHNT ("HIDD", mHidden);
-        if(mRepeat)
-            esm.writeHNT("REPT", mRepeat);
-    }
+        void AiTravel::save(ESMWriter& esm) const
+        {
+            esm.writeHNT("DATA", mData);
+            esm.writeHNT("HIDD", mHidden);
+            if (mRepeat)
+                esm.writeHNT("REPT", mRepeat);
+        }
 
-    void AiEscort::load(ESMReader &esm)
-    {
-        esm.getHNT (mData, "DATA");
-        mTargetId = esm.getHNString("TARG");
-        mTargetActorId = -1;
-        esm.getHNOT (mTargetActorId, "TAID");
-        esm.getHNT (mRemainingDuration, "DURA");
-        mCellId = esm.getHNOString ("CELL");
-        mRepeat = false;
-        esm.getHNOT(mRepeat, "REPT");
-        if(esm.getFormat() < 18)
+        void AiEscort::load(ESMReader& esm)
         {
-            // mDuration isn't saved in the save file, so just giving it "1" for now if the package has a duration.
-            // The exact value of mDuration only matters for repeating packages.
-            // Previously mRemainingDuration could be negative even when mDuration was 0. Checking for > 0 should fix old saves.
-            mData.mDuration = std::max<float>(mRemainingDuration > 0, mRemainingDuration);
+            esm.getHNT(mData, "DATA");
+            mTargetId = esm.getHNString("TARG");
+            mTargetActorId = -1;
+            esm.getHNOT(mTargetActorId, "TAID");
+            esm.getHNT(mRemainingDuration, "DURA");
+            mCellId = esm.getHNOString("CELL");
+            mRepeat = false;
+            esm.getHNOT(mRepeat, "REPT");
+            if (esm.getFormat() < 18)
+            {
+                // mDuration isn't saved in the save file, so just giving it "1" for now if the package has a duration.
+                // The exact value of mDuration only matters for repeating packages.
+                // Previously mRemainingDuration could be negative even when mDuration was 0. Checking for > 0 should
+                // fix old saves.
+                mData.mDuration = std::max<float>(mRemainingDuration > 0, mRemainingDuration);
+            }
         }
-    }
 
-    void AiEscort::save(ESMWriter &esm) const
-    {
-        esm.writeHNT ("DATA", mData);
-        esm.writeHNString ("TARG", mTargetId);
-        esm.writeHNT ("TAID", mTargetActorId);
-        esm.writeHNT ("DURA", mRemainingDuration);
-        if (!mCellId.empty())
-            esm.writeHNString ("CELL", mCellId);
-        if(mRepeat)
-            esm.writeHNT("REPT", mRepeat);
-    }
+        void AiEscort::save(ESMWriter& esm) const
+        {
+            esm.writeHNT("DATA", mData);
+            esm.writeHNString("TARG", mTargetId);
+            esm.writeHNT("TAID", mTargetActorId);
+            esm.writeHNT("DURA", mRemainingDuration);
+            if (!mCellId.empty())
+                esm.writeHNString("CELL", mCellId);
+            if (mRepeat)
+                esm.writeHNT("REPT", mRepeat);
+        }
 
-    void AiFollow::load(ESMReader &esm)
-    {
-        esm.getHNT (mData, "DATA");
-        mTargetId = esm.getHNString("TARG");
-        mTargetActorId = -1;
-        esm.getHNOT (mTargetActorId, "TAID");
-        esm.getHNT (mRemainingDuration, "DURA");
-        mCellId = esm.getHNOString ("CELL");
-        esm.getHNT (mAlwaysFollow, "ALWY");
-        mCommanded = false;
-        esm.getHNOT (mCommanded, "CMND");
-        mActive = false;
-        esm.getHNOT (mActive, "ACTV");
-        mRepeat = false;
-        esm.getHNOT(mRepeat, "REPT");
-        if(esm.getFormat() < 18)
+        void AiFollow::load(ESMReader& esm)
         {
-            // mDuration isn't saved in the save file, so just giving it "1" for now if the package has a duration.
-            // The exact value of mDuration only matters for repeating packages.
-            // Previously mRemainingDuration could be negative even when mDuration was 0. Checking for > 0 should fix old saves.
-            mData.mDuration = std::max<float>(mRemainingDuration > 0, mRemainingDuration);
+            esm.getHNT(mData, "DATA");
+            mTargetId = esm.getHNString("TARG");
+            mTargetActorId = -1;
+            esm.getHNOT(mTargetActorId, "TAID");
+            esm.getHNT(mRemainingDuration, "DURA");
+            mCellId = esm.getHNOString("CELL");
+            esm.getHNT(mAlwaysFollow, "ALWY");
+            mCommanded = false;
+            esm.getHNOT(mCommanded, "CMND");
+            mActive = false;
+            esm.getHNOT(mActive, "ACTV");
+            mRepeat = false;
+            esm.getHNOT(mRepeat, "REPT");
+            if (esm.getFormat() < 18)
+            {
+                // mDuration isn't saved in the save file, so just giving it "1" for now if the package has a duration.
+                // The exact value of mDuration only matters for repeating packages.
+                // Previously mRemainingDuration could be negative even when mDuration was 0. Checking for > 0 should
+                // fix old saves.
+                mData.mDuration = std::max<float>(mRemainingDuration > 0, mRemainingDuration);
+            }
         }
-    }
 
-    void AiFollow::save(ESMWriter &esm) const
-    {
-        esm.writeHNT ("DATA", mData);
-        esm.writeHNString("TARG", mTargetId);
-        esm.writeHNT ("TAID", mTargetActorId);
-        esm.writeHNT ("DURA", mRemainingDuration);
-        if (!mCellId.empty())
-            esm.writeHNString ("CELL", mCellId);
-        esm.writeHNT ("ALWY", mAlwaysFollow);
-        esm.writeHNT ("CMND", mCommanded);
-        if (mActive)
-            esm.writeHNT("ACTV", mActive);
-        if(mRepeat)
-            esm.writeHNT("REPT", mRepeat);
-    }
+        void AiFollow::save(ESMWriter& esm) const
+        {
+            esm.writeHNT("DATA", mData);
+            esm.writeHNString("TARG", mTargetId);
+            esm.writeHNT("TAID", mTargetActorId);
+            esm.writeHNT("DURA", mRemainingDuration);
+            if (!mCellId.empty())
+                esm.writeHNString("CELL", mCellId);
+            esm.writeHNT("ALWY", mAlwaysFollow);
+            esm.writeHNT("CMND", mCommanded);
+            if (mActive)
+                esm.writeHNT("ACTV", mActive);
+            if (mRepeat)
+                esm.writeHNT("REPT", mRepeat);
+        }
 
-    void AiActivate::load(ESMReader &esm)
-    {
-        mTargetId = esm.getHNString("TARG");
-        mRepeat = false;
-        esm.getHNOT(mRepeat, "REPT");
-    }
+        void AiActivate::load(ESMReader& esm)
+        {
+            mTargetId = esm.getHNString("TARG");
+            mRepeat = false;
+            esm.getHNOT(mRepeat, "REPT");
+        }
 
-    void AiActivate::save(ESMWriter &esm) const
-    {
-        esm.writeHNString("TARG", mTargetId);
-        if(mRepeat)
-            esm.writeHNT("REPT", mRepeat);
-    }
+        void AiActivate::save(ESMWriter& esm) const
+        {
+            esm.writeHNString("TARG", mTargetId);
+            if (mRepeat)
+                esm.writeHNT("REPT", mRepeat);
+        }
 
-    void AiCombat::load(ESMReader &esm)
-    {
-        esm.getHNT (mTargetActorId, "TARG");
-    }
+        void AiCombat::load(ESMReader& esm)
+        {
+            esm.getHNT(mTargetActorId, "TARG");
+        }
 
-    void AiCombat::save(ESMWriter &esm) const
-    {
-        esm.writeHNT ("TARG", mTargetActorId);
-    }
+        void AiCombat::save(ESMWriter& esm) const
+        {
+            esm.writeHNT("TARG", mTargetActorId);
+        }
 
-    void AiPursue::load(ESMReader &esm)
-    {
-        esm.getHNT (mTargetActorId, "TARG");
-    }
+        void AiPursue::load(ESMReader& esm)
+        {
+            esm.getHNT(mTargetActorId, "TARG");
+        }
 
-    void AiPursue::save(ESMWriter &esm) const
-    {
-        esm.writeHNT ("TARG", mTargetActorId);
-    }
+        void AiPursue::save(ESMWriter& esm) const
+        {
+            esm.writeHNT("TARG", mTargetActorId);
+        }
 
-    void AiSequence::save(ESMWriter &esm) const
-    {
-        for (std::vector<AiPackageContainer>::const_iterator it = mPackages.begin(); it != mPackages.end(); ++it)
+        void AiSequence::save(ESMWriter& esm) const
         {
-            esm.writeHNT ("AIPK", it->mType);
-            switch (it->mType)
+            for (std::vector<AiPackageContainer>::const_iterator it = mPackages.begin(); it != mPackages.end(); ++it)
             {
-            case Ai_Wander:
-                static_cast<const AiWander&>(*it->mPackage).save(esm);
-                break;
-            case Ai_Travel:
-                static_cast<const AiTravel&>(*it->mPackage).save(esm);
-                break;
-            case Ai_Escort:
-                static_cast<const AiEscort&>(*it->mPackage).save(esm);
-                break;
-            case Ai_Follow:
-                static_cast<const AiFollow&>(*it->mPackage).save(esm);
-                break;
-            case Ai_Activate:
-                static_cast<const AiActivate&>(*it->mPackage).save(esm);
-                break;
-            case Ai_Combat:
-                static_cast<const AiCombat&>(*it->mPackage).save(esm);
-                break;
-            case Ai_Pursue:
-                static_cast<const AiPursue&>(*it->mPackage).save(esm);
-                break;
+                esm.writeHNT("AIPK", it->mType);
+                switch (it->mType)
+                {
+                    case Ai_Wander:
+                        static_cast<const AiWander&>(*it->mPackage).save(esm);
+                        break;
+                    case Ai_Travel:
+                        static_cast<const AiTravel&>(*it->mPackage).save(esm);
+                        break;
+                    case Ai_Escort:
+                        static_cast<const AiEscort&>(*it->mPackage).save(esm);
+                        break;
+                    case Ai_Follow:
+                        static_cast<const AiFollow&>(*it->mPackage).save(esm);
+                        break;
+                    case Ai_Activate:
+                        static_cast<const AiActivate&>(*it->mPackage).save(esm);
+                        break;
+                    case Ai_Combat:
+                        static_cast<const AiCombat&>(*it->mPackage).save(esm);
+                        break;
+                    case Ai_Pursue:
+                        static_cast<const AiPursue&>(*it->mPackage).save(esm);
+                        break;
 
-            default:
-                break;
+                    default:
+                        break;
+                }
             }
-        }
 
-        esm.writeHNT ("LAST", mLastAiPackage);
-    }
+            esm.writeHNT("LAST", mLastAiPackage);
+        }
 
-    void AiSequence::load(ESMReader &esm)
-    {
-        int count = 0;
-        while (esm.isNextSub("AIPK"))
+        void AiSequence::load(ESMReader& esm)
         {
-            int type;
-            esm.getHT(type);
+            int count = 0;
+            while (esm.isNextSub("AIPK"))
+            {
+                int type;
+                esm.getHT(type);
 
-            mPackages.emplace_back();
-            mPackages.back().mType = type;
+                mPackages.emplace_back();
+                mPackages.back().mType = type;
 
-            switch (type)
-            {
-            case Ai_Wander:
-            {
-                std::unique_ptr<AiWander> ptr = std::make_unique<AiWander>();
-                ptr->load(esm);
-                mPackages.back().mPackage = std::move(ptr);
-                ++count;
-                break;
-            }
-            case Ai_Travel:
-            {
-                std::unique_ptr<AiTravel> ptr = std::make_unique<AiTravel>();
-                ptr->load(esm);
-                mPackages.back().mPackage = std::move(ptr);
-                ++count;
-                break;
-            }
-            case Ai_Escort:
-            {
-                std::unique_ptr<AiEscort> ptr = std::make_unique<AiEscort>();
-                ptr->load(esm);
-                mPackages.back().mPackage = std::move(ptr);
-                ++count;
-                break;
-            }
-            case Ai_Follow:
-            {
-                std::unique_ptr<AiFollow> ptr = std::make_unique<AiFollow>();
-                ptr->load(esm);
-                mPackages.back().mPackage = std::move(ptr);
-                ++count;
-                break;
+                switch (type)
+                {
+                    case Ai_Wander:
+                    {
+                        std::unique_ptr<AiWander> ptr = std::make_unique<AiWander>();
+                        ptr->load(esm);
+                        mPackages.back().mPackage = std::move(ptr);
+                        ++count;
+                        break;
+                    }
+                    case Ai_Travel:
+                    {
+                        std::unique_ptr<AiTravel> ptr = std::make_unique<AiTravel>();
+                        ptr->load(esm);
+                        mPackages.back().mPackage = std::move(ptr);
+                        ++count;
+                        break;
+                    }
+                    case Ai_Escort:
+                    {
+                        std::unique_ptr<AiEscort> ptr = std::make_unique<AiEscort>();
+                        ptr->load(esm);
+                        mPackages.back().mPackage = std::move(ptr);
+                        ++count;
+                        break;
+                    }
+                    case Ai_Follow:
+                    {
+                        std::unique_ptr<AiFollow> ptr = std::make_unique<AiFollow>();
+                        ptr->load(esm);
+                        mPackages.back().mPackage = std::move(ptr);
+                        ++count;
+                        break;
+                    }
+                    case Ai_Activate:
+                    {
+                        std::unique_ptr<AiActivate> ptr = std::make_unique<AiActivate>();
+                        ptr->load(esm);
+                        mPackages.back().mPackage = std::move(ptr);
+                        ++count;
+                        break;
+                    }
+                    case Ai_Combat:
+                    {
+                        std::unique_ptr<AiCombat> ptr = std::make_unique<AiCombat>();
+                        ptr->load(esm);
+                        mPackages.back().mPackage = std::move(ptr);
+                        break;
+                    }
+                    case Ai_Pursue:
+                    {
+                        std::unique_ptr<AiPursue> ptr = std::make_unique<AiPursue>();
+                        ptr->load(esm);
+                        mPackages.back().mPackage = std::move(ptr);
+                        break;
+                    }
+                    default:
+                        return;
+                }
             }
-            case Ai_Activate:
-            {
-                std::unique_ptr<AiActivate> ptr = std::make_unique<AiActivate>();
-                ptr->load(esm);
-                mPackages.back().mPackage = std::move(ptr);
-                ++count;
-                break;
-            }
-            case Ai_Combat:
-            {
-                std::unique_ptr<AiCombat> ptr = std::make_unique<AiCombat>();
-                ptr->load(esm);
-                mPackages.back().mPackage = std::move(ptr);
-                break;
-            }
-            case Ai_Pursue:
-            {
-                std::unique_ptr<AiPursue> ptr = std::make_unique<AiPursue>();
-                ptr->load(esm);
-                mPackages.back().mPackage = std::move(ptr);
-                break;
-            }
-            default:
-                return;
-            }
-        }
 
-        esm.getHNOT (mLastAiPackage, "LAST");
+            esm.getHNOT(mLastAiPackage, "LAST");
 
-        if(count > 1 && esm.getFormat() < 18)
-        {
-            for(auto& pkg : mPackages)
+            if (count > 1 && esm.getFormat() < 18)
             {
-                if(pkg.mType == Ai_Wander)
-                    static_cast<AiWander&>(*pkg.mPackage).mData.mShouldRepeat = true;
-                else if(pkg.mType == Ai_Travel)
-                    static_cast<AiTravel&>(*pkg.mPackage).mRepeat = true;
-                else if(pkg.mType == Ai_Escort)
-                    static_cast<AiEscort&>(*pkg.mPackage).mRepeat = true;
-                else if(pkg.mType == Ai_Follow)
-                    static_cast<AiFollow&>(*pkg.mPackage).mRepeat = true;
-                else if(pkg.mType == Ai_Activate)
-                    static_cast<AiActivate&>(*pkg.mPackage).mRepeat = true;
+                for (auto& pkg : mPackages)
+                {
+                    if (pkg.mType == Ai_Wander)
+                        static_cast<AiWander&>(*pkg.mPackage).mData.mShouldRepeat = true;
+                    else if (pkg.mType == Ai_Travel)
+                        static_cast<AiTravel&>(*pkg.mPackage).mRepeat = true;
+                    else if (pkg.mType == Ai_Escort)
+                        static_cast<AiEscort&>(*pkg.mPackage).mRepeat = true;
+                    else if (pkg.mType == Ai_Follow)
+                        static_cast<AiFollow&>(*pkg.mPackage).mRepeat = true;
+                    else if (pkg.mType == Ai_Activate)
+                        static_cast<AiActivate&>(*pkg.mPackage).mRepeat = true;
+                }
             }
         }
     }
 }
-}
diff --git a/components/esm3/aisequence.hpp b/components/esm3/aisequence.hpp
index f71771a4d5..9c4af0c971 100644
--- a/components/esm3/aisequence.hpp
+++ b/components/esm3/aisequence.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_COMPONENTS_ESM_AISEQUENCE_H
 #define OPENMW_COMPONENTS_ESM_AISEQUENCE_H
 
-#include <vector>
-#include <string>
 #include <memory>
+#include <string>
+#include <vector>
 
 #include "components/esm/defs.hpp"
 
@@ -17,159 +17,154 @@ namespace ESM
     namespace AiSequence
     {
 
-    // format 0, saved games only
-    // As opposed to AiPackageList, this stores the "live" version of AI packages.
-
-    enum AiPackages
-    {
-        Ai_Wander = fourCC("WAND"),
-        Ai_Travel = fourCC("TRAV"),
-        Ai_Escort = fourCC("ESCO"),
-        Ai_Follow = fourCC("FOLL"),
-        Ai_Activate = fourCC("ACTI"),
-        Ai_Combat = fourCC("COMB"),
-        Ai_Pursue = fourCC("PURS")
-    };
-
-
-    struct AiPackage
-    {
-        virtual ~AiPackage() {}
-    };
+        // format 0, saved games only
+        // As opposed to AiPackageList, this stores the "live" version of AI packages.
 
+        enum AiPackages
+        {
+            Ai_Wander = fourCC("WAND"),
+            Ai_Travel = fourCC("TRAV"),
+            Ai_Escort = fourCC("ESCO"),
+            Ai_Follow = fourCC("FOLL"),
+            Ai_Activate = fourCC("ACTI"),
+            Ai_Combat = fourCC("COMB"),
+            Ai_Pursue = fourCC("PURS")
+        };
+
+        struct AiPackage
+        {
+            virtual ~AiPackage() {}
+        };
 
-#pragma pack(push,1)
-    struct AiWanderData
-    {
-        short   mDistance;
-        short   mDuration;
-        unsigned char mTimeOfDay;
-        unsigned char mIdle[8];
-        unsigned char mShouldRepeat;
-    };
-    struct AiWanderDuration
-    {
-        float mRemainingDuration;
-        int unused;
-    };
-    struct AiTravelData
-    {
-        float   mX, mY, mZ;
-    };
-    struct AiEscortData
-    {
-        float mX, mY, mZ;
-        short   mDuration;
-    };
+#pragma pack(push, 1)
+        struct AiWanderData
+        {
+            short mDistance;
+            short mDuration;
+            unsigned char mTimeOfDay;
+            unsigned char mIdle[8];
+            unsigned char mShouldRepeat;
+        };
+        struct AiWanderDuration
+        {
+            float mRemainingDuration;
+            int unused;
+        };
+        struct AiTravelData
+        {
+            float mX, mY, mZ;
+        };
+        struct AiEscortData
+        {
+            float mX, mY, mZ;
+            short mDuration;
+        };
 
 #pragma pack(pop)
 
-    struct AiWander : AiPackage
-    {
-        AiWanderData mData;
-        AiWanderDuration mDurationData; // was TimeStamp mStartTime
+        struct AiWander : AiPackage
+        {
+            AiWanderData mData;
+            AiWanderDuration mDurationData; // was TimeStamp mStartTime
 
-        bool mStoredInitialActorPosition;
-        Vector3 mInitialActorPosition;
+            bool mStoredInitialActorPosition;
+            Vector3 mInitialActorPosition;
 
-        /// \todo add more AiWander state
+            /// \todo add more AiWander state
 
-        void load(ESMReader &esm);
-        void save(ESMWriter &esm) const;
-    };
+            void load(ESMReader& esm);
+            void save(ESMWriter& esm) const;
+        };
 
-    struct AiTravel : AiPackage
-    {
-        AiTravelData mData;
-        bool mHidden;
-        bool mRepeat;
+        struct AiTravel : AiPackage
+        {
+            AiTravelData mData;
+            bool mHidden;
+            bool mRepeat;
 
-        void load(ESMReader &esm);
-        void save(ESMWriter &esm) const;
-    };
+            void load(ESMReader& esm);
+            void save(ESMWriter& esm) const;
+        };
 
-    struct AiEscort : AiPackage
-    {
-        AiEscortData mData;
+        struct AiEscort : AiPackage
+        {
+            AiEscortData mData;
 
-        int mTargetActorId;
-        std::string mTargetId;
-        std::string mCellId;
-        float mRemainingDuration;
-        bool mRepeat;
+            int mTargetActorId;
+            std::string mTargetId;
+            std::string mCellId;
+            float mRemainingDuration;
+            bool mRepeat;
 
-        void load(ESMReader &esm);
-        void save(ESMWriter &esm) const;
-    };
+            void load(ESMReader& esm);
+            void save(ESMWriter& esm) const;
+        };
 
-    struct AiFollow : AiPackage
-    {
-        AiEscortData mData;
+        struct AiFollow : AiPackage
+        {
+            AiEscortData mData;
 
-        int mTargetActorId;
-        std::string mTargetId;
-        std::string mCellId;
-        float mRemainingDuration;
+            int mTargetActorId;
+            std::string mTargetId;
+            std::string mCellId;
+            float mRemainingDuration;
 
-        bool mAlwaysFollow;
-        bool mCommanded;
+            bool mAlwaysFollow;
+            bool mCommanded;
 
-        bool mActive;
-        bool mRepeat;
+            bool mActive;
+            bool mRepeat;
 
-        void load(ESMReader &esm);
-        void save(ESMWriter &esm) const;
-    };
+            void load(ESMReader& esm);
+            void save(ESMWriter& esm) const;
+        };
 
-    struct AiActivate : AiPackage
-    {
-        std::string mTargetId;
-        bool mRepeat;
+        struct AiActivate : AiPackage
+        {
+            std::string mTargetId;
+            bool mRepeat;
 
-        void load(ESMReader &esm);
-        void save(ESMWriter &esm) const;
-    };
+            void load(ESMReader& esm);
+            void save(ESMWriter& esm) const;
+        };
 
-    struct AiCombat : AiPackage
-    {
-        int mTargetActorId;
+        struct AiCombat : AiPackage
+        {
+            int mTargetActorId;
 
-        void load(ESMReader &esm);
-        void save(ESMWriter &esm) const;
-    };
+            void load(ESMReader& esm);
+            void save(ESMWriter& esm) const;
+        };
 
-    struct AiPursue : AiPackage
-    {
-        int mTargetActorId;
+        struct AiPursue : AiPackage
+        {
+            int mTargetActorId;
 
-        void load(ESMReader &esm);
-        void save(ESMWriter &esm) const;
-    };
+            void load(ESMReader& esm);
+            void save(ESMWriter& esm) const;
+        };
 
-    struct AiPackageContainer
-    {
-        int mType;
+        struct AiPackageContainer
+        {
+            int mType;
 
-        std::unique_ptr<AiPackage> mPackage;
-    };
+            std::unique_ptr<AiPackage> mPackage;
+        };
 
-    struct AiSequence
-    {
-        AiSequence()
+        struct AiSequence
         {
-            mLastAiPackage = -1;
-        }
+            AiSequence() { mLastAiPackage = -1; }
 
-        std::vector<AiPackageContainer> mPackages;
-        int mLastAiPackage;
+            std::vector<AiPackageContainer> mPackages;
+            int mLastAiPackage;
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm) const;
+            void load(ESMReader& esm);
+            void save(ESMWriter& esm) const;
 
-    private:
-        AiSequence(const AiSequence&);
-        AiSequence& operator=(const AiSequence&);
-    };
+        private:
+            AiSequence(const AiSequence&);
+            AiSequence& operator=(const AiSequence&);
+        };
 
     }
 
diff --git a/components/esm3/animationstate.cpp b/components/esm3/animationstate.cpp
index 37ea0b186e..14edf01a83 100644
--- a/components/esm3/animationstate.cpp
+++ b/components/esm3/animationstate.cpp
@@ -31,7 +31,7 @@ namespace ESM
             {
                 uint32_t loopcount;
                 esm.getT(loopcount);
-                anim.mLoopCount = (uint64_t) loopcount;
+                anim.mLoopCount = (uint64_t)loopcount;
             }
 
             mScriptedAnims.push_back(anim);
diff --git a/components/esm3/animationstate.hpp b/components/esm3/animationstate.hpp
index 144fabdbf0..3a4c3ec073 100644
--- a/components/esm3/animationstate.hpp
+++ b/components/esm3/animationstate.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_ESM_ANIMATIONSTATE_H
 #define OPENMW_ESM_ANIMATIONSTATE_H
 
+#include <cstdint>
 #include <string>
 #include <vector>
-#include <cstdint>
 
 namespace ESM
 {
@@ -16,7 +16,11 @@ namespace ESM
         struct ScriptedAnimation
         {
             ScriptedAnimation()
-                : mTime(0.f), mAbsolute(false), mLoopCount(0) {}
+                : mTime(0.f)
+                , mAbsolute(false)
+                , mLoopCount(0)
+            {
+            }
 
             std::string mGroup;
             float mTime;
diff --git a/components/esm3/cellid.cpp b/components/esm3/cellid.cpp
index 154ef53056..a63a1bfad6 100644
--- a/components/esm3/cellid.cpp
+++ b/components/esm3/cellid.cpp
@@ -6,61 +6,61 @@
 namespace ESM
 {
 
-const std::string CellId::sDefaultWorldspace = "sys::default";
+    const std::string CellId::sDefaultWorldspace = "sys::default";
 
-void CellId::load (ESMReader &esm)
-{
-    mWorldspace = esm.getHNString ("SPAC");
-
-    if (esm.isNextSub ("CIDX"))
+    void CellId::load(ESMReader& esm)
     {
-        esm.getHTSized<8>(mIndex);
-        mPaged = true;
-    }
-    else
-        mPaged = false;
-}
+        mWorldspace = esm.getHNString("SPAC");
 
-void CellId::save (ESMWriter &esm) const
-{
-    esm.writeHNString ("SPAC", mWorldspace);
+        if (esm.isNextSub("CIDX"))
+        {
+            esm.getHTSized<8>(mIndex);
+            mPaged = true;
+        }
+        else
+            mPaged = false;
+    }
 
-    if (mPaged)
-        esm.writeHNT ("CIDX", mIndex, 8);
-}
+    void CellId::save(ESMWriter& esm) const
+    {
+        esm.writeHNString("SPAC", mWorldspace);
 
-bool operator== (const CellId& left, const CellId& right)
-{
-    return left.mWorldspace==right.mWorldspace && left.mPaged==right.mPaged &&
-        (!left.mPaged || (left.mIndex.mX==right.mIndex.mX && left.mIndex.mY==right.mIndex.mY));
-}
+        if (mPaged)
+            esm.writeHNT("CIDX", mIndex, 8);
+    }
 
-bool operator!= (const CellId& left, const CellId& right)
-{
-    return !(left==right);
-}
+    bool operator==(const CellId& left, const CellId& right)
+    {
+        return left.mWorldspace == right.mWorldspace && left.mPaged == right.mPaged
+            && (!left.mPaged || (left.mIndex.mX == right.mIndex.mX && left.mIndex.mY == right.mIndex.mY));
+    }
 
-bool operator < (const CellId& left, const CellId& right)
-{
-    if (left.mPaged < right.mPaged)
-        return true;
-    if (left.mPaged > right.mPaged)
-        return false;
+    bool operator!=(const CellId& left, const CellId& right)
+    {
+        return !(left == right);
+    }
 
-    if (left.mPaged)
+    bool operator<(const CellId& left, const CellId& right)
     {
-        if (left.mIndex.mX < right.mIndex.mX)
+        if (left.mPaged < right.mPaged)
             return true;
-        if (left.mIndex.mX > right.mIndex.mX)
+        if (left.mPaged > right.mPaged)
             return false;
 
-        if (left.mIndex.mY < right.mIndex.mY)
-            return true;
-        if (left.mIndex.mY > right.mIndex.mY)
-            return false;
-    }
+        if (left.mPaged)
+        {
+            if (left.mIndex.mX < right.mIndex.mX)
+                return true;
+            if (left.mIndex.mX > right.mIndex.mX)
+                return false;
 
-    return left.mWorldspace < right.mWorldspace;
-}
+            if (left.mIndex.mY < right.mIndex.mY)
+                return true;
+            if (left.mIndex.mY > right.mIndex.mY)
+                return false;
+        }
+
+        return left.mWorldspace < right.mWorldspace;
+    }
 
 }
diff --git a/components/esm3/cellid.hpp b/components/esm3/cellid.hpp
index a28b717945..12479dc2c6 100644
--- a/components/esm3/cellid.hpp
+++ b/components/esm3/cellid.hpp
@@ -22,13 +22,13 @@ namespace ESM
 
         static const std::string sDefaultWorldspace;
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 
-    bool operator== (const CellId& left, const CellId& right);
-    bool operator!= (const CellId& left, const CellId& right);
-    bool operator< (const CellId& left, const CellId& right);
+    bool operator==(const CellId& left, const CellId& right);
+    bool operator!=(const CellId& left, const CellId& right);
+    bool operator<(const CellId& left, const CellId& right);
 }
 
 #endif
diff --git a/components/esm3/cellref.cpp b/components/esm3/cellref.cpp
index 1afd4bf863..63c85b6def 100644
--- a/components/esm3/cellref.cpp
+++ b/components/esm3/cellref.cpp
@@ -15,41 +15,40 @@ namespace ESM
         void loadIdImpl(ESMReader& esm, bool wideRefNum, CellRef& cellRef)
         {
             // According to Hrnchamd, this does not belong to the actual ref. Instead, it is a marker indicating that
-            // the following refs are part of a "temp refs" section. A temp ref is not being tracked by the moved references system.
-            // Its only purpose is a performance optimization for "immovable" things. We don't need this, and it's problematic anyway,
-            // because any item can theoretically be moved by a script.
+            // the following refs are part of a "temp refs" section. A temp ref is not being tracked by the moved
+            // references system. Its only purpose is a performance optimization for "immovable" things. We don't need
+            // this, and it's problematic anyway, because any item can theoretically be moved by a script.
             if (esm.isNextSub("NAM0"))
                 esm.skipHSub();
 
             if constexpr (load)
             {
                 cellRef.blank();
-                cellRef.mRefNum.load (esm, wideRefNum);
+                cellRef.mRefNum.load(esm, wideRefNum);
                 cellRef.mRefID = esm.getHNOString("NAME");
 
                 if (cellRef.mRefID.empty())
-                    Log(Debug::Warning) << "Warning: got CellRef with empty RefId in " << esm.getName() << " 0x" << std::hex << esm.getFileOffset();
+                    Log(Debug::Warning) << "Warning: got CellRef with empty RefId in " << esm.getName() << " 0x"
+                                        << std::hex << esm.getFileOffset();
             }
             else
             {
-                RefNum {}.load(esm, wideRefNum);
+                RefNum{}.load(esm, wideRefNum);
                 esm.skipHNOString("NAME");
             }
         }
 
         template <bool load>
-        void loadDataImpl(ESMReader &esm, bool &isDeleted, CellRef& cellRef)
+        void loadDataImpl(ESMReader& esm, bool& isDeleted, CellRef& cellRef)
         {
-            const auto getHStringOrSkip = [&] (std::string& value)
-            {
+            const auto getHStringOrSkip = [&](std::string& value) {
                 if constexpr (load)
                     value = esm.getHString();
                 else
                     esm.skipHString();
             };
 
-            const auto getHTOrSkip = [&] (auto& value)
-            {
+            const auto getHTOrSkip = [&](auto& value) {
                 if constexpr (load)
                     esm.getHT(value);
                 else
@@ -148,141 +147,144 @@ namespace ESM
         }
     }
 
-void RefNum::load(ESMReader& esm, bool wide, NAME tag)
-{
-    if (wide)
-        esm.getHNTSized<8>(*this, tag);
-    else
-        esm.getHNT(mIndex, tag);
-}
+    void RefNum::load(ESMReader& esm, bool wide, NAME tag)
+    {
+        if (wide)
+            esm.getHNTSized<8>(*this, tag);
+        else
+            esm.getHNT(mIndex, tag);
+    }
 
-void RefNum::save(ESMWriter &esm, bool wide, NAME tag) const
-{
-    if (wide)
-        esm.writeHNT (tag, *this, 8);
-    else
+    void RefNum::save(ESMWriter& esm, bool wide, NAME tag) const
     {
-        if (isSet() && !hasContentFile())
-            Log(Debug::Error) << "Generated RefNum can not be saved in 32bit format";
-        int refNum = (mIndex & 0xffffff) | ((hasContentFile() ? mContentFile : 0xff)<<24);
-        esm.writeHNT (tag, refNum, 4);
+        if (wide)
+            esm.writeHNT(tag, *this, 8);
+        else
+        {
+            if (isSet() && !hasContentFile())
+                Log(Debug::Error) << "Generated RefNum can not be saved in 32bit format";
+            int refNum = (mIndex & 0xffffff) | ((hasContentFile() ? mContentFile : 0xff) << 24);
+            esm.writeHNT(tag, refNum, 4);
+        }
     }
-}
 
-void CellRef::load (ESMReader& esm, bool &isDeleted, bool wideRefNum)
-{
-    loadId(esm, wideRefNum);
-    loadData(esm, isDeleted);
-}
+    void CellRef::load(ESMReader& esm, bool& isDeleted, bool wideRefNum)
+    {
+        loadId(esm, wideRefNum);
+        loadData(esm, isDeleted);
+    }
 
-void CellRef::loadId (ESMReader& esm, bool wideRefNum)
-{
-    loadIdImpl<true>(esm, wideRefNum, *this);
-}
+    void CellRef::loadId(ESMReader& esm, bool wideRefNum)
+    {
+        loadIdImpl<true>(esm, wideRefNum, *this);
+    }
 
-void CellRef::loadData(ESMReader &esm, bool &isDeleted)
-{
-    loadDataImpl<true>(esm, isDeleted, *this);
-}
+    void CellRef::loadData(ESMReader& esm, bool& isDeleted)
+    {
+        loadDataImpl<true>(esm, isDeleted, *this);
+    }
 
-void CellRef::save (ESMWriter &esm, bool wideRefNum, bool inInventory, bool isDeleted) const
-{
-    mRefNum.save (esm, wideRefNum);
+    void CellRef::save(ESMWriter& esm, bool wideRefNum, bool inInventory, bool isDeleted) const
+    {
+        mRefNum.save(esm, wideRefNum);
 
-    esm.writeHNCString("NAME", mRefID);
+        esm.writeHNCString("NAME", mRefID);
 
-    if (isDeleted) {
-        esm.writeHNString("DELE", "", 3);
-        return;
-    }
+        if (isDeleted)
+        {
+            esm.writeHNString("DELE", "", 3);
+            return;
+        }
 
-    if (mScale != 1.0) {
-        esm.writeHNT("XSCL", std::clamp(mScale, 0.5f, 2.0f));
-    }
+        if (mScale != 1.0)
+        {
+            esm.writeHNT("XSCL", std::clamp(mScale, 0.5f, 2.0f));
+        }
 
-    if (!inInventory)
-        esm.writeHNOCString("ANAM", mOwner);
+        if (!inInventory)
+            esm.writeHNOCString("ANAM", mOwner);
 
-    esm.writeHNOCString("BNAM", mGlobalVariable);
-    esm.writeHNOCString("XSOL", mSoul);
+        esm.writeHNOCString("BNAM", mGlobalVariable);
+        esm.writeHNOCString("XSOL", mSoul);
 
-    if (!inInventory)
-    {
-        esm.writeHNOCString("CNAM", mFaction);
-        if (mFactionRank != -2)
+        if (!inInventory)
         {
-            esm.writeHNT("INDX", mFactionRank);
+            esm.writeHNOCString("CNAM", mFaction);
+            if (mFactionRank != -2)
+            {
+                esm.writeHNT("INDX", mFactionRank);
+            }
         }
-    }
 
-    if (mEnchantmentCharge != -1)
-        esm.writeHNT("XCHG", mEnchantmentCharge);
+        if (mEnchantmentCharge != -1)
+            esm.writeHNT("XCHG", mEnchantmentCharge);
 
-    if (mChargeInt != -1)
-        esm.writeHNT("INTV", mChargeInt);
+        if (mChargeInt != -1)
+            esm.writeHNT("INTV", mChargeInt);
 
-    if (mGoldValue > 1)
-        esm.writeHNT("NAM9", mGoldValue);
+        if (mGoldValue > 1)
+            esm.writeHNT("NAM9", mGoldValue);
 
-    if (!inInventory && mTeleport)
-    {
-        esm.writeHNT("DODT", mDoorDest);
-        esm.writeHNOCString("DNAM", mDestCell);
-    }
+        if (!inInventory && mTeleport)
+        {
+            esm.writeHNT("DODT", mDoorDest);
+            esm.writeHNOCString("DNAM", mDestCell);
+        }
 
-    if (!inInventory && mLockLevel != 0) {
-        esm.writeHNT("FLTV", mLockLevel);
-    }
+        if (!inInventory && mLockLevel != 0)
+        {
+            esm.writeHNT("FLTV", mLockLevel);
+        }
 
-    if (!inInventory)
-    {
-        esm.writeHNOCString ("KNAM", mKey);
-        esm.writeHNOCString ("TNAM", mTrap);
-    }
+        if (!inInventory)
+        {
+            esm.writeHNOCString("KNAM", mKey);
+            esm.writeHNOCString("TNAM", mTrap);
+        }
 
-    if (mReferenceBlocked != -1)
-        esm.writeHNT("UNAM", mReferenceBlocked);
+        if (mReferenceBlocked != -1)
+            esm.writeHNT("UNAM", mReferenceBlocked);
 
-    if (!inInventory)
-        esm.writeHNT("DATA", mPos, 24);
-}
+        if (!inInventory)
+            esm.writeHNT("DATA", mPos, 24);
+    }
 
-void CellRef::blank()
-{
-    mRefNum.unset();
-    mRefID.clear();
-    mScale = 1;
-    mOwner.clear();
-    mGlobalVariable.clear();
-    mSoul.clear();
-    mFaction.clear();
-    mFactionRank = -2;
-    mChargeInt = -1;
-    mChargeIntRemainder = 0.0f;
-    mEnchantmentCharge = -1;
-    mGoldValue = 1;
-    mDestCell.clear();
-    mLockLevel = 0;
-    mKey.clear();
-    mTrap.clear();
-    mReferenceBlocked = -1;
-    mTeleport = false;
-
-    for (int i=0; i<3; ++i)
+    void CellRef::blank()
     {
-        mDoorDest.pos[i] = 0;
-        mDoorDest.rot[i] = 0;
-        mPos.pos[i] = 0;
-        mPos.rot[i] = 0;
+        mRefNum.unset();
+        mRefID.clear();
+        mScale = 1;
+        mOwner.clear();
+        mGlobalVariable.clear();
+        mSoul.clear();
+        mFaction.clear();
+        mFactionRank = -2;
+        mChargeInt = -1;
+        mChargeIntRemainder = 0.0f;
+        mEnchantmentCharge = -1;
+        mGoldValue = 1;
+        mDestCell.clear();
+        mLockLevel = 0;
+        mKey.clear();
+        mTrap.clear();
+        mReferenceBlocked = -1;
+        mTeleport = false;
+
+        for (int i = 0; i < 3; ++i)
+        {
+            mDoorDest.pos[i] = 0;
+            mDoorDest.rot[i] = 0;
+            mPos.pos[i] = 0;
+            mPos.rot[i] = 0;
+        }
     }
-}
 
-void skipLoadCellRef(ESMReader& esm, bool wideRefNum)
-{
-    CellRef cellRef;
-    loadIdImpl<false>(esm, wideRefNum, cellRef);
-    bool isDeleted;
-    loadDataImpl<false>(esm, isDeleted, cellRef);
-}
+    void skipLoadCellRef(ESMReader& esm, bool wideRefNum)
+    {
+        CellRef cellRef;
+        loadIdImpl<false>(esm, wideRefNum, cellRef);
+        bool isDeleted;
+        loadDataImpl<false>(esm, isDeleted, cellRef);
+    }
 
 }
diff --git a/components/esm3/cellref.hpp b/components/esm3/cellref.hpp
index f710167afc..cbff8a20e9 100644
--- a/components/esm3/cellref.hpp
+++ b/components/esm3/cellref.hpp
@@ -21,12 +21,12 @@ namespace ESM
 
         void load(ESMReader& esm, bool wide = false, NAME tag = "FRMR");
 
-        void save(ESMWriter &esm, bool wide = false, NAME tag = "FRMR") const;
+        void save(ESMWriter& esm, bool wide = false, NAME tag = "FRMR") const;
 
         inline bool hasContentFile() const { return mContentFile >= 0; }
 
         inline bool isSet() const { return mIndex != 0 || mContentFile != -1; }
-        inline void unset() { *this = {0, -1}; }
+        inline void unset() { *this = { 0, -1 }; }
     };
 
     /* Cell reference. This represents ONE object (of many) inside the
@@ -37,99 +37,99 @@ namespace ESM
 
     class CellRef
     {
-        public:
-            // Reference number
-            // Note: Currently unused for items in containers
-            RefNum mRefNum;
+    public:
+        // Reference number
+        // Note: Currently unused for items in containers
+        RefNum mRefNum;
 
-            std::string mRefID;    // ID of object being referenced
+        std::string mRefID; // ID of object being referenced
 
-            float mScale;          // Scale applied to mesh
+        float mScale; // Scale applied to mesh
 
-            // The NPC that owns this object (and will get angry if you steal it)
-            std::string mOwner;
+        // The NPC that owns this object (and will get angry if you steal it)
+        std::string mOwner;
 
-            // Name of a global variable. If the global variable is set to '1', using the object is temporarily allowed
-            // even if it has an Owner field.
-            // Used by bed rent scripts to allow the player to use the bed for the duration of the rent.
-            std::string mGlobalVariable;
+        // Name of a global variable. If the global variable is set to '1', using the object is temporarily allowed
+        // even if it has an Owner field.
+        // Used by bed rent scripts to allow the player to use the bed for the duration of the rent.
+        std::string mGlobalVariable;
 
-            // ID of creature trapped in this soul gem
-            std::string mSoul;
+        // ID of creature trapped in this soul gem
+        std::string mSoul;
 
-            // The faction that owns this object (and will get angry if
-            // you take it and are not a faction member)
-            std::string mFaction;
+        // The faction that owns this object (and will get angry if
+        // you take it and are not a faction member)
+        std::string mFaction;
 
-            // PC faction rank required to use the item. Sometimes is -1, which means "any rank".
-            int mFactionRank;
+        // PC faction rank required to use the item. Sometimes is -1, which means "any rank".
+        int mFactionRank;
 
-            // For weapon or armor, this is the remaining item health.
-            // For tools (lockpicks, probes, repair hammer) it is the remaining uses.
-            // For lights it is remaining time.
-            // This could be -1 if the charge was not touched yet (i.e. full).
-            union
-            {
-                int mChargeInt;     // Used by everything except lights
-                float mChargeFloat; // Used only by lights
-            };
-            float mChargeIntRemainder; // Stores amount of charge not subtracted from mChargeInt
+        // For weapon or armor, this is the remaining item health.
+        // For tools (lockpicks, probes, repair hammer) it is the remaining uses.
+        // For lights it is remaining time.
+        // This could be -1 if the charge was not touched yet (i.e. full).
+        union
+        {
+            int mChargeInt; // Used by everything except lights
+            float mChargeFloat; // Used only by lights
+        };
+        float mChargeIntRemainder; // Stores amount of charge not subtracted from mChargeInt
 
-            // Remaining enchantment charge. This could be -1 if the charge was not touched yet (i.e. full).
-            float mEnchantmentCharge;
+        // Remaining enchantment charge. This could be -1 if the charge was not touched yet (i.e. full).
+        float mEnchantmentCharge;
 
-            // This is 5 for Gold_005 references, 100 for Gold_100 and so on.
-            int mGoldValue;
+        // This is 5 for Gold_005 references, 100 for Gold_100 and so on.
+        int mGoldValue;
 
-            // For doors - true if this door teleports to somewhere else, false
-            // if it should open through animation.
-            bool mTeleport;
+        // For doors - true if this door teleports to somewhere else, false
+        // if it should open through animation.
+        bool mTeleport;
 
-            // Teleport location for the door, if this is a teleporting door.
-            Position mDoorDest;
+        // Teleport location for the door, if this is a teleporting door.
+        Position mDoorDest;
 
-            // Destination cell for doors (optional)
-            std::string mDestCell;
+        // Destination cell for doors (optional)
+        std::string mDestCell;
 
-            // Lock level for doors and containers
-            int mLockLevel;
-            std::string mKey, mTrap; // Key and trap ID names, if any
+        // Lock level for doors and containers
+        int mLockLevel;
+        std::string mKey, mTrap; // Key and trap ID names, if any
 
-            // This corresponds to the "Reference Blocked" checkbox in the construction set,
-            // which prevents editing that reference.
-            // -1 is not blocked, otherwise it is blocked.
-            signed char mReferenceBlocked;
+        // This corresponds to the "Reference Blocked" checkbox in the construction set,
+        // which prevents editing that reference.
+        // -1 is not blocked, otherwise it is blocked.
+        signed char mReferenceBlocked;
 
-            // Position and rotation of this object within the cell
-            Position mPos;
+        // Position and rotation of this object within the cell
+        Position mPos;
 
-            /// Calls loadId and loadData
-            void load (ESMReader& esm, bool &isDeleted, bool wideRefNum = false);
+        /// Calls loadId and loadData
+        void load(ESMReader& esm, bool& isDeleted, bool wideRefNum = false);
 
-            void loadId (ESMReader& esm, bool wideRefNum = false);
+        void loadId(ESMReader& esm, bool wideRefNum = false);
 
-            /// Implicitly called by load
-            void loadData (ESMReader& esm, bool &isDeleted);
+        /// Implicitly called by load
+        void loadData(ESMReader& esm, bool& isDeleted);
 
-            void save (ESMWriter &esm, bool wideRefNum = false, bool inInventory = false, bool isDeleted = false) const;
+        void save(ESMWriter& esm, bool wideRefNum = false, bool inInventory = false, bool isDeleted = false) const;
 
-            void blank();
+        void blank();
     };
 
     void skipLoadCellRef(ESMReader& esm, bool wideRefNum = false);
 
-    inline bool operator== (const RefNum& left, const RefNum& right)
+    inline bool operator==(const RefNum& left, const RefNum& right)
     {
-        return left.mIndex==right.mIndex && left.mContentFile==right.mContentFile;
+        return left.mIndex == right.mIndex && left.mContentFile == right.mContentFile;
     }
 
-    inline bool operator< (const RefNum& left, const RefNum& right)
+    inline bool operator<(const RefNum& left, const RefNum& right)
     {
-        if (left.mIndex<right.mIndex)
+        if (left.mIndex < right.mIndex)
             return true;
-        if (left.mIndex>right.mIndex)
+        if (left.mIndex > right.mIndex)
             return false;
-        return left.mContentFile<right.mContentFile;
+        return left.mContentFile < right.mContentFile;
     }
 
 }
diff --git a/components/esm3/cellstate.cpp b/components/esm3/cellstate.cpp
index d5773d5f26..830a4211b6 100644
--- a/components/esm3/cellstate.cpp
+++ b/components/esm3/cellstate.cpp
@@ -6,27 +6,27 @@
 namespace ESM
 {
 
-void CellState::load (ESMReader &esm)
-{
-    mWaterLevel = 0;
-    esm.getHNOT (mWaterLevel, "WLVL");
+    void CellState::load(ESMReader& esm)
+    {
+        mWaterLevel = 0;
+        esm.getHNOT(mWaterLevel, "WLVL");
 
-    mHasFogOfWar = false;
-    esm.getHNOT (mHasFogOfWar, "HFOW");
+        mHasFogOfWar = false;
+        esm.getHNOT(mHasFogOfWar, "HFOW");
 
-    mLastRespawn.mDay = 0;
-    mLastRespawn.mHour = 0;
-    esm.getHNOT (mLastRespawn, "RESP");
-}
+        mLastRespawn.mDay = 0;
+        mLastRespawn.mHour = 0;
+        esm.getHNOT(mLastRespawn, "RESP");
+    }
 
-void CellState::save (ESMWriter &esm) const
-{
-    if (!mId.mPaged)
-        esm.writeHNT ("WLVL", mWaterLevel);
+    void CellState::save(ESMWriter& esm) const
+    {
+        if (!mId.mPaged)
+            esm.writeHNT("WLVL", mWaterLevel);
 
-    esm.writeHNT ("HFOW", mHasFogOfWar);
+        esm.writeHNT("HFOW", mHasFogOfWar);
 
-    esm.writeHNT ("RESP", mLastRespawn);
-}
+        esm.writeHNT("RESP", mLastRespawn);
+    }
 
 }
diff --git a/components/esm3/cellstate.hpp b/components/esm3/cellstate.hpp
index bf332ae5e8..2f721b3838 100644
--- a/components/esm3/cellstate.hpp
+++ b/components/esm3/cellstate.hpp
@@ -23,8 +23,8 @@ namespace ESM
 
         TimeStamp mLastRespawn;
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 }
 
diff --git a/components/esm3/containerstate.cpp b/components/esm3/containerstate.cpp
index b54736cb8b..63d21e24bd 100644
--- a/components/esm3/containerstate.cpp
+++ b/components/esm3/containerstate.cpp
@@ -3,18 +3,18 @@
 namespace ESM
 {
 
-void ContainerState::load (ESMReader &esm)
-{
-    ObjectState::load (esm);
+    void ContainerState::load(ESMReader& esm)
+    {
+        ObjectState::load(esm);
 
-    mInventory.load (esm);
-}
+        mInventory.load(esm);
+    }
 
-void ContainerState::save (ESMWriter &esm, bool inInventory) const
-{
-    ObjectState::save (esm, inInventory);
+    void ContainerState::save(ESMWriter& esm, bool inInventory) const
+    {
+        ObjectState::save(esm, inInventory);
 
-    mInventory.save (esm);
-}
+        mInventory.save(esm);
+    }
 
 }
diff --git a/components/esm3/containerstate.hpp b/components/esm3/containerstate.hpp
index 7f1afd077f..55a19ffc15 100644
--- a/components/esm3/containerstate.hpp
+++ b/components/esm3/containerstate.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_ESM_CONTAINERSTATE_H
 #define OPENMW_ESM_CONTAINERSTATE_H
 
-#include "objectstate.hpp"
 #include "inventorystate.hpp"
+#include "objectstate.hpp"
 
 namespace ESM
 {
@@ -12,17 +12,11 @@ namespace ESM
     {
         InventoryState mInventory;
 
-        void load (ESMReader &esm) override;
-        void save (ESMWriter &esm, bool inInventory = false) const override;
+        void load(ESMReader& esm) override;
+        void save(ESMWriter& esm, bool inInventory = false) const override;
 
-        ContainerState& asContainerState() override
-        {
-            return *this;
-        }
-        const ContainerState& asContainerState() const override
-        {
-            return *this;
-        }
+        ContainerState& asContainerState() override { return *this; }
+        const ContainerState& asContainerState() const override { return *this; }
     };
 }
 
diff --git a/components/esm3/controlsstate.cpp b/components/esm3/controlsstate.cpp
index c985c23f15..e0bf555e15 100644
--- a/components/esm3/controlsstate.cpp
+++ b/components/esm3/controlsstate.cpp
@@ -6,43 +6,50 @@
 namespace ESM
 {
 
-ControlsState::ControlsState()
-    : mViewSwitchDisabled(false),
-      mControlsDisabled(false),
-      mJumpingDisabled(false),
-      mLookingDisabled(false),
-      mVanityModeDisabled(false),
-      mWeaponDrawingDisabled(false),
-      mSpellDrawingDisabled(false)
-{
-}
-
-void ControlsState::load(ESMReader& esm)
-{
-    int flags;
-    esm.getHNT(flags, "CFLG");
-
-    mViewSwitchDisabled = flags & ViewSwitchDisabled;
-    mControlsDisabled = flags & ControlsDisabled;
-    mJumpingDisabled = flags & JumpingDisabled;
-    mLookingDisabled = flags & LookingDisabled;
-    mVanityModeDisabled = flags & VanityModeDisabled;
-    mWeaponDrawingDisabled = flags & WeaponDrawingDisabled;
-    mSpellDrawingDisabled = flags & SpellDrawingDisabled;
-}
-
-void ControlsState::save(ESMWriter& esm) const
-{
-    int flags = 0;
-    if (mViewSwitchDisabled) flags |= ViewSwitchDisabled;
-    if (mControlsDisabled) flags |= ControlsDisabled;
-    if (mJumpingDisabled) flags |= JumpingDisabled;
-    if (mLookingDisabled) flags |= LookingDisabled;
-    if (mVanityModeDisabled) flags |= VanityModeDisabled;
-    if (mWeaponDrawingDisabled) flags |= WeaponDrawingDisabled;
-    if (mSpellDrawingDisabled) flags |= SpellDrawingDisabled;
-
-    esm.writeHNT("CFLG", flags);
-}
+    ControlsState::ControlsState()
+        : mViewSwitchDisabled(false)
+        , mControlsDisabled(false)
+        , mJumpingDisabled(false)
+        , mLookingDisabled(false)
+        , mVanityModeDisabled(false)
+        , mWeaponDrawingDisabled(false)
+        , mSpellDrawingDisabled(false)
+    {
+    }
+
+    void ControlsState::load(ESMReader& esm)
+    {
+        int flags;
+        esm.getHNT(flags, "CFLG");
+
+        mViewSwitchDisabled = flags & ViewSwitchDisabled;
+        mControlsDisabled = flags & ControlsDisabled;
+        mJumpingDisabled = flags & JumpingDisabled;
+        mLookingDisabled = flags & LookingDisabled;
+        mVanityModeDisabled = flags & VanityModeDisabled;
+        mWeaponDrawingDisabled = flags & WeaponDrawingDisabled;
+        mSpellDrawingDisabled = flags & SpellDrawingDisabled;
+    }
+
+    void ControlsState::save(ESMWriter& esm) const
+    {
+        int flags = 0;
+        if (mViewSwitchDisabled)
+            flags |= ViewSwitchDisabled;
+        if (mControlsDisabled)
+            flags |= ControlsDisabled;
+        if (mJumpingDisabled)
+            flags |= JumpingDisabled;
+        if (mLookingDisabled)
+            flags |= LookingDisabled;
+        if (mVanityModeDisabled)
+            flags |= VanityModeDisabled;
+        if (mWeaponDrawingDisabled)
+            flags |= WeaponDrawingDisabled;
+        if (mSpellDrawingDisabled)
+            flags |= SpellDrawingDisabled;
+
+        esm.writeHNT("CFLG", flags);
+    }
 
 }
diff --git a/components/esm3/controlsstate.hpp b/components/esm3/controlsstate.hpp
index b9654ea1aa..1414c446e2 100644
--- a/components/esm3/controlsstate.hpp
+++ b/components/esm3/controlsstate.hpp
@@ -31,8 +31,8 @@ namespace ESM
         bool mWeaponDrawingDisabled;
         bool mSpellDrawingDisabled;
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 }
 
diff --git a/components/esm3/creaturelevliststate.cpp b/components/esm3/creaturelevliststate.cpp
index 21cc73b89c..6deb7d68b7 100644
--- a/components/esm3/creaturelevliststate.cpp
+++ b/components/esm3/creaturelevliststate.cpp
@@ -6,26 +6,26 @@
 namespace ESM
 {
 
-    void CreatureLevListState::load(ESMReader &esm)
+    void CreatureLevListState::load(ESMReader& esm)
     {
         ObjectState::load(esm);
 
         mSpawnActorId = -1;
-        esm.getHNOT (mSpawnActorId, "SPAW");
+        esm.getHNOT(mSpawnActorId, "SPAW");
 
         mSpawn = false;
-        esm.getHNOT (mSpawn, "RESP");
+        esm.getHNOT(mSpawn, "RESP");
     }
 
-    void CreatureLevListState::save(ESMWriter &esm, bool inInventory) const
+    void CreatureLevListState::save(ESMWriter& esm, bool inInventory) const
     {
         ObjectState::save(esm, inInventory);
 
         if (mSpawnActorId != -1)
-            esm.writeHNT ("SPAW", mSpawnActorId);
+            esm.writeHNT("SPAW", mSpawnActorId);
 
         if (mSpawn)
-            esm.writeHNT ("RESP", mSpawn);
+            esm.writeHNT("RESP", mSpawn);
     }
 
 }
diff --git a/components/esm3/creaturelevliststate.hpp b/components/esm3/creaturelevliststate.hpp
index 2ee9e511f3..f8fb7162ff 100644
--- a/components/esm3/creaturelevliststate.hpp
+++ b/components/esm3/creaturelevliststate.hpp
@@ -12,17 +12,11 @@ namespace ESM
         int mSpawnActorId;
         bool mSpawn;
 
-        void load (ESMReader &esm) override;
-        void save (ESMWriter &esm, bool inInventory = false) const override;
+        void load(ESMReader& esm) override;
+        void save(ESMWriter& esm, bool inInventory = false) const override;
 
-        CreatureLevListState& asCreatureLevListState() override
-        {
-            return *this;
-        }
-        const CreatureLevListState& asCreatureLevListState() const override
-        {
-            return *this;
-        }
+        CreatureLevListState& asCreatureLevListState() override { return *this; }
+        const CreatureLevListState& asCreatureLevListState() const override { return *this; }
     };
 }
 
diff --git a/components/esm3/creaturestate.cpp b/components/esm3/creaturestate.cpp
index e9a9f52cf1..bfd8de495a 100644
--- a/components/esm3/creaturestate.cpp
+++ b/components/esm3/creaturestate.cpp
@@ -3,34 +3,34 @@
 namespace ESM
 {
 
-void CreatureState::load (ESMReader &esm)
-{
-    ObjectState::load (esm);
-
-    if (mHasCustomState)
+    void CreatureState::load(ESMReader& esm)
     {
-        mInventory.load (esm);
+        ObjectState::load(esm);
 
-        mCreatureStats.load (esm);
-    }
-}
+        if (mHasCustomState)
+        {
+            mInventory.load(esm);
 
-void CreatureState::save (ESMWriter &esm, bool inInventory) const
-{
-    ObjectState::save (esm, inInventory);
+            mCreatureStats.load(esm);
+        }
+    }
 
-    if (mHasCustomState)
+    void CreatureState::save(ESMWriter& esm, bool inInventory) const
     {
-        mInventory.save (esm);
+        ObjectState::save(esm, inInventory);
 
-        mCreatureStats.save (esm);
+        if (mHasCustomState)
+        {
+            mInventory.save(esm);
+
+            mCreatureStats.save(esm);
+        }
     }
-}
 
-void CreatureState::blank()
-{
-    ObjectState::blank();
-    mCreatureStats.blank();
-}
+    void CreatureState::blank()
+    {
+        ObjectState::blank();
+        mCreatureStats.blank();
+    }
 
 }
diff --git a/components/esm3/creaturestate.hpp b/components/esm3/creaturestate.hpp
index 4b4c59d719..d9caf91ef1 100644
--- a/components/esm3/creaturestate.hpp
+++ b/components/esm3/creaturestate.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_ESM_CREATURESTATE_H
 #define OPENMW_ESM_CREATURESTATE_H
 
-#include "objectstate.hpp"
-#include "inventorystate.hpp"
 #include "creaturestats.hpp"
+#include "inventorystate.hpp"
+#include "objectstate.hpp"
 
 namespace ESM
 {
@@ -17,17 +17,11 @@ namespace ESM
         /// Initialize to default state
         void blank() override;
 
-        void load (ESMReader &esm) override;
-        void save (ESMWriter &esm, bool inInventory = false) const override;
+        void load(ESMReader& esm) override;
+        void save(ESMWriter& esm, bool inInventory = false) const override;
 
-        CreatureState& asCreatureState() override
-        {
-            return *this;
-        }
-        const CreatureState& asCreatureState() const override
-        {
-            return *this;
-        }
+        CreatureState& asCreatureState() override { return *this; }
+        const CreatureState& asCreatureState() const override { return *this; }
     };
 }
 
diff --git a/components/esm3/creaturestats.cpp b/components/esm3/creaturestats.cpp
index 1a1eabd2ab..32433f6702 100644
--- a/components/esm3/creaturestats.cpp
+++ b/components/esm3/creaturestats.cpp
@@ -7,288 +7,301 @@
 namespace ESM
 {
 
-void CreatureStats::load (ESMReader &esm)
-{
-    bool intFallback = esm.getFormat() < 11;
-    for (int i=0; i<8; ++i)
-        mAttributes[i].load (esm, intFallback);
-
-    for (int i=0; i<3; ++i)
-        mDynamic[i].load (esm);
-
-    mGoldPool = 0;
-    esm.getHNOT (mGoldPool, "GOLD");
-
-    mTradeTime.mDay = 0;
-    mTradeTime.mHour = 0;
-    esm.getHNOT (mTradeTime, "TIME");
-
-    int flags = 0;
-    mDead = false;
-    mDeathAnimationFinished = false;
-    mDied = false;
-    mMurdered = false;
-    mTalkedTo = false;
-    mAlarmed = false;
-    mAttacked = false;
-    mKnockdown = false;
-    mKnockdownOneFrame = false;
-    mKnockdownOverOneFrame = false;
-    mHitRecovery = false;
-    mBlock = false;
-    mRecalcDynamicStats = false;
-    if (esm.getFormat() < 8)
-    {
-        esm.getHNOT (mDead, "DEAD");
-        esm.getHNOT (mDeathAnimationFinished, "DFNT");
-        if (esm.getFormat() < 3 && mDead)
-            mDeathAnimationFinished = true;
-        esm.getHNOT (mDied, "DIED");
-        esm.getHNOT (mMurdered, "MURD");
-        if (esm.isNextSub("FRHT"))
-            esm.skipHSub(); // Friendly hits, no longer used
-        esm.getHNOT (mTalkedTo, "TALK");
-        esm.getHNOT (mAlarmed, "ALRM");
-        esm.getHNOT (mAttacked, "ATKD");
-        if (esm.isNextSub("HOST"))
-            esm.skipHSub(); // Hostile, no longer used
-        if (esm.isNextSub("ATCK"))
-            esm.skipHSub(); // attackingOrSpell, no longer used
-        esm.getHNOT (mKnockdown, "KNCK");
-        esm.getHNOT (mKnockdownOneFrame, "KNC1");
-        esm.getHNOT (mKnockdownOverOneFrame, "KNCO");
-        esm.getHNOT (mHitRecovery, "HITR");
-        esm.getHNOT (mBlock, "BLCK");
-    }
-    else
+    void CreatureStats::load(ESMReader& esm)
     {
-        esm.getHNOT(flags, "AFLG");
-        mDead = flags & Dead;
-        mDeathAnimationFinished = flags & DeathAnimationFinished;
-        mDied = flags & Died;
-        mMurdered = flags & Murdered;
-        mTalkedTo = flags & TalkedTo;
-        mAlarmed = flags & Alarmed;
-        mAttacked = flags & Attacked;
-        mKnockdown = flags & Knockdown;
-        mKnockdownOneFrame = flags & KnockdownOneFrame;
-        mKnockdownOverOneFrame = flags & KnockdownOverOneFrame;
-        mHitRecovery = flags & HitRecovery;
-        mBlock = flags & Block;
-        mRecalcDynamicStats = flags & RecalcDynamicStats;
-    }
+        bool intFallback = esm.getFormat() < 11;
+        for (int i = 0; i < 8; ++i)
+            mAttributes[i].load(esm, intFallback);
+
+        for (int i = 0; i < 3; ++i)
+            mDynamic[i].load(esm);
+
+        mGoldPool = 0;
+        esm.getHNOT(mGoldPool, "GOLD");
+
+        mTradeTime.mDay = 0;
+        mTradeTime.mHour = 0;
+        esm.getHNOT(mTradeTime, "TIME");
+
+        int flags = 0;
+        mDead = false;
+        mDeathAnimationFinished = false;
+        mDied = false;
+        mMurdered = false;
+        mTalkedTo = false;
+        mAlarmed = false;
+        mAttacked = false;
+        mKnockdown = false;
+        mKnockdownOneFrame = false;
+        mKnockdownOverOneFrame = false;
+        mHitRecovery = false;
+        mBlock = false;
+        mRecalcDynamicStats = false;
+        if (esm.getFormat() < 8)
+        {
+            esm.getHNOT(mDead, "DEAD");
+            esm.getHNOT(mDeathAnimationFinished, "DFNT");
+            if (esm.getFormat() < 3 && mDead)
+                mDeathAnimationFinished = true;
+            esm.getHNOT(mDied, "DIED");
+            esm.getHNOT(mMurdered, "MURD");
+            if (esm.isNextSub("FRHT"))
+                esm.skipHSub(); // Friendly hits, no longer used
+            esm.getHNOT(mTalkedTo, "TALK");
+            esm.getHNOT(mAlarmed, "ALRM");
+            esm.getHNOT(mAttacked, "ATKD");
+            if (esm.isNextSub("HOST"))
+                esm.skipHSub(); // Hostile, no longer used
+            if (esm.isNextSub("ATCK"))
+                esm.skipHSub(); // attackingOrSpell, no longer used
+            esm.getHNOT(mKnockdown, "KNCK");
+            esm.getHNOT(mKnockdownOneFrame, "KNC1");
+            esm.getHNOT(mKnockdownOverOneFrame, "KNCO");
+            esm.getHNOT(mHitRecovery, "HITR");
+            esm.getHNOT(mBlock, "BLCK");
+        }
+        else
+        {
+            esm.getHNOT(flags, "AFLG");
+            mDead = flags & Dead;
+            mDeathAnimationFinished = flags & DeathAnimationFinished;
+            mDied = flags & Died;
+            mMurdered = flags & Murdered;
+            mTalkedTo = flags & TalkedTo;
+            mAlarmed = flags & Alarmed;
+            mAttacked = flags & Attacked;
+            mKnockdown = flags & Knockdown;
+            mKnockdownOneFrame = flags & KnockdownOneFrame;
+            mKnockdownOverOneFrame = flags & KnockdownOverOneFrame;
+            mHitRecovery = flags & HitRecovery;
+            mBlock = flags & Block;
+            mRecalcDynamicStats = flags & RecalcDynamicStats;
+        }
 
-    mMovementFlags = 0;
-    esm.getHNOT (mMovementFlags, "MOVE");
+        mMovementFlags = 0;
+        esm.getHNOT(mMovementFlags, "MOVE");
 
-    if (esm.isNextSub("ASTR"))
-        esm.skipHSub(); // attackStrength, no longer used
+        if (esm.isNextSub("ASTR"))
+            esm.skipHSub(); // attackStrength, no longer used
 
-    mFallHeight = 0;
-    esm.getHNOT (mFallHeight, "FALL");
+        mFallHeight = 0;
+        esm.getHNOT(mFallHeight, "FALL");
 
-    mLastHitObject = esm.getHNOString ("LHIT");
+        mLastHitObject = esm.getHNOString("LHIT");
 
-    mLastHitAttemptObject = esm.getHNOString ("LHAT");
+        mLastHitAttemptObject = esm.getHNOString("LHAT");
 
-    if (esm.getFormat() < 8)
-        esm.getHNOT (mRecalcDynamicStats, "CALC");
+        if (esm.getFormat() < 8)
+            esm.getHNOT(mRecalcDynamicStats, "CALC");
 
-    mDrawState = 0;
-    esm.getHNOT (mDrawState, "DRAW");
+        mDrawState = 0;
+        esm.getHNOT(mDrawState, "DRAW");
 
-    mLevel = 1;
-    esm.getHNOT (mLevel, "LEVL");
+        mLevel = 1;
+        esm.getHNOT(mLevel, "LEVL");
 
-    mActorId = -1;
-    esm.getHNOT (mActorId, "ACID");
+        mActorId = -1;
+        esm.getHNOT(mActorId, "ACID");
 
-    mDeathAnimation = -1;
-    esm.getHNOT (mDeathAnimation, "DANM");
+        mDeathAnimation = -1;
+        esm.getHNOT(mDeathAnimation, "DANM");
 
-    mTimeOfDeath.mDay = 0;
-    mTimeOfDeath.mHour = 0;
-    esm.getHNOT (mTimeOfDeath, "DTIM");
+        mTimeOfDeath.mDay = 0;
+        mTimeOfDeath.mHour = 0;
+        esm.getHNOT(mTimeOfDeath, "DTIM");
 
-    mSpells.load(esm);
-    mActiveSpells.load(esm);
-    mAiSequence.load(esm);
-    mMagicEffects.load(esm);
+        mSpells.load(esm);
+        mActiveSpells.load(esm);
+        mAiSequence.load(esm);
+        mMagicEffects.load(esm);
 
-    if (esm.getFormat() < 17)
-    {
-        while (esm.isNextSub("SUMM"))
+        if (esm.getFormat() < 17)
         {
-            int magicEffect;
-            esm.getHT(magicEffect);
-            std::string source = esm.getHNOString("SOUR");
-            int effectIndex = -1;
-            esm.getHNOT (effectIndex, "EIND");
-            int actorId;
-            esm.getHNT (actorId, "ACID");
-            mSummonedCreatureMap[SummonKey(magicEffect, source, effectIndex)] = actorId;
-            mSummonedCreatures.emplace(magicEffect, actorId);
+            while (esm.isNextSub("SUMM"))
+            {
+                int magicEffect;
+                esm.getHT(magicEffect);
+                std::string source = esm.getHNOString("SOUR");
+                int effectIndex = -1;
+                esm.getHNOT(effectIndex, "EIND");
+                int actorId;
+                esm.getHNT(actorId, "ACID");
+                mSummonedCreatureMap[SummonKey(magicEffect, source, effectIndex)] = actorId;
+                mSummonedCreatures.emplace(magicEffect, actorId);
+            }
         }
-    }
-    else
-    {
-        while (esm.isNextSub("SUMM"))
+        else
         {
-            int magicEffect;
-            esm.getHT(magicEffect);
-            int actorId;
-            esm.getHNT (actorId, "ACID");
-            mSummonedCreatures.emplace(magicEffect, actorId);
+            while (esm.isNextSub("SUMM"))
+            {
+                int magicEffect;
+                esm.getHT(magicEffect);
+                int actorId;
+                esm.getHNT(actorId, "ACID");
+                mSummonedCreatures.emplace(magicEffect, actorId);
+            }
         }
-    }
 
-    while (esm.isNextSub("GRAV"))
-    {
-        int actorId;
-        esm.getHT(actorId);
-        mSummonGraveyard.push_back(actorId);
-    }
+        while (esm.isNextSub("GRAV"))
+        {
+            int actorId;
+            esm.getHT(actorId);
+            mSummonGraveyard.push_back(actorId);
+        }
 
-    mHasAiSettings = false;
-    esm.getHNOT(mHasAiSettings, "AISE");
+        mHasAiSettings = false;
+        esm.getHNOT(mHasAiSettings, "AISE");
 
-    if (mHasAiSettings)
-    {
-        for (int i=0; i<4; ++i)
-            mAiSettings[i].load(esm);
-    }
+        if (mHasAiSettings)
+        {
+            for (int i = 0; i < 4; ++i)
+                mAiSettings[i].load(esm);
+        }
 
-    while (esm.isNextSub("CORP"))
-    {
-        std::string id = esm.getHString();
+        while (esm.isNextSub("CORP"))
+        {
+            std::string id = esm.getHString();
 
-        CorprusStats stats;
-        esm.getHNT(stats.mWorsenings, "WORS");
-        esm.getHNT(stats.mNextWorsening, "TIME");
+            CorprusStats stats;
+            esm.getHNT(stats.mWorsenings, "WORS");
+            esm.getHNT(stats.mNextWorsening, "TIME");
 
-        mCorprusSpells[id] = stats;
-    }
-    if(esm.getFormat() <= 18)
-        mMissingACDT = mGoldPool == std::numeric_limits<int>::min();
-    else
-    {
-        mMissingACDT = false;
-        esm.getHNOT(mMissingACDT, "NOAC");
+            mCorprusSpells[id] = stats;
+        }
+        if (esm.getFormat() <= 18)
+            mMissingACDT = mGoldPool == std::numeric_limits<int>::min();
+        else
+        {
+            mMissingACDT = false;
+            esm.getHNOT(mMissingACDT, "NOAC");
+        }
     }
-}
 
-void CreatureStats::save (ESMWriter &esm) const
-{
-    for (int i=0; i<8; ++i)
-        mAttributes[i].save (esm);
-
-    for (int i=0; i<3; ++i)
-        mDynamic[i].save (esm);
-
-    if (mGoldPool)
-        esm.writeHNT("GOLD", mGoldPool);
-
-    if (mTradeTime.mDay != 0 || mTradeTime.mHour != 0)
-        esm.writeHNT ("TIME", mTradeTime);
-
-    int flags = 0;
-    if (mDead) flags |= Dead;
-    if (mDeathAnimationFinished) flags |= DeathAnimationFinished;
-    if (mDied) flags |= Died;
-    if (mMurdered) flags |= Murdered;
-    if (mTalkedTo) flags |= TalkedTo;
-    if (mAlarmed) flags |= Alarmed;
-    if (mAttacked) flags |= Attacked;
-    if (mKnockdown) flags |= Knockdown;
-    if (mKnockdownOneFrame) flags |= KnockdownOneFrame;
-    if (mKnockdownOverOneFrame) flags |= KnockdownOverOneFrame;
-    if (mHitRecovery) flags |= HitRecovery;
-    if (mBlock) flags |= Block;
-    if (mRecalcDynamicStats) flags |= RecalcDynamicStats;
-
-    if (flags)
-        esm.writeHNT ("AFLG", flags);
-
-    if (mMovementFlags)
-        esm.writeHNT ("MOVE", mMovementFlags);
-
-    if (mFallHeight)
-        esm.writeHNT ("FALL", mFallHeight);
-
-    if (!mLastHitObject.empty())
-        esm.writeHNString ("LHIT", mLastHitObject);
-
-    if (!mLastHitAttemptObject.empty())
-        esm.writeHNString ("LHAT", mLastHitAttemptObject);
-
-    if (mDrawState)
-        esm.writeHNT ("DRAW", mDrawState);
-
-    if (mLevel != 1)
-        esm.writeHNT ("LEVL", mLevel);
-
-    if (mActorId != -1)
-        esm.writeHNT ("ACID", mActorId);
-
-    if (mDeathAnimation != -1)
-        esm.writeHNT ("DANM", mDeathAnimation);
-
-    if (mTimeOfDeath.mHour != 0 || mTimeOfDeath.mDay != 0)
-        esm.writeHNT ("DTIM", mTimeOfDeath);
-
-    mSpells.save(esm);
-    mActiveSpells.save(esm);
-    mAiSequence.save(esm);
-    mMagicEffects.save(esm);
-
-    for (const auto& [effectId, actorId] : mSummonedCreatures)
+    void CreatureStats::save(ESMWriter& esm) const
     {
-        esm.writeHNT ("SUMM", effectId);
-        esm.writeHNT ("ACID", actorId);
-    }
+        for (int i = 0; i < 8; ++i)
+            mAttributes[i].save(esm);
+
+        for (int i = 0; i < 3; ++i)
+            mDynamic[i].save(esm);
+
+        if (mGoldPool)
+            esm.writeHNT("GOLD", mGoldPool);
+
+        if (mTradeTime.mDay != 0 || mTradeTime.mHour != 0)
+            esm.writeHNT("TIME", mTradeTime);
+
+        int flags = 0;
+        if (mDead)
+            flags |= Dead;
+        if (mDeathAnimationFinished)
+            flags |= DeathAnimationFinished;
+        if (mDied)
+            flags |= Died;
+        if (mMurdered)
+            flags |= Murdered;
+        if (mTalkedTo)
+            flags |= TalkedTo;
+        if (mAlarmed)
+            flags |= Alarmed;
+        if (mAttacked)
+            flags |= Attacked;
+        if (mKnockdown)
+            flags |= Knockdown;
+        if (mKnockdownOneFrame)
+            flags |= KnockdownOneFrame;
+        if (mKnockdownOverOneFrame)
+            flags |= KnockdownOverOneFrame;
+        if (mHitRecovery)
+            flags |= HitRecovery;
+        if (mBlock)
+            flags |= Block;
+        if (mRecalcDynamicStats)
+            flags |= RecalcDynamicStats;
+
+        if (flags)
+            esm.writeHNT("AFLG", flags);
+
+        if (mMovementFlags)
+            esm.writeHNT("MOVE", mMovementFlags);
+
+        if (mFallHeight)
+            esm.writeHNT("FALL", mFallHeight);
+
+        if (!mLastHitObject.empty())
+            esm.writeHNString("LHIT", mLastHitObject);
+
+        if (!mLastHitAttemptObject.empty())
+            esm.writeHNString("LHAT", mLastHitAttemptObject);
+
+        if (mDrawState)
+            esm.writeHNT("DRAW", mDrawState);
+
+        if (mLevel != 1)
+            esm.writeHNT("LEVL", mLevel);
+
+        if (mActorId != -1)
+            esm.writeHNT("ACID", mActorId);
+
+        if (mDeathAnimation != -1)
+            esm.writeHNT("DANM", mDeathAnimation);
+
+        if (mTimeOfDeath.mHour != 0 || mTimeOfDeath.mDay != 0)
+            esm.writeHNT("DTIM", mTimeOfDeath);
+
+        mSpells.save(esm);
+        mActiveSpells.save(esm);
+        mAiSequence.save(esm);
+        mMagicEffects.save(esm);
+
+        for (const auto& [effectId, actorId] : mSummonedCreatures)
+        {
+            esm.writeHNT("SUMM", effectId);
+            esm.writeHNT("ACID", actorId);
+        }
 
-    for (int key : mSummonGraveyard)
-    {
-        esm.writeHNT ("GRAV", key);
+        for (int key : mSummonGraveyard)
+        {
+            esm.writeHNT("GRAV", key);
+        }
+
+        esm.writeHNT("AISE", mHasAiSettings);
+        if (mHasAiSettings)
+        {
+            for (int i = 0; i < 4; ++i)
+                mAiSettings[i].save(esm);
+        }
+        if (mMissingACDT)
+            esm.writeHNT("NOAC", mMissingACDT);
     }
 
-    esm.writeHNT("AISE", mHasAiSettings);
-    if (mHasAiSettings)
+    void CreatureStats::blank()
     {
-        for (int i=0; i<4; ++i)
-            mAiSettings[i].save(esm);
+        mTradeTime.mHour = 0;
+        mTradeTime.mDay = 0;
+        mGoldPool = 0;
+        mActorId = -1;
+        mHasAiSettings = false;
+        mDead = false;
+        mDeathAnimationFinished = false;
+        mDied = false;
+        mMurdered = false;
+        mTalkedTo = false;
+        mAlarmed = false;
+        mAttacked = false;
+        mKnockdown = false;
+        mKnockdownOneFrame = false;
+        mKnockdownOverOneFrame = false;
+        mHitRecovery = false;
+        mBlock = false;
+        mMovementFlags = 0;
+        mFallHeight = 0.f;
+        mRecalcDynamicStats = false;
+        mDrawState = 0;
+        mDeathAnimation = -1;
+        mLevel = 1;
+        mCorprusSpells.clear();
+        mMissingACDT = false;
     }
-    if (mMissingACDT)
-        esm.writeHNT("NOAC", mMissingACDT);
-}
-
-void CreatureStats::blank()
-{
-    mTradeTime.mHour = 0;
-    mTradeTime.mDay = 0;
-    mGoldPool = 0;
-    mActorId = -1;
-    mHasAiSettings = false;
-    mDead = false;
-    mDeathAnimationFinished = false;
-    mDied = false;
-    mMurdered = false;
-    mTalkedTo = false;
-    mAlarmed = false;
-    mAttacked = false;
-    mKnockdown = false;
-    mKnockdownOneFrame = false;
-    mKnockdownOverOneFrame = false;
-    mHitRecovery = false;
-    mBlock = false;
-    mMovementFlags = 0;
-    mFallHeight = 0.f;
-    mRecalcDynamicStats = false;
-    mDrawState = 0;
-    mDeathAnimation = -1;
-    mLevel = 1;
-    mCorprusSpells.clear();
-    mMissingACDT = false;
-}
 
 }
diff --git a/components/esm3/creaturestats.hpp b/components/esm3/creaturestats.hpp
index 7ad168b12f..b0cd56470f 100644
--- a/components/esm3/creaturestats.hpp
+++ b/components/esm3/creaturestats.hpp
@@ -1,19 +1,19 @@
 #ifndef OPENMW_ESM_CREATURESTATS_H
 #define OPENMW_ESM_CREATURESTATS_H
 
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
 
 #include "statstate.hpp"
 
 #include "components/esm/defs.hpp"
 
-#include "components/esm/attr.hpp"
-#include "spellstate.hpp"
 #include "activespells.hpp"
-#include "magiceffects.hpp"
 #include "aisequence.hpp"
+#include "components/esm/attr.hpp"
+#include "magiceffects.hpp"
+#include "spellstate.hpp"
 
 namespace ESM
 {
@@ -46,23 +46,23 @@ namespace ESM
         TimeStamp mTradeTime;
         int mGoldPool;
         int mActorId;
-        //int mHitAttemptActorId;
+        // int mHitAttemptActorId;
 
         enum Flags
         {
-            Dead                   = 0x0001,
+            Dead = 0x0001,
             DeathAnimationFinished = 0x0002,
-            Died                   = 0x0004,
-            Murdered               = 0x0008,
-            TalkedTo               = 0x0010,
-            Alarmed                = 0x0020,
-            Attacked               = 0x0040,
-            Knockdown              = 0x0080,
-            KnockdownOneFrame      = 0x0100,
-            KnockdownOverOneFrame  = 0x0200,
-            HitRecovery            = 0x0400,
-            Block                  = 0x0800,
-            RecalcDynamicStats     = 0x1000
+            Died = 0x0004,
+            Murdered = 0x0008,
+            TalkedTo = 0x0010,
+            Alarmed = 0x0020,
+            Attacked = 0x0040,
+            Knockdown = 0x0080,
+            KnockdownOneFrame = 0x0100,
+            KnockdownOverOneFrame = 0x0200,
+            HitRecovery = 0x0400,
+            Block = 0x0800,
+            RecalcDynamicStats = 0x1000
         };
         bool mDead;
         bool mDeathAnimationFinished;
@@ -94,8 +94,8 @@ namespace ESM
         /// Initialize to default state
         void blank();
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 }
 
diff --git a/components/esm3/custommarkerstate.cpp b/components/esm3/custommarkerstate.cpp
index 7752cc146f..f752ae7c97 100644
--- a/components/esm3/custommarkerstate.cpp
+++ b/components/esm3/custommarkerstate.cpp
@@ -1,26 +1,26 @@
 #include "custommarkerstate.hpp"
 
-#include "esmwriter.hpp"
 #include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {
 
-void CustomMarker::save(ESMWriter &esm) const
-{
-    esm.writeHNT("POSX", mWorldX);
-    esm.writeHNT("POSY", mWorldY);
-    mCell.save(esm);
-    if (!mNote.empty())
-        esm.writeHNString("NOTE", mNote);
-}
+    void CustomMarker::save(ESMWriter& esm) const
+    {
+        esm.writeHNT("POSX", mWorldX);
+        esm.writeHNT("POSY", mWorldY);
+        mCell.save(esm);
+        if (!mNote.empty())
+            esm.writeHNString("NOTE", mNote);
+    }
 
-void CustomMarker::load(ESMReader &esm)
-{
-    esm.getHNT(mWorldX, "POSX");
-    esm.getHNT(mWorldY, "POSY");
-    mCell.load(esm);
-    mNote = esm.getHNOString("NOTE");
-}
+    void CustomMarker::load(ESMReader& esm)
+    {
+        esm.getHNT(mWorldX, "POSX");
+        esm.getHNT(mWorldY, "POSY");
+        mCell.load(esm);
+        mNote = esm.getHNOString("NOTE");
+    }
 
 }
diff --git a/components/esm3/custommarkerstate.hpp b/components/esm3/custommarkerstate.hpp
index 0b527c0a92..f4cad06edb 100644
--- a/components/esm3/custommarkerstate.hpp
+++ b/components/esm3/custommarkerstate.hpp
@@ -6,24 +6,24 @@
 namespace ESM
 {
 
-// format 0, saved games only
-struct CustomMarker
-{
-    float mWorldX;
-    float mWorldY;
+    // format 0, saved games only
+    struct CustomMarker
+    {
+        float mWorldX;
+        float mWorldY;
 
-    CellId mCell;
+        CellId mCell;
 
-    std::string mNote;
+        std::string mNote;
 
-    bool operator == (const CustomMarker& other) const
-    {
-        return mNote == other.mNote && mCell == other.mCell && mWorldX == other.mWorldX && mWorldY == other.mWorldY;
-    }
+        bool operator==(const CustomMarker& other) const
+        {
+            return mNote == other.mNote && mCell == other.mCell && mWorldX == other.mWorldX && mWorldY == other.mWorldY;
+        }
 
-    void load (ESMReader& reader);
-    void save (ESMWriter& writer) const;
-};
+        void load(ESMReader& reader);
+        void save(ESMWriter& writer) const;
+    };
 
 }
 
diff --git a/components/esm3/debugprofile.cpp b/components/esm3/debugprofile.cpp
index 69f33d5f2d..ad5551206a 100644
--- a/components/esm3/debugprofile.cpp
+++ b/components/esm3/debugprofile.cpp
@@ -6,59 +6,59 @@
 namespace ESM
 {
 
-void DebugProfile::load (ESMReader& esm, bool &isDeleted)
-{
-    isDeleted = false;
-    mRecordFlags = esm.getRecordFlags();
-
-    while (esm.hasMoreSubs())
+    void DebugProfile::load(ESMReader& esm, bool& isDeleted)
     {
-        esm.getSubName();
-        switch (esm.retSubName().toInt())
+        isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
+
+        while (esm.hasMoreSubs())
         {
-            case SREC_NAME:
-                mId = esm.getHString();
-                break;
-            case fourCC("DESC"):
-                mDescription = esm.getHString();
-                break;
-            case fourCC("SCRP"):
-                mScriptText = esm.getHString();
-                break;
-            case fourCC("FLAG"):
-                esm.getHT(mFlags);
-                break;
-            case SREC_DELE:
-                esm.skipHSub();
-                isDeleted = true;
-                break;
-            default:
-                esm.fail("Unknown subrecord");
-                break;
+            esm.getSubName();
+            switch (esm.retSubName().toInt())
+            {
+                case SREC_NAME:
+                    mId = esm.getHString();
+                    break;
+                case fourCC("DESC"):
+                    mDescription = esm.getHString();
+                    break;
+                case fourCC("SCRP"):
+                    mScriptText = esm.getHString();
+                    break;
+                case fourCC("FLAG"):
+                    esm.getHT(mFlags);
+                    break;
+                case SREC_DELE:
+                    esm.skipHSub();
+                    isDeleted = true;
+                    break;
+                default:
+                    esm.fail("Unknown subrecord");
+                    break;
+            }
         }
     }
-}
 
-void DebugProfile::save (ESMWriter& esm, bool isDeleted) const
-{
-    esm.writeHNCString ("NAME", mId);
-
-    if (isDeleted)
+    void DebugProfile::save(ESMWriter& esm, bool isDeleted) const
     {
-        esm.writeHNString("DELE", "", 3);
-        return;
-    }
+        esm.writeHNCString("NAME", mId);
 
-    esm.writeHNCString ("DESC", mDescription);
-    esm.writeHNCString ("SCRP", mScriptText);
-    esm.writeHNT ("FLAG", mFlags);
-}
+        if (isDeleted)
+        {
+            esm.writeHNString("DELE", "", 3);
+            return;
+        }
 
-void DebugProfile::blank()
-{
-    mDescription.clear();
-    mScriptText.clear();
-    mFlags = 0;
-}
+        esm.writeHNCString("DESC", mDescription);
+        esm.writeHNCString("SCRP", mScriptText);
+        esm.writeHNT("FLAG", mFlags);
+    }
+
+    void DebugProfile::blank()
+    {
+        mDescription.clear();
+        mScriptText.clear();
+        mFlags = 0;
+    }
 
 }
diff --git a/components/esm3/debugprofile.hpp b/components/esm3/debugprofile.hpp
index e6fcbcd7f0..5d1dcae0b3 100644
--- a/components/esm3/debugprofile.hpp
+++ b/components/esm3/debugprofile.hpp
@@ -14,12 +14,11 @@ namespace ESM
     {
         constexpr static RecNameInts sRecordId = REC_DBGP;
 
-
         enum Flags
         {
-            Flag_Default = 1,       // add to newly opened scene subviews
+            Flag_Default = 1, // add to newly opened scene subviews
             Flag_BypassNewGame = 2, // bypass regular game startup
-            Flag_Global = 4         // make available from main menu (i.e. not location specific)
+            Flag_Global = 4 // make available from main menu (i.e. not location specific)
         };
 
         unsigned int mRecordFlags;
@@ -31,8 +30,8 @@ namespace ESM
 
         unsigned int mFlags;
 
-        void load (ESMReader& esm, bool &isDeleted);
-        void save (ESMWriter& esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
         /// Set record to default state (does not touch the ID).
         void blank();
diff --git a/components/esm3/dialoguestate.cpp b/components/esm3/dialoguestate.cpp
index bdae1dbf4c..60bd12fae0 100644
--- a/components/esm3/dialoguestate.cpp
+++ b/components/esm3/dialoguestate.cpp
@@ -6,53 +6,52 @@
 namespace ESM
 {
 
-void DialogueState::load (ESMReader &esm)
-{
-    while (esm.isNextSub ("TOPI"))
-        mKnownTopics.push_back (esm.getHString());
-
-    while (esm.isNextSub ("FACT"))
+    void DialogueState::load(ESMReader& esm)
     {
-        std::string faction = esm.getHString();
+        while (esm.isNextSub("TOPI"))
+            mKnownTopics.push_back(esm.getHString());
 
-        while (esm.isNextSub("REA2"))
+        while (esm.isNextSub("FACT"))
         {
-            std::string faction2 = esm.getHString();
-            int reaction;
-            esm.getHNT(reaction, "INTV");
-            mChangedFactionReaction[faction][faction2] = reaction;
-        }
-
-        // no longer used
-        while (esm.isNextSub ("REAC"))
-        {
-            esm.skipHSub();
-            esm.getSubName();
-            esm.skipHSub();
+            std::string faction = esm.getHString();
+
+            while (esm.isNextSub("REA2"))
+            {
+                std::string faction2 = esm.getHString();
+                int reaction;
+                esm.getHNT(reaction, "INTV");
+                mChangedFactionReaction[faction][faction2] = reaction;
+            }
+
+            // no longer used
+            while (esm.isNextSub("REAC"))
+            {
+                esm.skipHSub();
+                esm.getSubName();
+                esm.skipHSub();
+            }
         }
     }
-}
 
-void DialogueState::save (ESMWriter &esm) const
-{
-    for (std::vector<std::string>::const_iterator iter (mKnownTopics.begin());
-        iter!=mKnownTopics.end(); ++iter)
+    void DialogueState::save(ESMWriter& esm) const
     {
-        esm.writeHNString ("TOPI", *iter);
-    }
-
-    for (std::map<std::string, std::map<std::string, int> >::const_iterator iter = mChangedFactionReaction.begin();
-         iter != mChangedFactionReaction.end(); ++iter)
-    {
-        esm.writeHNString ("FACT", iter->first);
+        for (std::vector<std::string>::const_iterator iter(mKnownTopics.begin()); iter != mKnownTopics.end(); ++iter)
+        {
+            esm.writeHNString("TOPI", *iter);
+        }
 
-        for (std::map<std::string, int>::const_iterator reactIter = iter->second.begin();
-             reactIter != iter->second.end(); ++reactIter)
+        for (std::map<std::string, std::map<std::string, int>>::const_iterator iter = mChangedFactionReaction.begin();
+             iter != mChangedFactionReaction.end(); ++iter)
         {
-            esm.writeHNString ("REA2", reactIter->first);
-            esm.writeHNT ("INTV", reactIter->second);
+            esm.writeHNString("FACT", iter->first);
+
+            for (std::map<std::string, int>::const_iterator reactIter = iter->second.begin();
+                 reactIter != iter->second.end(); ++reactIter)
+            {
+                esm.writeHNString("REA2", reactIter->first);
+                esm.writeHNT("INTV", reactIter->second);
+            }
         }
     }
-}
 
 }
diff --git a/components/esm3/dialoguestate.hpp b/components/esm3/dialoguestate.hpp
index d7cdb941c2..d2e912cbcd 100644
--- a/components/esm3/dialoguestate.hpp
+++ b/components/esm3/dialoguestate.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_ESM_DIALOGUESTATE_H
 #define OPENMW_ESM_DIALOGUESTATE_H
 
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
 
 namespace ESM
 {
@@ -18,10 +18,10 @@ namespace ESM
         std::vector<std::string> mKnownTopics;
 
         // must be lower case faction IDs
-        std::map<std::string, std::map<std::string, int> > mChangedFactionReaction;
+        std::map<std::string, std::map<std::string, int>> mChangedFactionReaction;
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 }
 
diff --git a/components/esm3/doorstate.cpp b/components/esm3/doorstate.cpp
index 4378bb2197..635b7b39ac 100644
--- a/components/esm3/doorstate.cpp
+++ b/components/esm3/doorstate.cpp
@@ -8,28 +8,30 @@
 namespace ESM
 {
 
-    void DoorState::load(ESMReader &esm)
+    void DoorState::load(ESMReader& esm)
     {
         ObjectState::load(esm);
 
         mDoorState = 0;
-        esm.getHNOT (mDoorState, "ANIM");
+        esm.getHNOT(mDoorState, "ANIM");
         if (mDoorState < 0 || mDoorState > 2)
-            Log(Debug::Warning) << "Dropping invalid door state (" << mDoorState << ") for door \"" << mRef.mRefID << "\"";
+            Log(Debug::Warning) << "Dropping invalid door state (" << mDoorState << ") for door \"" << mRef.mRefID
+                                << "\"";
     }
 
-    void DoorState::save(ESMWriter &esm, bool inInventory) const
+    void DoorState::save(ESMWriter& esm, bool inInventory) const
     {
         ObjectState::save(esm, inInventory);
 
         if (mDoorState < 0 || mDoorState > 2)
         {
-            Log(Debug::Warning) << "Dropping invalid door state (" << mDoorState << ") for door \"" << mRef.mRefID << "\"";
+            Log(Debug::Warning) << "Dropping invalid door state (" << mDoorState << ") for door \"" << mRef.mRefID
+                                << "\"";
             return;
         }
 
         if (mDoorState != 0)
-            esm.writeHNT ("ANIM", mDoorState);
+            esm.writeHNT("ANIM", mDoorState);
     }
 
 }
diff --git a/components/esm3/doorstate.hpp b/components/esm3/doorstate.hpp
index c3aeb42e38..5298327707 100644
--- a/components/esm3/doorstate.hpp
+++ b/components/esm3/doorstate.hpp
@@ -11,17 +11,11 @@ namespace ESM
     {
         int mDoorState = 0;
 
-        void load (ESMReader &esm) override;
-        void save (ESMWriter &esm, bool inInventory = false) const override;
+        void load(ESMReader& esm) override;
+        void save(ESMWriter& esm, bool inInventory = false) const override;
 
-        DoorState& asDoorState() override
-        {
-            return *this;
-        }
-        const DoorState& asDoorState() const override
-        {
-            return *this;
-        }
+        DoorState& asDoorState() override { return *this; }
+        const DoorState& asDoorState() const override { return *this; }
     };
 }
 
diff --git a/components/esm3/effectlist.cpp b/components/esm3/effectlist.cpp
index c578e4095a..bdde270965 100644
--- a/components/esm3/effectlist.cpp
+++ b/components/esm3/effectlist.cpp
@@ -6,26 +6,28 @@
 namespace ESM
 {
 
-void EffectList::load(ESMReader &esm)
-{
-    mList.clear();
-    while (esm.isNextSub("ENAM")) {
-        add(esm);
+    void EffectList::load(ESMReader& esm)
+    {
+        mList.clear();
+        while (esm.isNextSub("ENAM"))
+        {
+            add(esm);
+        }
     }
-}
 
-void EffectList::add(ESMReader &esm)
-{
-    ENAMstruct s;
-    esm.getHTSized<24>(s);
-    mList.push_back(s);
-}
+    void EffectList::add(ESMReader& esm)
+    {
+        ENAMstruct s;
+        esm.getHTSized<24>(s);
+        mList.push_back(s);
+    }
 
-void EffectList::save(ESMWriter &esm) const
-{
-    for (std::vector<ENAMstruct>::const_iterator it = mList.begin(); it != mList.end(); ++it) {
-        esm.writeHNT<ENAMstruct>("ENAM", *it, 24);
+    void EffectList::save(ESMWriter& esm) const
+    {
+        for (std::vector<ENAMstruct>::const_iterator it = mList.begin(); it != mList.end(); ++it)
+        {
+            esm.writeHNT<ENAMstruct>("ENAM", *it, 24);
+        }
     }
-}
 
 } // end namespace
diff --git a/components/esm3/effectlist.hpp b/components/esm3/effectlist.hpp
index d581f83371..5887435d35 100644
--- a/components/esm3/effectlist.hpp
+++ b/components/esm3/effectlist.hpp
@@ -8,8 +8,8 @@ namespace ESM
     class ESMReader;
     class ESMWriter;
 
-    #pragma pack(push)
-    #pragma pack(1)
+#pragma pack(push)
+#pragma pack(1)
 
     /** Defines a spell effect. Shared between SPEL (Spells), ALCH
      (Potions) and ENCH (Item enchantments) records
@@ -27,7 +27,7 @@ namespace ESM
         int mRange; // 0 - self, 1 - touch, 2 - target (RangeType enum)
         int mArea, mDuration, mMagnMin, mMagnMax;
     };
-    #pragma pack(pop)
+#pragma pack(pop)
 
     /// EffectList, ENAM subrecord
     struct EffectList
@@ -35,11 +35,11 @@ namespace ESM
         std::vector<ENAMstruct> mList;
 
         /// Load one effect, assumes subrecord name was already read
-        void add(ESMReader &esm);
+        void add(ESMReader& esm);
 
         /// Load all effects
-        void load(ESMReader &esm);
-        void save(ESMWriter &esm) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 
 }
diff --git a/components/esm3/esmreader.cpp b/components/esm3/esmreader.cpp
index b1c4bea329..3db414bf19 100644
--- a/components/esm3/esmreader.cpp
+++ b/components/esm3/esmreader.cpp
@@ -2,370 +2,370 @@
 
 #include "readerscache.hpp"
 
-#include <components/misc/strings/algorithm.hpp>
-#include <components/files/openfile.hpp>
 #include <components/files/conversion.hpp>
+#include <components/files/openfile.hpp>
+#include <components/misc/strings/algorithm.hpp>
 
-#include <stdexcept>
-#include <sstream>
 #include <filesystem>
 #include <fstream>
+#include <sstream>
+#include <stdexcept>
 
 namespace ESM
 {
 
-ESM_Context ESMReader::getContext()
-{
-    // Update the file position before returning
-    mCtx.filePos = mEsm->tellg();
-    return mCtx;
-}
+    ESM_Context ESMReader::getContext()
+    {
+        // Update the file position before returning
+        mCtx.filePos = mEsm->tellg();
+        return mCtx;
+    }
 
-ESMReader::ESMReader()
-    : mRecordFlags(0)
-    , mBuffer(50*1024)
-    , mEncoder(nullptr)
-    , mFileSize(0)
-{
-    clearCtx();
-    mCtx.index = 0;
-}
+    ESMReader::ESMReader()
+        : mRecordFlags(0)
+        , mBuffer(50 * 1024)
+        , mEncoder(nullptr)
+        , mFileSize(0)
+    {
+        clearCtx();
+        mCtx.index = 0;
+    }
 
-void ESMReader::restoreContext(const ESM_Context &rc)
-{
-    // Reopen the file if necessary
-    if (mCtx.filename != rc.filename)
-        openRaw(rc.filename);
+    void ESMReader::restoreContext(const ESM_Context& rc)
+    {
+        // Reopen the file if necessary
+        if (mCtx.filename != rc.filename)
+            openRaw(rc.filename);
 
-    // Copy the data
-    mCtx = rc;
+        // Copy the data
+        mCtx = rc;
 
-    // Make sure we seek to the right place
-    mEsm->seekg(mCtx.filePos);
-}
+        // Make sure we seek to the right place
+        mEsm->seekg(mCtx.filePos);
+    }
 
-void ESMReader::close()
-{
-    mEsm.reset();
-    clearCtx();
-    mHeader.blank();
-}
+    void ESMReader::close()
+    {
+        mEsm.reset();
+        clearCtx();
+        mHeader.blank();
+    }
 
-void ESMReader::clearCtx() 
-{
-   mCtx.filename.clear();
-   mCtx.leftFile = 0;
-   mCtx.leftRec = 0;
-   mCtx.leftSub = 0;
-   mCtx.subCached = false;
-   mCtx.recName.clear();
-   mCtx.subName.clear();
-}
+    void ESMReader::clearCtx()
+    {
+        mCtx.filename.clear();
+        mCtx.leftFile = 0;
+        mCtx.leftRec = 0;
+        mCtx.leftSub = 0;
+        mCtx.subCached = false;
+        mCtx.recName.clear();
+        mCtx.subName.clear();
+    }
 
-void ESMReader::resolveParentFileIndices(ReadersCache& readers)
-{
-    mCtx.parentFileIndices.clear();
-    for (const Header::MasterData &mast : getGameFiles())
+    void ESMReader::resolveParentFileIndices(ReadersCache& readers)
     {
-        const std::string& fname = mast.name;
-        int index = getIndex(); 
-        for (int i = 0; i < getIndex(); i++)
+        mCtx.parentFileIndices.clear();
+        for (const Header::MasterData& mast : getGameFiles())
         {
-            const ESM::ReadersCache::BusyItem reader = readers.get(static_cast<std::size_t>(i));
-            if (reader->getFileSize() == 0)
-                continue;  // Content file in non-ESM format
-            const auto fnamecandidate = Files::pathToUnicodeString(reader->getName().filename());
-            if (Misc::StringUtils::ciEqual(fname, fnamecandidate))
+            const std::string& fname = mast.name;
+            int index = getIndex();
+            for (int i = 0; i < getIndex(); i++)
             {
-                index = i;
-                break;
+                const ESM::ReadersCache::BusyItem reader = readers.get(static_cast<std::size_t>(i));
+                if (reader->getFileSize() == 0)
+                    continue; // Content file in non-ESM format
+                const auto fnamecandidate = Files::pathToUnicodeString(reader->getName().filename());
+                if (Misc::StringUtils::ciEqual(fname, fnamecandidate))
+                {
+                    index = i;
+                    break;
+                }
             }
+            mCtx.parentFileIndices.push_back(index);
         }
-        mCtx.parentFileIndices.push_back(index);
     }
-}
-
-void ESMReader::openRaw(std::unique_ptr<std::istream>&& stream, const std::filesystem::path &name)
-{
-    close();
-    mEsm = std::move(stream);
-    mCtx.filename = name;
-    mEsm->seekg(0, mEsm->end);
-    mCtx.leftFile = mFileSize = mEsm->tellg();
-    mEsm->seekg(0, mEsm->beg);
-}
-
-void ESMReader::openRaw(const std::filesystem::path &filename)
-{
-    openRaw(Files::openBinaryInputFileStream(filename), filename);
-}
 
-void ESMReader::open(std::unique_ptr<std::istream>&& stream, const std::filesystem::path &name)
-{
-    openRaw(std::move(stream), name);
-
-    if (getRecName() != "TES3")
-        fail("Not a valid Morrowind file");
+    void ESMReader::openRaw(std::unique_ptr<std::istream>&& stream, const std::filesystem::path& name)
+    {
+        close();
+        mEsm = std::move(stream);
+        mCtx.filename = name;
+        mEsm->seekg(0, mEsm->end);
+        mCtx.leftFile = mFileSize = mEsm->tellg();
+        mEsm->seekg(0, mEsm->beg);
+    }
 
-    getRecHeader();
+    void ESMReader::openRaw(const std::filesystem::path& filename)
+    {
+        openRaw(Files::openBinaryInputFileStream(filename), filename);
+    }
 
-    mHeader.load (*this);
-}
+    void ESMReader::open(std::unique_ptr<std::istream>&& stream, const std::filesystem::path& name)
+    {
+        openRaw(std::move(stream), name);
 
-void ESMReader::open(const std::filesystem::path &file)
-{
-    open(Files::openBinaryInputFileStream(file), file);
-}
+        if (getRecName() != "TES3")
+            fail("Not a valid Morrowind file");
 
-std::string ESMReader::getHNOString(NAME name)
-{
-    if (isNextSub(name))
-        return getHString();
-    return "";
-}
+        getRecHeader();
 
-void ESMReader::skipHNOString(NAME name)
-{
-    if (isNextSub(name))
-        skipHString();
-}
+        mHeader.load(*this);
+    }
 
-std::string ESMReader::getHNString(NAME name)
-{
-    getSubNameIs(name);
-    return getHString();
-}
+    void ESMReader::open(const std::filesystem::path& file)
+    {
+        open(Files::openBinaryInputFileStream(file), file);
+    }
 
-std::string ESMReader::getHString()
-{
-    getSubHeader();
-
-    // Hack to make MultiMark.esp load. Zero-length strings do not
-    // occur in any of the official mods, but MultiMark makes use of
-    // them. For some reason, they break the rules, and contain a byte
-    // (value 0) even if the header says there is no data. If
-    // Morrowind accepts it, so should we.
-    if (mCtx.leftSub == 0 && hasMoreSubs() && !mEsm->peek())
+    std::string ESMReader::getHNOString(NAME name)
     {
-        // Skip the following zero byte
-        mCtx.leftRec--;
-        char c;
-        getT(c);
-        return std::string();
+        if (isNextSub(name))
+            return getHString();
+        return "";
     }
 
-    return getString(mCtx.leftSub);
-}
+    void ESMReader::skipHNOString(NAME name)
+    {
+        if (isNextSub(name))
+            skipHString();
+    }
 
-void ESMReader::skipHString()
-{
-    getSubHeader();
-
-    // Hack to make MultiMark.esp load. Zero-length strings do not
-    // occur in any of the official mods, but MultiMark makes use of
-    // them. For some reason, they break the rules, and contain a byte
-    // (value 0) even if the header says there is no data. If
-    // Morrowind accepts it, so should we.
-    if (mCtx.leftSub == 0 && hasMoreSubs() && !mEsm->peek())
+    std::string ESMReader::getHNString(NAME name)
     {
-        // Skip the following zero byte
-        mCtx.leftRec--;
-        skipT<char>();
-        return;
+        getSubNameIs(name);
+        return getHString();
     }
 
-    skip(mCtx.leftSub);
-}
+    std::string ESMReader::getHString()
+    {
+        getSubHeader();
+
+        // Hack to make MultiMark.esp load. Zero-length strings do not
+        // occur in any of the official mods, but MultiMark makes use of
+        // them. For some reason, they break the rules, and contain a byte
+        // (value 0) even if the header says there is no data. If
+        // Morrowind accepts it, so should we.
+        if (mCtx.leftSub == 0 && hasMoreSubs() && !mEsm->peek())
+        {
+            // Skip the following zero byte
+            mCtx.leftRec--;
+            char c;
+            getT(c);
+            return std::string();
+        }
 
-void ESMReader::getHExact(void*p, int size)
-{
-    getSubHeader();
-    if (size != static_cast<int> (mCtx.leftSub))
-        reportSubSizeMismatch(size, mCtx.leftSub);
-    getExact(p, size);
-}
+        return getString(mCtx.leftSub);
+    }
 
-// Read the given number of bytes from a named subrecord
-void ESMReader::getHNExact(void*p, int size, NAME name)
-{
-    getSubNameIs(name);
-    getHExact(p, size);
-}
+    void ESMReader::skipHString()
+    {
+        getSubHeader();
+
+        // Hack to make MultiMark.esp load. Zero-length strings do not
+        // occur in any of the official mods, but MultiMark makes use of
+        // them. For some reason, they break the rules, and contain a byte
+        // (value 0) even if the header says there is no data. If
+        // Morrowind accepts it, so should we.
+        if (mCtx.leftSub == 0 && hasMoreSubs() && !mEsm->peek())
+        {
+            // Skip the following zero byte
+            mCtx.leftRec--;
+            skipT<char>();
+            return;
+        }
 
-// Get the next subrecord name and check if it matches the parameter
-void ESMReader::getSubNameIs(NAME name)
-{
-    getSubName();
-    if (mCtx.subName != name)
-        fail("Expected subrecord " + name.toString() + " but got " + mCtx.subName.toString());
-}
+        skip(mCtx.leftSub);
+    }
 
-bool ESMReader::isNextSub(NAME name)
-{
-    if (!hasMoreSubs())
-        return false;
+    void ESMReader::getHExact(void* p, int size)
+    {
+        getSubHeader();
+        if (size != static_cast<int>(mCtx.leftSub))
+            reportSubSizeMismatch(size, mCtx.leftSub);
+        getExact(p, size);
+    }
 
-    getSubName();
+    // Read the given number of bytes from a named subrecord
+    void ESMReader::getHNExact(void* p, int size, NAME name)
+    {
+        getSubNameIs(name);
+        getHExact(p, size);
+    }
 
-    // If the name didn't match, then mark the it as 'cached' so it's
-    // available for the next call to getSubName.
-    mCtx.subCached = (mCtx.subName != name);
+    // Get the next subrecord name and check if it matches the parameter
+    void ESMReader::getSubNameIs(NAME name)
+    {
+        getSubName();
+        if (mCtx.subName != name)
+            fail("Expected subrecord " + name.toString() + " but got " + mCtx.subName.toString());
+    }
 
-    // If subCached is false, then subName == name.
-    return !mCtx.subCached;
-}
+    bool ESMReader::isNextSub(NAME name)
+    {
+        if (!hasMoreSubs())
+            return false;
 
-bool ESMReader::peekNextSub(NAME name)
-{
-    if (!hasMoreSubs())
-        return false;
+        getSubName();
 
-    getSubName();
+        // If the name didn't match, then mark the it as 'cached' so it's
+        // available for the next call to getSubName.
+        mCtx.subCached = (mCtx.subName != name);
 
-    mCtx.subCached = true;
-    return mCtx.subName == name;
-}
+        // If subCached is false, then subName == name.
+        return !mCtx.subCached;
+    }
 
-// Read subrecord name. This gets called a LOT, so I've optimized it
-// slightly.
-void ESMReader::getSubName()
-{
-    // If the name has already been read, do nothing
-    if (mCtx.subCached)
+    bool ESMReader::peekNextSub(NAME name)
     {
-        mCtx.subCached = false;
-        return;
+        if (!hasMoreSubs())
+            return false;
+
+        getSubName();
+
+        mCtx.subCached = true;
+        return mCtx.subName == name;
     }
 
-    // reading the subrecord data anyway.
-    const std::size_t subNameSize = decltype(mCtx.subName)::sCapacity;
-    getExact(mCtx.subName.mData, static_cast<int>(subNameSize));
-    mCtx.leftRec -= static_cast<std::uint32_t>(subNameSize);
-}
+    // Read subrecord name. This gets called a LOT, so I've optimized it
+    // slightly.
+    void ESMReader::getSubName()
+    {
+        // If the name has already been read, do nothing
+        if (mCtx.subCached)
+        {
+            mCtx.subCached = false;
+            return;
+        }
 
-void ESMReader::skipHSub()
-{
-    getSubHeader();
-    skip(mCtx.leftSub);
-}
+        // reading the subrecord data anyway.
+        const std::size_t subNameSize = decltype(mCtx.subName)::sCapacity;
+        getExact(mCtx.subName.mData, static_cast<int>(subNameSize));
+        mCtx.leftRec -= static_cast<std::uint32_t>(subNameSize);
+    }
 
-void ESMReader::skipHSubSize(int size)
-{
-    skipHSub();
-    if (static_cast<int> (mCtx.leftSub) != size)
-        reportSubSizeMismatch(mCtx.leftSub, size);
-}
+    void ESMReader::skipHSub()
+    {
+        getSubHeader();
+        skip(mCtx.leftSub);
+    }
 
-void ESMReader::skipHSubUntil(NAME name)
-{
-    while (hasMoreSubs() && !isNextSub(name))
+    void ESMReader::skipHSubSize(int size)
     {
-        mCtx.subCached = false;
         skipHSub();
+        if (static_cast<int>(mCtx.leftSub) != size)
+            reportSubSizeMismatch(mCtx.leftSub, size);
     }
-    if (hasMoreSubs())
-        mCtx.subCached = true;
-}
 
-void ESMReader::getSubHeader()
-{
-    if (mCtx.leftRec < sizeof(mCtx.leftSub))
-        fail("End of record while reading sub-record header");
+    void ESMReader::skipHSubUntil(NAME name)
+    {
+        while (hasMoreSubs() && !isNextSub(name))
+        {
+            mCtx.subCached = false;
+            skipHSub();
+        }
+        if (hasMoreSubs())
+            mCtx.subCached = true;
+    }
 
-    // Get subrecord size
-    getT(mCtx.leftSub);
-    mCtx.leftRec -= sizeof(mCtx.leftSub);
+    void ESMReader::getSubHeader()
+    {
+        if (mCtx.leftRec < sizeof(mCtx.leftSub))
+            fail("End of record while reading sub-record header");
 
-    // Adjust number of record bytes left
-    if (mCtx.leftRec < mCtx.leftSub)
-        fail("Record size is larger than rest of file");
-    mCtx.leftRec -= mCtx.leftSub;
-}
+        // Get subrecord size
+        getT(mCtx.leftSub);
+        mCtx.leftRec -= sizeof(mCtx.leftSub);
 
-NAME ESMReader::getRecName()
-{
-    if (!hasMoreRecs())
-        fail("No more records, getRecName() failed");
-    getName(mCtx.recName);
-    mCtx.leftFile -= decltype(mCtx.recName)::sCapacity;
+        // Adjust number of record bytes left
+        if (mCtx.leftRec < mCtx.leftSub)
+            fail("Record size is larger than rest of file");
+        mCtx.leftRec -= mCtx.leftSub;
+    }
 
-    // Make sure we don't carry over any old cached subrecord
-    // names. This can happen in some cases when we skip parts of a
-    // record.
-    mCtx.subCached = false;
+    NAME ESMReader::getRecName()
+    {
+        if (!hasMoreRecs())
+            fail("No more records, getRecName() failed");
+        getName(mCtx.recName);
+        mCtx.leftFile -= decltype(mCtx.recName)::sCapacity;
+
+        // Make sure we don't carry over any old cached subrecord
+        // names. This can happen in some cases when we skip parts of a
+        // record.
+        mCtx.subCached = false;
 
-    return mCtx.recName;
-}
+        return mCtx.recName;
+    }
 
-void ESMReader::skipRecord()
-{
-    skip(mCtx.leftRec);
-    mCtx.leftRec = 0;
-    mCtx.subCached = false;
-}
+    void ESMReader::skipRecord()
+    {
+        skip(mCtx.leftRec);
+        mCtx.leftRec = 0;
+        mCtx.subCached = false;
+    }
 
-void ESMReader::getRecHeader(uint32_t &flags)
-{
-    // General error checking
-    if (mCtx.leftFile < 3 * sizeof(uint32_t))
-        fail("End of file while reading record header");
-    if (mCtx.leftRec)
-        fail("Previous record contains unread bytes");
-
-    getUint(mCtx.leftRec);
-    getUint(flags);// This header entry is always zero
-    getUint(flags);
-    mCtx.leftFile -= 3 * sizeof(uint32_t);
-
-    // Check that sizes add up
-    if (mCtx.leftFile < mCtx.leftRec)
-        reportSubSizeMismatch(mCtx.leftFile, mCtx.leftRec);
-
-    // Adjust number of bytes mCtx.left in file
-    mCtx.leftFile -= mCtx.leftRec;
-}
+    void ESMReader::getRecHeader(uint32_t& flags)
+    {
+        // General error checking
+        if (mCtx.leftFile < 3 * sizeof(uint32_t))
+            fail("End of file while reading record header");
+        if (mCtx.leftRec)
+            fail("Previous record contains unread bytes");
+
+        getUint(mCtx.leftRec);
+        getUint(flags); // This header entry is always zero
+        getUint(flags);
+        mCtx.leftFile -= 3 * sizeof(uint32_t);
+
+        // Check that sizes add up
+        if (mCtx.leftFile < mCtx.leftRec)
+            reportSubSizeMismatch(mCtx.leftFile, mCtx.leftRec);
+
+        // Adjust number of bytes mCtx.left in file
+        mCtx.leftFile -= mCtx.leftRec;
+    }
 
-/*************************************************************************
- *
- *  Lowest level data reading and misc methods
- *
- *************************************************************************/
+    /*************************************************************************
+     *
+     *  Lowest level data reading and misc methods
+     *
+     *************************************************************************/
 
-std::string ESMReader::getString(int size)
-{
-    size_t s = size;
-    if (mBuffer.size() <= s)
-        // Add some extra padding to reduce the chance of having to resize
-        // again later.
-        mBuffer.resize(3*s);
+    std::string ESMReader::getString(int size)
+    {
+        size_t s = size;
+        if (mBuffer.size() <= s)
+            // Add some extra padding to reduce the chance of having to resize
+            // again later.
+            mBuffer.resize(3 * s);
 
-    // And make sure the string is zero terminated
-    mBuffer[s] = 0;
+        // And make sure the string is zero terminated
+        mBuffer[s] = 0;
 
-    // read ESM data
-    char *ptr = mBuffer.data();
-    getExact(ptr, size);
+        // read ESM data
+        char* ptr = mBuffer.data();
+        getExact(ptr, size);
 
-    size = static_cast<int>(strnlen(ptr, size));
+        size = static_cast<int>(strnlen(ptr, size));
 
-    // Convert to UTF8 and return
-    if (mEncoder)
-        return std::string(mEncoder->getUtf8(std::string_view(ptr, size)));
+        // Convert to UTF8 and return
+        if (mEncoder)
+            return std::string(mEncoder->getUtf8(std::string_view(ptr, size)));
 
-    return std::string (ptr, size);
-}
+        return std::string(ptr, size);
+    }
 
-[[noreturn]] void ESMReader::fail(const std::string &msg)
-{
-    std::stringstream ss;
-
-    ss << "ESM Error: " << msg;
-    ss << "\n  File: " << Files::pathToUnicodeString(mCtx.filename);
-    ss << "\n  Record: " << mCtx.recName.toStringView();
-    ss << "\n  Subrecord: " << mCtx.subName.toStringView();
-    if (mEsm.get())
-        ss << "\n  Offset: 0x" << std::hex << mEsm->tellg();
-    throw std::runtime_error(ss.str());
-}
+    [[noreturn]] void ESMReader::fail(const std::string& msg)
+    {
+        std::stringstream ss;
+
+        ss << "ESM Error: " << msg;
+        ss << "\n  File: " << Files::pathToUnicodeString(mCtx.filename);
+        ss << "\n  Record: " << mCtx.recName.toStringView();
+        ss << "\n  Subrecord: " << mCtx.subName.toStringView();
+        if (mEsm.get())
+            ss << "\n  Offset: 0x" << std::hex << mEsm->tellg();
+        throw std::runtime_error(ss.str());
+    }
 
 }
diff --git a/components/esm3/esmreader.hpp b/components/esm3/esmreader.hpp
index 521c1fc75d..c07518ea56 100644
--- a/components/esm3/esmreader.hpp
+++ b/components/esm3/esmreader.hpp
@@ -2,10 +2,10 @@
 #define OPENMW_ESM_READER_H
 
 #include <cstdint>
-#include <vector>
+#include <filesystem>
 #include <istream>
 #include <memory>
-#include <filesystem>
+#include <vector>
 
 #include <components/to_utf8/to_utf8.hpp>
 
@@ -15,304 +15,305 @@
 namespace ESM
 {
 
-class ReadersCache;
+    class ReadersCache;
 
-class ESMReader
-{
-public:
-
-  ESMReader();
-
-  /*************************************************************************
-   *
-   *  Information retrieval
-   *
-   *************************************************************************/
-
-  int getVer() const { return mHeader.mData.version; }
-  int getRecordCount() const { return mHeader.mData.records; }
-  float getFVer() const { return (mHeader.mData.version == VER_12) ? 1.2f : 1.3f; }
-  const std::string& getAuthor() const { return mHeader.mData.author; }
-  const std::string& getDesc() const { return mHeader.mData.desc; }
-  const std::vector<Header::MasterData> &getGameFiles() const { return mHeader.mMaster; }
-  const Header& getHeader() const { return mHeader; }
-  int getFormat() const { return mHeader.mFormat; };
-  const NAME &retSubName() const { return mCtx.subName; }
-  uint32_t getSubSize() const { return mCtx.leftSub; }
-  const std::filesystem::path& getName() const { return mCtx.filename; };
-  bool isOpen() const { return mEsm != nullptr; }
-
-  /*************************************************************************
-   *
-   *  Opening and closing
-   *
-   *************************************************************************/
-
-  /** Save the current file position and information in a ESM_Context
-      struct
-   */
-  ESM_Context getContext();
-
-  /** Restore a previously saved context */
-  void restoreContext(const ESM_Context &rc);
-
-  /** Close the file, resets all information. After calling close()
-      the structure may be reused to load a new file.
-  */
-  void close();
-
-  /// Raw opening. Opens the file and sets everything up but doesn't
-  /// parse the header.
-  void openRaw(std::unique_ptr<std::istream>&& stream, const std::filesystem::path &name);
-
-  /// Load ES file from a new stream, parses the header. Closes the
-  /// currently open file first, if any.
-  void open(std::unique_ptr<std::istream>&& stream, const std::filesystem::path &name);
-
-  void open(const std::filesystem::path &file);
-
-  void openRaw(const std::filesystem::path &filename);
-
-  /// Get the current position in the file. Make sure that the file has been opened!
-  size_t getFileOffset() const { return mEsm->tellg(); };
-
-  // This is a quick hack for multiple esm/esp files. Each plugin introduces its own
-  //  terrain palette, but ESMReader does not pass a reference to the correct plugin
-  //  to the individual load() methods. This hack allows to pass this reference
-  //  indirectly to the load() method.
-  void setIndex(const int index) { mCtx.index = index;}
-  int getIndex() const {return mCtx.index;}
-
-  // Assign parent esX files by tracking their indices in the global list of
-  // all files/readers used by the engine. This is required for correct adjustRefNum() results
-  // as required for handling moved, deleted and edited CellRefs.
-  /// @note Does not validate.
-  void resolveParentFileIndices(ReadersCache& readers);
-  const std::vector<int>& getParentFileIndices() const { return mCtx.parentFileIndices; }
-
-  /*************************************************************************
-   *
-   *  Medium-level reading shortcuts
-   *
-   *************************************************************************/
-
-  // Read data of a given type, stored in a subrecord of a given name
-  template <typename X>
-  void getHNT(X &x, NAME name)
-  {
-    getSubNameIs(name);
-    getHT(x);
-  }
-
-  // Optional version of getHNT
-  template <typename X>
-  void getHNOT(X &x, NAME name)
-  {
-      if(isNextSub(name))
-          getHT(x);
-  }
-
-  // Version with extra size checking, to make sure the compiler
-  // doesn't mess up our struct padding.
-  template <std::size_t size, typename X>
-  void getHNTSized(X &x, NAME name)
-  {
-      static_assert(sizeof(X) == size);
-      getHNT(x, name);
-  }
-
-  template <std::size_t size, typename X>
-  void getHNOTSized(X &x, NAME name)
-  {
-      static_assert(sizeof(X) == size);
-      getHNOT(x, name);
-  }
-
-  // Get data of a given type/size, including subrecord header
-  template <typename X>
-  void getHT(X &x)
-  {
-      getSubHeader();
-      if (mCtx.leftSub != sizeof(X))
-          reportSubSizeMismatch(sizeof(X), mCtx.leftSub);
-      getT(x);
-  }
-
-  template <typename T>
-  void skipHT()
-  {
-      getSubHeader();
-      if (mCtx.leftSub != sizeof(T))
-          reportSubSizeMismatch(sizeof(T), mCtx.leftSub);
-      skipT<T>();
-  }
-
-  // Version with extra size checking, to make sure the compiler
-  // doesn't mess up our struct padding.
-  template <std::size_t size, typename X>
-  void getHTSized(X &x)
-  {
-      static_assert(sizeof(X) == size);
-      getHT(x);
-  }
-
-  template <std::size_t size, typename T>
-  void skipHTSized()
-  {
-      static_assert(sizeof(T) == size);
-      skipHT<T>();
-  }
-
-  // Read a string by the given name if it is the next record.
-  std::string getHNOString(NAME name);
-
-  void skipHNOString(NAME name);
-
-  // Read a string with the given sub-record name
-  std::string getHNString(NAME name);
-
-  // Read a string, including the sub-record header (but not the name)
-  std::string getHString();
-
-  void skipHString();
-
-  // Read the given number of bytes from a subrecord
-  void getHExact(void*p, int size);
-
-  // Read the given number of bytes from a named subrecord
-  void getHNExact(void*p, int size, NAME name);
-
-  /*************************************************************************
-   *
-   *  Low level sub-record methods
-   *
-   *************************************************************************/
-
-  // Get the next subrecord name and check if it matches the parameter
-  void getSubNameIs(NAME name);
-
-  /** Checks if the next sub record name matches the parameter. If it
-      does, it is read into 'subName' just as if getSubName() was
-      called. If not, the read name will still be available for future
-      calls to getSubName(), isNextSub() and getSubNameIs().
-   */
-  bool isNextSub(NAME name);
-
-  bool peekNextSub(NAME name);
-
-  // Store the current subrecord name for the next call of getSubName()
-  void cacheSubName() {mCtx.subCached = true; };
-
-  // Read subrecord name. This gets called a LOT, so I've optimized it
-  // slightly.
-  void getSubName();
-
-  // Skip current sub record, including header (but not including
-  // name.)
-  void skipHSub();
-
-  // Skip sub record and check its size
-  void skipHSubSize(int size);
-
-  // Skip all subrecords until the given subrecord or no more subrecords remaining
-  void skipHSubUntil(NAME name);
-
-  /* Sub-record header. This updates leftRec beyond the current
-     sub-record as well. leftSub contains size of current sub-record.
-  */
-  void getSubHeader();
-
-  /*************************************************************************
-   *
-   *  Low level record methods
-   *
-   *************************************************************************/
-
-  // Get the next record name
-  NAME getRecName();
-
-  // Skip the rest of this record. Assumes the name and header have
-  // already been read
-  void skipRecord();
-
-  /* Read record header. This updatesleftFile BEYOND the data that
-     follows the header, ie beyond the entire record. You should use
-     leftRec to orient yourself inside the record itself.
-  */
-  void getRecHeader() { getRecHeader(mRecordFlags); }
-  void getRecHeader(uint32_t &flags);
-
-  bool hasMoreRecs() const { return mCtx.leftFile > 0; }
-  bool hasMoreSubs() const { return mCtx.leftRec > 0; }
+    class ESMReader
+    {
+    public:
+        ESMReader();
+
+        /*************************************************************************
+         *
+         *  Information retrieval
+         *
+         *************************************************************************/
+
+        int getVer() const { return mHeader.mData.version; }
+        int getRecordCount() const { return mHeader.mData.records; }
+        float getFVer() const { return (mHeader.mData.version == VER_12) ? 1.2f : 1.3f; }
+        const std::string& getAuthor() const { return mHeader.mData.author; }
+        const std::string& getDesc() const { return mHeader.mData.desc; }
+        const std::vector<Header::MasterData>& getGameFiles() const { return mHeader.mMaster; }
+        const Header& getHeader() const { return mHeader; }
+        int getFormat() const { return mHeader.mFormat; };
+        const NAME& retSubName() const { return mCtx.subName; }
+        uint32_t getSubSize() const { return mCtx.leftSub; }
+        const std::filesystem::path& getName() const { return mCtx.filename; };
+        bool isOpen() const { return mEsm != nullptr; }
+
+        /*************************************************************************
+         *
+         *  Opening and closing
+         *
+         *************************************************************************/
+
+        /** Save the current file position and information in a ESM_Context
+            struct
+         */
+        ESM_Context getContext();
+
+        /** Restore a previously saved context */
+        void restoreContext(const ESM_Context& rc);
+
+        /** Close the file, resets all information. After calling close()
+            the structure may be reused to load a new file.
+        */
+        void close();
+
+        /// Raw opening. Opens the file and sets everything up but doesn't
+        /// parse the header.
+        void openRaw(std::unique_ptr<std::istream>&& stream, const std::filesystem::path& name);
+
+        /// Load ES file from a new stream, parses the header. Closes the
+        /// currently open file first, if any.
+        void open(std::unique_ptr<std::istream>&& stream, const std::filesystem::path& name);
+
+        void open(const std::filesystem::path& file);
+
+        void openRaw(const std::filesystem::path& filename);
+
+        /// Get the current position in the file. Make sure that the file has been opened!
+        size_t getFileOffset() const { return mEsm->tellg(); };
+
+        // This is a quick hack for multiple esm/esp files. Each plugin introduces its own
+        //  terrain palette, but ESMReader does not pass a reference to the correct plugin
+        //  to the individual load() methods. This hack allows to pass this reference
+        //  indirectly to the load() method.
+        void setIndex(const int index) { mCtx.index = index; }
+        int getIndex() const { return mCtx.index; }
+
+        // Assign parent esX files by tracking their indices in the global list of
+        // all files/readers used by the engine. This is required for correct adjustRefNum() results
+        // as required for handling moved, deleted and edited CellRefs.
+        /// @note Does not validate.
+        void resolveParentFileIndices(ReadersCache& readers);
+        const std::vector<int>& getParentFileIndices() const { return mCtx.parentFileIndices; }
+
+        /*************************************************************************
+         *
+         *  Medium-level reading shortcuts
+         *
+         *************************************************************************/
+
+        // Read data of a given type, stored in a subrecord of a given name
+        template <typename X>
+        void getHNT(X& x, NAME name)
+        {
+            getSubNameIs(name);
+            getHT(x);
+        }
+
+        // Optional version of getHNT
+        template <typename X>
+        void getHNOT(X& x, NAME name)
+        {
+            if (isNextSub(name))
+                getHT(x);
+        }
+
+        // Version with extra size checking, to make sure the compiler
+        // doesn't mess up our struct padding.
+        template <std::size_t size, typename X>
+        void getHNTSized(X& x, NAME name)
+        {
+            static_assert(sizeof(X) == size);
+            getHNT(x, name);
+        }
+
+        template <std::size_t size, typename X>
+        void getHNOTSized(X& x, NAME name)
+        {
+            static_assert(sizeof(X) == size);
+            getHNOT(x, name);
+        }
+
+        // Get data of a given type/size, including subrecord header
+        template <typename X>
+        void getHT(X& x)
+        {
+            getSubHeader();
+            if (mCtx.leftSub != sizeof(X))
+                reportSubSizeMismatch(sizeof(X), mCtx.leftSub);
+            getT(x);
+        }
+
+        template <typename T>
+        void skipHT()
+        {
+            getSubHeader();
+            if (mCtx.leftSub != sizeof(T))
+                reportSubSizeMismatch(sizeof(T), mCtx.leftSub);
+            skipT<T>();
+        }
+
+        // Version with extra size checking, to make sure the compiler
+        // doesn't mess up our struct padding.
+        template <std::size_t size, typename X>
+        void getHTSized(X& x)
+        {
+            static_assert(sizeof(X) == size);
+            getHT(x);
+        }
+
+        template <std::size_t size, typename T>
+        void skipHTSized()
+        {
+            static_assert(sizeof(T) == size);
+            skipHT<T>();
+        }
+
+        // Read a string by the given name if it is the next record.
+        std::string getHNOString(NAME name);
+
+        void skipHNOString(NAME name);
+
+        // Read a string with the given sub-record name
+        std::string getHNString(NAME name);
+
+        // Read a string, including the sub-record header (but not the name)
+        std::string getHString();
+
+        void skipHString();
+
+        // Read the given number of bytes from a subrecord
+        void getHExact(void* p, int size);
+
+        // Read the given number of bytes from a named subrecord
+        void getHNExact(void* p, int size, NAME name);
+
+        /*************************************************************************
+         *
+         *  Low level sub-record methods
+         *
+         *************************************************************************/
+
+        // Get the next subrecord name and check if it matches the parameter
+        void getSubNameIs(NAME name);
+
+        /** Checks if the next sub record name matches the parameter. If it
+            does, it is read into 'subName' just as if getSubName() was
+            called. If not, the read name will still be available for future
+            calls to getSubName(), isNextSub() and getSubNameIs().
+         */
+        bool isNextSub(NAME name);
+
+        bool peekNextSub(NAME name);
+
+        // Store the current subrecord name for the next call of getSubName()
+        void cacheSubName() { mCtx.subCached = true; };
+
+        // Read subrecord name. This gets called a LOT, so I've optimized it
+        // slightly.
+        void getSubName();
+
+        // Skip current sub record, including header (but not including
+        // name.)
+        void skipHSub();
+
+        // Skip sub record and check its size
+        void skipHSubSize(int size);
+
+        // Skip all subrecords until the given subrecord or no more subrecords remaining
+        void skipHSubUntil(NAME name);
+
+        /* Sub-record header. This updates leftRec beyond the current
+           sub-record as well. leftSub contains size of current sub-record.
+        */
+        void getSubHeader();
+
+        /*************************************************************************
+         *
+         *  Low level record methods
+         *
+         *************************************************************************/
+
+        // Get the next record name
+        NAME getRecName();
+
+        // Skip the rest of this record. Assumes the name and header have
+        // already been read
+        void skipRecord();
 
+        /* Read record header. This updatesleftFile BEYOND the data that
+           follows the header, ie beyond the entire record. You should use
+           leftRec to orient yourself inside the record itself.
+        */
+        void getRecHeader() { getRecHeader(mRecordFlags); }
+        void getRecHeader(uint32_t& flags);
 
-  /*************************************************************************
-   *
-   *  Lowest level data reading and misc methods
-   *
-   *************************************************************************/
+        bool hasMoreRecs() const { return mCtx.leftFile > 0; }
+        bool hasMoreSubs() const { return mCtx.leftRec > 0; }
 
-  template <typename X>
-  void getT(X &x) { getExact(&x, sizeof(X)); }
+        /*************************************************************************
+         *
+         *  Lowest level data reading and misc methods
+         *
+         *************************************************************************/
 
-  template <typename T>
-  void skipT() { skip(sizeof(T)); }
+        template <typename X>
+        void getT(X& x)
+        {
+            getExact(&x, sizeof(X));
+        }
 
-  void getExact(void* x, int size) { mEsm->read((char*)x, size); }
-  void getName(NAME &name) { getT(name); }
-  void getUint(uint32_t &u) { getT(u); }
+        template <typename T>
+        void skipT()
+        {
+            skip(sizeof(T));
+        }
 
-  // Read the next 'size' bytes and return them as a string. Converts
-  // them from native encoding to UTF8 in the process.
-  std::string getString(int size);
+        void getExact(void* x, int size) { mEsm->read((char*)x, size); }
+        void getName(NAME& name) { getT(name); }
+        void getUint(uint32_t& u) { getT(u); }
 
-    void skip(std::size_t bytes)
-    {
-        char buffer[4096];
-        if (bytes > std::size(buffer))
-            mEsm->seekg(getFileOffset() + bytes);
-        else
-            mEsm->read(buffer, bytes);
-    }
+        // Read the next 'size' bytes and return them as a string. Converts
+        // them from native encoding to UTF8 in the process.
+        std::string getString(int size);
 
-  /// Used for error handling
-  [[noreturn]] void fail(const std::string &msg);
+        void skip(std::size_t bytes)
+        {
+            char buffer[4096];
+            if (bytes > std::size(buffer))
+                mEsm->seekg(getFileOffset() + bytes);
+            else
+                mEsm->read(buffer, bytes);
+        }
 
-  /// Sets font encoder for ESM strings
-  void setEncoder(ToUTF8::Utf8Encoder* encoder) { mEncoder = encoder; };
+        /// Used for error handling
+        [[noreturn]] void fail(const std::string& msg);
 
-  /// Get record flags of last record
-  unsigned int getRecordFlags() { return mRecordFlags; }
+        /// Sets font encoder for ESM strings
+        void setEncoder(ToUTF8::Utf8Encoder* encoder) { mEncoder = encoder; };
 
-  size_t getFileSize() const { return mFileSize; }
+        /// Get record flags of last record
+        unsigned int getRecordFlags() { return mRecordFlags; }
 
-private:
-  [[noreturn]] void reportSubSizeMismatch(size_t want, size_t got) {
-          fail("record size mismatch, requested " +
-                  std::to_string(want) +
-                  ", got" +
-                  std::to_string(got));
-  }
+        size_t getFileSize() const { return mFileSize; }
 
-  void clearCtx();
+    private:
+        [[noreturn]] void reportSubSizeMismatch(size_t want, size_t got)
+        {
+            fail("record size mismatch, requested " + std::to_string(want) + ", got" + std::to_string(got));
+        }
 
-  std::unique_ptr<std::istream> mEsm;
+        void clearCtx();
 
-  ESM_Context mCtx;
+        std::unique_ptr<std::istream> mEsm;
 
-  unsigned int mRecordFlags;
+        ESM_Context mCtx;
 
-  // Special file signifier (see SpecialFile enum above)
+        unsigned int mRecordFlags;
 
-  // Buffer for ESM strings
-  std::vector<char> mBuffer;
+        // Special file signifier (see SpecialFile enum above)
 
-  Header mHeader;
+        // Buffer for ESM strings
+        std::vector<char> mBuffer;
 
-  ToUTF8::Utf8Encoder* mEncoder;
+        Header mHeader;
 
-  size_t mFileSize;
+        ToUTF8::Utf8Encoder* mEncoder;
 
-};
+        size_t mFileSize;
+    };
 }
 #endif
diff --git a/components/esm3/esmwriter.cpp b/components/esm3/esmwriter.cpp
index 351de8612a..3bde68ab66 100644
--- a/components/esm3/esmwriter.cpp
+++ b/components/esm3/esmwriter.cpp
@@ -16,7 +16,8 @@ namespace ESM
         , mRecordCount(0)
         , mCounting(true)
         , mHeader()
-    {}
+    {
+    }
 
     unsigned int ESMWriter::getVersion() const
     {
@@ -35,20 +36,20 @@ namespace ESM
 
     void ESMWriter::setAuthor(const std::string& auth)
     {
-        mHeader.mData.author.assign (auth);
+        mHeader.mData.author.assign(auth);
     }
 
     void ESMWriter::setDescription(const std::string& desc)
     {
-        mHeader.mData.desc.assign (desc);
+        mHeader.mData.desc.assign(desc);
     }
 
-    void ESMWriter::setRecordCount (int count)
+    void ESMWriter::setRecordCount(int count)
     {
         mHeader.mData.records = count;
     }
 
-    void ESMWriter::setFormat (int format)
+    void ESMWriter::setFormat(int format)
     {
         mHeader.mFormat = format;
     }
@@ -75,7 +76,7 @@ namespace ESM
 
         startRecord("TES3", 0);
 
-        mHeader.save (*this);
+        mHeader.save(*this);
 
         endRecord("TES3");
     }
@@ -83,7 +84,7 @@ namespace ESM
     void ESMWriter::close()
     {
         if (!mRecords.empty())
-            throw std::runtime_error ("Unclosed record remaining");
+            throw std::runtime_error("Unclosed record remaining");
     }
 
     void ESMWriter::startRecord(NAME name, uint32_t flags)
@@ -103,7 +104,7 @@ namespace ESM
         assert(mRecords.back().size == 0);
     }
 
-    void ESMWriter::startRecord (uint32_t name, uint32_t flags)
+    void ESMWriter::startRecord(uint32_t name, uint32_t flags)
     {
         startRecord(NAME(name), flags);
     }
@@ -111,7 +112,7 @@ namespace ESM
     void ESMWriter::startSubRecord(NAME name)
     {
         // Sub-record hierarchies are not properly supported in ESMReader. This should be fixed later.
-        assert (mRecords.size() <= 1);
+        assert(mRecords.size() <= 1);
 
         writeName(name);
         RecordData rec;
@@ -133,14 +134,13 @@ namespace ESM
         mStream->seekp(rec.position);
 
         mCounting = false;
-        write (reinterpret_cast<const char*> (&rec.size), sizeof(uint32_t));
+        write(reinterpret_cast<const char*>(&rec.size), sizeof(uint32_t));
         mCounting = true;
 
         mStream->seekp(0, std::ios::end);
-
     }
 
-    void ESMWriter::endRecord (uint32_t name)
+    void ESMWriter::endRecord(uint32_t name)
     {
         endRecord(NAME(name));
     }
@@ -161,7 +161,7 @@ namespace ESM
         if (data.size() < size)
         {
             for (size_t i = data.size(); i < size; ++i)
-                write("\0",1);
+                write("\0", 1);
         }
 
         endRecord(name);
@@ -192,7 +192,7 @@ namespace ESM
     void ESMWriter::writeHCString(const std::string& data)
     {
         writeHString(data);
-        if (data.size() > 0 && data[data.size()-1] != '\0')
+        if (data.size() > 0 && data[data.size() - 1] != '\0')
             write("\0", 1);
     }
 
diff --git a/components/esm3/esmwriter.hpp b/components/esm3/esmwriter.hpp
index ddb9844796..c182b686fd 100644
--- a/components/esm3/esmwriter.hpp
+++ b/components/esm3/esmwriter.hpp
@@ -16,8 +16,8 @@ namespace ToUTF8
 namespace ESM
 {
 
-class ESMWriter
-{
+    class ESMWriter
+    {
         struct RecordData
         {
             NAME name;
@@ -26,7 +26,6 @@ class ESMWriter
         };
 
     public:
-
         ESMWriter();
 
         unsigned int getVersion() const;
@@ -35,18 +34,18 @@ class ESMWriter
         // otherwise this data will be left uninitialized.
         void setVersion(unsigned int ver = 0x3fa66666);
         void setType(int type);
-        void setEncoder(ToUTF8::Utf8Encoder *encoding);
+        void setEncoder(ToUTF8::Utf8Encoder* encoding);
         void setAuthor(const std::string& author);
         void setDescription(const std::string& desc);
         void setHeader(const Header& value) { mHeader = value; }
 
         // Set the record count for writing it in the file header
-        void setRecordCount (int count);
+        void setRecordCount(int count);
         // Counts how many records we have actually written.
         // It is a good idea to compare this with the value you wrote into the header (setRecordCount)
         // It should be the record count you set + 1 (1 additional record for the TES3 header)
         int getRecordCount() { return mRecordCount; }
-        void setFormat (int format);
+        void setFormat(int format);
 
         void clearMaster();
 
@@ -77,7 +76,7 @@ class ESMWriter
                 writeHNCString(name, data);
         }
 
-        template<typename T>
+        template <typename T>
         void writeHNT(NAME name, const T& data)
         {
             startSubRecord(name);
@@ -85,7 +84,7 @@ class ESMWriter
             endRecord(name);
         }
 
-        template<typename T, std::size_t size>
+        template <typename T, std::size_t size>
         void writeHNT(NAME name, const T (&data)[size])
         {
             startSubRecord(name);
@@ -100,10 +99,10 @@ class ESMWriter
 
         void writeT(NAME data) = delete;
 
-        template<typename T, std::size_t size>
+        template <typename T, std::size_t size>
         void writeHNT(NAME name, const T (&data)[size], int) = delete;
 
-        template<typename T>
+        template <typename T>
         void writeHNT(NAME name, const T& data, int size)
         {
             startSubRecord(name);
@@ -111,20 +110,20 @@ class ESMWriter
             endRecord(name);
         }
 
-        template<typename T>
+        template <typename T>
         void writeT(const T& data)
         {
             static_assert(!std::is_pointer_v<T>);
             write(reinterpret_cast<const char*>(&data), sizeof(T));
         }
 
-        template<typename T, std::size_t size>
+        template <typename T, std::size_t size>
         void writeT(const T (&data)[size])
         {
             write(reinterpret_cast<const char*>(data), size * sizeof(T));
         }
 
-        template<typename T>
+        template <typename T>
         void writeT(const T& data, size_t size)
         {
             static_assert(!std::is_pointer_v<T>);
diff --git a/components/esm3/filter.cpp b/components/esm3/filter.cpp
index 217b090b3a..e3c2a15b43 100644
--- a/components/esm3/filter.cpp
+++ b/components/esm3/filter.cpp
@@ -6,56 +6,56 @@
 namespace ESM
 {
 
-void Filter::load (ESMReader& esm, bool &isDeleted)
-{
-    isDeleted = false;
-    mRecordFlags = esm.getRecordFlags();
-
-    while (esm.hasMoreSubs())
+    void Filter::load(ESMReader& esm, bool& isDeleted)
     {
-        esm.getSubName();
-        uint32_t name = esm.retSubName().toInt();
-        switch (name)
+        isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
+
+        while (esm.hasMoreSubs())
         {
-            case SREC_NAME:
-                mId = esm.getHString();
-                break;
-            case fourCC("FILT"):
-                mFilter = esm.getHString();
-                break;
-            case fourCC("DESC"):
-                mDescription = esm.getHString();
-                break;
-            case SREC_DELE:
-                esm.skipHSub();
-                isDeleted = true;
-                break;
-            default:
-                esm.fail("Unknown subrecord");
-                break;
+            esm.getSubName();
+            uint32_t name = esm.retSubName().toInt();
+            switch (name)
+            {
+                case SREC_NAME:
+                    mId = esm.getHString();
+                    break;
+                case fourCC("FILT"):
+                    mFilter = esm.getHString();
+                    break;
+                case fourCC("DESC"):
+                    mDescription = esm.getHString();
+                    break;
+                case SREC_DELE:
+                    esm.skipHSub();
+                    isDeleted = true;
+                    break;
+                default:
+                    esm.fail("Unknown subrecord");
+                    break;
+            }
         }
     }
-}
 
-void Filter::save (ESMWriter& esm, bool isDeleted) const
-{
-    esm.writeHNCString ("NAME", mId);
-
-    if (isDeleted)
+    void Filter::save(ESMWriter& esm, bool isDeleted) const
     {
-        esm.writeHNString("DELE", "", 3);
-        return;
-    }
+        esm.writeHNCString("NAME", mId);
 
-    esm.writeHNCString ("FILT", mFilter);
-    esm.writeHNCString ("DESC", mDescription);
-}
+        if (isDeleted)
+        {
+            esm.writeHNString("DELE", "", 3);
+            return;
+        }
 
-void Filter::blank()
-{
-    mRecordFlags = 0;
-    mFilter.clear();
-    mDescription.clear();
-}
+        esm.writeHNCString("FILT", mFilter);
+        esm.writeHNCString("DESC", mDescription);
+    }
+
+    void Filter::blank()
+    {
+        mRecordFlags = 0;
+        mFilter.clear();
+        mDescription.clear();
+    }
 
 }
diff --git a/components/esm3/filter.hpp b/components/esm3/filter.hpp
index 2284718d8f..d6710739c3 100644
--- a/components/esm3/filter.hpp
+++ b/components/esm3/filter.hpp
@@ -1,8 +1,8 @@
 #ifndef COMPONENTS_ESM_FILTER_H
 #define COMPONENTS_ESM_FILTER_H
 
-#include <string>
 #include "components/esm/defs.hpp"
+#include <string>
 
 namespace ESM
 {
@@ -13,7 +13,6 @@ namespace ESM
     {
         constexpr static RecNameInts sRecordId = REC_FILT;
 
-
         unsigned int mRecordFlags;
         std::string mId;
 
@@ -21,8 +20,8 @@ namespace ESM
 
         std::string mFilter;
 
-        void load (ESMReader& esm, bool &isDeleted);
-        void save (ESMWriter& esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
         void blank();
         ///< Set record to default state (does not touch the ID).
diff --git a/components/esm3/fogstate.cpp b/components/esm3/fogstate.cpp
index 948e0c49b4..20f46e4f5f 100644
--- a/components/esm3/fogstate.cpp
+++ b/components/esm3/fogstate.cpp
@@ -12,91 +12,91 @@
 
 namespace ESM
 {
-namespace
-{
-void convertFogOfWar(std::vector<char>& imageData)
-{
-    if (imageData.empty())
-    {
-        return;
-    }
-
-    osgDB::ReaderWriter* tgaReader = osgDB::Registry::instance()->getReaderWriterForExtension("tga");
-    if (!tgaReader)
-    {
-        Log(Debug::Error) << "Error: Unable to load fog, can't find a tga ReaderWriter";
-        return;
-    }
-
-    Files::IMemStream in(imageData.data(), imageData.size());
-
-    osgDB::ReaderWriter::ReadResult result = tgaReader->readImage(in);
-    if (!result.success())
+    namespace
     {
-        Log(Debug::Error) << "Error: Failed to read fog: " << result.message() << " code " << result.status();
-        return;
-    }
+        void convertFogOfWar(std::vector<char>& imageData)
+        {
+            if (imageData.empty())
+            {
+                return;
+            }
+
+            osgDB::ReaderWriter* tgaReader = osgDB::Registry::instance()->getReaderWriterForExtension("tga");
+            if (!tgaReader)
+            {
+                Log(Debug::Error) << "Error: Unable to load fog, can't find a tga ReaderWriter";
+                return;
+            }
+
+            Files::IMemStream in(imageData.data(), imageData.size());
+
+            osgDB::ReaderWriter::ReadResult result = tgaReader->readImage(in);
+            if (!result.success())
+            {
+                Log(Debug::Error) << "Error: Failed to read fog: " << result.message() << " code " << result.status();
+                return;
+            }
+
+            osgDB::ReaderWriter* pngWriter = osgDB::Registry::instance()->getReaderWriterForExtension("png");
+            if (!pngWriter)
+            {
+                Log(Debug::Error) << "Error: Unable to write fog, can't find a png ReaderWriter";
+                return;
+            }
+
+            std::ostringstream ostream;
+            osgDB::ReaderWriter::WriteResult png = pngWriter->writeImage(*result.getImage(), ostream);
+            if (!png.success())
+            {
+                Log(Debug::Error) << "Error: Unable to write fog: " << png.message() << " code " << png.status();
+                return;
+            }
+
+            std::string str = ostream.str();
+            imageData = std::vector<char>(str.begin(), str.end());
+        }
 
-    osgDB::ReaderWriter* pngWriter = osgDB::Registry::instance()->getReaderWriterForExtension("png");
-    if (!pngWriter)
-    {
-        Log(Debug::Error) << "Error: Unable to write fog, can't find a png ReaderWriter";
-        return;
-    }
-
-    std::ostringstream ostream;
-    osgDB::ReaderWriter::WriteResult png = pngWriter->writeImage(*result.getImage(), ostream);
-    if (!png.success())
-    {
-        Log(Debug::Error) << "Error: Unable to write fog: " << png.message() << " code " << png.status();
-        return;
     }
 
-    std::string str = ostream.str();
-    imageData = std::vector<char>(str.begin(), str.end());
-}
-
-}
-
-void FogState::load (ESMReader &esm)
-{
-    esm.getHNOT(mBounds, "BOUN");
-    esm.getHNOT(mNorthMarkerAngle, "ANGL");
-    int dataFormat = esm.getFormat();
-    while (esm.isNextSub("FTEX"))
+    void FogState::load(ESMReader& esm)
     {
-        esm.getSubHeader();
-        FogTexture tex;
-
-        esm.getT(tex.mX);
-        esm.getT(tex.mY);
-
-        size_t imageSize = esm.getSubSize()-sizeof(int)*2;
-        tex.mImageData.resize(imageSize);
-        esm.getExact(&tex.mImageData[0], imageSize);
-
-        if (dataFormat < 7)
-            convertFogOfWar(tex.mImageData);
-
-        mFogTextures.push_back(tex);
+        esm.getHNOT(mBounds, "BOUN");
+        esm.getHNOT(mNorthMarkerAngle, "ANGL");
+        int dataFormat = esm.getFormat();
+        while (esm.isNextSub("FTEX"))
+        {
+            esm.getSubHeader();
+            FogTexture tex;
+
+            esm.getT(tex.mX);
+            esm.getT(tex.mY);
+
+            size_t imageSize = esm.getSubSize() - sizeof(int) * 2;
+            tex.mImageData.resize(imageSize);
+            esm.getExact(&tex.mImageData[0], imageSize);
+
+            if (dataFormat < 7)
+                convertFogOfWar(tex.mImageData);
+
+            mFogTextures.push_back(tex);
+        }
     }
-}
 
-void FogState::save (ESMWriter &esm, bool interiorCell) const
-{
-    if (interiorCell)
+    void FogState::save(ESMWriter& esm, bool interiorCell) const
     {
-        esm.writeHNT("BOUN", mBounds);
-        esm.writeHNT("ANGL", mNorthMarkerAngle);
+        if (interiorCell)
+        {
+            esm.writeHNT("BOUN", mBounds);
+            esm.writeHNT("ANGL", mNorthMarkerAngle);
+        }
+        for (std::vector<FogTexture>::const_iterator it = mFogTextures.begin(); it != mFogTextures.end(); ++it)
+        {
+            esm.startSubRecord("FTEX");
+            esm.writeT(it->mX);
+            esm.writeT(it->mY);
+            esm.write(&it->mImageData[0], it->mImageData.size());
+            esm.endRecord("FTEX");
+        }
     }
-    for (std::vector<FogTexture>::const_iterator it = mFogTextures.begin(); it != mFogTextures.end(); ++it)
-    {
-        esm.startSubRecord("FTEX");
-        esm.writeT(it->mX);
-        esm.writeT(it->mY);
-        esm.write(&it->mImageData[0], it->mImageData.size());
-        esm.endRecord("FTEX");
-    }
-}
 
 }
diff --git a/components/esm3/fogstate.hpp b/components/esm3/fogstate.hpp
index 4a5619e518..a95218ea58 100644
--- a/components/esm3/fogstate.hpp
+++ b/components/esm3/fogstate.hpp
@@ -30,8 +30,8 @@ namespace ESM
 
         std::vector<FogTexture> mFogTextures;
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm, bool interiorCell) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm, bool interiorCell) const;
     };
 }
 
diff --git a/components/esm3/globalmap.cpp b/components/esm3/globalmap.cpp
index 6a884c23a6..5fb58e8e7b 100644
--- a/components/esm3/globalmap.cpp
+++ b/components/esm3/globalmap.cpp
@@ -6,40 +6,40 @@
 namespace ESM
 {
 
-void GlobalMap::load (ESMReader &esm)
-{
-    esm.getHNT(mBounds, "BNDS");
-
-    esm.getSubNameIs("DATA");
-    esm.getSubHeader();
-    mImageData.resize(esm.getSubSize());
-    esm.getExact(mImageData.data(), mImageData.size());
-
-    while (esm.isNextSub("MRK_"))
+    void GlobalMap::load(ESMReader& esm)
     {
+        esm.getHNT(mBounds, "BNDS");
+
+        esm.getSubNameIs("DATA");
         esm.getSubHeader();
-        CellId cell;
-        esm.getT(cell.first);
-        esm.getT(cell.second);
-        mMarkers.insert(cell);
+        mImageData.resize(esm.getSubSize());
+        esm.getExact(mImageData.data(), mImageData.size());
+
+        while (esm.isNextSub("MRK_"))
+        {
+            esm.getSubHeader();
+            CellId cell;
+            esm.getT(cell.first);
+            esm.getT(cell.second);
+            mMarkers.insert(cell);
+        }
     }
-}
 
-void GlobalMap::save (ESMWriter &esm) const
-{
-    esm.writeHNT("BNDS", mBounds);
-
-    esm.startSubRecord("DATA");
-    esm.write(mImageData.data(), mImageData.size());
-    esm.endRecord("DATA");
-
-    for (std::set<CellId>::const_iterator it = mMarkers.begin(); it != mMarkers.end(); ++it)
+    void GlobalMap::save(ESMWriter& esm) const
     {
-        esm.startSubRecord("MRK_");
-        esm.writeT(it->first);
-        esm.writeT(it->second);
-        esm.endRecord("MRK_");
+        esm.writeHNT("BNDS", mBounds);
+
+        esm.startSubRecord("DATA");
+        esm.write(mImageData.data(), mImageData.size());
+        esm.endRecord("DATA");
+
+        for (std::set<CellId>::const_iterator it = mMarkers.begin(); it != mMarkers.end(); ++it)
+        {
+            esm.startSubRecord("MRK_");
+            esm.writeT(it->first);
+            esm.writeT(it->second);
+            esm.endRecord("MRK_");
+        }
     }
-}
 
 }
diff --git a/components/esm3/globalmap.hpp b/components/esm3/globalmap.hpp
index 593f8726b9..8aaf37e5e0 100644
--- a/components/esm3/globalmap.hpp
+++ b/components/esm3/globalmap.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_ESM_GLOBALMAP_H
 #define OPENMW_COMPONENTS_ESM_GLOBALMAP_H
 
-#include <vector>
 #include <set>
+#include <vector>
 
 #include "components/esm/defs.hpp"
 
@@ -18,7 +18,6 @@ namespace ESM
     {
         constexpr static RecNameInts sRecordId = REC_GMAP;
 
-
         // The minimum and maximum cell coordinates
         struct Bounds
         {
@@ -32,8 +31,8 @@ namespace ESM
         typedef std::pair<int, int> CellId;
         std::set<CellId> mMarkers;
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 
 }
diff --git a/components/esm3/globalscript.cpp b/components/esm3/globalscript.cpp
index 0eb1e31e9c..800a739437 100644
--- a/components/esm3/globalscript.cpp
+++ b/components/esm3/globalscript.cpp
@@ -6,36 +6,36 @@
 namespace ESM
 {
 
-void GlobalScript::load (ESMReader &esm)
-{
-    mId = esm.getHNString ("NAME");
+    void GlobalScript::load(ESMReader& esm)
+    {
+        mId = esm.getHNString("NAME");
 
-    mLocals.load (esm);
+        mLocals.load(esm);
 
-    mRunning = 0;
-    esm.getHNOT (mRunning, "RUN_");
+        mRunning = 0;
+        esm.getHNOT(mRunning, "RUN_");
 
-    mTargetRef.unset();
-    mTargetId = esm.getHNOString ("TARG");
-    if (esm.peekNextSub("FRMR"))
-        mTargetRef.load(esm, true, "FRMR");
-}
+        mTargetRef.unset();
+        mTargetId = esm.getHNOString("TARG");
+        if (esm.peekNextSub("FRMR"))
+            mTargetRef.load(esm, true, "FRMR");
+    }
 
-void GlobalScript::save (ESMWriter &esm) const
-{
-    esm.writeHNString ("NAME", mId);
+    void GlobalScript::save(ESMWriter& esm) const
+    {
+        esm.writeHNString("NAME", mId);
 
-    mLocals.save (esm);
+        mLocals.save(esm);
 
-    if (mRunning)
-        esm.writeHNT ("RUN_", mRunning);
+        if (mRunning)
+            esm.writeHNT("RUN_", mRunning);
 
-    if (!mTargetId.empty())
-    {
-        esm.writeHNOString ("TARG", mTargetId);
-        if (mTargetRef.isSet())
-            mTargetRef.save (esm, true, "FRMR");
+        if (!mTargetId.empty())
+        {
+            esm.writeHNOString("TARG", mTargetId);
+            if (mTargetRef.isSet())
+                mTargetRef.save(esm, true, "FRMR");
+        }
     }
-}
 
 }
diff --git a/components/esm3/globalscript.hpp b/components/esm3/globalscript.hpp
index 1a1a6cf4eb..e595e61195 100644
--- a/components/esm3/globalscript.hpp
+++ b/components/esm3/globalscript.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_ESM_GLOBALSCRIPT_H
 #define OPENMW_ESM_GLOBALSCRIPT_H
 
-#include "locals.hpp"
 #include "cellref.hpp"
+#include "locals.hpp"
 
 namespace ESM
 {
@@ -19,8 +19,8 @@ namespace ESM
         std::string mTargetId; // for targeted scripts
         RefNum mTargetRef;
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 }
 
diff --git a/components/esm3/inventorystate.cpp b/components/esm3/inventorystate.cpp
index c25ef27369..000fbde997 100644
--- a/components/esm3/inventorystate.cpp
+++ b/components/esm3/inventorystate.cpp
@@ -8,170 +8,172 @@
 namespace ESM
 {
 
-void InventoryState::load (ESMReader &esm)
-{
-    // obsolete
-    int index = 0;
-    while (esm.isNextSub ("IOBJ"))
+    void InventoryState::load(ESMReader& esm)
     {
-        int unused; // no longer used
-        esm.getHT(unused);
-
-        ObjectState state;
-
         // obsolete
-        if (esm.isNextSub("SLOT"))
+        int index = 0;
+        while (esm.isNextSub("IOBJ"))
         {
-            int slot;
-            esm.getHT(slot);
-            mEquipmentSlots[index] = slot;
-        }
+            int unused; // no longer used
+            esm.getHT(unused);
 
-        state.mRef.loadId(esm, true);
-        state.load (esm);
+            ObjectState state;
 
-        if (state.mCount == 0)
-            continue;
+            // obsolete
+            if (esm.isNextSub("SLOT"))
+            {
+                int slot;
+                esm.getHT(slot);
+                mEquipmentSlots[index] = slot;
+            }
 
-        mItems.push_back (state);
+            state.mRef.loadId(esm, true);
+            state.load(esm);
 
-        ++index;
-    }
+            if (state.mCount == 0)
+                continue;
 
-    int itemsCount = 0;
-    esm.getHNOT(itemsCount, "ICNT");
-    for (int i = 0; i < itemsCount; i++)
-    {
-        ObjectState state;
+            mItems.push_back(state);
 
-        state.mRef.loadId(esm, true);
-        state.load (esm);
+            ++index;
+        }
 
-        if (state.mCount == 0)
-            continue;
+        int itemsCount = 0;
+        esm.getHNOT(itemsCount, "ICNT");
+        for (int i = 0; i < itemsCount; i++)
+        {
+            ObjectState state;
 
-        mItems.push_back (state);
-    }
+            state.mRef.loadId(esm, true);
+            state.load(esm);
 
-    //Next item is Levelled item
-    while (esm.isNextSub("LEVM"))
-    {
-        //Get its name
-        std::string id = esm.getHString();
-        int count;
-        std::string parentGroup;
-        //Then get its count
-        esm.getHNT (count, "COUN");
-        //Old save formats don't have information about parent group; check for that
-        if(esm.isNextSub("LGRP"))
-            //Newest saves contain parent group
-            parentGroup = esm.getHString();
-        mLevelledItemMap[std::make_pair(id, parentGroup)] = count;
-    }
+            if (state.mCount == 0)
+                continue;
 
-    while (esm.isNextSub("MAGI"))
-    {
-        std::string id = esm.getHString();
+            mItems.push_back(state);
+        }
 
-        std::vector<std::pair<float, float> > params;
-        while (esm.isNextSub("RAND"))
+        // Next item is Levelled item
+        while (esm.isNextSub("LEVM"))
         {
-            float rand, multiplier;
-            esm.getHT (rand);
-            esm.getHNT (multiplier, "MULT");
-            params.emplace_back(rand, multiplier);
+            // Get its name
+            std::string id = esm.getHString();
+            int count;
+            std::string parentGroup;
+            // Then get its count
+            esm.getHNT(count, "COUN");
+            // Old save formats don't have information about parent group; check for that
+            if (esm.isNextSub("LGRP"))
+                // Newest saves contain parent group
+                parentGroup = esm.getHString();
+            mLevelledItemMap[std::make_pair(id, parentGroup)] = count;
         }
-        mPermanentMagicEffectMagnitudes[id] = params;
-    }
 
-    while (esm.isNextSub("EQUI"))
-    {
-        esm.getSubHeader();
-        int equipIndex;
-        esm.getT(equipIndex);
-        int slot;
-        esm.getT(slot);
-        mEquipmentSlots[equipIndex] = slot;
-    }
+        while (esm.isNextSub("MAGI"))
+        {
+            std::string id = esm.getHString();
+
+            std::vector<std::pair<float, float>> params;
+            while (esm.isNextSub("RAND"))
+            {
+                float rand, multiplier;
+                esm.getHT(rand);
+                esm.getHNT(multiplier, "MULT");
+                params.emplace_back(rand, multiplier);
+            }
+            mPermanentMagicEffectMagnitudes[id] = params;
+        }
 
-    if (esm.isNextSub("EQIP"))
-    {
-        esm.getSubHeader();
-        int slotsCount = 0;
-        esm.getT(slotsCount);
-        for (int i = 0; i < slotsCount; i++)
+        while (esm.isNextSub("EQUI"))
         {
+            esm.getSubHeader();
             int equipIndex;
             esm.getT(equipIndex);
             int slot;
             esm.getT(slot);
             mEquipmentSlots[equipIndex] = slot;
         }
-    }
-
-    mSelectedEnchantItem = -1;
-    esm.getHNOT(mSelectedEnchantItem, "SELE");
 
-    // Old saves had restocking levelled items in a special map
-    // This turns items from that map into negative quantities
-    for(const auto& entry : mLevelledItemMap)
-    {
-        const std::string& id = entry.first.first;
-        const int count = entry.second;
-        for(auto& item : mItems)
+        if (esm.isNextSub("EQIP"))
         {
-            if(item.mCount == count && Misc::StringUtils::ciEqual(id, item.mRef.mRefID))
-                item.mCount = -count;
+            esm.getSubHeader();
+            int slotsCount = 0;
+            esm.getT(slotsCount);
+            for (int i = 0; i < slotsCount; i++)
+            {
+                int equipIndex;
+                esm.getT(equipIndex);
+                int slot;
+                esm.getT(slot);
+                mEquipmentSlots[equipIndex] = slot;
+            }
         }
-    }
-}
 
-void InventoryState::save (ESMWriter &esm) const
-{
-    int itemsCount = static_cast<int>(mItems.size());
-    if (itemsCount > 0)
-    {
-        esm.writeHNT ("ICNT", itemsCount);
-        for (const ObjectState& state : mItems)
+        mSelectedEnchantItem = -1;
+        esm.getHNOT(mSelectedEnchantItem, "SELE");
+
+        // Old saves had restocking levelled items in a special map
+        // This turns items from that map into negative quantities
+        for (const auto& entry : mLevelledItemMap)
         {
-            state.save (esm, true);
+            const std::string& id = entry.first.first;
+            const int count = entry.second;
+            for (auto& item : mItems)
+            {
+                if (item.mCount == count && Misc::StringUtils::ciEqual(id, item.mRef.mRefID))
+                    item.mCount = -count;
+            }
         }
     }
 
-    for (std::map<std::pair<std::string, std::string>, int>::const_iterator it = mLevelledItemMap.begin(); it != mLevelledItemMap.end(); ++it)
+    void InventoryState::save(ESMWriter& esm) const
     {
-        esm.writeHNString ("LEVM", it->first.first);
-        esm.writeHNT ("COUN", it->second);
-        esm.writeHNString("LGRP", it->first.second);
-    }
+        int itemsCount = static_cast<int>(mItems.size());
+        if (itemsCount > 0)
+        {
+            esm.writeHNT("ICNT", itemsCount);
+            for (const ObjectState& state : mItems)
+            {
+                state.save(esm, true);
+            }
+        }
 
-    for (TEffectMagnitudes::const_iterator it = mPermanentMagicEffectMagnitudes.begin(); it != mPermanentMagicEffectMagnitudes.end(); ++it)
-    {
-        esm.writeHNString("MAGI", it->first);
+        for (std::map<std::pair<std::string, std::string>, int>::const_iterator it = mLevelledItemMap.begin();
+             it != mLevelledItemMap.end(); ++it)
+        {
+            esm.writeHNString("LEVM", it->first.first);
+            esm.writeHNT("COUN", it->second);
+            esm.writeHNString("LGRP", it->first.second);
+        }
 
-        const std::vector<std::pair<float, float> >& params = it->second;
-        for (std::vector<std::pair<float, float> >::const_iterator pIt = params.begin(); pIt != params.end(); ++pIt)
+        for (TEffectMagnitudes::const_iterator it = mPermanentMagicEffectMagnitudes.begin();
+             it != mPermanentMagicEffectMagnitudes.end(); ++it)
         {
-            esm.writeHNT ("RAND", pIt->first);
-            esm.writeHNT ("MULT", pIt->second);
+            esm.writeHNString("MAGI", it->first);
+
+            const std::vector<std::pair<float, float>>& params = it->second;
+            for (std::vector<std::pair<float, float>>::const_iterator pIt = params.begin(); pIt != params.end(); ++pIt)
+            {
+                esm.writeHNT("RAND", pIt->first);
+                esm.writeHNT("MULT", pIt->second);
+            }
         }
-    }
 
-    int slotsCount = static_cast<int>(mEquipmentSlots.size());
-    if (slotsCount > 0)
-    {
-        esm.startSubRecord("EQIP");
-        esm.writeT(slotsCount);
-        for (std::map<int, int>::const_iterator it = mEquipmentSlots.begin(); it != mEquipmentSlots.end(); ++it)
+        int slotsCount = static_cast<int>(mEquipmentSlots.size());
+        if (slotsCount > 0)
         {
-            esm.writeT(it->first);
-            esm.writeT(it->second);
+            esm.startSubRecord("EQIP");
+            esm.writeT(slotsCount);
+            for (std::map<int, int>::const_iterator it = mEquipmentSlots.begin(); it != mEquipmentSlots.end(); ++it)
+            {
+                esm.writeT(it->first);
+                esm.writeT(it->second);
+            }
+            esm.endRecord("EQIP");
         }
-        esm.endRecord("EQIP");
-    }
 
-    if (mSelectedEnchantItem != -1)
-        esm.writeHNT ("SELE", mSelectedEnchantItem);
-}
+        if (mSelectedEnchantItem != -1)
+            esm.writeHNT("SELE", mSelectedEnchantItem);
+    }
 
 }
diff --git a/components/esm3/inventorystate.hpp b/components/esm3/inventorystate.hpp
index f4bb0ab487..0a15357260 100644
--- a/components/esm3/inventorystate.hpp
+++ b/components/esm3/inventorystate.hpp
@@ -22,16 +22,19 @@ namespace ESM
 
         std::map<std::pair<std::string, std::string>, int> mLevelledItemMap;
 
-        typedef std::map<std::string, std::vector<std::pair<float, float> > > TEffectMagnitudes;
+        typedef std::map<std::string, std::vector<std::pair<float, float>>> TEffectMagnitudes;
         TEffectMagnitudes mPermanentMagicEffectMagnitudes;
 
         int mSelectedEnchantItem; // For inventories only
 
-        InventoryState() : mSelectedEnchantItem(-1) {}
+        InventoryState()
+            : mSelectedEnchantItem(-1)
+        {
+        }
         virtual ~InventoryState() {}
 
-        virtual void load (ESMReader &esm);
-        virtual void save (ESMWriter &esm) const;
+        virtual void load(ESMReader& esm);
+        virtual void save(ESMWriter& esm) const;
     };
 }
 
diff --git a/components/esm3/journalentry.cpp b/components/esm3/journalentry.cpp
index 869a5df29e..d47f212143 100644
--- a/components/esm3/journalentry.cpp
+++ b/components/esm3/journalentry.cpp
@@ -6,38 +6,38 @@
 namespace ESM
 {
 
-void JournalEntry::load (ESMReader &esm)
-{
-    esm.getHNOT (mType, "JETY");
-    mTopic = esm.getHNString ("YETO");
-    mInfo = esm.getHNString ("YEIN");
-    mText = esm.getHNString ("TEXT");
-
-    if (mType==Type_Journal)
+    void JournalEntry::load(ESMReader& esm)
     {
-        esm.getHNT (mDay, "JEDA");
-        esm.getHNT (mMonth, "JEMO");
-        esm.getHNT (mDayOfMonth, "JEDM");
-    }
-    else if (mType==Type_Topic)
-        mActorName = esm.getHNOString("ACT_");
-}
+        esm.getHNOT(mType, "JETY");
+        mTopic = esm.getHNString("YETO");
+        mInfo = esm.getHNString("YEIN");
+        mText = esm.getHNString("TEXT");
 
-void JournalEntry::save (ESMWriter &esm) const
-{
-    esm.writeHNT ("JETY", mType);
-    esm.writeHNString ("YETO", mTopic);
-    esm.writeHNString ("YEIN", mInfo);
-    esm.writeHNString ("TEXT", mText);
+        if (mType == Type_Journal)
+        {
+            esm.getHNT(mDay, "JEDA");
+            esm.getHNT(mMonth, "JEMO");
+            esm.getHNT(mDayOfMonth, "JEDM");
+        }
+        else if (mType == Type_Topic)
+            mActorName = esm.getHNOString("ACT_");
+    }
 
-    if (mType==Type_Journal)
+    void JournalEntry::save(ESMWriter& esm) const
     {
-        esm.writeHNT ("JEDA", mDay);
-        esm.writeHNT ("JEMO", mMonth);
-        esm.writeHNT ("JEDM", mDayOfMonth);
+        esm.writeHNT("JETY", mType);
+        esm.writeHNString("YETO", mTopic);
+        esm.writeHNString("YEIN", mInfo);
+        esm.writeHNString("TEXT", mText);
+
+        if (mType == Type_Journal)
+        {
+            esm.writeHNT("JEDA", mDay);
+            esm.writeHNT("JEMO", mMonth);
+            esm.writeHNT("JEDM", mDayOfMonth);
+        }
+        else if (mType == Type_Topic)
+            esm.writeHNString("ACT_", mActorName);
     }
-    else if (mType==Type_Topic)
-        esm.writeHNString ("ACT_", mActorName);
-}
 
 }
diff --git a/components/esm3/journalentry.hpp b/components/esm3/journalentry.hpp
index 76901a4b69..a2d16bd0f3 100644
--- a/components/esm3/journalentry.hpp
+++ b/components/esm3/journalentry.hpp
@@ -23,13 +23,14 @@ namespace ESM
         std::string mTopic;
         std::string mInfo;
         std::string mText;
-        std::string mActorName; // Could also be Actor ID to allow switching of localisation, but since mText is plaintext anyway...
+        std::string mActorName; // Could also be Actor ID to allow switching of localisation, but since mText is
+                                // plaintext anyway...
         int mDay; // time stamp
         int mMonth;
         int mDayOfMonth;
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 }
 
diff --git a/components/esm3/loadacti.cpp b/components/esm3/loadacti.cpp
index 4ef11f8563..dd28130b0c 100644
--- a/components/esm3/loadacti.cpp
+++ b/components/esm3/loadacti.cpp
@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    void Activator::load(ESMReader &esm, bool &isDeleted)
+    void Activator::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -42,7 +42,7 @@ namespace ESM
         if (!hasName)
             esm.fail("Missing NAME subrecord");
     }
-    void Activator::save(ESMWriter &esm, bool isDeleted) const
+    void Activator::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
diff --git a/components/esm3/loadacti.hpp b/components/esm3/loadacti.hpp
index e0dac3f85a..958e18310f 100644
--- a/components/esm3/loadacti.hpp
+++ b/components/esm3/loadacti.hpp
@@ -1,31 +1,31 @@
 #ifndef OPENMW_ESM_ACTI_H
 #define OPENMW_ESM_ACTI_H
 
-#include <string>
 #include "components/esm/defs.hpp"
+#include <string>
 
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-struct Activator
-{
-    constexpr static RecNameInts sRecordId = REC_ACTI;
+    struct Activator
+    {
+        constexpr static RecNameInts sRecordId = REC_ACTI;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Activator"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Activator"; }
 
-    unsigned int mRecordFlags;
-    std::string mId, mName, mScript, mModel;
+        unsigned int mRecordFlags;
+        std::string mId, mName, mScript, mModel;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-};
+        void blank();
+        ///< Set record to default state (does not touch the ID).
+    };
 
 }
 #endif
diff --git a/components/esm3/loadalch.cpp b/components/esm3/loadalch.cpp
index e6504c61d8..d2dae35ee4 100644
--- a/components/esm3/loadalch.cpp
+++ b/components/esm3/loadalch.cpp
@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    void Potion::load(ESMReader &esm, bool &isDeleted)
+    void Potion::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -57,7 +57,7 @@ namespace ESM
         if (!hasData && !isDeleted)
             esm.fail("Missing ALDT subrecord");
     }
-    void Potion::save(ESMWriter &esm, bool isDeleted) const
+    void Potion::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
diff --git a/components/esm3/loadalch.hpp b/components/esm3/loadalch.hpp
index 76d87bed63..3905a6f49b 100644
--- a/components/esm3/loadalch.hpp
+++ b/components/esm3/loadalch.hpp
@@ -3,45 +3,43 @@
 
 #include <string>
 
-#include "effectlist.hpp"
 #include "components/esm/defs.hpp"
+#include "effectlist.hpp"
 
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
-
-/*
- * Alchemy item (potions)
- */
-
-struct Potion
-{
-    constexpr static RecNameInts sRecordId = REC_ALCH;
-
+    class ESMReader;
+    class ESMWriter;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Potion"; }
+    /*
+     * Alchemy item (potions)
+     */
 
-    struct ALDTstruct
+    struct Potion
     {
-        float mWeight;
-        int mValue;
-        int mAutoCalc;
-    };
-    ALDTstruct mData;
+        constexpr static RecNameInts sRecordId = REC_ALCH;
+
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Potion"; }
 
-    unsigned int mRecordFlags;
-    std::string mId, mName, mModel, mIcon, mScript;
-    EffectList mEffects;
+        struct ALDTstruct
+        {
+            float mWeight;
+            int mValue;
+            int mAutoCalc;
+        };
+        ALDTstruct mData;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        unsigned int mRecordFlags;
+        std::string mId, mName, mModel, mIcon, mScript;
+        EffectList mEffects;
 
-    void blank();
-    ///< Set record to default state (does not touch the ID).
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
+        void blank();
+        ///< Set record to default state (does not touch the ID).
     };
 }
 #endif
diff --git a/components/esm3/loadappa.cpp b/components/esm3/loadappa.cpp
index 124d709973..4b33dc6aeb 100644
--- a/components/esm3/loadappa.cpp
+++ b/components/esm3/loadappa.cpp
@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    void Apparatus::load(ESMReader &esm, bool &isDeleted)
+    void Apparatus::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -53,7 +53,7 @@ namespace ESM
             esm.fail("Missing AADT subrecord");
     }
 
-    void Apparatus::save(ESMWriter &esm, bool isDeleted) const
+    void Apparatus::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
diff --git a/components/esm3/loadappa.hpp b/components/esm3/loadappa.hpp
index 67dd462523..5aa529597f 100644
--- a/components/esm3/loadappa.hpp
+++ b/components/esm3/loadappa.hpp
@@ -8,45 +8,45 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- * Alchemist apparatus
- */
+    /*
+     * Alchemist apparatus
+     */
 
-struct Apparatus
-{
-    constexpr static RecNameInts sRecordId = REC_APPA;
-
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Apparatus"; }
-
-    enum AppaType
+    struct Apparatus
     {
-        MortarPestle = 0,
-        Alembic = 1,
-        Calcinator = 2,
-        Retort = 3
+        constexpr static RecNameInts sRecordId = REC_APPA;
+
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Apparatus"; }
+
+        enum AppaType
+        {
+            MortarPestle = 0,
+            Alembic = 1,
+            Calcinator = 2,
+            Retort = 3
+        };
+
+        struct AADTstruct
+        {
+            int mType;
+            float mQuality;
+            float mWeight;
+            int mValue;
+        };
+
+        AADTstruct mData;
+        unsigned int mRecordFlags;
+        std::string mId, mModel, mIcon, mScript, mName;
+
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
+
+        void blank();
+        ///< Set record to default state (does not touch the ID).
     };
-
-    struct AADTstruct
-    {
-        int mType;
-        float mQuality;
-        float mWeight;
-        int mValue;
-    };
-
-    AADTstruct mData;
-    unsigned int mRecordFlags;
-    std::string mId, mModel, mIcon, mScript, mName;
-
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
-
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-};
 }
 #endif
diff --git a/components/esm3/loadarmo.cpp b/components/esm3/loadarmo.cpp
index 6b9225d883..babb9d2189 100644
--- a/components/esm3/loadarmo.cpp
+++ b/components/esm3/loadarmo.cpp
@@ -6,17 +6,16 @@
 namespace ESM
 {
 
-    void PartReferenceList::add(ESMReader &esm)
+    void PartReferenceList::add(ESMReader& esm)
     {
         PartReference pr;
         esm.getHT(pr.mPart); // The INDX byte
         pr.mMale = esm.getHNOString("BNAM");
         pr.mFemale = esm.getHNOString("CNAM");
         mParts.push_back(pr);
-
     }
 
-    void PartReferenceList::load(ESMReader &esm)
+    void PartReferenceList::load(ESMReader& esm)
     {
         mParts.clear();
         while (esm.isNextSub("INDX"))
@@ -25,7 +24,7 @@ namespace ESM
         }
     }
 
-    void PartReferenceList::save(ESMWriter &esm) const
+    void PartReferenceList::save(ESMWriter& esm) const
     {
         for (std::vector<PartReference>::const_iterator it = mParts.begin(); it != mParts.end(); ++it)
         {
@@ -35,7 +34,7 @@ namespace ESM
         }
     }
 
-    void Armor::load(ESMReader &esm, bool &isDeleted)
+    void Armor::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -91,7 +90,7 @@ namespace ESM
             esm.fail("Missing AODT subrecord");
     }
 
-    void Armor::save(ESMWriter &esm, bool isDeleted) const
+    void Armor::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
diff --git a/components/esm3/loadarmo.hpp b/components/esm3/loadarmo.hpp
index 3c16e9c6cf..84f37eb2e0 100644
--- a/components/esm3/loadarmo.hpp
+++ b/components/esm3/loadarmo.hpp
@@ -1,110 +1,110 @@
 #ifndef OPENMW_ESM_ARMO_H
 #define OPENMW_ESM_ARMO_H
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "components/esm/defs.hpp"
 
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
-
-enum PartReferenceType
-{
-    PRT_Head = 0,
-    PRT_Hair = 1,
-    PRT_Neck = 2,
-    PRT_Cuirass = 3,
-    PRT_Groin = 4,
-    PRT_Skirt = 5,
-    PRT_RHand = 6,
-    PRT_LHand = 7,
-    PRT_RWrist = 8,
-    PRT_LWrist = 9,
-    PRT_Shield = 10,
-    PRT_RForearm = 11,
-    PRT_LForearm = 12,
-    PRT_RUpperarm = 13,
-    PRT_LUpperarm = 14,
-    PRT_RFoot = 15,
-    PRT_LFoot = 16,
-    PRT_RAnkle = 17,
-    PRT_LAnkle = 18,
-    PRT_RKnee = 19,
-    PRT_LKnee = 20,
-    PRT_RLeg = 21,
-    PRT_LLeg = 22,
-    PRT_RPauldron = 23,
-    PRT_LPauldron = 24,
-    PRT_Weapon = 25,
-    PRT_Tail = 26,
-
-    PRT_Count = 27
-};
-
-// Reference to body parts
-struct PartReference
-{
-    unsigned char mPart; // possible values [0, 26]
-    std::string mMale, mFemale;
-};
-
-// A list of references to body parts
-struct PartReferenceList
-{
-    std::vector<PartReference> mParts;
-
-    /// Load one part, assumes the subrecord name was already read
-    void add(ESMReader &esm);
+    class ESMReader;
+    class ESMWriter;
 
-    /// TODO: remove this method. The ESM format does not guarantee that all Part subrecords follow one another.
-    void load(ESMReader &esm);
-    void save(ESMWriter &esm) const;
-};
-
-struct Armor
-{
-    constexpr static RecNameInts sRecordId = REC_ARMO;
-
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Armor"; }
-
-    enum Type
+    enum PartReferenceType
     {
-        Helmet = 0,
-        Cuirass = 1,
-        LPauldron = 2,
-        RPauldron = 3,
-        Greaves = 4,
-        Boots = 5,
-        LGauntlet = 6,
-        RGauntlet = 7,
-        Shield = 8,
-        LBracer = 9,
-        RBracer = 10
+        PRT_Head = 0,
+        PRT_Hair = 1,
+        PRT_Neck = 2,
+        PRT_Cuirass = 3,
+        PRT_Groin = 4,
+        PRT_Skirt = 5,
+        PRT_RHand = 6,
+        PRT_LHand = 7,
+        PRT_RWrist = 8,
+        PRT_LWrist = 9,
+        PRT_Shield = 10,
+        PRT_RForearm = 11,
+        PRT_LForearm = 12,
+        PRT_RUpperarm = 13,
+        PRT_LUpperarm = 14,
+        PRT_RFoot = 15,
+        PRT_LFoot = 16,
+        PRT_RAnkle = 17,
+        PRT_LAnkle = 18,
+        PRT_RKnee = 19,
+        PRT_LKnee = 20,
+        PRT_RLeg = 21,
+        PRT_LLeg = 22,
+        PRT_RPauldron = 23,
+        PRT_LPauldron = 24,
+        PRT_Weapon = 25,
+        PRT_Tail = 26,
+
+        PRT_Count = 27
     };
 
-    struct AODTstruct
+    // Reference to body parts
+    struct PartReference
     {
-        int mType;
-        float mWeight;
-        int mValue, mHealth, mEnchant, mArmor;
+        unsigned char mPart; // possible values [0, 26]
+        std::string mMale, mFemale;
     };
 
-    AODTstruct mData;
-    PartReferenceList mParts;
+    // A list of references to body parts
+    struct PartReferenceList
+    {
+        std::vector<PartReference> mParts;
 
-    unsigned int mRecordFlags;
-    std::string mId, mName, mModel, mIcon, mScript, mEnchant;
+        /// Load one part, assumes the subrecord name was already read
+        void add(ESMReader& esm);
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        /// TODO: remove this method. The ESM format does not guarantee that all Part subrecords follow one another.
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
+    };
 
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-};
+    struct Armor
+    {
+        constexpr static RecNameInts sRecordId = REC_ARMO;
+
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Armor"; }
+
+        enum Type
+        {
+            Helmet = 0,
+            Cuirass = 1,
+            LPauldron = 2,
+            RPauldron = 3,
+            Greaves = 4,
+            Boots = 5,
+            LGauntlet = 6,
+            RGauntlet = 7,
+            Shield = 8,
+            LBracer = 9,
+            RBracer = 10
+        };
+
+        struct AODTstruct
+        {
+            int mType;
+            float mWeight;
+            int mValue, mHealth, mEnchant, mArmor;
+        };
+
+        AODTstruct mData;
+        PartReferenceList mParts;
+
+        unsigned int mRecordFlags;
+        std::string mId, mName, mModel, mIcon, mScript, mEnchant;
+
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
+
+        void blank();
+        ///< Set record to default state (does not touch the ID).
+    };
 }
 #endif
diff --git a/components/esm3/loadbody.cpp b/components/esm3/loadbody.cpp
index 6b00d9a650..6ae084be1f 100644
--- a/components/esm3/loadbody.cpp
+++ b/components/esm3/loadbody.cpp
@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    void BodyPart::load(ESMReader &esm, bool &isDeleted)
+    void BodyPart::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -47,7 +47,7 @@ namespace ESM
             esm.fail("Missing BYDT subrecord");
     }
 
-    void BodyPart::save(ESMWriter &esm, bool isDeleted) const
+    void BodyPart::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
diff --git a/components/esm3/loadbody.hpp b/components/esm3/loadbody.hpp
index 7186b5bb52..2f146a05c1 100644
--- a/components/esm3/loadbody.hpp
+++ b/components/esm3/loadbody.hpp
@@ -1,73 +1,73 @@
 #ifndef OPENMW_ESM_BODY_H
 #define OPENMW_ESM_BODY_H
 
-#include <string>
 #include "components/esm/defs.hpp"
+#include <string>
 
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-struct BodyPart
-{
-    constexpr static RecNameInts sRecordId = REC_BODY;
+    struct BodyPart
+    {
+        constexpr static RecNameInts sRecordId = REC_BODY;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "BodyPart"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "BodyPart"; }
 
-    enum MeshPart
-    {
-        MP_Head = 0,
-        MP_Hair = 1,
-        MP_Neck = 2,
-        MP_Chest = 3,
-        MP_Groin = 4,
-        MP_Hand = 5,
-        MP_Wrist = 6,
-        MP_Forearm = 7,
-        MP_Upperarm = 8,
-        MP_Foot = 9,
-        MP_Ankle = 10,
-        MP_Knee = 11,
-        MP_Upperleg = 12,
-        MP_Clavicle = 13,
-        MP_Tail = 14,
+        enum MeshPart
+        {
+            MP_Head = 0,
+            MP_Hair = 1,
+            MP_Neck = 2,
+            MP_Chest = 3,
+            MP_Groin = 4,
+            MP_Hand = 5,
+            MP_Wrist = 6,
+            MP_Forearm = 7,
+            MP_Upperarm = 8,
+            MP_Foot = 9,
+            MP_Ankle = 10,
+            MP_Knee = 11,
+            MP_Upperleg = 12,
+            MP_Clavicle = 13,
+            MP_Tail = 14,
 
-        MP_Count = 15
-    };
+            MP_Count = 15
+        };
 
-    enum Flags
-    {
-        BPF_Female = 1,
-        BPF_NotPlayable = 2
-    };
+        enum Flags
+        {
+            BPF_Female = 1,
+            BPF_NotPlayable = 2
+        };
 
-    enum MeshType
-    {
-        MT_Skin = 0,
-        MT_Clothing = 1,
-        MT_Armor = 2
-    };
+        enum MeshType
+        {
+            MT_Skin = 0,
+            MT_Clothing = 1,
+            MT_Armor = 2
+        };
 
-    struct BYDTstruct
-    {
-        unsigned char mPart; // mesh part
-        unsigned char mVampire; // boolean
-        unsigned char mFlags;
-        unsigned char mType; // mesh type
-    };
+        struct BYDTstruct
+        {
+            unsigned char mPart; // mesh part
+            unsigned char mVampire; // boolean
+            unsigned char mFlags;
+            unsigned char mType; // mesh type
+        };
 
-    BYDTstruct mData;
-    unsigned int mRecordFlags;
-    std::string mId, mModel, mRace;
+        BYDTstruct mData;
+        unsigned int mRecordFlags;
+        std::string mId, mModel, mRace;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-};
+        void blank();
+        ///< Set record to default state (does not touch the ID).
+    };
 }
 #endif
diff --git a/components/esm3/loadbook.cpp b/components/esm3/loadbook.cpp
index 4bd04cd810..18400b3829 100644
--- a/components/esm3/loadbook.cpp
+++ b/components/esm3/loadbook.cpp
@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    void Book::load(ESMReader &esm, bool &isDeleted)
+    void Book::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -58,7 +58,7 @@ namespace ESM
         if (!hasData && !isDeleted)
             esm.fail("Missing BKDT subrecord");
     }
-    void Book::save(ESMWriter &esm, bool isDeleted) const
+    void Book::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
diff --git a/components/esm3/loadbook.hpp b/components/esm3/loadbook.hpp
index 0e4b83c7ea..b02759b8f0 100644
--- a/components/esm3/loadbook.hpp
+++ b/components/esm3/loadbook.hpp
@@ -1,41 +1,41 @@
 #ifndef OPENMW_ESM_BOOK_H
 #define OPENMW_ESM_BOOK_H
 
-#include <string>
 #include "components/esm/defs.hpp"
+#include <string>
 
 namespace ESM
 {
-/*
- * Books, magic scrolls, notes and so on
- */
+    /*
+     * Books, magic scrolls, notes and so on
+     */
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-struct Book
-{
-    constexpr static RecNameInts sRecordId = REC_BOOK;
+    struct Book
+    {
+        constexpr static RecNameInts sRecordId = REC_BOOK;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Book"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Book"; }
 
-    struct BKDTstruct
-    {
-        float mWeight;
-        int mValue, mIsScroll, mSkillId, mEnchant;
-    };
+        struct BKDTstruct
+        {
+            float mWeight;
+            int mValue, mIsScroll, mSkillId, mEnchant;
+        };
 
-    BKDTstruct mData;
-    std::string mName, mModel, mIcon, mScript, mEnchant, mText;
-    unsigned int mRecordFlags;
-    std::string mId;
+        BKDTstruct mData;
+        std::string mName, mModel, mIcon, mScript, mEnchant, mText;
+        unsigned int mRecordFlags;
+        std::string mId;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-};
+        void blank();
+        ///< Set record to default state (does not touch the ID).
+    };
 }
 #endif
diff --git a/components/esm3/loadbsgn.cpp b/components/esm3/loadbsgn.cpp
index 431a36a40f..516625f9da 100644
--- a/components/esm3/loadbsgn.cpp
+++ b/components/esm3/loadbsgn.cpp
@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    void BirthSign::load(ESMReader &esm, bool &isDeleted)
+    void BirthSign::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -48,7 +48,7 @@ namespace ESM
             esm.fail("Missing NAME subrecord");
     }
 
-    void BirthSign::save(ESMWriter &esm, bool isDeleted) const
+    void BirthSign::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
diff --git a/components/esm3/loadbsgn.hpp b/components/esm3/loadbsgn.hpp
index 89832d0a43..edb0b6adf0 100644
--- a/components/esm3/loadbsgn.hpp
+++ b/components/esm3/loadbsgn.hpp
@@ -3,33 +3,33 @@
 
 #include <string>
 
-#include "spelllist.hpp"
 #include "components/esm/defs.hpp"
+#include "spelllist.hpp"
 
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-struct BirthSign
-{
-    constexpr static RecNameInts sRecordId = REC_BSGN;
+    struct BirthSign
+    {
+        constexpr static RecNameInts sRecordId = REC_BSGN;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "BirthSign"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "BirthSign"; }
 
-    unsigned int mRecordFlags;
-    std::string mId, mName, mDescription, mTexture;
+        unsigned int mRecordFlags;
+        std::string mId, mName, mDescription, mTexture;
 
-    // List of powers and abilities that come with this birth sign.
-    SpellList mPowers;
+        // List of powers and abilities that come with this birth sign.
+        SpellList mPowers;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-    ///< Set record to default state (does not touch the ID/index).
-};
+        void blank();
+        ///< Set record to default state (does not touch the ID/index).
+    };
 }
 #endif
diff --git a/components/esm3/loadcell.cpp b/components/esm3/loadcell.cpp
index dc32ee6a43..f82190d78d 100644
--- a/components/esm3/loadcell.cpp
+++ b/components/esm3/loadcell.cpp
@@ -1,63 +1,63 @@
 #include "loadcell.hpp"
 
-#include <string>
 #include <limits>
 #include <list>
+#include <string>
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/strings/algorithm.hpp>
 
+#include "cellid.hpp"
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "cellid.hpp"
 
 namespace ESM
 {
-namespace
-{
-    ///< Translate 8bit/24bit code (stored in refNum.mIndex) into a proper refNum
-    void adjustRefNum (RefNum& refNum, const ESMReader& reader)
+    namespace
     {
-        unsigned int local = (refNum.mIndex & 0xff000000) >> 24;
-
-        // If we have an index value that does not make sense, assume that it was an addition
-        // by the present plugin (but a faulty one)
-        if (local && local <= reader.getParentFileIndices().size())
+        ///< Translate 8bit/24bit code (stored in refNum.mIndex) into a proper refNum
+        void adjustRefNum(RefNum& refNum, const ESMReader& reader)
         {
-            // If the most significant 8 bits are used, then this reference already exists.
-            // In this case, do not spawn a new reference, but overwrite the old one.
-            refNum.mIndex &= 0x00ffffff; // delete old plugin ID
-            refNum.mContentFile = reader.getParentFileIndices()[local-1];
-        }
-        else
-        {
-            // This is an addition by the present plugin. Set the corresponding plugin index.
-            refNum.mContentFile = reader.getIndex();
+            unsigned int local = (refNum.mIndex & 0xff000000) >> 24;
+
+            // If we have an index value that does not make sense, assume that it was an addition
+            // by the present plugin (but a faulty one)
+            if (local && local <= reader.getParentFileIndices().size())
+            {
+                // If the most significant 8 bits are used, then this reference already exists.
+                // In this case, do not spawn a new reference, but overwrite the old one.
+                refNum.mIndex &= 0x00ffffff; // delete old plugin ID
+                refNum.mContentFile = reader.getParentFileIndices()[local - 1];
+            }
+            else
+            {
+                // This is an addition by the present plugin. Set the corresponding plugin index.
+                refNum.mContentFile = reader.getIndex();
+            }
         }
     }
 }
-}
 
 namespace ESM
 {
     // Some overloaded compare operators.
-    bool operator== (const MovedCellRef& ref, const RefNum& refNum)
+    bool operator==(const MovedCellRef& ref, const RefNum& refNum)
     {
         return ref.mRefNum == refNum;
     }
 
-    bool operator== (const CellRef& ref, const RefNum& refNum)
+    bool operator==(const CellRef& ref, const RefNum& refNum)
     {
         return ref.mRefNum == refNum;
     }
 
-    void Cell::load(ESMReader &esm, bool &isDeleted, bool saveContext)
+    void Cell::load(ESMReader& esm, bool& isDeleted, bool saveContext)
     {
         loadNameAndData(esm, isDeleted);
         loadCell(esm, saveContext);
     }
 
-    void Cell::loadNameAndData(ESMReader &esm, bool &isDeleted)
+    void Cell::loadNameAndData(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
 
@@ -101,13 +101,13 @@ namespace ESM
         }
         else
         {
-            mCellId.mWorldspace = Misc::StringUtils::lowerCase (mName);
+            mCellId.mWorldspace = Misc::StringUtils::lowerCase(mName);
             mCellId.mIndex.mX = 0;
             mCellId.mIndex.mY = 0;
         }
     }
 
-    void Cell::loadCell(ESMReader &esm, bool saveContext)
+    void Cell::loadCell(ESMReader& esm, bool saveContext)
     {
         bool overriding = !mName.empty();
         bool isLoaded = false;
@@ -127,11 +127,12 @@ namespace ESM
                     float waterLevel;
                     esm.getHT(waterLevel);
                     mWaterInt = false;
-                    if(!std::isfinite(waterLevel))
+                    if (!std::isfinite(waterLevel))
                     {
-                        if(!overriding)
+                        if (!overriding)
                             mWater = std::numeric_limits<float>::max();
-                        Log(Debug::Warning) << "Warning: Encountered invalid water level in cell " << mName << " defined in " << esm.getContext().filename;
+                        Log(Debug::Warning) << "Warning: Encountered invalid water level in cell " << mName
+                                            << " defined in " << esm.getContext().filename;
                     }
                     else
                         mWater = waterLevel;
@@ -163,14 +164,14 @@ namespace ESM
         }
     }
 
-    void Cell::postLoad(ESMReader &esm)
+    void Cell::postLoad(ESMReader& esm)
     {
         // Save position of the cell references and move on
         mContextList.push_back(esm.getContext());
         esm.skipRecord();
     }
 
-    void Cell::save(ESMWriter &esm, bool isDeleted) const
+    void Cell::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mName);
         esm.writeHNT("DATA", mData, 12);
@@ -183,11 +184,13 @@ namespace ESM
 
         if (mData.mFlags & Interior)
         {
-            if (mWaterInt) {
-                int water =
-                    (mWater >= 0) ? (int) (mWater + 0.5) : (int) (mWater - 0.5);
+            if (mWaterInt)
+            {
+                int water = (mWater >= 0) ? (int)(mWater + 0.5) : (int)(mWater - 0.5);
                 esm.writeHNT("INTV", water);
-            } else {
+            }
+            else
+            {
                 esm.writeHNT("WHGT", mWater);
             }
 
@@ -209,15 +212,15 @@ namespace ESM
         }
     }
 
-    void Cell::saveTempMarker(ESMWriter &esm, int tempCount) const
+    void Cell::saveTempMarker(ESMWriter& esm, int tempCount) const
     {
         if (tempCount != 0)
             esm.writeHNT("NAM0", tempCount);
     }
 
-    void Cell::restore(ESMReader &esm, int iCtx) const
+    void Cell::restore(ESMReader& esm, int iCtx) const
     {
-        esm.restoreContext(mContextList.at (iCtx));
+        esm.restoreContext(mContextList.at(iCtx));
     }
 
     std::string Cell::getDescription() const
@@ -258,19 +261,19 @@ namespace ESM
 
         if (esm.peekNextSub("FRMR"))
         {
-            ref.load (esm, isDeleted);
+            ref.load(esm, isDeleted);
 
             // TODO: should count the number of temp refs and validate the number
 
             // Identify references belonging to a parent file and adapt the ID accordingly.
-            adjustRefNum (ref.mRefNum, esm);
+            adjustRefNum(ref.mRefNum, esm);
             return true;
         }
         return false;
     }
 
-    bool Cell::getNextRef(ESMReader& esm, CellRef& cellRef, bool& deleted, MovedCellRef& movedCellRef, bool& moved,
-        GetNextRefMode mode)
+    bool Cell::getNextRef(
+        ESMReader& esm, CellRef& cellRef, bool& deleted, MovedCellRef& movedCellRef, bool& moved, GetNextRefMode mode)
     {
         deleted = false;
         moved = false;
@@ -287,8 +290,7 @@ namespace ESM
         if (!esm.peekNextSub("FRMR"))
             return false;
 
-        if ((!moved && mode == GetNextRefMode::LoadOnlyMoved)
-                || (moved && mode == GetNextRefMode::LoadOnlyNotMoved))
+        if ((!moved && mode == GetNextRefMode::LoadOnlyMoved) || (moved && mode == GetNextRefMode::LoadOnlyNotMoved))
         {
             skipLoadCellRef(esm);
             return true;
@@ -300,12 +302,12 @@ namespace ESM
         return true;
     }
 
-    bool Cell::getNextMVRF(ESMReader &esm, MovedCellRef &mref)
+    bool Cell::getNextMVRF(ESMReader& esm, MovedCellRef& mref)
     {
         esm.getHT(mref.mRefNum.mIndex);
         esm.getHNOT(mref.mTarget, "CNDT");
 
-        adjustRefNum (mref.mRefNum, esm);
+        adjustRefNum(mref.mRefNum, esm);
 
         return true;
     }
diff --git a/components/esm3/loadcell.hpp b/components/esm3/loadcell.hpp
index 41876dfc6f..4ba10b93e2 100644
--- a/components/esm3/loadcell.hpp
+++ b/components/esm3/loadcell.hpp
@@ -1,14 +1,14 @@
 #ifndef OPENMW_ESM_CELL_H
 #define OPENMW_ESM_CELL_H
 
+#include <list>
 #include <string>
 #include <vector>
-#include <list>
 
-#include "components/esm/esmcommon.hpp"
-#include "components/esm/defs.hpp"
-#include "cellref.hpp"
 #include "cellid.hpp"
+#include "cellref.hpp"
+#include "components/esm/defs.hpp"
+#include "components/esm/esmcommon.hpp"
 
 namespace MWWorld
 {
@@ -17,192 +17,180 @@ namespace MWWorld
 
 namespace ESM
 {
-class ESMReader;
-class ESMWriter;
-
-/* Moved cell reference tracking object. This mainly stores the target cell
-        of the reference, so we can easily know where it has been moved when another
-        plugin tries to move it independently.
-    Unfortunately, we need to implement this here.
-    */
-class MovedCellRef
-{
-public:
-    RefNum mRefNum;
-
-    // Coordinates of target exterior cell
-    int mTarget[2];
-
-    // The content file format does not support moving objects to an interior cell.
-    // The save game format does support moving to interior cells, but uses a different mechanism
-    // (see the MovedRefTracker implementation in MWWorld::CellStore for more details).
-};
+    class ESMReader;
+    class ESMWriter;
+
+    /* Moved cell reference tracking object. This mainly stores the target cell
+            of the reference, so we can easily know where it has been moved when another
+            plugin tries to move it independently.
+        Unfortunately, we need to implement this here.
+        */
+    class MovedCellRef
+    {
+    public:
+        RefNum mRefNum;
 
-/// Overloaded compare operator used to search inside a list of cell refs.
-bool operator==(const MovedCellRef& ref, const RefNum& refNum);
-bool operator==(const CellRef& ref, const RefNum& refNum);
+        // Coordinates of target exterior cell
+        int mTarget[2];
 
-typedef std::list<MovedCellRef> MovedCellRefTracker;
-typedef std::list<std::pair<CellRef, bool> > CellRefTracker;
+        // The content file format does not support moving objects to an interior cell.
+        // The save game format does support moving to interior cells, but uses a different mechanism
+        // (see the MovedRefTracker implementation in MWWorld::CellStore for more details).
+    };
 
-struct CellRefTrackerPredicate
-{
-    RefNum mRefNum;
-
-    CellRefTrackerPredicate(const RefNum& refNum) : mRefNum(refNum) {}
-    bool operator() (const std::pair<CellRef, bool>& refdelPair) { return refdelPair.first == mRefNum; }
-};
-
-/* Cells hold data about objects, creatures, statics (rocks, walls,
-   buildings) and landscape (for exterior cells). Cells frequently
-   also has other associated LAND and PGRD records. Combined, all this
-   data can be huge, and we cannot load it all at startup. Instead,
-   the strategy we use is to remember the file position of each cell
-   (using ESMReader::getContext()) and jumping back into place
-   whenever we need to load a given cell.
- */
-struct Cell
-{
-    constexpr static RecNameInts sRecordId = REC_CELL;
+    /// Overloaded compare operator used to search inside a list of cell refs.
+    bool operator==(const MovedCellRef& ref, const RefNum& refNum);
+    bool operator==(const CellRef& ref, const RefNum& refNum);
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Cell"; }
+    typedef std::list<MovedCellRef> MovedCellRefTracker;
+    typedef std::list<std::pair<CellRef, bool>> CellRefTracker;
 
-    enum class GetNextRefMode
+    struct CellRefTrackerPredicate
     {
-        LoadAll,
-        LoadOnlyMoved,
-        LoadOnlyNotMoved,
+        RefNum mRefNum;
+
+        CellRefTrackerPredicate(const RefNum& refNum)
+            : mRefNum(refNum)
+        {
+        }
+        bool operator()(const std::pair<CellRef, bool>& refdelPair) { return refdelPair.first == mRefNum; }
     };
 
-  enum Flags
+    /* Cells hold data about objects, creatures, statics (rocks, walls,
+       buildings) and landscape (for exterior cells). Cells frequently
+       also has other associated LAND and PGRD records. Combined, all this
+       data can be huge, and we cannot load it all at startup. Instead,
+       the strategy we use is to remember the file position of each cell
+       (using ESMReader::getContext()) and jumping back into place
+       whenever we need to load a given cell.
+     */
+    struct Cell
     {
-      Interior  = 0x01, // Interior cell
-      HasWater  = 0x02, // Does this cell have a water surface
-      NoSleep   = 0x04, // Is it allowed to sleep here (without a bed)
-      QuasiEx   = 0x80  // Behave like exterior (Tribunal+), with
-                        // skybox and weather
-    };
+        constexpr static RecNameInts sRecordId = REC_CELL;
+
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Cell"; }
+
+        enum class GetNextRefMode
+        {
+            LoadAll,
+            LoadOnlyMoved,
+            LoadOnlyNotMoved,
+        };
+
+        enum Flags
+        {
+            Interior = 0x01, // Interior cell
+            HasWater = 0x02, // Does this cell have a water surface
+            NoSleep = 0x04, // Is it allowed to sleep here (without a bed)
+            QuasiEx = 0x80 // Behave like exterior (Tribunal+), with
+                           // skybox and weather
+        };
+
+        struct DATAstruct
+        {
+            int mFlags{ 0 };
+            int mX{ 0 }, mY{ 0 };
+        };
+
+        struct AMBIstruct
+        {
+            Color mAmbient{ 0 }, mSunlight{ 0 }, mFog{ 0 };
+            float mFogDensity{ 0.f };
+        };
+
+        Cell()
+            : mName("")
+            , mRegion("")
+            , mHasAmbi(true)
+            , mWater(0)
+            , mWaterInt(false)
+            , mMapColor(0)
+            , mRefNumCounter(0)
+        {
+        }
+
+        // Interior cells are indexed by this (it's the 'id'), for exterior
+        // cells it is optional.
+        std::string mName;
+
+        // Optional region name for exterior and quasi-exterior cells.
+        std::string mRegion;
+
+        std::vector<ESM_Context> mContextList; // File position; multiple positions for multiple plugin support
+        DATAstruct mData;
+        CellId mCellId;
+
+        AMBIstruct mAmbi;
+        bool mHasAmbi;
+
+        float mWater; // Water level
+        bool mWaterInt;
+        int mMapColor;
+        // Counter for RefNums. This is only used during content file editing and has no impact on gameplay.
+        // It prevents overwriting previous refNums, even if they were deleted.
+        // as that would collide with refs when a content file is upgraded.
+        int mRefNumCounter;
+
+        // References "leased" from another cell (i.e. a different cell
+        //  introduced this ref, and it has been moved here by a plugin)
+        CellRefTracker mLeasedRefs;
+        MovedCellRefTracker mMovedRefs;
+
+        void postLoad(ESMReader& esm);
+
+        // This method is left in for compatibility with esmtool. Parsing moved references currently requires
+        //  passing ESMStore, bit it does not know about this parameter, so we do it this way.
+        void load(ESMReader& esm, bool& isDeleted, bool saveContext = true); // Load everything (except references)
+        void loadNameAndData(ESMReader& esm, bool& isDeleted); // Load NAME and DATAstruct
+        void loadCell(
+            ESMReader& esm, bool saveContext = true); // Load everything, except NAME, DATAstruct and references
+
+        void save(ESMWriter& esm, bool isDeleted = false) const;
+        void saveTempMarker(ESMWriter& esm, int tempCount) const;
+
+        bool isExterior() const { return !(mData.mFlags & Interior); }
+
+        int getGridX() const { return mData.mX; }
+
+        int getGridY() const { return mData.mY; }
+
+        bool hasWater() const { return ((mData.mFlags & HasWater) != 0) || isExterior(); }
+
+        bool hasAmbient() const { return mHasAmbi; }
+
+        void setHasAmbient(bool hasAmbi) { mHasAmbi = hasAmbi; }
+
+        // Restore the given reader to the stored position. Will try to open
+        // the file matching the stored file name. If you want to read from
+        // somewhere other than the file system, you need to pre-open the
+        // ESMReader, and the filename must match the stored filename
+        // exactly.
+        void restore(ESMReader& esm, int iCtx) const;
+
+        std::string getDescription() const;
+        ///< Return a short string describing the cell (mostly used for debugging/logging purpose)
+
+        /* Get the next reference in this cell, if any. Returns false when
+           there are no more references in the cell.
+
+           All fields of the CellRef struct are overwritten. You can safely
+           reuse one memory location without blanking it between calls.
+        */
+        static bool getNextRef(ESMReader& esm, CellRef& ref, bool& deleted);
+
+        static bool getNextRef(ESMReader& esm, CellRef& cellRef, bool& deleted, MovedCellRef& movedCellRef, bool& moved,
+            GetNextRefMode mode = GetNextRefMode::LoadAll);
+
+        /* This fetches an MVRF record, which is used to track moved references.
+         * Since they are comparably rare, we use a separate method for this.
+         */
+        static bool getNextMVRF(ESMReader& esm, MovedCellRef& mref);
 
-  struct DATAstruct
-  {
-      int mFlags {0};
-      int mX {0}, mY {0};
-  };
-
-  struct AMBIstruct
-  {
-      Color mAmbient {0}, mSunlight {0}, mFog {0};
-      float mFogDensity {0.f};
-  };
-
-  Cell() : mName(""),
-           mRegion(""),
-           mHasAmbi(true),
-           mWater(0),
-           mWaterInt(false),
-           mMapColor(0),
-           mRefNumCounter(0)
-  {}
-
-  // Interior cells are indexed by this (it's the 'id'), for exterior
-  // cells it is optional.
-  std::string mName;
-
-  // Optional region name for exterior and quasi-exterior cells.
-  std::string mRegion;
-
-  std::vector<ESM_Context> mContextList; // File position; multiple positions for multiple plugin support
-  DATAstruct mData;
-  CellId mCellId;
-
-  AMBIstruct mAmbi;
-  bool mHasAmbi;
-
-  float mWater; // Water level
-  bool mWaterInt;
-  int mMapColor;
-  // Counter for RefNums. This is only used during content file editing and has no impact on gameplay.
-  // It prevents overwriting previous refNums, even if they were deleted.
-  // as that would collide with refs when a content file is upgraded.
-  int mRefNumCounter;
-
-  // References "leased" from another cell (i.e. a different cell
-  //  introduced this ref, and it has been moved here by a plugin)
-  CellRefTracker mLeasedRefs;
-  MovedCellRefTracker mMovedRefs;
-
-  void postLoad(ESMReader &esm);
-
-  // This method is left in for compatibility with esmtool. Parsing moved references currently requires
-  //  passing ESMStore, bit it does not know about this parameter, so we do it this way.
-  void load(ESMReader &esm, bool &isDeleted, bool saveContext = true); // Load everything (except references)
-  void loadNameAndData(ESMReader &esm, bool &isDeleted); // Load NAME and DATAstruct
-  void loadCell(ESMReader &esm, bool saveContext = true); // Load everything, except NAME, DATAstruct and references
-
-  void save(ESMWriter &esm, bool isDeleted = false) const;
-  void saveTempMarker(ESMWriter &esm, int tempCount) const;
-
-  bool isExterior() const
-  {
-      return !(mData.mFlags & Interior);
-  }
-
-  int getGridX() const
-  {
-      return mData.mX;
-  }
-
-  int getGridY() const
-  {
-      return mData.mY;
-  }
-
-  bool hasWater() const
-  {
-      return ((mData.mFlags&HasWater) != 0) || isExterior();
-  }
-
-  bool hasAmbient() const
-  {
-      return mHasAmbi;
-  }
-
-  void setHasAmbient(bool hasAmbi)
-  {
-      mHasAmbi = hasAmbi;
-  }
-
-  // Restore the given reader to the stored position. Will try to open
-  // the file matching the stored file name. If you want to read from
-  // somewhere other than the file system, you need to pre-open the
-  // ESMReader, and the filename must match the stored filename
-  // exactly.
-  void restore(ESMReader &esm, int iCtx) const;
-
-  std::string getDescription() const;
-  ///< Return a short string describing the cell (mostly used for debugging/logging purpose)
-
-  /* Get the next reference in this cell, if any. Returns false when
-     there are no more references in the cell.
-
-     All fields of the CellRef struct are overwritten. You can safely
-     reuse one memory location without blanking it between calls.
-  */
-    static bool getNextRef(ESMReader& esm, CellRef& ref, bool& deleted);
-
-    static bool getNextRef(ESMReader& esm, CellRef& cellRef, bool& deleted, MovedCellRef& movedCellRef, bool& moved,
-        GetNextRefMode mode = GetNextRefMode::LoadAll);
-
-  /* This fetches an MVRF record, which is used to track moved references.
-   * Since they are comparably rare, we use a separate method for this.
-   */
-  static bool getNextMVRF(ESMReader &esm, MovedCellRef &mref);
-
-    void blank();
-    ///< Set record to default state (does not touch the ID/index).
-
-    const CellId& getCellId() const;
-};
+        void blank();
+        ///< Set record to default state (does not touch the ID/index).
+
+        const CellId& getCellId() const;
+    };
 }
 #endif
diff --git a/components/esm3/loadclas.cpp b/components/esm3/loadclas.cpp
index 2166382013..ba03fda771 100644
--- a/components/esm3/loadclas.cpp
+++ b/components/esm3/loadclas.cpp
@@ -2,41 +2,34 @@
 
 #include <stdexcept>
 
+#include "components/esm/defs.hpp"
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    const Class::Specialization Class::sSpecializationIds[3] = {
-      Class::Combat,
-      Class::Magic,
-      Class::Stealth
-    };
-
-    const char *Class::sGmstSpecializationIds[3] = {
-      "sSpecializationCombat",
-      "sSpecializationMagic",
-      "sSpecializationStealth"
-    };
-
-    int& Class::CLDTstruct::getSkill (int index, bool major)
+    const Class::Specialization Class::sSpecializationIds[3] = { Class::Combat, Class::Magic, Class::Stealth };
+
+    const char* Class::sGmstSpecializationIds[3]
+        = { "sSpecializationCombat", "sSpecializationMagic", "sSpecializationStealth" };
+
+    int& Class::CLDTstruct::getSkill(int index, bool major)
     {
-        if (index<0 || index>=5)
-            throw std::logic_error ("skill index out of range");
+        if (index < 0 || index >= 5)
+            throw std::logic_error("skill index out of range");
 
         return mSkills[index][major ? 1 : 0];
     }
 
-    int Class::CLDTstruct::getSkill (int index, bool major) const
+    int Class::CLDTstruct::getSkill(int index, bool major) const
     {
-        if (index<0 || index>=5)
-            throw std::logic_error ("skill index out of range");
+        if (index < 0 || index >= 5)
+            throw std::logic_error("skill index out of range");
 
         return mSkills[index][major ? 1 : 0];
     }
 
-    void Class::load(ESMReader &esm, bool &isDeleted)
+    void Class::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -79,7 +72,7 @@ namespace ESM
         if (!hasData && !isDeleted)
             esm.fail("Missing CLDT subrecord");
     }
-    void Class::save(ESMWriter &esm, bool isDeleted) const
+    void Class::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
@@ -105,8 +98,8 @@ namespace ESM
         mData.mIsPlayable = 0;
         mData.mCalc = 0;
 
-        for (int i=0; i<5; ++i)
-            for (int i2=0; i2<2; ++i2)
+        for (int i = 0; i < 5; ++i)
+            for (int i2 = 0; i2 < 2; ++i2)
                 mData.mSkills[i][i2] = 0;
     }
 }
diff --git a/components/esm3/loadclas.hpp b/components/esm3/loadclas.hpp
index ce22622975..ece90ff6d6 100644
--- a/components/esm3/loadclas.hpp
+++ b/components/esm3/loadclas.hpp
@@ -8,81 +8,80 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- * Character class definitions
- */
+    /*
+     * Character class definitions
+     */
 
-// These flags tells us which items should be auto-calculated for this
-// class
-struct Class
-{
-    constexpr static RecNameInts sRecordId = REC_CLAS;
-
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Class"; }
-
-    enum AutoCalc
-    {
-        Weapon = 0x00001,
-        Armor = 0x00002,
-        Clothing = 0x00004,
-        Books = 0x00008,
-        Ingredient = 0x00010,
-        Lockpick = 0x00020,
-        Probe = 0x00040,
-        Lights = 0x00080,
-        Apparatus = 0x00100,
-        Repair = 0x00200,
-        Misc = 0x00400,
-        Spells = 0x00800,
-        MagicItems = 0x01000,
-        Potions = 0x02000,
-        Training = 0x04000,
-        Spellmaking = 0x08000,
-        Enchanting = 0x10000,
-        RepairItem = 0x20000
-    };
-
-    enum Specialization
+    // These flags tells us which items should be auto-calculated for this
+    // class
+    struct Class
     {
-        Combat = 0,
-        Magic = 1,
-        Stealth = 2
+        constexpr static RecNameInts sRecordId = REC_CLAS;
+
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Class"; }
+
+        enum AutoCalc
+        {
+            Weapon = 0x00001,
+            Armor = 0x00002,
+            Clothing = 0x00004,
+            Books = 0x00008,
+            Ingredient = 0x00010,
+            Lockpick = 0x00020,
+            Probe = 0x00040,
+            Lights = 0x00080,
+            Apparatus = 0x00100,
+            Repair = 0x00200,
+            Misc = 0x00400,
+            Spells = 0x00800,
+            MagicItems = 0x01000,
+            Potions = 0x02000,
+            Training = 0x04000,
+            Spellmaking = 0x08000,
+            Enchanting = 0x10000,
+            RepairItem = 0x20000
+        };
+
+        enum Specialization
+        {
+            Combat = 0,
+            Magic = 1,
+            Stealth = 2
+        };
+
+        static const Specialization sSpecializationIds[3];
+        static const char* sGmstSpecializationIds[3];
+
+        struct CLDTstruct
+        {
+            int mAttribute[2]; // Attributes that get class bonus
+            int mSpecialization; // 0 = Combat, 1 = Magic, 2 = Stealth
+            int mSkills[5][2]; // Minor and major skills.
+            int mIsPlayable; // 0x0001 - Playable class
+
+            // I have no idea how to autocalculate these items...
+            int mCalc;
+
+            int& getSkill(int index, bool major);
+            ///< Throws an exception for invalid values of \a index.
+
+            int getSkill(int index, bool major) const;
+            ///< Throws an exception for invalid values of \a index.
+        }; // 60 bytes
+
+        unsigned int mRecordFlags;
+        std::string mId, mName, mDescription;
+        CLDTstruct mData;
+
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
+
+        void blank();
+        ///< Set record to default state (does not touch the ID/index).
     };
-
-    static const Specialization sSpecializationIds[3];
-    static const char *sGmstSpecializationIds[3];
-
-    struct CLDTstruct
-    {
-        int mAttribute[2]; // Attributes that get class bonus
-        int mSpecialization; // 0 = Combat, 1 = Magic, 2 = Stealth
-        int mSkills[5][2]; // Minor and major skills.
-        int mIsPlayable; // 0x0001 - Playable class
-
-        // I have no idea how to autocalculate these items...
-        int mCalc;
-
-        int& getSkill (int index, bool major);
-        ///< Throws an exception for invalid values of \a index.
-
-        int getSkill (int index, bool major) const;
-        ///< Throws an exception for invalid values of \a index.
-    }; // 60 bytes
-
-    unsigned int mRecordFlags;
-    std::string mId, mName, mDescription;
-    CLDTstruct mData;
-
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
-
-    void blank();
-     ///< Set record to default state (does not touch the ID/index).
-
-};
 }
 #endif
diff --git a/components/esm3/loadclot.cpp b/components/esm3/loadclot.cpp
index a9a4121997..c69c92c301 100644
--- a/components/esm3/loadclot.cpp
+++ b/components/esm3/loadclot.cpp
@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    void Clothing::load(ESMReader &esm, bool &isDeleted)
+    void Clothing::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -61,7 +61,7 @@ namespace ESM
             esm.fail("Missing CTDT subrecord");
     }
 
-    void Clothing::save(ESMWriter &esm, bool isDeleted) const
+    void Clothing::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
diff --git a/components/esm3/loadclot.hpp b/components/esm3/loadclot.hpp
index d007e7f76e..b6e84c5017 100644
--- a/components/esm3/loadclot.hpp
+++ b/components/esm3/loadclot.hpp
@@ -3,59 +3,59 @@
 
 #include <string>
 
-#include "loadarmo.hpp"
 #include "components/esm/defs.hpp"
+#include "loadarmo.hpp"
 
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
-
-/*
- * Clothing
- */
-
-struct Clothing
-{
-    constexpr static RecNameInts sRecordId = REC_CLOT;
-
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Clothing"; }
+    class ESMReader;
+    class ESMWriter;
 
-    enum Type
-    {
-        Pants = 0,
-        Shoes = 1,
-        Shirt = 2,
-        Belt = 3,
-        Robe = 4,
-        RGlove = 5,
-        LGlove = 6,
-        Skirt = 7,
-        Ring = 8,
-        Amulet = 9
-    };
+    /*
+     * Clothing
+     */
 
-    struct CTDTstruct
+    struct Clothing
     {
-        int mType;
-        float mWeight;
-        unsigned short mValue;
-        unsigned short mEnchant;
+        constexpr static RecNameInts sRecordId = REC_CLOT;
+
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Clothing"; }
+
+        enum Type
+        {
+            Pants = 0,
+            Shoes = 1,
+            Shirt = 2,
+            Belt = 3,
+            Robe = 4,
+            RGlove = 5,
+            LGlove = 6,
+            Skirt = 7,
+            Ring = 8,
+            Amulet = 9
+        };
+
+        struct CTDTstruct
+        {
+            int mType;
+            float mWeight;
+            unsigned short mValue;
+            unsigned short mEnchant;
+        };
+        CTDTstruct mData;
+
+        PartReferenceList mParts;
+
+        unsigned int mRecordFlags;
+        std::string mId, mName, mModel, mIcon, mEnchant, mScript;
+
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
+
+        void blank();
+        ///< Set record to default state (does not touch the ID).
     };
-    CTDTstruct mData;
-
-    PartReferenceList mParts;
-
-    unsigned int mRecordFlags;
-    std::string mId, mName, mModel, mIcon, mEnchant, mScript;
-
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
-
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-};
 }
 #endif
diff --git a/components/esm3/loadcont.cpp b/components/esm3/loadcont.cpp
index 21ed46310a..a9ef424509 100644
--- a/components/esm3/loadcont.cpp
+++ b/components/esm3/loadcont.cpp
@@ -1,13 +1,13 @@
 #include "loadcont.hpp"
 
+#include "components/esm/defs.hpp"
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
 
-    void InventoryList::add(ESMReader &esm)
+    void InventoryList::add(ESMReader& esm)
     {
         esm.getSubHeader();
         ContItem ci;
@@ -16,7 +16,7 @@ namespace ESM
         mList.push_back(ci);
     }
 
-    void InventoryList::save(ESMWriter &esm) const
+    void InventoryList::save(ESMWriter& esm) const
     {
         for (std::vector<ContItem>::const_iterator it = mList.begin(); it != mList.end(); ++it)
         {
@@ -27,7 +27,7 @@ namespace ESM
         }
     }
 
-    void Container::load(ESMReader &esm, bool &isDeleted)
+    void Container::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -88,7 +88,7 @@ namespace ESM
             esm.fail("Missing FLAG subrecord");
     }
 
-    void Container::save(ESMWriter &esm, bool isDeleted) const
+    void Container::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
diff --git a/components/esm3/loadcont.hpp b/components/esm3/loadcont.hpp
index afef72ea80..8c51d39b78 100644
--- a/components/esm3/loadcont.hpp
+++ b/components/esm3/loadcont.hpp
@@ -9,56 +9,56 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- * Container definition
- */
+    /*
+     * Container definition
+     */
 
-struct ContItem
-{
-    int mCount{0};
-    std::string mItem;
-};
+    struct ContItem
+    {
+        int mCount{ 0 };
+        std::string mItem;
+    };
 
-/// InventoryList, NPCO subrecord
-struct InventoryList
-{
-    std::vector<ContItem> mList;
+    /// InventoryList, NPCO subrecord
+    struct InventoryList
+    {
+        std::vector<ContItem> mList;
 
-    /// Load one item, assumes subrecord name is already read
-    void add(ESMReader &esm);
+        /// Load one item, assumes subrecord name is already read
+        void add(ESMReader& esm);
 
-    void save(ESMWriter &esm) const;
-};
+        void save(ESMWriter& esm) const;
+    };
 
-struct Container
-{
-    constexpr static RecNameInts sRecordId = REC_CONT;
+    struct Container
+    {
+        constexpr static RecNameInts sRecordId = REC_CONT;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Container"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Container"; }
 
-    enum Flags
-    {
-        Organic = 1, // Objects cannot be placed in this container
-        Respawn = 2, // Respawns after 4 months
-        Unknown = 8
-    };
+        enum Flags
+        {
+            Organic = 1, // Objects cannot be placed in this container
+            Respawn = 2, // Respawns after 4 months
+            Unknown = 8
+        };
 
-    unsigned int mRecordFlags;
-    std::string mId, mName, mModel, mScript;
+        unsigned int mRecordFlags;
+        std::string mId, mName, mModel, mScript;
 
-    float mWeight; // Not sure, might be max total weight allowed?
-    int mFlags;
-    InventoryList mInventory;
+        float mWeight; // Not sure, might be max total weight allowed?
+        int mFlags;
+        InventoryList mInventory;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-};
+        void blank();
+        ///< Set record to default state (does not touch the ID).
+    };
 }
 #endif
diff --git a/components/esm3/loadcrea.cpp b/components/esm3/loadcrea.cpp
index 5f44f0f655..ac78b8f23a 100644
--- a/components/esm3/loadcrea.cpp
+++ b/components/esm3/loadcrea.cpp
@@ -8,7 +8,7 @@
 namespace ESM
 {
 
-    void Creature::load(ESMReader &esm, bool &isDeleted)
+    void Creature::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -106,7 +106,7 @@ namespace ESM
             esm.fail("Missing FLAG subrecord");
     }
 
-    void Creature::save(ESMWriter &esm, bool isDeleted) const
+    void Creature::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
@@ -122,7 +122,8 @@ namespace ESM
         esm.writeHNOCString("SCRI", mScript);
         esm.writeHNT("NPDT", mData, 96);
         esm.writeHNT("FLAG", ((mBloodType << 10) + mFlags));
-        if (mScale != 1.0) {
+        if (mScale != 1.0)
+        {
             esm.writeHNT("XSCL", mScale);
         }
 
@@ -138,12 +139,13 @@ namespace ESM
         mRecordFlags = 0;
         mData.mType = 0;
         mData.mLevel = 0;
-        mData.mStrength = mData.mIntelligence = mData.mWillpower = mData.mAgility =
-            mData.mSpeed = mData.mEndurance = mData.mPersonality = mData.mLuck = 0;
+        mData.mStrength = mData.mIntelligence = mData.mWillpower = mData.mAgility = mData.mSpeed = mData.mEndurance
+            = mData.mPersonality = mData.mLuck = 0;
         mData.mHealth = mData.mMana = mData.mFatigue = 0;
         mData.mSoul = 0;
         mData.mCombat = mData.mMagic = mData.mStealth = 0;
-        for (int i=0; i<6; ++i) mData.mAttack[i] = 0;
+        for (int i = 0; i < 6; ++i)
+            mData.mAttack[i] = 0;
         mData.mGold = 0;
         mBloodType = 0;
         mFlags = 0;
diff --git a/components/esm3/loadcrea.hpp b/components/esm3/loadcrea.hpp
index e5734e9b32..9636ba48de 100644
--- a/components/esm3/loadcrea.hpp
+++ b/components/esm3/loadcrea.hpp
@@ -3,9 +3,9 @@
 
 #include <string>
 
+#include "aipackage.hpp"
 #include "loadcont.hpp"
 #include "spelllist.hpp"
-#include "aipackage.hpp"
 #include "transport.hpp"
 
 #include "components/esm/defs.hpp"
@@ -13,93 +13,86 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
-
-/*
- * Creature definition
- *
- */
-
-struct Creature
-{
-    constexpr static RecNameInts sRecordId = REC_CREA;
-
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Creature"; }
+    class ESMReader;
+    class ESMWriter;
 
-    // Default is 0x48?
-    enum Flags
-    {
-        Bipedal       = 0x01,
-        Respawn       = 0x02,
-        Weapon        = 0x04, // Has weapon and shield
-        Base          = 0x08, // This flag is set for every actor in Bethesda ESMs
-        Swims         = 0x10,
-        Flies         = 0x20, // Don't know what happens if several
-        Walks         = 0x40, // of these are set
-        Essential     = 0x80
-    };
+    /*
+     * Creature definition
+     *
+     */
 
-    enum Type
+    struct Creature
     {
-        Creatures = 0,
-        Daedra  = 1,
-        Undead = 2,
-        Humanoid = 3
+        constexpr static RecNameInts sRecordId = REC_CREA;
+
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Creature"; }
+
+        // Default is 0x48?
+        enum Flags
+        {
+            Bipedal = 0x01,
+            Respawn = 0x02,
+            Weapon = 0x04, // Has weapon and shield
+            Base = 0x08, // This flag is set for every actor in Bethesda ESMs
+            Swims = 0x10,
+            Flies = 0x20, // Don't know what happens if several
+            Walks = 0x40, // of these are set
+            Essential = 0x80
+        };
+
+        enum Type
+        {
+            Creatures = 0,
+            Daedra = 1,
+            Undead = 2,
+            Humanoid = 3
+        };
+
+        struct NPDTstruct
+        {
+            int mType;
+            // For creatures we obviously have to use ints, not shorts and
+            // bytes like we use for NPCs.... this file format just makes so
+            // much sense! (Still, _much_ easier to decode than the NIFs.)
+            int mLevel;
+            int mStrength, mIntelligence, mWillpower, mAgility, mSpeed, mEndurance, mPersonality, mLuck;
+
+            int mHealth, mMana, mFatigue; // Stats
+            int mSoul; // The creatures soul value (used with soul gems.)
+            // Creatures have generalized combat, magic and stealth stats which substitute for
+            // the specific skills (in the same way as specializations).
+            int mCombat, mMagic, mStealth;
+            int mAttack[6]; // AttackMin1, AttackMax1, ditto2, ditto3
+            int mGold;
+        }; // 96 byte
+
+        NPDTstruct mData;
+
+        int mBloodType;
+        unsigned char mFlags;
+
+        float mScale;
+
+        unsigned int mRecordFlags;
+        std::string mId, mModel, mName, mScript;
+        std::string mOriginal; // Base creature that this is a modification of
+
+        InventoryList mInventory;
+        SpellList mSpells;
+
+        AIData mAiData;
+        AIPackageList mAiPackage;
+        Transport mTransport;
+
+        const std::vector<Transport::Dest>& getTransport() const;
+
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
+
+        void blank();
+        ///< Set record to default state (does not touch the ID).
     };
 
-    struct NPDTstruct
-    {
-        int mType;
-        // For creatures we obviously have to use ints, not shorts and
-        // bytes like we use for NPCs.... this file format just makes so
-        // much sense! (Still, _much_ easier to decode than the NIFs.)
-        int mLevel;
-        int mStrength,
-            mIntelligence,
-            mWillpower,
-            mAgility,
-            mSpeed,
-            mEndurance,
-            mPersonality,
-            mLuck;
-
-        int mHealth, mMana, mFatigue; // Stats
-        int mSoul; // The creatures soul value (used with soul gems.)
-        // Creatures have generalized combat, magic and stealth stats which substitute for
-        // the specific skills (in the same way as specializations).
-        int mCombat, mMagic, mStealth;
-        int mAttack[6]; // AttackMin1, AttackMax1, ditto2, ditto3
-        int mGold;
-    }; // 96 byte
-
-    NPDTstruct mData;
-
-    int mBloodType;
-    unsigned char mFlags;
-
-    float mScale;
-
-    unsigned int mRecordFlags;
-    std::string mId, mModel, mName, mScript;
-    std::string mOriginal; // Base creature that this is a modification of
-
-    InventoryList mInventory;
-    SpellList mSpells;
-
-    AIData mAiData;
-    AIPackageList mAiPackage;
-    Transport mTransport;
-
-    const std::vector<Transport::Dest>& getTransport() const;
-
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
-
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-};
-
 }
 #endif
diff --git a/components/esm3/loaddial.cpp b/components/esm3/loaddial.cpp
index f1c102250d..b1f1136648 100644
--- a/components/esm3/loaddial.cpp
+++ b/components/esm3/loaddial.cpp
@@ -8,18 +8,18 @@
 namespace ESM
 {
 
-    void Dialogue::load(ESMReader &esm, bool &isDeleted)
+    void Dialogue::load(ESMReader& esm, bool& isDeleted)
     {
         loadId(esm);
         loadData(esm, isDeleted);
     }
 
-    void Dialogue::loadId(ESMReader &esm)
+    void Dialogue::loadId(ESMReader& esm)
     {
         mId = esm.getHNString("NAME");
     }
 
-    void Dialogue::loadData(ESMReader &esm, bool &isDeleted)
+    void Dialogue::loadData(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
 
@@ -54,7 +54,7 @@ namespace ESM
         }
     }
 
-    void Dialogue::save(ESMWriter &esm, bool isDeleted) const
+    void Dialogue::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
         if (isDeleted)
@@ -72,7 +72,7 @@ namespace ESM
         mInfo.clear();
     }
 
-    void Dialogue::readInfo(ESMReader &esm, bool merge)
+    void Dialogue::readInfo(ESMReader& esm, bool merge)
     {
         DialInfo info;
         bool isDeleted = false;
@@ -89,7 +89,8 @@ namespace ESM
         if (lookup != mLookup.end())
         {
             auto it = lookup->second.first;
-            // Since the new version of this record may have changed the next/prev linked list connection, we need to re-insert the record
+            // Since the new version of this record may have changed the next/prev linked list connection, we need to
+            // re-insert the record
             mInfo.erase(it);
             mLookup.erase(lookup);
         }
diff --git a/components/esm3/loaddial.hpp b/components/esm3/loaddial.hpp
index 8f02c00425..dda6954d7b 100644
--- a/components/esm3/loaddial.hpp
+++ b/components/esm3/loaddial.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_ESM_DIAL_H
 #define OPENMW_ESM_DIAL_H
 
-#include <string>
 #include <list>
 #include <map>
+#include <string>
 
 #include "components/esm/defs.hpp"
 #include "loadinfo.hpp"
@@ -11,61 +11,61 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- * Dialogue topic and journal entries. The actual data is contained in
- * the INFO records following the DIAL.
- */
-
-struct Dialogue
-{
-    constexpr static RecNameInts sRecordId = REC_DIAL;
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Dialogue"; }
+    /*
+     * Dialogue topic and journal entries. The actual data is contained in
+     * the INFO records following the DIAL.
+     */
 
-    enum Type
+    struct Dialogue
     {
-        Topic = 0,
-        Voice = 1,
-        Greeting = 2,
-        Persuasion = 3,
-        Journal = 4,
-        Unknown = -1 // Used for deleted dialogues
-    };
+        constexpr static RecNameInts sRecordId = REC_DIAL;
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Dialogue"; }
+
+        enum Type
+        {
+            Topic = 0,
+            Voice = 1,
+            Greeting = 2,
+            Persuasion = 3,
+            Journal = 4,
+            Unknown = -1 // Used for deleted dialogues
+        };
 
-    std::string mId;
-    signed char mType;
+        std::string mId;
+        signed char mType;
 
-    typedef std::list<DialInfo> InfoContainer;
+        typedef std::list<DialInfo> InfoContainer;
 
-    // Parameters: Info ID, (Info iterator, Deleted flag)
-    typedef std::map<std::string, std::pair<InfoContainer::iterator, bool> > LookupMap;
+        // Parameters: Info ID, (Info iterator, Deleted flag)
+        typedef std::map<std::string, std::pair<InfoContainer::iterator, bool>> LookupMap;
 
-    InfoContainer mInfo;
+        InfoContainer mInfo;
 
-    // This is only used during the loading phase to speed up DialInfo merging.
-    LookupMap mLookup;
+        // This is only used during the loading phase to speed up DialInfo merging.
+        LookupMap mLookup;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    ///< Loads all sub-records of Dialogue record
-    void loadId(ESMReader &esm);
-    ///< Loads NAME sub-record of Dialogue record
-    void loadData(ESMReader &esm, bool &isDeleted);
-    ///< Loads all sub-records of Dialogue record, except NAME sub-record
+        void load(ESMReader& esm, bool& isDeleted);
+        ///< Loads all sub-records of Dialogue record
+        void loadId(ESMReader& esm);
+        ///< Loads NAME sub-record of Dialogue record
+        void loadData(ESMReader& esm, bool& isDeleted);
+        ///< Loads all sub-records of Dialogue record, except NAME sub-record
 
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    /// Remove all INFOs that are deleted
-    void clearDeletedInfos();
+        /// Remove all INFOs that are deleted
+        void clearDeletedInfos();
 
-    /// Read the next info record
-    /// @param merge Merge with existing list, or just push each record to the end of the list?
-    void readInfo (ESMReader& esm, bool merge);
+        /// Read the next info record
+        /// @param merge Merge with existing list, or just push each record to the end of the list?
+        void readInfo(ESMReader& esm, bool merge);
 
-    void blank();
-    ///< Set record to default state (does not touch the ID and does not change the type).
-};
+        void blank();
+        ///< Set record to default state (does not touch the ID and does not change the type).
+    };
 }
 #endif
diff --git a/components/esm3/loaddoor.cpp b/components/esm3/loaddoor.cpp
index a1f0b16a5f..61ed687975 100644
--- a/components/esm3/loaddoor.cpp
+++ b/components/esm3/loaddoor.cpp
@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    void Door::load(ESMReader &esm, bool &isDeleted)
+    void Door::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -49,7 +49,7 @@ namespace ESM
             esm.fail("Missing NAME subrecord");
     }
 
-    void Door::save(ESMWriter &esm, bool isDeleted) const
+    void Door::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
diff --git a/components/esm3/loaddoor.hpp b/components/esm3/loaddoor.hpp
index 37b8ea85a9..c61eaadc78 100644
--- a/components/esm3/loaddoor.hpp
+++ b/components/esm3/loaddoor.hpp
@@ -8,24 +8,24 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-struct Door
-{
-    constexpr static RecNameInts sRecordId = REC_DOOR;
+    struct Door
+    {
+        constexpr static RecNameInts sRecordId = REC_DOOR;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Door"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Door"; }
 
-    unsigned int mRecordFlags;
-    std::string mId, mName, mModel, mScript, mOpenSound, mCloseSound;
+        unsigned int mRecordFlags;
+        std::string mId, mName, mModel, mScript, mOpenSound, mCloseSound;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-};
+        void blank();
+        ///< Set record to default state (does not touch the ID).
+    };
 }
 #endif
diff --git a/components/esm3/loadench.cpp b/components/esm3/loadench.cpp
index 32a65b35aa..9a3eaa556b 100644
--- a/components/esm3/loadench.cpp
+++ b/components/esm3/loadench.cpp
@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    void Enchantment::load(ESMReader &esm, bool &isDeleted)
+    void Enchantment::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -45,7 +45,7 @@ namespace ESM
             esm.fail("Missing ENDT subrecord");
     }
 
-    void Enchantment::save(ESMWriter &esm, bool isDeleted) const
+    void Enchantment::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
diff --git a/components/esm3/loadench.hpp b/components/esm3/loadench.hpp
index d20cf5a593..f5d8cef80b 100644
--- a/components/esm3/loadench.hpp
+++ b/components/esm3/loadench.hpp
@@ -9,51 +9,51 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- * Enchantments
- */
+    /*
+     * Enchantments
+     */
 
-struct Enchantment
-{
-    constexpr static RecNameInts sRecordId = REC_ENCH;
-
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Enchantment"; }
-
-    enum Type
-    {
-        CastOnce = 0,
-        WhenStrikes = 1,
-        WhenUsed = 2,
-        ConstantEffect = 3
-    };
-
-    enum Flags
+    struct Enchantment
     {
-        Autocalc = 0x01
+        constexpr static RecNameInts sRecordId = REC_ENCH;
+
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Enchantment"; }
+
+        enum Type
+        {
+            CastOnce = 0,
+            WhenStrikes = 1,
+            WhenUsed = 2,
+            ConstantEffect = 3
+        };
+
+        enum Flags
+        {
+            Autocalc = 0x01
+        };
+
+        struct ENDTstruct
+        {
+            int mType;
+            int mCost;
+            int mCharge;
+            int mFlags;
+        };
+
+        unsigned int mRecordFlags;
+        std::string mId;
+        ENDTstruct mData;
+        EffectList mEffects;
+
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
+
+        void blank();
+        ///< Set record to default state (does not touch the ID).
     };
-
-    struct ENDTstruct
-    {
-        int mType;
-        int mCost;
-        int mCharge;
-        int mFlags;
-    };
-
-    unsigned int mRecordFlags;
-    std::string mId;
-    ENDTstruct mData;
-    EffectList mEffects;
-
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
-
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-};
 }
 #endif
diff --git a/components/esm3/loadfact.cpp b/components/esm3/loadfact.cpp
index 350cfa3891..f951a1a3e3 100644
--- a/components/esm3/loadfact.cpp
+++ b/components/esm3/loadfact.cpp
@@ -7,29 +7,29 @@
 
 namespace ESM
 {
-    int& Faction::FADTstruct::getSkill (int index, bool ignored)
+    int& Faction::FADTstruct::getSkill(int index, bool ignored)
     {
-        if (index<0 || index>=7)
-            throw std::logic_error ("skill index out of range");
+        if (index < 0 || index >= 7)
+            throw std::logic_error("skill index out of range");
 
         return mSkills[index];
     }
 
-    int Faction::FADTstruct::getSkill (int index, bool ignored) const
+    int Faction::FADTstruct::getSkill(int index, bool ignored) const
     {
-        if (index<0 || index>=7)
-            throw std::logic_error ("skill index out of range");
+        if (index < 0 || index >= 7)
+            throw std::logic_error("skill index out of range");
 
         return mSkills[index];
     }
 
-    void Faction::load(ESMReader &esm, bool &isDeleted)
+    void Faction::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
 
         mReactions.clear();
-        for (int i=0;i<10;++i)
+        for (int i = 0; i < 10; ++i)
             mRanks[i].clear();
 
         int rankCounter = 0;
@@ -82,7 +82,7 @@ namespace ESM
             esm.fail("Missing FADT subrecord");
     }
 
-    void Faction::save(ESMWriter &esm, bool isDeleted) const
+    void Faction::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
@@ -118,7 +118,7 @@ namespace ESM
         mData.mAttribute[0] = mData.mAttribute[1] = 0;
         mData.mIsHidden = 0;
 
-        for (int i=0; i<10; ++i)
+        for (int i = 0; i < 10; ++i)
         {
             mData.mRankData[i].mAttribute1 = mData.mRankData[i].mAttribute2 = 0;
             mData.mRankData[i].mPrimarySkill = mData.mRankData[i].mFavouredSkill = 0;
@@ -127,7 +127,7 @@ namespace ESM
             mRanks[i].clear();
         }
 
-        for (int i=0; i<7; ++i)
+        for (int i = 0; i < 7; ++i)
             mData.mSkills[i] = 0;
 
         mReactions.clear();
diff --git a/components/esm3/loadfact.hpp b/components/esm3/loadfact.hpp
index ec2df70c0e..78f779564b 100644
--- a/components/esm3/loadfact.hpp
+++ b/components/esm3/loadfact.hpp
@@ -1,77 +1,77 @@
 #ifndef OPENMW_ESM_FACT_H
 #define OPENMW_ESM_FACT_H
 
-#include <string>
 #include <map>
+#include <string>
 
 #include "components/esm/defs.hpp"
 
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- * Faction definitions
- */
+    /*
+     * Faction definitions
+     */
 
-// Requirements for each rank
-struct RankData
-{
-    int mAttribute1, mAttribute2; // Attribute level
+    // Requirements for each rank
+    struct RankData
+    {
+        int mAttribute1, mAttribute2; // Attribute level
 
-    // Skill level (faction skills given in
-    // skillID below.) You need one skill at
-    // level 'mPrimarySkill' and two skills at level
-    // 'mFavouredSkill' to advance to this rank.
-    int mPrimarySkill, mFavouredSkill;
+        // Skill level (faction skills given in
+        // skillID below.) You need one skill at
+        // level 'mPrimarySkill' and two skills at level
+        // 'mFavouredSkill' to advance to this rank.
+        int mPrimarySkill, mFavouredSkill;
 
-    int mFactReaction; // Reaction from faction members
-};
+        int mFactReaction; // Reaction from faction members
+    };
 
-struct Faction
-{
-    constexpr static RecNameInts sRecordId = REC_FACT;
+    struct Faction
+    {
+        constexpr static RecNameInts sRecordId = REC_FACT;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Faction"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Faction"; }
 
-    unsigned int mRecordFlags;
-    std::string mId, mName;
+        unsigned int mRecordFlags;
+        std::string mId, mName;
 
-    struct FADTstruct
-    {
-        // Which attributes we like
-        int mAttribute[2];
+        struct FADTstruct
+        {
+            // Which attributes we like
+            int mAttribute[2];
 
-        RankData mRankData[10];
+            RankData mRankData[10];
 
-        int mSkills[7]; // IDs of skills this faction require
-                        // Each element will either contain an Skill index, or -1.
+            int mSkills[7]; // IDs of skills this faction require
+                            // Each element will either contain an Skill index, or -1.
 
-        int mIsHidden; // 1 - hidden from player
+            int mIsHidden; // 1 - hidden from player
 
-        int& getSkill (int index, bool ignored = false);
-        ///< Throws an exception for invalid values of \a index.
+            int& getSkill(int index, bool ignored = false);
+            ///< Throws an exception for invalid values of \a index.
 
-        int getSkill (int index, bool ignored = false) const;
-        ///< Throws an exception for invalid values of \a index.
-    }; // 240 bytes
+            int getSkill(int index, bool ignored = false) const;
+            ///< Throws an exception for invalid values of \a index.
+        }; // 240 bytes
 
-    FADTstruct mData;
+        FADTstruct mData;
 
-    // <Faction ID, Reaction>
-    std::map<std::string, int> mReactions;
+        // <Faction ID, Reaction>
+        std::map<std::string, int> mReactions;
 
-    // Name of faction ranks (may be empty for NPC factions)
-    std::string mRanks[10];
+        // Name of faction ranks (may be empty for NPC factions)
+        std::string mRanks[10];
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-     ///< Set record to default state (does not touch the ID/index).
-};
+        void blank();
+        ///< Set record to default state (does not touch the ID/index).
+    };
 }
 #endif
diff --git a/components/esm3/loadglob.cpp b/components/esm3/loadglob.cpp
index 595d31c85d..6ca1101cd9 100644
--- a/components/esm3/loadglob.cpp
+++ b/components/esm3/loadglob.cpp
@@ -5,46 +5,46 @@
 
 namespace ESM
 {
-    void Global::load (ESMReader &esm, bool &isDeleted)
+    void Global::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
 
-        mId = esm.getHNString ("NAME");
+        mId = esm.getHNString("NAME");
 
-        if (esm.isNextSub ("DELE"))
+        if (esm.isNextSub("DELE"))
         {
             esm.skipHSub();
             isDeleted = true;
         }
         else
         {
-            mValue.read (esm, Variant::Format_Global);
+            mValue.read(esm, Variant::Format_Global);
         }
     }
 
-    void Global::save (ESMWriter &esm, bool isDeleted) const
+    void Global::save(ESMWriter& esm, bool isDeleted) const
     {
-        esm.writeHNCString ("NAME", mId);
+        esm.writeHNCString("NAME", mId);
 
         if (isDeleted)
         {
-            esm.writeHNCString ("DELE", "");
+            esm.writeHNCString("DELE", "");
         }
         else
         {
-            mValue.write (esm, Variant::Format_Global);
+            mValue.write(esm, Variant::Format_Global);
         }
     }
 
     void Global::blank()
     {
         mRecordFlags = 0;
-        mValue.setType (VT_None);
+        mValue.setType(VT_None);
     }
 
-    bool operator== (const Global& left, const Global& right)
+    bool operator==(const Global& left, const Global& right)
     {
-        return left.mId==right.mId && left.mValue==right.mValue;
+        return left.mId == right.mId && left.mValue == right.mValue;
     }
 }
diff --git a/components/esm3/loadglob.hpp b/components/esm3/loadglob.hpp
index 138d64e765..f36d22c394 100644
--- a/components/esm3/loadglob.hpp
+++ b/components/esm3/loadglob.hpp
@@ -10,32 +10,32 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- * Global script variables
- */
+    /*
+     * Global script variables
+     */
 
-struct Global
-{
-    constexpr static RecNameInts sRecordId = REC_GLOB;
+    struct Global
+    {
+        constexpr static RecNameInts sRecordId = REC_GLOB;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Global"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Global"; }
 
-    unsigned int mRecordFlags;
-    std::string mId;
-    Variant mValue;
+        unsigned int mRecordFlags;
+        std::string mId;
+        Variant mValue;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-};
+        void blank();
+        ///< Set record to default state (does not touch the ID).
+    };
 
-bool operator== (const Global& left, const Global& right);
+    bool operator==(const Global& left, const Global& right);
 
 }
 #endif
diff --git a/components/esm3/loadgmst.cpp b/components/esm3/loadgmst.cpp
index 832ba80f63..727f1ff90f 100644
--- a/components/esm3/loadgmst.cpp
+++ b/components/esm3/loadgmst.cpp
@@ -5,29 +5,29 @@
 
 namespace ESM
 {
-    void GameSetting::load (ESMReader &esm, bool &isDeleted)
+    void GameSetting::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false; // GameSetting record can't be deleted now (may be changed in the future)
         mRecordFlags = esm.getRecordFlags();
 
         mId = esm.getHNString("NAME");
-        mValue.read (esm, Variant::Format_Gmst);
+        mValue.read(esm, Variant::Format_Gmst);
     }
 
-    void GameSetting::save (ESMWriter &esm, bool /*isDeleted*/) const
+    void GameSetting::save(ESMWriter& esm, bool /*isDeleted*/) const
     {
         esm.writeHNCString("NAME", mId);
-        mValue.write (esm, Variant::Format_Gmst);
+        mValue.write(esm, Variant::Format_Gmst);
     }
 
     void GameSetting::blank()
     {
         mRecordFlags = 0;
-        mValue.setType (VT_None);
+        mValue.setType(VT_None);
     }
 
-    bool operator== (const GameSetting& left, const GameSetting& right)
+    bool operator==(const GameSetting& left, const GameSetting& right)
     {
-        return left.mValue==right.mValue;
+        return left.mValue == right.mValue;
     }
 }
diff --git a/components/esm3/loadgmst.hpp b/components/esm3/loadgmst.hpp
index da5a1baea6..68046ad421 100644
--- a/components/esm3/loadgmst.hpp
+++ b/components/esm3/loadgmst.hpp
@@ -10,34 +10,34 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- *  Game setting
- *
- */
+    /*
+     *  Game setting
+     *
+     */
 
-struct GameSetting
-{
-    constexpr static RecNameInts sRecordId = REC_GMST;
+    struct GameSetting
+    {
+        constexpr static RecNameInts sRecordId = REC_GMST;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "GameSetting"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "GameSetting"; }
 
-    unsigned int mRecordFlags;
-    std::string mId;
+        unsigned int mRecordFlags;
+        std::string mId;
 
-    Variant mValue;
+        Variant mValue;
 
-    void load(ESMReader &esm, bool &isDeleted);
+        void load(ESMReader& esm, bool& isDeleted);
 
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-};
+        void blank();
+        ///< Set record to default state (does not touch the ID).
+    };
 
-    bool operator== (const GameSetting& left, const GameSetting& right);
+    bool operator==(const GameSetting& left, const GameSetting& right);
 }
 #endif
diff --git a/components/esm3/loadinfo.cpp b/components/esm3/loadinfo.cpp
index 366582c10b..3581f0e314 100644
--- a/components/esm3/loadinfo.cpp
+++ b/components/esm3/loadinfo.cpp
@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    void DialInfo::load(ESMReader &esm, bool &isDeleted)
+    void DialInfo::load(ESMReader& esm, bool& isDeleted)
     {
         mId = esm.getHNString("INAM");
 
@@ -89,7 +89,7 @@ namespace ESM
         }
     }
 
-    void DialInfo::save(ESMWriter &esm, bool isDeleted) const
+    void DialInfo::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("INAM", mId);
         esm.writeHNCString("PNAM", mPrev);
@@ -114,17 +114,24 @@ namespace ESM
         for (std::vector<SelectStruct>::const_iterator it = mSelects.begin(); it != mSelects.end(); ++it)
         {
             esm.writeHNString("SCVR", it->mSelectRule);
-            it->mValue.write (esm, Variant::Format_Info);
+            it->mValue.write(esm, Variant::Format_Info);
         }
 
         esm.writeHNOString("BNAM", mResultScript);
 
-        switch(mQuestStatus)
+        switch (mQuestStatus)
         {
-        case QS_Name: esm.writeHNT("QSTN",'\1'); break;
-        case QS_Finished: esm.writeHNT("QSTF", '\1'); break;
-        case QS_Restart: esm.writeHNT("QSTR", '\1'); break;
-        default: break;
+            case QS_Name:
+                esm.writeHNT("QSTN", '\1');
+                break;
+            case QS_Finished:
+                esm.writeHNT("QSTF", '\1');
+                break;
+            case QS_Restart:
+                esm.writeHNT("QSTR", '\1');
+                break;
+            default:
+                break;
         }
     }
 
diff --git a/components/esm3/loadinfo.hpp b/components/esm3/loadinfo.hpp
index 088ce074aa..2c82e6ed34 100644
--- a/components/esm3/loadinfo.hpp
+++ b/components/esm3/loadinfo.hpp
@@ -10,110 +10,110 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- * Dialogue information. A series of these follow after DIAL records,
- * and form a linked list of dialogue items.
- */
+    /*
+     * Dialogue information. A series of these follow after DIAL records,
+     * and form a linked list of dialogue items.
+     */
 
-struct DialInfo
-{
-    constexpr static RecNameInts sRecordId = REC_INFO;
+    struct DialInfo
+    {
+        constexpr static RecNameInts sRecordId = REC_INFO;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "DialInfo"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "DialInfo"; }
 
-    enum Gender
-    {
-        Male = 0,
-        Female = 1,
-        NA = -1
-    };
+        enum Gender
+        {
+            Male = 0,
+            Female = 1,
+            NA = -1
+        };
 
-    struct DATAstruct
-    {
-        int mUnknown1 = 0;
-        union
+        struct DATAstruct
+        {
+            int mUnknown1 = 0;
+            union
+            {
+                int mDisposition = 0; // Used for dialogue responses
+                int mJournalIndex; // Used for journal entries
+            };
+            signed char mRank = -1; // Rank of NPC
+            signed char mGender = Gender::NA; // See Gender enum
+            signed char mPCrank = -1; // Player rank
+            signed char mUnknown2 = 0;
+        }; // 12 bytes
+        DATAstruct mData;
+
+        // The rules for whether or not we will select this dialog item.
+        struct SelectStruct
         {
-            int mDisposition = 0; // Used for dialogue responses
-            int mJournalIndex;  // Used for journal entries
+            std::string mSelectRule; // This has a complicated format
+            Variant mValue;
         };
-        signed char mRank = -1; // Rank of NPC
-        signed char mGender = Gender::NA; // See Gender enum
-        signed char mPCrank = -1; // Player rank
-        signed char mUnknown2 = 0;
-    }; // 12 bytes
-    DATAstruct mData;
-
-    // The rules for whether or not we will select this dialog item.
-    struct SelectStruct
-    {
-        std::string mSelectRule; // This has a complicated format
-        Variant mValue;
-    };
 
-    // Journal quest indices (introduced with the quest system in Tribunal)
-    enum QuestStatus
-    {
-        QS_None = 0,
-        QS_Name = 1,
-        QS_Finished = 2,
-        QS_Restart = 3
-    };
+        // Journal quest indices (introduced with the quest system in Tribunal)
+        enum QuestStatus
+        {
+            QS_None = 0,
+            QS_Name = 1,
+            QS_Finished = 2,
+            QS_Restart = 3
+        };
 
-    // Rules for when to include this item in the final list of options
-    // visible to the player.
-    std::vector<SelectStruct> mSelects;
+        // Rules for when to include this item in the final list of options
+        // visible to the player.
+        std::vector<SelectStruct> mSelects;
 
-    // Id of this, previous and next INFO items
-    std::string mId, mPrev, mNext;
+        // Id of this, previous and next INFO items
+        std::string mId, mPrev, mNext;
 
-    // Various references used in determining when to select this item.
-    std::string mActor, mRace, mClass, mFaction, mPcFaction, mCell;
+        // Various references used in determining when to select this item.
+        std::string mActor, mRace, mClass, mFaction, mPcFaction, mCell;
 
-    // Sound and text associated with this item
-    std::string mSound, mResponse;
+        // Sound and text associated with this item
+        std::string mSound, mResponse;
 
-    // Result script (uncompiled) to run whenever this dialog item is
-    // selected
-    std::string mResultScript;
+        // Result script (uncompiled) to run whenever this dialog item is
+        // selected
+        std::string mResultScript;
 
-    // ONLY include this item the NPC is not part of any faction.
-    bool mFactionLess;
+        // ONLY include this item the NPC is not part of any faction.
+        bool mFactionLess;
 
-    // Status of this quest item
-    QuestStatus mQuestStatus;
+        // Status of this quest item
+        QuestStatus mQuestStatus;
 
-    // Hexadecimal versions of the various subrecord names.
-    enum SubNames
-    {
-        REC_ONAM = 0x4d414e4f,
-        REC_RNAM = 0x4d414e52,
-        REC_CNAM = 0x4d414e43,
-        REC_FNAM = 0x4d414e46,
-        REC_ANAM = 0x4d414e41,
-        REC_DNAM = 0x4d414e44,
-        REC_SNAM = 0x4d414e53,
-        REC_NAME = 0x454d414e,
-        REC_SCVR = 0x52564353,
-
-        REC_BNAM = 0x4d414e42,
-        REC_QSTN = 0x4e545351,
-        REC_QSTF = 0x46545351,
-        REC_QSTR = 0x52545351,
-        REC_DELE = 0x454c4544
-    };
+        // Hexadecimal versions of the various subrecord names.
+        enum SubNames
+        {
+            REC_ONAM = 0x4d414e4f,
+            REC_RNAM = 0x4d414e52,
+            REC_CNAM = 0x4d414e43,
+            REC_FNAM = 0x4d414e46,
+            REC_ANAM = 0x4d414e41,
+            REC_DNAM = 0x4d414e44,
+            REC_SNAM = 0x4d414e53,
+            REC_NAME = 0x454d414e,
+            REC_SCVR = 0x52564353,
+
+            REC_BNAM = 0x4d414e42,
+            REC_QSTN = 0x4e545351,
+            REC_QSTF = 0x46545351,
+            REC_QSTR = 0x52545351,
+            REC_DELE = 0x454c4544
+        };
 
-    void load(ESMReader &esm, bool &isDeleted);
-    ///< Loads Info record
+        void load(ESMReader& esm, bool& isDeleted);
+        ///< Loads Info record
 
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-};
+        void blank();
+        ///< Set record to default state (does not touch the ID).
+    };
 
 }
 #endif
diff --git a/components/esm3/loadingr.cpp b/components/esm3/loadingr.cpp
index 0bb2cdd6d7..ca1525048a 100644
--- a/components/esm3/loadingr.cpp
+++ b/components/esm3/loadingr.cpp
@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    void Ingredient::load(ESMReader &esm, bool &isDeleted)
+    void Ingredient::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -53,30 +53,24 @@ namespace ESM
             esm.fail("Missing IRDT subrecord");
 
         // horrible hack to fix broken data in records
-        for (int i=0; i<4; ++i)
+        for (int i = 0; i < 4; ++i)
         {
-            if (mData.mEffectID[i] != 85 &&
-                mData.mEffectID[i] != 22 &&
-                mData.mEffectID[i] != 17 &&
-                mData.mEffectID[i] != 79 &&
-                mData.mEffectID[i] != 74)
+            if (mData.mEffectID[i] != 85 && mData.mEffectID[i] != 22 && mData.mEffectID[i] != 17
+                && mData.mEffectID[i] != 79 && mData.mEffectID[i] != 74)
             {
                 mData.mAttributes[i] = -1;
             }
 
             // is this relevant in cycle from 0 to 4?
-            if (mData.mEffectID[i] != 89 &&
-                mData.mEffectID[i] != 26 &&
-                mData.mEffectID[i] != 21 &&
-                mData.mEffectID[i] != 83 &&
-                mData.mEffectID[i] != 78)
+            if (mData.mEffectID[i] != 89 && mData.mEffectID[i] != 26 && mData.mEffectID[i] != 21
+                && mData.mEffectID[i] != 83 && mData.mEffectID[i] != 78)
             {
                 mData.mSkills[i] = -1;
             }
         }
     }
 
-    void Ingredient::save(ESMWriter &esm, bool isDeleted) const
+    void Ingredient::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
@@ -98,7 +92,7 @@ namespace ESM
         mRecordFlags = 0;
         mData.mWeight = 0;
         mData.mValue = 0;
-        for (int i=0; i<4; ++i)
+        for (int i = 0; i < 4; ++i)
         {
             mData.mEffectID[i] = 0;
             mData.mSkills[i] = 0;
diff --git a/components/esm3/loadingr.hpp b/components/esm3/loadingr.hpp
index 587a342407..af30da0356 100644
--- a/components/esm3/loadingr.hpp
+++ b/components/esm3/loadingr.hpp
@@ -8,38 +8,38 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- * Alchemy ingredient
- */
+    /*
+     * Alchemy ingredient
+     */
 
-struct Ingredient
-{
-    constexpr static RecNameInts sRecordId = REC_INGR;
+    struct Ingredient
+    {
+        constexpr static RecNameInts sRecordId = REC_INGR;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Ingredient"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Ingredient"; }
 
-    struct IRDTstruct
-    {
-        float mWeight;
-        int mValue;
-        int mEffectID[4]; // Effect, 0 or -1 means none
-        int mSkills[4]; // SkillEnum related to effect
-        int mAttributes[4]; // Attribute related to effect
-    };
+        struct IRDTstruct
+        {
+            float mWeight;
+            int mValue;
+            int mEffectID[4]; // Effect, 0 or -1 means none
+            int mSkills[4]; // SkillEnum related to effect
+            int mAttributes[4]; // Attribute related to effect
+        };
 
-    IRDTstruct mData;
-    unsigned int mRecordFlags;
-    std::string mId, mName, mModel, mIcon, mScript;
+        IRDTstruct mData;
+        unsigned int mRecordFlags;
+        std::string mId, mName, mModel, mIcon, mScript;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-};
+        void blank();
+        ///< Set record to default state (does not touch the ID).
+    };
 }
 #endif
diff --git a/components/esm3/loadland.cpp b/components/esm3/loadland.cpp
index ecc2412f59..f25a3ee1ae 100644
--- a/components/esm3/loadland.cpp
+++ b/components/esm3/loadland.cpp
@@ -1,12 +1,12 @@
 #include "loadland.hpp"
 
+#include <algorithm>
 #include <limits>
 #include <utility>
-#include <algorithm>
 
+#include "components/esm/defs.hpp"
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
@@ -19,14 +19,14 @@ namespace ESM
     {
     }
 
-    void transposeTextureData(const uint16_t *in, uint16_t *out)
+    void transposeTextureData(const uint16_t* in, uint16_t* out)
     {
-        int readPos = 0; //bit ugly, but it works
-        for ( int y1 = 0; y1 < 4; y1++ )
-            for ( int x1 = 0; x1 < 4; x1++ )
-                for ( int y2 = 0; y2 < 4; y2++)
-                    for ( int x2 = 0; x2 < 4; x2++ )
-                        out[(y1*4+y2)*16+(x1*4+x2)] = in[readPos++];
+        int readPos = 0; // bit ugly, but it works
+        for (int y1 = 0; y1 < 4; y1++)
+            for (int x1 = 0; x1 < 4; x1++)
+                for (int y2 = 0; y2 < 4; y2++)
+                    for (int x2 = 0; x2 < 4; x2++)
+                        out[(y1 * 4 + y2) * 16 + (x1 * 4 + x2)] = in[readPos++];
     }
 
     Land::~Land()
@@ -34,7 +34,7 @@ namespace ESM
         delete mLandData;
     }
 
-    void Land::load(ESMReader &esm, bool &isDeleted)
+    void Land::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
 
@@ -108,7 +108,7 @@ namespace ESM
         }
     }
 
-    void Land::save(ESMWriter &esm, bool isDeleted) const
+    void Land::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.startSubRecord("INTV");
         esm.writeT(mX);
@@ -125,10 +125,12 @@ namespace ESM
 
         if (mLandData)
         {
-            if (mDataTypes & Land::DATA_VNML) {
+            if (mDataTypes & Land::DATA_VNML)
+            {
                 esm.writeHNT("VNML", mLandData->mNormals);
             }
-            if (mDataTypes & Land::DATA_VHGT) {
+            if (mDataTypes & Land::DATA_VHGT)
+            {
                 VHGT offsets;
                 offsets.mHeightOffset = mLandData->mHeights[0] / HEIGHT_SCALE;
                 offsets.mUnk1 = mLandData->mUnk1;
@@ -136,18 +138,18 @@ namespace ESM
 
                 float prevY = mLandData->mHeights[0];
                 int number = 0; // avoid multiplication
-                for (int i = 0; i < LAND_SIZE; ++i) {
+                for (int i = 0; i < LAND_SIZE; ++i)
+                {
                     float diff = (mLandData->mHeights[number] - prevY) / HEIGHT_SCALE;
-                    offsets.mHeightData[number] =
-                        (diff >= 0) ? (int8_t) (diff + 0.5) : (int8_t) (diff - 0.5);
+                    offsets.mHeightData[number] = (diff >= 0) ? (int8_t)(diff + 0.5) : (int8_t)(diff - 0.5);
 
                     float prevX = prevY = mLandData->mHeights[number];
                     ++number;
 
-                    for (int j = 1; j < LAND_SIZE; ++j) {
+                    for (int j = 1; j < LAND_SIZE; ++j)
+                    {
                         diff = (mLandData->mHeights[number] - prevX) / HEIGHT_SCALE;
-                        offsets.mHeightData[number] =
-                            (diff >= 0) ? (int8_t) (diff + 0.5) : (int8_t) (diff - 0.5);
+                        offsets.mHeightData[number] = (diff >= 0) ? (int8_t)(diff + 0.5) : (int8_t)(diff - 0.5);
 
                         prevX = mLandData->mHeights[number];
                         ++number;
@@ -174,16 +176,17 @@ namespace ESM
                 }
                 esm.writeHNT("WNAM", wnam);
             }
-            if (mDataTypes & Land::DATA_VCLR) {
+            if (mDataTypes & Land::DATA_VCLR)
+            {
                 esm.writeHNT("VCLR", mLandData->mColours);
             }
-            if (mDataTypes & Land::DATA_VTEX) {
+            if (mDataTypes & Land::DATA_VTEX)
+            {
                 uint16_t vtex[LAND_NUM_TEXTURES];
                 transposeTextureData(mLandData->mTextures, vtex);
                 esm.writeHNT("VTEX", vtex);
             }
         }
-
     }
 
     void Land::blank()
@@ -201,16 +204,16 @@ namespace ESM
         mLandData->mMaxHeight = 0;
         for (int i = 0; i < LAND_NUM_VERTS; ++i)
         {
-            mLandData->mNormals[i*3+0] = 0;
-            mLandData->mNormals[i*3+1] = 0;
-            mLandData->mNormals[i*3+2] = 127;
+            mLandData->mNormals[i * 3 + 0] = 0;
+            mLandData->mNormals[i * 3 + 1] = 0;
+            mLandData->mNormals[i * 3 + 2] = 127;
         }
         std::fill(std::begin(mLandData->mTextures), std::end(mLandData->mTextures), 0);
         std::fill(std::begin(mLandData->mColours), std::end(mLandData->mColours), 255);
         mLandData->mUnk1 = 0;
         mLandData->mUnk2 = 0;
-        mLandData->mDataLoaded = Land::DATA_VNML | Land::DATA_VHGT | Land::DATA_WNAM |
-            Land::DATA_VCLR | Land::DATA_VTEX;
+        mLandData->mDataLoaded
+            = Land::DATA_VNML | Land::DATA_VHGT | Land::DATA_WNAM | Land::DATA_VCLR | Land::DATA_VTEX;
         mDataTypes = mLandData->mDataLoaded;
 
         // No file associated with the land now
@@ -231,7 +234,8 @@ namespace ESM
         // Try to load only available data
         flags = flags & mDataTypes;
         // Return if all required data is loaded
-        if ((target->mDataLoaded & flags) == flags) {
+        if ((target->mDataLoaded & flags) == flags)
+        {
             return;
         }
 
@@ -248,17 +252,21 @@ namespace ESM
         ESMReader reader;
         reader.restoreContext(mContext);
 
-        if (reader.isNextSub("VNML")) {
+        if (reader.isNextSub("VNML"))
+        {
             condLoad(reader, flags, target->mDataLoaded, DATA_VNML, target->mNormals, sizeof(target->mNormals));
         }
 
-        if (reader.isNextSub("VHGT")) {
+        if (reader.isNextSub("VHGT"))
+        {
             VHGT vhgt;
-            if (condLoad(reader, flags, target->mDataLoaded, DATA_VHGT, &vhgt, sizeof(vhgt))) {
+            if (condLoad(reader, flags, target->mDataLoaded, DATA_VHGT, &vhgt, sizeof(vhgt)))
+            {
                 target->mMinHeight = std::numeric_limits<float>::max();
                 target->mMaxHeight = -std::numeric_limits<float>::max();
                 float rowOffset = vhgt.mHeightOffset;
-                for (int y = 0; y < LAND_SIZE; y++) {
+                for (int y = 0; y < LAND_SIZE; y++)
+                {
                     rowOffset += vhgt.mHeightData[y * LAND_SIZE];
 
                     target->mHeights[y * LAND_SIZE] = rowOffset * HEIGHT_SCALE;
@@ -268,7 +276,8 @@ namespace ESM
                         target->mMinHeight = rowOffset * HEIGHT_SCALE;
 
                     float colOffset = rowOffset;
-                    for (int x = 1; x < LAND_SIZE; x++) {
+                    for (int x = 1; x < LAND_SIZE; x++)
+                    {
                         colOffset += vhgt.mHeightData[y * LAND_SIZE + x];
                         target->mHeights[x + y * LAND_SIZE] = colOffset * HEIGHT_SCALE;
 
@@ -288,9 +297,11 @@ namespace ESM
 
         if (reader.isNextSub("VCLR"))
             condLoad(reader, flags, target->mDataLoaded, DATA_VCLR, target->mColours, 3 * LAND_NUM_VERTS);
-        if (reader.isNextSub("VTEX")) {
+        if (reader.isNextSub("VTEX"))
+        {
             uint16_t vtex[LAND_NUM_TEXTURES];
-            if (condLoad(reader, flags, target->mDataLoaded, DATA_VTEX, vtex, sizeof(vtex))) {
+            if (condLoad(reader, flags, target->mDataLoaded, DATA_VTEX, vtex, sizeof(vtex)))
+            {
                 transposeTextureData(vtex, target->mTextures);
             }
         }
@@ -305,9 +316,11 @@ namespace ESM
         }
     }
 
-    bool Land::condLoad(ESMReader& reader, int flags, int& targetFlags, int dataFlag, void *ptr, unsigned int size) const
+    bool Land::condLoad(
+        ESMReader& reader, int flags, int& targetFlags, int dataFlag, void* ptr, unsigned int size) const
     {
-        if ((targetFlags & dataFlag) == 0 && (flags & dataFlag) != 0) {
+        if ((targetFlags & dataFlag) == 0 && (flags & dataFlag) != 0)
+        {
             reader.getHExact(ptr, size);
             targetFlags |= dataFlag;
             return true;
@@ -321,52 +334,55 @@ namespace ESM
         return mLandData && (mLandData->mDataLoaded & flags) == flags;
     }
 
-    Land::Land (const Land& land)
-    : mFlags (land.mFlags), mX (land.mX), mY (land.mY),
-      mContext (land.mContext), mDataTypes (land.mDataTypes),
-      mLandData (land.mLandData ? new LandData (*land.mLandData) : nullptr)
+    Land::Land(const Land& land)
+        : mFlags(land.mFlags)
+        , mX(land.mX)
+        , mY(land.mY)
+        , mContext(land.mContext)
+        , mDataTypes(land.mDataTypes)
+        , mLandData(land.mLandData ? new LandData(*land.mLandData) : nullptr)
     {
         std::copy(land.mWnam, land.mWnam + LAND_GLOBAL_MAP_LOD_SIZE, mWnam);
     }
 
-    Land& Land::operator= (const Land& land)
+    Land& Land::operator=(const Land& land)
     {
         Land tmp(land);
         swap(tmp);
         return *this;
     }
 
-    void Land::swap (Land& land)
+    void Land::swap(Land& land)
     {
-        std::swap (mFlags, land.mFlags);
-        std::swap (mX, land.mX);
-        std::swap (mY, land.mY);
-        std::swap (mContext, land.mContext);
-        std::swap (mDataTypes, land.mDataTypes);
-        std::swap (mLandData, land.mLandData);
-        std::swap (mWnam, land.mWnam);
+        std::swap(mFlags, land.mFlags);
+        std::swap(mX, land.mX);
+        std::swap(mY, land.mY);
+        std::swap(mContext, land.mContext);
+        std::swap(mDataTypes, land.mDataTypes);
+        std::swap(mLandData, land.mLandData);
+        std::swap(mWnam, land.mWnam);
     }
 
-    const Land::LandData *Land::getLandData (int flags) const
+    const Land::LandData* Land::getLandData(int flags) const
     {
         if (!(flags & mDataTypes))
             return nullptr;
 
-        loadData (flags);
+        loadData(flags);
         return mLandData;
     }
 
-    const Land::LandData *Land::getLandData() const
+    const Land::LandData* Land::getLandData() const
     {
         return mLandData;
     }
 
-    Land::LandData *Land::getLandData()
+    Land::LandData* Land::getLandData()
     {
         return mLandData;
     }
 
-    void Land::add (int flags)
+    void Land::add(int flags)
     {
         if (!mLandData)
             mLandData = new LandData;
@@ -375,7 +391,7 @@ namespace ESM
         mLandData->mDataLoaded |= flags;
     }
 
-    void Land::remove (int flags)
+    void Land::remove(int flags)
     {
         mDataTypes &= ~flags;
 
diff --git a/components/esm3/loadland.hpp b/components/esm3/loadland.hpp
index bb71350b4f..4ff077d79f 100644
--- a/components/esm3/loadland.hpp
+++ b/components/esm3/loadland.hpp
@@ -11,180 +11,179 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- * Landscape data.
- */
+    /*
+     * Landscape data.
+     */
 
-struct Land
-{
-    constexpr static RecNameInts sRecordId = REC_LAND;
+    struct Land
+    {
+        constexpr static RecNameInts sRecordId = REC_LAND;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Land"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Land"; }
 
-    Land();
-    ~Land();
+        Land();
+        ~Land();
 
-    int mFlags; // Only first four bits seem to be used, don't know what
-    // they mean.
-    int mX, mY; // Map coordinates.
-    
-    // Plugin index, used to reference the correct material palette.
-    int getPlugin() const { return mContext.index; }
-    void setPlugin(int index) { mContext.index = index; }
+        int mFlags; // Only first four bits seem to be used, don't know what
+        // they mean.
+        int mX, mY; // Map coordinates.
 
-    // File context. This allows the ESM reader to be 'reset' to this
-    // location later when we are ready to load the full data set.
-    // In the editor, there may not be a file associated with the Land,
-    // in which case the filename will be empty.
-    ESM_Context mContext;
+        // Plugin index, used to reference the correct material palette.
+        int getPlugin() const { return mContext.index; }
+        void setPlugin(int index) { mContext.index = index; }
 
-    int mDataTypes;
+        // File context. This allows the ESM reader to be 'reset' to this
+        // location later when we are ready to load the full data set.
+        // In the editor, there may not be a file associated with the Land,
+        // in which case the filename will be empty.
+        ESM_Context mContext;
 
-    enum
-    {
-        DATA_VNML = 1,
-        DATA_VHGT = 2,
-        DATA_WNAM = 4,
-        DATA_VCLR = 8,
-        DATA_VTEX = 16
-    };
+        int mDataTypes;
 
-    // default height to use in case there is no Land record
-    static constexpr int DEFAULT_HEIGHT = -2048;
+        enum
+        {
+            DATA_VNML = 1,
+            DATA_VHGT = 2,
+            DATA_WNAM = 4,
+            DATA_VCLR = 8,
+            DATA_VTEX = 16
+        };
 
-    // number of vertices per side
-    static constexpr int LAND_SIZE = 65;
+        // default height to use in case there is no Land record
+        static constexpr int DEFAULT_HEIGHT = -2048;
 
-    // cell terrain size in world coords
-    static constexpr int REAL_SIZE = Constants::CellSizeInUnits;
+        // number of vertices per side
+        static constexpr int LAND_SIZE = 65;
 
-    // total number of vertices
-    static constexpr int LAND_NUM_VERTS = LAND_SIZE * LAND_SIZE;
+        // cell terrain size in world coords
+        static constexpr int REAL_SIZE = Constants::CellSizeInUnits;
 
-    static constexpr int HEIGHT_SCALE = 8;
+        // total number of vertices
+        static constexpr int LAND_NUM_VERTS = LAND_SIZE * LAND_SIZE;
 
-    //number of textures per side of land
-    static constexpr int LAND_TEXTURE_SIZE = 16;
+        static constexpr int HEIGHT_SCALE = 8;
 
-    //total number of textures per land
-    static constexpr int LAND_NUM_TEXTURES = LAND_TEXTURE_SIZE * LAND_TEXTURE_SIZE;
+        // number of textures per side of land
+        static constexpr int LAND_TEXTURE_SIZE = 16;
 
-    static constexpr int LAND_GLOBAL_MAP_LOD_SIZE = 81;
+        // total number of textures per land
+        static constexpr int LAND_NUM_TEXTURES = LAND_TEXTURE_SIZE * LAND_TEXTURE_SIZE;
 
-    static constexpr int LAND_GLOBAL_MAP_LOD_SIZE_SQRT = 9;
+        static constexpr int LAND_GLOBAL_MAP_LOD_SIZE = 81;
 
-#pragma pack(push,1)
-    struct VHGT
-    {
-        float mHeightOffset;
-        int8_t mHeightData[LAND_NUM_VERTS];
-        short mUnk1;
-        char mUnk2;
-    };
+        static constexpr int LAND_GLOBAL_MAP_LOD_SIZE_SQRT = 9;
+
+#pragma pack(push, 1)
+        struct VHGT
+        {
+            float mHeightOffset;
+            int8_t mHeightData[LAND_NUM_VERTS];
+            short mUnk1;
+            char mUnk2;
+        };
 #pragma pack(pop)
 
-    typedef signed char VNML;
+        typedef signed char VNML;
 
-    struct LandData
-    {
-        LandData()
-            : mHeightOffset(0)
-            , mMinHeight(0)
-            , mMaxHeight(0)
-            , mUnk1(0)
-            , mUnk2(0)
-            , mDataLoaded(0)
+        struct LandData
         {
-        }
+            LandData()
+                : mHeightOffset(0)
+                , mMinHeight(0)
+                , mMaxHeight(0)
+                , mUnk1(0)
+                , mUnk2(0)
+                , mDataLoaded(0)
+            {
+            }
 
-        // Initial reference height for the first vertex, only needed for filling mHeights
-        float mHeightOffset;
-        // Height in world space for each vertex
-        float mHeights[LAND_NUM_VERTS];
-        float mMinHeight;
-        float mMaxHeight;
+            // Initial reference height for the first vertex, only needed for filling mHeights
+            float mHeightOffset;
+            // Height in world space for each vertex
+            float mHeights[LAND_NUM_VERTS];
+            float mMinHeight;
+            float mMaxHeight;
 
-        // 24-bit normals, these aren't always correct though. Edge and corner normals may be garbage.
-        VNML mNormals[LAND_NUM_VERTS * 3];
+            // 24-bit normals, these aren't always correct though. Edge and corner normals may be garbage.
+            VNML mNormals[LAND_NUM_VERTS * 3];
 
-        // 2D array of texture indices. An index can be used to look up an LandTexture,
-        // but to do so you must subtract 1 from the index first!
-        // An index of 0 indicates the default texture.
-        uint16_t mTextures[LAND_NUM_TEXTURES];
+            // 2D array of texture indices. An index can be used to look up an LandTexture,
+            // but to do so you must subtract 1 from the index first!
+            // An index of 0 indicates the default texture.
+            uint16_t mTextures[LAND_NUM_TEXTURES];
 
-        // 24-bit RGB color for each vertex
-        unsigned char mColours[3 * LAND_NUM_VERTS];
+            // 24-bit RGB color for each vertex
+            unsigned char mColours[3 * LAND_NUM_VERTS];
 
-        // ???
-        short mUnk1;
-        uint8_t mUnk2;
+            // ???
+            short mUnk1;
+            uint8_t mUnk2;
 
-        int mDataLoaded;
-    };
+            int mDataLoaded;
+        };
 
-    // low-LOD heightmap (used for rendering the global map)
-    signed char mWnam[LAND_GLOBAL_MAP_LOD_SIZE];
+        // low-LOD heightmap (used for rendering the global map)
+        signed char mWnam[LAND_GLOBAL_MAP_LOD_SIZE];
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
+        void blank();
 
-    /**
-     * Actually loads data into target
-     * If target is nullptr, assumed target is mLandData
-     */
-    void loadData(int flags, LandData* target = nullptr) const;
+        /**
+         * Actually loads data into target
+         * If target is nullptr, assumed target is mLandData
+         */
+        void loadData(int flags, LandData* target = nullptr) const;
 
-    /**
-     * Frees memory allocated for mLandData
-     */
-    void unloadData() const;
+        /**
+         * Frees memory allocated for mLandData
+         */
+        void unloadData() const;
 
-    /// Check if given data type is loaded
-    bool isDataLoaded(int flags) const;
+        /// Check if given data type is loaded
+        bool isDataLoaded(int flags) const;
 
-    /// Sets the flags and creates a LandData if needed
-    void setDataLoaded(int flags);
+        /// Sets the flags and creates a LandData if needed
+        void setDataLoaded(int flags);
 
-        Land (const Land& land);
+        Land(const Land& land);
 
-        Land& operator= (const Land& land);
+        Land& operator=(const Land& land);
 
-        void swap (Land& land);
+        void swap(Land& land);
 
         /// Return land data with at least the data types specified in \a flags loaded (if they
         /// are available). Will return a 0-pointer if there is no data for any of the
         /// specified types.
-        const LandData *getLandData (int flags) const;
+        const LandData* getLandData(int flags) const;
 
         /// Return land data without loading first anything. Can return a 0-pointer.
-        const LandData *getLandData() const;
+        const LandData* getLandData() const;
 
         /// Return land data without loading first anything. Can return a 0-pointer.
-        LandData *getLandData();
+        LandData* getLandData();
 
         /// \attention Must not be called on objects that aren't fully loaded.
         ///
         /// \note Added data fields will be uninitialised
-        void add (int flags);
+        void add(int flags);
 
         /// \attention Must not be called on objects that aren't fully loaded.
-        void remove (int flags);
+        void remove(int flags);
 
     private:
-
         /// Loads data and marks it as loaded
         /// \return true if data is actually loaded from file, false otherwise
         /// including the case when data is already loaded
-        bool condLoad(ESMReader& reader, int flags, int& targetFlags, int dataFlag, void *ptr, unsigned int size) const;
+        bool condLoad(ESMReader& reader, int flags, int& targetFlags, int dataFlag, void* ptr, unsigned int size) const;
 
-        mutable LandData *mLandData;
-};
+        mutable LandData* mLandData;
+    };
 
 }
 #endif
diff --git a/components/esm3/loadlevlist.cpp b/components/esm3/loadlevlist.cpp
index d16ab89231..cadf340890 100644
--- a/components/esm3/loadlevlist.cpp
+++ b/components/esm3/loadlevlist.cpp
@@ -1,8 +1,8 @@
 #include "loadlevlist.hpp"
 
+#include "components/esm/defs.hpp"
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
@@ -42,7 +42,7 @@ namespace ESM
                     // that does something with that list.
                     for (size_t i = 0; i < mList.size(); i++)
                     {
-                        LevelItem &li = mList[i];
+                        LevelItem& li = mList[i];
                         li.mId = esm.getHNString(recName);
                         esm.getHNT(li.mLevel, "INTV");
                     }
diff --git a/components/esm3/loadlevlist.hpp b/components/esm3/loadlevlist.hpp
index d73003fdda..10bcf58c6b 100644
--- a/components/esm3/loadlevlist.hpp
+++ b/components/esm3/loadlevlist.hpp
@@ -4,91 +4,94 @@
 #include <string>
 #include <vector>
 
-#include <components/esm/esmcommon.hpp>
 #include <components/esm/defs.hpp>
+#include <components/esm/esmcommon.hpp>
 
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- * Levelled lists. Since these have identical layout, I only bothered
- * to implement it once.
- *
- * We should later implement the ability to merge levelled lists from
- * several files.
- */
-
-struct LevelledListBase
-{
-    int mFlags;
-    unsigned char mChanceNone; // Chance that none are selected (0-100)
-    unsigned int mRecordFlags;
-    std::string mId;
+    /*
+     * Levelled lists. Since these have identical layout, I only bothered
+     * to implement it once.
+     *
+     * We should later implement the ability to merge levelled lists from
+     * several files.
+     */
 
-    struct LevelItem
+    struct LevelledListBase
     {
+        int mFlags;
+        unsigned char mChanceNone; // Chance that none are selected (0-100)
+        unsigned int mRecordFlags;
         std::string mId;
-        short mLevel;
-    };
-
-    std::vector<LevelItem> mList;
 
-    void load(ESMReader& esm, NAME recName, bool& isDeleted);
-    void save(ESMWriter& esm, NAME recName, bool isDeleted) const;
+        struct LevelItem
+        {
+            std::string mId;
+            short mLevel;
+        };
 
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-};
+        std::vector<LevelItem> mList;
 
-template <class Base>
-struct CustomLevelledListBase : LevelledListBase
-{
-    void load(ESMReader &esm, bool& isDeleted) { LevelledListBase::load(esm, Base::sRecName, isDeleted); }
-    void save(ESMWriter &esm, bool isDeleted = false) const { LevelledListBase::save(esm, Base::sRecName, isDeleted); }
-};
+        void load(ESMReader& esm, NAME recName, bool& isDeleted);
+        void save(ESMWriter& esm, NAME recName, bool isDeleted) const;
 
-struct CreatureLevList : CustomLevelledListBase<CreatureLevList>
-{
-    /// Record name used to read references.
-    static constexpr NAME sRecName {"CNAM"};
-    static constexpr RecNameInts sRecordId = RecNameInts::REC_LEVC;
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "CreatureLevList"; }
+        void blank();
+        ///< Set record to default state (does not touch the ID).
+    };
 
-    enum Flags
+    template <class Base>
+    struct CustomLevelledListBase : LevelledListBase
     {
-
-        AllLevels = 0x01  // Calculate from all levels <= player
-                          // level, not just the closest below
-                          // player.
+        void load(ESMReader& esm, bool& isDeleted) { LevelledListBase::load(esm, Base::sRecName, isDeleted); }
+        void save(ESMWriter& esm, bool isDeleted = false) const
+        {
+            LevelledListBase::save(esm, Base::sRecName, isDeleted);
+        }
     };
-};
 
-struct ItemLevList : CustomLevelledListBase<ItemLevList>
-{
-    /// Record name used to read references.
-    static constexpr NAME sRecName {"INAM"};
-    static constexpr RecNameInts sRecordId = RecNameInts::REC_LEVI;
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "ItemLevList"; }
-
-    enum Flags
+    struct CreatureLevList : CustomLevelledListBase<CreatureLevList>
     {
+        /// Record name used to read references.
+        static constexpr NAME sRecName{ "CNAM" };
+        static constexpr RecNameInts sRecordId = RecNameInts::REC_LEVC;
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "CreatureLevList"; }
+
+        enum Flags
+        {
+
+            AllLevels = 0x01 // Calculate from all levels <= player
+                             // level, not just the closest below
+                             // player.
+        };
+    };
 
-        Each = 0x01,      // Select a new item each time this
-                          // list is instantiated, instead of
-                          // giving several identical items
-                          // (used when a container has more
-                          // than one instance of one levelled
-                          // list.)
-        AllLevels = 0x02  // Calculate from all levels <= player
-                          // level, not just the closest below
-                          // player.
+    struct ItemLevList : CustomLevelledListBase<ItemLevList>
+    {
+        /// Record name used to read references.
+        static constexpr NAME sRecName{ "INAM" };
+        static constexpr RecNameInts sRecordId = RecNameInts::REC_LEVI;
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "ItemLevList"; }
+
+        enum Flags
+        {
+
+            Each = 0x01, // Select a new item each time this
+                         // list is instantiated, instead of
+                         // giving several identical items
+                         // (used when a container has more
+                         // than one instance of one levelled
+                         // list.)
+            AllLevels = 0x02 // Calculate from all levels <= player
+                             // level, not just the closest below
+                             // player.
+        };
     };
-};
 
 }
 #endif
diff --git a/components/esm3/loadligh.cpp b/components/esm3/loadligh.cpp
index a8797b347a..feeccca4fd 100644
--- a/components/esm3/loadligh.cpp
+++ b/components/esm3/loadligh.cpp
@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    void Light::load(ESMReader &esm, bool &isDeleted)
+    void Light::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -55,7 +55,7 @@ namespace ESM
         if (!hasData && !isDeleted)
             esm.fail("Missing LHDT subrecord");
     }
-    void Light::save(ESMWriter &esm, bool isDeleted) const
+    void Light::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
diff --git a/components/esm3/loadligh.hpp b/components/esm3/loadligh.hpp
index 422d2b1d4e..71d004ed4f 100644
--- a/components/esm3/loadligh.hpp
+++ b/components/esm3/loadligh.hpp
@@ -8,54 +8,55 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- * Lights. Includes static light sources and also carryable candles
- * and torches.
- */
+    /*
+     * Lights. Includes static light sources and also carryable candles
+     * and torches.
+     */
 
-struct Light
-{
-    constexpr static RecNameInts sRecordId = REC_LIGH;
-
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Light"; }
-
-    enum Flags
+    struct Light
     {
-        Dynamic     = 0x001,
-        Carry       = 0x002, // Can be carried
-        Negative    = 0x004, // Negative light - i.e. darkness
-        Flicker     = 0x008,
-        Fire        = 0x010,
-        OffDefault  = 0x020, // Off by default - does not burn while placed in a cell, but can burn when equipped by an NPC
-        FlickerSlow = 0x040,
-        Pulse       = 0x080,
-        PulseSlow   = 0x100
+        constexpr static RecNameInts sRecordId = REC_LIGH;
+
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Light"; }
+
+        enum Flags
+        {
+            Dynamic = 0x001,
+            Carry = 0x002, // Can be carried
+            Negative = 0x004, // Negative light - i.e. darkness
+            Flicker = 0x008,
+            Fire = 0x010,
+            OffDefault
+            = 0x020, // Off by default - does not burn while placed in a cell, but can burn when equipped by an NPC
+            FlickerSlow = 0x040,
+            Pulse = 0x080,
+            PulseSlow = 0x100
+        };
+
+        struct LHDTstruct
+        {
+            float mWeight;
+            int mValue;
+            int mTime; // Duration
+            int mRadius;
+            unsigned int mColor; // 4-byte rgba value
+            int mFlags;
+        }; // Size = 24 bytes
+
+        LHDTstruct mData;
+
+        unsigned int mRecordFlags;
+        std::string mSound, mScript, mModel, mIcon, mName, mId;
+
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
+
+        void blank();
+        ///< Set record to default state (does not touch the ID).
     };
-
-    struct LHDTstruct
-    {
-        float mWeight;
-        int mValue;
-        int mTime; // Duration
-        int mRadius;
-        unsigned int mColor; // 4-byte rgba value
-        int mFlags;
-    }; // Size = 24 bytes
-
-    LHDTstruct mData;
-
-    unsigned int mRecordFlags;
-    std::string mSound, mScript, mModel, mIcon, mName, mId;
-
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
-
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-};
 }
 #endif
diff --git a/components/esm3/loadlock.cpp b/components/esm3/loadlock.cpp
index 4a2693ebf1..ecd31f9489 100644
--- a/components/esm3/loadlock.cpp
+++ b/components/esm3/loadlock.cpp
@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    void Lockpick::load(ESMReader &esm, bool &isDeleted)
+    void Lockpick::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -53,7 +53,7 @@ namespace ESM
             esm.fail("Missing LKDT subrecord");
     }
 
-    void Lockpick::save(ESMWriter &esm, bool isDeleted) const
+    void Lockpick::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
diff --git a/components/esm3/loadlock.hpp b/components/esm3/loadlock.hpp
index 1ebc6c902c..e0235d0044 100644
--- a/components/esm3/loadlock.hpp
+++ b/components/esm3/loadlock.hpp
@@ -8,35 +8,35 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-struct Lockpick
-{
-    constexpr static RecNameInts sRecordId = REC_LOCK;
+    struct Lockpick
+    {
+        constexpr static RecNameInts sRecordId = REC_LOCK;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Lockpick"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Lockpick"; }
 
-    struct Data
-    {
-        float mWeight;
-        int mValue;
+        struct Data
+        {
+            float mWeight;
+            int mValue;
 
-        float mQuality;
-        int mUses;
-    }; // Size = 16
+            float mQuality;
+            int mUses;
+        }; // Size = 16
 
-    Data mData;
-    unsigned int mRecordFlags;
-    std::string mId, mName, mModel, mIcon, mScript;
+        Data mData;
+        unsigned int mRecordFlags;
+        std::string mId, mName, mModel, mIcon, mScript;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-};
+        void blank();
+        ///< Set record to default state (does not touch the ID).
+    };
 
 }
 #endif
diff --git a/components/esm3/loadltex.cpp b/components/esm3/loadltex.cpp
index f7e75f079e..df5ae5ca32 100644
--- a/components/esm3/loadltex.cpp
+++ b/components/esm3/loadltex.cpp
@@ -1,12 +1,12 @@
 #include "loadltex.hpp"
 
+#include "components/esm/defs.hpp"
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    void LandTexture::load(ESMReader &esm, bool &isDeleted)
+    void LandTexture::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
 
@@ -43,7 +43,7 @@ namespace ESM
         if (!hasIndex)
             esm.fail("Missing INTV subrecord");
     }
-    void LandTexture::save(ESMWriter &esm, bool isDeleted) const
+    void LandTexture::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
         esm.writeHNT("INTV", mIndex);
diff --git a/components/esm3/loadltex.hpp b/components/esm3/loadltex.hpp
index c645cb1d4f..7da22f2b45 100644
--- a/components/esm3/loadltex.hpp
+++ b/components/esm3/loadltex.hpp
@@ -8,32 +8,32 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- * Texture used for texturing landscape.
- * They are indexed by 'num', but still use 'id' to override base records.
- * Original editor even does not allow to create new records with existing ID's.
- * TODO: currently OpenMW-CS does not allow to override LTEX records at all.
- */
+    /*
+     * Texture used for texturing landscape.
+     * They are indexed by 'num', but still use 'id' to override base records.
+     * Original editor even does not allow to create new records with existing ID's.
+     * TODO: currently OpenMW-CS does not allow to override LTEX records at all.
+     */
 
-struct LandTexture
-{
-    constexpr static RecNameInts sRecordId = REC_LTEX;
+    struct LandTexture
+    {
+        constexpr static RecNameInts sRecordId = REC_LTEX;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "LandTexture"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "LandTexture"; }
 
-    // mId is merely a user friendly name for the texture in the editor.
-    std::string mId, mTexture;
-    int mIndex;
+        // mId is merely a user friendly name for the texture in the editor.
+        std::string mId, mTexture;
+        int mIndex;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    /// Sets the record to the default state. Does not touch the index. Does touch mID.
-    void blank();
-};
+        /// Sets the record to the default state. Does not touch the index. Does touch mID.
+        void blank();
+    };
 }
 #endif
diff --git a/components/esm3/loadmgef.cpp b/components/esm3/loadmgef.cpp
index 3982681b31..1de8066b9c 100644
--- a/components/esm3/loadmgef.cpp
+++ b/components/esm3/loadmgef.cpp
@@ -2,579 +2,572 @@
 
 #include <sstream>
 
+#include "components/esm/defs.hpp"
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 #include <components/misc/strings/algorithm.hpp>
 
 namespace ESM
 {
-namespace
-{
-    static const char *sIds[MagicEffect::Length] =
+    namespace
     {
-        "WaterBreathing",
-        "SwiftSwim",
-        "WaterWalking",
-        "Shield",
-        "FireShield",
-        "LightningShield",
-        "FrostShield",
-        "Burden",
-        "Feather",
-        "Jump",
-        "Levitate",
-        "SlowFall",
-        "Lock",
-        "Open",
-        "FireDamage",
-        "ShockDamage",
-        "FrostDamage",
-        "DrainAttribute",
-        "DrainHealth",
-        "DrainMagicka",
-        "DrainFatigue",
-        "DrainSkill",
-        "DamageAttribute",
-        "DamageHealth",
-        "DamageMagicka",
-        "DamageFatigue",
-        "DamageSkill",
-        "Poison",
-        "WeaknessToFire",
-        "WeaknessToFrost",
-        "WeaknessToShock",
-        "WeaknessToMagicka",
-        "WeaknessToCommonDisease",
-        "WeaknessToBlightDisease",
-        "WeaknessToCorprusDisease",
-        "WeaknessToPoison",
-        "WeaknessToNormalWeapons",
-        "DisintegrateWeapon",
-        "DisintegrateArmor",
-        "Invisibility",
-        "Chameleon",
-        "Light",
-        "Sanctuary",
-        "NightEye",
-        "Charm",
-        "Paralyze",
-        "Silence",
-        "Blind",
-        "Sound",
-        "CalmHumanoid",
-        "CalmCreature",
-        "FrenzyHumanoid",
-        "FrenzyCreature",
-        "DemoralizeHumanoid",
-        "DemoralizeCreature",
-        "RallyHumanoid",
-        "RallyCreature",
-        "Dispel",
-        "Soultrap",
-        "Telekinesis",
-        "Mark",
-        "Recall",
-        "DivineIntervention",
-        "AlmsiviIntervention",
-        "DetectAnimal",
-        "DetectEnchantment",
-        "DetectKey",
-        "SpellAbsorption",
-        "Reflect",
-        "CureCommonDisease",
-        "CureBlightDisease",
-        "CureCorprusDisease",
-        "CurePoison",
-        "CureParalyzation",
-        "RestoreAttribute",
-        "RestoreHealth",
-        "RestoreMagicka",
-        "RestoreFatigue",
-        "RestoreSkill",
-        "FortifyAttribute",
-        "FortifyHealth",
-        "FortifyMagicka",
-        "FortifyFatigue",
-        "FortifySkill",
-        "FortifyMaximumMagicka",
-        "AbsorbAttribute",
-        "AbsorbHealth",
-        "AbsorbMagicka",
-        "AbsorbFatigue",
-        "AbsorbSkill",
-        "ResistFire",
-        "ResistFrost",
-        "ResistShock",
-        "ResistMagicka",
-        "ResistCommonDisease",
-        "ResistBlightDisease",
-        "ResistCorprusDisease",
-        "ResistPoison",
-        "ResistNormalWeapons",
-        "ResistParalysis",
-        "RemoveCurse",
-        "TurnUndead",
-        "SummonScamp",
-        "SummonClannfear",
-        "SummonDaedroth",
-        "SummonDremora",
-        "SummonAncestralGhost",
-        "SummonSkeletalMinion",
-        "SummonBonewalker",
-        "SummonGreaterBonewalker",
-        "SummonBonelord",
-        "SummonWingedTwilight",
-        "SummonHunger",
-        "SummonGoldenSaint",
-        "SummonFlameAtronach",
-        "SummonFrostAtronach",
-        "SummonStormAtronach",
-        "FortifyAttack",
-        "CommandCreature",
-        "CommandHumanoid",
-        "BoundDagger",
-        "BoundLongsword",
-        "BoundMace",
-        "BoundBattleAxe",
-        "BoundSpear",
-        "BoundLongbow",
-        "ExtraSpell",
-        "BoundCuirass",
-        "BoundHelm",
-        "BoundBoots",
-        "BoundShield",
-        "BoundGloves",
-        "Corprus",
-        "Vampirism",
-        "SummonCenturionSphere",
-        "SunDamage",
-        "StuntedMagicka",
-
-        // Tribunal only
-        "SummonFabricant",
-
-        // Bloodmoon only
-        "SummonWolf",
-        "SummonBear",
-        "SummonBonewolf",
-        "SummonCreature04",
-        "SummonCreature05",
-    };
-
-    const int NumberOfHardcodedFlags = 143;
-    const int HardcodedFlags[NumberOfHardcodedFlags] = {
-        0x11c8, 0x11c0, 0x11c8, 0x11e0, 0x11e0, 0x11e0, 0x11e0, 0x11d0,
-        0x11c0, 0x11c0, 0x11e0, 0x11c0, 0x11184, 0x11184, 0x1f0, 0x1f0,
-        0x1f0, 0x11d2, 0x11f0, 0x11d0, 0x11d0, 0x11d1, 0x1d2, 0x1f0,
-        0x1d0, 0x1d0, 0x1d1, 0x1f0, 0x11d0, 0x11d0, 0x11d0, 0x11d0,
-        0x11d0, 0x11d0, 0x11d0, 0x11d0, 0x11d0, 0x1d0, 0x1d0, 0x11c8,
-        0x31c0, 0x11c0, 0x11c0, 0x11c0, 0x1180, 0x11d8, 0x11d8, 0x11d0,
-        0x11d0, 0x11180, 0x11180, 0x11180, 0x11180, 0x11180, 0x11180, 0x11180,
-        0x11180, 0x11c4, 0x111b8, 0x1040, 0x104c, 0x104c, 0x104c, 0x104c,
-        0x1040, 0x1040, 0x1040, 0x11c0, 0x11c0, 0x1cc, 0x1cc, 0x1cc,
-        0x1cc, 0x1cc, 0x1c2, 0x1c0, 0x1c0, 0x1c0, 0x1c1, 0x11c2,
-        0x11c0, 0x11c0, 0x11c0, 0x11c1, 0x11c0, 0x21192, 0x20190, 0x20190,
-        0x20190, 0x21191, 0x11c0, 0x11c0, 0x11c0, 0x11c0, 0x11c0, 0x11c0,
-        0x11c0, 0x11c0, 0x11c0, 0x11c0, 0x1c0, 0x11190, 0x9048, 0x9048,
-        0x9048, 0x9048, 0x9048, 0x9048, 0x9048, 0x9048, 0x9048, 0x9048,
-        0x9048, 0x9048, 0x9048, 0x9048, 0x9048, 0x11c0, 0x1180, 0x1180,
-        0x5048, 0x5048, 0x5048, 0x5048, 0x5048, 0x5048, 0x1188, 0x5048,
-        0x5048, 0x5048, 0x5048, 0x5048, 0x1048, 0x104c, 0x1048, 0x40,
-        0x11c8, 0x1048, 0x1048, 0x1048, 0x1048, 0x1048, 0x1048
-    };
-}
+        static const char* sIds[MagicEffect::Length] = {
+            "WaterBreathing",
+            "SwiftSwim",
+            "WaterWalking",
+            "Shield",
+            "FireShield",
+            "LightningShield",
+            "FrostShield",
+            "Burden",
+            "Feather",
+            "Jump",
+            "Levitate",
+            "SlowFall",
+            "Lock",
+            "Open",
+            "FireDamage",
+            "ShockDamage",
+            "FrostDamage",
+            "DrainAttribute",
+            "DrainHealth",
+            "DrainMagicka",
+            "DrainFatigue",
+            "DrainSkill",
+            "DamageAttribute",
+            "DamageHealth",
+            "DamageMagicka",
+            "DamageFatigue",
+            "DamageSkill",
+            "Poison",
+            "WeaknessToFire",
+            "WeaknessToFrost",
+            "WeaknessToShock",
+            "WeaknessToMagicka",
+            "WeaknessToCommonDisease",
+            "WeaknessToBlightDisease",
+            "WeaknessToCorprusDisease",
+            "WeaknessToPoison",
+            "WeaknessToNormalWeapons",
+            "DisintegrateWeapon",
+            "DisintegrateArmor",
+            "Invisibility",
+            "Chameleon",
+            "Light",
+            "Sanctuary",
+            "NightEye",
+            "Charm",
+            "Paralyze",
+            "Silence",
+            "Blind",
+            "Sound",
+            "CalmHumanoid",
+            "CalmCreature",
+            "FrenzyHumanoid",
+            "FrenzyCreature",
+            "DemoralizeHumanoid",
+            "DemoralizeCreature",
+            "RallyHumanoid",
+            "RallyCreature",
+            "Dispel",
+            "Soultrap",
+            "Telekinesis",
+            "Mark",
+            "Recall",
+            "DivineIntervention",
+            "AlmsiviIntervention",
+            "DetectAnimal",
+            "DetectEnchantment",
+            "DetectKey",
+            "SpellAbsorption",
+            "Reflect",
+            "CureCommonDisease",
+            "CureBlightDisease",
+            "CureCorprusDisease",
+            "CurePoison",
+            "CureParalyzation",
+            "RestoreAttribute",
+            "RestoreHealth",
+            "RestoreMagicka",
+            "RestoreFatigue",
+            "RestoreSkill",
+            "FortifyAttribute",
+            "FortifyHealth",
+            "FortifyMagicka",
+            "FortifyFatigue",
+            "FortifySkill",
+            "FortifyMaximumMagicka",
+            "AbsorbAttribute",
+            "AbsorbHealth",
+            "AbsorbMagicka",
+            "AbsorbFatigue",
+            "AbsorbSkill",
+            "ResistFire",
+            "ResistFrost",
+            "ResistShock",
+            "ResistMagicka",
+            "ResistCommonDisease",
+            "ResistBlightDisease",
+            "ResistCorprusDisease",
+            "ResistPoison",
+            "ResistNormalWeapons",
+            "ResistParalysis",
+            "RemoveCurse",
+            "TurnUndead",
+            "SummonScamp",
+            "SummonClannfear",
+            "SummonDaedroth",
+            "SummonDremora",
+            "SummonAncestralGhost",
+            "SummonSkeletalMinion",
+            "SummonBonewalker",
+            "SummonGreaterBonewalker",
+            "SummonBonelord",
+            "SummonWingedTwilight",
+            "SummonHunger",
+            "SummonGoldenSaint",
+            "SummonFlameAtronach",
+            "SummonFrostAtronach",
+            "SummonStormAtronach",
+            "FortifyAttack",
+            "CommandCreature",
+            "CommandHumanoid",
+            "BoundDagger",
+            "BoundLongsword",
+            "BoundMace",
+            "BoundBattleAxe",
+            "BoundSpear",
+            "BoundLongbow",
+            "ExtraSpell",
+            "BoundCuirass",
+            "BoundHelm",
+            "BoundBoots",
+            "BoundShield",
+            "BoundGloves",
+            "Corprus",
+            "Vampirism",
+            "SummonCenturionSphere",
+            "SunDamage",
+            "StuntedMagicka",
+
+            // Tribunal only
+            "SummonFabricant",
+
+            // Bloodmoon only
+            "SummonWolf",
+            "SummonBear",
+            "SummonBonewolf",
+            "SummonCreature04",
+            "SummonCreature05",
+        };
+
+        const int NumberOfHardcodedFlags = 143;
+        const int HardcodedFlags[NumberOfHardcodedFlags] = { 0x11c8, 0x11c0, 0x11c8, 0x11e0, 0x11e0, 0x11e0, 0x11e0,
+            0x11d0, 0x11c0, 0x11c0, 0x11e0, 0x11c0, 0x11184, 0x11184, 0x1f0, 0x1f0, 0x1f0, 0x11d2, 0x11f0, 0x11d0,
+            0x11d0, 0x11d1, 0x1d2, 0x1f0, 0x1d0, 0x1d0, 0x1d1, 0x1f0, 0x11d0, 0x11d0, 0x11d0, 0x11d0, 0x11d0, 0x11d0,
+            0x11d0, 0x11d0, 0x11d0, 0x1d0, 0x1d0, 0x11c8, 0x31c0, 0x11c0, 0x11c0, 0x11c0, 0x1180, 0x11d8, 0x11d8,
+            0x11d0, 0x11d0, 0x11180, 0x11180, 0x11180, 0x11180, 0x11180, 0x11180, 0x11180, 0x11180, 0x11c4, 0x111b8,
+            0x1040, 0x104c, 0x104c, 0x104c, 0x104c, 0x1040, 0x1040, 0x1040, 0x11c0, 0x11c0, 0x1cc, 0x1cc, 0x1cc, 0x1cc,
+            0x1cc, 0x1c2, 0x1c0, 0x1c0, 0x1c0, 0x1c1, 0x11c2, 0x11c0, 0x11c0, 0x11c0, 0x11c1, 0x11c0, 0x21192, 0x20190,
+            0x20190, 0x20190, 0x21191, 0x11c0, 0x11c0, 0x11c0, 0x11c0, 0x11c0, 0x11c0, 0x11c0, 0x11c0, 0x11c0, 0x11c0,
+            0x1c0, 0x11190, 0x9048, 0x9048, 0x9048, 0x9048, 0x9048, 0x9048, 0x9048, 0x9048, 0x9048, 0x9048, 0x9048,
+            0x9048, 0x9048, 0x9048, 0x9048, 0x11c0, 0x1180, 0x1180, 0x5048, 0x5048, 0x5048, 0x5048, 0x5048, 0x5048,
+            0x1188, 0x5048, 0x5048, 0x5048, 0x5048, 0x5048, 0x1048, 0x104c, 0x1048, 0x40, 0x11c8, 0x1048, 0x1048,
+            0x1048, 0x1048, 0x1048, 0x1048 };
+    }
 }
 
 namespace ESM
 {
-void MagicEffect::load(ESMReader &esm, bool &isDeleted)
-{
-    isDeleted = false; // MagicEffect record can't be deleted now (may be changed in the future)
-    mRecordFlags = esm.getRecordFlags();
+    void MagicEffect::load(ESMReader& esm, bool& isDeleted)
+    {
+        isDeleted = false; // MagicEffect record can't be deleted now (may be changed in the future)
+        mRecordFlags = esm.getRecordFlags();
 
-    esm.getHNT(mIndex, "INDX");
+        esm.getHNT(mIndex, "INDX");
 
-    mId = indexToId (mIndex);
+        mId = indexToId(mIndex);
 
-    esm.getHNTSized<36>(mData, "MEDT");
-    if (esm.getFormat() == 0)
-    {
-        // don't allow mods to change fixed flags in the legacy format
-        mData.mFlags &= (AllowSpellmaking | AllowEnchanting | NegativeLight);
-        if (mIndex>=0 && mIndex<NumberOfHardcodedFlags)
-        mData.mFlags |= HardcodedFlags[mIndex];
-    }
+        esm.getHNTSized<36>(mData, "MEDT");
+        if (esm.getFormat() == 0)
+        {
+            // don't allow mods to change fixed flags in the legacy format
+            mData.mFlags &= (AllowSpellmaking | AllowEnchanting | NegativeLight);
+            if (mIndex >= 0 && mIndex < NumberOfHardcodedFlags)
+                mData.mFlags |= HardcodedFlags[mIndex];
+        }
 
-    // vanilla MW accepts the _SND subrecords before or after DESC... I hope
-    // this isn't true for other records, or we have to do a mass-refactor
-    while (esm.hasMoreSubs())
-    {
-        esm.getSubName();
-        switch (esm.retSubName().toInt())
+        // vanilla MW accepts the _SND subrecords before or after DESC... I hope
+        // this isn't true for other records, or we have to do a mass-refactor
+        while (esm.hasMoreSubs())
         {
-            case fourCC("ITEX"):
-                mIcon = esm.getHString();
-                break;
-            case fourCC("PTEX"):
-                mParticle = esm.getHString();
-                break;
-            case fourCC("BSND"):
-                mBoltSound = esm.getHString();
-                break;
-            case fourCC("CSND"):
-                mCastSound = esm.getHString();
-                break;
-            case fourCC("HSND"):
-                mHitSound = esm.getHString();
-                break;
-            case fourCC("ASND"):
-                mAreaSound = esm.getHString();
-                break;
-            case fourCC("CVFX"):
-                mCasting = esm.getHString();
-                break;
-            case fourCC("BVFX"):
-                mBolt = esm.getHString();
-                break;
-            case fourCC("HVFX"):
-                mHit = esm.getHString();
-                break;
-            case fourCC("AVFX"):
-                mArea = esm.getHString();
-                break;
-            case fourCC("DESC"):
-                mDescription = esm.getHString();
-                break;
-            default:
-                esm.fail("Unknown subrecord");
+            esm.getSubName();
+            switch (esm.retSubName().toInt())
+            {
+                case fourCC("ITEX"):
+                    mIcon = esm.getHString();
+                    break;
+                case fourCC("PTEX"):
+                    mParticle = esm.getHString();
+                    break;
+                case fourCC("BSND"):
+                    mBoltSound = esm.getHString();
+                    break;
+                case fourCC("CSND"):
+                    mCastSound = esm.getHString();
+                    break;
+                case fourCC("HSND"):
+                    mHitSound = esm.getHString();
+                    break;
+                case fourCC("ASND"):
+                    mAreaSound = esm.getHString();
+                    break;
+                case fourCC("CVFX"):
+                    mCasting = esm.getHString();
+                    break;
+                case fourCC("BVFX"):
+                    mBolt = esm.getHString();
+                    break;
+                case fourCC("HVFX"):
+                    mHit = esm.getHString();
+                    break;
+                case fourCC("AVFX"):
+                    mArea = esm.getHString();
+                    break;
+                case fourCC("DESC"):
+                    mDescription = esm.getHString();
+                    break;
+                default:
+                    esm.fail("Unknown subrecord");
+            }
         }
     }
-}
-void MagicEffect::save(ESMWriter &esm, bool /*isDeleted*/) const
-{
-    esm.writeHNT("INDX", mIndex);
-
-    esm.writeHNT("MEDT", mData, 36);
+    void MagicEffect::save(ESMWriter& esm, bool /*isDeleted*/) const
+    {
+        esm.writeHNT("INDX", mIndex);
 
-    esm.writeHNOCString("ITEX", mIcon);
-    esm.writeHNOCString("PTEX", mParticle);
-    esm.writeHNOCString("BSND", mBoltSound);
-    esm.writeHNOCString("CSND", mCastSound);
-    esm.writeHNOCString("HSND", mHitSound);
-    esm.writeHNOCString("ASND", mAreaSound);
+        esm.writeHNT("MEDT", mData, 36);
 
-    esm.writeHNOCString("CVFX", mCasting);
-    esm.writeHNOCString("BVFX", mBolt);
-    esm.writeHNOCString("HVFX", mHit);
-    esm.writeHNOCString("AVFX", mArea);
+        esm.writeHNOCString("ITEX", mIcon);
+        esm.writeHNOCString("PTEX", mParticle);
+        esm.writeHNOCString("BSND", mBoltSound);
+        esm.writeHNOCString("CSND", mCastSound);
+        esm.writeHNOCString("HSND", mHitSound);
+        esm.writeHNOCString("ASND", mAreaSound);
 
-    esm.writeHNOString("DESC", mDescription);
-}
+        esm.writeHNOCString("CVFX", mCasting);
+        esm.writeHNOCString("BVFX", mBolt);
+        esm.writeHNOCString("HVFX", mHit);
+        esm.writeHNOCString("AVFX", mArea);
 
-short MagicEffect::getResistanceEffect(short effect)
-{
-    // Source https://wiki.openmw.org/index.php?title=Research:Magic#Effect_attribute
+        esm.writeHNOString("DESC", mDescription);
+    }
 
-    // <Effect, Effect providing resistance against first effect>
-    static std::map<short, short> effects;
-    if (effects.empty())
+    short MagicEffect::getResistanceEffect(short effect)
     {
-        effects[DisintegrateArmor] = Sanctuary;
-        effects[DisintegrateWeapon] = Sanctuary;
-
-        for (int i = DrainAttribute; i <= DamageSkill; ++i)
-            effects[i] = ResistMagicka;
-        for (int i = AbsorbAttribute; i <= AbsorbSkill; ++i)
-            effects[i] = ResistMagicka;
-        for (int i = WeaknessToFire; i <= WeaknessToNormalWeapons; ++i)
-            effects[i] = ResistMagicka;
-
-        effects[Burden] = ResistMagicka;
-        effects[Charm] = ResistMagicka;
-        effects[Silence] = ResistMagicka;
-        effects[Blind] = ResistMagicka;
-        effects[Sound] = ResistMagicka;
-
-        for (int i=0; i<2; ++i)
+        // Source https://wiki.openmw.org/index.php?title=Research:Magic#Effect_attribute
+
+        // <Effect, Effect providing resistance against first effect>
+        static std::map<short, short> effects;
+        if (effects.empty())
         {
-            effects[CalmHumanoid+i] = ResistMagicka;
-            effects[FrenzyHumanoid+i] = ResistMagicka;
-            effects[DemoralizeHumanoid+i] = ResistMagicka;
-            effects[RallyHumanoid+i] = ResistMagicka;
-        }
+            effects[DisintegrateArmor] = Sanctuary;
+            effects[DisintegrateWeapon] = Sanctuary;
+
+            for (int i = DrainAttribute; i <= DamageSkill; ++i)
+                effects[i] = ResistMagicka;
+            for (int i = AbsorbAttribute; i <= AbsorbSkill; ++i)
+                effects[i] = ResistMagicka;
+            for (int i = WeaknessToFire; i <= WeaknessToNormalWeapons; ++i)
+                effects[i] = ResistMagicka;
+
+            effects[Burden] = ResistMagicka;
+            effects[Charm] = ResistMagicka;
+            effects[Silence] = ResistMagicka;
+            effects[Blind] = ResistMagicka;
+            effects[Sound] = ResistMagicka;
+
+            for (int i = 0; i < 2; ++i)
+            {
+                effects[CalmHumanoid + i] = ResistMagicka;
+                effects[FrenzyHumanoid + i] = ResistMagicka;
+                effects[DemoralizeHumanoid + i] = ResistMagicka;
+                effects[RallyHumanoid + i] = ResistMagicka;
+            }
 
-        effects[TurnUndead] = ResistMagicka;
+            effects[TurnUndead] = ResistMagicka;
 
-        effects[FireDamage] = ResistFire;
-        effects[FrostDamage] = ResistFrost;
-        effects[ShockDamage] = ResistShock;
-        effects[Vampirism] = ResistCommonDisease;
-        effects[Corprus] = ResistCorprusDisease;
-        effects[Poison] = ResistPoison;
-        effects[Paralyze] = ResistParalysis;
-    }
+            effects[FireDamage] = ResistFire;
+            effects[FrostDamage] = ResistFrost;
+            effects[ShockDamage] = ResistShock;
+            effects[Vampirism] = ResistCommonDisease;
+            effects[Corprus] = ResistCorprusDisease;
+            effects[Poison] = ResistPoison;
+            effects[Paralyze] = ResistParalysis;
+        }
 
-    if (effects.find(effect) != effects.end())
-        return effects[effect];
-    else
-        return -1;
-}
+        if (effects.find(effect) != effects.end())
+            return effects[effect];
+        else
+            return -1;
+    }
 
-short MagicEffect::getWeaknessEffect(short effect)
-{
-    static std::map<short, short> effects;
-    if (effects.empty())
+    short MagicEffect::getWeaknessEffect(short effect)
     {
-        for (int i = DrainAttribute; i <= DamageSkill; ++i)
-            effects[i] = WeaknessToMagicka;
-        for (int i = AbsorbAttribute; i <= AbsorbSkill; ++i)
-            effects[i] = WeaknessToMagicka;
-        for (int i = WeaknessToFire; i <= WeaknessToNormalWeapons; ++i)
-            effects[i] = WeaknessToMagicka;
-
-        effects[Burden] = WeaknessToMagicka;
-        effects[Charm] = WeaknessToMagicka;
-        effects[Silence] = WeaknessToMagicka;
-        effects[Blind] = WeaknessToMagicka;
-        effects[Sound] = WeaknessToMagicka;
-
-        for (int i=0; i<2; ++i)
+        static std::map<short, short> effects;
+        if (effects.empty())
         {
-            effects[CalmHumanoid+i] = WeaknessToMagicka;
-            effects[FrenzyHumanoid+i] = WeaknessToMagicka;
-            effects[DemoralizeHumanoid+i] = WeaknessToMagicka;
-            effects[RallyHumanoid+i] = WeaknessToMagicka;
-        }
+            for (int i = DrainAttribute; i <= DamageSkill; ++i)
+                effects[i] = WeaknessToMagicka;
+            for (int i = AbsorbAttribute; i <= AbsorbSkill; ++i)
+                effects[i] = WeaknessToMagicka;
+            for (int i = WeaknessToFire; i <= WeaknessToNormalWeapons; ++i)
+                effects[i] = WeaknessToMagicka;
+
+            effects[Burden] = WeaknessToMagicka;
+            effects[Charm] = WeaknessToMagicka;
+            effects[Silence] = WeaknessToMagicka;
+            effects[Blind] = WeaknessToMagicka;
+            effects[Sound] = WeaknessToMagicka;
+
+            for (int i = 0; i < 2; ++i)
+            {
+                effects[CalmHumanoid + i] = WeaknessToMagicka;
+                effects[FrenzyHumanoid + i] = WeaknessToMagicka;
+                effects[DemoralizeHumanoid + i] = WeaknessToMagicka;
+                effects[RallyHumanoid + i] = WeaknessToMagicka;
+            }
+
+            effects[TurnUndead] = WeaknessToMagicka;
 
-        effects[TurnUndead] = WeaknessToMagicka;
+            effects[FireDamage] = WeaknessToFire;
+            effects[FrostDamage] = WeaknessToFrost;
+            effects[ShockDamage] = WeaknessToShock;
+            effects[Vampirism] = WeaknessToCommonDisease;
+            effects[Corprus] = WeaknessToCorprusDisease;
+            effects[Poison] = WeaknessToPoison;
 
-        effects[FireDamage] = WeaknessToFire;
-        effects[FrostDamage] = WeaknessToFrost;
-        effects[ShockDamage] = WeaknessToShock;
-        effects[Vampirism] = WeaknessToCommonDisease;
-        effects[Corprus] = WeaknessToCorprusDisease;
-        effects[Poison] = WeaknessToPoison;
+            effects[Paralyze] = -1;
+        }
 
-        effects[Paralyze] = -1;
+        if (effects.find(effect) != effects.end())
+            return effects[effect];
+        else
+            return -1;
     }
 
-    if (effects.find(effect) != effects.end())
-        return effects[effect];
-    else
-        return -1;
-}
+    static std::map<short, std::string> genNameMap()
+    {
+        // Map effect ID to GMST name
+        // http://www.uesp.net/morrow/hints/mweffects.shtml
+        std::map<short, std::string> names;
+        names[85] = "sEffectAbsorbAttribute";
+        names[88] = "sEffectAbsorbFatigue";
+        names[86] = "sEffectAbsorbHealth";
+        names[87] = "sEffectAbsorbSpellPoints";
+        names[89] = "sEffectAbsorbSkill";
+        names[63] = "sEffectAlmsiviIntervention";
+        names[47] = "sEffectBlind";
+        names[123] = "sEffectBoundBattleAxe";
+        names[129] = "sEffectBoundBoots";
+        names[127] = "sEffectBoundCuirass";
+        names[120] = "sEffectBoundDagger";
+        names[131] = "sEffectBoundGloves";
+        names[128] = "sEffectBoundHelm";
+        names[125] = "sEffectBoundLongbow";
+        names[126] = "sEffectExtraSpell";
+        names[121] = "sEffectBoundLongsword";
+        names[122] = "sEffectBoundMace";
+        names[130] = "sEffectBoundShield";
+        names[124] = "sEffectBoundSpear";
+        names[7] = "sEffectBurden";
+        names[50] = "sEffectCalmCreature";
+        names[49] = "sEffectCalmHumanoid";
+        names[40] = "sEffectChameleon";
+        names[44] = "sEffectCharm";
+        names[118] = "sEffectCommandCreatures";
+        names[119] = "sEffectCommandHumanoids";
+        names[132] = "sEffectCorpus"; // NB this typo. (bethesda made it)
+        names[70] = "sEffectCureBlightDisease";
+        names[69] = "sEffectCureCommonDisease";
+        names[71] = "sEffectCureCorprusDisease";
+        names[73] = "sEffectCureParalyzation";
+        names[72] = "sEffectCurePoison";
+        names[22] = "sEffectDamageAttribute";
+        names[25] = "sEffectDamageFatigue";
+        names[23] = "sEffectDamageHealth";
+        names[24] = "sEffectDamageMagicka";
+        names[26] = "sEffectDamageSkill";
+        names[54] = "sEffectDemoralizeCreature";
+        names[53] = "sEffectDemoralizeHumanoid";
+        names[64] = "sEffectDetectAnimal";
+        names[65] = "sEffectDetectEnchantment";
+        names[66] = "sEffectDetectKey";
+        names[38] = "sEffectDisintegrateArmor";
+        names[37] = "sEffectDisintegrateWeapon";
+        names[57] = "sEffectDispel";
+        names[62] = "sEffectDivineIntervention";
+        names[17] = "sEffectDrainAttribute";
+        names[20] = "sEffectDrainFatigue";
+        names[18] = "sEffectDrainHealth";
+        names[19] = "sEffectDrainSpellpoints";
+        names[21] = "sEffectDrainSkill";
+        names[8] = "sEffectFeather";
+        names[14] = "sEffectFireDamage";
+        names[4] = "sEffectFireShield";
+        names[117] = "sEffectFortifyAttackBonus";
+        names[79] = "sEffectFortifyAttribute";
+        names[82] = "sEffectFortifyFatigue";
+        names[80] = "sEffectFortifyHealth";
+        names[81] = "sEffectFortifySpellpoints";
+        names[84] = "sEffectFortifyMagickaMultiplier";
+        names[83] = "sEffectFortifySkill";
+        names[52] = "sEffectFrenzyCreature";
+        names[51] = "sEffectFrenzyHumanoid";
+        names[16] = "sEffectFrostDamage";
+        names[6] = "sEffectFrostShield";
+        names[39] = "sEffectInvisibility";
+        names[9] = "sEffectJump";
+        names[10] = "sEffectLevitate";
+        names[41] = "sEffectLight";
+        names[5] = "sEffectLightningShield";
+        names[12] = "sEffectLock";
+        names[60] = "sEffectMark";
+        names[43] = "sEffectNightEye";
+        names[13] = "sEffectOpen";
+        names[45] = "sEffectParalyze";
+        names[27] = "sEffectPoison";
+        names[56] = "sEffectRallyCreature";
+        names[55] = "sEffectRallyHumanoid";
+        names[61] = "sEffectRecall";
+        names[68] = "sEffectReflect";
+        names[100] = "sEffectRemoveCurse";
+        names[95] = "sEffectResistBlightDisease";
+        names[94] = "sEffectResistCommonDisease";
+        names[96] = "sEffectResistCorprusDisease";
+        names[90] = "sEffectResistFire";
+        names[91] = "sEffectResistFrost";
+        names[93] = "sEffectResistMagicka";
+        names[98] = "sEffectResistNormalWeapons";
+        names[99] = "sEffectResistParalysis";
+        names[97] = "sEffectResistPoison";
+        names[92] = "sEffectResistShock";
+        names[74] = "sEffectRestoreAttribute";
+        names[77] = "sEffectRestoreFatigue";
+        names[75] = "sEffectRestoreHealth";
+        names[76] = "sEffectRestoreSpellPoints";
+        names[78] = "sEffectRestoreSkill";
+        names[42] = "sEffectSanctuary";
+        names[3] = "sEffectShield";
+        names[15] = "sEffectShockDamage";
+        names[46] = "sEffectSilence";
+        names[11] = "sEffectSlowFall";
+        names[58] = "sEffectSoultrap";
+        names[48] = "sEffectSound";
+        names[67] = "sEffectSpellAbsorption";
+        names[136] = "sEffectStuntedMagicka";
+        names[106] = "sEffectSummonAncestralGhost";
+        names[110] = "sEffectSummonBonelord";
+        names[108] = "sEffectSummonLeastBonewalker";
+        names[134] = "sEffectSummonCenturionSphere";
+        names[103] = "sEffectSummonClannfear";
+        names[104] = "sEffectSummonDaedroth";
+        names[105] = "sEffectSummonDremora";
+        names[114] = "sEffectSummonFlameAtronach";
+        names[115] = "sEffectSummonFrostAtronach";
+        names[113] = "sEffectSummonGoldenSaint";
+        names[109] = "sEffectSummonGreaterBonewalker";
+        names[112] = "sEffectSummonHunger";
+        names[102] = "sEffectSummonScamp";
+        names[107] = "sEffectSummonSkeletalMinion";
+        names[116] = "sEffectSummonStormAtronach";
+        names[111] = "sEffectSummonWingedTwilight";
+        names[135] = "sEffectSunDamage";
+        names[1] = "sEffectSwiftSwim";
+        names[59] = "sEffectTelekinesis";
+        names[101] = "sEffectTurnUndead";
+        names[133] = "sEffectVampirism";
+        names[0] = "sEffectWaterBreathing";
+        names[2] = "sEffectWaterWalking";
+        names[33] = "sEffectWeaknesstoBlightDisease";
+        names[32] = "sEffectWeaknesstoCommonDisease";
+        names[34] = "sEffectWeaknesstoCorprusDisease";
+        names[28] = "sEffectWeaknesstoFire";
+        names[29] = "sEffectWeaknesstoFrost";
+        names[31] = "sEffectWeaknesstoMagicka";
+        names[36] = "sEffectWeaknesstoNormalWeapons";
+        names[35] = "sEffectWeaknesstoPoison";
+        names[30] = "sEffectWeaknesstoShock";
+
+        // bloodmoon
+        names[138] = "sEffectSummonCreature01";
+        names[139] = "sEffectSummonCreature02";
+        names[140] = "sEffectSummonCreature03";
+        names[141] = "sEffectSummonCreature04";
+        names[142] = "sEffectSummonCreature05";
+
+        // tribunal
+        names[137] = "sEffectSummonFabricant";
+
+        return names;
+    }
+    const std::map<short, std::string> MagicEffect::sNames = genNameMap();
 
-static std::map<short,std::string> genNameMap()
-{
-    // Map effect ID to GMST name
-    // http://www.uesp.net/morrow/hints/mweffects.shtml
-    std::map<short, std::string> names;
-    names[85] ="sEffectAbsorbAttribute";
-    names[88] ="sEffectAbsorbFatigue";
-    names[86] ="sEffectAbsorbHealth";
-    names[87] ="sEffectAbsorbSpellPoints";
-    names[89] ="sEffectAbsorbSkill";
-    names[63] ="sEffectAlmsiviIntervention";
-    names[47] ="sEffectBlind";
-    names[123] ="sEffectBoundBattleAxe";
-    names[129] ="sEffectBoundBoots";
-    names[127] ="sEffectBoundCuirass";
-    names[120] ="sEffectBoundDagger";
-    names[131] ="sEffectBoundGloves";
-    names[128] ="sEffectBoundHelm";
-    names[125] ="sEffectBoundLongbow";
-    names[126] ="sEffectExtraSpell";
-    names[121] ="sEffectBoundLongsword";
-    names[122] ="sEffectBoundMace";
-    names[130] ="sEffectBoundShield";
-    names[124] ="sEffectBoundSpear";
-    names[7] ="sEffectBurden";
-    names[50] ="sEffectCalmCreature";
-    names[49] ="sEffectCalmHumanoid";
-    names[40] ="sEffectChameleon";
-    names[44] ="sEffectCharm";
-    names[118] ="sEffectCommandCreatures";
-    names[119] ="sEffectCommandHumanoids";
-    names[132] ="sEffectCorpus"; // NB this typo. (bethesda made it)
-    names[70] ="sEffectCureBlightDisease";
-    names[69] ="sEffectCureCommonDisease";
-    names[71] ="sEffectCureCorprusDisease";
-    names[73] ="sEffectCureParalyzation";
-    names[72] ="sEffectCurePoison";
-    names[22] ="sEffectDamageAttribute";
-    names[25] ="sEffectDamageFatigue";
-    names[23] ="sEffectDamageHealth";
-    names[24] ="sEffectDamageMagicka";
-    names[26] ="sEffectDamageSkill";
-    names[54] ="sEffectDemoralizeCreature";
-    names[53] ="sEffectDemoralizeHumanoid";
-    names[64] ="sEffectDetectAnimal";
-    names[65] ="sEffectDetectEnchantment";
-    names[66] ="sEffectDetectKey";
-    names[38] ="sEffectDisintegrateArmor";
-    names[37] ="sEffectDisintegrateWeapon";
-    names[57] ="sEffectDispel";
-    names[62] ="sEffectDivineIntervention";
-    names[17] ="sEffectDrainAttribute";
-    names[20] ="sEffectDrainFatigue";
-    names[18] ="sEffectDrainHealth";
-    names[19] ="sEffectDrainSpellpoints";
-    names[21] ="sEffectDrainSkill";
-    names[8] ="sEffectFeather";
-    names[14] ="sEffectFireDamage";
-    names[4] ="sEffectFireShield";
-    names[117] ="sEffectFortifyAttackBonus";
-    names[79] ="sEffectFortifyAttribute";
-    names[82] ="sEffectFortifyFatigue";
-    names[80] ="sEffectFortifyHealth";
-    names[81] ="sEffectFortifySpellpoints";
-    names[84] ="sEffectFortifyMagickaMultiplier";
-    names[83] ="sEffectFortifySkill";
-    names[52] ="sEffectFrenzyCreature";
-    names[51] ="sEffectFrenzyHumanoid";
-    names[16] ="sEffectFrostDamage";
-    names[6] ="sEffectFrostShield";
-    names[39] ="sEffectInvisibility";
-    names[9] ="sEffectJump";
-    names[10] ="sEffectLevitate";
-    names[41] ="sEffectLight";
-    names[5] ="sEffectLightningShield";
-    names[12] ="sEffectLock";
-    names[60] ="sEffectMark";
-    names[43] ="sEffectNightEye";
-    names[13] ="sEffectOpen";
-    names[45] ="sEffectParalyze";
-    names[27] ="sEffectPoison";
-    names[56] ="sEffectRallyCreature";
-    names[55] ="sEffectRallyHumanoid";
-    names[61] ="sEffectRecall";
-    names[68] ="sEffectReflect";
-    names[100] ="sEffectRemoveCurse";
-    names[95] ="sEffectResistBlightDisease";
-    names[94] ="sEffectResistCommonDisease";
-    names[96] ="sEffectResistCorprusDisease";
-    names[90] ="sEffectResistFire";
-    names[91] ="sEffectResistFrost";
-    names[93] ="sEffectResistMagicka";
-    names[98] ="sEffectResistNormalWeapons";
-    names[99] ="sEffectResistParalysis";
-    names[97] ="sEffectResistPoison";
-    names[92] ="sEffectResistShock";
-    names[74] ="sEffectRestoreAttribute";
-    names[77] ="sEffectRestoreFatigue";
-    names[75] ="sEffectRestoreHealth";
-    names[76] ="sEffectRestoreSpellPoints";
-    names[78] ="sEffectRestoreSkill";
-    names[42] ="sEffectSanctuary";
-    names[3] ="sEffectShield";
-    names[15] ="sEffectShockDamage";
-    names[46] ="sEffectSilence";
-    names[11] ="sEffectSlowFall";
-    names[58] ="sEffectSoultrap";
-    names[48] ="sEffectSound";
-    names[67] ="sEffectSpellAbsorption";
-    names[136] ="sEffectStuntedMagicka";
-    names[106] ="sEffectSummonAncestralGhost";
-    names[110] ="sEffectSummonBonelord";
-    names[108] ="sEffectSummonLeastBonewalker";
-    names[134] ="sEffectSummonCenturionSphere";
-    names[103] ="sEffectSummonClannfear";
-    names[104] ="sEffectSummonDaedroth";
-    names[105] ="sEffectSummonDremora";
-    names[114] ="sEffectSummonFlameAtronach";
-    names[115] ="sEffectSummonFrostAtronach";
-    names[113] ="sEffectSummonGoldenSaint";
-    names[109] ="sEffectSummonGreaterBonewalker";
-    names[112] ="sEffectSummonHunger";
-    names[102] ="sEffectSummonScamp";
-    names[107] ="sEffectSummonSkeletalMinion";
-    names[116] ="sEffectSummonStormAtronach";
-    names[111] ="sEffectSummonWingedTwilight";
-    names[135] ="sEffectSunDamage";
-    names[1] ="sEffectSwiftSwim";
-    names[59] ="sEffectTelekinesis";
-    names[101] ="sEffectTurnUndead";
-    names[133] ="sEffectVampirism";
-    names[0] ="sEffectWaterBreathing";
-    names[2] ="sEffectWaterWalking";
-    names[33] ="sEffectWeaknesstoBlightDisease";
-    names[32] ="sEffectWeaknesstoCommonDisease";
-    names[34] ="sEffectWeaknesstoCorprusDisease";
-    names[28] ="sEffectWeaknesstoFire";
-    names[29] ="sEffectWeaknesstoFrost";
-    names[31] ="sEffectWeaknesstoMagicka";
-    names[36] ="sEffectWeaknesstoNormalWeapons";
-    names[35] ="sEffectWeaknesstoPoison";
-    names[30] ="sEffectWeaknesstoShock";
-
-    // bloodmoon
-    names[138] ="sEffectSummonCreature01";
-    names[139] ="sEffectSummonCreature02";
-    names[140] ="sEffectSummonCreature03";
-    names[141] ="sEffectSummonCreature04";
-    names[142] ="sEffectSummonCreature05";
-
-    // tribunal
-    names[137] ="sEffectSummonFabricant";
-
-    return names;
-}
-const std::map<short,std::string> MagicEffect::sNames = genNameMap();
+    const std::string& MagicEffect::effectIdToString(short effectID)
+    {
+        std::map<short, std::string>::const_iterator name = sNames.find(effectID);
+        if (name == sNames.end())
+            throw std::runtime_error(std::string("Unimplemented effect ID ") + std::to_string(effectID));
 
-const std::string &MagicEffect::effectIdToString(short effectID)
-{
-    std::map<short,std::string>::const_iterator name = sNames.find(effectID);
-    if(name == sNames.end())
-        throw std::runtime_error(std::string("Unimplemented effect ID ")+std::to_string(effectID));
+        return name->second;
+    }
 
-    return name->second;
-}
+    class FindSecond
+    {
+        std::string_view mName;
 
-class FindSecond {
-    std::string_view mName;
+    public:
+        FindSecond(std::string_view name)
+            : mName(name)
+        {
+        }
 
-public:
-    FindSecond(std::string_view name) : mName(name) { }
+        bool operator()(const std::pair<short, std::string>& item) const
+        {
+            if (Misc::StringUtils::ciEqual(item.second, mName))
+                return true;
+            return false;
+        }
+    };
 
-    bool operator()(const std::pair<short,std::string> &item) const
+    short MagicEffect::effectStringToId(std::string_view effect)
     {
-        if(Misc::StringUtils::ciEqual(item.second, mName))
-            return true;
-        return false;
-    }
-};
+        std::map<short, std::string>::const_iterator name;
 
-short MagicEffect::effectStringToId(std::string_view effect)
-{
-    std::map<short,std::string>::const_iterator name;
-
-    name = std::find_if(sNames.begin(), sNames.end(), FindSecond(effect));
-    if(name == sNames.end())
-        throw std::runtime_error("Unimplemented effect " + std::string(effect));
+        name = std::find_if(sNames.begin(), sNames.end(), FindSecond(effect));
+        if (name == sNames.end())
+            throw std::runtime_error("Unimplemented effect " + std::string(effect));
 
-    return name->first;
-}
+        return name->first;
+    }
 
-MagicEffect::MagnitudeDisplayType MagicEffect::getMagnitudeDisplayType() const {
-    if ( mData.mFlags & NoMagnitude )
-        return MDT_None;
-    if ( mIndex == 84 )
-        return MDT_TimesInt;
-    if ( mIndex == 59 ||
-        ( mIndex >= 64 && mIndex <= 66) )
-        return MDT_Feet;
-    if ( mIndex == 118 || mIndex == 119 )
-        return MDT_Level;
-    if (   ( mIndex >= 28 && mIndex <= 36 )
-        || ( mIndex >= 90 && mIndex <= 99 )
-        ||   mIndex == 40 || mIndex == 47
-        ||   mIndex == 57 || mIndex == 68 )
-        return MDT_Percentage;
-
-    return MDT_Points;
-}
+    MagicEffect::MagnitudeDisplayType MagicEffect::getMagnitudeDisplayType() const
+    {
+        if (mData.mFlags & NoMagnitude)
+            return MDT_None;
+        if (mIndex == 84)
+            return MDT_TimesInt;
+        if (mIndex == 59 || (mIndex >= 64 && mIndex <= 66))
+            return MDT_Feet;
+        if (mIndex == 118 || mIndex == 119)
+            return MDT_Level;
+        if ((mIndex >= 28 && mIndex <= 36) || (mIndex >= 90 && mIndex <= 99) || mIndex == 40 || mIndex == 47
+            || mIndex == 57 || mIndex == 68)
+            return MDT_Percentage;
+
+        return MDT_Points;
+    }
 
     void MagicEffect::blank()
     {
@@ -600,25 +593,25 @@ MagicEffect::MagnitudeDisplayType MagicEffect::getMagnitudeDisplayType() const {
         mDescription.clear();
     }
 
-    std::string MagicEffect::indexToId (int index)
+    std::string MagicEffect::indexToId(int index)
     {
         std::ostringstream stream;
 
-        if (index!=-1)
+        if (index != -1)
         {
             stream << "#";
 
-            if (index<100)
+            if (index < 100)
             {
                 stream << "0";
 
-                if (index<10)
+                if (index < 10)
                     stream << "0";
             }
 
             stream << index;
 
-            if (index>=0 && index<Length)
+            if (index >= 0 && index < Length)
                 stream << sIds[index];
         }
 
diff --git a/components/esm3/loadmgef.hpp b/components/esm3/loadmgef.hpp
index 6cd1ffad9b..e5c2eb3543 100644
--- a/components/esm3/loadmgef.hpp
+++ b/components/esm3/loadmgef.hpp
@@ -1,268 +1,274 @@
 #ifndef OPENMW_ESM_MGEF_H
 #define OPENMW_ESM_MGEF_H
 
+#include <map>
 #include <string>
 #include <string_view>
-#include <map>
 
 #include "components/esm/defs.hpp"
 
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-struct MagicEffect
-{
-    constexpr static RecNameInts sRecordId = REC_MGEF;
+    struct MagicEffect
+    {
+        constexpr static RecNameInts sRecordId = REC_MGEF;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "MagicEffect"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "MagicEffect"; }
 
-    unsigned int mRecordFlags;
-    std::string mId;
+        unsigned int mRecordFlags;
+        std::string mId;
 
-    enum Flags
-    {
-        // Originally fixed flags (HardcodedFlags array consists of just these)
-        TargetSkill = 0x1, // Affects a specific skill, which is specified elsewhere in the effect structure.
-        TargetAttribute = 0x2, // Affects a specific attribute, which is specified elsewhere in the effect structure.
-        NoDuration = 0x4, // Has no duration. Only runs effect once on cast.
-        NoMagnitude = 0x8, // Has no magnitude.
-        Harmful = 0x10, // Counts as a negative effect. Interpreted as useful for attack, and is treated as a bad effect in alchemy.
-        ContinuousVfx = 0x20, // The effect's hit particle VFX repeats for the full duration of the spell, rather than occuring once on hit.
-        CastSelf = 0x40, // Allows range - cast on self.
-        CastTouch = 0x80, // Allows range - cast on touch.
-        CastTarget = 0x100, // Allows range - cast on target.
-        AppliedOnce = 0x1000, // An effect that is applied once it lands, instead of continuously. Allows an effect to reduce an attribute below zero; removes the normal minimum effect duration of 1 second.
-        Stealth = 0x2000, // Unused
-        NonRecastable = 0x4000, // Does not land if parent spell is already affecting target. Shows "you cannot re-cast" message for self target.
-        IllegalDaedra = 0x8000, // Unused
-        Unreflectable = 0x10000, // Cannot be reflected, the effect always lands normally.
-        CasterLinked = 0x20000, // Must quench if caster is dead, or not an NPC/creature. Not allowed in containter/door trap spells.
+        enum Flags
+        {
+            // Originally fixed flags (HardcodedFlags array consists of just these)
+            TargetSkill = 0x1, // Affects a specific skill, which is specified elsewhere in the effect structure.
+            TargetAttribute
+            = 0x2, // Affects a specific attribute, which is specified elsewhere in the effect structure.
+            NoDuration = 0x4, // Has no duration. Only runs effect once on cast.
+            NoMagnitude = 0x8, // Has no magnitude.
+            Harmful = 0x10, // Counts as a negative effect. Interpreted as useful for attack, and is treated as a bad
+                            // effect in alchemy.
+            ContinuousVfx = 0x20, // The effect's hit particle VFX repeats for the full duration of the spell, rather
+                                  // than occuring once on hit.
+            CastSelf = 0x40, // Allows range - cast on self.
+            CastTouch = 0x80, // Allows range - cast on touch.
+            CastTarget = 0x100, // Allows range - cast on target.
+            AppliedOnce
+            = 0x1000, // An effect that is applied once it lands, instead of continuously. Allows an effect to reduce an
+                      // attribute below zero; removes the normal minimum effect duration of 1 second.
+            Stealth = 0x2000, // Unused
+            NonRecastable = 0x4000, // Does not land if parent spell is already affecting target. Shows "you cannot
+                                    // re-cast" message for self target.
+            IllegalDaedra = 0x8000, // Unused
+            Unreflectable = 0x10000, // Cannot be reflected, the effect always lands normally.
+            CasterLinked = 0x20000, // Must quench if caster is dead, or not an NPC/creature. Not allowed in
+                                    // containter/door trap spells.
 
-        // Originally modifiable flags
-        AllowSpellmaking = 0x200, // Can be used for spellmaking
-        AllowEnchanting = 0x400, // Can be used for enchanting
-        NegativeLight = 0x800 // Unused
-    };
+            // Originally modifiable flags
+            AllowSpellmaking = 0x200, // Can be used for spellmaking
+            AllowEnchanting = 0x400, // Can be used for enchanting
+            NegativeLight = 0x800 // Unused
+        };
 
-    enum MagnitudeDisplayType
-    {
-        MDT_None,
-        MDT_Feet,
-        MDT_Level,
-        MDT_Percentage,
-        MDT_Points,
-        MDT_TimesInt
-    };
+        enum MagnitudeDisplayType
+        {
+            MDT_None,
+            MDT_Feet,
+            MDT_Level,
+            MDT_Percentage,
+            MDT_Points,
+            MDT_TimesInt
+        };
 
-    struct MEDTstruct
-    {
-        int mSchool; // SpellSchool, see defs.hpp
-        float mBaseCost;
-        int mFlags;
-        // Glow color for enchanted items with this effect
-        int mRed, mGreen, mBlue;
+        struct MEDTstruct
+        {
+            int mSchool; // SpellSchool, see defs.hpp
+            float mBaseCost;
+            int mFlags;
+            // Glow color for enchanted items with this effect
+            int mRed, mGreen, mBlue;
 
-        float mUnknown1; // Called "Size X" in CS
-        float mSpeed; // Speed of fired projectile
-        float mUnknown2; // Called "Size Cap" in CS
-    }; // 36 bytes
+            float mUnknown1; // Called "Size X" in CS
+            float mSpeed; // Speed of fired projectile
+            float mUnknown2; // Called "Size Cap" in CS
+        }; // 36 bytes
 
-    static const std::map<short,std::string> sNames;
+        static const std::map<short, std::string> sNames;
 
-    static const std::string &effectIdToString(short effectID);
-    static short effectStringToId(std::string_view effect);
+        static const std::string& effectIdToString(short effectID);
+        static short effectStringToId(std::string_view effect);
 
-    /// Returns the effect that provides resistance against \a effect (or -1 if there's none)
-    static short getResistanceEffect(short effect);
-    /// Returns the effect that induces weakness against \a effect (or -1 if there's none)
-    static short getWeaknessEffect(short effect);
+        /// Returns the effect that provides resistance against \a effect (or -1 if there's none)
+        static short getResistanceEffect(short effect);
+        /// Returns the effect that induces weakness against \a effect (or -1 if there's none)
+        static short getWeaknessEffect(short effect);
 
-    MagnitudeDisplayType getMagnitudeDisplayType() const;
+        MagnitudeDisplayType getMagnitudeDisplayType() const;
 
+        MEDTstruct mData;
 
-    MEDTstruct mData;
+        std::string mIcon, mParticle; // Textures
+        std::string mCasting, mHit, mArea; // Static
+        std::string mBolt; // Weapon
+        std::string mCastSound, mBoltSound, mHitSound, mAreaSound; // Sounds
+        std::string mDescription;
 
-    std::string mIcon, mParticle; // Textures
-    std::string mCasting, mHit, mArea; // Static
-    std::string mBolt; // Weapon
-    std::string mCastSound, mBoltSound, mHitSound, mAreaSound; // Sounds
-    std::string mDescription;
+        // Index of this magical effect. Corresponds to one of the
+        // hard-coded effects in the original engine:
+        // 0-136 in Morrowind
+        // 137 in Tribunal
+        // 138-140 in Bloodmoon (also changes 64?)
+        // 141-142 are summon effects introduced in bloodmoon, but not used
+        // there. They can be redefined in mods by setting the name in GMST
+        // sEffectSummonCreature04/05 creature id in
+        // sMagicCreature04ID/05ID.
+        int mIndex;
 
-    // Index of this magical effect. Corresponds to one of the
-    // hard-coded effects in the original engine:
-    // 0-136 in Morrowind
-    // 137 in Tribunal
-    // 138-140 in Bloodmoon (also changes 64?)
-    // 141-142 are summon effects introduced in bloodmoon, but not used
-    // there. They can be redefined in mods by setting the name in GMST
-    // sEffectSummonCreature04/05 creature id in
-    // sMagicCreature04ID/05ID.
-    int mIndex;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        /// Set record to default state (does not touch the ID/index).
+        void blank();
 
-     /// Set record to default state (does not touch the ID/index).
-    void blank();
+        enum Effects
+        {
+            WaterBreathing = 0,
+            SwiftSwim = 1,
+            WaterWalking = 2,
+            Shield = 3,
+            FireShield = 4,
+            LightningShield = 5,
+            FrostShield = 6,
+            Burden = 7,
+            Feather = 8,
+            Jump = 9,
+            Levitate = 10,
+            SlowFall = 11,
+            Lock = 12,
+            Open = 13,
+            FireDamage = 14,
+            ShockDamage = 15,
+            FrostDamage = 16,
+            DrainAttribute = 17,
+            DrainHealth = 18,
+            DrainMagicka = 19,
+            DrainFatigue = 20,
+            DrainSkill = 21,
+            DamageAttribute = 22,
+            DamageHealth = 23,
+            DamageMagicka = 24,
+            DamageFatigue = 25,
+            DamageSkill = 26,
+            Poison = 27,
+            WeaknessToFire = 28,
+            WeaknessToFrost = 29,
+            WeaknessToShock = 30,
+            WeaknessToMagicka = 31,
+            WeaknessToCommonDisease = 32,
+            WeaknessToBlightDisease = 33,
+            WeaknessToCorprusDisease = 34,
+            WeaknessToPoison = 35,
+            WeaknessToNormalWeapons = 36,
+            DisintegrateWeapon = 37,
+            DisintegrateArmor = 38,
+            Invisibility = 39,
+            Chameleon = 40,
+            Light = 41,
+            Sanctuary = 42,
+            NightEye = 43,
+            Charm = 44,
+            Paralyze = 45,
+            Silence = 46,
+            Blind = 47,
+            Sound = 48,
+            CalmHumanoid = 49,
+            CalmCreature = 50,
+            FrenzyHumanoid = 51,
+            FrenzyCreature = 52,
+            DemoralizeHumanoid = 53,
+            DemoralizeCreature = 54,
+            RallyHumanoid = 55,
+            RallyCreature = 56,
+            Dispel = 57,
+            Soultrap = 58,
+            Telekinesis = 59,
+            Mark = 60,
+            Recall = 61,
+            DivineIntervention = 62,
+            AlmsiviIntervention = 63,
+            DetectAnimal = 64,
+            DetectEnchantment = 65,
+            DetectKey = 66,
+            SpellAbsorption = 67,
+            Reflect = 68,
+            CureCommonDisease = 69,
+            CureBlightDisease = 70,
+            CureCorprusDisease = 71,
+            CurePoison = 72,
+            CureParalyzation = 73,
+            RestoreAttribute = 74,
+            RestoreHealth = 75,
+            RestoreMagicka = 76,
+            RestoreFatigue = 77,
+            RestoreSkill = 78,
+            FortifyAttribute = 79,
+            FortifyHealth = 80,
+            FortifyMagicka = 81,
+            FortifyFatigue = 82,
+            FortifySkill = 83,
+            FortifyMaximumMagicka = 84,
+            AbsorbAttribute = 85,
+            AbsorbHealth = 86,
+            AbsorbMagicka = 87,
+            AbsorbFatigue = 88,
+            AbsorbSkill = 89,
+            ResistFire = 90,
+            ResistFrost = 91,
+            ResistShock = 92,
+            ResistMagicka = 93,
+            ResistCommonDisease = 94,
+            ResistBlightDisease = 95,
+            ResistCorprusDisease = 96,
+            ResistPoison = 97,
+            ResistNormalWeapons = 98,
+            ResistParalysis = 99,
+            RemoveCurse = 100,
+            TurnUndead = 101,
+            SummonScamp = 102,
+            SummonClannfear = 103,
+            SummonDaedroth = 104,
+            SummonDremora = 105,
+            SummonAncestralGhost = 106,
+            SummonSkeletalMinion = 107,
+            SummonBonewalker = 108,
+            SummonGreaterBonewalker = 109,
+            SummonBonelord = 110,
+            SummonWingedTwilight = 111,
+            SummonHunger = 112,
+            SummonGoldenSaint = 113,
+            SummonFlameAtronach = 114,
+            SummonFrostAtronach = 115,
+            SummonStormAtronach = 116,
+            FortifyAttack = 117,
+            CommandCreature = 118,
+            CommandHumanoid = 119,
+            BoundDagger = 120,
+            BoundLongsword = 121,
+            BoundMace = 122,
+            BoundBattleAxe = 123,
+            BoundSpear = 124,
+            BoundLongbow = 125,
+            ExtraSpell = 126,
+            BoundCuirass = 127,
+            BoundHelm = 128,
+            BoundBoots = 129,
+            BoundShield = 130,
+            BoundGloves = 131,
+            Corprus = 132,
+            Vampirism = 133,
+            SummonCenturionSphere = 134,
+            SunDamage = 135,
+            StuntedMagicka = 136,
 
-    enum Effects
-    {
-        WaterBreathing = 0,
-        SwiftSwim = 1,
-        WaterWalking = 2,
-        Shield = 3,
-        FireShield = 4,
-        LightningShield = 5,
-        FrostShield = 6,
-        Burden = 7,
-        Feather = 8,
-        Jump = 9,
-        Levitate = 10,
-        SlowFall = 11,
-        Lock = 12,
-        Open = 13,
-        FireDamage = 14,
-        ShockDamage = 15,
-        FrostDamage = 16,
-        DrainAttribute = 17,
-        DrainHealth = 18,
-        DrainMagicka = 19,
-        DrainFatigue = 20,
-        DrainSkill = 21,
-        DamageAttribute = 22,
-        DamageHealth = 23,
-        DamageMagicka = 24,
-        DamageFatigue = 25,
-        DamageSkill = 26,
-        Poison = 27,
-        WeaknessToFire = 28,
-        WeaknessToFrost = 29,
-        WeaknessToShock = 30,
-        WeaknessToMagicka = 31,
-        WeaknessToCommonDisease = 32,
-        WeaknessToBlightDisease = 33,
-        WeaknessToCorprusDisease = 34,
-        WeaknessToPoison = 35,
-        WeaknessToNormalWeapons = 36,
-        DisintegrateWeapon = 37,
-        DisintegrateArmor = 38,
-        Invisibility = 39,
-        Chameleon = 40,
-        Light = 41,
-        Sanctuary = 42,
-        NightEye = 43,
-        Charm = 44,
-        Paralyze = 45,
-        Silence = 46,
-        Blind = 47,
-        Sound = 48,
-        CalmHumanoid = 49,
-        CalmCreature = 50,
-        FrenzyHumanoid = 51,
-        FrenzyCreature = 52,
-        DemoralizeHumanoid = 53,
-        DemoralizeCreature = 54,
-        RallyHumanoid = 55,
-        RallyCreature = 56,
-        Dispel = 57,
-        Soultrap = 58,
-        Telekinesis = 59,
-        Mark = 60,
-        Recall = 61,
-        DivineIntervention = 62,
-        AlmsiviIntervention = 63,
-        DetectAnimal = 64,
-        DetectEnchantment = 65,
-        DetectKey = 66,
-        SpellAbsorption = 67,
-        Reflect = 68,
-        CureCommonDisease = 69,
-        CureBlightDisease = 70,
-        CureCorprusDisease = 71,
-        CurePoison = 72,
-        CureParalyzation = 73,
-        RestoreAttribute = 74,
-        RestoreHealth = 75,
-        RestoreMagicka = 76,
-        RestoreFatigue = 77,
-        RestoreSkill = 78,
-        FortifyAttribute = 79,
-        FortifyHealth = 80,
-        FortifyMagicka= 81,
-        FortifyFatigue = 82,
-        FortifySkill = 83,
-        FortifyMaximumMagicka = 84,
-        AbsorbAttribute = 85,
-        AbsorbHealth = 86,
-        AbsorbMagicka = 87,
-        AbsorbFatigue = 88,
-        AbsorbSkill = 89,
-        ResistFire = 90,
-        ResistFrost = 91,
-        ResistShock = 92,
-        ResistMagicka = 93,
-        ResistCommonDisease = 94,
-        ResistBlightDisease = 95,
-        ResistCorprusDisease = 96,
-        ResistPoison = 97,
-        ResistNormalWeapons = 98,
-        ResistParalysis = 99,
-        RemoveCurse = 100,
-        TurnUndead = 101,
-        SummonScamp = 102,
-        SummonClannfear = 103,
-        SummonDaedroth = 104,
-        SummonDremora = 105,
-        SummonAncestralGhost = 106,
-        SummonSkeletalMinion = 107,
-        SummonBonewalker = 108,
-        SummonGreaterBonewalker = 109,
-        SummonBonelord = 110,
-        SummonWingedTwilight = 111,
-        SummonHunger = 112,
-        SummonGoldenSaint = 113,
-        SummonFlameAtronach = 114,
-        SummonFrostAtronach = 115,
-        SummonStormAtronach = 116,
-        FortifyAttack = 117,
-        CommandCreature = 118,
-        CommandHumanoid = 119,
-        BoundDagger = 120,
-        BoundLongsword = 121,
-        BoundMace = 122,
-        BoundBattleAxe = 123,
-        BoundSpear = 124,
-        BoundLongbow = 125,
-        ExtraSpell = 126,
-        BoundCuirass = 127,
-        BoundHelm = 128,
-        BoundBoots = 129,
-        BoundShield = 130,
-        BoundGloves = 131,
-        Corprus = 132,
-        Vampirism = 133,
-        SummonCenturionSphere = 134,
-        SunDamage = 135,
-        StuntedMagicka = 136,
+            // Tribunal only
+            SummonFabricant = 137,
 
-        // Tribunal only
-        SummonFabricant = 137,
+            // Bloodmoon only
+            SummonWolf = 138,
+            SummonBear = 139,
+            SummonBonewolf = 140,
+            SummonCreature04 = 141,
+            SummonCreature05 = 142,
 
-        // Bloodmoon only
-        SummonWolf = 138,
-        SummonBear = 139,
-        SummonBonewolf = 140,
-        SummonCreature04 = 141,
-        SummonCreature05 = 142,
+            Length
+        };
 
-        Length
+        static std::string indexToId(int index);
     };
-
-    static std::string indexToId (int index);
-};
 }
 #endif
diff --git a/components/esm3/loadmisc.cpp b/components/esm3/loadmisc.cpp
index 48c66d08b6..6e0ed03b22 100644
--- a/components/esm3/loadmisc.cpp
+++ b/components/esm3/loadmisc.cpp
@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    void Miscellaneous::load(ESMReader &esm, bool &isDeleted)
+    void Miscellaneous::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -53,7 +53,7 @@ namespace ESM
             esm.fail("Missing MCDT subrecord");
     }
 
-    void Miscellaneous::save(ESMWriter &esm, bool isDeleted) const
+    void Miscellaneous::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
diff --git a/components/esm3/loadmisc.hpp b/components/esm3/loadmisc.hpp
index 2af4784a3c..7a203443cf 100644
--- a/components/esm3/loadmisc.hpp
+++ b/components/esm3/loadmisc.hpp
@@ -8,39 +8,39 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- * Misc inventory items, basically things that have no use but can be
- * carried, bought and sold. It also includes keys.
- */
+    /*
+     * Misc inventory items, basically things that have no use but can be
+     * carried, bought and sold. It also includes keys.
+     */
 
-struct Miscellaneous
-{
-    constexpr static RecNameInts sRecordId = REC_MISC;
+    struct Miscellaneous
+    {
+        constexpr static RecNameInts sRecordId = REC_MISC;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Miscellaneous"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Miscellaneous"; }
 
-    struct MCDTstruct
-    {
-        float mWeight;
-        int mValue;
-        int mIsKey; // There are many keys in Morrowind.esm that has this
-                   // set to 0. TODO: Check what this field corresponds to
-                   // in the editor.
-    };
-    MCDTstruct mData;
+        struct MCDTstruct
+        {
+            float mWeight;
+            int mValue;
+            int mIsKey; // There are many keys in Morrowind.esm that has this
+                        // set to 0. TODO: Check what this field corresponds to
+                        // in the editor.
+        };
+        MCDTstruct mData;
 
-    unsigned int mRecordFlags;
-    std::string mId, mName, mModel, mIcon, mScript;
+        unsigned int mRecordFlags;
+        std::string mId, mName, mModel, mIcon, mScript;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-};
+        void blank();
+        ///< Set record to default state (does not touch the ID).
+    };
 }
 #endif
diff --git a/components/esm3/loadnpc.cpp b/components/esm3/loadnpc.cpp
index 08677838a8..74a9d53e8b 100644
--- a/components/esm3/loadnpc.cpp
+++ b/components/esm3/loadnpc.cpp
@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    void NPC::load(ESMReader &esm, bool &isDeleted)
+    void NPC::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -63,14 +63,14 @@ namespace ESM
                     }
                     else if (esm.getSubSize() == 12)
                     {
-                        //Reading into temporary NPDTstruct12 object
+                        // Reading into temporary NPDTstruct12 object
                         NPDTstruct12 npdt12;
                         mNpdtType = NPC_WITH_AUTOCALCULATED_STATS;
                         esm.getExact(&npdt12, 12);
 
-                        //Clearing the mNdpt struct to initialize all values
+                        // Clearing the mNdpt struct to initialize all values
                         blankNpdt();
-                        //Swiching to an internal representation
+                        // Swiching to an internal representation
                         mNpdt.mLevel = npdt12.mLevel;
                         mNpdt.mDisposition = npdt12.mDisposition;
                         mNpdt.mReputation = npdt12.mReputation;
@@ -125,7 +125,7 @@ namespace ESM
         if (!hasFlags && !isDeleted)
             esm.fail("Missing FLAG subrecord");
     }
-    void NPC::save(ESMWriter &esm, bool isDeleted) const
+    void NPC::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
@@ -173,13 +173,16 @@ namespace ESM
         mAiPackage.save(esm);
     }
 
-    bool NPC::isMale() const {
+    bool NPC::isMale() const
+    {
         return (mFlags & Female) == 0;
     }
 
-    void NPC::setIsMale(bool value) {
+    void NPC::setIsMale(bool value)
+    {
         mFlags |= Female;
-        if (value) {
+        if (value)
+        {
             mFlags ^= Female;
         }
     }
@@ -210,9 +213,10 @@ namespace ESM
     void NPC::blankNpdt()
     {
         mNpdt.mLevel = 0;
-        mNpdt.mStrength = mNpdt.mIntelligence = mNpdt.mWillpower = mNpdt.mAgility =
-            mNpdt.mSpeed = mNpdt.mEndurance = mNpdt.mPersonality = mNpdt.mLuck = 0;
-        for (int i=0; i< Skill::Length; ++i) mNpdt.mSkills[i] = 0;
+        mNpdt.mStrength = mNpdt.mIntelligence = mNpdt.mWillpower = mNpdt.mAgility = mNpdt.mSpeed = mNpdt.mEndurance
+            = mNpdt.mPersonality = mNpdt.mLuck = 0;
+        for (int i = 0; i < Skill::Length; ++i)
+            mNpdt.mSkills[i] = 0;
         mNpdt.mReputation = 0;
         mNpdt.mHealth = mNpdt.mMana = mNpdt.mFatigue = 0;
         mNpdt.mDisposition = 0;
diff --git a/components/esm3/loadnpc.hpp b/components/esm3/loadnpc.hpp
index b766a58394..414629b82b 100644
--- a/components/esm3/loadnpc.hpp
+++ b/components/esm3/loadnpc.hpp
@@ -4,149 +4,143 @@
 #include <string>
 #include <vector>
 
+#include "aipackage.hpp"
 #include "components/esm/defs.hpp"
 #include "loadcont.hpp"
-#include "aipackage.hpp"
-#include "spelllist.hpp"
 #include "loadskil.hpp"
+#include "spelllist.hpp"
 #include "transport.hpp"
 
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- * NPC definition
- */
+    /*
+     * NPC definition
+     */
 
-struct NPC
-{
-    constexpr static RecNameInts sRecordId = REC_NPC_;
-
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "NPC"; }
-
-  // Services
-  enum Services
+    struct NPC
     {
-      // This merchant buys:
-      Weapon        = 0x00001,
-      Armor         = 0x00002,
-      Clothing      = 0x00004,
-      Books         = 0x00008,
-      Ingredients   = 0x00010,
-      Picks         = 0x00020,
-      Probes        = 0x00040,
-      Lights        = 0x00080,
-      Apparatus     = 0x00100,
-      RepairItem    = 0x00200,
-      Misc          = 0x00400,
-      Potions       = 0x02000,
-
-      AllItems = Weapon|Armor|Clothing|Books|Ingredients|Picks|Probes|Lights|Apparatus|RepairItem|Misc|Potions,
-
-      // Other services
-      Spells        = 0x00800,
-      MagicItems    = 0x01000,
-      Training      = 0x04000,
-      Spellmaking   = 0x08000,
-      Enchanting    = 0x10000,
-      Repair        = 0x20000
+        constexpr static RecNameInts sRecordId = REC_NPC_;
+
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "NPC"; }
+
+        // Services
+        enum Services
+        {
+            // This merchant buys:
+            Weapon = 0x00001,
+            Armor = 0x00002,
+            Clothing = 0x00004,
+            Books = 0x00008,
+            Ingredients = 0x00010,
+            Picks = 0x00020,
+            Probes = 0x00040,
+            Lights = 0x00080,
+            Apparatus = 0x00100,
+            RepairItem = 0x00200,
+            Misc = 0x00400,
+            Potions = 0x02000,
+
+            AllItems = Weapon | Armor | Clothing | Books | Ingredients | Picks | Probes | Lights | Apparatus
+                | RepairItem | Misc | Potions,
+
+            // Other services
+            Spells = 0x00800,
+            MagicItems = 0x01000,
+            Training = 0x04000,
+            Spellmaking = 0x08000,
+            Enchanting = 0x10000,
+            Repair = 0x20000
+        };
+
+        enum Flags
+        {
+            Female = 0x01,
+            Essential = 0x02,
+            Respawn = 0x04,
+            Base = 0x08,
+            Autocalc = 0x10
+        };
+
+        enum NpcType
+        {
+            NPC_WITH_AUTOCALCULATED_STATS = 12,
+            NPC_DEFAULT = 52
+        };
+
+#pragma pack(push)
+#pragma pack(1)
+
+        struct NPDTstruct52
+        {
+            short mLevel;
+            unsigned char mStrength, mIntelligence, mWillpower, mAgility, mSpeed, mEndurance, mPersonality, mLuck;
+
+            // mSkill can grow up to 200, it must be unsigned
+            unsigned char mSkills[Skill::Length];
+
+            char mUnknown1;
+            unsigned short mHealth, mMana, mFatigue;
+            unsigned char mDisposition, mReputation, mRank;
+            char mUnknown2;
+            int mGold;
+        }; // 52 bytes
+
+        // Structure for autocalculated characters.
+        //  This is only used for load and save operations.
+        struct NPDTstruct12
+        {
+            short mLevel;
+            // see above
+            unsigned char mDisposition, mReputation, mRank;
+            char mUnknown1, mUnknown2, mUnknown3;
+            int mGold;
+        }; // 12 bytes
+#pragma pack(pop)
+
+        unsigned char mNpdtType;
+        // Worth noting when saving the struct:
+        //  Although we might read a NPDTstruct12 in, we use NPDTstruct52 internally
+        NPDTstruct52 mNpdt;
+
+        int getFactionRank() const; /// wrapper for mNpdt*, -1 = no rank
+
+        int mBloodType;
+        unsigned char mFlags;
+
+        InventoryList mInventory;
+        SpellList mSpells;
+
+        AIData mAiData;
+
+        Transport mTransport;
+
+        const std::vector<Transport::Dest>& getTransport() const;
+
+        AIPackageList mAiPackage;
+
+        unsigned int mRecordFlags;
+        std::string mId, mName, mModel, mRace, mClass, mFaction, mScript;
+
+        // body parts
+        std::string mHair, mHead;
+
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
+
+        bool isMale() const;
+
+        void setIsMale(bool value);
+
+        void blank();
+        ///< Set record to default state (does not touch the ID).
+
+        /// Resets the mNpdt object
+        void blankNpdt();
     };
-
-  enum Flags
-    {
-      Female        = 0x01,
-      Essential     = 0x02,
-      Respawn       = 0x04,
-      Base          = 0x08,
-      Autocalc      = 0x10
-    };
-
-  enum NpcType
-  {
-    NPC_WITH_AUTOCALCULATED_STATS = 12,
-    NPC_DEFAULT = 52
-  };
-
-    #pragma pack(push)
-    #pragma pack(1)
-
-    struct NPDTstruct52
-    {
-        short mLevel;
-        unsigned char mStrength,
-             mIntelligence,
-             mWillpower,
-             mAgility,
-             mSpeed,
-             mEndurance,
-             mPersonality,
-             mLuck;
-
-        // mSkill can grow up to 200, it must be unsigned
-        unsigned char mSkills[Skill::Length];
-
-        char mUnknown1;
-        unsigned short mHealth, mMana, mFatigue;
-        unsigned char mDisposition, mReputation, mRank;
-        char mUnknown2;
-        int mGold;
-    }; // 52 bytes
-
-    //Structure for autocalculated characters.
-    // This is only used for load and save operations.
-    struct NPDTstruct12
-    {
-        short mLevel;
-        // see above
-        unsigned char mDisposition, mReputation, mRank;
-        char mUnknown1, mUnknown2, mUnknown3;
-        int mGold;
-    }; // 12 bytes
-    #pragma pack(pop)
-
-    unsigned char mNpdtType;
-    //Worth noting when saving the struct:
-    // Although we might read a NPDTstruct12 in, we use NPDTstruct52 internally
-    NPDTstruct52 mNpdt;
-
-    int getFactionRank() const; /// wrapper for mNpdt*, -1 = no rank
-
-    int mBloodType;
-    unsigned char mFlags;
-
-    InventoryList mInventory;
-    SpellList mSpells;
-
-    AIData mAiData;
-
-    Transport mTransport;
-
-    const std::vector<Transport::Dest>& getTransport() const;
-
-    AIPackageList     mAiPackage;
-
-    unsigned int mRecordFlags;
-    std::string mId, mName, mModel, mRace, mClass, mFaction, mScript;
-
-    // body parts
-    std::string mHair, mHead;
-
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
-
-    bool isMale() const;
-
-    void setIsMale(bool value);
-
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-
-    /// Resets the mNpdt object
-    void blankNpdt();
-};
 }
 #endif
diff --git a/components/esm3/loadpgrd.cpp b/components/esm3/loadpgrd.cpp
index 461a4194ee..8e301dc500 100644
--- a/components/esm3/loadpgrd.cpp
+++ b/components/esm3/loadpgrd.cpp
@@ -16,20 +16,25 @@ namespace ESM
         return *this;
     }
     Pathgrid::Point::Point(const float rhs[3])
-    : mX(static_cast<int>(rhs[0])),
-      mY(static_cast<int>(rhs[1])),
-      mZ(static_cast<int>(rhs[2])),
-      mAutogenerated(0),
-      mConnectionNum(0),
-      mUnknown(0)
+        : mX(static_cast<int>(rhs[0]))
+        , mY(static_cast<int>(rhs[1]))
+        , mZ(static_cast<int>(rhs[2]))
+        , mAutogenerated(0)
+        , mConnectionNum(0)
+        , mUnknown(0)
     {
     }
-    Pathgrid::Point::Point():mX(0),mY(0),mZ(0),mAutogenerated(0),
-                             mConnectionNum(0),mUnknown(0)
+    Pathgrid::Point::Point()
+        : mX(0)
+        , mY(0)
+        , mZ(0)
+        , mAutogenerated(0)
+        , mConnectionNum(0)
+        , mUnknown(0)
     {
     }
 
-    void Pathgrid::load(ESMReader &esm, bool &isDeleted)
+    void Pathgrid::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
 
@@ -57,7 +62,7 @@ namespace ESM
                     esm.getSubHeader();
                     int size = esm.getSubSize();
                     // Check that the sizes match up. Size = 16 * s2 (path points)
-                    if (size != static_cast<int> (sizeof(Point) * mData.mS2))
+                    if (size != static_cast<int>(sizeof(Point) * mData.mS2))
                         esm.fail("Path point subrecord size mismatch");
                     else
                     {
@@ -94,12 +99,13 @@ namespace ESM
                         std::vector<int>::const_iterator rawIt = rawConnections.begin();
                         int pointIndex = 0;
                         mEdges.reserve(edgeCount);
-                        for(PointList::const_iterator it = mPoints.begin(); it != mPoints.end(); ++it, ++pointIndex)
+                        for (PointList::const_iterator it = mPoints.begin(); it != mPoints.end(); ++it, ++pointIndex)
                         {
                             unsigned char connectionNum = (*it).mConnectionNum;
                             if (rawConnections.end() - rawIt < connectionNum)
                                 esm.fail("Not enough connections");
-                            for (int i = 0; i < connectionNum; ++i) {
+                            for (int i = 0; i < connectionNum; ++i)
+                            {
                                 Edge edge;
                                 edge.mV0 = pointIndex;
                                 edge.mV1 = *rawIt;
@@ -124,7 +130,7 @@ namespace ESM
             esm.fail("Missing DATA subrecord");
     }
 
-    void Pathgrid::save(ESMWriter &esm, bool isDeleted) const
+    void Pathgrid::save(ESMWriter& esm, bool isDeleted) const
     {
         // Correct connection count and sort edges by point
         // Can probably be optimized
diff --git a/components/esm3/loadpgrd.hpp b/components/esm3/loadpgrd.hpp
index b9490ae221..59cdb99ed8 100644
--- a/components/esm3/loadpgrd.hpp
+++ b/components/esm3/loadpgrd.hpp
@@ -9,60 +9,65 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- * Path grid.
- */
-struct Pathgrid
-{
-    constexpr static RecNameInts sRecordId = REC_PGRD;
+    /*
+     * Path grid.
+     */
+    struct Pathgrid
+    {
+        constexpr static RecNameInts sRecordId = REC_PGRD;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Pathgrid"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Pathgrid"; }
 
-    struct DATAstruct
-    {
-        int mX, mY; // Grid location, matches cell for exterior cells
-        short mS1; // ?? Usually but not always a power of 2. Doesn't seem
-                  // to have any relation to the size of PGRC.
-        short mS2; // Number of path points.
-    }; // 12 bytes
+        struct DATAstruct
+        {
+            int mX, mY; // Grid location, matches cell for exterior cells
+            short mS1; // ?? Usually but not always a power of 2. Doesn't seem
+                       // to have any relation to the size of PGRC.
+            short mS2; // Number of path points.
+        }; // 12 bytes
 
-    struct Point // path grid point
-    {
-        int mX, mY, mZ; // Location of point
-        unsigned char mAutogenerated; // autogenerated vs. user coloring flag?
-        unsigned char mConnectionNum; // number of connections for this point
-        short mUnknown;
-        Point& operator=(const float[3]);
-        Point(const float[3]);
-        Point();
-        Point(int x, int y, int z)
-            : mX(x), mY(y), mZ(z)
-            , mAutogenerated(0), mConnectionNum(0), mUnknown(0)
-        {}
-    }; // 16 bytes
+        struct Point // path grid point
+        {
+            int mX, mY, mZ; // Location of point
+            unsigned char mAutogenerated; // autogenerated vs. user coloring flag?
+            unsigned char mConnectionNum; // number of connections for this point
+            short mUnknown;
+            Point& operator=(const float[3]);
+            Point(const float[3]);
+            Point();
+            Point(int x, int y, int z)
+                : mX(x)
+                , mY(y)
+                , mZ(z)
+                , mAutogenerated(0)
+                , mConnectionNum(0)
+                , mUnknown(0)
+            {
+            }
+        }; // 16 bytes
 
-    struct Edge // path grid edge
-    {
-        int mV0, mV1; // index of points connected with this edge
-    }; // 8 bytes
+        struct Edge // path grid edge
+        {
+            int mV0, mV1; // index of points connected with this edge
+        }; // 8 bytes
 
-    std::string mCell; // Cell name
-    DATAstruct mData;
+        std::string mCell; // Cell name
+        DATAstruct mData;
 
-    typedef std::vector<Point> PointList;
-    PointList mPoints;
+        typedef std::vector<Point> PointList;
+        PointList mPoints;
 
-    typedef std::vector<Edge> EdgeList;
-    EdgeList mEdges;
+        typedef std::vector<Edge> EdgeList;
+        EdgeList mEdges;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-};
+        void blank();
+    };
 }
 #endif
diff --git a/components/esm3/loadprob.cpp b/components/esm3/loadprob.cpp
index 419b716ebc..430fc5ec38 100644
--- a/components/esm3/loadprob.cpp
+++ b/components/esm3/loadprob.cpp
@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    void Probe::load(ESMReader &esm, bool &isDeleted)
+    void Probe::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -53,7 +53,7 @@ namespace ESM
             esm.fail("Missing PBDT subrecord");
     }
 
-    void Probe::save(ESMWriter &esm, bool isDeleted) const
+    void Probe::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
diff --git a/components/esm3/loadprob.hpp b/components/esm3/loadprob.hpp
index 58e65d6c64..08c1dbd7f3 100644
--- a/components/esm3/loadprob.hpp
+++ b/components/esm3/loadprob.hpp
@@ -8,35 +8,35 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-struct Probe
-{
-    constexpr static RecNameInts sRecordId = REC_PROB;
+    struct Probe
+    {
+        constexpr static RecNameInts sRecordId = REC_PROB;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Probe"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Probe"; }
 
-    struct Data
-    {
-        float mWeight;
-        int mValue;
+        struct Data
+        {
+            float mWeight;
+            int mValue;
 
-        float mQuality;
-        int mUses;
-    }; // Size = 16
+            float mQuality;
+            int mUses;
+        }; // Size = 16
 
-    Data mData;
-    unsigned int mRecordFlags;
-    std::string mId, mName, mModel, mIcon, mScript;
+        Data mData;
+        unsigned int mRecordFlags;
+        std::string mId, mName, mModel, mIcon, mScript;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-};
+        void blank();
+        ///< Set record to default state (does not touch the ID).
+    };
 
 }
 #endif
diff --git a/components/esm3/loadrace.cpp b/components/esm3/loadrace.cpp
index 53174219df..0deff3b9c3 100644
--- a/components/esm3/loadrace.cpp
+++ b/components/esm3/loadrace.cpp
@@ -5,17 +5,17 @@
 
 namespace ESM
 {
-    int Race::MaleFemale::getValue (bool male) const
+    int Race::MaleFemale::getValue(bool male) const
     {
         return male ? mMale : mFemale;
     }
 
-    float Race::MaleFemaleF::getValue (bool male) const
+    float Race::MaleFemaleF::getValue(bool male) const
     {
         return male ? mMale : mFemale;
     }
 
-    void Race::load(ESMReader &esm, bool &isDeleted)
+    void Race::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -60,7 +60,7 @@ namespace ESM
         if (!hasData && !isDeleted)
             esm.fail("Missing RADT subrecord");
     }
-    void Race::save(ESMWriter &esm, bool isDeleted) const
+    void Race::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
@@ -84,13 +84,13 @@ namespace ESM
 
         mPowers.mList.clear();
 
-        for (int i=0; i<7; ++i)
+        for (int i = 0; i < 7; ++i)
         {
             mData.mBonus[i].mSkill = -1;
             mData.mBonus[i].mBonus = 0;
         }
 
-        for (int i=0; i<8; ++i)
+        for (int i = 0; i < 8; ++i)
             mData.mAttributeValues[i].mMale = mData.mAttributeValues[i].mFemale = 1;
 
         mData.mHeight.mMale = mData.mHeight.mFemale = 1;
diff --git a/components/esm3/loadrace.hpp b/components/esm3/loadrace.hpp
index 74459bab3d..3dba09d128 100644
--- a/components/esm3/loadrace.hpp
+++ b/components/esm3/loadrace.hpp
@@ -3,80 +3,80 @@
 
 #include <string>
 
-#include "spelllist.hpp"
 #include "components/esm/defs.hpp"
+#include "spelllist.hpp"
 
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- * Race definition
- */
+    /*
+     * Race definition
+     */
 
-struct Race
-{
-    constexpr static RecNameInts sRecordId = REC_RACE;
+    struct Race
+    {
+        constexpr static RecNameInts sRecordId = REC_RACE;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Race"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Race"; }
 
-    struct SkillBonus
-    {
-        int mSkill; // SkillEnum
-        int mBonus;
-    };
+        struct SkillBonus
+        {
+            int mSkill; // SkillEnum
+            int mBonus;
+        };
 
-    struct MaleFemale
-    {
-        int mMale, mFemale;
+        struct MaleFemale
+        {
+            int mMale, mFemale;
 
-        int getValue (bool male) const;
-    };
+            int getValue(bool male) const;
+        };
 
-    struct MaleFemaleF
-    {
-        float mMale, mFemale;
+        struct MaleFemaleF
+        {
+            float mMale, mFemale;
 
-        float getValue (bool male) const;
-    };
+            float getValue(bool male) const;
+        };
 
-    enum Flags
-    {
-        Playable = 0x01,
-        Beast = 0x02
-    };
+        enum Flags
+        {
+            Playable = 0x01,
+            Beast = 0x02
+        };
 
-    struct RADTstruct
-    {
-        // List of skills that get a bonus
-        SkillBonus mBonus[7];
+        struct RADTstruct
+        {
+            // List of skills that get a bonus
+            SkillBonus mBonus[7];
 
-        // Attribute values for male/female
-        MaleFemale mAttributeValues[8];
+            // Attribute values for male/female
+            MaleFemale mAttributeValues[8];
 
-        // The actual eye level height (in game units) is (probably) given
-        // as 'height' times 128. This has not been tested yet.
-        MaleFemaleF mHeight, mWeight;
+            // The actual eye level height (in game units) is (probably) given
+            // as 'height' times 128. This has not been tested yet.
+            MaleFemaleF mHeight, mWeight;
 
-        int mFlags; // 0x1 - playable, 0x2 - beast race
+            int mFlags; // 0x1 - playable, 0x2 - beast race
 
-    }; // Size = 140 bytes
+        }; // Size = 140 bytes
 
-    RADTstruct mData;
+        RADTstruct mData;
 
-    unsigned int mRecordFlags;
-    std::string mId, mName, mDescription;
-    SpellList mPowers;
+        unsigned int mRecordFlags;
+        std::string mId, mName, mDescription;
+        SpellList mPowers;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-    ///< Set record to default state (does not touch the ID/index).
-};
+        void blank();
+        ///< Set record to default state (does not touch the ID/index).
+    };
 
 }
 #endif
diff --git a/components/esm3/loadregn.cpp b/components/esm3/loadregn.cpp
index 9de89d1889..bd1c00e8c4 100644
--- a/components/esm3/loadregn.cpp
+++ b/components/esm3/loadregn.cpp
@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    void Region::load(ESMReader &esm, bool &isDeleted)
+    void Region::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -72,7 +72,7 @@ namespace ESM
             esm.fail("Missing NAME subrecord");
     }
 
-    void Region::save(ESMWriter &esm, bool isDeleted) const
+    void Region::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
@@ -104,8 +104,8 @@ namespace ESM
     void Region::blank()
     {
         mRecordFlags = 0;
-        mData.mClear = mData.mCloudy = mData.mFoggy = mData.mOvercast = mData.mRain =
-            mData.mThunder = mData.mAsh = mData.mBlight = mData.mSnow = mData.mBlizzard = 0;
+        mData.mClear = mData.mCloudy = mData.mFoggy = mData.mOvercast = mData.mRain = mData.mThunder = mData.mAsh
+            = mData.mBlight = mData.mSnow = mData.mBlizzard = 0;
 
         mMapColor = 0;
 
diff --git a/components/esm3/loadregn.hpp b/components/esm3/loadregn.hpp
index 1a771f28e5..159b79fa24 100644
--- a/components/esm3/loadregn.hpp
+++ b/components/esm3/loadregn.hpp
@@ -9,51 +9,51 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- * Region data
- */
+    /*
+     * Region data
+     */
 
-struct Region
-{
-    constexpr static RecNameInts sRecordId = REC_REGN;
+    struct Region
+    {
+        constexpr static RecNameInts sRecordId = REC_REGN;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Region"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Region"; }
 
 #pragma pack(push)
 #pragma pack(1)
-    struct WEATstruct
-    {
-        // These are probabilities that add up to 100
-        unsigned char mClear, mCloudy, mFoggy, mOvercast, mRain, mThunder, mAsh, mBlight, mSnow, mBlizzard;
-    }; // 10 bytes
+        struct WEATstruct
+        {
+            // These are probabilities that add up to 100
+            unsigned char mClear, mCloudy, mFoggy, mOvercast, mRain, mThunder, mAsh, mBlight, mSnow, mBlizzard;
+        }; // 10 bytes
 #pragma pack(pop)
 
-    // Reference to a sound that is played randomly in this region
-    struct SoundRef
-    {
-        std::string   mSound;
-        unsigned char mChance;
-    };
+        // Reference to a sound that is played randomly in this region
+        struct SoundRef
+        {
+            std::string mSound;
+            unsigned char mChance;
+        };
 
-    WEATstruct mData;
-    int mMapColor; // RGBA
+        WEATstruct mData;
+        int mMapColor; // RGBA
 
-    unsigned int mRecordFlags;
-    // sleepList refers to a leveled list of creatures you can meet if
-    // you sleep outside in this region.
-    std::string mId, mName, mSleepList;
+        unsigned int mRecordFlags;
+        // sleepList refers to a leveled list of creatures you can meet if
+        // you sleep outside in this region.
+        std::string mId, mName, mSleepList;
 
-    std::vector<SoundRef> mSoundList;
+        std::vector<SoundRef> mSoundList;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-    ///< Set record to default state (does not touch the ID/index).
-};
+        void blank();
+        ///< Set record to default state (does not touch the ID/index).
+    };
 }
 #endif
diff --git a/components/esm3/loadrepa.cpp b/components/esm3/loadrepa.cpp
index 3580359873..93343e3e98 100644
--- a/components/esm3/loadrepa.cpp
+++ b/components/esm3/loadrepa.cpp
@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    void Repair::load(ESMReader &esm, bool &isDeleted)
+    void Repair::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -53,7 +53,7 @@ namespace ESM
             esm.fail("Missing RIDT subrecord");
     }
 
-    void Repair::save(ESMWriter &esm, bool isDeleted) const
+    void Repair::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
diff --git a/components/esm3/loadrepa.hpp b/components/esm3/loadrepa.hpp
index d4e94feaf4..4bc350bc61 100644
--- a/components/esm3/loadrepa.hpp
+++ b/components/esm3/loadrepa.hpp
@@ -8,35 +8,35 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-struct Repair
-{
-    constexpr static RecNameInts sRecordId = REC_REPA;
+    struct Repair
+    {
+        constexpr static RecNameInts sRecordId = REC_REPA;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Repair"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Repair"; }
 
-    struct Data
-    {
-        float mWeight;
-        int mValue;
+        struct Data
+        {
+            float mWeight;
+            int mValue;
 
-        int mUses;
-        float mQuality;
-    }; // Size = 16
+            int mUses;
+            float mQuality;
+        }; // Size = 16
 
-    Data mData;
-    unsigned int mRecordFlags;
-    std::string mId, mName, mModel, mIcon, mScript;
+        Data mData;
+        unsigned int mRecordFlags;
+        std::string mId, mName, mModel, mIcon, mScript;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-};
+        void blank();
+        ///< Set record to default state (does not touch the ID).
+    };
 
 }
 #endif
diff --git a/components/esm3/loadscpt.cpp b/components/esm3/loadscpt.cpp
index 3f478d09a8..365db2cd69 100644
--- a/components/esm3/loadscpt.cpp
+++ b/components/esm3/loadscpt.cpp
@@ -1,7 +1,7 @@
 #include "loadscpt.hpp"
 
-#include <sstream>
 #include <algorithm>
+#include <sstream>
 
 #include <components/debug/debuglog.hpp>
 
@@ -10,11 +10,11 @@
 
 namespace ESM
 {
-    void Script::loadSCVR(ESMReader &esm)
+    void Script::loadSCVR(ESMReader& esm)
     {
         int s = mData.mStringTableSize;
 
-        std::vector<char> tmp (s);
+        std::vector<char> tmp(s);
         // not using getHExact, vanilla doesn't seem to mind unused bytes at the end
         esm.getSubHeader();
         int left = esm.getSubSize();
@@ -22,7 +22,7 @@ namespace ESM
             esm.fail("SCVR string list is smaller than specified");
         esm.getExact(tmp.data(), s);
         if (left > s)
-            esm.skip(left-s); // skip the leftover junk
+            esm.skip(left - s); // skip the leftover junk
 
         // Set up the list of variable names
         mVarNames.resize(mData.mNumShorts + mData.mNumLongs + mData.mNumFloats);
@@ -48,7 +48,8 @@ namespace ESM
             ss << "Malformed string table";
             ss << "\n  File: " << esm.getName();
             ss << "\n  Record: " << esm.getContext().recName.toStringView();
-            ss << "\n  Subrecord: " << "SCVR";
+            ss << "\n  Subrecord: "
+               << "SCVR";
             ss << "\n  Offset: 0x" << std::hex << esm.getFileOffset();
             Log(Debug::Verbose) << ss.str();
             str = tmp.data();
@@ -61,7 +62,7 @@ namespace ESM
             str += mVarNames[i].size() + 1;
             if (str >= tmpEnd)
             {
-                if(str > tmpEnd)
+                if (str > tmpEnd)
                 {
                     // SCVR subrecord is unused and variable names are determined
                     // from the script source, so an overflow is not fatal.
@@ -69,18 +70,19 @@ namespace ESM
                     ss << "String table overflow";
                     ss << "\n  File: " << esm.getName();
                     ss << "\n  Record: " << esm.getContext().recName.toStringView();
-                    ss << "\n  Subrecord: " << "SCVR";
+                    ss << "\n  Subrecord: "
+                       << "SCVR";
                     ss << "\n  Offset: 0x" << std::hex << esm.getFileOffset();
                     Log(Debug::Verbose) << ss.str();
                 }
                 // Get rid of empty strings in the list.
-                mVarNames.resize(i+1);
+                mVarNames.resize(i + 1);
                 break;
             }
         }
     }
 
-    void Script::load(ESMReader &esm, bool &isDeleted)
+    void Script::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -142,7 +144,7 @@ namespace ESM
             esm.fail("Missing SCHD subrecord");
     }
 
-    void Script::save(ESMWriter &esm, bool isDeleted) const
+    void Script::save(ESMWriter& esm, bool isDeleted) const
     {
         std::string varNameString;
         if (!mVarNames.empty())
@@ -171,7 +173,7 @@ namespace ESM
         }
 
         esm.startSubRecord("SCDT");
-        esm.write(reinterpret_cast<const char *>(mScriptData.data()), mData.mScriptDataSize);
+        esm.write(reinterpret_cast<const char*>(mScriptData.data()), mData.mScriptDataSize);
         esm.endRecord("SCDT");
 
         esm.writeHNOString("SCTX", mScriptText);
@@ -187,7 +189,7 @@ namespace ESM
         mVarNames.clear();
         mScriptData.clear();
 
-        if (mId.find ("::")!=std::string::npos)
+        if (mId.find("::") != std::string::npos)
             mScriptText = "Begin \"" + mId + "\"\n\nEnd " + mId + "\n";
         else
             mScriptText = "Begin " + mId + "\n\nEnd " + mId + "\n";
diff --git a/components/esm3/loadscpt.hpp b/components/esm3/loadscpt.hpp
index b93e0eeb96..33b50676f3 100644
--- a/components/esm3/loadscpt.hpp
+++ b/components/esm3/loadscpt.hpp
@@ -9,57 +9,57 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- * Script definitions
- */
+    /*
+     * Script definitions
+     */
 
-class Script
-{
-public:
-    constexpr static RecNameInts sRecordId = REC_SCPT;
+    class Script
+    {
+    public:
+        constexpr static RecNameInts sRecordId = REC_SCPT;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Script"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Script"; }
 
-    struct SCHDstruct
-    {
-        /// Data from script-precompling in the editor.
-        /// \warning Do not use them. OpenCS currently does not precompile scripts.
-        int mNumShorts, mNumLongs, mNumFloats, mScriptDataSize, mStringTableSize;
-    };
-    struct SCHD
-    {
-        std::string         mName;
-        Script::SCHDstruct  mData;
-    };
+        struct SCHDstruct
+        {
+            /// Data from script-precompling in the editor.
+            /// \warning Do not use them. OpenCS currently does not precompile scripts.
+            int mNumShorts, mNumLongs, mNumFloats, mScriptDataSize, mStringTableSize;
+        };
+        struct SCHD
+        {
+            std::string mName;
+            Script::SCHDstruct mData;
+        };
 
-    unsigned int mRecordFlags;
-    std::string mId;
+        unsigned int mRecordFlags;
+        std::string mId;
 
-    SCHDstruct mData;
+        SCHDstruct mData;
 
-    /// Variable names generated by script-precompiling in the editor.
-    /// \warning Do not use this field. OpenCS currently does not precompile scripts.
-    std::vector<std::string> mVarNames;
+        /// Variable names generated by script-precompiling in the editor.
+        /// \warning Do not use this field. OpenCS currently does not precompile scripts.
+        std::vector<std::string> mVarNames;
 
-    /// Bytecode generated from script-precompiling in the editor.
-    /// \warning Do not use this field. OpenCS currently does not precompile scripts.
-    std::vector<unsigned char> mScriptData;
+        /// Bytecode generated from script-precompiling in the editor.
+        /// \warning Do not use this field. OpenCS currently does not precompile scripts.
+        std::vector<unsigned char> mScriptData;
 
-    /// Script source code
-    std::string mScriptText;
+        /// Script source code
+        std::string mScriptText;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-    ///< Set record to default state (does not touch the ID/index).
+        void blank();
+        ///< Set record to default state (does not touch the ID/index).
 
-private:
-    void loadSCVR(ESMReader &esm);
-};
+    private:
+        void loadSCVR(ESMReader& esm);
+    };
 }
 #endif
diff --git a/components/esm3/loadskil.cpp b/components/esm3/loadskil.cpp
index 6ad0faaf75..7154ae3265 100644
--- a/components/esm3/loadskil.cpp
+++ b/components/esm3/loadskil.cpp
@@ -2,9 +2,9 @@
 
 #include <sstream>
 
+#include "components/esm/defs.hpp"
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
@@ -95,37 +95,12 @@ namespace ESM
         "stealth_speechcraft.dds",
         "stealth_handtohand.dds",
     };
-    const std::array<Skill::SkillEnum, Skill::Length> Skill::sSkillIds = {{
-        Block,
-        Armorer,
-        MediumArmor,
-        HeavyArmor,
-        BluntWeapon,
-        LongBlade,
-        Axe,
-        Spear,
-        Athletics,
-        Enchant,
-        Destruction,
-        Alteration,
-        Illusion,
-        Conjuration,
-        Mysticism,
-        Restoration,
-        Alchemy,
-        Unarmored,
-        Security,
-        Sneak,
-        Acrobatics,
-        LightArmor,
-        ShortBlade,
-        Marksman,
-        Mercantile,
-        Speechcraft,
-        HandToHand
-    }};
+    const std::array<Skill::SkillEnum, Skill::Length> Skill::sSkillIds
+        = { { Block, Armorer, MediumArmor, HeavyArmor, BluntWeapon, LongBlade, Axe, Spear, Athletics, Enchant,
+            Destruction, Alteration, Illusion, Conjuration, Mysticism, Restoration, Alchemy, Unarmored, Security, Sneak,
+            Acrobatics, LightArmor, ShortBlade, Marksman, Mercantile, Speechcraft, HandToHand } };
 
-    void Skill::load(ESMReader &esm, bool &isDeleted)
+    void Skill::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false; // Skill record can't be deleted now (may be changed in the future)
         mRecordFlags = esm.getRecordFlags();
@@ -159,10 +134,10 @@ namespace ESM
 
         // create an ID from the index and the name (only used in the editor and likely to change in the
         // future)
-        mId = indexToId (mIndex);
+        mId = indexToId(mIndex);
     }
 
-    void Skill::save(ESMWriter &esm, bool /*isDeleted*/) const
+    void Skill::save(ESMWriter& esm, bool /*isDeleted*/) const
     {
         esm.writeHNT("INDX", mIndex);
         esm.writeHNT("SKDT", mData, 24);
@@ -178,21 +153,21 @@ namespace ESM
         mDescription.clear();
     }
 
-    std::string Skill::indexToId (int index)
+    std::string Skill::indexToId(int index)
     {
         std::ostringstream stream;
 
-        if (index!=-1)
+        if (index != -1)
         {
             stream << "#";
 
-            if (index<10)
+            if (index < 10)
                 stream << "0";
 
             stream << index;
 
-            if (index>=0 && index<Length)
-                stream << sSkillNameIds[index].substr (6);
+            if (index >= 0 && index < Length)
+                stream << sSkillNameIds[index].substr(6);
         }
 
         return stream.str();
diff --git a/components/esm3/loadskil.hpp b/components/esm3/loadskil.hpp
index 3fed87f136..0db629d51c 100644
--- a/components/esm3/loadskil.hpp
+++ b/components/esm3/loadskil.hpp
@@ -9,84 +9,84 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- * Skill information
- *
- */
+    /*
+     * Skill information
+     *
+     */
 
-struct Skill
-{
+    struct Skill
+    {
 
-    constexpr static RecNameInts sRecordId = REC_SKIL;
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Skill"; }
+        constexpr static RecNameInts sRecordId = REC_SKIL;
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Skill"; }
 
-    unsigned int mRecordFlags;
-    std::string mId;
+        unsigned int mRecordFlags;
+        std::string mId;
 
-  struct SKDTstruct
-  {
-    int mAttribute;     // see defs.hpp
-    int mSpecialization;// 0 - Combat, 1 - Magic, 2 - Stealth
-    float mUseValue[4]; // How much skill improves through use. Meaning
-               // of each field depends on what skill this
-               // is. We should document this better later.
-  }; // Total size: 24 bytes
-  SKDTstruct mData;
+        struct SKDTstruct
+        {
+            int mAttribute; // see defs.hpp
+            int mSpecialization; // 0 - Combat, 1 - Magic, 2 - Stealth
+            float mUseValue[4]; // How much skill improves through use. Meaning
+                                // of each field depends on what skill this
+                                // is. We should document this better later.
+        }; // Total size: 24 bytes
+        SKDTstruct mData;
 
-  // Skill index. Skils don't have an id ("NAME") like most records,
-  // they only have a numerical index that matches one of the
-  // hard-coded skills in the game.
-  int mIndex;
+        // Skill index. Skils don't have an id ("NAME") like most records,
+        // they only have a numerical index that matches one of the
+        // hard-coded skills in the game.
+        int mIndex;
 
-  std::string mDescription;
+        std::string mDescription;
 
-    enum SkillEnum
-    {
-        Block = 0,
-        Armorer = 1,
-        MediumArmor = 2,
-        HeavyArmor = 3,
-        BluntWeapon = 4,
-        LongBlade = 5,
-        Axe = 6,
-        Spear = 7,
-        Athletics = 8,
-        Enchant = 9,
-        Destruction = 10,
-        Alteration = 11,
-        Illusion = 12,
-        Conjuration = 13,
-        Mysticism = 14,
-        Restoration = 15,
-        Alchemy = 16,
-        Unarmored = 17,
-        Security = 18,
-        Sneak = 19,
-        Acrobatics = 20,
-        LightArmor = 21,
-        ShortBlade = 22,
-        Marksman = 23,
-        Mercantile = 24,
-        Speechcraft = 25,
-        HandToHand = 26,
-        Length
-    };
-  static const std::string sSkillNames[Length];
-  static const std::string sSkillNameIds[Length];
-  static const std::string sIconNames[Length];
-  static const std::array<SkillEnum, Length> sSkillIds;
+        enum SkillEnum
+        {
+            Block = 0,
+            Armorer = 1,
+            MediumArmor = 2,
+            HeavyArmor = 3,
+            BluntWeapon = 4,
+            LongBlade = 5,
+            Axe = 6,
+            Spear = 7,
+            Athletics = 8,
+            Enchant = 9,
+            Destruction = 10,
+            Alteration = 11,
+            Illusion = 12,
+            Conjuration = 13,
+            Mysticism = 14,
+            Restoration = 15,
+            Alchemy = 16,
+            Unarmored = 17,
+            Security = 18,
+            Sneak = 19,
+            Acrobatics = 20,
+            LightArmor = 21,
+            ShortBlade = 22,
+            Marksman = 23,
+            Mercantile = 24,
+            Speechcraft = 25,
+            HandToHand = 26,
+            Length
+        };
+        static const std::string sSkillNames[Length];
+        static const std::string sSkillNameIds[Length];
+        static const std::string sIconNames[Length];
+        static const std::array<SkillEnum, Length> sSkillIds;
 
-  void load(ESMReader &esm, bool &isDeleted);
-  void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-     ///< Set record to default state (does not touch the ID/index).
+        void blank();
+        ///< Set record to default state (does not touch the ID/index).
 
-    static std::string indexToId (int index);
-};
+        static std::string indexToId(int index);
+    };
 }
 #endif
diff --git a/components/esm3/loadsndg.cpp b/components/esm3/loadsndg.cpp
index c81ff87099..29f010a42a 100644
--- a/components/esm3/loadsndg.cpp
+++ b/components/esm3/loadsndg.cpp
@@ -1,12 +1,12 @@
 #include "loadsndg.hpp"
 
+#include "components/esm/defs.hpp"
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    void SoundGenerator::load(ESMReader &esm, bool &isDeleted)
+    void SoundGenerator::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -47,7 +47,7 @@ namespace ESM
         if (!hasData && !isDeleted)
             esm.fail("Missing DATA subrecord");
     }
-    void SoundGenerator::save(ESMWriter &esm, bool isDeleted) const
+    void SoundGenerator::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
@@ -60,7 +60,6 @@ namespace ESM
         esm.writeHNT("DATA", mType, 4);
         esm.writeHNOCString("CNAM", mCreature);
         esm.writeHNOCString("SNAM", mSound);
-        
     }
 
     void SoundGenerator::blank()
diff --git a/components/esm3/loadsndg.hpp b/components/esm3/loadsndg.hpp
index ad8c26f3ed..dad6a47550 100644
--- a/components/esm3/loadsndg.hpp
+++ b/components/esm3/loadsndg.hpp
@@ -8,42 +8,42 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- * Sound generator. This describes the sounds a creature make.
- */
+    /*
+     * Sound generator. This describes the sounds a creature make.
+     */
 
-struct SoundGenerator
-{
-    constexpr static RecNameInts sRecordId = REC_SNDG;
+    struct SoundGenerator
+    {
+        constexpr static RecNameInts sRecordId = REC_SNDG;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "SoundGenerator"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "SoundGenerator"; }
 
-    enum Type
-    {
-        LeftFoot = 0,
-        RightFoot = 1,
-        SwimLeft = 2,
-        SwimRight = 3,
-        Moan = 4,
-        Roar = 5,
-        Scream = 6,
-        Land = 7
-    };
+        enum Type
+        {
+            LeftFoot = 0,
+            RightFoot = 1,
+            SwimLeft = 2,
+            SwimRight = 3,
+            Moan = 4,
+            Roar = 5,
+            Scream = 6,
+            Land = 7
+        };
 
-    // Type
-    int mType;
+        // Type
+        int mType;
 
-    unsigned int mRecordFlags;
-    std::string mId, mCreature, mSound;
+        unsigned int mRecordFlags;
+        std::string mId, mCreature, mSound;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-};
+        void blank();
+    };
 }
 #endif
diff --git a/components/esm3/loadsoun.cpp b/components/esm3/loadsoun.cpp
index 95be333e13..9a223fe41c 100644
--- a/components/esm3/loadsoun.cpp
+++ b/components/esm3/loadsoun.cpp
@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    void Sound::load(ESMReader &esm, bool &isDeleted)
+    void Sound::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -44,7 +44,7 @@ namespace ESM
             esm.fail("Missing DATA subrecord");
     }
 
-    void Sound::save(ESMWriter &esm, bool isDeleted) const
+    void Sound::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
diff --git a/components/esm3/loadsoun.hpp b/components/esm3/loadsoun.hpp
index 5fea039f4f..5c82a9eb2e 100644
--- a/components/esm3/loadsoun.hpp
+++ b/components/esm3/loadsoun.hpp
@@ -8,30 +8,30 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-struct SOUNstruct
-{
-    unsigned char mVolume, mMinRange, mMaxRange;
-};
+    struct SOUNstruct
+    {
+        unsigned char mVolume, mMinRange, mMaxRange;
+    };
 
-struct Sound
-{
-    constexpr static RecNameInts sRecordId = REC_SOUN;
+    struct Sound
+    {
+        constexpr static RecNameInts sRecordId = REC_SOUN;
 
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Sound"; }
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Sound"; }
 
-    SOUNstruct mData;
-    unsigned int mRecordFlags;
-    std::string mId, mSound;
+        SOUNstruct mData;
+        unsigned int mRecordFlags;
+        std::string mId, mSound;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-    ///< Set record to default state (does not touch the ID/index).
-};
+        void blank();
+        ///< Set record to default state (does not touch the ID/index).
+    };
 }
 #endif
diff --git a/components/esm3/loadspel.cpp b/components/esm3/loadspel.cpp
index 1415528f88..c1f52e5e1a 100644
--- a/components/esm3/loadspel.cpp
+++ b/components/esm3/loadspel.cpp
@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    void Spell::load(ESMReader &esm, bool &isDeleted)
+    void Spell::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -51,7 +51,7 @@ namespace ESM
             esm.fail("Missing SPDT subrecord");
     }
 
-    void Spell::save(ESMWriter &esm, bool isDeleted) const
+    void Spell::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
diff --git a/components/esm3/loadspel.hpp b/components/esm3/loadspel.hpp
index 59fbe7fd95..6467b0983f 100644
--- a/components/esm3/loadspel.hpp
+++ b/components/esm3/loadspel.hpp
@@ -3,56 +3,56 @@
 
 #include <string>
 
-#include "effectlist.hpp"
 #include "components/esm/defs.hpp"
+#include "effectlist.hpp"
 
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
-
-struct Spell
-{
-    constexpr static RecNameInts sRecordId = REC_SPEL;
-
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Spell"; }
-
-    enum SpellType
-    {
-        ST_Spell = 0,   // Normal spell, must be cast and costs mana
-        ST_Ability = 1, // Inert ability, always in effect
-        ST_Blight = 2,  // Blight disease
-        ST_Disease = 3, // Common disease
-        ST_Curse = 4,   // Curse (?)
-        ST_Power = 5    // Power, can use once a day
-    };
-
-    enum Flags
-    {
-        F_Autocalc = 1, // Can be selected by NPC spells auto-calc
-        F_PCStart = 2, // Can be selected by player spells auto-calc
-        F_Always = 4 // Casting always succeeds
-    };
+    class ESMReader;
+    class ESMWriter;
 
-    struct SPDTstruct
+    struct Spell
     {
-        int mType; // SpellType
-        int mCost; // Mana cost
-        int mFlags; // Flags
+        constexpr static RecNameInts sRecordId = REC_SPEL;
+
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Spell"; }
+
+        enum SpellType
+        {
+            ST_Spell = 0, // Normal spell, must be cast and costs mana
+            ST_Ability = 1, // Inert ability, always in effect
+            ST_Blight = 2, // Blight disease
+            ST_Disease = 3, // Common disease
+            ST_Curse = 4, // Curse (?)
+            ST_Power = 5 // Power, can use once a day
+        };
+
+        enum Flags
+        {
+            F_Autocalc = 1, // Can be selected by NPC spells auto-calc
+            F_PCStart = 2, // Can be selected by player spells auto-calc
+            F_Always = 4 // Casting always succeeds
+        };
+
+        struct SPDTstruct
+        {
+            int mType; // SpellType
+            int mCost; // Mana cost
+            int mFlags; // Flags
+        };
+
+        SPDTstruct mData;
+        unsigned int mRecordFlags;
+        std::string mId, mName;
+        EffectList mEffects;
+
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
+
+        void blank();
+        ///< Set record to default state (does not touch the ID/index).
     };
-
-    SPDTstruct mData;
-    unsigned int mRecordFlags;
-    std::string mId, mName;
-    EffectList mEffects;
-
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
-
-    void blank();
-    ///< Set record to default state (does not touch the ID/index).
-};
 }
 #endif
diff --git a/components/esm3/loadsscr.cpp b/components/esm3/loadsscr.cpp
index 6f30980f04..7098e664cb 100644
--- a/components/esm3/loadsscr.cpp
+++ b/components/esm3/loadsscr.cpp
@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    void StartScript::load(ESMReader &esm, bool &isDeleted)
+    void StartScript::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -40,7 +40,7 @@ namespace ESM
         if (!hasData && !isDeleted)
             esm.fail("Missing DATA");
     }
-    void StartScript::save(ESMWriter &esm, bool isDeleted) const
+    void StartScript::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
         if (isDeleted)
diff --git a/components/esm3/loadsscr.hpp b/components/esm3/loadsscr.hpp
index 64c8e78cda..375d7ce889 100644
--- a/components/esm3/loadsscr.hpp
+++ b/components/esm3/loadsscr.hpp
@@ -8,34 +8,34 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
-
-/*
- Startup script. I think this is simply a 'main' script that is run
- from the begining. The SSCR records contain a DATA identifier which
- is totally useless (TODO: don't remember what it contains exactly,
- document it below later.), and a NAME which is simply a script
- reference.
- */
-
-struct StartScript
-{
-    constexpr static RecNameInts sRecordId = REC_SSCR;
-
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "StartScript"; }
-
-    std::string mData;
-    unsigned int mRecordFlags;
-    std::string mId;
-
-    // Load a record and add it to the list
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
-
-    void blank();
-};
+    class ESMReader;
+    class ESMWriter;
+
+    /*
+     Startup script. I think this is simply a 'main' script that is run
+     from the begining. The SSCR records contain a DATA identifier which
+     is totally useless (TODO: don't remember what it contains exactly,
+     document it below later.), and a NAME which is simply a script
+     reference.
+     */
+
+    struct StartScript
+    {
+        constexpr static RecNameInts sRecordId = REC_SSCR;
+
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "StartScript"; }
+
+        std::string mData;
+        unsigned int mRecordFlags;
+        std::string mId;
+
+        // Load a record and add it to the list
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
+
+        void blank();
+    };
 
 }
 #endif
diff --git a/components/esm3/loadstat.cpp b/components/esm3/loadstat.cpp
index fba92cd467..d793200b00 100644
--- a/components/esm3/loadstat.cpp
+++ b/components/esm3/loadstat.cpp
@@ -5,12 +5,12 @@
 
 namespace ESM
 {
-    void Static::load(ESMReader &esm, bool &isDeleted)
+    void Static::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
-        //bool isBlocked = (mRecordFlags & FLAG_Blocked) != 0;
-        //bool isPersistent = (mRecordFlags & FLAG_Persistent) != 0;
+        // bool isBlocked = (mRecordFlags & FLAG_Blocked) != 0;
+        // bool isPersistent = (mRecordFlags & FLAG_Persistent) != 0;
 
         bool hasName = false;
         while (esm.hasMoreSubs())
@@ -38,7 +38,7 @@ namespace ESM
         if (!hasName)
             esm.fail("Missing NAME subrecord");
     }
-    void Static::save(ESMWriter &esm, bool isDeleted) const
+    void Static::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
         if (isDeleted)
diff --git a/components/esm3/loadstat.hpp b/components/esm3/loadstat.hpp
index d107cc0ffd..16b21e6f75 100644
--- a/components/esm3/loadstat.hpp
+++ b/components/esm3/loadstat.hpp
@@ -8,36 +8,36 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
-
-/*
- * Definition of static object.
- *
- * A stat record is basically just a reference to a nif file. Some
- * esps seem to contain copies of the STAT entries from the esms, and
- * the esms themselves contain several identical entries. Perhaps all
- * statics referenced in a file is also put in the file? Since we are
- * only reading files it doesn't much matter to us, but it would if we
- * were writing our own ESM/ESPs. You can check some files later when
- * you decode the CELL blocks, if you want to test this hypothesis.
- */
-
-struct Static
-{
-    constexpr static RecNameInts sRecordId = REC_STAT;
-
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Static"; }
-
-    unsigned int mRecordFlags;
-    std::string mId, mModel;
-
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
-
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-};
+    class ESMReader;
+    class ESMWriter;
+
+    /*
+     * Definition of static object.
+     *
+     * A stat record is basically just a reference to a nif file. Some
+     * esps seem to contain copies of the STAT entries from the esms, and
+     * the esms themselves contain several identical entries. Perhaps all
+     * statics referenced in a file is also put in the file? Since we are
+     * only reading files it doesn't much matter to us, but it would if we
+     * were writing our own ESM/ESPs. You can check some files later when
+     * you decode the CELL blocks, if you want to test this hypothesis.
+     */
+
+    struct Static
+    {
+        constexpr static RecNameInts sRecordId = REC_STAT;
+
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Static"; }
+
+        unsigned int mRecordFlags;
+        std::string mId, mModel;
+
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
+
+        void blank();
+        ///< Set record to default state (does not touch the ID).
+    };
 }
 #endif
diff --git a/components/esm3/loadtes3.cpp b/components/esm3/loadtes3.cpp
index 0c3ccf232e..a44b2ffd0e 100644
--- a/components/esm3/loadtes3.cpp
+++ b/components/esm3/loadtes3.cpp
@@ -1,91 +1,91 @@
 #include "loadtes3.hpp"
 
+#include "components/esm/defs.hpp"
 #include "components/esm/esmcommon.hpp"
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
 
-void Header::blank()
-{
-    mData.version = VER_13;
-    mData.type = 0;
-    mData.author.clear();
-    mData.desc.clear();
-    mData.records = 0;
-    mFormat = CurrentFormat;
-    mMaster.clear();
-}
-
-void Header::load (ESMReader &esm)
-{
-    if (esm.isNextSub ("FORM"))
+    void Header::blank()
     {
-        esm.getHT (mFormat);
-        if (mFormat<0)
-            esm.fail ("invalid format code");
+        mData.version = VER_13;
+        mData.type = 0;
+        mData.author.clear();
+        mData.desc.clear();
+        mData.records = 0;
+        mFormat = CurrentFormat;
+        mMaster.clear();
     }
-    else
-        mFormat = 0;
 
-    if (esm.isNextSub("HEDR"))
+    void Header::load(ESMReader& esm)
     {
-      esm.getSubHeader();
-      esm.getT(mData.version);
-      esm.getT(mData.type);
-      mData.author.assign( esm.getString(32) );
-      mData.desc.assign( esm.getString(256) );
-      esm.getT(mData.records);
-    }
+        if (esm.isNextSub("FORM"))
+        {
+            esm.getHT(mFormat);
+            if (mFormat < 0)
+                esm.fail("invalid format code");
+        }
+        else
+            mFormat = 0;
 
-    while (esm.isNextSub ("MAST"))
-    {
-        MasterData m;
-        m.name = esm.getHString();
-        esm.getHNT(m.size, "DATA");
-        mMaster.push_back (m);
-    }
+        if (esm.isNextSub("HEDR"))
+        {
+            esm.getSubHeader();
+            esm.getT(mData.version);
+            esm.getT(mData.type);
+            mData.author.assign(esm.getString(32));
+            mData.desc.assign(esm.getString(256));
+            esm.getT(mData.records);
+        }
 
-    if (esm.isNextSub("GMDT"))
-    {
-        esm.getHT(mGameData);
-    }
-    if (esm.isNextSub("SCRD"))
-    {
-        esm.getSubHeader();
-        mSCRD.resize(esm.getSubSize());
-        if (!mSCRD.empty())
-            esm.getExact(mSCRD.data(), mSCRD.size());
-    }
-    if (esm.isNextSub("SCRS"))
-    {
-        esm.getSubHeader();
-        mSCRS.resize(esm.getSubSize());
-        if (!mSCRS.empty())
-            esm.getExact(mSCRS.data(), mSCRS.size());
+        while (esm.isNextSub("MAST"))
+        {
+            MasterData m;
+            m.name = esm.getHString();
+            esm.getHNT(m.size, "DATA");
+            mMaster.push_back(m);
+        }
+
+        if (esm.isNextSub("GMDT"))
+        {
+            esm.getHT(mGameData);
+        }
+        if (esm.isNextSub("SCRD"))
+        {
+            esm.getSubHeader();
+            mSCRD.resize(esm.getSubSize());
+            if (!mSCRD.empty())
+                esm.getExact(mSCRD.data(), mSCRD.size());
+        }
+        if (esm.isNextSub("SCRS"))
+        {
+            esm.getSubHeader();
+            mSCRS.resize(esm.getSubSize());
+            if (!mSCRS.empty())
+                esm.getExact(mSCRS.data(), mSCRS.size());
+        }
     }
-}
 
-void Header::save (ESMWriter &esm)
-{
-    if (mFormat>0)
-        esm.writeHNT ("FORM", mFormat);
+    void Header::save(ESMWriter& esm)
+    {
+        if (mFormat > 0)
+            esm.writeHNT("FORM", mFormat);
 
-    esm.startSubRecord("HEDR");
-    esm.writeT(mData.version);
-    esm.writeT(mData.type);
-    esm.writeFixedSizeString(mData.author, 32);
-    esm.writeFixedSizeString(mData.desc, 256);
-    esm.writeT(mData.records);
-    esm.endRecord("HEDR");
+        esm.startSubRecord("HEDR");
+        esm.writeT(mData.version);
+        esm.writeT(mData.type);
+        esm.writeFixedSizeString(mData.author, 32);
+        esm.writeFixedSizeString(mData.desc, 256);
+        esm.writeT(mData.records);
+        esm.endRecord("HEDR");
 
-    for (const Header::MasterData& data : mMaster)
-    {
-        esm.writeHNCString ("MAST", data.name);
-        esm.writeHNT ("DATA", data.size);
+        for (const Header::MasterData& data : mMaster)
+        {
+            esm.writeHNCString("MAST", data.name);
+            esm.writeHNT("DATA", data.size);
+        }
     }
-}
 
 }
diff --git a/components/esm3/loadtes3.hpp b/components/esm3/loadtes3.hpp
index ea41ce9fb6..7dca3d0ff8 100644
--- a/components/esm3/loadtes3.hpp
+++ b/components/esm3/loadtes3.hpp
@@ -20,10 +20,10 @@ namespace ESM
             1.2 = 0x3f99999a and 1.3 = 0x3fa66666
         */
         unsigned int version;
-        int type;           // 0=esp, 1=esm, 32=ess (unused)
+        int type; // 0=esp, 1=esm, 32=ess (unused)
         std::string author; // Author's name
-        std::string desc;   // File description
-        int records;        // Number of records
+        std::string desc; // File description
+        int records; // Number of records
     };
 
     struct GMDT
@@ -61,8 +61,8 @@ namespace ESM
 
         void blank();
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm);
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm);
     };
 
 }
diff --git a/components/esm3/loadweap.cpp b/components/esm3/loadweap.cpp
index cdc81f2aa7..8f74eeee69 100644
--- a/components/esm3/loadweap.cpp
+++ b/components/esm3/loadweap.cpp
@@ -1,12 +1,12 @@
 #include "loadweap.hpp"
 
+#include "components/esm/defs.hpp"
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    void Weapon::load(ESMReader &esm, bool &isDeleted)
+    void Weapon::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -55,7 +55,7 @@ namespace ESM
         if (!hasData && !isDeleted)
             esm.fail("Missing WPDT subrecord");
     }
-    void Weapon::save(ESMWriter &esm, bool isDeleted) const
+    void Weapon::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
diff --git a/components/esm3/loadweap.hpp b/components/esm3/loadweap.hpp
index 7b84603511..b54f5e8327 100644
--- a/components/esm3/loadweap.hpp
+++ b/components/esm3/loadweap.hpp
@@ -8,116 +8,123 @@
 namespace ESM
 {
 
-class ESMReader;
-class ESMWriter;
+    class ESMReader;
+    class ESMWriter;
 
-/*
- * Weapon definition
- */
+    /*
+     * Weapon definition
+     */
 
-struct Weapon
-{
-    constexpr static RecNameInts sRecordId = REC_WEAP;
-
-    /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string_view getRecordType() { return "Weapon"; }
-
-    enum Type
-    {
-        PickProbe = -4,
-        HandToHand = -3,
-        Spell = -2,
-        None = -1,
-        ShortBladeOneHand = 0,
-        LongBladeOneHand = 1,
-        LongBladeTwoHand = 2,
-        BluntOneHand = 3,
-        BluntTwoClose = 4,
-        BluntTwoWide = 5,
-        SpearTwoWide = 6,
-        AxeOneHand = 7,
-        AxeTwoHand = 8,
-        MarksmanBow = 9,
-        MarksmanCrossbow = 10,
-        MarksmanThrown = 11,
-        Arrow = 12,
-        Bolt = 13
-    };
-
-    enum AttackType
-    {
-        AT_Chop,
-        AT_Slash,
-        AT_Thrust
-    };
-
-    enum Flags
+    struct Weapon
     {
-        Magical = 0x01,
-        Silver = 0x02
-    };
+        constexpr static RecNameInts sRecordId = REC_WEAP;
+
+        /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
+        static std::string_view getRecordType() { return "Weapon"; }
+
+        enum Type
+        {
+            PickProbe = -4,
+            HandToHand = -3,
+            Spell = -2,
+            None = -1,
+            ShortBladeOneHand = 0,
+            LongBladeOneHand = 1,
+            LongBladeTwoHand = 2,
+            BluntOneHand = 3,
+            BluntTwoClose = 4,
+            BluntTwoWide = 5,
+            SpearTwoWide = 6,
+            AxeOneHand = 7,
+            AxeTwoHand = 8,
+            MarksmanBow = 9,
+            MarksmanCrossbow = 10,
+            MarksmanThrown = 11,
+            Arrow = 12,
+            Bolt = 13
+        };
+
+        enum AttackType
+        {
+            AT_Chop,
+            AT_Slash,
+            AT_Thrust
+        };
+
+        enum Flags
+        {
+            Magical = 0x01,
+            Silver = 0x02
+        };
 
 #pragma pack(push)
 #pragma pack(1)
-    struct WPDTstruct
-    {
-        float mWeight;
-        int mValue;
-        short mType;
-        unsigned short mHealth;
-        float mSpeed, mReach;
-        unsigned short mEnchant; // Enchantment points. The real value is mEnchant/10.f
-        unsigned char mChop[2], mSlash[2], mThrust[2]; // Min and max
-        int mFlags;
-    }; // 32 bytes
+        struct WPDTstruct
+        {
+            float mWeight;
+            int mValue;
+            short mType;
+            unsigned short mHealth;
+            float mSpeed, mReach;
+            unsigned short mEnchant; // Enchantment points. The real value is mEnchant/10.f
+            unsigned char mChop[2], mSlash[2], mThrust[2]; // Min and max
+            int mFlags;
+        }; // 32 bytes
 #pragma pack(pop)
 
-    WPDTstruct mData;
+        WPDTstruct mData;
 
-    unsigned int mRecordFlags;
-    std::string mId, mName, mModel, mIcon, mEnchant, mScript;
+        unsigned int mRecordFlags;
+        std::string mId, mName, mModel, mIcon, mEnchant, mScript;
 
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
 
-    void blank();
-    ///< Set record to default state (does not touch the ID).
-};
-
-struct WeaponType
-{
-    enum Flags
-    {
-        TwoHanded = 0x01,
-        HasHealth = 0x02
+        void blank();
+        ///< Set record to default state (does not touch the ID).
     };
 
-    enum Class
+    struct WeaponType
     {
-        Melee = 0,
-        Ranged = 1,
-        Thrown = 2,
-        Ammo = 3
-    };
+        enum Flags
+        {
+            TwoHanded = 0x01,
+            HasHealth = 0x02
+        };
+
+        enum Class
+        {
+            Melee = 0,
+            Ranged = 1,
+            Thrown = 2,
+            Ammo = 3
+        };
+
+        // std::string mDisplayName; // TODO: will be needed later for editor
+        std::string mShortGroup;
+        std::string mLongGroup;
+        std::string mSoundIdDown;
+        std::string mSoundIdUp;
+        std::string mAttachBone;
+        std::string mSheathingBone;
+        Skill::SkillEnum mSkill;
+        Class mWeaponClass;
+        int mAmmoType;
+        int mFlags;
 
-    //std::string mDisplayName; // TODO: will be needed later for editor
-    std::string mShortGroup;
-    std::string mLongGroup;
-    std::string mSoundIdDown;
-    std::string mSoundIdUp;
-    std::string mAttachBone;
-    std::string mSheathingBone;
-    Skill::SkillEnum mSkill;
-    Class mWeaponClass;
-    int mAmmoType;
-    int mFlags;
-
-    WeaponType(std::string shortGroup, std::string longGroup, const std::string& soundId, std::string attachBone,
-        std::string sheathingBone, Skill::SkillEnum skill, Class weaponClass, int ammoType, int flags) :
-        mShortGroup(std::move(shortGroup)), mLongGroup(std::move(longGroup)), mSoundIdDown(soundId + " Down"),
-        mSoundIdUp(soundId + " Up"), mAttachBone(std::move(attachBone)), mSheathingBone(std::move(sheathingBone)),
-        mSkill(skill), mWeaponClass(weaponClass), mAmmoType(ammoType), mFlags(flags) {};
-};
+        WeaponType(std::string shortGroup, std::string longGroup, const std::string& soundId, std::string attachBone,
+            std::string sheathingBone, Skill::SkillEnum skill, Class weaponClass, int ammoType, int flags)
+            : mShortGroup(std::move(shortGroup))
+            , mLongGroup(std::move(longGroup))
+            , mSoundIdDown(soundId + " Down")
+            , mSoundIdUp(soundId + " Up")
+            , mAttachBone(std::move(attachBone))
+            , mSheathingBone(std::move(sheathingBone))
+            , mSkill(skill)
+            , mWeaponClass(weaponClass)
+            , mAmmoType(ammoType)
+            , mFlags(flags){};
+    };
 
 }
 #endif
diff --git a/components/esm3/locals.cpp b/components/esm3/locals.cpp
index 7db0e544ec..3b23fe8ace 100644
--- a/components/esm3/locals.cpp
+++ b/components/esm3/locals.cpp
@@ -6,27 +6,27 @@
 namespace ESM
 {
 
-void Locals::load (ESMReader &esm)
-{
-    while (esm.isNextSub ("LOCA"))
+    void Locals::load(ESMReader& esm)
     {
-        std::string id = esm.getHString();
+        while (esm.isNextSub("LOCA"))
+        {
+            std::string id = esm.getHString();
 
-        Variant value;
-        value.read (esm, Variant::Format_Local);
+            Variant value;
+            value.read(esm, Variant::Format_Local);
 
-        mVariables.emplace_back (id, value);
+            mVariables.emplace_back(id, value);
+        }
     }
-}
 
-void Locals::save (ESMWriter &esm) const
-{
-    for (std::vector<std::pair<std::string, Variant> >::const_iterator iter (mVariables.begin());
-        iter!=mVariables.end(); ++iter)
+    void Locals::save(ESMWriter& esm) const
     {
-        esm.writeHNString ("LOCA", iter->first);
-        iter->second.write (esm, Variant::Format_Local);
+        for (std::vector<std::pair<std::string, Variant>>::const_iterator iter(mVariables.begin());
+             iter != mVariables.end(); ++iter)
+        {
+            esm.writeHNString("LOCA", iter->first);
+            iter->second.write(esm, Variant::Format_Local);
+        }
     }
-}
 
 }
diff --git a/components/esm3/locals.hpp b/components/esm3/locals.hpp
index af5afb23bd..82ddcf69d1 100644
--- a/components/esm3/locals.hpp
+++ b/components/esm3/locals.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_ESM_LOCALS_H
 #define OPENMW_ESM_LOCALS_H
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "variant.hpp"
 
@@ -17,10 +17,10 @@ namespace ESM
 
     struct Locals
     {
-        std::vector<std::pair<std::string, Variant> > mVariables;
+        std::vector<std::pair<std::string, Variant>> mVariables;
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 }
 
diff --git a/components/esm3/magiceffects.cpp b/components/esm3/magiceffects.cpp
index a1f943a93d..559eeaa9de 100644
--- a/components/esm3/magiceffects.cpp
+++ b/components/esm3/magiceffects.cpp
@@ -1,35 +1,35 @@
 #include "magiceffects.hpp"
 
-#include "esmwriter.hpp"
 #include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {
 
-void MagicEffects::save(ESMWriter &esm) const
-{
-    for (const auto& [key, params] : mEffects)
+    void MagicEffects::save(ESMWriter& esm) const
     {
-        esm.writeHNT("EFID", key);
-        esm.writeHNT("BASE", params.first);
-        esm.writeHNT("MODI", params.second);
+        for (const auto& [key, params] : mEffects)
+        {
+            esm.writeHNT("EFID", key);
+            esm.writeHNT("BASE", params.first);
+            esm.writeHNT("MODI", params.second);
+        }
     }
-}
 
-void MagicEffects::load(ESMReader &esm)
-{
-    while (esm.isNextSub("EFID"))
+    void MagicEffects::load(ESMReader& esm)
     {
-        int id;
-        std::pair<int, float> params;
-        esm.getHT(id);
-        esm.getHNT(params.first, "BASE");
-        if(esm.getFormat() < 17)
-            params.second = 0.f;
-        else
-            esm.getHNT(params.second, "MODI");
-        mEffects.emplace(id, params);
+        while (esm.isNextSub("EFID"))
+        {
+            int id;
+            std::pair<int, float> params;
+            esm.getHT(id);
+            esm.getHNT(params.first, "BASE");
+            if (esm.getFormat() < 17)
+                params.second = 0.f;
+            else
+                esm.getHNT(params.second, "MODI");
+            mEffects.emplace(id, params);
+        }
     }
-}
 
 }
diff --git a/components/esm3/magiceffects.hpp b/components/esm3/magiceffects.hpp
index 4b54692c5f..3789ebf991 100644
--- a/components/esm3/magiceffects.hpp
+++ b/components/esm3/magiceffects.hpp
@@ -15,24 +15,25 @@ namespace ESM
         // <Effect Id, Base value, Modifier>
         std::map<int, std::pair<int, float>> mEffects;
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 
     struct SummonKey
     {
-        SummonKey(int effectId, const std::string& sourceId, int index):
-            mEffectId(effectId), mSourceId(sourceId), mEffectIndex(index)
-        {}
+        SummonKey(int effectId, const std::string& sourceId, int index)
+            : mEffectId(effectId)
+            , mSourceId(sourceId)
+            , mEffectIndex(index)
+        {
+        }
 
-        bool operator==(const SummonKey &other) const
+        bool operator==(const SummonKey& other) const
         {
-            return mEffectId == other.mEffectId &&
-                    mSourceId == other.mSourceId &&
-                    mEffectIndex == other.mEffectIndex;
+            return mEffectId == other.mEffectId && mSourceId == other.mSourceId && mEffectIndex == other.mEffectIndex;
         }
 
-        bool operator<(const SummonKey &other) const
+        bool operator<(const SummonKey& other) const
         {
             if (mEffectId < other.mEffectId)
                 return true;
diff --git a/components/esm3/mappings.cpp b/components/esm3/mappings.cpp
index 4553c1396f..445c7200b4 100644
--- a/components/esm3/mappings.cpp
+++ b/components/esm3/mappings.cpp
@@ -6,7 +6,7 @@ namespace ESM
 {
     BodyPart::MeshPart getMeshPart(PartReferenceType type)
     {
-        switch(type)
+        switch (type)
         {
             case PRT_Head:
                 return BodyPart::MP_Head;
@@ -53,14 +53,14 @@ namespace ESM
             case PRT_Tail:
                 return BodyPart::MP_Tail;
             default:
-                throw std::runtime_error("PartReferenceType " +
-                    std::to_string(type) + " not associated with a mesh part");
+                throw std::runtime_error(
+                    "PartReferenceType " + std::to_string(type) + " not associated with a mesh part");
         }
     }
 
     std::string getBoneName(PartReferenceType type)
     {
-        switch(type)
+        switch (type)
         {
             case PRT_Head:
                 return "head";
@@ -123,7 +123,7 @@ namespace ESM
 
     std::string getMeshFilter(PartReferenceType type)
     {
-        switch(type)
+        switch (type)
         {
             case PRT_Hair:
                 return "hair";
diff --git a/components/esm3/npcstate.cpp b/components/esm3/npcstate.cpp
index 91c6ebbf09..c0262b73e2 100644
--- a/components/esm3/npcstate.cpp
+++ b/components/esm3/npcstate.cpp
@@ -3,40 +3,40 @@
 namespace ESM
 {
 
-void NpcState::load (ESMReader &esm)
-{
-    ObjectState::load (esm);
-
-    if (mHasCustomState)
+    void NpcState::load(ESMReader& esm)
     {
-        mInventory.load (esm);
+        ObjectState::load(esm);
 
-        mNpcStats.load (esm);
+        if (mHasCustomState)
+        {
+            mInventory.load(esm);
 
-        mCreatureStats.load (esm);
-    }
-}
+            mNpcStats.load(esm);
 
-void NpcState::save (ESMWriter &esm, bool inInventory) const
-{
-    ObjectState::save (esm, inInventory);
+            mCreatureStats.load(esm);
+        }
+    }
 
-    if (mHasCustomState)
+    void NpcState::save(ESMWriter& esm, bool inInventory) const
     {
-        mInventory.save (esm);
+        ObjectState::save(esm, inInventory);
 
-        mNpcStats.save (esm);
+        if (mHasCustomState)
+        {
+            mInventory.save(esm);
 
-        mCreatureStats.save (esm);
+            mNpcStats.save(esm);
+
+            mCreatureStats.save(esm);
+        }
     }
-}
 
-void NpcState::blank()
-{
-    ObjectState::blank();
-    mNpcStats.blank();
-    mCreatureStats.blank();
-    mHasCustomState = true;
-}
+    void NpcState::blank()
+    {
+        ObjectState::blank();
+        mNpcStats.blank();
+        mCreatureStats.blank();
+        mHasCustomState = true;
+    }
 
 }
diff --git a/components/esm3/npcstate.hpp b/components/esm3/npcstate.hpp
index fc6b917642..30a492a489 100644
--- a/components/esm3/npcstate.hpp
+++ b/components/esm3/npcstate.hpp
@@ -1,10 +1,10 @@
 #ifndef OPENMW_ESM_NPCSTATE_H
 #define OPENMW_ESM_NPCSTATE_H
 
-#include "objectstate.hpp"
+#include "creaturestats.hpp"
 #include "inventorystate.hpp"
 #include "npcstats.hpp"
-#include "creaturestats.hpp"
+#include "objectstate.hpp"
 
 namespace ESM
 {
@@ -19,17 +19,11 @@ namespace ESM
         /// Initialize to default state
         void blank() override;
 
-        void load (ESMReader &esm) override;
-        void save (ESMWriter &esm, bool inInventory = false) const override;
+        void load(ESMReader& esm) override;
+        void save(ESMWriter& esm, bool inInventory = false) const override;
 
-        NpcState& asNpcState() override
-        {
-            return *this;
-        }
-        const NpcState& asNpcState() const override
-        {
-            return *this;
-        }
+        NpcState& asNpcState() override { return *this; }
+        const NpcState& asNpcState() const override { return *this; }
     };
 }
 
diff --git a/components/esm3/npcstats.cpp b/components/esm3/npcstats.cpp
index 2896f6a922..455a1d77f4 100644
--- a/components/esm3/npcstats.cpp
+++ b/components/esm3/npcstats.cpp
@@ -8,207 +8,208 @@
 namespace ESM
 {
 
-NpcStats::Faction::Faction() : mExpelled (false), mRank (-1), mReputation (0) {}
-
-void NpcStats::load (ESMReader &esm)
-{
-    while (esm.isNextSub ("FACT"))
+    NpcStats::Faction::Faction()
+        : mExpelled(false)
+        , mRank(-1)
+        , mReputation(0)
     {
-        std::string id = esm.getHString();
+    }
 
-        Faction faction;
+    void NpcStats::load(ESMReader& esm)
+    {
+        while (esm.isNextSub("FACT"))
+        {
+            std::string id = esm.getHString();
 
-        int expelled = 0;
-        esm.getHNOT (expelled, "FAEX");
+            Faction faction;
 
-        if (expelled)
-            faction.mExpelled = true;
+            int expelled = 0;
+            esm.getHNOT(expelled, "FAEX");
 
-        esm.getHNOT (faction.mRank, "FARA");
+            if (expelled)
+                faction.mExpelled = true;
 
-        esm.getHNOT (faction.mReputation, "FARE");
+            esm.getHNOT(faction.mRank, "FARA");
 
-        mFactions.insert (std::make_pair (id, faction));
-    }
+            esm.getHNOT(faction.mReputation, "FARE");
 
-    mDisposition = 0;
-    esm.getHNOT (mDisposition, "DISP");
+            mFactions.insert(std::make_pair(id, faction));
+        }
 
-    bool intFallback = esm.getFormat() < 11;
-    for (int i=0; i<27; ++i)
-        mSkills[i].load (esm, intFallback);
+        mDisposition = 0;
+        esm.getHNOT(mDisposition, "DISP");
 
-    mWerewolfDeprecatedData = false;
-    if (esm.getFormat() < 8 && esm.peekNextSub("STBA"))
-    {
-        // we have deprecated werewolf skills, stored interleaved
-        // Load into one big vector, then remove every 2nd value
-        mWerewolfDeprecatedData = true;
-        std::vector<StatState<float> > skills(mSkills, mSkills + sizeof(mSkills)/sizeof(mSkills[0]));
+        bool intFallback = esm.getFormat() < 11;
+        for (int i = 0; i < 27; ++i)
+            mSkills[i].load(esm, intFallback);
 
-        for (int i=0; i<27; ++i)
+        mWerewolfDeprecatedData = false;
+        if (esm.getFormat() < 8 && esm.peekNextSub("STBA"))
         {
-            StatState<float> skill;
-            skill.load(esm, intFallback);
-            skills.push_back(skill);
+            // we have deprecated werewolf skills, stored interleaved
+            // Load into one big vector, then remove every 2nd value
+            mWerewolfDeprecatedData = true;
+            std::vector<StatState<float>> skills(mSkills, mSkills + sizeof(mSkills) / sizeof(mSkills[0]));
+
+            for (int i = 0; i < 27; ++i)
+            {
+                StatState<float> skill;
+                skill.load(esm, intFallback);
+                skills.push_back(skill);
+            }
+
+            int i = 0;
+            for (std::vector<StatState<float>>::iterator it = skills.begin(); it != skills.end(); ++i)
+            {
+                if (i % 2 == 1)
+                    it = skills.erase(it);
+                else
+                    ++it;
+            }
+            assert(skills.size() == 27);
+            std::copy(skills.begin(), skills.end(), mSkills);
         }
 
-        int i=0;
-        for (std::vector<StatState<float> >::iterator it = skills.begin(); it != skills.end(); ++i)
+        // No longer used
+        bool hasWerewolfAttributes = false;
+        esm.getHNOT(hasWerewolfAttributes, "HWAT");
+        if (hasWerewolfAttributes)
         {
-            if (i%2 == 1)
-                it = skills.erase(it);
-            else
-                ++it;
+            StatState<int> dummy;
+            for (int i = 0; i < 8; ++i)
+                dummy.load(esm, intFallback);
+            mWerewolfDeprecatedData = true;
         }
-        assert(skills.size() == 27);
-        std::copy(skills.begin(), skills.end(), mSkills);
-    }
 
-    // No longer used
-    bool hasWerewolfAttributes = false;
-    esm.getHNOT (hasWerewolfAttributes, "HWAT");
-    if (hasWerewolfAttributes)
-    {
-        StatState<int> dummy;
-        for (int i=0; i<8; ++i)
-            dummy.load(esm, intFallback);
-        mWerewolfDeprecatedData = true;
-    }
+        mIsWerewolf = false;
+        esm.getHNOT(mIsWerewolf, "WOLF");
 
-    mIsWerewolf = false;
-    esm.getHNOT (mIsWerewolf, "WOLF");
+        mBounty = 0;
+        esm.getHNOT(mBounty, "BOUN");
 
-    mBounty = 0;
-    esm.getHNOT (mBounty, "BOUN");
+        mReputation = 0;
+        esm.getHNOT(mReputation, "REPU");
 
-    mReputation = 0;
-    esm.getHNOT (mReputation, "REPU");
+        mWerewolfKills = 0;
+        esm.getHNOT(mWerewolfKills, "WKIL");
 
-    mWerewolfKills = 0;
-    esm.getHNOT (mWerewolfKills, "WKIL");
+        // No longer used
+        if (esm.isNextSub("PROF"))
+            esm.skipHSub(); // int profit
 
-    // No longer used
-    if (esm.isNextSub("PROF"))
-        esm.skipHSub(); // int profit
+        // No longer used
+        if (esm.isNextSub("ASTR"))
+            esm.skipHSub(); // attackStrength
 
-    // No longer used
-    if (esm.isNextSub("ASTR"))
-        esm.skipHSub(); // attackStrength
+        mLevelProgress = 0;
+        esm.getHNOT(mLevelProgress, "LPRO");
 
-    mLevelProgress = 0;
-    esm.getHNOT (mLevelProgress, "LPRO");
+        for (int i = 0; i < 8; ++i)
+            mSkillIncrease[i] = 0;
+        esm.getHNOT(mSkillIncrease, "INCR");
 
-    for (int i = 0; i < 8; ++i)
-        mSkillIncrease[i] = 0;
-    esm.getHNOT (mSkillIncrease, "INCR");
+        for (int i = 0; i < 3; ++i)
+            mSpecIncreases[i] = 0;
+        esm.getHNOT(mSpecIncreases, "SPEC");
 
-    for (int i=0; i<3; ++i)
-        mSpecIncreases[i] = 0;
-    esm.getHNOT (mSpecIncreases, "SPEC");
+        while (esm.isNextSub("USED"))
+            mUsedIds.push_back(esm.getHString());
 
-    while (esm.isNextSub ("USED"))
-        mUsedIds.push_back (esm.getHString());
+        mTimeToStartDrowning = 0;
+        esm.getHNOT(mTimeToStartDrowning, "DRTI");
 
-    mTimeToStartDrowning = 0;
-    esm.getHNOT (mTimeToStartDrowning, "DRTI");
+        // No longer used
+        float lastDrowningHit = 0;
+        esm.getHNOT(lastDrowningHit, "DRLH");
 
-    // No longer used
-    float lastDrowningHit = 0;
-    esm.getHNOT (lastDrowningHit, "DRLH");
+        // No longer used
+        float levelHealthBonus = 0;
+        esm.getHNOT(levelHealthBonus, "LVLH");
 
-    // No longer used
-    float levelHealthBonus = 0;
-    esm.getHNOT (levelHealthBonus, "LVLH");
-
-    mCrimeId = -1;
-    esm.getHNOT (mCrimeId, "CRID");
-}
+        mCrimeId = -1;
+        esm.getHNOT(mCrimeId, "CRID");
+    }
 
-void NpcStats::save (ESMWriter &esm) const
-{
-    for (std::map<std::string, Faction>::const_iterator iter (mFactions.begin());
-        iter!=mFactions.end(); ++iter)
+    void NpcStats::save(ESMWriter& esm) const
     {
-        esm.writeHNString ("FACT", iter->first);
-
-        if (iter->second.mExpelled)
+        for (std::map<std::string, Faction>::const_iterator iter(mFactions.begin()); iter != mFactions.end(); ++iter)
         {
-            int expelled = 1;
-            esm.writeHNT ("FAEX", expelled);
-        }
+            esm.writeHNString("FACT", iter->first);
 
-        if (iter->second.mRank >= 0)
-            esm.writeHNT ("FARA", iter->second.mRank);
+            if (iter->second.mExpelled)
+            {
+                int expelled = 1;
+                esm.writeHNT("FAEX", expelled);
+            }
 
-        if (iter->second.mReputation)
-            esm.writeHNT ("FARE", iter->second.mReputation);
-    }
+            if (iter->second.mRank >= 0)
+                esm.writeHNT("FARA", iter->second.mRank);
 
-    if (mDisposition)
-        esm.writeHNT ("DISP", mDisposition);
+            if (iter->second.mReputation)
+                esm.writeHNT("FARE", iter->second.mReputation);
+        }
 
-    for (int i=0; i<27; ++i)
-        mSkills[i].save (esm);
+        if (mDisposition)
+            esm.writeHNT("DISP", mDisposition);
 
-    if (mIsWerewolf)
-        esm.writeHNT ("WOLF", mIsWerewolf);
+        for (int i = 0; i < 27; ++i)
+            mSkills[i].save(esm);
 
-    if (mBounty)
-        esm.writeHNT ("BOUN", mBounty);
+        if (mIsWerewolf)
+            esm.writeHNT("WOLF", mIsWerewolf);
 
-    if (mReputation)
-        esm.writeHNT ("REPU", mReputation);
+        if (mBounty)
+            esm.writeHNT("BOUN", mBounty);
 
-    if (mWerewolfKills)
-        esm.writeHNT ("WKIL", mWerewolfKills);
+        if (mReputation)
+            esm.writeHNT("REPU", mReputation);
 
-    if (mLevelProgress)
-        esm.writeHNT ("LPRO", mLevelProgress);
+        if (mWerewolfKills)
+            esm.writeHNT("WKIL", mWerewolfKills);
 
-    bool saveSkillIncreases = false;
-    for (int i = 0; i < 8; ++i)
-    {
-        if (mSkillIncrease[i] != 0)
+        if (mLevelProgress)
+            esm.writeHNT("LPRO", mLevelProgress);
+
+        bool saveSkillIncreases = false;
+        for (int i = 0; i < 8; ++i)
         {
-            saveSkillIncreases = true;
-            break;
+            if (mSkillIncrease[i] != 0)
+            {
+                saveSkillIncreases = true;
+                break;
+            }
         }
-    }
-    if (saveSkillIncreases)
-        esm.writeHNT ("INCR", mSkillIncrease);
+        if (saveSkillIncreases)
+            esm.writeHNT("INCR", mSkillIncrease);
 
-    if (mSpecIncreases[0] != 0 ||
-        mSpecIncreases[1] != 0 ||
-        mSpecIncreases[2] != 0)
-    esm.writeHNT ("SPEC", mSpecIncreases);
+        if (mSpecIncreases[0] != 0 || mSpecIncreases[1] != 0 || mSpecIncreases[2] != 0)
+            esm.writeHNT("SPEC", mSpecIncreases);
 
-    for (std::vector<std::string>::const_iterator iter (mUsedIds.begin()); iter!=mUsedIds.end();
-        ++iter)
-        esm.writeHNString ("USED", *iter);
+        for (std::vector<std::string>::const_iterator iter(mUsedIds.begin()); iter != mUsedIds.end(); ++iter)
+            esm.writeHNString("USED", *iter);
 
-    if (mTimeToStartDrowning)
-        esm.writeHNT ("DRTI", mTimeToStartDrowning);
+        if (mTimeToStartDrowning)
+            esm.writeHNT("DRTI", mTimeToStartDrowning);
 
-    if (mCrimeId != -1)
-        esm.writeHNT ("CRID", mCrimeId);
-}
+        if (mCrimeId != -1)
+            esm.writeHNT("CRID", mCrimeId);
+    }
 
-void NpcStats::blank()
-{
-    mWerewolfDeprecatedData = false;
-    mIsWerewolf = false;
-    mDisposition = 0;
-    mBounty = 0;
-    mReputation = 0;
-    mWerewolfKills = 0;
-    mLevelProgress = 0;
-    for (int i=0; i<8; ++i)
-        mSkillIncrease[i] = 0;
-    for (int i=0; i<3; ++i)
-        mSpecIncreases[i] = 0;
-    mTimeToStartDrowning = 20;
-    mCrimeId = -1;
-}
+    void NpcStats::blank()
+    {
+        mWerewolfDeprecatedData = false;
+        mIsWerewolf = false;
+        mDisposition = 0;
+        mBounty = 0;
+        mReputation = 0;
+        mWerewolfKills = 0;
+        mLevelProgress = 0;
+        for (int i = 0; i < 8; ++i)
+            mSkillIncrease[i] = 0;
+        for (int i = 0; i < 3; ++i)
+            mSpecIncreases[i] = 0;
+        mTimeToStartDrowning = 20;
+        mCrimeId = -1;
+    }
 
 }
diff --git a/components/esm3/npcstats.hpp b/components/esm3/npcstats.hpp
index 3ad94b543e..f18cb31513 100644
--- a/components/esm3/npcstats.hpp
+++ b/components/esm3/npcstats.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_ESM_NPCSTATS_H
 #define OPENMW_ESM_NPCSTATS_H
 
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
 
 #include "statstate.hpp"
 
@@ -45,8 +45,8 @@ namespace ESM
         /// Initialize to default state
         void blank();
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 }
 
diff --git a/components/esm3/objectstate.cpp b/components/esm3/objectstate.cpp
index 30f6c98f38..a8ebff7b88 100644
--- a/components/esm3/objectstate.cpp
+++ b/components/esm3/objectstate.cpp
@@ -1,9 +1,9 @@
 #include "objectstate.hpp"
 
-#include <stdexcept>
+#include <array>
 #include <sstream>
+#include <stdexcept>
 #include <typeinfo>
-#include <array>
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
@@ -11,174 +11,174 @@
 namespace ESM
 {
 
-void ObjectState::load (ESMReader &esm)
-{
-    mVersion = esm.getFormat();
+    void ObjectState::load(ESMReader& esm)
+    {
+        mVersion = esm.getFormat();
 
-    bool isDeleted;
-    mRef.loadData(esm, isDeleted);
+        bool isDeleted;
+        mRef.loadData(esm, isDeleted);
 
-    mHasLocals = 0;
-    esm.getHNOT (mHasLocals, "HLOC");
+        mHasLocals = 0;
+        esm.getHNOT(mHasLocals, "HLOC");
 
-    if (mHasLocals)
-        mLocals.load (esm);
+        if (mHasLocals)
+            mLocals.load(esm);
 
-    mLuaScripts.load(esm);
+        mLuaScripts.load(esm);
 
-    mEnabled = 1;
-    esm.getHNOT (mEnabled, "ENAB");
+        mEnabled = 1;
+        esm.getHNOT(mEnabled, "ENAB");
 
-    mCount = 1;
-    esm.getHNOT (mCount, "COUN");
+        mCount = 1;
+        esm.getHNOT(mCount, "COUN");
 
-    if(esm.isNextSub("POS_"))
-    {
-        std::array<float, 6> pos;
-        esm.getHT(pos);
-        memcpy(mPosition.pos, pos.data(), sizeof(float) * 3);
-        memcpy(mPosition.rot, pos.data() + 3, sizeof(float) * 3);
-    }
-    else
-        mPosition = mRef.mPos;
+        if (esm.isNextSub("POS_"))
+        {
+            std::array<float, 6> pos;
+            esm.getHT(pos);
+            memcpy(mPosition.pos, pos.data(), sizeof(float) * 3);
+            memcpy(mPosition.rot, pos.data() + 3, sizeof(float) * 3);
+        }
+        else
+            mPosition = mRef.mPos;
 
-    if (esm.isNextSub("LROT"))
-        esm.skipHSub(); // local rotation, no longer used
+        if (esm.isNextSub("LROT"))
+            esm.skipHSub(); // local rotation, no longer used
 
-    mFlags = 0;
-    esm.getHNOT (mFlags, "FLAG");
+        mFlags = 0;
+        esm.getHNOT(mFlags, "FLAG");
 
-    // obsolete
-    int unused;
-    esm.getHNOT(unused, "LTIM");
+        // obsolete
+        int unused;
+        esm.getHNOT(unused, "LTIM");
 
-    mAnimationState.load(esm);
+        mAnimationState.load(esm);
 
-    // FIXME: assuming "false" as default would make more sense, but also break compatibility with older save files
-    mHasCustomState = true;
-    esm.getHNOT (mHasCustomState, "HCUS");
-}
-
-void ObjectState::save (ESMWriter &esm, bool inInventory) const
-{
-    mRef.save (esm, true, inInventory);
+        // FIXME: assuming "false" as default would make more sense, but also break compatibility with older save files
+        mHasCustomState = true;
+        esm.getHNOT(mHasCustomState, "HCUS");
+    }
 
-    if (mHasLocals)
+    void ObjectState::save(ESMWriter& esm, bool inInventory) const
     {
-        esm.writeHNT ("HLOC", mHasLocals);
-        mLocals.save (esm);
-    }
+        mRef.save(esm, true, inInventory);
 
-    mLuaScripts.save(esm);
+        if (mHasLocals)
+        {
+            esm.writeHNT("HLOC", mHasLocals);
+            mLocals.save(esm);
+        }
 
-    if (!mEnabled && !inInventory)
-        esm.writeHNT ("ENAB", mEnabled);
+        mLuaScripts.save(esm);
 
-    if (mCount!=1)
-        esm.writeHNT ("COUN", mCount);
+        if (!mEnabled && !inInventory)
+            esm.writeHNT("ENAB", mEnabled);
 
-    if (!inInventory && mPosition != mRef.mPos)
-    {
-        std::array<float, 6> pos;
-        memcpy(pos.data(), mPosition.pos, sizeof(float) * 3);
-        memcpy(pos.data() + 3, mPosition.rot, sizeof(float) * 3);
-        esm.writeHNT ("POS_", pos, 24);
-    }
+        if (mCount != 1)
+            esm.writeHNT("COUN", mCount);
 
-    if (mFlags != 0)
-        esm.writeHNT ("FLAG", mFlags);
+        if (!inInventory && mPosition != mRef.mPos)
+        {
+            std::array<float, 6> pos;
+            memcpy(pos.data(), mPosition.pos, sizeof(float) * 3);
+            memcpy(pos.data() + 3, mPosition.rot, sizeof(float) * 3);
+            esm.writeHNT("POS_", pos, 24);
+        }
 
-    mAnimationState.save(esm);
+        if (mFlags != 0)
+            esm.writeHNT("FLAG", mFlags);
 
-    if (!mHasCustomState)
-        esm.writeHNT ("HCUS", false);
-}
+        mAnimationState.save(esm);
 
-void ObjectState::blank()
-{
-    mRef.blank();
-    mHasLocals = 0;
-    mEnabled = false;
-    mCount = 1;
-    for (int i=0;i<3;++i)
+        if (!mHasCustomState)
+            esm.writeHNT("HCUS", false);
+    }
+
+    void ObjectState::blank()
     {
-        mPosition.pos[i] = 0;
-        mPosition.rot[i] = 0;
+        mRef.blank();
+        mHasLocals = 0;
+        mEnabled = false;
+        mCount = 1;
+        for (int i = 0; i < 3; ++i)
+        {
+            mPosition.pos[i] = 0;
+            mPosition.rot[i] = 0;
+        }
+        mFlags = 0;
+        mHasCustomState = true;
     }
-    mFlags = 0;
-    mHasCustomState = true;
-}
 
-const NpcState& ObjectState::asNpcState() const
-{
-    std::stringstream error;
-    error << "bad cast " << typeid(this).name() << " to NpcState";
-    throw std::logic_error(error.str());
-}
+    const NpcState& ObjectState::asNpcState() const
+    {
+        std::stringstream error;
+        error << "bad cast " << typeid(this).name() << " to NpcState";
+        throw std::logic_error(error.str());
+    }
 
-NpcState& ObjectState::asNpcState()
-{
-    std::stringstream error;
-    error << "bad cast " << typeid(this).name() << " to NpcState";
-    throw std::logic_error(error.str());
-}
+    NpcState& ObjectState::asNpcState()
+    {
+        std::stringstream error;
+        error << "bad cast " << typeid(this).name() << " to NpcState";
+        throw std::logic_error(error.str());
+    }
 
-const CreatureState& ObjectState::asCreatureState() const
-{
-    std::stringstream error;
-    error << "bad cast " << typeid(this).name() << " to CreatureState";
-    throw std::logic_error(error.str());
-}
+    const CreatureState& ObjectState::asCreatureState() const
+    {
+        std::stringstream error;
+        error << "bad cast " << typeid(this).name() << " to CreatureState";
+        throw std::logic_error(error.str());
+    }
 
-CreatureState& ObjectState::asCreatureState()
-{
-    std::stringstream error;
-    error << "bad cast " << typeid(this).name() << " to CreatureState";
-    throw std::logic_error(error.str());
-}
+    CreatureState& ObjectState::asCreatureState()
+    {
+        std::stringstream error;
+        error << "bad cast " << typeid(this).name() << " to CreatureState";
+        throw std::logic_error(error.str());
+    }
 
-const ContainerState& ObjectState::asContainerState() const
-{
-    std::stringstream error;
-    error << "bad cast " << typeid(this).name() << " to ContainerState";
-    throw std::logic_error(error.str());
-}
+    const ContainerState& ObjectState::asContainerState() const
+    {
+        std::stringstream error;
+        error << "bad cast " << typeid(this).name() << " to ContainerState";
+        throw std::logic_error(error.str());
+    }
 
-ContainerState& ObjectState::asContainerState()
-{
-    std::stringstream error;
-    error << "bad cast " << typeid(this).name() << " to ContainerState";
-    throw std::logic_error(error.str());
-}
+    ContainerState& ObjectState::asContainerState()
+    {
+        std::stringstream error;
+        error << "bad cast " << typeid(this).name() << " to ContainerState";
+        throw std::logic_error(error.str());
+    }
 
-const DoorState& ObjectState::asDoorState() const
-{
-    std::stringstream error;
-    error << "bad cast " << typeid(this).name() << " to DoorState";
-    throw std::logic_error(error.str());
-}
+    const DoorState& ObjectState::asDoorState() const
+    {
+        std::stringstream error;
+        error << "bad cast " << typeid(this).name() << " to DoorState";
+        throw std::logic_error(error.str());
+    }
 
-DoorState& ObjectState::asDoorState()
-{
-    std::stringstream error;
-    error << "bad cast " << typeid(this).name() << " to DoorState";
-    throw std::logic_error(error.str());
-}
+    DoorState& ObjectState::asDoorState()
+    {
+        std::stringstream error;
+        error << "bad cast " << typeid(this).name() << " to DoorState";
+        throw std::logic_error(error.str());
+    }
 
-const CreatureLevListState& ObjectState::asCreatureLevListState() const
-{
-    std::stringstream error;
-    error << "bad cast " << typeid(this).name() << " to CreatureLevListState";
-    throw std::logic_error(error.str());
-}
+    const CreatureLevListState& ObjectState::asCreatureLevListState() const
+    {
+        std::stringstream error;
+        error << "bad cast " << typeid(this).name() << " to CreatureLevListState";
+        throw std::logic_error(error.str());
+    }
 
-CreatureLevListState& ObjectState::asCreatureLevListState()
-{
-    std::stringstream error;
-    error << "bad cast " << typeid(this).name() << " to CreatureLevListState";
-    throw std::logic_error(error.str());
-}
+    CreatureLevListState& ObjectState::asCreatureLevListState()
+    {
+        std::stringstream error;
+        error << "bad cast " << typeid(this).name() << " to CreatureLevListState";
+        throw std::logic_error(error.str());
+    }
 
-ObjectState::~ObjectState() {}
+    ObjectState::~ObjectState() {}
 
 }
diff --git a/components/esm3/objectstate.hpp b/components/esm3/objectstate.hpp
index 5a9e85b71d..996c912a83 100644
--- a/components/esm3/objectstate.hpp
+++ b/components/esm3/objectstate.hpp
@@ -4,10 +4,10 @@
 #include <string>
 #include <vector>
 
+#include "animationstate.hpp"
 #include "cellref.hpp"
-#include "locals.hpp"
 #include "components/esm/luascripts.hpp"
-#include "animationstate.hpp"
+#include "locals.hpp"
 
 namespace ESM
 {
@@ -42,17 +42,23 @@ namespace ESM
         AnimationState mAnimationState;
 
         ObjectState()
-        : mHasLocals(0), mEnabled(0), mCount(0)
-        , mFlags(0), mHasCustomState(true), mVersion(0)
-        {}
+            : mHasLocals(0)
+            , mEnabled(0)
+            , mCount(0)
+            , mFlags(0)
+            , mHasCustomState(true)
+            , mVersion(0)
+        {
+        }
 
         /// @note Does not load the CellRef ID, it should already be loaded before calling this method
-        virtual void load (ESMReader &esm);
+        virtual void load(ESMReader& esm);
 
-        virtual void save (ESMWriter &esm, bool inInventory = false) const;
+        virtual void save(ESMWriter& esm, bool inInventory = false) const;
 
         virtual /// Initialize to default state
-        void blank();
+            void
+            blank();
 
         virtual ~ObjectState();
 
diff --git a/components/esm3/player.cpp b/components/esm3/player.cpp
index fbf6afec93..f75ded51d7 100644
--- a/components/esm3/player.cpp
+++ b/components/esm3/player.cpp
@@ -6,114 +6,114 @@
 namespace ESM
 {
 
-void Player::load (ESMReader &esm)
-{
-    mObject.mRef.loadId(esm, true);
-    mObject.load (esm);
+    void Player::load(ESMReader& esm)
+    {
+        mObject.mRef.loadId(esm, true);
+        mObject.load(esm);
 
-    mCellId.load (esm);
+        mCellId.load(esm);
 
-    esm.getHNTSized<12>(mLastKnownExteriorPosition, "LKEP");
+        esm.getHNTSized<12>(mLastKnownExteriorPosition, "LKEP");
 
-    if (esm.isNextSub ("MARK"))
-    {
-        mHasMark = true;
-        esm.getHTSized<24>(mMarkedPosition);
-        mMarkedCell.load (esm);
-    }
-    else
-        mHasMark = false;
+        if (esm.isNextSub("MARK"))
+        {
+            mHasMark = true;
+            esm.getHTSized<24>(mMarkedPosition);
+            mMarkedCell.load(esm);
+        }
+        else
+            mHasMark = false;
 
-    // Automove, no longer used.
-    if (esm.isNextSub("AMOV"))
-        esm.skipHSub();
+        // Automove, no longer used.
+        if (esm.isNextSub("AMOV"))
+            esm.skipHSub();
 
-    mBirthsign = esm.getHNString ("SIGN");
+        mBirthsign = esm.getHNString("SIGN");
 
-    mCurrentCrimeId = -1;
-    esm.getHNOT (mCurrentCrimeId, "CURD");
-    mPaidCrimeId = -1;
-    esm.getHNOT (mPaidCrimeId, "PAYD");
+        mCurrentCrimeId = -1;
+        esm.getHNOT(mCurrentCrimeId, "CURD");
+        mPaidCrimeId = -1;
+        esm.getHNOT(mPaidCrimeId, "PAYD");
 
-    bool checkPrevItems = true;
-    while (checkPrevItems)
-    {
-        std::string boundItemId = esm.getHNOString("BOUN");
-        std::string prevItemId = esm.getHNOString("PREV");
+        bool checkPrevItems = true;
+        while (checkPrevItems)
+        {
+            std::string boundItemId = esm.getHNOString("BOUN");
+            std::string prevItemId = esm.getHNOString("PREV");
 
-        if (!boundItemId.empty())
-            mPreviousItems[boundItemId] = prevItemId;
-        else
-            checkPrevItems = false;
-    }
+            if (!boundItemId.empty())
+                mPreviousItems[boundItemId] = prevItemId;
+            else
+                checkPrevItems = false;
+        }
 
-    if(esm.getFormat() < 19)
-    {
-        bool intFallback = esm.getFormat() < 11;
-        bool clearModified = esm.getFormat() < 17 && !mObject.mNpcStats.mIsWerewolf;
-        if (esm.hasMoreSubs())
+        if (esm.getFormat() < 19)
         {
-            for (int i=0; i<Attribute::Length; ++i)
+            bool intFallback = esm.getFormat() < 11;
+            bool clearModified = esm.getFormat() < 17 && !mObject.mNpcStats.mIsWerewolf;
+            if (esm.hasMoreSubs())
             {
-                StatState<float> attribute;
-                attribute.load(esm, intFallback);
-                if (clearModified)
-                    attribute.mMod = 0.f;
-                mSaveAttributes[i] = attribute.mBase + attribute.mMod - attribute.mDamage;
-                if (mObject.mNpcStats.mIsWerewolf)
-                    mObject.mCreatureStats.mAttributes[i] = attribute;
-            }
-            for (int i=0; i<Skill::Length; ++i)
-            {
-                StatState<float> skill;
-                skill.load(esm, intFallback);
-                if (clearModified)
-                    skill.mMod = 0.f;
-                mSaveSkills[i] = skill.mBase + skill.mMod - skill.mDamage;
-                if (mObject.mNpcStats.mIsWerewolf)
+                for (int i = 0; i < Attribute::Length; ++i)
+                {
+                    StatState<float> attribute;
+                    attribute.load(esm, intFallback);
+                    if (clearModified)
+                        attribute.mMod = 0.f;
+                    mSaveAttributes[i] = attribute.mBase + attribute.mMod - attribute.mDamage;
+                    if (mObject.mNpcStats.mIsWerewolf)
+                        mObject.mCreatureStats.mAttributes[i] = attribute;
+                }
+                for (int i = 0; i < Skill::Length; ++i)
                 {
-                    if(i == Skill::Acrobatics)
-                        mSetWerewolfAcrobatics = mObject.mNpcStats.mSkills[i].mBase != skill.mBase;
-                    mObject.mNpcStats.mSkills[i] = skill;
+                    StatState<float> skill;
+                    skill.load(esm, intFallback);
+                    if (clearModified)
+                        skill.mMod = 0.f;
+                    mSaveSkills[i] = skill.mBase + skill.mMod - skill.mDamage;
+                    if (mObject.mNpcStats.mIsWerewolf)
+                    {
+                        if (i == Skill::Acrobatics)
+                            mSetWerewolfAcrobatics = mObject.mNpcStats.mSkills[i].mBase != skill.mBase;
+                        mObject.mNpcStats.mSkills[i] = skill;
+                    }
                 }
             }
         }
+        else
+        {
+            mSetWerewolfAcrobatics = false;
+            esm.getHNT(mSaveAttributes, "WWAT");
+            esm.getHNT(mSaveSkills, "WWSK");
+        }
     }
-    else
+
+    void Player::save(ESMWriter& esm) const
     {
-        mSetWerewolfAcrobatics = false;
-        esm.getHNT(mSaveAttributes, "WWAT");
-        esm.getHNT(mSaveSkills, "WWSK");
-    }
-}
+        mObject.save(esm);
 
-void Player::save (ESMWriter &esm) const
-{
-    mObject.save (esm);
+        mCellId.save(esm);
 
-    mCellId.save (esm);
+        esm.writeHNT("LKEP", mLastKnownExteriorPosition);
 
-    esm.writeHNT ("LKEP", mLastKnownExteriorPosition);
+        if (mHasMark)
+        {
+            esm.writeHNT("MARK", mMarkedPosition, 24);
+            mMarkedCell.save(esm);
+        }
 
-    if (mHasMark)
-    {
-        esm.writeHNT ("MARK", mMarkedPosition, 24);
-        mMarkedCell.save (esm);
-    }
+        esm.writeHNString("SIGN", mBirthsign);
 
-    esm.writeHNString ("SIGN", mBirthsign);
+        esm.writeHNT("CURD", mCurrentCrimeId);
+        esm.writeHNT("PAYD", mPaidCrimeId);
 
-    esm.writeHNT ("CURD", mCurrentCrimeId);
-    esm.writeHNT ("PAYD", mPaidCrimeId);
+        for (PreviousItems::const_iterator it = mPreviousItems.begin(); it != mPreviousItems.end(); ++it)
+        {
+            esm.writeHNString("BOUN", it->first);
+            esm.writeHNString("PREV", it->second);
+        }
 
-    for (PreviousItems::const_iterator it=mPreviousItems.begin(); it != mPreviousItems.end(); ++it)
-    {
-        esm.writeHNString ("BOUN", it->first);
-        esm.writeHNString ("PREV", it->second);
+        esm.writeHNT("WWAT", mSaveAttributes);
+        esm.writeHNT("WWSK", mSaveSkills);
     }
 
-    esm.writeHNT("WWAT", mSaveAttributes);
-    esm.writeHNT("WWSK", mSaveSkills);
-}
-
 }
diff --git a/components/esm3/player.hpp b/components/esm3/player.hpp
index 6e914b0e9a..391ae6525b 100644
--- a/components/esm3/player.hpp
+++ b/components/esm3/player.hpp
@@ -3,12 +3,12 @@
 
 #include <string>
 
-#include "npcstate.hpp"
 #include "cellid.hpp"
 #include "components/esm/defs.hpp"
+#include "npcstate.hpp"
 
-#include "loadskil.hpp"
 #include "components/esm/attr.hpp"
+#include "loadskil.hpp"
 
 namespace ESM
 {
@@ -37,8 +37,8 @@ namespace ESM
         typedef std::map<std::string, std::string> PreviousItems; // previous equipped items, needed for bound spells
         PreviousItems mPreviousItems;
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 }
 
diff --git a/components/esm3/projectilestate.cpp b/components/esm3/projectilestate.cpp
index 6a2fcc6675..41451ac495 100644
--- a/components/esm3/projectilestate.cpp
+++ b/components/esm3/projectilestate.cpp
@@ -1,37 +1,37 @@
 #include "projectilestate.hpp"
 
-#include "esmwriter.hpp"
 #include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {
 
-    void BaseProjectileState::save(ESMWriter &esm) const
+    void BaseProjectileState::save(ESMWriter& esm) const
     {
-        esm.writeHNString ("ID__", mId);
-        esm.writeHNT ("VEC3", mPosition);
-        esm.writeHNT ("QUAT", mOrientation);
-        esm.writeHNT ("ACTO", mActorId);
+        esm.writeHNString("ID__", mId);
+        esm.writeHNT("VEC3", mPosition);
+        esm.writeHNT("QUAT", mOrientation);
+        esm.writeHNT("ACTO", mActorId);
     }
 
-    void BaseProjectileState::load(ESMReader &esm)
+    void BaseProjectileState::load(ESMReader& esm)
     {
         mId = esm.getHNString("ID__");
-        esm.getHNT (mPosition, "VEC3");
-        esm.getHNT (mOrientation, "QUAT");
-        esm.getHNT (mActorId, "ACTO");
+        esm.getHNT(mPosition, "VEC3");
+        esm.getHNT(mOrientation, "QUAT");
+        esm.getHNT(mActorId, "ACTO");
     }
 
-    void MagicBoltState::save(ESMWriter &esm) const
+    void MagicBoltState::save(ESMWriter& esm) const
     {
         BaseProjectileState::save(esm);
 
-        esm.writeHNString ("SPEL", mSpellId);
-        esm.writeHNT ("SPED", mSpeed);
-        esm.writeHNT ("SLOT", mSlot);
+        esm.writeHNString("SPEL", mSpellId);
+        esm.writeHNT("SPED", mSpeed);
+        esm.writeHNT("SLOT", mSlot);
     }
 
-    void MagicBoltState::load(ESMReader &esm)
+    void MagicBoltState::load(ESMReader& esm)
     {
         BaseProjectileState::load(esm);
 
@@ -39,8 +39,8 @@ namespace ESM
         if (esm.isNextSub("SRCN")) // for backwards compatibility
             esm.skipHSub();
         EffectList().load(esm); // for backwards compatibility
-        esm.getHNT (mSpeed, "SPED");
-        if(esm.getFormat() < 17)
+        esm.getHNT(mSpeed, "SPED");
+        if (esm.getFormat() < 17)
             mSlot = 0;
         else
             esm.getHNT(mSlot, "SLOT");
@@ -50,21 +50,21 @@ namespace ESM
             esm.skipHSub();
     }
 
-    void ProjectileState::save(ESMWriter &esm) const
+    void ProjectileState::save(ESMWriter& esm) const
     {
         BaseProjectileState::save(esm);
 
-        esm.writeHNString ("BOW_", mBowId);
-        esm.writeHNT ("VEL_", mVelocity);
-        esm.writeHNT ("STR_", mAttackStrength);
+        esm.writeHNString("BOW_", mBowId);
+        esm.writeHNT("VEL_", mVelocity);
+        esm.writeHNT("STR_", mAttackStrength);
     }
 
-    void ProjectileState::load(ESMReader &esm)
+    void ProjectileState::load(ESMReader& esm)
     {
         BaseProjectileState::load(esm);
 
-        mBowId = esm.getHNString ("BOW_");
-        esm.getHNT (mVelocity, "VEL_");
+        mBowId = esm.getHNString("BOW_");
+        esm.getHNT(mVelocity, "VEL_");
 
         mAttackStrength = 1.f;
         esm.getHNOT(mAttackStrength, "STR_");
diff --git a/components/esm3/projectilestate.hpp b/components/esm3/projectilestate.hpp
index 2b2f0d137b..97e8f2c327 100644
--- a/components/esm3/projectilestate.hpp
+++ b/components/esm3/projectilestate.hpp
@@ -24,8 +24,8 @@ namespace ESM
 
         int mActorId;
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 
     struct MagicBoltState : public BaseProjectileState
@@ -34,8 +34,8 @@ namespace ESM
         float mSpeed;
         int mSlot;
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 
     struct ProjectileState : public BaseProjectileState
@@ -44,8 +44,8 @@ namespace ESM
         Vector3 mVelocity;
         float mAttackStrength;
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 
 }
diff --git a/components/esm3/queststate.cpp b/components/esm3/queststate.cpp
index af7ed81f9e..0d39c59b32 100644
--- a/components/esm3/queststate.cpp
+++ b/components/esm3/queststate.cpp
@@ -6,18 +6,18 @@
 namespace ESM
 {
 
-void QuestState::load (ESMReader &esm)
-{
-    mTopic = esm.getHNString ("YETO");
-    esm.getHNOT (mState, "QSTA");
-    esm.getHNOT (mFinished, "QFIN");
-}
+    void QuestState::load(ESMReader& esm)
+    {
+        mTopic = esm.getHNString("YETO");
+        esm.getHNOT(mState, "QSTA");
+        esm.getHNOT(mFinished, "QFIN");
+    }
 
-void QuestState::save (ESMWriter &esm) const
-{
-    esm.writeHNString ("YETO", mTopic);
-    esm.writeHNT ("QSTA", mState);
-    esm.writeHNT ("QFIN", mFinished);
-}
+    void QuestState::save(ESMWriter& esm) const
+    {
+        esm.writeHNString("YETO", mTopic);
+        esm.writeHNT("QSTA", mState);
+        esm.writeHNT("QFIN", mFinished);
+    }
 
 }
diff --git a/components/esm3/queststate.hpp b/components/esm3/queststate.hpp
index 4966cdc908..31c932e206 100644
--- a/components/esm3/queststate.hpp
+++ b/components/esm3/queststate.hpp
@@ -16,8 +16,8 @@ namespace ESM
         int mState;
         unsigned char mFinished;
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 }
 
diff --git a/components/esm3/quickkeys.cpp b/components/esm3/quickkeys.cpp
index 42cd91c5bc..275320bd2b 100644
--- a/components/esm3/quickkeys.cpp
+++ b/components/esm3/quickkeys.cpp
@@ -1,12 +1,12 @@
 #include "quickkeys.hpp"
 
-#include "esmwriter.hpp"
 #include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {
 
-    void QuickKeys::load(ESMReader &esm)
+    void QuickKeys::load(ESMReader& esm)
     {
         if (esm.isNextSub("KEY_"))
             esm.getSubHeader(); // no longer used, because sub-record hierachies do not work properly in esmreader
@@ -25,11 +25,11 @@ namespace ESM
             mKeys.push_back(key);
 
             if (esm.isNextSub("KEY_"))
-                esm.getSubHeader();  // no longer used, because sub-record hierachies do not work properly in esmreader
+                esm.getSubHeader(); // no longer used, because sub-record hierachies do not work properly in esmreader
         }
     }
 
-    void QuickKeys::save(ESMWriter &esm) const
+    void QuickKeys::save(ESMWriter& esm) const
     {
         for (std::vector<QuickKey>::const_iterator it = mKeys.begin(); it != mKeys.end(); ++it)
         {
@@ -38,5 +38,4 @@ namespace ESM
         }
     }
 
-
 }
diff --git a/components/esm3/quickkeys.hpp b/components/esm3/quickkeys.hpp
index c52466b13e..0952f9d39f 100644
--- a/components/esm3/quickkeys.hpp
+++ b/components/esm3/quickkeys.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_ESM_QUICKKEYS_H
 #define OPENMW_COMPONENTS_ESM_QUICKKEYS_H
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace ESM
 {
@@ -19,8 +19,8 @@ namespace ESM
 
         std::vector<QuickKey> mKeys;
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 
 }
diff --git a/components/esm3/readerscache.cpp b/components/esm3/readerscache.cpp
index c3b9d3d03c..deae2a3dc7 100644
--- a/components/esm3/readerscache.cpp
+++ b/components/esm3/readerscache.cpp
@@ -7,7 +7,8 @@ namespace ESM
     ReadersCache::BusyItem::BusyItem(ReadersCache& owner, std::list<Item>::iterator item) noexcept
         : mOwner(owner)
         , mItem(item)
-    {}
+    {
+    }
 
     ReadersCache::BusyItem::~BusyItem() noexcept
     {
@@ -16,7 +17,8 @@ namespace ESM
 
     ReadersCache::ReadersCache(std::size_t capacity)
         : mCapacity(capacity)
-    {}
+    {
+    }
 
     ReadersCache::BusyItem ReadersCache::get(std::size_t index)
     {
diff --git a/components/esm3/readerscache.hpp b/components/esm3/readerscache.hpp
index df14bb6a8a..5d8c2afcbd 100644
--- a/components/esm3/readerscache.hpp
+++ b/components/esm3/readerscache.hpp
@@ -13,58 +13,58 @@ namespace ESM
 {
     class ReadersCache
     {
-        private:
-            enum class State
-            {
-                Busy,
-                Free,
-                Closed,
-            };
-
-            struct Item
-            {
-                State mState = State::Busy;
-                ESMReader mReader;
-                std::optional<std::filesystem::path> mName;
-
-                Item() = default;
-            };
-
+    private:
+        enum class State
+        {
+            Busy,
+            Free,
+            Closed,
+        };
+
+        struct Item
+        {
+            State mState = State::Busy;
+            ESMReader mReader;
+            std::optional<std::filesystem::path> mName;
+
+            Item() = default;
+        };
+
+    public:
+        class BusyItem
+        {
         public:
-            class BusyItem
-            {
-                public:
-                    explicit BusyItem(ReadersCache& owner, std::list<Item>::iterator item) noexcept;
+            explicit BusyItem(ReadersCache& owner, std::list<Item>::iterator item) noexcept;
 
-                    BusyItem(const BusyItem& other) = delete;
+            BusyItem(const BusyItem& other) = delete;
 
-                    ~BusyItem() noexcept;
+            ~BusyItem() noexcept;
 
-                    BusyItem& operator=(const BusyItem& other) = delete;
+            BusyItem& operator=(const BusyItem& other) = delete;
 
-                    ESMReader& operator*() const noexcept { return mItem->mReader; }
+            ESMReader& operator*() const noexcept { return mItem->mReader; }
 
-                    ESMReader* operator->() const noexcept { return &mItem->mReader; }
+            ESMReader* operator->() const noexcept { return &mItem->mReader; }
 
-                private:
-                    ReadersCache& mOwner;
-                    std::list<Item>::iterator mItem;
-            };
+        private:
+            ReadersCache& mOwner;
+            std::list<Item>::iterator mItem;
+        };
 
-            explicit ReadersCache(std::size_t capacity = 100);
+        explicit ReadersCache(std::size_t capacity = 100);
 
-            BusyItem get(std::size_t index);
+        BusyItem get(std::size_t index);
 
-        private:
-            const std::size_t mCapacity;
-            std::map<std::size_t, std::list<Item>::iterator> mIndex;
-            std::list<Item> mBusyItems;
-            std::list<Item> mFreeItems;
-            std::list<Item> mClosedItems;
+    private:
+        const std::size_t mCapacity;
+        std::map<std::size_t, std::list<Item>::iterator> mIndex;
+        std::list<Item> mBusyItems;
+        std::list<Item> mFreeItems;
+        std::list<Item> mClosedItems;
 
-            inline void closeExtraReaders();
+        inline void closeExtraReaders();
 
-            inline void releaseItem(std::list<Item>::iterator it) noexcept;
+        inline void releaseItem(std::list<Item>::iterator it) noexcept;
     };
 }
 
diff --git a/components/esm3/savedgame.cpp b/components/esm3/savedgame.cpp
index 5286cda7df..9251bbb15a 100644
--- a/components/esm3/savedgame.cpp
+++ b/components/esm3/savedgame.cpp
@@ -6,52 +6,51 @@
 namespace ESM
 {
 
-int SavedGame::sCurrentFormat = 21;
-
-void SavedGame::load (ESMReader &esm)
-{
-    mPlayerName = esm.getHNString("PLNA");
-    esm.getHNOT (mPlayerLevel, "PLLE");
-
-    mPlayerClassId = esm.getHNOString("PLCL");
-    mPlayerClassName = esm.getHNOString("PLCN");
-
-    mPlayerCell = esm.getHNString("PLCE");
-    esm.getHNTSized<16>(mInGameTime, "TSTM");
-    esm.getHNT (mTimePlayed, "TIME");
-    mDescription = esm.getHNString ("DESC");
-
-    while (esm.isNextSub ("DEPE"))
-        mContentFiles.push_back (esm.getHString());
-
-    esm.getSubNameIs("SCRN");
-    esm.getSubHeader();
-    mScreenshot.resize(esm.getSubSize());
-    esm.getExact(mScreenshot.data(), mScreenshot.size());
-}
-
-void SavedGame::save (ESMWriter &esm) const
-{
-    esm.writeHNString ("PLNA", mPlayerName);
-    esm.writeHNT ("PLLE", mPlayerLevel);
-
-    if (!mPlayerClassId.empty())
-        esm.writeHNString ("PLCL", mPlayerClassId);
-    else
-        esm.writeHNString ("PLCN", mPlayerClassName);
-
-    esm.writeHNString ("PLCE", mPlayerCell);
-    esm.writeHNT ("TSTM", mInGameTime, 16);
-    esm.writeHNT ("TIME", mTimePlayed);
-    esm.writeHNString ("DESC", mDescription);
-
-    for (std::vector<std::string>::const_iterator iter (mContentFiles.begin());
-         iter!=mContentFiles.end(); ++iter)
-         esm.writeHNString ("DEPE", *iter);
-
-    esm.startSubRecord("SCRN");
-    esm.write(mScreenshot.data(), mScreenshot.size());
-    esm.endRecord("SCRN");
-}
+    int SavedGame::sCurrentFormat = 21;
+
+    void SavedGame::load(ESMReader& esm)
+    {
+        mPlayerName = esm.getHNString("PLNA");
+        esm.getHNOT(mPlayerLevel, "PLLE");
+
+        mPlayerClassId = esm.getHNOString("PLCL");
+        mPlayerClassName = esm.getHNOString("PLCN");
+
+        mPlayerCell = esm.getHNString("PLCE");
+        esm.getHNTSized<16>(mInGameTime, "TSTM");
+        esm.getHNT(mTimePlayed, "TIME");
+        mDescription = esm.getHNString("DESC");
+
+        while (esm.isNextSub("DEPE"))
+            mContentFiles.push_back(esm.getHString());
+
+        esm.getSubNameIs("SCRN");
+        esm.getSubHeader();
+        mScreenshot.resize(esm.getSubSize());
+        esm.getExact(mScreenshot.data(), mScreenshot.size());
+    }
+
+    void SavedGame::save(ESMWriter& esm) const
+    {
+        esm.writeHNString("PLNA", mPlayerName);
+        esm.writeHNT("PLLE", mPlayerLevel);
+
+        if (!mPlayerClassId.empty())
+            esm.writeHNString("PLCL", mPlayerClassId);
+        else
+            esm.writeHNString("PLCN", mPlayerClassName);
+
+        esm.writeHNString("PLCE", mPlayerCell);
+        esm.writeHNT("TSTM", mInGameTime, 16);
+        esm.writeHNT("TIME", mTimePlayed);
+        esm.writeHNString("DESC", mDescription);
+
+        for (std::vector<std::string>::const_iterator iter(mContentFiles.begin()); iter != mContentFiles.end(); ++iter)
+            esm.writeHNString("DEPE", *iter);
+
+        esm.startSubRecord("SCRN");
+        esm.write(mScreenshot.data(), mScreenshot.size());
+        esm.endRecord("SCRN");
+    }
 
 }
diff --git a/components/esm3/savedgame.hpp b/components/esm3/savedgame.hpp
index a51fd3e817..282ce07bb9 100644
--- a/components/esm3/savedgame.hpp
+++ b/components/esm3/savedgame.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_ESM_SAVEDGAME_H
 #define OPENMW_ESM_SAVEDGAME_H
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "components/esm/defs.hpp"
 
@@ -35,8 +35,8 @@ namespace ESM
         std::string mDescription;
         std::vector<char> mScreenshot; // raw jpg-encoded data
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 }
 
diff --git a/components/esm3/spelllist.cpp b/components/esm3/spelllist.cpp
index 9e20ba2644..00da33244b 100644
--- a/components/esm3/spelllist.cpp
+++ b/components/esm3/spelllist.cpp
@@ -8,24 +8,25 @@
 namespace ESM
 {
 
-void SpellList::add(ESMReader &esm)
-{
-    mList.push_back(esm.getHString());
-}
+    void SpellList::add(ESMReader& esm)
+    {
+        mList.push_back(esm.getHString());
+    }
 
-void SpellList::save(ESMWriter &esm) const
-{
-    for (std::vector<std::string>::const_iterator it = mList.begin(); it != mList.end(); ++it) {
-        esm.writeHNString("NPCS", *it, 32);
+    void SpellList::save(ESMWriter& esm) const
+    {
+        for (std::vector<std::string>::const_iterator it = mList.begin(); it != mList.end(); ++it)
+        {
+            esm.writeHNString("NPCS", *it, 32);
+        }
     }
-}
 
-bool SpellList::exists(const std::string &spell) const
-{
-    for (std::vector<std::string>::const_iterator it = mList.begin(); it != mList.end(); ++it)
-        if (Misc::StringUtils::ciEqual(*it, spell))
-            return true;
-    return false;
-}
+    bool SpellList::exists(const std::string& spell) const
+    {
+        for (std::vector<std::string>::const_iterator it = mList.begin(); it != mList.end(); ++it)
+            if (Misc::StringUtils::ciEqual(*it, spell))
+                return true;
+        return false;
+    }
 
 }
diff --git a/components/esm3/spelllist.hpp b/components/esm3/spelllist.hpp
index 6fb0980659..12d487f3b8 100644
--- a/components/esm3/spelllist.hpp
+++ b/components/esm3/spelllist.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_ESM_SPELLLIST_H
 #define OPENMW_ESM_SPELLLIST_H
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace ESM
 {
@@ -21,11 +21,10 @@ namespace ESM
         bool exists(const std::string& spell) const;
 
         /// Load one spell, assumes the subrecord name was already read
-        void add(ESMReader &esm);
+        void add(ESMReader& esm);
 
-        void save(ESMWriter &esm) const;
+        void save(ESMWriter& esm) const;
     };
 }
 
 #endif
-
diff --git a/components/esm3/spellstate.cpp b/components/esm3/spellstate.cpp
index b1ddb6523c..0108c85d14 100644
--- a/components/esm3/spellstate.cpp
+++ b/components/esm3/spellstate.cpp
@@ -6,9 +6,9 @@
 namespace ESM
 {
 
-    void SpellState::load(ESMReader &esm)
+    void SpellState::load(ESMReader& esm)
     {
-        if(esm.getFormat() < 17)
+        if (esm.getFormat() < 17)
         {
             while (esm.isNextSub("SPEL"))
             {
@@ -26,7 +26,8 @@ namespace ESM
                     state.mEffectRands[index] = magnitude;
                 }
 
-                while (esm.isNextSub("PURG")) {
+                while (esm.isNextSub("PURG"))
+                {
                     int index;
                     esm.getHT(index);
                     state.mPurgedEffects.insert(index);
@@ -95,7 +96,7 @@ namespace ESM
         mSelectedSpell = esm.getHNOString("SLCT");
     }
 
-    void SpellState::save(ESMWriter &esm) const
+    void SpellState::save(ESMWriter& esm) const
     {
         for (const std::string& spell : mSpells)
             esm.writeHNString("SPEL", spell);
diff --git a/components/esm3/spellstate.hpp b/components/esm3/spellstate.hpp
index bb909c506c..bf7fa12f39 100644
--- a/components/esm3/spellstate.hpp
+++ b/components/esm3/spellstate.hpp
@@ -2,9 +2,9 @@
 #define OPENMW_ESM_SPELLSTATE_H
 
 #include <map>
-#include <vector>
-#include <string>
 #include <set>
+#include <string>
+#include <vector>
 
 #include "components/esm/defs.hpp"
 
@@ -38,15 +38,15 @@ namespace ESM
 
         // FIXME: obsolete, used only for old saves
         std::map<std::string, SpellParams> mSpellParams;
-        std::map<std::string, std::vector<PermanentSpellEffectInfo> > mPermanentSpellEffects;
+        std::map<std::string, std::vector<PermanentSpellEffectInfo>> mPermanentSpellEffects;
         std::map<std::string, CorprusStats> mCorprusSpells;
 
         std::map<std::string, TimeStamp> mUsedPowers;
 
         std::string mSelectedSpell;
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm) const;
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 
 }
diff --git a/components/esm3/statstate.cpp b/components/esm3/statstate.cpp
index 4e37df7d79..b5ddc54985 100644
--- a/components/esm3/statstate.cpp
+++ b/components/esm3/statstate.cpp
@@ -5,11 +5,18 @@
 
 namespace ESM
 {
-    template<typename T>
-    StatState<T>::StatState() : mBase(0), mMod(0), mCurrent(0), mDamage(0), mProgress(0) {}
+    template <typename T>
+    StatState<T>::StatState()
+        : mBase(0)
+        , mMod(0)
+        , mCurrent(0)
+        , mDamage(0)
+        , mProgress(0)
+    {
+    }
 
-    template<typename T>
-    void StatState<T>::load(ESMReader &esm, bool intFallback)
+    template <typename T>
+    void StatState<T>::load(ESMReader& esm, bool intFallback)
     {
         // We changed stats values from integers to floats; ensure backwards compatibility
         if (intFallback)
@@ -53,8 +60,8 @@ namespace ESM
         esm.getHNOT(mProgress, "STPR");
     }
 
-    template<typename T>
-    void StatState<T>::save(ESMWriter &esm) const
+    template <typename T>
+    void StatState<T>::save(ESMWriter& esm) const
     {
         esm.writeHNT("STBA", mBase);
 
diff --git a/components/esm3/statstate.hpp b/components/esm3/statstate.hpp
index d81d24a61f..ae5dfd5a25 100644
--- a/components/esm3/statstate.hpp
+++ b/components/esm3/statstate.hpp
@@ -8,7 +8,7 @@ namespace ESM
 
     // format 0, saved games only
 
-    template<typename T>
+    template <typename T>
     struct StatState
     {
         T mBase;
@@ -20,8 +20,8 @@ namespace ESM
 
         StatState();
 
-        void load (ESMReader &esm, bool intFallback = false);
-        void save (ESMWriter &esm) const;
+        void load(ESMReader& esm, bool intFallback = false);
+        void save(ESMWriter& esm) const;
     };
 }
 
diff --git a/components/esm3/stolenitems.cpp b/components/esm3/stolenitems.cpp
index a43ae61a60..658902247c 100644
--- a/components/esm3/stolenitems.cpp
+++ b/components/esm3/stolenitems.cpp
@@ -6,7 +6,7 @@
 namespace ESM
 {
 
-    void StolenItems::write(ESMWriter &esm) const
+    void StolenItems::write(ESMWriter& esm) const
     {
         for (StolenItemsMap::const_iterator it = mStolenItems.begin(); it != mStolenItems.end(); ++it)
         {
@@ -23,7 +23,7 @@ namespace ESM
         }
     }
 
-    void StolenItems::load(ESMReader &esm)
+    void StolenItems::load(ESMReader& esm)
     {
         while (esm.isNextSub("NAME"))
         {
diff --git a/components/esm3/stolenitems.hpp b/components/esm3/stolenitems.hpp
index cd7fe5a6c8..94c4d9af85 100644
--- a/components/esm3/stolenitems.hpp
+++ b/components/esm3/stolenitems.hpp
@@ -12,7 +12,7 @@ namespace ESM
     // format 0, saved games only
     struct StolenItems
     {
-        typedef std::map<std::string, std::map<std::pair<std::string, bool>, int> > StolenItemsMap;
+        typedef std::map<std::string, std::map<std::pair<std::string, bool>, int>> StolenItemsMap;
         StolenItemsMap mStolenItems;
 
         void load(ESMReader& esm);
diff --git a/components/esm3/transport.cpp b/components/esm3/transport.cpp
index b79818a228..9270219fa5 100644
--- a/components/esm3/transport.cpp
+++ b/components/esm3/transport.cpp
@@ -8,7 +8,7 @@
 namespace ESM
 {
 
-    void Transport::add(ESMReader &esm)
+    void Transport::add(ESMReader& esm)
     {
         if (esm.retSubName().toInt() == fourCC("DODT"))
         {
@@ -26,7 +26,7 @@ namespace ESM
         }
     }
 
-    void Transport::save(ESMWriter &esm) const
+    void Transport::save(ESMWriter& esm) const
     {
         typedef std::vector<Dest>::const_iterator DestIter;
         for (DestIter it = mList.begin(); it != mList.end(); ++it)
diff --git a/components/esm3/transport.hpp b/components/esm3/transport.hpp
index f1e5f2103b..555504c994 100644
--- a/components/esm3/transport.hpp
+++ b/components/esm3/transport.hpp
@@ -18,17 +18,16 @@ namespace ESM
 
         struct Dest
         {
-            Position    mPos;
+            Position mPos;
             std::string mCellName;
         };
 
         std::vector<Dest> mList;
 
         /// Load one destination, assumes the subrecord name was already read
-        void add(ESMReader &esm);
-
-        void save(ESMWriter &esm) const;
+        void add(ESMReader& esm);
 
+        void save(ESMWriter& esm) const;
     };
 
 }
diff --git a/components/esm3/variant.cpp b/components/esm3/variant.cpp
index b7dc293f53..6850b41e56 100644
--- a/components/esm3/variant.cpp
+++ b/components/esm3/variant.cpp
@@ -10,268 +10,272 @@
 
 namespace ESM
 {
-namespace
-{
-    constexpr uint32_t STRV = fourCC("STRV");
-    constexpr uint32_t INTV = fourCC("INTV");
-    constexpr uint32_t FLTV = fourCC("FLTV");
-    constexpr uint32_t STTV = fourCC("STTV");
-
-    template <typename T, bool orDefault = false>
-    struct GetValue
+    namespace
     {
-        constexpr T operator()(int value) const { return static_cast<T>(value); }
-
-        constexpr T operator()(float value) const { return static_cast<T>(value); }
+        constexpr uint32_t STRV = fourCC("STRV");
+        constexpr uint32_t INTV = fourCC("INTV");
+        constexpr uint32_t FLTV = fourCC("FLTV");
+        constexpr uint32_t STTV = fourCC("STTV");
 
-        template <typename V>
-        constexpr T operator()(const V&) const
+        template <typename T, bool orDefault = false>
+        struct GetValue
         {
-            if constexpr (orDefault)
-                return T {};
-            else
-                throw std::runtime_error("cannot convert variant");
-        }
-    };
+            constexpr T operator()(int value) const { return static_cast<T>(value); }
 
-    template <typename T>
-    struct SetValue
-    {
-        T mValue;
+            constexpr T operator()(float value) const { return static_cast<T>(value); }
 
-        explicit SetValue(T value) : mValue(value) {}
+            template <typename V>
+            constexpr T operator()(const V&) const
+            {
+                if constexpr (orDefault)
+                    return T{};
+                else
+                    throw std::runtime_error("cannot convert variant");
+            }
+        };
 
-        void operator()(int& value) const { value = static_cast<int>(mValue); }
+        template <typename T>
+        struct SetValue
+        {
+            T mValue;
 
-        void operator()(float& value) const { value = static_cast<float>(mValue); }
+            explicit SetValue(T value)
+                : mValue(value)
+            {
+            }
 
-        template <typename V>
-        void operator()(V&) const { throw std::runtime_error("cannot convert variant"); }
-    };
-}
+            void operator()(int& value) const { value = static_cast<int>(mValue); }
 
-const std::string& Variant::getString() const
-{
-    return std::get<std::string>(mData);
-}
+            void operator()(float& value) const { value = static_cast<float>(mValue); }
 
-int Variant::getInteger() const
-{
-    return std::visit(GetValue<int>{}, mData);
-}
+            template <typename V>
+            void operator()(V&) const
+            {
+                throw std::runtime_error("cannot convert variant");
+            }
+        };
+    }
 
-float Variant::getFloat() const
-{
-    return std::visit(GetValue<float>{}, mData);
-}
+    const std::string& Variant::getString() const
+    {
+        return std::get<std::string>(mData);
+    }
 
-void Variant::read (ESMReader& esm, Format format)
-{
-    // type
-    VarType type = VT_Unknown;
+    int Variant::getInteger() const
+    {
+        return std::visit(GetValue<int>{}, mData);
+    }
 
-    if (format==Format_Global)
+    float Variant::getFloat() const
     {
-        std::string typeId = esm.getHNString ("FNAM");
-
-        if (typeId == "s")
-            type = VT_Short;
-        else if (typeId == "l")
-            type = VT_Long;
-        else if (typeId == "f")
-            type = VT_Float;
-        else
-            esm.fail ("illegal global variable type " + typeId);
+        return std::visit(GetValue<float>{}, mData);
     }
-    else if (format==Format_Gmst)
+
+    void Variant::read(ESMReader& esm, Format format)
     {
-        if (!esm.hasMoreSubs())
+        // type
+        VarType type = VT_Unknown;
+
+        if (format == Format_Global)
         {
-            type = VT_None;
+            std::string typeId = esm.getHNString("FNAM");
+
+            if (typeId == "s")
+                type = VT_Short;
+            else if (typeId == "l")
+                type = VT_Long;
+            else if (typeId == "f")
+                type = VT_Float;
+            else
+                esm.fail("illegal global variable type " + typeId);
         }
-        else
+        else if (format == Format_Gmst)
+        {
+            if (!esm.hasMoreSubs())
+            {
+                type = VT_None;
+            }
+            else
+            {
+                esm.getSubName();
+                NAME name = esm.retSubName();
+
+                if (name == STRV)
+                {
+                    type = VT_String;
+                }
+                else if (name == INTV)
+                {
+                    type = VT_Int;
+                }
+                else if (name == FLTV)
+                {
+                    type = VT_Float;
+                }
+                else
+                    esm.fail("invalid subrecord: " + name.toString());
+            }
+        }
+        else if (format == Format_Info)
         {
             esm.getSubName();
             NAME name = esm.retSubName();
 
-
-
-            if (name==STRV)
+            if (name == INTV)
             {
-                type = VT_String;
+                type = VT_Int;
+            }
+            else if (name == FLTV)
+            {
+                type = VT_Float;
             }
-            else if (name==INTV)
+            else
+                esm.fail("invalid subrecord: " + name.toString());
+        }
+        else if (format == Format_Local)
+        {
+            esm.getSubName();
+            NAME name = esm.retSubName();
+
+            if (name == INTV)
             {
                 type = VT_Int;
             }
-            else if (name==FLTV)
+            else if (name == FLTV)
             {
                 type = VT_Float;
             }
+            else if (name == STTV)
+            {
+                type = VT_Short;
+            }
             else
-                esm.fail ("invalid subrecord: " + name.toString());
+                esm.fail("invalid subrecord: " + name.toString());
         }
-    }
-    else if (format == Format_Info)
-    {
-        esm.getSubName();
-        NAME name = esm.retSubName();
 
-        if (name==INTV)
-        {
-            type = VT_Int;
-        }
-        else if (name==FLTV)
-        {
-            type = VT_Float;
-        }
-        else
-            esm.fail ("invalid subrecord: " + name.toString());
+        setType(type);
+
+        std::visit(ReadESMVariantValue{ esm, format, mType }, mData);
     }
-    else if (format == Format_Local)
-    {
-        esm.getSubName();
-        NAME name = esm.retSubName();
 
-        if (name==INTV)
-        {
-            type = VT_Int;
-        }
-        else if (name==FLTV)
+    void Variant::write(ESMWriter& esm, Format format) const
+    {
+        if (mType == VT_Unknown)
         {
-            type = VT_Float;
+            throw std::runtime_error("can not serialise variant of unknown type");
         }
-        else if (name==STTV)
+        else if (mType == VT_None)
         {
-            type = VT_Short;
-        }
-        else
-            esm.fail ("invalid subrecord: " + name.toString());
-    }
-
-    setType (type);
-
-    std::visit(ReadESMVariantValue {esm, format, mType}, mData);
-}
-
-void Variant::write (ESMWriter& esm, Format format) const
-{
-    if (mType==VT_Unknown)
-    {
-        throw std::runtime_error ("can not serialise variant of unknown type");
-    }
-    else if (mType==VT_None)
-    {
-        if (format==Format_Global)
-            throw std::runtime_error ("can not serialise variant of type none to global format");
+            if (format == Format_Global)
+                throw std::runtime_error("can not serialise variant of type none to global format");
 
-        if (format==Format_Info)
-            throw std::runtime_error ("can not serialise variant of type none to info format");
+            if (format == Format_Info)
+                throw std::runtime_error("can not serialise variant of type none to info format");
 
-        if (format==Format_Local)
-            throw std::runtime_error ("can not serialise variant of type none to local format");
+            if (format == Format_Local)
+                throw std::runtime_error("can not serialise variant of type none to local format");
 
-        // nothing to do here for GMST format
+            // nothing to do here for GMST format
+        }
+        else
+            std::visit(WriteESMVariantValue{ esm, format, mType }, mData);
     }
-    else
-        std::visit(WriteESMVariantValue {esm, format, mType}, mData);
-}
 
-void Variant::write (std::ostream& stream) const
-{
-    switch (mType)
+    void Variant::write(std::ostream& stream) const
     {
-        case VT_Unknown:
-
-            stream << "variant unknown";
-            break;
-
-        case VT_None:
-
-            stream << "variant none";
-            break;
-
-        case VT_Short:
-
-            stream << "variant short: " << std::get<int>(mData);
-            break;
-
-        case VT_Int:
-
-            stream << "variant int: " << std::get<int>(mData);
-            break;
+        switch (mType)
+        {
+            case VT_Unknown:
 
-        case VT_Long:
+                stream << "variant unknown";
+                break;
 
-            stream << "variant long: " << std::get<int>(mData);
-            break;
+            case VT_None:
 
-        case VT_Float:
+                stream << "variant none";
+                break;
 
-            stream << "variant float: " << std::get<float>(mData);
-            break;
+            case VT_Short:
 
-        case VT_String:
+                stream << "variant short: " << std::get<int>(mData);
+                break;
 
-            stream << "variant string: \"" << std::get<std::string>(mData) << "\"";
-            break;
-    }
-}
+            case VT_Int:
 
-void Variant::setType (VarType type)
-{
-    if (type!=mType)
-    {
-        switch (type)
-        {
-            case VT_Unknown:
-            case VT_None:
-                mData = std::monostate {};
+                stream << "variant int: " << std::get<int>(mData);
                 break;
 
-            case VT_Short:
-            case VT_Int:
             case VT_Long:
-                mData = std::visit(GetValue<int, true>{}, mData);
+
+                stream << "variant long: " << std::get<int>(mData);
                 break;
 
             case VT_Float:
-                mData = std::visit(GetValue<float, true>{}, mData);
+
+                stream << "variant float: " << std::get<float>(mData);
                 break;
 
             case VT_String:
-                mData = std::string {};
+
+                stream << "variant string: \"" << std::get<std::string>(mData) << "\"";
                 break;
         }
+    }
 
-        mType = type;
+    void Variant::setType(VarType type)
+    {
+        if (type != mType)
+        {
+            switch (type)
+            {
+                case VT_Unknown:
+                case VT_None:
+                    mData = std::monostate{};
+                    break;
+
+                case VT_Short:
+                case VT_Int:
+                case VT_Long:
+                    mData = std::visit(GetValue<int, true>{}, mData);
+                    break;
+
+                case VT_Float:
+                    mData = std::visit(GetValue<float, true>{}, mData);
+                    break;
+
+                case VT_String:
+                    mData = std::string{};
+                    break;
+            }
+
+            mType = type;
+        }
     }
-}
 
-void Variant::setString (const std::string& value)
-{
-    std::get<std::string>(mData) = value;
-}
+    void Variant::setString(const std::string& value)
+    {
+        std::get<std::string>(mData) = value;
+    }
 
-void Variant::setString (std::string&& value)
-{
-    std::get<std::string>(mData) = std::move(value);
-}
+    void Variant::setString(std::string&& value)
+    {
+        std::get<std::string>(mData) = std::move(value);
+    }
 
-void Variant::setInteger (int value)
-{
-    std::visit(SetValue(value), mData);
-}
+    void Variant::setInteger(int value)
+    {
+        std::visit(SetValue(value), mData);
+    }
 
-void Variant::setFloat (float value)
-{
-    std::visit(SetValue(value), mData);
-}
+    void Variant::setFloat(float value)
+    {
+        std::visit(SetValue(value), mData);
+    }
 
-std::ostream& operator<< (std::ostream& stream, const Variant& value)
-{
-    value.write (stream);
-    return stream;
-}
+    std::ostream& operator<<(std::ostream& stream, const Variant& value)
+    {
+        value.write(stream);
+        return stream;
+    }
 
 }
diff --git a/components/esm3/variant.hpp b/components/esm3/variant.hpp
index 3d706c163f..d00ccb2746 100644
--- a/components/esm3/variant.hpp
+++ b/components/esm3/variant.hpp
@@ -1,10 +1,10 @@
 #ifndef OPENMW_ESM_VARIANT_H
 #define OPENMW_ESM_VARIANT_H
 
-#include <string>
 #include <iosfwd>
-#include <variant>
+#include <string>
 #include <tuple>
+#include <variant>
 
 namespace ESM
 {
@@ -24,71 +24,87 @@ namespace ESM
 
     class Variant
     {
-            VarType mType;
-            std::variant<std::monostate, int, float, std::string> mData;
-
-        public:
+        VarType mType;
+        std::variant<std::monostate, int, float, std::string> mData;
 
-            enum Format
-            {
-                Format_Global,
-                Format_Gmst,
-                Format_Info,
-                Format_Local // local script variables in save game files
-            };
+    public:
+        enum Format
+        {
+            Format_Global,
+            Format_Gmst,
+            Format_Info,
+            Format_Local // local script variables in save game files
+        };
 
-            Variant() : mType (VT_None), mData (std::monostate{}) {}
+        Variant()
+            : mType(VT_None)
+            , mData(std::monostate{})
+        {
+        }
 
-            explicit Variant(const std::string& value) : mType(VT_String), mData(value) {}
+        explicit Variant(const std::string& value)
+            : mType(VT_String)
+            , mData(value)
+        {
+        }
 
-            explicit Variant(std::string&& value) : mType(VT_String), mData(std::move(value)) {}
+        explicit Variant(std::string&& value)
+            : mType(VT_String)
+            , mData(std::move(value))
+        {
+        }
 
-            explicit Variant(int value) : mType(VT_Long), mData(value) {}
+        explicit Variant(int value)
+            : mType(VT_Long)
+            , mData(value)
+        {
+        }
 
-            explicit Variant(float value) : mType(VT_Float), mData(value) {}
+        explicit Variant(float value)
+            : mType(VT_Float)
+            , mData(value)
+        {
+        }
 
-            VarType getType() const { return mType; }
+        VarType getType() const { return mType; }
 
-            const std::string& getString() const;
-            ///< Will throw an exception, if value can not be represented as a string.
+        const std::string& getString() const;
+        ///< Will throw an exception, if value can not be represented as a string.
 
-            int getInteger() const;
-            ///< Will throw an exception, if value can not be represented as an integer (implicit
-            /// casting of float values is permitted).
+        int getInteger() const;
+        ///< Will throw an exception, if value can not be represented as an integer (implicit
+        /// casting of float values is permitted).
 
-            float getFloat() const;
-            ///< Will throw an exception, if value can not be represented as a float value.
+        float getFloat() const;
+        ///< Will throw an exception, if value can not be represented as a float value.
 
-            void read (ESMReader& esm, Format format);
+        void read(ESMReader& esm, Format format);
 
-            void write (ESMWriter& esm, Format format) const;
+        void write(ESMWriter& esm, Format format) const;
 
-            void write (std::ostream& stream) const;
-            ///< Write in text format.
+        void write(std::ostream& stream) const;
+        ///< Write in text format.
 
-            void setType (VarType type);
+        void setType(VarType type);
 
-            void setString (const std::string& value);
-            ///< Will throw an exception, if type is not compatible with string.
+        void setString(const std::string& value);
+        ///< Will throw an exception, if type is not compatible with string.
 
-            void setString (std::string&& value);
-            ///< Will throw an exception, if type is not compatible with string.
+        void setString(std::string&& value);
+        ///< Will throw an exception, if type is not compatible with string.
 
-            void setInteger (int value);
-            ///< Will throw an exception, if type is not compatible with integer.
+        void setInteger(int value);
+        ///< Will throw an exception, if type is not compatible with integer.
 
-            void setFloat (float value);
-            ///< Will throw an exception, if type is not compatible with float.
+        void setFloat(float value);
+        ///< Will throw an exception, if type is not compatible with float.
 
-            friend bool operator==(const Variant& left, const Variant& right)
-            {
-                return std::tie(left.mType, left.mData) == std::tie(right.mType, right.mData);
-            }
+        friend bool operator==(const Variant& left, const Variant& right)
+        {
+            return std::tie(left.mType, left.mData) == std::tie(right.mType, right.mData);
+        }
 
-            friend bool operator!=(const Variant& left, const Variant& right)
-            {
-                return !(left == right);
-            }
+        friend bool operator!=(const Variant& left, const Variant& right) { return !(left == right); }
     };
 
     std::ostream& operator<<(std::ostream& stream, const Variant& value);
diff --git a/components/esm3/variantimp.cpp b/components/esm3/variantimp.cpp
index 7116ce7a74..410f4ade8d 100644
--- a/components/esm3/variantimp.cpp
+++ b/components/esm3/variantimp.cpp
@@ -1,8 +1,8 @@
 #include "variantimp.hpp"
 
-#include <stdexcept>
 #include <cmath>
 #include <sstream>
+#include <stdexcept>
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
@@ -10,161 +10,159 @@
 namespace ESM
 {
 
-void readESMVariantValue(ESMReader& esm, Variant::Format format, VarType type, std::string& out)
-{
-    if (type!=VT_String)
-        throw std::logic_error ("not a string type");
-
-    if (format==Variant::Format_Global)
-        esm.fail ("global variables of type string not supported");
+    void readESMVariantValue(ESMReader& esm, Variant::Format format, VarType type, std::string& out)
+    {
+        if (type != VT_String)
+            throw std::logic_error("not a string type");
 
-    if (format==Variant::Format_Info)
-        esm.fail ("info variables of type string not supported");
+        if (format == Variant::Format_Global)
+            esm.fail("global variables of type string not supported");
 
-    if (format==Variant::Format_Local)
-        esm.fail ("local variables of type string not supported");
+        if (format == Variant::Format_Info)
+            esm.fail("info variables of type string not supported");
 
-    // GMST
-    out = esm.getHString();
-}
+        if (format == Variant::Format_Local)
+            esm.fail("local variables of type string not supported");
 
-void writeESMVariantValue(ESMWriter& esm, Variant::Format format, VarType type, const std::string& in)
-{
-    if (type!=VT_String)
-        throw std::logic_error ("not a string type");
+        // GMST
+        out = esm.getHString();
+    }
 
-    if (format==Variant::Format_Global)
-        throw std::runtime_error ("global variables of type string not supported");
+    void writeESMVariantValue(ESMWriter& esm, Variant::Format format, VarType type, const std::string& in)
+    {
+        if (type != VT_String)
+            throw std::logic_error("not a string type");
 
-    if (format==Variant::Format_Info)
-        throw std::runtime_error ("info variables of type string not supported");
+        if (format == Variant::Format_Global)
+            throw std::runtime_error("global variables of type string not supported");
 
-    if (format==Variant::Format_Local)
-        throw std::runtime_error ("local variables of type string not supported");
+        if (format == Variant::Format_Info)
+            throw std::runtime_error("info variables of type string not supported");
 
-    // GMST
-    esm.writeHNString("STRV", in);
-}
+        if (format == Variant::Format_Local)
+            throw std::runtime_error("local variables of type string not supported");
 
-void readESMVariantValue(ESMReader& esm, Variant::Format format, VarType type, int& out)
-{
-    if (type!=VT_Short && type!=VT_Long && type!=VT_Int)
-        throw std::logic_error ("not an integer type");
+        // GMST
+        esm.writeHNString("STRV", in);
+    }
 
-    if (format==Variant::Format_Global)
+    void readESMVariantValue(ESMReader& esm, Variant::Format format, VarType type, int& out)
     {
-        float value;
-        esm.getHNT (value, "FLTV");
+        if (type != VT_Short && type != VT_Long && type != VT_Int)
+            throw std::logic_error("not an integer type");
 
-        if (type==VT_Short)
-            if (std::isnan(value))
-                out = 0;
-            else
-                out = static_cast<short> (value);
-        else if (type==VT_Long)
-            out = static_cast<int> (value);
-        else
-            esm.fail ("unsupported global variable integer type");
-    }
-    else if (format==Variant::Format_Gmst || format==Variant::Format_Info)
-    {
-        if (type!=VT_Int)
+        if (format == Variant::Format_Global)
         {
-            std::ostringstream stream;
-            stream
-                << "unsupported " <<(format==Variant::Format_Gmst ? "gmst" : "info")
-                << " variable integer type";
-            esm.fail (stream.str());
+            float value;
+            esm.getHNT(value, "FLTV");
+
+            if (type == VT_Short)
+                if (std::isnan(value))
+                    out = 0;
+                else
+                    out = static_cast<short>(value);
+            else if (type == VT_Long)
+                out = static_cast<int>(value);
+            else
+                esm.fail("unsupported global variable integer type");
         }
-
-        esm.getHT(out);
-    }
-    else if (format==Variant::Format_Local)
-    {
-        if (type==VT_Short)
+        else if (format == Variant::Format_Gmst || format == Variant::Format_Info)
         {
-            short value;
-            esm.getHT(value);
-            out = value;
+            if (type != VT_Int)
+            {
+                std::ostringstream stream;
+                stream << "unsupported " << (format == Variant::Format_Gmst ? "gmst" : "info")
+                       << " variable integer type";
+                esm.fail(stream.str());
+            }
+
+            esm.getHT(out);
         }
-        else if (type==VT_Int)
+        else if (format == Variant::Format_Local)
         {
-            esm.getHT(out);
+            if (type == VT_Short)
+            {
+                short value;
+                esm.getHT(value);
+                out = value;
+            }
+            else if (type == VT_Int)
+            {
+                esm.getHT(out);
+            }
+            else
+                esm.fail("unsupported local variable integer type");
         }
-        else
-            esm.fail("unsupported local variable integer type");
     }
-}
-
-void writeESMVariantValue(ESMWriter& esm, Variant::Format format, VarType type, int in)
-{
-    if (type!=VT_Short && type!=VT_Long && type!=VT_Int)
-        throw std::logic_error ("not an integer type");
 
-    if (format==Variant::Format_Global)
+    void writeESMVariantValue(ESMWriter& esm, Variant::Format format, VarType type, int in)
     {
-        if (type==VT_Short || type==VT_Long)
+        if (type != VT_Short && type != VT_Long && type != VT_Int)
+            throw std::logic_error("not an integer type");
+
+        if (format == Variant::Format_Global)
         {
-            float value = static_cast<float>(in);
-            esm.writeHNString ("FNAM", type==VT_Short ? "s" : "l");
-            esm.writeHNT ("FLTV", value);
+            if (type == VT_Short || type == VT_Long)
+            {
+                float value = static_cast<float>(in);
+                esm.writeHNString("FNAM", type == VT_Short ? "s" : "l");
+                esm.writeHNT("FLTV", value);
+            }
+            else
+                throw std::runtime_error("unsupported global variable integer type");
         }
-        else
-            throw std::runtime_error ("unsupported global variable integer type");
-    }
-    else if (format==Variant::Format_Gmst || format==Variant::Format_Info)
-    {
-        if (type!=VT_Int)
+        else if (format == Variant::Format_Gmst || format == Variant::Format_Info)
         {
-            std::ostringstream stream;
-            stream
-                << "unsupported " <<(format==Variant::Format_Gmst ? "gmst" : "info")
-                << " variable integer type";
-            throw std::runtime_error (stream.str());
-        }
+            if (type != VT_Int)
+            {
+                std::ostringstream stream;
+                stream << "unsupported " << (format == Variant::Format_Gmst ? "gmst" : "info")
+                       << " variable integer type";
+                throw std::runtime_error(stream.str());
+            }
 
-        esm.writeHNT("INTV", in);
-    }
-    else if (format==Variant::Format_Local)
-    {
-        if (type==VT_Short)
-            esm.writeHNT("STTV", static_cast<short>(in));
-        else if (type == VT_Int)
             esm.writeHNT("INTV", in);
-        else
-            throw std::runtime_error("unsupported local variable integer type");
+        }
+        else if (format == Variant::Format_Local)
+        {
+            if (type == VT_Short)
+                esm.writeHNT("STTV", static_cast<short>(in));
+            else if (type == VT_Int)
+                esm.writeHNT("INTV", in);
+            else
+                throw std::runtime_error("unsupported local variable integer type");
+        }
     }
-}
 
-void readESMVariantValue(ESMReader& esm, Variant::Format format, VarType type, float& out)
-{
-    if (type!=VT_Float)
-        throw std::logic_error ("not a float type");
-
-    if (format==Variant::Format_Global)
-    {
-        esm.getHNT(out, "FLTV");
-    }
-    else if (format==Variant::Format_Gmst || format==Variant::Format_Info || format==Variant::Format_Local)
+    void readESMVariantValue(ESMReader& esm, Variant::Format format, VarType type, float& out)
     {
-        esm.getHT(out);
-    }
-}
+        if (type != VT_Float)
+            throw std::logic_error("not a float type");
 
-void writeESMVariantValue(ESMWriter& esm, Variant::Format format, VarType type, float in)
-{
-    if (type!=VT_Float)
-        throw std::logic_error ("not a float type");
-
-    if (format==Variant::Format_Global)
-    {
-        esm.writeHNString ("FNAM", "f");
-        esm.writeHNT("FLTV", in);
+        if (format == Variant::Format_Global)
+        {
+            esm.getHNT(out, "FLTV");
+        }
+        else if (format == Variant::Format_Gmst || format == Variant::Format_Info || format == Variant::Format_Local)
+        {
+            esm.getHT(out);
+        }
     }
-    else if (format==Variant::Format_Gmst || format==Variant::Format_Info || format==Variant::Format_Local)
+
+    void writeESMVariantValue(ESMWriter& esm, Variant::Format format, VarType type, float in)
     {
-        esm.writeHNT("FLTV", in);
+        if (type != VT_Float)
+            throw std::logic_error("not a float type");
+
+        if (format == Variant::Format_Global)
+        {
+            esm.writeHNString("FNAM", "f");
+            esm.writeHNT("FLTV", in);
+        }
+        else if (format == Variant::Format_Gmst || format == Variant::Format_Info || format == Variant::Format_Local)
+        {
+            esm.writeHNT("FLTV", in);
+        }
     }
-}
 
 }
diff --git a/components/esm3/variantimp.hpp b/components/esm3/variantimp.hpp
index 9458728115..90f45a420f 100644
--- a/components/esm3/variantimp.hpp
+++ b/components/esm3/variantimp.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_ESM_VARIANTIMP_H
 #define OPENMW_ESM_VARIANTIMP_H
 
-#include <string>
 #include <functional>
+#include <string>
 
 #include "variant.hpp"
 
@@ -27,7 +27,11 @@ namespace ESM
         VarType mType;
 
         ReadESMVariantValue(ESMReader& reader, Variant::Format format, VarType type)
-            : mReader(reader), mFormat(format), mType(type) {}
+            : mReader(reader)
+            , mFormat(format)
+            , mType(type)
+        {
+        }
 
         void operator()(std::monostate) const {}
 
@@ -45,7 +49,11 @@ namespace ESM
         VarType mType;
 
         WriteESMVariantValue(ESMWriter& writer, Variant::Format format, VarType type)
-            : mWriter(writer), mFormat(format), mType(type) {}
+            : mWriter(writer)
+            , mFormat(format)
+            , mType(type)
+        {
+        }
 
         void operator()(std::monostate) const {}
 
diff --git a/components/esm3/weatherstate.cpp b/components/esm3/weatherstate.cpp
index b148bc8045..390259161b 100644
--- a/components/esm3/weatherstate.cpp
+++ b/components/esm3/weatherstate.cpp
@@ -5,20 +5,20 @@
 
 namespace ESM
 {
-namespace
-{
-    constexpr NAME currentRegionRecord     = "CREG";
-    constexpr NAME timePassedRecord        = "TMPS";
-    constexpr NAME fastForwardRecord       = "FAST";
-    constexpr NAME weatherUpdateTimeRecord = "WUPD";
-    constexpr NAME transitionFactorRecord  = "TRFC";
-    constexpr NAME currentWeatherRecord    = "CWTH";
-    constexpr NAME nextWeatherRecord       = "NWTH";
-    constexpr NAME queuedWeatherRecord     = "QWTH";
-    constexpr NAME regionNameRecord        = "RGNN";
-    constexpr NAME regionWeatherRecord     = "RGNW";
-    constexpr NAME regionChanceRecord      = "RGNC";
-}
+    namespace
+    {
+        constexpr NAME currentRegionRecord = "CREG";
+        constexpr NAME timePassedRecord = "TMPS";
+        constexpr NAME fastForwardRecord = "FAST";
+        constexpr NAME weatherUpdateTimeRecord = "WUPD";
+        constexpr NAME transitionFactorRecord = "TRFC";
+        constexpr NAME currentWeatherRecord = "CWTH";
+        constexpr NAME nextWeatherRecord = "NWTH";
+        constexpr NAME queuedWeatherRecord = "QWTH";
+        constexpr NAME regionNameRecord = "RGNN";
+        constexpr NAME regionWeatherRecord = "RGNW";
+        constexpr NAME regionChanceRecord = "RGNC";
+    }
 }
 
 namespace ESM
@@ -62,11 +62,11 @@ namespace ESM
         esm.writeHNT(queuedWeatherRecord, mQueuedWeather);
 
         std::map<std::string, RegionWeatherState>::const_iterator it = mRegions.begin();
-        for(; it != mRegions.end(); ++it)
+        for (; it != mRegions.end(); ++it)
         {
             esm.writeHNCString(regionNameRecord, it->first.c_str());
             esm.writeHNT(regionWeatherRecord, it->second.mWeather);
-            for(size_t i = 0; i < it->second.mChances.size(); ++i)
+            for (size_t i = 0; i < it->second.mChances.size(); ++i)
             {
                 esm.writeHNT(regionChanceRecord, it->second.mChances[i]);
             }
diff --git a/components/esm3terrain/storage.cpp b/components/esm3terrain/storage.cpp
index f9aab5367e..a189640bc8 100644
--- a/components/esm3terrain/storage.cpp
+++ b/components/esm3terrain/storage.cpp
@@ -16,7 +16,7 @@ namespace ESMTerrain
     class LandCache
     {
     public:
-        typedef std::map<std::pair<int, int>, osg::ref_ptr<const LandObject> > Map;
+        typedef std::map<std::pair<int, int>, osg::ref_ptr<const LandObject>> Map;
         Map mMap;
     };
 
@@ -26,26 +26,26 @@ namespace ESMTerrain
     {
     }
 
-    LandObject::LandObject(const ESM::Land *land, int loadFlags)
+    LandObject::LandObject(const ESM::Land* land, int loadFlags)
         : mLand(land)
         , mLoadFlags(loadFlags)
     {
         mLand->loadData(mLoadFlags, &mData);
     }
 
-    LandObject::LandObject(const LandObject &copy, const osg::CopyOp &copyop)
+    LandObject::LandObject(const LandObject& copy, const osg::CopyOp& copyop)
         : mLand(nullptr)
         , mLoadFlags(0)
     {
     }
 
-    LandObject::~LandObject()
-    {
-    }
+    LandObject::~LandObject() {}
 
     const float defaultHeight = ESM::Land::DEFAULT_HEIGHT;
 
-    Storage::Storage(const VFS::Manager *vfs, const std::string& normalMapPattern, const std::string& normalHeightMapPattern, bool autoUseNormalMaps, const std::string& specularMapPattern, bool autoUseSpecularMaps)
+    Storage::Storage(const VFS::Manager* vfs, const std::string& normalMapPattern,
+        const std::string& normalHeightMapPattern, bool autoUseNormalMaps, const std::string& specularMapPattern,
+        bool autoUseSpecularMaps)
         : mVFS(vfs)
         , mNormalMapPattern(normalMapPattern)
         , mNormalHeightMapPattern(normalHeightMapPattern)
@@ -55,11 +55,11 @@ namespace ESMTerrain
     {
     }
 
-    bool Storage::getMinMaxHeights(float size, const osg::Vec2f &center, float &min, float &max)
+    bool Storage::getMinMaxHeights(float size, const osg::Vec2f& center, float& min, float& max)
     {
-        assert (size <= 1 && "Storage::getMinMaxHeights, chunk size should be <= 1 cell");
+        assert(size <= 1 && "Storage::getMinMaxHeights, chunk size should be <= 1 cell");
 
-        osg::Vec2f origin = center - osg::Vec2f(size/2.f, size/2.f);
+        osg::Vec2f origin = center - osg::Vec2f(size / 2.f, size / 2.f);
 
         int cellX = static_cast<int>(std::floor(origin.x()));
         int cellY = static_cast<int>(std::floor(origin.y()));
@@ -67,20 +67,20 @@ namespace ESMTerrain
         int startRow = (origin.x() - cellX) * ESM::Land::LAND_SIZE;
         int startColumn = (origin.y() - cellY) * ESM::Land::LAND_SIZE;
 
-        int endRow = startRow + size * (ESM::Land::LAND_SIZE-1) + 1;
-        int endColumn = startColumn + size * (ESM::Land::LAND_SIZE-1) + 1;
+        int endRow = startRow + size * (ESM::Land::LAND_SIZE - 1) + 1;
+        int endColumn = startColumn + size * (ESM::Land::LAND_SIZE - 1) + 1;
 
-        osg::ref_ptr<const LandObject> land = getLand (cellX, cellY);
+        osg::ref_ptr<const LandObject> land = getLand(cellX, cellY);
         const ESM::Land::LandData* data = land ? land->getData(ESM::Land::DATA_VHGT) : nullptr;
         if (data)
         {
             min = std::numeric_limits<float>::max();
             max = -std::numeric_limits<float>::max();
-            for (int row=startRow; row<endRow; ++row)
+            for (int row = startRow; row < endRow; ++row)
             {
-                for (int col=startColumn; col<endColumn; ++col)
+                for (int col = startColumn; col < endColumn; ++col)
                 {
-                    float h = data->mHeights[col*ESM::Land::LAND_SIZE+row];
+                    float h = data->mHeights[col * ESM::Land::LAND_SIZE + row];
                     if (h > max)
                         max = h;
                     if (h < min)
@@ -95,61 +95,61 @@ namespace ESMTerrain
         return false;
     }
 
-    void Storage::fixNormal (osg::Vec3f& normal, int cellX, int cellY, int col, int row, LandCache& cache)
+    void Storage::fixNormal(osg::Vec3f& normal, int cellX, int cellY, int col, int row, LandCache& cache)
     {
-        while (col >= ESM::Land::LAND_SIZE-1)
+        while (col >= ESM::Land::LAND_SIZE - 1)
         {
             ++cellY;
-            col -= ESM::Land::LAND_SIZE-1;
+            col -= ESM::Land::LAND_SIZE - 1;
         }
-        while (row >= ESM::Land::LAND_SIZE-1)
+        while (row >= ESM::Land::LAND_SIZE - 1)
         {
             ++cellX;
-            row -= ESM::Land::LAND_SIZE-1;
+            row -= ESM::Land::LAND_SIZE - 1;
         }
         while (col < 0)
         {
             --cellY;
-            col += ESM::Land::LAND_SIZE-1;
+            col += ESM::Land::LAND_SIZE - 1;
         }
         while (row < 0)
         {
             --cellX;
-            row += ESM::Land::LAND_SIZE-1;
+            row += ESM::Land::LAND_SIZE - 1;
         }
 
         const LandObject* land = getLand(cellX, cellY, cache);
         const ESM::Land::LandData* data = land ? land->getData(ESM::Land::DATA_VNML) : nullptr;
         if (data)
         {
-            normal.x() = data->mNormals[col*ESM::Land::LAND_SIZE*3+row*3];
-            normal.y() = data->mNormals[col*ESM::Land::LAND_SIZE*3+row*3+1];
-            normal.z() = data->mNormals[col*ESM::Land::LAND_SIZE*3+row*3+2];
+            normal.x() = data->mNormals[col * ESM::Land::LAND_SIZE * 3 + row * 3];
+            normal.y() = data->mNormals[col * ESM::Land::LAND_SIZE * 3 + row * 3 + 1];
+            normal.z() = data->mNormals[col * ESM::Land::LAND_SIZE * 3 + row * 3 + 2];
             normal.normalize();
         }
         else
-            normal = osg::Vec3f(0,0,1);
+            normal = osg::Vec3f(0, 0, 1);
     }
 
-    void Storage::averageNormal(osg::Vec3f &normal, int cellX, int cellY, int col, int row, LandCache& cache)
+    void Storage::averageNormal(osg::Vec3f& normal, int cellX, int cellY, int col, int row, LandCache& cache)
     {
-        osg::Vec3f n1,n2,n3,n4;
-        fixNormal(n1, cellX, cellY, col+1, row, cache);
-        fixNormal(n2, cellX, cellY, col-1, row, cache);
-        fixNormal(n3, cellX, cellY, col, row+1, cache);
-        fixNormal(n4, cellX, cellY, col, row-1, cache);
-        normal = (n1+n2+n3+n4);
+        osg::Vec3f n1, n2, n3, n4;
+        fixNormal(n1, cellX, cellY, col + 1, row, cache);
+        fixNormal(n2, cellX, cellY, col - 1, row, cache);
+        fixNormal(n3, cellX, cellY, col, row + 1, cache);
+        fixNormal(n4, cellX, cellY, col, row - 1, cache);
+        normal = (n1 + n2 + n3 + n4);
         normal.normalize();
     }
 
-    void Storage::fixColour (osg::Vec4ub& color, int cellX, int cellY, int col, int row, LandCache& cache)
+    void Storage::fixColour(osg::Vec4ub& color, int cellX, int cellY, int col, int row, LandCache& cache)
     {
-        if (col == ESM::Land::LAND_SIZE-1)
+        if (col == ESM::Land::LAND_SIZE - 1)
         {
             ++cellY;
             col = 0;
         }
-        if (row == ESM::Land::LAND_SIZE-1)
+        if (row == ESM::Land::LAND_SIZE - 1)
         {
             ++cellX;
             row = 0;
@@ -159,9 +159,9 @@ namespace ESMTerrain
         const ESM::Land::LandData* data = land ? land->getData(ESM::Land::DATA_VCLR) : nullptr;
         if (data)
         {
-            color.r() = data->mColours[col*ESM::Land::LAND_SIZE*3+row*3];
-            color.g() = data->mColours[col*ESM::Land::LAND_SIZE*3+row*3+1];
-            color.b() = data->mColours[col*ESM::Land::LAND_SIZE*3+row*3+2];
+            color.r() = data->mColours[col * ESM::Land::LAND_SIZE * 3 + row * 3];
+            color.g() = data->mColours[col * ESM::Land::LAND_SIZE * 3 + row * 3 + 1];
+            color.b() = data->mColours[col * ESM::Land::LAND_SIZE * 3 + row * 3 + 2];
         }
         else
         {
@@ -171,24 +171,23 @@ namespace ESMTerrain
         }
     }
 
-    void Storage::fillVertexBuffers (int lodLevel, float size, const osg::Vec2f& center,
-                                            osg::ref_ptr<osg::Vec3Array> positions,
-                                            osg::ref_ptr<osg::Vec3Array> normals,
-                                            osg::ref_ptr<osg::Vec4ubArray> colours)
+    void Storage::fillVertexBuffers(int lodLevel, float size, const osg::Vec2f& center,
+        osg::ref_ptr<osg::Vec3Array> positions, osg::ref_ptr<osg::Vec3Array> normals,
+        osg::ref_ptr<osg::Vec4ubArray> colours)
     {
         // LOD level n means every 2^n-th vertex is kept
         size_t increment = static_cast<size_t>(1) << lodLevel;
 
-        osg::Vec2f origin = center - osg::Vec2f(size/2.f, size/2.f);
+        osg::Vec2f origin = center - osg::Vec2f(size / 2.f, size / 2.f);
 
         int startCellX = static_cast<int>(std::floor(origin.x()));
         int startCellY = static_cast<int>(std::floor(origin.y()));
 
-        size_t numVerts = static_cast<size_t>(size*(ESM::Land::LAND_SIZE - 1) / increment + 1);
+        size_t numVerts = static_cast<size_t>(size * (ESM::Land::LAND_SIZE - 1) / increment + 1);
 
-        positions->resize(numVerts*numVerts);
-        normals->resize(numVerts*numVerts);
-        colours->resize(numVerts*numVerts);
+        positions->resize(numVerts * numVerts);
+        normals->resize(numVerts * numVerts);
+        colours->resize(numVerts * numVerts);
 
         osg::Vec3f normal;
         osg::Vec4ub color;
@@ -207,9 +206,9 @@ namespace ESMTerrain
             for (int cellX = startCellX; cellX < startCellX + std::ceil(size); ++cellX)
             {
                 const LandObject* land = getLand(cellX, cellY, cache);
-                const ESM::Land::LandData *heightData = nullptr;
-                const ESM::Land::LandData *normalData = nullptr;
-                const ESM::Land::LandData *colourData = nullptr;
+                const ESM::Land::LandData* heightData = nullptr;
+                const ESM::Land::LandData* normalData = nullptr;
+                const ESM::Land::LandData* colourData = nullptr;
                 if (land)
                 {
                     heightData = land->getData(ESM::Land::DATA_VHGT);
@@ -230,59 +229,61 @@ namespace ESMTerrain
                 // Only relevant for chunks smaller than (contained in) one cell
                 rowStart += (origin.x() - startCellX) * ESM::Land::LAND_SIZE;
                 colStart += (origin.y() - startCellY) * ESM::Land::LAND_SIZE;
-                int rowEnd = std::min(static_cast<int>(rowStart + std::min(1.f, size) * (ESM::Land::LAND_SIZE-1) + 1), static_cast<int>(ESM::Land::LAND_SIZE));
-                int colEnd = std::min(static_cast<int>(colStart + std::min(1.f, size) * (ESM::Land::LAND_SIZE-1) + 1), static_cast<int>(ESM::Land::LAND_SIZE));
+                int rowEnd = std::min(static_cast<int>(rowStart + std::min(1.f, size) * (ESM::Land::LAND_SIZE - 1) + 1),
+                    static_cast<int>(ESM::Land::LAND_SIZE));
+                int colEnd = std::min(static_cast<int>(colStart + std::min(1.f, size) * (ESM::Land::LAND_SIZE - 1) + 1),
+                    static_cast<int>(ESM::Land::LAND_SIZE));
 
                 vertY = vertY_;
-                for (int col=colStart; col<colEnd; col += increment)
+                for (int col = colStart; col < colEnd; col += increment)
                 {
                     vertX = vertX_;
-                    for (int row=rowStart; row<rowEnd; row += increment)
+                    for (int row = rowStart; row < rowEnd; row += increment)
                     {
-                        int srcArrayIndex = col*ESM::Land::LAND_SIZE*3+row*3;
+                        int srcArrayIndex = col * ESM::Land::LAND_SIZE * 3 + row * 3;
 
                         assert(row >= 0 && row < ESM::Land::LAND_SIZE);
                         assert(col >= 0 && col < ESM::Land::LAND_SIZE);
 
-                        assert (vertX < numVerts);
-                        assert (vertY < numVerts);
+                        assert(vertX < numVerts);
+                        assert(vertY < numVerts);
 
                         float height = defaultHeight;
                         if (heightData)
-                            height = heightData->mHeights[col*ESM::Land::LAND_SIZE + row];
+                            height = heightData->mHeights[col * ESM::Land::LAND_SIZE + row];
                         if (alteration)
                             height += getAlteredHeight(col, row);
-                        (*positions)[static_cast<unsigned int>(vertX*numVerts + vertY)]
+                        (*positions)[static_cast<unsigned int>(vertX * numVerts + vertY)]
                             = osg::Vec3f((vertX / float(numVerts - 1) - 0.5f) * size * Constants::CellSizeInUnits,
-                                         (vertY / float(numVerts - 1) - 0.5f) * size * Constants::CellSizeInUnits,
-                                         height);
+                                (vertY / float(numVerts - 1) - 0.5f) * size * Constants::CellSizeInUnits, height);
 
                         if (normalData)
                         {
-                            for (int i=0; i<3; ++i)
-                                normal[i] = normalData->mNormals[srcArrayIndex+i];
+                            for (int i = 0; i < 3; ++i)
+                                normal[i] = normalData->mNormals[srcArrayIndex + i];
 
                             normal.normalize();
                         }
                         else
-                            normal = osg::Vec3f(0,0,1);
+                            normal = osg::Vec3f(0, 0, 1);
 
                         // Normals apparently don't connect seamlessly between cells
-                        if (col == ESM::Land::LAND_SIZE-1 || row == ESM::Land::LAND_SIZE-1)
+                        if (col == ESM::Land::LAND_SIZE - 1 || row == ESM::Land::LAND_SIZE - 1)
                             fixNormal(normal, cellX, cellY, col, row, cache);
 
                         // some corner normals appear to be complete garbage (z < 0)
-                        if ((row == 0 || row == ESM::Land::LAND_SIZE-1) && (col == 0 || col == ESM::Land::LAND_SIZE-1))
+                        if ((row == 0 || row == ESM::Land::LAND_SIZE - 1)
+                            && (col == 0 || col == ESM::Land::LAND_SIZE - 1))
                             averageNormal(normal, cellX, cellY, col, row, cache);
 
                         assert(normal.z() > 0);
 
-                        (*normals)[static_cast<unsigned int>(vertX*numVerts + vertY)] = normal;
+                        (*normals)[static_cast<unsigned int>(vertX * numVerts + vertY)] = normal;
 
                         if (colourData)
                         {
-                            for (int i=0; i<3; ++i)
-                                color[i] = colourData->mColours[srcArrayIndex+i];
+                            for (int i = 0; i < 3; ++i)
+                                color[i] = colourData->mColours[srcArrayIndex + i];
                         }
                         else
                         {
@@ -291,15 +292,15 @@ namespace ESMTerrain
                             color.b() = 255;
                         }
                         if (alteration)
-                            adjustColor(col, row, heightData, color); //Does nothing by default, override in OpenMW-CS
+                            adjustColor(col, row, heightData, color); // Does nothing by default, override in OpenMW-CS
 
                         // Unlike normals, colors mostly connect seamlessly between cells, but not always...
-                        if (col == ESM::Land::LAND_SIZE-1 || row == ESM::Land::LAND_SIZE-1)
+                        if (col == ESM::Land::LAND_SIZE - 1 || row == ESM::Land::LAND_SIZE - 1)
                             fixColour(color, cellX, cellY, col, row, cache);
 
                         color.a() = 255;
 
-                        (*colours)[static_cast<unsigned int>(vertX*numVerts + vertY)] = color;
+                        (*colours)[static_cast<unsigned int>(vertX * numVerts + vertY)] = color;
 
                         ++vertX;
                     }
@@ -311,11 +312,10 @@ namespace ESMTerrain
 
             assert(vertX_ == numVerts); // Ensure we covered whole area
         }
-        assert(vertY_ == numVerts);  // Ensure we covered whole area
+        assert(vertY_ == numVerts); // Ensure we covered whole area
     }
 
-    Storage::UniqueTextureId Storage::getVtexIndexAt(int cellX, int cellY,
-                                           int x, int y, LandCache& cache)
+    Storage::UniqueTextureId Storage::getVtexIndexAt(int cellX, int cellY, int x, int y, LandCache& cache)
     {
         // For the first/last row/column, we need to get the texture from the neighbour cell
         // to get consistent blending at the borders
@@ -330,26 +330,27 @@ namespace ESMTerrain
             ++cellX;
             x -= ESM::Land::LAND_TEXTURE_SIZE;
         }
-        while (y >= ESM::Land::LAND_TEXTURE_SIZE) // Y appears to be wrapped from the other side because why the hell not?
+        while (
+            y >= ESM::Land::LAND_TEXTURE_SIZE) // Y appears to be wrapped from the other side because why the hell not?
         {
             ++cellY;
             y -= ESM::Land::LAND_TEXTURE_SIZE;
         }
 
-        assert(x<ESM::Land::LAND_TEXTURE_SIZE);
-        assert(y<ESM::Land::LAND_TEXTURE_SIZE);
+        assert(x < ESM::Land::LAND_TEXTURE_SIZE);
+        assert(y < ESM::Land::LAND_TEXTURE_SIZE);
 
         const LandObject* land = getLand(cellX, cellY, cache);
 
-        const ESM::Land::LandData *data = land ? land->getData(ESM::Land::DATA_VTEX) : nullptr;
+        const ESM::Land::LandData* data = land ? land->getData(ESM::Land::DATA_VTEX) : nullptr;
         if (data)
         {
             int tex = data->mTextures[y * ESM::Land::LAND_TEXTURE_SIZE + x];
             if (tex == 0)
-                return std::make_pair(0,0); // vtex 0 is always the base texture, regardless of plugin
+                return std::make_pair(0, 0); // vtex 0 is always the base texture, regardless of plugin
             return std::make_pair(tex, land->getPlugin());
         }
-        return std::make_pair(0,0);
+        return std::make_pair(0, 0);
     }
 
     std::string Storage::getTextureName(UniqueTextureId id)
@@ -359,10 +360,11 @@ namespace ESMTerrain
             return defaultTexture; // Not sure if the default texture really is hardcoded?
 
         // NB: All vtex ids are +1 compared to the ltex ids
-        const ESM::LandTexture* ltex = getLandTexture(id.first-1, id.second);
+        const ESM::LandTexture* ltex = getLandTexture(id.first - 1, id.second);
         if (!ltex)
         {
-            Log(Debug::Warning) << "Warning: Unable to find land texture index " << id.first-1 << " in plugin " << id.second << ", using default texture instead";
+            Log(Debug::Warning) << "Warning: Unable to find land texture index " << id.first - 1 << " in plugin "
+                                << id.second << ", using default texture instead";
             return defaultTexture;
         }
 
@@ -372,18 +374,19 @@ namespace ESMTerrain
         return texture;
     }
 
-    void Storage::getBlendmaps(float chunkSize, const osg::Vec2f &chunkCenter, ImageVector &blendmaps, std::vector<Terrain::LayerInfo> &layerList)
+    void Storage::getBlendmaps(float chunkSize, const osg::Vec2f& chunkCenter, ImageVector& blendmaps,
+        std::vector<Terrain::LayerInfo>& layerList)
     {
-        osg::Vec2f origin = chunkCenter - osg::Vec2f(chunkSize/2.f, chunkSize/2.f);
+        osg::Vec2f origin = chunkCenter - osg::Vec2f(chunkSize / 2.f, chunkSize / 2.f);
         int cellX = static_cast<int>(std::floor(origin.x()));
         int cellY = static_cast<int>(std::floor(origin.y()));
 
-        int realTextureSize = ESM::Land::LAND_TEXTURE_SIZE+1; // add 1 to wrap around next cell
+        int realTextureSize = ESM::Land::LAND_TEXTURE_SIZE + 1; // add 1 to wrap around next cell
 
         int rowStart = (origin.x() - cellX) * realTextureSize;
         int colStart = (origin.y() - cellY) * realTextureSize;
 
-        const int blendmapSize = (realTextureSize-1) * chunkSize + 1;
+        const int blendmapSize = (realTextureSize - 1) * chunkSize + 1;
         // We need to upscale the blendmap 2x with nearest neighbor sampling to look like Vanilla
         const int imageScaleFactor = 2;
         const int blendmapImageSize = blendmapSize * imageScaleFactor;
@@ -391,11 +394,11 @@ namespace ESMTerrain
         LandCache cache;
         std::map<UniqueTextureId, unsigned int> textureIndicesMap;
 
-        for (int y=0; y<blendmapSize; y++)
+        for (int y = 0; y < blendmapSize; y++)
         {
-            for (int x=0; x<blendmapSize; x++)
+            for (int x = 0; x < blendmapSize; x++)
             {
-                UniqueTextureId id = getVtexIndexAt(cellX, cellY, x+rowStart, y+colStart, cache);
+                UniqueTextureId id = getVtexIndexAt(cellX, cellY, x + rowStart, y + colStart, cache);
                 std::map<UniqueTextureId, unsigned int>::iterator found = textureIndicesMap.find(id);
                 if (found == textureIndicesMap.end())
                 {
@@ -403,7 +406,7 @@ namespace ESMTerrain
                     Terrain::LayerInfo info = getLayerInfo(getTextureName(id));
 
                     // look for existing diffuse map, which may be present when several plugins use the same texture
-                    for (unsigned int i=0; i<layerList.size(); ++i)
+                    for (unsigned int i = 0; i < layerList.size(); ++i)
                     {
                         if (layerList[i].mDiffuseMap == info.mDiffuseMap)
                         {
@@ -416,7 +419,7 @@ namespace ESMTerrain
 
                     if (layerIndex >= layerList.size())
                     {
-                        osg::ref_ptr<osg::Image> image (new osg::Image);
+                        osg::ref_ptr<osg::Image> image(new osg::Image);
                         image->allocateImage(blendmapImageSize, blendmapImageSize, 1, GL_ALPHA, GL_UNSIGNED_BYTE);
                         unsigned char* pData = image->data();
                         memset(pData, 0, image->getTotalDataSize());
@@ -426,12 +429,12 @@ namespace ESMTerrain
                 }
                 unsigned int layerIndex = found->second;
                 unsigned char* pData = blendmaps[layerIndex]->data();
-                int realY = (blendmapSize - y - 1)*imageScaleFactor;
-                int realX = x*imageScaleFactor;
-                pData[((realY+0)*blendmapImageSize + realX + 0)] = 255;
-                pData[((realY+1)*blendmapImageSize + realX + 0)] = 255;
-                pData[((realY+0)*blendmapImageSize + realX + 1)] = 255;
-                pData[((realY+1)*blendmapImageSize + realX + 1)] = 255;
+                int realY = (blendmapSize - y - 1) * imageScaleFactor;
+                int realX = x * imageScaleFactor;
+                pData[((realY + 0) * blendmapImageSize + realX + 0)] = 255;
+                pData[((realY + 1) * blendmapImageSize + realX + 0)] = 255;
+                pData[((realY + 0) * blendmapImageSize + realX + 1)] = 255;
+                pData[((realY + 1) * blendmapImageSize + realX + 1)] = 255;
             }
         }
 
@@ -439,7 +442,7 @@ namespace ESMTerrain
             blendmaps.clear(); // If a single texture fills the whole terrain, there is no need to blend
     }
 
-    float Storage::getHeightAt(const osg::Vec3f &worldPos)
+    float Storage::getHeightAt(const osg::Vec3f& worldPos)
     {
         int cellX = static_cast<int>(std::floor(worldPos.x() / float(Constants::CellSizeInUnits)));
         int cellY = static_cast<int>(std::floor(worldPos.y() / float(Constants::CellSizeInUnits)));
@@ -467,8 +470,8 @@ namespace ESMTerrain
         int endX = startX + 1;
         int endY = startY + 1;
 
-        endX = std::min(endX, ESM::Land::LAND_SIZE-1);
-        endY = std::min(endY, ESM::Land::LAND_SIZE-1);
+        endX = std::min(endX, ESM::Land::LAND_SIZE - 1);
+        endY = std::min(endY, ESM::Land::LAND_SIZE - 1);
 
         // now get points in terrain space (effectively rounding them to boundaries)
         float startXTS = startX * invFactor;
@@ -488,10 +491,10 @@ namespace ESMTerrain
         */
 
         // Build all 4 positions in normalized cell space, using point-sampled height
-        osg::Vec3f v0 (startXTS, startYTS, getVertexHeight(data, startX, startY) / float(Constants::CellSizeInUnits));
-        osg::Vec3f v1 (endXTS, startYTS, getVertexHeight(data, endX, startY) / float(Constants::CellSizeInUnits));
-        osg::Vec3f v2 (endXTS, endYTS, getVertexHeight(data, endX, endY) / float(Constants::CellSizeInUnits));
-        osg::Vec3f v3 (startXTS, endYTS, getVertexHeight(data, startX, endY) / float(Constants::CellSizeInUnits));
+        osg::Vec3f v0(startXTS, startYTS, getVertexHeight(data, startX, startY) / float(Constants::CellSizeInUnits));
+        osg::Vec3f v1(endXTS, startYTS, getVertexHeight(data, endX, startY) / float(Constants::CellSizeInUnits));
+        osg::Vec3f v2(endXTS, endYTS, getVertexHeight(data, endX, endY) / float(Constants::CellSizeInUnits));
+        osg::Vec3f v3(startXTS, endYTS, getVertexHeight(data, startX, endY) / float(Constants::CellSizeInUnits));
         // define this plane in terrain space
         osg::Plane plane;
         // FIXME: deal with differing triangle alignment
@@ -517,10 +520,8 @@ namespace ESMTerrain
         */
 
         // Solve plane equation for z
-        return (-plane.getNormal().x() * nX
-                -plane.getNormal().y() * nY
-                - plane[3]) / plane.getNormal().z() * Constants::CellSizeInUnits;
-
+        return (-plane.getNormal().x() * nX - plane.getNormal().y() * nY - plane[3]) / plane.getNormal().z()
+            * Constants::CellSizeInUnits;
     }
 
     const LandObject* Storage::getLand(int cellX, int cellY, LandCache& cache)
@@ -535,9 +536,7 @@ namespace ESMTerrain
         }
     }
 
-    void Storage::adjustColor(int col, int row, const ESM::Land::LandData *heightData, osg::Vec4ub& color) const
-    {
-    }
+    void Storage::adjustColor(int col, int row, const ESM::Land::LandData* heightData, osg::Vec4ub& color) const {}
 
     float Storage::getAlteredHeight(int col, int row) const
     {
@@ -604,7 +603,7 @@ namespace ESMTerrain
 
     int Storage::getBlendmapScale(float chunkSize)
     {
-        return ESM::Land::LAND_TEXTURE_SIZE*chunkSize;
+        return ESM::Land::LAND_TEXTURE_SIZE * chunkSize;
     }
 
 }
diff --git a/components/esm3terrain/storage.hpp b/components/esm3terrain/storage.hpp
index a2ac625c6c..e1bff744ae 100644
--- a/components/esm3terrain/storage.hpp
+++ b/components/esm3terrain/storage.hpp
@@ -19,7 +19,8 @@ namespace ESMTerrain
 
     class LandCache;
 
-    /// @brief Wrapper around Land Data with reference counting. The wrapper needs to be held as long as the data is still in use
+    /// @brief Wrapper around Land Data with reference counting. The wrapper needs to be held as long as the data is
+    /// still in use
     class LandObject : public osg::Object
     {
     public:
@@ -50,10 +51,12 @@ namespace ESMTerrain
     class Storage : public Terrain::Storage
     {
     public:
-        Storage(const VFS::Manager* vfs, const std::string& normalMapPattern = "", const std::string& normalHeightMapPattern = "", bool autoUseNormalMaps = false, const std::string& specularMapPattern = "", bool autoUseSpecularMaps = false);
+        Storage(const VFS::Manager* vfs, const std::string& normalMapPattern = "",
+            const std::string& normalHeightMapPattern = "", bool autoUseNormalMaps = false,
+            const std::string& specularMapPattern = "", bool autoUseSpecularMaps = false);
 
         // Not implemented in this class, because we need different Store implementations for game and editor
-        virtual osg::ref_ptr<const LandObject> getLand (int cellX, int cellY)= 0;
+        virtual osg::ref_ptr<const LandObject> getLand(int cellX, int cellY) = 0;
         virtual const ESM::LandTexture* getLandTexture(int index, short plugin) = 0;
         /// Get bounds of the whole terrain in cell units
         void getBounds(float& minX, float& maxX, float& minY, float& maxY) override = 0;
@@ -66,7 +69,7 @@ namespace ESMTerrain
         /// @param min min height will be stored here
         /// @param max max height will be stored here
         /// @return true if there was data available for this terrain chunk
-        bool getMinMaxHeights (float size, const osg::Vec2f& center, float& min, float& max) override;
+        bool getMinMaxHeights(float size, const osg::Vec2f& center, float& min, float& max) override;
 
         /// Fill vertex buffers for a terrain chunk.
         /// @note May be called from background threads. Make sure to only call thread-safe functions from here!
@@ -78,10 +81,9 @@ namespace ESMTerrain
         /// @param positions buffer to write vertices
         /// @param normals buffer to write vertex normals
         /// @param colours buffer to write vertex colours
-        void fillVertexBuffers (int lodLevel, float size, const osg::Vec2f& center,
-                                osg::ref_ptr<osg::Vec3Array> positions,
-                                osg::ref_ptr<osg::Vec3Array> normals,
-                                osg::ref_ptr<osg::Vec4ubArray> colours) override;
+        void fillVertexBuffers(int lodLevel, float size, const osg::Vec2f& center,
+            osg::ref_ptr<osg::Vec3Array> positions, osg::ref_ptr<osg::Vec3Array> normals,
+            osg::ref_ptr<osg::Vec4ubArray> colours) override;
 
         /// Create textures holding layer blend values for a terrain chunk.
         /// @note The terrain chunk shouldn't be larger than one cell since otherwise we might
@@ -91,10 +93,10 @@ namespace ESMTerrain
         /// @param chunkCenter center of the chunk in cell units
         /// @param blendmaps created blendmaps will be written here
         /// @param layerList names of the layer textures used will be written here
-        void getBlendmaps (float chunkSize, const osg::Vec2f& chunkCenter, ImageVector& blendmaps,
-                               std::vector<Terrain::LayerInfo>& layerList) override;
+        void getBlendmaps(float chunkSize, const osg::Vec2f& chunkCenter, ImageVector& blendmaps,
+            std::vector<Terrain::LayerInfo>& layerList) override;
 
-        float getHeightAt (const osg::Vec3f& worldPos) override;
+        float getHeightAt(const osg::Vec3f& worldPos) override;
 
         /// Get the transformation factor for mapping cell units to world units.
         float getCellWorldSize() override;
@@ -104,7 +106,7 @@ namespace ESMTerrain
 
         int getBlendmapScale(float chunkSize) override;
 
-        float getVertexHeight (const ESM::Land::LandData* data, int x, int y)
+        float getVertexHeight(const ESM::Land::LandData* data, int x, int y)
         {
             assert(x < ESM::Land::LAND_SIZE);
             assert(y < ESM::Land::LAND_SIZE);
@@ -114,14 +116,14 @@ namespace ESMTerrain
     private:
         const VFS::Manager* mVFS;
 
-        inline void fixNormal (osg::Vec3f& normal, int cellX, int cellY, int col, int row, LandCache& cache);
-        inline void fixColour (osg::Vec4ub& colour, int cellX, int cellY, int col, int row, LandCache& cache);
-        inline void averageNormal (osg::Vec3f& normal, int cellX, int cellY, int col, int row, LandCache& cache);
+        inline void fixNormal(osg::Vec3f& normal, int cellX, int cellY, int col, int row, LandCache& cache);
+        inline void fixColour(osg::Vec4ub& colour, int cellX, int cellY, int col, int row, LandCache& cache);
+        inline void averageNormal(osg::Vec3f& normal, int cellX, int cellY, int col, int row, LandCache& cache);
 
         inline const LandObject* getLand(int cellX, int cellY, LandCache& cache);
 
         virtual bool useAlteration() const { return false; }
-        virtual void adjustColor(int col, int row, const ESM::Land::LandData *heightData, osg::Vec4ub& color) const;
+        virtual void adjustColor(int col, int row, const ESM::Land::LandData* heightData, osg::Vec4ub& color) const;
         virtual float getAlteredHeight(int col, int row) const;
 
         // Since plugins can define new texture palettes, we need to know the plugin index too
@@ -130,7 +132,7 @@ namespace ESMTerrain
         typedef std::pair<short, short> UniqueTextureId;
 
         inline UniqueTextureId getVtexIndexAt(int cellX, int cellY, int x, int y, LandCache&);
-        std::string getTextureName (UniqueTextureId id);
+        std::string getTextureName(UniqueTextureId id);
 
         std::map<std::string, Terrain::LayerInfo> mLayerInfoMap;
         std::mutex mLayerInfoMutex;
diff --git a/components/esm4/actor.hpp b/components/esm4/actor.hpp
index ae56a49564..1020008240 100644
--- a/components/esm4/actor.hpp
+++ b/components/esm4/actor.hpp
@@ -34,28 +34,28 @@
 namespace ESM4
 {
 #pragma pack(push, 1)
-    struct AIData        // NPC_, CREA
+    struct AIData // NPC_, CREA
     {
-        std::uint8_t  aggression;
-        std::uint8_t  confidence;
-        std::uint8_t  energyLevel;
-        std::uint8_t  responsibility;
+        std::uint8_t aggression;
+        std::uint8_t confidence;
+        std::uint8_t energyLevel;
+        std::uint8_t responsibility;
         std::uint32_t aiFlags;
-        std::uint8_t  trainSkill;
-        std::uint8_t  trainLevel;
+        std::uint8_t trainSkill;
+        std::uint8_t trainLevel;
         std::uint16_t unknown;
     };
 
     struct AttributeValues
     {
-        std::uint8_t  strength;
-        std::uint8_t  intelligence;
-        std::uint8_t  willpower;
-        std::uint8_t  agility;
-        std::uint8_t  speed;
-        std::uint8_t  endurance;
-        std::uint8_t  personality;
-        std::uint8_t  luck;
+        std::uint8_t strength;
+        std::uint8_t intelligence;
+        std::uint8_t willpower;
+        std::uint8_t agility;
+        std::uint8_t speed;
+        std::uint8_t endurance;
+        std::uint8_t personality;
+        std::uint8_t luck;
     };
 
     struct ACBS_TES4
@@ -64,7 +64,7 @@ namespace ESM4
         std::uint16_t baseSpell;
         std::uint16_t fatigue;
         std::uint16_t barterGold;
-        std::int16_t  levelOrOffset;
+        std::int16_t levelOrOffset;
         std::uint16_t calcMin;
         std::uint16_t calcMax;
         std::uint32_t padding1;
@@ -76,12 +76,12 @@ namespace ESM4
         std::uint32_t flags;
         std::uint16_t fatigue;
         std::uint16_t barterGold;
-        std::int16_t  levelOrMult;
+        std::int16_t levelOrMult;
         std::uint16_t calcMinlevel;
         std::uint16_t calcMaxlevel;
         std::uint16_t speedMultiplier;
-        float         karma;
-        std::int16_t  dispositionBase;
+        float karma;
+        std::int16_t dispositionBase;
         std::uint16_t templateFlags;
     };
 
@@ -90,7 +90,7 @@ namespace ESM4
         std::uint32_t flags;
         std::uint16_t magickaOffset;
         std::uint16_t staminaOffset;
-        std::uint16_t levelOrMult;     // TODO: check if int16_t
+        std::uint16_t levelOrMult; // TODO: check if int16_t
         std::uint16_t calcMinlevel;
         std::uint16_t calcMaxlevel;
         std::uint16_t speedMultiplier;
@@ -103,14 +103,14 @@ namespace ESM4
     union ActorBaseConfig
     {
         ACBS_TES4 tes4;
-        ACBS_FO3  fo3;
+        ACBS_FO3 fo3;
         ACBS_TES5 tes5;
     };
 
     struct ActorFaction
     {
-        FormId       faction;
-        std::int8_t  rank;
+        FormId faction;
+        std::int8_t rank;
         std::uint8_t unknown1;
         std::uint8_t unknown2;
         std::uint8_t unknown3;
diff --git a/components/esm4/common.cpp b/components/esm4/common.cpp
index 752660fd85..8af645c8f0 100644
--- a/components/esm4/common.cpp
+++ b/components/esm4/common.cpp
@@ -26,8 +26,8 @@
 */
 #include "common.hpp"
 
-#include <sstream>
 #include <algorithm>
+#include <sstream>
 #include <stdexcept>
 
 #include <string>
@@ -36,12 +36,9 @@
 
 namespace ESM4
 {
-    const char *sGroupType[] =
-    {
-        "Record Type", "World Child", "Interior Cell", "Interior Sub Cell", "Exterior Cell",
-        "Exterior Sub Cell", "Cell Child", "Topic Child", "Cell Persistent Child",
-        "Cell Temporary Child", "Cell Visible Dist Child", "Unknown"
-    };
+    const char* sGroupType[] = { "Record Type", "World Child", "Interior Cell", "Interior Sub Cell", "Exterior Cell",
+        "Exterior Sub Cell", "Cell Child", "Topic Child", "Cell Persistent Child", "Cell Temporary Child",
+        "Cell Visible Dist Child", "Unknown" };
 
     std::string printLabel(const GroupLabel& label, const std::uint32_t type)
     {
@@ -58,9 +55,9 @@ namespace ESM4
             case ESM4::Grp_ExteriorCell:
             case ESM4::Grp_ExteriorSubCell:
             {
-                //short x, y;
-                //y = label & 0xff;
-                //x = (label >> 16) & 0xff;
+                // short x, y;
+                // y = label & 0xff;
+                // x = (label >> 16) & 0xff;
                 ss << ": grid (x, y) " << std::dec << label.grid[1] << ", " << label.grid[0];
 
                 break;
@@ -90,9 +87,9 @@ namespace ESM4
 
     void gridToString(std::int16_t x, std::int16_t y, std::string& str)
     {
-        char buf[6+6+2+1]; // longest signed 16 bit number is 6 characters (-32768)
-        int res = snprintf(buf, 6+6+2+1, "#%d %d", x, y);
-        if (res > 0 && res < 6+6+2+1)
+        char buf[6 + 6 + 2 + 1]; // longest signed 16 bit number is 6 characters (-32768)
+        int res = snprintf(buf, 6 + 6 + 2 + 1, "#%d %d", x, y);
+        if (res > 0 && res < 6 + 6 + 2 + 1)
             str.assign(buf);
         else
             throw std::runtime_error("possible buffer overflow while converting grid");
diff --git a/components/esm4/common.hpp b/components/esm4/common.hpp
index ddfbefb002..5eae860a10 100644
--- a/components/esm4/common.hpp
+++ b/components/esm4/common.hpp
@@ -34,10 +34,12 @@
 
 namespace ESM
 {
-    template<std::size_t len>
-    constexpr unsigned int fourCC(const char(&name)[len]) {
+    template <std::size_t len>
+    constexpr unsigned int fourCC(const char (&name)[len])
+    {
         static_assert(len == 5, "Constant must be 4 characters long. (Plus null terminator)");
-        return static_cast<unsigned char>(name[0]) | (static_cast<unsigned char>(name[1]) << 8) | (static_cast<unsigned char>(name[2]) << 16) | (static_cast<unsigned char>(name[3]) << 24);
+        return static_cast<unsigned char>(name[0]) | (static_cast<unsigned char>(name[1]) << 8)
+            | (static_cast<unsigned char>(name[2]) << 16) | (static_cast<unsigned char>(name[3]) << 24);
     }
 }
 
@@ -186,7 +188,7 @@ namespace ESM4
         REC_CCRD = fourCC("CCRD"), // Caravan Card
         REC_CMNY = fourCC("CMNY"), // Caravan Money
         REC_ALOC = fourCC("ALOC"), // Audio Location Controller
-        REC_MSET = fourCC("MSET")  // Media Set
+        REC_MSET = fourCC("MSET") // Media Set
     };
 
     enum SubRecordTypes
@@ -808,100 +810,100 @@ namespace ESM4
         EFI_SUDG = fourCC("SUDG"), // Sun Damage
         EFI_VAMP = fourCC("VAMP"), // Vampirism
         EFI_DARK = fourCC("DARK"), // Darkness
-        EFI_RSWD = fourCC("RSWD")  // Resist Water Damage
+        EFI_RSWD = fourCC("RSWD") // Resist Water Damage
     };
 
     // Based on http://www.uesp.net/wiki/Tes5Mod:Mod_File_Format#Groups
     enum GroupType
     {
-        Grp_RecordType           = 0,
-        Grp_WorldChild           = 1,
-        Grp_InteriorCell         = 2,
-        Grp_InteriorSubCell      = 3,
-        Grp_ExteriorCell         = 4,
-        Grp_ExteriorSubCell      = 5,
-        Grp_CellChild            = 6,
-        Grp_TopicChild           = 7,
-        Grp_CellPersistentChild  = 8,
-        Grp_CellTemporaryChild   = 9,
+        Grp_RecordType = 0,
+        Grp_WorldChild = 1,
+        Grp_InteriorCell = 2,
+        Grp_InteriorSubCell = 3,
+        Grp_ExteriorCell = 4,
+        Grp_ExteriorSubCell = 5,
+        Grp_CellChild = 6,
+        Grp_TopicChild = 7,
+        Grp_CellPersistentChild = 8,
+        Grp_CellTemporaryChild = 9,
         Grp_CellVisibleDistChild = 10
     };
 
     // Based on http://www.uesp.net/wiki/Tes5Mod:Mod_File_Format#Records
     enum RecordFlag
     {
-        Rec_ESM        = 0x00000001, // (TES4 record only) Master (ESM) file.
-        Rec_Deleted    = 0x00000020, // Deleted
-        Rec_Constant   = 0x00000040, // Constant
+        Rec_ESM = 0x00000001, // (TES4 record only) Master (ESM) file.
+        Rec_Deleted = 0x00000020, // Deleted
+        Rec_Constant = 0x00000040, // Constant
         Rec_HiddenLMap = 0x00000040, // (REFR) Hidden From Local Map (Needs Confirmation: Related to shields)
-        Rec_Localized  = 0x00000080, // (TES4 record only) Is localized. This will make Skyrim load the
-                                     //   .STRINGS, .DLSTRINGS, and .ILSTRINGS files associated with the mod.
-                                     //   If this flag is not set, lstrings are treated as zstrings.
-        Rec_FireOff    = 0x00000080, // (PHZD) Turn off fire
+        Rec_Localized = 0x00000080, // (TES4 record only) Is localized. This will make Skyrim load the
+                                    //   .STRINGS, .DLSTRINGS, and .ILSTRINGS files associated with the mod.
+                                    //   If this flag is not set, lstrings are treated as zstrings.
+        Rec_FireOff = 0x00000080, // (PHZD) Turn off fire
         Rec_UpdateAnim = 0x00000100, // Must Update Anims
-        Rec_NoAccess   = 0x00000100, // (REFR) Inaccessible
-        Rec_Hidden     = 0x00000200, // (REFR) Hidden from local map
-        Rec_StartDead  = 0x00000200, // (ACHR) Starts dead /(REFR) MotionBlurCastsShadows
+        Rec_NoAccess = 0x00000100, // (REFR) Inaccessible
+        Rec_Hidden = 0x00000200, // (REFR) Hidden from local map
+        Rec_StartDead = 0x00000200, // (ACHR) Starts dead /(REFR) MotionBlurCastsShadows
         Rec_Persistent = 0x00000400, // Quest item / Persistent reference
-        Rec_DispMenu   = 0x00000400, // (LSCR) Displays in Main Menu
-        Rec_Disabled   = 0x00000800, // Initially disabled
-        Rec_Ignored    = 0x00001000, // Ignored
+        Rec_DispMenu = 0x00000400, // (LSCR) Displays in Main Menu
+        Rec_Disabled = 0x00000800, // Initially disabled
+        Rec_Ignored = 0x00001000, // Ignored
         Rec_VisDistant = 0x00008000, // Visible when distant
-        Rec_RandAnim   = 0x00010000, // (ACTI) Random Animation Start
-        Rec_Danger     = 0x00020000, // (ACTI) Dangerous / Off limits (Interior cell)
-                                     //   Dangerous Can't be set withough Ignore Object Interaction
+        Rec_RandAnim = 0x00010000, // (ACTI) Random Animation Start
+        Rec_Danger = 0x00020000, // (ACTI) Dangerous / Off limits (Interior cell)
+                                 //   Dangerous Can't be set withough Ignore Object Interaction
         Rec_Compressed = 0x00040000, // Data is compressed
         Rec_CanNotWait = 0x00080000, // Can't wait
-        Rec_IgnoreObj  = 0x00100000, // (ACTI) Ignore Object Interaction
-                                     //   Ignore Object Interaction Sets Dangerous Automatically
-        Rec_Marker     = 0x00800000, // Is Marker
-        Rec_Obstacle   = 0x02000000, // (ACTI) Obstacle / (REFR) No AI Acquire
+        Rec_IgnoreObj = 0x00100000, // (ACTI) Ignore Object Interaction
+                                    //   Ignore Object Interaction Sets Dangerous Automatically
+        Rec_Marker = 0x00800000, // Is Marker
+        Rec_Obstacle = 0x02000000, // (ACTI) Obstacle / (REFR) No AI Acquire
         Rec_NavMFilter = 0x04000000, // NavMesh Gen - Filter
-        Rec_NavMBBox   = 0x08000000, // NavMesh Gen - Bounding Box
+        Rec_NavMBBox = 0x08000000, // NavMesh Gen - Bounding Box
         Rec_ExitToTalk = 0x10000000, // (FURN) Must Exit to Talk
-        Rec_Refected   = 0x10000000, // (REFR) Reflected By Auto Water
-        Rec_ChildUse   = 0x20000000, // (FURN/IDLM) Child Can Use
-        Rec_NoHavok    = 0x20000000, // (REFR) Don't Havok Settle
+        Rec_Refected = 0x10000000, // (REFR) Reflected By Auto Water
+        Rec_ChildUse = 0x20000000, // (FURN/IDLM) Child Can Use
+        Rec_NoHavok = 0x20000000, // (REFR) Don't Havok Settle
         Rec_NavMGround = 0x40000000, // NavMesh Gen - Ground
-        Rec_NoRespawn  = 0x40000000, // (REFR) NoRespawn
-        Rec_MultiBound = 0x80000000  // (REFR) MultiBound
+        Rec_NoRespawn = 0x40000000, // (REFR) NoRespawn
+        Rec_MultiBound = 0x80000000 // (REFR) MultiBound
     };
 
 #pragma pack(push, 1)
     // NOTE: the label field of a group is not reliable (http://www.uesp.net/wiki/Tes4Mod:Mod_File_Format)
     union GroupLabel
     {
-        std::uint32_t value;     // formId, blockNo or raw int representation of type
-        char recordType[4];      // record type in ascii
-        std::int16_t grid[2];    // grid y, x (note the reverse order)
+        std::uint32_t value; // formId, blockNo or raw int representation of type
+        char recordType[4]; // record type in ascii
+        std::int16_t grid[2]; // grid y, x (note the reverse order)
     };
 
     struct GroupTypeHeader
     {
         std::uint32_t typeId;
         std::uint32_t groupSize; // includes the 24 bytes (20 for TES4) of header (i.e. this struct)
-        GroupLabel    label;     // format based on type
-        std::int32_t  type;
-        std::uint16_t stamp;     // & 0xff for day, & 0xff00 for months since Dec 2002 (i.e. 1 = Jan 2003)
+        GroupLabel label; // format based on type
+        std::int32_t type;
+        std::uint16_t stamp; // & 0xff for day, & 0xff00 for months since Dec 2002 (i.e. 1 = Jan 2003)
         std::uint16_t unknown;
-        std::uint16_t version;   // not in TES4
-        std::uint16_t unknown2;  // not in TES4
+        std::uint16_t version; // not in TES4
+        std::uint16_t unknown2; // not in TES4
     };
 
     struct RecordTypeHeader
     {
         std::uint32_t typeId;
-        std::uint32_t dataSize;  // does *not* include 24 bytes (20 for TES4) of header
+        std::uint32_t dataSize; // does *not* include 24 bytes (20 for TES4) of header
         std::uint32_t flags;
-        FormId        id;
+        FormId id;
         std::uint32_t revision;
-        std::uint16_t version;  // not in TES4
-        std::uint16_t unknown;  // not in TES4
+        std::uint16_t version; // not in TES4
+        std::uint16_t unknown; // not in TES4
     };
 
     union RecordHeader
     {
-        struct GroupTypeHeader  group;
+        struct GroupTypeHeader group;
         struct RecordTypeHeader record;
     };
 
@@ -922,7 +924,7 @@ namespace ESM4
     union CellGrid
     {
         FormId cellId;
-        Grid   grid;
+        Grid grid;
     };
 
     struct Vertex
diff --git a/components/esm4/dialogue.hpp b/components/esm4/dialogue.hpp
index e77d192901..485a225a62 100644
--- a/components/esm4/dialogue.hpp
+++ b/components/esm4/dialogue.hpp
@@ -31,15 +31,15 @@ namespace ESM4
 {
     enum DialType
     {
-        DTYP_Topic         = 0,
-        DTYP_Conversation  = 1,
-        DTYP_Combat        = 2,
-        DTYP_Persuation    = 3,
-        DTYP_Detection     = 4,
-        DTYP_Service       = 5,
+        DTYP_Topic = 0,
+        DTYP_Conversation = 1,
+        DTYP_Combat = 2,
+        DTYP_Persuation = 3,
+        DTYP_Detection = 4,
+        DTYP_Service = 5,
         DTYP_Miscellaneous = 6,
         // below FO3/FONV
-        DTYP_Radio         = 7
+        DTYP_Radio = 7
     };
 }
 
diff --git a/components/esm4/effect.hpp b/components/esm4/effect.hpp
index 8580a478dc..c83f9790fb 100644
--- a/components/esm4/effect.hpp
+++ b/components/esm4/effect.hpp
@@ -42,10 +42,10 @@ namespace ESM4
 
     struct ScriptEffect
     {
-        FormId       formId;       // Script effect (Magic effect must be SEFF)
-        std::int32_t school;       // Magic school. See Magic schools for more information.
-        EFI_Label    visualEffect; // Visual effect name or 0x00000000 if None
-        std::uint8_t flags;        // 0x01 = Hostile
+        FormId formId; // Script effect (Magic effect must be SEFF)
+        std::int32_t school; // Magic school. See Magic schools for more information.
+        EFI_Label visualEffect; // Visual effect name or 0x00000000 if None
+        std::uint8_t flags; // 0x01 = Hostile
         std::uint8_t unknown1;
         std::uint8_t unknown2;
         std::uint8_t unknown3;
diff --git a/components/esm4/formid.cpp b/components/esm4/formid.cpp
index f5493fd0ca..7aab4ac6d6 100644
--- a/components/esm4/formid.cpp
+++ b/components/esm4/formid.cpp
@@ -22,11 +22,11 @@
 */
 #include "formid.hpp"
 
-#include <sstream>
 #include <algorithm>
-#include <stdexcept>
-#include <cstdlib> // strtol
 #include <climits> // LONG_MIN, LONG_MAX for gcc
+#include <cstdlib> // strtol
+#include <sstream>
+#include <stdexcept>
 
 #include <string>
 
@@ -34,9 +34,9 @@ namespace ESM4
 {
     void formIdToString(FormId formId, std::string& str)
     {
-        char buf[8+1];
-        int res = snprintf(buf, 8+1, "%08X", formId);
-        if (res > 0 && res < 8+1)
+        char buf[8 + 1];
+        int res = snprintf(buf, 8 + 1, "%08X", formId);
+        if (res > 0 && res < 8 + 1)
             str.assign(buf);
         else
             throw std::runtime_error("Possible buffer overflow while converting formId");
@@ -49,17 +49,17 @@ namespace ESM4
         return str;
     }
 
-    bool isFormId(const std::string& str, FormId *id)
+    bool isFormId(const std::string& str, FormId* id)
     {
         if (str.size() != 8)
             return false;
 
-        char *tmp;
+        char* tmp;
         errno = 0;
         unsigned long val = strtol(str.c_str(), &tmp, 16);
 
         if (tmp == str.c_str() || *tmp != '\0'
-                || ((val == (unsigned long)LONG_MIN || val == (unsigned long)LONG_MAX) && errno == ERANGE))
+            || ((val == (unsigned long)LONG_MIN || val == (unsigned long)LONG_MAX) && errno == ERANGE))
             return false;
 
         if (id != nullptr)
diff --git a/components/esm4/formid.hpp b/components/esm4/formid.hpp
index 6bb2c475e3..d2baaa989d 100644
--- a/components/esm4/formid.hpp
+++ b/components/esm4/formid.hpp
@@ -34,7 +34,7 @@ namespace ESM4
 
     std::string formIdToString(FormId formId);
 
-    bool isFormId(const std::string& str, FormId *id = nullptr);
+    bool isFormId(const std::string& str, FormId* id = nullptr);
 
     FormId stringToFormId(const std::string& str);
 }
diff --git a/components/esm4/inventory.hpp b/components/esm4/inventory.hpp
index 31181ce33c..d072749b47 100644
--- a/components/esm4/inventory.hpp
+++ b/components/esm4/inventory.hpp
@@ -37,16 +37,16 @@ namespace ESM4
     // LVLC, LVLI
     struct LVLO
     {
-        std::int16_t  level;
-        std::uint16_t unknown;  // sometimes missing
-        FormId        item;
-        std::int16_t  count;
+        std::int16_t level;
+        std::uint16_t unknown; // sometimes missing
+        FormId item;
+        std::int16_t count;
         std::uint16_t unknown2; // sometimes missing
     };
 
     struct InventoryItem // NPC_, CREA, CONT
     {
-        FormId        item;
+        FormId item;
         std::uint32_t count;
     };
 #pragma pack(pop)
diff --git a/components/esm4/lighting.hpp b/components/esm4/lighting.hpp
index a139ae630e..4cfa8957d7 100644
--- a/components/esm4/lighting.hpp
+++ b/components/esm4/lighting.hpp
@@ -35,17 +35,17 @@ namespace ESM4
 #pragma pack(push, 1)
     // guesses only for TES4
     struct Lighting
-    {                              //               | Aichan Prison values
-        std::uint32_t ambient;     //               | 16 17 19 00 (RGBA)
+    { //               | Aichan Prison values
+        std::uint32_t ambient; //               | 16 17 19 00 (RGBA)
         std::uint32_t directional; //               | 00 00 00 00 (RGBA)
-        std::uint32_t fogColor;    //               | 1D 1B 16 00 (RGBA)
-        float         fogNear;     // Fog Near      | 00 00 00 00 = 0.f
-        float         fogFar;      // Fog Far       | 00 80 3B 45 = 3000.f
-        std::int32_t  rotationXY;  // rotation xy   | 00 00 00 00 = 0
-        std::int32_t  rotationZ;   // rotation z    | 00 00 00 00 = 0
-        float         fogDirFade;  // Fog dir fade  | 00 00 80 3F = 1.f
-        float         fogClipDist; // Fog clip dist | 00 80 3B 45 = 3000.f
-        float         fogPower = std::numeric_limits<float>::max();
+        std::uint32_t fogColor; //               | 1D 1B 16 00 (RGBA)
+        float fogNear; // Fog Near      | 00 00 00 00 = 0.f
+        float fogFar; // Fog Far       | 00 80 3B 45 = 3000.f
+        std::int32_t rotationXY; // rotation xy   | 00 00 00 00 = 0
+        std::int32_t rotationZ; // rotation z    | 00 00 00 00 = 0
+        float fogDirFade; // Fog dir fade  | 00 00 80 3F = 1.f
+        float fogClipDist; // Fog clip dist | 00 80 3B 45 = 3000.f
+        float fogPower = std::numeric_limits<float>::max();
     };
 
     struct Lighting_TES5
@@ -53,13 +53,13 @@ namespace ESM4
         std::uint32_t ambient;
         std::uint32_t directional;
         std::uint32_t fogColor;
-        float         fogNear;
-        float         fogFar;
-        std::int32_t  rotationXY;
-        std::int32_t  rotationZ;
-        float         fogDirFade;
-        float         fogClipDist;
-        float         fogPower;
+        float fogNear;
+        float fogFar;
+        std::int32_t rotationXY;
+        std::int32_t rotationZ;
+        float fogDirFade;
+        float fogClipDist;
+        float fogPower;
         std::uint32_t unknown1;
         std::uint32_t unknown2;
         std::uint32_t unknown3;
@@ -69,9 +69,9 @@ namespace ESM4
         std::uint32_t unknown7;
         std::uint32_t unknown8;
         std::uint32_t fogColorFar;
-        float         fogMax;
-        float         LightFadeStart;
-        float         LightFadeEnd;
+        float fogMax;
+        float LightFadeStart;
+        float LightFadeEnd;
         std::uint32_t padding;
     };
 #pragma pack(pop)
diff --git a/components/esm4/loadachr.cpp b/components/esm4/loadachr.cpp
index 7a62b5cdbd..97f23e9c49 100644
--- a/components/esm4/loadachr.cpp
+++ b/components/esm4/loadachr.cpp
@@ -36,7 +36,7 @@ void ESM4::ActorCharacter::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
     mParent = reader.currCell(); // NOTE: only for persistent achr? (aren't they all persistent?)
 
     while (reader.getSubRecordHeader())
@@ -44,12 +44,24 @@ void ESM4::ActorCharacter::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getZString(mFullName); break;
-            case ESM4::SUB_NAME: reader.getFormId(mBaseObj);   break;
-            case ESM4::SUB_DATA: reader.get(mPlacement); break;
-            case ESM4::SUB_XSCL: reader.get(mScale);     break;
-            case ESM4::SUB_XOWN: reader.get(mOwner);     break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getZString(mFullName);
+                break;
+            case ESM4::SUB_NAME:
+                reader.getFormId(mBaseObj);
+                break;
+            case ESM4::SUB_DATA:
+                reader.get(mPlacement);
+                break;
+            case ESM4::SUB_XSCL:
+                reader.get(mScale);
+                break;
+            case ESM4::SUB_XOWN:
+                reader.get(mOwner);
+                break;
             case ESM4::SUB_XESP:
             {
                 reader.get(mEsp);
@@ -59,7 +71,7 @@ void ESM4::ActorCharacter::load(ESM4::Reader& reader)
             case ESM4::SUB_XRGD: // ragdoll
             case ESM4::SUB_XRGB: // ragdoll biped
             {
-                //std::cout << "ACHR " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "ACHR " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -91,7 +103,7 @@ void ESM4::ActorCharacter::load(ESM4::Reader& reader)
             case ESM4::SUB_TNAM: // FO3
             case ESM4::SUB_XATO: // FONV
             {
-                //std::cout << "ACHR " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "ACHR " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -101,10 +113,10 @@ void ESM4::ActorCharacter::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::ActorCharacter::save(ESM4::Writer& writer) const
+// void ESM4::ActorCharacter::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::ActorCharacter::blank()
+// void ESM4::ActorCharacter::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadachr.hpp b/components/esm4/loadachr.hpp
index 89b1ad7c86..a5c0a11518 100644
--- a/components/esm4/loadachr.hpp
+++ b/components/esm4/loadachr.hpp
@@ -38,29 +38,29 @@ namespace ESM4
 
     struct ActorCharacter
     {
-        FormId mParent;       // cell formId, from the loading sequence
-                              // NOTE: for exterior cells it will be the dummy cell FormId
+        FormId mParent; // cell formId, from the loading sequence
+                        // NOTE: for exterior cells it will be the dummy cell FormId
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
         std::string mFullName;
-        FormId      mBaseObj;
+        FormId mBaseObj;
 
         Placement mPlacement;
-        float    mScale = 1.0f;
-        FormId   mOwner;
-        FormId   mGlobal;
+        float mScale = 1.0f;
+        FormId mOwner;
+        FormId mGlobal;
 
         bool mInitiallyDisabled; // TODO may need to check mFlags & 0x800 (initially disabled)
 
         EnableParent mEsp;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadacre.cpp b/components/esm4/loadacre.cpp
index 33d402eb81..8dfa9104a1 100644
--- a/components/esm4/loadacre.cpp
+++ b/components/esm4/loadacre.cpp
@@ -36,31 +36,45 @@ void ESM4::ActorCreature::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_NAME: reader.getFormId(mBaseObj);   break;
-            case ESM4::SUB_DATA: reader.get(mPlacement);       break;
-            case ESM4::SUB_XSCL: reader.get(mScale);           break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_NAME:
+                reader.getFormId(mBaseObj);
+                break;
+            case ESM4::SUB_DATA:
+                reader.get(mPlacement);
+                break;
+            case ESM4::SUB_XSCL:
+                reader.get(mScale);
+                break;
             case ESM4::SUB_XESP:
             {
                 reader.get(mEsp);
                 reader.adjustFormId(mEsp.parent);
                 break;
             }
-            case ESM4::SUB_XOWN: reader.getFormId(mOwner);     break;
-            case ESM4::SUB_XGLB: reader.get(mGlobal);          break; // FIXME: formId?
-            case ESM4::SUB_XRNK: reader.get(mFactionRank);     break;
+            case ESM4::SUB_XOWN:
+                reader.getFormId(mOwner);
+                break;
+            case ESM4::SUB_XGLB:
+                reader.get(mGlobal);
+                break; // FIXME: formId?
+            case ESM4::SUB_XRNK:
+                reader.get(mFactionRank);
+                break;
             case ESM4::SUB_XRGD: // ragdoll
             case ESM4::SUB_XRGB: // ragdoll biped
             {
                 // seems to occur only for dead bodies, e.g. DeadMuffy, DeadDogVicious
-                //std::cout << "ACRE " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "ACRE " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -74,7 +88,7 @@ void ESM4::ActorCreature::load(ESM4::Reader& reader)
             case ESM4::SUB_XPRD: // FO3
             case ESM4::SUB_XATO: // FONV
             {
-                //std::cout << "ACRE " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "ACRE " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -84,10 +98,10 @@ void ESM4::ActorCreature::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::ActorCreature::save(ESM4::Writer& writer) const
+// void ESM4::ActorCreature::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::ActorCreature::blank()
+// void ESM4::ActorCreature::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadacre.hpp b/components/esm4/loadacre.hpp
index 4be76a5a8a..8272d608d0 100644
--- a/components/esm4/loadacre.hpp
+++ b/components/esm4/loadacre.hpp
@@ -38,16 +38,16 @@ namespace ESM4
 
     struct ActorCreature
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
-        FormId      mBaseObj;
+        FormId mBaseObj;
 
         Placement mPlacement;
-        float    mScale = 1.0f;
-        FormId   mOwner;
-        FormId   mGlobal;
+        float mScale = 1.0f;
+        FormId mOwner;
+        FormId mGlobal;
         std::uint32_t mFactionRank;
 
         bool mInitiallyDisabled; // TODO may need to check mFlags & 0x800 (initially disabled)
@@ -55,9 +55,9 @@ namespace ESM4
         EnableParent mEsp;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadacti.cpp b/components/esm4/loadacti.cpp
index 8c64e0477c..3b86a2e3c4 100644
--- a/components/esm4/loadacti.cpp
+++ b/components/esm4/loadacti.cpp
@@ -26,8 +26,8 @@
 */
 #include "loadacti.hpp"
 
-#include <stdexcept>
 #include <iostream> // FIXME
+#include <stdexcept>
 
 #include "reader.hpp"
 //#include "writer.hpp"
@@ -36,23 +36,43 @@ void ESM4::Activator::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
-            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
-            case ESM4::SUB_SNAM: reader.getFormId(mLoopingSound);  break;
-            case ESM4::SUB_VNAM: reader.getFormId(mActivationSound);  break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
-            case ESM4::SUB_INAM: reader.getFormId(mRadioTemplate); break; // FONV
-            case ESM4::SUB_RNAM: reader.getFormId(mRadioStation); break;
-            case ESM4::SUB_XATO: reader.getZString(mActivationPrompt); break; // FONV
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_SCRI:
+                reader.getFormId(mScriptId);
+                break;
+            case ESM4::SUB_SNAM:
+                reader.getFormId(mLoopingSound);
+                break;
+            case ESM4::SUB_VNAM:
+                reader.getFormId(mActivationSound);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
+            case ESM4::SUB_INAM:
+                reader.getFormId(mRadioTemplate);
+                break; // FONV
+            case ESM4::SUB_RNAM:
+                reader.getFormId(mRadioStation);
+                break;
+            case ESM4::SUB_XATO:
+                reader.getZString(mActivationPrompt);
+                break; // FONV
             case ESM4::SUB_MODT:
             case ESM4::SUB_MODS:
             case ESM4::SUB_DEST:
@@ -70,7 +90,7 @@ void ESM4::Activator::load(ESM4::Reader& reader)
             case ESM4::SUB_VMAD:
             case ESM4::SUB_WNAM:
             {
-                //std::cout << "ACTI " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "ACTI " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -80,10 +100,10 @@ void ESM4::Activator::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Activator::save(ESM4::Writer& writer) const
+// void ESM4::Activator::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Activator::blank()
+// void ESM4::Activator::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadacti.hpp b/components/esm4/loadacti.hpp
index 7d5798c033..f65699ca59 100644
--- a/components/esm4/loadacti.hpp
+++ b/components/esm4/loadacti.hpp
@@ -39,7 +39,7 @@ namespace ESM4
 
     struct Activator
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -47,20 +47,20 @@ namespace ESM4
         std::string mModel;
 
         FormId mScriptId;
-        FormId mLoopingSound;    // SOUN
+        FormId mLoopingSound; // SOUN
         FormId mActivationSound; // SOUN
 
         float mBoundRadius;
 
         FormId mRadioTemplate; // SOUN
-        FormId mRadioStation;  // TACT
+        FormId mRadioStation; // TACT
 
         std::string mActivationPrompt;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadalch.cpp b/components/esm4/loadalch.cpp
index 579bf309f0..7a2427dc45 100644
--- a/components/esm4/loadalch.cpp
+++ b/components/esm4/loadalch.cpp
@@ -26,8 +26,8 @@
 */
 #include "loadalch.hpp"
 
-#include <stdexcept>
 #include <cstring>
+#include <stdexcept>
 //#include <iostream> // FIXME
 
 #include "reader.hpp"
@@ -37,21 +37,37 @@ void ESM4::Potion::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
-            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
-            case ESM4::SUB_MICO: reader.getZString(mMiniIcon); break; // FO3
-            case ESM4::SUB_DATA: reader.get(mData);         break;
-            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_ICON:
+                reader.getZString(mIcon);
+                break;
+            case ESM4::SUB_MICO:
+                reader.getZString(mMiniIcon);
+                break; // FO3
+            case ESM4::SUB_DATA:
+                reader.get(mData);
+                break;
+            case ESM4::SUB_SCRI:
+                reader.getFormId(mScriptId);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
             case ESM4::SUB_SCIT:
             {
                 reader.get(mEffect);
@@ -73,8 +89,12 @@ void ESM4::Potion::load(ESM4::Reader& reader)
                 reader.adjustFormId(mItem.sound);
                 break;
             }
-            case ESM4::SUB_YNAM: reader.getFormId(mPickUpSound); break;
-            case ESM4::SUB_ZNAM: reader.getFormId(mDropSound); break;
+            case ESM4::SUB_YNAM:
+                reader.getFormId(mPickUpSound);
+                break;
+            case ESM4::SUB_ZNAM:
+                reader.getFormId(mDropSound);
+                break;
             case ESM4::SUB_MODT:
             case ESM4::SUB_EFID:
             case ESM4::SUB_EFIT:
@@ -85,7 +105,7 @@ void ESM4::Potion::load(ESM4::Reader& reader)
             case ESM4::SUB_OBND:
             case ESM4::SUB_ETYP: // FO3
             {
-                //std::cout << "ALCH " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "ALCH " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -95,10 +115,10 @@ void ESM4::Potion::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Potion::save(ESM4::Writer& writer) const
+// void ESM4::Potion::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Potion::blank()
+// void ESM4::Potion::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadalch.hpp b/components/esm4/loadalch.hpp
index dbc8b80f82..73d399df05 100644
--- a/components/esm4/loadalch.hpp
+++ b/components/esm4/loadalch.hpp
@@ -50,12 +50,12 @@ namespace ESM4
             std::int32_t value;
             std::uint32_t flags;
             FormId withdrawl;
-            float  chanceAddition;
+            float chanceAddition;
             FormId sound;
         };
 #pragma pack(pop)
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -76,9 +76,9 @@ namespace ESM4
         EnchantedItem mItem;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadaloc.cpp b/components/esm4/loadaloc.cpp
index 29defdef23..6039e0ead8 100644
--- a/components/esm4/loadaloc.cpp
+++ b/components/esm4/loadaloc.cpp
@@ -26,8 +26,8 @@
 */
 #include "loadaloc.hpp"
 
-#include <stdexcept>
 #include <cstring>
+#include <stdexcept>
 //#include <iostream> // FIXME: for debugging only
 //#include <iomanip>  // FIXME: for debugging only
 
@@ -42,15 +42,19 @@ void ESM4::MediaLocationController::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
-            case ESM4::SUB_FULL: reader.getZString(mFullName);  break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getZString(mFullName);
+                break;
             case ESM4::SUB_GNAM:
             {
                 FormId id;
@@ -99,7 +103,9 @@ void ESM4::MediaLocationController::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_RNAM: reader.getFormId(mConditionalFaction); break;
+            case ESM4::SUB_RNAM:
+                reader.getFormId(mConditionalFaction);
+                break;
             case ESM4::SUB_NAM1:
             {
                 reader.get(mMediaFlags);
@@ -108,10 +114,18 @@ void ESM4::MediaLocationController::load(ESM4::Reader& reader)
                 mMediaFlags.factionNotFound = flags & 0x0F; // WARN: overwriting data
                 break;
             }
-            case ESM4::SUB_NAM4: reader.get(mLocationDelay); break;
-            case ESM4::SUB_NAM7: reader.get(mRetriggerDelay); break;
-            case ESM4::SUB_NAM5: reader.get(mDayStart); break;
-            case ESM4::SUB_NAM6: reader.get(mNightStart); break;
+            case ESM4::SUB_NAM4:
+                reader.get(mLocationDelay);
+                break;
+            case ESM4::SUB_NAM7:
+                reader.get(mRetriggerDelay);
+                break;
+            case ESM4::SUB_NAM5:
+                reader.get(mDayStart);
+                break;
+            case ESM4::SUB_NAM6:
+                reader.get(mNightStart);
+                break;
             case ESM4::SUB_NAM2: // always 0? 4 bytes
             case ESM4::SUB_NAM3: // always 0? 4 bytes
             case ESM4::SUB_FNAM: // always 0? 4 bytes
@@ -135,25 +149,25 @@ void ESM4::MediaLocationController::load(ESM4::Reader& reader)
                 }
                 std::cout << ss.str() << std::endl;
 #else
-                //std::cout << "ALOC " << ESM::printName(subHdr.typeId) << " skipping..."
-                          //<< subHdr.dataSize << std::endl;
+                // std::cout << "ALOC " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
 #endif
                 break;
             }
             default:
-                //std::cout << "ALOC " << ESM::printName(subHdr.typeId) << " skipping..."
-                          //<< subHdr.dataSize << std::endl;
-                //reader.skipSubRecordData();
+                // std::cout << "ALOC " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
+                // reader.skipSubRecordData();
                 throw std::runtime_error("ESM4::ALOC::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
         }
     }
 }
 
-//void ESM4::MediaLocationController::save(ESM4::Writer& writer) const
+// void ESM4::MediaLocationController::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::MediaLocationController::blank()
+// void ESM4::MediaLocationController::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadaloc.hpp b/components/esm4/loadaloc.hpp
index 3c5ae39f55..8773091eb9 100644
--- a/components/esm4/loadaloc.hpp
+++ b/components/esm4/loadaloc.hpp
@@ -52,7 +52,7 @@ namespace ESM4
 
     struct MediaLocationController
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -76,9 +76,9 @@ namespace ESM4
         std::uint32_t mNightStart;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadammo.cpp b/components/esm4/loadammo.cpp
index 16cd7cab1c..a30189aa97 100644
--- a/components/esm4/loadammo.cpp
+++ b/components/esm4/loadammo.cpp
@@ -35,7 +35,7 @@ void ESM4::Ammunition::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
     std::uint32_t esmVer = reader.esmVersion();
     bool isFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
 
@@ -44,11 +44,15 @@ void ESM4::Ammunition::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
             case ESM4::SUB_DATA:
             {
-                //if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
+                // if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
                 if (subHdr.dataSize == 16) // FO3 has 13 bytes even though VER_094
                 {
                     FormId projectile;
@@ -81,15 +85,33 @@ void ESM4::Ammunition::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
-            case ESM4::SUB_MICO: reader.getZString(mMiniIcon); break; // FO3
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
-            case ESM4::SUB_ANAM: reader.get(mEnchantmentPoints); break;
-            case ESM4::SUB_ENAM: reader.getFormId(mEnchantment); break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
-            case ESM4::SUB_DESC: reader.getLocalizedString(mText); break;
-            case ESM4::SUB_YNAM: reader.getFormId(mPickUpSound); break;
-            case ESM4::SUB_ZNAM: reader.getFormId(mDropSound); break;
+            case ESM4::SUB_ICON:
+                reader.getZString(mIcon);
+                break;
+            case ESM4::SUB_MICO:
+                reader.getZString(mMiniIcon);
+                break; // FO3
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_ANAM:
+                reader.get(mEnchantmentPoints);
+                break;
+            case ESM4::SUB_ENAM:
+                reader.getFormId(mEnchantment);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
+            case ESM4::SUB_DESC:
+                reader.getLocalizedString(mText);
+                break;
+            case ESM4::SUB_YNAM:
+                reader.getFormId(mPickUpSound);
+                break;
+            case ESM4::SUB_ZNAM:
+                reader.getFormId(mDropSound);
+                break;
             case ESM4::SUB_MODT:
             case ESM4::SUB_OBND:
             case ESM4::SUB_KSIZ:
@@ -100,7 +122,7 @@ void ESM4::Ammunition::load(ESM4::Reader& reader)
             case ESM4::SUB_RCIL: // FONV
             case ESM4::SUB_SCRI: // FONV
             {
-                //std::cout << "AMMO " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "AMMO " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -110,10 +132,10 @@ void ESM4::Ammunition::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Ammunition::save(ESM4::Writer& writer) const
+// void ESM4::Ammunition::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Ammunition::blank()
+// void ESM4::Ammunition::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadammo.hpp b/components/esm4/loadammo.hpp
index b399245a1b..d23cc3c547 100644
--- a/components/esm4/loadammo.hpp
+++ b/components/esm4/loadammo.hpp
@@ -41,17 +41,25 @@ namespace ESM4
     {
         struct Data // FIXME: TES5 projectile, damage (float)
         {
-            float         speed;
+            float speed;
             std::uint32_t flags;
-            std::uint32_t value;   // gold
-            float         weight;
+            std::uint32_t value; // gold
+            float weight;
             std::uint16_t damage;
-            std::uint8_t  clipRounds; // only in FO3/FONV
-
-            Data() : speed(0.f), flags(0), value(0), weight(0.f), damage(0), clipRounds(0) {}
+            std::uint8_t clipRounds; // only in FO3/FONV
+
+            Data()
+                : speed(0.f)
+                , flags(0)
+                , value(0)
+                , weight(0.f)
+                , damage(0)
+                , clipRounds(0)
+            {
+            }
         };
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -72,9 +80,9 @@ namespace ESM4
         Data mData;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadanio.cpp b/components/esm4/loadanio.cpp
index 86441e36ee..2fadc6c9c2 100644
--- a/components/esm4/loadanio.cpp
+++ b/components/esm4/loadanio.cpp
@@ -35,22 +35,32 @@ void ESM4::AnimObject::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_MODL: reader.getZString(mModel);    break;
-            case ESM4::SUB_BNAM: reader.getZString(mUnloadEvent); break;
-            case ESM4::SUB_DATA: reader.getFormId(mIdleAnim);  break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);     break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_BNAM:
+                reader.getZString(mUnloadEvent);
+                break;
+            case ESM4::SUB_DATA:
+                reader.getFormId(mIdleAnim);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
             case ESM4::SUB_MODT: // TES5 only
             case ESM4::SUB_MODS: // TES5 only
             {
-                //std::cout << "ANIO " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "ANIO " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -60,10 +70,10 @@ void ESM4::AnimObject::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::AnimObject::save(ESM4::Writer& writer) const
+// void ESM4::AnimObject::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::AnimObject::blank()
+// void ESM4::AnimObject::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadanio.hpp b/components/esm4/loadanio.hpp
index 5e40b5f9d8..4d27ed7a5c 100644
--- a/components/esm4/loadanio.hpp
+++ b/components/esm4/loadanio.hpp
@@ -39,7 +39,7 @@ namespace ESM4
 
     struct AnimObject
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -47,13 +47,13 @@ namespace ESM4
 
         float mBoundRadius;
 
-        FormId mIdleAnim;         // only in TES4
+        FormId mIdleAnim; // only in TES4
         std::string mUnloadEvent; // only in TES5
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadappa.cpp b/components/esm4/loadappa.cpp
index a7814d99c4..72369b7e0e 100644
--- a/components/esm4/loadappa.cpp
+++ b/components/esm4/loadappa.cpp
@@ -35,15 +35,19 @@ void ESM4::Apparatus::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
             case ESM4::SUB_DATA:
             {
                 if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
@@ -60,16 +64,26 @@ void ESM4::Apparatus::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
-            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
-            case ESM4::SUB_DESC: reader.getLocalizedString(mText); break;
+            case ESM4::SUB_ICON:
+                reader.getZString(mIcon);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_SCRI:
+                reader.getFormId(mScriptId);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
+            case ESM4::SUB_DESC:
+                reader.getLocalizedString(mText);
+                break;
             case ESM4::SUB_MODT:
             case ESM4::SUB_OBND:
             case ESM4::SUB_QUAL:
             {
-                //std::cout << "APPA " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "APPA " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -79,10 +93,10 @@ void ESM4::Apparatus::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Apparatus::save(ESM4::Writer& writer) const
+// void ESM4::Apparatus::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Apparatus::blank()
+// void ESM4::Apparatus::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadappa.hpp b/components/esm4/loadappa.hpp
index 7e4e48ce5a..ef4952b68e 100644
--- a/components/esm4/loadappa.hpp
+++ b/components/esm4/loadappa.hpp
@@ -41,13 +41,13 @@ namespace ESM4
     {
         struct Data
         {
-            std::uint8_t  type;  // 0 = Mortar and Pestle, 1 = Alembic, 2 = Calcinator, 3 = Retort
+            std::uint8_t type; // 0 = Mortar and Pestle, 1 = Alembic, 2 = Calcinator, 3 = Retort
             std::uint32_t value; // gold
-            float         weight;
-            float         quality;
+            float weight;
+            float quality;
         };
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -63,9 +63,9 @@ namespace ESM4
         Data mData;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadarma.cpp b/components/esm4/loadarma.cpp
index 389a5b122c..aaed806ff5 100644
--- a/components/esm4/loadarma.cpp
+++ b/components/esm4/loadarma.cpp
@@ -36,7 +36,7 @@ void ESM4::ArmorAddon::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     std::uint32_t esmVer = reader.esmVersion();
 
@@ -45,22 +45,34 @@ void ESM4::ArmorAddon::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_MOD2: reader.getZString(mModelMale); break;
-            case ESM4::SUB_MOD3: reader.getZString(mModelFemale); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_MOD2:
+                reader.getZString(mModelMale);
+                break;
+            case ESM4::SUB_MOD3:
+                reader.getZString(mModelFemale);
+                break;
             case ESM4::SUB_MOD4:
             case ESM4::SUB_MOD5:
             {
                 std::string model;
                 reader.getZString(model);
 
-                //std::cout << mEditorId << " " << ESM::printName(subHdr.typeId) << " " << model << std::endl;
+                // std::cout << mEditorId << " " << ESM::printName(subHdr.typeId) << " " << model << std::endl;
 
                 break;
             }
-            case ESM4::SUB_NAM0: reader.getFormId(mTextureMale); break;
-            case ESM4::SUB_NAM1: reader.getFormId(mTextureFemale); break;
-            case ESM4::SUB_RNAM: reader.getFormId(mRacePrimary); break;
+            case ESM4::SUB_NAM0:
+                reader.getFormId(mTextureMale);
+                break;
+            case ESM4::SUB_NAM1:
+                reader.getFormId(mTextureFemale);
+                break;
+            case ESM4::SUB_RNAM:
+                reader.getFormId(mRacePrimary);
+                break;
             case ESM4::SUB_MODL:
             {
                 if ((esmVer == ESM::VER_094 || esmVer == ESM::VER_170) && subHdr.dataSize == 4) // TES5
@@ -119,7 +131,7 @@ void ESM4::ArmorAddon::load(ESM4::Reader& reader)
             case ESM4::SUB_MODD: // FO3 // FIXME: should group with MODL
             case ESM4::SUB_OBND: // FO3
             {
-                //std::cout << "ARMA " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "ARMA " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -129,10 +141,10 @@ void ESM4::ArmorAddon::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::ArmorAddon::save(ESM4::Writer& writer) const
+// void ESM4::ArmorAddon::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::ArmorAddon::blank()
+// void ESM4::ArmorAddon::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadarma.hpp b/components/esm4/loadarma.hpp
index 8bee9d0396..d72aef0b13 100644
--- a/components/esm4/loadarma.hpp
+++ b/components/esm4/loadarma.hpp
@@ -31,8 +31,8 @@
 #include <string>
 #include <vector>
 
-#include "formid.hpp"
 #include "actor.hpp" // BodyTemplate
+#include "formid.hpp"
 
 namespace ESM4
 {
@@ -41,7 +41,7 @@ namespace ESM4
 
     struct ArmorAddon
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -58,9 +58,9 @@ namespace ESM4
         BodyTemplate mBodyTemplate; // TES5
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadarmo.cpp b/components/esm4/loadarmo.cpp
index b2b43e1111..eebacb516f 100644
--- a/components/esm4/loadarmo.cpp
+++ b/components/esm4/loadarmo.cpp
@@ -36,7 +36,7 @@ void ESM4::Armor::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
     std::uint32_t esmVer = reader.esmVersion();
     mIsFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
 
@@ -45,11 +45,15 @@ void ESM4::Armor::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
             case ESM4::SUB_DATA:
             {
-                //if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
+                // if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
                 if (subHdr.dataSize == 8) // FO3 has 12 bytes even though VER_094
                 {
                     reader.get(mData.value);
@@ -72,7 +76,7 @@ void ESM4::Armor::load(ESM4::Reader& reader)
             }
             case ESM4::SUB_MODL: // seems only for Dawnguard/Dragonborn?
             {
-                //if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || isFONV)
+                // if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || isFONV)
                 if (subHdr.dataSize == 4) // FO3 has zstring even though VER_094
                 {
                     FormId formId;
@@ -83,18 +87,32 @@ void ESM4::Armor::load(ESM4::Reader& reader)
                 else
                 {
                     if (!reader.getZString(mModelMale))
-                        throw std::runtime_error ("ARMO MODL data read error");
+                        throw std::runtime_error("ARMO MODL data read error");
                 }
 
                 break;
             }
-            case ESM4::SUB_MOD2: reader.getZString(mModelMaleWorld);break;
-            case ESM4::SUB_MOD3: reader.getZString(mModelFemale); break;
-            case ESM4::SUB_MOD4: reader.getZString(mModelFemaleWorld); break;
-            case ESM4::SUB_ICON: reader.getZString(mIconMale);   break;
-            case ESM4::SUB_MICO: reader.getZString(mMiniIconMale);   break;
-            case ESM4::SUB_ICO2: reader.getZString(mIconFemale); break;
-            case ESM4::SUB_MIC2: reader.getZString(mMiniIconFemale); break;
+            case ESM4::SUB_MOD2:
+                reader.getZString(mModelMaleWorld);
+                break;
+            case ESM4::SUB_MOD3:
+                reader.getZString(mModelFemale);
+                break;
+            case ESM4::SUB_MOD4:
+                reader.getZString(mModelFemaleWorld);
+                break;
+            case ESM4::SUB_ICON:
+                reader.getZString(mIconMale);
+                break;
+            case ESM4::SUB_MICO:
+                reader.getZString(mMiniIconMale);
+                break;
+            case ESM4::SUB_ICO2:
+                reader.getZString(mIconFemale);
+                break;
+            case ESM4::SUB_MIC2:
+                reader.getZString(mMiniIconFemale);
+                break;
             case ESM4::SUB_BMDT:
             {
                 if (subHdr.dataSize == 8) // FO3
@@ -104,7 +122,7 @@ void ESM4::Armor::load(ESM4::Reader& reader)
                     mGeneralFlags &= 0x000000ff;
                     mGeneralFlags |= TYPE_FO3;
                 }
-                else                      // TES4
+                else // TES4
                 {
                     reader.get(mArmorFlags);
                     mGeneralFlags = (mArmorFlags & 0x00ff0000) >> 16;
@@ -118,7 +136,7 @@ void ESM4::Armor::load(ESM4::Reader& reader)
                 uint32_t flags = 0;
                 if (subHdr.dataSize == 12)
                     reader.get(flags);
-                reader.get(mGeneralFlags);   // skill
+                reader.get(mGeneralFlags); // skill
                 mGeneralFlags &= 0x0000000f; // 0 (light), 1 (heavy) or 2 (none)
                 if (subHdr.dataSize == 12)
                     mGeneralFlags |= (flags & 0x0000000f) << 3;
@@ -133,13 +151,27 @@ void ESM4::Armor::load(ESM4::Reader& reader)
                 mGeneralFlags |= TYPE_TES5;
                 break;
             }
-            case ESM4::SUB_SCRI: reader.getFormId(mScriptId);      break;
-            case ESM4::SUB_ANAM: reader.get(mEnchantmentPoints); break;
-            case ESM4::SUB_ENAM: reader.getFormId(mEnchantment); break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);       break;
-            case ESM4::SUB_DESC: reader.getLocalizedString(mText); break;
-            case ESM4::SUB_YNAM: reader.getFormId(mPickUpSound); break;
-            case ESM4::SUB_ZNAM: reader.getFormId(mDropSound); break;
+            case ESM4::SUB_SCRI:
+                reader.getFormId(mScriptId);
+                break;
+            case ESM4::SUB_ANAM:
+                reader.get(mEnchantmentPoints);
+                break;
+            case ESM4::SUB_ENAM:
+                reader.getFormId(mEnchantment);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
+            case ESM4::SUB_DESC:
+                reader.getLocalizedString(mText);
+                break;
+            case ESM4::SUB_YNAM:
+                reader.getFormId(mPickUpSound);
+                break;
+            case ESM4::SUB_ZNAM:
+                reader.getFormId(mDropSound);
+                break;
             case ESM4::SUB_MODT:
             case ESM4::SUB_MO2B:
             case ESM4::SUB_MO3B:
@@ -171,7 +203,7 @@ void ESM4::Armor::load(ESM4::Reader& reader)
             case ESM4::SUB_BNAM: // FONV
             case ESM4::SUB_SNAM: // FONV
             {
-                //std::cout << "ARMO " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "ARMO " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -179,14 +211,14 @@ void ESM4::Armor::load(ESM4::Reader& reader)
                 throw std::runtime_error("ESM4::ARMO::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
         }
     }
-    //if ((mArmorFlags&0xffff) == 0x02) // only hair
-        //std::cout << "only hair " << mEditorId << std::endl;
+    // if ((mArmorFlags&0xffff) == 0x02) // only hair
+    // std::cout << "only hair " << mEditorId << std::endl;
 }
 
-//void ESM4::Armor::save(ESM4::Writer& writer) const
+// void ESM4::Armor::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Armor::blank()
+// void ESM4::Armor::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadarmo.hpp b/components/esm4/loadarmo.hpp
index e7f6fa5a7c..ccc28dc834 100644
--- a/components/esm4/loadarmo.hpp
+++ b/components/esm4/loadarmo.hpp
@@ -43,67 +43,67 @@ namespace ESM4
         // WARN: TES4 Armorflags still has the general flags high bits
         enum ArmorFlags
         {
-            TES4_Head        = 0x00000001,
-            TES4_Hair        = 0x00000002,
-            TES4_UpperBody   = 0x00000004,
-            TES4_LowerBody   = 0x00000008,
-            TES4_Hands       = 0x00000010,
-            TES4_Feet        = 0x00000020,
-            TES4_RightRing   = 0x00000040,
-            TES4_LeftRing    = 0x00000080,
-            TES4_Amulet      = 0x00000100,
-            TES4_Weapon      = 0x00000200,
-            TES4_BackWeapon  = 0x00000400,
-            TES4_SideWeapon  = 0x00000800,
-            TES4_Quiver      = 0x00001000,
-            TES4_Shield      = 0x00002000,
-            TES4_Torch       = 0x00004000,
-            TES4_Tail        = 0x00008000,
+            TES4_Head = 0x00000001,
+            TES4_Hair = 0x00000002,
+            TES4_UpperBody = 0x00000004,
+            TES4_LowerBody = 0x00000008,
+            TES4_Hands = 0x00000010,
+            TES4_Feet = 0x00000020,
+            TES4_RightRing = 0x00000040,
+            TES4_LeftRing = 0x00000080,
+            TES4_Amulet = 0x00000100,
+            TES4_Weapon = 0x00000200,
+            TES4_BackWeapon = 0x00000400,
+            TES4_SideWeapon = 0x00000800,
+            TES4_Quiver = 0x00001000,
+            TES4_Shield = 0x00002000,
+            TES4_Torch = 0x00004000,
+            TES4_Tail = 0x00008000,
             //
-            FO3_Head         = 0x00000001,
-            FO3_Hair         = 0x00000002,
-            FO3_UpperBody    = 0x00000004,
-            FO3_LeftHand     = 0x00000008,
-            FO3_RightHand    = 0x00000010,
-            FO3_Weapon       = 0x00000020,
-            FO3_PipBoy       = 0x00000040,
-            FO3_Backpack     = 0x00000080,
-            FO3_Necklace     = 0x00000100,
-            FO3_Headband     = 0x00000200,
-            FO3_Hat          = 0x00000400,
-            FO3_EyeGlasses   = 0x00000800,
-            FO3_NoseRing     = 0x00001000,
-            FO3_Earrings     = 0x00002000,
-            FO3_Mask         = 0x00004000,
-            FO3_Choker       = 0x00008000,
-            FO3_MouthObject  = 0x00010000,
-            FO3_BodyAddOn1   = 0x00020000,
-            FO3_BodyAddOn2   = 0x00040000,
-            FO3_BodyAddOn3   = 0x00080000,
+            FO3_Head = 0x00000001,
+            FO3_Hair = 0x00000002,
+            FO3_UpperBody = 0x00000004,
+            FO3_LeftHand = 0x00000008,
+            FO3_RightHand = 0x00000010,
+            FO3_Weapon = 0x00000020,
+            FO3_PipBoy = 0x00000040,
+            FO3_Backpack = 0x00000080,
+            FO3_Necklace = 0x00000100,
+            FO3_Headband = 0x00000200,
+            FO3_Hat = 0x00000400,
+            FO3_EyeGlasses = 0x00000800,
+            FO3_NoseRing = 0x00001000,
+            FO3_Earrings = 0x00002000,
+            FO3_Mask = 0x00004000,
+            FO3_Choker = 0x00008000,
+            FO3_MouthObject = 0x00010000,
+            FO3_BodyAddOn1 = 0x00020000,
+            FO3_BodyAddOn2 = 0x00040000,
+            FO3_BodyAddOn3 = 0x00080000,
             //
-            TES5_Head        = 0x00000001,
-            TES5_Hair        = 0x00000002,
-            TES5_Body        = 0x00000004,
-            TES5_Hands       = 0x00000008,
-            TES5_Forearms    = 0x00000010,
-            TES5_Amulet      = 0x00000020,
-            TES5_Ring        = 0x00000040,
-            TES5_Feet        = 0x00000080,
-            TES5_Calves      = 0x00000100,
-            TES5_Shield      = 0x00000200,
-            TES5_Tail        = 0x00000400,
-            TES5_LongHair    = 0x00000800,
-            TES5_Circlet     = 0x00001000,
-            TES5_Ears        = 0x00002000,
-            TES5_BodyAddOn3  = 0x00004000,
-            TES5_BodyAddOn4  = 0x00008000,
-            TES5_BodyAddOn5  = 0x00010000,
-            TES5_BodyAddOn6  = 0x00020000,
-            TES5_BodyAddOn7  = 0x00040000,
-            TES5_BodyAddOn8  = 0x00080000,
-            TES5_DecapHead   = 0x00100000,
-            TES5_Decapitate  = 0x00200000,
-            TES5_BodyAddOn9  = 0x00400000,
+            TES5_Head = 0x00000001,
+            TES5_Hair = 0x00000002,
+            TES5_Body = 0x00000004,
+            TES5_Hands = 0x00000008,
+            TES5_Forearms = 0x00000010,
+            TES5_Amulet = 0x00000020,
+            TES5_Ring = 0x00000040,
+            TES5_Feet = 0x00000080,
+            TES5_Calves = 0x00000100,
+            TES5_Shield = 0x00000200,
+            TES5_Tail = 0x00000400,
+            TES5_LongHair = 0x00000800,
+            TES5_Circlet = 0x00001000,
+            TES5_Ears = 0x00002000,
+            TES5_BodyAddOn3 = 0x00004000,
+            TES5_BodyAddOn4 = 0x00008000,
+            TES5_BodyAddOn5 = 0x00010000,
+            TES5_BodyAddOn6 = 0x00020000,
+            TES5_BodyAddOn7 = 0x00040000,
+            TES5_BodyAddOn8 = 0x00080000,
+            TES5_DecapHead = 0x00100000,
+            TES5_Decapitate = 0x00200000,
+            TES5_BodyAddOn9 = 0x00400000,
             TES5_BodyAddOn10 = 0x00800000,
             TES5_BodyAddOn11 = 0x01000000,
             TES5_BodyAddOn12 = 0x02000000,
@@ -112,30 +112,30 @@ namespace ESM4
             TES5_BodyAddOn15 = 0x10000000,
             TES5_BodyAddOn16 = 0x20000000,
             TES5_BodyAddOn17 = 0x40000000,
-            TES5_FX01        = 0x80000000
+            TES5_FX01 = 0x80000000
         };
 
         enum GeneralFlags
         {
-            TYPE_TES4        = 0x1000,
-            TYPE_FO3         = 0x2000,
-            TYPE_TES5        = 0x3000,
-            TYPE_FONV        = 0x4000,
+            TYPE_TES4 = 0x1000,
+            TYPE_FO3 = 0x2000,
+            TYPE_TES5 = 0x3000,
+            TYPE_FONV = 0x4000,
             //
-            TES4_HideRings   = 0x0001,
-            TES4_HideAmulet  = 0x0002,
+            TES4_HideRings = 0x0001,
+            TES4_HideAmulet = 0x0002,
             TES4_NonPlayable = 0x0040,
-            TES4_HeavyArmor  = 0x0080,
+            TES4_HeavyArmor = 0x0080,
             //
-            FO3_PowerArmor   = 0x0020,
-            FO3_NonPlayable  = 0x0040,
-            FO3_HeavyArmor   = 0x0080,
+            FO3_PowerArmor = 0x0020,
+            FO3_NonPlayable = 0x0040,
+            FO3_HeavyArmor = 0x0080,
             //
-            TES5_LightArmor  = 0x0000,
-            TES5_HeavyArmor  = 0x0001,
-            TES5_None        = 0x0002,
-            TES5_ModVoice    = 0x0004, // note bit shift
-            TES5_NonPlayable = 0x0040  // note bit shift
+            TES5_LightArmor = 0x0000,
+            TES5_HeavyArmor = 0x0001,
+            TES5_None = 0x0002,
+            TES5_ModVoice = 0x0004, // note bit shift
+            TES5_NonPlayable = 0x0040 // note bit shift
         };
 
 #pragma pack(push, 1)
@@ -144,11 +144,11 @@ namespace ESM4
             std::uint16_t armor; // only in TES4?
             std::uint32_t value;
             std::uint32_t health; // not in TES5?
-            float         weight;
+            float weight;
         };
 #pragma pack(pop)
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         bool mIsTES4; // TODO: check that these match the general flags
@@ -176,17 +176,17 @@ namespace ESM4
 
         std::uint32_t mArmorFlags;
         std::uint32_t mGeneralFlags;
-        FormId        mScriptId;
+        FormId mScriptId;
         std::uint16_t mEnchantmentPoints;
-        FormId        mEnchantment;
+        FormId mEnchantment;
 
         std::vector<FormId> mAddOns; // TES5 ARMA
         Data mData;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadaspc.cpp b/components/esm4/loadaspc.cpp
index b1e856056a..acfa28085b 100644
--- a/components/esm4/loadaspc.cpp
+++ b/components/esm4/loadaspc.cpp
@@ -36,15 +36,19 @@ void ESM4::AcousticSpace::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
-            case ESM4::SUB_ANAM: reader.get(mEnvironmentType); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_ANAM:
+                reader.get(mEnvironmentType);
+                break;
             case ESM4::SUB_SNAM:
             {
                 FormId id;
@@ -52,20 +56,24 @@ void ESM4::AcousticSpace::load(ESM4::Reader& reader)
                 mAmbientLoopSounds.push_back(id);
                 break;
             }
-            case ESM4::SUB_RDAT: reader.getFormId(mSoundRegion); break;
-            case ESM4::SUB_INAM: reader.get(mIsInterior); break;
+            case ESM4::SUB_RDAT:
+                reader.getFormId(mSoundRegion);
+                break;
+            case ESM4::SUB_INAM:
+                reader.get(mIsInterior);
+                break;
             case ESM4::SUB_WNAM: // usually 0 for FONV (maybe # of close Actors for Walla to trigger)
             {
                 std::uint32_t dummy;
                 reader.get(dummy);
-                //std::cout << "WNAM " << mEditorId << " " << dummy << std::endl;
+                // std::cout << "WNAM " << mEditorId << " " << dummy << std::endl;
                 break;
             }
             case ESM4::SUB_BNAM: // TES5 reverb formid
             case ESM4::SUB_OBND:
             {
-                //std::cout << "ASPC " << ESM::printName(subHdr.typeId) << " skipping..."
-                          //<< subHdr.dataSize << std::endl;
+                // std::cout << "ASPC " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -75,10 +83,10 @@ void ESM4::AcousticSpace::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::AcousticSpace::save(ESM4::Writer& writer) const
+// void ESM4::AcousticSpace::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::AcousticSpace::blank()
+// void ESM4::AcousticSpace::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadaspc.hpp b/components/esm4/loadaspc.hpp
index 9fd17ea27c..6979f59708 100644
--- a/components/esm4/loadaspc.hpp
+++ b/components/esm4/loadaspc.hpp
@@ -40,7 +40,7 @@ namespace ESM4
 
     struct AcousticSpace
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -54,9 +54,9 @@ namespace ESM4
         std::uint32_t mIsInterior; // if true only use mAmbientLoopSounds[0]
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadbook.cpp b/components/esm4/loadbook.cpp
index c17ef102be..3419ad4c12 100644
--- a/components/esm4/loadbook.cpp
+++ b/components/esm4/loadbook.cpp
@@ -35,21 +35,27 @@ void ESM4::Book::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
-    //std::uint32_t esmVer = reader.esmVersion(); // currently unused
+    mFlags = reader.hdr().record.flags;
+    // std::uint32_t esmVer = reader.esmVersion(); // currently unused
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
-            case ESM4::SUB_DESC: reader.getLocalizedString(mText); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
+            case ESM4::SUB_DESC:
+                reader.getLocalizedString(mText);
+                break;
             case ESM4::SUB_DATA:
             {
                 reader.get(mData.flags);
-                //if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
+                // if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
                 if (subHdr.dataSize == 16) // FO3 has 10 bytes even though VER_094
                 {
                     static std::uint8_t dummy;
@@ -66,14 +72,30 @@ void ESM4::Book::load(ESM4::Reader& reader)
                 reader.get(mData.weight);
                 break;
             }
-            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
-            case ESM4::SUB_SCRI: reader.getFormId(mScriptId);      break;
-            case ESM4::SUB_ANAM: reader.get(mEnchantmentPoints); break;
-            case ESM4::SUB_ENAM: reader.getFormId(mEnchantment); break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
-            case ESM4::SUB_YNAM: reader.getFormId(mPickUpSound); break;
-            case ESM4::SUB_ZNAM: reader.getFormId(mDropSound); break; // TODO: does this exist?
+            case ESM4::SUB_ICON:
+                reader.getZString(mIcon);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_SCRI:
+                reader.getFormId(mScriptId);
+                break;
+            case ESM4::SUB_ANAM:
+                reader.get(mEnchantmentPoints);
+                break;
+            case ESM4::SUB_ENAM:
+                reader.getFormId(mEnchantment);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
+            case ESM4::SUB_YNAM:
+                reader.getFormId(mPickUpSound);
+                break;
+            case ESM4::SUB_ZNAM:
+                reader.getFormId(mDropSound);
+                break; // TODO: does this exist?
             case ESM4::SUB_MODT:
             case ESM4::SUB_OBND:
             case ESM4::SUB_KSIZ:
@@ -82,7 +104,7 @@ void ESM4::Book::load(ESM4::Reader& reader)
             case ESM4::SUB_INAM:
             case ESM4::SUB_VMAD:
             {
-                //std::cout << "BOOK " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "BOOK " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -92,10 +114,10 @@ void ESM4::Book::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Book::save(ESM4::Writer& writer) const
+// void ESM4::Book::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Book::blank()
+// void ESM4::Book::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadbook.hpp b/components/esm4/loadbook.hpp
index a1176a3320..bbdbf12fe5 100644
--- a/components/esm4/loadbook.hpp
+++ b/components/esm4/loadbook.hpp
@@ -47,41 +47,41 @@ namespace ESM4
 
         enum BookSkill // for TES4 only
         {
-            BookSkill_None        = -1,
-            BookSkill_Armorer     =  0,
-            BookSkill_Athletics   =  1,
-            BookSkill_Blade       =  2,
-            BookSkill_Block       =  3,
-            BookSkill_Blunt       =  4,
-            BookSkill_HandToHand  =  5,
-            BookSkill_HeavyArmor  =  6,
-            BookSkill_Alchemy     =  7,
-            BookSkill_Alteration  =  8,
-            BookSkill_Conjuration =  9,
+            BookSkill_None = -1,
+            BookSkill_Armorer = 0,
+            BookSkill_Athletics = 1,
+            BookSkill_Blade = 2,
+            BookSkill_Block = 3,
+            BookSkill_Blunt = 4,
+            BookSkill_HandToHand = 5,
+            BookSkill_HeavyArmor = 6,
+            BookSkill_Alchemy = 7,
+            BookSkill_Alteration = 8,
+            BookSkill_Conjuration = 9,
             BookSkill_Destruction = 10,
-            BookSkill_Illusion    = 11,
-            BookSkill_Mysticism   = 12,
+            BookSkill_Illusion = 11,
+            BookSkill_Mysticism = 12,
             BookSkill_Restoration = 13,
-            BookSkill_Acrobatics  = 14,
-            BookSkill_LightArmor  = 15,
-            BookSkill_Marksman    = 16,
-            BookSkill_Mercantile  = 17,
-            BookSkill_Security    = 18,
-            BookSkill_Sneak       = 19,
+            BookSkill_Acrobatics = 14,
+            BookSkill_LightArmor = 15,
+            BookSkill_Marksman = 16,
+            BookSkill_Mercantile = 17,
+            BookSkill_Security = 18,
+            BookSkill_Sneak = 19,
             BookSkill_Speechcraft = 20
         };
 
         struct Data
         {
-            std::uint8_t  flags;
-            std::uint8_t  type;    // TES5 only
+            std::uint8_t flags;
+            std::uint8_t type; // TES5 only
             std::uint32_t teaches; // TES5 only
             std::int8_t bookSkill; // not in TES5
             std::uint32_t value;
-            float         weight;
+            float weight;
         };
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -91,10 +91,10 @@ namespace ESM4
         float mBoundRadius;
 
         std::string mText;
-        FormId      mScriptId;
+        FormId mScriptId;
         std::string mIcon;
         std::uint16_t mEnchantmentPoints;
-        FormId      mEnchantment;
+        FormId mEnchantment;
 
         Data mData;
 
@@ -102,9 +102,9 @@ namespace ESM4
         FormId mDropSound;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadbptd.cpp b/components/esm4/loadbptd.cpp
index da40df0de9..9bc6844388 100644
--- a/components/esm4/loadbptd.cpp
+++ b/components/esm4/loadbptd.cpp
@@ -26,9 +26,9 @@
 */
 #include "loadbptd.hpp"
 
-#include <stdexcept>
-#include <iostream> // FIXME: testing only
 #include <cstring>
+#include <iostream> // FIXME: testing only
+#include <stdexcept>
 
 #include "reader.hpp"
 //#include "writer.hpp"
@@ -48,7 +48,7 @@ void ESM4::BodyPartData::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     BodyPart bodyPart;
     bodyPart.clear();
@@ -58,15 +58,33 @@ void ESM4::BodyPartData::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
-            case ESM4::SUB_BPTN: reader.getLocalizedString(bodyPart.mPartName); break;
-            case ESM4::SUB_BPNN: reader.getZString(bodyPart.mNodeName); break;
-            case ESM4::SUB_BPNT: reader.getZString(bodyPart.mVATSTarget); break;
-            case ESM4::SUB_BPNI: reader.getZString(bodyPart.mIKStartNode); break;
-            case ESM4::SUB_BPND: reader.get(bodyPart.mData); break;
-            case ESM4::SUB_NAM1: reader.getZString(bodyPart.mLimbReplacementModel); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_BPTN:
+                reader.getLocalizedString(bodyPart.mPartName);
+                break;
+            case ESM4::SUB_BPNN:
+                reader.getZString(bodyPart.mNodeName);
+                break;
+            case ESM4::SUB_BPNT:
+                reader.getZString(bodyPart.mVATSTarget);
+                break;
+            case ESM4::SUB_BPNI:
+                reader.getZString(bodyPart.mIKStartNode);
+                break;
+            case ESM4::SUB_BPND:
+                reader.get(bodyPart.mData);
+                break;
+            case ESM4::SUB_NAM1:
+                reader.getZString(bodyPart.mLimbReplacementModel);
+                break;
             case ESM4::SUB_NAM4: // FIXME: assumed occurs last
             {
                 reader.getZString(bodyPart.mGoreEffectsTarget); // target bone
@@ -81,7 +99,7 @@ void ESM4::BodyPartData::load(ESM4::Reader& reader)
             case ESM4::SUB_MODS:
             case ESM4::SUB_MODT:
             {
-                //std::cout << "BPTD " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "BPTD " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -90,14 +108,14 @@ void ESM4::BodyPartData::load(ESM4::Reader& reader)
         }
     }
 
-    //if (mEditorId == "DefaultBodyPartData")
-        //std::cout << "BPTD: " << mEditorId << std::endl; // FIXME: testing only
+    // if (mEditorId == "DefaultBodyPartData")
+    // std::cout << "BPTD: " << mEditorId << std::endl; // FIXME: testing only
 }
 
-//void ESM4::BodyPartData::save(ESM4::Writer& writer) const
+// void ESM4::BodyPartData::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::BodyPartData::blank()
+// void ESM4::BodyPartData::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadbptd.hpp b/components/esm4/loadbptd.hpp
index f831a53653..d92727743f 100644
--- a/components/esm4/loadbptd.hpp
+++ b/components/esm4/loadbptd.hpp
@@ -61,7 +61,7 @@ namespace ESM4
             std::uint8_t partType;
 
             std::uint8_t healthPercent;
-            std::int8_t  actorValue; //(Actor Values)
+            std::int8_t actorValue; //(Actor Values)
             std::uint8_t toHitChance;
 
             std::uint8_t explExplosionChance; // %
@@ -76,7 +76,7 @@ namespace ESM4
             FormId sevExplosion;
             float sevDebrisScale;
 
-            //Struct - Gore Effects Positioning
+            // Struct - Gore Effects Positioning
             float transX;
             float transY;
             float transZ;
@@ -106,7 +106,7 @@ namespace ESM4
             void clear();
         };
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -116,9 +116,9 @@ namespace ESM4
         std::vector<BodyPart> mBodyParts;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadcell.cpp b/components/esm4/loadcell.cpp
index 6da827499d..919c81b8e9 100644
--- a/components/esm4/loadcell.cpp
+++ b/components/esm4/loadcell.cpp
@@ -31,8 +31,8 @@
 #endif
 
 #include <cassert>
-#include <stdexcept>
 #include <cfloat> // FLT_MAX for gcc
+#include <stdexcept>
 
 #include <iostream> // FIXME: debug only
 
@@ -50,7 +50,7 @@ void ESM4::Cell::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
     mParent = reader.currWorld();
 
     reader.clearCellGrid(); // clear until XCLC FIXME: somehow do this automatically?
@@ -59,13 +59,13 @@ void ESM4::Cell::load(ESM4::Reader& reader)
     // To workaround this issue put a default value if group is "exterior sub cell" and its
     // grid from label is "0 0".  Note the reversed X/Y order (no matter since they're both 0
     // anyway).
-    if (reader.grp().type == ESM4::Grp_ExteriorSubCell
-            && reader.grp().label.grid[1] == 0 && reader.grp().label.grid[0] == 0)
+    if (reader.grp().type == ESM4::Grp_ExteriorSubCell && reader.grp().label.grid[1] == 0
+        && reader.grp().label.grid[0] == 0)
     {
         ESM4::CellGrid currCellGrid;
         currCellGrid.grid.x = 0;
         currCellGrid.grid.y = 0;
-        reader.setCurrCellGrid(currCellGrid);  // side effect: sets mCellGridValid  true
+        reader.setCurrCellGrid(currCellGrid); // side effect: sets mCellGridValid  true
     }
 
     // WARN: we need to call setCurrCell (and maybe setCurrCellGrid?) again before loading
@@ -83,7 +83,7 @@ void ESM4::Cell::load(ESM4::Reader& reader)
             case ESM4::SUB_EDID:
             {
                 if (!reader.getZString(mEditorId))
-                    throw std::runtime_error ("CELL EDID data read error");
+                    throw std::runtime_error("CELL EDID data read error");
 #if 0
                 std::string padding;
                 padding.insert(0, reader.stackSize()*2, ' ');
@@ -94,7 +94,7 @@ void ESM4::Cell::load(ESM4::Reader& reader)
             case ESM4::SUB_XCLC:
             {
                 //(X, Y) grid location of the cell followed by flags. Always in
-                //exterior cells and never in interior cells.
+                // exterior cells and never in interior cells.
                 //
                 //    int32 - X
                 //    int32 - Y
@@ -127,7 +127,9 @@ void ESM4::Cell::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
             case ESM4::SUB_DATA:
             {
                 if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || isFONV)
@@ -151,7 +153,7 @@ void ESM4::Cell::load(ESM4::Reader& reader)
             }
             case ESM4::SUB_XCLR: // for exterior cells
             {
-                mRegions.resize(subHdr.dataSize/sizeof(FormId));
+                mRegions.resize(subHdr.dataSize / sizeof(FormId));
                 for (std::vector<FormId>::iterator it = mRegions.begin(); it != mRegions.end(); ++it)
                 {
                     reader.getFormId(*it);
@@ -163,11 +165,21 @@ void ESM4::Cell::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_XOWN: reader.getFormId(mOwner);   break;
-            case ESM4::SUB_XGLB: reader.getFormId(mGlobal);  break; // Oblivion only?
-            case ESM4::SUB_XCCM: reader.getFormId(mClimate); break;
-            case ESM4::SUB_XCWT: reader.getFormId(mWater);   break;
-            case ESM4::SUB_XCLW: reader.get(mWaterHeight);   break;
+            case ESM4::SUB_XOWN:
+                reader.getFormId(mOwner);
+                break;
+            case ESM4::SUB_XGLB:
+                reader.getFormId(mGlobal);
+                break; // Oblivion only?
+            case ESM4::SUB_XCCM:
+                reader.getFormId(mClimate);
+                break;
+            case ESM4::SUB_XCWT:
+                reader.getFormId(mWater);
+                break;
+            case ESM4::SUB_XCLW:
+                reader.get(mWaterHeight);
+                break;
             case ESM4::SUB_XCLL:
             {
                 if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || isFONV)
@@ -187,11 +199,21 @@ void ESM4::Cell::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_XCMT: reader.get(mMusicType); break; // Oblivion only?
-            case ESM4::SUB_LTMP: reader.getFormId(mLightingTemplate); break;
-            case ESM4::SUB_LNAM: reader.get(mLightingTemplateFlags); break; // seems to always follow LTMP
-            case ESM4::SUB_XCMO: reader.getFormId(mMusic); break;
-            case ESM4::SUB_XCAS: reader.getFormId(mAcousticSpace); break;
+            case ESM4::SUB_XCMT:
+                reader.get(mMusicType);
+                break; // Oblivion only?
+            case ESM4::SUB_LTMP:
+                reader.getFormId(mLightingTemplate);
+                break;
+            case ESM4::SUB_LNAM:
+                reader.get(mLightingTemplateFlags);
+                break; // seems to always follow LTMP
+            case ESM4::SUB_XCMO:
+                reader.getFormId(mMusic);
+                break;
+            case ESM4::SUB_XCAS:
+                reader.getFormId(mAcousticSpace);
+                break;
             case ESM4::SUB_TVDT:
             case ESM4::SUB_MHDT:
             case ESM4::SUB_XCGD:
@@ -208,7 +230,7 @@ void ESM4::Cell::load(ESM4::Reader& reader)
             case ESM4::SUB_XCET: // FO3
             case ESM4::SUB_IMPF: // FO3 Zeta
             {
-                //std::cout << "CELL " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "CELL " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -218,10 +240,8 @@ void ESM4::Cell::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Cell::save(ESM4::Writer& writer) const
+// void ESM4::Cell::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-void ESM4::Cell::blank()
-{
-}
+void ESM4::Cell::blank() {}
diff --git a/components/esm4/loadcell.hpp b/components/esm4/loadcell.hpp
index ff51c64f00..ee77bd2bfc 100644
--- a/components/esm4/loadcell.hpp
+++ b/components/esm4/loadcell.hpp
@@ -42,26 +42,26 @@ namespace ESM4
     struct CellGroup;
     typedef std::uint32_t FormId;
 
-    enum CellFlags               // TES4                     TES5
-    {                            // -----------------------  ------------------------------------
-        CELL_Interior = 0x0001,  // Can't travel from here   Interior
-        CELL_HasWater = 0x0002,  // Has water (Int)          Has Water (Int)
-        CELL_NoTravel = 0x0004,  //                          not Can't Travel From Here(Int only)
-        CELL_HideLand = 0x0008,  // Force hide land (Ext)    No LOD Water
-                                 // Oblivion interior (Int)
-        CELL_Public   = 0x0020,  // Public place             Public Area
-        CELL_HandChgd = 0x0040,  // Hand changed             Hand Changed
-        CELL_QuasiExt = 0x0080,  // Behave like exterior     Show Sky
-        CELL_SkyLight = 0x0100   //                          Use Sky Lighting
+    enum CellFlags // TES4                     TES5
+    { // -----------------------  ------------------------------------
+        CELL_Interior = 0x0001, // Can't travel from here   Interior
+        CELL_HasWater = 0x0002, // Has water (Int)          Has Water (Int)
+        CELL_NoTravel = 0x0004, //                          not Can't Travel From Here(Int only)
+        CELL_HideLand = 0x0008, // Force hide land (Ext)    No LOD Water
+                                // Oblivion interior (Int)
+        CELL_Public = 0x0020, // Public place             Public Area
+        CELL_HandChgd = 0x0040, // Hand changed             Hand Changed
+        CELL_QuasiExt = 0x0080, // Behave like exterior     Show Sky
+        CELL_SkyLight = 0x0100 //                          Use Sky Lighting
     };
 
     // Unlike TES3, multiple cells can have the same exterior co-ordinates.
     // The cells need to be organised under world spaces.
     struct Cell
     {
-        FormId mParent;       // world formId (for grouping cells), from the loading sequence
+        FormId mParent; // world formId (for grouping cells), from the loading sequence
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -75,24 +75,24 @@ namespace ESM4
         FormId mGlobal;
         FormId mClimate;
         FormId mWater;
-        float  mWaterHeight;
+        float mWaterHeight;
 
         std::vector<FormId> mRegions;
         Lighting mLighting;
 
-        FormId mLightingTemplate;             // FO3/FONV
+        FormId mLightingTemplate; // FO3/FONV
         std::uint32_t mLightingTemplateFlags; // FO3/FONV
 
-        FormId mMusic;         // FO3/FONV
+        FormId mMusic; // FO3/FONV
         FormId mAcousticSpace; // FO3/FONV
         // TES4: 0 = default, 1 = public, 2 = dungeon
         // FO3/FONV have more types (not sure how they are used, however)
         std::uint8_t mMusicType;
 
-        CellGroup *mCellGroup;
+        CellGroup* mCellGroup;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
         void blank();
     };
diff --git a/components/esm4/loadclas.cpp b/components/esm4/loadclas.cpp
index eca978276b..c037260218 100644
--- a/components/esm4/loadclas.cpp
+++ b/components/esm4/loadclas.cpp
@@ -38,22 +38,30 @@
 
 void ESM4::Class::load(ESM4::Reader& reader)
 {
-    //mFormId = reader.adjustFormId(reader.hdr().record.id); // FIXME: use master adjusted?
+    // mFormId = reader.adjustFormId(reader.hdr().record.id); // FIXME: use master adjusted?
     mFormId = reader.hdr().record.id;
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
-            case ESM4::SUB_DESC: reader.getLocalizedString(mDesc); break;
-            case ESM4::SUB_ICON: reader.getZString(mIcon);     break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
+            case ESM4::SUB_DESC:
+                reader.getLocalizedString(mDesc);
+                break;
+            case ESM4::SUB_ICON:
+                reader.getZString(mIcon);
+                break;
             case ESM4::SUB_DATA:
             {
-                //std::cout << "CLAS " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "CLAS " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -63,10 +71,10 @@ void ESM4::Class::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Class::save(ESM4::Writer& writer) const
+// void ESM4::Class::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Class::blank()
+// void ESM4::Class::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadclas.hpp b/components/esm4/loadclas.hpp
index bf091fa7f4..cda3471142 100644
--- a/components/esm4/loadclas.hpp
+++ b/components/esm4/loadclas.hpp
@@ -44,7 +44,7 @@ namespace ESM4
             std::uint32_t attr;
         };
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -54,9 +54,9 @@ namespace ESM4
         Data mData;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& reader) const;
+        // void save(ESM4::Writer& reader) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadclfm.cpp b/components/esm4/loadclfm.cpp
index efaf1461e4..259bfb6104 100644
--- a/components/esm4/loadclfm.cpp
+++ b/components/esm4/loadclfm.cpp
@@ -26,8 +26,8 @@
 */
 #include "loadclfm.hpp"
 
-#include <stdexcept>
 #include <iostream> // FIXME: for debugging only
+#include <stdexcept>
 
 #include "reader.hpp"
 //#include "writer.hpp"
@@ -36,15 +36,19 @@ void ESM4::Colour::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
             case ESM4::SUB_CNAM:
             {
                 reader.get(mColour.red);
@@ -61,18 +65,18 @@ void ESM4::Colour::load(ESM4::Reader& reader)
                 break;
             }
             default:
-                //std::cout << "CLFM " << ESM::printName(subHdr.typeId) << " skipping..."
-                          //<< subHdr.dataSize << std::endl;
-                //reader.skipSubRecordData();
+                // std::cout << "CLFM " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
+                // reader.skipSubRecordData();
                 throw std::runtime_error("ESM4::CLFM::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
         }
     }
 }
 
-//void ESM4::Colour::save(ESM4::Writer& writer) const
+// void ESM4::Colour::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Colour::blank()
+// void ESM4::Colour::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadclfm.hpp b/components/esm4/loadclfm.hpp
index 4fb81c6e00..b9348800d3 100644
--- a/components/esm4/loadclfm.hpp
+++ b/components/esm4/loadclfm.hpp
@@ -48,7 +48,7 @@ namespace ESM4
 
     struct Colour
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -58,9 +58,9 @@ namespace ESM4
         std::uint32_t mPlayable;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadclot.cpp b/components/esm4/loadclot.cpp
index cdcc692caa..e29f81c032 100644
--- a/components/esm4/loadclot.cpp
+++ b/components/esm4/loadclot.cpp
@@ -36,27 +36,55 @@ void ESM4::Clothing::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getZString(mFullName); break;
-            case ESM4::SUB_DATA: reader.get(mData);            break;
-            case ESM4::SUB_BMDT: reader.get(mClothingFlags);   break;
-            case ESM4::SUB_SCRI: reader.getFormId(mScriptId);      break;
-            case ESM4::SUB_ENAM: reader.getFormId(mEnchantment); break;
-            case ESM4::SUB_ANAM: reader.get(mEnchantmentPoints); break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);     break;
-            case ESM4::SUB_MODL: reader.getZString(mModelMale); break;
-            case ESM4::SUB_MOD2: reader.getZString(mModelMaleWorld); break;
-            case ESM4::SUB_MOD3: reader.getZString(mModelFemale); break;
-            case ESM4::SUB_MOD4: reader.getZString(mModelFemaleWorld); break;
-            case ESM4::SUB_ICON: reader.getZString(mIconMale); break;
-            case ESM4::SUB_ICO2: reader.getZString(mIconFemale); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getZString(mFullName);
+                break;
+            case ESM4::SUB_DATA:
+                reader.get(mData);
+                break;
+            case ESM4::SUB_BMDT:
+                reader.get(mClothingFlags);
+                break;
+            case ESM4::SUB_SCRI:
+                reader.getFormId(mScriptId);
+                break;
+            case ESM4::SUB_ENAM:
+                reader.getFormId(mEnchantment);
+                break;
+            case ESM4::SUB_ANAM:
+                reader.get(mEnchantmentPoints);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModelMale);
+                break;
+            case ESM4::SUB_MOD2:
+                reader.getZString(mModelMaleWorld);
+                break;
+            case ESM4::SUB_MOD3:
+                reader.getZString(mModelFemale);
+                break;
+            case ESM4::SUB_MOD4:
+                reader.getZString(mModelFemaleWorld);
+                break;
+            case ESM4::SUB_ICON:
+                reader.getZString(mIconMale);
+                break;
+            case ESM4::SUB_ICO2:
+                reader.getZString(mIconFemale);
+                break;
             case ESM4::SUB_MODT:
             case ESM4::SUB_MO2B:
             case ESM4::SUB_MO3B:
@@ -65,7 +93,7 @@ void ESM4::Clothing::load(ESM4::Reader& reader)
             case ESM4::SUB_MO3T:
             case ESM4::SUB_MO4T:
             {
-                //std::cout << "CLOT " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "CLOT " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -73,14 +101,14 @@ void ESM4::Clothing::load(ESM4::Reader& reader)
                 throw std::runtime_error("ESM4::CLOT::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
         }
     }
-    //if ((mClothingFlags&0xffff) == 0x02) // only hair
-        //std::cout << "only hair " << mEditorId << std::endl;
+    // if ((mClothingFlags&0xffff) == 0x02) // only hair
+    // std::cout << "only hair " << mEditorId << std::endl;
 }
 
-//void ESM4::Clothing::save(ESM4::Writer& writer) const
+// void ESM4::Clothing::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Clothing::blank()
+// void ESM4::Clothing::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadclot.hpp b/components/esm4/loadclot.hpp
index 16c8a145a0..26a7163c44 100644
--- a/components/esm4/loadclot.hpp
+++ b/components/esm4/loadclot.hpp
@@ -42,12 +42,12 @@ namespace ESM4
 #pragma pack(push, 1)
         struct Data
         {
-            std::uint32_t value;   // gold
-            float         weight;
+            std::uint32_t value; // gold
+            float weight;
         };
 #pragma pack(pop)
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -56,7 +56,7 @@ namespace ESM4
         std::string mModelMaleWorld;
         std::string mModelFemale;
         std::string mModelFemaleWorld;
-        std::string mIconMale;   // texture
+        std::string mIconMale; // texture
         std::string mIconFemale; // texture
 
         std::string mModel; // FIXME: for OpenCS
@@ -64,16 +64,16 @@ namespace ESM4
         float mBoundRadius;
 
         std::uint32_t mClothingFlags; // see Armor::ArmorFlags for the values
-        FormId        mScriptId;
+        FormId mScriptId;
         std::uint16_t mEnchantmentPoints;
-        FormId        mEnchantment;
+        FormId mEnchantment;
 
         Data mData;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadcont.cpp b/components/esm4/loadcont.cpp
index f0c7309967..34b2279446 100644
--- a/components/esm4/loadcont.cpp
+++ b/components/esm4/loadcont.cpp
@@ -35,15 +35,19 @@ void ESM4::Container::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
             case ESM4::SUB_DATA:
             {
                 reader.get(mDataFlags);
@@ -58,11 +62,21 @@ void ESM4::Container::load(ESM4::Reader& reader)
                 mInventory.push_back(inv);
                 break;
             }
-            case ESM4::SUB_MODL: reader.getZString(mModel);     break;
-            case ESM4::SUB_SNAM: reader.getFormId(mOpenSound);  break;
-            case ESM4::SUB_QNAM: reader.getFormId(mCloseSound); break;
-            case ESM4::SUB_SCRI: reader.getFormId(mScriptId);     break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);      break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_SNAM:
+                reader.getFormId(mOpenSound);
+                break;
+            case ESM4::SUB_QNAM:
+                reader.getFormId(mCloseSound);
+                break;
+            case ESM4::SUB_SCRI:
+                reader.getFormId(mScriptId);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
             case ESM4::SUB_MODT:
             case ESM4::SUB_MODS: // TES5 only
             case ESM4::SUB_VMAD: // TES5 only
@@ -76,7 +90,7 @@ void ESM4::Container::load(ESM4::Reader& reader)
             case ESM4::SUB_DMDT: // FONV
             case ESM4::SUB_RNAM: // FONV
             {
-                //std::cout << "CONT " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "CONT " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -86,10 +100,10 @@ void ESM4::Container::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Container::save(ESM4::Writer& writer) const
+// void ESM4::Container::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Container::blank()
+// void ESM4::Container::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadcont.hpp b/components/esm4/loadcont.hpp
index e7b47e8944..bd4916e2bc 100644
--- a/components/esm4/loadcont.hpp
+++ b/components/esm4/loadcont.hpp
@@ -41,7 +41,7 @@ namespace ESM4
 
     struct Container
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -59,9 +59,9 @@ namespace ESM4
         std::vector<InventoryItem> mInventory;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadcrea.cpp b/components/esm4/loadcrea.cpp
index a18f3b28a8..803a5f3615 100644
--- a/components/esm4/loadcrea.cpp
+++ b/components/esm4/loadcrea.cpp
@@ -31,11 +31,11 @@
 #endif
 
 #include <cassert>
-#include <stdexcept>
 #include <cstring>
-#include <string>
-#include <sstream>
 #include <iostream> // FIXME
+#include <sstream>
+#include <stdexcept>
+#include <string>
 
 #include "reader.hpp"
 //#include "writer.hpp"
@@ -44,16 +44,22 @@ void ESM4::Creature::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getZString(mFullName); break;
-            case ESM4::SUB_MODL: reader.getZString(mModel);    break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getZString(mFullName);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
             case ESM4::SUB_CNTO:
             {
                 static InventoryItem inv; // FIXME: use unique_ptr here?
@@ -82,8 +88,12 @@ void ESM4::Creature::load(ESM4::Reader& reader)
                 reader.adjustFormId(mFaction.faction);
                 break;
             }
-            case ESM4::SUB_INAM: reader.getFormId(mDeathItem);   break;
-            case ESM4::SUB_SCRI: reader.getFormId(mScriptId);      break;
+            case ESM4::SUB_INAM:
+                reader.getFormId(mDeathItem);
+                break;
+            case ESM4::SUB_SCRI:
+                reader.getFormId(mScriptId);
+                break;
             case ESM4::SUB_AIDT:
             {
                 if (subHdr.dataSize == 20) // FO3
@@ -94,7 +104,7 @@ void ESM4::Creature::load(ESM4::Reader& reader)
             }
             case ESM4::SUB_ACBS:
             {
-                //if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || mIsFONV)
+                // if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || mIsFONV)
                 if (subHdr.dataSize == 24)
                     reader.get(mBaseConfig);
                 else
@@ -109,20 +119,40 @@ void ESM4::Creature::load(ESM4::Reader& reader)
                     reader.get(mData);
                 break;
             }
-            case ESM4::SUB_ZNAM: reader.getFormId(mCombatStyle); break;
-            case ESM4::SUB_CSCR: reader.getFormId(mSoundBase);   break;
-            case ESM4::SUB_CSDI: reader.getFormId(mSound);       break;
-            case ESM4::SUB_CSDC: reader.get(mSoundChance);  break;
-            case ESM4::SUB_BNAM: reader.get(mBaseScale);    break;
-            case ESM4::SUB_TNAM: reader.get(mTurningSpeed); break;
-            case ESM4::SUB_WNAM: reader.get(mFootWeight);   break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
-            case ESM4::SUB_NAM0: reader.getZString(mBloodSpray); break;
-            case ESM4::SUB_NAM1: reader.getZString(mBloodDecal); break;
+            case ESM4::SUB_ZNAM:
+                reader.getFormId(mCombatStyle);
+                break;
+            case ESM4::SUB_CSCR:
+                reader.getFormId(mSoundBase);
+                break;
+            case ESM4::SUB_CSDI:
+                reader.getFormId(mSound);
+                break;
+            case ESM4::SUB_CSDC:
+                reader.get(mSoundChance);
+                break;
+            case ESM4::SUB_BNAM:
+                reader.get(mBaseScale);
+                break;
+            case ESM4::SUB_TNAM:
+                reader.get(mTurningSpeed);
+                break;
+            case ESM4::SUB_WNAM:
+                reader.get(mFootWeight);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
+            case ESM4::SUB_NAM0:
+                reader.getZString(mBloodSpray);
+                break;
+            case ESM4::SUB_NAM1:
+                reader.getZString(mBloodDecal);
+                break;
             case ESM4::SUB_NIFZ:
             {
                 if (!reader.getZeroTerminatedStringArray(mNif))
-                    throw std::runtime_error ("CREA NIFZ data read error");
+                    throw std::runtime_error("CREA NIFZ data read error");
                 break;
             }
             case ESM4::SUB_NIFT:
@@ -143,10 +173,12 @@ void ESM4::Creature::load(ESM4::Reader& reader)
             case ESM4::SUB_KFFZ:
             {
                 if (!reader.getZeroTerminatedStringArray(mKf))
-                    throw std::runtime_error ("CREA KFFZ data read error");
+                    throw std::runtime_error("CREA KFFZ data read error");
                 break;
             }
-            case ESM4::SUB_TPLT: reader.get(mBaseTemplate); break; // FO3
+            case ESM4::SUB_TPLT:
+                reader.get(mBaseTemplate);
+                break; // FO3
             case ESM4::SUB_PNAM: // FO3/FONV/TES5
             {
                 FormId bodyPart;
@@ -173,7 +205,7 @@ void ESM4::Creature::load(ESM4::Reader& reader)
             case ESM4::SUB_DMDT: // FO3
             case ESM4::SUB_COED: // FO3
             {
-                //std::cout << "CREA " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "CREA " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -183,10 +215,10 @@ void ESM4::Creature::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Creature::save(ESM4::Writer& writer) const
+// void ESM4::Creature::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Creature::blank()
+// void ESM4::Creature::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadcrea.hpp b/components/esm4/loadcrea.hpp
index 05e6840312..d237733672 100644
--- a/components/esm4/loadcrea.hpp
+++ b/components/esm4/loadcrea.hpp
@@ -43,58 +43,58 @@ namespace ESM4
     {
         enum ACBS_TES4
         {
-            TES4_Essential      = 0x000002,
-            TES4_WeapAndShield  = 0x000004,
-            TES4_Respawn        = 0x000008,
-            TES4_PCLevelOffset  = 0x000080,
+            TES4_Essential = 0x000002,
+            TES4_WeapAndShield = 0x000004,
+            TES4_Respawn = 0x000008,
+            TES4_PCLevelOffset = 0x000080,
             TES4_NoLowLevelProc = 0x000200,
-            TES4_NoHead         = 0x008000, // different meaning to npc_
-            TES4_NoRightArm     = 0x010000,
-            TES4_NoLeftArm      = 0x020000,
-            TES4_NoCombatWater  = 0x040000,
-            TES4_NoShadow       = 0x080000,
-            TES4_NoCorpseCheck  = 0x100000  // opposite of npc_
+            TES4_NoHead = 0x008000, // different meaning to npc_
+            TES4_NoRightArm = 0x010000,
+            TES4_NoLeftArm = 0x020000,
+            TES4_NoCombatWater = 0x040000,
+            TES4_NoShadow = 0x080000,
+            TES4_NoCorpseCheck = 0x100000 // opposite of npc_
         };
 
         enum ACBS_FO3
         {
-            FO3_Biped          = 0x00000001,
-            FO3_Essential      = 0x00000002,
-            FO3_Weap_Shield    = 0x00000004,
-            FO3_Respawn        = 0x00000008,
-            FO3_CanSwim        = 0x00000010,
-            FO3_CanFly         = 0x00000020,
-            FO3_CanWalk        = 0x00000040,
-            FO3_PCLevelMult    = 0x00000080,
+            FO3_Biped = 0x00000001,
+            FO3_Essential = 0x00000002,
+            FO3_Weap_Shield = 0x00000004,
+            FO3_Respawn = 0x00000008,
+            FO3_CanSwim = 0x00000010,
+            FO3_CanFly = 0x00000020,
+            FO3_CanWalk = 0x00000040,
+            FO3_PCLevelMult = 0x00000080,
             FO3_NoLowLevelProc = 0x00000200,
-            FO3_NoBloodSpray   = 0x00000800,
-            FO3_NoBloodDecal   = 0x00001000,
-            FO3_NoHead         = 0x00008000,
-            FO3_NoRightArm     = 0x00010000,
-            FO3_NoLeftArm      = 0x00020000,
-            FO3_NoWaterCombat  = 0x00040000,
-            FO3_NoShadow       = 0x00080000,
-            FO3_NoVATSMelee    = 0x00100000,
-            FO3_AllowPCDialog  = 0x00200000,
-            FO3_NoOpenDoors    = 0x00400000,
-            FO3_Immobile       = 0x00800000,
-            FO3_TiltFrontBack  = 0x01000000,
-            FO3_TiltLeftRight  = 0x02000000,
-            FO3_NoKnockdown    = 0x04000000,
-            FO3_NotPushable    = 0x08000000,
+            FO3_NoBloodSpray = 0x00000800,
+            FO3_NoBloodDecal = 0x00001000,
+            FO3_NoHead = 0x00008000,
+            FO3_NoRightArm = 0x00010000,
+            FO3_NoLeftArm = 0x00020000,
+            FO3_NoWaterCombat = 0x00040000,
+            FO3_NoShadow = 0x00080000,
+            FO3_NoVATSMelee = 0x00100000,
+            FO3_AllowPCDialog = 0x00200000,
+            FO3_NoOpenDoors = 0x00400000,
+            FO3_Immobile = 0x00800000,
+            FO3_TiltFrontBack = 0x01000000,
+            FO3_TiltLeftRight = 0x02000000,
+            FO3_NoKnockdown = 0x04000000,
+            FO3_NotPushable = 0x08000000,
             FO3_AllowPickpoket = 0x10000000,
-            FO3_IsGhost        = 0x20000000,
-            FO3_NoRotateHead   = 0x40000000,
-            FO3_Invulnerable   = 0x80000000
+            FO3_IsGhost = 0x20000000,
+            FO3_NoRotateHead = 0x40000000,
+            FO3_Invulnerable = 0x80000000
         };
 
 #pragma pack(push, 1)
         struct Data
         {
-            std::uint8_t  unknown;
-            std::uint8_t  combat;
-            std::uint8_t  magic;
-            std::uint8_t  stealth;
+            std::uint8_t unknown;
+            std::uint8_t combat;
+            std::uint8_t magic;
+            std::uint8_t stealth;
             std::uint16_t soul;
             std::uint16_t health;
             std::uint16_t unknown2;
@@ -103,7 +103,7 @@ namespace ESM4
         };
 #pragma pack(pop)
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -118,7 +118,7 @@ namespace ESM4
         std::vector<FormId> mAIPackages;
         ActorBaseConfig mBaseConfig;
         ActorFaction mFaction;
-        Data   mData;
+        Data mData;
         FormId mCombatStyle;
         FormId mSoundBase;
         FormId mSound;
@@ -135,13 +135,13 @@ namespace ESM4
 
         std::vector<InventoryItem> mInventory;
 
-        FormId mBaseTemplate;           // FO3/FONV
+        FormId mBaseTemplate; // FO3/FONV
         std::vector<FormId> mBodyParts; // FO3/FONV
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loaddial.cpp b/components/esm4/loaddial.cpp
index 342828a9d6..bc9b859609 100644
--- a/components/esm4/loaddial.cpp
+++ b/components/esm4/loaddial.cpp
@@ -26,9 +26,9 @@
 */
 #include "loaddial.hpp"
 
-#include <stdexcept>
 #include <cstring>
 #include <iostream> // FIXME: for debugging only
+#include <stdexcept>
 
 #include "reader.hpp"
 //#include "writer.hpp"
@@ -37,15 +37,19 @@ void ESM4::Dialogue::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
-            case ESM4::SUB_FULL: reader.getZString(mTopicName); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getZString(mTopicName);
+                break;
             case ESM4::SUB_QSTI:
             {
                 FormId questId;
@@ -82,8 +86,12 @@ void ESM4::Dialogue::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_PNAM: reader.get(mPriority); break; // FO3/FONV
-            case ESM4::SUB_TDUM: reader.getZString(mTextDumb); break; // FONV
+            case ESM4::SUB_PNAM:
+                reader.get(mPriority);
+                break; // FO3/FONV
+            case ESM4::SUB_TDUM:
+                reader.getZString(mTextDumb);
+                break; // FONV
             case ESM4::SUB_SCRI:
             case ESM4::SUB_INFC: // FONV info connection
             case ESM4::SUB_INFX: // FONV info index
@@ -92,8 +100,8 @@ void ESM4::Dialogue::load(ESM4::Reader& reader)
             case ESM4::SUB_SNAM: // TES5
             case ESM4::SUB_TIFC: // TES5
             {
-                //std::cout << "DIAL " << ESM::printName(subHdr.typeId) << " skipping..."
-                        //<< subHdr.dataSize << std::endl;
+                // std::cout << "DIAL " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -103,10 +111,10 @@ void ESM4::Dialogue::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Dialogue::save(ESM4::Writer& writer) const
+// void ESM4::Dialogue::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Dialogue::blank()
+// void ESM4::Dialogue::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loaddial.hpp b/components/esm4/loaddial.hpp
index 8097c94baf..d073e0baff 100644
--- a/components/esm4/loaddial.hpp
+++ b/components/esm4/loaddial.hpp
@@ -31,8 +31,8 @@
 #include <string>
 #include <vector>
 
-#include "formid.hpp"
 #include "dialogue.hpp" // DialType
+#include "formid.hpp"
 
 namespace ESM4
 {
@@ -41,7 +41,7 @@ namespace ESM4
 
     struct Dialogue
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -52,15 +52,15 @@ namespace ESM4
         std::string mTextDumb; // FIXME: temp name
 
         bool mDoAllBeforeRepeat; // TES5 only
-        std::uint8_t mDialType;  // DialType
+        std::uint8_t mDialType; // DialType
         std::uint8_t mDialFlags; // FO3/FONV: 0x1 rumours, 0x2 top-level
 
         float mPriority;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loaddobj.cpp b/components/esm4/loaddobj.cpp
index 6d791ff044..d5d8a2569a 100644
--- a/components/esm4/loaddobj.cpp
+++ b/components/esm4/loaddobj.cpp
@@ -28,8 +28,8 @@
 */
 #include "loaddobj.hpp"
 
-#include <stdexcept>
 #include <cstring>
+#include <stdexcept>
 //#include <iostream> // FIXME: for debugging only
 
 //#include "formid.hpp"
@@ -41,14 +41,16 @@ void ESM4::DefaultObj::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break; // "DefaultObjectManager"
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break; // "DefaultObjectManager"
             case ESM4::SUB_DATA:
             {
                 reader.getFormId(mData.stimpack);
@@ -94,24 +96,24 @@ void ESM4::DefaultObj::load(ESM4::Reader& reader)
             }
             case ESM4::SUB_DNAM:
             {
-                //std::cout << "DOBJ " << ESM::printName(subHdr.typeId) << " skipping..."
-                          //<< subHdr.dataSize << std::endl;
+                // std::cout << "DOBJ " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
             default:
-                //std::cout << "DOBJ " << ESM::printName(subHdr.typeId) << " skipping..."
-                          //<< subHdr.dataSize << std::endl;
-                //reader.skipSubRecordData();
+                // std::cout << "DOBJ " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
+                // reader.skipSubRecordData();
                 throw std::runtime_error("ESM4::DOBJ::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
         }
     }
 }
 
-//void ESM4::DefaultObj::save(ESM4::Writer& writer) const
+// void ESM4::DefaultObj::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::DefaultObj::blank()
+// void ESM4::DefaultObj::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loaddobj.hpp b/components/esm4/loaddobj.hpp
index c959a62e50..75530ac4bc 100644
--- a/components/esm4/loaddobj.hpp
+++ b/components/esm4/loaddobj.hpp
@@ -80,7 +80,7 @@ namespace ESM4
 
     struct DefaultObj
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -88,9 +88,9 @@ namespace ESM4
         Defaults mData;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loaddoor.cpp b/components/esm4/loaddoor.cpp
index 555c7a7d3f..828a04adf5 100644
--- a/components/esm4/loaddoor.cpp
+++ b/components/esm4/loaddoor.cpp
@@ -35,23 +35,43 @@ void ESM4::Door::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
-            case ESM4::SUB_MODL: reader.getZString(mModel);     break;
-            case ESM4::SUB_SCRI: reader.getFormId(mScriptId);     break;
-            case ESM4::SUB_SNAM: reader.getFormId(mOpenSound);  break;
-            case ESM4::SUB_ANAM: reader.getFormId(mCloseSound); break;
-            case ESM4::SUB_BNAM: reader.getFormId(mLoopSound);  break;
-            case ESM4::SUB_FNAM: reader.get(mDoorFlags);        break;
-            case ESM4::SUB_TNAM: reader.getFormId(mRandomTeleport); break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);      break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_SCRI:
+                reader.getFormId(mScriptId);
+                break;
+            case ESM4::SUB_SNAM:
+                reader.getFormId(mOpenSound);
+                break;
+            case ESM4::SUB_ANAM:
+                reader.getFormId(mCloseSound);
+                break;
+            case ESM4::SUB_BNAM:
+                reader.getFormId(mLoopSound);
+                break;
+            case ESM4::SUB_FNAM:
+                reader.get(mDoorFlags);
+                break;
+            case ESM4::SUB_TNAM:
+                reader.getFormId(mRandomTeleport);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
             case ESM4::SUB_MODT:
             case ESM4::SUB_MODS:
             case ESM4::SUB_OBND:
@@ -62,7 +82,7 @@ void ESM4::Door::load(ESM4::Reader& reader)
             case ESM4::SUB_DMDL: // FO3
             case ESM4::SUB_DMDT: // FO3
             {
-                //std::cout << "DOOR " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "DOOR " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -72,10 +92,10 @@ void ESM4::Door::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Door::save(ESM4::Writer& writer) const
+// void ESM4::Door::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Door::blank()
+// void ESM4::Door::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loaddoor.hpp b/components/esm4/loaddoor.hpp
index 9810a45989..fdf9b2cdda 100644
--- a/components/esm4/loaddoor.hpp
+++ b/components/esm4/loaddoor.hpp
@@ -41,13 +41,13 @@ namespace ESM4
     {
         enum Flags
         {
-            Flag_OblivionGate  = 0x01,
+            Flag_OblivionGate = 0x01,
             Flag_AutomaticDoor = 0x02,
-            Flag_Hidden        = 0x04,
-            Flag_MinimalUse    = 0x08
+            Flag_Hidden = 0x04,
+            Flag_MinimalUse = 0x08
         };
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -58,15 +58,15 @@ namespace ESM4
 
         std::uint8_t mDoorFlags;
         FormId mScriptId;
-        FormId mOpenSound;  // SNDR for TES5, SOUN for others
+        FormId mOpenSound; // SNDR for TES5, SOUN for others
         FormId mCloseSound; // SNDR for TES5, SOUN for others
         FormId mLoopSound;
         FormId mRandomTeleport;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadeyes.cpp b/components/esm4/loadeyes.cpp
index f91de07926..0120479dcc 100644
--- a/components/esm4/loadeyes.cpp
+++ b/components/esm4/loadeyes.cpp
@@ -35,27 +35,35 @@ void ESM4::Eyes::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
-            case ESM4::SUB_ICON: reader.getZString(mIcon); break;
-            case ESM4::SUB_DATA: reader.get(mData); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
+            case ESM4::SUB_ICON:
+                reader.getZString(mIcon);
+                break;
+            case ESM4::SUB_DATA:
+                reader.get(mData);
+                break;
             default:
                 throw std::runtime_error("ESM4::EYES::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
         }
     }
 }
 
-//void ESM4::Eyes::save(ESM4::Writer& writer) const
+// void ESM4::Eyes::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Eyes::blank()
+// void ESM4::Eyes::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadeyes.hpp b/components/esm4/loadeyes.hpp
index 5f0bb0f31b..2ca765bb01 100644
--- a/components/esm4/loadeyes.hpp
+++ b/components/esm4/loadeyes.hpp
@@ -46,19 +46,19 @@ namespace ESM4
         };
 #pragma pack(pop)
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
         std::string mFullName;
-        std::string mIcon;    // texture
+        std::string mIcon; // texture
 
         Data mData;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadflor.cpp b/components/esm4/loadflor.cpp
index ae9770ab74..2d250cd933 100644
--- a/components/esm4/loadflor.cpp
+++ b/components/esm4/loadflor.cpp
@@ -35,21 +35,37 @@ void ESM4::Flora::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
-            case ESM4::SUB_SCRI: reader.getFormId(mScriptId);     break;
-            case ESM4::SUB_PFIG: reader.getFormId(mIngredient); break;
-            case ESM4::SUB_PFPC: reader.get(mPercentHarvest);   break;
-            case ESM4::SUB_SNAM: reader.getFormId(mSound);      break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_SCRI:
+                reader.getFormId(mScriptId);
+                break;
+            case ESM4::SUB_PFIG:
+                reader.getFormId(mIngredient);
+                break;
+            case ESM4::SUB_PFPC:
+                reader.get(mPercentHarvest);
+                break;
+            case ESM4::SUB_SNAM:
+                reader.getFormId(mSound);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
             case ESM4::SUB_MODT:
             case ESM4::SUB_MODS:
             case ESM4::SUB_FNAM:
@@ -58,7 +74,7 @@ void ESM4::Flora::load(ESM4::Reader& reader)
             case ESM4::SUB_RNAM:
             case ESM4::SUB_VMAD:
             {
-                //std::cout << "FLOR " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "FLOR " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -68,10 +84,10 @@ void ESM4::Flora::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Flora::save(ESM4::Writer& writer) const
+// void ESM4::Flora::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Flora::blank()
+// void ESM4::Flora::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadflor.hpp b/components/esm4/loadflor.hpp
index d454108233..ea907882d7 100644
--- a/components/esm4/loadflor.hpp
+++ b/components/esm4/loadflor.hpp
@@ -47,11 +47,17 @@ namespace ESM4
             std::uint8_t autumn;
             std::uint8_t winter;
 
-            Production() : spring(0), summer(0), autumn(0), winter(0) {}
+            Production()
+                : spring(0)
+                , summer(0)
+                , autumn(0)
+                , winter(0)
+            {
+            }
         };
 #pragma pack(pop)
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -66,9 +72,9 @@ namespace ESM4
         Production mPercentHarvest;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadflst.cpp b/components/esm4/loadflst.cpp
index 32de2fe813..90356d6afc 100644
--- a/components/esm4/loadflst.cpp
+++ b/components/esm4/loadflst.cpp
@@ -36,14 +36,16 @@ void ESM4::FormIdList::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
             case ESM4::SUB_LNAM:
             {
                 FormId formId;
@@ -54,19 +56,19 @@ void ESM4::FormIdList::load(ESM4::Reader& reader)
                 break;
             }
             default:
-                //std::cout << "FLST " << ESM::printName(subHdr.typeId) << " skipping..."
-                          //<< subHdr.dataSize << std::endl;
-                //reader.skipSubRecordData();
+                // std::cout << "FLST " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
+                // reader.skipSubRecordData();
                 throw std::runtime_error("ESM4::FLST::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
         }
     }
-    //std::cout << "flst " << mEditorId << " " << mObjects.size() << std::endl; // FIXME
+    // std::cout << "flst " << mEditorId << " " << mObjects.size() << std::endl; // FIXME
 }
 
-//void ESM4::FormIdList::save(ESM4::Writer& writer) const
+// void ESM4::FormIdList::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::FormIdList::blank()
+// void ESM4::FormIdList::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadflst.hpp b/components/esm4/loadflst.hpp
index 5a3d048fd4..53f3522b9f 100644
--- a/components/esm4/loadflst.hpp
+++ b/components/esm4/loadflst.hpp
@@ -40,7 +40,7 @@ namespace ESM4
 
     struct FormIdList
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -48,9 +48,9 @@ namespace ESM4
         std::vector<FormId> mObjects;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadfurn.cpp b/components/esm4/loadfurn.cpp
index 0b27f50194..f32b907d45 100644
--- a/components/esm4/loadfurn.cpp
+++ b/components/esm4/loadfurn.cpp
@@ -35,19 +35,31 @@ void ESM4::Furniture::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
-            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
-            case ESM4::SUB_MNAM: reader.get(mActiveMarkerFlags); break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_SCRI:
+                reader.getFormId(mScriptId);
+                break;
+            case ESM4::SUB_MNAM:
+                reader.get(mActiveMarkerFlags);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
             case ESM4::SUB_MODT:
             case ESM4::SUB_DEST:
             case ESM4::SUB_DSTD:
@@ -67,7 +79,7 @@ void ESM4::Furniture::load(ESM4::Reader& reader)
             case ESM4::SUB_WBDT:
             case ESM4::SUB_XMRK:
             {
-                //std::cout << "FURN " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "FURN " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -77,10 +89,10 @@ void ESM4::Furniture::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Furniture::save(ESM4::Writer& writer) const
+// void ESM4::Furniture::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Furniture::blank()
+// void ESM4::Furniture::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadfurn.hpp b/components/esm4/loadfurn.hpp
index 051d2b03d6..8fc8e47d1c 100644
--- a/components/esm4/loadfurn.hpp
+++ b/components/esm4/loadfurn.hpp
@@ -39,7 +39,7 @@ namespace ESM4
 
     struct Furniture
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -52,9 +52,9 @@ namespace ESM4
         std::uint32_t mActiveMarkerFlags;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadglob.cpp b/components/esm4/loadglob.cpp
index 739aab5b82..605a1cb683 100644
--- a/components/esm4/loadglob.cpp
+++ b/components/esm4/loadglob.cpp
@@ -26,8 +26,8 @@
 */
 #include "loadglob.hpp"
 
-#include <stdexcept>
 #include <iostream> // FIXME
+#include <stdexcept>
 
 #include "reader.hpp"
 //#include "writer.hpp"
@@ -36,16 +36,22 @@ void ESM4::GlobalVariable::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FNAM: reader.get(mType);  break;
-            case ESM4::SUB_FLTV: reader.get(mValue);  break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FNAM:
+                reader.get(mType);
+                break;
+            case ESM4::SUB_FLTV:
+                reader.get(mValue);
+                break;
             case ESM4::SUB_FULL:
             case ESM4::SUB_MODL:
             case ESM4::SUB_MODB:
@@ -54,7 +60,7 @@ void ESM4::GlobalVariable::load(ESM4::Reader& reader)
             case ESM4::SUB_OBND: // TES5
             case ESM4::SUB_VMAD: // TES5
             {
-                //std::cout << "GLOB " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "GLOB " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -64,10 +70,10 @@ void ESM4::GlobalVariable::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::GlobalVariable::save(ESM4::Writer& writer) const
+// void ESM4::GlobalVariable::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::GlobalVariable::blank()
+// void ESM4::GlobalVariable::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadglob.hpp b/components/esm4/loadglob.hpp
index abe3a8ac93..62e074247f 100644
--- a/components/esm4/loadglob.hpp
+++ b/components/esm4/loadglob.hpp
@@ -39,7 +39,7 @@ namespace ESM4
 
     struct GlobalVariable
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -48,9 +48,9 @@ namespace ESM4
         float mValue;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadgras.cpp b/components/esm4/loadgras.cpp
index 8c4699b25b..547589236f 100644
--- a/components/esm4/loadgras.cpp
+++ b/components/esm4/loadgras.cpp
@@ -35,21 +35,29 @@ void ESM4::Grass::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
-            case ESM4::SUB_DATA: reader.get(mData);         break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_DATA:
+                reader.get(mData);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
             case ESM4::SUB_MODT:
             case ESM4::SUB_OBND:
             {
-                //std::cout << "GRAS " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "GRAS " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -59,10 +67,10 @@ void ESM4::Grass::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Grass::save(ESM4::Writer& writer) const
+// void ESM4::Grass::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Grass::blank()
+// void ESM4::Grass::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadgras.hpp b/components/esm4/loadgras.hpp
index e5b9cb18ff..29a5bd61d9 100644
--- a/components/esm4/loadgras.hpp
+++ b/components/esm4/loadgras.hpp
@@ -43,10 +43,10 @@ namespace ESM4
         // unused fields are probably packing
         struct Data
         {
-            std::uint8_t  density;
-            std::uint8_t  minSlope;
-            std::uint8_t  maxSlope;
-            std::uint8_t  unused;
+            std::uint8_t density;
+            std::uint8_t minSlope;
+            std::uint8_t maxSlope;
+            std::uint8_t unused;
             std::uint16_t distanceFromWater;
             std::uint16_t unused2;
             /*
@@ -69,13 +69,13 @@ namespace ESM4
             0x02 Uniform Scaling
             0x04 Fit to Slope
             */
-            std::uint8_t  flags;
-            std::uint8_t  unused3;
+            std::uint8_t flags;
+            std::uint8_t unused3;
             std::uint16_t unused4;
         };
 #pragma pack(pop)
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -86,9 +86,9 @@ namespace ESM4
         Data mData;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadgrup.hpp b/components/esm4/loadgrup.hpp
index 4b9aa9547b..3ad4f12aa9 100644
--- a/components/esm4/loadgrup.hpp
+++ b/components/esm4/loadgrup.hpp
@@ -101,7 +101,7 @@ namespace ESM4
     // NOTE: There may be many CELL records in one subblock
     struct CellGroup
     {
-        FormId mCell;      // CELL record for this cell group
+        FormId mCell; // CELL record for this cell group
         int mCellModIndex; // from which file to get the CELL record (e.g. may have been updated)
 
         // For retrieving parent group size (for lazy loading or skipping) and sub-block number / grid
@@ -131,7 +131,7 @@ namespace ESM4
         // cache (modindex adjusted) formId's of children
         // FIXME: also need file index + file context of all those that has type 8 GRUP
         GroupTypeHeader mHdrPersist;
-        std::vector<FormId> mPersistent;  // REFR, ACHR, ACRE
+        std::vector<FormId> mPersistent; // REFR, ACHR, ACRE
         std::vector<FormId> mdelPersistent;
 
         // FIXME: also need file index + file context of all those that has type 10 GRUP
@@ -143,7 +143,7 @@ namespace ESM4
         GroupTypeHeader mHdrTemp;
         FormId mLand; // if present, assume only one LAND per exterior CELL
         FormId mPgrd; // if present, seems to be the first record after LAND in Temp Cell Child GRUP
-        std::vector<FormId> mTemporary;   // REFR, ACHR, ACRE
+        std::vector<FormId> mTemporary; // REFR, ACHR, ACRE
         std::vector<FormId> mdelTemporary;
 
         // need to keep modindex and context for lazy loading (of all the files that contribute
diff --git a/components/esm4/loadhair.cpp b/components/esm4/loadhair.cpp
index 64d0b2192e..4da4203387 100644
--- a/components/esm4/loadhair.cpp
+++ b/components/esm4/loadhair.cpp
@@ -36,22 +36,34 @@ void ESM4::Hair::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getZString(mFullName); break;
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
-            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
-            case ESM4::SUB_DATA: reader.get(mData);         break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getZString(mFullName);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_ICON:
+                reader.getZString(mIcon);
+                break;
+            case ESM4::SUB_DATA:
+                reader.get(mData);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
             case ESM4::SUB_MODT:
             {
-                //std::cout << "HAIR " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "HAIR " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -61,10 +73,10 @@ void ESM4::Hair::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Hair::save(ESM4::Writer& writer) const
+// void ESM4::Hair::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Hair::blank()
+// void ESM4::Hair::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadhair.hpp b/components/esm4/loadhair.hpp
index b0b07f9281..3b278fe4b4 100644
--- a/components/esm4/loadhair.hpp
+++ b/components/esm4/loadhair.hpp
@@ -46,22 +46,22 @@ namespace ESM4
         };
 #pragma pack(pop)
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
         std::string mFullName;
-        std::string mModel;   // mesh
-        std::string mIcon;    // texture
+        std::string mModel; // mesh
+        std::string mIcon; // texture
 
         float mBoundRadius;
 
         Data mData;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadhdpt.cpp b/components/esm4/loadhdpt.cpp
index ee1d3dd526..69cb3bb674 100644
--- a/components/esm4/loadhdpt.cpp
+++ b/components/esm4/loadhdpt.cpp
@@ -26,8 +26,8 @@
 */
 #include "loadhdpt.hpp"
 
-#include <stdexcept>
 #include <optional>
+#include <stdexcept>
 //#include <iostream> // FIXME: testing only
 
 #include "reader.hpp"
@@ -37,7 +37,7 @@ void ESM4::HeadPart::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     std::optional<std::uint32_t> type;
 
@@ -46,11 +46,21 @@ void ESM4::HeadPart::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
-            case ESM4::SUB_DATA: reader.get(mData); break;
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
-            case ESM4::SUB_HNAM: reader.getFormId(mAdditionalPart); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
+            case ESM4::SUB_DATA:
+                reader.get(mData);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_HNAM:
+                reader.getFormId(mAdditionalPart);
+                break;
             case ESM4::SUB_NAM0: // TES5
             {
                 std::uint32_t value;
@@ -65,22 +75,27 @@ void ESM4::HeadPart::load(ESM4::Reader& reader)
                 reader.getZString(file);
 
                 if (!type.has_value())
-                    throw std::runtime_error("Failed to read ESM4 HDPT record: subrecord NAM0 does not precede subrecord NAM1: file type is unknown");
+                    throw std::runtime_error(
+                        "Failed to read ESM4 HDPT record: subrecord NAM0 does not precede subrecord NAM1: file type is "
+                        "unknown");
 
                 if (*type >= mTriFile.size())
-                    throw std::runtime_error("Failed to read ESM4 HDPT record: invalid file type: " + std::to_string(*type));
+                    throw std::runtime_error(
+                        "Failed to read ESM4 HDPT record: invalid file type: " + std::to_string(*type));
 
                 mTriFile[*type] = std::move(file);
 
                 break;
             }
-            case ESM4::SUB_TNAM: reader.getFormId(mBaseTexture); break;
+            case ESM4::SUB_TNAM:
+                reader.getFormId(mBaseTexture);
+                break;
             case ESM4::SUB_PNAM:
             case ESM4::SUB_MODS:
             case ESM4::SUB_MODT:
             case ESM4::SUB_RNAM:
             {
-                //std::cout << "HDPT " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "HDPT " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -90,10 +105,10 @@ void ESM4::HeadPart::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::HeadPart::save(ESM4::Writer& writer) const
+// void ESM4::HeadPart::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::HeadPart::blank()
+// void ESM4::HeadPart::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadhdpt.hpp b/components/esm4/loadhdpt.hpp
index 89a486eba8..1496a478c5 100644
--- a/components/esm4/loadhdpt.hpp
+++ b/components/esm4/loadhdpt.hpp
@@ -27,8 +27,8 @@
 #ifndef ESM4_HDPT_H
 #define ESM4_HDPT_H
 
-#include <cstdint>
 #include <array>
+#include <cstdint>
 
 #include "formid.hpp"
 
@@ -39,7 +39,7 @@ namespace ESM4
 
     struct HeadPart
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -54,9 +54,9 @@ namespace ESM4
         FormId mBaseTexture;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadidle.cpp b/components/esm4/loadidle.cpp
index df84e3df4c..cf0e993207 100644
--- a/components/esm4/loadidle.cpp
+++ b/components/esm4/loadidle.cpp
@@ -35,16 +35,22 @@ void ESM4::IdleAnimation::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
-            case ESM4::SUB_DNAM: reader.getZString(mCollision); break;
-            case ESM4::SUB_ENAM: reader.getZString(mEvent);     break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_DNAM:
+                reader.getZString(mCollision);
+                break;
+            case ESM4::SUB_ENAM:
+                reader.getZString(mEvent);
+                break;
             case ESM4::SUB_ANAM:
             {
                 reader.get(mParent);
@@ -54,7 +60,7 @@ void ESM4::IdleAnimation::load(ESM4::Reader& reader)
             case ESM4::SUB_CTDA: // formId
             case ESM4::SUB_DATA: // formId
             {
-                //std::cout << "IDLE " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "IDLE " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -64,10 +70,10 @@ void ESM4::IdleAnimation::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::IdleAnimation::save(ESM4::Writer& writer) const
+// void ESM4::IdleAnimation::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::IdleAnimation::blank()
+// void ESM4::IdleAnimation::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadidle.hpp b/components/esm4/loadidle.hpp
index ad4e796359..a3cfd414a0 100644
--- a/components/esm4/loadidle.hpp
+++ b/components/esm4/loadidle.hpp
@@ -39,20 +39,20 @@ namespace ESM4
 
     struct IdleAnimation
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
         std::string mCollision;
         std::string mEvent;
 
-        FormId      mParent;  // IDLE or AACT
-        FormId      mPrevious;
+        FormId mParent; // IDLE or AACT
+        FormId mPrevious;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadidlm.cpp b/components/esm4/loadidlm.cpp
index c94cd37310..801cd9465b 100644
--- a/components/esm4/loadidlm.cpp
+++ b/components/esm4/loadidlm.cpp
@@ -36,7 +36,7 @@ void ESM4::IdleMarker::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     std::uint32_t esmVer = reader.esmVersion();
 
@@ -45,8 +45,12 @@ void ESM4::IdleMarker::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_IDLF: reader.get(mIdleFlags);       break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_IDLF:
+                reader.get(mIdleFlags);
+                break;
             case ESM4::SUB_IDLC:
             {
                 if (subHdr.dataSize != 1) // FO3 can have 4?
@@ -58,7 +62,9 @@ void ESM4::IdleMarker::load(ESM4::Reader& reader)
                 reader.get(mIdleCount);
                 break;
             }
-            case ESM4::SUB_IDLT: reader.get(mIdleTimer);       break;
+            case ESM4::SUB_IDLT:
+                reader.get(mIdleTimer);
+                break;
             case ESM4::SUB_IDLA:
             {
                 bool isFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
@@ -75,7 +81,7 @@ void ESM4::IdleMarker::load(ESM4::Reader& reader)
             }
             case ESM4::SUB_OBND: // object bounds
             {
-                //std::cout << "IDLM " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "IDLM " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -85,10 +91,10 @@ void ESM4::IdleMarker::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::IdleMarker::save(ESM4::Writer& writer) const
+// void ESM4::IdleMarker::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::IdleMarker::blank()
+// void ESM4::IdleMarker::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadidlm.hpp b/components/esm4/loadidlm.hpp
index 2874426217..7185aa3333 100644
--- a/components/esm4/loadidlm.hpp
+++ b/components/esm4/loadidlm.hpp
@@ -39,7 +39,7 @@ namespace ESM4
 
     struct IdleMarker
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -51,9 +51,9 @@ namespace ESM4
         std::vector<FormId> mIdleAnim;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadimod.cpp b/components/esm4/loadimod.cpp
index 4ec6518a01..ad043978bd 100644
--- a/components/esm4/loadimod.cpp
+++ b/components/esm4/loadimod.cpp
@@ -28,8 +28,8 @@
 */
 #include "loadimod.hpp"
 
-#include <stdexcept>
 #include <iostream> // FIXME: for debugging only
+#include <stdexcept>
 
 #include "reader.hpp"
 //#include "writer.hpp"
@@ -38,14 +38,16 @@ void ESM4::ItemMod::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
             case ESM4::SUB_OBND:
             case ESM4::SUB_FULL:
             case ESM4::SUB_MODL:
@@ -57,24 +59,23 @@ void ESM4::ItemMod::load(ESM4::Reader& reader)
             case ESM4::SUB_ZNAM:
             case ESM4::SUB_DATA:
             {
-                //std::cout << "IMOD " << ESM::printName(subHdr.typeId) << " skipping..."
-                          //<< subHdr.dataSize << std::endl;
+                // std::cout << "IMOD " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
             default:
-                std::cout << "IMOD " << ESM::printName(subHdr.typeId) << " skipping..."
-                          << subHdr.dataSize << std::endl;
+                std::cout << "IMOD " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
-                //throw std::runtime_error("ESM4::IMOD::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+                // throw std::runtime_error("ESM4::IMOD::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
         }
     }
 }
 
-//void ESM4::ItemMod::save(ESM4::Writer& writer) const
+// void ESM4::ItemMod::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::ItemMod::blank()
+// void ESM4::ItemMod::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadimod.hpp b/components/esm4/loadimod.hpp
index 5e6078384e..aab191d3c7 100644
--- a/components/esm4/loadimod.hpp
+++ b/components/esm4/loadimod.hpp
@@ -41,15 +41,15 @@ namespace ESM4
 
     struct ItemMod
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadinfo.cpp b/components/esm4/loadinfo.cpp
index a0a99b13dc..b37411accc 100644
--- a/components/esm4/loadinfo.cpp
+++ b/components/esm4/loadinfo.cpp
@@ -26,9 +26,9 @@
 */
 #include "loadinfo.hpp"
 
-#include <stdexcept>
 #include <cstring>
 #include <iostream> // FIXME: for debugging only
+#include <stdexcept>
 
 #include "reader.hpp"
 //#include "writer.hpp"
@@ -37,7 +37,7 @@ void ESM4::DialogInfo::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     mEditorId = formIdToString(mFormId); // FIXME: quick workaround to use existing code
 
@@ -49,8 +49,12 @@ void ESM4::DialogInfo::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_QSTI: reader.getFormId(mQuest); break; // FormId quest id
-            case ESM4::SUB_SNDD: reader.getFormId(mSound); break; // FO3 (not used in FONV?)
+            case ESM4::SUB_QSTI:
+                reader.getFormId(mQuest);
+                break; // FormId quest id
+            case ESM4::SUB_SNDD:
+                reader.getFormId(mSound);
+                break; // FO3 (not used in FONV?)
             case ESM4::SUB_TRDT:
             {
                 if (subHdr.dataSize == 16) // TES4
@@ -66,9 +70,15 @@ void ESM4::DialogInfo::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_NAM1: reader.getZString(mResponse); break; // response text
-            case ESM4::SUB_NAM2: reader.getZString(mNotes); break; // actor notes
-            case ESM4::SUB_NAM3: reader.getZString(mEdits); break; // not in TES4
+            case ESM4::SUB_NAM1:
+                reader.getZString(mResponse);
+                break; // response text
+            case ESM4::SUB_NAM2:
+                reader.getZString(mNotes);
+                break; // actor notes
+            case ESM4::SUB_NAM3:
+                reader.getZString(mEdits);
+                break; // not in TES4
             case ESM4::SUB_CTDA: // FIXME: how to detect if 1st/2nd param is a formid?
             {
                 if (subHdr.dataSize == 24) // TES4
@@ -104,9 +114,15 @@ void ESM4::DialogInfo::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_SCDA: reader.skipSubRecordData(); break; // compiled script data
-            case ESM4::SUB_SCTX: reader.getString(mScript.scriptSource); break;
-            case ESM4::SUB_SCRO: reader.getFormId(mScript.globReference); break;
+            case ESM4::SUB_SCDA:
+                reader.skipSubRecordData();
+                break; // compiled script data
+            case ESM4::SUB_SCTX:
+                reader.getString(mScript.scriptSource);
+                break;
+            case ESM4::SUB_SCRO:
+                reader.getFormId(mScript.globReference);
+                break;
             case ESM4::SUB_SLSD:
             {
                 localVar.clear();
@@ -180,24 +196,23 @@ void ESM4::DialogInfo::load(ESM4::Reader& reader)
             case ESM4::SUB_QNAM: // TES5 for mScript
             case ESM4::SUB_RNAM: // TES5
             {
-                //std::cout << "INFO " << ESM::printName(subHdr.typeId) << " skipping..."
-                        //<< subHdr.dataSize << std::endl;
+                // std::cout << "INFO " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
             default:
-                std::cout << "INFO " << ESM::printName(subHdr.typeId) << " skipping..."
-                        << subHdr.dataSize << std::endl;
+                std::cout << "INFO " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
-                //throw std::runtime_error("ESM4::INFO::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+                // throw std::runtime_error("ESM4::INFO::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
         }
     }
 }
 
-//void ESM4::DialogInfo::save(ESM4::Writer& writer) const
+// void ESM4::DialogInfo::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::DialogInfo::blank()
+// void ESM4::DialogInfo::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadinfo.hpp b/components/esm4/loadinfo.hpp
index 2decff05e0..0ba27be25e 100644
--- a/components/esm4/loadinfo.hpp
+++ b/components/esm4/loadinfo.hpp
@@ -30,9 +30,9 @@
 #include <cstdint>
 #include <string>
 
+#include "dialogue.hpp" // DialType
 #include "formid.hpp"
 #include "script.hpp" // TargetCondition
-#include "dialogue.hpp" // DialType
 
 namespace ESM4
 {
@@ -41,21 +41,21 @@ namespace ESM4
 
     enum InfoFlag
     {
-        INFO_Goodbye         = 0x0001,
-        INFO_Random          = 0x0002,
-        INFO_SayOnce         = 0x0004,
-        INFO_RunImmediately  = 0x0008,
-        INFO_InfoRefusal     = 0x0010,
-        INFO_RandomEnd       = 0x0020,
-        INFO_RunForRumors    = 0x0040,
+        INFO_Goodbye = 0x0001,
+        INFO_Random = 0x0002,
+        INFO_SayOnce = 0x0004,
+        INFO_RunImmediately = 0x0008,
+        INFO_InfoRefusal = 0x0010,
+        INFO_RandomEnd = 0x0020,
+        INFO_RunForRumors = 0x0040,
         INFO_SpeechChallenge = 0x0080,
-        INFO_SayOnceADay     = 0x0100,
-        INFO_AlwaysDarken    = 0x0200
+        INFO_SayOnceADay = 0x0100,
+        INFO_AlwaysDarken = 0x0200
     };
 
     struct DialogInfo
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId; // FIXME: no such record for INFO, but keep here to avoid extra work for now
@@ -68,8 +68,8 @@ namespace ESM4
         std::string mNotes;
         std::string mEdits;
 
-        std::uint8_t  mDialType;  // DialType
-        std::uint8_t  mNextSpeaker;
+        std::uint8_t mDialType; // DialType
+        std::uint8_t mNextSpeaker;
         std::uint16_t mInfoFlags; // see above enum
 
         TargetCondition mTargetCondition;
@@ -78,9 +78,9 @@ namespace ESM4
         ScriptDefinition mScript; // FIXME: ignoring the second one after the NEXT sub-record
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadingr.cpp b/components/esm4/loadingr.cpp
index 9001329662..4756be8e63 100644
--- a/components/esm4/loadingr.cpp
+++ b/components/esm4/loadingr.cpp
@@ -26,8 +26,8 @@
 */
 #include "loadingr.hpp"
 
-#include <stdexcept>
 #include <cstring>
+#include <stdexcept>
 
 #include "reader.hpp"
 //#include "writer.hpp"
@@ -36,26 +36,29 @@ void ESM4::Ingredient::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
             case ESM4::SUB_FULL:
             {
                 if (mFullName.empty())
                 {
-                    reader.getLocalizedString(mFullName); break;
+                    reader.getLocalizedString(mFullName);
+                    break;
                 }
                 else // in TES4 subsequent FULL records are script effect names
                 {
                     // FIXME: should be part of a struct?
                     std::string scriptEffectName;
                     if (!reader.getZString(scriptEffectName))
-                        throw std::runtime_error ("INGR FULL data read error");
+                        throw std::runtime_error("INGR FULL data read error");
 
                     mScriptEffect.push_back(scriptEffectName);
 
@@ -64,7 +67,7 @@ void ESM4::Ingredient::load(ESM4::Reader& reader)
             }
             case ESM4::SUB_DATA:
             {
-                //if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
+                // if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
                 if (subHdr.dataSize == 8) // FO3 is size 4 even though VER_094
                     reader.get(mData);
                 else
@@ -72,11 +75,21 @@ void ESM4::Ingredient::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
-            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
-            case ESM4::SUB_ENIT: reader.get(mEnchantment);  break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_ICON:
+                reader.getZString(mIcon);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_SCRI:
+                reader.getFormId(mScriptId);
+                break;
+            case ESM4::SUB_ENIT:
+                reader.get(mEnchantment);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
             case ESM4::SUB_SCIT:
             {
                 reader.get(mEffect);
@@ -95,7 +108,7 @@ void ESM4::Ingredient::load(ESM4::Reader& reader)
             case ESM4::SUB_ZNAM:
             case ESM4::SUB_ETYP: // FO3
             {
-                //std::cout << "INGR " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "INGR " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -105,10 +118,10 @@ void ESM4::Ingredient::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Ingredient::save(ESM4::Writer& writer) const
+// void ESM4::Ingredient::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Ingredient::blank()
+// void ESM4::Ingredient::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadingr.hpp b/components/esm4/loadingr.hpp
index 08b3e73efc..9a80d52824 100644
--- a/components/esm4/loadingr.hpp
+++ b/components/esm4/loadingr.hpp
@@ -43,7 +43,7 @@ namespace ESM4
         struct Data
         {
             std::uint32_t value;
-            float         weight;
+            float weight;
         };
 
         struct ENIT
@@ -53,7 +53,7 @@ namespace ESM4
         };
 #pragma pack(pop)
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -66,14 +66,14 @@ namespace ESM4
         std::vector<std::string> mScriptEffect; // FIXME: prob. should be in a struct
         FormId mScriptId;
         ScriptEffect mEffect;
-        ENIT   mEnchantment;
+        ENIT mEnchantment;
 
         Data mData;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadkeym.cpp b/components/esm4/loadkeym.cpp
index f0c5dbedb7..0ac8ae22e8 100644
--- a/components/esm4/loadkeym.cpp
+++ b/components/esm4/loadkeym.cpp
@@ -35,30 +35,50 @@ void ESM4::Key::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
-            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
-            case ESM4::SUB_MICO: reader.getZString(mMiniIcon); break; // FO3
-            case ESM4::SUB_DATA: reader.get(mData);         break;
-            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
-            case ESM4::SUB_YNAM: reader.getFormId(mPickUpSound); break;
-            case ESM4::SUB_ZNAM: reader.getFormId(mDropSound); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_ICON:
+                reader.getZString(mIcon);
+                break;
+            case ESM4::SUB_MICO:
+                reader.getZString(mMiniIcon);
+                break; // FO3
+            case ESM4::SUB_DATA:
+                reader.get(mData);
+                break;
+            case ESM4::SUB_SCRI:
+                reader.getFormId(mScriptId);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
+            case ESM4::SUB_YNAM:
+                reader.getFormId(mPickUpSound);
+                break;
+            case ESM4::SUB_ZNAM:
+                reader.getFormId(mDropSound);
+                break;
             case ESM4::SUB_MODT:
             case ESM4::SUB_KSIZ:
             case ESM4::SUB_KWDA:
             case ESM4::SUB_OBND:
             case ESM4::SUB_VMAD:
             {
-                //std::cout << "KEYM " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "KEYM " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -68,10 +88,10 @@ void ESM4::Key::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Key::save(ESM4::Writer& writer) const
+// void ESM4::Key::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Key::blank()
+// void ESM4::Key::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadkeym.hpp b/components/esm4/loadkeym.hpp
index 68835eeeb6..115f150ab6 100644
--- a/components/esm4/loadkeym.hpp
+++ b/components/esm4/loadkeym.hpp
@@ -43,11 +43,11 @@ namespace ESM4
         struct Data
         {
             std::uint32_t value; // gold
-            float         weight;
+            float weight;
         };
 #pragma pack(pop)
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -65,9 +65,9 @@ namespace ESM4
         Data mData;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadland.cpp b/components/esm4/loadland.cpp
index 40e9d95c58..0d09fe8332 100644
--- a/components/esm4/loadland.cpp
+++ b/components/esm4/loadland.cpp
@@ -57,13 +57,13 @@ void ESM4::Land::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
     mDataTypes = 0;
 
     TxtLayer layer;
     std::int8_t currentAddQuad = -1; // for VTXT following ATXT
 
-    //std::map<FormId, int> uniqueTextures; // FIXME: for temp testing only
+    // std::map<FormId, int> uniqueTextures; // FIXME: for temp testing only
 
     while (reader.getSubRecordHeader())
     {
@@ -153,37 +153,36 @@ void ESM4::Land::load(ESM4::Reader& reader)
 
                 int count = (int)reader.subRecordHeader().dataSize / sizeof(ESM4::Land::VTXT);
                 assert((reader.subRecordHeader().dataSize % sizeof(ESM4::Land::VTXT)) == 0
-                        && "ESM4::LAND VTXT data size error");
+                    && "ESM4::LAND VTXT data size error");
 
                 if (count)
                 {
                     layer.data.resize(count);
                     std::vector<ESM4::Land::VTXT>::iterator it = layer.data.begin();
-                    for (;it != layer.data.end(); ++it)
+                    for (; it != layer.data.end(); ++it)
                     {
                         reader.get(*it);
                         // FIXME: debug only
-                        //std::cout << "pos: " << std::dec << (int)(*it).position << std::endl;
+                        // std::cout << "pos: " << std::dec << (int)(*it).position << std::endl;
                     }
                 }
                 mTextures[currentAddQuad].layers.push_back(layer);
 
                 // Assumed that the layers are added in the correct sequence
                 // FIXME: Knights.esp doesn't seem to observe this - investigate more
-                //assert(layer.texture.layerIndex == mTextures[currentAddQuad].layers.size()-1
-                        //&& "additional texture layer index error");
+                // assert(layer.texture.layerIndex == mTextures[currentAddQuad].layers.size()-1
+                //&& "additional texture layer index error");
 
                 currentAddQuad = -1;
                 layer.data.clear();
                 // FIXME: debug only
-                //std::cout << "VTXT: count " << std::dec << count << std::endl;
+                // std::cout << "VTXT: count " << std::dec << count << std::endl;
                 break;
             }
             case ESM4::SUB_VTEX: // only in Oblivion?
             {
                 int count = (int)reader.subRecordHeader().dataSize / sizeof(FormId);
-                assert((reader.subRecordHeader().dataSize % sizeof(FormId)) == 0
-                        && "ESM4::LAND VTEX data size error");
+                assert((reader.subRecordHeader().dataSize % sizeof(FormId)) == 0 && "ESM4::LAND VTEX data size error");
 
                 if (count)
                 {
@@ -192,7 +191,7 @@ void ESM4::Land::load(ESM4::Reader& reader)
                     {
                         reader.getFormId(*it);
                         // FIXME: debug only
-                        //std::cout << "VTEX: " << std::hex << *it << std::endl;
+                        // std::cout << "VTEX: " << std::hex << *it << std::endl;
                     }
                 }
                 break;
@@ -205,7 +204,8 @@ void ESM4::Land::load(ESM4::Reader& reader)
     if (currentAddQuad != -1)
     {
         // FIXME: not sure if it happens here as well
-        std::cout << "ESM4::Land VTXT empty layer " << (int)layer.texture.layerIndex << " quad " << (int)layer.texture.quadrant << std::endl;
+        std::cout << "ESM4::Land VTXT empty layer " << (int)layer.texture.layerIndex << " quad "
+                  << (int)layer.texture.quadrant << std::endl;
         mTextures[currentAddQuad].layers.push_back(layer);
     }
 
@@ -214,27 +214,27 @@ void ESM4::Land::load(ESM4::Reader& reader)
     {
         if (mTextures[i].base.formId == 0)
         {
-            //std::cout << "ESM4::LAND " << ESM4::formIdToString(mFormId) << " missing base, quad " << i << std::endl;
-            //std::cout << "layers " << mTextures[i].layers.size() << std::endl;
-            // NOTE: can't set the default here since FO3/FONV may have different defaults
-            //mTextures[i].base.formId = 0x000008C0; // TerrainHDDirt01.dds
+            // std::cout << "ESM4::LAND " << ESM4::formIdToString(mFormId) << " missing base, quad " << i << std::endl;
+            // std::cout << "layers " << mTextures[i].layers.size() << std::endl;
+            //  NOTE: can't set the default here since FO3/FONV may have different defaults
+            // mTextures[i].base.formId = 0x000008C0; // TerrainHDDirt01.dds
             missing = true;
         }
-        //else
+        // else
         //{
-        //    std::cout << "ESM4::LAND " << ESM4::formIdToString(mFormId) << " base, quad " << i << std::endl;
-        //    std::cout << "layers " << mTextures[i].layers.size() << std::endl;
-        //}
+        //     std::cout << "ESM4::LAND " << ESM4::formIdToString(mFormId) << " base, quad " << i << std::endl;
+        //     std::cout << "layers " << mTextures[i].layers.size() << std::endl;
+        // }
     }
     // at least one of the quadrants do not have a base texture, return without setting the flag
     if (!missing)
         mDataTypes |= LAND_VTEX;
 }
 
-//void ESM4::Land::save(ESM4::Writer& writer) const
+// void ESM4::Land::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Land::blank()
+// void ESM4::Land::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadland.hpp b/components/esm4/loadland.hpp
index 305b48c157..ab5abe4f90 100644
--- a/components/esm4/loadland.hpp
+++ b/components/esm4/loadland.hpp
@@ -63,53 +63,53 @@ namespace ESM4
         // (for TES4 - based on vanilla observations)
         static const int QUAD_TEXTURE_PER_SIDE = 6;
 
-#pragma pack(push,1)
+#pragma pack(push, 1)
         struct VHGT
         {
-            float         heightOffset;
-            std::int8_t   gradientData[VERTS_PER_SIDE * VERTS_PER_SIDE];
+            float heightOffset;
+            std::int8_t gradientData[VERTS_PER_SIDE * VERTS_PER_SIDE];
             std::uint16_t unknown1;
             unsigned char unknown2;
         };
 
         struct BTXT
         {
-            FormId        formId;
-            std::uint8_t  quadrant; // 0 = bottom left, 1 = bottom right, 2 = top left, 3 = top right
-            std::uint8_t  unknown1;
+            FormId formId;
+            std::uint8_t quadrant; // 0 = bottom left, 1 = bottom right, 2 = top left, 3 = top right
+            std::uint8_t unknown1;
             std::uint16_t unknown2;
         };
 
         struct ATXT
         {
-            FormId        formId;
-            std::uint8_t  quadrant; // 0 = bottom left, 1 = bottom right, 2 = top left, 3 = top right
-            std::uint8_t  unknown;
+            FormId formId;
+            std::uint8_t quadrant; // 0 = bottom left, 1 = bottom right, 2 = top left, 3 = top right
+            std::uint8_t unknown;
             std::uint16_t layerIndex; // texture layer, 0..7
         };
 
         struct VTXT
         {
             std::uint16_t position; // 0..288 (17x17 grid)
-            std::uint8_t  unknown1;
-            std::uint8_t  unknown2;
-            float         opacity;
+            std::uint8_t unknown1;
+            std::uint8_t unknown2;
+            float opacity;
         };
 #pragma pack(pop)
 
         struct TxtLayer
         {
-            ATXT          texture;
+            ATXT texture;
             std::vector<VTXT> data; // alpha data
         };
 
         struct Texture
         {
-            BTXT          base;
+            BTXT base;
             std::vector<TxtLayer> layers;
         };
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::uint32_t mLandFlags; // from DATA subrecord
@@ -117,16 +117,16 @@ namespace ESM4
         // FIXME: lazy loading not yet implemented
         int mDataTypes; // which data types are loaded
 
-        signed char   mVertNorm[VERTS_PER_SIDE * VERTS_PER_SIDE * 3]; // from VNML subrecord
-        signed char   mVertColr[VERTS_PER_SIDE * VERTS_PER_SIDE * 3]; // from VCLR subrecord
-        VHGT          mHeightMap;
-        Texture       mTextures[4]; // 0 = bottom left, 1 = bottom right, 2 = top left, 3 = top right
-        std::vector<FormId> mIds;   // land texture (LTEX) formids
+        signed char mVertNorm[VERTS_PER_SIDE * VERTS_PER_SIDE * 3]; // from VNML subrecord
+        signed char mVertColr[VERTS_PER_SIDE * VERTS_PER_SIDE * 3]; // from VCLR subrecord
+        VHGT mHeightMap;
+        Texture mTextures[4]; // 0 = bottom left, 1 = bottom right, 2 = top left, 3 = top right
+        std::vector<FormId> mIds; // land texture (LTEX) formids
 
         virtual void load(Reader& reader);
-        //virtual void save(Writer& writer) const;
+        // virtual void save(Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadlgtm.cpp b/components/esm4/loadlgtm.cpp
index d0aa3a5b49..1382a7237b 100644
--- a/components/esm4/loadlgtm.cpp
+++ b/components/esm4/loadlgtm.cpp
@@ -28,8 +28,8 @@
 */
 #include "loadlgtm.hpp"
 
-#include <stdexcept>
 #include <cfloat> // FLT_MAX for gcc
+#include <stdexcept>
 //#include <iostream> // FIXME: for debugging only
 
 #include "reader.hpp"
@@ -39,14 +39,16 @@ void ESM4::LightingTemplate::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
             case ESM4::SUB_DATA:
             {
                 if (subHdr.dataSize == 36) // TES4
@@ -65,8 +67,8 @@ void ESM4::LightingTemplate::load(ESM4::Reader& reader)
             }
             case ESM4::SUB_DALC: // TES5
             {
-                //std::cout << "LGTM " << ESM::printName(subHdr.typeId) << " skipping..."
-                          //<< subHdr.dataSize << std::endl;
+                // std::cout << "LGTM " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -76,10 +78,10 @@ void ESM4::LightingTemplate::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::LightingTemplate::save(ESM4::Writer& writer) const
+// void ESM4::LightingTemplate::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::LightingTemplate::blank()
+// void ESM4::LightingTemplate::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadlgtm.hpp b/components/esm4/loadlgtm.hpp
index 1b625e458f..d835ef7a67 100644
--- a/components/esm4/loadlgtm.hpp
+++ b/components/esm4/loadlgtm.hpp
@@ -43,7 +43,7 @@ namespace ESM4
 
     struct LightingTemplate
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -51,9 +51,9 @@ namespace ESM4
         Lighting mLighting;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadligh.cpp b/components/esm4/loadligh.cpp
index 394d10114d..eb82224d66 100644
--- a/components/esm4/loadligh.cpp
+++ b/components/esm4/loadligh.cpp
@@ -35,7 +35,7 @@ void ESM4::Light::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
     std::uint32_t esmVer = reader.esmVersion();
     bool isFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
 
@@ -44,14 +44,18 @@ void ESM4::Light::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
             case ESM4::SUB_DATA:
             {
                 // FIXME: TES4 might be uint32 as well, need to check
-                if (isFONV || (esmVer == ESM::VER_094 && subHdr.dataSize == 32)/*FO3*/)
+                if (isFONV || (esmVer == ESM::VER_094 && subHdr.dataSize == 32) /*FO3*/)
                 {
-                    reader.get(mData.time);     // uint32
+                    reader.get(mData.time); // uint32
                 }
                 else
                     reader.get(mData.duration); // float
@@ -59,7 +63,7 @@ void ESM4::Light::load(ESM4::Reader& reader)
                 reader.get(mData.radius);
                 reader.get(mData.colour);
                 reader.get(mData.flags);
-                //if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
+                // if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
                 if (subHdr.dataSize == 48)
                 {
                     reader.get(mData.falloff);
@@ -78,17 +82,29 @@ void ESM4::Light::load(ESM4::Reader& reader)
                 reader.get(mData.weight);
                 break;
             }
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
-            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
-            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
-            case ESM4::SUB_SNAM: reader.getFormId(mSound);  break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
-            case ESM4::SUB_FNAM: reader.get(mFade);         break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_ICON:
+                reader.getZString(mIcon);
+                break;
+            case ESM4::SUB_SCRI:
+                reader.getFormId(mScriptId);
+                break;
+            case ESM4::SUB_SNAM:
+                reader.getFormId(mSound);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
+            case ESM4::SUB_FNAM:
+                reader.get(mFade);
+                break;
             case ESM4::SUB_MODT:
             case ESM4::SUB_OBND:
             case ESM4::SUB_VMAD: // Dragonborn only?
             {
-                //std::cout << "LIGH " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "LIGH " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -98,10 +114,10 @@ void ESM4::Light::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Light::save(ESM4::Writer& writer) const
+// void ESM4::Light::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Light::blank()
+// void ESM4::Light::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadligh.hpp b/components/esm4/loadligh.hpp
index 974385dbf8..fe5129f8b0 100644
--- a/components/esm4/loadligh.hpp
+++ b/components/esm4/loadligh.hpp
@@ -41,8 +41,8 @@ namespace ESM4
     {
         struct Data
         {
-            std::uint32_t time;               // FO/FONV only
-            float         duration = -1;
+            std::uint32_t time; // FO/FONV only
+            float duration = -1;
             std::uint32_t radius;
             std::uint32_t colour; // RGBA
             // flags:
@@ -56,18 +56,18 @@ namespace ESM4
             // 0x00000100 = Pulse Slow
             // 0x00000200 = Spot Light
             // 0x00000400 = Spot Shadow
-            std::int32_t  flags;
-            float         falloff = 1.f;
-            float         FOV = 90; // FIXME: FOV in degrees or radians?
-            float         nearClip;           // TES5 only
-            float         frequency;          // TES5 only
-            float         intensityAmplitude; // TES5 only
-            float         movementAmplitude;  // TES5 only
-            std::uint32_t value;   // gold
-            float         weight;
+            std::int32_t flags;
+            float falloff = 1.f;
+            float FOV = 90; // FIXME: FOV in degrees or radians?
+            float nearClip; // TES5 only
+            float frequency; // TES5 only
+            float intensityAmplitude; // TES5 only
+            float movementAmplitude; // TES5 only
+            std::uint32_t value; // gold
+            float weight;
         };
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -85,9 +85,9 @@ namespace ESM4
         Data mData;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadltex.cpp b/components/esm4/loadltex.cpp
index 6edcd4ae05..d36f492cce 100644
--- a/components/esm4/loadltex.cpp
+++ b/components/esm4/loadltex.cpp
@@ -41,7 +41,7 @@ void ESM4::LandTexture::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
     std::uint32_t esmVer = reader.esmVersion();
     bool isFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
 
@@ -50,7 +50,9 @@ void ESM4::LandTexture::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
             case ESM4::SUB_HNAM:
             {
                 if (isFONV)
@@ -62,7 +64,7 @@ void ESM4::LandTexture::load(ESM4::Reader& reader)
                 if ((reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
                     && subHdr.dataSize == 2) // FO3 is VER_094 but dataSize 3
                 {
-                    //assert(subHdr.dataSize == 2 && "LTEX unexpected HNAM size");
+                    // assert(subHdr.dataSize == 2 && "LTEX unexpected HNAM size");
                     reader.get(mHavokFriction);
                     reader.get(mHavokRestitution);
                 }
@@ -75,21 +77,31 @@ void ESM4::LandTexture::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_ICON: reader.getZString(mTextureFile); break; // Oblivion only?
-            case ESM4::SUB_SNAM: reader.get(mTextureSpecular); break;
-            case ESM4::SUB_GNAM: reader.getFormId(mGrass);     break;
-            case ESM4::SUB_TNAM: reader.getFormId(mTexture);   break; // TES5 only
-            case ESM4::SUB_MNAM: reader.getFormId(mMaterial);  break; // TES5 only
+            case ESM4::SUB_ICON:
+                reader.getZString(mTextureFile);
+                break; // Oblivion only?
+            case ESM4::SUB_SNAM:
+                reader.get(mTextureSpecular);
+                break;
+            case ESM4::SUB_GNAM:
+                reader.getFormId(mGrass);
+                break;
+            case ESM4::SUB_TNAM:
+                reader.getFormId(mTexture);
+                break; // TES5 only
+            case ESM4::SUB_MNAM:
+                reader.getFormId(mMaterial);
+                break; // TES5 only
             default:
                 throw std::runtime_error("ESM4::LTEX::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
         }
     }
 }
 
-//void ESM4::LandTexture::save(ESM4::Writer& writer) const
+// void ESM4::LandTexture::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::LandTexture::blank()
+// void ESM4::LandTexture::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadltex.hpp b/components/esm4/loadltex.hpp
index e445f54525..5801dc6862 100644
--- a/components/esm4/loadltex.hpp
+++ b/components/esm4/loadltex.hpp
@@ -39,7 +39,7 @@ namespace ESM4
 
     struct LandTexture
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -63,9 +63,9 @@ namespace ESM4
         // ----------------------
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadlvlc.cpp b/components/esm4/loadlvlc.cpp
index a3067a0561..3a3a2cc42a 100644
--- a/components/esm4/loadlvlc.cpp
+++ b/components/esm4/loadlvlc.cpp
@@ -36,18 +36,28 @@ void ESM4::LevelledCreature::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_SCRI: reader.getFormId(mScriptId);    break;
-            case ESM4::SUB_TNAM: reader.getFormId(mTemplate);  break;
-            case ESM4::SUB_LVLD: reader.get(mChanceNone);      break;
-            case ESM4::SUB_LVLF: reader.get(mLvlCreaFlags);    break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_SCRI:
+                reader.getFormId(mScriptId);
+                break;
+            case ESM4::SUB_TNAM:
+                reader.getFormId(mTemplate);
+                break;
+            case ESM4::SUB_LVLD:
+                reader.get(mChanceNone);
+                break;
+            case ESM4::SUB_LVLF:
+                reader.get(mLvlCreaFlags);
+                break;
             case ESM4::SUB_LVLO:
             {
                 static LVLO lvlo;
@@ -58,8 +68,8 @@ void ESM4::LevelledCreature::load(ESM4::Reader& reader)
                         reader.get(lvlo.level);
                         reader.get(lvlo.item);
                         reader.get(lvlo.count);
-                        //std::cout << "LVLC " << mEditorId << " LVLO lev " << lvlo.level << ", item " << lvlo.item
-                                  //<< ", count " << lvlo.count << std::endl;
+                        // std::cout << "LVLC " << mEditorId << " LVLO lev " << lvlo.level << ", item " << lvlo.item
+                        //<< ", count " << lvlo.count << std::endl;
                         // FIXME: seems to happen only once, don't add to mLvlObject
                         // LVLC TesKvatchCreature LVLO lev 1, item 1393819648, count 2
                         // 0x0001, 0x5314 0000, 0x0002
@@ -77,7 +87,7 @@ void ESM4::LevelledCreature::load(ESM4::Reader& reader)
             }
             case ESM4::SUB_OBND: // FO3
             {
-                //std::cout << "LVLC " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "LVLC " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -111,10 +121,10 @@ std::int8_t ESM4::LevelledCreature::chanceNone() const
         return (mChanceNone & 0x7f); // FIXME: 0x80 is just a guess
 }
 
-//void ESM4::LevelledCreature::save(ESM4::Writer& writer) const
+// void ESM4::LevelledCreature::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::LevelledCreature::blank()
+// void ESM4::LevelledCreature::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadlvlc.hpp b/components/esm4/loadlvlc.hpp
index 44aadbe36e..934e3da527 100644
--- a/components/esm4/loadlvlc.hpp
+++ b/components/esm4/loadlvlc.hpp
@@ -40,7 +40,7 @@ namespace ESM4
 
     struct LevelledCreature
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -59,9 +59,9 @@ namespace ESM4
         std::int8_t chanceNone() const;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadlvli.cpp b/components/esm4/loadlvli.cpp
index 68e458e73c..637814641c 100644
--- a/components/esm4/loadlvli.cpp
+++ b/components/esm4/loadlvli.cpp
@@ -26,8 +26,8 @@
 */
 #include "loadlvli.hpp"
 
-#include <stdexcept>
 #include <iostream> // FIXME: for debugging
+#include <stdexcept>
 
 #include "reader.hpp"
 //#include "writer.hpp"
@@ -36,17 +36,26 @@ void ESM4::LevelledItem::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_LVLD: reader.get(mChanceNone); break;
-            case ESM4::SUB_LVLF: reader.get(mLvlItemFlags); mHasLvlItemFlags = true; break;
-            case ESM4::SUB_DATA: reader.get(mData); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_LVLD:
+                reader.get(mChanceNone);
+                break;
+            case ESM4::SUB_LVLF:
+                reader.get(mLvlItemFlags);
+                mHasLvlItemFlags = true;
+                break;
+            case ESM4::SUB_DATA:
+                reader.get(mData);
+                break;
             case ESM4::SUB_LVLO:
             {
                 static LVLO lvlo;
@@ -57,8 +66,9 @@ void ESM4::LevelledItem::load(ESM4::Reader& reader)
                         reader.get(lvlo.level);
                         reader.get(lvlo.item);
                         reader.get(lvlo.count);
-//                        std::cout << "LVLI " << mEditorId << " LVLO lev " << lvlo.level << ", item " << lvlo.item
-//                                  << ", count " << lvlo.count << std::endl;
+                        //                        std::cout << "LVLI " << mEditorId << " LVLO lev " << lvlo.level << ",
+                        //                        item " << lvlo.item
+                        //                                  << ", count " << lvlo.count << std::endl;
                         break;
                     }
                     else
@@ -77,7 +87,8 @@ void ESM4::LevelledItem::load(ESM4::Reader& reader)
             case ESM4::SUB_LVLG: // FO3/FONV
             {
 
-                //std::cout << "LVLI " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize << std::endl;
+                // std::cout << "LVLI " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize <<
+                // std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -87,8 +98,8 @@ void ESM4::LevelledItem::load(ESM4::Reader& reader)
     }
 
     // FIXME: testing
-    //if (mHasLvlItemFlags && mChanceNone >= 90)
-        //std::cout << "LVLI " << mEditorId << " chance none " << int(mChanceNone) << std::endl;
+    // if (mHasLvlItemFlags && mChanceNone >= 90)
+    // std::cout << "LVLI " << mEditorId << " chance none " << int(mChanceNone) << std::endl;
 }
 
 bool ESM4::LevelledItem::calcAllLvlLessThanPlayer() const
@@ -123,10 +134,10 @@ bool ESM4::LevelledItem::useAll() const
         return false;
 }
 
-//void ESM4::LevelledItem::save(ESM4::Writer& writer) const
+// void ESM4::LevelledItem::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::LevelledItem::blank()
+// void ESM4::LevelledItem::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadlvli.hpp b/components/esm4/loadlvli.hpp
index 290658e86d..e8cbe857a3 100644
--- a/components/esm4/loadlvli.hpp
+++ b/components/esm4/loadlvli.hpp
@@ -40,7 +40,7 @@ namespace ESM4
 
     struct LevelledItem
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -60,9 +60,9 @@ namespace ESM4
         std::int8_t chanceNone() const;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadlvln.cpp b/components/esm4/loadlvln.cpp
index bd1423d0ac..cf5f70c27c 100644
--- a/components/esm4/loadlvln.cpp
+++ b/components/esm4/loadlvln.cpp
@@ -36,19 +36,29 @@ void ESM4::LevelledNpc::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
-    //std::uint32_t esmVer = reader.esmVersion(); // currently unused
+    mFlags = reader.hdr().record.flags;
+    // std::uint32_t esmVer = reader.esmVersion(); // currently unused
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_MODL: reader.getZString(mModel);    break;
-            case ESM4::SUB_LLCT: reader.get(mListCount);       break;
-            case ESM4::SUB_LVLD: reader.get(mChanceNone);      break;
-            case ESM4::SUB_LVLF: reader.get(mLvlActorFlags);   break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_LLCT:
+                reader.get(mListCount);
+                break;
+            case ESM4::SUB_LVLD:
+                reader.get(mChanceNone);
+                break;
+            case ESM4::SUB_LVLF:
+                reader.get(mLvlActorFlags);
+                break;
             case ESM4::SUB_LVLO:
             {
                 static LVLO lvlo;
@@ -64,16 +74,16 @@ void ESM4::LevelledNpc::load(ESM4::Reader& reader)
                     else
                         throw std::runtime_error("ESM4::LVLN::load - " + mEditorId + " LVLO size error");
                 }
-//              else if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || isFONV)
-//              {
-//                  std::uint32_t level;
-//                  reader.get(level);
-//                  lvlo.level = static_cast<std::uint16_t>(level);
-//                  reader.get(lvlo.item);
-//                  std::uint32_t count;
-//                  reader.get(count);
-//                  lvlo.count = static_cast<std::uint16_t>(count);
-//              }
+                //              else if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || isFONV)
+                //              {
+                //                  std::uint32_t level;
+                //                  reader.get(level);
+                //                  lvlo.level = static_cast<std::uint16_t>(level);
+                //                  reader.get(lvlo.item);
+                //                  std::uint32_t count;
+                //                  reader.get(count);
+                //                  lvlo.count = static_cast<std::uint16_t>(count);
+                //              }
                 else
                     reader.get(lvlo);
 
@@ -85,7 +95,7 @@ void ESM4::LevelledNpc::load(ESM4::Reader& reader)
             case ESM4::SUB_OBND: // object bounds
             case ESM4::SUB_MODT: // model texture data
             {
-                //std::cout << "LVLN " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "LVLN " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -95,10 +105,10 @@ void ESM4::LevelledNpc::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::LevelledNpc::save(ESM4::Writer& writer) const
+// void ESM4::LevelledNpc::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::LevelledNpc::blank()
+// void ESM4::LevelledNpc::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadlvln.hpp b/components/esm4/loadlvln.hpp
index 49a7bb943b..265d1a20f0 100644
--- a/components/esm4/loadlvln.hpp
+++ b/components/esm4/loadlvln.hpp
@@ -40,7 +40,7 @@ namespace ESM4
 
     struct LevelledNpc
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -57,9 +57,9 @@ namespace ESM4
         inline std::int8_t chanceNone() const { return mChanceNone; }
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadmato.cpp b/components/esm4/loadmato.cpp
index 7e3ab43026..41b78d4e23 100644
--- a/components/esm4/loadmato.cpp
+++ b/components/esm4/loadmato.cpp
@@ -33,21 +33,25 @@
 
 void ESM4::Material::load(ESM4::Reader& reader)
 {
-    //mFormId = reader.adjustFormId(reader.hdr().record.id); // FIXME: use master adjusted?
+    // mFormId = reader.adjustFormId(reader.hdr().record.id); // FIXME: use master adjusted?
     mFormId = reader.hdr().record.id;
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_MODL: reader.getZString(mModel);    break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
             case ESM4::SUB_DNAM:
             case ESM4::SUB_DATA:
             {
-                //std::cout << "MATO " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "MATO " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -57,10 +61,10 @@ void ESM4::Material::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Material::save(ESM4::Writer& writer) const
+// void ESM4::Material::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Material::blank()
+// void ESM4::Material::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadmato.hpp b/components/esm4/loadmato.hpp
index 041b158c29..50fc7fcd59 100644
--- a/components/esm4/loadmato.hpp
+++ b/components/esm4/loadmato.hpp
@@ -39,16 +39,16 @@ namespace ESM4
 
     struct Material
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
         std::string mModel;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadmisc.cpp b/components/esm4/loadmisc.cpp
index 966910f775..62ad5c5396 100644
--- a/components/esm4/loadmisc.cpp
+++ b/components/esm4/loadmisc.cpp
@@ -35,23 +35,43 @@ void ESM4::MiscItem::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
-            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
-            case ESM4::SUB_MICO: reader.getZString(mMiniIcon); break; // FO3
-            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
-            case ESM4::SUB_DATA: reader.get(mData);         break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
-            case ESM4::SUB_YNAM: reader.getFormId(mPickUpSound); break;
-            case ESM4::SUB_ZNAM: reader.getFormId(mDropSound); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_ICON:
+                reader.getZString(mIcon);
+                break;
+            case ESM4::SUB_MICO:
+                reader.getZString(mMiniIcon);
+                break; // FO3
+            case ESM4::SUB_SCRI:
+                reader.getFormId(mScriptId);
+                break;
+            case ESM4::SUB_DATA:
+                reader.get(mData);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
+            case ESM4::SUB_YNAM:
+                reader.getFormId(mPickUpSound);
+                break;
+            case ESM4::SUB_ZNAM:
+                reader.getFormId(mDropSound);
+                break;
             case ESM4::SUB_MODT:
             case ESM4::SUB_KSIZ:
             case ESM4::SUB_KWDA:
@@ -60,7 +80,7 @@ void ESM4::MiscItem::load(ESM4::Reader& reader)
             case ESM4::SUB_VMAD:
             case ESM4::SUB_RNAM: // FONV
             {
-                //std::cout << "MISC " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "MISC " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -70,10 +90,10 @@ void ESM4::MiscItem::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::MiscItem::save(ESM4::Writer& writer) const
+// void ESM4::MiscItem::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::MiscItem::blank()
+// void ESM4::MiscItem::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadmisc.hpp b/components/esm4/loadmisc.hpp
index 49297330ea..07e8b18f79 100644
--- a/components/esm4/loadmisc.hpp
+++ b/components/esm4/loadmisc.hpp
@@ -42,12 +42,12 @@ namespace ESM4
 #pragma pack(push, 1)
         struct Data
         {
-            std::uint32_t value;   // gold
-            float         weight;
+            std::uint32_t value; // gold
+            float weight;
         };
 #pragma pack(pop)
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -65,9 +65,9 @@ namespace ESM4
         Data mData;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadmset.cpp b/components/esm4/loadmset.cpp
index 55a2619239..02b5a8dc0a 100644
--- a/components/esm4/loadmset.cpp
+++ b/components/esm4/loadmset.cpp
@@ -26,8 +26,8 @@
 */
 #include "loadmset.hpp"
 
-#include <stdexcept>
 #include <iostream> // FIXME: for debugging only
+#include <stdexcept>
 
 #include "reader.hpp"
 //#include "writer.hpp"
@@ -36,45 +36,101 @@ void ESM4::MediaSet::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
-            case ESM4::SUB_FULL: reader.getZString(mFullName);  break;
-            case ESM4::SUB_NAM1: reader.get(mSetType); break;
-            case ESM4::SUB_PNAM: reader.get(mEnabled); break;
-            case ESM4::SUB_NAM2: reader.getZString(mSet2); break;
-            case ESM4::SUB_NAM3: reader.getZString(mSet3); break;
-            case ESM4::SUB_NAM4: reader.getZString(mSet4); break;
-            case ESM4::SUB_NAM5: reader.getZString(mSet5); break;
-            case ESM4::SUB_NAM6: reader.getZString(mSet6); break;
-            case ESM4::SUB_NAM7: reader.getZString(mSet7); break;
-            case ESM4::SUB_HNAM: reader.getFormId(mSoundIntro); break;
-            case ESM4::SUB_INAM: reader.getFormId(mSoundOutro); break;
-            case ESM4::SUB_NAM8: reader.get(mLevel8); break;
-            case ESM4::SUB_NAM9: reader.get(mLevel9); break;
-            case ESM4::SUB_NAM0: reader.get(mLevel0); break;
-            case ESM4::SUB_ANAM: reader.get(mLevelA); break;
-            case ESM4::SUB_BNAM: reader.get(mLevelB); break;
-            case ESM4::SUB_CNAM: reader.get(mLevelC); break;
-            case ESM4::SUB_JNAM: reader.get(mBoundaryDayOuter); break;
-            case ESM4::SUB_KNAM: reader.get(mBoundaryDayMiddle); break;
-            case ESM4::SUB_LNAM: reader.get(mBoundaryDayInner); break;
-            case ESM4::SUB_MNAM: reader.get(mBoundaryNightOuter); break;
-            case ESM4::SUB_NNAM: reader.get(mBoundaryNightMiddle); break;
-            case ESM4::SUB_ONAM: reader.get(mBoundaryNightInner); break;
-            case ESM4::SUB_DNAM: reader.get(mTime1); break;
-            case ESM4::SUB_ENAM: reader.get(mTime2); break;
-            case ESM4::SUB_FNAM: reader.get(mTime3); break;
-            case ESM4::SUB_GNAM: reader.get(mTime4); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getZString(mFullName);
+                break;
+            case ESM4::SUB_NAM1:
+                reader.get(mSetType);
+                break;
+            case ESM4::SUB_PNAM:
+                reader.get(mEnabled);
+                break;
+            case ESM4::SUB_NAM2:
+                reader.getZString(mSet2);
+                break;
+            case ESM4::SUB_NAM3:
+                reader.getZString(mSet3);
+                break;
+            case ESM4::SUB_NAM4:
+                reader.getZString(mSet4);
+                break;
+            case ESM4::SUB_NAM5:
+                reader.getZString(mSet5);
+                break;
+            case ESM4::SUB_NAM6:
+                reader.getZString(mSet6);
+                break;
+            case ESM4::SUB_NAM7:
+                reader.getZString(mSet7);
+                break;
+            case ESM4::SUB_HNAM:
+                reader.getFormId(mSoundIntro);
+                break;
+            case ESM4::SUB_INAM:
+                reader.getFormId(mSoundOutro);
+                break;
+            case ESM4::SUB_NAM8:
+                reader.get(mLevel8);
+                break;
+            case ESM4::SUB_NAM9:
+                reader.get(mLevel9);
+                break;
+            case ESM4::SUB_NAM0:
+                reader.get(mLevel0);
+                break;
+            case ESM4::SUB_ANAM:
+                reader.get(mLevelA);
+                break;
+            case ESM4::SUB_BNAM:
+                reader.get(mLevelB);
+                break;
+            case ESM4::SUB_CNAM:
+                reader.get(mLevelC);
+                break;
+            case ESM4::SUB_JNAM:
+                reader.get(mBoundaryDayOuter);
+                break;
+            case ESM4::SUB_KNAM:
+                reader.get(mBoundaryDayMiddle);
+                break;
+            case ESM4::SUB_LNAM:
+                reader.get(mBoundaryDayInner);
+                break;
+            case ESM4::SUB_MNAM:
+                reader.get(mBoundaryNightOuter);
+                break;
+            case ESM4::SUB_NNAM:
+                reader.get(mBoundaryNightMiddle);
+                break;
+            case ESM4::SUB_ONAM:
+                reader.get(mBoundaryNightInner);
+                break;
+            case ESM4::SUB_DNAM:
+                reader.get(mTime1);
+                break;
+            case ESM4::SUB_ENAM:
+                reader.get(mTime2);
+                break;
+            case ESM4::SUB_FNAM:
+                reader.get(mTime3);
+                break;
+            case ESM4::SUB_GNAM:
+                reader.get(mTime4);
+                break;
             case ESM4::SUB_DATA:
             {
-                //std::cout << "MSET " << ESM::printName(subHdr.typeId) << " skipping..."
-                          //<< subHdr.dataSize << std::endl;
+                // std::cout << "MSET " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -84,10 +140,10 @@ void ESM4::MediaSet::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::MediaSet::save(ESM4::Writer& writer) const
+// void ESM4::MediaSet::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::MediaSet::blank()
+// void ESM4::MediaSet::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadmset.hpp b/components/esm4/loadmset.hpp
index 7fa9450236..4f7b8dfa09 100644
--- a/components/esm4/loadmset.hpp
+++ b/components/esm4/loadmset.hpp
@@ -39,7 +39,7 @@ namespace ESM4
 
     struct MediaSet
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -56,12 +56,12 @@ namespace ESM4
         // 0x08 night outer, 0x10 night middle, 0x20 night inner
         std::uint8_t mEnabled; // for location
 
-        float mBoundaryDayOuter;    // %
-        float mBoundaryDayMiddle;   // %
-        float mBoundaryDayInner;    // %
-        float mBoundaryNightOuter;  // %
+        float mBoundaryDayOuter; // %
+        float mBoundaryDayMiddle; // %
+        float mBoundaryDayInner; // %
+        float mBoundaryNightOuter; // %
         float mBoundaryNightMiddle; // %
-        float mBoundaryNightInner;  // %
+        float mBoundaryNightInner; // %
 
         // start at 2 to reduce confusion
         std::string mSet2; // NAM2
@@ -87,9 +87,9 @@ namespace ESM4
         FormId mSoundOutro; // INAM
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadmstt.cpp b/components/esm4/loadmstt.cpp
index 1deb5603f8..0f6a3d6cdb 100644
--- a/components/esm4/loadmstt.cpp
+++ b/components/esm4/loadmstt.cpp
@@ -36,17 +36,25 @@ void ESM4::MovableStatic::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_MODL: reader.getZString(mModel);    break;
-            case ESM4::SUB_DATA: reader.get(mData);            break;
-            case ESM4::SUB_SNAM: reader.get(mLoopingSound);    break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_DATA:
+                reader.get(mData);
+                break;
+            case ESM4::SUB_SNAM:
+                reader.get(mLoopingSound);
+                break;
             case ESM4::SUB_DEST: // destruction data
             case ESM4::SUB_OBND: // object bounds
             case ESM4::SUB_MODT: // model texture data
@@ -58,7 +66,7 @@ void ESM4::MovableStatic::load(ESM4::Reader& reader)
             case ESM4::SUB_FULL:
             case ESM4::SUB_MODB:
             {
-                //std::cout << "MSTT " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "MSTT " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -68,10 +76,10 @@ void ESM4::MovableStatic::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::MovableStatic::save(ESM4::Writer& writer) const
+// void ESM4::MovableStatic::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::MovableStatic::blank()
+// void ESM4::MovableStatic::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadmstt.hpp b/components/esm4/loadmstt.hpp
index eceabda161..c7e5b34cd0 100644
--- a/components/esm4/loadmstt.hpp
+++ b/components/esm4/loadmstt.hpp
@@ -38,7 +38,7 @@ namespace ESM4
 
     struct MovableStatic
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -48,9 +48,9 @@ namespace ESM4
         FormId mLoopingSound;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadmusc.cpp b/components/esm4/loadmusc.cpp
index 566fcb2401..4b554807a6 100644
--- a/components/esm4/loadmusc.cpp
+++ b/components/esm4/loadmusc.cpp
@@ -40,24 +40,27 @@ void ESM4::Music::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FNAM: reader.getZString(mMusicFile);
-                                 //std::cout << "music: " << /*formIdToString(mFormId)*/mEditorId << " " << mMusicFile << std::endl;
-                                 break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FNAM:
+                reader.getZString(mMusicFile);
+                // std::cout << "music: " << /*formIdToString(mFormId)*/mEditorId << " " << mMusicFile << std::endl;
+                break;
             case ESM4::SUB_ANAM: // FONV float (attenuation in db? loop if positive?)
             case ESM4::SUB_WNAM: // TES5
             case ESM4::SUB_PNAM: // TES5
             case ESM4::SUB_TNAM: // TES5
             {
-                //std::cout << "MUSC " << ESM::printName(subHdr.typeId) << " skipping..."
-                          //<< subHdr.dataSize << std::endl;
+                // std::cout << "MUSC " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -67,10 +70,10 @@ void ESM4::Music::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Music::save(ESM4::Writer& writer) const
+// void ESM4::Music::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Music::blank()
+// void ESM4::Music::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadmusc.hpp b/components/esm4/loadmusc.hpp
index c54c9fa67c..56f5821bc0 100644
--- a/components/esm4/loadmusc.hpp
+++ b/components/esm4/loadmusc.hpp
@@ -41,16 +41,16 @@ namespace ESM4
 
     struct Music
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
         std::string mMusicFile;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadnavi.cpp b/components/esm4/loadnavi.cpp
index ae8d433f28..7b8f669f17 100644
--- a/components/esm4/loadnavi.cpp
+++ b/components/esm4/loadnavi.cpp
@@ -52,7 +52,7 @@ void ESM4::Navigation::IslandInfo::load(ESM4::Reader& reader)
     if (count)
     {
         triangles.resize(count);
-        //std::cout << "NVMI island triangles " << std::dec << count << std::endl; // FIXME
+        // std::cout << "NVMI island triangles " << std::dec << count << std::endl; // FIXME
         for (std::vector<Navigation::Triangle>::iterator it = triangles.begin(); it != triangles.end(); ++it)
         {
             reader.get(*it);
@@ -105,7 +105,7 @@ void ESM4::Navigation::NavMeshInfo::load(ESM4::Reader& reader)
     reader.get(count); // countMerged;
     if (count)
     {
-        //std::cout << "NVMI countMerged " << std::dec << count << std::endl;
+        // std::cout << "NVMI countMerged " << std::dec << count << std::endl;
         formIdMerged.resize(count);
         for (std::vector<FormId>::iterator it = formIdMerged.begin(); it != formIdMerged.end(); ++it)
         {
@@ -116,7 +116,7 @@ void ESM4::Navigation::NavMeshInfo::load(ESM4::Reader& reader)
     reader.get(count); // countPrefMerged;
     if (count)
     {
-        //std::cout << "NVMI countPrefMerged " << std::dec << count << std::endl;
+        // std::cout << "NVMI countPrefMerged " << std::dec << count << std::endl;
         formIdPrefMerged.resize(count);
         for (std::vector<FormId>::iterator it = formIdPrefMerged.begin(); it != formIdPrefMerged.end(); ++it)
         {
@@ -127,7 +127,7 @@ void ESM4::Navigation::NavMeshInfo::load(ESM4::Reader& reader)
     reader.get(count); // countLinkedDoors;
     if (count)
     {
-        //std::cout << "NVMI countLinkedDoors " << std::dec << count << std::endl;
+        // std::cout << "NVMI countLinkedDoors " << std::dec << count << std::endl;
         linkedDoors.resize(count);
         for (std::vector<DoorRef>::iterator it = linkedDoors.begin(); it != linkedDoors.end(); ++it)
         {
@@ -149,8 +149,8 @@ void ESM4::Navigation::NavMeshInfo::load(ESM4::Reader& reader)
     reader.get(locationMarker);
 
     reader.get(worldSpaceId);
-    //FLG_Tamriel    = 0x0000003c, // grid info follows, possibly Tamriel?
-    //FLG_Morrowind  = 0x01380000, // grid info follows, probably Skywind
+    // FLG_Tamriel    = 0x0000003c, // grid info follows, possibly Tamriel?
+    // FLG_Morrowind  = 0x01380000, // grid info follows, probably Skywind
     if (worldSpaceId == 0x0000003c || worldSpaceId == 0x01380000)
     {
         reader.get(cellGrid.grid.y); // NOTE: reverse order
@@ -237,8 +237,8 @@ void ESM4::Navigation::NavMeshInfo::load(ESM4::Reader& reader)
 //
 void ESM4::Navigation::load(ESM4::Reader& reader)
 {
-    //mFormId = reader.hdr().record.id;
-    //mFlags  = reader.hdr().record.flags;
+    // mFormId = reader.hdr().record.id;
+    // mFlags  = reader.hdr().record.flags;
     std::uint32_t esmVer = reader.esmVersion();
     bool isFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
 
@@ -250,7 +250,7 @@ void ESM4::Navigation::load(ESM4::Reader& reader)
             case ESM4::SUB_EDID: // seems to be unused?
             {
                 if (!reader.getZString(mEditorId))
-                    throw std::runtime_error ("NAVI EDID data read error");
+                    throw std::runtime_error("NAVI EDID data read error");
                 break;
             }
             case ESM4::SUB_NVPP:
@@ -278,8 +278,8 @@ void ESM4::Navigation::load(ESM4::Reader& reader)
                     if (count)
                     {
                         preferredPaths.resize(count);
-                        for (std::vector<FormId>::iterator it = preferredPaths.begin();
-                                it != preferredPaths.end(); ++it)
+                        for (std::vector<FormId>::iterator it = preferredPaths.begin(); it != preferredPaths.end();
+                             ++it)
                         {
                             reader.get(*it);
                         }
@@ -312,11 +312,11 @@ void ESM4::Navigation::load(ESM4::Reader& reader)
                     std::cout << "node " << std::hex << node // FIXME: debugging only
                         << ", index " << index << ", i " << std::dec << total+i << std::endl;
 #endif
-                    //std::pair<std::map<FormId, std::uint32_t>::iterator, bool> res =
-                        mPathIndexMap.insert(std::make_pair(node, index));
+                    // std::pair<std::map<FormId, std::uint32_t>::iterator, bool> res =
+                    mPathIndexMap.insert(std::make_pair(node, index));
                     // FIXME: this throws if more than one file is being loaded
-                    //if (!res.second)
-                        //throw std::runtime_error ("node already exists in the preferred path index map");
+                    // if (!res.second)
+                    // throw std::runtime_error ("node already exists in the preferred path index map");
                 }
                 break;
             }
@@ -324,7 +324,7 @@ void ESM4::Navigation::load(ESM4::Reader& reader)
             {
                 std::uint32_t version; // always the same? (0x0c)
                 reader.get(version); // TODO: store this or use it for merging?
-                //std::cout << "NAVI version " << std::dec << version << std::endl;
+                // std::cout << "NAVI version " << std::dec << version << std::endl;
                 break;
             }
             case ESM4::SUB_NVMI: // multiple
@@ -335,10 +335,10 @@ void ESM4::Navigation::load(ESM4::Reader& reader)
                     break;
                 }
 
-                //std::cout << "\nNVMI start" << std::endl;
+                // std::cout << "\nNVMI start" << std::endl;
                 NavMeshInfo nvmi;
                 nvmi.load(reader);
-                mNavMeshInfo.push_back (nvmi);
+                mNavMeshInfo.push_back(nvmi);
                 break;
             }
             case ESM4::SUB_NVSI: // from Dawnguard onwards
@@ -355,10 +355,10 @@ void ESM4::Navigation::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Navigation::save(ESM4::Writer& writer) const
+// void ESM4::Navigation::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Navigation::blank()
+// void ESM4::Navigation::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadnavi.hpp b/components/esm4/loadnavi.hpp
index 117aa102d0..e7d5ede7b3 100644
--- a/components/esm4/loadnavi.hpp
+++ b/components/esm4/loadnavi.hpp
@@ -28,8 +28,8 @@
 #define ESM4_NAVI_H
 
 #include <cstdint>
-#include <vector>
 #include <map>
+#include <vector>
 
 #include "common.hpp" // CellGrid, Vertex
 
@@ -40,7 +40,7 @@ namespace ESM4
 
     struct Navigation
     {
-#pragma pack(push,1)
+#pragma pack(push, 1)
         struct DoorRef
         {
             std::uint32_t unknown;
@@ -71,9 +71,9 @@ namespace ESM4
 
         enum Flags // NVMI island flags (not certain)
         {
-            FLG_Island     = 0x00000020,
-            FLG_Modified   = 0x00000000, // not island
-            FLG_Unmodified = 0x00000040  // not island
+            FLG_Island = 0x00000020,
+            FLG_Modified = 0x00000000, // not island
+            FLG_Unmodified = 0x00000040 // not island
         };
 
         struct NavMeshInfo
@@ -100,14 +100,14 @@ namespace ESM4
 
         std::vector<NavMeshInfo> mNavMeshInfo;
 
-        std::vector<std::pair<std::uint32_t, std::vector<FormId> > > mPreferredPaths;
+        std::vector<std::pair<std::uint32_t, std::vector<FormId>>> mPreferredPaths;
 
         std::map<FormId, std::uint32_t> mPathIndexMap;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadnavm.cpp b/components/esm4/loadnavm.cpp
index 5a90f67b01..0def0dbdb7 100644
--- a/components/esm4/loadnavm.cpp
+++ b/components/esm4/loadnavm.cpp
@@ -26,9 +26,9 @@
 */
 #include "loadnavm.hpp"
 
-#include <stdexcept>
 #include <cassert>
 #include <cstring>
+#include <stdexcept>
 
 #include <iostream> // FIXME: debugging only
 
@@ -37,16 +37,16 @@
 
 void ESM4::NavMesh::NVNMstruct::load(ESM4::Reader& reader)
 {
-    //std::cout << "start: divisor " << std::dec << divisor << ", segments " << triSegments.size() << //std::endl;
-        //"this 0x" << this << std::endl; // FIXME
+    // std::cout << "start: divisor " << std::dec << divisor << ", segments " << triSegments.size() << //std::endl;
+    //"this 0x" << this << std::endl; // FIXME
 
     std::uint32_t count;
 
     reader.get(unknownNVER);
     reader.get(unknownLCTN);
     reader.get(worldSpaceId);
-    //FLG_Tamriel    = 0x0000003c, // grid info follows, possibly Tamriel?
-    //FLG_Morrowind  = 0x01380000, // grid info follows, probably Skywind
+    // FLG_Tamriel    = 0x0000003c, // grid info follows, possibly Tamriel?
+    // FLG_Morrowind  = 0x01380000, // grid info follows, probably Skywind
     if (worldSpaceId == 0x0000003c || worldSpaceId == 0x01380000)
     {
         //   ^
@@ -164,7 +164,7 @@ void ESM4::NavMesh::NVNMstruct::load(ESM4::Reader& reader)
 
     // FIXME: should check remaining size here
     // there are divisor^2 segments, each segment is a vector of triangle indices
-    for (unsigned int i = 0; i < divisor*divisor; ++i)
+    for (unsigned int i = 0; i < divisor * divisor; ++i)
     {
         reader.get(count); // NOTE: count may be zero
 
@@ -176,7 +176,7 @@ void ESM4::NavMesh::NVNMstruct::load(ESM4::Reader& reader)
         }
         triSegments.push_back(indices);
     }
-    assert(triSegments.size() == divisor*divisor && "tiangle segments size is not the square of divisor");
+    assert(triSegments.size() == divisor * divisor && "tiangle segments size is not the square of divisor");
 #if 0
     if (triSegments.size() != divisor*divisor)
         std::cout << "divisor " << std::dec << divisor << ", segments " << triSegments.size() << //std::endl;
@@ -187,9 +187,9 @@ void ESM4::NavMesh::NVNMstruct::load(ESM4::Reader& reader)
 void ESM4::NavMesh::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
-    //std::cout << "NavMesh 0x" << std::hex << this << std::endl; // FIXME
+    // std::cout << "NavMesh 0x" << std::hex << this << std::endl; // FIXME
     std::uint32_t subSize = 0; // for XXXX sub record
 
 // FIXME: debugging only
@@ -221,8 +221,8 @@ void ESM4::NavMesh::load(ESM4::Reader& reader)
                     subSize = 0;
                 }
                 else
-                    //const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
-                    //std::cout << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                    // const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+                    // std::cout << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                     reader.skipSubRecordData(); // FIXME: process the subrecord rather than skip
 
                 break;
@@ -246,17 +246,15 @@ void ESM4::NavMesh::load(ESM4::Reader& reader)
                 break;
             }
             default:
-                throw std::runtime_error("ESM4::NAVM::load - Unknown subrecord " +
-                                          ESM::printName(reader.subRecordHeader().typeId));
+                throw std::runtime_error(
+                    "ESM4::NAVM::load - Unknown subrecord " + ESM::printName(reader.subRecordHeader().typeId));
         }
     }
-    //std::cout << "num nvnm " << std::dec << mData.size() << std::endl; // FIXME
+    // std::cout << "num nvnm " << std::dec << mData.size() << std::endl; // FIXME
 }
 
-//void ESM4::NavMesh::save(ESM4::Writer& writer) const
+// void ESM4::NavMesh::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-void ESM4::NavMesh::blank()
-{
-}
+void ESM4::NavMesh::blank() {}
diff --git a/components/esm4/loadnavm.hpp b/components/esm4/loadnavm.hpp
index a7a86cf71d..682c9d8f2f 100644
--- a/components/esm4/loadnavm.hpp
+++ b/components/esm4/loadnavm.hpp
@@ -39,7 +39,7 @@ namespace ESM4
 
     struct NavMesh
     {
-#pragma pack(push,1)
+#pragma pack(push, 1)
         struct Triangle
         {
             std::uint16_t vertexIndex0;
@@ -55,7 +55,7 @@ namespace ESM4
         struct ExtConnection
         {
             std::uint32_t unknown;
-            FormId        navMesh;
+            FormId navMesh;
             std::uint16_t triangleIndex;
         };
 
@@ -63,7 +63,7 @@ namespace ESM4
         {
             std::uint16_t triangleIndex;
             std::uint32_t unknown;
-            FormId        doorRef;
+            FormId doorRef;
         };
 #pragma pack(pop)
 
@@ -71,12 +71,12 @@ namespace ESM4
         {
             std::uint32_t unknownNVER;
             std::uint32_t unknownLCTN;
-            FormId        worldSpaceId;
+            FormId worldSpaceId;
             CellGrid cellGrid;
-            std::vector<Vertex>        verticies;
-            std::vector<Triangle>      triangles;
+            std::vector<Vertex> verticies;
+            std::vector<Triangle> triangles;
             std::vector<ExtConnection> extConns;
-            std::vector<DoorTriangle>  doorTriangles;
+            std::vector<DoorTriangle> doorTriangles;
             std::vector<std::uint16_t> coverTriangles;
             std::uint32_t divisor;
             float maxXDist;
@@ -88,18 +88,18 @@ namespace ESM4
             float maxY;
             float maxZ;
             // there are divisor^2 segments, each segment is a vector of triangle indices
-            std::vector<std::vector<std::uint16_t> >  triSegments;
+            std::vector<std::vector<std::uint16_t>> triSegments;
 
             void load(ESM4::Reader& esm);
         };
 
         std::vector<NVNMstruct> mData; // Up to 4 skywind cells in one Morrowind cell
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
         void blank();
     };
diff --git a/components/esm4/loadnote.cpp b/components/esm4/loadnote.cpp
index 5f4b836fcf..f0611758c7 100644
--- a/components/esm4/loadnote.cpp
+++ b/components/esm4/loadnote.cpp
@@ -36,17 +36,25 @@ void ESM4::Note::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
-            case ESM4::SUB_ICON: reader.getZString(mIcon); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_ICON:
+                reader.getZString(mIcon);
+                break;
             case ESM4::SUB_DATA:
             case ESM4::SUB_MODB:
             case ESM4::SUB_ONAM:
@@ -55,7 +63,7 @@ void ESM4::Note::load(ESM4::Reader& reader)
             case ESM4::SUB_XNAM:
             case ESM4::SUB_OBND:
             {
-                //std::cout << "NOTE " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "NOTE " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -65,10 +73,10 @@ void ESM4::Note::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Note::save(ESM4::Writer& writer) const
+// void ESM4::Note::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Note::blank()
+// void ESM4::Note::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadnote.hpp b/components/esm4/loadnote.hpp
index 33f08257e9..5b7105348a 100644
--- a/components/esm4/loadnote.hpp
+++ b/components/esm4/loadnote.hpp
@@ -39,7 +39,7 @@ namespace ESM4
 
     struct Note
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -48,9 +48,9 @@ namespace ESM4
         std::string mIcon;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadnpc.cpp b/components/esm4/loadnpc.cpp
index 78a65d2d62..eda5f8a4ca 100644
--- a/components/esm4/loadnpc.cpp
+++ b/components/esm4/loadnpc.cpp
@@ -26,12 +26,12 @@
 */
 #include "loadnpc.hpp"
 
-#include <stdexcept>
 #include <cstring>
-#include <string> // getline
+#include <iomanip> // NOTE: for testing only
 #include <iostream> // NOTE: for testing only
 #include <sstream> // NOTE: for testing only
-#include <iomanip>  // NOTE: for testing only
+#include <stdexcept>
+#include <string> // getline
 
 //#include <boost/iostreams/filtering_streambuf.hpp>
 //#include <boost/iostreams/copy.hpp>
@@ -45,21 +45,27 @@ void ESM4::Npc::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     std::uint32_t esmVer = reader.esmVersion();
     mIsTES4 = esmVer == ESM::VER_080 || esmVer == ESM::VER_100;
     mIsFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
-    //mIsTES5 = esmVer == ESM::VER_094 || esmVer == ESM::VER_170; // WARN: FO3 is also VER_094
+    // mIsTES5 = esmVer == ESM::VER_094 || esmVer == ESM::VER_170; // WARN: FO3 is also VER_094
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_MODL: reader.getZString(mModel);    break; // not for TES5, see Race
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break; // not for TES5, see Race
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
             case ESM4::SUB_CNTO:
             {
                 static InventoryItem inv; // FIXME: use unique_ptr here?
@@ -88,13 +94,25 @@ void ESM4::Npc::load(ESM4::Reader& reader)
                 reader.adjustFormId(mFaction.faction);
                 break;
             }
-            case ESM4::SUB_RNAM: reader.getFormId(mRace);      break;
-            case ESM4::SUB_CNAM: reader.getFormId(mClass);     break;
-            case ESM4::SUB_HNAM: reader.getFormId(mHair);      break; // not for TES5
-            case ESM4::SUB_ENAM: reader.getFormId(mEyes);      break;
+            case ESM4::SUB_RNAM:
+                reader.getFormId(mRace);
+                break;
+            case ESM4::SUB_CNAM:
+                reader.getFormId(mClass);
+                break;
+            case ESM4::SUB_HNAM:
+                reader.getFormId(mHair);
+                break; // not for TES5
+            case ESM4::SUB_ENAM:
+                reader.getFormId(mEyes);
+                break;
             //
-            case ESM4::SUB_INAM: reader.getFormId(mDeathItem); break;
-            case ESM4::SUB_SCRI: reader.getFormId(mScriptId);    break;
+            case ESM4::SUB_INAM:
+                reader.getFormId(mDeathItem);
+                break;
+            case ESM4::SUB_SCRI:
+                reader.getFormId(mScriptId);
+                break;
             //
             case ESM4::SUB_AIDT:
             {
@@ -109,7 +127,7 @@ void ESM4::Npc::load(ESM4::Reader& reader)
             }
             case ESM4::SUB_ACBS:
             {
-                //if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || mIsFONV)
+                // if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || mIsFONV)
                 if (subHdr.dataSize == 24)
                     reader.get(mBaseConfig);
                 else
@@ -129,10 +147,18 @@ void ESM4::Npc::load(ESM4::Reader& reader)
                 reader.get(&mData, 33); // FIXME: check packing
                 break;
             }
-            case ESM4::SUB_ZNAM: reader.getFormId(mCombatStyle); break;
-            case ESM4::SUB_CSCR: reader.getFormId(mSoundBase);   break;
-            case ESM4::SUB_CSDI: reader.getFormId(mSound);       break;
-            case ESM4::SUB_CSDC: reader.get(mSoundChance); break;
+            case ESM4::SUB_ZNAM:
+                reader.getFormId(mCombatStyle);
+                break;
+            case ESM4::SUB_CSCR:
+                reader.getFormId(mSoundBase);
+                break;
+            case ESM4::SUB_CSDI:
+                reader.getFormId(mSound);
+                break;
+            case ESM4::SUB_CSDC:
+                reader.get(mSoundChance);
+                break;
             case ESM4::SUB_WNAM:
             {
                 if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
@@ -141,7 +167,9 @@ void ESM4::Npc::load(ESM4::Reader& reader)
                     reader.get(mFootWeight);
                 break;
             }
-            case ESM4::SUB_MODB: reader.get(mBoundRadius); break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
             case ESM4::SUB_KFFZ:
             {
                 // Seems to be only below 3, and only happens 3 times while loading TES4:
@@ -149,10 +177,12 @@ void ESM4::Npc::load(ESM4::Reader& reader)
                 //   TurnLeft_SheogorathWithCane.kf
                 //   TurnRight_SheogorathWithCane.kf
                 if (!reader.getZeroTerminatedStringArray(mKf))
-                    throw std::runtime_error ("NPC_ KFFZ data read error");
+                    throw std::runtime_error("NPC_ KFFZ data read error");
                 break;
             }
-            case ESM4::SUB_LNAM: reader.get(mHairLength); break;
+            case ESM4::SUB_LNAM:
+                reader.get(mHairLength);
+                break;
             case ESM4::SUB_HCLR:
             {
                 reader.get(mHairColour.red);
@@ -162,7 +192,9 @@ void ESM4::Npc::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_TPLT: reader.get(mBaseTemplate); break;
+            case ESM4::SUB_TPLT:
+                reader.get(mBaseTemplate);
+                break;
             case ESM4::SUB_FGGS:
             {
                 mSymShapeModeCoefficients.resize(50);
@@ -190,8 +222,8 @@ void ESM4::Npc::load(ESM4::Reader& reader)
             case ESM4::SUB_FNAM:
             {
                 reader.get(mFgRace);
-                //std::cout << "race " << mEditorId << " " << mRace << std::endl; // FIXME
-                //std::cout << "fg race " << mEditorId << " " << mFgRace << std::endl; // FIXME
+                // std::cout << "race " << mEditorId << " " << mRace << std::endl; // FIXME
+                // std::cout << "fg race " << mEditorId << " " << mFgRace << std::endl; // FIXME
                 break;
             }
             case ESM4::SUB_PNAM: // FO3/FONV/TES5
@@ -215,9 +247,15 @@ void ESM4::Npc::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_DOFT: reader.getFormId(mDefaultOutfit); break;
-            case ESM4::SUB_SOFT: reader.getFormId(mSleepOutfit); break;
-            case ESM4::SUB_DPLT: reader.getFormId(mDefaultPkg); break; // AI package list
+            case ESM4::SUB_DOFT:
+                reader.getFormId(mDefaultOutfit);
+                break;
+            case ESM4::SUB_SOFT:
+                reader.getFormId(mSleepOutfit);
+                break;
+            case ESM4::SUB_DPLT:
+                reader.getFormId(mDefaultPkg);
+                break; // AI package list
             case ESM4::SUB_DEST:
             case ESM4::SUB_DSTD:
             case ESM4::SUB_DSTF:
@@ -236,13 +274,13 @@ void ESM4::Npc::load(ESM4::Reader& reader)
                         ss << std::setfill('0') << std::setw(2) << std::hex << (int)(dataBuf[i]);
                     if ((i & 0x000f) == 0xf) // wrap around
                         ss << "\n";
-                    else if (i < (size_t)(subHdr.dataSize-1)) // quiesce gcc
+                    else if (i < (size_t)(subHdr.dataSize - 1)) // quiesce gcc
                         ss << " ";
                 }
                 std::cout << ss.str() << std::endl;
 #else
-                //std::cout << "NPC_ " << ESM::printName(subHdr.typeId) << " skipping..."
-                          //<< subHdr.dataSize << std::endl;
+                // std::cout << "NPC_ " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
 #endif
                 break;
@@ -282,7 +320,7 @@ void ESM4::Npc::load(ESM4::Reader& reader)
             case ESM4::SUB_NAM4: // FO3
             case ESM4::SUB_COED: // FO3
             {
-                //std::cout << "NPC_ " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "NPC_ " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -292,10 +330,10 @@ void ESM4::Npc::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Npc::save(ESM4::Writer& writer) const
+// void ESM4::Npc::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Npc::blank()
+// void ESM4::Npc::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadnpc.hpp b/components/esm4/loadnpc.hpp
index 316caeecc2..e979544213 100644
--- a/components/esm4/loadnpc.hpp
+++ b/components/esm4/loadnpc.hpp
@@ -43,108 +43,108 @@ namespace ESM4
     {
         enum ACBS_TES4
         {
-            TES4_Female         = 0x000001,
-            TES4_Essential      = 0x000002,
-            TES4_Respawn        = 0x000008,
-            TES4_AutoCalcStats  = 0x000010,
-            TES4_PCLevelOffset  = 0x000080,
+            TES4_Female = 0x000001,
+            TES4_Essential = 0x000002,
+            TES4_Respawn = 0x000008,
+            TES4_AutoCalcStats = 0x000010,
+            TES4_PCLevelOffset = 0x000080,
             TES4_NoLowLevelProc = 0x000200,
-            TES4_NoRumors       = 0x002000,
-            TES4_Summonable     = 0x004000,
-            TES4_NoPersuasion   = 0x008000, // different meaning to crea
-            TES4_CanCorpseCheck = 0x100000  // opposite of crea
+            TES4_NoRumors = 0x002000,
+            TES4_Summonable = 0x004000,
+            TES4_NoPersuasion = 0x008000, // different meaning to crea
+            TES4_CanCorpseCheck = 0x100000 // opposite of crea
         };
 
         enum ACBS_FO3
         {
-            FO3_Female         = 0x00000001,
-            FO3_Essential      = 0x00000002,
-            FO3_PresetFace     = 0x00000004, // Is CharGen Face Preset
-            FO3_Respawn        = 0x00000008,
-            FO3_AutoCalcStats  = 0x00000010,
-            FO3_PCLevelMult    = 0x00000080,
-            FO3_UseTemplate    = 0x00000100,
+            FO3_Female = 0x00000001,
+            FO3_Essential = 0x00000002,
+            FO3_PresetFace = 0x00000004, // Is CharGen Face Preset
+            FO3_Respawn = 0x00000008,
+            FO3_AutoCalcStats = 0x00000010,
+            FO3_PCLevelMult = 0x00000080,
+            FO3_UseTemplate = 0x00000100,
             FO3_NoLowLevelProc = 0x00000200,
-            FO3_NoBloodSpray   = 0x00000800,
-            FO3_NoBloodDecal   = 0x00001000,
-            FO3_NoVATSMelee    = 0x00100000,
-            FO3_AnyRace        = 0x00400000,
-            FO3_AutoCalcServ   = 0x00800000,
-            FO3_NoKnockdown    = 0x04000000,
-            FO3_NotPushable    = 0x08000000,
-            FO3_NoRotateHead   = 0x40000000
+            FO3_NoBloodSpray = 0x00000800,
+            FO3_NoBloodDecal = 0x00001000,
+            FO3_NoVATSMelee = 0x00100000,
+            FO3_AnyRace = 0x00400000,
+            FO3_AutoCalcServ = 0x00800000,
+            FO3_NoKnockdown = 0x04000000,
+            FO3_NotPushable = 0x08000000,
+            FO3_NoRotateHead = 0x40000000
         };
 
         enum ACBS_TES5
         {
-            TES5_Female         = 0x00000001,
-            TES5_Essential      = 0x00000002,
-            TES5_PresetFace     = 0x00000004, // Is CharGen Face Preset
-            TES5_Respawn        = 0x00000008,
-            TES5_AutoCalcStats  = 0x00000010,
-            TES5_Unique         = 0x00000020,
-            TES5_NoStealth      = 0x00000040, // Doesn't affect stealth meter
-            TES5_PCLevelMult    = 0x00000080,
-          //TES5_Unknown        = 0x00000100, // Audio template?
-            TES5_Protected      = 0x00000800,
-            TES5_Summonable     = 0x00004000,
-            TES5_NoBleeding     = 0x00010000,
-            TES5_Owned          = 0x00040000, // owned/follow? (Horses, Atronachs, NOT Shadowmere)
-            TES5_GenderAnim     = 0x00080000, // Opposite Gender Anims
-            TES5_SimpleActor    = 0x00100000,
-            TES5_LoopedScript   = 0x00200000, // AAvenicci, Arcadia, Silvia, Afflicted, TortureVictims
-            TES5_LoopedAudio    = 0x10000000, // AAvenicci, Arcadia, Silvia, DA02 Cultists, Afflicted, TortureVictims
-            TES5_IsGhost        = 0x20000000, // Ghost/non-interactable (Ghosts, Nocturnal)
-            TES5_Invulnerable   = 0x80000000
+            TES5_Female = 0x00000001,
+            TES5_Essential = 0x00000002,
+            TES5_PresetFace = 0x00000004, // Is CharGen Face Preset
+            TES5_Respawn = 0x00000008,
+            TES5_AutoCalcStats = 0x00000010,
+            TES5_Unique = 0x00000020,
+            TES5_NoStealth = 0x00000040, // Doesn't affect stealth meter
+            TES5_PCLevelMult = 0x00000080,
+            // TES5_Unknown        = 0x00000100, // Audio template?
+            TES5_Protected = 0x00000800,
+            TES5_Summonable = 0x00004000,
+            TES5_NoBleeding = 0x00010000,
+            TES5_Owned = 0x00040000, // owned/follow? (Horses, Atronachs, NOT Shadowmere)
+            TES5_GenderAnim = 0x00080000, // Opposite Gender Anims
+            TES5_SimpleActor = 0x00100000,
+            TES5_LoopedScript = 0x00200000, // AAvenicci, Arcadia, Silvia, Afflicted, TortureVictims
+            TES5_LoopedAudio = 0x10000000, // AAvenicci, Arcadia, Silvia, DA02 Cultists, Afflicted, TortureVictims
+            TES5_IsGhost = 0x20000000, // Ghost/non-interactable (Ghosts, Nocturnal)
+            TES5_Invulnerable = 0x80000000
         };
 
         enum Template_Flags
         {
-            TES5_UseTraits    = 0x0001, // Destructible Object; Traits tab, including race, gender, height, weight,
-                                        // voice type, death item; Sounds tab; Animation tab; Character Gen tabs
-            TES5_UseStats     = 0x0002, // Stats tab, including level, autocalc, skills, health/magicka/stamina,
-                                        // speed, bleedout, class
-            TES5_UseFactions  = 0x0004, // both factions and assigned crime faction
+            TES5_UseTraits = 0x0001, // Destructible Object; Traits tab, including race, gender, height, weight,
+                                     // voice type, death item; Sounds tab; Animation tab; Character Gen tabs
+            TES5_UseStats = 0x0002, // Stats tab, including level, autocalc, skills, health/magicka/stamina,
+                                    // speed, bleedout, class
+            TES5_UseFactions = 0x0004, // both factions and assigned crime faction
             TES5_UseSpellList = 0x0008, // both spells and perks
-            TES5_UseAIData    = 0x0010, // AI Data tab, including aggression/confidence/morality, combat style and
-                                        // gift filter
+            TES5_UseAIData = 0x0010, // AI Data tab, including aggression/confidence/morality, combat style and
+                                     // gift filter
             TES5_UseAIPackage = 0x0020, // only the basic Packages listed on the AI Packages tab;
                                         // rest of tab controlled by Def Pack List
-            TES5_UseBaseData  = 0x0080, // including name and short name, and flags for Essential, Protected,
-                                        // Respawn, Summonable, Simple Actor, and Doesn't affect stealth meter
+            TES5_UseBaseData = 0x0080, // including name and short name, and flags for Essential, Protected,
+                                       // Respawn, Summonable, Simple Actor, and Doesn't affect stealth meter
             TES5_UseInventory = 0x0100, // Inventory tab, including all outfits and geared-up item
                                         // -- but not death item
-            TES5_UseScript    = 0x0200,
-            TES5_UseDefined   = 0x0400, // Def Pack List (the dropdown-selected package lists on the AI Packages tab)
-            TES5_UseAtkData   = 0x0800, // Attack Data tab, including override from behavior graph race,
-                                        // events, and data)
-            TES5_UseKeywords  = 0x1000
+            TES5_UseScript = 0x0200,
+            TES5_UseDefined = 0x0400, // Def Pack List (the dropdown-selected package lists on the AI Packages tab)
+            TES5_UseAtkData = 0x0800, // Attack Data tab, including override from behavior graph race,
+                                      // events, and data)
+            TES5_UseKeywords = 0x1000
         };
 
 #pragma pack(push, 1)
         struct SkillValues
         {
-            std::uint8_t  armorer;
-            std::uint8_t  athletics;
-            std::uint8_t  blade;
-            std::uint8_t  block;
-            std::uint8_t  blunt;
-            std::uint8_t  handToHand;
-            std::uint8_t  heavyArmor;
-            std::uint8_t  alchemy;
-            std::uint8_t  alteration;
-            std::uint8_t  conjuration;
-            std::uint8_t  destruction;
-            std::uint8_t  illusion;
-            std::uint8_t  mysticism;
-            std::uint8_t  restoration;
-            std::uint8_t  acrobatics;
-            std::uint8_t  lightArmor;
-            std::uint8_t  marksman;
-            std::uint8_t  mercantile;
-            std::uint8_t  security;
-            std::uint8_t  sneak;
-            std::uint8_t  speechcraft;
+            std::uint8_t armorer;
+            std::uint8_t athletics;
+            std::uint8_t blade;
+            std::uint8_t block;
+            std::uint8_t blunt;
+            std::uint8_t handToHand;
+            std::uint8_t heavyArmor;
+            std::uint8_t alchemy;
+            std::uint8_t alteration;
+            std::uint8_t conjuration;
+            std::uint8_t destruction;
+            std::uint8_t illusion;
+            std::uint8_t mysticism;
+            std::uint8_t restoration;
+            std::uint8_t acrobatics;
+            std::uint8_t lightArmor;
+            std::uint8_t marksman;
+            std::uint8_t mercantile;
+            std::uint8_t security;
+            std::uint8_t sneak;
+            std::uint8_t speechcraft;
         };
 
         struct HairColour
@@ -157,14 +157,14 @@ namespace ESM4
 
         struct Data
         {
-            SkillValues   skills;
+            SkillValues skills;
             std::uint32_t health;
             AttributeValues attribs;
         };
 
 #pragma pack(pop)
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         bool mIsTES4;
@@ -172,7 +172,7 @@ namespace ESM4
 
         std::string mEditorId;
         std::string mFullName;
-        std::string mModel;  // skeleton model (can be a marker in FO3/FONV)
+        std::string mModel; // skeleton model (can be a marker in FO3/FONV)
 
         FormId mRace;
         FormId mClass;
@@ -193,7 +193,7 @@ namespace ESM4
         std::vector<FormId> mAIPackages; // seems to be in priority order, 0 = highest priority
         ActorBaseConfig mBaseConfig; // union
         ActorFaction mFaction;
-        Data   mData;
+        Data mData;
         FormId mCombatStyle;
         FormId mSoundBase;
         FormId mSound;
@@ -206,21 +206,21 @@ namespace ESM4
         std::vector<InventoryItem> mInventory;
 
         FormId mBaseTemplate; // FO3/FONV/TES5
-        FormId mWornArmor;    // TES5 only?
+        FormId mWornArmor; // TES5 only?
 
         FormId mDefaultOutfit; // TES5 OTFT
-        FormId mSleepOutfit;   // TES5 OTFT
+        FormId mSleepOutfit; // TES5 OTFT
         FormId mDefaultPkg;
 
-        std::vector<float> mSymShapeModeCoefficients;    // size 0 or 50
-        std::vector<float> mAsymShapeModeCoefficients;   // size 0 or 30
-        std::vector<float> mSymTextureModeCoefficients;  // size 0 or 50
+        std::vector<float> mSymShapeModeCoefficients; // size 0 or 50
+        std::vector<float> mAsymShapeModeCoefficients; // size 0 or 30
+        std::vector<float> mSymTextureModeCoefficients; // size 0 or 50
         std::int16_t mFgRace;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadotft.cpp b/components/esm4/loadotft.cpp
index e24e3fbc9c..f8035d5082 100644
--- a/components/esm4/loadotft.cpp
+++ b/components/esm4/loadotft.cpp
@@ -36,14 +36,16 @@ void ESM4::Outfit::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
             case ESM4::SUB_INAM:
             {
                 std::size_t numObj = subHdr.dataSize / sizeof(FormId);
@@ -58,18 +60,18 @@ void ESM4::Outfit::load(ESM4::Reader& reader)
                 break;
             }
             default:
-                //std::cout << "OTFT " << ESM::printName(subHdr.typeId) << " skipping..."
-                          //<< subHdr.dataSize << std::endl;
-                //reader.skipSubRecordData();
+                // std::cout << "OTFT " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
+                // reader.skipSubRecordData();
                 throw std::runtime_error("ESM4::OTFT::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
         }
     }
 }
 
-//void ESM4::Outfit::save(ESM4::Writer& writer) const
+// void ESM4::Outfit::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Outfit::blank()
+// void ESM4::Outfit::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadotft.hpp b/components/esm4/loadotft.hpp
index cf15775a91..ccdd694951 100644
--- a/components/esm4/loadotft.hpp
+++ b/components/esm4/loadotft.hpp
@@ -40,7 +40,7 @@ namespace ESM4
 
     struct Outfit
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -48,9 +48,9 @@ namespace ESM4
         std::vector<FormId> mInventory;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadpack.cpp b/components/esm4/loadpack.cpp
index 7d0e1027c7..90515c5b05 100644
--- a/components/esm4/loadpack.cpp
+++ b/components/esm4/loadpack.cpp
@@ -26,8 +26,8 @@
 */
 #include "loadpack.hpp"
 
-#include <stdexcept>
 #include <cstring>
+#include <stdexcept>
 //#include <iostream> // FIXME: for debugging only
 
 #include "reader.hpp"
@@ -37,19 +37,21 @@ void ESM4::AIPackage::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
             case ESM4::SUB_PKDT:
             {
                 if (subHdr.dataSize != sizeof(PKDT) && subHdr.dataSize == 4)
                 {
-                    //std::cout << "skip fallout" << mEditorId << std::endl; // FIXME
+                    // std::cout << "skip fallout" << mEditorId << std::endl; // FIXME
                     reader.get(mData.flags);
                     mData.type = 0; // FIXME
                 }
@@ -60,7 +62,7 @@ void ESM4::AIPackage::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_PSDT: //reader.get(mSchedule); break;
+            case ESM4::SUB_PSDT: // reader.get(mSchedule); break;
             {
                 if (subHdr.dataSize != sizeof(mSchedule))
                     reader.skipSubRecordData(); // FIXME:
@@ -106,8 +108,8 @@ void ESM4::AIPackage::load(ESM4::Reader& reader)
                 static CTDA condition;
                 reader.get(condition);
                 // FIXME: how to "unadjust" if not FormId?
-                //adjustFormId(condition.param1);
-                //adjustFormId(condition.param2);
+                // adjustFormId(condition.param1);
+                // adjustFormId(condition.param2);
                 mConditions.push_back(condition);
 
                 break;
@@ -162,8 +164,8 @@ void ESM4::AIPackage::load(ESM4::Reader& reader)
             case ESM4::SUB_VMAD: // TES5
             case ESM4::SUB_TPIC: // TES5
             {
-                //std::cout << "PACK " << ESM::printName(subHdr.typeId) << " skipping..."
-                        //<< subHdr.dataSize << std::endl;
+                // std::cout << "PACK " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -173,10 +175,10 @@ void ESM4::AIPackage::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::AIPackage::save(ESM4::Writer& writer) const
+// void ESM4::AIPackage::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::AIPackage::blank()
+// void ESM4::AIPackage::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadpack.hpp b/components/esm4/loadpack.hpp
index e04c67a7d8..002782dd08 100644
--- a/components/esm4/loadpack.hpp
+++ b/components/esm4/loadpack.hpp
@@ -44,29 +44,30 @@ namespace ESM4
         struct PKDT // data
         {
             std::uint32_t flags;
-            std::int32_t  type;
+            std::int32_t type;
         };
 
         struct PSDT // schedule
         {
-            std::uint8_t month;      // Any = 0xff
-            std::uint8_t dayOfWeek;  // Any = 0xff
-            std::uint8_t date;       // Any = 0
-            std::uint8_t time;       // Any = 0xff
+            std::uint8_t month; // Any = 0xff
+            std::uint8_t dayOfWeek; // Any = 0xff
+            std::uint8_t date; // Any = 0
+            std::uint8_t time; // Any = 0xff
             std::uint32_t duration;
         };
 
         struct PLDT // location
         {
-            std::int32_t type = 0xff; // 0 = near ref, 1 = in cell, 2 = current loc, 3 = editor loc, 4 = obj id, 5 = obj type, 0xff = no location data
-            FormId location;   // uint32_t if type = 5
+            std::int32_t type = 0xff; // 0 = near ref, 1 = in cell, 2 = current loc, 3 = editor loc, 4 = obj id, 5 = obj
+                                      // type, 0xff = no location data
+            FormId location; // uint32_t if type = 5
             std::int32_t radius;
         };
 
         struct PTDT // target
         {
             std::int32_t type = 0xff; // 0 = specific ref, 1 = obj id, 2 = obj type, 0xff = no target data
-            FormId target;   // uint32_t if type = 2
+            FormId target; // uint32_t if type = 2
             std::int32_t distance;
         };
 
@@ -86,7 +87,7 @@ namespace ESM4
         };
 #pragma pack(pop)
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -98,9 +99,9 @@ namespace ESM4
         std::vector<CTDA> mConditions;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadpgrd.cpp b/components/esm4/loadpgrd.cpp
index d1c3a8f1c8..93b14ed2c1 100644
--- a/components/esm4/loadpgrd.cpp
+++ b/components/esm4/loadpgrd.cpp
@@ -40,7 +40,7 @@ void ESM4::Pathgrid::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     mEditorId = formIdToString(mFormId); // FIXME: quick workaround to use existing code
 
@@ -49,7 +49,9 @@ void ESM4::Pathgrid::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_DATA: reader.get(mData); break;
+            case ESM4::SUB_DATA:
+                reader.get(mData);
+                break;
             case ESM4::SUB_PGRP:
             {
                 std::size_t numNodes = subHdr.dataSize / sizeof(PGRP);
@@ -86,8 +88,8 @@ void ESM4::Pathgrid::load(ESM4::Reader& reader)
                         // ICMarketDistrictTheBestDefenseBasement doesn't have a PGRR sub-record
                         // CELL formId 00049E2A
                         // PGRD formId 000304B7
-                        //if (mFormId == 0x0001C2C8)
-                            //std::cout << link.startNode << "," << link.endNode << std::endl;
+                        // if (mFormId == 0x0001C2C8)
+                        // std::cout << link.startNode << "," << link.endNode << std::endl;
                         mLinks.push_back(link);
                     }
                 }
@@ -142,8 +144,8 @@ void ESM4::Pathgrid::load(ESM4::Reader& reader)
                 }
                 std::cout << ss.str() << std::endl;
 #else
-                //std::cout << "PGRD " << ESM::printName(subHdr.typeId) << " skipping..."
-                        //<< subHdr.dataSize << std::endl;
+                // std::cout << "PGRD " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
 #endif
                 break;
@@ -154,10 +156,10 @@ void ESM4::Pathgrid::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Pathgrid::save(ESM4::Writer& writer) const
+// void ESM4::Pathgrid::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Pathgrid::blank()
+// void ESM4::Pathgrid::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadpgrd.hpp b/components/esm4/loadpgrd.hpp
index 5ee864b93b..369ac08c77 100644
--- a/components/esm4/loadpgrd.hpp
+++ b/components/esm4/loadpgrd.hpp
@@ -46,9 +46,9 @@ namespace ESM4
             float x;
             float y;
             float z;
-            std::uint8_t  numLinks;
-            std::uint8_t  priority; // probably padding, repurposing
-            std::uint16_t unknown;  // probably padding
+            std::uint8_t numLinks;
+            std::uint8_t priority; // probably padding, repurposing
+            std::uint16_t unknown; // probably padding
         };
 
         struct PGRR
@@ -72,7 +72,7 @@ namespace ESM4
             std::vector<std::int32_t> linkedNodes;
         };
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId; // FIXME: no such record for PGRD, but keep here to avoid extra work for now
@@ -84,9 +84,9 @@ namespace ESM4
         std::vector<PGRL> mObjects;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadpgre.cpp b/components/esm4/loadpgre.cpp
index b38305b3b5..faf701300b 100644
--- a/components/esm4/loadpgre.cpp
+++ b/components/esm4/loadpgre.cpp
@@ -28,8 +28,8 @@
 */
 #include "loadpgre.hpp"
 
-#include <stdexcept>
 #include <iostream> // FIXME: for debugging only
+#include <stdexcept>
 
 #include "reader.hpp"
 //#include "writer.hpp"
@@ -38,14 +38,16 @@ void ESM4::PlacedGrenade::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
             case ESM4::SUB_NAME:
             case ESM4::SUB_XEZN:
             case ESM4::SUB_XRGD:
@@ -73,24 +75,23 @@ void ESM4::PlacedGrenade::load(ESM4::Reader& reader)
             case ESM4::SUB_XSCL:
             case ESM4::SUB_DATA:
             {
-                //std::cout << "PGRE " << ESM::printName(subHdr.typeId) << " skipping..."
-                          //<< subHdr.dataSize << std::endl;
+                // std::cout << "PGRE " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
             default:
-                std::cout << "PGRE " << ESM::printName(subHdr.typeId) << " skipping..."
-                          << subHdr.dataSize << std::endl;
+                std::cout << "PGRE " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
-                //throw std::runtime_error("ESM4::PGRE::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+                // throw std::runtime_error("ESM4::PGRE::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
         }
     }
 }
 
-//void ESM4::PlacedGrenade::save(ESM4::Writer& writer) const
+// void ESM4::PlacedGrenade::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::PlacedGrenade::blank()
+// void ESM4::PlacedGrenade::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadpgre.hpp b/components/esm4/loadpgre.hpp
index 90e3749508..db0f8f8174 100644
--- a/components/esm4/loadpgre.hpp
+++ b/components/esm4/loadpgre.hpp
@@ -41,15 +41,15 @@ namespace ESM4
 
     struct PlacedGrenade
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadpwat.cpp b/components/esm4/loadpwat.cpp
index 8f403470a2..8c10ab0146 100644
--- a/components/esm4/loadpwat.cpp
+++ b/components/esm4/loadpwat.cpp
@@ -28,8 +28,8 @@
 */
 #include "loadpwat.hpp"
 
-#include <stdexcept>
 #include <iostream> // FIXME: for debugging only
+#include <stdexcept>
 
 #include "reader.hpp"
 //#include "writer.hpp"
@@ -38,36 +38,37 @@ void ESM4::PlaceableWater::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
             case ESM4::SUB_OBND:
             case ESM4::SUB_MODL:
             case ESM4::SUB_DNAM:
             {
-                //std::cout << "PWAT " << ESM::printName(subHdr.typeId) << " skipping..."
-                          //<< subHdr.dataSize << std::endl;
+                // std::cout << "PWAT " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
             default:
-                std::cout << "PWAT " << ESM::printName(subHdr.typeId) << " skipping..."
-                          << subHdr.dataSize << std::endl;
+                std::cout << "PWAT " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
-                //throw std::runtime_error("ESM4::PWAT::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+                // throw std::runtime_error("ESM4::PWAT::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
         }
     }
 }
 
-//void ESM4::PlaceableWater::save(ESM4::Writer& writer) const
+// void ESM4::PlaceableWater::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::PlaceableWater::blank()
+// void ESM4::PlaceableWater::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadpwat.hpp b/components/esm4/loadpwat.hpp
index 4a74faeb02..33d0421076 100644
--- a/components/esm4/loadpwat.hpp
+++ b/components/esm4/loadpwat.hpp
@@ -29,8 +29,8 @@
 #ifndef ESM4_PWAT_H
 #define ESM4_PWAT_H
 
-#include <string>
 #include <cstdint>
+#include <string>
 
 #include "formid.hpp"
 
@@ -41,15 +41,15 @@ namespace ESM4
 
     struct PlaceableWater
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadqust.cpp b/components/esm4/loadqust.cpp
index 14aa51e17a..992f3b5993 100644
--- a/components/esm4/loadqust.cpp
+++ b/components/esm4/loadqust.cpp
@@ -26,9 +26,9 @@
 */
 #include "loadqust.hpp"
 
-#include <stdexcept>
 #include <cstring>
 #include <iostream> // FIXME: for debugging only
+#include <stdexcept>
 
 #include "reader.hpp"
 //#include "writer.hpp"
@@ -37,16 +37,22 @@ void ESM4::Quest::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
-            case ESM4::SUB_FULL: reader.getZString(mQuestName); break;
-            case ESM4::SUB_ICON: reader.getZString(mFileName); break; // TES4 (none in FO3/FONV)
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getZString(mQuestName);
+                break;
+            case ESM4::SUB_ICON:
+                reader.getZString(mFileName);
+                break; // TES4 (none in FO3/FONV)
             case ESM4::SUB_DATA:
             {
                 if (subHdr.dataSize == 2) // TES4
@@ -54,15 +60,17 @@ void ESM4::Quest::load(ESM4::Reader& reader)
                     reader.get(&mData, 2);
                     mData.questDelay = 0.f; // unused in TES4 but keep it clean
 
-                    //if ((mData.flags & Flag_StartGameEnabled) != 0)
-                        //std::cout << "start quest " << mEditorId << std::endl;
+                    // if ((mData.flags & Flag_StartGameEnabled) != 0)
+                    // std::cout << "start quest " << mEditorId << std::endl;
                 }
                 else
                     reader.get(mData); // FO3
 
                 break;
             }
-            case ESM4::SUB_SCRI: reader.get(mQuestScript); break;
+            case ESM4::SUB_SCRI:
+                reader.get(mQuestScript);
+                break;
             case ESM4::SUB_CTDA: // FIXME: how to detect if 1st/2nd param is a formid?
             {
                 if (subHdr.dataSize == 24) // TES4
@@ -89,10 +97,18 @@ void ESM4::Quest::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_SCHR: reader.get(mScript.scriptHeader); break;
-            case ESM4::SUB_SCDA: reader.skipSubRecordData(); break; // compiled script data
-            case ESM4::SUB_SCTX: reader.getString(mScript.scriptSource); break;
-            case ESM4::SUB_SCRO: reader.getFormId(mScript.globReference); break;
+            case ESM4::SUB_SCHR:
+                reader.get(mScript.scriptHeader);
+                break;
+            case ESM4::SUB_SCDA:
+                reader.skipSubRecordData();
+                break; // compiled script data
+            case ESM4::SUB_SCTX:
+                reader.getString(mScript.scriptSource);
+                break;
+            case ESM4::SUB_SCRO:
+                reader.getFormId(mScript.globReference);
+                break;
             case ESM4::SUB_INDX:
             case ESM4::SUB_QSDT:
             case ESM4::SUB_CNAM:
@@ -142,8 +158,8 @@ void ESM4::Quest::load(ESM4::Reader& reader)
             case ESM4::SUB_VMAD: // TES5
             case ESM4::SUB_VTCK: // TES5
             {
-                //std::cout << "QUST " << ESM::printName(subHdr.typeId) << " skipping..."
-                          //<< subHdr.dataSize << std::endl;
+                // std::cout << "QUST " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -151,14 +167,14 @@ void ESM4::Quest::load(ESM4::Reader& reader)
                 throw std::runtime_error("ESM4::QUST::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
         }
     }
-    //if (mEditorId == "DAConversations")
-        //std::cout << mEditorId << std::endl;
+    // if (mEditorId == "DAConversations")
+    // std::cout << mEditorId << std::endl;
 }
 
-//void ESM4::Quest::save(ESM4::Writer& writer) const
+// void ESM4::Quest::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Quest::blank()
+// void ESM4::Quest::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadqust.hpp b/components/esm4/loadqust.hpp
index 2fa9ff7097..ef5e38d219 100644
--- a/components/esm4/loadqust.hpp
+++ b/components/esm4/loadqust.hpp
@@ -40,10 +40,10 @@ namespace ESM4
 #pragma pack(push, 1)
     struct QuestData
     {
-        std::uint8_t flags;    // Quest_Flags
+        std::uint8_t flags; // Quest_Flags
         std::uint8_t priority;
         std::uint16_t padding; // FO3
-        float questDelay;      // FO3
+        float questDelay; // FO3
     };
 #pragma pack(pop)
 
@@ -52,12 +52,12 @@ namespace ESM4
         // NOTE: these values are for TES4
         enum Quest_Flags
         {
-            Flag_StartGameEnabled     = 0x01,
+            Flag_StartGameEnabled = 0x01,
             Flag_AllowRepeatConvTopic = 0x04,
-            Flag_AllowRepeatStages    = 0x08
+            Flag_AllowRepeatStages = 0x08
         };
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -72,9 +72,9 @@ namespace ESM4
         ScriptDefinition mScript;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadrace.cpp b/components/esm4/loadrace.cpp
index 5cf1d9a59a..8538c94962 100644
--- a/components/esm4/loadrace.cpp
+++ b/components/esm4/loadrace.cpp
@@ -26,10 +26,10 @@
 */
 #include "loadrace.hpp"
 
-#include <stdexcept>
 #include <cstring>
+#include <iomanip> // FIXME: for debugging only
 #include <iostream> // FIXME: for debugging only
-#include <iomanip>  // FIXME: for debugging only
+#include <stdexcept>
 
 #include "formid.hpp"
 #include "reader.hpp"
@@ -39,7 +39,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     std::uint32_t esmVer = reader.esmVersion();
     bool isTES4 = esmVer == ESM::VER_080 || esmVer == ESM::VER_100;
@@ -53,7 +53,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
-        //std::cout << "RACE " << ESM::printName(subHdr.typeId) << std::endl;
+        // std::cout << "RACE " << ESM::printName(subHdr.typeId) << std::endl;
         switch (subHdr.typeId)
         {
             case ESM4::SUB_EDID:
@@ -77,7 +77,9 @@ void ESM4::Race::load(ESM4::Reader& reader)
                 // Imperial    0x00000907
                 break;
             }
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
             case ESM4::SUB_DESC:
             {
                 if (subHdr.dataSize == 1) // FO3?
@@ -86,14 +88,16 @@ void ESM4::Race::load(ESM4::Reader& reader)
                     break;
                 }
 
-                reader.getLocalizedString(mDesc); break;
+                reader.getLocalizedString(mDesc);
+                break;
             }
             case ESM4::SUB_SPLO: // bonus spell formid (TES5 may have SPCT and multiple SPLO)
             {
                 FormId magic;
                 reader.getFormId(magic);
                 mBonusSpells.push_back(magic);
-//              std::cout << "RACE " << printName(subHdr.typeId) << " " << formIdToString(magic) << std::endl;
+                //              std::cout << "RACE " << printName(subHdr.typeId) << " " << formIdToString(magic) <<
+                //              std::endl;
 
                 break;
             }
@@ -181,18 +185,18 @@ void ESM4::Race::load(ESM4::Reader& reader)
                     reader.get(dummy2); // size
                     reader.get(dummy2); // head biped object
                     reader.get(dummy2); // hair biped object
-                    reader.get(dummy);  // injured health % (0.f..1.f)
+                    reader.get(dummy); // injured health % (0.f..1.f)
                     reader.get(dummy2); // shield biped object
-                    reader.get(dummy);  // health regen
-                    reader.get(dummy);  // magicka regen
-                    reader.get(dummy);  // stamina regen
-                    reader.get(dummy);  // unarmed damage
-                    reader.get(dummy);  // unarmed reach
+                    reader.get(dummy); // health regen
+                    reader.get(dummy); // magicka regen
+                    reader.get(dummy); // stamina regen
+                    reader.get(dummy); // unarmed damage
+                    reader.get(dummy); // unarmed reach
                     reader.get(dummy2); // body biped object
-                    reader.get(dummy);  // aim angle tolerance
+                    reader.get(dummy); // aim angle tolerance
                     reader.get(dummy2); // unknown
-                    reader.get(dummy);  // angular accleration rate
-                    reader.get(dummy);  // angular tolerance
+                    reader.get(dummy); // angular accleration rate
+                    reader.get(dummy); // angular tolerance
                     reader.get(dummy2); // flags
 
                     if (subHdr.dataSize > 128)
@@ -211,8 +215,8 @@ void ESM4::Race::load(ESM4::Reader& reader)
                 else
                 {
                     reader.skipSubRecordData();
-                    std::cout << "RACE " << ESM::printName(subHdr.typeId) << " skipping..."
-                        << subHdr.dataSize << std::endl;
+                    std::cout << "RACE " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize
+                              << std::endl;
                 }
 #endif
                 break;
@@ -225,28 +229,32 @@ void ESM4::Race::load(ESM4::Reader& reader)
                 break;
             }
             case ESM4::SUB_CNAM: // Only in TES4?
-            //              CNAM       SNAM                     VNAM
-            // Sheogorath   0x0  0000  98 2b  10011000 00101011
-            // Golden Saint 0x3  0011  26 46  00100110 01000110
-            // Dark Seducer 0xC  1100  df 55  11011111 01010101
-            // Vampire Race 0x0  0000  77 44  01110111 10001000
-            // Dremora      0x7  0111  bf 32  10111111 00110010
-            // Argonian     0x0  0000  dc 3c  11011100 00111100
-            // Nord         0x5  0101  b6 03  10110110 00000011
-            // Breton       0x5  0101  48 1d  01001000 00011101 00000000 00000907 (Imperial)
-            // Wood Elf     0xD  1101  2e 4a  00101110 01001010 00019204 00019204 (HighElf)
-            // khajiit      0x5  0101  54 5b  01010100 01011011 00023FE9 00023FE9 (Argonian)
-            // Dark Elf     0x0  0000  72 54  01110010 01010100 00019204 00019204 (HighElf)
-            // Orc          0xC  1100  74 09  01110100 00001001 000224FD 000224FD (Nord)
-            // High Elf     0xF  1111  e6 21  11100110 00100001
-            // Redguard     0xD  1101  a9 61  10101001 01100001
-            // Imperial     0xD  1101  8e 35  10001110 00110101
-            {
-                reader.skipSubRecordData();
-                break;
-            }
-            case ESM4::SUB_PNAM: reader.get(mFaceGenMainClamp); break; // 0x40A00000 = 5.f
-            case ESM4::SUB_UNAM: reader.get(mFaceGenFaceClamp); break; // 0x40400000 = 3.f
+                //              CNAM       SNAM                     VNAM
+                // Sheogorath   0x0  0000  98 2b  10011000 00101011
+                // Golden Saint 0x3  0011  26 46  00100110 01000110
+                // Dark Seducer 0xC  1100  df 55  11011111 01010101
+                // Vampire Race 0x0  0000  77 44  01110111 10001000
+                // Dremora      0x7  0111  bf 32  10111111 00110010
+                // Argonian     0x0  0000  dc 3c  11011100 00111100
+                // Nord         0x5  0101  b6 03  10110110 00000011
+                // Breton       0x5  0101  48 1d  01001000 00011101 00000000 00000907 (Imperial)
+                // Wood Elf     0xD  1101  2e 4a  00101110 01001010 00019204 00019204 (HighElf)
+                // khajiit      0x5  0101  54 5b  01010100 01011011 00023FE9 00023FE9 (Argonian)
+                // Dark Elf     0x0  0000  72 54  01110010 01010100 00019204 00019204 (HighElf)
+                // Orc          0xC  1100  74 09  01110100 00001001 000224FD 000224FD (Nord)
+                // High Elf     0xF  1111  e6 21  11100110 00100001
+                // Redguard     0xD  1101  a9 61  10101001 01100001
+                // Imperial     0xD  1101  8e 35  10001110 00110101
+                {
+                    reader.skipSubRecordData();
+                    break;
+                }
+            case ESM4::SUB_PNAM:
+                reader.get(mFaceGenMainClamp);
+                break; // 0x40A00000 = 5.f
+            case ESM4::SUB_UNAM:
+                reader.get(mFaceGenFaceClamp);
+                break; // 0x40400000 = 3.f
             case ESM4::SUB_ATTR: // Only in TES4?
             {
                 if (subHdr.dataSize == 2) // FO3?
@@ -303,12 +311,12 @@ void ESM4::Race::load(ESM4::Reader& reader)
             {
                 reader.get(currentIndex);
                 // FIXME: below check is rather useless
-                //if (headpart)
+                // if (headpart)
                 //{
                 //    if (currentIndex > 8)
                 //        throw std::runtime_error("ESM4::RACE::load - too many head part " + currentIndex);
                 //}
-                //else // bodypart
+                // else // bodypart
                 //{
                 //    if (currentIndex > 4)
                 //        throw std::runtime_error("ESM4::RACE::load - too many body part " + currentIndex);
@@ -338,18 +346,20 @@ void ESM4::Race::load(ESM4::Reader& reader)
                 }
                 else if (curr_part == 2) // egt
                 {
-                    //std::cout << mEditorId << " egt " << currentIndex << std::endl; // FIXME
-                    reader.skipSubRecordData();  // FIXME TES5 egt
+                    // std::cout << mEditorId << " egt " << currentIndex << std::endl; // FIXME
+                    reader.skipSubRecordData(); // FIXME TES5 egt
                 }
                 else
                 {
-                    //std::cout << mEditorId << " hkx " << currentIndex << std::endl; // FIXME
-                    reader.skipSubRecordData();  // FIXME TES5 hkx
+                    // std::cout << mEditorId << " hkx " << currentIndex << std::endl; // FIXME
+                    reader.skipSubRecordData(); // FIXME TES5 hkx
                 }
 
                 break;
             }
-            case ESM4::SUB_MODB: reader.skipSubRecordData(); break; // always 0x0000?
+            case ESM4::SUB_MODB:
+                reader.skipSubRecordData();
+                break; // always 0x0000?
             case ESM4::SUB_ICON:
             {
                 if (curr_part == 0) // head part
@@ -367,7 +377,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
                         reader.getZString(mBodyPartsFemale[currentIndex].texture);
                 }
                 else
-                    reader.skipSubRecordData();  // FIXME TES5
+                    reader.skipSubRecordData(); // FIXME TES5
 
                 break;
             }
@@ -386,7 +396,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
                 {
                     curr_part = 1; // body part
 
-                    mBodyPartsMale.resize(5);   // 0 = upper body, 1 = legs, 2 = hands, 3 = feet, 4 = tail
+                    mBodyPartsMale.resize(5); // 0 = upper body, 1 = legs, 2 = hands, 3 = feet, 4 = tail
                     mBodyPartsFemale.resize(5); // 0 = upper body, 1 = legs, 2 = hands, 3 = feet, 4 = tail
                 }
                 else // TES5
@@ -399,8 +409,12 @@ void ESM4::Race::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_MNAM: isMale = true; break;  /* 2, 5, 7 */
-            case ESM4::SUB_FNAM: isMale = false; break; /* 3, 6, 8 */
+            case ESM4::SUB_MNAM:
+                isMale = true;
+                break; /* 2, 5, 7 */
+            case ESM4::SUB_FNAM:
+                isMale = false;
+                break; /* 3, 6, 8 */
             //
             case ESM4::SUB_HNAM:
             {
@@ -472,7 +486,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
                 break;
             }
             //
-            case ESM4::SUB_SNAM: //skipping...2 // only in TES4?
+            case ESM4::SUB_SNAM: // skipping...2 // only in TES4?
             {
                 reader.skipSubRecordData();
                 break;
@@ -504,8 +518,8 @@ void ESM4::Race::load(ESM4::Reader& reader)
                 else
                 {
                     reader.skipSubRecordData();
-                    std::cout << "RACE " << ESM::printName(subHdr.typeId) << " skipping..."
-                        << subHdr.dataSize << std::endl;
+                    std::cout << "RACE " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize
+                              << std::endl;
                 }
 
                 break;
@@ -519,7 +533,9 @@ void ESM4::Race::load(ESM4::Reader& reader)
                     reader.getZString(mModelFemale);
                 break;
             }
-            case ESM4::SUB_KSIZ: reader.get(mNumKeywords); break;
+            case ESM4::SUB_KSIZ:
+                reader.get(mNumKeywords);
+                break;
             case ESM4::SUB_KWDA:
             {
                 std::uint32_t formid;
@@ -531,7 +547,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
             case ESM4::SUB_WNAM: // ARMO FormId
             {
                 reader.getFormId(mSkin);
-                //std::cout << mEditorId << " skin " << formIdToString(mSkin) << std::endl; // FIXME
+                // std::cout << mEditorId << " skin " << formIdToString(mSkin) << std::endl; // FIXME
                 break;
             }
             case ESM4::SUB_BODT: // body template
@@ -567,8 +583,8 @@ void ESM4::Race::load(ESM4::Reader& reader)
                 else
                     mHeadPartIdsFemale[currentIndex] = formId;
 
-                //std::cout << mEditorId << (isMale ? " male head " : " female head ")
-                        //<< formIdToString(formId) << " " << currentIndex << std::endl; // FIXME
+                // std::cout << mEditorId << (isMale ? " male head " : " female head ")
+                //<< formIdToString(formId) << " " << currentIndex << std::endl; // FIXME
 
                 break;
             }
@@ -616,7 +632,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
             {
                 std::string name;
                 reader.getZString(name);
-                //std::cout << mEditorId << " " << name << std::endl;
+                // std::cout << mEditorId << " " << name << std::endl;
 
                 break;
             }
@@ -670,7 +686,8 @@ void ESM4::Race::load(ESM4::Reader& reader)
             case ESM4::SUB_ONAM: // FO3
             {
 
-                //std::cout << "RACE " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize << std::endl;
+                // std::cout << "RACE " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize <<
+                // std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -680,10 +697,10 @@ void ESM4::Race::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Race::save(ESM4::Writer& writer) const
+// void ESM4::Race::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Race::blank()
+// void ESM4::Race::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadrace.hpp b/components/esm4/loadrace.hpp
index 9166282e17..d5ce25ab40 100644
--- a/components/esm4/loadrace.hpp
+++ b/components/esm4/loadrace.hpp
@@ -27,13 +27,13 @@
 #ifndef ESM4_RACE
 #define ESM4_RACE
 
+#include <array>
 #include <cstdint>
-#include <vector>
 #include <map>
-#include <array>
+#include <vector>
 
-#include "formid.hpp"
 #include "actor.hpp" // AttributeValues, BodyTemplate
+#include "formid.hpp"
 
 namespace ESM4
 {
@@ -52,62 +52,62 @@ namespace ESM4
 
         enum SkillIndex
         {
-            Skill_Armorer     = 0x0C,
-            Skill_Athletics   = 0x0D,
-            Skill_Blade       = 0x0E,
-            Skill_Block       = 0x0F,
-            Skill_Blunt       = 0x10,
-            Skill_HandToHand  = 0x11,
-            Skill_HeavyArmor  = 0x12,
-            Skill_Alchemy     = 0x13,
-            Skill_Alteration  = 0x14,
+            Skill_Armorer = 0x0C,
+            Skill_Athletics = 0x0D,
+            Skill_Blade = 0x0E,
+            Skill_Block = 0x0F,
+            Skill_Blunt = 0x10,
+            Skill_HandToHand = 0x11,
+            Skill_HeavyArmor = 0x12,
+            Skill_Alchemy = 0x13,
+            Skill_Alteration = 0x14,
             Skill_Conjuration = 0x15,
             Skill_Destruction = 0x16,
-            Skill_Illusion    = 0x17,
-            Skill_Mysticism   = 0x18,
+            Skill_Illusion = 0x17,
+            Skill_Mysticism = 0x18,
             Skill_Restoration = 0x19,
-            Skill_Acrobatics  = 0x1A,
-            Skill_LightArmor  = 0x1B,
-            Skill_Marksman    = 0x1C,
-            Skill_Mercantile  = 0x1D,
-            Skill_Security    = 0x1E,
-            Skill_Sneak       = 0x1F,
+            Skill_Acrobatics = 0x1A,
+            Skill_LightArmor = 0x1B,
+            Skill_Marksman = 0x1C,
+            Skill_Mercantile = 0x1D,
+            Skill_Security = 0x1E,
+            Skill_Sneak = 0x1F,
             Skill_Speechcraft = 0x20,
-            Skill_None        = 0xFF,
-            Skill_Unknown     = 0x00
+            Skill_None = 0xFF,
+            Skill_Unknown = 0x00
         };
 
         enum HeadPartIndex // TES4
         {
-            Head              = 0,
-            EarMale           = 1,
-            EarFemale         = 2,
-            Mouth             = 3,
-            TeethLower        = 4,
-            TeethUpper        = 5,
-            Tongue            = 6,
-            EyeLeft           = 7, // no texture
-            EyeRight          = 8, // no texture
-            NumHeadParts      = 9
+            Head = 0,
+            EarMale = 1,
+            EarFemale = 2,
+            Mouth = 3,
+            TeethLower = 4,
+            TeethUpper = 5,
+            Tongue = 6,
+            EyeLeft = 7, // no texture
+            EyeRight = 8, // no texture
+            NumHeadParts = 9
         };
 
         enum BodyPartIndex // TES4
         {
-            UpperBody         = 0,
-            LowerBody         = 1,
-            Hands             = 2,
-            Feet              = 3,
-            Tail              = 4,
-            NumBodyParts      = 5
+            UpperBody = 0,
+            LowerBody = 1,
+            Hands = 2,
+            Feet = 3,
+            Tail = 4,
+            NumBodyParts = 5
         };
 
         struct BodyPart
         {
-            std::string mesh;    // can be empty for arms, hands, etc
+            std::string mesh; // can be empty for arms, hands, etc
             std::string texture; // can be empty e.g. eye left, eye right
         };
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         bool mIsTES5;
@@ -115,7 +115,7 @@ namespace ESM4
         std::string mEditorId;
         std::string mFullName;
         std::string mDesc;
-        std::string mModelMale;   // TES5 skeleton (in TES4 skeleton is found in npc_)
+        std::string mModelMale; // TES5 skeleton (in TES4 skeleton is found in npc_)
         std::string mModelFemale; // TES5 skeleton (in TES4 skeleton is found in npc_)
 
         AttributeValues mAttribMale;
@@ -129,26 +129,26 @@ namespace ESM4
         float mWeightFemale = 1.0f;
         std::uint32_t mRaceFlags; // 0x0001 = playable?
 
-        std::vector<BodyPart> mHeadParts;       // see HeadPartIndex
+        std::vector<BodyPart> mHeadParts; // see HeadPartIndex
         std::vector<BodyPart> mHeadPartsFemale; // see HeadPartIndex
 
-        std::vector<BodyPart> mBodyPartsMale;   // see BodyPartIndex
+        std::vector<BodyPart> mBodyPartsMale; // see BodyPartIndex
         std::vector<BodyPart> mBodyPartsFemale; // see BodyPartIndex
 
-        std::vector<FormId> mEyeChoices;        // texture only
+        std::vector<FormId> mEyeChoices; // texture only
         std::vector<FormId> mHairChoices; // not for TES5
 
         float mFaceGenMainClamp;
         float mFaceGenFaceClamp;
-        std::vector<float> mSymShapeModeCoefficients;   // should be 50
-        std::vector<float> mSymShapeModeCoeffFemale;    // should be 50
-        std::vector<float> mAsymShapeModeCoefficients;  // should be 30
-        std::vector<float> mAsymShapeModeCoeffFemale;   // should be 30
+        std::vector<float> mSymShapeModeCoefficients; // should be 50
+        std::vector<float> mSymShapeModeCoeffFemale; // should be 50
+        std::vector<float> mAsymShapeModeCoefficients; // should be 30
+        std::vector<float> mAsymShapeModeCoeffFemale; // should be 30
         std::vector<float> mSymTextureModeCoefficients; // should be 50
-        std::vector<float> mSymTextureModeCoeffFemale;  // should be 50
+        std::vector<float> mSymTextureModeCoeffFemale; // should be 50
 
         std::map<FormId, std::int32_t> mDisposition; // race adjustments
-        std::vector<FormId> mBonusSpells;            // race ability/power
+        std::vector<FormId> mBonusSpells; // race ability/power
         std::array<FormId, 2> mVNAM; // don't know what these are; 1 or 2 RACE FormIds
         std::array<FormId, 2> mDefaultHair; // male/female (HAIR FormId for TES4)
 
@@ -159,13 +159,13 @@ namespace ESM4
 
         // FIXME: there's no fixed order?
         // head, mouth, eyes, brow, hair
-        std::vector<FormId> mHeadPartIdsMale;   // TES5
+        std::vector<FormId> mHeadPartIdsMale; // TES5
         std::vector<FormId> mHeadPartIdsFemale; // TES5
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadrefr.cpp b/components/esm4/loadrefr.cpp
index 91c10c564e..d96f52a741 100644
--- a/components/esm4/loadrefr.cpp
+++ b/components/esm4/loadrefr.cpp
@@ -26,8 +26,8 @@
 */
 #include "loadrefr.hpp"
 
-#include <stdexcept>
 #include <iostream> // FIXME: debug only
+#include <stdexcept>
 
 #include "reader.hpp"
 //#include "writer.hpp"
@@ -36,11 +36,11 @@ void ESM4::Reference::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
     mParent = reader.currCell(); // NOTE: only for persistent refs?
 
     // TODO: Let the engine apply this? Saved games?
-    //mInitiallyDisabled = ((mFlags & ESM4::Rec_Disabled) != 0) ? true : false;
+    // mInitiallyDisabled = ((mFlags & ESM4::Rec_Disabled) != 0) ? true : false;
     std::uint32_t esmVer = reader.esmVersion();
     bool isFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
 
@@ -52,8 +52,12 @@ void ESM4::Reference::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
             case ESM4::SUB_NAME:
             {
                 reader.getFormId(mBaseObj);
@@ -63,22 +67,32 @@ void ESM4::Reference::load(ESM4::Reader& reader)
                         " baseobj " << formIdToString(mBaseObj) <<
                         " " << (mEditorId.empty() ? "" : mEditorId) << std::endl; // FIXME
 #endif
-                //if (mBaseObj == 0x20) // e.g. FO3 mFormId == 0x0007E90F
-                //if (mBaseObj == 0x17)
-                    //std::cout << mEditorId << std::endl;
+                // if (mBaseObj == 0x20) // e.g. FO3 mFormId == 0x0007E90F
+                // if (mBaseObj == 0x17)
+                // std::cout << mEditorId << std::endl;
                 break;
             }
-            case ESM4::SUB_DATA: reader.get(mPlacement); break;
-            case ESM4::SUB_XSCL: reader.get(mScale);    break;
-            case ESM4::SUB_XOWN: reader.getFormId(mOwner);    break;
-            case ESM4::SUB_XGLB: reader.getFormId(mGlobal);   break;
-            case ESM4::SUB_XRNK: reader.get(mFactionRank); break;
+            case ESM4::SUB_DATA:
+                reader.get(mPlacement);
+                break;
+            case ESM4::SUB_XSCL:
+                reader.get(mScale);
+                break;
+            case ESM4::SUB_XOWN:
+                reader.getFormId(mOwner);
+                break;
+            case ESM4::SUB_XGLB:
+                reader.getFormId(mGlobal);
+                break;
+            case ESM4::SUB_XRNK:
+                reader.get(mFactionRank);
+                break;
             case ESM4::SUB_XESP:
             {
                 reader.get(mEsp);
                 reader.adjustFormId(mEsp.parent);
-                //std::cout << "REFR  parent: " << formIdToString(mEsp.parent) << " ref " << formIdToString(mFormId)
-                    //<< ", 0x" << std::hex << (mEsp.flags & 0xff) << std::endl;// FIXME
+                // std::cout << "REFR  parent: " << formIdToString(mEsp.parent) << " ref " << formIdToString(mFormId)
+                //<< ", 0x" << std::hex << (mEsp.flags & 0xff) << std::endl;// FIXME
                 break;
             }
             case ESM4::SUB_XTEL:
@@ -87,7 +101,7 @@ void ESM4::Reference::load(ESM4::Reader& reader)
                 reader.get(mDoor.destPos);
                 if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || isFONV)
                     reader.get(mDoor.flags); // not in Obvlivion
-                //std::cout << "REFR  dest door: " << formIdToString(mDoor.destDoor) << std::endl;// FIXME
+                // std::cout << "REFR  dest door: " << formIdToString(mDoor.destDoor) << std::endl;// FIXME
                 break;
             }
             case ESM4::SUB_XSED:
@@ -97,18 +111,18 @@ void ESM4::Reference::load(ESM4::Reader& reader)
                 {
                     uint8_t data;
                     reader.get(data);
-                    //std::cout << "REFR XSED " << std::hex << (int)data << std::endl;
+                    // std::cout << "REFR XSED " << std::hex << (int)data << std::endl;
                     break;
                 }
                 else if (subHdr.dataSize == 4)
                 {
                     uint32_t data;
                     reader.get(data);
-                    //std::cout << "REFR XSED " << std::hex << (int)data << std::endl;
+                    // std::cout << "REFR XSED " << std::hex << (int)data << std::endl;
                     break;
                 }
 
-                //std::cout << "REFR XSED dataSize: " << subHdr.dataSize << std::endl;// FIXME
+                // std::cout << "REFR XSED dataSize: " << subHdr.dataSize << std::endl;// FIXME
                 reader.skipSubRecordData();
                 break;
             }
@@ -121,14 +135,15 @@ void ESM4::Reference::load(ESM4::Reader& reader)
                     reader.get(data);
                     reader.get(data2);
                     reader.get(data3);
-                    //bool hasVisibleWhenDistantFlag = (mFlags & 0x00008000) != 0; // currently unused
-                    // some are trees, e.g. 000E03B6, mBaseObj 00022F32, persistent, visible when distant
-                    // some are doors, e.g. 000270F7, mBaseObj 000CD338, persistent, initially disabled
-                    // (this particular one is an Oblivion Gate)
-                    //std::cout << "REFR XLOD " << std::hex << (int)data << " " << (int)data2 << " " << (int)data3 << std::endl;
+                    // bool hasVisibleWhenDistantFlag = (mFlags & 0x00008000) != 0; // currently unused
+                    //  some are trees, e.g. 000E03B6, mBaseObj 00022F32, persistent, visible when distant
+                    //  some are doors, e.g. 000270F7, mBaseObj 000CD338, persistent, initially disabled
+                    //  (this particular one is an Oblivion Gate)
+                    // std::cout << "REFR XLOD " << std::hex << (int)data << " " << (int)data2 << " " << (int)data3 <<
+                    // std::endl;
                     break;
                 }
-                //std::cout << "REFR XLOD dataSize: " << subHdr.dataSize << std::endl;// FIXME
+                // std::cout << "REFR XLOD dataSize: " << subHdr.dataSize << std::endl;// FIXME
                 reader.skipSubRecordData();
                 break;
             }
@@ -138,11 +153,11 @@ void ESM4::Reference::load(ESM4::Reader& reader)
                 {
                     uint32_t data;
                     reader.get(data);
-                    //std::cout << "REFR XACT " << std::hex << (int)data << std::endl;
+                    // std::cout << "REFR XACT " << std::hex << (int)data << std::endl;
                     break;
                 }
 
-                //std::cout << "REFR XACT dataSize: " << subHdr.dataSize << std::endl;// FIXME
+                // std::cout << "REFR XACT dataSize: " << subHdr.dataSize << std::endl;// FIXME
                 reader.skipSubRecordData();
                 break;
             }
@@ -160,34 +175,38 @@ void ESM4::Reference::load(ESM4::Reader& reader)
                 //    XRTM : 000A4DD7 in OblivionRDCavesMiddleA05 (maybe spawn points?)
                 FormId marker;
                 reader.getFormId(marker);
-                //std::cout << "REFR " << mEditorId << " XRTM : " << formIdToString(marker) << std::endl;// FIXME
+                // std::cout << "REFR " << mEditorId << " XRTM : " << formIdToString(marker) << std::endl;// FIXME
                 break;
             }
-            case ESM4::SUB_TNAM: //reader.get(mMapMarker); break;
+            case ESM4::SUB_TNAM: // reader.get(mMapMarker); break;
             {
                 if (subHdr.dataSize != sizeof(mMapMarker))
-                    //reader.skipSubRecordData(); // FIXME: FO3
+                    // reader.skipSubRecordData(); // FIXME: FO3
                     reader.getFormId(mid);
                 else
                     reader.get(mMapMarker); // TES4
 
                 break;
             }
-            case ESM4::SUB_XMRK: mIsMapMarker = true; break; // all have mBaseObj 0x00000010 "MapMarker"
+            case ESM4::SUB_XMRK:
+                mIsMapMarker = true;
+                break; // all have mBaseObj 0x00000010 "MapMarker"
             case ESM4::SUB_FNAM:
             {
-                //std::cout << "REFR " << ESM::printName(subHdr.typeId) << " skipping..."
-                        //<< subHdr.dataSize << std::endl;
+                // std::cout << "REFR " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
             case ESM4::SUB_XTRG: // formId
             {
                 reader.getFormId(mTargetRef);
-                //std::cout << "REFR XRTG : " << formIdToString(id) << std::endl;// FIXME
+                // std::cout << "REFR XRTG : " << formIdToString(id) << std::endl;// FIXME
                 break;
             }
-            case ESM4::SUB_CNAM: reader.getFormId(mAudioLocation); break; // FONV
+            case ESM4::SUB_CNAM:
+                reader.getFormId(mAudioLocation);
+                break; // FONV
             case ESM4::SUB_XRDO: // FO3
             {
                 reader.get(mRadio.rangeRadius);
@@ -200,8 +219,8 @@ void ESM4::Reference::load(ESM4::Reader& reader)
             case ESM4::SUB_SCRO: // FO3
             {
                 reader.getFormId(sid);
-                //if (mFormId == 0x0016b74B)
-                    //std::cout << "REFR SCRO : " << formIdToString(sid) << std::endl;// FIXME
+                // if (mFormId == 0x0016b74B)
+                // std::cout << "REFR SCRO : " << formIdToString(sid) << std::endl;// FIXME
                 break;
             }
             case ESM4::SUB_XLOC:
@@ -220,7 +239,7 @@ void ESM4::Reference::load(ESM4::Reader& reader)
                 reader.get(dummy);
                 if (subHdr.dataSize == 16)
                     reader.skipSubRecordData(4); // Oblivion (sometimes), flag?
-                else if (subHdr.dataSize == 20)  // Skyrim, FO3
+                else if (subHdr.dataSize == 20) // Skyrim, FO3
                     reader.skipSubRecordData(8); // flag?
 
                 break;
@@ -299,9 +318,9 @@ void ESM4::Reference::load(ESM4::Reader& reader)
             case ESM4::SUB_WMI1: // FONV
             case ESM4::SUB_XLRL: // Unofficial Skyrim Patch
             {
-                //if (mFormId == 0x0007e90f) // XPRM XPOD
-                //if (mBaseObj == 0x17) //XPRM XOCP occlusion plane data XMBO bound half extents
-                //std::cout << "REFR " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // if (mFormId == 0x0007e90f) // XPRM XPOD
+                // if (mBaseObj == 0x17) //XPRM XOCP occlusion plane data XMBO bound half extents
+                // std::cout << "REFR " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -309,14 +328,12 @@ void ESM4::Reference::load(ESM4::Reader& reader)
                 throw std::runtime_error("ESM4::REFR::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
         }
     }
-    //if (mFormId == 0x0016B74B) // base is TACT vCasinoUltraLuxeRadio in cell ULCasino
-        //std::cout << "REFR SCRO " << formIdToString(sid) << std::endl;
+    // if (mFormId == 0x0016B74B) // base is TACT vCasinoUltraLuxeRadio in cell ULCasino
+    // std::cout << "REFR SCRO " << formIdToString(sid) << std::endl;
 }
 
-//void ESM4::Reference::save(ESM4::Writer& writer) const
+// void ESM4::Reference::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-void ESM4::Reference::blank()
-{
-}
+void ESM4::Reference::blank() {}
diff --git a/components/esm4/loadrefr.hpp b/components/esm4/loadrefr.hpp
index 0494dcb074..04d537932e 100644
--- a/components/esm4/loadrefr.hpp
+++ b/components/esm4/loadrefr.hpp
@@ -38,24 +38,24 @@ namespace ESM4
 
     enum MapMarkerType
     {
-        Map_None          = 0x00, // ?
-        Map_Camp          = 0x01,
-        Map_Cave          = 0x02,
-        Map_City          = 0x03,
-        Map_ElvenRuin     = 0x04,
-        Map_FortRuin      = 0x05,
-        Map_Mine          = 0x06,
-        Map_Landmark      = 0x07,
-        Map_Tavern        = 0x08,
-        Map_Settlement    = 0x09,
+        Map_None = 0x00, // ?
+        Map_Camp = 0x01,
+        Map_Cave = 0x02,
+        Map_City = 0x03,
+        Map_ElvenRuin = 0x04,
+        Map_FortRuin = 0x05,
+        Map_Mine = 0x06,
+        Map_Landmark = 0x07,
+        Map_Tavern = 0x08,
+        Map_Settlement = 0x09,
         Map_DaedricShrine = 0x0A,
-        Map_OblivionGate  = 0x0B,
-        Map_Unknown       = 0x0C // ? (door icon)
+        Map_OblivionGate = 0x0B,
+        Map_Unknown = 0x0C // ? (door icon)
     };
 
     struct TeleportDest
     {
-        FormId   destDoor;
+        FormId destDoor;
         Placement destPos;
         std::uint32_t flags; // 0x01 no alarm (only in TES5)
     };
@@ -71,20 +71,20 @@ namespace ESM4
 
     struct Reference
     {
-        FormId mParent;       // cell FormId (currently persistent refs only), from the loading sequence
-                              // NOTE: for exterior cells it will be the dummy cell FormId
+        FormId mParent; // cell FormId (currently persistent refs only), from the loading sequence
+                        // NOTE: for exterior cells it will be the dummy cell FormId
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
         std::string mFullName;
-        FormId      mBaseObj;
+        FormId mBaseObj;
 
         Placement mPlacement;
-        float    mScale = 1.0f;
-        FormId   mOwner;
-        FormId   mGlobal;
+        float mScale = 1.0f;
+        FormId mOwner;
+        FormId mGlobal;
         std::int32_t mFactionRank = -1;
 
         bool mInitiallyDisabled; // TODO may need to check mFlags & 0x800 (initially disabled)
@@ -107,7 +107,7 @@ namespace ESM4
         FormId mTargetRef;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
         void blank();
     };
diff --git a/components/esm4/loadregn.cpp b/components/esm4/loadregn.cpp
index b57ce81aa0..da1a9f08fc 100644
--- a/components/esm4/loadregn.cpp
+++ b/components/esm4/loadregn.cpp
@@ -43,21 +43,31 @@ void ESM4::Region::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_RCLR: reader.get(mColour);        break;
-            case ESM4::SUB_WNAM: reader.getFormId(mWorldId); break;
-            case ESM4::SUB_ICON: reader.getZString(mShader); break;
-            case ESM4::SUB_RPLI: reader.get(mEdgeFalloff);   break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_RCLR:
+                reader.get(mColour);
+                break;
+            case ESM4::SUB_WNAM:
+                reader.getFormId(mWorldId);
+                break;
+            case ESM4::SUB_ICON:
+                reader.getZString(mShader);
+                break;
+            case ESM4::SUB_RPLI:
+                reader.get(mEdgeFalloff);
+                break;
             case ESM4::SUB_RPLD:
             {
-                mRPLD.resize(subHdr.dataSize/sizeof(std::uint32_t));
+                mRPLD.resize(subHdr.dataSize / sizeof(std::uint32_t));
                 for (std::vector<std::uint32_t>::iterator it = mRPLD.begin(); it != mRPLD.end(); ++it)
                 {
                     reader.get(*it);
@@ -70,11 +80,14 @@ void ESM4::Region::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_RDAT: reader.get(mData); break;
+            case ESM4::SUB_RDAT:
+                reader.get(mData);
+                break;
             case ESM4::SUB_RDMP:
             {
                 assert(mData.type == RDAT_Map && "REGN unexpected data type");
-                reader.getLocalizedString(mMapName); break;
+                reader.getLocalizedString(mMapName);
+                break;
             }
             // FO3 only 2: DemoMegatonSound and DC01 (both 0 RDMD)
             // FONV none
@@ -91,17 +104,17 @@ void ESM4::Region::load(ESM4::Reader& reader)
             }
             case ESM4::SUB_RDMO: // not seen in FO3/FONV?
             {
-                //std::cout << "REGN " << ESM::printName(subHdr.typeId) << " skipping..."
-                          //<< subHdr.dataSize << std::endl;
+                // std::cout << "REGN " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
             case ESM4::SUB_RDSD: // Possibly the same as RDSA
             {
-                //assert(mData.type == RDAT_Map && "REGN unexpected data type");
+                // assert(mData.type == RDAT_Map && "REGN unexpected data type");
                 if (mData.type != RDAT_Sound)
-                    throw std::runtime_error("ESM4::REGN::load - unexpected data type " +
-                                              ESM::printName(subHdr.typeId));
+                    throw std::runtime_error(
+                        "ESM4::REGN::load - unexpected data type " + ESM::printName(subHdr.typeId));
 
                 std::size_t numSounds = subHdr.dataSize / sizeof(RegionSound);
                 mSounds.resize(numSounds);
@@ -119,22 +132,22 @@ void ESM4::Region::load(ESM4::Reader& reader)
             case ESM4::SUB_RDSI: // FONV
             case ESM4::SUB_NVMI: // TES5
             {
-                //RDAT skipping... following is a map
-                //RDMP skipping... map name
+                // RDAT skipping... following is a map
+                // RDMP skipping... map name
                 //
-                //RDAT skipping... following is weather
-                //RDWT skipping... weather data
+                // RDAT skipping... following is weather
+                // RDWT skipping... weather data
                 //
-                //RDAT skipping... following is sound
-                //RDMD skipping... unknown, maybe music data
+                // RDAT skipping... following is sound
+                // RDMD skipping... unknown, maybe music data
                 //
-                //RDSD skipping... unknown, maybe sound data
+                // RDSD skipping... unknown, maybe sound data
                 //
-                //RDAT skipping... following is grass
-                //RDGS skipping... unknown, maybe grass
+                // RDAT skipping... following is grass
+                // RDGS skipping... unknown, maybe grass
 
-                //std::cout << "REGN " << ESM::printName(subHdr.typeId) << " skipping..."
-                          //<< subHdr.dataSize << std::endl;
+                // std::cout << "REGN " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
                 reader.skipSubRecordData(); // FIXME: process the subrecord rather than skip
                 break;
             }
@@ -144,10 +157,8 @@ void ESM4::Region::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Region::save(ESM4::Writer& writer) const
+// void ESM4::Region::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-void ESM4::Region::blank()
-{
-}
+void ESM4::Region::blank() {}
diff --git a/components/esm4/loadregn.hpp b/components/esm4/loadregn.hpp
index 9b7962ba3c..30576dbf8e 100644
--- a/components/esm4/loadregn.hpp
+++ b/components/esm4/loadregn.hpp
@@ -42,22 +42,22 @@ namespace ESM4
     {
         enum RegionDataType
         {
-            RDAT_None      = 0x00,
-            RDAT_Objects   = 0x02,
-            RDAT_Weather   = 0x03,
-            RDAT_Map       = 0x04,
+            RDAT_None = 0x00,
+            RDAT_Objects = 0x02,
+            RDAT_Weather = 0x03,
+            RDAT_Map = 0x04,
             RDAT_Landscape = 0x05,
-            RDAT_Grass     = 0x06,
-            RDAT_Sound     = 0x07,
-            RDAT_Imposter  = 0x08
+            RDAT_Grass = 0x06,
+            RDAT_Sound = 0x07,
+            RDAT_Imposter = 0x08
         };
 
 #pragma pack(push, 1)
         struct RegionData
         {
             std::uint32_t type;
-            std::uint8_t  flag;
-            std::uint8_t  priority;
+            std::uint8_t flag;
+            std::uint8_t priority;
             std::uint16_t unknown;
         };
 
@@ -69,15 +69,15 @@ namespace ESM4
         };
 #pragma pack(pop)
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
-        std::string   mEditorId;
+        std::string mEditorId;
         std::uint32_t mColour; // RGBA
-        FormId  mWorldId;      // worldspace formid
+        FormId mWorldId; // worldspace formid
 
-        std::string   mShader; //?? ICON
-        std::string   mMapName;
+        std::string mShader; //?? ICON
+        std::string mMapName;
 
         std::uint32_t mEdgeFalloff;
         std::vector<std::uint32_t> mRPLD; // unknown, point data?
@@ -86,7 +86,7 @@ namespace ESM4
         std::vector<RegionSound> mSounds;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
         void blank();
     };
diff --git a/components/esm4/loadroad.cpp b/components/esm4/loadroad.cpp
index b131811c64..e4707d3877 100644
--- a/components/esm4/loadroad.cpp
+++ b/components/esm4/loadroad.cpp
@@ -37,7 +37,7 @@ void ESM4::Road::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
     mParent = reader.currWorld();
 
     mEditorId = formIdToString(mFormId); // FIXME: quick workaround to use existing code
@@ -89,8 +89,8 @@ void ESM4::Road::load(ESM4::Reader& reader)
                         }
 
                         if (!found)
-                            throw std::runtime_error("ESM4::ROAD::PGRR - Unknown link point "
-                                + std::to_string(j) + "at node " + std::to_string(i) + ".");
+                            throw std::runtime_error("ESM4::ROAD::PGRR - Unknown link point " + std::to_string(j)
+                                + "at node " + std::to_string(i) + ".");
                     }
                 }
 
@@ -102,10 +102,10 @@ void ESM4::Road::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Road::save(ESM4::Writer& writer) const
+// void ESM4::Road::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Road::blank()
+// void ESM4::Road::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadroad.hpp b/components/esm4/loadroad.hpp
index 33fc332643..60aa8d17da 100644
--- a/components/esm4/loadroad.hpp
+++ b/components/esm4/loadroad.hpp
@@ -47,8 +47,8 @@ namespace ESM4
             float x;
             float y;
             float z;
-            std::uint8_t  numLinks;
-            std::uint8_t  unknown1;
+            std::uint8_t numLinks;
+            std::uint8_t unknown1;
             std::uint16_t unknown2;
         };
 
@@ -66,9 +66,9 @@ namespace ESM4
             float z;
         };
 #pragma pack(pop)
-        FormId mParent;       // world FormId, from the loading sequence
+        FormId mParent; // world FormId, from the loading sequence
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -77,9 +77,9 @@ namespace ESM4
         std::vector<PGRR> mLinks;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadsbsp.cpp b/components/esm4/loadsbsp.cpp
index 79ad846414..0182500924 100644
--- a/components/esm4/loadsbsp.cpp
+++ b/components/esm4/loadsbsp.cpp
@@ -35,14 +35,16 @@ void ESM4::SubSpace::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
             case ESM4::SUB_DNAM:
             {
                 reader.get(mDimension.x);
@@ -56,10 +58,10 @@ void ESM4::SubSpace::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::SubSpace::save(ESM4::Writer& writer) const
+// void ESM4::SubSpace::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::SubSpace::blank()
+// void ESM4::SubSpace::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadsbsp.hpp b/components/esm4/loadsbsp.hpp
index 8e949cc6ad..29db8e9c7b 100644
--- a/components/esm4/loadsbsp.hpp
+++ b/components/esm4/loadsbsp.hpp
@@ -45,16 +45,16 @@ namespace ESM4
             float z;
         };
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
         Dimension mDimension;
 
         virtual void load(Reader& reader);
-        //virtual void save(Writer& writer) const;
+        // virtual void save(Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadscol.cpp b/components/esm4/loadscol.cpp
index 0dd206a08f..14eaab5f5c 100644
--- a/components/esm4/loadscol.cpp
+++ b/components/esm4/loadscol.cpp
@@ -28,8 +28,8 @@
 */
 #include "loadscol.hpp"
 
-#include <stdexcept>
 #include <iostream> // FIXME: for debugging only
+#include <stdexcept>
 
 #include "reader.hpp"
 //#include "writer.hpp"
@@ -38,38 +38,39 @@ void ESM4::StaticCollection::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
             case ESM4::SUB_OBND:
             case ESM4::SUB_MODL:
             case ESM4::SUB_MODT:
             case ESM4::SUB_ONAM:
             case ESM4::SUB_DATA:
             {
-                //std::cout << "SCOL " << ESM::printName(subHdr.typeId) << " skipping..."
-                          //<< subHdr.dataSize << std::endl;
+                // std::cout << "SCOL " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
             default:
-                std::cout << "SCOL " << ESM::printName(subHdr.typeId) << " skipping..."
-                          << subHdr.dataSize << std::endl;
+                std::cout << "SCOL " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
-                //throw std::runtime_error("ESM4::SCOL::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+                // throw std::runtime_error("ESM4::SCOL::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
         }
     }
 }
 
-//void ESM4::StaticCollection::save(ESM4::Writer& writer) const
+// void ESM4::StaticCollection::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::StaticCollection::blank()
+// void ESM4::StaticCollection::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadscol.hpp b/components/esm4/loadscol.hpp
index 6a0005699d..d8a549e471 100644
--- a/components/esm4/loadscol.hpp
+++ b/components/esm4/loadscol.hpp
@@ -41,15 +41,15 @@ namespace ESM4
 
     struct StaticCollection
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadscpt.cpp b/components/esm4/loadscpt.cpp
index 4aa0710440..6a06bcdec2 100644
--- a/components/esm4/loadscpt.cpp
+++ b/components/esm4/loadscpt.cpp
@@ -26,9 +26,9 @@
 */
 #include "loadscpt.hpp"
 
-#include <stdexcept>
-#include <iostream> // FIXME: debugging only
 #include <iomanip>
+#include <iostream> // FIXME: debugging only
+#include <stdexcept>
 
 #include "reader.hpp"
 //#include "writer.hpp"
@@ -37,7 +37,7 @@ void ESM4::Script::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     static ScriptLocalVariableData localVar;
 
@@ -53,7 +53,7 @@ void ESM4::Script::load(ESM4::Reader& reader)
             }
             case ESM4::SUB_SCHR:
             {
-    // For debugging only
+                // For debugging only
 #if 0
                 unsigned char mDataBuf[256/*bufSize*/];
                 reader.get(mDataBuf, subHdr.dataSize);
@@ -76,13 +76,14 @@ void ESM4::Script::load(ESM4::Reader& reader)
 #endif
                 break;
             }
-            case ESM4::SUB_SCTX: reader.getString(mScript.scriptSource);
-                //if (mEditorId == "CTrapLogs01SCRIPT")
-                    //std::cout << mScript.scriptSource << std::endl;
+            case ESM4::SUB_SCTX:
+                reader.getString(mScript.scriptSource);
+                // if (mEditorId == "CTrapLogs01SCRIPT")
+                // std::cout << mScript.scriptSource << std::endl;
                 break;
             case ESM4::SUB_SCDA: // compiled script data
             {
-    // For debugging only
+                // For debugging only
 #if 0
                 if (subHdr.dataSize >= 4096)
                 {
@@ -114,7 +115,9 @@ void ESM4::Script::load(ESM4::Reader& reader)
 #endif
                 break;
             }
-            case ESM4::SUB_SCRO: reader.getFormId(mScript.globReference); break;
+            case ESM4::SUB_SCRO:
+                reader.getFormId(mScript.globReference);
+                break;
             case ESM4::SUB_SLSD:
             {
                 localVar.clear();
@@ -146,19 +149,19 @@ void ESM4::Script::load(ESM4::Reader& reader)
                 break;
             }
             default:
-                //std::cout << "SCPT " << ESM::printName(subHdr.typeId) << " skipping..."
-                          //<< subHdr.dataSize << std::endl;
-                //reader.skipSubRecordData();
-                //break;
+                // std::cout << "SCPT " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
+                // reader.skipSubRecordData();
+                // break;
                 throw std::runtime_error("ESM4::SCPT::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
         }
     }
 }
 
-//void ESM4::Script::save(ESM4::Writer& writer) const
+// void ESM4::Script::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Script::blank()
+// void ESM4::Script::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadscpt.hpp b/components/esm4/loadscpt.hpp
index dbf36aa367..bfddaf1029 100644
--- a/components/esm4/loadscpt.hpp
+++ b/components/esm4/loadscpt.hpp
@@ -39,7 +39,7 @@ namespace ESM4
 
     struct Script
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -47,9 +47,9 @@ namespace ESM4
         ScriptDefinition mScript;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadscrl.cpp b/components/esm4/loadscrl.cpp
index ae084afae3..ed0a1e9205 100644
--- a/components/esm4/loadscrl.cpp
+++ b/components/esm4/loadscrl.cpp
@@ -36,24 +36,32 @@ void ESM4::Scroll::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
-            case ESM4::SUB_DESC: reader.getLocalizedString(mText); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
+            case ESM4::SUB_DESC:
+                reader.getLocalizedString(mText);
+                break;
             case ESM4::SUB_DATA:
             {
                 reader.get(mData.value);
                 reader.get(mData.weight);
                 break;
             }
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
-            //case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            // case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
             case ESM4::SUB_OBND:
             case ESM4::SUB_CTDA:
             case ESM4::SUB_EFID:
@@ -65,7 +73,7 @@ void ESM4::Scroll::load(ESM4::Reader& reader)
             case ESM4::SUB_MODT:
             case ESM4::SUB_SPIT:
             {
-                //std::cout << "SCRL " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "SCRL " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -75,10 +83,10 @@ void ESM4::Scroll::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Scroll::save(ESM4::Writer& writer) const
+// void ESM4::Scroll::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Scroll::blank()
+// void ESM4::Scroll::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadscrl.hpp b/components/esm4/loadscrl.hpp
index d7872f551e..a7d6b015af 100644
--- a/components/esm4/loadscrl.hpp
+++ b/components/esm4/loadscrl.hpp
@@ -42,10 +42,10 @@ namespace ESM4
         struct Data
         {
             std::uint32_t value;
-            float         weight;
+            float weight;
         };
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -56,9 +56,9 @@ namespace ESM4
         Data mData;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadsgst.cpp b/components/esm4/loadsgst.cpp
index 843644fe8b..27402f520e 100644
--- a/components/esm4/loadsgst.cpp
+++ b/components/esm4/loadsgst.cpp
@@ -26,8 +26,8 @@
 */
 #include "loadsgst.hpp"
 
-#include <stdexcept>
 #include <cstring>
+#include <stdexcept>
 
 #include "reader.hpp"
 //#include "writer.hpp"
@@ -36,27 +36,29 @@ void ESM4::SigilStone::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
             case ESM4::SUB_FULL:
             {
                 if (mFullName.empty())
                 {
                     if (!reader.getZString(mFullName))
-                        throw std::runtime_error ("SGST FULL data read error");
+                        throw std::runtime_error("SGST FULL data read error");
                 }
                 else
                 {
                     // FIXME: should be part of a struct?
                     std::string scriptEffectName;
                     if (!reader.getZString(scriptEffectName))
-                        throw std::runtime_error ("SGST FULL data read error");
+                        throw std::runtime_error("SGST FULL data read error");
                     mScriptEffect.push_back(scriptEffectName);
                 }
                 break;
@@ -68,10 +70,18 @@ void ESM4::SigilStone::load(ESM4::Reader& reader)
                 reader.get(mData.weight);
                 break;
             }
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
-            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
-            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_ICON:
+                reader.getZString(mIcon);
+                break;
+            case ESM4::SUB_SCRI:
+                reader.getFormId(mScriptId);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
             case ESM4::SUB_SCIT:
             {
                 reader.get(mEffect);
@@ -91,10 +101,10 @@ void ESM4::SigilStone::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::SigilStone::save(ESM4::Writer& writer) const
+// void ESM4::SigilStone::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::SigilStone::blank()
+// void ESM4::SigilStone::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadsgst.hpp b/components/esm4/loadsgst.hpp
index aa9b95166b..aa08389480 100644
--- a/components/esm4/loadsgst.hpp
+++ b/components/esm4/loadsgst.hpp
@@ -41,12 +41,12 @@ namespace ESM4
     {
         struct Data
         {
-            std::uint8_t  uses;
+            std::uint8_t uses;
             std::uint32_t value; // gold
-            float         weight;
+            float weight;
         };
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -63,9 +63,9 @@ namespace ESM4
         Data mData;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadslgm.cpp b/components/esm4/loadslgm.cpp
index 53e30fd1da..8d42c06169 100644
--- a/components/esm4/loadslgm.cpp
+++ b/components/esm4/loadslgm.cpp
@@ -35,29 +35,47 @@ void ESM4::SoulGem::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
-            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
-            case ESM4::SUB_DATA: reader.get(mData);         break;
-            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
-            case ESM4::SUB_SOUL: reader.get(mSoul);         break;
-            case ESM4::SUB_SLCP: reader.get(mSoulCapacity); break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_ICON:
+                reader.getZString(mIcon);
+                break;
+            case ESM4::SUB_DATA:
+                reader.get(mData);
+                break;
+            case ESM4::SUB_SCRI:
+                reader.getFormId(mScriptId);
+                break;
+            case ESM4::SUB_SOUL:
+                reader.get(mSoul);
+                break;
+            case ESM4::SUB_SLCP:
+                reader.get(mSoulCapacity);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
             case ESM4::SUB_MODT:
             case ESM4::SUB_KSIZ:
             case ESM4::SUB_KWDA:
             case ESM4::SUB_NAM0:
             case ESM4::SUB_OBND:
             {
-                //std::cout << "SLGM " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "SLGM " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -67,10 +85,10 @@ void ESM4::SoulGem::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::SoulGem::save(ESM4::Writer& writer) const
+// void ESM4::SoulGem::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::SoulGem::blank()
+// void ESM4::SoulGem::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadslgm.hpp b/components/esm4/loadslgm.hpp
index 893603a1fe..cc30e502e7 100644
--- a/components/esm4/loadslgm.hpp
+++ b/components/esm4/loadslgm.hpp
@@ -43,11 +43,11 @@ namespace ESM4
         struct Data
         {
             std::uint32_t value; // gold
-            float         weight;
+            float weight;
         };
 #pragma pack(pop)
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -58,15 +58,15 @@ namespace ESM4
         float mBoundRadius;
 
         FormId mScriptId;
-        std::uint8_t mSoul;         // 0 = None, 1 = Petty, 2 = Lesser, 3 = Common, 4 = Greater, 5 = Grand
+        std::uint8_t mSoul; // 0 = None, 1 = Petty, 2 = Lesser, 3 = Common, 4 = Greater, 5 = Grand
         std::uint8_t mSoulCapacity; // 0 = None, 1 = Petty, 2 = Lesser, 3 = Common, 4 = Greater, 5 = Grand
 
         Data mData;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadsndr.cpp b/components/esm4/loadsndr.cpp
index d01fb0ed74..f5a74fd091 100644
--- a/components/esm4/loadsndr.cpp
+++ b/components/esm4/loadsndr.cpp
@@ -36,14 +36,16 @@ void ESM4::SoundReference::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
             case ESM4::SUB_CTDA:
             {
                 reader.get(&mTargetCondition, 20);
@@ -55,17 +57,29 @@ void ESM4::SoundReference::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_GNAM: reader.getFormId(mSoundCategory); break;
-            case ESM4::SUB_SNAM: reader.getFormId(mSoundId); break;
-            case ESM4::SUB_ONAM: reader.getFormId(mOutputModel); break;
-            case ESM4::SUB_ANAM: reader.getZString(mSoundFile);  break;
-            case ESM4::SUB_LNAM: reader.get(mLoopInfo); break;
-            case ESM4::SUB_BNAM: reader.get(mData); break;
+            case ESM4::SUB_GNAM:
+                reader.getFormId(mSoundCategory);
+                break;
+            case ESM4::SUB_SNAM:
+                reader.getFormId(mSoundId);
+                break;
+            case ESM4::SUB_ONAM:
+                reader.getFormId(mOutputModel);
+                break;
+            case ESM4::SUB_ANAM:
+                reader.getZString(mSoundFile);
+                break;
+            case ESM4::SUB_LNAM:
+                reader.get(mLoopInfo);
+                break;
+            case ESM4::SUB_BNAM:
+                reader.get(mData);
+                break;
             case ESM4::SUB_CNAM: // CRC32 hash
             case ESM4::SUB_FNAM: // unknown
             {
-                //std::cout << "SNDR " << ESM::printName(subHdr.typeId) << " skipping..."
-                          //<< subHdr.dataSize << std::endl;
+                // std::cout << "SNDR " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -75,10 +89,10 @@ void ESM4::SoundReference::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::SoundReference::save(ESM4::Writer& writer) const
+// void ESM4::SoundReference::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::SoundReference::blank()
+// void ESM4::SoundReference::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadsndr.hpp b/components/esm4/loadsndr.hpp
index de0ca3eb1a..6ecaa9735a 100644
--- a/components/esm4/loadsndr.hpp
+++ b/components/esm4/loadsndr.hpp
@@ -49,8 +49,8 @@ namespace ESM4
     struct SoundInfo
     {
         std::int8_t frequencyAdjustment; // %, signed
-        std::uint8_t frequencyVariance;  // %
-        std::uint8_t priority;           // default 128
+        std::uint8_t frequencyVariance; // %
+        std::uint8_t priority; // default 128
         std::uint8_t dBVriance;
         std::uint16_t staticAttenuation; // divide by 100 to get value in dB
     };
@@ -58,7 +58,7 @@ namespace ESM4
 
     struct SoundReference
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -74,9 +74,9 @@ namespace ESM4
         TargetCondition mTargetCondition;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadsoun.cpp b/components/esm4/loadsoun.cpp
index a3358236b0..7e69cc952c 100644
--- a/components/esm4/loadsoun.cpp
+++ b/components/esm4/loadsoun.cpp
@@ -36,16 +36,22 @@ void ESM4::Sound::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
-            case ESM4::SUB_FNAM: reader.getZString(mSoundFile); break;
-            case ESM4::SUB_SNDX: reader.get(mData); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FNAM:
+                reader.getZString(mSoundFile);
+                break;
+            case ESM4::SUB_SNDX:
+                reader.get(mData);
+                break;
             case ESM4::SUB_SNDD:
             {
                 if (subHdr.dataSize == 8)
@@ -65,8 +71,8 @@ void ESM4::Sound::load(ESM4::Reader& reader)
             case ESM4::SUB_HNAM: // FO3
             case ESM4::SUB_RNAM: // FONV
             {
-                //std::cout << "SOUN " << ESM::printName(subHdr.typeId) << " skipping..."
-                          //<< subHdr.dataSize << std::endl;
+                // std::cout << "SOUN " << ESM::printName(subHdr.typeId) << " skipping..."
+                //<< subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -76,10 +82,10 @@ void ESM4::Sound::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Sound::save(ESM4::Writer& writer) const
+// void ESM4::Sound::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Sound::blank()
+// void ESM4::Sound::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadsoun.hpp b/components/esm4/loadsoun.hpp
index da1d7fbd71..d3164912c9 100644
--- a/components/esm4/loadsoun.hpp
+++ b/components/esm4/loadsoun.hpp
@@ -42,27 +42,27 @@ namespace ESM4
         enum Flags
         {
             Flag_RandomFreqShift = 0x0001,
-            Flag_PlayAtRandom    = 0x0002,
-            Flag_EnvIgnored      = 0x0004,
-            Flag_RandomLocation  = 0x0008,
-            Flag_Loop            = 0x0010,
-            Flag_MenuSound       = 0x0020,
-            Flag_2D              = 0x0040,
-            Flag_360LFE          = 0x0080
+            Flag_PlayAtRandom = 0x0002,
+            Flag_EnvIgnored = 0x0004,
+            Flag_RandomLocation = 0x0008,
+            Flag_Loop = 0x0010,
+            Flag_MenuSound = 0x0020,
+            Flag_2D = 0x0040,
+            Flag_360LFE = 0x0080
         };
 
 #pragma pack(push, 1)
         struct SNDX
         {
-            std::uint8_t  minAttenuation; // distance?
-            std::uint8_t  maxAttenuation; // distance?
-            std::int8_t   freqAdjustment; // %, signed
-            std::uint8_t  unknown; // probably padding
+            std::uint8_t minAttenuation; // distance?
+            std::uint8_t maxAttenuation; // distance?
+            std::int8_t freqAdjustment; // %, signed
+            std::uint8_t unknown; // probably padding
             std::uint16_t flags;
             std::uint16_t unknown2; // probably padding
             std::uint16_t staticAttenuation; // divide by 100 to get value in dB
-            std::uint8_t  stopTime;  // multiply by 1440/256 to get value in minutes
-            std::uint8_t  startTime; // multiply by 1440/256 to get value in minutes
+            std::uint8_t stopTime; // multiply by 1440/256 to get value in minutes
+            std::uint8_t startTime; // multiply by 1440/256 to get value in minutes
         };
 
         struct SoundData
@@ -79,7 +79,7 @@ namespace ESM4
         };
 #pragma pack(pop)
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -89,9 +89,9 @@ namespace ESM4
         SoundData mExtra;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadstat.cpp b/components/esm4/loadstat.cpp
index d57294cc40..e8e789cb1b 100644
--- a/components/esm4/loadstat.cpp
+++ b/components/esm4/loadstat.cpp
@@ -26,8 +26,8 @@
 */
 #include "loadstat.hpp"
 
-#include <stdexcept>
 #include <iostream> // FIXME: debug only
+#include <stdexcept>
 
 #include "reader.hpp"
 //#include "writer.hpp"
@@ -36,24 +36,30 @@ void ESM4::Static::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
             case ESM4::SUB_MODT:
             {
                 // version is only availabe in TES5 (seems to be 27 or 28?)
-                //if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
-                    //std::cout << "STAT MODT ver: " << std::hex << reader.hdr().record.version << std::endl;
+                // if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
+                // std::cout << "STAT MODT ver: " << std::hex << reader.hdr().record.version << std::endl;
 
                 // for TES4 these are just a sequence of bytes
-                mMODT.resize(subHdr.dataSize/sizeof(std::uint8_t));
+                mMODT.resize(subHdr.dataSize / sizeof(std::uint8_t));
                 for (std::vector<std::uint8_t>::iterator it = mMODT.begin(); it != mMODT.end(); ++it)
                 {
                     reader.get(*it);
@@ -72,7 +78,7 @@ void ESM4::Static::load(ESM4::Reader& reader)
             case ESM4::SUB_BRUS: // FONV
             case ESM4::SUB_RNAM: // FONV
             {
-                //std::cout << "STAT " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "STAT " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -82,10 +88,10 @@ void ESM4::Static::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Static::save(ESM4::Writer& writer) const
+// void ESM4::Static::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Static::blank()
+// void ESM4::Static::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadstat.hpp b/components/esm4/loadstat.hpp
index 07369b3357..f34ba6a1cf 100644
--- a/components/esm4/loadstat.hpp
+++ b/components/esm4/loadstat.hpp
@@ -40,7 +40,7 @@ namespace ESM4
 
     struct Static
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -50,9 +50,9 @@ namespace ESM4
         std::vector<std::uint8_t> mMODT; // FIXME texture hash
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadtact.cpp b/components/esm4/loadtact.cpp
index 0d684719be..362ea65a3c 100644
--- a/components/esm4/loadtact.cpp
+++ b/components/esm4/loadtact.cpp
@@ -26,8 +26,8 @@
 */
 #include "loadtact.hpp"
 
-#include <stdexcept>
 #include <iostream> // FIXME: testing only
+#include <stdexcept>
 
 #include "reader.hpp"
 //#include "writer.hpp"
@@ -36,20 +36,34 @@ void ESM4::TalkingActivator::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
-            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
-            case ESM4::SUB_VNAM: reader.getFormId(mVoiceType); break;
-            case ESM4::SUB_SNAM: reader.getFormId(mLoopSound); break;
-            case ESM4::SUB_INAM: reader.getFormId(mRadioTemplate); break; // FONV
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
+            case ESM4::SUB_SCRI:
+                reader.getFormId(mScriptId);
+                break;
+            case ESM4::SUB_VNAM:
+                reader.getFormId(mVoiceType);
+                break;
+            case ESM4::SUB_SNAM:
+                reader.getFormId(mLoopSound);
+                break;
+            case ESM4::SUB_INAM:
+                reader.getFormId(mRadioTemplate);
+                break; // FONV
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
             case ESM4::SUB_DEST: // FO3 destruction
             case ESM4::SUB_DSTD: // FO3 destruction
             case ESM4::SUB_DSTF: // FO3 destruction
@@ -58,7 +72,7 @@ void ESM4::TalkingActivator::load(ESM4::Reader& reader)
             case ESM4::SUB_MODT: // texture file hash?
             case ESM4::SUB_OBND:
             {
-                //std::cout << "TACT " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "TACT " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -68,10 +82,10 @@ void ESM4::TalkingActivator::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::TalkingActivator::save(ESM4::Writer& writer) const
+// void ESM4::TalkingActivator::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::TalkingActivator::blank()
+// void ESM4::TalkingActivator::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadtact.hpp b/components/esm4/loadtact.hpp
index 3a79006d78..4720d15063 100644
--- a/components/esm4/loadtact.hpp
+++ b/components/esm4/loadtact.hpp
@@ -39,18 +39,18 @@ namespace ESM4
 
     enum TalkingActivatorFlags
     {
-         TACT_OnLocalMap      = 0x00000200,
-         TACT_QuestItem       = 0x00000400,
-         TACT_NoVoiceFilter   = 0x00002000,
-         TACT_RandomAnimStart = 0x00010000,
-         TACT_RadioStation    = 0x00020000,
-         TACT_NonProxy        = 0x10000000, // only valid if Radio Station
-         TACT_ContBroadcast   = 0x40000000  // only valid if Radio Station
+        TACT_OnLocalMap = 0x00000200,
+        TACT_QuestItem = 0x00000400,
+        TACT_NoVoiceFilter = 0x00002000,
+        TACT_RandomAnimStart = 0x00010000,
+        TACT_RadioStation = 0x00020000,
+        TACT_NonProxy = 0x10000000, // only valid if Radio Station
+        TACT_ContBroadcast = 0x40000000 // only valid if Radio Station
     };
 
     struct TalkingActivator
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see above for details
 
         std::string mEditorId;
@@ -59,14 +59,14 @@ namespace ESM4
         std::string mModel;
 
         FormId mScriptId;
-        FormId mVoiceType;     // VTYP
-        FormId mLoopSound;     // SOUN
+        FormId mVoiceType; // VTYP
+        FormId mLoopSound; // SOUN
         FormId mRadioTemplate; // SOUN
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadterm.cpp b/components/esm4/loadterm.cpp
index fc1d10cf70..91b056bc92 100644
--- a/components/esm4/loadterm.cpp
+++ b/components/esm4/loadterm.cpp
@@ -36,21 +36,37 @@ void ESM4::Terminal::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
-            case ESM4::SUB_DESC: reader.getLocalizedString(mText); break;
-            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
-            case ESM4::SUB_PNAM: reader.getFormId(mPasswordNote); break;
-            case ESM4::SUB_SNAM: reader.getFormId(mSound); break;
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
-            case ESM4::SUB_RNAM: reader.getZString(mResultText); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
+            case ESM4::SUB_DESC:
+                reader.getLocalizedString(mText);
+                break;
+            case ESM4::SUB_SCRI:
+                reader.getFormId(mScriptId);
+                break;
+            case ESM4::SUB_PNAM:
+                reader.getFormId(mPasswordNote);
+                break;
+            case ESM4::SUB_SNAM:
+                reader.getFormId(mSound);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_RNAM:
+                reader.getZString(mResultText);
+                break;
             case ESM4::SUB_DNAM: // difficulty
             case ESM4::SUB_ANAM: // flags
             case ESM4::SUB_CTDA:
@@ -68,7 +84,7 @@ void ESM4::Terminal::load(ESM4::Reader& reader)
             case ESM4::SUB_OBND:
             case ESM4::SUB_MODS: // FONV
             {
-                //std::cout << "TERM " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "TERM " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -78,10 +94,10 @@ void ESM4::Terminal::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Terminal::save(ESM4::Writer& writer) const
+// void ESM4::Terminal::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Terminal::blank()
+// void ESM4::Terminal::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadterm.hpp b/components/esm4/loadterm.hpp
index 32ec613ff5..f1e8984f40 100644
--- a/components/esm4/loadterm.hpp
+++ b/components/esm4/loadterm.hpp
@@ -39,7 +39,7 @@ namespace ESM4
 
     struct Terminal
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -54,9 +54,9 @@ namespace ESM4
         FormId mSound;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadtes4.cpp b/components/esm4/loadtes4.cpp
index 453a2f12a7..8549a1bf02 100644
--- a/components/esm4/loadtes4.cpp
+++ b/components/esm4/loadtes4.cpp
@@ -51,14 +51,20 @@ void ESM4::Header::load(ESM4::Reader& reader)
         {
             case ESM4::SUB_HEDR:
             {
-                if (!reader.getExact(mData.version) || !reader.getExact(mData.records) || !reader.getExact(mData.nextObjectId))
+                if (!reader.getExact(mData.version) || !reader.getExact(mData.records)
+                    || !reader.getExact(mData.nextObjectId))
                     throw std::runtime_error("TES4 HEDR data read error");
-                if ((size_t)subHdr.dataSize != sizeof(mData.version)+sizeof(mData.records)+sizeof(mData.nextObjectId))
+                if ((size_t)subHdr.dataSize
+                    != sizeof(mData.version) + sizeof(mData.records) + sizeof(mData.nextObjectId))
                     throw std::runtime_error("TES4 HEDR data size mismatch");
                 break;
             }
-            case ESM4::SUB_CNAM: reader.getZString(mAuthor); break;
-            case ESM4::SUB_SNAM: reader.getZString(mDesc); break;
+            case ESM4::SUB_CNAM:
+                reader.getZString(mAuthor);
+                break;
+            case ESM4::SUB_SNAM:
+                reader.getZString(mDesc);
+                break;
             case ESM4::SUB_MAST: // multiple
             {
                 ESM::MasterData m;
@@ -67,7 +73,7 @@ void ESM4::Header::load(ESM4::Reader& reader)
 
                 // NOTE: some mods do not have DATA following MAST so can't read DATA here
                 m.size = 0;
-                mMaster.push_back (m);
+                mMaster.push_back(m);
                 break;
             }
             case ESM4::SUB_DATA:
@@ -79,8 +85,8 @@ void ESM4::Header::load(ESM4::Reader& reader)
             }
             case ESM4::SUB_ONAM:
             {
-                mOverrides.resize(subHdr.dataSize/sizeof(FormId));
-                for (unsigned int & mOverride : mOverrides)
+                mOverrides.resize(subHdr.dataSize / sizeof(FormId));
+                for (unsigned int& mOverride : mOverrides)
                 {
                     if (!reader.getExact(mOverride))
                         throw std::runtime_error("TES4 ONAM data read error");
@@ -97,7 +103,7 @@ void ESM4::Header::load(ESM4::Reader& reader)
             case ESM4::SUB_OFST: // Oblivion only?
             case ESM4::SUB_DELE: // Oblivion only?
             {
-                //std::cout << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -107,6 +113,6 @@ void ESM4::Header::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Header::save(ESM4::Writer& writer)
+// void ESM4::Header::save(ESM4::Writer& writer)
 //{
-//}
+// }
diff --git a/components/esm4/loadtes4.hpp b/components/esm4/loadtes4.hpp
index 6d84fe360b..212862e319 100644
--- a/components/esm4/loadtes4.hpp
+++ b/components/esm4/loadtes4.hpp
@@ -29,8 +29,8 @@
 
 #include <vector>
 
-#include "formid.hpp"
 #include "../esm/common.hpp" // ESMVersion, MasterData
+#include "formid.hpp"
 
 namespace ESM4
 {
@@ -41,8 +41,8 @@ namespace ESM4
     struct Data
     {
         ESM::ESMVersion version; // File format version.
-        std::int32_t    records; // Number of records
-        std::uint32_t   nextObjectId;
+        std::int32_t records; // Number of records
+        std::uint32_t nextObjectId;
     };
 #pragma pack(pop)
 
@@ -52,17 +52,17 @@ namespace ESM4
 
         Data mData;
         std::string mAuthor; // Author's name
-        std::string mDesc;   // File description
+        std::string mDesc; // File description
         std::vector<ESM::MasterData> mMaster;
 
         std::vector<FormId> mOverrides; // Skyrim only, cell children (ACHR, LAND, NAVM, PGRE, PHZD, REFR)
 
         // position in the vector = mod index of master files above
         // value = adjusted mod index based on all the files loaded so far
-        //std::vector<std::uint32_t> mModIndices;
+        // std::vector<std::uint32_t> mModIndices;
 
-        void load (Reader& reader);
-        //void save (Writer& writer);
+        void load(Reader& reader);
+        // void save (Writer& writer);
     };
 }
 
diff --git a/components/esm4/loadtree.cpp b/components/esm4/loadtree.cpp
index 1ac3301c3f..b0c2656595 100644
--- a/components/esm4/loadtree.cpp
+++ b/components/esm4/loadtree.cpp
@@ -35,17 +35,25 @@ void ESM4::Tree::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_MODL: reader.getZString(mModel);    break;
-            case ESM4::SUB_ICON: reader.getZString(mLeafTexture); break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);     break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_ICON:
+                reader.getZString(mLeafTexture);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
             case ESM4::SUB_MODT:
             case ESM4::SUB_CNAM:
             case ESM4::SUB_BNAM:
@@ -55,7 +63,7 @@ void ESM4::Tree::load(ESM4::Reader& reader)
             case ESM4::SUB_PFIG:
             case ESM4::SUB_PFPC:
             {
-                //std::cout << "TREE " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "TREE " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -65,10 +73,10 @@ void ESM4::Tree::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Tree::save(ESM4::Writer& writer) const
+// void ESM4::Tree::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Tree::blank()
+// void ESM4::Tree::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadtree.hpp b/components/esm4/loadtree.hpp
index 48c59468b2..cc4f88fad6 100644
--- a/components/esm4/loadtree.hpp
+++ b/components/esm4/loadtree.hpp
@@ -39,7 +39,7 @@ namespace ESM4
 
     struct Tree
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -50,9 +50,9 @@ namespace ESM4
         std::string mLeafTexture;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadtxst.cpp b/components/esm4/loadtxst.cpp
index b0f8c1113c..20e058ebbc 100644
--- a/components/esm4/loadtxst.cpp
+++ b/components/esm4/loadtxst.cpp
@@ -26,8 +26,8 @@
 */
 #include "loadtxst.hpp"
 
-#include <stdexcept>
 #include <iostream> // FIXME: testing only
+#include <stdexcept>
 
 #include "reader.hpp"
 //#include "writer.hpp"
@@ -36,27 +36,45 @@ void ESM4::TextureSet::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_TX00: reader.getZString(mDiffuse); break;
-            case ESM4::SUB_TX01: reader.getZString(mNormalMap); break;
-            case ESM4::SUB_TX02: reader.getZString(mEnvMask); break;
-            case ESM4::SUB_TX03: reader.getZString(mToneMap); break;
-            case ESM4::SUB_TX04: reader.getZString(mDetailMap); break;
-            case ESM4::SUB_TX05: reader.getZString(mEnvMap); break;
-            case ESM4::SUB_TX06: reader.getZString(mUnknown); break;
-            case ESM4::SUB_TX07: reader.getZString(mSpecular); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_TX00:
+                reader.getZString(mDiffuse);
+                break;
+            case ESM4::SUB_TX01:
+                reader.getZString(mNormalMap);
+                break;
+            case ESM4::SUB_TX02:
+                reader.getZString(mEnvMask);
+                break;
+            case ESM4::SUB_TX03:
+                reader.getZString(mToneMap);
+                break;
+            case ESM4::SUB_TX04:
+                reader.getZString(mDetailMap);
+                break;
+            case ESM4::SUB_TX05:
+                reader.getZString(mEnvMap);
+                break;
+            case ESM4::SUB_TX06:
+                reader.getZString(mUnknown);
+                break;
+            case ESM4::SUB_TX07:
+                reader.getZString(mSpecular);
+                break;
             case ESM4::SUB_DNAM:
             case ESM4::SUB_DODT:
             case ESM4::SUB_OBND: // object bounds
             {
-                //std::cout << "TXST " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "TXST " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -66,10 +84,10 @@ void ESM4::TextureSet::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::TextureSet::save(ESM4::Writer& writer) const
+// void ESM4::TextureSet::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::TextureSet::blank()
+// void ESM4::TextureSet::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadtxst.hpp b/components/esm4/loadtxst.hpp
index be968f2e6e..06502af582 100644
--- a/components/esm4/loadtxst.hpp
+++ b/components/esm4/loadtxst.hpp
@@ -39,7 +39,7 @@ namespace ESM4
 
     struct TextureSet
     {
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -54,9 +54,9 @@ namespace ESM4
         std::string mSpecular;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadweap.cpp b/components/esm4/loadweap.cpp
index 56ae2174d2..d8fdfe26f7 100644
--- a/components/esm4/loadweap.cpp
+++ b/components/esm4/loadweap.cpp
@@ -35,7 +35,7 @@ void ESM4::Weapon::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
     std::uint32_t esmVer = reader.esmVersion();
     bool isFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
 
@@ -44,11 +44,15 @@ void ESM4::Weapon::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
             case ESM4::SUB_DATA:
             {
-                //if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
+                // if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
                 if (subHdr.dataSize == 10) // FO3 has 15 bytes even though VER_094
                 {
                     reader.get(mData.value);
@@ -76,16 +80,36 @@ void ESM4::Weapon::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_MODL: reader.getZString(mModel); break;
-            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
-            case ESM4::SUB_MICO: reader.getZString(mMiniIcon); break; // FO3
-            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
-            case ESM4::SUB_ANAM: reader.get(mEnchantmentPoints); break;
-            case ESM4::SUB_ENAM: reader.getFormId(mEnchantment); break;
-            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
-            case ESM4::SUB_DESC: reader.getLocalizedString(mText); break;
-            case ESM4::SUB_YNAM: reader.getFormId(mPickUpSound); break;
-            case ESM4::SUB_ZNAM: reader.getFormId(mDropSound); break;
+            case ESM4::SUB_MODL:
+                reader.getZString(mModel);
+                break;
+            case ESM4::SUB_ICON:
+                reader.getZString(mIcon);
+                break;
+            case ESM4::SUB_MICO:
+                reader.getZString(mMiniIcon);
+                break; // FO3
+            case ESM4::SUB_SCRI:
+                reader.getFormId(mScriptId);
+                break;
+            case ESM4::SUB_ANAM:
+                reader.get(mEnchantmentPoints);
+                break;
+            case ESM4::SUB_ENAM:
+                reader.getFormId(mEnchantment);
+                break;
+            case ESM4::SUB_MODB:
+                reader.get(mBoundRadius);
+                break;
+            case ESM4::SUB_DESC:
+                reader.getLocalizedString(mText);
+                break;
+            case ESM4::SUB_YNAM:
+                reader.getFormId(mPickUpSound);
+                break;
+            case ESM4::SUB_ZNAM:
+                reader.getFormId(mDropSound);
+                break;
             case ESM4::SUB_MODT:
             case ESM4::SUB_BAMT:
             case ESM4::SUB_BIDS:
@@ -125,7 +149,7 @@ void ESM4::Weapon::load(ESM4::Reader& reader)
             case ESM4::SUB_MO3T: // FO3
             case ESM4::SUB_MO3S: // FO3
             case ESM4::SUB_MODD: // FO3
-          //case ESM4::SUB_MOSD: // FO3
+                                 // case ESM4::SUB_MOSD: // FO3
             case ESM4::SUB_DEST: // FO3
             case ESM4::SUB_DSTD: // FO3
             case ESM4::SUB_DSTF: // FO3
@@ -154,7 +178,7 @@ void ESM4::Weapon::load(ESM4::Reader& reader)
             case ESM4::SUB_WNM7: // FONV
             case ESM4::SUB_EFSD: // FONV DeadMoney
             {
-                //std::cout << "WEAP " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "WEAP " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
@@ -164,10 +188,10 @@ void ESM4::Weapon::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::Weapon::save(ESM4::Writer& writer) const
+// void ESM4::Weapon::save(ESM4::Writer& writer) const
 //{
-//}
+// }
 
-//void ESM4::Weapon::blank()
+// void ESM4::Weapon::blank()
 //{
-//}
+// }
diff --git a/components/esm4/loadweap.hpp b/components/esm4/loadweap.hpp
index 1abfc5b577..52c8c22d17 100644
--- a/components/esm4/loadweap.hpp
+++ b/components/esm4/loadweap.hpp
@@ -49,20 +49,30 @@ namespace ESM4
             // 4 = Staff
             // 5 = Bow
             std::uint32_t type;
-            float         speed;
-            float         reach;
+            float speed;
+            float reach;
             std::uint32_t flags;
             std::uint32_t value; // gold
             std::uint32_t health;
-            float         weight;
+            float weight;
             std::uint16_t damage;
-            std::uint8_t  clipSize; // FO3/FONV only
-
-            Data() : type(0), speed(0.f), reach(0.f), flags(0), value(0),
-                     health(0), weight(0.f), damage(0), clipSize(0) {}
+            std::uint8_t clipSize; // FO3/FONV only
+
+            Data()
+                : type(0)
+                , speed(0.f)
+                , reach(0.f)
+                , flags(0)
+                , value(0)
+                , health(0)
+                , weight(0.f)
+                , damage(0)
+                , clipSize(0)
+            {
+            }
         };
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
@@ -79,14 +89,14 @@ namespace ESM4
 
         FormId mScriptId;
         std::uint16_t mEnchantmentPoints;
-        FormId      mEnchantment;
+        FormId mEnchantment;
 
         Data mData;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
 
-        //void blank();
+        // void blank();
     };
 }
 
diff --git a/components/esm4/loadwrld.cpp b/components/esm4/loadwrld.cpp
index d8ec79b625..9cc56cd9fd 100644
--- a/components/esm4/loadwrld.cpp
+++ b/components/esm4/loadwrld.cpp
@@ -36,7 +36,7 @@ void ESM4::World::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
-    mFlags  = reader.hdr().record.flags;
+    mFlags = reader.hdr().record.flags;
 
     // It should be possible to save the current world formId automatically while reading in
     // the record header rather than doing it manually here but possibly less efficient (may
@@ -50,8 +50,8 @@ void ESM4::World::load(ESM4::Reader& reader)
     std::uint32_t subSize = 0; // for XXXX sub record
 
     std::uint32_t esmVer = reader.esmVersion();
-    //bool isTES4 = (esmVer == ESM::VER_080 || esmVer == ESM::VER_100);
-    //bool isFONV = (esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134);
+    // bool isTES4 = (esmVer == ESM::VER_080 || esmVer == ESM::VER_100);
+    // bool isFONV = (esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134);
     bool isTES5 = (esmVer == ESM::VER_094 || esmVer == ESM::VER_170); // WARN: FO3 is also VER_094
     bool usingDefaultLevels = true;
 
@@ -60,14 +60,30 @@ void ESM4::World::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
-            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
-            case ESM4::SUB_WCTR: reader.get(mCenterCell);   break; // Center cell, TES5 only
-            case ESM4::SUB_WNAM: reader.getFormId(mParent); break;
-            case ESM4::SUB_SNAM: reader.get(mSound);        break; // sound, Oblivion only?
-            case ESM4::SUB_ICON: reader.getZString(mMapFile); break; // map filename, Oblivion only?
-            case ESM4::SUB_CNAM: reader.get(mClimate);      break;
-            case ESM4::SUB_NAM2: reader.getFormId(mWater);  break;
+            case ESM4::SUB_EDID:
+                reader.getZString(mEditorId);
+                break;
+            case ESM4::SUB_FULL:
+                reader.getLocalizedString(mFullName);
+                break;
+            case ESM4::SUB_WCTR:
+                reader.get(mCenterCell);
+                break; // Center cell, TES5 only
+            case ESM4::SUB_WNAM:
+                reader.getFormId(mParent);
+                break;
+            case ESM4::SUB_SNAM:
+                reader.get(mSound);
+                break; // sound, Oblivion only?
+            case ESM4::SUB_ICON:
+                reader.getZString(mMapFile);
+                break; // map filename, Oblivion only?
+            case ESM4::SUB_CNAM:
+                reader.get(mClimate);
+                break;
+            case ESM4::SUB_NAM2:
+                reader.getFormId(mWater);
+                break;
             case ESM4::SUB_NAM0:
             {
                 reader.get(mMinX);
@@ -80,7 +96,9 @@ void ESM4::World::load(ESM4::Reader& reader)
                 reader.get(mMaxY);
                 break;
             }
-            case ESM4::SUB_DATA: reader.get(mWorldFlags);   break;
+            case ESM4::SUB_DATA:
+                reader.get(mWorldFlags);
+                break;
             case ESM4::SUB_MNAM:
             {
                 reader.get(mMap.width);
@@ -101,7 +119,7 @@ void ESM4::World::load(ESM4::Reader& reader)
             }
             case ESM4::SUB_DNAM: // defaults
             {
-                reader.get(mLandLevel);  //  -2700.f for TES5
+                reader.get(mLandLevel); //  -2700.f for TES5
                 reader.get(mWaterLevel); // -14000.f for TES5
                 usingDefaultLevels = false;
 
@@ -121,8 +139,12 @@ void ESM4::World::load(ESM4::Reader& reader)
             // 00119D2E freeside\freeside_01.mp3 0012D94D FreesideNorthWorld (Freeside)
             // 00119D2E freeside\freeside_01.mp3 0012D94E FreesideFortWorld (Old Mormon Fort)
             // NOTE: FONV DefaultObjectManager has 00090908 "explore" as the default music
-            case ESM4::SUB_ZNAM: reader.getFormId(mMusic); break;
-            case ESM4::SUB_PNAM: reader.get(mParentUseFlags); break;
+            case ESM4::SUB_ZNAM:
+                reader.getFormId(mMusic);
+                break;
+            case ESM4::SUB_PNAM:
+                reader.get(mParentUseFlags);
+                break;
             case ESM4::SUB_RNAM: // multiple
             case ESM4::SUB_MHDT:
             case ESM4::SUB_LTMP:
@@ -143,7 +165,7 @@ void ESM4::World::load(ESM4::Reader& reader)
             case ESM4::SUB_IMPS: // FO3 Anchorage
             case ESM4::SUB_IMPF: // FO3 Anchorage
             {
-                //std::cout << "WRLD " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                // std::cout << "WRLD " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData(); // FIXME: process the subrecord rather than skip
                 break;
             }
@@ -177,6 +199,6 @@ void ESM4::World::load(ESM4::Reader& reader)
     }
 }
 
-//void ESM4::World::save(ESM4::Writer& writer) const
+// void ESM4::World::save(ESM4::Writer& writer) const
 //{
-//}
+// }
diff --git a/components/esm4/loadwrld.hpp b/components/esm4/loadwrld.hpp
index b6b643446c..1916057b58 100644
--- a/components/esm4/loadwrld.hpp
+++ b/components/esm4/loadwrld.hpp
@@ -28,8 +28,8 @@
 #define ESM4_WRLD_H
 
 #include <cstdint>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "common.hpp"
 
@@ -40,21 +40,21 @@ namespace ESM4
 
     struct World
     {
-        enum WorldFlags                 // TES4                 TES5
-        {                               // -------------------- -----------------
-            WLD_Small          = 0x01,  // Small World          Small World
-            WLD_NoFastTravel   = 0x02,  // Can't Fast Travel    Can't Fast Travel
-            WLD_Oblivion       = 0x04,  // Oblivion worldspace
-            WLD_NoLODWater     = 0x08,  //                      No LOD Water
-            WLD_NoLandscpe     = 0x10,  // No LOD Water         No Landscape
-            WLD_NoSky          = 0x20,  //                      No Sky
-            wLD_FixedDimension = 0x40,  //                      Fixed Dimensions
-            WLD_NoGrass        = 0x80   //                      No Grass
+        enum WorldFlags // TES4                 TES5
+        { // -------------------- -----------------
+            WLD_Small = 0x01, // Small World          Small World
+            WLD_NoFastTravel = 0x02, // Can't Fast Travel    Can't Fast Travel
+            WLD_Oblivion = 0x04, // Oblivion worldspace
+            WLD_NoLODWater = 0x08, //                      No LOD Water
+            WLD_NoLandscpe = 0x10, // No LOD Water         No Landscape
+            WLD_NoSky = 0x20, //                      No Sky
+            wLD_FixedDimension = 0x40, //                      Fixed Dimensions
+            WLD_NoGrass = 0x80 //                      No Grass
         };
 
         struct REFRcoord
         {
-            FormId       formId;
+            FormId formId;
             std::int16_t unknown1;
             std::int16_t unknown2;
         };
@@ -66,31 +66,31 @@ namespace ESM4
             std::vector<REFRcoord> refrs;
         };
 
-        //Map size	struct	16 or 28 byte structure
+        // Map size	struct	16 or 28 byte structure
         struct Map
         {
-            std::uint32_t width;  // usable width of the map
+            std::uint32_t width; // usable width of the map
             std::uint32_t height; // usable height of the map
-            std::int16_t  NWcellX;
-            std::int16_t  NWcellY;
-            std::int16_t  SEcellX;
-            std::int16_t  SEcellY;
+            std::int16_t NWcellX;
+            std::int16_t NWcellY;
+            std::int16_t SEcellX;
+            std::int16_t SEcellY;
             float minHeight; // Camera Data (default 50000), new as of Skyrim 1.8, purpose is not yet known.
             float maxHeight; // Camera Data (default 80000)
             float initialPitch;
         };
 
-        FormId mFormId;       // from the header
+        FormId mFormId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
-        std::string  mEditorId;
-        std::string  mFullName;
-        FormId       mParent;       // parent worldspace formid
+        std::string mEditorId;
+        std::string mFullName;
+        FormId mParent; // parent worldspace formid
         std::uint8_t mWorldFlags;
-        FormId       mClimate;
-        FormId       mWater;
-        float        mLandLevel;
-        float        mWaterLevel;
+        FormId mClimate;
+        FormId mWater;
+        float mLandLevel;
+        float mWaterLevel;
 
         Map mMap;
 
@@ -101,7 +101,7 @@ namespace ESM4
 
         // ------ TES4 only -----
 
-        std::int32_t mSound;   // 0 = no record, 1 = Public, 2 = Dungeon
+        std::int32_t mSound; // 0 = no record, 1 = Public, 2 = Dungeon
         std::string mMapFile;
 
         // ------ TES5 only -----
@@ -127,7 +127,7 @@ namespace ESM4
         std::vector<FormId> mRoads;
 
         void load(ESM4::Reader& reader);
-        //void save(ESM4::Writer& writer) const;
+        // void save(ESM4::Writer& writer) const;
     };
 }
 
diff --git a/components/esm4/reader.cpp b/components/esm4/reader.cpp
index 0e661007d5..b032fabe5f 100644
--- a/components/esm4/reader.cpp
+++ b/components/esm4/reader.cpp
@@ -29,67 +29,76 @@
 #undef DEBUG_GROUPSTACK
 
 #include <cassert>
+#include <iomanip> // for debugging
+#include <iostream> // for debugging
+#include <sstream> // for debugging
 #include <stdexcept>
 #include <unordered_map>
-#include <iostream> // for debugging
-#include <sstream>  // for debugging
-#include <iomanip>  // for debugging
 
 #if defined(_MSC_VER)
-    #pragma warning (push)
-    #pragma warning (disable : 4706)
-    #include <boost/iostreams/filter/zlib.hpp>
-    #pragma warning (pop)
+#pragma warning(push)
+#pragma warning(disable : 4706)
+#include <boost/iostreams/filter/zlib.hpp>
+#pragma warning(pop)
 #else
-    #include <boost/iostreams/filter/zlib.hpp>
+#include <boost/iostreams/filter/zlib.hpp>
 #endif
-#include <boost/iostreams/filtering_streambuf.hpp>
 #include <boost/iostreams/copy.hpp>
+#include <boost/iostreams/filtering_streambuf.hpp>
 
 #include <components/bsa/memorystream.hpp>
-#include <components/misc/strings/lower.hpp>
 #include <components/files/constrainedfilestream.hpp>
-#include <components/to_utf8/to_utf8.hpp>
 #include <components/files/conversion.hpp>
+#include <components/misc/strings/lower.hpp>
+#include <components/to_utf8/to_utf8.hpp>
 
 #include "formid.hpp"
 
 namespace ESM4
 {
 
-ReaderContext::ReaderContext() : modIndex(0), recHeaderSize(sizeof(RecordHeader)),
-    filePos(0), fileRead(0), recordRead(0), currWorld(0), currCell(0), cellGridValid(false)
-{
-    currCellGrid.cellId = 0;
-    currCellGrid.grid.x = 0;
-    currCellGrid.grid.y = 0;
-    subRecordHeader.typeId = 0;
-    subRecordHeader.dataSize = 0;
-}
+    ReaderContext::ReaderContext()
+        : modIndex(0)
+        , recHeaderSize(sizeof(RecordHeader))
+        , filePos(0)
+        , fileRead(0)
+        , recordRead(0)
+        , currWorld(0)
+        , currCell(0)
+        , cellGridValid(false)
+    {
+        currCellGrid.cellId = 0;
+        currCellGrid.grid.x = 0;
+        currCellGrid.grid.y = 0;
+        subRecordHeader.typeId = 0;
+        subRecordHeader.dataSize = 0;
+    }
 
-Reader::Reader(Files::IStreamPtr&& esmStream, const std::filesystem::path &filename)
-    : mEncoder(nullptr), mFileSize(0), mStream(std::move(esmStream))
-{
-    // used by ESMReader only?
-    mCtx.filename = filename;
-
-    mCtx.fileRead = 0;
-    mStream->seekg(0, mStream->end);
-    mFileSize = mStream->tellg();
-    mStream->seekg(20); // go to the start but skip the "TES4" record header
-
-    mSavedStream.reset();
-
-    // determine header size
-    std::uint32_t subRecName = 0;
-    mStream->read((char*)&subRecName, sizeof(subRecName));
-    if (subRecName == 0x52444548) // "HEDR"
-        mCtx.recHeaderSize = sizeof(RecordHeader) - 4; // TES4 header size is 4 bytes smaller than TES5 header
-    else
-        mCtx.recHeaderSize = sizeof(RecordHeader);
-
-    // restart from the beginning (i.e. "TES4" record header)
-    mStream->seekg(0, mStream->beg);
+    Reader::Reader(Files::IStreamPtr&& esmStream, const std::filesystem::path& filename)
+        : mEncoder(nullptr)
+        , mFileSize(0)
+        , mStream(std::move(esmStream))
+    {
+        // used by ESMReader only?
+        mCtx.filename = filename;
+
+        mCtx.fileRead = 0;
+        mStream->seekg(0, mStream->end);
+        mFileSize = mStream->tellg();
+        mStream->seekg(20); // go to the start but skip the "TES4" record header
+
+        mSavedStream.reset();
+
+        // determine header size
+        std::uint32_t subRecName = 0;
+        mStream->read((char*)&subRecName, sizeof(subRecName));
+        if (subRecName == 0x52444548) // "HEDR"
+            mCtx.recHeaderSize = sizeof(RecordHeader) - 4; // TES4 header size is 4 bytes smaller than TES5 header
+        else
+            mCtx.recHeaderSize = sizeof(RecordHeader);
+
+        // restart from the beginning (i.e. "TES4" record header)
+        mStream->seekg(0, mStream->beg);
 #if 0
     unsigned int esmVer = mHeader.mData.version.ui;
     bool isTes4 = esmVer == ESM::VER_080 || esmVer == ESM::VER_100;
@@ -99,584 +108,593 @@ Reader::Reader(Files::IStreamPtr&& esmStream, const std::filesystem::path &filen
     // TES4 header size is 4 bytes smaller than TES5 header
     mCtx.recHeaderSize = isTes4 ? sizeof(ESM4::RecordHeader) - 4 : sizeof(ESM4::RecordHeader);
 #endif
-    getRecordHeader();
-    if (mCtx.recordHeader.record.typeId == REC_TES4)
-    {
-        mHeader.load(*this);
-        mCtx.fileRead += mCtx.recordHeader.record.dataSize;
+        getRecordHeader();
+        if (mCtx.recordHeader.record.typeId == REC_TES4)
+        {
+            mHeader.load(*this);
+            mCtx.fileRead += mCtx.recordHeader.record.dataSize;
 
-        buildLStringIndex(); // for localised strings in Skyrim
+            buildLStringIndex(); // for localised strings in Skyrim
+        }
+        else
+            fail("Unknown file format");
     }
-    else
-        fail("Unknown file format");
-}
-
-Reader::~Reader()
-{
-    close();
-}
-
-// Since the record data may have been compressed, it is not always possible to use seek() to
-// go to a position of a sub record.
-//
-// The record header needs to be saved in the context or the header needs to be re-loaded after
-// restoring the context. The latter option was chosen.
-ReaderContext Reader::getContext()
-{
-    mCtx.filePos = mStream->tellg();
-    mCtx.filePos -= mCtx.recHeaderSize; // update file position
-    return mCtx;
-}
 
-// NOTE: Assumes that the caller has reopened the file if necessary
-bool Reader::restoreContext(const ReaderContext& ctx)
-{
-    if (mSavedStream) // TODO: doesn't seem to ever happen
+    Reader::~Reader()
     {
-        mStream = std::move(mSavedStream);
+        close();
     }
 
-    mCtx.groupStack.clear(); // probably not necessary since it will be overwritten
-    mCtx = ctx;
-    mStream->seekg(ctx.filePos); // update file position
-
-    return getRecordHeader();
-}
-
-void Reader::close()
-{
-    mStream.reset();
-    //clearCtx();
-    //mHeader.blank();
-}
-
-void Reader::openRaw(Files::IStreamPtr&& stream, const std::filesystem::path &filename)
-{
-    close();
-
-    mStream = std::move(stream);
-    mCtx.filename = filename;
-    mCtx.fileRead = 0;
-    mStream->seekg(0, mStream->end);
-    mFileSize = mStream->tellg();
-    mStream->seekg(0, mStream->beg);
-
-}
-
-void Reader::open(Files::IStreamPtr&& stream, const std::filesystem::path &filename)
-{
-    openRaw(std::move(stream), filename);
+    // Since the record data may have been compressed, it is not always possible to use seek() to
+    // go to a position of a sub record.
+    //
+    // The record header needs to be saved in the context or the header needs to be re-loaded after
+    // restoring the context. The latter option was chosen.
+    ReaderContext Reader::getContext()
+    {
+        mCtx.filePos = mStream->tellg();
+        mCtx.filePos -= mCtx.recHeaderSize; // update file position
+        return mCtx;
+    }
 
-    // should at least have the size of ESM3 record header (20 or 24 bytes for ESM4)
-    assert (mFileSize >= 16);
-    std::uint32_t modVer = 0;
-    if (getExact(modVer)) // get the first 4 bytes of the record header only
+    // NOTE: Assumes that the caller has reopened the file if necessary
+    bool Reader::restoreContext(const ReaderContext& ctx)
     {
-        // FIXME: need to setup header/context
-        if (modVer == REC_TES4)
+        if (mSavedStream) // TODO: doesn't seem to ever happen
         {
+            mStream = std::move(mSavedStream);
         }
-        else
-        {
-        }
-    }
 
-    throw std::runtime_error("Unknown file format"); // can't yet use fail() as mCtx is not setup
-}
-
-void Reader::open(const std::filesystem::path& filename)
-{
-    open(Files::openConstrainedFileStream(filename), filename);
-}
+        mCtx.groupStack.clear(); // probably not necessary since it will be overwritten
+        mCtx = ctx;
+        mStream->seekg(ctx.filePos); // update file position
 
-void Reader::setRecHeaderSize(const std::size_t size)
-{
-    mCtx.recHeaderSize = size;
-}
-
-void Reader::buildLStringIndex()
-{
-    if ((mHeader.mFlags & Rec_ESM) == 0 || (mHeader.mFlags & Rec_Localized) == 0)
-        return;
+        return getRecordHeader();
+    }
 
-    const auto filename = mCtx.filename.stem().filename().u8string();
+    void Reader::close()
+    {
+        mStream.reset();
+        // clearCtx();
+        // mHeader.blank();
+    }
 
-    static const std::filesystem::path s("Strings");
-    buildLStringIndex(s / (filename + u8"_English.STRINGS"),   Type_Strings);
-    buildLStringIndex(s / (filename + u8"_English.ILSTRINGS"), Type_ILStrings);
-    buildLStringIndex(s / (filename + u8"_English.DLSTRINGS"), Type_DLStrings);
-}
+    void Reader::openRaw(Files::IStreamPtr&& stream, const std::filesystem::path& filename)
+    {
+        close();
+
+        mStream = std::move(stream);
+        mCtx.filename = filename;
+        mCtx.fileRead = 0;
+        mStream->seekg(0, mStream->end);
+        mFileSize = mStream->tellg();
+        mStream->seekg(0, mStream->beg);
+    }
 
-void Reader::buildLStringIndex(const std::filesystem::path &stringFile, LocalizedStringType stringType)
-{
-    std::uint32_t numEntries;
-    std::uint32_t dataSize;
-    std::uint32_t stringId;
-    LStringOffset sp;
-    sp.type = stringType;
+    void Reader::open(Files::IStreamPtr&& stream, const std::filesystem::path& filename)
+    {
+        openRaw(std::move(stream), filename);
 
-    // TODO: possibly check if the resource exists?
-    Files::IStreamPtr filestream = Files::openConstrainedFileStream(stringFile);
+        // should at least have the size of ESM3 record header (20 or 24 bytes for ESM4)
+        assert(mFileSize >= 16);
+        std::uint32_t modVer = 0;
+        if (getExact(modVer)) // get the first 4 bytes of the record header only
+        {
+            // FIXME: need to setup header/context
+            if (modVer == REC_TES4)
+            {
+            }
+            else
+            {
+            }
+        }
 
-    filestream->seekg(0, std::ios::end);
-    std::size_t fileSize = filestream->tellg();
-    filestream->seekg(0, std::ios::beg);
+        throw std::runtime_error("Unknown file format"); // can't yet use fail() as mCtx is not setup
+    }
 
-    std::istream* stream = filestream.get();
-    switch (stringType)
+    void Reader::open(const std::filesystem::path& filename)
     {
-        case Type_Strings:   mStrings =   std::move(filestream); break;
-        case Type_ILStrings: mILStrings = std::move(filestream); break;
-        case Type_DLStrings: mDLStrings = std::move(filestream); break;
-        default:
-            throw std::runtime_error("ESM4::Reader::unknown localised string type");
+        open(Files::openConstrainedFileStream(filename), filename);
     }
 
-    stream->read((char*)&numEntries, sizeof(numEntries));
-    stream->read((char*)&dataSize, sizeof(dataSize));
-    std::size_t dataStart = fileSize - dataSize;
-    for (unsigned int i = 0; i < numEntries; ++i)
+    void Reader::setRecHeaderSize(const std::size_t size)
     {
-        stream->read((char*)&stringId, sizeof(stringId));
-        stream->read((char*)&sp.offset, sizeof(sp.offset));
-        sp.offset += (std::uint32_t)dataStart;
-        mLStringIndex[stringId] = sp;
+        mCtx.recHeaderSize = size;
     }
-    //assert (dataStart - stream->tell() == 0 && "String file start of data section mismatch");
-}
 
-void Reader::getLocalizedString(std::string& str)
-{
-    if (!hasLocalizedStrings())
-        return (void)getZString(str);
+    void Reader::buildLStringIndex()
+    {
+        if ((mHeader.mFlags & Rec_ESM) == 0 || (mHeader.mFlags & Rec_Localized) == 0)
+            return;
 
-    std::uint32_t stringId; // FormId
-    get(stringId);
-    if (stringId) // TES5 FoxRace, BOOK
-        getLocalizedStringImpl(stringId, str);
-}
+        const auto filename = mCtx.filename.stem().filename().u8string();
 
-// FIXME: very messy and probably slow/inefficient
-void Reader::getLocalizedStringImpl(const FormId stringId, std::string& str)
-{
-    const std::map<FormId, LStringOffset>::const_iterator it = mLStringIndex.find(stringId);
+        static const std::filesystem::path s("Strings");
+        buildLStringIndex(s / (filename + u8"_English.STRINGS"), Type_Strings);
+        buildLStringIndex(s / (filename + u8"_English.ILSTRINGS"), Type_ILStrings);
+        buildLStringIndex(s / (filename + u8"_English.DLSTRINGS"), Type_DLStrings);
+    }
 
-    if (it != mLStringIndex.end())
+    void Reader::buildLStringIndex(const std::filesystem::path& stringFile, LocalizedStringType stringType)
     {
-        std::istream* filestream = nullptr;
+        std::uint32_t numEntries;
+        std::uint32_t dataSize;
+        std::uint32_t stringId;
+        LStringOffset sp;
+        sp.type = stringType;
 
-        switch (it->second.type)
-        {
-            case Type_Strings: // no string size provided
-            {
-                filestream = mStrings.get();
-                filestream->seekg(it->second.offset);
+        // TODO: possibly check if the resource exists?
+        Files::IStreamPtr filestream = Files::openConstrainedFileStream(stringFile);
 
-                char ch;
-                std::vector<char> data;
-                do {
-                    filestream->read(&ch, sizeof(ch));
-                    data.push_back(ch);
-                } while (ch != 0);
+        filestream->seekg(0, std::ios::end);
+        std::size_t fileSize = filestream->tellg();
+        filestream->seekg(0, std::ios::beg);
 
-                str = std::string(data.data());
-                return;
-            }
-            case Type_ILStrings: filestream = mILStrings.get(); break;
-            case Type_DLStrings: filestream = mDLStrings.get(); break;
+        std::istream* stream = filestream.get();
+        switch (stringType)
+        {
+            case Type_Strings:
+                mStrings = std::move(filestream);
+                break;
+            case Type_ILStrings:
+                mILStrings = std::move(filestream);
+                break;
+            case Type_DLStrings:
+                mDLStrings = std::move(filestream);
+                break;
             default:
-                throw std::runtime_error("ESM4::Reader::getLocalizedString unknown string type");
+                throw std::runtime_error("ESM4::Reader::unknown localised string type");
         }
 
-        // get ILStrings or DLStrings (they provide string size)
-        filestream->seekg(it->second.offset);
-        std::uint32_t size = 0;
-        filestream->read((char*)&size, sizeof(size));
-        getStringImpl(str, size, *filestream, mEncoder, true); // expect null terminated string
+        stream->read((char*)&numEntries, sizeof(numEntries));
+        stream->read((char*)&dataSize, sizeof(dataSize));
+        std::size_t dataStart = fileSize - dataSize;
+        for (unsigned int i = 0; i < numEntries; ++i)
+        {
+            stream->read((char*)&stringId, sizeof(stringId));
+            stream->read((char*)&sp.offset, sizeof(sp.offset));
+            sp.offset += (std::uint32_t)dataStart;
+            mLStringIndex[stringId] = sp;
+        }
+        // assert (dataStart - stream->tell() == 0 && "String file start of data section mismatch");
     }
-    else
-        throw std::runtime_error("ESM4::Reader::getLocalizedString localized string not found");
-}
 
-bool Reader::getRecordHeader()
-{
-    // FIXME: this seems very hacky but we may have skipped subrecords from within an inflated data block
-    if (/*mStream->eof() && */mSavedStream)
+    void Reader::getLocalizedString(std::string& str)
     {
-        mStream = std::move(mSavedStream);
+        if (!hasLocalizedStrings())
+            return (void)getZString(str);
+
+        std::uint32_t stringId; // FormId
+        get(stringId);
+        if (stringId) // TES5 FoxRace, BOOK
+            getLocalizedStringImpl(stringId, str);
     }
 
-    mStream->read((char*)&mCtx.recordHeader, mCtx.recHeaderSize);
-    std::size_t bytesRead = (std::size_t)mStream->gcount();
+    // FIXME: very messy and probably slow/inefficient
+    void Reader::getLocalizedStringImpl(const FormId stringId, std::string& str)
+    {
+        const std::map<FormId, LStringOffset>::const_iterator it = mLStringIndex.find(stringId);
 
-    // keep track of data left to read from the file
-    mCtx.fileRead += mCtx.recHeaderSize;
+        if (it != mLStringIndex.end())
+        {
+            std::istream* filestream = nullptr;
 
-    mCtx.recordRead = 0; // for keeping track of sub records
+            switch (it->second.type)
+            {
+                case Type_Strings: // no string size provided
+                {
+                    filestream = mStrings.get();
+                    filestream->seekg(it->second.offset);
+
+                    char ch;
+                    std::vector<char> data;
+                    do
+                    {
+                        filestream->read(&ch, sizeof(ch));
+                        data.push_back(ch);
+                    } while (ch != 0);
+
+                    str = std::string(data.data());
+                    return;
+                }
+                case Type_ILStrings:
+                    filestream = mILStrings.get();
+                    break;
+                case Type_DLStrings:
+                    filestream = mDLStrings.get();
+                    break;
+                default:
+                    throw std::runtime_error("ESM4::Reader::getLocalizedString unknown string type");
+            }
 
-    // After reading the record header we can cache a WRLD or CELL formId for convenient access later.
-    // FIXME: currently currWorld and currCell are set manually when loading the WRLD and CELL records
+            // get ILStrings or DLStrings (they provide string size)
+            filestream->seekg(it->second.offset);
+            std::uint32_t size = 0;
+            filestream->read((char*)&size, sizeof(size));
+            getStringImpl(str, size, *filestream, mEncoder, true); // expect null terminated string
+        }
+        else
+            throw std::runtime_error("ESM4::Reader::getLocalizedString localized string not found");
+    }
 
-    // HACK: mCtx.groupStack.back() is updated before the record data are read/skipped
-    //       N.B. the data must be fully read/skipped for this to work
-    if (mCtx.recordHeader.record.typeId != REC_GRUP && !mCtx.groupStack.empty())
+    bool Reader::getRecordHeader()
     {
-        mCtx.groupStack.back().second += (std::uint32_t)mCtx.recHeaderSize + mCtx.recordHeader.record.dataSize;
+        // FIXME: this seems very hacky but we may have skipped subrecords from within an inflated data block
+        if (/*mStream->eof() && */ mSavedStream)
+        {
+            mStream = std::move(mSavedStream);
+        }
+
+        mStream->read((char*)&mCtx.recordHeader, mCtx.recHeaderSize);
+        std::size_t bytesRead = (std::size_t)mStream->gcount();
 
         // keep track of data left to read from the file
-        mCtx.fileRead += mCtx.recordHeader.record.dataSize;
-    }
+        mCtx.fileRead += mCtx.recHeaderSize;
 
-    return bytesRead == mCtx.recHeaderSize;
-}
+        mCtx.recordRead = 0; // for keeping track of sub records
 
-void Reader::getRecordData(bool dump)
-{
-    std::uint32_t uncompressedSize = 0;
+        // After reading the record header we can cache a WRLD or CELL formId for convenient access later.
+        // FIXME: currently currWorld and currCell are set manually when loading the WRLD and CELL records
+
+        // HACK: mCtx.groupStack.back() is updated before the record data are read/skipped
+        //       N.B. the data must be fully read/skipped for this to work
+        if (mCtx.recordHeader.record.typeId != REC_GRUP && !mCtx.groupStack.empty())
+        {
+            mCtx.groupStack.back().second += (std::uint32_t)mCtx.recHeaderSize + mCtx.recordHeader.record.dataSize;
 
-    if ((mCtx.recordHeader.record.flags & Rec_Compressed) != 0)
+            // keep track of data left to read from the file
+            mCtx.fileRead += mCtx.recordHeader.record.dataSize;
+        }
+
+        return bytesRead == mCtx.recHeaderSize;
+    }
+
+    void Reader::getRecordData(bool dump)
     {
-        mStream->read(reinterpret_cast<char*>(&uncompressedSize), sizeof(std::uint32_t));
+        std::uint32_t uncompressedSize = 0;
 
-        std::size_t recordSize = mCtx.recordHeader.record.dataSize - sizeof(std::uint32_t);
-        Bsa::MemoryInputStream compressedRecord(recordSize);
-        mStream->read(compressedRecord.getRawData(), recordSize);
-        std::istream *fileStream = (std::istream*)&compressedRecord;
-        mSavedStream = std::move(mStream);
+        if ((mCtx.recordHeader.record.flags & Rec_Compressed) != 0)
+        {
+            mStream->read(reinterpret_cast<char*>(&uncompressedSize), sizeof(std::uint32_t));
 
-        mCtx.recordHeader.record.dataSize = uncompressedSize - sizeof(uncompressedSize);
+            std::size_t recordSize = mCtx.recordHeader.record.dataSize - sizeof(std::uint32_t);
+            Bsa::MemoryInputStream compressedRecord(recordSize);
+            mStream->read(compressedRecord.getRawData(), recordSize);
+            std::istream* fileStream = (std::istream*)&compressedRecord;
+            mSavedStream = std::move(mStream);
 
-        auto memoryStreamPtr = std::make_unique<Bsa::MemoryInputStream>(uncompressedSize);
+            mCtx.recordHeader.record.dataSize = uncompressedSize - sizeof(uncompressedSize);
 
-        boost::iostreams::filtering_streambuf<boost::iostreams::input> inputStreamBuf;
-        inputStreamBuf.push(boost::iostreams::zlib_decompressor());
-        inputStreamBuf.push(*fileStream);
+            auto memoryStreamPtr = std::make_unique<Bsa::MemoryInputStream>(uncompressedSize);
 
-        boost::iostreams::basic_array_sink<char> sr(memoryStreamPtr->getRawData(), uncompressedSize);
-        boost::iostreams::copy(inputStreamBuf, sr);
+            boost::iostreams::filtering_streambuf<boost::iostreams::input> inputStreamBuf;
+            inputStreamBuf.push(boost::iostreams::zlib_decompressor());
+            inputStreamBuf.push(*fileStream);
 
-    // For debugging only
-//#if 0
-if (dump)
-{
-        std::ostringstream ss;
-        char* data = memoryStreamPtr->getRawData();
-        for (unsigned int i = 0; i < uncompressedSize; ++i)
-        {
-            if (data[i] > 64 && data[i] < 91)
-                ss << (char)(data[i]) << " ";
-            else
-                ss << std::setfill('0') << std::setw(2) << std::hex << (int)(data[i]);
-            if ((i & 0x000f) == 0xf)
-                ss << "\n";
-            else if (i < uncompressedSize-1)
-                ss << " ";
+            boost::iostreams::basic_array_sink<char> sr(memoryStreamPtr->getRawData(), uncompressedSize);
+            boost::iostreams::copy(inputStreamBuf, sr);
+
+            // For debugging only
+            //#if 0
+            if (dump)
+            {
+                std::ostringstream ss;
+                char* data = memoryStreamPtr->getRawData();
+                for (unsigned int i = 0; i < uncompressedSize; ++i)
+                {
+                    if (data[i] > 64 && data[i] < 91)
+                        ss << (char)(data[i]) << " ";
+                    else
+                        ss << std::setfill('0') << std::setw(2) << std::hex << (int)(data[i]);
+                    if ((i & 0x000f) == 0xf)
+                        ss << "\n";
+                    else if (i < uncompressedSize - 1)
+                        ss << " ";
+                }
+                std::cout << ss.str() << std::endl;
+            }
+            //#endif
+            mStream = std::make_unique<Files::StreamWithBuffer<Bsa::MemoryInputStream>>(std::move(memoryStreamPtr));
         }
-        std::cout << ss.str() << std::endl;
-}
-//#endif
-        mStream = std::make_unique<Files::StreamWithBuffer<Bsa::MemoryInputStream>>(std::move(memoryStreamPtr));
     }
-}
 
-void Reader::skipRecordData()
-{
-    assert (mCtx.recordRead <= mCtx.recordHeader.record.dataSize && "Skipping after reading more than available");
-    mStream->ignore(mCtx.recordHeader.record.dataSize - mCtx.recordRead);
-    mCtx.recordRead = mCtx.recordHeader.record.dataSize; // for getSubRecordHeader()
-}
-
-bool Reader::getSubRecordHeader()
-{
-    bool result = false;
-    // NOTE: some SubRecords have 0 dataSize (e.g. SUB_RDSD in one of REC_REGN records in Oblivion.esm).
-    // Also SUB_XXXX has zero dataSize and the following 4 bytes represent the actual dataSize
-    // - hence it require manual updtes to mCtx.recordRead via updateRecordRead()
-    // See ESM4::NavMesh and ESM4::World.
-    if (mCtx.recordHeader.record.dataSize - mCtx.recordRead >= sizeof(mCtx.subRecordHeader))
+    void Reader::skipRecordData()
     {
-        result = getExact(mCtx.subRecordHeader);
-        // HACK: below assumes sub-record data will be read or skipped in full;
-        //       this hack aims to avoid updating mCtx.recordRead each time anything is read
-        mCtx.recordRead += (sizeof(mCtx.subRecordHeader) + mCtx.subRecordHeader.dataSize);
+        assert(mCtx.recordRead <= mCtx.recordHeader.record.dataSize && "Skipping after reading more than available");
+        mStream->ignore(mCtx.recordHeader.record.dataSize - mCtx.recordRead);
+        mCtx.recordRead = mCtx.recordHeader.record.dataSize; // for getSubRecordHeader()
     }
-    else if (mCtx.recordRead > mCtx.recordHeader.record.dataSize)
+
+    bool Reader::getSubRecordHeader()
     {
-        // try to correct any overshoot, seek to the end of the expected data
-        // this will only work if mCtx.subRecordHeader.dataSize was fully read or skipped
-        // (i.e. it will only correct mCtx.subRecordHeader.dataSize being incorrect)
-        // TODO: not tested
-        std::uint32_t overshoot = (std::uint32_t)mCtx.recordRead - mCtx.recordHeader.record.dataSize;
+        bool result = false;
+        // NOTE: some SubRecords have 0 dataSize (e.g. SUB_RDSD in one of REC_REGN records in Oblivion.esm).
+        // Also SUB_XXXX has zero dataSize and the following 4 bytes represent the actual dataSize
+        // - hence it require manual updtes to mCtx.recordRead via updateRecordRead()
+        // See ESM4::NavMesh and ESM4::World.
+        if (mCtx.recordHeader.record.dataSize - mCtx.recordRead >= sizeof(mCtx.subRecordHeader))
+        {
+            result = getExact(mCtx.subRecordHeader);
+            // HACK: below assumes sub-record data will be read or skipped in full;
+            //       this hack aims to avoid updating mCtx.recordRead each time anything is read
+            mCtx.recordRead += (sizeof(mCtx.subRecordHeader) + mCtx.subRecordHeader.dataSize);
+        }
+        else if (mCtx.recordRead > mCtx.recordHeader.record.dataSize)
+        {
+            // try to correct any overshoot, seek to the end of the expected data
+            // this will only work if mCtx.subRecordHeader.dataSize was fully read or skipped
+            // (i.e. it will only correct mCtx.subRecordHeader.dataSize being incorrect)
+            // TODO: not tested
+            std::uint32_t overshoot = (std::uint32_t)mCtx.recordRead - mCtx.recordHeader.record.dataSize;
 
-        std::size_t pos = mStream->tellg();
-        mStream->seekg(pos - overshoot);
+            std::size_t pos = mStream->tellg();
+            mStream->seekg(pos - overshoot);
 
-        return false;
-    }
+            return false;
+        }
 
-    return result;
-}
+        return result;
+    }
 
-void Reader::skipSubRecordData()
-{
-    mStream->ignore(mCtx.subRecordHeader.dataSize);
-}
+    void Reader::skipSubRecordData()
+    {
+        mStream->ignore(mCtx.subRecordHeader.dataSize);
+    }
 
-void Reader::skipSubRecordData(std::uint32_t size)
-{
-    mStream->ignore(size);
-}
+    void Reader::skipSubRecordData(std::uint32_t size)
+    {
+        mStream->ignore(size);
+    }
 
-void Reader::enterGroup()
-{
-#ifdef DEBUG_GROUPSTACK
-    std::string padding; // FIXME: debugging only
-    padding.insert(0, mCtx.groupStack.size()*2, ' ');
-    std::cout << padding << "Starting record group "
-              << printLabel(mCtx.recordHeader.group.label, mCtx.recordHeader.group.type) << std::endl;
-#endif
-    // empty group if the group size is same as the header size
-    if (mCtx.recordHeader.group.groupSize == (std::uint32_t)mCtx.recHeaderSize)
+    void Reader::enterGroup()
     {
 #ifdef DEBUG_GROUPSTACK
-        std::cout << padding << "Ignoring record group " // FIXME: debugging only
-            << printLabel(mCtx.recordHeader.group.label, mCtx.recordHeader.group.type)
-            << " (empty)" << std::endl;
+        std::string padding; // FIXME: debugging only
+        padding.insert(0, mCtx.groupStack.size() * 2, ' ');
+        std::cout << padding << "Starting record group "
+                  << printLabel(mCtx.recordHeader.group.label, mCtx.recordHeader.group.type) << std::endl;
 #endif
-        if (!mCtx.groupStack.empty()) // top group may be empty (e.g. HAIR in Skyrim)
+        // empty group if the group size is same as the header size
+        if (mCtx.recordHeader.group.groupSize == (std::uint32_t)mCtx.recHeaderSize)
         {
-            // don't put on the stack, exitGroupCheck() may not get called before recursing into this method
-            mCtx.groupStack.back().second += mCtx.recordHeader.group.groupSize;
-            exitGroupCheck();
+#ifdef DEBUG_GROUPSTACK
+            std::cout << padding << "Ignoring record group " // FIXME: debugging only
+                      << printLabel(mCtx.recordHeader.group.label, mCtx.recordHeader.group.type) << " (empty)"
+                      << std::endl;
+#endif
+            if (!mCtx.groupStack.empty()) // top group may be empty (e.g. HAIR in Skyrim)
+            {
+                // don't put on the stack, exitGroupCheck() may not get called before recursing into this method
+                mCtx.groupStack.back().second += mCtx.recordHeader.group.groupSize;
+                exitGroupCheck();
+            }
+
+            return; // don't push an empty group, just return
         }
 
-        return; // don't push an empty group, just return
+        // push group
+        mCtx.groupStack.push_back(std::make_pair(mCtx.recordHeader.group, (std::uint32_t)mCtx.recHeaderSize));
     }
 
-    // push group
-    mCtx.groupStack.push_back(std::make_pair(mCtx.recordHeader.group, (std::uint32_t)mCtx.recHeaderSize));
-}
-
-void Reader::exitGroupCheck()
-{
-    if (mCtx.groupStack.empty())
-        return;
-
-    // pop finished groups (note reading too much is allowed here)
-    std::uint32_t lastGroupSize = mCtx.groupStack.back().first.groupSize;
-    while (mCtx.groupStack.back().second >= lastGroupSize)
+    void Reader::exitGroupCheck()
     {
+        if (mCtx.groupStack.empty())
+            return;
+
+        // pop finished groups (note reading too much is allowed here)
+        std::uint32_t lastGroupSize = mCtx.groupStack.back().first.groupSize;
+        while (mCtx.groupStack.back().second >= lastGroupSize)
+        {
 #ifdef DEBUG_GROUPSTACK
-        GroupTypeHeader grp = mCtx.groupStack.back().first; // FIXME: grp is for debugging only
+            GroupTypeHeader grp = mCtx.groupStack.back().first; // FIXME: grp is for debugging only
 #endif
-        // try to correct any overshoot
-        // TODO: not tested
-        std::uint32_t overshoot = mCtx.groupStack.back().second - lastGroupSize;
-        if (overshoot > 0)
-        {
-            std::size_t pos = mStream->tellg();
-            mStream->seekg(pos - overshoot);
-        }
+            // try to correct any overshoot
+            // TODO: not tested
+            std::uint32_t overshoot = mCtx.groupStack.back().second - lastGroupSize;
+            if (overshoot > 0)
+            {
+                std::size_t pos = mStream->tellg();
+                mStream->seekg(pos - overshoot);
+            }
 
-        mCtx.groupStack.pop_back();
+            mCtx.groupStack.pop_back();
 #ifdef DEBUG_GROUPSTACK
-        std::string padding; // FIXME: debugging only
-        padding.insert(0, mCtx.groupStack.size()*2, ' ');
-        std::cout << padding << "Finished record group " << printLabel(grp.label, grp.type) << std::endl;
+            std::string padding; // FIXME: debugging only
+            padding.insert(0, mCtx.groupStack.size() * 2, ' ');
+            std::cout << padding << "Finished record group " << printLabel(grp.label, grp.type) << std::endl;
 #endif
-        // if the previous group was the final one no need to do below
-        if (mCtx.groupStack.empty())
-            return;
+            // if the previous group was the final one no need to do below
+            if (mCtx.groupStack.empty())
+                return;
 
-        mCtx.groupStack.back().second += lastGroupSize;
-        lastGroupSize = mCtx.groupStack.back().first.groupSize;
+            mCtx.groupStack.back().second += lastGroupSize;
+            lastGroupSize = mCtx.groupStack.back().first.groupSize;
 
-        assert (lastGroupSize >= mCtx.groupStack.back().second && "Read more records than available");
-//#if 0
-        if (mCtx.groupStack.back().second > lastGroupSize) // FIXME: debugging only
-            std::cerr << printLabel(mCtx.groupStack.back().first.label,
-                                          mCtx.groupStack.back().first.type)
-                      << " read more records than available" << std::endl;
-//#endif
+            assert(lastGroupSize >= mCtx.groupStack.back().second && "Read more records than available");
+            //#if 0
+            if (mCtx.groupStack.back().second > lastGroupSize) // FIXME: debugging only
+                std::cerr << printLabel(mCtx.groupStack.back().first.label, mCtx.groupStack.back().first.type)
+                          << " read more records than available" << std::endl;
+            //#endif
+        }
     }
-}
 
-// WARNING: this method should be used after first calling enterGroup()
-// else the method may try to dereference an element that does not exist
-const GroupTypeHeader& Reader::grp(std::size_t pos) const
-{
-    assert (pos <= mCtx.groupStack.size()-1 && "ESM4::Reader::grp - exceeded stack depth");
+    // WARNING: this method should be used after first calling enterGroup()
+    // else the method may try to dereference an element that does not exist
+    const GroupTypeHeader& Reader::grp(std::size_t pos) const
+    {
+        assert(pos <= mCtx.groupStack.size() - 1 && "ESM4::Reader::grp - exceeded stack depth");
 
-    return (*(mCtx.groupStack.end()-pos-1)).first;
-}
+        return (*(mCtx.groupStack.end() - pos - 1)).first;
+    }
 
-void Reader::skipGroupData()
-{
-    assert (!mCtx.groupStack.empty() && "Skipping group with an empty stack");
+    void Reader::skipGroupData()
+    {
+        assert(!mCtx.groupStack.empty() && "Skipping group with an empty stack");
 
-    // subtract what was already read/skipped
-    std::uint32_t skipSize = mCtx.groupStack.back().first.groupSize - mCtx.groupStack.back().second;
+        // subtract what was already read/skipped
+        std::uint32_t skipSize = mCtx.groupStack.back().first.groupSize - mCtx.groupStack.back().second;
 
-    mStream->ignore(skipSize);
+        mStream->ignore(skipSize);
 
-    // keep track of data left to read from the file
-    mCtx.fileRead += skipSize;
+        // keep track of data left to read from the file
+        mCtx.fileRead += skipSize;
 
-    mCtx.groupStack.back().second = mCtx.groupStack.back().first.groupSize;
-}
+        mCtx.groupStack.back().second = mCtx.groupStack.back().first.groupSize;
+    }
 
-void Reader::skipGroup()
-{
+    void Reader::skipGroup()
+    {
 #ifdef DEBUG_GROUPSTACK
-    std::string padding; // FIXME: debugging only
-    padding.insert(0, mCtx.groupStack.size()*2, ' ');
-    std::cout << padding << "Skipping record group "
-              << printLabel(mCtx.recordHeader.group.label, mCtx.recordHeader.group.type) << std::endl;
+        std::string padding; // FIXME: debugging only
+        padding.insert(0, mCtx.groupStack.size() * 2, ' ');
+        std::cout << padding << "Skipping record group "
+                  << printLabel(mCtx.recordHeader.group.label, mCtx.recordHeader.group.type) << std::endl;
 #endif
-    // subtract the size of header already read before skipping
-    std::uint32_t skipSize = mCtx.recordHeader.group.groupSize - (std::uint32_t)mCtx.recHeaderSize;
-    mStream->ignore(skipSize);
+        // subtract the size of header already read before skipping
+        std::uint32_t skipSize = mCtx.recordHeader.group.groupSize - (std::uint32_t)mCtx.recHeaderSize;
+        mStream->ignore(skipSize);
 
-    // keep track of data left to read from the file
-    mCtx.fileRead += skipSize;
+        // keep track of data left to read from the file
+        mCtx.fileRead += skipSize;
 
-    // NOTE: mCtx.groupStack.back().second already has mCtx.recHeaderSize from enterGroup()
-    if (!mCtx.groupStack.empty())
-        mCtx.groupStack.back().second += mCtx.recordHeader.group.groupSize;
-}
+        // NOTE: mCtx.groupStack.back().second already has mCtx.recHeaderSize from enterGroup()
+        if (!mCtx.groupStack.empty())
+            mCtx.groupStack.back().second += mCtx.recordHeader.group.groupSize;
+    }
 
-const CellGrid& Reader::currCellGrid() const
-{
-    // Maybe should throw an exception instead?
-    assert (mCtx.cellGridValid && "Attempt to use an invalid cell grid");
+    const CellGrid& Reader::currCellGrid() const
+    {
+        // Maybe should throw an exception instead?
+        assert(mCtx.cellGridValid && "Attempt to use an invalid cell grid");
 
-    return mCtx.currCellGrid;
-}
+        return mCtx.currCellGrid;
+    }
 
-// NOTE: the parameter 'files' must have the file names in the loaded order
-void Reader::updateModIndices(const std::vector<std::string>& files)
-{
-    if (files.size() >= 0xff)
-        throw std::runtime_error("ESM4::Reader::updateModIndices too many files"); // 0xff is reserved
+    // NOTE: the parameter 'files' must have the file names in the loaded order
+    void Reader::updateModIndices(const std::vector<std::string>& files)
+    {
+        if (files.size() >= 0xff)
+            throw std::runtime_error("ESM4::Reader::updateModIndices too many files"); // 0xff is reserved
 
-    // NOTE: this map is rebuilt each time this method is called (i.e. each time a file is loaded)
-    // Perhaps there is an opportunity to optimize this by saving the result somewhere.
-    // But then, the number of files is at most around 250 so perhaps keeping it simple might be better.
+        // NOTE: this map is rebuilt each time this method is called (i.e. each time a file is loaded)
+        // Perhaps there is an opportunity to optimize this by saving the result somewhere.
+        // But then, the number of files is at most around 250 so perhaps keeping it simple might be better.
 
-    // build a lookup map
-    std::unordered_map<std::string, size_t> fileIndex;
+        // build a lookup map
+        std::unordered_map<std::string, size_t> fileIndex;
 
-    for (size_t i = 0; i < files.size(); ++i) // ATTENTION: assumes current file is not included
-        fileIndex[Misc::StringUtils::lowerCase(files[i])] = i;
+        for (size_t i = 0; i < files.size(); ++i) // ATTENTION: assumes current file is not included
+            fileIndex[Misc::StringUtils::lowerCase(files[i])] = i;
 
-    mCtx.parentFileIndices.resize(mHeader.mMaster.size());
-    for (unsigned int i = 0; i < mHeader.mMaster.size(); ++i)
-    {
-        // locate the position of the dependency in already loaded files
-        std::unordered_map<std::string, size_t>::const_iterator it
-            = fileIndex.find(Misc::StringUtils::lowerCase(mHeader.mMaster[i].name));
+        mCtx.parentFileIndices.resize(mHeader.mMaster.size());
+        for (unsigned int i = 0; i < mHeader.mMaster.size(); ++i)
+        {
+            // locate the position of the dependency in already loaded files
+            std::unordered_map<std::string, size_t>::const_iterator it
+                = fileIndex.find(Misc::StringUtils::lowerCase(mHeader.mMaster[i].name));
 
-        if (it != fileIndex.end())
-            mCtx.parentFileIndices[i] = (std::uint32_t)((it->second << 24) & 0xff000000);
-        else
-            throw std::runtime_error("ESM4::Reader::updateModIndices required dependency file not loaded");
+            if (it != fileIndex.end())
+                mCtx.parentFileIndices[i] = (std::uint32_t)((it->second << 24) & 0xff000000);
+            else
+                throw std::runtime_error("ESM4::Reader::updateModIndices required dependency file not loaded");
 #if 0
         std::cout << "Master Mod: " << mCtx.header.mMaster[i].name << ", " // FIXME: debugging only
                   << formIdToString(mCtx.parentFileIndices[i]) << std::endl;
 #endif
-    }
-
-    if (!mCtx.parentFileIndices.empty() &&  mCtx.parentFileIndices[0] != 0)
-        throw std::runtime_error("ESM4::Reader::updateModIndices base modIndex is not zero");
-}
+        }
 
-// ModIndex adjusted formId according to master file dependencies
-// (see http://www.uesp.net/wiki/Tes4Mod:FormID_Fixup)
-// NOTE: need to update modindex to parentFileIndices.size() before saving
-//
-// FIXME: probably should add a parameter to check for mCtx.header::mOverrides
-//        (ACHR, LAND, NAVM, PGRE, PHZD, REFR), but not sure what exactly overrides mean
-//        i.e. use the modindx of its master?
-// FIXME: Apparently ModIndex '00' in an ESP means the object is defined in one of its masters.
-//        This means we may need to search multiple times to get the correct id.
-//        (see https://www.uesp.net/wiki/Tes4Mod:Formid#ModIndex_Zero)
-void Reader::adjustFormId(FormId& id)
-{
-    if (mCtx.parentFileIndices.empty())
-        return;
+        if (!mCtx.parentFileIndices.empty() && mCtx.parentFileIndices[0] != 0)
+            throw std::runtime_error("ESM4::Reader::updateModIndices base modIndex is not zero");
+    }
 
-    std::size_t index = (id >> 24) & 0xff;
+    // ModIndex adjusted formId according to master file dependencies
+    // (see http://www.uesp.net/wiki/Tes4Mod:FormID_Fixup)
+    // NOTE: need to update modindex to parentFileIndices.size() before saving
+    //
+    // FIXME: probably should add a parameter to check for mCtx.header::mOverrides
+    //        (ACHR, LAND, NAVM, PGRE, PHZD, REFR), but not sure what exactly overrides mean
+    //        i.e. use the modindx of its master?
+    // FIXME: Apparently ModIndex '00' in an ESP means the object is defined in one of its masters.
+    //        This means we may need to search multiple times to get the correct id.
+    //        (see https://www.uesp.net/wiki/Tes4Mod:Formid#ModIndex_Zero)
+    void Reader::adjustFormId(FormId& id)
+    {
+        if (mCtx.parentFileIndices.empty())
+            return;
 
-    if (index < mCtx.parentFileIndices.size())
-        id = mCtx.parentFileIndices[index] | (id & 0x00ffffff);
-    else
-        id = mCtx.modIndex | (id & 0x00ffffff);
-}
+        std::size_t index = (id >> 24) & 0xff;
 
-bool Reader::getFormId(FormId& id)
-{
-    if (!getExact(id))
-        return false;
+        if (index < mCtx.parentFileIndices.size())
+            id = mCtx.parentFileIndices[index] | (id & 0x00ffffff);
+        else
+            id = mCtx.modIndex | (id & 0x00ffffff);
+    }
 
-    adjustFormId(id);
-    return true;
-}
+    bool Reader::getFormId(FormId& id)
+    {
+        if (!getExact(id))
+            return false;
 
-void Reader::adjustGRUPFormId()
-{
-    adjustFormId(mCtx.recordHeader.group.label.value);
-}
+        adjustFormId(id);
+        return true;
+    }
 
-[[noreturn]] void Reader::fail(const std::string& msg)
-{
-    std::stringstream ss;
+    void Reader::adjustGRUPFormId()
+    {
+        adjustFormId(mCtx.recordHeader.group.label.value);
+    }
 
-    ss << "ESM Error: " << msg;
-    ss << "\n  File: " << Files::pathToUnicodeString(mCtx.filename);
-    ss << "\n  Record: " << ESM::printName(mCtx.recordHeader.record.typeId);
-    ss << "\n  Subrecord: " << ESM::printName(mCtx.subRecordHeader.typeId);
-    if (mStream.get())
-        ss << "\n  Offset: 0x" << std::hex << mStream->tellg();
+    [[noreturn]] void Reader::fail(const std::string& msg)
+    {
+        std::stringstream ss;
 
-    throw std::runtime_error(ss.str());
-}
+        ss << "ESM Error: " << msg;
+        ss << "\n  File: " << Files::pathToUnicodeString(mCtx.filename);
+        ss << "\n  Record: " << ESM::printName(mCtx.recordHeader.record.typeId);
+        ss << "\n  Subrecord: " << ESM::printName(mCtx.subRecordHeader.typeId);
+        if (mStream.get())
+            ss << "\n  Offset: 0x" << std::hex << mStream->tellg();
 
-bool Reader::getStringImpl(std::string& str, std::size_t size,
-        std::istream& stream, const ToUTF8::StatelessUtf8Encoder* encoder, bool hasNull)
-{
-    std::size_t newSize = size;
+        throw std::runtime_error(ss.str());
+    }
 
-    if (encoder)
+    bool Reader::getStringImpl(std::string& str, std::size_t size, std::istream& stream,
+        const ToUTF8::StatelessUtf8Encoder* encoder, bool hasNull)
     {
-        std::string input(size, '\0');
-        stream.read(input.data(), size);
-        if (stream.gcount() == static_cast<std::streamsize>(size))
+        std::size_t newSize = size;
+
+        if (encoder)
         {
-            const std::string_view result = encoder->getUtf8(input, ToUTF8::BufferAllocationPolicy::FitToRequiredSize, str);
-            if (str.empty() && !result.empty())
+            std::string input(size, '\0');
+            stream.read(input.data(), size);
+            if (stream.gcount() == static_cast<std::streamsize>(size))
             {
-                str = std::move(input);
-                str.resize(result.size());
+                const std::string_view result
+                    = encoder->getUtf8(input, ToUTF8::BufferAllocationPolicy::FitToRequiredSize, str);
+                if (str.empty() && !result.empty())
+                {
+                    str = std::move(input);
+                    str.resize(result.size());
+                }
+                return true;
             }
-            return true;
         }
-    }
-    else
-    {
-        if (hasNull)
-            newSize -= 1; // don't read the null terminator yet
-
-        str.resize(newSize); // assumed C++11
-        stream.read(str.data(), newSize);
-        if (static_cast<std::size_t>(stream.gcount()) == newSize)
+        else
         {
             if (hasNull)
+                newSize -= 1; // don't read the null terminator yet
+
+            str.resize(newSize); // assumed C++11
+            stream.read(str.data(), newSize);
+            if (static_cast<std::size_t>(stream.gcount()) == newSize)
             {
-                char ch;
-                stream.read(&ch, 1); // read the null terminator
-                assert (ch == '\0'
-                        && "ESM4::Reader::getString string is not terminated with a null");
-            }
+                if (hasNull)
+                {
+                    char ch;
+                    stream.read(&ch, 1); // read the null terminator
+                    assert(ch == '\0' && "ESM4::Reader::getString string is not terminated with a null");
+                }
 #if 0
             else
             {
@@ -685,38 +703,38 @@ bool Reader::getStringImpl(std::string& str, std::size_t size,
                         && "ESM4::Reader::getString string is unexpectedly terminated with a null");
             }
 #endif
-            return true;
+                return true;
+            }
         }
+
+        str.clear();
+        return false; // FIXME: throw instead?
     }
 
-    str.clear();
-    return false; // FIXME: throw instead?
-}
+    bool Reader::getZeroTerminatedStringArray(std::vector<std::string>& values)
+    {
+        const std::size_t size = mCtx.subRecordHeader.dataSize;
+        std::string input(size, '\0');
+        mStream->read(input.data(), size);
 
-bool Reader::getZeroTerminatedStringArray(std::vector<std::string>& values)
-{
-    const std::size_t size = mCtx.subRecordHeader.dataSize;
-    std::string input(size, '\0');
-    mStream->read(input.data(), size);
+        if (mStream->gcount() != static_cast<std::streamsize>(size))
+            return false;
 
-    if (mStream->gcount() != static_cast<std::streamsize>(size))
-        return false;
+        std::string_view inputView(input.data(), input.size());
+        std::string buffer;
+        while (true)
+        {
+            std::string_view value(inputView.data());
+            const std::size_t next = inputView.find_first_not_of('\0', value.size());
+            if (mEncoder != nullptr)
+                value = mEncoder->getUtf8(value, ToUTF8::BufferAllocationPolicy::UseGrowFactor, buffer);
+            values.emplace_back(value);
+            if (next == std::string_view::npos)
+                break;
+            inputView = inputView.substr(next);
+        }
 
-    std::string_view inputView(input.data(), input.size());
-    std::string buffer;
-    while (true)
-    {
-        std::string_view value(inputView.data());
-        const std::size_t next = inputView.find_first_not_of('\0', value.size());
-        if (mEncoder != nullptr)
-            value = mEncoder->getUtf8(value, ToUTF8::BufferAllocationPolicy::UseGrowFactor, buffer);
-        values.emplace_back(value);
-        if (next == std::string_view::npos)
-            break;
-        inputView = inputView.substr(next);
+        return true;
     }
 
-    return true;
-}
-
 }
diff --git a/components/esm4/reader.hpp b/components/esm4/reader.hpp
index 69a45d6ef2..1af583e13c 100644
--- a/components/esm4/reader.hpp
+++ b/components/esm4/reader.hpp
@@ -23,11 +23,11 @@
 #ifndef ESM4_READER_H
 #define ESM4_READER_H
 
-#include <map>
 #include <cstddef>
-#include <memory>
-#include <istream>
 #include <filesystem>
+#include <istream>
+#include <map>
+#include <memory>
 
 #include "common.hpp"
 #include "loadtes4.hpp"
@@ -39,42 +39,43 @@ namespace ToUTF8
     class StatelessUtf8Encoder;
 }
 
-namespace ESM4 {
+namespace ESM4
+{
     //                                                   bytes read from group, updated by
     //                                                   getRecordHeader() in advance
     //                                                     |
     //                                                     v
-    typedef std::vector<std::pair<ESM4::GroupTypeHeader, std::uint32_t> > GroupStack;
+    typedef std::vector<std::pair<ESM4::GroupTypeHeader, std::uint32_t>> GroupStack;
 
     struct ReaderContext
     {
-        std::filesystem::path filename;         // in case we need to reopen to restore the context
-        std::uint32_t modIndex;         // the sequential position of this file in the load order:
+        std::filesystem::path filename; // in case we need to reopen to restore the context
+        std::uint32_t modIndex; // the sequential position of this file in the load order:
         //  0x00 reserved, 0xFF in-game (see notes below)
 
         // position in the vector = mod index of master files above
         // value = adjusted mod index based on all the files loaded so far
         std::vector<std::uint32_t> parentFileIndices;
 
-        std::size_t recHeaderSize;    // normally should be already set correctly, but just in
+        std::size_t recHeaderSize; // normally should be already set correctly, but just in
         //  case the file was re-opened.  default = TES5 size,
         //  can be reduced for TES4 by setRecHeaderSize()
 
-        std::size_t filePos;          // assume that the record header will be re-read once
+        std::size_t filePos; // assume that the record header will be re-read once
         //  the context is restored
 
         // for keeping track of things
-        std::size_t fileRead;         // number of bytes read, incl. the current record
+        std::size_t fileRead; // number of bytes read, incl. the current record
 
-        GroupStack groupStack;       // keep track of bytes left to find when a group is done
-        RecordHeader recordHeader;     // header of the current record or group being processed
-        SubRecordHeader subRecordHeader;  // header of the current sub record being processed
-        std::uint32_t recordRead;       // bytes read from the sub records, incl. the current one
+        GroupStack groupStack; // keep track of bytes left to find when a group is done
+        RecordHeader recordHeader; // header of the current record or group being processed
+        SubRecordHeader subRecordHeader; // header of the current sub record being processed
+        std::uint32_t recordRead; // bytes read from the sub records, incl. the current one
 
-        FormId currWorld;        // formId of current world - for grouping CELL records
-        FormId currCell;         // formId of current cell
+        FormId currWorld; // formId of current world - for grouping CELL records
+        FormId currCell; // formId of current cell
         // FIXME: try to get rid of these two members, seem like massive hacks
-        CellGrid currCellGrid;     // TODO: should keep a map of cell formids
+        CellGrid currCellGrid; // TODO: should keep a map of cell formids
         bool cellGridValid;
 
         ReaderContext();
@@ -82,24 +83,24 @@ namespace ESM4 {
 
     class Reader
     {
-        Header               mHeader;     // ESM4 header
+        Header mHeader; // ESM4 header
 
-        ReaderContext        mCtx;
+        ReaderContext mCtx;
 
         const ToUTF8::StatelessUtf8Encoder* mEncoder;
 
-        std::size_t          mFileSize;
+        std::size_t mFileSize;
 
-        Files::IStreamPtr    mStream;
-        Files::IStreamPtr    mSavedStream; // mStream is saved here while using deflated memory stream
+        Files::IStreamPtr mStream;
+        Files::IStreamPtr mSavedStream; // mStream is saved here while using deflated memory stream
 
-        Files::IStreamPtr    mStrings;
-        Files::IStreamPtr    mILStrings;
-        Files::IStreamPtr    mDLStrings;
+        Files::IStreamPtr mStrings;
+        Files::IStreamPtr mILStrings;
+        Files::IStreamPtr mDLStrings;
 
         enum LocalizedStringType
         {
-            Type_Strings   = 0,
+            Type_Strings = 0,
             Type_ILStrings = 1,
             Type_DLStrings = 2
         };
@@ -122,7 +123,7 @@ namespace ESM4 {
 
         // Close the file, resets all information.
         // After calling close() the structure may be reused to load a new file.
-        //void close();
+        // void close();
 
         // Raw opening. Opens the file and sets everything up but doesn't parse the header.
         void openRaw(Files::IStreamPtr&& stream, const std::filesystem::path& filename);
@@ -133,16 +134,13 @@ namespace ESM4 {
 
         Reader() = default;
 
-        bool getStringImpl(std::string& str, std::size_t size,
-                std::istream& stream, const ToUTF8::StatelessUtf8Encoder* encoder, bool hasNull = false);
+        bool getStringImpl(std::string& str, std::size_t size, std::istream& stream,
+            const ToUTF8::StatelessUtf8Encoder* encoder, bool hasNull = false);
 
     public:
-
         Reader(Files::IStreamPtr&& esmStream, const std::filesystem::path& filename);
         ~Reader();
 
-
-
         void open(const std::filesystem::path& filename);
 
         void close();
@@ -171,17 +169,22 @@ namespace ESM4 {
 
         bool restoreContext(const ReaderContext& ctx); // returns the result of re-reading the header
 
-        template<typename T>
-        inline void get(T& t) { mStream->read((char*)&t, sizeof(T)); }
+        template <typename T>
+        inline void get(T& t)
+        {
+            mStream->read((char*)&t, sizeof(T));
+        }
 
-        template<typename T>
-        bool getExact(T& t) {
+        template <typename T>
+        bool getExact(T& t)
+        {
             mStream->read((char*)&t, sizeof(T));
             return mStream->gcount() == sizeof(T); // FIXME: try/catch block needed?
         }
 
         // for arrays
-        inline bool get(void* p, std::size_t size) {
+        inline bool get(void* p, std::size_t size)
+        {
             mStream->read((char*)p, size);
             return mStream->gcount() == (std::streamsize)size; // FIXME: try/catch block needed?
         }
@@ -214,7 +217,8 @@ namespace ESM4 {
 
         // This is set while loading a CELL record (XCLC sub record) and invalidated
         // each time loading a CELL (see clearCellGrid())
-        inline void setCurrCellGrid(const CellGrid& currCell) {
+        inline void setCurrCellGrid(const CellGrid& currCell)
+        {
             mCtx.cellGridValid = true;
             mCtx.currCellGrid = currCell;
         }
@@ -268,7 +272,7 @@ namespace ESM4 {
         void skipSubRecordData(std::uint32_t size);
 
         // Get a subrecord of a particular type and data type
-        template<typename T>
+        template <typename T>
         bool getSubRecord(const ESM4::SubRecordTypes type, T& t)
         {
             ESM4::SubRecordHeader hdr;
@@ -286,10 +290,12 @@ namespace ESM4 {
         void adjustGRUPFormId();
 
         // Note: uses the string size from the subrecord header rather than checking null termination
-        bool getZString(std::string& str) {
+        bool getZString(std::string& str)
+        {
             return getStringImpl(str, mCtx.subRecordHeader.dataSize, *mStream, mEncoder, true);
         }
-        bool getString(std::string& str) {
+        bool getString(std::string& str)
+        {
             return getStringImpl(str, mCtx.subRecordHeader.dataSize, *mStream, mEncoder);
         }
 
@@ -304,9 +310,9 @@ namespace ESM4 {
         // Used for error handling
         [[noreturn]] void fail(const std::string& msg);
 
-        void setGlobalReaderList(std::vector<Reader*> *list) { mGlobalReaderList = list; }
+        void setGlobalReaderList(std::vector<Reader*>* list) { mGlobalReaderList = list; }
 
-        std::vector<Reader*> *getGlobalReaderList() { return mGlobalReaderList; }
+        std::vector<Reader*>* getGlobalReaderList() { return mGlobalReaderList; }
     };
 }
 
diff --git a/components/esm4/reference.hpp b/components/esm4/reference.hpp
index 5ac94b8519..0a0c96e712 100644
--- a/components/esm4/reference.hpp
+++ b/components/esm4/reference.hpp
@@ -52,8 +52,8 @@ namespace ESM4
     // REFR, ACHR, ACRE
     struct EnableParent
     {
-        FormId        parent;
-        std::uint32_t flags; //0x0001 = Set Enable State Opposite Parent, 0x0002 = Pop In
+        FormId parent;
+        std::uint32_t flags; // 0x0001 = Set Enable State Opposite Parent, 0x0002 = Pop In
     };
 #pragma pack(pop)
 
diff --git a/components/esm4/script.hpp b/components/esm4/script.hpp
index 8ba8c0025c..d1cd18018d 100644
--- a/components/esm4/script.hpp
+++ b/components/esm4/script.hpp
@@ -37,235 +37,235 @@ namespace ESM4
 {
     enum EmotionType
     {
-        EMO_Neutral  = 0,
-        EMO_Anger    = 1,
-        EMO_Disgust  = 2,
-        EMO_Fear     = 3,
-        EMO_Sad      = 4,
-        EMO_Happy    = 5,
+        EMO_Neutral = 0,
+        EMO_Anger = 1,
+        EMO_Disgust = 2,
+        EMO_Fear = 3,
+        EMO_Sad = 4,
+        EMO_Happy = 5,
         EMO_Surprise = 6,
-        EMO_Pained   = 7 // FO3/FONV
+        EMO_Pained = 7 // FO3/FONV
     };
 
     enum ConditionTypeAndFlag
     {
         // flag
-        CTF_Combine     = 0x01,
+        CTF_Combine = 0x01,
         CTF_RunOnTarget = 0x02,
-        CTF_UseGlobal   = 0x04,
+        CTF_UseGlobal = 0x04,
         // condition
-        CTF_EqualTo     = 0x00,
-        CTF_NotEqualTo  = 0x20,
+        CTF_EqualTo = 0x00,
+        CTF_NotEqualTo = 0x20,
         CTF_GreaterThan = 0x40,
-        CTF_GrThOrEqTo  = 0x60,
-        CTF_LessThan    = 0x80,
-        CTF_LeThOrEqTo  = 0xA0
+        CTF_GrThOrEqTo = 0x60,
+        CTF_LessThan = 0x80,
+        CTF_LeThOrEqTo = 0xA0
     };
 
     enum FunctionIndices
     {
-        FUN_GetDistance      = 1,
-        FUN_GetLocked        = 5,
-        FUN_GetPos           = 6,
-        FUN_GetAngle         = 8,
-        FUN_GetStartingPos   = 10,
+        FUN_GetDistance = 1,
+        FUN_GetLocked = 5,
+        FUN_GetPos = 6,
+        FUN_GetAngle = 8,
+        FUN_GetStartingPos = 10,
         FUN_GetStartingAngle = 11,
         FUN_GetSecondsPassed = 12,
-        FUN_GetActorValue    = 14,
-        FUN_GetCurrentTime   = 18,
-        FUN_GetScale         = 24,
-        FUN_IsMoving         = 25,
-        FUN_IsTurning        = 26,
-        FUN_GetLineOfSight   = 27,
-        FUN_GetIsInSameCell  = 32,
-        FUN_GetDisabled      = 35,
-        FUN_GetMenuMode      = 36,
-        FUN_GetDisease       = 39,
-        FUN_GetVampire       = 40,
+        FUN_GetActorValue = 14,
+        FUN_GetCurrentTime = 18,
+        FUN_GetScale = 24,
+        FUN_IsMoving = 25,
+        FUN_IsTurning = 26,
+        FUN_GetLineOfSight = 27,
+        FUN_GetIsInSameCell = 32,
+        FUN_GetDisabled = 35,
+        FUN_GetMenuMode = 36,
+        FUN_GetDisease = 39,
+        FUN_GetVampire = 40,
         FUN_GetClothingValue = 41,
-        FUN_SameFaction      = 42,
-        FUN_SameRace         = 43,
-        FUN_SameSex          = 44,
-        FUN_GetDetected      = 45,
-        FUN_GetDead          = 46,
-        FUN_GetItemCount     = 47,
-        FUN_GetGold          = 48,
-        FUN_GetSleeping      = 49,
-        FUN_GetTalkedToPC    = 50,
+        FUN_SameFaction = 42,
+        FUN_SameRace = 43,
+        FUN_SameSex = 44,
+        FUN_GetDetected = 45,
+        FUN_GetDead = 46,
+        FUN_GetItemCount = 47,
+        FUN_GetGold = 48,
+        FUN_GetSleeping = 49,
+        FUN_GetTalkedToPC = 50,
         FUN_GetScriptVariable = 53,
-        FUN_GetQuestRunning  = 56,
-        FUN_GetStage         = 58,
-        FUN_GetStageDone     = 59,
+        FUN_GetQuestRunning = 56,
+        FUN_GetStage = 58,
+        FUN_GetStageDone = 59,
         FUN_GetFactionRankDifference = 60,
-        FUN_GetAlarmed       = 61,
-        FUN_IsRaining        = 62,
-        FUN_GetAttacked      = 63,
-        FUN_GetIsCreature    = 64,
-        FUN_GetLockLevel     = 65,
-        FUN_GetShouldAttack  = 66,
-        FUN_GetInCell        = 67,
-        FUN_GetIsClass       = 68,
-        FUN_GetIsRace        = 69,
-        FUN_GetIsSex         = 70,
-        FUN_GetInFaction     = 71,
-        FUN_GetIsID          = 72,
-        FUN_GetFactionRank   = 73,
-        FUN_GetGlobalValue   = 74,
-        FUN_IsSnowing        = 75,
-        FUN_GetDisposition   = 76,
+        FUN_GetAlarmed = 61,
+        FUN_IsRaining = 62,
+        FUN_GetAttacked = 63,
+        FUN_GetIsCreature = 64,
+        FUN_GetLockLevel = 65,
+        FUN_GetShouldAttack = 66,
+        FUN_GetInCell = 67,
+        FUN_GetIsClass = 68,
+        FUN_GetIsRace = 69,
+        FUN_GetIsSex = 70,
+        FUN_GetInFaction = 71,
+        FUN_GetIsID = 72,
+        FUN_GetFactionRank = 73,
+        FUN_GetGlobalValue = 74,
+        FUN_IsSnowing = 75,
+        FUN_GetDisposition = 76,
         FUN_GetRandomPercent = 77,
         FUN_GetQuestVariable = 79,
-        FUN_GetLevel         = 80,
-        FUN_GetArmorRating   = 81,
-        FUN_GetDeadCount     = 84,
-        FUN_GetIsAlerted     = 91,
+        FUN_GetLevel = 80,
+        FUN_GetArmorRating = 81,
+        FUN_GetDeadCount = 84,
+        FUN_GetIsAlerted = 91,
         FUN_GetPlayerControlsDisabled = 98,
-        FUN_GetHeadingAngle  = 99,
-        FUN_IsWeaponOut      = 101,
-        FUN_IsTorchOut       = 102,
-        FUN_IsShieldOut      = 103,
-        FUN_IsFacingUp       = 106,
-        FUN_GetKnockedState  = 107,
+        FUN_GetHeadingAngle = 99,
+        FUN_IsWeaponOut = 101,
+        FUN_IsTorchOut = 102,
+        FUN_IsShieldOut = 103,
+        FUN_IsFacingUp = 106,
+        FUN_GetKnockedState = 107,
         FUN_GetWeaponAnimType = 108,
         FUN_IsWeaponSkillType = 109,
         FUN_GetCurrentAIPackage = 110,
-        FUN_IsWaiting        = 111,
-        FUN_IsIdlePlaying    = 112,
+        FUN_IsWaiting = 111,
+        FUN_IsIdlePlaying = 112,
         FUN_GetMinorCrimeCount = 116,
         FUN_GetMajorCrimeCount = 117,
         FUN_GetActorAggroRadiusViolated = 118,
-        FUN_GetCrime         = 122,
+        FUN_GetCrime = 122,
         FUN_IsGreetingPlayer = 123,
-        FUN_IsGuard          = 125,
-        FUN_HasBeenEaten     = 127,
+        FUN_IsGuard = 125,
+        FUN_HasBeenEaten = 127,
         FUN_GetFatiguePercentage = 128,
-        FUN_GetPCIsClass     = 129,
-        FUN_GetPCIsRace      = 130,
-        FUN_GetPCIsSex       = 131,
-        FUN_GetPCInFaction   = 132,
-        FUN_SameFactionAsPC  = 133,
-        FUN_SameRaceAsPC     = 134,
-        FUN_SameSexAsPC      = 135,
-        FUN_GetIsReference   = 136,
-        FUN_IsTalking        = 141,
-        FUN_GetWalkSpeed     = 142,
+        FUN_GetPCIsClass = 129,
+        FUN_GetPCIsRace = 130,
+        FUN_GetPCIsSex = 131,
+        FUN_GetPCInFaction = 132,
+        FUN_SameFactionAsPC = 133,
+        FUN_SameRaceAsPC = 134,
+        FUN_SameSexAsPC = 135,
+        FUN_GetIsReference = 136,
+        FUN_IsTalking = 141,
+        FUN_GetWalkSpeed = 142,
         FUN_GetCurrentAIProcedure = 143,
         FUN_GetTrespassWarningLevel = 144,
-        FUN_IsTrespassing    = 145,
-        FUN_IsInMyOwnedCell  = 146,
-        FUN_GetWindSpeed     = 147,
+        FUN_IsTrespassing = 145,
+        FUN_IsInMyOwnedCell = 146,
+        FUN_GetWindSpeed = 147,
         FUN_GetCurrentWeatherPercent = 148,
         FUN_GetIsCurrentWeather = 149,
         FUN_IsContinuingPackagePCNear = 150,
-        FUN_CanHaveFlames    = 153,
-        FUN_HasFlames        = 154,
-        FUN_GetOpenState     = 157,
-        FUN_GetSitting       = 159,
+        FUN_CanHaveFlames = 153,
+        FUN_HasFlames = 154,
+        FUN_GetOpenState = 157,
+        FUN_GetSitting = 159,
         FUN_GetFurnitureMarkerID = 160,
         FUN_GetIsCurrentPackage = 161,
         FUN_IsCurrentFurnitureRef = 162,
         FUN_IsCurrentFurnitureObj = 163,
-        FUN_GetDayofWeek     = 170,
+        FUN_GetDayofWeek = 170,
         FUN_GetTalkedToPCParam = 172,
-        FUN_IsPCSleeping     = 175,
-        FUN_IsPCAMurderer    = 176,
+        FUN_IsPCSleeping = 175,
+        FUN_IsPCAMurderer = 176,
         FUN_GetDetectionLevel = 180,
-        FUN_GetEquipped      = 182,
-        FUN_IsSwimming       = 185,
+        FUN_GetEquipped = 182,
+        FUN_IsSwimming = 185,
         FUN_GetAmountSoldStolen = 190,
-        FUN_GetIgnoreCrime   = 192,
-        FUN_GetPCExpelled    = 193,
+        FUN_GetIgnoreCrime = 192,
+        FUN_GetPCExpelled = 193,
         FUN_GetPCFactionMurder = 195,
         FUN_GetPCEnemyofFaction = 197,
         FUN_GetPCFactionAttack = 199,
-        FUN_GetDestroyed     = 203,
-        FUN_HasMagicEffect   = 214,
-        FUN_GetDefaultOpen   = 215,
-        FUN_GetAnimAction    = 219,
-        FUN_IsSpellTarget    = 223,
-        FUN_GetVATSMode      = 224,
+        FUN_GetDestroyed = 203,
+        FUN_HasMagicEffect = 214,
+        FUN_GetDefaultOpen = 215,
+        FUN_GetAnimAction = 219,
+        FUN_IsSpellTarget = 223,
+        FUN_GetVATSMode = 224,
         FUN_GetPersuasionNumber = 225,
-        FUN_GetSandman       = 226,
-        FUN_GetCannibal      = 227,
+        FUN_GetSandman = 226,
+        FUN_GetCannibal = 227,
         FUN_GetIsClassDefault = 228,
         FUN_GetClassDefaultMatch = 229,
-        FUN_GetInCellParam   = 230,
+        FUN_GetInCellParam = 230,
         FUN_GetVatsTargetHeight = 235,
-        FUN_GetIsGhost       = 237,
-        FUN_GetUnconscious   = 242,
-        FUN_GetRestrained    = 244,
-        FUN_GetIsUsedItem    = 246,
+        FUN_GetIsGhost = 237,
+        FUN_GetUnconscious = 242,
+        FUN_GetRestrained = 244,
+        FUN_GetIsUsedItem = 246,
         FUN_GetIsUsedItemType = 247,
         FUN_GetIsPlayableRace = 254,
         FUN_GetOffersServicesNow = 255,
         FUN_GetUsedItemLevel = 258,
         FUN_GetUsedItemActivate = 259,
-        FUN_GetBarterGold    = 264,
-        FUN_IsTimePassing    = 265,
-        FUN_IsPleasant       = 266,
-        FUN_IsCloudy         = 267,
+        FUN_GetBarterGold = 264,
+        FUN_IsTimePassing = 265,
+        FUN_IsPleasant = 266,
+        FUN_IsCloudy = 267,
         FUN_GetArmorRatingUpperBody = 274,
         FUN_GetBaseActorValue = 277,
-        FUN_IsOwner          = 278,
-        FUN_IsCellOwner      = 280,
-        FUN_IsHorseStolen    = 282,
-        FUN_IsLeftUp         = 285,
-        FUN_IsSneaking       = 286,
-        FUN_IsRunning        = 287,
-        FUN_GetFriendHit     = 288,
-        FUN_IsInCombat       = 289,
-        FUN_IsInInterior     = 300,
-        FUN_IsWaterObject    = 304,
+        FUN_IsOwner = 278,
+        FUN_IsCellOwner = 280,
+        FUN_IsHorseStolen = 282,
+        FUN_IsLeftUp = 285,
+        FUN_IsSneaking = 286,
+        FUN_IsRunning = 287,
+        FUN_GetFriendHit = 288,
+        FUN_IsInCombat = 289,
+        FUN_IsInInterior = 300,
+        FUN_IsWaterObject = 304,
         FUN_IsActorUsingATorch = 306,
-        FUN_IsXBox           = 309,
-        FUN_GetInWorldspace  = 310,
-        FUN_GetPCMiscStat    = 312,
-        FUN_IsActorEvil      = 313,
-        FUN_IsActorAVictim   = 314,
+        FUN_IsXBox = 309,
+        FUN_GetInWorldspace = 310,
+        FUN_GetPCMiscStat = 312,
+        FUN_IsActorEvil = 313,
+        FUN_IsActorAVictim = 314,
         FUN_GetTotalPersuasionNumber = 315,
-        FUN_GetIdleDoneOnce  = 318,
-        FUN_GetNoRumors      = 320,
+        FUN_GetIdleDoneOnce = 318,
+        FUN_GetNoRumors = 320,
         FUN_WhichServiceMenu = 323,
-        FUN_IsRidingHorse    = 327,
+        FUN_IsRidingHorse = 327,
         FUN_IsInDangerousWater = 332,
         FUN_GetIgnoreFriendlyHits = 338,
         FUN_IsPlayersLastRiddenHorse = 339,
-        FUN_IsActor          = 353,
-        FUN_IsEssential      = 354,
+        FUN_IsActor = 353,
+        FUN_IsEssential = 354,
         FUN_IsPlayerMovingIntoNewSpace = 358,
-        FUN_GetTimeDead      = 361,
+        FUN_GetTimeDead = 361,
         FUN_GetPlayerHasLastRiddenHorse = 362,
-        FUN_IsChild          = 365,
+        FUN_IsChild = 365,
         FUN_GetLastPlayerAction = 367,
         FUN_IsPlayerActionActive = 368,
         FUN_IsTalkingActivatorActor = 370,
-        FUN_IsInList         = 372,
-        FUN_GetHasNote       = 382,
-        FUN_GetHitLocation   = 391,
-        FUN_IsPC1stPerson    = 392,
-        FUN_GetCauseofDeath  = 397,
-        FUN_IsLimbGone       = 398,
-        FUN_IsWeaponInList   = 399,
+        FUN_IsInList = 372,
+        FUN_GetHasNote = 382,
+        FUN_GetHitLocation = 391,
+        FUN_IsPC1stPerson = 392,
+        FUN_GetCauseofDeath = 397,
+        FUN_IsLimbGone = 398,
+        FUN_IsWeaponInList = 399,
         FUN_HasFriendDisposition = 403,
-        FUN_GetVATSValue     = 408,
-        FUN_IsKiller         = 409,
-        FUN_IsKillerObject   = 410,
+        FUN_GetVATSValue = 408,
+        FUN_IsKiller = 409,
+        FUN_IsKillerObject = 410,
         FUN_GetFactionCombatReaction = 411,
-        FUN_Exists           = 415,
+        FUN_Exists = 415,
         FUN_GetGroupMemberCount = 416,
         FUN_GetGroupTargetCount = 417,
         FUN_GetObjectiveCompleted = 420,
         FUN_GetObjectiveDisplayed = 421,
-        FUN_GetIsVoiceType   = 427,
+        FUN_GetIsVoiceType = 427,
         FUN_GetPlantedExplosive = 428,
         FUN_IsActorTalkingThroughActivator = 430,
         FUN_GetHealthPercentage = 431,
-        FUN_GetIsObjectType  = 433,
+        FUN_GetIsObjectType = 433,
         FUN_GetDialogueEmotion = 435,
         FUN_GetDialogueEmotionValue = 436,
         FUN_GetIsCreatureType = 438,
-        FUN_GetInZone        = 446,
-        FUN_HasPerk          = 449,
+        FUN_GetInZone = 446,
+        FUN_HasPerk = 449,
         FUN_GetFactionRelation = 450,
         FUN_IsLastIdlePlayed = 451,
         FUN_GetPlayerTeammate = 454,
@@ -275,24 +275,24 @@ namespace ESM4
         FUN_IsPlayerTagSkill = 462,
         FUN_IsPlayerGrabbedRef = 464,
         FUN_GetDestructionStage = 471,
-        FUN_GetIsAlignment   = 474,
-        FUN_GetThreatRatio   = 478,
+        FUN_GetIsAlignment = 474,
+        FUN_GetThreatRatio = 478,
         FUN_GetIsUsedItemEquipType = 480,
-        FUN_GetConcussed     = 489,
+        FUN_GetConcussed = 489,
         FUN_GetMapMarkerVisible = 492,
         FUN_GetPermanentActorValue = 495,
         FUN_GetKillingBlowLimb = 496,
         FUN_GetWeaponHealthPerc = 500,
         FUN_GetRadiationLevel = 503,
         FUN_GetLastHitCritical = 510,
-        FUN_IsCombatTarget   = 515,
+        FUN_IsCombatTarget = 515,
         FUN_GetVATSRightAreaFree = 518,
         FUN_GetVATSLeftAreaFree = 519,
         FUN_GetVATSBackAreaFree = 520,
         FUN_GetVATSFrontAreaFree = 521,
-        FUN_GetIsLockBroken  = 522,
-        FUN_IsPS3            = 523,
-        FUN_IsWin32          = 524,
+        FUN_GetIsLockBroken = 522,
+        FUN_IsPS3 = 523,
+        FUN_IsWin32 = 524,
         FUN_GetVATSRightTargetVisible = 525,
         FUN_GetVATSLeftTargetVisible = 526,
         FUN_GetVATSBackTargetVisible = 527,
@@ -300,18 +300,18 @@ namespace ESM4
         FUN_IsInCriticalStage = 531,
         FUN_GetXPForNextLevel = 533,
         FUN_GetQuestCompleted = 546,
-        FUN_IsGoreDisabled   = 550,
+        FUN_IsGoreDisabled = 550,
         FUN_GetSpellUsageNum = 555,
-        FUN_GetActorsInHigh  = 557,
-        FUN_HasLoaded3D      = 558,
-        FUN_GetReputation    = 573,
+        FUN_GetActorsInHigh = 557,
+        FUN_HasLoaded3D = 558,
+        FUN_GetReputation = 573,
         FUN_GetReputationPct = 574,
         FUN_GetReputationThreshold = 575,
-        FUN_IsHardcore       = 586,
+        FUN_IsHardcore = 586,
         FUN_GetForceHitReaction = 601,
-        FUN_ChallengeLocked  = 607,
+        FUN_ChallengeLocked = 607,
         FUN_GetCasinoWinningStage = 610,
-        FUN_PlayerInRegion   = 612,
+        FUN_PlayerInRegion = 612,
         FUN_GetChallengeCompleted = 614,
         FUN_IsAlwaysHardcore = 619
     };
@@ -320,7 +320,7 @@ namespace ESM4
     struct TargetResponseData
     {
         std::uint32_t emoType; // EmotionType
-        std::int32_t  emoValue;
+        std::int32_t emoValue;
         std::uint32_t unknown1;
         std::uint32_t responseNo; // 1 byte + padding
         // below FO3/FONV
@@ -363,7 +363,8 @@ namespace ESM4
         // SCVR
         std::string variableName;
 
-        void clear() {
+        void clear()
+        {
             index = 0;
             type = 0;
             variableName.clear();
diff --git a/components/esmloader/esmdata.cpp b/components/esmloader/esmdata.cpp
index 7b27a2f14c..e03605f13f 100644
--- a/components/esmloader/esmdata.cpp
+++ b/components/esmloader/esmdata.cpp
@@ -27,15 +27,15 @@ namespace EsmLoader
         template <class F>
         auto returnAs(F&& f)
         {
-            using Result = decltype(std::forward<F>(f)(ESM::Static {}));
+            using Result = decltype(std::forward<F>(f)(ESM::Static{}));
             if constexpr (!std::is_same_v<Result, void>)
-                return Result {};
+                return Result{};
         }
 
         template <class T, class F>
         auto withStatic(std::string_view refId, const std::vector<T>& values, F&& f)
         {
-            const auto it = std::lower_bound(values.begin(), values.end(), refId, LessById {});
+            const auto it = std::lower_bound(values.begin(), values.end(), refId, LessById{});
 
             if (it == values.end() || it->mId != refId)
                 return returnAs(std::forward<F>(f));
@@ -48,11 +48,16 @@ namespace EsmLoader
         {
             switch (type)
             {
-                case ESM::REC_ACTI: return withStatic(refId, content.mActivators, std::forward<F>(f));
-                case ESM::REC_CONT: return withStatic(refId, content.mContainers, std::forward<F>(f));
-                case ESM::REC_DOOR: return withStatic(refId, content.mDoors, std::forward<F>(f));
-                case ESM::REC_STAT: return withStatic(refId, content.mStatics, std::forward<F>(f));
-                default: break;
+                case ESM::REC_ACTI:
+                    return withStatic(refId, content.mActivators, std::forward<F>(f));
+                case ESM::REC_CONT:
+                    return withStatic(refId, content.mContainers, std::forward<F>(f));
+                case ESM::REC_DOOR:
+                    return withStatic(refId, content.mDoors, std::forward<F>(f));
+                case ESM::REC_STAT:
+                    return withStatic(refId, content.mStatics, std::forward<F>(f));
+                default:
+                    break;
             }
 
             return returnAs(std::forward<F>(f));
@@ -63,13 +68,13 @@ namespace EsmLoader
 
     std::string_view getModel(const EsmData& content, std::string_view refId, ESM::RecNameInts type)
     {
-        return withStatic(refId, type, content, [] (const auto& v) { return std::string_view(v.mModel); });
+        return withStatic(refId, type, content, [](const auto& v) { return std::string_view(v.mModel); });
     }
 
     ESM::Variant getGameSetting(const std::vector<ESM::GameSetting>& records, std::string_view id)
     {
         const std::string lower = Misc::StringUtils::lowerCase(id);
-        auto it = std::lower_bound(records.begin(), records.end(), lower, LessById {});
+        auto it = std::lower_bound(records.begin(), records.end(), lower, LessById{});
         if (it == records.end() || it->mId != lower)
             throw std::runtime_error("Game settings \"" + std::string(id) + "\" is not found");
         return it->mValue;
diff --git a/components/esmloader/load.cpp b/components/esmloader/load.cpp
index 66e859bf20..0f66c4a4a4 100644
--- a/components/esmloader/load.cpp
+++ b/components/esmloader/load.cpp
@@ -4,8 +4,8 @@
 #include "record.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm3/cellref.hpp>
 #include <components/esm/defs.hpp>
+#include <components/esm3/cellref.hpp>
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/loadacti.hpp>
 #include <components/esm3/loadcell.hpp>
@@ -14,25 +14,25 @@
 #include <components/esm3/loadgmst.hpp>
 #include <components/esm3/loadland.hpp>
 #include <components/esm3/loadstat.hpp>
+#include <components/esm3/readerscache.hpp>
 #include <components/files/collections.hpp>
+#include <components/files/conversion.hpp>
 #include <components/files/multidircollection.hpp>
+#include <components/loadinglistener/loadinglistener.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/strings/lower.hpp>
-#include <components/esm3/readerscache.hpp>
-#include <components/loadinglistener/loadinglistener.hpp>
-#include <components/files/conversion.hpp>
 
 #include <algorithm>
-#include <filesystem>
 #include <cstddef>
+#include <filesystem>
 #include <map>
 #include <set>
+#include <sstream>
 #include <string>
 #include <string_view>
 #include <type_traits>
 #include <utility>
 #include <vector>
-#include <sstream>
 
 namespace EsmLoader
 {
@@ -46,15 +46,9 @@ namespace EsmLoader
                 return (v.mId);
             }
 
-            const ESM::CellId& operator()(const ESM::Cell& v) const
-            {
-                return v.mCellId;
-            }
+            const ESM::CellId& operator()(const ESM::Cell& v) const { return v.mCellId; }
 
-            std::pair<int, int> operator()(const ESM::Land& v) const
-            {
-                return std::pair(v.mX, v.mY);
-            }
+            std::pair<int, int> operator()(const ESM::Land& v) const { return std::pair(v.mX, v.mY); }
 
             template <class T>
             decltype(auto) operator()(const Record<T>& v) const
@@ -71,17 +65,20 @@ namespace EsmLoader
         };
 
         template <class T, class = std::void_t<>>
-        struct HasId : std::false_type {};
+        struct HasId : std::false_type
+        {
+        };
 
         template <class T>
-        struct HasId<T, std::void_t<decltype(T::mId)>> : std::true_type {};
+        struct HasId<T, std::void_t<decltype(T::mId)>> : std::true_type
+        {
+        };
 
         template <class T>
         constexpr bool hasId = HasId<T>::value;
 
         template <class T>
-        auto loadRecord(ESM::ESMReader& reader, Records<T>& records)
-            -> std::enable_if_t<hasId<T>>
+        auto loadRecord(ESM::ESMReader& reader, Records<T>& records) -> std::enable_if_t<hasId<T>>
         {
             T record;
             bool deleted = false;
@@ -93,8 +90,7 @@ namespace EsmLoader
         }
 
         template <class T>
-        auto loadRecord(ESM::ESMReader& reader, Records<T>& records)
-            -> std::enable_if_t<!hasId<T>>
+        auto loadRecord(ESM::ESMReader& reader, Records<T>& records) -> std::enable_if_t<!hasId<T>>
         {
             T record;
             bool deleted = false;
@@ -213,12 +209,12 @@ namespace EsmLoader
         }
 
         ShallowContent shallowLoad(const Query& query, const std::vector<std::string>& contentFiles,
-            const Files::Collections& fileCollections, ESM::ReadersCache& readers,
-            ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener)
+            const Files::Collections& fileCollections, ESM::ReadersCache& readers, ToUTF8::Utf8Encoder* encoder,
+            Loading::Listener* listener)
         {
             ShallowContent result;
 
-            const std::set<std::string> supportedFormats {
+            const std::set<std::string> supportedFormats{
                 ".esm",
                 ".esp",
                 ".omwgame",
@@ -228,8 +224,9 @@ namespace EsmLoader
 
             for (std::size_t i = 0; i < contentFiles.size(); ++i)
             {
-                const std::string &file = contentFiles[i];
-                const std::string extension = Misc::StringUtils::lowerCase(Files::pathToUnicodeString(std::filesystem::path(file).extension()));
+                const std::string& file = contentFiles[i];
+                const std::string extension
+                    = Misc::StringUtils::lowerCase(Files::pathToUnicodeString(std::filesystem::path(file).extension()));
 
                 if (supportedFormats.find(extension) == supportedFormats.end())
                 {
@@ -263,31 +260,30 @@ namespace EsmLoader
             ESM::RecNameInts mType;
 
             template <class T>
-            RefIdWithType operator()(const T& v) const { return {v.mId, mType}; }
+            RefIdWithType operator()(const T& v) const
+            {
+                return { v.mId, mType };
+            }
         };
 
         template <class T>
         void addRefIdsTypes(const std::vector<T>& values, std::vector<RefIdWithType>& refIdsTypes)
         {
             std::transform(values.begin(), values.end(), std::back_inserter(refIdsTypes),
-                           WithType {static_cast<ESM::RecNameInts>(T::sRecordId)});
+                WithType{ static_cast<ESM::RecNameInts>(T::sRecordId) });
         }
 
         void addRefIdsTypes(EsmData& content)
         {
-            content.mRefIdTypes.reserve(
-                content.mActivators.size()
-                + content.mContainers.size()
-                + content.mDoors.size()
-                + content.mStatics.size()
-            );
+            content.mRefIdTypes.reserve(content.mActivators.size() + content.mContainers.size() + content.mDoors.size()
+                + content.mStatics.size());
 
             addRefIdsTypes(content.mActivators, content.mRefIdTypes);
             addRefIdsTypes(content.mContainers, content.mRefIdTypes);
             addRefIdsTypes(content.mDoors, content.mRefIdTypes);
             addRefIdsTypes(content.mStatics, content.mRefIdTypes);
 
-            std::sort(content.mRefIdTypes.begin(), content.mRefIdTypes.end(), LessById {});
+            std::sort(content.mRefIdTypes.begin(), content.mRefIdTypes.end(), LessById{});
         }
 
         std::vector<ESM::Cell> prepareCellRecords(Records<ESM::Cell>& records)
@@ -330,19 +326,19 @@ namespace EsmLoader
         EsmData result;
 
         if (query.mLoadActivators)
-            result.mActivators = prepareRecords(content.mActivators, GetKey {});
+            result.mActivators = prepareRecords(content.mActivators, GetKey{});
         if (query.mLoadCells)
             result.mCells = prepareCellRecords(content.mCells.mValues);
         if (query.mLoadContainers)
-            result.mContainers = prepareRecords(content.mContainers, GetKey {});
+            result.mContainers = prepareRecords(content.mContainers, GetKey{});
         if (query.mLoadDoors)
-            result.mDoors = prepareRecords(content.mDoors, GetKey {});
+            result.mDoors = prepareRecords(content.mDoors, GetKey{});
         if (query.mLoadGameSettings)
-            result.mGameSettings = prepareRecords(content.mGameSettings, GetKey {});
+            result.mGameSettings = prepareRecords(content.mGameSettings, GetKey{});
         if (query.mLoadLands)
-            result.mLands = prepareRecords(content.mLands, GetKey {});
+            result.mLands = prepareRecords(content.mLands, GetKey{});
         if (query.mLoadStatics)
-            result.mStatics = prepareRecords(content.mStatics, GetKey {});
+            result.mStatics = prepareRecords(content.mStatics, GetKey{});
 
         addRefIdsTypes(result);
 
diff --git a/components/esmloader/load.hpp b/components/esmloader/load.hpp
index d7a64a1c85..884d6126d3 100644
--- a/components/esmloader/load.hpp
+++ b/components/esmloader/load.hpp
@@ -39,8 +39,8 @@ namespace EsmLoader
     };
 
     EsmData loadEsmData(const Query& query, const std::vector<std::string>& contentFiles,
-        const Files::Collections& fileCollections, ESM::ReadersCache& readers,
-        ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener = nullptr);
+        const Files::Collections& fileCollections, ESM::ReadersCache& readers, ToUTF8::Utf8Encoder* encoder,
+        Loading::Listener* listener = nullptr);
 }
 
 #endif
diff --git a/components/esmloader/record.hpp b/components/esmloader/record.hpp
index ec9705e823..41a990f924 100644
--- a/components/esmloader/record.hpp
+++ b/components/esmloader/record.hpp
@@ -16,11 +16,12 @@ namespace EsmLoader
         bool mDeleted;
         T mValue;
 
-        template <class ... Args>
-        explicit Record(bool deleted, Args&& ... args)
+        template <class... Args>
+        explicit Record(bool deleted, Args&&... args)
             : mDeleted(deleted)
-            , mValue(std::forward<Args>(args) ...)
-        {}
+            , mValue(std::forward<Args>(args)...)
+        {
+        }
     };
 
     template <class T>
@@ -29,12 +30,11 @@ namespace EsmLoader
     template <class T, class GetKey>
     inline std::vector<T> prepareRecords(Records<T>& records, const GetKey& getKey)
     {
-        const auto greaterByKey = [&] (const auto& l, const auto& r) { return getKey(r) < getKey(l); };
-        const auto equalByKey = [&] (const auto& l, const auto& r) { return getKey(l) == getKey(r); };
+        const auto greaterByKey = [&](const auto& l, const auto& r) { return getKey(r) < getKey(l); };
+        const auto equalByKey = [&](const auto& l, const auto& r) { return getKey(l) == getKey(r); };
         std::stable_sort(records.begin(), records.end(), greaterByKey);
         std::vector<T> result;
-        Misc::forEachUnique(records.rbegin(), records.rend(), equalByKey, [&] (const auto& v)
-        {
+        Misc::forEachUnique(records.rbegin(), records.rend(), equalByKey, [&](const auto& v) {
             if (!v.mDeleted)
                 result.emplace_back(std::move(v.mValue));
         });
diff --git a/components/fallback/fallback.cpp b/components/fallback/fallback.cpp
index 361f7b71fc..e0bf19111c 100644
--- a/components/fallback/fallback.cpp
+++ b/components/fallback/fallback.cpp
@@ -8,9 +8,9 @@ namespace Fallback
 {
     std::map<std::string, std::string, std::less<>> Map::mFallbackMap;
 
-    void Map::init(const std::map<std::string,std::string>& fallback)
+    void Map::init(const std::map<std::string, std::string>& fallback)
     {
-        for(const auto& entry : fallback)
+        for (const auto& entry : fallback)
             mFallbackMap.insert(entry);
     }
 
@@ -71,18 +71,21 @@ namespace Fallback
                 unsigned int j = 0;
                 for (unsigned int i = 0; i < sum.length(); ++i)
                 {
-                    if(sum[i]==',') j++;
-                    else if (sum[i] != ' ') ret[j]+=sum[i];
+                    if (sum[i] == ',')
+                        j++;
+                    else if (sum[i] != ' ')
+                        ret[j] += sum[i];
                 }
-                return osg::Vec4f(std::stoi(ret[0])/255.f,std::stoi(ret[1])/255.f,std::stoi(ret[2])/255.f, 1.f);    
+                return osg::Vec4f(std::stoi(ret[0]) / 255.f, std::stoi(ret[1]) / 255.f, std::stoi(ret[2]) / 255.f, 1.f);
             }
             catch (const std::invalid_argument&)
             {
-                Log(Debug::Error) << "Error: '" << fall << "' setting value (" << sum << ") is not a valid color, using middle gray as a fallback";
+                Log(Debug::Error) << "Error: '" << fall << "' setting value (" << sum
+                                  << ") is not a valid color, using middle gray as a fallback";
             }
         }
 
-        return osg::Vec4f(0.5f,0.5f,0.5f,1.f);
+        return osg::Vec4f(0.5f, 0.5f, 0.5f, 1.f);
     }
 
 }
diff --git a/components/fallback/fallback.hpp b/components/fallback/fallback.hpp
index 8eb7440cfa..5d38acbd3a 100644
--- a/components/fallback/fallback.hpp
+++ b/components/fallback/fallback.hpp
@@ -12,15 +12,16 @@ namespace Fallback
     /// @brief contains settings imported from the Morrowind INI file.
     class Map
     {
-            static std::map<std::string, std::string, std::less<>> mFallbackMap;
-        public:
-            static void init(const std::map<std::string,std::string>& fallback);
+        static std::map<std::string, std::string, std::less<>> mFallbackMap;
 
-            static std::string_view getString(std::string_view fall);
-            static float getFloat(std::string_view fall);
-            static int getInt(std::string_view fall);
-            static bool getBool(std::string_view fall);
-            static osg::Vec4f getColour(std::string_view fall);
+    public:
+        static void init(const std::map<std::string, std::string>& fallback);
+
+        static std::string_view getString(std::string_view fall);
+        static float getFloat(std::string_view fall);
+        static int getInt(std::string_view fall);
+        static bool getBool(std::string_view fall);
+        static osg::Vec4f getColour(std::string_view fall);
     };
 }
 #endif
diff --git a/components/fallback/validate.cpp b/components/fallback/validate.cpp
index e47c6f878e..bf73ce0876 100644
--- a/components/fallback/validate.cpp
+++ b/components/fallback/validate.cpp
@@ -10,13 +10,14 @@ void Fallback::validate(boost::any& v, std::vector<std::string> const& tokens, F
         v = boost::any(FallbackMap());
     }
 
-    FallbackMap *map = boost::any_cast<FallbackMap>(&v);
+    FallbackMap* map = boost::any_cast<FallbackMap>(&v);
 
     for (const auto& token : tokens)
     {
         size_t sep = token.find(',');
         if (sep < 1 || sep == token.length() - 1 || sep == std::string::npos)
-            throw boost::program_options::validation_error(boost::program_options::validation_error::invalid_option_value);
+            throw boost::program_options::validation_error(
+                boost::program_options::validation_error::invalid_option_value);
 
         std::string key(token.substr(0, sep));
         std::string value(token.substr(sep + 1));
diff --git a/components/fallback/validate.hpp b/components/fallback/validate.hpp
index 49046be6fc..15e355ab6a 100644
--- a/components/fallback/validate.hpp
+++ b/components/fallback/validate.hpp
@@ -17,11 +17,12 @@ namespace boost
 namespace Fallback
 {
 
-    struct FallbackMap {
+    struct FallbackMap
+    {
         std::map<std::string, std::string> mMap;
     };
 
-    void validate(boost::any &v, std::vector<std::string> const &tokens, FallbackMap*, int);
+    void validate(boost::any& v, std::vector<std::string> const& tokens, FallbackMap*, int);
 }
 
 #endif
diff --git a/components/files/androidpath.cpp b/components/files/androidpath.cpp
index 36479d4ebb..0a6cc161f3 100644
--- a/components/files/androidpath.cpp
+++ b/components/files/androidpath.cpp
@@ -2,20 +2,21 @@
 
 #if defined(__ANDROID__)
 
-#include <jni.h>
 #include <cstdlib>
 #include <cstring>
+#include <filesystem>
+#include <jni.h>
 #include <pwd.h>
 #include <unistd.h>
-#include <filesystem>
 
-static const char *g_path_global; //< Path to global directory root, e.g. /data/data/com.libopenmw.openmw
-static const char *g_path_user; //< Path to user root, e.g. /sdcard/Android/data/com.libopenmw.openmw
+static const char* g_path_global; //< Path to global directory root, e.g. /data/data/com.libopenmw.openmw
+static const char* g_path_user; //< Path to user root, e.g. /sdcard/Android/data/com.libopenmw.openmw
 
 /**
  * \brief Called by java code to set up directory paths
  */
-extern "C" JNIEXPORT void JNICALL Java_ui_activity_GameActivity_getPathToJni(JNIEnv *env, jobject obj, jstring global, jstring user)
+extern "C" JNIEXPORT void JNICALL Java_ui_activity_GameActivity_getPathToJni(
+    JNIEnv* env, jobject obj, jstring global, jstring user)
 {
     g_path_global = env->GetStringUTFChars(global, nullptr);
     g_path_user = env->GetStringUTFChars(user, nullptr);
@@ -24,54 +25,51 @@ extern "C" JNIEXPORT void JNICALL Java_ui_activity_GameActivity_getPathToJni(JNI
 namespace Files
 {
 
-AndroidPath::AndroidPath(const std::string& application_name)
-{
-}
-
-// /sdcard/Android/data/com.libopenmw.openmw/config
-std::filesystem::path AndroidPath::getUserConfigPath() const
-{
-    return std::filesystem::path(g_path_user) / "config";
-}
-
-// /sdcard/Android/data/com.libopenmw.openmw/
-// (so that saves are placed at /sdcard/Android/data/com.libopenmw.openmw/saves)
-std::filesystem::path AndroidPath::getUserDataPath() const
-{
-    return std::filesystem::path(g_path_user);
-}
-
-// /data/data/com.libopenmw.openmw/cache
-// (supposed to be "official" android cache location)
-std::filesystem::path AndroidPath::getCachePath() const
-{
-    return std::filesystem::path(g_path_global) / "cache";
-}
-
-// /data/data/com.libopenmw.openmw/files/config
-// (note the addition of "files")
-std::filesystem::path AndroidPath::getGlobalConfigPath() const
-{
-    return std::filesystem::path(g_path_global) / "files" / "config";
-}
-
-std::filesystem::path AndroidPath::getLocalPath() const
-{
-    return std::filesystem::path("./");
-}
-
-// /sdcard/Android/data/com.libopenmw.openmw
-// (so that the data is at /sdcard/Android/data/com.libopenmw.openmw/data)
-std::filesystem::path AndroidPath::getGlobalDataPath() const
-{
-    return std::filesystem::path(g_path_user);
-}
-
-std::filesystem::path AndroidPath::getInstallPath() const
-{
-    return std::filesystem::path();
-}
-
+    AndroidPath::AndroidPath(const std::string& application_name) {}
+
+    // /sdcard/Android/data/com.libopenmw.openmw/config
+    std::filesystem::path AndroidPath::getUserConfigPath() const
+    {
+        return std::filesystem::path(g_path_user) / "config";
+    }
+
+    // /sdcard/Android/data/com.libopenmw.openmw/
+    // (so that saves are placed at /sdcard/Android/data/com.libopenmw.openmw/saves)
+    std::filesystem::path AndroidPath::getUserDataPath() const
+    {
+        return std::filesystem::path(g_path_user);
+    }
+
+    // /data/data/com.libopenmw.openmw/cache
+    // (supposed to be "official" android cache location)
+    std::filesystem::path AndroidPath::getCachePath() const
+    {
+        return std::filesystem::path(g_path_global) / "cache";
+    }
+
+    // /data/data/com.libopenmw.openmw/files/config
+    // (note the addition of "files")
+    std::filesystem::path AndroidPath::getGlobalConfigPath() const
+    {
+        return std::filesystem::path(g_path_global) / "files" / "config";
+    }
+
+    std::filesystem::path AndroidPath::getLocalPath() const
+    {
+        return std::filesystem::path("./");
+    }
+
+    // /sdcard/Android/data/com.libopenmw.openmw
+    // (so that the data is at /sdcard/Android/data/com.libopenmw.openmw/data)
+    std::filesystem::path AndroidPath::getGlobalDataPath() const
+    {
+        return std::filesystem::path(g_path_user);
+    }
+
+    std::filesystem::path AndroidPath::getInstallPath() const
+    {
+        return std::filesystem::path();
+    }
 
 } /* namespace Files */
 
diff --git a/components/files/androidpath.hpp b/components/files/androidpath.hpp
index 33d89fdce1..5a10efe798 100644
--- a/components/files/androidpath.hpp
+++ b/components/files/androidpath.hpp
@@ -8,45 +8,43 @@
  * \namespace Files
  */
 
-
 namespace Files
 {
 
-struct AndroidPath
-{
-    AndroidPath(const std::string& application_name);
-    
-
-    /**
-     * \brief Return path to the user directory.
-     */
-    std::filesystem::path getUserConfigPath() const;
-
-    std::filesystem::path getUserDataPath() const;
-
-    /**
-     * \brief Return path to the global (system) directory where config files can be placed.
-     */
-    std::filesystem::path getGlobalConfigPath() const;
-
-    /**
-     * \brief Return path to the runtime configuration directory which is the
-     * place where an application was started.
-     */
-    std::filesystem::path getLocalPath() const;
-
-    /**
-     * \brief Return path to the global (system) directory where game files can be placed.
-     */
-    std::filesystem::path getGlobalDataPath() const;
-
-    /**
-     * \brief
-     */
-    std::filesystem::path getCachePath() const;
-
-    std::filesystem::path getInstallPath() const;
-};
+    struct AndroidPath
+    {
+        AndroidPath(const std::string& application_name);
+
+        /**
+         * \brief Return path to the user directory.
+         */
+        std::filesystem::path getUserConfigPath() const;
+
+        std::filesystem::path getUserDataPath() const;
+
+        /**
+         * \brief Return path to the global (system) directory where config files can be placed.
+         */
+        std::filesystem::path getGlobalConfigPath() const;
+
+        /**
+         * \brief Return path to the runtime configuration directory which is the
+         * place where an application was started.
+         */
+        std::filesystem::path getLocalPath() const;
+
+        /**
+         * \brief Return path to the global (system) directory where game files can be placed.
+         */
+        std::filesystem::path getGlobalDataPath() const;
+
+        /**
+         * \brief
+         */
+        std::filesystem::path getCachePath() const;
+
+        std::filesystem::path getInstallPath() const;
+    };
 
 } /* namespace Files */
 
diff --git a/components/files/collections.cpp b/components/files/collections.cpp
index 575beb988d..b556ab06b0 100644
--- a/components/files/collections.cpp
+++ b/components/files/collections.cpp
@@ -24,10 +24,10 @@ namespace Files
     {
         std::string ext = Misc::StringUtils::lowerCase(extension);
         auto iter = mCollections.find(ext);
-        if (iter==mCollections.end())
+        if (iter == mCollections.end())
         {
-            std::pair<MultiDirCollectionContainer::iterator, bool> result =
-                mCollections.emplace(ext, MultiDirCollection(mDirectories, ext, mFoldCase));
+            std::pair<MultiDirCollectionContainer::iterator, bool> result
+                = mCollections.emplace(ext, MultiDirCollection(mDirectories, ext, mFoldCase));
 
             iter = result.first;
         }
@@ -37,10 +37,9 @@ namespace Files
 
     std::filesystem::path Collections::getPath(const std::string& file) const
     {
-        for (const auto & mDirectorie : mDirectories)
+        for (const auto& mDirectorie : mDirectories)
         {
-            for (const auto& iter2 :
-                std::filesystem::directory_iterator (mDirectorie))
+            for (const auto& iter2 : std::filesystem::directory_iterator(mDirectorie))
             {
                 const auto& path = iter2.path();
                 const auto str = Files::pathToUnicodeString(path.filename());
@@ -55,15 +54,14 @@ namespace Files
             }
         }
 
-        throw std::runtime_error ("file " + file + " not found");
+        throw std::runtime_error("file " + file + " not found");
     }
 
     bool Collections::doesExist(const std::string& file) const
     {
-        for (const auto & mDirectorie : mDirectories)
+        for (const auto& mDirectorie : mDirectories)
         {
-            for (const auto& iter2 :
-                std::filesystem::directory_iterator (mDirectorie))
+            for (const auto& iter2 : std::filesystem::directory_iterator(mDirectorie))
             {
                 const auto& path = iter2.path();
                 const auto str = Files::pathToUnicodeString(path.filename());
diff --git a/components/files/collections.hpp b/components/files/collections.hpp
index 000160bae7..8aac182966 100644
--- a/components/files/collections.hpp
+++ b/components/files/collections.hpp
@@ -9,34 +9,34 @@ namespace Files
 {
     class Collections
     {
-        public:
-            Collections();
+    public:
+        Collections();
 
-            ///< Directories are listed with increasing priority.
-            Collections(const Files::PathContainer& directories, bool foldCase);
+        ///< Directories are listed with increasing priority.
+        Collections(const Files::PathContainer& directories, bool foldCase);
 
-            ///< Return a file collection for the given extension. Extension must contain the
-            /// leading dot and must be all lower-case.
-            const MultiDirCollection& getCollection(const std::string& extension) const;
+        ///< Return a file collection for the given extension. Extension must contain the
+        /// leading dot and must be all lower-case.
+        const MultiDirCollection& getCollection(const std::string& extension) const;
 
-            std::filesystem::path getPath(const std::string& file) const;
-            ///< Return full path (including filename) of \a file.
-            ///
-            /// If the file does not exist in any of the collection's
-            /// directories, an exception is thrown. \a file must include the
-            /// extension.
+        std::filesystem::path getPath(const std::string& file) const;
+        ///< Return full path (including filename) of \a file.
+        ///
+        /// If the file does not exist in any of the collection's
+        /// directories, an exception is thrown. \a file must include the
+        /// extension.
 
-            bool doesExist(const std::string& file) const;
-            ///< \return Does a file with the given name exist?
+        bool doesExist(const std::string& file) const;
+        ///< \return Does a file with the given name exist?
 
-            const Files::PathContainer& getPaths() const;
+        const Files::PathContainer& getPaths() const;
 
-        private:
-            typedef std::map<std::string, MultiDirCollection> MultiDirCollectionContainer;
-            Files::PathContainer mDirectories;
+    private:
+        typedef std::map<std::string, MultiDirCollection> MultiDirCollectionContainer;
+        Files::PathContainer mDirectories;
 
-            bool mFoldCase;
-            mutable MultiDirCollectionContainer mCollections;
+        bool mFoldCase;
+        mutable MultiDirCollectionContainer mCollections;
     };
 }
 
diff --git a/components/files/configfileparser.cpp b/components/files/configfileparser.cpp
index 3d8e06ebe7..2f498ef736 100644
--- a/components/files/configfileparser.cpp
+++ b/components/files/configfileparser.cpp
@@ -22,7 +22,7 @@ namespace Files
             for(; i !=e; ++i) {
                 *i;
             }
-            
+
             Syntax conventions:
 
             - config file can not contain positional options
@@ -31,10 +31,10 @@ namespace Files
             - variable assignments are in the form
             name '=' value.
             spaces around '=' are trimmed.
-            - Section names are given in brackets. 
+            - Section names are given in brackets.
 
             The actual option name is constructed by combining current section
-            name and specified option name, with dot between. If section_name 
+            name and specified option name, with dot between. If section_name
             already contains dot at the end, new dot is not inserted. For example:
             @verbatim
             [gui.accessibility]
@@ -45,20 +45,16 @@ namespace Files
 
             TODO: maybe, we should just accept a pointer to options_description
             class.
-        */ 
-        class common_config_file_iterator
-            : public boost::eof_iterator<common_config_file_iterator, bpo::option>
+        */
+        class common_config_file_iterator : public boost::eof_iterator<common_config_file_iterator, bpo::option>
         {
         public:
             common_config_file_iterator() { found_eof(); }
-            common_config_file_iterator(
-                const std::set<std::string>& allowed_options,
-                bool allow_unregistered = false);
+            common_config_file_iterator(const std::set<std::string>& allowed_options, bool allow_unregistered = false);
 
             virtual ~common_config_file_iterator() {}
 
         public: // Method required by eof_iterator
-
             void get();
 
 #if BOOST_WORKAROUND(_MSC_VER, <= 1900)
@@ -67,13 +63,15 @@ namespace Files
 #endif
 
         protected: // Stubs for derived classes
-
             // Obtains next line from the config file
             // Note: really, this design is a bit ugly
             // The most clean thing would be to pass 'line_iterator' to
             // constructor of this class, but to avoid templating this class
             // we'd need polymorphic iterator, which does not exist yet.
-            virtual bool getline(std::string&) { return false; }
+            virtual bool getline(std::string&)
+            {
+                return false;
+            }
 
         protected:
             /** Adds another allowed option. If the 'name' ends with
@@ -95,14 +93,11 @@ namespace Files
         };
 
         common_config_file_iterator::common_config_file_iterator(
-            const std::set<std::string>& allowed_options,
-            bool allow_unregistered)
-            : allowed_options(allowed_options),
-              m_allow_unregistered(allow_unregistered)
+            const std::set<std::string>& allowed_options, bool allow_unregistered)
+            : allowed_options(allowed_options)
+            , m_allow_unregistered(allow_unregistered)
         {
-            for (std::set<std::string>::const_iterator i = allowed_options.begin();
-                i != allowed_options.end();
-                ++i)
+            for (std::set<std::string>::const_iterator i = allowed_options.begin(); i != allowed_options.end(); ++i)
             {
                 add_option(i->c_str());
             }
@@ -112,7 +107,8 @@ namespace Files
         {
             std::string s(name);
             assert(!s.empty());
-            if (*s.rbegin() == '*') {
+            if (*s.rbegin() == '*')
+            {
                 s.resize(s.size() - 1);
                 bool bad_prefixes(false);
                 // If 's' is a prefix of one of allowed suffix, then
@@ -120,19 +116,22 @@ namespace Files
                 // If some element is prefix of 's', then lower_bound will
                 // return the next element.
                 std::set<std::string>::iterator i = allowed_prefixes.lower_bound(s);
-                if (i != allowed_prefixes.end()) {
+                if (i != allowed_prefixes.end())
+                {
                     if (i->find(s) == 0)
                         bad_prefixes = true;
                 }
-                if (i != allowed_prefixes.begin()) {
+                if (i != allowed_prefixes.begin())
+                {
                     --i;
                     if (s.find(*i) == 0)
                         bad_prefixes = true;
                 }
                 if (bad_prefixes)
-                    boost::throw_exception(bpo::error("options '" + std::string(name) + "' and '" +
-                                                      *i + "*' will both match the same "
-                                                      "arguments from the configuration file"));
+                    boost::throw_exception(
+                        bpo::error("options '" + std::string(name) + "' and '" + *i
+                            + "*' will both match the same "
+                              "arguments from the configuration file"));
                 allowed_prefixes.insert(s);
             }
         }
@@ -143,7 +142,8 @@ namespace Files
             n = s.find_first_not_of(" \t\r\n");
             if (n == std::string::npos)
                 return std::string();
-            else {
+            else
+            {
                 n2 = s.find_last_not_of(" \t\r\n");
                 return s.substr(n, n2 - n + 1);
             }
@@ -155,21 +155,25 @@ namespace Files
             std::string::size_type n;
             bool found = false;
 
-            while (this->getline(s)) {
+            while (this->getline(s))
+            {
 
                 // strip '#' comments and whitespace
                 if (s.find('#') == s.find_first_not_of(" \t\r\n"))
                     continue;
                 s = trim_ws(s);
 
-                if (!s.empty()) {
+                if (!s.empty())
+                {
                     // Handle section name
-                    if (*s.begin() == '[' && *s.rbegin() == ']') {
+                    if (*s.begin() == '[' && *s.rbegin() == ']')
+                    {
                         m_prefix = s.substr(1, s.size() - 2);
                         if (*m_prefix.rbegin() != '.')
                             m_prefix += '.';
                     }
-                    else if ((n = s.find('=')) != std::string::npos) {
+                    else if ((n = s.find('=')) != std::string::npos)
+                    {
 
                         std::string name = m_prefix + trim_ws(s.substr(0, n));
                         std::string value = trim_ws(s.substr(n + 1));
@@ -187,9 +191,11 @@ namespace Files
                         this->value().original_tokens.push_back(name);
                         this->value().original_tokens.push_back(value);
                         break;
-
-                    } else {
-                        boost::throw_exception(bpo::invalid_config_file_syntax(s, bpo::invalid_syntax::unrecognized_line));
+                    }
+                    else
+                    {
+                        boost::throw_exception(
+                            bpo::invalid_config_file_syntax(s, bpo::invalid_syntax::unrecognized_line));
                     }
                 }
             }
@@ -203,7 +209,7 @@ namespace Files
             if (i != allowed_options.end())
                 return true;
             // If s is "pa" where "p" is allowed prefix then
-            // lower_bound should find the element after "p". 
+            // lower_bound should find the element after "p".
             // This depends on 'allowed_prefixes' invariant.
             i = allowed_prefixes.lower_bound(s);
             if (i != allowed_prefixes.begin() && s.find(*--i) == 0)
@@ -211,63 +217,56 @@ namespace Files
             return false;
         }
 
-
-
-        template<class charT>
-        class basic_config_file_iterator : public Files::common_config_file_iterator {
+        template <class charT>
+        class basic_config_file_iterator : public Files::common_config_file_iterator
+        {
         public:
-            basic_config_file_iterator()
-            {
-                found_eof();
-            }
+            basic_config_file_iterator() { found_eof(); }
 
-            /** Creates a config file parser for the specified stream.            
-            */
-            basic_config_file_iterator(std::basic_istream<charT>& is, 
-                                       const std::set<std::string>& allowed_options,
-                                       bool allow_unregistered = false); 
+            /** Creates a config file parser for the specified stream.
+             */
+            basic_config_file_iterator(std::basic_istream<charT>& is, const std::set<std::string>& allowed_options,
+                bool allow_unregistered = false);
 
         private: // base overrides
-
             bool getline(std::string&);
 
         private: // internal data
-            std::shared_ptr<std::basic_istream<charT> > is;
+            std::shared_ptr<std::basic_istream<charT>> is;
         };
 
-        template<class charT>
-        basic_config_file_iterator<charT>::
-        basic_config_file_iterator(std::basic_istream<charT>& is, 
-                                   const std::set<std::string>& allowed_options,
-                                   bool allow_unregistered)
-        : common_config_file_iterator(allowed_options, allow_unregistered)
+        template <class charT>
+        basic_config_file_iterator<charT>::basic_config_file_iterator(
+            std::basic_istream<charT>& is, const std::set<std::string>& allowed_options, bool allow_unregistered)
+            : common_config_file_iterator(allowed_options, allow_unregistered)
         {
-            this->is.reset(&is, bpo::detail::null_deleter());                 
+            this->is.reset(&is, bpo::detail::null_deleter());
             get();
         }
 
-        template<class charT>
+        template <class charT>
         bool basic_config_file_iterator<charT>::getline(std::string& s)
         {
             std::basic_string<charT> in;
-            if (std::getline(*is, in)) {
+            if (std::getline(*is, in))
+            {
                 s = bpo::to_internal(in);
                 return true;
-            } else {
+            }
+            else
+            {
                 return false;
             }
         }
     }
 
-    template<class charT>
-    bpo::basic_parsed_options<charT>
-    parse_config_file(std::basic_istream<charT>& is, 
-                      const bpo::options_description& desc,
-                      bool allow_unregistered)
-    {    
+    template <class charT>
+    bpo::basic_parsed_options<charT> parse_config_file(
+        std::basic_istream<charT>& is, const bpo::options_description& desc, bool allow_unregistered)
+    {
         std::set<std::string> allowed_options;
 
-        const std::vector<boost::shared_ptr<bpo::option_description> >& options = desc.options();
+        const std::vector<boost::shared_ptr<bpo::option_description>>& options = desc.options();
         for (unsigned i = 0; i < options.size(); ++i)
         {
             const bpo::option_description& d = *options[i];
@@ -280,18 +279,13 @@ namespace Files
         }
 
         // Parser return char strings
-        bpo::parsed_options result(&desc);        
-        copy(basic_config_file_iterator<charT>(
-                 is, allowed_options, allow_unregistered), 
-             basic_config_file_iterator<charT>(), 
-             back_inserter(result.options));
+        bpo::parsed_options result(&desc);
+        copy(basic_config_file_iterator<charT>(is, allowed_options, allow_unregistered),
+            basic_config_file_iterator<charT>(), back_inserter(result.options));
         // Convert char strings into desired type.
         return bpo::basic_parsed_options<charT>(result);
     }
 
-    template
-    bpo::basic_parsed_options<char>
-    parse_config_file(std::basic_istream<char>& is, 
-                      const bpo::options_description& desc,
-                      bool allow_unregistered);
+    template bpo::basic_parsed_options<char> parse_config_file(
+        std::basic_istream<char>& is, const bpo::options_description& desc, bool allow_unregistered);
 }
diff --git a/components/files/configfileparser.hpp b/components/files/configfileparser.hpp
index 60ab27a6d4..72a4370d8b 100644
--- a/components/files/configfileparser.hpp
+++ b/components/files/configfileparser.hpp
@@ -6,11 +6,11 @@
 namespace Files
 {
 
-namespace bpo = boost::program_options;
+    namespace bpo = boost::program_options;
 
-template<class charT>
-bpo::basic_parsed_options<charT> parse_config_file(std::basic_istream<charT>&, const bpo::options_description&,
-                                                   bool allow_unregistered = false);
+    template <class charT>
+    bpo::basic_parsed_options<charT> parse_config_file(
+        std::basic_istream<charT>&, const bpo::options_description&, bool allow_unregistered = false);
 
 }
 
diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index fa600c6e38..19a25dc702 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -3,12 +3,12 @@
 #include <fstream>
 
 #include <components/debug/debuglog.hpp>
-#include <components/files/configfileparser.hpp>
 #include <components/fallback/validate.hpp>
+#include <components/files/configfileparser.hpp>
 #include <components/misc/strings/conversion.hpp>
 
-#include <boost/program_options/variables_map.hpp>
 #include <boost/program_options/options_description.hpp>
+#include <boost/program_options/variables_map.hpp>
 
 /**
  * \namespace Files
@@ -16,449 +16,465 @@
 namespace Files
 {
 
-namespace bpo = boost::program_options;
+    namespace bpo = boost::program_options;
 
-static const char* const openmwCfgFile = "openmw.cfg";
+    static const char* const openmwCfgFile = "openmw.cfg";
 
 #if defined(_WIN32) || defined(__WINDOWS__)
-static const char* const applicationName = "OpenMW";
+    static const char* const applicationName = "OpenMW";
 #else
-static const char* const applicationName = "openmw";
+    static const char* const applicationName = "openmw";
 #endif
 
-static constexpr auto localToken = u8"?local?";
-static constexpr auto userConfigToken = u8"?userconfig?";
-static constexpr auto userDataToken = u8"?userdata?";
-static constexpr auto globalToken = u8"?global?";
-
-ConfigurationManager::ConfigurationManager(bool silent)
-    : mFixedPath(applicationName)
-    , mSilent(silent)
-{
-    setupTokensMapping();
-
-    // Initialize with fixed paths, will be overridden in `readConfiguration`.
-    mUserDataPath = mFixedPath.getUserDataPath();
-    mScreenshotPath = mFixedPath.getUserDataPath() / "screenshots";
-}
-
-ConfigurationManager::~ConfigurationManager()
-{
-}
-
-void ConfigurationManager::setupTokensMapping()
-{
-    mTokensMapping.insert(std::make_pair(localToken, &FixedPath<>::getLocalPath));
-    mTokensMapping.insert(std::make_pair(userConfigToken, &FixedPath<>::getUserConfigPath));
-    mTokensMapping.insert(std::make_pair(userDataToken, &FixedPath<>::getUserDataPath));
-    mTokensMapping.insert(std::make_pair(globalToken, &FixedPath<>::getGlobalDataPath));
-}
+    static constexpr auto localToken = u8"?local?";
+    static constexpr auto userConfigToken = u8"?userconfig?";
+    static constexpr auto userDataToken = u8"?userdata?";
+    static constexpr auto globalToken = u8"?global?";
 
-static bool hasReplaceConfig(const bpo::variables_map& variables)
-{
-    if (variables["replace"].empty())
-        return false;
-    for (const std::string& var : variables["replace"].as<std::vector<std::string>>())
+    ConfigurationManager::ConfigurationManager(bool silent)
+        : mFixedPath(applicationName)
+        , mSilent(silent)
     {
-        if (var == "config")
-            return true;
+        setupTokensMapping();
+
+        // Initialize with fixed paths, will be overridden in `readConfiguration`.
+        mUserDataPath = mFixedPath.getUserDataPath();
+        mScreenshotPath = mFixedPath.getUserDataPath() / "screenshots";
     }
-    return false;
-}
 
-void ConfigurationManager::readConfiguration(bpo::variables_map& variables,
-                                             const bpo::options_description& description, bool quiet)
-{
-    bool silent = mSilent;
-    mSilent = quiet;
+    ConfigurationManager::~ConfigurationManager() {}
 
-    std::optional<bpo::variables_map> config = loadConfig(mFixedPath.getLocalPath(), description);
-    if (config)
-        mActiveConfigPaths.push_back(mFixedPath.getLocalPath());
-    else
+    void ConfigurationManager::setupTokensMapping()
     {
-        mActiveConfigPaths.push_back(mFixedPath.getGlobalConfigPath());
-        config = loadConfig(mFixedPath.getGlobalConfigPath(), description);
+        mTokensMapping.insert(std::make_pair(localToken, &FixedPath<>::getLocalPath));
+        mTokensMapping.insert(std::make_pair(userConfigToken, &FixedPath<>::getUserConfigPath));
+        mTokensMapping.insert(std::make_pair(userDataToken, &FixedPath<>::getUserDataPath));
+        mTokensMapping.insert(std::make_pair(globalToken, &FixedPath<>::getGlobalDataPath));
     }
-    if (!config)
+
+    static bool hasReplaceConfig(const bpo::variables_map& variables)
     {
-        if (!quiet)
-            Log(Debug::Error) << "Neither local config nor global config are available.";
-        mSilent = silent;
-        return;
+        if (variables["replace"].empty())
+            return false;
+        for (const std::string& var : variables["replace"].as<std::vector<std::string>>())
+        {
+            if (var == "config")
+                return true;
+        }
+        return false;
     }
 
-    std::stack<std::filesystem::path> extraConfigDirs;
-    addExtraConfigDirs(extraConfigDirs, variables);
-    if (!hasReplaceConfig(variables))
-        addExtraConfigDirs(extraConfigDirs, *config);
-
-    std::vector<bpo::variables_map> parsedConfigs{*std::move(config)};
-    std::set<std::filesystem::path> alreadyParsedPaths;  // needed to prevent infinite loop in case of a circular link
-    alreadyParsedPaths.insert(mActiveConfigPaths.front());
-
-    while (!extraConfigDirs.empty())
+    void ConfigurationManager::readConfiguration(
+        bpo::variables_map& variables, const bpo::options_description& description, bool quiet)
     {
-        auto path = extraConfigDirs.top();
-        extraConfigDirs.pop();
-        if (alreadyParsedPaths.count(path) > 0)
+        bool silent = mSilent;
+        mSilent = quiet;
+
+        std::optional<bpo::variables_map> config = loadConfig(mFixedPath.getLocalPath(), description);
+        if (config)
+            mActiveConfigPaths.push_back(mFixedPath.getLocalPath());
+        else
+        {
+            mActiveConfigPaths.push_back(mFixedPath.getGlobalConfigPath());
+            config = loadConfig(mFixedPath.getGlobalConfigPath(), description);
+        }
+        if (!config)
         {
             if (!quiet)
-                Log(Debug::Warning) << "Repeated config dir: " << path;
-            continue;
+                Log(Debug::Error) << "Neither local config nor global config are available.";
+            mSilent = silent;
+            return;
         }
-        alreadyParsedPaths.insert(path);
-        config = loadConfig(path, description);
-        if (config && hasReplaceConfig(*config) && parsedConfigs.size() > 1)
+
+        std::stack<std::filesystem::path> extraConfigDirs;
+        addExtraConfigDirs(extraConfigDirs, variables);
+        if (!hasReplaceConfig(variables))
+            addExtraConfigDirs(extraConfigDirs, *config);
+
+        std::vector<bpo::variables_map> parsedConfigs{ *std::move(config) };
+        std::set<std::filesystem::path>
+            alreadyParsedPaths; // needed to prevent infinite loop in case of a circular link
+        alreadyParsedPaths.insert(mActiveConfigPaths.front());
+
+        while (!extraConfigDirs.empty())
         {
-            mActiveConfigPaths.resize(1);
-            parsedConfigs.resize(1);
-            Log(Debug::Info) << "Skipping previous configs except " << (mActiveConfigPaths.front() / "openmw.cfg") <<
-                " due to replace=config in " << (path / "openmw.cfg");
+            auto path = extraConfigDirs.top();
+            extraConfigDirs.pop();
+            if (alreadyParsedPaths.count(path) > 0)
+            {
+                if (!quiet)
+                    Log(Debug::Warning) << "Repeated config dir: " << path;
+                continue;
+            }
+            alreadyParsedPaths.insert(path);
+            config = loadConfig(path, description);
+            if (config && hasReplaceConfig(*config) && parsedConfigs.size() > 1)
+            {
+                mActiveConfigPaths.resize(1);
+                parsedConfigs.resize(1);
+                Log(Debug::Info) << "Skipping previous configs except " << (mActiveConfigPaths.front() / "openmw.cfg")
+                                 << " due to replace=config in " << (path / "openmw.cfg");
+            }
+            mActiveConfigPaths.emplace_back(std::move(path));
+            if (config)
+            {
+                addExtraConfigDirs(extraConfigDirs, *config);
+                parsedConfigs.push_back(*std::move(config));
+            }
         }
-        mActiveConfigPaths.emplace_back(std::move(path));
-        if (config)
+
+        for (auto it = parsedConfigs.rbegin(); it != parsedConfigs.rend(); ++it)
         {
-            addExtraConfigDirs(extraConfigDirs, *config);
-            parsedConfigs.push_back(*std::move(config));
+            auto composingVariables = separateComposingVariables(variables, description);
+            for (auto& [k, v] : *it)
+            {
+                auto variable = variables.find(k);
+                if (variable == variables.end())
+                    variables.insert({ k, v });
+                else if (variable->second.defaulted())
+                    variable->second = v;
+            }
+            mergeComposingVariables(variables, composingVariables, description);
         }
-    }
 
-    for (auto it = parsedConfigs.rbegin(); it != parsedConfigs.rend(); ++it)
-    {
-        auto composingVariables = separateComposingVariables(variables, description);
-        for (auto& [k, v] : *it)
+        mUserDataPath = variables["user-data"]
+                            .as<Files::MaybeQuotedPath>()
+                            .u8string(); // This call to u8string is redundant, but required to build on MSVC 14.26 due
+                                         // to implementation bugs.
+        if (mUserDataPath.empty())
         {
-            auto variable = variables.find(k);
-            if (variable == variables.end())
-                variables.insert({k, v});
-            else if (variable->second.defaulted())
-                variable->second = v;
+            if (!quiet)
+                Log(Debug::Warning) << "Error: `user-data` is not specified";
+            mUserDataPath = mFixedPath.getUserDataPath();
         }
-        mergeComposingVariables(variables, composingVariables, description);
-    }
+        mScreenshotPath = mUserDataPath / "screenshots";
 
-    mUserDataPath = variables["user-data"].as<Files::MaybeQuotedPath>().u8string(); // This call to u8string is redundant, but required to build on MSVC 14.26 due to implementation bugs.
-    if (mUserDataPath.empty())
-    {
-        if (!quiet)
-            Log(Debug::Warning) << "Error: `user-data` is not specified";
-        mUserDataPath = mFixedPath.getUserDataPath();
-    }
-    mScreenshotPath = mUserDataPath / "screenshots";
+        std::filesystem::create_directories(getUserConfigPath());
+        std::filesystem::create_directories(mScreenshotPath);
 
-    std::filesystem::create_directories(getUserConfigPath());
-    std::filesystem::create_directories(mScreenshotPath);
+        // probably not necessary but validate the creation of the screenshots directory and fallback to the original
+        // behavior if it fails
+        if (!std::filesystem::is_directory(mScreenshotPath))
+            mScreenshotPath = mUserDataPath;
 
-    // probably not necessary but validate the creation of the screenshots directory and fallback to the original behavior if it fails
-    if (!std::filesystem::is_directory(mScreenshotPath))
-        mScreenshotPath = mUserDataPath;
+        if (!quiet)
+        {
+            Log(Debug::Info) << "Logs dir: " << getUserConfigPath();
+            Log(Debug::Info) << "User data dir: " << mUserDataPath;
+            Log(Debug::Info) << "Screenshots dir: " << mScreenshotPath;
+        }
 
-    if (!quiet)
-    {
-        Log(Debug::Info) << "Logs dir: " << getUserConfigPath();
-        Log(Debug::Info) << "User data dir: " << mUserDataPath;
-        Log(Debug::Info) << "Screenshots dir: " << mScreenshotPath;
+        mSilent = silent;
     }
 
-    mSilent = silent;
-}
-
-void ConfigurationManager::addExtraConfigDirs(std::stack<std::filesystem::path>& dirs,
-                                              const bpo::variables_map& variables) const
-{
-    auto configIt = variables.find("config");
-    if (configIt == variables.end())
-        return;
-    Files::PathContainer newDirs = asPathContainer(configIt->second.as<Files::MaybeQuotedPathContainer>());
-    for (auto it = newDirs.rbegin(); it != newDirs.rend(); ++it)
-        dirs.push(*it);
-}
-
-void ConfigurationManager::addCommonOptions(bpo::options_description& description)
-{
-    auto addOption = description.add_options();
-    addOption("config", bpo::value<Files::MaybeQuotedPathContainer>()->default_value(Files::MaybeQuotedPathContainer(), "")
-            ->multitoken()->composing(), "additional config directories");
-    addOption("replace", bpo::value<std::vector<std::string>>()->default_value(std::vector<std::string>(), "")->multitoken()->composing(),
-            "settings where the values from the current source should replace those from lower-priority sources instead of being appended");
-    addOption("user-data", bpo::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), ""),
-            "set user data directory (used for saves, screenshots, etc)");
-}
+    void ConfigurationManager::addExtraConfigDirs(
+        std::stack<std::filesystem::path>& dirs, const bpo::variables_map& variables) const
+    {
+        auto configIt = variables.find("config");
+        if (configIt == variables.end())
+            return;
+        Files::PathContainer newDirs = asPathContainer(configIt->second.as<Files::MaybeQuotedPathContainer>());
+        for (auto it = newDirs.rbegin(); it != newDirs.rend(); ++it)
+            dirs.push(*it);
+    }
 
-bpo::variables_map separateComposingVariables(bpo::variables_map & variables, const bpo::options_description& description)
-{
-    bpo::variables_map composingVariables;
-    for (auto itr = variables.begin(); itr != variables.end();)
+    void ConfigurationManager::addCommonOptions(bpo::options_description& description)
     {
-        if (description.find(itr->first, false).semantic()->is_composing())
-        {
-            composingVariables.emplace(*itr);
-            itr = variables.erase(itr);
-        }
-        else
-            ++itr;
+        auto addOption = description.add_options();
+        addOption("config",
+            bpo::value<Files::MaybeQuotedPathContainer>()
+                ->default_value(Files::MaybeQuotedPathContainer(), "")
+                ->multitoken()
+                ->composing(),
+            "additional config directories");
+        addOption("replace",
+            bpo::value<std::vector<std::string>>()
+                ->default_value(std::vector<std::string>(), "")
+                ->multitoken()
+                ->composing(),
+            "settings where the values from the current source should replace those from lower-priority sources "
+            "instead of being appended");
+        addOption("user-data", bpo::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), ""),
+            "set user data directory (used for saves, screenshots, etc)");
     }
-    return composingVariables;
-}
 
-void mergeComposingVariables(bpo::variables_map& first, bpo::variables_map& second,
-    const bpo::options_description& description)
-{
-    // There are a few places this assumes all variables are present in second, but it's never crashed in the wild, so it looks like that's guaranteed.
-    std::set<std::string> replacedVariables;
-    if (description.find_nothrow("replace", false))
+    bpo::variables_map separateComposingVariables(
+        bpo::variables_map& variables, const bpo::options_description& description)
     {
-        auto replace = second["replace"];
-        if (!replace.defaulted() && !replace.empty())
+        bpo::variables_map composingVariables;
+        for (auto itr = variables.begin(); itr != variables.end();)
         {
-            std::vector<std::string> replaceVector = replace.as<std::vector<std::string>>();
-            replacedVariables.insert(replaceVector.begin(), replaceVector.end());
+            if (description.find(itr->first, false).semantic()->is_composing())
+            {
+                composingVariables.emplace(*itr);
+                itr = variables.erase(itr);
+            }
+            else
+                ++itr;
         }
+        return composingVariables;
     }
-    for (const auto& option : description.options())
+
+    void mergeComposingVariables(
+        bpo::variables_map& first, bpo::variables_map& second, const bpo::options_description& description)
     {
-        if (option->semantic()->is_composing())
+        // There are a few places this assumes all variables are present in second, but it's never crashed in the wild,
+        // so it looks like that's guaranteed.
+        std::set<std::string> replacedVariables;
+        if (description.find_nothrow("replace", false))
         {
-            std::string name = option->canonical_display_name();
-
-            auto firstPosition = first.find(name);
-            if (firstPosition == first.end())
+            auto replace = second["replace"];
+            if (!replace.defaulted() && !replace.empty())
             {
-                first.emplace(name, second[name]);
-                continue;
+                std::vector<std::string> replaceVector = replace.as<std::vector<std::string>>();
+                replacedVariables.insert(replaceVector.begin(), replaceVector.end());
             }
-
-            if (replacedVariables.count(name) || firstPosition->second.defaulted() || firstPosition->second.empty())
+        }
+        for (const auto& option : description.options())
+        {
+            if (option->semantic()->is_composing())
             {
-                firstPosition->second = second[name];
-                continue;
+                std::string name = option->canonical_display_name();
+
+                auto firstPosition = first.find(name);
+                if (firstPosition == first.end())
+                {
+                    first.emplace(name, second[name]);
+                    continue;
+                }
+
+                if (replacedVariables.count(name) || firstPosition->second.defaulted() || firstPosition->second.empty())
+                {
+                    firstPosition->second = second[name];
+                    continue;
+                }
+
+                if (second[name].defaulted() || second[name].empty())
+                    continue;
+
+                boost::any& firstValue = firstPosition->second.value();
+                const boost::any& secondValue = second[name].value();
+
+                if (firstValue.type() == typeid(Files::MaybeQuotedPathContainer))
+                {
+                    auto& firstPathContainer = boost::any_cast<Files::MaybeQuotedPathContainer&>(firstValue);
+                    const auto& secondPathContainer
+                        = boost::any_cast<const Files::MaybeQuotedPathContainer&>(secondValue);
+                    firstPathContainer.insert(
+                        firstPathContainer.end(), secondPathContainer.begin(), secondPathContainer.end());
+                }
+                else if (firstValue.type() == typeid(std::vector<std::string>))
+                {
+                    auto& firstVector = boost::any_cast<std::vector<std::string>&>(firstValue);
+                    const auto& secondVector = boost::any_cast<const std::vector<std::string>&>(secondValue);
+
+                    firstVector.insert(firstVector.end(), secondVector.begin(), secondVector.end());
+                }
+                else if (firstValue.type() == typeid(Fallback::FallbackMap))
+                {
+                    auto& firstMap = boost::any_cast<Fallback::FallbackMap&>(firstValue);
+                    const auto& secondMap = boost::any_cast<const Fallback::FallbackMap&>(secondValue);
+
+                    std::map<std::string, std::string> tempMap(secondMap.mMap);
+                    tempMap.merge(firstMap.mMap);
+                    firstMap.mMap.swap(tempMap);
+                }
+                else
+                    Log(Debug::Error)
+                        << "Unexpected composing variable type. Curse boost and their blasted arcane templates.";
             }
+        }
+    }
 
-            if (second[name].defaulted() || second[name].empty())
-                continue;
+    void ConfigurationManager::processPath(std::filesystem::path& path, const std::filesystem::path& basePath) const
+    {
+        const auto str = path.u8string();
 
-            boost::any& firstValue = firstPosition->second.value();
-            const boost::any& secondValue = second[name].value();
+        if (str.empty() || str[0] != u8'?')
+        {
+            if (!path.is_absolute())
+                path = basePath / path;
+            return;
+        }
 
-            if (firstValue.type() == typeid(Files::MaybeQuotedPathContainer))
-            {
-                auto& firstPathContainer = boost::any_cast<Files::MaybeQuotedPathContainer&>(firstValue);
-                const auto& secondPathContainer = boost::any_cast<const Files::MaybeQuotedPathContainer&>(secondValue);
-                firstPathContainer.insert(firstPathContainer.end(), secondPathContainer.begin(), secondPathContainer.end());
-            }
-            else if (firstValue.type() == typeid(std::vector<std::string>))
+        const auto pos = str.find('?', 1);
+        if (pos != std::u8string::npos && pos != 0)
+        {
+            auto tokenIt = mTokensMapping.find(str.substr(0, pos + 1));
+            if (tokenIt != mTokensMapping.end())
             {
-                auto& firstVector = boost::any_cast<std::vector<std::string>&>(firstValue);
-                const auto& secondVector = boost::any_cast<const std::vector<std::string>&>(secondValue);
-
-                firstVector.insert(firstVector.end(), secondVector.begin(), secondVector.end());
+                auto tempPath(((mFixedPath).*(tokenIt->second))());
+                if (pos < str.length() - 1)
+                {
+                    // There is something after the token, so we should
+                    // append it to the path
+                    tempPath /= str.substr(pos + 1, str.length() - pos);
+                }
+
+                path = tempPath;
             }
-            else if (firstValue.type() == typeid(Fallback::FallbackMap))
+            else
             {
-                auto& firstMap = boost::any_cast<Fallback::FallbackMap&>(firstValue);
-                const auto& secondMap = boost::any_cast<const Fallback::FallbackMap&>(secondValue);
-
-                std::map<std::string, std::string> tempMap(secondMap.mMap);
-                tempMap.merge(firstMap.mMap);
-                firstMap.mMap.swap(tempMap);
+                if (!mSilent)
+                    Log(Debug::Warning) << "Path starts with unknown token: " << path;
+                path.clear();
             }
-            else
-                Log(Debug::Error) << "Unexpected composing variable type. Curse boost and their blasted arcane templates.";
         }
     }
-}
 
-void ConfigurationManager::processPath(std::filesystem::path& path, const std::filesystem::path& basePath) const
-{
-    const auto str = path.u8string();
-
-    if (str.empty() || str[0] != u8'?')
+    void ConfigurationManager::processPaths(Files::PathContainer& dataDirs, const std::filesystem::path& basePath) const
     {
-        if (!path.is_absolute())
-            path = basePath / path;
-        return;
+        for (auto& path : dataDirs)
+            processPath(path, basePath);
     }
 
-    const auto pos = str.find('?', 1);
-    if (pos != std::u8string::npos && pos != 0)
+    void ConfigurationManager::processPaths(
+        boost::program_options::variables_map& variables, const std::filesystem::path& basePath) const
     {
-        auto tokenIt = mTokensMapping.find(str.substr(0, pos + 1));
-        if (tokenIt != mTokensMapping.end())
+        for (auto& [name, var] : variables)
         {
-            auto tempPath(((mFixedPath).*(tokenIt->second))());
-            if (pos < str.length() - 1)
+            if (var.defaulted())
+                continue;
+            if (var.value().type() == typeid(MaybeQuotedPathContainer))
             {
-                // There is something after the token, so we should
-                // append it to the path
-                tempPath /= str.substr(pos + 1, str.length() - pos);
+                auto& pathContainer = boost::any_cast<MaybeQuotedPathContainer&>(var.value());
+                for (MaybeQuotedPath& path : pathContainer)
+                    processPath(path, basePath);
+            }
+            else if (var.value().type() == typeid(MaybeQuotedPath))
+            {
+                std::filesystem::path& path = boost::any_cast<Files::MaybeQuotedPath&>(var.value());
+                processPath(path, basePath);
             }
-
-            path = tempPath;
-        }
-        else
-        {
-            if (!mSilent)
-                Log(Debug::Warning) << "Path starts with unknown token: " << path;
-            path.clear();
         }
     }
-}
 
-void ConfigurationManager::processPaths(Files::PathContainer& dataDirs, const std::filesystem::path& basePath) const
-{
-    for (auto& path : dataDirs)
-        processPath(path, basePath);
-}
-
-void ConfigurationManager::processPaths(boost::program_options::variables_map& variables, const std::filesystem::path& basePath) const
-{
-    for (auto& [name, var] : variables)
+    void ConfigurationManager::filterOutNonExistingPaths(Files::PathContainer& dataDirs) const
     {
-        if (var.defaulted())
-            continue;
-        if (var.value().type() == typeid(MaybeQuotedPathContainer))
-        {
-            auto& pathContainer = boost::any_cast<MaybeQuotedPathContainer&>(var.value());
-            for (MaybeQuotedPath& path : pathContainer)
-                processPath(path, basePath);
-        }
-        else if (var.value().type() == typeid(MaybeQuotedPath))
-        {
-            std::filesystem::path& path = boost::any_cast<Files::MaybeQuotedPath&>(var.value());
-            processPath(path, basePath);
-        }
+        dataDirs.erase(std::remove_if(dataDirs.begin(), dataDirs.end(),
+                           [this](const std::filesystem::path& p) {
+                               bool exists = std::filesystem::is_directory(p);
+                               if (!exists && !mSilent)
+                                   Log(Debug::Warning) << "No such dir: " << p;
+                               return !exists;
+                           }),
+            dataDirs.end());
     }
-}
 
-void ConfigurationManager::filterOutNonExistingPaths(Files::PathContainer& dataDirs) const
-{
-    dataDirs.erase(std::remove_if(dataDirs.begin(), dataDirs.end(),
-        [this](const std::filesystem::path& p)
-        {
-            bool exists = std::filesystem::is_directory(p);
-            if (!exists && !mSilent)
-                Log(Debug::Warning) << "No such dir: " << p;
-            return !exists;
-        }),
-        dataDirs.end());
-}
-
-std::optional<bpo::variables_map> ConfigurationManager::loadConfig(
-    const std::filesystem::path& path, const bpo::options_description& description) const
-{
-    std::filesystem::path cfgFile(path);
-    cfgFile /= openmwCfgFile;
-    if (std::filesystem::is_regular_file(cfgFile))
+    std::optional<bpo::variables_map> ConfigurationManager::loadConfig(
+        const std::filesystem::path& path, const bpo::options_description& description) const
     {
-        if (!mSilent)
-            Log(Debug::Info) << "Loading config file: " << cfgFile;
+        std::filesystem::path cfgFile(path);
+        cfgFile /= openmwCfgFile;
+        if (std::filesystem::is_regular_file(cfgFile))
+        {
+            if (!mSilent)
+                Log(Debug::Info) << "Loading config file: " << cfgFile;
 
-        std::ifstream configFileStream(cfgFile);
+            std::ifstream configFileStream(cfgFile);
 
-        if (configFileStream.is_open())
-        {
-            bpo::variables_map variables;
-            bpo::store(Files::parse_config_file(configFileStream, description, true), variables);
-            processPaths(variables, path);
-            return variables;
+            if (configFileStream.is_open())
+            {
+                bpo::variables_map variables;
+                bpo::store(Files::parse_config_file(configFileStream, description, true), variables);
+                processPaths(variables, path);
+                return variables;
+            }
+            else if (!mSilent)
+                Log(Debug::Error) << "Loading failed.";
         }
-        else if (!mSilent)
-            Log(Debug::Error) << "Loading failed.";
+        return std::nullopt;
     }
-    return std::nullopt;
-}
 
-const std::filesystem::path& ConfigurationManager::getGlobalPath() const
-{
-    return mFixedPath.getGlobalConfigPath();
-}
+    const std::filesystem::path& ConfigurationManager::getGlobalPath() const
+    {
+        return mFixedPath.getGlobalConfigPath();
+    }
 
-const std::filesystem::path& ConfigurationManager::getUserConfigPath() const
-{
-    if (mActiveConfigPaths.empty())
-        return mFixedPath.getUserConfigPath();
-    else
-        return mActiveConfigPaths.back();
-}
+    const std::filesystem::path& ConfigurationManager::getUserConfigPath() const
+    {
+        if (mActiveConfigPaths.empty())
+            return mFixedPath.getUserConfigPath();
+        else
+            return mActiveConfigPaths.back();
+    }
 
-const std::filesystem::path& ConfigurationManager::getUserDataPath() const
-{
-    return mUserDataPath;
-}
+    const std::filesystem::path& ConfigurationManager::getUserDataPath() const
+    {
+        return mUserDataPath;
+    }
 
-const std::filesystem::path& ConfigurationManager::getLocalPath() const
-{
-    return mFixedPath.getLocalPath();
-}
+    const std::filesystem::path& ConfigurationManager::getLocalPath() const
+    {
+        return mFixedPath.getLocalPath();
+    }
 
-const std::filesystem::path& ConfigurationManager::getGlobalDataPath() const
-{
-    return mFixedPath.getGlobalDataPath();
-}
+    const std::filesystem::path& ConfigurationManager::getGlobalDataPath() const
+    {
+        return mFixedPath.getGlobalDataPath();
+    }
 
-const std::filesystem::path& ConfigurationManager::getCachePath() const
-{
-    return mFixedPath.getCachePath();
-}
+    const std::filesystem::path& ConfigurationManager::getCachePath() const
+    {
+        return mFixedPath.getCachePath();
+    }
 
-const std::filesystem::path& ConfigurationManager::getInstallPath() const
-{
-    return mFixedPath.getInstallPath();
-}
+    const std::filesystem::path& ConfigurationManager::getInstallPath() const
+    {
+        return mFixedPath.getInstallPath();
+    }
 
-const std::filesystem::path& ConfigurationManager::getScreenshotPath() const
-{
-    return mScreenshotPath;
-}
+    const std::filesystem::path& ConfigurationManager::getScreenshotPath() const
+    {
+        return mScreenshotPath;
+    }
 
-void parseArgs(int argc, const char* const argv[], bpo::variables_map& variables,
-    const bpo::options_description& description)
-{
-    bpo::store(
-        bpo::command_line_parser(argc, argv).options(description).allow_unregistered().run(),
-        variables
-    );
-}
+    void parseArgs(
+        int argc, const char* const argv[], bpo::variables_map& variables, const bpo::options_description& description)
+    {
+        bpo::store(bpo::command_line_parser(argc, argv).options(description).allow_unregistered().run(), variables);
+    }
 
-void parseConfig(std::istream& stream, bpo::variables_map& variables, const bpo::options_description& description)
-{
-    bpo::store(Files::parse_config_file(stream, description, true), variables);
-}
+    void parseConfig(std::istream& stream, bpo::variables_map& variables, const bpo::options_description& description)
+    {
+        bpo::store(Files::parse_config_file(stream, description, true), variables);
+    }
 
-std::istream& operator>> (std::istream& istream, MaybeQuotedPath& MaybeQuotedPath)
-{
-    // If the stream starts with a double quote, read from stream using boost::filesystem::path rules, then discard anything remaining.
-    // This prevents boost::program_options getting upset that we've not consumed the whole stream.
-    // If it doesn't start with a double quote, read the whole thing verbatim
-    if (istream.peek() == '"')
+    std::istream& operator>>(std::istream& istream, MaybeQuotedPath& MaybeQuotedPath)
     {
-        std::string intermediate;
-        istream >> std::quoted(intermediate, '"', '&');
-        static_cast<std::filesystem::path&>(MaybeQuotedPath) = Misc::StringUtils::stringToU8String(intermediate);
-        if (istream && !istream.eof() && istream.peek() != EOF)
+        // If the stream starts with a double quote, read from stream using boost::filesystem::path rules, then discard
+        // anything remaining. This prevents boost::program_options getting upset that we've not consumed the whole
+        // stream. If it doesn't start with a double quote, read the whole thing verbatim
+        if (istream.peek() == '"')
         {
-            std::string remainder{std::istreambuf_iterator(istream), {}};
-            Log(Debug::Warning) << "Trailing data in path setting. Used '" << MaybeQuotedPath << "' but '" << remainder << "' remained";
+            std::string intermediate;
+            istream >> std::quoted(intermediate, '"', '&');
+            static_cast<std::filesystem::path&>(MaybeQuotedPath) = Misc::StringUtils::stringToU8String(intermediate);
+            if (istream && !istream.eof() && istream.peek() != EOF)
+            {
+                std::string remainder{ std::istreambuf_iterator(istream), {} };
+                Log(Debug::Warning) << "Trailing data in path setting. Used '" << MaybeQuotedPath << "' but '"
+                                    << remainder << "' remained";
+            }
         }
+        else
+        {
+            std::string intermediate{ std::istreambuf_iterator(istream), {} };
+            static_cast<std::filesystem::path&>(MaybeQuotedPath) = Misc::StringUtils::stringToU8String(intermediate);
+        }
+        return istream;
     }
-    else
-    {
-        std::string intermediate{std::istreambuf_iterator(istream), {}};
-        static_cast<std::filesystem::path&>(MaybeQuotedPath) = Misc::StringUtils::stringToU8String(intermediate);
-    }
-    return istream;
-}
 
-PathContainer asPathContainer(const MaybeQuotedPathContainer& MaybeQuotedPathContainer)
-{
-    PathContainer res;
-    res.reserve(MaybeQuotedPathContainer.size());
-    for (const auto & maybeQuotedPath : MaybeQuotedPathContainer)
+    PathContainer asPathContainer(const MaybeQuotedPathContainer& MaybeQuotedPathContainer)
     {
-        res.emplace_back(maybeQuotedPath.u8string()); // This call to u8string is redundant, but required to build on MSVC 14.26 due to implementation bugs.
+        PathContainer res;
+        res.reserve(MaybeQuotedPathContainer.size());
+        for (const auto& maybeQuotedPath : MaybeQuotedPathContainer)
+        {
+            res.emplace_back(maybeQuotedPath.u8string()); // This call to u8string is redundant, but required to build
+                                                          // on MSVC 14.26 due to implementation bugs.
+        }
+        return res;
     }
-    return res;
-}
 
 } /* namespace Files */
diff --git a/components/files/configurationmanager.hpp b/components/files/configurationmanager.hpp
index 7c999ebd6e..49f777b798 100644
--- a/components/files/configurationmanager.hpp
+++ b/components/files/configurationmanager.hpp
@@ -5,8 +5,8 @@
 #include <optional>
 #include <stack>
 
-#include <components/files/fixedpath.hpp>
 #include <components/files/collections.hpp>
+#include <components/files/fixedpath.hpp>
 
 namespace boost::program_options
 {
@@ -20,41 +20,42 @@ namespace boost::program_options
 namespace Files
 {
 
-/**
- * \struct ConfigurationManager
- */
-struct ConfigurationManager
-{
-    ConfigurationManager(bool silent=false); /// @param silent Emit log messages to cout?
-    virtual ~ConfigurationManager();
+    /**
+     * \struct ConfigurationManager
+     */
+    struct ConfigurationManager
+    {
+        ConfigurationManager(bool silent = false); /// @param silent Emit log messages to cout?
+        virtual ~ConfigurationManager();
 
-    void readConfiguration(boost::program_options::variables_map& variables,
-        const boost::program_options::options_description& description, bool quiet=false);
+        void readConfiguration(boost::program_options::variables_map& variables,
+            const boost::program_options::options_description& description, bool quiet = false);
 
-    void filterOutNonExistingPaths(Files::PathContainer& dataDirs) const;
+        void filterOutNonExistingPaths(Files::PathContainer& dataDirs) const;
 
-    // Replaces tokens (`?local?`, `?global?`, etc.) in paths. Adds `basePath` prefix for relative paths.
-    void processPath(std::filesystem::path& path, const std::filesystem::path& basePath) const;
-    void processPaths(Files::PathContainer& dataDirs, const std::filesystem::path& basePath) const;
-    void processPaths(boost::program_options::variables_map& variables, const std::filesystem::path& basePath) const;
+        // Replaces tokens (`?local?`, `?global?`, etc.) in paths. Adds `basePath` prefix for relative paths.
+        void processPath(std::filesystem::path& path, const std::filesystem::path& basePath) const;
+        void processPaths(Files::PathContainer& dataDirs, const std::filesystem::path& basePath) const;
+        void processPaths(
+            boost::program_options::variables_map& variables, const std::filesystem::path& basePath) const;
 
-    /**< Fixed paths */
-    const std::filesystem::path& getGlobalPath() const;
-    const std::filesystem::path& getLocalPath() const;
+        /**< Fixed paths */
+        const std::filesystem::path& getGlobalPath() const;
+        const std::filesystem::path& getLocalPath() const;
 
-    const std::filesystem::path& getGlobalDataPath() const;
-    const std::filesystem::path& getUserConfigPath() const;
-    const std::filesystem::path& getUserDataPath() const;
-    const std::filesystem::path& getLocalDataPath() const;
-    const std::filesystem::path& getInstallPath() const;
-    const std::vector<std::filesystem::path>& getActiveConfigPaths() const { return mActiveConfigPaths; }
+        const std::filesystem::path& getGlobalDataPath() const;
+        const std::filesystem::path& getUserConfigPath() const;
+        const std::filesystem::path& getUserDataPath() const;
+        const std::filesystem::path& getLocalDataPath() const;
+        const std::filesystem::path& getInstallPath() const;
+        const std::vector<std::filesystem::path>& getActiveConfigPaths() const { return mActiveConfigPaths; }
 
-    const std::filesystem::path& getCachePath() const;
+        const std::filesystem::path& getCachePath() const;
 
-    const std::filesystem::path& getLogPath() const { return getUserConfigPath(); }
-    const std::filesystem::path& getScreenshotPath() const;
+        const std::filesystem::path& getLogPath() const { return getUserConfigPath(); }
+        const std::filesystem::path& getScreenshotPath() const;
 
-    static void addCommonOptions(boost::program_options::options_description& description);
+        static void addCommonOptions(boost::program_options::options_description& description);
 
     private:
         typedef Files::FixedPath<> FixedPathType;
@@ -63,11 +64,10 @@ struct ConfigurationManager
         typedef std::map<std::u8string, path_type_f> TokensMappingContainer;
 
         std::optional<boost::program_options::variables_map> loadConfig(
-            const std::filesystem::path& path,
-            const boost::program_options::options_description& description) const;
+            const std::filesystem::path& path, const boost::program_options::options_description& description) const;
 
-        void addExtraConfigDirs(std::stack<std::filesystem::path>& dirs,
-            const boost::program_options::variables_map& variables) const;
+        void addExtraConfigDirs(
+            std::stack<std::filesystem::path>& dirs, const boost::program_options::variables_map& variables) const;
 
         void setupTokensMapping();
 
@@ -81,29 +81,29 @@ struct ConfigurationManager
         TokensMappingContainer mTokensMapping;
 
         bool mSilent;
-};
+    };
 
-boost::program_options::variables_map separateComposingVariables(boost::program_options::variables_map& variables,
-    const boost::program_options::options_description& description);
+    boost::program_options::variables_map separateComposingVariables(boost::program_options::variables_map& variables,
+        const boost::program_options::options_description& description);
 
-void mergeComposingVariables(boost::program_options::variables_map& first, boost::program_options::variables_map& second,
-    const boost::program_options::options_description& description);
+    void mergeComposingVariables(boost::program_options::variables_map& first,
+        boost::program_options::variables_map& second, const boost::program_options::options_description& description);
 
-void parseArgs(int argc, const char* const argv[], boost::program_options::variables_map& variables,
-    const boost::program_options::options_description& description);
+    void parseArgs(int argc, const char* const argv[], boost::program_options::variables_map& variables,
+        const boost::program_options::options_description& description);
 
-void parseConfig(std::istream& stream, boost::program_options::variables_map& variables,
-    const boost::program_options::options_description& description);
+    void parseConfig(std::istream& stream, boost::program_options::variables_map& variables,
+        const boost::program_options::options_description& description);
 
-class MaybeQuotedPath : public std::filesystem::path
-{
-};
+    class MaybeQuotedPath : public std::filesystem::path
+    {
+    };
 
-std::istream& operator>> (std::istream& istream, MaybeQuotedPath& MaybeQuotedPath);
+    std::istream& operator>>(std::istream& istream, MaybeQuotedPath& MaybeQuotedPath);
 
-typedef std::vector<MaybeQuotedPath> MaybeQuotedPathContainer;
+    typedef std::vector<MaybeQuotedPath> MaybeQuotedPathContainer;
 
-PathContainer asPathContainer(const MaybeQuotedPathContainer& MaybeQuotedPathContainer);
+    PathContainer asPathContainer(const MaybeQuotedPathContainer& MaybeQuotedPathContainer);
 
 } /* namespace Files */
 
diff --git a/components/files/constrainedfilestream.cpp b/components/files/constrainedfilestream.cpp
index 4ac0453139..a79a31a842 100644
--- a/components/files/constrainedfilestream.cpp
+++ b/components/files/constrainedfilestream.cpp
@@ -4,8 +4,9 @@
 
 namespace Files
 {
-    IStreamPtr openConstrainedFileStream(const std::filesystem::path &filename, std::size_t start, std::size_t length)
+    IStreamPtr openConstrainedFileStream(const std::filesystem::path& filename, std::size_t start, std::size_t length)
     {
-        return std::make_unique<ConstrainedFileStream>(std::make_unique<ConstrainedFileStreamBuf>(filename, start, length));
+        return std::make_unique<ConstrainedFileStream>(
+            std::make_unique<ConstrainedFileStreamBuf>(filename, start, length));
     }
 }
diff --git a/components/files/constrainedfilestream.hpp b/components/files/constrainedfilestream.hpp
index fd239b2832..941f0ee493 100644
--- a/components/files/constrainedfilestream.hpp
+++ b/components/files/constrainedfilestream.hpp
@@ -2,8 +2,8 @@
 #define OPENMW_CONSTRAINEDFILESTREAM_H
 
 #include "constrainedfilestreambuf.hpp"
-#include "streamwithbuffer.hpp"
 #include "istreamptr.hpp"
+#include "streamwithbuffer.hpp"
 
 #include <limits>
 #include <string>
@@ -11,11 +11,11 @@
 namespace Files
 {
 
-/// A file stream constrained to a specific region in the file, specified by the 'start' and 'length' parameters.
-using ConstrainedFileStream = StreamWithBuffer<ConstrainedFileStreamBuf>;
+    /// A file stream constrained to a specific region in the file, specified by the 'start' and 'length' parameters.
+    using ConstrainedFileStream = StreamWithBuffer<ConstrainedFileStreamBuf>;
 
-IStreamPtr openConstrainedFileStream(const std::filesystem::path &filename, std::size_t start = 0,
-    std::size_t length = std::numeric_limits<std::size_t>::max());
+    IStreamPtr openConstrainedFileStream(const std::filesystem::path& filename, std::size_t start = 0,
+        std::size_t length = std::numeric_limits<std::size_t>::max());
 
 }
 
diff --git a/components/files/constrainedfilestreambuf.cpp b/components/files/constrainedfilestreambuf.cpp
index 7c568dfe84..c3ac2d6d15 100644
--- a/components/files/constrainedfilestreambuf.cpp
+++ b/components/files/constrainedfilestreambuf.cpp
@@ -1,18 +1,19 @@
 #include "constrainedfilestreambuf.hpp"
 
 #include <algorithm>
-#include <limits>
 #include <filesystem>
+#include <limits>
 
 namespace Files
 {
     namespace File = Platform::File;
 
-    ConstrainedFileStreamBuf::ConstrainedFileStreamBuf(const std::filesystem::path& fname, std::size_t start, std::size_t length)
+    ConstrainedFileStreamBuf::ConstrainedFileStreamBuf(
+        const std::filesystem::path& fname, std::size_t start, std::size_t length)
         : mOrigin(start)
     {
         mFile = File::open(fname);
-        mSize  = length != std::numeric_limits<std::size_t>::max() ? length : File::size(mFile) - start;
+        mSize = length != std::numeric_limits<std::size_t>::max() ? length : File::size(mFile) - start;
 
         if (start != 0)
             File::seek(mFile, start);
@@ -36,7 +37,8 @@ namespace Files
         return traits_type::to_int_type(*gptr());
     }
 
-    std::streambuf::pos_type ConstrainedFileStreamBuf::seekoff(off_type offset, std::ios_base::seekdir whence, std::ios_base::openmode mode)
+    std::streambuf::pos_type ConstrainedFileStreamBuf::seekoff(
+        off_type offset, std::ios_base::seekdir whence, std::ios_base::openmode mode)
     {
         if ((mode & std::ios_base::out) || !(mode & std::ios_base::in))
             return traits_type::eof();
diff --git a/components/files/constrainedfilestreambuf.hpp b/components/files/constrainedfilestreambuf.hpp
index c18dabab4a..c3301fac65 100644
--- a/components/files/constrainedfilestreambuf.hpp
+++ b/components/files/constrainedfilestreambuf.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_CONSTRAINEDFILESTREAMBUF_H
 #define OPENMW_CONSTRAINEDFILESTREAMBUF_H
 
-#include <streambuf>
 #include <filesystem>
+#include <streambuf>
 
 #include <components/platform/file.hpp>
 
@@ -12,7 +12,7 @@ namespace Files
     class ConstrainedFileStreamBuf final : public std::streambuf
     {
     public:
-        ConstrainedFileStreamBuf(const std::filesystem::path &fname, std::size_t start, std::size_t length);
+        ConstrainedFileStreamBuf(const std::filesystem::path& fname, std::size_t start, std::size_t length);
 
         int_type underflow() final;
 
diff --git a/components/files/conversion.hpp b/components/files/conversion.hpp
index 7eb3ebf7b4..d525c482d6 100644
--- a/components/files/conversion.hpp
+++ b/components/files/conversion.hpp
@@ -3,7 +3,8 @@
 
 #include <filesystem>
 
-namespace Files {
+namespace Files
+{
     std::string pathToUnicodeString(const std::filesystem::path& path);
 
     std::string pathToUnicodeString(std::filesystem::path&& path);
@@ -15,4 +16,4 @@ namespace Files {
     std::filesystem::path pathFromUnicodeString(const char* path);
 }
 
-#endif //COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP
+#endif // COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP
diff --git a/components/files/fixedpath.hpp b/components/files/fixedpath.hpp
index 9d0f666409..76e8574fa7 100644
--- a/components/files/fixedpath.hpp
+++ b/components/files/fixedpath.hpp
@@ -1,128 +1,112 @@
 #ifndef COMPONENTS_FILES_FIXEDPATH_HPP
 #define COMPONENTS_FILES_FIXEDPATH_HPP
 
-#include <string>
 #include <filesystem>
+#include <string>
 
 #if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
 #ifndef ANDROID
-    #include <components/files/linuxpath.hpp>
-    namespace Files { typedef LinuxPath TargetPathType; }
+#include <components/files/linuxpath.hpp>
+namespace Files
+{
+    typedef LinuxPath TargetPathType;
+}
 #else
-    #include <components/files/androidpath.hpp>
-    namespace Files { typedef AndroidPath TargetPathType; }
+#include <components/files/androidpath.hpp>
+namespace Files
+{
+    typedef AndroidPath TargetPathType;
+}
 #endif
 #elif defined(__WIN32) || defined(__WINDOWS__) || defined(_WIN32)
-    #include <components/files/windowspath.hpp>
-    namespace Files { typedef WindowsPath TargetPathType; }
+#include <components/files/windowspath.hpp>
+namespace Files
+{
+    typedef WindowsPath TargetPathType;
+}
 
 #elif defined(macintosh) || defined(Macintosh) || defined(__APPLE__) || defined(__MACH__)
-    #include <components/files/macospath.hpp>
-    namespace Files { typedef MacOsPath TargetPathType; }
+#include <components/files/macospath.hpp>
+namespace Files
+{
+    typedef MacOsPath TargetPathType;
+}
 
 #else
-    #error "Unknown platform!"
+#error "Unknown platform!"
 #endif
 
-
 /**
  * \namespace Files
  */
 namespace Files
 {
 
-/**
- * \struct Path
- *
- * \tparam P - Path strategy class type (depends on target system)
- *
- */
-template
-<
-    class P = TargetPathType
->
-struct FixedPath
-{
-    typedef P PathType;
-
     /**
-     * \brief Path constructor.
+     * \struct Path
+     *
+     * \tparam P - Path strategy class type (depends on target system)
      *
-     * \param [in] application_name - Name of the application
-     */
-    FixedPath(const std::string& application_name)
-        : mPath(application_name + "/")
-        , mUserConfigPath(mPath.getUserConfigPath())
-        , mUserDataPath(mPath.getUserDataPath())
-        , mGlobalConfigPath(mPath.getGlobalConfigPath())
-        , mLocalPath(mPath.getLocalPath())
-        , mGlobalDataPath(mPath.getGlobalDataPath())
-        , mCachePath(mPath.getCachePath())
-        , mInstallPath(mPath.getInstallPath())
-    {
-    }
-
-    /**
-     * \brief Return path pointing to the user local configuration directory.
-     */
-    const std::filesystem::path& getUserConfigPath() const
-    {
-        return mUserConfigPath;
-    }
-
-    const std::filesystem::path& getUserDataPath() const
-    {
-        return mUserDataPath;
-    }
-
-    /**
-     * \brief Return path pointing to the global (system) configuration directory.
-     */
-    const std::filesystem::path& getGlobalConfigPath() const
-    {
-        return mGlobalConfigPath;
-    }
-
-    /**
-     * \brief Return path pointing to the directory where application was started.
      */
-    const std::filesystem::path& getLocalPath() const
+    template <class P = TargetPathType>
+    struct FixedPath
     {
-        return mLocalPath;
-    }
-
-
-    const std::filesystem::path& getInstallPath() const
-    {
-        return mInstallPath;
-    }
-
-    const std::filesystem::path& getGlobalDataPath() const
-    {
-        return mGlobalDataPath;
-    }
-
-    const std::filesystem::path& getCachePath() const
-    {
-        return mCachePath;
-    }
+        typedef P PathType;
+
+        /**
+         * \brief Path constructor.
+         *
+         * \param [in] application_name - Name of the application
+         */
+        FixedPath(const std::string& application_name)
+            : mPath(application_name + "/")
+            , mUserConfigPath(mPath.getUserConfigPath())
+            , mUserDataPath(mPath.getUserDataPath())
+            , mGlobalConfigPath(mPath.getGlobalConfigPath())
+            , mLocalPath(mPath.getLocalPath())
+            , mGlobalDataPath(mPath.getGlobalDataPath())
+            , mCachePath(mPath.getCachePath())
+            , mInstallPath(mPath.getInstallPath())
+        {
+        }
+
+        /**
+         * \brief Return path pointing to the user local configuration directory.
+         */
+        const std::filesystem::path& getUserConfigPath() const { return mUserConfigPath; }
+
+        const std::filesystem::path& getUserDataPath() const { return mUserDataPath; }
+
+        /**
+         * \brief Return path pointing to the global (system) configuration directory.
+         */
+        const std::filesystem::path& getGlobalConfigPath() const { return mGlobalConfigPath; }
+
+        /**
+         * \brief Return path pointing to the directory where application was started.
+         */
+        const std::filesystem::path& getLocalPath() const { return mLocalPath; }
+
+        const std::filesystem::path& getInstallPath() const { return mInstallPath; }
+
+        const std::filesystem::path& getGlobalDataPath() const { return mGlobalDataPath; }
+
+        const std::filesystem::path& getCachePath() const { return mCachePath; }
 
     private:
         PathType mPath;
 
-        std::filesystem::path mUserConfigPath;       /**< User path  */
+        std::filesystem::path mUserConfigPath; /**< User path  */
         std::filesystem::path mUserDataPath;
-        std::filesystem::path mGlobalConfigPath;     /**< Global path */
-        std::filesystem::path mLocalPath;      /**< It is the same directory where application was run */
+        std::filesystem::path mGlobalConfigPath; /**< Global path */
+        std::filesystem::path mLocalPath; /**< It is the same directory where application was run */
 
-        std::filesystem::path mGlobalDataPath;        /**< Global application data path */
+        std::filesystem::path mGlobalDataPath; /**< Global application data path */
 
         std::filesystem::path mCachePath;
 
         std::filesystem::path mInstallPath;
-
-};
-
+    };
 
 } /* namespace Files */
 
diff --git a/components/files/hash.cpp b/components/files/hash.cpp
index 946ff06272..afb59b2e9e 100644
--- a/components/files/hash.cpp
+++ b/components/files/hash.cpp
@@ -12,7 +12,7 @@ namespace Files
 {
     std::array<std::uint64_t, 2> getHash(const std::filesystem::path& fileName, std::istream& stream)
     {
-        std::array<std::uint64_t, 2> hash {0, 0};
+        std::array<std::uint64_t, 2> hash{ 0, 0 };
         try
         {
             const auto start = stream.tellg();
@@ -25,7 +25,7 @@ namespace Files
                 const std::streamsize read = stream.gcount();
                 if (read == 0)
                     break;
-                std::array<std::uint64_t, 2> blockHash {0, 0};
+                std::array<std::uint64_t, 2> blockHash{ 0, 0 };
                 MurmurHash3_x64_128(value.data(), static_cast<int>(read), hash.data(), blockHash.data());
                 hash = blockHash;
             }
@@ -35,7 +35,8 @@ namespace Files
         }
         catch (const std::exception& e)
         {
-            throw std::runtime_error("Error while reading \"" + Files::pathToUnicodeString(fileName) + "\" to get hash: " + e.what());
+            throw std::runtime_error(
+                "Error while reading \"" + Files::pathToUnicodeString(fileName) + "\" to get hash: " + e.what());
         }
         return hash;
     }
diff --git a/components/files/hash.hpp b/components/files/hash.hpp
index 2f525c3222..0e6ce29ab5 100644
--- a/components/files/hash.hpp
+++ b/components/files/hash.hpp
@@ -3,8 +3,8 @@
 
 #include <array>
 #include <cstdint>
-#include <iosfwd>
 #include <filesystem>
+#include <iosfwd>
 
 namespace Files
 {
diff --git a/components/files/linuxpath.cpp b/components/files/linuxpath.cpp
index c085a07682..7071dd4291 100644
--- a/components/files/linuxpath.cpp
+++ b/components/files/linuxpath.cpp
@@ -2,10 +2,10 @@
 
 #if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
 
+#include <cstring>
+#include <fstream>
 #include <pwd.h>
 #include <unistd.h>
-#include <fstream>
-#include <cstring>
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/strings/lower.hpp>
@@ -48,133 +48,135 @@ namespace
 namespace Files
 {
 
-LinuxPath::LinuxPath(const std::string& application_name)
-    : mName(application_name)
-{
-    std::error_code ec;
-    current_path(getLocalPath(), ec);
-    const auto err = ec.value();
-    if (err != 0) {
-        Log(Debug::Warning) << "Error " << err << " " << std::strerror(err) << " when changing current directory";
+    LinuxPath::LinuxPath(const std::string& application_name)
+        : mName(application_name)
+    {
+        std::error_code ec;
+        current_path(getLocalPath(), ec);
+        const auto err = ec.value();
+        if (err != 0)
+        {
+            Log(Debug::Warning) << "Error " << err << " " << std::strerror(err) << " when changing current directory";
+        }
     }
-}
-
-std::filesystem::path LinuxPath::getUserConfigPath() const
-{
-    return getEnv("XDG_CONFIG_HOME", getUserHome() / ".config") / mName;
-}
-
-std::filesystem::path LinuxPath::getUserDataPath() const
-{
-    return getEnv("XDG_DATA_HOME", getUserHome() / ".local/share") / mName;
-}
 
-std::filesystem::path LinuxPath::getCachePath() const
-{
-    return getEnv("XDG_CACHE_HOME", getUserHome() / ".cache") / mName;
-}
+    std::filesystem::path LinuxPath::getUserConfigPath() const
+    {
+        return getEnv("XDG_CONFIG_HOME", getUserHome() / ".config") / mName;
+    }
 
-std::filesystem::path LinuxPath::getGlobalConfigPath() const
-{
-    std::filesystem::path globalPath(GLOBAL_CONFIG_PATH);
-    return globalPath / mName;
-}
+    std::filesystem::path LinuxPath::getUserDataPath() const
+    {
+        return getEnv("XDG_DATA_HOME", getUserHome() / ".local/share") / mName;
+    }
 
-std::filesystem::path LinuxPath::getLocalPath() const
-{
-    auto localPath = std::filesystem::current_path();
-    static const std::filesystem::path statusPaths[] = {"/proc/self/exe", "/proc/self/file", "/proc/curproc/exe", "/proc/curproc/file"};
+    std::filesystem::path LinuxPath::getCachePath() const
+    {
+        return getEnv("XDG_CACHE_HOME", getUserHome() / ".cache") / mName;
+    }
 
-    for(const auto& path : statusPaths)
+    std::filesystem::path LinuxPath::getGlobalConfigPath() const
     {
-        std::error_code ec;
-        const auto binPath = read_symlink(path, ec);
-        if (ec.value() != -1)
-        {
-            localPath = binPath.parent_path();
-            break;
-        }
+        std::filesystem::path globalPath(GLOBAL_CONFIG_PATH);
+        return globalPath / mName;
     }
 
-    return localPath;
-}
+    std::filesystem::path LinuxPath::getLocalPath() const
+    {
+        auto localPath = std::filesystem::current_path();
+        static const std::filesystem::path statusPaths[]
+            = { "/proc/self/exe", "/proc/self/file", "/proc/curproc/exe", "/proc/curproc/file" };
 
-std::filesystem::path LinuxPath::getGlobalDataPath() const
-{
-    std::filesystem::path globalDataPath(GLOBAL_DATA_PATH);
-    return globalDataPath / mName;
-}
+        for (const auto& path : statusPaths)
+        {
+            std::error_code ec;
+            const auto binPath = read_symlink(path, ec);
+            if (ec.value() != -1)
+            {
+                localPath = binPath.parent_path();
+                break;
+            }
+        }
 
-std::filesystem::path LinuxPath::getInstallPath() const
-{
-    std::filesystem::path installPath;
+        return localPath;
+    }
 
-    std::filesystem::path homePath = getUserHome();
+    std::filesystem::path LinuxPath::getGlobalDataPath() const
+    {
+        std::filesystem::path globalDataPath(GLOBAL_DATA_PATH);
+        return globalDataPath / mName;
+    }
 
-    if (!homePath.empty())
+    std::filesystem::path LinuxPath::getInstallPath() const
     {
-        std::filesystem::path wineDefaultRegistry(homePath);
-        wineDefaultRegistry /= ".wine/system.reg";
+        std::filesystem::path installPath;
 
-        if (std::filesystem::is_regular_file(wineDefaultRegistry))
+        std::filesystem::path homePath = getUserHome();
+
+        if (!homePath.empty())
         {
-            std::ifstream file(wineDefaultRegistry);
-            bool isRegEntry = false;
-            std::string line;
-            std::string mwpath;
+            std::filesystem::path wineDefaultRegistry(homePath);
+            wineDefaultRegistry /= ".wine/system.reg";
 
-            while (std::getline(file, line))
+            if (std::filesystem::is_regular_file(wineDefaultRegistry))
             {
-                if (line[0] == '[') // we found an entry
-                {
-                    if (isRegEntry)
-                    {
-                        break;
-                    }
+                std::ifstream file(wineDefaultRegistry);
+                bool isRegEntry = false;
+                std::string line;
+                std::string mwpath;
 
-                    isRegEntry = (line.find("Softworks\\\\Morrowind]") != std::string::npos);
-                }
-                else if (isRegEntry)
+                while (std::getline(file, line))
                 {
-                    if (line[0] == '"') // empty line means new registry key
+                    if (line[0] == '[') // we found an entry
                     {
-                        std::string key = line.substr(1, line.find('"', 1) - 1);
-                        if (strcasecmp(key.c_str(), "Installed Path") == 0)
+                        if (isRegEntry)
                         {
-                            std::string::size_type valuePos = line.find('=') + 2;
-                            mwpath = line.substr(valuePos, line.rfind('"') - valuePos);
+                            break;
+                        }
 
-                            std::string::size_type pos = mwpath.find("\\");
-                            while (pos != std::string::npos)
+                        isRegEntry = (line.find("Softworks\\\\Morrowind]") != std::string::npos);
+                    }
+                    else if (isRegEntry)
+                    {
+                        if (line[0] == '"') // empty line means new registry key
+                        {
+                            std::string key = line.substr(1, line.find('"', 1) - 1);
+                            if (strcasecmp(key.c_str(), "Installed Path") == 0)
                             {
-                               mwpath.replace(pos, 2, "/");
-                               pos = mwpath.find("\\", pos + 1);
+                                std::string::size_type valuePos = line.find('=') + 2;
+                                mwpath = line.substr(valuePos, line.rfind('"') - valuePos);
+
+                                std::string::size_type pos = mwpath.find("\\");
+                                while (pos != std::string::npos)
+                                {
+                                    mwpath.replace(pos, 2, "/");
+                                    pos = mwpath.find("\\", pos + 1);
+                                }
+                                break;
                             }
-                            break;
                         }
                     }
                 }
-            }
 
-            if (!mwpath.empty())
-            {
-                // Change drive letter to lowercase, so we could use
-                // ~/.wine/dosdevices symlinks
-                mwpath[0] = Misc::StringUtils::toLower(mwpath[0]);
-                installPath /= homePath;
-                installPath /= ".wine/dosdevices/";
-                installPath /= mwpath;
-
-                if (!std::filesystem::is_directory(installPath))
+                if (!mwpath.empty())
                 {
-                    installPath.clear();
+                    // Change drive letter to lowercase, so we could use
+                    // ~/.wine/dosdevices symlinks
+                    mwpath[0] = Misc::StringUtils::toLower(mwpath[0]);
+                    installPath /= homePath;
+                    installPath /= ".wine/dosdevices/";
+                    installPath /= mwpath;
+
+                    if (!std::filesystem::is_directory(installPath))
+                    {
+                        installPath.clear();
+                    }
                 }
             }
         }
-    }
 
-    return installPath;
-}
+        return installPath;
+    }
 
 } /* namespace Files */
 
diff --git a/components/files/linuxpath.hpp b/components/files/linuxpath.hpp
index e3f99af3fd..36bbb47bf2 100644
--- a/components/files/linuxpath.hpp
+++ b/components/files/linuxpath.hpp
@@ -11,48 +11,48 @@
 namespace Files
 {
 
-/**
- * \struct LinuxPath
- */
-struct LinuxPath
-{
-    LinuxPath(const std::string& application_name);
-
-    /**
-     * \brief Return path to the user directory.
-     */
-    std::filesystem::path getUserConfigPath() const;
-
-    std::filesystem::path getUserDataPath() const;
-
-    /**
-     * \brief Return path to the global (system) directory where config files can be placed.
-     */
-    std::filesystem::path getGlobalConfigPath() const;
-
     /**
-     * \brief Return path to the runtime configuration directory which is the
-     * place where an application was started.
+     * \struct LinuxPath
      */
-    std::filesystem::path getLocalPath() const;
-
-    /**
-     * \brief Return path to the global (system) directory where game files can be placed.
-     */
-    std::filesystem::path getGlobalDataPath() const;
-
-    /**
-     * \brief
-     */
-    std::filesystem::path getCachePath() const;
-
-    /**
-     * \brief Gets the path of the installed Morrowind version if there is one.
-     */
-    std::filesystem::path getInstallPath() const;
-
-    std::string mName;
-};
+    struct LinuxPath
+    {
+        LinuxPath(const std::string& application_name);
+
+        /**
+         * \brief Return path to the user directory.
+         */
+        std::filesystem::path getUserConfigPath() const;
+
+        std::filesystem::path getUserDataPath() const;
+
+        /**
+         * \brief Return path to the global (system) directory where config files can be placed.
+         */
+        std::filesystem::path getGlobalConfigPath() const;
+
+        /**
+         * \brief Return path to the runtime configuration directory which is the
+         * place where an application was started.
+         */
+        std::filesystem::path getLocalPath() const;
+
+        /**
+         * \brief Return path to the global (system) directory where game files can be placed.
+         */
+        std::filesystem::path getGlobalDataPath() const;
+
+        /**
+         * \brief
+         */
+        std::filesystem::path getCachePath() const;
+
+        /**
+         * \brief Gets the path of the installed Morrowind version if there is one.
+         */
+        std::filesystem::path getInstallPath() const;
+
+        std::string mName;
+    };
 
 } /* namespace Files */
 
diff --git a/components/files/macospath.cpp b/components/files/macospath.cpp
index e6dc8e55b7..2d0a409782 100644
--- a/components/files/macospath.cpp
+++ b/components/files/macospath.cpp
@@ -3,10 +3,10 @@
 #if defined(macintosh) || defined(Macintosh) || defined(__APPLE__) || defined(__MACH__)
 
 #include <cstdlib>
-#include <pwd.h>
-#include <unistd.h>
 #include <filesystem>
 #include <fstream>
+#include <pwd.h>
+#include <unistd.h>
 
 #include <components/misc/strings/lower.hpp>
 
@@ -33,121 +33,120 @@ namespace
 namespace Files
 {
 
-MacOsPath::MacOsPath(const std::string& application_name)
-    : mName(application_name)
-{
-}
-
-std::filesystem::path MacOsPath::getUserConfigPath() const
-{
-    std::filesystem::path userPath (getUserHome());
-    userPath /= "Library/Preferences/";
-
-    return userPath / mName;
-}
+    MacOsPath::MacOsPath(const std::string& application_name)
+        : mName(application_name)
+    {
+    }
 
-std::filesystem::path MacOsPath::getUserDataPath() const
-{
-    std::filesystem::path userPath (getUserHome());
-    userPath /= "Library/Application Support/";
+    std::filesystem::path MacOsPath::getUserConfigPath() const
+    {
+        std::filesystem::path userPath(getUserHome());
+        userPath /= "Library/Preferences/";
 
-    return userPath / mName;
-}
+        return userPath / mName;
+    }
 
-std::filesystem::path MacOsPath::getGlobalConfigPath() const
-{
-    std::filesystem::path globalPath("/Library/Preferences/");
-    return globalPath / mName;
-}
+    std::filesystem::path MacOsPath::getUserDataPath() const
+    {
+        std::filesystem::path userPath(getUserHome());
+        userPath /= "Library/Application Support/";
 
-std::filesystem::path MacOsPath::getCachePath() const
-{
-    std::filesystem::path userPath (getUserHome());
-    userPath /= "Library/Caches";
-    return userPath / mName;
-}
+        return userPath / mName;
+    }
 
-std::filesystem::path MacOsPath::getLocalPath() const
-{
-    return std::filesystem::path("../Resources/");
-}
+    std::filesystem::path MacOsPath::getGlobalConfigPath() const
+    {
+        std::filesystem::path globalPath("/Library/Preferences/");
+        return globalPath / mName;
+    }
 
-std::filesystem::path MacOsPath::getGlobalDataPath() const
-{
-    std::filesystem::path globalDataPath("/Library/Application Support/");
-    return globalDataPath / mName;
-}
+    std::filesystem::path MacOsPath::getCachePath() const
+    {
+        std::filesystem::path userPath(getUserHome());
+        userPath /= "Library/Caches";
+        return userPath / mName;
+    }
 
-std::filesystem::path MacOsPath::getInstallPath() const
-{
-    std::filesystem::path installPath;
+    std::filesystem::path MacOsPath::getLocalPath() const
+    {
+        return std::filesystem::path("../Resources/");
+    }
 
-    std::filesystem::path homePath = getUserHome();
+    std::filesystem::path MacOsPath::getGlobalDataPath() const
+    {
+        std::filesystem::path globalDataPath("/Library/Application Support/");
+        return globalDataPath / mName;
+    }
 
-    if (!homePath.empty())
+    std::filesystem::path MacOsPath::getInstallPath() const
     {
-        std::filesystem::path wineDefaultRegistry(homePath);
-        wineDefaultRegistry /= ".wine/system.reg";
+        std::filesystem::path installPath;
 
-        if (std::filesystem::is_regular_file(wineDefaultRegistry))
+        std::filesystem::path homePath = getUserHome();
+
+        if (!homePath.empty())
         {
-            std::ifstream file(wineDefaultRegistry);
-            bool isRegEntry = false;
-            std::string line;
-            std::string mwpath;
+            std::filesystem::path wineDefaultRegistry(homePath);
+            wineDefaultRegistry /= ".wine/system.reg";
 
-            while (std::getline(file, line))
+            if (std::filesystem::is_regular_file(wineDefaultRegistry))
             {
-                if (line[0] == '[') // we found an entry
-                {
-                    if (isRegEntry)
-                    {
-                        break;
-                    }
+                std::ifstream file(wineDefaultRegistry);
+                bool isRegEntry = false;
+                std::string line;
+                std::string mwpath;
 
-                    isRegEntry = (line.find("Softworks\\\\Morrowind]") != std::string::npos);
-                }
-                else if (isRegEntry)
+                while (std::getline(file, line))
                 {
-                    if (line[0] == '"') // empty line means new registry key
+                    if (line[0] == '[') // we found an entry
                     {
-                        std::string key = line.substr(1, line.find('"', 1) - 1);
-                        if (strcasecmp(key.c_str(), "Installed Path") == 0)
+                        if (isRegEntry)
                         {
-                            std::string::size_type valuePos = line.find('=') + 2;
-                            mwpath = line.substr(valuePos, line.rfind('"') - valuePos);
+                            break;
+                        }
 
-                            std::string::size_type pos = mwpath.find("\\");
-                            while (pos != std::string::npos)
+                        isRegEntry = (line.find("Softworks\\\\Morrowind]") != std::string::npos);
+                    }
+                    else if (isRegEntry)
+                    {
+                        if (line[0] == '"') // empty line means new registry key
+                        {
+                            std::string key = line.substr(1, line.find('"', 1) - 1);
+                            if (strcasecmp(key.c_str(), "Installed Path") == 0)
                             {
-                               mwpath.replace(pos, 2, "/");
-                               pos = mwpath.find("\\", pos + 1);
+                                std::string::size_type valuePos = line.find('=') + 2;
+                                mwpath = line.substr(valuePos, line.rfind('"') - valuePos);
+
+                                std::string::size_type pos = mwpath.find("\\");
+                                while (pos != std::string::npos)
+                                {
+                                    mwpath.replace(pos, 2, "/");
+                                    pos = mwpath.find("\\", pos + 1);
+                                }
+                                break;
                             }
-                            break;
                         }
                     }
                 }
-            }
-
-            if (!mwpath.empty())
-            {
-                // Change drive letter to lowercase, so we could use ~/.wine/dosdevice symlinks
-                mwpath[0] = Misc::StringUtils::toLower(mwpath[0]);
-                installPath /= homePath;
-                installPath /= ".wine/dosdevices/";
-                installPath /= mwpath;
 
-                if (!std::filesystem::is_directory(installPath))
+                if (!mwpath.empty())
                 {
-                    installPath.clear();
+                    // Change drive letter to lowercase, so we could use ~/.wine/dosdevice symlinks
+                    mwpath[0] = Misc::StringUtils::toLower(mwpath[0]);
+                    installPath /= homePath;
+                    installPath /= ".wine/dosdevices/";
+                    installPath /= mwpath;
+
+                    if (!std::filesystem::is_directory(installPath))
+                    {
+                        installPath.clear();
+                    }
                 }
             }
         }
-    }
-
-    return installPath;
-}
 
+        return installPath;
+    }
 
 } /* namespace Files */
 
diff --git a/components/files/macospath.hpp b/components/files/macospath.hpp
index 12c7fd66bc..c1eeaf1dab 100644
--- a/components/files/macospath.hpp
+++ b/components/files/macospath.hpp
@@ -11,55 +11,55 @@
 namespace Files
 {
 
-/**
- * \struct MacOsPath
- */
-struct MacOsPath
-{
-    MacOsPath(const std::string& application_name);
-
     /**
-     * \brief Return path to the local directory.
-     *
-     * \return std::filesystem::path
+     * \struct MacOsPath
      */
-    std::filesystem::path getUserConfigPath() const;
+    struct MacOsPath
+    {
+        MacOsPath(const std::string& application_name);
 
-    std::filesystem::path getUserDataPath() const;
+        /**
+         * \brief Return path to the local directory.
+         *
+         * \return std::filesystem::path
+         */
+        std::filesystem::path getUserConfigPath() const;
 
-    /**
-     * \brief Return path to the global (system) directory.
-     *
-     * \return std::filesystem::path
-     */
-    std::filesystem::path getGlobalConfigPath() const;
+        std::filesystem::path getUserDataPath() const;
 
-    /**
-     * \brief Return path to the runtime directory which is the
-     * place where an application was started.
-     *
-     * \return std::filesystem::path
-     */
-    std::filesystem::path getLocalPath() const;
+        /**
+         * \brief Return path to the global (system) directory.
+         *
+         * \return std::filesystem::path
+         */
+        std::filesystem::path getGlobalConfigPath() const;
 
-    /**
-     * \brief
-     *
-     * \return std::filesystem::path
-     */
-    std::filesystem::path getCachePath() const;
+        /**
+         * \brief Return path to the runtime directory which is the
+         * place where an application was started.
+         *
+         * \return std::filesystem::path
+         */
+        std::filesystem::path getLocalPath() const;
 
-    /**
-     * \brief
-     *
-     * \return std::filesystem::path
-     */
-    std::filesystem::path getGlobalDataPath() const;
+        /**
+         * \brief
+         *
+         * \return std::filesystem::path
+         */
+        std::filesystem::path getCachePath() const;
+
+        /**
+         * \brief
+         *
+         * \return std::filesystem::path
+         */
+        std::filesystem::path getGlobalDataPath() const;
 
-    std::filesystem::path getInstallPath() const;
+        std::filesystem::path getInstallPath() const;
 
-    std::string mName;
-};
+        std::string mName;
+    };
 
 } /* namespace Files */
 
diff --git a/components/files/memorystream.hpp b/components/files/memorystream.hpp
index b4c7b76758..bd226beb9a 100644
--- a/components/files/memorystream.hpp
+++ b/components/files/memorystream.hpp
@@ -37,7 +37,7 @@ namespace Files
     };
 
     /// @brief A variant of std::istream that reads from a constant in-memory buffer.
-    struct IMemStream: virtual MemBuf, std::istream
+    struct IMemStream : virtual MemBuf, std::istream
     {
         IMemStream(char const* buffer, size_t size)
             : MemBuf(buffer, size)
diff --git a/components/files/multidircollection.cpp b/components/files/multidircollection.cpp
index 752a1d0275..8c9461da74 100644
--- a/components/files/multidircollection.cpp
+++ b/components/files/multidircollection.cpp
@@ -11,23 +11,26 @@ namespace Files
     {
         bool mStrict;
 
-        NameEqual (bool strict) : mStrict (strict) {}
+        NameEqual(bool strict)
+            : mStrict(strict)
+        {
+        }
 
-        bool operator() (const std::string& left, const std::string& right) const
+        bool operator()(const std::string& left, const std::string& right) const
         {
             if (mStrict)
-                return left==right;
+                return left == right;
             return Misc::StringUtils::ciEqual(left, right);
         }
     };
 
-    MultiDirCollection::MultiDirCollection(const Files::PathContainer& directories,
-        const std::string& extension, bool foldCase)
-    : mFiles (NameLess (!foldCase))
+    MultiDirCollection::MultiDirCollection(
+        const Files::PathContainer& directories, const std::string& extension, bool foldCase)
+        : mFiles(NameLess(!foldCase))
     {
-        NameEqual equal (!foldCase);
+        NameEqual equal(!foldCase);
 
-        for (const auto & directory : directories)
+        for (const auto& directory : directories)
         {
             if (!std::filesystem::is_directory(directory))
             {
@@ -39,44 +42,44 @@ namespace Files
             {
                 const auto& path = dirIter.path();
 
-                if (!equal (extension, Files::pathToUnicodeString(path.extension())))
+                if (!equal(extension, Files::pathToUnicodeString(path.extension())))
                     continue;
 
                 const auto filename = Files::pathToUnicodeString(path.filename());
 
-                TIter result = mFiles.find (filename);
+                TIter result = mFiles.find(filename);
 
-                if (result==mFiles.end())
+                if (result == mFiles.end())
                 {
-                    mFiles.insert (std::make_pair (filename, path));
+                    mFiles.insert(std::make_pair(filename, path));
                 }
-                else if (result->first==filename)
+                else if (result->first == filename)
                 {
                     mFiles[filename] = path;
                 }
                 else
                 {
                     // handle case folding
-                    mFiles.erase (result->first);
-                    mFiles.insert (std::make_pair (filename, path));
+                    mFiles.erase(result->first);
+                    mFiles.insert(std::make_pair(filename, path));
                 }
             }
         }
     }
 
-    std::filesystem::path MultiDirCollection::getPath (const std::string& file) const
+    std::filesystem::path MultiDirCollection::getPath(const std::string& file) const
     {
-        TIter iter = mFiles.find (file);
+        TIter iter = mFiles.find(file);
 
-        if (iter==mFiles.end())
-            throw std::runtime_error ("file " + file + " not found");
+        if (iter == mFiles.end())
+            throw std::runtime_error("file " + file + " not found");
 
         return iter->second;
     }
 
-    bool MultiDirCollection::doesExist (const std::string& file) const
+    bool MultiDirCollection::doesExist(const std::string& file) const
     {
-        return mFiles.find (file)!=mFiles.end();
+        return mFiles.find(file) != mFiles.end();
     }
 
     MultiDirCollection::TIter MultiDirCollection::begin() const
diff --git a/components/files/multidircollection.hpp b/components/files/multidircollection.hpp
index a89801f573..5d5b5c5570 100644
--- a/components/files/multidircollection.hpp
+++ b/components/files/multidircollection.hpp
@@ -1,11 +1,11 @@
 #ifndef COMPONENTS_FILES_MULTIDIRSOLLECTION_HPP
 #define COMPONENTS_FILES_MULTIDIRSOLLECTION_HPP
 
-#include <map>
-#include <vector>
-#include <string>
 #include <cctype>
 #include <filesystem>
+#include <map>
+#include <string>
+#include <vector>
 
 #include <components/misc/strings/algorithm.hpp>
 
@@ -17,12 +17,15 @@ namespace Files
     {
         bool mStrict;
 
-        NameLess (bool strict) : mStrict (strict) {}
+        NameLess(bool strict)
+            : mStrict(strict)
+        {
+        }
 
-        bool operator() (const std::string& left, const std::string& right) const
+        bool operator()(const std::string& left, const std::string& right) const
         {
             if (mStrict)
-                return left<right;
+                return left < right;
             return Misc::StringUtils::ciLess(left, right);
         }
     };
@@ -34,39 +37,34 @@ namespace Files
     /// with the higher priority is used.
     class MultiDirCollection
     {
-        public:
-
-            typedef std::map<std::string, std::filesystem::path, NameLess> TContainer;
-            typedef TContainer::const_iterator TIter;
-
-        private:
-
-            TContainer mFiles;
-
-        public:
-
-            MultiDirCollection (const Files::PathContainer& directories,
-                const std::string& extension, bool foldCase);
-            ///< Directories are listed with increasing priority.
-            /// \param extension The extension that should be listed in this collection. Must
-            /// contain the leading dot.
-            /// \param foldCase Ignore filename case
-
-            std::filesystem::path getPath (const std::string& file) const;
-            ///< Return full path (including filename) of \a file.
-            ///
-            /// If the file does not exist, an exception is thrown. \a file must include
-            /// the extension.
-
-            bool doesExist (const std::string& file) const;
-            ///< \return Does a file with the given name exist?
-
-            TIter begin() const;
-            ///< Return iterator pointing to the first file.
-
-            TIter end() const;
-            ///< Return iterator pointing past the last file.
-
+    public:
+        typedef std::map<std::string, std::filesystem::path, NameLess> TContainer;
+        typedef TContainer::const_iterator TIter;
+
+    private:
+        TContainer mFiles;
+
+    public:
+        MultiDirCollection(const Files::PathContainer& directories, const std::string& extension, bool foldCase);
+        ///< Directories are listed with increasing priority.
+        /// \param extension The extension that should be listed in this collection. Must
+        /// contain the leading dot.
+        /// \param foldCase Ignore filename case
+
+        std::filesystem::path getPath(const std::string& file) const;
+        ///< Return full path (including filename) of \a file.
+        ///
+        /// If the file does not exist, an exception is thrown. \a file must include
+        /// the extension.
+
+        bool doesExist(const std::string& file) const;
+        ///< \return Does a file with the given name exist?
+
+        TIter begin() const;
+        ///< Return iterator pointing to the first file.
+
+        TIter end() const;
+        ///< Return iterator pointing past the last file.
     };
 }
 
diff --git a/components/files/openfile.cpp b/components/files/openfile.cpp
index 9ffe134e4a..58ab2869ff 100644
--- a/components/files/openfile.cpp
+++ b/components/files/openfile.cpp
@@ -6,11 +6,12 @@
 
 namespace Files
 {
-    std::unique_ptr<std::ifstream> openBinaryInputFileStream(const std::filesystem::path &path)
+    std::unique_ptr<std::ifstream> openBinaryInputFileStream(const std::filesystem::path& path)
     {
         auto stream = std::make_unique<std::ifstream>(path, std::ios::binary);
         if (!stream->is_open())
-            throw std::runtime_error("Failed to open '" + Files::pathToUnicodeString(path) + "' for reading: " + std::strerror(errno));
+            throw std::runtime_error(
+                "Failed to open '" + Files::pathToUnicodeString(path) + "' for reading: " + std::strerror(errno));
         stream->exceptions(std::ios::badbit);
         return stream;
     }
diff --git a/components/files/openfile.hpp b/components/files/openfile.hpp
index a65f0a8b18..10ea338ca2 100644
--- a/components/files/openfile.hpp
+++ b/components/files/openfile.hpp
@@ -1,14 +1,14 @@
 #ifndef OPENMW_COMPONENTS_FILES_OPENFILE_H
 #define OPENMW_COMPONENTS_FILES_OPENFILE_H
 
+#include <filesystem>
 #include <iosfwd>
 #include <memory>
 #include <string>
-#include <filesystem>
 
 namespace Files
 {
-    std::unique_ptr<std::ifstream> openBinaryInputFileStream(const std::filesystem::path &path);
+    std::unique_ptr<std::ifstream> openBinaryInputFileStream(const std::filesystem::path& path);
 }
 
 #endif
diff --git a/components/files/streamwithbuffer.hpp b/components/files/streamwithbuffer.hpp
index dfd1a04376..f135f71aa1 100644
--- a/components/files/streamwithbuffer.hpp
+++ b/components/files/streamwithbuffer.hpp
@@ -9,14 +9,15 @@ namespace Files
     template <class Buffer>
     class StreamWithBuffer final : public std::istream
     {
-        public:
-            explicit StreamWithBuffer(std::unique_ptr<Buffer>&& buffer)
-                : std::istream(buffer.get())
-                , mBuffer(std::move(buffer))
-            {}
+    public:
+        explicit StreamWithBuffer(std::unique_ptr<Buffer>&& buffer)
+            : std::istream(buffer.get())
+            , mBuffer(std::move(buffer))
+        {
+        }
 
-        private:
-            std::unique_ptr<Buffer> mBuffer;
+    private:
+        std::unique_ptr<Buffer> mBuffer;
     };
 }
 
diff --git a/components/files/windowspath.cpp b/components/files/windowspath.cpp
index c6a03f4263..8c494e3bce 100644
--- a/components/files/windowspath.cpp
+++ b/components/files/windowspath.cpp
@@ -25,93 +25,96 @@ namespace bconv = boost::locale::conv;
 namespace Files
 {
 
-WindowsPath::WindowsPath(const std::string& application_name)
-    : mName(application_name)
-{
-    std::error_code ec;
-    current_path(getLocalPath(), ec);
-    if (ec.value() != 0)
-        Log(Debug::Warning) << "Error " << ec.value() << " when changing current directory";
-}
-
-std::filesystem::path WindowsPath::getUserConfigPath() const
-{
-    std::filesystem::path userPath = std::filesystem::current_path();
-
-    WCHAR path[MAX_PATH + 1] = {};
-
-    if(SUCCEEDED(SHGetFolderPathW(nullptr, CSIDL_PERSONAL | CSIDL_FLAG_CREATE, nullptr, 0, path)))
+    WindowsPath::WindowsPath(const std::string& application_name)
+        : mName(application_name)
     {
-        userPath = std::filesystem::path(path);
+        std::error_code ec;
+        current_path(getLocalPath(), ec);
+        if (ec.value() != 0)
+            Log(Debug::Warning) << "Error " << ec.value() << " when changing current directory";
     }
 
-    return userPath / "My Games" / mName;
-}
+    std::filesystem::path WindowsPath::getUserConfigPath() const
+    {
+        std::filesystem::path userPath = std::filesystem::current_path();
 
-std::filesystem::path WindowsPath::getUserDataPath() const
-{
-    // Have some chaos, windows people!
-    return getUserConfigPath();
-}
+        WCHAR path[MAX_PATH + 1] = {};
 
-std::filesystem::path WindowsPath::getGlobalConfigPath() const
-{
-    std::filesystem::path globalPath = std::filesystem::current_path();
+        if (SUCCEEDED(SHGetFolderPathW(nullptr, CSIDL_PERSONAL | CSIDL_FLAG_CREATE, nullptr, 0, path)))
+        {
+            userPath = std::filesystem::path(path);
+        }
 
-    WCHAR path[MAX_PATH + 1] = {};
+        return userPath / "My Games" / mName;
+    }
 
-    if(SUCCEEDED(SHGetFolderPathW(nullptr, CSIDL_PROGRAM_FILES | CSIDL_FLAG_CREATE, nullptr, 0, path)))
+    std::filesystem::path WindowsPath::getUserDataPath() const
     {
-        globalPath = std::filesystem::path(path);
+        // Have some chaos, windows people!
+        return getUserConfigPath();
     }
 
-    return globalPath / mName;
-}
+    std::filesystem::path WindowsPath::getGlobalConfigPath() const
+    {
+        std::filesystem::path globalPath = std::filesystem::current_path();
 
-std::filesystem::path WindowsPath::getLocalPath() const
-{
-    std::filesystem::path localPath = std::filesystem::current_path();
+        WCHAR path[MAX_PATH + 1] = {};
 
-    WCHAR path[MAX_PATH + 1] = {};
+        if (SUCCEEDED(SHGetFolderPathW(nullptr, CSIDL_PROGRAM_FILES | CSIDL_FLAG_CREATE, nullptr, 0, path)))
+        {
+            globalPath = std::filesystem::path(path);
+        }
 
-    if (GetModuleFileNameW(nullptr, path, MAX_PATH + 1) > 0)
-    {
-        localPath = std::filesystem::path(path).parent_path();
+        return globalPath / mName;
     }
 
-    // lookup exe path
-    return localPath;
-}
+    std::filesystem::path WindowsPath::getLocalPath() const
+    {
+        std::filesystem::path localPath = std::filesystem::current_path();
 
-std::filesystem::path WindowsPath::getGlobalDataPath() const
-{
-    return getGlobalConfigPath();
-}
+        WCHAR path[MAX_PATH + 1] = {};
 
-std::filesystem::path WindowsPath::getCachePath() const
-{
-    return getUserConfigPath() / "cache";
-}
+        if (GetModuleFileNameW(nullptr, path, MAX_PATH + 1) > 0)
+        {
+            localPath = std::filesystem::path(path).parent_path();
+        }
 
-std::filesystem::path WindowsPath::getInstallPath() const
-{
-    std::filesystem::path installPath{};
+        // lookup exe path
+        return localPath;
+    }
 
-    if (HKEY hKey; RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Bethesda Softworks\\Morrowind", 0, KEY_READ | KEY_WOW64_32KEY, &hKey) == ERROR_SUCCESS)
+    std::filesystem::path WindowsPath::getGlobalDataPath() const
     {
-        //Key existed, let's try to read the install dir
-        std::array<wchar_t, 512> buf{};
-        DWORD len = buf.size() * sizeof(wchar_t);
+        return getGlobalConfigPath();
+    }
 
-        if (RegQueryValueExW(hKey, L"Installed Path", nullptr, nullptr, reinterpret_cast<LPBYTE>(buf.data()), &len) == ERROR_SUCCESS)
+    std::filesystem::path WindowsPath::getCachePath() const
+    {
+        return getUserConfigPath() / "cache";
+    }
+
+    std::filesystem::path WindowsPath::getInstallPath() const
+    {
+        std::filesystem::path installPath{};
+
+        if (HKEY hKey; RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Bethesda Softworks\\Morrowind", 0,
+                           KEY_READ | KEY_WOW64_32KEY, &hKey)
+            == ERROR_SUCCESS)
         {
-            installPath = std::filesystem::path (buf.data());
+            // Key existed, let's try to read the install dir
+            std::array<wchar_t, 512> buf{};
+            DWORD len = buf.size() * sizeof(wchar_t);
+
+            if (RegQueryValueExW(hKey, L"Installed Path", nullptr, nullptr, reinterpret_cast<LPBYTE>(buf.data()), &len)
+                == ERROR_SUCCESS)
+            {
+                installPath = std::filesystem::path(buf.data());
+            }
+            RegCloseKey(hKey);
         }
-        RegCloseKey(hKey);
-    }
 
-    return installPath;
-}
+        return installPath;
+    }
 
 } /* namespace Files */
 
diff --git a/components/files/windowspath.hpp b/components/files/windowspath.hpp
index 4fd579b0b9..380e831b20 100644
--- a/components/files/windowspath.hpp
+++ b/components/files/windowspath.hpp
@@ -11,66 +11,66 @@
 namespace Files
 {
 
-/**
- * \struct WindowsPath
- */
-struct WindowsPath
-{
     /**
-     * \brief WindowsPath constructor.
-     *
-     * \param [in] application_name - The name of the application.
+     * \struct WindowsPath
      */
-    WindowsPath(const std::string& application_name);
+    struct WindowsPath
+    {
+        /**
+         * \brief WindowsPath constructor.
+         *
+         * \param [in] application_name - The name of the application.
+         */
+        WindowsPath(const std::string& application_name);
 
-    /**
-     * \brief Returns user path i.e.:
-     * "X:\Documents And Settings\<User name>\My Documents\My Games\"
-     *
-     * \return std::filesystem::path
-     */
-    std::filesystem::path getUserConfigPath() const;
+        /**
+         * \brief Returns user path i.e.:
+         * "X:\Documents And Settings\<User name>\My Documents\My Games\"
+         *
+         * \return std::filesystem::path
+         */
+        std::filesystem::path getUserConfigPath() const;
 
-    std::filesystem::path getUserDataPath() const;
+        std::filesystem::path getUserDataPath() const;
 
-    /**
-     * \brief Returns "X:\Program Files\"
-     *
-     * \return std::filesystem::path
-     */
-    std::filesystem::path getGlobalConfigPath() const;
+        /**
+         * \brief Returns "X:\Program Files\"
+         *
+         * \return std::filesystem::path
+         */
+        std::filesystem::path getGlobalConfigPath() const;
 
-    /**
-     * \brief Return local path which is a location where
-     * an application was started
-     *
-     * \return std::filesystem::path
-     */
-    std::filesystem::path getLocalPath() const;
+        /**
+         * \brief Return local path which is a location where
+         * an application was started
+         *
+         * \return std::filesystem::path
+         */
+        std::filesystem::path getLocalPath() const;
 
-    /**
-     * \brief
-     *
-     * \return std::filesystem::path
-     */
-    std::filesystem::path getCachePath() const;
+        /**
+         * \brief
+         *
+         * \return std::filesystem::path
+         */
+        std::filesystem::path getCachePath() const;
 
-    /**
-     * \brief Return same path like getGlobalPath
-     *
-     * \return std::filesystem::path
-     */
-    std::filesystem::path getGlobalDataPath() const;
+        /**
+         * \brief Return same path like getGlobalPath
+         *
+         * \return std::filesystem::path
+         */
+        std::filesystem::path getGlobalDataPath() const;
 
-    /**
-     * \brief Gets the path of the installed Morrowind version if there is one.
-     *
-     * \return std::filesystem::path
-     */
-    std::filesystem::path getInstallPath() const;
+        /**
+         * \brief Gets the path of the installed Morrowind version if there is one.
+         *
+         * \return std::filesystem::path
+         */
+        std::filesystem::path getInstallPath() const;
 
-    std::string mName;
-};
+        std::string mName;
+    };
 
 } /* namespace Files */
 
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index 4e5525d3a5..c54d60ef23 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -1,19 +1,19 @@
 #include "fontloader.hpp"
 
+#include <array>
 #include <stdexcept>
 #include <string_view>
-#include <array>
 
 #include <osg/Image>
 
 #include <osgDB/WriteFile>
 
+#include <MyGUI_FactoryManager.h>
+#include <MyGUI_RenderManager.h>
 #include <MyGUI_ResourceManager.h>
 #include <MyGUI_ResourceManualFont.h>
 #include <MyGUI_ResourceTrueTypeFont.h>
 #include <MyGUI_XmlDocument.h>
-#include <MyGUI_FactoryManager.h>
-#include <MyGUI_RenderManager.h>
 
 #include <components/debug/debuglog.hpp>
 
@@ -62,7 +62,8 @@ namespace
             if (name == "JournalBooks")
             {
                 MyGUI::xml::ElementPtr sizeProperty = getProperty(layersIterator.current(), "Size");
-                const std::string& sizeValue = sizeProperty != nullptr ? sizeProperty->findAttribute("value") : std::string();
+                const std::string& sizeValue
+                    = sizeProperty != nullptr ? sizeProperty->findAttribute("value") : std::string();
                 if (!sizeValue.empty())
                     return MyGUI::IntSize::parse(sizeValue);
             }
@@ -90,17 +91,17 @@ namespace
         }
         else if (ch <= 0xDF)
         {
-            unicode = ch&0x1F;
+            unicode = ch & 0x1F;
             numbytes = 1;
         }
         else if (ch <= 0xEF)
         {
-            unicode = ch&0x0F;
+            unicode = ch & 0x0F;
             numbytes = 2;
         }
         else if (ch <= 0xF7)
         {
-            unicode = ch&0x07;
+            unicode = ch & 0x07;
             numbytes = 3;
         }
         else
@@ -124,42 +125,78 @@ namespace
     }
 
     /// This is a hack for Polish font
-    unsigned char mapUtf8Char(unsigned char c) {
-        switch(c){
-            case 0x80: return 0xc6;
-            case 0x81: return 0x9c;
-            case 0x82: return 0xe6;
-            case 0x83: return 0xb3;
-            case 0x84: return 0xf1;
-            case 0x85: return 0xb9;
-            case 0x86: return 0xbf;
-            case 0x87: return 0x9f;
-            case 0x88: return 0xea;
-            case 0x89: return 0xea;
-            case 0x8a: return 0x00; // not contained in win1250
-            case 0x8b: return 0x00; // not contained in win1250
-            case 0x8c: return 0x8f;
-            case 0x8d: return 0xaf;
-            case 0x8e: return 0xa5;
-            case 0x8f: return 0x8c;
-            case 0x90: return 0xca;
-            case 0x93: return 0xa3;
-            case 0x94: return 0xf6;
-            case 0x95: return 0xf3;
-            case 0x96: return 0xaf;
-            case 0x97: return 0x8f;
-            case 0x99: return 0xd3;
-            case 0x9a: return 0xd1;
-            case 0x9c: return 0x00; // not contained in win1250
-            case 0xa0: return 0xb9;
-            case 0xa1: return 0xaf;
-            case 0xa2: return 0xf3;
-            case 0xa3: return 0xbf;
-            case 0xa4: return 0x00; // not contained in win1250
-            case 0xe1: return 0x8c;
-            case 0xe3: return 0x00; // not contained in win1250
-            case 0xf5: return 0x00; // not contained in win1250
-            default: return c;
+    unsigned char mapUtf8Char(unsigned char c)
+    {
+        switch (c)
+        {
+            case 0x80:
+                return 0xc6;
+            case 0x81:
+                return 0x9c;
+            case 0x82:
+                return 0xe6;
+            case 0x83:
+                return 0xb3;
+            case 0x84:
+                return 0xf1;
+            case 0x85:
+                return 0xb9;
+            case 0x86:
+                return 0xbf;
+            case 0x87:
+                return 0x9f;
+            case 0x88:
+                return 0xea;
+            case 0x89:
+                return 0xea;
+            case 0x8a:
+                return 0x00; // not contained in win1250
+            case 0x8b:
+                return 0x00; // not contained in win1250
+            case 0x8c:
+                return 0x8f;
+            case 0x8d:
+                return 0xaf;
+            case 0x8e:
+                return 0xa5;
+            case 0x8f:
+                return 0x8c;
+            case 0x90:
+                return 0xca;
+            case 0x93:
+                return 0xa3;
+            case 0x94:
+                return 0xf6;
+            case 0x95:
+                return 0xf3;
+            case 0x96:
+                return 0xaf;
+            case 0x97:
+                return 0x8f;
+            case 0x99:
+                return 0xd3;
+            case 0x9a:
+                return 0xd1;
+            case 0x9c:
+                return 0x00; // not contained in win1250
+            case 0xa0:
+                return 0xb9;
+            case 0xa1:
+                return 0xaf;
+            case 0xa2:
+                return 0xf3;
+            case 0xa3:
+                return 0xbf;
+            case 0xa4:
+                return 0x00; // not contained in win1250
+            case 0xe1:
+                return 0x8c;
+            case 0xe3:
+                return 0x00; // not contained in win1250
+            case 0xf5:
+                return 0x00; // not contained in win1250
+            default:
+                return c;
         }
     }
 
@@ -170,12 +207,12 @@ namespace
     {
         if (encoding == ToUTF8::WINDOWS_1250) // Hack for polish font
         {
-            const std::array<char, 2> str {static_cast<char>(mapUtf8Char(c)), '\0'};
+            const std::array<char, 2> str{ static_cast<char>(mapUtf8Char(c)), '\0' };
             return utf8ToUnicode(encoder.getUtf8(std::string_view(str.data(), 1)));
         }
         else
         {
-            const std::array<char, 2> str {static_cast<char>(c), '\0'};
+            const std::array<char, 2> str{ static_cast<char>(c), '\0' };
             return utf8ToUnicode(encoder.getUtf8(std::string_view(str.data(), 1)));
         }
     }
@@ -205,23 +242,27 @@ namespace Gui
             mEncoding = encoding;
 
         MyGUI::ResourceManager::getInstance().unregisterLoadXmlDelegate("Resource");
-        MyGUI::ResourceManager::getInstance().registerLoadXmlDelegate("Resource") = MyGUI::newDelegate(this, &FontLoader::overrideLineHeight);
+        MyGUI::ResourceManager::getInstance().registerLoadXmlDelegate("Resource")
+            = MyGUI::newDelegate(this, &FontLoader::overrideLineHeight);
 
         loadFonts();
     }
 
     void FontLoader::loadFonts()
     {
-        std::string defaultFont{Fallback::Map::getString("Fonts_Font_0")};
-        std::string scrollFont{Fallback::Map::getString("Fonts_Font_2")};
+        std::string defaultFont{ Fallback::Map::getString("Fonts_Font_0") };
+        std::string scrollFont{ Fallback::Map::getString("Fonts_Font_2") };
         loadFont(defaultFont, "DefaultFont");
         loadFont(scrollFont, "ScrollFont");
-        loadFont("DejaVuLGCSansMono", "MonoFont"); // We need to use a TrueType monospace font to display debug texts properly.
+        loadFont("DejaVuLGCSansMono",
+            "MonoFont"); // We need to use a TrueType monospace font to display debug texts properly.
 
         // Use our TrueType fonts as a fallback.
-        if (!MyGUI::ResourceManager::getInstance().isExist("DefaultFont") && !Misc::StringUtils::ciEqual(defaultFont, "MysticCards"))
+        if (!MyGUI::ResourceManager::getInstance().isExist("DefaultFont")
+            && !Misc::StringUtils::ciEqual(defaultFont, "MysticCards"))
             loadFont("MysticCards", "DefaultFont");
-        if (!MyGUI::ResourceManager::getInstance().isExist("ScrollFont") && !Misc::StringUtils::ciEqual(scrollFont, "DemonicLetters"))
+        if (!MyGUI::ResourceManager::getInstance().isExist("ScrollFont")
+            && !Misc::StringUtils::ciEqual(scrollFont, "DemonicLetters"))
             loadFont("DemonicLetters", "ScrollFont");
     }
 
@@ -239,7 +280,8 @@ namespace Gui
     {
         Log(Debug::Info) << "Loading font file " << fileName;
 
-        osgMyGUI::DataManager* dataManager = dynamic_cast<osgMyGUI::DataManager*>(&osgMyGUI::DataManager::getInstance());
+        osgMyGUI::DataManager* dataManager
+            = dynamic_cast<osgMyGUI::DataManager*>(&osgMyGUI::DataManager::getInstance());
         if (!dataManager)
         {
             Log(Debug::Error) << "Can not load TrueType font " << fontId << ": osgMyGUI::DataManager is not available.";
@@ -291,23 +333,25 @@ namespace Gui
         sizeNode->addAttribute("value", std::to_string(mFontHeight));
 
         MyGUI::ResourceTrueTypeFont* font = static_cast<MyGUI::ResourceTrueTypeFont*>(
-                    MyGUI::FactoryManager::getInstance().createObject("Resource", "ResourceTrueTypeFont"));
-        font->deserialization(resourceNode.current(), MyGUI::Version(3,2,0));
+            MyGUI::FactoryManager::getInstance().createObject("Resource", "ResourceTrueTypeFont"));
+        font->deserialization(resourceNode.current(), MyGUI::Version(3, 2, 0));
         font->setResourceName(fontId);
         MyGUI::ResourceManager::getInstance().addResource(font);
 
-        resolutionNode->setAttribute("value", MyGUI::utility::toString(static_cast<int>(resolution * bookScale * mScalingFactor)));
+        resolutionNode->setAttribute(
+            "value", MyGUI::utility::toString(static_cast<int>(resolution * bookScale * mScalingFactor)));
 
         MyGUI::ResourceTrueTypeFont* bookFont = static_cast<MyGUI::ResourceTrueTypeFont*>(
-                    MyGUI::FactoryManager::getInstance().createObject("Resource", "ResourceTrueTypeFont"));
-        bookFont->deserialization(resourceNode.current(), MyGUI::Version(3,2,0));
+            MyGUI::FactoryManager::getInstance().createObject("Resource", "ResourceTrueTypeFont"));
+        bookFont->deserialization(resourceNode.current(), MyGUI::Version(3, 2, 0));
         bookFont->setResourceName("Journalbook " + fontId);
         MyGUI::ResourceManager::getInstance().addResource(bookFont);
 
         dataManager->setResourcePath(oldDataPath);
 
         if (resourceNode.next("Resource"))
-            Log(Debug::Warning) << "Font file " << fileName << " contains multiple Resource entries, only first one will be used.";
+            Log(Debug::Warning) << "Font file " << fileName
+                                << " contains multiple Resource entries, only first one will be used.";
     }
 
     typedef struct
@@ -330,7 +374,7 @@ namespace Gui
         float ascent;
     } GlyphInfo;
 
-    void FontLoader::loadBitmapFont(const std::string &fileName, const std::string& fontId)
+    void FontLoader::loadBitmapFont(const std::string& fileName, const std::string& fontId)
     {
         Log(Debug::Info) << "Loading font file " << fileName;
 
@@ -385,8 +429,8 @@ namespace Gui
             fail(*bitmapFile, bitmapFilename, "Width and height must be positive");
 
         std::vector<char> textureData;
-        textureData.resize(width*height*4);
-        bitmapFile->read(textureData.data(), width*height*4);
+        textureData.resize(width * height * 4);
+        bitmapFile->read(textureData.data(), width * height * 4);
         if (!bitmapFile->good())
             fail(*bitmapFile, bitmapFilename, "File too small to be a valid bitmap");
         bitmapFile.reset();
@@ -411,28 +455,30 @@ namespace Gui
         source->addAttribute("value", std::string(bitmapFilename));
         MyGUI::xml::ElementPtr codes = root->createChild("Codes");
 
-        for(int i = 0; i < 256; i++)
+        for (int i = 0; i < 256; i++)
         {
-            float x1 = data[i].top_left.x*width;
-            float y1 = data[i].top_left.y*height;
-            float w  = data[i].top_right.x*width - x1;
-            float h  = data[i].bottom_left.y*height - y1;
+            float x1 = data[i].top_left.x * width;
+            float y1 = data[i].top_left.y * height;
+            float w = data[i].top_right.x * width - x1;
+            float h = data[i].bottom_left.y * height - y1;
 
             ToUTF8::Utf8Encoder encoder(mEncoding);
             unsigned long unicodeVal = getUnicode(i, encoder, mEncoding);
 
             MyGUI::xml::ElementPtr code = codes->createChild("Code");
             code->addAttribute("index", unicodeVal);
-            code->addAttribute("coord", MyGUI::utility::toString(x1) + " "
-                                        + MyGUI::utility::toString(y1) + " "
-                                        + MyGUI::utility::toString(w) + " "
-                                        + MyGUI::utility::toString(h));
+            code->addAttribute("coord",
+                MyGUI::utility::toString(x1) + " " + MyGUI::utility::toString(y1) + " " + MyGUI::utility::toString(w)
+                    + " " + MyGUI::utility::toString(h));
             code->addAttribute("advance", data[i].width);
-            code->addAttribute("bearing", MyGUI::utility::toString(data[i].kerning) + " "
-                               + MyGUI::utility::toString((fontSize-data[i].ascent)));
-            code->addAttribute("size", MyGUI::IntSize(static_cast<int>(data[i].width), static_cast<int>(data[i].height)));
-
-            // Fall back from unavailable Windows-1252 encoding symbols to similar characters available in the game fonts
+            code->addAttribute("bearing",
+                MyGUI::utility::toString(data[i].kerning) + " "
+                    + MyGUI::utility::toString((fontSize - data[i].ascent)));
+            code->addAttribute(
+                "size", MyGUI::IntSize(static_cast<int>(data[i].width), static_cast<int>(data[i].height)));
+
+            // Fall back from unavailable Windows-1252 encoding symbols to similar characters available in the game
+            // fonts
             std::multimap<int, int> additional; // fallback glyph index, unicode
             additional.insert(std::make_pair(156, 0x00A2)); // cent sign
             additional.insert(std::make_pair(89, 0x00A5)); // yen sign
@@ -494,14 +540,15 @@ namespace Gui
                     continue;
                 code = codes->createChild("Code");
                 code->addAttribute("index", it->second);
-                code->addAttribute("coord", MyGUI::utility::toString(x1) + " "
-                                            + MyGUI::utility::toString(y1) + " "
-                                            + MyGUI::utility::toString(w) + " "
-                                            + MyGUI::utility::toString(h));
+                code->addAttribute("coord",
+                    MyGUI::utility::toString(x1) + " " + MyGUI::utility::toString(y1) + " "
+                        + MyGUI::utility::toString(w) + " " + MyGUI::utility::toString(h));
                 code->addAttribute("advance", data[i].width);
-                code->addAttribute("bearing", MyGUI::utility::toString(data[i].kerning) + " "
-                                   + MyGUI::utility::toString((fontSize-data[i].ascent)));
-                code->addAttribute("size", MyGUI::IntSize(static_cast<int>(data[i].width), static_cast<int>(data[i].height)));
+                code->addAttribute("bearing",
+                    MyGUI::utility::toString(data[i].kerning) + " "
+                        + MyGUI::utility::toString((fontSize - data[i].ascent)));
+                code->addAttribute(
+                    "size", MyGUI::IntSize(static_cast<int>(data[i].width), static_cast<int>(data[i].height)));
             }
 
             // ASCII vertical bar, use this as text input cursor
@@ -509,14 +556,15 @@ namespace Gui
             {
                 MyGUI::xml::ElementPtr cursorCode = codes->createChild("Code");
                 cursorCode->addAttribute("index", MyGUI::FontCodeType::Cursor);
-                cursorCode->addAttribute("coord", MyGUI::utility::toString(x1) + " "
-                                            + MyGUI::utility::toString(y1) + " "
-                                            + MyGUI::utility::toString(w) + " "
-                                            + MyGUI::utility::toString(h));
+                cursorCode->addAttribute("coord",
+                    MyGUI::utility::toString(x1) + " " + MyGUI::utility::toString(y1) + " "
+                        + MyGUI::utility::toString(w) + " " + MyGUI::utility::toString(h));
                 cursorCode->addAttribute("advance", data[i].width);
-                cursorCode->addAttribute("bearing", MyGUI::utility::toString(data[i].kerning) + " "
-                                   + MyGUI::utility::toString((fontSize-data[i].ascent)));
-                cursorCode->addAttribute("size", MyGUI::IntSize(static_cast<int>(data[i].width), static_cast<int>(data[i].height)));
+                cursorCode->addAttribute("bearing",
+                    MyGUI::utility::toString(data[i].kerning) + " "
+                        + MyGUI::utility::toString((fontSize - data[i].ascent)));
+                cursorCode->addAttribute(
+                    "size", MyGUI::IntSize(static_cast<int>(data[i].width), static_cast<int>(data[i].height)));
             }
 
             // Question mark, use for NotDefined marker (used for glyphs not existing in the font)
@@ -524,22 +572,23 @@ namespace Gui
             {
                 MyGUI::xml::ElementPtr cursorCode = codes->createChild("Code");
                 cursorCode->addAttribute("index", MyGUI::FontCodeType::NotDefined);
-                cursorCode->addAttribute("coord", MyGUI::utility::toString(x1) + " "
-                                            + MyGUI::utility::toString(y1) + " "
-                                            + MyGUI::utility::toString(w) + " "
-                                            + MyGUI::utility::toString(h));
+                cursorCode->addAttribute("coord",
+                    MyGUI::utility::toString(x1) + " " + MyGUI::utility::toString(y1) + " "
+                        + MyGUI::utility::toString(w) + " " + MyGUI::utility::toString(h));
                 cursorCode->addAttribute("advance", data[i].width);
-                cursorCode->addAttribute("bearing", MyGUI::utility::toString(data[i].kerning) + " "
-                                   + MyGUI::utility::toString((fontSize-data[i].ascent)));
-                cursorCode->addAttribute("size", MyGUI::IntSize(static_cast<int>(data[i].width), static_cast<int>(data[i].height)));
+                cursorCode->addAttribute("bearing",
+                    MyGUI::utility::toString(data[i].kerning) + " "
+                        + MyGUI::utility::toString((fontSize - data[i].ascent)));
+                cursorCode->addAttribute(
+                    "size", MyGUI::IntSize(static_cast<int>(data[i].width), static_cast<int>(data[i].height)));
             }
         }
 
         // These are required as well, but the fonts don't provide them
-        for (int i=0; i<2; ++i)
+        for (int i = 0; i < 2; ++i)
         {
             MyGUI::FontCodeType::Enum type;
-            if(i == 0)
+            if (i == 0)
                 type = MyGUI::FontCodeType::Selected;
             else // if (i == 1)
                 type = MyGUI::FontCodeType::SelectedBack;
@@ -554,12 +603,12 @@ namespace Gui
 
         // Register the font with MyGUI
         MyGUI::ResourceManualFont* font = static_cast<MyGUI::ResourceManualFont*>(
-                    MyGUI::FactoryManager::getInstance().createObject("Resource", "ResourceManualFont"));
-        font->deserialization(root, MyGUI::Version(3,2,0));
+            MyGUI::FactoryManager::getInstance().createObject("Resource", "ResourceManualFont"));
+        font->deserialization(root, MyGUI::Version(3, 2, 0));
 
         MyGUI::ResourceManualFont* bookFont = static_cast<MyGUI::ResourceManualFont*>(
-                    MyGUI::FactoryManager::getInstance().createObject("Resource", "ResourceManualFont"));
-        bookFont->deserialization(root, MyGUI::Version(3,2,0));
+            MyGUI::FactoryManager::getInstance().createObject("Resource", "ResourceManualFont"));
+        bookFont->deserialization(root, MyGUI::Version(3, 2, 0));
         bookFont->setResourceName("Journalbook " + fontId);
 
         MyGUI::ResourceManager::getInstance().addResource(font);
@@ -573,13 +622,13 @@ namespace Gui
         {
             std::string type = resourceNode->findAttribute("type");
 
-            if (Misc::StringUtils::ciEqual(type, "ResourceSkin") ||
-                     Misc::StringUtils::ciEqual(type, "AutoSizedResourceSkin"))
+            if (Misc::StringUtils::ciEqual(type, "ResourceSkin")
+                || Misc::StringUtils::ciEqual(type, "AutoSizedResourceSkin"))
             {
                 // We should adjust line height for MyGUI widgets depending on font size
                 MyGUI::xml::ElementPtr heightNode = resourceNode->createChild("Property");
                 heightNode->addAttribute("key", "HeightLine");
-                heightNode->addAttribute("value", std::to_string(mFontHeight+2));
+                heightNode->addAttribute("value", std::to_string(mFontHeight + 2));
             }
         }
 
diff --git a/components/fontloader/fontloader.hpp b/components/fontloader/fontloader.hpp
index abc0b22bc6..194c1a54f3 100644
--- a/components/fontloader/fontloader.hpp
+++ b/components/fontloader/fontloader.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_FONTLOADER_H
 #define OPENMW_COMPONENTS_FONTLOADER_H
 
-#include <MyGUI_XmlDocument.h>
 #include <MyGUI_Version.h>
+#include <MyGUI_XmlDocument.h>
 
 #include <components/myguiplatform/myguidatamanager.hpp>
 #include <components/to_utf8/to_utf8.hpp>
@@ -25,7 +25,7 @@ namespace Gui
     class FontLoader
     {
     public:
-        FontLoader (ToUTF8::FromType encoding, const VFS::Manager* vfs, float scalingFactor);
+        FontLoader(ToUTF8::FromType encoding, const VFS::Manager* vfs, float scalingFactor);
 
         void overrideLineHeight(MyGUI::xml::ElementPtr _node, const std::string& _file, MyGUI::Version _version);
 
@@ -42,7 +42,7 @@ namespace Gui
         void loadFonts();
         void loadFont(const std::string& fontName, const std::string& fontId);
 
-        void loadBitmapFont (const std::string& fileName, const std::string& fontId);
+        void loadBitmapFont(const std::string& fileName, const std::string& fontId);
         void loadTrueTypeFont(const std::string& fileName, const std::string& fontId);
 
         FontLoader(const FontLoader&);
diff --git a/components/fx/lexer.cpp b/components/fx/lexer.cpp
index ee3e362e4d..5bb0de445f 100644
--- a/components/fx/lexer.cpp
+++ b/components/fx/lexer.cpp
@@ -1,13 +1,13 @@
 #include "lexer.hpp"
 
-#include <string_view>
-#include <string>
-#include <variant>
-#include <optional>
-#include <cstdint>
 #include <array>
 #include <cmath>
+#include <cstdint>
 #include <exception>
+#include <optional>
+#include <string>
+#include <string_view>
+#include <variant>
 
 #include <components/misc/strings/format.hpp>
 
@@ -27,7 +27,8 @@ namespace fx
             , mLine(0)
             , mBuffer(buffer)
             , mLastToken(Eof{})
-        { }
+        {
+        }
 
         Token Lexer::next()
         {
@@ -114,7 +115,7 @@ namespace fx
                 if (level == 0)
                 {
                     mHead--;
-                    auto sv = std::string_view{start, static_cast<std::string_view::size_type>(mHead + 1 - start)};
+                    auto sv = std::string_view{ start, static_cast<std::string_view::size_type>(mHead + 1 - start) };
                     mLastJumpBlock.content = sv;
                     return sv;
                 }
@@ -158,7 +159,7 @@ namespace fx
             while (true)
             {
                 if (mHead == mTail)
-                    return {Eof{}};
+                    return { Eof{} };
 
                 if (head() == '\n')
                 {
@@ -181,38 +182,38 @@ namespace fx
             if (std::isdigit(head()) || head() == '.' || head() == '-')
                 return scanNumber();
 
-            switch(head())
+            switch (head())
             {
                 case '=':
                     advance();
-                    return {Equal{}};
+                    return { Equal{} };
                 case '{':
                     advance();
-                    return {Open_bracket{}};
+                    return { Open_bracket{} };
                 case '}':
                     advance();
-                    return {Close_bracket{}};
+                    return { Close_bracket{} };
                 case '(':
                     advance();
-                    return {Open_Parenthesis{}};
+                    return { Open_Parenthesis{} };
                 case ')':
                     advance();
-                    return {Close_Parenthesis{}};
+                    return { Close_Parenthesis{} };
                 case '\"':
                     advance();
-                    return {Quote{}};
+                    return { Quote{} };
                 case ':':
                     advance();
-                    return {Colon{}};
+                    return { Colon{} };
                 case ';':
                     advance();
-                    return {SemiColon{}};
+                    return { SemiColon{} };
                 case '|':
                     advance();
-                    return {VBar{}};
+                    return { VBar{} };
                 case ',':
                     advance();
-                    return {Comma{}};
+                    return { Comma{} };
                 default:
                     error(Misc::StringUtils::format("unexpected token <%c>", head()));
             }
@@ -226,30 +227,50 @@ namespace fx
             while (mHead != mTail && (std::isalnum(head()) || head() == '_'))
                 advance();
 
-            std::string_view value{start, static_cast<std::string_view::size_type>(mHead - start)};
-
-            if (value == "shared") return Shared{};
-            if (value == "technique") return Technique{};
-            if (value == "render_target") return Render_Target{};
-            if (value == "vertex") return Vertex{};
-            if (value == "fragment") return Fragment{};
-            if (value == "compute") return Compute{};
-            if (value == "sampler_1d") return Sampler_1D{};
-            if (value == "sampler_2d") return Sampler_2D{};
-            if (value == "sampler_3d") return Sampler_3D{};
-            if (value == "uniform_bool") return Uniform_Bool{};
-            if (value == "uniform_float") return Uniform_Float{};
-            if (value == "uniform_int") return Uniform_Int{};
-            if (value == "uniform_vec2") return Uniform_Vec2{};
-            if (value == "uniform_vec3") return Uniform_Vec3{};
-            if (value == "uniform_vec4") return Uniform_Vec4{};
-            if (value == "true") return True{};
-            if (value == "false") return False{};
-            if (value == "vec2") return Vec2{};
-            if (value == "vec3") return Vec3{};
-            if (value == "vec4") return Vec4{};
-
-            return Literal{value};
+            std::string_view value{ start, static_cast<std::string_view::size_type>(mHead - start) };
+
+            if (value == "shared")
+                return Shared{};
+            if (value == "technique")
+                return Technique{};
+            if (value == "render_target")
+                return Render_Target{};
+            if (value == "vertex")
+                return Vertex{};
+            if (value == "fragment")
+                return Fragment{};
+            if (value == "compute")
+                return Compute{};
+            if (value == "sampler_1d")
+                return Sampler_1D{};
+            if (value == "sampler_2d")
+                return Sampler_2D{};
+            if (value == "sampler_3d")
+                return Sampler_3D{};
+            if (value == "uniform_bool")
+                return Uniform_Bool{};
+            if (value == "uniform_float")
+                return Uniform_Float{};
+            if (value == "uniform_int")
+                return Uniform_Int{};
+            if (value == "uniform_vec2")
+                return Uniform_Vec2{};
+            if (value == "uniform_vec3")
+                return Uniform_Vec3{};
+            if (value == "uniform_vec4")
+                return Uniform_Vec4{};
+            if (value == "true")
+                return True{};
+            if (value == "false")
+                return False{};
+            if (value == "vec2")
+                return Vec2{};
+            if (value == "vec3")
+                return Vec3{};
+            if (value == "vec4")
+                return Vec4{};
+
+            return Literal{ value };
         }
 
         Token Lexer::scanStringLiteral()
@@ -272,7 +293,7 @@ namespace fx
             if (!terminated)
                 error("unterminated string");
 
-            return String{{start, static_cast<std::string_view::size_type>(mHead - start - 1)}};
+            return String{ { start, static_cast<std::string_view::size_type>(mHead - start - 1) } };
         }
 
         Token Lexer::scanNumber()
@@ -291,10 +312,10 @@ namespace fx
             for (; tmp != endPtr; ++tmp)
             {
                 if ((*tmp == '.'))
-                    return Float{static_cast<float>(buffer)};
+                    return Float{ static_cast<float>(buffer) };
             }
 
-            return Integer{static_cast<int>(buffer)};
+            return Integer{ static_cast<int>(buffer) };
         }
     }
 }
diff --git a/components/fx/lexer.hpp b/components/fx/lexer.hpp
index e24239399c..4b8c1ddbfd 100644
--- a/components/fx/lexer.hpp
+++ b/components/fx/lexer.hpp
@@ -1,12 +1,12 @@
 #ifndef OPENMW_COMPONENTS_FX_LEXER_H
 #define OPENMW_COMPONENTS_FX_LEXER_H
 
-#include <string_view>
-#include <string>
-#include <variant>
-#include <optional>
 #include <cstdint>
+#include <optional>
 #include <stdexcept>
+#include <string>
+#include <string_view>
+#include <variant>
 
 #include <osg/Vec2f>
 #include <osg/Vec3f>
@@ -20,8 +20,14 @@ namespace fx
     {
         struct LexerException : std::runtime_error
         {
-            LexerException(const std::string& message) : std::runtime_error(message) {}
-            LexerException(const char* message) : std::runtime_error(message) {}
+            LexerException(const std::string& message)
+                : std::runtime_error(message)
+            {
+            }
+            LexerException(const char* message)
+                : std::runtime_error(message)
+            {
+            }
         };
 
         class Lexer
diff --git a/components/fx/lexer_types.hpp b/components/fx/lexer_types.hpp
index cacddff3c5..9fe13ac827 100644
--- a/components/fx/lexer_types.hpp
+++ b/components/fx/lexer_types.hpp
@@ -1,54 +1,167 @@
 #ifndef OPENMW_COMPONENTS_FX_LEXER_TYPES_H
 #define OPENMW_COMPONENTS_FX_LEXER_TYPES_H
 
-#include <variant>
 #include <string_view>
+#include <variant>
 
 namespace fx
 {
     namespace Lexer
     {
-        struct Float            { inline static constexpr std::string_view repr = "float"; float value = 0.0;};
-        struct Integer          { inline static constexpr std::string_view repr = "integer"; int value = 0;};
-        struct Boolean          { inline static constexpr std::string_view repr = "boolean"; bool value = false;};
-        struct Literal          { inline static constexpr std::string_view repr = "literal"; std::string_view value;};
-        struct String           { inline static constexpr std::string_view repr = "string"; std::string_view value;};
-        struct Shared           { inline static constexpr std::string_view repr = "shared"; };
-        struct Vertex           { inline static constexpr std::string_view repr = "vertex"; };
-        struct Fragment         { inline static constexpr std::string_view repr = "fragment"; };
-        struct Compute          { inline static constexpr std::string_view repr = "compute"; };
-        struct Technique        { inline static constexpr std::string_view repr = "technique"; };
-        struct Render_Target    { inline static constexpr std::string_view repr = "render_target"; };
-        struct Sampler_1D       { inline static constexpr std::string_view repr = "sampler_1d"; };
-        struct Sampler_2D       { inline static constexpr std::string_view repr = "sampler_2d"; };
-        struct Sampler_3D       { inline static constexpr std::string_view repr = "sampler_3d"; };
-        struct Uniform_Bool     { inline static constexpr std::string_view repr = "uniform_bool"; };
-        struct Uniform_Float    { inline static constexpr std::string_view repr = "uniform_float"; };
-        struct Uniform_Int      { inline static constexpr std::string_view repr = "uniform_int"; };
-        struct Uniform_Vec2     { inline static constexpr std::string_view repr = "uniform_vec2"; };
-        struct Uniform_Vec3     { inline static constexpr std::string_view repr = "uniform_vec3"; };
-        struct Uniform_Vec4     { inline static constexpr std::string_view repr = "uniform_vec4"; };
-        struct Eof              { inline static constexpr std::string_view repr = "eof"; };
-        struct Equal            { inline static constexpr std::string_view repr = "equal"; };
-        struct Open_bracket     { inline static constexpr std::string_view repr = "open_bracket"; };
-        struct Close_bracket    { inline static constexpr std::string_view repr = "close_bracket"; };
-        struct Open_Parenthesis { inline static constexpr std::string_view repr = "open_parenthesis"; };
-        struct Close_Parenthesis{ inline static constexpr std::string_view repr = "close_parenthesis"; };
-        struct Quote            { inline static constexpr std::string_view repr = "quote"; };
-        struct SemiColon        { inline static constexpr std::string_view repr = "semicolon"; };
-        struct Comma            { inline static constexpr std::string_view repr = "comma"; };
-        struct VBar             { inline static constexpr std::string_view repr = "vbar"; };
-        struct Colon            { inline static constexpr std::string_view repr = "colon"; };
-        struct True             { inline static constexpr std::string_view repr = "true"; };
-        struct False            { inline static constexpr std::string_view repr = "false"; };
-        struct Vec2             { inline static constexpr std::string_view repr = "vec2"; };
-        struct Vec3             { inline static constexpr std::string_view repr = "vec3"; };
-        struct Vec4             { inline static constexpr std::string_view repr = "vec4"; };
+        struct Float
+        {
+            inline static constexpr std::string_view repr = "float";
+            float value = 0.0;
+        };
+        struct Integer
+        {
+            inline static constexpr std::string_view repr = "integer";
+            int value = 0;
+        };
+        struct Boolean
+        {
+            inline static constexpr std::string_view repr = "boolean";
+            bool value = false;
+        };
+        struct Literal
+        {
+            inline static constexpr std::string_view repr = "literal";
+            std::string_view value;
+        };
+        struct String
+        {
+            inline static constexpr std::string_view repr = "string";
+            std::string_view value;
+        };
+        struct Shared
+        {
+            inline static constexpr std::string_view repr = "shared";
+        };
+        struct Vertex
+        {
+            inline static constexpr std::string_view repr = "vertex";
+        };
+        struct Fragment
+        {
+            inline static constexpr std::string_view repr = "fragment";
+        };
+        struct Compute
+        {
+            inline static constexpr std::string_view repr = "compute";
+        };
+        struct Technique
+        {
+            inline static constexpr std::string_view repr = "technique";
+        };
+        struct Render_Target
+        {
+            inline static constexpr std::string_view repr = "render_target";
+        };
+        struct Sampler_1D
+        {
+            inline static constexpr std::string_view repr = "sampler_1d";
+        };
+        struct Sampler_2D
+        {
+            inline static constexpr std::string_view repr = "sampler_2d";
+        };
+        struct Sampler_3D
+        {
+            inline static constexpr std::string_view repr = "sampler_3d";
+        };
+        struct Uniform_Bool
+        {
+            inline static constexpr std::string_view repr = "uniform_bool";
+        };
+        struct Uniform_Float
+        {
+            inline static constexpr std::string_view repr = "uniform_float";
+        };
+        struct Uniform_Int
+        {
+            inline static constexpr std::string_view repr = "uniform_int";
+        };
+        struct Uniform_Vec2
+        {
+            inline static constexpr std::string_view repr = "uniform_vec2";
+        };
+        struct Uniform_Vec3
+        {
+            inline static constexpr std::string_view repr = "uniform_vec3";
+        };
+        struct Uniform_Vec4
+        {
+            inline static constexpr std::string_view repr = "uniform_vec4";
+        };
+        struct Eof
+        {
+            inline static constexpr std::string_view repr = "eof";
+        };
+        struct Equal
+        {
+            inline static constexpr std::string_view repr = "equal";
+        };
+        struct Open_bracket
+        {
+            inline static constexpr std::string_view repr = "open_bracket";
+        };
+        struct Close_bracket
+        {
+            inline static constexpr std::string_view repr = "close_bracket";
+        };
+        struct Open_Parenthesis
+        {
+            inline static constexpr std::string_view repr = "open_parenthesis";
+        };
+        struct Close_Parenthesis
+        {
+            inline static constexpr std::string_view repr = "close_parenthesis";
+        };
+        struct Quote
+        {
+            inline static constexpr std::string_view repr = "quote";
+        };
+        struct SemiColon
+        {
+            inline static constexpr std::string_view repr = "semicolon";
+        };
+        struct Comma
+        {
+            inline static constexpr std::string_view repr = "comma";
+        };
+        struct VBar
+        {
+            inline static constexpr std::string_view repr = "vbar";
+        };
+        struct Colon
+        {
+            inline static constexpr std::string_view repr = "colon";
+        };
+        struct True
+        {
+            inline static constexpr std::string_view repr = "true";
+        };
+        struct False
+        {
+            inline static constexpr std::string_view repr = "false";
+        };
+        struct Vec2
+        {
+            inline static constexpr std::string_view repr = "vec2";
+        };
+        struct Vec3
+        {
+            inline static constexpr std::string_view repr = "vec3";
+        };
+        struct Vec4
+        {
+            inline static constexpr std::string_view repr = "vec4";
+        };
 
-        using Token = std::variant<Float, Integer, Boolean, String, Literal, Equal, Open_bracket, Close_bracket, Open_Parenthesis,
-            Close_Parenthesis, Quote, SemiColon, Comma, VBar, Colon, Shared, Technique, Render_Target, Vertex, Fragment,
-            Compute, Sampler_1D, Sampler_2D, Sampler_3D, Uniform_Bool, Uniform_Float, Uniform_Int, Uniform_Vec2, Uniform_Vec3, Uniform_Vec4,
-            True, False, Vec2, Vec3, Vec4, Eof>;
+        using Token = std::variant<Float, Integer, Boolean, String, Literal, Equal, Open_bracket, Close_bracket,
+            Open_Parenthesis, Close_Parenthesis, Quote, SemiColon, Comma, VBar, Colon, Shared, Technique, Render_Target,
+            Vertex, Fragment, Compute, Sampler_1D, Sampler_2D, Sampler_3D, Uniform_Bool, Uniform_Float, Uniform_Int,
+            Uniform_Vec2, Uniform_Vec3, Uniform_Vec4, True, False, Vec2, Vec3, Vec4, Eof>;
     }
 }
 
diff --git a/components/fx/parse_constants.hpp b/components/fx/parse_constants.hpp
index 914cfbe414..3c9e3b59c8 100644
--- a/components/fx/parse_constants.hpp
+++ b/components/fx/parse_constants.hpp
@@ -4,10 +4,10 @@
 #include <array>
 #include <string_view>
 
-#include <osg/Texture>
-#include <osg/Image>
-#include <osg/BlendFunc>
 #include <osg/BlendEquation>
+#include <osg/BlendFunc>
+#include <osg/Image>
+#include <osg/Texture>
 
 #include <components/sceneutil/color.hpp>
 
@@ -17,116 +17,116 @@ namespace fx
 {
     namespace constants
     {
-        constexpr std::array<std::pair<std::string_view, fx::FlagsType>, 6> TechniqueFlag = {{
-            {"disable_interiors"  ,  Technique::Flag_Disable_Interiors},
-            {"disable_exteriors"  ,  Technique::Flag_Disable_Exteriors},
-            {"disable_underwater" ,  Technique::Flag_Disable_Underwater},
-            {"disable_abovewater" ,  Technique::Flag_Disable_Abovewater},
-            {"disable_sunglare"   ,  Technique::Flag_Disable_SunGlare},
-            {"hidden"             ,  Technique::Flag_Hidden},
-        }};
+        constexpr std::array<std::pair<std::string_view, fx::FlagsType>, 6> TechniqueFlag = { {
+            { "disable_interiors", Technique::Flag_Disable_Interiors },
+            { "disable_exteriors", Technique::Flag_Disable_Exteriors },
+            { "disable_underwater", Technique::Flag_Disable_Underwater },
+            { "disable_abovewater", Technique::Flag_Disable_Abovewater },
+            { "disable_sunglare", Technique::Flag_Disable_SunGlare },
+            { "hidden", Technique::Flag_Hidden },
+        } };
 
-        constexpr std::array<std::pair<std::string_view, int>, 6> SourceFormat = {{
-            {"red" ,  GL_RED},
-            {"rg"  ,  GL_RG},
-            {"rgb" ,  GL_RGB},
-            {"bgr" ,  GL_BGR},
-            {"rgba",  GL_RGBA},
-            {"bgra",  GL_BGRA},
-        }};
+        constexpr std::array<std::pair<std::string_view, int>, 6> SourceFormat = { {
+            { "red", GL_RED },
+            { "rg", GL_RG },
+            { "rgb", GL_RGB },
+            { "bgr", GL_BGR },
+            { "rgba", GL_RGBA },
+            { "bgra", GL_BGRA },
+        } };
 
-        constexpr std::array<std::pair<std::string_view, int>, 9> SourceType = {{
-            {"byte"             ,  GL_BYTE},
-            {"unsigned_byte"    ,  GL_UNSIGNED_BYTE},
-            {"short"            ,  GL_SHORT},
-            {"unsigned_short"   ,  GL_UNSIGNED_SHORT},
-            {"int"              ,  GL_INT},
-            {"unsigned_int"     ,  GL_UNSIGNED_INT},
-            {"unsigned_int_24_8",  GL_UNSIGNED_INT_24_8},
-            {"float"            ,  GL_FLOAT},
-            {"double"           ,  GL_DOUBLE},
-        }};
+        constexpr std::array<std::pair<std::string_view, int>, 9> SourceType = { {
+            { "byte", GL_BYTE },
+            { "unsigned_byte", GL_UNSIGNED_BYTE },
+            { "short", GL_SHORT },
+            { "unsigned_short", GL_UNSIGNED_SHORT },
+            { "int", GL_INT },
+            { "unsigned_int", GL_UNSIGNED_INT },
+            { "unsigned_int_24_8", GL_UNSIGNED_INT_24_8 },
+            { "float", GL_FLOAT },
+            { "double", GL_DOUBLE },
+        } };
 
-        constexpr std::array<std::pair<std::string_view, int>, 16> InternalFormat = {{
-            {"red"               ,  GL_RED},
-            {"r16f"              ,  GL_R16F},
-            {"r32f"              ,  GL_R32F},
-            {"rg"                ,  GL_RG},
-            {"rg16f"             ,  GL_RG16F},
-            {"rg32f"             ,  GL_RG32F},
-            {"rgb"               ,  GL_RGB},
-            {"rgb16f"            ,  GL_RGB16F},
-            {"rgb32f"            ,  GL_RGB32F},
-            {"rgba"              ,  GL_RGBA},
-            {"rgba16f"           ,  GL_RGBA16F},
-            {"rgba32f"           ,  GL_RGBA32F},
-            {"depth_component16" ,  GL_DEPTH_COMPONENT16},
-            {"depth_component24" ,  GL_DEPTH_COMPONENT24},
-            {"depth_component32" ,  GL_DEPTH_COMPONENT32},
-            {"depth_component32f",  GL_DEPTH_COMPONENT32F},
-        }};
+        constexpr std::array<std::pair<std::string_view, int>, 16> InternalFormat = { {
+            { "red", GL_RED },
+            { "r16f", GL_R16F },
+            { "r32f", GL_R32F },
+            { "rg", GL_RG },
+            { "rg16f", GL_RG16F },
+            { "rg32f", GL_RG32F },
+            { "rgb", GL_RGB },
+            { "rgb16f", GL_RGB16F },
+            { "rgb32f", GL_RGB32F },
+            { "rgba", GL_RGBA },
+            { "rgba16f", GL_RGBA16F },
+            { "rgba32f", GL_RGBA32F },
+            { "depth_component16", GL_DEPTH_COMPONENT16 },
+            { "depth_component24", GL_DEPTH_COMPONENT24 },
+            { "depth_component32", GL_DEPTH_COMPONENT32 },
+            { "depth_component32f", GL_DEPTH_COMPONENT32F },
+        } };
 
-        constexpr std::array<std::pair<std::string_view, osg::Texture::InternalFormatMode>, 13> Compression = {{
-            {"auto"        , osg::Texture::USE_USER_DEFINED_FORMAT},
-            {"arb"         , osg::Texture::USE_ARB_COMPRESSION},
-            {"s3tc_dxt1"   , osg::Texture::USE_S3TC_DXT1_COMPRESSION},
-            {"s3tc_dxt3"   , osg::Texture::USE_S3TC_DXT3_COMPRESSION},
-            {"s3tc_dxt5"   , osg::Texture::USE_S3TC_DXT5_COMPRESSION},
-            {"pvrtc_2bpp"  , osg::Texture::USE_PVRTC_2BPP_COMPRESSION},
-            {"pvrtc_4bpp"  , osg::Texture::USE_PVRTC_4BPP_COMPRESSION},
-            {"etc"         , osg::Texture::USE_ETC_COMPRESSION},
-            {"etc2"        , osg::Texture::USE_ETC2_COMPRESSION},
-            {"rgtc1"       , osg::Texture::USE_RGTC1_COMPRESSION},
-            {"rgtc2"       , osg::Texture::USE_RGTC2_COMPRESSION},
-            {"s3tc_dxt1c"  , osg::Texture::USE_S3TC_DXT1c_COMPRESSION},
-            {"s3tc_dxt1a"  , osg::Texture::USE_S3TC_DXT1a_COMPRESSION},
-        }};
+        constexpr std::array<std::pair<std::string_view, osg::Texture::InternalFormatMode>, 13> Compression = { {
+            { "auto", osg::Texture::USE_USER_DEFINED_FORMAT },
+            { "arb", osg::Texture::USE_ARB_COMPRESSION },
+            { "s3tc_dxt1", osg::Texture::USE_S3TC_DXT1_COMPRESSION },
+            { "s3tc_dxt3", osg::Texture::USE_S3TC_DXT3_COMPRESSION },
+            { "s3tc_dxt5", osg::Texture::USE_S3TC_DXT5_COMPRESSION },
+            { "pvrtc_2bpp", osg::Texture::USE_PVRTC_2BPP_COMPRESSION },
+            { "pvrtc_4bpp", osg::Texture::USE_PVRTC_4BPP_COMPRESSION },
+            { "etc", osg::Texture::USE_ETC_COMPRESSION },
+            { "etc2", osg::Texture::USE_ETC2_COMPRESSION },
+            { "rgtc1", osg::Texture::USE_RGTC1_COMPRESSION },
+            { "rgtc2", osg::Texture::USE_RGTC2_COMPRESSION },
+            { "s3tc_dxt1c", osg::Texture::USE_S3TC_DXT1c_COMPRESSION },
+            { "s3tc_dxt1a", osg::Texture::USE_S3TC_DXT1a_COMPRESSION },
+        } };
 
-        constexpr std::array<std::pair<std::string_view, osg::Texture::WrapMode>, 6> WrapMode = {{
-            {"clamp"          , osg::Texture::CLAMP},
-            {"clamp_to_edge"  , osg::Texture::CLAMP_TO_EDGE},
-            {"clamp_to_border", osg::Texture::CLAMP_TO_BORDER},
-            {"repeat"         , osg::Texture::REPEAT},
-            {"mirror"         , osg::Texture::MIRROR},
-        }};
+        constexpr std::array<std::pair<std::string_view, osg::Texture::WrapMode>, 6> WrapMode = { {
+            { "clamp", osg::Texture::CLAMP },
+            { "clamp_to_edge", osg::Texture::CLAMP_TO_EDGE },
+            { "clamp_to_border", osg::Texture::CLAMP_TO_BORDER },
+            { "repeat", osg::Texture::REPEAT },
+            { "mirror", osg::Texture::MIRROR },
+        } };
 
-        constexpr std::array<std::pair<std::string_view, osg::Texture::FilterMode>, 6> FilterMode = {{
-            {"linear"                , osg::Texture::LINEAR},
-            {"linear_mipmap_linear"  , osg::Texture::LINEAR_MIPMAP_LINEAR},
-            {"linear_mipmap_nearest" , osg::Texture::LINEAR_MIPMAP_NEAREST},
-            {"nearest"               , osg::Texture::NEAREST},
-            {"nearest_mipmap_linear" , osg::Texture::NEAREST_MIPMAP_LINEAR},
-            {"nearest_mipmap_nearest", osg::Texture::NEAREST_MIPMAP_NEAREST},
-        }};
+        constexpr std::array<std::pair<std::string_view, osg::Texture::FilterMode>, 6> FilterMode = { {
+            { "linear", osg::Texture::LINEAR },
+            { "linear_mipmap_linear", osg::Texture::LINEAR_MIPMAP_LINEAR },
+            { "linear_mipmap_nearest", osg::Texture::LINEAR_MIPMAP_NEAREST },
+            { "nearest", osg::Texture::NEAREST },
+            { "nearest_mipmap_linear", osg::Texture::NEAREST_MIPMAP_LINEAR },
+            { "nearest_mipmap_nearest", osg::Texture::NEAREST_MIPMAP_NEAREST },
+        } };
 
-        constexpr std::array<std::pair<std::string_view, osg::BlendFunc::BlendFuncMode>, 15> BlendFunc = {{
-            {"dst_alpha"                , osg::BlendFunc::DST_ALPHA},
-            {"dst_color"                , osg::BlendFunc::DST_COLOR},
-            {"one"                      , osg::BlendFunc::ONE},
-            {"one_minus_dst_alpha"      , osg::BlendFunc::ONE_MINUS_DST_ALPHA},
-            {"one_minus_dst_color"      , osg::BlendFunc::ONE_MINUS_DST_COLOR},
-            {"one_minus_src_alpha"      , osg::BlendFunc::ONE_MINUS_SRC_ALPHA},
-            {"one_minus_src_color"      , osg::BlendFunc::ONE_MINUS_SRC_COLOR},
-            {"src_alpha"                , osg::BlendFunc::SRC_ALPHA},
-            {"src_alpha_saturate"       , osg::BlendFunc::SRC_ALPHA_SATURATE},
-            {"src_color"                , osg::BlendFunc::SRC_COLOR},
-            {"constant_color"           , osg::BlendFunc::CONSTANT_COLOR},
-            {"one_minus_constant_color" , osg::BlendFunc::ONE_MINUS_CONSTANT_COLOR},
-            {"constant_alpha"           , osg::BlendFunc::CONSTANT_ALPHA},
-            {"one_minus_constant_alpha" , osg::BlendFunc::ONE_MINUS_CONSTANT_ALPHA},
-            {"zero"                     , osg::BlendFunc::ZERO},
-        }};
+        constexpr std::array<std::pair<std::string_view, osg::BlendFunc::BlendFuncMode>, 15> BlendFunc = { {
+            { "dst_alpha", osg::BlendFunc::DST_ALPHA },
+            { "dst_color", osg::BlendFunc::DST_COLOR },
+            { "one", osg::BlendFunc::ONE },
+            { "one_minus_dst_alpha", osg::BlendFunc::ONE_MINUS_DST_ALPHA },
+            { "one_minus_dst_color", osg::BlendFunc::ONE_MINUS_DST_COLOR },
+            { "one_minus_src_alpha", osg::BlendFunc::ONE_MINUS_SRC_ALPHA },
+            { "one_minus_src_color", osg::BlendFunc::ONE_MINUS_SRC_COLOR },
+            { "src_alpha", osg::BlendFunc::SRC_ALPHA },
+            { "src_alpha_saturate", osg::BlendFunc::SRC_ALPHA_SATURATE },
+            { "src_color", osg::BlendFunc::SRC_COLOR },
+            { "constant_color", osg::BlendFunc::CONSTANT_COLOR },
+            { "one_minus_constant_color", osg::BlendFunc::ONE_MINUS_CONSTANT_COLOR },
+            { "constant_alpha", osg::BlendFunc::CONSTANT_ALPHA },
+            { "one_minus_constant_alpha", osg::BlendFunc::ONE_MINUS_CONSTANT_ALPHA },
+            { "zero", osg::BlendFunc::ZERO },
+        } };
 
-        constexpr std::array<std::pair<std::string_view, osg::BlendEquation::Equation>, 8> BlendEquation = {{
-            {"rgba_min"             , osg::BlendEquation::RGBA_MIN},
-            {"rgba_max"             , osg::BlendEquation::RGBA_MAX},
-            {"alpha_min"            , osg::BlendEquation::ALPHA_MIN},
-            {"alpha_max"            , osg::BlendEquation::ALPHA_MAX},
-            {"logic_op"             , osg::BlendEquation::LOGIC_OP},
-            {"add"                  , osg::BlendEquation::FUNC_ADD},
-            {"subtract"             , osg::BlendEquation::FUNC_SUBTRACT},
-            {"reverse_subtract"     , osg::BlendEquation::FUNC_REVERSE_SUBTRACT},
-        }};
+        constexpr std::array<std::pair<std::string_view, osg::BlendEquation::Equation>, 8> BlendEquation = { {
+            { "rgba_min", osg::BlendEquation::RGBA_MIN },
+            { "rgba_max", osg::BlendEquation::RGBA_MAX },
+            { "alpha_min", osg::BlendEquation::ALPHA_MIN },
+            { "alpha_max", osg::BlendEquation::ALPHA_MAX },
+            { "logic_op", osg::BlendEquation::LOGIC_OP },
+            { "add", osg::BlendEquation::FUNC_ADD },
+            { "subtract", osg::BlendEquation::FUNC_SUBTRACT },
+            { "reverse_subtract", osg::BlendEquation::FUNC_REVERSE_SUBTRACT },
+        } };
     }
 }
 
diff --git a/components/fx/pass.cpp b/components/fx/pass.cpp
index 709facc66f..3117364b30 100644
--- a/components/fx/pass.cpp
+++ b/components/fx/pass.cpp
@@ -1,24 +1,24 @@
 #include "pass.hpp"
 
-#include <unordered_set>
-#include <string>
 #include <sstream>
+#include <string>
+#include <unordered_set>
 
+#include <osg/BindImageTexture>
+#include <osg/FrameBufferObject>
 #include <osg/Program>
 #include <osg/Shader>
 #include <osg/State>
 #include <osg/StateSet>
-#include <osg/BindImageTexture>
-#include <osg/FrameBufferObject>
 
-#include <components/sceneutil/util.hpp>
-#include <components/sceneutil/lightmanager.hpp>
-#include <components/sceneutil/clearcolor.hpp>
 #include <components/resource/scenemanager.hpp>
+#include <components/sceneutil/clearcolor.hpp>
+#include <components/sceneutil/lightmanager.hpp>
+#include <components/sceneutil/util.hpp>
 #include <components/stereo/multiview.hpp>
 
-#include "technique.hpp"
 #include "stateupdater.hpp"
+#include "technique.hpp"
 
 namespace
 {
@@ -249,35 +249,32 @@ float omw_EstimateFogCoverageFromUV(vec2 uv)
 
         std::stringstream extBlock;
         for (const auto& extension : technique.getGLSLExtensions())
-            extBlock << "#ifdef " << extension << '\n' << "\t#extension " << extension << ": enable" << '\n' << "#endif" << '\n';
-
-        const std::vector<std::pair<std::string,std::string>> defines = {
-            {"@pointLightCount", std::to_string(SceneUtil::PPLightBuffer::sMaxPPLightsArraySize)},
-            {"@version", std::to_string(technique.getGLSLVersion())},
-            {"@multiview", Stereo::getMultiview() ? "1" : "0"},
-            {"@builtinSampler", Stereo::getMultiview() ? "sampler2DArray" : "sampler2D"},
-            {"@profile", technique.getGLSLProfile()},
-            {"@extensions", extBlock.str()},
-            {"@uboStruct", StateUpdater::getStructDefinition()},
-            {"@ubo", mUBO ? "1" : "0"},
-            {"@normals", technique.getNormals() ? "1" : "0"},
-            {"@reverseZ", SceneUtil::AutoDepth::isReversed() ? "1" : "0"},
-            {"@radialFog", Settings::Manager::getBool("radial fog", "Fog") ? "1" : "0"},
-            {"@exponentialFog", Settings::Manager::getBool("exponential fog", "Fog") ? "1" : "0"},
-            {"@hdr", technique.getHDR() ? "1" : "0"},
-            {"@in", mLegacyGLSL ? "varying" : "in"},
-            {"@out", mLegacyGLSL ? "varying" : "out"},
-            {"@position", "gl_Position"},
-            {"@texture1D", mLegacyGLSL ? "texture1D" : "texture"},
-            {"@texture2D", mLegacyGLSL ? "texture2D" : "texture"},
-            {"@texture3D", mLegacyGLSL ? "texture3D" : "texture"},
-            {"@vertex", mLegacyGLSL ? "gl_Vertex" : "_omw_Vertex"},
-            {"@fragColor", mLegacyGLSL ? "gl_FragColor" : "_omw_FragColor"},
-            {"@useBindings", mLegacyGLSL ? "0" : "1"},
-            {"@fragBinding", mLegacyGLSL ? "" : "out vec4 omw_FragColor;"}
-        };
-
-        for (const auto& [define, value]: defines)
+            extBlock << "#ifdef " << extension << '\n'
+                     << "\t#extension " << extension << ": enable" << '\n'
+                     << "#endif" << '\n';
+
+        const std::vector<std::pair<std::string, std::string>> defines
+            = { { "@pointLightCount", std::to_string(SceneUtil::PPLightBuffer::sMaxPPLightsArraySize) },
+                  { "@version", std::to_string(technique.getGLSLVersion()) },
+                  { "@multiview", Stereo::getMultiview() ? "1" : "0" },
+                  { "@builtinSampler", Stereo::getMultiview() ? "sampler2DArray" : "sampler2D" },
+                  { "@profile", technique.getGLSLProfile() }, { "@extensions", extBlock.str() },
+                  { "@uboStruct", StateUpdater::getStructDefinition() }, { "@ubo", mUBO ? "1" : "0" },
+                  { "@normals", technique.getNormals() ? "1" : "0" },
+                  { "@reverseZ", SceneUtil::AutoDepth::isReversed() ? "1" : "0" },
+                  { "@radialFog", Settings::Manager::getBool("radial fog", "Fog") ? "1" : "0" },
+                  { "@exponentialFog", Settings::Manager::getBool("exponential fog", "Fog") ? "1" : "0" },
+                  { "@hdr", technique.getHDR() ? "1" : "0" }, { "@in", mLegacyGLSL ? "varying" : "in" },
+                  { "@out", mLegacyGLSL ? "varying" : "out" }, { "@position", "gl_Position" },
+                  { "@texture1D", mLegacyGLSL ? "texture1D" : "texture" },
+                  { "@texture2D", mLegacyGLSL ? "texture2D" : "texture" },
+                  { "@texture3D", mLegacyGLSL ? "texture3D" : "texture" },
+                  { "@vertex", mLegacyGLSL ? "gl_Vertex" : "_omw_Vertex" },
+                  { "@fragColor", mLegacyGLSL ? "gl_FragColor" : "_omw_FragColor" },
+                  { "@useBindings", mLegacyGLSL ? "0" : "1" },
+                  { "@fragBinding", mLegacyGLSL ? "" : "out vec4 omw_FragColor;" } };
+
+        for (const auto& [define, value] : defines)
             for (size_t pos = header.find(define); pos != std::string::npos; pos = header.find(define))
                 header.replace(pos, define.size(), value);
 
@@ -347,7 +344,8 @@ float omw_EstimateFogCoverageFromUV(vec2 uv)
         if (mType == Type::Pixel)
         {
             if (!mVertex)
-                mVertex = new osg::Shader(osg::Shader::VERTEX, Stereo::getMultiview() ? s_DefaultVertexMultiview : s_DefaultVertex);
+                mVertex = new osg::Shader(
+                    osg::Shader::VERTEX, Stereo::getMultiview() ? s_DefaultVertexMultiview : s_DefaultVertex);
 
             mVertex->setShaderSource(getPassHeader(technique, preamble).append(mVertex->getShaderSource()));
             mFragment->setShaderSource(getPassHeader(technique, preamble, true).append(mFragment->getShaderSource()));
diff --git a/components/fx/pass.hpp b/components/fx/pass.hpp
index 829fb716cf..51e05ca6fe 100644
--- a/components/fx/pass.hpp
+++ b/components/fx/pass.hpp
@@ -2,18 +2,18 @@
 #define OPENMW_COMPONENTS_FX_PASS_H
 
 #include <array>
-#include <string>
 #include <cstdint>
-#include <unordered_set>
 #include <optional>
+#include <string>
+#include <unordered_set>
 
-#include <osg/Timer>
+#include <osg/BlendEquation>
+#include <osg/BlendFunc>
 #include <osg/Program>
 #include <osg/Shader>
 #include <osg/State>
 #include <osg/Texture2D>
-#include <osg/BlendEquation>
-#include <osg/BlendFunc>
+#include <osg/Timer>
 
 namespace fx
 {
@@ -22,7 +22,6 @@ namespace fx
     class Pass
     {
     public:
-
         enum class Order
         {
             Forward,
@@ -38,7 +37,7 @@ namespace fx
 
         friend class Technique;
 
-        Pass(Type type=Type::Pixel, Order order=Order::Post, bool ubo = false);
+        Pass(Type type = Type::Pixel, Order order = Order::Post, bool ubo = false);
 
         void compile(Technique& technique, std::string_view preamble);
 
diff --git a/components/fx/stateupdater.cpp b/components/fx/stateupdater.cpp
index 00034b54f0..3bcc967172 100644
--- a/components/fx/stateupdater.cpp
+++ b/components/fx/stateupdater.cpp
@@ -1,14 +1,17 @@
 #include "stateupdater.hpp"
 
-#include <osg/BufferObject>
 #include <osg/BufferIndexBinding>
+#include <osg/BufferObject>
 
-#include <components/resource/scenemanager.hpp>
 #include <components/debug/debuglog.hpp>
+#include <components/resource/scenemanager.hpp>
 
 namespace fx
 {
-    StateUpdater::StateUpdater(bool useUBO) : mUseUBO(useUBO) {}
+    StateUpdater::StateUpdater(bool useUBO)
+        : mUseUBO(useUBO)
+    {
+    }
 
     void StateUpdater::setDefaults(osg::StateSet* stateset)
     {
@@ -16,22 +19,24 @@ namespace fx
         {
             osg::ref_ptr<osg::UniformBufferObject> ubo = new osg::UniformBufferObject;
 
-            osg::ref_ptr<osg::BufferTemplate<UniformData::BufferType>> data = new osg::BufferTemplate<UniformData::BufferType>();
+            osg::ref_ptr<osg::BufferTemplate<UniformData::BufferType>> data
+                = new osg::BufferTemplate<UniformData::BufferType>();
             data->setBufferObject(ubo);
 
-            osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Resource::SceneManager::UBOBinding::PostProcessor), data, 0, mData.getGPUSize());
+            osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(
+                static_cast<int>(Resource::SceneManager::UBOBinding::PostProcessor), data, 0, mData.getGPUSize());
 
             stateset->setAttributeAndModes(ubb, osg::StateAttribute::ON);
         }
         else
         {
-            const auto createUniform = [&] (const auto& v) {
+            const auto createUniform = [&](const auto& v) {
                 using T = std::decay_t<decltype(v)>;
                 std::string name = "omw." + std::string(T::sName);
                 stateset->addUniform(new osg::Uniform(name.c_str(), mData.get<T>()));
             };
 
-            std::apply([&] (const auto& ... v) { (createUniform(v) , ...); }, mData.getData());
+            std::apply([&](const auto&... v) { (createUniform(v), ...); }, mData.getData());
         }
     }
 
@@ -39,7 +44,9 @@ namespace fx
     {
         if (mUseUBO)
         {
-            osg::UniformBufferBinding* ubb = dynamic_cast<osg::UniformBufferBinding*>(stateset->getAttribute(osg::StateAttribute::UNIFORMBUFFERBINDING, static_cast<int>(Resource::SceneManager::UBOBinding::PostProcessor)));
+            osg::UniformBufferBinding* ubb = dynamic_cast<osg::UniformBufferBinding*>(
+                stateset->getAttribute(osg::StateAttribute::UNIFORMBUFFERBINDING,
+                    static_cast<int>(Resource::SceneManager::UBOBinding::PostProcessor)));
             if (!ubb)
                 throw std::runtime_error("StateUpdater::apply: failed to get an UniformBufferBinding!");
 
@@ -50,13 +57,13 @@ namespace fx
         }
         else
         {
-            const auto setUniform = [&] (const auto& v) {
+            const auto setUniform = [&](const auto& v) {
                 using T = std::decay_t<decltype(v)>;
                 std::string name = "omw." + std::string(T::sName);
                 stateset->getUniform(name)->set(mData.get<T>());
             };
 
-            std::apply([&] (const auto& ... v) { (setUniform(v) , ...); }, mData.getData());
+            std::apply([&](const auto&... v) { (setUniform(v), ...); }, mData.getData());
         }
 
         if (mPointLightBuffer)
diff --git a/components/fx/stateupdater.hpp b/components/fx/stateupdater.hpp
index 0ea217c8ec..529d11cc18 100644
--- a/components/fx/stateupdater.hpp
+++ b/components/fx/stateupdater.hpp
@@ -20,13 +20,13 @@ namespace fx
             mData.get<InvProjectionMatrix>() = osg::Matrixf::inverse(matrix);
         }
 
-        void setViewMatrix(const osg::Matrixf& matrix) 
-        { 
+        void setViewMatrix(const osg::Matrixf& matrix)
+        {
             mData.get<ViewMatrix>() = matrix;
             mData.get<InvViewMatrix>() = osg::Matrixf::inverse(matrix);
         }
 
-        void setPrevViewMatrix(const osg::Matrixf& matrix) { mData.get<PrevViewMatrix>() = matrix;}
+        void setPrevViewMatrix(const osg::Matrixf& matrix) { mData.get<PrevViewMatrix>() = matrix; }
 
         void setEyePos(const osg::Vec3f& pos) { mData.get<EyePos>() = osg::Vec4f(pos, 0.f); }
 
@@ -47,13 +47,10 @@ namespace fx
         void setResolution(const osg::Vec2f& size)
         {
             mData.get<Resolution>() = size;
-            mData.get<RcpResolution>() = {1.f / size.x(), 1.f / size.y()};
+            mData.get<RcpResolution>() = { 1.f / size.x(), 1.f / size.y() };
         }
 
-        void setSunVis(float vis)
-        {
-            mData.get<SunVis>() = vis;
-        }
+        void setSunVis(float vis) { mData.get<SunVis>() = vis; }
 
         void setFogRange(float near, float far)
         {
@@ -89,13 +86,13 @@ namespace fx
 
         void setWindSpeed(float speed) { mData.get<WindSpeed>() = speed; }
 
-        void setWeatherTransition(float transition) { mData.get<WeatherTransition>() = transition > 0 ? 1 - transition : 0; }
-
-        void bindPointLights(std::shared_ptr<SceneUtil::PPLightBuffer> buffer)
+        void setWeatherTransition(float transition)
         {
-            mPointLightBuffer = buffer;
+            mData.get<WeatherTransition>() = transition > 0 ? 1 - transition : 0;
         }
 
+        void bindPointLights(std::shared_ptr<SceneUtil::PPLightBuffer> buffer) { mPointLightBuffer = buffer; }
+
         static std::string getStructDefinition()
         {
             static std::string definition = UniformData::getDefinition("_omw_data");
@@ -107,95 +104,155 @@ namespace fx
         void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override;
 
     private:
-        struct ProjectionMatrix : std140::Mat4 { static constexpr std::string_view sName = "projectionMatrix"; };
+        struct ProjectionMatrix : std140::Mat4
+        {
+            static constexpr std::string_view sName = "projectionMatrix";
+        };
 
-        struct InvProjectionMatrix : std140::Mat4 { static constexpr std::string_view sName = "invProjectionMatrix"; };
+        struct InvProjectionMatrix : std140::Mat4
+        {
+            static constexpr std::string_view sName = "invProjectionMatrix";
+        };
 
-        struct ViewMatrix : std140::Mat4 { static constexpr std::string_view sName = "viewMatrix"; };
+        struct ViewMatrix : std140::Mat4
+        {
+            static constexpr std::string_view sName = "viewMatrix";
+        };
 
-        struct PrevViewMatrix : std140::Mat4 { static constexpr std::string_view sName = "prevViewMatrix"; };
+        struct PrevViewMatrix : std140::Mat4
+        {
+            static constexpr std::string_view sName = "prevViewMatrix";
+        };
 
-        struct InvViewMatrix : std140::Mat4 { static constexpr std::string_view sName = "invViewMatrix"; };
+        struct InvViewMatrix : std140::Mat4
+        {
+            static constexpr std::string_view sName = "invViewMatrix";
+        };
 
-        struct EyePos : std140::Vec4 { static constexpr std::string_view sName = "eyePos"; };
+        struct EyePos : std140::Vec4
+        {
+            static constexpr std::string_view sName = "eyePos";
+        };
 
-        struct EyeVec : std140::Vec4 { static constexpr std::string_view sName = "eyeVec"; };
+        struct EyeVec : std140::Vec4
+        {
+            static constexpr std::string_view sName = "eyeVec";
+        };
 
-        struct FogColor : std140::Vec4 { static constexpr std::string_view sName = "fogColor"; };
+        struct FogColor : std140::Vec4
+        {
+            static constexpr std::string_view sName = "fogColor";
+        };
 
-        struct SunColor : std140::Vec4 { static constexpr std::string_view sName = "sunColor"; };
+        struct SunColor : std140::Vec4
+        {
+            static constexpr std::string_view sName = "sunColor";
+        };
 
-        struct SunPos : std140::Vec4 { static constexpr std::string_view sName = "sunPos"; };
+        struct SunPos : std140::Vec4
+        {
+            static constexpr std::string_view sName = "sunPos";
+        };
 
-        struct Resolution : std140::Vec2 { static constexpr std::string_view sName = "resolution"; };
+        struct Resolution : std140::Vec2
+        {
+            static constexpr std::string_view sName = "resolution";
+        };
 
-        struct RcpResolution : std140::Vec2 { static constexpr std::string_view sName = "rcpResolution"; };
+        struct RcpResolution : std140::Vec2
+        {
+            static constexpr std::string_view sName = "rcpResolution";
+        };
 
-        struct FogNear : std140::Float { static constexpr std::string_view sName = "fogNear"; };
+        struct FogNear : std140::Float
+        {
+            static constexpr std::string_view sName = "fogNear";
+        };
 
-        struct FogFar : std140::Float { static constexpr std::string_view sName = "fogFar"; };
+        struct FogFar : std140::Float
+        {
+            static constexpr std::string_view sName = "fogFar";
+        };
 
-        struct Near : std140::Float { static constexpr std::string_view sName = "near"; };
+        struct Near : std140::Float
+        {
+            static constexpr std::string_view sName = "near";
+        };
 
-        struct Far : std140::Float { static constexpr std::string_view sName = "far"; };
+        struct Far : std140::Float
+        {
+            static constexpr std::string_view sName = "far";
+        };
 
-        struct Fov : std140::Float { static constexpr std::string_view sName = "fov"; };
+        struct Fov : std140::Float
+        {
+            static constexpr std::string_view sName = "fov";
+        };
 
-        struct GameHour : std140::Float { static constexpr std::string_view sName = "gameHour"; };
+        struct GameHour : std140::Float
+        {
+            static constexpr std::string_view sName = "gameHour";
+        };
 
-        struct SunVis : std140::Float { static constexpr std::string_view sName = "sunVis"; };
+        struct SunVis : std140::Float
+        {
+            static constexpr std::string_view sName = "sunVis";
+        };
 
-        struct WaterHeight : std140::Float { static constexpr std::string_view sName = "waterHeight"; };
+        struct WaterHeight : std140::Float
+        {
+            static constexpr std::string_view sName = "waterHeight";
+        };
 
-        struct IsWaterEnabled : std140::Bool { static constexpr std::string_view sName = "isWaterEnabled"; };
+        struct IsWaterEnabled : std140::Bool
+        {
+            static constexpr std::string_view sName = "isWaterEnabled";
+        };
 
-        struct SimulationTime : std140::Float { static constexpr std::string_view sName = "simulationTime"; };
+        struct SimulationTime : std140::Float
+        {
+            static constexpr std::string_view sName = "simulationTime";
+        };
 
-        struct DeltaSimulationTime : std140::Float { static constexpr std::string_view sName = "deltaSimulationTime"; };
+        struct DeltaSimulationTime : std140::Float
+        {
+            static constexpr std::string_view sName = "deltaSimulationTime";
+        };
 
-        struct WindSpeed : std140::Float { static constexpr std::string_view sName = "windSpeed"; };
+        struct WindSpeed : std140::Float
+        {
+            static constexpr std::string_view sName = "windSpeed";
+        };
 
-        struct WeatherTransition : std140::Float { static constexpr std::string_view sName = "weatherTransition"; };
+        struct WeatherTransition : std140::Float
+        {
+            static constexpr std::string_view sName = "weatherTransition";
+        };
 
-        struct WeatherID : std140::Int { static constexpr std::string_view sName = "weatherID"; };
+        struct WeatherID : std140::Int
+        {
+            static constexpr std::string_view sName = "weatherID";
+        };
 
-        struct NextWeatherID : std140::Int { static constexpr std::string_view sName = "nextWeatherID"; };
+        struct NextWeatherID : std140::Int
+        {
+            static constexpr std::string_view sName = "nextWeatherID";
+        };
 
-        struct IsUnderwater : std140::Bool { static constexpr std::string_view sName = "isUnderwater"; };
+        struct IsUnderwater : std140::Bool
+        {
+            static constexpr std::string_view sName = "isUnderwater";
+        };
 
-        struct IsInterior : std140::Bool { static constexpr std::string_view sName = "isInterior"; };
+        struct IsInterior : std140::Bool
+        {
+            static constexpr std::string_view sName = "isInterior";
+        };
 
-        using UniformData = std140::UBO<
-            ProjectionMatrix,
-            InvProjectionMatrix,
-            ViewMatrix,
-            PrevViewMatrix,
-            InvViewMatrix,
-            EyePos,
-            EyeVec,
-            FogColor,
-            SunColor,
-            SunPos,
-            Resolution,
-            RcpResolution,
-            FogNear,
-            FogFar,
-            Near,
-            Far,
-            Fov,
-            GameHour,
-            SunVis,
-            WaterHeight,
-            IsWaterEnabled,
-            SimulationTime,
-            DeltaSimulationTime,
-            WindSpeed,
-            WeatherTransition,
-            WeatherID,
-            NextWeatherID,
-            IsUnderwater,
-            IsInterior
-        >;
+        using UniformData = std140::UBO<ProjectionMatrix, InvProjectionMatrix, ViewMatrix, PrevViewMatrix,
+            InvViewMatrix, EyePos, EyeVec, FogColor, SunColor, SunPos, Resolution, RcpResolution, FogNear, FogFar, Near,
+            Far, Fov, GameHour, SunVis, WaterHeight, IsWaterEnabled, SimulationTime, DeltaSimulationTime, WindSpeed,
+            WeatherTransition, WeatherID, NextWeatherID, IsUnderwater, IsInterior>;
 
         UniformData mData;
         bool mUseUBO;
diff --git a/components/fx/technique.cpp b/components/fx/technique.cpp
index c2de7aaa89..e76a6d2551 100644
--- a/components/fx/technique.cpp
+++ b/components/fx/technique.cpp
@@ -4,20 +4,20 @@
 #include <string>
 #include <utility>
 
+#include <osg/CullStack>
 #include <osg/Texture1D>
 #include <osg/Texture2D>
 #include <osg/Texture3D>
-#include <osg/CullStack>
 
 #include <SDL_opengl_glext.h>
 
-#include <components/vfs/manager.hpp>
-#include <components/stereo/multiview.hpp>
-#include <components/misc/strings/algorithm.hpp>
-#include <components/sceneutil/util.hpp>
-#include <components/resource/imagemanager.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/files/conversion.hpp>
+#include <components/misc/strings/algorithm.hpp>
+#include <components/resource/imagemanager.hpp>
+#include <components/sceneutil/util.hpp>
+#include <components/stereo/multiview.hpp>
+#include <components/vfs/manager.hpp>
 
 #include "parse_constants.hpp"
 
@@ -29,7 +29,7 @@ namespace
         osg::Texture::WrapMode wrap_t = osg::Texture::CLAMP_TO_EDGE;
         osg::Texture::WrapMode wrap_r = osg::Texture::CLAMP_TO_EDGE;
         osg::Texture::FilterMode min_filter = osg::Texture::LINEAR_MIPMAP_LINEAR;
-        osg::Texture::FilterMode mag_filter =osg::Texture::LINEAR;
+        osg::Texture::FilterMode mag_filter = osg::Texture::LINEAR;
         osg::Texture::InternalFormatMode compression = osg::Texture::USE_IMAGE_DATA_FORMAT;
         std::optional<int> source_format;
         std::optional<int> source_type;
@@ -39,9 +39,11 @@ namespace
 
 namespace fx
 {
-    Technique::Technique(const VFS::Manager& vfs, Resource::ImageManager& imageManager, std::string  name, int width, int height, bool ubo, bool supportsNormals)
+    Technique::Technique(const VFS::Manager& vfs, Resource::ImageManager& imageManager, std::string name, int width,
+        int height, bool ubo, bool supportsNormals)
         : mName(std::move(name))
-        , mFileName(Files::pathToUnicodeString((Files::pathFromUnicodeString(Technique::sSubdir) / (mName + Technique::sExt))))
+        , mFileName(Files::pathToUnicodeString(
+              (Files::pathFromUnicodeString(Technique::sSubdir) / (mName + Technique::sExt))))
         , mLastModificationTime(std::filesystem::file_time_type())
         , mWidth(width)
         , mHeight(height)
@@ -84,16 +86,14 @@ namespace fx
         auto block = mLexer->getLastJumpBlock();
         std::string content = std::string(block.content);
 
-        content = "\n#line " + std::to_string(block.line + 1) + "\n"  + std::string(block.content) + "\n";
+        content = "\n#line " + std::to_string(block.line + 1) + "\n" + std::string(block.content) + "\n";
         return content;
     }
 
     Technique::UniformMap::iterator Technique::findUniform(const std::string& name)
     {
-        return std::find_if(mDefinedUniforms.begin(), mDefinedUniforms.end(), [&name](const auto& uniform)
-        {
-            return uniform->mName == name;
-        });
+        return std::find_if(mDefinedUniforms.begin(), mDefinedUniforms.end(),
+            [&name](const auto& uniform) { return uniform->mName == name; });
     }
 
     bool Technique::compile()
@@ -124,13 +124,17 @@ namespace fx
                 auto it = mPassMap.find(name);
 
                 if (it == mPassMap.end())
-                    error(Misc::StringUtils::format("pass '%s' was found in the pass list, but there was no matching 'fragment', 'vertex' or 'compute' block", std::string(name)));
+                    error(
+                        Misc::StringUtils::format("pass '%s' was found in the pass list, but there was no matching "
+                                                  "'fragment', 'vertex' or 'compute' block",
+                            std::string(name)));
 
                 if (mLastAppliedType != Pass::Type::None && mLastAppliedType != it->second->mType)
                 {
                     swaps++;
                     if (swaps == 2)
-                        Log(Debug::Warning) << "compute and pixel shaders are being swapped multiple times in shader chain, this can lead to serious performance drain.";
+                        Log(Debug::Warning) << "compute and pixel shaders are being swapped multiple times in shader "
+                                               "chain, this can lead to serious performance drain.";
                 }
                 else
                     mLastAppliedType = it->second->mType;
@@ -159,12 +163,13 @@ namespace fx
 
             mValid = true;
         }
-        catch(const std::runtime_error& e)
+        catch (const std::runtime_error& e)
         {
             clear();
             mStatus = Status::Parse_Error;
 
-            mLastError = "Failed parsing technique '" + getName() + "' "  + e.what();;
+            mLastError = "Failed parsing technique '" + getName() + "' " + e.what();
+            ;
             Log(Debug::Error) << mLastError;
         }
 
@@ -193,7 +198,7 @@ namespace fx
         mLexer->error(msg);
     }
 
-    template<>
+    template <>
     void Technique::parseBlockImp<Lexer::Shared>()
     {
         if (!mLexer->jump())
@@ -205,7 +210,7 @@ namespace fx
         mShared = getBlockWithLineDirective();
     }
 
-    template<>
+    template <>
     void Technique::parseBlockImp<Lexer::Technique>()
     {
         if (!mPassKeys.empty())
@@ -254,16 +259,16 @@ namespace fx
             else if (key == "dynamic")
                 mDynamic = parseBool();
             else
-                error(Misc::StringUtils::format("unexpected key '%s'", std::string{key}));
+                error(Misc::StringUtils::format("unexpected key '%s'", std::string{ key }));
 
             expect<Lexer::SemiColon>();
-    }
+        }
 
         if (mPassKeys.empty())
             error("pass list in 'technique' block cannot be empty.");
     }
 
-    template<>
+    template <>
     void Technique::parseBlockImp<Lexer::Render_Target>()
     {
         if (mRenderTargets.count(mBlockName))
@@ -316,7 +321,7 @@ namespace fx
         mRenderTargets.emplace(mBlockName, std::move(rt));
     }
 
-    template<>
+    template <>
     void Technique::parseBlockImp<Lexer::Vertex>()
     {
         if (!mLexer->jump())
@@ -339,7 +344,7 @@ namespace fx
         pass->mType = Pass::Type::Pixel;
     }
 
-    template<>
+    template <>
     void Technique::parseBlockImp<Lexer::Fragment>()
     {
         if (!mLexer->jump())
@@ -363,7 +368,7 @@ namespace fx
         pass->mType = Pass::Type::Pixel;
     }
 
-    template<>
+    template <>
     void Technique::parseBlockImp<Lexer::Compute>()
     {
         if (!mLexer->jump())
@@ -431,7 +436,7 @@ namespace fx
             else if (key == "source")
             {
                 expect<Lexer::String>();
-                auto image = mImageManager.getImage(std::string{std::get<Lexer::String>(mToken).value}, is3D);
+                auto image = mImageManager.getImage(std::string{ std::get<Lexer::String>(mToken).value }, is3D);
                 if constexpr (is1D)
                 {
                     type = Types::SamplerType::Texture_1D;
@@ -449,12 +454,13 @@ namespace fx
                 }
             }
             else
-                error(Misc::StringUtils::format("unexpected key '%s'", std::string{key}));
+                error(Misc::StringUtils::format("unexpected key '%s'", std::string{ key }));
 
             expect<Lexer::SemiColon>();
         }
         if (!sampler)
-            error(Misc::StringUtils::format("%s '%s' requires a filename", std::string(T::repr), std::string{mBlockName}));
+            error(Misc::StringUtils::format(
+                "%s '%s' requires a filename", std::string(T::repr), std::string{ mBlockName }));
 
         if (!is1D)
         {
@@ -472,7 +478,7 @@ namespace fx
             sampler->setSourceType(proxy.source_type.value());
         if (proxy.internal_format.has_value())
             sampler->setSourceFormat(proxy.internal_format.value());
-        sampler->setName(std::string{mBlockName});
+        sampler->setName(std::string{ mBlockName });
         sampler->setResizeNonPowerOfTwoHint(false);
 
         mTextures.emplace_back(sampler);
@@ -500,7 +506,8 @@ namespace fx
 
             expect<Lexer::Equal>("error parsing config for uniform block");
 
-            constexpr bool isVec = std::is_same_v<osg::Vec2f, SrcT> || std::is_same_v<osg::Vec3f, SrcT> || std::is_same_v<osg::Vec4f, SrcT>;
+            constexpr bool isVec = std::is_same_v<osg::Vec2f,
+                                       SrcT> || std::is_same_v<osg::Vec3f, SrcT> || std::is_same_v<osg::Vec4f, SrcT>;
             constexpr bool isFloat = std::is_same_v<float, SrcT>;
             constexpr bool isInt = std::is_same_v<int, SrcT>;
             constexpr bool isBool = std::is_same_v<bool, SrcT>;
@@ -569,7 +576,7 @@ namespace fx
                 uniform->mDisplayName = std::get<Lexer::String>(mToken).value;
             }
             else
-                error(Misc::StringUtils::format("unexpected key '%s'", std::string{key}));
+                error(Misc::StringUtils::format("unexpected key '%s'", std::string{ key }));
 
             expect<Lexer::SemiColon>();
         }
@@ -597,61 +604,61 @@ namespace fx
         mDefinedUniforms.emplace_back(std::move(uniform));
     }
 
-    template<>
+    template <>
     void Technique::parseBlockImp<Lexer::Sampler_1D>()
     {
         parseSampler<Lexer::Sampler_1D>();
     }
 
-    template<>
+    template <>
     void Technique::parseBlockImp<Lexer::Sampler_2D>()
     {
         parseSampler<Lexer::Sampler_2D>();
     }
 
-    template<>
+    template <>
     void Technique::parseBlockImp<Lexer::Sampler_3D>()
     {
         parseSampler<Lexer::Sampler_3D>();
     }
 
-    template<>
+    template <>
     void Technique::parseBlockImp<Lexer::Uniform_Bool>()
     {
         parseUniform<bool, bool>();
     }
 
-    template<>
+    template <>
     void Technique::parseBlockImp<Lexer::Uniform_Float>()
     {
         parseUniform<float, float>();
     }
 
-    template<>
+    template <>
     void Technique::parseBlockImp<Lexer::Uniform_Int>()
     {
         parseUniform<int, int>();
     }
 
-    template<>
+    template <>
     void Technique::parseBlockImp<Lexer::Uniform_Vec2>()
     {
         parseUniform<osg::Vec2f, Lexer::Vec2>();
     }
 
-    template<>
+    template <>
     void Technique::parseBlockImp<Lexer::Uniform_Vec3>()
     {
         parseUniform<osg::Vec3f, Lexer::Vec3>();
     }
 
-    template<>
+    template <>
     void Technique::parseBlockImp<Lexer::Uniform_Vec4>()
     {
         parseUniform<osg::Vec4f, Lexer::Vec4>();
     }
 
-    template<class T>
+    template <class T>
     void Technique::expect(const std::string& err)
     {
         mToken = mLexer->next();
@@ -664,14 +671,15 @@ namespace fx
         }
     }
 
-    template<class T, class T2>
+    template <class T, class T2>
     void Technique::expect(const std::string& err)
     {
         mToken = mLexer->next();
         if (!std::holds_alternative<T>(mToken) && !std::holds_alternative<T2>(mToken))
         {
             if (err.empty())
-                error(Misc::StringUtils::format("%s. Expected %s or %s", err, std::string(T::repr), std::string(T2::repr)));
+                error(Misc::StringUtils::format(
+                    "%s. Expected %s or %s", err, std::string(T::repr), std::string(T2::repr)));
             else
                 error(Misc::StringUtils::format("Expected %s or %s", std::string(T::repr), std::string(T2::repr)));
         }
@@ -691,43 +699,44 @@ namespace fx
 
         for (auto t = mLexer->next(); !std::holds_alternative<Lexer::Eof>(t); t = mLexer->next())
         {
-            std::visit([this](auto&& arg) {
-                using T = std::decay_t<decltype(arg)>;
-
-                if constexpr (std::is_same_v<Lexer::Shared, T>)
-                    parseBlock<Lexer::Shared>(false);
-                else if constexpr (std::is_same_v<Lexer::Technique, T>)
-                    parseBlock<Lexer::Technique>(false);
-                else if constexpr (std::is_same_v<Lexer::Render_Target, T>)
-                    parseBlock<Lexer::Render_Target>();
-                else if constexpr (std::is_same_v<Lexer::Vertex, T>)
-                    parseBlock<Lexer::Vertex>();
-                else if constexpr (std::is_same_v<Lexer::Fragment, T>)
-                    parseBlock<Lexer::Fragment>();
-                else if constexpr (std::is_same_v<Lexer::Compute, T>)
-                    parseBlock<Lexer::Compute>();
-                else if constexpr (std::is_same_v<Lexer::Sampler_1D, T>)
-                    parseBlock<Lexer::Sampler_1D>();
-                else if constexpr (std::is_same_v<Lexer::Sampler_2D, T>)
-                    parseBlock<Lexer::Sampler_2D>();
-                else if constexpr (std::is_same_v<Lexer::Sampler_3D, T>)
-                    parseBlock<Lexer::Sampler_3D>();
-                else if constexpr (std::is_same_v<Lexer::Uniform_Bool, T>)
-                    parseBlock<Lexer::Uniform_Bool>();
-                else if constexpr (std::is_same_v<Lexer::Uniform_Float, T>)
-                    parseBlock<Lexer::Uniform_Float>();
-                else if constexpr (std::is_same_v<Lexer::Uniform_Int, T>)
-                    parseBlock<Lexer::Uniform_Int>();
-                else if constexpr (std::is_same_v<Lexer::Uniform_Vec2, T>)
-                    parseBlock<Lexer::Uniform_Vec2>();
-                else if constexpr (std::is_same_v<Lexer::Uniform_Vec3, T>)
-                    parseBlock<Lexer::Uniform_Vec3>();
-                else if constexpr (std::is_same_v<Lexer::Uniform_Vec4, T>)
-                    parseBlock<Lexer::Uniform_Vec4>();
-                else
-                    error("invalid top level block");
-            }
-            , t);
+            std::visit(
+                [this](auto&& arg) {
+                    using T = std::decay_t<decltype(arg)>;
+
+                    if constexpr (std::is_same_v<Lexer::Shared, T>)
+                        parseBlock<Lexer::Shared>(false);
+                    else if constexpr (std::is_same_v<Lexer::Technique, T>)
+                        parseBlock<Lexer::Technique>(false);
+                    else if constexpr (std::is_same_v<Lexer::Render_Target, T>)
+                        parseBlock<Lexer::Render_Target>();
+                    else if constexpr (std::is_same_v<Lexer::Vertex, T>)
+                        parseBlock<Lexer::Vertex>();
+                    else if constexpr (std::is_same_v<Lexer::Fragment, T>)
+                        parseBlock<Lexer::Fragment>();
+                    else if constexpr (std::is_same_v<Lexer::Compute, T>)
+                        parseBlock<Lexer::Compute>();
+                    else if constexpr (std::is_same_v<Lexer::Sampler_1D, T>)
+                        parseBlock<Lexer::Sampler_1D>();
+                    else if constexpr (std::is_same_v<Lexer::Sampler_2D, T>)
+                        parseBlock<Lexer::Sampler_2D>();
+                    else if constexpr (std::is_same_v<Lexer::Sampler_3D, T>)
+                        parseBlock<Lexer::Sampler_3D>();
+                    else if constexpr (std::is_same_v<Lexer::Uniform_Bool, T>)
+                        parseBlock<Lexer::Uniform_Bool>();
+                    else if constexpr (std::is_same_v<Lexer::Uniform_Float, T>)
+                        parseBlock<Lexer::Uniform_Float>();
+                    else if constexpr (std::is_same_v<Lexer::Uniform_Int, T>)
+                        parseBlock<Lexer::Uniform_Int>();
+                    else if constexpr (std::is_same_v<Lexer::Uniform_Vec2, T>)
+                        parseBlock<Lexer::Uniform_Vec2>();
+                    else if constexpr (std::is_same_v<Lexer::Uniform_Vec3, T>)
+                        parseBlock<Lexer::Uniform_Vec3>();
+                    else if constexpr (std::is_same_v<Lexer::Uniform_Vec4, T>)
+                        parseBlock<Lexer::Uniform_Vec4>();
+                    else
+                        error("invalid top level block");
+                },
+                t);
         }
     }
 
@@ -789,7 +798,7 @@ namespace fx
             pass = std::make_shared<fx::Pass>();
 
         bool clear = true;
-        osg::Vec4f clearColor = {1,1,1,1};
+        osg::Vec4f clearColor = { 1, 1, 1, 1 };
 
         while (!isNext<Lexer::Eof>())
         {
@@ -817,7 +826,7 @@ namespace fx
             else if (key == "rt3")
             {
                 expect<Lexer::Literal>();
-                pass->mRenderTargets[2] =std::get<Lexer::Literal>(mToken).value;
+                pass->mRenderTargets[2] = std::get<Lexer::Literal>(mToken).value;
             }
             else if (key == "blend")
             {
@@ -868,8 +877,8 @@ namespace fx
 
     FlagsType Technique::parseFlags()
     {
-        auto parseBit = [this] (std::string_view term) {
-            for (const auto& [identifer, bit]: constants::TechniqueFlag)
+        auto parseBit = [this](std::string_view term) {
+            for (const auto& [identifer, bit] : constants::TechniqueFlag)
             {
                 if (Misc::StringUtils::ciEqual(term, identifer))
                     return bit;
@@ -888,104 +897,104 @@ namespace fx
     {
         expect<Lexer::Literal>();
 
-        for (const auto& [identifer, mode]: constants::FilterMode)
+        for (const auto& [identifer, mode] : constants::FilterMode)
         {
             if (asLiteral() == identifer)
                 return mode;
         }
 
-        error(Misc::StringUtils::format("unrecognized filter mode '%s'", std::string{asLiteral()}));
+        error(Misc::StringUtils::format("unrecognized filter mode '%s'", std::string{ asLiteral() }));
     }
 
     osg::Texture::WrapMode Technique::parseWrapMode()
     {
         expect<Lexer::Literal>();
 
-        for (const auto& [identifer, mode]: constants::WrapMode)
+        for (const auto& [identifer, mode] : constants::WrapMode)
         {
             if (asLiteral() == identifer)
                 return mode;
         }
 
-        error(Misc::StringUtils::format("unrecognized wrap mode '%s'", std::string{asLiteral()}));
+        error(Misc::StringUtils::format("unrecognized wrap mode '%s'", std::string{ asLiteral() }));
     }
 
     osg::Texture::InternalFormatMode Technique::parseCompression()
     {
         expect<Lexer::Literal>();
 
-        for (const auto& [identifer, mode]: constants::Compression)
+        for (const auto& [identifer, mode] : constants::Compression)
         {
             if (asLiteral() == identifer)
                 return mode;
         }
 
-        error(Misc::StringUtils::format("unrecognized compression '%s'", std::string{asLiteral()}));
+        error(Misc::StringUtils::format("unrecognized compression '%s'", std::string{ asLiteral() }));
     }
 
     int Technique::parseInternalFormat()
     {
         expect<Lexer::Literal>();
 
-        for (const auto& [identifer, mode]: constants::InternalFormat)
+        for (const auto& [identifer, mode] : constants::InternalFormat)
         {
             if (asLiteral() == identifer)
                 return mode;
         }
 
-        error(Misc::StringUtils::format("unrecognized internal format '%s'", std::string{asLiteral()}));
+        error(Misc::StringUtils::format("unrecognized internal format '%s'", std::string{ asLiteral() }));
     }
 
     int Technique::parseSourceType()
     {
         expect<Lexer::Literal>();
 
-        for (const auto& [identifer, mode]: constants::SourceType)
+        for (const auto& [identifer, mode] : constants::SourceType)
         {
             if (asLiteral() == identifer)
                 return mode;
         }
 
-        error(Misc::StringUtils::format("unrecognized source type '%s'", std::string{asLiteral()}));
+        error(Misc::StringUtils::format("unrecognized source type '%s'", std::string{ asLiteral() }));
     }
 
     int Technique::parseSourceFormat()
     {
         expect<Lexer::Literal>();
 
-        for (const auto& [identifer, mode]: constants::SourceFormat)
+        for (const auto& [identifer, mode] : constants::SourceFormat)
         {
             if (asLiteral() == identifer)
                 return mode;
         }
 
-        error(Misc::StringUtils::format("unrecognized source format '%s'", std::string{asLiteral()}));
+        error(Misc::StringUtils::format("unrecognized source format '%s'", std::string{ asLiteral() }));
     }
 
     osg::BlendEquation::Equation Technique::parseBlendEquation()
     {
         expect<Lexer::Literal>();
 
-        for (const auto& [identifer, mode]: constants::BlendEquation)
+        for (const auto& [identifer, mode] : constants::BlendEquation)
         {
             if (asLiteral() == identifer)
                 return mode;
         }
 
-        error(Misc::StringUtils::format("unrecognized blend equation '%s'", std::string{asLiteral()}));
+        error(Misc::StringUtils::format("unrecognized blend equation '%s'", std::string{ asLiteral() }));
     }
 
     osg::BlendFunc::BlendFuncMode Technique::parseBlendFuncMode()
     {
         expect<Lexer::Literal>();
 
-        for (const auto& [identifer, mode]: constants::BlendFunc)
+        for (const auto& [identifer, mode] : constants::BlendFunc)
         {
             if (asLiteral() == identifer)
                 return mode;
         }
 
-        error(Misc::StringUtils::format("unrecognized blend function '%s'", std::string{asLiteral()}));
+        error(Misc::StringUtils::format("unrecognized blend function '%s'", std::string{ asLiteral() }));
     }
 
     bool Technique::parseBool()
diff --git a/components/fx/technique.hpp b/components/fx/technique.hpp
index 4c01e2a92d..a35f81ebd6 100644
--- a/components/fx/technique.hpp
+++ b/components/fx/technique.hpp
@@ -1,27 +1,27 @@
 #ifndef OPENMW_COMPONENTS_FX_TECHNIQUE_H
 #define OPENMW_COMPONENTS_FX_TECHNIQUE_H
 
-#include <vector>
-#include <string>
-#include <variant>
+#include <filesystem>
 #include <memory>
+#include <string>
 #include <unordered_map>
-#include <filesystem>
+#include <variant>
+#include <vector>
 
+#include <osg/BlendEquation>
+#include <osg/BlendFunc>
+#include <osg/FrameBufferObject>
 #include <osg/Node>
 #include <osg/Program>
 #include <osg/Shader>
-#include <osg/Texture2D>
 #include <osg/StateSet>
-#include <osg/FrameBufferObject>
+#include <osg/Texture2D>
 #include <osg/Vec2f>
 #include <osg/Vec3f>
 #include <osg/Vec4f>
-#include <osg/BlendFunc>
-#include <osg/BlendEquation>
 
-#include "pass.hpp"
 #include "lexer.hpp"
+#include "pass.hpp"
 #include "types.hpp"
 
 namespace Resource
@@ -53,7 +53,8 @@ namespace fx
                 mPasses.emplace_back(subpass, copyOp);
         }
 
-        struct SubPass {
+        struct SubPass
+        {
             SubPass() = default;
 
             osg::ref_ptr<osg::StateSet> mStateSet = new osg::StateSet;
@@ -123,7 +124,8 @@ namespace fx
         static constexpr FlagsType Flag_Disable_SunGlare = (1 << 4);
         static constexpr FlagsType Flag_Hidden = (1 << 5);
 
-        Technique(const VFS::Manager& vfs, Resource::ImageManager& imageManager, std::string  name, int width, int height, bool ubo, bool supportsNormals);
+        Technique(const VFS::Manager& vfs, Resource::ImageManager& imageManager, std::string name, int width,
+            int height, bool ubo, bool supportsNormals);
 
         bool compile();
 
@@ -183,11 +185,11 @@ namespace fx
 
         std::string_view asLiteral() const;
 
-        template<class T>
-        void expect(const std::string& err="");
+        template <class T>
+        void expect(const std::string& err = "");
 
-        template<class T, class T2>
-        void expect(const std::string& err="");
+        template <class T, class T2>
+        void expect(const std::string& err = "");
 
         template <class T>
         bool isNext();
@@ -201,10 +203,12 @@ namespace fx
         void parseSampler();
 
         template <class T>
-        void parseBlock(bool named=true);
+        void parseBlock(bool named = true);
 
         template <class T>
-        void parseBlockImp() {}
+        void parseBlockImp()
+        {
+        }
 
         void parseBlockHeader();
 
@@ -296,21 +300,36 @@ namespace fx
         bool mLocked = false;
     };
 
-    template<> void Technique::parseBlockImp<Lexer::Shared>();
-    template<> void Technique::parseBlockImp<Lexer::Technique>();
-    template<> void Technique::parseBlockImp<Lexer::Render_Target>();
-    template<> void Technique::parseBlockImp<Lexer::Vertex>();
-    template<> void Technique::parseBlockImp<Lexer::Fragment>();
-    template<> void Technique::parseBlockImp<Lexer::Compute>();
-    template<> void Technique::parseBlockImp<Lexer::Sampler_1D>();
-    template<> void Technique::parseBlockImp<Lexer::Sampler_2D>();
-    template<> void Technique::parseBlockImp<Lexer::Sampler_3D>();
-    template<> void Technique::parseBlockImp<Lexer::Uniform_Bool>();
-    template<> void Technique::parseBlockImp<Lexer::Uniform_Float>();
-    template<> void Technique::parseBlockImp<Lexer::Uniform_Int>();
-    template<> void Technique::parseBlockImp<Lexer::Uniform_Vec2>();
-    template<> void Technique::parseBlockImp<Lexer::Uniform_Vec3>();
-    template<> void Technique::parseBlockImp<Lexer::Uniform_Vec4>();
+    template <>
+    void Technique::parseBlockImp<Lexer::Shared>();
+    template <>
+    void Technique::parseBlockImp<Lexer::Technique>();
+    template <>
+    void Technique::parseBlockImp<Lexer::Render_Target>();
+    template <>
+    void Technique::parseBlockImp<Lexer::Vertex>();
+    template <>
+    void Technique::parseBlockImp<Lexer::Fragment>();
+    template <>
+    void Technique::parseBlockImp<Lexer::Compute>();
+    template <>
+    void Technique::parseBlockImp<Lexer::Sampler_1D>();
+    template <>
+    void Technique::parseBlockImp<Lexer::Sampler_2D>();
+    template <>
+    void Technique::parseBlockImp<Lexer::Sampler_3D>();
+    template <>
+    void Technique::parseBlockImp<Lexer::Uniform_Bool>();
+    template <>
+    void Technique::parseBlockImp<Lexer::Uniform_Float>();
+    template <>
+    void Technique::parseBlockImp<Lexer::Uniform_Int>();
+    template <>
+    void Technique::parseBlockImp<Lexer::Uniform_Vec2>();
+    template <>
+    void Technique::parseBlockImp<Lexer::Uniform_Vec3>();
+    template <>
+    void Technique::parseBlockImp<Lexer::Uniform_Vec4>();
 }
 
 #endif
diff --git a/components/fx/types.hpp b/components/fx/types.hpp
index 18d730bc98..09f191c61c 100644
--- a/components/fx/types.hpp
+++ b/components/fx/types.hpp
@@ -4,19 +4,19 @@
 #include <optional>
 #include <variant>
 
+#include <osg/BlendEquation>
+#include <osg/BlendFunc>
 #include <osg/Camera>
-#include <osg/Uniform>
-#include <osg/Texture2D>
 #include <osg/FrameBufferObject>
-#include <osg/BlendFunc>
-#include <osg/BlendEquation>
+#include <osg/Texture2D>
+#include <osg/Uniform>
 
 #include <MyGUI_Widget.h>
 
+#include <components/debug/debuglog.hpp>
+#include <components/misc/strings/format.hpp>
 #include <components/sceneutil/depth.hpp>
 #include <components/settings/shadermanager.hpp>
-#include <components/misc/strings/format.hpp>
-#include <components/debug/debuglog.hpp>
 
 namespace fx
 {
@@ -29,7 +29,7 @@ namespace fx
             std::optional<int> mWidth;
             std::optional<int> mHeight;
 
-            std::tuple<int,int> get(int width, int height) const
+            std::tuple<int, int> get(int width, int height) const
             {
                 int scaledWidth = width;
                 int scaledHeight = height;
@@ -67,30 +67,15 @@ namespace fx
 
             using value_type = T;
 
-            bool isArray() const
-            {
-                return mArray.has_value();
-            }
+            bool isArray() const { return mArray.has_value(); }
 
-            const std::vector<T>& getArray() const
-            {
-                return *mArray;
-            }
+            const std::vector<T>& getArray() const { return *mArray; }
 
-            T getValue() const
-            {
-                return mValue.value_or(mDefault);
-            }
+            T getValue() const { return mValue.value_or(mDefault); }
         };
 
-        using Uniform_t = std::variant<
-            Uniform<osg::Vec2f>,
-            Uniform<osg::Vec3f>,
-            Uniform<osg::Vec4f>,
-            Uniform<bool>,
-            Uniform<float>,
-            Uniform<int>
-        >;
+        using Uniform_t = std::variant<Uniform<osg::Vec2f>, Uniform<osg::Vec3f>, Uniform<osg::Vec4f>, Uniform<bool>,
+            Uniform<float>, Uniform<int>>;
 
         enum SamplerType
         {
@@ -123,7 +108,12 @@ namespace fx
 
             size_t getNumElements() const
             {
-                return std::visit([&](auto&& arg) { ;return arg.isArray() ? arg.getArray().size() : 1; }, mData);
+                return std::visit(
+                    [&](auto&& arg) {
+                        ;
+                        return arg.isArray() ? arg.getArray().size() : 1;
+                    },
+                    mData);
             }
 
             template <class T>
@@ -147,42 +137,47 @@ namespace fx
             template <class T>
             void setValue(const T& value)
             {
-                std::visit([&, value](auto&& arg){
-                    using U = typename std::decay_t<decltype(arg)>::value_type;
-
-                    if constexpr (std::is_same_v<T, U>)
-                    {
-                        arg.mValue = value;
-
-                        Settings::ShaderManager::get().setValue(mTechniqueName, mName, value);
-                    }
-                    else
-                    {
-                        Log(Debug::Warning) << "Attempting to set uniform '" << mName << "' with wrong type";
-                    }
-                }, mData);
+                std::visit(
+                    [&, value](auto&& arg) {
+                        using U = typename std::decay_t<decltype(arg)>::value_type;
+
+                        if constexpr (std::is_same_v<T, U>)
+                        {
+                            arg.mValue = value;
+
+                            Settings::ShaderManager::get().setValue(mTechniqueName, mName, value);
+                        }
+                        else
+                        {
+                            Log(Debug::Warning) << "Attempting to set uniform '" << mName << "' with wrong type";
+                        }
+                    },
+                    mData);
             }
 
             template <class T, class A>
             void setValue(const std::vector<T, A>& value)
             {
-                std::visit([&, value](auto&& arg) {
-                    using U = typename std::decay_t<decltype(arg)>::value_type;
-
-                    if (!arg.isArray() || arg.getArray().size() != value.size())
-                    {
-                        Log(Debug::Error) << "Attempting to set uniform array '" << mName << "' with mismatching array sizes";
-                        return;
-                    }
-
-                    if constexpr (std::is_same_v<T, U>)
-                    {
-                        arg.mArray = value;
-                        Settings::ShaderManager::get().setValue(mTechniqueName, mName, value);
-                    }
-                    else
-                        Log(Debug::Warning) << "Attempting to set uniform array '" << mName << "' with wrong type";
-                }, mData);
+                std::visit(
+                    [&, value](auto&& arg) {
+                        using U = typename std::decay_t<decltype(arg)>::value_type;
+
+                        if (!arg.isArray() || arg.getArray().size() != value.size())
+                        {
+                            Log(Debug::Error)
+                                << "Attempting to set uniform array '" << mName << "' with mismatching array sizes";
+                            return;
+                        }
+
+                        if constexpr (std::is_same_v<T, U>)
+                        {
+                            arg.mArray = value;
+                            Settings::ShaderManager::get().setValue(mTechniqueName, mName, value);
+                        }
+                        else
+                            Log(Debug::Warning) << "Attempting to set uniform array '" << mName << "' with wrong type";
+                    },
+                    mData);
             }
 
             void setUniform(osg::Uniform* uniform)
@@ -191,39 +186,42 @@ namespace fx
                 if (!type || type.value() != uniform->getType())
                     return;
 
-                std::visit([&](auto&& arg)
-                {
-                    if (arg.isArray())
-                    {
-                        for (size_t i = 0; i < arg.getArray().size(); ++i)
-                            uniform->setElement(i, arg.getArray()[i]);
-                        uniform->dirty();
-                    }
-                    else
-                        uniform->set(arg.getValue());
-                }, mData);
+                std::visit(
+                    [&](auto&& arg) {
+                        if (arg.isArray())
+                        {
+                            for (size_t i = 0; i < arg.getArray().size(); ++i)
+                                uniform->setElement(i, arg.getArray()[i]);
+                            uniform->dirty();
+                        }
+                        else
+                            uniform->set(arg.getValue());
+                    },
+                    mData);
             }
 
             std::optional<osg::Uniform::Type> getType() const
             {
-                return std::visit([](auto&& arg) -> std::optional<osg::Uniform::Type> {
-                    using T = typename std::decay_t<decltype(arg)>::value_type;
-
-                    if constexpr (std::is_same_v<T, osg::Vec2f>)
-                        return osg::Uniform::FLOAT_VEC2;
-                    else if constexpr (std::is_same_v<T, osg::Vec3f>)
-                        return osg::Uniform::FLOAT_VEC3;
-                    else if constexpr (std::is_same_v<T, osg::Vec4f>)
-                        return osg::Uniform::FLOAT_VEC4;
-                    else if constexpr (std::is_same_v<T, float>)
-                        return osg::Uniform::FLOAT;
-                    else if constexpr (std::is_same_v<T, int>)
-                        return osg::Uniform::INT;
-                    else if constexpr (std::is_same_v<T, bool>)
-                        return osg::Uniform::BOOL;
-
-                    return std::nullopt;
-                }, mData);
+                return std::visit(
+                    [](auto&& arg) -> std::optional<osg::Uniform::Type> {
+                        using T = typename std::decay_t<decltype(arg)>::value_type;
+
+                        if constexpr (std::is_same_v<T, osg::Vec2f>)
+                            return osg::Uniform::FLOAT_VEC2;
+                        else if constexpr (std::is_same_v<T, osg::Vec3f>)
+                            return osg::Uniform::FLOAT_VEC3;
+                        else if constexpr (std::is_same_v<T, osg::Vec4f>)
+                            return osg::Uniform::FLOAT_VEC4;
+                        else if constexpr (std::is_same_v<T, float>)
+                            return osg::Uniform::FLOAT;
+                        else if constexpr (std::is_same_v<T, int>)
+                            return osg::Uniform::INT;
+                        else if constexpr (std::is_same_v<T, bool>)
+                            return osg::Uniform::BOOL;
+
+                        return std::nullopt;
+                    },
+                    mData);
             }
 
             std::optional<std::string> getGLSL()
@@ -241,62 +239,68 @@ namespace fx
                     }
                 }
 
-                return std::visit([&](auto&& arg) -> std::optional<std::string> {
-                    using T = typename std::decay_t<decltype(arg)>::value_type;
-
-                    auto value = arg.getValue();
-
-                    const bool useUniform = arg.isArray() || (Settings::ShaderManager::get().getMode() == Settings::ShaderManager::Mode::Debug || mStatic == false);
-                    const std::string uname = arg.isArray() ? Misc::StringUtils::format("%s[%zu]", mName, arg.getArray().size()) : mName;
-
-                    if constexpr (std::is_same_v<T, osg::Vec2f>)
-                    {
-                        if (useUniform)
-                            return Misc::StringUtils::format("uniform vec2 %s;", uname);
-
-                        return Misc::StringUtils::format("const vec2 %s=vec2(%f,%f);", mName, value[0], value[1]);
-                    }
-                    else if constexpr (std::is_same_v<T, osg::Vec3f>)
-                    {
-                        if (useUniform)
-                            return Misc::StringUtils::format("uniform vec3 %s;", uname);
-
-                        return Misc::StringUtils::format("const vec3 %s=vec3(%f,%f,%f);", mName, value[0], value[1], value[2]);
-                    }
-                    else if constexpr (std::is_same_v<T, osg::Vec4f>)
-                    {
-                        if (useUniform)
-                            return Misc::StringUtils::format("uniform vec4 %s;", uname);
-
-                        return Misc::StringUtils::format("const vec4 %s=vec4(%f,%f,%f,%f);", mName, value[0], value[1], value[2], value[3]);
-                    }
-                    else if constexpr (std::is_same_v<T, float>)
-                    {
-                        if (useUniform)
-                            return Misc::StringUtils::format("uniform float %s;", uname);
-
-                        return Misc::StringUtils::format("const float %s=%f;", mName, value);
-                    }
-                    else if constexpr (std::is_same_v<T, int>)
-                    {
-                        if (useUniform)
-                            return Misc::StringUtils::format("uniform int %s;", uname);
-
-                        return Misc::StringUtils::format("const int %s=%i;", mName, value);
-                    }
-                    else if constexpr (std::is_same_v<T, bool>)
-                    {
-                        if (useUniform)
-                            return Misc::StringUtils::format("uniform bool %s;", uname);
-
-                        return Misc::StringUtils::format("const bool %s=%s;", mName, value ? "true" : "false");
-                    }
-
-                    return std::nullopt;
-
-                }, mData);
+                return std::visit(
+                    [&](auto&& arg) -> std::optional<std::string> {
+                        using T = typename std::decay_t<decltype(arg)>::value_type;
+
+                        auto value = arg.getValue();
+
+                        const bool useUniform = arg.isArray()
+                            || (Settings::ShaderManager::get().getMode() == Settings::ShaderManager::Mode::Debug
+                                || mStatic == false);
+                        const std::string uname = arg.isArray()
+                            ? Misc::StringUtils::format("%s[%zu]", mName, arg.getArray().size())
+                            : mName;
+
+                        if constexpr (std::is_same_v<T, osg::Vec2f>)
+                        {
+                            if (useUniform)
+                                return Misc::StringUtils::format("uniform vec2 %s;", uname);
+
+                            return Misc::StringUtils::format("const vec2 %s=vec2(%f,%f);", mName, value[0], value[1]);
+                        }
+                        else if constexpr (std::is_same_v<T, osg::Vec3f>)
+                        {
+                            if (useUniform)
+                                return Misc::StringUtils::format("uniform vec3 %s;", uname);
+
+                            return Misc::StringUtils::format(
+                                "const vec3 %s=vec3(%f,%f,%f);", mName, value[0], value[1], value[2]);
+                        }
+                        else if constexpr (std::is_same_v<T, osg::Vec4f>)
+                        {
+                            if (useUniform)
+                                return Misc::StringUtils::format("uniform vec4 %s;", uname);
+
+                            return Misc::StringUtils::format(
+                                "const vec4 %s=vec4(%f,%f,%f,%f);", mName, value[0], value[1], value[2], value[3]);
+                        }
+                        else if constexpr (std::is_same_v<T, float>)
+                        {
+                            if (useUniform)
+                                return Misc::StringUtils::format("uniform float %s;", uname);
+
+                            return Misc::StringUtils::format("const float %s=%f;", mName, value);
+                        }
+                        else if constexpr (std::is_same_v<T, int>)
+                        {
+                            if (useUniform)
+                                return Misc::StringUtils::format("uniform int %s;", uname);
+
+                            return Misc::StringUtils::format("const int %s=%i;", mName, value);
+                        }
+                        else if constexpr (std::is_same_v<T, bool>)
+                        {
+                            if (useUniform)
+                                return Misc::StringUtils::format("uniform bool %s;", uname);
+
+                            return Misc::StringUtils::format("const bool %s=%s;", mName, value ? "true" : "false");
+                        }
+
+                        return std::nullopt;
+                    },
+                    mData);
             }
-
         };
     }
 }
diff --git a/components/fx/widgets.cpp b/components/fx/widgets.cpp
index 1f9ec50d45..09482f24e1 100644
--- a/components/fx/widgets.cpp
+++ b/components/fx/widgets.cpp
@@ -5,7 +5,8 @@
 namespace
 {
     template <class T, class WidgetT>
-    void createVectorWidget(const std::shared_ptr<fx::Types::UniformBase>& uniform, MyGUI::Widget* client, fx::Widgets::UniformBase* base)
+    void createVectorWidget(
+        const std::shared_ptr<fx::Types::UniformBase>& uniform, MyGUI::Widget* client, fx::Widgets::UniformBase* base)
     {
         int height = client->getHeight();
         base->setSize(base->getSize().width, (base->getSize().height - height) + (height * T::num_components));
@@ -13,7 +14,8 @@ namespace
 
         for (int i = 0; i < T::num_components; ++i)
         {
-            auto* widget = client->createWidget<WidgetT>("MW_ValueEditNumber", {0, height * i, client->getWidth(), height}, MyGUI::Align::Default);
+            auto* widget = client->createWidget<WidgetT>(
+                "MW_ValueEditNumber", { 0, height * i, client->getWidth(), height }, MyGUI::Align::Default);
             widget->setData(uniform, static_cast<fx::Widgets::Index>(i));
             base->addItem(widget);
         }
@@ -67,7 +69,6 @@ namespace fx
             mCheckbutton->eventMouseButtonClick += MyGUI::newDelegate(this, &EditBool::notifyMouseButtonClick);
         }
 
-
         void EditBool::notifyMouseButtonClick(MyGUI::Widget* sender)
         {
             auto uniform = mUniform.lock();
@@ -96,46 +97,50 @@ namespace fx
                 mLabel->setUserString("Caption_Text", uniform->mDescription);
             }
 
-            std::visit([this, &uniform](auto&& arg) {
-                using T = typename std::decay_t<decltype(arg)>::value_type;
-
-                if constexpr (std::is_same_v<osg::Vec4f, T>)
-                {
-                    createVectorWidget<T, EditNumberFloat4>(uniform, mClient, this);
-                }
-                else if constexpr (std::is_same_v<osg::Vec3f, T>)
-                {
-                    createVectorWidget<T, EditNumberFloat3>(uniform, mClient, this);
-                }
-                else if constexpr (std::is_same_v<osg::Vec2f, T>)
-                {
-                    createVectorWidget<T, EditNumberFloat2>(uniform, mClient, this);
-                }
-                else if constexpr (std::is_same_v<T, float>)
-                {
-                    auto* widget = mClient->createWidget<EditNumberFloat>("MW_ValueEditNumber", {0, 0, mClient->getWidth(), mClient->getHeight()}, MyGUI::Align::Stretch);
-                    widget->setData(uniform);
-                    mBases.emplace_back(widget);
-                }
-                else if constexpr (std::is_same_v<T, int>)
-                {
-                    auto* widget = mClient->createWidget<EditNumberInt>("MW_ValueEditNumber", {0, 0, mClient->getWidth(), mClient->getHeight()}, MyGUI::Align::Stretch);
-                    widget->setData(uniform);
-                    mBases.emplace_back(widget);
-                }
-                else if constexpr (std::is_same_v<T, bool>)
-                {
-                    auto* widget = mClient->createWidget<EditBool>("MW_ValueEditBool", {0, 0, mClient->getWidth(), mClient->getHeight()}, MyGUI::Align::Stretch);
-                    widget->setData(uniform);
-                    mBases.emplace_back(widget);
-                }
-
-                mReset->eventMouseButtonClick += MyGUI::newDelegate(this, &UniformBase::notifyResetClicked);
-
-                for (EditBase* base : mBases)
-                    base->setValueFromUniform();
-
-            }, uniform->mData);
+            std::visit(
+                [this, &uniform](auto&& arg) {
+                    using T = typename std::decay_t<decltype(arg)>::value_type;
+
+                    if constexpr (std::is_same_v<osg::Vec4f, T>)
+                    {
+                        createVectorWidget<T, EditNumberFloat4>(uniform, mClient, this);
+                    }
+                    else if constexpr (std::is_same_v<osg::Vec3f, T>)
+                    {
+                        createVectorWidget<T, EditNumberFloat3>(uniform, mClient, this);
+                    }
+                    else if constexpr (std::is_same_v<osg::Vec2f, T>)
+                    {
+                        createVectorWidget<T, EditNumberFloat2>(uniform, mClient, this);
+                    }
+                    else if constexpr (std::is_same_v<T, float>)
+                    {
+                        auto* widget = mClient->createWidget<EditNumberFloat>("MW_ValueEditNumber",
+                            { 0, 0, mClient->getWidth(), mClient->getHeight() }, MyGUI::Align::Stretch);
+                        widget->setData(uniform);
+                        mBases.emplace_back(widget);
+                    }
+                    else if constexpr (std::is_same_v<T, int>)
+                    {
+                        auto* widget = mClient->createWidget<EditNumberInt>("MW_ValueEditNumber",
+                            { 0, 0, mClient->getWidth(), mClient->getHeight() }, MyGUI::Align::Stretch);
+                        widget->setData(uniform);
+                        mBases.emplace_back(widget);
+                    }
+                    else if constexpr (std::is_same_v<T, bool>)
+                    {
+                        auto* widget = mClient->createWidget<EditBool>("MW_ValueEditBool",
+                            { 0, 0, mClient->getWidth(), mClient->getHeight() }, MyGUI::Align::Stretch);
+                        widget->setData(uniform);
+                        mBases.emplace_back(widget);
+                    }
+
+                    mReset->eventMouseButtonClick += MyGUI::newDelegate(this, &UniformBase::notifyResetClicked);
+
+                    for (EditBase* base : mBases)
+                        base->setValueFromUniform();
+                },
+                uniform->mData);
         }
 
         void UniformBase::addItem(EditBase* item)
diff --git a/components/fx/widgets.hpp b/components/fx/widgets.hpp
index 2d80bc71d4..751ad7f50f 100644
--- a/components/fx/widgets.hpp
+++ b/components/fx/widgets.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_FX_WIDGETS_H
 #define OPENMW_COMPONENTS_FX_WIDGETS_H
 
-#include <MyGUI_Gui.h>
 #include <MyGUI_Button.h>
+#include <MyGUI_Gui.h>
 #include <MyGUI_InputManager.h>
 
 #include <osg/Vec2f>
@@ -65,8 +65,8 @@ namespace fx
             void initialiseOverride() override;
             void notifyMouseButtonClick(MyGUI::Widget* sender);
 
-            MyGUI::Button* mCheckbutton{nullptr};
-            MyGUI::Widget* mFill{nullptr};
+            MyGUI::Button* mCheckbutton{ nullptr };
+            MyGUI::Widget* mFill{ nullptr };
         };
 
         template <class T, class UType>
@@ -135,7 +135,6 @@ namespace fx
             }
 
         private:
-
             void initialiseOverride() override
             {
                 Base::initialiseOverride();
@@ -181,7 +180,8 @@ namespace fx
 
                 // allow finer tuning when shift is pressed
                 constexpr double scaling = 20.0;
-                T step = MyGUI::InputManager::getInstance().isShiftPressed() ? uniform->mStep / scaling : uniform->mStep;
+                T step
+                    = MyGUI::InputManager::getInstance().isShiftPressed() ? uniform->mStep / scaling : uniform->mStep;
 
                 if (step == 0)
                 {
@@ -215,9 +215,11 @@ namespace fx
                     return;
 
                 if constexpr (std::is_fundamental_v<UType>)
-                    setValue(std::clamp<T>(uniform->template getValue<UType>() + step, uniform->template getMin<UType>(), uniform->template getMax<T>()));
+                    setValue(std::clamp<T>(uniform->template getValue<UType>() + step,
+                        uniform->template getMin<UType>(), uniform->template getMax<T>()));
                 else
-                    setValue(std::clamp<T>(uniform->template getValue<UType>()[mIndex] + step, uniform->template getMin<UType>()[mIndex], uniform->template getMax<UType>()[mIndex]));
+                    setValue(std::clamp<T>(uniform->template getValue<UType>()[mIndex] + step,
+                        uniform->template getMin<UType>()[mIndex], uniform->template getMax<UType>()[mIndex]));
             }
 
             void notifyButtonClicked(MyGUI::Widget* sender)
@@ -233,21 +235,36 @@ namespace fx
                     increment(uniform->mStep);
             }
 
-            MyGUI::Button* mButtonDecrease{nullptr};
-            MyGUI::Button* mButtonIncrease{nullptr};
-            MyGUI::Widget* mDragger{nullptr};
-            MyGUI::Widget* mFill{nullptr};
-            MyGUI::TextBox* mValueLabel{nullptr};
+            MyGUI::Button* mButtonDecrease{ nullptr };
+            MyGUI::Button* mButtonIncrease{ nullptr };
+            MyGUI::Widget* mDragger{ nullptr };
+            MyGUI::Widget* mFill{ nullptr };
+            MyGUI::TextBox* mValueLabel{ nullptr };
             T mValue{};
 
-            int mLastPointerX{0};
+            int mLastPointerX{ 0 };
         };
 
-        class EditNumberFloat4 : public EditNumber<float, osg::Vec4f> { MYGUI_RTTI_DERIVED(EditNumberFloat4) };
-        class EditNumberFloat3 : public EditNumber<float, osg::Vec3f> { MYGUI_RTTI_DERIVED(EditNumberFloat3) };
-        class EditNumberFloat2 : public EditNumber<float, osg::Vec2f> { MYGUI_RTTI_DERIVED(EditNumberFloat2) };
-        class EditNumberFloat : public EditNumber<float, float> { MYGUI_RTTI_DERIVED(EditNumberFloat) };
-        class EditNumberInt : public EditNumber<int, int> { MYGUI_RTTI_DERIVED(EditNumberInt) };
+        class EditNumberFloat4 : public EditNumber<float, osg::Vec4f>
+        {
+            MYGUI_RTTI_DERIVED(EditNumberFloat4)
+        };
+        class EditNumberFloat3 : public EditNumber<float, osg::Vec3f>
+        {
+            MYGUI_RTTI_DERIVED(EditNumberFloat3)
+        };
+        class EditNumberFloat2 : public EditNumber<float, osg::Vec2f>
+        {
+            MYGUI_RTTI_DERIVED(EditNumberFloat2)
+        };
+        class EditNumberFloat : public EditNumber<float, float>
+        {
+            MYGUI_RTTI_DERIVED(EditNumberFloat)
+        };
+        class EditNumberInt : public EditNumber<int, int>
+        {
+            MYGUI_RTTI_DERIVED(EditNumberInt)
+        };
 
         class UniformBase final : public MyGUI::Widget
         {
@@ -263,14 +280,13 @@ namespace fx
             Gui::AutoSizedTextBox* getLabel() { return mLabel; }
 
         private:
-
             void notifyResetClicked(MyGUI::Widget* sender);
 
             void initialiseOverride() override;
 
-            Gui::AutoSizedButton* mReset{nullptr};
-            Gui::AutoSizedTextBox* mLabel{nullptr};
-            MyGUI::Widget* mClient{nullptr};
+            Gui::AutoSizedButton* mReset{ nullptr };
+            Gui::AutoSizedTextBox* mLabel{ nullptr };
+            MyGUI::Widget* mClient{ nullptr };
             std::vector<EditBase*> mBases;
         };
     }
diff --git a/components/interpreter/context.hpp b/components/interpreter/context.hpp
index c78b572353..f5910e0b1b 100644
--- a/components/interpreter/context.hpp
+++ b/components/interpreter/context.hpp
@@ -9,89 +9,86 @@ namespace Interpreter
 {
     class Context
     {
-        public:
+    public:
+        virtual ~Context() {}
 
-            virtual ~Context() {}
+        virtual std::string_view getTarget() const = 0;
 
-            virtual std::string_view getTarget() const = 0;
+        virtual int getLocalShort(int index) const = 0;
 
-            virtual int getLocalShort (int index) const = 0;
+        virtual int getLocalLong(int index) const = 0;
 
-            virtual int getLocalLong (int index) const = 0;
+        virtual float getLocalFloat(int index) const = 0;
 
-            virtual float getLocalFloat (int index) const = 0;
+        virtual void setLocalShort(int index, int value) = 0;
 
-            virtual void setLocalShort (int index, int value) = 0;
+        virtual void setLocalLong(int index, int value) = 0;
 
-            virtual void setLocalLong (int index, int value) = 0;
+        virtual void setLocalFloat(int index, float value) = 0;
 
-            virtual void setLocalFloat (int index, float value) = 0;
+        virtual void messageBox(std::string_view message, const std::vector<std::string>& buttons) = 0;
 
-            virtual void messageBox(std::string_view message,
-                const std::vector<std::string>& buttons) = 0;
+        void messageBox(std::string_view message)
+        {
+            std::vector<std::string> empty;
+            messageBox(message, empty);
+        }
 
-            void messageBox(std::string_view message)
-            {
-                std::vector<std::string> empty;
-                messageBox (message, empty);
-            }
+        virtual void report(const std::string& message) = 0;
 
-            virtual void report (const std::string& message) = 0;
+        virtual int getGlobalShort(std::string_view name) const = 0;
 
-            virtual int getGlobalShort(std::string_view name) const = 0;
+        virtual int getGlobalLong(std::string_view name) const = 0;
 
-            virtual int getGlobalLong(std::string_view name) const = 0;
+        virtual float getGlobalFloat(std::string_view name) const = 0;
 
-            virtual float getGlobalFloat(std::string_view name) const = 0;
+        virtual void setGlobalShort(std::string_view name, int value) = 0;
 
-            virtual void setGlobalShort(std::string_view name, int value) = 0;
+        virtual void setGlobalLong(std::string_view name, int value) = 0;
 
-            virtual void setGlobalLong(std::string_view name, int value) = 0;
+        virtual void setGlobalFloat(std::string_view name, float value) = 0;
 
-            virtual void setGlobalFloat(std::string_view name, float value) = 0;
+        virtual std::vector<std::string> getGlobals() const = 0;
 
-            virtual std::vector<std::string> getGlobals () const = 0;
+        virtual char getGlobalType(std::string_view name) const = 0;
 
-            virtual char getGlobalType(std::string_view name) const = 0;
+        virtual std::string getActionBinding(std::string_view action) const = 0;
 
-            virtual std::string getActionBinding(std::string_view action) const = 0;
+        virtual std::string_view getActorName() const = 0;
 
-            virtual std::string_view getActorName() const = 0;
+        virtual std::string_view getNPCRace() const = 0;
 
-            virtual std::string_view getNPCRace() const = 0;
+        virtual std::string_view getNPCClass() const = 0;
 
-            virtual std::string_view getNPCClass() const = 0;
+        virtual std::string_view getNPCFaction() const = 0;
 
-            virtual std::string_view getNPCFaction() const = 0;
+        virtual std::string_view getNPCRank() const = 0;
 
-            virtual std::string_view getNPCRank() const = 0;
+        virtual std::string_view getPCName() const = 0;
 
-            virtual std::string_view getPCName() const = 0;
+        virtual std::string_view getPCRace() const = 0;
 
-            virtual std::string_view getPCRace() const = 0;
+        virtual std::string_view getPCClass() const = 0;
 
-            virtual std::string_view getPCClass() const = 0;
+        virtual std::string_view getPCRank() const = 0;
 
-            virtual std::string_view getPCRank() const = 0;
+        virtual std::string_view getPCNextRank() const = 0;
 
-            virtual std::string_view getPCNextRank() const = 0;
+        virtual int getPCBounty() const = 0;
 
-            virtual int getPCBounty() const = 0;
+        virtual std::string_view getCurrentCellName() const = 0;
 
-            virtual std::string_view getCurrentCellName() const = 0;
+        virtual int getMemberShort(std::string_view id, std::string_view name, bool global) const = 0;
 
-            virtual int getMemberShort(std::string_view id, std::string_view name, bool global) const = 0;
+        virtual int getMemberLong(std::string_view id, std::string_view name, bool global) const = 0;
 
-            virtual int getMemberLong(std::string_view id, std::string_view name, bool global) const = 0;
+        virtual float getMemberFloat(std::string_view id, std::string_view name, bool global) const = 0;
 
-            virtual float getMemberFloat(std::string_view id, std::string_view name, bool global) const = 0;
+        virtual void setMemberShort(std::string_view id, std::string_view name, int value, bool global) = 0;
 
-            virtual void setMemberShort(std::string_view id, std::string_view name, int value, bool global) = 0;
+        virtual void setMemberLong(std::string_view id, std::string_view name, int value, bool global) = 0;
 
-            virtual void setMemberLong(std::string_view id, std::string_view name, int value, bool global) = 0;
-
-            virtual void setMemberFloat(std::string_view id, std::string_view name, float value, bool global)
-                = 0;
+        virtual void setMemberFloat(std::string_view id, std::string_view name, float value, bool global) = 0;
     };
 }
 
diff --git a/components/interpreter/controlopcodes.hpp b/components/interpreter/controlopcodes.hpp
index fdf9291612..6999b751cc 100644
--- a/components/interpreter/controlopcodes.hpp
+++ b/components/interpreter/controlopcodes.hpp
@@ -10,66 +10,58 @@ namespace Interpreter
 {
     class OpReturn : public Opcode0
     {
-        public:
-
-            void execute (Runtime& runtime) override
-            {
-                runtime.setPC (-1);
-            }
+    public:
+        void execute(Runtime& runtime) override { runtime.setPC(-1); }
     };
 
     class OpSkipZero : public Opcode0
     {
-        public:
-
-            void execute (Runtime& runtime) override
-            {
-                Type_Integer data = runtime[0].mInteger;
-                runtime.pop();
-
-                if (data==0)
-                    runtime.setPC (runtime.getPC()+1);
-            }
+    public:
+        void execute(Runtime& runtime) override
+        {
+            Type_Integer data = runtime[0].mInteger;
+            runtime.pop();
+
+            if (data == 0)
+                runtime.setPC(runtime.getPC() + 1);
+        }
     };
 
     class OpSkipNonZero : public Opcode0
     {
-        public:
-
-            void execute (Runtime& runtime) override
-            {
-                Type_Integer data = runtime[0].mInteger;
-                runtime.pop();
-
-                if (data!=0)
-                    runtime.setPC (runtime.getPC()+1);
-            }
+    public:
+        void execute(Runtime& runtime) override
+        {
+            Type_Integer data = runtime[0].mInteger;
+            runtime.pop();
+
+            if (data != 0)
+                runtime.setPC(runtime.getPC() + 1);
+        }
     };
 
     class OpJumpForward : public Opcode1
     {
-        public:
-
-            void execute (Runtime& runtime, unsigned int arg0) override
-            {
-                if (arg0==0)
-                    throw std::logic_error ("infinite loop");
-
-                runtime.setPC (runtime.getPC()+arg0-1);
-            }
+    public:
+        void execute(Runtime& runtime, unsigned int arg0) override
+        {
+            if (arg0 == 0)
+                throw std::logic_error("infinite loop");
+
+            runtime.setPC(runtime.getPC() + arg0 - 1);
+        }
     };
 
     class OpJumpBackward : public Opcode1
     {
-        public:
-
-            void execute (Runtime& runtime, unsigned int arg0) override
-            {
-                if (arg0==0)
-                    throw std::logic_error ("infinite loop");
-
-                runtime.setPC (runtime.getPC()-arg0-1);
-            }
+    public:
+        void execute(Runtime& runtime, unsigned int arg0) override
+        {
+            if (arg0 == 0)
+                throw std::logic_error("infinite loop");
+
+            runtime.setPC(runtime.getPC() - arg0 - 1);
+        }
     };
 }
 
diff --git a/components/interpreter/defines.cpp b/components/interpreter/defines.cpp
index 1e8d91dfa6..0fd0157425 100644
--- a/components/interpreter/defines.cpp
+++ b/components/interpreter/defines.cpp
@@ -1,19 +1,21 @@
 #include "defines.hpp"
 
+#include <algorithm>
 #include <sstream>
 #include <string>
 #include <vector>
-#include <algorithm>
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/strings/lower.hpp>
 
-namespace Interpreter{
+namespace Interpreter
+{
 
     bool check(const std::string& str, const std::string& escword, unsigned int* i, unsigned int* start)
     {
         bool retval = str.find(escword) == 0;
-        if(retval){
+        if (retval)
+        {
             (*i) += escword.length();
             (*start) = (*i) + 1;
         }
@@ -31,10 +33,10 @@ namespace Interpreter{
     {
         unsigned int start = 0;
         std::ostringstream retval;
-        for(unsigned int i = 0; i < text.length(); i++)
+        for (unsigned int i = 0; i < text.length(); i++)
         {
             char eschar = text[i];
-            if(eschar == '%' || eschar == '^')
+            if (eschar == '%' || eschar == '^')
             {
                 retval << text.substr(start, i - start);
                 std::string temp = Misc::StringUtils::lowerCase(std::string_view(text).substr(i + 1, 100));
@@ -42,148 +44,201 @@ namespace Interpreter{
                 bool found = false;
                 try
                 {
-                    if(     (found = check(temp, "actionslideright", &i, &start))){
+                    if ((found = check(temp, "actionslideright", &i, &start)))
+                    {
                         retval << context.getActionBinding("#{sRight}");
                     }
-                    else if((found = check(temp, "actionreadymagic", &i, &start))){
+                    else if ((found = check(temp, "actionreadymagic", &i, &start)))
+                    {
                         retval << context.getActionBinding("#{sReady_Magic}");
                     }
-                    else if((found = check(temp, "actionprevweapon", &i, &start))){
+                    else if ((found = check(temp, "actionprevweapon", &i, &start)))
+                    {
                         retval << context.getActionBinding("#{sPrevWeapon}");
                     }
-                    else if((found = check(temp, "actionnextweapon", &i, &start))){
+                    else if ((found = check(temp, "actionnextweapon", &i, &start)))
+                    {
                         retval << context.getActionBinding("#{sNextWeapon}");
                     }
-                    else if((found = check(temp, "actiontogglerun", &i, &start))){
+                    else if ((found = check(temp, "actiontogglerun", &i, &start)))
+                    {
                         retval << context.getActionBinding("#{sAuto_Run}");
                     }
-                    else if((found = check(temp, "actionslideleft", &i, &start))){
+                    else if ((found = check(temp, "actionslideleft", &i, &start)))
+                    {
                         retval << context.getActionBinding("#{sLeft}");
                     }
-                    else if((found = check(temp, "actionreadyitem", &i, &start))){
+                    else if ((found = check(temp, "actionreadyitem", &i, &start)))
+                    {
                         retval << context.getActionBinding("#{sReady_Weapon}");
                     }
-                    else if((found = check(temp, "actionprevspell", &i, &start))){
+                    else if ((found = check(temp, "actionprevspell", &i, &start)))
+                    {
                         retval << context.getActionBinding("#{sPrevSpell}");
                     }
-                    else if((found = check(temp, "actionnextspell", &i, &start))){
+                    else if ((found = check(temp, "actionnextspell", &i, &start)))
+                    {
                         retval << context.getActionBinding("#{sNextSpell}");
                     }
-                    else if((found = check(temp, "actionrestmenu", &i, &start))){
+                    else if ((found = check(temp, "actionrestmenu", &i, &start)))
+                    {
                         retval << context.getActionBinding("#{sRestKey}");
                     }
-                    else if((found = check(temp, "actionmenumode", &i, &start))){
+                    else if ((found = check(temp, "actionmenumode", &i, &start)))
+                    {
                         retval << context.getActionBinding("#{sInventory}");
                     }
-                    else if((found = check(temp, "actionactivate", &i, &start))){
+                    else if ((found = check(temp, "actionactivate", &i, &start)))
+                    {
                         retval << context.getActionBinding("#{sActivate}");
                     }
-                    else if((found = check(temp, "actionjournal", &i, &start))){
+                    else if ((found = check(temp, "actionjournal", &i, &start)))
+                    {
                         retval << context.getActionBinding("#{sJournal}");
                     }
-                    else if((found = check(temp, "actionforward", &i, &start))){
+                    else if ((found = check(temp, "actionforward", &i, &start)))
+                    {
                         retval << context.getActionBinding("#{sForward}");
                     }
-                    else if((found = check(temp, "pccrimelevel", &i, &start))){
+                    else if ((found = check(temp, "pccrimelevel", &i, &start)))
+                    {
                         retval << context.getPCBounty();
                     }
-                    else if((found = check(temp, "actioncrouch", &i, &start))){
+                    else if ((found = check(temp, "actioncrouch", &i, &start)))
+                    {
                         retval << context.getActionBinding("#{sCrouch_Sneak}");
                     }
-                    else if((found = check(temp, "actionjump", &i, &start))){
+                    else if ((found = check(temp, "actionjump", &i, &start)))
+                    {
                         retval << context.getActionBinding("#{sJump}");
                     }
-                    else if((found = check(temp, "actionback", &i, &start))){
+                    else if ((found = check(temp, "actionback", &i, &start)))
+                    {
                         retval << context.getActionBinding("#{sBack}");
                     }
-                    else if((found = check(temp, "actionuse", &i, &start))){
+                    else if ((found = check(temp, "actionuse", &i, &start)))
+                    {
                         retval << context.getActionBinding("#{sUse}");
                     }
-                    else if((found = check(temp, "actionrun", &i, &start))){
+                    else if ((found = check(temp, "actionrun", &i, &start)))
+                    {
                         retval << context.getActionBinding("#{sRun}");
                     }
-                    else if((found = check(temp, "pcclass", &i, &start))){
+                    else if ((found = check(temp, "pcclass", &i, &start)))
+                    {
                         retval << context.getPCClass();
                     }
-                    else if((found = check(temp, "pcrace", &i, &start))){
+                    else if ((found = check(temp, "pcrace", &i, &start)))
+                    {
                         retval << context.getPCRace();
                     }
-                    else if((found = check(temp, "pcname", &i, &start))){
+                    else if ((found = check(temp, "pcname", &i, &start)))
+                    {
                         retval << context.getPCName();
                     }
-                    else if((found = check(temp, "cell", &i, &start))){
+                    else if ((found = check(temp, "cell", &i, &start)))
+                    {
                         retval << context.getCurrentCellName();
                     }
 
-                    else if(dialogue) { // In Dialogue, not messagebox
-                        if(     (found = check(temp, "faction", &i, &start))){
+                    else if (dialogue)
+                    { // In Dialogue, not messagebox
+                        if ((found = check(temp, "faction", &i, &start)))
+                        {
                             retval << context.getNPCFaction();
                         }
-                        else if((found = check(temp, "nextpcrank", &i, &start))){
+                        else if ((found = check(temp, "nextpcrank", &i, &start)))
+                        {
                             retval << context.getPCNextRank();
                         }
-                        else if((found = check(temp, "pcnextrank", &i, &start))){
+                        else if ((found = check(temp, "pcnextrank", &i, &start)))
+                        {
                             retval << context.getPCNextRank();
                         }
-                        else if((found = check(temp, "pcrank", &i, &start))){
+                        else if ((found = check(temp, "pcrank", &i, &start)))
+                        {
                             retval << context.getPCRank();
                         }
-                        else if((found = check(temp, "rank", &i, &start))){
+                        else if ((found = check(temp, "rank", &i, &start)))
+                        {
                             retval << context.getNPCRank();
                         }
 
-                        else if((found = check(temp, "class", &i, &start))){
+                        else if ((found = check(temp, "class", &i, &start)))
+                        {
                             retval << context.getNPCClass();
                         }
-                        else if((found = check(temp, "race", &i, &start))){
+                        else if ((found = check(temp, "race", &i, &start)))
+                        {
                             retval << context.getNPCRace();
                         }
-                        else if((found = check(temp, "name", &i, &start))){
+                        else if ((found = check(temp, "name", &i, &start)))
+                        {
                             retval << context.getActorName();
                         }
                     }
-                    else { // In messagebox or book, not dialogue
+                    else
+                    { // In messagebox or book, not dialogue
 
                         /* empty outside dialogue */
-                        if(     (found = check(temp, "faction", &i, &start)));
-                        else if((found = check(temp, "nextpcrank", &i, &start)));
-                        else if((found = check(temp, "pcnextrank", &i, &start)));
-                        else if((found = check(temp, "pcrank", &i, &start)));
-                        else if((found = check(temp, "rank", &i, &start)));
+                        if ((found = check(temp, "faction", &i, &start)))
+                            ;
+                        else if ((found = check(temp, "nextpcrank", &i, &start)))
+                            ;
+                        else if ((found = check(temp, "pcnextrank", &i, &start)))
+                            ;
+                        else if ((found = check(temp, "pcrank", &i, &start)))
+                            ;
+                        else if ((found = check(temp, "rank", &i, &start)))
+                            ;
 
                         /* uses pc in messageboxes */
-                        else if((found = check(temp, "class", &i, &start))){
+                        else if ((found = check(temp, "class", &i, &start)))
+                        {
                             retval << context.getPCClass();
                         }
-                        else if((found = check(temp, "race", &i, &start))){
+                        else if ((found = check(temp, "race", &i, &start)))
+                        {
                             retval << context.getPCRace();
                         }
-                        else if((found = check(temp, "name", &i, &start))){
+                        else if ((found = check(temp, "name", &i, &start)))
+                        {
                             retval << context.getPCName();
                         }
                     }
 
                     /* Not a builtin, try global variables */
-                    if(!found){
+                    if (!found)
+                    {
                         /* if list of globals is empty, grab it and sort it by descending string length */
-                        if(globals.empty()){
+                        if (globals.empty())
+                        {
                             globals = context.getGlobals();
                             sort(globals.begin(), globals.end(), longerStr);
                         }
 
-                        for(unsigned int j = 0; j < globals.size(); j++)
+                        for (unsigned int j = 0; j < globals.size(); j++)
                         {
                             if (globals[j].length() > temp.length()) // Just in case there's a global with a huuuge name
-                                temp = Misc::StringUtils::lowerCase(std::string_view(text).substr(i + 1, globals[j].length()));
+                                temp = Misc::StringUtils::lowerCase(
+                                    std::string_view(text).substr(i + 1, globals[j].length()));
 
                             found = check(temp, globals[j], &i, &start);
-                            if(found){
+                            if (found)
+                            {
                                 char type = context.getGlobalType(globals[j]);
 
-                                switch(type){
-                                    case 's': retval << context.getGlobalShort(globals[j]);  break;
-                                    case 'l': retval << context.getGlobalLong(globals[j]); break;
-                                    case 'f': retval << context.getGlobalFloat(globals[j]); break;
+                                switch (type)
+                                {
+                                    case 's':
+                                        retval << context.getGlobalShort(globals[j]);
+                                        break;
+                                    case 'l':
+                                        retval << context.getGlobalLong(globals[j]);
+                                        break;
+                                    case 'f':
+                                        retval << context.getGlobalFloat(globals[j]);
+                                        break;
                                 }
                                 break;
                             }
@@ -192,12 +247,14 @@ namespace Interpreter{
                 }
                 catch (std::exception& e)
                 {
-                    Log(Debug::Error) << "Error: Failed to replace escape character, with the following error: " << e.what();
+                    Log(Debug::Error) << "Error: Failed to replace escape character, with the following error: "
+                                      << e.what();
                     Log(Debug::Error) << "Full text below:\n" << text;
                 }
 
                 // Not found, or error
-                if(!found){
+                if (!found)
+                {
                     /* leave unmodified */
                     i += 1;
                     start = i;
@@ -206,18 +263,21 @@ namespace Interpreter{
             }
         }
         retval << text.substr(start, text.length() - start);
-        return retval.str ();
+        return retval.str();
     }
 
-    std::string fixDefinesDialog(const std::string& text, Context& context){
+    std::string fixDefinesDialog(const std::string& text, Context& context)
+    {
         return fixDefinesReal(text, true, context);
     }
 
-    std::string fixDefinesMsgBox(const std::string& text, Context& context){
+    std::string fixDefinesMsgBox(const std::string& text, Context& context)
+    {
         return fixDefinesReal(text, false, context);
     }
 
-    std::string fixDefinesBook(const std::string& text, Context& context){
+    std::string fixDefinesBook(const std::string& text, Context& context)
+    {
         return fixDefinesReal(text, false, context);
     }
 }
diff --git a/components/interpreter/defines.hpp b/components/interpreter/defines.hpp
index 3471b20305..e371c30ed5 100644
--- a/components/interpreter/defines.hpp
+++ b/components/interpreter/defines.hpp
@@ -1,10 +1,11 @@
 #ifndef INTERPRETER_DEFINES_H_INCLUDED
 #define INTERPRETER_DEFINES_H_INCLUDED
 
-#include <string>
 #include "context.hpp"
+#include <string>
 
-namespace Interpreter{
+namespace Interpreter
+{
     std::string fixDefinesDialog(const std::string& text, Context& context);
     std::string fixDefinesMsgBox(const std::string& text, Context& context);
     std::string fixDefinesBook(const std::string& text, Context& context);
diff --git a/components/interpreter/genericopcodes.hpp b/components/interpreter/genericopcodes.hpp
index ca08027aeb..1bbcc75d54 100644
--- a/components/interpreter/genericopcodes.hpp
+++ b/components/interpreter/genericopcodes.hpp
@@ -8,86 +8,75 @@ namespace Interpreter
 {
     class OpPushInt : public Opcode1
     {
-        public:
-        
-            void execute (Runtime& runtime, unsigned int arg0) override
-            {
-                runtime.push (static_cast<Type_Integer> (arg0));
-            }        
+    public:
+        void execute(Runtime& runtime, unsigned int arg0) override { runtime.push(static_cast<Type_Integer>(arg0)); }
     };
-    
+
     class OpIntToFloat : public Opcode0
     {
-        public:
-        
-            void execute (Runtime& runtime) override
-            {
-                Type_Integer data = runtime[0].mInteger;
-                Type_Float floatValue = static_cast<Type_Float> (data);
-                runtime[0].mFloat = floatValue;
-            }           
+    public:
+        void execute(Runtime& runtime) override
+        {
+            Type_Integer data = runtime[0].mInteger;
+            Type_Float floatValue = static_cast<Type_Float>(data);
+            runtime[0].mFloat = floatValue;
+        }
     };
-    
+
     class OpFloatToInt : public Opcode0
     {
-        public:
-        
-            void execute (Runtime& runtime) override
-            {
-                Type_Float data = runtime[0].mFloat;
-                Type_Integer integerValue = static_cast<Type_Integer> (data);
-                runtime[0].mInteger = integerValue;
-            }           
-    };    
-    
+    public:
+        void execute(Runtime& runtime) override
+        {
+            Type_Float data = runtime[0].mFloat;
+            Type_Integer integerValue = static_cast<Type_Integer>(data);
+            runtime[0].mInteger = integerValue;
+        }
+    };
+
     class OpNegateInt : public Opcode0
     {
-        public:
-        
-            void execute (Runtime& runtime) override
-            {
-                Type_Integer data = runtime[0].mInteger;
-                data = -data;
-                runtime[0].mInteger = data;
-            }           
-    };    
-    
+    public:
+        void execute(Runtime& runtime) override
+        {
+            Type_Integer data = runtime[0].mInteger;
+            data = -data;
+            runtime[0].mInteger = data;
+        }
+    };
+
     class OpNegateFloat : public Opcode0
     {
-        public:
-        
-            void execute (Runtime& runtime) override
-            {
-                Type_Float data = runtime[0].mFloat;
-                data = -data;
-                runtime[0].mFloat = data;
-            }           
+    public:
+        void execute(Runtime& runtime) override
+        {
+            Type_Float data = runtime[0].mFloat;
+            data = -data;
+            runtime[0].mFloat = data;
+        }
     };
-    
+
     class OpIntToFloat1 : public Opcode0
     {
-        public:
-        
-            void execute (Runtime& runtime) override
-            {
-                Type_Integer data = runtime[1].mInteger;
-                Type_Float floatValue = static_cast<Type_Float> (data);
-                runtime[1].mFloat = floatValue;
-            }           
+    public:
+        void execute(Runtime& runtime) override
+        {
+            Type_Integer data = runtime[1].mInteger;
+            Type_Float floatValue = static_cast<Type_Float>(data);
+            runtime[1].mFloat = floatValue;
+        }
     };
-    
+
     class OpFloatToInt1 : public Opcode0
     {
-        public:
-        
-            void execute (Runtime& runtime) override
-            {
-                Type_Float data = runtime[1].mFloat;
-                Type_Integer integerValue = static_cast<Type_Integer> (data);
-                runtime[1].mInteger = integerValue;
-            }           
-    };            
+    public:
+        void execute(Runtime& runtime) override
+        {
+            Type_Float data = runtime[1].mFloat;
+            Type_Integer integerValue = static_cast<Type_Integer>(data);
+            runtime[1].mInteger = integerValue;
+        }
+    };
 }
 
 #endif
-
diff --git a/components/interpreter/installopcodes.cpp b/components/interpreter/installopcodes.cpp
index d5e9bb0cc5..ee8a341df8 100644
--- a/components/interpreter/installopcodes.cpp
+++ b/components/interpreter/installopcodes.cpp
@@ -2,11 +2,11 @@
 
 #include <functional>
 
-#include "interpreter.hpp"
+#include "controlopcodes.hpp"
 #include "genericopcodes.hpp"
+#include "interpreter.hpp"
 #include "localopcodes.hpp"
 #include "mathopcodes.hpp"
-#include "controlopcodes.hpp"
 #include "miscopcodes.hpp"
 
 namespace Interpreter
@@ -59,19 +59,19 @@ namespace Interpreter
         interpreter.installSegment5<OpMulInt<Type_Float>>(14);
         interpreter.installSegment5<OpDivInt<Type_Integer>>(15);
         interpreter.installSegment5<OpDivInt<Type_Float>>(16);
-        interpreter.installSegment5<OpCompare<Type_Integer, std::equal_to<Type_Integer> >>(26);
-        interpreter.installSegment5<OpCompare<Type_Integer, std::not_equal_to<Type_Integer> >>(27);
-        interpreter.installSegment5<OpCompare<Type_Integer, std::less<Type_Integer> >>(28);
-        interpreter.installSegment5<OpCompare<Type_Integer, std::less_equal<Type_Integer> >>(29);
-        interpreter.installSegment5<OpCompare<Type_Integer, std::greater<Type_Integer> >>(30);
-        interpreter.installSegment5<OpCompare<Type_Integer, std::greater_equal<Type_Integer> >>(31);
+        interpreter.installSegment5<OpCompare<Type_Integer, std::equal_to<Type_Integer>>>(26);
+        interpreter.installSegment5<OpCompare<Type_Integer, std::not_equal_to<Type_Integer>>>(27);
+        interpreter.installSegment5<OpCompare<Type_Integer, std::less<Type_Integer>>>(28);
+        interpreter.installSegment5<OpCompare<Type_Integer, std::less_equal<Type_Integer>>>(29);
+        interpreter.installSegment5<OpCompare<Type_Integer, std::greater<Type_Integer>>>(30);
+        interpreter.installSegment5<OpCompare<Type_Integer, std::greater_equal<Type_Integer>>>(31);
 
-        interpreter.installSegment5<OpCompare<Type_Float, std::equal_to<Type_Float> >>(32);
-        interpreter.installSegment5<OpCompare<Type_Float, std::not_equal_to<Type_Float> >>(33);
-        interpreter.installSegment5<OpCompare<Type_Float, std::less<Type_Float> >>(34);
-        interpreter.installSegment5<OpCompare<Type_Float, std::less_equal<Type_Float> >>(35);
-        interpreter.installSegment5<OpCompare<Type_Float, std::greater<Type_Float> >>(36);
-        interpreter.installSegment5<OpCompare<Type_Float, std::greater_equal<Type_Float> >>(37);
+        interpreter.installSegment5<OpCompare<Type_Float, std::equal_to<Type_Float>>>(32);
+        interpreter.installSegment5<OpCompare<Type_Float, std::not_equal_to<Type_Float>>>(33);
+        interpreter.installSegment5<OpCompare<Type_Float, std::less<Type_Float>>>(34);
+        interpreter.installSegment5<OpCompare<Type_Float, std::less_equal<Type_Float>>>(35);
+        interpreter.installSegment5<OpCompare<Type_Float, std::greater<Type_Float>>>(36);
+        interpreter.installSegment5<OpCompare<Type_Float, std::greater_equal<Type_Float>>>(37);
 
         // control structures
         interpreter.installSegment5<OpReturn>(20);
diff --git a/components/interpreter/installopcodes.hpp b/components/interpreter/installopcodes.hpp
index 8020490dd1..7c89d3316b 100644
--- a/components/interpreter/installopcodes.hpp
+++ b/components/interpreter/installopcodes.hpp
@@ -4,8 +4,8 @@
 namespace Interpreter
 {
     class Interpreter;
-    
-    void installOpcodes (Interpreter& interpreter);
+
+    void installOpcodes(Interpreter& interpreter);
 }
 
 #endif
diff --git a/components/interpreter/interpreter.cpp b/components/interpreter/interpreter.cpp
index 7047dec05f..712c5ea380 100644
--- a/components/interpreter/interpreter.cpp
+++ b/components/interpreter/interpreter.cpp
@@ -20,7 +20,7 @@ namespace Interpreter
         throw std::runtime_error(error);
     }
 
-    template<typename T>
+    template <typename T>
     auto& getDispatcher(const T& segment, unsigned int seg, int opcode)
     {
         auto it = segment.find(opcode);
@@ -31,7 +31,7 @@ namespace Interpreter
         return it->second;
     }
 
-    void Interpreter::execute (Type_Code code)
+    void Interpreter::execute(Type_Code code)
     {
         unsigned int segSpec = code >> 30;
 
@@ -74,14 +74,14 @@ namespace Interpreter
             }
         }
 
-        abortUnknownSegment (code);
+        abortUnknownSegment(code);
     }
 
     void Interpreter::begin()
     {
         if (mRunning)
         {
-            mCallstack.push (mRuntime);
+            mCallstack.push(mRuntime);
             mRuntime.clear();
         }
         else
@@ -104,28 +104,30 @@ namespace Interpreter
         }
     }
 
-    Interpreter::Interpreter() : mRunning (false)
-    {}
+    Interpreter::Interpreter()
+        : mRunning(false)
+    {
+    }
 
-    void Interpreter::run (const Type_Code *code, int codeSize, Context& context)
+    void Interpreter::run(const Type_Code* code, int codeSize, Context& context)
     {
-        assert (codeSize>=4);
+        assert(codeSize >= 4);
 
         begin();
 
         try
         {
-            mRuntime.configure (code, codeSize, context);
+            mRuntime.configure(code, codeSize, context);
 
-            int opcodes = static_cast<int> (code[0]);
+            int opcodes = static_cast<int>(code[0]);
 
-            const Type_Code *codeBlock = code + 4;
+            const Type_Code* codeBlock = code + 4;
 
-            while (mRuntime.getPC()>=0 && mRuntime.getPC()<opcodes)
+            while (mRuntime.getPC() >= 0 && mRuntime.getPC() < opcodes)
             {
                 Type_Code runCode = codeBlock[mRuntime.getPC()];
-                mRuntime.setPC (mRuntime.getPC()+1);
-                execute (runCode);
+                mRuntime.setPC(mRuntime.getPC() + 1);
+                execute(runCode);
             }
         }
         catch (...)
diff --git a/components/interpreter/interpreter.hpp b/components/interpreter/interpreter.hpp
index 2e08e6614b..29cb48ead4 100644
--- a/components/interpreter/interpreter.hpp
+++ b/components/interpreter/interpreter.hpp
@@ -1,74 +1,73 @@
 #ifndef INTERPRETER_INTERPRETER_H_INCLUDED
 #define INTERPRETER_INTERPRETER_H_INCLUDED
 
+#include <cassert>
 #include <map>
-#include <stack>
 #include <memory>
-#include <cassert>
+#include <stack>
 #include <utility>
 
+#include "opcodes.hpp"
 #include "runtime.hpp"
 #include "types.hpp"
-#include "opcodes.hpp"
 
 namespace Interpreter
 {
     class Interpreter
     {
-            std::stack<Runtime> mCallstack;
-            bool mRunning;
-            Runtime mRuntime;
-            std::map<int, std::unique_ptr<Opcode1>> mSegment0;
-            std::map<int, std::unique_ptr<Opcode1>> mSegment2;
-            std::map<int, std::unique_ptr<Opcode1>> mSegment3;
-            std::map<int, std::unique_ptr<Opcode0>> mSegment5;
-
-            // not implemented
-            Interpreter (const Interpreter&);
-            Interpreter& operator= (const Interpreter&);
-
-            void execute (Type_Code code);
-
-            void begin();
-
-            void end();
-
-            template<typename TSeg, typename TOp>
-            void installSegment(TSeg& seg, int code, TOp&& op)
-            {
-                assert(seg.find(code) == seg.end());
-                seg.emplace(code, std::move(op));
-            }
-
-        public:
-
-            Interpreter();
-
-            template<typename T, typename ...TArgs>
-            void installSegment0(int code, TArgs&& ...args)
-            {
-                installSegment(mSegment0, code, std::make_unique<T>(std::forward<TArgs>(args)...));
-            }
-
-            template<typename T, typename ...TArgs>
-            void installSegment2(int code, TArgs&& ...args)
-            {
-                installSegment(mSegment2, code, std::make_unique<T>(std::forward<TArgs>(args)...));
-            }
-
-            template<typename T, typename ...TArgs>
-            void installSegment3(int code, TArgs&& ...args)
-            {
-                installSegment(mSegment3, code, std::make_unique<T>(std::forward<TArgs>(args)...));
-            }
-
-            template<typename T, typename ...TArgs>
-            void installSegment5(int code, TArgs&& ...args)
-            {
-                installSegment(mSegment5, code, std::make_unique<T>(std::forward<TArgs>(args)...));
-            }
-
-            void run (const Type_Code *code, int codeSize, Context& context);
+        std::stack<Runtime> mCallstack;
+        bool mRunning;
+        Runtime mRuntime;
+        std::map<int, std::unique_ptr<Opcode1>> mSegment0;
+        std::map<int, std::unique_ptr<Opcode1>> mSegment2;
+        std::map<int, std::unique_ptr<Opcode1>> mSegment3;
+        std::map<int, std::unique_ptr<Opcode0>> mSegment5;
+
+        // not implemented
+        Interpreter(const Interpreter&);
+        Interpreter& operator=(const Interpreter&);
+
+        void execute(Type_Code code);
+
+        void begin();
+
+        void end();
+
+        template <typename TSeg, typename TOp>
+        void installSegment(TSeg& seg, int code, TOp&& op)
+        {
+            assert(seg.find(code) == seg.end());
+            seg.emplace(code, std::move(op));
+        }
+
+    public:
+        Interpreter();
+
+        template <typename T, typename... TArgs>
+        void installSegment0(int code, TArgs&&... args)
+        {
+            installSegment(mSegment0, code, std::make_unique<T>(std::forward<TArgs>(args)...));
+        }
+
+        template <typename T, typename... TArgs>
+        void installSegment2(int code, TArgs&&... args)
+        {
+            installSegment(mSegment2, code, std::make_unique<T>(std::forward<TArgs>(args)...));
+        }
+
+        template <typename T, typename... TArgs>
+        void installSegment3(int code, TArgs&&... args)
+        {
+            installSegment(mSegment3, code, std::make_unique<T>(std::forward<TArgs>(args)...));
+        }
+
+        template <typename T, typename... TArgs>
+        void installSegment5(int code, TArgs&&... args)
+        {
+            installSegment(mSegment5, code, std::make_unique<T>(std::forward<TArgs>(args)...));
+        }
+
+        void run(const Type_Code* code, int codeSize, Context& context);
     };
 }
 
diff --git a/components/interpreter/localopcodes.hpp b/components/interpreter/localopcodes.hpp
index 6fe779493f..8422858934 100644
--- a/components/interpreter/localopcodes.hpp
+++ b/components/interpreter/localopcodes.hpp
@@ -1,326 +1,306 @@
 #ifndef INTERPRETER_LOCALOPCODES_H_INCLUDED
 #define INTERPRETER_LOCALOPCODES_H_INCLUDED
 
+#include "context.hpp"
 #include "opcodes.hpp"
 #include "runtime.hpp"
-#include "context.hpp"
 
 namespace Interpreter
 {
     class OpStoreLocalShort : public Opcode0
     {
-        public:
-
-            void execute (Runtime& runtime) override
-            {
-                Type_Integer data = runtime[0].mInteger;
-                int index = runtime[1].mInteger;
+    public:
+        void execute(Runtime& runtime) override
+        {
+            Type_Integer data = runtime[0].mInteger;
+            int index = runtime[1].mInteger;
 
-                runtime.getContext().setLocalShort (index, data);
+            runtime.getContext().setLocalShort(index, data);
 
-                runtime.pop();
-                runtime.pop();
-            }
+            runtime.pop();
+            runtime.pop();
+        }
     };
 
     class OpStoreLocalLong : public Opcode0
     {
-        public:
+    public:
+        void execute(Runtime& runtime) override
+        {
+            Type_Integer data = runtime[0].mInteger;
+            int index = runtime[1].mInteger;
 
-            void execute (Runtime& runtime) override
-            {
-                Type_Integer data = runtime[0].mInteger;
-                int index = runtime[1].mInteger;
+            runtime.getContext().setLocalLong(index, data);
 
-                runtime.getContext().setLocalLong (index, data);
-
-                runtime.pop();
-                runtime.pop();
-            }
+            runtime.pop();
+            runtime.pop();
+        }
     };
 
     class OpStoreLocalFloat : public Opcode0
     {
-        public:
-
-            void execute (Runtime& runtime) override
-            {
-                Type_Float data = runtime[0].mFloat;
-                int index = runtime[1].mInteger;
+    public:
+        void execute(Runtime& runtime) override
+        {
+            Type_Float data = runtime[0].mFloat;
+            int index = runtime[1].mInteger;
 
-                runtime.getContext().setLocalFloat (index, data);
+            runtime.getContext().setLocalFloat(index, data);
 
-                runtime.pop();
-                runtime.pop();
-            }
+            runtime.pop();
+            runtime.pop();
+        }
     };
 
     class OpFetchIntLiteral : public Opcode0
     {
-        public:
-
-            void execute (Runtime& runtime) override
-            {
-                Type_Integer intValue = runtime.getIntegerLiteral (runtime[0].mInteger);
-                runtime[0].mInteger = intValue;
-            }
+    public:
+        void execute(Runtime& runtime) override
+        {
+            Type_Integer intValue = runtime.getIntegerLiteral(runtime[0].mInteger);
+            runtime[0].mInteger = intValue;
+        }
     };
 
     class OpFetchFloatLiteral : public Opcode0
     {
-        public:
-
-            void execute (Runtime& runtime) override
-            {
-                Type_Float floatValue = runtime.getFloatLiteral (runtime[0].mInteger);
-                runtime[0].mFloat = floatValue;
-            }
+    public:
+        void execute(Runtime& runtime) override
+        {
+            Type_Float floatValue = runtime.getFloatLiteral(runtime[0].mInteger);
+            runtime[0].mFloat = floatValue;
+        }
     };
 
     class OpFetchLocalShort : public Opcode0
     {
-        public:
-
-            void execute (Runtime& runtime) override
-            {
-                int index = runtime[0].mInteger;
-                int value = runtime.getContext().getLocalShort (index);
-                runtime[0].mInteger = value;
-            }
+    public:
+        void execute(Runtime& runtime) override
+        {
+            int index = runtime[0].mInteger;
+            int value = runtime.getContext().getLocalShort(index);
+            runtime[0].mInteger = value;
+        }
     };
 
     class OpFetchLocalLong : public Opcode0
     {
-        public:
-
-            void execute (Runtime& runtime) override
-            {
-                int index = runtime[0].mInteger;
-                int value = runtime.getContext().getLocalLong (index);
-                runtime[0].mInteger = value;
-            }
+    public:
+        void execute(Runtime& runtime) override
+        {
+            int index = runtime[0].mInteger;
+            int value = runtime.getContext().getLocalLong(index);
+            runtime[0].mInteger = value;
+        }
     };
 
     class OpFetchLocalFloat : public Opcode0
     {
-        public:
-
-            void execute (Runtime& runtime) override
-            {
-                int index = runtime[0].mInteger;
-                float value = runtime.getContext().getLocalFloat (index);
-                runtime[0].mFloat = value;
-            }
+    public:
+        void execute(Runtime& runtime) override
+        {
+            int index = runtime[0].mInteger;
+            float value = runtime.getContext().getLocalFloat(index);
+            runtime[0].mFloat = value;
+        }
     };
 
     class OpStoreGlobalShort : public Opcode0
     {
-        public:
-
-            void execute (Runtime& runtime) override
-            {
-                Type_Integer data = runtime[0].mInteger;
-                int index = runtime[1].mInteger;
+    public:
+        void execute(Runtime& runtime) override
+        {
+            Type_Integer data = runtime[0].mInteger;
+            int index = runtime[1].mInteger;
 
-                std::string_view name = runtime.getStringLiteral (index);
+            std::string_view name = runtime.getStringLiteral(index);
 
-                runtime.getContext().setGlobalShort (name, data);
+            runtime.getContext().setGlobalShort(name, data);
 
-                runtime.pop();
-                runtime.pop();
-            }
+            runtime.pop();
+            runtime.pop();
+        }
     };
 
     class OpStoreGlobalLong : public Opcode0
     {
-        public:
+    public:
+        void execute(Runtime& runtime) override
+        {
+            Type_Integer data = runtime[0].mInteger;
+            int index = runtime[1].mInteger;
 
-            void execute (Runtime& runtime) override
-            {
-                Type_Integer data = runtime[0].mInteger;
-                int index = runtime[1].mInteger;
+            std::string_view name = runtime.getStringLiteral(index);
 
-                std::string_view name = runtime.getStringLiteral (index);
+            runtime.getContext().setGlobalLong(name, data);
 
-                runtime.getContext().setGlobalLong (name, data);
-
-                runtime.pop();
-                runtime.pop();
-            }
+            runtime.pop();
+            runtime.pop();
+        }
     };
 
     class OpStoreGlobalFloat : public Opcode0
     {
-        public:
-
-            void execute (Runtime& runtime) override
-            {
-                Type_Float data = runtime[0].mFloat;
-                int index = runtime[1].mInteger;
+    public:
+        void execute(Runtime& runtime) override
+        {
+            Type_Float data = runtime[0].mFloat;
+            int index = runtime[1].mInteger;
 
-                std::string_view name = runtime.getStringLiteral (index);
+            std::string_view name = runtime.getStringLiteral(index);
 
-                runtime.getContext().setGlobalFloat (name, data);
+            runtime.getContext().setGlobalFloat(name, data);
 
-                runtime.pop();
-                runtime.pop();
-            }
+            runtime.pop();
+            runtime.pop();
+        }
     };
 
     class OpFetchGlobalShort : public Opcode0
     {
-        public:
-
-            void execute (Runtime& runtime) override
-            {
-                int index = runtime[0].mInteger;
-                std::string_view name = runtime.getStringLiteral (index);
-                Type_Integer value = runtime.getContext().getGlobalShort (name);
-                runtime[0].mInteger = value;
-            }
+    public:
+        void execute(Runtime& runtime) override
+        {
+            int index = runtime[0].mInteger;
+            std::string_view name = runtime.getStringLiteral(index);
+            Type_Integer value = runtime.getContext().getGlobalShort(name);
+            runtime[0].mInteger = value;
+        }
     };
 
     class OpFetchGlobalLong : public Opcode0
     {
-        public:
-
-            void execute (Runtime& runtime) override
-            {
-                int index = runtime[0].mInteger;
-                std::string_view name = runtime.getStringLiteral (index);
-                Type_Integer value = runtime.getContext().getGlobalLong (name);
-                runtime[0].mInteger = value;
-            }
+    public:
+        void execute(Runtime& runtime) override
+        {
+            int index = runtime[0].mInteger;
+            std::string_view name = runtime.getStringLiteral(index);
+            Type_Integer value = runtime.getContext().getGlobalLong(name);
+            runtime[0].mInteger = value;
+        }
     };
 
     class OpFetchGlobalFloat : public Opcode0
     {
-        public:
-
-            void execute (Runtime& runtime) override
-            {
-                int index = runtime[0].mInteger;
-                std::string_view name = runtime.getStringLiteral (index);
-                Type_Float value = runtime.getContext().getGlobalFloat (name);
-                runtime[0].mFloat = value;
-            }
+    public:
+        void execute(Runtime& runtime) override
+        {
+            int index = runtime[0].mInteger;
+            std::string_view name = runtime.getStringLiteral(index);
+            Type_Float value = runtime.getContext().getGlobalFloat(name);
+            runtime[0].mFloat = value;
+        }
     };
 
-    template<bool TGlobal>
+    template <bool TGlobal>
     class OpStoreMemberShort : public Opcode0
     {
-        public:
-
-            void execute (Runtime& runtime) override
-            {
-                Type_Integer data = runtime[0].mInteger;
-                Type_Integer index = runtime[1].mInteger;
-                std::string_view id = runtime.getStringLiteral (index);
-                index = runtime[2].mInteger;
-                std::string_view variable = runtime.getStringLiteral (index);
-
-                runtime.getContext().setMemberShort (id, variable, data, TGlobal);
-
-                runtime.pop();
-                runtime.pop();
-                runtime.pop();
-            }
+    public:
+        void execute(Runtime& runtime) override
+        {
+            Type_Integer data = runtime[0].mInteger;
+            Type_Integer index = runtime[1].mInteger;
+            std::string_view id = runtime.getStringLiteral(index);
+            index = runtime[2].mInteger;
+            std::string_view variable = runtime.getStringLiteral(index);
+
+            runtime.getContext().setMemberShort(id, variable, data, TGlobal);
+
+            runtime.pop();
+            runtime.pop();
+            runtime.pop();
+        }
     };
 
-    template<bool TGlobal>
+    template <bool TGlobal>
     class OpStoreMemberLong : public Opcode0
     {
-        public:
-
-            void execute (Runtime& runtime) override
-            {
-                Type_Integer data = runtime[0].mInteger;
-                Type_Integer index = runtime[1].mInteger;
-                std::string_view id = runtime.getStringLiteral (index);
-                index = runtime[2].mInteger;
-                std::string_view variable = runtime.getStringLiteral (index);
-
-                runtime.getContext().setMemberLong (id, variable, data, TGlobal);
-
-                runtime.pop();
-                runtime.pop();
-                runtime.pop();
-            }
+    public:
+        void execute(Runtime& runtime) override
+        {
+            Type_Integer data = runtime[0].mInteger;
+            Type_Integer index = runtime[1].mInteger;
+            std::string_view id = runtime.getStringLiteral(index);
+            index = runtime[2].mInteger;
+            std::string_view variable = runtime.getStringLiteral(index);
+
+            runtime.getContext().setMemberLong(id, variable, data, TGlobal);
+
+            runtime.pop();
+            runtime.pop();
+            runtime.pop();
+        }
     };
 
-    template<bool TGlobal>
+    template <bool TGlobal>
     class OpStoreMemberFloat : public Opcode0
     {
-        public:
-
-            void execute (Runtime& runtime) override
-            {
-                Type_Float data = runtime[0].mFloat;
-                Type_Integer index = runtime[1].mInteger;
-                std::string_view id = runtime.getStringLiteral (index);
-                index = runtime[2].mInteger;
-                std::string_view variable = runtime.getStringLiteral (index);
-
-                runtime.getContext().setMemberFloat (id, variable, data, TGlobal);
-
-                runtime.pop();
-                runtime.pop();
-                runtime.pop();
-            }
+    public:
+        void execute(Runtime& runtime) override
+        {
+            Type_Float data = runtime[0].mFloat;
+            Type_Integer index = runtime[1].mInteger;
+            std::string_view id = runtime.getStringLiteral(index);
+            index = runtime[2].mInteger;
+            std::string_view variable = runtime.getStringLiteral(index);
+
+            runtime.getContext().setMemberFloat(id, variable, data, TGlobal);
+
+            runtime.pop();
+            runtime.pop();
+            runtime.pop();
+        }
     };
 
-    template<bool TGlobal>
+    template <bool TGlobal>
     class OpFetchMemberShort : public Opcode0
     {
-        public:
-
-            void execute (Runtime& runtime) override
-            {
-                Type_Integer index = runtime[0].mInteger;
-                std::string_view id = runtime.getStringLiteral (index);
-                index = runtime[1].mInteger;
-                std::string_view variable = runtime.getStringLiteral (index);
-                runtime.pop();
-
-                int value = runtime.getContext().getMemberShort (id, variable, TGlobal);
-                runtime[0].mInteger = value;
-            }
+    public:
+        void execute(Runtime& runtime) override
+        {
+            Type_Integer index = runtime[0].mInteger;
+            std::string_view id = runtime.getStringLiteral(index);
+            index = runtime[1].mInteger;
+            std::string_view variable = runtime.getStringLiteral(index);
+            runtime.pop();
+
+            int value = runtime.getContext().getMemberShort(id, variable, TGlobal);
+            runtime[0].mInteger = value;
+        }
     };
 
-    template<bool TGlobal>
+    template <bool TGlobal>
     class OpFetchMemberLong : public Opcode0
     {
-        public:
-
-            void execute (Runtime& runtime) override
-            {
-                Type_Integer index = runtime[0].mInteger;
-                std::string_view id = runtime.getStringLiteral (index);
-                index = runtime[1].mInteger;
-                std::string_view variable = runtime.getStringLiteral (index);
-                runtime.pop();
-
-                int value = runtime.getContext().getMemberLong (id, variable, TGlobal);
-                runtime[0].mInteger = value;
-            }
+    public:
+        void execute(Runtime& runtime) override
+        {
+            Type_Integer index = runtime[0].mInteger;
+            std::string_view id = runtime.getStringLiteral(index);
+            index = runtime[1].mInteger;
+            std::string_view variable = runtime.getStringLiteral(index);
+            runtime.pop();
+
+            int value = runtime.getContext().getMemberLong(id, variable, TGlobal);
+            runtime[0].mInteger = value;
+        }
     };
 
-    template<bool TGlobal>
+    template <bool TGlobal>
     class OpFetchMemberFloat : public Opcode0
     {
-        public:
-
-            void execute (Runtime& runtime) override
-            {
-                Type_Integer index = runtime[0].mInteger;
-                std::string_view id = runtime.getStringLiteral (index);
-                index = runtime[1].mInteger;
-                std::string_view variable = runtime.getStringLiteral (index);
-                runtime.pop();
-
-                float value = runtime.getContext().getMemberFloat (id, variable, TGlobal);
-                runtime[0].mFloat = value;
-            }
+    public:
+        void execute(Runtime& runtime) override
+        {
+            Type_Integer index = runtime[0].mInteger;
+            std::string_view id = runtime.getStringLiteral(index);
+            index = runtime[1].mInteger;
+            std::string_view variable = runtime.getStringLiteral(index);
+            runtime.pop();
+
+            float value = runtime.getContext().getMemberFloat(id, variable, TGlobal);
+            runtime[0].mFloat = value;
+        }
     };
 }
 
diff --git a/components/interpreter/mathopcodes.hpp b/components/interpreter/mathopcodes.hpp
index bf580c6c2e..febd889cca 100644
--- a/components/interpreter/mathopcodes.hpp
+++ b/components/interpreter/mathopcodes.hpp
@@ -1,94 +1,88 @@
 #ifndef INTERPRETER_MATHOPCODES_H_INCLUDED
 #define INTERPRETER_MATHOPCODES_H_INCLUDED
 
-#include <stdexcept>
 #include <cmath>
+#include <stdexcept>
 
 #include "opcodes.hpp"
 #include "runtime.hpp"
 
 namespace Interpreter
 {
-    template<typename T>
+    template <typename T>
     class OpAddInt : public Opcode0
     {
-        public:
-        
-            void execute (Runtime& runtime) override
-            {
-                T result = getData<T> (runtime[1]) + getData<T> (runtime[0]);
-                
-                runtime.pop();
-                
-                getData<T> (runtime[0]) = result;
-            }           
+    public:
+        void execute(Runtime& runtime) override
+        {
+            T result = getData<T>(runtime[1]) + getData<T>(runtime[0]);
+
+            runtime.pop();
+
+            getData<T>(runtime[0]) = result;
+        }
     };
 
-    template<typename T>
+    template <typename T>
     class OpSubInt : public Opcode0
     {
-        public:
-        
-            void execute (Runtime& runtime) override
-            {
-                T result = getData<T> (runtime[1]) - getData<T> (runtime[0]);
-                
-                runtime.pop();
-
-                getData<T> (runtime[0]) = result;
-            }           
+    public:
+        void execute(Runtime& runtime) override
+        {
+            T result = getData<T>(runtime[1]) - getData<T>(runtime[0]);
+
+            runtime.pop();
+
+            getData<T>(runtime[0]) = result;
+        }
     };
 
-    template<typename T>
+    template <typename T>
     class OpMulInt : public Opcode0
     {
-        public:
-        
-            void execute (Runtime& runtime) override
-            {
-                T result = getData<T> (runtime[1]) * getData<T> (runtime[0]);
-                
-                runtime.pop();
-
-                getData<T> (runtime[0]) = result;
-            }           
+    public:
+        void execute(Runtime& runtime) override
+        {
+            T result = getData<T>(runtime[1]) * getData<T>(runtime[0]);
+
+            runtime.pop();
+
+            getData<T>(runtime[0]) = result;
+        }
     };
 
-    template<typename T>
+    template <typename T>
     class OpDivInt : public Opcode0
     {
-        public:
-        
-            void execute (Runtime& runtime) override
-            {
-                T left = getData<T> (runtime[0]);
-            
-                if (left==0)
-                    throw std::runtime_error ("division by zero");
-            
-                T result = getData<T> (runtime[1]) / left;
-                
-                runtime.pop();
-
-                getData<T> (runtime[0]) = result;
-            }           
+    public:
+        void execute(Runtime& runtime) override
+        {
+            T left = getData<T>(runtime[0]);
+
+            if (left == 0)
+                throw std::runtime_error("division by zero");
+
+            T result = getData<T>(runtime[1]) / left;
+
+            runtime.pop();
+
+            getData<T>(runtime[0]) = result;
+        }
     };
-    
-    template<typename T, typename C>
+
+    template <typename T, typename C>
     class OpCompare : public Opcode0
     {
-        public:
-        
-            void execute (Runtime& runtime) override
-            {
-                int result = C() (getData<T> (runtime[1]), getData<T> (runtime[0]));
-                
-                runtime.pop();
-                
-                runtime[0].mInteger = result;
-            }           
+    public:
+        void execute(Runtime& runtime) override
+        {
+            int result = C()(getData<T>(runtime[1]), getData<T>(runtime[0]));
+
+            runtime.pop();
+
+            runtime[0].mInteger = result;
+        }
     };
 }
 
 #endif
-
diff --git a/components/interpreter/miscopcodes.hpp b/components/interpreter/miscopcodes.hpp
index 32b4df2e47..72cc1439d2 100644
--- a/components/interpreter/miscopcodes.hpp
+++ b/components/interpreter/miscopcodes.hpp
@@ -1,15 +1,15 @@
 #ifndef INTERPRETER_MISCOPCODES_H_INCLUDED
 #define INTERPRETER_MISCOPCODES_H_INCLUDED
 
+#include <algorithm>
+#include <sstream>
 #include <stdexcept>
-#include <vector>
 #include <string>
-#include <sstream>
-#include <algorithm>
+#include <vector>
 
+#include "defines.hpp"
 #include "opcodes.hpp"
 #include "runtime.hpp"
-#include "defines.hpp"
 
 #include <components/misc/messageformatparser.hpp>
 
@@ -17,99 +17,94 @@ namespace Interpreter
 {
     class RuntimeMessageFormatter : public Misc::MessageFormatParser
     {
-        private:
-            std::string mFormattedMessage;
-            Runtime& mRuntime;
-
-        protected:
-            void visitedPlaceholder(Placeholder placeholder, char padding, int width, int precision, Notation notation) override
+    private:
+        std::string mFormattedMessage;
+        Runtime& mRuntime;
+
+    protected:
+        void visitedPlaceholder(
+            Placeholder placeholder, char padding, int width, int precision, Notation notation) override
+        {
+            std::ostringstream out;
+            out.fill(padding);
+            if (width != -1)
+                out.width(width);
+            if (precision != -1)
+                out.precision(precision);
+
+            switch (placeholder)
             {
-                std::ostringstream out;
-                out.fill(padding);
-                if (width != -1)
-                    out.width(width);
-                if (precision != -1)
-                    out.precision(precision);
-
-                switch (placeholder)
+                case StringPlaceholder:
                 {
-                    case StringPlaceholder:
-                        {
-                            int index = mRuntime[0].mInteger;
-                            mRuntime.pop();
-
-                            out << mRuntime.getStringLiteral(index);
-                            mFormattedMessage += out.str();
-                        }
-                        break;
-                    case IntegerPlaceholder:
-                        {
-                            Type_Integer value = mRuntime[0].mInteger;
-                            mRuntime.pop();
-
-                            out << value;
-                            mFormattedMessage += out.str();
-                        }
-                        break;
-                    case FloatPlaceholder:
-                        {
-                            float value = mRuntime[0].mFloat;
-                            mRuntime.pop();
-
-                            if (notation == FixedNotation)
-                            {
-                                out << std::fixed << value;
-                                mFormattedMessage += out.str();
-                            }
-                            else if (notation == ShortestNotation)
-                            {
-                                out << value;
-                                std::string standard = out.str();
-
-                                out.str(std::string());
-                                out.clear();
-
-                                out << std::scientific << value;
-                                std::string scientific = out.str();
-
-                                mFormattedMessage += standard.length() < scientific.length() ? standard : scientific;
-                            }
-                            else
-                            {
-                                out << std::scientific << value;
-                                mFormattedMessage += out.str();
-                            }
-                        }
-                        break;
-                    default:
-                        break;
+                    int index = mRuntime[0].mInteger;
+                    mRuntime.pop();
+
+                    out << mRuntime.getStringLiteral(index);
+                    mFormattedMessage += out.str();
                 }
-            }
+                break;
+                case IntegerPlaceholder:
+                {
+                    Type_Integer value = mRuntime[0].mInteger;
+                    mRuntime.pop();
 
-            void visitedCharacter(char c) override
-            {
-                mFormattedMessage += c;
+                    out << value;
+                    mFormattedMessage += out.str();
+                }
+                break;
+                case FloatPlaceholder:
+                {
+                    float value = mRuntime[0].mFloat;
+                    mRuntime.pop();
+
+                    if (notation == FixedNotation)
+                    {
+                        out << std::fixed << value;
+                        mFormattedMessage += out.str();
+                    }
+                    else if (notation == ShortestNotation)
+                    {
+                        out << value;
+                        std::string standard = out.str();
+
+                        out.str(std::string());
+                        out.clear();
+
+                        out << std::scientific << value;
+                        std::string scientific = out.str();
+
+                        mFormattedMessage += standard.length() < scientific.length() ? standard : scientific;
+                    }
+                    else
+                    {
+                        out << std::scientific << value;
+                        mFormattedMessage += out.str();
+                    }
+                }
+                break;
+                default:
+                    break;
             }
+        }
 
-        public:
-            RuntimeMessageFormatter(Runtime& runtime)
-                : mRuntime(runtime)
-            {
-            }
+        void visitedCharacter(char c) override { mFormattedMessage += c; }
 
-            void process(std::string_view message) override
-            {
-                mFormattedMessage.clear();
-                MessageFormatParser::process(message);
-            }
+    public:
+        RuntimeMessageFormatter(Runtime& runtime)
+            : mRuntime(runtime)
+        {
+        }
 
-            std::string getFormattedMessage() const
-            {
-                return mFormattedMessage;
-            }
+        void process(std::string_view message) override
+        {
+            mFormattedMessage.clear();
+            MessageFormatParser::process(message);
+        }
+
+        std::string getFormattedMessage() const { return mFormattedMessage; }
     };
 
-    inline std::string formatMessage (std::string_view message, Runtime& runtime)
+    inline std::string formatMessage(std::string_view message, Runtime& runtime)
     {
         RuntimeMessageFormatter formatter(runtime);
         formatter.process(message);
@@ -121,50 +116,48 @@ namespace Interpreter
 
     class OpMessageBox : public Opcode1
     {
-        public:
-
-            void execute (Runtime& runtime, unsigned int arg0) override
+    public:
+        void execute(Runtime& runtime, unsigned int arg0) override
+        {
+            // message
+            int index = runtime[0].mInteger;
+            runtime.pop();
+            std::string_view message = runtime.getStringLiteral(index);
+
+            // buttons
+            std::vector<std::string> buttons;
+
+            for (std::size_t i = 0; i < arg0; ++i)
             {
-                // message
-                int index = runtime[0].mInteger;
+                index = runtime[0].mInteger;
                 runtime.pop();
-                std::string_view message = runtime.getStringLiteral (index);
-
-                // buttons
-                std::vector<std::string> buttons;
-
-                for (std::size_t i=0; i<arg0; ++i)
-                {
-                    index = runtime[0].mInteger;
-                    runtime.pop();
-                    buttons.emplace_back(runtime.getStringLiteral(index));
-                }
+                buttons.emplace_back(runtime.getStringLiteral(index));
+            }
 
-                std::reverse (buttons.begin(), buttons.end());
+            std::reverse(buttons.begin(), buttons.end());
 
-                // handle additional parameters
-                std::string formattedMessage = formatMessage (message, runtime);
+            // handle additional parameters
+            std::string formattedMessage = formatMessage(message, runtime);
 
-                runtime.getContext().messageBox (formattedMessage, buttons);
-            }
+            runtime.getContext().messageBox(formattedMessage, buttons);
+        }
     };
 
     class OpReport : public Opcode0
     {
-        public:
-
-            void execute (Runtime& runtime) override
-            {
-                // message
-                int index = runtime[0].mInteger;
-                runtime.pop();
-                std::string_view message = runtime.getStringLiteral (index);
-
-                // handle additional parameters
-                std::string formattedMessage = formatMessage (message, runtime);
-
-                runtime.getContext().report (formattedMessage);
-            }
+    public:
+        void execute(Runtime& runtime) override
+        {
+            // message
+            int index = runtime[0].mInteger;
+            runtime.pop();
+            std::string_view message = runtime.getStringLiteral(index);
+
+            // handle additional parameters
+            std::string formattedMessage = formatMessage(message, runtime);
+
+            runtime.getContext().report(formattedMessage);
+        }
     };
 
 }
diff --git a/components/interpreter/opcodes.hpp b/components/interpreter/opcodes.hpp
index da266e8ffa..a5fa36fc16 100644
--- a/components/interpreter/opcodes.hpp
+++ b/components/interpreter/opcodes.hpp
@@ -8,21 +8,19 @@ namespace Interpreter
     /// opcode for 0 arguments
     class Opcode0
     {
-        public:
-        
-            virtual void execute (Runtime& runtime) = 0;
-            
-            virtual ~Opcode0() {}
+    public:
+        virtual void execute(Runtime& runtime) = 0;
+
+        virtual ~Opcode0() {}
     };
 
     /// opcode for 1 argument
     class Opcode1
     {
-        public:
-        
-            virtual void execute (Runtime& runtime, unsigned int arg0) = 0;
-            
-            virtual ~Opcode1() {}
+    public:
+        virtual void execute(Runtime& runtime, unsigned int arg0) = 0;
+
+        virtual ~Opcode1() {}
     };
 
 }
diff --git a/components/interpreter/runtime.cpp b/components/interpreter/runtime.cpp
index d5bedfba57..41778e9106 100644
--- a/components/interpreter/runtime.cpp
+++ b/components/interpreter/runtime.cpp
@@ -1,45 +1,50 @@
 #include "runtime.hpp"
 
-#include <stdexcept>
 #include <cassert>
 #include <cstring>
+#include <stdexcept>
 
 namespace Interpreter
 {
-    Runtime::Runtime() : mContext (nullptr), mCode (nullptr), mCodeSize(0), mPC (0) {}
+    Runtime::Runtime()
+        : mContext(nullptr)
+        , mCode(nullptr)
+        , mCodeSize(0)
+        , mPC(0)
+    {
+    }
 
     int Runtime::getPC() const
     {
         return mPC;
     }
 
-    int Runtime::getIntegerLiteral (int index) const
+    int Runtime::getIntegerLiteral(int index) const
     {
-        if (index < 0 || index >= static_cast<int> (mCode[1]))
+        if (index < 0 || index >= static_cast<int>(mCode[1]))
             throw std::out_of_range("out of range");
 
-        const Type_Code *literalBlock = mCode + 4 + mCode[0];
+        const Type_Code* literalBlock = mCode + 4 + mCode[0];
 
-        return *reinterpret_cast<const int *> (&literalBlock[index]);
+        return *reinterpret_cast<const int*>(&literalBlock[index]);
     }
 
-    float Runtime::getFloatLiteral (int index) const
+    float Runtime::getFloatLiteral(int index) const
     {
-        if (index < 0 || index >= static_cast<int> (mCode[2]))
+        if (index < 0 || index >= static_cast<int>(mCode[2]))
             throw std::out_of_range("out of range");
 
-        const Type_Code *literalBlock = mCode + 4 + mCode[0] + mCode[1];
+        const Type_Code* literalBlock = mCode + 4 + mCode[0] + mCode[1];
 
-        return *reinterpret_cast<const float *> (&literalBlock[index]);
+        return *reinterpret_cast<const float*>(&literalBlock[index]);
     }
 
     std::string_view Runtime::getStringLiteral(int index) const
     {
-        if (index < 0 || static_cast<int> (mCode[3]) <= 0)
+        if (index < 0 || static_cast<int>(mCode[3]) <= 0)
             throw std::out_of_range("out of range");
 
-        const char *literalBlock =
-            reinterpret_cast<const char *> (mCode + 4 + mCode[0] + mCode[1] + mCode[2]);
+        const char* literalBlock = reinterpret_cast<const char*>(mCode + 4 + mCode[0] + mCode[1] + mCode[2]);
 
         size_t offset = 0;
 
@@ -50,10 +55,10 @@ namespace Interpreter
                 throw std::out_of_range("out of range");
         }
 
-        return literalBlock+offset;
+        return literalBlock + offset;
     }
 
-    void Runtime::configure (const Type_Code *code, int codeSize, Context& context)
+    void Runtime::configure(const Type_Code* code, int codeSize, Context& context)
     {
         clear();
 
@@ -71,49 +76,49 @@ namespace Interpreter
         mStack.clear();
     }
 
-    void Runtime::setPC (int PC)
+    void Runtime::setPC(int PC)
     {
         mPC = PC;
     }
 
-    void Runtime::push (const Data& data)
+    void Runtime::push(const Data& data)
     {
-        mStack.push_back (data);
+        mStack.push_back(data);
     }
 
-    void Runtime::push (Type_Integer value)
+    void Runtime::push(Type_Integer value)
     {
         Data data;
         data.mInteger = value;
-        push (data);
+        push(data);
     }
 
-    void Runtime::push (Type_Float value)
+    void Runtime::push(Type_Float value)
     {
         Data data;
         data.mFloat = value;
-        push (data);
+        push(data);
     }
 
     void Runtime::pop()
     {
         if (mStack.empty())
-            throw std::runtime_error ("stack underflow");
+            throw std::runtime_error("stack underflow");
 
         mStack.pop_back();
     }
 
-    Data& Runtime::operator[] (int Index)
+    Data& Runtime::operator[](int Index)
     {
-        if (Index<0 || Index>=static_cast<int> (mStack.size()))
-            throw std::runtime_error ("stack index out of range");
+        if (Index < 0 || Index >= static_cast<int>(mStack.size()))
+            throw std::runtime_error("stack index out of range");
 
-        return mStack[mStack.size()-Index-1];
+        return mStack[mStack.size() - Index - 1];
     }
 
     Context& Runtime::getContext()
     {
-        assert (mContext);
+        assert(mContext);
         return *mContext;
     }
 }
diff --git a/components/interpreter/runtime.hpp b/components/interpreter/runtime.hpp
index 7f48ca8d3e..f0b716ef3f 100644
--- a/components/interpreter/runtime.hpp
+++ b/components/interpreter/runtime.hpp
@@ -1,8 +1,8 @@
 #ifndef INTERPRETER_RUNTIME_H_INCLUDED
 #define INTERPRETER_RUNTIME_H_INCLUDED
 
-#include <vector>
 #include <string_view>
+#include <vector>
 
 #include "types.hpp"
 
@@ -14,50 +14,49 @@ namespace Interpreter
 
     class Runtime
     {
-            Context *mContext;
-            const Type_Code *mCode;
-            int mCodeSize;
-            int mPC;
-            std::vector<Data> mStack;
-
-        public:
+        Context* mContext;
+        const Type_Code* mCode;
+        int mCodeSize;
+        int mPC;
+        std::vector<Data> mStack;
 
-            Runtime ();
+    public:
+        Runtime();
 
-            int getPC() const;
-            ///< return program counter.
+        int getPC() const;
+        ///< return program counter.
 
-            int getIntegerLiteral (int index) const;
+        int getIntegerLiteral(int index) const;
 
-            float getFloatLiteral (int index) const;
+        float getFloatLiteral(int index) const;
 
-            std::string_view getStringLiteral(int index) const;
+        std::string_view getStringLiteral(int index) const;
 
-            void configure (const Type_Code *code, int codeSize, Context& context);
-            ///< \a context and \a code must exist as least until either configure, clear or
-            /// the destructor is called. \a codeSize is given in 32-bit words.
+        void configure(const Type_Code* code, int codeSize, Context& context);
+        ///< \a context and \a code must exist as least until either configure, clear or
+        /// the destructor is called. \a codeSize is given in 32-bit words.
 
-            void clear();
+        void clear();
 
-            void setPC (int PC);
-            ///< set program counter.
+        void setPC(int PC);
+        ///< set program counter.
 
-            void push (const Data& data);
-            ///< push data on stack
+        void push(const Data& data);
+        ///< push data on stack
 
-            void push (Type_Integer value);
-            ///< push integer data on stack.
+        void push(Type_Integer value);
+        ///< push integer data on stack.
 
-            void push (Type_Float value);
-            ///< push float data on stack.
+        void push(Type_Float value);
+        ///< push float data on stack.
 
-            void pop();
-            ///< pop stack
+        void pop();
+        ///< pop stack
 
-            Data& operator[] (int Index);
-            ///< Access stack member, counted from the top.
+        Data& operator[](int Index);
+        ///< Access stack member, counted from the top.
 
-            Context& getContext();
+        Context& getContext();
     };
 }
 
diff --git a/components/interpreter/types.hpp b/components/interpreter/types.hpp
index 89529189f6..78c07586bc 100644
--- a/components/interpreter/types.hpp
+++ b/components/interpreter/types.hpp
@@ -8,37 +8,36 @@ namespace Interpreter
     typedef unsigned int Type_Code; // 32 bit
 
     typedef unsigned int Type_Data; // 32 bit
-    
+
     typedef short Type_Short; // 16 bit
-    
+
     typedef int Type_Integer; // 32 bit
-    
+
     typedef float Type_Float; // 32 bit
-    
+
     union Data
     {
         Type_Integer mInteger;
         Type_Float mFloat;
     };
-    
-    template<typename T>
-    T& getData (Data& data)
+
+    template <typename T>
+    T& getData(Data& data)
     {
-        throw std::runtime_error ("unsupported data type");
+        throw std::runtime_error("unsupported data type");
     }
-    
-    template<>
-    inline Type_Integer& getData (Data& data)
+
+    template <>
+    inline Type_Integer& getData(Data& data)
     {
         return data.mInteger;
     }
-    
-    template<>
-    inline Type_Float& getData (Data& data)
+
+    template <>
+    inline Type_Float& getData(Data& data)
     {
         return data.mFloat;
-    }    
+    }
 }
 
 #endif
-
diff --git a/components/l10n/messagebundles.cpp b/components/l10n/messagebundles.cpp
index d44c5b34a1..75f0c325fe 100644
--- a/components/l10n/messagebundles.cpp
+++ b/components/l10n/messagebundles.cpp
@@ -1,25 +1,25 @@
 #include "messagebundles.hpp"
 
 #include <cstring>
-#include <unicode/errorcode.h>
 #include <unicode/calendar.h>
+#include <unicode/errorcode.h>
 #include <yaml-cpp/yaml.h>
 
 #include <components/debug/debuglog.hpp>
 
 namespace l10n
 {
-    MessageBundles::MessageBundles(const std::vector<icu::Locale> &preferredLocales, icu::Locale &fallbackLocale) :
-            mFallbackLocale(fallbackLocale)
+    MessageBundles::MessageBundles(const std::vector<icu::Locale>& preferredLocales, icu::Locale& fallbackLocale)
+        : mFallbackLocale(fallbackLocale)
     {
         setPreferredLocales(preferredLocales);
     }
 
-    void MessageBundles::setPreferredLocales(const std::vector<icu::Locale> &preferredLocales)
+    void MessageBundles::setPreferredLocales(const std::vector<icu::Locale>& preferredLocales)
     {
         mPreferredLocales.clear();
         mPreferredLocaleStrings.clear();
-        for (const icu::Locale &loc: preferredLocales)
+        for (const icu::Locale& loc : preferredLocales)
         {
             mPreferredLocales.push_back(loc);
             mPreferredLocaleStrings.emplace_back(loc.getName());
@@ -39,7 +39,7 @@ namespace l10n
         }
     }
 
-    std::string getErrorText(const UParseError &parseError)
+    std::string getErrorText(const UParseError& parseError)
     {
         icu::UnicodeString preContext(parseError.preContext), postContext(parseError.postContext);
         std::string parseErrorString;
@@ -48,7 +48,8 @@ namespace l10n
         return parseErrorString;
     }
 
-    static bool checkSuccess(const icu::ErrorCode &status, const std::string &message, const UParseError parseError = UParseError())
+    static bool checkSuccess(
+        const icu::ErrorCode& status, const std::string& message, const UParseError parseError = UParseError())
     {
         if (status.isFailure())
         {
@@ -65,13 +66,13 @@ namespace l10n
         return status.isSuccess();
     }
 
-    void MessageBundles::load(std::istream &input, const icu::Locale& lang, const std::string &path)
+    void MessageBundles::load(std::istream& input, const icu::Locale& lang, const std::string& path)
     {
         try
         {
             YAML::Node data = YAML::Load(input);
             std::string localeName = lang.getName();
-            for (const auto& it: data)
+            for (const auto& it : data)
             {
                 const auto key = it.first.as<std::string>();
                 const auto value = it.second.as<std::string>();
@@ -79,8 +80,8 @@ namespace l10n
                 icu::ErrorCode status;
                 UParseError parseError;
                 icu::MessageFormat message(pattern, lang, parseError, status);
-                if (checkSuccess(status, std::string("Failed to create message ")
-                            + key + " for locale " + lang.getName(), parseError))
+                if (checkSuccess(status,
+                        std::string("Failed to create message ") + key + " for locale " + lang.getName(), parseError))
                 {
                     mBundles[localeName].insert(std::make_pair(key, message));
                 }
@@ -92,7 +93,7 @@ namespace l10n
         }
     }
 
-    const icu::MessageFormat * MessageBundles::findMessage(std::string_view key, const std::string &localeName) const
+    const icu::MessageFormat* MessageBundles::findMessage(std::string_view key, const std::string& localeName) const
     {
         auto iter = mBundles.find(localeName);
         if (iter != mBundles.end())
@@ -106,7 +107,8 @@ namespace l10n
         return nullptr;
     }
 
-    std::string MessageBundles::formatMessage(std::string_view key, const std::map<std::string, icu::Formattable> &args) const
+    std::string MessageBundles::formatMessage(
+        std::string_view key, const std::map<std::string, icu::Formattable>& args) const
     {
         std::vector<icu::UnicodeString> argNames;
         std::vector<icu::Formattable> argValues;
@@ -118,14 +120,15 @@ namespace l10n
         return formatMessage(key, argNames, argValues);
     }
 
-    std::string MessageBundles::formatMessage(std::string_view key, const std::vector<icu::UnicodeString> &argNames, const std::vector<icu::Formattable> &args) const
+    std::string MessageBundles::formatMessage(std::string_view key, const std::vector<icu::UnicodeString>& argNames,
+        const std::vector<icu::Formattable>& args) const
     {
         icu::UnicodeString result;
         std::string resultString;
         icu::ErrorCode success;
 
-        const icu::MessageFormat *message = nullptr;
-        for (auto &loc: mPreferredLocaleStrings)
+        const icu::MessageFormat* message = nullptr;
+        for (auto& loc : mPreferredLocaleStrings)
         {
             message = findMessage(key, loc);
             if (message)
@@ -148,11 +151,11 @@ namespace l10n
         icu::Locale defaultLocale(nullptr);
         if (!mPreferredLocales.empty())
         {
-             defaultLocale = mPreferredLocales[0];
+            defaultLocale = mPreferredLocales[0];
         }
         UParseError parseError;
-        icu::MessageFormat defaultMessage(icu::UnicodeString::fromUTF8(icu::StringPiece(key.data(), key.size())),
-                                          defaultLocale, parseError, success);
+        icu::MessageFormat defaultMessage(
+            icu::UnicodeString::fromUTF8(icu::StringPiece(key.data(), key.size())), defaultLocale, parseError, success);
         if (!checkSuccess(success, std::string("Failed to create message ") + key.data(), parseError))
             // If we can't parse the key as a pattern, just return the key
             return std::string(key);
diff --git a/components/l10n/messagebundles.hpp b/components/l10n/messagebundles.hpp
index 1a4636c95a..d25000d8ab 100644
--- a/components/l10n/messagebundles.hpp
+++ b/components/l10n/messagebundles.hpp
@@ -1,8 +1,8 @@
 #ifndef COMPONENTS_L10N_MESSAGEBUNDLES_H
 #define COMPONENTS_L10N_MESSAGEBUNDLES_H
 
-#include <string_view>
 #include <map>
+#include <string_view>
 #include <unordered_map>
 #include <vector>
 
@@ -28,18 +28,20 @@ namespace l10n
          * @param preferredLocales user-requested locales, in order of priority
          *        Each locale will be checked when looking up messages, in case some resource files are incomplete.
          *        For each locale which contains a country code or a variant, the locales obtained by removing first
-         *        the variant, then the country code, will also be checked before moving on to the next locale in the list.
+         *        the variant, then the country code, will also be checked before moving on to the next locale in the
+         * list.
          * @param fallbackLocale the fallback locale which should be used if messages cannot be found for the user
          *        preferred locales
          */
-        MessageBundles(const std::vector<icu::Locale> &preferredLocales, icu::Locale &fallbackLocale);
-        std::string formatMessage(std::string_view key, const std::map<std::string, icu::Formattable> &args) const;
-        std::string formatMessage(std::string_view key, const std::vector<icu::UnicodeString> &argNames, const std::vector<icu::Formattable> &args) const;
-        void setPreferredLocales(const std::vector<icu::Locale> &preferredLocales);
-        const std::vector<icu::Locale> & getPreferredLocales() const { return mPreferredLocales; }
-        void load(std::istream &input, const icu::Locale &lang, const std::string &path);
+        MessageBundles(const std::vector<icu::Locale>& preferredLocales, icu::Locale& fallbackLocale);
+        std::string formatMessage(std::string_view key, const std::map<std::string, icu::Formattable>& args) const;
+        std::string formatMessage(std::string_view key, const std::vector<icu::UnicodeString>& argNames,
+            const std::vector<icu::Formattable>& args) const;
+        void setPreferredLocales(const std::vector<icu::Locale>& preferredLocales);
+        const std::vector<icu::Locale>& getPreferredLocales() const { return mPreferredLocales; }
+        void load(std::istream& input, const icu::Locale& lang, const std::string& path);
         bool isLoaded(const icu::Locale& loc) const { return mBundles.find(loc.getName()) != mBundles.end(); }
-        const icu::Locale & getFallbackLocale() const { return mFallbackLocale; }
+        const icu::Locale& getFallbackLocale() const { return mFallbackLocale; }
 
     private:
         // icu::Locale isn't hashable (or comparable), so we use the string form instead, which is canonicalized
@@ -47,7 +49,7 @@ namespace l10n
         const icu::Locale mFallbackLocale;
         std::vector<std::string> mPreferredLocaleStrings;
         std::vector<icu::Locale> mPreferredLocales;
-        const icu::MessageFormat * findMessage(std::string_view key, const std::string &localeName) const;
+        const icu::MessageFormat* findMessage(std::string_view key, const std::string& localeName) const;
     };
 
 }
diff --git a/components/loadinglistener/loadinglistener.hpp b/components/loadinglistener/loadinglistener.hpp
index e61f3837f1..423688ad1b 100644
--- a/components/loadinglistener/loadinglistener.hpp
+++ b/components/loadinglistener/loadinglistener.hpp
@@ -1,8 +1,8 @@
 #ifndef COMPONENTS_LOADINGLISTENER_H
 #define COMPONENTS_LOADINGLISTENER_H
 
-#include <string>
 #include <memory>
+#include <string>
 
 namespace Loading
 {
@@ -15,21 +15,22 @@ namespace Loading
         /// @note "non-important" labels may not show on screen if the loading process went so fast
         /// that the implementation decided not to show a loading screen at all. "important" labels
         /// will show in a separate message-box if the loading screen was not shown.
-        virtual void setLabel (const std::string& label, bool important=false) {}
+        virtual void setLabel(const std::string& label, bool important = false) {}
 
         /// Start a loading sequence. Must call loadingOff() when done.
-        /// @note To get the loading screen to actually update, you must call setProgress / increaseProgress periodically.
+        /// @note To get the loading screen to actually update, you must call setProgress / increaseProgress
+        /// periodically.
         /// @note It is best to use the ScopedLoad object instead of using loadingOn()/loadingOff() directly,
         ///  so that the loading is exception safe.
-        virtual void loadingOn(bool visible=true) {}
+        virtual void loadingOn(bool visible = true) {}
         virtual void loadingOff() {}
 
         /// Set the total range of progress (e.g. the number of objects to load).
-        virtual void setProgressRange (size_t range) {}
+        virtual void setProgressRange(size_t range) {}
         /// Set current progress. Valid range is [0, progressRange)
-        virtual void setProgress (size_t value) {}
+        virtual void setProgress(size_t value) {}
         /// Increase current progress, default by 1.
-        virtual void increaseProgress (size_t increase = 1) {}
+        virtual void increaseProgress(size_t increase = 1) {}
 
         virtual ~Listener() = default;
     };
diff --git a/components/lua/configuration.cpp b/components/lua/configuration.cpp
index c4ee7d1865..6826cc3197 100644
--- a/components/lua/configuration.cpp
+++ b/components/lua/configuration.cpp
@@ -15,29 +15,29 @@ namespace LuaUtil
     namespace
     {
         const std::map<std::string, ESM::LuaScriptCfg::Flags, std::less<>> flagsByName{
-            {"GLOBAL", ESM::LuaScriptCfg::sGlobal},
-            {"CUSTOM", ESM::LuaScriptCfg::sCustom},
-            {"PLAYER", ESM::LuaScriptCfg::sPlayer},
+            { "GLOBAL", ESM::LuaScriptCfg::sGlobal },
+            { "CUSTOM", ESM::LuaScriptCfg::sCustom },
+            { "PLAYER", ESM::LuaScriptCfg::sPlayer },
         };
 
         const std::map<std::string, ESM::RecNameInts, std::less<>> typeTagsByName{
-            {"ACTIVATOR", ESM::REC_ACTI},
-            {"ARMOR", ESM::REC_ARMO},
-            {"BOOK", ESM::REC_BOOK},
-            {"CLOTHING", ESM::REC_CLOT},
-            {"CONTAINER", ESM::REC_CONT},
-            {"CREATURE", ESM::REC_CREA},
-            {"DOOR", ESM::REC_DOOR},
-            {"INGREDIENT", ESM::REC_INGR},
-            {"LIGHT", ESM::REC_LIGH},
-            {"MISC_ITEM", ESM::REC_MISC},
-            {"NPC", ESM::REC_NPC_},
-            {"POTION", ESM::REC_ALCH},
-            {"WEAPON", ESM::REC_WEAP},
-            {"APPARATUS", ESM::REC_APPA},
-            {"LOCKPICK", ESM::REC_LOCK},
-            {"PROBE", ESM::REC_PROB},
-            {"REPAIR", ESM::REC_REPA},
+            { "ACTIVATOR", ESM::REC_ACTI },
+            { "ARMOR", ESM::REC_ARMO },
+            { "BOOK", ESM::REC_BOOK },
+            { "CLOTHING", ESM::REC_CLOT },
+            { "CONTAINER", ESM::REC_CONT },
+            { "CREATURE", ESM::REC_CREA },
+            { "DOOR", ESM::REC_DOOR },
+            { "INGREDIENT", ESM::REC_INGR },
+            { "LIGHT", ESM::REC_LIGH },
+            { "MISC_ITEM", ESM::REC_MISC },
+            { "NPC", ESM::REC_NPC_ },
+            { "POTION", ESM::REC_ALCH },
+            { "WEAPON", ESM::REC_WEAP },
+            { "APPARATUS", ESM::REC_APPA },
+            { "LOCKPICK", ESM::REC_LOCK },
+            { "PROBE", ESM::REC_PROB },
+            { "REPAIR", ESM::REC_REPA },
         };
 
         bool isSpace(char c)
@@ -61,10 +61,9 @@ namespace LuaUtil
             if (global && (script.mFlags & ~ESM::LuaScriptCfg::sMerge) != ESM::LuaScriptCfg::sGlobal)
                 throw std::runtime_error(std::string("Global script can not have local flags: ") + script.mScriptPath);
             if (global && (!script.mTypes.empty() || !script.mRecords.empty() || !script.mRefs.empty()))
-                throw std::runtime_error(std::string(
-                    "Global script can not have per-type and per-object configuration") + script.mScriptPath);
-            auto [it, inserted] = mPathToIndex.emplace(
-                Misc::StringUtils::lowerCase(script.mScriptPath), i);
+                throw std::runtime_error(std::string("Global script can not have per-type and per-object configuration")
+                    + script.mScriptPath);
+            auto [it, inserted] = mPathToIndex.emplace(Misc::StringUtils::lowerCase(script.mScriptPath), i);
             if (inserted)
                 continue;
             ESM::LuaScriptCfg& oldScript = cfg.mScripts[it->second];
@@ -96,18 +95,19 @@ namespace LuaUtil
         for (int i = 0; i < static_cast<int>(mScripts.size()); ++i)
         {
             const ESM::LuaScriptCfg& s = mScripts[i];
-            mPathToIndex[s.mScriptPath] = i;  // Stored paths are case sensitive.
+            mPathToIndex[s.mScriptPath] = i; // Stored paths are case sensitive.
             for (uint32_t t : s.mTypes)
                 mScriptsPerType[t].push_back(i);
             for (const ESM::LuaScriptCfg::PerRecordCfg& r : s.mRecords)
             {
                 std::string_view data = r.mInitializationData.empty() ? s.mInitializationData : r.mInitializationData;
-                mScriptsPerRecordId[r.mRecordId].push_back(DetailedConf{i, r.mAttach, data});
+                mScriptsPerRecordId[r.mRecordId].push_back(DetailedConf{ i, r.mAttach, data });
             }
             for (const ESM::LuaScriptCfg::PerRefCfg& r : s.mRefs)
             {
                 std::string_view data = r.mInitializationData.empty() ? s.mInitializationData : r.mInitializationData;
-                mScriptsPerRefNum[ESM::RefNum{r.mRefnumIndex, r.mRefnumContentFile}].push_back(DetailedConf{i, r.mAttach, data});
+                mScriptsPerRefNum[ESM::RefNum{ r.mRefnumIndex, r.mRefnumContentFile }].push_back(
+                    DetailedConf{ i, r.mAttach, data });
             }
         }
     }
@@ -179,7 +179,7 @@ namespace LuaUtil
 
             while (!line.empty() && isSpace(line[0]))
                 line = line.substr(1);
-            if (line.empty() || line[0] == '#')  // Skip empty lines and comments
+            if (line.empty() || line[0] == '#') // Skip empty lines and comments
                 continue;
             while (!line.empty() && isSpace(line.back()))
                 line = line.substr(0, line.size() - 1);
@@ -220,8 +220,8 @@ namespace LuaUtil
                 else if (typesIt != typeTagsByName.end())
                     script.mTypes.push_back(typesIt->second);
                 else
-                    throw std::runtime_error(Misc::StringUtils::format("Unknown tag '%s' in: %s",
-                                                                       std::string(tagName), std::string(line)));
+                    throw std::runtime_error(
+                        Misc::StringUtils::format("Unknown tag '%s' in: %s", std::string(tagName), std::string(line)));
             }
         }
     }
diff --git a/components/lua/configuration.hpp b/components/lua/configuration.hpp
index 87159068be..ba9778f4bb 100644
--- a/components/lua/configuration.hpp
+++ b/components/lua/configuration.hpp
@@ -24,7 +24,8 @@ namespace LuaUtil
 
         ScriptIdsWithInitializationData getGlobalConf() const { return getConfByFlag(ESM::LuaScriptCfg::sGlobal); }
         ScriptIdsWithInitializationData getPlayerConf() const { return getConfByFlag(ESM::LuaScriptCfg::sPlayer); }
-        ScriptIdsWithInitializationData getLocalConf(uint32_t type, std::string_view recordId, ESM::RefNum refnum) const;
+        ScriptIdsWithInitializationData getLocalConf(
+            uint32_t type, std::string_view recordId, ESM::RefNum refnum) const;
 
     private:
         ScriptIdsWithInitializationData getConfByFlag(ESM::LuaScriptCfg::Flags flag) const;
diff --git a/components/lua/l10n.cpp b/components/lua/l10n.cpp
index 469962d568..0b9e7a1e6b 100644
--- a/components/lua/l10n.cpp
+++ b/components/lua/l10n.cpp
@@ -8,7 +8,9 @@
 namespace sol
 {
     template <>
-    struct is_automagical<LuaUtil::L10nManager::Context> : std::false_type {};
+    struct is_automagical<LuaUtil::L10nManager::Context> : std::false_type
+    {
+    };
 }
 
 namespace LuaUtil
@@ -28,7 +30,7 @@ namespace LuaUtil
     void L10nManager::setPreferredLocales(const std::vector<std::string>& langs)
     {
         mPreferredLocales.clear();
-        for (const auto &lang : langs)
+        for (const auto& lang : langs)
             mPreferredLocales.push_back(icu::Locale(lang.c_str()));
         {
             Log msg(Debug::Info);
@@ -53,7 +55,8 @@ namespace LuaUtil
         mMessageBundles->load(*manager->mVFS->get(path), lang, path);
     }
 
-    std::pair<std::vector<icu::Formattable>, std::vector<icu::UnicodeString>> getICUArgs(std::string_view messageId, const sol::table &table)
+    std::pair<std::vector<icu::Formattable>, std::vector<icu::UnicodeString>> getICUArgs(
+        std::string_view messageId, const sol::table& table)
     {
         std::vector<icu::Formattable> args;
         std::vector<icu::UnicodeString> argNames;
@@ -70,7 +73,7 @@ namespace LuaUtil
             else
             {
                 Log(Debug::Error) << "Unrecognized argument type for key \"" << key.as<std::string>()
-                    << "\" when formatting message \"" << messageId << "\"";
+                                  << "\" when formatting message \"" << messageId << "\"";
             }
 
             // Argument names
@@ -85,7 +88,8 @@ namespace LuaUtil
         std::vector<icu::Formattable> args;
         std::vector<icu::UnicodeString> argNames;
 
-        if (data.is<sol::table>()) {
+        if (data.is<sol::table>())
+        {
             sol::table dataTable = data.as<sol::table>();
             auto argData = getICUArgs(key, dataTable);
             args = argData.first;
@@ -101,7 +105,7 @@ namespace LuaUtil
         mMessageBundles->setPreferredLocales(manager->mPreferredLocales);
         int localeCount = 0;
         bool fallbackLocaleInPreferred = false;
-        for (const icu::Locale& loc: mMessageBundles->getPreferredLocales())
+        for (const icu::Locale& loc : mMessageBundles->getPreferredLocales())
         {
             if (!mMessageBundles->isLoaded(loc))
                 readLangData(manager, loc);
@@ -116,7 +120,8 @@ namespace LuaUtil
         if (!mMessageBundles->isLoaded(fallbackLocale))
             readLangData(manager, fallbackLocale);
         if (mMessageBundles->isLoaded(fallbackLocale) && !fallbackLocaleInPreferred)
-            Log(Debug::Verbose) << "Fallback language file \"l10n/" << mName << "/" << fallbackLocale.getName() << ".yaml\" is enabled";
+            Log(Debug::Verbose) << "Fallback language file \"l10n/" << mName << "/" << fallbackLocale.getName()
+                                << ".yaml\" is enabled";
 
         if (localeCount == 0)
         {
@@ -129,10 +134,8 @@ namespace LuaUtil
         auto it = mContexts.find(contextName);
         if (it != mContexts.end())
             return sol::make_object(mLua->sol(), it->second);
-        auto allowedChar = [](char c)
-        {
-            return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') ||
-                   (c >= '0' && c <= '9') || c == '_';
+        auto allowedChar = [](char c) {
+            return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '_';
         };
         bool valid = !contextName.empty();
         for (char c : contextName)
@@ -140,7 +143,7 @@ namespace LuaUtil
         if (!valid)
             throw std::runtime_error(std::string("Invalid l10n context name: ") + contextName);
         icu::Locale fallbackLocale(fallbackLocaleName.c_str());
-        Context ctx{contextName, std::make_shared<l10n::MessageBundles>(mPreferredLocales, fallbackLocale)};
+        Context ctx{ contextName, std::make_shared<l10n::MessageBundles>(mPreferredLocales, fallbackLocale) };
         {
             Log msg(Debug::Verbose);
             msg << "Fallback locale: " << fallbackLocale.getName();
diff --git a/components/lua/l10n.hpp b/components/lua/l10n.hpp
index 51c8ecad9c..5de5be8e59 100644
--- a/components/lua/l10n.hpp
+++ b/components/lua/l10n.hpp
@@ -16,7 +16,11 @@ namespace LuaUtil
     class L10nManager
     {
     public:
-        L10nManager(const VFS::Manager* vfs, LuaState* lua) : mVFS(vfs), mLua(lua) {}
+        L10nManager(const VFS::Manager* vfs, LuaState* lua)
+            : mVFS(vfs)
+            , mLua(lua)
+        {
+        }
         void init();
         void clear() { mContexts.clear(); }
 
diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
index 8dacdd5267..bada1868fc 100644
--- a/components/lua/luastate.cpp
+++ b/components/lua/luastate.cpp
@@ -7,8 +7,8 @@
 #include <filesystem>
 
 #include <components/debug/debuglog.hpp>
-#include <components/vfs/manager.hpp>
 #include <components/files/conversion.hpp>
+#include <components/vfs/manager.hpp>
 
 namespace LuaUtil
 {
@@ -27,7 +27,8 @@ namespace LuaUtil
             throw std::runtime_error("module not found: " + std::string(packageName));
     }
 
-    static std::filesystem::path packageNameToPath(std::string_view packageName, const std::vector<std::filesystem::path> &searchDirs)
+    static std::filesystem::path packageNameToPath(
+        std::string_view packageName, const std::vector<std::filesystem::path>& searchDirs)
     {
         std::string path(packageName);
         std::replace(path.begin(), path.end(), '.', '/');
@@ -45,18 +46,19 @@ namespace LuaUtil
         throw std::runtime_error("module not found: " + std::string(packageName));
     }
 
-    static const std::string safeFunctions[] = {
-        "assert", "error", "ipairs", "next", "pairs", "pcall", "select", "tonumber", "tostring",
-        "type", "unpack", "xpcall", "rawequal", "rawget", "rawset", "setmetatable"};
-    static const std::string safePackages[] = {"coroutine", "math", "string", "table"};
+    static const std::string safeFunctions[] = { "assert", "error", "ipairs", "next", "pairs", "pcall", "select",
+        "tonumber", "tostring", "type", "unpack", "xpcall", "rawequal", "rawget", "rawset", "setmetatable" };
+    static const std::string safePackages[] = { "coroutine", "math", "string", "table" };
 
-    LuaState::LuaState(const VFS::Manager* vfs, const ScriptsConfiguration* conf) : mConf(conf), mVFS(vfs)
+    LuaState::LuaState(const VFS::Manager* vfs, const ScriptsConfiguration* conf)
+        : mConf(conf)
+        , mVFS(vfs)
     {
-        mLua.open_libraries(sol::lib::base, sol::lib::coroutine, sol::lib::math, sol::lib::bit32,
-                            sol::lib::string, sol::lib::table, sol::lib::os, sol::lib::debug);
+        mLua.open_libraries(sol::lib::base, sol::lib::coroutine, sol::lib::math, sol::lib::bit32, sol::lib::string,
+            sol::lib::table, sol::lib::os, sol::lib::debug);
 
         mLua["math"]["randomseed"](static_cast<unsigned>(std::time(nullptr)));
-        mLua["math"]["randomseed"] = []{};
+        mLua["math"]["randomseed"] = [] {};
 
         mLua["writeToLog"] = [](std::string_view s) { Log(Debug::Level::Info) << s; };
 
@@ -124,20 +126,20 @@ namespace LuaUtil
         mSandboxEnv["_VERSION"] = mLua["_VERSION"];
         for (const std::string& s : safeFunctions)
         {
-            if (mLua[s] == sol::nil) throw std::logic_error("Lua function not found: " + s);
+            if (mLua[s] == sol::nil)
+                throw std::logic_error("Lua function not found: " + s);
             mSandboxEnv[s] = mLua[s];
         }
         for (const std::string& s : safePackages)
         {
-            if (mLua[s] == sol::nil) throw std::logic_error("Lua package not found: " + s);
+            if (mLua[s] == sol::nil)
+                throw std::logic_error("Lua package not found: " + s);
             mCommonPackages[s] = mSandboxEnv[s] = makeReadOnly(mLua[s]);
         }
         mSandboxEnv["getmetatable"] = mLua["getSafeMetatable"];
-        mCommonPackages["os"] = mSandboxEnv["os"] = makeReadOnly(tableFromPairs<std::string_view, sol::function>({
-            {"date", mLua["os"]["date"]},
-            {"difftime", mLua["os"]["difftime"]},
-            {"time", mLua["os"]["time"]}
-        }));
+        mCommonPackages["os"] = mSandboxEnv["os"]
+            = makeReadOnly(tableFromPairs<std::string_view, sol::function>({ { "date", mLua["os"]["date"] },
+                { "difftime", mLua["os"]["difftime"] }, { "time", mLua["os"]["time"] } }));
     }
 
     LuaState::~LuaState()
@@ -152,7 +154,7 @@ namespace LuaUtil
         if (table == sol::nil)
             return table;
         if (table.is<sol::userdata>())
-            return table;  // it is already userdata, no sense to wrap it again
+            return table; // it is already userdata, no sense to wrap it again
 
         lua_State* luaState = table.lua_state();
         sol::state_view lua(luaState);
@@ -183,8 +185,7 @@ namespace LuaUtil
         mCommonPackages.emplace(std::move(packageName), std::move(package));
     }
 
-    sol::protected_function_result LuaState::runInNewSandbox(
-        const std::string& path, const std::string& namePrefix,
+    sol::protected_function_result LuaState::runInNewSandbox(const std::string& path, const std::string& namePrefix,
         const std::map<std::string, sol::object>& packages, const sol::object& hiddenData)
     {
         sol::protected_function script = loadScriptAndCache(path);
@@ -195,8 +196,7 @@ namespace LuaUtil
         env["_G"] = env;
         env[sol::metatable_key]["__metatable"] = false;
 
-        auto maybeRunLoader = [&hiddenData](const sol::object& package) -> sol::object
-        {
+        auto maybeRunLoader = [&hiddenData](const sol::object& package) -> sol::object {
             if (package.is<sol::function>())
                 return call(package.as<sol::function>(), hiddenData);
             else
@@ -207,8 +207,7 @@ namespace LuaUtil
             loaded[key] = maybeRunLoader(value);
         for (const auto& [key, value] : packages)
             loaded[key] = maybeRunLoader(value);
-        env["require"] = [this, env, loaded, hiddenData](std::string_view packageName) mutable
-        {
+        env["require"] = [this, env, loaded, hiddenData](std::string_view packageName) mutable {
             sol::object package = loaded[packageName];
             if (package != sol::nil)
                 return package;
@@ -229,8 +228,7 @@ namespace LuaUtil
         sol::table loaded(mLua, sol::create);
         for (const std::string& s : safePackages)
             loaded[s] = static_cast<sol::object>(mSandboxEnv[s]);
-        env["require"] = [this, loaded, env](const std::string& module) mutable
-        {
+        env["require"] = [this, loaded, env](const std::string& module) mutable {
             if (loaded[module] != sol::nil)
                 return loaded[module];
             sol::protected_function initializer = loadInternalLib(module);
@@ -279,11 +277,11 @@ namespace LuaUtil
 
     std::string getLuaVersion()
     {
-        #ifdef NO_LUAJIT
+#ifdef NO_LUAJIT
         return LUA_RELEASE;
-        #else
+#else
         return LUA_RELEASE " (" LUAJIT_VERSION ")";
-        #endif
+#endif
     }
 
     std::string toString(const sol::object& obj)
diff --git a/components/lua/luastate.hpp b/components/lua/luastate.hpp
index 48d302d44b..7baf3f4839 100644
--- a/components/lua/luastate.hpp
+++ b/components/lua/luastate.hpp
@@ -72,17 +72,16 @@ namespace LuaUtil
         //     packages: additional packages that should be available from the sandbox via `require`. Each package
         //         should be either a sol::table or a sol::function. If it is a function, it will be evaluated
         //         (once per sandbox) with the argument 'hiddenData' the first time when requested.
-        sol::protected_function_result runInNewSandbox(const std::string& path,
-                                                       const std::string& namePrefix = "",
-                                                       const std::map<std::string, sol::object>& packages = {},
-                                                       const sol::object& hiddenData = sol::nil);
+        sol::protected_function_result runInNewSandbox(const std::string& path, const std::string& namePrefix = "",
+            const std::map<std::string, sol::object>& packages = {}, const sol::object& hiddenData = sol::nil);
 
         void dropScriptCache() { mCompiledScripts.clear(); }
 
         const ScriptsConfiguration& getConfiguration() const { return *mConf; }
 
-        // Load internal Lua library. All libraries are loaded in one sandbox and shouldn't be exposed to scripts directly.
-        void addInternalLibSearchPath(const std::filesystem::path &path) { mLibSearchPaths.push_back(path); }
+        // Load internal Lua library. All libraries are loaded in one sandbox and shouldn't be exposed to scripts
+        // directly.
+        void addInternalLibSearchPath(const std::filesystem::path& path) { mLibSearchPaths.push_back(path); }
         sol::function loadInternalLib(std::string_view libName);
         sol::function loadFromVFS(const std::string& path);
         sol::environment newInternalLibEnvironment();
@@ -112,8 +111,14 @@ namespace LuaUtil
         {
             return LuaState::throwIfError(fn(std::forward<Args>(args)...));
         }
-        catch (std::exception&) { throw; }
-        catch (...) { throw std::runtime_error("Unknown error"); }
+        catch (std::exception&)
+        {
+            throw;
+        }
+        catch (...)
+        {
+            throw std::runtime_error("Unknown error");
+        }
     }
 
     // getFieldOrNil(table, "a", "b", "c") returns table["a"]["b"]["c"] or nil if some of the fields doesn't exist.
@@ -146,7 +151,10 @@ namespace LuaUtil
     // Needed to forbid any changes in common resources that can be accessed from different sandboxes.
     // `strictIndex = true` replaces default `__index` with a strict version that throws an error if key is not found.
     sol::table makeReadOnly(const sol::table&, bool strictIndex = false);
-    inline sol::table makeStrictReadOnly(const sol::table& tbl) { return makeReadOnly(tbl, true); }
+    inline sol::table makeStrictReadOnly(const sol::table& tbl)
+    {
+        return makeReadOnly(tbl, true);
+    }
     sol::table getMutableFromReadOnly(const sol::userdata&);
 
 }
diff --git a/components/lua/scriptscontainer.cpp b/components/lua/scriptscontainer.cpp
index 9e20a215fa..aa669b0fe4 100644
--- a/components/lua/scriptscontainer.cpp
+++ b/components/lua/scriptscontainer.cpp
@@ -16,9 +16,10 @@ namespace LuaUtil
     static constexpr std::string_view HANDLER_INTERFACE_OVERRIDE = "onInterfaceOverride";
 
     ScriptsContainer::ScriptsContainer(LuaUtil::LuaState* lua, std::string_view namePrefix)
-        : mNamePrefix(namePrefix), mLua(*lua)
+        : mNamePrefix(namePrefix)
+        , mLua(*lua)
     {
-        registerEngineHandlers({&mUpdateHandlers});
+        registerEngineHandlers({ &mUpdateHandlers });
         mPublicInterfaces = sol::table(lua->sol(), sol::create);
         addPackage("openmw.interfaces", mPublicInterfaces);
     }
@@ -55,11 +56,12 @@ namespace LuaUtil
         }
     }
 
-    bool ScriptsContainer::addScript(int scriptId, std::optional<sol::function>& onInit, std::optional<sol::function>& onLoad)
+    bool ScriptsContainer::addScript(
+        int scriptId, std::optional<sol::function>& onInit, std::optional<sol::function>& onLoad)
     {
         assert(scriptId >= 0 && scriptId < static_cast<int>(mLua.getConfiguration().size()));
         if (mScripts.count(scriptId) != 0)
-            return false;  // already present
+            return false; // already present
 
         const std::string& path = scriptPath(scriptId);
         std::string debugName = mNamePrefix;
@@ -69,7 +71,7 @@ namespace LuaUtil
 
         Script& script = mScripts[scriptId];
         script.mHiddenData = mLua.newTable();
-        script.mHiddenData[sScriptIdKey] = ScriptId{this, scriptId};
+        script.mHiddenData[sScriptIdKey] = ScriptId{ this, scriptId };
         script.mHiddenData[sScriptDebugNameKey] = debugName;
         script.mPath = path;
 
@@ -155,7 +157,7 @@ namespace LuaUtil
     {
         auto scriptIter = mScripts.find(scriptId);
         if (scriptIter == mScripts.end())
-            return;  // no such script
+            return; // no such script
         Script& script = scriptIter->second;
         if (script.mInterface)
             removeInterface(scriptId, script);
@@ -188,13 +190,25 @@ namespace LuaUtil
         }
         if (prev && script.mOnOverride)
         {
-            try { LuaUtil::call(*script.mOnOverride, *prev->mInterface); }
-            catch (std::exception& e) { printError(scriptId, "onInterfaceOverride failed", e); }
+            try
+            {
+                LuaUtil::call(*script.mOnOverride, *prev->mInterface);
+            }
+            catch (std::exception& e)
+            {
+                printError(scriptId, "onInterfaceOverride failed", e);
+            }
         }
         if (next && next->mOnOverride)
         {
-            try { LuaUtil::call(*next->mOnOverride, *script.mInterface); }
-            catch (std::exception& e) { printError(nextId, "onInterfaceOverride failed", e); }
+            try
+            {
+                LuaUtil::call(*next->mOnOverride, *script.mInterface);
+            }
+            catch (std::exception& e)
+            {
+                printError(nextId, "onInterfaceOverride failed", e);
+            }
         }
         if (next == nullptr)
             mPublicInterfaces[script.mInterfaceName] = *script.mInterface;
@@ -226,8 +240,14 @@ namespace LuaUtil
                 sol::object prevInterface = sol::nil;
                 if (prev)
                     prevInterface = *prev->mInterface;
-                try { LuaUtil::call(*next->mOnOverride, prevInterface); }
-                catch (std::exception& e) { printError(nextId, "onInterfaceOverride failed", e); }
+                try
+                {
+                    LuaUtil::call(*next->mOnOverride, prevInterface);
+                }
+                catch (std::exception& e)
+                {
+                    printError(nextId, "onInterfaceOverride failed", e);
+                }
             }
         }
         else if (prev)
@@ -251,9 +271,9 @@ namespace LuaUtil
 
     void ScriptsContainer::removeHandler(std::vector<Handler>& list, int scriptId)
     {
-        list.erase(std::remove_if(list.begin(), list.end(),
-                                  [scriptId](const Handler& h){ return h.mScriptId == scriptId; }),
-                   list.end());
+        list.erase(
+            std::remove_if(list.begin(), list.end(), [scriptId](const Handler& h) { return h.mScriptId == scriptId; }),
+            list.end());
     }
 
     void ScriptsContainer::receiveEvent(std::string_view eventName, std::string_view eventData)
@@ -261,7 +281,8 @@ namespace LuaUtil
         auto it = mEventHandlers.find(eventName);
         if (it == mEventHandlers.end())
         {
-            Log(Debug::Warning) << mNamePrefix << " has received event '" << eventName << "', but there are no handlers for this event";
+            Log(Debug::Warning) << mNamePrefix << " has received event '" << eventName
+                                << "', but there are no handlers for this event";
             return;
         }
         sol::object data;
@@ -281,12 +302,12 @@ namespace LuaUtil
             {
                 sol::object res = LuaUtil::call(list[i].mFn, data);
                 if (res != sol::nil && !res.as<bool>())
-                    break;  // Skip other handlers if 'false' was returned.
+                    break; // Skip other handlers if 'false' was returned.
             }
             catch (std::exception& e)
             {
-                Log(Debug::Error) << mNamePrefix << "[" << scriptPath(list[i].mScriptId)
-                                  << "] eventHandler[" << eventName << "] failed. " << e.what();
+                Log(Debug::Error) << mNamePrefix << "[" << scriptPath(list[i].mScriptId) << "] eventHandler["
+                                  << eventName << "] failed. " << e.what();
             }
         }
     }
@@ -303,14 +324,16 @@ namespace LuaUtil
         {
             LuaUtil::call(onInit, deserialize(mLua.sol(), data, mSerializer));
         }
-        catch (std::exception& e) { printError(scriptId, "onInit failed", e); }
+        catch (std::exception& e)
+        {
+            printError(scriptId, "onInit failed", e);
+        }
     }
 
     void ScriptsContainer::save(ESM::LuaScripts& data)
     {
         std::map<int, std::vector<ESM::LuaTimer>> timers;
-        auto saveTimerFn = [&](const Timer& timer, TimerType timerType)
-        {
+        auto saveTimerFn = [&](const Timer& timer, TimerType timerType) {
             if (!timer.mSerializable)
                 return;
             ESM::LuaTimer savedTimer;
@@ -338,7 +361,10 @@ namespace LuaUtil
                     sol::object state = LuaUtil::call(*script.mOnSave);
                     savedScript.mData = serialize(state, mSerializer);
                 }
-                catch (std::exception& e) { printError(scriptId, "onSave failed", e); }
+                catch (std::exception& e)
+                {
+                    printError(scriptId, "onSave failed", e);
+                }
             }
             auto timersIt = timers.find(scriptId);
             if (timersIt != timers.end())
@@ -359,7 +385,7 @@ namespace LuaUtil
         };
         std::map<int, ScriptInfo> scripts;
         for (const auto& [scriptId, initData] : mAutoStartScripts)
-            scripts[scriptId] = {initData, nullptr};
+            scripts[scriptId] = { initData, nullptr };
         for (const ESM::LuaScript& s : data.mScripts)
         {
             std::optional<int> scriptId = cfg.findId(s.mScriptPath);
@@ -372,9 +398,10 @@ namespace LuaUtil
             if (it != scripts.end())
                 it->second.mSavedData = &s;
             else if (cfg.isCustomScript(*scriptId))
-                scripts[*scriptId] = {cfg[*scriptId].mInitializationData, &s};
+                scripts[*scriptId] = { cfg[*scriptId].mInitializationData, &s };
             else
-                Log(Debug::Verbose) << "Ignoring " << mNamePrefix << "[" << s.mScriptPath << "]; this script is not allowed here";
+                Log(Debug::Verbose) << "Ignoring " << mNamePrefix << "[" << s.mScriptPath
+                                    << "]; this script is not allowed here";
         }
 
         for (const auto& [scriptId, scriptInfo] : scripts)
@@ -393,11 +420,13 @@ namespace LuaUtil
                 try
                 {
                     sol::object state = deserialize(mLua.sol(), scriptInfo.mSavedData->mData, mSavedDataDeserializer);
-                    sol::object initializationData =
-                        deserialize(mLua.sol(), scriptInfo.mInitData, mSerializer);
+                    sol::object initializationData = deserialize(mLua.sol(), scriptInfo.mInitData, mSerializer);
                     LuaUtil::call(*onLoad, state, initializationData);
                 }
-                catch (std::exception& e) { printError(scriptId, "onLoad failed", e); }
+                catch (std::exception& e)
+                {
+                    printError(scriptId, "onLoad failed", e);
+                }
             }
             for (const ESM::LuaTimer& savedTimer : scriptInfo.mSavedData->mTimers)
             {
@@ -419,7 +448,10 @@ namespace LuaUtil
                     else
                         mSimulationTimersQueue.push_back(std::move(timer));
                 }
-                catch (std::exception& e) { printError(scriptId, "can not load timer", e); }
+                catch (std::exception& e)
+                {
+                    printError(scriptId, "can not load timer", e);
+                }
             }
         }
 
@@ -467,8 +499,8 @@ namespace LuaUtil
         std::push_heap(timerQueue.begin(), timerQueue.end());
     }
 
-    void ScriptsContainer::setupSerializableTimer(TimerType type, double time, int scriptId,
-                                                  std::string_view callbackName, sol::object callbackArg)
+    void ScriptsContainer::setupSerializableTimer(
+        TimerType type, double time, int scriptId, std::string_view callbackName, sol::object callbackArg)
     {
         Timer t;
         t.mCallback = std::string(callbackName);
@@ -514,7 +546,10 @@ namespace LuaUtil
                 script.mTemporaryCallbacks.erase(id);
             }
         }
-        catch (std::exception& e) { printError(t.mScriptId, "callTimer failed", e); }
+        catch (std::exception& e)
+        {
+            printError(t.mScriptId, "callTimer failed", e);
+        }
     }
 
     void ScriptsContainer::updateTimerQueue(std::vector<Timer>& timerQueue, double time)
diff --git a/components/lua/scriptscontainer.hpp b/components/lua/scriptscontainer.hpp
index 1599966376..04a5af2e5e 100644
--- a/components/lua/scriptscontainer.hpp
+++ b/components/lua/scriptscontainer.hpp
@@ -14,48 +14,49 @@
 namespace LuaUtil
 {
 
-// ScriptsContainer is a base class for all scripts containers (LocalScripts,
-// GlobalScripts, PlayerScripts, etc). Each script runs in a separate sandbox.
-// Scripts from different containers can interact to each other only via events.
-// Scripts within one container can interact via interfaces.
-// All scripts from one container have the same set of API packages available.
-//
-// Each script should return a table in a specific format that describes its
-// handlers and interfaces. Every section of the table is optional. Basic structure:
-//
-//     local function update(dt)
-//         print("Update")
-//     end
-//
-//     local function someEventHandler(eventData)
-//         print("'SomeEvent' received")
-//     end
-//
-//     return {
-//         -- Provides interface for other scripts in the same container
-//         interfaceName = "InterfaceName",
-//         interface = {
-//             someFunction = function() print("someFunction was called from another script") end,
-//         },
-//
-//         -- Script interface for the engine. Not available for other script.
-//         -- An error is printed if unknown handler is specified.
-//         engineHandlers = {
-//             onUpdate = update,
-//             onInit = function(initData) ... end,  -- used when the script is just created (not loaded)
-//             onSave = function() return ... end,
-//             onLoad = function(state, initData) ... end,  -- "state" is the data that was earlier returned by onSave
-//
-//             -- Works only if a child class has passed a EngineHandlerList
-//             -- for 'onSomethingElse' to ScriptsContainer::registerEngineHandlers.
-//             onSomethingElse = function() print("something else") end
-//         },
-//
-//         -- Handlers for events, sent from other scripts. Engine itself never sent events. Any name can be used for an event.
-//         eventHandlers = {
-//             SomeEvent = someEventHandler
-//         }
-//     }
+    // ScriptsContainer is a base class for all scripts containers (LocalScripts,
+    // GlobalScripts, PlayerScripts, etc). Each script runs in a separate sandbox.
+    // Scripts from different containers can interact to each other only via events.
+    // Scripts within one container can interact via interfaces.
+    // All scripts from one container have the same set of API packages available.
+    //
+    // Each script should return a table in a specific format that describes its
+    // handlers and interfaces. Every section of the table is optional. Basic structure:
+    //
+    //     local function update(dt)
+    //         print("Update")
+    //     end
+    //
+    //     local function someEventHandler(eventData)
+    //         print("'SomeEvent' received")
+    //     end
+    //
+    //     return {
+    //         -- Provides interface for other scripts in the same container
+    //         interfaceName = "InterfaceName",
+    //         interface = {
+    //             someFunction = function() print("someFunction was called from another script") end,
+    //         },
+    //
+    //         -- Script interface for the engine. Not available for other script.
+    //         -- An error is printed if unknown handler is specified.
+    //         engineHandlers = {
+    //             onUpdate = update,
+    //             onInit = function(initData) ... end,  -- used when the script is just created (not loaded)
+    //             onSave = function() return ... end,
+    //             onLoad = function(state, initData) ... end,  -- "state" is the data that was earlier returned by
+    //             onSave
+    //
+    //             -- Works only if a child class has passed a EngineHandlerList
+    //             -- for 'onSomethingElse' to ScriptsContainer::registerEngineHandlers.
+    //             onSomethingElse = function() print("something else") end
+    //         },
+    //
+    //         -- Handlers for events, sent from other scripts. Engine itself never sent events. Any name can be used
+    //         for an event. eventHandlers = {
+    //             SomeEvent = someEventHandler
+    //         }
+    //     }
 
     class ScriptsContainer
     {
@@ -71,12 +72,12 @@ namespace LuaUtil
         struct ScriptId
         {
             ScriptsContainer* mContainer;
-            int mIndex;  // index in LuaUtil::ScriptsConfiguration
+            int mIndex; // index in LuaUtil::ScriptsConfiguration
         };
         using TimerType = ESM::LuaTimer::Type;
 
-        // `namePrefix` is a common prefix for all scripts in the container. Used in logs for error messages and `print` output.
-        // `autoStartScripts` specifies the list of scripts that should be autostarted in this container;
+        // `namePrefix` is a common prefix for all scripts in the container. Used in logs for error messages and `print`
+        // output. `autoStartScripts` specifies the list of scripts that should be autostarted in this container;
         //     the script names themselves are stored in ScriptsConfiguration.
         ScriptsContainer(LuaState* lua, std::string_view namePrefix);
 
@@ -91,10 +92,10 @@ namespace LuaUtil
         // Automatically applies LuaUtil::makeReadOnly to the package.
         void addPackage(std::string packageName, sol::object package);
 
-        // Gets script with given id from ScriptsConfiguration, finds the source in the virtual file system, starts as a new script,
-        // adds it to the container, and calls onInit for this script. Returns `true` if the script was successfully added.
-        // The script should have CUSTOM flag. If the flag is not set, or file not found, or has syntax errors, returns false.
-        // If such script already exists in the container, then also returns false.
+        // Gets script with given id from ScriptsConfiguration, finds the source in the virtual file system, starts as a
+        // new script, adds it to the container, and calls onInit for this script. Returns `true` if the script was
+        // successfully added. The script should have CUSTOM flag. If the flag is not set, or file not found, or has
+        // syntax errors, returns false. If such script already exists in the container, then also returns false.
         bool addCustomScript(int scriptId);
 
         bool hasScript(int scriptId) const { return mScripts.count(scriptId) != 0; }
@@ -125,7 +126,8 @@ namespace LuaUtil
         // Removes all scripts including the auto started.
         void removeAllScripts();
 
-        // Calls engineHandler "onSave" for every script and saves the list of the scripts with serialized data to ESM::LuaScripts.
+        // Calls engineHandler "onSave" for every script and saves the list of the scripts with serialized data to
+        // ESM::LuaScripts.
         void save(ESM::LuaScripts&);
 
         // Removes all scripts; starts scripts according to `autoStartMode` and
@@ -139,11 +141,11 @@ namespace LuaUtil
         // Sets up a timer, that can be automatically saved and loaded.
         //   type - the type of timer, either SIMULATION_TIME or GAME_TIME.
         //   time - the absolute game time (in seconds or in hours) when the timer should be executed.
-        //   scriptPath - script path in VFS is used as script id. The script with the given path should already present in the container.
-        //   callbackName - callback (should be registered in advance) for this timer.
-        //   callbackArg - parameter for the callback (should be serializable).
-        void setupSerializableTimer(TimerType type, double time, int scriptId,
-                                    std::string_view callbackName, sol::object callbackArg);
+        //   scriptPath - script path in VFS is used as script id. The script with the given path should already present
+        //   in the container. callbackName - callback (should be registered in advance) for this timer. callbackArg -
+        //   parameter for the callback (should be serializable).
+        void setupSerializableTimer(
+            TimerType type, double time, int scriptId, std::string_view callbackName, sol::object callbackArg);
 
         // Creates a timer. `callback` is an arbitrary Lua function. These timers are called "unsavable"
         // because they can not be stored in saves. I.e. loading a saved game will not fully restore the state.
@@ -162,7 +164,10 @@ namespace LuaUtil
             std::vector<Handler> mList;
 
             // "name" must be string literal
-            explicit EngineHandlerList(std::string_view name) : mName(name) {}
+            explicit EngineHandlerList(std::string_view name)
+                : mName(name)
+            {
+            }
         };
 
         // Calls given handlers in direct order.
@@ -171,11 +176,14 @@ namespace LuaUtil
         {
             for (Handler& handler : handlers.mList)
             {
-                try { LuaUtil::call(handler.mFn, args...); }
+                try
+                {
+                    LuaUtil::call(handler.mFn, args...);
+                }
                 catch (std::exception& e)
                 {
-                    Log(Debug::Error) << mNamePrefix << "[" << scriptPath(handler.mScriptId) << "] "
-                                      << handlers.mName << " failed. " << e.what();
+                    Log(Debug::Error) << mNamePrefix << "[" << scriptPath(handler.mScriptId) << "] " << handlers.mName
+                                      << " failed. " << e.what();
                 }
             }
         }
@@ -204,7 +212,7 @@ namespace LuaUtil
             double mTime;
             bool mSerializable;
             int mScriptId;
-            std::variant<std::string, int64_t> mCallback;  // string if serializable, integer otherwise
+            std::variant<std::string, int64_t> mCallback; // string if serializable, integer otherwise
             sol::object mArg;
             std::string mSerializedArg;
 
@@ -237,7 +245,7 @@ namespace LuaUtil
         std::map<int, Script> mScripts;
         sol::table mPublicInterfaces;
 
-        EngineHandlerList mUpdateHandlers{"onUpdate"};
+        EngineHandlerList mUpdateHandlers{ "onUpdate" };
         std::map<std::string_view, EngineHandlerList*> mEngineHandlers;
         std::map<std::string, EventHandlerList, std::less<>> mEventHandlers;
 
@@ -252,7 +260,7 @@ namespace LuaUtil
     struct Callback
     {
         sol::function mFunc;
-        sol::table mHiddenData;  // same object as Script::mHiddenData in ScriptsContainer
+        sol::table mHiddenData; // same object as Script::mHiddenData in ScriptsContainer
 
         bool isValid() const { return mHiddenData[ScriptsContainer::sScriptIdKey] != sol::nil; }
 
@@ -270,7 +278,10 @@ namespace LuaUtil
         template <typename... Args>
         void tryCall(Args&&... args) const
         {
-            try { this->call(std::forward<Args>(args)...); }
+            try
+            {
+                this->call(std::forward<Args>(args)...);
+            }
             catch (std::exception& e)
             {
                 Log(Debug::Error) << "Error in callback: " << e.what();
diff --git a/components/lua/serialization.cpp b/components/lua/serialization.cpp
index f1ee7c1aae..3976a3f94e 100644
--- a/components/lua/serialization.cpp
+++ b/components/lua/serialization.cpp
@@ -19,24 +19,24 @@ namespace LuaUtil
 
     enum class SerializedType : char
     {
-        NUMBER =       0x0,
-        LONG_STRING =  0x1,
-        BOOLEAN =      0x2,
-        TABLE_START =  0x3,
-        TABLE_END =    0x4,
+        NUMBER = 0x0,
+        LONG_STRING = 0x1,
+        BOOLEAN = 0x2,
+        TABLE_START = 0x3,
+        TABLE_END = 0x4,
 
-        VEC2 =         0x10,
-        VEC3 =         0x11,
-        TRANSFORM_M =  0x12,
-        TRANSFORM_Q =  0x13,
-        VEC4 =         0x14,
-        COLOR =        0x15,
+        VEC2 = 0x10,
+        VEC3 = 0x11,
+        TRANSFORM_M = 0x12,
+        TRANSFORM_Q = 0x13,
+        VEC4 = 0x14,
+        COLOR = 0x15,
 
         // All values should be lesser than 0x20 (SHORT_STRING_FLAG).
     };
-    constexpr unsigned char SHORT_STRING_FLAG = 0x20;    // 0b001SSSSS. SSSSS = string length
-    constexpr unsigned char CUSTOM_FULL_FLAG = 0x40;     // 0b01TTTTTT + 32bit dataSize
-    constexpr unsigned char CUSTOM_COMPACT_FLAG = 0x80;  // 0b1SSSSTTT. SSSS = dataSize, TTT = (typeName size - 1)
+    constexpr unsigned char SHORT_STRING_FLAG = 0x20; // 0b001SSSSS. SSSSS = string length
+    constexpr unsigned char CUSTOM_FULL_FLAG = 0x40; // 0b01TTTTTT + 32bit dataSize
+    constexpr unsigned char CUSTOM_COMPACT_FLAG = 0x80; // 0b1SSSSTTT. SSSS = dataSize, TTT = (typeName size - 1)
 
     static void appendType(BinaryData& out, SerializedType type)
     {
@@ -82,12 +82,12 @@ namespace LuaUtil
     {
         assert(!typeName.empty() && typeName.size() <= 64);
         if (typeName.size() <= 8 && dataSize < 16)
-        {  // Compact form: 0b1SSSSTTT. SSSS = dataSize, TTT = (typeName size - 1).
+        { // Compact form: 0b1SSSSTTT. SSSS = dataSize, TTT = (typeName size - 1).
             unsigned char t = CUSTOM_COMPACT_FLAG | (dataSize << 3) | (typeName.size() - 1);
             out.push_back(t);
         }
         else
-        {  // Full form: 0b01TTTTTT + 32bit dataSize.
+        { // Full form: 0b01TTTTTT + 32bit dataSize.
             unsigned char t = CUSTOM_FULL_FLAG | (typeName.size() - 1);
             out.push_back(t);
             appendValue<uint32_t>(out, dataSize);
@@ -132,7 +132,8 @@ namespace LuaUtil
         return refnum;
     }
 
-    static void serializeUserdata(BinaryData& out, const sol::userdata& data, const UserdataSerializer* customSerializer)
+    static void serializeUserdata(
+        BinaryData& out, const sol::userdata& data, const UserdataSerializer* customSerializer)
     {
         if (data.is<osg::Vec2f>())
         {
@@ -157,14 +158,14 @@ namespace LuaUtil
             osg::Matrixf matrix = data.as<TransformM>().mM;
             for (size_t i = 0; i < 4; i++)
                 for (size_t j = 0; j < 4; j++)
-                    appendValue<double>(out, matrix(i,j));
+                    appendValue<double>(out, matrix(i, j));
             return;
         }
         if (data.is<TransformQ>())
         {
             appendType(out, SerializedType::TRANSFORM_Q);
             osg::Quat quat = data.as<TransformQ>().mQ;
-            for(size_t i = 0; i < 4; i++)
+            for (size_t i = 0; i < 4; i++)
                 appendValue<double>(out, quat[i]);
             return;
         }
@@ -181,7 +182,7 @@ namespace LuaUtil
         if (data.is<Misc::Color>())
         {
             appendType(out, SerializedType::COLOR);
-            Misc::Color v = data.as<Misc::Color> ();
+            Misc::Color v = data.as<Misc::Color>();
             appendValue<float>(out, v.r());
             appendValue<float>(out, v.g());
             appendValue<float>(out, v.b());
@@ -194,7 +195,8 @@ namespace LuaUtil
             throw std::runtime_error("Value is not serializable.");
     }
 
-    static void serialize(BinaryData& out, const sol::object& obj, const UserdataSerializer* customSerializer, int recursionCounter)
+    static void serialize(
+        BinaryData& out, const sol::object& obj, const UserdataSerializer* customSerializer, int recursionCounter)
     {
         if (obj.get_type() == sol::type::lightuserdata)
             throw std::runtime_error("Light userdata is not allowed to be serialized.");
@@ -205,7 +207,8 @@ namespace LuaUtil
         else if (obj.is<sol::lua_table>())
         {
             if (recursionCounter >= 32)
-                throw std::runtime_error("Can not serialize more than 32 nested tables. Likely the table contains itself.");
+                throw std::runtime_error(
+                    "Can not serialize more than 32 nested tables. Likely the table contains itself.");
             sol::table table = obj;
             appendType(out, SerializedType::TABLE_START);
             for (auto& [key, value] : table)
@@ -227,12 +230,13 @@ namespace LuaUtil
             char v = obj.as<bool>() ? 1 : 0;
             appendType(out, SerializedType::BOOLEAN);
             out.push_back(v);
-        } else
+        }
+        else
             throw std::runtime_error("Unknown Lua type.");
     }
 
-    static void deserializeImpl(lua_State* lua, std::string_view& binaryData,
-                                const UserdataSerializer* customSerializer, bool readOnly)
+    static void deserializeImpl(
+        lua_State* lua, std::string_view& binaryData, const UserdataSerializer* customSerializer, bool readOnly)
     {
         if (binaryData.empty())
             throw std::runtime_error("Unexpected end of serialized data.");
@@ -242,12 +246,12 @@ namespace LuaUtil
         {
             size_t typeNameSize, dataSize;
             if (type & CUSTOM_COMPACT_FLAG)
-            {  // Compact form: 0b1SSSSTTT. SSSS = dataSize, TTT = (typeName size - 1).
+            { // Compact form: 0b1SSSSTTT. SSSS = dataSize, TTT = (typeName size - 1).
                 typeNameSize = (type & 7) + 1;
                 dataSize = (type >> 3) & 15;
             }
             else
-            {  // Full form: 0b01TTTTTT + 32bit dataSize.
+            { // Full form: 0b01TTTTTT + 32bit dataSize.
                 typeNameSize = (type & 63) + 1;
                 dataSize = getValue<uint32_t>(binaryData);
             }
@@ -362,14 +366,14 @@ namespace LuaUtil
         return res;
     }
 
-    sol::object deserialize(lua_State* lua, std::string_view binaryData,
-                            const UserdataSerializer* customSerializer, bool readOnly)
+    sol::object deserialize(
+        lua_State* lua, std::string_view binaryData, const UserdataSerializer* customSerializer, bool readOnly)
     {
         if (binaryData.empty())
             return sol::nil;
         if (binaryData[0] != FORMAT_VERSION)
-            throw std::runtime_error("Incorrect version of Lua serialization format: " +
-                                     std::to_string(static_cast<unsigned>(binaryData[0])));
+            throw std::runtime_error("Incorrect version of Lua serialization format: "
+                + std::to_string(static_cast<unsigned>(binaryData[0])));
         binaryData = binaryData.substr(1);
         deserializeImpl(lua, binaryData, customSerializer, readOnly);
         if (!binaryData.empty())
diff --git a/components/lua/serialization.hpp b/components/lua/serialization.hpp
index 03de88cf8e..439e86af36 100644
--- a/components/lua/serialization.hpp
+++ b/components/lua/serialization.hpp
@@ -20,8 +20,8 @@ namespace LuaUtil
         // Returns false if this type of userdata is not supported by this serializer.
         virtual bool serialize(BinaryData&, const sol::userdata&) const = 0;
 
-        // Deserializes userdata of type "typeName" from binaryData. Should push the result on stack using sol::stack::push.
-        // Returns false if this type is not supported by this serializer.
+        // Deserializes userdata of type "typeName" from binaryData. Should push the result on stack using
+        // sol::stack::push. Returns false if this type is not supported by this serializer.
         virtual bool deserialize(std::string_view typeName, std::string_view binaryData, lua_State*) const = 0;
 
     protected:
@@ -38,8 +38,10 @@ namespace LuaUtil
     {
     public:
         BasicSerializer() = default;
-        explicit BasicSerializer(std::function<int(int)> adjustContentFileIndexFn) :
-            mAdjustContentFilesIndexFn(std::move(adjustContentFileIndexFn)) {}
+        explicit BasicSerializer(std::function<int(int)> adjustContentFileIndexFn)
+            : mAdjustContentFilesIndexFn(std::move(adjustContentFileIndexFn))
+        {
+        }
 
     private:
         bool serialize(LuaUtil::BinaryData& out, const sol::userdata& data) const override;
@@ -50,7 +52,7 @@ namespace LuaUtil
 
     BinaryData serialize(const sol::object&, const UserdataSerializer* customSerializer = nullptr);
     sol::object deserialize(lua_State* lua, std::string_view binaryData,
-                            const UserdataSerializer* customSerializer = nullptr, bool readOnly = false);
+        const UserdataSerializer* customSerializer = nullptr, bool readOnly = false);
 
 }
 
diff --git a/components/lua/storage.cpp b/components/lua/storage.cpp
index c80181f977..309a687941 100644
--- a/components/lua/storage.cpp
+++ b/components/lua/storage.cpp
@@ -8,7 +8,9 @@
 namespace sol
 {
     template <>
-    struct is_automagical<LuaUtil::LuaStorage::SectionView> : std::false_type {};
+    struct is_automagical<LuaUtil::LuaStorage::SectionView> : std::false_type
+    {
+    };
 }
 
 namespace LuaUtil
@@ -39,22 +41,25 @@ namespace LuaUtil
     void LuaStorage::Section::runCallbacks(sol::optional<std::string_view> changedKey)
     {
         mStorage->mRunningCallbacks.insert(this);
-        mCallbacks.erase(std::remove_if(mCallbacks.begin(), mCallbacks.end(), [&](const Callback& callback)
-        {
-            bool valid = callback.isValid();
-            if (valid)
-                callback.tryCall(mSectionName, changedKey);
-            return !valid;
-        }), mCallbacks.end());
+        mCallbacks.erase(std::remove_if(mCallbacks.begin(), mCallbacks.end(),
+                             [&](const Callback& callback) {
+                                 bool valid = callback.isValid();
+                                 if (valid)
+                                     callback.tryCall(mSectionName, changedKey);
+                                 return !valid;
+                             }),
+            mCallbacks.end());
         mStorage->mRunningCallbacks.erase(this);
     }
 
     void LuaStorage::Section::throwIfCallbackRecursionIsTooDeep()
     {
         if (mStorage->mRunningCallbacks.count(this) > 0)
-            throw std::runtime_error("Storage handler shouldn't change the storage section it handles (leads to an infinite recursion)");
+            throw std::runtime_error(
+                "Storage handler shouldn't change the storage section it handles (leads to an infinite recursion)");
         if (mStorage->mRunningCallbacks.size() > 10)
-            throw std::runtime_error("Too many subscribe callbacks triggering in a chain, likely an infinite recursion");
+            throw std::runtime_error(
+                "Too many subscribe callbacks triggering in a chain, likely an infinite recursion");
     }
 
     void LuaStorage::Section::set(std::string_view key, const sol::object& value)
@@ -99,40 +104,34 @@ namespace LuaUtil
     {
         sol::state_view lua(L);
         sol::usertype<SectionView> sview = lua.new_usertype<SectionView>("Section");
-        sview["get"] = [](sol::this_state s, const SectionView& section, std::string_view key)
-        {
+        sview["get"] = [](sol::this_state s, const SectionView& section, std::string_view key) {
             return section.mSection->get(key).getReadOnly(s);
         };
-        sview["getCopy"] = [](sol::this_state s, const SectionView& section, std::string_view key)
-        {
+        sview["getCopy"] = [](sol::this_state s, const SectionView& section, std::string_view key) {
             return section.mSection->get(key).getCopy(s);
         };
         sview["asTable"] = [](const SectionView& section) { return section.mSection->asTable(); };
-        sview["subscribe"] = [](const SectionView& section, const Callback& callback)
-        {
+        sview["subscribe"] = [](const SectionView& section, const Callback& callback) {
             std::vector<Callback>& callbacks = section.mSection->mCallbacks;
             if (!callbacks.empty() && callbacks.size() == callbacks.capacity())
             {
-                callbacks.erase(std::remove_if(callbacks.begin(), callbacks.end(),
-                                               [&](const Callback& c) { return !c.isValid(); }),
-                                callbacks.end());
+                callbacks.erase(
+                    std::remove_if(callbacks.begin(), callbacks.end(), [&](const Callback& c) { return !c.isValid(); }),
+                    callbacks.end());
             }
             callbacks.push_back(callback);
         };
-        sview["reset"] = [](const SectionView& section, const sol::optional<sol::table>& newValues)
-        {
+        sview["reset"] = [](const SectionView& section, const sol::optional<sol::table>& newValues) {
             if (section.mReadOnly)
                 throw std::runtime_error("Access to storage is read only");
             section.mSection->setAll(newValues);
         };
-        sview["removeOnExit"] = [](const SectionView& section)
-        {
+        sview["removeOnExit"] = [](const SectionView& section) {
             if (section.mReadOnly)
                 throw std::runtime_error("Access to storage is read only");
             section.mSection->mPermanent = false;
         };
-        sview["set"] = [](const SectionView& section, std::string_view key, const sol::object& value)
-        {
+        sview["set"] = [](const SectionView& section, std::string_view key, const sol::object& value) {
             if (section.mReadOnly)
                 throw std::runtime_error("Access to storage is read only");
             section.mSection->set(key, value);
@@ -155,12 +154,13 @@ namespace LuaUtil
         }
     }
 
-    void LuaStorage::load(const std::filesystem::path &path)
+    void LuaStorage::load(const std::filesystem::path& path)
     {
-        assert(mData.empty());  // Shouldn't be used before loading
+        assert(mData.empty()); // Shouldn't be used before loading
         try
         {
-            Log(Debug::Info) << "Loading Lua storage \"" << path << "\" (" << std::filesystem::file_size(path) << " bytes)";
+            Log(Debug::Info) << "Loading Lua storage \"" << path << "\" (" << std::filesystem::file_size(path)
+                             << " bytes)";
             std::ifstream fin(path, std::fstream::binary);
             std::string serializedData((std::istreambuf_iterator<char>(fin)), std::istreambuf_iterator<char>());
             sol::table data = deserialize(mLua, serializedData);
@@ -177,7 +177,7 @@ namespace LuaUtil
         }
     }
 
-    void LuaStorage::save(const std::filesystem::path &path) const
+    void LuaStorage::save(const std::filesystem::path& path) const
     {
         sol::table data(mLua, sol::create);
         for (const auto& [sectionName, section] : mData)
@@ -206,7 +206,7 @@ namespace LuaUtil
     sol::object LuaStorage::getSection(std::string_view sectionName, bool readOnly)
     {
         const std::shared_ptr<Section>& section = getSection(sectionName);
-        return sol::make_object<SectionView>(mLua, SectionView{section, readOnly});
+        return sol::make_object<SectionView>(mLua, SectionView{ section, readOnly });
     }
 
     sol::table LuaStorage::getAllSections(bool readOnly)
diff --git a/components/lua/storage.hpp b/components/lua/storage.hpp
index f4047bd2ee..dcb5c2cdb8 100644
--- a/components/lua/storage.hpp
+++ b/components/lua/storage.hpp
@@ -15,11 +15,14 @@ namespace LuaUtil
     public:
         static void initLuaBindings(lua_State*);
 
-        explicit LuaStorage(lua_State* lua) : mLua(lua) {}
+        explicit LuaStorage(lua_State* lua)
+            : mLua(lua)
+        {
+        }
 
         void clearTemporaryAndRemoveCallbacks();
-        void load(const std::filesystem::path &path);
-        void save(const std::filesystem::path &path) const;
+        void load(const std::filesystem::path& path);
+        void save(const std::filesystem::path& path) const;
 
         sol::object getSection(std::string_view sectionName, bool readOnly);
         sol::object getMutableSection(std::string_view sectionName) { return getSection(sectionName, false); }
@@ -27,15 +30,20 @@ namespace LuaUtil
         sol::table getAllSections(bool readOnly = false);
 
         void setSingleValue(std::string_view section, std::string_view key, const sol::object& value)
-            { getSection(section)->set(key, value); }
+        {
+            getSection(section)->set(key, value);
+        }
 
         void setSectionValues(std::string_view section, const sol::optional<sol::table>& values)
-            { getSection(section)->setAll(values); }
+        {
+            getSection(section)->setAll(values);
+        }
 
         class Listener
         {
         public:
-            virtual void valueChanged(std::string_view section, std::string_view key, const sol::object& value) const = 0;
+            virtual void valueChanged(
+                std::string_view section, std::string_view key, const sol::object& value) const = 0;
             virtual void sectionReplaced(std::string_view section, const sol::optional<sol::table>& values) const = 0;
         };
         void setListener(const Listener* listener) { mListener = listener; }
@@ -45,7 +53,10 @@ namespace LuaUtil
         {
         public:
             Value() {}
-            Value(const sol::object& value) : mSerializedValue(serialize(value)) {}
+            Value(const sol::object& value)
+                : mSerializedValue(serialize(value))
+            {
+            }
             sol::object getCopy(lua_State* L) const;
             sol::object getReadOnly(lua_State* L) const;
 
@@ -56,7 +67,11 @@ namespace LuaUtil
 
         struct Section
         {
-            explicit Section(LuaStorage* storage, std::string name) : mStorage(storage), mSectionName(std::move(name)) {}
+            explicit Section(LuaStorage* storage, std::string name)
+                : mStorage(storage)
+                , mSectionName(std::move(name))
+            {
+            }
             const Value& get(std::string_view key) const;
             void set(std::string_view key, const sol::object& value);
             void setAll(const sol::optional<sol::table>& values);
diff --git a/components/lua/utilpackage.cpp b/components/lua/utilpackage.cpp
index 88cf7cb17a..91f189337b 100644
--- a/components/lua/utilpackage.cpp
+++ b/components/lua/utilpackage.cpp
@@ -1,39 +1,52 @@
 #include "utilpackage.hpp"
 
 #include <algorithm>
-#include <sstream>
 #include <array>
+#include <sstream>
 
-#include <components/misc/mathutil.hpp>
 #include <components/misc/color.hpp>
+#include <components/misc/mathutil.hpp>
 
 #include "luastate.hpp"
 
 namespace sol
 {
     template <>
-    struct is_automagical<LuaUtil::Vec2> : std::false_type {};
+    struct is_automagical<LuaUtil::Vec2> : std::false_type
+    {
+    };
 
     template <>
-    struct is_automagical<LuaUtil::Vec3> : std::false_type {};
+    struct is_automagical<LuaUtil::Vec3> : std::false_type
+    {
+    };
 
     template <>
-    struct is_automagical<LuaUtil::Vec4> : std::false_type {};
+    struct is_automagical<LuaUtil::Vec4> : std::false_type
+    {
+    };
 
     template <>
-    struct is_automagical<Misc::Color> : std::false_type {};
+    struct is_automagical<Misc::Color> : std::false_type
+    {
+    };
 
     template <>
-    struct is_automagical<LuaUtil::TransformM> : std::false_type {};
+    struct is_automagical<LuaUtil::TransformM> : std::false_type
+    {
+    };
 
     template <>
-    struct is_automagical<LuaUtil::TransformQ> : std::false_type {};
+    struct is_automagical<LuaUtil::TransformQ> : std::false_type
+    {
+    };
 }
 
 namespace LuaUtil
 {
-    namespace {
-        template<typename T>
+    namespace
+    {
+        template <typename T>
         void addVectorMethods(sol::usertype<T>& vectorType)
         {
             vectorType[sol::meta_function::unary_minus] = [](const T& a) { return -a; };
@@ -41,36 +54,31 @@ namespace LuaUtil
             vectorType[sol::meta_function::subtraction] = [](const T& a, const T& b) { return a - b; };
             vectorType[sol::meta_function::equal_to] = [](const T& a, const T& b) { return a == b; };
             vectorType[sol::meta_function::multiplication] = sol::overload(
-                [](const T& a, float c) { return a * c; },
-                [](const T& a, const T& b) { return a * b; });
+                [](const T& a, float c) { return a * c; }, [](const T& a, const T& b) { return a * b; });
             vectorType[sol::meta_function::division] = [](const T& a, float c) { return a / c; };
             vectorType["dot"] = [](const T& a, const T b) { return a * b; };
             vectorType["length"] = &T::length;
             vectorType["length2"] = &T::length2;
-            vectorType["normalize"] = [](const T& v)
-            {
+            vectorType["normalize"] = [](const T& v) {
                 float len = v.length();
                 if (len == 0)
                     return std::make_tuple(T(), 0.f);
                 else
                     return std::make_tuple(v * (1.f / len), len);
             };
-            vectorType["emul"] = [](const T& a, const T& b)
-            {
+            vectorType["emul"] = [](const T& a, const T& b) {
                 T result;
                 for (int i = 0; i < T::num_components; ++i)
                     result[i] = a[i] * b[i];
                 return result;
             };
-            vectorType["ediv"] = [](const T& a, const T& b)
-            {
+            vectorType["ediv"] = [](const T& a, const T& b) {
                 T result;
                 for (int i = 0; i < T::num_components; ++i)
                     result[i] = a[i] / b[i];
                 return result;
             };
-            vectorType[sol::meta_function::to_string] = [](const T& v)
-            {
+            vectorType[sol::meta_function::to_string] = [](const T& v) {
                 std::stringstream ss;
                 ss << "(" << v[0];
                 for (int i = 1; i < T::num_components; ++i)
@@ -88,24 +96,23 @@ namespace LuaUtil
         // Lua bindings for Vec2
         util["vector2"] = [](float x, float y) { return Vec2(x, y); };
         sol::usertype<Vec2> vec2Type = lua.new_usertype<Vec2>("Vec2");
-        vec2Type["x"] = sol::readonly_property([](const Vec2& v) -> float { return v.x(); } );
-        vec2Type["y"] = sol::readonly_property([](const Vec2& v) -> float { return v.y(); } );
+        vec2Type["x"] = sol::readonly_property([](const Vec2& v) -> float { return v.x(); });
+        vec2Type["y"] = sol::readonly_property([](const Vec2& v) -> float { return v.y(); });
         addVectorMethods<Vec2>(vec2Type);
         vec2Type["rotate"] = &Misc::rotateVec2f;
 
         // Lua bindings for Vec3
         util["vector3"] = [](float x, float y, float z) { return Vec3(x, y, z); };
         sol::usertype<Vec3> vec3Type = lua.new_usertype<Vec3>("Vec3");
-        vec3Type["x"] = sol::readonly_property([](const Vec3& v) -> float { return v.x(); } );
-        vec3Type["y"] = sol::readonly_property([](const Vec3& v) -> float { return v.y(); } );
-        vec3Type["z"] = sol::readonly_property([](const Vec3& v) -> float { return v.z(); } );
+        vec3Type["x"] = sol::readonly_property([](const Vec3& v) -> float { return v.x(); });
+        vec3Type["y"] = sol::readonly_property([](const Vec3& v) -> float { return v.y(); });
+        vec3Type["z"] = sol::readonly_property([](const Vec3& v) -> float { return v.z(); });
         addVectorMethods<Vec3>(vec3Type);
         vec3Type[sol::meta_function::involution] = [](const Vec3& a, const Vec3& b) { return a ^ b; };
         vec3Type["cross"] = [](const Vec3& a, const Vec3& b) { return a ^ b; };
 
         // Lua bindings for Vec4
-        util["vector4"] = [](float x, float y, float z, float w)
-        { return Vec4(x, y, z, w); };
+        util["vector4"] = [](float x, float y, float z, float w) { return Vec4(x, y, z, w); };
         sol::usertype<Vec4> vec4Type = lua.new_usertype<Vec4>("Vec4");
         vec4Type["x"] = sol::readonly_property([](const Vec4& v) -> float { return v.x(); });
         vec4Type["y"] = sol::readonly_property([](const Vec4& v) -> float { return v.y(); });
@@ -136,29 +143,25 @@ namespace LuaUtil
         sol::table transforms(lua, sol::create);
         util["transform"] = LuaUtil::makeReadOnly(transforms);
 
-        transforms["identity"] = sol::make_object(lua, TransformM{osg::Matrixf::identity()});
-        transforms["move"] = sol::overload(
-            [](const Vec3& v) { return TransformM{osg::Matrixf::translate(v)}; },
-            [](float x, float y, float z) { return TransformM{osg::Matrixf::translate(x, y, z)}; });
-        transforms["scale"] = sol::overload(
-            [](const Vec3& v) { return TransformM{osg::Matrixf::scale(v)}; },
-            [](float x, float y, float z) { return TransformM{osg::Matrixf::scale(x, y, z)}; });
-        transforms["rotate"] = [](float angle, const Vec3& axis) { return TransformQ{osg::Quat(angle, axis)}; };
-        transforms["rotateX"] = [](float angle) { return TransformQ{osg::Quat(angle, Vec3(-1, 0, 0))}; };
-        transforms["rotateY"] = [](float angle) { return TransformQ{osg::Quat(angle, Vec3(0, -1, 0))}; };
-        transforms["rotateZ"] = [](float angle) { return TransformQ{osg::Quat(angle, Vec3(0, 0, -1))}; };
+        transforms["identity"] = sol::make_object(lua, TransformM{ osg::Matrixf::identity() });
+        transforms["move"] = sol::overload([](const Vec3& v) { return TransformM{ osg::Matrixf::translate(v) }; },
+            [](float x, float y, float z) { return TransformM{ osg::Matrixf::translate(x, y, z) }; });
+        transforms["scale"] = sol::overload([](const Vec3& v) { return TransformM{ osg::Matrixf::scale(v) }; },
+            [](float x, float y, float z) { return TransformM{ osg::Matrixf::scale(x, y, z) }; });
+        transforms["rotate"] = [](float angle, const Vec3& axis) { return TransformQ{ osg::Quat(angle, axis) }; };
+        transforms["rotateX"] = [](float angle) { return TransformQ{ osg::Quat(angle, Vec3(-1, 0, 0)) }; };
+        transforms["rotateY"] = [](float angle) { return TransformQ{ osg::Quat(angle, Vec3(0, -1, 0)) }; };
+        transforms["rotateZ"] = [](float angle) { return TransformQ{ osg::Quat(angle, Vec3(0, 0, -1)) }; };
 
-        transMType[sol::meta_function::multiplication] = sol::overload(
-            [](const TransformM& a, const Vec3& b) { return a.mM.preMult(b); },
-            [](const TransformM& a, const TransformM& b) { return TransformM{b.mM * a.mM}; },
-            [](const TransformM& a, const TransformQ& b)
-            {
-                TransformM res{a.mM};
-                res.mM.preMultRotate(b.mQ);
-                return res;
-            });
-        transMType[sol::meta_function::to_string] = [](const TransformM& m)
-        {
+        transMType[sol::meta_function::multiplication]
+            = sol::overload([](const TransformM& a, const Vec3& b) { return a.mM.preMult(b); },
+                [](const TransformM& a, const TransformM& b) { return TransformM{ b.mM * a.mM }; },
+                [](const TransformM& a, const TransformQ& b) {
+                    TransformM res{ a.mM };
+                    res.mM.preMultRotate(b.mQ);
+                    return res;
+                });
+        transMType[sol::meta_function::to_string] = [](const TransformM& m) {
             osg::Vec3f trans, scale;
             osg::Quat rotation, so;
             m.mM.decompose(trans, rotation, scale, so);
@@ -171,44 +174,41 @@ namespace LuaUtil
             if (trans.length2() > 0)
                 ss << "move(" << trans.x() << ", " << trans.y() << ", " << trans.z() << ") ";
             if (rot_angle != 0)
-                ss << "rotation(angle=" << rot_angle << ", axis=("
-                    << rot_axis.x() << ", " << rot_axis.y() << ", " << rot_axis.z() << ")) ";
+                ss << "rotation(angle=" << rot_angle << ", axis=(" << rot_axis.x() << ", " << rot_axis.y() << ", "
+                   << rot_axis.z() << ")) ";
             if (scale.x() != 1 || scale.y() != 1 || scale.z() != 1)
                 ss << "scale(" << scale.x() << ", " << scale.y() << ", " << scale.z() << ") ";
             if (so_angle != 0)
-                ss << "rotation(angle=" << so_angle << ", axis=("
-                    << so_axis.x() << ", " << so_axis.y() << ", " << so_axis.z() << ")) ";
+                ss << "rotation(angle=" << so_angle << ", axis=(" << so_axis.x() << ", " << so_axis.y() << ", "
+                   << so_axis.z() << ")) ";
             ss << "}";
             return ss.str();
         };
-        transMType["inverse"] = [](const TransformM& m)
-        {
+        transMType["inverse"] = [](const TransformM& m) {
             TransformM res;
             if (!res.mM.invert_4x3(m.mM))
                 throw std::runtime_error("This Transform is not invertible");
             return res;
         };
 
-        transQType[sol::meta_function::multiplication] = sol::overload(
-            [](const TransformQ& a, const Vec3& b) { return a.mQ * b; },
-            [](const TransformQ& a, const TransformQ& b) { return TransformQ{b.mQ * a.mQ}; },
-            [](const TransformQ& a, const TransformM& b)
-            {
-                TransformM res{b};
-                res.mM.postMultRotate(a.mQ);
-                return res;
-            });
-        transQType[sol::meta_function::to_string] = [](const TransformQ& q)
-        {
+        transQType[sol::meta_function::multiplication]
+            = sol::overload([](const TransformQ& a, const Vec3& b) { return a.mQ * b; },
+                [](const TransformQ& a, const TransformQ& b) { return TransformQ{ b.mQ * a.mQ }; },
+                [](const TransformQ& a, const TransformM& b) {
+                    TransformM res{ b };
+                    res.mM.postMultRotate(a.mQ);
+                    return res;
+                });
+        transQType[sol::meta_function::to_string] = [](const TransformQ& q) {
             osg::Quat::value_type angle;
             osg::Vec3f axis;
             q.mQ.getRotate(angle, axis);
             std::stringstream ss;
-            ss << "TransformQ{ rotation(angle=" << angle << ", axis=("
-                << axis.x() << ", " << axis.y() << ", " << axis.z() << ")) }";
+            ss << "TransformQ{ rotation(angle=" << angle << ", axis=(" << axis.x() << ", " << axis.y() << ", "
+               << axis.z() << ")) }";
             return ss.str();
         };
-        transQType["inverse"] = [](const TransformQ& q) { return TransformQ{q.mQ.inverse()}; };
+        transQType["inverse"] = [](const TransformQ& q) { return TransformQ{ q.mQ.inverse() }; };
 
         // Utility functions
         util["clamp"] = [](float value, float from, float to) { return std::clamp(value, from, to); };
@@ -227,20 +227,17 @@ namespace LuaUtil
         }
         else
         {
-            util["bitOr"] = [](unsigned a, sol::variadic_args va)
-            {
+            util["bitOr"] = [](unsigned a, sol::variadic_args va) {
                 for (const auto& v : va)
                     a |= v.as<unsigned>();
                 return a;
             };
-            util["bitAnd"] = [](unsigned a, sol::variadic_args va)
-            {
+            util["bitAnd"] = [](unsigned a, sol::variadic_args va) {
                 for (const auto& v : va)
                     a &= v.as<unsigned>();
                 return a;
             };
-            util["bitXor"] = [](unsigned a, sol::variadic_args va)
-            {
+            util["bitXor"] = [](unsigned a, sol::variadic_args va) {
                 for (const auto& v : va)
                     a ^= v.as<unsigned>();
                 return a;
@@ -248,8 +245,7 @@ namespace LuaUtil
             util["bitNot"] = [](unsigned a) { return ~a; };
         }
 
-        util["loadCode"] = [](const std::string& code, const sol::table& env, sol::this_state s)
-        {
+        util["loadCode"] = [](const std::string& code, const sol::table& env, sol::this_state s) {
             sol::state_view lua(s);
             sol::load_result res = lua.load(code, "", sol::load_mode::text);
             if (!res.valid())
@@ -263,5 +259,5 @@ namespace LuaUtil
 
         return util;
     }
-    
+
 }
diff --git a/components/lua/utilpackage.hpp b/components/lua/utilpackage.hpp
index a647b682af..de47710334 100644
--- a/components/lua/utilpackage.hpp
+++ b/components/lua/utilpackage.hpp
@@ -1,10 +1,10 @@
 #ifndef COMPONENTS_LUA_UTILPACKAGE_H
 #define COMPONENTS_LUA_UTILPACKAGE_H
 
+#include <osg/Matrix>
 #include <osg/Vec2>
 #include <osg/Vec3>
 #include <osg/Vec4>
-#include <osg/Matrix>
 
 #include <sol/sol.hpp>
 
@@ -16,11 +16,23 @@ namespace LuaUtil
 
     // For performance reasons "Transform" is implemented as 2 types with the same interface.
     // Transform supports only composition, inversion, and applying to a 3d vector.
-    struct TransformM { osg::Matrixf mM; };
-    struct TransformQ { osg::Quat mQ; };
-
-    inline TransformM asTransform(const osg::Matrixf& m) { return {m}; }
-    inline TransformQ asTransform(const osg::Quat& q) { return {q}; }
+    struct TransformM
+    {
+        osg::Matrixf mM;
+    };
+    struct TransformQ
+    {
+        osg::Quat mQ;
+    };
+
+    inline TransformM asTransform(const osg::Matrixf& m)
+    {
+        return { m };
+    }
+    inline TransformQ asTransform(const osg::Quat& q)
+    {
+        return { q };
+    }
 
     sol::table initUtilPackage(sol::state&);
 
diff --git a/components/lua_ui/adapter.cpp b/components/lua_ui/adapter.cpp
index 88f282c970..2fd6365977 100644
--- a/components/lua_ui/adapter.cpp
+++ b/components/lua_ui/adapter.cpp
@@ -2,8 +2,8 @@
 
 #include <MyGUI_Gui.h>
 
-#include "element.hpp"
 #include "container.hpp"
+#include "element.hpp"
 
 namespace LuaUi
 {
@@ -19,10 +19,7 @@ namespace LuaUi
         mContainer = MyGUI::Gui::getInstancePtr()->createWidget<LuaContainer>(
             "", MyGUI::IntCoord(), MyGUI::Align::Default, "", "");
         mContainer->initialize(luaState, mContainer);
-        mContainer->onCoordChange([this](WidgetExtension* ext, MyGUI::IntCoord coord)
-        {
-            setSize(coord.size());
-        });
+        mContainer->onCoordChange([this](WidgetExtension* ext, MyGUI::IntCoord coord) { setSize(coord.size()); });
         mContainer->widget()->attachToWidget(this);
     }
 
@@ -58,4 +55,3 @@ namespace LuaUi
         mElement = nullptr;
     }
 }
-
diff --git a/components/lua_ui/adapter.hpp b/components/lua_ui/adapter.hpp
index 2cb08b7367..d699e4992f 100644
--- a/components/lua_ui/adapter.hpp
+++ b/components/lua_ui/adapter.hpp
@@ -13,18 +13,18 @@ namespace LuaUi
     {
         MYGUI_RTTI_DERIVED(LuaAdapter)
 
-        public:
-            LuaAdapter();
+    public:
+        LuaAdapter();
 
-            void attach(const std::shared_ptr<Element>& element);
-            void detach();
+        void attach(const std::shared_ptr<Element>& element);
+        void detach();
 
-        private:
-            std::shared_ptr<Element> mElement;
-            LuaContainer* mContainer;
+    private:
+        std::shared_ptr<Element> mElement;
+        LuaContainer* mContainer;
 
-            void attachElement();
-            void detachElement();
+        void attachElement();
+        void detachElement();
     };
 }
 
diff --git a/components/lua_ui/container.hpp b/components/lua_ui/container.hpp
index 1a8adee89f..79d3cd8fa8 100644
--- a/components/lua_ui/container.hpp
+++ b/components/lua_ui/container.hpp
@@ -12,15 +12,15 @@ namespace LuaUi
         MyGUI::IntSize calculateSize() override;
         void updateCoord() override;
 
-        protected:
-            void updateChildren() override;
-            MyGUI::IntSize childScalingSize() override;
-            MyGUI::IntSize templateScalingSize() override;
+    protected:
+        void updateChildren() override;
+        MyGUI::IntSize childScalingSize() override;
+        MyGUI::IntSize templateScalingSize() override;
 
-        private:
-            void updateSizeToFit();
-            MyGUI::IntSize mInnerSize;
-            MyGUI::IntSize mOuterSize;
+    private:
+        void updateSizeToFit();
+        MyGUI::IntSize mInnerSize;
+        MyGUI::IntSize mOuterSize;
     };
 }
 
diff --git a/components/lua_ui/content.hpp b/components/lua_ui/content.hpp
index e970744b3d..d16f1caef9 100644
--- a/components/lua_ui/content.hpp
+++ b/components/lua_ui/content.hpp
@@ -10,30 +10,30 @@ namespace LuaUi
 {
     class Content
     {
-        public:
-            using iterator = std::vector<sol::table>::iterator;
+    public:
+        using iterator = std::vector<sol::table>::iterator;
 
-            Content() {}
+        Content() {}
 
-            // expects a Lua array - a table with keys from 1 to n without any nil values in between
-            // any other keys are ignored
-            explicit Content(const sol::table&);
+        // expects a Lua array - a table with keys from 1 to n without any nil values in between
+        // any other keys are ignored
+        explicit Content(const sol::table&);
 
-            size_t size() const { return mOrdered.size(); }
+        size_t size() const { return mOrdered.size(); }
 
-            void assign(std::string_view name, const sol::table& table);
-            void assign(size_t index, const sol::table& table);
-            void insert(size_t index, const sol::table& table);
+        void assign(std::string_view name, const sol::table& table);
+        void assign(size_t index, const sol::table& table);
+        void insert(size_t index, const sol::table& table);
 
-            sol::table at(size_t index) const;
-            sol::table at(std::string_view name) const;
-            size_t remove(size_t index);
-            size_t remove(std::string_view name);
-            size_t indexOf(const sol::table& table);
+        sol::table at(size_t index) const;
+        sol::table at(std::string_view name) const;
+        size_t remove(size_t index);
+        size_t remove(std::string_view name);
+        size_t indexOf(const sol::table& table);
 
-        private:
-            std::map<std::string, size_t, std::less<>> mNamed;
-            std::vector<sol::table> mOrdered;
+    private:
+        std::map<std::string, size_t, std::less<>> mNamed;
+        std::vector<sol::table> mOrdered;
     };
 
 }
diff --git a/components/lua_ui/element.cpp b/components/lua_ui/element.cpp
index bd9f84fec2..1753b0c3fb 100644
--- a/components/lua_ui/element.cpp
+++ b/components/lua_ui/element.cpp
@@ -30,7 +30,8 @@ namespace LuaUi
         {
             sol::object typeField = LuaUtil::getFieldOrNil(layout, LayoutKeys::type);
             std::string type = LuaUtil::getValueOrDefault(typeField, defaultWidgetType);
-            sol::object templateTypeField = LuaUtil::getFieldOrNil(layout, LayoutKeys::templateLayout, LayoutKeys::type);
+            sol::object templateTypeField
+                = LuaUtil::getFieldOrNil(layout, LayoutKeys::templateLayout, LayoutKeys::type);
             if (templateTypeField != sol::nil)
             {
                 std::string templateType = LuaUtil::getValueOrDefault(templateTypeField, defaultWidgetType);
@@ -106,8 +107,7 @@ namespace LuaUi
             if (!eventsObj.is<sol::table>())
                 throw std::logic_error("The \"events\" layout field must be a table of callbacks");
             auto events = eventsObj.as<sol::table>();
-            events.for_each([ext](const sol::object& name, const sol::object& callback)
-            {
+            events.for_each([ext](const sol::object& name, const sol::object& callback) {
                 if (name.is<std::string>() && callback.is<LuaUtil::Callback>())
                     ext->setCallback(name.as<std::string>(), callback.as<LuaUtil::Callback>());
                 else if (!name.is<std::string>())
@@ -127,9 +127,7 @@ namespace LuaUi
 
             std::string name = layout.get_or(LayoutKeys::name, std::string());
             MyGUI::Widget* widget = MyGUI::Gui::getInstancePtr()->createWidgetT(
-                type, "",
-                MyGUI::IntCoord(), MyGUI::Align::Default,
-                std::string(), name);
+                type, "", MyGUI::IntCoord(), MyGUI::Align::Default, std::string(), name);
 
             WidgetExtension* ext = dynamic_cast<WidgetExtension*>(widget);
             if (!ext)
@@ -178,8 +176,8 @@ namespace LuaUi
         , mLayer()
         , mUpdate(false)
         , mDestroy(false)
-    {}
-
+    {
+    }
 
     std::shared_ptr<Element> Element::make(sol::table layout)
     {
diff --git a/components/lua_ui/element.hpp b/components/lua_ui/element.hpp
index 1387a1b51e..8b3a9ef4e1 100644
--- a/components/lua_ui/element.hpp
+++ b/components/lua_ui/element.hpp
@@ -9,10 +9,10 @@ namespace LuaUi
     {
         static std::shared_ptr<Element> make(sol::table layout);
 
-        template<class Callback>
+        template <class Callback>
         static void forEach(Callback callback)
         {
-            for(auto& [e, _] : sAllElements)
+            for (auto& [e, _] : sAllElements)
                 callback(e);
         }
 
@@ -34,10 +34,10 @@ namespace LuaUi
         void attachToWidget(WidgetExtension* w);
         void detachFromWidget();
 
-        private:
-            Element(sol::table layout);
-            static std::map<Element*, std::shared_ptr<Element>> sAllElements;
-            void updateAttachment();
+    private:
+        Element(sol::table layout);
+        static std::map<Element*, std::shared_ptr<Element>> sAllElements;
+        void updateAttachment();
     };
 }
 
diff --git a/components/lua_ui/flex.cpp b/components/lua_ui/flex.cpp
index b54120e78b..c55b48ddb7 100644
--- a/components/lua_ui/flex.cpp
+++ b/components/lua_ui/flex.cpp
@@ -19,15 +19,15 @@ namespace LuaUi
             {
                 switch (alignment)
                 {
-                case Alignment::Start:
-                    alignedPosition = 0;
-                    break;
-                case Alignment::Center:
-                    alignedPosition = (container - content) / 2;
-                    break;
-                case Alignment::End:
-                    alignedPosition = container - content;
-                    break;
+                    case Alignment::Start:
+                        alignedPosition = 0;
+                        break;
+                    case Alignment::Center:
+                        alignedPosition = (container - content) / 2;
+                        break;
+                    case Alignment::End:
+                        alignedPosition = container - content;
+                        break;
                 }
             }
             return alignedPosition;
@@ -43,7 +43,7 @@ namespace LuaUi
     {
         float totalGrow = 0;
         MyGUI::IntSize childrenSize;
-        for (auto* w: children())
+        for (auto* w : children())
         {
             w->clearForced();
             MyGUI::IntSize size = w->calculateSize();
@@ -91,7 +91,8 @@ namespace LuaUi
     MyGUI::IntSize LuaFlex::calculateSize()
     {
         MyGUI::IntSize size = WidgetExtension::calculateSize();
-        if (mAutoSized) {
+        if (mAutoSized)
+        {
             primary(size) = std::max(primary(size), primary(mChildrenSize));
             secondary(size) = std::max(secondary(size), secondary(mChildrenSize));
         }
diff --git a/components/lua_ui/flex.hpp b/components/lua_ui/flex.hpp
index 50a3404425..944daaec77 100644
--- a/components/lua_ui/flex.hpp
+++ b/components/lua_ui/flex.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_LUAUI_FLEX
 #define OPENMW_LUAUI_FLEX
 
-#include "widget.hpp"
 #include "alignment.hpp"
+#include "widget.hpp"
 
 namespace LuaUi
 {
@@ -10,44 +10,44 @@ namespace LuaUi
     {
         MYGUI_RTTI_DERIVED(LuaFlex)
 
-        protected:
-            MyGUI::IntSize calculateSize() override;
-            void updateProperties() override;
-            void updateChildren() override;
-            MyGUI::IntSize childScalingSize() override;
-
-            void updateCoord() override;
-
-        private:
-            bool mHorizontal;
-            bool mAutoSized;
-            MyGUI::IntSize mChildrenSize;
-            Alignment mAlign;
-            Alignment mArrange;
-
-            template<typename T>
-            T& primary(MyGUI::types::TPoint<T>& point)
-            {
-                return mHorizontal ? point.left : point.top;
-            }
-
-            template<typename T>
-            T& secondary(MyGUI::types::TPoint<T>& point)
-            {
-                return mHorizontal ? point.top : point.left;
-            }
-
-            template<typename T>
-            T& primary(MyGUI::types::TSize<T>& size)
-            {
-                return mHorizontal ? size.width : size.height;
-            }
-
-            template<typename T>
-            T& secondary(MyGUI::types::TSize<T>& size)
-            {
-                return mHorizontal ? size.height : size.width;
-            }
+    protected:
+        MyGUI::IntSize calculateSize() override;
+        void updateProperties() override;
+        void updateChildren() override;
+        MyGUI::IntSize childScalingSize() override;
+
+        void updateCoord() override;
+
+    private:
+        bool mHorizontal;
+        bool mAutoSized;
+        MyGUI::IntSize mChildrenSize;
+        Alignment mAlign;
+        Alignment mArrange;
+
+        template <typename T>
+        T& primary(MyGUI::types::TPoint<T>& point)
+        {
+            return mHorizontal ? point.left : point.top;
+        }
+
+        template <typename T>
+        T& secondary(MyGUI::types::TPoint<T>& point)
+        {
+            return mHorizontal ? point.top : point.left;
+        }
+
+        template <typename T>
+        T& primary(MyGUI::types::TSize<T>& size)
+        {
+            return mHorizontal ? size.width : size.height;
+        }
+
+        template <typename T>
+        T& secondary(MyGUI::types::TSize<T>& size)
+        {
+            return mHorizontal ? size.height : size.width;
+        }
     };
 }
 
diff --git a/components/lua_ui/image.cpp b/components/lua_ui/image.cpp
index 8319780b23..0454dd19b4 100644
--- a/components/lua_ui/image.cpp
+++ b/components/lua_ui/image.cpp
@@ -41,11 +41,9 @@ namespace LuaUi
         MyGUI::IntCoord atlasCoord;
         if (resource)
         {
-            atlasCoord = MyGUI::IntCoord(
-                static_cast<int>(resource->mOffset.x()),
-                static_cast<int>(resource->mOffset.y()),
-                static_cast<int>(resource->mSize.x()),
-                static_cast<int>(resource->mSize.y()));
+            atlasCoord
+                = MyGUI::IntCoord(static_cast<int>(resource->mOffset.x()), static_cast<int>(resource->mOffset.y()),
+                    static_cast<int>(resource->mSize.x()), static_cast<int>(resource->mSize.y()));
             setImageTexture(resource->mPath);
         }
 
@@ -57,10 +55,7 @@ namespace LuaUi
         if (texture != nullptr)
             textureSize = MyGUI::IntSize(texture->getWidth(), texture->getHeight());
 
-        mTileRect->updateSize(MyGUI::IntSize(
-            tileH ? textureSize.width : 0,
-            tileV ? textureSize.height : 0
-        ));
+        mTileRect->updateSize(MyGUI::IntSize(tileH ? textureSize.width : 0, tileV ? textureSize.height : 0));
         setImageTile(textureSize);
 
         if (atlasCoord.width == 0)
@@ -69,7 +64,7 @@ namespace LuaUi
             atlasCoord.height = textureSize.height;
         setImageCoord(atlasCoord);
 
-        setColour(propertyValue("color", MyGUI::Colour(1,1,1,1)));
+        setColour(propertyValue("color", MyGUI::Colour(1, 1, 1, 1)));
 
         WidgetExtension::updateProperties();
     }
diff --git a/components/lua_ui/image.hpp b/components/lua_ui/image.hpp
index f7df102440..1cc7b897bb 100644
--- a/components/lua_ui/image.hpp
+++ b/components/lua_ui/image.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_LUAUI_IMAGE
 #define OPENMW_LUAUI_IMAGE
 
-#include <MyGUI_TileRect.h>
 #include <MyGUI_ImageBox.h>
+#include <MyGUI_TileRect.h>
 
 #include "widget.hpp"
 
@@ -12,23 +12,23 @@ namespace LuaUi
     {
         MYGUI_RTTI_DERIVED(LuaTileRect)
 
-        public:
-            void _setAlign(const MyGUI::IntSize& _oldsize) override;
+    public:
+        void _setAlign(const MyGUI::IntSize& _oldsize) override;
 
-            void updateSize(MyGUI::IntSize tileSize) { mSetTileSize = tileSize; }
+        void updateSize(MyGUI::IntSize tileSize) { mSetTileSize = tileSize; }
 
-        protected:
-            MyGUI::IntSize mSetTileSize;
+    protected:
+        MyGUI::IntSize mSetTileSize;
     };
 
     class LuaImage : public MyGUI::ImageBox, public WidgetExtension
     {
         MYGUI_RTTI_DERIVED(LuaImage)
 
-        protected:
-            void initialize() override;
-            void updateProperties() override;
-            LuaTileRect* mTileRect;
+    protected:
+        void initialize() override;
+        void updateProperties() override;
+        LuaTileRect* mTileRect;
     };
 }
 
diff --git a/components/lua_ui/layers.cpp b/components/lua_ui/layers.cpp
index 645c44f69f..fabf4640ce 100644
--- a/components/lua_ui/layers.cpp
+++ b/components/lua_ui/layers.cpp
@@ -20,8 +20,7 @@ namespace LuaUi
             Log(Debug::Error) << "Layer \"" << name << "\" already exists";
         else
         {
-            auto layer = MyGUI::LayerManager::getInstance()
-                .createLayerAt(std::string(name), "OverlappedLayer", index);
+            auto layer = MyGUI::LayerManager::getInstance().createLayerAt(std::string(name), "OverlappedLayer", index);
             auto overlappedLayer = dynamic_cast<MyGUI::OverlappedLayer*>(layer);
             overlappedLayer->setPick(options.mInteractive);
         }
diff --git a/components/lua_ui/layers.hpp b/components/lua_ui/layers.hpp
index bb07e13c69..029ac2454a 100644
--- a/components/lua_ui/layers.hpp
+++ b/components/lua_ui/layers.hpp
@@ -14,54 +14,52 @@ namespace LuaUi
     // stores layers in a vector and their indices could change
     class Layer
     {
-        public:
-            Layer(size_t index)
-                : mName(at(index)->getName())
-                , mCachedIndex(index)
-            {}
+    public:
+        Layer(size_t index)
+            : mName(at(index)->getName())
+            , mCachedIndex(index)
+        {
+        }
 
-            const std::string& name() const noexcept { return mName; };
-            const osg::Vec2f size()
-            {
-                MyGUI::ILayer* p = refresh();
-                MyGUI::IntSize size = p->getSize();
-                return osg::Vec2f(size.width, size.height);
-            }
+        const std::string& name() const noexcept { return mName; };
+        const osg::Vec2f size()
+        {
+            MyGUI::ILayer* p = refresh();
+            MyGUI::IntSize size = p->getSize();
+            return osg::Vec2f(size.width, size.height);
+        }
 
-            struct Options
-            {
-                bool mInteractive;
-            };
+        struct Options
+        {
+            bool mInteractive;
+        };
 
-            static size_t count()
-            {
-                return MyGUI::LayerManager::getInstance().getLayerCount();
-            }
+        static size_t count() { return MyGUI::LayerManager::getInstance().getLayerCount(); }
 
-            static size_t indexOf(std::string_view name);
+        static size_t indexOf(std::string_view name);
 
-            static void insert(size_t index, std::string_view name, Options options);
+        static void insert(size_t index, std::string_view name, Options options);
 
-        private:
-            static MyGUI::ILayer* at(size_t index)
-            {
-                if (index >= count())
-                    throw std::logic_error("Invalid layer index");
-                return MyGUI::LayerManager::getInstance().getLayer(index);
-            }
+    private:
+        static MyGUI::ILayer* at(size_t index)
+        {
+            if (index >= count())
+                throw std::logic_error("Invalid layer index");
+            return MyGUI::LayerManager::getInstance().getLayer(index);
+        }
 
-            MyGUI::ILayer* refresh()
+        MyGUI::ILayer* refresh()
+        {
+            MyGUI::ILayer* p = at(mCachedIndex);
+            if (p->getName() != mName)
             {
-                MyGUI::ILayer* p = at(mCachedIndex);
-                if (p->getName() != mName)
-                {
-                    mCachedIndex = indexOf(mName);
-                    p = at(mCachedIndex);
-                }
-                return p;
+                mCachedIndex = indexOf(mName);
+                p = at(mCachedIndex);
             }
-            std::string mName;
-            size_t mCachedIndex;
+            return p;
+        }
+        std::string mName;
+        size_t mCachedIndex;
     };
 }
 
diff --git a/components/lua_ui/properties.hpp b/components/lua_ui/properties.hpp
index 56dcfa0cf9..3ef2ddc31b 100644
--- a/components/lua_ui/properties.hpp
+++ b/components/lua_ui/properties.hpp
@@ -1,23 +1,21 @@
 #ifndef OPENMW_LUAUI_PROPERTIES
 #define OPENMW_LUAUI_PROPERTIES
 
-#include <sol/sol.hpp>
-#include <MyGUI_Types.h>
 #include <MyGUI_Colour.h>
+#include <MyGUI_Types.h>
 #include <osg/Vec2>
+#include <sol/sol.hpp>
 
 #include <components/lua/luastate.hpp>
 #include <components/misc/color.hpp>
 
 namespace LuaUi
 {
-    template<typename T>
-    constexpr bool isMyGuiVector() {
-        return
-            std::is_same<T, MyGUI::IntPoint>() ||
-            std::is_same<T, MyGUI::IntSize>() ||
-            std::is_same<T, MyGUI::FloatPoint>() ||
-            std::is_same<T, MyGUI::FloatSize>();
+    template <typename T>
+    constexpr bool isMyGuiVector()
+    {
+        return std::is_same<T, MyGUI::IntPoint>() || std::is_same<T, MyGUI::IntSize>()
+            || std::is_same<T, MyGUI::FloatPoint>() || std::is_same<T, MyGUI::FloatSize>();
     }
 
     template <typename T>
@@ -27,10 +25,7 @@ namespace LuaUi
     }
 
     template <typename T, typename LuaT>
-    sol::optional<T> parseValue(
-        sol::object table,
-        std::string_view field,
-        std::string_view errorPrefix)
+    sol::optional<T> parseValue(sol::object table, std::string_view field, std::string_view errorPrefix)
     {
         sol::object opt = LuaUtil::getFieldOrNil(table, field);
         if (opt != sol::nil && !opt.is<LuaT>())
@@ -56,10 +51,7 @@ namespace LuaUi
     }
 
     template <typename T>
-    sol::optional<T> parseValue(
-        sol::object table,
-        std::string_view field,
-        std::string_view errorPrefix)
+    sol::optional<T> parseValue(sol::object table, std::string_view field, std::string_view errorPrefix)
     {
         if constexpr (isMyGuiVector<T>())
             return parseValue<T, osg::Vec2f>(table, field, errorPrefix);
@@ -70,11 +62,7 @@ namespace LuaUi
     }
 
     template <typename T>
-    T parseProperty(
-        sol::object props,
-        sol::object templateProps,
-        std::string_view field,
-        const T& defaultValue)
+    T parseProperty(sol::object props, sol::object templateProps, std::string_view field, const T& defaultValue)
     {
         auto propOptional = parseValue<T>(props, field, "Property");
         auto templateOptional = parseValue<T>(templateProps, field, "Template property");
@@ -88,10 +76,7 @@ namespace LuaUi
     }
 
     template <typename T>
-    T parseExternal(
-        sol::object external,
-        std::string_view field,
-        const T& defaultValue)
+    T parseExternal(sol::object external, std::string_view field, const T& defaultValue)
     {
         auto optional = parseValue<T>(external, field, "External value");
 
diff --git a/components/lua_ui/resources.hpp b/components/lua_ui/resources.hpp
index cabcd63bf4..7c3cec24ae 100644
--- a/components/lua_ui/resources.hpp
+++ b/components/lua_ui/resources.hpp
@@ -1,10 +1,10 @@
 #ifndef OPENMW_LUAUI_RESOURCES
 #define OPENMW_LUAUI_RESOURCES
 
+#include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
-#include <memory>
 
 #include <osg/Vec2f>
 
@@ -27,18 +27,19 @@ namespace LuaUi
 
     class ResourceManager
     {
-        public:
-            ResourceManager(const VFS::Manager* vfs)
-                : mVfs(vfs)
-            {}
-
-            std::shared_ptr<TextureResource> registerTexture(TextureData data);
-            void clear();
-
-        private:
-            const VFS::Manager* mVfs;
-            using TextureResources = std::vector<std::shared_ptr<TextureResource>>;
-            std::unordered_map<std::string, TextureResources> mTextures;
+    public:
+        ResourceManager(const VFS::Manager* vfs)
+            : mVfs(vfs)
+        {
+        }
+
+        std::shared_ptr<TextureResource> registerTexture(TextureData data);
+        void clear();
+
+    private:
+        const VFS::Manager* mVfs;
+        using TextureResources = std::vector<std::shared_ptr<TextureResource>>;
+        std::unordered_map<std::string, TextureResources> mTextures;
     };
 }
 
diff --git a/components/lua_ui/scriptsettings.cpp b/components/lua_ui/scriptsettings.cpp
index f2ab84bde0..ba0328d710 100644
--- a/components/lua_ui/scriptsettings.cpp
+++ b/components/lua_ui/scriptsettings.cpp
@@ -3,9 +3,9 @@
 #include <map>
 #include <sol/sol.hpp>
 
-#include "registerscriptsettings.hpp"
-#include "element.hpp"
 #include "adapter.hpp"
+#include "element.hpp"
+#include "registerscriptsettings.hpp"
 
 namespace LuaUi
 {
@@ -21,9 +21,7 @@ namespace LuaUi
                 Log(Debug::Warning) << "A script settings page has an empty name";
             if (!element.get())
                 Log(Debug::Warning) << "A script settings page has no UI element assigned";
-            return {
-                name, searchHints, element
-            };
+            return { name, searchHints, element };
         }
     }
 
diff --git a/components/lua_ui/scriptsettings.hpp b/components/lua_ui/scriptsettings.hpp
index 99d43bb518..ab68bde839 100644
--- a/components/lua_ui/scriptsettings.hpp
+++ b/components/lua_ui/scriptsettings.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_LUAUI_SCRIPTSETTINGS
 #define OPENMW_LUAUI_SCRIPTSETTINGS
 
+#include <memory>
 #include <string>
 #include <string_view>
-#include <memory>
 
 namespace LuaUi
 {
diff --git a/components/lua_ui/text.cpp b/components/lua_ui/text.cpp
index 9ec31834f4..e55f1750b9 100644
--- a/components/lua_ui/text.cpp
+++ b/components/lua_ui/text.cpp
@@ -6,7 +6,8 @@ namespace LuaUi
 {
     LuaText::LuaText()
         : mAutoSized(true)
-    {}
+    {
+    }
 
     void LuaText::initialize()
     {
diff --git a/components/lua_ui/text.hpp b/components/lua_ui/text.hpp
index e42b6f9935..fffe34a3ba 100644
--- a/components/lua_ui/text.hpp
+++ b/components/lua_ui/text.hpp
@@ -11,17 +11,17 @@ namespace LuaUi
     {
         MYGUI_RTTI_DERIVED(LuaText)
 
-        public:
-            LuaText();
-            void initialize() override;
-            void updateProperties() override;
-            void setCaption(const MyGUI::UString& caption) override;
+    public:
+        LuaText();
+        void initialize() override;
+        void updateProperties() override;
+        void setCaption(const MyGUI::UString& caption) override;
 
-        private:
-            bool mAutoSized;
+    private:
+        bool mAutoSized;
 
-        protected:
-            MyGUI::IntSize calculateSize() override;
+    protected:
+        MyGUI::IntSize calculateSize() override;
     };
 }
 
diff --git a/components/lua_ui/textedit.cpp b/components/lua_ui/textedit.cpp
index c6fda38416..a8c19fa8fd 100644
--- a/components/lua_ui/textedit.cpp
+++ b/components/lua_ui/textedit.cpp
@@ -61,7 +61,7 @@ namespace LuaUi
         mEditBox->detachFromWidget();
         mEditBox->attachToWidget(this);
     }
-    
+
     MyGUI::IntSize LuaTextEdit::calculateSize()
     {
         MyGUI::IntSize normalSize = WidgetExtension::calculateSize();
diff --git a/components/lua_ui/textedit.hpp b/components/lua_ui/textedit.hpp
index a9b8de1621..3492a315bc 100644
--- a/components/lua_ui/textedit.hpp
+++ b/components/lua_ui/textedit.hpp
@@ -11,20 +11,20 @@ namespace LuaUi
     {
         MYGUI_RTTI_DERIVED(LuaTextEdit)
 
-        protected:
-            void initialize() override;
-            void deinitialize() override;
-            void updateProperties() override;
-            void updateCoord() override;
-            void updateChildren() override;
-            MyGUI::IntSize calculateSize() override;
+    protected:
+        void initialize() override;
+        void deinitialize() override;
+        void updateProperties() override;
+        void updateCoord() override;
+        void updateChildren() override;
+        MyGUI::IntSize calculateSize() override;
 
-        private:
-            void textChange(MyGUI::EditBox*);
+    private:
+        void textChange(MyGUI::EditBox*);
 
-            MyGUI::EditBox* mEditBox = nullptr;
-            bool mMultiline{false};
-            bool mAutoSize{false};
+        MyGUI::EditBox* mEditBox = nullptr;
+        bool mMultiline{ false };
+        bool mAutoSize{ false };
     };
 }
 
diff --git a/components/lua_ui/util.cpp b/components/lua_ui/util.cpp
index f3cb0d288c..78237c54ea 100644
--- a/components/lua_ui/util.cpp
+++ b/components/lua_ui/util.cpp
@@ -3,13 +3,13 @@
 #include <MyGUI_FactoryManager.h>
 
 #include "adapter.hpp"
-#include "widget.hpp"
+#include "container.hpp"
+#include "flex.hpp"
+#include "image.hpp"
 #include "text.hpp"
 #include "textedit.hpp"
+#include "widget.hpp"
 #include "window.hpp"
-#include "image.hpp"
-#include "container.hpp"
-#include "flex.hpp"
 
 #include "element.hpp"
 #include "registerscriptsettings.hpp"
diff --git a/components/lua_ui/util.hpp b/components/lua_ui/util.hpp
index 3851e6c947..78daf6669c 100644
--- a/components/lua_ui/util.hpp
+++ b/components/lua_ui/util.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_LUAUI_WIDGETLIST
 #define OPENMW_LUAUI_WIDGETLIST
 
-#include <unordered_map>
 #include <string>
+#include <unordered_map>
 
 namespace LuaUi
 {
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index e3f45d90dd..ba4463a198 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -22,7 +22,8 @@ namespace LuaUi
         , mExternal(sol::nil)
         , mParent(nullptr)
         , mTemplateChild(false)
-    {}
+    {
+    }
 
     void WidgetExtension::initialize(lua_State* lua, MyGUI::Widget* self)
     {
@@ -87,7 +88,7 @@ namespace LuaUi
     void WidgetExtension::reset()
     {
         // detach all children from the slot widget, in case it gets destroyed
-        for (auto& w: mChildren)
+        for (auto& w : mChildren)
             w->widget()->detachFromWidget();
     }
 
@@ -167,7 +168,8 @@ namespace LuaUi
         return sol::make_object(lua(), keySym);
     }
 
-    sol::object WidgetExtension::mouseEvent(int left, int top, MyGUI::MouseButton button = MyGUI::MouseButton::None) const
+    sol::object WidgetExtension::mouseEvent(
+        int left, int top, MyGUI::MouseButton button = MyGUI::MouseButton::None) const
     {
         osg::Vec2f position(left, top);
         MyGUI::IntPoint absolutePosition = mWidget->getAbsolutePosition();
@@ -246,7 +248,8 @@ namespace LuaUi
         mForcedCoord = size;
     }
 
-    void WidgetExtension::clearForced() {
+    void WidgetExtension::clearForced()
+    {
         mForcePosition = false;
         mForceSize = false;
     }
@@ -362,7 +365,7 @@ namespace LuaUi
             });
         }
         else
-            propagateEvent("keyPress", [code](auto w){ return w->keyEvent(code); });
+            propagateEvent("keyPress", [code](auto w) { return w->keyEvent(code); });
     }
 
     void WidgetExtension::keyRelease(MyGUI::Widget*, MyGUI::KeyCode code)
@@ -382,12 +385,12 @@ namespace LuaUi
 
     void WidgetExtension::mouseClick(MyGUI::Widget* _widget)
     {
-        propagateEvent("mouseClick", [](auto){ return sol::nil; });
+        propagateEvent("mouseClick", [](auto) { return sol::nil; });
     }
 
     void WidgetExtension::mouseDoubleClick(MyGUI::Widget* _widget)
     {
-        propagateEvent("mouseDoubleClick", [](auto){ return sol::nil; });
+        propagateEvent("mouseDoubleClick", [](auto) { return sol::nil; });
     }
 
     void WidgetExtension::mousePress(MyGUI::Widget*, int left, int top, MyGUI::MouseButton button)
@@ -402,11 +405,11 @@ namespace LuaUi
 
     void WidgetExtension::focusGain(MyGUI::Widget*, MyGUI::Widget*)
     {
-        propagateEvent("focusGain", [](auto){ return sol::nil; });
+        propagateEvent("focusGain", [](auto) { return sol::nil; });
     }
 
     void WidgetExtension::focusLoss(MyGUI::Widget*, MyGUI::Widget*)
     {
-        propagateEvent("focusLoss", [](auto){ return sol::nil; });
+        propagateEvent("focusLoss", [](auto) { return sol::nil; });
     }
 }
diff --git a/components/lua_ui/widget.hpp b/components/lua_ui/widget.hpp
index 3285f629ac..3f34f6ec80 100644
--- a/components/lua_ui/widget.hpp
+++ b/components/lua_ui/widget.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_LUAUI_WIDGET
 #define OPENMW_LUAUI_WIDGET
 
-#include <map>
 #include <functional>
+#include <map>
 
 #include <MyGUI_Widget.h>
 #include <sol/sol.hpp>
@@ -14,10 +14,10 @@
 namespace LuaUi
 {
     /*
-    * extends MyGUI::Widget and its child classes
-    * memory ownership is controlled by MyGUI
-    * it is important not to call any WidgetExtension methods after destroying the MyGUI::Widget
-    */
+     * extends MyGUI::Widget and its child classes
+     * memory ownership is controlled by MyGUI
+     * it is important not to call any WidgetExtension methods after destroying the MyGUI::Widget
+     */
     class WidgetExtension
     {
     public:
@@ -85,7 +85,7 @@ namespace LuaUi
         virtual MyGUI::IntSize childScalingSize();
         virtual MyGUI::IntSize templateScalingSize();
 
-        template<typename T>
+        template <typename T>
         T propertyValue(std::string_view name, const T& defaultValue)
         {
             return parseProperty(mProperties, mTemplateProperties, name, defaultValue);
@@ -96,12 +96,12 @@ namespace LuaUi
 
         virtual void updateTemplate();
         virtual void updateProperties();
-        virtual void updateChildren() {};
+        virtual void updateChildren(){};
 
         lua_State* lua() const { return mLua; }
 
         void triggerEvent(std::string_view name, sol::object argument) const;
-        template<class ArgFactory>
+        template <class ArgFactory>
         void propagateEvent(std::string_view name, const ArgFactory& argumentFactory) const
         {
             const WidgetExtension* w = this;
diff --git a/components/lua_ui/window.cpp b/components/lua_ui/window.cpp
index 5dbf3f5219..bccd2f5a58 100644
--- a/components/lua_ui/window.cpp
+++ b/components/lua_ui/window.cpp
@@ -8,7 +8,8 @@ namespace LuaUi
 {
     LuaWindow::LuaWindow()
         : mCaption(nullptr)
-    {}
+    {
+    }
 
     void LuaWindow::updateTemplate()
     {
@@ -56,8 +57,7 @@ namespace LuaUi
         WidgetExtension* ext = mActionWidgets[sender];
 
         mChangeScale = MyGUI::IntCoord(
-            ext->externalValue("move", MyGUI::IntPoint(1, 1)),
-            ext->externalValue("resize", MyGUI::IntSize(0, 0)));
+            ext->externalValue("move", MyGUI::IntPoint(1, 1)), ext->externalValue("resize", MyGUI::IntSize(0, 0)));
     }
 
     void LuaWindow::notifyMouseDrag(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id)
diff --git a/components/lua_ui/window.hpp b/components/lua_ui/window.hpp
index 8c466e73d1..962607d81e 100644
--- a/components/lua_ui/window.hpp
+++ b/components/lua_ui/window.hpp
@@ -3,8 +3,8 @@
 
 #include <optional>
 
-#include "widget.hpp"
 #include "text.hpp"
+#include "widget.hpp"
 
 namespace LuaUi
 {
@@ -12,22 +12,22 @@ namespace LuaUi
     {
         MYGUI_RTTI_DERIVED(LuaWindow)
 
-        public:
-            LuaWindow();
-            void updateTemplate() override;
-            void updateProperties() override;
+    public:
+        LuaWindow();
+        void updateTemplate() override;
+        void updateProperties() override;
 
-        private:
-            LuaText* mCaption;
-            std::map<MyGUI::Widget*, WidgetExtension*> mActionWidgets;
-            MyGUI::IntPoint mPreviousMouse;
-            MyGUI::IntCoord mChangeScale;
+    private:
+        LuaText* mCaption;
+        std::map<MyGUI::Widget*, WidgetExtension*> mActionWidgets;
+        MyGUI::IntPoint mPreviousMouse;
+        MyGUI::IntCoord mChangeScale;
 
-            MyGUI::IntCoord mMoveResize;
+        MyGUI::IntCoord mMoveResize;
 
-        protected:
-            void notifyMousePress(MyGUI::Widget*, int, int, MyGUI::MouseButton);
-            void notifyMouseDrag(MyGUI::Widget*, int, int, MyGUI::MouseButton);
+    protected:
+        void notifyMousePress(MyGUI::Widget*, int, int, MyGUI::MouseButton);
+        void notifyMouseDrag(MyGUI::Widget*, int, int, MyGUI::MouseButton);
     };
 }
 
diff --git a/components/misc/algorithm.hpp b/components/misc/algorithm.hpp
index 536b2b3f74..9c914866db 100644
--- a/components/misc/algorithm.hpp
+++ b/components/misc/algorithm.hpp
@@ -12,11 +12,7 @@ namespace Misc
     inline Iterator forEachUnique(Iterator begin, Iterator end, BinaryPredicate predicate, Function function)
     {
         static_assert(
-            std::is_base_of_v<
-                std::forward_iterator_tag,
-                typename std::iterator_traits<Iterator>::iterator_category
-            >
-        );
+            std::is_base_of_v<std::forward_iterator_tag, typename std::iterator_traits<Iterator>::iterator_category>);
         if (begin == end)
             return begin;
         function(*begin);
@@ -35,20 +31,20 @@ namespace Misc
     }
 
     /// Performs a binary search on a sorted container for a string that 'key' starts with
-    template<typename Iterator, typename T>
+    template <typename Iterator, typename T>
     static Iterator partialBinarySearch(Iterator begin, Iterator end, const T& key)
     {
         const Iterator notFound = end;
 
-        while(begin < end)
+        while (begin < end)
         {
             const Iterator middle = begin + (std::distance(begin, end) / 2);
 
             int comp = Misc::StringUtils::ciCompareLen((*middle), key, (*middle).size());
 
-            if(comp == 0)
+            if (comp == 0)
                 return middle;
-            else if(comp > 0)
+            else if (comp > 0)
                 end = middle;
             else
                 begin = middle + 1;
diff --git a/components/misc/barrier.hpp b/components/misc/barrier.hpp
index 9738fbb7fa..7404af9164 100644
--- a/components/misc/barrier.hpp
+++ b/components/misc/barrier.hpp
@@ -9,40 +9,43 @@ namespace Misc
     /// @brief Synchronize several threads
     class Barrier
     {
-        public:
-            /// @param count number of threads to wait on
-            explicit Barrier(unsigned count) : mThreadCount(count), mRendezvousCount(0), mGeneration(0)
+    public:
+        /// @param count number of threads to wait on
+        explicit Barrier(unsigned count)
+            : mThreadCount(count)
+            , mRendezvousCount(0)
+            , mGeneration(0)
+        {
+        }
+
+        /// @brief stop execution of threads until count distinct threads reach this point
+        /// @param func callable to be executed once after all threads have met
+        template <class Callback>
+        void wait(Callback&& func)
+        {
+            std::unique_lock lock(mMutex);
+
+            ++mRendezvousCount;
+            const unsigned int currentGeneration = mGeneration;
+            if (mRendezvousCount == mThreadCount || mThreadCount == 0)
             {
+                ++mGeneration;
+                mRendezvousCount = 0;
+                func();
+                mRendezvous.notify_all();
             }
-
-            /// @brief stop execution of threads until count distinct threads reach this point
-            /// @param func callable to be executed once after all threads have met
-            template <class Callback>
-            void wait(Callback&& func)
+            else
             {
-                std::unique_lock lock(mMutex);
-
-                ++mRendezvousCount;
-                const unsigned int currentGeneration = mGeneration;
-                if (mRendezvousCount == mThreadCount || mThreadCount == 0)
-                {
-                    ++mGeneration;
-                    mRendezvousCount = 0;
-                    func();
-                    mRendezvous.notify_all();
-                }
-                else
-                {
-                    mRendezvous.wait(lock, [&]() { return mGeneration != currentGeneration; });
-                }
+                mRendezvous.wait(lock, [&]() { return mGeneration != currentGeneration; });
             }
+        }
 
-        private:
-            unsigned int mThreadCount;
-            unsigned int mRendezvousCount;
-            unsigned int mGeneration;
-            mutable std::mutex mMutex;
-            std::condition_variable mRendezvous;
+    private:
+        unsigned int mThreadCount;
+        unsigned int mRendezvousCount;
+        unsigned int mGeneration;
+        mutable std::mutex mMutex;
+        std::condition_variable mRendezvous;
     };
 }
 
diff --git a/components/misc/budgetmeasurement.hpp b/components/misc/budgetmeasurement.hpp
index d9ac866975..647ab3e61a 100644
--- a/components/misc/budgetmeasurement.hpp
+++ b/components/misc/budgetmeasurement.hpp
@@ -7,37 +7,38 @@
 namespace Misc
 {
 
-class BudgetMeasurement
-{
-    std::array<float, 4> mBudgetHistory;
-    std::array<unsigned int, 4> mBudgetStepCount;
-
-public:
-    BudgetMeasurement(const float default_expense)
-    {
-        mBudgetHistory = {default_expense, default_expense, default_expense, default_expense};
-        mBudgetStepCount = {1, 1, 1, 1};
-    }
-
-    void reset(const float default_expense)
-    {
-        mBudgetHistory = {default_expense, default_expense, default_expense, default_expense};
-        mBudgetStepCount = {1, 1, 1, 1};
-    }
-
-    void update(double delta, unsigned int stepCount, size_t cursor)
-    {
-        mBudgetHistory[cursor%4] = delta;
-        mBudgetStepCount[cursor%4] = stepCount;
-    }
-
-    double get() const
+    class BudgetMeasurement
     {
-        float sum = (mBudgetHistory[0] + mBudgetHistory[1] + mBudgetHistory[2] + mBudgetHistory[3]);
-        unsigned int stepCountSum = (mBudgetStepCount[0] + mBudgetStepCount[1] + mBudgetStepCount[2] + mBudgetStepCount[3]);
-        return sum/float(stepCountSum);
-    }
-};
+        std::array<float, 4> mBudgetHistory;
+        std::array<unsigned int, 4> mBudgetStepCount;
+
+    public:
+        BudgetMeasurement(const float default_expense)
+        {
+            mBudgetHistory = { default_expense, default_expense, default_expense, default_expense };
+            mBudgetStepCount = { 1, 1, 1, 1 };
+        }
+
+        void reset(const float default_expense)
+        {
+            mBudgetHistory = { default_expense, default_expense, default_expense, default_expense };
+            mBudgetStepCount = { 1, 1, 1, 1 };
+        }
+
+        void update(double delta, unsigned int stepCount, size_t cursor)
+        {
+            mBudgetHistory[cursor % 4] = delta;
+            mBudgetStepCount[cursor % 4] = stepCount;
+        }
+
+        double get() const
+        {
+            float sum = (mBudgetHistory[0] + mBudgetHistory[1] + mBudgetHistory[2] + mBudgetHistory[3]);
+            unsigned int stepCountSum
+                = (mBudgetStepCount[0] + mBudgetStepCount[1] + mBudgetStepCount[2] + mBudgetStepCount[3]);
+            return sum / float(stepCountSum);
+        }
+    };
 
 }
 
diff --git a/components/misc/color.cpp b/components/misc/color.cpp
index 56520c5d74..2891004749 100644
--- a/components/misc/color.cpp
+++ b/components/misc/color.cpp
@@ -1,9 +1,9 @@
 #include "color.hpp"
 
-#include <charconv>
+#include <algorithm>
 #include <array>
+#include <charconv>
 #include <sstream>
-#include <algorithm>
 
 namespace Misc
 {
@@ -12,7 +12,8 @@ namespace Misc
         , mG(std::clamp(g, 0.f, 1.f))
         , mB(std::clamp(b, 0.f, 1.f))
         , mA(std::clamp(a, 0.f, 1.f))
-    {}
+    {
+    }
 
     std::string Color::toString() const
     {
diff --git a/components/misc/color.hpp b/components/misc/color.hpp
index 932d261fad..f23448c98f 100644
--- a/components/misc/color.hpp
+++ b/components/misc/color.hpp
@@ -7,27 +7,27 @@ namespace Misc
 {
     class Color
     {
-        public:
-            Color(float r, float g, float b, float a);
+    public:
+        Color(float r, float g, float b, float a);
 
-            float r() const { return mR; }
-            float g() const { return mG; }
-            float b() const { return mB; }
-            float a() const { return mA; }
+        float r() const { return mR; }
+        float g() const { return mG; }
+        float b() const { return mB; }
+        float a() const { return mA; }
 
-            std::string toString() const;
+        std::string toString() const;
 
-            static Color fromHex(std::string_view hex);
+        static Color fromHex(std::string_view hex);
 
-            std::string toHex() const;
+        std::string toHex() const;
 
-            friend bool operator==(const Color& l, const Color& r);
+        friend bool operator==(const Color& l, const Color& r);
 
-        private:
-            float mR;
-            float mG;
-            float mB;
-            float mA;
+    private:
+        float mR;
+        float mG;
+        float mB;
+        float mA;
     };
 }
 
diff --git a/components/misc/compression.cpp b/components/misc/compression.cpp
index 7f76d0900c..b32a29f5d3 100644
--- a/components/misc/compression.cpp
+++ b/components/misc/compression.cpp
@@ -13,13 +13,11 @@ namespace Misc
     std::vector<std::byte> compress(const std::vector<std::byte>& data)
     {
         const std::size_t originalSize = data.size();
-        std::vector<std::byte> result(static_cast<std::size_t>(LZ4_compressBound(static_cast<int>(originalSize)) + sizeof(originalSize)));
-        const int size = LZ4_compress_default(
-            reinterpret_cast<const char*>(data.data()),
-            reinterpret_cast<char*>(result.data()) + sizeof(originalSize),
-            static_cast<int>(data.size()),
-            static_cast<int>(result.size() - sizeof(originalSize))
-        );
+        std::vector<std::byte> result(
+            static_cast<std::size_t>(LZ4_compressBound(static_cast<int>(originalSize)) + sizeof(originalSize)));
+        const int size = LZ4_compress_default(reinterpret_cast<const char*>(data.data()),
+            reinterpret_cast<char*>(result.data()) + sizeof(originalSize), static_cast<int>(data.size()),
+            static_cast<int>(result.size() - sizeof(originalSize)));
         if (size == 0)
             throw std::runtime_error("Failed to compress");
         std::memcpy(result.data(), &originalSize, sizeof(originalSize));
@@ -32,17 +30,14 @@ namespace Misc
         std::size_t originalSize;
         std::memcpy(&originalSize, data.data(), sizeof(originalSize));
         std::vector<std::byte> result(originalSize);
-        const int size = LZ4_decompress_safe(
-            reinterpret_cast<const char*>(data.data()) + sizeof(originalSize),
-            reinterpret_cast<char*>(result.data()),
-            static_cast<int>(data.size() - sizeof(originalSize)),
-            static_cast<int>(result.size())
-        );
+        const int size = LZ4_decompress_safe(reinterpret_cast<const char*>(data.data()) + sizeof(originalSize),
+            reinterpret_cast<char*>(result.data()), static_cast<int>(data.size() - sizeof(originalSize)),
+            static_cast<int>(result.size()));
         if (size < 0)
             throw std::runtime_error("Failed to decompress");
         if (originalSize != static_cast<std::size_t>(size))
-            throw std::runtime_error("Size of decompressed data (" + std::to_string(size)
-                                     + ") doesn't match stored (" + std::to_string(originalSize) + ")");
+            throw std::runtime_error("Size of decompressed data (" + std::to_string(size) + ") doesn't match stored ("
+                + std::to_string(originalSize) + ")");
         return result;
     }
 }
diff --git a/components/misc/constants.hpp b/components/misc/constants.hpp
index 2f4d4f8a18..753613ab86 100644
--- a/components/misc/constants.hpp
+++ b/components/misc/constants.hpp
@@ -6,41 +6,41 @@
 namespace Constants
 {
 
-// The game uses 64 units per yard
-const float UnitsPerMeter = 69.99125109f;
-const float UnitsPerFoot = 21.33333333f;
+    // The game uses 64 units per yard
+    const float UnitsPerMeter = 69.99125109f;
+    const float UnitsPerFoot = 21.33333333f;
 
-// Sound speed in meters per second
-const float SoundSpeedInAir = 343.3f;
-const float SoundSpeedUnderwater = 1484.0f;
+    // Sound speed in meters per second
+    const float SoundSpeedInAir = 343.3f;
+    const float SoundSpeedUnderwater = 1484.0f;
 
-// Gravity constant in m/sec^2
-// Note: 8.96 m/sec^2 = 9.8 yards/sec^2
-// Probaly original engine's developers just forgot
-// that their engine uses yards instead of meters
-// and used standart gravity value as it is
-const float GravityConst = 8.96f;
+    // Gravity constant in m/sec^2
+    // Note: 8.96 m/sec^2 = 9.8 yards/sec^2
+    // Probaly original engine's developers just forgot
+    // that their engine uses yards instead of meters
+    // and used standart gravity value as it is
+    const float GravityConst = 8.96f;
 
-// Size of one exterior cell in game units
-const int CellSizeInUnits = 8192;
+    // Size of one exterior cell in game units
+    const int CellSizeInUnits = 8192;
 
-// Size of active cell grid in cells (it is a square with the (2 * CellGridRadius + 1) cells side)
-const int CellGridRadius = 1;
+    // Size of active cell grid in cells (it is a square with the (2 * CellGridRadius + 1) cells side)
+    const int CellGridRadius = 1;
 
-// A label to mark night/day visual switches
-const std::string NightDayLabel = "NightDaySwitch";
+    // A label to mark night/day visual switches
+    const std::string NightDayLabel = "NightDaySwitch";
 
-// A label to mark visual switches for herbalism feature
-const std::string HerbalismLabel = "HerbalismSwitch";
+    // A label to mark visual switches for herbalism feature
+    const std::string HerbalismLabel = "HerbalismSwitch";
 
-// Percentage height at which projectiles are spawned from an actor
-const float TorsoHeight = 0.75f;
+    // Percentage height at which projectiles are spawned from an actor
+    const float TorsoHeight = 0.75f;
 
-static constexpr float sStepSizeUp = 34.0f;
-static constexpr float sMaxSlope = 46.0f;
+    static constexpr float sStepSizeUp = 34.0f;
+    static constexpr float sMaxSlope = 46.0f;
 
-// Identifier for main scene camera
-const std::string SceneCamera = "SceneCam";
+    // Identifier for main scene camera
+    const std::string SceneCamera = "SceneCam";
 
 }
 
diff --git a/components/misc/convert.hpp b/components/misc/convert.hpp
index 0b84c32059..a66fac9125 100644
--- a/components/misc/convert.hpp
+++ b/components/misc/convert.hpp
@@ -4,11 +4,11 @@
 #include <components/esm/defs.hpp>
 #include <components/esm3/loadpgrd.hpp>
 
+#include <LinearMath/btQuaternion.h>
 #include <LinearMath/btTransform.h>
 #include <LinearMath/btVector3.h>
-#include <LinearMath/btQuaternion.h>
-#include <osg/Vec3f>
 #include <osg/Quat>
+#include <osg/Vec3f>
 
 namespace Misc::Convert
 {
@@ -44,8 +44,7 @@ namespace Misc::Convert
 
     inline osg::Quat makeOsgQuat(const float (&rotation)[3])
     {
-        return osg::Quat(rotation[2], osg::Vec3f(0, 0, -1))
-            * osg::Quat(rotation[1], osg::Vec3f(0, -1, 0))
+        return osg::Quat(rotation[2], osg::Vec3f(0, 0, -1)) * osg::Quat(rotation[1], osg::Vec3f(0, -1, 0))
             * osg::Quat(rotation[0], osg::Vec3f(-1, 0, 0));
     }
 
@@ -56,8 +55,7 @@ namespace Misc::Convert
 
     inline btQuaternion makeBulletQuaternion(const float (&rotation)[3])
     {
-        return btQuaternion(btVector3(0, 0, -1), rotation[2])
-            * btQuaternion(btVector3(0, -1, 0), rotation[1])
+        return btQuaternion(btVector3(0, 0, -1), rotation[2]) * btQuaternion(btVector3(0, -1, 0), rotation[1])
             * btQuaternion(btVector3(-1, 0, 0), rotation[0]);
     }
 
diff --git a/components/misc/coordinateconverter.hpp b/components/misc/coordinateconverter.hpp
index 42e772c16d..0750c2221b 100644
--- a/components/misc/coordinateconverter.hpp
+++ b/components/misc/coordinateconverter.hpp
@@ -11,57 +11,54 @@ namespace Misc
     /// \brief convert coordinates between world and local cell
     class CoordinateConverter
     {
-        public:
-            CoordinateConverter(bool exterior, int cellX, int cellY)
-                : mCellX(exterior ? cellX * ESM::Land::REAL_SIZE : 0),
-                  mCellY(exterior ? cellY * ESM::Land::REAL_SIZE : 0)
-            {
-            }
+    public:
+        CoordinateConverter(bool exterior, int cellX, int cellY)
+            : mCellX(exterior ? cellX * ESM::Land::REAL_SIZE : 0)
+            , mCellY(exterior ? cellY * ESM::Land::REAL_SIZE : 0)
+        {
+        }
 
-            explicit CoordinateConverter(const ESM::Cell* cell)
-                : CoordinateConverter(cell->isExterior(), cell->mData.mX, cell->mData.mY)
-            {
-            }
+        explicit CoordinateConverter(const ESM::Cell* cell)
+            : CoordinateConverter(cell->isExterior(), cell->mData.mX, cell->mData.mY)
+        {
+        }
 
-            /// in-place conversion from local to world
-            void toWorld(ESM::Pathgrid::Point& point) const
-            {
-                point.mX += mCellX;
-                point.mY += mCellY;
-            }
+        /// in-place conversion from local to world
+        void toWorld(ESM::Pathgrid::Point& point) const
+        {
+            point.mX += mCellX;
+            point.mY += mCellY;
+        }
 
-            ESM::Pathgrid::Point toWorldPoint(ESM::Pathgrid::Point point) const
-            {
-                toWorld(point);
-                return point;
-            }
+        ESM::Pathgrid::Point toWorldPoint(ESM::Pathgrid::Point point) const
+        {
+            toWorld(point);
+            return point;
+        }
 
-            /// in-place conversion from local to world
-            void toWorld(osg::Vec3f& point) const
-            {
-                point.x() += static_cast<float>(mCellX);
-                point.y() += static_cast<float>(mCellY);
-            }
+        /// in-place conversion from local to world
+        void toWorld(osg::Vec3f& point) const
+        {
+            point.x() += static_cast<float>(mCellX);
+            point.y() += static_cast<float>(mCellY);
+        }
 
-            /// in-place conversion from world to local
-            void toLocal(osg::Vec3f& point) const
-            {
-                point.x() -= static_cast<float>(mCellX);
-                point.y() -= static_cast<float>(mCellY);
-            }
+        /// in-place conversion from world to local
+        void toLocal(osg::Vec3f& point) const
+        {
+            point.x() -= static_cast<float>(mCellX);
+            point.y() -= static_cast<float>(mCellY);
+        }
 
-            osg::Vec3f toLocalVec3(const osg::Vec3f& point) const
-            {
-                return osg::Vec3f(
-                    point.x() - static_cast<float>(mCellX),
-                    point.y() - static_cast<float>(mCellY),
-                    point.z()
-                );
-            }
+        osg::Vec3f toLocalVec3(const osg::Vec3f& point) const
+        {
+            return osg::Vec3f(
+                point.x() - static_cast<float>(mCellX), point.y() - static_cast<float>(mCellY), point.z());
+        }
 
-        private:
-            int mCellX;
-            int mCellY;
+    private:
+        int mCellX;
+        int mCellY;
     };
 }
 
diff --git a/components/misc/endianness.hpp b/components/misc/endianness.hpp
index ad8aba18c7..5887c9b155 100644
--- a/components/misc/endianness.hpp
+++ b/components/misc/endianness.hpp
@@ -40,13 +40,13 @@ namespace Misc
         }
     }
 
-    #ifdef _WIN32
+#ifdef _WIN32
     constexpr bool IS_LITTLE_ENDIAN = true;
     constexpr bool IS_BIG_ENDIAN = false;
-    #else
+#else
     constexpr bool IS_LITTLE_ENDIAN = __BYTE_ORDER__ != __ORDER_BIG_ENDIAN__;
     constexpr bool IS_BIG_ENDIAN = __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__;
-    #endif
+#endif
 
     // Usage: swapEndiannessInplaceIf<IS_BIG_ENDIAN>(v)  - native to little-endian or back
     //        swapEndiannessInplaceIf<IS_LITTLE_ENDIAN>(v)  - native to big-endian or back
diff --git a/components/misc/frameratelimiter.hpp b/components/misc/frameratelimiter.hpp
index e3689cbcf4..14ec625bfd 100644
--- a/components/misc/frameratelimiter.hpp
+++ b/components/misc/frameratelimiter.hpp
@@ -8,41 +8,39 @@ namespace Misc
 {
     class FrameRateLimiter
     {
-        public:
-            template <class Rep, class Ratio>
-            explicit FrameRateLimiter(std::chrono::duration<Rep, Ratio> maxFrameDuration,
-                                      std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now())
-                : mMaxFrameDuration(std::chrono::duration_cast<std::chrono::steady_clock::duration>(maxFrameDuration))
-                , mLastMeasurement(now)
-                , mLastFrameDuration(0)
-            {}
+    public:
+        template <class Rep, class Ratio>
+        explicit FrameRateLimiter(std::chrono::duration<Rep, Ratio> maxFrameDuration,
+            std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now())
+            : mMaxFrameDuration(std::chrono::duration_cast<std::chrono::steady_clock::duration>(maxFrameDuration))
+            , mLastMeasurement(now)
+            , mLastFrameDuration(0)
+        {
+        }
 
-            std::chrono::steady_clock::duration getLastFrameDuration() const
+        std::chrono::steady_clock::duration getLastFrameDuration() const { return mLastFrameDuration; }
+
+        void limit(std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now())
+        {
+            const auto passed = now - mLastMeasurement;
+            const auto left = mMaxFrameDuration - passed;
+            if (left > left.zero())
             {
-                return mLastFrameDuration;
+                std::this_thread::sleep_for(left);
+                mLastMeasurement = now + left;
+                mLastFrameDuration = mMaxFrameDuration;
             }
-
-            void limit(std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now())
+            else
             {
-                const auto passed = now - mLastMeasurement;
-                const auto left = mMaxFrameDuration - passed;
-                if (left > left.zero())
-                {
-                    std::this_thread::sleep_for(left);
-                    mLastMeasurement = now + left;
-                    mLastFrameDuration = mMaxFrameDuration;
-                }
-                else
-                {
-                    mLastMeasurement = now;
-                    mLastFrameDuration = passed;
-                }
+                mLastMeasurement = now;
+                mLastFrameDuration = passed;
             }
+        }
 
-        private:
-            std::chrono::steady_clock::duration mMaxFrameDuration;
-            std::chrono::steady_clock::time_point mLastMeasurement;
-            std::chrono::steady_clock::duration mLastFrameDuration;
+    private:
+        std::chrono::steady_clock::duration mMaxFrameDuration;
+        std::chrono::steady_clock::time_point mLastMeasurement;
+        std::chrono::steady_clock::duration mLastFrameDuration;
     };
 
     inline Misc::FrameRateLimiter makeFrameRateLimiter(float frameRateLimit)
diff --git a/components/misc/guarded.hpp b/components/misc/guarded.hpp
index a06789773d..41e50d0f4a 100644
--- a/components/misc/guarded.hpp
+++ b/components/misc/guarded.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_COMPONENTS_MISC_GUARDED_H
 #define OPENMW_COMPONENTS_MISC_GUARDED_H
 
-#include <mutex>
-#include <memory>
 #include <condition_variable>
+#include <memory>
+#include <mutex>
 #include <type_traits>
 
 namespace Misc
@@ -11,86 +11,79 @@ namespace Misc
     template <class T>
     class Locked
     {
-        public:
-            Locked(std::mutex& mutex, std::remove_reference_t<T>& value)
-                : mLock(mutex), mValue(value)
-            {}
-
-            std::remove_reference_t<T>& get() const
-            {
-                return mValue.get();
-            }
-
-            std::remove_reference_t<T>* operator ->() const
-            {
-                return &get();
-            }
-
-            std::remove_reference_t<T>& operator *() const
-            {
-                return get();
-            }
-
-        private:
-            std::unique_lock<std::mutex> mLock;
-            std::reference_wrapper<std::remove_reference_t<T>> mValue;
+    public:
+        Locked(std::mutex& mutex, std::remove_reference_t<T>& value)
+            : mLock(mutex)
+            , mValue(value)
+        {
+        }
+
+        std::remove_reference_t<T>& get() const { return mValue.get(); }
+
+        std::remove_reference_t<T>* operator->() const { return &get(); }
+
+        std::remove_reference_t<T>& operator*() const { return get(); }
+
+    private:
+        std::unique_lock<std::mutex> mLock;
+        std::reference_wrapper<std::remove_reference_t<T>> mValue;
     };
 
     template <class T>
     class ScopeGuarded
     {
-        public:
-            ScopeGuarded()
-                : mMutex()
-                , mValue()
-            {}
-
-            ScopeGuarded(const T& value)
-                : mMutex()
-                , mValue(value)
-            {}
-
-            ScopeGuarded(T&& value)
-                : mMutex()
-                , mValue(std::move(value))
-            {}
-
-            template <class ... Args>
-            ScopeGuarded(Args&& ... args)
-                : mMutex()
-                , mValue(std::forward<Args>(args) ...)
-            {}
-
-            ScopeGuarded(const ScopeGuarded& other)
-                : mMutex()
-                , mValue(other.lock().get())
-            {}
-
-            ScopeGuarded(ScopeGuarded&& other)
-                : mMutex()
-                , mValue(std::move(other.lock().get()))
-            {}
-
-            Locked<T> lock()
-            {
-                return Locked<T>(mMutex, mValue);
-            }
-
-            Locked<const T> lockConst() const
-            {
-                return Locked<const T>(mMutex, mValue);
-            }
-
-            template <class Predicate>
-            void wait(std::condition_variable& cv, Predicate&& predicate)
-            {
-                std::unique_lock<std::mutex> lock(mMutex);
-                cv.wait(lock, [&] { return predicate(mValue); });
-            }
-
-        private:
-            mutable std::mutex mMutex;
-            T mValue;
+    public:
+        ScopeGuarded()
+            : mMutex()
+            , mValue()
+        {
+        }
+
+        ScopeGuarded(const T& value)
+            : mMutex()
+            , mValue(value)
+        {
+        }
+
+        ScopeGuarded(T&& value)
+            : mMutex()
+            , mValue(std::move(value))
+        {
+        }
+
+        template <class... Args>
+        ScopeGuarded(Args&&... args)
+            : mMutex()
+            , mValue(std::forward<Args>(args)...)
+        {
+        }
+
+        ScopeGuarded(const ScopeGuarded& other)
+            : mMutex()
+            , mValue(other.lock().get())
+        {
+        }
+
+        ScopeGuarded(ScopeGuarded&& other)
+            : mMutex()
+            , mValue(std::move(other.lock().get()))
+        {
+        }
+
+        Locked<T> lock() { return Locked<T>(mMutex, mValue); }
+
+        Locked<const T> lockConst() const { return Locked<const T>(mMutex, mValue); }
+
+        template <class Predicate>
+        void wait(std::condition_variable& cv, Predicate&& predicate)
+        {
+            std::unique_lock<std::mutex> lock(mMutex);
+            cv.wait(lock, [&] { return predicate(mValue); });
+        }
+
+    private:
+        mutable std::mutex mMutex;
+        T mValue;
     };
 }
 
diff --git a/components/misc/hash.hpp b/components/misc/hash.hpp
index 861df73772..461acee303 100644
--- a/components/misc/hash.hpp
+++ b/components/misc/hash.hpp
@@ -13,7 +13,7 @@ namespace Misc
     {
         static_assert(sizeof(Seed) >= sizeof(std::size_t), "Resulting hash will be truncated");
         std::hash<T> hasher;
-        seed ^= static_cast<Seed>(hasher(v) + 0x9e3779b9 + (seed<<6) + (seed>>2));
+        seed ^= static_cast<Seed>(hasher(v) + 0x9e3779b9 + (seed << 6) + (seed >> 2));
     }
 }
 
diff --git a/components/misc/helpviewer.cpp b/components/misc/helpviewer.cpp
index 0e6dadcaa5..0ff4abb9d3 100644
--- a/components/misc/helpviewer.cpp
+++ b/components/misc/helpviewer.cpp
@@ -1,12 +1,12 @@
 #include "helpviewer.hpp"
 
-#include <QString>
 #include <QDesktopServices>
+#include <QString>
 #include <QUrl>
 
 void Misc::HelpViewer::openHelp(const char* url)
 {
-    QString link {OPENMW_DOC_BASEURL};
+    QString link{ OPENMW_DOC_BASEURL };
     link.append(url);
     QDesktopServices::openUrl(QUrl(link));
 }
diff --git a/components/misc/helpviewer.hpp b/components/misc/helpviewer.hpp
index 7affb2c36e..0e6dad9637 100644
--- a/components/misc/helpviewer.hpp
+++ b/components/misc/helpviewer.hpp
@@ -1,7 +1,9 @@
 #pragma once
 
-namespace Misc {
-    namespace HelpViewer {
+namespace Misc
+{
+    namespace HelpViewer
+    {
         void openHelp(const char* url);
     }
 }
diff --git a/components/misc/mathutil.hpp b/components/misc/mathutil.hpp
index 2f7f446b56..cc333dec3c 100644
--- a/components/misc/mathutil.hpp
+++ b/components/misc/mathutil.hpp
@@ -13,7 +13,7 @@ namespace Misc
         double fullTurns = angle / (2 * osg::PI) + 0.5;
         return (fullTurns - floor(fullTurns) - 0.5) * (2 * osg::PI);
     }
-    
+
     /// Rotates given 2d vector counterclockwise. Angle is in radians.
     inline osg::Vec2f rotateVec2f(osg::Vec2f vec, float angle)
     {
diff --git a/components/misc/messageformatparser.hpp b/components/misc/messageformatparser.hpp
index 4ceac2be2f..dc7ce09884 100644
--- a/components/misc/messageformatparser.hpp
+++ b/components/misc/messageformatparser.hpp
@@ -7,28 +7,30 @@ namespace Misc
 {
     class MessageFormatParser
     {
-        protected:
-            enum Placeholder
-            {
-                StringPlaceholder,
-                IntegerPlaceholder,
-                FloatPlaceholder
-            };
+    protected:
+        enum Placeholder
+        {
+            StringPlaceholder,
+            IntegerPlaceholder,
+            FloatPlaceholder
+        };
 
-            enum Notation
-            {
-                FixedNotation,
-                ScientificNotation,
-                ShortestNotation
-            };
+        enum Notation
+        {
+            FixedNotation,
+            ScientificNotation,
+            ShortestNotation
+        };
 
-            virtual void visitedPlaceholder(Placeholder placeholder, char padding, int width, int precision, Notation notation) = 0;
-            virtual void visitedCharacter(char c) = 0;
+        virtual void visitedPlaceholder(
+            Placeholder placeholder, char padding, int width, int precision, Notation notation)
+            = 0;
+        virtual void visitedCharacter(char c) = 0;
 
-        public:
-            virtual ~MessageFormatParser();
+    public:
+        virtual ~MessageFormatParser();
 
-            virtual void process(std::string_view message);
+        virtual void process(std::string_view message);
     };
 }
 
diff --git a/components/misc/objectpool.hpp b/components/misc/objectpool.hpp
index b3dae6a4f5..e02d493d3e 100644
--- a/components/misc/objectpool.hpp
+++ b/components/misc/objectpool.hpp
@@ -13,20 +13,21 @@ namespace Misc
     template <class T>
     class ObjectPtrDeleter
     {
-        public:
-            ObjectPtrDeleter(std::nullptr_t)
-                : mPool(nullptr) {}
+    public:
+        ObjectPtrDeleter(std::nullptr_t)
+            : mPool(nullptr)
+        {
+        }
 
-            ObjectPtrDeleter(ObjectPool<T>& pool)
-                : mPool(&pool) {}
+        ObjectPtrDeleter(ObjectPool<T>& pool)
+            : mPool(&pool)
+        {
+        }
 
-            void operator()(T* object) const
-            {
-                mPool->recycle(object);
-            }
+        void operator()(T* object) const { mPool->recycle(object); }
 
-        private:
-            ObjectPool<T>* mPool;
+    private:
+        ObjectPool<T>* mPool;
     };
 
     template <class T>
@@ -36,10 +37,14 @@ namespace Misc
         using std::unique_ptr<T, ObjectPtrDeleter<T>>::operator=;
 
         ObjectPtr()
-            : ObjectPtr(nullptr) {}
+            : ObjectPtr(nullptr)
+        {
+        }
 
         ObjectPtr(std::nullptr_t)
-            : std::unique_ptr<T, ObjectPtrDeleter<T>>(nullptr, nullptr) {}
+            : std::unique_ptr<T, ObjectPtrDeleter<T>>(nullptr, nullptr)
+        {
+        }
     };
 
     template <class T>
@@ -47,36 +52,35 @@ namespace Misc
     {
         friend class ObjectPtrDeleter<T>;
 
-        public:
-            ObjectPool()
-                : mObjects(std::make_unique<std::deque<T>>()) {}
+    public:
+        ObjectPool()
+            : mObjects(std::make_unique<std::deque<T>>())
+        {
+        }
 
-            ObjectPtr<T> get()
+        ObjectPtr<T> get()
+        {
+            T* object;
+
+            if (!mUnused.empty())
             {
-                T* object;
-
-                if (!mUnused.empty())
-                {
-                    object = mUnused.back();
-                    mUnused.pop_back();
-                }
-                else
-                {
-                    mObjects->emplace_back();
-                    object = &mObjects->back();
-                }
-
-                return ObjectPtr<T>(object, ObjectPtrDeleter<T>(*this));
+                object = mUnused.back();
+                mUnused.pop_back();
             }
-
-        private:
-            std::unique_ptr<std::deque<T>> mObjects;
-            std::vector<T*> mUnused;
-
-            void recycle(T* object)
+            else
             {
-                mUnused.push_back(object);
+                mObjects->emplace_back();
+                object = &mObjects->back();
             }
+
+            return ObjectPtr<T>(object, ObjectPtrDeleter<T>(*this));
+        }
+
+    private:
+        std::unique_ptr<std::deque<T>> mObjects;
+        std::vector<T*> mUnused;
+
+        void recycle(T* object) { mUnused.push_back(object); }
     };
 }
 
diff --git a/components/misc/progressreporter.hpp b/components/misc/progressreporter.hpp
index 30d9b0ae2e..91e0b8b275 100644
--- a/components/misc/progressreporter.hpp
+++ b/components/misc/progressreporter.hpp
@@ -13,28 +13,30 @@ namespace Misc
     class ProgressReporter
     {
     public:
-        explicit ProgressReporter(Report&& report = Report {})
+        explicit ProgressReporter(Report&& report = Report{})
             : mReport(std::forward<Report>(report))
-        {}
+        {
+        }
 
-        explicit ProgressReporter(std::chrono::steady_clock::duration interval, Report&& report = Report {})
+        explicit ProgressReporter(std::chrono::steady_clock::duration interval, Report&& report = Report{})
             : mInterval(interval)
             , mReport(std::forward<Report>(report))
-        {}
+        {
+        }
 
         void operator()(std::size_t provided, std::size_t expected)
         {
             expected = std::max(expected, provided);
-            const bool shouldReport = [&]
-            {
+            const bool shouldReport = [&] {
                 const std::lock_guard lock(mMutex);
                 const auto now = std::chrono::steady_clock::now();
                 if (mNextReport > now || provided == expected)
                     return false;
                 if (mInterval.count() > 0)
-                    mNextReport = mNextReport + mInterval * ((now - mNextReport + mInterval).count() / mInterval.count());
+                    mNextReport
+                        = mNextReport + mInterval * ((now - mNextReport + mInterval).count() / mInterval.count());
                 return true;
-            } ();
+            }();
             if (shouldReport)
                 mReport(provided, expected);
         }
@@ -43,7 +45,7 @@ namespace Misc
         const std::chrono::steady_clock::duration mInterval = std::chrono::seconds(1);
         Report mReport;
         std::mutex mMutex;
-        std::chrono::steady_clock::time_point mNextReport {std::chrono::steady_clock::now() + mInterval};
+        std::chrono::steady_clock::time_point mNextReport{ std::chrono::steady_clock::now() + mInterval };
     };
 }
 
diff --git a/components/misc/resourcehelpers.cpp b/components/misc/resourcehelpers.cpp
index 3719e8e8c7..dc58828360 100644
--- a/components/misc/resourcehelpers.cpp
+++ b/components/misc/resourcehelpers.cpp
@@ -1,14 +1,14 @@
 #include "resourcehelpers.hpp"
 
+#include <algorithm>
 #include <sstream>
 #include <string_view>
-#include <algorithm>
 
 #include <components/esm/common.hpp>
 
 #include <components/misc/pathhelpers.hpp>
-#include <components/misc/strings/lower.hpp>
 #include <components/misc/strings/algorithm.hpp>
+#include <components/misc/strings/lower.hpp>
 
 #include <components/settings/settings.hpp>
 #include <components/vfs/manager.hpp>
@@ -16,30 +16,23 @@
 namespace
 {
 
-
     struct MatchPathSeparator
     {
-        bool operator()( char ch ) const
-        {
-            return ch == '\\' || ch == '/';
-        }
+        bool operator()(char ch) const { return ch == '\\' || ch == '/'; }
     };
 
-    std::string
-    getBasename( std::string const& pathname )
+    std::string getBasename(std::string const& pathname)
     {
         return std::string(
-            std::find_if( pathname.rbegin(), pathname.rend(),
-                          MatchPathSeparator() ).base(),
-            pathname.end() );
+            std::find_if(pathname.rbegin(), pathname.rend(), MatchPathSeparator()).base(), pathname.end());
     }
 
 }
 
-bool changeExtension(std::string &path, std::string_view ext)
+bool changeExtension(std::string& path, std::string_view ext)
 {
     std::string::size_type pos = path.rfind('.');
-    if(pos != std::string::npos && path.compare(pos, path.length() - pos, ext) != 0)
+    if (pos != std::string::npos && path.compare(pos, path.length() - pos, ext) != 0)
     {
         path.replace(pos, path.length(), ext);
         return true;
@@ -47,12 +40,13 @@ bool changeExtension(std::string &path, std::string_view ext)
     return false;
 }
 
-bool Misc::ResourceHelpers::changeExtensionToDds(std::string &path)
+bool Misc::ResourceHelpers::changeExtensionToDds(std::string& path)
 {
     return changeExtension(path, ".dds");
 }
 
-std::string Misc::ResourceHelpers::correctResourcePath(std::string_view topLevelDirectory, std::string_view resPath, const VFS::Manager* vfs)
+std::string Misc::ResourceHelpers::correctResourcePath(
+    std::string_view topLevelDirectory, std::string_view resPath, const VFS::Manager* vfs)
 {
     /* Bethesda at some point converted all their BSA
      * textures from tga to dds for increased load speed, but all
@@ -65,9 +59,9 @@ std::string Misc::ResourceHelpers::correctResourcePath(std::string_view topLevel
     while (correctedPath.size() && (correctedPath[0] == '/' || correctedPath[0] == '\\'))
         correctedPath.erase(0, 1);
 
-    if(!correctedPath.starts_with(topLevelDirectory) || correctedPath.size() <= topLevelDirectory.size() ||
-        (correctedPath[topLevelDirectory.size()] != '/' && correctedPath[topLevelDirectory.size()] != '\\'))
-        correctedPath = std::string{topLevelDirectory} + '\\' + correctedPath;
+    if (!correctedPath.starts_with(topLevelDirectory) || correctedPath.size() <= topLevelDirectory.size()
+        || (correctedPath[topLevelDirectory.size()] != '/' && correctedPath[topLevelDirectory.size()] != '\\'))
+        correctedPath = std::string{ topLevelDirectory } + '\\' + correctedPath;
 
     std::string origExt = correctedPath;
 
@@ -82,7 +76,7 @@ std::string Misc::ResourceHelpers::correctResourcePath(std::string_view topLevel
         return origExt;
 
     // fall back to a resource in the top level directory if it exists
-    std::string fallback{topLevelDirectory};
+    std::string fallback{ topLevelDirectory };
     fallback += '\\';
     fallback += getBasename(correctedPath);
     if (vfs->exists(fallback))
@@ -115,7 +109,8 @@ std::string Misc::ResourceHelpers::correctBookartPath(std::string_view resPath,
     return correctResourcePath("bookart", resPath, vfs);
 }
 
-std::string Misc::ResourceHelpers::correctBookartPath(std::string_view resPath, int width, int height, const VFS::Manager* vfs)
+std::string Misc::ResourceHelpers::correctBookartPath(
+    std::string_view resPath, int width, int height, const VFS::Manager* vfs)
 {
     std::string image = correctBookartPath(resPath, vfs);
 
@@ -131,22 +126,22 @@ std::string Misc::ResourceHelpers::correctBookartPath(std::string_view resPath,
     return image;
 }
 
-std::string Misc::ResourceHelpers::correctActorModelPath(const std::string &resPath, const VFS::Manager* vfs)
+std::string Misc::ResourceHelpers::correctActorModelPath(const std::string& resPath, const VFS::Manager* vfs)
 {
     std::string mdlname = resPath;
     std::string::size_type p = mdlname.find_last_of("/\\");
-    if(p != std::string::npos)
-        mdlname.insert(mdlname.begin()+p+1, 'x');
+    if (p != std::string::npos)
+        mdlname.insert(mdlname.begin() + p + 1, 'x');
     else
         mdlname.insert(mdlname.begin(), 'x');
-    if(!vfs->exists(mdlname))
+    if (!vfs->exists(mdlname))
     {
         return resPath;
     }
     return mdlname;
 }
 
-std::string Misc::ResourceHelpers::correctMeshPath(const std::string &resPath, const VFS::Manager* vfs)
+std::string Misc::ResourceHelpers::correctMeshPath(const std::string& resPath, const VFS::Manager* vfs)
 {
     return "meshes\\" + resPath;
 }
@@ -156,37 +151,38 @@ std::string Misc::ResourceHelpers::correctSoundPath(std::string_view resPath, co
     // Workaround: Bethesda at some point converted some of the files to mp3, but the references were kept as .wav.
     if (!vfs->exists(resPath))
     {
-        std::string sound{resPath};
+        std::string sound{ resPath };
         changeExtension(sound, ".mp3");
         return vfs->normalizeFilename(sound);
     }
     return vfs->normalizeFilename(resPath);
-
 }
 
 bool Misc::ResourceHelpers::isHiddenMarker(std::string_view id)
 {
-    return Misc::StringUtils::ciEqual(id, "prisonmarker") || Misc::StringUtils::ciEqual(id, "divinemarker") || Misc::StringUtils::ciEqual(id, "templemarker") || Misc::StringUtils::ciEqual(id, "northmarker");
+    return Misc::StringUtils::ciEqual(id, "prisonmarker") || Misc::StringUtils::ciEqual(id, "divinemarker")
+        || Misc::StringUtils::ciEqual(id, "templemarker") || Misc::StringUtils::ciEqual(id, "northmarker");
 }
 
 namespace
 {
-std::string getLODMeshNameImpl(std::string resPath, const VFS::Manager* vfs, std::string_view pattern)
-{
-    if (auto w = Misc::findExtension(resPath); w != std::string::npos)
-        resPath.insert(w, pattern);
-    return vfs->normalizeFilename(resPath);
-}
+    std::string getLODMeshNameImpl(std::string resPath, const VFS::Manager* vfs, std::string_view pattern)
+    {
+        if (auto w = Misc::findExtension(resPath); w != std::string::npos)
+            resPath.insert(w, pattern);
+        return vfs->normalizeFilename(resPath);
+    }
 
-std::string getBestLODMeshName(std::string const& resPath, const VFS::Manager* vfs, std::string_view pattern)
-{
-    if (const auto& result = getLODMeshNameImpl(resPath, vfs, pattern); vfs->exists(result))
-        return result;
-    return resPath;
-}
+    std::string getBestLODMeshName(std::string const& resPath, const VFS::Manager* vfs, std::string_view pattern)
+    {
+        if (const auto& result = getLODMeshNameImpl(resPath, vfs, pattern); vfs->exists(result))
+            return result;
+        return resPath;
+    }
 }
 
-std::string Misc::ResourceHelpers::getLODMeshName(int esmVersion, std::string resPath, const VFS::Manager* vfs, unsigned char lod)
+std::string Misc::ResourceHelpers::getLODMeshName(
+    int esmVersion, std::string resPath, const VFS::Manager* vfs, unsigned char lod)
 {
     const std::string distantMeshPattern = [&esmVersion] {
         switch (esmVersion)
diff --git a/components/misc/resourcehelpers.hpp b/components/misc/resourcehelpers.hpp
index 96a3a4a81b..355bd67885 100644
--- a/components/misc/resourcehelpers.hpp
+++ b/components/misc/resourcehelpers.hpp
@@ -16,15 +16,16 @@ namespace Misc
     // so we have the opportunity to use proper resource handling for content created in OpenMW-CS.
     namespace ResourceHelpers
     {
-        bool changeExtensionToDds(std::string &path);
-        std::string correctResourcePath(std::string_view topLevelDirectory, std::string_view resPath, const VFS::Manager* vfs);
+        bool changeExtensionToDds(std::string& path);
+        std::string correctResourcePath(
+            std::string_view topLevelDirectory, std::string_view resPath, const VFS::Manager* vfs);
         std::string correctTexturePath(std::string_view resPath, const VFS::Manager* vfs);
         std::string correctIconPath(std::string_view resPath, const VFS::Manager* vfs);
         std::string correctBookartPath(std::string_view resPath, const VFS::Manager* vfs);
         std::string correctBookartPath(std::string_view resPath, int width, int height, const VFS::Manager* vfs);
         /// Use "xfoo.nif" instead of "foo.nif" if available
-        std::string correctActorModelPath(const std::string &resPath, const VFS::Manager* vfs);
-        std::string correctMeshPath(const std::string &resPath, const VFS::Manager* vfs);
+        std::string correctActorModelPath(const std::string& resPath, const VFS::Manager* vfs);
+        std::string correctMeshPath(const std::string& resPath, const VFS::Manager* vfs);
 
         std::string correctSoundPath(std::string_view resPath, const VFS::Manager* vfs);
 
diff --git a/components/misc/rng.hpp b/components/misc/rng.hpp
index 5663b86a02..9dd5a0da99 100644
--- a/components/misc/rng.hpp
+++ b/components/misc/rng.hpp
@@ -27,7 +27,7 @@ namespace Misc::Rng
     /// return value in range [0.0f, 1.0f)  <- note open upper range.
     float rollProbability();
     float rollProbability(Generator& prng);
-  
+
     /// return value in range [0.0f, 1.0f]  <- note closed upper range.
     float rollClosedProbability();
     float rollClosedProbability(Generator& prng);
@@ -37,8 +37,14 @@ namespace Misc::Rng
     int rollDice(int max, Generator& prng);
 
     /// return value in range [0, 99]
-    inline int roll0to99(Generator& prng) { return rollDice(100, prng); }
-    inline int roll0to99() { return rollDice(100); }
+    inline int roll0to99(Generator& prng)
+    {
+        return rollDice(100, prng);
+    }
+    inline int roll0to99()
+    {
+        return rollDice(100);
+    }
 
     float deviate(float mean, float deviation);
     float deviate(float mean, float deviation, Generator& prng);
diff --git a/components/misc/strings/algorithm.hpp b/components/misc/strings/algorithm.hpp
index 04fe81b195..1e1eba30a9 100644
--- a/components/misc/strings/algorithm.hpp
+++ b/components/misc/strings/algorithm.hpp
@@ -24,15 +24,15 @@ namespace Misc::StringUtils
     {
         if (std::size(x) != std::size(y))
             return false;
-        return std::equal(std::begin(x), std::end(x), std::begin(y),
-                          [] (char l, char r) { return toLower(l) == toLower(r); });
+        return std::equal(
+            std::begin(x), std::end(x), std::begin(y), [](char l, char r) { return toLower(l) == toLower(r); });
     }
     inline bool ciEqual(std::u8string_view x, std::u8string_view y)
     {
         if (std::size(x) != std::size(y))
             return false;
-        return std::equal(std::begin(x), std::end(x), std::begin(y),
-            [](char l, char r) { return toLower(l) == toLower(r); });
+        return std::equal(
+            std::begin(x), std::end(x), std::begin(y), [](char l, char r) { return toLower(l) == toLower(r); });
     }
 
     inline bool ciStartsWith(std::string_view value, std::string_view prefix)
@@ -44,7 +44,7 @@ namespace Misc::StringUtils
     {
         std::string_view::const_iterator xit = x.begin();
         std::string_view::const_iterator yit = y.begin();
-        for(; xit != x.end() && yit != y.end() && len > 0; ++xit, ++yit, --len)
+        for (; xit != x.end() && yit != y.end() && len > 0; ++xit, ++yit, --len)
         {
             char left = *xit;
             char right = *yit;
@@ -54,14 +54,14 @@ namespace Misc::StringUtils
             left = toLower(left);
             right = toLower(right);
             int res = left - right;
-            if(res != 0)
+            if (res != 0)
                 return (res > 0) ? 1 : -1;
         }
-        if(len > 0)
+        if (len > 0)
         {
-            if(xit != x.end())
+            if (xit != x.end())
                 return 1;
-            if(yit != y.end())
+            if (yit != y.end())
                 return -1;
         }
         return 0;
@@ -71,10 +71,7 @@ namespace Misc::StringUtils
     {
         using is_transparent = void;
 
-        bool operator()(std::string_view left, std::string_view right) const
-        {
-            return ciEqual(left, right);
-        }
+        bool operator()(std::string_view left, std::string_view right) const { return ciEqual(left, right); }
     };
 
     struct CiHash
@@ -84,9 +81,9 @@ namespace Misc::StringUtils
         constexpr std::size_t operator()(std::string_view str) const
         {
             // FNV-1a
-            std::size_t hash{0xcbf29ce484222325ull};
-            constexpr std::size_t prime{0x00000100000001B3ull};
-            for(char c : str)
+            std::size_t hash{ 0xcbf29ce484222325ull };
+            constexpr std::size_t prime{ 0x00000100000001B3ull };
+            for (char c : str)
             {
                 hash ^= static_cast<std::size_t>(toLower(c));
                 hash *= prime;
@@ -97,10 +94,7 @@ namespace Misc::StringUtils
 
     struct CiComp
     {
-        bool operator()(std::string_view left, std::string_view right) const
-        {
-            return ciLess(left, right);
-        }
+        bool operator()(std::string_view left, std::string_view right) const { return ciLess(left, right); }
     };
 
     /** @brief Replaces all occurrences of a string in another string.
@@ -135,19 +129,20 @@ namespace Misc::StringUtils
 
     inline bool ciEndsWith(std::string_view s, std::string_view suffix)
     {
-        return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin(),
-                                                       [](char l, char r) { return toLower(l) == toLower(r); });
+        return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin(), [](char l, char r) {
+            return toLower(l) == toLower(r);
+        });
     }
     inline bool ciEndsWith(std::u8string_view s, std::u8string_view suffix)
     {
-        return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin(),
-            [](char l, char r) { return toLower(l) == toLower(r); });
+        return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin(), [](char l, char r) {
+            return toLower(l) == toLower(r);
+        });
     }
 
     inline void trim(std::string& s)
     {
-        const auto notSpace = [](char ch)
-        {
+        const auto notSpace = [](char ch) {
             // TODO Do we care about multibyte whitespace?
             return !std::isspace(static_cast<unsigned char>(ch));
         };
diff --git a/components/misc/strings/conversion.hpp b/components/misc/strings/conversion.hpp
index b1d88e69d9..50df405610 100644
--- a/components/misc/strings/conversion.hpp
+++ b/components/misc/strings/conversion.hpp
@@ -17,17 +17,18 @@ namespace Misc::StringUtils
 
     inline std::string u8StringToString(std::u8string_view str)
     {
-        return {str.begin(), str.end()};
+        return { str.begin(), str.end() };
     }
 
     inline std::string u8StringToString(std::u8string&& str)
     {
-        return {str.begin(), str.end()};
+        return { str.begin(), str.end() };
     }
 
     inline const char8_t* stringToU8String(const char* str)
     {
-        return reinterpret_cast<const char8_t*>(str);  // Undefined behavior if the contents of "char" aren't UTF8 or ASCII.
+        return reinterpret_cast<const char8_t*>(
+            str); // Undefined behavior if the contents of "char" aren't UTF8 or ASCII.
     }
 
     inline char8_t* stringToU8String(char* str)
@@ -46,4 +47,4 @@ namespace Misc::StringUtils
     }
 }
 
-#endif //COMPONENTS_MISC_STRINGS_CONVERSION_H
\ No newline at end of file
+#endif // COMPONENTS_MISC_STRINGS_CONVERSION_H
\ No newline at end of file
diff --git a/components/misc/strings/format.hpp b/components/misc/strings/format.hpp
index af436b6229..ee52fceaaf 100644
--- a/components/misc/strings/format.hpp
+++ b/components/misc/strings/format.hpp
@@ -1,12 +1,12 @@
 #ifndef COMPONENTS_MISC_STRINGS_FORMAT_H
 #define COMPONENTS_MISC_STRINGS_FORMAT_H
 
-#include <cstdio>
 #include <cerrno>
+#include <cstdio>
 #include <cstring>
+#include <stdexcept>
 #include <string>
 #include <string_view>
-#include <stdexcept>
 #include <vector>
 
 namespace Misc::StringUtils
@@ -22,54 +22,55 @@ namespace Misc::StringUtils
         }
 
         template <typename T>
-        T const * argument(std::basic_string<T> const & value) noexcept
+        T const* argument(std::basic_string<T> const& value) noexcept
         {
             return value.c_str();
         }
 
-        template<class T>
+        template <class T>
         T nullTerminated(T value) noexcept
         {
             return value;
         }
 
-        template<class T>
+        template <class T>
         std::basic_string<T> nullTerminated(const std::basic_string_view<T>& value) noexcept
         {
             // Ensure string_view arguments are null-terminated by creating a string
             // TODO: Use a format function that doesn't require this workaround
-            return std::string{value};
+            return std::string{ value };
         }
 
         // Requires some C++11 features:
         // 1. std::string needs to be contiguous
         // 2. std::snprintf with zero size (second argument) returns an output string size
         // 3. variadic templates support
-        template <typename ... Args>
-        std::string format(const char* fmt, Args const & ... args)
+        template <typename... Args>
+        std::string format(const char* fmt, Args const&... args)
         {
-            const int size = std::snprintf(nullptr, 0, fmt, argument(args) ...);
+            const int size = std::snprintf(nullptr, 0, fmt, argument(args)...);
             if (size < 0)
-                throw std::runtime_error(std::string("Failed to compute resulting string size: ") + std::strerror(errno));
+                throw std::runtime_error(
+                    std::string("Failed to compute resulting string size: ") + std::strerror(errno));
             // Note: sprintf also writes a trailing null character. We should remove it.
             std::string ret(static_cast<std::size_t>(size) + 1, '\0');
-            if (std::sprintf(ret.data(), fmt, argument(args) ...) < 0)
+            if (std::sprintf(ret.data(), fmt, argument(args)...) < 0)
                 throw std::runtime_error(std::string("Failed to format string: ") + std::strerror(errno));
             ret.erase(static_cast<std::size_t>(size));
             return ret;
         }
     }
 
-    template <typename ... Args>
-    std::string format(const char* fmt, Args const & ... args)
+    template <typename... Args>
+    std::string format(const char* fmt, Args const&... args)
     {
-        return Details::format(fmt, Details::nullTerminated(args) ...);
+        return Details::format(fmt, Details::nullTerminated(args)...);
     }
 
-    template <typename ... Args>
-    std::string format(const std::string& fmt, Args const & ... args)
+    template <typename... Args>
+    std::string format(const std::string& fmt, Args const&... args)
     {
-        return Details::format(fmt.c_str(), Details::nullTerminated(args) ...);
+        return Details::format(fmt.c_str(), Details::nullTerminated(args)...);
     }
 }
 
diff --git a/components/misc/strings/lower.hpp b/components/misc/strings/lower.hpp
index d17ca6aa00..aaca056c6d 100644
--- a/components/misc/strings/lower.hpp
+++ b/components/misc/strings/lower.hpp
@@ -7,27 +7,22 @@
 namespace Misc::StringUtils
 {
     /* Mapping table to go from uppercase to lowercase for plain ASCII.*/
-    static constexpr unsigned char tolowermap[256] = {
-        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
-        22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
-        42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
-        62, 63, 64, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
-        111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 91, 92, 93, 94, 95,
-        96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-        112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-        128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
-        144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
-        160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
-        176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
-        192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
-        208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
-        224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
-        240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255
-    };
+    static constexpr unsigned char tolowermap[256] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+        19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
+        47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 97, 98, 99, 100, 101, 102, 103, 104,
+        105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 91, 92, 93, 94, 95,
+        96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
+        119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
+        141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162,
+        163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
+        185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
+        207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228,
+        229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250,
+        251, 252, 253, 254, 255 };
 
-    /// Plain and simple locale-unaware toLower. Anything from A to Z is lower-cased, multibyte characters are unchanged.
-    /// Don't use std::tolower(char, locale&) because that is abysmally slow.
-    /// Don't use tolower(int) because that depends on global locale.
+    /// Plain and simple locale-unaware toLower. Anything from A to Z is lower-cased, multibyte characters are
+    /// unchanged. Don't use std::tolower(char, locale&) because that is abysmally slow. Don't use tolower(int) because
+    /// that depends on global locale.
     inline constexpr char toLower(char c)
     {
         return tolowermap[static_cast<unsigned char>(c)];
diff --git a/components/misc/strongtypedef.hpp b/components/misc/strongtypedef.hpp
index 2a9e4c3a8b..006282423f 100644
--- a/components/misc/strongtypedef.hpp
+++ b/components/misc/strongtypedef.hpp
@@ -12,9 +12,15 @@ namespace Misc
 
         StrongTypedef() = default;
 
-        explicit StrongTypedef(const T& value) : mValue(value) {}
+        explicit StrongTypedef(const T& value)
+            : mValue(value)
+        {
+        }
 
-        explicit StrongTypedef(T&& value) : mValue(std::move(value)) {}
+        explicit StrongTypedef(T&& value)
+            : mValue(std::move(value))
+        {
+        }
 
         operator const T&() const { return mValue; }
 
diff --git a/components/misc/thread.cpp b/components/misc/thread.cpp
index ca811fdd2f..7a303a541b 100644
--- a/components/misc/thread.cpp
+++ b/components/misc/thread.cpp
@@ -19,7 +19,8 @@ namespace Misc
         if (pthread_setschedparam(pthread_self(), SCHED_IDLE, &param) == 0)
             Log(Debug::Verbose) << "Using idle priority for thread=" << std::this_thread::get_id();
         else
-            Log(Debug::Warning) << "Failed to set idle priority for thread=" << std::this_thread::get_id() << ": " << std::strerror(errno);
+            Log(Debug::Warning) << "Failed to set idle priority for thread=" << std::this_thread::get_id() << ": "
+                                << std::strerror(errno);
     }
 }
 
@@ -34,14 +35,15 @@ namespace Misc
         if (SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_LOWEST))
             Log(Debug::Verbose) << "Using idle priority for thread=" << std::this_thread::get_id();
         else
-            Log(Debug::Warning) << "Failed to set idle priority for thread=" << std::this_thread::get_id() << ": " << GetLastError();
+            Log(Debug::Warning) << "Failed to set idle priority for thread=" << std::this_thread::get_id() << ": "
+                                << GetLastError();
     }
 }
 
 #elif defined(__FreeBSD__)
 
-#include <sys/types.h>
 #include <sys/rtprio.h>
+#include <sys/types.h>
 
 namespace Misc
 {
@@ -53,7 +55,8 @@ namespace Misc
         if (rtprio_thread(RTP_SET, 0, &prio) == 0)
             Log(Debug::Verbose) << "Using idle priority for thread=" << std::this_thread::get_id();
         else
-            Log(Debug::Warning) << "Failed to set idle priority for thread=" << std::this_thread::get_id() << ": " << std::strerror(errno);
+            Log(Debug::Warning) << "Failed to set idle priority for thread=" << std::this_thread::get_id() << ": "
+                                << std::strerror(errno);
     }
 }
 
diff --git a/components/misc/timeconvert.hpp b/components/misc/timeconvert.hpp
index 26073025a3..1f4c8e9bc6 100644
--- a/components/misc/timeconvert.hpp
+++ b/components/misc/timeconvert.hpp
@@ -1,18 +1,18 @@
 #ifndef OPENMW_COMPONENTS_MISC_TIMECONVERT_H
 #define OPENMW_COMPONENTS_MISC_TIMECONVERT_H
 
-#include <ctime>
 #include <chrono>
+#include <ctime>
 
 namespace Misc
 {
-template <typename TP>
-inline std::time_t to_time_t(TP tp)
-{
-    using namespace std::chrono;
-    auto sctp = time_point_cast<system_clock::duration>(tp - TP::clock::now() + system_clock::now());
-    return system_clock::to_time_t(sctp);
-}
+    template <typename TP>
+    inline std::time_t to_time_t(TP tp)
+    {
+        using namespace std::chrono;
+        auto sctp = time_point_cast<system_clock::duration>(tp - TP::clock::now() + system_clock::now());
+        return system_clock::to_time_t(sctp);
+    }
 } // namespace Misc
 
 #endif
diff --git a/components/misc/timer.hpp b/components/misc/timer.hpp
index 910d45bc03..d478249dd9 100644
--- a/components/misc/timer.hpp
+++ b/components/misc/timer.hpp
@@ -13,29 +13,32 @@ namespace Misc
 
     class DeviatingPeriodicTimer
     {
-        public:
-            explicit DeviatingPeriodicTimer(float period, float deviation, float timeLeft)
-                : mPeriod(period), mDeviation(deviation), mTimeLeft(timeLeft)
-            {}
-
-            TimerStatus update(float duration, Rng::Generator& prng)
+    public:
+        explicit DeviatingPeriodicTimer(float period, float deviation, float timeLeft)
+            : mPeriod(period)
+            , mDeviation(deviation)
+            , mTimeLeft(timeLeft)
+        {
+        }
+
+        TimerStatus update(float duration, Rng::Generator& prng)
+        {
+            if (mTimeLeft > 0)
             {
-                if (mTimeLeft > 0)
-                {
-                    mTimeLeft -= duration;
-                    return TimerStatus::Waiting;
-                }
-
-                mTimeLeft = Rng::deviate(mPeriod, mDeviation, prng);
-                return TimerStatus::Elapsed;
+                mTimeLeft -= duration;
+                return TimerStatus::Waiting;
             }
 
-            void reset(float timeLeft) { mTimeLeft = timeLeft; }
+            mTimeLeft = Rng::deviate(mPeriod, mDeviation, prng);
+            return TimerStatus::Elapsed;
+        }
+
+        void reset(float timeLeft) { mTimeLeft = timeLeft; }
 
-        private:
-            const float mPeriod;
-            const float mDeviation;
-            float mTimeLeft;
+    private:
+        const float mPeriod;
+        const float mDeviation;
+        float mTimeLeft;
     };
 }
 
diff --git a/components/misc/typetraits.hpp b/components/misc/typetraits.hpp
index 4c6a7e731b..48ab57c0f4 100644
--- a/components/misc/typetraits.hpp
+++ b/components/misc/typetraits.hpp
@@ -7,10 +7,14 @@
 namespace Misc
 {
     template <class T>
-    struct IsOptional : std::false_type {};
+    struct IsOptional : std::false_type
+    {
+    };
 
     template <class T>
-    struct IsOptional<std::optional<T>> : std::true_type {};
+    struct IsOptional<std::optional<T>> : std::true_type
+    {
+    };
 
     template <class T>
     inline constexpr bool isOptional = IsOptional<T>::value;
diff --git a/components/misc/utf8stream.hpp b/components/misc/utf8stream.hpp
index 9ebcd67827..a0c26ed762 100644
--- a/components/misc/utf8stream.hpp
+++ b/components/misc/utf8stream.hpp
@@ -9,92 +9,91 @@
 class Utf8Stream
 {
 public:
-
     typedef uint32_t UnicodeChar;
-    typedef unsigned char const * Point;
+    typedef unsigned char const* Point;
 
-    //static const unicode_char sBadChar = 0xFFFFFFFF; gcc can't handle this
-    static UnicodeChar sBadChar () { return UnicodeChar (0xFFFFFFFF); }
+    // static const unicode_char sBadChar = 0xFFFFFFFF; gcc can't handle this
+    static UnicodeChar sBadChar() { return UnicodeChar(0xFFFFFFFF); }
 
-    Utf8Stream (Point begin, Point end) :
-        cur (begin), nxt (begin), end (end), val(Utf8Stream::sBadChar())
+    Utf8Stream(Point begin, Point end)
+        : cur(begin)
+        , nxt(begin)
+        , end(end)
+        , val(Utf8Stream::sBadChar())
     {
     }
 
-    Utf8Stream (const char * str) :
-        cur (reinterpret_cast<const unsigned char*>(str)),
-        nxt (reinterpret_cast<const unsigned char*>(str)),
-        end (reinterpret_cast<const unsigned char*>(str) + strlen(str)),
-        val(Utf8Stream::sBadChar())
+    Utf8Stream(const char* str)
+        : cur(reinterpret_cast<const unsigned char*>(str))
+        , nxt(reinterpret_cast<const unsigned char*>(str))
+        , end(reinterpret_cast<const unsigned char*>(str) + strlen(str))
+        , val(Utf8Stream::sBadChar())
     {
     }
 
-    Utf8Stream (std::pair <Point, Point> range) :
-        cur (range.first), nxt (range.first), end (range.second), val(Utf8Stream::sBadChar())
+    Utf8Stream(std::pair<Point, Point> range)
+        : cur(range.first)
+        , nxt(range.first)
+        , end(range.second)
+        , val(Utf8Stream::sBadChar())
     {
     }
 
-    Utf8Stream (std::string_view str) :
-        Utf8Stream (reinterpret_cast<Point>(str.data()), reinterpret_cast<Point>(str.data() + str.size()))
+    Utf8Stream(std::string_view str)
+        : Utf8Stream(reinterpret_cast<Point>(str.data()), reinterpret_cast<Point>(str.data() + str.size()))
     {
     }
 
-    bool eof () const
-    {
-        return cur == end;
-    }
+    bool eof() const { return cur == end; }
 
-    Point current () const
-    {
-        return cur;
-    }
+    Point current() const { return cur; }
 
-    UnicodeChar peek ()
+    UnicodeChar peek()
     {
         if (cur == nxt)
-            next ();
+            next();
         return val;
     }
 
-    UnicodeChar consume ()
+    UnicodeChar consume()
     {
         if (cur == nxt)
-            next ();
+            next();
         cur = nxt;
         return val;
     }
 
-    static std::pair <UnicodeChar, Point> decode (Point cur, Point end)
+    static std::pair<UnicodeChar, Point> decode(Point cur, Point end)
     {
         if ((*cur & 0x80) == 0)
         {
             UnicodeChar chr = *cur++;
 
-            return std::make_pair (chr, cur);
+            return std::make_pair(chr, cur);
         }
 
         int octets;
         UnicodeChar chr;
 
-        std::tie (octets, chr) = octet_count (*cur++);
+        std::tie(octets, chr) = octet_count(*cur++);
 
         if (octets > 5)
-            return std::make_pair (sBadChar(), cur);
+            return std::make_pair(sBadChar(), cur);
 
         Point eoc = cur + octets;
 
         if (eoc > end)
-            return std::make_pair (sBadChar(), cur);
+            return std::make_pair(sBadChar(), cur);
 
         while (cur != eoc)
         {
             if ((*cur & 0xC0) != 0x80) // check continuation mark
-                return std::make_pair (sBadChar(), cur);
+                return std::make_pair(sBadChar(), cur);
 
-            chr = (chr << 6) | UnicodeChar ((*cur++) & 0x3F);
+            chr = (chr << 6) | UnicodeChar((*cur++) & 0x3F);
         }
 
-        return std::make_pair (chr, cur);
+        return std::make_pair(chr, cur);
     }
 
     static UnicodeChar toLowerUtf8(UnicodeChar ch)
@@ -125,13 +124,13 @@ public:
     static std::string lowerCaseUtf8(std::string_view str)
     {
         if (str.empty())
-            return std::string{str};
+            return std::string{ str };
 
         // Decode string as utf8 characters, convert to lower case and pack them to string
         std::string out;
         out.reserve(str.length());
-        Utf8Stream stream (str);
-        while (!stream.eof ())
+        Utf8Stream stream(str);
+        while (!stream.eof())
         {
             UnicodeChar character = toLowerUtf8(stream.peek());
 
@@ -163,8 +162,7 @@ public:
     }
 
 private:
-
-    static std::pair <int, UnicodeChar> octet_count (unsigned char octet)
+    static std::pair<int, UnicodeChar> octet_count(unsigned char octet)
     {
         int octets;
 
@@ -180,13 +178,10 @@ private:
             mask = (mask >> 1) | 0x80;
         }
 
-        return std::make_pair (octets, octet & ~mask);
+        return std::make_pair(octets, octet & ~mask);
     }
 
-    void next ()
-    {
-        std::tie (val, nxt) = decode (nxt, end);
-    }
+    void next() { std::tie(val, nxt) = decode(nxt, end); }
 
     Point cur;
     Point nxt;
diff --git a/components/misc/weakcache.hpp b/components/misc/weakcache.hpp
index 3bbb0812cd..8d39995538 100644
--- a/components/misc/weakcache.hpp
+++ b/components/misc/weakcache.hpp
@@ -25,6 +25,7 @@ namespace Misc
             bool operator==(const iterator& other) const;
             bool operator!=(const iterator& other) const;
             StrongPtr operator*();
+
         private:
             WeakCache* mCache;
             typename Map::iterator mCurrent, mEnd;
@@ -32,7 +33,7 @@ namespace Misc
         };
 
         /// Stores a weak pointer to the item.
-        void insert(Key key, StrongPtr value, bool prune=true);
+        void insert(Key key, StrongPtr value, bool prune = true);
 
         /// Retrieves the item associated with the key.
         /// \return An item or null.
@@ -49,7 +50,6 @@ namespace Misc
         std::vector<Key> mDirty;
     };
 
-
     template <typename Key, typename T>
     WeakCache<Key, T>::iterator::iterator(WeakCache* cache, typename Map::iterator current, typename Map::iterator end)
         : mCache(cache)
@@ -57,11 +57,13 @@ namespace Misc
         , mEnd(end)
     {
         // Move to 1st available valid item
-        for ( ; mCurrent != mEnd; ++mCurrent)
+        for (; mCurrent != mEnd; ++mCurrent)
         {
             mPtr = mCurrent->second.lock();
-            if (mPtr) break;
-            else mCache->mDirty.push_back(mCurrent->first);
+            if (mPtr)
+                break;
+            else
+                mCache->mDirty.push_back(mCurrent->first);
         }
     }
 
@@ -91,12 +93,12 @@ namespace Misc
         return mPtr;
     }
 
-
     template <typename Key, typename T>
     void WeakCache<Key, T>::insert(Key key, StrongPtr value, bool shouldPrune)
     {
         mData[key] = WeakPtr(value);
-        if (shouldPrune) prune();
+        if (shouldPrune)
+            prune();
     }
 
     template <typename Key, typename T>
diff --git a/components/myguiplatform/additivelayer.cpp b/components/myguiplatform/additivelayer.cpp
index 49558cf8e1..d170c831a6 100644
--- a/components/myguiplatform/additivelayer.cpp
+++ b/components/myguiplatform/additivelayer.cpp
@@ -19,7 +19,7 @@ namespace osgMyGUI
         // defined in .cpp file since we can't delete incomplete types
     }
 
-    void AdditiveLayer::renderToTarget(MyGUI::IRenderTarget *_target, bool _update)
+    void AdditiveLayer::renderToTarget(MyGUI::IRenderTarget* _target, bool _update)
     {
         RenderManager& renderManager = static_cast<RenderManager&>(MyGUI::RenderManager::getInstance());
 
diff --git a/components/myguiplatform/additivelayer.hpp b/components/myguiplatform/additivelayer.hpp
index f89e1d007d..cfd5c82058 100644
--- a/components/myguiplatform/additivelayer.hpp
+++ b/components/myguiplatform/additivelayer.hpp
@@ -17,7 +17,7 @@ namespace osgMyGUI
     class AdditiveLayer final : public MyGUI::OverlappedLayer
     {
     public:
-        MYGUI_RTTI_DERIVED( AdditiveLayer )
+        MYGUI_RTTI_DERIVED(AdditiveLayer)
 
         AdditiveLayer();
         ~AdditiveLayer() override;
diff --git a/components/myguiplatform/myguidatamanager.cpp b/components/myguiplatform/myguidatamanager.cpp
index 473076ff12..8e34e0c2fe 100644
--- a/components/myguiplatform/myguidatamanager.cpp
+++ b/components/myguiplatform/myguidatamanager.cpp
@@ -1,12 +1,12 @@
 #include "myguidatamanager.hpp"
 
-#include <string>
 #include <stdexcept>
+#include <string>
 
 #include <MyGUI_DataFileStream.h>
 
-#include <components/vfs/manager.hpp>
 #include <components/files/conversion.hpp>
+#include <components/vfs/manager.hpp>
 
 namespace
 {
@@ -16,7 +16,8 @@ namespace
         explicit DataStream(std::unique_ptr<std::istream>&& stream)
             : MyGUI::DataStream(stream.get())
             , mOwnedStream(std::move(stream))
-        {}
+        {
+        }
 
     private:
         std::unique_ptr<std::istream> mOwnedStream;
@@ -26,52 +27,53 @@ namespace
 namespace osgMyGUI
 {
 
-void DataManager::setResourcePath(const std::filesystem::path &path)
-{
-    mResourcePath = path;
-}
+    void DataManager::setResourcePath(const std::filesystem::path& path)
+    {
+        mResourcePath = path;
+    }
 
-DataManager::DataManager(const std::string& resourcePath, const VFS::Manager* vfs)
-    : mResourcePath(resourcePath)
-    , mVfs(vfs)
-{
-}
+    DataManager::DataManager(const std::string& resourcePath, const VFS::Manager* vfs)
+        : mResourcePath(resourcePath)
+        , mVfs(vfs)
+    {
+    }
 
-MyGUI::IDataStream *DataManager::getData(const std::string &name) const
-{
-    return new DataStream(mVfs->get(Files::pathToUnicodeString(mResourcePath / name)));
-}
+    MyGUI::IDataStream* DataManager::getData(const std::string& name) const
+    {
+        return new DataStream(mVfs->get(Files::pathToUnicodeString(mResourcePath / name)));
+    }
 
-void DataManager::freeData(MyGUI::IDataStream *data)
-{
-    delete data;
-}
+    void DataManager::freeData(MyGUI::IDataStream* data)
+    {
+        delete data;
+    }
 
-bool DataManager::isDataExist(const std::string &name) const
-{
-    return mVfs->exists(Files::pathToUnicodeString(mResourcePath / name));
-}
+    bool DataManager::isDataExist(const std::string& name) const
+    {
+        return mVfs->exists(Files::pathToUnicodeString(mResourcePath / name));
+    }
 
-const MyGUI::VectorString &DataManager::getDataListNames(const std::string &pattern) const
-{
-    throw std::runtime_error("DataManager::getDataListNames is not implemented - VFS is used");
-}
+    const MyGUI::VectorString& DataManager::getDataListNames(const std::string& pattern) const
+    {
+        throw std::runtime_error("DataManager::getDataListNames is not implemented - VFS is used");
+    }
 
-const std::string &DataManager::getDataPath(const std::string &name) const
-{
-    static std::string result;
-    result.clear();
+    const std::string& DataManager::getDataPath(const std::string& name) const
+    {
+        static std::string result;
+        result.clear();
 
-    if (name.empty()) {
-        result = Files::pathToUnicodeString(mResourcePath);
-        return result;
-    }
+        if (name.empty())
+        {
+            result = Files::pathToUnicodeString(mResourcePath);
+            return result;
+        }
 
-    if (!isDataExist(name))
-        return result;
+        if (!isDataExist(name))
+            return result;
 
-    result = Files::pathToUnicodeString(mResourcePath / name);
-    return result;
-}
+        result = Files::pathToUnicodeString(mResourcePath / name);
+        return result;
+    }
 
 }
diff --git a/components/myguiplatform/myguidatamanager.hpp b/components/myguiplatform/myguidatamanager.hpp
index 09a427fdac..40dc6c3705 100644
--- a/components/myguiplatform/myguidatamanager.hpp
+++ b/components/myguiplatform/myguidatamanager.hpp
@@ -3,8 +3,8 @@
 
 #include <MyGUI_DataManager.h>
 
-#include <string>
 #include <filesystem>
+#include <string>
 
 namespace VFS
 {
@@ -14,44 +14,44 @@ namespace VFS
 namespace osgMyGUI
 {
 
-class DataManager : public MyGUI::DataManager
-{
-public:
-    explicit DataManager(const std::string& path, const VFS::Manager* vfs);
-
-    void setResourcePath(const std::filesystem::path &path);
-
-    /** Get data stream from specified resource name.
-        @param _name Resource name (usually file name).
-    */
-    MyGUI::IDataStream* getData(const std::string& _name) const override;
-
-    /** Free data stream.
-        @param _data Data stream.
-    */
-    void freeData(MyGUI::IDataStream* _data) override;
-
-    /** Is data with specified name exist.
-        @param _name Resource name.
-    */
-    bool isDataExist(const std::string& _name) const override;
-
-    /** Get all data names with names that matches pattern.
-        @param _pattern Pattern to match (for example "*.layout").
-    */
-    const MyGUI::VectorString& getDataListNames(const std::string& _pattern) const override;
-
-    /** Get full path to data.
-        @param _name Resource name.
-        @return Return full path to specified data.
-    */
-    const std::string& getDataPath(const std::string& _name) const override;
-
-private:
-    std::filesystem::path mResourcePath;
-
-    const VFS::Manager* mVfs;
-};
+    class DataManager : public MyGUI::DataManager
+    {
+    public:
+        explicit DataManager(const std::string& path, const VFS::Manager* vfs);
+
+        void setResourcePath(const std::filesystem::path& path);
+
+        /** Get data stream from specified resource name.
+            @param _name Resource name (usually file name).
+        */
+        MyGUI::IDataStream* getData(const std::string& _name) const override;
+
+        /** Free data stream.
+            @param _data Data stream.
+        */
+        void freeData(MyGUI::IDataStream* _data) override;
+
+        /** Is data with specified name exist.
+            @param _name Resource name.
+        */
+        bool isDataExist(const std::string& _name) const override;
+
+        /** Get all data names with names that matches pattern.
+            @param _pattern Pattern to match (for example "*.layout").
+        */
+        const MyGUI::VectorString& getDataListNames(const std::string& _pattern) const override;
+
+        /** Get full path to data.
+            @param _name Resource name.
+            @return Return full path to specified data.
+        */
+        const std::string& getDataPath(const std::string& _name) const override;
+
+    private:
+        std::filesystem::path mResourcePath;
+
+        const VFS::Manager* mVfs;
+    };
 
 }
 
diff --git a/components/myguiplatform/myguiloglistener.cpp b/components/myguiplatform/myguiloglistener.cpp
index e389f5bf92..9002d390f5 100644
--- a/components/myguiplatform/myguiloglistener.cpp
+++ b/components/myguiplatform/myguiloglistener.cpp
@@ -25,16 +25,16 @@ namespace osgMyGUI
             mStream.flush();
     }
 
-    void CustomLogListener::log(const std::string& _section, MyGUI::LogLevel _level, const struct tm* _time, const std::string& _message, const char* _file, int _line)
+    void CustomLogListener::log(const std::string& _section, MyGUI::LogLevel _level, const struct tm* _time,
+        const std::string& _message, const char* _file, int _line)
     {
         if (mStream.is_open())
         {
             const char* separator = "  |  ";
-            mStream << std::setw(2) << std::setfill('0') << _time->tm_hour << ":"
-                << std::setw(2) << std::setfill('0') << _time->tm_min << ":"
-                << std::setw(2) << std::setfill('0') << _time->tm_sec << separator
-                << _section << separator << _level.print() << separator
-                << _message << separator << _file << separator << _line << std::endl;
+            mStream << std::setw(2) << std::setfill('0') << _time->tm_hour << ":" << std::setw(2) << std::setfill('0')
+                    << _time->tm_min << ":" << std::setw(2) << std::setfill('0') << _time->tm_sec << separator
+                    << _section << separator << _level.print() << separator << _message << separator << _file
+                    << separator << _line << std::endl;
         }
     }
 }
diff --git a/components/myguiplatform/myguiloglistener.hpp b/components/myguiplatform/myguiloglistener.hpp
index 6379428e00..ec8bd16578 100644
--- a/components/myguiplatform/myguiloglistener.hpp
+++ b/components/myguiplatform/myguiloglistener.hpp
@@ -1,14 +1,14 @@
 #ifndef OPENMW_COMPONENTS_MYGUIPLATFORM_LOGLISTENER_H
 #define OPENMW_COMPONENTS_MYGUIPLATFORM_LOGLISTENER_H
 
-#include <string>
 #include <filesystem>
 #include <fstream>
+#include <string>
 
-#include <MyGUI_ILogListener.h>
-#include <MyGUI_LogSource.h>
 #include <MyGUI_ConsoleLogListener.h>
+#include <MyGUI_ILogListener.h>
 #include <MyGUI_LevelLogFilter.h>
+#include <MyGUI_LogSource.h>
 
 namespace osgMyGUI
 {
@@ -19,9 +19,10 @@ namespace osgMyGUI
     class CustomLogListener : public MyGUI::ILogListener
     {
     public:
-        CustomLogListener(const std::filesystem::path &name)
+        CustomLogListener(const std::filesystem::path& name)
             : mFileName(name)
-        {}
+        {
+        }
 
         ~CustomLogListener() {}
 
@@ -29,7 +30,8 @@ namespace osgMyGUI
         void close() override;
         void flush() override;
 
-        void log(const std::string& _section, MyGUI::LogLevel _level, const struct tm* _time, const std::string& _message, const char* _file, int _line) override;
+        void log(const std::string& _section, MyGUI::LogLevel _level, const struct tm* _time,
+            const std::string& _message, const char* _file, int _line) override;
 
     private:
         std::ofstream mStream;
@@ -40,15 +42,14 @@ namespace osgMyGUI
     /// MyGUI log creation
     class LogFacility
     {
-        MyGUI::ConsoleLogListener  mConsole;
-        CustomLogListener   mFile;
-        MyGUI::LevelLogFilter      mFilter;
-        MyGUI::LogSource           mSource;
+        MyGUI::ConsoleLogListener mConsole;
+        CustomLogListener mFile;
+        MyGUI::LevelLogFilter mFilter;
+        MyGUI::LogSource mSource;
 
     public:
-
-        LogFacility(const std::filesystem::path &output, bool console)
-          : mFile(output)
+        LogFacility(const std::filesystem::path& output, bool console)
+            : mFile(output)
         {
             mConsole.setEnabled(console);
             mFilter.setLoggingLevel(MyGUI::LogLevel::Info);
@@ -60,7 +61,7 @@ namespace osgMyGUI
             mSource.open();
         }
 
-        MyGUI::LogSource *getSource() { return &mSource; }
+        MyGUI::LogSource* getSource() { return &mSource; }
     };
 
 }
diff --git a/components/myguiplatform/myguiplatform.cpp b/components/myguiplatform/myguiplatform.cpp
index ef9faecfb7..20fdaa7e7c 100644
--- a/components/myguiplatform/myguiplatform.cpp
+++ b/components/myguiplatform/myguiplatform.cpp
@@ -1,42 +1,43 @@
 #include "myguiplatform.hpp"
 
-#include "myguirendermanager.hpp"
 #include "myguidatamanager.hpp"
 #include "myguiloglistener.hpp"
+#include "myguirendermanager.hpp"
 
 #include "components/files/conversion.hpp"
 
 namespace osgMyGUI
 {
 
-Platform::Platform(osgViewer::Viewer *viewer, osg::Group* guiRoot, Resource::ImageManager* imageManager,
-    const VFS::Manager* vfs, float uiScalingFactor, const std::filesystem::path& resourcePath, const std::filesystem::path& logName)
-    : mLogFacility(logName.empty() ? nullptr : std::make_unique<LogFacility>(logName, false))
-    , mLogManager(std::make_unique<MyGUI::LogManager>())
-    , mDataManager(std::make_unique<DataManager>(Files::pathToUnicodeString(resourcePath), vfs))
-    , mRenderManager(std::make_unique<RenderManager>(viewer, guiRoot, imageManager, uiScalingFactor))
-{
-    if (mLogFacility != nullptr)
-        mLogManager->addLogSource(mLogFacility->getSource());
-
-    mRenderManager->initialise();
-}
-
-Platform::~Platform() = default;
-
-void Platform::shutdown()
-{
-    mRenderManager->shutdown();
-}
-
-RenderManager *Platform::getRenderManagerPtr()
-{
-    return mRenderManager.get();
-}
-
-DataManager *Platform::getDataManagerPtr()
-{
-    return mDataManager.get();
-}
+    Platform::Platform(osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::ImageManager* imageManager,
+        const VFS::Manager* vfs, float uiScalingFactor, const std::filesystem::path& resourcePath,
+        const std::filesystem::path& logName)
+        : mLogFacility(logName.empty() ? nullptr : std::make_unique<LogFacility>(logName, false))
+        , mLogManager(std::make_unique<MyGUI::LogManager>())
+        , mDataManager(std::make_unique<DataManager>(Files::pathToUnicodeString(resourcePath), vfs))
+        , mRenderManager(std::make_unique<RenderManager>(viewer, guiRoot, imageManager, uiScalingFactor))
+    {
+        if (mLogFacility != nullptr)
+            mLogManager->addLogSource(mLogFacility->getSource());
+
+        mRenderManager->initialise();
+    }
+
+    Platform::~Platform() = default;
+
+    void Platform::shutdown()
+    {
+        mRenderManager->shutdown();
+    }
+
+    RenderManager* Platform::getRenderManagerPtr()
+    {
+        return mRenderManager.get();
+    }
+
+    DataManager* Platform::getDataManagerPtr()
+    {
+        return mDataManager.get();
+    }
 
 }
diff --git a/components/myguiplatform/myguiplatform.hpp b/components/myguiplatform/myguiplatform.hpp
index a4812cc0b9..66b02cd8ba 100644
--- a/components/myguiplatform/myguiplatform.hpp
+++ b/components/myguiplatform/myguiplatform.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_COMPONENTS_MYGUIPLATFORM_MYGUIPLATFORM_H
 #define OPENMW_COMPONENTS_MYGUIPLATFORM_MYGUIPLATFORM_H
 
-#include <string>
-#include <memory>
 #include <filesystem>
+#include <memory>
+#include <string>
 
 namespace osgViewer
 {
diff --git a/components/myguiplatform/myguirendermanager.cpp b/components/myguiplatform/myguirendermanager.cpp
index 2ac65c559d..8fff38d668 100644
--- a/components/myguiplatform/myguirendermanager.cpp
+++ b/components/myguiplatform/myguirendermanager.cpp
@@ -3,575 +3,564 @@
 #include <MyGUI_Timer.h>
 
 #include <osg/Drawable>
-#include <osg/Texture2D>
 #include <osg/TexMat>
+#include <osg/Texture2D>
 
 #include <osgViewer/Viewer>
 
 #include <osgGA/GUIEventHandler>
 
 #include <components/resource/imagemanager.hpp>
-#include <components/shader/shadermanager.hpp>
 #include <components/sceneutil/nodecallback.hpp>
+#include <components/shader/shadermanager.hpp>
 
 #include "myguitexture.hpp"
 
 #define MYGUI_PLATFORM_LOG_SECTION "Platform"
 #define MYGUI_PLATFORM_LOG(level, text) MYGUI_LOGGING(MYGUI_PLATFORM_LOG_SECTION, level, text)
 
-#define MYGUI_PLATFORM_EXCEPT(dest) do { \
-    MYGUI_PLATFORM_LOG(Critical, dest); \
-    std::ostringstream stream; \
-    stream << dest << "\n"; \
-    MYGUI_BASE_EXCEPT(stream.str().c_str(), "MyGUI"); \
-} while(0)
-
-#define MYGUI_PLATFORM_ASSERT(exp, dest) do { \
-    if ( ! (exp) ) \
-    { \
-        MYGUI_PLATFORM_LOG(Critical, dest); \
-        std::ostringstream stream; \
-        stream << dest << "\n"; \
-        MYGUI_BASE_EXCEPT(stream.str().c_str(), "MyGUI"); \
-    } \
-} while(0)
+#define MYGUI_PLATFORM_EXCEPT(dest)                                                                                    \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        MYGUI_PLATFORM_LOG(Critical, dest);                                                                            \
+        std::ostringstream stream;                                                                                     \
+        stream << dest << "\n";                                                                                        \
+        MYGUI_BASE_EXCEPT(stream.str().c_str(), "MyGUI");                                                              \
+    } while (0)
+
+#define MYGUI_PLATFORM_ASSERT(exp, dest)                                                                               \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        if (!(exp))                                                                                                    \
+        {                                                                                                              \
+            MYGUI_PLATFORM_LOG(Critical, dest);                                                                        \
+            std::ostringstream stream;                                                                                 \
+            stream << dest << "\n";                                                                                    \
+            MYGUI_BASE_EXCEPT(stream.str().c_str(), "MyGUI");                                                          \
+        }                                                                                                              \
+    } while (0)
 
 namespace osgMyGUI
 {
 
-class Drawable : public osg::Drawable {
-    osgMyGUI::RenderManager *mParent;
-    osg::ref_ptr<osg::StateSet> mStateSet;
-
-public:
-
-    // Stage 0: update widget animations and controllers. Run during the Update traversal.
-    class FrameUpdate : public SceneUtil::NodeCallback<FrameUpdate>
+    class Drawable : public osg::Drawable
     {
-    public:
-        FrameUpdate()
-            : mRenderManager(nullptr)
-        {
-        }
-
-        void setRenderManager(osgMyGUI::RenderManager* renderManager)
-        {
-            mRenderManager = renderManager;
-        }
-
-        void operator()(osg::Node*, osg::NodeVisitor*)
-        {
-            mRenderManager->update();
-        }
-
-    private:
-        osgMyGUI::RenderManager* mRenderManager;
-    };
+        osgMyGUI::RenderManager* mParent;
+        osg::ref_ptr<osg::StateSet> mStateSet;
 
-    // Stage 1: collect draw calls. Run during the Cull traversal.
-    class CollectDrawCalls : public SceneUtil::NodeCallback<CollectDrawCalls>
-    {
     public:
-        CollectDrawCalls()
-            : mRenderManager(nullptr)
-        {
-        }
-
-        void setRenderManager(osgMyGUI::RenderManager* renderManager)
+        // Stage 0: update widget animations and controllers. Run during the Update traversal.
+        class FrameUpdate : public SceneUtil::NodeCallback<FrameUpdate>
         {
-            mRenderManager = renderManager;
-        }
-
-        void operator()(osg::Node*, osg::NodeVisitor*)
-        {
-            mRenderManager->collectDrawCalls();
-        }
-
-    private:
-        osgMyGUI::RenderManager* mRenderManager;
-    };
-
-    // Stage 2: execute the draw calls. Run during the Draw traversal. May run in parallel with the update traversal of the next frame.
-    void drawImplementation(osg::RenderInfo &renderInfo) const override
-    {
-        osg::State *state = renderInfo.getState();
-
-        state->pushStateSet(mStateSet);
-        state->apply();
-
-        state->disableAllVertexArrays();
-        state->setClientActiveTextureUnit(0);
-        glEnableClientState(GL_VERTEX_ARRAY);
-        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-        glEnableClientState(GL_COLOR_ARRAY);
-
-        mReadFrom = (mReadFrom+1)%sNumBuffers;
-        const std::vector<Batch>& vec = mBatchVector[mReadFrom];
-        for (std::vector<Batch>::const_iterator it = vec.begin(); it != vec.end(); ++it)
-        {
-            const Batch& batch = *it;
-            osg::VertexBufferObject *vbo = batch.mVertexBuffer;
-
-            if (batch.mStateSet)
+        public:
+            FrameUpdate()
+                : mRenderManager(nullptr)
             {
-                state->pushStateSet(batch.mStateSet);
-                state->apply();
             }
 
-            // A GUI element without an associated texture would be extremely rare.
-            // It is worth it to use a dummy 1x1 black texture sampler instead of either adding a conditional or relinking shaders.
-            osg::Texture2D* texture = batch.mTexture;
-            if(texture)
-                state->applyTextureAttribute(0, texture);
-            else
-                state->applyTextureAttribute(0, mDummyTexture);
+            void setRenderManager(osgMyGUI::RenderManager* renderManager) { mRenderManager = renderManager; }
 
-            osg::GLBufferObject* bufferobject = state->isVertexBufferObjectSupported() ? vbo->getOrCreateGLBufferObject(state->getContextID()) : nullptr;
-            if (bufferobject)
-            {
-                state->bindVertexBufferObject(bufferobject);
+            void operator()(osg::Node*, osg::NodeVisitor*) { mRenderManager->update(); }
 
-                glVertexPointer(3, GL_FLOAT, sizeof(MyGUI::Vertex), reinterpret_cast<char*>(0));
-                glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(MyGUI::Vertex), reinterpret_cast<char*>(12));
-                glTexCoordPointer(2, GL_FLOAT, sizeof(MyGUI::Vertex), reinterpret_cast<char*>(16));
-            }
-            else
+        private:
+            osgMyGUI::RenderManager* mRenderManager;
+        };
+
+        // Stage 1: collect draw calls. Run during the Cull traversal.
+        class CollectDrawCalls : public SceneUtil::NodeCallback<CollectDrawCalls>
+        {
+        public:
+            CollectDrawCalls()
+                : mRenderManager(nullptr)
             {
-                glVertexPointer(3, GL_FLOAT, sizeof(MyGUI::Vertex), reinterpret_cast<const char*>(vbo->getArray(0)->getDataPointer()));
-                glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(MyGUI::Vertex), reinterpret_cast<const char*>(vbo->getArray(0)->getDataPointer()) + 12);
-                glTexCoordPointer(2, GL_FLOAT, sizeof(MyGUI::Vertex), reinterpret_cast<const char*>(vbo->getArray(0)->getDataPointer()) + 16);
             }
 
-            glDrawArrays(GL_TRIANGLES, 0, batch.mVertexCount);
+            void setRenderManager(osgMyGUI::RenderManager* renderManager) { mRenderManager = renderManager; }
 
-            if (batch.mStateSet)
-            {
-                state->popStateSet();
-                state->apply();
-            }
-        }
+            void operator()(osg::Node*, osg::NodeVisitor*) { mRenderManager->collectDrawCalls(); }
 
-        glDisableClientState(GL_VERTEX_ARRAY);
-        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-        glDisableClientState(GL_COLOR_ARRAY);
+        private:
+            osgMyGUI::RenderManager* mRenderManager;
+        };
 
-        state->popStateSet();
+        // Stage 2: execute the draw calls. Run during the Draw traversal. May run in parallel with the update traversal
+        // of the next frame.
+        void drawImplementation(osg::RenderInfo& renderInfo) const override
+        {
+            osg::State* state = renderInfo.getState();
 
-        state->unbindVertexBufferObject();
-        state->dirtyAllVertexArrays();
-        state->disableAllVertexArrays();
-    }
+            state->pushStateSet(mStateSet);
+            state->apply();
 
-public:
-    Drawable(osgMyGUI::RenderManager *parent = nullptr)
-        : mParent(parent)
-        , mWriteTo(0)
-        , mReadFrom(0)
-    {
-        setSupportsDisplayList(false);
-
-        osg::ref_ptr<CollectDrawCalls> collectDrawCalls = new CollectDrawCalls;
-        collectDrawCalls->setRenderManager(mParent);
-        setCullCallback(collectDrawCalls);
-
-        osg::ref_ptr<FrameUpdate> frameUpdate = new FrameUpdate;
-        frameUpdate->setRenderManager(mParent);
-        setUpdateCallback(frameUpdate);
-
-        mStateSet = new osg::StateSet;
-        mStateSet->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
-        mStateSet->setTextureMode(0, GL_TEXTURE_2D, osg::StateAttribute::ON);
-        mStateSet->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
-        mStateSet->setMode(GL_BLEND, osg::StateAttribute::ON);
-
-        mDummyTexture = new osg::Texture2D;
-        mDummyTexture->setInternalFormat(GL_RGB);
-        mDummyTexture->setTextureSize(1,1);
-
-        // need to flip tex coords since MyGUI uses DirectX convention of top left image origin
-        osg::Matrix flipMat;
-        flipMat.preMultTranslate(osg::Vec3f(0,1,0));
-        flipMat.preMultScale(osg::Vec3f(1,-1,1));
-        mStateSet->setTextureAttribute(0, new osg::TexMat(flipMat), osg::StateAttribute::ON);
-    }
-    Drawable(const Drawable &copy, const osg::CopyOp &copyop=osg::CopyOp::SHALLOW_COPY)
-        : osg::Drawable(copy, copyop)
-        , mParent(copy.mParent)
-        , mStateSet(copy.mStateSet)
-        , mWriteTo(0)
-        , mReadFrom(0)
-        , mDummyTexture(copy.mDummyTexture)
-    {
-    }
+            state->disableAllVertexArrays();
+            state->setClientActiveTextureUnit(0);
+            glEnableClientState(GL_VERTEX_ARRAY);
+            glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+            glEnableClientState(GL_COLOR_ARRAY);
 
-    // Defines the necessary information for a draw call
-    struct Batch
-    {
-        // May be empty
-        osg::ref_ptr<osg::Texture2D> mTexture;
+            mReadFrom = (mReadFrom + 1) % sNumBuffers;
+            const std::vector<Batch>& vec = mBatchVector[mReadFrom];
+            for (std::vector<Batch>::const_iterator it = vec.begin(); it != vec.end(); ++it)
+            {
+                const Batch& batch = *it;
+                osg::VertexBufferObject* vbo = batch.mVertexBuffer;
+
+                if (batch.mStateSet)
+                {
+                    state->pushStateSet(batch.mStateSet);
+                    state->apply();
+                }
+
+                // A GUI element without an associated texture would be extremely rare.
+                // It is worth it to use a dummy 1x1 black texture sampler instead of either adding a conditional or
+                // relinking shaders.
+                osg::Texture2D* texture = batch.mTexture;
+                if (texture)
+                    state->applyTextureAttribute(0, texture);
+                else
+                    state->applyTextureAttribute(0, mDummyTexture);
+
+                osg::GLBufferObject* bufferobject = state->isVertexBufferObjectSupported()
+                    ? vbo->getOrCreateGLBufferObject(state->getContextID())
+                    : nullptr;
+                if (bufferobject)
+                {
+                    state->bindVertexBufferObject(bufferobject);
+
+                    glVertexPointer(3, GL_FLOAT, sizeof(MyGUI::Vertex), reinterpret_cast<char*>(0));
+                    glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(MyGUI::Vertex), reinterpret_cast<char*>(12));
+                    glTexCoordPointer(2, GL_FLOAT, sizeof(MyGUI::Vertex), reinterpret_cast<char*>(16));
+                }
+                else
+                {
+                    glVertexPointer(3, GL_FLOAT, sizeof(MyGUI::Vertex),
+                        reinterpret_cast<const char*>(vbo->getArray(0)->getDataPointer()));
+                    glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(MyGUI::Vertex),
+                        reinterpret_cast<const char*>(vbo->getArray(0)->getDataPointer()) + 12);
+                    glTexCoordPointer(2, GL_FLOAT, sizeof(MyGUI::Vertex),
+                        reinterpret_cast<const char*>(vbo->getArray(0)->getDataPointer()) + 16);
+                }
+
+                glDrawArrays(GL_TRIANGLES, 0, batch.mVertexCount);
+
+                if (batch.mStateSet)
+                {
+                    state->popStateSet();
+                    state->apply();
+                }
+            }
 
-        osg::ref_ptr<osg::VertexBufferObject> mVertexBuffer;
-        // need to hold on to this too as the mVertexBuffer does not hold a ref to its own array
-        osg::ref_ptr<osg::Array> mArray;
+            glDisableClientState(GL_VERTEX_ARRAY);
+            glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+            glDisableClientState(GL_COLOR_ARRAY);
 
-        // optional
-        osg::ref_ptr<osg::StateSet> mStateSet;
+            state->popStateSet();
 
-        size_t mVertexCount;
-    };
+            state->unbindVertexBufferObject();
+            state->dirtyAllVertexArrays();
+            state->disableAllVertexArrays();
+        }
 
-    void addBatch(const Batch& batch)
-    {
-        mBatchVector[mWriteTo].push_back(batch);
-    }
+    public:
+        Drawable(osgMyGUI::RenderManager* parent = nullptr)
+            : mParent(parent)
+            , mWriteTo(0)
+            , mReadFrom(0)
+        {
+            setSupportsDisplayList(false);
+
+            osg::ref_ptr<CollectDrawCalls> collectDrawCalls = new CollectDrawCalls;
+            collectDrawCalls->setRenderManager(mParent);
+            setCullCallback(collectDrawCalls);
+
+            osg::ref_ptr<FrameUpdate> frameUpdate = new FrameUpdate;
+            frameUpdate->setRenderManager(mParent);
+            setUpdateCallback(frameUpdate);
+
+            mStateSet = new osg::StateSet;
+            mStateSet->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+            mStateSet->setTextureMode(0, GL_TEXTURE_2D, osg::StateAttribute::ON);
+            mStateSet->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+            mStateSet->setMode(GL_BLEND, osg::StateAttribute::ON);
+
+            mDummyTexture = new osg::Texture2D;
+            mDummyTexture->setInternalFormat(GL_RGB);
+            mDummyTexture->setTextureSize(1, 1);
+
+            // need to flip tex coords since MyGUI uses DirectX convention of top left image origin
+            osg::Matrix flipMat;
+            flipMat.preMultTranslate(osg::Vec3f(0, 1, 0));
+            flipMat.preMultScale(osg::Vec3f(1, -1, 1));
+            mStateSet->setTextureAttribute(0, new osg::TexMat(flipMat), osg::StateAttribute::ON);
+        }
+        Drawable(const Drawable& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY)
+            : osg::Drawable(copy, copyop)
+            , mParent(copy.mParent)
+            , mStateSet(copy.mStateSet)
+            , mWriteTo(0)
+            , mReadFrom(0)
+            , mDummyTexture(copy.mDummyTexture)
+        {
+        }
 
-    void clear()
-    {
-        mWriteTo = (mWriteTo+1)%sNumBuffers;
-        mBatchVector[mWriteTo].clear();
-    }
+        // Defines the necessary information for a draw call
+        struct Batch
+        {
+            // May be empty
+            osg::ref_ptr<osg::Texture2D> mTexture;
 
-    osg::StateSet* getDrawableStateSet()
-    {
-        return mStateSet;
-    }
+            osg::ref_ptr<osg::VertexBufferObject> mVertexBuffer;
+            // need to hold on to this too as the mVertexBuffer does not hold a ref to its own array
+            osg::ref_ptr<osg::Array> mArray;
 
-    META_Object(osgMyGUI, Drawable)
+            // optional
+            osg::ref_ptr<osg::StateSet> mStateSet;
 
-private:
-    // 2 would be enough in most cases, use 4 to get stereo working
-    static const int sNumBuffers = 4;
+            size_t mVertexCount;
+        };
 
-    // double buffering approach, to avoid the need for synchronization with the draw thread
-    std::vector<Batch> mBatchVector[sNumBuffers];
+        void addBatch(const Batch& batch) { mBatchVector[mWriteTo].push_back(batch); }
 
-    int mWriteTo;
-    mutable int mReadFrom;
+        void clear()
+        {
+            mWriteTo = (mWriteTo + 1) % sNumBuffers;
+            mBatchVector[mWriteTo].clear();
+        }
 
-    osg::ref_ptr<osg::Texture2D> mDummyTexture;
-};
+        osg::StateSet* getDrawableStateSet() { return mStateSet; }
 
-class OSGVertexBuffer : public MyGUI::IVertexBuffer
-{
-    osg::ref_ptr<osg::VertexBufferObject> mBuffer[2];
-    osg::ref_ptr<osg::UByteArray> mVertexArray[2];
+        META_Object(osgMyGUI, Drawable)
 
-    size_t mNeedVertexCount;
+    private:
+        // 2 would be enough in most cases, use 4 to get stereo working
+        static const int sNumBuffers = 4;
 
-    unsigned int mCurrentBuffer;
-    bool mUsed; // has the mCurrentBuffer been submitted to the rendering thread
+        // double buffering approach, to avoid the need for synchronization with the draw thread
+        std::vector<Batch> mBatchVector[sNumBuffers];
 
-    void destroy();
-    osg::UByteArray* create();
+        int mWriteTo;
+        mutable int mReadFrom;
 
-public:
-    OSGVertexBuffer();
-    virtual ~OSGVertexBuffer() {}
+        osg::ref_ptr<osg::Texture2D> mDummyTexture;
+    };
 
-    void markUsed();
+    class OSGVertexBuffer : public MyGUI::IVertexBuffer
+    {
+        osg::ref_ptr<osg::VertexBufferObject> mBuffer[2];
+        osg::ref_ptr<osg::UByteArray> mVertexArray[2];
 
-    osg::Array* getVertexArray();
-    osg::VertexBufferObject* getVertexBuffer();
+        size_t mNeedVertexCount;
 
-    void setVertexCount(size_t count) override;
-    size_t getVertexCount() const override;
+        unsigned int mCurrentBuffer;
+        bool mUsed; // has the mCurrentBuffer been submitted to the rendering thread
 
-    MyGUI::Vertex *lock() override;
-    void unlock() override;
+        void destroy();
+        osg::UByteArray* create();
 
-};
+    public:
+        OSGVertexBuffer();
+        virtual ~OSGVertexBuffer() {}
 
-OSGVertexBuffer::OSGVertexBuffer()
-  : mNeedVertexCount(0)
-  , mCurrentBuffer(0)
-  , mUsed(false)
-{
-}
+        void markUsed();
 
-void OSGVertexBuffer::markUsed()
-{
-    mUsed = true;
-}
+        osg::Array* getVertexArray();
+        osg::VertexBufferObject* getVertexBuffer();
 
-void OSGVertexBuffer::setVertexCount(size_t count)
-{
-    if(count == mNeedVertexCount)
-        return;
+        void setVertexCount(size_t count) override;
+        size_t getVertexCount() const override;
 
-    mNeedVertexCount = count;
-}
+        MyGUI::Vertex* lock() override;
+        void unlock() override;
+    };
 
-size_t OSGVertexBuffer::getVertexCount() const
-{
-    return mNeedVertexCount;
-}
+    OSGVertexBuffer::OSGVertexBuffer()
+        : mNeedVertexCount(0)
+        , mCurrentBuffer(0)
+        , mUsed(false)
+    {
+    }
 
-MyGUI::Vertex *OSGVertexBuffer::lock()
-{
-    if (mUsed)
+    void OSGVertexBuffer::markUsed()
     {
-        mCurrentBuffer = (mCurrentBuffer+1)%2;
-        mUsed = false;
+        mUsed = true;
     }
-    osg::UByteArray* array = mVertexArray[mCurrentBuffer];
-    if (!array)
+
+    void OSGVertexBuffer::setVertexCount(size_t count)
     {
-        array = create();
+        if (count == mNeedVertexCount)
+            return;
+
+        mNeedVertexCount = count;
     }
-    else if (array->size() != mNeedVertexCount * sizeof(MyGUI::Vertex))
+
+    size_t OSGVertexBuffer::getVertexCount() const
     {
-        array->resize(mNeedVertexCount * sizeof(MyGUI::Vertex));
+        return mNeedVertexCount;
     }
 
-    return (MyGUI::Vertex*)&(*array)[0];
-}
+    MyGUI::Vertex* OSGVertexBuffer::lock()
+    {
+        if (mUsed)
+        {
+            mCurrentBuffer = (mCurrentBuffer + 1) % 2;
+            mUsed = false;
+        }
+        osg::UByteArray* array = mVertexArray[mCurrentBuffer];
+        if (!array)
+        {
+            array = create();
+        }
+        else if (array->size() != mNeedVertexCount * sizeof(MyGUI::Vertex))
+        {
+            array->resize(mNeedVertexCount * sizeof(MyGUI::Vertex));
+        }
 
-void OSGVertexBuffer::unlock()
-{
-    mVertexArray[mCurrentBuffer]->dirty();
-    mBuffer[mCurrentBuffer]->dirty();
-}
+        return (MyGUI::Vertex*)&(*array)[0];
+    }
 
-osg::UByteArray* OSGVertexBuffer::create()
-{
-    mVertexArray[mCurrentBuffer] = new osg::UByteArray(mNeedVertexCount*sizeof(MyGUI::Vertex));
+    void OSGVertexBuffer::unlock()
+    {
+        mVertexArray[mCurrentBuffer]->dirty();
+        mBuffer[mCurrentBuffer]->dirty();
+    }
 
-    mBuffer[mCurrentBuffer] = new osg::VertexBufferObject;
-    mBuffer[mCurrentBuffer]->setDataVariance(osg::Object::DYNAMIC);
-    mBuffer[mCurrentBuffer]->setUsage(GL_DYNAMIC_DRAW);
-    // NB mBuffer does not own the array
-    mBuffer[mCurrentBuffer]->setArray(0, mVertexArray[mCurrentBuffer].get());
+    osg::UByteArray* OSGVertexBuffer::create()
+    {
+        mVertexArray[mCurrentBuffer] = new osg::UByteArray(mNeedVertexCount * sizeof(MyGUI::Vertex));
 
-    return mVertexArray[mCurrentBuffer];
-}
+        mBuffer[mCurrentBuffer] = new osg::VertexBufferObject;
+        mBuffer[mCurrentBuffer]->setDataVariance(osg::Object::DYNAMIC);
+        mBuffer[mCurrentBuffer]->setUsage(GL_DYNAMIC_DRAW);
+        // NB mBuffer does not own the array
+        mBuffer[mCurrentBuffer]->setArray(0, mVertexArray[mCurrentBuffer].get());
 
-osg::Array* OSGVertexBuffer::getVertexArray()
-{
-    return mVertexArray[mCurrentBuffer];
-}
+        return mVertexArray[mCurrentBuffer];
+    }
 
-osg::VertexBufferObject* OSGVertexBuffer::getVertexBuffer()
-{
-    return mBuffer[mCurrentBuffer];
-}
+    osg::Array* OSGVertexBuffer::getVertexArray()
+    {
+        return mVertexArray[mCurrentBuffer];
+    }
 
-// ---------------------------------------------------------------------------
+    osg::VertexBufferObject* OSGVertexBuffer::getVertexBuffer()
+    {
+        return mBuffer[mCurrentBuffer];
+    }
 
-RenderManager::RenderManager(osgViewer::Viewer *viewer, osg::Group *sceneroot, Resource::ImageManager* imageManager, float scalingFactor)
-  : mViewer(viewer)
-  , mSceneRoot(sceneroot)
-  , mImageManager(imageManager)
-  , mUpdate(false)
-  , mIsInitialise(false)
-  , mInvScalingFactor(1.f)
-  , mInjectState(nullptr)
-{
-    if (scalingFactor != 0.f)
-        mInvScalingFactor = 1.f / scalingFactor;
-}
+    // ---------------------------------------------------------------------------
+
+    RenderManager::RenderManager(
+        osgViewer::Viewer* viewer, osg::Group* sceneroot, Resource::ImageManager* imageManager, float scalingFactor)
+        : mViewer(viewer)
+        , mSceneRoot(sceneroot)
+        , mImageManager(imageManager)
+        , mUpdate(false)
+        , mIsInitialise(false)
+        , mInvScalingFactor(1.f)
+        , mInjectState(nullptr)
+    {
+        if (scalingFactor != 0.f)
+            mInvScalingFactor = 1.f / scalingFactor;
+    }
 
-RenderManager::~RenderManager()
-{
-    MYGUI_PLATFORM_LOG(Info, "* Shutdown: "<<getClassTypeName());
+    RenderManager::~RenderManager()
+    {
+        MYGUI_PLATFORM_LOG(Info, "* Shutdown: " << getClassTypeName());
 
-    if(mGuiRoot.valid())
-        mSceneRoot->removeChild(mGuiRoot.get());
-    mGuiRoot = nullptr;
-    mSceneRoot = nullptr;
-    mViewer = nullptr;
+        if (mGuiRoot.valid())
+            mSceneRoot->removeChild(mGuiRoot.get());
+        mGuiRoot = nullptr;
+        mSceneRoot = nullptr;
+        mViewer = nullptr;
 
-    MYGUI_PLATFORM_LOG(Info, getClassTypeName()<<" successfully shutdown");
-    mIsInitialise = false;
-}
+        MYGUI_PLATFORM_LOG(Info, getClassTypeName() << " successfully shutdown");
+        mIsInitialise = false;
+    }
 
+    void RenderManager::initialise()
+    {
+        MYGUI_PLATFORM_ASSERT(!mIsInitialise, getClassTypeName() << " initialised twice");
+        MYGUI_PLATFORM_LOG(Info, "* Initialise: " << getClassTypeName());
 
-void RenderManager::initialise()
-{
-    MYGUI_PLATFORM_ASSERT(!mIsInitialise, getClassTypeName()<<" initialised twice");
-    MYGUI_PLATFORM_LOG(Info, "* Initialise: "<<getClassTypeName());
+        mVertexFormat = MyGUI::VertexColourType::ColourABGR;
 
-    mVertexFormat = MyGUI::VertexColourType::ColourABGR;
+        mUpdate = false;
 
-    mUpdate = false;
+        mDrawable = new Drawable(this);
 
-    mDrawable = new Drawable(this);
+        osg::ref_ptr<osg::Camera> camera = new osg::Camera();
+        camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
+        camera->setProjectionResizePolicy(osg::Camera::FIXED);
+        camera->setProjectionMatrix(osg::Matrix::identity());
+        camera->setViewMatrix(osg::Matrix::identity());
+        camera->setRenderOrder(osg::Camera::POST_RENDER);
+        camera->setClearMask(GL_NONE);
+        mDrawable->setCullingActive(false);
+        camera->addChild(mDrawable.get());
 
-    osg::ref_ptr<osg::Camera> camera = new osg::Camera();
-    camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
-    camera->setProjectionResizePolicy(osg::Camera::FIXED);
-    camera->setProjectionMatrix(osg::Matrix::identity());
-    camera->setViewMatrix(osg::Matrix::identity());
-    camera->setRenderOrder(osg::Camera::POST_RENDER);
-    camera->setClearMask(GL_NONE);
-    mDrawable->setCullingActive(false);
-    camera->addChild(mDrawable.get());
+        mGuiRoot = camera;
+        mSceneRoot->addChild(mGuiRoot.get());
 
-    mGuiRoot = camera;
-    mSceneRoot->addChild(mGuiRoot.get());
+        osg::ref_ptr<osg::Viewport> vp = mViewer->getCamera()->getViewport();
+        setViewSize(vp->width(), vp->height());
 
-    osg::ref_ptr<osg::Viewport> vp = mViewer->getCamera()->getViewport();
-    setViewSize(vp->width(), vp->height());
+        MYGUI_PLATFORM_LOG(Info, getClassTypeName() << " successfully initialized");
+        mIsInitialise = true;
+    }
 
-    MYGUI_PLATFORM_LOG(Info, getClassTypeName()<<" successfully initialized");
-    mIsInitialise = true;
-}
+    void RenderManager::shutdown()
+    {
+        mGuiRoot->removeChildren(0, mGuiRoot->getNumChildren());
+        mSceneRoot->removeChild(mGuiRoot);
+    }
 
-void RenderManager::shutdown()
-{
-    mGuiRoot->removeChildren(0, mGuiRoot->getNumChildren());
-    mSceneRoot->removeChild(mGuiRoot);
-}
+    void RenderManager::enableShaders(Shader::ShaderManager& shaderManager)
+    {
+        auto vertexShader = shaderManager.getShader("gui_vertex.glsl", {}, osg::Shader::VERTEX);
+        auto fragmentShader = shaderManager.getShader("gui_fragment.glsl", {}, osg::Shader::FRAGMENT);
+        auto program = shaderManager.getProgram(vertexShader, fragmentShader);
 
-void RenderManager::enableShaders(Shader::ShaderManager& shaderManager)
-{
-    auto vertexShader = shaderManager.getShader("gui_vertex.glsl", {}, osg::Shader::VERTEX);
-    auto fragmentShader = shaderManager.getShader("gui_fragment.glsl", {}, osg::Shader::FRAGMENT);
-    auto program = shaderManager.getProgram(vertexShader, fragmentShader);
+        mDrawable->getDrawableStateSet()->setAttributeAndModes(program, osg::StateAttribute::ON);
+        mDrawable->getDrawableStateSet()->addUniform(new osg::Uniform("diffuseMap", 0));
+    }
 
-    mDrawable->getDrawableStateSet()->setAttributeAndModes(program, osg::StateAttribute::ON);
-    mDrawable->getDrawableStateSet()->addUniform(new osg::Uniform("diffuseMap", 0));
-}
+    MyGUI::IVertexBuffer* RenderManager::createVertexBuffer()
+    {
+        return new OSGVertexBuffer();
+    }
 
-MyGUI::IVertexBuffer* RenderManager::createVertexBuffer()
-{
-    return new OSGVertexBuffer();
-}
+    void RenderManager::destroyVertexBuffer(MyGUI::IVertexBuffer* buffer)
+    {
+        delete buffer;
+    }
 
-void RenderManager::destroyVertexBuffer(MyGUI::IVertexBuffer *buffer)
-{
-    delete buffer;
-}
+    void RenderManager::begin()
+    {
+        mDrawable->clear();
+        // variance will be recomputed based on textures being rendered in this frame
+        mDrawable->setDataVariance(osg::Object::STATIC);
+    }
 
+    void RenderManager::doRender(MyGUI::IVertexBuffer* buffer, MyGUI::ITexture* texture, size_t count)
+    {
+        Drawable::Batch batch;
+        batch.mVertexCount = count;
+        batch.mVertexBuffer = static_cast<OSGVertexBuffer*>(buffer)->getVertexBuffer();
+        batch.mArray = static_cast<OSGVertexBuffer*>(buffer)->getVertexArray();
+        static_cast<OSGVertexBuffer*>(buffer)->markUsed();
 
-void RenderManager::begin()
-{
-    mDrawable->clear();
-    // variance will be recomputed based on textures being rendered in this frame
-    mDrawable->setDataVariance(osg::Object::STATIC);
-}
+        if (OSGTexture* osgtexture = static_cast<OSGTexture*>(texture))
+        {
+            batch.mTexture = osgtexture->getTexture();
+            if (batch.mTexture->getDataVariance() == osg::Object::DYNAMIC)
+                mDrawable->setDataVariance(osg::Object::DYNAMIC); // only for this frame, reset in begin()
+            if (!mInjectState && osgtexture->getInjectState())
+                batch.mStateSet = osgtexture->getInjectState();
+        }
+        if (mInjectState)
+            batch.mStateSet = mInjectState;
 
-void RenderManager::doRender(MyGUI::IVertexBuffer *buffer, MyGUI::ITexture *texture, size_t count)
-{
-    Drawable::Batch batch;
-    batch.mVertexCount = count;
-    batch.mVertexBuffer = static_cast<OSGVertexBuffer*>(buffer)->getVertexBuffer();
-    batch.mArray = static_cast<OSGVertexBuffer*>(buffer)->getVertexArray();
-    static_cast<OSGVertexBuffer*>(buffer)->markUsed();
+        mDrawable->addBatch(batch);
+    }
 
-    if (OSGTexture* osgtexture = static_cast<OSGTexture*>(texture))
+    void RenderManager::setInjectState(osg::StateSet* stateSet)
     {
-        batch.mTexture = osgtexture->getTexture();
-        if (batch.mTexture->getDataVariance() == osg::Object::DYNAMIC)
-            mDrawable->setDataVariance(osg::Object::DYNAMIC); // only for this frame, reset in begin()
-        if (!mInjectState && osgtexture->getInjectState())
-            batch.mStateSet = osgtexture->getInjectState();
+        mInjectState = stateSet;
     }
-    if (mInjectState)
-        batch.mStateSet = mInjectState;
 
-    mDrawable->addBatch(batch);
-}
+    void RenderManager::end() {}
 
-void RenderManager::setInjectState(osg::StateSet* stateSet)
-{
-    mInjectState = stateSet;
-}
-
-void RenderManager::end()
-{
-}
-
-void RenderManager::update()
-{
-    static MyGUI::Timer timer;
-    static unsigned long last_time = timer.getMilliseconds();
-    unsigned long now_time = timer.getMilliseconds();
-    unsigned long time = now_time - last_time;
+    void RenderManager::update()
+    {
+        static MyGUI::Timer timer;
+        static unsigned long last_time = timer.getMilliseconds();
+        unsigned long now_time = timer.getMilliseconds();
+        unsigned long time = now_time - last_time;
 
-    onFrameEvent((float)((double)(time) / (double)1000));
+        onFrameEvent((float)((double)(time) / (double)1000));
 
-    last_time = now_time;
-}
+        last_time = now_time;
+    }
 
-void RenderManager::collectDrawCalls()
-{
-    begin();
-    onRenderToTarget(this, mUpdate);
-    end();
+    void RenderManager::collectDrawCalls()
+    {
+        begin();
+        onRenderToTarget(this, mUpdate);
+        end();
 
-    mUpdate = false;
-}
+        mUpdate = false;
+    }
 
-void RenderManager::setViewSize(int width, int height)
-{
-    if(width < 1) width = 1;
-    if(height < 1) height = 1;
+    void RenderManager::setViewSize(int width, int height)
+    {
+        if (width < 1)
+            width = 1;
+        if (height < 1)
+            height = 1;
 
-    mGuiRoot->setViewport(0, 0, width, height);
+        mGuiRoot->setViewport(0, 0, width, height);
 
-    mViewSize.set(width * mInvScalingFactor, height * mInvScalingFactor);
+        mViewSize.set(width * mInvScalingFactor, height * mInvScalingFactor);
 
-    mInfo.maximumDepth = 1;
-    mInfo.hOffset = 0;
-    mInfo.vOffset = 0;
-    mInfo.aspectCoef = float(mViewSize.height) / float(mViewSize.width);
-    mInfo.pixScaleX = 1.0f / float(mViewSize.width);
-    mInfo.pixScaleY = 1.0f / float(mViewSize.height);
+        mInfo.maximumDepth = 1;
+        mInfo.hOffset = 0;
+        mInfo.vOffset = 0;
+        mInfo.aspectCoef = float(mViewSize.height) / float(mViewSize.width);
+        mInfo.pixScaleX = 1.0f / float(mViewSize.width);
+        mInfo.pixScaleY = 1.0f / float(mViewSize.height);
 
-    onResizeView(mViewSize);
-    mUpdate = true;
-}
+        onResizeView(mViewSize);
+        mUpdate = true;
+    }
 
+    bool RenderManager::isFormatSupported(MyGUI::PixelFormat /*format*/, MyGUI::TextureUsage /*usage*/)
+    {
+        return true;
+    }
 
-bool RenderManager::isFormatSupported(MyGUI::PixelFormat /*format*/, MyGUI::TextureUsage /*usage*/)
-{
-    return true;
-}
+    MyGUI::ITexture* RenderManager::createTexture(const std::string& name)
+    {
+        const auto it = mTextures.insert_or_assign(name, OSGTexture(name, mImageManager)).first;
+        return &it->second;
+    }
 
-MyGUI::ITexture* RenderManager::createTexture(const std::string &name)
-{
-    const auto it = mTextures.insert_or_assign(name, OSGTexture(name, mImageManager)).first;
-    return &it->second;
-}
+    void RenderManager::destroyTexture(MyGUI::ITexture* texture)
+    {
+        if (texture == nullptr)
+            return;
 
-void RenderManager::destroyTexture(MyGUI::ITexture *texture)
-{
-    if(texture == nullptr)
-        return;
+        const auto item = mTextures.find(texture->getName());
+        MYGUI_PLATFORM_ASSERT(item != mTextures.end(), "Texture '" << texture->getName() << "' not found");
 
-    const auto item = mTextures.find(texture->getName());
-    MYGUI_PLATFORM_ASSERT(item != mTextures.end(), "Texture '"<<texture->getName()<<"' not found");
+        mTextures.erase(item);
+    }
 
-    mTextures.erase(item);
-}
+    MyGUI::ITexture* RenderManager::getTexture(const std::string& name)
+    {
+        if (name.empty())
+            return nullptr;
 
-MyGUI::ITexture* RenderManager::getTexture(const std::string &name)
-{
-    if (name.empty())
-        return nullptr;
+        const auto item = mTextures.find(name);
+        if (item == mTextures.end())
+        {
+            MyGUI::ITexture* tex = createTexture(name);
+            tex->loadFromFile(name);
+            return tex;
+        }
+        return &item->second;
+    }
 
-    const auto item = mTextures.find(name);
-    if(item == mTextures.end())
+    bool RenderManager::checkTexture(MyGUI::ITexture* _texture)
     {
-        MyGUI::ITexture* tex = createTexture(name);
-        tex->loadFromFile(name);
-        return tex;
+        // We support external textures that aren't registered via this manager, so can't implement this method
+        // sensibly.
+        return true;
     }
-    return &item->second;
-}
-
-bool RenderManager::checkTexture(MyGUI::ITexture* _texture)
-{
-    // We support external textures that aren't registered via this manager, so can't implement this method sensibly.
-    return true;
-}
 
-void RenderManager::registerShader(
-    const std::string& _shaderName,
-    const std::string& _vertexProgramFile,
-    const std::string& _fragmentProgramFile)
-{
-    MYGUI_PLATFORM_LOG(Warning, "osgMyGUI::RenderManager::registerShader is not implemented");
-}
+    void RenderManager::registerShader(
+        const std::string& _shaderName, const std::string& _vertexProgramFile, const std::string& _fragmentProgramFile)
+    {
+        MYGUI_PLATFORM_LOG(Warning, "osgMyGUI::RenderManager::registerShader is not implemented");
+    }
 
 }
diff --git a/components/myguiplatform/myguirendermanager.hpp b/components/myguiplatform/myguirendermanager.hpp
index b6723db283..ed8d95e378 100644
--- a/components/myguiplatform/myguirendermanager.hpp
+++ b/components/myguiplatform/myguirendermanager.hpp
@@ -31,95 +31,99 @@ namespace osg
 namespace osgMyGUI
 {
 
-class Drawable;
-class OSGTexture;
+    class Drawable;
+    class OSGTexture;
 
-class RenderManager : public MyGUI::RenderManager, public MyGUI::IRenderTarget
-{
-    osg::ref_ptr<osgViewer::Viewer> mViewer;
-    osg::ref_ptr<osg::Group> mSceneRoot;
-    osg::ref_ptr<Drawable> mDrawable;
-    Resource::ImageManager* mImageManager;
+    class RenderManager : public MyGUI::RenderManager, public MyGUI::IRenderTarget
+    {
+        osg::ref_ptr<osgViewer::Viewer> mViewer;
+        osg::ref_ptr<osg::Group> mSceneRoot;
+        osg::ref_ptr<Drawable> mDrawable;
+        Resource::ImageManager* mImageManager;
 
-    MyGUI::IntSize mViewSize;
-    bool mUpdate;
-    MyGUI::VertexColourType mVertexFormat;
-    MyGUI::RenderTargetInfo mInfo;
+        MyGUI::IntSize mViewSize;
+        bool mUpdate;
+        MyGUI::VertexColourType mVertexFormat;
+        MyGUI::RenderTargetInfo mInfo;
 
-    std::map<std::string, OSGTexture> mTextures;
+        std::map<std::string, OSGTexture> mTextures;
 
-    bool mIsInitialise;
+        bool mIsInitialise;
 
-    osg::ref_ptr<osg::Camera> mGuiRoot;
+        osg::ref_ptr<osg::Camera> mGuiRoot;
 
-    float mInvScalingFactor;
+        float mInvScalingFactor;
 
-    osg::StateSet* mInjectState;
+        osg::StateSet* mInjectState;
 
-public:
-    RenderManager(osgViewer::Viewer *viewer, osg::Group *sceneroot, Resource::ImageManager* imageManager, float scalingFactor);
-    virtual ~RenderManager();
+    public:
+        RenderManager(osgViewer::Viewer* viewer, osg::Group* sceneroot, Resource::ImageManager* imageManager,
+            float scalingFactor);
+        virtual ~RenderManager();
 
-    void initialise();
-    void shutdown();
+        void initialise();
+        void shutdown();
 
-    void enableShaders(Shader::ShaderManager& shaderManager);
+        void enableShaders(Shader::ShaderManager& shaderManager);
 
-    void setScalingFactor(float factor);
+        void setScalingFactor(float factor);
 
-    static RenderManager& getInstance() { return *getInstancePtr(); }
-    static RenderManager* getInstancePtr()
-    { return static_cast<RenderManager*>(MyGUI::RenderManager::getInstancePtr()); }
+        static RenderManager& getInstance() { return *getInstancePtr(); }
+        static RenderManager* getInstancePtr()
+        {
+            return static_cast<RenderManager*>(MyGUI::RenderManager::getInstancePtr());
+        }
 
-    /** @see RenderManager::getViewSize */
-    const MyGUI::IntSize& getViewSize() const override { return mViewSize; }
+        /** @see RenderManager::getViewSize */
+        const MyGUI::IntSize& getViewSize() const override { return mViewSize; }
 
-    /** @see RenderManager::getVertexFormat */
-    MyGUI::VertexColourType getVertexFormat() const override
-    { return mVertexFormat; }
+        /** @see RenderManager::getVertexFormat */
+        MyGUI::VertexColourType getVertexFormat() const override { return mVertexFormat; }
 
-    /** @see RenderManager::isFormatSupported */
-    bool isFormatSupported(MyGUI::PixelFormat format, MyGUI::TextureUsage usage) override;
+        /** @see RenderManager::isFormatSupported */
+        bool isFormatSupported(MyGUI::PixelFormat format, MyGUI::TextureUsage usage) override;
 
-    /** @see RenderManager::createVertexBuffer */
-    MyGUI::IVertexBuffer* createVertexBuffer() override;
-    /** @see RenderManager::destroyVertexBuffer */
-    void destroyVertexBuffer(MyGUI::IVertexBuffer *buffer) override;
+        /** @see RenderManager::createVertexBuffer */
+        MyGUI::IVertexBuffer* createVertexBuffer() override;
+        /** @see RenderManager::destroyVertexBuffer */
+        void destroyVertexBuffer(MyGUI::IVertexBuffer* buffer) override;
 
-    /** @see RenderManager::createTexture */
-    MyGUI::ITexture* createTexture(const std::string &name) override;
-    /** @see RenderManager::destroyTexture */
-    void destroyTexture(MyGUI::ITexture* _texture) override;
-    /** @see RenderManager::getTexture */
-    MyGUI::ITexture* getTexture(const std::string &name) override;
+        /** @see RenderManager::createTexture */
+        MyGUI::ITexture* createTexture(const std::string& name) override;
+        /** @see RenderManager::destroyTexture */
+        void destroyTexture(MyGUI::ITexture* _texture) override;
+        /** @see RenderManager::getTexture */
+        MyGUI::ITexture* getTexture(const std::string& name) override;
 
-    // Called by the update traversal
-    void update();
+        // Called by the update traversal
+        void update();
 
-    // Called by the cull traversal
-    /** @see IRenderTarget::begin */
-    void begin() override;
-    /** @see IRenderTarget::end */
-    void end() override;
-    /** @see IRenderTarget::doRender */
-    void doRender(MyGUI::IVertexBuffer *buffer, MyGUI::ITexture *texture, size_t count) override;
+        // Called by the cull traversal
+        /** @see IRenderTarget::begin */
+        void begin() override;
+        /** @see IRenderTarget::end */
+        void end() override;
+        /** @see IRenderTarget::doRender */
+        void doRender(MyGUI::IVertexBuffer* buffer, MyGUI::ITexture* texture, size_t count) override;
 
-    /** specify a StateSet to inject for rendering. The StateSet will be used by future doRender calls until you reset it to nullptr again. */
-    void setInjectState(osg::StateSet* stateSet);
+        /** specify a StateSet to inject for rendering. The StateSet will be used by future doRender calls until you
+         * reset it to nullptr again. */
+        void setInjectState(osg::StateSet* stateSet);
 
-    /** @see IRenderTarget::getInfo */
-    const MyGUI::RenderTargetInfo& getInfo() const override { return mInfo; }
+        /** @see IRenderTarget::getInfo */
+        const MyGUI::RenderTargetInfo& getInfo() const override { return mInfo; }
 
-    bool checkTexture(MyGUI::ITexture* _texture);
+        bool checkTexture(MyGUI::ITexture* _texture);
 
-    void setViewSize(int width, int height) override;
+        void setViewSize(int width, int height) override;
 
-    void registerShader(const std::string& _shaderName, const std::string& _vertexProgramFile, const std::string& _fragmentProgramFile) override;
+        void registerShader(const std::string& _shaderName, const std::string& _vertexProgramFile,
+            const std::string& _fragmentProgramFile) override;
 
-/*internal:*/
+        /*internal:*/
 
-    void collectDrawCalls();
-};
+        void collectDrawCalls();
+    };
 
 }
 
diff --git a/components/myguiplatform/myguitexture.cpp b/components/myguiplatform/myguitexture.cpp
index d120cb52f3..26127cf39a 100644
--- a/components/myguiplatform/myguitexture.cpp
+++ b/components/myguiplatform/myguitexture.cpp
@@ -2,8 +2,8 @@
 
 #include <stdexcept>
 
-#include <osg/Texture2D>
 #include <osg/StateSet>
+#include <osg/Texture2D>
 
 #include <components/debug/debuglog.hpp>
 #include <components/resource/imagemanager.hpp>
@@ -11,18 +11,18 @@
 namespace osgMyGUI
 {
 
-    OSGTexture::OSGTexture(const std::string &name, Resource::ImageManager* imageManager)
-      : mName(name)
-      , mImageManager(imageManager)
-      , mFormat(MyGUI::PixelFormat::Unknow)
-      , mUsage(MyGUI::TextureUsage::Default)
-      , mNumElemBytes(0)
-      , mWidth(0)
-      , mHeight(0)
+    OSGTexture::OSGTexture(const std::string& name, Resource::ImageManager* imageManager)
+        : mName(name)
+        , mImageManager(imageManager)
+        , mFormat(MyGUI::PixelFormat::Unknow)
+        , mUsage(MyGUI::TextureUsage::Default)
+        , mNumElemBytes(0)
+        , mWidth(0)
+        , mHeight(0)
     {
     }
 
-    OSGTexture::OSGTexture(osg::Texture2D *texture, osg::StateSet *injectState)
+    OSGTexture::OSGTexture(osg::Texture2D* texture, osg::StateSet* injectState)
         : mImageManager(nullptr)
         , mTexture(texture)
         , mInjectState(injectState)
@@ -34,15 +34,13 @@ namespace osgMyGUI
     {
     }
 
-    OSGTexture::~OSGTexture()
-    {
-    }
+    OSGTexture::~OSGTexture() {}
 
     void OSGTexture::createManual(int width, int height, MyGUI::TextureUsage usage, MyGUI::PixelFormat format)
     {
         GLenum glfmt = GL_NONE;
         size_t numelems = 0;
-        switch(format.getValue())
+        switch (format.getValue())
         {
             case MyGUI::PixelFormat::L8:
                 glfmt = GL_LUMINANCE;
@@ -61,7 +59,7 @@ namespace osgMyGUI
                 numelems = 4;
                 break;
         }
-        if(glfmt == GL_NONE)
+        if (glfmt == GL_NONE)
             throw std::runtime_error("Texture format not supported");
 
         mTexture = new osg::Texture2D();
@@ -92,12 +90,12 @@ namespace osgMyGUI
         mHeight = 0;
     }
 
-    void OSGTexture::loadFromFile(const std::string &fname)
+    void OSGTexture::loadFromFile(const std::string& fname)
     {
         if (!mImageManager)
             throw std::runtime_error("No imagemanager set");
 
-        osg::ref_ptr<osg::Image> image (mImageManager->getImage(fname));
+        osg::ref_ptr<osg::Image> image(mImageManager->getImage(fname));
         mTexture = new osg::Texture2D(image);
         mTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         mTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
@@ -112,12 +110,12 @@ namespace osgMyGUI
         mUsage = MyGUI::TextureUsage::Static;
     }
 
-    void OSGTexture::saveToFile(const std::string &fname)
+    void OSGTexture::saveToFile(const std::string& fname)
     {
         Log(Debug::Warning) << "Would save image to file " << fname;
     }
 
-    void *OSGTexture::lock(MyGUI::TextureUsage /*access*/)
+    void* OSGTexture::lock(MyGUI::TextureUsage /*access*/)
     {
         if (!mTexture.valid())
             throw std::runtime_error("Texture is not created");
@@ -125,10 +123,8 @@ namespace osgMyGUI
             throw std::runtime_error("Texture already locked");
 
         mLockedImage = new osg::Image();
-        mLockedImage->allocateImage(
-            mTexture->getTextureWidth(), mTexture->getTextureHeight(), mTexture->getTextureDepth(),
-            mTexture->getSourceFormat(), mTexture->getSourceType()
-        );
+        mLockedImage->allocateImage(mTexture->getTextureWidth(), mTexture->getTextureHeight(),
+            mTexture->getTextureDepth(), mTexture->getSourceFormat(), mTexture->getSourceType());
 
         return mLockedImage->data();
     }
@@ -166,5 +162,7 @@ namespace osgMyGUI
     }
 
     void OSGTexture::setShader(const std::string& _shaderName)
-    { Log(Debug::Warning) << "OSGTexture::setShader is not implemented"; }
+    {
+        Log(Debug::Warning) << "OSGTexture::setShader is not implemented";
+    }
 }
diff --git a/components/myguiplatform/myguitexture.hpp b/components/myguiplatform/myguitexture.hpp
index 02079798d3..7139a81dba 100644
--- a/components/myguiplatform/myguitexture.hpp
+++ b/components/myguiplatform/myguitexture.hpp
@@ -36,7 +36,7 @@ namespace osgMyGUI
         int mHeight;
 
     public:
-        OSGTexture(const std::string &name, Resource::ImageManager* imageManager);
+        OSGTexture(const std::string& name, Resource::ImageManager* imageManager);
         OSGTexture(osg::Texture2D* texture, osg::StateSet* injectState = nullptr);
         ~OSGTexture() override;
 
@@ -45,8 +45,8 @@ namespace osgMyGUI
         const std::string& getName() const override { return mName; }
 
         void createManual(int width, int height, MyGUI::TextureUsage usage, MyGUI::PixelFormat format) override;
-        void loadFromFile(const std::string &fname) override;
-        void saveToFile(const std::string &fname) override;
+        void loadFromFile(const std::string& fname) override;
+        void saveToFile(const std::string& fname) override;
 
         void destroy() override;
 
@@ -61,12 +61,12 @@ namespace osgMyGUI
         MyGUI::TextureUsage getUsage() const override { return mUsage; }
         size_t getNumElemBytes() const override { return mNumElemBytes; }
 
-        MyGUI::IRenderTarget *getRenderTarget() override;
+        MyGUI::IRenderTarget* getRenderTarget() override;
 
         void setShader(const std::string& _shaderName) override;
 
-    /*internal:*/
-        osg::Texture2D *getTexture() const { return mTexture.get(); }
+        /*internal:*/
+        osg::Texture2D* getTexture() const { return mTexture.get(); }
     };
 
 }
diff --git a/components/myguiplatform/scalinglayer.cpp b/components/myguiplatform/scalinglayer.cpp
index e0ab25819c..fbd2f594c7 100644
--- a/components/myguiplatform/scalinglayer.cpp
+++ b/components/myguiplatform/scalinglayer.cpp
@@ -12,7 +12,8 @@ namespace osgMyGUI
     public:
         /// @param target The target to render to.
         /// @param viewSize The size of the underlying layer node to render.
-        /// @param hoffset The horizontal rendering offset, specified as an offset from the left screen edge in range 0-1.
+        /// @param hoffset The horizontal rendering offset, specified as an offset from the left screen edge in range
+        /// 0-1.
         /// @param voffset The vertical rendering offset, specified as an offset from the top screen edge in range 0-1.
         ProxyRenderTarget(MyGUI::IRenderTarget* target, MyGUI::IntSize viewSize, float hoffset, float voffset)
             : mTarget(target)
@@ -22,15 +23,9 @@ namespace osgMyGUI
         {
         }
 
-        void begin() override
-        {
-            mTarget->begin();
-        }
+        void begin() override { mTarget->begin(); }
 
-        void end() override
-        {
-            mTarget->end();
-        }
+        void end() override { mTarget->end(); }
 
         void doRender(MyGUI::IVertexBuffer* _buffer, MyGUI::ITexture* _texture, size_t _count) override
         {
@@ -54,7 +49,7 @@ namespace osgMyGUI
         mutable MyGUI::RenderTargetInfo mInfo;
     };
 
-    MyGUI::ILayerItem *ScalingLayer::getLayerItemByPoint(int _left, int _top) const
+    MyGUI::ILayerItem* ScalingLayer::getLayerItemByPoint(int _left, int _top) const
     {
         screenToLayerCoords(_left, _top);
 
@@ -69,14 +64,14 @@ namespace osgMyGUI
 
         MyGUI::IntSize globalViewSize = MyGUI::RenderManager::getInstance().getViewSize();
 
-        _left -= globalViewSize.width/2;
-        _top -= globalViewSize.height/2;
+        _left -= globalViewSize.width / 2;
+        _top -= globalViewSize.height / 2;
 
-        _left = static_cast<int>(_left/scale);
-        _top = static_cast<int>(_top/scale);
+        _left = static_cast<int>(_left / scale);
+        _top = static_cast<int>(_top / scale);
 
-        _left += mViewSize.width/2;
-        _top += mViewSize.height/2;
+        _left += mViewSize.width / 2;
+        _top += mViewSize.height / 2;
     }
 
     float ScalingLayer::getScaleFactor(const MyGUI::IntSize& _layerViewSize)
@@ -96,7 +91,7 @@ namespace osgMyGUI
         return MyGUI::IntPoint(_left, _top);
     }
 
-    void ScalingLayer::renderToTarget(MyGUI::IRenderTarget *_target, bool _update)
+    void ScalingLayer::renderToTarget(MyGUI::IRenderTarget* _target, bool _update)
     {
         MyGUI::IntSize globalViewSize = MyGUI::RenderManager::getInstance().getViewSize();
         MyGUI::IntSize viewSize = globalViewSize;
@@ -104,15 +99,17 @@ namespace osgMyGUI
         viewSize.width = static_cast<int>(viewSize.width / scale);
         viewSize.height = static_cast<int>(viewSize.height / scale);
 
-        float hoffset = (globalViewSize.width - mViewSize.width*getScaleFactor(mViewSize))/2.f / static_cast<float>(globalViewSize.width);
-        float voffset = (globalViewSize.height - mViewSize.height*getScaleFactor(mViewSize))/2.f / static_cast<float>(globalViewSize.height);
+        float hoffset = (globalViewSize.width - mViewSize.width * getScaleFactor(mViewSize)) / 2.f
+            / static_cast<float>(globalViewSize.width);
+        float voffset = (globalViewSize.height - mViewSize.height * getScaleFactor(mViewSize)) / 2.f
+            / static_cast<float>(globalViewSize.height);
 
         ProxyRenderTarget proxy(_target, viewSize, hoffset, voffset);
 
         MyGUI::OverlappedLayer::renderToTarget(&proxy, _update);
     }
 
-    void ScalingLayer::resizeView(const MyGUI::IntSize &_viewSize)
+    void ScalingLayer::resizeView(const MyGUI::IntSize& _viewSize)
     {
         // do nothing
     }
diff --git a/components/myguiplatform/scalinglayer.hpp b/components/myguiplatform/scalinglayer.hpp
index 805edb0d01..4f04ce917a 100644
--- a/components/myguiplatform/scalinglayer.hpp
+++ b/components/myguiplatform/scalinglayer.hpp
@@ -6,8 +6,10 @@
 namespace osgMyGUI
 {
 
-    ///@brief A Layer that lays out and renders widgets in screen-relative coordinates. The "Size" property determines the size of the virtual screen,
-    /// which is then upscaled to the real screen size during rendering. The aspect ratio is kept intact, adding blanks to the sides when necessary.
+    ///@brief A Layer that lays out and renders widgets in screen-relative coordinates. The "Size" property determines
+    /// the size of the virtual screen,
+    /// which is then upscaled to the real screen size during rendering. The aspect ratio is kept intact, adding blanks
+    /// to the sides when necessary.
     class ScalingLayer final : public MyGUI::OverlappedLayer
     {
     public:
diff --git a/components/navmeshtool/protocol.cpp b/components/navmeshtool/protocol.cpp
index 656d5ab4d6..93c7e0cbf4 100644
--- a/components/navmeshtool/protocol.cpp
+++ b/components/navmeshtool/protocol.cpp
@@ -1,9 +1,9 @@
 #include "protocol.hpp"
 
+#include <components/serialization/binaryreader.hpp>
+#include <components/serialization/binarywriter.hpp>
 #include <components/serialization/format.hpp>
 #include <components/serialization/sizeaccumulator.hpp>
-#include <components/serialization/binarywriter.hpp>
-#include <components/serialization/binaryreader.hpp>
 
 #include <stdexcept>
 #include <string>
@@ -83,7 +83,8 @@ namespace NavMeshTool
         std::vector<std::byte> serializeImpl(const T& value)
         {
             const auto data = serializeToVector(value);
-            const Message message {static_cast<std::uint64_t>(T::sMessageType), static_cast<std::uint64_t>(data.size()), data.data()};
+            const Message message{ static_cast<std::uint64_t>(T::sMessageType), static_cast<std::uint64_t>(data.size()),
+                data.data() };
             return serializeToVector(message);
         }
     }
diff --git a/components/navmeshtool/protocol.hpp b/components/navmeshtool/protocol.hpp
index ddb68a716c..f117f5001d 100644
--- a/components/navmeshtool/protocol.hpp
+++ b/components/navmeshtool/protocol.hpp
@@ -9,11 +9,14 @@
 
 namespace NavMeshTool
 {
-    inline constexpr char messageMagic[] = {'n', 'v', 't', 'm'};
+    inline constexpr char messageMagic[] = { 'n', 'v', 't', 'm' };
 
     struct BadMessageMagic : std::runtime_error
     {
-        BadMessageMagic() : std::runtime_error("Bad Message magic") {}
+        BadMessageMagic()
+            : std::runtime_error("Bad Message magic")
+        {
+        }
     };
 
     enum class MessageType : std::uint64_t
@@ -55,12 +58,7 @@ namespace NavMeshTool
         std::uint64_t mCount = 0;
     };
 
-    using TypedMessage = std::variant<
-        ExpectedCells,
-        ProcessedCells,
-        ExpectedTiles,
-        GeneratedTiles
-    >;
+    using TypedMessage = std::variant<ExpectedCells, ProcessedCells, ExpectedTiles, GeneratedTiles>;
 
     std::vector<std::byte> serialize(const ExpectedCells& value);
 
diff --git a/components/nif/base.cpp b/components/nif/base.cpp
index 8f0a069f3f..1b221ea6bc 100644
--- a/components/nif/base.cpp
+++ b/components/nif/base.cpp
@@ -2,28 +2,28 @@
 
 namespace Nif
 {
-    void Extra::read(NIFStream *nif)
+    void Extra::read(NIFStream* nif)
     {
-        if (nif->getVersion() >= NIFStream::generateVersion(10,0,1,0))
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 0, 1, 0))
             name = nif->getString();
-        else if (nif->getVersion() <= NIFStream::generateVersion(4,2,2,0))
+        else if (nif->getVersion() <= NIFStream::generateVersion(4, 2, 2, 0))
         {
             next.read(nif);
             recordSize = nif->getUInt();
         }
     }
 
-    void Named::read(NIFStream *nif)
+    void Named::read(NIFStream* nif)
     {
         name = nif->getString();
-        if (nif->getVersion() < NIFStream::generateVersion(10,0,1,0))
+        if (nif->getVersion() < NIFStream::generateVersion(10, 0, 1, 0))
             extra.read(nif);
         else
             extralist.read(nif);
         controller.read(nif);
     }
 
-    void Named::post(NIFFile *nif)
+    void Named::post(NIFFile* nif)
     {
         extra.post(nif);
         extralist.post(nif);
diff --git a/components/nif/base.hpp b/components/nif/base.hpp
index 35474ad385..30c1d5bc56 100644
--- a/components/nif/base.hpp
+++ b/components/nif/base.hpp
@@ -1,4 +1,4 @@
-///This file holds the main classes of NIF Records used by everything else.
+/// This file holds the main classes of NIF Records used by everything else.
 #ifndef OPENMW_COMPONENTS_NIF_BASE_HPP
 #define OPENMW_COMPONENTS_NIF_BASE_HPP
 
@@ -6,60 +6,61 @@
 
 namespace Nif
 {
-struct File;
-struct Record;
-struct Stream;
+    struct File;
+    struct Record;
+    struct Stream;
 
-// An extra data record. All the extra data connected to an object form a linked list.
-struct Extra : public Record
-{
-    std::string name;
-    ExtraPtr next; // Next extra data record in the list
-    unsigned int recordSize{0u};
-
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override { next.post(nif); }
-};
+    // An extra data record. All the extra data connected to an object form a linked list.
+    struct Extra : public Record
+    {
+        std::string name;
+        ExtraPtr next; // Next extra data record in the list
+        unsigned int recordSize{ 0u };
 
-struct Controller : public Record
-{
-    enum Flags {
-        Flag_Active = 0x8
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override { next.post(nif); }
     };
 
-    enum ExtrapolationMode
+    struct Controller : public Record
     {
-        Cycle = 0,
-        Reverse = 2,
-        Constant = 4,
-        Mask = 6
-    };
+        enum Flags
+        {
+            Flag_Active = 0x8
+        };
 
-    ControllerPtr next;
-    int flags;
-    float frequency, phase;
-    float timeStart, timeStop;
-    NamedPtr target;
+        enum ExtrapolationMode
+        {
+            Cycle = 0,
+            Reverse = 2,
+            Constant = 4,
+            Mask = 6
+        };
 
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
+        ControllerPtr next;
+        int flags;
+        float frequency, phase;
+        float timeStart, timeStop;
+        NamedPtr target;
 
-    bool isActive() const { return flags & Flag_Active; }
-    ExtrapolationMode extrapolationMode() const { return static_cast<ExtrapolationMode>(flags & Mask); }
-};
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
 
-/// Has name, extra-data and controller
-struct Named : public Record
-{
-    std::string name;
-    ExtraPtr extra;
-    ExtraList extralist;
-    ControllerPtr controller;
+        bool isActive() const { return flags & Flag_Active; }
+        ExtrapolationMode extrapolationMode() const { return static_cast<ExtrapolationMode>(flags & Mask); }
+    };
 
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
-using NiSequenceStreamHelper = Named;
+    /// Has name, extra-data and controller
+    struct Named : public Record
+    {
+        std::string name;
+        ExtraPtr extra;
+        ExtraList extralist;
+        ControllerPtr controller;
+
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
+    using NiSequenceStreamHelper = Named;
 
 } // Namespace
 #endif
diff --git a/components/nif/controlled.cpp b/components/nif/controlled.cpp
index 0491dd7d98..1430cede78 100644
--- a/components/nif/controlled.cpp
+++ b/components/nif/controlled.cpp
@@ -5,7 +5,7 @@
 namespace Nif
 {
 
-    void NiSourceTexture::read(NIFStream *nif)
+    void NiSourceTexture::read(NIFStream* nif)
     {
         Named::read(nif);
 
@@ -15,12 +15,12 @@ namespace Nif
             filename = nif->getString();
         else
         {
-            if (nif->getVersion() <= NIFStream::generateVersion(10,0,1,3))
+            if (nif->getVersion() <= NIFStream::generateVersion(10, 0, 1, 3))
                 internal = nif->getChar();
-            if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
+            if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
                 filename = nif->getString(); // Original file path of the internal texture
         }
-        if (nif->getVersion() <= NIFStream::generateVersion(10,0,1,3))
+        if (nif->getVersion() <= NIFStream::generateVersion(10, 0, 1, 3))
         {
             if (!external && internal)
                 data.read(nif);
@@ -35,56 +35,56 @@ namespace Nif
         alpha = nif->getUInt();
 
         // Renderer hints, typically of no use for us
-        /* bool mIsStatic = */nif->getChar();
-        if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,103))
-            /* bool mDirectRendering = */nif->getBoolean();
-        if (nif->getVersion() >= NIFStream::generateVersion(20,2,0,4))
-            /* bool mPersistRenderData = */nif->getBoolean();
+        /* bool mIsStatic = */ nif->getChar();
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 103))
+            /* bool mDirectRendering = */ nif->getBoolean();
+        if (nif->getVersion() >= NIFStream::generateVersion(20, 2, 0, 4))
+            /* bool mPersistRenderData = */ nif->getBoolean();
     }
 
-    void NiSourceTexture::post(NIFFile *nif)
+    void NiSourceTexture::post(NIFFile* nif)
     {
         Named::post(nif);
         data.post(nif);
     }
 
-    void BSShaderTextureSet::read(NIFStream *nif)
+    void BSShaderTextureSet::read(NIFStream* nif)
     {
         nif->getSizedStrings(textures, nif->getUInt());
     }
 
-    void NiParticleModifier::read(NIFStream *nif)
+    void NiParticleModifier::read(NIFStream* nif)
     {
         next.read(nif);
         controller.read(nif);
     }
 
-    void NiParticleModifier::post(NIFFile *nif)
+    void NiParticleModifier::post(NIFFile* nif)
     {
         next.post(nif);
         controller.post(nif);
     }
 
-    void NiParticleGrowFade::read(NIFStream *nif)
+    void NiParticleGrowFade::read(NIFStream* nif)
     {
         NiParticleModifier::read(nif);
         growTime = nif->getFloat();
         fadeTime = nif->getFloat();
     }
 
-    void NiParticleColorModifier::read(NIFStream *nif)
+    void NiParticleColorModifier::read(NIFStream* nif)
     {
         NiParticleModifier::read(nif);
         data.read(nif);
     }
 
-    void NiParticleColorModifier::post(NIFFile *nif)
+    void NiParticleColorModifier::post(NIFFile* nif)
     {
         NiParticleModifier::post(nif);
         data.post(nif);
     }
 
-    void NiGravity::read(NIFStream *nif)
+    void NiGravity::read(NIFStream* nif)
     {
         NiParticleModifier::read(nif);
 
@@ -95,20 +95,20 @@ namespace Nif
         mDirection = nif->getVector3();
     }
 
-    void NiParticleCollider::read(NIFStream *nif)
+    void NiParticleCollider::read(NIFStream* nif)
     {
         NiParticleModifier::read(nif);
 
         mBounceFactor = nif->getFloat();
-        if (nif->getVersion() >= NIFStream::generateVersion(4,2,0,2))
+        if (nif->getVersion() >= NIFStream::generateVersion(4, 2, 0, 2))
         {
             // Unused in NifSkope. Need to figure out what these do.
-            /*bool mSpawnOnCollision = */nif->getBoolean();
-            /*bool mDieOnCollision = */nif->getBoolean();
+            /*bool mSpawnOnCollision = */ nif->getBoolean();
+            /*bool mDieOnCollision = */ nif->getBoolean();
         }
     }
 
-    void NiPlanarCollider::read(NIFStream *nif)
+    void NiPlanarCollider::read(NIFStream* nif)
     {
         NiParticleCollider::read(nif);
 
@@ -120,13 +120,13 @@ namespace Nif
         mPlaneDistance = nif->getFloat();
     }
 
-    void NiParticleRotation::read(NIFStream *nif)
+    void NiParticleRotation::read(NIFStream* nif)
     {
         NiParticleModifier::read(nif);
 
-        /* bool mRandomInitialAxis = */nif->getChar();
-        /* osg::Vec3f mInitialAxis = */nif->getVector3();
-        /* float mRotationSpeed = */nif->getFloat();
+        /* bool mRandomInitialAxis = */ nif->getChar();
+        /* osg::Vec3f mInitialAxis = */ nif->getVector3();
+        /* float mRotationSpeed = */ nif->getFloat();
     }
 
     void NiSphericalCollider::read(NIFStream* nif)
diff --git a/components/nif/controlled.hpp b/components/nif/controlled.hpp
index 5094f1fd87..62a240918f 100644
--- a/components/nif/controlled.hpp
+++ b/components/nif/controlled.hpp
@@ -29,131 +29,129 @@
 namespace Nif
 {
 
-struct NiSourceTexture : public Named
-{
-    // Is this an external (references a separate texture file) or
-    // internal (data is inside the nif itself) texture?
-    bool external;
-
-    std::string filename; // In case of external textures
-    NiPixelDataPtr data;  // In case of internal textures
-
-    /* Pixel layout
-        0 - Palettised
-        1 - High color 16
-        2 - True color 32
-        3 - Compressed
-        4 - Bumpmap
-        5 - Default */
-    unsigned int pixel;
-
-    /* Mipmap format
-        0 - no
-        1 - yes
-        2 - default */
-    unsigned int mipmap;
-
-    /* Alpha
-        0 - none
-        1 - binary
-        2 - smooth
-        3 - default (use material alpha, or multiply material with texture if present)
-    */
-    unsigned int alpha;
-
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
-
-struct BSShaderTextureSet : public Record
-{
-    enum TextureType
+    struct NiSourceTexture : public Named
     {
-        TextureType_Base = 0,
-        TextureType_Normal = 1,
-        TextureType_Glow = 2,
-        TextureType_Parallax = 3,
-        TextureType_Env = 4,
-        TextureType_EnvMask = 5,
-        TextureType_Subsurface = 6,
-        TextureType_BackLighting = 7
+        // Is this an external (references a separate texture file) or
+        // internal (data is inside the nif itself) texture?
+        bool external;
+
+        std::string filename; // In case of external textures
+        NiPixelDataPtr data; // In case of internal textures
+
+        /* Pixel layout
+            0 - Palettised
+            1 - High color 16
+            2 - True color 32
+            3 - Compressed
+            4 - Bumpmap
+            5 - Default */
+        unsigned int pixel;
+
+        /* Mipmap format
+            0 - no
+            1 - yes
+            2 - default */
+        unsigned int mipmap;
+
+        /* Alpha
+            0 - none
+            1 - binary
+            2 - smooth
+            3 - default (use material alpha, or multiply material with texture if present)
+        */
+        unsigned int alpha;
+
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
     };
-    std::vector<std::string> textures;
 
-    void read(NIFStream *nif) override;
-};
-
-struct NiParticleModifier : public Record
-{
-    NiParticleModifierPtr next;
-    ControllerPtr controller;
+    struct BSShaderTextureSet : public Record
+    {
+        enum TextureType
+        {
+            TextureType_Base = 0,
+            TextureType_Normal = 1,
+            TextureType_Glow = 2,
+            TextureType_Parallax = 3,
+            TextureType_Env = 4,
+            TextureType_EnvMask = 5,
+            TextureType_Subsurface = 6,
+            TextureType_BackLighting = 7
+        };
+        std::vector<std::string> textures;
+
+        void read(NIFStream* nif) override;
+    };
 
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
+    struct NiParticleModifier : public Record
+    {
+        NiParticleModifierPtr next;
+        ControllerPtr controller;
 
-struct NiParticleGrowFade : public NiParticleModifier
-{
-    float growTime;
-    float fadeTime;
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
-    void read(NIFStream *nif) override;
-};
+    struct NiParticleGrowFade : public NiParticleModifier
+    {
+        float growTime;
+        float fadeTime;
 
-struct NiParticleColorModifier : public NiParticleModifier
-{
-    NiColorDataPtr data;
+        void read(NIFStream* nif) override;
+    };
 
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
+    struct NiParticleColorModifier : public NiParticleModifier
+    {
+        NiColorDataPtr data;
 
-struct NiGravity : public NiParticleModifier
-{
-    float mForce;
-    /* 0 - Wind (fixed direction)
-     * 1 - Point (fixed origin)
-     */
-    int mType;
-    float mDecay;
-    osg::Vec3f mPosition;
-    osg::Vec3f mDirection;
-
-    void read(NIFStream *nif) override;
-};
-
-struct NiParticleCollider : public NiParticleModifier
-{
-    float mBounceFactor;
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
-// NiPinaColada
-struct NiPlanarCollider : public NiParticleCollider
-{
-    osg::Vec2f mExtents;
-    osg::Vec3f mPosition;
-    osg::Vec3f mXVector, mYVector;
-    osg::Vec3f mPlaneNormal;
-    float mPlaneDistance;
+    struct NiGravity : public NiParticleModifier
+    {
+        float mForce;
+        /* 0 - Wind (fixed direction)
+         * 1 - Point (fixed origin)
+         */
+        int mType;
+        float mDecay;
+        osg::Vec3f mPosition;
+        osg::Vec3f mDirection;
+
+        void read(NIFStream* nif) override;
+    };
 
-    void read(NIFStream *nif) override;
-};
+    struct NiParticleCollider : public NiParticleModifier
+    {
+        float mBounceFactor;
+        void read(NIFStream* nif) override;
+    };
 
-struct NiSphericalCollider : public NiParticleCollider
-{
-    float mRadius;
-    osg::Vec3f mCenter;
+    // NiPinaColada
+    struct NiPlanarCollider : public NiParticleCollider
+    {
+        osg::Vec2f mExtents;
+        osg::Vec3f mPosition;
+        osg::Vec3f mXVector, mYVector;
+        osg::Vec3f mPlaneNormal;
+        float mPlaneDistance;
 
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
+    };
 
-struct NiParticleRotation : public NiParticleModifier
-{
-    void read(NIFStream *nif) override;
-};
+    struct NiSphericalCollider : public NiParticleCollider
+    {
+        float mRadius;
+        osg::Vec3f mCenter;
 
+        void read(NIFStream* nif) override;
+    };
 
+    struct NiParticleRotation : public NiParticleModifier
+    {
+        void read(NIFStream* nif) override;
+    };
 
 } // Namespace
 #endif
diff --git a/components/nif/controller.cpp b/components/nif/controller.cpp
index 9a0f08f39c..aa6d6ab76b 100644
--- a/components/nif/controller.cpp
+++ b/components/nif/controller.cpp
@@ -8,7 +8,7 @@
 namespace Nif
 {
 
-    void Controller::read(NIFStream *nif)
+    void Controller::read(NIFStream* nif)
     {
         next.read(nif);
 
@@ -22,7 +22,7 @@ namespace Nif
         target.read(nif);
     }
 
-    void Controller::post(NIFFile *nif)
+    void Controller::post(NIFFile* nif)
     {
         Record::post(nif);
         next.post(nif);
@@ -32,14 +32,15 @@ namespace Nif
     void NiInterpController::read(NIFStream* nif)
     {
         Controller::read(nif);
-        if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,104) && nif->getVersion() <= NIFStream::generateVersion(10,1,0,108))
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 104)
+            && nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 108))
             mManagerControlled = nif->getBoolean();
     }
 
     void NiSingleInterpController::read(NIFStream* nif)
     {
         NiInterpController::read(nif);
-        if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,104))
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 104))
             mInterpolator.read(nif);
     }
 
@@ -49,7 +50,7 @@ namespace Nif
         mInterpolator.post(nif);
     }
 
-    void NiParticleSystemController::read(NIFStream *nif)
+    void NiParticleSystemController::read(NIFStream* nif)
     {
         Controller::read(nif);
 
@@ -86,7 +87,7 @@ namespace Nif
         activeCount = nif->getUShort();
 
         particles.resize(numParticles);
-        for(size_t i = 0;i < particles.size();i++)
+        for (size_t i = 0; i < particles.size(); i++)
         {
             particles[i].velocity = nif->getVector3();
             nif->getVector3(); /* unknown */
@@ -103,7 +104,7 @@ namespace Nif
         nif->getChar();
     }
 
-    void NiParticleSystemController::post(NIFFile *nif)
+    void NiParticleSystemController::post(NIFFile* nif)
     {
         Controller::post(nif);
         emitter.post(nif);
@@ -111,7 +112,7 @@ namespace Nif
         colliders.post(nif);
     }
 
-    void NiMaterialColorController::read(NIFStream *nif)
+    void NiMaterialColorController::read(NIFStream* nif)
     {
         NiPoint3InterpController::read(nif);
         // Two bits that correspond to the controlled material color.
@@ -119,35 +120,35 @@ namespace Nif
         // 01: Diffuse
         // 10: Specular
         // 11: Emissive
-        if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
             mTargetColor = nif->getUShort() & 3;
         else
             mTargetColor = (flags >> 4) & 3;
-        if (nif->getVersion() <= NIFStream::generateVersion(10,1,0,103))
+        if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 103))
             mData.read(nif);
     }
 
-    void NiMaterialColorController::post(NIFFile *nif)
+    void NiMaterialColorController::post(NIFFile* nif)
     {
         NiPoint3InterpController::post(nif);
         mData.post(nif);
     }
 
-    void NiLookAtController::read(NIFStream *nif)
+    void NiLookAtController::read(NIFStream* nif)
     {
         Controller::read(nif);
-        if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
             lookAtFlags = nif->getUShort();
         target.read(nif);
     }
 
-    void NiLookAtController::post(NIFFile *nif)
+    void NiLookAtController::post(NIFFile* nif)
     {
         Controller::post(nif);
         target.post(nif);
     }
 
-    void NiPathController::read(NIFStream *nif)
+    void NiPathController::read(NIFStream* nif)
     {
         Controller::read(nif);
 
@@ -159,7 +160,7 @@ namespace Nif
         floatData.read(nif);
     }
 
-    void NiPathController::post(NIFFile *nif)
+    void NiPathController::post(NIFFile* nif)
     {
         Controller::post(nif);
 
@@ -167,7 +168,7 @@ namespace Nif
         floatData.post(nif);
     }
 
-    void NiUVController::read(NIFStream *nif)
+    void NiUVController::read(NIFStream* nif)
     {
         Controller::read(nif);
 
@@ -175,26 +176,26 @@ namespace Nif
         data.read(nif);
     }
 
-    void NiUVController::post(NIFFile *nif)
+    void NiUVController::post(NIFFile* nif)
     {
         Controller::post(nif);
         data.post(nif);
     }
 
-    void NiKeyframeController::read(NIFStream *nif)
+    void NiKeyframeController::read(NIFStream* nif)
     {
         NiSingleInterpController::read(nif);
-        if (nif->getVersion() <= NIFStream::generateVersion(10,1,0,103))
+        if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 103))
             mData.read(nif);
     }
 
-    void NiKeyframeController::post(NIFFile *nif)
+    void NiKeyframeController::post(NIFFile* nif)
     {
         NiSingleInterpController::post(nif);
         mData.post(nif);
     }
 
-    void NiMultiTargetTransformController::read(NIFStream *nif)
+    void NiMultiTargetTransformController::read(NIFStream* nif)
     {
         NiInterpController::read(nif);
         size_t numTargets = nif->getUShort();
@@ -205,39 +206,39 @@ namespace Nif
         mExtraTargets = targets;
     }
 
-    void NiMultiTargetTransformController::post(NIFFile *nif)
+    void NiMultiTargetTransformController::post(NIFFile* nif)
     {
         NiInterpController::post(nif);
         mExtraTargets.post(nif);
     }
 
-    void NiAlphaController::read(NIFStream *nif)
+    void NiAlphaController::read(NIFStream* nif)
     {
         NiFloatInterpController::read(nif);
-        if (nif->getVersion() <= NIFStream::generateVersion(10,1,0,103))
+        if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 103))
             mData.read(nif);
     }
 
-    void NiAlphaController::post(NIFFile *nif)
+    void NiAlphaController::post(NIFFile* nif)
     {
         NiFloatInterpController::post(nif);
         mData.post(nif);
     }
 
-    void NiRollController::read(NIFStream *nif)
+    void NiRollController::read(NIFStream* nif)
     {
         NiSingleInterpController::read(nif);
-        if (nif->getVersion() <= NIFStream::generateVersion(10,1,0,103))
+        if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 103))
             mData.read(nif);
     }
 
-    void NiRollController::post(NIFFile *nif)
+    void NiRollController::post(NIFFile* nif)
     {
         NiSingleInterpController::post(nif);
         mData.post(nif);
     }
 
-    void NiGeomMorpherController::read(NIFStream *nif)
+    void NiGeomMorpherController::read(NIFStream* nif)
     {
         NiInterpController::read(nif);
         if (nif->getVersion() >= NIFFile::NIFVersion::VER_OB_OLD)
@@ -246,12 +247,12 @@ namespace Nif
         if (nif->getVersion() >= NIFFile::NIFVersion::VER_MW)
         {
             mAlwaysActive = nif->getChar();
-            if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,106))
+            if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 106))
             {
                 if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
                 {
                     mInterpolators.read(nif);
-                    if (nif->getVersion() >= NIFStream::generateVersion(10,2,0,0) && nif->getBethVersion() > 9)
+                    if (nif->getVersion() >= NIFStream::generateVersion(10, 2, 0, 0) && nif->getBethVersion() > 9)
                     {
                         unsigned int numUnknown = nif->getUInt();
                         nif->skip(4 * numUnknown);
@@ -274,31 +275,31 @@ namespace Nif
         }
     }
 
-    void NiGeomMorpherController::post(NIFFile *nif)
+    void NiGeomMorpherController::post(NIFFile* nif)
     {
         NiInterpController::post(nif);
         mData.post(nif);
         mInterpolators.post(nif);
     }
 
-    void NiVisController::read(NIFStream *nif)
+    void NiVisController::read(NIFStream* nif)
     {
         NiBoolInterpController::read(nif);
-        if (nif->getVersion() <= NIFStream::generateVersion(10,1,0,103))
+        if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 103))
             mData.read(nif);
     }
 
-    void NiVisController::post(NIFFile *nif)
+    void NiVisController::post(NIFFile* nif)
     {
         NiBoolInterpController::post(nif);
         mData.post(nif);
     }
 
-    void NiFlipController::read(NIFStream *nif)
+    void NiFlipController::read(NIFStream* nif)
     {
         NiFloatInterpController::read(nif);
         mTexSlot = nif->getUInt();
-        if (nif->getVersion() <= NIFStream::generateVersion(10,1,0,103))
+        if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 103))
         {
             timeStart = nif->getFloat();
             mDelta = nif->getFloat();
@@ -306,19 +307,19 @@ namespace Nif
         mSources.read(nif);
     }
 
-    void NiFlipController::post(NIFFile *nif)
+    void NiFlipController::post(NIFFile* nif)
     {
         NiFloatInterpController::post(nif);
         mSources.post(nif);
     }
 
-    void bhkBlendController::read(NIFStream *nif)
+    void bhkBlendController::read(NIFStream* nif)
     {
         Controller::read(nif);
         nif->getUInt(); // Zero
     }
 
-    void NiControllerManager::read(NIFStream *nif)
+    void NiControllerManager::read(NIFStream* nif)
     {
         Controller::read(nif);
         mCumulative = nif->getBoolean();
@@ -327,45 +328,45 @@ namespace Nif
         nif->skip(4); // Object palette
     }
 
-    void NiPoint3Interpolator::read(NIFStream *nif)
+    void NiPoint3Interpolator::read(NIFStream* nif)
     {
         defaultVal = nif->getVector3();
         data.read(nif);
     }
 
-    void NiPoint3Interpolator::post(NIFFile *nif)
+    void NiPoint3Interpolator::post(NIFFile* nif)
     {
         data.post(nif);
     }
 
-    void NiBoolInterpolator::read(NIFStream *nif)
+    void NiBoolInterpolator::read(NIFStream* nif)
     {
         defaultVal = nif->getBoolean();
         data.read(nif);
     }
 
-    void NiBoolInterpolator::post(NIFFile *nif)
+    void NiBoolInterpolator::post(NIFFile* nif)
     {
         data.post(nif);
     }
 
-    void NiFloatInterpolator::read(NIFStream *nif)
+    void NiFloatInterpolator::read(NIFStream* nif)
     {
         defaultVal = nif->getFloat();
         data.read(nif);
     }
 
-    void NiFloatInterpolator::post(NIFFile *nif)
+    void NiFloatInterpolator::post(NIFFile* nif)
     {
         data.post(nif);
     }
 
-    void NiTransformInterpolator::read(NIFStream *nif)
+    void NiTransformInterpolator::read(NIFStream* nif)
     {
         defaultPos = nif->getVector3();
         defaultRot = nif->getQuaternion();
         defaultScale = nif->getFloat();
-        if (nif->getVersion() <= NIFStream::generateVersion(10,1,0,109))
+        if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 109))
         {
             if (!nif->getBoolean())
                 defaultPos = osg::Vec3f();
@@ -377,18 +378,18 @@ namespace Nif
         data.read(nif);
     }
 
-    void NiTransformInterpolator::post(NIFFile *nif)
+    void NiTransformInterpolator::post(NIFFile* nif)
     {
         data.post(nif);
     }
 
-    void NiColorInterpolator::read(NIFStream *nif)
+    void NiColorInterpolator::read(NIFStream* nif)
     {
         defaultVal = nif->getVector4();
         data.read(nif);
     }
 
-    void NiColorInterpolator::post(NIFFile *nif)
+    void NiColorInterpolator::post(NIFFile* nif)
     {
         data.post(nif);
     }
diff --git a/components/nif/controller.hpp b/components/nif/controller.hpp
index 07d35efa50..4f743c99ba 100644
--- a/components/nif/controller.hpp
+++ b/components/nif/controller.hpp
@@ -29,259 +29,269 @@
 namespace Nif
 {
 
-// Base class for controllers that use NiInterpolators to animate objects.
-struct NiInterpController : public Controller
-{
-    // Usually one of the flags.
-    bool mManagerControlled{false};
-
-    void read(NIFStream* nif) override;
-};
-
-// Base class for controllers that use one NiInterpolator.
-struct NiSingleInterpController : public NiInterpController
-{
-    NiInterpolatorPtr mInterpolator;
-
-    void read(NIFStream* nif) override;
-    void post(NIFFile* nif) override;
-};
-
-// Base class for controllers that use a NiFloatInterpolator to animate their target.
-struct NiFloatInterpController : public NiSingleInterpController { };
+    // Base class for controllers that use NiInterpolators to animate objects.
+    struct NiInterpController : public Controller
+    {
+        // Usually one of the flags.
+        bool mManagerControlled{ false };
 
-// Ditto for NiBoolInterpolator.
-struct NiBoolInterpController : public NiSingleInterpController { };
+        void read(NIFStream* nif) override;
+    };
 
-// Ditto for NiPoint3Interpolator.
-struct NiPoint3InterpController : public NiSingleInterpController { };
+    // Base class for controllers that use one NiInterpolator.
+    struct NiSingleInterpController : public NiInterpController
+    {
+        NiInterpolatorPtr mInterpolator;
 
-struct NiParticleSystemController : public Controller
-{
-    enum BSPArrayController {
-        BSPArrayController_AtNode = 0x8,
-        BSPArrayController_AtVertex = 0x10
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
     };
 
-    struct Particle {
-        osg::Vec3f velocity;
-        float lifetime;
-        float lifespan;
-        float timestamp;
-        unsigned short vertex;
+    // Base class for controllers that use a NiFloatInterpolator to animate their target.
+    struct NiFloatInterpController : public NiSingleInterpController
+    {
     };
 
-    float velocity;
-    float velocityRandom;
-
-    float verticalDir; // 0=up, pi/2=horizontal, pi=down
-    float verticalAngle;
-    float horizontalDir;
-    float horizontalAngle;
-
-    osg::Vec4f color;
-    float size;
-    float startTime;
-    float stopTime;
-
-    float emitRate;
-    float lifetime;
-    float lifetimeRandom;
-
-    enum EmitFlags
+    // Ditto for NiBoolInterpolator.
+    struct NiBoolInterpController : public NiSingleInterpController
     {
-        EmitFlag_NoAutoAdjust = 0x1 // If this flag is set, we use the emitRate value. Otherwise,
-                                    // we calculate an emit rate so that the maximum number of particles
-                                    // in the system (numParticles) is never exceeded.
     };
-    int emitFlags;
-
-    osg::Vec3f offsetRandom;
 
-    NodePtr emitter;
+    // Ditto for NiPoint3Interpolator.
+    struct NiPoint3InterpController : public NiSingleInterpController
+    {
+    };
 
-    int numParticles;
-    int activeCount;
-    std::vector<Particle> particles;
+    struct NiParticleSystemController : public Controller
+    {
+        enum BSPArrayController
+        {
+            BSPArrayController_AtNode = 0x8,
+            BSPArrayController_AtVertex = 0x10
+        };
+
+        struct Particle
+        {
+            osg::Vec3f velocity;
+            float lifetime;
+            float lifespan;
+            float timestamp;
+            unsigned short vertex;
+        };
+
+        float velocity;
+        float velocityRandom;
+
+        float verticalDir; // 0=up, pi/2=horizontal, pi=down
+        float verticalAngle;
+        float horizontalDir;
+        float horizontalAngle;
+
+        osg::Vec4f color;
+        float size;
+        float startTime;
+        float stopTime;
+
+        float emitRate;
+        float lifetime;
+        float lifetimeRandom;
 
-    NiParticleModifierPtr affectors;
-    NiParticleModifierPtr colliders;
+        enum EmitFlags
+        {
+            EmitFlag_NoAutoAdjust = 0x1 // If this flag is set, we use the emitRate value. Otherwise,
+                                        // we calculate an emit rate so that the maximum number of particles
+                                        // in the system (numParticles) is never exceeded.
+        };
+        int emitFlags;
 
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
+        osg::Vec3f offsetRandom;
 
-    bool noAutoAdjust() const { return emitFlags & EmitFlag_NoAutoAdjust; }
-    bool emitAtVertex() const { return flags & BSPArrayController_AtVertex; }
-};
-using NiBSPArrayController = NiParticleSystemController;
+        NodePtr emitter;
 
-struct NiMaterialColorController : public NiPoint3InterpController
-{
-    NiPosDataPtr mData;
-    unsigned int mTargetColor;
+        int numParticles;
+        int activeCount;
+        std::vector<Particle> particles;
 
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
+        NiParticleModifierPtr affectors;
+        NiParticleModifierPtr colliders;
 
-struct NiPathController : public Controller
-{
-    NiPosDataPtr posData;
-    NiFloatDataPtr floatData;
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
 
-    enum Flags
-    {
-        Flag_OpenCurve      = 0x020,
-        Flag_AllowFlip      = 0x040,
-        Flag_Bank           = 0x080,
-        Flag_ConstVelocity  = 0x100,
-        Flag_Follow         = 0x200,
-        Flag_FlipFollowAxis = 0x400
+        bool noAutoAdjust() const { return emitFlags & EmitFlag_NoAutoAdjust; }
+        bool emitAtVertex() const { return flags & BSPArrayController_AtVertex; }
     };
+    using NiBSPArrayController = NiParticleSystemController;
 
-    int bankDir;
-    float maxBankAngle, smoothing;
-    short followAxis;
+    struct NiMaterialColorController : public NiPoint3InterpController
+    {
+        NiPosDataPtr mData;
+        unsigned int mTargetColor;
 
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
-struct NiLookAtController : public Controller
-{
-    NodePtr target;
-    unsigned short lookAtFlags{0};
+    struct NiPathController : public Controller
+    {
+        NiPosDataPtr posData;
+        NiFloatDataPtr floatData;
+
+        enum Flags
+        {
+            Flag_OpenCurve = 0x020,
+            Flag_AllowFlip = 0x040,
+            Flag_Bank = 0x080,
+            Flag_ConstVelocity = 0x100,
+            Flag_Follow = 0x200,
+            Flag_FlipFollowAxis = 0x400
+        };
+
+        int bankDir;
+        float maxBankAngle, smoothing;
+        short followAxis;
+
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
+    struct NiLookAtController : public Controller
+    {
+        NodePtr target;
+        unsigned short lookAtFlags{ 0 };
 
-struct NiUVController : public Controller
-{
-    NiUVDataPtr data;
-    unsigned int uvSet;
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
+    struct NiUVController : public Controller
+    {
+        NiUVDataPtr data;
+        unsigned int uvSet;
 
-struct NiKeyframeController : public NiSingleInterpController
-{
-    NiKeyframeDataPtr mData;
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
+    struct NiKeyframeController : public NiSingleInterpController
+    {
+        NiKeyframeDataPtr mData;
 
-struct NiMultiTargetTransformController : public NiInterpController
-{
-    NodeList mExtraTargets;
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
+    struct NiMultiTargetTransformController : public NiInterpController
+    {
+        NodeList mExtraTargets;
 
-struct NiAlphaController : public NiFloatInterpController
-{
-    NiFloatDataPtr mData;
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
+    struct NiAlphaController : public NiFloatInterpController
+    {
+        NiFloatDataPtr mData;
 
-struct NiRollController : public NiSingleInterpController
-{
-    NiFloatDataPtr mData;
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
+    struct NiRollController : public NiSingleInterpController
+    {
+        NiFloatDataPtr mData;
 
-struct NiGeomMorpherController : public NiInterpController
-{
-    bool mUpdateNormals{false};
-    bool mAlwaysActive{false};
-    NiMorphDataPtr mData;
-    NiInterpolatorList mInterpolators;
-    std::vector<float> mWeights;
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
+    struct NiGeomMorpherController : public NiInterpController
+    {
+        bool mUpdateNormals{ false };
+        bool mAlwaysActive{ false };
+        NiMorphDataPtr mData;
+        NiInterpolatorList mInterpolators;
+        std::vector<float> mWeights;
+
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
-struct NiVisController : public NiBoolInterpController
-{
-    NiVisDataPtr mData;
+    struct NiVisController : public NiBoolInterpController
+    {
+        NiVisDataPtr mData;
 
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
-struct NiFlipController : public NiFloatInterpController
-{
-    int mTexSlot; // NiTexturingProperty::TextureType
-    float mDelta; // Time between two flips. delta = (start_time - stop_time) / num_sources
-    NiSourceTextureList mSources;
+    struct NiFlipController : public NiFloatInterpController
+    {
+        int mTexSlot; // NiTexturingProperty::TextureType
+        float mDelta; // Time between two flips. delta = (start_time - stop_time) / num_sources
+        NiSourceTextureList mSources;
 
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
-struct bhkBlendController : public Controller
-{
-    void read(NIFStream *nif) override;
-};
+    struct bhkBlendController : public Controller
+    {
+        void read(NIFStream* nif) override;
+    };
 
-struct NiControllerManager : public Controller
-{
-    bool mCumulative;
-    void read(NIFStream *nif) override;
-};
+    struct NiControllerManager : public Controller
+    {
+        bool mCumulative;
+        void read(NIFStream* nif) override;
+    };
 
-struct NiInterpolator : public Record { };
+    struct NiInterpolator : public Record
+    {
+    };
 
-struct NiPoint3Interpolator : public NiInterpolator
-{
-    osg::Vec3f defaultVal;
-    NiPosDataPtr data;
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
+    struct NiPoint3Interpolator : public NiInterpolator
+    {
+        osg::Vec3f defaultVal;
+        NiPosDataPtr data;
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
-struct NiBoolInterpolator : public NiInterpolator
-{
-    char defaultVal;
-    NiBoolDataPtr data;
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
+    struct NiBoolInterpolator : public NiInterpolator
+    {
+        char defaultVal;
+        NiBoolDataPtr data;
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
-struct NiFloatInterpolator : public NiInterpolator
-{
-    float defaultVal;
-    NiFloatDataPtr data;
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
+    struct NiFloatInterpolator : public NiInterpolator
+    {
+        float defaultVal;
+        NiFloatDataPtr data;
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
-struct NiTransformInterpolator : public NiInterpolator
-{
-    osg::Vec3f defaultPos;
-    osg::Quat defaultRot;
-    float defaultScale;
-    NiKeyframeDataPtr data;
+    struct NiTransformInterpolator : public NiInterpolator
+    {
+        osg::Vec3f defaultPos;
+        osg::Quat defaultRot;
+        float defaultScale;
+        NiKeyframeDataPtr data;
 
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
-struct NiColorInterpolator : public NiInterpolator
-{
-    osg::Vec4f defaultVal;
-    NiColorDataPtr data;
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
+    struct NiColorInterpolator : public NiInterpolator
+    {
+        osg::Vec4f defaultVal;
+        NiColorDataPtr data;
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
 } // Namespace
 #endif
diff --git a/components/nif/data.cpp b/components/nif/data.cpp
index b0ed2f4e53..f2d533cbce 100644
--- a/components/nif/data.cpp
+++ b/components/nif/data.cpp
@@ -4,478 +4,479 @@
 
 namespace Nif
 {
-void NiSkinInstance::read(NIFStream *nif)
-{
-    data.read(nif);
-    if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,101))
-        partitions.read(nif);
-    root.read(nif);
-    bones.read(nif);
-}
-
-void NiSkinInstance::post(NIFFile *nif)
-{
-    data.post(nif);
-    partitions.post(nif);
-    root.post(nif);
-    bones.post(nif);
+    void NiSkinInstance::read(NIFStream* nif)
+    {
+        data.read(nif);
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 101))
+            partitions.read(nif);
+        root.read(nif);
+        bones.read(nif);
+    }
 
-    if(data.empty() || root.empty())
-        nif->fail("NiSkinInstance missing root or data");
+    void NiSkinInstance::post(NIFFile* nif)
+    {
+        data.post(nif);
+        partitions.post(nif);
+        root.post(nif);
+        bones.post(nif);
+
+        if (data.empty() || root.empty())
+            nif->fail("NiSkinInstance missing root or data");
 
-    size_t bnum = bones.length();
-    if(bnum != data->bones.size())
-        nif->fail("Mismatch in NiSkinData bone count");
+        size_t bnum = bones.length();
+        if (bnum != data->bones.size())
+            nif->fail("Mismatch in NiSkinData bone count");
 
-    for(size_t i=0; i<bnum; i++)
+        for (size_t i = 0; i < bnum; i++)
+        {
+            if (bones[i].empty())
+                nif->fail("Oops: Missing bone! Don't know how to handle this.");
+            bones[i]->setBone();
+        }
+    }
+
+    void BSDismemberSkinInstance::read(NIFStream* nif)
     {
-        if(bones[i].empty())
-            nif->fail("Oops: Missing bone! Don't know how to handle this.");
-        bones[i]->setBone();
+        NiSkinInstance::read(nif);
+        unsigned int numPartitions = nif->getUInt();
+        nif->skip(4 * numPartitions); // Body part information
     }
-}
 
-void BSDismemberSkinInstance::read(NIFStream *nif)
-{
-    NiSkinInstance::read(nif);
-    unsigned int numPartitions = nif->getUInt();
-    nif->skip(4 * numPartitions); // Body part information
-}
+    void NiGeometryData::read(NIFStream* nif)
+    {
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 114))
+            nif->getInt(); // Group ID. (Almost?) always 0.
 
-void NiGeometryData::read(NIFStream *nif)
-{
-    if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,114))
-        nif->getInt(); // Group ID. (Almost?) always 0.
+        int verts = nif->getUShort();
+
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
+            nif->skip(2); // Keep flags and compress flags
+
+        if (nif->getBoolean())
+            nif->getVector3s(vertices, verts);
 
-    int verts = nif->getUShort();
+        unsigned int dataFlags = 0;
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 0, 1, 0))
+            dataFlags = nif->getUShort();
 
-    if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
-        nif->skip(2); // Keep flags and compress flags
+        if (nif->getVersion() == NIFFile::NIFVersion::VER_BGS
+            && nif->getBethVersion() > NIFFile::BethVersion::BETHVER_FO3)
+            nif->getUInt(); // Material CRC
 
-    if (nif->getBoolean())
-        nif->getVector3s(vertices, verts);
+        if (nif->getBoolean())
+        {
+            nif->getVector3s(normals, verts);
+            if (dataFlags & 0x1000)
+            {
+                nif->getVector3s(tangents, verts);
+                nif->getVector3s(bitangents, verts);
+            }
+        }
 
-    unsigned int dataFlags = 0;
-    if (nif->getVersion() >= NIFStream::generateVersion(10,0,1,0))
-        dataFlags = nif->getUShort();
+        center = nif->getVector3();
+        radius = nif->getFloat();
 
-    if (nif->getVersion() == NIFFile::NIFVersion::VER_BGS && nif->getBethVersion() > NIFFile::BethVersion::BETHVER_FO3)
-        nif->getUInt(); // Material CRC
+        if (nif->getBoolean())
+            nif->getVector4s(colors, verts);
 
-    if (nif->getBoolean())
-    {
-        nif->getVector3s(normals, verts);
-        if (dataFlags & 0x1000)
+        unsigned int numUVs = dataFlags;
+        if (nif->getVersion() <= NIFStream::generateVersion(4, 2, 2, 0))
+            numUVs = nif->getUShort();
+
+        // In Morrowind this field only corresponds to the number of UV sets.
+        // In later games only the first 6 bits are used as a count and the rest are flags.
+        if (nif->getVersion() > NIFFile::NIFVersion::VER_MW)
         {
-            nif->getVector3s(tangents, verts);
-            nif->getVector3s(bitangents, verts);
+            numUVs &= 0x3f;
+            if (nif->getVersion() == NIFFile::NIFVersion::VER_BGS && nif->getBethVersion() > 0)
+                numUVs &= 0x1;
+        }
+
+        bool hasUVs = true;
+        if (nif->getVersion() <= NIFFile::NIFVersion::VER_MW)
+            hasUVs = nif->getBoolean();
+        if (hasUVs)
+        {
+            uvlist.resize(numUVs);
+            for (unsigned int i = 0; i < numUVs; i++)
+            {
+                nif->getVector2s(uvlist[i], verts);
+                // flip the texture coordinates to convert them to the OpenGL convention of bottom-left image origin
+                for (unsigned int uv = 0; uv < uvlist[i].size(); ++uv)
+                {
+                    uvlist[i][uv] = osg::Vec2f(uvlist[i][uv].x(), 1.f - uvlist[i][uv].y());
+                }
+            }
         }
-    }
 
-    center = nif->getVector3();
-    radius = nif->getFloat();
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 0, 1, 0))
+            nif->getUShort(); // Consistency flags
 
-    if (nif->getBoolean())
-        nif->getVector4s(colors, verts);
+        if (nif->getVersion() >= NIFStream::generateVersion(20, 0, 0, 4))
+            nif->skip(4); // Additional data
+    }
 
-    unsigned int numUVs = dataFlags;
-    if (nif->getVersion() <= NIFStream::generateVersion(4,2,2,0))
-        numUVs = nif->getUShort();
+    void NiTriShapeData::read(NIFStream* nif)
+    {
+        NiGeometryData::read(nif);
+
+        /*int tris =*/nif->getUShort();
+
+        // We have three times as many vertices as triangles, so this
+        // is always equal to tris*3.
+        int cnt = nif->getInt();
+        bool hasTriangles = true;
+        if (nif->getVersion() > NIFFile::NIFVersion::VER_OB_OLD)
+            hasTriangles = nif->getBoolean();
+        if (hasTriangles)
+            nif->getUShorts(triangles, cnt);
+
+        // Read the match list, which lists the vertices that are equal to
+        // vertices. We don't actually need need this for anything, so
+        // just skip it.
+        unsigned short verts = nif->getUShort();
+        for (unsigned short i = 0; i < verts; i++)
+        {
+            // Number of vertices matching vertex 'i'
+            int num = nif->getUShort();
+            nif->skip(num * sizeof(short));
+        }
+    }
 
-    // In Morrowind this field only corresponds to the number of UV sets.
-    // In later games only the first 6 bits are used as a count and the rest are flags.
-    if (nif->getVersion() > NIFFile::NIFVersion::VER_MW)
+    void NiTriStripsData::read(NIFStream* nif)
     {
-        numUVs &= 0x3f;
-        if (nif->getVersion() == NIFFile::NIFVersion::VER_BGS && nif->getBethVersion() > 0)
-            numUVs &= 0x1;
+        NiGeometryData::read(nif);
+
+        // Every strip with n points defines n-2 triangles, so this should be unnecessary.
+        /*int tris =*/nif->getUShort();
+        // Number of triangle strips
+        int numStrips = nif->getUShort();
+
+        std::vector<unsigned short> lengths;
+        nif->getUShorts(lengths, numStrips);
+
+        // "Has Strips" flag. Exceptionally useful.
+        bool hasStrips = true;
+        if (nif->getVersion() > NIFFile::NIFVersion::VER_OB_OLD)
+            hasStrips = nif->getBoolean();
+        if (!hasStrips || !numStrips)
+            return;
+
+        strips.resize(numStrips);
+        for (int i = 0; i < numStrips; i++)
+            nif->getUShorts(strips[i], lengths[i]);
     }
 
-    bool hasUVs = true;
-    if (nif->getVersion() <= NIFFile::NIFVersion::VER_MW)
-        hasUVs = nif->getBoolean();
-    if (hasUVs)
+    void NiLinesData::read(NIFStream* nif)
     {
-        uvlist.resize(numUVs);
-        for (unsigned int i = 0; i < numUVs; i++)
+        NiGeometryData::read(nif);
+        size_t num = vertices.size();
+        std::vector<char> flags;
+        nif->getChars(flags, num);
+        // Can't construct a line from a single vertex.
+        if (num < 2)
+            return;
+        // Convert connectivity flags into usable geometry. The last element needs special handling.
+        for (size_t i = 0; i < num - 1; ++i)
         {
-            nif->getVector2s(uvlist[i], verts);
-            // flip the texture coordinates to convert them to the OpenGL convention of bottom-left image origin
-            for (unsigned int uv=0; uv<uvlist[i].size(); ++uv)
+            if (flags[i] & 1)
             {
-                uvlist[i][uv] = osg::Vec2f(uvlist[i][uv].x(), 1.f - uvlist[i][uv].y());
+                lines.emplace_back(i);
+                lines.emplace_back(i + 1);
             }
         }
+        // If there are just two vertices, they can be connected twice. Probably isn't critical.
+        if (flags[num - 1] & 1)
+        {
+            lines.emplace_back(num - 1);
+            lines.emplace_back(0);
+        }
     }
 
-    if (nif->getVersion() >= NIFStream::generateVersion(10,0,1,0))
-        nif->getUShort(); // Consistency flags
+    void NiParticlesData::read(NIFStream* nif)
+    {
+        NiGeometryData::read(nif);
 
-    if (nif->getVersion() >= NIFStream::generateVersion(20,0,0,4))
-        nif->skip(4); // Additional data
-}
+        // Should always match the number of vertices
+        if (nif->getVersion() <= NIFFile::NIFVersion::VER_MW)
+            numParticles = nif->getUShort();
 
-void NiTriShapeData::read(NIFStream *nif)
-{
-    NiGeometryData::read(nif);
-
-    /*int tris =*/ nif->getUShort();
-
-    // We have three times as many vertices as triangles, so this
-    // is always equal to tris*3.
-    int cnt = nif->getInt();
-    bool hasTriangles = true;
-    if (nif->getVersion() > NIFFile::NIFVersion::VER_OB_OLD)
-        hasTriangles = nif->getBoolean();
-    if (hasTriangles)
-        nif->getUShorts(triangles, cnt);
-
-    // Read the match list, which lists the vertices that are equal to
-    // vertices. We don't actually need need this for anything, so
-    // just skip it.
-    unsigned short verts = nif->getUShort();
-    for (unsigned short i=0; i < verts; i++)
-    {
-        // Number of vertices matching vertex 'i'
-        int num = nif->getUShort();
-        nif->skip(num * sizeof(short));
-    }
-}
+        if (nif->getVersion() <= NIFStream::generateVersion(10, 0, 1, 0))
+            std::fill(particleRadii.begin(), particleRadii.end(), nif->getFloat());
+        else if (nif->getBoolean())
+            nif->getFloats(particleRadii, vertices.size());
+        activeCount = nif->getUShort();
 
-void NiTriStripsData::read(NIFStream *nif)
-{
-    NiGeometryData::read(nif);
+        // Particle sizes
+        if (nif->getBoolean())
+            nif->getFloats(sizes, vertices.size());
 
-    // Every strip with n points defines n-2 triangles, so this should be unnecessary.
-    /*int tris =*/ nif->getUShort();
-    // Number of triangle strips
-    int numStrips = nif->getUShort();
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 0, 1, 0) && nif->getBoolean())
+            nif->getQuaternions(rotations, vertices.size());
+        if (nif->getVersion() >= NIFStream::generateVersion(20, 0, 0, 4))
+        {
+            if (nif->getBoolean())
+                nif->getFloats(rotationAngles, vertices.size());
+            if (nif->getBoolean())
+                nif->getVector3s(rotationAxes, vertices.size());
+        }
+    }
 
-    std::vector<unsigned short> lengths;
-    nif->getUShorts(lengths, numStrips);
+    void NiRotatingParticlesData::read(NIFStream* nif)
+    {
+        NiParticlesData::read(nif);
 
-    // "Has Strips" flag. Exceptionally useful.
-    bool hasStrips = true;
-    if (nif->getVersion() > NIFFile::NIFVersion::VER_OB_OLD)
-        hasStrips = nif->getBoolean();
-    if (!hasStrips || !numStrips)
-        return;
+        if (nif->getVersion() <= NIFStream::generateVersion(4, 2, 2, 0) && nif->getBoolean())
+            nif->getQuaternions(rotations, vertices.size());
+    }
 
-    strips.resize(numStrips);
-    for (int i = 0; i < numStrips; i++)
-        nif->getUShorts(strips[i], lengths[i]);
-}
+    void NiPosData::read(NIFStream* nif)
+    {
+        mKeyList = std::make_shared<Vector3KeyMap>();
+        mKeyList->read(nif);
+    }
 
-void NiLinesData::read(NIFStream *nif)
-{
-    NiGeometryData::read(nif);
-    size_t num = vertices.size();
-    std::vector<char> flags;
-    nif->getChars(flags, num);
-    // Can't construct a line from a single vertex.
-    if (num < 2)
-        return;
-    // Convert connectivity flags into usable geometry. The last element needs special handling.
-    for (size_t i = 0; i < num-1; ++i)
+    void NiUVData::read(NIFStream* nif)
     {
-        if (flags[i] & 1)
+        for (int i = 0; i < 4; i++)
         {
-            lines.emplace_back(i);
-            lines.emplace_back(i+1);
+            mKeyList[i] = std::make_shared<FloatKeyMap>();
+            mKeyList[i]->read(nif);
         }
     }
-    // If there are just two vertices, they can be connected twice. Probably isn't critical.
-    if (flags[num-1] & 1)
+
+    void NiFloatData::read(NIFStream* nif)
     {
-        lines.emplace_back(num-1);
-        lines.emplace_back(0);
+        mKeyList = std::make_shared<FloatKeyMap>();
+        mKeyList->read(nif);
     }
-}
 
-void NiParticlesData::read(NIFStream *nif)
-{
-    NiGeometryData::read(nif);
-
-    // Should always match the number of vertices
-    if (nif->getVersion() <= NIFFile::NIFVersion::VER_MW)
-        numParticles = nif->getUShort();
-
-    if (nif->getVersion() <= NIFStream::generateVersion(10,0,1,0))
-        std::fill(particleRadii.begin(), particleRadii.end(), nif->getFloat());
-    else if (nif->getBoolean())
-        nif->getFloats(particleRadii, vertices.size());
-    activeCount = nif->getUShort();
+    void NiPixelData::read(NIFStream* nif)
+    {
+        fmt = (Format)nif->getUInt();
 
-    // Particle sizes
-    if (nif->getBoolean())
-        nif->getFloats(sizes, vertices.size());
+        if (nif->getVersion() < NIFStream::generateVersion(10, 4, 0, 2))
+        {
+            for (unsigned int i = 0; i < 4; ++i)
+                colorMask[i] = nif->getUInt();
+            bpp = nif->getUInt();
+            nif->skip(8); // "Old Fast Compare". Whatever that means.
+            if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
+                pixelTiling = nif->getUInt();
+        }
+        else // TODO: see if anything from here needs to be implemented
+        {
+            bpp = nif->getChar();
+            nif->skip(4); // Renderer hint
+            nif->skip(4); // Extra data
+            nif->skip(4); // Flags
+            pixelTiling = nif->getUInt();
+            if (nif->getVersion() >= NIFStream::generateVersion(20, 3, 0, 4))
+                sRGB = nif->getBoolean();
+            nif->skip(4 * 10); // Channel data
+        }
 
-    if (nif->getVersion() >= NIFStream::generateVersion(10,0,1,0) && nif->getBoolean())
-        nif->getQuaternions(rotations, vertices.size());
-    if (nif->getVersion() >= NIFStream::generateVersion(20,0,0,4))
-    {
-        if (nif->getBoolean())
-            nif->getFloats(rotationAngles, vertices.size());
-        if (nif->getBoolean())
-            nif->getVector3s(rotationAxes, vertices.size());
-    }
+        palette.read(nif);
 
-}
+        numberOfMipmaps = nif->getUInt();
 
-void NiRotatingParticlesData::read(NIFStream *nif)
-{
-    NiParticlesData::read(nif);
+        // Bytes per pixel, should be bpp / 8
+        /* int bytes = */ nif->getUInt();
 
-    if (nif->getVersion() <= NIFStream::generateVersion(4,2,2,0) && nif->getBoolean())
-        nif->getQuaternions(rotations, vertices.size());
-}
+        for (unsigned int i = 0; i < numberOfMipmaps; i++)
+        {
+            // Image size and offset in the following data field
+            Mipmap m;
+            m.width = nif->getUInt();
+            m.height = nif->getUInt();
+            m.dataOffset = nif->getUInt();
+            mipmaps.push_back(m);
+        }
 
-void NiPosData::read(NIFStream *nif)
-{
-    mKeyList = std::make_shared<Vector3KeyMap>();
-    mKeyList->read(nif);
-}
+        // Read the data
+        unsigned int numPixels = nif->getUInt();
+        bool hasFaces = nif->getVersion() >= NIFStream::generateVersion(10, 4, 0, 2);
+        unsigned int numFaces = hasFaces ? nif->getUInt() : 1;
+        if (numPixels && numFaces)
+            nif->getUChars(data, numPixels * numFaces);
+    }
 
-void NiUVData::read(NIFStream *nif)
-{
-    for(int i = 0;i < 4;i++)
+    void NiPixelData::post(NIFFile* nif)
     {
-        mKeyList[i] = std::make_shared<FloatKeyMap>();
-        mKeyList[i]->read(nif);
+        palette.post(nif);
     }
-}
-
-void NiFloatData::read(NIFStream *nif)
-{
-    mKeyList = std::make_shared<FloatKeyMap>();
-    mKeyList->read(nif);
-}
-
-void NiPixelData::read(NIFStream *nif)
-{
-    fmt = (Format)nif->getUInt();
 
-    if (nif->getVersion() < NIFStream::generateVersion(10,4,0,2))
+    void NiColorData::read(NIFStream* nif)
     {
-        for (unsigned int i = 0; i < 4; ++i)
-            colorMask[i] = nif->getUInt();
-        bpp = nif->getUInt();
-        nif->skip(8); // "Old Fast Compare". Whatever that means.
-        if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
-            pixelTiling = nif->getUInt();
+        mKeyMap = std::make_shared<Vector4KeyMap>();
+        mKeyMap->read(nif);
     }
-    else // TODO: see if anything from here needs to be implemented
+
+    void NiVisData::read(NIFStream* nif)
     {
-        bpp = nif->getChar();
-        nif->skip(4); // Renderer hint
-        nif->skip(4); // Extra data
-        nif->skip(4); // Flags
-        pixelTiling = nif->getUInt();
-        if (nif->getVersion() >= NIFStream::generateVersion(20,3,0,4))
-            sRGB = nif->getBoolean();
-        nif->skip(4*10); // Channel data
+        int count = nif->getInt();
+        mVis.resize(count);
+        for (size_t i = 0; i < mVis.size(); i++)
+        {
+            mVis[i].time = nif->getFloat();
+            mVis[i].isSet = (nif->getChar() != 0);
+        }
     }
 
-    palette.read(nif);
-
-    numberOfMipmaps = nif->getUInt();
-
-    // Bytes per pixel, should be bpp / 8
-    /* int bytes = */ nif->getUInt();
-
-    for(unsigned int i=0; i<numberOfMipmaps; i++)
+    void NiSkinData::read(NIFStream* nif)
     {
-        // Image size and offset in the following data field
-        Mipmap m;
-        m.width = nif->getUInt();
-        m.height = nif->getUInt();
-        m.dataOffset = nif->getUInt();
-        mipmaps.push_back(m);
-    }
+        trafo.rotation = nif->getMatrix3();
+        trafo.pos = nif->getVector3();
+        trafo.scale = nif->getFloat();
 
-    // Read the data
-    unsigned int numPixels = nif->getUInt();
-    bool hasFaces = nif->getVersion() >= NIFStream::generateVersion(10,4,0,2);
-    unsigned int numFaces = hasFaces ? nif->getUInt() : 1;
-    if (numPixels && numFaces)
-        nif->getUChars(data, numPixels * numFaces);
-}
+        int boneNum = nif->getInt();
+        if (nif->getVersion() >= NIFFile::NIFVersion::VER_MW
+            && nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 0))
+            partitions.read(nif);
 
-void NiPixelData::post(NIFFile *nif)
-{
-    palette.post(nif);
-}
+        // Has vertex weights flag
+        if (nif->getVersion() > NIFStream::generateVersion(4, 2, 1, 0) && !nif->getBoolean())
+            return;
 
-void NiColorData::read(NIFStream *nif)
-{
-    mKeyMap = std::make_shared<Vector4KeyMap>();
-    mKeyMap->read(nif);
-}
+        bones.resize(boneNum);
+        for (BoneInfo& bi : bones)
+        {
+            bi.trafo.rotation = nif->getMatrix3();
+            bi.trafo.pos = nif->getVector3();
+            bi.trafo.scale = nif->getFloat();
+            bi.boundSphereCenter = nif->getVector3();
+            bi.boundSphereRadius = nif->getFloat();
+
+            // Number of vertex weights
+            bi.weights.resize(nif->getUShort());
+            for (size_t j = 0; j < bi.weights.size(); j++)
+            {
+                bi.weights[j].vertex = nif->getUShort();
+                bi.weights[j].weight = nif->getFloat();
+            }
+        }
+    }
 
-void NiVisData::read(NIFStream *nif)
-{
-    int count = nif->getInt();
-    mVis.resize(count);
-    for(size_t i = 0;i < mVis.size();i++)
+    void NiSkinData::post(NIFFile* nif)
     {
-        mVis[i].time = nif->getFloat();
-        mVis[i].isSet = (nif->getChar() != 0);
+        partitions.post(nif);
     }
-}
-
-void NiSkinData::read(NIFStream *nif)
-{
-    trafo.rotation = nif->getMatrix3();
-    trafo.pos = nif->getVector3();
-    trafo.scale = nif->getFloat();
-
-    int boneNum = nif->getInt();
-    if (nif->getVersion() >= NIFFile::NIFVersion::VER_MW && nif->getVersion() <= NIFStream::generateVersion(10,1,0,0))
-        partitions.read(nif);
 
-    // Has vertex weights flag
-    if (nif->getVersion() > NIFStream::generateVersion(4,2,1,0) && !nif->getBoolean())
-        return;
+    void NiSkinPartition::read(NIFStream* nif)
+    {
+        unsigned int num = nif->getUInt();
+        data.resize(num);
+        for (auto& partition : data)
+            partition.read(nif);
+    }
 
-    bones.resize(boneNum);
-    for (BoneInfo &bi : bones)
+    void NiSkinPartition::Partition::read(NIFStream* nif)
     {
-        bi.trafo.rotation = nif->getMatrix3();
-        bi.trafo.pos = nif->getVector3();
-        bi.trafo.scale = nif->getFloat();
-        bi.boundSphereCenter = nif->getVector3();
-        bi.boundSphereRadius = nif->getFloat();
-
-        // Number of vertex weights
-        bi.weights.resize(nif->getUShort());
-        for(size_t j = 0;j < bi.weights.size();j++)
+        size_t numVertices = nif->getUShort();
+        size_t numTriangles = nif->getUShort();
+        size_t numBones = nif->getUShort();
+        size_t numStrips = nif->getUShort();
+        size_t bonesPerVertex = nif->getUShort();
+        if (numBones)
+            nif->getUShorts(bones, numBones);
+
+        bool hasVertexMap = true;
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
+            hasVertexMap = nif->getBoolean();
+        if (hasVertexMap && numVertices)
+            nif->getUShorts(vertexMap, numVertices);
+
+        bool hasVertexWeights = true;
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
+            hasVertexWeights = nif->getBoolean();
+        if (hasVertexWeights && numVertices && bonesPerVertex)
+            nif->getFloats(weights, numVertices * bonesPerVertex);
+
+        std::vector<unsigned short> stripLengths;
+        if (numStrips)
+            nif->getUShorts(stripLengths, numStrips);
+
+        bool hasFaces = true;
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
+            hasFaces = nif->getBoolean();
+        if (hasFaces)
         {
-            bi.weights[j].vertex = nif->getUShort();
-            bi.weights[j].weight = nif->getFloat();
+            if (numStrips)
+            {
+                strips.resize(numStrips);
+                for (size_t i = 0; i < numStrips; i++)
+                    nif->getUShorts(strips[i], stripLengths[i]);
+            }
+            else if (numTriangles)
+                nif->getUShorts(triangles, numTriangles * 3);
+        }
+        bool hasBoneIndices = nif->getChar() != 0;
+        if (hasBoneIndices && numVertices && bonesPerVertex)
+            nif->getChars(boneIndices, numVertices * bonesPerVertex);
+        if (nif->getBethVersion() > NIFFile::BethVersion::BETHVER_FO3)
+        {
+            nif->getChar(); // LOD level
+            nif->getBoolean(); // Global VB
         }
     }
-}
 
-void NiSkinData::post(NIFFile *nif)
-{
-    partitions.post(nif);
-}
+    void NiMorphData::read(NIFStream* nif)
+    {
+        int morphCount = nif->getInt();
+        int vertCount = nif->getInt();
+        nif->getChar(); // Relative targets, always 1
 
-void NiSkinPartition::read(NIFStream *nif)
-{
-    unsigned int num = nif->getUInt();
-    data.resize(num);
-    for (auto& partition : data)
-        partition.read(nif);
-}
+        mMorphs.resize(morphCount);
+        for (int i = 0; i < morphCount; i++)
+        {
+            mMorphs[i].mKeyFrames = std::make_shared<FloatKeyMap>();
+            mMorphs[i].mKeyFrames->read(nif, /*morph*/ true);
+            nif->getVector3s(mMorphs[i].mVertices, vertCount);
+        }
+    }
 
-void NiSkinPartition::Partition::read(NIFStream *nif)
-{
-    size_t numVertices = nif->getUShort();
-    size_t numTriangles = nif->getUShort();
-    size_t numBones = nif->getUShort();
-    size_t numStrips = nif->getUShort();
-    size_t bonesPerVertex = nif->getUShort();
-    if (numBones)
-        nif->getUShorts(bones, numBones);
-
-    bool hasVertexMap = true;
-    if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
-        hasVertexMap = nif->getBoolean();
-    if (hasVertexMap && numVertices)
-        nif->getUShorts(vertexMap, numVertices);
-
-    bool hasVertexWeights = true;
-    if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
-        hasVertexWeights = nif->getBoolean();
-    if (hasVertexWeights && numVertices && bonesPerVertex)
-        nif->getFloats(weights, numVertices * bonesPerVertex);
-
-    std::vector<unsigned short> stripLengths;
-    if (numStrips)
-        nif->getUShorts(stripLengths, numStrips);
-
-    bool hasFaces = true;
-    if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
-        hasFaces = nif->getBoolean();
-    if (hasFaces)
+    void NiKeyframeData::read(NIFStream* nif)
     {
-        if (numStrips)
+        mRotations = std::make_shared<QuaternionKeyMap>();
+        mRotations->read(nif);
+        if (mRotations->mInterpolationType == InterpolationType_XYZ)
         {
-            strips.resize(numStrips);
-            for (size_t i = 0; i < numStrips; i++)
-                nif->getUShorts(strips[i], stripLengths[i]);
+            if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 0))
+                mAxisOrder = static_cast<AxisOrder>(nif->getInt());
+            mXRotations = std::make_shared<FloatKeyMap>();
+            mYRotations = std::make_shared<FloatKeyMap>();
+            mZRotations = std::make_shared<FloatKeyMap>();
+            mXRotations->read(nif);
+            mYRotations->read(nif);
+            mZRotations->read(nif);
         }
-        else if (numTriangles)
-            nif->getUShorts(triangles, numTriangles * 3);
+        mTranslations = std::make_shared<Vector3KeyMap>();
+        mTranslations->read(nif);
+        mScales = std::make_shared<FloatKeyMap>();
+        mScales->read(nif);
     }
-    bool hasBoneIndices = nif->getChar() != 0;
-    if (hasBoneIndices && numVertices && bonesPerVertex)
-        nif->getChars(boneIndices, numVertices * bonesPerVertex);
-    if (nif->getBethVersion() > NIFFile::BethVersion::BETHVER_FO3)
+
+    void NiPalette::read(NIFStream* nif)
     {
-        nif->getChar(); // LOD level
-        nif->getBoolean(); // Global VB
+        unsigned int alphaMask = !nif->getChar() ? 0xFF000000 : 0;
+        // Fill the entire palette with black even if there isn't enough entries.
+        colors.resize(256);
+        unsigned int numEntries = nif->getUInt();
+        for (unsigned int i = 0; i < numEntries; i++)
+            colors[i] = nif->getUInt() | alphaMask;
     }
-}
-
-void NiMorphData::read(NIFStream *nif)
-{
-    int morphCount = nif->getInt();
-    int vertCount  = nif->getInt();
-    nif->getChar(); // Relative targets, always 1
 
-    mMorphs.resize(morphCount);
-    for(int i = 0;i < morphCount;i++)
+    void NiStringPalette::read(NIFStream* nif)
     {
-        mMorphs[i].mKeyFrames = std::make_shared<FloatKeyMap>();
-        mMorphs[i].mKeyFrames->read(nif, /*morph*/true);
-        nif->getVector3s(mMorphs[i].mVertices, vertCount);
+        palette = nif->getString();
+        if (nif->getUInt() != palette.size())
+            nif->file->warn("Failed size check in NiStringPalette");
     }
-}
 
-void NiKeyframeData::read(NIFStream *nif)
-{
-    mRotations = std::make_shared<QuaternionKeyMap>();
-    mRotations->read(nif);
-    if(mRotations->mInterpolationType == InterpolationType_XYZ)
+    void NiBoolData::read(NIFStream* nif)
     {
-        if (nif->getVersion() <= NIFStream::generateVersion(10,1,0,0))
-            mAxisOrder = static_cast<AxisOrder>(nif->getInt());
-        mXRotations = std::make_shared<FloatKeyMap>();
-        mYRotations = std::make_shared<FloatKeyMap>();
-        mZRotations = std::make_shared<FloatKeyMap>();
-        mXRotations->read(nif);
-        mYRotations->read(nif);
-        mZRotations->read(nif);
+        mKeyList = std::make_shared<ByteKeyMap>();
+        mKeyList->read(nif);
     }
-    mTranslations = std::make_shared<Vector3KeyMap>();
-    mTranslations->read(nif);
-    mScales = std::make_shared<FloatKeyMap>();
-    mScales->read(nif);
-}
-
-void NiPalette::read(NIFStream *nif)
-{
-    unsigned int alphaMask = !nif->getChar() ? 0xFF000000 : 0;
-    // Fill the entire palette with black even if there isn't enough entries.
-    colors.resize(256);
-    unsigned int numEntries = nif->getUInt();
-    for (unsigned int i = 0; i < numEntries; i++)
-        colors[i] = nif->getUInt() | alphaMask;
-}
-
-void NiStringPalette::read(NIFStream *nif)
-{
-    palette = nif->getString();
-    if (nif->getUInt() != palette.size())
-        nif->file->warn("Failed size check in NiStringPalette");
-}
-
-void NiBoolData::read(NIFStream *nif)
-{
-    mKeyList = std::make_shared<ByteKeyMap>();
-    mKeyList->read(nif);
-}
 
 } // Namespace
diff --git a/components/nif/data.hpp b/components/nif/data.hpp
index 0132b1ad6d..806bb4b305 100644
--- a/components/nif/data.hpp
+++ b/components/nif/data.hpp
@@ -31,253 +31,254 @@
 namespace Nif
 {
 
-// Common ancestor for several data classes
-struct NiGeometryData : public Record
-{
-    std::vector<osg::Vec3f> vertices, normals, tangents, bitangents;
-    std::vector<osg::Vec4f> colors;
-    std::vector< std::vector<osg::Vec2f> > uvlist;
-    osg::Vec3f center;
-    float radius;
+    // Common ancestor for several data classes
+    struct NiGeometryData : public Record
+    {
+        std::vector<osg::Vec3f> vertices, normals, tangents, bitangents;
+        std::vector<osg::Vec4f> colors;
+        std::vector<std::vector<osg::Vec2f>> uvlist;
+        osg::Vec3f center;
+        float radius;
 
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
+    };
 
-struct NiTriShapeData : public NiGeometryData
-{
-    // Triangles, three vertex indices per triangle
-    std::vector<unsigned short> triangles;
+    struct NiTriShapeData : public NiGeometryData
+    {
+        // Triangles, three vertex indices per triangle
+        std::vector<unsigned short> triangles;
 
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
+    };
 
-struct NiTriStripsData : public NiGeometryData
-{
-    // Triangle strips, series of vertex indices.
-    std::vector<std::vector<unsigned short>> strips;
+    struct NiTriStripsData : public NiGeometryData
+    {
+        // Triangle strips, series of vertex indices.
+        std::vector<std::vector<unsigned short>> strips;
 
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
+    };
 
-struct NiLinesData : public NiGeometryData
-{
-    // Lines, series of indices that correspond to connected vertices.
-    std::vector<unsigned short> lines;
+    struct NiLinesData : public NiGeometryData
+    {
+        // Lines, series of indices that correspond to connected vertices.
+        std::vector<unsigned short> lines;
 
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
+    };
 
-struct NiParticlesData : public NiGeometryData
-{
-    int numParticles{0};
+    struct NiParticlesData : public NiGeometryData
+    {
+        int numParticles{ 0 };
 
-    int activeCount{0};
+        int activeCount{ 0 };
 
-    std::vector<float> particleRadii, sizes, rotationAngles;
-    std::vector<osg::Quat> rotations;
-    std::vector<osg::Vec3f> rotationAxes;
+        std::vector<float> particleRadii, sizes, rotationAngles;
+        std::vector<osg::Quat> rotations;
+        std::vector<osg::Vec3f> rotationAxes;
 
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
+    };
 
-struct NiRotatingParticlesData : public NiParticlesData
-{
-    void read(NIFStream *nif) override;
-};
+    struct NiRotatingParticlesData : public NiParticlesData
+    {
+        void read(NIFStream* nif) override;
+    };
 
-struct NiPosData : public Record
-{
-    Vector3KeyMapPtr mKeyList;
+    struct NiPosData : public Record
+    {
+        Vector3KeyMapPtr mKeyList;
 
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
+    };
 
-struct NiUVData : public Record
-{
-    FloatKeyMapPtr mKeyList[4];
+    struct NiUVData : public Record
+    {
+        FloatKeyMapPtr mKeyList[4];
 
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
+    };
 
-struct NiFloatData : public Record
-{
-    FloatKeyMapPtr mKeyList;
+    struct NiFloatData : public Record
+    {
+        FloatKeyMapPtr mKeyList;
 
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
+    };
 
-struct NiPixelData : public Record
-{
-    enum Format
+    struct NiPixelData : public Record
     {
-        NIPXFMT_RGB8,
-        NIPXFMT_RGBA8,
-        NIPXFMT_PAL8,
-        NIPXFMT_PALA8,
-        NIPXFMT_BGR8,
-        NIPXFMT_BGRA8,
-        NIPXFMT_DXT1,
-        NIPXFMT_DXT3,
-        NIPXFMT_DXT5
+        enum Format
+        {
+            NIPXFMT_RGB8,
+            NIPXFMT_RGBA8,
+            NIPXFMT_PAL8,
+            NIPXFMT_PALA8,
+            NIPXFMT_BGR8,
+            NIPXFMT_BGRA8,
+            NIPXFMT_DXT1,
+            NIPXFMT_DXT3,
+            NIPXFMT_DXT5
+        };
+        Format fmt{ NIPXFMT_RGB8 };
+
+        unsigned int colorMask[4]{ 0 };
+        unsigned int bpp{ 0 }, pixelTiling{ 0 };
+        bool sRGB{ false };
+
+        NiPalettePtr palette;
+        unsigned int numberOfMipmaps{ 0 };
+
+        struct Mipmap
+        {
+            int width, height;
+            int dataOffset;
+        };
+        std::vector<Mipmap> mipmaps;
+
+        std::vector<unsigned char> data;
+
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
     };
-    Format fmt{NIPXFMT_RGB8};
 
-    unsigned int colorMask[4]{0};
-    unsigned int bpp{0}, pixelTiling{0};
-    bool sRGB{false};
+    struct NiColorData : public Record
+    {
+        Vector4KeyMapPtr mKeyMap;
 
-    NiPalettePtr palette;
-    unsigned int numberOfMipmaps{0};
+        void read(NIFStream* nif) override;
+    };
 
-    struct Mipmap
+    struct NiVisData : public Record
     {
-        int width, height;
-        int dataOffset;
+        struct VisData
+        {
+            float time;
+            bool isSet;
+        };
+        std::vector<VisData> mVis;
+
+        void read(NIFStream* nif) override;
     };
-    std::vector<Mipmap> mipmaps;
-
-    std::vector<unsigned char> data;
-
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
-
-struct NiColorData : public Record
-{
-    Vector4KeyMapPtr mKeyMap;
 
-    void read(NIFStream *nif) override;
-};
+    struct NiSkinInstance : public Record
+    {
+        NiSkinDataPtr data;
+        NiSkinPartitionPtr partitions;
+        NodePtr root;
+        NodeList bones;
 
-struct NiVisData : public Record
-{
-    struct VisData {
-        float time;
-        bool isSet;
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
     };
-    std::vector<VisData> mVis;
 
-    void read(NIFStream *nif) override;
-};
+    struct BSDismemberSkinInstance : public NiSkinInstance
+    {
+        void read(NIFStream* nif) override;
+    };
 
-struct NiSkinInstance : public Record
-{
-    NiSkinDataPtr data;
-    NiSkinPartitionPtr partitions;
-    NodePtr root;
-    NodeList bones;
+    struct NiSkinData : public Record
+    {
+        struct VertWeight
+        {
+            unsigned short vertex;
+            float weight;
+        };
+
+        struct BoneInfo
+        {
+            Transformation trafo;
+            osg::Vec3f boundSphereCenter;
+            float boundSphereRadius;
+            std::vector<VertWeight> weights;
+        };
 
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
+        Transformation trafo;
+        std::vector<BoneInfo> bones;
+        NiSkinPartitionPtr partitions;
 
-struct BSDismemberSkinInstance : public NiSkinInstance
-{
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
-struct NiSkinData : public Record
-{
-    struct VertWeight
+    struct NiSkinPartition : public Record
     {
-        unsigned short vertex;
-        float weight;
+        struct Partition
+        {
+            std::vector<unsigned short> bones;
+            std::vector<unsigned short> vertexMap;
+            std::vector<float> weights;
+            std::vector<std::vector<unsigned short>> strips;
+            std::vector<unsigned short> triangles;
+            std::vector<char> boneIndices;
+            void read(NIFStream* nif);
+        };
+        std::vector<Partition> data;
+
+        void read(NIFStream* nif) override;
     };
 
-    struct BoneInfo
+    struct NiMorphData : public Record
     {
-        Transformation trafo;
-        osg::Vec3f boundSphereCenter;
-        float boundSphereRadius;
-        std::vector<VertWeight> weights;
+        struct MorphData
+        {
+            FloatKeyMapPtr mKeyFrames;
+            std::vector<osg::Vec3f> mVertices;
+        };
+        std::vector<MorphData> mMorphs;
+
+        void read(NIFStream* nif) override;
     };
 
-    Transformation trafo;
-    std::vector<BoneInfo> bones;
-    NiSkinPartitionPtr partitions;
-
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
-
-struct NiSkinPartition : public Record
-{
-    struct Partition
+    struct NiKeyframeData : public Record
     {
-        std::vector<unsigned short> bones;
-        std::vector<unsigned short> vertexMap;
-        std::vector<float> weights;
-        std::vector<std::vector<unsigned short>> strips;
-        std::vector<unsigned short> triangles;
-        std::vector<char> boneIndices;
-        void read(NIFStream *nif);
+        QuaternionKeyMapPtr mRotations;
+
+        // may be NULL
+        FloatKeyMapPtr mXRotations;
+        FloatKeyMapPtr mYRotations;
+        FloatKeyMapPtr mZRotations;
+
+        Vector3KeyMapPtr mTranslations;
+        FloatKeyMapPtr mScales;
+
+        enum class AxisOrder
+        {
+            Order_XYZ = 0,
+            Order_XZY = 1,
+            Order_YZX = 2,
+            Order_YXZ = 3,
+            Order_ZXY = 4,
+            Order_ZYX = 5,
+            Order_XYX = 6,
+            Order_YZY = 7,
+            Order_ZXZ = 8
+        };
+
+        AxisOrder mAxisOrder{ AxisOrder::Order_XYZ };
+
+        void read(NIFStream* nif) override;
     };
-    std::vector<Partition> data;
 
-    void read(NIFStream *nif) override;
-};
+    struct NiPalette : public Record
+    {
+        // 32-bit RGBA colors that correspond to 8-bit indices
+        std::vector<unsigned int> colors;
 
-struct NiMorphData : public Record
-{
-    struct MorphData {
-        FloatKeyMapPtr mKeyFrames;
-        std::vector<osg::Vec3f> mVertices;
+        void read(NIFStream* nif) override;
     };
-    std::vector<MorphData> mMorphs;
-
-    void read(NIFStream *nif) override;
-};
-
-
-struct NiKeyframeData : public Record
-{
-    QuaternionKeyMapPtr mRotations;
 
-    // may be NULL
-    FloatKeyMapPtr mXRotations;
-    FloatKeyMapPtr mYRotations;
-    FloatKeyMapPtr mZRotations;
-
-    Vector3KeyMapPtr mTranslations;
-    FloatKeyMapPtr mScales;
-
-    enum class AxisOrder
+    struct NiStringPalette : public Record
     {
-        Order_XYZ = 0,
-        Order_XZY = 1,
-        Order_YZX = 2,
-        Order_YXZ = 3,
-        Order_ZXY = 4,
-        Order_ZYX = 5,
-        Order_XYX = 6,
-        Order_YZY = 7,
-        Order_ZXZ = 8
+        std::string palette;
+        void read(NIFStream* nif) override;
     };
 
-    AxisOrder mAxisOrder{AxisOrder::Order_XYZ};
-
-    void read(NIFStream *nif) override;
-};
-
-struct NiPalette : public Record
-{
-    // 32-bit RGBA colors that correspond to 8-bit indices
-    std::vector<unsigned int> colors;
-
-    void read(NIFStream *nif) override;
-};
-
-struct NiStringPalette : public Record
-{
-    std::string palette;
-    void read(NIFStream *nif) override;
-};
-
-struct NiBoolData : public Record
-{
-    ByteKeyMapPtr mKeyList;
-    void read(NIFStream *nif) override;
-};
+    struct NiBoolData : public Record
+    {
+        ByteKeyMapPtr mKeyList;
+        void read(NIFStream* nif) override;
+    };
 
 } // Namespace
 #endif
diff --git a/components/nif/effect.cpp b/components/nif/effect.cpp
index e1cab2bd50..2d74b38c44 100644
--- a/components/nif/effect.cpp
+++ b/components/nif/effect.cpp
@@ -6,81 +6,81 @@
 namespace Nif
 {
 
-void NiDynamicEffect::read(NIFStream *nif)
-{
-    Node::read(nif);
-    if (nif->getVersion() >= nif->generateVersion(10,1,0,106)
-     && nif->getBethVersion() < NIFFile::BethVersion::BETHVER_FO4)
-        nif->getBoolean(); // Switch state
-    unsigned int numAffectedNodes = nif->getUInt();
-    for (unsigned int i=0; i<numAffectedNodes; ++i)
-        nif->getUInt(); // ref to another Node
-}
-
-void NiLight::read(NIFStream *nif)
-{
-    NiDynamicEffect::read(nif);
-
-    dimmer = nif->getFloat();
-    ambient = nif->getVector3();
-    diffuse = nif->getVector3();
-    specular = nif->getVector3();
-}
-
-void NiTextureEffect::read(NIFStream *nif)
-{
-    NiDynamicEffect::read(nif);
-
-    // Model Projection Matrix
-    nif->skip(3 * 3 * sizeof(float));
-
-    // Model Projection Transform
-    nif->skip(3 * sizeof(float));
-
-    // Texture Filtering
-    nif->skip(4);
-
-    // Max anisotropy samples
-    if (nif->getVersion() >= NIFStream::generateVersion(20,5,0,4))
-        nif->skip(2);
-
-    clamp = nif->getUInt();
-
-    textureType = (TextureType)nif->getUInt();
-
-    coordGenType = (CoordGenType)nif->getUInt();
-
-    texture.read(nif);
-
-    nif->skip(1); // Use clipping plane
-    nif->skip(16); // Clipping plane dimensions vector
-    if (nif->getVersion() <= NIFStream::generateVersion(10,2,0,0))
-        nif->skip(4); // PS2-specific shorts
-    if (nif->getVersion() <= NIFStream::generateVersion(4,1,0,12))
-        nif->skip(2); // Unknown short
-}
-
-void NiTextureEffect::post(NIFFile *nif)
-{
-    NiDynamicEffect::post(nif);
-    texture.post(nif);
-}
-
-void NiPointLight::read(NIFStream *nif)
-{
-    NiLight::read(nif);
-
-    constantAttenuation = nif->getFloat();
-    linearAttenuation = nif->getFloat();
-    quadraticAttenuation = nif->getFloat();
-}
-
-void NiSpotLight::read(NIFStream *nif)
-{
-    NiPointLight::read(nif);
-
-    cutoff = nif->getFloat();
-    exponent = nif->getFloat();
-}
+    void NiDynamicEffect::read(NIFStream* nif)
+    {
+        Node::read(nif);
+        if (nif->getVersion() >= nif->generateVersion(10, 1, 0, 106)
+            && nif->getBethVersion() < NIFFile::BethVersion::BETHVER_FO4)
+            nif->getBoolean(); // Switch state
+        unsigned int numAffectedNodes = nif->getUInt();
+        for (unsigned int i = 0; i < numAffectedNodes; ++i)
+            nif->getUInt(); // ref to another Node
+    }
+
+    void NiLight::read(NIFStream* nif)
+    {
+        NiDynamicEffect::read(nif);
+
+        dimmer = nif->getFloat();
+        ambient = nif->getVector3();
+        diffuse = nif->getVector3();
+        specular = nif->getVector3();
+    }
+
+    void NiTextureEffect::read(NIFStream* nif)
+    {
+        NiDynamicEffect::read(nif);
+
+        // Model Projection Matrix
+        nif->skip(3 * 3 * sizeof(float));
+
+        // Model Projection Transform
+        nif->skip(3 * sizeof(float));
+
+        // Texture Filtering
+        nif->skip(4);
+
+        // Max anisotropy samples
+        if (nif->getVersion() >= NIFStream::generateVersion(20, 5, 0, 4))
+            nif->skip(2);
+
+        clamp = nif->getUInt();
+
+        textureType = (TextureType)nif->getUInt();
+
+        coordGenType = (CoordGenType)nif->getUInt();
+
+        texture.read(nif);
+
+        nif->skip(1); // Use clipping plane
+        nif->skip(16); // Clipping plane dimensions vector
+        if (nif->getVersion() <= NIFStream::generateVersion(10, 2, 0, 0))
+            nif->skip(4); // PS2-specific shorts
+        if (nif->getVersion() <= NIFStream::generateVersion(4, 1, 0, 12))
+            nif->skip(2); // Unknown short
+    }
+
+    void NiTextureEffect::post(NIFFile* nif)
+    {
+        NiDynamicEffect::post(nif);
+        texture.post(nif);
+    }
+
+    void NiPointLight::read(NIFStream* nif)
+    {
+        NiLight::read(nif);
+
+        constantAttenuation = nif->getFloat();
+        linearAttenuation = nif->getFloat();
+        quadraticAttenuation = nif->getFloat();
+    }
+
+    void NiSpotLight::read(NIFStream* nif)
+    {
+        NiPointLight::read(nif);
+
+        cutoff = nif->getFloat();
+        exponent = nif->getFloat();
+    }
 
 }
diff --git a/components/nif/effect.hpp b/components/nif/effect.hpp
index dcbeef45e1..7efaff62c9 100644
--- a/components/nif/effect.hpp
+++ b/components/nif/effect.hpp
@@ -29,68 +29,68 @@
 namespace Nif
 {
 
-struct NiDynamicEffect : public Node
-{
-    void read(NIFStream *nif) override;
-};
-
-// Used as base for NiAmbientLight, NiDirectionalLight, NiPointLight and NiSpotLight.
-struct NiLight : NiDynamicEffect
-{
-    float dimmer;
-    osg::Vec3f ambient;
-    osg::Vec3f diffuse;
-    osg::Vec3f specular;
-
-    void read(NIFStream *nif) override;
-};
+    struct NiDynamicEffect : public Node
+    {
+        void read(NIFStream* nif) override;
+    };
 
-struct NiPointLight : public NiLight
-{
-    float constantAttenuation;
-    float linearAttenuation;
-    float quadraticAttenuation;
+    // Used as base for NiAmbientLight, NiDirectionalLight, NiPointLight and NiSpotLight.
+    struct NiLight : NiDynamicEffect
+    {
+        float dimmer;
+        osg::Vec3f ambient;
+        osg::Vec3f diffuse;
+        osg::Vec3f specular;
 
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
+    };
 
-struct NiSpotLight : public NiPointLight
-{
-    float cutoff;
-    float exponent;
-    void read(NIFStream *nif) override;
-};
+    struct NiPointLight : public NiLight
+    {
+        float constantAttenuation;
+        float linearAttenuation;
+        float quadraticAttenuation;
 
-struct NiTextureEffect : NiDynamicEffect
-{
-    NiSourceTexturePtr texture;
-    unsigned int clamp;
+        void read(NIFStream* nif) override;
+    };
 
-    enum TextureType
+    struct NiSpotLight : public NiPointLight
     {
-        Projected_Light = 0,
-        Projected_Shadow = 1,
-        Environment_Map = 2,
-        Fog_Map = 3
+        float cutoff;
+        float exponent;
+        void read(NIFStream* nif) override;
     };
-    TextureType textureType;
 
-    enum CoordGenType
+    struct NiTextureEffect : NiDynamicEffect
     {
-        World_Parallel = 0,
-        World_Perspective,
-        Sphere_Map,
-        Specular_Cube_Map,
-        Diffuse_Cube_Map
+        NiSourceTexturePtr texture;
+        unsigned int clamp;
+
+        enum TextureType
+        {
+            Projected_Light = 0,
+            Projected_Shadow = 1,
+            Environment_Map = 2,
+            Fog_Map = 3
+        };
+        TextureType textureType;
+
+        enum CoordGenType
+        {
+            World_Parallel = 0,
+            World_Perspective,
+            Sphere_Map,
+            Specular_Cube_Map,
+            Diffuse_Cube_Map
+        };
+        CoordGenType coordGenType;
+
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+
+        bool wrapT() const { return clamp & 1; }
+        bool wrapS() const { return (clamp >> 1) & 1; }
     };
-    CoordGenType coordGenType;
-
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-
-    bool wrapT() const { return clamp & 1; }
-    bool wrapS() const { return (clamp >> 1) & 1; }
-};
 
 } // Namespace
 #endif
diff --git a/components/nif/extra.cpp b/components/nif/extra.cpp
index 04217995ac..30b8952dc2 100644
--- a/components/nif/extra.cpp
+++ b/components/nif/extra.cpp
@@ -3,129 +3,129 @@
 namespace Nif
 {
 
-void NiExtraData::read(NIFStream *nif)
-{
-    Extra::read(nif);
-    if (recordSize)
-        nif->getChars(data, recordSize);
-}
-
-void NiStringExtraData::read(NIFStream *nif)
-{
-    Extra::read(nif);
-    string = nif->getString();
-}
-
-void NiTextKeyExtraData::read(NIFStream *nif)
-{
-    Extra::read(nif);
+    void NiExtraData::read(NIFStream* nif)
+    {
+        Extra::read(nif);
+        if (recordSize)
+            nif->getChars(data, recordSize);
+    }
 
-    int keynum = nif->getInt();
-    list.resize(keynum);
-    for(int i=0; i<keynum; i++)
+    void NiStringExtraData::read(NIFStream* nif)
     {
-        list[i].time = nif->getFloat();
-        list[i].text = nif->getString();
+        Extra::read(nif);
+        string = nif->getString();
     }
-}
 
-void NiVertWeightsExtraData::read(NIFStream *nif)
-{
-    Extra::read(nif);
+    void NiTextKeyExtraData::read(NIFStream* nif)
+    {
+        Extra::read(nif);
+
+        int keynum = nif->getInt();
+        list.resize(keynum);
+        for (int i = 0; i < keynum; i++)
+        {
+            list[i].time = nif->getFloat();
+            list[i].text = nif->getString();
+        }
+    }
 
-    nif->skip(nif->getUShort() * sizeof(float)); // vertex weights I guess
-}
+    void NiVertWeightsExtraData::read(NIFStream* nif)
+    {
+        Extra::read(nif);
 
-void NiIntegerExtraData::read(NIFStream *nif)
-{
-    Extra::read(nif);
+        nif->skip(nif->getUShort() * sizeof(float)); // vertex weights I guess
+    }
 
-    data = nif->getUInt();
-}
+    void NiIntegerExtraData::read(NIFStream* nif)
+    {
+        Extra::read(nif);
 
-void NiIntegersExtraData::read(NIFStream *nif)
-{
-    Extra::read(nif);
+        data = nif->getUInt();
+    }
 
-    unsigned int num = nif->getUInt();
-    if (num)
-        nif->getUInts(data, num);
-}
+    void NiIntegersExtraData::read(NIFStream* nif)
+    {
+        Extra::read(nif);
 
-void NiBinaryExtraData::read(NIFStream *nif)
-{
-    Extra::read(nif);
-    unsigned int size = nif->getUInt();
-    if (size)
-        nif->getChars(data, size);
-}
+        unsigned int num = nif->getUInt();
+        if (num)
+            nif->getUInts(data, num);
+    }
 
-void NiBooleanExtraData::read(NIFStream *nif)
-{
-    Extra::read(nif);
-    data = nif->getBoolean();
-}
+    void NiBinaryExtraData::read(NIFStream* nif)
+    {
+        Extra::read(nif);
+        unsigned int size = nif->getUInt();
+        if (size)
+            nif->getChars(data, size);
+    }
 
-void NiVectorExtraData::read(NIFStream *nif)
-{
-    Extra::read(nif);
-    data = nif->getVector4();
-}
+    void NiBooleanExtraData::read(NIFStream* nif)
+    {
+        Extra::read(nif);
+        data = nif->getBoolean();
+    }
 
-void NiFloatExtraData::read(NIFStream *nif)
-{
-    Extra::read(nif);
+    void NiVectorExtraData::read(NIFStream* nif)
+    {
+        Extra::read(nif);
+        data = nif->getVector4();
+    }
 
-    data = nif->getFloat();
-}
+    void NiFloatExtraData::read(NIFStream* nif)
+    {
+        Extra::read(nif);
 
-void NiFloatsExtraData::read(NIFStream *nif)
-{
-    Extra::read(nif);
-    unsigned int num = nif->getUInt();
-    if (num)
-        nif->getFloats(data, num);
-}
+        data = nif->getFloat();
+    }
 
-void BSBound::read(NIFStream *nif)
-{
-    Extra::read(nif);
-    center = nif->getVector3();
-    halfExtents = nif->getVector3();
-}
+    void NiFloatsExtraData::read(NIFStream* nif)
+    {
+        Extra::read(nif);
+        unsigned int num = nif->getUInt();
+        if (num)
+            nif->getFloats(data, num);
+    }
 
-void BSFurnitureMarker::LegacyFurniturePosition::read(NIFStream *nif)
-{
-    mOffset = nif->getVector3();
-    mOrientation = nif->getUShort();
-    mPositionRef = nif->getChar();
-    nif->skip(1); // Position ref 2
-}
+    void BSBound::read(NIFStream* nif)
+    {
+        Extra::read(nif);
+        center = nif->getVector3();
+        halfExtents = nif->getVector3();
+    }
 
-void BSFurnitureMarker::FurniturePosition::read(NIFStream *nif)
-{
-    mOffset = nif->getVector3();
-    mHeading = nif->getFloat();
-    mType = nif->getUShort();
-    mEntryPoint = nif->getUShort();
-}
+    void BSFurnitureMarker::LegacyFurniturePosition::read(NIFStream* nif)
+    {
+        mOffset = nif->getVector3();
+        mOrientation = nif->getUShort();
+        mPositionRef = nif->getChar();
+        nif->skip(1); // Position ref 2
+    }
 
-void BSFurnitureMarker::read(NIFStream *nif)
-{
-    Extra::read(nif);
-    unsigned int num = nif->getUInt();
-    if (nif->getBethVersion() <= NIFFile::BethVersion::BETHVER_FO3)
+    void BSFurnitureMarker::FurniturePosition::read(NIFStream* nif)
     {
-        mLegacyMarkers.resize(num);
-        for (auto& marker : mLegacyMarkers)
-            marker.read(nif);
+        mOffset = nif->getVector3();
+        mHeading = nif->getFloat();
+        mType = nif->getUShort();
+        mEntryPoint = nif->getUShort();
     }
-    else
+
+    void BSFurnitureMarker::read(NIFStream* nif)
     {
-        mMarkers.resize(num);
-        for (auto& marker : mMarkers)
-            marker.read(nif);
+        Extra::read(nif);
+        unsigned int num = nif->getUInt();
+        if (nif->getBethVersion() <= NIFFile::BethVersion::BETHVER_FO3)
+        {
+            mLegacyMarkers.resize(num);
+            for (auto& marker : mLegacyMarkers)
+                marker.read(nif);
+        }
+        else
+        {
+            mMarkers.resize(num);
+            for (auto& marker : mMarkers)
+                marker.read(nif);
+        }
     }
-}
 
 }
diff --git a/components/nif/extra.hpp b/components/nif/extra.hpp
index cbcb3cabe6..0da573ade5 100644
--- a/components/nif/extra.hpp
+++ b/components/nif/extra.hpp
@@ -29,122 +29,122 @@
 namespace Nif
 {
 
-struct NiExtraData : public Extra
-{
-    std::vector<char> data;
-
-    void read(NIFStream *nif) override;
-};
+    struct NiExtraData : public Extra
+    {
+        std::vector<char> data;
 
-struct NiVertWeightsExtraData : public Extra
-{
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
+    };
 
-struct NiTextKeyExtraData : public Extra
-{
-    struct TextKey
+    struct NiVertWeightsExtraData : public Extra
     {
-        float time;
-        std::string text;
+        void read(NIFStream* nif) override;
     };
-    std::vector<TextKey> list;
-
-    void read(NIFStream *nif) override;
-};
-
-struct NiStringExtraData : public Extra
-{
-    /* Known meanings:
-       "MRK" - marker, only visible in the editor, not rendered in-game
-       "NCC" - no collision except with the camera
-       Anything else starting with "NC" - no collision
-    */
-    std::string string;
-
-    void read(NIFStream *nif) override;
-};
 
-struct NiIntegerExtraData : public Extra
-{
-    unsigned int data;
+    struct NiTextKeyExtraData : public Extra
+    {
+        struct TextKey
+        {
+            float time;
+            std::string text;
+        };
+        std::vector<TextKey> list;
+
+        void read(NIFStream* nif) override;
+    };
 
-    void read(NIFStream *nif) override;
-};
+    struct NiStringExtraData : public Extra
+    {
+        /* Known meanings:
+           "MRK" - marker, only visible in the editor, not rendered in-game
+           "NCC" - no collision except with the camera
+           Anything else starting with "NC" - no collision
+        */
+        std::string string;
+
+        void read(NIFStream* nif) override;
+    };
 
-struct NiIntegersExtraData : public Extra
-{
-    std::vector<unsigned int> data;
+    struct NiIntegerExtraData : public Extra
+    {
+        unsigned int data;
 
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
+    };
 
-struct NiBinaryExtraData : public Extra
-{
-    std::vector<char> data;
+    struct NiIntegersExtraData : public Extra
+    {
+        std::vector<unsigned int> data;
 
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
+    };
 
-struct NiBooleanExtraData : public Extra
-{
-    bool data;
+    struct NiBinaryExtraData : public Extra
+    {
+        std::vector<char> data;
 
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
+    };
 
-struct NiVectorExtraData : public Extra
-{
-    osg::Vec4f data;
+    struct NiBooleanExtraData : public Extra
+    {
+        bool data;
 
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
+    };
 
-struct NiFloatExtraData : public Extra
-{
-    float data;
+    struct NiVectorExtraData : public Extra
+    {
+        osg::Vec4f data;
 
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
+    };
 
-struct NiFloatsExtraData : public Extra
-{
-    std::vector<float> data;
+    struct NiFloatExtraData : public Extra
+    {
+        float data;
 
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
+    };
 
-struct BSBound : public Extra
-{
-    osg::Vec3f center, halfExtents;
+    struct NiFloatsExtraData : public Extra
+    {
+        std::vector<float> data;
 
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
+    };
 
-struct BSFurnitureMarker : public Extra
-{
-    struct LegacyFurniturePosition
+    struct BSBound : public Extra
     {
-        osg::Vec3f mOffset;
-        uint16_t mOrientation;
-        uint8_t mPositionRef;
-        void read(NIFStream *nif);
+        osg::Vec3f center, halfExtents;
+
+        void read(NIFStream* nif) override;
     };
 
-    struct FurniturePosition
+    struct BSFurnitureMarker : public Extra
     {
-        osg::Vec3f mOffset;
-        float mHeading;
-        uint16_t mType;
-        uint16_t mEntryPoint;
-        void read(NIFStream *nif);
+        struct LegacyFurniturePosition
+        {
+            osg::Vec3f mOffset;
+            uint16_t mOrientation;
+            uint8_t mPositionRef;
+            void read(NIFStream* nif);
+        };
+
+        struct FurniturePosition
+        {
+            osg::Vec3f mOffset;
+            float mHeading;
+            uint16_t mType;
+            uint16_t mEntryPoint;
+            void read(NIFStream* nif);
+        };
+
+        std::vector<LegacyFurniturePosition> mLegacyMarkers;
+        std::vector<FurniturePosition> mMarkers;
+
+        void read(NIFStream* nif) override;
     };
 
-    std::vector<LegacyFurniturePosition> mLegacyMarkers;
-    std::vector<FurniturePosition> mMarkers;
-
-    void read(NIFStream *nif) override;
-};
-
 } // Namespace
 #endif
diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 3b06335552..8aa1000a6d 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -1,8 +1,8 @@
 #include "niffile.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/files/hash.hpp>
 #include <components/files/conversion.hpp>
+#include <components/files/hash.hpp>
 
 #include <algorithm>
 #include <array>
@@ -22,366 +22,368 @@
 namespace Nif
 {
 
-/// Open a NIF stream. The name is used for error messages.
-NIFFile::NIFFile(Files::IStreamPtr&& stream, const std::filesystem::path &name)
-    : filename(name)
-{
-    parse(std::move(stream));
-}
-
-template <typename NodeType, RecordType recordType>
-static std::unique_ptr<Record> construct()
-{
-    auto result = std::make_unique<NodeType>();
-    result->recType = recordType;
-    return result;
-}
-
-using CreateRecord = std::unique_ptr<Record> (*)();
-
-///These are all the record types we know how to read.
-static std::map<std::string, CreateRecord> makeFactory()
-{
-    return 
+    /// Open a NIF stream. The name is used for error messages.
+    NIFFile::NIFFile(Files::IStreamPtr&& stream, const std::filesystem::path& name)
+        : filename(name)
     {
-        {"NiNode"                           , &construct <NiNode                            , RC_NiNode                             >},
-        {"NiSwitchNode"                     , &construct <NiSwitchNode                      , RC_NiSwitchNode                       >},
-        {"NiLODNode"                        , &construct <NiLODNode                         , RC_NiLODNode                          >},
-        {"NiFltAnimationNode"               , &construct <NiFltAnimationNode                , RC_NiFltAnimationNode                 >},
-        {"AvoidNode"                        , &construct <NiNode                            , RC_AvoidNode                          >},
-        {"NiCollisionSwitch"                , &construct <NiNode                            , RC_NiCollisionSwitch                  >},
-        {"NiBSParticleNode"                 , &construct <NiNode                            , RC_NiBSParticleNode                   >},
-        {"NiBSAnimationNode"                , &construct <NiNode                            , RC_NiBSAnimationNode                  >},
-        {"NiBillboardNode"                  , &construct <NiBillboardNode                   , RC_NiBillboardNode                    >},
-        {"NiTriShape"                       , &construct <NiTriShape                        , RC_NiTriShape                         >},
-        {"NiTriStrips"                      , &construct <NiTriStrips                       , RC_NiTriStrips                        >},
-        {"NiLines"                          , &construct <NiLines                           , RC_NiLines                            >},
-        {"NiParticles"                      , &construct <NiParticles                       , RC_NiParticles                        >},
-        {"NiRotatingParticles"              , &construct <NiParticles                       , RC_NiParticles                        >},
-        {"NiAutoNormalParticles"            , &construct <NiParticles                       , RC_NiParticles                        >},
-        {"NiCamera"                         , &construct <NiCamera                          , RC_NiCamera                           >},
-        {"RootCollisionNode"                , &construct <NiNode                            , RC_RootCollisionNode                  >},
-        {"NiTexturingProperty"              , &construct <NiTexturingProperty               , RC_NiTexturingProperty                >},
-        {"NiFogProperty"                    , &construct <NiFogProperty                     , RC_NiFogProperty                      >},
-        {"NiMaterialProperty"               , &construct <NiMaterialProperty                , RC_NiMaterialProperty                 >},
-        {"NiZBufferProperty"                , &construct <NiZBufferProperty                 , RC_NiZBufferProperty                  >},
-        {"NiAlphaProperty"                  , &construct <NiAlphaProperty                   , RC_NiAlphaProperty                    >},
-        {"NiVertexColorProperty"            , &construct <NiVertexColorProperty             , RC_NiVertexColorProperty              >},
-        {"NiShadeProperty"                  , &construct <NiShadeProperty                   , RC_NiShadeProperty                    >},
-        {"NiDitherProperty"                 , &construct <NiDitherProperty                  , RC_NiDitherProperty                   >},
-        {"NiWireframeProperty"              , &construct <NiWireframeProperty               , RC_NiWireframeProperty                >},
-        {"NiSpecularProperty"               , &construct <NiSpecularProperty                , RC_NiSpecularProperty                 >},
-        {"NiStencilProperty"                , &construct <NiStencilProperty                 , RC_NiStencilProperty                  >},
-        {"NiVisController"                  , &construct <NiVisController                   , RC_NiVisController                    >},
-        {"NiGeomMorpherController"          , &construct <NiGeomMorpherController           , RC_NiGeomMorpherController            >},
-        {"NiKeyframeController"             , &construct <NiKeyframeController              , RC_NiKeyframeController               >},
-        {"NiAlphaController"                , &construct <NiAlphaController                 , RC_NiAlphaController                  >},
-        {"NiRollController"                 , &construct <NiRollController                  , RC_NiRollController                   >},
-        {"NiUVController"                   , &construct <NiUVController                    , RC_NiUVController                     >},
-        {"NiPathController"                 , &construct <NiPathController                  , RC_NiPathController                   >},
-        {"NiMaterialColorController"        , &construct <NiMaterialColorController         , RC_NiMaterialColorController          >},
-        {"NiBSPArrayController"             , &construct <NiBSPArrayController              , RC_NiBSPArrayController               >},
-        {"NiParticleSystemController"       , &construct <NiParticleSystemController        , RC_NiParticleSystemController         >},
-        {"NiFlipController"                 , &construct <NiFlipController                  , RC_NiFlipController                   >},
-        {"NiAmbientLight"                   , &construct <NiLight                           , RC_NiLight                            >},
-        {"NiDirectionalLight"               , &construct <NiLight                           , RC_NiLight                            >},
-        {"NiPointLight"                     , &construct <NiPointLight                      , RC_NiLight                            >},
-        {"NiSpotLight"                      , &construct <NiSpotLight                       , RC_NiLight                            >},
-        {"NiTextureEffect"                  , &construct <NiTextureEffect                   , RC_NiTextureEffect                    >},
-        {"NiExtraData"                      , &construct <NiExtraData                       , RC_NiExtraData                        >},
-        {"NiVertWeightsExtraData"           , &construct <NiVertWeightsExtraData            , RC_NiVertWeightsExtraData             >},
-        {"NiTextKeyExtraData"               , &construct <NiTextKeyExtraData                , RC_NiTextKeyExtraData                 >},
-        {"NiStringExtraData"                , &construct <NiStringExtraData                 , RC_NiStringExtraData                  >},
-        {"NiGravity"                        , &construct <NiGravity                         , RC_NiGravity                          >},
-        {"NiPlanarCollider"                 , &construct <NiPlanarCollider                  , RC_NiPlanarCollider                   >},
-        {"NiSphericalCollider"              , &construct <NiSphericalCollider               , RC_NiSphericalCollider                >},
-        {"NiParticleGrowFade"               , &construct <NiParticleGrowFade                , RC_NiParticleGrowFade                 >},
-        {"NiParticleColorModifier"          , &construct <NiParticleColorModifier           , RC_NiParticleColorModifier            >},
-        {"NiParticleRotation"               , &construct <NiParticleRotation                , RC_NiParticleRotation                 >},
-        {"NiFloatData"                      , &construct <NiFloatData                       , RC_NiFloatData                        >},
-        {"NiTriShapeData"                   , &construct <NiTriShapeData                    , RC_NiTriShapeData                     >},
-        {"NiTriStripsData"                  , &construct <NiTriStripsData                   , RC_NiTriStripsData                    >},
-        {"NiLinesData"                      , &construct <NiLinesData                       , RC_NiLinesData                        >},
-        {"NiVisData"                        , &construct <NiVisData                         , RC_NiVisData                          >},
-        {"NiColorData"                      , &construct <NiColorData                       , RC_NiColorData                        >},
-        {"NiPixelData"                      , &construct <NiPixelData                       , RC_NiPixelData                        >},
-        {"NiMorphData"                      , &construct <NiMorphData                       , RC_NiMorphData                        >},
-        {"NiKeyframeData"                   , &construct <NiKeyframeData                    , RC_NiKeyframeData                     >},
-        {"NiSkinData"                       , &construct <NiSkinData                        , RC_NiSkinData                         >},
-        {"NiUVData"                         , &construct <NiUVData                          , RC_NiUVData                           >},
-        {"NiPosData"                        , &construct <NiPosData                         , RC_NiPosData                          >},
-        {"NiParticlesData"                  , &construct <NiParticlesData                   , RC_NiParticlesData                    >},
-        {"NiRotatingParticlesData"          , &construct <NiRotatingParticlesData           , RC_NiParticlesData                    >},
-        {"NiAutoNormalParticlesData"        , &construct <NiParticlesData                   , RC_NiParticlesData                    >},
-        {"NiSequenceStreamHelper"           , &construct <NiSequenceStreamHelper            , RC_NiSequenceStreamHelper             >},
-        {"NiSourceTexture"                  , &construct <NiSourceTexture                   , RC_NiSourceTexture                    >},
-        {"NiSkinInstance"                   , &construct <NiSkinInstance                    , RC_NiSkinInstance                     >},
-        {"NiLookAtController"               , &construct <NiLookAtController                , RC_NiLookAtController                 >},
-        {"NiPalette"                        , &construct <NiPalette                         , RC_NiPalette                          >},
-        {"NiIntegerExtraData"               , &construct <NiIntegerExtraData                , RC_NiIntegerExtraData                 >},
-        {"NiIntegersExtraData"              , &construct <NiIntegersExtraData               , RC_NiIntegersExtraData                >},
-        {"NiBinaryExtraData"                , &construct <NiBinaryExtraData                 , RC_NiBinaryExtraData                  >},
-        {"NiBooleanExtraData"               , &construct <NiBooleanExtraData                , RC_NiBooleanExtraData                 >},
-        {"NiVectorExtraData"                , &construct <NiVectorExtraData                 , RC_NiVectorExtraData                  >},
-        {"NiColorExtraData"                 , &construct <NiVectorExtraData                 , RC_NiColorExtraData                   >},
-        {"NiFloatExtraData"                 , &construct <NiFloatExtraData                  , RC_NiFloatExtraData                   >},
-        {"NiFloatsExtraData"                , &construct <NiFloatsExtraData                 , RC_NiFloatsExtraData                  >},
-        {"NiStringPalette"                  , &construct <NiStringPalette                   , RC_NiStringPalette                    >},
-        {"NiBoolData"                       , &construct <NiBoolData                        , RC_NiBoolData                         >},
-        {"NiSkinPartition"                  , &construct <NiSkinPartition                   , RC_NiSkinPartition                    >},
-        {"BSXFlags"                         , &construct <NiIntegerExtraData                , RC_BSXFlags                           >},
-        {"BSBound"                          , &construct <BSBound                           , RC_BSBound                            >},
-        {"NiTransformData"                  , &construct <NiKeyframeData                    , RC_NiKeyframeData                     >},
-        {"BSFadeNode"                       , &construct <NiNode                            , RC_NiNode                             >},
-        {"bhkBlendController"               , &construct <bhkBlendController                , RC_bhkBlendController                 >},
-        {"NiFloatInterpolator"              , &construct <NiFloatInterpolator               , RC_NiFloatInterpolator                >},
-        {"NiBoolInterpolator"               , &construct <NiBoolInterpolator                , RC_NiBoolInterpolator                 >},
-        {"NiPoint3Interpolator"             , &construct <NiPoint3Interpolator              , RC_NiPoint3Interpolator               >},
-        {"NiTransformController"            , &construct <NiKeyframeController              , RC_NiKeyframeController               >},
-        {"NiMultiTargetTransformController" , &construct <NiMultiTargetTransformController  , RC_NiMultiTargetTransformController   >},
-        {"NiTransformInterpolator"          , &construct <NiTransformInterpolator           , RC_NiTransformInterpolator            >},
-        {"NiColorInterpolator"              , &construct <NiColorInterpolator               , RC_NiColorInterpolator                >},
-        {"BSShaderTextureSet"               , &construct <BSShaderTextureSet                , RC_BSShaderTextureSet                 >},
-        {"BSLODTriShape"                    , &construct <BSLODTriShape                     , RC_BSLODTriShape                      >},
-        {"BSShaderProperty"                 , &construct <BSShaderProperty                  , RC_BSShaderProperty                   >},
-        {"BSShaderPPLightingProperty"       , &construct <BSShaderPPLightingProperty        , RC_BSShaderPPLightingProperty         >},
-        {"BSShaderNoLightingProperty"       , &construct <BSShaderNoLightingProperty        , RC_BSShaderNoLightingProperty         >},
-        {"BSFurnitureMarker"                , &construct <BSFurnitureMarker                 , RC_BSFurnitureMarker                  >},
-        {"NiCollisionObject"                , &construct <NiCollisionObject                 , RC_NiCollisionObject                  >},
-        {"bhkCollisionObject"               , &construct <bhkCollisionObject                , RC_bhkCollisionObject                 >},
-        {"BSDismemberSkinInstance"          , &construct <BSDismemberSkinInstance           , RC_BSDismemberSkinInstance            >},
-        {"NiControllerManager"              , &construct <NiControllerManager               , RC_NiControllerManager                >},
-        {"bhkMoppBvTreeShape"               , &construct <bhkMoppBvTreeShape                , RC_bhkMoppBvTreeShape                 >},
-        {"bhkNiTriStripsShape"              , &construct <bhkNiTriStripsShape               , RC_bhkNiTriStripsShape                >},
-        {"bhkPackedNiTriStripsShape"        , &construct <bhkPackedNiTriStripsShape         , RC_bhkPackedNiTriStripsShape          >},
-        {"hkPackedNiTriStripsData"          , &construct <hkPackedNiTriStripsData           , RC_hkPackedNiTriStripsData            >},
-        {"bhkConvexVerticesShape"           , &construct <bhkConvexVerticesShape            , RC_bhkConvexVerticesShape             >},
-        {"bhkBoxShape"                      , &construct <bhkBoxShape                       , RC_bhkBoxShape                        >},
-        {"bhkCapsuleShape"                  , &construct <bhkCapsuleShape                   , RC_bhkCapsuleShape                    >},
-        {"bhkSphereShape"                   , &construct <bhkSphereShape                    , RC_bhkSphereShape                     >},
-        {"bhkListShape"                     , &construct <bhkListShape                      , RC_bhkListShape                       >},
-        {"bhkRigidBody"                     , &construct <bhkRigidBody                      , RC_bhkRigidBody                       >},
-        {"bhkRigidBodyT"                    , &construct <bhkRigidBody                      , RC_bhkRigidBodyT                      >},
-        {"BSLightingShaderProperty"         , &construct <BSLightingShaderProperty          , RC_BSLightingShaderProperty           >},
-        {"NiSortAdjustNode"                 , &construct <NiSortAdjustNode                  , RC_NiSortAdjustNode                   >},
-        {"NiClusterAccumulator"             , &construct <NiClusterAccumulator              , RC_NiClusterAccumulator               >},
-        {"NiAlphaAccumulator"               , &construct <NiAlphaAccumulator                , RC_NiAlphaAccumulator                 >},
-    };
-}
-
-///Make the factory map used for parsing the file
-static const std::map<std::string, CreateRecord> factories = makeFactory();
-
-std::string NIFFile::printVersion(unsigned int version)
-{
-    int major = (version >> 24) & 0xFF;
-    int minor = (version >> 16) & 0xFF;
-    int patch = (version >> 8) & 0xFF;
-    int rev = version & 0xFF;
-
-    std::stringstream stream;
-    stream << major << "." << minor << "." << patch << "." << rev;
-    return stream.str();
-}
+        parse(std::move(stream));
+    }
 
-void NIFFile::parse(Files::IStreamPtr&& stream)
-{
-    const std::array<std::uint64_t, 2> fileHash = Files::getHash(filename, *stream);
-    hash.append(reinterpret_cast<const char*>(fileHash.data()), fileHash.size() * sizeof(std::uint64_t));
+    template <typename NodeType, RecordType recordType>
+    static std::unique_ptr<Record> construct()
+    {
+        auto result = std::make_unique<NodeType>();
+        result->recType = recordType;
+        return result;
+    }
 
-    NIFStream nif (this, std::move(stream));
+    using CreateRecord = std::unique_ptr<Record> (*)();
 
-    // Check the header string
-    std::string head = nif.getVersionString();
-    static const std::array<std::string, 2> verStrings =
-    {
-        "NetImmerse File Format",
-        "Gamebryo File Format",
-    };
-    const bool supportedHeader = std::any_of(verStrings.begin(), verStrings.end(),
-        [&] (const std::string& verString) { return head.compare(0, verString.size(), verString) == 0; });
-    if (!supportedHeader)
-        fail("Invalid NIF header: " + head);
-
-    // Get BCD version
-    ver = nif.getUInt();
-    // 4.0.0.0 is an older, practically identical version of the format.
-    // It's not used by Morrowind assets but Morrowind supports it.
-    static const std::array<uint32_t, 2> supportedVers =
+    /// These are all the record types we know how to read.
+    static std::map<std::string, CreateRecord> makeFactory()
     {
-        NIFStream::generateVersion(4,0,0,0),
-        VER_MW,
-    };
-    const bool supportedVersion = std::find(supportedVers.begin(), supportedVers.end(), ver) != supportedVers.end();
-    if (!supportedVersion)
-    {
-        if (sLoadUnsupportedFiles)
-            warn("Unsupported NIF version: " + printVersion(ver) + ". Proceed with caution!");
-        else
-            fail("Unsupported NIF version: " + printVersion(ver));
+        return {
+            { "NiNode", &construct<NiNode, RC_NiNode> },
+            { "NiSwitchNode", &construct<NiSwitchNode, RC_NiSwitchNode> },
+            { "NiLODNode", &construct<NiLODNode, RC_NiLODNode> },
+            { "NiFltAnimationNode", &construct<NiFltAnimationNode, RC_NiFltAnimationNode> },
+            { "AvoidNode", &construct<NiNode, RC_AvoidNode> },
+            { "NiCollisionSwitch", &construct<NiNode, RC_NiCollisionSwitch> },
+            { "NiBSParticleNode", &construct<NiNode, RC_NiBSParticleNode> },
+            { "NiBSAnimationNode", &construct<NiNode, RC_NiBSAnimationNode> },
+            { "NiBillboardNode", &construct<NiBillboardNode, RC_NiBillboardNode> },
+            { "NiTriShape", &construct<NiTriShape, RC_NiTriShape> },
+            { "NiTriStrips", &construct<NiTriStrips, RC_NiTriStrips> },
+            { "NiLines", &construct<NiLines, RC_NiLines> },
+            { "NiParticles", &construct<NiParticles, RC_NiParticles> },
+            { "NiRotatingParticles", &construct<NiParticles, RC_NiParticles> },
+            { "NiAutoNormalParticles", &construct<NiParticles, RC_NiParticles> },
+            { "NiCamera", &construct<NiCamera, RC_NiCamera> },
+            { "RootCollisionNode", &construct<NiNode, RC_RootCollisionNode> },
+            { "NiTexturingProperty", &construct<NiTexturingProperty, RC_NiTexturingProperty> },
+            { "NiFogProperty", &construct<NiFogProperty, RC_NiFogProperty> },
+            { "NiMaterialProperty", &construct<NiMaterialProperty, RC_NiMaterialProperty> },
+            { "NiZBufferProperty", &construct<NiZBufferProperty, RC_NiZBufferProperty> },
+            { "NiAlphaProperty", &construct<NiAlphaProperty, RC_NiAlphaProperty> },
+            { "NiVertexColorProperty", &construct<NiVertexColorProperty, RC_NiVertexColorProperty> },
+            { "NiShadeProperty", &construct<NiShadeProperty, RC_NiShadeProperty> },
+            { "NiDitherProperty", &construct<NiDitherProperty, RC_NiDitherProperty> },
+            { "NiWireframeProperty", &construct<NiWireframeProperty, RC_NiWireframeProperty> },
+            { "NiSpecularProperty", &construct<NiSpecularProperty, RC_NiSpecularProperty> },
+            { "NiStencilProperty", &construct<NiStencilProperty, RC_NiStencilProperty> },
+            { "NiVisController", &construct<NiVisController, RC_NiVisController> },
+            { "NiGeomMorpherController", &construct<NiGeomMorpherController, RC_NiGeomMorpherController> },
+            { "NiKeyframeController", &construct<NiKeyframeController, RC_NiKeyframeController> },
+            { "NiAlphaController", &construct<NiAlphaController, RC_NiAlphaController> },
+            { "NiRollController", &construct<NiRollController, RC_NiRollController> },
+            { "NiUVController", &construct<NiUVController, RC_NiUVController> },
+            { "NiPathController", &construct<NiPathController, RC_NiPathController> },
+            { "NiMaterialColorController", &construct<NiMaterialColorController, RC_NiMaterialColorController> },
+            { "NiBSPArrayController", &construct<NiBSPArrayController, RC_NiBSPArrayController> },
+            { "NiParticleSystemController", &construct<NiParticleSystemController, RC_NiParticleSystemController> },
+            { "NiFlipController", &construct<NiFlipController, RC_NiFlipController> },
+            { "NiAmbientLight", &construct<NiLight, RC_NiLight> },
+            { "NiDirectionalLight", &construct<NiLight, RC_NiLight> },
+            { "NiPointLight", &construct<NiPointLight, RC_NiLight> },
+            { "NiSpotLight", &construct<NiSpotLight, RC_NiLight> },
+            { "NiTextureEffect", &construct<NiTextureEffect, RC_NiTextureEffect> },
+            { "NiExtraData", &construct<NiExtraData, RC_NiExtraData> },
+            { "NiVertWeightsExtraData", &construct<NiVertWeightsExtraData, RC_NiVertWeightsExtraData> },
+            { "NiTextKeyExtraData", &construct<NiTextKeyExtraData, RC_NiTextKeyExtraData> },
+            { "NiStringExtraData", &construct<NiStringExtraData, RC_NiStringExtraData> },
+            { "NiGravity", &construct<NiGravity, RC_NiGravity> },
+            { "NiPlanarCollider", &construct<NiPlanarCollider, RC_NiPlanarCollider> },
+            { "NiSphericalCollider", &construct<NiSphericalCollider, RC_NiSphericalCollider> },
+            { "NiParticleGrowFade", &construct<NiParticleGrowFade, RC_NiParticleGrowFade> },
+            { "NiParticleColorModifier", &construct<NiParticleColorModifier, RC_NiParticleColorModifier> },
+            { "NiParticleRotation", &construct<NiParticleRotation, RC_NiParticleRotation> },
+            { "NiFloatData", &construct<NiFloatData, RC_NiFloatData> },
+            { "NiTriShapeData", &construct<NiTriShapeData, RC_NiTriShapeData> },
+            { "NiTriStripsData", &construct<NiTriStripsData, RC_NiTriStripsData> },
+            { "NiLinesData", &construct<NiLinesData, RC_NiLinesData> },
+            { "NiVisData", &construct<NiVisData, RC_NiVisData> },
+            { "NiColorData", &construct<NiColorData, RC_NiColorData> },
+            { "NiPixelData", &construct<NiPixelData, RC_NiPixelData> },
+            { "NiMorphData", &construct<NiMorphData, RC_NiMorphData> },
+            { "NiKeyframeData", &construct<NiKeyframeData, RC_NiKeyframeData> },
+            { "NiSkinData", &construct<NiSkinData, RC_NiSkinData> },
+            { "NiUVData", &construct<NiUVData, RC_NiUVData> },
+            { "NiPosData", &construct<NiPosData, RC_NiPosData> },
+            { "NiParticlesData", &construct<NiParticlesData, RC_NiParticlesData> },
+            { "NiRotatingParticlesData", &construct<NiRotatingParticlesData, RC_NiParticlesData> },
+            { "NiAutoNormalParticlesData", &construct<NiParticlesData, RC_NiParticlesData> },
+            { "NiSequenceStreamHelper", &construct<NiSequenceStreamHelper, RC_NiSequenceStreamHelper> },
+            { "NiSourceTexture", &construct<NiSourceTexture, RC_NiSourceTexture> },
+            { "NiSkinInstance", &construct<NiSkinInstance, RC_NiSkinInstance> },
+            { "NiLookAtController", &construct<NiLookAtController, RC_NiLookAtController> },
+            { "NiPalette", &construct<NiPalette, RC_NiPalette> },
+            { "NiIntegerExtraData", &construct<NiIntegerExtraData, RC_NiIntegerExtraData> },
+            { "NiIntegersExtraData", &construct<NiIntegersExtraData, RC_NiIntegersExtraData> },
+            { "NiBinaryExtraData", &construct<NiBinaryExtraData, RC_NiBinaryExtraData> },
+            { "NiBooleanExtraData", &construct<NiBooleanExtraData, RC_NiBooleanExtraData> },
+            { "NiVectorExtraData", &construct<NiVectorExtraData, RC_NiVectorExtraData> },
+            { "NiColorExtraData", &construct<NiVectorExtraData, RC_NiColorExtraData> },
+            { "NiFloatExtraData", &construct<NiFloatExtraData, RC_NiFloatExtraData> },
+            { "NiFloatsExtraData", &construct<NiFloatsExtraData, RC_NiFloatsExtraData> },
+            { "NiStringPalette", &construct<NiStringPalette, RC_NiStringPalette> },
+            { "NiBoolData", &construct<NiBoolData, RC_NiBoolData> },
+            { "NiSkinPartition", &construct<NiSkinPartition, RC_NiSkinPartition> },
+            { "BSXFlags", &construct<NiIntegerExtraData, RC_BSXFlags> },
+            { "BSBound", &construct<BSBound, RC_BSBound> },
+            { "NiTransformData", &construct<NiKeyframeData, RC_NiKeyframeData> },
+            { "BSFadeNode", &construct<NiNode, RC_NiNode> },
+            { "bhkBlendController", &construct<bhkBlendController, RC_bhkBlendController> },
+            { "NiFloatInterpolator", &construct<NiFloatInterpolator, RC_NiFloatInterpolator> },
+            { "NiBoolInterpolator", &construct<NiBoolInterpolator, RC_NiBoolInterpolator> },
+            { "NiPoint3Interpolator", &construct<NiPoint3Interpolator, RC_NiPoint3Interpolator> },
+            { "NiTransformController", &construct<NiKeyframeController, RC_NiKeyframeController> },
+            { "NiMultiTargetTransformController",
+                &construct<NiMultiTargetTransformController, RC_NiMultiTargetTransformController> },
+            { "NiTransformInterpolator", &construct<NiTransformInterpolator, RC_NiTransformInterpolator> },
+            { "NiColorInterpolator", &construct<NiColorInterpolator, RC_NiColorInterpolator> },
+            { "BSShaderTextureSet", &construct<BSShaderTextureSet, RC_BSShaderTextureSet> },
+            { "BSLODTriShape", &construct<BSLODTriShape, RC_BSLODTriShape> },
+            { "BSShaderProperty", &construct<BSShaderProperty, RC_BSShaderProperty> },
+            { "BSShaderPPLightingProperty", &construct<BSShaderPPLightingProperty, RC_BSShaderPPLightingProperty> },
+            { "BSShaderNoLightingProperty", &construct<BSShaderNoLightingProperty, RC_BSShaderNoLightingProperty> },
+            { "BSFurnitureMarker", &construct<BSFurnitureMarker, RC_BSFurnitureMarker> },
+            { "NiCollisionObject", &construct<NiCollisionObject, RC_NiCollisionObject> },
+            { "bhkCollisionObject", &construct<bhkCollisionObject, RC_bhkCollisionObject> },
+            { "BSDismemberSkinInstance", &construct<BSDismemberSkinInstance, RC_BSDismemberSkinInstance> },
+            { "NiControllerManager", &construct<NiControllerManager, RC_NiControllerManager> },
+            { "bhkMoppBvTreeShape", &construct<bhkMoppBvTreeShape, RC_bhkMoppBvTreeShape> },
+            { "bhkNiTriStripsShape", &construct<bhkNiTriStripsShape, RC_bhkNiTriStripsShape> },
+            { "bhkPackedNiTriStripsShape", &construct<bhkPackedNiTriStripsShape, RC_bhkPackedNiTriStripsShape> },
+            { "hkPackedNiTriStripsData", &construct<hkPackedNiTriStripsData, RC_hkPackedNiTriStripsData> },
+            { "bhkConvexVerticesShape", &construct<bhkConvexVerticesShape, RC_bhkConvexVerticesShape> },
+            { "bhkBoxShape", &construct<bhkBoxShape, RC_bhkBoxShape> },
+            { "bhkCapsuleShape", &construct<bhkCapsuleShape, RC_bhkCapsuleShape> },
+            { "bhkSphereShape", &construct<bhkSphereShape, RC_bhkSphereShape> },
+            { "bhkListShape", &construct<bhkListShape, RC_bhkListShape> },
+            { "bhkRigidBody", &construct<bhkRigidBody, RC_bhkRigidBody> },
+            { "bhkRigidBodyT", &construct<bhkRigidBody, RC_bhkRigidBodyT> },
+            { "BSLightingShaderProperty", &construct<BSLightingShaderProperty, RC_BSLightingShaderProperty> },
+            { "NiSortAdjustNode", &construct<NiSortAdjustNode, RC_NiSortAdjustNode> },
+            { "NiClusterAccumulator", &construct<NiClusterAccumulator, RC_NiClusterAccumulator> },
+            { "NiAlphaAccumulator", &construct<NiAlphaAccumulator, RC_NiAlphaAccumulator> },
+        };
     }
 
-    // NIF data endianness
-    if (ver >= NIFStream::generateVersion(20,0,0,4))
+    /// Make the factory map used for parsing the file
+    static const std::map<std::string, CreateRecord> factories = makeFactory();
+
+    std::string NIFFile::printVersion(unsigned int version)
     {
-        unsigned char endianness = nif.getChar();
-        if (endianness == 0)
-            fail("Big endian NIF files are unsupported");
+        int major = (version >> 24) & 0xFF;
+        int minor = (version >> 16) & 0xFF;
+        int patch = (version >> 8) & 0xFF;
+        int rev = version & 0xFF;
+
+        std::stringstream stream;
+        stream << major << "." << minor << "." << patch << "." << rev;
+        return stream.str();
     }
 
-    // User version
-    if (ver > NIFStream::generateVersion(10,0,1,8))
-        userVer = nif.getUInt();
+    void NIFFile::parse(Files::IStreamPtr&& stream)
+    {
+        const std::array<std::uint64_t, 2> fileHash = Files::getHash(filename, *stream);
+        hash.append(reinterpret_cast<const char*>(fileHash.data()), fileHash.size() * sizeof(std::uint64_t));
+
+        NIFStream nif(this, std::move(stream));
+
+        // Check the header string
+        std::string head = nif.getVersionString();
+        static const std::array<std::string, 2> verStrings = {
+            "NetImmerse File Format",
+            "Gamebryo File Format",
+        };
+        const bool supportedHeader = std::any_of(verStrings.begin(), verStrings.end(),
+            [&](const std::string& verString) { return head.compare(0, verString.size(), verString) == 0; });
+        if (!supportedHeader)
+            fail("Invalid NIF header: " + head);
+
+        // Get BCD version
+        ver = nif.getUInt();
+        // 4.0.0.0 is an older, practically identical version of the format.
+        // It's not used by Morrowind assets but Morrowind supports it.
+        static const std::array<uint32_t, 2> supportedVers = {
+            NIFStream::generateVersion(4, 0, 0, 0),
+            VER_MW,
+        };
+        const bool supportedVersion = std::find(supportedVers.begin(), supportedVers.end(), ver) != supportedVers.end();
+        if (!supportedVersion)
+        {
+            if (sLoadUnsupportedFiles)
+                warn("Unsupported NIF version: " + printVersion(ver) + ". Proceed with caution!");
+            else
+                fail("Unsupported NIF version: " + printVersion(ver));
+        }
 
-    // Number of records
-    const std::size_t recNum = nif.getUInt();
-    records.resize(recNum);
+        // NIF data endianness
+        if (ver >= NIFStream::generateVersion(20, 0, 0, 4))
+        {
+            unsigned char endianness = nif.getChar();
+            if (endianness == 0)
+                fail("Big endian NIF files are unsupported");
+        }
 
-    // Bethesda stream header
-    // It contains Bethesda format version and (useless) export information
-    if (ver == VER_OB_OLD ||
-       (userVer >= 3 && ((ver == VER_OB || ver == VER_BGS)
-    || (ver >= NIFStream::generateVersion(10,1,0,0) && ver <= NIFStream::generateVersion(20,0,0,4) && userVer <= 11))))
-    {
-        bethVer = nif.getUInt();
-        nif.getExportString(); // Author
-        if (bethVer > BETHVER_FO4)
-            nif.getUInt(); // Unknown
-        nif.getExportString(); // Process script
-        nif.getExportString(); // Export script
-        if (bethVer == BETHVER_FO4)
-            nif.getExportString(); // Max file path
-    }
+        // User version
+        if (ver > NIFStream::generateVersion(10, 0, 1, 8))
+            userVer = nif.getUInt();
+
+        // Number of records
+        const std::size_t recNum = nif.getUInt();
+        records.resize(recNum);
+
+        // Bethesda stream header
+        // It contains Bethesda format version and (useless) export information
+        if (ver == VER_OB_OLD
+            || (userVer >= 3
+                && ((ver == VER_OB || ver == VER_BGS)
+                    || (ver >= NIFStream::generateVersion(10, 1, 0, 0) && ver <= NIFStream::generateVersion(20, 0, 0, 4)
+                        && userVer <= 11))))
+        {
+            bethVer = nif.getUInt();
+            nif.getExportString(); // Author
+            if (bethVer > BETHVER_FO4)
+                nif.getUInt(); // Unknown
+            nif.getExportString(); // Process script
+            nif.getExportString(); // Export script
+            if (bethVer == BETHVER_FO4)
+                nif.getExportString(); // Max file path
+        }
 
-    std::vector<std::string> recTypes;
-    std::vector<unsigned short> recTypeIndices;
+        std::vector<std::string> recTypes;
+        std::vector<unsigned short> recTypeIndices;
 
-    const bool hasRecTypeListings = ver >= NIFStream::generateVersion(5,0,0,1);
-    if (hasRecTypeListings)
-    {
-        unsigned short recTypeNum = nif.getUShort();
-        if (recTypeNum) // Record type list
-            nif.getSizedStrings(recTypes, recTypeNum);
-        if (recNum) // Record type mapping for each record
-            nif.getUShorts(recTypeIndices, recNum);
-        if (ver >= NIFStream::generateVersion(5,0,0,6)) // Groups
+        const bool hasRecTypeListings = ver >= NIFStream::generateVersion(5, 0, 0, 1);
+        if (hasRecTypeListings)
         {
-            if (ver >= NIFStream::generateVersion(20,1,0,1)) // String table
+            unsigned short recTypeNum = nif.getUShort();
+            if (recTypeNum) // Record type list
+                nif.getSizedStrings(recTypes, recTypeNum);
+            if (recNum) // Record type mapping for each record
+                nif.getUShorts(recTypeIndices, recNum);
+            if (ver >= NIFStream::generateVersion(5, 0, 0, 6)) // Groups
             {
-                if (ver >= NIFStream::generateVersion(20,2,0,5) && recNum) // Record sizes
+                if (ver >= NIFStream::generateVersion(20, 1, 0, 1)) // String table
                 {
-                    std::vector<unsigned int> recSizes; // Currently unused
-                    nif.getUInts(recSizes, recNum);
+                    if (ver >= NIFStream::generateVersion(20, 2, 0, 5) && recNum) // Record sizes
+                    {
+                        std::vector<unsigned int> recSizes; // Currently unused
+                        nif.getUInts(recSizes, recNum);
+                    }
+                    const std::size_t stringNum = nif.getUInt();
+                    nif.getUInt(); // Max string length
+                    if (stringNum)
+                        nif.getSizedStrings(strings, stringNum);
                 }
-                const std::size_t stringNum = nif.getUInt();
-                nif.getUInt(); // Max string length
-                if (stringNum)
-                    nif.getSizedStrings(strings, stringNum);
+                std::vector<unsigned int> groups; // Currently unused
+                unsigned int groupNum = nif.getUInt();
+                if (groupNum)
+                    nif.getUInts(groups, groupNum);
             }
-            std::vector<unsigned int> groups; // Currently unused
-            unsigned int groupNum = nif.getUInt();
-            if (groupNum)
-                nif.getUInts(groups, groupNum);
         }
-    }
-
-    const bool hasRecordSeparators = ver >= NIFStream::generateVersion(10,0,0,0) && ver < NIFStream::generateVersion(10,2,0,0);
-    for (std::size_t i = 0; i < recNum; i++)
-    {
-        std::unique_ptr<Record> r;
 
-        std::string rec = hasRecTypeListings ? recTypes[recTypeIndices[i]] : nif.getString();
-        if(rec.empty())
+        const bool hasRecordSeparators
+            = ver >= NIFStream::generateVersion(10, 0, 0, 0) && ver < NIFStream::generateVersion(10, 2, 0, 0);
+        for (std::size_t i = 0; i < recNum; i++)
         {
-            std::stringstream error;
-            error << "Record number " << i << " out of " << recNum << " is blank.";
-            fail(error.str());
-        }
+            std::unique_ptr<Record> r;
 
-        // Record separator. Some Havok records in Oblivion do not have it.
-        if (hasRecordSeparators && rec.compare(0, 3, "bhk"))
-        {
-            if (nif.getInt())
+            std::string rec = hasRecTypeListings ? recTypes[recTypeIndices[i]] : nif.getString();
+            if (rec.empty())
             {
-                std::stringstream warning;
-                warning << "Record number " << i << " out of " << recNum << " is preceded by a non-zero separator.";
-                warn(warning.str());
+                std::stringstream error;
+                error << "Record number " << i << " out of " << recNum << " is blank.";
+                fail(error.str());
             }
-        }
 
-        const auto entry = factories.find(rec);
+            // Record separator. Some Havok records in Oblivion do not have it.
+            if (hasRecordSeparators && rec.compare(0, 3, "bhk"))
+            {
+                if (nif.getInt())
+                {
+                    std::stringstream warning;
+                    warning << "Record number " << i << " out of " << recNum << " is preceded by a non-zero separator.";
+                    warn(warning.str());
+                }
+            }
 
-        if (entry == factories.end())
-            fail("Unknown record type " + rec);
+            const auto entry = factories.find(rec);
 
-        r = entry->second();
+            if (entry == factories.end())
+                fail("Unknown record type " + rec);
 
-        if (!supportedVersion)
-            Log(Debug::Verbose) << "NIF Debug: Reading record of type " << rec << ", index " << i << " (" << filename << ")";
-
-        assert(r != nullptr);
-        assert(r->recType != RC_MISSING);
-        r->recName = rec;
-        r->recIndex = i;
-        r->read(&nif);
-        records[i] = std::move(r);
-    }
+            r = entry->second();
 
-    const std::size_t rootNum = nif.getUInt();
-    roots.resize(rootNum);
+            if (!supportedVersion)
+                Log(Debug::Verbose) << "NIF Debug: Reading record of type " << rec << ", index " << i << " ("
+                                    << filename << ")";
 
-    //Determine which records are roots
-    for (std::size_t i = 0; i < rootNum; i++)
-    {
-        int idx = nif.getInt();
-        if (idx >= 0 && static_cast<std::size_t>(idx) < records.size())
-        {
-            roots[i] = records[idx].get();
+            assert(r != nullptr);
+            assert(r->recType != RC_MISSING);
+            r->recName = rec;
+            r->recIndex = i;
+            r->read(&nif);
+            records[i] = std::move(r);
         }
-        else
+
+        const std::size_t rootNum = nif.getUInt();
+        roots.resize(rootNum);
+
+        // Determine which records are roots
+        for (std::size_t i = 0; i < rootNum; i++)
         {
-            roots[i] = nullptr;
-            warn("Root " + std::to_string(i + 1) + " does not point to a record: index " + std::to_string(idx));
+            int idx = nif.getInt();
+            if (idx >= 0 && static_cast<std::size_t>(idx) < records.size())
+            {
+                roots[i] = records[idx].get();
+            }
+            else
+            {
+                roots[i] = nullptr;
+                warn("Root " + std::to_string(i + 1) + " does not point to a record: index " + std::to_string(idx));
+            }
         }
-    }
 
-    // Once parsing is done, do post-processing.
-    for (const auto& record : records)
-        record->post(this);
-}
+        // Once parsing is done, do post-processing.
+        for (const auto& record : records)
+            record->post(this);
+    }
 
-void NIFFile::setUseSkinning(bool skinning)
-{
-    mUseSkinning = skinning;
-}
+    void NIFFile::setUseSkinning(bool skinning)
+    {
+        mUseSkinning = skinning;
+    }
 
-bool NIFFile::getUseSkinning() const
-{
-    return mUseSkinning;
-}
+    bool NIFFile::getUseSkinning() const
+    {
+        return mUseSkinning;
+    }
 
-std::atomic_bool NIFFile::sLoadUnsupportedFiles = false;
+    std::atomic_bool NIFFile::sLoadUnsupportedFiles = false;
 
-void NIFFile::setLoadUnsupportedFiles(bool load)
-{
-    sLoadUnsupportedFiles = load;
-}
+    void NIFFile::setLoadUnsupportedFiles(bool load)
+    {
+        sLoadUnsupportedFiles = load;
+    }
 
-void NIFFile::warn(const std::string &msg) const
-{
-    Log(Debug::Warning) << " NIFFile Warning: " << msg << "\nFile: " << filename;
-}
+    void NIFFile::warn(const std::string& msg) const
+    {
+        Log(Debug::Warning) << " NIFFile Warning: " << msg << "\nFile: " << filename;
+    }
 
-[[noreturn]] void NIFFile::fail(const std::string &msg) const
-{
-    throw std::runtime_error(" NIFFile Error: " + msg + "\nFile: " + Files::pathToUnicodeString(filename));
-}
+    [[noreturn]] void NIFFile::fail(const std::string& msg) const
+    {
+        throw std::runtime_error(" NIFFile Error: " + msg + "\nFile: " + Files::pathToUnicodeString(filename));
+    }
 
-std::string NIFFile::getString(uint32_t index) const
-{
-    if (index == std::numeric_limits<uint32_t>::max())
-        return std::string();
-    return strings.at(index);
-}
+    std::string NIFFile::getString(uint32_t index) const
+    {
+        if (index == std::numeric_limits<uint32_t>::max())
+            return std::string();
+        return strings.at(index);
+    }
 
 }
diff --git a/components/nif/niffile.hpp b/components/nif/niffile.hpp
index 1789ab665b..21b0fa6892 100644
--- a/components/nif/niffile.hpp
+++ b/components/nif/niffile.hpp
@@ -1,11 +1,11 @@
-///Main header for reading .nif files
+/// Main header for reading .nif files
 
 #ifndef OPENMW_COMPONENTS_NIF_NIFFILE_HPP
 #define OPENMW_COMPONENTS_NIF_NIFFILE_HPP
 
-#include <vector>
 #include <atomic>
 #include <filesystem>
+#include <vector>
 
 #include <components/files/istreamptr.hpp>
 
@@ -14,140 +14,135 @@
 namespace Nif
 {
 
-struct File
-{
-    virtual ~File() = default;
-
-    virtual Record *getRecord(size_t index) const = 0;
-
-    virtual size_t numRecords() const = 0;
+    struct File
+    {
+        virtual ~File() = default;
 
-    virtual Record *getRoot(size_t index = 0) const = 0;
+        virtual Record* getRecord(size_t index) const = 0;
 
-    virtual size_t numRoots() const = 0;
+        virtual size_t numRecords() const = 0;
 
-    virtual std::string getString(uint32_t index) const = 0;
+        virtual Record* getRoot(size_t index = 0) const = 0;
 
-    virtual void setUseSkinning(bool skinning) = 0;
+        virtual size_t numRoots() const = 0;
 
-    virtual bool getUseSkinning() const = 0;
+        virtual std::string getString(uint32_t index) const = 0;
 
-    virtual std::filesystem::path getFilename() const = 0;
+        virtual void setUseSkinning(bool skinning) = 0;
 
-    virtual std::string getHash() const = 0;
+        virtual bool getUseSkinning() const = 0;
 
-    virtual unsigned int getVersion() const = 0;
+        virtual std::filesystem::path getFilename() const = 0;
 
-    virtual unsigned int getUserVersion() const = 0;
+        virtual std::string getHash() const = 0;
 
-    virtual unsigned int getBethVersion() const = 0;
-};
+        virtual unsigned int getVersion() const = 0;
 
-class NIFFile final : public File
-{
-    /// File version, user version, Bethesda version
-    unsigned int ver = 0;
-    unsigned int userVer = 0;
-    unsigned int bethVer = 0;
+        virtual unsigned int getUserVersion() const = 0;
 
-    /// File name, used for error messages and opening the file
-    std::filesystem::path filename;
-    std::string hash;
+        virtual unsigned int getBethVersion() const = 0;
+    };
 
-    /// Record list
-    std::vector<std::unique_ptr<Record>> records;
+    class NIFFile final : public File
+    {
+        /// File version, user version, Bethesda version
+        unsigned int ver = 0;
+        unsigned int userVer = 0;
+        unsigned int bethVer = 0;
 
-    /// Root list.  This is a select portion of the pointers from records
-    std::vector<Record*> roots;
+        /// File name, used for error messages and opening the file
+        std::filesystem::path filename;
+        std::string hash;
 
-    /// String table
-    std::vector<std::string> strings;
+        /// Record list
+        std::vector<std::unique_ptr<Record>> records;
 
-    bool mUseSkinning = false;
+        /// Root list.  This is a select portion of the pointers from records
+        std::vector<Record*> roots;
 
-    static std::atomic_bool sLoadUnsupportedFiles;
+        /// String table
+        std::vector<std::string> strings;
 
-    /// Parse the file
-    void parse(Files::IStreamPtr&& stream);
+        bool mUseSkinning = false;
 
-    /// Get the file's version in a human readable form
-    ///\returns A string containing a human readable NIF version number
-    std::string printVersion(unsigned int version);
+        static std::atomic_bool sLoadUnsupportedFiles;
 
-    ///Private Copy Constructor
-    NIFFile (NIFFile const &);
-    ///\overload
-    void operator = (NIFFile const &);
+        /// Parse the file
+        void parse(Files::IStreamPtr&& stream);
 
-public:
-    // For generic versions NIFStream::generateVersion() is used instead
-    enum NIFVersion
-    {
-        VER_MW         = 0x04000002,    // 4.0.0.2. Main Morrowind NIF version.
-        VER_OB_OLD     = 0x0A000102,    // 10.0.1.2. Main older Oblivion NIF version.
-        VER_OB         = 0x14000005,    // 20.0.0.5. Main Oblivion NIF version.
-        VER_BGS        = 0x14020007     // 20.2.0.7. Main Fallout 3/4/76/New Vegas and Skyrim/SkyrimSE NIF version.
-    };
-    enum BethVersion
-    {
-        BETHVER_FO3      = 34,          // Fallout 3
-        BETHVER_FO4      = 130          // Fallout 4
-    };
+        /// Get the file's version in a human readable form
+        ///\returns A string containing a human readable NIF version number
+        std::string printVersion(unsigned int version);
 
-    /// Used if file parsing fails
-    [[noreturn]] void fail(const std::string &msg) const;
+        /// Private Copy Constructor
+        NIFFile(NIFFile const&);
+        ///\overload
+        void operator=(NIFFile const&);
 
-    /// Used when something goes wrong, but not catastrophically so
-    void warn(const std::string &msg) const;
+    public:
+        // For generic versions NIFStream::generateVersion() is used instead
+        enum NIFVersion
+        {
+            VER_MW = 0x04000002, // 4.0.0.2. Main Morrowind NIF version.
+            VER_OB_OLD = 0x0A000102, // 10.0.1.2. Main older Oblivion NIF version.
+            VER_OB = 0x14000005, // 20.0.0.5. Main Oblivion NIF version.
+            VER_BGS = 0x14020007 // 20.2.0.7. Main Fallout 3/4/76/New Vegas and Skyrim/SkyrimSE NIF version.
+        };
+        enum BethVersion
+        {
+            BETHVER_FO3 = 34, // Fallout 3
+            BETHVER_FO4 = 130 // Fallout 4
+        };
 
-    /// Open a NIF stream. The name is used for error messages.
-    NIFFile(Files::IStreamPtr&& stream, const std::filesystem::path &name);
+        /// Used if file parsing fails
+        [[noreturn]] void fail(const std::string& msg) const;
 
-    /// Get a given record
-    Record *getRecord(size_t index) const override
-    {
-        return records.at(index).get();
-    }
-    /// Number of records
-    size_t numRecords() const override { return records.size(); }
+        /// Used when something goes wrong, but not catastrophically so
+        void warn(const std::string& msg) const;
 
-    /// Get a given root
-    Record *getRoot(size_t index=0) const override
-    {
-        Record *res = roots.at(index);
-        return res;
-    }
-    /// Number of roots
-    size_t numRoots() const override { return roots.size(); }
+        /// Open a NIF stream. The name is used for error messages.
+        NIFFile(Files::IStreamPtr&& stream, const std::filesystem::path& name);
 
-    /// Get a given string from the file's string table
-    std::string getString(uint32_t index) const override;
+        /// Get a given record
+        Record* getRecord(size_t index) const override { return records.at(index).get(); }
+        /// Number of records
+        size_t numRecords() const override { return records.size(); }
 
-    /// Set whether there is skinning contained in this NIF file.
-    /// @note This is just a hint for users of the NIF file and has no effect on the loading procedure.
-    void setUseSkinning(bool skinning) override;
+        /// Get a given root
+        Record* getRoot(size_t index = 0) const override
+        {
+            Record* res = roots.at(index);
+            return res;
+        }
+        /// Number of roots
+        size_t numRoots() const override { return roots.size(); }
 
-    bool getUseSkinning() const override;
+        /// Get a given string from the file's string table
+        std::string getString(uint32_t index) const override;
 
-    /// Get the name of the file
-    std::filesystem::path getFilename() const override { return filename; }
+        /// Set whether there is skinning contained in this NIF file.
+        /// @note This is just a hint for users of the NIF file and has no effect on the loading procedure.
+        void setUseSkinning(bool skinning) override;
 
-    std::string getHash() const override { return hash; }
+        bool getUseSkinning() const override;
 
-    /// Get the version of the NIF format used
-    unsigned int getVersion() const override { return ver; }
+        /// Get the name of the file
+        std::filesystem::path getFilename() const override { return filename; }
 
-    /// Get the user version of the NIF format used
-    unsigned int getUserVersion() const override { return userVer; }
+        std::string getHash() const override { return hash; }
 
-    /// Get the Bethesda version of the NIF format used
-    unsigned int getBethVersion() const override { return bethVer; }
+        /// Get the version of the NIF format used
+        unsigned int getVersion() const override { return ver; }
 
-    static void setLoadUnsupportedFiles(bool load);
-};
-using NIFFilePtr = std::shared_ptr<const Nif::NIFFile>;
+        /// Get the user version of the NIF format used
+        unsigned int getUserVersion() const override { return userVer; }
 
+        /// Get the Bethesda version of the NIF format used
+        unsigned int getBethVersion() const override { return bethVer; }
 
+        static void setLoadUnsupportedFiles(bool load);
+    };
+    using NIFFilePtr = std::shared_ptr<const Nif::NIFFile>;
 
 } // Namespace
 #endif
diff --git a/components/nif/nifkey.hpp b/components/nif/nifkey.hpp
index 85fc70d527..eda98eed76 100644
--- a/components/nif/nifkey.hpp
+++ b/components/nif/nifkey.hpp
@@ -1,156 +1,153 @@
-///File to handle keys used by nif file records
+/// File to handle keys used by nif file records
 
 #ifndef OPENMW_COMPONENTS_NIF_NIFKEY_HPP
 #define OPENMW_COMPONENTS_NIF_NIFKEY_HPP
 
 #include <map>
 
-#include "nifstream.hpp"
 #include "niffile.hpp"
+#include "nifstream.hpp"
 
 namespace Nif
 {
 
-enum InterpolationType
-{
-    InterpolationType_Unknown = 0,
-    InterpolationType_Linear = 1,
-    InterpolationType_Quadratic = 2,
-    InterpolationType_TBC = 3,
-    InterpolationType_XYZ = 4,
-    InterpolationType_Constant = 5
-};
-
-template<typename T>
-struct KeyT {
-    T mValue;
-    T mInTan; // Only for Quadratic interpolation, and never for QuaternionKeyList
-    T mOutTan; // Only for Quadratic interpolation, and never for QuaternionKeyList
-
-    // FIXME: Implement TBC interpolation
-    /*
-    float mTension;    // Only for TBC interpolation
-    float mBias;       // Only for TBC interpolation
-    float mContinuity; // Only for TBC interpolation
-    */
-};
-using FloatKey = KeyT<float>;
-using Vector3Key = KeyT<osg::Vec3f>;
-using Vector4Key = KeyT<osg::Vec4f>;
-using QuaternionKey = KeyT<osg::Quat>;
-
-template<typename T, T (NIFStream::*getValue)()>
-struct KeyMapT {
-    using MapType = std::map<float, KeyT<T>>;
-
-    using ValueType = T;
-    using KeyType = KeyT<T>;
-
-    unsigned int mInterpolationType = InterpolationType_Unknown;
-    MapType mKeys;
-
-    //Read in a KeyGroup (see http://niftools.sourceforge.net/doc/nif/NiKeyframeData.html)
-    void read(NIFStream *nif, bool morph = false)
+    enum InterpolationType
+    {
+        InterpolationType_Unknown = 0,
+        InterpolationType_Linear = 1,
+        InterpolationType_Quadratic = 2,
+        InterpolationType_TBC = 3,
+        InterpolationType_XYZ = 4,
+        InterpolationType_Constant = 5
+    };
+
+    template <typename T>
+    struct KeyT
     {
-        assert(nif);
+        T mValue;
+        T mInTan; // Only for Quadratic interpolation, and never for QuaternionKeyList
+        T mOutTan; // Only for Quadratic interpolation, and never for QuaternionKeyList
+
+        // FIXME: Implement TBC interpolation
+        /*
+        float mTension;    // Only for TBC interpolation
+        float mBias;       // Only for TBC interpolation
+        float mContinuity; // Only for TBC interpolation
+        */
+    };
+    using FloatKey = KeyT<float>;
+    using Vector3Key = KeyT<osg::Vec3f>;
+    using Vector4Key = KeyT<osg::Vec4f>;
+    using QuaternionKey = KeyT<osg::Quat>;
+
+    template <typename T, T (NIFStream::*getValue)()>
+    struct KeyMapT
+    {
+        using MapType = std::map<float, KeyT<T>>;
+
+        using ValueType = T;
+        using KeyType = KeyT<T>;
 
-        if (morph && nif->getVersion() >= NIFStream::generateVersion(10,1,0,106))
-            nif->getString(); // Frame name
+        unsigned int mInterpolationType = InterpolationType_Unknown;
+        MapType mKeys;
 
-        if (morph && nif->getVersion() > NIFStream::generateVersion(10,1,0,0))
+        // Read in a KeyGroup (see http://niftools.sourceforge.net/doc/nif/NiKeyframeData.html)
+        void read(NIFStream* nif, bool morph = false)
         {
-            if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,104) &&
-                nif->getVersion() <= NIFStream::generateVersion(20,1,0,2) && nif->getBethVersion() < 10)
-                nif->getFloat(); // Legacy weight
-            return;
-        }
+            assert(nif);
+
+            if (morph && nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 106))
+                nif->getString(); // Frame name
 
-        size_t count = nif->getUInt();
+            if (morph && nif->getVersion() > NIFStream::generateVersion(10, 1, 0, 0))
+            {
+                if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 104)
+                    && nif->getVersion() <= NIFStream::generateVersion(20, 1, 0, 2) && nif->getBethVersion() < 10)
+                    nif->getFloat(); // Legacy weight
+                return;
+            }
 
-        if (count != 0 || morph)
-            mInterpolationType = nif->getUInt();
+            size_t count = nif->getUInt();
 
-        KeyType key = {};
+            if (count != 0 || morph)
+                mInterpolationType = nif->getUInt();
 
-        if (mInterpolationType == InterpolationType_Linear || mInterpolationType == InterpolationType_Constant)
-        {
-            for (size_t i = 0;i < count;i++)
+            KeyType key = {};
+
+            if (mInterpolationType == InterpolationType_Linear || mInterpolationType == InterpolationType_Constant)
             {
-                float time = nif->getFloat();
-                readValue(*nif, key);
-                mKeys[time] = key;
+                for (size_t i = 0; i < count; i++)
+                {
+                    float time = nif->getFloat();
+                    readValue(*nif, key);
+                    mKeys[time] = key;
+                }
             }
-        }
-        else if (mInterpolationType == InterpolationType_Quadratic)
-        {
-            for (size_t i = 0;i < count;i++)
+            else if (mInterpolationType == InterpolationType_Quadratic)
             {
-                float time = nif->getFloat();
-                readQuadratic(*nif, key);
-                mKeys[time] = key;
+                for (size_t i = 0; i < count; i++)
+                {
+                    float time = nif->getFloat();
+                    readQuadratic(*nif, key);
+                    mKeys[time] = key;
+                }
             }
-        }
-        else if (mInterpolationType == InterpolationType_TBC)
-        {
-            for (size_t i = 0;i < count;i++)
+            else if (mInterpolationType == InterpolationType_TBC)
             {
-                float time = nif->getFloat();
-                readTBC(*nif, key);
-                mKeys[time] = key;
+                for (size_t i = 0; i < count; i++)
+                {
+                    float time = nif->getFloat();
+                    readTBC(*nif, key);
+                    mKeys[time] = key;
+                }
+            }
+            else if (mInterpolationType == InterpolationType_XYZ)
+            {
+                // XYZ keys aren't actually read here.
+                // data.cpp sees that the last type read was InterpolationType_XYZ and:
+                //     Eats a floating point number, then
+                //     Re-runs the read function 3 more times.
+                //         When it does that it's reading in a bunch of InterpolationType_Linear keys, not
+                //         InterpolationType_XYZ.
+            }
+            else if (count != 0)
+            {
+                nif->file->fail("Unhandled interpolation type: " + std::to_string(mInterpolationType));
             }
         }
-        else if (mInterpolationType == InterpolationType_XYZ)
-        {
-            //XYZ keys aren't actually read here.
-            //data.cpp sees that the last type read was InterpolationType_XYZ and:
-            //    Eats a floating point number, then
-            //    Re-runs the read function 3 more times.
-            //        When it does that it's reading in a bunch of InterpolationType_Linear keys, not InterpolationType_XYZ.
-        }
-        else if (count != 0)
-        {
-            nif->file->fail("Unhandled interpolation type: " + std::to_string(mInterpolationType));
-        }
-    }
 
-private:
-    static void readValue(NIFStream &nif, KeyT<T> &key)
-    {
-        key.mValue = (nif.*getValue)();
-    }
+    private:
+        static void readValue(NIFStream& nif, KeyT<T>& key) { key.mValue = (nif.*getValue)(); }
 
-    template <typename U>
-    static void readQuadratic(NIFStream &nif, KeyT<U> &key)
-    {
-        readValue(nif, key);
-        key.mInTan = (nif.*getValue)();
-        key.mOutTan = (nif.*getValue)();
-    }
+        template <typename U>
+        static void readQuadratic(NIFStream& nif, KeyT<U>& key)
+        {
+            readValue(nif, key);
+            key.mInTan = (nif.*getValue)();
+            key.mOutTan = (nif.*getValue)();
+        }
 
-    static void readQuadratic(NIFStream &nif, KeyT<osg::Quat> &key)
-    {
-        readValue(nif, key);
-    }
+        static void readQuadratic(NIFStream& nif, KeyT<osg::Quat>& key) { readValue(nif, key); }
 
-    static void readTBC(NIFStream &nif, KeyT<T> &key)
-    {
-        readValue(nif, key);
-        /*key.mTension = */nif.getFloat();
-        /*key.mBias = */nif.getFloat();
-        /*key.mContinuity = */nif.getFloat();
-    }
-};
-using FloatKeyMap = KeyMapT<float,&NIFStream::getFloat>;
-using Vector3KeyMap = KeyMapT<osg::Vec3f,&NIFStream::getVector3>;
-using Vector4KeyMap = KeyMapT<osg::Vec4f,&NIFStream::getVector4>;
-using QuaternionKeyMap = KeyMapT<osg::Quat,&NIFStream::getQuaternion>;
-using ByteKeyMap = KeyMapT<char,&NIFStream::getChar>;
-
-using FloatKeyMapPtr = std::shared_ptr<FloatKeyMap>;
-using Vector3KeyMapPtr = std::shared_ptr<Vector3KeyMap>;
-using Vector4KeyMapPtr = std::shared_ptr<Vector4KeyMap>;
-using QuaternionKeyMapPtr = std::shared_ptr<QuaternionKeyMap>;
-using ByteKeyMapPtr = std::shared_ptr<ByteKeyMap>;
+        static void readTBC(NIFStream& nif, KeyT<T>& key)
+        {
+            readValue(nif, key);
+            /*key.mTension = */ nif.getFloat();
+            /*key.mBias = */ nif.getFloat();
+            /*key.mContinuity = */ nif.getFloat();
+        }
+    };
+    using FloatKeyMap = KeyMapT<float, &NIFStream::getFloat>;
+    using Vector3KeyMap = KeyMapT<osg::Vec3f, &NIFStream::getVector3>;
+    using Vector4KeyMap = KeyMapT<osg::Vec4f, &NIFStream::getVector4>;
+    using QuaternionKeyMap = KeyMapT<osg::Quat, &NIFStream::getQuaternion>;
+    using ByteKeyMap = KeyMapT<char, &NIFStream::getChar>;
+
+    using FloatKeyMapPtr = std::shared_ptr<FloatKeyMap>;
+    using Vector3KeyMapPtr = std::shared_ptr<Vector3KeyMap>;
+    using Vector4KeyMapPtr = std::shared_ptr<Vector4KeyMap>;
+    using QuaternionKeyMapPtr = std::shared_ptr<QuaternionKeyMap>;
+    using ByteKeyMapPtr = std::shared_ptr<ByteKeyMap>;
 
 } // Namespace
 #endif //#ifndef OPENMW_COMPONENTS_NIF_NIFKEY_HPP
diff --git a/components/nif/nifstream.cpp b/components/nif/nifstream.cpp
index 6129a17394..7ded5e8edf 100644
--- a/components/nif/nifstream.cpp
+++ b/components/nif/nifstream.cpp
@@ -1,5 +1,5 @@
 #include "nifstream.hpp"
-//For error reporting
+// For error reporting
 #include "niffile.hpp"
 
 namespace Nif
@@ -25,21 +25,29 @@ namespace Nif
         return t;
     }
 
-    ///Booleans in 4.0.0.2 (Morrowind format) and earlier are 4 byte, while in 4.1.0.0+ they're 1 byte.
+    /// Booleans in 4.0.0.2 (Morrowind format) and earlier are 4 byte, while in 4.1.0.0+ they're 1 byte.
     bool NIFStream::getBoolean()
     {
-        return getVersion() < generateVersion(4,1,0,0) ? getInt() != 0 : getChar() != 0;
+        return getVersion() < generateVersion(4, 1, 0, 0) ? getInt() != 0 : getChar() != 0;
     }
 
-    ///Read in a string, either from the string table using the index or from the stream using the specified length
+    /// Read in a string, either from the string table using the index or from the stream using the specified length
     std::string NIFStream::getString()
     {
-        return getVersion() < generateVersion(20,1,0,1) ? getSizedString() : file->getString(getUInt());
+        return getVersion() < generateVersion(20, 1, 0, 1) ? getSizedString() : file->getString(getUInt());
     }
 
-
     // Convenience utility functions: get the versions of the currently read file
-    unsigned int NIFStream::getVersion() const { return file->getVersion(); }
-    unsigned int NIFStream::getUserVersion() const { return file->getBethVersion(); }
-    unsigned int NIFStream::getBethVersion() const { return file->getBethVersion(); }
+    unsigned int NIFStream::getVersion() const
+    {
+        return file->getVersion();
+    }
+    unsigned int NIFStream::getUserVersion() const
+    {
+        return file->getBethVersion();
+    }
+    unsigned int NIFStream::getBethVersion() const
+    {
+        return file->getBethVersion();
+    }
 }
diff --git a/components/nif/nifstream.hpp b/components/nif/nifstream.hpp
index 5b41f4c8ed..a58588fad9 100644
--- a/components/nif/nifstream.hpp
+++ b/components/nif/nifstream.hpp
@@ -1,261 +1,250 @@
-///Functions used to read raw binary data from .nif files
+/// Functions used to read raw binary data from .nif files
 
 #ifndef OPENMW_COMPONENTS_NIF_NIFSTREAM_HPP
 #define OPENMW_COMPONENTS_NIF_NIFSTREAM_HPP
 
 #include <cassert>
-#include <stdint.h>
+#include <istream>
 #include <stdexcept>
-#include <vector>
+#include <stdint.h>
 #include <type_traits>
-#include <istream>
+#include <vector>
 
 #include <components/files/istreamptr.hpp>
 #include <components/misc/endianness.hpp>
 
+#include <osg/Quat>
 #include <osg/Vec3f>
 #include <osg/Vec4f>
-#include <osg/Quat>
 
 #include "niftypes.hpp"
 
 namespace Nif
 {
 
-class NIFFile;
-
-template <std::size_t numInstances, typename T> inline void readLittleEndianBufferOfType(Files::IStreamPtr &pIStream, T* dest)
-{
-    static_assert(std::is_arithmetic_v<T>, "Buffer element type is not arithmetic");
-    pIStream->read((char*)dest, numInstances * sizeof(T));
-    if (pIStream->bad())
-        throw std::runtime_error("Failed to read little endian typed (" + std::string(typeid(T).name()) + ") buffer of "
-                                 + std::to_string(numInstances) + " instances");
-    if constexpr (Misc::IS_BIG_ENDIAN)
-        for (std::size_t i = 0; i < numInstances; i++)
-            Misc::swapEndiannessInplace(dest[i]);
-}
-
-template <typename T> inline void readLittleEndianDynamicBufferOfType(Files::IStreamPtr &pIStream, T* dest, std::size_t numInstances)
-{
-    static_assert(std::is_arithmetic_v<T>, "Buffer element type is not arithmetic");
-    pIStream->read((char*)dest, numInstances * sizeof(T));
-    if (pIStream->bad())
-        throw std::runtime_error("Failed to read little endian dynamic buffer of " + std::to_string(numInstances) + " instances");
-    if constexpr (Misc::IS_BIG_ENDIAN)
-        for (std::size_t i = 0; i < numInstances; i++)
-            Misc::swapEndiannessInplace(dest[i]);
-}
-template<typename type> type inline readLittleEndianType(Files::IStreamPtr &pIStream)
-{
-    type val;
-    readLittleEndianBufferOfType<1, type>(pIStream, &val);
-    return val;
-}
-
-class NIFStream
-{
-    /// Input stream
-    Files::IStreamPtr inp;
-
-public:
-
-    NIFFile * const file;
-
-    NIFStream (NIFFile * file, Files::IStreamPtr&& inp): inp (std::move(inp)), file (file) {}
-
-    void skip(size_t size) { inp->ignore(size); }
-
-    char getChar()
-    {
-        return readLittleEndianType<char>(inp);
-    }
-
-    short getShort()
-    {
-        return readLittleEndianType<short>(inp);
-    }
-
-    unsigned short getUShort()
-    {
-        return readLittleEndianType<unsigned short>(inp);
-    }
-
-    int getInt()
-    {
-        return readLittleEndianType<int>(inp);
-    }
-
-    unsigned int getUInt()
-    {
-        return readLittleEndianType<unsigned int>(inp);
-    }
-
-    float getFloat()
-    {
-        return readLittleEndianType<float>(inp);
-    }
-
-    osg::Vec2f getVector2()
-    {
-        osg::Vec2f vec;
-        readLittleEndianBufferOfType<2,float>(inp, vec._v);
-        return vec;
-    }
-
-    osg::Vec3f getVector3()
-    {
-        osg::Vec3f vec;
-        readLittleEndianBufferOfType<3, float>(inp, vec._v);
-        return vec;
-    }
-
-    osg::Vec4f getVector4()
-    {
-        osg::Vec4f vec;
-        readLittleEndianBufferOfType<4, float>(inp, vec._v);
-        return vec;
-    }
-
-    Matrix3 getMatrix3()
-    {
-        Matrix3 mat;
-        readLittleEndianBufferOfType<9, float>(inp, (float*)&mat.mValues);
-        return mat;
-    }
-
-    osg::Quat getQuaternion();
-
-    Transformation getTrafo();
-
-    bool getBoolean();
-
-    std::string getString();
-
-    unsigned int getVersion() const;
-    unsigned int getUserVersion() const;
-    unsigned int getBethVersion() const;
-
-    // Convert human-readable version numbers into a number that can be compared.
-    static constexpr uint32_t generateVersion(uint8_t major, uint8_t minor, uint8_t patch, uint8_t rev)
-    {
-        return (major << 24) + (minor << 16) + (patch << 8) + rev;
-    }
-
-    ///Read in a string of the given length
-    std::string getSizedString(size_t length)
-    {
-        std::string str(length, '\0');
-        inp->read(str.data(), length);
-        if (inp->bad())
-            throw std::runtime_error("Failed to read sized string of " + std::to_string(length) + " chars");
-        size_t end = str.find('\0');
-        if (end != std::string::npos)
-            str.erase(end);
-        return str;
-    }
-    ///Read in a string of the length specified in the file
-    std::string getSizedString()
-    {
-        size_t size = readLittleEndianType<uint32_t>(inp);
-        return getSizedString(size);
-    }
-
-    ///Specific to Bethesda headers, uses a byte for length
-    std::string getExportString()
-    {
-        size_t size = static_cast<size_t>(readLittleEndianType<uint8_t>(inp));
-        return getSizedString(size);
-    }
-
-    ///This is special since the version string doesn't start with a number, and ends with "\n"
-    std::string getVersionString()
-    {
-        std::string result;
-        std::getline(*inp, result);
-        if (inp->bad())
-            throw std::runtime_error("Failed to read version string");
-        return result;
-    }
-
-    void getChars(std::vector<char> &vec, size_t size)
-    {
-        vec.resize(size);
-        readLittleEndianDynamicBufferOfType<char>(inp, vec.data(), size);
-    }
-
-    void getUChars(std::vector<unsigned char> &vec, size_t size)
-    {
-        vec.resize(size);
-        readLittleEndianDynamicBufferOfType<unsigned char>(inp, vec.data(), size);
-    }
+    class NIFFile;
 
-    void getUShorts(std::vector<unsigned short> &vec, size_t size)
+    template <std::size_t numInstances, typename T>
+    inline void readLittleEndianBufferOfType(Files::IStreamPtr& pIStream, T* dest)
     {
-        vec.resize(size);
-        readLittleEndianDynamicBufferOfType<unsigned short>(inp, vec.data(), size);
+        static_assert(std::is_arithmetic_v<T>, "Buffer element type is not arithmetic");
+        pIStream->read((char*)dest, numInstances * sizeof(T));
+        if (pIStream->bad())
+            throw std::runtime_error("Failed to read little endian typed (" + std::string(typeid(T).name())
+                + ") buffer of " + std::to_string(numInstances) + " instances");
+        if constexpr (Misc::IS_BIG_ENDIAN)
+            for (std::size_t i = 0; i < numInstances; i++)
+                Misc::swapEndiannessInplace(dest[i]);
     }
 
-    void getFloats(std::vector<float> &vec, size_t size)
+    template <typename T>
+    inline void readLittleEndianDynamicBufferOfType(Files::IStreamPtr& pIStream, T* dest, std::size_t numInstances)
     {
-        vec.resize(size);
-        readLittleEndianDynamicBufferOfType<float>(inp, vec.data(), size);
-    }
-
-    void getInts(std::vector<int> &vec, size_t size)
-    {
-        vec.resize(size);
-        readLittleEndianDynamicBufferOfType<int>(inp, vec.data(), size);
-    }
-
-    void getUInts(std::vector<unsigned int> &vec, size_t size)
-    {
-        vec.resize(size);
-        readLittleEndianDynamicBufferOfType<unsigned int>(inp, vec.data(), size);
-    }
-
-    void getVector2s(std::vector<osg::Vec2f> &vec, size_t size)
-    {
-        vec.resize(size);
-        /* The packed storage of each Vec2f is 2 floats exactly */
-        readLittleEndianDynamicBufferOfType<float>(inp,(float*)vec.data(), size*2);
-    }
-
-    void getVector3s(std::vector<osg::Vec3f> &vec, size_t size)
+        static_assert(std::is_arithmetic_v<T>, "Buffer element type is not arithmetic");
+        pIStream->read((char*)dest, numInstances * sizeof(T));
+        if (pIStream->bad())
+            throw std::runtime_error(
+                "Failed to read little endian dynamic buffer of " + std::to_string(numInstances) + " instances");
+        if constexpr (Misc::IS_BIG_ENDIAN)
+            for (std::size_t i = 0; i < numInstances; i++)
+                Misc::swapEndiannessInplace(dest[i]);
+    }
+    template <typename type>
+    type inline readLittleEndianType(Files::IStreamPtr& pIStream)
     {
-        vec.resize(size);
-        /* The packed storage of each Vec3f is 3 floats exactly */
-        readLittleEndianDynamicBufferOfType<float>(inp, (float*)vec.data(), size*3);
-    }
-
-    void getVector4s(std::vector<osg::Vec4f> &vec, size_t size)
-    {
-        vec.resize(size);
-        /* The packed storage of each Vec4f is 4 floats exactly */
-        readLittleEndianDynamicBufferOfType<float>(inp, (float*)vec.data(), size*4);
-    }
-
-    void getQuaternions(std::vector<osg::Quat> &quat, size_t size)
-    {
-        quat.resize(size);
-        for (size_t i = 0;i < quat.size();i++)
-            quat[i] = getQuaternion();
-    }
-
-    void getStrings(std::vector<std::string> &vec, size_t size)
-    {
-        vec.resize(size);
-        for (size_t i = 0; i < vec.size(); i++)
-            vec[i] = getString();
-    }
-    /// We need to use this when the string table isn't actually initialized.
-    void getSizedStrings(std::vector<std::string> &vec, size_t size)
-    {
-        vec.resize(size);
-        for (size_t i = 0; i < vec.size(); i++)
-            vec[i] = getSizedString();
-    }
-};
+        type val;
+        readLittleEndianBufferOfType<1, type>(pIStream, &val);
+        return val;
+    }
+
+    class NIFStream
+    {
+        /// Input stream
+        Files::IStreamPtr inp;
+
+    public:
+        NIFFile* const file;
+
+        NIFStream(NIFFile* file, Files::IStreamPtr&& inp)
+            : inp(std::move(inp))
+            , file(file)
+        {
+        }
+
+        void skip(size_t size) { inp->ignore(size); }
+
+        char getChar() { return readLittleEndianType<char>(inp); }
+
+        short getShort() { return readLittleEndianType<short>(inp); }
+
+        unsigned short getUShort() { return readLittleEndianType<unsigned short>(inp); }
+
+        int getInt() { return readLittleEndianType<int>(inp); }
+
+        unsigned int getUInt() { return readLittleEndianType<unsigned int>(inp); }
+
+        float getFloat() { return readLittleEndianType<float>(inp); }
+
+        osg::Vec2f getVector2()
+        {
+            osg::Vec2f vec;
+            readLittleEndianBufferOfType<2, float>(inp, vec._v);
+            return vec;
+        }
+
+        osg::Vec3f getVector3()
+        {
+            osg::Vec3f vec;
+            readLittleEndianBufferOfType<3, float>(inp, vec._v);
+            return vec;
+        }
+
+        osg::Vec4f getVector4()
+        {
+            osg::Vec4f vec;
+            readLittleEndianBufferOfType<4, float>(inp, vec._v);
+            return vec;
+        }
+
+        Matrix3 getMatrix3()
+        {
+            Matrix3 mat;
+            readLittleEndianBufferOfType<9, float>(inp, (float*)&mat.mValues);
+            return mat;
+        }
+
+        osg::Quat getQuaternion();
+
+        Transformation getTrafo();
+
+        bool getBoolean();
+
+        std::string getString();
+
+        unsigned int getVersion() const;
+        unsigned int getUserVersion() const;
+        unsigned int getBethVersion() const;
+
+        // Convert human-readable version numbers into a number that can be compared.
+        static constexpr uint32_t generateVersion(uint8_t major, uint8_t minor, uint8_t patch, uint8_t rev)
+        {
+            return (major << 24) + (minor << 16) + (patch << 8) + rev;
+        }
+
+        /// Read in a string of the given length
+        std::string getSizedString(size_t length)
+        {
+            std::string str(length, '\0');
+            inp->read(str.data(), length);
+            if (inp->bad())
+                throw std::runtime_error("Failed to read sized string of " + std::to_string(length) + " chars");
+            size_t end = str.find('\0');
+            if (end != std::string::npos)
+                str.erase(end);
+            return str;
+        }
+        /// Read in a string of the length specified in the file
+        std::string getSizedString()
+        {
+            size_t size = readLittleEndianType<uint32_t>(inp);
+            return getSizedString(size);
+        }
+
+        /// Specific to Bethesda headers, uses a byte for length
+        std::string getExportString()
+        {
+            size_t size = static_cast<size_t>(readLittleEndianType<uint8_t>(inp));
+            return getSizedString(size);
+        }
+
+        /// This is special since the version string doesn't start with a number, and ends with "\n"
+        std::string getVersionString()
+        {
+            std::string result;
+            std::getline(*inp, result);
+            if (inp->bad())
+                throw std::runtime_error("Failed to read version string");
+            return result;
+        }
+
+        void getChars(std::vector<char>& vec, size_t size)
+        {
+            vec.resize(size);
+            readLittleEndianDynamicBufferOfType<char>(inp, vec.data(), size);
+        }
+
+        void getUChars(std::vector<unsigned char>& vec, size_t size)
+        {
+            vec.resize(size);
+            readLittleEndianDynamicBufferOfType<unsigned char>(inp, vec.data(), size);
+        }
+
+        void getUShorts(std::vector<unsigned short>& vec, size_t size)
+        {
+            vec.resize(size);
+            readLittleEndianDynamicBufferOfType<unsigned short>(inp, vec.data(), size);
+        }
+
+        void getFloats(std::vector<float>& vec, size_t size)
+        {
+            vec.resize(size);
+            readLittleEndianDynamicBufferOfType<float>(inp, vec.data(), size);
+        }
+
+        void getInts(std::vector<int>& vec, size_t size)
+        {
+            vec.resize(size);
+            readLittleEndianDynamicBufferOfType<int>(inp, vec.data(), size);
+        }
+
+        void getUInts(std::vector<unsigned int>& vec, size_t size)
+        {
+            vec.resize(size);
+            readLittleEndianDynamicBufferOfType<unsigned int>(inp, vec.data(), size);
+        }
+
+        void getVector2s(std::vector<osg::Vec2f>& vec, size_t size)
+        {
+            vec.resize(size);
+            /* The packed storage of each Vec2f is 2 floats exactly */
+            readLittleEndianDynamicBufferOfType<float>(inp, (float*)vec.data(), size * 2);
+        }
+
+        void getVector3s(std::vector<osg::Vec3f>& vec, size_t size)
+        {
+            vec.resize(size);
+            /* The packed storage of each Vec3f is 3 floats exactly */
+            readLittleEndianDynamicBufferOfType<float>(inp, (float*)vec.data(), size * 3);
+        }
+
+        void getVector4s(std::vector<osg::Vec4f>& vec, size_t size)
+        {
+            vec.resize(size);
+            /* The packed storage of each Vec4f is 4 floats exactly */
+            readLittleEndianDynamicBufferOfType<float>(inp, (float*)vec.data(), size * 4);
+        }
+
+        void getQuaternions(std::vector<osg::Quat>& quat, size_t size)
+        {
+            quat.resize(size);
+            for (size_t i = 0; i < quat.size(); i++)
+                quat[i] = getQuaternion();
+        }
+
+        void getStrings(std::vector<std::string>& vec, size_t size)
+        {
+            vec.resize(size);
+            for (size_t i = 0; i < vec.size(); i++)
+                vec[i] = getString();
+        }
+        /// We need to use this when the string table isn't actually initialized.
+        void getSizedStrings(std::vector<std::string>& vec, size_t size)
+        {
+            vec.resize(size);
+            for (size_t i = 0; i < vec.size(); i++)
+                vec[i] = getSizedString();
+        }
+    };
 
 }
 
diff --git a/components/nif/niftypes.hpp b/components/nif/niftypes.hpp
index 7786257179..b6a97b6ecb 100644
--- a/components/nif/niftypes.hpp
+++ b/components/nif/niftypes.hpp
@@ -24,67 +24,61 @@
 #ifndef OPENMW_COMPONENTS_NIF_NIFTYPES_HPP
 #define OPENMW_COMPONENTS_NIF_NIFTYPES_HPP
 
-#include <osg/Vec3f>
 #include <osg/Matrixf>
+#include <osg/Vec3f>
 
 // Common types used in NIF files
 
 namespace Nif
 {
 
-struct Matrix3
-{
-    float mValues[3][3];
-
-    Matrix3()
-    {
-        for (int i=0;i<3;++i)
-            for (int j=0;j<3;++j)
-                mValues[i][j] = (i==j) ? 1.f : 0.f;
-    }
-
-    bool isIdentity() const
-    {
-        for (int i=0;i<3;++i)
-            for (int j=0;j<3;++j)
-                if ((i==j) != (mValues[i][j] == 1))
-                    return false;
-        return true;
-    }
-};
-
-struct Transformation
-{
-    osg::Vec3f pos;
-    Matrix3 rotation; // this can contain scale components too, including negative and nonuniform scales
-    float scale;
-
-    osg::Matrixf toMatrix() const
+    struct Matrix3
     {
-        osg::Matrixf transform;
-        transform.setTrans(pos);
-
-        for (int i=0;i<3;++i)
-            for (int j=0;j<3;++j)
-                transform(j,i) = rotation.mValues[i][j] * scale; // NB column/row major difference
-
-        return transform;
-    }
-
-    bool isIdentity() const
-    {
-        return pos == osg::Vec3f(0,0,0)
-                && rotation.isIdentity() && scale == 1.f;
-    }
-
-    static const Transformation& getIdentity()
+        float mValues[3][3];
+
+        Matrix3()
+        {
+            for (int i = 0; i < 3; ++i)
+                for (int j = 0; j < 3; ++j)
+                    mValues[i][j] = (i == j) ? 1.f : 0.f;
+        }
+
+        bool isIdentity() const
+        {
+            for (int i = 0; i < 3; ++i)
+                for (int j = 0; j < 3; ++j)
+                    if ((i == j) != (mValues[i][j] == 1))
+                        return false;
+            return true;
+        }
+    };
+
+    struct Transformation
     {
-        static const Transformation identity = {
-            osg::Vec3f(), Matrix3(), 1.0f
-        };
-        return identity;
-    }
-};
+        osg::Vec3f pos;
+        Matrix3 rotation; // this can contain scale components too, including negative and nonuniform scales
+        float scale;
+
+        osg::Matrixf toMatrix() const
+        {
+            osg::Matrixf transform;
+            transform.setTrans(pos);
+
+            for (int i = 0; i < 3; ++i)
+                for (int j = 0; j < 3; ++j)
+                    transform(j, i) = rotation.mValues[i][j] * scale; // NB column/row major difference
+
+            return transform;
+        }
+
+        bool isIdentity() const { return pos == osg::Vec3f(0, 0, 0) && rotation.isIdentity() && scale == 1.f; }
+
+        static const Transformation& getIdentity()
+        {
+            static const Transformation identity = { osg::Vec3f(), Matrix3(), 1.0f };
+            return identity;
+        }
+    };
 
 } // Namespace
 #endif
diff --git a/components/nif/node.cpp b/components/nif/node.cpp
index 15761b02ef..8c604a59fa 100644
--- a/components/nif/node.cpp
+++ b/components/nif/node.cpp
@@ -39,7 +39,7 @@ namespace Nif
             case LOZENGE_BV:
             {
                 lozenge.radius = nif->getFloat();
-                if (nif->getVersion() >= NIFStream::generateVersion(4,2,1,0))
+                if (nif->getVersion() >= NIFStream::generateVersion(4, 2, 1, 0))
                 {
                     lozenge.extent0 = nif->getFloat();
                     lozenge.extent1 = nif->getFloat();
@@ -62,7 +62,7 @@ namespace Nif
             case HALFSPACE_BV:
             {
                 halfSpace.plane = osg::Plane(nif->getVector4());
-                if (nif->getVersion() >= NIFStream::generateVersion(4,2,1,0))
+                if (nif->getVersion() >= NIFStream::generateVersion(4, 2, 1, 0))
                     halfSpace.origin = nif->getVector3();
                 break;
             }
@@ -73,23 +73,23 @@ namespace Nif
         }
     }
 
-    void Node::read(NIFStream *nif)
+    void Node::read(NIFStream* nif)
     {
         Named::read(nif);
 
         flags = nif->getBethVersion() <= 26 ? nif->getUShort() : nif->getUInt();
         trafo = nif->getTrafo();
-        if (nif->getVersion() <= NIFStream::generateVersion(4,2,2,0))
+        if (nif->getVersion() <= NIFStream::generateVersion(4, 2, 2, 0))
             velocity = nif->getVector3();
         if (nif->getBethVersion() <= NIFFile::BethVersion::BETHVER_FO3)
             props.read(nif);
 
-        if (nif->getVersion() <= NIFStream::generateVersion(4,2,2,0))
+        if (nif->getVersion() <= NIFStream::generateVersion(4, 2, 2, 0))
             hasBounds = nif->getBoolean();
         if (hasBounds)
             bounds.read(nif);
         // Reference to the collision object in Gamebryo files.
-        if (nif->getVersion() >= NIFStream::generateVersion(10,0,1,0))
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 0, 1, 0))
             collision.read(nif);
 
         parents.clear();
@@ -97,7 +97,7 @@ namespace Nif
         isBone = false;
     }
 
-    void Node::post(NIFFile *nif)
+    void Node::post(NIFFile* nif)
     {
         Named::post(nif);
         props.post(nif);
@@ -109,7 +109,7 @@ namespace Nif
         isBone = true;
     }
 
-    void NiNode::read(NIFStream *nif)
+    void NiNode::read(NIFStream* nif)
     {
         Node::read(nif);
         children.read(nif);
@@ -126,7 +126,7 @@ namespace Nif
         }
     }
 
-    void NiNode::post(NIFFile *nif)
+    void NiNode::post(NIFFile* nif)
     {
         Node::post(nif);
         children.post(nif);
@@ -140,40 +140,41 @@ namespace Nif
         }
     }
 
-    void NiGeometry::MaterialData::read(NIFStream *nif)
+    void NiGeometry::MaterialData::read(NIFStream* nif)
     {
-        if (nif->getVersion() <= NIFStream::generateVersion(10,0,1,0))
+        if (nif->getVersion() <= NIFStream::generateVersion(10, 0, 1, 0))
             return;
         unsigned int num = 0;
-        if (nif->getVersion() <= NIFStream::generateVersion(20,1,0,3))
+        if (nif->getVersion() <= NIFStream::generateVersion(20, 1, 0, 3))
             num = nif->getBoolean(); // Has Shader
-        else if (nif->getVersion() >= NIFStream::generateVersion(20,2,0,5))
+        else if (nif->getVersion() >= NIFStream::generateVersion(20, 2, 0, 5))
             num = nif->getUInt();
         if (num)
         {
             nif->getStrings(names, num);
             nif->getInts(extra, num);
         }
-        if (nif->getVersion() >= NIFStream::generateVersion(20,2,0,5))
+        if (nif->getVersion() >= NIFStream::generateVersion(20, 2, 0, 5))
             active = nif->getUInt();
         if (nif->getVersion() >= NIFFile::NIFVersion::VER_BGS)
             needsUpdate = nif->getBoolean();
     }
 
-    void NiGeometry::read(NIFStream *nif)
+    void NiGeometry::read(NIFStream* nif)
     {
         Node::read(nif);
         data.read(nif);
         skin.read(nif);
         material.read(nif);
-        if (nif->getVersion() == NIFFile::NIFVersion::VER_BGS && nif->getBethVersion() > NIFFile::BethVersion::BETHVER_FO3)
+        if (nif->getVersion() == NIFFile::NIFVersion::VER_BGS
+            && nif->getBethVersion() > NIFFile::BethVersion::BETHVER_FO3)
         {
             shaderprop.read(nif);
             alphaprop.read(nif);
         }
     }
 
-    void NiGeometry::post(NIFFile *nif)
+    void NiGeometry::post(NIFFile* nif)
     {
         Node::post(nif);
         data.post(nif);
@@ -184,7 +185,7 @@ namespace Nif
             nif->setUseSkinning(true);
     }
 
-    void BSLODTriShape::read(NIFStream *nif)
+    void BSLODTriShape::read(NIFStream* nif)
     {
         NiTriShape::read(nif);
         lod0 = nif->getUInt();
@@ -192,9 +193,9 @@ namespace Nif
         lod2 = nif->getUInt();
     }
 
-    void NiCamera::Camera::read(NIFStream *nif)
+    void NiCamera::Camera::read(NIFStream* nif)
     {
-        if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
             cameraFlags = nif->getUShort();
         left = nif->getFloat();
         right = nif->getFloat();
@@ -202,7 +203,7 @@ namespace Nif
         bottom = nif->getFloat();
         nearDist = nif->getFloat();
         farDist = nif->getFloat();
-        if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
             orthographic = nif->getBoolean();
         vleft = nif->getFloat();
         vright = nif->getFloat();
@@ -212,7 +213,7 @@ namespace Nif
         LOD = nif->getFloat();
     }
 
-    void NiCamera::read(NIFStream *nif)
+    void NiCamera::read(NIFStream* nif)
     {
         Node::read(nif);
 
@@ -220,31 +221,32 @@ namespace Nif
 
         nif->getInt(); // -1
         nif->getInt(); // 0
-        if (nif->getVersion() >= NIFStream::generateVersion(4,2,1,0))
+        if (nif->getVersion() >= NIFStream::generateVersion(4, 2, 1, 0))
             nif->getInt(); // 0
     }
 
-    void NiSwitchNode::read(NIFStream *nif)
+    void NiSwitchNode::read(NIFStream* nif)
     {
         NiNode::read(nif);
-        if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
             switchFlags = nif->getUShort();
         initialIndex = nif->getUInt();
     }
 
-    void NiLODNode::read(NIFStream *nif)
+    void NiLODNode::read(NIFStream* nif)
     {
         NiSwitchNode::read(nif);
-        if (nif->getVersion() >= NIFFile::NIFVersion::VER_MW && nif->getVersion() <= NIFStream::generateVersion(10,0,1,0))
+        if (nif->getVersion() >= NIFFile::NIFVersion::VER_MW
+            && nif->getVersion() <= NIFStream::generateVersion(10, 0, 1, 0))
             lodCenter = nif->getVector3();
-        else if (nif->getVersion() > NIFStream::generateVersion(10,0,1,0))
+        else if (nif->getVersion() > NIFStream::generateVersion(10, 0, 1, 0))
         {
             nif->skip(4); // NiLODData, unsupported at the moment
             return;
         }
 
         unsigned int numLodLevels = nif->getUInt();
-        for (unsigned int i=0; i<numLodLevels; ++i)
+        for (unsigned int i = 0; i < numLodLevels; ++i)
         {
             LODRange r;
             r.minRange = nif->getFloat();
@@ -253,30 +255,30 @@ namespace Nif
         }
     }
 
-    void NiFltAnimationNode::read(NIFStream *nif)
+    void NiFltAnimationNode::read(NIFStream* nif)
     {
         NiSwitchNode::read(nif);
         mDuration = nif->getFloat();
     }
 
-    void NiSortAdjustNode::read(NIFStream *nif)
+    void NiSortAdjustNode::read(NIFStream* nif)
     {
         NiNode::read(nif);
         mMode = nif->getInt();
-        if (nif->getVersion() <= NIFStream::generateVersion(20,0,0,3))
+        if (nif->getVersion() <= NIFStream::generateVersion(20, 0, 0, 3))
             mSubSorter.read(nif);
     }
 
-    void NiSortAdjustNode::post(NIFFile *nif)
+    void NiSortAdjustNode::post(NIFFile* nif)
     {
         NiNode::post(nif);
         mSubSorter.post(nif);
     }
 
-    void NiBillboardNode::read(NIFStream *nif)
+    void NiBillboardNode::read(NIFStream* nif)
     {
         NiNode::read(nif);
-        if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
             mMode = nif->getUShort() & 0x7;
         else
             mMode = (flags >> 5) & 0x3;
diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index 8160a66dc4..658f6b75e0 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -8,255 +8,270 @@
 namespace Nif
 {
 
-struct NiNode;
+    struct NiNode;
 
-struct NiBoundingVolume
-{
-    enum Type
+    struct NiBoundingVolume
     {
-        BASE_BV = 0xFFFFFFFF,
-        SPHERE_BV = 0,
-        BOX_BV = 1,
-        CAPSULE_BV = 2,
-        LOZENGE_BV = 3,
-        UNION_BV = 4,
-        HALFSPACE_BV = 5
+        enum Type
+        {
+            BASE_BV = 0xFFFFFFFF,
+            SPHERE_BV = 0,
+            BOX_BV = 1,
+            CAPSULE_BV = 2,
+            LOZENGE_BV = 3,
+            UNION_BV = 4,
+            HALFSPACE_BV = 5
+        };
+
+        struct NiSphereBV
+        {
+            osg::Vec3f center;
+            float radius{ 0.f };
+        };
+
+        struct NiBoxBV
+        {
+            osg::Vec3f center;
+            Matrix3 axes;
+            osg::Vec3f extents;
+        };
+
+        struct NiCapsuleBV
+        {
+            osg::Vec3f center, axis;
+            float extent{ 0.f }, radius{ 0.f };
+        };
+
+        struct NiLozengeBV
+        {
+            float radius{ 0.f }, extent0{ 0.f }, extent1{ 0.f };
+            osg::Vec3f center, axis0, axis1;
+        };
+
+        struct NiHalfSpaceBV
+        {
+            osg::Plane plane;
+            osg::Vec3f origin;
+        };
+
+        unsigned int type;
+        NiSphereBV sphere;
+        NiBoxBV box;
+        NiCapsuleBV capsule;
+        NiLozengeBV lozenge;
+        std::vector<NiBoundingVolume> children;
+        NiHalfSpaceBV halfSpace;
+
+        void read(NIFStream* nif);
     };
 
-    struct NiSphereBV
+    /** A Node is an object that's part of the main NIF tree. It has
+        parent node (unless it's the root), and transformation (location
+        and rotation) relative to it's parent.
+     */
+    struct Node : public Named
     {
-        osg::Vec3f center;
-        float radius{0.f};
+        enum Flags
+        {
+            Flag_Hidden = 0x0001,
+            Flag_MeshCollision = 0x0002,
+            Flag_BBoxCollision = 0x0004,
+            Flag_ActiveCollision = 0x0020
+        };
+
+        // Node flags. Interpretation depends somewhat on the type of node.
+        unsigned int flags;
+
+        Transformation trafo;
+        osg::Vec3f velocity; // Unused? Might be a run-time game state
+        PropertyList props;
+
+        // Bounding box info
+        bool hasBounds{ false };
+        NiBoundingVolume bounds;
+
+        // Collision object info
+        NiCollisionObjectPtr collision;
+
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+
+        // Parent node, or nullptr for the root node. As far as I'm aware, only
+        // NiNodes (or types derived from NiNodes) can be parents.
+        std::vector<NiNode*> parents;
+
+        bool isBone{ false };
+
+        void setBone();
+
+        bool isHidden() const { return flags & Flag_Hidden; }
+        bool hasMeshCollision() const { return flags & Flag_MeshCollision; }
+        bool hasBBoxCollision() const { return flags & Flag_BBoxCollision; }
+        bool collisionActive() const { return flags & Flag_ActiveCollision; }
     };
 
-    struct NiBoxBV
+    struct NiNode : Node
     {
-        osg::Vec3f center;
-        Matrix3 axes;
-        osg::Vec3f extents;
+        NodeList children;
+        NodeList effects;
+
+        enum BSAnimFlags
+        {
+            AnimFlag_AutoPlay = 0x0020
+        };
+        enum BSParticleFlags
+        {
+            ParticleFlag_AutoPlay = 0x0020,
+            ParticleFlag_LocalSpace = 0x0080
+        };
+
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
     };
 
-    struct NiCapsuleBV
+    struct NiGeometry : Node
     {
-        osg::Vec3f center, axis;
-        float extent{0.f}, radius{0.f};
+        /* Possible flags:
+            0x40 - mesh has no vertex normals ?
+
+            Only flags included in 0x47 (ie. 0x01, 0x02, 0x04 and 0x40) have
+            been observed so far.
+        */
+
+        struct MaterialData
+        {
+            std::vector<std::string> names;
+            std::vector<int> extra;
+            unsigned int active{ 0 };
+            bool needsUpdate{ false };
+            void read(NIFStream* nif);
+        };
+
+        NiGeometryDataPtr data;
+        NiSkinInstancePtr skin;
+        MaterialData material;
+        BSShaderPropertyPtr shaderprop;
+        NiAlphaPropertyPtr alphaprop;
+
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
     };
 
-    struct NiLozengeBV
+    struct NiTriShape : NiGeometry
     {
-        float radius{0.f}, extent0{0.f}, extent1{0.f};
-        osg::Vec3f center, axis0, axis1;
     };
-
-    struct NiHalfSpaceBV
+    struct BSLODTriShape : NiTriShape
     {
-        osg::Plane plane;
-        osg::Vec3f origin;
+        unsigned int lod0, lod1, lod2;
+        void read(NIFStream* nif) override;
     };
-
-    unsigned int type;
-    NiSphereBV sphere;
-    NiBoxBV box;
-    NiCapsuleBV capsule;
-    NiLozengeBV lozenge;
-    std::vector<NiBoundingVolume> children;
-    NiHalfSpaceBV halfSpace;
-
-    void read(NIFStream* nif);
-};
-
-/** A Node is an object that's part of the main NIF tree. It has
-    parent node (unless it's the root), and transformation (location
-    and rotation) relative to it's parent.
- */
-struct Node : public Named
-{
-    enum Flags {
-        Flag_Hidden = 0x0001,
-        Flag_MeshCollision = 0x0002,
-        Flag_BBoxCollision = 0x0004,
-        Flag_ActiveCollision = 0x0020
+    struct NiTriStrips : NiGeometry
+    {
+    };
+    struct NiLines : NiGeometry
+    {
+    };
+    struct NiParticles : NiGeometry
+    {
     };
 
-    // Node flags. Interpretation depends somewhat on the type of node.
-    unsigned int flags;
-
-    Transformation trafo;
-    osg::Vec3f velocity; // Unused? Might be a run-time game state
-    PropertyList props;
-
-    // Bounding box info
-    bool hasBounds{false};
-    NiBoundingVolume bounds;
-
-    // Collision object info
-    NiCollisionObjectPtr collision;
-
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
+    struct NiCamera : Node
+    {
+        struct Camera
+        {
+            unsigned short cameraFlags{ 0 };
 
-    // Parent node, or nullptr for the root node. As far as I'm aware, only
-    // NiNodes (or types derived from NiNodes) can be parents.
-    std::vector<NiNode*> parents;
+            // Camera frustrum
+            float left, right, top, bottom, nearDist, farDist;
 
-    bool isBone{false};
+            // Viewport
+            float vleft, vright, vtop, vbottom;
 
-    void setBone();
+            // Level of detail modifier
+            float LOD;
 
-    bool isHidden() const { return flags & Flag_Hidden; }
-    bool hasMeshCollision() const { return flags & Flag_MeshCollision; }
-    bool hasBBoxCollision() const { return flags & Flag_BBoxCollision; }
-    bool collisionActive() const { return flags & Flag_ActiveCollision; }
-};
+            // Orthographic projection usage flag
+            bool orthographic{ false };
 
-struct NiNode : Node
-{
-    NodeList children;
-    NodeList effects;
+            void read(NIFStream* nif);
+        };
+        Camera cam;
 
-    enum BSAnimFlags {
-        AnimFlag_AutoPlay = 0x0020
+        void read(NIFStream* nif) override;
     };
-    enum BSParticleFlags {
-        ParticleFlag_AutoPlay = 0x0020,
-        ParticleFlag_LocalSpace = 0x0080
-    };
-
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
-
-struct NiGeometry : Node
-{
-    /* Possible flags:
-        0x40 - mesh has no vertex normals ?
-
-        Only flags included in 0x47 (ie. 0x01, 0x02, 0x04 and 0x40) have
-        been observed so far.
-    */
 
-    struct MaterialData
+    // A node used as the base to switch between child nodes, such as for LOD levels.
+    struct NiSwitchNode : public NiNode
     {
-        std::vector<std::string> names;
-        std::vector<int> extra;
-        unsigned int active{0};
-        bool needsUpdate{false};
-        void read(NIFStream *nif);
-    };
-
-    NiGeometryDataPtr data;
-    NiSkinInstancePtr skin;
-    MaterialData material;
-    BSShaderPropertyPtr shaderprop;
-    NiAlphaPropertyPtr alphaprop;
+        unsigned int switchFlags{ 0 };
+        unsigned int initialIndex{ 0 };
 
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
+        void read(NIFStream* nif) override;
+    };
 
-struct NiTriShape : NiGeometry {};
-struct BSLODTriShape : NiTriShape
-{
-    unsigned int lod0, lod1, lod2;
-    void read(NIFStream *nif) override;
-};
-struct NiTriStrips : NiGeometry {};
-struct NiLines : NiGeometry {};
-struct NiParticles : NiGeometry { };
-
-struct NiCamera : Node
-{
-    struct Camera
+    struct NiLODNode : public NiSwitchNode
     {
-        unsigned short cameraFlags{0};
-
-        // Camera frustrum
-        float left, right, top, bottom, nearDist, farDist;
-
-        // Viewport
-        float vleft, vright, vtop, vbottom;
+        osg::Vec3f lodCenter;
 
-        // Level of detail modifier
-        float LOD;
+        struct LODRange
+        {
+            float minRange;
+            float maxRange;
+        };
+        std::vector<LODRange> lodLevels;
 
-        // Orthographic projection usage flag
-        bool orthographic{false};
-
-        void read(NIFStream *nif);
+        void read(NIFStream* nif) override;
     };
-    Camera cam;
-
-    void read(NIFStream *nif) override;
-};
 
-// A node used as the base to switch between child nodes, such as for LOD levels.
-struct NiSwitchNode : public NiNode
-{
-    unsigned int switchFlags{0};
-    unsigned int initialIndex{0};
+    struct NiFltAnimationNode : public NiSwitchNode
+    {
+        float mDuration;
+        enum Flags
+        {
+            Flag_Swing = 0x40
+        };
 
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
 
-struct NiLODNode : public NiSwitchNode
-{
-    osg::Vec3f lodCenter;
+        bool swing() const { return flags & Flag_Swing; }
+    };
 
-    struct LODRange
+    // Abstract
+    struct NiAccumulator : Record
     {
-        float minRange;
-        float maxRange;
+        void read(NIFStream* nif) override {}
     };
-    std::vector<LODRange> lodLevels;
-
-    void read(NIFStream *nif) override;
-};
 
-struct NiFltAnimationNode : public NiSwitchNode
-{
-    float mDuration;
-    enum Flags
+    // Node children sorters
+    struct NiClusterAccumulator : NiAccumulator
     {
-        Flag_Swing = 0x40
     };
-
-    void read(NIFStream *nif) override;
-
-    bool swing() const { return flags & Flag_Swing; }
-};
-
-// Abstract
-struct NiAccumulator : Record
-{
-    void read(NIFStream *nif) override {}
-};
-
-// Node children sorters
-struct NiClusterAccumulator : NiAccumulator {};
-struct NiAlphaAccumulator : NiClusterAccumulator {};
-
-struct NiSortAdjustNode : NiNode
-{
-    enum SortingMode
+    struct NiAlphaAccumulator : NiClusterAccumulator
     {
-        SortingMode_Inherit,
-        SortingMode_Off,
-        SortingMode_Subsort
     };
 
-    int mMode;
-    NiAccumulatorPtr mSubSorter;
-
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
+    struct NiSortAdjustNode : NiNode
+    {
+        enum SortingMode
+        {
+            SortingMode_Inherit,
+            SortingMode_Off,
+            SortingMode_Subsort
+        };
+
+        int mMode;
+        NiAccumulatorPtr mSubSorter;
+
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
-struct NiBillboardNode : NiNode
-{
-    int mMode{0};
+    struct NiBillboardNode : NiNode
+    {
+        int mMode{ 0 };
 
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
+    };
 
 } // Namespace
 #endif
diff --git a/components/nif/physics.cpp b/components/nif/physics.cpp
index ab0788c82a..04b3f48c00 100644
--- a/components/nif/physics.cpp
+++ b/components/nif/physics.cpp
@@ -8,14 +8,14 @@ namespace Nif
 
     /// Non-record data types
 
-    void bhkWorldObjCInfoProperty::read(NIFStream *nif)
+    void bhkWorldObjCInfoProperty::read(NIFStream* nif)
     {
         mData = nif->getUInt();
         mSize = nif->getUInt();
         mCapacityAndFlags = nif->getUInt();
     }
 
-    void bhkWorldObjectCInfo::read(NIFStream *nif)
+    void bhkWorldObjectCInfo::read(NIFStream* nif)
     {
         nif->skip(4); // Unused
         mPhaseType = static_cast<BroadPhaseType>(nif->getChar());
@@ -23,31 +23,31 @@ namespace Nif
         mProperty.read(nif);
     }
 
-    void HavokMaterial::read(NIFStream *nif)
+    void HavokMaterial::read(NIFStream* nif)
     {
         if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB_OLD)
             nif->skip(4); // Unknown
         mMaterial = nif->getUInt();
     }
 
-    void HavokFilter::read(NIFStream *nif)
+    void HavokFilter::read(NIFStream* nif)
     {
         mLayer = nif->getChar();
         mFlags = nif->getChar();
         mGroup = nif->getUShort();
     }
 
-    void hkSubPartData::read(NIFStream *nif)
+    void hkSubPartData::read(NIFStream* nif)
     {
         mHavokFilter.read(nif);
         mNumVertices = nif->getUInt();
         mHavokMaterial.read(nif);
     }
 
-    void hkpMoppCode::read(NIFStream *nif)
+    void hkpMoppCode::read(NIFStream* nif)
     {
         unsigned int size = nif->getUInt();
-        if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
             mOffset = nif->getVector4();
         if (nif->getBethVersion() > NIFFile::BethVersion::BETHVER_FO3)
             nif->getChar(); // MOPP data build type
@@ -55,14 +55,14 @@ namespace Nif
             nif->getChars(mData, size);
     }
 
-    void bhkEntityCInfo::read(NIFStream *nif)
+    void bhkEntityCInfo::read(NIFStream* nif)
     {
         mResponseType = static_cast<hkResponseType>(nif->getChar());
         nif->skip(1); // Unused
         mProcessContactDelay = nif->getUShort();
     }
 
-    void TriangleData::read(NIFStream *nif)
+    void TriangleData::read(NIFStream* nif)
     {
         for (int i = 0; i < 3; i++)
             mTriangle[i] = nif->getUShort();
@@ -71,9 +71,9 @@ namespace Nif
             mNormal = nif->getVector3();
     }
 
-    void bhkRigidBodyCInfo::read(NIFStream *nif)
+    void bhkRigidBodyCInfo::read(NIFStream* nif)
     {
-        if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
         {
             nif->skip(4); // Unused
             mHavokFilter.read(nif);
@@ -110,7 +110,7 @@ namespace Nif
         if (nif->getBethVersion() >= 83)
             mRollingFrictionMult = nif->getFloat();
         mRestitution = nif->getFloat();
-        if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
         {
             mMaxLinearVelocity = nif->getFloat();
             mMaxAngularVelocity = nif->getFloat();
@@ -149,14 +149,14 @@ namespace Nif
 
     /// Record types
 
-    void bhkCollisionObject::read(NIFStream *nif)
+    void bhkCollisionObject::read(NIFStream* nif)
     {
         NiCollisionObject::read(nif);
         mFlags = nif->getUShort();
         mBody.read(nif);
     }
 
-    void bhkWorldObject::read(NIFStream *nif)
+    void bhkWorldObject::read(NIFStream* nif)
     {
         mShape.read(nif);
         if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB_OLD)
@@ -165,28 +165,28 @@ namespace Nif
         mWorldObjectInfo.read(nif);
     }
 
-    void bhkWorldObject::post(NIFFile *nif)
+    void bhkWorldObject::post(NIFFile* nif)
     {
         mShape.post(nif);
     }
 
-    void bhkEntity::read(NIFStream *nif)
+    void bhkEntity::read(NIFStream* nif)
     {
         bhkWorldObject::read(nif);
         mInfo.read(nif);
     }
 
-    void bhkBvTreeShape::read(NIFStream *nif)
+    void bhkBvTreeShape::read(NIFStream* nif)
     {
         mShape.read(nif);
     }
 
-    void bhkBvTreeShape::post(NIFFile *nif)
+    void bhkBvTreeShape::post(NIFFile* nif)
     {
         mShape.post(nif);
     }
 
-    void bhkMoppBvTreeShape::read(NIFStream *nif)
+    void bhkMoppBvTreeShape::read(NIFStream* nif)
     {
         bhkBvTreeShape::read(nif);
         nif->skip(12); // Unused
@@ -194,25 +194,25 @@ namespace Nif
         mMopp.read(nif);
     }
 
-    void bhkNiTriStripsShape::read(NIFStream *nif)
+    void bhkNiTriStripsShape::read(NIFStream* nif)
     {
         mHavokMaterial.read(nif);
         mRadius = nif->getFloat();
         nif->skip(20); // Unused
         mGrowBy = nif->getUInt();
-        if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
             mScale = nif->getVector4();
         mData.read(nif);
         unsigned int numFilters = nif->getUInt();
         nif->getUInts(mFilters, numFilters);
     }
 
-    void bhkNiTriStripsShape::post(NIFFile *nif)
+    void bhkNiTriStripsShape::post(NIFFile* nif)
     {
         mData.post(nif);
     }
 
-    void bhkPackedNiTriStripsShape::read(NIFStream *nif)
+    void bhkPackedNiTriStripsShape::read(NIFStream* nif)
     {
         if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
         {
@@ -229,12 +229,12 @@ namespace Nif
         mData.read(nif);
     }
 
-    void bhkPackedNiTriStripsShape::post(NIFFile *nif)
+    void bhkPackedNiTriStripsShape::post(NIFFile* nif)
     {
         mData.post(nif);
     }
 
-    void hkPackedNiTriStripsData::read(NIFStream *nif)
+    void hkPackedNiTriStripsData::read(NIFStream* nif)
     {
         unsigned int numTriangles = nif->getUInt();
         mTriangles.resize(numTriangles);
@@ -257,18 +257,18 @@ namespace Nif
         }
     }
 
-    void bhkSphereRepShape::read(NIFStream *nif)
+    void bhkSphereRepShape::read(NIFStream* nif)
     {
         mHavokMaterial.read(nif);
     }
 
-    void bhkConvexShape::read(NIFStream *nif)
+    void bhkConvexShape::read(NIFStream* nif)
     {
         bhkSphereRepShape::read(nif);
         mRadius = nif->getFloat();
     }
 
-    void bhkConvexVerticesShape::read(NIFStream *nif)
+    void bhkConvexVerticesShape::read(NIFStream* nif)
     {
         bhkConvexShape::read(nif);
         mVerticesProperty.read(nif);
@@ -281,7 +281,7 @@ namespace Nif
             nif->getVector4s(mNormals, numNormals);
     }
 
-    void bhkBoxShape::read(NIFStream *nif)
+    void bhkBoxShape::read(NIFStream* nif)
     {
         bhkConvexShape::read(nif);
         nif->skip(8); // Unused
@@ -289,7 +289,7 @@ namespace Nif
         nif->skip(4); // Unused
     }
 
-    void bhkCapsuleShape::read(NIFStream *nif)
+    void bhkCapsuleShape::read(NIFStream* nif)
     {
         bhkConvexShape::read(nif);
         nif->skip(8); // Unused
@@ -299,7 +299,7 @@ namespace Nif
         mRadius2 = nif->getFloat();
     }
 
-    void bhkListShape::read(NIFStream *nif)
+    void bhkListShape::read(NIFStream* nif)
     {
         mSubshapes.read(nif);
         mHavokMaterial.read(nif);
@@ -311,7 +311,7 @@ namespace Nif
             filter.read(nif);
     }
 
-    void bhkRigidBody::read(NIFStream *nif)
+    void bhkRigidBody::read(NIFStream* nif)
     {
         bhkEntity::read(nif);
         mInfo.read(nif);
diff --git a/components/nif/physics.hpp b/components/nif/physics.hpp
index 184aec2240..ef4df5899a 100644
--- a/components/nif/physics.hpp
+++ b/components/nif/physics.hpp
@@ -4,9 +4,9 @@
 #include "record.hpp"
 #include "recordptr.hpp"
 
+#include <osg/Quat>
 #include <osg/Vec3f>
 #include <osg/Vec4f>
-#include <osg/Quat>
 
 #include <cstdint>
 #include <vector>
@@ -16,340 +16,342 @@
 namespace Nif
 {
 
-class NIFStream;
-class NIFFile;
+    class NIFStream;
+    class NIFFile;
 
-/// Non-record data types
+    /// Non-record data types
 
-struct bhkWorldObjCInfoProperty
-{
-    unsigned int mData;
-    unsigned int mSize;
-    unsigned int mCapacityAndFlags;
-    void read(NIFStream *nif);
-};
+    struct bhkWorldObjCInfoProperty
+    {
+        unsigned int mData;
+        unsigned int mSize;
+        unsigned int mCapacityAndFlags;
+        void read(NIFStream* nif);
+    };
 
-enum class BroadPhaseType : uint8_t
-{
-    BroadPhase_Invalid = 0,
-    BroadPhase_Entity = 1,
-    BroadPhase_Phantom = 2,
-    BroadPhase_Border = 3
-};
+    enum class BroadPhaseType : uint8_t
+    {
+        BroadPhase_Invalid = 0,
+        BroadPhase_Entity = 1,
+        BroadPhase_Phantom = 2,
+        BroadPhase_Border = 3
+    };
 
-struct bhkWorldObjectCInfo
-{
-    BroadPhaseType mPhaseType;
-    bhkWorldObjCInfoProperty mProperty;
-    void read(NIFStream *nif);
-};
+    struct bhkWorldObjectCInfo
+    {
+        BroadPhaseType mPhaseType;
+        bhkWorldObjCInfoProperty mProperty;
+        void read(NIFStream* nif);
+    };
 
-struct HavokMaterial
-{
-    unsigned int mMaterial;
-    void read(NIFStream *nif);
-};
+    struct HavokMaterial
+    {
+        unsigned int mMaterial;
+        void read(NIFStream* nif);
+    };
 
-struct HavokFilter
-{
-    unsigned char mLayer;
-    unsigned char mFlags;
-    unsigned short mGroup;
-    void read(NIFStream *nif);
-};
+    struct HavokFilter
+    {
+        unsigned char mLayer;
+        unsigned char mFlags;
+        unsigned short mGroup;
+        void read(NIFStream* nif);
+    };
 
-struct hkSubPartData
-{
-    HavokMaterial mHavokMaterial;
-    unsigned int mNumVertices;
-    HavokFilter mHavokFilter;
-    void read(NIFStream *nif);
-};
+    struct hkSubPartData
+    {
+        HavokMaterial mHavokMaterial;
+        unsigned int mNumVertices;
+        HavokFilter mHavokFilter;
+        void read(NIFStream* nif);
+    };
 
-enum class hkResponseType : uint8_t
-{
-    Response_Invalid = 0,
-    Response_SimpleContact = 1,
-    Response_Reporting = 2,
-    Response_None = 3
-};
+    enum class hkResponseType : uint8_t
+    {
+        Response_Invalid = 0,
+        Response_SimpleContact = 1,
+        Response_Reporting = 2,
+        Response_None = 3
+    };
 
-struct bhkEntityCInfo
-{
-    hkResponseType mResponseType;
-    unsigned short mProcessContactDelay;
-    void read(NIFStream *nif);
-};
+    struct bhkEntityCInfo
+    {
+        hkResponseType mResponseType;
+        unsigned short mProcessContactDelay;
+        void read(NIFStream* nif);
+    };
 
-struct hkpMoppCode
-{
-    osg::Vec4f mOffset;
-    std::vector<char> mData;
-    void read(NIFStream *nif);
-};
+    struct hkpMoppCode
+    {
+        osg::Vec4f mOffset;
+        std::vector<char> mData;
+        void read(NIFStream* nif);
+    };
 
-struct TriangleData
-{
-    unsigned short mTriangle[3];
-    unsigned short mWeldingInfo;
-    osg::Vec3f mNormal;
-    void read(NIFStream *nif);
-};
+    struct TriangleData
+    {
+        unsigned short mTriangle[3];
+        unsigned short mWeldingInfo;
+        osg::Vec3f mNormal;
+        void read(NIFStream* nif);
+    };
 
-enum class hkMotionType : uint8_t
-{
-    Motion_Invalid = 0,
-    Motion_Dynamic = 1,
-    Motion_SphereInertia = 2,
-    Motion_SphereStabilized = 3,
-    Motion_BoxInertia = 4,
-    Motion_BoxStabilized = 5,
-    Motion_Keyframed = 6,
-    Motion_Fixed = 7,
-    Motion_ThinBox = 8,
-    Motion_Character = 9
-};
-
-enum class hkDeactivatorType : uint8_t
-{
-    Deactivator_Invalid = 0,
-    Deactivator_Never = 1,
-    Deactivator_Spatial = 2
-};
+    enum class hkMotionType : uint8_t
+    {
+        Motion_Invalid = 0,
+        Motion_Dynamic = 1,
+        Motion_SphereInertia = 2,
+        Motion_SphereStabilized = 3,
+        Motion_BoxInertia = 4,
+        Motion_BoxStabilized = 5,
+        Motion_Keyframed = 6,
+        Motion_Fixed = 7,
+        Motion_ThinBox = 8,
+        Motion_Character = 9
+    };
+
+    enum class hkDeactivatorType : uint8_t
+    {
+        Deactivator_Invalid = 0,
+        Deactivator_Never = 1,
+        Deactivator_Spatial = 2
+    };
 
-enum class hkSolverDeactivation : uint8_t
-{
-    SolverDeactivation_Invalid = 0,
-    SolverDeactivation_Off = 1,
-    SolverDeactivation_Low = 2,
-    SolverDeactivation_Medium = 3,
-    SolverDeactivation_High = 4,
-    SolverDeactivation_Max = 5
-};
-
-enum class hkQualityType : uint8_t
-{
-    Quality_Invalid = 0,
-    Quality_Fixed = 1,
-    Quality_Keyframed = 2,
-    Quality_Debris = 3,
-    Quality_Moving = 4,
-    Quality_Critical = 5,
-    Quality_Bullet = 6,
-    Quality_User = 7,
-    Quality_Character = 8,
-    Quality_KeyframedReport = 9
-};
-
-struct bhkRigidBodyCInfo
-{
-    HavokFilter mHavokFilter;
-    hkResponseType mResponseType;
-    unsigned short mProcessContactDelay;
-    osg::Vec4f mTranslation;
-    osg::Quat mRotation;
-    osg::Vec4f mLinearVelocity;
-    osg::Vec4f mAngularVelocity;
-    float mInertiaTensor[3][4];
-    osg::Vec4f mCenter;
-    float mMass;
-    float mLinearDamping;
-    float mAngularDamping;
-    float mTimeFactor{1.f};
-    float mGravityFactor{1.f};
-    float mFriction;
-    float mRollingFrictionMult;
-    float mRestitution;
-    float mMaxLinearVelocity;
-    float mMaxAngularVelocity;
-    float mPenetrationDepth;
-    hkMotionType mMotionType;
-    hkDeactivatorType mDeactivatorType;
-    bool mEnableDeactivation{true};
-    hkSolverDeactivation mSolverDeactivation;
-    hkQualityType mQualityType;
-    unsigned char mAutoRemoveLevel;
-    unsigned char mResponseModifierFlags;
-    unsigned char mNumContactPointShapeKeys;
-    bool mForceCollidedOntoPPU;
-    void read(NIFStream *nif);
-};
-
-/// Record types
-
-// Abstract Bethesda Havok object
-struct bhkRefObject : public Record {};
-
-// Abstract serializable Bethesda Havok object
-struct bhkSerializable : public bhkRefObject {};
-
-// Abstract narrowphase collision detection object
-struct bhkShape : public bhkSerializable {};
-
-// Abstract bhkShape collection
-struct bhkShapeCollection : public bhkShape {};
-
-// Generic collision object
-struct NiCollisionObject : public Record
-{
-    // The node that references this object
-    NodePtr mTarget;
+    enum class hkSolverDeactivation : uint8_t
+    {
+        SolverDeactivation_Invalid = 0,
+        SolverDeactivation_Off = 1,
+        SolverDeactivation_Low = 2,
+        SolverDeactivation_Medium = 3,
+        SolverDeactivation_High = 4,
+        SolverDeactivation_Max = 5
+    };
+
+    enum class hkQualityType : uint8_t
+    {
+        Quality_Invalid = 0,
+        Quality_Fixed = 1,
+        Quality_Keyframed = 2,
+        Quality_Debris = 3,
+        Quality_Moving = 4,
+        Quality_Critical = 5,
+        Quality_Bullet = 6,
+        Quality_User = 7,
+        Quality_Character = 8,
+        Quality_KeyframedReport = 9
+    };
+
+    struct bhkRigidBodyCInfo
+    {
+        HavokFilter mHavokFilter;
+        hkResponseType mResponseType;
+        unsigned short mProcessContactDelay;
+        osg::Vec4f mTranslation;
+        osg::Quat mRotation;
+        osg::Vec4f mLinearVelocity;
+        osg::Vec4f mAngularVelocity;
+        float mInertiaTensor[3][4];
+        osg::Vec4f mCenter;
+        float mMass;
+        float mLinearDamping;
+        float mAngularDamping;
+        float mTimeFactor{ 1.f };
+        float mGravityFactor{ 1.f };
+        float mFriction;
+        float mRollingFrictionMult;
+        float mRestitution;
+        float mMaxLinearVelocity;
+        float mMaxAngularVelocity;
+        float mPenetrationDepth;
+        hkMotionType mMotionType;
+        hkDeactivatorType mDeactivatorType;
+        bool mEnableDeactivation{ true };
+        hkSolverDeactivation mSolverDeactivation;
+        hkQualityType mQualityType;
+        unsigned char mAutoRemoveLevel;
+        unsigned char mResponseModifierFlags;
+        unsigned char mNumContactPointShapeKeys;
+        bool mForceCollidedOntoPPU;
+        void read(NIFStream* nif);
+    };
+
+    /// Record types
+
+    // Abstract Bethesda Havok object
+    struct bhkRefObject : public Record
+    {
+    };
 
-    void read(NIFStream *nif) override
+    // Abstract serializable Bethesda Havok object
+    struct bhkSerializable : public bhkRefObject
     {
-        mTarget.read(nif);
-    }
-    void post(NIFFile *nif) override
+    };
+
+    // Abstract narrowphase collision detection object
+    struct bhkShape : public bhkSerializable
     {
-        mTarget.post(nif);
-    }
-};
+    };
 
-// Bethesda Havok-specific collision object
-struct bhkCollisionObject : public NiCollisionObject
-{
-    unsigned short mFlags;
-    bhkWorldObjectPtr mBody;
+    // Abstract bhkShape collection
+    struct bhkShapeCollection : public bhkShape
+    {
+    };
 
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override
+    // Generic collision object
+    struct NiCollisionObject : public Record
     {
-        NiCollisionObject::post(nif);
-        mBody.post(nif);
-    }
-};
+        // The node that references this object
+        NodePtr mTarget;
 
-// Abstract Havok shape info record
-struct bhkWorldObject : public bhkSerializable
-{
-    bhkShapePtr mShape;
-    HavokFilter mHavokFilter;
-    bhkWorldObjectCInfo mWorldObjectInfo;
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
-
-// Abstract
-struct bhkEntity : public bhkWorldObject
-{
-    bhkEntityCInfo mInfo;
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override { mTarget.read(nif); }
+        void post(NIFFile* nif) override { mTarget.post(nif); }
+    };
 
-// Bethesda extension of hkpBvTreeShape
-// hkpBvTreeShape adds a bounding volume tree to an hkpShapeCollection
-struct bhkBvTreeShape : public bhkShape
-{
-    bhkShapePtr mShape;
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
+    // Bethesda Havok-specific collision object
+    struct bhkCollisionObject : public NiCollisionObject
+    {
+        unsigned short mFlags;
+        bhkWorldObjectPtr mBody;
+
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override
+        {
+            NiCollisionObject::post(nif);
+            mBody.post(nif);
+        }
+    };
+
+    // Abstract Havok shape info record
+    struct bhkWorldObject : public bhkSerializable
+    {
+        bhkShapePtr mShape;
+        HavokFilter mHavokFilter;
+        bhkWorldObjectCInfo mWorldObjectInfo;
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
+
+    // Abstract
+    struct bhkEntity : public bhkWorldObject
+    {
+        bhkEntityCInfo mInfo;
+        void read(NIFStream* nif) override;
+    };
 
-// bhkBvTreeShape with Havok MOPP code
-struct bhkMoppBvTreeShape : public bhkBvTreeShape
-{
-    float mScale;
-    hkpMoppCode mMopp;
-    void read(NIFStream *nif) override;
-};
+    // Bethesda extension of hkpBvTreeShape
+    // hkpBvTreeShape adds a bounding volume tree to an hkpShapeCollection
+    struct bhkBvTreeShape : public bhkShape
+    {
+        bhkShapePtr mShape;
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
-// Bethesda triangle strip-based Havok shape collection
-struct bhkNiTriStripsShape : public bhkShape
-{
-    HavokMaterial mHavokMaterial;
-    float mRadius;
-    unsigned int mGrowBy;
-    osg::Vec4f mScale{1.f, 1.f, 1.f, 0.f};
-    NiTriStripsDataList mData;
-    std::vector<unsigned int> mFilters;
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
-
-// Bethesda packed triangle strip-based Havok shape collection
-struct bhkPackedNiTriStripsShape : public bhkShapeCollection
-{
-    std::vector<hkSubPartData> mSubshapes;
-    unsigned int mUserData;
-    float mRadius;
-    osg::Vec4f mScale;
-    hkPackedNiTriStripsDataPtr mData;
-
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
-
-// bhkPackedNiTriStripsShape data block
-struct hkPackedNiTriStripsData : public bhkShapeCollection
-{
-    std::vector<TriangleData> mTriangles;
-    std::vector<osg::Vec3f> mVertices;
-    std::vector<hkSubPartData> mSubshapes;
-    void read(NIFStream *nif) override;
-};
-
-// Abstract
-struct bhkSphereRepShape : public bhkShape
-{
-    HavokMaterial mHavokMaterial;
-    void read(NIFStream *nif) override;
-};
+    // bhkBvTreeShape with Havok MOPP code
+    struct bhkMoppBvTreeShape : public bhkBvTreeShape
+    {
+        float mScale;
+        hkpMoppCode mMopp;
+        void read(NIFStream* nif) override;
+    };
 
-// Abstract
-struct bhkConvexShape : public bhkSphereRepShape
-{
-    float mRadius;
-    void read(NIFStream *nif) override;
-};
+    // Bethesda triangle strip-based Havok shape collection
+    struct bhkNiTriStripsShape : public bhkShape
+    {
+        HavokMaterial mHavokMaterial;
+        float mRadius;
+        unsigned int mGrowBy;
+        osg::Vec4f mScale{ 1.f, 1.f, 1.f, 0.f };
+        NiTriStripsDataList mData;
+        std::vector<unsigned int> mFilters;
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
+
+    // Bethesda packed triangle strip-based Havok shape collection
+    struct bhkPackedNiTriStripsShape : public bhkShapeCollection
+    {
+        std::vector<hkSubPartData> mSubshapes;
+        unsigned int mUserData;
+        float mRadius;
+        osg::Vec4f mScale;
+        hkPackedNiTriStripsDataPtr mData;
+
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
+
+    // bhkPackedNiTriStripsShape data block
+    struct hkPackedNiTriStripsData : public bhkShapeCollection
+    {
+        std::vector<TriangleData> mTriangles;
+        std::vector<osg::Vec3f> mVertices;
+        std::vector<hkSubPartData> mSubshapes;
+        void read(NIFStream* nif) override;
+    };
+
+    // Abstract
+    struct bhkSphereRepShape : public bhkShape
+    {
+        HavokMaterial mHavokMaterial;
+        void read(NIFStream* nif) override;
+    };
 
-// A convex shape built from vertices
-struct bhkConvexVerticesShape : public bhkConvexShape
-{
-    bhkWorldObjCInfoProperty mVerticesProperty;
-    bhkWorldObjCInfoProperty mNormalsProperty;
-    std::vector<osg::Vec4f> mVertices;
-    std::vector<osg::Vec4f> mNormals;
-    void read(NIFStream *nif) override;
-};
-
-// A box
-struct bhkBoxShape : public bhkConvexShape
-{
-    osg::Vec3f mExtents;
-    void read(NIFStream *nif) override;
-};
+    // Abstract
+    struct bhkConvexShape : public bhkSphereRepShape
+    {
+        float mRadius;
+        void read(NIFStream* nif) override;
+    };
 
-// A capsule
-struct bhkCapsuleShape : public bhkConvexShape
-{
-    osg::Vec3f mPoint1, mPoint2;
-    float mRadius1, mRadius2;
+    // A convex shape built from vertices
+    struct bhkConvexVerticesShape : public bhkConvexShape
+    {
+        bhkWorldObjCInfoProperty mVerticesProperty;
+        bhkWorldObjCInfoProperty mNormalsProperty;
+        std::vector<osg::Vec4f> mVertices;
+        std::vector<osg::Vec4f> mNormals;
+        void read(NIFStream* nif) override;
+    };
+
+    // A box
+    struct bhkBoxShape : public bhkConvexShape
+    {
+        osg::Vec3f mExtents;
+        void read(NIFStream* nif) override;
+    };
 
-    void read(NIFStream *nif) override;
-};
+    // A capsule
+    struct bhkCapsuleShape : public bhkConvexShape
+    {
+        osg::Vec3f mPoint1, mPoint2;
+        float mRadius1, mRadius2;
 
-// A sphere
-using bhkSphereShape = bhkConvexShape;
+        void read(NIFStream* nif) override;
+    };
 
-// A list of shapes
-struct bhkListShape : public bhkShapeCollection
-{
-    bhkShapeList mSubshapes;
-    HavokMaterial mHavokMaterial;
-    bhkWorldObjCInfoProperty mChildShapeProperty;
-    bhkWorldObjCInfoProperty mChildFilterProperty;
-    std::vector<HavokFilter> mHavokFilters;
-    void read(NIFStream *nif) override;
-};
-
-struct bhkRigidBody : public bhkEntity
-{
-    bhkRigidBodyCInfo mInfo;
-    bhkSerializableList mConstraints;
-    unsigned int mBodyFlags;
+    // A sphere
+    using bhkSphereShape = bhkConvexShape;
+
+    // A list of shapes
+    struct bhkListShape : public bhkShapeCollection
+    {
+        bhkShapeList mSubshapes;
+        HavokMaterial mHavokMaterial;
+        bhkWorldObjCInfoProperty mChildShapeProperty;
+        bhkWorldObjCInfoProperty mChildFilterProperty;
+        std::vector<HavokFilter> mHavokFilters;
+        void read(NIFStream* nif) override;
+    };
+
+    struct bhkRigidBody : public bhkEntity
+    {
+        bhkRigidBodyCInfo mInfo;
+        bhkSerializableList mConstraints;
+        unsigned int mBodyFlags;
 
-    void read(NIFStream *nif) override;
-};
+        void read(NIFStream* nif) override;
+    };
 
 } // Namespace
 #endif
diff --git a/components/nif/property.cpp b/components/nif/property.cpp
index ee47e8ccbe..be1c59297f 100644
--- a/components/nif/property.cpp
+++ b/components/nif/property.cpp
@@ -1,268 +1,268 @@
 #include "property.hpp"
 
-#include "data.hpp"
 #include "controlled.hpp"
+#include "data.hpp"
 
 namespace Nif
 {
 
-void NiTexturingProperty::Texture::read(NIFStream *nif)
-{
-    inUse = nif->getBoolean();
-    if(!inUse) return;
-
-    texture.read(nif);
-    if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
-    {
-        clamp = nif->getInt();
-        nif->skip(4); // Filter mode. Ignoring because global filtering settings are more sensible
-    }
-    else
+    void NiTexturingProperty::Texture::read(NIFStream* nif)
     {
-        clamp = nif->getUShort() & 0xF;
-    }
-    // Max anisotropy. I assume we'll always only use the global anisotropy setting.
-    if (nif->getVersion() >= NIFStream::generateVersion(20,5,0,4))
-        nif->getUShort();
+        inUse = nif->getBoolean();
+        if (!inUse)
+            return;
+
+        texture.read(nif);
+        if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
+        {
+            clamp = nif->getInt();
+            nif->skip(4); // Filter mode. Ignoring because global filtering settings are more sensible
+        }
+        else
+        {
+            clamp = nif->getUShort() & 0xF;
+        }
+        // Max anisotropy. I assume we'll always only use the global anisotropy setting.
+        if (nif->getVersion() >= NIFStream::generateVersion(20, 5, 0, 4))
+            nif->getUShort();
 
-    if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
-        uvSet = nif->getUInt();
+        if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
+            uvSet = nif->getUInt();
 
-    // Two PS2-specific shorts.
-    if (nif->getVersion() < NIFStream::generateVersion(10,4,0,2))
-        nif->skip(4);
-    if (nif->getVersion() <= NIFStream::generateVersion(4,1,0,18))
-        nif->skip(2); // Unknown short
-    else if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
-    {
-        if (nif->getBoolean()) // Has texture transform
+        // Two PS2-specific shorts.
+        if (nif->getVersion() < NIFStream::generateVersion(10, 4, 0, 2))
+            nif->skip(4);
+        if (nif->getVersion() <= NIFStream::generateVersion(4, 1, 0, 18))
+            nif->skip(2); // Unknown short
+        else if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
         {
-            nif->getVector2(); // UV translation
-            nif->getVector2(); // UV scale
-            nif->getFloat(); // W axis rotation
-            nif->getUInt(); // Transform method
-            nif->getVector2(); // Texture rotation origin
+            if (nif->getBoolean()) // Has texture transform
+            {
+                nif->getVector2(); // UV translation
+                nif->getVector2(); // UV scale
+                nif->getFloat(); // W axis rotation
+                nif->getUInt(); // Transform method
+                nif->getVector2(); // Texture rotation origin
+            }
         }
     }
-}
 
-void NiTexturingProperty::Texture::post(NIFFile *nif)
-{
-    texture.post(nif);
-}
+    void NiTexturingProperty::Texture::post(NIFFile* nif)
+    {
+        texture.post(nif);
+    }
 
-void NiTexturingProperty::read(NIFStream *nif)
-{
-    Property::read(nif);
-    if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB_OLD || nif->getVersion() >= NIFStream::generateVersion(20,1,0,2))
-        flags = nif->getUShort();
-    if (nif->getVersion() <= NIFStream::generateVersion(20,1,0,1))
-        apply = nif->getUInt();
+    void NiTexturingProperty::read(NIFStream* nif)
+    {
+        Property::read(nif);
+        if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB_OLD
+            || nif->getVersion() >= NIFStream::generateVersion(20, 1, 0, 2))
+            flags = nif->getUShort();
+        if (nif->getVersion() <= NIFStream::generateVersion(20, 1, 0, 1))
+            apply = nif->getUInt();
 
-    unsigned int numTextures = nif->getUInt();
+        unsigned int numTextures = nif->getUInt();
 
-    if (!numTextures)
-        return;
+        if (!numTextures)
+            return;
 
-    textures.resize(numTextures);
-    for (unsigned int i = 0; i < numTextures; i++)
-    {
-        textures[i].read(nif);
-        if (i == 5 && textures[5].inUse) // Bump map settings
+        textures.resize(numTextures);
+        for (unsigned int i = 0; i < numTextures; i++)
         {
-            envMapLumaBias = nif->getVector2();
-            bumpMapMatrix = nif->getVector4();
+            textures[i].read(nif);
+            if (i == 5 && textures[5].inUse) // Bump map settings
+            {
+                envMapLumaBias = nif->getVector2();
+                bumpMapMatrix = nif->getVector4();
+            }
+            else if (i == 7 && textures[7].inUse && nif->getVersion() >= NIFStream::generateVersion(20, 2, 0, 5))
+                /*float parallaxOffset = */ nif->getFloat();
         }
-        else if (i == 7 && textures[7].inUse && nif->getVersion() >= NIFStream::generateVersion(20,2,0,5))
-            /*float parallaxOffset = */nif->getFloat();
-    }
 
-    if (nif->getVersion() >= NIFStream::generateVersion(10,0,1,0))
-    {
-        unsigned int numShaderTextures = nif->getUInt();
-        shaderTextures.resize(numShaderTextures);
-        for (unsigned int i = 0; i < numShaderTextures; i++)
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 0, 1, 0))
         {
-            shaderTextures[i].read(nif);
-            if (shaderTextures[i].inUse)
-                nif->getUInt(); // Unique identifier
+            unsigned int numShaderTextures = nif->getUInt();
+            shaderTextures.resize(numShaderTextures);
+            for (unsigned int i = 0; i < numShaderTextures; i++)
+            {
+                shaderTextures[i].read(nif);
+                if (shaderTextures[i].inUse)
+                    nif->getUInt(); // Unique identifier
+            }
         }
     }
-}
-
-void NiTexturingProperty::post(NIFFile *nif)
-{
-    Property::post(nif);
-    for (size_t i = 0; i < textures.size(); i++)
-        textures[i].post(nif);
-    for (size_t i = 0; i < shaderTextures.size(); i++)
-        shaderTextures[i].post(nif);
-}
 
-void BSShaderProperty::read(NIFStream *nif)
-{
-    NiShadeProperty::read(nif);
-    if (nif->getBethVersion() <= NIFFile::BethVersion::BETHVER_FO3)
+    void NiTexturingProperty::post(NIFFile* nif)
     {
-        type = nif->getUInt();
-        flags1 = nif->getUInt();
-        flags2 = nif->getUInt();
-        envMapIntensity = nif->getFloat();
+        Property::post(nif);
+        for (size_t i = 0; i < textures.size(); i++)
+            textures[i].post(nif);
+        for (size_t i = 0; i < shaderTextures.size(); i++)
+            shaderTextures[i].post(nif);
     }
-}
 
-void BSShaderLightingProperty::read(NIFStream *nif)
-{
-    BSShaderProperty::read(nif);
-    if (nif->getBethVersion() <= NIFFile::BethVersion::BETHVER_FO3)
-        clamp = nif->getUInt();
-}
-
-void BSShaderPPLightingProperty::read(NIFStream *nif)
-{
-    BSShaderLightingProperty::read(nif);
-    textureSet.read(nif);
-    if (nif->getBethVersion() <= 14)
-        return;
-    refraction.strength = nif->getFloat();
-    refraction.period = nif->getInt();
-    if (nif->getBethVersion() <= 24)
-        return;
-    parallax.passes = nif->getFloat();
-    parallax.scale = nif->getFloat();
-}
-
-void BSShaderPPLightingProperty::post(NIFFile *nif)
-{
-    BSShaderLightingProperty::post(nif);
-    textureSet.post(nif);
-}
+    void BSShaderProperty::read(NIFStream* nif)
+    {
+        NiShadeProperty::read(nif);
+        if (nif->getBethVersion() <= NIFFile::BethVersion::BETHVER_FO3)
+        {
+            type = nif->getUInt();
+            flags1 = nif->getUInt();
+            flags2 = nif->getUInt();
+            envMapIntensity = nif->getFloat();
+        }
+    }
 
-void BSShaderNoLightingProperty::read(NIFStream *nif)
-{
-    BSShaderLightingProperty::read(nif);
-    filename = nif->getSizedString();
-    if (nif->getBethVersion() >= 27)
-        falloffParams = nif->getVector4();
-}
+    void BSShaderLightingProperty::read(NIFStream* nif)
+    {
+        BSShaderProperty::read(nif);
+        if (nif->getBethVersion() <= NIFFile::BethVersion::BETHVER_FO3)
+            clamp = nif->getUInt();
+    }
 
-void BSLightingShaderProperty::read(NIFStream *nif)
-{
-    type = nif->getUInt();
-    BSShaderProperty::read(nif);
-    flags1 = nif->getUInt();
-    flags2 = nif->getUInt();
-    nif->skip(8); // UV offset
-    nif->skip(8); // UV scale
-    mTextureSet.read(nif);
-    mEmissive = nif->getVector3();
-    mEmissiveMult = nif->getFloat();
-    mClamp = nif->getUInt();
-    mAlpha = nif->getFloat();
-    nif->getFloat(); // Refraction strength
-    mGlossiness = nif->getFloat();
-    mSpecular = nif->getVector3();
-    mSpecStrength = nif->getFloat();
-    nif->skip(8); // Lighting effects
-    switch (static_cast<BSLightingShaderType>(type))
+    void BSShaderPPLightingProperty::read(NIFStream* nif)
     {
-        case BSLightingShaderType::ShaderType_EnvMap:
-            nif->skip(4); // Environment map scale
-            break;
-        case BSLightingShaderType::ShaderType_SkinTint:
-        case BSLightingShaderType::ShaderType_HairTint:
-            nif->skip(12); // Tint color
-            break;
-        case BSLightingShaderType::ShaderType_ParallaxOcc:
-            nif->skip(4); // Max passes
-            nif->skip(4); // Scale
-            break;
-        case BSLightingShaderType::ShaderType_MultiLayerParallax:
-            nif->skip(4); // Inner layer thickness
-            nif->skip(4); // Refraction scale
-            nif->skip(8); // Inner layer texture scale
-            nif->skip(4); // Environment map strength
-            break;
-        case BSLightingShaderType::ShaderType_SparkleSnow:
-            nif->skip(16); // Sparkle parameters
-            break;
-        case BSLightingShaderType::ShaderType_EyeEnvmap:
-            nif->skip(4); // Cube map scale
-            nif->skip(12); // Left eye cube map offset
-            nif->skip(12); // Right eye cube map offset
-            break;
-        default:
-            break;
+        BSShaderLightingProperty::read(nif);
+        textureSet.read(nif);
+        if (nif->getBethVersion() <= 14)
+            return;
+        refraction.strength = nif->getFloat();
+        refraction.period = nif->getInt();
+        if (nif->getBethVersion() <= 24)
+            return;
+        parallax.passes = nif->getFloat();
+        parallax.scale = nif->getFloat();
     }
-}
 
-void BSLightingShaderProperty::post(NIFFile *nif)
-{
-    BSShaderProperty::post(nif);
-    mTextureSet.post(nif);
-}
+    void BSShaderPPLightingProperty::post(NIFFile* nif)
+    {
+        BSShaderLightingProperty::post(nif);
+        textureSet.post(nif);
+    }
 
-void NiFogProperty::read(NIFStream *nif)
-{
-    Property::read(nif);
-    mFlags = nif->getUShort();
-    mFogDepth = nif->getFloat();
-    mColour = nif->getVector3();
-}
+    void BSShaderNoLightingProperty::read(NIFStream* nif)
+    {
+        BSShaderLightingProperty::read(nif);
+        filename = nif->getSizedString();
+        if (nif->getBethVersion() >= 27)
+            falloffParams = nif->getVector4();
+    }
 
-void S_MaterialProperty::read(NIFStream *nif)
-{
-    if (nif->getBethVersion() < 26)
+    void BSLightingShaderProperty::read(NIFStream* nif)
     {
-        ambient = nif->getVector3();
-        diffuse = nif->getVector3();
+        type = nif->getUInt();
+        BSShaderProperty::read(nif);
+        flags1 = nif->getUInt();
+        flags2 = nif->getUInt();
+        nif->skip(8); // UV offset
+        nif->skip(8); // UV scale
+        mTextureSet.read(nif);
+        mEmissive = nif->getVector3();
+        mEmissiveMult = nif->getFloat();
+        mClamp = nif->getUInt();
+        mAlpha = nif->getFloat();
+        nif->getFloat(); // Refraction strength
+        mGlossiness = nif->getFloat();
+        mSpecular = nif->getVector3();
+        mSpecStrength = nif->getFloat();
+        nif->skip(8); // Lighting effects
+        switch (static_cast<BSLightingShaderType>(type))
+        {
+            case BSLightingShaderType::ShaderType_EnvMap:
+                nif->skip(4); // Environment map scale
+                break;
+            case BSLightingShaderType::ShaderType_SkinTint:
+            case BSLightingShaderType::ShaderType_HairTint:
+                nif->skip(12); // Tint color
+                break;
+            case BSLightingShaderType::ShaderType_ParallaxOcc:
+                nif->skip(4); // Max passes
+                nif->skip(4); // Scale
+                break;
+            case BSLightingShaderType::ShaderType_MultiLayerParallax:
+                nif->skip(4); // Inner layer thickness
+                nif->skip(4); // Refraction scale
+                nif->skip(8); // Inner layer texture scale
+                nif->skip(4); // Environment map strength
+                break;
+            case BSLightingShaderType::ShaderType_SparkleSnow:
+                nif->skip(16); // Sparkle parameters
+                break;
+            case BSLightingShaderType::ShaderType_EyeEnvmap:
+                nif->skip(4); // Cube map scale
+                nif->skip(12); // Left eye cube map offset
+                nif->skip(12); // Right eye cube map offset
+                break;
+            default:
+                break;
+        }
     }
-    specular = nif->getVector3();
-    emissive = nif->getVector3();
-    glossiness = nif->getFloat();
-    alpha = nif->getFloat();
-    if (nif->getBethVersion() >= 22)
-        emissiveMult = nif->getFloat();
-}
 
-void S_VertexColorProperty::read(NIFStream *nif)
-{
-    vertmode = nif->getInt();
-    lightmode = nif->getInt();
-}
+    void BSLightingShaderProperty::post(NIFFile* nif)
+    {
+        BSShaderProperty::post(nif);
+        mTextureSet.post(nif);
+    }
 
-void S_AlphaProperty::read(NIFStream *nif)
-{
-    threshold = nif->getChar();
-}
+    void NiFogProperty::read(NIFStream* nif)
+    {
+        Property::read(nif);
+        mFlags = nif->getUShort();
+        mFogDepth = nif->getFloat();
+        mColour = nif->getVector3();
+    }
 
-void S_StencilProperty::read(NIFStream *nif)
-{
-    if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
+    void S_MaterialProperty::read(NIFStream* nif)
     {
-        enabled = nif->getChar();
-        compareFunc = nif->getInt();
-        stencilRef = nif->getUInt();
-        stencilMask = nif->getUInt();
-        failAction = nif->getInt();
-        zFailAction = nif->getInt();
-        zPassAction = nif->getInt();
-        drawMode = nif->getInt();
+        if (nif->getBethVersion() < 26)
+        {
+            ambient = nif->getVector3();
+            diffuse = nif->getVector3();
+        }
+        specular = nif->getVector3();
+        emissive = nif->getVector3();
+        glossiness = nif->getFloat();
+        alpha = nif->getFloat();
+        if (nif->getBethVersion() >= 22)
+            emissiveMult = nif->getFloat();
     }
-    else
+
+    void S_VertexColorProperty::read(NIFStream* nif)
     {
-        unsigned short flags = nif->getUShort();
-        enabled = flags & 0x1;
-        failAction = (flags >> 1) & 0x7;
-        zFailAction = (flags >> 4) & 0x7;
-        zPassAction = (flags >> 7) & 0x7;
-        drawMode = (flags >> 10) & 0x3;
-        compareFunc = (flags >> 12) & 0x7;
-        stencilRef = nif->getUInt();
-        stencilMask = nif->getUInt();
+        vertmode = nif->getInt();
+        lightmode = nif->getInt();
     }
-}
 
+    void S_AlphaProperty::read(NIFStream* nif)
+    {
+        threshold = nif->getChar();
+    }
 
+    void S_StencilProperty::read(NIFStream* nif)
+    {
+        if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
+        {
+            enabled = nif->getChar();
+            compareFunc = nif->getInt();
+            stencilRef = nif->getUInt();
+            stencilMask = nif->getUInt();
+            failAction = nif->getInt();
+            zFailAction = nif->getInt();
+            zPassAction = nif->getInt();
+            drawMode = nif->getInt();
+        }
+        else
+        {
+            unsigned short flags = nif->getUShort();
+            enabled = flags & 0x1;
+            failAction = (flags >> 1) & 0x7;
+            zFailAction = (flags >> 4) & 0x7;
+            zPassAction = (flags >> 7) & 0x7;
+            drawMode = (flags >> 10) & 0x3;
+            compareFunc = (flags >> 12) & 0x7;
+            stencilRef = nif->getUInt();
+            stencilMask = nif->getUInt();
+        }
+    }
 
 }
diff --git a/components/nif/property.hpp b/components/nif/property.hpp
index fd7d47402f..5c1eab37e0 100644
--- a/components/nif/property.hpp
+++ b/components/nif/property.hpp
@@ -29,406 +29,410 @@
 namespace Nif
 {
 
-struct Property : public Named { };
-
-struct NiTexturingProperty : public Property
-{
-    unsigned short flags{0u};
+    struct Property : public Named
+    {
+    };
 
-    // A sub-texture
-    struct Texture
+    struct NiTexturingProperty : public Property
     {
-        /* Clamp mode
-        0 - clampS clampT
-        1 - clampS wrapT
-        2 - wrapS clampT
-        3 - wrapS wrapT
+        unsigned short flags{ 0u };
+
+        // A sub-texture
+        struct Texture
+        {
+            /* Clamp mode
+            0 - clampS clampT
+            1 - clampS wrapT
+            2 - wrapS clampT
+            3 - wrapS wrapT
+            */
+
+            bool inUse;
+            NiSourceTexturePtr texture;
+
+            unsigned int clamp, uvSet;
+
+            void read(NIFStream* nif);
+            void post(NIFFile* nif);
+
+            bool wrapT() const { return clamp & 1; }
+            bool wrapS() const { return (clamp >> 1) & 1; }
+        };
+
+        /* Apply mode:
+            0 - replace
+            1 - decal
+            2 - modulate
+            3 - hilight  // These two are for PS2 only?
+            4 - hilight2
         */
+        unsigned int apply{ 0 };
+
+        /*
+         * The textures in this list are as follows:
+         *
+         * 0 - Base texture
+         * 1 - Dark texture
+         * 2 - Detail texture
+         * 3 - Gloss texture
+         * 4 - Glow texture
+         * 5 - Bump map texture
+         * 6 - Decal texture
+         */
+        enum TextureType
+        {
+            BaseTexture = 0,
+            DarkTexture = 1,
+            DetailTexture = 2,
+            GlossTexture = 3,
+            GlowTexture = 4,
+            BumpTexture = 5,
+            DecalTexture = 6,
+        };
+
+        std::vector<Texture> textures;
+        std::vector<Texture> shaderTextures;
+
+        osg::Vec2f envMapLumaBias;
+        osg::Vec4f bumpMapMatrix;
+
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
-        bool inUse;
-        NiSourceTexturePtr texture;
-
-        unsigned int clamp, uvSet;
-
-        void read(NIFStream *nif);
-        void post(NIFFile *nif);
+    struct NiFogProperty : public Property
+    {
+        unsigned short mFlags;
+        float mFogDepth;
+        osg::Vec3f mColour;
 
-        bool wrapT() const { return clamp & 1; }
-        bool wrapS() const { return (clamp >> 1) & 1; }
+        void read(NIFStream* nif) override;
     };
 
-    /* Apply mode:
-        0 - replace
-        1 - decal
-        2 - modulate
-        3 - hilight  // These two are for PS2 only?
-        4 - hilight2
-    */
-    unsigned int apply{0};
-
-    /*
-     * The textures in this list are as follows:
-     *
-     * 0 - Base texture
-     * 1 - Dark texture
-     * 2 - Detail texture
-     * 3 - Gloss texture
-     * 4 - Glow texture
-     * 5 - Bump map texture
-     * 6 - Decal texture
-     */
-    enum TextureType
+    // These contain no other data than the 'flags' field
+    struct NiShadeProperty : public Property
     {
-        BaseTexture = 0,
-        DarkTexture = 1,
-        DetailTexture = 2,
-        GlossTexture = 3,
-        GlowTexture = 4,
-        BumpTexture = 5,
-        DecalTexture = 6,
+        unsigned short flags{ 0u };
+        void read(NIFStream* nif) override
+        {
+            Property::read(nif);
+            if (nif->getBethVersion() <= NIFFile::BethVersion::BETHVER_FO3)
+                flags = nif->getUShort();
+        }
     };
 
-    std::vector<Texture> textures;
-    std::vector<Texture> shaderTextures;
-
-    osg::Vec2f envMapLumaBias;
-    osg::Vec4f bumpMapMatrix;
-
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
-
-struct NiFogProperty : public Property
-{
-    unsigned short mFlags;
-    float mFogDepth;
-    osg::Vec3f mColour;
+    enum class BSShaderType : unsigned int
+    {
+        ShaderType_TallGrass = 0,
+        ShaderType_Default = 1,
+        ShaderType_Sky = 10,
+        ShaderType_Skin = 14,
+        ShaderType_Water = 17,
+        ShaderType_Lighting30 = 29,
+        ShaderType_Tile = 32,
+        ShaderType_NoLighting = 33
+    };
 
-    void read(NIFStream *nif) override;
-};
+    struct BSShaderProperty : public NiShadeProperty
+    {
+        unsigned int type{ 0u }, flags1{ 0u }, flags2{ 0u };
+        float envMapIntensity{ 0.f };
+        void read(NIFStream* nif) override;
+    };
 
-// These contain no other data than the 'flags' field
-struct NiShadeProperty : public Property
-{
-    unsigned short flags{0u};
-    void read(NIFStream *nif) override
+    struct BSShaderLightingProperty : public BSShaderProperty
     {
-        Property::read(nif);
-        if (nif->getBethVersion() <= NIFFile::BethVersion::BETHVER_FO3)
-            flags = nif->getUShort();
-    }
-};
+        unsigned int clamp{ 0u };
+        void read(NIFStream* nif) override;
 
+        bool wrapT() const { return clamp & 1; }
+        bool wrapS() const { return (clamp >> 1) & 1; }
+    };
 
-enum class BSShaderType : unsigned int
-{
-    ShaderType_TallGrass = 0,
-    ShaderType_Default = 1,
-    ShaderType_Sky = 10,
-    ShaderType_Skin = 14,
-    ShaderType_Water = 17,
-    ShaderType_Lighting30 = 29,
-    ShaderType_Tile = 32,
-    ShaderType_NoLighting = 33
-};
-
-struct BSShaderProperty : public NiShadeProperty
-{
-    unsigned int type{0u}, flags1{0u}, flags2{0u};
-    float envMapIntensity{0.f};
-    void read(NIFStream *nif) override;
-};
+    struct BSShaderPPLightingProperty : public BSShaderLightingProperty
+    {
+        BSShaderTextureSetPtr textureSet;
+        struct RefractionSettings
+        {
+            float strength{ 0.f };
+            int period{ 0 };
+        };
+        struct ParallaxSettings
+        {
+            float passes{ 0.f };
+            float scale{ 0.f };
+        };
+        RefractionSettings refraction;
+        ParallaxSettings parallax;
+
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
+    };
 
-struct BSShaderLightingProperty : public BSShaderProperty
-{
-    unsigned int clamp{0u};
-    void read(NIFStream *nif) override;
+    struct BSShaderNoLightingProperty : public BSShaderLightingProperty
+    {
+        std::string filename;
+        osg::Vec4f falloffParams;
 
-    bool wrapT() const { return clamp & 1; }
-    bool wrapS() const { return (clamp >> 1) & 1; }
-};
+        void read(NIFStream* nif) override;
+    };
 
-struct BSShaderPPLightingProperty : public BSShaderLightingProperty
-{
-    BSShaderTextureSetPtr textureSet;
-    struct RefractionSettings
+    enum class BSLightingShaderType : unsigned int
     {
-        float strength{0.f};
-        int period{0};
+        ShaderType_Default = 0,
+        ShaderType_EnvMap = 1,
+        ShaderType_Glow = 2,
+        ShaderType_Parallax = 3,
+        ShaderType_FaceTint = 4,
+        ShaderType_SkinTint = 5,
+        ShaderType_HairTint = 6,
+        ShaderType_ParallaxOcc = 7,
+        ShaderType_MultitexLand = 8,
+        ShaderType_LODLand = 9,
+        ShaderType_Snow = 10,
+        ShaderType_MultiLayerParallax = 11,
+        ShaderType_TreeAnim = 12,
+        ShaderType_LODObjects = 13,
+        ShaderType_SparkleSnow = 14,
+        ShaderType_LODObjectsHD = 15,
+        ShaderType_EyeEnvmap = 16,
+        ShaderType_Cloud = 17,
+        ShaderType_LODNoise = 18,
+        ShaderType_MultitexLandLODBlend = 19,
+        ShaderType_Dismemberment = 20
     };
-    struct ParallaxSettings
+
+    struct BSLightingShaderProperty : public BSShaderProperty
     {
-        float passes{0.f};
-        float scale{0.f};
+        BSShaderTextureSetPtr mTextureSet;
+        unsigned int mClamp{ 0u };
+        float mAlpha;
+        float mGlossiness;
+        osg::Vec3f mEmissive, mSpecular;
+        float mEmissiveMult, mSpecStrength;
+
+        void read(NIFStream* nif) override;
+        void post(NIFFile* nif) override;
     };
-    RefractionSettings refraction;
-    ParallaxSettings parallax;
-
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
 
-struct BSShaderNoLightingProperty : public BSShaderLightingProperty
-{
-    std::string filename;
-    osg::Vec4f falloffParams;
-
-    void read(NIFStream *nif) override;
-};
-
-enum class BSLightingShaderType : unsigned int
-{
-    ShaderType_Default = 0,
-    ShaderType_EnvMap = 1,
-    ShaderType_Glow = 2,
-    ShaderType_Parallax = 3,
-    ShaderType_FaceTint = 4,
-    ShaderType_SkinTint = 5,
-    ShaderType_HairTint = 6,
-    ShaderType_ParallaxOcc = 7,
-    ShaderType_MultitexLand = 8,
-    ShaderType_LODLand = 9,
-    ShaderType_Snow = 10,
-    ShaderType_MultiLayerParallax = 11,
-    ShaderType_TreeAnim = 12,
-    ShaderType_LODObjects = 13,
-    ShaderType_SparkleSnow = 14,
-    ShaderType_LODObjectsHD = 15,
-    ShaderType_EyeEnvmap = 16,
-    ShaderType_Cloud = 17,
-    ShaderType_LODNoise = 18,
-    ShaderType_MultitexLandLODBlend = 19,
-    ShaderType_Dismemberment = 20
-};
-
-struct BSLightingShaderProperty : public BSShaderProperty
-{
-    BSShaderTextureSetPtr mTextureSet;
-    unsigned int mClamp{0u};
-    float mAlpha;
-    float mGlossiness;
-    osg::Vec3f mEmissive, mSpecular;
-    float mEmissiveMult, mSpecStrength;
-
-    void read(NIFStream *nif) override;
-    void post(NIFFile *nif) override;
-};
-
-struct NiDitherProperty : public Property
-{
-    unsigned short flags;
-    void read(NIFStream* nif) override
+    struct NiDitherProperty : public Property
     {
-        Property::read(nif);
-        flags = nif->getUShort();
-    }
-};
+        unsigned short flags;
+        void read(NIFStream* nif) override
+        {
+            Property::read(nif);
+            flags = nif->getUShort();
+        }
+    };
 
-struct NiZBufferProperty : public Property
-{
-    unsigned short flags;
-    unsigned int testFunction;
-    void read(NIFStream *nif) override
+    struct NiZBufferProperty : public Property
     {
-        Property::read(nif);
-        flags = nif->getUShort();
-        testFunction = (flags >> 2) & 0x7;
-        if (nif->getVersion() >= NIFStream::generateVersion(4,1,0,12) && nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
-            testFunction = nif->getUInt();
-    }
+        unsigned short flags;
+        unsigned int testFunction;
+        void read(NIFStream* nif) override
+        {
+            Property::read(nif);
+            flags = nif->getUShort();
+            testFunction = (flags >> 2) & 0x7;
+            if (nif->getVersion() >= NIFStream::generateVersion(4, 1, 0, 12)
+                && nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
+                testFunction = nif->getUInt();
+        }
 
-    bool depthTest() const { return flags & 1; }
+        bool depthTest() const { return flags & 1; }
 
-    bool depthWrite() const { return (flags >> 1) & 1; }
-};
+        bool depthWrite() const { return (flags >> 1) & 1; }
+    };
 
-struct NiSpecularProperty : public Property
-{
-    unsigned short flags;
-    void read(NIFStream* nif) override
+    struct NiSpecularProperty : public Property
     {
-        Property::read(nif);
-        flags = nif->getUShort();
-    }
+        unsigned short flags;
+        void read(NIFStream* nif) override
+        {
+            Property::read(nif);
+            flags = nif->getUShort();
+        }
 
-    bool isEnabled() const { return flags & 1; }
-};
+        bool isEnabled() const { return flags & 1; }
+    };
 
-struct NiWireframeProperty : public Property
-{
-    unsigned short flags;
-    void read(NIFStream* nif) override
+    struct NiWireframeProperty : public Property
     {
-        Property::read(nif);
-        flags = nif->getUShort();
-    }
-
-    bool isEnabled() const { return flags & 1; }
-};
+        unsigned short flags;
+        void read(NIFStream* nif) override
+        {
+            Property::read(nif);
+            flags = nif->getUShort();
+        }
 
-// The rest are all struct-based
-template <typename T>
-struct StructPropT : Property
-{
-    T data;
-    unsigned short flags;
+        bool isEnabled() const { return flags & 1; }
+    };
 
-    void read(NIFStream *nif) override
+    // The rest are all struct-based
+    template <typename T>
+    struct StructPropT : Property
     {
-        Property::read(nif);
-        flags = nif->getUShort();
-        data.read(nif);
-    }
-};
+        T data;
+        unsigned short flags;
 
-struct S_MaterialProperty
-{
-    // The vector components are R,G,B
-    osg::Vec3f ambient{1.f,1.f,1.f}, diffuse{1.f,1.f,1.f};
-    osg::Vec3f specular, emissive;
-    float glossiness{0.f}, alpha{0.f}, emissiveMult{1.f};
+        void read(NIFStream* nif) override
+        {
+            Property::read(nif);
+            flags = nif->getUShort();
+            data.read(nif);
+        }
+    };
 
-    void read(NIFStream *nif);
-};
+    struct S_MaterialProperty
+    {
+        // The vector components are R,G,B
+        osg::Vec3f ambient{ 1.f, 1.f, 1.f }, diffuse{ 1.f, 1.f, 1.f };
+        osg::Vec3f specular, emissive;
+        float glossiness{ 0.f }, alpha{ 0.f }, emissiveMult{ 1.f };
 
-struct S_VertexColorProperty
-{
-    /* Vertex mode:
-        0 - source ignore
-        1 - source emmisive
-        2 - source amb diff
+        void read(NIFStream* nif);
+    };
 
-        Lighting mode
-        0 - lighting emmisive
-        1 - lighting emmisive ambient/diffuse
-    */
-    int vertmode, lightmode;
+    struct S_VertexColorProperty
+    {
+        /* Vertex mode:
+            0 - source ignore
+            1 - source emmisive
+            2 - source amb diff
+
+            Lighting mode
+            0 - lighting emmisive
+            1 - lighting emmisive ambient/diffuse
+        */
+        int vertmode, lightmode;
 
-    void read(NIFStream *nif);
-};
+        void read(NIFStream* nif);
+    };
 
-struct S_AlphaProperty
-{
-    /*
-        NiAlphaProperty blend modes (glBlendFunc):
-        0000 GL_ONE
-        0001 GL_ZERO
-        0010 GL_SRC_COLOR
-        0011 GL_ONE_MINUS_SRC_COLOR
-        0100 GL_DST_COLOR
-        0101 GL_ONE_MINUS_DST_COLOR
-        0110 GL_SRC_ALPHA
-        0111 GL_ONE_MINUS_SRC_ALPHA
-        1000 GL_DST_ALPHA
-        1001 GL_ONE_MINUS_DST_ALPHA
-        1010 GL_SRC_ALPHA_SATURATE
-
-        test modes (glAlphaFunc):
-        000 GL_ALWAYS
-        001 GL_LESS
-        010 GL_EQUAL
-        011 GL_LEQUAL
-        100 GL_GREATER
-        101 GL_NOTEQUAL
-        110 GL_GEQUAL
-        111 GL_NEVER
-
-        Taken from:
-        http://niftools.sourceforge.net/doc/nif/NiAlphaProperty.html
-    */
-
-    // Tested against when certain flags are set (see above.)
-    unsigned char threshold;
-
-    void read(NIFStream *nif);
-};
+    struct S_AlphaProperty
+    {
+        /*
+            NiAlphaProperty blend modes (glBlendFunc):
+            0000 GL_ONE
+            0001 GL_ZERO
+            0010 GL_SRC_COLOR
+            0011 GL_ONE_MINUS_SRC_COLOR
+            0100 GL_DST_COLOR
+            0101 GL_ONE_MINUS_DST_COLOR
+            0110 GL_SRC_ALPHA
+            0111 GL_ONE_MINUS_SRC_ALPHA
+            1000 GL_DST_ALPHA
+            1001 GL_ONE_MINUS_DST_ALPHA
+            1010 GL_SRC_ALPHA_SATURATE
+
+            test modes (glAlphaFunc):
+            000 GL_ALWAYS
+            001 GL_LESS
+            010 GL_EQUAL
+            011 GL_LEQUAL
+            100 GL_GREATER
+            101 GL_NOTEQUAL
+            110 GL_GEQUAL
+            111 GL_NEVER
+
+            Taken from:
+            http://niftools.sourceforge.net/doc/nif/NiAlphaProperty.html
+        */
 
-/*
-    Docs taken from:
-    http://niftools.sourceforge.net/doc/nif/NiStencilProperty.html
- */
-struct S_StencilProperty
-{
-    // Is stencil test enabled?
-    unsigned char enabled;
+        // Tested against when certain flags are set (see above.)
+        unsigned char threshold;
+
+        void read(NIFStream* nif);
+    };
 
     /*
-        0   TEST_NEVER
-        1   TEST_LESS
-        2   TEST_EQUAL
-        3   TEST_LESS_EQUAL
-        4   TEST_GREATER
-        5   TEST_NOT_EQUAL
-        6   TEST_GREATER_EQUAL
-        7   TEST_NEVER (though nifskope comment says TEST_ALWAYS, but ingame it is TEST_NEVER)
-     */
-    int compareFunc;
-    unsigned stencilRef;
-    unsigned stencilMask;
-    /*
-        Stencil test fail action, depth test fail action and depth test pass action:
-        0   ACTION_KEEP
-        1   ACTION_ZERO
-        2   ACTION_REPLACE
-        3   ACTION_INCREMENT
-        4   ACTION_DECREMENT
-        5   ACTION_INVERT
-     */
-    int failAction;
-    int zFailAction;
-    int zPassAction;
-    /*
-        Face draw mode:
-        0   DRAW_CCW_OR_BOTH
-        1   DRAW_CCW        [default]
-        2   DRAW_CW
-        3   DRAW_BOTH
+        Docs taken from:
+        http://niftools.sourceforge.net/doc/nif/NiStencilProperty.html
      */
-    int drawMode;
-
-    void read(NIFStream *nif);
-};
-
-struct NiAlphaProperty : public StructPropT<S_AlphaProperty>
-{
-    bool useAlphaBlending() const { return flags & 1; }
-    int sourceBlendMode() const { return (flags >> 1) & 0xF; }
-    int destinationBlendMode() const { return (flags >> 5) & 0xF; }
-    bool noSorter() const { return (flags >> 13) & 1; }
+    struct S_StencilProperty
+    {
+        // Is stencil test enabled?
+        unsigned char enabled;
+
+        /*
+            0   TEST_NEVER
+            1   TEST_LESS
+            2   TEST_EQUAL
+            3   TEST_LESS_EQUAL
+            4   TEST_GREATER
+            5   TEST_NOT_EQUAL
+            6   TEST_GREATER_EQUAL
+            7   TEST_NEVER (though nifskope comment says TEST_ALWAYS, but ingame it is TEST_NEVER)
+         */
+        int compareFunc;
+        unsigned stencilRef;
+        unsigned stencilMask;
+        /*
+            Stencil test fail action, depth test fail action and depth test pass action:
+            0   ACTION_KEEP
+            1   ACTION_ZERO
+            2   ACTION_REPLACE
+            3   ACTION_INCREMENT
+            4   ACTION_DECREMENT
+            5   ACTION_INVERT
+         */
+        int failAction;
+        int zFailAction;
+        int zPassAction;
+        /*
+            Face draw mode:
+            0   DRAW_CCW_OR_BOTH
+            1   DRAW_CCW        [default]
+            2   DRAW_CW
+            3   DRAW_BOTH
+         */
+        int drawMode;
+
+        void read(NIFStream* nif);
+    };
 
-    bool useAlphaTesting() const { return (flags >> 9) & 1; }
-    int alphaTestMode() const { return (flags >> 10) & 0x7; }
-};
+    struct NiAlphaProperty : public StructPropT<S_AlphaProperty>
+    {
+        bool useAlphaBlending() const { return flags & 1; }
+        int sourceBlendMode() const { return (flags >> 1) & 0xF; }
+        int destinationBlendMode() const { return (flags >> 5) & 0xF; }
+        bool noSorter() const { return (flags >> 13) & 1; }
 
-struct NiVertexColorProperty : public StructPropT<S_VertexColorProperty> { };
-struct NiStencilProperty : public Property
-{
-    S_StencilProperty data;
-    unsigned short flags{0u};
+        bool useAlphaTesting() const { return (flags >> 9) & 1; }
+        int alphaTestMode() const { return (flags >> 10) & 0x7; }
+    };
 
-    void read(NIFStream *nif) override
+    struct NiVertexColorProperty : public StructPropT<S_VertexColorProperty>
     {
-        Property::read(nif);
-        if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB_OLD)
-            flags = nif->getUShort();
-        data.read(nif);
-    }
-};
-
-struct NiMaterialProperty : public Property
-{
-    S_MaterialProperty data;
-    unsigned short flags{0u};
+    };
+    struct NiStencilProperty : public Property
+    {
+        S_StencilProperty data;
+        unsigned short flags{ 0u };
+
+        void read(NIFStream* nif) override
+        {
+            Property::read(nif);
+            if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB_OLD)
+                flags = nif->getUShort();
+            data.read(nif);
+        }
+    };
 
-    void read(NIFStream *nif) override
+    struct NiMaterialProperty : public Property
     {
-        Property::read(nif);
-        if (nif->getVersion() >= NIFStream::generateVersion(3,0,0,0)
-         && nif->getVersion() <= NIFFile::NIFVersion::VER_OB_OLD)
-            flags = nif->getUShort();
-        data.read(nif);
-    }
-};
+        S_MaterialProperty data;
+        unsigned short flags{ 0u };
+
+        void read(NIFStream* nif) override
+        {
+            Property::read(nif);
+            if (nif->getVersion() >= NIFStream::generateVersion(3, 0, 0, 0)
+                && nif->getVersion() <= NIFFile::NIFVersion::VER_OB_OLD)
+                flags = nif->getUShort();
+            data.read(nif);
+        }
+    };
 
 } // Namespace
 #endif
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index fbe4f730e9..397faa03cb 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -29,145 +29,145 @@
 namespace Nif
 {
 
-class NIFFile;
-class NIFStream;
-
-enum RecordType
-{
-  RC_MISSING = 0,
-  RC_NiNode,
-  RC_NiSwitchNode,
-  RC_NiLODNode,
-  RC_NiFltAnimationNode,
-  RC_NiBillboardNode,
-  RC_AvoidNode,
-  RC_NiCollisionSwitch,
-  RC_NiTriShape,
-  RC_NiTriStrips,
-  RC_NiLines,
-  RC_NiParticles,
-  RC_NiBSParticleNode,
-  RC_NiCamera,
-  RC_NiTexturingProperty,
-  RC_NiFogProperty,
-  RC_NiMaterialProperty,
-  RC_NiZBufferProperty,
-  RC_NiAlphaProperty,
-  RC_NiVertexColorProperty,
-  RC_NiShadeProperty,
-  RC_NiDitherProperty,
-  RC_NiWireframeProperty,
-  RC_NiSpecularProperty,
-  RC_NiStencilProperty,
-  RC_NiVisController,
-  RC_NiGeomMorpherController,
-  RC_NiKeyframeController,
-  RC_NiAlphaController,
-  RC_NiRollController,
-  RC_NiUVController,
-  RC_NiPathController,
-  RC_NiMaterialColorController,
-  RC_NiBSPArrayController,
-  RC_NiParticleSystemController,
-  RC_NiFlipController,
-  RC_NiBSAnimationNode,
-  RC_NiLight,
-  RC_NiTextureEffect,
-  RC_NiExtraData,
-  RC_NiVertWeightsExtraData,
-  RC_NiTextKeyExtraData,
-  RC_NiStringExtraData,
-  RC_NiGravity,
-  RC_NiPlanarCollider,
-  RC_NiParticleGrowFade,
-  RC_NiParticleColorModifier,
-  RC_NiParticleRotation,
-  RC_NiFloatData,
-  RC_NiTriShapeData,
-  RC_NiTriStripsData,
-  RC_NiLinesData,
-  RC_NiVisData,
-  RC_NiColorData,
-  RC_NiPixelData,
-  RC_NiMorphData,
-  RC_NiKeyframeData,
-  RC_NiSkinData,
-  RC_NiUVData,
-  RC_NiPosData,
-  RC_NiRotatingParticlesData,
-  RC_NiParticlesData,
-  RC_NiSequenceStreamHelper,
-  RC_NiSourceTexture,
-  RC_NiSkinInstance,
-  RC_RootCollisionNode,
-  RC_NiSphericalCollider,
-  RC_NiLookAtController,
-  RC_NiPalette,
-  RC_NiIntegerExtraData,
-  RC_NiIntegersExtraData,
-  RC_NiBinaryExtraData,
-  RC_NiBooleanExtraData,
-  RC_NiVectorExtraData,
-  RC_NiColorExtraData,
-  RC_NiFloatExtraData,
-  RC_NiFloatsExtraData,
-  RC_NiStringPalette,
-  RC_NiBoolData,
-  RC_NiSkinPartition,
-  RC_BSXFlags,
-  RC_BSBound,
-  RC_bhkBlendController,
-  RC_NiFloatInterpolator,
-  RC_NiPoint3Interpolator,
-  RC_NiBoolInterpolator,
-  RC_NiTransformInterpolator,
-  RC_NiColorInterpolator,
-  RC_BSShaderTextureSet,
-  RC_BSLODTriShape,
-  RC_BSShaderProperty,
-  RC_BSShaderPPLightingProperty,
-  RC_BSShaderNoLightingProperty,
-  RC_BSFurnitureMarker,
-  RC_NiCollisionObject,
-  RC_bhkCollisionObject,
-  RC_BSDismemberSkinInstance,
-  RC_NiControllerManager,
-  RC_bhkMoppBvTreeShape,
-  RC_bhkNiTriStripsShape,
-  RC_bhkPackedNiTriStripsShape,
-  RC_hkPackedNiTriStripsData,
-  RC_bhkConvexVerticesShape,
-  RC_bhkBoxShape,
-  RC_bhkCapsuleShape,
-  RC_bhkSphereShape,
-  RC_bhkListShape,
-  RC_bhkRigidBody,
-  RC_bhkRigidBodyT,
-  RC_BSLightingShaderProperty,
-  RC_NiClusterAccumulator,
-  RC_NiAlphaAccumulator,
-  RC_NiSortAdjustNode,
-  RC_NiMultiTargetTransformController
-};
-
-/// Base class for all records
-struct Record
-{
-    // Record type and type name
-    RecordType recType{RC_MISSING};
-    std::string recName;
-    unsigned int recIndex{~0u};
-
-    Record() = default;
-
-    /// Parses the record from file
-    virtual void read(NIFStream *nif) = 0;
-
-    /// Does post-processing, after the entire tree is loaded
-    virtual void post(NIFFile *nif) {}
-
-    virtual ~Record() {}
-};
+    class NIFFile;
+    class NIFStream;
+
+    enum RecordType
+    {
+        RC_MISSING = 0,
+        RC_NiNode,
+        RC_NiSwitchNode,
+        RC_NiLODNode,
+        RC_NiFltAnimationNode,
+        RC_NiBillboardNode,
+        RC_AvoidNode,
+        RC_NiCollisionSwitch,
+        RC_NiTriShape,
+        RC_NiTriStrips,
+        RC_NiLines,
+        RC_NiParticles,
+        RC_NiBSParticleNode,
+        RC_NiCamera,
+        RC_NiTexturingProperty,
+        RC_NiFogProperty,
+        RC_NiMaterialProperty,
+        RC_NiZBufferProperty,
+        RC_NiAlphaProperty,
+        RC_NiVertexColorProperty,
+        RC_NiShadeProperty,
+        RC_NiDitherProperty,
+        RC_NiWireframeProperty,
+        RC_NiSpecularProperty,
+        RC_NiStencilProperty,
+        RC_NiVisController,
+        RC_NiGeomMorpherController,
+        RC_NiKeyframeController,
+        RC_NiAlphaController,
+        RC_NiRollController,
+        RC_NiUVController,
+        RC_NiPathController,
+        RC_NiMaterialColorController,
+        RC_NiBSPArrayController,
+        RC_NiParticleSystemController,
+        RC_NiFlipController,
+        RC_NiBSAnimationNode,
+        RC_NiLight,
+        RC_NiTextureEffect,
+        RC_NiExtraData,
+        RC_NiVertWeightsExtraData,
+        RC_NiTextKeyExtraData,
+        RC_NiStringExtraData,
+        RC_NiGravity,
+        RC_NiPlanarCollider,
+        RC_NiParticleGrowFade,
+        RC_NiParticleColorModifier,
+        RC_NiParticleRotation,
+        RC_NiFloatData,
+        RC_NiTriShapeData,
+        RC_NiTriStripsData,
+        RC_NiLinesData,
+        RC_NiVisData,
+        RC_NiColorData,
+        RC_NiPixelData,
+        RC_NiMorphData,
+        RC_NiKeyframeData,
+        RC_NiSkinData,
+        RC_NiUVData,
+        RC_NiPosData,
+        RC_NiRotatingParticlesData,
+        RC_NiParticlesData,
+        RC_NiSequenceStreamHelper,
+        RC_NiSourceTexture,
+        RC_NiSkinInstance,
+        RC_RootCollisionNode,
+        RC_NiSphericalCollider,
+        RC_NiLookAtController,
+        RC_NiPalette,
+        RC_NiIntegerExtraData,
+        RC_NiIntegersExtraData,
+        RC_NiBinaryExtraData,
+        RC_NiBooleanExtraData,
+        RC_NiVectorExtraData,
+        RC_NiColorExtraData,
+        RC_NiFloatExtraData,
+        RC_NiFloatsExtraData,
+        RC_NiStringPalette,
+        RC_NiBoolData,
+        RC_NiSkinPartition,
+        RC_BSXFlags,
+        RC_BSBound,
+        RC_bhkBlendController,
+        RC_NiFloatInterpolator,
+        RC_NiPoint3Interpolator,
+        RC_NiBoolInterpolator,
+        RC_NiTransformInterpolator,
+        RC_NiColorInterpolator,
+        RC_BSShaderTextureSet,
+        RC_BSLODTriShape,
+        RC_BSShaderProperty,
+        RC_BSShaderPPLightingProperty,
+        RC_BSShaderNoLightingProperty,
+        RC_BSFurnitureMarker,
+        RC_NiCollisionObject,
+        RC_bhkCollisionObject,
+        RC_BSDismemberSkinInstance,
+        RC_NiControllerManager,
+        RC_bhkMoppBvTreeShape,
+        RC_bhkNiTriStripsShape,
+        RC_bhkPackedNiTriStripsShape,
+        RC_hkPackedNiTriStripsData,
+        RC_bhkConvexVerticesShape,
+        RC_bhkBoxShape,
+        RC_bhkCapsuleShape,
+        RC_bhkSphereShape,
+        RC_bhkListShape,
+        RC_bhkRigidBody,
+        RC_bhkRigidBodyT,
+        RC_BSLightingShaderProperty,
+        RC_NiClusterAccumulator,
+        RC_NiAlphaAccumulator,
+        RC_NiSortAdjustNode,
+        RC_NiMultiTargetTransformController
+    };
+
+    /// Base class for all records
+    struct Record
+    {
+        // Record type and type name
+        RecordType recType{ RC_MISSING };
+        std::string recName;
+        unsigned int recIndex{ ~0u };
+
+        Record() = default;
+
+        /// Parses the record from file
+        virtual void read(NIFStream* nif) = 0;
+
+        /// Does post-processing, after the entire tree is loaded
+        virtual void post(NIFFile* nif) {}
+
+        virtual ~Record() {}
+    };
 
 } // Namespace
 #endif
diff --git a/components/nif/recordptr.hpp b/components/nif/recordptr.hpp
index f9c0f32cf3..6982aa3b3f 100644
--- a/components/nif/recordptr.hpp
+++ b/components/nif/recordptr.hpp
@@ -8,189 +8,188 @@
 namespace Nif
 {
 
-/** A reference to another record. It is read as an index from the
-    NIF, and later looked up in the index table to get an actual
-    pointer.
-*/
-template <class X>
-class RecordPtrT
-{
-    union {
-        intptr_t index;
-        X* ptr;
-    };
+    /** A reference to another record. It is read as an index from the
+        NIF, and later looked up in the index table to get an actual
+        pointer.
+    */
+    template <class X>
+    class RecordPtrT
+    {
+        union
+        {
+            intptr_t index;
+            X* ptr;
+        };
 
-public:
-    RecordPtrT() : index(-2) {}
+    public:
+        RecordPtrT()
+            : index(-2)
+        {
+        }
 
-    RecordPtrT(X* ptr) : ptr(ptr) {}
+        RecordPtrT(X* ptr)
+            : ptr(ptr)
+        {
+        }
 
-    /// Read the index from the nif
-    void read(NIFStream *nif)
-    {
-        // Can only read the index once
-        assert(index == -2);
+        /// Read the index from the nif
+        void read(NIFStream* nif)
+        {
+            // Can only read the index once
+            assert(index == -2);
 
-        // Store the index for later
-        index = nif->getInt();
-        assert(index >= -1);
-    }
+            // Store the index for later
+            index = nif->getInt();
+            assert(index >= -1);
+        }
 
-    /// Resolve index to pointer
-    void post(NIFFile *nif)
-    {
-        if(index < 0)
-            ptr = nullptr;
-        else
+        /// Resolve index to pointer
+        void post(NIFFile* nif)
+        {
+            if (index < 0)
+                ptr = nullptr;
+            else
+            {
+                Record* r = nif->getRecord(index);
+                // And cast it
+                ptr = dynamic_cast<X*>(r);
+                assert(ptr != nullptr);
+            }
+        }
+
+        /// Look up the actual object from the index
+        const X* getPtr() const
+        {
+            assert(ptr != nullptr);
+            return ptr;
+        }
+        X* getPtr()
         {
-            Record *r = nif->getRecord(index);
-            // And cast it
-            ptr = dynamic_cast<X*>(r);
             assert(ptr != nullptr);
+            return ptr;
         }
-    }
 
-    /// Look up the actual object from the index
-    const X* getPtr() const
-    {
-        assert(ptr != nullptr);
-        return ptr;
-    }
-    X* getPtr()
-    {
-        assert(ptr != nullptr);
-        return ptr;
-    }
-
-    const X& get() const
-    { return *getPtr(); }
-    X& get()
-    { return *getPtr(); }
-
-    /// Syntactic sugar
-    const X* operator->() const
-    { return getPtr(); }
-    X* operator->()
-    { return getPtr(); }
-
-    /// Pointers are allowed to be empty
-    bool empty() const
-    { return ptr == nullptr; }
-};
-
-/** A list of references to other records. These are read as a list,
-    and later converted to pointers as needed. Not an optimized
-    implementation.
- */
-template <class X>
-class RecordListT
-{
-    typedef RecordPtrT<X> Ptr;
-    std::vector<Ptr> list;
+        const X& get() const { return *getPtr(); }
+        X& get() { return *getPtr(); }
 
-public:
-    RecordListT() = default;
+        /// Syntactic sugar
+        const X* operator->() const { return getPtr(); }
+        X* operator->() { return getPtr(); }
 
-    RecordListT(std::vector<Ptr> list)
-        : list(std::move(list))
-    {}
+        /// Pointers are allowed to be empty
+        bool empty() const { return ptr == nullptr; }
+    };
 
-    void read(NIFStream *nif)
+    /** A list of references to other records. These are read as a list,
+        and later converted to pointers as needed. Not an optimized
+        implementation.
+     */
+    template <class X>
+    class RecordListT
     {
-        int len = nif->getInt();
-        list.resize(len);
+        typedef RecordPtrT<X> Ptr;
+        std::vector<Ptr> list;
 
-        for(size_t i=0;i < list.size();i++)
-            list[i].read(nif);
-    }
+    public:
+        RecordListT() = default;
 
-    void post(NIFFile *nif)
-    {
-        for(size_t i=0;i < list.size();i++)
-            list[i].post(nif);
-    }
-
-    const Ptr& operator[](size_t index) const
-    { return list.at(index); }
-    Ptr& operator[](size_t index)
-    { return list.at(index); }
-
-    size_t length() const
-    { return list.size(); }
-};
-
-
-struct Node;
-struct Extra;
-struct Property;
-struct NiUVData;
-struct NiPosData;
-struct NiVisData;
-struct Controller;
-struct Named;
-struct NiSkinData;
-struct NiFloatData;
-struct NiMorphData;
-struct NiPixelData;
-struct NiColorData;
-struct NiKeyframeData;
-struct NiTriStripsData;
-struct NiSkinInstance;
-struct NiSourceTexture;
-struct NiPalette;
-struct NiParticleModifier;
-struct NiBoolData;
-struct NiSkinPartition;
-struct BSShaderTextureSet;
-struct NiGeometryData;
-struct BSShaderProperty;
-struct NiAlphaProperty;
-struct NiCollisionObject;
-struct bhkWorldObject;
-struct bhkShape;
-struct bhkSerializable;
-struct hkPackedNiTriStripsData;
-struct NiAccumulator;
-struct NiInterpolator;
-
-using NodePtr = RecordPtrT<Node>;
-using ExtraPtr = RecordPtrT<Extra>;
-using NiUVDataPtr = RecordPtrT<NiUVData>;
-using NiPosDataPtr = RecordPtrT<NiPosData>;
-using NiVisDataPtr = RecordPtrT<NiVisData>;
-using ControllerPtr = RecordPtrT<Controller>;
-using NamedPtr = RecordPtrT<Named>;
-using NiSkinDataPtr = RecordPtrT<NiSkinData>;
-using NiMorphDataPtr = RecordPtrT<NiMorphData>;
-using NiPixelDataPtr = RecordPtrT<NiPixelData>;
-using NiFloatDataPtr = RecordPtrT<NiFloatData>;
-using NiColorDataPtr = RecordPtrT<NiColorData>;
-using NiKeyframeDataPtr = RecordPtrT<NiKeyframeData>;
-using NiSkinInstancePtr = RecordPtrT<NiSkinInstance>;
-using NiSourceTexturePtr = RecordPtrT<NiSourceTexture>;
-using NiPalettePtr = RecordPtrT<NiPalette>;
-using NiParticleModifierPtr = RecordPtrT<NiParticleModifier>;
-using NiBoolDataPtr = RecordPtrT<NiBoolData>;
-using NiSkinPartitionPtr = RecordPtrT<NiSkinPartition>;
-using BSShaderTextureSetPtr = RecordPtrT<BSShaderTextureSet>;
-using NiGeometryDataPtr = RecordPtrT<NiGeometryData>;
-using BSShaderPropertyPtr = RecordPtrT<BSShaderProperty>;
-using NiAlphaPropertyPtr = RecordPtrT<NiAlphaProperty>;
-using NiCollisionObjectPtr = RecordPtrT<NiCollisionObject>;
-using bhkWorldObjectPtr = RecordPtrT<bhkWorldObject>;
-using bhkShapePtr = RecordPtrT<bhkShape>;
-using hkPackedNiTriStripsDataPtr = RecordPtrT<hkPackedNiTriStripsData>;
-using NiAccumulatorPtr = RecordPtrT<NiAccumulator>;
-using NiInterpolatorPtr = RecordPtrT<NiInterpolator>;
-
-using NodeList = RecordListT<Node>;
-using PropertyList = RecordListT<Property>;
-using ExtraList = RecordListT<Extra>;
-using NiSourceTextureList = RecordListT<NiSourceTexture>;
-using NiInterpolatorList = RecordListT<NiInterpolator>;
-using NiTriStripsDataList = RecordListT<NiTriStripsData>;
-using bhkShapeList = RecordListT<bhkShape>;
-using bhkSerializableList = RecordListT<bhkSerializable>;
+        RecordListT(std::vector<Ptr> list)
+            : list(std::move(list))
+        {
+        }
+
+        void read(NIFStream* nif)
+        {
+            int len = nif->getInt();
+            list.resize(len);
+
+            for (size_t i = 0; i < list.size(); i++)
+                list[i].read(nif);
+        }
+
+        void post(NIFFile* nif)
+        {
+            for (size_t i = 0; i < list.size(); i++)
+                list[i].post(nif);
+        }
+
+        const Ptr& operator[](size_t index) const { return list.at(index); }
+        Ptr& operator[](size_t index) { return list.at(index); }
+
+        size_t length() const { return list.size(); }
+    };
+
+    struct Node;
+    struct Extra;
+    struct Property;
+    struct NiUVData;
+    struct NiPosData;
+    struct NiVisData;
+    struct Controller;
+    struct Named;
+    struct NiSkinData;
+    struct NiFloatData;
+    struct NiMorphData;
+    struct NiPixelData;
+    struct NiColorData;
+    struct NiKeyframeData;
+    struct NiTriStripsData;
+    struct NiSkinInstance;
+    struct NiSourceTexture;
+    struct NiPalette;
+    struct NiParticleModifier;
+    struct NiBoolData;
+    struct NiSkinPartition;
+    struct BSShaderTextureSet;
+    struct NiGeometryData;
+    struct BSShaderProperty;
+    struct NiAlphaProperty;
+    struct NiCollisionObject;
+    struct bhkWorldObject;
+    struct bhkShape;
+    struct bhkSerializable;
+    struct hkPackedNiTriStripsData;
+    struct NiAccumulator;
+    struct NiInterpolator;
+
+    using NodePtr = RecordPtrT<Node>;
+    using ExtraPtr = RecordPtrT<Extra>;
+    using NiUVDataPtr = RecordPtrT<NiUVData>;
+    using NiPosDataPtr = RecordPtrT<NiPosData>;
+    using NiVisDataPtr = RecordPtrT<NiVisData>;
+    using ControllerPtr = RecordPtrT<Controller>;
+    using NamedPtr = RecordPtrT<Named>;
+    using NiSkinDataPtr = RecordPtrT<NiSkinData>;
+    using NiMorphDataPtr = RecordPtrT<NiMorphData>;
+    using NiPixelDataPtr = RecordPtrT<NiPixelData>;
+    using NiFloatDataPtr = RecordPtrT<NiFloatData>;
+    using NiColorDataPtr = RecordPtrT<NiColorData>;
+    using NiKeyframeDataPtr = RecordPtrT<NiKeyframeData>;
+    using NiSkinInstancePtr = RecordPtrT<NiSkinInstance>;
+    using NiSourceTexturePtr = RecordPtrT<NiSourceTexture>;
+    using NiPalettePtr = RecordPtrT<NiPalette>;
+    using NiParticleModifierPtr = RecordPtrT<NiParticleModifier>;
+    using NiBoolDataPtr = RecordPtrT<NiBoolData>;
+    using NiSkinPartitionPtr = RecordPtrT<NiSkinPartition>;
+    using BSShaderTextureSetPtr = RecordPtrT<BSShaderTextureSet>;
+    using NiGeometryDataPtr = RecordPtrT<NiGeometryData>;
+    using BSShaderPropertyPtr = RecordPtrT<BSShaderProperty>;
+    using NiAlphaPropertyPtr = RecordPtrT<NiAlphaProperty>;
+    using NiCollisionObjectPtr = RecordPtrT<NiCollisionObject>;
+    using bhkWorldObjectPtr = RecordPtrT<bhkWorldObject>;
+    using bhkShapePtr = RecordPtrT<bhkShape>;
+    using hkPackedNiTriStripsDataPtr = RecordPtrT<hkPackedNiTriStripsData>;
+    using NiAccumulatorPtr = RecordPtrT<NiAccumulator>;
+    using NiInterpolatorPtr = RecordPtrT<NiInterpolator>;
+
+    using NodeList = RecordListT<Node>;
+    using PropertyList = RecordListT<Property>;
+    using ExtraList = RecordListT<Extra>;
+    using NiSourceTextureList = RecordListT<NiSourceTexture>;
+    using NiInterpolatorList = RecordListT<NiInterpolator>;
+    using NiTriStripsDataList = RecordListT<NiTriStripsData>;
+    using bhkShapeList = RecordListT<bhkShape>;
+    using bhkSerializableList = RecordListT<bhkSerializable>;
 
 } // Namespace
 #endif
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index dcf406ecb2..325903ad0e 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -1,10 +1,10 @@
 #include "bulletnifloader.hpp"
 
 #include <cassert>
-#include <vector>
-#include <variant>
 #include <sstream>
 #include <tuple>
+#include <variant>
+#include <vector>
 
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionShapes/btTriangleMesh.h>
@@ -15,455 +15,454 @@
 
 #include <components/misc/strings/algorithm.hpp>
 
-#include <components/nif/node.hpp>
 #include <components/nif/data.hpp>
 #include <components/nif/extra.hpp>
+#include <components/nif/node.hpp>
 #include <components/nif/parent.hpp>
 
-#include <components/settings/settings.hpp>
 #include <components/files/conversion.hpp>
+#include <components/settings/settings.hpp>
 
 namespace
 {
 
-osg::Matrixf getWorldTransform(const Nif::Node& node, const Nif::Parent* nodeParent)
-{
-    osg::Matrixf result = node.trafo.toMatrix();
-    for (const Nif::Parent* parent = nodeParent; parent != nullptr; parent = parent->mParent)
-        result *= parent->mNiNode.trafo.toMatrix();
-    return result;
-}
-
-bool pathFileNameStartsWithX(const std::string& path)
-{
-    const std::size_t slashpos = path.find_last_of("/\\");
-    const std::size_t letterPos = slashpos == std::string::npos ? 0 : slashpos + 1;
-    return letterPos < path.size() && (path[letterPos] == 'x' || path[letterPos] == 'X');
-}
-
-void fillTriangleMesh(btTriangleMesh& mesh, const Nif::NiTriShapeData& data, const osg::Matrixf &transform)
-{
-    const std::vector<osg::Vec3f> &vertices = data.vertices;
-    const std::vector<unsigned short> &triangles = data.triangles;
-    mesh.preallocateVertices(static_cast<int>(vertices.size()));
-    mesh.preallocateIndices(static_cast<int>(triangles.size()));
+    osg::Matrixf getWorldTransform(const Nif::Node& node, const Nif::Parent* nodeParent)
+    {
+        osg::Matrixf result = node.trafo.toMatrix();
+        for (const Nif::Parent* parent = nodeParent; parent != nullptr; parent = parent->mParent)
+            result *= parent->mNiNode.trafo.toMatrix();
+        return result;
+    }
 
-    for (std::size_t i = 0; i < triangles.size(); i += 3)
+    bool pathFileNameStartsWithX(const std::string& path)
     {
-        mesh.addTriangle(
-            Misc::Convert::toBullet(vertices[triangles[i + 0]] * transform),
-            Misc::Convert::toBullet(vertices[triangles[i + 1]] * transform),
-            Misc::Convert::toBullet(vertices[triangles[i + 2]] * transform)
-        );
+        const std::size_t slashpos = path.find_last_of("/\\");
+        const std::size_t letterPos = slashpos == std::string::npos ? 0 : slashpos + 1;
+        return letterPos < path.size() && (path[letterPos] == 'x' || path[letterPos] == 'X');
     }
-}
 
-void fillTriangleMesh(btTriangleMesh& mesh, const Nif::NiTriStripsData& data, const osg::Matrixf &transform)
-{
-    const std::vector<osg::Vec3f> &vertices = data.vertices;
-    const std::vector<std::vector<unsigned short>> &strips = data.strips;
-    mesh.preallocateVertices(static_cast<int>(vertices.size()));
-    int numTriangles = 0;
-    for (const std::vector<unsigned short>& strip : strips)
+    void fillTriangleMesh(btTriangleMesh& mesh, const Nif::NiTriShapeData& data, const osg::Matrixf& transform)
     {
-        // Each strip with N points contains information about N-2 triangles.
-        if (strip.size() >= 3)
-            numTriangles += static_cast<int>(strip.size()-2);
+        const std::vector<osg::Vec3f>& vertices = data.vertices;
+        const std::vector<unsigned short>& triangles = data.triangles;
+        mesh.preallocateVertices(static_cast<int>(vertices.size()));
+        mesh.preallocateIndices(static_cast<int>(triangles.size()));
+
+        for (std::size_t i = 0; i < triangles.size(); i += 3)
+        {
+            mesh.addTriangle(Misc::Convert::toBullet(vertices[triangles[i + 0]] * transform),
+                Misc::Convert::toBullet(vertices[triangles[i + 1]] * transform),
+                Misc::Convert::toBullet(vertices[triangles[i + 2]] * transform));
+        }
     }
-    mesh.preallocateIndices(static_cast<int>(numTriangles));
 
-    // It's triangulation time. Totally not a NifSkope spell ripoff.
-    for (const std::vector<unsigned short>& strip : strips)
+    void fillTriangleMesh(btTriangleMesh& mesh, const Nif::NiTriStripsData& data, const osg::Matrixf& transform)
     {
-        // Can't make a triangle from less than 3 points.
-        if (strip.size() < 3)
-            continue;
-
-        unsigned short a;
-        unsigned short b = strip[0];
-        unsigned short c = strip[1];
-        for (size_t i = 2; i < strip.size(); i++)
+        const std::vector<osg::Vec3f>& vertices = data.vertices;
+        const std::vector<std::vector<unsigned short>>& strips = data.strips;
+        mesh.preallocateVertices(static_cast<int>(vertices.size()));
+        int numTriangles = 0;
+        for (const std::vector<unsigned short>& strip : strips)
         {
-            a = b;
-            b = c;
-            c = strip[i];
-            if (a != b && b != c && a != c)
+            // Each strip with N points contains information about N-2 triangles.
+            if (strip.size() >= 3)
+                numTriangles += static_cast<int>(strip.size() - 2);
+        }
+        mesh.preallocateIndices(static_cast<int>(numTriangles));
+
+        // It's triangulation time. Totally not a NifSkope spell ripoff.
+        for (const std::vector<unsigned short>& strip : strips)
+        {
+            // Can't make a triangle from less than 3 points.
+            if (strip.size() < 3)
+                continue;
+
+            unsigned short a;
+            unsigned short b = strip[0];
+            unsigned short c = strip[1];
+            for (size_t i = 2; i < strip.size(); i++)
             {
-                if (i%2==0)
-                {
-                    mesh.addTriangle(
-                        Misc::Convert::toBullet(vertices[a] * transform),
-                        Misc::Convert::toBullet(vertices[b] * transform),
-                        Misc::Convert::toBullet(vertices[c] * transform)
-                    );
-                }
-                else
+                a = b;
+                b = c;
+                c = strip[i];
+                if (a != b && b != c && a != c)
                 {
-                    mesh.addTriangle(
-                        Misc::Convert::toBullet(vertices[a] * transform),
-                        Misc::Convert::toBullet(vertices[c] * transform),
-                        Misc::Convert::toBullet(vertices[b] * transform)
-                    );
+                    if (i % 2 == 0)
+                    {
+                        mesh.addTriangle(Misc::Convert::toBullet(vertices[a] * transform),
+                            Misc::Convert::toBullet(vertices[b] * transform),
+                            Misc::Convert::toBullet(vertices[c] * transform));
+                    }
+                    else
+                    {
+                        mesh.addTriangle(Misc::Convert::toBullet(vertices[a] * transform),
+                            Misc::Convert::toBullet(vertices[c] * transform),
+                            Misc::Convert::toBullet(vertices[b] * transform));
+                    }
                 }
             }
         }
     }
-}
 
-template <class Function>
-auto handleNiGeometry(const Nif::NiGeometry& geometry, Function&& function)
-    -> decltype(function(static_cast<const Nif::NiTriShapeData&>(geometry.data.get())))
-{
-    if (geometry.recType == Nif::RC_NiTriShape || geometry.recType == Nif::RC_BSLODTriShape)
+    template <class Function>
+    auto handleNiGeometry(const Nif::NiGeometry& geometry, Function&& function)
+        -> decltype(function(static_cast<const Nif::NiTriShapeData&>(geometry.data.get())))
     {
-        if (geometry.data->recType != Nif::RC_NiTriShapeData)
-            return {};
+        if (geometry.recType == Nif::RC_NiTriShape || geometry.recType == Nif::RC_BSLODTriShape)
+        {
+            if (geometry.data->recType != Nif::RC_NiTriShapeData)
+                return {};
 
-        auto data = static_cast<const Nif::NiTriShapeData*>(geometry.data.getPtr());
-        if (data->triangles.empty())
-            return {};
+            auto data = static_cast<const Nif::NiTriShapeData*>(geometry.data.getPtr());
+            if (data->triangles.empty())
+                return {};
 
-        return function(static_cast<const Nif::NiTriShapeData&>(*data));
-    }
+            return function(static_cast<const Nif::NiTriShapeData&>(*data));
+        }
 
-    if (geometry.recType == Nif::RC_NiTriStrips)
-    {
-        if (geometry.data->recType != Nif::RC_NiTriStripsData)
-            return {};
+        if (geometry.recType == Nif::RC_NiTriStrips)
+        {
+            if (geometry.data->recType != Nif::RC_NiTriStripsData)
+                return {};
 
-        auto data = static_cast<const Nif::NiTriStripsData*>(geometry.data.getPtr());
-        if (data->strips.empty())
-            return {};
+            auto data = static_cast<const Nif::NiTriStripsData*>(geometry.data.getPtr());
+            if (data->strips.empty())
+                return {};
 
-        return function(static_cast<const Nif::NiTriStripsData&>(*data));
-    }
+            return function(static_cast<const Nif::NiTriStripsData&>(*data));
+        }
 
-    return {};
-}
+        return {};
+    }
 
-std::monostate fillTriangleMesh(std::unique_ptr<btTriangleMesh>& mesh, const Nif::NiGeometry& geometry, const osg::Matrixf &transform)
-{
-    return handleNiGeometry(geometry, [&] (const auto& data)
+    std::monostate fillTriangleMesh(
+        std::unique_ptr<btTriangleMesh>& mesh, const Nif::NiGeometry& geometry, const osg::Matrixf& transform)
     {
-        if (mesh == nullptr)
-            mesh = std::make_unique<btTriangleMesh>(false);
-        fillTriangleMesh(*mesh, data, transform);
-        return std::monostate {};
-    });
-}
+        return handleNiGeometry(geometry, [&](const auto& data) {
+            if (mesh == nullptr)
+                mesh = std::make_unique<btTriangleMesh>(false);
+            fillTriangleMesh(*mesh, data, transform);
+            return std::monostate{};
+        });
+    }
 
-std::unique_ptr<btTriangleMesh> makeChildMesh(const Nif::NiGeometry& geometry)
-{
-    return handleNiGeometry(geometry, [&] (const auto& data)
+    std::unique_ptr<btTriangleMesh> makeChildMesh(const Nif::NiGeometry& geometry)
     {
-        auto mesh = std::make_unique<btTriangleMesh>();
-        fillTriangleMesh(*mesh, data, osg::Matrixf());
-        return mesh;
-    });
-}
+        return handleNiGeometry(geometry, [&](const auto& data) {
+            auto mesh = std::make_unique<btTriangleMesh>();
+            fillTriangleMesh(*mesh, data, osg::Matrixf());
+            return mesh;
+        });
+    }
 
 }
 
 namespace NifBullet
 {
 
-osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
-{
-    mShape = new Resource::BulletShape;
-
-    mCompoundShape.reset();
-    mStaticMesh.reset();
-    mAvoidStaticMesh.reset();
+    osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
+    {
+        mShape = new Resource::BulletShape;
 
-    mShape->mFileHash = nif.getHash();
+        mCompoundShape.reset();
+        mStaticMesh.reset();
+        mAvoidStaticMesh.reset();
 
-    const size_t numRoots = nif.numRoots();
-    std::vector<const Nif::Node*> roots;
-    for (size_t i = 0; i < numRoots; ++i)
-    {
-        const Nif::Record* r = nif.getRoot(i);
-        if (!r)
-            continue;
-        const Nif::Node* node = dynamic_cast<const Nif::Node*>(r);
-        if (node)
-            roots.emplace_back(node);
-    }
-    const std::string filename = Files::pathToUnicodeString(nif.getFilename());
-    mShape->mFileName = filename;
-    if (roots.empty())
-    {
-        warn("Found no root nodes in NIF file " + filename);
-        return mShape;
-    }
+        mShape->mFileHash = nif.getHash();
 
-    // Try to find a valid bounding box first. If one's found for any root node, use that.
-    for (const Nif::Node* node : roots)
-    {
-        if (findBoundingBox(*node, filename))
+        const size_t numRoots = nif.numRoots();
+        std::vector<const Nif::Node*> roots;
+        for (size_t i = 0; i < numRoots; ++i)
+        {
+            const Nif::Record* r = nif.getRoot(i);
+            if (!r)
+                continue;
+            const Nif::Node* node = dynamic_cast<const Nif::Node*>(r);
+            if (node)
+                roots.emplace_back(node);
+        }
+        const std::string filename = Files::pathToUnicodeString(nif.getFilename());
+        mShape->mFileName = filename;
+        if (roots.empty())
         {
-            const btVector3 extents = Misc::Convert::toBullet(mShape->mCollisionBox.mExtents);
-            const btVector3 center = Misc::Convert::toBullet(mShape->mCollisionBox.mCenter);
-            auto compound = std::make_unique<btCompoundShape>();
-            auto boxShape = std::make_unique<btBoxShape>(extents);
-            btTransform transform = btTransform::getIdentity();
-            transform.setOrigin(center);
-            compound->addChildShape(transform, boxShape.get());
-            std::ignore = boxShape.release();
-
-            mShape->mCollisionShape.reset(compound.release());
+            warn("Found no root nodes in NIF file " + filename);
             return mShape;
         }
-    }
-    // files with the name convention xmodel.nif usually have keyframes stored in a separate file xmodel.kf (see Animation::addAnimSource).
-    // assume all nodes in the file will be animated
-    const bool isAnimated = pathFileNameStartsWithX(filename);
 
-    // If there's no bounding box, we'll have to generate a Bullet collision shape
-    // from the collision data present in every root node.
-    for (const Nif::Node* node : roots)
-    {
-        bool hasCollisionNode = hasRootCollisionNode(*node);
-        bool hasCollisionShape = hasCollisionNode && !collisionShapeIsEmpty(*node);
-        if (hasCollisionNode && !hasCollisionShape)
-            mShape->mVisualCollisionType = Resource::VisualCollisionType::Camera;
-        bool generateCollisionShape = !hasCollisionShape;
-        handleNode(filename, *node, nullptr, 0, generateCollisionShape, isAnimated, generateCollisionShape,
-                   false, mShape->mVisualCollisionType);
-    }
+        // Try to find a valid bounding box first. If one's found for any root node, use that.
+        for (const Nif::Node* node : roots)
+        {
+            if (findBoundingBox(*node, filename))
+            {
+                const btVector3 extents = Misc::Convert::toBullet(mShape->mCollisionBox.mExtents);
+                const btVector3 center = Misc::Convert::toBullet(mShape->mCollisionBox.mCenter);
+                auto compound = std::make_unique<btCompoundShape>();
+                auto boxShape = std::make_unique<btBoxShape>(extents);
+                btTransform transform = btTransform::getIdentity();
+                transform.setOrigin(center);
+                compound->addChildShape(transform, boxShape.get());
+                std::ignore = boxShape.release();
+
+                mShape->mCollisionShape.reset(compound.release());
+                return mShape;
+            }
+        }
+        // files with the name convention xmodel.nif usually have keyframes stored in a separate file xmodel.kf (see
+        // Animation::addAnimSource). assume all nodes in the file will be animated
+        const bool isAnimated = pathFileNameStartsWithX(filename);
 
-    if (mCompoundShape)
-    {
-        if (mStaticMesh != nullptr && mStaticMesh->getNumTriangles() > 0)
+        // If there's no bounding box, we'll have to generate a Bullet collision shape
+        // from the collision data present in every root node.
+        for (const Nif::Node* node : roots)
+        {
+            bool hasCollisionNode = hasRootCollisionNode(*node);
+            bool hasCollisionShape = hasCollisionNode && !collisionShapeIsEmpty(*node);
+            if (hasCollisionNode && !hasCollisionShape)
+                mShape->mVisualCollisionType = Resource::VisualCollisionType::Camera;
+            bool generateCollisionShape = !hasCollisionShape;
+            handleNode(filename, *node, nullptr, 0, generateCollisionShape, isAnimated, generateCollisionShape, false,
+                mShape->mVisualCollisionType);
+        }
+
+        if (mCompoundShape)
+        {
+            if (mStaticMesh != nullptr && mStaticMesh->getNumTriangles() > 0)
+            {
+                btTransform trans;
+                trans.setIdentity();
+                std::unique_ptr<btCollisionShape> child
+                    = std::make_unique<Resource::TriangleMeshShape>(mStaticMesh.get(), true);
+                mCompoundShape->addChildShape(trans, child.get());
+                std::ignore = child.release();
+                std::ignore = mStaticMesh.release();
+            }
+            mShape->mCollisionShape = std::move(mCompoundShape);
+        }
+        else if (mStaticMesh != nullptr && mStaticMesh->getNumTriangles() > 0)
         {
-            btTransform trans;
-            trans.setIdentity();
-            std::unique_ptr<btCollisionShape> child = std::make_unique<Resource::TriangleMeshShape>(mStaticMesh.get(), true);
-            mCompoundShape->addChildShape(trans, child.get());
-            std::ignore = child.release();
+            mShape->mCollisionShape.reset(new Resource::TriangleMeshShape(mStaticMesh.get(), true));
             std::ignore = mStaticMesh.release();
         }
-        mShape->mCollisionShape = std::move(mCompoundShape);
-    }
-    else if (mStaticMesh != nullptr && mStaticMesh->getNumTriangles() > 0)
-    {
-        mShape->mCollisionShape.reset(new Resource::TriangleMeshShape(mStaticMesh.get(), true));
-        std::ignore = mStaticMesh.release();
-    }
 
-    if (mAvoidStaticMesh != nullptr && mAvoidStaticMesh->getNumTriangles() > 0)
-    {
-        mShape->mAvoidCollisionShape.reset(new Resource::TriangleMeshShape(mAvoidStaticMesh.get(), false));
-        std::ignore = mAvoidStaticMesh.release();
-    }
+        if (mAvoidStaticMesh != nullptr && mAvoidStaticMesh->getNumTriangles() > 0)
+        {
+            mShape->mAvoidCollisionShape.reset(new Resource::TriangleMeshShape(mAvoidStaticMesh.get(), false));
+            std::ignore = mAvoidStaticMesh.release();
+        }
 
-    return mShape;
-}
+        return mShape;
+    }
 
-// Find a boundingBox in the node hierarchy.
-// Return: use bounding box for collision?
-bool BulletNifLoader::findBoundingBox(const Nif::Node& node, const std::string& filename)
-{
-    if (node.hasBounds)
+    // Find a boundingBox in the node hierarchy.
+    // Return: use bounding box for collision?
+    bool BulletNifLoader::findBoundingBox(const Nif::Node& node, const std::string& filename)
     {
-        unsigned int type = node.bounds.type;
-        switch (type)
+        if (node.hasBounds)
         {
-            case Nif::NiBoundingVolume::Type::BOX_BV:
-                mShape->mCollisionBox.mExtents = node.bounds.box.extents;
-                mShape->mCollisionBox.mCenter = node.bounds.box.center;
-                break;
-            default:
+            unsigned int type = node.bounds.type;
+            switch (type)
+            {
+                case Nif::NiBoundingVolume::Type::BOX_BV:
+                    mShape->mCollisionBox.mExtents = node.bounds.box.extents;
+                    mShape->mCollisionBox.mCenter = node.bounds.box.center;
+                    break;
+                default:
+                {
+                    std::stringstream warning;
+                    warning << "Unsupported NiBoundingVolume type " << type << " in node " << node.recIndex;
+                    warning << " in file " << filename;
+                    warn(warning.str());
+                }
+            }
+
+            if (node.hasBBoxCollision())
             {
-                std::stringstream warning;
-                warning << "Unsupported NiBoundingVolume type " << type << " in node " << node.recIndex;
-                warning << " in file " << filename;
-                warn(warning.str());
+                return true;
             }
         }
 
-        if (node.hasBBoxCollision())
+        if (const Nif::NiNode* ninode = dynamic_cast<const Nif::NiNode*>(&node))
         {
-            return true;
+            const Nif::NodeList& list = ninode->children;
+            for (size_t i = 0; i < list.length(); i++)
+            {
+                if (!list[i].empty())
+                {
+                    if (findBoundingBox(list[i].get(), filename))
+                        return true;
+                }
+            }
         }
+        return false;
     }
 
-    if (const Nif::NiNode *ninode = dynamic_cast<const Nif::NiNode*>(&node))
+    bool BulletNifLoader::hasRootCollisionNode(const Nif::Node& rootNode) const
     {
-        const Nif::NodeList &list = ninode->children;
-        for(size_t i = 0;i < list.length();i++)
+        if (const Nif::NiNode* ninode = dynamic_cast<const Nif::NiNode*>(&rootNode))
         {
-            if(!list[i].empty())
+            const Nif::NodeList& list = ninode->children;
+            for (size_t i = 0; i < list.length(); i++)
             {
-                if (findBoundingBox(list[i].get(), filename))
+                if (list[i].empty())
+                    continue;
+                if (list[i].getPtr()->recType == Nif::RC_RootCollisionNode)
                     return true;
             }
         }
+        return false;
     }
-    return false;
-}
 
-bool BulletNifLoader::hasRootCollisionNode(const Nif::Node& rootNode) const
-{
-    if (const Nif::NiNode* ninode = dynamic_cast<const Nif::NiNode*>(&rootNode))
+    bool BulletNifLoader::collisionShapeIsEmpty(const Nif::Node& rootNode) const
     {
-        const Nif::NodeList &list = ninode->children;
-        for(size_t i = 0;i < list.length();i++)
+        if (const Nif::NiNode* ninode = dynamic_cast<const Nif::NiNode*>(&rootNode))
         {
-            if(list[i].empty())
-                continue;
-            if (list[i].getPtr()->recType == Nif::RC_RootCollisionNode)
-                return true;
+            const Nif::NodeList& list = ninode->children;
+            for (size_t i = 0; i < list.length(); i++)
+            {
+                if (list[i].empty())
+                    continue;
+                const Nif::Node* childNode = list[i].getPtr();
+                if (childNode->recType != Nif::RC_RootCollisionNode)
+                    continue;
+                const Nif::NiNode* niChildnode
+                    = static_cast<const Nif::NiNode*>(childNode); // RootCollisionNode is always a NiNode
+                if (childNode->hasBounds || niChildnode->children.length() > 0)
+                    return false;
+            }
         }
+        return true;
     }
-    return false;
-}
 
-bool BulletNifLoader::collisionShapeIsEmpty(const Nif::Node& rootNode) const
-{
-    if (const Nif::NiNode* ninode = dynamic_cast<const Nif::NiNode*>(&rootNode))
+    void BulletNifLoader::handleNode(const std::string& fileName, const Nif::Node& node, const Nif::Parent* parent,
+        int flags, bool isCollisionNode, bool isAnimated, bool autogenerated, bool avoid,
+        Resource::VisualCollisionType& visualCollisionType)
     {
-        const Nif::NodeList &list = ninode->children;
-        for(size_t i = 0;i < list.length();i++)
-        {
-            if(list[i].empty())
-                continue;
-            const Nif::Node* childNode = list[i].getPtr();
-            if (childNode->recType != Nif::RC_RootCollisionNode)
-                continue;
-            const Nif::NiNode* niChildnode = static_cast<const Nif::NiNode*>(childNode);  // RootCollisionNode is always a NiNode
-            if (childNode->hasBounds || niChildnode->children.length() > 0)
-                return false;
-        }
-    }
-    return true;
-}
-
-void BulletNifLoader::handleNode(const std::string& fileName, const Nif::Node& node, const Nif::Parent* parent,
-    int flags, bool isCollisionNode, bool isAnimated, bool autogenerated, bool avoid,
-    Resource::VisualCollisionType& visualCollisionType)
-{
-    // TODO: allow on-the fly collision switching via toggling this flag
-    if (node.recType == Nif::RC_NiCollisionSwitch && !node.collisionActive())
-        return;
+        // TODO: allow on-the fly collision switching via toggling this flag
+        if (node.recType == Nif::RC_NiCollisionSwitch && !node.collisionActive())
+            return;
 
-    // If RootCollisionNode is empty we treat it as NCC flag and autogenerate collision shape as there was no RootCollisionNode.
-    // So ignoring it here if `autogenerated` is true and collisionType was set to `Camera`.
-    if (node.recType == Nif::RC_RootCollisionNode && autogenerated
+        // If RootCollisionNode is empty we treat it as NCC flag and autogenerate collision shape as there was no
+        // RootCollisionNode. So ignoring it here if `autogenerated` is true and collisionType was set to `Camera`.
+        if (node.recType == Nif::RC_RootCollisionNode && autogenerated
             && visualCollisionType == Resource::VisualCollisionType::Camera)
-        return;
+            return;
 
-    // Accumulate the flags from all the child nodes. This works for all
-    // the flags we currently use, at least.
-    flags |= node.flags;
+        // Accumulate the flags from all the child nodes. This works for all
+        // the flags we currently use, at least.
+        flags |= node.flags;
 
-    if (!node.controller.empty() && node.controller->recType == Nif::RC_NiKeyframeController && node.controller->isActive())
-        isAnimated = true;
+        if (!node.controller.empty() && node.controller->recType == Nif::RC_NiKeyframeController
+            && node.controller->isActive())
+            isAnimated = true;
 
-    isCollisionNode = isCollisionNode || (node.recType == Nif::RC_RootCollisionNode);
+        isCollisionNode = isCollisionNode || (node.recType == Nif::RC_RootCollisionNode);
 
-    // Don't collide with AvoidNode shapes
-    avoid = avoid || (node.recType == Nif::RC_AvoidNode);
+        // Don't collide with AvoidNode shapes
+        avoid = avoid || (node.recType == Nif::RC_AvoidNode);
 
-    // We encountered a RootCollisionNode inside autogenerated mesh. It is not right.
-    if (node.recType == Nif::RC_RootCollisionNode && autogenerated)
-        Log(Debug::Info) << "RootCollisionNode is not attached to the root node in " << fileName << ". Treating it as a common NiTriShape.";
+        // We encountered a RootCollisionNode inside autogenerated mesh. It is not right.
+        if (node.recType == Nif::RC_RootCollisionNode && autogenerated)
+            Log(Debug::Info) << "RootCollisionNode is not attached to the root node in " << fileName
+                             << ". Treating it as a common NiTriShape.";
 
-    // Check for extra data
-    for (Nif::ExtraPtr e = node.extra; !e.empty(); e = e->next)
-    {
-        if (e->recType == Nif::RC_NiStringExtraData)
+        // Check for extra data
+        for (Nif::ExtraPtr e = node.extra; !e.empty(); e = e->next)
         {
-            // String markers may contain important information
-            // affecting the entire subtree of this node
-            Nif::NiStringExtraData *sd = (Nif::NiStringExtraData*)e.getPtr();
-
-            if (Misc::StringUtils::ciStartsWith(sd->string, "NC"))
-            {
-                // NCC flag in vanilla is partly case sensitive: prefix NC is case insensitive but second C needs be uppercase
-                if (sd->string.length() > 2 && sd->string[2] == 'C')
-                    // Collide only with camera.
-                    visualCollisionType = Resource::VisualCollisionType::Camera;
-                else
-                    // No collision.
-                    visualCollisionType = Resource::VisualCollisionType::Default;
-            }
-            else if (sd->string == "MRK" && autogenerated)
+            if (e->recType == Nif::RC_NiStringExtraData)
             {
-                // Marker can still have collision if the model explicitely specifies it via a RootCollisionNode.
-                return;
-            }
+                // String markers may contain important information
+                // affecting the entire subtree of this node
+                Nif::NiStringExtraData* sd = (Nif::NiStringExtraData*)e.getPtr();
 
+                if (Misc::StringUtils::ciStartsWith(sd->string, "NC"))
+                {
+                    // NCC flag in vanilla is partly case sensitive: prefix NC is case insensitive but second C needs be
+                    // uppercase
+                    if (sd->string.length() > 2 && sd->string[2] == 'C')
+                        // Collide only with camera.
+                        visualCollisionType = Resource::VisualCollisionType::Camera;
+                    else
+                        // No collision.
+                        visualCollisionType = Resource::VisualCollisionType::Default;
+                }
+                else if (sd->string == "MRK" && autogenerated)
+                {
+                    // Marker can still have collision if the model explicitely specifies it via a RootCollisionNode.
+                    return;
+                }
+            }
         }
-    }
 
-    if (isCollisionNode)
-    {
-        // NOTE: a trishape with hasBounds=true, but no BBoxCollision flag should NOT go through handleNiTriShape!
-        // It must be ignored completely.
-        // (occurs in tr_ex_imp_wall_arch_04.nif)
-        if(!node.hasBounds && (node.recType == Nif::RC_NiTriShape
-                                || node.recType == Nif::RC_NiTriStrips
-                                || node.recType == Nif::RC_BSLODTriShape))
+        if (isCollisionNode)
         {
-            handleNiTriShape(static_cast<const Nif::NiGeometry&>(node), parent, getWorldTransform(node, parent), isAnimated, avoid);
+            // NOTE: a trishape with hasBounds=true, but no BBoxCollision flag should NOT go through handleNiTriShape!
+            // It must be ignored completely.
+            // (occurs in tr_ex_imp_wall_arch_04.nif)
+            if (!node.hasBounds
+                && (node.recType == Nif::RC_NiTriShape || node.recType == Nif::RC_NiTriStrips
+                    || node.recType == Nif::RC_BSLODTriShape))
+            {
+                handleNiTriShape(static_cast<const Nif::NiGeometry&>(node), parent, getWorldTransform(node, parent),
+                    isAnimated, avoid);
+            }
         }
-    }
 
-    // For NiNodes, loop through children
-    if (const Nif::NiNode *ninode = dynamic_cast<const Nif::NiNode*>(&node))
-    {
-        const Nif::NodeList &list = ninode->children;
-        const Nif::Parent currentParent {*ninode, parent};
-        for(size_t i = 0;i < list.length();i++)
+        // For NiNodes, loop through children
+        if (const Nif::NiNode* ninode = dynamic_cast<const Nif::NiNode*>(&node))
         {
-            if (list[i].empty())
-                continue;
+            const Nif::NodeList& list = ninode->children;
+            const Nif::Parent currentParent{ *ninode, parent };
+            for (size_t i = 0; i < list.length(); i++)
+            {
+                if (list[i].empty())
+                    continue;
 
-            assert(std::find(list[i]->parents.begin(), list[i]->parents.end(), ninode) != list[i]->parents.end());
-            handleNode(fileName, list[i].get(), &currentParent, flags, isCollisionNode, isAnimated, autogenerated, avoid, visualCollisionType);
+                assert(std::find(list[i]->parents.begin(), list[i]->parents.end(), ninode) != list[i]->parents.end());
+                handleNode(fileName, list[i].get(), &currentParent, flags, isCollisionNode, isAnimated, autogenerated,
+                    avoid, visualCollisionType);
+            }
         }
     }
-}
-
-void BulletNifLoader::handleNiTriShape(const Nif::NiGeometry& niGeometry, const Nif::Parent* nodeParent,
-    const osg::Matrixf &transform, bool isAnimated, bool avoid)
-{
-    if (niGeometry.data.empty() || niGeometry.data->vertices.empty())
-        return;
-
-    if (!niGeometry.skin.empty())
-        isAnimated = false;
 
-    if (isAnimated)
+    void BulletNifLoader::handleNiTriShape(const Nif::NiGeometry& niGeometry, const Nif::Parent* nodeParent,
+        const osg::Matrixf& transform, bool isAnimated, bool avoid)
     {
-        std::unique_ptr<btTriangleMesh> childMesh = makeChildMesh(niGeometry);
-        if (childMesh == nullptr || childMesh->getNumTriangles() == 0)
+        if (niGeometry.data.empty() || niGeometry.data->vertices.empty())
             return;
 
-        if (!mCompoundShape)
-            mCompoundShape.reset(new btCompoundShape);
+        if (!niGeometry.skin.empty())
+            isAnimated = false;
 
-        auto childShape = std::make_unique<Resource::TriangleMeshShape>(childMesh.get(), true);
-        std::ignore = childMesh.release();
+        if (isAnimated)
+        {
+            std::unique_ptr<btTriangleMesh> childMesh = makeChildMesh(niGeometry);
+            if (childMesh == nullptr || childMesh->getNumTriangles() == 0)
+                return;
 
-        float scale = niGeometry.trafo.scale;
-        for (const Nif::Parent* parent = nodeParent; parent != nullptr; parent = parent->mParent)
-            scale *= parent->mNiNode.trafo.scale;
-        osg::Quat q = transform.getRotate();
-        osg::Vec3f v = transform.getTrans();
-        childShape->setLocalScaling(btVector3(scale, scale, scale));
+            if (!mCompoundShape)
+                mCompoundShape.reset(new btCompoundShape);
 
-        btTransform trans(btQuaternion(q.x(), q.y(), q.z(), q.w()), btVector3(v.x(), v.y(), v.z()));
+            auto childShape = std::make_unique<Resource::TriangleMeshShape>(childMesh.get(), true);
+            std::ignore = childMesh.release();
 
-        mShape->mAnimatedShapes.emplace(niGeometry.recIndex, mCompoundShape->getNumChildShapes());
+            float scale = niGeometry.trafo.scale;
+            for (const Nif::Parent* parent = nodeParent; parent != nullptr; parent = parent->mParent)
+                scale *= parent->mNiNode.trafo.scale;
+            osg::Quat q = transform.getRotate();
+            osg::Vec3f v = transform.getTrans();
+            childShape->setLocalScaling(btVector3(scale, scale, scale));
 
-        mCompoundShape->addChildShape(trans, childShape.get());
-        std::ignore = childShape.release();
+            btTransform trans(btQuaternion(q.x(), q.y(), q.z(), q.w()), btVector3(v.x(), v.y(), v.z()));
+
+            mShape->mAnimatedShapes.emplace(niGeometry.recIndex, mCompoundShape->getNumChildShapes());
+
+            mCompoundShape->addChildShape(trans, childShape.get());
+            std::ignore = childShape.release();
+        }
+        else if (avoid)
+            fillTriangleMesh(mAvoidStaticMesh, niGeometry, transform);
+        else
+            fillTriangleMesh(mStaticMesh, niGeometry, transform);
     }
-    else if (avoid)
-        fillTriangleMesh(mAvoidStaticMesh, niGeometry, transform);
-    else
-        fillTriangleMesh(mStaticMesh, niGeometry, transform);
-}
 
 } // namespace NifBullet
diff --git a/components/nifbullet/bulletnifloader.hpp b/components/nifbullet/bulletnifloader.hpp
index eefb34b942..a28a27376a 100644
--- a/components/nifbullet/bulletnifloader.hpp
+++ b/components/nifbullet/bulletnifloader.hpp
@@ -2,14 +2,14 @@
 #define OPENMW_COMPONENTS_NIFBULLET_BULLETNIFLOADER_HPP
 
 #include <cassert>
-#include <string>
-#include <set>
 #include <map>
+#include <set>
+#include <string>
 
-#include <osg/Matrixf>
 #include <osg/BoundingBox>
-#include <osg/ref_ptr>
+#include <osg/Matrixf>
 #include <osg/Referenced>
+#include <osg/ref_ptr>
 
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
 
@@ -34,46 +34,43 @@ namespace Nif
 namespace NifBullet
 {
 
-/**
-*Load bulletShape from NIF files.
-*/
-class BulletNifLoader
-{
-public:
-    void warn(const std::string &msg)
+    /**
+     *Load bulletShape from NIF files.
+     */
+    class BulletNifLoader
     {
-        Log(Debug::Warning) << "NIFLoader: Warn: " << msg;
-    }
+    public:
+        void warn(const std::string& msg) { Log(Debug::Warning) << "NIFLoader: Warn: " << msg; }
 
-    [[noreturn]] void fail(const std::string &msg)
-    {
-        Log(Debug::Error) << "NIFLoader: Fail: "<< msg;
-        abort();
-    }
+        [[noreturn]] void fail(const std::string& msg)
+        {
+            Log(Debug::Error) << "NIFLoader: Fail: " << msg;
+            abort();
+        }
 
-    osg::ref_ptr<Resource::BulletShape> load(const Nif::File& file);
+        osg::ref_ptr<Resource::BulletShape> load(const Nif::File& file);
 
-private:
-    bool findBoundingBox(const Nif::Node& node, const std::string& filename);
+    private:
+        bool findBoundingBox(const Nif::Node& node, const std::string& filename);
 
-    void handleNode(const std::string& fileName, const Nif::Node& node, const Nif::Parent* parent, int flags,
-        bool isCollisionNode, bool isAnimated, bool autogenerated, bool avoid,
-        Resource::VisualCollisionType& visualCollisionType);
+        void handleNode(const std::string& fileName, const Nif::Node& node, const Nif::Parent* parent, int flags,
+            bool isCollisionNode, bool isAnimated, bool autogenerated, bool avoid,
+            Resource::VisualCollisionType& visualCollisionType);
 
-    bool hasRootCollisionNode(const Nif::Node& rootNode) const;
-    bool collisionShapeIsEmpty(const Nif::Node& rootNode) const;
+        bool hasRootCollisionNode(const Nif::Node& rootNode) const;
+        bool collisionShapeIsEmpty(const Nif::Node& rootNode) const;
 
-    void handleNiTriShape(const Nif::NiGeometry& nifNode, const Nif::Parent* parent, const osg::Matrixf& transform,
-        bool isAnimated, bool avoid);
+        void handleNiTriShape(const Nif::NiGeometry& nifNode, const Nif::Parent* parent, const osg::Matrixf& transform,
+            bool isAnimated, bool avoid);
 
-    std::unique_ptr<btCompoundShape, Resource::DeleteCollisionShape> mCompoundShape;
+        std::unique_ptr<btCompoundShape, Resource::DeleteCollisionShape> mCompoundShape;
 
-    std::unique_ptr<btTriangleMesh> mStaticMesh;
+        std::unique_ptr<btTriangleMesh> mStaticMesh;
 
-    std::unique_ptr<btTriangleMesh> mAvoidStaticMesh;
+        std::unique_ptr<btTriangleMesh> mAvoidStaticMesh;
 
-    osg::ref_ptr<Resource::BulletShape> mShape;
-};
+        osg::ref_ptr<Resource::BulletShape> mShape;
+    };
 
 }
 
diff --git a/components/nifosg/controller.cpp b/components/nifosg/controller.cpp
index 5403a29ab2..c2102a5345 100644
--- a/components/nifosg/controller.cpp
+++ b/components/nifosg/controller.cpp
@@ -1,8 +1,8 @@
 #include "controller.hpp"
 
+#include <osg/Material>
 #include <osg/MatrixTransform>
 #include <osg/TexMat>
-#include <osg/Material>
 #include <osg/Texture2D>
 
 #include <osgParticle/Emitter>
@@ -15,615 +15,616 @@
 namespace NifOsg
 {
 
-ControllerFunction::ControllerFunction(const Nif::Controller *ctrl)
-    : mFrequency(ctrl->frequency)
-    , mPhase(ctrl->phase)
-    , mStartTime(ctrl->timeStart)
-    , mStopTime(ctrl->timeStop)
-    , mExtrapolationMode(ctrl->extrapolationMode())
-{
-}
-
-float ControllerFunction::calculate(float value) const
-{
-    float time = mFrequency * value + mPhase;
-    if (time >= mStartTime && time <= mStopTime)
-        return time;
-    switch (mExtrapolationMode)
+    ControllerFunction::ControllerFunction(const Nif::Controller* ctrl)
+        : mFrequency(ctrl->frequency)
+        , mPhase(ctrl->phase)
+        , mStartTime(ctrl->timeStart)
+        , mStopTime(ctrl->timeStop)
+        , mExtrapolationMode(ctrl->extrapolationMode())
     {
-    case Nif::Controller::ExtrapolationMode::Cycle:
-    {
-        float delta = mStopTime - mStartTime;
-        if ( delta <= 0 )
-            return mStartTime;
-        float cycles = ( time - mStartTime ) / delta;
-        float remainder = ( cycles - std::floor( cycles ) ) * delta;
-        return mStartTime + remainder;
     }
-    case Nif::Controller::ExtrapolationMode::Reverse:
+
+    float ControllerFunction::calculate(float value) const
     {
-        float delta = mStopTime - mStartTime;
-        if ( delta <= 0 )
-            return mStartTime;
+        float time = mFrequency * value + mPhase;
+        if (time >= mStartTime && time <= mStopTime)
+            return time;
+        switch (mExtrapolationMode)
+        {
+            case Nif::Controller::ExtrapolationMode::Cycle:
+            {
+                float delta = mStopTime - mStartTime;
+                if (delta <= 0)
+                    return mStartTime;
+                float cycles = (time - mStartTime) / delta;
+                float remainder = (cycles - std::floor(cycles)) * delta;
+                return mStartTime + remainder;
+            }
+            case Nif::Controller::ExtrapolationMode::Reverse:
+            {
+                float delta = mStopTime - mStartTime;
+                if (delta <= 0)
+                    return mStartTime;
 
-        float cycles = ( time - mStartTime ) / delta;
-        float remainder = ( cycles - std::floor( cycles ) ) * delta;
+                float cycles = (time - mStartTime) / delta;
+                float remainder = (cycles - std::floor(cycles)) * delta;
 
-        // Even number of cycles?
-        if ( ( static_cast<int>(std::fabs( std::floor( cycles ) )) % 2 ) == 0 )
-            return mStartTime + remainder;
+                // Even number of cycles?
+                if ((static_cast<int>(std::fabs(std::floor(cycles))) % 2) == 0)
+                    return mStartTime + remainder;
 
-        return mStopTime - remainder;
-    }
-    case Nif::Controller::ExtrapolationMode::Constant:
-    default:
-        return std::clamp(time, mStartTime, mStopTime);
+                return mStopTime - remainder;
+            }
+            case Nif::Controller::ExtrapolationMode::Constant:
+            default:
+                return std::clamp(time, mStartTime, mStopTime);
+        }
     }
-}
-
-float ControllerFunction::getMaximum() const
-{
-    return mStopTime;
-}
 
-KeyframeController::KeyframeController()
-{
-}
+    float ControllerFunction::getMaximum() const
+    {
+        return mStopTime;
+    }
 
-KeyframeController::KeyframeController(const KeyframeController &copy, const osg::CopyOp &copyop)
-    : osg::Object(copy, copyop)
-    , SceneUtil::KeyframeController(copy)
-    , SceneUtil::NodeCallback<KeyframeController, NifOsg::MatrixTransform*>(copy, copyop)
-    , mRotations(copy.mRotations)
-    , mXRotations(copy.mXRotations)
-    , mYRotations(copy.mYRotations)
-    , mZRotations(copy.mZRotations)
-    , mTranslations(copy.mTranslations)
-    , mScales(copy.mScales)
-    , mAxisOrder(copy.mAxisOrder)
-{
-}
+    KeyframeController::KeyframeController() {}
+
+    KeyframeController::KeyframeController(const KeyframeController& copy, const osg::CopyOp& copyop)
+        : osg::Object(copy, copyop)
+        , SceneUtil::KeyframeController(copy)
+        , SceneUtil::NodeCallback<KeyframeController, NifOsg::MatrixTransform*>(copy, copyop)
+        , mRotations(copy.mRotations)
+        , mXRotations(copy.mXRotations)
+        , mYRotations(copy.mYRotations)
+        , mZRotations(copy.mZRotations)
+        , mTranslations(copy.mTranslations)
+        , mScales(copy.mScales)
+        , mAxisOrder(copy.mAxisOrder)
+    {
+    }
 
-KeyframeController::KeyframeController(const Nif::NiKeyframeController *keyctrl)
-{
-    if (!keyctrl->mInterpolator.empty())
+    KeyframeController::KeyframeController(const Nif::NiKeyframeController* keyctrl)
     {
-        if (keyctrl->mInterpolator->recType == Nif::RC_NiTransformInterpolator)
+        if (!keyctrl->mInterpolator.empty())
         {
-            const Nif::NiTransformInterpolator* interp = static_cast<const Nif::NiTransformInterpolator*>(keyctrl->mInterpolator.getPtr());
-            if (!interp->data.empty())
+            if (keyctrl->mInterpolator->recType == Nif::RC_NiTransformInterpolator)
             {
-                mRotations = QuaternionInterpolator(interp->data->mRotations, interp->defaultRot);
-                mXRotations = FloatInterpolator(interp->data->mXRotations);
-                mYRotations = FloatInterpolator(interp->data->mYRotations);
-                mZRotations = FloatInterpolator(interp->data->mZRotations);
-                mTranslations = Vec3Interpolator(interp->data->mTranslations, interp->defaultPos);
-                mScales = FloatInterpolator(interp->data->mScales, interp->defaultScale);
-                mAxisOrder = interp->data->mAxisOrder;
-            }
-            else
-            {
-                mRotations = QuaternionInterpolator(Nif::QuaternionKeyMapPtr(), interp->defaultRot);
-                mTranslations = Vec3Interpolator(Nif::Vector3KeyMapPtr(), interp->defaultPos);
-                mScales = FloatInterpolator(Nif::FloatKeyMapPtr(), interp->defaultScale);
+                const Nif::NiTransformInterpolator* interp
+                    = static_cast<const Nif::NiTransformInterpolator*>(keyctrl->mInterpolator.getPtr());
+                if (!interp->data.empty())
+                {
+                    mRotations = QuaternionInterpolator(interp->data->mRotations, interp->defaultRot);
+                    mXRotations = FloatInterpolator(interp->data->mXRotations);
+                    mYRotations = FloatInterpolator(interp->data->mYRotations);
+                    mZRotations = FloatInterpolator(interp->data->mZRotations);
+                    mTranslations = Vec3Interpolator(interp->data->mTranslations, interp->defaultPos);
+                    mScales = FloatInterpolator(interp->data->mScales, interp->defaultScale);
+                    mAxisOrder = interp->data->mAxisOrder;
+                }
+                else
+                {
+                    mRotations = QuaternionInterpolator(Nif::QuaternionKeyMapPtr(), interp->defaultRot);
+                    mTranslations = Vec3Interpolator(Nif::Vector3KeyMapPtr(), interp->defaultPos);
+                    mScales = FloatInterpolator(Nif::FloatKeyMapPtr(), interp->defaultScale);
+                }
             }
         }
+        else if (!keyctrl->mData.empty())
+        {
+            const Nif::NiKeyframeData* keydata = keyctrl->mData.getPtr();
+            mRotations = QuaternionInterpolator(keydata->mRotations);
+            mXRotations = FloatInterpolator(keydata->mXRotations);
+            mYRotations = FloatInterpolator(keydata->mYRotations);
+            mZRotations = FloatInterpolator(keydata->mZRotations);
+            mTranslations = Vec3Interpolator(keydata->mTranslations);
+            mScales = FloatInterpolator(keydata->mScales, 1.f);
+            mAxisOrder = keydata->mAxisOrder;
+        }
     }
-    else if (!keyctrl->mData.empty())
+
+    osg::Quat KeyframeController::getXYZRotation(float time) const
     {
-        const Nif::NiKeyframeData* keydata = keyctrl->mData.getPtr();
-        mRotations = QuaternionInterpolator(keydata->mRotations);
-        mXRotations = FloatInterpolator(keydata->mXRotations);
-        mYRotations = FloatInterpolator(keydata->mYRotations);
-        mZRotations = FloatInterpolator(keydata->mZRotations);
-        mTranslations = Vec3Interpolator(keydata->mTranslations);
-        mScales = FloatInterpolator(keydata->mScales, 1.f);
-        mAxisOrder = keydata->mAxisOrder;
+        float xrot = 0, yrot = 0, zrot = 0;
+        if (!mXRotations.empty())
+            xrot = mXRotations.interpKey(time);
+        if (!mYRotations.empty())
+            yrot = mYRotations.interpKey(time);
+        if (!mZRotations.empty())
+            zrot = mZRotations.interpKey(time);
+        osg::Quat xr(xrot, osg::X_AXIS);
+        osg::Quat yr(yrot, osg::Y_AXIS);
+        osg::Quat zr(zrot, osg::Z_AXIS);
+        switch (mAxisOrder)
+        {
+            case Nif::NiKeyframeData::AxisOrder::Order_XYZ:
+                return xr * yr * zr;
+            case Nif::NiKeyframeData::AxisOrder::Order_XZY:
+                return xr * zr * yr;
+            case Nif::NiKeyframeData::AxisOrder::Order_YZX:
+                return yr * zr * xr;
+            case Nif::NiKeyframeData::AxisOrder::Order_YXZ:
+                return yr * xr * zr;
+            case Nif::NiKeyframeData::AxisOrder::Order_ZXY:
+                return zr * xr * yr;
+            case Nif::NiKeyframeData::AxisOrder::Order_ZYX:
+                return zr * yr * xr;
+            case Nif::NiKeyframeData::AxisOrder::Order_XYX:
+                return xr * yr * xr;
+            case Nif::NiKeyframeData::AxisOrder::Order_YZY:
+                return yr * zr * yr;
+            case Nif::NiKeyframeData::AxisOrder::Order_ZXZ:
+                return zr * xr * zr;
+        }
+        return xr * yr * zr;
     }
-}
 
-osg::Quat KeyframeController::getXYZRotation(float time) const
-{
-    float xrot = 0, yrot = 0, zrot = 0;
-    if (!mXRotations.empty())
-        xrot = mXRotations.interpKey(time);
-    if (!mYRotations.empty())
-        yrot = mYRotations.interpKey(time);
-    if (!mZRotations.empty())
-        zrot = mZRotations.interpKey(time);
-    osg::Quat xr(xrot, osg::X_AXIS);
-    osg::Quat yr(yrot, osg::Y_AXIS);
-    osg::Quat zr(zrot, osg::Z_AXIS);
-    switch (mAxisOrder)
-    {
-        case Nif::NiKeyframeData::AxisOrder::Order_XYZ:
-            return xr * yr * zr;
-        case Nif::NiKeyframeData::AxisOrder::Order_XZY:
-            return xr * zr * yr;
-        case Nif::NiKeyframeData::AxisOrder::Order_YZX:
-            return yr * zr * xr;
-        case Nif::NiKeyframeData::AxisOrder::Order_YXZ:
-            return yr * xr * zr;
-        case Nif::NiKeyframeData::AxisOrder::Order_ZXY:
-            return zr * xr * yr;
-        case Nif::NiKeyframeData::AxisOrder::Order_ZYX:
-            return zr * yr * xr;
-        case Nif::NiKeyframeData::AxisOrder::Order_XYX:
-            return xr * yr * xr;
-        case Nif::NiKeyframeData::AxisOrder::Order_YZY:
-            return yr * zr * yr;
-        case Nif::NiKeyframeData::AxisOrder::Order_ZXZ:
-            return zr * xr * zr;
-    }
-    return xr * yr * zr;
-}
-
-osg::Vec3f KeyframeController::getTranslation(float time) const
-{
-    if(!mTranslations.empty())
-        return mTranslations.interpKey(time);
-    return osg::Vec3f();
-}
-
-void KeyframeController::operator() (NifOsg::MatrixTransform* node, osg::NodeVisitor* nv)
-{
-    if (hasInput())
+    osg::Vec3f KeyframeController::getTranslation(float time) const
     {
-        float time = getInputValue(nv);
-
-        if (!mRotations.empty())
-            node->setRotation(mRotations.interpKey(time));
-        else if (!mXRotations.empty() || !mYRotations.empty() || !mZRotations.empty())
-            node->setRotation(getXYZRotation(time));
-        else
-            node->setRotation(node->mRotationScale);
-
-        if (!mScales.empty())
-            node->setScale(mScales.interpKey(time));
-
         if (!mTranslations.empty())
-            node->setTranslation(mTranslations.interpKey(time));
+            return mTranslations.interpKey(time);
+        return osg::Vec3f();
     }
 
-    traverse(node, nv);
-}
+    void KeyframeController::operator()(NifOsg::MatrixTransform* node, osg::NodeVisitor* nv)
+    {
+        if (hasInput())
+        {
+            float time = getInputValue(nv);
 
-GeomMorpherController::GeomMorpherController()
-{
-}
+            if (!mRotations.empty())
+                node->setRotation(mRotations.interpKey(time));
+            else if (!mXRotations.empty() || !mYRotations.empty() || !mZRotations.empty())
+                node->setRotation(getXYZRotation(time));
+            else
+                node->setRotation(node->mRotationScale);
 
-GeomMorpherController::GeomMorpherController(const GeomMorpherController &copy, const osg::CopyOp &copyop)
-    : Controller(copy)
-    , SceneUtil::NodeCallback<GeomMorpherController, SceneUtil::MorphGeometry*>(copy, copyop)
-    , mKeyFrames(copy.mKeyFrames)
-    , mWeights(copy.mWeights)
-{
-}
+            if (!mScales.empty())
+                node->setScale(mScales.interpKey(time));
 
-GeomMorpherController::GeomMorpherController(const Nif::NiGeomMorpherController* ctrl)
-{
-    if (ctrl->mInterpolators.length() == 0)
-    {
-        if (!ctrl->mData.empty())
-        {
-            for (const auto& morph : ctrl->mData->mMorphs)
-                mKeyFrames.emplace_back(morph.mKeyFrames);
+            if (!mTranslations.empty())
+                node->setTranslation(mTranslations.interpKey(time));
         }
-        return;
+
+        traverse(node, nv);
     }
 
-    mKeyFrames.resize(ctrl->mInterpolators.length());
-    mWeights = ctrl->mWeights;
+    GeomMorpherController::GeomMorpherController() {}
 
-    for (size_t i = 0; i < ctrl->mInterpolators.length(); ++i)
+    GeomMorpherController::GeomMorpherController(const GeomMorpherController& copy, const osg::CopyOp& copyop)
+        : Controller(copy)
+        , SceneUtil::NodeCallback<GeomMorpherController, SceneUtil::MorphGeometry*>(copy, copyop)
+        , mKeyFrames(copy.mKeyFrames)
+        , mWeights(copy.mWeights)
     {
-        if (!ctrl->mInterpolators[i].empty() && ctrl->mInterpolators[i]->recType == Nif::RC_NiFloatInterpolator)
-        {
-            auto interpolator = static_cast<const Nif::NiFloatInterpolator*>(ctrl->mInterpolators[i].getPtr());
-            mKeyFrames[i] = FloatInterpolator(interpolator);
-        }
     }
-}
 
-void GeomMorpherController::operator()(SceneUtil::MorphGeometry* node, osg::NodeVisitor *nv)
-{
-    if (hasInput())
+    GeomMorpherController::GeomMorpherController(const Nif::NiGeomMorpherController* ctrl)
     {
-        if (mKeyFrames.size() <= 1)
-            return;
-        float input = getInputValue(nv);
-        size_t i = 1;
-        for (std::vector<FloatInterpolator>::iterator it = mKeyFrames.begin()+1; it != mKeyFrames.end(); ++it,++i)
+        if (ctrl->mInterpolators.length() == 0)
         {
-            float val = 0;
-            if (!(*it).empty())
+            if (!ctrl->mData.empty())
             {
-                val = it->interpKey(input);
-                if (i < mWeights.size())
-                    val *= mWeights[i];
+                for (const auto& morph : ctrl->mData->mMorphs)
+                    mKeyFrames.emplace_back(morph.mKeyFrames);
             }
+            return;
+        }
+
+        mKeyFrames.resize(ctrl->mInterpolators.length());
+        mWeights = ctrl->mWeights;
 
-            SceneUtil::MorphGeometry::MorphTarget& target = node->getMorphTarget(i);
-            if (target.getWeight() != val)
+        for (size_t i = 0; i < ctrl->mInterpolators.length(); ++i)
+        {
+            if (!ctrl->mInterpolators[i].empty() && ctrl->mInterpolators[i]->recType == Nif::RC_NiFloatInterpolator)
             {
-                target.setWeight(val);
-                node->dirty();
+                auto interpolator = static_cast<const Nif::NiFloatInterpolator*>(ctrl->mInterpolators[i].getPtr());
+                mKeyFrames[i] = FloatInterpolator(interpolator);
             }
         }
     }
-}
 
-UVController::UVController()
-{
-}
-
-UVController::UVController(const Nif::NiUVData *data, const std::set<int>& textureUnits)
-    : mUTrans(data->mKeyList[0], 0.f)
-    , mVTrans(data->mKeyList[1], 0.f)
-    , mUScale(data->mKeyList[2], 1.f)
-    , mVScale(data->mKeyList[3], 1.f)
-    , mTextureUnits(textureUnits)
-{
-}
-
-UVController::UVController(const UVController& copy, const osg::CopyOp& copyop)
-    : osg::Object(copy, copyop), StateSetUpdater(copy, copyop), Controller(copy)
-    , mUTrans(copy.mUTrans)
-    , mVTrans(copy.mVTrans)
-    , mUScale(copy.mUScale)
-    , mVScale(copy.mVScale)
-    , mTextureUnits(copy.mTextureUnits)
-{
-}
+    void GeomMorpherController::operator()(SceneUtil::MorphGeometry* node, osg::NodeVisitor* nv)
+    {
+        if (hasInput())
+        {
+            if (mKeyFrames.size() <= 1)
+                return;
+            float input = getInputValue(nv);
+            size_t i = 1;
+            for (std::vector<FloatInterpolator>::iterator it = mKeyFrames.begin() + 1; it != mKeyFrames.end();
+                 ++it, ++i)
+            {
+                float val = 0;
+                if (!(*it).empty())
+                {
+                    val = it->interpKey(input);
+                    if (i < mWeights.size())
+                        val *= mWeights[i];
+                }
+
+                SceneUtil::MorphGeometry::MorphTarget& target = node->getMorphTarget(i);
+                if (target.getWeight() != val)
+                {
+                    target.setWeight(val);
+                    node->dirty();
+                }
+            }
+        }
+    }
 
-void UVController::setDefaults(osg::StateSet *stateset)
-{
-    osg::ref_ptr<osg::TexMat> texMat (new osg::TexMat);
-    for (std::set<int>::const_iterator it = mTextureUnits.begin(); it != mTextureUnits.end(); ++it)
-        stateset->setTextureAttributeAndModes(*it, texMat, osg::StateAttribute::ON);
-}
+    UVController::UVController() {}
 
-void UVController::apply(osg::StateSet* stateset, osg::NodeVisitor* nv)
-{
-    if (hasInput())
+    UVController::UVController(const Nif::NiUVData* data, const std::set<int>& textureUnits)
+        : mUTrans(data->mKeyList[0], 0.f)
+        , mVTrans(data->mKeyList[1], 0.f)
+        , mUScale(data->mKeyList[2], 1.f)
+        , mVScale(data->mKeyList[3], 1.f)
+        , mTextureUnits(textureUnits)
     {
-        float value = getInputValue(nv);
+    }
 
-        // First scale the UV relative to its center, then apply the offset.
-        // U offset is flipped regardless of the graphics library,
-        // while V offset is flipped to account for OpenGL Y axis convention.
-        osg::Vec3f uvOrigin(0.5f, 0.5f, 0.f);
-        osg::Vec3f uvScale(mUScale.interpKey(value), mVScale.interpKey(value), 1.f);
-        osg::Vec3f uvTrans(-mUTrans.interpKey(value), -mVTrans.interpKey(value), 0.f);
+    UVController::UVController(const UVController& copy, const osg::CopyOp& copyop)
+        : osg::Object(copy, copyop)
+        , StateSetUpdater(copy, copyop)
+        , Controller(copy)
+        , mUTrans(copy.mUTrans)
+        , mVTrans(copy.mVTrans)
+        , mUScale(copy.mUScale)
+        , mVScale(copy.mVScale)
+        , mTextureUnits(copy.mTextureUnits)
+    {
+    }
 
-        osg::Matrixf mat = osg::Matrixf::translate(uvOrigin);
-        mat.preMultScale(uvScale);
-        mat.preMultTranslate(-uvOrigin);
-        mat.setTrans(mat.getTrans() + uvTrans);
+    void UVController::setDefaults(osg::StateSet* stateset)
+    {
+        osg::ref_ptr<osg::TexMat> texMat(new osg::TexMat);
+        for (std::set<int>::const_iterator it = mTextureUnits.begin(); it != mTextureUnits.end(); ++it)
+            stateset->setTextureAttributeAndModes(*it, texMat, osg::StateAttribute::ON);
+    }
 
-        // setting once is enough because all other texture units share the same TexMat (see setDefaults).
-        if (!mTextureUnits.empty())
+    void UVController::apply(osg::StateSet* stateset, osg::NodeVisitor* nv)
+    {
+        if (hasInput())
         {
-            osg::TexMat* texMat = static_cast<osg::TexMat*>(stateset->getTextureAttribute(*mTextureUnits.begin(), osg::StateAttribute::TEXMAT));
-            texMat->setMatrix(mat);
+            float value = getInputValue(nv);
+
+            // First scale the UV relative to its center, then apply the offset.
+            // U offset is flipped regardless of the graphics library,
+            // while V offset is flipped to account for OpenGL Y axis convention.
+            osg::Vec3f uvOrigin(0.5f, 0.5f, 0.f);
+            osg::Vec3f uvScale(mUScale.interpKey(value), mVScale.interpKey(value), 1.f);
+            osg::Vec3f uvTrans(-mUTrans.interpKey(value), -mVTrans.interpKey(value), 0.f);
+
+            osg::Matrixf mat = osg::Matrixf::translate(uvOrigin);
+            mat.preMultScale(uvScale);
+            mat.preMultTranslate(-uvOrigin);
+            mat.setTrans(mat.getTrans() + uvTrans);
+
+            // setting once is enough because all other texture units share the same TexMat (see setDefaults).
+            if (!mTextureUnits.empty())
+            {
+                osg::TexMat* texMat = static_cast<osg::TexMat*>(
+                    stateset->getTextureAttribute(*mTextureUnits.begin(), osg::StateAttribute::TEXMAT));
+                texMat->setMatrix(mat);
+            }
         }
     }
-}
 
-VisController::VisController(const Nif::NiVisController *ctrl, unsigned int mask)
-    : mMask(mask)
-{
-    if (!ctrl->mInterpolator.empty())
+    VisController::VisController(const Nif::NiVisController* ctrl, unsigned int mask)
+        : mMask(mask)
     {
-        if (ctrl->mInterpolator->recType == Nif::RC_NiBoolInterpolator)
-            mInterpolator = ByteInterpolator(static_cast<const Nif::NiBoolInterpolator*>(ctrl->mInterpolator.getPtr()));
+        if (!ctrl->mInterpolator.empty())
+        {
+            if (ctrl->mInterpolator->recType == Nif::RC_NiBoolInterpolator)
+                mInterpolator
+                    = ByteInterpolator(static_cast<const Nif::NiBoolInterpolator*>(ctrl->mInterpolator.getPtr()));
+        }
+        else if (!ctrl->mData.empty())
+            mData = ctrl->mData->mVis;
     }
-    else if (!ctrl->mData.empty())
-        mData = ctrl->mData->mVis;
 
-}
+    VisController::VisController() {}
 
-VisController::VisController()
-{
-}
+    VisController::VisController(const VisController& copy, const osg::CopyOp& copyop)
+        : SceneUtil::NodeCallback<VisController>(copy, copyop)
+        , Controller(copy)
+        , mData(copy.mData)
+        , mInterpolator(copy.mInterpolator)
+        , mMask(copy.mMask)
+    {
+    }
 
-VisController::VisController(const VisController &copy, const osg::CopyOp &copyop)
-    : SceneUtil::NodeCallback<VisController>(copy, copyop)
-    , Controller(copy)
-    , mData(copy.mData)
-    , mInterpolator(copy.mInterpolator)
-    , mMask(copy.mMask)
-{
-}
+    bool VisController::calculate(float time) const
+    {
+        if (!mInterpolator.empty())
+            return mInterpolator.interpKey(time);
 
-bool VisController::calculate(float time) const
-{
-    if (!mInterpolator.empty())
-        return mInterpolator.interpKey(time);
+        if (mData.size() == 0)
+            return true;
 
-    if(mData.size() == 0)
-        return true;
+        for (size_t i = 1; i < mData.size(); i++)
+        {
+            if (mData[i].time > time)
+                return mData[i - 1].isSet;
+        }
+        return mData.back().isSet;
+    }
 
-    for(size_t i = 1;i < mData.size();i++)
+    void VisController::operator()(osg::Node* node, osg::NodeVisitor* nv)
     {
-        if(mData[i].time > time)
-            return mData[i-1].isSet;
+        if (hasInput())
+        {
+            bool vis = calculate(getInputValue(nv));
+            node->setNodeMask(vis ? ~0 : mMask);
+        }
+        traverse(node, nv);
     }
-    return mData.back().isSet;
-}
 
-void VisController::operator() (osg::Node* node, osg::NodeVisitor* nv)
-{
-    if (hasInput())
+    RollController::RollController(const Nif::NiRollController* ctrl)
     {
-        bool vis = calculate(getInputValue(nv));
-        node->setNodeMask(vis ? ~0 : mMask);
+        if (!ctrl->mInterpolator.empty())
+        {
+            if (ctrl->mInterpolator->recType == Nif::RC_NiFloatInterpolator)
+                mData = FloatInterpolator(static_cast<const Nif::NiFloatInterpolator*>(ctrl->mInterpolator.getPtr()));
+        }
+        else if (!ctrl->mData.empty())
+            mData = FloatInterpolator(ctrl->mData->mKeyList, 1.f);
     }
-    traverse(node, nv);
-}
 
-RollController::RollController(const Nif::NiRollController* ctrl)
-{
-    if (!ctrl->mInterpolator.empty())
+    RollController::RollController(const RollController& copy, const osg::CopyOp& copyop)
+        : SceneUtil::NodeCallback<RollController, osg::MatrixTransform*>(copy, copyop)
+        , Controller(copy)
+        , mData(copy.mData)
+        , mStartingTime(copy.mStartingTime)
     {
-        if (ctrl->mInterpolator->recType == Nif::RC_NiFloatInterpolator)
-            mData = FloatInterpolator(static_cast<const Nif::NiFloatInterpolator*>(ctrl->mInterpolator.getPtr()));
     }
-    else if (!ctrl->mData.empty())
-        mData = FloatInterpolator(ctrl->mData->mKeyList, 1.f);
-}
 
-RollController::RollController(const RollController &copy, const osg::CopyOp &copyop)
-    : SceneUtil::NodeCallback<RollController, osg::MatrixTransform*>(copy, copyop)
-    , Controller(copy)
-    , mData(copy.mData)
-    , mStartingTime(copy.mStartingTime)
-{
-}
-
-void RollController::operator() (osg::MatrixTransform* node, osg::NodeVisitor* nv)
-{
-    traverse(node, nv);
-
-    if (hasInput())
+    void RollController::operator()(osg::MatrixTransform* node, osg::NodeVisitor* nv)
     {
-        double newTime = nv->getFrameStamp()->getSimulationTime();
-        double duration = newTime - mStartingTime;
-        mStartingTime = newTime;
+        traverse(node, nv);
+
+        if (hasInput())
+        {
+            double newTime = nv->getFrameStamp()->getSimulationTime();
+            double duration = newTime - mStartingTime;
+            mStartingTime = newTime;
 
-        float value = mData.interpKey(getInputValue(nv));
+            float value = mData.interpKey(getInputValue(nv));
 
-        // Rotate around "roll" axis.
-        // Note: in original game rotation speed is the framerate-dependent in a very tricky way.
-        // Do not replicate this behaviour until we will really need it.
-        // For now consider controller's current value as an angular speed in radians per 1/60 seconds.
-        node->preMult(osg::Matrix::rotate(value * duration * 60.f, 0, 0, 1));
+            // Rotate around "roll" axis.
+            // Note: in original game rotation speed is the framerate-dependent in a very tricky way.
+            // Do not replicate this behaviour until we will really need it.
+            // For now consider controller's current value as an angular speed in radians per 1/60 seconds.
+            node->preMult(osg::Matrix::rotate(value * duration * 60.f, 0, 0, 1));
 
-        // Note: doing it like this means RollControllers are not compatible with KeyframeControllers.
-        // KeyframeController currently wins the conflict.
-        // However unlikely that is, NetImmerse might combine the transformations somehow.
+            // Note: doing it like this means RollControllers are not compatible with KeyframeControllers.
+            // KeyframeController currently wins the conflict.
+            // However unlikely that is, NetImmerse might combine the transformations somehow.
+        }
     }
-}
 
-AlphaController::AlphaController()
-{
-}
+    AlphaController::AlphaController() {}
 
-AlphaController::AlphaController(const Nif::NiAlphaController* ctrl, const osg::Material* baseMaterial)
-    : mBaseMaterial(baseMaterial)
-{
-    if (!ctrl->mInterpolator.empty())
+    AlphaController::AlphaController(const Nif::NiAlphaController* ctrl, const osg::Material* baseMaterial)
+        : mBaseMaterial(baseMaterial)
     {
-        if (ctrl->mInterpolator->recType == Nif::RC_NiFloatInterpolator)
-            mData = FloatInterpolator(static_cast<const Nif::NiFloatInterpolator*>(ctrl->mInterpolator.getPtr()));
+        if (!ctrl->mInterpolator.empty())
+        {
+            if (ctrl->mInterpolator->recType == Nif::RC_NiFloatInterpolator)
+                mData = FloatInterpolator(static_cast<const Nif::NiFloatInterpolator*>(ctrl->mInterpolator.getPtr()));
+        }
+        else if (!ctrl->mData.empty())
+            mData = FloatInterpolator(ctrl->mData->mKeyList, 1.f);
     }
-    else if (!ctrl->mData.empty())
-        mData = FloatInterpolator(ctrl->mData->mKeyList, 1.f);
-}
 
-AlphaController::AlphaController(const AlphaController &copy, const osg::CopyOp &copyop)
-    : StateSetUpdater(copy, copyop), Controller(copy)
-    , mData(copy.mData)
-    , mBaseMaterial(copy.mBaseMaterial)
-{
-}
+    AlphaController::AlphaController(const AlphaController& copy, const osg::CopyOp& copyop)
+        : StateSetUpdater(copy, copyop)
+        , Controller(copy)
+        , mData(copy.mData)
+        , mBaseMaterial(copy.mBaseMaterial)
+    {
+    }
 
-void AlphaController::setDefaults(osg::StateSet *stateset)
-{
-    stateset->setAttribute(static_cast<osg::Material*>(mBaseMaterial->clone(osg::CopyOp::DEEP_COPY_ALL)), osg::StateAttribute::ON);
-}
+    void AlphaController::setDefaults(osg::StateSet* stateset)
+    {
+        stateset->setAttribute(
+            static_cast<osg::Material*>(mBaseMaterial->clone(osg::CopyOp::DEEP_COPY_ALL)), osg::StateAttribute::ON);
+    }
 
-void AlphaController::apply(osg::StateSet *stateset, osg::NodeVisitor *nv)
-{
-    if (hasInput())
+    void AlphaController::apply(osg::StateSet* stateset, osg::NodeVisitor* nv)
     {
-        float value = mData.interpKey(getInputValue(nv));
-        osg::Material* mat = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
-        osg::Vec4f diffuse = mat->getDiffuse(osg::Material::FRONT_AND_BACK);
-        diffuse.a() = value;
-        mat->setDiffuse(osg::Material::FRONT_AND_BACK, diffuse);
+        if (hasInput())
+        {
+            float value = mData.interpKey(getInputValue(nv));
+            osg::Material* mat = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
+            osg::Vec4f diffuse = mat->getDiffuse(osg::Material::FRONT_AND_BACK);
+            diffuse.a() = value;
+            mat->setDiffuse(osg::Material::FRONT_AND_BACK, diffuse);
+        }
     }
-}
 
-MaterialColorController::MaterialColorController()
-{
-}
+    MaterialColorController::MaterialColorController() {}
 
-MaterialColorController::MaterialColorController(const Nif::NiMaterialColorController* ctrl, const osg::Material* baseMaterial)
-    : mTargetColor(static_cast<MaterialColorController::TargetColor>(ctrl->mTargetColor))
-    , mBaseMaterial(baseMaterial)
-{
-    if (!ctrl->mInterpolator.empty())
+    MaterialColorController::MaterialColorController(
+        const Nif::NiMaterialColorController* ctrl, const osg::Material* baseMaterial)
+        : mTargetColor(static_cast<MaterialColorController::TargetColor>(ctrl->mTargetColor))
+        , mBaseMaterial(baseMaterial)
     {
-        if (ctrl->mInterpolator->recType == Nif::RC_NiPoint3Interpolator)
-            mData = Vec3Interpolator(static_cast<const Nif::NiPoint3Interpolator*>(ctrl->mInterpolator.getPtr()));
+        if (!ctrl->mInterpolator.empty())
+        {
+            if (ctrl->mInterpolator->recType == Nif::RC_NiPoint3Interpolator)
+                mData = Vec3Interpolator(static_cast<const Nif::NiPoint3Interpolator*>(ctrl->mInterpolator.getPtr()));
+        }
+        else if (!ctrl->mData.empty())
+            mData = Vec3Interpolator(ctrl->mData->mKeyList, osg::Vec3f(1, 1, 1));
     }
-    else if (!ctrl->mData.empty())
-        mData = Vec3Interpolator(ctrl->mData->mKeyList, osg::Vec3f(1, 1, 1));
-}
 
-MaterialColorController::MaterialColorController(const MaterialColorController &copy, const osg::CopyOp &copyop)
-    : StateSetUpdater(copy, copyop), Controller(copy)
-    , mData(copy.mData)
-    , mTargetColor(copy.mTargetColor)
-    , mBaseMaterial(copy.mBaseMaterial)
-{
-}
+    MaterialColorController::MaterialColorController(const MaterialColorController& copy, const osg::CopyOp& copyop)
+        : StateSetUpdater(copy, copyop)
+        , Controller(copy)
+        , mData(copy.mData)
+        , mTargetColor(copy.mTargetColor)
+        , mBaseMaterial(copy.mBaseMaterial)
+    {
+    }
 
-void MaterialColorController::setDefaults(osg::StateSet *stateset)
-{
-    stateset->setAttribute(static_cast<osg::Material*>(mBaseMaterial->clone(osg::CopyOp::DEEP_COPY_ALL)), osg::StateAttribute::ON);
-}
+    void MaterialColorController::setDefaults(osg::StateSet* stateset)
+    {
+        stateset->setAttribute(
+            static_cast<osg::Material*>(mBaseMaterial->clone(osg::CopyOp::DEEP_COPY_ALL)), osg::StateAttribute::ON);
+    }
 
-void MaterialColorController::apply(osg::StateSet *stateset, osg::NodeVisitor *nv)
-{
-    if (hasInput())
+    void MaterialColorController::apply(osg::StateSet* stateset, osg::NodeVisitor* nv)
     {
-        osg::Vec3f value = mData.interpKey(getInputValue(nv));
-        osg::Material* mat = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
-        switch (mTargetColor)
+        if (hasInput())
         {
-            case Diffuse:
-            {
-                osg::Vec4f diffuse = mat->getDiffuse(osg::Material::FRONT_AND_BACK);
-                diffuse.set(value.x(), value.y(), value.z(), diffuse.a());
-                mat->setDiffuse(osg::Material::FRONT_AND_BACK, diffuse);
-                break;
-            }
-            case Specular:
+            osg::Vec3f value = mData.interpKey(getInputValue(nv));
+            osg::Material* mat = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
+            switch (mTargetColor)
             {
-                osg::Vec4f specular = mat->getSpecular(osg::Material::FRONT_AND_BACK);
-                specular.set(value.x(), value.y(), value.z(), specular.a());
-                mat->setSpecular(osg::Material::FRONT_AND_BACK, specular);
-                break;
-            }
-            case Emissive:
-            {
-                osg::Vec4f emissive = mat->getEmission(osg::Material::FRONT_AND_BACK);
-                emissive.set(value.x(), value.y(), value.z(), emissive.a());
-                mat->setEmission(osg::Material::FRONT_AND_BACK, emissive);
-                break;
-            }
-            case Ambient:
-            default:
-            {
-                osg::Vec4f ambient = mat->getAmbient(osg::Material::FRONT_AND_BACK);
-                ambient.set(value.x(), value.y(), value.z(), ambient.a());
-                mat->setAmbient(osg::Material::FRONT_AND_BACK, ambient);
+                case Diffuse:
+                {
+                    osg::Vec4f diffuse = mat->getDiffuse(osg::Material::FRONT_AND_BACK);
+                    diffuse.set(value.x(), value.y(), value.z(), diffuse.a());
+                    mat->setDiffuse(osg::Material::FRONT_AND_BACK, diffuse);
+                    break;
+                }
+                case Specular:
+                {
+                    osg::Vec4f specular = mat->getSpecular(osg::Material::FRONT_AND_BACK);
+                    specular.set(value.x(), value.y(), value.z(), specular.a());
+                    mat->setSpecular(osg::Material::FRONT_AND_BACK, specular);
+                    break;
+                }
+                case Emissive:
+                {
+                    osg::Vec4f emissive = mat->getEmission(osg::Material::FRONT_AND_BACK);
+                    emissive.set(value.x(), value.y(), value.z(), emissive.a());
+                    mat->setEmission(osg::Material::FRONT_AND_BACK, emissive);
+                    break;
+                }
+                case Ambient:
+                default:
+                {
+                    osg::Vec4f ambient = mat->getAmbient(osg::Material::FRONT_AND_BACK);
+                    ambient.set(value.x(), value.y(), value.z(), ambient.a());
+                    mat->setAmbient(osg::Material::FRONT_AND_BACK, ambient);
+                }
             }
         }
     }
-}
 
-FlipController::FlipController(const Nif::NiFlipController *ctrl, const std::vector<osg::ref_ptr<osg::Texture2D> >& textures)
-    : mTexSlot(0) // always affects diffuse
-    , mDelta(ctrl->mDelta)
-    , mTextures(textures)
-{
-    if (!ctrl->mInterpolator.empty() && ctrl->mInterpolator->recType == Nif::RC_NiFloatInterpolator)
-        mData = static_cast<const Nif::NiFloatInterpolator*>(ctrl->mInterpolator.getPtr());
-}
-
-FlipController::FlipController(int texSlot, float delta, const std::vector<osg::ref_ptr<osg::Texture2D> >& textures)
-    : mTexSlot(texSlot)
-    , mDelta(delta)
-    , mTextures(textures)
-{
-}
+    FlipController::FlipController(
+        const Nif::NiFlipController* ctrl, const std::vector<osg::ref_ptr<osg::Texture2D>>& textures)
+        : mTexSlot(0) // always affects diffuse
+        , mDelta(ctrl->mDelta)
+        , mTextures(textures)
+    {
+        if (!ctrl->mInterpolator.empty() && ctrl->mInterpolator->recType == Nif::RC_NiFloatInterpolator)
+            mData = static_cast<const Nif::NiFloatInterpolator*>(ctrl->mInterpolator.getPtr());
+    }
 
-FlipController::FlipController(const FlipController &copy, const osg::CopyOp &copyop)
-    : StateSetUpdater(copy, copyop)
-    , Controller(copy)
-    , mTexSlot(copy.mTexSlot)
-    , mDelta(copy.mDelta)
-    , mTextures(copy.mTextures)
-    , mData(copy.mData)
-{
-}
+    FlipController::FlipController(int texSlot, float delta, const std::vector<osg::ref_ptr<osg::Texture2D>>& textures)
+        : mTexSlot(texSlot)
+        , mDelta(delta)
+        , mTextures(textures)
+    {
+    }
 
-void FlipController::apply(osg::StateSet* stateset, osg::NodeVisitor* nv)
-{
-    if (hasInput() && !mTextures.empty())
+    FlipController::FlipController(const FlipController& copy, const osg::CopyOp& copyop)
+        : StateSetUpdater(copy, copyop)
+        , Controller(copy)
+        , mTexSlot(copy.mTexSlot)
+        , mDelta(copy.mDelta)
+        , mTextures(copy.mTextures)
+        , mData(copy.mData)
     {
-        int curTexture = 0;
-        if (mDelta != 0)
-            curTexture = int(getInputValue(nv) / mDelta) % mTextures.size();
-        else
-            curTexture = int(mData.interpKey(getInputValue(nv))) % mTextures.size();
-        stateset->setTextureAttribute(mTexSlot, mTextures[curTexture]);
     }
-}
 
-ParticleSystemController::ParticleSystemController(const Nif::NiParticleSystemController *ctrl)
-    : mEmitStart(ctrl->startTime), mEmitStop(ctrl->stopTime)
-{
-}
+    void FlipController::apply(osg::StateSet* stateset, osg::NodeVisitor* nv)
+    {
+        if (hasInput() && !mTextures.empty())
+        {
+            int curTexture = 0;
+            if (mDelta != 0)
+                curTexture = int(getInputValue(nv) / mDelta) % mTextures.size();
+            else
+                curTexture = int(mData.interpKey(getInputValue(nv))) % mTextures.size();
+            stateset->setTextureAttribute(mTexSlot, mTextures[curTexture]);
+        }
+    }
 
-ParticleSystemController::ParticleSystemController()
-    : mEmitStart(0.f), mEmitStop(0.f)
-{
-}
+    ParticleSystemController::ParticleSystemController(const Nif::NiParticleSystemController* ctrl)
+        : mEmitStart(ctrl->startTime)
+        , mEmitStop(ctrl->stopTime)
+    {
+    }
 
-ParticleSystemController::ParticleSystemController(const ParticleSystemController &copy, const osg::CopyOp &copyop)
-    : SceneUtil::NodeCallback<ParticleSystemController, osgParticle::ParticleProcessor*>(copy, copyop)
-    , Controller(copy)
-    , mEmitStart(copy.mEmitStart)
-    , mEmitStop(copy.mEmitStop)
-{
-}
+    ParticleSystemController::ParticleSystemController()
+        : mEmitStart(0.f)
+        , mEmitStop(0.f)
+    {
+    }
 
-void ParticleSystemController::operator() (osgParticle::ParticleProcessor* node, osg::NodeVisitor* nv)
-{
-    if (hasInput())
+    ParticleSystemController::ParticleSystemController(const ParticleSystemController& copy, const osg::CopyOp& copyop)
+        : SceneUtil::NodeCallback<ParticleSystemController, osgParticle::ParticleProcessor*>(copy, copyop)
+        , Controller(copy)
+        , mEmitStart(copy.mEmitStart)
+        , mEmitStop(copy.mEmitStop)
     {
-        float time = getInputValue(nv);
-        node->getParticleSystem()->setFrozen(false);
-        node->setEnabled(time >= mEmitStart && time < mEmitStop);
     }
-    else
-        node->getParticleSystem()->setFrozen(true);
-    traverse(node, nv);
-}
 
-PathController::PathController(const PathController &copy, const osg::CopyOp &copyop)
-    : SceneUtil::NodeCallback<PathController, NifOsg::MatrixTransform*>(copy, copyop)
-    , Controller(copy)
-    , mPath(copy.mPath)
-    , mPercent(copy.mPercent)
-    , mFlags(copy.mFlags)
-{
-}
+    void ParticleSystemController::operator()(osgParticle::ParticleProcessor* node, osg::NodeVisitor* nv)
+    {
+        if (hasInput())
+        {
+            float time = getInputValue(nv);
+            node->getParticleSystem()->setFrozen(false);
+            node->setEnabled(time >= mEmitStart && time < mEmitStop);
+        }
+        else
+            node->getParticleSystem()->setFrozen(true);
+        traverse(node, nv);
+    }
 
-PathController::PathController(const Nif::NiPathController* ctrl)
-    : mPath(ctrl->posData->mKeyList, osg::Vec3f())
-    , mPercent(ctrl->floatData->mKeyList, 1.f)
-    , mFlags(ctrl->flags)
-{
-}
+    PathController::PathController(const PathController& copy, const osg::CopyOp& copyop)
+        : SceneUtil::NodeCallback<PathController, NifOsg::MatrixTransform*>(copy, copyop)
+        , Controller(copy)
+        , mPath(copy.mPath)
+        , mPercent(copy.mPercent)
+        , mFlags(copy.mFlags)
+    {
+    }
 
-float PathController::getPercent(float time) const
-{
-    float percent = mPercent.interpKey(time);
-    if (percent < 0.f)
-        percent = std::fmod(percent, 1.f) + 1.f;
-    else if (percent > 1.f)
-        percent = std::fmod(percent, 1.f);
-    return percent;
-}
+    PathController::PathController(const Nif::NiPathController* ctrl)
+        : mPath(ctrl->posData->mKeyList, osg::Vec3f())
+        , mPercent(ctrl->floatData->mKeyList, 1.f)
+        , mFlags(ctrl->flags)
+    {
+    }
 
-void PathController::operator() (NifOsg::MatrixTransform* node, osg::NodeVisitor* nv)
-{
-    if (mPath.empty() || mPercent.empty() || !hasInput())
+    float PathController::getPercent(float time) const
     {
-        traverse(node, nv);
-        return;
+        float percent = mPercent.interpKey(time);
+        if (percent < 0.f)
+            percent = std::fmod(percent, 1.f) + 1.f;
+        else if (percent > 1.f)
+            percent = std::fmod(percent, 1.f);
+        return percent;
     }
 
-    float time = getInputValue(nv);
-    float percent = getPercent(time);
-    node->setTranslation(mPath.interpKey(percent));
+    void PathController::operator()(NifOsg::MatrixTransform* node, osg::NodeVisitor* nv)
+    {
+        if (mPath.empty() || mPercent.empty() || !hasInput())
+        {
+            traverse(node, nv);
+            return;
+        }
+
+        float time = getInputValue(nv);
+        float percent = getPercent(time);
+        node->setTranslation(mPath.interpKey(percent));
 
-    traverse(node, nv);
-}
+        traverse(node, nv);
+    }
 
 }
diff --git a/components/nifosg/controller.hpp b/components/nifosg/controller.hpp
index bb839caa53..373f43aed5 100644
--- a/components/nifosg/controller.hpp
+++ b/components/nifosg/controller.hpp
@@ -1,10 +1,10 @@
 #ifndef COMPONENTS_NIFOSG_CONTROLLER_H
 #define COMPONENTS_NIFOSG_CONTROLLER_H
 
-#include <components/nif/niffile.hpp>
-#include <components/nif/nifkey.hpp>
 #include <components/nif/controller.hpp>
 #include <components/nif/data.hpp>
+#include <components/nif/niffile.hpp>
+#include <components/nif/nifkey.hpp>
 
 #include <components/sceneutil/keyframe.hpp>
 #include <components/sceneutil/nodecallback.hpp>
@@ -64,23 +64,15 @@ namespace NifOsg
 
         ValueInterpolator() = default;
 
-        template<
-            class T,
-            typename = std::enable_if_t<
-                std::conjunction_v<
-                    std::disjunction<
-                        std::is_same<ValueT, float>,
-                        std::is_same<ValueT, osg::Vec3f>,
-                        std::is_same<ValueT, bool>,
-                        std::is_same<ValueT, osg::Vec4f>,
-                        std::is_same<ValueT, char>
-                    >,
-                    std::is_same<decltype(T::defaultVal), ValueT>
-                >,
-                T
-            >
-        >
-        ValueInterpolator(const T* interpolator) : mDefaultVal(interpolator->defaultVal)
+        template <class T,
+            typename
+            = std::enable_if_t<std::conjunction_v<std::disjunction<std::is_same<ValueT, float>,
+                                                      std::is_same<ValueT, osg::Vec3f>, std::is_same<ValueT, bool>,
+                                                      std::is_same<ValueT, osg::Vec4f>, std::is_same<ValueT, char>>,
+                                   std::is_same<decltype(T::defaultVal), ValueT>>,
+                T>>
+        ValueInterpolator(const T* interpolator)
+            : mDefaultVal(interpolator->defaultVal)
         {
             if (interpolator->data.empty())
                 return;
@@ -108,9 +100,9 @@ namespace NifOsg
             if (empty())
                 return mDefaultVal;
 
-            const typename MapT::MapType & keys = mKeys->mKeys;
+            const typename MapT::MapType& keys = mKeys->mKeys;
 
-            if(time <= keys.begin()->first)
+            if (time <= keys.begin()->first)
                 return keys.begin()->second.mValue;
 
             typename MapT::MapType::const_iterator it = retrieveKey(time);
@@ -130,14 +122,12 @@ namespace NifOsg
             return keys.rbegin()->second.mValue;
         }
 
-        bool empty() const
-        {
-            return !mKeys || mKeys->mKeys.empty();
-        }
+        bool empty() const { return !mKeys || mKeys->mKeys.empty(); }
 
     private:
         template <typename ValueType>
-        ValueType interpolate(const Nif::KeyT<ValueType>& a, const Nif::KeyT<ValueType>& b, float fraction, unsigned int type) const
+        ValueType interpolate(
+            const Nif::KeyT<ValueType>& a, const Nif::KeyT<ValueType>& b, float fraction, unsigned int type) const
         {
             switch (type)
             {
@@ -165,7 +155,8 @@ namespace NifOsg
                     return a.mValue + ((b.mValue - a.mValue) * fraction);
             }
         }
-        osg::Quat interpolate(const Nif::KeyT<osg::Quat>& a, const Nif::KeyT<osg::Quat>& b, float fraction, unsigned int type) const
+        osg::Quat interpolate(
+            const Nif::KeyT<osg::Quat>& a, const Nif::KeyT<osg::Quat>& b, float fraction, unsigned int type) const
         {
             switch (type)
             {
@@ -205,14 +196,15 @@ namespace NifOsg
         Nif::Controller::ExtrapolationMode mExtrapolationMode;
 
     public:
-        ControllerFunction(const Nif::Controller *ctrl);
+        ControllerFunction(const Nif::Controller* ctrl);
 
         float calculate(float value) const override;
 
         float getMaximum() const override;
     };
 
-    class GeomMorpherController : public SceneUtil::Controller, public SceneUtil::NodeCallback<GeomMorpherController, SceneUtil::MorphGeometry*>
+    class GeomMorpherController : public SceneUtil::Controller,
+                                  public SceneUtil::NodeCallback<GeomMorpherController, SceneUtil::MorphGeometry*>
     {
     public:
         GeomMorpherController(const Nif::NiGeomMorpherController* ctrl);
@@ -229,26 +221,27 @@ namespace NifOsg
     };
 
 #ifdef _MSC_VER
-#pragma warning( push )
- /*
-  * Warning C4250: 'NifOsg::KeyframeController': inherits 'osg::Callback::osg::Callback::asCallback' via dominance,
-  * there is no way to solved this if an object must inherit from both osg::Object and osg::Callback
-  */
-#pragma warning( disable : 4250 )
+#pragma warning(push)
+    /*
+     * Warning C4250: 'NifOsg::KeyframeController': inherits 'osg::Callback::osg::Callback::asCallback' via dominance,
+     * there is no way to solved this if an object must inherit from both osg::Object and osg::Callback
+     */
+#pragma warning(disable : 4250)
 #endif
-    class KeyframeController : public SceneUtil::KeyframeController, public SceneUtil::NodeCallback<KeyframeController, NifOsg::MatrixTransform*>
+    class KeyframeController : public SceneUtil::KeyframeController,
+                               public SceneUtil::NodeCallback<KeyframeController, NifOsg::MatrixTransform*>
     {
     public:
         KeyframeController();
         KeyframeController(const KeyframeController& copy, const osg::CopyOp& copyop);
-        KeyframeController(const Nif::NiKeyframeController *keyctrl);
+        KeyframeController(const Nif::NiKeyframeController* keyctrl);
 
         META_Object(NifOsg, KeyframeController)
 
         osg::Vec3f getTranslation(float time) const override;
         osg::Callback* getAsCallback() override { return this; }
 
-        void operator() (NifOsg::MatrixTransform*, osg::NodeVisitor*);
+        void operator()(NifOsg::MatrixTransform*, osg::NodeVisitor*);
 
     private:
         QuaternionInterpolator mRotations;
@@ -260,25 +253,25 @@ namespace NifOsg
         Vec3Interpolator mTranslations;
         FloatInterpolator mScales;
 
-        Nif::NiKeyframeData::AxisOrder mAxisOrder{Nif::NiKeyframeData::AxisOrder::Order_XYZ};
+        Nif::NiKeyframeData::AxisOrder mAxisOrder{ Nif::NiKeyframeData::AxisOrder::Order_XYZ };
 
         osg::Quat getXYZRotation(float time) const;
     };
 #ifdef _MSC_VER
-#pragma warning( pop )
+#pragma warning(pop)
 #endif
 
     class UVController : public SceneUtil::StateSetUpdater, public SceneUtil::Controller
     {
     public:
         UVController();
-        UVController(const UVController&,const osg::CopyOp&);
-        UVController(const Nif::NiUVData *data, const std::set<int>& textureUnits);
+        UVController(const UVController&, const osg::CopyOp&);
+        UVController(const Nif::NiUVData* data, const std::set<int>& textureUnits);
 
-        META_Object(NifOsg,UVController)
+        META_Object(NifOsg, UVController)
 
         void setDefaults(osg::StateSet* stateset) override;
-        void apply(osg::StateSet *stateset, osg::NodeVisitor *nv) override;
+        void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override;
 
     private:
         FloatInterpolator mUTrans;
@@ -293,7 +286,7 @@ namespace NifOsg
     private:
         std::vector<Nif::NiVisData::VisData> mData;
         ByteInterpolator mInterpolator;
-        unsigned int mMask{0u};
+        unsigned int mMask{ 0u };
 
         bool calculate(float time) const;
 
@@ -304,21 +297,22 @@ namespace NifOsg
 
         META_Object(NifOsg, VisController)
 
-        void operator() (osg::Node* node, osg::NodeVisitor* nv);
+        void operator()(osg::Node* node, osg::NodeVisitor* nv);
     };
 
-    class RollController : public SceneUtil::NodeCallback<RollController, osg::MatrixTransform*>, public SceneUtil::Controller
+    class RollController : public SceneUtil::NodeCallback<RollController, osg::MatrixTransform*>,
+                           public SceneUtil::Controller
     {
     private:
         FloatInterpolator mData;
-        double mStartingTime{0};
+        double mStartingTime{ 0 };
 
     public:
         RollController(const Nif::NiRollController* interpolator);
         RollController() = default;
         RollController(const RollController& copy, const osg::CopyOp& copyop);
 
-        void operator() (osg::MatrixTransform* node, osg::NodeVisitor* nv);
+        void operator()(osg::MatrixTransform* node, osg::NodeVisitor* nv);
 
         META_Object(NifOsg, RollController)
     };
@@ -328,6 +322,7 @@ namespace NifOsg
     private:
         FloatInterpolator mData;
         osg::ref_ptr<const osg::Material> mBaseMaterial;
+
     public:
         AlphaController(const Nif::NiAlphaController* ctrl, const osg::Material* baseMaterial);
         AlphaController();
@@ -345,8 +340,8 @@ namespace NifOsg
     public:
         enum TargetColor
         {
-            Ambient  = 0,
-            Diffuse  = 1,
+            Ambient = 0,
+            Diffuse = 1,
             Specular = 2,
             Emissive = 3
         };
@@ -369,25 +364,27 @@ namespace NifOsg
     class FlipController : public SceneUtil::StateSetUpdater, public SceneUtil::Controller
     {
     private:
-        int mTexSlot{0};
-        float mDelta{0.f};
-        std::vector<osg::ref_ptr<osg::Texture2D> > mTextures;
+        int mTexSlot{ 0 };
+        float mDelta{ 0.f };
+        std::vector<osg::ref_ptr<osg::Texture2D>> mTextures;
         FloatInterpolator mData;
 
     public:
-        FlipController(const Nif::NiFlipController* ctrl, const std::vector<osg::ref_ptr<osg::Texture2D> >& textures);
-        FlipController(int texSlot, float delta, const std::vector<osg::ref_ptr<osg::Texture2D> >& textures);
+        FlipController(const Nif::NiFlipController* ctrl, const std::vector<osg::ref_ptr<osg::Texture2D>>& textures);
+        FlipController(int texSlot, float delta, const std::vector<osg::ref_ptr<osg::Texture2D>>& textures);
         FlipController() = default;
         FlipController(const FlipController& copy, const osg::CopyOp& copyop);
 
         META_Object(NifOsg, FlipController)
 
-        std::vector<osg::ref_ptr<osg::Texture2D> >& getTextures() { return mTextures; }
+        std::vector<osg::ref_ptr<osg::Texture2D>>& getTextures() { return mTextures; }
 
-        void apply(osg::StateSet *stateset, osg::NodeVisitor *nv) override;
+        void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override;
     };
 
-    class ParticleSystemController : public SceneUtil::NodeCallback<ParticleSystemController, osgParticle::ParticleProcessor*>, public SceneUtil::Controller
+    class ParticleSystemController
+        : public SceneUtil::NodeCallback<ParticleSystemController, osgParticle::ParticleProcessor*>,
+          public SceneUtil::Controller
     {
     public:
         ParticleSystemController(const Nif::NiParticleSystemController* ctrl);
@@ -396,14 +393,15 @@ namespace NifOsg
 
         META_Object(NifOsg, ParticleSystemController)
 
-        void operator() (osgParticle::ParticleProcessor* node, osg::NodeVisitor* nv);
+        void operator()(osgParticle::ParticleProcessor* node, osg::NodeVisitor* nv);
 
     private:
         float mEmitStart;
         float mEmitStop;
     };
 
-    class PathController : public SceneUtil::NodeCallback<PathController, NifOsg::MatrixTransform*>, public SceneUtil::Controller
+    class PathController : public SceneUtil::NodeCallback<PathController, NifOsg::MatrixTransform*>,
+                           public SceneUtil::Controller
     {
     public:
         PathController(const Nif::NiPathController* ctrl);
@@ -412,12 +410,12 @@ namespace NifOsg
 
         META_Object(NifOsg, PathController)
 
-        void operator() (NifOsg::MatrixTransform*, osg::NodeVisitor*);
+        void operator()(NifOsg::MatrixTransform*, osg::NodeVisitor*);
 
     private:
         Vec3Interpolator mPath;
         FloatInterpolator mPercent;
-        int mFlags{0};
+        int mFlags{ 0 };
 
         float getPercent(float time) const;
     };
diff --git a/components/nifosg/matrixtransform.cpp b/components/nifosg/matrixtransform.cpp
index 2170c84e5c..44eac28def 100644
--- a/components/nifosg/matrixtransform.cpp
+++ b/components/nifosg/matrixtransform.cpp
@@ -2,14 +2,14 @@
 
 namespace NifOsg
 {
-    MatrixTransform::MatrixTransform(const Nif::Transformation &trafo)
+    MatrixTransform::MatrixTransform(const Nif::Transformation& trafo)
         : osg::MatrixTransform(trafo.toMatrix())
         , mScale(trafo.scale)
         , mRotationScale(trafo.rotation)
     {
     }
 
-    MatrixTransform::MatrixTransform(const MatrixTransform &copy, const osg::CopyOp &copyop)
+    MatrixTransform::MatrixTransform(const MatrixTransform& copy, const osg::CopyOp& copyop)
         : osg::MatrixTransform(copy, copyop)
         , mScale(copy.mScale)
         , mRotationScale(copy.mRotationScale)
@@ -24,13 +24,13 @@ namespace NifOsg
         // Rescale the node using the known components.
         for (int i = 0; i < 3; ++i)
             for (int j = 0; j < 3; ++j)
-                _matrix(i,j) = mRotationScale.mValues[j][i] * mScale; // NB: column/row major difference
+                _matrix(i, j) = mRotationScale.mValues[j][i] * mScale; // NB: column/row major difference
 
         _inverseDirty = true;
         dirtyBound();
     }
 
-    void MatrixTransform::setRotation(const osg::Quat &rotation)
+    void MatrixTransform::setRotation(const osg::Quat& rotation)
     {
         // First override the rotation ignoring the scale.
         _matrix.setRotate(rotation);
@@ -40,8 +40,8 @@ namespace NifOsg
             for (int j = 0; j < 3; ++j)
             {
                 // Update the current decomposed rotation and restore the known scale.
-                mRotationScale.mValues[j][i] = _matrix(i,j); // NB: column/row major difference
-                _matrix(i,j) *= mScale;
+                mRotationScale.mValues[j][i] = _matrix(i, j); // NB: column/row major difference
+                _matrix(i, j) *= mScale;
             }
         }
 
@@ -49,7 +49,7 @@ namespace NifOsg
         dirtyBound();
     }
 
-    void MatrixTransform::setRotation(const Nif::Matrix3 &rotation)
+    void MatrixTransform::setRotation(const Nif::Matrix3& rotation)
     {
         // Update the decomposed rotation.
         mRotationScale = rotation;
@@ -57,13 +57,13 @@ namespace NifOsg
         // Reorient the node using the known components.
         for (int i = 0; i < 3; ++i)
             for (int j = 0; j < 3; ++j)
-                _matrix(i,j) = mRotationScale.mValues[j][i] * mScale; // NB: column/row major difference
+                _matrix(i, j) = mRotationScale.mValues[j][i] * mScale; // NB: column/row major difference
 
         _inverseDirty = true;
         dirtyBound();
     }
 
-    void MatrixTransform::setTranslation(const osg::Vec3f &translation)
+    void MatrixTransform::setTranslation(const osg::Vec3f& translation)
     {
         // The translation is independent from the rotation and scale so we can apply it directly.
         _matrix.setTrans(translation);
diff --git a/components/nifosg/matrixtransform.hpp b/components/nifosg/matrixtransform.hpp
index ffb3c1c37d..2447fdaa49 100644
--- a/components/nifosg/matrixtransform.hpp
+++ b/components/nifosg/matrixtransform.hpp
@@ -12,26 +12,26 @@ namespace NifOsg
     {
     public:
         MatrixTransform() = default;
-        MatrixTransform(const Nif::Transformation &trafo);
-        MatrixTransform(const MatrixTransform &copy, const osg::CopyOp &copyop);
+        MatrixTransform(const Nif::Transformation& trafo);
+        MatrixTransform(const MatrixTransform& copy, const osg::CopyOp& copyop);
 
         META_Node(NifOsg, MatrixTransform)
 
-        // Hack: account for Transform differences between OSG and NIFs.
-        // OSG uses a 4x4 matrix, NIF's use a 3x3 rotationScale, float scale, and vec3 position.
-        // Decomposing the original components from the 4x4 matrix isn't possible, which causes
-        // problems when a KeyframeController wants to change only one of these components. So
-        // we store the scale and rotation components separately here.
-        float mScale{0.f};
+            // Hack: account for Transform differences between OSG and NIFs.
+            // OSG uses a 4x4 matrix, NIF's use a 3x3 rotationScale, float scale, and vec3 position.
+            // Decomposing the original components from the 4x4 matrix isn't possible, which causes
+            // problems when a KeyframeController wants to change only one of these components. So
+            // we store the scale and rotation components separately here.
+            float mScale{ 0.f };
         Nif::Matrix3 mRotationScale;
 
         // Utility methods to transform the node and keep these components up-to-date.
         // The matrix's components should not be overridden manually or using preMult/postMult
         // unless you're sure you know what you are doing.
         void setScale(float scale);
-        void setRotation(const osg::Quat &rotation);
-        void setRotation(const Nif::Matrix3 &rotation);
-        void setTranslation(const osg::Vec3f &translation);
+        void setRotation(const osg::Quat& rotation);
+        void setRotation(const Nif::Matrix3& rotation);
+        void setTranslation(const osg::Vec3f& translation);
     };
 
 }
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 9c0dd86c0a..55be6a1dc3 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -3,51 +3,51 @@
 #include <mutex>
 #include <string_view>
 
-#include <osg/Matrixf>
-#include <osg/Geometry>
 #include <osg/Array>
+#include <osg/Geometry>
 #include <osg/LOD>
-#include <osg/Switch>
+#include <osg/Matrixf>
 #include <osg/Sequence>
+#include <osg/Switch>
 #include <osg/TexGen>
 #include <osg/ValueObject>
 
 // resource
 #include <components/debug/debuglog.hpp>
 #include <components/misc/constants.hpp>
+#include <components/misc/osguservalues.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/strings/algorithm.hpp>
 #include <components/misc/strings/lower.hpp>
-#include <components/resource/imagemanager.hpp>
-#include <components/misc/osguservalues.hpp>
 #include <components/nif/parent.hpp>
+#include <components/resource/imagemanager.hpp>
 
 // particle
-#include <osgParticle/ParticleSystem>
-#include <osgParticle/ParticleSystemUpdater>
-#include <osgParticle/ConstantRateCounter>
 #include <osgParticle/BoxPlacer>
+#include <osgParticle/ConstantRateCounter>
 #include <osgParticle/ModularProgram>
+#include <osgParticle/ParticleSystem>
+#include <osgParticle/ParticleSystemUpdater>
 
-#include <osg/BlendFunc>
 #include <osg/AlphaFunc>
+#include <osg/BlendFunc>
 #include <osg/Depth>
-#include <osg/PolygonMode>
 #include <osg/FrontFace>
-#include <osg/Stencil>
 #include <osg/Material>
-#include <osg/Texture2D>
+#include <osg/PolygonMode>
+#include <osg/Stencil>
 #include <osg/TexEnv>
 #include <osg/TexEnvCombine>
+#include <osg/Texture2D>
 
 #include <components/nif/controlled.hpp>
 #include <components/nif/effect.hpp>
 #include <components/nif/extra.hpp>
 #include <components/nif/node.hpp>
 #include <components/nif/property.hpp>
-#include <components/sceneutil/skeleton.hpp>
-#include <components/sceneutil/riggeometry.hpp>
 #include <components/sceneutil/morphgeometry.hpp>
+#include <components/sceneutil/riggeometry.hpp>
+#include <components/sceneutil/skeleton.hpp>
 
 #include "matrixtransform.hpp"
 #include "particle.hpp"
@@ -56,18 +56,18 @@ namespace
 {
     struct DisableOptimizer : osg::NodeVisitor
     {
-        DisableOptimizer(osg::NodeVisitor::TraversalMode mode = TRAVERSE_ALL_CHILDREN) : osg::NodeVisitor(mode) {}
-
-        void apply(osg::Node &node) override
+        DisableOptimizer(osg::NodeVisitor::TraversalMode mode = TRAVERSE_ALL_CHILDREN)
+            : osg::NodeVisitor(mode)
         {
-            node.setDataVariance(osg::Object::DYNAMIC);
-            traverse(node);
         }
 
-        void apply(osg::Drawable &node) override
+        void apply(osg::Node& node) override
         {
+            node.setDataVariance(osg::Object::DYNAMIC);
             traverse(node);
         }
+
+        void apply(osg::Drawable& node) override { traverse(node); }
     };
 
     void getAllNiNodes(const Nif::Node* node, std::vector<int>& outIndices)
@@ -75,7 +75,7 @@ namespace
         if (const Nif::NiNode* ninode = dynamic_cast<const Nif::NiNode*>(node))
         {
             outIndices.push_back(ninode->recIndex);
-            for (unsigned int i=0; i<ninode->children.length(); ++i)
+            for (unsigned int i = 0; i < ninode->children.length(); ++i)
                 if (!ninode->children[i].empty())
                     getAllNiNodes(ninode->children[i].getPtr(), outIndices);
         }
@@ -94,26 +94,28 @@ namespace
         return false;
     }
 
-    // Collect all properties affecting the given drawable that should be handled on drawable basis rather than on the node hierarchy above it.
-    void collectDrawableProperties(const Nif::Node* nifNode, const Nif::Parent* parent, std::vector<const Nif::Property*>& out)
+    // Collect all properties affecting the given drawable that should be handled on drawable basis rather than on the
+    // node hierarchy above it.
+    void collectDrawableProperties(
+        const Nif::Node* nifNode, const Nif::Parent* parent, std::vector<const Nif::Property*>& out)
     {
         if (parent != nullptr)
             collectDrawableProperties(&parent->mNiNode, parent->mParent, out);
         const Nif::PropertyList& props = nifNode->props;
-        for (size_t i = 0; i <props.length();++i)
+        for (size_t i = 0; i < props.length(); ++i)
         {
             if (!props[i].empty())
             {
                 switch (props[i]->recType)
                 {
-                case Nif::RC_NiMaterialProperty:
-                case Nif::RC_NiVertexColorProperty:
-                case Nif::RC_NiSpecularProperty:
-                case Nif::RC_NiAlphaProperty:
-                    out.push_back(props[i].getPtr());
-                    break;
-                default:
-                    break;
+                    case Nif::RC_NiMaterialProperty:
+                    case Nif::RC_NiVertexColorProperty:
+                    case Nif::RC_NiSpecularProperty:
+                    case Nif::RC_NiAlphaProperty:
+                        out.push_back(props[i].getPtr());
+                        break;
+                    default:
+                        break;
                 }
             }
         }
@@ -133,9 +135,7 @@ namespace
     class BillboardCallback : public SceneUtil::NodeCallback<BillboardCallback, osg::Node*, osgUtil::CullVisitor*>
     {
     public:
-        BillboardCallback()
-        {
-        }
+        BillboardCallback() {}
         BillboardCallback(const BillboardCallback& copy, const osg::CopyOp& copyop)
             : SceneUtil::NodeCallback<BillboardCallback, osg::Node*, osgUtil::CullVisitor*>(copy, copyop)
         {
@@ -149,15 +149,16 @@ namespace
 
             // attempt to preserve scale
             float mag[3];
-            for (int i=0;i<3;++i)
+            for (int i = 0; i < 3; ++i)
             {
-                mag[i] = std::sqrt(modelView(0,i) * modelView(0,i) + modelView(1,i) * modelView(1,i) + modelView(2,i) * modelView(2,i));
+                mag[i] = std::sqrt(modelView(0, i) * modelView(0, i) + modelView(1, i) * modelView(1, i)
+                    + modelView(2, i) * modelView(2, i));
             }
 
             modelView.setRotate(osg::Quat());
-            modelView(0,0) = mag[0];
-            modelView(1,1) = mag[1];
-            modelView(2,2) = mag[2];
+            modelView(0, 0) = mag[0];
+            modelView(1, 1) = mag[1];
+            modelView(2, 2) = mag[2];
 
             cv->pushModelViewMatrix(new osg::RefMatrix(modelView), osg::Transform::RELATIVE_RF);
 
@@ -167,13 +168,13 @@ namespace
         }
     };
 
-    void extractTextKeys(const Nif::NiTextKeyExtraData *tk, SceneUtil::TextKeyMap &textkeys)
+    void extractTextKeys(const Nif::NiTextKeyExtraData* tk, SceneUtil::TextKeyMap& textkeys)
     {
-        for(size_t i = 0;i < tk->list.size();i++)
+        for (size_t i = 0; i < tk->list.size(); i++)
         {
             std::vector<std::string> results;
             Misc::StringUtils::split(tk->list[i].text, results, "\r\n");
-            for (std::string &result : results)
+            for (std::string& result : results)
             {
                 Misc::StringUtils::trim(result);
                 Misc::StringUtils::lowerCaseInPlace(result);
@@ -226,14 +227,16 @@ namespace NifOsg
     public:
         /// @param filename used for warning messages.
         LoaderImpl(const std::filesystem::path& filename, unsigned int ver, unsigned int userver, unsigned int bethver)
-            : mFilename(filename), mVersion(ver), mUserVersion(userver), mBethVersion(bethver)
+            : mFilename(filename)
+            , mVersion(ver)
+            , mUserVersion(userver)
+            , mBethVersion(bethver)
         {
-
         }
         std::filesystem::path mFilename;
         unsigned int mVersion, mUserVersion, mBethVersion;
 
-        size_t mFirstRootTextureIndex{~0u};
+        size_t mFirstRootTextureIndex{ ~0u };
         bool mFoundFirstRootTexturingProperty = false;
 
         bool mHasNightDayLabel = false;
@@ -248,11 +251,11 @@ namespace NifOsg
 
         void loadKf(Nif::NIFFilePtr nif, SceneUtil::KeyframeHolder& target) const
         {
-            const Nif::NiSequenceStreamHelper *seq = nullptr;
+            const Nif::NiSequenceStreamHelper* seq = nullptr;
             const size_t numRoots = nif->numRoots();
             for (size_t i = 0; i < numRoots; ++i)
             {
-                const Nif::Record *r = nif->getRoot(i);
+                const Nif::Record* r = nif->getRoot(i);
                 if (r && r->recType == Nif::RC_NiSequenceStreamHelper)
                 {
                     seq = static_cast<const Nif::NiSequenceStreamHelper*>(r);
@@ -267,10 +270,10 @@ namespace NifOsg
             }
 
             Nif::ExtraPtr extra = seq->extra;
-            if(extra.empty() || extra->recType != Nif::RC_NiTextKeyExtraData)
+            if (extra.empty() || extra->recType != Nif::RC_NiTextKeyExtraData)
             {
-                nif->warn("First extra data was not a NiTextKeyExtraData, but a "+
-                          (extra.empty() ? std::string("nil") : extra->recName)+".");
+                nif->warn("First extra data was not a NiTextKeyExtraData, but a "
+                    + (extra.empty() ? std::string("nil") : extra->recName) + ".");
                 return;
             }
 
@@ -278,34 +281,36 @@ namespace NifOsg
 
             extra = extra->next;
             Nif::ControllerPtr ctrl = seq->controller;
-            for(;!extra.empty() && !ctrl.empty();(extra=extra->next),(ctrl=ctrl->next))
+            for (; !extra.empty() && !ctrl.empty(); (extra = extra->next), (ctrl = ctrl->next))
             {
-                if(extra->recType != Nif::RC_NiStringExtraData || ctrl->recType != Nif::RC_NiKeyframeController)
+                if (extra->recType != Nif::RC_NiStringExtraData || ctrl->recType != Nif::RC_NiKeyframeController)
                 {
-                    nif->warn("Unexpected extra data "+extra->recName+" with controller "+ctrl->recName);
+                    nif->warn("Unexpected extra data " + extra->recName + " with controller " + ctrl->recName);
                     continue;
                 }
 
                 // Vanilla seems to ignore the "active" flag for NiKeyframeController,
                 // so we don't want to skip inactive controllers here.
 
-                const Nif::NiStringExtraData *strdata = static_cast<const Nif::NiStringExtraData*>(extra.getPtr());
-                const Nif::NiKeyframeController *key = static_cast<const Nif::NiKeyframeController*>(ctrl.getPtr());
+                const Nif::NiStringExtraData* strdata = static_cast<const Nif::NiStringExtraData*>(extra.getPtr());
+                const Nif::NiKeyframeController* key = static_cast<const Nif::NiKeyframeController*>(ctrl.getPtr());
 
                 if (key->mData.empty() && key->mInterpolator.empty())
                     continue;
 
                 if (!key->mInterpolator.empty() && key->mInterpolator->recType != Nif::RC_NiTransformInterpolator)
                 {
-                    Log(Debug::Error) << "Unsupported interpolator type for NiKeyframeController " << key->recIndex << " in " << mFilename;
+                    Log(Debug::Error) << "Unsupported interpolator type for NiKeyframeController " << key->recIndex
+                                      << " in " << mFilename;
                     continue;
                 }
 
                 osg::ref_ptr<SceneUtil::KeyframeController> callback = new NifOsg::KeyframeController(key);
-                setupController(key, callback, /*animflags*/0);
+                setupController(key, callback, /*animflags*/ 0);
 
                 if (!target.mKeyframeControllers.emplace(strdata->string, callback).second)
-                    Log(Debug::Verbose) << "Controller " << strdata->string << " present more than once in " << nif->getFilename() << ", ignoring later version";
+                    Log(Debug::Verbose) << "Controller " << strdata->string << " present more than once in "
+                                        << nif->getFilename() << ", ignoring later version";
             }
         }
 
@@ -325,13 +330,14 @@ namespace NifOsg
             if (roots.empty())
                 nif->fail("Found no root nodes");
 
-            osg::ref_ptr<SceneUtil::TextKeyMapHolder> textkeys (new SceneUtil::TextKeyMapHolder);
+            osg::ref_ptr<SceneUtil::TextKeyMapHolder> textkeys(new SceneUtil::TextKeyMapHolder);
 
             osg::ref_ptr<osg::Group> created(new osg::Group);
             created->setDataVariance(osg::Object::STATIC);
             for (const Nif::Node* root : roots)
             {
-                auto node = handleNode(root, nullptr, nullptr, imageManager, std::vector<unsigned int>(), 0, false, false, false, &textkeys->mTextKeys);
+                auto node = handleNode(root, nullptr, nullptr, imageManager, std::vector<unsigned int>(), 0, false,
+                    false, false, &textkeys->mTextKeys);
                 created->addChild(node);
             }
             if (mHasNightDayLabel)
@@ -347,7 +353,7 @@ namespace NifOsg
                 osg::ref_ptr<SceneUtil::Skeleton> skel = new SceneUtil::Skeleton;
                 skel->setStateSet(created->getStateSet());
                 skel->setName(created->getName());
-                for (unsigned int i=0; i < created->getNumChildren(); ++i)
+                for (unsigned int i = 0; i < created->getNumChildren(); ++i)
                     skel->addChild(created->getChild(i));
                 created->removeChildren(0, created->getNumChildren());
                 created = skel;
@@ -361,20 +367,23 @@ namespace NifOsg
             return created;
         }
 
-        void applyNodeProperties(const Nif::Node *nifNode, osg::Node *applyTo, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager, std::vector<unsigned int>& boundTextures, int animflags)
+        void applyNodeProperties(const Nif::Node* nifNode, osg::Node* applyTo,
+            SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager,
+            std::vector<unsigned int>& boundTextures, int animflags)
         {
             const Nif::PropertyList& props = nifNode->props;
 
             bool hasStencilProperty = false;
 
-            for (size_t i = 0; i <props.length(); ++i)
+            for (size_t i = 0; i < props.length(); ++i)
             {
                 if (props[i].empty())
                     continue;
 
                 if (props[i].getPtr()->recType == Nif::RC_NiStencilProperty)
                 {
-                    const Nif::NiStencilProperty* stencilprop = static_cast<const Nif::NiStencilProperty*>(props[i].getPtr());
+                    const Nif::NiStencilProperty* stencilprop
+                        = static_cast<const Nif::NiStencilProperty*>(props[i].getPtr());
                     if (stencilprop->data.enabled != 0)
                     {
                         hasStencilProperty = true;
@@ -383,13 +392,14 @@ namespace NifOsg
                 }
             }
 
-            for (size_t i = 0; i <props.length(); ++i)
+            for (size_t i = 0; i < props.length(); ++i)
             {
                 if (!props[i].empty())
                 {
                     // Get the lowest numbered recIndex of the NiTexturingProperty root node.
                     // This is what is overridden when a spell effect "particle texture" is used.
-                    if (nifNode->parents.empty() && !mFoundFirstRootTexturingProperty && props[i].getPtr()->recType == Nif::RC_NiTexturingProperty)
+                    if (nifNode->parents.empty() && !mFoundFirstRootTexturingProperty
+                        && props[i].getPtr()->recType == Nif::RC_NiTexturingProperty)
                     {
                         mFirstRootTextureIndex = props[i].getPtr()->recIndex;
                         mFoundFirstRootTexturingProperty = true;
@@ -399,14 +409,16 @@ namespace NifOsg
                         if (props[i].getPtr()->recIndex == mFirstRootTextureIndex)
                             applyTo->setUserValue("overrideFx", 1);
                     }
-                    handleProperty(props[i].getPtr(), applyTo, composite, imageManager, boundTextures, animflags, hasStencilProperty);
+                    handleProperty(props[i].getPtr(), applyTo, composite, imageManager, boundTextures, animflags,
+                        hasStencilProperty);
                 }
             }
 
             auto geometry = dynamic_cast<const Nif::NiGeometry*>(nifNode);
             // NiGeometry's NiAlphaProperty doesn't get handled here because it's a drawable property
             if (geometry && !geometry->shaderprop.empty())
-                handleProperty(geometry->shaderprop.getPtr(), applyTo, composite, imageManager, boundTextures, animflags, hasStencilProperty);
+                handleProperty(geometry->shaderprop.getPtr(), applyTo, composite, imageManager, boundTextures,
+                    animflags, hasStencilProperty);
         }
 
         static void setupController(const Nif::Controller* ctrl, SceneUtil::Controller* toSetup, int animflags)
@@ -420,11 +432,11 @@ namespace NifOsg
 
         static osg::ref_ptr<osg::LOD> handleLodNode(const Nif::NiLODNode* niLodNode)
         {
-            osg::ref_ptr<osg::LOD> lod (new osg::LOD);
+            osg::ref_ptr<osg::LOD> lod(new osg::LOD);
             lod->setName(niLodNode->name);
             lod->setCenterMode(osg::LOD::USER_DEFINED_CENTER);
             lod->setCenter(niLodNode->lodCenter);
-            for (unsigned int i=0; i<niLodNode->lodLevels.size(); ++i)
+            for (unsigned int i = 0; i < niLodNode->lodLevels.size(); ++i)
             {
                 const Nif::NiLODNode::LODRange& range = niLodNode->lodLevels[i];
                 lod->setRange(i, range.minRange, range.maxRange);
@@ -435,7 +447,7 @@ namespace NifOsg
 
         static osg::ref_ptr<osg::Switch> handleSwitchNode(const Nif::NiSwitchNode* niSwitchNode)
         {
-            osg::ref_ptr<osg::Switch> switchNode (new osg::Switch);
+            osg::ref_ptr<osg::Switch> switchNode(new osg::Switch);
             switchNode->setName(niSwitchNode->name);
             switchNode->setNewChildDefaultValue(false);
             switchNode->setSingleChildOn(niSwitchNode->initialIndex);
@@ -445,14 +457,15 @@ namespace NifOsg
         static osg::ref_ptr<osg::Sequence> prepareSequenceNode(const Nif::Node* nifNode)
         {
             const Nif::NiFltAnimationNode* niFltAnimationNode = static_cast<const Nif::NiFltAnimationNode*>(nifNode);
-            osg::ref_ptr<osg::Sequence> sequenceNode (new osg::Sequence);
+            osg::ref_ptr<osg::Sequence> sequenceNode(new osg::Sequence);
             sequenceNode->setName(niFltAnimationNode->name);
-            if (niFltAnimationNode->children.length()!=0)
+            if (niFltAnimationNode->children.length() != 0)
             {
                 if (niFltAnimationNode->swing())
-                    sequenceNode->setDefaultTime(niFltAnimationNode->mDuration/(niFltAnimationNode->children.length()*2));
+                    sequenceNode->setDefaultTime(
+                        niFltAnimationNode->mDuration / (niFltAnimationNode->children.length() * 2));
                 else
-                    sequenceNode->setDefaultTime(niFltAnimationNode->mDuration/niFltAnimationNode->children.length());
+                    sequenceNode->setDefaultTime(niFltAnimationNode->mDuration / niFltAnimationNode->children.length());
             }
             return sequenceNode;
         }
@@ -462,14 +475,15 @@ namespace NifOsg
             const Nif::NiFltAnimationNode* niFltAnimationNode = static_cast<const Nif::NiFltAnimationNode*>(nifNode);
             osg::Sequence* sequenceNode = static_cast<osg::Sequence*>(osgNode);
             if (niFltAnimationNode->swing())
-                sequenceNode->setInterval(osg::Sequence::SWING, 0,-1);
+                sequenceNode->setInterval(osg::Sequence::SWING, 0, -1);
             else
-                sequenceNode->setInterval(osg::Sequence::LOOP, 0,-1);
+                sequenceNode->setInterval(osg::Sequence::LOOP, 0, -1);
             sequenceNode->setDuration(1.0f, -1);
             sequenceNode->setMode(osg::Sequence::START);
         }
 
-        osg::ref_ptr<osg::Image> handleSourceTexture(const Nif::NiSourceTexture* st, Resource::ImageManager* imageManager)
+        osg::ref_ptr<osg::Image> handleSourceTexture(
+            const Nif::NiSourceTexture* st, Resource::ImageManager* imageManager)
         {
             if (!st)
                 return nullptr;
@@ -498,7 +512,8 @@ namespace NifOsg
             const Nif::NiTextureEffect* textureEffect = static_cast<const Nif::NiTextureEffect*>(nifNode);
             if (textureEffect->textureType != Nif::NiTextureEffect::Environment_Map)
             {
-                Log(Debug::Info) << "Unhandled NiTextureEffect type " << textureEffect->textureType << " in " << mFilename;
+                Log(Debug::Info) << "Unhandled NiTextureEffect type " << textureEffect->textureType << " in "
+                                 << mFilename;
                 return;
             }
 
@@ -508,30 +523,33 @@ namespace NifOsg
                 return;
             }
 
-            osg::ref_ptr<osg::TexGen> texGen (new osg::TexGen);
+            osg::ref_ptr<osg::TexGen> texGen(new osg::TexGen);
             switch (textureEffect->coordGenType)
             {
-            case Nif::NiTextureEffect::World_Parallel:
-                texGen->setMode(osg::TexGen::OBJECT_LINEAR);
-                break;
-            case Nif::NiTextureEffect::World_Perspective:
-                texGen->setMode(osg::TexGen::EYE_LINEAR);
-                break;
-            case Nif::NiTextureEffect::Sphere_Map:
-                texGen->setMode(osg::TexGen::SPHERE_MAP);
-                break;
-            default:
-                Log(Debug::Info) << "Unhandled NiTextureEffect coordGenType " << textureEffect->coordGenType << " in " << mFilename;
-                return;
+                case Nif::NiTextureEffect::World_Parallel:
+                    texGen->setMode(osg::TexGen::OBJECT_LINEAR);
+                    break;
+                case Nif::NiTextureEffect::World_Perspective:
+                    texGen->setMode(osg::TexGen::EYE_LINEAR);
+                    break;
+                case Nif::NiTextureEffect::Sphere_Map:
+                    texGen->setMode(osg::TexGen::SPHERE_MAP);
+                    break;
+                default:
+                    Log(Debug::Info) << "Unhandled NiTextureEffect coordGenType " << textureEffect->coordGenType
+                                     << " in " << mFilename;
+                    return;
             }
 
-            osg::ref_ptr<osg::Image> image (handleSourceTexture(textureEffect->texture.getPtr(), imageManager));
-            osg::ref_ptr<osg::Texture2D> texture2d (new osg::Texture2D(image));
+            osg::ref_ptr<osg::Image> image(handleSourceTexture(textureEffect->texture.getPtr(), imageManager));
+            osg::ref_ptr<osg::Texture2D> texture2d(new osg::Texture2D(image));
             if (image)
                 texture2d->setTextureSize(image->s(), image->t());
             texture2d->setName("envMap");
-            texture2d->setWrap(osg::Texture::WRAP_S, textureEffect->wrapS() ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
-            texture2d->setWrap(osg::Texture::WRAP_T, textureEffect->wrapT() ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
+            texture2d->setWrap(
+                osg::Texture::WRAP_S, textureEffect->wrapS() ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
+            texture2d->setWrap(
+                osg::Texture::WRAP_T, textureEffect->wrapT() ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
 
             int texUnit = 3; // FIXME
 
@@ -540,7 +558,7 @@ namespace NifOsg
             stateset->setTextureAttributeAndModes(texUnit, texGen, osg::StateAttribute::ON);
             stateset->setTextureAttributeAndModes(texUnit, createEmissiveTexEnv(), osg::StateAttribute::ON);
 
-            stateset->addUniform(new osg::Uniform("envMapColor", osg::Vec4f(1,1,1,1)));
+            stateset->addUniform(new osg::Uniform("envMapColor", osg::Vec4f(1, 1, 1, 1)));
         }
 
         // Get a default dataVariance for this node to be used as a hint by optimization (post)routines
@@ -551,19 +569,20 @@ namespace NifOsg
 
             switch (nifNode->recType)
             {
-            case Nif::RC_NiBillboardNode:
-                dataVariance = osg::Object::DYNAMIC;
-                break;
-            default:
-                // The Root node can be created as a Group if no transformation is required.
-                // This takes advantage of the fact root nodes can't have additional controllers
-                // loaded from an external .kf file (original engine just throws "can't find node" errors if you try).
-                if (nifNode->parents.empty() && nifNode->controller.empty() && nifNode->trafo.isIdentity())
-                    node = new osg::Group;
+                case Nif::RC_NiBillboardNode:
+                    dataVariance = osg::Object::DYNAMIC;
+                    break;
+                default:
+                    // The Root node can be created as a Group if no transformation is required.
+                    // This takes advantage of the fact root nodes can't have additional controllers
+                    // loaded from an external .kf file (original engine just throws "can't find node" errors if you
+                    // try).
+                    if (nifNode->parents.empty() && nifNode->controller.empty() && nifNode->trafo.isIdentity())
+                        node = new osg::Group;
 
-                dataVariance = nifNode->isBone ? osg::Object::DYNAMIC : osg::Object::STATIC;
+                    dataVariance = nifNode->isBone ? osg::Object::DYNAMIC : osg::Object::STATIC;
 
-                break;
+                    break;
             }
             if (!node)
                 node = new NifOsg::MatrixTransform(nifNode->trafo);
@@ -576,7 +595,7 @@ namespace NifOsg
         osg::ref_ptr<osg::Node> handleNode(const Nif::Node* nifNode, const Nif::Parent* parent, osg::Group* parentNode,
             Resource::ImageManager* imageManager, std::vector<unsigned int> boundTextures, int animflags,
             bool skipMeshes, bool hasMarkers, bool hasAnimatedParents, SceneUtil::TextKeyMap* textKeys,
-            osg::Node* rootNode=nullptr)
+            osg::Node* rootNode = nullptr)
         {
             if (rootNode != nullptr && Misc::StringUtils::ciEqual(nifNode->name, "Bounding Box"))
                 return nullptr;
@@ -616,14 +635,14 @@ namespace NifOsg
 
             for (const auto& e : extraCollection)
             {
-                if(e->recType == Nif::RC_NiTextKeyExtraData && textKeys)
+                if (e->recType == Nif::RC_NiTextKeyExtraData && textKeys)
                 {
-                    const Nif::NiTextKeyExtraData *tk = static_cast<const Nif::NiTextKeyExtraData*>(e.getPtr());
+                    const Nif::NiTextKeyExtraData* tk = static_cast<const Nif::NiTextKeyExtraData*>(e.getPtr());
                     extractTextKeys(tk, *textKeys);
                 }
-                else if(e->recType == Nif::RC_NiStringExtraData)
+                else if (e->recType == Nif::RC_NiStringExtraData)
                 {
-                    const Nif::NiStringExtraData *sd = static_cast<const Nif::NiStringExtraData*>(e.getPtr());
+                    const Nif::NiStringExtraData* sd = static_cast<const Nif::NiStringExtraData*>(e.getPtr());
 
                     constexpr std::string_view extraDataIdentifer = "omw:data";
 
@@ -640,7 +659,8 @@ namespace NifOsg
                     }
                     else if (sd->string.rfind(extraDataIdentifer, 0) == 0)
                     {
-                        node->setUserValue(Misc::OsgUserValues::sExtraData, sd->string.substr(extraDataIdentifer.length()));
+                        node->setUserValue(
+                            Misc::OsgUserValues::sExtraData, sd->string.substr(extraDataIdentifer.length()));
                     }
                 }
             }
@@ -654,11 +674,13 @@ namespace NifOsg
 
                 if (sortNode->mSubSorter.empty())
                 {
-                    Log(Debug::Warning) << "Empty accumulator found in '" << nifNode->recName << "' node " << nifNode->recIndex;
+                    Log(Debug::Warning) << "Empty accumulator found in '" << nifNode->recName << "' node "
+                                        << nifNode->recIndex;
                 }
                 else
                 {
-                    if (mPushedSorter && !mPushedSorter->mSubSorter.empty() && mPushedSorter->mMode != Nif::NiSortAdjustNode::SortingMode_Inherit)
+                    if (mPushedSorter && !mPushedSorter->mSubSorter.empty()
+                        && mPushedSorter->mMode != Nif::NiSortAdjustNode::SortingMode_Inherit)
                         mLastAppliedNoInheritSorter = mPushedSorter;
                     mPushedSorter = sortNode;
                 }
@@ -685,7 +707,8 @@ namespace NifOsg
                 }
 
                 if (!hasVisController)
-                    skipMeshes = true; // skip child meshes, but still create the child node hierarchy for animating collision shapes
+                    skipMeshes = true; // skip child meshes, but still create the child node hierarchy for animating
+                                       // collision shapes
 
                 node->setNodeMask(Loader::getHiddenNodeMask());
             }
@@ -706,7 +729,8 @@ namespace NifOsg
                 static const std::string shadowName = "shadow";
                 static const std::string shadowName2 = "tri shadow";
                 const bool isMarker = hasMarkers && !nodeName.compare(0, markerName.size(), markerName);
-                if (!isMarker && nodeName.compare(0, shadowName.size(), shadowName) && nodeName.compare(0, shadowName2.size(), shadowName2))
+                if (!isMarker && nodeName.compare(0, shadowName.size(), shadowName)
+                    && nodeName.compare(0, shadowName2.size(), shadowName2))
                 {
                     Nif::NiSkinInstancePtr skin = static_cast<const Nif::NiGeometry*>(nifNode)->skin;
 
@@ -725,13 +749,14 @@ namespace NifOsg
 
             if (composite->getNumControllers() > 0)
             {
-                osg::Callback *cb = composite;
+                osg::Callback* cb = composite;
                 if (composite->getNumControllers() == 1)
                     cb = composite->getController(0);
                 if (animflags & Nif::NiNode::AnimFlag_AutoPlay)
                     node->addCullCallback(cb);
                 else
-                    node->addUpdateCallback(cb); // have to remain as UpdateCallback so AssignControllerSourcesVisitor can find it.
+                    node->addUpdateCallback(
+                        cb); // have to remain as UpdateCallback so AssignControllerSourcesVisitor can find it.
             }
 
             bool isAnimated = false;
@@ -741,9 +766,9 @@ namespace NifOsg
             if (isAnimated || (hasAnimatedParents && ((skipMeshes || hasMarkers) || isGeometry)))
                 node->setDataVariance(osg::Object::DYNAMIC);
 
-            // LOD and Switch nodes must be wrapped by a transform (the current node) to support transformations properly
-            // and we need to attach their children to the osg::LOD/osg::Switch nodes
-            // but we must return that transform to the caller of handleNode instead of the actual LOD/Switch nodes.
+            // LOD and Switch nodes must be wrapped by a transform (the current node) to support transformations
+            // properly and we need to attach their children to the osg::LOD/osg::Switch nodes but we must return that
+            // transform to the caller of handleNode instead of the actual LOD/Switch nodes.
             osg::ref_ptr<osg::Group> currentNode = node;
 
             if (nifNode->recType == Nif::RC_NiSwitchNode)
@@ -772,32 +797,35 @@ namespace NifOsg
                 currentNode = sequenceNode;
             }
 
-            const Nif::NiNode *ninode = dynamic_cast<const Nif::NiNode*>(nifNode);
-            if(ninode)
+            const Nif::NiNode* ninode = dynamic_cast<const Nif::NiNode*>(nifNode);
+            if (ninode)
             {
-                const Nif::NodeList &effects = ninode->effects;
+                const Nif::NodeList& effects = ninode->effects;
                 for (size_t i = 0; i < effects.length(); ++i)
                 {
                     if (!effects[i].empty())
                         handleEffect(effects[i].getPtr(), currentNode, imageManager);
                 }
 
-                const Nif::NodeList &children = ninode->children;
-                const Nif::Parent currentParent {*ninode, parent};
-                for(size_t i = 0;i < children.length();++i)
+                const Nif::NodeList& children = ninode->children;
+                const Nif::Parent currentParent{ *ninode, parent };
+                for (size_t i = 0; i < children.length(); ++i)
                 {
-                    if(!children[i].empty())
-                        handleNode(children[i].getPtr(), &currentParent, currentNode, imageManager, boundTextures, animflags, skipMeshes, hasMarkers, hasAnimatedParents, textKeys, rootNode);
+                    if (!children[i].empty())
+                        handleNode(children[i].getPtr(), &currentParent, currentNode, imageManager, boundTextures,
+                            animflags, skipMeshes, hasMarkers, hasAnimatedParents, textKeys, rootNode);
                 }
             }
 
             if (nifNode->recType == Nif::RC_NiFltAnimationNode)
-                activateSequenceNode(currentNode,nifNode);
+                activateSequenceNode(currentNode, nifNode);
 
             return node;
         }
 
-        void handleMeshControllers(const Nif::Node *nifNode, osg::Node* node, SceneUtil::CompositeStateSetUpdater* composite, const std::vector<unsigned int> &boundTextures, int animflags)
+        void handleMeshControllers(const Nif::Node* nifNode, osg::Node* node,
+            SceneUtil::CompositeStateSetUpdater* composite, const std::vector<unsigned int>& boundTextures,
+            int animflags)
         {
             for (Nif::ControllerPtr ctrl = nifNode->controller; !ctrl.empty(); ctrl = ctrl->next)
             {
@@ -805,13 +833,13 @@ namespace NifOsg
                     continue;
                 if (ctrl->recType == Nif::RC_NiUVController)
                 {
-                    const Nif::NiUVController *niuvctrl = static_cast<const Nif::NiUVController*>(ctrl.getPtr());
+                    const Nif::NiUVController* niuvctrl = static_cast<const Nif::NiUVController*>(ctrl.getPtr());
                     if (niuvctrl->data.empty())
                         continue;
                     const unsigned int uvSet = niuvctrl->uvSet;
                     std::set<int> texUnits;
                     // UVController should work only for textures which use a given UV Set, usually 0.
-                    for (unsigned int i=0; i<boundTextures.size(); ++i)
+                    for (unsigned int i = 0; i < boundTextures.size(); ++i)
                     {
                         if (boundTextures[i] == uvSet)
                             texUnits.insert(i);
@@ -832,12 +860,13 @@ namespace NifOsg
                     continue;
                 if (ctrl->recType == Nif::RC_NiKeyframeController)
                 {
-                    const Nif::NiKeyframeController *key = static_cast<const Nif::NiKeyframeController*>(ctrl.getPtr());
+                    const Nif::NiKeyframeController* key = static_cast<const Nif::NiKeyframeController*>(ctrl.getPtr());
                     if (key->mData.empty() && key->mInterpolator.empty())
                         continue;
                     if (!key->mInterpolator.empty() && key->mInterpolator->recType != Nif::RC_NiTransformInterpolator)
                     {
-                        Log(Debug::Error) << "Unsupported interpolator type for NiKeyframeController " << key->recIndex << " in " << mFilename;
+                        Log(Debug::Error) << "Unsupported interpolator type for NiKeyframeController " << key->recIndex
+                                          << " in " << mFilename;
                         continue;
                     }
                     osg::ref_ptr<KeyframeController> callback = new KeyframeController(key);
@@ -847,7 +876,7 @@ namespace NifOsg
                 }
                 else if (ctrl->recType == Nif::RC_NiPathController)
                 {
-                    const Nif::NiPathController *path = static_cast<const Nif::NiPathController*>(ctrl.getPtr());
+                    const Nif::NiPathController* path = static_cast<const Nif::NiPathController*>(ctrl.getPtr());
                     if (path->posData.empty() || path->floatData.empty())
                         continue;
                     osg::ref_ptr<PathController> callback(new PathController(path));
@@ -857,12 +886,14 @@ namespace NifOsg
                 }
                 else if (ctrl->recType == Nif::RC_NiVisController)
                 {
-                    const Nif::NiVisController *visctrl = static_cast<const Nif::NiVisController*>(ctrl.getPtr());
+                    const Nif::NiVisController* visctrl = static_cast<const Nif::NiVisController*>(ctrl.getPtr());
                     if (visctrl->mData.empty() && visctrl->mInterpolator.empty())
                         continue;
-                    if (!visctrl->mInterpolator.empty() && visctrl->mInterpolator->recType != Nif::RC_NiBoolInterpolator)
+                    if (!visctrl->mInterpolator.empty()
+                        && visctrl->mInterpolator->recType != Nif::RC_NiBoolInterpolator)
                     {
-                        Log(Debug::Error) << "Unsupported interpolator type for NiVisController " << visctrl->recIndex << " in " << mFilename;
+                        Log(Debug::Error) << "Unsupported interpolator type for NiVisController " << visctrl->recIndex
+                                          << " in " << mFilename;
                         continue;
                     }
                     osg::ref_ptr<VisController> callback(new VisController(visctrl, Loader::getHiddenNodeMask()));
@@ -871,12 +902,14 @@ namespace NifOsg
                 }
                 else if (ctrl->recType == Nif::RC_NiRollController)
                 {
-                    const Nif::NiRollController *rollctrl = static_cast<const Nif::NiRollController*>(ctrl.getPtr());
+                    const Nif::NiRollController* rollctrl = static_cast<const Nif::NiRollController*>(ctrl.getPtr());
                     if (rollctrl->mData.empty() && rollctrl->mInterpolator.empty())
                         continue;
-                    if (!rollctrl->mInterpolator.empty() && rollctrl->mInterpolator->recType != Nif::RC_NiFloatInterpolator)
+                    if (!rollctrl->mInterpolator.empty()
+                        && rollctrl->mInterpolator->recType != Nif::RC_NiFloatInterpolator)
                     {
-                        Log(Debug::Error) << "Unsupported interpolator type for NiRollController " << rollctrl->recIndex << " in " << mFilename;
+                        Log(Debug::Error) << "Unsupported interpolator type for NiRollController " << rollctrl->recIndex
+                                          << " in " << mFilename;
                         continue;
                     }
                     osg::ref_ptr<RollController> callback = new RollController(rollctrl);
@@ -885,18 +918,19 @@ namespace NifOsg
                     isAnimated = true;
                 }
                 else if (ctrl->recType == Nif::RC_NiGeomMorpherController
-                      || ctrl->recType == Nif::RC_NiParticleSystemController
-                      || ctrl->recType == Nif::RC_NiBSPArrayController
-                      || ctrl->recType == Nif::RC_NiUVController)
+                    || ctrl->recType == Nif::RC_NiParticleSystemController
+                    || ctrl->recType == Nif::RC_NiBSPArrayController || ctrl->recType == Nif::RC_NiUVController)
                 {
                     // These controllers are handled elsewhere
                 }
                 else
-                    Log(Debug::Info) << "Unhandled controller " << ctrl->recName << " on node " << nifNode->recIndex << " in " << mFilename;
+                    Log(Debug::Info) << "Unhandled controller " << ctrl->recName << " on node " << nifNode->recIndex
+                                     << " in " << mFilename;
             }
         }
 
-        void handleMaterialControllers(const Nif::Property *materialProperty, SceneUtil::CompositeStateSetUpdater* composite, int animflags, const osg::Material* baseMaterial)
+        void handleMaterialControllers(const Nif::Property* materialProperty,
+            SceneUtil::CompositeStateSetUpdater* composite, int animflags, const osg::Material* baseMaterial)
         {
             for (Nif::ControllerPtr ctrl = materialProperty->controller; !ctrl.empty(); ctrl = ctrl->next)
             {
@@ -907,9 +941,11 @@ namespace NifOsg
                     const Nif::NiAlphaController* alphactrl = static_cast<const Nif::NiAlphaController*>(ctrl.getPtr());
                     if (alphactrl->mData.empty() && alphactrl->mInterpolator.empty())
                         continue;
-                    if (!alphactrl->mInterpolator.empty() && alphactrl->mInterpolator->recType != Nif::RC_NiFloatInterpolator)
+                    if (!alphactrl->mInterpolator.empty()
+                        && alphactrl->mInterpolator->recType != Nif::RC_NiFloatInterpolator)
                     {
-                        Log(Debug::Error) << "Unsupported interpolator type for NiAlphaController " << alphactrl->recIndex << " in " << mFilename;
+                        Log(Debug::Error) << "Unsupported interpolator type for NiAlphaController "
+                                          << alphactrl->recIndex << " in " << mFilename;
                         continue;
                     }
                     osg::ref_ptr<AlphaController> osgctrl = new AlphaController(alphactrl, baseMaterial);
@@ -918,15 +954,19 @@ namespace NifOsg
                 }
                 else if (ctrl->recType == Nif::RC_NiMaterialColorController)
                 {
-                    const Nif::NiMaterialColorController* matctrl = static_cast<const Nif::NiMaterialColorController*>(ctrl.getPtr());
+                    const Nif::NiMaterialColorController* matctrl
+                        = static_cast<const Nif::NiMaterialColorController*>(ctrl.getPtr());
                     if (matctrl->mData.empty() && matctrl->mInterpolator.empty())
                         continue;
                     auto targetColor = static_cast<MaterialColorController::TargetColor>(matctrl->mTargetColor);
-                    if (mVersion <= Nif::NIFFile::NIFVersion::VER_MW && targetColor == MaterialColorController::TargetColor::Specular)
+                    if (mVersion <= Nif::NIFFile::NIFVersion::VER_MW
+                        && targetColor == MaterialColorController::TargetColor::Specular)
                         continue;
-                    if (!matctrl->mInterpolator.empty() && matctrl->mInterpolator->recType != Nif::RC_NiPoint3Interpolator)
+                    if (!matctrl->mInterpolator.empty()
+                        && matctrl->mInterpolator->recType != Nif::RC_NiPoint3Interpolator)
                     {
-                        Log(Debug::Error) << "Unsupported interpolator type for NiMaterialColorController " << matctrl->recIndex << " in " << mFilename;
+                        Log(Debug::Error) << "Unsupported interpolator type for NiMaterialColorController "
+                                          << matctrl->recIndex << " in " << mFilename;
                         continue;
                     }
                     osg::ref_ptr<MaterialColorController> osgctrl = new MaterialColorController(matctrl, baseMaterial);
@@ -938,7 +978,8 @@ namespace NifOsg
             }
         }
 
-        void handleTextureControllers(const Nif::Property *texProperty, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager, osg::StateSet *stateset, int animflags)
+        void handleTextureControllers(const Nif::Property* texProperty, SceneUtil::CompositeStateSetUpdater* composite,
+            Resource::ImageManager* imageManager, osg::StateSet* stateset, int animflags)
         {
             for (Nif::ControllerPtr ctrl = texProperty->controller; !ctrl.empty(); ctrl = ctrl->next)
             {
@@ -947,15 +988,18 @@ namespace NifOsg
                 if (ctrl->recType == Nif::RC_NiFlipController)
                 {
                     const Nif::NiFlipController* flipctrl = static_cast<const Nif::NiFlipController*>(ctrl.getPtr());
-                    if (!flipctrl->mInterpolator.empty() && flipctrl->mInterpolator->recType != Nif::RC_NiFloatInterpolator)
+                    if (!flipctrl->mInterpolator.empty()
+                        && flipctrl->mInterpolator->recType != Nif::RC_NiFloatInterpolator)
                     {
-                        Log(Debug::Error) << "Unsupported interpolator type for NiFlipController " << flipctrl->recIndex << " in " << mFilename;
+                        Log(Debug::Error) << "Unsupported interpolator type for NiFlipController " << flipctrl->recIndex
+                                          << " in " << mFilename;
                         continue;
                     }
-                    std::vector<osg::ref_ptr<osg::Texture2D> > textures;
+                    std::vector<osg::ref_ptr<osg::Texture2D>> textures;
 
                     // inherit wrap settings from the target slot
-                    osg::Texture2D* inherit = dynamic_cast<osg::Texture2D*>(stateset->getTextureAttribute(0, osg::StateAttribute::TEXTURE));
+                    osg::Texture2D* inherit
+                        = dynamic_cast<osg::Texture2D*>(stateset->getTextureAttribute(0, osg::StateAttribute::TEXTURE));
                     osg::Texture2D::WrapMode wrapS = osg::Texture2D::REPEAT;
                     osg::Texture2D::WrapMode wrapT = osg::Texture2D::REPEAT;
                     if (inherit)
@@ -964,14 +1008,14 @@ namespace NifOsg
                         wrapT = inherit->getWrap(osg::Texture2D::WRAP_T);
                     }
 
-                    for (unsigned int i=0; i<flipctrl->mSources.length(); ++i)
+                    for (unsigned int i = 0; i < flipctrl->mSources.length(); ++i)
                     {
                         Nif::NiSourceTexturePtr st = flipctrl->mSources[i];
                         if (st.empty())
                             continue;
 
-                        osg::ref_ptr<osg::Image> image (handleSourceTexture(st.getPtr(), imageManager));
-                        osg::ref_ptr<osg::Texture2D> texture (new osg::Texture2D(image));
+                        osg::ref_ptr<osg::Image> image(handleSourceTexture(st.getPtr(), imageManager));
+                        osg::ref_ptr<osg::Texture2D> texture(new osg::Texture2D(image));
                         if (image)
                             texture->setTextureSize(image->s(), image->t());
                         texture->setWrap(osg::Texture::WRAP_S, wrapS);
@@ -987,7 +1031,9 @@ namespace NifOsg
             }
         }
 
-        void handleParticlePrograms(Nif::NiParticleModifierPtr affectors, Nif::NiParticleModifierPtr colliders, osg::Group *attachTo, osgParticle::ParticleSystem* partsys, osgParticle::ParticleProcessor::ReferenceFrame rf)
+        void handleParticlePrograms(Nif::NiParticleModifierPtr affectors, Nif::NiParticleModifierPtr colliders,
+            osg::Group* attachTo, osgParticle::ParticleSystem* partsys,
+            osgParticle::ParticleProcessor::ReferenceFrame rf)
         {
             osgParticle::ModularProgram* program = new osgParticle::ModularProgram;
             attachTo->addChild(program);
@@ -997,7 +1043,7 @@ namespace NifOsg
             {
                 if (affectors->recType == Nif::RC_NiParticleGrowFade)
                 {
-                    const Nif::NiParticleGrowFade *gf = static_cast<const Nif::NiParticleGrowFade*>(affectors.getPtr());
+                    const Nif::NiParticleGrowFade* gf = static_cast<const Nif::NiParticleGrowFade*>(affectors.getPtr());
                     program->addOperator(new GrowFadeAffector(gf->growTime, gf->fadeTime));
                 }
                 else if (affectors->recType == Nif::RC_NiGravity)
@@ -1007,10 +1053,11 @@ namespace NifOsg
                 }
                 else if (affectors->recType == Nif::RC_NiParticleColorModifier)
                 {
-                    const Nif::NiParticleColorModifier *cl = static_cast<const Nif::NiParticleColorModifier*>(affectors.getPtr());
+                    const Nif::NiParticleColorModifier* cl
+                        = static_cast<const Nif::NiParticleColorModifier*>(affectors.getPtr());
                     if (cl->data.empty())
                         continue;
-                    const Nif::NiColorData *clrdata = cl->data.getPtr();
+                    const Nif::NiColorData* clrdata = cl->data.getPtr();
                     program->addOperator(new ParticleColorAffector(clrdata));
                 }
                 else if (affectors->recType == Nif::RC_NiParticleRotation)
@@ -1024,12 +1071,14 @@ namespace NifOsg
             {
                 if (colliders->recType == Nif::RC_NiPlanarCollider)
                 {
-                    const Nif::NiPlanarCollider* planarcollider = static_cast<const Nif::NiPlanarCollider*>(colliders.getPtr());
+                    const Nif::NiPlanarCollider* planarcollider
+                        = static_cast<const Nif::NiPlanarCollider*>(colliders.getPtr());
                     program->addOperator(new PlanarCollider(planarcollider));
                 }
                 else if (colliders->recType == Nif::RC_NiSphericalCollider)
                 {
-                    const Nif::NiSphericalCollider* sphericalcollider = static_cast<const Nif::NiSphericalCollider*>(colliders.getPtr());
+                    const Nif::NiSphericalCollider* sphericalcollider
+                        = static_cast<const Nif::NiSphericalCollider*>(colliders.getPtr());
                     program->addOperator(new SphericalCollider(sphericalcollider));
                 }
                 else
@@ -1037,8 +1086,10 @@ namespace NifOsg
             }
         }
 
-        // Load the initial state of the particle system, i.e. the initial particles and their positions, velocity and colors.
-        void handleParticleInitialState(const Nif::Node* nifNode, ParticleSystem* partsys, const Nif::NiParticleSystemController* partctrl)
+        // Load the initial state of the particle system, i.e. the initial particles and their positions, velocity and
+        // colors.
+        void handleParticleInitialState(
+            const Nif::Node* nifNode, ParticleSystem* partsys, const Nif::NiParticleSystemController* partctrl)
         {
             auto particleNode = static_cast<const Nif::NiParticles*>(nifNode);
             if (particleNode->data.empty() || particleNode->data->recType != Nif::RC_NiParticlesData)
@@ -1052,7 +1103,7 @@ namespace NifOsg
 
             osg::BoundingBox box;
 
-            int i=0;
+            int i = 0;
             for (const auto& particle : partctrl->particles)
             {
                 if (i++ >= particledata->activeCount)
@@ -1070,7 +1121,8 @@ namespace NifOsg
                 created->setLifeTime(particle.lifespan);
 
                 // Note this position and velocity is not correct for a particle system with absolute reference frame,
-                // which can not be done in this loader since we are not attached to the scene yet. Will be fixed up post-load in the SceneManager.
+                // which can not be done in this loader since we are not attached to the scene yet. Will be fixed up
+                // post-load in the SceneManager.
                 created->setVelocity(particle.velocity);
                 const osg::Vec3f& position = particledata->vertices[particle.vertex];
                 created->setPosition(position);
@@ -1087,7 +1139,7 @@ namespace NifOsg
             }
 
             // radius may be used to force a larger bounding box
-            box.expandBy(osg::BoundingSphere(osg::Vec3(0,0,0), particledata->radius));
+            box.expandBy(osg::BoundingSphere(osg::Vec3(0, 0, 0), particledata->radius));
 
             partsys->setInitialBound(box);
         }
@@ -1108,15 +1160,15 @@ namespace NifOsg
             else if (partctrl->lifetime == 0 && partctrl->lifetimeRandom == 0)
                 counter->setNumberOfParticlesPerSecondToCreate(0);
             else
-                counter->setNumberOfParticlesPerSecondToCreate(partctrl->numParticles / (partctrl->lifetime + partctrl->lifetimeRandom/2));
+                counter->setNumberOfParticlesPerSecondToCreate(
+                    partctrl->numParticles / (partctrl->lifetime + partctrl->lifetimeRandom / 2));
 
             emitter->setCounter(counter);
 
-            ParticleShooter* shooter = new ParticleShooter(partctrl->velocity - partctrl->velocityRandom*0.5f,
-                                                           partctrl->velocity + partctrl->velocityRandom*0.5f,
-                                                           partctrl->horizontalDir, partctrl->horizontalAngle,
-                                                           partctrl->verticalDir, partctrl->verticalAngle,
-                                                           partctrl->lifetime, partctrl->lifetimeRandom);
+            ParticleShooter* shooter = new ParticleShooter(partctrl->velocity - partctrl->velocityRandom * 0.5f,
+                partctrl->velocity + partctrl->velocityRandom * 0.5f, partctrl->horizontalDir,
+                partctrl->horizontalAngle, partctrl->verticalDir, partctrl->verticalAngle, partctrl->lifetime,
+                partctrl->lifetimeRandom);
             emitter->setShooter(shooter);
             emitter->setFlags(partctrl->flags);
 
@@ -1146,12 +1198,14 @@ namespace NifOsg
                 osg::Group* emitterNode = findEmitterNode.mFound;
                 if (!emitterNode)
                 {
-                    nif->warn("Failed to find particle emitter emitter node (node record index " + std::to_string(recIndex) + ")");
+                    nif->warn("Failed to find particle emitter emitter node (node record index "
+                        + std::to_string(recIndex) + ")");
                     continue;
                 }
 
-                // Emitter attached to the emitter node. Note one side effect of the emitter using the CullVisitor is that hiding its node
-                // actually causes the emitter to stop firing. Convenient, because MW behaves this way too!
+                // Emitter attached to the emitter node. Note one side effect of the emitter using the CullVisitor is
+                // that hiding its node actually causes the emitter to stop firing. Convenient, because MW behaves this
+                // way too!
                 emitterNode->addChild(emitterPair.second);
 
                 DisableOptimizer disableOptimizer;
@@ -1160,10 +1214,10 @@ namespace NifOsg
             mEmitterQueue.clear();
         }
 
-        void handleParticleSystem(const Nif::Node *nifNode, const Nif::Parent* parent, osg::Group *parentNode,
+        void handleParticleSystem(const Nif::Node* nifNode, const Nif::Parent* parent, osg::Group* parentNode,
             SceneUtil::CompositeStateSetUpdater* composite, int animflags)
         {
-            osg::ref_ptr<ParticleSystem> partsys (new ParticleSystem);
+            osg::ref_ptr<ParticleSystem> partsys(new ParticleSystem);
             partsys->setSortMode(osgParticle::ParticleSystem::SORT_BACK_TO_FRONT);
 
             const Nif::NiParticleSystemController* partctrl = nullptr;
@@ -1171,7 +1225,8 @@ namespace NifOsg
             {
                 if (!ctrl->isActive())
                     continue;
-                if(ctrl->recType == Nif::RC_NiParticleSystemController || ctrl->recType == Nif::RC_NiBSPArrayController)
+                if (ctrl->recType == Nif::RC_NiParticleSystemController
+                    || ctrl->recType == Nif::RC_NiBSPArrayController)
                     partctrl = static_cast<Nif::NiParticleSystemController*>(ctrl.getPtr());
             }
             if (!partctrl)
@@ -1181,8 +1236,8 @@ namespace NifOsg
             }
 
             osgParticle::ParticleProcessor::ReferenceFrame rf = (animflags & Nif::NiNode::ParticleFlag_LocalSpace)
-                    ? osgParticle::ParticleProcessor::RELATIVE_RF
-                    : osgParticle::ParticleProcessor::ABSOLUTE_RF;
+                ? osgParticle::ParticleProcessor::RELATIVE_RF
+                : osgParticle::ParticleProcessor::ABSOLUTE_RF;
 
             // HACK: ParticleSystem has no setReferenceFrame method
             if (rf == osgParticle::ParticleProcessor::ABSOLUTE_RF)
@@ -1204,9 +1259,9 @@ namespace NifOsg
                 emitter->setParticleSystem(partsys);
                 emitter->setReferenceFrame(osgParticle::ParticleProcessor::RELATIVE_RF);
 
-                // The emitter node may not actually be handled yet, so let's delay attaching the emitter to a later moment.
-                // If the emitter node is placed later than the particle node, it'll have a single frame delay in particle processing.
-                // But that shouldn't be a game-breaking issue.
+                // The emitter node may not actually be handled yet, so let's delay attaching the emitter to a later
+                // moment. If the emitter node is placed later than the particle node, it'll have a single frame delay
+                // in particle processing. But that shouldn't be a game-breaking issue.
                 mEmitterQueue.emplace_back(partctrl->emitter->recIndex, emitter);
 
                 osg::ref_ptr<ParticleSystemController> callback(new ParticleSystemController(partctrl));
@@ -1234,7 +1289,8 @@ namespace NifOsg
             applyDrawableProperties(parentNode, drawableProps, composite, true, animflags);
 
             // particle system updater (after the emitters and affectors in the scene graph)
-            // I think for correct culling needs to be *before* the ParticleSystem, though osg examples do it the other way
+            // I think for correct culling needs to be *before* the ParticleSystem, though osg examples do it the other
+            // way
             osg::ref_ptr<osgParticle::ParticleSystemUpdater> updater = new osgParticle::ParticleSystemUpdater;
             updater->addParticleSystem(partsys);
             parentNode->addChild(updater);
@@ -1252,7 +1308,8 @@ namespace NifOsg
             }
         }
 
-        void handleNiGeometryData(osg::Geometry *geometry, const Nif::NiGeometryData* data, const std::vector<unsigned int>& boundTextures, const std::string& name)
+        void handleNiGeometryData(osg::Geometry* geometry, const Nif::NiGeometryData* data,
+            const std::vector<unsigned int>& boundTextures, const std::string& name)
         {
             const auto& vertices = data->vertices;
             const auto& normals = data->normals;
@@ -1260,28 +1317,32 @@ namespace NifOsg
             if (!vertices.empty())
                 geometry->setVertexArray(new osg::Vec3Array(vertices.size(), vertices.data()));
             if (!normals.empty())
-                geometry->setNormalArray(new osg::Vec3Array(normals.size(), normals.data()), osg::Array::BIND_PER_VERTEX);
+                geometry->setNormalArray(
+                    new osg::Vec3Array(normals.size(), normals.data()), osg::Array::BIND_PER_VERTEX);
             if (!colors.empty())
                 geometry->setColorArray(new osg::Vec4Array(colors.size(), colors.data()), osg::Array::BIND_PER_VERTEX);
 
             const auto& uvlist = data->uvlist;
             int textureStage = 0;
-            for (std::vector<unsigned int>::const_iterator it = boundTextures.begin(); it != boundTextures.end(); ++it, ++textureStage)
+            for (std::vector<unsigned int>::const_iterator it = boundTextures.begin(); it != boundTextures.end();
+                 ++it, ++textureStage)
             {
                 unsigned int uvSet = *it;
                 if (uvSet >= uvlist.size())
                 {
-                    Log(Debug::Verbose) << "Out of bounds UV set " << uvSet << " on shape \"" << name << "\" in " << mFilename;
+                    Log(Debug::Verbose) << "Out of bounds UV set " << uvSet << " on shape \"" << name << "\" in "
+                                        << mFilename;
                     if (uvlist.empty())
                         continue;
                     uvSet = 0;
                 }
 
-                geometry->setTexCoordArray(textureStage, new osg::Vec2Array(uvlist[uvSet].size(), uvlist[uvSet].data()), osg::Array::BIND_PER_VERTEX);
+                geometry->setTexCoordArray(textureStage, new osg::Vec2Array(uvlist[uvSet].size(), uvlist[uvSet].data()),
+                    osg::Array::BIND_PER_VERTEX);
             }
         }
 
-        void handleNiGeometry(const Nif::Node *nifNode, const Nif::Parent* parent, osg::Geometry *geometry,
+        void handleNiGeometry(const Nif::Node* nifNode, const Nif::Parent* parent, osg::Geometry* geometry,
             osg::Node* parentNode, SceneUtil::CompositeStateSetUpdater* composite,
             const std::vector<unsigned int>& boundTextures, int animflags)
         {
@@ -1297,8 +1358,8 @@ namespace NifOsg
                 auto triangles = static_cast<const Nif::NiTriShapeData*>(niGeometryData)->triangles;
                 if (triangles.empty())
                     return;
-                geometry->addPrimitiveSet(new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES, triangles.size(),
-                                                                        (unsigned short*)triangles.data()));
+                geometry->addPrimitiveSet(new osg::DrawElementsUShort(
+                    osg::PrimitiveSet::TRIANGLES, triangles.size(), (unsigned short*)triangles.data()));
             }
             else if (niGeometry->recType == Nif::RC_NiTriStrips)
             {
@@ -1310,8 +1371,8 @@ namespace NifOsg
                 {
                     if (strip.size() < 3)
                         continue;
-                    geometry->addPrimitiveSet(new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLE_STRIP, strip.size(),
-                                                                            reinterpret_cast<const unsigned short*>(strip.data())));
+                    geometry->addPrimitiveSet(new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLE_STRIP,
+                        strip.size(), reinterpret_cast<const unsigned short*>(strip.data())));
                     hasGeometry = true;
                 }
                 if (!hasGeometry)
@@ -1325,8 +1386,8 @@ namespace NifOsg
                 const auto& line = data->lines;
                 if (line.empty())
                     return;
-                geometry->addPrimitiveSet(new osg::DrawElementsUShort(osg::PrimitiveSet::LINES, line.size(),
-                                                                        reinterpret_cast<const unsigned short*>(line.data())));
+                geometry->addPrimitiveSet(new osg::DrawElementsUShort(
+                    osg::PrimitiveSet::LINES, line.size(), reinterpret_cast<const unsigned short*>(line.data())));
             }
             handleNiGeometryData(geometry, niGeometryData, boundTextures, nifNode->name);
 
@@ -1344,7 +1405,7 @@ namespace NifOsg
             int animflags)
         {
             assert(isTypeGeometry(nifNode->recType));
-            osg::ref_ptr<osg::Geometry> geom (new osg::Geometry);
+            osg::ref_ptr<osg::Geometry> geom(new osg::Geometry);
             handleNiGeometry(nifNode, parent, geom, parentNode, composite, boundTextures, animflags);
             // If the record had no valid geometry data in it, early-out
             if (geom->empty())
@@ -1354,9 +1415,10 @@ namespace NifOsg
             {
                 if (!ctrl->isActive())
                     continue;
-                if(ctrl->recType == Nif::RC_NiGeomMorpherController)
+                if (ctrl->recType == Nif::RC_NiGeomMorpherController)
                 {
-                    const Nif::NiGeomMorpherController* nimorphctrl = static_cast<const Nif::NiGeomMorpherController*>(ctrl.getPtr());
+                    const Nif::NiGeomMorpherController* nimorphctrl
+                        = static_cast<const Nif::NiGeomMorpherController*>(ctrl.getPtr());
                     if (nimorphctrl->mData.empty())
                         continue;
                     drawable = handleMorphGeometry(nimorphctrl, geom, parentNode, composite, boundTextures, animflags);
@@ -1373,7 +1435,10 @@ namespace NifOsg
             parentNode->addChild(drawable);
         }
 
-        osg::ref_ptr<osg::Drawable> handleMorphGeometry(const Nif::NiGeomMorpherController* morpher, osg::ref_ptr<osg::Geometry> sourceGeometry, osg::Node* parentNode, SceneUtil::CompositeStateSetUpdater* composite, const std::vector<unsigned int>& boundTextures, int animflags)
+        osg::ref_ptr<osg::Drawable> handleMorphGeometry(const Nif::NiGeomMorpherController* morpher,
+            osg::ref_ptr<osg::Geometry> sourceGeometry, osg::Node* parentNode,
+            SceneUtil::CompositeStateSetUpdater* composite, const std::vector<unsigned int>& boundTextures,
+            int animflags)
         {
             osg::ref_ptr<SceneUtil::MorphGeometry> morphGeom = new SceneUtil::MorphGeometry;
             morphGeom->setSourceGeometry(sourceGeometry);
@@ -1381,19 +1446,22 @@ namespace NifOsg
             const std::vector<Nif::NiMorphData::MorphData>& morphs = morpher->mData.getPtr()->mMorphs;
             if (morphs.empty())
                 return morphGeom;
-            if (morphs[0].mVertices.size() != static_cast<const osg::Vec3Array*>(sourceGeometry->getVertexArray())->size())
+            if (morphs[0].mVertices.size()
+                != static_cast<const osg::Vec3Array*>(sourceGeometry->getVertexArray())->size())
                 return morphGeom;
             for (unsigned int i = 0; i < morphs.size(); ++i)
-                morphGeom->addMorphTarget(new osg::Vec3Array(morphs[i].mVertices.size(), morphs[i].mVertices.data()), 0.f);
+                morphGeom->addMorphTarget(
+                    new osg::Vec3Array(morphs[i].mVertices.size(), morphs[i].mVertices.data()), 0.f);
 
             return morphGeom;
         }
 
-        void handleSkinnedGeometry(const Nif::Node *nifNode, const Nif::Parent* parent, osg::Group *parentNode,
-            SceneUtil::CompositeStateSetUpdater* composite, const std::vector<unsigned int>& boundTextures, int animflags)
+        void handleSkinnedGeometry(const Nif::Node* nifNode, const Nif::Parent* parent, osg::Group* parentNode,
+            SceneUtil::CompositeStateSetUpdater* composite, const std::vector<unsigned int>& boundTextures,
+            int animflags)
         {
             assert(isTypeGeometry(nifNode->recType));
-            osg::ref_ptr<osg::Geometry> geometry (new osg::Geometry);
+            osg::ref_ptr<osg::Geometry> geometry(new osg::Geometry);
             handleNiGeometry(nifNode, parent, geometry, parentNode, composite, boundTextures, animflags);
             if (geometry->empty())
                 return;
@@ -1402,23 +1470,24 @@ namespace NifOsg
             rig->setName(nifNode->name);
 
             // Assign bone weights
-            osg::ref_ptr<SceneUtil::RigGeometry::InfluenceMap> map (new SceneUtil::RigGeometry::InfluenceMap);
+            osg::ref_ptr<SceneUtil::RigGeometry::InfluenceMap> map(new SceneUtil::RigGeometry::InfluenceMap);
 
-            const Nif::NiSkinInstance *skin = static_cast<const Nif::NiGeometry*>(nifNode)->skin.getPtr();
-            const Nif::NiSkinData *data = skin->data.getPtr();
-            const Nif::NodeList &bones = skin->bones;
-            for(size_t i = 0;i < bones.length();i++)
+            const Nif::NiSkinInstance* skin = static_cast<const Nif::NiGeometry*>(nifNode)->skin.getPtr();
+            const Nif::NiSkinData* data = skin->data.getPtr();
+            const Nif::NodeList& bones = skin->bones;
+            for (size_t i = 0; i < bones.length(); i++)
             {
                 std::string boneName = Misc::StringUtils::lowerCase(bones[i].getPtr()->name);
 
                 SceneUtil::RigGeometry::BoneInfluence influence;
-                const std::vector<Nif::NiSkinData::VertWeight> &weights = data->bones[i].weights;
-                for(size_t j = 0;j < weights.size();j++)
+                const std::vector<Nif::NiSkinData::VertWeight>& weights = data->bones[i].weights;
+                for (size_t j = 0; j < weights.size(); j++)
                 {
                     influence.mWeights.emplace_back(weights[j].vertex, weights[j].weight);
                 }
                 influence.mInvBindMatrix = data->bones[i].trafo.toMatrix();
-                influence.mBoundSphere = osg::BoundingSpheref(data->bones[i].boundSphereCenter, data->bones[i].boundSphereRadius);
+                influence.mBoundSphere
+                    = osg::BoundingSpheref(data->bones[i].boundSphereCenter, data->bones[i].boundSphereRadius);
 
                 map->mData.emplace_back(boneName, influence);
             }
@@ -1429,22 +1498,33 @@ namespace NifOsg
 
         osg::BlendFunc::BlendFuncMode getBlendMode(int mode)
         {
-            switch(mode)
-            {
-            case 0: return osg::BlendFunc::ONE;
-            case 1: return osg::BlendFunc::ZERO;
-            case 2: return osg::BlendFunc::SRC_COLOR;
-            case 3: return osg::BlendFunc::ONE_MINUS_SRC_COLOR;
-            case 4: return osg::BlendFunc::DST_COLOR;
-            case 5: return osg::BlendFunc::ONE_MINUS_DST_COLOR;
-            case 6: return osg::BlendFunc::SRC_ALPHA;
-            case 7: return osg::BlendFunc::ONE_MINUS_SRC_ALPHA;
-            case 8: return osg::BlendFunc::DST_ALPHA;
-            case 9: return osg::BlendFunc::ONE_MINUS_DST_ALPHA;
-            case 10: return osg::BlendFunc::SRC_ALPHA_SATURATE;
-            default:
-                Log(Debug::Info) << "Unexpected blend mode: "<< mode << " in " << mFilename;
-                return osg::BlendFunc::SRC_ALPHA;
+            switch (mode)
+            {
+                case 0:
+                    return osg::BlendFunc::ONE;
+                case 1:
+                    return osg::BlendFunc::ZERO;
+                case 2:
+                    return osg::BlendFunc::SRC_COLOR;
+                case 3:
+                    return osg::BlendFunc::ONE_MINUS_SRC_COLOR;
+                case 4:
+                    return osg::BlendFunc::DST_COLOR;
+                case 5:
+                    return osg::BlendFunc::ONE_MINUS_DST_COLOR;
+                case 6:
+                    return osg::BlendFunc::SRC_ALPHA;
+                case 7:
+                    return osg::BlendFunc::ONE_MINUS_SRC_ALPHA;
+                case 8:
+                    return osg::BlendFunc::DST_ALPHA;
+                case 9:
+                    return osg::BlendFunc::ONE_MINUS_DST_ALPHA;
+                case 10:
+                    return osg::BlendFunc::SRC_ALPHA_SATURATE;
+                default:
+                    Log(Debug::Info) << "Unexpected blend mode: " << mode << " in " << mFilename;
+                    return osg::BlendFunc::SRC_ALPHA;
             }
         }
 
@@ -1452,17 +1532,25 @@ namespace NifOsg
         {
             switch (mode)
             {
-            case 0: return osg::AlphaFunc::ALWAYS;
-            case 1: return osg::AlphaFunc::LESS;
-            case 2: return osg::AlphaFunc::EQUAL;
-            case 3: return osg::AlphaFunc::LEQUAL;
-            case 4: return osg::AlphaFunc::GREATER;
-            case 5: return osg::AlphaFunc::NOTEQUAL;
-            case 6: return osg::AlphaFunc::GEQUAL;
-            case 7: return osg::AlphaFunc::NEVER;
-            default:
-                Log(Debug::Info) << "Unexpected blend mode: " << mode << " in " << mFilename;
-                return osg::AlphaFunc::LEQUAL;
+                case 0:
+                    return osg::AlphaFunc::ALWAYS;
+                case 1:
+                    return osg::AlphaFunc::LESS;
+                case 2:
+                    return osg::AlphaFunc::EQUAL;
+                case 3:
+                    return osg::AlphaFunc::LEQUAL;
+                case 4:
+                    return osg::AlphaFunc::GREATER;
+                case 5:
+                    return osg::AlphaFunc::NOTEQUAL;
+                case 6:
+                    return osg::AlphaFunc::GEQUAL;
+                case 7:
+                    return osg::AlphaFunc::NEVER;
+                default:
+                    Log(Debug::Info) << "Unexpected blend mode: " << mode << " in " << mFilename;
+                    return osg::AlphaFunc::LEQUAL;
             }
         }
 
@@ -1470,17 +1558,25 @@ namespace NifOsg
         {
             switch (func)
             {
-            case 0: return osg::Stencil::NEVER;
-            case 1: return osg::Stencil::LESS;
-            case 2: return osg::Stencil::EQUAL;
-            case 3: return osg::Stencil::LEQUAL;
-            case 4: return osg::Stencil::GREATER;
-            case 5: return osg::Stencil::NOTEQUAL;
-            case 6: return osg::Stencil::GEQUAL;
-            case 7: return osg::Stencil::ALWAYS;
-            default:
-                Log(Debug::Info) << "Unexpected stencil function: " << func << " in " << mFilename;
-                return osg::Stencil::NEVER;
+                case 0:
+                    return osg::Stencil::NEVER;
+                case 1:
+                    return osg::Stencil::LESS;
+                case 2:
+                    return osg::Stencil::EQUAL;
+                case 3:
+                    return osg::Stencil::LEQUAL;
+                case 4:
+                    return osg::Stencil::GREATER;
+                case 5:
+                    return osg::Stencil::NOTEQUAL;
+                case 6:
+                    return osg::Stencil::GEQUAL;
+                case 7:
+                    return osg::Stencil::ALWAYS;
+                default:
+                    Log(Debug::Info) << "Unexpected stencil function: " << func << " in " << mFilename;
+                    return osg::Stencil::NEVER;
             }
         }
 
@@ -1488,58 +1584,64 @@ namespace NifOsg
         {
             switch (op)
             {
-            case 0: return osg::Stencil::KEEP;
-            case 1: return osg::Stencil::ZERO;
-            case 2: return osg::Stencil::REPLACE;
-            case 3: return osg::Stencil::INCR;
-            case 4: return osg::Stencil::DECR;
-            case 5: return osg::Stencil::INVERT;
-            default:
-                Log(Debug::Info) << "Unexpected stencil operation: " << op << " in " << mFilename;
-                return osg::Stencil::KEEP;
+                case 0:
+                    return osg::Stencil::KEEP;
+                case 1:
+                    return osg::Stencil::ZERO;
+                case 2:
+                    return osg::Stencil::REPLACE;
+                case 3:
+                    return osg::Stencil::INCR;
+                case 4:
+                    return osg::Stencil::DECR;
+                case 5:
+                    return osg::Stencil::INVERT;
+                default:
+                    Log(Debug::Info) << "Unexpected stencil operation: " << op << " in " << mFilename;
+                    return osg::Stencil::KEEP;
             }
         }
 
         osg::ref_ptr<osg::Image> handleInternalTexture(const Nif::NiPixelData* pixelData)
         {
-            osg::ref_ptr<osg::Image> image (new osg::Image);
+            osg::ref_ptr<osg::Image> image(new osg::Image);
 
             // Pixel row alignment, defining it to be consistent with OSG DDS plugin
             int packing = 1;
             GLenum pixelformat = 0;
             switch (pixelData->fmt)
             {
-            case Nif::NiPixelData::NIPXFMT_RGB8:
-                pixelformat = GL_RGB;
-                break;
-            case Nif::NiPixelData::NIPXFMT_RGBA8:
-                pixelformat = GL_RGBA;
-                break;
-            case Nif::NiPixelData::NIPXFMT_PAL8:
-            case Nif::NiPixelData::NIPXFMT_PALA8:
-                pixelformat = GL_RED; // Each color is defined by a byte.
-                break;
-            case Nif::NiPixelData::NIPXFMT_BGR8:
-                pixelformat = GL_BGR;
-                break;
-            case Nif::NiPixelData::NIPXFMT_BGRA8:
-                pixelformat = GL_BGRA;
-                break;
-            case Nif::NiPixelData::NIPXFMT_DXT1:
-                pixelformat = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
-                packing = 2;
-                break;
-            case Nif::NiPixelData::NIPXFMT_DXT3:
-                pixelformat = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
-                packing = 4;
-                break;
-            case Nif::NiPixelData::NIPXFMT_DXT5:
-                pixelformat = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
-                packing = 4;
-                break;
-            default:
-                Log(Debug::Info) << "Unhandled internal pixel format " << pixelData->fmt << " in " << mFilename;
-                return nullptr;
+                case Nif::NiPixelData::NIPXFMT_RGB8:
+                    pixelformat = GL_RGB;
+                    break;
+                case Nif::NiPixelData::NIPXFMT_RGBA8:
+                    pixelformat = GL_RGBA;
+                    break;
+                case Nif::NiPixelData::NIPXFMT_PAL8:
+                case Nif::NiPixelData::NIPXFMT_PALA8:
+                    pixelformat = GL_RED; // Each color is defined by a byte.
+                    break;
+                case Nif::NiPixelData::NIPXFMT_BGR8:
+                    pixelformat = GL_BGR;
+                    break;
+                case Nif::NiPixelData::NIPXFMT_BGRA8:
+                    pixelformat = GL_BGRA;
+                    break;
+                case Nif::NiPixelData::NIPXFMT_DXT1:
+                    pixelformat = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
+                    packing = 2;
+                    break;
+                case Nif::NiPixelData::NIPXFMT_DXT3:
+                    pixelformat = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
+                    packing = 4;
+                    break;
+                case Nif::NiPixelData::NIPXFMT_DXT5:
+                    pixelformat = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
+                    packing = 4;
+                    break;
+                default:
+                    Log(Debug::Info) << "Unhandled internal pixel format " << pixelData->fmt << " in " << mFilename;
+                    return nullptr;
             }
 
             if (pixelData->mipmaps.empty())
@@ -1549,11 +1651,12 @@ namespace NifOsg
             int height = 0;
 
             std::vector<unsigned int> mipmapVector;
-            for (unsigned int i=0; i<pixelData->mipmaps.size(); ++i)
+            for (unsigned int i = 0; i < pixelData->mipmaps.size(); ++i)
             {
                 const Nif::NiPixelData::Mipmap& mip = pixelData->mipmaps[i];
 
-                size_t mipSize = osg::Image::computeImageSizeInBytes(mip.width, mip.height, 1, pixelformat, GL_UNSIGNED_BYTE, packing);
+                size_t mipSize = osg::Image::computeImageSizeInBytes(
+                    mip.width, mip.height, 1, pixelformat, GL_UNSIGNED_BYTE, packing);
                 if (mipSize + mip.dataOffset > pixelData->data.size())
                 {
                     Log(Debug::Info) << "Internal texture's mipmap data out of bounds, ignoring texture";
@@ -1578,46 +1681,48 @@ namespace NifOsg
             const std::vector<unsigned char>& pixels = pixelData->data;
             switch (pixelData->fmt)
             {
-            case Nif::NiPixelData::NIPXFMT_RGB8:
-            case Nif::NiPixelData::NIPXFMT_RGBA8:
-            case Nif::NiPixelData::NIPXFMT_BGR8:
-            case Nif::NiPixelData::NIPXFMT_BGRA8:
-            case Nif::NiPixelData::NIPXFMT_DXT1:
-            case Nif::NiPixelData::NIPXFMT_DXT3:
-            case Nif::NiPixelData::NIPXFMT_DXT5:
-            {
-                unsigned char* data = new unsigned char[pixels.size()];
-                memcpy(data, pixels.data(), pixels.size());
-                image->setImage(width, height, 1, pixelformat, pixelformat, GL_UNSIGNED_BYTE, data, osg::Image::USE_NEW_DELETE, packing);
-                break;
-            }
-            case Nif::NiPixelData::NIPXFMT_PAL8:
-            case Nif::NiPixelData::NIPXFMT_PALA8:
-            {
-                if (pixelData->palette.empty() || pixelData->bpp != 8)
+                case Nif::NiPixelData::NIPXFMT_RGB8:
+                case Nif::NiPixelData::NIPXFMT_RGBA8:
+                case Nif::NiPixelData::NIPXFMT_BGR8:
+                case Nif::NiPixelData::NIPXFMT_BGRA8:
+                case Nif::NiPixelData::NIPXFMT_DXT1:
+                case Nif::NiPixelData::NIPXFMT_DXT3:
+                case Nif::NiPixelData::NIPXFMT_DXT5:
                 {
-                    Log(Debug::Info) << "Palettized texture in " << mFilename << " is invalid, ignoring";
-                    return nullptr;
+                    unsigned char* data = new unsigned char[pixels.size()];
+                    memcpy(data, pixels.data(), pixels.size());
+                    image->setImage(width, height, 1, pixelformat, pixelformat, GL_UNSIGNED_BYTE, data,
+                        osg::Image::USE_NEW_DELETE, packing);
+                    break;
                 }
-                pixelformat = pixelData->fmt == Nif::NiPixelData::NIPXFMT_PAL8 ? GL_RGB : GL_RGBA;
-                // We're going to convert the indices that pixel data contains
-                // into real colors using the palette.
-                const auto& palette = pixelData->palette->colors;
-                const int numChannels = pixelformat == GL_RGBA ? 4 : 3;
-                unsigned char* data = new unsigned char[pixels.size() * numChannels];
-                unsigned char* pixel = data;
-                for (unsigned char index : pixels)
+                case Nif::NiPixelData::NIPXFMT_PAL8:
+                case Nif::NiPixelData::NIPXFMT_PALA8:
                 {
-                    memcpy(pixel, &palette[index], sizeof(unsigned char) * numChannels);
-                    pixel += numChannels;
+                    if (pixelData->palette.empty() || pixelData->bpp != 8)
+                    {
+                        Log(Debug::Info) << "Palettized texture in " << mFilename << " is invalid, ignoring";
+                        return nullptr;
+                    }
+                    pixelformat = pixelData->fmt == Nif::NiPixelData::NIPXFMT_PAL8 ? GL_RGB : GL_RGBA;
+                    // We're going to convert the indices that pixel data contains
+                    // into real colors using the palette.
+                    const auto& palette = pixelData->palette->colors;
+                    const int numChannels = pixelformat == GL_RGBA ? 4 : 3;
+                    unsigned char* data = new unsigned char[pixels.size() * numChannels];
+                    unsigned char* pixel = data;
+                    for (unsigned char index : pixels)
+                    {
+                        memcpy(pixel, &palette[index], sizeof(unsigned char) * numChannels);
+                        pixel += numChannels;
+                    }
+                    for (unsigned int& offset : mipmapVector)
+                        offset *= numChannels;
+                    image->setImage(width, height, 1, pixelformat, pixelformat, GL_UNSIGNED_BYTE, data,
+                        osg::Image::USE_NEW_DELETE, packing);
+                    break;
                 }
-                for (unsigned int& offset : mipmapVector)
-                    offset *= numChannels;
-                image->setImage(width, height, 1, pixelformat, pixelformat, GL_UNSIGNED_BYTE, data, osg::Image::USE_NEW_DELETE, packing);
-                break;
-            }
-            default:
-                return nullptr;
+                default:
+                    return nullptr;
             }
 
             image->setMipmapLevels(mipmapVector);
@@ -1640,24 +1745,28 @@ namespace NifOsg
             return texEnv;
         }
 
-        void handleTextureProperty(const Nif::NiTexturingProperty* texprop, const std::string& nodeName, osg::StateSet* stateset, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager, std::vector<unsigned int>& boundTextures, int animflags)
+        void handleTextureProperty(const Nif::NiTexturingProperty* texprop, const std::string& nodeName,
+            osg::StateSet* stateset, SceneUtil::CompositeStateSetUpdater* composite,
+            Resource::ImageManager* imageManager, std::vector<unsigned int>& boundTextures, int animflags)
         {
             if (!boundTextures.empty())
             {
                 // overriding a parent NiTexturingProperty, so remove what was previously bound
-                for (unsigned int i=0; i<boundTextures.size(); ++i)
+                for (unsigned int i = 0; i < boundTextures.size(); ++i)
                     stateset->setTextureMode(i, GL_TEXTURE_2D, osg::StateAttribute::OFF);
                 boundTextures.clear();
             }
 
-            // If this loop is changed such that the base texture isn't guaranteed to end up in texture unit 0, the shadow casting shader will need to be updated accordingly.
-            for (size_t i=0; i<texprop->textures.size(); ++i)
+            // If this loop is changed such that the base texture isn't guaranteed to end up in texture unit 0, the
+            // shadow casting shader will need to be updated accordingly.
+            for (size_t i = 0; i < texprop->textures.size(); ++i)
             {
-                if (texprop->textures[i].inUse || (i == Nif::NiTexturingProperty::BaseTexture && !texprop->controller.empty()))
+                if (texprop->textures[i].inUse
+                    || (i == Nif::NiTexturingProperty::BaseTexture && !texprop->controller.empty()))
                 {
-                    switch(i)
+                    switch (i)
                     {
-                        //These are handled later on
+                        // These are handled later on
                         case Nif::NiTexturingProperty::BaseTexture:
                         case Nif::NiTexturingProperty::GlowTexture:
                         case Nif::NiTexturingProperty::DarkTexture:
@@ -1668,7 +1777,8 @@ namespace NifOsg
                             break;
                         default:
                         {
-                            Log(Debug::Info) << "Unhandled texture stage " << i << " on shape \"" << nodeName << "\" in " << mFilename;
+                            Log(Debug::Info) << "Unhandled texture stage " << i << " on shape \"" << nodeName
+                                             << "\" in " << mFilename;
                             continue;
                         }
                     }
@@ -1679,16 +1789,17 @@ namespace NifOsg
                     if (texprop->textures[i].inUse)
                     {
                         const Nif::NiTexturingProperty::Texture& tex = texprop->textures[i];
-                        if(tex.texture.empty() && texprop->controller.empty())
+                        if (tex.texture.empty() && texprop->controller.empty())
                         {
                             if (i == 0)
-                                Log(Debug::Warning) << "Base texture is in use but empty on shape \"" << nodeName << "\" in " << mFilename;
+                                Log(Debug::Warning) << "Base texture is in use but empty on shape \"" << nodeName
+                                                    << "\" in " << mFilename;
                             continue;
                         }
 
                         if (!tex.texture.empty())
                         {
-                            const Nif::NiSourceTexture *st = tex.texture.getPtr();
+                            const Nif::NiSourceTexture* st = tex.texture.getPtr();
                             osg::ref_ptr<osg::Image> image = handleSourceTexture(st, imageManager);
                             texture2d = new osg::Texture2D(image);
                             if (image)
@@ -1697,8 +1808,10 @@ namespace NifOsg
                         else
                             texture2d = new osg::Texture2D;
 
-                        texture2d->setWrap(osg::Texture::WRAP_S, tex.wrapS() ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
-                        texture2d->setWrap(osg::Texture::WRAP_T, tex.wrapT() ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
+                        texture2d->setWrap(
+                            osg::Texture::WRAP_S, tex.wrapS() ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
+                        texture2d->setWrap(
+                            osg::Texture::WRAP_T, tex.wrapT() ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
 
                         uvSet = tex.uvSet;
                     }
@@ -1750,7 +1863,7 @@ namespace NifOsg
                         // Set this texture to Off by default since we can't render it with the fixed-function pipeline
                         stateset->setTextureMode(texUnit, GL_TEXTURE_2D, osg::StateAttribute::OFF);
                         osg::Matrix2 bumpMapMatrix(texprop->bumpMapMatrix.x(), texprop->bumpMapMatrix.y(),
-                                                   texprop->bumpMapMatrix.z(), texprop->bumpMapMatrix.w());
+                            texprop->bumpMapMatrix.z(), texprop->bumpMapMatrix.w());
                         stateset->addUniform(new osg::Uniform("bumpMapMatrix", bumpMapMatrix));
                         stateset->addUniform(new osg::Uniform("envMapLumaBias", texprop->envMapLumaBias));
                     }
@@ -1785,29 +1898,29 @@ namespace NifOsg
 
                     switch (i)
                     {
-                    case Nif::NiTexturingProperty::BaseTexture:
-                        texture2d->setName("diffuseMap");
-                        break;
-                    case Nif::NiTexturingProperty::BumpTexture:
-                        texture2d->setName("bumpMap");
-                        break;
-                    case Nif::NiTexturingProperty::GlowTexture:
-                        texture2d->setName("emissiveMap");
-                        break;
-                    case Nif::NiTexturingProperty::DarkTexture:
-                        texture2d->setName("darkMap");
-                        break;
-                    case Nif::NiTexturingProperty::DetailTexture:
-                        texture2d->setName("detailMap");
-                        break;
-                    case Nif::NiTexturingProperty::DecalTexture:
-                        texture2d->setName("decalMap");
-                        break;
-                    case Nif::NiTexturingProperty::GlossTexture:
-                        texture2d->setName("glossMap");
-                        break;
-                    default:
-                        break;
+                        case Nif::NiTexturingProperty::BaseTexture:
+                            texture2d->setName("diffuseMap");
+                            break;
+                        case Nif::NiTexturingProperty::BumpTexture:
+                            texture2d->setName("bumpMap");
+                            break;
+                        case Nif::NiTexturingProperty::GlowTexture:
+                            texture2d->setName("emissiveMap");
+                            break;
+                        case Nif::NiTexturingProperty::DarkTexture:
+                            texture2d->setName("darkMap");
+                            break;
+                        case Nif::NiTexturingProperty::DetailTexture:
+                            texture2d->setName("detailMap");
+                            break;
+                        case Nif::NiTexturingProperty::DecalTexture:
+                            texture2d->setName("decalMap");
+                            break;
+                        case Nif::NiTexturingProperty::GlossTexture:
+                            texture2d->setName("glossMap");
+                            break;
+                        default:
+                            break;
                     }
 
                     boundTextures.push_back(uvSet);
@@ -1816,7 +1929,9 @@ namespace NifOsg
             handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
         }
 
-        void handleTextureSet(const Nif::BSShaderTextureSet* textureSet, unsigned int clamp, const std::string& nodeName, osg::StateSet* stateset, Resource::ImageManager* imageManager, std::vector<unsigned int>& boundTextures)
+        void handleTextureSet(const Nif::BSShaderTextureSet* textureSet, unsigned int clamp,
+            const std::string& nodeName, osg::StateSet* stateset, Resource::ImageManager* imageManager,
+            std::vector<unsigned int>& boundTextures)
         {
             if (!boundTextures.empty())
             {
@@ -1831,7 +1946,7 @@ namespace NifOsg
             {
                 if (textureSet->textures[i].empty())
                     continue;
-                switch(i)
+                switch (i)
                 {
                     case Nif::BSShaderTextureSet::TextureType_Base:
                     case Nif::BSShaderTextureSet::TextureType_Normal:
@@ -1839,11 +1954,13 @@ namespace NifOsg
                         break;
                     default:
                     {
-                        Log(Debug::Info) << "Unhandled texture stage " << i << " on shape \"" << nodeName << "\" in " << mFilename;
+                        Log(Debug::Info) << "Unhandled texture stage " << i << " on shape \"" << nodeName << "\" in "
+                                         << mFilename;
                         continue;
                     }
                 }
-                std::string filename = Misc::ResourceHelpers::correctTexturePath(textureSet->textures[i], imageManager->getVFS());
+                std::string filename
+                    = Misc::ResourceHelpers::correctTexturePath(textureSet->textures[i], imageManager->getVFS());
                 osg::ref_ptr<osg::Image> image = imageManager->getImage(filename);
                 osg::ref_ptr<osg::Texture2D> texture2d = new osg::Texture2D(image);
                 if (image)
@@ -1875,8 +1992,10 @@ namespace NifOsg
         {
             switch (static_cast<Nif::BSShaderType>(type))
             {
-                case Nif::BSShaderType::ShaderType_Default: return "nv_default";
-                case Nif::BSShaderType::ShaderType_NoLighting: return "nv_nolighting";
+                case Nif::BSShaderType::ShaderType_Default:
+                    return "nv_default";
+                case Nif::BSShaderType::ShaderType_NoLighting:
+                    return "nv_nolighting";
                 case Nif::BSShaderType::ShaderType_TallGrass:
                 case Nif::BSShaderType::ShaderType_Sky:
                 case Nif::BSShaderType::ShaderType_Skin:
@@ -1894,7 +2013,8 @@ namespace NifOsg
         {
             switch (static_cast<Nif::BSLightingShaderType>(type))
             {
-                case Nif::BSLightingShaderType::ShaderType_Default: return "nv_default";
+                case Nif::BSLightingShaderType::ShaderType_Default:
+                    return "nv_default";
                 case Nif::BSLightingShaderType::ShaderType_EnvMap:
                 case Nif::BSLightingShaderType::ShaderType_Glow:
                 case Nif::BSLightingShaderType::ShaderType_Parallax:
@@ -1922,179 +2042,195 @@ namespace NifOsg
             return "nv_default";
         }
 
-        void handleProperty(const Nif::Property *property,
-                            osg::Node *node, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager, std::vector<unsigned int>& boundTextures, int animflags, bool hasStencilProperty)
+        void handleProperty(const Nif::Property* property, osg::Node* node,
+            SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager,
+            std::vector<unsigned int>& boundTextures, int animflags, bool hasStencilProperty)
         {
             switch (property->recType)
             {
-            case Nif::RC_NiStencilProperty:
-            {
-                const Nif::NiStencilProperty* stencilprop = static_cast<const Nif::NiStencilProperty*>(property);
-                osg::ref_ptr<osg::FrontFace> frontFace = new osg::FrontFace;
-                switch (stencilprop->data.drawMode)
+                case Nif::RC_NiStencilProperty:
                 {
-                case 2:
-                    frontFace->setMode(osg::FrontFace::CLOCKWISE);
+                    const Nif::NiStencilProperty* stencilprop = static_cast<const Nif::NiStencilProperty*>(property);
+                    osg::ref_ptr<osg::FrontFace> frontFace = new osg::FrontFace;
+                    switch (stencilprop->data.drawMode)
+                    {
+                        case 2:
+                            frontFace->setMode(osg::FrontFace::CLOCKWISE);
+                            break;
+                        case 0:
+                        case 1:
+                        default:
+                            frontFace->setMode(osg::FrontFace::COUNTER_CLOCKWISE);
+                            break;
+                    }
+                    frontFace = shareAttribute(frontFace);
+
+                    osg::StateSet* stateset = node->getOrCreateStateSet();
+                    stateset->setAttribute(frontFace, osg::StateAttribute::ON);
+                    stateset->setMode(GL_CULL_FACE,
+                        stencilprop->data.drawMode == 3 ? osg::StateAttribute::OFF : osg::StateAttribute::ON);
+
+                    if (stencilprop->data.enabled != 0)
+                    {
+                        mHasStencilProperty = true;
+                        osg::ref_ptr<osg::Stencil> stencil = new osg::Stencil;
+                        stencil->setFunction(getStencilFunction(stencilprop->data.compareFunc),
+                            stencilprop->data.stencilRef, stencilprop->data.stencilMask);
+                        stencil->setStencilFailOperation(getStencilOperation(stencilprop->data.failAction));
+                        stencil->setStencilPassAndDepthFailOperation(
+                            getStencilOperation(stencilprop->data.zFailAction));
+                        stencil->setStencilPassAndDepthPassOperation(
+                            getStencilOperation(stencilprop->data.zPassAction));
+                        stencil = shareAttribute(stencil);
+
+                        stateset->setAttributeAndModes(stencil, osg::StateAttribute::ON);
+                    }
                     break;
-                case 0:
-                case 1:
-                default:
-                    frontFace->setMode(osg::FrontFace::COUNTER_CLOCKWISE);
+                }
+                case Nif::RC_NiWireframeProperty:
+                {
+                    const Nif::NiWireframeProperty* wireprop = static_cast<const Nif::NiWireframeProperty*>(property);
+                    osg::ref_ptr<osg::PolygonMode> mode = new osg::PolygonMode;
+                    mode->setMode(osg::PolygonMode::FRONT_AND_BACK,
+                        wireprop->isEnabled() ? osg::PolygonMode::LINE : osg::PolygonMode::FILL);
+                    mode = shareAttribute(mode);
+                    node->getOrCreateStateSet()->setAttributeAndModes(mode, osg::StateAttribute::ON);
                     break;
                 }
-                frontFace = shareAttribute(frontFace);
-
-                osg::StateSet* stateset = node->getOrCreateStateSet();
-                stateset->setAttribute(frontFace, osg::StateAttribute::ON);
-                stateset->setMode(GL_CULL_FACE, stencilprop->data.drawMode == 3 ? osg::StateAttribute::OFF
-                                                                                : osg::StateAttribute::ON);
-
-                if (stencilprop->data.enabled != 0)
+                case Nif::RC_NiZBufferProperty:
                 {
-                    mHasStencilProperty = true;
-                    osg::ref_ptr<osg::Stencil> stencil = new osg::Stencil;
-                    stencil->setFunction(getStencilFunction(stencilprop->data.compareFunc), stencilprop->data.stencilRef, stencilprop->data.stencilMask);
-                    stencil->setStencilFailOperation(getStencilOperation(stencilprop->data.failAction));
-                    stencil->setStencilPassAndDepthFailOperation(getStencilOperation(stencilprop->data.zFailAction));
-                    stencil->setStencilPassAndDepthPassOperation(getStencilOperation(stencilprop->data.zPassAction));
-                    stencil = shareAttribute(stencil);
-
-                    stateset->setAttributeAndModes(stencil, osg::StateAttribute::ON);
+                    const Nif::NiZBufferProperty* zprop = static_cast<const Nif::NiZBufferProperty*>(property);
+                    osg::StateSet* stateset = node->getOrCreateStateSet();
+                    stateset->setMode(
+                        GL_DEPTH_TEST, zprop->depthTest() ? osg::StateAttribute::ON : osg::StateAttribute::OFF);
+                    osg::ref_ptr<osg::Depth> depth = new osg::Depth;
+                    depth->setWriteMask(zprop->depthWrite());
+                    // Morrowind ignores depth test function, unless a NiStencilProperty is present, in which case it
+                    // uses a fixed depth function of GL_ALWAYS.
+                    if (hasStencilProperty)
+                        depth->setFunction(osg::Depth::ALWAYS);
+                    depth = shareAttribute(depth);
+                    stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
+                    break;
                 }
-                break;
-            }
-            case Nif::RC_NiWireframeProperty:
-            {
-                const Nif::NiWireframeProperty* wireprop = static_cast<const Nif::NiWireframeProperty*>(property);
-                osg::ref_ptr<osg::PolygonMode> mode = new osg::PolygonMode;
-                mode->setMode(osg::PolygonMode::FRONT_AND_BACK, wireprop->isEnabled() ? osg::PolygonMode::LINE : osg::PolygonMode::FILL);
-                mode = shareAttribute(mode);
-                node->getOrCreateStateSet()->setAttributeAndModes(mode, osg::StateAttribute::ON);
-                break;
-            }
-            case Nif::RC_NiZBufferProperty:
-            {
-                const Nif::NiZBufferProperty* zprop = static_cast<const Nif::NiZBufferProperty*>(property);
-                osg::StateSet* stateset = node->getOrCreateStateSet();
-                stateset->setMode(GL_DEPTH_TEST, zprop->depthTest() ? osg::StateAttribute::ON : osg::StateAttribute::OFF);
-                osg::ref_ptr<osg::Depth> depth = new osg::Depth;
-                depth->setWriteMask(zprop->depthWrite());
-                // Morrowind ignores depth test function, unless a NiStencilProperty is present, in which case it uses a fixed depth function of GL_ALWAYS.
-                if (hasStencilProperty)
-                    depth->setFunction(osg::Depth::ALWAYS);
-                depth = shareAttribute(depth);
-                stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
-                break;
-            }
-            // OSG groups the material properties that NIFs have separate, so we have to parse them all again when one changed
-            case Nif::RC_NiMaterialProperty:
-            case Nif::RC_NiVertexColorProperty:
-            case Nif::RC_NiSpecularProperty:
-            {
-                // Handled on drawable level so we know whether vertex colors are available
-                break;
-            }
-            case Nif::RC_NiAlphaProperty:
-            {
-                // Handled on drawable level to prevent RenderBin nesting issues
-                break;
-            }
-            case Nif::RC_NiTexturingProperty:
-            {
-                const Nif::NiTexturingProperty* texprop = static_cast<const Nif::NiTexturingProperty*>(property);
-                osg::StateSet* stateset = node->getOrCreateStateSet();
-                handleTextureProperty(texprop, node->getName(), stateset, composite, imageManager, boundTextures, animflags);
-                break;
-            }
-            case Nif::RC_BSShaderPPLightingProperty:
-            {
-                auto texprop = static_cast<const Nif::BSShaderPPLightingProperty*>(property);
-                bool shaderRequired = true;
-                node->setUserValue("shaderPrefix", std::string(getBSShaderPrefix(texprop->type)));
-                node->setUserValue("shaderRequired", shaderRequired);
-                osg::StateSet* stateset = node->getOrCreateStateSet();
-                if (!texprop->textureSet.empty())
+                // OSG groups the material properties that NIFs have separate, so we have to parse them all again when
+                // one changed
+                case Nif::RC_NiMaterialProperty:
+                case Nif::RC_NiVertexColorProperty:
+                case Nif::RC_NiSpecularProperty:
                 {
-                    auto textureSet = texprop->textureSet.getPtr();
-                    handleTextureSet(textureSet, texprop->clamp, node->getName(), stateset, imageManager, boundTextures);
+                    // Handled on drawable level so we know whether vertex colors are available
+                    break;
                 }
-                handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
-                break;
-            }
-            case Nif::RC_BSShaderNoLightingProperty:
-            {
-                auto texprop = static_cast<const Nif::BSShaderNoLightingProperty*>(property);
-                bool shaderRequired = true;
-                node->setUserValue("shaderPrefix", std::string(getBSShaderPrefix(texprop->type)));
-                node->setUserValue("shaderRequired", shaderRequired);
-                osg::StateSet* stateset = node->getOrCreateStateSet();
-                if (!texprop->filename.empty())
+                case Nif::RC_NiAlphaProperty:
+                {
+                    // Handled on drawable level to prevent RenderBin nesting issues
+                    break;
+                }
+                case Nif::RC_NiTexturingProperty:
                 {
-                    if (!boundTextures.empty())
+                    const Nif::NiTexturingProperty* texprop = static_cast<const Nif::NiTexturingProperty*>(property);
+                    osg::StateSet* stateset = node->getOrCreateStateSet();
+                    handleTextureProperty(
+                        texprop, node->getName(), stateset, composite, imageManager, boundTextures, animflags);
+                    break;
+                }
+                case Nif::RC_BSShaderPPLightingProperty:
+                {
+                    auto texprop = static_cast<const Nif::BSShaderPPLightingProperty*>(property);
+                    bool shaderRequired = true;
+                    node->setUserValue("shaderPrefix", std::string(getBSShaderPrefix(texprop->type)));
+                    node->setUserValue("shaderRequired", shaderRequired);
+                    osg::StateSet* stateset = node->getOrCreateStateSet();
+                    if (!texprop->textureSet.empty())
                     {
-                        for (unsigned int i = 0; i < boundTextures.size(); ++i)
-                            stateset->setTextureMode(i, GL_TEXTURE_2D, osg::StateAttribute::OFF);
-                        boundTextures.clear();
+                        auto textureSet = texprop->textureSet.getPtr();
+                        handleTextureSet(
+                            textureSet, texprop->clamp, node->getName(), stateset, imageManager, boundTextures);
                     }
-                    std::string filename = Misc::ResourceHelpers::correctTexturePath(texprop->filename, imageManager->getVFS());
-                    osg::ref_ptr<osg::Image> image = imageManager->getImage(filename);
-                    osg::ref_ptr<osg::Texture2D> texture2d = new osg::Texture2D(image);
-                    texture2d->setName("diffuseMap");
-                    if (image)
-                        texture2d->setTextureSize(image->s(), image->t());
-                    texture2d->setWrap(osg::Texture::WRAP_S, texprop->wrapS() ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
-                    texture2d->setWrap(osg::Texture::WRAP_T, texprop->wrapT() ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
-                    const unsigned int texUnit = 0;
-                    const unsigned int uvSet = 0;
-                    stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
-                    boundTextures.push_back(uvSet);
+                    handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
+                    break;
+                }
+                case Nif::RC_BSShaderNoLightingProperty:
+                {
+                    auto texprop = static_cast<const Nif::BSShaderNoLightingProperty*>(property);
+                    bool shaderRequired = true;
+                    node->setUserValue("shaderPrefix", std::string(getBSShaderPrefix(texprop->type)));
+                    node->setUserValue("shaderRequired", shaderRequired);
+                    osg::StateSet* stateset = node->getOrCreateStateSet();
+                    if (!texprop->filename.empty())
+                    {
+                        if (!boundTextures.empty())
+                        {
+                            for (unsigned int i = 0; i < boundTextures.size(); ++i)
+                                stateset->setTextureMode(i, GL_TEXTURE_2D, osg::StateAttribute::OFF);
+                            boundTextures.clear();
+                        }
+                        std::string filename
+                            = Misc::ResourceHelpers::correctTexturePath(texprop->filename, imageManager->getVFS());
+                        osg::ref_ptr<osg::Image> image = imageManager->getImage(filename);
+                        osg::ref_ptr<osg::Texture2D> texture2d = new osg::Texture2D(image);
+                        texture2d->setName("diffuseMap");
+                        if (image)
+                            texture2d->setTextureSize(image->s(), image->t());
+                        texture2d->setWrap(osg::Texture::WRAP_S,
+                            texprop->wrapS() ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
+                        texture2d->setWrap(osg::Texture::WRAP_T,
+                            texprop->wrapT() ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
+                        const unsigned int texUnit = 0;
+                        const unsigned int uvSet = 0;
+                        stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
+                        boundTextures.push_back(uvSet);
+                    }
+                    if (mBethVersion >= 27)
+                    {
+                        stateset->addUniform(new osg::Uniform("useFalloff", true));
+                        stateset->addUniform(new osg::Uniform("falloffParams", texprop->falloffParams));
+                    }
+                    else
+                    {
+                        stateset->addUniform(new osg::Uniform("useFalloff", false));
+                    }
+                    handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
+                    break;
                 }
-                if (mBethVersion >= 27)
+                case Nif::RC_BSLightingShaderProperty:
                 {
-                    stateset->addUniform(new osg::Uniform("useFalloff", true));
-                    stateset->addUniform(new osg::Uniform("falloffParams", texprop->falloffParams));
+                    auto texprop = static_cast<const Nif::BSLightingShaderProperty*>(property);
+                    bool shaderRequired = true;
+                    node->setUserValue("shaderPrefix", std::string(getBSLightingShaderPrefix(texprop->type)));
+                    node->setUserValue("shaderRequired", shaderRequired);
+                    osg::StateSet* stateset = node->getOrCreateStateSet();
+                    if (!texprop->mTextureSet.empty())
+                        handleTextureSet(texprop->mTextureSet.getPtr(), texprop->mClamp, node->getName(), stateset,
+                            imageManager, boundTextures);
+                    handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
+                    break;
                 }
-                else
+                // unused by mw
+                case Nif::RC_NiShadeProperty:
+                case Nif::RC_NiDitherProperty:
+                case Nif::RC_NiFogProperty:
                 {
-                    stateset->addUniform(new osg::Uniform("useFalloff", false));
+                    break;
                 }
-                handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
-                break;
-            }
-            case Nif::RC_BSLightingShaderProperty:
-            {
-                auto texprop = static_cast<const Nif::BSLightingShaderProperty*>(property);
-                bool shaderRequired = true;
-                node->setUserValue("shaderPrefix", std::string(getBSLightingShaderPrefix(texprop->type)));
-                node->setUserValue("shaderRequired", shaderRequired);
-                osg::StateSet* stateset = node->getOrCreateStateSet();
-                if (!texprop->mTextureSet.empty())
-                    handleTextureSet(texprop->mTextureSet.getPtr(), texprop->mClamp, node->getName(), stateset, imageManager, boundTextures);
-                handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
-                break;
-            }
-            // unused by mw
-            case Nif::RC_NiShadeProperty:
-            case Nif::RC_NiDitherProperty:
-            case Nif::RC_NiFogProperty:
-            {
-                break;
-            }
-            default:
-                Log(Debug::Info) << "Unhandled " << property->recName << " in " << mFilename;
-                break;
+                default:
+                    Log(Debug::Info) << "Unhandled " << property->recName << " in " << mFilename;
+                    break;
             }
         }
 
         struct CompareStateAttribute
         {
-            bool operator() (const osg::ref_ptr<osg::StateAttribute>& left, const osg::ref_ptr<osg::StateAttribute>& right) const
+            bool operator()(
+                const osg::ref_ptr<osg::StateAttribute>& left, const osg::ref_ptr<osg::StateAttribute>& right) const
             {
                 return left->compare(*right) < 0;
             }
         };
 
-        // global sharing of State Attributes will reduce the number of GL calls as the osg::State will check by pointer to see if state is the same
+        // global sharing of State Attributes will reduce the number of GL calls as the osg::State will check by pointer
+        // to see if state is the same
         template <class Attribute>
         Attribute* shareAttribute(const osg::ref_ptr<Attribute>& attr)
         {
@@ -2108,26 +2244,26 @@ namespace NifOsg
             return *found;
         }
 
-        void applyDrawableProperties(osg::Node* node, const std::vector<const Nif::Property*>& properties, SceneUtil::CompositeStateSetUpdater* composite,
-                                             bool hasVertexColors, int animflags)
+        void applyDrawableProperties(osg::Node* node, const std::vector<const Nif::Property*>& properties,
+            SceneUtil::CompositeStateSetUpdater* composite, bool hasVertexColors, int animflags)
         {
             // Specular lighting is enabled by default, but there's a quirk...
             bool specEnabled = true;
-            osg::ref_ptr<osg::Material> mat (new osg::Material);
+            osg::ref_ptr<osg::Material> mat(new osg::Material);
             mat->setColorMode(hasVertexColors ? osg::Material::AMBIENT_AND_DIFFUSE : osg::Material::OFF);
 
             // NIF material defaults don't match OpenGL defaults
-            mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
-            mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
+            mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1, 1, 1, 1));
+            mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1, 1, 1, 1));
 
             bool hasMatCtrl = false;
             bool hasSortAlpha = false;
             osg::StateSet* blendFuncStateSet = nullptr;
 
-            auto setBin_Transparent = [] (osg::StateSet* ss) { ss->setRenderingHint(osg::StateSet::TRANSPARENT_BIN); };
-            auto setBin_BackToFront = [] (osg::StateSet* ss) { ss->setRenderBinDetails(0, "SORT_BACK_TO_FRONT"); };
-            auto setBin_Traversal = [] (osg::StateSet* ss) { ss->setRenderBinDetails(2, "TraversalOrderBin"); };
-            auto setBin_Inherit = [] (osg::StateSet* ss) { ss->setRenderBinToInherit(); };
+            auto setBin_Transparent = [](osg::StateSet* ss) { ss->setRenderingHint(osg::StateSet::TRANSPARENT_BIN); };
+            auto setBin_BackToFront = [](osg::StateSet* ss) { ss->setRenderBinDetails(0, "SORT_BACK_TO_FRONT"); };
+            auto setBin_Traversal = [](osg::StateSet* ss) { ss->setRenderBinDetails(2, "TraversalOrderBin"); };
+            auto setBin_Inherit = [](osg::StateSet* ss) { ss->setRenderBinToInherit(); };
 
             int lightmode = 1;
             float emissiveMult = 1.f;
@@ -2137,129 +2273,133 @@ namespace NifOsg
             {
                 switch (property->recType)
                 {
-                case Nif::RC_NiSpecularProperty:
-                {
-                    // Specular property can turn specular lighting off.
-                    // FIXME: NiMaterialColorController doesn't care about this.
-                    auto specprop = static_cast<const Nif::NiSpecularProperty*>(property);
-                    specEnabled = specprop->isEnabled();
-                    break;
-                }
-                case Nif::RC_NiMaterialProperty:
-                {
-                    const Nif::NiMaterialProperty* matprop = static_cast<const Nif::NiMaterialProperty*>(property);
-
-                    mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(matprop->data.diffuse, matprop->data.alpha));
-                    mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(matprop->data.ambient, 1.f));
-                    mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(matprop->data.emissive, 1.f));
-                    emissiveMult = matprop->data.emissiveMult;
-
-                    mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(matprop->data.specular, 1.f));
-                    mat->setShininess(osg::Material::FRONT_AND_BACK, matprop->data.glossiness);
-
-                    if (!matprop->controller.empty())
+                    case Nif::RC_NiSpecularProperty:
                     {
-                        hasMatCtrl = true;
-                        handleMaterialControllers(matprop, composite, animflags, mat);
+                        // Specular property can turn specular lighting off.
+                        // FIXME: NiMaterialColorController doesn't care about this.
+                        auto specprop = static_cast<const Nif::NiSpecularProperty*>(property);
+                        specEnabled = specprop->isEnabled();
+                        break;
                     }
+                    case Nif::RC_NiMaterialProperty:
+                    {
+                        const Nif::NiMaterialProperty* matprop = static_cast<const Nif::NiMaterialProperty*>(property);
 
-                    break;
-                }
-                case Nif::RC_NiVertexColorProperty:
-                {
-                    const Nif::NiVertexColorProperty* vertprop = static_cast<const Nif::NiVertexColorProperty*>(property);
-                    lightmode = vertprop->data.lightmode;
+                        mat->setDiffuse(
+                            osg::Material::FRONT_AND_BACK, osg::Vec4f(matprop->data.diffuse, matprop->data.alpha));
+                        mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(matprop->data.ambient, 1.f));
+                        mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(matprop->data.emissive, 1.f));
+                        emissiveMult = matprop->data.emissiveMult;
+
+                        mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(matprop->data.specular, 1.f));
+                        mat->setShininess(osg::Material::FRONT_AND_BACK, matprop->data.glossiness);
 
-                    switch (vertprop->data.vertmode)
+                        if (!matprop->controller.empty())
+                        {
+                            hasMatCtrl = true;
+                            handleMaterialControllers(matprop, composite, animflags, mat);
+                        }
+
+                        break;
+                    }
+                    case Nif::RC_NiVertexColorProperty:
                     {
-                        case 0:
-                            mat->setColorMode(osg::Material::OFF);
-                            break;
-                        case 1:
-                            mat->setColorMode(osg::Material::EMISSION);
-                            break;
-                        case 2:
-                            if (lightmode != 0)
-                                mat->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
-                            else
+                        const Nif::NiVertexColorProperty* vertprop
+                            = static_cast<const Nif::NiVertexColorProperty*>(property);
+                        lightmode = vertprop->data.lightmode;
+
+                        switch (vertprop->data.vertmode)
+                        {
+                            case 0:
                                 mat->setColorMode(osg::Material::OFF);
-                            break;
+                                break;
+                            case 1:
+                                mat->setColorMode(osg::Material::EMISSION);
+                                break;
+                            case 2:
+                                if (lightmode != 0)
+                                    mat->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
+                                else
+                                    mat->setColorMode(osg::Material::OFF);
+                                break;
+                        }
+                        break;
                     }
-                    break;
-                }
-                case Nif::RC_NiAlphaProperty:
-                {
-                    const Nif::NiAlphaProperty* alphaprop = static_cast<const Nif::NiAlphaProperty*>(property);
-                    if (alphaprop->useAlphaBlending())
+                    case Nif::RC_NiAlphaProperty:
                     {
-                        osg::ref_ptr<osg::BlendFunc> blendFunc (new osg::BlendFunc(getBlendMode(alphaprop->sourceBlendMode()),
-                                                                                   getBlendMode(alphaprop->destinationBlendMode())));
-                        // on AMD hardware, alpha still seems to be stored with an RGBA framebuffer with OpenGL.
-                        // This might be mandated by the OpenGL 2.1 specification section 2.14.9, or might be a bug.
-                        // Either way, D3D8.1 doesn't do that, so adapt the destination factor.
-                        if (blendFunc->getDestination() == GL_DST_ALPHA)
-                            blendFunc->setDestination(GL_ONE);
-                        blendFunc = shareAttribute(blendFunc);
-                        node->getOrCreateStateSet()->setAttributeAndModes(blendFunc, osg::StateAttribute::ON);
-
-                        if (!alphaprop->noSorter())
+                        const Nif::NiAlphaProperty* alphaprop = static_cast<const Nif::NiAlphaProperty*>(property);
+                        if (alphaprop->useAlphaBlending())
                         {
-                            hasSortAlpha = true;
-                            if (!mPushedSorter)
-                                setBin_Transparent(node->getStateSet());
+                            osg::ref_ptr<osg::BlendFunc> blendFunc(
+                                new osg::BlendFunc(getBlendMode(alphaprop->sourceBlendMode()),
+                                    getBlendMode(alphaprop->destinationBlendMode())));
+                            // on AMD hardware, alpha still seems to be stored with an RGBA framebuffer with OpenGL.
+                            // This might be mandated by the OpenGL 2.1 specification section 2.14.9, or might be a bug.
+                            // Either way, D3D8.1 doesn't do that, so adapt the destination factor.
+                            if (blendFunc->getDestination() == GL_DST_ALPHA)
+                                blendFunc->setDestination(GL_ONE);
+                            blendFunc = shareAttribute(blendFunc);
+                            node->getOrCreateStateSet()->setAttributeAndModes(blendFunc, osg::StateAttribute::ON);
+
+                            if (!alphaprop->noSorter())
+                            {
+                                hasSortAlpha = true;
+                                if (!mPushedSorter)
+                                    setBin_Transparent(node->getStateSet());
+                            }
+                            else
+                            {
+                                if (!mPushedSorter)
+                                    setBin_Inherit(node->getStateSet());
+                            }
                         }
-                        else
+                        else if (osg::StateSet* stateset = node->getStateSet())
                         {
+                            stateset->removeAttribute(osg::StateAttribute::BLENDFUNC);
+                            stateset->removeMode(GL_BLEND);
+                            blendFuncStateSet = stateset;
                             if (!mPushedSorter)
-                                setBin_Inherit(node->getStateSet());
+                                blendFuncStateSet->setRenderBinToInherit();
                         }
-                    }
-                    else if (osg::StateSet* stateset = node->getStateSet())
-                    {
-                        stateset->removeAttribute(osg::StateAttribute::BLENDFUNC);
-                        stateset->removeMode(GL_BLEND);
-                        blendFuncStateSet = stateset;
-                        if (!mPushedSorter)
-                            blendFuncStateSet->setRenderBinToInherit();
-                    }
 
-                    if (alphaprop->useAlphaTesting())
-                    {
-                        osg::ref_ptr<osg::AlphaFunc> alphaFunc (new osg::AlphaFunc(getTestMode(alphaprop->alphaTestMode()), alphaprop->data.threshold/255.f));
-                        alphaFunc = shareAttribute(alphaFunc);
-                        node->getOrCreateStateSet()->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
+                        if (alphaprop->useAlphaTesting())
+                        {
+                            osg::ref_ptr<osg::AlphaFunc> alphaFunc(new osg::AlphaFunc(
+                                getTestMode(alphaprop->alphaTestMode()), alphaprop->data.threshold / 255.f));
+                            alphaFunc = shareAttribute(alphaFunc);
+                            node->getOrCreateStateSet()->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
+                        }
+                        else if (osg::StateSet* stateset = node->getStateSet())
+                        {
+                            stateset->removeAttribute(osg::StateAttribute::ALPHAFUNC);
+                            stateset->removeMode(GL_ALPHA_TEST);
+                        }
+                        break;
                     }
-                    else if (osg::StateSet* stateset = node->getStateSet())
+                    case Nif::RC_BSLightingShaderProperty:
                     {
-                        stateset->removeAttribute(osg::StateAttribute::ALPHAFUNC);
-                        stateset->removeMode(GL_ALPHA_TEST);
+                        auto shaderprop = static_cast<const Nif::BSLightingShaderProperty*>(property);
+                        mat->setAlpha(osg::Material::FRONT_AND_BACK, shaderprop->mAlpha);
+                        mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(shaderprop->mEmissive, 1.f));
+                        mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(shaderprop->mSpecular, 1.f));
+                        mat->setShininess(osg::Material::FRONT_AND_BACK, shaderprop->mGlossiness);
+                        emissiveMult = shaderprop->mEmissiveMult;
+                        specStrength = shaderprop->mSpecStrength;
+                        break;
                     }
-                    break;
-                }
-                case Nif::RC_BSLightingShaderProperty:
-                {
-                    auto shaderprop = static_cast<const Nif::BSLightingShaderProperty*>(property);
-                    mat->setAlpha(osg::Material::FRONT_AND_BACK, shaderprop->mAlpha);
-                    mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(shaderprop->mEmissive, 1.f));
-                    mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(shaderprop->mSpecular, 1.f));
-                    mat->setShininess(osg::Material::FRONT_AND_BACK, shaderprop->mGlossiness);
-                    emissiveMult = shaderprop->mEmissiveMult;
-                    specStrength = shaderprop->mSpecStrength;
-                    break;
-                }
-                default:
-                    break;
+                    default:
+                        break;
                 }
             }
 
             // While NetImmerse and Gamebryo support specular lighting, Morrowind has its support disabled.
             if (mVersion <= Nif::NIFFile::NIFVersion::VER_MW || !specEnabled)
-                mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f,0.f,0.f,0.f));
+                mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
 
             if (lightmode == 0)
             {
                 osg::Vec4f diffuse = mat->getDiffuse(osg::Material::FRONT_AND_BACK);
-                diffuse = osg::Vec4f(0,0,0,diffuse.a());
+                diffuse = osg::Vec4f(0, 0, 0, diffuse.a());
                 mat->setDiffuse(osg::Material::FRONT_AND_BACK, diffuse);
                 mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f());
             }
@@ -2269,18 +2409,18 @@ namespace NifOsg
             {
                 switch (mat->getColorMode())
                 {
-                case osg::Material::AMBIENT:
-                    mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
-                    break;
-                case osg::Material::AMBIENT_AND_DIFFUSE:
-                    mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
-                    mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
-                    break;
-                case osg::Material::EMISSION:
-                    mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
-                    break;
-                default:
-                    break;
+                    case osg::Material::AMBIENT:
+                        mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1, 1, 1, 1));
+                        break;
+                    case osg::Material::AMBIENT_AND_DIFFUSE:
+                        mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1, 1, 1, 1));
+                        mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1, 1, 1, 1));
+                        break;
+                    case osg::Material::EMISSION:
+                        mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(1, 1, 1, 1));
+                        break;
+                    default:
+                        break;
                 }
                 mat->setColorMode(osg::Material::OFF);
             }
@@ -2289,11 +2429,11 @@ namespace NifOsg
                 setBin_Traversal(node->getOrCreateStateSet());
 
             if (!mPushedSorter && !hasMatCtrl && mat->getColorMode() == osg::Material::OFF
-                    && mat->getEmission(osg::Material::FRONT_AND_BACK) == osg::Vec4f(0,0,0,1)
-                    && mat->getDiffuse(osg::Material::FRONT_AND_BACK) == osg::Vec4f(1,1,1,1)
-                    && mat->getAmbient(osg::Material::FRONT_AND_BACK) == osg::Vec4f(1,1,1,1)
-                    && mat->getShininess(osg::Material::FRONT_AND_BACK) == 0
-                    && mat->getSpecular(osg::Material::FRONT_AND_BACK) == osg::Vec4f(0.f, 0.f, 0.f, 0.f))
+                && mat->getEmission(osg::Material::FRONT_AND_BACK) == osg::Vec4f(0, 0, 0, 1)
+                && mat->getDiffuse(osg::Material::FRONT_AND_BACK) == osg::Vec4f(1, 1, 1, 1)
+                && mat->getAmbient(osg::Material::FRONT_AND_BACK) == osg::Vec4f(1, 1, 1, 1)
+                && mat->getShininess(osg::Material::FRONT_AND_BACK) == 0
+                && mat->getSpecular(osg::Material::FRONT_AND_BACK) == osg::Vec4f(0.f, 0.f, 0.f, 0.f))
             {
                 // default state, skip
                 return;
@@ -2311,7 +2451,7 @@ namespace NifOsg
             if (!mPushedSorter)
                 return;
 
-            auto assignBin = [&] (int mode, int type) {
+            auto assignBin = [&](int mode, int type) {
                 if (mode == Nif::NiSortAdjustNode::SortingMode_Off)
                 {
                     setBin_Traversal(stateset);
@@ -2353,7 +2493,6 @@ namespace NifOsg
                 }
             }
         }
-
     };
 
     osg::ref_ptr<osg::Node> Loader::load(Nif::NIFFilePtr file, Resource::ImageManager* imageManager)
diff --git a/components/nifosg/nifloader.hpp b/components/nifosg/nifloader.hpp
index ddee8031a9..99251e3da8 100644
--- a/components/nifosg/nifloader.hpp
+++ b/components/nifosg/nifloader.hpp
@@ -5,8 +5,8 @@
 #include <components/sceneutil/keyframe.hpp>
 #include <components/sceneutil/textkeymap.hpp>
 
-#include <osg/ref_ptr>
 #include <osg/Referenced>
+#include <osg/ref_ptr>
 
 namespace osg
 {
@@ -26,7 +26,8 @@ namespace NifOsg
     class Loader
     {
     public:
-        /// Create a scene graph for the given NIF. Auto-detects when skinning is used and wraps the graph in a Skeleton if so.
+        /// Create a scene graph for the given NIF. Auto-detects when skinning is used and wraps the graph in a Skeleton
+        /// if so.
         static osg::ref_ptr<osg::Node> load(Nif::NIFFilePtr file, Resource::ImageManager* imageManager);
 
         /// Load keyframe controllers from the given kf file.
@@ -40,7 +41,8 @@ namespace NifOsg
         static bool getShowMarkers();
 
         /// Set the mask to use for hidden nodes. The default is 0, i.e. updates to those nodes can no longer happen.
-        /// If you need to run animations or physics for hidden nodes, you may want to set this to a non-zero mask and remove exactly that mask from the camera's cull mask.
+        /// If you need to run animations or physics for hidden nodes, you may want to set this to a non-zero mask and
+        /// remove exactly that mask from the camera's cull mask.
         static void setHiddenNodeMask(unsigned int mask);
         static unsigned int getHiddenNodeMask();
 
diff --git a/components/nifosg/particle.cpp b/components/nifosg/particle.cpp
index 320c24164f..126e7b7560 100644
--- a/components/nifosg/particle.cpp
+++ b/components/nifosg/particle.cpp
@@ -3,8 +3,8 @@
 #include <limits>
 #include <optional>
 
-#include <osg/MatrixTransform>
 #include <osg/Geometry>
+#include <osg/MatrixTransform>
 #include <osg/ValueObject>
 
 #include <components/debug/debuglog.hpp>
@@ -50,10 +50,7 @@ namespace
             traverse(drawable);
         }
 
-        void apply(osg::Geometry& geometry) override
-        {
-            mGeometry = &geometry;
-        }
+        void apply(osg::Geometry& geometry) override { mGeometry = &geometry; }
 
         osg::Geometry* mGeometry;
     };
@@ -61,7 +58,11 @@ namespace
     class LocalToWorldAccumulator : public osg::NodeVisitor
     {
     public:
-        LocalToWorldAccumulator(osg::Matrix& matrix) : osg::NodeVisitor(), mMatrix(matrix) {}
+        LocalToWorldAccumulator(osg::Matrix& matrix)
+            : osg::NodeVisitor()
+            , mMatrix(matrix)
+        {
+        }
 
         virtual void apply(osg::Transform& transform)
         {
@@ -83,11 +84,12 @@ namespace
             for (auto rit = path.rbegin(); rit != path.rend(); rit++, --i)
             {
                 const osg::Camera* camera = (*rit)->asCamera();
-                if (camera && (camera->getReferenceFrame() != osg::Transform::RELATIVE_RF || camera->getParents().empty()))
+                if (camera
+                    && (camera->getReferenceFrame() != osg::Transform::RELATIVE_RF || camera->getParents().empty()))
                     break;
             }
 
-            for(; i < path.size(); ++i)
+            for (; i < path.size(); ++i)
                 path[i]->accept(*this);
         }
 
@@ -100,561 +102,571 @@ namespace
 namespace NifOsg
 {
 
-ParticleSystem::ParticleSystem()
-    : osgParticle::ParticleSystem()
-    , mQuota(std::numeric_limits<int>::max())
-{
-    mNormalArray = new osg::Vec3Array(1);
-    mNormalArray->setBinding(osg::Array::BIND_OVERALL);
-    (*mNormalArray.get())[0] = osg::Vec3(0.3, 0.3, 0.3);
-}
-
-ParticleSystem::ParticleSystem(const ParticleSystem &copy, const osg::CopyOp &copyop)
-    : osgParticle::ParticleSystem(copy, copyop)
-    , mQuota(copy.mQuota)
-{
-    mNormalArray = new osg::Vec3Array(1);
-    mNormalArray->setBinding(osg::Array::BIND_OVERALL);
-    (*mNormalArray.get())[0] = osg::Vec3(0.3, 0.3, 0.3);
-
-    // For some reason the osgParticle constructor doesn't copy the particles
-    for (int i=0;i<copy.numParticles()-copy.numDeadParticles();++i)
-        ParticleSystem::createParticle(copy.getParticle(i));
-}
+    ParticleSystem::ParticleSystem()
+        : osgParticle::ParticleSystem()
+        , mQuota(std::numeric_limits<int>::max())
+    {
+        mNormalArray = new osg::Vec3Array(1);
+        mNormalArray->setBinding(osg::Array::BIND_OVERALL);
+        (*mNormalArray.get())[0] = osg::Vec3(0.3, 0.3, 0.3);
+    }
 
-void ParticleSystem::setQuota(int quota)
-{
-    mQuota = quota;
-}
+    ParticleSystem::ParticleSystem(const ParticleSystem& copy, const osg::CopyOp& copyop)
+        : osgParticle::ParticleSystem(copy, copyop)
+        , mQuota(copy.mQuota)
+    {
+        mNormalArray = new osg::Vec3Array(1);
+        mNormalArray->setBinding(osg::Array::BIND_OVERALL);
+        (*mNormalArray.get())[0] = osg::Vec3(0.3, 0.3, 0.3);
 
-osgParticle::Particle* ParticleSystem::createParticle(const osgParticle::Particle *ptemplate)
-{
-    if (numParticles()-numDeadParticles() < mQuota)
-        return osgParticle::ParticleSystem::createParticle(ptemplate);
-    return nullptr;
-}
+        // For some reason the osgParticle constructor doesn't copy the particles
+        for (int i = 0; i < copy.numParticles() - copy.numDeadParticles(); ++i)
+            ParticleSystem::createParticle(copy.getParticle(i));
+    }
 
-void ParticleSystem::drawImplementation(osg::RenderInfo& renderInfo) const
-{
-    osg::State & state = *renderInfo.getState();
-    if(state.useVertexArrayObject(getUseVertexArrayObject()))
+    void ParticleSystem::setQuota(int quota)
     {
-        state.getCurrentVertexArrayState()->assignNormalArrayDispatcher();
-        state.getCurrentVertexArrayState()->setNormalArray(state, mNormalArray);
+        mQuota = quota;
     }
-    else
+
+    osgParticle::Particle* ParticleSystem::createParticle(const osgParticle::Particle* ptemplate)
     {
-        state.getAttributeDispatchers().activateNormalArray(mNormalArray);
+        if (numParticles() - numDeadParticles() < mQuota)
+            return osgParticle::ParticleSystem::createParticle(ptemplate);
+        return nullptr;
     }
-     osgParticle::ParticleSystem::drawImplementation(renderInfo);
-}
 
-void InverseWorldMatrix::operator()(osg::MatrixTransform *node, osg::NodeVisitor *nv)
-{
-    osg::NodePath path = nv->getNodePath();
-    path.pop_back();
-
-    osg::Matrix mat = osg::computeLocalToWorld( path );
-    mat.orthoNormalize(mat); // don't undo the scale
-    mat.invert(mat);
-    node->setMatrix(mat);
-
-    traverse(node,nv);
-}
+    void ParticleSystem::drawImplementation(osg::RenderInfo& renderInfo) const
+    {
+        osg::State& state = *renderInfo.getState();
+        if (state.useVertexArrayObject(getUseVertexArrayObject()))
+        {
+            state.getCurrentVertexArrayState()->assignNormalArrayDispatcher();
+            state.getCurrentVertexArrayState()->setNormalArray(state, mNormalArray);
+        }
+        else
+        {
+            state.getAttributeDispatchers().activateNormalArray(mNormalArray);
+        }
+        osgParticle::ParticleSystem::drawImplementation(renderInfo);
+    }
 
-ParticleShooter::ParticleShooter(float minSpeed, float maxSpeed, float horizontalDir, float horizontalAngle, float verticalDir, float verticalAngle, float lifetime, float lifetimeRandom)
-    : mMinSpeed(minSpeed), mMaxSpeed(maxSpeed), mHorizontalDir(horizontalDir)
-    , mHorizontalAngle(horizontalAngle), mVerticalDir(verticalDir), mVerticalAngle(verticalAngle)
-    , mLifetime(lifetime), mLifetimeRandom(lifetimeRandom)
-{
-}
+    void InverseWorldMatrix::operator()(osg::MatrixTransform* node, osg::NodeVisitor* nv)
+    {
+        osg::NodePath path = nv->getNodePath();
+        path.pop_back();
 
-ParticleShooter::ParticleShooter()
-    : mMinSpeed(0.f), mMaxSpeed(0.f), mHorizontalDir(0.f)
-    , mHorizontalAngle(0.f), mVerticalDir(0.f), mVerticalAngle(0.f)
-    , mLifetime(0.f), mLifetimeRandom(0.f)
-{
-}
+        osg::Matrix mat = osg::computeLocalToWorld(path);
+        mat.orthoNormalize(mat); // don't undo the scale
+        mat.invert(mat);
+        node->setMatrix(mat);
 
-ParticleShooter::ParticleShooter(const ParticleShooter &copy, const osg::CopyOp &copyop)
-    : osgParticle::Shooter(copy, copyop)
-{
-    mMinSpeed = copy.mMinSpeed;
-    mMaxSpeed = copy.mMaxSpeed;
-    mHorizontalDir = copy.mHorizontalDir;
-    mHorizontalAngle = copy.mHorizontalAngle;
-    mVerticalDir = copy.mVerticalDir;
-    mVerticalAngle = copy.mVerticalAngle;
-    mLifetime = copy.mLifetime;
-    mLifetimeRandom = copy.mLifetimeRandom;
-}
+        traverse(node, nv);
+    }
 
-void ParticleShooter::shoot(osgParticle::Particle *particle) const
-{
-    float hdir = mHorizontalDir + mHorizontalAngle * (2.f * Misc::Rng::rollClosedProbability() - 1.f);
-    float vdir = mVerticalDir + mVerticalAngle * (2.f * Misc::Rng::rollClosedProbability() - 1.f);
+    ParticleShooter::ParticleShooter(float minSpeed, float maxSpeed, float horizontalDir, float horizontalAngle,
+        float verticalDir, float verticalAngle, float lifetime, float lifetimeRandom)
+        : mMinSpeed(minSpeed)
+        , mMaxSpeed(maxSpeed)
+        , mHorizontalDir(horizontalDir)
+        , mHorizontalAngle(horizontalAngle)
+        , mVerticalDir(verticalDir)
+        , mVerticalAngle(verticalAngle)
+        , mLifetime(lifetime)
+        , mLifetimeRandom(lifetimeRandom)
+    {
+    }
 
-    osg::Vec3f dir = (osg::Quat(vdir, osg::Vec3f(0,1,0)) * osg::Quat(hdir, osg::Vec3f(0,0,1)))
-             * osg::Vec3f(0,0,1);
+    ParticleShooter::ParticleShooter()
+        : mMinSpeed(0.f)
+        , mMaxSpeed(0.f)
+        , mHorizontalDir(0.f)
+        , mHorizontalAngle(0.f)
+        , mVerticalDir(0.f)
+        , mVerticalAngle(0.f)
+        , mLifetime(0.f)
+        , mLifetimeRandom(0.f)
+    {
+    }
 
-    float vel = mMinSpeed + (mMaxSpeed - mMinSpeed) * Misc::Rng::rollClosedProbability();
-    particle->setVelocity(dir * vel);
+    ParticleShooter::ParticleShooter(const ParticleShooter& copy, const osg::CopyOp& copyop)
+        : osgParticle::Shooter(copy, copyop)
+    {
+        mMinSpeed = copy.mMinSpeed;
+        mMaxSpeed = copy.mMaxSpeed;
+        mHorizontalDir = copy.mHorizontalDir;
+        mHorizontalAngle = copy.mHorizontalAngle;
+        mVerticalDir = copy.mVerticalDir;
+        mVerticalAngle = copy.mVerticalAngle;
+        mLifetime = copy.mLifetime;
+        mLifetimeRandom = copy.mLifetimeRandom;
+    }
 
-    // Not supposed to set this here, but there doesn't seem to be a better way of doing it
-    particle->setLifeTime(std::max(std::numeric_limits<float>::epsilon(), mLifetime + mLifetimeRandom * Misc::Rng::rollClosedProbability()));
-}
+    void ParticleShooter::shoot(osgParticle::Particle* particle) const
+    {
+        float hdir = mHorizontalDir + mHorizontalAngle * (2.f * Misc::Rng::rollClosedProbability() - 1.f);
+        float vdir = mVerticalDir + mVerticalAngle * (2.f * Misc::Rng::rollClosedProbability() - 1.f);
 
-GrowFadeAffector::GrowFadeAffector(float growTime, float fadeTime)
-    : mGrowTime(growTime)
-    , mFadeTime(fadeTime)
-    , mCachedDefaultSize(0.f)
-{
-}
+        osg::Vec3f dir
+            = (osg::Quat(vdir, osg::Vec3f(0, 1, 0)) * osg::Quat(hdir, osg::Vec3f(0, 0, 1))) * osg::Vec3f(0, 0, 1);
 
-GrowFadeAffector::GrowFadeAffector()
-    : mGrowTime(0.f)
-    , mFadeTime(0.f)
-    , mCachedDefaultSize(0.f)
-{
+        float vel = mMinSpeed + (mMaxSpeed - mMinSpeed) * Misc::Rng::rollClosedProbability();
+        particle->setVelocity(dir * vel);
 
-}
+        // Not supposed to set this here, but there doesn't seem to be a better way of doing it
+        particle->setLifeTime(std::max(
+            std::numeric_limits<float>::epsilon(), mLifetime + mLifetimeRandom * Misc::Rng::rollClosedProbability()));
+    }
 
-GrowFadeAffector::GrowFadeAffector(const GrowFadeAffector& copy, const osg::CopyOp& copyop)
-    : osgParticle::Operator(copy, copyop)
-{
-    mGrowTime = copy.mGrowTime;
-    mFadeTime = copy.mFadeTime;
-    mCachedDefaultSize = copy.mCachedDefaultSize;
-}
+    GrowFadeAffector::GrowFadeAffector(float growTime, float fadeTime)
+        : mGrowTime(growTime)
+        , mFadeTime(fadeTime)
+        , mCachedDefaultSize(0.f)
+    {
+    }
 
-void GrowFadeAffector::beginOperate(osgParticle::Program *program)
-{
-    mCachedDefaultSize = program->getParticleSystem()->getDefaultParticleTemplate().getSizeRange().minimum;
-}
+    GrowFadeAffector::GrowFadeAffector()
+        : mGrowTime(0.f)
+        , mFadeTime(0.f)
+        , mCachedDefaultSize(0.f)
+    {
+    }
 
-void GrowFadeAffector::operate(osgParticle::Particle* particle, double /* dt */)
-{
-    float size = mCachedDefaultSize;
-    if (particle->getAge() < mGrowTime && mGrowTime != 0.f)
-        size *= particle->getAge() / mGrowTime;
-    if (particle->getLifeTime() - particle->getAge() < mFadeTime && mFadeTime != 0.f)
-        size *= (particle->getLifeTime() - particle->getAge()) / mFadeTime;
-    particle->setSizeRange(osgParticle::rangef(size, size));
-}
+    GrowFadeAffector::GrowFadeAffector(const GrowFadeAffector& copy, const osg::CopyOp& copyop)
+        : osgParticle::Operator(copy, copyop)
+    {
+        mGrowTime = copy.mGrowTime;
+        mFadeTime = copy.mFadeTime;
+        mCachedDefaultSize = copy.mCachedDefaultSize;
+    }
 
-ParticleColorAffector::ParticleColorAffector(const Nif::NiColorData *clrdata)
-    : mData(clrdata->mKeyMap, osg::Vec4f(1,1,1,1))
-{
-}
+    void GrowFadeAffector::beginOperate(osgParticle::Program* program)
+    {
+        mCachedDefaultSize = program->getParticleSystem()->getDefaultParticleTemplate().getSizeRange().minimum;
+    }
 
-ParticleColorAffector::ParticleColorAffector()
-{
+    void GrowFadeAffector::operate(osgParticle::Particle* particle, double /* dt */)
+    {
+        float size = mCachedDefaultSize;
+        if (particle->getAge() < mGrowTime && mGrowTime != 0.f)
+            size *= particle->getAge() / mGrowTime;
+        if (particle->getLifeTime() - particle->getAge() < mFadeTime && mFadeTime != 0.f)
+            size *= (particle->getLifeTime() - particle->getAge()) / mFadeTime;
+        particle->setSizeRange(osgParticle::rangef(size, size));
+    }
 
-}
+    ParticleColorAffector::ParticleColorAffector(const Nif::NiColorData* clrdata)
+        : mData(clrdata->mKeyMap, osg::Vec4f(1, 1, 1, 1))
+    {
+    }
 
-ParticleColorAffector::ParticleColorAffector(const ParticleColorAffector &copy, const osg::CopyOp &copyop)
-    : osgParticle::Operator(copy, copyop)
-{
-    mData = copy.mData;
-}
+    ParticleColorAffector::ParticleColorAffector() {}
 
-void ParticleColorAffector::operate(osgParticle::Particle* particle, double /* dt */)
-{
-    assert(particle->getLifeTime() > 0);
-    float time = static_cast<float>(particle->getAge()/particle->getLifeTime());
-    osg::Vec4f color = mData.interpKey(time);
-    float alpha = color.a();
-    color.a() = 1.0f;
-
-    particle->setColorRange(osgParticle::rangev4(color, color));
-    particle->setAlphaRange(osgParticle::rangef(alpha, alpha));
-}
+    ParticleColorAffector::ParticleColorAffector(const ParticleColorAffector& copy, const osg::CopyOp& copyop)
+        : osgParticle::Operator(copy, copyop)
+    {
+        mData = copy.mData;
+    }
 
-GravityAffector::GravityAffector(const Nif::NiGravity *gravity)
-    : mForce(gravity->mForce)
-    , mType(static_cast<ForceType>(gravity->mType))
-    , mPosition(gravity->mPosition)
-    , mDirection(gravity->mDirection)
-    , mDecay(gravity->mDecay)
-{
-}
+    void ParticleColorAffector::operate(osgParticle::Particle* particle, double /* dt */)
+    {
+        assert(particle->getLifeTime() > 0);
+        float time = static_cast<float>(particle->getAge() / particle->getLifeTime());
+        osg::Vec4f color = mData.interpKey(time);
+        float alpha = color.a();
+        color.a() = 1.0f;
+
+        particle->setColorRange(osgParticle::rangev4(color, color));
+        particle->setAlphaRange(osgParticle::rangef(alpha, alpha));
+    }
 
-GravityAffector::GravityAffector()
-    : mForce(0), mType(Type_Wind), mDecay(0.f)
-{
+    GravityAffector::GravityAffector(const Nif::NiGravity* gravity)
+        : mForce(gravity->mForce)
+        , mType(static_cast<ForceType>(gravity->mType))
+        , mPosition(gravity->mPosition)
+        , mDirection(gravity->mDirection)
+        , mDecay(gravity->mDecay)
+    {
+    }
 
-}
+    GravityAffector::GravityAffector()
+        : mForce(0)
+        , mType(Type_Wind)
+        , mDecay(0.f)
+    {
+    }
 
-GravityAffector::GravityAffector(const GravityAffector &copy, const osg::CopyOp &copyop)
-    : osgParticle::Operator(copy, copyop)
-{
-    mForce = copy.mForce;
-    mType = copy.mType;
-    mPosition = copy.mPosition;
-    mDirection = copy.mDirection;
-    mDecay = copy.mDecay;
-    mCachedWorldPosition = copy.mCachedWorldPosition;
-    mCachedWorldDirection = copy.mCachedWorldDirection;
-}
+    GravityAffector::GravityAffector(const GravityAffector& copy, const osg::CopyOp& copyop)
+        : osgParticle::Operator(copy, copyop)
+    {
+        mForce = copy.mForce;
+        mType = copy.mType;
+        mPosition = copy.mPosition;
+        mDirection = copy.mDirection;
+        mDecay = copy.mDecay;
+        mCachedWorldPosition = copy.mCachedWorldPosition;
+        mCachedWorldDirection = copy.mCachedWorldDirection;
+    }
 
-void GravityAffector::beginOperate(osgParticle::Program* program)
-{
-    bool absolute = (program->getReferenceFrame() == osgParticle::ParticleProcessor::ABSOLUTE_RF);
+    void GravityAffector::beginOperate(osgParticle::Program* program)
+    {
+        bool absolute = (program->getReferenceFrame() == osgParticle::ParticleProcessor::ABSOLUTE_RF);
 
-    if (mType == Type_Point || mDecay != 0.f) // we don't need the position for Wind gravity, except if decay is being applied
-        mCachedWorldPosition = absolute ? program->transformLocalToWorld(mPosition) : mPosition;
+        if (mType == Type_Point
+            || mDecay != 0.f) // we don't need the position for Wind gravity, except if decay is being applied
+            mCachedWorldPosition = absolute ? program->transformLocalToWorld(mPosition) : mPosition;
 
-    mCachedWorldDirection = absolute ? program->rotateLocalToWorld(mDirection) : mDirection;
-    mCachedWorldDirection.normalize();
-}
+        mCachedWorldDirection = absolute ? program->rotateLocalToWorld(mDirection) : mDirection;
+        mCachedWorldDirection.normalize();
+    }
 
-void GravityAffector::operate(osgParticle::Particle *particle, double dt)
-{
-    const float magic = 1.6f;
-    switch (mType)
+    void GravityAffector::operate(osgParticle::Particle* particle, double dt)
     {
-        case Type_Wind:
+        const float magic = 1.6f;
+        switch (mType)
         {
-            float decayFactor = 1.f;
-            if (mDecay != 0.f)
+            case Type_Wind:
             {
-                osg::Plane gravityPlane(mCachedWorldDirection, mCachedWorldPosition);
-                float distance = std::abs(gravityPlane.distance(particle->getPosition()));
-                decayFactor = std::exp(-1.f * mDecay * distance);
-            }
+                float decayFactor = 1.f;
+                if (mDecay != 0.f)
+                {
+                    osg::Plane gravityPlane(mCachedWorldDirection, mCachedWorldPosition);
+                    float distance = std::abs(gravityPlane.distance(particle->getPosition()));
+                    decayFactor = std::exp(-1.f * mDecay * distance);
+                }
 
-            particle->addVelocity(mCachedWorldDirection * mForce * dt * decayFactor * magic);
+                particle->addVelocity(mCachedWorldDirection * mForce * dt * decayFactor * magic);
 
-            break;
-        }
-        case Type_Point:
-        {
-            osg::Vec3f diff = mCachedWorldPosition - particle->getPosition();
+                break;
+            }
+            case Type_Point:
+            {
+                osg::Vec3f diff = mCachedWorldPosition - particle->getPosition();
 
-            float decayFactor = 1.f;
-            if (mDecay != 0.f)
-                decayFactor = std::exp(-1.f * mDecay * diff.length());
+                float decayFactor = 1.f;
+                if (mDecay != 0.f)
+                    decayFactor = std::exp(-1.f * mDecay * diff.length());
 
-            diff.normalize();
+                diff.normalize();
 
-            particle->addVelocity(diff * mForce * dt * decayFactor * magic);
-            break;
+                particle->addVelocity(diff * mForce * dt * decayFactor * magic);
+                break;
+            }
         }
     }
-}
-
-Emitter::Emitter()
-    : osgParticle::Emitter()
-    , mFlags(0)
-    , mGeometryEmitterTarget(std::nullopt)
-{
-}
-
-Emitter::Emitter(const Emitter &copy, const osg::CopyOp &copyop)
-    : osgParticle::Emitter(copy, copyop)
-    , mTargets(copy.mTargets)
-    , mPlacer(copy.mPlacer)
-    , mShooter(copy.mShooter)
-    // need a deep copy because the remainder is stored in the object
-    , mCounter(static_cast<osgParticle::Counter*>(copy.mCounter->clone(osg::CopyOp::DEEP_COPY_ALL)))
-    , mFlags(copy.mFlags)
-    , mGeometryEmitterTarget(copy.mGeometryEmitterTarget)
-    , mCachedGeometryEmitter(copy.mCachedGeometryEmitter)
-{
-}
-
-Emitter::Emitter(const std::vector<int> &targets)
-    : mTargets(targets)
-    , mFlags(0)
-    , mGeometryEmitterTarget(std::nullopt)
-{
-}
 
-void Emitter::emitParticles(double dt)
-{
-    int n = mCounter->numParticlesToCreate(dt);
-    if (n == 0)
-        return;
-
-    osg::Matrix worldToPs;
-
-    // maybe this could be optimized by halting at the lowest common ancestor of the particle and emitter nodes
-    osg::NodePathList partsysNodePaths = getParticleSystem()->getParentalNodePaths();
-    if (!partsysNodePaths.empty())
+    Emitter::Emitter()
+        : osgParticle::Emitter()
+        , mFlags(0)
+        , mGeometryEmitterTarget(std::nullopt)
     {
-        osg::Matrix psToWorld = osg::computeLocalToWorld(partsysNodePaths[0]);
-        worldToPs = osg::Matrix::inverse(psToWorld);
     }
 
-    const osg::Matrix& ltw = getLocalToWorldMatrix();
-    osg::Matrix emitterToPs = ltw * worldToPs;
-
-    osg::ref_ptr<osg::Vec3Array> geometryVertices = nullptr;
+    Emitter::Emitter(const Emitter& copy, const osg::CopyOp& copyop)
+        : osgParticle::Emitter(copy, copyop)
+        , mTargets(copy.mTargets)
+        , mPlacer(copy.mPlacer)
+        , mShooter(copy.mShooter)
+        // need a deep copy because the remainder is stored in the object
+        , mCounter(static_cast<osgParticle::Counter*>(copy.mCounter->clone(osg::CopyOp::DEEP_COPY_ALL)))
+        , mFlags(copy.mFlags)
+        , mGeometryEmitterTarget(copy.mGeometryEmitterTarget)
+        , mCachedGeometryEmitter(copy.mCachedGeometryEmitter)
+    {
+    }
 
-    const bool useGeometryEmitter = mFlags & Nif::NiParticleSystemController::BSPArrayController_AtVertex;
+    Emitter::Emitter(const std::vector<int>& targets)
+        : mTargets(targets)
+        , mFlags(0)
+        , mGeometryEmitterTarget(std::nullopt)
+    {
+    }
 
-    if (useGeometryEmitter || !mTargets.empty())
+    void Emitter::emitParticles(double dt)
     {
-        int recIndex;
+        int n = mCounter->numParticlesToCreate(dt);
+        if (n == 0)
+            return;
 
-        if (useGeometryEmitter)
-        {
-            if (!mGeometryEmitterTarget.has_value())
-                return;
+        osg::Matrix worldToPs;
 
-            recIndex = mGeometryEmitterTarget.value();
-        }
-        else
+        // maybe this could be optimized by halting at the lowest common ancestor of the particle and emitter nodes
+        osg::NodePathList partsysNodePaths = getParticleSystem()->getParentalNodePaths();
+        if (!partsysNodePaths.empty())
         {
-            int randomIndex = Misc::Rng::rollClosedProbability() * (mTargets.size() - 1);
-            recIndex = mTargets[randomIndex];
+            osg::Matrix psToWorld = osg::computeLocalToWorld(partsysNodePaths[0]);
+            worldToPs = osg::Matrix::inverse(psToWorld);
         }
 
-        // we could use a map here for faster lookup
-        FindGroupByRecIndex visitor(recIndex);
-        getParent(0)->accept(visitor);
+        const osg::Matrix& ltw = getLocalToWorldMatrix();
+        osg::Matrix emitterToPs = ltw * worldToPs;
 
-        if (!visitor.mFound)
-        {
-            Log(Debug::Info) << "Can't find emitter node" << recIndex;
-            return;
-        }
+        osg::ref_ptr<osg::Vec3Array> geometryVertices = nullptr;
+
+        const bool useGeometryEmitter = mFlags & Nif::NiParticleSystemController::BSPArrayController_AtVertex;
 
-        if (useGeometryEmitter)
+        if (useGeometryEmitter || !mTargets.empty())
         {
-            if (!mCachedGeometryEmitter.lock(geometryVertices))
+            int recIndex;
+
+            if (useGeometryEmitter)
             {
-                FindFirstGeometry geometryVisitor;
-                visitor.mFound->accept(geometryVisitor);
+                if (!mGeometryEmitterTarget.has_value())
+                    return;
 
-                if (geometryVisitor.mGeometry)
+                recIndex = mGeometryEmitterTarget.value();
+            }
+            else
+            {
+                int randomIndex = Misc::Rng::rollClosedProbability() * (mTargets.size() - 1);
+                recIndex = mTargets[randomIndex];
+            }
+
+            // we could use a map here for faster lookup
+            FindGroupByRecIndex visitor(recIndex);
+            getParent(0)->accept(visitor);
+
+            if (!visitor.mFound)
+            {
+                Log(Debug::Info) << "Can't find emitter node" << recIndex;
+                return;
+            }
+
+            if (useGeometryEmitter)
+            {
+                if (!mCachedGeometryEmitter.lock(geometryVertices))
                 {
-                    if (auto* vertices = dynamic_cast<osg::Vec3Array*>(geometryVisitor.mGeometry->getVertexArray()))
+                    FindFirstGeometry geometryVisitor;
+                    visitor.mFound->accept(geometryVisitor);
+
+                    if (geometryVisitor.mGeometry)
                     {
-                        mCachedGeometryEmitter = osg::observer_ptr<osg::Vec3Array>(vertices);
-                        geometryVertices = vertices;
+                        if (auto* vertices = dynamic_cast<osg::Vec3Array*>(geometryVisitor.mGeometry->getVertexArray()))
+                        {
+                            mCachedGeometryEmitter = osg::observer_ptr<osg::Vec3Array>(vertices);
+                            geometryVertices = vertices;
+                        }
                     }
                 }
             }
-        }
 
-        osg::NodePath path = visitor.mFoundPath;
-        path.erase(path.begin());
-        if (!useGeometryEmitter && (mFlags & Nif::NiParticleSystemController::BSPArrayController_AtNode) && path.size())
-        {
-            osg::Matrix current;
+            osg::NodePath path = visitor.mFoundPath;
+            path.erase(path.begin());
+            if (!useGeometryEmitter && (mFlags & Nif::NiParticleSystemController::BSPArrayController_AtNode)
+                && path.size())
+            {
+                osg::Matrix current;
 
-            LocalToWorldAccumulator accum(current);
-            accum.accumulate(path);
+                LocalToWorldAccumulator accum(current);
+                accum.accumulate(path);
 
-            osg::Matrix parent = accum.mLastMatrix.value_or(current);
+                osg::Matrix parent = accum.mLastMatrix.value_or(current);
 
-            auto p1 = parent.getTrans();
-            auto p2 = current.getTrans();
-            current.setTrans((p2 - p1) * Misc::Rng::rollClosedProbability() + p1);
+                auto p1 = parent.getTrans();
+                auto p2 = current.getTrans();
+                current.setTrans((p2 - p1) * Misc::Rng::rollClosedProbability() + p1);
 
-            emitterToPs = current * emitterToPs;
-        }
-        else
-        {
-            emitterToPs = osg::computeLocalToWorld(path) * emitterToPs;
+                emitterToPs = current * emitterToPs;
+            }
+            else
+            {
+                emitterToPs = osg::computeLocalToWorld(path) * emitterToPs;
+            }
         }
-    }
 
-    emitterToPs.orthoNormalize(emitterToPs);
+        emitterToPs.orthoNormalize(emitterToPs);
 
-    if (useGeometryEmitter && (!geometryVertices.valid() || geometryVertices->empty()))
-        return;
+        if (useGeometryEmitter && (!geometryVertices.valid() || geometryVertices->empty()))
+            return;
 
-    for (int i=0; i<n; ++i)
-    {
-        osgParticle::Particle* P = getParticleSystem()->createParticle(nullptr);
-        if (P)
+        for (int i = 0; i < n; ++i)
         {
-            if (useGeometryEmitter)
-                P->setPosition((*geometryVertices)[Misc::Rng::rollDice(geometryVertices->getNumElements())]);
-            else if (mPlacer)
-                mPlacer->place(P);
+            osgParticle::Particle* P = getParticleSystem()->createParticle(nullptr);
+            if (P)
+            {
+                if (useGeometryEmitter)
+                    P->setPosition((*geometryVertices)[Misc::Rng::rollDice(geometryVertices->getNumElements())]);
+                else if (mPlacer)
+                    mPlacer->place(P);
 
-            mShooter->shoot(P);
+                mShooter->shoot(P);
 
-            P->transformPositionVelocity(emitterToPs);
+                P->transformPositionVelocity(emitterToPs);
+            }
         }
     }
-}
-
-FindGroupByRecIndex::FindGroupByRecIndex(unsigned int recIndex)
-    : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-    , mFound(nullptr)
-    , mRecIndex(recIndex)
-{
-}
 
-void FindGroupByRecIndex::apply(osg::Node &node)
-{
-    applyNode(node);
-}
-
-void FindGroupByRecIndex::apply(osg::MatrixTransform &node)
-{
-    applyNode(node);
-}
+    FindGroupByRecIndex::FindGroupByRecIndex(unsigned int recIndex)
+        : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+        , mFound(nullptr)
+        , mRecIndex(recIndex)
+    {
+    }
 
-void FindGroupByRecIndex::apply(osg::Geometry &node)
-{
-    applyNode(node);
-}
+    void FindGroupByRecIndex::apply(osg::Node& node)
+    {
+        applyNode(node);
+    }
 
-void FindGroupByRecIndex::applyNode(osg::Node &searchNode)
-{
-    unsigned int recIndex;
-    if (searchNode.getUserValue("recIndex", recIndex) && mRecIndex == recIndex)
+    void FindGroupByRecIndex::apply(osg::MatrixTransform& node)
     {
-        osg::Group* group = searchNode.asGroup();
-        if (!group)
-            group = searchNode.getParent(0);
+        applyNode(node);
+    }
 
-        mFound = group;
-        mFoundPath = getNodePath();
-        return;
+    void FindGroupByRecIndex::apply(osg::Geometry& node)
+    {
+        applyNode(node);
     }
-    traverse(searchNode);
-}
 
-PlanarCollider::PlanarCollider(const Nif::NiPlanarCollider *collider)
-    : mBounceFactor(collider->mBounceFactor)
-    , mExtents(collider->mExtents)
-    , mPosition(collider->mPosition)
-    , mXVector(collider->mXVector)
-    , mYVector(collider->mYVector)
-    , mPlane(-collider->mPlaneNormal, collider->mPlaneDistance)
-{
-}
+    void FindGroupByRecIndex::applyNode(osg::Node& searchNode)
+    {
+        unsigned int recIndex;
+        if (searchNode.getUserValue("recIndex", recIndex) && mRecIndex == recIndex)
+        {
+            osg::Group* group = searchNode.asGroup();
+            if (!group)
+                group = searchNode.getParent(0);
 
-PlanarCollider::PlanarCollider(const PlanarCollider &copy, const osg::CopyOp &copyop)
-    : osgParticle::Operator(copy, copyop)
-    , mBounceFactor(copy.mBounceFactor)
-    , mExtents(copy.mExtents)
-    , mPosition(copy.mPosition)
-    , mPositionInParticleSpace(copy.mPositionInParticleSpace)
-    , mXVector(copy.mXVector)
-    , mXVectorInParticleSpace(copy.mXVectorInParticleSpace)
-    , mYVector(copy.mYVector)
-    , mYVectorInParticleSpace(copy.mYVectorInParticleSpace)
-    , mPlane(copy.mPlane)
-    , mPlaneInParticleSpace(copy.mPlaneInParticleSpace)
-{
-}
+            mFound = group;
+            mFoundPath = getNodePath();
+            return;
+        }
+        traverse(searchNode);
+    }
 
-void PlanarCollider::beginOperate(osgParticle::Program *program)
-{
-    mPositionInParticleSpace = mPosition;
-    mPlaneInParticleSpace = mPlane;
-    mXVectorInParticleSpace = mXVector;
-    mYVectorInParticleSpace = mYVector;
-    if (program->getReferenceFrame() == osgParticle::ParticleProcessor::ABSOLUTE_RF)
+    PlanarCollider::PlanarCollider(const Nif::NiPlanarCollider* collider)
+        : mBounceFactor(collider->mBounceFactor)
+        , mExtents(collider->mExtents)
+        , mPosition(collider->mPosition)
+        , mXVector(collider->mXVector)
+        , mYVector(collider->mYVector)
+        , mPlane(-collider->mPlaneNormal, collider->mPlaneDistance)
     {
-        mPositionInParticleSpace = program->transformLocalToWorld(mPosition);
-        mPlaneInParticleSpace.transform(program->getLocalToWorldMatrix());
-        mXVectorInParticleSpace = program->rotateLocalToWorld(mXVector);
-        mYVectorInParticleSpace = program->rotateLocalToWorld(mYVector);
     }
-}
 
-void PlanarCollider::operate(osgParticle::Particle *particle, double dt)
-{
-    // Does the particle in question move towards the collider?
-    float velDotProduct = particle->getVelocity() * mPlaneInParticleSpace.getNormal();
-    if (velDotProduct <= 0)
-        return;
-
-    // Does it intersect the collider's plane?
-    osg::BoundingSphere bs(particle->getPosition(), 0.f);
-    if (mPlaneInParticleSpace.intersect(bs) != 1)
-        return;
-
-    // Is it inside the collider's bounds?
-    osg::Vec3f relativePos = particle->getPosition() - mPositionInParticleSpace;
-    float xDotProduct = relativePos * mXVectorInParticleSpace;
-    float yDotProduct = relativePos * mYVectorInParticleSpace;
-    if (-mExtents.x() * 0.5f > xDotProduct || mExtents.x() * 0.5f < xDotProduct)
-        return;
-    if (-mExtents.y() * 0.5f > yDotProduct || mExtents.y() * 0.5f < yDotProduct)
-        return;
-
-    // Deflect the particle
-    osg::Vec3 reflectedVelocity = particle->getVelocity() - mPlaneInParticleSpace.getNormal() * (2 * velDotProduct);
-    reflectedVelocity *= mBounceFactor;
-    particle->setVelocity(reflectedVelocity);
-}
+    PlanarCollider::PlanarCollider(const PlanarCollider& copy, const osg::CopyOp& copyop)
+        : osgParticle::Operator(copy, copyop)
+        , mBounceFactor(copy.mBounceFactor)
+        , mExtents(copy.mExtents)
+        , mPosition(copy.mPosition)
+        , mPositionInParticleSpace(copy.mPositionInParticleSpace)
+        , mXVector(copy.mXVector)
+        , mXVectorInParticleSpace(copy.mXVectorInParticleSpace)
+        , mYVector(copy.mYVector)
+        , mYVectorInParticleSpace(copy.mYVectorInParticleSpace)
+        , mPlane(copy.mPlane)
+        , mPlaneInParticleSpace(copy.mPlaneInParticleSpace)
+    {
+    }
 
-SphericalCollider::SphericalCollider(const Nif::NiSphericalCollider* collider)
-    : mBounceFactor(collider->mBounceFactor),
-      mSphere(collider->mCenter, collider->mRadius)
-{
-}
+    void PlanarCollider::beginOperate(osgParticle::Program* program)
+    {
+        mPositionInParticleSpace = mPosition;
+        mPlaneInParticleSpace = mPlane;
+        mXVectorInParticleSpace = mXVector;
+        mYVectorInParticleSpace = mYVector;
+        if (program->getReferenceFrame() == osgParticle::ParticleProcessor::ABSOLUTE_RF)
+        {
+            mPositionInParticleSpace = program->transformLocalToWorld(mPosition);
+            mPlaneInParticleSpace.transform(program->getLocalToWorldMatrix());
+            mXVectorInParticleSpace = program->rotateLocalToWorld(mXVector);
+            mYVectorInParticleSpace = program->rotateLocalToWorld(mYVector);
+        }
+    }
 
-SphericalCollider::SphericalCollider()
-    : mBounceFactor(1.0f)
-{
+    void PlanarCollider::operate(osgParticle::Particle* particle, double dt)
+    {
+        // Does the particle in question move towards the collider?
+        float velDotProduct = particle->getVelocity() * mPlaneInParticleSpace.getNormal();
+        if (velDotProduct <= 0)
+            return;
 
-}
+        // Does it intersect the collider's plane?
+        osg::BoundingSphere bs(particle->getPosition(), 0.f);
+        if (mPlaneInParticleSpace.intersect(bs) != 1)
+            return;
 
-SphericalCollider::SphericalCollider(const SphericalCollider& copy, const osg::CopyOp& copyop)
-    : osgParticle::Operator(copy, copyop)
-    , mBounceFactor(copy.mBounceFactor)
-    , mSphere(copy.mSphere)
-    , mSphereInParticleSpace(copy.mSphereInParticleSpace)
-{
+        // Is it inside the collider's bounds?
+        osg::Vec3f relativePos = particle->getPosition() - mPositionInParticleSpace;
+        float xDotProduct = relativePos * mXVectorInParticleSpace;
+        float yDotProduct = relativePos * mYVectorInParticleSpace;
+        if (-mExtents.x() * 0.5f > xDotProduct || mExtents.x() * 0.5f < xDotProduct)
+            return;
+        if (-mExtents.y() * 0.5f > yDotProduct || mExtents.y() * 0.5f < yDotProduct)
+            return;
 
-}
+        // Deflect the particle
+        osg::Vec3 reflectedVelocity = particle->getVelocity() - mPlaneInParticleSpace.getNormal() * (2 * velDotProduct);
+        reflectedVelocity *= mBounceFactor;
+        particle->setVelocity(reflectedVelocity);
+    }
 
-void SphericalCollider::beginOperate(osgParticle::Program* program)
-{
-    mSphereInParticleSpace = mSphere;
-    if (program->getReferenceFrame() == osgParticle::ParticleProcessor::ABSOLUTE_RF)
-        mSphereInParticleSpace.center() = program->transformLocalToWorld(mSphereInParticleSpace.center());
-}
+    SphericalCollider::SphericalCollider(const Nif::NiSphericalCollider* collider)
+        : mBounceFactor(collider->mBounceFactor)
+        , mSphere(collider->mCenter, collider->mRadius)
+    {
+    }
 
-void SphericalCollider::operate(osgParticle::Particle* particle, double dt)
-{
-    osg::Vec3f cent = (particle->getPosition() - mSphereInParticleSpace.center()); // vector from sphere center to particle
+    SphericalCollider::SphericalCollider()
+        : mBounceFactor(1.0f)
+    {
+    }
 
-    bool insideSphere = cent.length2() <= mSphereInParticleSpace.radius2();
+    SphericalCollider::SphericalCollider(const SphericalCollider& copy, const osg::CopyOp& copyop)
+        : osgParticle::Operator(copy, copyop)
+        , mBounceFactor(copy.mBounceFactor)
+        , mSphere(copy.mSphere)
+        , mSphereInParticleSpace(copy.mSphereInParticleSpace)
+    {
+    }
 
-    if (insideSphere
-            || (cent * particle->getVelocity() < 0.0f)) // if outside, make sure the particle is flying towards the sphere
+    void SphericalCollider::beginOperate(osgParticle::Program* program)
     {
-        // Collision test (finding point of contact) is performed by solving a quadratic equation:
-        // ||vec(cent) + vec(vel)*k|| = R      /^2
-        // k^2 + 2*k*(vec(cent)*vec(vel))/||vec(vel)||^2 + (||vec(cent)||^2 - R^2)/||vec(vel)||^2 = 0
+        mSphereInParticleSpace = mSphere;
+        if (program->getReferenceFrame() == osgParticle::ParticleProcessor::ABSOLUTE_RF)
+            mSphereInParticleSpace.center() = program->transformLocalToWorld(mSphereInParticleSpace.center());
+    }
 
-        float b = -(cent * particle->getVelocity()) / particle->getVelocity().length2();
+    void SphericalCollider::operate(osgParticle::Particle* particle, double dt)
+    {
+        osg::Vec3f cent
+            = (particle->getPosition() - mSphereInParticleSpace.center()); // vector from sphere center to particle
 
-        osg::Vec3f u = cent + particle->getVelocity() * b;
+        bool insideSphere = cent.length2() <= mSphereInParticleSpace.radius2();
 
         if (insideSphere
-                || (u.length2() < mSphereInParticleSpace.radius2()))
+            || (cent * particle->getVelocity()
+                < 0.0f)) // if outside, make sure the particle is flying towards the sphere
         {
-            float d = (mSphereInParticleSpace.radius2() - u.length2()) / particle->getVelocity().length2();
-            float k = insideSphere ? (std::sqrt(d) + b) : (b - std::sqrt(d));
+            // Collision test (finding point of contact) is performed by solving a quadratic equation:
+            // ||vec(cent) + vec(vel)*k|| = R      /^2
+            // k^2 + 2*k*(vec(cent)*vec(vel))/||vec(vel)||^2 + (||vec(cent)||^2 - R^2)/||vec(vel)||^2 = 0
+
+            float b = -(cent * particle->getVelocity()) / particle->getVelocity().length2();
 
-            if (k < dt)
+            osg::Vec3f u = cent + particle->getVelocity() * b;
+
+            if (insideSphere || (u.length2() < mSphereInParticleSpace.radius2()))
             {
-                // collision detected; reflect off the tangent plane
-                osg::Vec3f contact = particle->getPosition() + particle->getVelocity() * k;
+                float d = (mSphereInParticleSpace.radius2() - u.length2()) / particle->getVelocity().length2();
+                float k = insideSphere ? (std::sqrt(d) + b) : (b - std::sqrt(d));
 
-                osg::Vec3 normal = (contact - mSphereInParticleSpace.center());
-                normal.normalize();
+                if (k < dt)
+                {
+                    // collision detected; reflect off the tangent plane
+                    osg::Vec3f contact = particle->getPosition() + particle->getVelocity() * k;
 
-                float dotproduct = particle->getVelocity() * normal;
+                    osg::Vec3 normal = (contact - mSphereInParticleSpace.center());
+                    normal.normalize();
 
-                osg::Vec3 reflectedVelocity = particle->getVelocity() - normal * (2 * dotproduct);
-                reflectedVelocity *= mBounceFactor;
-                particle->setVelocity(reflectedVelocity);
+                    float dotproduct = particle->getVelocity() * normal;
+
+                    osg::Vec3 reflectedVelocity = particle->getVelocity() - normal * (2 * dotproduct);
+                    reflectedVelocity *= mBounceFactor;
+                    particle->setVelocity(reflectedVelocity);
+                }
             }
         }
     }
-}
 
 }
diff --git a/components/nifosg/particle.hpp b/components/nifosg/particle.hpp
index 34e6a4308d..3424512208 100644
--- a/components/nifosg/particle.hpp
+++ b/components/nifosg/particle.hpp
@@ -3,12 +3,12 @@
 
 #include <optional>
 
-#include <osgParticle/Particle>
-#include <osgParticle/Shooter>
-#include <osgParticle/Operator>
+#include <osgParticle/Counter>
 #include <osgParticle/Emitter>
+#include <osgParticle/Operator>
+#include <osgParticle/Particle>
 #include <osgParticle/Placer>
-#include <osgParticle/Counter>
+#include <osgParticle/Shooter>
 
 #include <components/sceneutil/nodecallback.hpp>
 
@@ -34,7 +34,7 @@ namespace NifOsg
 
         META_Object(NifOsg, ParticleSystem)
 
-        osgParticle::Particle* createParticle(const osgParticle::Particle *ptemplate) override;
+        osgParticle::Particle* createParticle(const osgParticle::Particle* ptemplate) override;
 
         void setQuota(int quota);
 
@@ -62,11 +62,10 @@ namespace NifOsg
     class InverseWorldMatrix : public SceneUtil::NodeCallback<InverseWorldMatrix, osg::MatrixTransform*>
     {
     public:
-        InverseWorldMatrix()
-        {
-        }
+        InverseWorldMatrix() {}
         InverseWorldMatrix(const InverseWorldMatrix& copy, const osg::CopyOp& copyop)
-            : osg::Object(copy, copyop), SceneUtil::NodeCallback<InverseWorldMatrix, osg::MatrixTransform*>(copy, copyop)
+            : osg::Object(copy, copyop)
+            , SceneUtil::NodeCallback<InverseWorldMatrix, osg::MatrixTransform*>(copy, copyop)
         {
         }
 
@@ -78,8 +77,8 @@ namespace NifOsg
     class ParticleShooter : public osgParticle::Shooter
     {
     public:
-        ParticleShooter(float minSpeed, float maxSpeed, float horizontalDir, float horizontalAngle, float verticalDir, float verticalAngle,
-                        float lifetime, float lifetimeRandom);
+        ParticleShooter(float minSpeed, float maxSpeed, float horizontalDir, float horizontalAngle, float verticalDir,
+            float verticalAngle, float lifetime, float lifetimeRandom);
         ParticleShooter();
         ParticleShooter(const ParticleShooter& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY);
 
@@ -113,7 +112,7 @@ namespace NifOsg
         void operate(osgParticle::Particle* particle, double dt) override;
 
     private:
-        float mBounceFactor{0.f};
+        float mBounceFactor{ 0.f };
         osg::Vec2f mExtents;
         osg::Vec3f mPosition, mPositionInParticleSpace;
         osg::Vec3f mXVector, mXVectorInParticleSpace;
@@ -132,6 +131,7 @@ namespace NifOsg
 
         void beginOperate(osgParticle::Program* program) override;
         void operate(osgParticle::Particle* particle, double dt) override;
+
     private:
         float mBounceFactor;
         osg::BoundingSphere mSphere;
@@ -188,11 +188,12 @@ namespace NifOsg
         META_Object(NifOsg, GravityAffector)
 
         void operate(osgParticle::Particle* particle, double dt) override;
-        void beginOperate(osgParticle::Program *) override ;
+        void beginOperate(osgParticle::Program*) override;
 
     private:
         float mForce;
-        enum ForceType {
+        enum ForceType
+        {
             Type_Wind,
             Type_Point
         };
@@ -211,7 +212,7 @@ namespace NifOsg
     public:
         FindGroupByRecIndex(unsigned int recIndex);
 
-        void apply(osg::Node &node) override;
+        void apply(osg::Node& node) override;
 
         // Technically not required as the default implementation would trickle down to apply(Node&) anyway,
         // but we'll shortcut instead to avoid the chain of virtual function calls
@@ -222,11 +223,13 @@ namespace NifOsg
 
         osg::Group* mFound;
         osg::NodePath mFoundPath;
+
     private:
         unsigned int mRecIndex;
     };
 
-    // Subclass emitter to support randomly choosing one of the child node's transforms for the emit position of new particles.
+    // Subclass emitter to support randomly choosing one of the child node's transforms for the emit position of new
+    // particles.
     class Emitter : public osgParticle::Emitter
     {
     public:
@@ -240,7 +243,7 @@ namespace NifOsg
 
         void setShooter(osgParticle::Shooter* shooter) { mShooter = shooter; }
         void setPlacer(osgParticle::Placer* placer) { mPlacer = placer; }
-        void setCounter(osgParticle::Counter* counter) { mCounter = counter;}
+        void setCounter(osgParticle::Counter* counter) { mCounter = counter; }
         void setGeometryEmitterTarget(std::optional<int> recIndex) { mGeometryEmitterTarget = recIndex; }
         void setFlags(int flags) { mFlags = flags; }
 
diff --git a/components/platform/file.hpp b/components/platform/file.hpp
index 0b1ffde027..f941f5c69d 100644
--- a/components/platform/file.hpp
+++ b/components/platform/file.hpp
@@ -4,7 +4,8 @@
 #include <cstdlib>
 #include <filesystem>
 
-namespace Platform::File {
+namespace Platform::File
+{
 
     enum class Handle : intptr_t
     {
@@ -32,15 +33,18 @@ namespace Platform::File {
     class ScopedHandle
     {
         Handle mHandle{ Handle::Invalid };
-        
+
     public:
         ScopedHandle() noexcept = default;
         ScopedHandle(ScopedHandle& other) = delete;
-        ScopedHandle(Handle handle) noexcept : mHandle(handle) {}
-        ScopedHandle(ScopedHandle&& other) noexcept 
-            : mHandle(other.mHandle) 
-        { 
-            other.mHandle = Handle::Invalid; 
+        ScopedHandle(Handle handle) noexcept
+            : mHandle(handle)
+        {
+        }
+        ScopedHandle(ScopedHandle&& other) noexcept
+            : mHandle(other.mHandle)
+        {
+            other.mHandle = Handle::Invalid;
         }
         ScopedHandle& operator=(const ScopedHandle& other) = delete;
         ScopedHandle& operator=(ScopedHandle&& other) noexcept
@@ -51,10 +55,10 @@ namespace Platform::File {
             other.mHandle = Handle::Invalid;
             return *this;
         }
-        ~ScopedHandle() 
-        { 
-            if(mHandle != Handle::Invalid) 
-                close(mHandle); 
+        ~ScopedHandle()
+        {
+            if (mHandle != Handle::Invalid)
+                close(mHandle);
         }
 
         operator Handle() const { return mHandle; }
diff --git a/components/platform/file.posix.cpp b/components/platform/file.posix.cpp
index 0f859569ba..b8f6adfcd7 100644
--- a/components/platform/file.posix.cpp
+++ b/components/platform/file.posix.cpp
@@ -1,17 +1,18 @@
 #include "file.hpp"
 
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
+#include <cassert>
 #include <errno.h>
-#include <string.h>
+#include <fcntl.h>
 #include <stdexcept>
+#include <string.h>
 #include <string>
-#include <cassert>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include <components/files/conversion.hpp>
 
-namespace Platform::File {
+namespace Platform::File
+{
 
     static auto getNativeHandle(Handle handle)
     {
@@ -42,7 +43,8 @@ namespace Platform::File {
         auto handle = ::open(filename.c_str(), openFlags, 0);
         if (handle == -1)
         {
-            throw std::runtime_error(std::string("Failed to open '") + Files::pathToUnicodeString(filename) + "' for reading: " + strerror(errno));
+            throw std::runtime_error(std::string("Failed to open '") + Files::pathToUnicodeString(filename)
+                + "' for reading: " + strerror(errno));
         }
         return static_cast<Handle>(handle);
     }
@@ -73,7 +75,6 @@ namespace Platform::File {
         const auto fileSize = tell(handle);
         seek(handle, oldPos, SeekType::Begin);
 
-
         return static_cast<size_t>(fileSize);
     }
 
@@ -96,7 +97,8 @@ namespace Platform::File {
         int amount = ::read(nativeHandle, data, size);
         if (amount == -1)
         {
-            throw std::runtime_error("An attempt to read " + std::to_string(size) + " bytes failed: " + strerror(errno));
+            throw std::runtime_error(
+                "An attempt to read " + std::to_string(size) + " bytes failed: " + strerror(errno));
         }
         return amount;
     }
diff --git a/components/platform/file.stdio.cpp b/components/platform/file.stdio.cpp
index b2287bfcf9..c9553da712 100644
--- a/components/platform/file.stdio.cpp
+++ b/components/platform/file.stdio.cpp
@@ -1,14 +1,15 @@
 #include "file.hpp"
 
+#include <cassert>
 #include <errno.h>
+#include <stdexcept>
 #include <string.h>
 #include <string>
-#include <stdexcept>
-#include <cassert>
 
 #include <components/files/conversion.hpp>
 
-namespace Platform::File {
+namespace Platform::File
+{
 
     static auto getNativeHandle(Handle handle)
     {
@@ -33,7 +34,8 @@ namespace Platform::File {
         FILE* handle = fopen(filename.c_str(), "rb");
         if (handle == nullptr)
         {
-            throw std::runtime_error(std::string("Failed to open '") + Files::pathToUnicodeString(filename) + "' for reading: " + strerror(errno));
+            throw std::runtime_error(std::string("Failed to open '") + Files::pathToUnicodeString(filename)
+                + "' for reading: " + strerror(errno));
         }
         return static_cast<Handle>(reinterpret_cast<intptr_t>(handle));
     }
@@ -57,7 +59,7 @@ namespace Platform::File {
     size_t size(Handle handle)
     {
         auto nativeHandle = getNativeHandle(handle);
-        
+
         const auto oldPos = tell(handle);
         seek(handle, 0, SeekType::End);
         const auto fileSize = tell(handle);
@@ -85,7 +87,8 @@ namespace Platform::File {
         int amount = fread(data, 1, size, nativeHandle);
         if (amount == 0 && ferror(nativeHandle))
         {
-            throw std::runtime_error(std::string("An attempt to read ") + std::to_string(size) + " bytes failed: " + strerror(errno));
+            throw std::runtime_error(
+                std::string("An attempt to read ") + std::to_string(size) + " bytes failed: " + strerror(errno));
         }
         return static_cast<size_t>(amount);
     }
diff --git a/components/platform/file.win32.cpp b/components/platform/file.win32.cpp
index 7f80061163..639a7f3643 100644
--- a/components/platform/file.win32.cpp
+++ b/components/platform/file.win32.cpp
@@ -1,14 +1,15 @@
 #include "file.hpp"
 
-#include <components/windows.hpp>
-#include <string>
-#include <stdexcept>
 #include <boost/locale.hpp>
 #include <cassert>
+#include <components/windows.hpp>
+#include <stdexcept>
+#include <string>
 
 #include <components/files/conversion.hpp>
 
-namespace Platform::File {
+namespace Platform::File
+{
 
     static auto getNativeHandle(Handle handle)
     {
@@ -33,7 +34,8 @@ namespace Platform::File {
         HANDLE handle = CreateFileW(filename.c_str(), GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);
         if (handle == INVALID_HANDLE_VALUE)
         {
-            throw std::runtime_error(std::string("Failed to open '") + Files::pathToUnicodeString(filename) + "' for reading: " + std::to_string(GetLastError()));
+            throw std::runtime_error(std::string("Failed to open '") + Files::pathToUnicodeString(filename)
+                + "' for reading: " + std::to_string(GetLastError()));
         }
         return static_cast<Handle>(reinterpret_cast<intptr_t>(handle));
     }
@@ -49,7 +51,8 @@ namespace Platform::File {
         const auto nativeHandle = getNativeHandle(handle);
         const auto nativeSeekType = getNativeSeekType(type);
 
-        if (SetFilePointer(nativeHandle, static_cast<LONG>(position), nullptr, nativeSeekType) == INVALID_SET_FILE_POINTER)
+        if (SetFilePointer(nativeHandle, static_cast<LONG>(position), nullptr, nativeSeekType)
+            == INVALID_SET_FILE_POINTER)
         {
             if (auto errCode = GetLastError(); errCode != ERROR_SUCCESS)
             {
@@ -91,7 +94,8 @@ namespace Platform::File {
         DWORD bytesRead{};
 
         if (!ReadFile(nativeHandle, data, static_cast<DWORD>(size), &bytesRead, nullptr))
-            throw std::runtime_error(std::string("A read operation on a file failed: ") + std::to_string(GetLastError()));
+            throw std::runtime_error(
+                std::string("A read operation on a file failed: ") + std::to_string(GetLastError()));
 
         return bytesRead;
     }
diff --git a/components/platform/platform.cpp b/components/platform/platform.cpp
index 9044ba3792..08a7d5d2f2 100644
--- a/components/platform/platform.cpp
+++ b/components/platform/platform.cpp
@@ -2,7 +2,8 @@
 
 #include <stdio.h>
 
-namespace Platform {
+namespace Platform
+{
 
     static void increaseFileHandleLimit()
     {
diff --git a/components/platform/platform.hpp b/components/platform/platform.hpp
index d8f2058217..6c8cb9c946 100644
--- a/components/platform/platform.hpp
+++ b/components/platform/platform.hpp
@@ -1,7 +1,8 @@
 #ifndef OPENMW_COMPONENTS_PLATFORM_PLATFORM_HPP
 #define OPENMW_COMPONENTS_PLATFORM_PLATFORM_HPP
 
-namespace Platform {
+namespace Platform
+{
 
     void init();
 
diff --git a/components/process/processinvoker.cpp b/components/process/processinvoker.cpp
index 44c1b44008..73e23eb9f9 100644
--- a/components/process/processinvoker.cpp
+++ b/components/process/processinvoker.cpp
@@ -1,9 +1,9 @@
 #include "processinvoker.hpp"
 
+#include <QDir>
 #include <QMessageBox>
-#include <QStringList>
 #include <QString>
-#include <QDir>
+#include <QStringList>
 
 #if defined(Q_OS_MAC)
 #include <QCoreApplication>
@@ -14,49 +14,45 @@ Process::ProcessInvoker::ProcessInvoker(QObject* parent)
 {
     mProcess = new QProcess(this);
 
-    connect(mProcess, &QProcess::errorOccurred,
-            this, &ProcessInvoker::processError);
-
-    connect(mProcess, qOverload<int,QProcess::ExitStatus>(&QProcess::finished),
-            this, &ProcessInvoker::processFinished);
+    connect(mProcess, &QProcess::errorOccurred, this, &ProcessInvoker::processError);
 
+    connect(
+        mProcess, qOverload<int, QProcess::ExitStatus>(&QProcess::finished), this, &ProcessInvoker::processFinished);
 
     mName = QString();
     mArguments = QStringList();
 }
 
-Process::ProcessInvoker::~ProcessInvoker()
-{
-}
+Process::ProcessInvoker::~ProcessInvoker() {}
 
-//void Process::ProcessInvoker::setProcessName(const QString &name)
+// void Process::ProcessInvoker::setProcessName(const QString &name)
 //{
-//    mName = name;
-//}
+//     mName = name;
+// }
 
-//void Process::ProcessInvoker::setProcessArguments(const QStringList &arguments)
+// void Process::ProcessInvoker::setProcessArguments(const QStringList &arguments)
 //{
-//    mArguments = arguments;
-//}
+//     mArguments = arguments;
+// }
 
 QProcess* Process::ProcessInvoker::getProcess()
 {
     return mProcess;
 }
 
-//QString Process::ProcessInvoker::getProcessName()
+// QString Process::ProcessInvoker::getProcessName()
 //{
-//    return mName;
-//}
+//     return mName;
+// }
 
-//QStringList Process::ProcessInvoker::getProcessArguments()
+// QStringList Process::ProcessInvoker::getProcessArguments()
 //{
-//    return mArguments;
-//}
+//     return mArguments;
+// }
 
-bool Process::ProcessInvoker::startProcess(const QString &name, const QStringList &arguments, bool detached)
+bool Process::ProcessInvoker::startProcess(const QString& name, const QStringList& arguments, bool detached)
 {
-//    mProcess = new QProcess(this);
+    //    mProcess = new QProcess(this);
     mName = name;
     mArguments = arguments;
     mIgnoreErrors = false;
@@ -73,45 +69,57 @@ bool Process::ProcessInvoker::startProcess(const QString &name, const QStringLis
 
     QFileInfo info(path);
 
-    if (!info.exists()) {
+    if (!info.exists())
+    {
         QMessageBox msgBox;
         msgBox.setWindowTitle(tr("Error starting executable"));
         msgBox.setIcon(QMessageBox::Warning);
         msgBox.setStandardButtons(QMessageBox::Ok);
-        msgBox.setText(tr("<html><head/><body><p><b>Could not find %1</b></p> \
+        msgBox.setText(
+            tr("<html><head/><body><p><b>Could not find %1</b></p> \
                           <p>The application is not found.</p> \
-                          <p>Please make sure OpenMW is installed correctly and try again.</p></body></html>").arg(info.fileName()));
+                          <p>Please make sure OpenMW is installed correctly and try again.</p></body></html>")
+                .arg(info.fileName()));
         msgBox.exec();
         return false;
     }
 
-    if (!info.isExecutable()) {
+    if (!info.isExecutable())
+    {
         QMessageBox msgBox;
         msgBox.setWindowTitle(tr("Error starting executable"));
         msgBox.setIcon(QMessageBox::Warning);
         msgBox.setStandardButtons(QMessageBox::Ok);
-        msgBox.setText(tr("<html><head/><body><p><b>Could not start %1</b></p> \
+        msgBox.setText(
+            tr("<html><head/><body><p><b>Could not start %1</b></p> \
                           <p>The application is not executable.</p> \
-                          <p>Please make sure you have the right permissions and try again.</p></body></html>").arg(info.fileName()));
+                          <p>Please make sure you have the right permissions and try again.</p></body></html>")
+                .arg(info.fileName()));
         msgBox.exec();
         return false;
     }
 
     // Start the executable
-    if (detached) {
-        if (!mProcess->startDetached(path, arguments)) {
+    if (detached)
+    {
+        if (!mProcess->startDetached(path, arguments))
+        {
             QMessageBox msgBox;
             msgBox.setWindowTitle(tr("Error starting executable"));
             msgBox.setIcon(QMessageBox::Critical);
             msgBox.setStandardButtons(QMessageBox::Ok);
-            msgBox.setText(tr("<html><head/><body><p><b>Could not start %1</b></p> \
+            msgBox.setText(
+                tr("<html><head/><body><p><b>Could not start %1</b></p> \
                               <p>An error occurred while starting %1.</p> \
-                              <p>Press \"Show Details...\" for more information.</p></body></html>").arg(info.fileName()));
+                              <p>Press \"Show Details...\" for more information.</p></body></html>")
+                    .arg(info.fileName()));
             msgBox.setDetailedText(mProcess->errorString());
             msgBox.exec();
             return false;
         }
-    } else {
+    }
+    else
+    {
         mProcess->start(path, arguments);
 
         /*
@@ -122,8 +130,8 @@ bool Process::ProcessInvoker::startProcess(const QString &name, const QStringLis
             msgBox.setStandardButtons(QMessageBox::Ok);
             msgBox.setText(tr("<html><head/><body><p><b>Could not start %1</b></p> \
                               <p>An error occurred while starting %1.</p> \
-                              <p>Press \"Show Details...\" for more information.</p></body></html>").arg(info.fileName()));
-            msgBox.setDetailedText(mProcess->errorString());
+                              <p>Press \"Show Details...\" for more
+        information.</p></body></html>").arg(info.fileName())); msgBox.setDetailedText(mProcess->errorString());
             msgBox.exec();
 
             return false;
@@ -140,9 +148,8 @@ bool Process::ProcessInvoker::startProcess(const QString &name, const QStringLis
             msgBox.setStandardButtons(QMessageBox::Ok);
             msgBox.setText(tr("<html><head/><body><p><b>Executable %1 returned an error</b></p> \
                               <p>An error occurred while running %1.</p> \
-                              <p>Press \"Show Details...\" for more information.</p></body></html>").arg(info.fileName()));
-            msgBox.setDetailedText(error);
-            msgBox.exec();
+                              <p>Press \"Show Details...\" for more
+        information.</p></body></html>").arg(info.fileName())); msgBox.setDetailedText(error); msgBox.exec();
 
             return false;
         }
@@ -150,7 +157,6 @@ bool Process::ProcessInvoker::startProcess(const QString &name, const QStringLis
     }
 
     return true;
-
 }
 
 void Process::ProcessInvoker::processError(QProcess::ProcessError error)
@@ -161,17 +167,19 @@ void Process::ProcessInvoker::processError(QProcess::ProcessError error)
     msgBox.setWindowTitle(tr("Error running executable"));
     msgBox.setIcon(QMessageBox::Critical);
     msgBox.setStandardButtons(QMessageBox::Ok);
-    msgBox.setText(tr("<html><head/><body><p><b>Executable %1 returned an error</b></p> \
+    msgBox.setText(
+        tr("<html><head/><body><p><b>Executable %1 returned an error</b></p> \
                       <p>An error occurred while running %1.</p> \
-                      <p>Press \"Show Details...\" for more information.</p></body></html>").arg(mName));
+                      <p>Press \"Show Details...\" for more information.</p></body></html>")
+            .arg(mName));
     msgBox.setDetailedText(mProcess->errorString());
     msgBox.exec();
-
 }
 
 void Process::ProcessInvoker::processFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
-    if (exitCode != 0 || exitStatus == QProcess::CrashExit) {
+    if (exitCode != 0 || exitStatus == QProcess::CrashExit)
+    {
         if (mIgnoreErrors)
             return;
         QString error(mProcess->readAllStandardError());
@@ -182,9 +190,11 @@ void Process::ProcessInvoker::processFinished(int exitCode, QProcess::ExitStatus
         msgBox.setWindowTitle(tr("Error running executable"));
         msgBox.setIcon(QMessageBox::Critical);
         msgBox.setStandardButtons(QMessageBox::Ok);
-        msgBox.setText(tr("<html><head/><body><p><b>Executable %1 returned an error</b></p> \
+        msgBox.setText(
+            tr("<html><head/><body><p><b>Executable %1 returned an error</b></p> \
                           <p>An error occurred while running %1.</p> \
-                          <p>Press \"Show Details...\" for more information.</p></body></html>").arg(mName));
+                          <p>Press \"Show Details...\" for more information.</p></body></html>")
+                .arg(mName));
         msgBox.setDetailedText(error);
         msgBox.exec();
     }
diff --git a/components/process/processinvoker.hpp b/components/process/processinvoker.hpp
index f4b402cb12..3800844969 100644
--- a/components/process/processinvoker.hpp
+++ b/components/process/processinvoker.hpp
@@ -1,9 +1,9 @@
 #ifndef PROCESSINVOKER_HPP
 #define PROCESSINVOKER_HPP
 
-#include <QStringList>
-#include <QString>
 #include <QProcess>
+#include <QString>
+#include <QStringList>
 
 namespace Process
 {
@@ -12,25 +12,27 @@ namespace Process
         Q_OBJECT
 
     public:
-
         ProcessInvoker(QObject* parent = nullptr);
         ~ProcessInvoker();
 
-//        void setProcessName(const QString &name);
-//        void setProcessArguments(const QStringList &arguments);
+        //        void setProcessName(const QString &name);
+        //        void setProcessArguments(const QStringList &arguments);
 
         QProcess* getProcess();
-//        QString getProcessName();
-//        QStringList getProcessArguments();
+        //        QString getProcessName();
+        //        QStringList getProcessArguments();
 
-//        inline bool startProcess(bool detached = false) { return startProcess(mName, mArguments, detached); }
-        inline bool startProcess(const QString &name, bool detached = false) { return startProcess(name, QStringList(), detached); }
-        bool startProcess(const QString &name, const QStringList &arguments, bool detached = false);
+        //        inline bool startProcess(bool detached = false) { return startProcess(mName, mArguments, detached); }
+        inline bool startProcess(const QString& name, bool detached = false)
+        {
+            return startProcess(name, QStringList(), detached);
+        }
+        bool startProcess(const QString& name, const QStringList& arguments, bool detached = false);
 
         void killProcess();
 
     private:
-        QProcess *mProcess;
+        QProcess* mProcess;
 
         QString mName;
         QStringList mArguments;
@@ -40,7 +42,6 @@ namespace Process
     private slots:
         void processError(QProcess::ProcessError error);
         void processFinished(int exitCode, QProcess::ExitStatus exitStatus);
-
     };
 }
 
diff --git a/components/resource/animation.cpp b/components/resource/animation.cpp
index d2d7d08d55..848e304331 100644
--- a/components/resource/animation.cpp
+++ b/components/resource/animation.cpp
@@ -5,12 +5,13 @@
 
 namespace Resource
 {
-    Animation::Animation(const Animation& anim, const osg::CopyOp& copyop): osg::Object(anim, copyop),
-        mDuration(0.0f),
-        mStartTime(0.0f)
+    Animation::Animation(const Animation& anim, const osg::CopyOp& copyop)
+        : osg::Object(anim, copyop)
+        , mDuration(0.0f)
+        , mStartTime(0.0f)
     {
         const osgAnimation::ChannelList& channels = anim.getChannels();
-        for (const auto& channel: channels)
+        for (const auto& channel : channels)
             addChannel(channel.get()->clone());
     }
 
@@ -29,9 +30,9 @@ namespace Resource
         return mChannels;
     }
 
-    bool Animation::update (double time)
+    bool Animation::update(double time)
     {
-        for (const auto& channel: mChannels)
+        for (const auto& channel : mChannels)
         {
             channel->update(time, 1.0f, 0);
         }
diff --git a/components/resource/animation.hpp b/components/resource/animation.hpp
index 885394747e..4a0e426dfa 100644
--- a/components/resource/animation.hpp
+++ b/components/resource/animation.hpp
@@ -12,28 +12,31 @@ namespace Resource
     /// Stripped down class of osgAnimation::Animation, only needed for OSG's plugin formats like dae
     class Animation : public osg::Object
     {
-        public:
-            META_Object(Resource, Animation)
+    public:
+        META_Object(Resource, Animation)
 
-            Animation() :
-                mDuration(0.0), mStartTime(0) {}
+        Animation()
+            : mDuration(0.0)
+            , mStartTime(0)
+        {
+        }
 
-            Animation(const Animation&, const osg::CopyOp&);
-            ~Animation() {}
+        Animation(const Animation&, const osg::CopyOp&);
+        ~Animation() {}
 
-            void addChannel (osg::ref_ptr<osgAnimation::Channel> pChannel);
+        void addChannel(osg::ref_ptr<osgAnimation::Channel> pChannel);
 
-            std::vector<osg::ref_ptr<osgAnimation::Channel>>& getChannels();
+        std::vector<osg::ref_ptr<osgAnimation::Channel>>& getChannels();
 
-            const std::vector<osg::ref_ptr<osgAnimation::Channel>>& getChannels() const;
+        const std::vector<osg::ref_ptr<osgAnimation::Channel>>& getChannels() const;
 
-            bool update (double time);
+        bool update(double time);
 
-        protected:
-            double mDuration;
-            double mStartTime;
-            std::vector<osg::ref_ptr<osgAnimation::Channel>> mChannels;
-        };
+    protected:
+        double mDuration;
+        double mStartTime;
+        std::vector<osg::ref_ptr<osgAnimation::Channel>> mChannels;
+    };
 }
 
 #endif
diff --git a/components/resource/bulletshape.cpp b/components/resource/bulletshape.cpp
index b170d67bc7..ffff8fb48b 100644
--- a/components/resource/bulletshape.cpp
+++ b/components/resource/bulletshape.cpp
@@ -4,101 +4,103 @@
 #include <string>
 
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
-#include <BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h>
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
 #include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
+#include <BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h>
 
 namespace Resource
 {
-namespace
-{
-    CollisionShapePtr duplicateCollisionShape(const btCollisionShape *shape)
+    namespace
     {
-        if (shape == nullptr)
-            return nullptr;
-
-        if (shape->isCompound())
+        CollisionShapePtr duplicateCollisionShape(const btCollisionShape* shape)
         {
-            const btCompoundShape *comp = static_cast<const btCompoundShape*>(shape);
-            std::unique_ptr<btCompoundShape, DeleteCollisionShape> newShape(new btCompoundShape);
+            if (shape == nullptr)
+                return nullptr;
 
-            for (int i = 0, n = comp->getNumChildShapes(); i < n; ++i)
+            if (shape->isCompound())
             {
-                auto child = duplicateCollisionShape(comp->getChildShape(i));
-                const btTransform& trans = comp->getChildTransform(i);
-                newShape->addChildShape(trans, child.release());
+                const btCompoundShape* comp = static_cast<const btCompoundShape*>(shape);
+                std::unique_ptr<btCompoundShape, DeleteCollisionShape> newShape(new btCompoundShape);
+
+                for (int i = 0, n = comp->getNumChildShapes(); i < n; ++i)
+                {
+                    auto child = duplicateCollisionShape(comp->getChildShape(i));
+                    const btTransform& trans = comp->getChildTransform(i);
+                    newShape->addChildShape(trans, child.release());
+                }
+
+                return newShape;
             }
 
-            return newShape;
-        }
+            if (shape->getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE)
+            {
+                const btBvhTriangleMeshShape* trishape = static_cast<const btBvhTriangleMeshShape*>(shape);
+                return CollisionShapePtr(new btScaledBvhTriangleMeshShape(
+                    const_cast<btBvhTriangleMeshShape*>(trishape), btVector3(1.f, 1.f, 1.f)));
+            }
 
-        if (shape->getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE)
-        {
-            const btBvhTriangleMeshShape* trishape = static_cast<const btBvhTriangleMeshShape*>(shape);
-            return CollisionShapePtr(new btScaledBvhTriangleMeshShape(const_cast<btBvhTriangleMeshShape*>(trishape), btVector3(1.f, 1.f, 1.f)));
-        }
+            if (shape->getShapeType() == BOX_SHAPE_PROXYTYPE)
+            {
+                const btBoxShape* boxshape = static_cast<const btBoxShape*>(shape);
+                return CollisionShapePtr(new btBoxShape(*boxshape));
+            }
 
-        if (shape->getShapeType() == BOX_SHAPE_PROXYTYPE)
-        {
-            const btBoxShape* boxshape = static_cast<const btBoxShape*>(shape);
-            return CollisionShapePtr(new btBoxShape(*boxshape));
+            if (shape->getShapeType() == TERRAIN_SHAPE_PROXYTYPE)
+                return CollisionShapePtr(
+                    new btHeightfieldTerrainShape(static_cast<const btHeightfieldTerrainShape&>(*shape)));
+
+            throw std::logic_error(std::string("Unhandled Bullet shape duplication: ") + shape->getName());
         }
 
-        if (shape->getShapeType() == TERRAIN_SHAPE_PROXYTYPE)
-            return CollisionShapePtr(new btHeightfieldTerrainShape(static_cast<const btHeightfieldTerrainShape&>(*shape)));
+        void deleteShape(btCollisionShape* shape)
+        {
+            if (shape->isCompound())
+            {
+                btCompoundShape* compound = static_cast<btCompoundShape*>(shape);
+                for (int i = 0, n = compound->getNumChildShapes(); i < n; i++)
+                    if (btCollisionShape* child = compound->getChildShape(i))
+                        deleteShape(child);
+            }
 
-        throw std::logic_error(std::string("Unhandled Bullet shape duplication: ") + shape->getName());
+            delete shape;
+        }
     }
 
-    void deleteShape(btCollisionShape* shape)
+    void DeleteCollisionShape::operator()(btCollisionShape* shape) const
     {
-        if (shape->isCompound())
-        {
-            btCompoundShape* compound = static_cast<btCompoundShape*>(shape);
-            for (int i = 0, n = compound->getNumChildShapes(); i < n; i++)
-                if (btCollisionShape* child = compound->getChildShape(i))
-                    deleteShape(child);
-        }
-
-        delete shape;
+        deleteShape(shape);
     }
-}
-
-void DeleteCollisionShape::operator()(btCollisionShape* shape) const
-{
-    deleteShape(shape);
-}
 
-BulletShape::BulletShape(const BulletShape &copy, const osg::CopyOp &copyop)
-    : mCollisionShape(duplicateCollisionShape(copy.mCollisionShape.get()))
-    , mAvoidCollisionShape(duplicateCollisionShape(copy.mAvoidCollisionShape.get()))
-    , mCollisionBox(copy.mCollisionBox)
-    , mAnimatedShapes(copy.mAnimatedShapes)
-    , mFileName(copy.mFileName)
-    , mFileHash(copy.mFileHash)
-{
-}
+    BulletShape::BulletShape(const BulletShape& copy, const osg::CopyOp& copyop)
+        : mCollisionShape(duplicateCollisionShape(copy.mCollisionShape.get()))
+        , mAvoidCollisionShape(duplicateCollisionShape(copy.mAvoidCollisionShape.get()))
+        , mCollisionBox(copy.mCollisionBox)
+        , mAnimatedShapes(copy.mAnimatedShapes)
+        , mFileName(copy.mFileName)
+        , mFileHash(copy.mFileHash)
+    {
+    }
 
-void BulletShape::setLocalScaling(const btVector3& scale)
-{
-    mCollisionShape->setLocalScaling(scale);
-    if (mAvoidCollisionShape)
-        mAvoidCollisionShape->setLocalScaling(scale);
-}
+    void BulletShape::setLocalScaling(const btVector3& scale)
+    {
+        mCollisionShape->setLocalScaling(scale);
+        if (mAvoidCollisionShape)
+            mAvoidCollisionShape->setLocalScaling(scale);
+    }
 
-osg::ref_ptr<BulletShapeInstance> makeInstance(osg::ref_ptr<const BulletShape> source)
-{
-    return {new BulletShapeInstance(std::move(source))};
-}
+    osg::ref_ptr<BulletShapeInstance> makeInstance(osg::ref_ptr<const BulletShape> source)
+    {
+        return { new BulletShapeInstance(std::move(source)) };
+    }
 
-BulletShapeInstance::BulletShapeInstance(osg::ref_ptr<const BulletShape> source)
-    : mSource(std::move(source))
-{
-    mCollisionBox = mSource->mCollisionBox;
-    mAnimatedShapes = mSource->mAnimatedShapes;
-    mVisualCollisionType = mSource->mVisualCollisionType;
-    mCollisionShape = duplicateCollisionShape(mSource->mCollisionShape.get());
-    mAvoidCollisionShape = duplicateCollisionShape(mSource->mAvoidCollisionShape.get());
-}
+    BulletShapeInstance::BulletShapeInstance(osg::ref_ptr<const BulletShape> source)
+        : mSource(std::move(source))
+    {
+        mCollisionBox = mSource->mCollisionBox;
+        mAnimatedShapes = mSource->mAnimatedShapes;
+        mVisualCollisionType = mSource->mVisualCollisionType;
+        mCollisionShape = duplicateCollisionShape(mSource->mCollisionShape.get());
+        mAvoidCollisionShape = duplicateCollisionShape(mSource->mAvoidCollisionShape.get());
+    }
 
 }
diff --git a/components/resource/bulletshape.hpp b/components/resource/bulletshape.hpp
index 9a8beeb655..34b3234130 100644
--- a/components/resource/bulletshape.hpp
+++ b/components/resource/bulletshape.hpp
@@ -6,8 +6,8 @@
 #include <memory>
 
 #include <osg/Object>
-#include <osg/ref_ptr>
 #include <osg/Vec3f>
+#include <osg/ref_ptr>
 
 #include <BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h>
 
@@ -45,8 +45,8 @@ namespace Resource
         CollisionShapePtr mCollisionShape;
         CollisionShapePtr mAvoidCollisionShape;
 
-        // Used for actors and projectiles. mCollisionShape is used for actors only when we need to autogenerate collision box for creatures.
-        // For now, use one file <-> one resource for simplicity.
+        // Used for actors and projectiles. mCollisionShape is used for actors only when we need to autogenerate
+        // collision box for creatures. For now, use one file <-> one resource for simplicity.
         CollisionBox mCollisionBox;
 
         // Stores animated collision shapes. If any collision nodes in the NIF are animated, then mCollisionShape
@@ -70,9 +70,9 @@ namespace Resource
         bool isAnimated() const { return !mAnimatedShapes.empty(); }
     };
 
-
     // An instance of a BulletShape that may have its own unique scaling set on the mCollisionShape.
-    // Vertex data is shallow-copied where possible. A ref_ptr to the original shape is held to keep vertex pointers intact.
+    // Vertex data is shallow-copied where possible. A ref_ptr to the original shape is held to keep vertex pointers
+    // intact.
     class BulletShapeInstance : public BulletShape
     {
     public:
@@ -89,7 +89,8 @@ namespace Resource
     // Subclass btBhvTriangleMeshShape to auto-delete the meshInterface
     struct TriangleMeshShape : public btBvhTriangleMeshShape
     {
-        TriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression, bool buildBvh = true)
+        TriangleMeshShape(
+            btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression, bool buildBvh = true)
             : btBvhTriangleMeshShape(meshInterface, useQuantizedAabbCompression, buildBvh)
         {
         }
@@ -101,7 +102,6 @@ namespace Resource
         }
     };
 
-
 }
 
 #endif
diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index da4672757a..004c772e42 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -2,229 +2,218 @@
 
 #include <cstring>
 
+#include <osg/Drawable>
 #include <osg/NodeVisitor>
-#include <osg/TriangleFunctor>
 #include <osg/Transform>
-#include <osg/Drawable>
+#include <osg/TriangleFunctor>
 
 #include <BulletCollision/CollisionShapes/btTriangleMesh.h>
 
+#include <components/misc/osguservalues.hpp>
 #include <components/misc/pathhelpers.hpp>
 #include <components/sceneutil/visitor.hpp>
 #include <components/vfs/manager.hpp>
-#include <components/misc/osguservalues.hpp>
 
 #include <components/nifbullet/bulletnifloader.hpp>
 
 #include "bulletshape.hpp"
-#include "scenemanager.hpp"
+#include "multiobjectcache.hpp"
 #include "niffilemanager.hpp"
 #include "objectcache.hpp"
-#include "multiobjectcache.hpp"
+#include "scenemanager.hpp"
 
 namespace Resource
 {
 
-struct GetTriangleFunctor
-{
-    GetTriangleFunctor()
-        : mTriMesh(nullptr)
+    struct GetTriangleFunctor
     {
-    }
+        GetTriangleFunctor()
+            : mTriMesh(nullptr)
+        {
+        }
 
-    void setTriMesh(btTriangleMesh* triMesh)
-    {
-        mTriMesh = triMesh;
-    }
+        void setTriMesh(btTriangleMesh* triMesh) { mTriMesh = triMesh; }
 
-    void setMatrix(const osg::Matrixf& matrix)
-    {
-        mMatrix = matrix;
-    }
+        void setMatrix(const osg::Matrixf& matrix) { mMatrix = matrix; }
 
-    inline btVector3 toBullet(const osg::Vec3f& vec)
-    {
-        return btVector3(vec.x(), vec.y(), vec.z());
-    }
+        inline btVector3 toBullet(const osg::Vec3f& vec) { return btVector3(vec.x(), vec.y(), vec.z()); }
 
-    void inline operator()( const osg::Vec3& v1, const osg::Vec3& v2, const osg::Vec3& v3, bool _temp=false ) // Note: unused temp argument left here for OSG versions less than 3.5.6 
-    {
-        if (mTriMesh)
-            mTriMesh->addTriangle( toBullet(mMatrix.preMult(v1)), toBullet(mMatrix.preMult(v2)), toBullet(mMatrix.preMult(v3)));
-    }
+        void inline operator()(const osg::Vec3& v1, const osg::Vec3& v2, const osg::Vec3& v3,
+            bool _temp = false) // Note: unused temp argument left here for OSG versions less than 3.5.6
+        {
+            if (mTriMesh)
+                mTriMesh->addTriangle(
+                    toBullet(mMatrix.preMult(v1)), toBullet(mMatrix.preMult(v2)), toBullet(mMatrix.preMult(v3)));
+        }
 
-    btTriangleMesh* mTriMesh;
-    osg::Matrixf mMatrix;
-};
+        btTriangleMesh* mTriMesh;
+        osg::Matrixf mMatrix;
+    };
 
-/// Creates a BulletShape out of a Node hierarchy.
-class NodeToShapeVisitor : public osg::NodeVisitor
-{
-public:
-    NodeToShapeVisitor()
-        : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-        , mTriangleMesh(nullptr)
+    /// Creates a BulletShape out of a Node hierarchy.
+    class NodeToShapeVisitor : public osg::NodeVisitor
     {
+    public:
+        NodeToShapeVisitor()
+            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+            , mTriangleMesh(nullptr)
+        {
+        }
 
-    }
+        void apply(osg::Drawable& drawable) override
+        {
+            if (!mTriangleMesh)
+                mTriangleMesh.reset(new btTriangleMesh);
+
+            osg::Matrixf worldMat = osg::computeLocalToWorld(getNodePath());
+            osg::TriangleFunctor<GetTriangleFunctor> functor;
+            functor.setTriMesh(mTriangleMesh.get());
+            functor.setMatrix(worldMat);
+            drawable.accept(functor);
+        }
 
-    void apply(osg::Drawable &drawable) override
-    {
-        if (!mTriangleMesh)
-            mTriangleMesh.reset(new btTriangleMesh);
-
-        osg::Matrixf worldMat = osg::computeLocalToWorld(getNodePath());
-        osg::TriangleFunctor<GetTriangleFunctor> functor;
-        functor.setTriMesh(mTriangleMesh.get());
-        functor.setMatrix(worldMat);
-        drawable.accept(functor);
-    }
+        osg::ref_ptr<BulletShape> getShape()
+        {
+            if (!mTriangleMesh)
+                return osg::ref_ptr<BulletShape>();
+
+            osg::ref_ptr<BulletShape> shape(new BulletShape);
+
+            auto triangleMeshShape = std::make_unique<TriangleMeshShape>(mTriangleMesh.release(), true);
+            btVector3 aabbMin = triangleMeshShape->getLocalAabbMin();
+            btVector3 aabbMax = triangleMeshShape->getLocalAabbMax();
+            shape->mCollisionBox.mExtents[0] = (aabbMax[0] - aabbMin[0]) / 2.0f;
+            shape->mCollisionBox.mExtents[1] = (aabbMax[1] - aabbMin[1]) / 2.0f;
+            shape->mCollisionBox.mExtents[2] = (aabbMax[2] - aabbMin[2]) / 2.0f;
+            shape->mCollisionBox.mCenter = osg::Vec3f(
+                (aabbMax[0] + aabbMin[0]) / 2.0f, (aabbMax[1] + aabbMin[1]) / 2.0f, (aabbMax[2] + aabbMin[2]) / 2.0f);
+            shape->mCollisionShape.reset(triangleMeshShape.release());
+
+            return shape;
+        }
 
-    osg::ref_ptr<BulletShape> getShape()
-    {
-        if (!mTriangleMesh)
-            return osg::ref_ptr<BulletShape>();
-
-        osg::ref_ptr<BulletShape> shape (new BulletShape);
-
-        auto triangleMeshShape = std::make_unique<TriangleMeshShape>(mTriangleMesh.release(), true);
-        btVector3 aabbMin = triangleMeshShape->getLocalAabbMin();
-        btVector3 aabbMax = triangleMeshShape->getLocalAabbMax();
-        shape->mCollisionBox.mExtents[0] = (aabbMax[0] - aabbMin[0]) / 2.0f;
-        shape->mCollisionBox.mExtents[1] = (aabbMax[1] - aabbMin[1]) / 2.0f;
-        shape->mCollisionBox.mExtents[2] = (aabbMax[2] - aabbMin[2]) / 2.0f;
-        shape->mCollisionBox.mCenter = osg::Vec3f( (aabbMax[0] + aabbMin[0]) / 2.0f,
-                                                  (aabbMax[1] + aabbMin[1]) / 2.0f,
-                                                  (aabbMax[2] + aabbMin[2]) / 2.0f );
-        shape->mCollisionShape.reset(triangleMeshShape.release());
+    private:
+        std::unique_ptr<btTriangleMesh> mTriangleMesh;
+    };
 
-        return shape;
+    BulletShapeManager::BulletShapeManager(
+        const VFS::Manager* vfs, SceneManager* sceneMgr, NifFileManager* nifFileManager)
+        : ResourceManager(vfs)
+        , mInstanceCache(new MultiObjectCache)
+        , mSceneManager(sceneMgr)
+        , mNifFileManager(nifFileManager)
+    {
     }
 
-private:
-    std::unique_ptr<btTriangleMesh> mTriangleMesh;
-};
-
-BulletShapeManager::BulletShapeManager(const VFS::Manager* vfs, SceneManager* sceneMgr, NifFileManager* nifFileManager)
-    : ResourceManager(vfs)
-    , mInstanceCache(new MultiObjectCache)
-    , mSceneManager(sceneMgr)
-    , mNifFileManager(nifFileManager)
-{
-
-}
+    BulletShapeManager::~BulletShapeManager() {}
 
-BulletShapeManager::~BulletShapeManager()
-{
-
-}
-
-osg::ref_ptr<const BulletShape> BulletShapeManager::getShape(const std::string &name)
-{
-    const std::string normalized = mVFS->normalizeFilename(name);
-
-    osg::ref_ptr<BulletShape> shape;
-    osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(normalized);
-    if (obj)
-        shape = osg::ref_ptr<BulletShape>(static_cast<BulletShape*>(obj.get()));
-    else
+    osg::ref_ptr<const BulletShape> BulletShapeManager::getShape(const std::string& name)
     {
-        if (Misc::getFileExtension(normalized) == "nif")
-        {
-            NifBullet::BulletNifLoader loader;
-            shape = loader.load(*mNifFileManager->get(normalized));
-        }
+        const std::string normalized = mVFS->normalizeFilename(name);
+
+        osg::ref_ptr<BulletShape> shape;
+        osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(normalized);
+        if (obj)
+            shape = osg::ref_ptr<BulletShape>(static_cast<BulletShape*>(obj.get()));
         else
         {
-            // TODO: support .bullet shape files
-
-            osg::ref_ptr<const osg::Node> constNode (mSceneManager->getTemplate(normalized));
-            osg::ref_ptr<osg::Node> node (const_cast<osg::Node*>(constNode.get())); // const-trickery required because there is no const version of NodeVisitor
-
-            // Check first if there's a custom collision node
-            unsigned int visitAllNodesMask = 0xffffffff;
-            SceneUtil::FindByNameVisitor nameFinder("Collision");
-            nameFinder.setTraversalMask(visitAllNodesMask);
-            nameFinder.setNodeMaskOverride(visitAllNodesMask);
-            node->accept(nameFinder);
-            if (nameFinder.mFoundNode)
+            if (Misc::getFileExtension(normalized) == "nif")
             {
-                NodeToShapeVisitor visitor;
-                visitor.setTraversalMask(visitAllNodesMask);
-                visitor.setNodeMaskOverride(visitAllNodesMask);
-                nameFinder.mFoundNode->accept(visitor);
-                shape = visitor.getShape();
+                NifBullet::BulletNifLoader loader;
+                shape = loader.load(*mNifFileManager->get(normalized));
             }
-
-            // Generate a collision shape from the mesh
-            if (!shape)
+            else
             {
-                NodeToShapeVisitor visitor;
-                node->accept(visitor);
-                shape = visitor.getShape();
+                // TODO: support .bullet shape files
+
+                osg::ref_ptr<const osg::Node> constNode(mSceneManager->getTemplate(normalized));
+                osg::ref_ptr<osg::Node> node(const_cast<osg::Node*>(
+                    constNode.get())); // const-trickery required because there is no const version of NodeVisitor
+
+                // Check first if there's a custom collision node
+                unsigned int visitAllNodesMask = 0xffffffff;
+                SceneUtil::FindByNameVisitor nameFinder("Collision");
+                nameFinder.setTraversalMask(visitAllNodesMask);
+                nameFinder.setNodeMaskOverride(visitAllNodesMask);
+                node->accept(nameFinder);
+                if (nameFinder.mFoundNode)
+                {
+                    NodeToShapeVisitor visitor;
+                    visitor.setTraversalMask(visitAllNodesMask);
+                    visitor.setNodeMaskOverride(visitAllNodesMask);
+                    nameFinder.mFoundNode->accept(visitor);
+                    shape = visitor.getShape();
+                }
+
+                // Generate a collision shape from the mesh
                 if (!shape)
-                    return osg::ref_ptr<BulletShape>();
+                {
+                    NodeToShapeVisitor visitor;
+                    node->accept(visitor);
+                    shape = visitor.getShape();
+                    if (!shape)
+                        return osg::ref_ptr<BulletShape>();
+                }
+
+                if (shape != nullptr)
+                {
+                    shape->mFileName = normalized;
+                    constNode->getUserValue(Misc::OsgUserValues::sFileHash, shape->mFileHash);
+                }
             }
 
-            if (shape != nullptr)
-            {
-                shape->mFileName = normalized;
-                constNode->getUserValue(Misc::OsgUserValues::sFileHash, shape->mFileHash);
-            }
+            mCache->addEntryToObjectCache(normalized, shape);
         }
-
-        mCache->addEntryToObjectCache(normalized, shape);
+        return shape;
     }
-    return shape;
-}
 
-osg::ref_ptr<BulletShapeInstance> BulletShapeManager::cacheInstance(const std::string &name)
-{
-    const std::string normalized = mVFS->normalizeFilename(name);
+    osg::ref_ptr<BulletShapeInstance> BulletShapeManager::cacheInstance(const std::string& name)
+    {
+        const std::string normalized = mVFS->normalizeFilename(name);
 
-    osg::ref_ptr<BulletShapeInstance> instance = createInstance(normalized);
-    if (instance)
-        mInstanceCache->addEntryToObjectCache(normalized, instance.get());
-    return instance;
-}
+        osg::ref_ptr<BulletShapeInstance> instance = createInstance(normalized);
+        if (instance)
+            mInstanceCache->addEntryToObjectCache(normalized, instance.get());
+        return instance;
+    }
 
-osg::ref_ptr<BulletShapeInstance> BulletShapeManager::getInstance(const std::string &name)
-{
-    const std::string normalized = mVFS->normalizeFilename(name);
+    osg::ref_ptr<BulletShapeInstance> BulletShapeManager::getInstance(const std::string& name)
+    {
+        const std::string normalized = mVFS->normalizeFilename(name);
 
-    osg::ref_ptr<osg::Object> obj = mInstanceCache->takeFromObjectCache(normalized);
-    if (obj.get())
-        return static_cast<BulletShapeInstance*>(obj.get());
-    else
-        return createInstance(normalized);
-}
+        osg::ref_ptr<osg::Object> obj = mInstanceCache->takeFromObjectCache(normalized);
+        if (obj.get())
+            return static_cast<BulletShapeInstance*>(obj.get());
+        else
+            return createInstance(normalized);
+    }
 
-osg::ref_ptr<BulletShapeInstance> BulletShapeManager::createInstance(const std::string &name)
-{
-    osg::ref_ptr<const BulletShape> shape = getShape(name);
-    if (shape)
-        return makeInstance(std::move(shape));
-    return osg::ref_ptr<BulletShapeInstance>();
-}
+    osg::ref_ptr<BulletShapeInstance> BulletShapeManager::createInstance(const std::string& name)
+    {
+        osg::ref_ptr<const BulletShape> shape = getShape(name);
+        if (shape)
+            return makeInstance(std::move(shape));
+        return osg::ref_ptr<BulletShapeInstance>();
+    }
 
-void BulletShapeManager::updateCache(double referenceTime)
-{
-    ResourceManager::updateCache(referenceTime);
+    void BulletShapeManager::updateCache(double referenceTime)
+    {
+        ResourceManager::updateCache(referenceTime);
 
-    mInstanceCache->removeUnreferencedObjectsInCache();
-}
+        mInstanceCache->removeUnreferencedObjectsInCache();
+    }
 
-void BulletShapeManager::clearCache()
-{
-    ResourceManager::clearCache();
+    void BulletShapeManager::clearCache()
+    {
+        ResourceManager::clearCache();
 
-    mInstanceCache->clear();
-}
+        mInstanceCache->clear();
+    }
 
-void BulletShapeManager::reportStats(unsigned int frameNumber, osg::Stats *stats) const
-{
-    stats->setAttribute(frameNumber, "Shape", mCache->getCacheSize());
-    stats->setAttribute(frameNumber, "Shape Instance", mInstanceCache->getCacheSize());
-}
+    void BulletShapeManager::reportStats(unsigned int frameNumber, osg::Stats* stats) const
+    {
+        stats->setAttribute(frameNumber, "Shape", mCache->getCacheSize());
+        stats->setAttribute(frameNumber, "Shape Instance", mInstanceCache->getCacheSize());
+    }
 
 }
diff --git a/components/resource/bulletshapemanager.hpp b/components/resource/bulletshapemanager.hpp
index 283c78a062..1b4ce849fe 100644
--- a/components/resource/bulletshapemanager.hpp
+++ b/components/resource/bulletshapemanager.hpp
@@ -31,9 +31,10 @@ namespace Resource
         /// @note May return a null pointer if the object has no shape.
         osg::ref_ptr<const BulletShape> getShape(const std::string& name);
 
-        /// Create an instance of the given shape and cache it for later use, so that future calls to getInstance() can simply return
-        /// the cached instance instead of having to create a new one.
-        /// @note The returned ref_ptr may be kept by the caller to ensure that the instance stays in cache for as long as needed.
+        /// Create an instance of the given shape and cache it for later use, so that future calls to getInstance() can
+        /// simply return the cached instance instead of having to create a new one.
+        /// @note The returned ref_ptr may be kept by the caller to ensure that the instance stays in cache for as long
+        /// as needed.
         osg::ref_ptr<BulletShapeInstance> cacheInstance(const std::string& name);
 
         /// @note May return a null pointer if the object has no shape.
@@ -44,7 +45,7 @@ namespace Resource
 
         void clearCache() override;
 
-        void reportStats(unsigned int frameNumber, osg::Stats *stats) const override;
+        void reportStats(unsigned int frameNumber, osg::Stats* stats) const override;
 
     private:
         osg::ref_ptr<BulletShapeInstance> createInstance(const std::string& name);
diff --git a/components/resource/foreachbulletobject.cpp b/components/resource/foreachbulletobject.cpp
index 5b4b4ef6eb..b7434df3a2 100644
--- a/components/resource/foreachbulletobject.cpp
+++ b/components/resource/foreachbulletobject.cpp
@@ -5,6 +5,7 @@
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/loadcell.hpp>
 #include <components/esm3/loadland.hpp>
+#include <components/esm3/readerscache.hpp>
 #include <components/esmloader/esmdata.hpp>
 #include <components/esmloader/lessbyid.hpp>
 #include <components/esmloader/record.hpp>
@@ -13,7 +14,6 @@
 #include <components/resource/bulletshapemanager.hpp>
 #include <components/settings/settings.hpp>
 #include <components/vfs/manager.hpp>
-#include <components/esm3/readerscache.hpp>
 
 #include <osg/ref_ptr>
 
@@ -37,27 +37,35 @@ namespace Resource
             float mScale;
             ESM::Position mPos;
 
-            CellRef(ESM::RecNameInts type, ESM::RefNum refNum, std::string&& refId, float scale, const ESM::Position& pos)
-                : mType(type), mRefNum(refNum), mRefId(std::move(refId)), mScale(scale), mPos(pos) {}
+            CellRef(
+                ESM::RecNameInts type, ESM::RefNum refNum, std::string&& refId, float scale, const ESM::Position& pos)
+                : mType(type)
+                , mRefNum(refNum)
+                , mRefId(std::move(refId))
+                , mScale(scale)
+                , mPos(pos)
+            {
+            }
         };
 
         ESM::RecNameInts getType(const EsmLoader::EsmData& esmData, std::string_view refId)
         {
-            const auto it = std::lower_bound(esmData.mRefIdTypes.begin(), esmData.mRefIdTypes.end(),
-                                             refId, EsmLoader::LessById {});
+            const auto it = std::lower_bound(
+                esmData.mRefIdTypes.begin(), esmData.mRefIdTypes.end(), refId, EsmLoader::LessById{});
             if (it == esmData.mRefIdTypes.end() || it->mId != refId)
                 return {};
             return it->mType;
         }
 
-        std::vector<CellRef> loadCellRefs(const ESM::Cell& cell, const EsmLoader::EsmData& esmData,
-            ESM::ReadersCache& readers)
+        std::vector<CellRef> loadCellRefs(
+            const ESM::Cell& cell, const EsmLoader::EsmData& esmData, ESM::ReadersCache& readers)
         {
             std::vector<EsmLoader::Record<CellRef>> cellRefs;
 
             for (std::size_t i = 0; i < cell.mContextList.size(); i++)
             {
-                const ESM::ReadersCache::BusyItem reader = readers.get(static_cast<std::size_t>(cell.mContextList[i].index));
+                const ESM::ReadersCache::BusyItem reader
+                    = readers.get(static_cast<std::size_t>(cell.mContextList[i].index));
                 cell.restore(*reader, static_cast<int>(i));
                 ESM::CellRef cellRef;
                 bool deleted = false;
@@ -65,16 +73,17 @@ namespace Resource
                 {
                     Misc::StringUtils::lowerCaseInPlace(cellRef.mRefID);
                     const ESM::RecNameInts type = getType(esmData, cellRef.mRefID);
-                    if (type == ESM::RecNameInts {})
+                    if (type == ESM::RecNameInts{})
                         continue;
-                    cellRefs.emplace_back(deleted, type, cellRef.mRefNum, std::move(cellRef.mRefID),
-                                        cellRef.mScale, cellRef.mPos);
+                    cellRefs.emplace_back(
+                        deleted, type, cellRef.mRefNum, std::move(cellRef.mRefID), cellRef.mScale, cellRef.mPos);
                 }
             }
 
             Log(Debug::Debug) << "Loaded " << cellRefs.size() << " cell refs";
 
-            const auto getKey = [] (const EsmLoader::Record<CellRef>& v) -> const ESM::RefNum& { return v.mValue.mRefNum; };
+            const auto getKey
+                = [](const EsmLoader::Record<CellRef>& v) -> const ESM::RefNum& { return v.mValue.mRefNum; };
             std::vector<CellRef> result = prepareRecords(cellRefs, getKey);
 
             Log(Debug::Debug) << "Prepared " << result.size() << " unique cell refs";
@@ -84,8 +93,7 @@ namespace Resource
 
         template <class F>
         void forEachObject(const ESM::Cell& cell, const EsmLoader::EsmData& esmData, const VFS::Manager& vfs,
-            Resource::BulletShapeManager& bulletShapeManager, ESM::ReadersCache& readers,
-            F&& f)
+            Resource::BulletShapeManager& bulletShapeManager, ESM::ReadersCache& readers, F&& f)
         {
             std::vector<CellRef> cellRefs = loadCellRefs(cell, esmData, readers);
 
@@ -100,18 +108,18 @@ namespace Resource
                 if (cellRef.mType != ESM::REC_STAT)
                     model = Misc::ResourceHelpers::correctActorModelPath(model, &vfs);
 
-                osg::ref_ptr<const Resource::BulletShape> shape = [&]
-                {
+                osg::ref_ptr<const Resource::BulletShape> shape = [&] {
                     try
                     {
                         return bulletShapeManager.getShape("meshes/" + model);
                     }
                     catch (const std::exception& e)
                     {
-                        Log(Debug::Warning) << "Failed to load cell ref \"" << cellRef.mRefId << "\" model \"" << model << "\": " << e.what();
+                        Log(Debug::Warning) << "Failed to load cell ref \"" << cellRef.mRefId << "\" model \"" << model
+                                            << "\": " << e.what();
                         return osg::ref_ptr<const Resource::BulletShape>();
                     }
-                } ();
+                }();
 
                 if (shape == nullptr)
                     continue;
@@ -122,7 +130,7 @@ namespace Resource
                     case ESM::REC_CONT:
                     case ESM::REC_DOOR:
                     case ESM::REC_STAT:
-                        f(BulletObject {std::move(shape), cellRef.mPos, cellRef.mScale});
+                        f(BulletObject{ std::move(shape), cellRef.mPos, cellRef.mScale });
                         break;
                     default:
                         break;
@@ -133,7 +141,7 @@ namespace Resource
 
     void forEachBulletObject(ESM::ReadersCache& readers, const VFS::Manager& vfs,
         Resource::BulletShapeManager& bulletShapeManager, const EsmLoader::EsmData& esmData,
-        std::function<void (const ESM::Cell& cell, const BulletObject& object)> callback)
+        std::function<void(const ESM::Cell& cell, const BulletObject& object)> callback)
     {
         Log(Debug::Info) << "Processing " << esmData.mCells.size() << " cells...";
 
@@ -142,21 +150,19 @@ namespace Resource
             const ESM::Cell& cell = esmData.mCells[i];
             const bool exterior = cell.isExterior();
 
-            Log(Debug::Debug) << "Processing " << (exterior ? "exterior" : "interior")
-                << " cell (" << (i + 1) << "/" << esmData.mCells.size() << ") \"" << cell.getDescription() << "\"";
+            Log(Debug::Debug) << "Processing " << (exterior ? "exterior" : "interior") << " cell (" << (i + 1) << "/"
+                              << esmData.mCells.size() << ") \"" << cell.getDescription() << "\"";
 
             std::size_t objects = 0;
 
-            forEachObject(cell, esmData, vfs, bulletShapeManager, readers,
-                [&] (const BulletObject& object)
-                {
-                    callback(cell, object);
-                    ++objects;
-                });
+            forEachObject(cell, esmData, vfs, bulletShapeManager, readers, [&](const BulletObject& object) {
+                callback(cell, object);
+                ++objects;
+            });
 
-            Log(Debug::Info) << "Processed " << (exterior ? "exterior" : "interior")
-                << " cell (" << (i + 1) << "/" << esmData.mCells.size() << ") " << cell.getDescription()
-                << " with " << objects << " objects";
+            Log(Debug::Info) << "Processed " << (exterior ? "exterior" : "interior") << " cell (" << (i + 1) << "/"
+                             << esmData.mCells.size() << ") " << cell.getDescription() << " with " << objects
+                             << " objects";
         }
     }
 }
diff --git a/components/resource/foreachbulletobject.hpp b/components/resource/foreachbulletobject.hpp
index 0ccaf729ad..6329bdabc1 100644
--- a/components/resource/foreachbulletobject.hpp
+++ b/components/resource/foreachbulletobject.hpp
@@ -42,7 +42,7 @@ namespace Resource
 
     void forEachBulletObject(ESM::ReadersCache& readers, const VFS::Manager& vfs,
         Resource::BulletShapeManager& bulletShapeManager, const EsmLoader::EsmData& esmData,
-        std::function<void (const ESM::Cell&, const BulletObject& object)> callback);
+        std::function<void(const ESM::Cell&, const BulletObject& object)> callback);
 }
 
 #endif
diff --git a/components/resource/imagemanager.cpp b/components/resource/imagemanager.cpp
index ef90353a73..917cdf802f 100644
--- a/components/resource/imagemanager.cpp
+++ b/components/resource/imagemanager.cpp
@@ -29,13 +29,13 @@ namespace
 
         int width = 8, height = 8;
         warningImage->allocateImage(width, height, 1, GL_RGB, GL_UNSIGNED_BYTE);
-        assert (warningImage->isDataContiguous());
+        assert(warningImage->isDataContiguous());
         unsigned char* data = warningImage->data();
-        for (int i=0;i<width*height;++i)
+        for (int i = 0; i < width * height; ++i)
         {
-            data[3*i] = (255);
-            data[3*i+1] = (0);
-            data[3*i+2] = (255);
+            data[3 * i] = (255);
+            data[3 * i + 1] = (0);
+            data[3 * i + 2] = (255);
         }
         return warningImage;
     }
@@ -45,7 +45,7 @@ namespace
 namespace Resource
 {
 
-    ImageManager::ImageManager(const VFS::Manager *vfs)
+    ImageManager::ImageManager(const VFS::Manager* vfs)
         : ResourceManager(vfs)
         , mWarningImage(createWarningImage())
         , mOptions(new osgDB::Options("dds_flip dds_dxt1_detect_rgba ignoreTga2Fields"))
@@ -53,37 +53,37 @@ namespace Resource
     {
     }
 
-    ImageManager::~ImageManager()
-    {
-
-    }
+    ImageManager::~ImageManager() {}
 
     bool checkSupported(osg::Image* image, const std::string& filename)
     {
-        switch(image->getPixelFormat())
+        switch (image->getPixelFormat())
         {
-            case(GL_COMPRESSED_RGB_S3TC_DXT1_EXT):
-            case(GL_COMPRESSED_RGBA_S3TC_DXT1_EXT):
-            case(GL_COMPRESSED_RGBA_S3TC_DXT3_EXT):
-            case(GL_COMPRESSED_RGBA_S3TC_DXT5_EXT):
+            case (GL_COMPRESSED_RGB_S3TC_DXT1_EXT):
+            case (GL_COMPRESSED_RGBA_S3TC_DXT1_EXT):
+            case (GL_COMPRESSED_RGBA_S3TC_DXT3_EXT):
+            case (GL_COMPRESSED_RGBA_S3TC_DXT5_EXT):
             {
                 osg::GLExtensions* exts = osg::GLExtensions::Get(0, false);
-                if (exts && !exts->isTextureCompressionS3TCSupported
-                        // This one works too. Should it be included in isTextureCompressionS3TCSupported()? Submitted as a patch to OSG.
-                        && !osg::isGLExtensionSupported(0, "GL_S3_s3tc"))
+                if (exts
+                    && !exts->isTextureCompressionS3TCSupported
+                    // This one works too. Should it be included in isTextureCompressionS3TCSupported()? Submitted as a
+                    // patch to OSG.
+                    && !osg::isGLExtensionSupported(0, "GL_S3_s3tc"))
                 {
                     return false;
                 }
                 break;
             }
-            // not bothering with checks for other compression formats right now, we are unlikely to ever use those anyway
+            // not bothering with checks for other compression formats right now, we are unlikely to ever use those
+            // anyway
             default:
                 return true;
         }
         return true;
     }
 
-    osg::ref_ptr<osg::Image> ImageManager::getImage(const std::string &filename, bool disableFlip)
+    osg::ref_ptr<osg::Image> ImageManager::getImage(const std::string& filename, bool disableFlip)
     {
         const std::string normalized = mVFS->normalizeFilename(filename);
 
@@ -136,10 +136,12 @@ namespace Resource
                 stream->seekg(0);
             }
 
-            osgDB::ReaderWriter::ReadResult result = reader->readImage(*stream, disableFlip ? mOptionsNoFlip : mOptions);
+            osgDB::ReaderWriter::ReadResult result
+                = reader->readImage(*stream, disableFlip ? mOptionsNoFlip : mOptions);
             if (!result.success())
             {
-                Log(Debug::Error) << "Error loading " << filename << ": " << result.message() << " code " << result.status();
+                Log(Debug::Error) << "Error loading " << filename << ": " << result.message() << " code "
+                                  << result.status();
                 mCache->addEntryToObjectCache(normalized, mWarningImage);
                 return mWarningImage;
             }
@@ -152,7 +154,8 @@ namespace Resource
                 static bool uncompress = (getenv("OPENMW_DECOMPRESS_TEXTURES") != nullptr);
                 if (!uncompress)
                 {
-                    Log(Debug::Error) << "Error loading " << filename << ": no S3TC texture compression support installed";
+                    Log(Debug::Error) << "Error loading " << filename
+                                      << ": no S3TC texture compression support installed";
                     mCache->addEntryToObjectCache(normalized, mWarningImage);
                     return mWarningImage;
                 }
@@ -162,11 +165,12 @@ namespace Resource
                     // requires update to getColor() to be released with OSG 3.6
                     osg::ref_ptr<osg::Image> newImage = new osg::Image;
                     newImage->setFileName(image->getFileName());
-                    newImage->allocateImage(image->s(), image->t(), image->r(), image->isImageTranslucent() ? GL_RGBA : GL_RGB, GL_UNSIGNED_BYTE);
-                    for (int s=0; s<image->s(); ++s)
-                        for (int t=0; t<image->t(); ++t)
-                            for (int r=0; r<image->r(); ++r)
-                                newImage->setColor(image->getColor(s,t,r), s,t,r);
+                    newImage->allocateImage(image->s(), image->t(), image->r(),
+                        image->isImageTranslucent() ? GL_RGBA : GL_RGB, GL_UNSIGNED_BYTE);
+                    for (int s = 0; s < image->s(); ++s)
+                        for (int t = 0; t < image->t(); ++t)
+                            for (int r = 0; r < image->r(); ++r)
+                                newImage->setColor(image->getColor(s, t, r), s, t, r);
                     image = newImage;
                 }
             }
@@ -188,12 +192,12 @@ namespace Resource
         }
     }
 
-    osg::Image *ImageManager::getWarningImage()
+    osg::Image* ImageManager::getWarningImage()
     {
         return mWarningImage;
     }
 
-    void ImageManager::reportStats(unsigned int frameNumber, osg::Stats *stats) const
+    void ImageManager::reportStats(unsigned int frameNumber, osg::Stats* stats) const
     {
         stats->setAttribute(frameNumber, "Image", mCache->getCacheSize());
     }
diff --git a/components/resource/imagemanager.hpp b/components/resource/imagemanager.hpp
index 85ea69795a..32855d40df 100644
--- a/components/resource/imagemanager.hpp
+++ b/components/resource/imagemanager.hpp
@@ -1,12 +1,12 @@
 #ifndef OPENMW_COMPONENTS_RESOURCE_IMAGEMANAGER_H
 #define OPENMW_COMPONENTS_RESOURCE_IMAGEMANAGER_H
 
-#include <string>
 #include <map>
+#include <string>
 
-#include <osg/ref_ptr>
 #include <osg/Image>
 #include <osg/Texture2D>
+#include <osg/ref_ptr>
 
 #include "resourcemanager.hpp"
 
@@ -40,7 +40,7 @@ namespace Resource
         osg::ref_ptr<osgDB::Options> mOptionsNoFlip;
 
         ImageManager(const ImageManager&);
-        void operator = (const ImageManager&);
+        void operator=(const ImageManager&);
     };
 
 }
diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index b892ce3135..99139fbf38 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -8,11 +8,11 @@
 #include <osgAnimation/Channel>
 
 #include <components/debug/debuglog.hpp>
+#include <components/misc/pathhelpers.hpp>
+#include <components/misc/strings/algorithm.hpp>
 #include <components/nifosg/nifloader.hpp>
 #include <components/sceneutil/keyframe.hpp>
 #include <components/sceneutil/osgacontroller.hpp>
-#include <components/misc/pathhelpers.hpp>
-#include <components/misc/strings/algorithm.hpp>
 
 #include "animation.hpp"
 #include "objectcache.hpp"
@@ -21,75 +21,86 @@
 namespace Resource
 {
 
-    RetrieveAnimationsVisitor::RetrieveAnimationsVisitor(SceneUtil::KeyframeHolder& target, osg::ref_ptr<osgAnimation::BasicAnimationManager> animationManager,
-        const std::string& normalized, const VFS::Manager* vfs) :
-        osg::NodeVisitor(TRAVERSE_ALL_CHILDREN), mTarget(target), mAnimationManager(animationManager), mNormalized(normalized), mVFS(vfs) {}
+    RetrieveAnimationsVisitor::RetrieveAnimationsVisitor(SceneUtil::KeyframeHolder& target,
+        osg::ref_ptr<osgAnimation::BasicAnimationManager> animationManager, const std::string& normalized,
+        const VFS::Manager* vfs)
+        : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+        , mTarget(target)
+        , mAnimationManager(animationManager)
+        , mNormalized(normalized)
+        , mVFS(vfs)
+    {
+    }
 
     void RetrieveAnimationsVisitor::apply(osg::Node& node)
     {
         if (node.libraryName() == std::string_view("osgAnimation") && node.className() == std::string_view("Bone")
-                && Misc::StringUtils::lowerCase(node.getName()) == std::string_view("bip01"))
-            {
-                osg::ref_ptr<SceneUtil::OsgAnimationController> callback = new SceneUtil::OsgAnimationController();
+            && Misc::StringUtils::lowerCase(node.getName()) == std::string_view("bip01"))
+        {
+            osg::ref_ptr<SceneUtil::OsgAnimationController> callback = new SceneUtil::OsgAnimationController();
 
-                std::vector<SceneUtil::EmulatedAnimation> emulatedAnimations;
+            std::vector<SceneUtil::EmulatedAnimation> emulatedAnimations;
 
-                for (const auto& animation : mAnimationManager->getAnimationList())
+            for (const auto& animation : mAnimationManager->getAnimationList())
+            {
+                if (animation)
                 {
-                    if (animation)
+                    if (animation->getName()
+                        == "Default") //"Default" is osg dae plugin's default naming scheme for unnamed animations
                     {
-                        if (animation->getName() == "Default") //"Default" is osg dae plugin's default naming scheme for unnamed animations
-                        {
-                            animation->setName(std::string("idle")); // animation naming scheme "idle: start" and "idle: stop" is the default idle animation that OpenMW seems to want to play
-                        }
-
-                        osg::ref_ptr<Resource::Animation> mergedAnimationTrack = new Resource::Animation;
-                        const std::string animationName = animation->getName();
-                        mergedAnimationTrack->setName(animationName);
-
-                        const osgAnimation::ChannelList& channels = animation->getChannels();
-                        for (const auto& channel: channels)
-                        {
-                            mergedAnimationTrack->addChannel(channel.get()->clone()); // is ->clone needed?
-                        }
-
-                        callback->addMergedAnimationTrack(mergedAnimationTrack);
-
-                        float startTime = animation->getStartTime();
-                        float stopTime = startTime + animation->getDuration();
-
-                        SceneUtil::EmulatedAnimation emulatedAnimation;
-                        emulatedAnimation.mStartTime = startTime;
-                        emulatedAnimation.mStopTime = stopTime;
-                        emulatedAnimation.mName = animationName;
-                        emulatedAnimations.emplace_back(emulatedAnimation);
+                        animation->setName(
+                            std::string("idle")); // animation naming scheme "idle: start" and "idle: stop" is the
+                                                  // default idle animation that OpenMW seems to want to play
                     }
-                }
 
-                // mTextKeys is a nif-thing, used by OpenMW's animation system
-                // Format is likely "AnimationName: [Keyword_optional] [Start OR Stop]"
-                // AnimationNames are keywords like idle2, idle3... AiPackages and various mechanics control which animations are played
-                // Keywords can be stuff like Loop, Equip, Unequip, Block, InventoryHandtoHand, InventoryWeaponOneHand, PickProbe, Slash, Thrust, Chop... even "Slash Small Follow"
-                // osgAnimation formats should have a .txt file with the same name, each line holding a textkey and whitespace separated time value
-                // e.g. idle: start 0.0333
-                try
-                {
-                    Files::IStreamPtr textKeysFile = mVFS->get(changeFileExtension(mNormalized, "txt"));
-                    std::string line;
-                    while ( getline (*textKeysFile, line) )
+                    osg::ref_ptr<Resource::Animation> mergedAnimationTrack = new Resource::Animation;
+                    const std::string animationName = animation->getName();
+                    mergedAnimationTrack->setName(animationName);
+
+                    const osgAnimation::ChannelList& channels = animation->getChannels();
+                    for (const auto& channel : channels)
                     {
-                        mTarget.mTextKeys.emplace(parseTimeSignature(line), parseTextKey(line));
+                        mergedAnimationTrack->addChannel(channel.get()->clone()); // is ->clone needed?
                     }
+
+                    callback->addMergedAnimationTrack(mergedAnimationTrack);
+
+                    float startTime = animation->getStartTime();
+                    float stopTime = startTime + animation->getDuration();
+
+                    SceneUtil::EmulatedAnimation emulatedAnimation;
+                    emulatedAnimation.mStartTime = startTime;
+                    emulatedAnimation.mStopTime = stopTime;
+                    emulatedAnimation.mName = animationName;
+                    emulatedAnimations.emplace_back(emulatedAnimation);
                 }
-                catch (std::exception&)
+            }
+
+            // mTextKeys is a nif-thing, used by OpenMW's animation system
+            // Format is likely "AnimationName: [Keyword_optional] [Start OR Stop]"
+            // AnimationNames are keywords like idle2, idle3... AiPackages and various mechanics control which
+            // animations are played Keywords can be stuff like Loop, Equip, Unequip, Block, InventoryHandtoHand,
+            // InventoryWeaponOneHand, PickProbe, Slash, Thrust, Chop... even "Slash Small Follow" osgAnimation formats
+            // should have a .txt file with the same name, each line holding a textkey and whitespace separated time
+            // value e.g. idle: start 0.0333
+            try
+            {
+                Files::IStreamPtr textKeysFile = mVFS->get(changeFileExtension(mNormalized, "txt"));
+                std::string line;
+                while (getline(*textKeysFile, line))
                 {
-                    Log(Debug::Warning) << "No textkey file found for " << mNormalized;
+                    mTarget.mTextKeys.emplace(parseTimeSignature(line), parseTextKey(line));
                 }
-
-                callback->setEmulatedAnimations(emulatedAnimations);
-                mTarget.mKeyframeControllers.emplace(node.getName(), callback);
+            }
+            catch (std::exception&)
+            {
+                Log(Debug::Warning) << "No textkey file found for " << mNormalized;
             }
 
+            callback->setEmulatedAnimations(emulatedAnimations);
+            mTarget.mKeyframeControllers.emplace(node.getName(), callback);
+        }
+
         traverse(node);
     }
 
@@ -97,7 +108,7 @@ namespace Resource
     {
         size_t spacePos = line.find_last_of(' ');
         if (spacePos != std::string::npos)
-             return line.substr(0, spacePos);
+            return line.substr(0, spacePos);
         return "";
     }
 
@@ -106,14 +117,14 @@ namespace Resource
         size_t spacePos = line.find_last_of(' ');
         double time = 0.0;
         if (spacePos != std::string::npos && spacePos + 1 < line.size())
-             time = std::stod(line.substr(spacePos + 1));
+            time = std::stod(line.substr(spacePos + 1));
         return time;
     }
 
     std::string RetrieveAnimationsVisitor::changeFileExtension(const std::string& file, const std::string& ext)
     {
         size_t extPos = file.find_last_of('.');
-        if (extPos != std::string::npos && extPos+1 < file.size())
+        if (extPos != std::string::npos && extPos + 1 < file.size())
         {
             return file.substr(0, extPos + 1) + ext;
         }
@@ -131,11 +142,9 @@ namespace Resource
     {
     }
 
-    KeyframeManager::~KeyframeManager()
-    {
-    }
+    KeyframeManager::~KeyframeManager() {}
 
-    osg::ref_ptr<const SceneUtil::KeyframeHolder> KeyframeManager::get(const std::string &name)
+    osg::ref_ptr<const SceneUtil::KeyframeHolder> KeyframeManager::get(const std::string& name)
     {
         const std::string normalized = mVFS->normalizeFilename(name);
 
@@ -144,15 +153,17 @@ namespace Resource
             return osg::ref_ptr<const SceneUtil::KeyframeHolder>(static_cast<SceneUtil::KeyframeHolder*>(obj.get()));
         else
         {
-            osg::ref_ptr<SceneUtil::KeyframeHolder> loaded (new SceneUtil::KeyframeHolder);
+            osg::ref_ptr<SceneUtil::KeyframeHolder> loaded(new SceneUtil::KeyframeHolder);
             if (Misc::getFileExtension(normalized) == "kf")
             {
-                NifOsg::Loader::loadKf(Nif::NIFFilePtr(new Nif::NIFFile(mVFS->getNormalized(normalized), normalized)), *loaded.get());
+                NifOsg::Loader::loadKf(
+                    Nif::NIFFilePtr(new Nif::NIFFile(mVFS->getNormalized(normalized), normalized)), *loaded.get());
             }
             else
             {
-                osg::ref_ptr<osg::Node> scene = const_cast<osg::Node*> ( mSceneManager->getTemplate(normalized).get() );
-                osg::ref_ptr<osgAnimation::BasicAnimationManager> bam = dynamic_cast<osgAnimation::BasicAnimationManager*> (scene->getUpdateCallback());
+                osg::ref_ptr<osg::Node> scene = const_cast<osg::Node*>(mSceneManager->getTemplate(normalized).get());
+                osg::ref_ptr<osgAnimation::BasicAnimationManager> bam
+                    = dynamic_cast<osgAnimation::BasicAnimationManager*>(scene->getUpdateCallback());
                 if (bam)
                 {
                     Resource::RetrieveAnimationsVisitor rav(*loaded.get(), bam, normalized, mVFS);
@@ -164,11 +175,9 @@ namespace Resource
         }
     }
 
-    void KeyframeManager::reportStats(unsigned int frameNumber, osg::Stats *stats) const
+    void KeyframeManager::reportStats(unsigned int frameNumber, osg::Stats* stats) const
     {
         stats->setAttribute(frameNumber, "Keyframe", mCache->getCacheSize());
     }
 
-
-
 }
diff --git a/components/resource/keyframemanager.hpp b/components/resource/keyframemanager.hpp
index 75c9cc6ff4..2ed1696def 100644
--- a/components/resource/keyframemanager.hpp
+++ b/components/resource/keyframemanager.hpp
@@ -14,23 +14,22 @@ namespace Resource
     /// @brief extract animations to OpenMW's animation system
     class RetrieveAnimationsVisitor : public osg::NodeVisitor
     {
-        public:
-            RetrieveAnimationsVisitor(SceneUtil::KeyframeHolder& target, osg::ref_ptr<osgAnimation::BasicAnimationManager> animationManager,
-                const std::string& normalized, const VFS::Manager* vfs);
-
-            virtual void apply(osg::Node& node) override;
-
-        private:
-
-            std::string changeFileExtension(const std::string& file, const std::string& ext);
-            std::string parseTextKey(const std::string& line);
-            double parseTimeSignature(const std::string& line);
+    public:
+        RetrieveAnimationsVisitor(SceneUtil::KeyframeHolder& target,
+            osg::ref_ptr<osgAnimation::BasicAnimationManager> animationManager, const std::string& normalized,
+            const VFS::Manager* vfs);
 
-            SceneUtil::KeyframeHolder& mTarget;
-            osg::ref_ptr<osgAnimation::BasicAnimationManager> mAnimationManager;
-            std::string mNormalized;
-            const VFS::Manager* mVFS;
+        virtual void apply(osg::Node& node) override;
 
+    private:
+        std::string changeFileExtension(const std::string& file, const std::string& ext);
+        std::string parseTextKey(const std::string& line);
+        double parseTimeSignature(const std::string& line);
+
+        SceneUtil::KeyframeHolder& mTarget;
+        osg::ref_ptr<osgAnimation::BasicAnimationManager> mAnimationManager;
+        std::string mNormalized;
+        const VFS::Manager* mVFS;
     };
 }
 
@@ -52,6 +51,7 @@ namespace Resource
         osg::ref_ptr<const SceneUtil::KeyframeHolder> get(const std::string& name);
 
         void reportStats(unsigned int frameNumber, osg::Stats* stats) const override;
+
     private:
         SceneManager* mSceneManager;
     };
diff --git a/components/resource/multiobjectcache.cpp b/components/resource/multiobjectcache.cpp
index 9d75d2480a..f94dabc77c 100644
--- a/components/resource/multiobjectcache.cpp
+++ b/components/resource/multiobjectcache.cpp
@@ -7,25 +7,19 @@
 namespace Resource
 {
 
-    MultiObjectCache::MultiObjectCache()
-    {
-
-    }
+    MultiObjectCache::MultiObjectCache() {}
 
-    MultiObjectCache::~MultiObjectCache()
-    {
-
-    }
+    MultiObjectCache::~MultiObjectCache() {}
 
     void MultiObjectCache::removeUnreferencedObjectsInCache()
     {
-        std::vector<osg::ref_ptr<osg::Object> > objectsToRemove;
+        std::vector<osg::ref_ptr<osg::Object>> objectsToRemove;
         {
             std::lock_guard<std::mutex> lock(_objectCacheMutex);
 
             // Remove unreferenced entries from object cache
             ObjectCacheMap::iterator oitr = _objectCache.begin();
-            while(oitr != _objectCache.end())
+            while (oitr != _objectCache.end())
             {
                 if (oitr->second->referenceCount() <= 1)
                 {
@@ -49,7 +43,7 @@ namespace Resource
         _objectCache.clear();
     }
 
-    void MultiObjectCache::addEntryToObjectCache(const std::string &filename, osg::Object *object)
+    void MultiObjectCache::addEntryToObjectCache(const std::string& filename, osg::Object* object)
     {
         if (!object)
         {
@@ -60,7 +54,7 @@ namespace Resource
         _objectCache.insert(std::make_pair(filename, object));
     }
 
-    osg::ref_ptr<osg::Object> MultiObjectCache::takeFromObjectCache(const std::string &fileName)
+    osg::ref_ptr<osg::Object> MultiObjectCache::takeFromObjectCache(const std::string& fileName)
     {
         std::lock_guard<std::mutex> lock(_objectCacheMutex);
         ObjectCacheMap::iterator found = _objectCache.find(fileName);
@@ -74,13 +68,11 @@ namespace Resource
         }
     }
 
-    void MultiObjectCache::releaseGLObjects(osg::State *state)
+    void MultiObjectCache::releaseGLObjects(osg::State* state)
     {
         std::lock_guard<std::mutex> lock(_objectCacheMutex);
 
-        for(ObjectCacheMap::iterator itr = _objectCache.begin();
-            itr != _objectCache.end();
-            ++itr)
+        for (ObjectCacheMap::iterator itr = _objectCache.begin(); itr != _objectCache.end(); ++itr)
         {
             osg::Object* object = itr->second.get();
             object->releaseGLObjects(state);
diff --git a/components/resource/multiobjectcache.hpp b/components/resource/multiobjectcache.hpp
index 543406ebd8..e1629f3197 100644
--- a/components/resource/multiobjectcache.hpp
+++ b/components/resource/multiobjectcache.hpp
@@ -2,11 +2,11 @@
 #define OPENMW_COMPONENTS_MULTIOBJECTCACHE_H
 
 #include <map>
-#include <string>
 #include <mutex>
+#include <string>
 
-#include <osg/ref_ptr>
 #include <osg/Referenced>
+#include <osg/ref_ptr>
 
 namespace osg
 {
@@ -40,12 +40,10 @@ namespace Resource
         unsigned int getCacheSize() const;
 
     protected:
+        typedef std::multimap<std::string, osg::ref_ptr<osg::Object>> ObjectCacheMap;
 
-        typedef std::multimap<std::string, osg::ref_ptr<osg::Object> >             ObjectCacheMap;
-
-        ObjectCacheMap                          _objectCache;
-        mutable std::mutex                      _objectCacheMutex;
-
+        ObjectCacheMap _objectCache;
+        mutable std::mutex _objectCacheMutex;
     };
 
 }
diff --git a/components/resource/niffilemanager.cpp b/components/resource/niffilemanager.cpp
index 3f63544e0a..29ed9a6b9c 100644
--- a/components/resource/niffilemanager.cpp
+++ b/components/resource/niffilemanager.cpp
@@ -24,41 +24,35 @@ namespace Resource
         {
         }
 
-        NifFileHolder()
-        {
-        }
+        NifFileHolder() {}
 
         META_Object(Resource, NifFileHolder)
 
         Nif::NIFFilePtr mNifFile;
     };
 
-    NifFileManager::NifFileManager(const VFS::Manager *vfs)
+    NifFileManager::NifFileManager(const VFS::Manager* vfs)
         : ResourceManager(vfs)
     {
     }
 
-    NifFileManager::~NifFileManager()
-    {
-
-    }
-
+    NifFileManager::~NifFileManager() {}
 
-    Nif::NIFFilePtr NifFileManager::get(const std::string &name)
+    Nif::NIFFilePtr NifFileManager::get(const std::string& name)
     {
         osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(name);
         if (obj)
             return static_cast<NifFileHolder*>(obj.get())->mNifFile;
         else
         {
-            Nif::NIFFilePtr file (new Nif::NIFFile(mVFS->get(name), name));
+            Nif::NIFFilePtr file(new Nif::NIFFile(mVFS->get(name), name));
             obj = new NifFileHolder(file);
             mCache->addEntryToObjectCache(name, obj);
             return file;
         }
     }
 
-    void NifFileManager::reportStats(unsigned int frameNumber, osg::Stats *stats) const
+    void NifFileManager::reportStats(unsigned int frameNumber, osg::Stats* stats) const
     {
         stats->setAttribute(frameNumber, "Nif", mCache->getCacheSize());
     }
diff --git a/components/resource/niffilemanager.hpp b/components/resource/niffilemanager.hpp
index d88aefd63e..1dca680ed4 100644
--- a/components/resource/niffilemanager.hpp
+++ b/components/resource/niffilemanager.hpp
@@ -23,7 +23,7 @@ namespace Resource
         /// to be done in advance by other managers accessing the NifFileManager.
         Nif::NIFFilePtr get(const std::string& name);
 
-        void reportStats(unsigned int frameNumber, osg::Stats *stats) const override;
+        void reportStats(unsigned int frameNumber, osg::Stats* stats) const override;
     };
 
 }
diff --git a/components/resource/objectcache.hpp b/components/resource/objectcache.hpp
index 5c4b511f0a..65b2606b06 100644
--- a/components/resource/objectcache.hpp
+++ b/components/resource/objectcache.hpp
@@ -15,18 +15,18 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * OpenSceneGraph Public License for more details.
-*/
+ */
 
 #ifndef OPENMW_COMPONENTS_RESOURCE_OBJECTCACHE
 #define OPENMW_COMPONENTS_RESOURCE_OBJECTCACHE
 
+#include <osg/Node>
 #include <osg/Referenced>
 #include <osg/ref_ptr>
-#include <osg/Node>
 
-#include <string>
 #include <map>
 #include <mutex>
+#include <string>
 
 namespace osg
 {
@@ -35,49 +35,51 @@ namespace osg
     class NodeVisitor;
 }
 
-namespace Resource {
-
-template <typename KeyType>
-class GenericObjectCache : public osg::Referenced
+namespace Resource
 {
-    public:
 
+    template <typename KeyType>
+    class GenericObjectCache : public osg::Referenced
+    {
+    public:
         GenericObjectCache()
-            : osg::Referenced(true) {}
+            : osg::Referenced(true)
+        {
+        }
 
         /** For each object in the cache which has an reference count greater than 1
-          * (and therefore referenced by elsewhere in the application) set the time stamp
-          * for that object in the cache to specified time.
-          * This would typically be called once per frame by applications which are doing database paging,
-          * and need to prune objects that are no longer required.
-          * The time used should be taken from the FrameStamp::getReferenceTime().*/
+         * (and therefore referenced by elsewhere in the application) set the time stamp
+         * for that object in the cache to specified time.
+         * This would typically be called once per frame by applications which are doing database paging,
+         * and need to prune objects that are no longer required.
+         * The time used should be taken from the FrameStamp::getReferenceTime().*/
         void updateTimeStampOfObjectsInCacheWithExternalReferences(double referenceTime)
         {
             // look for objects with external references and update their time stamp.
             std::lock_guard<std::mutex> lock(_objectCacheMutex);
-            for(typename ObjectCacheMap::iterator itr=_objectCache.begin(); itr!=_objectCache.end(); ++itr)
+            for (typename ObjectCacheMap::iterator itr = _objectCache.begin(); itr != _objectCache.end(); ++itr)
             {
                 // If ref count is greater than 1, the object has an external reference.
                 // If the timestamp is yet to be initialized, it needs to be updated too.
-                if (itr->second.first->referenceCount()>1 || itr->second.second == 0.0)
+                if (itr->second.first->referenceCount() > 1 || itr->second.second == 0.0)
                     itr->second.second = referenceTime;
             }
         }
 
         /** Removed object in the cache which have a time stamp at or before the specified expiry time.
-          * This would typically be called once per frame by applications which are doing database paging,
-          * and need to prune objects that are no longer required, and called after the a called
-          * after the call to updateTimeStampOfObjectsInCacheWithExternalReferences(expirtyTime).*/
+         * This would typically be called once per frame by applications which are doing database paging,
+         * and need to prune objects that are no longer required, and called after the a called
+         * after the call to updateTimeStampOfObjectsInCacheWithExternalReferences(expirtyTime).*/
         void removeExpiredObjectsInCache(double expiryTime)
         {
-            std::vector<osg::ref_ptr<osg::Object> > objectsToRemove;
+            std::vector<osg::ref_ptr<osg::Object>> objectsToRemove;
             {
                 std::lock_guard<std::mutex> lock(_objectCacheMutex);
                 // Remove expired entries from object cache
                 typename ObjectCacheMap::iterator oitr = _objectCache.begin();
-                while(oitr != _objectCache.end())
+                while (oitr != _objectCache.end())
                 {
-                    if (oitr->second.second<=expiryTime)
+                    if (oitr->second.second <= expiryTime)
                     {
                         objectsToRemove.push_back(oitr->second.first);
                         _objectCache.erase(oitr++);
@@ -101,7 +103,7 @@ class GenericObjectCache : public osg::Referenced
         void addEntryToObjectCache(const KeyType& key, osg::Object* object, double timestamp = 0.0)
         {
             std::lock_guard<std::mutex> lock(_objectCacheMutex);
-            _objectCache[key]=ObjectTimeStampPair(object,timestamp);
+            _objectCache[key] = ObjectTimeStampPair(object, timestamp);
         }
 
         /** Remove Object from cache.*/
@@ -109,7 +111,8 @@ class GenericObjectCache : public osg::Referenced
         {
             std::lock_guard<std::mutex> lock(_objectCacheMutex);
             typename ObjectCacheMap::iterator itr = _objectCache.find(key);
-            if (itr!=_objectCache.end()) _objectCache.erase(itr);
+            if (itr != _objectCache.end())
+                _objectCache.erase(itr);
         }
 
         /** Get an ref_ptr<Object> from the object cache*/
@@ -117,9 +120,10 @@ class GenericObjectCache : public osg::Referenced
         {
             std::lock_guard<std::mutex> lock(_objectCacheMutex);
             typename ObjectCacheMap::iterator itr = _objectCache.find(key);
-            if (itr!=_objectCache.end())
+            if (itr != _objectCache.end())
                 return itr->second.first;
-            else return nullptr;
+            else
+                return nullptr;
         }
 
         /** Check if an object is in the cache, and if it is, update its usage time stamp. */
@@ -127,19 +131,20 @@ class GenericObjectCache : public osg::Referenced
         {
             std::lock_guard<std::mutex> lock(_objectCacheMutex);
             typename ObjectCacheMap::iterator itr = _objectCache.find(key);
-            if (itr!=_objectCache.end())
+            if (itr != _objectCache.end())
             {
                 itr->second.second = timeStamp;
                 return true;
             }
-            else return false;
+            else
+                return false;
         }
 
         /** call releaseGLObjects on all objects attached to the object cache.*/
         void releaseGLObjects(osg::State* state)
         {
             std::lock_guard<std::mutex> lock(_objectCacheMutex);
-            for(typename ObjectCacheMap::iterator itr = _objectCache.begin(); itr != _objectCache.end(); ++itr)
+            for (typename ObjectCacheMap::iterator itr = _objectCache.begin(); itr != _objectCache.end(); ++itr)
             {
                 osg::Object* object = itr->second.first.get();
                 object->releaseGLObjects(state);
@@ -150,7 +155,7 @@ class GenericObjectCache : public osg::Referenced
         void accept(osg::NodeVisitor& nv)
         {
             std::lock_guard<std::mutex> lock(_objectCacheMutex);
-            for(typename ObjectCacheMap::iterator itr = _objectCache.begin(); itr != _objectCache.end(); ++itr)
+            for (typename ObjectCacheMap::iterator itr = _objectCache.begin(); itr != _objectCache.end(); ++itr)
             {
                 osg::Object* object = itr->second.first.get();
                 if (object)
@@ -179,20 +184,18 @@ class GenericObjectCache : public osg::Referenced
         }
 
     protected:
-
         virtual ~GenericObjectCache() {}
 
-        typedef std::pair<osg::ref_ptr<osg::Object>, double >           ObjectTimeStampPair;
-        typedef std::map<KeyType, ObjectTimeStampPair >             ObjectCacheMap;
-
-        ObjectCacheMap                          _objectCache;
-        mutable std::mutex                      _objectCacheMutex;
+        typedef std::pair<osg::ref_ptr<osg::Object>, double> ObjectTimeStampPair;
+        typedef std::map<KeyType, ObjectTimeStampPair> ObjectCacheMap;
 
-};
+        ObjectCacheMap _objectCache;
+        mutable std::mutex _objectCacheMutex;
+    };
 
-class ObjectCache : public GenericObjectCache<std::string>
-{
-};
+    class ObjectCache : public GenericObjectCache<std::string>
+    {
+    };
 
 }
 
diff --git a/components/resource/resourcemanager.hpp b/components/resource/resourcemanager.hpp
index b2b71f4635..655076e65b 100644
--- a/components/resource/resourcemanager.hpp
+++ b/components/resource/resourcemanager.hpp
@@ -31,7 +31,8 @@ namespace Resource
     };
 
     /// @brief Base class for managers that require a virtual file system and object cache.
-    /// @par This base class implements clearing of the cache, but populating it and what it's used for is up to the individual sub classes.
+    /// @par This base class implements clearing of the cache, but populating it and what it's used for is up to the
+    /// individual sub classes.
     template <class KeyType>
     class GenericResourceManager : public BaseResourceManager
     {
@@ -58,7 +59,7 @@ namespace Resource
         void clearCache() override { mCache->clear(); }
 
         /// How long to keep objects in cache after no longer being referenced.
-        void setExpiryDelay (double expiryDelay) override { mExpiryDelay = expiryDelay; }
+        void setExpiryDelay(double expiryDelay) override { mExpiryDelay = expiryDelay; }
         float getExpiryDelay() const { return mExpiryDelay; }
 
         const VFS::Manager* getVFS() const { return mVFS; }
@@ -73,11 +74,13 @@ namespace Resource
         double mExpiryDelay;
     };
 
-
     class ResourceManager : public GenericResourceManager<std::string>
     {
     public:
-        ResourceManager(const VFS::Manager* vfs) : GenericResourceManager<std::string>(vfs) {}
+        ResourceManager(const VFS::Manager* vfs)
+            : GenericResourceManager<std::string>(vfs)
+        {
+        }
     };
 
 }
diff --git a/components/resource/resourcesystem.cpp b/components/resource/resourcesystem.cpp
index a62dd0016a..1f3f6bf198 100644
--- a/components/resource/resourcesystem.cpp
+++ b/components/resource/resourcesystem.cpp
@@ -2,15 +2,15 @@
 
 #include <algorithm>
 
-#include "scenemanager.hpp"
 #include "imagemanager.hpp"
-#include "niffilemanager.hpp"
 #include "keyframemanager.hpp"
+#include "niffilemanager.hpp"
+#include "scenemanager.hpp"
 
 namespace Resource
 {
 
-    ResourceSystem::ResourceSystem(const VFS::Manager *vfs)
+    ResourceSystem::ResourceSystem(const VFS::Manager* vfs)
         : mVFS(vfs)
     {
         mNifFileManager = std::make_unique<NifFileManager>(vfs);
@@ -54,7 +54,8 @@ namespace Resource
 
     void ResourceSystem::setExpiryDelay(double expiryDelay)
     {
-        for (std::vector<BaseResourceManager*>::iterator it = mResourceManagers.begin(); it != mResourceManagers.end(); ++it)
+        for (std::vector<BaseResourceManager*>::iterator it = mResourceManagers.begin(); it != mResourceManagers.end();
+             ++it)
             (*it)->setExpiryDelay(expiryDelay);
 
         // NIF files aren't needed any more once the converted objects are cached in SceneManager / BulletShapeManager,
@@ -64,24 +65,27 @@ namespace Resource
 
     void ResourceSystem::updateCache(double referenceTime)
     {
-        for (std::vector<BaseResourceManager*>::iterator it = mResourceManagers.begin(); it != mResourceManagers.end(); ++it)
+        for (std::vector<BaseResourceManager*>::iterator it = mResourceManagers.begin(); it != mResourceManagers.end();
+             ++it)
             (*it)->updateCache(referenceTime);
     }
 
     void ResourceSystem::clearCache()
     {
-        for (std::vector<BaseResourceManager*>::iterator it = mResourceManagers.begin(); it != mResourceManagers.end(); ++it)
+        for (std::vector<BaseResourceManager*>::iterator it = mResourceManagers.begin(); it != mResourceManagers.end();
+             ++it)
             (*it)->clearCache();
     }
 
-    void ResourceSystem::addResourceManager(BaseResourceManager *resourceMgr)
+    void ResourceSystem::addResourceManager(BaseResourceManager* resourceMgr)
     {
         mResourceManagers.push_back(resourceMgr);
     }
 
-    void ResourceSystem::removeResourceManager(BaseResourceManager *resourceMgr)
+    void ResourceSystem::removeResourceManager(BaseResourceManager* resourceMgr)
     {
-        std::vector<BaseResourceManager*>::iterator found = std::find(mResourceManagers.begin(), mResourceManagers.end(), resourceMgr);
+        std::vector<BaseResourceManager*>::iterator found
+            = std::find(mResourceManagers.begin(), mResourceManagers.end(), resourceMgr);
         if (found != mResourceManagers.end())
             mResourceManagers.erase(found);
     }
@@ -91,15 +95,17 @@ namespace Resource
         return mVFS;
     }
 
-    void ResourceSystem::reportStats(unsigned int frameNumber, osg::Stats *stats) const
+    void ResourceSystem::reportStats(unsigned int frameNumber, osg::Stats* stats) const
     {
-        for (std::vector<BaseResourceManager*>::const_iterator it = mResourceManagers.begin(); it != mResourceManagers.end(); ++it)
+        for (std::vector<BaseResourceManager*>::const_iterator it = mResourceManagers.begin();
+             it != mResourceManagers.end(); ++it)
             (*it)->reportStats(frameNumber, stats);
     }
 
-    void ResourceSystem::releaseGLObjects(osg::State *state)
+    void ResourceSystem::releaseGLObjects(osg::State* state)
     {
-        for (std::vector<BaseResourceManager*>::const_iterator it = mResourceManagers.begin(); it != mResourceManagers.end(); ++it)
+        for (std::vector<BaseResourceManager*>::const_iterator it = mResourceManagers.begin();
+             it != mResourceManagers.end(); ++it)
             (*it)->releaseGLObjects(state);
     }
 
diff --git a/components/resource/resourcesystem.hpp b/components/resource/resourcesystem.hpp
index db8bbafc96..72440d17ee 100644
--- a/components/resource/resourcesystem.hpp
+++ b/components/resource/resourcesystem.hpp
@@ -38,7 +38,8 @@ namespace Resource
         NifFileManager* getNifFileManager();
         KeyframeManager* getKeyframeManager();
 
-        /// Indicates to each resource manager to clear the cache, i.e. to drop cached objects that are no longer referenced.
+        /// Indicates to each resource manager to clear the cache, i.e. to drop cached objects that are no longer
+        /// referenced.
         /// @note May be called from any thread if you do not add or remove resource managers at that point.
         void updateCache(double referenceTime);
 
@@ -77,7 +78,7 @@ namespace Resource
         const VFS::Manager* mVFS;
 
         ResourceSystem(const ResourceSystem&);
-        void operator = (const ResourceSystem&);
+        void operator=(const ResourceSystem&);
     };
 
 }
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index f66337df99..e686de79fa 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -15,49 +15,50 @@
 #include <osgUtil/IncrementalCompileOperation>
 
 #include <osgDB/FileUtils>
-#include <osgDB/SharedStateManager>
 #include <osgDB/Registry>
+#include <osgDB/SharedStateManager>
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/nifosg/nifloader.hpp>
 #include <components/nifosg/controller.hpp>
+#include <components/nifosg/nifloader.hpp>
 
 #include <components/nif/niffile.hpp>
 
-#include <components/misc/pathhelpers.hpp>
-#include <components/misc/strings/algorithm.hpp>
 #include <components/misc/algorithm.hpp>
 #include <components/misc/osguservalues.hpp>
+#include <components/misc/pathhelpers.hpp>
+#include <components/misc/strings/algorithm.hpp>
 
 #include <components/vfs/manager.hpp>
 
 #include <components/sceneutil/clone.hpp>
-#include <components/sceneutil/util.hpp>
 #include <components/sceneutil/controller.hpp>
-#include <components/sceneutil/optimizer.hpp>
-#include <components/sceneutil/visitor.hpp>
-#include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/depth.hpp>
-#include <components/sceneutil/riggeometryosgaextension.hpp>
 #include <components/sceneutil/extradata.hpp>
+#include <components/sceneutil/lightmanager.hpp>
+#include <components/sceneutil/optimizer.hpp>
+#include <components/sceneutil/riggeometryosgaextension.hpp>
+#include <components/sceneutil/util.hpp>
+#include <components/sceneutil/visitor.hpp>
 
-#include <components/shader/shadervisitor.hpp>
 #include <components/shader/shadermanager.hpp>
+#include <components/shader/shadervisitor.hpp>
 
+#include <components/files/conversion.hpp>
 #include <components/files/hash.hpp>
 #include <components/files/memorystream.hpp>
-#include <components/files/conversion.hpp>
 
+#include "errormarker.hpp"
 #include "imagemanager.hpp"
 #include "niffilemanager.hpp"
 #include "objectcache.hpp"
-#include "errormarker.hpp"
 
 namespace
 {
 
-    class InitWorldSpaceParticlesCallback : public SceneUtil::NodeCallback<InitWorldSpaceParticlesCallback, osgParticle::ParticleSystem*>
+    class InitWorldSpaceParticlesCallback
+        : public SceneUtil::NodeCallback<InitWorldSpaceParticlesCallback, osgParticle::ParticleSystem*>
     {
     public:
         void operator()(osgParticle::ParticleSystem* node, osg::NodeVisitor* nv)
@@ -76,7 +77,7 @@ namespace
                 return;
             osg::Matrixf worldMat = osg::computeLocalToWorld(nodepaths[0]);
             worldMat.orthoNormalize(worldMat); // scale is already applied on the particle node
-            for (int i=0; i<partsys->numParticles(); ++i)
+            for (int i = 0; i < partsys->numParticles(); ++i)
             {
                 partsys->getParticle(i)->transformPositionVelocity(worldMat);
             }
@@ -88,7 +89,6 @@ namespace
             box.expandBy(sphere);
             partsys->setInitialBound(box);
         }
-
     };
 
     class InitParticlesVisitor : public osg::NodeVisitor
@@ -104,9 +104,8 @@ namespace
         bool isWorldSpaceParticleSystem(osgParticle::ParticleSystem* partsys)
         {
             // HACK: ParticleSystem has no getReferenceFrame()
-            return (partsys->getUserDataContainer()
-                    && partsys->getUserDataContainer()->getNumDescriptions() > 0
-                    && partsys->getUserDataContainer()->getDescriptions()[0] == "worldspace");
+            return (partsys->getUserDataContainer() && partsys->getUserDataContainer()->getNumDescriptions() > 0
+                && partsys->getUserDataContainer()->getDescriptions()[0] == "worldspace");
         }
 
         void apply(osg::Drawable& drw) override
@@ -136,15 +135,9 @@ namespace Resource
     class SharedStateManager : public osgDB::SharedStateManager
     {
     public:
-        unsigned int getNumSharedTextures() const
-        {
-            return _sharedTextureList.size();
-        }
+        unsigned int getNumSharedTextures() const { return _sharedTextureList.size(); }
 
-        unsigned int getNumSharedStateSets() const
-        {
-            return _sharedStateSetList.size();
-        }
+        unsigned int getNumSharedStateSets() const { return _sharedStateSetList.size(); }
 
         void clearCache()
         {
@@ -158,7 +151,8 @@ namespace Resource
     class SetFilterSettingsControllerVisitor : public SceneUtil::ControllerVisitor
     {
     public:
-        SetFilterSettingsControllerVisitor(osg::Texture::FilterMode minFilter, osg::Texture::FilterMode magFilter, int maxAnisotropy)
+        SetFilterSettingsControllerVisitor(
+            osg::Texture::FilterMode minFilter, osg::Texture::FilterMode magFilter, int maxAnisotropy)
             : mMinFilter(minFilter)
             , mMagFilter(magFilter)
             , mMaxAnisotropy(maxAnisotropy)
@@ -169,7 +163,8 @@ namespace Resource
         {
             if (NifOsg::FlipController* flipctrl = dynamic_cast<NifOsg::FlipController*>(&ctrl))
             {
-                for (std::vector<osg::ref_ptr<osg::Texture2D> >::iterator it = flipctrl->getTextures().begin(); it != flipctrl->getTextures().end(); ++it)
+                for (std::vector<osg::ref_ptr<osg::Texture2D>>::iterator it = flipctrl->getTextures().begin();
+                     it != flipctrl->getTextures().end(); ++it)
                 {
                     osg::Texture* tex = *it;
                     tex->setFilter(osg::Texture::MIN_FILTER, mMinFilter);
@@ -189,7 +184,8 @@ namespace Resource
     class SetFilterSettingsVisitor : public osg::NodeVisitor
     {
     public:
-        SetFilterSettingsVisitor(osg::Texture::FilterMode minFilter, osg::Texture::FilterMode magFilter, int maxAnisotropy)
+        SetFilterSettingsVisitor(
+            osg::Texture::FilterMode minFilter, osg::Texture::FilterMode magFilter, int maxAnisotropy)
             : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
             , mMinFilter(minFilter)
             , mMagFilter(magFilter)
@@ -209,9 +205,9 @@ namespace Resource
         void applyStateSet(osg::StateSet* stateset)
         {
             const osg::StateSet::TextureAttributeList& texAttributes = stateset->getTextureAttributeList();
-            for(unsigned int unit=0;unit<texAttributes.size();++unit)
+            for (unsigned int unit = 0; unit < texAttributes.size(); ++unit)
             {
-                osg::StateAttribute *texture = stateset->getTextureAttribute(unit, osg::StateAttribute::TEXTURE);
+                osg::StateAttribute* texture = stateset->getTextureAttribute(unit, osg::StateAttribute::TEXTURE);
                 if (texture)
                     applyStateAttribute(texture);
             }
@@ -227,6 +223,7 @@ namespace Resource
                 tex->setMaxAnisotropy(mMaxAnisotropy);
             }
         }
+
     private:
         osg::Texture::FilterMode mMinFilter;
         osg::Texture::FilterMode mMagFilter;
@@ -238,21 +235,29 @@ namespace Resource
     {
     public:
         ColladaDescriptionVisitor()
-            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN),
-            mSkeleton(nullptr)
+            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+            , mSkeleton(nullptr)
         {
         }
 
         osg::AlphaFunc::ComparisonFunction getTestMode(std::string mode)
         {
-            if (mode == "ALWAYS") return osg::AlphaFunc::ALWAYS;
-            if (mode == "LESS") return osg::AlphaFunc::LESS;
-            if (mode == "EQUAL") return osg::AlphaFunc::EQUAL;
-            if (mode == "LEQUAL") return osg::AlphaFunc::LEQUAL;
-            if (mode == "GREATER") return osg::AlphaFunc::GREATER;
-            if (mode == "NOTEQUAL") return osg::AlphaFunc::NOTEQUAL;
-            if (mode == "GEQUAL") return osg::AlphaFunc::GEQUAL;
-            if (mode == "NEVER") return osg::AlphaFunc::NEVER;
+            if (mode == "ALWAYS")
+                return osg::AlphaFunc::ALWAYS;
+            if (mode == "LESS")
+                return osg::AlphaFunc::LESS;
+            if (mode == "EQUAL")
+                return osg::AlphaFunc::EQUAL;
+            if (mode == "LEQUAL")
+                return osg::AlphaFunc::LEQUAL;
+            if (mode == "GREATER")
+                return osg::AlphaFunc::GREATER;
+            if (mode == "NOTEQUAL")
+                return osg::AlphaFunc::NOTEQUAL;
+            if (mode == "GEQUAL")
+                return osg::AlphaFunc::GEQUAL;
+            if (mode == "NEVER")
+                return osg::AlphaFunc::NEVER;
 
             Log(Debug::Warning) << "Unexpected alpha testing mode: " << mode;
             return osg::AlphaFunc::LEQUAL;
@@ -277,11 +282,11 @@ namespace Resource
                     stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
                 }
             }
-            /* Check if the <node> has <extra type="Node"> <technique profile="OpenSceneGraph"> <Descriptions> <Description>
-               correct format for OpenMW: <Description>alphatest mode value MaterialName</Description>
-                                      e.g <Description>alphatest GEQUAL 0.8 MyAlphaTestedMaterial</Description> */
+            /* Check if the <node> has <extra type="Node"> <technique profile="OpenSceneGraph"> <Descriptions>
+               <Description> correct format for OpenMW: <Description>alphatest mode value MaterialName</Description> e.g
+               <Description>alphatest GEQUAL 0.8 MyAlphaTestedMaterial</Description> */
             std::vector<std::string> descriptions = node.getDescriptions();
-            for (const auto & description : descriptions)
+            for (const auto& description : descriptions)
             {
                 mDescriptions.emplace_back(description);
             }
@@ -289,7 +294,7 @@ namespace Resource
             // Iterate each description, and see if the current node uses the specified material for alpha testing
             if (node.getStateSet())
             {
-                for (const auto & description : mDescriptions)
+                for (const auto& description : mDescriptions)
                 {
                     std::vector<std::string> descriptionParts;
                     std::istringstream descriptionStringStream(description);
@@ -303,7 +308,8 @@ namespace Resource
                         if (descriptionParts.at(0) == "alphatest")
                         {
                             osg::AlphaFunc::ComparisonFunction mode = getTestMode(descriptionParts.at(1));
-                            osg::ref_ptr<osg::AlphaFunc> alphaFunc (new osg::AlphaFunc(mode, std::stod(descriptionParts.at(2))));
+                            osg::ref_ptr<osg::AlphaFunc> alphaFunc(
+                                new osg::AlphaFunc(mode, std::stod(descriptionParts.at(2))));
                             node.getStateSet()->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
                         }
                     }
@@ -312,18 +318,22 @@ namespace Resource
                     {
                         SceneUtil::FindByClassVisitor osgaRigFinder("RigGeometryHolder");
                         node.accept(osgaRigFinder);
-                        for(osg::Node* foundRigNode : osgaRigFinder.mFoundNodes)
+                        for (osg::Node* foundRigNode : osgaRigFinder.mFoundNodes)
                         {
-                            if (SceneUtil::RigGeometryHolder* rigGeometryHolder = dynamic_cast<SceneUtil::RigGeometryHolder*> (foundRigNode))
-                                mRigGeometryHolders.emplace_back(osg::ref_ptr<SceneUtil::RigGeometryHolder> (rigGeometryHolder));
-                            else Log(Debug::Error) << "Converted RigGeometryHolder is of a wrong type.";
+                            if (SceneUtil::RigGeometryHolder* rigGeometryHolder
+                                = dynamic_cast<SceneUtil::RigGeometryHolder*>(foundRigNode))
+                                mRigGeometryHolders.emplace_back(
+                                    osg::ref_ptr<SceneUtil::RigGeometryHolder>(rigGeometryHolder));
+                            else
+                                Log(Debug::Error) << "Converted RigGeometryHolder is of a wrong type.";
                         }
 
                         if (!mRigGeometryHolders.empty())
                         {
                             osgAnimation::RigGeometry::FindNearestParentSkeleton skeletonFinder;
                             mRigGeometryHolders[0]->accept(skeletonFinder);
-                            if (skeletonFinder._root.valid()) mSkeleton = skeletonFinder._root;
+                            if (skeletonFinder._root.valid())
+                                mSkeleton = skeletonFinder._root;
                         }
                     }
                 }
@@ -331,14 +341,17 @@ namespace Resource
 
             traverse(node);
         }
-        private:
-            std::vector<std::string> mDescriptions;
-        public:
-            osgAnimation::Skeleton* mSkeleton; //pointer is valid only if the model is a bodypart, osg::ref_ptr<Skeleton>
-            std::vector<osg::ref_ptr<SceneUtil::RigGeometryHolder>> mRigGeometryHolders;
+
+    private:
+        std::vector<std::string> mDescriptions;
+
+    public:
+        osgAnimation::Skeleton* mSkeleton; // pointer is valid only if the model is a bodypart, osg::ref_ptr<Skeleton>
+        std::vector<osg::ref_ptr<SceneUtil::RigGeometryHolder>> mRigGeometryHolders;
     };
 
-    SceneManager::SceneManager(const VFS::Manager *vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
+    SceneManager::SceneManager(
+        const VFS::Manager* vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
         : ResourceManager(vfs)
         , mShaderManager(new Shader::ShaderManager)
         , mForceShaders(false)
@@ -370,7 +383,8 @@ namespace Resource
         return mForceShaders;
     }
 
-    void SceneManager::recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix, bool forceShadersForNode, const osg::Program* programTemplate)
+    void SceneManager::recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix,
+        bool forceShadersForNode, const osg::Program* programTemplate)
     {
         osg::ref_ptr<Shader::ShaderVisitor> shaderVisitor(createShaderVisitor(shaderPrefix));
         shaderVisitor->setAllowedToModifyStateSets(false);
@@ -382,7 +396,8 @@ namespace Resource
 
     void SceneManager::reinstateRemovedState(osg::ref_ptr<osg::Node> node)
     {
-        osg::ref_ptr<Shader::ReinstateRemovedStateVisitor> reinstateRemovedStateVisitor = new Shader::ReinstateRemovedStateVisitor(false);
+        osg::ref_ptr<Shader::ReinstateRemovedStateVisitor> reinstateRemovedStateVisitor
+            = new Shader::ReinstateRemovedStateVisitor(false);
         node->accept(*reinstateRemovedStateVisitor);
     }
 
@@ -401,12 +416,12 @@ namespace Resource
         mAutoUseNormalMaps = use;
     }
 
-    void SceneManager::setNormalMapPattern(const std::string &pattern)
+    void SceneManager::setNormalMapPattern(const std::string& pattern)
     {
         mNormalMapPattern = pattern;
     }
 
-    void SceneManager::setNormalHeightMapPattern(const std::string &pattern)
+    void SceneManager::setNormalHeightMapPattern(const std::string& pattern)
     {
         mNormalHeightMapPattern = pattern;
     }
@@ -416,7 +431,7 @@ namespace Resource
         mAutoUseSpecularMaps = use;
     }
 
-    void SceneManager::setSpecularMapPattern(const std::string &pattern)
+    void SceneManager::setSpecularMapPattern(const std::string& pattern)
     {
         mSpecularMapPattern = pattern;
     }
@@ -473,17 +488,17 @@ namespace Resource
         // this has to be defined in the .cpp file as we can't delete incomplete types
     }
 
-    Shader::ShaderManager &SceneManager::getShaderManager()
+    Shader::ShaderManager& SceneManager::getShaderManager()
     {
         return *mShaderManager.get();
     }
 
-    void SceneManager::setShaderPath(const std::filesystem::path &path)
+    void SceneManager::setShaderPath(const std::filesystem::path& path)
     {
         mShaderManager->setShaderPath(path);
     }
 
-    bool SceneManager::checkLoaded(const std::string &name, double timeStamp)
+    bool SceneManager::checkLoaded(const std::string& name, double timeStamp)
     {
         return mCache->checkInObjectCache(mVFS->normalizeFilename(name), timeStamp);
     }
@@ -507,7 +522,7 @@ namespace Resource
             try
             {
                 return osgDB::ReaderWriter::ReadResult(mImageManager->getImage(Files::pathToUnicodeString(filePath)),
-                                                       osgDB::ReaderWriter::ReadResult::FILE_LOADED);
+                    osgDB::ReaderWriter::ReadResult::FILE_LOADED);
             }
             catch (std::exception& e)
             {
@@ -521,23 +536,27 @@ namespace Resource
 
     namespace
     {
-        osg::ref_ptr<osg::Node> loadNonNif(const std::string& normalizedFilename, std::istream& model, Resource::ImageManager* imageManager)
+        osg::ref_ptr<osg::Node> loadNonNif(
+            const std::string& normalizedFilename, std::istream& model, Resource::ImageManager* imageManager)
         {
             auto ext = Misc::getFileExtension(normalizedFilename);
             osgDB::ReaderWriter* reader = osgDB::Registry::instance()->getReaderWriterForExtension(std::string(ext));
             if (!reader)
             {
                 std::stringstream errormsg;
-                errormsg << "Error loading " << normalizedFilename << ": no readerwriter for '" << ext << "' found" << std::endl;
+                errormsg << "Error loading " << normalizedFilename << ": no readerwriter for '" << ext << "' found"
+                         << std::endl;
                 throw std::runtime_error(errormsg.str());
             }
 
-            osg::ref_ptr<osgDB::Options> options (new osgDB::Options);
-            // Set a ReadFileCallback so that image files referenced in the model are read from our virtual file system instead of the osgDB.
-            // Note, for some formats (.obj/.mtl) that reference other (non-image) files a findFileCallback would be necessary.
-            // but findFileCallback does not support virtual files, so we can't implement it.
+            osg::ref_ptr<osgDB::Options> options(new osgDB::Options);
+            // Set a ReadFileCallback so that image files referenced in the model are read from our virtual file system
+            // instead of the osgDB. Note, for some formats (.obj/.mtl) that reference other (non-image) files a
+            // findFileCallback would be necessary. but findFileCallback does not support virtual files, so we can't
+            // implement it.
             options->setReadFileCallback(new ImageReadCallback(imageManager));
-            if (ext == "dae") options->setOptionString("daeUseSequencedTextureUnits");
+            if (ext == "dae")
+                options->setOptionString("daeUseSequencedTextureUnits");
 
             const std::array<std::uint64_t, 2> fileHash = Files::getHash(normalizedFilename, model);
 
@@ -545,7 +564,8 @@ namespace Resource
             if (!result.success())
             {
                 std::stringstream errormsg;
-                errormsg << "Error loading " << normalizedFilename << ": " << result.message() << " code " << result.status() << std::endl;
+                errormsg << "Error loading " << normalizedFilename << ": " << result.message() << " code "
+                         << result.status() << std::endl;
                 throw std::runtime_error(errormsg.str());
             }
 
@@ -561,16 +581,18 @@ namespace Resource
             // Recognize and convert osgAnimation::RigGeometry to OpenMW-optimized type
             SceneUtil::FindByClassVisitor rigFinder("RigGeometry");
             node->accept(rigFinder);
-            for(osg::Node* foundRigNode : rigFinder.mFoundNodes)
+            for (osg::Node* foundRigNode : rigFinder.mFoundNodes)
             {
                 if (foundRigNode->libraryName() == std::string("osgAnimation"))
                 {
-                    osgAnimation::RigGeometry* foundRigGeometry = static_cast<osgAnimation::RigGeometry*> (foundRigNode);
-                    osg::ref_ptr<SceneUtil::RigGeometryHolder> newRig = new SceneUtil::RigGeometryHolder(*foundRigGeometry, osg::CopyOp::DEEP_COPY_ALL);
+                    osgAnimation::RigGeometry* foundRigGeometry = static_cast<osgAnimation::RigGeometry*>(foundRigNode);
+                    osg::ref_ptr<SceneUtil::RigGeometryHolder> newRig
+                        = new SceneUtil::RigGeometryHolder(*foundRigGeometry, osg::CopyOp::DEEP_COPY_ALL);
 
-                    if (foundRigGeometry->getStateSet()) newRig->setStateSet(foundRigGeometry->getStateSet());
+                    if (foundRigGeometry->getStateSet())
+                        newRig->setStateSet(foundRigGeometry->getStateSet());
 
-                    if (osg::Group* parent = dynamic_cast<osg::Group*> (foundRigGeometry->getParent(0)))
+                    if (osg::Group* parent = dynamic_cast<osg::Group*>(foundRigGeometry->getParent(0)))
                     {
                         parent->removeChild(foundRigGeometry);
                         parent->addChild(newRig);
@@ -585,21 +607,25 @@ namespace Resource
 
                 if (colladaDescriptionVisitor.mSkeleton)
                 {
-                    if ( osg::Group* group = dynamic_cast<osg::Group*> (node) )
+                    if (osg::Group* group = dynamic_cast<osg::Group*>(node))
                     {
                         group->removeChildren(0, group->getNumChildren());
-                        for (osg::ref_ptr<SceneUtil::RigGeometryHolder> newRiggeometryHolder : colladaDescriptionVisitor.mRigGeometryHolders)
+                        for (osg::ref_ptr<SceneUtil::RigGeometryHolder> newRiggeometryHolder :
+                            colladaDescriptionVisitor.mRigGeometryHolders)
                         {
                             osg::ref_ptr<osg::MatrixTransform> backToOriginTrans = new osg::MatrixTransform();
 
-                            newRiggeometryHolder->getOrCreateUserDataContainer()->addUserObject(new TemplateRef(newRiggeometryHolder->getGeometry(0)));
-                            backToOriginTrans->getOrCreateUserDataContainer()->addUserObject(new TemplateRef(newRiggeometryHolder->getGeometry(0)));
+                            newRiggeometryHolder->getOrCreateUserDataContainer()->addUserObject(
+                                new TemplateRef(newRiggeometryHolder->getGeometry(0)));
+                            backToOriginTrans->getOrCreateUserDataContainer()->addUserObject(
+                                new TemplateRef(newRiggeometryHolder->getGeometry(0)));
 
                             newRiggeometryHolder->setBodyPart(true);
 
                             for (int i = 0; i < 2; ++i)
                             {
-                                if (newRiggeometryHolder->getGeometry(i)) newRiggeometryHolder->getGeometry(i)->setSkeleton(nullptr);
+                                if (newRiggeometryHolder->getGeometry(i))
+                                    newRiggeometryHolder->getGeometry(i)->setSkeleton(nullptr);
                             }
 
                             backToOriginTrans->addChild(newRiggeometryHolder);
@@ -610,7 +636,7 @@ namespace Resource
 
                 node->getOrCreateStateSet()->addUniform(new osg::Uniform("emissiveMult", 1.f));
                 node->getOrCreateStateSet()->addUniform(new osg::Uniform("specStrength", 1.f));
-                node->getOrCreateStateSet()->addUniform(new osg::Uniform("envMapColor", osg::Vec4f(1,1,1,1)));
+                node->getOrCreateStateSet()->addUniform(new osg::Uniform("envMapColor", osg::Vec4f(1, 1, 1, 1)));
                 node->getOrCreateStateSet()->addUniform(new osg::Uniform("useFalloff", false));
             }
 
@@ -683,7 +709,8 @@ namespace Resource
         }
     }
 
-    osg::ref_ptr<osg::Node> load (const std::string& normalizedFilename, const VFS::Manager* vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
+    osg::ref_ptr<osg::Node> load(const std::string& normalizedFilename, const VFS::Manager* vfs,
+        Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
     {
         auto ext = Misc::getFileExtension(normalizedFilename);
         if (ext == "nif")
@@ -706,34 +733,40 @@ namespace Resource
             return it != reservedNames.end();
         }
 
-        bool isOperationPermissibleForObjectImplementation(const SceneUtil::Optimizer* optimizer, const osg::Drawable* node,unsigned int option) const override
+        bool isOperationPermissibleForObjectImplementation(
+            const SceneUtil::Optimizer* optimizer, const osg::Drawable* node, unsigned int option) const override
         {
             if (option & SceneUtil::Optimizer::FLATTEN_STATIC_TRANSFORMS)
             {
                 if (node->asGeometry() && node->className() == std::string("Geometry"))
                     return true;
                 else
-                    return false; //ParticleSystem would have to convert space of all the processors, RigGeometry would have to convert bones... theoretically possible, but very complicated
+                    return false; // ParticleSystem would have to convert space of all the processors, RigGeometry would
+                                  // have to convert bones... theoretically possible, but very complicated
             }
-            return (option & optimizer->getPermissibleOptimizationsForObject(node))!=0;
+            return (option & optimizer->getPermissibleOptimizationsForObject(node)) != 0;
         }
 
-        bool isOperationPermissibleForObjectImplementation(const SceneUtil::Optimizer* optimizer, const osg::Node* node,unsigned int option) const override
+        bool isOperationPermissibleForObjectImplementation(
+            const SceneUtil::Optimizer* optimizer, const osg::Node* node, unsigned int option) const override
         {
-            if (node->getNumDescriptions()>0) return false;
-            if (node->getDataVariance() == osg::Object::DYNAMIC) return false;
-            if (isReservedName(node->getName())) return false;
+            if (node->getNumDescriptions() > 0)
+                return false;
+            if (node->getDataVariance() == osg::Object::DYNAMIC)
+                return false;
+            if (isReservedName(node->getName()))
+                return false;
 
-            return (option & optimizer->getPermissibleOptimizationsForObject(node))!=0;
+            return (option & optimizer->getPermissibleOptimizationsForObject(node)) != 0;
         }
     };
 
     bool canOptimize(const std::string& filename)
     {
         size_t slashpos = filename.find_last_of("\\/");
-        if (slashpos != std::string::npos && slashpos+1 < filename.size())
+        if (slashpos != std::string::npos && slashpos + 1 < filename.size())
         {
-            std::string basename = filename.substr(slashpos+1);
+            std::string basename = filename.substr(slashpos + 1);
             // xmesh.nif can not be optimized because there are keyframes added in post
             if (!basename.empty() && basename[0] == 'x')
                 return false;
@@ -744,7 +777,8 @@ namespace Resource
                 return false;
         }
 
-        // For spell VFX, DummyXX nodes must remain intact. Not adding those to reservedNames to avoid being overly cautious - instead, decide on filename
+        // For spell VFX, DummyXX nodes must remain intact. Not adding those to reservedNames to avoid being overly
+        // cautious - instead, decide on filename
         if (filename.find("vfx_pattern") != std::string::npos)
             return false;
         return true;
@@ -754,32 +788,41 @@ namespace Resource
     {
         using namespace SceneUtil;
         const char* env = getenv("OPENMW_OPTIMIZE");
-        unsigned int options = Optimizer::FLATTEN_STATIC_TRANSFORMS|Optimizer::REMOVE_REDUNDANT_NODES|Optimizer::MERGE_GEOMETRY;
+        unsigned int options
+            = Optimizer::FLATTEN_STATIC_TRANSFORMS | Optimizer::REMOVE_REDUNDANT_NODES | Optimizer::MERGE_GEOMETRY;
         if (env)
         {
             std::string str(env);
 
-            if(str.find("OFF")!=std::string::npos || str.find('0')!= std::string::npos) options = 0;
+            if (str.find("OFF") != std::string::npos || str.find('0') != std::string::npos)
+                options = 0;
 
-            if(str.find("~FLATTEN_STATIC_TRANSFORMS")!=std::string::npos) options ^= Optimizer::FLATTEN_STATIC_TRANSFORMS;
-            else if(str.find("FLATTEN_STATIC_TRANSFORMS")!=std::string::npos) options |= Optimizer::FLATTEN_STATIC_TRANSFORMS;
+            if (str.find("~FLATTEN_STATIC_TRANSFORMS") != std::string::npos)
+                options ^= Optimizer::FLATTEN_STATIC_TRANSFORMS;
+            else if (str.find("FLATTEN_STATIC_TRANSFORMS") != std::string::npos)
+                options |= Optimizer::FLATTEN_STATIC_TRANSFORMS;
 
-            if(str.find("~REMOVE_REDUNDANT_NODES")!=std::string::npos) options ^= Optimizer::REMOVE_REDUNDANT_NODES;
-            else if(str.find("REMOVE_REDUNDANT_NODES")!=std::string::npos) options |= Optimizer::REMOVE_REDUNDANT_NODES;
+            if (str.find("~REMOVE_REDUNDANT_NODES") != std::string::npos)
+                options ^= Optimizer::REMOVE_REDUNDANT_NODES;
+            else if (str.find("REMOVE_REDUNDANT_NODES") != std::string::npos)
+                options |= Optimizer::REMOVE_REDUNDANT_NODES;
 
-            if(str.find("~MERGE_GEOMETRY")!=std::string::npos) options ^= Optimizer::MERGE_GEOMETRY;
-            else if(str.find("MERGE_GEOMETRY")!=std::string::npos) options |= Optimizer::MERGE_GEOMETRY;
+            if (str.find("~MERGE_GEOMETRY") != std::string::npos)
+                options ^= Optimizer::MERGE_GEOMETRY;
+            else if (str.find("MERGE_GEOMETRY") != std::string::npos)
+                options |= Optimizer::MERGE_GEOMETRY;
         }
         return options;
     }
 
-    void SceneManager::shareState(osg::ref_ptr<osg::Node> node) {
+    void SceneManager::shareState(osg::ref_ptr<osg::Node> node)
+    {
         mSharedStateMutex.lock();
         mSharedStateManager->share(node.get());
         mSharedStateMutex.unlock();
     }
 
-    osg::ref_ptr<const osg::Node> SceneManager::getTemplate(const std::string &name, bool compile)
+    osg::ref_ptr<const osg::Node> SceneManager::getTemplate(const std::string& name, bool compile)
     {
         std::string normalized = mVFS->normalizeFilename(name);
 
@@ -801,7 +844,7 @@ namespace Resource
                 static osg::ref_ptr<osg::Node> errorMarkerNode = [&] {
                     static const char* const sMeshTypes[] = { "nif", "osg", "osgt", "osgb", "osgx", "osg2", "dae" };
 
-                    for (unsigned int i=0; i<sizeof(sMeshTypes)/sizeof(sMeshTypes[0]); ++i)
+                    for (unsigned int i = 0; i < sizeof(sMeshTypes) / sizeof(sMeshTypes[0]); ++i)
                     {
                         normalized = "meshes/marker_error." + std::string(sMeshTypes[i]);
                         if (mVFS->exists(normalized))
@@ -818,13 +861,14 @@ namespace Resource
             // set filtering settings
             SetFilterSettingsVisitor setFilterSettingsVisitor(mMinFilter, mMagFilter, mMaxAnisotropy);
             loaded->accept(setFilterSettingsVisitor);
-            SetFilterSettingsControllerVisitor setFilterSettingsControllerVisitor(mMinFilter, mMagFilter, mMaxAnisotropy);
+            SetFilterSettingsControllerVisitor setFilterSettingsControllerVisitor(
+                mMinFilter, mMagFilter, mMaxAnisotropy);
             loaded->accept(setFilterSettingsControllerVisitor);
 
             SceneUtil::ReplaceDepthVisitor replaceDepthVisitor;
             loaded->accept(replaceDepthVisitor);
 
-            osg::ref_ptr<Shader::ShaderVisitor> shaderVisitor (createShaderVisitor());
+            osg::ref_ptr<Shader::ShaderVisitor> shaderVisitor(createShaderVisitor());
             loaded->accept(*shaderVisitor);
 
             if (canOptimize(normalized))
@@ -833,7 +877,8 @@ namespace Resource
                 optimizer.setSharedStateManager(mSharedStateManager, &mSharedStateMutex);
                 optimizer.setIsOperationPermissibleForObjectCallback(new CanOptimizeCallback);
 
-                static const unsigned int options = getOptimizationOptions()|SceneUtil::Optimizer::SHARE_DUPLICATE_STATE;
+                static const unsigned int options
+                    = getOptimizationOptions() | SceneUtil::Optimizer::SHARE_DUPLICATE_STATE;
 
                 optimizer.optimize(loaded, options);
             }
@@ -863,43 +908,47 @@ namespace Resource
         {
             if (drawable->asGeometry())
             {
-                Log(Debug::Warning) << "SceneManager::cloneNode: attempting to clone osg::Geometry. For safety reasons this will be expensive. Consider avoiding this call.";
-                copyop.setCopyFlags(copyop.getCopyFlags()|osg::CopyOp::DEEP_COPY_ARRAYS|osg::CopyOp::DEEP_COPY_PRIMITIVES);
+                Log(Debug::Warning) << "SceneManager::cloneNode: attempting to clone osg::Geometry. For safety reasons "
+                                       "this will be expensive. Consider avoiding this call.";
+                copyop.setCopyFlags(
+                    copyop.getCopyFlags() | osg::CopyOp::DEEP_COPY_ARRAYS | osg::CopyOp::DEEP_COPY_PRIMITIVES);
             }
         }
         osg::ref_ptr<osg::Node> cloned = static_cast<osg::Node*>(base->clone(copyop));
         // add a ref to the original template to help verify the safety of shallow cloning operations
-        // in addition, if this node is managed by a cache, we hint to the cache that it's still being used and should be kept in cache
+        // in addition, if this node is managed by a cache, we hint to the cache that it's still being used and should
+        // be kept in cache
         cloned->getOrCreateUserDataContainer()->addUserObject(new TemplateRef(base));
         return cloned;
     }
 
-    osg::ref_ptr<osg::Node> SceneManager::getInstance(const osg::Node *base)
+    osg::ref_ptr<osg::Node> SceneManager::getInstance(const osg::Node* base)
     {
         osg::ref_ptr<osg::Node> cloned = cloneNode(base);
-        // we can skip any scene graphs without update callbacks since we know that particle emitters will have an update callback set
+        // we can skip any scene graphs without update callbacks since we know that particle emitters will have an
+        // update callback set
         if (cloned->getNumChildrenRequiringUpdateTraversal() > 0)
         {
-            InitParticlesVisitor visitor (mParticleSystemMask);
+            InitParticlesVisitor visitor(mParticleSystemMask);
             cloned->accept(visitor);
         }
 
         return cloned;
     }
 
-    osg::ref_ptr<osg::Node> SceneManager::getInstance(const std::string &name, osg::Group* parentNode)
+    osg::ref_ptr<osg::Node> SceneManager::getInstance(const std::string& name, osg::Group* parentNode)
     {
         osg::ref_ptr<osg::Node> cloned = getInstance(name);
         attachTo(cloned, parentNode);
         return cloned;
     }
 
-    void SceneManager::attachTo(osg::Node *instance, osg::Group *parentNode) const
+    void SceneManager::attachTo(osg::Node* instance, osg::Group* parentNode) const
     {
         parentNode->addChild(instance);
     }
 
-    void SceneManager::releaseGLObjects(osg::State *state)
+    void SceneManager::releaseGLObjects(osg::State* state)
     {
         mCache->releaseGLObjects(state);
 
@@ -909,12 +958,12 @@ namespace Resource
         mSharedStateManager->releaseGLObjects(state);
     }
 
-    void SceneManager::setIncrementalCompileOperation(osgUtil::IncrementalCompileOperation *ico)
+    void SceneManager::setIncrementalCompileOperation(osgUtil::IncrementalCompileOperation* ico)
     {
         mIncrementalCompileOperation = ico;
     }
 
-    osgUtil::IncrementalCompileOperation *SceneManager::getIncrementalCompileOperation()
+    osgUtil::IncrementalCompileOperation* SceneManager::getIncrementalCompileOperation()
     {
         return mIncrementalCompileOperation.get();
     }
@@ -929,36 +978,36 @@ namespace Resource
         mParticleSystemMask = mask;
     }
 
-    void SceneManager::setFilterSettings(const std::string &magfilter, const std::string &minfilter,
-                                           const std::string &mipmap, int maxAnisotropy)
+    void SceneManager::setFilterSettings(
+        const std::string& magfilter, const std::string& minfilter, const std::string& mipmap, int maxAnisotropy)
     {
         osg::Texture::FilterMode min = osg::Texture::LINEAR;
         osg::Texture::FilterMode mag = osg::Texture::LINEAR;
 
-        if(magfilter == "nearest")
+        if (magfilter == "nearest")
             mag = osg::Texture::NEAREST;
-        else if(magfilter != "linear")
-            Log(Debug::Warning) << "Warning: Invalid texture mag filter: "<< magfilter;
+        else if (magfilter != "linear")
+            Log(Debug::Warning) << "Warning: Invalid texture mag filter: " << magfilter;
 
-        if(minfilter == "nearest")
+        if (minfilter == "nearest")
             min = osg::Texture::NEAREST;
-        else if(minfilter != "linear")
-            Log(Debug::Warning) << "Warning: Invalid texture min filter: "<< minfilter;
+        else if (minfilter != "linear")
+            Log(Debug::Warning) << "Warning: Invalid texture min filter: " << minfilter;
 
-        if(mipmap == "nearest")
+        if (mipmap == "nearest")
         {
-            if(min == osg::Texture::NEAREST)
+            if (min == osg::Texture::NEAREST)
                 min = osg::Texture::NEAREST_MIPMAP_NEAREST;
-            else if(min == osg::Texture::LINEAR)
+            else if (min == osg::Texture::LINEAR)
                 min = osg::Texture::LINEAR_MIPMAP_NEAREST;
         }
-        else if(mipmap != "none")
+        else if (mipmap != "none")
         {
-            if(mipmap != "linear")
+            if (mipmap != "linear")
                 Log(Debug::Warning) << "Warning: Invalid texture mipmap: " << mipmap;
-            if(min == osg::Texture::NEAREST)
+            if (min == osg::Texture::NEAREST)
                 min = osg::Texture::NEAREST_MIPMAP_LINEAR;
-            else if(min == osg::Texture::LINEAR)
+            else if (min == osg::Texture::LINEAR)
                 min = osg::Texture::LINEAR_MIPMAP_LINEAR;
         }
 
@@ -966,14 +1015,14 @@ namespace Resource
         mMagFilter = mag;
         mMaxAnisotropy = std::max(1, maxAnisotropy);
 
-        SetFilterSettingsControllerVisitor setFilterSettingsControllerVisitor (mMinFilter, mMagFilter, mMaxAnisotropy);
-        SetFilterSettingsVisitor setFilterSettingsVisitor (mMinFilter, mMagFilter, mMaxAnisotropy);
+        SetFilterSettingsControllerVisitor setFilterSettingsControllerVisitor(mMinFilter, mMagFilter, mMaxAnisotropy);
+        SetFilterSettingsVisitor setFilterSettingsVisitor(mMinFilter, mMagFilter, mMaxAnisotropy);
 
         mCache->accept(setFilterSettingsVisitor);
         mCache->accept(setFilterSettingsControllerVisitor);
     }
 
-    void SceneManager::applyFilterSettings(osg::Texture *tex)
+    void SceneManager::applyFilterSettings(osg::Texture* tex)
     {
         tex->setFilter(osg::Texture::MIN_FILTER, mMinFilter);
         tex->setFilter(osg::Texture::MAG_FILTER, mMagFilter);
@@ -997,10 +1046,11 @@ namespace Resource
         {
             std::lock_guard<OpenThreads::Mutex> lock(*mIncrementalCompileOperation->getToCompiledMutex());
             osgUtil::IncrementalCompileOperation::CompileSets& sets = mIncrementalCompileOperation->getToCompile();
-            for(osgUtil::IncrementalCompileOperation::CompileSets::iterator it = sets.begin(); it != sets.end();)
+            for (osgUtil::IncrementalCompileOperation::CompileSets::iterator it = sets.begin(); it != sets.end();)
             {
                 int refcount = (*it)->_subgraphToCompile->referenceCount();
-                if ((*it)->_subgraphToCompile->asDrawable()) refcount -= 1; // ref by CompileList.
+                if ((*it)->_subgraphToCompile->asDrawable())
+                    refcount -= 1; // ref by CompileList.
                 if (refcount <= 2) // ref by ObjectCache + ref by _subgraphToCompile.
                 {
                     // no other ref = not needed anymore.
@@ -1020,7 +1070,7 @@ namespace Resource
         mSharedStateManager->clearCache();
     }
 
-    void SceneManager::reportStats(unsigned int frameNumber, osg::Stats *stats) const
+    void SceneManager::reportStats(unsigned int frameNumber, osg::Stats* stats) const
     {
         if (mIncrementalCompileOperation)
         {
@@ -1037,9 +1087,10 @@ namespace Resource
         stats->setAttribute(frameNumber, "Node", mCache->getCacheSize());
     }
 
-    Shader::ShaderVisitor *SceneManager::createShaderVisitor(const std::string& shaderPrefix)
+    Shader::ShaderVisitor* SceneManager::createShaderVisitor(const std::string& shaderPrefix)
     {
-        Shader::ShaderVisitor* shaderVisitor = new Shader::ShaderVisitor(*mShaderManager.get(), *mImageManager, shaderPrefix);
+        Shader::ShaderVisitor* shaderVisitor
+            = new Shader::ShaderVisitor(*mShaderManager.get(), *mImageManager, shaderPrefix);
         shaderVisitor->setForceShaders(mForceShaders);
         shaderVisitor->setAutoUseNormalMaps(mAutoUseNormalMaps);
         shaderVisitor->setNormalMapPattern(mNormalMapPattern);
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index b27b807447..db93147111 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -1,15 +1,15 @@
 #ifndef OPENMW_COMPONENTS_RESOURCE_SCENEMANAGER_H
 #define OPENMW_COMPONENTS_RESOURCE_SCENEMANAGER_H
 
-#include <string>
 #include <map>
 #include <memory>
 #include <mutex>
+#include <string>
 
-#include <osg/ref_ptr>
 #include <osg/Node>
-#include <osg/Texture>
 #include <osg/Texture2D>
+#include <osg/Texture>
+#include <osg/ref_ptr>
 
 #include "resourcemanager.hpp"
 
@@ -44,9 +44,15 @@ namespace Resource
     class TemplateRef : public osg::Object
     {
     public:
-        TemplateRef(const Object* object) : mObject(object) {}
+        TemplateRef(const Object* object)
+            : mObject(object)
+        {
+        }
         TemplateRef() {}
-        TemplateRef(const TemplateRef& copy, const osg::CopyOp&) : mObject(copy.mObject) {}
+        TemplateRef(const TemplateRef& copy, const osg::CopyOp&)
+            : mObject(copy.mObject)
+        {
+        }
 
         META_Object(Resource, TemplateRef)
 
@@ -58,7 +64,10 @@ namespace Resource
     {
     public:
         TemplateMultiRef() {}
-        TemplateMultiRef(const TemplateMultiRef& copy, const osg::CopyOp&) : mObjects(copy.mObjects) {}
+        TemplateMultiRef(const TemplateMultiRef& copy, const osg::CopyOp&)
+            : mObjects(copy.mObjects)
+        {
+        }
         void addRef(const osg::Node* node);
 
         META_Object(Resource, TemplateMultiRef)
@@ -68,21 +77,26 @@ namespace Resource
     };
 
     /// @brief Handles loading and caching of scenes, e.g. .nif files or .osg files
-    /// @note Some methods of the scene manager can be used from any thread, see the methods documentation for more details.
+    /// @note Some methods of the scene manager can be used from any thread, see the methods documentation for more
+    /// details.
     class SceneManager : public ResourceManager
     {
     public:
-        SceneManager(const VFS::Manager* vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager);
+        SceneManager(
+            const VFS::Manager* vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager);
         ~SceneManager();
 
         Shader::ShaderManager& getShaderManager();
 
-        /// Re-create shaders for this node, need to call this if alpha testing, texture stages or vertex color mode have changed.
-        void recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix = "objects", bool forceShadersForNode = false, const osg::Program* programTemplate = nullptr);
+        /// Re-create shaders for this node, need to call this if alpha testing, texture stages or vertex color mode
+        /// have changed.
+        void recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix = "objects",
+            bool forceShadersForNode = false, const osg::Program* programTemplate = nullptr);
 
         /// Applying shaders to a node may replace some fixed-function state.
         /// This restores it.
-        /// When editing such state, it should be reinstated before the edits, and shaders should be recreated afterwards.
+        /// When editing such state, it should be reinstated before the edits, and shaders should be recreated
+        /// afterwards.
         void reinstateRemovedState(osg::ref_ptr<osg::Node> node);
 
         /// @see ShaderVisitor::setForceShaders
@@ -116,16 +130,17 @@ namespace Resource
 
         enum class UBOBinding
         {
-            // If we add more UBO's, we should probably assign their bindings dynamically according to the current count of UBO's in the programTemplate
+            // If we add more UBO's, we should probably assign their bindings dynamically according to the current count
+            // of UBO's in the programTemplate
             LightBuffer,
             PostProcessor
         };
         void setLightingMethod(SceneUtil::LightingMethod method);
         SceneUtil::LightingMethod getLightingMethod() const;
-        
+
         void setConvertAlphaTestToAlphaToCoverage(bool convert);
 
-        void setShaderPath(const std::filesystem::path &path);
+        void setShaderPath(const std::filesystem::path& path);
 
         /// Check if a given scene is loaded and if so, update its usage timestamp to prevent it from being unloaded
         bool checkLoaded(const std::string& name, double referenceTime);
@@ -134,7 +149,7 @@ namespace Resource
         /// @note If the given filename does not exist or fails to load, an error marker mesh will be used instead.
         ///  If even the error marker mesh can not be found, an exception is thrown.
         /// @note Thread safe.
-        osg::ref_ptr<const osg::Node> getTemplate(const std::string& name, bool compile=true);
+        osg::ref_ptr<const osg::Node> getTemplate(const std::string& name, bool compile = true);
 
         /// Clone osg::Node safely.
         /// @note Thread safe.
@@ -177,16 +192,18 @@ namespace Resource
         /// @param mask The node mask to apply to loaded particle system nodes.
         void setParticleSystemMask(unsigned int mask);
 
-        /// @warning It is unsafe to call this method while the draw thread is using textures! call Viewer::stopThreading first.
-        void setFilterSettings(const std::string &magfilter, const std::string &minfilter,
-                               const std::string &mipmap, int maxAnisotropy);
+        /// @warning It is unsafe to call this method while the draw thread is using textures! call
+        /// Viewer::stopThreading first.
+        void setFilterSettings(
+            const std::string& magfilter, const std::string& minfilter, const std::string& mipmap, int maxAnisotropy);
 
-        /// Apply filter settings to the given texture. Note, when loading an object through this scene manager (i.e. calling getTemplate or createInstance)
-        /// the filter settings are applied automatically. This method is provided for textures that were created outside of the SceneManager.
-        void applyFilterSettings (osg::Texture* tex);
+        /// Apply filter settings to the given texture. Note, when loading an object through this scene manager (i.e.
+        /// calling getTemplate or createInstance) the filter settings are applied automatically. This method is
+        /// provided for textures that were created outside of the SceneManager.
+        void applyFilterSettings(osg::Texture* tex);
 
-        /// Keep a copy of the texture data around in system memory? This is needed when using multiple graphics contexts,
-        /// otherwise should be disabled to reduce memory usage.
+        /// Keep a copy of the texture data around in system memory? This is needed when using multiple graphics
+        /// contexts, otherwise should be disabled to reduce memory usage.
         void setUnRefImageDataAfterApply(bool unref);
 
         /// @see ResourceManager::updateCache
@@ -203,7 +220,6 @@ namespace Resource
         bool getSoftParticles() const { return mSoftParticles; }
 
     private:
-
         Shader::ShaderVisitor* createShaderVisitor(const std::string& shaderPrefix = "objects");
 
         std::unique_ptr<Shader::ShaderManager> mShaderManager;
@@ -238,7 +254,7 @@ namespace Resource
         unsigned int mParticleSystemMask;
 
         SceneManager(const SceneManager&);
-        void operator = (const SceneManager&);
+        void operator=(const SceneManager&);
     };
 
     std::string getFileExtension(const std::string& file);
diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp
index b92f9d8bdf..85e6a6bd8d 100644
--- a/components/resource/stats.cpp
+++ b/components/resource/stats.cpp
@@ -1,8 +1,8 @@
 #include "stats.hpp"
 
-#include <sstream>
-#include <iomanip>
 #include <algorithm>
+#include <iomanip>
+#include <sstream>
 
 #include <osg/PolygonMode>
 
@@ -11,8 +11,8 @@
 
 #include <osgDB/Registry>
 
-#include <osgViewer/Viewer>
 #include <osgViewer/Renderer>
+#include <osgViewer/Viewer>
 
 #include <components/myguiplatform/myguidatamanager.hpp>
 
@@ -21,516 +21,531 @@
 namespace Resource
 {
 
-static bool collectStatRendering = false;
-static bool collectStatCameraObjects = false;
-static bool collectStatViewerObjects = false;
-static bool collectStatResource = false;
-static bool collectStatGPU = false;
-static bool collectStatEvent = false;
-static bool collectStatFrameRate = false;
-static bool collectStatUpdate = false;
-static bool collectStatEngine = false;
+    static bool collectStatRendering = false;
+    static bool collectStatCameraObjects = false;
+    static bool collectStatViewerObjects = false;
+    static bool collectStatResource = false;
+    static bool collectStatGPU = false;
+    static bool collectStatEvent = false;
+    static bool collectStatFrameRate = false;
+    static bool collectStatUpdate = false;
+    static bool collectStatEngine = false;
 
-constexpr std::string_view sFontName = "Fonts/DejaVuLGCSansMono.ttf";
+    constexpr std::string_view sFontName = "Fonts/DejaVuLGCSansMono.ttf";
 
-static void setupStatCollection()
-{
-    const char* envList = getenv("OPENMW_OSG_STATS_LIST");
-    if (envList == nullptr)
-        return;
+    static void setupStatCollection()
+    {
+        const char* envList = getenv("OPENMW_OSG_STATS_LIST");
+        if (envList == nullptr)
+            return;
 
-    std::string_view kwList(envList);
+        std::string_view kwList(envList);
 
-    auto kwBegin = kwList.begin();
+        auto kwBegin = kwList.begin();
 
-    while (kwBegin != kwList.end())
-    {
-        auto kwEnd = std::find(kwBegin, kwList.end(), ';');
-
-        const auto kw = kwList.substr(std::distance(kwList.begin(), kwBegin), std::distance(kwBegin, kwEnd));
-
-        if (kw.compare("gpu") == 0)
-            collectStatGPU = true;
-        else if (kw.compare("event") == 0)
-            collectStatEvent = true;
-        else if (kw.compare("frame_rate") == 0)
-            collectStatFrameRate = true;
-        else if (kw.compare("update") == 0)
-            collectStatUpdate = true;
-        else if (kw.compare("engine") == 0)
-            collectStatEngine = true;
-        else if (kw.compare("rendering") == 0)
-            collectStatRendering = true;
-        else if (kw.compare("cameraobjects") == 0)
-            collectStatCameraObjects = true;
-        else if (kw.compare("viewerobjects") == 0)
-            collectStatViewerObjects = true;
-        else if (kw.compare("resource") == 0)
-            collectStatResource = true;
-        else if (kw.compare("times") == 0)
+        while (kwBegin != kwList.end())
         {
-            collectStatGPU = true;
-            collectStatEvent = true;
-            collectStatFrameRate = true;
-            collectStatUpdate = true;
-            collectStatEngine = true;
-            collectStatRendering = true;
-        }
+            auto kwEnd = std::find(kwBegin, kwList.end(), ';');
+
+            const auto kw = kwList.substr(std::distance(kwList.begin(), kwBegin), std::distance(kwBegin, kwEnd));
+
+            if (kw.compare("gpu") == 0)
+                collectStatGPU = true;
+            else if (kw.compare("event") == 0)
+                collectStatEvent = true;
+            else if (kw.compare("frame_rate") == 0)
+                collectStatFrameRate = true;
+            else if (kw.compare("update") == 0)
+                collectStatUpdate = true;
+            else if (kw.compare("engine") == 0)
+                collectStatEngine = true;
+            else if (kw.compare("rendering") == 0)
+                collectStatRendering = true;
+            else if (kw.compare("cameraobjects") == 0)
+                collectStatCameraObjects = true;
+            else if (kw.compare("viewerobjects") == 0)
+                collectStatViewerObjects = true;
+            else if (kw.compare("resource") == 0)
+                collectStatResource = true;
+            else if (kw.compare("times") == 0)
+            {
+                collectStatGPU = true;
+                collectStatEvent = true;
+                collectStatFrameRate = true;
+                collectStatUpdate = true;
+                collectStatEngine = true;
+                collectStatRendering = true;
+            }
 
-        if (kwEnd == kwList.end())
-            break;
+            if (kwEnd == kwList.end())
+                break;
 
-        kwBegin = std::next(kwEnd);
+            kwBegin = std::next(kwEnd);
+        }
     }
-}
-
-class SetFontVisitor : public osg::NodeVisitor
-{
-public:
-    SetFontVisitor(osgText::Font* font)
-        : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-        , mFont(font)
-        {}
 
-    void apply(osg::Drawable& node) override
+    class SetFontVisitor : public osg::NodeVisitor
     {
-        if (osgText::Text* text = dynamic_cast<osgText::Text*>(&node))
+    public:
+        SetFontVisitor(osgText::Font* font)
+            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+            , mFont(font)
         {
-            text->setFont(mFont);
         }
-    }
 
-private:
-    osgText::Font* mFont;
-};
+        void apply(osg::Drawable& node) override
+        {
+            if (osgText::Text* text = dynamic_cast<osgText::Text*>(&node))
+            {
+                text->setFont(mFont);
+            }
+        }
+
+    private:
+        osgText::Font* mFont;
+    };
 
-osg::ref_ptr<osgText::Font> getMonoFont(VFS::Manager* vfs)
-{
-    if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf") && vfs->exists(sFontName))
+    osg::ref_ptr<osgText::Font> getMonoFont(VFS::Manager* vfs)
     {
-        Files::IStreamPtr streamPtr = vfs->get(sFontName);
-        return osgText::readRefFontStream(*streamPtr.get());
-    }
+        if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf") && vfs->exists(sFontName))
+        {
+            Files::IStreamPtr streamPtr = vfs->get(sFontName);
+            return osgText::readRefFontStream(*streamPtr.get());
+        }
 
-    return nullptr;
-}
+        return nullptr;
+    }
 
-StatsHandler::StatsHandler(bool offlineCollect, VFS::Manager* vfs):
-    _key(osgGA::GUIEventAdapter::KEY_F4),
-    _initialized(false),
-    _statsType(false),
-    _offlineCollect(offlineCollect),
-    _statsWidth(1280.0f),
-    _statsHeight(1024.0f),
-    _characterSize(18.0f)
-{
-    _camera = new osg::Camera;
-    _camera->getOrCreateStateSet()->setGlobalDefaults();
-    _camera->setRenderer(new osgViewer::Renderer(_camera.get()));
-    _camera->setProjectionResizePolicy(osg::Camera::FIXED);
+    StatsHandler::StatsHandler(bool offlineCollect, VFS::Manager* vfs)
+        : _key(osgGA::GUIEventAdapter::KEY_F4)
+        , _initialized(false)
+        , _statsType(false)
+        , _offlineCollect(offlineCollect)
+        , _statsWidth(1280.0f)
+        , _statsHeight(1024.0f)
+        , _characterSize(18.0f)
+    {
+        _camera = new osg::Camera;
+        _camera->getOrCreateStateSet()->setGlobalDefaults();
+        _camera->setRenderer(new osgViewer::Renderer(_camera.get()));
+        _camera->setProjectionResizePolicy(osg::Camera::FIXED);
 
-    _resourceStatsChildNum = 0;
+        _resourceStatsChildNum = 0;
 
-    _textFont = getMonoFont(vfs);
-}
+        _textFont = getMonoFont(vfs);
+    }
 
-Profiler::Profiler(bool offlineCollect, VFS::Manager* vfs):
-    _offlineCollect(offlineCollect),
-    _initFonts(false)
-{
-    _characterSize = 18;
-    _font.clear();
+    Profiler::Profiler(bool offlineCollect, VFS::Manager* vfs)
+        : _offlineCollect(offlineCollect)
+        , _initFonts(false)
+    {
+        _characterSize = 18;
+        _font.clear();
 
-    _textFont = getMonoFont(vfs);
+        _textFont = getMonoFont(vfs);
 
-    setKeyEventTogglesOnScreenStats(osgGA::GUIEventAdapter::KEY_F3);
-    setupStatCollection();
-}
+        setKeyEventTogglesOnScreenStats(osgGA::GUIEventAdapter::KEY_F3);
+        setupStatCollection();
+    }
 
-void Profiler::setUpFonts()
-{
-    if (_textFont != nullptr)
+    void Profiler::setUpFonts()
     {
-        SetFontVisitor visitor(_textFont);
-        _switch->accept(visitor);
-    }
+        if (_textFont != nullptr)
+        {
+            SetFontVisitor visitor(_textFont);
+            _switch->accept(visitor);
+        }
 
-    _initFonts = true;
-}
+        _initFonts = true;
+    }
 
-bool Profiler::handle(const osgGA::GUIEventAdapter &ea, osgGA::GUIActionAdapter &aa)
-{
-    osgViewer::ViewerBase* viewer = nullptr;
+    bool Profiler::handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa)
+    {
+        osgViewer::ViewerBase* viewer = nullptr;
 
-    bool handled = StatsHandler::handle(ea, aa);
-    if (_initialized && !_initFonts)
-        setUpFonts();
+        bool handled = StatsHandler::handle(ea, aa);
+        if (_initialized && !_initFonts)
+            setUpFonts();
 
-    auto* view = dynamic_cast<osgViewer::View*>(&aa);
-    if (view)
-        viewer = view->getViewerBase();
+        auto* view = dynamic_cast<osgViewer::View*>(&aa);
+        if (view)
+            viewer = view->getViewerBase();
 
-    if (viewer)
-    {
-        // Add/remove openmw stats to the osd as necessary
-        viewer->getViewerStats()->collectStats("engine", _statsType >= StatsHandler::StatsType::VIEWER_STATS);
+        if (viewer)
+        {
+            // Add/remove openmw stats to the osd as necessary
+            viewer->getViewerStats()->collectStats("engine", _statsType >= StatsHandler::StatsType::VIEWER_STATS);
 
-        if (_offlineCollect)
-            CollectStatistics(viewer);
+            if (_offlineCollect)
+                CollectStatistics(viewer);
+        }
+        return handled;
     }
-    return handled;
-}
-
-bool StatsHandler::handle(const osgGA::GUIEventAdapter &ea, osgGA::GUIActionAdapter &aa)
-{
-    if (ea.getHandled()) return false;
 
-    switch(ea.getEventType())
+    bool StatsHandler::handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa)
     {
-        case(osgGA::GUIEventAdapter::KEYDOWN):
+        if (ea.getHandled())
+            return false;
+
+        switch (ea.getEventType())
         {
-            if (ea.getKey()== _key)
+            case (osgGA::GUIEventAdapter::KEYDOWN):
             {
-                osgViewer::View* myview = dynamic_cast<osgViewer::View*>(&aa);
-                if (!myview) return false;
+                if (ea.getKey() == _key)
+                {
+                    osgViewer::View* myview = dynamic_cast<osgViewer::View*>(&aa);
+                    if (!myview)
+                        return false;
 
-                osgViewer::ViewerBase* viewer = myview->getViewerBase();
+                    osgViewer::ViewerBase* viewer = myview->getViewerBase();
 
-                toggle(viewer);
+                    toggle(viewer);
 
-                if (_offlineCollect)
-                    CollectStatistics(viewer);
+                    if (_offlineCollect)
+                        CollectStatistics(viewer);
 
-                aa.requestRedraw();
-                return true;
+                    aa.requestRedraw();
+                    return true;
+                }
+                break;
             }
-            break;
-        }
-        case osgGA::GUIEventAdapter::RESIZE:
-        {
-            setWindowSize(ea.getWindowWidth(), ea.getWindowHeight());
-            break;
+            case osgGA::GUIEventAdapter::RESIZE:
+            {
+                setWindowSize(ea.getWindowWidth(), ea.getWindowHeight());
+                break;
+            }
+            default:
+                break;
         }
-        default:
-            break;
+        return false;
     }
-    return false;
-}
-
-void StatsHandler::setWindowSize(int width, int height)
-{
-    if (width <= 0 || height <= 0)
-        return;
 
-    _camera->setViewport(0, 0, width, height);
-    if (fabs(height*_statsWidth) <= fabs(width*_statsHeight))
+    void StatsHandler::setWindowSize(int width, int height)
     {
-        _camera->setProjectionMatrix(osg::Matrix::ortho2D(_statsWidth - width*_statsHeight/height, _statsWidth,0.0,_statsHeight));
-    }
-    else
-    {
-        _camera->setProjectionMatrix(osg::Matrix::ortho2D(0.0,_statsWidth,_statsHeight-height*_statsWidth/width,_statsHeight));
+        if (width <= 0 || height <= 0)
+            return;
+
+        _camera->setViewport(0, 0, width, height);
+        if (fabs(height * _statsWidth) <= fabs(width * _statsHeight))
+        {
+            _camera->setProjectionMatrix(
+                osg::Matrix::ortho2D(_statsWidth - width * _statsHeight / height, _statsWidth, 0.0, _statsHeight));
+        }
+        else
+        {
+            _camera->setProjectionMatrix(
+                osg::Matrix::ortho2D(0.0, _statsWidth, _statsHeight - height * _statsWidth / width, _statsHeight));
+        }
     }
-}
 
-void StatsHandler::toggle(osgViewer::ViewerBase *viewer)
-{
-    if (!_initialized)
+    void StatsHandler::toggle(osgViewer::ViewerBase* viewer)
     {
-        setUpHUDCamera(viewer);
-        setUpScene(viewer);
-    }
+        if (!_initialized)
+        {
+            setUpHUDCamera(viewer);
+            setUpScene(viewer);
+        }
 
-    _statsType = !_statsType;
+        _statsType = !_statsType;
 
-    if (!_statsType)
-    {
-        _camera->setNodeMask(0);
-        _switch->setAllChildrenOff();
+        if (!_statsType)
+        {
+            _camera->setNodeMask(0);
+            _switch->setAllChildrenOff();
 
-        viewer->getViewerStats()->collectStats("resource", false);
-    }
-    else
-    {
-        _camera->setNodeMask(0xffffffff);
-        _switch->setSingleChildOn(_resourceStatsChildNum);
+            viewer->getViewerStats()->collectStats("resource", false);
+        }
+        else
+        {
+            _camera->setNodeMask(0xffffffff);
+            _switch->setSingleChildOn(_resourceStatsChildNum);
 
-        viewer->getViewerStats()->collectStats("resource", true);
+            viewer->getViewerStats()->collectStats("resource", true);
+        }
     }
-}
-
-void StatsHandler::setUpHUDCamera(osgViewer::ViewerBase* viewer)
-{
-    // Try GraphicsWindow first so we're likely to get the main viewer window
-    osg::GraphicsContext* context = dynamic_cast<osgViewer::GraphicsWindow*>(_camera->getGraphicsContext());
 
-    if (!context)
+    void StatsHandler::setUpHUDCamera(osgViewer::ViewerBase* viewer)
     {
-        osgViewer::Viewer::Windows windows;
-        viewer->getWindows(windows);
+        // Try GraphicsWindow first so we're likely to get the main viewer window
+        osg::GraphicsContext* context = dynamic_cast<osgViewer::GraphicsWindow*>(_camera->getGraphicsContext());
 
-        if (!windows.empty()) context = windows.front();
-        else
+        if (!context)
         {
-            // No GraphicsWindows were found, so let's try to find a GraphicsContext
-            context = _camera->getGraphicsContext();
+            osgViewer::Viewer::Windows windows;
+            viewer->getWindows(windows);
 
-            if (!context)
+            if (!windows.empty())
+                context = windows.front();
+            else
             {
-                osgViewer::Viewer::Contexts contexts;
-                viewer->getContexts(contexts);
+                // No GraphicsWindows were found, so let's try to find a GraphicsContext
+                context = _camera->getGraphicsContext();
+
+                if (!context)
+                {
+                    osgViewer::Viewer::Contexts contexts;
+                    viewer->getContexts(contexts);
 
-                if (contexts.empty()) return;
+                    if (contexts.empty())
+                        return;
 
-                context = contexts.front();
+                    context = contexts.front();
+                }
             }
         }
-    }
-
-    _camera->setGraphicsContext(context);
 
-    _camera->setRenderOrder(osg::Camera::POST_RENDER, 11);
+        _camera->setGraphicsContext(context);
 
-    _camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
-    _camera->setViewMatrix(osg::Matrix::identity());
-    setWindowSize(context->getTraits()->width, context->getTraits()->height);
+        _camera->setRenderOrder(osg::Camera::POST_RENDER, 11);
 
-    // only clear the depth buffer
-    _camera->setClearMask(0);
-    _camera->setAllowEventFocus(false);
+        _camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
+        _camera->setViewMatrix(osg::Matrix::identity());
+        setWindowSize(context->getTraits()->width, context->getTraits()->height);
 
-    _camera->setRenderer(new osgViewer::Renderer(_camera.get()));
+        // only clear the depth buffer
+        _camera->setClearMask(0);
+        _camera->setAllowEventFocus(false);
 
-    _initialized = true;
-}
+        _camera->setRenderer(new osgViewer::Renderer(_camera.get()));
 
-osg::Geometry* createBackgroundRectangle(const osg::Vec3& pos, const float width, const float height, osg::Vec4& color)
-{
-    osg::StateSet *ss = new osg::StateSet;
+        _initialized = true;
+    }
 
-    osg::Geometry* geometry = new osg::Geometry;
+    osg::Geometry* createBackgroundRectangle(
+        const osg::Vec3& pos, const float width, const float height, osg::Vec4& color)
+    {
+        osg::StateSet* ss = new osg::StateSet;
 
-    geometry->setUseDisplayList(false);
-    geometry->setStateSet(ss);
+        osg::Geometry* geometry = new osg::Geometry;
 
-    osg::Vec3Array* vertices = new osg::Vec3Array;
-    geometry->setVertexArray(vertices);
+        geometry->setUseDisplayList(false);
+        geometry->setStateSet(ss);
 
-    vertices->push_back(osg::Vec3(pos.x(), pos.y(), 0));
-    vertices->push_back(osg::Vec3(pos.x(), pos.y()-height,0));
-    vertices->push_back(osg::Vec3(pos.x()+width, pos.y()-height,0));
-    vertices->push_back(osg::Vec3(pos.x()+width, pos.y(),0));
+        osg::Vec3Array* vertices = new osg::Vec3Array;
+        geometry->setVertexArray(vertices);
 
-    osg::Vec4Array* colors = new osg::Vec4Array;
-    colors->push_back(color);
-    geometry->setColorArray(colors, osg::Array::BIND_OVERALL);
+        vertices->push_back(osg::Vec3(pos.x(), pos.y(), 0));
+        vertices->push_back(osg::Vec3(pos.x(), pos.y() - height, 0));
+        vertices->push_back(osg::Vec3(pos.x() + width, pos.y() - height, 0));
+        vertices->push_back(osg::Vec3(pos.x() + width, pos.y(), 0));
 
-    osg::DrawElementsUShort *base =  new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLE_FAN,0);
-    base->push_back(0);
-    base->push_back(1);
-    base->push_back(2);
-    base->push_back(3);
+        osg::Vec4Array* colors = new osg::Vec4Array;
+        colors->push_back(color);
+        geometry->setColorArray(colors, osg::Array::BIND_OVERALL);
 
-    geometry->addPrimitiveSet(base);
+        osg::DrawElementsUShort* base = new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLE_FAN, 0);
+        base->push_back(0);
+        base->push_back(1);
+        base->push_back(2);
+        base->push_back(3);
 
-    return geometry;
-}
+        geometry->addPrimitiveSet(base);
 
-class ResourceStatsTextDrawCallback : public osg::Drawable::DrawCallback
-{
-public:
-    ResourceStatsTextDrawCallback(osg::Stats* stats, const std::vector<std::string>& statNames)
-        : mStats(stats)
-        , mStatNames(statNames)
-    {
+        return geometry;
     }
 
-    void drawImplementation(osg::RenderInfo& renderInfo,const osg::Drawable* drawable) const override
+    class ResourceStatsTextDrawCallback : public osg::Drawable::DrawCallback
     {
-        if (!mStats) return;
+    public:
+        ResourceStatsTextDrawCallback(osg::Stats* stats, const std::vector<std::string>& statNames)
+            : mStats(stats)
+            , mStatNames(statNames)
+        {
+        }
 
-        osgText::Text* text = (osgText::Text*)(drawable);
+        void drawImplementation(osg::RenderInfo& renderInfo, const osg::Drawable* drawable) const override
+        {
+            if (!mStats)
+                return;
 
-        std::ostringstream viewStr;
-        viewStr.setf(std::ios::left, std::ios::adjustfield);
-        viewStr.width(14);
-        // Used fixed formatting, as scientific will switch to "...e+.." notation for
-        // large numbers of vertices/drawables/etc.
-        viewStr.setf(std::ios::fixed);
-        viewStr.precision(0);
+            osgText::Text* text = (osgText::Text*)(drawable);
 
-        unsigned int frameNumber = renderInfo.getState()->getFrameStamp()->getFrameNumber()-1;
+            std::ostringstream viewStr;
+            viewStr.setf(std::ios::left, std::ios::adjustfield);
+            viewStr.width(14);
+            // Used fixed formatting, as scientific will switch to "...e+.." notation for
+            // large numbers of vertices/drawables/etc.
+            viewStr.setf(std::ios::fixed);
+            viewStr.precision(0);
 
-        for (const auto& statName : mStatNames.get())
-        {
-            if (statName.empty())
-                viewStr << std::endl;
-            else
+            unsigned int frameNumber = renderInfo.getState()->getFrameStamp()->getFrameNumber() - 1;
+
+            for (const auto& statName : mStatNames.get())
             {
-                double value = 0.0;
-                if (mStats->getAttribute(frameNumber, statName, value))
-                    viewStr << std::setw(8) << value << std::endl;
+                if (statName.empty())
+                    viewStr << std::endl;
                 else
-                    viewStr << std::setw(8) << "." << std::endl;
+                {
+                    double value = 0.0;
+                    if (mStats->getAttribute(frameNumber, statName, value))
+                        viewStr << std::setw(8) << value << std::endl;
+                    else
+                        viewStr << std::setw(8) << "." << std::endl;
+                }
             }
-        }
 
-        text->setText(viewStr.str());
+            text->setText(viewStr.str());
 
-        text->drawImplementation(renderInfo);
-    }
+            text->drawImplementation(renderInfo);
+        }
 
-    osg::ref_ptr<osg::Stats> mStats;
-    std::reference_wrapper<const std::vector<std::string>> mStatNames;
-};
+        osg::ref_ptr<osg::Stats> mStats;
+        std::reference_wrapper<const std::vector<std::string>> mStatNames;
+    };
 
-void StatsHandler::setUpScene(osgViewer::ViewerBase *viewer)
-{
-    _switch = new osg::Switch;
+    void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
+    {
+        _switch = new osg::Switch;
 
-    _camera->addChild(_switch);
+        _camera->addChild(_switch);
 
-    osg::StateSet* stateset = _switch->getOrCreateStateSet();
-    stateset->setMode(GL_LIGHTING,osg::StateAttribute::OFF);
-    stateset->setMode(GL_BLEND,osg::StateAttribute::ON);
-    stateset->setMode(GL_DEPTH_TEST,osg::StateAttribute::OFF);
+        osg::StateSet* stateset = _switch->getOrCreateStateSet();
+        stateset->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+        stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
+        stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
 #ifdef OSG_GL1_AVAILABLE
-    stateset->setAttribute(new osg::PolygonMode(), osg::StateAttribute::PROTECTED);
+        stateset->setAttribute(new osg::PolygonMode(), osg::StateAttribute::PROTECTED);
 #endif
 
-    osg::Vec4 backgroundColor(0.0, 0.0, 0.0f, 0.3);
-    osg::Vec4 staticTextColor(1.0, 1.0, 0.0f, 1.0);
-    osg::Vec4 dynamicTextColor(1.0, 1.0, 1.0f, 1.0);
-    float backgroundMargin = 5;
-    float backgroundSpacing = 3;
+        osg::Vec4 backgroundColor(0.0, 0.0, 0.0f, 0.3);
+        osg::Vec4 staticTextColor(1.0, 1.0, 0.0f, 1.0);
+        osg::Vec4 dynamicTextColor(1.0, 1.0, 1.0f, 1.0);
+        float backgroundMargin = 5;
+        float backgroundSpacing = 3;
 
-    // resource stats
-    {
-        osg::Group* group = new osg::Group;
-        group->setCullingActive(false);
-        _resourceStatsChildNum = _switch->getNumChildren();
-        _switch->addChild(group, false);
-
-        static const std::vector<std::string> statNames({
-            "FrameNumber",
-            "",
-            "Compiling",
-            "WorkQueue",
-            "WorkThread",
-            "UnrefQueue",
-            "",
-            "Texture",
-            "StateSet",
-            "Node",
-            "Shape",
-            "Shape Instance",
-            "Image",
-            "Nif",
-            "Keyframe",
-            "",
-            "Groundcover Chunk",
-            "Object Chunk",
-            "Terrain Chunk",
-            "Terrain Texture",
-            "Land",
-            "Composite",
-            "",
-            "NavMesh Jobs",
-            "NavMesh Waiting",
-            "NavMesh Pushed",
-            "NavMesh Processing",
-            "NavMesh DbJobs Write",
-            "NavMesh DbJobs Read",
-            "NavMesh DbCacheHitRate",
-            "NavMesh CacheSize",
-            "NavMesh UsedTiles",
-            "NavMesh CachedTiles",
-            "NavMesh CacheHitRate",
-            "",
-            "Mechanics Actors",
-            "Mechanics Objects",
-            "",
-            "Physics Actors",
-            "Physics Objects",
-            "Physics Projectiles",
-            "Physics HeightFields",
-        });
-
-        static const auto longest = std::max_element(statNames.begin(), statNames.end(),
-            [] (const std::string& lhs, const std::string& rhs) { return lhs.size() < rhs.size(); });
-        const float statNamesWidth = 13 * _characterSize + 2 * backgroundMargin;
-        const float statTextWidth = 7 * _characterSize + 2 * backgroundMargin;
-        const float statHeight = statNames.size() * _characterSize + 2 * backgroundMargin;
-        osg::Vec3 pos(_statsWidth - statNamesWidth - backgroundSpacing - statTextWidth, statHeight, 0.0f);
-
-        group->addChild(createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, _characterSize + backgroundMargin, 0),
-                                                        statNamesWidth,
-                                                        statHeight,
-                                                        backgroundColor));
-
-        osg::ref_ptr<osgText::Text> staticText = new osgText::Text;
-        group->addChild( staticText.get() );
-        staticText->setColor(staticTextColor);
-        staticText->setCharacterSize(_characterSize);
-        staticText->setPosition(pos);
-
-        std::ostringstream viewStr;
-        viewStr.clear();
-        viewStr.setf(std::ios::left, std::ios::adjustfield);
-        viewStr.width(longest->size());
-        for (const auto& statName : statNames)
+        // resource stats
         {
-            viewStr << statName << std::endl;
-        }
+            osg::Group* group = new osg::Group;
+            group->setCullingActive(false);
+            _resourceStatsChildNum = _switch->getNumChildren();
+            _switch->addChild(group, false);
+
+            static const std::vector<std::string> statNames({
+                "FrameNumber",
+                "",
+                "Compiling",
+                "WorkQueue",
+                "WorkThread",
+                "UnrefQueue",
+                "",
+                "Texture",
+                "StateSet",
+                "Node",
+                "Shape",
+                "Shape Instance",
+                "Image",
+                "Nif",
+                "Keyframe",
+                "",
+                "Groundcover Chunk",
+                "Object Chunk",
+                "Terrain Chunk",
+                "Terrain Texture",
+                "Land",
+                "Composite",
+                "",
+                "NavMesh Jobs",
+                "NavMesh Waiting",
+                "NavMesh Pushed",
+                "NavMesh Processing",
+                "NavMesh DbJobs Write",
+                "NavMesh DbJobs Read",
+                "NavMesh DbCacheHitRate",
+                "NavMesh CacheSize",
+                "NavMesh UsedTiles",
+                "NavMesh CachedTiles",
+                "NavMesh CacheHitRate",
+                "",
+                "Mechanics Actors",
+                "Mechanics Objects",
+                "",
+                "Physics Actors",
+                "Physics Objects",
+                "Physics Projectiles",
+                "Physics HeightFields",
+            });
+
+            static const auto longest = std::max_element(statNames.begin(), statNames.end(),
+                [](const std::string& lhs, const std::string& rhs) { return lhs.size() < rhs.size(); });
+            const float statNamesWidth = 13 * _characterSize + 2 * backgroundMargin;
+            const float statTextWidth = 7 * _characterSize + 2 * backgroundMargin;
+            const float statHeight = statNames.size() * _characterSize + 2 * backgroundMargin;
+            osg::Vec3 pos(_statsWidth - statNamesWidth - backgroundSpacing - statTextWidth, statHeight, 0.0f);
+
+            group->addChild(
+                createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, _characterSize + backgroundMargin, 0),
+                    statNamesWidth, statHeight, backgroundColor));
+
+            osg::ref_ptr<osgText::Text> staticText = new osgText::Text;
+            group->addChild(staticText.get());
+            staticText->setColor(staticTextColor);
+            staticText->setCharacterSize(_characterSize);
+            staticText->setPosition(pos);
+
+            std::ostringstream viewStr;
+            viewStr.clear();
+            viewStr.setf(std::ios::left, std::ios::adjustfield);
+            viewStr.width(longest->size());
+            for (const auto& statName : statNames)
+            {
+                viewStr << statName << std::endl;
+            }
 
-        staticText->setText(viewStr.str());
+            staticText->setText(viewStr.str());
 
-        pos.x() += statNamesWidth + backgroundSpacing;
+            pos.x() += statNamesWidth + backgroundSpacing;
 
-        group->addChild(createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, _characterSize + backgroundMargin, 0),
-                                                        statTextWidth,
-                                                        statHeight,
-                                                        backgroundColor));
+            group->addChild(
+                createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, _characterSize + backgroundMargin, 0),
+                    statTextWidth, statHeight, backgroundColor));
 
-        osg::ref_ptr<osgText::Text> statsText = new osgText::Text;
-        group->addChild( statsText.get() );
+            osg::ref_ptr<osgText::Text> statsText = new osgText::Text;
+            group->addChild(statsText.get());
 
-        statsText->setColor(dynamicTextColor);
-        statsText->setCharacterSize(_characterSize);
-        statsText->setPosition(pos);
-        statsText->setText("");
-        statsText->setDrawCallback(new ResourceStatsTextDrawCallback(viewer->getViewerStats(), statNames));
+            statsText->setColor(dynamicTextColor);
+            statsText->setCharacterSize(_characterSize);
+            statsText->setPosition(pos);
+            statsText->setText("");
+            statsText->setDrawCallback(new ResourceStatsTextDrawCallback(viewer->getViewerStats(), statNames));
 
-        if (_textFont)
-        {
-            staticText->setFont(_textFont);
-            statsText->setFont(_textFont);
+            if (_textFont)
+            {
+                staticText->setFont(_textFont);
+                statsText->setFont(_textFont);
+            }
         }
     }
-}
 
+    void StatsHandler::getUsage(osg::ApplicationUsage& usage) const
+    {
+        usage.addKeyboardMouseBinding(_key, "On screen resource usage stats.");
+    }
 
-void StatsHandler::getUsage(osg::ApplicationUsage &usage) const
-{
-    usage.addKeyboardMouseBinding(_key, "On screen resource usage stats.");
-}
-
-void CollectStatistics(osgViewer::ViewerBase* viewer)
-{
-    osgViewer::Viewer::Cameras cameras;
-    viewer->getCameras(cameras);
-    for (auto* camera : cameras)
+    void CollectStatistics(osgViewer::ViewerBase* viewer)
     {
-        if (collectStatGPU)           camera->getStats()->collectStats("gpu", true);
-        if (collectStatRendering)     camera->getStats()->collectStats("rendering", true);
-        if (collectStatCameraObjects) camera->getStats()->collectStats("scene", true);
+        osgViewer::Viewer::Cameras cameras;
+        viewer->getCameras(cameras);
+        for (auto* camera : cameras)
+        {
+            if (collectStatGPU)
+                camera->getStats()->collectStats("gpu", true);
+            if (collectStatRendering)
+                camera->getStats()->collectStats("rendering", true);
+            if (collectStatCameraObjects)
+                camera->getStats()->collectStats("scene", true);
+        }
+        if (collectStatEvent)
+            viewer->getViewerStats()->collectStats("event", true);
+        if (collectStatFrameRate)
+            viewer->getViewerStats()->collectStats("frame_rate", true);
+        if (collectStatUpdate)
+            viewer->getViewerStats()->collectStats("update", true);
+        if (collectStatResource)
+            viewer->getViewerStats()->collectStats("resource", true);
+        if (collectStatViewerObjects)
+            viewer->getViewerStats()->collectStats("scene", true);
+        if (collectStatEngine)
+            viewer->getViewerStats()->collectStats("engine", true);
     }
-    if (collectStatEvent)         viewer->getViewerStats()->collectStats("event", true);
-    if (collectStatFrameRate)     viewer->getViewerStats()->collectStats("frame_rate", true);
-    if (collectStatUpdate)        viewer->getViewerStats()->collectStats("update", true);
-    if (collectStatResource)      viewer->getViewerStats()->collectStats("resource", true);
-    if (collectStatViewerObjects) viewer->getViewerStats()->collectStats("scene", true);
-    if (collectStatEngine)        viewer->getViewerStats()->collectStats("engine", true);
-}
 
 }
diff --git a/components/resource/stats.hpp b/components/resource/stats.hpp
index e51474c6cb..fc2899d386 100644
--- a/components/resource/stats.hpp
+++ b/components/resource/stats.hpp
@@ -62,15 +62,15 @@ namespace Resource
     private:
         osg::ref_ptr<osg::Switch> _switch;
         int _key;
-        osg::ref_ptr<osg::Camera>  _camera;
+        osg::ref_ptr<osg::Camera> _camera;
         bool _initialized;
         bool _statsType;
         bool _offlineCollect;
 
-        float                               _statsWidth;
-        float                               _statsHeight;
+        float _statsWidth;
+        float _statsHeight;
 
-        float                               _characterSize;
+        float _characterSize;
 
         int _resourceStatsChildNum;
 
diff --git a/components/sceneutil/agentpath.cpp b/components/sceneutil/agentpath.cpp
index e1fa9fe3c8..4e8f177e55 100644
--- a/components/sceneutil/agentpath.cpp
+++ b/components/sceneutil/agentpath.cpp
@@ -3,22 +3,22 @@
 
 #include <osg/Material>
 
-#include <components/detournavigator/settings.hpp>
 #include <components/detournavigator/recastparams.hpp>
+#include <components/detournavigator/settings.hpp>
 
 #include <algorithm>
 
 namespace
 {
     void drawAgent(duDebugDraw& debugDraw, const osg::Vec3f& pos, const float radius, const float height,
-            const float climb, const unsigned color)
+        const float climb, const unsigned color)
     {
         debugDraw.depthMask(false);
 
         duDebugDrawCylinderWire(&debugDraw, pos.x() - radius, pos.z() + 0.02f, pos.y() - radius, pos.x() + radius,
             pos.z() + height, pos.y() + radius, color, radius * 0.2f);
 
-        duDebugDrawCircle(&debugDraw, pos.x(), pos.z() + climb, pos.y(), radius, duRGBA(0, 0 , 0, 64), radius * 0.1f);
+        duDebugDrawCircle(&debugDraw, pos.x(), pos.z() + climb, pos.y(), radius, duRGBA(0, 0, 0, 64), radius * 0.1f);
 
         const auto colb = duRGBA(0, 0, 0, 196);
         debugDraw.begin(DU_DRAW_LINES);
@@ -37,8 +37,8 @@ namespace
 namespace SceneUtil
 {
     osg::ref_ptr<osg::Group> createAgentPathGroup(const std::deque<osg::Vec3f>& path,
-            const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end,
-            const DetourNavigator::RecastSettings& settings)
+        const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end,
+        const DetourNavigator::RecastSettings& settings)
     {
         using namespace DetourNavigator;
 
@@ -61,8 +61,9 @@ namespace SceneUtil
 
         debugDraw.begin(osg::PrimitiveSet::LINE_STRIP, agentRadius * 0.5f);
         debugDraw.vertex(osg::Vec3f(start.x(), start.z() + agentClimb, start.y()).ptr(), startColor);
-        std::for_each(path.begin(), path.end(),
-            [&] (const osg::Vec3f& v) { debugDraw.vertex(osg::Vec3f(v.x(), v.z() + agentClimb, v.y()).ptr(), pathColor); });
+        std::for_each(path.begin(), path.end(), [&](const osg::Vec3f& v) {
+            debugDraw.vertex(osg::Vec3f(v.x(), v.z() + agentClimb, v.y()).ptr(), pathColor);
+        });
         debugDraw.vertex(osg::Vec3f(end.x(), end.z() + agentClimb, end.y()).ptr(), endColor);
         debugDraw.end();
 
diff --git a/components/sceneutil/agentpath.hpp b/components/sceneutil/agentpath.hpp
index 53a41e02d8..af4e9cca71 100644
--- a/components/sceneutil/agentpath.hpp
+++ b/components/sceneutil/agentpath.hpp
@@ -20,8 +20,8 @@ namespace DetourNavigator
 namespace SceneUtil
 {
     osg::ref_ptr<osg::Group> createAgentPathGroup(const std::deque<osg::Vec3f>& path,
-            const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end,
-            const DetourNavigator::RecastSettings& settings);
+        const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end,
+        const DetourNavigator::RecastSettings& settings);
 }
 
 #endif
diff --git a/components/sceneutil/attach.cpp b/components/sceneutil/attach.cpp
index 0bcb9630d5..819834b0a6 100644
--- a/components/sceneutil/attach.cpp
+++ b/components/sceneutil/attach.cpp
@@ -2,18 +2,18 @@
 
 #include <stdexcept>
 
-#include <osg/NodeVisitor>
-#include <osg/Group>
-#include <osg/Geometry>
 #include <osg/FrontFace>
-#include <osg/PositionAttitudeTransform>
+#include <osg/Geometry>
+#include <osg/Group>
 #include <osg/MatrixTransform>
+#include <osg/NodeVisitor>
+#include <osg/PositionAttitudeTransform>
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/strings/lower.hpp>
 
-#include <components/sceneutil/skeleton.hpp>
 #include <components/resource/scenemanager.hpp>
+#include <components/sceneutil/skeleton.hpp>
 
 #include "visitor.hpp"
 
@@ -30,18 +30,9 @@ namespace SceneUtil
         {
         }
 
-        void apply(osg::MatrixTransform& node) override
-        {
-            traverse(node);
-        }
-        void apply(osg::Node& node) override
-        {
-            traverse(node);
-        }
-        void apply(osg::Group& node) override
-        {
-            traverse(node);
-        }
+        void apply(osg::MatrixTransform& node) override { traverse(node); }
+        void apply(osg::Node& node) override { traverse(node); }
+        void apply(osg::Group& node) override { traverse(node); }
 
         void apply(osg::Drawable& drawable) override
         {
@@ -49,7 +40,7 @@ namespace SceneUtil
                 return;
 
             const osg::Node* node = &drawable;
-            for (auto it = getNodePath().rbegin()+1; it != getNodePath().rend(); ++it)
+            for (auto it = getNodePath().rbegin() + 1; it != getNodePath().rend(); ++it)
             {
                 const osg::Node* parent = *it;
                 if (!filterMatches(parent->getName()))
@@ -69,7 +60,6 @@ namespace SceneUtil
         }
 
     private:
-
         bool filterMatches(std::string_view name) const
         {
             if (Misc::StringUtils::ciStartsWith(name, mFilter))
@@ -91,17 +81,19 @@ namespace SceneUtil
     {
         if (!source)
             return;
-    
+
         if (!target->getUserDataContainer())
             target->setUserDataContainer(osg::clone(source, osg::CopyOp::SHALLOW_COPY));
         else
         {
-            for (unsigned int i=0; i<source->getNumUserObjects(); ++i)
-                target->getUserDataContainer()->addUserObject(osg::clone(source->getUserObject(i), osg::CopyOp::SHALLOW_COPY));
+            for (unsigned int i = 0; i < source->getNumUserObjects(); ++i)
+                target->getUserDataContainer()->addUserObject(
+                    osg::clone(source->getUserObject(i), osg::CopyOp::SHALLOW_COPY));
         }
     }
 
-    osg::ref_ptr<osg::Node> attach(osg::ref_ptr<const osg::Node> toAttach, osg::Node* master, std::string_view filter, osg::Group* attachNode, Resource::SceneManager* sceneManager, const osg::Quat* attitude)
+    osg::ref_ptr<osg::Node> attach(osg::ref_ptr<const osg::Node> toAttach, osg::Node* master, std::string_view filter,
+        osg::Group* attachNode, Resource::SceneManager* sceneManager, const osg::Quat* attitude)
     {
         if (dynamic_cast<const SceneUtil::Skeleton*>(toAttach.get()))
         {
@@ -110,7 +102,8 @@ namespace SceneUtil
             CopyRigVisitor copyVisitor(handle, filter);
             const_cast<osg::Node*>(toAttach.get())->accept(copyVisitor);
             copyVisitor.doCopy(sceneManager);
-            // add a ref to the original template to hint to the cache that it is still being used and should be kept in cache.
+            // add a ref to the original template to hint to the cache that it is still being used and should be kept in
+            // cache.
             handle->getOrCreateUserDataContainer()->addUserObject(new Resource::TemplateRef(toAttach));
 
             if (handle->getNumChildren() == 1)
@@ -158,8 +151,9 @@ namespace SceneUtil
                 trans->setScale(osg::Vec3f(-1.f, 1.f, 1.f));
 
                 // Need to invert culling because of the negative scale
-                // Note: for absolute correctness we would need to check the current front face for every mesh then invert it
-                // However MW isn't doing this either, so don't. Assuming all meshes are using backface culling is more efficient.
+                // Note: for absolute correctness we would need to check the current front face for every mesh then
+                // invert it However MW isn't doing this either, so don't. Assuming all meshes are using backface
+                // culling is more efficient.
                 static osg::ref_ptr<osg::StateSet> frontFaceStateSet;
                 if (!frontFaceStateSet)
                 {
@@ -171,7 +165,7 @@ namespace SceneUtil
                 trans->setStateSet(frontFaceStateSet);
             }
 
-            if(attitude)
+            if (attitude)
             {
                 if (!trans)
                     trans = new osg::PositionAttitudeTransform;
diff --git a/components/sceneutil/attach.hpp b/components/sceneutil/attach.hpp
index ab55f9c2f0..519085eb92 100644
--- a/components/sceneutil/attach.hpp
+++ b/components/sceneutil/attach.hpp
@@ -19,12 +19,14 @@ namespace Resource
 namespace SceneUtil
 {
 
-    /// Clone and attach parts of the \a toAttach scenegraph to the \a master scenegraph, using the specified filter and attachment node.
-    /// If the \a toAttach scene graph contains skinned objects, we will attach only those (filtered by the \a filter).
-    /// Otherwise, just attach all of the toAttach scenegraph to the attachment node on the master scenegraph, with no filtering.
+    /// Clone and attach parts of the \a toAttach scenegraph to the \a master scenegraph, using the specified filter and
+    /// attachment node. If the \a toAttach scene graph contains skinned objects, we will attach only those (filtered by
+    /// the \a filter). Otherwise, just attach all of the toAttach scenegraph to the attachment node on the master
+    /// scenegraph, with no filtering.
     /// @note The master scene graph is expected to include a skeleton.
     /// @return A newly created node that is directly attached to the master scene graph
-    osg::ref_ptr<osg::Node> attach(osg::ref_ptr<const osg::Node> toAttach, osg::Node* master, std::string_view filter, osg::Group* attachNode, Resource::SceneManager* sceneManager, const osg::Quat* attitude = nullptr);
+    osg::ref_ptr<osg::Node> attach(osg::ref_ptr<const osg::Node> toAttach, osg::Node* master, std::string_view filter,
+        osg::Group* attachNode, Resource::SceneManager* sceneManager, const osg::Quat* attitude = nullptr);
 
 }
 
diff --git a/components/sceneutil/clearcolor.hpp b/components/sceneutil/clearcolor.hpp
index 1a386548ca..17766bf6d1 100755
--- a/components/sceneutil/clearcolor.hpp
+++ b/components/sceneutil/clearcolor.hpp
@@ -9,15 +9,26 @@ namespace SceneUtil
     class ClearColor : public osg::StateAttribute
     {
     public:
-        ClearColor() : mMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT) {}
-        ClearColor(const osg::Vec4f& color, GLbitfield mask) : mColor(color), mMask(mask) {}
+        ClearColor()
+            : mMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)
+        {
+        }
+        ClearColor(const osg::Vec4f& color, GLbitfield mask)
+            : mColor(color)
+            , mMask(mask)
+        {
+        }
 
-        ClearColor(const ClearColor& copy,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
-            : osg::StateAttribute(copy,copyop), mColor(copy.mColor), mMask(copy.mMask) {}
+        ClearColor(const ClearColor& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY)
+            : osg::StateAttribute(copy, copyop)
+            , mColor(copy.mColor)
+            , mMask(copy.mMask)
+        {
+        }
 
         META_StateAttribute(fx, ClearColor, static_cast<osg::StateAttribute::Type>(100))
 
-        int compare(const StateAttribute& sa) const override
+            int compare(const StateAttribute& sa) const override
         {
             COMPARE_StateAttribute_Types(ClearColor, sa);
 
diff --git a/components/sceneutil/clone.cpp b/components/sceneutil/clone.cpp
index 99a12c1677..f07a1bfaae 100644
--- a/components/sceneutil/clone.cpp
+++ b/components/sceneutil/clone.cpp
@@ -5,9 +5,9 @@
 #include <osgAnimation/MorphGeometry>
 #include <osgAnimation/RigGeometry>
 
+#include <osgParticle/Emitter>
 #include <osgParticle/ParticleProcessor>
 #include <osgParticle/ParticleSystemUpdater>
-#include <osgParticle/Emitter>
 
 #include <components/sceneutil/morphgeometry.hpp>
 #include <components/sceneutil/riggeometry.hpp>
@@ -19,32 +19,35 @@ namespace SceneUtil
     CopyOp::CopyOp()
     {
         setCopyFlags(osg::CopyOp::DEEP_COPY_NODES
-                     // Controller might need different inputs per scene instance
-                     | osg::CopyOp::DEEP_COPY_CALLBACKS
-                     | osg::CopyOp::DEEP_COPY_USERDATA);
+            // Controller might need different inputs per scene instance
+            | osg::CopyOp::DEEP_COPY_CALLBACKS | osg::CopyOp::DEEP_COPY_USERDATA);
     }
 
-    osg::Node* CopyOp::operator ()(const osg::Node* node) const
+    osg::Node* CopyOp::operator()(const osg::Node* node) const
     {
         if (const osgParticle::ParticleProcessor* processor = dynamic_cast<const osgParticle::ParticleProcessor*>(node))
             return operator()(processor);
-        if (const osgParticle::ParticleSystemUpdater* updater = dynamic_cast<const osgParticle::ParticleSystemUpdater*>(node))
+        if (const osgParticle::ParticleSystemUpdater* updater
+            = dynamic_cast<const osgParticle::ParticleSystemUpdater*>(node))
         {
-            osgParticle::ParticleSystemUpdater* cloned = new osgParticle::ParticleSystemUpdater(*updater, osg::CopyOp::SHALLOW_COPY);
+            osgParticle::ParticleSystemUpdater* cloned
+                = new osgParticle::ParticleSystemUpdater(*updater, osg::CopyOp::SHALLOW_COPY);
             mUpdaterToOldPs[cloned] = updater->getParticleSystem(0);
             return cloned;
         }
         return osg::CopyOp::operator()(node);
     }
 
-    osg::Drawable* CopyOp::operator ()(const osg::Drawable* drawable) const
+    osg::Drawable* CopyOp::operator()(const osg::Drawable* drawable) const
     {
         if (const osgParticle::ParticleSystem* partsys = dynamic_cast<const osgParticle::ParticleSystem*>(drawable))
             return operator()(partsys);
 
-        if (dynamic_cast<const SceneUtil::RigGeometry*>(drawable) || dynamic_cast<const SceneUtil::MorphGeometry*>(drawable) ||
-            dynamic_cast<const osgAnimation::RigGeometry*>(drawable) || dynamic_cast<const osgAnimation::MorphGeometry*>(drawable) ||
-            dynamic_cast<const SceneUtil::RigGeometryHolder*>(drawable))
+        if (dynamic_cast<const SceneUtil::RigGeometry*>(drawable)
+            || dynamic_cast<const SceneUtil::MorphGeometry*>(drawable)
+            || dynamic_cast<const osgAnimation::RigGeometry*>(drawable)
+            || dynamic_cast<const osgAnimation::MorphGeometry*>(drawable)
+            || dynamic_cast<const SceneUtil::RigGeometryHolder*>(drawable))
         {
             return static_cast<osg::Drawable*>(drawable->clone(*this));
         }
@@ -52,9 +55,10 @@ namespace SceneUtil
         return osg::CopyOp::operator()(drawable);
     }
 
-    osgParticle::ParticleProcessor* CopyOp::operator() (const osgParticle::ParticleProcessor* processor) const
+    osgParticle::ParticleProcessor* CopyOp::operator()(const osgParticle::ParticleProcessor* processor) const
     {
-        osgParticle::ParticleProcessor* cloned = static_cast<osgParticle::ParticleProcessor*>(processor->clone(osg::CopyOp::DEEP_COPY_CALLBACKS));
+        osgParticle::ParticleProcessor* cloned
+            = static_cast<osgParticle::ParticleProcessor*>(processor->clone(osg::CopyOp::DEEP_COPY_CALLBACKS));
         for (const auto& oldPsNewPsPair : mOldPsToNewPs)
         {
             if (processor->getParticleSystem() == oldPsNewPsPair.first)
@@ -68,7 +72,7 @@ namespace SceneUtil
         return cloned;
     }
 
-    osgParticle::ParticleSystem* CopyOp::operator ()(const osgParticle::ParticleSystem* partsys) const
+    osgParticle::ParticleSystem* CopyOp::operator()(const osgParticle::ParticleSystem* partsys) const
     {
         osgParticle::ParticleSystem* cloned = static_cast<osgParticle::ParticleSystem*>(partsys->clone(*this));
 
diff --git a/components/sceneutil/clone.hpp b/components/sceneutil/clone.hpp
index 35240cbfba..b755280b61 100644
--- a/components/sceneutil/clone.hpp
+++ b/components/sceneutil/clone.hpp
@@ -18,18 +18,19 @@ namespace SceneUtil
     /// @par Defines the cloning behaviour we need:
     /// * Assigns updated ParticleSystem pointers on cloned emitters and programs.
     /// * Deep copies RigGeometry and MorphGeometry so they can animate without affecting clones.
-    /// @warning Avoid using this class directly. The safety of cloning operations depends on the copy flags and the objects involved. Consider using SceneManager::cloneNode for additional safety.
+    /// @warning Avoid using this class directly. The safety of cloning operations depends on the copy flags and the
+    /// objects involved. Consider using SceneManager::cloneNode for additional safety.
     /// @warning Do not use an object of this class for more than one copy operation.
     class CopyOp : public osg::CopyOp
     {
     public:
         CopyOp();
 
-        virtual osgParticle::ParticleSystem* operator() (const osgParticle::ParticleSystem* partsys) const;
-        virtual osgParticle::ParticleProcessor* operator() (const osgParticle::ParticleProcessor* processor) const;
+        virtual osgParticle::ParticleSystem* operator()(const osgParticle::ParticleSystem* partsys) const;
+        virtual osgParticle::ParticleProcessor* operator()(const osgParticle::ParticleProcessor* processor) const;
 
-        osg::Node* operator() (const osg::Node* node) const override;
-        osg::Drawable* operator() (const osg::Drawable* drawable) const override;
+        osg::Node* operator()(const osg::Node* node) const override;
+        osg::Drawable* operator()(const osg::Drawable* drawable) const override;
 
     private:
         // maps new pointers to their old pointers
diff --git a/components/sceneutil/color.hpp b/components/sceneutil/color.hpp
index e4812d1149..d6a8023838 100644
--- a/components/sceneutil/color.hpp
+++ b/components/sceneutil/color.hpp
@@ -19,8 +19,10 @@ namespace SceneUtil
         class SelectColorFormatOperation final : public osg::GraphicsOperation
         {
         public:
-            SelectColorFormatOperation() : GraphicsOperation("SelectColorFormatOperation", false)
-            {}
+            SelectColorFormatOperation()
+                : GraphicsOperation("SelectColorFormatOperation", false)
+            {
+            }
 
             void operator()(osg::GraphicsContext* graphicsContext) override;
 
@@ -99,8 +101,8 @@ namespace SceneUtil
 #define GL_RGB10_A2 0x906F
 #endif
 
-#ifndef GL_RGB10_A2UI 
-#define GL_RGB10_A2UI  0x906F
+#ifndef GL_RGB10_A2UI
+#define GL_RGB10_A2UI 0x906F
 #endif
 
 #ifndef GL_RGBA12
@@ -151,7 +153,6 @@ namespace SceneUtil
 #define GL_R11F_G11F_B10F 0x8C3A
 #endif
 
-
 #ifndef GL_RGB8I
 #define GL_RGB8I 0x8D8F
 #endif
diff --git a/components/sceneutil/controller.cpp b/components/sceneutil/controller.cpp
index 2c7507d0a3..e416d589bf 100644
--- a/components/sceneutil/controller.cpp
+++ b/components/sceneutil/controller.cpp
@@ -12,10 +12,7 @@
 namespace SceneUtil
 {
 
-
-    Controller::Controller()
-    {
-    }
+    Controller::Controller() {}
 
     bool Controller::hasInput() const
     {
@@ -50,11 +47,9 @@ namespace SceneUtil
         return mFunction;
     }
 
-    FrameTimeSource::FrameTimeSource()
-    {
-    }
+    FrameTimeSource::FrameTimeSource() {}
 
-    float FrameTimeSource::getValue(osg::NodeVisitor *nv)
+    float FrameTimeSource::getValue(osg::NodeVisitor* nv)
     {
         return nv->getFrameStamp()->getSimulationTime();
     }
@@ -62,25 +57,24 @@ namespace SceneUtil
     ControllerVisitor::ControllerVisitor()
         : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
     {
-
     }
 
-    void ControllerVisitor::apply(osg::Node &node)
+    void ControllerVisitor::apply(osg::Node& node)
     {
         applyNode(node);
     }
 
-    void ControllerVisitor::apply(osg::MatrixTransform &node)
+    void ControllerVisitor::apply(osg::MatrixTransform& node)
     {
         applyNode(node);
     }
 
-    void ControllerVisitor::apply(osg::Geometry &node)
+    void ControllerVisitor::apply(osg::Geometry& node)
     {
         applyNode(node);
     }
 
-    void ControllerVisitor::applyNode(osg::Node &node)
+    void ControllerVisitor::applyNode(osg::Node& node)
     {
         osg::Callback* callback = node.getUpdateCallback();
         while (callback)
@@ -89,7 +83,7 @@ namespace SceneUtil
                 visit(node, *ctrl);
             if (CompositeStateSetUpdater* composite = dynamic_cast<CompositeStateSetUpdater*>(callback))
             {
-                for (unsigned int i=0; i<composite->getNumControllers(); ++i)
+                for (unsigned int i = 0; i < composite->getNumControllers(); ++i)
                 {
                     StateSetUpdater* statesetcontroller = composite->getController(i);
                     if (Controller* ctrl = dynamic_cast<Controller*>(statesetcontroller))
@@ -115,7 +109,7 @@ namespace SceneUtil
     {
     }
 
-    void AssignControllerSourcesVisitor::visit(osg::Node&, Controller &ctrl)
+    void AssignControllerSourcesVisitor::visit(osg::Node&, Controller& ctrl)
     {
         if (!ctrl.getSource())
             ctrl.setSource(mToAssign);
@@ -131,7 +125,7 @@ namespace SceneUtil
     {
     }
 
-    void ForceControllerSourcesVisitor::visit(osg::Node&, Controller &ctrl)
+    void ForceControllerSourcesVisitor::visit(osg::Node&, Controller& ctrl)
     {
         ctrl.setSource(mToAssign);
     }
@@ -142,7 +136,7 @@ namespace SceneUtil
     {
     }
 
-    void FindMaxControllerLengthVisitor::visit(osg::Node &, Controller &ctrl)
+    void FindMaxControllerLengthVisitor::visit(osg::Node&, Controller& ctrl)
     {
         if (ctrl.getFunction())
             mMaxLength = std::max(mMaxLength, ctrl.getFunction()->getMaximum());
diff --git a/components/sceneutil/controller.hpp b/components/sceneutil/controller.hpp
index 6ef800f05b..3f30e4ea03 100644
--- a/components/sceneutil/controller.hpp
+++ b/components/sceneutil/controller.hpp
@@ -10,7 +10,7 @@ namespace SceneUtil
     class ControllerSource
     {
     public:
-        virtual ~ControllerSource() { }
+        virtual ~ControllerSource() {}
         virtual float getValue(osg::NodeVisitor* nv) = 0;
     };
 
@@ -21,7 +21,8 @@ namespace SceneUtil
         float getValue(osg::NodeVisitor* nv) override;
     };
 
-    /// @note ControllerFunctions may be shared - you should not hold any state in it. That is why all its methods are declared const.
+    /// @note ControllerFunctions may be shared - you should not hold any state in it. That is why all its methods are
+    /// declared const.
     class ControllerFunction
     {
     public:
@@ -82,7 +83,8 @@ namespace SceneUtil
         AssignControllerSourcesVisitor(std::shared_ptr<ControllerSource> toAssign);
 
         /// Assign the wanted ControllerSource. May be overridden in derived classes.
-        /// By default assigns the ControllerSource passed to the constructor of this class if no ControllerSource is assigned to that controller yet.
+        /// By default assigns the ControllerSource passed to the constructor of this class if no ControllerSource is
+        /// assigned to that controller yet.
         void visit(osg::Node& node, Controller& ctrl) override;
 
     protected:
@@ -105,7 +107,7 @@ namespace SceneUtil
     public:
         FindMaxControllerLengthVisitor();
 
-        void visit(osg::Node& , Controller& ctrl) override;
+        void visit(osg::Node&, Controller& ctrl) override;
 
         float getMaxLength() const;
 
diff --git a/components/sceneutil/depth.cpp b/components/sceneutil/depth.cpp
index f51c973389..d6fc0172cb 100644
--- a/components/sceneutil/depth.cpp
+++ b/components/sceneutil/depth.cpp
@@ -14,34 +14,22 @@ namespace SceneUtil
 
     osg::Matrix getReversedZProjectionMatrixAsPerspectiveInf(double fov, double aspect, double near)
     {
-        double A = 1.0/std::tan(osg::DegreesToRadians(fov)/2.0);
-        return osg::Matrix(
-            A/aspect,   0,      0,      0,
-            0,          A,      0,      0,
-            0,          0,      0,      -1,
-            0,          0,      near,   0
-        );
+        double A = 1.0 / std::tan(osg::DegreesToRadians(fov) / 2.0);
+        return osg::Matrix(A / aspect, 0, 0, 0, 0, A, 0, 0, 0, 0, 0, -1, 0, 0, near, 0);
     }
 
     osg::Matrix getReversedZProjectionMatrixAsPerspective(double fov, double aspect, double near, double far)
     {
-        double A = 1.0/std::tan(osg::DegreesToRadians(fov)/2.0);
+        double A = 1.0 / std::tan(osg::DegreesToRadians(fov) / 2.0);
         return osg::Matrix(
-            A/aspect,   0,      0,                          0,
-            0,          A,      0,                          0,
-            0,          0,      near/(far-near),            -1,
-            0,          0,      (far*near)/(far - near),    0
-        );
+            A / aspect, 0, 0, 0, 0, A, 0, 0, 0, 0, near / (far - near), -1, 0, 0, (far * near) / (far - near), 0);
     }
 
-    osg::Matrix getReversedZProjectionMatrixAsOrtho(double left, double right, double bottom, double top, double near, double far)
+    osg::Matrix getReversedZProjectionMatrixAsOrtho(
+        double left, double right, double bottom, double top, double near, double far)
     {
-        return osg::Matrix(
-            2/(right-left),             0,                          0,                  0,
-            0,                          2/(top-bottom),             0,                  0,
-            0,                          0,                          1/(far-near),       0,
-            (right+left)/(left-right),  (top+bottom)/(bottom-top),  far/(far-near),     1
-        );
+        return osg::Matrix(2 / (right - left), 0, 0, 0, 0, 2 / (top - bottom), 0, 0, 0, 0, 1 / (far - near), 0,
+            (right + left) / (left - right), (top + bottom) / (bottom - top), far / (far - near), 1);
     }
 
     bool isDepthFormat(GLenum format)
@@ -75,30 +63,30 @@ namespace SceneUtil
     {
         switch (internalFormat)
         {
-        case GL_DEPTH_COMPONENT16:
-        case GL_DEPTH_COMPONENT24:
-        case GL_DEPTH_COMPONENT32:
-            sourceType = GL_UNSIGNED_INT;
-            sourceFormat = GL_DEPTH_COMPONENT;
-            break;
-        case GL_DEPTH_COMPONENT32F:
-        case GL_DEPTH_COMPONENT32F_NV:
-            sourceType = GL_FLOAT;
-            sourceFormat = GL_DEPTH_COMPONENT;
-            break;
-        case GL_DEPTH24_STENCIL8:
-            sourceType = GL_UNSIGNED_INT_24_8_EXT;
-            sourceFormat = GL_DEPTH_STENCIL_EXT;
-            break;
-        case GL_DEPTH32F_STENCIL8:
-        case GL_DEPTH32F_STENCIL8_NV:
-            sourceType = GL_FLOAT_32_UNSIGNED_INT_24_8_REV;
-            sourceFormat = GL_DEPTH_STENCIL_EXT;
-            break;
-        default:
-            sourceType = GL_UNSIGNED_INT;
-            sourceFormat = GL_DEPTH_COMPONENT;
-            break;
+            case GL_DEPTH_COMPONENT16:
+            case GL_DEPTH_COMPONENT24:
+            case GL_DEPTH_COMPONENT32:
+                sourceType = GL_UNSIGNED_INT;
+                sourceFormat = GL_DEPTH_COMPONENT;
+                break;
+            case GL_DEPTH_COMPONENT32F:
+            case GL_DEPTH_COMPONENT32F_NV:
+                sourceType = GL_FLOAT;
+                sourceFormat = GL_DEPTH_COMPONENT;
+                break;
+            case GL_DEPTH24_STENCIL8:
+                sourceType = GL_UNSIGNED_INT_24_8_EXT;
+                sourceFormat = GL_DEPTH_STENCIL_EXT;
+                break;
+            case GL_DEPTH32F_STENCIL8:
+            case GL_DEPTH32F_STENCIL8_NV:
+                sourceType = GL_FLOAT_32_UNSIGNED_INT_24_8_REV;
+                sourceFormat = GL_DEPTH_STENCIL_EXT;
+                break;
+            default:
+                sourceType = GL_UNSIGNED_INT;
+                sourceFormat = GL_DEPTH_COMPONENT;
+                break;
         }
     }
 
@@ -106,18 +94,18 @@ namespace SceneUtil
     {
         switch (internalFormat)
         {
-        case GL_DEPTH24_STENCIL8:
-            return GL_DEPTH_COMPONENT24;
-            break;
-        case GL_DEPTH32F_STENCIL8:
-            return GL_DEPTH_COMPONENT32F;
-            break;
-        case GL_DEPTH32F_STENCIL8_NV:
-            return GL_DEPTH_COMPONENT32F_NV;
-            break;
-        default:
-            return internalFormat;
-            break;
+            case GL_DEPTH24_STENCIL8:
+                return GL_DEPTH_COMPONENT24;
+                break;
+            case GL_DEPTH32F_STENCIL8:
+                return GL_DEPTH_COMPONENT32F;
+                break;
+            case GL_DEPTH32F_STENCIL8_NV:
+                return GL_DEPTH_COMPONENT32F_NV;
+                break;
+            default:
+                return internalFormat;
+                break;
         }
     }
 
@@ -156,7 +144,8 @@ namespace SceneUtil
             }
             else
             {
-                Log(Debug::Warning) << errPreamble << "'GL_ARB_depth_buffer_float' and 'GL_NV_depth_buffer_float' unsupported.";
+                Log(Debug::Warning) << errPreamble
+                                    << "'GL_ARB_depth_buffer_float' and 'GL_NV_depth_buffer_float' unsupported.";
             }
         }
 
@@ -169,7 +158,8 @@ namespace SceneUtil
         {
             for (auto requestedFormat : requestedFormats)
             {
-                if (std::find(mSupportedFormats.cbegin(), mSupportedFormats.cend(), requestedFormat) != mSupportedFormats.cend())
+                if (std::find(mSupportedFormats.cbegin(), mSupportedFormats.cend(), requestedFormat)
+                    != mSupportedFormats.cend())
                 {
                     SceneUtil::AutoDepth::setDepthFormat(requestedFormat);
                     break;
diff --git a/components/sceneutil/depth.hpp b/components/sceneutil/depth.hpp
index f7b1875206..ccc214ae3e 100644
--- a/components/sceneutil/depth.hpp
+++ b/components/sceneutil/depth.hpp
@@ -43,7 +43,8 @@ namespace SceneUtil
     osg::Matrix getReversedZProjectionMatrixAsPerspective(double fov, double aspect, double near, double far);
 
     // Returns an orthographic projection matrix for use with a reversed z-buffer.
-    osg::Matrix getReversedZProjectionMatrixAsOrtho(double left, double right, double bottom, double top, double near, double far);
+    osg::Matrix getReversedZProjectionMatrixAsOrtho(
+        double left, double right, double bottom, double top, double near, double far);
 
     // Returns true if the GL format is a depth format
     bool isDepthFormat(GLenum format);
@@ -57,11 +58,13 @@ namespace SceneUtil
     // Converts depth-stencil formats to their corresponding depth formats.
     GLenum getDepthFormatOfDepthStencilFormat(GLenum internalFormat);
 
-    // Brief wrapper around an osg::Depth that applies the reversed depth function when a reversed depth buffer is in use
+    // Brief wrapper around an osg::Depth that applies the reversed depth function when a reversed depth buffer is in
+    // use
     class AutoDepth : public osg::Depth
     {
     public:
-        AutoDepth(osg::Depth::Function func=osg::Depth::LESS, double zNear=0.0, double zFar=1.0, bool writeMask=true)
+        AutoDepth(
+            osg::Depth::Function func = osg::Depth::LESS, double zNear = 0.0, double zFar = 1.0, bool writeMask = true)
         {
             setFunction(func);
             setZNear(zNear);
@@ -69,20 +72,23 @@ namespace SceneUtil
             setWriteMask(writeMask);
         }
 
-        AutoDepth(const osg::Depth& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY) : osg::Depth(copy, copyop) {}
+        AutoDepth(const osg::Depth& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY)
+            : osg::Depth(copy, copyop)
+        {
+        }
 
         osg::Object* cloneType() const override { return new AutoDepth; }
-        osg::Object* clone(const osg::CopyOp& copyop) const override { return new AutoDepth(*this,copyop); }
+        osg::Object* clone(const osg::CopyOp& copyop) const override { return new AutoDepth(*this, copyop); }
 
         void apply(osg::State& state) const override
         {
             glDepthFunc(static_cast<GLenum>(AutoDepth::isReversed() ? getReversedDepthFunction() : getFunction()));
             glDepthMask(static_cast<GLboolean>(getWriteMask()));
-        #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE) || defined(OSG_GLES3_AVAILABLE)
-            glDepthRangef(getZNear(),getZFar());
-        #else
-            glDepthRange(getZNear(),getZFar());
-        #endif
+#if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE) || defined(OSG_GLES3_AVAILABLE)
+            glDepthRangef(getZNear(), getZFar());
+#else
+            glDepthRange(getZNear(), getZFar());
+#endif
         }
 
         static void setReversed(bool reverseZ)
@@ -119,7 +125,6 @@ namespace SceneUtil
         }
 
     private:
-
         static inline bool sReversed = false;
         static inline GLenum sDepthSourceFormat = GL_DEPTH_COMPONENT;
         static inline GLenum sDepthInternalFormat = GL_DEPTH_COMPONENT24;
@@ -131,26 +136,28 @@ namespace SceneUtil
 
             switch (func)
             {
-            case osg::Depth::LESS:
-                return osg::Depth::GREATER;
-            case osg::Depth::LEQUAL:
-                return osg::Depth::GEQUAL;
-            case osg::Depth::GREATER:
-                return osg::Depth::LESS;
-            case osg::Depth::GEQUAL:
-                return osg::Depth::LEQUAL;
-            default:
-                return func;
+                case osg::Depth::LESS:
+                    return osg::Depth::GREATER;
+                case osg::Depth::LEQUAL:
+                    return osg::Depth::GEQUAL;
+                case osg::Depth::GREATER:
+                    return osg::Depth::LESS;
+                case osg::Depth::GEQUAL:
+                    return osg::Depth::LEQUAL;
+                default:
+                    return func;
             }
         }
-
     };
 
     // Replaces all nodes osg::Depth state attributes with SceneUtil::AutoDepth.
     class ReplaceDepthVisitor : public osg::NodeVisitor
     {
     public:
-        ReplaceDepthVisitor() : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN) {}
+        ReplaceDepthVisitor()
+            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+        {
+        }
 
         void apply(osg::Node& node) override
         {
@@ -169,15 +176,14 @@ namespace SceneUtil
     class SelectDepthFormatOperation : public osg::GraphicsOperation
     {
     public:
-        SelectDepthFormatOperation() : GraphicsOperation("SelectDepthFormatOperation", false)
-        {}
+        SelectDepthFormatOperation()
+            : GraphicsOperation("SelectDepthFormatOperation", false)
+        {
+        }
 
         void operator()(osg::GraphicsContext* graphicsContext) override;
 
-        void setSupportedFormats(const std::vector<GLenum>& supportedFormats)
-        {
-            mSupportedFormats = supportedFormats;
-        }
+        void setSupportedFormats(const std::vector<GLenum>& supportedFormats) { mSupportedFormats = supportedFormats; }
 
     private:
         std::vector<GLenum> mSupportedFormats;
diff --git a/components/sceneutil/detourdebugdraw.cpp b/components/sceneutil/detourdebugdraw.cpp
index 62e7ea71c0..3e07d17a23 100644
--- a/components/sceneutil/detourdebugdraw.cpp
+++ b/components/sceneutil/detourdebugdraw.cpp
@@ -20,16 +20,16 @@ namespace
             case DU_DRAW_QUADS:
                 return osg::PrimitiveSet::QUADS;
         }
-        throw std::logic_error("Can't convert duDebugDrawPrimitives to osg::PrimitiveSet::Mode, value="
-                               + std::to_string(value));
+        throw std::logic_error(
+            "Can't convert duDebugDrawPrimitives to osg::PrimitiveSet::Mode, value=" + std::to_string(value));
     }
 
 }
 
 namespace SceneUtil
 {
-    DebugDraw::DebugDraw(osg::Group& group, const osg::ref_ptr<osg::StateSet>& stateSet,
-        const osg::Vec3f& shift, float recastInvertedScaleFactor)
+    DebugDraw::DebugDraw(osg::Group& group, const osg::ref_ptr<osg::StateSet>& stateSet, const osg::Vec3f& shift,
+        float recastInvertedScaleFactor)
         : mGroup(group)
         , mStateSet(stateSet)
         , mShift(shift)
@@ -39,13 +39,9 @@ namespace SceneUtil
     {
     }
 
-    void DebugDraw::depthMask(bool)
-    {
-    }
+    void DebugDraw::depthMask(bool) {}
 
-    void DebugDraw::texture(bool)
-    {
-    }
+    void DebugDraw::texture(bool) {}
 
     void DebugDraw::begin(osg::PrimitiveSet::Mode mode, float size)
     {
diff --git a/components/sceneutil/detourdebugdraw.hpp b/components/sceneutil/detourdebugdraw.hpp
index 1d00735ea0..1da68db73b 100644
--- a/components/sceneutil/detourdebugdraw.hpp
+++ b/components/sceneutil/detourdebugdraw.hpp
@@ -15,8 +15,8 @@ namespace SceneUtil
     class DebugDraw : public duDebugDraw
     {
     public:
-        explicit DebugDraw(osg::Group& group, const osg::ref_ptr<osg::StateSet>& stateSet,
-            const osg::Vec3f& shift, float recastInvertedScaleFactor);
+        explicit DebugDraw(osg::Group& group, const osg::ref_ptr<osg::StateSet>& stateSet, const osg::Vec3f& shift,
+            float recastInvertedScaleFactor);
 
         static osg::ref_ptr<osg::StateSet> makeStateSet();
 
@@ -34,8 +34,8 @@ namespace SceneUtil
 
         void vertex(const float* pos, unsigned int color, const float* uv) override;
 
-        void vertex(const float x, const float y, const float z, unsigned int color,
-                const float u, const float v) override;
+        void vertex(
+            const float x, const float y, const float z, unsigned int color, const float u, const float v) override;
 
         void end() override;
 
diff --git a/components/sceneutil/extradata.cpp b/components/sceneutil/extradata.cpp
index 3f5bb6df88..850c2f883b 100644
--- a/components/sceneutil/extradata.cpp
+++ b/components/sceneutil/extradata.cpp
@@ -9,10 +9,10 @@
 #include <yaml-cpp/yaml.h>
 
 #include <components/misc/osguservalues.hpp>
-#include <components/sceneutil/depth.hpp>
 #include <components/resource/scenemanager.hpp>
-#include <components/shader/shadermanager.hpp>
+#include <components/sceneutil/depth.hpp>
 #include <components/serialization/osgyaml.hpp>
+#include <components/shader/shadermanager.hpp>
 
 #include <components/debug/debuglog.hpp>
 
@@ -23,7 +23,8 @@ namespace SceneUtil
         if (!mSceneMgr->getSoftParticles())
             return;
 
-        const int unitSoftEffect = mSceneMgr->getShaderManager().reserveGlobalTextureUnits(Shader::ShaderManager::Slot::OpaqueDepthTexture);
+        const int unitSoftEffect
+            = mSceneMgr->getShaderManager().reserveGlobalTextureUnits(Shader::ShaderManager::Slot::OpaqueDepthTexture);
         static const osg::ref_ptr<SceneUtil::AutoDepth> depth = new SceneUtil::AutoDepth(osg::Depth::LESS, 0, 1, false);
 
         osg::StateSet* stateset = node.getOrCreateStateSet();
diff --git a/components/sceneutil/extradata.hpp b/components/sceneutil/extradata.hpp
index b460bd04d0..cff94c3b06 100644
--- a/components/sceneutil/extradata.hpp
+++ b/components/sceneutil/extradata.hpp
@@ -21,7 +21,11 @@ namespace SceneUtil
     class ProcessExtraDataVisitor : public osg::NodeVisitor
     {
     public:
-        ProcessExtraDataVisitor(Resource::SceneManager* sceneMgr) : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN), mSceneMgr(sceneMgr) {}
+        ProcessExtraDataVisitor(Resource::SceneManager* sceneMgr)
+            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+            , mSceneMgr(sceneMgr)
+        {
+        }
 
         void apply(osg::Node& node) override;
 
diff --git a/components/sceneutil/keyframe.hpp b/components/sceneutil/keyframe.hpp
index eee8d6646c..9e44f2ad7b 100644
--- a/components/sceneutil/keyframe.hpp
+++ b/components/sceneutil/keyframe.hpp
@@ -5,9 +5,9 @@
 
 #include <osg/Object>
 
+#include <components/resource/animation.hpp>
 #include <components/sceneutil/controller.hpp>
 #include <components/sceneutil/textkeymap.hpp>
-#include <components/resource/animation.hpp>
 
 namespace SceneUtil
 {
@@ -18,9 +18,11 @@ namespace SceneUtil
         KeyframeController() {}
 
         KeyframeController(const KeyframeController& copy)
-            : SceneUtil::Controller(copy) {}
+            : SceneUtil::Controller(copy)
+        {
+        }
 
-        virtual osg::Vec3f getTranslation(float time) const  { return osg::Vec3f(); }
+        virtual osg::Vec3f getTranslation(float time) const { return osg::Vec3f(); }
 
         /// @note We could drop this function in favour of osg::Object::asCallback from OSG 3.6 on.
         virtual osg::Callback* getAsCallback() = 0;
@@ -34,12 +36,12 @@ namespace SceneUtil
         TextKeyMapHolder(const TextKeyMapHolder& copy, const osg::CopyOp& copyop)
             : osg::Object(copy, copyop)
             , mTextKeys(copy.mTextKeys)
-        {}
+        {
+        }
 
         TextKeyMap mTextKeys;
 
         META_Object(SceneUtil, TextKeyMapHolder)
-
     };
 
     /// Wrapper object containing the animation track and its KeyframeControllers.
@@ -58,7 +60,7 @@ namespace SceneUtil
         META_Object(SceneUtil, KeyframeHolder)
 
         /// Controllers mapped to node name.
-        typedef std::map<std::string, osg::ref_ptr<const KeyframeController> > KeyframeControllerMap;
+        typedef std::map<std::string, osg::ref_ptr<const KeyframeController>> KeyframeControllerMap;
         KeyframeControllerMap mKeyframeControllers;
     };
 
diff --git a/components/sceneutil/lightcontroller.cpp b/components/sceneutil/lightcontroller.cpp
index 13e367baa4..98af5d21c8 100644
--- a/components/sceneutil/lightcontroller.cpp
+++ b/components/sceneutil/lightcontroller.cpp
@@ -26,14 +26,14 @@ namespace SceneUtil
         mType = type;
     }
 
-    void LightController::operator ()(SceneUtil::LightSource* node, osg::NodeVisitor* nv)
+    void LightController::operator()(SceneUtil::LightSource* node, osg::NodeVisitor* nv)
     {
         double time = nv->getFrameStamp()->getSimulationTime();
         if (mStartTime == 0)
             mStartTime = time;
 
         // disabled early out, light state needs to be set every frame regardless of change, due to the double buffering
-        //if (time == mLastTime)
+        // if (time == mLastTime)
         //    return;
 
         if (mType == LT_Normal)
@@ -45,7 +45,8 @@ namespace SceneUtil
 
         // Updating flickering at 15 FPS like vanilla.
         constexpr float updateRate = 15.f;
-        mTicksToAdvance = static_cast<float>(time - mStartTime - mLastTime) * updateRate * 0.25f + mTicksToAdvance * 0.75f;
+        mTicksToAdvance
+            = static_cast<float>(time - mStartTime - mLastTime) * updateRate * 0.25f + mTicksToAdvance * 0.75f;
         mLastTime = time - mStartTime;
 
         float speed = (mType == LT_Flicker || mType == LT_Pulse) ? 0.1f : 0.05f;
diff --git a/components/sceneutil/lightcontroller.hpp b/components/sceneutil/lightcontroller.hpp
index b67cd59472..13f5501bf9 100644
--- a/components/sceneutil/lightcontroller.hpp
+++ b/components/sceneutil/lightcontroller.hpp
@@ -13,7 +13,8 @@ namespace SceneUtil
     class LightController : public SceneUtil::NodeCallback<LightController, SceneUtil::LightSource*>
     {
     public:
-        enum LightType {
+        enum LightType
+        {
             LT_Normal,
             LT_Flicker,
             LT_FlickerSlow,
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 76e1ea852e..68e2a3cf8f 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -1,22 +1,22 @@
 #include "lightmanager.hpp"
 
+#include <algorithm>
 #include <array>
 #include <cstring>
-#include <algorithm>
 #include <iterator>
 
-#include <osg/BufferObject>
 #include <osg/BufferIndexBinding>
+#include <osg/BufferObject>
 #include <osg/Endian>
 #include <osg/ValueObject>
 
 #include <osgUtil/CullVisitor>
 
-#include <components/sceneutil/util.hpp>
 #include <components/resource/scenemanager.hpp>
+#include <components/sceneutil/util.hpp>
 
-#include <components/misc/hash.hpp>
 #include <components/misc/constants.hpp>
+#include <components/misc/hash.hpp>
 
 #include <components/debug/debuglog.hpp>
 
@@ -26,10 +26,12 @@ namespace
     constexpr int maxLightsUpperLimit = 64;
     constexpr int ffpMaxLights = 8;
 
-    bool sortLights(const SceneUtil::LightManager::LightSourceViewBound* left, const SceneUtil::LightManager::LightSourceViewBound* right)
+    bool sortLights(const SceneUtil::LightManager::LightSourceViewBound* left,
+        const SceneUtil::LightManager::LightSourceViewBound* right)
     {
         static auto constexpr illuminationBias = 81.f;
-        return left->mViewBound.center().length2() - left->mViewBound.radius2()*illuminationBias < right->mViewBound.center().length2() - right->mViewBound.radius2()*illuminationBias;
+        return left->mViewBound.center().length2() - left->mViewBound.radius2() * illuminationBias
+            < right->mViewBound.center().length2() - right->mViewBound.radius2() * illuminationBias;
     }
 
     void configurePosition(osg::Matrixf& mat, const osg::Vec4& pos)
@@ -75,19 +77,19 @@ namespace SceneUtil
     namespace
     {
         const std::unordered_map<std::string, LightingMethod> lightingMethodSettingMap = {
-            {"legacy", LightingMethod::FFP},
-            {"shaders compatibility", LightingMethod::PerObjectUniform},
-            {"shaders", LightingMethod::SingleUBO},
+            { "legacy", LightingMethod::FFP },
+            { "shaders compatibility", LightingMethod::PerObjectUniform },
+            { "shaders", LightingMethod::SingleUBO },
         };
     }
 
     static int sLightId = 0;
 
-    // Handles a GLSL shared layout by using configured offsets and strides to fill a continuous buffer, making the data upload to GPU simpler.
+    // Handles a GLSL shared layout by using configured offsets and strides to fill a continuous buffer, making the data
+    // upload to GPU simpler.
     class LightBuffer : public osg::Referenced
     {
     public:
-
         enum LayoutOffset
         {
             Diffuse,
@@ -99,7 +101,7 @@ namespace SceneUtil
         };
 
         LightBuffer(int count)
-            : mData(new osg::FloatArray(3*4*count))
+            : mData(new osg::FloatArray(3 * 4 * count))
             , mEndian(osg::getCpuByteOrder())
             , mCount(count)
             , mCachedSunPos(osg::Vec4())
@@ -145,25 +147,13 @@ namespace SceneUtil
             std::memcpy(&(*mData)[getOffset(index, AttenuationRadius)], value.ptr(), sizeof(osg::Vec4f));
         }
 
-        auto& getData()
-        {
-            return mData;
-        }
+        auto& getData() { return mData; }
 
-        void dirty()
-        {
-            mData->dirty();
-        }
+        void dirty() { mData->dirty(); }
 
-        static constexpr int queryBlockSize(int sz)
-        {
-            return 3 * osg::Vec4::num_components * sizeof(GLfloat) * sz;
-        }
+        static constexpr int queryBlockSize(int sz) { return 3 * osg::Vec4::num_components * sizeof(GLfloat) * sz; }
 
-        void setCachedSunPos(const osg::Vec4& pos)
-        {
-            mCachedSunPos = pos;
-        }
+        void setCachedSunPos(const osg::Vec4& pos) { mCachedSunPos = pos; }
 
         void uploadCachedSunPos(const osg::Matrix& viewMat)
         {
@@ -176,10 +166,7 @@ namespace SceneUtil
             return mEndian == osg::BigEndian ? value.asABGR() : value.asRGBA();
         }
 
-        int getOffset(int index, LayoutOffset slot) const
-        {
-            return mOffsets.get(index, slot);
-        }
+        int getOffset(int index, LayoutOffset slot) const { return mOffsets.get(index, slot); }
 
         void configureLayout(int offsetColors, int offsetPosition, int offsetAttenuationRadius, int size, int stride)
         {
@@ -197,40 +184,37 @@ namespace SceneUtil
     private:
         class Offsets
         {
-            public:
-                Offsets()
-                    : mStride(12)
-                {
-                    mValues[Diffuse] = 0;
-                    mValues[Ambient] = 1;
-                    mValues[Specular] = 2;
-                    mValues[DiffuseSign] = 3;
-                    mValues[Position] = 4;
-                    mValues[AttenuationRadius] = 8;
-                }
+        public:
+            Offsets()
+                : mStride(12)
+            {
+                mValues[Diffuse] = 0;
+                mValues[Ambient] = 1;
+                mValues[Specular] = 2;
+                mValues[DiffuseSign] = 3;
+                mValues[Position] = 4;
+                mValues[AttenuationRadius] = 8;
+            }
 
-                Offsets(int offsetColors, int offsetPosition, int offsetAttenuationRadius, int stride)
-                    : mStride((offsetAttenuationRadius + sizeof(GLfloat) * osg::Vec4::num_components + stride) / 4)
-                {
-                    constexpr auto sizeofFloat = sizeof(GLfloat);
-                    const auto diffuseOffset = offsetColors / sizeofFloat;
-
-                    mValues[Diffuse] = diffuseOffset;
-                    mValues[Ambient] = diffuseOffset + 1;
-                    mValues[Specular] = diffuseOffset + 2;
-                    mValues[DiffuseSign] = diffuseOffset + 3;
-                    mValues[Position] = offsetPosition / sizeofFloat;
-                    mValues[AttenuationRadius] = offsetAttenuationRadius / sizeofFloat;
-                }
+            Offsets(int offsetColors, int offsetPosition, int offsetAttenuationRadius, int stride)
+                : mStride((offsetAttenuationRadius + sizeof(GLfloat) * osg::Vec4::num_components + stride) / 4)
+            {
+                constexpr auto sizeofFloat = sizeof(GLfloat);
+                const auto diffuseOffset = offsetColors / sizeofFloat;
+
+                mValues[Diffuse] = diffuseOffset;
+                mValues[Ambient] = diffuseOffset + 1;
+                mValues[Specular] = diffuseOffset + 2;
+                mValues[DiffuseSign] = diffuseOffset + 3;
+                mValues[Position] = offsetPosition / sizeofFloat;
+                mValues[AttenuationRadius] = offsetAttenuationRadius / sizeofFloat;
+            }
 
-                int get(int index, LayoutOffset slot) const
-                {
-                    return mStride * index + mValues[slot];
-                }
+            int get(int index, LayoutOffset slot) const { return mStride * index + mValues[slot]; }
 
-            private:
-                int mStride;
-                std::array<int, 6> mValues;
+        private:
+            int mStride;
+            std::array<int, 6> mValues;
         };
 
         void configureLayout(const Offsets& offsets, int size)
@@ -241,9 +225,12 @@ namespace SceneUtil
             mData->resizeArray(static_cast<unsigned>(size));
             for (int i = 0; i < mCount; ++i)
             {
-                std::memcpy(&(*mData)[offsets.get(i, Diffuse)], data.data() + getOffset(i, Diffuse), sizeof(osg::Vec4f));
-                std::memcpy(&(*mData)[offsets.get(i, Position)], data.data() + getOffset(i, Position), sizeof(osg::Vec4f));
-                std::memcpy(&(*mData)[offsets.get(i, AttenuationRadius)], data.data() + getOffset(i, AttenuationRadius), sizeof(osg::Vec4f));
+                std::memcpy(
+                    &(*mData)[offsets.get(i, Diffuse)], data.data() + getOffset(i, Diffuse), sizeof(osg::Vec4f));
+                std::memcpy(
+                    &(*mData)[offsets.get(i, Position)], data.data() + getOffset(i, Position), sizeof(osg::Vec4f));
+                std::memcpy(&(*mData)[offsets.get(i, AttenuationRadius)], data.data() + getOffset(i, AttenuationRadius),
+                    sizeof(osg::Vec4f));
             }
             mOffsets = offsets;
         }
@@ -263,22 +250,23 @@ namespace SceneUtil
     LightStateCache* getLightStateCache(size_t contextid, size_t size = 8)
     {
         static std::vector<LightStateCache> cacheVector;
-        if (cacheVector.size() < contextid+1)
-            cacheVector.resize(contextid+1);
+        if (cacheVector.size() < contextid + 1)
+            cacheVector.resize(contextid + 1);
         cacheVector[contextid].lastAppliedLight.resize(size);
         return &cacheVector[contextid];
     }
 
-    void configureStateSetSunOverride(LightManager* lightManager, const osg::Light* light, osg::StateSet* stateset, int mode)
+    void configureStateSetSunOverride(
+        LightManager* lightManager, const osg::Light* light, osg::StateSet* stateset, int mode)
     {
         auto method = lightManager->getLightingMethod();
         switch (method)
         {
-        case LightingMethod::FFP:
+            case LightingMethod::FFP:
             {
                 break;
             }
-        case LightingMethod::PerObjectUniform:
+            case LightingMethod::PerObjectUniform:
             {
                 osg::Matrixf lightMat;
                 configurePosition(lightMat, light->getPosition());
@@ -289,7 +277,7 @@ namespace SceneUtil
                 stateset->addUniform(lightManager->generateLightBufferUniform(lightMat), mode);
                 break;
             }
-        case LightingMethod::SingleUBO:
+            case LightingMethod::SingleUBO:
             {
                 osg::ref_ptr<LightBuffer> buffer = new LightBuffer(lightManager->getMaxLightsInScene());
 
@@ -300,7 +288,9 @@ namespace SceneUtil
 
                 osg::ref_ptr<osg::UniformBufferObject> ubo = new osg::UniformBufferObject;
                 buffer->getData()->setBufferObject(ubo);
-                osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Resource::SceneManager::UBOBinding::LightBuffer), buffer->getData(), 0, buffer->getData()->getTotalDataSize());
+                osg::ref_ptr<osg::UniformBufferBinding> ubb
+                    = new osg::UniformBufferBinding(static_cast<int>(Resource::SceneManager::UBOBinding::LightBuffer),
+                        buffer->getData(), 0, buffer->getData()->getTotalDataSize());
                 stateset->setAttributeAndModes(ubb, mode);
 
                 break;
@@ -311,15 +301,24 @@ namespace SceneUtil
     class DisableLight : public osg::StateAttribute
     {
     public:
-        DisableLight() : mIndex(0) {}
-        DisableLight(int index) : mIndex(index) {}
+        DisableLight()
+            : mIndex(0)
+        {
+        }
+        DisableLight(int index)
+            : mIndex(index)
+        {
+        }
 
-        DisableLight(const DisableLight& copy,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
-            : osg::StateAttribute(copy,copyop), mIndex(copy.mIndex) {}
+        DisableLight(const DisableLight& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY)
+            : osg::StateAttribute(copy, copyop)
+            , mIndex(copy.mIndex)
+        {
+        }
 
         META_StateAttribute(SceneUtil, DisableLight, osg::StateAttribute::LIGHT)
 
-        unsigned int getMember() const override
+            unsigned int getMember() const override
         {
             return mIndex;
         }
@@ -354,17 +353,26 @@ namespace SceneUtil
     class FFPLightStateAttribute : public osg::StateAttribute
     {
     public:
-        FFPLightStateAttribute() : mIndex(0) {}
-        FFPLightStateAttribute(size_t index, const std::vector<osg::ref_ptr<osg::Light>>& lights) : mIndex(index), mLights(lights) {}
-
-        FFPLightStateAttribute(const FFPLightStateAttribute& copy,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
-            : osg::StateAttribute(copy,copyop), mIndex(copy.mIndex), mLights(copy.mLights) {}
+        FFPLightStateAttribute()
+            : mIndex(0)
+        {
+        }
+        FFPLightStateAttribute(size_t index, const std::vector<osg::ref_ptr<osg::Light>>& lights)
+            : mIndex(index)
+            , mLights(lights)
+        {
+        }
 
-        unsigned int getMember() const override
+        FFPLightStateAttribute(
+            const FFPLightStateAttribute& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY)
+            : osg::StateAttribute(copy, copyop)
+            , mIndex(copy.mIndex)
+            , mLights(copy.mLights)
         {
-            return mIndex;
         }
 
+        unsigned int getMember() const override { return mIndex; }
+
         bool getModeUsage(ModeUsage& usage) const override
         {
             for (size_t i = 0; i < mLights.size(); ++i)
@@ -379,7 +387,7 @@ namespace SceneUtil
 
         META_StateAttribute(SceneUtil, FFPLightStateAttribute, osg::StateAttribute::LIGHT)
 
-        void apply(osg::State& state) const override
+            void apply(osg::State& state) const override
         {
             if (mLights.empty())
                 return;
@@ -391,11 +399,11 @@ namespace SceneUtil
 
             for (size_t i = 0; i < mLights.size(); ++i)
             {
-                osg::Light* current = cache->lastAppliedLight[i+mIndex];
+                osg::Light* current = cache->lastAppliedLight[i + mIndex];
                 if (current != mLights[i].get())
                 {
                     applyLight((GLenum)((int)GL_LIGHT0 + i + mIndex), mLights[i].get());
-                    cache->lastAppliedLight[i+mIndex] = mLights[i].get();
+                    cache->lastAppliedLight[i + mIndex] = mLights[i].get();
                 }
             }
 
@@ -410,9 +418,9 @@ namespace SceneUtil
             glLightfv(lightNum, GL_POSITION, light->getPosition().ptr());
             // TODO: enable this once spot lights are supported
             // need to transform SPOT_DIRECTION by the world matrix?
-            //glLightfv(lightNum, GL_SPOT_DIRECTION, light->getDirection().ptr());
-            //glLightf(lightNum, GL_SPOT_EXPONENT, light->getSpotExponent());
-            //glLightf(lightNum, GL_SPOT_CUTOFF, light->getSpotCutoff());
+            // glLightfv(lightNum, GL_SPOT_DIRECTION, light->getDirection().ptr());
+            // glLightf(lightNum, GL_SPOT_EXPONENT, light->getSpotExponent());
+            // glLightf(lightNum, GL_SPOT_CUTOFF, light->getSpotCutoff());
             glLightf(lightNum, GL_CONSTANT_ATTENUATION, light->getConstantAttenuation());
             glLightf(lightNum, GL_LINEAR_ATTENUATION, light->getLinearAttenuation());
             glLightf(lightNum, GL_QUADRATIC_ATTENUATION, light->getQuadraticAttenuation());
@@ -450,7 +458,8 @@ namespace SceneUtil
             // the first light state attribute handles the actual state setting for all lights
             // it's best to batch these up so that we don't need to touch the modelView matrix more than necessary
             // don't use setAttributeAndModes, that does not support light indices!
-            stateset->setAttribute(new FFPLightStateAttribute(mLightManager->getStartLight(), std::move(lights)), osg::StateAttribute::ON);
+            stateset->setAttribute(
+                new FFPLightStateAttribute(mLightManager->getStartLight(), std::move(lights)), osg::StateAttribute::ON);
 
             for (size_t i = 0; i < lightList.size(); ++i)
                 stateset->setMode(GL_LIGHT0 + mLightManager->getStartLight() + i, osg::StateAttribute::ON);
@@ -458,7 +467,8 @@ namespace SceneUtil
             // need to push some dummy attributes to ensure proper state tracking
             // lights need to reset to their default when the StateSet is popped
             for (size_t i = 1; i < lightList.size(); ++i)
-                stateset->setAttribute(mLightManager->getDummies()[i + mLightManager->getStartLight()].get(), osg::StateAttribute::ON);
+                stateset->setAttribute(
+                    mLightManager->getDummies()[i + mLightManager->getStartLight()].get(), osg::StateAttribute::ON);
 
             return stateset;
         }
@@ -470,7 +480,8 @@ namespace SceneUtil
         {
             osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
 
-            osg::ref_ptr<osg::Uniform> indicesUni = new osg::Uniform(osg::Uniform::Type::INT, "PointLightIndex", mLightManager->getMaxLights());
+            osg::ref_ptr<osg::Uniform> indicesUni
+                = new osg::Uniform(osg::Uniform::Type::INT, "PointLightIndex", mLightManager->getMaxLights());
             int pointCount = 0;
 
             for (size_t i = 0; i < lightList.size(); ++i)
@@ -519,7 +530,8 @@ namespace SceneUtil
         osg::ref_ptr<osg::StateSet> generate(const LightManager::LightList& lightList, size_t frameNum) override
         {
             osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
-            osg::ref_ptr<osg::Uniform> data = mLightManager->generateLightBufferUniform(mLightManager->getSunlightBuffer(frameNum));
+            osg::ref_ptr<osg::Uniform> data
+                = mLightManager->generateLightBufferUniform(mLightManager->getSunlightBuffer(frameNum));
 
             for (size_t i = 0; i < lightList.size(); ++i)
             {
@@ -528,9 +540,10 @@ namespace SceneUtil
                 configurePosition(lightMat, light->getPosition() * mViewMatrix);
                 configureAmbient(lightMat, light->getAmbient());
                 configureDiffuse(lightMat, light->getDiffuse());
-                configureAttenuation(lightMat, light->getConstantAttenuation(), light->getLinearAttenuation(), light->getQuadraticAttenuation(), lightList[i]->mLightSource->getRadius());
+                configureAttenuation(lightMat, light->getConstantAttenuation(), light->getLinearAttenuation(),
+                    light->getQuadraticAttenuation(), lightList[i]->mLightSource->getRadius());
 
-                data->setElement(i+1, lightMat);
+                data->setElement(i + 1, lightMat);
             }
 
             stateset->addUniform(data);
@@ -551,16 +564,21 @@ namespace SceneUtil
     }
 
     // Set on a LightSource. Adds the light source to its light manager for the current frame.
-    // This allows us to keep track of the current lights in the scene graph without tying creation & destruction to the manager.
+    // This allows us to keep track of the current lights in the scene graph without tying creation & destruction to the
+    // manager.
     class CollectLightCallback : public NodeCallback<CollectLightCallback>
     {
     public:
         CollectLightCallback()
-            : mLightManager(nullptr) { }
+            : mLightManager(nullptr)
+        {
+        }
 
         CollectLightCallback(const CollectLightCallback& copy, const osg::CopyOp& copyop)
             : NodeCallback<CollectLightCallback>(copy, copyop)
-            , mLightManager(nullptr) { }
+            , mLightManager(nullptr)
+        {
+        }
 
         META_Object(SceneUtil, CollectLightCallback)
 
@@ -574,7 +592,8 @@ namespace SceneUtil
                     throw std::runtime_error("can't find parent LightManager");
             }
 
-            mLightManager->addLight(static_cast<LightSource*>(node), osg::computeLocalToWorld(nv->getNodePath()), nv->getTraversalNumber());
+            mLightManager->addLight(
+                static_cast<LightSource*>(node), osg::computeLocalToWorld(nv->getNodePath()), nv->getTraversalNumber());
 
             traverse(node, nv);
         }
@@ -587,7 +606,6 @@ namespace SceneUtil
     class LightManagerUpdateCallback : public SceneUtil::NodeCallback<LightManagerUpdateCallback>
     {
     public:
-
         void operator()(osg::Node* node, osg::NodeVisitor* nv)
         {
             LightManager* lightManager = static_cast<LightManager*>(node);
@@ -597,7 +615,8 @@ namespace SceneUtil
         }
     };
 
-    class LightManagerCullCallback : public SceneUtil::NodeCallback<LightManagerCullCallback, LightManager*, osgUtil::CullVisitor*>
+    class LightManagerCullCallback
+        : public SceneUtil::NodeCallback<LightManagerCullCallback, LightManager*, osgUtil::CullVisitor*>
     {
     public:
         LightManagerCullCallback(LightManager* lightManager)
@@ -608,7 +627,9 @@ namespace SceneUtil
             for (size_t i = 0; i < mUBBs.size(); ++i)
             {
                 auto& buffer = lightManager->getUBOManager()->getLightBuffer(i);
-                mUBBs[i] = new osg::UniformBufferBinding(static_cast<int>(Resource::SceneManager::UBOBinding::LightBuffer), buffer->getData(), 0, buffer->getData()->getTotalDataSize());
+                mUBBs[i]
+                    = new osg::UniformBufferBinding(static_cast<int>(Resource::SceneManager::UBOBinding::LightBuffer),
+                        buffer->getData(), 0, buffer->getData()->getTotalDataSize());
             }
         }
 
@@ -636,7 +657,8 @@ namespace SceneUtil
                 if (auto sun = node->getSunlight())
                 {
                     osg::Matrixf lightMat;
-                    configurePosition(lightMat, sun->getPosition() * (*cv->getCurrentRenderStage()->getInitialViewMatrix()));
+                    configurePosition(
+                        lightMat, sun->getPosition() * (*cv->getCurrentRenderStage()->getInitialViewMatrix()));
                     configureAmbient(lightMat, sun->getAmbient());
                     configureDiffuse(lightMat, sun->getDiffuse());
                     configureSpecular(lightMat, sun->getSpecular());
@@ -664,10 +686,11 @@ namespace SceneUtil
     {
         static const std::string dummyVertSource = generateDummyShader(lightCount);
 
-        // Needed to query the layout of the buffer object. The layout specifier needed to use the std140 layout is not reliably
-        // available, regardless of extensions, until GLSL 140.
+        // Needed to query the layout of the buffer object. The layout specifier needed to use the std140 layout is not
+        // reliably available, regardless of extensions, until GLSL 140.
         mDummyProgram->addShader(new osg::Shader(osg::Shader::VERTEX, dummyVertSource));
-        mDummyProgram->addBindUniformBlock("LightBufferBinding", static_cast<int>(Resource::SceneManager::UBOBinding::LightBuffer));
+        mDummyProgram->addBindUniformBlock(
+            "LightBufferBinding", static_cast<int>(Resource::SceneManager::UBOBinding::LightBuffer));
 
         for (size_t i = 0; i < mLightBuffers.size(); ++i)
         {
@@ -680,14 +703,19 @@ namespace SceneUtil
         }
     }
 
-    UBOManager::UBOManager(const UBOManager& copy, const osg::CopyOp& copyop) : osg::StateAttribute(copy,copyop), mDummyProgram(copy.mDummyProgram), mInitLayout(copy.mInitLayout) {}
+    UBOManager::UBOManager(const UBOManager& copy, const osg::CopyOp& copyop)
+        : osg::StateAttribute(copy, copyop)
+        , mDummyProgram(copy.mDummyProgram)
+        , mInitLayout(copy.mInitLayout)
+    {
+    }
 
     void UBOManager::releaseGLObjects(osg::State* state) const
     {
         mDummyProgram->releaseGLObjects(state);
     }
 
-    int UBOManager::compare(const StateAttribute &sa) const
+    int UBOManager::compare(const StateAttribute& sa) const
     {
         throw std::runtime_error("LightManagerStateAttribute::compare: unimplemented");
     }
@@ -750,7 +778,8 @@ namespace SceneUtil
 
     void UBOManager::initSharedLayout(osg::GLExtensions* ext, int handle, unsigned int frame) const
     {
-        constexpr std::array<unsigned int, 1> index = { static_cast<unsigned int>(Resource::SceneManager::UBOBinding::LightBuffer) };
+        constexpr std::array<unsigned int, 1> index
+            = { static_cast<unsigned int>(Resource::SceneManager::UBOBinding::LightBuffer) };
         int totalBlockSize = -1;
         int stride = -1;
 
@@ -822,14 +851,16 @@ namespace SceneUtil
         if (lightingMethod == LightingMethod::SingleUBO && !hasLoggedWarnings)
         {
             if (!supportsUBO)
-                Log(Debug::Warning) << "GL_ARB_uniform_buffer_object not supported: switching to shader compatibility lighting mode";
+                Log(Debug::Warning)
+                    << "GL_ARB_uniform_buffer_object not supported: switching to shader compatibility lighting mode";
             if (!supportsGPU4)
-                Log(Debug::Warning) << "GL_EXT_gpu_shader4 not supported: switching to shader compatibility lighting mode";
+                Log(Debug::Warning)
+                    << "GL_EXT_gpu_shader4 not supported: switching to shader compatibility lighting mode";
             hasLoggedWarnings = true;
         }
 
-        const int targetLights = std::clamp(Settings::Manager::getInt("max lights", "Shaders"),
-                                            maxLightsLowerLimit, maxLightsUpperLimit);
+        const int targetLights
+            = std::clamp(Settings::Manager::getInt("max lights", "Shaders"), maxLightsLowerLimit, maxLightsUpperLimit);
 
         if (!supportsUBO || !supportsGPU4 || lightingMethod == LightingMethod::PerObjectUniform)
             initPerObjectUniform(targetLights);
@@ -843,7 +874,7 @@ namespace SceneUtil
         addCullCallback(new LightManagerCullCallback(this));
     }
 
-    LightManager::LightManager(const LightManager &copy, const osg::CopyOp &copyop)
+    LightManager::LightManager(const LightManager& copy, const osg::CopyOp& copyop)
         : osg::Group(copy, copyop)
         , mStartLight(copy.mStartLight)
         , mLightingMask(copy.mLightingMask)
@@ -896,7 +927,7 @@ namespace SceneUtil
         // exposes bitwise operators
         defines["useGPUShader4"] = std::to_string(getLightingMethod() == LightingMethod::SingleUBO);
         defines["getLight"] = getLightingMethod() == LightingMethod::FFP ? "gl_LightSource" : "LightBuffer";
-        defines["startLight"] =  getLightingMethod() == LightingMethod::SingleUBO ? "0" : "1";
+        defines["startLight"] = getLightingMethod() == LightingMethod::SingleUBO ? "0" : "1";
         defines["endLight"] = getLightingMethod() == LightingMethod::FFP ? defines["maxLights"] : "PointLightCount";
 
         return defines;
@@ -912,7 +943,8 @@ namespace SceneUtil
         if (usingFFP())
             return;
 
-        setMaxLights(std::clamp(Settings::Manager::getInt("max lights", "Shaders"), maxLightsLowerLimit, maxLightsUpperLimit));
+        setMaxLights(
+            std::clamp(Settings::Manager::getInt("max lights", "Shaders"), maxLightsLowerLimit, maxLightsUpperLimit));
 
         if (getLightingMethod() == LightingMethod::PerObjectUniform)
         {
@@ -929,7 +961,8 @@ namespace SceneUtil
         if (getLightingMethod() == LightingMethod::FFP)
             return;
 
-        mPointLightRadiusMultiplier = std::clamp(Settings::Manager::getFloat("light bounds multiplier", "Shaders"), 0.f, 5.f);
+        mPointLightRadiusMultiplier
+            = std::clamp(Settings::Manager::getFloat("light bounds multiplier", "Shaders"), 0.f, 5.f);
 
         mPointLightFadeEnd = std::max(0.f, Settings::Manager::getFloat("maximum light distance", "Shaders"));
         if (mPointLightFadeEnd > 0)
@@ -970,15 +1003,15 @@ namespace SceneUtil
         mLightingMethod = method;
         switch (method)
         {
-        case LightingMethod::FFP:
-            mStateSetGenerator = std::make_unique<StateSetGeneratorFFP>();
-            break;
-        case LightingMethod::SingleUBO:
-            mStateSetGenerator = std::make_unique<StateSetGeneratorSingleUBO>();
-            break;
-        case LightingMethod::PerObjectUniform:
-            mStateSetGenerator = std::make_unique<StateSetGeneratorPerObjectUniform>();
-            break;
+            case LightingMethod::FFP:
+                mStateSetGenerator = std::make_unique<StateSetGeneratorFFP>();
+                break;
+            case LightingMethod::SingleUBO:
+                mStateSetGenerator = std::make_unique<StateSetGeneratorSingleUBO>();
+                break;
+            case LightingMethod::PerObjectUniform:
+                mStateSetGenerator = std::make_unique<StateSetGeneratorPerObjectUniform>();
+                break;
         }
         mStateSetGenerator->mLightManager = this;
     }
@@ -997,14 +1030,15 @@ namespace SceneUtil
     {
         mStartLight = start;
 
-        if (!usingFFP()) return;
+        if (!usingFFP())
+            return;
 
         // Set default light state to zero
         // This is necessary because shaders don't respect glDisable(GL_LIGHTX) so in addition to disabling
         // we'll have to set a light state that has no visible effect
         for (int i = start; i < getMaxLights(); ++i)
         {
-            osg::ref_ptr<DisableLight> defaultLight (new DisableLight(i));
+            osg::ref_ptr<DisableLight> defaultLight(new DisableLight(i));
             getOrCreateStateSet()->setAttributeAndModes(defaultLight, osg::StateAttribute::OFF);
         }
     }
@@ -1044,7 +1078,8 @@ namespace SceneUtil
 
     void LightManager::setSunlight(osg::ref_ptr<osg::Light> sun)
     {
-        if (usingFFP()) return;
+        if (usingFFP())
+            return;
 
         mSun = sun;
     }
@@ -1062,7 +1097,8 @@ namespace SceneUtil
         return hash;
     }
 
-    osg::ref_ptr<osg::StateSet> LightManager::getLightListStateSet(const LightList& lightList, size_t frameNum, const osg::RefMatrix* viewMatrix)
+    osg::ref_ptr<osg::StateSet> LightManager::getLightListStateSet(
+        const LightList& lightList, size_t frameNum, const osg::RefMatrix* viewMatrix)
     {
         if (getLightingMethod() == LightingMethod::PerObjectUniform)
         {
@@ -1070,7 +1106,8 @@ namespace SceneUtil
             return mStateSetGenerator->generate(lightList, frameNum);
         }
 
-        // possible optimization: return a StateSet containing all requested lights plus some extra lights (if a suitable one exists)
+        // possible optimization: return a StateSet containing all requested lights plus some extra lights (if a
+        // suitable one exists)
 
         if (getLightingMethod() == LightingMethod::SingleUBO)
         {
@@ -1086,11 +1123,12 @@ namespace SceneUtil
             }
         }
 
-        auto& stateSetCache = mStateSetCache[frameNum%2];
+        auto& stateSetCache = mStateSetCache[frameNum % 2];
 
         LightIdList lightIdList;
         lightIdList.reserve(lightList.size());
-        std::transform(lightList.begin(), lightList.end(), std::back_inserter(lightIdList), [] (const LightSourceViewBound* l) { return l->mLightSource->getId(); });
+        std::transform(lightList.begin(), lightList.end(), std::back_inserter(lightIdList),
+            [](const LightSourceViewBound* l) { return l->mLightSource->getId(); });
 
         auto found = stateSetCache.find(lightIdList);
         if (found != stateSetCache.end())
@@ -1104,11 +1142,12 @@ namespace SceneUtil
         return stateset;
     }
 
-    const std::vector<LightManager::LightSourceViewBound>& LightManager::getLightsInViewSpace(osgUtil::CullVisitor* cv, const osg::RefMatrix* viewMatrix, size_t frameNum)
+    const std::vector<LightManager::LightSourceViewBound>& LightManager::getLightsInViewSpace(
+        osgUtil::CullVisitor* cv, const osg::RefMatrix* viewMatrix, size_t frameNum)
     {
         osg::Camera* camera = cv->getCurrentCamera();
 
-        osg::observer_ptr<osg::Camera> camPtr (camera);
+        osg::observer_ptr<osg::Camera> camPtr(camera);
         auto it = mLightsInViewSpace.find(camPtr);
 
         if (it == mLightsInViewSpace.end())
@@ -1121,7 +1160,7 @@ namespace SceneUtil
 
                 float radius = transform.mLightSource->getRadius();
 
-                osg::BoundingSphere viewBound = osg::BoundingSphere(osg::Vec3f(0,0,0), radius);
+                osg::BoundingSphere viewBound = osg::BoundingSphere(osg::Vec3f(0, 0, 0), radius);
                 transformBoundingSphere(worldViewMat, viewBound);
 
                 if (transform.mLightSource->getLastAppliedFrame() != frameNum && mPointLightFadeEnd != 0.f)
@@ -1156,8 +1195,9 @@ namespace SceneUtil
 
             if (fillPPLights || getLightingMethod() == LightingMethod::SingleUBO)
             {
-                auto sorter = [] (const LightSourceViewBound& left, const LightSourceViewBound& right) {
-                    return left.mViewBound.center().length2() - left.mViewBound.radius2() < right.mViewBound.center().length2() - right.mViewBound.radius2();
+                auto sorter = [](const LightSourceViewBound& left, const LightSourceViewBound& right) {
+                    return left.mViewBound.center().length2() - left.mViewBound.radius2()
+                        < right.mViewBound.center().length2() - right.mViewBound.radius2();
                 };
 
                 std::sort(it->second.begin(), it->second.end(), sorter);
@@ -1182,13 +1222,16 @@ namespace SceneUtil
         return it->second;
     }
 
-    void LightManager::updateGPUPointLight(int index, LightSource* lightSource, size_t frameNum,const osg::RefMatrix* viewMatrix)
+    void LightManager::updateGPUPointLight(
+        int index, LightSource* lightSource, size_t frameNum, const osg::RefMatrix* viewMatrix)
     {
         auto* light = lightSource->getLight(frameNum);
         auto& buf = getUBOManager()->getLightBuffer(frameNum);
         buf->setDiffuse(index, light->getDiffuse());
         buf->setAmbient(index, light->getAmbient());
-        buf->setAttenuationRadius(index, osg::Vec4(light->getConstantAttenuation(), light->getLinearAttenuation(), light->getQuadraticAttenuation(), lightSource->getRadius()));
+        buf->setAttenuationRadius(index,
+            osg::Vec4(light->getConstantAttenuation(), light->getLinearAttenuation(), light->getQuadraticAttenuation(),
+                lightSource->getRadius()));
         buf->setPosition(index, light->getPosition() * (*viewMatrix));
     }
 
@@ -1217,7 +1260,7 @@ namespace SceneUtil
         mId = sLightId++;
     }
 
-    LightSource::LightSource(const LightSource &copy, const osg::CopyOp &copyop)
+    LightSource::LightSource(const LightSource& copy, const osg::CopyOp& copyop)
         : osg::Node(copy, copyop)
         , mRadius(copy.mRadius)
         , mActorFade(copy.mActorFade)
@@ -1229,7 +1272,7 @@ namespace SceneUtil
             mLight[i] = new osg::Light(*copy.mLight[i].get(), copyop);
     }
 
-    void LightListCallback::operator()(osg::Node *node, osgUtil::CullVisitor *cv)
+    void LightListCallback::operator()(osg::Node* node, osgUtil::CullVisitor* cv)
     {
         bool pushedState = pushLightState(node, cv);
         traverse(node, cv);
@@ -1237,7 +1280,7 @@ namespace SceneUtil
             cv->popStateSet();
     }
 
-    bool LightListCallback::pushLightState(osg::Node *node, osgUtil::CullVisitor *cv)
+    bool LightListCallback::pushLightState(osg::Node* node, osgUtil::CullVisitor* cv)
     {
         if (!mLightManager)
         {
@@ -1252,12 +1295,12 @@ namespace SceneUtil
         // Possible optimizations:
         // - organize lights in a quad tree
 
-
         mLastFrameNumber = cv->getTraversalNumber();
 
         // Don't use Camera::getViewMatrix, that one might be relative to another camera!
         const osg::RefMatrix* viewMatrix = cv->getCurrentRenderStage()->getInitialViewMatrix();
-        const std::vector<LightManager::LightSourceViewBound>& lights = mLightManager->getLightsInViewSpace(cv, viewMatrix, mLastFrameNumber);
+        const std::vector<LightManager::LightSourceViewBound>& lights
+            = mLightManager->getLightsInViewSpace(cv, viewMatrix, mLastFrameNumber);
 
         // get the node bounds in view space
         // NB do not node->getBound() * modelView, that would apply the node's transformation twice
@@ -1312,11 +1355,12 @@ namespace SceneUtil
                 std::sort(lightList.begin(), lightList.end(), sortLights);
                 while (lightList.size() > maxLights)
                     lightList.pop_back();
-                stateset = mLightManager->getLightListStateSet(lightList, cv->getTraversalNumber(), cv->getCurrentRenderStage()->getInitialViewMatrix());
+                stateset = mLightManager->getLightListStateSet(
+                    lightList, cv->getTraversalNumber(), cv->getCurrentRenderStage()->getInitialViewMatrix());
             }
             else
-                stateset = mLightManager->getLightListStateSet(mLightList, cv->getTraversalNumber(), cv->getCurrentRenderStage()->getInitialViewMatrix());
-
+                stateset = mLightManager->getLightListStateSet(
+                    mLightList, cv->getTraversalNumber(), cv->getCurrentRenderStage()->getInitialViewMatrix());
 
             cv->pushStateSet(stateset);
             return true;
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index c69f7a74fb..905e0d0516 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -1,20 +1,20 @@
 #ifndef OPENMW_COMPONENTS_SCENEUTIL_LIGHTMANAGER_H
 #define OPENMW_COMPONENTS_SCENEUTIL_LIGHTMANAGER_H
 
+#include <array>
+#include <memory>
 #include <set>
 #include <unordered_map>
-#include <memory>
-#include <array>
 
-#include <osg/Light>
 #include <osg/Group>
+#include <osg/Light>
 #include <osg/NodeVisitor>
 #include <osg/observer_ptr>
 
 #include <components/shader/shadermanager.hpp>
 
-#include <components/settings/settings.hpp>
 #include <components/sceneutil/nodecallback.hpp>
+#include <components/settings/settings.hpp>
 
 namespace osgUtil
 {
@@ -37,7 +37,8 @@ namespace SceneUtil
             for (size_t i = 0; i < 2; ++i)
             {
                 mIndex[i] = 0;
-                mUniformBuffers[i] = new osg::Uniform(osg::Uniform::FLOAT_VEC4, "omw_PointLights", sMaxPPLightsArraySize);
+                mUniformBuffers[i]
+                    = new osg::Uniform(osg::Uniform::FLOAT_VEC4, "omw_PointLights", sMaxPPLightsArraySize);
                 mUniformCount[i] = new osg::Uniform("omw_PointLightsCount", static_cast<int>(0));
             }
         }
@@ -55,10 +56,7 @@ namespace SceneUtil
             mUniformCount[frameId]->dirty();
         }
 
-        void clear(size_t frame)
-        {
-            mIndex[frame % 2] = 0;
-        }
+        void clear(size_t frame) { mIndex[frame % 2] = 0; }
 
         void setLight(size_t frame, const osg::Light* light, float radius)
         {
@@ -72,7 +70,9 @@ namespace SceneUtil
 
             mUniformBuffers[frameId]->setElement(i + 0, light->getPosition());
             mUniformBuffers[frameId]->setElement(i + 1, light->getDiffuse());
-            mUniformBuffers[frameId]->setElement(i + 2, osg::Vec4f(light->getConstantAttenuation(), light->getLinearAttenuation(), light->getQuadraticAttenuation(), radius));
+            mUniformBuffers[frameId]->setElement(i + 2,
+                osg::Vec4f(light->getConstantAttenuation(), light->getLinearAttenuation(),
+                    light->getQuadraticAttenuation(), radius));
 
             mIndex[frameId]++;
         }
@@ -97,13 +97,16 @@ namespace SceneUtil
     };
 
     /// LightSource managed by a LightManager.
-    /// @par Typically used for point lights. Spot lights are not supported yet. Directional lights affect the whole scene
-    ///     so do not need to be managed by a LightManager - so for directional lights use a plain osg::LightSource instead.
+    /// @par Typically used for point lights. Spot lights are not supported yet. Directional lights affect the whole
+    /// scene
+    ///     so do not need to be managed by a LightManager - so for directional lights use a plain osg::LightSource
+    ///     instead.
     /// @note LightSources must be decorated by a LightManager node in order to have an effect. Typical use would
     ///     be one LightManager as the root of the scene graph.
     /// @note One needs to attach LightListCallback's to the scene to have objects receive lighting from LightSources.
     ///     See the documentation of LightListCallback for more information.
-    /// @note The position of the contained osg::Light is automatically updated based on the LightSource's world position.
+    /// @note The position of the contained osg::Light is automatically updated based on the LightSource's world
+    /// position.
     class LightSource : public osg::Node
     {
         // double buffered osg::Light's, since one of them may be in use by the draw thread at any given time
@@ -121,51 +124,29 @@ namespace SceneUtil
         bool mEmpty = false;
 
     public:
-
         META_Node(SceneUtil, LightSource)
 
-        LightSource();
+            LightSource();
 
         LightSource(const LightSource& copy, const osg::CopyOp& copyop);
 
-        float getRadius() const
-        {
-            return mRadius;
-        }
+        float getRadius() const { return mRadius; }
 
         /// The LightSource will affect objects within this radius.
-        void setRadius(float radius)
-        {
-            mRadius = radius;
-        }
+        void setRadius(float radius) { mRadius = radius; }
 
-        void setActorFade(float alpha)
-        {
-            mActorFade = alpha;
-        }
+        void setActorFade(float alpha) { mActorFade = alpha; }
 
-        float getActorFade() const
-        {
-            return mActorFade;
-        }
+        float getActorFade() const { return mActorFade; }
 
-        void setEmpty(bool empty)
-        {
-            mEmpty = empty;
-        }
+        void setEmpty(bool empty) { mEmpty = empty; }
 
-        bool getEmpty() const
-        {
-            return mEmpty;
-        }
+        bool getEmpty() const { return mEmpty; }
 
         /// Get the osg::Light safe for modification in the given frame.
         /// @par May be used externally to animate the light's color/attenuation properties,
         /// and is used internally to synchronize the light's position with the position of the LightSource.
-        osg::Light* getLight(size_t frame)
-        {
-            return mLight[frame % 2];
-        }
+        osg::Light* getLight(size_t frame) { return mLight[frame % 2]; }
 
         /// @warning It is recommended not to replace an existing osg::Light, because there might still be
         /// references to it in the light StateSet cache that are associated with this LightSource's ID.
@@ -178,27 +159,18 @@ namespace SceneUtil
         }
 
         /// Get the unique ID for this light source.
-        int getId() const
-        {
-            return mId;
-        }
+        int getId() const { return mId; }
 
-        void setLastAppliedFrame(unsigned int lastAppliedFrame)
-        {
-            mLastAppliedFrame = lastAppliedFrame;
-        }
+        void setLastAppliedFrame(unsigned int lastAppliedFrame) { mLastAppliedFrame = lastAppliedFrame; }
 
-        unsigned int getLastAppliedFrame() const
-        {
-            return mLastAppliedFrame;
-        }
+        unsigned int getLastAppliedFrame() const { return mLastAppliedFrame; }
     };
 
     class UBOManager : public osg::StateAttribute
     {
     public:
-        UBOManager(int lightCount=1);
-        UBOManager(const UBOManager& copy, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
+        UBOManager(int lightCount = 1);
+        UBOManager(const UBOManager& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY);
 
         void releaseGLObjects(osg::State* state) const override;
 
@@ -206,9 +178,9 @@ namespace SceneUtil
 
         META_StateAttribute(SceneUtil, UBOManager, osg::StateAttribute::LIGHT)
 
-        void apply(osg::State& state) const override;
+            void apply(osg::State& state) const override;
 
-        auto& getLightBuffer(size_t frameNum) { return mLightBuffers[frameNum%2]; }
+        auto& getLightBuffer(size_t frameNum) { return mLightBuffers[frameNum % 2]; }
 
     private:
         std::string generateDummyShader(int maxLightsInScene);
@@ -221,7 +193,8 @@ namespace SceneUtil
         osg::ref_ptr<LightBuffer> mTemplate;
     };
 
-    /// @brief Decorator node implementing the rendering of any number of LightSources that can be anywhere in the subgraph.
+    /// @brief Decorator node implementing the rendering of any number of LightSources that can be anywhere in the
+    /// subgraph.
     class LightManager : public osg::Group
     {
     public:
@@ -246,7 +219,7 @@ namespace SceneUtil
 
         META_Node(SceneUtil, LightManager)
 
-        LightManager(bool ffp = true);
+            LightManager(bool ffp = true);
 
         LightManager(const LightManager& copy, const osg::CopyOp& copyop);
 
@@ -257,7 +230,8 @@ namespace SceneUtil
         void setLightingMask(size_t mask);
         size_t getLightingMask() const;
 
-        /// Set the first light index that should be used by this manager, typically the number of directional lights in the scene.
+        /// Set the first light index that should be used by this manager, typically the number of directional lights in
+        /// the scene.
         void setStartLight(int start);
         int getStartLight() const;
 
@@ -267,9 +241,11 @@ namespace SceneUtil
         /// Internal use only, called automatically by the LightSource's UpdateCallback
         void addLight(LightSource* lightSource, const osg::Matrixf& worldMat, size_t frameNum);
 
-        const std::vector<LightSourceViewBound>& getLightsInViewSpace(osgUtil::CullVisitor* cv, const osg::RefMatrix* viewMatrix, size_t frameNum);
+        const std::vector<LightSourceViewBound>& getLightsInViewSpace(
+            osgUtil::CullVisitor* cv, const osg::RefMatrix* viewMatrix, size_t frameNum);
 
-        osg::ref_ptr<osg::StateSet> getLightListStateSet(const LightList& lightList, size_t frameNum, const osg::RefMatrix* viewMatrix);
+        osg::ref_ptr<osg::StateSet> getLightListStateSet(
+            const LightList& lightList, size_t frameNum, const osg::RefMatrix* viewMatrix);
 
         void setSunlight(osg::ref_ptr<osg::Light> sun);
         osg::ref_ptr<osg::Light> getSunlight();
@@ -284,12 +260,12 @@ namespace SceneUtil
 
         auto& getDummies() { return mDummies; }
 
-        auto& getLightIndexMap(size_t frameNum) { return mLightIndexMaps[frameNum%2]; }
+        auto& getLightIndexMap(size_t frameNum) { return mLightIndexMaps[frameNum % 2]; }
 
         auto& getUBOManager() { return mUBOManager; }
 
-        osg::Matrixf getSunlightBuffer(size_t frameNum) const { return mSunlightBuffers[frameNum%2]; }
-        void setSunlightBuffer(const osg::Matrixf& buffer, size_t frameNum) { mSunlightBuffers[frameNum%2] = buffer; }
+        osg::Matrixf getSunlightBuffer(size_t frameNum) const { return mSunlightBuffers[frameNum % 2]; }
+        void setSunlightBuffer(const osg::Matrixf& buffer, size_t frameNum) { mSunlightBuffers[frameNum % 2] = buffer; }
 
         SupportedMethods getSupportedLightingMethods() { return mSupported; }
 
@@ -317,7 +293,8 @@ namespace SceneUtil
         void setLightingMethod(LightingMethod method);
         void setMaxLights(int value);
 
-        void updateGPUPointLight(int index, LightSource* lightSource, size_t frameNum, const osg::RefMatrix* viewMatrix);
+        void updateGPUPointLight(
+            int index, LightSource* lightSource, size_t frameNum, const osg::RefMatrix* viewMatrix);
 
         std::vector<LightSourceTransform> mLights;
 
@@ -378,13 +355,16 @@ namespace SceneUtil
         LightListCallback()
             : mLightManager(nullptr)
             , mLastFrameNumber(0)
-        {}
+        {
+        }
         LightListCallback(const LightListCallback& copy, const osg::CopyOp& copyop)
-            : osg::Object(copy, copyop), SceneUtil::NodeCallback<LightListCallback, osg::Node*, osgUtil::CullVisitor*>(copy, copyop)
+            : osg::Object(copy, copyop)
+            , SceneUtil::NodeCallback<LightListCallback, osg::Node*, osgUtil::CullVisitor*>(copy, copyop)
             , mLightManager(copy.mLightManager)
             , mLastFrameNumber(0)
             , mIgnoredLightSources(copy.mIgnoredLightSources)
-        {}
+        {
+        }
 
         META_Object(SceneUtil, LightListCallback)
 
@@ -401,7 +381,8 @@ namespace SceneUtil
         std::set<SceneUtil::LightSource*> mIgnoredLightSources;
     };
 
-    void configureStateSetSunOverride(LightManager* lightManager, const osg::Light* light, osg::StateSet* stateset, int mode = osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+    void configureStateSetSunOverride(LightManager* lightManager, const osg::Light* light, osg::StateSet* stateset,
+        int mode = osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
 
 }
 
diff --git a/components/sceneutil/lightutil.cpp b/components/sceneutil/lightutil.cpp
index adf36ff04f..30292bea61 100644
--- a/components/sceneutil/lightutil.cpp
+++ b/components/sceneutil/lightutil.cpp
@@ -1,15 +1,15 @@
 #include "lightutil.hpp"
 
-#include <osg/Light>
 #include <osg/Group>
+#include <osg/Light>
 
 #include <osgParticle/ParticleSystem>
 
 #include <components/esm3/loadligh.hpp>
 #include <components/fallback/fallback.hpp>
 
-#include "lightmanager.hpp"
 #include "lightcontroller.hpp"
+#include "lightmanager.hpp"
 #include "util.hpp"
 #include "visitor.hpp"
 
@@ -18,7 +18,10 @@ namespace
     class CheckEmptyLightVisitor : public osg::NodeVisitor
     {
     public:
-        CheckEmptyLightVisitor() : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN) {}
+        CheckEmptyLightVisitor()
+            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+        {
+        }
 
         void apply(osg::Drawable& drawable) override
         {
@@ -31,10 +34,7 @@ namespace
                 traverse(drawable);
         }
 
-        void apply(osg::Geometry& geometry) override
-        {
-            mEmpty = false;
-        }
+        void apply(osg::Geometry& geometry) override { mEmpty = false; }
 
         bool mEmpty = true;
     };
@@ -43,7 +43,7 @@ namespace
 namespace SceneUtil
 {
 
-    void configureLight(osg::Light *light, float radius, bool isExterior)
+    void configureLight(osg::Light* light, float radius, bool isExterior)
     {
         float quadraticAttenuation = 0.f;
         float linearAttenuation = 0.f;
@@ -85,13 +85,15 @@ namespace SceneUtil
         light->setQuadraticAttenuation(quadraticAttenuation);
     }
 
-    osg::ref_ptr<LightSource> addLight(osg::Group* node, const ESM::Light* esmLight, unsigned int lightMask, bool isExterior)
+    osg::ref_ptr<LightSource> addLight(
+        osg::Group* node, const ESM::Light* esmLight, unsigned int lightMask, bool isExterior)
     {
         SceneUtil::FindByNameVisitor visitor("AttachLight");
         node->accept(visitor);
 
         osg::Group* attachTo = visitor.mFoundNode ? visitor.mFoundNode : node;
-        osg::ref_ptr<LightSource> lightSource = createLightSource(esmLight, lightMask, isExterior, osg::Vec4f(0,0,0,1));
+        osg::ref_ptr<LightSource> lightSource
+            = createLightSource(esmLight, lightMask, isExterior, osg::Vec4f(0, 0, 0, 1));
         attachTo->addChild(lightSource);
 
         CheckEmptyLightVisitor emptyVisitor;
@@ -102,10 +104,11 @@ namespace SceneUtil
         return lightSource;
     }
 
-    osg::ref_ptr<LightSource> createLightSource(const ESM::Light* esmLight, unsigned int lightMask, bool isExterior, const osg::Vec4f& ambient)
+    osg::ref_ptr<LightSource> createLightSource(
+        const ESM::Light* esmLight, unsigned int lightMask, bool isExterior, const osg::Vec4f& ambient)
     {
-        osg::ref_ptr<SceneUtil::LightSource> lightSource (new SceneUtil::LightSource);
-        osg::ref_ptr<osg::Light> light (new osg::Light);
+        osg::ref_ptr<SceneUtil::LightSource> lightSource(new SceneUtil::LightSource);
+        osg::ref_ptr<osg::Light> light(new osg::Light);
         lightSource->setNodeMask(lightMask);
 
         float radius = esmLight->mData.mRadius;
@@ -121,11 +124,11 @@ namespace SceneUtil
         }
         light->setDiffuse(diffuse);
         light->setAmbient(ambient);
-        light->setSpecular(osg::Vec4f(0,0,0,0));
+        light->setSpecular(osg::Vec4f(0, 0, 0, 0));
 
         lightSource->setLight(light);
 
-        osg::ref_ptr<SceneUtil::LightController> ctrl (new SceneUtil::LightController);
+        osg::ref_ptr<SceneUtil::LightController> ctrl(new SceneUtil::LightController);
         ctrl->setDiffuse(light->getDiffuse());
         if (esmLight->mData.mFlags & ESM::Light::Flicker)
             ctrl->setType(SceneUtil::LightController::LT_Flicker);
diff --git a/components/sceneutil/lightutil.hpp b/components/sceneutil/lightutil.hpp
index aabeec58ab..cae973bb38 100644
--- a/components/sceneutil/lightutil.hpp
+++ b/components/sceneutil/lightutil.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_LIGHTUTIL_H
 #define OPENMW_COMPONENTS_LIGHTUTIL_H
 
-#include <osg/ref_ptr>
 #include <osg/Vec4f>
+#include <osg/ref_ptr>
 
 namespace osg
 {
@@ -22,7 +22,7 @@ namespace SceneUtil
     /// @brief Set up global attenuation settings for an osg::Light.
     /// @param radius The radius of the light source.
     /// @param isExterior Is the light outside? May be used for deciding which attenuation settings to use.
-    void configureLight (osg::Light *light, float radius, bool isExterior);
+    void configureLight(osg::Light* light, float radius, bool isExterior);
 
     /// @brief Convert an ESM::Light to a SceneUtil::LightSource, and add it to a sub graph.
     /// @note If the sub graph contains a node named "AttachLight" (case insensitive), then the light is added to that.
@@ -31,14 +31,16 @@ namespace SceneUtil
     /// @param esmLight The light definition coming from the game files containing radius, color, flicker, etc.
     /// @param lightMask Mask to assign to the newly created LightSource.
     /// @param isExterior Is the light outside? May be used for deciding which attenuation settings to use.
-    osg::ref_ptr<LightSource> addLight (osg::Group* node, const ESM::Light* esmLight, unsigned int lightMask, bool isExterior);
+    osg::ref_ptr<LightSource> addLight(
+        osg::Group* node, const ESM::Light* esmLight, unsigned int lightMask, bool isExterior);
 
     /// @brief Convert an ESM::Light to a SceneUtil::LightSource, and return it.
     /// @param esmLight The light definition coming from the game files containing radius, color, flicker, etc.
     /// @param lightMask Mask to assign to the newly created LightSource.
     /// @param isExterior Is the light outside? May be used for deciding which attenuation settings to use.
     /// @param ambient Ambient component of the light.
-    osg::ref_ptr<LightSource> createLightSource (const ESM::Light* esmLight, unsigned int lightMask, bool isExterior, const osg::Vec4f& ambient=osg::Vec4f(0,0,0,1));
+    osg::ref_ptr<LightSource> createLightSource(const ESM::Light* esmLight, unsigned int lightMask, bool isExterior,
+        const osg::Vec4f& ambient = osg::Vec4f(0, 0, 0, 1));
 
 }
 
diff --git a/components/sceneutil/morphgeometry.cpp b/components/sceneutil/morphgeometry.cpp
index 39102b575a..e521c92dc9 100644
--- a/components/sceneutil/morphgeometry.cpp
+++ b/components/sceneutil/morphgeometry.cpp
@@ -6,198 +6,200 @@
 namespace SceneUtil
 {
 
-MorphGeometry::MorphGeometry()
-    : mLastFrameNumber(0)
-    , mDirty(true)
-    , mMorphedBoundingBox(false)
-{
-
-}
+    MorphGeometry::MorphGeometry()
+        : mLastFrameNumber(0)
+        , mDirty(true)
+        , mMorphedBoundingBox(false)
+    {
+    }
 
-MorphGeometry::MorphGeometry(const MorphGeometry &copy, const osg::CopyOp &copyop)
-    : osg::Drawable(copy, copyop)
-    , mMorphTargets(copy.mMorphTargets)
-    , mLastFrameNumber(0)
-    , mDirty(true)
-    , mMorphedBoundingBox(false)
-{
-    setSourceGeometry(copy.getSourceGeometry());
-}
+    MorphGeometry::MorphGeometry(const MorphGeometry& copy, const osg::CopyOp& copyop)
+        : osg::Drawable(copy, copyop)
+        , mMorphTargets(copy.mMorphTargets)
+        , mLastFrameNumber(0)
+        , mDirty(true)
+        , mMorphedBoundingBox(false)
+    {
+        setSourceGeometry(copy.getSourceGeometry());
+    }
 
-void MorphGeometry::setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeom)
-{
-    for (unsigned int i=0; i<2; ++i)
-        mGeometry[i] = nullptr;
+    void MorphGeometry::setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeom)
+    {
+        for (unsigned int i = 0; i < 2; ++i)
+            mGeometry[i] = nullptr;
 
-    mSourceGeometry = sourceGeom;
+        mSourceGeometry = sourceGeom;
 
-    for (unsigned int i=0; i<2; ++i)
-    {
-        // DO NOT COPY AND PASTE THIS CODE. Cloning osg::Geometry without also cloning its contained Arrays is generally unsafe.
-        // In this specific case the operation is safe under the following two assumptions:
-        // - When Arrays are removed or replaced in the cloned geometry, the original Arrays in their place must outlive the cloned geometry regardless. (ensured by TemplateRef)
-        // - Arrays that we add or replace in the cloned geometry must be explicitely forbidden from reusing BufferObjects of the original geometry. (ensured by vbo below)
-        mGeometry[i] = new osg::Geometry(*mSourceGeometry, osg::CopyOp::SHALLOW_COPY);
-        mGeometry[i]->getOrCreateUserDataContainer()->addUserObject(new Resource::TemplateRef(mSourceGeometry));
-
-        const osg::Geometry& from = *mSourceGeometry;
-        osg::Geometry& to = *mGeometry[i];
-        to.setSupportsDisplayList(false);
-        to.setUseVertexBufferObjects(true);
-        to.setCullingActive(false); // make sure to disable culling since that's handled by this class
-
-        // vertices are modified every frame, so we need to deep copy them.
-        // assign a dedicated VBO to make sure that modifications don't interfere with source geometry's VBO.
-        osg::ref_ptr<osg::VertexBufferObject> vbo (new osg::VertexBufferObject);
-        vbo->setUsage(GL_DYNAMIC_DRAW_ARB);
-
-        osg::ref_ptr<osg::Array> vertexArray = static_cast<osg::Array*>(from.getVertexArray()->clone(osg::CopyOp::DEEP_COPY_ALL));
-        if (vertexArray)
+        for (unsigned int i = 0; i < 2; ++i)
         {
-            vertexArray->setVertexBufferObject(vbo);
-            to.setVertexArray(vertexArray);
+            // DO NOT COPY AND PASTE THIS CODE. Cloning osg::Geometry without also cloning its contained Arrays is
+            // generally unsafe. In this specific case the operation is safe under the following two assumptions:
+            // - When Arrays are removed or replaced in the cloned geometry, the original Arrays in their place must
+            // outlive the cloned geometry regardless. (ensured by TemplateRef)
+            // - Arrays that we add or replace in the cloned geometry must be explicitely forbidden from reusing
+            // BufferObjects of the original geometry. (ensured by vbo below)
+            mGeometry[i] = new osg::Geometry(*mSourceGeometry, osg::CopyOp::SHALLOW_COPY);
+            mGeometry[i]->getOrCreateUserDataContainer()->addUserObject(new Resource::TemplateRef(mSourceGeometry));
+
+            const osg::Geometry& from = *mSourceGeometry;
+            osg::Geometry& to = *mGeometry[i];
+            to.setSupportsDisplayList(false);
+            to.setUseVertexBufferObjects(true);
+            to.setCullingActive(false); // make sure to disable culling since that's handled by this class
+
+            // vertices are modified every frame, so we need to deep copy them.
+            // assign a dedicated VBO to make sure that modifications don't interfere with source geometry's VBO.
+            osg::ref_ptr<osg::VertexBufferObject> vbo(new osg::VertexBufferObject);
+            vbo->setUsage(GL_DYNAMIC_DRAW_ARB);
+
+            osg::ref_ptr<osg::Array> vertexArray
+                = static_cast<osg::Array*>(from.getVertexArray()->clone(osg::CopyOp::DEEP_COPY_ALL));
+            if (vertexArray)
+            {
+                vertexArray->setVertexBufferObject(vbo);
+                to.setVertexArray(vertexArray);
+            }
         }
     }
-}
 
-void MorphGeometry::addMorphTarget(osg::Vec3Array *offsets, float weight)
-{
-    mMorphTargets.push_back(MorphTarget(offsets, weight));
-    mMorphedBoundingBox = false;
-    dirty();
-}
+    void MorphGeometry::addMorphTarget(osg::Vec3Array* offsets, float weight)
+    {
+        mMorphTargets.push_back(MorphTarget(offsets, weight));
+        mMorphedBoundingBox = false;
+        dirty();
+    }
 
-void MorphGeometry::dirty()
-{
-    mDirty = true;
-    if (!mMorphedBoundingBox)
-        dirtyBound();
-}
+    void MorphGeometry::dirty()
+    {
+        mDirty = true;
+        if (!mMorphedBoundingBox)
+            dirtyBound();
+    }
 
-osg::ref_ptr<osg::Geometry> MorphGeometry::getSourceGeometry() const
-{
-    return mSourceGeometry;
-}
+    osg::ref_ptr<osg::Geometry> MorphGeometry::getSourceGeometry() const
+    {
+        return mSourceGeometry;
+    }
 
-void MorphGeometry::accept(osg::NodeVisitor &nv)
-{
-    if (!nv.validNodeMask(*this))
-        return;
+    void MorphGeometry::accept(osg::NodeVisitor& nv)
+    {
+        if (!nv.validNodeMask(*this))
+            return;
 
-    nv.pushOntoNodePath(this);
+        nv.pushOntoNodePath(this);
 
-    if (nv.getVisitorType() == osg::NodeVisitor::CULL_VISITOR)
-        cull(&nv);
-    else
-        nv.apply(*this);
+        if (nv.getVisitorType() == osg::NodeVisitor::CULL_VISITOR)
+            cull(&nv);
+        else
+            nv.apply(*this);
 
-    nv.popFromNodePath();
-}
+        nv.popFromNodePath();
+    }
 
-void MorphGeometry::accept(osg::PrimitiveFunctor& func) const
-{
-    getGeometry(mLastFrameNumber)->accept(func);
-}
+    void MorphGeometry::accept(osg::PrimitiveFunctor& func) const
+    {
+        getGeometry(mLastFrameNumber)->accept(func);
+    }
 
-osg::BoundingBox MorphGeometry::computeBoundingBox() const
-{
-    bool anyMorphTarget = false;
-    for (unsigned int i=1; i<mMorphTargets.size(); ++i)
-        if (mMorphTargets[i].getWeight() != 0)
+    osg::BoundingBox MorphGeometry::computeBoundingBox() const
+    {
+        bool anyMorphTarget = false;
+        for (unsigned int i = 1; i < mMorphTargets.size(); ++i)
+            if (mMorphTargets[i].getWeight() != 0)
+            {
+                anyMorphTarget = true;
+                break;
+            }
+
+        // before the MorphGeometry has started animating, we will use a regular bounding box (this is required
+        // for correct object placements, which uses the bounding box)
+        if (!mMorphedBoundingBox && !anyMorphTarget)
         {
-            anyMorphTarget = true;
-            break;
+            return mSourceGeometry->getBoundingBox();
         }
+        // once it animates, use a bounding box that encompasses all possible animations so as to avoid recalculating
+        else
+        {
+            mMorphedBoundingBox = true;
 
-    // before the MorphGeometry has started animating, we will use a regular bounding box (this is required
-    // for correct object placements, which uses the bounding box)
-    if (!mMorphedBoundingBox && !anyMorphTarget)
-    {
-        return mSourceGeometry->getBoundingBox();
-    }
-    // once it animates, use a bounding box that encompasses all possible animations so as to avoid recalculating
-    else
-    {
-        mMorphedBoundingBox = true;
+            const osg::Vec3Array* sourceVerts = static_cast<const osg::Vec3Array*>(mSourceGeometry->getVertexArray());
+            if (mMorphTargets.size() != 0)
+                sourceVerts = mMorphTargets[0].getOffsets();
+            std::vector<osg::BoundingBox> vertBounds(sourceVerts->size());
 
-        const osg::Vec3Array* sourceVerts = static_cast<const osg::Vec3Array*>(mSourceGeometry->getVertexArray());
-        if (mMorphTargets.size() != 0)
-            sourceVerts = mMorphTargets[0].getOffsets();
-        std::vector<osg::BoundingBox> vertBounds(sourceVerts->size());
+            // Since we don't know what combinations of morphs are being applied we need to keep track of a bounding box
+            // for each vertex. The minimum/maximum of the box is the minimum/maximum offset the vertex can have from
+            // its starting position.
 
-        // Since we don't know what combinations of morphs are being applied we need to keep track of a bounding box for each vertex.
-        // The minimum/maximum of the box is the minimum/maximum offset the vertex can have from its starting position.
+            // Start with zero offsets which will happen when no morphs are applied.
+            for (unsigned int i = 0; i < vertBounds.size(); ++i)
+                vertBounds[i].set(osg::Vec3f(0, 0, 0), osg::Vec3f(0, 0, 0));
 
-        // Start with zero offsets which will happen when no morphs are applied.
-        for (unsigned int i=0; i<vertBounds.size(); ++i)
-            vertBounds[i].set(osg::Vec3f(0,0,0), osg::Vec3f(0,0,0));
+            for (unsigned int i = 1; i < mMorphTargets.size(); ++i)
+            {
+                const osg::Vec3Array& offsets = *mMorphTargets[i].getOffsets();
+                for (unsigned int j = 0; j < offsets.size() && j < vertBounds.size(); ++j)
+                {
+                    osg::BoundingBox& bounds = vertBounds[j];
+                    bounds.expandBy(bounds._max + offsets[j]);
+                    bounds.expandBy(bounds._min + offsets[j]);
+                }
+            }
 
-        for (unsigned int i = 1; i < mMorphTargets.size(); ++i)
-        {
-            const osg::Vec3Array& offsets = *mMorphTargets[i].getOffsets();
-            for (unsigned int j=0; j<offsets.size() && j<vertBounds.size(); ++j)
+            osg::BoundingBox box;
+            for (unsigned int i = 0; i < vertBounds.size(); ++i)
             {
-                osg::BoundingBox& bounds = vertBounds[j];
-                bounds.expandBy(bounds._max + offsets[j]);
-                bounds.expandBy(bounds._min + offsets[j]);
+                vertBounds[i]._max += (*sourceVerts)[i];
+                vertBounds[i]._min += (*sourceVerts)[i];
+                box.expandBy(vertBounds[i]);
             }
+            return box;
         }
+    }
 
-        osg::BoundingBox box;
-        for (unsigned int i=0; i<vertBounds.size(); ++i)
+    void MorphGeometry::cull(osg::NodeVisitor* nv)
+    {
+        if (mLastFrameNumber == nv->getTraversalNumber() || !mDirty || mMorphTargets.size() == 0)
         {
-            vertBounds[i]._max += (*sourceVerts)[i];
-            vertBounds[i]._min += (*sourceVerts)[i];
-            box.expandBy(vertBounds[i]);
+            osg::Geometry& geom = *getGeometry(mLastFrameNumber);
+            nv->pushOntoNodePath(&geom);
+            nv->apply(geom);
+            nv->popFromNodePath();
+            return;
         }
-        return box;
-    }
-}
 
-void MorphGeometry::cull(osg::NodeVisitor *nv)
-{
-    if (mLastFrameNumber == nv->getTraversalNumber() || !mDirty || mMorphTargets.size() == 0)
-    {
+        mDirty = false;
+        mLastFrameNumber = nv->getTraversalNumber();
         osg::Geometry& geom = *getGeometry(mLastFrameNumber);
+
+        const osg::Vec3Array* positionSrc = mMorphTargets[0].getOffsets();
+        osg::Vec3Array* positionDst = static_cast<osg::Vec3Array*>(geom.getVertexArray());
+        assert(positionSrc->size() == positionDst->size());
+        for (unsigned int vertex = 0; vertex < positionSrc->size(); ++vertex)
+            (*positionDst)[vertex] = (*positionSrc)[vertex];
+
+        for (unsigned int i = 1; i < mMorphTargets.size(); ++i)
+        {
+            float weight = mMorphTargets[i].getWeight();
+            if (weight == 0.f)
+                continue;
+            const osg::Vec3Array* offsets = mMorphTargets[i].getOffsets();
+            for (unsigned int vertex = 0; vertex < positionSrc->size(); ++vertex)
+                (*positionDst)[vertex] += (*offsets)[vertex] * weight;
+        }
+
+        positionDst->dirty();
+
+        geom.osg::Drawable::dirtyGLObjects();
+
         nv->pushOntoNodePath(&geom);
         nv->apply(geom);
         nv->popFromNodePath();
-        return;
     }
 
-    mDirty = false;
-    mLastFrameNumber = nv->getTraversalNumber();
-    osg::Geometry& geom = *getGeometry(mLastFrameNumber);
-
-    const osg::Vec3Array* positionSrc = mMorphTargets[0].getOffsets();
-    osg::Vec3Array* positionDst = static_cast<osg::Vec3Array*>(geom.getVertexArray());
-    assert(positionSrc->size() == positionDst->size());
-    for (unsigned int vertex=0; vertex<positionSrc->size(); ++vertex)
-        (*positionDst)[vertex] = (*positionSrc)[vertex];
-
-    for (unsigned int i=1; i<mMorphTargets.size(); ++i)
+    osg::Geometry* MorphGeometry::getGeometry(unsigned int frame) const
     {
-        float weight = mMorphTargets[i].getWeight();
-        if (weight == 0.f)
-            continue;
-        const osg::Vec3Array* offsets = mMorphTargets[i].getOffsets();
-        for (unsigned int vertex=0; vertex<positionSrc->size(); ++vertex)
-            (*positionDst)[vertex] += (*offsets)[vertex] * weight;
+        return mGeometry[frame % 2];
     }
 
-    positionDst->dirty();
-
-    geom.osg::Drawable::dirtyGLObjects();
-
-    nv->pushOntoNodePath(&geom);
-    nv->apply(geom);
-    nv->popFromNodePath();
-}
-
-osg::Geometry* MorphGeometry::getGeometry(unsigned int frame) const
-{
-    return mGeometry[frame%2];
-}
-
-
 }
diff --git a/components/sceneutil/morphgeometry.hpp b/components/sceneutil/morphgeometry.hpp
index 6c492ad15f..2ef7f2837f 100644
--- a/components/sceneutil/morphgeometry.hpp
+++ b/components/sceneutil/morphgeometry.hpp
@@ -7,8 +7,9 @@ namespace SceneUtil
 {
 
     /// @brief Vertex morphing implementation.
-    /// @note The internal Geometry used for rendering is double buffered, this allows updates to be done in a thread safe way while
-    /// not compromising rendering performance. This is crucial when using osg's default threading model of DrawThreadPerContext.
+    /// @note The internal Geometry used for rendering is double buffered, this allows updates to be done in a thread
+    /// safe way while not compromising rendering performance. This is crucial when using osg's default threading model
+    /// of DrawThreadPerContext.
     class MorphGeometry : public osg::Drawable
     {
     public:
@@ -21,7 +22,9 @@ namespace SceneUtil
         /// @note The source geometry will not be modified.
         void setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeom);
 
-        // Currently empty as this is difficult to implement. Technically we would need to compile both internal geometries in separate frames but this method is only called once. Alternatively we could compile just the static parts of the model.
+        // Currently empty as this is difficult to implement. Technically we would need to compile both internal
+        // geometries in separate frames but this method is only called once. Alternatively we could compile just the
+        // static parts of the model.
         void compileGLObjects(osg::RenderInfo& renderInfo) const override {}
 
         class MorphTarget
@@ -29,8 +32,13 @@ namespace SceneUtil
         protected:
             osg::ref_ptr<osg::Vec3Array> mOffsets;
             float mWeight;
+
         public:
-            MorphTarget(osg::Vec3Array* offsets, float w = 1.0) : mOffsets(offsets), mWeight(w) {}
+            MorphTarget(osg::Vec3Array* offsets, float w = 1.0)
+                : mOffsets(offsets)
+                , mWeight(w)
+            {
+            }
             void setWeight(float weight) { mWeight = weight; }
             float getWeight() const { return mWeight; }
             osg::Vec3Array* getOffsets() { return mOffsets.get(); }
@@ -40,7 +48,7 @@ namespace SceneUtil
 
         typedef std::vector<MorphTarget> MorphTargetList;
 
-        virtual void addMorphTarget( osg::Vec3Array* offsets, float weight = 1.0 );
+        virtual void addMorphTarget(osg::Vec3Array* offsets, float weight = 1.0);
 
         /** Set the MorphGeometry dirty.*/
         void dirty();
@@ -52,14 +60,14 @@ namespace SceneUtil
         MorphTargetList& getMorphTargetList() { return mMorphTargets; }
 
         /** Return the \c MorphTarget at position \c i.*/
-        inline const MorphTarget& getMorphTarget( unsigned int i ) const { return mMorphTargets[i]; }
+        inline const MorphTarget& getMorphTarget(unsigned int i) const { return mMorphTargets[i]; }
 
         /** Return the \c MorphTarget at position \c i.*/
-        inline MorphTarget& getMorphTarget( unsigned int i ) { return mMorphTargets[i]; }
+        inline MorphTarget& getMorphTarget(unsigned int i) { return mMorphTargets[i]; }
 
         osg::ref_ptr<osg::Geometry> getSourceGeometry() const;
 
-        void accept(osg::NodeVisitor &nv) override;
+        void accept(osg::NodeVisitor& nv) override;
         bool supports(const osg::PrimitiveFunctor&) const override { return true; }
         void accept(osg::PrimitiveFunctor&) const override;
 
diff --git a/components/sceneutil/navmesh.cpp b/components/sceneutil/navmesh.cpp
index a8a9fbac5f..2254150a53 100644
--- a/components/sceneutil/navmesh.cpp
+++ b/components/sceneutil/navmesh.cpp
@@ -1,6 +1,6 @@
 #include "navmesh.hpp"
-#include "detourdebugdraw.hpp"
 #include "depth.hpp"
+#include "detourdebugdraw.hpp"
 
 #include <components/detournavigator/settings.hpp>
 
@@ -14,26 +14,29 @@
 
 namespace
 {
-    // Copied from https://github.com/recastnavigation/recastnavigation/blob/c5cbd53024c8a9d8d097a4371215e3342d2fdc87/DebugUtils/Source/DetourDebugDraw.cpp#L26-L38
+    // Copied from
+    // https://github.com/recastnavigation/recastnavigation/blob/c5cbd53024c8a9d8d097a4371215e3342d2fdc87/DebugUtils/Source/DetourDebugDraw.cpp#L26-L38
     float distancePtLine2d(const float* pt, const float* p, const float* q)
     {
         float pqx = q[0] - p[0];
         float pqz = q[2] - p[2];
         float dx = pt[0] - p[0];
         float dz = pt[2] - p[2];
-        float d = pqx*pqx + pqz*pqz;
-        float t = pqx*dx + pqz*dz;
-        if (d != 0) t /= d;
-        dx = p[0] + t*pqx - pt[0];
-        dz = p[2] + t*pqz - pt[2];
-        return dx*dx + dz*dz;
+        float d = pqx * pqx + pqz * pqz;
+        float t = pqx * dx + pqz * dz;
+        if (d != 0)
+            t /= d;
+        dx = p[0] + t * pqx - pt[0];
+        dz = p[2] + t * pqz - pt[2];
+        return dx * dx + dz * dz;
     }
 
-    // Copied from https://github.com/recastnavigation/recastnavigation/blob/c5cbd53024c8a9d8d097a4371215e3342d2fdc87/DebugUtils/Source/DetourDebugDraw.cpp#L40-L118
-    void drawPolyBoundaries(duDebugDraw* dd, const dtMeshTile* tile, const unsigned int col,
-        const float linew, bool inner)
+    // Copied from
+    // https://github.com/recastnavigation/recastnavigation/blob/c5cbd53024c8a9d8d097a4371215e3342d2fdc87/DebugUtils/Source/DetourDebugDraw.cpp#L40-L118
+    void drawPolyBoundaries(
+        duDebugDraw* dd, const dtMeshTile* tile, const unsigned int col, const float linew, bool inner)
     {
-        static const float thr = 0.01f*0.01f;
+        static const float thr = 0.01f * 0.01f;
 
         dd->begin(DU_DRAW_LINES, linew);
 
@@ -41,7 +44,8 @@ namespace
         {
             const dtPoly* p = &tile->polys[i];
 
-            if (p->getType() == DT_POLYTYPE_OFFMESH_CONNECTION) continue;
+            if (p->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
+                continue;
 
             const dtPolyDetail* pd = &tile->detailMeshes[i];
 
@@ -50,7 +54,8 @@ namespace
                 unsigned int c = col;
                 if (inner)
                 {
-                    if (p->neis[j] == 0) continue;
+                    if (p->neis[j] == 0)
+                        continue;
                     if (p->neis[j] & DT_EXT_LINK)
                     {
                         bool con = false;
@@ -63,41 +68,41 @@ namespace
                             }
                         }
                         if (con)
-                            c = duRGBA(255,255,255,48);
+                            c = duRGBA(255, 255, 255, 48);
                         else
-                            c = duRGBA(0,0,0,48);
+                            c = duRGBA(0, 0, 0, 48);
                     }
                     else
-                        c = duRGBA(0,48,64,32);
+                        c = duRGBA(0, 48, 64, 32);
                 }
                 else
                 {
-                    if (p->neis[j] != 0) continue;
+                    if (p->neis[j] != 0)
+                        continue;
                 }
 
-                const float* v0 = &tile->verts[p->verts[j]*3];
-                const float* v1 = &tile->verts[p->verts[(j+1) % nj]*3];
+                const float* v0 = &tile->verts[p->verts[j] * 3];
+                const float* v1 = &tile->verts[p->verts[(j + 1) % nj] * 3];
 
                 // Draw detail mesh edges which align with the actual poly edge.
                 // This is really slow.
                 for (int k = 0; k < pd->triCount; ++k)
                 {
-                    const unsigned char* t = &tile->detailTris[(pd->triBase+k)*4];
+                    const unsigned char* t = &tile->detailTris[(pd->triBase + k) * 4];
                     const float* tv[3];
                     for (int m = 0; m < 3; ++m)
                     {
                         if (t[m] < p->vertCount)
-                            tv[m] = &tile->verts[p->verts[t[m]]*3];
+                            tv[m] = &tile->verts[p->verts[t[m]] * 3];
                         else
-                            tv[m] = &tile->detailVerts[(pd->vertBase+(t[m]-p->vertCount))*3];
+                            tv[m] = &tile->detailVerts[(pd->vertBase + (t[m] - p->vertCount)) * 3];
                     }
-                    for (int m = 0, n = 2; m < 3; n=m++)
+                    for (int m = 0, n = 2; m < 3; n = m++)
                     {
                         if ((dtGetDetailTriEdgeFlags(t[3], n) & DT_DETAIL_EDGE_BOUNDARY) == 0)
                             continue;
 
-                        if (distancePtLine2d(tv[n],v0,v1) < thr &&
-                            distancePtLine2d(tv[m],v0,v1) < thr)
+                        if (distancePtLine2d(tv[n], v0, v1) < thr && distancePtLine2d(tv[m], v0, v1) < thr)
                         {
                             dd->vertex(tv[n], c);
                             dd->vertex(tv[m], c);
@@ -138,9 +143,10 @@ namespace
         return duRGBA(max, min + getRgbaComponent(1 - 4 * (heat - 0.75f), max - min), min, alpha);
     }
 
-    // Based on https://github.com/recastnavigation/recastnavigation/blob/c5cbd53024c8a9d8d097a4371215e3342d2fdc87/DebugUtils/Source/DetourDebugDraw.cpp#L120-L235
-    void drawMeshTile(duDebugDraw* dd, const dtNavMesh& mesh, const dtNavMeshQuery* query,
-        const dtMeshTile* tile, unsigned char flags, float heat)
+    // Based on
+    // https://github.com/recastnavigation/recastnavigation/blob/c5cbd53024c8a9d8d097a4371215e3342d2fdc87/DebugUtils/Source/DetourDebugDraw.cpp#L120-L235
+    void drawMeshTile(duDebugDraw* dd, const dtNavMesh& mesh, const dtNavMeshQuery* query, const dtMeshTile* tile,
+        unsigned char flags, float heat)
     {
         using namespace SceneUtil;
 
@@ -156,7 +162,7 @@ namespace
         for (int i = 0; i < tile->header->polyCount; ++i)
         {
             const dtPoly* p = &tile->polys[i];
-            if (p->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)	// Skip off-mesh links.
+            if (p->getType() == DT_POLYTYPE_OFFMESH_CONNECTION) // Skip off-mesh links.
                 continue;
 
             const dtPolyDetail* pd = &tile->detailMeshes[i];
@@ -176,23 +182,23 @@ namespace
 
             for (int j = 0; j < pd->triCount; ++j)
             {
-                const unsigned char* t = &tile->detailTris[(pd->triBase+j)*4];
+                const unsigned char* t = &tile->detailTris[(pd->triBase + j) * 4];
                 for (int k = 0; k < 3; ++k)
                 {
                     if (t[k] < p->vertCount)
-                        dd->vertex(&tile->verts[p->verts[t[k]]*3], col);
+                        dd->vertex(&tile->verts[p->verts[t[k]] * 3], col);
                     else
-                        dd->vertex(&tile->detailVerts[(pd->vertBase+t[k]-p->vertCount)*3], col);
+                        dd->vertex(&tile->detailVerts[(pd->vertBase + t[k] - p->vertCount) * 3], col);
                 }
             }
         }
         dd->end();
 
         // Draw inter poly boundaries
-        drawPolyBoundaries(dd, tile, duRGBA(0,48,64,32), 1.5f, true);
+        drawPolyBoundaries(dd, tile, duRGBA(0, 48, 64, 32), 1.5f, true);
 
         // Draw outer poly boundaries
-        drawPolyBoundaries(dd, tile, duRGBA(0,48,64,220), 2.5f, false);
+        drawPolyBoundaries(dd, tile, duRGBA(0, 48, 64, 220), 2.5f, false);
 
         if (flags & NavMeshTileDrawFlagsOffMeshConnections)
         {
@@ -200,18 +206,18 @@ namespace
             for (int i = 0; i < tile->header->polyCount; ++i)
             {
                 const dtPoly* p = &tile->polys[i];
-                if (p->getType() != DT_POLYTYPE_OFFMESH_CONNECTION)	// Skip regular polys.
+                if (p->getType() != DT_POLYTYPE_OFFMESH_CONNECTION) // Skip regular polys.
                     continue;
 
                 unsigned int col, col2;
                 if (query && query->isInClosedList(base | (dtPolyRef)i))
-                    col = duRGBA(255,196,0,220);
+                    col = duRGBA(255, 196, 0, 220);
                 else
                     col = duDarkenCol(duTransCol(dd->areaToCol(p->getArea()), 220));
 
                 const dtOffMeshConnection* con = &tile->offMeshCons[i - tile->header->offMeshBase];
-                const float* va = &tile->verts[p->verts[0]*3];
-                const float* vb = &tile->verts[p->verts[1]*3];
+                const float* va = &tile->verts[p->verts[0] * 3];
+                const float* vb = &tile->verts[p->verts[1] * 3];
 
                 // Check to see if start and end end-points have links.
                 bool startSet = false;
@@ -225,35 +231,35 @@ namespace
                 }
 
                 // End points and their on-mesh locations.
-                dd->vertex(va[0],va[1],va[2], col);
-                dd->vertex(con->pos[0],con->pos[1],con->pos[2], col);
-                col2 = startSet ? col : duRGBA(220,32,16,196);
-                duAppendCircle(dd, con->pos[0],con->pos[1]+0.1f,con->pos[2], con->rad, col2);
+                dd->vertex(va[0], va[1], va[2], col);
+                dd->vertex(con->pos[0], con->pos[1], con->pos[2], col);
+                col2 = startSet ? col : duRGBA(220, 32, 16, 196);
+                duAppendCircle(dd, con->pos[0], con->pos[1] + 0.1f, con->pos[2], con->rad, col2);
 
-                dd->vertex(vb[0],vb[1],vb[2], col);
-                dd->vertex(con->pos[3],con->pos[4],con->pos[5], col);
-                col2 = endSet ? col : duRGBA(220,32,16,196);
-                duAppendCircle(dd, con->pos[3],con->pos[4]+0.1f,con->pos[5], con->rad, col2);
+                dd->vertex(vb[0], vb[1], vb[2], col);
+                dd->vertex(con->pos[3], con->pos[4], con->pos[5], col);
+                col2 = endSet ? col : duRGBA(220, 32, 16, 196);
+                duAppendCircle(dd, con->pos[3], con->pos[4] + 0.1f, con->pos[5], con->rad, col2);
 
                 // End point vertices.
-                dd->vertex(con->pos[0],con->pos[1],con->pos[2], duRGBA(0,48,64,196));
-                dd->vertex(con->pos[0],con->pos[1]+0.2f,con->pos[2], duRGBA(0,48,64,196));
+                dd->vertex(con->pos[0], con->pos[1], con->pos[2], duRGBA(0, 48, 64, 196));
+                dd->vertex(con->pos[0], con->pos[1] + 0.2f, con->pos[2], duRGBA(0, 48, 64, 196));
 
-                dd->vertex(con->pos[3],con->pos[4],con->pos[5], duRGBA(0,48,64,196));
-                dd->vertex(con->pos[3],con->pos[4]+0.2f,con->pos[5], duRGBA(0,48,64,196));
+                dd->vertex(con->pos[3], con->pos[4], con->pos[5], duRGBA(0, 48, 64, 196));
+                dd->vertex(con->pos[3], con->pos[4] + 0.2f, con->pos[5], duRGBA(0, 48, 64, 196));
 
                 // Connection arc.
-                duAppendArc(dd, con->pos[0],con->pos[1],con->pos[2], con->pos[3],con->pos[4],con->pos[5], 0.25f,
-                            (con->flags & 1) ? 0.6f : 0, 0.6f, col);
+                duAppendArc(dd, con->pos[0], con->pos[1], con->pos[2], con->pos[3], con->pos[4], con->pos[5], 0.25f,
+                    (con->flags & 1) ? 0.6f : 0, 0.6f, col);
             }
             dd->end();
         }
 
-        const unsigned int vcol = duRGBA(0,0,0,196);
+        const unsigned int vcol = duRGBA(0, 0, 0, 196);
         dd->begin(DU_DRAW_POINTS, 3.0f);
         for (int i = 0; i < tile->header->vertCount; ++i)
         {
-            const float* v = &tile->verts[i*3];
+            const float* v = &tile->verts[i * 3];
             dd->vertex(v[0], v[1], v[2], vcol);
         }
         dd->end();
@@ -271,7 +277,8 @@ namespace SceneUtil
 
         const float polygonOffsetFactor = SceneUtil::AutoDepth::isReversed() ? 1.0 : -1.0;
         const float polygonOffsetUnits = SceneUtil::AutoDepth::isReversed() ? 1.0 : -1.0;
-        osg::ref_ptr<osg::PolygonOffset> polygonOffset = new osg::PolygonOffset(polygonOffsetFactor, polygonOffsetUnits);
+        osg::ref_ptr<osg::PolygonOffset> polygonOffset
+            = new osg::PolygonOffset(polygonOffsetFactor, polygonOffsetUnits);
 
         osg::ref_ptr<osg::StateSet> stateSet = new osg::StateSet;
         stateSet->setAttribute(material);
@@ -289,7 +296,8 @@ namespace SceneUtil
         osg::ref_ptr<osg::Group> group(new osg::Group);
         group->setStateSet(groupStateSet);
         constexpr float shift = 10.0f;
-        DebugDraw debugDraw(*group, debugDrawStateSet, osg::Vec3f(0, 0, shift), 1.0f / settings.mRecast.mRecastScaleFactor);
+        DebugDraw debugDraw(
+            *group, debugDrawStateSet, osg::Vec3f(0, 0, shift), 1.0f / settings.mRecast.mRecastScaleFactor);
         dtNavMeshQuery navMeshQuery;
         navMeshQuery.init(&navMesh, settings.mDetour.mMaxNavMeshQueryNodes);
         drawMeshTile(&debugDraw, navMesh, &navMeshQuery, &meshTile, flags, getHeat(meshTile.salt, minSalt, maxSalt));
diff --git a/components/sceneutil/nodecallback.hpp b/components/sceneutil/nodecallback.hpp
index 96e3ae229e..b0cf21606e 100644
--- a/components/sceneutil/nodecallback.hpp
+++ b/components/sceneutil/nodecallback.hpp
@@ -12,29 +12,31 @@ namespace osg
 namespace SceneUtil
 {
 
-template <class Derived, typename NodeType=osg::Node*, typename VisitorType=osg::NodeVisitor*>
-class NodeCallback : public osg::Callback
-{
-public:
-    NodeCallback(){}
-    NodeCallback(const NodeCallback& nc,const osg::CopyOp& copyop):
-            osg::Callback(nc, copyop) {}
-
-    bool run(osg::Object* object, osg::Object* data) override
+    template <class Derived, typename NodeType = osg::Node*, typename VisitorType = osg::NodeVisitor*>
+    class NodeCallback : public osg::Callback
     {
-        static_cast<Derived*>(this)->operator()((NodeType)object, (VisitorType)data->asNodeVisitor());
-        return true;
-    }
+    public:
+        NodeCallback() {}
+        NodeCallback(const NodeCallback& nc, const osg::CopyOp& copyop)
+            : osg::Callback(nc, copyop)
+        {
+        }
 
-    template <typename VT>
-    void traverse(NodeType object, VT data)
-    {
-        if (_nestedCallback.valid())
-            _nestedCallback->run(object, data);
-        else
-            data->traverse(*object);
-    }
-};
+        bool run(osg::Object* object, osg::Object* data) override
+        {
+            static_cast<Derived*>(this)->operator()((NodeType)object, (VisitorType)data->asNodeVisitor());
+            return true;
+        }
+
+        template <typename VT>
+        void traverse(NodeType object, VT data)
+        {
+            if (_nestedCallback.valid())
+                _nestedCallback->run(object, data);
+            else
+                data->traverse(*object);
+        }
+    };
 
 }
 #endif
diff --git a/components/sceneutil/osgacontroller.cpp b/components/sceneutil/osgacontroller.cpp
index b7981cf4e5..87fac9c6e7 100644
--- a/components/sceneutil/osgacontroller.cpp
+++ b/components/sceneutil/osgacontroller.cpp
@@ -17,7 +17,8 @@
 
 namespace SceneUtil
 {
-    LinkVisitor::LinkVisitor() : osg::NodeVisitor( TRAVERSE_ALL_CHILDREN )
+    LinkVisitor::LinkVisitor()
+        : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
     {
         mAnimation = nullptr;
     }
@@ -25,15 +26,16 @@ namespace SceneUtil
     void LinkVisitor::link(osgAnimation::UpdateMatrixTransform* umt)
     {
         const osgAnimation::ChannelList& channels = mAnimation->getChannels();
-        for (const auto& channel: channels)
+        for (const auto& channel : channels)
         {
             const std::string& channelName = channel->getName();
             const std::string& channelTargetName = channel->getTargetName();
 
-            if (channelTargetName != umt->getName()) continue;
+            if (channelTargetName != umt->getName())
+                continue;
 
             // check if we can link a StackedTransformElement to the current Channel
-            for (const auto & stackedTransform : umt->getStackedTransforms())
+            for (const auto& stackedTransform : umt->getStackedTransforms())
             {
                 osgAnimation::StackedTransformElement* element = stackedTransform.get();
                 if (element && !element->getName().empty() && channelName == element->getName())
@@ -60,15 +62,16 @@ namespace SceneUtil
         {
             osgAnimation::UpdateMatrixTransform* umt = dynamic_cast<osgAnimation::UpdateMatrixTransform*>(cb);
             if (umt)
-                if (Misc::StringUtils::lowerCase(node.getName()) != "bip01") link(umt);
+                if (Misc::StringUtils::lowerCase(node.getName()) != "bip01")
+                    link(umt);
             cb = cb->getNestedCallback();
         }
 
         if (node.getNumChildrenRequiringUpdateTraversal())
-            traverse( node );
+            traverse(node);
     }
 
-    OsgAnimationController::OsgAnimationController(const OsgAnimationController &copy, const osg::CopyOp &copyop)
+    OsgAnimationController::OsgAnimationController(const OsgAnimationController& copy, const osg::CopyOp& copyop)
         : osg::Object(copy, copyop)
         , SceneUtil::KeyframeController(copy)
         , SceneUtil::NodeCallback<OsgAnimationController>(copy, copyop)
@@ -77,7 +80,8 @@ namespace SceneUtil
         mLinker = nullptr;
         for (const auto& mergedAnimationTrack : copy.mMergedAnimationTracks)
         {
-            Resource::Animation* copiedAnimationTrack = static_cast<Resource::Animation*>(mergedAnimationTrack.get()->clone(copyop));
+            Resource::Animation* copiedAnimationTrack
+                = static_cast<Resource::Animation*>(mergedAnimationTrack.get()->clone(copyop));
             mMergedAnimationTracks.emplace_back(copiedAnimationTrack);
         }
     }
@@ -88,7 +92,7 @@ namespace SceneUtil
         std::string animationName;
         float newTime = time;
 
-        //Find the correct animation based on time
+        // Find the correct animation based on time
         for (const EmulatedAnimation& emulatedAnimation : mEmulatedAnimations)
         {
             if (time >= emulatedAnimation.mStartTime && time <= emulatedAnimation.mStopTime)
@@ -98,18 +102,21 @@ namespace SceneUtil
             }
         }
 
-        //Find the root transform track in animation
+        // Find the root transform track in animation
         for (const auto& mergedAnimationTrack : mMergedAnimationTracks)
         {
-            if (mergedAnimationTrack->getName() != animationName) continue;
+            if (mergedAnimationTrack->getName() != animationName)
+                continue;
 
             const osgAnimation::ChannelList& channels = mergedAnimationTrack->getChannels();
 
-            for (const auto& channel: channels)
+            for (const auto& channel : channels)
             {
-                if (channel->getTargetName() != "bip01" || channel->getName() != "transform") continue;
+                if (channel->getTargetName() != "bip01" || channel->getName() != "transform")
+                    continue;
 
-                if ( osgAnimation::MatrixLinearSampler* templateSampler = dynamic_cast<osgAnimation::MatrixLinearSampler*> (channel->getSampler()) )
+                if (osgAnimation::MatrixLinearSampler* templateSampler
+                    = dynamic_cast<osgAnimation::MatrixLinearSampler*>(channel->getSampler()))
                 {
                     osg::Matrixf matrix;
                     templateSampler->getValueAt(newTime, matrix);
@@ -126,11 +133,12 @@ namespace SceneUtil
     {
         for (const auto& mergedAnimationTrack : mMergedAnimationTracks)
         {
-            if (mergedAnimationTrack->getName() == animationName) mergedAnimationTrack->update(time);
+            if (mergedAnimationTrack->getName() == animationName)
+                mergedAnimationTrack->update(time);
         }
     }
 
-    void OsgAnimationController::operator() (osg::Node* node, osg::NodeVisitor* nv)
+    void OsgAnimationController::operator()(osg::Node* node, osg::NodeVisitor* nv)
     {
         if (hasInput())
         {
@@ -138,7 +146,8 @@ namespace SceneUtil
             {
                 for (const auto& mergedAnimationTrack : mMergedAnimationTracks)
                 {
-                    if (!mLinker.valid()) mLinker = new LinkVisitor();
+                    if (!mLinker.valid())
+                        mLinker = new LinkVisitor();
                     mLinker->setAnimation(mergedAnimationTrack);
                     node->accept(*mLinker);
                 }
diff --git a/components/sceneutil/osgacontroller.hpp b/components/sceneutil/osgacontroller.hpp
index 07bf0d68a7..5beee601f2 100644
--- a/components/sceneutil/osgacontroller.hpp
+++ b/components/sceneutil/osgacontroller.hpp
@@ -6,8 +6,8 @@
 #include <osg/ref_ptr>
 #include <osgAnimation/UpdateMatrixTransform>
 
-#include "nodecallback.hpp"
 #include "keyframe.hpp"
+#include "nodecallback.hpp"
 
 #include <components/resource/animation.hpp>
 
@@ -22,32 +22,33 @@ namespace SceneUtil
 
     class LinkVisitor : public osg::NodeVisitor
     {
-        public:
-            LinkVisitor();
+    public:
+        LinkVisitor();
 
-            virtual void link(osgAnimation::UpdateMatrixTransform* umt);
+        virtual void link(osgAnimation::UpdateMatrixTransform* umt);
 
-            virtual void setAnimation(Resource::Animation* animation);
+        virtual void setAnimation(Resource::Animation* animation);
 
-            virtual void apply(osg::Node& node) override;
+        virtual void apply(osg::Node& node) override;
 
-        protected:
-            Resource::Animation* mAnimation;
+    protected:
+        Resource::Animation* mAnimation;
     };
 
 #ifdef _MSC_VER
-#pragma warning( push )
+#pragma warning(push)
 /*
- * Warning C4250: 'SceneUtil::OsgAnimationController': inherits 'osg::Callback::osg::Callback::asCallback' via dominance,
- * there is no way to solved this if an object must inherit from both osg::Object and osg::Callback
+ * Warning C4250: 'SceneUtil::OsgAnimationController': inherits 'osg::Callback::osg::Callback::asCallback' via
+ * dominance, there is no way to solved this if an object must inherit from both osg::Object and osg::Callback
  */
-#pragma warning( disable : 4250 )
+#pragma warning(disable : 4250)
 #endif
-    class OsgAnimationController : public SceneUtil::KeyframeController, public SceneUtil::NodeCallback<OsgAnimationController>
+    class OsgAnimationController : public SceneUtil::KeyframeController,
+                                   public SceneUtil::NodeCallback<OsgAnimationController>
     {
     public:
         /// @brief Handles the animation for osgAnimation formats
-        OsgAnimationController() {};
+        OsgAnimationController(){};
 
         OsgAnimationController(const OsgAnimationController& copy, const osg::CopyOp& copyop);
 
@@ -62,7 +63,7 @@ namespace SceneUtil
         void update(float time, const std::string& animationName);
 
         /// @brief Called every frame for osgAnimation
-        void operator() (osg::Node*, osg::NodeVisitor*);
+        void operator()(osg::Node*, osg::NodeVisitor*);
 
         /// @brief Sets details of the animations
         void setEmulatedAnimations(const std::vector<EmulatedAnimation>& emulatedAnimations);
@@ -73,11 +74,12 @@ namespace SceneUtil
     private:
         bool mNeedToLink = true;
         osg::ref_ptr<LinkVisitor> mLinker;
-        std::vector<osg::ref_ptr<Resource::Animation>> mMergedAnimationTracks; // Used only by osgAnimation-based formats (e.g. dae)
+        std::vector<osg::ref_ptr<Resource::Animation>>
+            mMergedAnimationTracks; // Used only by osgAnimation-based formats (e.g. dae)
         std::vector<EmulatedAnimation> mEmulatedAnimations;
     };
 #ifdef _MSC_VER
-#pragma warning( pop )
+#pragma warning(pop)
 #endif
 }
 
diff --git a/components/sceneutil/pathgridutil.cpp b/components/sceneutil/pathgridutil.cpp
index 6bfc724d7b..2d19913341 100644
--- a/components/sceneutil/pathgridutil.cpp
+++ b/components/sceneutil/pathgridutil.cpp
@@ -17,58 +17,23 @@ namespace SceneUtil
 
     const float DiamondWireframeScalar = 1.1f;
 
-    const osg::Vec3f DiamondPoints[DiamondVertexCount] =
-    {
-        osg::Vec3f( 0.f, 0.f, DiamondHalfHeight * 2.f),
-        osg::Vec3f(-DiamondHalfWidth, -DiamondHalfWidth,  DiamondHalfHeight),
-        osg::Vec3f(-DiamondHalfWidth,  DiamondHalfWidth,  DiamondHalfHeight),
-        osg::Vec3f( DiamondHalfWidth, -DiamondHalfWidth,  DiamondHalfHeight),
-        osg::Vec3f( DiamondHalfWidth,  DiamondHalfWidth,  DiamondHalfHeight),
-        osg::Vec3f( 0.f, 0.f, 0.f)
-    };
-
-    const unsigned short DiamondIndices[DiamondIndexCount] =
-    {
-        0, 2, 1,
-        0, 1, 3,
-        0, 3, 4,
-        0, 4, 2,
-        5, 1, 2,
-        5, 3, 1,
-        5, 4, 3,
-        5, 2, 4
-    };
-
-    const unsigned short DiamondWireframeIndices[DiamondWireframeIndexCount] =
-    {
-        0, 1,
-        0, 2,
-        0, 3,
-        0, 4,
-        1, 2,
-        2, 4,
-        4, 3,
-        3, 1,
-        5, 1,
-        5, 2,
-        5, 3,
-        5, 4
-    };
-
-    const unsigned short DiamondConnectorVertices[DiamondConnectorVertexCount] =
-    {
-        1, 2, 3, 4
-    };
+    const osg::Vec3f DiamondPoints[DiamondVertexCount] = { osg::Vec3f(0.f, 0.f, DiamondHalfHeight * 2.f),
+        osg::Vec3f(-DiamondHalfWidth, -DiamondHalfWidth, DiamondHalfHeight),
+        osg::Vec3f(-DiamondHalfWidth, DiamondHalfWidth, DiamondHalfHeight),
+        osg::Vec3f(DiamondHalfWidth, -DiamondHalfWidth, DiamondHalfHeight),
+        osg::Vec3f(DiamondHalfWidth, DiamondHalfWidth, DiamondHalfHeight), osg::Vec3f(0.f, 0.f, 0.f) };
 
-    const osg::Vec4f DiamondColors[DiamondVertexCount] =
-    {
-        osg::Vec4f(0.f, 0.f, 1.f, 1.f),
-        osg::Vec4f(0.f, .05f, .95f, 1.f),
-        osg::Vec4f(0.f, .1f, .95f, 1.f),
-        osg::Vec4f(0.f, .15f, .95f, 1.f),
-        osg::Vec4f(0.f, .2f, .95f, 1.f),
-        osg::Vec4f(0.f, .25f, 9.f, 1.f)
-    };
+    const unsigned short DiamondIndices[DiamondIndexCount]
+        = { 0, 2, 1, 0, 1, 3, 0, 3, 4, 0, 4, 2, 5, 1, 2, 5, 3, 1, 5, 4, 3, 5, 2, 4 };
+
+    const unsigned short DiamondWireframeIndices[DiamondWireframeIndexCount]
+        = { 0, 1, 0, 2, 0, 3, 0, 4, 1, 2, 2, 4, 4, 3, 3, 1, 5, 1, 5, 2, 5, 3, 5, 4 };
+
+    const unsigned short DiamondConnectorVertices[DiamondConnectorVertexCount] = { 1, 2, 3, 4 };
+
+    const osg::Vec4f DiamondColors[DiamondVertexCount]
+        = { osg::Vec4f(0.f, 0.f, 1.f, 1.f), osg::Vec4f(0.f, .05f, .95f, 1.f), osg::Vec4f(0.f, .1f, .95f, 1.f),
+              osg::Vec4f(0.f, .15f, .95f, 1.f), osg::Vec4f(0.f, .2f, .95f, 1.f), osg::Vec4f(0.f, .25f, 9.f, 1.f) };
 
     const osg::Vec4f DiamondEdgeColor = osg::Vec4f(0.5f, 1.f, 1.f, 1.f);
     const osg::Vec4f DiamondWireColor = osg::Vec4f(0.72f, 0.f, 0.96f, 1.f);
@@ -90,10 +55,10 @@ namespace SceneUtil
         {
             osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array(VertexCount);
             osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array(ColorCount);
-            osg::ref_ptr<osg::DrawElementsUShort> pointIndices =
-                new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES, PointIndexCount);
-            osg::ref_ptr<osg::DrawElementsUShort> lineIndices =
-                new osg::DrawElementsUShort(osg::PrimitiveSet::LINES, EdgeIndexCount);
+            osg::ref_ptr<osg::DrawElementsUShort> pointIndices
+                = new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES, PointIndexCount);
+            osg::ref_ptr<osg::DrawElementsUShort> lineIndices
+                = new osg::DrawElementsUShort(osg::PrimitiveSet::LINES, EdgeIndexCount);
 
             // Add each point/node
             for (unsigned short pointIndex = 0; pointIndex < PointCount; ++pointIndex)
@@ -128,11 +93,11 @@ namespace SceneUtil
             // Add edges
             unsigned short lineIndex = 0;
 
-            for (ESM::Pathgrid::EdgeList::const_iterator edge = pathgrid.mEdges.begin();
-                edge != pathgrid.mEdges.end(); ++edge)
+            for (ESM::Pathgrid::EdgeList::const_iterator edge = pathgrid.mEdges.begin(); edge != pathgrid.mEdges.end();
+                 ++edge)
             {
-                if (edge->mV0 == edge->mV1 || edge->mV0 < 0 || edge->mV0 >= PointCount ||
-                    edge->mV1 < 0 || edge->mV1 >= PointCount)
+                if (edge->mV0 == edge->mV1 || edge->mV0 < 0 || edge->mV0 >= PointCount || edge->mV1 < 0
+                    || edge->mV1 >= PointCount)
                     continue;
 
                 const ESM::Pathgrid::Point& from = pathgrid.mPoints[edge->mV0];
@@ -161,8 +126,10 @@ namespace SceneUtil
                 unsigned short fromIndex = static_cast<unsigned short>(edge->mV0);
                 unsigned short toIndex = static_cast<unsigned short>(edge->mV1);
 
-                lineIndices->setElement(lineIndex++, fromIndex * DiamondTotalVertexCount + DiamondVertexCount + diamondIndex);
-                lineIndices->setElement(lineIndex++, toIndex * DiamondTotalVertexCount + DiamondVertexCount + diamondIndex);
+                lineIndices->setElement(
+                    lineIndex++, fromIndex * DiamondTotalVertexCount + DiamondVertexCount + diamondIndex);
+                lineIndices->setElement(
+                    lineIndex++, toIndex * DiamondTotalVertexCount + DiamondVertexCount + diamondIndex);
             }
 
             lineIndices->resize(lineIndex);
@@ -183,8 +150,8 @@ namespace SceneUtil
         return gridGeometry;
     }
 
-    osg::ref_ptr<osg::Geometry> createPathgridSelectedWireframe(const ESM::Pathgrid& pathgrid,
-        const std::vector<unsigned short>& selected)
+    osg::ref_ptr<osg::Geometry> createPathgridSelectedWireframe(
+        const ESM::Pathgrid& pathgrid, const std::vector<unsigned short>& selected)
     {
         const unsigned short PointCount = selected.size();
 
@@ -198,8 +165,8 @@ namespace SceneUtil
         {
             osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array(VertexCount);
             osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array(ColorCount);
-            osg::ref_ptr<osg::DrawElementsUShort> indices =
-                new osg::DrawElementsUShort(osg::PrimitiveSet::LINES, IndexCount);
+            osg::ref_ptr<osg::DrawElementsUShort> indices
+                = new osg::DrawElementsUShort(osg::PrimitiveSet::LINES, IndexCount);
 
             osg::Vec3f wireOffset = osg::Vec3f(0, 0, (1 - DiamondWireframeScalar) * DiamondHalfHeight);
 
diff --git a/components/sceneutil/pathgridutil.hpp b/components/sceneutil/pathgridutil.hpp
index de0ff35ed3..4acdc29d5f 100644
--- a/components/sceneutil/pathgridutil.hpp
+++ b/components/sceneutil/pathgridutil.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_PATHGRIDUTIL_H
 #define OPENMW_COMPONENTS_PATHGRIDUTIL_H
 
-#include <osg/ref_ptr>
 #include <osg/Geometry>
+#include <osg/ref_ptr>
 
 namespace ESM
 {
@@ -16,8 +16,8 @@ namespace SceneUtil
 
     osg::ref_ptr<osg::Geometry> createPathgridGeometry(const ESM::Pathgrid& pathgrid);
 
-    osg::ref_ptr<osg::Geometry> createPathgridSelectedWireframe(const ESM::Pathgrid& pathgrid,
-        const std::vector<unsigned short>& selected);
+    osg::ref_ptr<osg::Geometry> createPathgridSelectedWireframe(
+        const ESM::Pathgrid& pathgrid, const std::vector<unsigned short>& selected);
 
     unsigned short getPathgridNode(unsigned short vertexIndex);
 }
diff --git a/components/sceneutil/positionattitudetransform.cpp b/components/sceneutil/positionattitudetransform.cpp
index 6129c33b4d..9e79d042f0 100644
--- a/components/sceneutil/positionattitudetransform.cpp
+++ b/components/sceneutil/positionattitudetransform.cpp
@@ -3,47 +3,46 @@
 namespace SceneUtil
 {
 
-PositionAttitudeTransform::PositionAttitudeTransform():
-    _scale(1.0,1.0,1.0)
-{
-}
-
-bool PositionAttitudeTransform::computeLocalToWorldMatrix(osg::Matrix& matrix, osg::NodeVisitor*) const
-{
-    if (_referenceFrame==RELATIVE_RF)
+    PositionAttitudeTransform::PositionAttitudeTransform()
+        : _scale(1.0, 1.0, 1.0)
     {
-        matrix.preMultTranslate(_position);
-        matrix.preMultRotate(_attitude);
-        matrix.preMultScale(_scale);
     }
-    else // absolute
-    {
-        matrix.makeRotate(_attitude);
-        matrix.postMultTranslate(_position);
-        matrix.preMultScale(_scale);
-    }
-    return true;
-}
 
-
-bool PositionAttitudeTransform::computeWorldToLocalMatrix(osg::Matrix& matrix, osg::NodeVisitor*) const
-{
-    if (_scale.x() == 0.0 || _scale.y() == 0.0 || _scale.z() == 0.0)
-        return false;
-
-    if (_referenceFrame==RELATIVE_RF)
+    bool PositionAttitudeTransform::computeLocalToWorldMatrix(osg::Matrix& matrix, osg::NodeVisitor*) const
     {
-        matrix.postMultTranslate(-_position);
-        matrix.postMultRotate(_attitude.inverse());
-        matrix.postMultScale(osg::Vec3f(1.0/_scale.x(), 1.0/_scale.y(), 1.0/_scale.z()));
+        if (_referenceFrame == RELATIVE_RF)
+        {
+            matrix.preMultTranslate(_position);
+            matrix.preMultRotate(_attitude);
+            matrix.preMultScale(_scale);
+        }
+        else // absolute
+        {
+            matrix.makeRotate(_attitude);
+            matrix.postMultTranslate(_position);
+            matrix.preMultScale(_scale);
+        }
+        return true;
     }
-    else // absolute
+
+    bool PositionAttitudeTransform::computeWorldToLocalMatrix(osg::Matrix& matrix, osg::NodeVisitor*) const
     {
-        matrix.makeRotate(_attitude.inverse());
-        matrix.preMultTranslate(-_position);
-        matrix.postMultScale(osg::Vec3f(1.0/_scale.x(), 1.0/_scale.y(), 1.0/_scale.z()));
+        if (_scale.x() == 0.0 || _scale.y() == 0.0 || _scale.z() == 0.0)
+            return false;
+
+        if (_referenceFrame == RELATIVE_RF)
+        {
+            matrix.postMultTranslate(-_position);
+            matrix.postMultRotate(_attitude.inverse());
+            matrix.postMultScale(osg::Vec3f(1.0 / _scale.x(), 1.0 / _scale.y(), 1.0 / _scale.z()));
+        }
+        else // absolute
+        {
+            matrix.makeRotate(_attitude.inverse());
+            matrix.preMultTranslate(-_position);
+            matrix.postMultScale(osg::Vec3f(1.0 / _scale.x(), 1.0 / _scale.y(), 1.0 / _scale.z()));
+        }
+        return true;
     }
-    return true;
-}
 
 }
diff --git a/components/sceneutil/positionattitudetransform.hpp b/components/sceneutil/positionattitudetransform.hpp
index 9513c0e365..0fd924e5fe 100644
--- a/components/sceneutil/positionattitudetransform.hpp
+++ b/components/sceneutil/positionattitudetransform.hpp
@@ -6,42 +6,55 @@
 namespace SceneUtil
 {
 
-/// @brief A customized version of osg::PositionAttitudeTransform optimized for speed.
-/// Uses single precision values. Also removed _pivotPoint which we don't need.
-class PositionAttitudeTransform : public osg::Transform
-{
-    public :
+    /// @brief A customized version of osg::PositionAttitudeTransform optimized for speed.
+    /// Uses single precision values. Also removed _pivotPoint which we don't need.
+    class PositionAttitudeTransform : public osg::Transform
+    {
+    public:
         PositionAttitudeTransform();
 
-        PositionAttitudeTransform(const PositionAttitudeTransform& pat,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY):
-            Transform(pat,copyop),
-            _position(pat._position),
-            _attitude(pat._attitude),
-            _scale(pat._scale){}
-
+        PositionAttitudeTransform(
+            const PositionAttitudeTransform& pat, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY)
+            : Transform(pat, copyop)
+            , _position(pat._position)
+            , _attitude(pat._attitude)
+            , _scale(pat._scale)
+        {
+        }
 
         META_Node(SceneUtil, PositionAttitudeTransform)
 
-        inline void setPosition(const osg::Vec3f& pos) { _position = pos; dirtyBound(); }
+            inline void setPosition(const osg::Vec3f& pos)
+        {
+            _position = pos;
+            dirtyBound();
+        }
         inline const osg::Vec3f& getPosition() const { return _position; }
 
-        inline void setAttitude(const osg::Quat& quat) { _attitude = quat; dirtyBound(); }
+        inline void setAttitude(const osg::Quat& quat)
+        {
+            _attitude = quat;
+            dirtyBound();
+        }
         inline const osg::Quat& getAttitude() const { return _attitude; }
 
-        inline void setScale(const osg::Vec3f& scale) { _scale = scale; dirtyBound(); }
+        inline void setScale(const osg::Vec3f& scale)
+        {
+            _scale = scale;
+            dirtyBound();
+        }
         inline const osg::Vec3f& getScale() const { return _scale; }
 
-        bool computeLocalToWorldMatrix(osg::Matrix& matrix,osg::NodeVisitor* nv) const override;
-        bool computeWorldToLocalMatrix(osg::Matrix& matrix,osg::NodeVisitor* nv) const override;
-
+        bool computeLocalToWorldMatrix(osg::Matrix& matrix, osg::NodeVisitor* nv) const override;
+        bool computeWorldToLocalMatrix(osg::Matrix& matrix, osg::NodeVisitor* nv) const override;
 
-    protected :
+    protected:
         virtual ~PositionAttitudeTransform() {}
 
         osg::Vec3f _position;
         osg::Quat _attitude;
         osg::Vec3f _scale;
-};
+    };
 
 }
 
diff --git a/components/sceneutil/recastmesh.cpp b/components/sceneutil/recastmesh.cpp
index d320624682..cdb2025d1d 100644
--- a/components/sceneutil/recastmesh.cpp
+++ b/components/sceneutil/recastmesh.cpp
@@ -1,10 +1,10 @@
 #include "recastmesh.hpp"
-#include "detourdebugdraw.hpp"
 #include "depth.hpp"
+#include "detourdebugdraw.hpp"
 
-#include <components/detournavigator/settings.hpp>
 #include <components/detournavigator/recastmesh.hpp>
 #include <components/detournavigator/recastmeshbuilder.hpp>
+#include <components/detournavigator/settings.hpp>
 
 #include <RecastDebugDraw.h>
 
@@ -41,8 +41,8 @@ namespace
 
 namespace SceneUtil
 {
-    osg::ref_ptr<osg::Group> createRecastMeshGroup(const DetourNavigator::RecastMesh& recastMesh,
-        const DetourNavigator::RecastSettings& settings)
+    osg::ref_ptr<osg::Group> createRecastMeshGroup(
+        const DetourNavigator::RecastMesh& recastMesh, const DetourNavigator::RecastSettings& settings)
     {
         using namespace DetourNavigator;
 
@@ -56,9 +56,10 @@ namespace SceneUtil
         {
             const Mesh heightfieldMesh = makeMesh(heightfield);
             const int indexShift = static_cast<int>(vertices.size() / 3);
-            std::copy(heightfieldMesh.getVertices().begin(), heightfieldMesh.getVertices().end(), std::back_inserter(vertices));
-            std::transform(heightfieldMesh.getIndices().begin(), heightfieldMesh.getIndices().end(), std::back_inserter(indices),
-                           [&] (int index) { return index + indexShift; });
+            std::copy(heightfieldMesh.getVertices().begin(), heightfieldMesh.getVertices().end(),
+                std::back_inserter(vertices));
+            std::transform(heightfieldMesh.getIndices().begin(), heightfieldMesh.getIndices().end(),
+                std::back_inserter(indices), [&](int index) { return index + indexShift; });
         }
 
         for (std::size_t i = 0; i < vertices.size(); i += 3)
@@ -66,15 +67,16 @@ namespace SceneUtil
 
         const auto normals = calculateNormals(vertices, indices);
         const auto texScale = 1.0f / (settings.mCellSize * 10.0f);
-        duDebugDrawTriMeshSlope(&debugDraw, vertices.data(), static_cast<int>(vertices.size() / 3),
-            indices.data(), normals.data(), static_cast<int>(indices.size() / 3), settings.mMaxSlope, texScale);
+        duDebugDrawTriMeshSlope(&debugDraw, vertices.data(), static_cast<int>(vertices.size() / 3), indices.data(),
+            normals.data(), static_cast<int>(indices.size() / 3), settings.mMaxSlope, texScale);
 
         osg::ref_ptr<osg::Material> material = new osg::Material;
         material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
 
         const float polygonOffsetFactor = SceneUtil::AutoDepth::isReversed() ? 1.0 : -1.0;
         const float polygonOffsetUnits = SceneUtil::AutoDepth::isReversed() ? 1.0 : -1.0;
-        osg::ref_ptr<osg::PolygonOffset> polygonOffset = new osg::PolygonOffset(polygonOffsetFactor, polygonOffsetUnits);
+        osg::ref_ptr<osg::PolygonOffset> polygonOffset
+            = new osg::PolygonOffset(polygonOffsetFactor, polygonOffsetUnits);
 
         osg::ref_ptr<osg::StateSet> stateSet = group->getOrCreateStateSet();
         stateSet->setAttribute(material);
diff --git a/components/sceneutil/recastmesh.hpp b/components/sceneutil/recastmesh.hpp
index 674b5b1d2a..bc9fb1c3ea 100644
--- a/components/sceneutil/recastmesh.hpp
+++ b/components/sceneutil/recastmesh.hpp
@@ -16,8 +16,8 @@ namespace DetourNavigator
 
 namespace SceneUtil
 {
-    osg::ref_ptr<osg::Group> createRecastMeshGroup(const DetourNavigator::RecastMesh& recastMesh,
-        const DetourNavigator::RecastSettings& settings);
+    osg::ref_ptr<osg::Group> createRecastMeshGroup(
+        const DetourNavigator::RecastMesh& recastMesh, const DetourNavigator::RecastSettings& settings);
 }
 
 #endif
diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index 5fca265877..a3f0925b71 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -9,7 +9,8 @@
 
 namespace
 {
-    inline void accumulateMatrix(const osg::Matrixf& invBindMatrix, const osg::Matrixf& matrix, const float weight, osg::Matrixf& result)
+    inline void accumulateMatrix(
+        const osg::Matrixf& invBindMatrix, const osg::Matrixf& matrix, const float weight, osg::Matrixf& result)
     {
         osg::Matrixf m = invBindMatrix * matrix;
         float* ptr = m.ptr();
@@ -35,139 +36,128 @@ namespace
 namespace SceneUtil
 {
 
-RigGeometry::RigGeometry()
-    : mSkeleton(nullptr)
-    , mLastFrameNumber(0)
-    , mBoundsFirstFrame(true)
-{
-    setNumChildrenRequiringUpdateTraversal(1);
-    // update done in accept(NodeVisitor&)
-}
-
-RigGeometry::RigGeometry(const RigGeometry &copy, const osg::CopyOp &copyop)
-    : Drawable(copy, copyop)
-    , mSkeleton(nullptr)
-    , mInfluenceMap(copy.mInfluenceMap)
-    , mBone2VertexVector(copy.mBone2VertexVector)
-    , mBoneSphereVector(copy.mBoneSphereVector)
-    , mLastFrameNumber(0)
-    , mBoundsFirstFrame(true)
-{
-    setSourceGeometry(copy.mSourceGeometry);
-    setNumChildrenRequiringUpdateTraversal(1);
-}
-
-void RigGeometry::setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeometry)
-{
-    for (unsigned int i=0; i<2; ++i)
-        mGeometry[i] = nullptr;
+    RigGeometry::RigGeometry()
+        : mSkeleton(nullptr)
+        , mLastFrameNumber(0)
+        , mBoundsFirstFrame(true)
+    {
+        setNumChildrenRequiringUpdateTraversal(1);
+        // update done in accept(NodeVisitor&)
+    }
 
-    mSourceGeometry = sourceGeometry;
+    RigGeometry::RigGeometry(const RigGeometry& copy, const osg::CopyOp& copyop)
+        : Drawable(copy, copyop)
+        , mSkeleton(nullptr)
+        , mInfluenceMap(copy.mInfluenceMap)
+        , mBone2VertexVector(copy.mBone2VertexVector)
+        , mBoneSphereVector(copy.mBoneSphereVector)
+        , mLastFrameNumber(0)
+        , mBoundsFirstFrame(true)
+    {
+        setSourceGeometry(copy.mSourceGeometry);
+        setNumChildrenRequiringUpdateTraversal(1);
+    }
 
-    for (unsigned int i=0; i<2; ++i)
+    void RigGeometry::setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeometry)
     {
-        const osg::Geometry& from = *sourceGeometry;
-
-        // DO NOT COPY AND PASTE THIS CODE. Cloning osg::Geometry without also cloning its contained Arrays is generally unsafe.
-        // In this specific case the operation is safe under the following two assumptions:
-        // - When Arrays are removed or replaced in the cloned geometry, the original Arrays in their place must outlive the cloned geometry regardless. (ensured by mSourceGeometry)
-        // - Arrays that we add or replace in the cloned geometry must be explicitely forbidden from reusing BufferObjects of the original geometry. (ensured by vbo below)
-        mGeometry[i] = new osg::Geometry(from, osg::CopyOp::SHALLOW_COPY);
-        mGeometry[i]->getOrCreateUserDataContainer()->addUserObject(new Resource::TemplateRef(mSourceGeometry));
-
-        osg::Geometry& to = *mGeometry[i];
-        to.setSupportsDisplayList(false);
-        to.setUseVertexBufferObjects(true);
-        to.setCullingActive(false); // make sure to disable culling since that's handled by this class
-        to.setComputeBoundingBoxCallback(new CopyBoundingBoxCallback());
-        to.setComputeBoundingSphereCallback(new CopyBoundingSphereCallback());
-
-        // vertices and normals are modified every frame, so we need to deep copy them.
-        // assign a dedicated VBO to make sure that modifications don't interfere with source geometry's VBO.
-        osg::ref_ptr<osg::VertexBufferObject> vbo (new osg::VertexBufferObject);
-        vbo->setUsage(GL_DYNAMIC_DRAW_ARB);
-
-        osg::ref_ptr<osg::Array> vertexArray = static_cast<osg::Array*>(from.getVertexArray()->clone(osg::CopyOp::DEEP_COPY_ALL));
-        if (vertexArray)
-        {
-            vertexArray->setVertexBufferObject(vbo);
-            to.setVertexArray(vertexArray);
-        }
+        for (unsigned int i = 0; i < 2; ++i)
+            mGeometry[i] = nullptr;
 
-        if (const osg::Array* normals = from.getNormalArray())
+        mSourceGeometry = sourceGeometry;
+
+        for (unsigned int i = 0; i < 2; ++i)
         {
-            osg::ref_ptr<osg::Array> normalArray = static_cast<osg::Array*>(normals->clone(osg::CopyOp::DEEP_COPY_ALL));
-            if (normalArray)
+            const osg::Geometry& from = *sourceGeometry;
+
+            // DO NOT COPY AND PASTE THIS CODE. Cloning osg::Geometry without also cloning its contained Arrays is
+            // generally unsafe. In this specific case the operation is safe under the following two assumptions:
+            // - When Arrays are removed or replaced in the cloned geometry, the original Arrays in their place must
+            // outlive the cloned geometry regardless. (ensured by mSourceGeometry)
+            // - Arrays that we add or replace in the cloned geometry must be explicitely forbidden from reusing
+            // BufferObjects of the original geometry. (ensured by vbo below)
+            mGeometry[i] = new osg::Geometry(from, osg::CopyOp::SHALLOW_COPY);
+            mGeometry[i]->getOrCreateUserDataContainer()->addUserObject(new Resource::TemplateRef(mSourceGeometry));
+
+            osg::Geometry& to = *mGeometry[i];
+            to.setSupportsDisplayList(false);
+            to.setUseVertexBufferObjects(true);
+            to.setCullingActive(false); // make sure to disable culling since that's handled by this class
+            to.setComputeBoundingBoxCallback(new CopyBoundingBoxCallback());
+            to.setComputeBoundingSphereCallback(new CopyBoundingSphereCallback());
+
+            // vertices and normals are modified every frame, so we need to deep copy them.
+            // assign a dedicated VBO to make sure that modifications don't interfere with source geometry's VBO.
+            osg::ref_ptr<osg::VertexBufferObject> vbo(new osg::VertexBufferObject);
+            vbo->setUsage(GL_DYNAMIC_DRAW_ARB);
+
+            osg::ref_ptr<osg::Array> vertexArray
+                = static_cast<osg::Array*>(from.getVertexArray()->clone(osg::CopyOp::DEEP_COPY_ALL));
+            if (vertexArray)
             {
-                normalArray->setVertexBufferObject(vbo);
-                to.setNormalArray(normalArray, osg::Array::BIND_PER_VERTEX);
+                vertexArray->setVertexBufferObject(vbo);
+                to.setVertexArray(vertexArray);
             }
-        }
 
-        if (const osg::Vec4Array* tangents = dynamic_cast<const osg::Vec4Array*>(from.getTexCoordArray(7)))
-        {
-            mSourceTangents = tangents;
-            osg::ref_ptr<osg::Array> tangentArray = static_cast<osg::Array*>(tangents->clone(osg::CopyOp::DEEP_COPY_ALL));
-            tangentArray->setVertexBufferObject(vbo);
-            to.setTexCoordArray(7, tangentArray, osg::Array::BIND_PER_VERTEX);
-        }
-        else
-            mSourceTangents = nullptr;
-    }
-}
-
-osg::ref_ptr<osg::Geometry> RigGeometry::getSourceGeometry() const
-{
-    return mSourceGeometry;
-}
+            if (const osg::Array* normals = from.getNormalArray())
+            {
+                osg::ref_ptr<osg::Array> normalArray
+                    = static_cast<osg::Array*>(normals->clone(osg::CopyOp::DEEP_COPY_ALL));
+                if (normalArray)
+                {
+                    normalArray->setVertexBufferObject(vbo);
+                    to.setNormalArray(normalArray, osg::Array::BIND_PER_VERTEX);
+                }
+            }
 
-bool RigGeometry::initFromParentSkeleton(osg::NodeVisitor* nv)
-{
-    const osg::NodePath& path = nv->getNodePath();
-    for (osg::NodePath::const_reverse_iterator it = path.rbegin()+1; it != path.rend(); ++it)
-    {
-        osg::Node* node = *it;
-        if (node->asTransform())
-            continue;
-        if (Skeleton* skel = dynamic_cast<Skeleton*>(node))
-        {
-            mSkeleton = skel;
-            break;
+            if (const osg::Vec4Array* tangents = dynamic_cast<const osg::Vec4Array*>(from.getTexCoordArray(7)))
+            {
+                mSourceTangents = tangents;
+                osg::ref_ptr<osg::Array> tangentArray
+                    = static_cast<osg::Array*>(tangents->clone(osg::CopyOp::DEEP_COPY_ALL));
+                tangentArray->setVertexBufferObject(vbo);
+                to.setTexCoordArray(7, tangentArray, osg::Array::BIND_PER_VERTEX);
+            }
+            else
+                mSourceTangents = nullptr;
         }
     }
 
-    if (!mSkeleton)
+    osg::ref_ptr<osg::Geometry> RigGeometry::getSourceGeometry() const
     {
-        Log(Debug::Error) << "Error: A RigGeometry did not find its parent skeleton";
-        return false;
+        return mSourceGeometry;
     }
 
-    if (!mInfluenceMap)
+    bool RigGeometry::initFromParentSkeleton(osg::NodeVisitor* nv)
     {
-        Log(Debug::Error) << "Error: No InfluenceMap set on RigGeometry";
-        return false;
-    }
+        const osg::NodePath& path = nv->getNodePath();
+        for (osg::NodePath::const_reverse_iterator it = path.rbegin() + 1; it != path.rend(); ++it)
+        {
+            osg::Node* node = *it;
+            if (node->asTransform())
+                continue;
+            if (Skeleton* skel = dynamic_cast<Skeleton*>(node))
+            {
+                mSkeleton = skel;
+                break;
+            }
+        }
 
-    mBoneNodesVector.clear();
-    for (auto& bonePair : mBoneSphereVector->mData)
-    {
-        const std::string& boneName = bonePair.first;
-        Bone* bone = mSkeleton->getBone(boneName);
-        if (!bone)
+        if (!mSkeleton)
         {
-            mBoneNodesVector.push_back(nullptr);
-            Log(Debug::Error) << "Error: RigGeometry did not find bone " << boneName;
-            continue;
+            Log(Debug::Error) << "Error: A RigGeometry did not find its parent skeleton";
+            return false;
         }
 
-        mBoneNodesVector.push_back(bone);
-    }
+        if (!mInfluenceMap)
+        {
+            Log(Debug::Error) << "Error: No InfluenceMap set on RigGeometry";
+            return false;
+        }
 
-    for (auto& pair : mBone2VertexVector->mData)
-    {
-        for (auto &weight : pair.first)
+        mBoneNodesVector.clear();
+        for (auto& bonePair : mBoneSphereVector->mData)
         {
-            const std::string& boneName = weight.first.first;
+            const std::string& boneName = bonePair.first;
             Bone* bone = mSkeleton->getBone(boneName);
             if (!bone)
             {
@@ -178,233 +168,248 @@ bool RigGeometry::initFromParentSkeleton(osg::NodeVisitor* nv)
 
             mBoneNodesVector.push_back(bone);
         }
-    }
 
-    return true;
-}
+        for (auto& pair : mBone2VertexVector->mData)
+        {
+            for (auto& weight : pair.first)
+            {
+                const std::string& boneName = weight.first.first;
+                Bone* bone = mSkeleton->getBone(boneName);
+                if (!bone)
+                {
+                    mBoneNodesVector.push_back(nullptr);
+                    Log(Debug::Error) << "Error: RigGeometry did not find bone " << boneName;
+                    continue;
+                }
 
-void RigGeometry::cull(osg::NodeVisitor* nv)
-{
-    if (!mSkeleton)
-    {
-        Log(Debug::Error) << "Error: RigGeometry rendering with no skeleton, should have been initialized by UpdateVisitor";
-        // try to recover anyway, though rendering is likely to be incorrect.
-        if (!initFromParentSkeleton(nv))
-            return;
+                mBoneNodesVector.push_back(bone);
+            }
+        }
+
+        return true;
     }
 
-    unsigned int traversalNumber = nv->getTraversalNumber();
-    if (mLastFrameNumber == traversalNumber || (mLastFrameNumber != 0 && !mSkeleton->getActive()))
+    void RigGeometry::cull(osg::NodeVisitor* nv)
     {
-        osg::Geometry& geom = *getGeometry(mLastFrameNumber);
-        nv->pushOntoNodePath(&geom);
-        nv->apply(geom);
-        nv->popFromNodePath();
-        return;
-    }
-    mLastFrameNumber = traversalNumber;
-    osg::Geometry& geom = *getGeometry(mLastFrameNumber);
+        if (!mSkeleton)
+        {
+            Log(Debug::Error)
+                << "Error: RigGeometry rendering with no skeleton, should have been initialized by UpdateVisitor";
+            // try to recover anyway, though rendering is likely to be incorrect.
+            if (!initFromParentSkeleton(nv))
+                return;
+        }
 
-    mSkeleton->updateBoneMatrices(traversalNumber);
+        unsigned int traversalNumber = nv->getTraversalNumber();
+        if (mLastFrameNumber == traversalNumber || (mLastFrameNumber != 0 && !mSkeleton->getActive()))
+        {
+            osg::Geometry& geom = *getGeometry(mLastFrameNumber);
+            nv->pushOntoNodePath(&geom);
+            nv->apply(geom);
+            nv->popFromNodePath();
+            return;
+        }
+        mLastFrameNumber = traversalNumber;
+        osg::Geometry& geom = *getGeometry(mLastFrameNumber);
 
-    // skinning
-    const osg::Vec3Array* positionSrc = static_cast<osg::Vec3Array*>(mSourceGeometry->getVertexArray());
-    const osg::Vec3Array* normalSrc = static_cast<osg::Vec3Array*>(mSourceGeometry->getNormalArray());
-    const osg::Vec4Array* tangentSrc = mSourceTangents;
+        mSkeleton->updateBoneMatrices(traversalNumber);
 
-    osg::Vec3Array* positionDst = static_cast<osg::Vec3Array*>(geom.getVertexArray());
-    osg::Vec3Array* normalDst = static_cast<osg::Vec3Array*>(geom.getNormalArray());
-    osg::Vec4Array* tangentDst = static_cast<osg::Vec4Array*>(geom.getTexCoordArray(7));
+        // skinning
+        const osg::Vec3Array* positionSrc = static_cast<osg::Vec3Array*>(mSourceGeometry->getVertexArray());
+        const osg::Vec3Array* normalSrc = static_cast<osg::Vec3Array*>(mSourceGeometry->getNormalArray());
+        const osg::Vec4Array* tangentSrc = mSourceTangents;
 
-    int index = mBoneSphereVector->mData.size();
-    for (auto &pair : mBone2VertexVector->mData)
-    {
-        osg::Matrixf resultMat (0, 0, 0, 0,
-                                0, 0, 0, 0,
-                                0, 0, 0, 0,
-                                0, 0, 0, 1);
+        osg::Vec3Array* positionDst = static_cast<osg::Vec3Array*>(geom.getVertexArray());
+        osg::Vec3Array* normalDst = static_cast<osg::Vec3Array*>(geom.getNormalArray());
+        osg::Vec4Array* tangentDst = static_cast<osg::Vec4Array*>(geom.getTexCoordArray(7));
 
-        for (auto &weight : pair.first)
+        int index = mBoneSphereVector->mData.size();
+        for (auto& pair : mBone2VertexVector->mData)
         {
-            Bone* bone = mBoneNodesVector[index];
-            if (bone == nullptr)
-                continue;
+            osg::Matrixf resultMat(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1);
 
-            accumulateMatrix(weight.first.second, bone->mMatrixInSkeletonSpace, weight.second, resultMat);
-            index++;
-        }
+            for (auto& weight : pair.first)
+            {
+                Bone* bone = mBoneNodesVector[index];
+                if (bone == nullptr)
+                    continue;
 
-        if (mGeomToSkelMatrix)
-            resultMat *= (*mGeomToSkelMatrix);
+                accumulateMatrix(weight.first.second, bone->mMatrixInSkeletonSpace, weight.second, resultMat);
+                index++;
+            }
 
-        for (auto &vertex : pair.second)
-        {
-            (*positionDst)[vertex] = resultMat.preMult((*positionSrc)[vertex]);
-            if (normalDst)
-                (*normalDst)[vertex] = osg::Matrixf::transform3x3((*normalSrc)[vertex], resultMat);
+            if (mGeomToSkelMatrix)
+                resultMat *= (*mGeomToSkelMatrix);
 
-            if (tangentDst)
+            for (auto& vertex : pair.second)
             {
-                const osg::Vec4f& srcTangent = (*tangentSrc)[vertex];
-                osg::Vec3f transformedTangent = osg::Matrixf::transform3x3(osg::Vec3f(srcTangent.x(), srcTangent.y(), srcTangent.z()), resultMat);
-                (*tangentDst)[vertex] = osg::Vec4f(transformedTangent, srcTangent.w());
+                (*positionDst)[vertex] = resultMat.preMult((*positionSrc)[vertex]);
+                if (normalDst)
+                    (*normalDst)[vertex] = osg::Matrixf::transform3x3((*normalSrc)[vertex], resultMat);
+
+                if (tangentDst)
+                {
+                    const osg::Vec4f& srcTangent = (*tangentSrc)[vertex];
+                    osg::Vec3f transformedTangent = osg::Matrixf::transform3x3(
+                        osg::Vec3f(srcTangent.x(), srcTangent.y(), srcTangent.z()), resultMat);
+                    (*tangentDst)[vertex] = osg::Vec4f(transformedTangent, srcTangent.w());
+                }
             }
         }
-    }
 
-    positionDst->dirty();
-    if (normalDst)
-        normalDst->dirty();
-    if (tangentDst)
-        tangentDst->dirty();
+        positionDst->dirty();
+        if (normalDst)
+            normalDst->dirty();
+        if (tangentDst)
+            tangentDst->dirty();
 
-    geom.osg::Drawable::dirtyGLObjects();
+        geom.osg::Drawable::dirtyGLObjects();
 
-    nv->pushOntoNodePath(&geom);
-    nv->apply(geom);
-    nv->popFromNodePath();
-}
+        nv->pushOntoNodePath(&geom);
+        nv->apply(geom);
+        nv->popFromNodePath();
+    }
 
-void RigGeometry::updateBounds(osg::NodeVisitor *nv)
-{
-    if (!mSkeleton)
+    void RigGeometry::updateBounds(osg::NodeVisitor* nv)
     {
-        if (!initFromParentSkeleton(nv))
-            return;
-    }
+        if (!mSkeleton)
+        {
+            if (!initFromParentSkeleton(nv))
+                return;
+        }
 
-    if (!mSkeleton->getActive() && !mBoundsFirstFrame)
-        return;
-    mBoundsFirstFrame = false;
+        if (!mSkeleton->getActive() && !mBoundsFirstFrame)
+            return;
+        mBoundsFirstFrame = false;
 
-    mSkeleton->updateBoneMatrices(nv->getTraversalNumber());
+        mSkeleton->updateBoneMatrices(nv->getTraversalNumber());
 
-    updateGeomToSkelMatrix(nv->getNodePath());
+        updateGeomToSkelMatrix(nv->getNodePath());
 
-    osg::BoundingBox box;
+        osg::BoundingBox box;
 
-    int index = 0;
-    for (auto& boundPair : mBoneSphereVector->mData)
-    {
-        Bone* bone = mBoneNodesVector[index];
-        if (bone == nullptr)
-            continue;
-
-        index++;
-        osg::BoundingSpheref bs = boundPair.second;
-        if (mGeomToSkelMatrix)
-            transformBoundingSphere(bone->mMatrixInSkeletonSpace * (*mGeomToSkelMatrix), bs);
-        else
-            transformBoundingSphere(bone->mMatrixInSkeletonSpace, bs);
-        box.expandBy(bs);
-    }
+        int index = 0;
+        for (auto& boundPair : mBoneSphereVector->mData)
+        {
+            Bone* bone = mBoneNodesVector[index];
+            if (bone == nullptr)
+                continue;
 
-    if (box != _boundingBox)
-    {
-        _boundingBox = box;
-        _boundingSphere = osg::BoundingSphere(_boundingBox);
-        _boundingSphereComputed = true;
-        for (unsigned int i=0; i<getNumParents(); ++i)
-            getParent(i)->dirtyBound();
+            index++;
+            osg::BoundingSpheref bs = boundPair.second;
+            if (mGeomToSkelMatrix)
+                transformBoundingSphere(bone->mMatrixInSkeletonSpace * (*mGeomToSkelMatrix), bs);
+            else
+                transformBoundingSphere(bone->mMatrixInSkeletonSpace, bs);
+            box.expandBy(bs);
+        }
 
-        for (unsigned int i = 0; i < 2; ++i)
+        if (box != _boundingBox)
         {
-            osg::Geometry& geom = *mGeometry[i];
-            static_cast<CopyBoundingBoxCallback*>(geom.getComputeBoundingBoxCallback())->boundingBox = _boundingBox;
-            static_cast<CopyBoundingSphereCallback*>(geom.getComputeBoundingSphereCallback())->boundingSphere = _boundingSphere;
-            geom.dirtyBound();
+            _boundingBox = box;
+            _boundingSphere = osg::BoundingSphere(_boundingBox);
+            _boundingSphereComputed = true;
+            for (unsigned int i = 0; i < getNumParents(); ++i)
+                getParent(i)->dirtyBound();
+
+            for (unsigned int i = 0; i < 2; ++i)
+            {
+                osg::Geometry& geom = *mGeometry[i];
+                static_cast<CopyBoundingBoxCallback*>(geom.getComputeBoundingBoxCallback())->boundingBox = _boundingBox;
+                static_cast<CopyBoundingSphereCallback*>(geom.getComputeBoundingSphereCallback())->boundingSphere
+                    = _boundingSphere;
+                geom.dirtyBound();
+            }
         }
     }
-}
 
-void RigGeometry::updateGeomToSkelMatrix(const osg::NodePath& nodePath)
-{
-    bool foundSkel = false;
-    osg::RefMatrix* geomToSkelMatrix = mGeomToSkelMatrix;
-    if (geomToSkelMatrix)
-        geomToSkelMatrix->makeIdentity();
-    for (osg::NodePath::const_iterator it = nodePath.begin(); it != nodePath.end()-1; ++it)
+    void RigGeometry::updateGeomToSkelMatrix(const osg::NodePath& nodePath)
     {
-        osg::Node* node = *it;
-        if (!foundSkel)
+        bool foundSkel = false;
+        osg::RefMatrix* geomToSkelMatrix = mGeomToSkelMatrix;
+        if (geomToSkelMatrix)
+            geomToSkelMatrix->makeIdentity();
+        for (osg::NodePath::const_iterator it = nodePath.begin(); it != nodePath.end() - 1; ++it)
         {
-            if (node == mSkeleton)
-                foundSkel = true;
-        }
-        else
-        {
-            if (osg::Transform* trans = node->asTransform())
+            osg::Node* node = *it;
+            if (!foundSkel)
             {
-                osg::MatrixTransform* matrixTrans = trans->asMatrixTransform();
-                if (matrixTrans && matrixTrans->getMatrix().isIdentity())
-                    continue;
-                if (!geomToSkelMatrix)
-                    geomToSkelMatrix = mGeomToSkelMatrix = new osg::RefMatrix;
-                trans->computeWorldToLocalMatrix(*geomToSkelMatrix, nullptr);
+                if (node == mSkeleton)
+                    foundSkel = true;
+            }
+            else
+            {
+                if (osg::Transform* trans = node->asTransform())
+                {
+                    osg::MatrixTransform* matrixTrans = trans->asMatrixTransform();
+                    if (matrixTrans && matrixTrans->getMatrix().isIdentity())
+                        continue;
+                    if (!geomToSkelMatrix)
+                        geomToSkelMatrix = mGeomToSkelMatrix = new osg::RefMatrix;
+                    trans->computeWorldToLocalMatrix(*geomToSkelMatrix, nullptr);
+                }
             }
         }
     }
-}
 
-void RigGeometry::setInfluenceMap(osg::ref_ptr<InfluenceMap> influenceMap)
-{
-    mInfluenceMap = influenceMap;
-
-    typedef std::map<unsigned short, std::vector<BoneWeight> > Vertex2BoneMap;
-    Vertex2BoneMap vertex2BoneMap;
-    mBoneSphereVector = new BoneSphereVector;
-    mBoneSphereVector->mData.reserve(mInfluenceMap->mData.size());
-    mBone2VertexVector = new Bone2VertexVector;
-    for (auto& influencePair : mInfluenceMap->mData)
+    void RigGeometry::setInfluenceMap(osg::ref_ptr<InfluenceMap> influenceMap)
     {
-        const std::string& boneName = influencePair.first;
-        const BoneInfluence& bi = influencePair.second;
-        mBoneSphereVector->mData.emplace_back(boneName, bi.mBoundSphere);
-
-        for (auto& weightPair: bi.mWeights)
+        mInfluenceMap = influenceMap;
+
+        typedef std::map<unsigned short, std::vector<BoneWeight>> Vertex2BoneMap;
+        Vertex2BoneMap vertex2BoneMap;
+        mBoneSphereVector = new BoneSphereVector;
+        mBoneSphereVector->mData.reserve(mInfluenceMap->mData.size());
+        mBone2VertexVector = new Bone2VertexVector;
+        for (auto& influencePair : mInfluenceMap->mData)
         {
-            std::vector<BoneWeight>& vec = vertex2BoneMap[weightPair.first];
+            const std::string& boneName = influencePair.first;
+            const BoneInfluence& bi = influencePair.second;
+            mBoneSphereVector->mData.emplace_back(boneName, bi.mBoundSphere);
 
-            vec.emplace_back(std::make_pair(boneName, bi.mInvBindMatrix), weightPair.second);
-        }
-    }
+            for (auto& weightPair : bi.mWeights)
+            {
+                std::vector<BoneWeight>& vec = vertex2BoneMap[weightPair.first];
 
-    Bone2VertexMap bone2VertexMap;
-    for (auto& vertexPair : vertex2BoneMap)
-    {
-        bone2VertexMap[vertexPair.second].emplace_back(vertexPair.first);
-    }
+                vec.emplace_back(std::make_pair(boneName, bi.mInvBindMatrix), weightPair.second);
+            }
+        }
 
-    mBone2VertexVector->mData.reserve(bone2VertexMap.size());
-    mBone2VertexVector->mData.assign(bone2VertexMap.begin(), bone2VertexMap.end());
-}
+        Bone2VertexMap bone2VertexMap;
+        for (auto& vertexPair : vertex2BoneMap)
+        {
+            bone2VertexMap[vertexPair.second].emplace_back(vertexPair.first);
+        }
 
-void RigGeometry::accept(osg::NodeVisitor &nv)
-{
-    if (!nv.validNodeMask(*this))
-        return;
+        mBone2VertexVector->mData.reserve(bone2VertexMap.size());
+        mBone2VertexVector->mData.assign(bone2VertexMap.begin(), bone2VertexMap.end());
+    }
 
-    nv.pushOntoNodePath(this);
+    void RigGeometry::accept(osg::NodeVisitor& nv)
+    {
+        if (!nv.validNodeMask(*this))
+            return;
 
-    if (nv.getVisitorType() == osg::NodeVisitor::CULL_VISITOR)
-        cull(&nv);
-    else if (nv.getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR)
-        updateBounds(&nv);
-    else
-        nv.apply(*this);
+        nv.pushOntoNodePath(this);
 
-    nv.popFromNodePath();
-}
+        if (nv.getVisitorType() == osg::NodeVisitor::CULL_VISITOR)
+            cull(&nv);
+        else if (nv.getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR)
+            updateBounds(&nv);
+        else
+            nv.apply(*this);
 
-void RigGeometry::accept(osg::PrimitiveFunctor& func) const
-{
-    getGeometry(mLastFrameNumber)->accept(func);
-}
+        nv.popFromNodePath();
+    }
 
-osg::Geometry* RigGeometry::getGeometry(unsigned int frame) const
-{
-    return mGeometry[frame%2].get();
-}
+    void RigGeometry::accept(osg::PrimitiveFunctor& func) const
+    {
+        getGeometry(mLastFrameNumber)->accept(func);
+    }
 
+    osg::Geometry* RigGeometry::getGeometry(unsigned int frame) const
+    {
+        return mGeometry[frame % 2].get();
+    }
 
 }
diff --git a/components/sceneutil/riggeometry.hpp b/components/sceneutil/riggeometry.hpp
index 25ae5a3243..72e8fcd032 100644
--- a/components/sceneutil/riggeometry.hpp
+++ b/components/sceneutil/riggeometry.hpp
@@ -14,13 +14,15 @@ namespace SceneUtil
     // - mSourceGeometry should be const, but can not be const because of a use case in shadervisitor.cpp.
     // - We create useless mGeometry clones in template RigGeometries.
     // - We do not support compileGLObjects.
-    // - We duplicate some code in MorphGeometry. 
+    // - We duplicate some code in MorphGeometry.
 
     /// @brief Mesh skinning implementation.
     /// @note A RigGeometry may be attached directly to a Skeleton, or somewhere below a Skeleton.
-    /// Note though that the RigGeometry ignores any transforms below the Skeleton, so the attachment point is not that important.
-    /// @note The internal Geometry used for rendering is double buffered, this allows updates to be done in a thread safe way while
-    /// not compromising rendering performance. This is crucial when using osg's default threading model of DrawThreadPerContext.
+    /// Note though that the RigGeometry ignores any transforms below the Skeleton, so the attachment point is not that
+    /// important.
+    /// @note The internal Geometry used for rendering is double buffered, this allows updates to be done in a thread
+    /// safe way while not compromising rendering performance. This is crucial when using osg's default threading model
+    /// of DrawThreadPerContext.
     class RigGeometry : public osg::Drawable
     {
     public:
@@ -29,7 +31,9 @@ namespace SceneUtil
 
         META_Object(SceneUtil, RigGeometry)
 
-        // Currently empty as this is difficult to implement. Technically we would need to compile both internal geometries in separate frames but this method is only called once. Alternatively we could compile just the static parts of the model.
+        // Currently empty as this is difficult to implement. Technically we would need to compile both internal
+        // geometries in separate frames but this method is only called once. Alternatively we could compile just the
+        // static parts of the model.
         void compileGLObjects(osg::RenderInfo& renderInfo) const override {}
 
         struct BoneInfluence
@@ -53,8 +57,8 @@ namespace SceneUtil
 
         osg::ref_ptr<osg::Geometry> getSourceGeometry() const;
 
-        void accept(osg::NodeVisitor &nv) override;
-        bool supports(const osg::PrimitiveFunctor&) const override{ return true; }
+        void accept(osg::NodeVisitor& nv) override;
+        bool supports(const osg::PrimitiveFunctor&) const override { return true; }
         void accept(osg::PrimitiveFunctor&) const override;
 
         struct CopyBoundingBoxCallback : osg::Drawable::ComputeBoundingBoxCallback
diff --git a/components/sceneutil/riggeometryosgaextension.cpp b/components/sceneutil/riggeometryosgaextension.cpp
index 8768eb403f..f8bc06e3e4 100644
--- a/components/sceneutil/riggeometryosgaextension.cpp
+++ b/components/sceneutil/riggeometryosgaextension.cpp
@@ -11,270 +11,286 @@
 namespace SceneUtil
 {
 
-OsgaRigGeometry::OsgaRigGeometry() : osgAnimation::RigGeometry()
-{
-    setDataVariance(osg::Object::STATIC);
-}
-
-OsgaRigGeometry::OsgaRigGeometry(const osgAnimation::RigGeometry& copy, const osg::CopyOp& copyop) : osgAnimation::RigGeometry(copy, copyop)
-{
-    setDataVariance(osg::Object::STATIC);
-}
-
-OsgaRigGeometry::OsgaRigGeometry(const OsgaRigGeometry& copy, const osg::CopyOp& copyop) :
-    osgAnimation::RigGeometry(copy, copyop)
-{
-    setDataVariance(osg::Object::STATIC);
-}
-
-void OsgaRigGeometry::computeMatrixFromRootSkeleton(osg::MatrixList mtxList)
-{
-    if (!_root.valid())
+    OsgaRigGeometry::OsgaRigGeometry()
+        : osgAnimation::RigGeometry()
     {
-    	Log(Debug::Warning) << "Warning " << className() <<"::computeMatrixFromRootSkeleton if you have this message it means you miss to call buildTransformer(Skeleton* root), or your RigGeometry (" << getName() <<") is not attached to a Skeleton subgraph";
-        return;
+        setDataVariance(osg::Object::STATIC);
     }
-    osg::Matrix notRoot = _root->getMatrix();
-    _matrixFromSkeletonToGeometry = mtxList[0] * osg::Matrix::inverse(notRoot);
-    _invMatrixFromSkeletonToGeometry = osg::Matrix::inverse(_matrixFromSkeletonToGeometry);
-    _needToComputeMatrix = false;
-}
 
-RigGeometryHolder::RigGeometryHolder() :
-	mBackToOrigin(nullptr),
-    mLastFrameNumber(0),
-	mIsBodyPart(false)
-{
-}
+    OsgaRigGeometry::OsgaRigGeometry(const osgAnimation::RigGeometry& copy, const osg::CopyOp& copyop)
+        : osgAnimation::RigGeometry(copy, copyop)
+    {
+        setDataVariance(osg::Object::STATIC);
+    }
 
-RigGeometryHolder::RigGeometryHolder(const RigGeometryHolder& copy, const osg::CopyOp& copyop) :
-    Drawable(copy, copyop),
-	mBackToOrigin(copy.mBackToOrigin),
-    mLastFrameNumber(0),
-	mIsBodyPart(copy.mIsBodyPart)
-{
-    setUseVertexBufferObjects(true);
+    OsgaRigGeometry::OsgaRigGeometry(const OsgaRigGeometry& copy, const osg::CopyOp& copyop)
+        : osgAnimation::RigGeometry(copy, copyop)
+    {
+        setDataVariance(osg::Object::STATIC);
+    }
 
-    if (!copy.getSourceRigGeometry())
+    void OsgaRigGeometry::computeMatrixFromRootSkeleton(osg::MatrixList mtxList)
     {
-        Log(Debug::Error) << "copy constructor of RigGeometryHolder partially failed (no source RigGeometry)";
-        return;
+        if (!_root.valid())
+        {
+            Log(Debug::Warning) << "Warning " << className()
+                                << "::computeMatrixFromRootSkeleton if you have this message it means you miss to call "
+                                   "buildTransformer(Skeleton* root), or your RigGeometry ("
+                                << getName() << ") is not attached to a Skeleton subgraph";
+            return;
+        }
+        osg::Matrix notRoot = _root->getMatrix();
+        _matrixFromSkeletonToGeometry = mtxList[0] * osg::Matrix::inverse(notRoot);
+        _invMatrixFromSkeletonToGeometry = osg::Matrix::inverse(_matrixFromSkeletonToGeometry);
+        _needToComputeMatrix = false;
     }
 
-    osg::ref_ptr<OsgaRigGeometry> rigGeometry = new OsgaRigGeometry(*copy.getSourceRigGeometry(), copyop);
-    setSourceRigGeometry(rigGeometry);
-}
+    RigGeometryHolder::RigGeometryHolder()
+        : mBackToOrigin(nullptr)
+        , mLastFrameNumber(0)
+        , mIsBodyPart(false)
+    {
+    }
 
-RigGeometryHolder::RigGeometryHolder(const osgAnimation::RigGeometry& copy, const osg::CopyOp& copyop) :
-	mBackToOrigin(nullptr),
-    mLastFrameNumber(0),
-	mIsBodyPart(false)
-{
-    setUseVertexBufferObjects(true);
+    RigGeometryHolder::RigGeometryHolder(const RigGeometryHolder& copy, const osg::CopyOp& copyop)
+        : Drawable(copy, copyop)
+        , mBackToOrigin(copy.mBackToOrigin)
+        , mLastFrameNumber(0)
+        , mIsBodyPart(copy.mIsBodyPart)
+    {
+        setUseVertexBufferObjects(true);
 
-    osg::ref_ptr<OsgaRigGeometry> rigGeometry = new OsgaRigGeometry(copy, copyop);
-    setSourceRigGeometry(rigGeometry);
-}
+        if (!copy.getSourceRigGeometry())
+        {
+            Log(Debug::Error) << "copy constructor of RigGeometryHolder partially failed (no source RigGeometry)";
+            return;
+        }
 
-void RigGeometryHolder::setSourceRigGeometry(osg::ref_ptr<OsgaRigGeometry> sourceRigGeometry)
-{
-    for (unsigned int i=0; i<2; ++i)
-        mGeometry.at(i) = nullptr;
+        osg::ref_ptr<OsgaRigGeometry> rigGeometry = new OsgaRigGeometry(*copy.getSourceRigGeometry(), copyop);
+        setSourceRigGeometry(rigGeometry);
+    }
 
-    mSourceRigGeometry = sourceRigGeometry;
+    RigGeometryHolder::RigGeometryHolder(const osgAnimation::RigGeometry& copy, const osg::CopyOp& copyop)
+        : mBackToOrigin(nullptr)
+        , mLastFrameNumber(0)
+        , mIsBodyPart(false)
+    {
+        setUseVertexBufferObjects(true);
 
-    _boundingBox = mSourceRigGeometry->getComputeBoundingBoxCallback()->computeBound(*mSourceRigGeometry);
-    _boundingSphere = osg::BoundingSphere(_boundingBox);
+        osg::ref_ptr<OsgaRigGeometry> rigGeometry = new OsgaRigGeometry(copy, copyop);
+        setSourceRigGeometry(rigGeometry);
+    }
 
-    for (unsigned int i=0; i<2; ++i)
+    void RigGeometryHolder::setSourceRigGeometry(osg::ref_ptr<OsgaRigGeometry> sourceRigGeometry)
     {
-        const OsgaRigGeometry& from = *sourceRigGeometry;
-
-        // DO NOT COPY AND PASTE THIS CODE. Cloning osg::Geometry without also cloning its contained Arrays is generally unsafe.
-        // In this specific case the operation is safe under the following two assumptions:
-        // - When Arrays are removed or replaced in the cloned geometry, the original Arrays in their place must outlive the cloned geometry regardless. (ensured by mSourceRigGeometry, possibly also RigGeometry._geometry)
-        // - Arrays that we add or replace in the cloned geometry must be explicitely forbidden from reusing BufferObjects of the original geometry.
-        mGeometry.at(i) = new OsgaRigGeometry(from, osg::CopyOp::SHALLOW_COPY);
-        mGeometry.at(i)->getOrCreateUserDataContainer()->addUserObject(new Resource::TemplateRef(mSourceRigGeometry));
-
-        OsgaRigGeometry& to = *mGeometry.at(i);
-        to.setSupportsDisplayList(false);
-        to.setUseVertexBufferObjects(true);
-        to.setCullingActive(false); // make sure to disable culling since that's handled by this class
-
-        to.setDataVariance(osg::Object::STATIC);
-        to.setNeedToComputeMatrix(true);
-
-        // vertices and normals are modified every frame, so we need to deep copy them.
-        // assign a dedicated VBO to make sure that modifications don't interfere with source geometry's VBO.
-        osg::ref_ptr<osg::VertexBufferObject> vbo (new osg::VertexBufferObject);
-        vbo->setUsage(GL_DYNAMIC_DRAW_ARB);
-
-        osg::ref_ptr<osg::Array> vertexArray = static_cast<osg::Array*>(from.getVertexArray()->clone(osg::CopyOp::DEEP_COPY_ALL));
-        if (vertexArray)
-        {
-            vertexArray->setVertexBufferObject(vbo);
-            to.setVertexArray(vertexArray);
-        }
+        for (unsigned int i = 0; i < 2; ++i)
+            mGeometry.at(i) = nullptr;
 
-        if (const osg::Array* normals = from.getNormalArray())
+        mSourceRigGeometry = sourceRigGeometry;
+
+        _boundingBox = mSourceRigGeometry->getComputeBoundingBoxCallback()->computeBound(*mSourceRigGeometry);
+        _boundingSphere = osg::BoundingSphere(_boundingBox);
+
+        for (unsigned int i = 0; i < 2; ++i)
         {
-            osg::ref_ptr<osg::Array> normalArray = static_cast<osg::Array*>(normals->clone(osg::CopyOp::DEEP_COPY_ALL));
-            if (normalArray)
+            const OsgaRigGeometry& from = *sourceRigGeometry;
+
+            // DO NOT COPY AND PASTE THIS CODE. Cloning osg::Geometry without also cloning its contained Arrays is
+            // generally unsafe. In this specific case the operation is safe under the following two assumptions:
+            // - When Arrays are removed or replaced in the cloned geometry, the original Arrays in their place must
+            // outlive the cloned geometry regardless. (ensured by mSourceRigGeometry, possibly also
+            // RigGeometry._geometry)
+            // - Arrays that we add or replace in the cloned geometry must be explicitely forbidden from reusing
+            // BufferObjects of the original geometry.
+            mGeometry.at(i) = new OsgaRigGeometry(from, osg::CopyOp::SHALLOW_COPY);
+            mGeometry.at(i)->getOrCreateUserDataContainer()->addUserObject(
+                new Resource::TemplateRef(mSourceRigGeometry));
+
+            OsgaRigGeometry& to = *mGeometry.at(i);
+            to.setSupportsDisplayList(false);
+            to.setUseVertexBufferObjects(true);
+            to.setCullingActive(false); // make sure to disable culling since that's handled by this class
+
+            to.setDataVariance(osg::Object::STATIC);
+            to.setNeedToComputeMatrix(true);
+
+            // vertices and normals are modified every frame, so we need to deep copy them.
+            // assign a dedicated VBO to make sure that modifications don't interfere with source geometry's VBO.
+            osg::ref_ptr<osg::VertexBufferObject> vbo(new osg::VertexBufferObject);
+            vbo->setUsage(GL_DYNAMIC_DRAW_ARB);
+
+            osg::ref_ptr<osg::Array> vertexArray
+                = static_cast<osg::Array*>(from.getVertexArray()->clone(osg::CopyOp::DEEP_COPY_ALL));
+            if (vertexArray)
             {
-                normalArray->setVertexBufferObject(vbo);
-                to.setNormalArray(normalArray, osg::Array::BIND_PER_VERTEX);
+                vertexArray->setVertexBufferObject(vbo);
+                to.setVertexArray(vertexArray);
             }
-        }
 
-        if (const osg::Vec4Array* tangents = dynamic_cast<const osg::Vec4Array*>(from.getTexCoordArray(7)))
-        {
-            osg::ref_ptr<osg::Array> tangentArray = static_cast<osg::Array*>(tangents->clone(osg::CopyOp::DEEP_COPY_ALL));
-            tangentArray->setVertexBufferObject(vbo);
-            to.setTexCoordArray(7, tangentArray, osg::Array::BIND_PER_VERTEX);
+            if (const osg::Array* normals = from.getNormalArray())
+            {
+                osg::ref_ptr<osg::Array> normalArray
+                    = static_cast<osg::Array*>(normals->clone(osg::CopyOp::DEEP_COPY_ALL));
+                if (normalArray)
+                {
+                    normalArray->setVertexBufferObject(vbo);
+                    to.setNormalArray(normalArray, osg::Array::BIND_PER_VERTEX);
+                }
+            }
+
+            if (const osg::Vec4Array* tangents = dynamic_cast<const osg::Vec4Array*>(from.getTexCoordArray(7)))
+            {
+                osg::ref_ptr<osg::Array> tangentArray
+                    = static_cast<osg::Array*>(tangents->clone(osg::CopyOp::DEEP_COPY_ALL));
+                tangentArray->setVertexBufferObject(vbo);
+                to.setTexCoordArray(7, tangentArray, osg::Array::BIND_PER_VERTEX);
+            }
         }
     }
 
-}
-
-osg::ref_ptr<OsgaRigGeometry> RigGeometryHolder::getSourceRigGeometry() const
-{
-    return mSourceRigGeometry;
-}
-
-void RigGeometryHolder::updateRigGeometry(OsgaRigGeometry* geom, osg::NodeVisitor *nv)
-{
-    if(!geom)
-        return;
+    osg::ref_ptr<OsgaRigGeometry> RigGeometryHolder::getSourceRigGeometry() const
+    {
+        return mSourceRigGeometry;
+    }
 
-    if(!geom->getSkeleton() && !this->getParents().empty())
+    void RigGeometryHolder::updateRigGeometry(OsgaRigGeometry* geom, osg::NodeVisitor* nv)
     {
-        osgAnimation::RigGeometry::FindNearestParentSkeleton finder;
-        if(this->getParents().size() > 1)
-        Log(Debug::Warning) << "A RigGeometry should not have multi parent ( " << geom->getName() << " )";
-        this->getParents()[0]->accept(finder);
+        if (!geom)
+            return;
 
-        if(!finder._root.valid())
+        if (!geom->getSkeleton() && !this->getParents().empty())
         {
-        	Log(Debug::Warning) << "A RigGeometry did not find a parent skeleton for RigGeometry ( " << geom->getName() << " )";
-            return;
+            osgAnimation::RigGeometry::FindNearestParentSkeleton finder;
+            if (this->getParents().size() > 1)
+                Log(Debug::Warning) << "A RigGeometry should not have multi parent ( " << geom->getName() << " )";
+            this->getParents()[0]->accept(finder);
+
+            if (!finder._root.valid())
+            {
+                Log(Debug::Warning) << "A RigGeometry did not find a parent skeleton for RigGeometry ( "
+                                    << geom->getName() << " )";
+                return;
+            }
+            geom->getRigTransformImplementation()->prepareData(*geom);
+            geom->setSkeleton(finder._root.get());
         }
-        geom->getRigTransformImplementation()->prepareData(*geom);
-        geom->setSkeleton(finder._root.get());
-    }
 
-    if(!geom->getSkeleton())
-        return;
+        if (!geom->getSkeleton())
+            return;
 
-    if(geom->getNeedToComputeMatrix())
-    {
-        osgAnimation::Skeleton* root = geom->getSkeleton();
-        if (!root)
+        if (geom->getNeedToComputeMatrix())
         {
-            Log(Debug::Warning) << "Warning: if you have this message it means you miss to call buildTransformer(Skeleton* root), or your RigGeometry is not attached to a Skeleton subgraph";
-            return;
-        }
-        osg::MatrixList mtxList = root->getWorldMatrices(root); //We always assume that RigGeometries have origin at their root
-        geom->computeMatrixFromRootSkeleton(mtxList);
+            osgAnimation::Skeleton* root = geom->getSkeleton();
+            if (!root)
+            {
+                Log(Debug::Warning)
+                    << "Warning: if you have this message it means you miss to call buildTransformer(Skeleton* root), "
+                       "or your RigGeometry is not attached to a Skeleton subgraph";
+                return;
+            }
+            osg::MatrixList mtxList
+                = root->getWorldMatrices(root); // We always assume that RigGeometries have origin at their root
+            geom->computeMatrixFromRootSkeleton(mtxList);
 
-        if (mIsBodyPart && mBackToOrigin) updateBackToOriginTransform(geom);
-    }
+            if (mIsBodyPart && mBackToOrigin)
+                updateBackToOriginTransform(geom);
+        }
 
-    if(geom->getSourceGeometry())
-    {
-        osg::Drawable::UpdateCallback * up = dynamic_cast<osg::Drawable::UpdateCallback*>(geom->getSourceGeometry()->getUpdateCallback());
-        if(up)
+        if (geom->getSourceGeometry())
         {
-            up->update(nv, geom->getSourceGeometry());
+            osg::Drawable::UpdateCallback* up
+                = dynamic_cast<osg::Drawable::UpdateCallback*>(geom->getSourceGeometry()->getUpdateCallback());
+            if (up)
+            {
+                up->update(nv, geom->getSourceGeometry());
+            }
         }
-    }
-
-    geom->update();
-}
-
-OsgaRigGeometry* RigGeometryHolder::getGeometry(int geometry)
-{
-    return mGeometry.at(geometry).get();
-}
 
+        geom->update();
+    }
 
-void RigGeometryHolder::updateBackToOriginTransform(OsgaRigGeometry* geometry)
-{
-    osgAnimation::Skeleton* skeleton = geometry->getSkeleton();
-    if (skeleton)
+    OsgaRigGeometry* RigGeometryHolder::getGeometry(int geometry)
     {
-        osg::MatrixList mtxList = mBackToOrigin->getParents()[0]->getWorldMatrices(skeleton);
-        osg::Matrix skeletonMatrix = skeleton->getMatrix();
-        osg::Matrixf matrixFromSkeletonToGeometry = mtxList[0] * osg::Matrix::inverse(skeletonMatrix);
-        osg::Matrixf invMatrixFromSkeletonToGeometry = osg::Matrix::inverse(matrixFromSkeletonToGeometry);
-        mBackToOrigin->setMatrix(invMatrixFromSkeletonToGeometry);
+        return mGeometry.at(geometry).get();
     }
-}
-
-void RigGeometryHolder::accept(osg::NodeVisitor &nv)
-{
-    if (!nv.validNodeMask(*this))
-        return;
 
-    nv.pushOntoNodePath(this);
-
-    if (nv.getVisitorType() == osg::NodeVisitor::CULL_VISITOR && mSourceRigGeometry.get())
+    void RigGeometryHolder::updateBackToOriginTransform(OsgaRigGeometry* geometry)
     {
-        unsigned int traversalNumber = nv.getTraversalNumber();
-        if (mLastFrameNumber == traversalNumber)
+        osgAnimation::Skeleton* skeleton = geometry->getSkeleton();
+        if (skeleton)
         {
-            OsgaRigGeometry& geom = *getRigGeometryPerFrame(mLastFrameNumber);
-
-            nv.pushOntoNodePath(&geom);
-            nv.apply(geom);
-            nv.popFromNodePath();                
+            osg::MatrixList mtxList = mBackToOrigin->getParents()[0]->getWorldMatrices(skeleton);
+            osg::Matrix skeletonMatrix = skeleton->getMatrix();
+            osg::Matrixf matrixFromSkeletonToGeometry = mtxList[0] * osg::Matrix::inverse(skeletonMatrix);
+            osg::Matrixf invMatrixFromSkeletonToGeometry = osg::Matrix::inverse(matrixFromSkeletonToGeometry);
+            mBackToOrigin->setMatrix(invMatrixFromSkeletonToGeometry);
         }
-        else
+    }
+
+    void RigGeometryHolder::accept(osg::NodeVisitor& nv)
+    {
+        if (!nv.validNodeMask(*this))
+            return;
+
+        nv.pushOntoNodePath(this);
+
+        if (nv.getVisitorType() == osg::NodeVisitor::CULL_VISITOR && mSourceRigGeometry.get())
         {
-            mLastFrameNumber = traversalNumber;
+            unsigned int traversalNumber = nv.getTraversalNumber();
+            if (mLastFrameNumber == traversalNumber)
+            {
+                OsgaRigGeometry& geom = *getRigGeometryPerFrame(mLastFrameNumber);
 
-            OsgaRigGeometry& geom = *getRigGeometryPerFrame(mLastFrameNumber);
-            
-            if (mIsBodyPart)
+                nv.pushOntoNodePath(&geom);
+                nv.apply(geom);
+                nv.popFromNodePath();
+            }
+            else
             {
-                if (mBackToOrigin) updateBackToOriginTransform(&geom);
-                else
+                mLastFrameNumber = traversalNumber;
+
+                OsgaRigGeometry& geom = *getRigGeometryPerFrame(mLastFrameNumber);
+
+                if (mIsBodyPart)
                 {
-                 	osg::MatrixTransform* matrixTransform = dynamic_cast<osg::MatrixTransform*> (this->getParents()[0]);
-                 	if (matrixTransform)
-                 	{
-                 		mBackToOrigin = matrixTransform;
-                     	updateBackToOriginTransform(&geom);
-                	}
+                    if (mBackToOrigin)
+                        updateBackToOriginTransform(&geom);
+                    else
+                    {
+                        osg::MatrixTransform* matrixTransform
+                            = dynamic_cast<osg::MatrixTransform*>(this->getParents()[0]);
+                        if (matrixTransform)
+                        {
+                            mBackToOrigin = matrixTransform;
+                            updateBackToOriginTransform(&geom);
+                        }
+                    }
                 }
+
+                updateRigGeometry(&geom, &nv);
+
+                nv.pushOntoNodePath(&geom);
+                nv.apply(geom);
+                nv.popFromNodePath();
             }
-            
-            updateRigGeometry(&geom, &nv);
-            
-            nv.pushOntoNodePath(&geom);
-            nv.apply(geom);
-            nv.popFromNodePath();
         }
+        else if (nv.getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR)
+        {
+        }
+        else
+            nv.apply(*this);
+
+        nv.popFromNodePath();
     }
-    else if (nv.getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR)
+
+    void RigGeometryHolder::accept(osg::PrimitiveFunctor& func) const
     {
+        getRigGeometryPerFrame(mLastFrameNumber)->accept(func);
     }
-    else
-        nv.apply(*this);
-
-    nv.popFromNodePath();
-}
-
-
-void RigGeometryHolder::accept(osg::PrimitiveFunctor& func) const
-{
-    getRigGeometryPerFrame(mLastFrameNumber)->accept(func);
-}
-
-OsgaRigGeometry* RigGeometryHolder::getRigGeometryPerFrame(unsigned int frame) const
-{
-    return mGeometry.at(frame%2).get();
-}
 
+    OsgaRigGeometry* RigGeometryHolder::getRigGeometryPerFrame(unsigned int frame) const
+    {
+        return mGeometry.at(frame % 2).get();
+    }
 
 }
diff --git a/components/sceneutil/riggeometryosgaextension.hpp b/components/sceneutil/riggeometryosgaextension.hpp
index 6098bd9608..dd22e5fa80 100644
--- a/components/sceneutil/riggeometryosgaextension.hpp
+++ b/components/sceneutil/riggeometryosgaextension.hpp
@@ -14,7 +14,6 @@ namespace SceneUtil
     class OsgaRigGeometry : public osgAnimation::RigGeometry
     {
     public:
-
         OsgaRigGeometry();
 
         OsgaRigGeometry(const osgAnimation::RigGeometry& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY);
@@ -42,26 +41,28 @@ namespace SceneUtil
         void setSourceRigGeometry(osg::ref_ptr<OsgaRigGeometry> sourceRigGeometry);
         osg::ref_ptr<OsgaRigGeometry> getSourceRigGeometry() const;
 
-        /// @brief Modified rig update, code based on osgAnimation::UpdateRigGeometry : public osg::Drawable::UpdateCallback
-        void updateRigGeometry(OsgaRigGeometry* geom, osg::NodeVisitor *nv);
+        /// @brief Modified rig update, code based on osgAnimation::UpdateRigGeometry : public
+        /// osg::Drawable::UpdateCallback
+        void updateRigGeometry(OsgaRigGeometry* geom, osg::NodeVisitor* nv);
 
         OsgaRigGeometry* getGeometry(int geometry);
 
-        void accept(osg::NodeVisitor &nv) override;
+        void accept(osg::NodeVisitor& nv) override;
         void accept(osg::PrimitiveFunctor&) const override;
-        bool supports(const osg::PrimitiveFunctor&) const override{ return true; }
-        
-        void setBackToOrigin(osg::MatrixTransform* backToOrigin) {mBackToOrigin = backToOrigin;}
-        void setBodyPart(bool isBodyPart) {mIsBodyPart = isBodyPart;}
+        bool supports(const osg::PrimitiveFunctor&) const override { return true; }
+
+        void setBackToOrigin(osg::MatrixTransform* backToOrigin) { mBackToOrigin = backToOrigin; }
+        void setBodyPart(bool isBodyPart) { mIsBodyPart = isBodyPart; }
 
     private:
         std::array<osg::ref_ptr<OsgaRigGeometry>, 2> mGeometry;
         osg::ref_ptr<OsgaRigGeometry> mSourceRigGeometry;
-        osg::MatrixTransform* mBackToOrigin; //This is used to move riggeometries from their slot locations to skeleton origin in order to get correct deformations for bodyparts
+        osg::MatrixTransform* mBackToOrigin; // This is used to move riggeometries from their slot locations to skeleton
+                                             // origin in order to get correct deformations for bodyparts
 
         unsigned int mLastFrameNumber;
         bool mIsBodyPart;
-        
+
         void updateBackToOriginTransform(OsgaRigGeometry* geometry);
 
         OsgaRigGeometry* getRigGeometryPerFrame(unsigned int frame) const;
diff --git a/components/sceneutil/rtt.cpp b/components/sceneutil/rtt.cpp
index 19daf2b560..be324543b1 100644
--- a/components/sceneutil/rtt.cpp
+++ b/components/sceneutil/rtt.cpp
@@ -7,12 +7,12 @@
 #include <osg/Texture2DArray>
 #include <osgUtil/CullVisitor>
 
+#include <components/debug/debuglog.hpp>
+#include <components/sceneutil/color.hpp>
+#include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/nodecallback.hpp>
 #include <components/settings/settings.hpp>
-#include <components/sceneutil/depth.hpp>
-#include <components/sceneutil/color.hpp>
 #include <components/stereo/multiview.hpp>
-#include <components/debug/debuglog.hpp>
 #include <components/stereo/stereomanager.hpp>
 
 namespace SceneUtil
@@ -20,14 +20,11 @@ namespace SceneUtil
     class CullCallback : public SceneUtil::NodeCallback<CullCallback, RTTNode*, osgUtil::CullVisitor*>
     {
     public:
-
-        void operator()(RTTNode* node, osgUtil::CullVisitor* cv)
-        {
-            node->cull(cv);
-        }
+        void operator()(RTTNode* node, osgUtil::CullVisitor* cv) { node->cull(cv); }
     };
 
-    RTTNode::RTTNode(uint32_t textureWidth, uint32_t textureHeight, uint32_t samples, bool generateMipmaps, int renderOrderNum, StereoAwareness stereoAwareness)
+    RTTNode::RTTNode(uint32_t textureWidth, uint32_t textureHeight, uint32_t samples, bool generateMipmaps,
+        int renderOrderNum, StereoAwareness stereoAwareness)
         : mTextureWidth(textureWidth)
         , mTextureHeight(textureHeight)
         , mSamples(samples)
@@ -83,7 +80,7 @@ namespace SceneUtil
 
     bool RTTNode::shouldDoPerViewMapping()
     {
-        if(mStereoAwareness != StereoAwareness::Aware)
+        if (mStereoAwareness != StereoAwareness::Aware)
             return false;
         if (!Stereo::getMultiview())
             return true;
@@ -198,7 +195,8 @@ namespace SceneUtil
             if (camera->getBufferAttachmentMap().count(osg::Camera::COLOR_BUFFER))
                 vdd->mColorTexture = camera->getBufferAttachmentMap()[osg::Camera::COLOR_BUFFER]._texture;
             if (camera->getBufferAttachmentMap().count(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER))
-                vdd->mDepthTexture = camera->getBufferAttachmentMap()[osg::Camera::PACKED_DEPTH_STENCIL_BUFFER]._texture;
+                vdd->mDepthTexture
+                    = camera->getBufferAttachmentMap()[osg::Camera::PACKED_DEPTH_STENCIL_BUFFER]._texture;
 
             if (shouldDoTextureArray())
             {
@@ -206,22 +204,28 @@ namespace SceneUtil
                 if (camera->getBufferAttachmentMap().count(osg::Camera::COLOR_BUFFER) == 0)
                 {
                     vdd->mColorTexture = createTextureArray(mColorBufferInternalFormat);
-                    camera->attach(osg::Camera::COLOR_BUFFER, vdd->mColorTexture, 0, Stereo::osgFaceControlledByMultiviewShader(), mGenerateMipmaps, mSamples);
-                    SceneUtil::attachAlphaToCoverageFriendlyFramebufferToCamera(camera, osg::Camera::COLOR_BUFFER, vdd->mColorTexture, 0, Stereo::osgFaceControlledByMultiviewShader(), mGenerateMipmaps);
+                    camera->attach(osg::Camera::COLOR_BUFFER, vdd->mColorTexture, 0,
+                        Stereo::osgFaceControlledByMultiviewShader(), mGenerateMipmaps, mSamples);
+                    SceneUtil::attachAlphaToCoverageFriendlyFramebufferToCamera(camera, osg::Camera::COLOR_BUFFER,
+                        vdd->mColorTexture, 0, Stereo::osgFaceControlledByMultiviewShader(), mGenerateMipmaps);
                 }
 
                 if (camera->getBufferAttachmentMap().count(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER) == 0)
                 {
                     vdd->mDepthTexture = createTextureArray(mDepthBufferInternalFormat);
-                    camera->attach(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, vdd->mDepthTexture, 0, Stereo::osgFaceControlledByMultiviewShader(), false, mSamples);
+                    camera->attach(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, vdd->mDepthTexture, 0,
+                        Stereo::osgFaceControlledByMultiviewShader(), false, mSamples);
                 }
 
                 if (shouldDoTextureView())
                 {
-                    // In this case, shaders being set to multiview forces us to render to a multiview framebuffer even though we don't need that.
-                    // This forces us to make Texture2DArray. To make this possible to sample as a Texture2D, make a Texture2D view into the texture array.
-                    vdd->mColorTexture = Stereo::createTextureView_Texture2DFromTexture2DArray(static_cast<osg::Texture2DArray*>(vdd->mColorTexture.get()), 0);
-                    vdd->mDepthTexture = Stereo::createTextureView_Texture2DFromTexture2DArray(static_cast<osg::Texture2DArray*>(vdd->mDepthTexture.get()), 0);
+                    // In this case, shaders being set to multiview forces us to render to a multiview framebuffer even
+                    // though we don't need that. This forces us to make Texture2DArray. To make this possible to sample
+                    // as a Texture2D, make a Texture2D view into the texture array.
+                    vdd->mColorTexture = Stereo::createTextureView_Texture2DFromTexture2DArray(
+                        static_cast<osg::Texture2DArray*>(vdd->mColorTexture.get()), 0);
+                    vdd->mDepthTexture = Stereo::createTextureView_Texture2DFromTexture2DArray(
+                        static_cast<osg::Texture2DArray*>(vdd->mDepthTexture.get()), 0);
                 }
             }
             else
@@ -231,7 +235,8 @@ namespace SceneUtil
                 {
                     vdd->mColorTexture = createTexture(mColorBufferInternalFormat);
                     camera->attach(osg::Camera::COLOR_BUFFER, vdd->mColorTexture, 0, 0, mGenerateMipmaps, mSamples);
-                    SceneUtil::attachAlphaToCoverageFriendlyFramebufferToCamera(camera, osg::Camera::COLOR_BUFFER, vdd->mColorTexture, 0, 0, mGenerateMipmaps);
+                    SceneUtil::attachAlphaToCoverageFriendlyFramebufferToCamera(
+                        camera, osg::Camera::COLOR_BUFFER, vdd->mColorTexture, 0, 0, mGenerateMipmaps);
                 }
 
                 if (camera->getBufferAttachmentMap().count(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER) == 0)
@@ -241,13 +246,17 @@ namespace SceneUtil
                 }
             }
 
-            // OSG appears not to properly initialize this metadata. So when multisampling is enabled, OSG will use incorrect formats for the resolve buffers.
+            // OSG appears not to properly initialize this metadata. So when multisampling is enabled, OSG will use
+            // incorrect formats for the resolve buffers.
             if (mSamples > 1)
             {
-                camera->getBufferAttachmentMap()[osg::Camera::COLOR_BUFFER]._internalFormat = mColorBufferInternalFormat;
+                camera->getBufferAttachmentMap()[osg::Camera::COLOR_BUFFER]._internalFormat
+                    = mColorBufferInternalFormat;
                 camera->getBufferAttachmentMap()[osg::Camera::COLOR_BUFFER]._mipMapGeneration = mGenerateMipmaps;
-                camera->getBufferAttachmentMap()[osg::Camera::PACKED_DEPTH_STENCIL_BUFFER]._internalFormat = mDepthBufferInternalFormat;
-                camera->getBufferAttachmentMap()[osg::Camera::PACKED_DEPTH_STENCIL_BUFFER]._mipMapGeneration = mGenerateMipmaps;
+                camera->getBufferAttachmentMap()[osg::Camera::PACKED_DEPTH_STENCIL_BUFFER]._internalFormat
+                    = mDepthBufferInternalFormat;
+                camera->getBufferAttachmentMap()[osg::Camera::PACKED_DEPTH_STENCIL_BUFFER]._mipMapGeneration
+                    = mGenerateMipmaps;
             }
         }
 
diff --git a/components/sceneutil/rtt.hpp b/components/sceneutil/rtt.hpp
index ec8243792f..f46d6c813e 100644
--- a/components/sceneutil/rtt.hpp
+++ b/components/sceneutil/rtt.hpp
@@ -23,26 +23,36 @@ namespace SceneUtil
     class CreateTextureViewsCallback;
 
     /// @brief Implements per-view RTT operations.
-    /// @par With a naive RTT implementation, subsequent views of multiple views will overwrite the results of the previous views, leading to
-    ///     the results of the last view being broadcast to all views. An error in all cases where the RTT result depends on the view.
-    /// @par If using an RTTNode this is solved by mapping RTT operations to CullVisitors, which will be unique per view. This requires
+    /// @par With a naive RTT implementation, subsequent views of multiple views will overwrite the results of the
+    /// previous views, leading to
+    ///     the results of the last view being broadcast to all views. An error in all cases where the RTT result
+    ///     depends on the view.
+    /// @par If using an RTTNode this is solved by mapping RTT operations to CullVisitors, which will be unique per
+    /// view. This requires
     ///     instancing one camera per view, and traversing only the camera mapped to that CV during cull traversals.
-    /// @par Camera settings should be effectuated by overriding the setDefaults() and apply() methods, following a pattern similar to SceneUtil::StateSetUpdater
-    /// @par When using the RTT texture in your statesets, it is recommended to use SceneUtil::StateSetUpdater as a cull callback to handle this as the appropriate
+    /// @par Camera settings should be effectuated by overriding the setDefaults() and apply() methods, following a
+    /// pattern similar to SceneUtil::StateSetUpdater
+    /// @par When using the RTT texture in your statesets, it is recommended to use SceneUtil::StateSetUpdater as a cull
+    /// callback to handle this as the appropriate
     ///     textures can be retrieved during SceneUtil::StateSetUpdater::Apply()
-    /// @par For any of COLOR_BUFFER or PACKED_DEPTH_STENCIL_BUFFER not added during setDefaults(), RTTNode will attach a default buffer. The default color buffer has an internal format of GL_RGB.
-    ///     The default depth buffer has internal format GL_DEPTH_COMPONENT24, source format GL_DEPTH_COMPONENT, and source type GL_UNSIGNED_INT. Default wrap is CLAMP_TO_EDGE and filter LINEAR.
+    /// @par For any of COLOR_BUFFER or PACKED_DEPTH_STENCIL_BUFFER not added during setDefaults(), RTTNode will attach
+    /// a default buffer. The default color buffer has an internal format of GL_RGB.
+    ///     The default depth buffer has internal format GL_DEPTH_COMPONENT24, source format GL_DEPTH_COMPONENT, and
+    ///     source type GL_UNSIGNED_INT. Default wrap is CLAMP_TO_EDGE and filter LINEAR.
     class RTTNode : public osg::Node
     {
     public:
         enum class StereoAwareness
         {
             Unaware, //! RTT does not vary by view. A single RTT context is created
-            Aware, //! RTT varies by view. One RTT context per view is created. Textures are automatically created as arrays if multiview is enabled.
-            Unaware_MultiViewShaders, //! RTT does not vary by view, but renders with multiview shaders and needs to create texture arrays if multiview is enabled.
+            Aware, //! RTT varies by view. One RTT context per view is created. Textures are automatically created as
+                   //! arrays if multiview is enabled.
+            Unaware_MultiViewShaders, //! RTT does not vary by view, but renders with multiview shaders and needs to
+                                      //! create texture arrays if multiview is enabled.
         };
 
-        RTTNode(uint32_t textureWidth, uint32_t textureHeight, uint32_t samples, bool generateMipmaps, int renderOrderNum, StereoAwareness stereoAwareness);
+        RTTNode(uint32_t textureWidth, uint32_t textureHeight, uint32_t samples, bool generateMipmaps,
+            int renderOrderNum, StereoAwareness stereoAwareness);
         ~RTTNode();
 
         osg::Texture* getColorTexture(osgUtil::CullVisitor* cv);
@@ -52,11 +62,12 @@ namespace SceneUtil
         osg::Camera* getCamera(osgUtil::CullVisitor* cv);
 
         /// Set default settings - optionally override in derived classes
-        virtual void setDefaults(osg::Camera* camera) {};
+        virtual void setDefaults(osg::Camera* camera){};
 
         /// Apply state - to override in derived classes
-        /// @note Due to the view mapping approach you *have* to apply all camera settings, even if they have not changed since the last frame.
-        virtual void apply(osg::Camera* camera) {};
+        /// @note Due to the view mapping approach you *have* to apply all camera settings, even if they have not
+        /// changed since the last frame.
+        virtual void apply(osg::Camera* camera){};
 
         /// Apply any state specific to the Left view. Default implementation does nothing. Called after apply()
         virtual void applyLeft(osg::Camera* camera) {}
@@ -92,7 +103,7 @@ namespace SceneUtil
 
         ViewDependentData* getViewDependentData(osgUtil::CullVisitor* cv);
 
-        typedef std::map< osgUtil::CullVisitor*, std::shared_ptr<ViewDependentData> >  ViewDependentDataMap;
+        typedef std::map<osgUtil::CullVisitor*, std::shared_ptr<ViewDependentData>> ViewDependentDataMap;
         ViewDependentDataMap mViewDependentDataMap;
         uint32_t mTextureWidth;
         uint32_t mTextureHeight;
diff --git a/components/sceneutil/screencapture.cpp b/components/sceneutil/screencapture.cpp
index 6c73191014..c68e83510f 100644
--- a/components/sceneutil/screencapture.cpp
+++ b/components/sceneutil/screencapture.cpp
@@ -1,70 +1,65 @@
 #include "screencapture.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/sceneutil/workqueue.hpp>
 #include <components/files/conversion.hpp>
+#include <components/sceneutil/workqueue.hpp>
 
-#include <osg/ref_ptr>
 #include <osg/Image>
+#include <osg/ref_ptr>
 #include <osgDB/ReaderWriter>
 #include <osgDB/Registry>
 
-
+#include <atomic>
 #include <cassert>
-#include <fstream>
 #include <filesystem>
+#include <fstream>
 #include <iomanip>
 #include <sstream>
 #include <string>
-#include <atomic>
 
 namespace
 {
     class ScreenCaptureWorkItem : public SceneUtil::WorkItem
     {
-        public:
-            ScreenCaptureWorkItem(const osg::ref_ptr<osgViewer::ScreenCaptureHandler::CaptureOperation>& impl,
-                                  const osg::Image& image, unsigned int contextId)
-                : mImpl(impl),
-                  mImage(new osg::Image(image)),
-                  mContextId(contextId)
-            {
-                assert(mImpl != nullptr);
-            }
+    public:
+        ScreenCaptureWorkItem(const osg::ref_ptr<osgViewer::ScreenCaptureHandler::CaptureOperation>& impl,
+            const osg::Image& image, unsigned int contextId)
+            : mImpl(impl)
+            , mImage(new osg::Image(image))
+            , mContextId(contextId)
+        {
+            assert(mImpl != nullptr);
+        }
 
-            void doWork() override
+        void doWork() override
+        {
+            if (mAborted)
+                return;
+
+            try
             {
-                if (mAborted)
-                    return;
-
-                try
-                {
-                    (*mImpl)(*mImage, mContextId);
-                }
-                catch (const std::exception& e)
-                {
-                    Log(Debug::Error) << "ScreenCaptureWorkItem exception: " << e.what();
-                }
+                (*mImpl)(*mImage, mContextId);
             }
-
-            void abort() override
+            catch (const std::exception& e)
             {
-                mAborted = true;
+                Log(Debug::Error) << "ScreenCaptureWorkItem exception: " << e.what();
             }
+        }
+
+        void abort() override { mAborted = true; }
 
-        private:
-            const osg::ref_ptr<osgViewer::ScreenCaptureHandler::CaptureOperation> mImpl;
-            const osg::ref_ptr<const osg::Image> mImage;
-            const unsigned int mContextId;
-            std::atomic_bool mAborted {false};
+    private:
+        const osg::ref_ptr<osgViewer::ScreenCaptureHandler::CaptureOperation> mImpl;
+        const osg::ref_ptr<const osg::Image> mImage;
+        const unsigned int mContextId;
+        std::atomic_bool mAborted{ false };
     };
 }
 
 namespace SceneUtil
 {
-    std::filesystem::path writeScreenshotToFile(const std::filesystem::path& screenshotPath,
-                                                const std::string& screenshotFormat,
-                                                const osg::Image& image)
+    std::filesystem::path writeScreenshotToFile(
+        const std::filesystem::path& screenshotPath, const std::string& screenshotFormat, const osg::Image& image)
     {
         // Count screenshots.
         int shotCount = 0;
@@ -106,9 +101,8 @@ namespace SceneUtil
         return lastFileName;
     }
 
-    WriteScreenshotToFileOperation::WriteScreenshotToFileOperation(const std::filesystem::path &screenshotPath,
-                                                                   const std::string& screenshotFormat,
-                                                                   std::function<void (std::string)> callback)
+    WriteScreenshotToFileOperation::WriteScreenshotToFileOperation(const std::filesystem::path& screenshotPath,
+        const std::string& screenshotFormat, std::function<void(std::string)> callback)
         : mScreenshotPath(screenshotPath)
         , mScreenshotFormat(screenshotFormat)
         , mCallback(callback)
@@ -124,8 +118,8 @@ namespace SceneUtil
         }
         catch (const std::exception& e)
         {
-            Log(Debug::Error) << "Failed to write screenshot to file with path=\"" << mScreenshotPath
-                              << "\", format=\"" << mScreenshotFormat << "\": " << e.what();
+            Log(Debug::Error) << "Failed to write screenshot to file with path=\"" << mScreenshotPath << "\", format=\""
+                              << mScreenshotFormat << "\": " << e.what();
         }
         if (fileName.empty())
             mCallback("Failed to save screenshot");
@@ -133,10 +127,10 @@ namespace SceneUtil
             mCallback(Files::pathToUnicodeString(fileName) + " has been saved");
     }
 
-    AsyncScreenCaptureOperation::AsyncScreenCaptureOperation(osg::ref_ptr<WorkQueue> queue,
-                                                             osg::ref_ptr<CaptureOperation> impl)
-        : mQueue(std::move(queue)),
-          mImpl(std::move(impl))
+    AsyncScreenCaptureOperation::AsyncScreenCaptureOperation(
+        osg::ref_ptr<WorkQueue> queue, osg::ref_ptr<CaptureOperation> impl)
+        : mQueue(std::move(queue))
+        , mImpl(std::move(impl))
     {
         assert(mQueue != nullptr);
         assert(mImpl != nullptr);
@@ -160,7 +154,7 @@ namespace SceneUtil
     {
         osg::ref_ptr<SceneUtil::WorkItem> item(new ScreenCaptureWorkItem(mImpl, image, context_id));
         mQueue->addWorkItem(item);
-        const auto isDone = [] (const osg::ref_ptr<SceneUtil::WorkItem>& v) { return v->isDone(); };
+        const auto isDone = [](const osg::ref_ptr<SceneUtil::WorkItem>& v) { return v->isDone(); };
         const auto workItems = mWorkItems.lock();
         workItems->erase(std::remove_if(workItems->begin(), workItems->end(), isDone), workItems->end());
         workItems->emplace_back(std::move(item));
diff --git a/components/sceneutil/screencapture.hpp b/components/sceneutil/screencapture.hpp
index e5a8304896..1bbd13739d 100644
--- a/components/sceneutil/screencapture.hpp
+++ b/components/sceneutil/screencapture.hpp
@@ -6,9 +6,9 @@
 #include <osg/ref_ptr>
 #include <osgViewer/ViewerEventHandlers>
 
+#include <filesystem>
 #include <string>
 #include <vector>
-#include <filesystem>
 
 namespace osg
 {
@@ -20,40 +20,39 @@ namespace SceneUtil
     class WorkQueue;
     class WorkItem;
 
-    std::filesystem::path writeScreenshotToFile(const std::filesystem::path& screenshotPath,
-                                                const std::string& screenshotFormat,
-                                                const osg::Image& image);
+    std::filesystem::path writeScreenshotToFile(
+        const std::filesystem::path& screenshotPath, const std::string& screenshotFormat, const osg::Image& image);
 
     class WriteScreenshotToFileOperation : public osgViewer::ScreenCaptureHandler::CaptureOperation
     {
-        public:
-            WriteScreenshotToFileOperation(const std::filesystem::path &screenshotPath, const std::string& screenshotFormat,
-                                           std::function<void (std::string)> callback);
+    public:
+        WriteScreenshotToFileOperation(const std::filesystem::path& screenshotPath, const std::string& screenshotFormat,
+            std::function<void(std::string)> callback);
 
-            void operator()(const osg::Image& image, const unsigned int context_id) override;
+        void operator()(const osg::Image& image, const unsigned int context_id) override;
 
-        private:
-            const std::filesystem::path mScreenshotPath;
-            const std::string mScreenshotFormat;
-            const std::function<void (std::string)> mCallback;
+    private:
+        const std::filesystem::path mScreenshotPath;
+        const std::string mScreenshotFormat;
+        const std::function<void(std::string)> mCallback;
     };
 
     class AsyncScreenCaptureOperation : public osgViewer::ScreenCaptureHandler::CaptureOperation
     {
-        public:
-            AsyncScreenCaptureOperation(osg::ref_ptr<SceneUtil::WorkQueue> queue,
-                                        osg::ref_ptr<osgViewer::ScreenCaptureHandler::CaptureOperation> impl);
+    public:
+        AsyncScreenCaptureOperation(osg::ref_ptr<SceneUtil::WorkQueue> queue,
+            osg::ref_ptr<osgViewer::ScreenCaptureHandler::CaptureOperation> impl);
 
-            ~AsyncScreenCaptureOperation();
+        ~AsyncScreenCaptureOperation();
 
-            void stop();
+        void stop();
 
-            void operator()(const osg::Image& image, const unsigned int context_id) override;
+        void operator()(const osg::Image& image, const unsigned int context_id) override;
 
-        private:
-            const osg::ref_ptr<SceneUtil::WorkQueue> mQueue;
-            const osg::ref_ptr<osgViewer::ScreenCaptureHandler::CaptureOperation> mImpl;
-            Misc::ScopeGuarded<std::vector<osg::ref_ptr<SceneUtil::WorkItem>>> mWorkItems;
+    private:
+        const osg::ref_ptr<SceneUtil::WorkQueue> mQueue;
+        const osg::ref_ptr<osgViewer::ScreenCaptureHandler::CaptureOperation> mImpl;
+        Misc::ScopeGuarded<std::vector<osg::ref_ptr<SceneUtil::WorkItem>>> mWorkItems;
     };
 }
 
diff --git a/components/sceneutil/serialize.cpp b/components/sceneutil/serialize.cpp
index 748b3a708d..066f43d123 100644
--- a/components/sceneutil/serialize.cpp
+++ b/components/sceneutil/serialize.cpp
@@ -5,185 +5,180 @@
 
 #include <components/nifosg/matrixtransform.hpp>
 
+#include <components/sceneutil/morphgeometry.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
-#include <components/sceneutil/skeleton.hpp>
 #include <components/sceneutil/riggeometry.hpp>
 #include <components/sceneutil/riggeometryosgaextension.hpp>
-#include <components/sceneutil/morphgeometry.hpp>
+#include <components/sceneutil/skeleton.hpp>
 
 namespace SceneUtil
 {
 
-template <class Cls>
-static osg::Object* createInstanceFunc() { return new Cls; }
-
-class PositionAttitudeTransformSerializer : public osgDB::ObjectWrapper
-{
-public:
-    PositionAttitudeTransformSerializer()
-        : osgDB::ObjectWrapper(createInstanceFunc<SceneUtil::PositionAttitudeTransform>, "SceneUtil::PositionAttitudeTransform", "osg::Object osg::Node osg::Group osg::Transform SceneUtil::PositionAttitudeTransform")
+    template <class Cls>
+    static osg::Object* createInstanceFunc()
     {
-        addSerializer( new osgDB::PropByRefSerializer< SceneUtil::PositionAttitudeTransform, osg::Vec3f >(
-            "position", osg::Vec3f(), &SceneUtil::PositionAttitudeTransform::getPosition, &SceneUtil::PositionAttitudeTransform::setPosition), osgDB::BaseSerializer::RW_VEC3F );
-        addSerializer( new osgDB::PropByRefSerializer< SceneUtil::PositionAttitudeTransform, osg::Quat >(
-            "attitude", osg::Quat(), &SceneUtil::PositionAttitudeTransform::getAttitude, &SceneUtil::PositionAttitudeTransform::setAttitude), osgDB::BaseSerializer::RW_QUAT );
-        addSerializer( new osgDB::PropByRefSerializer< SceneUtil::PositionAttitudeTransform, osg::Vec3f >(
-            "scale", osg::Vec3f(), &SceneUtil::PositionAttitudeTransform::getScale, &SceneUtil::PositionAttitudeTransform::setScale), osgDB::BaseSerializer::RW_VEC3F );
+        return new Cls;
     }
-};
 
-class SkeletonSerializer : public osgDB::ObjectWrapper
-{
-public:
-    SkeletonSerializer()
-        : osgDB::ObjectWrapper(createInstanceFunc<SceneUtil::Skeleton>, "SceneUtil::Skeleton", "osg::Object osg::Node osg::Group SceneUtil::Skeleton")
+    class PositionAttitudeTransformSerializer : public osgDB::ObjectWrapper
     {
-    }
-};
+    public:
+        PositionAttitudeTransformSerializer()
+            : osgDB::ObjectWrapper(createInstanceFunc<SceneUtil::PositionAttitudeTransform>,
+                "SceneUtil::PositionAttitudeTransform",
+                "osg::Object osg::Node osg::Group osg::Transform SceneUtil::PositionAttitudeTransform")
+        {
+            addSerializer(new osgDB::PropByRefSerializer<SceneUtil::PositionAttitudeTransform, osg::Vec3f>("position",
+                              osg::Vec3f(), &SceneUtil::PositionAttitudeTransform::getPosition,
+                              &SceneUtil::PositionAttitudeTransform::setPosition),
+                osgDB::BaseSerializer::RW_VEC3F);
+            addSerializer(new osgDB::PropByRefSerializer<SceneUtil::PositionAttitudeTransform, osg::Quat>("attitude",
+                              osg::Quat(), &SceneUtil::PositionAttitudeTransform::getAttitude,
+                              &SceneUtil::PositionAttitudeTransform::setAttitude),
+                osgDB::BaseSerializer::RW_QUAT);
+            addSerializer(
+                new osgDB::PropByRefSerializer<SceneUtil::PositionAttitudeTransform, osg::Vec3f>("scale", osg::Vec3f(),
+                    &SceneUtil::PositionAttitudeTransform::getScale, &SceneUtil::PositionAttitudeTransform::setScale),
+                osgDB::BaseSerializer::RW_VEC3F);
+        }
+    };
 
-class RigGeometrySerializer : public osgDB::ObjectWrapper
-{
-public:
-    RigGeometrySerializer()
-        : osgDB::ObjectWrapper(createInstanceFunc<SceneUtil::RigGeometry>, "SceneUtil::RigGeometry", "osg::Object osg::Node osg::Drawable SceneUtil::RigGeometry")
+    class SkeletonSerializer : public osgDB::ObjectWrapper
     {
-    }
-};
+    public:
+        SkeletonSerializer()
+            : osgDB::ObjectWrapper(createInstanceFunc<SceneUtil::Skeleton>, "SceneUtil::Skeleton",
+                "osg::Object osg::Node osg::Group SceneUtil::Skeleton")
+        {
+        }
+    };
 
-class RigGeometryHolderSerializer : public osgDB::ObjectWrapper
-{
-public:
-    RigGeometryHolderSerializer()
-        : osgDB::ObjectWrapper(createInstanceFunc<SceneUtil::RigGeometryHolder>, "SceneUtil::RigGeometryHolder", "osg::Object osg::Node osg::Drawable SceneUtil::RigGeometryHolder")
+    class RigGeometrySerializer : public osgDB::ObjectWrapper
     {
-    }
-};
+    public:
+        RigGeometrySerializer()
+            : osgDB::ObjectWrapper(createInstanceFunc<SceneUtil::RigGeometry>, "SceneUtil::RigGeometry",
+                "osg::Object osg::Node osg::Drawable SceneUtil::RigGeometry")
+        {
+        }
+    };
 
-class OsgaRigGeometrySerializer : public osgDB::ObjectWrapper
-{
-public:
-    OsgaRigGeometrySerializer()
-        : osgDB::ObjectWrapper(createInstanceFunc<SceneUtil::OsgaRigGeometry>, "SceneUtil::OsgaRigGeometry", "osg::Object osg::Node osg::Geometry osgAnimation::RigGeometry SceneUtil::OsgaRigGeometry")
+    class RigGeometryHolderSerializer : public osgDB::ObjectWrapper
     {
-    }
-};
+    public:
+        RigGeometryHolderSerializer()
+            : osgDB::ObjectWrapper(createInstanceFunc<SceneUtil::RigGeometryHolder>, "SceneUtil::RigGeometryHolder",
+                "osg::Object osg::Node osg::Drawable SceneUtil::RigGeometryHolder")
+        {
+        }
+    };
 
-class MorphGeometrySerializer : public osgDB::ObjectWrapper
-{
-public:
-    MorphGeometrySerializer()
-        : osgDB::ObjectWrapper(createInstanceFunc<SceneUtil::MorphGeometry>, "SceneUtil::MorphGeometry", "osg::Object osg::Node osg::Drawable SceneUtil::MorphGeometry")
+    class OsgaRigGeometrySerializer : public osgDB::ObjectWrapper
     {
-    }
-};
+    public:
+        OsgaRigGeometrySerializer()
+            : osgDB::ObjectWrapper(createInstanceFunc<SceneUtil::OsgaRigGeometry>, "SceneUtil::OsgaRigGeometry",
+                "osg::Object osg::Node osg::Geometry osgAnimation::RigGeometry SceneUtil::OsgaRigGeometry")
+        {
+        }
+    };
 
-class LightManagerSerializer : public osgDB::ObjectWrapper
-{
-public:
-    LightManagerSerializer()
-        : osgDB::ObjectWrapper(createInstanceFunc<osg::Group>, "SceneUtil::LightManager", "osg::Object osg::Node osg::Group SceneUtil::LightManager")
+    class MorphGeometrySerializer : public osgDB::ObjectWrapper
     {
-    }
-};
+    public:
+        MorphGeometrySerializer()
+            : osgDB::ObjectWrapper(createInstanceFunc<SceneUtil::MorphGeometry>, "SceneUtil::MorphGeometry",
+                "osg::Object osg::Node osg::Drawable SceneUtil::MorphGeometry")
+        {
+        }
+    };
 
-class CameraRelativeTransformSerializer : public osgDB::ObjectWrapper
-{
-public:
-    CameraRelativeTransformSerializer()
-        : osgDB::ObjectWrapper(createInstanceFunc<osg::Group>, "MWRender::CameraRelativeTransform", "osg::Object osg::Node osg::Group MWRender::CameraRelativeTransform")
+    class LightManagerSerializer : public osgDB::ObjectWrapper
     {
-    }
-};
+    public:
+        LightManagerSerializer()
+            : osgDB::ObjectWrapper(createInstanceFunc<osg::Group>, "SceneUtil::LightManager",
+                "osg::Object osg::Node osg::Group SceneUtil::LightManager")
+        {
+        }
+    };
 
-class MatrixTransformSerializer : public osgDB::ObjectWrapper
-{
-public:
-    MatrixTransformSerializer()
-        : osgDB::ObjectWrapper(createInstanceFunc<NifOsg::MatrixTransform>, "NifOsg::MatrixTransform", "osg::Object osg::Node osg::Group osg::Transform osg::MatrixTransform NifOsg::MatrixTransform")
+    class CameraRelativeTransformSerializer : public osgDB::ObjectWrapper
     {
-    }
-};
+    public:
+        CameraRelativeTransformSerializer()
+            : osgDB::ObjectWrapper(createInstanceFunc<osg::Group>, "MWRender::CameraRelativeTransform",
+                "osg::Object osg::Node osg::Group MWRender::CameraRelativeTransform")
+        {
+        }
+    };
 
-osgDB::ObjectWrapper* makeDummySerializer(const std::string& classname)
-{
-    return new osgDB::ObjectWrapper(createInstanceFunc<osg::DummyObject>, classname, "osg::Object");
-}
+    class MatrixTransformSerializer : public osgDB::ObjectWrapper
+    {
+    public:
+        MatrixTransformSerializer()
+            : osgDB::ObjectWrapper(createInstanceFunc<NifOsg::MatrixTransform>, "NifOsg::MatrixTransform",
+                "osg::Object osg::Node osg::Group osg::Transform osg::MatrixTransform NifOsg::MatrixTransform")
+        {
+        }
+    };
 
-class GeometrySerializer : public osgDB::ObjectWrapper
-{
-public:
-    GeometrySerializer()
-        : osgDB::ObjectWrapper(createInstanceFunc<osg::Drawable>, "osg::Geometry", "osg::Object osg::Drawable osg::Geometry")
+    osgDB::ObjectWrapper* makeDummySerializer(const std::string& classname)
     {
+        return new osgDB::ObjectWrapper(createInstanceFunc<osg::DummyObject>, classname, "osg::Object");
     }
-};
 
-void registerSerializers()
-{
-    static bool done = false;
-    if (!done)
+    class GeometrySerializer : public osgDB::ObjectWrapper
     {
-        osgDB::ObjectWrapperManager* mgr = osgDB::Registry::instance()->getObjectWrapperManager();
-        mgr->addWrapper(new PositionAttitudeTransformSerializer);
-        mgr->addWrapper(new SkeletonSerializer);
-        mgr->addWrapper(new RigGeometrySerializer);
-        mgr->addWrapper(new RigGeometryHolderSerializer);
-        mgr->addWrapper(new OsgaRigGeometrySerializer);
-        mgr->addWrapper(new MorphGeometrySerializer);
-        mgr->addWrapper(new LightManagerSerializer);
-        mgr->addWrapper(new CameraRelativeTransformSerializer);
-        mgr->addWrapper(new MatrixTransformSerializer);
-
-        // Don't serialize Geometry data as we are more interested in the overall structure rather than tons of vertex data that would make the file large and hard to read.
-        mgr->removeWrapper(mgr->findWrapper("osg::Geometry"));
-        mgr->addWrapper(new GeometrySerializer);
-
-        // ignore the below for now to avoid warning spam
-        const char* ignore[] = {
-            "MWRender::PtrHolder",
-            "Resource::TemplateRef",
-            "Resource::TemplateMultiRef",
-            "SceneUtil::CompositeStateSetUpdater",
-            "SceneUtil::UBOManager",
-            "SceneUtil::LightListCallback",
-            "SceneUtil::LightManagerUpdateCallback",
-            "SceneUtil::FFPLightStateAttribute",
-            "SceneUtil::UpdateRigBounds",
-            "SceneUtil::UpdateRigGeometry",
-            "SceneUtil::LightSource",
-            "SceneUtil::DisableLight",
-            "SceneUtil::MWShadowTechnique",
-            "SceneUtil::TextKeyMapHolder",
-            "Shader::AddedState",
-            "Shader::RemovedAlphaFunc",
-            "NifOsg::FlipController",
-            "NifOsg::KeyframeController",
-            "NifOsg::Emitter",
-            "NifOsg::ParticleColorAffector",
-            "NifOsg::ParticleSystem",
-            "NifOsg::GravityAffector",
-            "NifOsg::GrowFadeAffector",
-            "NifOsg::InverseWorldMatrix",
-            "NifOsg::StaticBoundingBoxCallback",
-            "NifOsg::GeomMorpherController",
-            "NifOsg::UpdateMorphGeometry",
-            "NifOsg::UVController",
-            "NifOsg::VisController",
-            "osgMyGUI::Drawable",
-            "osg::DrawCallback",
-            "osg::UniformBufferObject",
-            "osgOQ::ClearQueriesCallback",
-            "osgOQ::RetrieveQueriesCallback",
-            "osg::DummyObject"
-        };
-        for (size_t i=0; i<sizeof(ignore)/sizeof(ignore[0]); ++i)
+    public:
+        GeometrySerializer()
+            : osgDB::ObjectWrapper(
+                createInstanceFunc<osg::Drawable>, "osg::Geometry", "osg::Object osg::Drawable osg::Geometry")
         {
-            mgr->addWrapper(makeDummySerializer(ignore[i]));
         }
+    };
 
-
-        done = true;
+    void registerSerializers()
+    {
+        static bool done = false;
+        if (!done)
+        {
+            osgDB::ObjectWrapperManager* mgr = osgDB::Registry::instance()->getObjectWrapperManager();
+            mgr->addWrapper(new PositionAttitudeTransformSerializer);
+            mgr->addWrapper(new SkeletonSerializer);
+            mgr->addWrapper(new RigGeometrySerializer);
+            mgr->addWrapper(new RigGeometryHolderSerializer);
+            mgr->addWrapper(new OsgaRigGeometrySerializer);
+            mgr->addWrapper(new MorphGeometrySerializer);
+            mgr->addWrapper(new LightManagerSerializer);
+            mgr->addWrapper(new CameraRelativeTransformSerializer);
+            mgr->addWrapper(new MatrixTransformSerializer);
+
+            // Don't serialize Geometry data as we are more interested in the overall structure rather than tons of
+            // vertex data that would make the file large and hard to read.
+            mgr->removeWrapper(mgr->findWrapper("osg::Geometry"));
+            mgr->addWrapper(new GeometrySerializer);
+
+            // ignore the below for now to avoid warning spam
+            const char* ignore[] = { "MWRender::PtrHolder", "Resource::TemplateRef", "Resource::TemplateMultiRef",
+                "SceneUtil::CompositeStateSetUpdater", "SceneUtil::UBOManager", "SceneUtil::LightListCallback",
+                "SceneUtil::LightManagerUpdateCallback", "SceneUtil::FFPLightStateAttribute",
+                "SceneUtil::UpdateRigBounds", "SceneUtil::UpdateRigGeometry", "SceneUtil::LightSource",
+                "SceneUtil::DisableLight", "SceneUtil::MWShadowTechnique", "SceneUtil::TextKeyMapHolder",
+                "Shader::AddedState", "Shader::RemovedAlphaFunc", "NifOsg::FlipController",
+                "NifOsg::KeyframeController", "NifOsg::Emitter", "NifOsg::ParticleColorAffector",
+                "NifOsg::ParticleSystem", "NifOsg::GravityAffector", "NifOsg::GrowFadeAffector",
+                "NifOsg::InverseWorldMatrix", "NifOsg::StaticBoundingBoxCallback", "NifOsg::GeomMorpherController",
+                "NifOsg::UpdateMorphGeometry", "NifOsg::UVController", "NifOsg::VisController", "osgMyGUI::Drawable",
+                "osg::DrawCallback", "osg::UniformBufferObject", "osgOQ::ClearQueriesCallback",
+                "osgOQ::RetrieveQueriesCallback", "osg::DummyObject" };
+            for (size_t i = 0; i < sizeof(ignore) / sizeof(ignore[0]); ++i)
+            {
+                mgr->addWrapper(makeDummySerializer(ignore[i]));
+            }
+
+            done = true;
+        }
     }
-}
 
 }
diff --git a/components/sceneutil/shadow.cpp b/components/sceneutil/shadow.cpp
index d1d0fc3251..702159c3f9 100644
--- a/components/sceneutil/shadow.cpp
+++ b/components/sceneutil/shadow.cpp
@@ -1,7 +1,7 @@
 #include "shadow.hpp"
 
-#include <osgShadow/ShadowedScene>
 #include <osgShadow/ShadowSettings>
+#include <osgShadow/ShadowedScene>
 
 #include <components/misc/strings/algorithm.hpp>
 #include <components/settings/settings.hpp>
@@ -22,13 +22,14 @@ namespace SceneUtil
             mShadowTechnique->disableShadows();
             return;
         }
-        
+
         mShadowTechnique->enableShadows();
 
         mShadowSettings->setLightNum(0);
         mShadowSettings->setReceivesShadowTraversalMask(~0u);
 
-        const int numberOfShadowMapsPerLight = std::clamp(Settings::Manager::getInt("number of shadow maps", "Shadows"), 1, 8);
+        const int numberOfShadowMapsPerLight
+            = std::clamp(Settings::Manager::getInt("number of shadow maps", "Shadows"), 1, 8);
 
         mShadowSettings->setNumShadowMapsPerLight(numberOfShadowMapsPerLight);
         mShadowSettings->setBaseShadowTextureUnit(8 - numberOfShadowMapsPerLight);
@@ -36,12 +37,14 @@ namespace SceneUtil
         const float maximumShadowMapDistance = Settings::Manager::getFloat("maximum shadow map distance", "Shadows");
         if (maximumShadowMapDistance > 0)
         {
-            const float shadowFadeStart = std::clamp(Settings::Manager::getFloat("shadow fade start", "Shadows"), 0.f, 1.f);
+            const float shadowFadeStart
+                = std::clamp(Settings::Manager::getFloat("shadow fade start", "Shadows"), 0.f, 1.f);
             mShadowSettings->setMaximumShadowMapDistance(maximumShadowMapDistance);
             mShadowTechnique->setShadowFadeStart(maximumShadowMapDistance * shadowFadeStart);
         }
 
-        mShadowSettings->setMinimumShadowMapNearFarRatio(Settings::Manager::getFloat("minimum lispsm near far ratio", "Shadows"));
+        mShadowSettings->setMinimumShadowMapNearFarRatio(
+            Settings::Manager::getFloat("minimum lispsm near far ratio", "Shadows"));
 
         const std::string& computeSceneBounds = Settings::Manager::getString("compute scene bounds", "Shadows");
         if (Misc::StringUtils::ciEqual(computeSceneBounds, "primitives"))
@@ -52,10 +55,12 @@ namespace SceneUtil
         int mapres = Settings::Manager::getInt("shadow map resolution", "Shadows");
         mShadowSettings->setTextureSize(osg::Vec2s(mapres, mapres));
 
-        mShadowTechnique->setSplitPointUniformLogarithmicRatio(Settings::Manager::getFloat("split point uniform logarithmic ratio", "Shadows"));
+        mShadowTechnique->setSplitPointUniformLogarithmicRatio(
+            Settings::Manager::getFloat("split point uniform logarithmic ratio", "Shadows"));
         mShadowTechnique->setSplitPointDeltaBias(Settings::Manager::getFloat("split point bias", "Shadows"));
 
-        mShadowTechnique->setPolygonOffset(Settings::Manager::getFloat("polygon offset factor", "Shadows"), Settings::Manager::getFloat("polygon offset units", "Shadows"));
+        mShadowTechnique->setPolygonOffset(Settings::Manager::getFloat("polygon offset factor", "Shadows"),
+            Settings::Manager::getFloat("polygon offset units", "Shadows"));
 
         if (Settings::Manager::getBool("use front face culling", "Shadows"))
             mShadowTechnique->enableFrontFaceCulling();
@@ -78,10 +83,11 @@ namespace SceneUtil
         if (!Settings::Manager::getBool("enable shadows", "Shadows"))
             return;
 
-        const int numberOfShadowMapsPerLight = std::clamp(Settings::Manager::getInt("number of shadow maps", "Shadows"), 1, 8);
+        const int numberOfShadowMapsPerLight
+            = std::clamp(Settings::Manager::getInt("number of shadow maps", "Shadows"), 1, 8);
 
         int baseShadowTextureUnit = 8 - numberOfShadowMapsPerLight;
-        
+
         osg::ref_ptr<osg::Image> fakeShadowMapImage = new osg::Image();
         fakeShadowMapImage->allocateImage(1, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT);
         *(float*)fakeShadowMapImage->data() = std::numeric_limits<float>::infinity();
@@ -90,16 +96,22 @@ namespace SceneUtil
         fakeShadowMapTexture->setShadowCompareFunc(osg::Texture::ShadowCompareFunc::ALWAYS);
         for (int i = baseShadowTextureUnit; i < baseShadowTextureUnit + numberOfShadowMapsPerLight; ++i)
         {
-            stateset->setTextureAttributeAndModes(i, fakeShadowMapTexture, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE | osg::StateAttribute::PROTECTED);
-            stateset->addUniform(new osg::Uniform(("shadowTexture" + std::to_string(i - baseShadowTextureUnit)).c_str(), i));
-            stateset->addUniform(new osg::Uniform(("shadowTextureUnit" + std::to_string(i - baseShadowTextureUnit)).c_str(), i));
+            stateset->setTextureAttributeAndModes(i, fakeShadowMapTexture,
+                osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE | osg::StateAttribute::PROTECTED);
+            stateset->addUniform(
+                new osg::Uniform(("shadowTexture" + std::to_string(i - baseShadowTextureUnit)).c_str(), i));
+            stateset->addUniform(
+                new osg::Uniform(("shadowTextureUnit" + std::to_string(i - baseShadowTextureUnit)).c_str(), i));
         }
     }
 
-    ShadowManager::ShadowManager(osg::ref_ptr<osg::Group> sceneRoot, osg::ref_ptr<osg::Group> rootNode, unsigned int outdoorShadowCastingMask, unsigned int indoorShadowCastingMask, unsigned int worldMask, Shader::ShaderManager &shaderManager) : mShadowedScene(new osgShadow::ShadowedScene),
-        mShadowTechnique(new MWShadowTechnique),
-        mOutdoorShadowCastingMask(outdoorShadowCastingMask),
-        mIndoorShadowCastingMask(indoorShadowCastingMask)
+    ShadowManager::ShadowManager(osg::ref_ptr<osg::Group> sceneRoot, osg::ref_ptr<osg::Group> rootNode,
+        unsigned int outdoorShadowCastingMask, unsigned int indoorShadowCastingMask, unsigned int worldMask,
+        Shader::ShaderManager& shaderManager)
+        : mShadowedScene(new osgShadow::ShadowedScene)
+        , mShadowTechnique(new MWShadowTechnique)
+        , mOutdoorShadowCastingMask(outdoorShadowCastingMask)
+        , mIndoorShadowCastingMask(indoorShadowCastingMask)
     {
         mShadowedScene->setShadowTechnique(mShadowTechnique);
         Stereo::Manager::instance().setShadowTechnique(mShadowTechnique);
@@ -134,20 +146,27 @@ namespace SceneUtil
         for (unsigned int i = 0; i < mShadowSettings->getNumShadowMapsPerLight(); ++i)
             definesWithShadows["shadow_texture_unit_list"] += std::to_string(i) + ",";
         // remove extra comma
-        definesWithShadows["shadow_texture_unit_list"] = definesWithShadows["shadow_texture_unit_list"].substr(0, definesWithShadows["shadow_texture_unit_list"].length() - 1);
+        definesWithShadows["shadow_texture_unit_list"] = definesWithShadows["shadow_texture_unit_list"].substr(
+            0, definesWithShadows["shadow_texture_unit_list"].length() - 1);
 
-        definesWithShadows["shadowMapsOverlap"] = Settings::Manager::getBool("allow shadow map overlap", "Shadows") ? "1" : "0";
+        definesWithShadows["shadowMapsOverlap"]
+            = Settings::Manager::getBool("allow shadow map overlap", "Shadows") ? "1" : "0";
 
-        definesWithShadows["useShadowDebugOverlay"] = Settings::Manager::getBool("enable debug overlay", "Shadows") ? "1" : "0";
+        definesWithShadows["useShadowDebugOverlay"]
+            = Settings::Manager::getBool("enable debug overlay", "Shadows") ? "1" : "0";
 
         // switch this to reading settings if it's ever exposed to the user
-        definesWithShadows["perspectiveShadowMaps"] = mShadowSettings->getShadowMapProjectionHint() == ShadowSettings::PERSPECTIVE_SHADOW_MAP ? "1" : "0";
+        definesWithShadows["perspectiveShadowMaps"]
+            = mShadowSettings->getShadowMapProjectionHint() == ShadowSettings::PERSPECTIVE_SHADOW_MAP ? "1" : "0";
 
-        definesWithShadows["disableNormalOffsetShadows"] = Settings::Manager::getFloat("normal offset distance", "Shadows") == 0.0 ? "1" : "0";
+        definesWithShadows["disableNormalOffsetShadows"]
+            = Settings::Manager::getFloat("normal offset distance", "Shadows") == 0.0 ? "1" : "0";
 
-        definesWithShadows["shadowNormalOffset"] = std::to_string(Settings::Manager::getFloat("normal offset distance", "Shadows"));
+        definesWithShadows["shadowNormalOffset"]
+            = std::to_string(Settings::Manager::getFloat("normal offset distance", "Shadows"));
 
-        definesWithShadows["limitShadowMapDistance"] = Settings::Manager::getFloat("maximum shadow map distance", "Shadows") > 0 ? "1" : "0";
+        definesWithShadows["limitShadowMapDistance"]
+            = Settings::Manager::getFloat("maximum shadow map distance", "Shadows") > 0 ? "1" : "0";
 
         return definesWithShadows;
     }
diff --git a/components/sceneutil/shadow.hpp b/components/sceneutil/shadow.hpp
index 4c34944f4a..c969ca331f 100644
--- a/components/sceneutil/shadow.hpp
+++ b/components/sceneutil/shadow.hpp
@@ -24,7 +24,9 @@ namespace SceneUtil
 
         static Shader::ShaderManager::DefineMap getShadowsDisabledDefines();
 
-        ShadowManager(osg::ref_ptr<osg::Group> sceneRoot, osg::ref_ptr<osg::Group> rootNode, unsigned int outdoorShadowCastingMask, unsigned int indoorShadowCastingMask, unsigned int worldMask, Shader::ShaderManager &shaderManager);
+        ShadowManager(osg::ref_ptr<osg::Group> sceneRoot, osg::ref_ptr<osg::Group> rootNode,
+            unsigned int outdoorShadowCastingMask, unsigned int indoorShadowCastingMask, unsigned int worldMask,
+            Shader::ShaderManager& shaderManager);
         ~ShadowManager();
 
         void setupShadowSettings();
@@ -34,6 +36,7 @@ namespace SceneUtil
         void enableIndoorMode();
 
         void enableOutdoorMode();
+
     protected:
         bool mEnableShadows;
 
@@ -46,4 +49,4 @@ namespace SceneUtil
     };
 }
 
-#endif //COMPONENTS_SCENEUTIL_SHADOW_H
+#endif // COMPONENTS_SCENEUTIL_SHADOW_H
diff --git a/components/sceneutil/shadowsbin.cpp b/components/sceneutil/shadowsbin.cpp
index 3e933cbb98..dd03879e8c 100644
--- a/components/sceneutil/shadowsbin.cpp
+++ b/components/sceneutil/shadowsbin.cpp
@@ -1,10 +1,10 @@
 #include "shadowsbin.hpp"
-#include <unordered_set>
-#include <osg/StateSet>
 #include <osg/AlphaFunc>
 #include <osg/Material>
 #include <osg/Program>
+#include <osg/StateSet>
 #include <osgUtil/StateGraph>
+#include <unordered_set>
 
 using namespace osgUtil;
 
@@ -13,7 +13,8 @@ namespace
     template <typename T>
     inline void accumulateState(T& currentValue, T newValue, bool& isOverride, unsigned int overrideFlags)
     {
-        if (isOverride && !(overrideFlags & osg::StateAttribute::PROTECTED)) return;
+        if (isOverride && !(overrideFlags & osg::StateAttribute::PROTECTED))
+            return;
 
         if (overrideFlags & osg::StateAttribute::OVERRIDE)
             isOverride = true;
@@ -42,176 +43,185 @@ namespace
 namespace SceneUtil
 {
 
-ShadowsBin::ShadowsBin(const CastingPrograms& castingPrograms)
-{
-    mNoTestStateSet = new osg::StateSet;
-    mNoTestStateSet->addUniform(new osg::Uniform("useDiffuseMapForShadowAlpha", false));
-    mNoTestStateSet->addUniform(new osg::Uniform("alphaTestShadows", false));
+    ShadowsBin::ShadowsBin(const CastingPrograms& castingPrograms)
+    {
+        mNoTestStateSet = new osg::StateSet;
+        mNoTestStateSet->addUniform(new osg::Uniform("useDiffuseMapForShadowAlpha", false));
+        mNoTestStateSet->addUniform(new osg::Uniform("alphaTestShadows", false));
 
-    mShaderAlphaTestStateSet = new osg::StateSet;
-    mShaderAlphaTestStateSet->addUniform(new osg::Uniform("alphaTestShadows", true));
-    mShaderAlphaTestStateSet->addUniform(new osg::Uniform("useDiffuseMapForShadowAlpha", true));
-    mShaderAlphaTestStateSet->setMode(GL_BLEND, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED | osg::StateAttribute::OVERRIDE);
+        mShaderAlphaTestStateSet = new osg::StateSet;
+        mShaderAlphaTestStateSet->addUniform(new osg::Uniform("alphaTestShadows", true));
+        mShaderAlphaTestStateSet->addUniform(new osg::Uniform("useDiffuseMapForShadowAlpha", true));
+        mShaderAlphaTestStateSet->setMode(
+            GL_BLEND, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED | osg::StateAttribute::OVERRIDE);
 
-    for (size_t i = 0; i < castingPrograms.size(); ++i)
-    {
-        mAlphaFuncShaders[i] = new osg::StateSet;
-        mAlphaFuncShaders[i]->setAttribute(castingPrograms[i], osg::StateAttribute::ON | osg::StateAttribute::PROTECTED | osg::StateAttribute::OVERRIDE);
+        for (size_t i = 0; i < castingPrograms.size(); ++i)
+        {
+            mAlphaFuncShaders[i] = new osg::StateSet;
+            mAlphaFuncShaders[i]->setAttribute(castingPrograms[i],
+                osg::StateAttribute::ON | osg::StateAttribute::PROTECTED | osg::StateAttribute::OVERRIDE);
+        }
     }
-}
 
-StateGraph* ShadowsBin::cullStateGraph(StateGraph* sg, StateGraph* root, std::unordered_set<StateGraph*>& uninterestingCache, bool cullFaceOverridden)
-{
-    std::vector<StateGraph*> return_path;
-    State state;
-    StateGraph* sg_new = sg;
-    do
+    StateGraph* ShadowsBin::cullStateGraph(
+        StateGraph* sg, StateGraph* root, std::unordered_set<StateGraph*>& uninterestingCache, bool cullFaceOverridden)
     {
-        if (uninterestingCache.find(sg_new) != uninterestingCache.end())
-            break;
-        return_path.push_back(sg_new);
-        sg_new = sg_new->_parent;
-    } while (sg_new && sg_new != root);
+        std::vector<StateGraph*> return_path;
+        State state;
+        StateGraph* sg_new = sg;
+        do
+        {
+            if (uninterestingCache.find(sg_new) != uninterestingCache.end())
+                break;
+            return_path.push_back(sg_new);
+            sg_new = sg_new->_parent;
+        } while (sg_new && sg_new != root);
 
-    for(auto itr=return_path.rbegin(); itr!=return_path.rend(); ++itr)
-    {
-        const osg::StateSet* ss = (*itr)->getStateSet();
-        if (!ss)
-            continue;
+        for (auto itr = return_path.rbegin(); itr != return_path.rend(); ++itr)
+        {
+            const osg::StateSet* ss = (*itr)->getStateSet();
+            if (!ss)
+                continue;
 
-        accumulateModeState(ss, state.mAlphaBlend, state.mAlphaBlendOverride, GL_BLEND);
+            accumulateModeState(ss, state.mAlphaBlend, state.mAlphaBlendOverride, GL_BLEND);
 
-        const osg::StateSet::AttributeList& attributes = ss->getAttributeList();
-        osg::StateSet::AttributeList::const_iterator found = attributes.find(std::make_pair(osg::StateAttribute::MATERIAL, 0));
-        if (found != attributes.end())
-        {
-            const osg::StateSet::RefAttributePair& rap = found->second;
-            accumulateState(state.mMaterial, static_cast<osg::Material*>(rap.first.get()), state.mMaterialOverride, rap.second);
-            if (state.mMaterial && !materialNeedShadows(state.mMaterial))
-                state.mMaterial = nullptr;
+            const osg::StateSet::AttributeList& attributes = ss->getAttributeList();
+            osg::StateSet::AttributeList::const_iterator found
+                = attributes.find(std::make_pair(osg::StateAttribute::MATERIAL, 0));
+            if (found != attributes.end())
+            {
+                const osg::StateSet::RefAttributePair& rap = found->second;
+                accumulateState(
+                    state.mMaterial, static_cast<osg::Material*>(rap.first.get()), state.mMaterialOverride, rap.second);
+                if (state.mMaterial && !materialNeedShadows(state.mMaterial))
+                    state.mMaterial = nullptr;
+            }
+
+            found = attributes.find(std::make_pair(osg::StateAttribute::ALPHAFUNC, 0));
+            if (found != attributes.end())
+            {
+                // As force shaders is on, we know this is really a RemovedAlphaFunc
+                const osg::StateSet::RefAttributePair& rap = found->second;
+                accumulateState(state.mAlphaFunc, static_cast<osg::AlphaFunc*>(rap.first.get()),
+                    state.mAlphaFuncOverride, rap.second);
+            }
+
+            if (!cullFaceOverridden)
+            {
+                // osg::FrontFace specifies triangle winding, not front-face culling. We can't safely reparent anything
+                // under it unless GL_CULL_FACE is off or we flip face culling.
+                found = attributes.find(std::make_pair(osg::StateAttribute::FRONTFACE, 0));
+                if (found != attributes.end())
+                    state.mImportantState = true;
+            }
+
+            if ((*itr) != sg && !state.interesting())
+                uninterestingCache.insert(*itr);
         }
 
-        found = attributes.find(std::make_pair(osg::StateAttribute::ALPHAFUNC, 0));
-        if (found != attributes.end())
+        if (!state.needShadows())
+            return nullptr;
+
+        if (!state.needTexture() && !state.mImportantState)
         {
-            // As force shaders is on, we know this is really a RemovedAlphaFunc
-            const osg::StateSet::RefAttributePair& rap = found->second;
-            accumulateState(state.mAlphaFunc, static_cast<osg::AlphaFunc*>(rap.first.get()), state.mAlphaFuncOverride, rap.second);
+            for (RenderLeaf* leaf : sg->_leaves)
+            {
+                leaf->_parent = root;
+                root->_leaves.push_back(leaf);
+            }
+            return nullptr;
         }
 
-        if (!cullFaceOverridden)
+        if (state.mAlphaBlend)
         {
-            // osg::FrontFace specifies triangle winding, not front-face culling. We can't safely reparent anything under it unless GL_CULL_FACE is off or we flip face culling.
-            found = attributes.find(std::make_pair(osg::StateAttribute::FRONTFACE, 0));
-            if (found != attributes.end())
-                state.mImportantState = true;
+            sg_new = sg->find_or_insert(mShaderAlphaTestStateSet);
+            sg_new->_leaves = std::move(sg->_leaves);
+            for (RenderLeaf* leaf : sg_new->_leaves)
+                leaf->_parent = sg_new;
+            sg = sg_new;
         }
 
-        if ((*itr) != sg && !state.interesting())
-            uninterestingCache.insert(*itr);
-    }
-
-    if (!state.needShadows())
-        return nullptr;
-
-    if (!state.needTexture() && !state.mImportantState)
-    {
-        for (RenderLeaf* leaf : sg->_leaves)
+        // GL_ALWAYS is set by default by mwshadowtechnique
+        if (state.mAlphaFunc && state.mAlphaFunc->getFunction() != GL_ALWAYS)
         {
-            leaf->_parent = root;
-            root->_leaves.push_back(leaf);
+            sg_new = sg->find_or_insert(mAlphaFuncShaders[state.mAlphaFunc->getFunction() - GL_NEVER]);
+            sg_new->_leaves = std::move(sg->_leaves);
+            for (RenderLeaf* leaf : sg_new->_leaves)
+                leaf->_parent = sg_new;
+            sg = sg_new;
         }
-        return nullptr;
+
+        return sg;
     }
 
-    if (state.mAlphaBlend)
+    inline bool ShadowsBin::State::needTexture() const
     {
-        sg_new = sg->find_or_insert(mShaderAlphaTestStateSet);
-        sg_new->_leaves = std::move(sg->_leaves);
-        for (RenderLeaf* leaf : sg_new->_leaves)
-            leaf->_parent = sg_new;
-        sg = sg_new;
+        return mAlphaBlend || (mAlphaFunc && mAlphaFunc->getFunction() != GL_ALWAYS);
     }
 
-    // GL_ALWAYS is set by default by mwshadowtechnique
-    if (state.mAlphaFunc && state.mAlphaFunc->getFunction() != GL_ALWAYS)
+    bool ShadowsBin::State::needShadows() const
     {
-        sg_new = sg->find_or_insert(mAlphaFuncShaders[state.mAlphaFunc->getFunction() - GL_NEVER]);
-        sg_new->_leaves = std::move(sg->_leaves);
-        for (RenderLeaf* leaf : sg_new->_leaves)
-            leaf->_parent = sg_new;
-        sg = sg_new;
+        if (mAlphaFunc && mAlphaFunc->getFunction() == GL_NEVER)
+            return false;
+        // other alpha func + material combinations might be skippable
+        if (mAlphaBlend && mMaterial)
+            return materialNeedShadows(mMaterial);
+        return true;
     }
 
-    return sg;
-}
-
-inline bool ShadowsBin::State::needTexture() const
-{
-    return mAlphaBlend || (mAlphaFunc && mAlphaFunc->getFunction() != GL_ALWAYS);
-}
-
-bool ShadowsBin::State::needShadows() const
-{
-    if (mAlphaFunc && mAlphaFunc->getFunction() == GL_NEVER)
-        return false;
-    // other alpha func + material combinations might be skippable
-    if (mAlphaBlend && mMaterial)
-        return materialNeedShadows(mMaterial);
-    return true;
-}
-
-void ShadowsBin::sortImplementation()
-{
-    // The cull visitor contains a stategraph.
-    // When a stateset is pushed, it's added/found as a child of the current stategraph node, then that node becomes the new current stategraph node.
-    // When a drawable is added, the current stategraph node is added to the current renderbin (if it's not there already) and the drawable is added as a renderleaf to the stategraph
-    // This means our list only contains stategraph nodes with directly-attached renderleaves, but they might have parents with more state set that needs to be considered.
-    if (!_stateGraphList.size())
-        return;
-    StateGraph* root = _stateGraphList[0];
-    while (root->_parent)
+    void ShadowsBin::sortImplementation()
     {
-        root = root->_parent;
-        const osg::StateSet* ss = root->getStateSet();
-        if (ss->getMode(GL_NORMALIZE) & osg::StateAttribute::ON // that is root stategraph of renderingmanager cpp
-           || ss->getAttribute(osg::StateAttribute::VIEWPORT)) // fallback to rendertarget's sg just in case
-            break;
-        if (!root->_parent)
+        // The cull visitor contains a stategraph.
+        // When a stateset is pushed, it's added/found as a child of the current stategraph node, then that node becomes
+        // the new current stategraph node. When a drawable is added, the current stategraph node is added to the
+        // current renderbin (if it's not there already) and the drawable is added as a renderleaf to the stategraph
+        // This means our list only contains stategraph nodes with directly-attached renderleaves, but they might have
+        // parents with more state set that needs to be considered.
+        if (!_stateGraphList.size())
             return;
-    }
-    StateGraph* noTestRoot = root->find_or_insert(mNoTestStateSet.get());
-    // noTestRoot is now a stategraph with useDiffuseMapForShadowAlpha disabled but minimal other state
+        StateGraph* root = _stateGraphList[0];
+        while (root->_parent)
+        {
+            root = root->_parent;
+            const osg::StateSet* ss = root->getStateSet();
+            if (ss->getMode(GL_NORMALIZE) & osg::StateAttribute::ON // that is root stategraph of renderingmanager cpp
+                || ss->getAttribute(osg::StateAttribute::VIEWPORT)) // fallback to rendertarget's sg just in case
+                break;
+            if (!root->_parent)
+                return;
+        }
+        StateGraph* noTestRoot = root->find_or_insert(mNoTestStateSet.get());
+        // noTestRoot is now a stategraph with useDiffuseMapForShadowAlpha disabled but minimal other state
 
-    bool cullFaceOverridden = false;
-    while (root->_parent)
-    {
-        root = root->_parent;
-        if (!root->getStateSet())
-            continue;
-        unsigned int cullFaceFlags = root->getStateSet()->getMode(GL_CULL_FACE);
-        if (cullFaceFlags & osg::StateAttribute::OVERRIDE && !(cullFaceFlags & osg::StateAttribute::ON))
+        bool cullFaceOverridden = false;
+        while (root->_parent)
         {
-            cullFaceOverridden = true;
-            break;
+            root = root->_parent;
+            if (!root->getStateSet())
+                continue;
+            unsigned int cullFaceFlags = root->getStateSet()->getMode(GL_CULL_FACE);
+            if (cullFaceFlags & osg::StateAttribute::OVERRIDE && !(cullFaceFlags & osg::StateAttribute::ON))
+            {
+                cullFaceOverridden = true;
+                break;
+            }
         }
-    }
 
-    noTestRoot->_leaves.reserve(_stateGraphList.size());
-    StateGraphList newList;
-    std::unordered_set<StateGraph*> uninterestingCache;
-    for (StateGraph* graph : _stateGraphList)
-    {
-        // Render leaves which shouldn't use the diffuse map for shadow alpha but do cast shadows become children of root, so graph is now empty. Don't add to newList.
-        // Graphs containing just render leaves which don't cast shadows are discarded. Don't add to newList.
-        // Graphs containing other leaves need to be in newList.
-        StateGraph* graphToAdd = cullStateGraph(graph, noTestRoot, uninterestingCache, cullFaceOverridden);
-        if (graphToAdd)
-            newList.push_back(graphToAdd);
+        noTestRoot->_leaves.reserve(_stateGraphList.size());
+        StateGraphList newList;
+        std::unordered_set<StateGraph*> uninterestingCache;
+        for (StateGraph* graph : _stateGraphList)
+        {
+            // Render leaves which shouldn't use the diffuse map for shadow alpha but do cast shadows become children of
+            // root, so graph is now empty. Don't add to newList. Graphs containing just render leaves which don't cast
+            // shadows are discarded. Don't add to newList. Graphs containing other leaves need to be in newList.
+            StateGraph* graphToAdd = cullStateGraph(graph, noTestRoot, uninterestingCache, cullFaceOverridden);
+            if (graphToAdd)
+                newList.push_back(graphToAdd);
+        }
+        if (!noTestRoot->_leaves.empty())
+            newList.push_back(noTestRoot);
+        _stateGraphList = std::move(newList);
     }
-    if (!noTestRoot->_leaves.empty())
-        newList.push_back(noTestRoot);
-    _stateGraphList = std::move(newList);
-}
 
 }
diff --git a/components/sceneutil/shadowsbin.hpp b/components/sceneutil/shadowsbin.hpp
index 2c838d509e..4e5e19ee1f 100644
--- a/components/sceneutil/shadowsbin.hpp
+++ b/components/sceneutil/shadowsbin.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SCENEUTIL_SHADOWBIN_H
 #define OPENMW_COMPONENTS_SCENEUTIL_SHADOWBIN_H
 #include <array>
-#include <unordered_set>
 #include <osgUtil/RenderBin>
+#include <unordered_set>
 
 namespace osg
 {
@@ -28,7 +28,8 @@ namespace SceneUtil
             , mNoTestStateSet(rhs.mNoTestStateSet)
             , mShaderAlphaTestStateSet(rhs.mShaderAlphaTestStateSet)
             , mAlphaFuncShaders(rhs.mAlphaFuncShaders)
-            {}
+        {
+        }
 
         void sortImplementation() override;
 
@@ -42,7 +43,8 @@ namespace SceneUtil
                 , mMaterial(nullptr)
                 , mMaterialOverride(false)
                 , mImportantState(false)
-                {}
+            {
+            }
 
             bool mAlphaBlend;
             bool mAlphaBlendOverride;
@@ -56,11 +58,13 @@ namespace SceneUtil
             // A state is interesting if there's anything about it that might affect whether we can optimise child state
             bool interesting() const
             {
-                return !needShadows() || needTexture() || mAlphaBlendOverride || mAlphaFuncOverride || mMaterialOverride || mImportantState;
+                return !needShadows() || needTexture() || mAlphaBlendOverride || mAlphaFuncOverride || mMaterialOverride
+                    || mImportantState;
             }
         };
 
-        osgUtil::StateGraph* cullStateGraph(osgUtil::StateGraph* sg, osgUtil::StateGraph* root, std::unordered_set<osgUtil::StateGraph*>& uninteresting, bool cullFaceOverridden);
+        osgUtil::StateGraph* cullStateGraph(osgUtil::StateGraph* sg, osgUtil::StateGraph* root,
+            std::unordered_set<osgUtil::StateGraph*>& uninteresting, bool cullFaceOverridden);
 
     private:
         ShadowsBin() {}
diff --git a/components/sceneutil/skeleton.cpp b/components/sceneutil/skeleton.cpp
index f319a63587..f5221f028a 100644
--- a/components/sceneutil/skeleton.cpp
+++ b/components/sceneutil/skeleton.cpp
@@ -10,170 +10,168 @@
 namespace SceneUtil
 {
 
-class InitBoneCacheVisitor : public osg::NodeVisitor
-{
-public:
-    typedef std::vector<osg::MatrixTransform*> TransformPath;
-    InitBoneCacheVisitor(std::unordered_map<std::string, TransformPath>& cache)
-        : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-        , mCache(cache)
+    class InitBoneCacheVisitor : public osg::NodeVisitor
     {
-    }
+    public:
+        typedef std::vector<osg::MatrixTransform*> TransformPath;
+        InitBoneCacheVisitor(std::unordered_map<std::string, TransformPath>& cache)
+            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+            , mCache(cache)
+        {
+        }
+
+        void apply(osg::MatrixTransform& node) override
+        {
+            mPath.push_back(&node);
+            mCache[Misc::StringUtils::lowerCase(node.getName())] = mPath;
+            traverse(node);
+            mPath.pop_back();
+        }
 
-    void apply(osg::MatrixTransform &node) override
+    private:
+        TransformPath mPath;
+        std::unordered_map<std::string, TransformPath>& mCache;
+    };
+
+    Skeleton::Skeleton()
+        : mBoneCacheInit(false)
+        , mNeedToUpdateBoneMatrices(true)
+        , mActive(Active)
+        , mLastFrameNumber(0)
+        , mLastCullFrameNumber(0)
     {
-        mPath.push_back(&node);
-        mCache[Misc::StringUtils::lowerCase(node.getName())] = mPath;
-        traverse(node);
-        mPath.pop_back();
     }
 
-private:
-    TransformPath mPath;
-    std::unordered_map<std::string, TransformPath>& mCache;
-};
-
-Skeleton::Skeleton()
-    : mBoneCacheInit(false)
-    , mNeedToUpdateBoneMatrices(true)
-    , mActive(Active)
-    , mLastFrameNumber(0)
-    , mLastCullFrameNumber(0)
-{
-
-}
-
-Skeleton::Skeleton(const Skeleton &copy, const osg::CopyOp &copyop)
-    : osg::Group(copy, copyop)
-    , mBoneCacheInit(false)
-    , mNeedToUpdateBoneMatrices(true)
-    , mActive(copy.mActive)
-    , mLastFrameNumber(0)
-    , mLastCullFrameNumber(0)
-{
-
-}
-
-Bone* Skeleton::getBone(const std::string &name)
-{
-    if (!mBoneCacheInit)
+    Skeleton::Skeleton(const Skeleton& copy, const osg::CopyOp& copyop)
+        : osg::Group(copy, copyop)
+        , mBoneCacheInit(false)
+        , mNeedToUpdateBoneMatrices(true)
+        , mActive(copy.mActive)
+        , mLastFrameNumber(0)
+        , mLastCullFrameNumber(0)
     {
-        InitBoneCacheVisitor visitor(mBoneCache);
-        accept(visitor);
-        mBoneCacheInit = true;
     }
 
-    BoneCache::iterator found = mBoneCache.find(Misc::StringUtils::lowerCase(name));
-    if (found == mBoneCache.end())
-        return nullptr;
+    Bone* Skeleton::getBone(const std::string& name)
+    {
+        if (!mBoneCacheInit)
+        {
+            InitBoneCacheVisitor visitor(mBoneCache);
+            accept(visitor);
+            mBoneCacheInit = true;
+        }
 
-    // find or insert in the bone hierarchy
+        BoneCache::iterator found = mBoneCache.find(Misc::StringUtils::lowerCase(name));
+        if (found == mBoneCache.end())
+            return nullptr;
 
-    if (!mRootBone.get())
-    {
-        mRootBone = std::make_unique<Bone>();
-    }
+        // find or insert in the bone hierarchy
 
-    Bone* bone = mRootBone.get();
-    for (osg::MatrixTransform* matrixTransform : found->second)
-    {
-        const auto it = std::find_if(bone->mChildren.begin(), bone->mChildren.end(),
-                                     [&] (const auto& v) { return v->mNode == matrixTransform; });
+        if (!mRootBone.get())
+        {
+            mRootBone = std::make_unique<Bone>();
+        }
 
-        if (it == bone->mChildren.end())
+        Bone* bone = mRootBone.get();
+        for (osg::MatrixTransform* matrixTransform : found->second)
         {
-            bone = bone->mChildren.emplace_back(std::make_unique<Bone>()).get();
-            mNeedToUpdateBoneMatrices = true;
+            const auto it = std::find_if(bone->mChildren.begin(), bone->mChildren.end(),
+                [&](const auto& v) { return v->mNode == matrixTransform; });
+
+            if (it == bone->mChildren.end())
+            {
+                bone = bone->mChildren.emplace_back(std::make_unique<Bone>()).get();
+                mNeedToUpdateBoneMatrices = true;
+            }
+            else
+                bone = it->get();
+
+            bone->mNode = matrixTransform;
         }
-        else
-            bone = it->get();
 
-        bone->mNode = matrixTransform;
+        return bone;
     }
 
-    return bone;
-}
-
-void Skeleton::updateBoneMatrices(unsigned int traversalNumber)
-{
-    if (traversalNumber != mLastFrameNumber)
-        mNeedToUpdateBoneMatrices = true;
+    void Skeleton::updateBoneMatrices(unsigned int traversalNumber)
+    {
+        if (traversalNumber != mLastFrameNumber)
+            mNeedToUpdateBoneMatrices = true;
 
-    mLastFrameNumber = traversalNumber;
+        mLastFrameNumber = traversalNumber;
 
-    if (mNeedToUpdateBoneMatrices)
-    {
-        if (mRootBone.get())
+        if (mNeedToUpdateBoneMatrices)
         {
-            for (const auto& child : mRootBone->mChildren)
-                child->update(nullptr);
-        }
+            if (mRootBone.get())
+            {
+                for (const auto& child : mRootBone->mChildren)
+                    child->update(nullptr);
+            }
 
-        mNeedToUpdateBoneMatrices = false;
+            mNeedToUpdateBoneMatrices = false;
+        }
     }
-}
 
-void Skeleton::setActive(ActiveType active)
-{
-    mActive = active;
-}
-
-bool Skeleton::getActive() const
-{
-    return mActive != Inactive;
-}
+    void Skeleton::setActive(ActiveType active)
+    {
+        mActive = active;
+    }
 
-void Skeleton::markDirty()
-{
-    mLastFrameNumber = 0;
-    mBoneCache.clear();
-    mBoneCacheInit = false;
-}
+    bool Skeleton::getActive() const
+    {
+        return mActive != Inactive;
+    }
 
-void Skeleton::traverse(osg::NodeVisitor& nv)
-{
-    if (nv.getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR)
+    void Skeleton::markDirty()
     {
-        if (mActive == Inactive && mLastFrameNumber != 0)
-            return;
-        if (mActive == SemiActive && mLastFrameNumber != 0 && mLastCullFrameNumber+3 <= nv.getTraversalNumber())
-            return;
+        mLastFrameNumber = 0;
+        mBoneCache.clear();
+        mBoneCacheInit = false;
     }
-    else if (nv.getVisitorType() == osg::NodeVisitor::CULL_VISITOR)
-        mLastCullFrameNumber = nv.getTraversalNumber();
 
-    osg::Group::traverse(nv);
-}
+    void Skeleton::traverse(osg::NodeVisitor& nv)
+    {
+        if (nv.getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR)
+        {
+            if (mActive == Inactive && mLastFrameNumber != 0)
+                return;
+            if (mActive == SemiActive && mLastFrameNumber != 0 && mLastCullFrameNumber + 3 <= nv.getTraversalNumber())
+                return;
+        }
+        else if (nv.getVisitorType() == osg::NodeVisitor::CULL_VISITOR)
+            mLastCullFrameNumber = nv.getTraversalNumber();
 
-void Skeleton::childInserted(unsigned int)
-{
-    markDirty();
-}
+        osg::Group::traverse(nv);
+    }
 
-void Skeleton::childRemoved(unsigned int, unsigned int)
-{
-    markDirty();
-}
+    void Skeleton::childInserted(unsigned int)
+    {
+        markDirty();
+    }
 
-Bone::Bone()
-    : mNode(nullptr)
-{
-}
+    void Skeleton::childRemoved(unsigned int, unsigned int)
+    {
+        markDirty();
+    }
 
-void Bone::update(const osg::Matrixf* parentMatrixInSkeletonSpace)
-{
-    if (!mNode)
+    Bone::Bone()
+        : mNode(nullptr)
     {
-        Log(Debug::Error) << "Error: Bone without node";
-        return;
     }
-    if (parentMatrixInSkeletonSpace)
-        mMatrixInSkeletonSpace = mNode->getMatrix() * (*parentMatrixInSkeletonSpace);
-    else
-        mMatrixInSkeletonSpace = mNode->getMatrix();
 
-    for (const auto& child : mChildren)
-        child->update(&mMatrixInSkeletonSpace);
-}
+    void Bone::update(const osg::Matrixf* parentMatrixInSkeletonSpace)
+    {
+        if (!mNode)
+        {
+            Log(Debug::Error) << "Error: Bone without node";
+            return;
+        }
+        if (parentMatrixInSkeletonSpace)
+            mMatrixInSkeletonSpace = mNode->getMatrix() * (*parentMatrixInSkeletonSpace);
+        else
+            mMatrixInSkeletonSpace = mNode->getMatrix();
+
+        for (const auto& child : mChildren)
+            child->update(&mMatrixInSkeletonSpace);
+    }
 
 }
diff --git a/components/sceneutil/skeleton.hpp b/components/sceneutil/skeleton.hpp
index 7ca4887999..b141c1e0d6 100644
--- a/components/sceneutil/skeleton.hpp
+++ b/components/sceneutil/skeleton.hpp
@@ -37,15 +37,15 @@ namespace SceneUtil
 
         META_Node(SceneUtil, Skeleton)
 
-        /// Retrieve a bone by name.
-        Bone* getBone(const std::string& name);
+            /// Retrieve a bone by name.
+            Bone* getBone(const std::string& name);
 
         /// Request an update of bone matrices. May be a no-op if already updated in this frame.
         void updateBoneMatrices(unsigned int traversalNumber);
 
         enum ActiveType
         {
-            Inactive=0,
+            Inactive = 0,
             SemiActive, /// Like Active, but don't bother with Update (including new bounding box) if we're off-screen
             Active
         };
@@ -68,7 +68,7 @@ namespace SceneUtil
         // As far as the scene graph goes we support multiple root bones.
         std::unique_ptr<Bone> mRootBone;
 
-        typedef std::unordered_map<std::string, std::vector<osg::MatrixTransform*> > BoneCache;
+        typedef std::unordered_map<std::string, std::vector<osg::MatrixTransform*>> BoneCache;
         BoneCache mBoneCache;
         bool mBoneCacheInit;
 
diff --git a/components/sceneutil/statesetupdater.cpp b/components/sceneutil/statesetupdater.cpp
index 9778cf4852..7bb65798cd 100644
--- a/components/sceneutil/statesetupdater.cpp
+++ b/components/sceneutil/statesetupdater.cpp
@@ -25,7 +25,9 @@ namespace SceneUtil
         {
             for (int i = 0; i < 2; ++i)
             {
-                mStateSetsUpdate[i] = new osg::StateSet(*node->getOrCreateStateSet(), osg::CopyOp::SHALLOW_COPY); // Using SHALLOW_COPY for StateAttributes, if users want to modify it is their responsibility to set a non-shared one first in setDefaults
+                mStateSetsUpdate[i] = new osg::StateSet(*node->getOrCreateStateSet(),
+                    osg::CopyOp::SHALLOW_COPY); // Using SHALLOW_COPY for StateAttributes, if users want to modify it is
+                                                // their responsibility to set a non-shared one first in setDefaults
                 setDefaults(mStateSetsUpdate[i]);
             }
         }
@@ -35,7 +37,7 @@ namespace SceneUtil
         node->setStateSet(stateset);
         traverse(node, nv);
     }
-    
+
     void StateSetUpdater::applyCull(osg::Node* node, osgUtil::CullVisitor* cv)
     {
         auto stateset = getCvDependentStateset(cv);
@@ -71,37 +73,33 @@ namespace SceneUtil
         mStateSetsCull.clear();
     }
 
-    StateSetUpdater::StateSetUpdater()
-    {
-    }
+    StateSetUpdater::StateSetUpdater() {}
 
-    StateSetUpdater::StateSetUpdater(const StateSetUpdater &copy, const osg::CopyOp &copyop)
+    StateSetUpdater::StateSetUpdater(const StateSetUpdater& copy, const osg::CopyOp& copyop)
         : SceneUtil::NodeCallback<StateSetUpdater>(copy, copyop)
     {
     }
 
     // ----------------------------------------------------------------------------------
 
-    void CompositeStateSetUpdater::apply(osg::StateSet *stateset, osg::NodeVisitor *nv)
+    void CompositeStateSetUpdater::apply(osg::StateSet* stateset, osg::NodeVisitor* nv)
     {
-        for (unsigned int i=0; i<mCtrls.size(); ++i)
+        for (unsigned int i = 0; i < mCtrls.size(); ++i)
             mCtrls[i]->apply(stateset, nv);
     }
 
-    void CompositeStateSetUpdater::setDefaults(osg::StateSet *stateset)
+    void CompositeStateSetUpdater::setDefaults(osg::StateSet* stateset)
     {
-        for (unsigned int i=0; i<mCtrls.size(); ++i)
+        for (unsigned int i = 0; i < mCtrls.size(); ++i)
             mCtrls[i]->setDefaults(stateset);
     }
 
-    CompositeStateSetUpdater::CompositeStateSetUpdater()
-    {
-    }
+    CompositeStateSetUpdater::CompositeStateSetUpdater() {}
 
-    CompositeStateSetUpdater::CompositeStateSetUpdater(const CompositeStateSetUpdater &copy, const osg::CopyOp &copyop)
+    CompositeStateSetUpdater::CompositeStateSetUpdater(const CompositeStateSetUpdater& copy, const osg::CopyOp& copyop)
         : StateSetUpdater(copy, copyop)
     {
-        for (unsigned int i=0; i<copy.mCtrls.size(); ++i)
+        for (unsigned int i = 0; i < copy.mCtrls.size(); ++i)
             mCtrls.emplace_back(osg::clone(copy.mCtrls[i].get(), copyop));
     }
 
@@ -115,7 +113,7 @@ namespace SceneUtil
         return mCtrls[i];
     }
 
-    void CompositeStateSetUpdater::addController(StateSetUpdater *ctrl)
+    void CompositeStateSetUpdater::addController(StateSetUpdater* ctrl)
     {
         mCtrls.emplace_back(ctrl);
     }
diff --git a/components/sceneutil/statesetupdater.hpp b/components/sceneutil/statesetupdater.hpp
index fb8a9c2fc9..261721e3d6 100644
--- a/components/sceneutil/statesetupdater.hpp
+++ b/components/sceneutil/statesetupdater.hpp
@@ -3,8 +3,8 @@
 
 #include <components/sceneutil/nodecallback.hpp>
 
-#include <map>
 #include <array>
+#include <map>
 
 namespace osgUtil
 {
@@ -19,15 +19,20 @@ namespace SceneUtil
     ///     queues up a StateSet that we want to modify for the next frame. To solve this we could set the StateSet to
     ///     DYNAMIC data variance but that would undo all the benefits of the threading model - having the cull and draw
     ///     traversals run in parallel can yield up to 200% framerates.
-    /// @par Must be set as UpdateCallback or CullCallback on a Node. If set as a CullCallback, the StateSetUpdater operates on an empty StateSet, 
+    /// @par Must be set as UpdateCallback or CullCallback on a Node. If set as a CullCallback, the StateSetUpdater
+    /// operates on an empty StateSet,
     ///     otherwise it operates on a clone of the node's existing StateSet.
-    /// @par If set as an UpdateCallback, race conditions are prevented using a "double buffering" scheme - we have two StateSets that take turns,
+    /// @par If set as an UpdateCallback, race conditions are prevented using a "double buffering" scheme - we have two
+    /// StateSets that take turns,
     ///     one StateSet we can write to, the second one is currently in use by the draw traversal of the last frame.
-    /// @par If set as a CullCallback, race conditions are prevented by mapping statesets to cull visitors - OSG has two cull visitors that take turns,
+    /// @par If set as a CullCallback, race conditions are prevented by mapping statesets to cull visitors - OSG has two
+    /// cull visitors that take turns,
     ///     allowing the updater to automatically scale for the number of views.
-    /// @note When used as a CullCallback, StateSetUpdater will have no effect on leaf nodes such as osg::Geometry and must be used on branch nodes only.
+    /// @note When used as a CullCallback, StateSetUpdater will have no effect on leaf nodes such as osg::Geometry and
+    /// must be used on branch nodes only.
     /// @note Do not add the same StateSetUpdater to multiple nodes.
-    /// @note Do not add multiple StateSetUpdaters on the same Node as they will conflict - instead use the CompositeStateSetUpdater.
+    /// @note Do not add multiple StateSetUpdaters on the same Node as they will conflict - instead use the
+    /// CompositeStateSetUpdater.
     class StateSetUpdater : public SceneUtil::NodeCallback<StateSetUpdater>
     {
     public:
@@ -41,15 +46,17 @@ namespace SceneUtil
         /// even if it has not changed since the last frame.
         virtual void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) {}
 
-        /// Apply any state specific to the Left view. Default implementation does nothing. Called after apply() \note requires the updater be a cull callback
+        /// Apply any state specific to the Left view. Default implementation does nothing. Called after apply() \note
+        /// requires the updater be a cull callback
         virtual void applyLeft(osg::StateSet* stateset, osgUtil::CullVisitor* nv) {}
-        /// Apply any state specific to the Right view. Default implementation does nothing. Called after apply() \note requires the updater be a cull callback
+        /// Apply any state specific to the Right view. Default implementation does nothing. Called after apply() \note
+        /// requires the updater be a cull callback
         virtual void applyRight(osg::StateSet* stateset, osgUtil::CullVisitor* nv) {}
 
         /// Set default state - optionally override in derived classes
         /// @par May be used e.g. to allocate StateAttributes.
         virtual void setDefaults(osg::StateSet* stateset) {}
-    
+
         /// Reset mStateSets, forcing a setDefaults() on the next frame. Can be used to change the defaults if needed.
         void reset();
 
@@ -62,7 +69,8 @@ namespace SceneUtil
         std::map<osgUtil::CullVisitor*, osg::ref_ptr<osg::StateSet>> mStateSetsCull;
     };
 
-    /// @brief A variant of the StateSetController that can be made up of multiple controllers all controlling the same target.
+    /// @brief A variant of the StateSetController that can be made up of multiple controllers all controlling the same
+    /// target.
     class CompositeStateSetUpdater : public StateSetUpdater
     {
     public:
@@ -79,10 +87,9 @@ namespace SceneUtil
         void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override;
 
     protected:
+        void setDefaults(osg::StateSet* stateset) override;
 
-        void setDefaults(osg::StateSet *stateset) override;
-
-        std::vector<osg::ref_ptr<StateSetUpdater> > mCtrls;
+        std::vector<osg::ref_ptr<StateSetUpdater>> mCtrls;
     };
 
 }
diff --git a/components/sceneutil/textkeymap.hpp b/components/sceneutil/textkeymap.hpp
index 019c7eb1f2..934c0946e5 100644
--- a/components/sceneutil/textkeymap.hpp
+++ b/components/sceneutil/textkeymap.hpp
@@ -14,35 +14,17 @@ namespace SceneUtil
     public:
         using ConstIterator = std::multimap<float, std::string>::const_iterator;
 
-        auto begin() const noexcept
-        {
-            return mTextKeyByTime.begin();
-        }
+        auto begin() const noexcept { return mTextKeyByTime.begin(); }
 
-        auto end() const noexcept
-        {
-            return mTextKeyByTime.end();
-        }
+        auto end() const noexcept { return mTextKeyByTime.end(); }
 
-        auto rbegin() const noexcept
-        {
-            return mTextKeyByTime.rbegin();
-        }
+        auto rbegin() const noexcept { return mTextKeyByTime.rbegin(); }
 
-        auto rend() const noexcept
-        {
-            return mTextKeyByTime.rend();
-        }
+        auto rend() const noexcept { return mTextKeyByTime.rend(); }
 
-        auto lowerBound(float time) const
-        {
-            return mTextKeyByTime.lower_bound(time);
-        }
+        auto lowerBound(float time) const { return mTextKeyByTime.lower_bound(time); }
 
-        auto upperBound(float time) const
-        {
-            return mTextKeyByTime.upper_bound(time);
-        }
+        auto upperBound(float time) const { return mTextKeyByTime.upper_bound(time); }
 
         void emplace(float time, std::string&& textKey)
         {
@@ -53,30 +35,24 @@ namespace SceneUtil
             mTextKeyByTime.emplace(time, std::move(textKey));
         }
 
-        bool empty() const noexcept
-        {
-            return mTextKeyByTime.empty();
-        }
+        bool empty() const noexcept { return mTextKeyByTime.empty(); }
 
         auto findGroupStart(std::string_view groupName) const
         {
-            return std::find_if(mTextKeyByTime.begin(), mTextKeyByTime.end(), IsGroupStart{groupName});
+            return std::find_if(mTextKeyByTime.begin(), mTextKeyByTime.end(), IsGroupStart{ groupName });
         }
 
-        bool hasGroupStart(std::string_view groupName) const
-        {
-            return mGroups.count(groupName) > 0;
-        }
+        bool hasGroupStart(std::string_view groupName) const { return mGroups.count(groupName) > 0; }
 
     private:
         struct IsGroupStart
         {
             std::string_view mGroupName;
 
-            bool operator ()(const std::multimap<float, std::string>::value_type& value) const
+            bool operator()(const std::multimap<float, std::string>::value_type& value) const
             {
-                return value.second.compare(0, mGroupName.size(), mGroupName) == 0 &&
-                        value.second.compare(mGroupName.size(), 2, ": ") == 0;
+                return value.second.compare(0, mGroupName.size(), mGroupName) == 0
+                    && value.second.compare(mGroupName.size(), 2, ": ") == 0;
             }
         };
 
diff --git a/components/sceneutil/unrefqueue.cpp b/components/sceneutil/unrefqueue.cpp
index 57697e153c..394f74c5b0 100644
--- a/components/sceneutil/unrefqueue.cpp
+++ b/components/sceneutil/unrefqueue.cpp
@@ -9,7 +9,9 @@ namespace SceneUtil
             std::vector<osg::ref_ptr<osg::Referenced>> mObjects;
 
             explicit ClearVector(std::vector<osg::ref_ptr<osg::Referenced>>&& objects)
-                : mObjects(std::move(objects)) {}
+                : mObjects(std::move(objects))
+            {
+            }
 
             void doWork() override { mObjects.clear(); }
         };
diff --git a/components/sceneutil/unrefqueue.hpp b/components/sceneutil/unrefqueue.hpp
index b2fdbc480a..55b01f3a3d 100644
--- a/components/sceneutil/unrefqueue.hpp
+++ b/components/sceneutil/unrefqueue.hpp
@@ -3,8 +3,8 @@
 
 #include "workqueue.hpp"
 
-#include <osg/ref_ptr>
 #include <osg/Referenced>
+#include <osg/ref_ptr>
 
 #include <vector>
 
diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp
index b533d805e3..17e4aa9008 100644
--- a/components/sceneutil/util.cpp
+++ b/components/sceneutil/util.cpp
@@ -1,16 +1,16 @@
 #include "util.hpp"
 
 #include <algorithm>
-#include <sstream>
 #include <iomanip>
+#include <sstream>
 
+#include <osg/FrameBufferObject>
 #include <osg/Node>
 #include <osg/NodeVisitor>
-#include <osg/TexGen>
 #include <osg/TexEnvCombine>
-#include <osg/FrameBufferObject>
-#include <osgUtil/RenderStage>
+#include <osg/TexGen>
 #include <osgUtil/CullVisitor>
+#include <osgUtil/RenderStage>
 
 #include <components/resource/imagemanager.hpp>
 #include <components/resource/scenemanager.hpp>
@@ -19,251 +19,260 @@
 namespace SceneUtil
 {
 
-class FindLowestUnusedTexUnitVisitor : public osg::NodeVisitor
-{
-public:
-    FindLowestUnusedTexUnitVisitor()
-        : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-        , mLowestUnusedTexUnit(0)
+    class FindLowestUnusedTexUnitVisitor : public osg::NodeVisitor
     {
-    }
+    public:
+        FindLowestUnusedTexUnitVisitor()
+            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+            , mLowestUnusedTexUnit(0)
+        {
+        }
 
-    void apply(osg::Node& node) override
-    {
-        if (osg::StateSet* stateset = node.getStateSet())
-            mLowestUnusedTexUnit = std::max(mLowestUnusedTexUnit, int(stateset->getTextureAttributeList().size()));
+        void apply(osg::Node& node) override
+        {
+            if (osg::StateSet* stateset = node.getStateSet())
+                mLowestUnusedTexUnit = std::max(mLowestUnusedTexUnit, int(stateset->getTextureAttributeList().size()));
 
-        traverse(node);
+            traverse(node);
+        }
+        int mLowestUnusedTexUnit;
+    };
+
+    GlowUpdater::GlowUpdater(int texUnit, const osg::Vec4f& color,
+        const std::vector<osg::ref_ptr<osg::Texture2D>>& textures, osg::Node* node, float duration,
+        Resource::ResourceSystem* resourcesystem)
+        : mTexUnit(texUnit)
+        , mColor(color)
+        , mOriginalColor(color)
+        , mTextures(textures)
+        , mNode(node)
+        , mDuration(duration)
+        , mOriginalDuration(duration)
+        , mStartingTime(0)
+        , mResourceSystem(resourcesystem)
+        , mColorChanged(false)
+        , mDone(false)
+    {
     }
-    int mLowestUnusedTexUnit;
-};
-
-GlowUpdater::GlowUpdater(int texUnit, const osg::Vec4f& color, const std::vector<osg::ref_ptr<osg::Texture2D> >& textures,
-    osg::Node* node, float duration, Resource::ResourceSystem* resourcesystem)
-    : mTexUnit(texUnit)
-    , mColor(color)
-    , mOriginalColor(color)
-    , mTextures(textures)
-    , mNode(node)
-    , mDuration(duration)
-    , mOriginalDuration(duration)
-    , mStartingTime(0)
-    , mResourceSystem(resourcesystem)
-    , mColorChanged(false)
-    , mDone(false)
-{
-}
 
-void GlowUpdater::setDefaults(osg::StateSet *stateset)
-{
-    if (mDone)
-        removeTexture(stateset);
-    else
+    void GlowUpdater::setDefaults(osg::StateSet* stateset)
     {
-        stateset->setTextureMode(mTexUnit, GL_TEXTURE_2D, osg::StateAttribute::ON);
-        osg::TexGen* texGen = new osg::TexGen;
-        texGen->setMode(osg::TexGen::SPHERE_MAP);
-
-        stateset->setTextureAttributeAndModes(mTexUnit, texGen, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-
-        osg::TexEnvCombine* texEnv = new osg::TexEnvCombine;
-        texEnv->setSource0_RGB(osg::TexEnvCombine::CONSTANT);
-        texEnv->setConstantColor(mColor);
-        texEnv->setCombine_RGB(osg::TexEnvCombine::INTERPOLATE);
-        texEnv->setSource2_RGB(osg::TexEnvCombine::TEXTURE);
-        texEnv->setOperand2_RGB(osg::TexEnvCombine::SRC_COLOR);
-
-        stateset->setTextureAttributeAndModes(mTexUnit, texEnv, osg::StateAttribute::ON);
-        stateset->addUniform(new osg::Uniform("envMapColor", mColor));
+        if (mDone)
+            removeTexture(stateset);
+        else
+        {
+            stateset->setTextureMode(mTexUnit, GL_TEXTURE_2D, osg::StateAttribute::ON);
+            osg::TexGen* texGen = new osg::TexGen;
+            texGen->setMode(osg::TexGen::SPHERE_MAP);
+
+            stateset->setTextureAttributeAndModes(
+                mTexUnit, texGen, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+
+            osg::TexEnvCombine* texEnv = new osg::TexEnvCombine;
+            texEnv->setSource0_RGB(osg::TexEnvCombine::CONSTANT);
+            texEnv->setConstantColor(mColor);
+            texEnv->setCombine_RGB(osg::TexEnvCombine::INTERPOLATE);
+            texEnv->setSource2_RGB(osg::TexEnvCombine::TEXTURE);
+            texEnv->setOperand2_RGB(osg::TexEnvCombine::SRC_COLOR);
+
+            stateset->setTextureAttributeAndModes(mTexUnit, texEnv, osg::StateAttribute::ON);
+            stateset->addUniform(new osg::Uniform("envMapColor", mColor));
+        }
     }
-}
 
-void GlowUpdater::removeTexture(osg::StateSet* stateset)
-{
-    stateset->removeTextureAttribute(mTexUnit, osg::StateAttribute::TEXTURE);
-    stateset->removeTextureAttribute(mTexUnit, osg::StateAttribute::TEXGEN);
-    stateset->removeTextureAttribute(mTexUnit, osg::StateAttribute::TEXENV);
-    stateset->removeTextureMode(mTexUnit, GL_TEXTURE_2D);
-    stateset->removeUniform("envMapColor");
-
-    osg::StateSet::TextureAttributeList& list = stateset->getTextureAttributeList();
-    while (list.size() && list.rbegin()->empty())
-        list.pop_back();
-}
-
-void GlowUpdater::apply(osg::StateSet *stateset, osg::NodeVisitor *nv)
-{
-    if (mColorChanged){
-        this->reset();
-        setDefaults(stateset);
-        mColorChanged = false;
+    void GlowUpdater::removeTexture(osg::StateSet* stateset)
+    {
+        stateset->removeTextureAttribute(mTexUnit, osg::StateAttribute::TEXTURE);
+        stateset->removeTextureAttribute(mTexUnit, osg::StateAttribute::TEXGEN);
+        stateset->removeTextureAttribute(mTexUnit, osg::StateAttribute::TEXENV);
+        stateset->removeTextureMode(mTexUnit, GL_TEXTURE_2D);
+        stateset->removeUniform("envMapColor");
+
+        osg::StateSet::TextureAttributeList& list = stateset->getTextureAttributeList();
+        while (list.size() && list.rbegin()->empty())
+            list.pop_back();
     }
-    if (mDone)
-        return;
-
-    // Set the starting time to measure glow duration from if this is a temporary glow
-    if ((mDuration >= 0) && mStartingTime == 0)
-        mStartingTime = nv->getFrameStamp()->getSimulationTime();
-
-    float time = nv->getFrameStamp()->getSimulationTime();
-    int index = (int)(time*16) % mTextures.size();
-    stateset->setTextureAttribute(mTexUnit, mTextures[index], osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
 
-    if ((mDuration >= 0) && (time - mStartingTime > mDuration)) // If this is a temporary glow and it has finished its duration
+    void GlowUpdater::apply(osg::StateSet* stateset, osg::NodeVisitor* nv)
     {
-        if (mOriginalDuration >= 0) // if this glowupdater was a temporary glow since its creation
+        if (mColorChanged)
         {
-            removeTexture(stateset);
             this->reset();
-            mDone = true;
-            // normally done in StateSetUpdater::operator(), but needs doing here so the shader visitor sees the right StateSet
-            mNode->setStateSet(stateset);
-            mResourceSystem->getSceneManager()->recreateShaders(mNode);
+            setDefaults(stateset);
+            mColorChanged = false;
         }
-        if (mOriginalDuration < 0) // if this glowupdater was originally a permanent glow
+        if (mDone)
+            return;
+
+        // Set the starting time to measure glow duration from if this is a temporary glow
+        if ((mDuration >= 0) && mStartingTime == 0)
+            mStartingTime = nv->getFrameStamp()->getSimulationTime();
+
+        float time = nv->getFrameStamp()->getSimulationTime();
+        int index = (int)(time * 16) % mTextures.size();
+        stateset->setTextureAttribute(
+            mTexUnit, mTextures[index], osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+
+        if ((mDuration >= 0)
+            && (time - mStartingTime > mDuration)) // If this is a temporary glow and it has finished its duration
         {
-            mDuration = mOriginalDuration;
-            mStartingTime = 0;
-            mColor = mOriginalColor;
-            this->reset();
-            setDefaults(stateset);
+            if (mOriginalDuration >= 0) // if this glowupdater was a temporary glow since its creation
+            {
+                removeTexture(stateset);
+                this->reset();
+                mDone = true;
+                // normally done in StateSetUpdater::operator(), but needs doing here so the shader visitor sees the
+                // right StateSet
+                mNode->setStateSet(stateset);
+                mResourceSystem->getSceneManager()->recreateShaders(mNode);
+            }
+            if (mOriginalDuration < 0) // if this glowupdater was originally a permanent glow
+            {
+                mDuration = mOriginalDuration;
+                mStartingTime = 0;
+                mColor = mOriginalColor;
+                this->reset();
+                setDefaults(stateset);
+            }
         }
     }
-}
 
-bool GlowUpdater::isPermanentGlowUpdater()
-{
-    return (mDuration < 0);
-}
+    bool GlowUpdater::isPermanentGlowUpdater()
+    {
+        return (mDuration < 0);
+    }
 
-bool GlowUpdater::isDone()
-{
-    return mDone;
-}
+    bool GlowUpdater::isDone()
+    {
+        return mDone;
+    }
 
-void GlowUpdater::setColor(const osg::Vec4f& color)
-{
-    mColor = color;
-    mColorChanged = true;
-}
+    void GlowUpdater::setColor(const osg::Vec4f& color)
+    {
+        mColor = color;
+        mColorChanged = true;
+    }
 
-void GlowUpdater::setDuration(float duration)
-{
-    mDuration = duration;
-}
+    void GlowUpdater::setDuration(float duration)
+    {
+        mDuration = duration;
+    }
 
-osg::Vec4f colourFromRGB(unsigned int clr)
-{
-    osg::Vec4f colour(((clr >> 0) & 0xFF) / 255.0f,
-                      ((clr >> 8) & 0xFF) / 255.0f,
-                      ((clr >> 16) & 0xFF) / 255.0f, 1.f);
-    return colour;
-}
+    osg::Vec4f colourFromRGB(unsigned int clr)
+    {
+        osg::Vec4f colour(
+            ((clr >> 0) & 0xFF) / 255.0f, ((clr >> 8) & 0xFF) / 255.0f, ((clr >> 16) & 0xFF) / 255.0f, 1.f);
+        return colour;
+    }
 
-osg::Vec4f colourFromRGBA(unsigned int value)
-{
-    return osg::Vec4f(makeOsgColorComponent(value, 0), makeOsgColorComponent(value, 8),
-                      makeOsgColorComponent(value, 16), makeOsgColorComponent(value, 24));
-}
+    osg::Vec4f colourFromRGBA(unsigned int value)
+    {
+        return osg::Vec4f(makeOsgColorComponent(value, 0), makeOsgColorComponent(value, 8),
+            makeOsgColorComponent(value, 16), makeOsgColorComponent(value, 24));
+    }
 
-float makeOsgColorComponent(unsigned int value, unsigned int shift)
-{
-    return float((value >> shift) & 0xFFu) / 255.0f;
-}
+    float makeOsgColorComponent(unsigned int value, unsigned int shift)
+    {
+        return float((value >> shift) & 0xFFu) / 255.0f;
+    }
+
+    bool hasUserDescription(const osg::Node* node, std::string_view pattern)
+    {
+        if (node == nullptr)
+            return false;
+
+        const osg::UserDataContainer* udc = node->getUserDataContainer();
+        if (udc && udc->getNumDescriptions() > 0)
+        {
+            for (auto& descr : udc->getDescriptions())
+            {
+                if (descr == pattern)
+                    return true;
+            }
+        }
 
-bool hasUserDescription(const osg::Node* node, std::string_view pattern)
-{
-    if (node == nullptr)
         return false;
+    }
 
-    const osg::UserDataContainer* udc = node->getUserDataContainer();
-    if (udc && udc->getNumDescriptions() > 0)
+    osg::ref_ptr<GlowUpdater> addEnchantedGlow(osg::ref_ptr<osg::Node> node, Resource::ResourceSystem* resourceSystem,
+        const osg::Vec4f& glowColor, float glowDuration)
     {
-        for (auto& descr : udc->getDescriptions())
+        std::vector<osg::ref_ptr<osg::Texture2D>> textures;
+        for (int i = 0; i < 32; ++i)
         {
-            if (descr == pattern)
-                return true;
+            std::stringstream stream;
+            stream << "textures/magicitem/caust";
+            stream << std::setw(2);
+            stream << std::setfill('0');
+            stream << i;
+            stream << ".dds";
+
+            osg::ref_ptr<osg::Image> image = resourceSystem->getImageManager()->getImage(stream.str());
+            osg::ref_ptr<osg::Texture2D> tex(new osg::Texture2D(image));
+            tex->setName("envMap");
+            tex->setWrap(osg::Texture::WRAP_S, osg::Texture2D::REPEAT);
+            tex->setWrap(osg::Texture::WRAP_T, osg::Texture2D::REPEAT);
+            resourceSystem->getSceneManager()->applyFilterSettings(tex);
+            textures.push_back(tex);
         }
-    }
 
-    return false;
-}
+        FindLowestUnusedTexUnitVisitor findLowestUnusedTexUnitVisitor;
+        node->accept(findLowestUnusedTexUnitVisitor);
+        int texUnit = findLowestUnusedTexUnitVisitor.mLowestUnusedTexUnit;
 
-osg::ref_ptr<GlowUpdater> addEnchantedGlow(osg::ref_ptr<osg::Node> node, Resource::ResourceSystem* resourceSystem, const osg::Vec4f& glowColor, float glowDuration)
-{
-    std::vector<osg::ref_ptr<osg::Texture2D> > textures;
-    for (int i=0; i<32; ++i)
-    {
-        std::stringstream stream;
-        stream << "textures/magicitem/caust";
-        stream << std::setw(2);
-        stream << std::setfill('0');
-        stream << i;
-        stream << ".dds";
-
-        osg::ref_ptr<osg::Image> image = resourceSystem->getImageManager()->getImage(stream.str());
-        osg::ref_ptr<osg::Texture2D> tex (new osg::Texture2D(image));
-        tex->setName("envMap");
-        tex->setWrap(osg::Texture::WRAP_S, osg::Texture2D::REPEAT);
-        tex->setWrap(osg::Texture::WRAP_T, osg::Texture2D::REPEAT);
-        resourceSystem->getSceneManager()->applyFilterSettings(tex);
-        textures.push_back(tex);
-    }
+        osg::ref_ptr<GlowUpdater> glowUpdater
+            = new GlowUpdater(texUnit, glowColor, textures, node, glowDuration, resourceSystem);
+        node->addUpdateCallback(glowUpdater);
 
-    FindLowestUnusedTexUnitVisitor findLowestUnusedTexUnitVisitor;
-    node->accept(findLowestUnusedTexUnitVisitor);
-    int texUnit = findLowestUnusedTexUnitVisitor.mLowestUnusedTexUnit;
+        // set a texture now so that the ShaderVisitor can find it
+        osg::ref_ptr<osg::StateSet> writableStateSet = nullptr;
+        if (!node->getStateSet())
+            writableStateSet = node->getOrCreateStateSet();
+        else
+        {
+            writableStateSet = new osg::StateSet(*node->getStateSet(), osg::CopyOp::SHALLOW_COPY);
+            node->setStateSet(writableStateSet);
+        }
+        writableStateSet->setTextureAttributeAndModes(texUnit, textures.front(), osg::StateAttribute::ON);
+        writableStateSet->addUniform(new osg::Uniform("envMapColor", glowColor));
+        resourceSystem->getSceneManager()->recreateShaders(node);
 
-    osg::ref_ptr<GlowUpdater> glowUpdater = new GlowUpdater(texUnit, glowColor, textures, node, glowDuration, resourceSystem);
-    node->addUpdateCallback(glowUpdater);
+        return glowUpdater;
+    }
 
-    // set a texture now so that the ShaderVisitor can find it
-    osg::ref_ptr<osg::StateSet> writableStateSet = nullptr;
-    if (!node->getStateSet())
-        writableStateSet = node->getOrCreateStateSet();
-    else
+    bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::Camera::BufferComponent buffer,
+        osg::Texture* texture, unsigned int level, unsigned int face, bool mipMapGeneration)
     {
-        writableStateSet = new osg::StateSet(*node->getStateSet(), osg::CopyOp::SHALLOW_COPY);
-        node->setStateSet(writableStateSet);
+        unsigned int samples = 0;
+        unsigned int colourSamples = 0;
+        bool addMSAAIntermediateTarget = Settings::Manager::getBool("antialias alpha test", "Shaders")
+            && Settings::Manager::getInt("antialiasing", "Video") > 1;
+        if (addMSAAIntermediateTarget)
+        {
+            // Alpha-to-coverage requires a multisampled framebuffer.
+            // OSG will set that up automatically and resolve it to the specified single-sample texture for us.
+            // For some reason, two samples are needed, at least with some drivers.
+            samples = 2;
+            colourSamples = 1;
+        }
+        camera->attach(buffer, texture, level, face, mipMapGeneration, samples, colourSamples);
+        return addMSAAIntermediateTarget;
     }
-    writableStateSet->setTextureAttributeAndModes(texUnit, textures.front(), osg::StateAttribute::ON);
-    writableStateSet->addUniform(new osg::Uniform("envMapColor", glowColor));
-    resourceSystem->getSceneManager()->recreateShaders(node);
 
-    return glowUpdater;
-}
-
-bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::Camera::BufferComponent buffer, osg::Texture * texture, unsigned int level, unsigned int face, bool mipMapGeneration)
-{
-    unsigned int samples = 0;
-    unsigned int colourSamples = 0;
-    bool addMSAAIntermediateTarget = Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1;
-    if (addMSAAIntermediateTarget)
+    OperationSequence::OperationSequence(bool keep)
+        : Operation("OperationSequence", keep)
+        , mOperationQueue(new osg::OperationQueue())
     {
-        // Alpha-to-coverage requires a multisampled framebuffer.
-        // OSG will set that up automatically and resolve it to the specified single-sample texture for us.
-        // For some reason, two samples are needed, at least with some drivers.
-        samples = 2;
-        colourSamples = 1;
     }
-    camera->attach(buffer, texture, level, face, mipMapGeneration, samples, colourSamples);
-    return addMSAAIntermediateTarget;
-}
-
-OperationSequence::OperationSequence(bool keep)
-    : Operation("OperationSequence", keep)
-    , mOperationQueue(new osg::OperationQueue())
-{
-}
 
-void OperationSequence::operator()(osg::Object* object)
-{
-    mOperationQueue->runOperations(object);
-}
+    void OperationSequence::operator()(osg::Object* object)
+    {
+        mOperationQueue->runOperations(object);
+    }
 
-void OperationSequence::add(osg::Operation* operation)
-{
-    mOperationQueue->add(operation);
-}
+    void OperationSequence::add(osg::Operation* operation)
+    {
+        mOperationQueue->add(operation);
+    }
 
 }
diff --git a/components/sceneutil/util.hpp b/components/sceneutil/util.hpp
index 5494198252..76cb9a4e55 100644
--- a/components/sceneutil/util.hpp
+++ b/components/sceneutil/util.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_COMPONENTS_SCENEUTIL_UTIL_H
 #define OPENMW_COMPONENTS_SCENEUTIL_UTIL_H
 
-#include <osg/Matrix>
 #include <osg/BoundingSphere>
 #include <osg/Camera>
+#include <osg/Matrix>
 #include <osg/Texture2D>
 #include <osg/Vec4f>
 
@@ -16,13 +16,13 @@ namespace SceneUtil
     class GlowUpdater : public SceneUtil::StateSetUpdater
     {
     public:
-        GlowUpdater(int texUnit, const osg::Vec4f& color, const std::vector<osg::ref_ptr<osg::Texture2D> >& textures,
+        GlowUpdater(int texUnit, const osg::Vec4f& color, const std::vector<osg::ref_ptr<osg::Texture2D>>& textures,
             osg::Node* node, float duration, Resource::ResourceSystem* resourcesystem);
 
-        void setDefaults(osg::StateSet *stateset) override;
+        void setDefaults(osg::StateSet* stateset) override;
 
         void removeTexture(osg::StateSet* stateset);
-        void apply(osg::StateSet *stateset, osg::NodeVisitor *nv) override;
+        void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override;
 
         bool isPermanentGlowUpdater();
 
@@ -35,11 +35,13 @@ namespace SceneUtil
     private:
         int mTexUnit;
         osg::Vec4f mColor;
-        osg::Vec4f mOriginalColor; // for restoring the color of a permanent glow after a temporary glow on the object finishes
-        std::vector<osg::ref_ptr<osg::Texture2D> > mTextures;
+        osg::Vec4f
+            mOriginalColor; // for restoring the color of a permanent glow after a temporary glow on the object finishes
+        std::vector<osg::ref_ptr<osg::Texture2D>> mTextures;
         osg::Node* mNode;
         float mDuration;
-        float mOriginalDuration; // for recording that this is originally a permanent glow if it is changed to a temporary one
+        float mOriginalDuration; // for recording that this is originally a permanent glow if it is changed to a
+                                 // temporary one
         float mStartingTime;
         Resource::ResourceSystem* mResourceSystem;
         bool mColorChanged;
@@ -49,22 +51,22 @@ namespace SceneUtil
     // Transform a bounding sphere by a matrix
     // based off private code in osg::Transform
     // TODO: patch osg to make public
-    template<typename VT>
-    inline void transformBoundingSphere (const osg::Matrixf& matrix, osg::BoundingSphereImpl<VT>& bsphere)
+    template <typename VT>
+    inline void transformBoundingSphere(const osg::Matrixf& matrix, osg::BoundingSphereImpl<VT>& bsphere)
     {
         VT xdash = bsphere._center;
         xdash.x() += bsphere._radius;
-        xdash = xdash*matrix;
+        xdash = xdash * matrix;
 
         VT ydash = bsphere._center;
         ydash.y() += bsphere._radius;
-        ydash = ydash*matrix;
+        ydash = ydash * matrix;
 
         VT zdash = bsphere._center;
         zdash.z() += bsphere._radius;
-        zdash = zdash*matrix;
+        zdash = zdash * matrix;
 
-        bsphere._center = bsphere._center*matrix;
+        bsphere._center = bsphere._center * matrix;
 
         xdash -= bsphere._center;
         typename VT::value_type sqrlen_xdash = xdash.length2();
@@ -76,23 +78,27 @@ namespace SceneUtil
         typename VT::value_type sqrlen_zdash = zdash.length2();
 
         bsphere._radius = sqrlen_xdash;
-        if (bsphere._radius<sqrlen_ydash) bsphere._radius = sqrlen_ydash;
-        if (bsphere._radius<sqrlen_zdash) bsphere._radius = sqrlen_zdash;
+        if (bsphere._radius < sqrlen_ydash)
+            bsphere._radius = sqrlen_ydash;
+        if (bsphere._radius < sqrlen_zdash)
+            bsphere._radius = sqrlen_zdash;
         bsphere._radius = sqrtf(bsphere._radius);
     }
 
-    osg::Vec4f colourFromRGB (unsigned int clr);
+    osg::Vec4f colourFromRGB(unsigned int clr);
 
-    osg::Vec4f colourFromRGBA (unsigned int value);
+    osg::Vec4f colourFromRGBA(unsigned int value);
 
-    float makeOsgColorComponent (unsigned int value, unsigned int shift);
+    float makeOsgColorComponent(unsigned int value, unsigned int shift);
 
     bool hasUserDescription(const osg::Node* node, std::string_view pattern);
 
-    osg::ref_ptr<GlowUpdater> addEnchantedGlow(osg::ref_ptr<osg::Node> node, Resource::ResourceSystem* resourceSystem, const osg::Vec4f& glowColor, float glowDuration=-1);
+    osg::ref_ptr<GlowUpdater> addEnchantedGlow(osg::ref_ptr<osg::Node> node, Resource::ResourceSystem* resourceSystem,
+        const osg::Vec4f& glowColor, float glowDuration = -1);
 
     // Alpha-to-coverage requires a multisampled framebuffer, so we need to set that up for RTTs
-    bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::Camera::BufferComponent buffer, osg::Texture* texture, unsigned int level = 0, unsigned int face = 0, bool mipMapGeneration = false);
+    bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::Camera::BufferComponent buffer,
+        osg::Texture* texture, unsigned int level = 0, unsigned int face = 0, bool mipMapGeneration = false);
 
     class OperationSequence : public osg::Operation
     {
@@ -102,6 +108,7 @@ namespace SceneUtil
         void operator()(osg::Object* object) override;
 
         void add(osg::Operation* operation);
+
     protected:
         osg::ref_ptr<osg::OperationQueue> mOperationQueue;
     };
diff --git a/components/sceneutil/visitor.cpp b/components/sceneutil/visitor.cpp
index e3530d2c3b..aadbf35af8 100644
--- a/components/sceneutil/visitor.cpp
+++ b/components/sceneutil/visitor.cpp
@@ -14,7 +14,7 @@
 namespace SceneUtil
 {
 
-    bool FindByNameVisitor::checkGroup(osg::Group &group)
+    bool FindByNameVisitor::checkGroup(osg::Group& group)
     {
         if (Misc::StringUtils::ciEqual(group.getName(), mNameToFind))
         {
@@ -24,7 +24,7 @@ namespace SceneUtil
         return false;
     }
 
-    void FindByClassVisitor::apply(osg::Node &node)
+    void FindByClassVisitor::apply(osg::Node& node)
     {
         if (Misc::StringUtils::ciEqual(node.className(), mNameToFind))
             mFoundNodes.push_back(&node);
@@ -32,21 +32,19 @@ namespace SceneUtil
         traverse(node);
     }
 
-    void FindByNameVisitor::apply(osg::Group &group)
+    void FindByNameVisitor::apply(osg::Group& group)
     {
         if (!mFoundNode && !checkGroup(group))
             traverse(group);
     }
 
-    void FindByNameVisitor::apply(osg::MatrixTransform &node)
+    void FindByNameVisitor::apply(osg::MatrixTransform& node)
     {
         if (!mFoundNode && !checkGroup(node))
             traverse(node);
     }
 
-    void FindByNameVisitor::apply(osg::Geometry&)
-    {
-    }
+    void FindByNameVisitor::apply(osg::Geometry&) {}
 
     void NodeMapVisitor::apply(osg::MatrixTransform& trans)
     {
@@ -55,7 +53,8 @@ namespace SceneUtil
         if (trans.libraryName() == std::string_view("osgAnimation"))
         {
             std::string nodeName = trans.getName();
-            // Convert underscores to whitespaces as a workaround for Collada (OpenMW's animation system uses whitespace-separated names)
+            // Convert underscores to whitespaces as a workaround for Collada (OpenMW's animation system uses
+            // whitespace-separated names)
             std::replace(nodeName.begin(), nodeName.end(), '_', ' ');
             mMap.emplace(nodeName, &trans);
         }
@@ -107,7 +106,7 @@ namespace SceneUtil
 
     void CleanObjectRootVisitor::applyDrawable(osg::Node& node)
     {
-        osg::NodePath::iterator parent = getNodePath().end()-2;
+        osg::NodePath::iterator parent = getNodePath().end() - 2;
         // We know that the parent is a Group because only Groups can have children.
         osg::Group* parentGroup = static_cast<osg::Group*>(*parent);
 
@@ -146,7 +145,7 @@ namespace SceneUtil
     {
         if (Misc::StringUtils::ciStartsWith(node.getName(), "tri bip"))
         {
-            osg::Group* parent = static_cast<osg::Group*>(*(getNodePath().end()-2));
+            osg::Group* parent = static_cast<osg::Group*>(*(getNodePath().end() - 2));
             // Not safe to remove in apply(), since the visitor is still iterating the child list
             mToRemove.emplace_back(&node, parent);
         }
diff --git a/components/sceneutil/visitor.hpp b/components/sceneutil/visitor.hpp
index 66c628bcd3..3e3df4d4b3 100644
--- a/components/sceneutil/visitor.hpp
+++ b/components/sceneutil/visitor.hpp
@@ -44,17 +44,19 @@ namespace SceneUtil
         {
         }
 
-        void apply(osg::Node &node) override;
+        void apply(osg::Node& node) override;
 
         std::string_view mNameToFind;
-        std::vector<osg::Node *> mFoundNodes;
+        std::vector<osg::Node*> mFoundNodes;
     };
 
     /// Maps names to nodes
     class NodeMapVisitor : public osg::NodeVisitor
     {
     public:
-        typedef std::unordered_map<std::string, osg::ref_ptr<osg::MatrixTransform>, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual> NodeMap;
+        typedef std::unordered_map<std::string, osg::ref_ptr<osg::MatrixTransform>, Misc::StringUtils::CiHash,
+            Misc::StringUtils::CiEqual>
+            NodeMap;
 
         NodeMapVisitor(NodeMap& map)
             : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN)
@@ -83,8 +85,8 @@ namespace SceneUtil
 
     protected:
         // <node to remove, parent node to remove it from>
-        typedef std::vector<std::pair<osg::Node*, osg::Group*> > RemoveVec;
-        std::vector<std::pair<osg::Node*, osg::Group*> > mToRemove;
+        typedef std::vector<std::pair<osg::Node*, osg::Group*>> RemoveVec;
+        std::vector<std::pair<osg::Node*, osg::Group*>> mToRemove;
     };
 
     // Removes all drawables from a graph.
diff --git a/components/sceneutil/waterutil.cpp b/components/sceneutil/waterutil.cpp
index 10a0d4e885..7e739945aa 100644
--- a/components/sceneutil/waterutil.cpp
+++ b/components/sceneutil/waterutil.cpp
@@ -12,24 +12,24 @@ namespace SceneUtil
     // disable nonsense test against a worldsize bb what will always pass
     class WaterBoundCallback : public osg::Drawable::ComputeBoundingBoxCallback
     {
-         osg::BoundingBox computeBound(const osg::Drawable&) const override { return osg::BoundingBox(); }
+        osg::BoundingBox computeBound(const osg::Drawable&) const override { return osg::BoundingBox(); }
     };
 
     osg::ref_ptr<osg::Geometry> createWaterGeometry(float size, int segments, float textureRepeats)
     {
-        osg::ref_ptr<osg::Vec3Array> verts (new osg::Vec3Array);
-        osg::ref_ptr<osg::Vec2Array> texcoords (new osg::Vec2Array);
+        osg::ref_ptr<osg::Vec3Array> verts(new osg::Vec3Array);
+        osg::ref_ptr<osg::Vec2Array> texcoords(new osg::Vec2Array);
 
         // some drivers don't like huge triangles, so we do some subdivisons
         // a paged solution would be even better
-        const float step = size/segments;
+        const float step = size / segments;
         const float texCoordStep = textureRepeats / segments;
-        for (int x=0; x<segments; ++x)
+        for (int x = 0; x < segments; ++x)
         {
-            for (int y=0; y<segments; ++y)
+            for (int y = 0; y < segments; ++y)
             {
-                float x1 = -size/2.f + x*step;
-                float y1 = -size/2.f + y*step;
+                float x1 = -size / 2.f + x * step;
+                float y1 = -size / 2.f + y * step;
                 float x2 = x1 + step;
                 float y2 = y1 + step;
 
@@ -38,8 +38,8 @@ namespace SceneUtil
                 verts->push_back(osg::Vec3f(x2, y1, 0.f));
                 verts->push_back(osg::Vec3f(x2, y2, 0.f));
 
-                float u1 = x*texCoordStep;
-                float v1 = y*texCoordStep;
+                float u1 = x * texCoordStep;
+                float v1 = y * texCoordStep;
                 float u2 = u1 + texCoordStep;
                 float v2 = v1 + texCoordStep;
 
@@ -50,15 +50,15 @@ namespace SceneUtil
             }
         }
 
-        osg::ref_ptr<osg::Geometry> waterGeom (new osg::Geometry);
+        osg::ref_ptr<osg::Geometry> waterGeom(new osg::Geometry);
         waterGeom->setVertexArray(verts);
         waterGeom->setTexCoordArray(0, texcoords);
 
-        osg::ref_ptr<osg::Vec3Array> normal (new osg::Vec3Array);
-        normal->push_back(osg::Vec3f(0,0,1));
+        osg::ref_ptr<osg::Vec3Array> normal(new osg::Vec3Array);
+        normal->push_back(osg::Vec3f(0, 0, 1));
         waterGeom->setNormalArray(normal, osg::Array::BIND_OVERALL);
 
-        waterGeom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::QUADS,0,verts->size()));
+        waterGeom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::QUADS, 0, verts->size()));
         waterGeom->setComputeBoundingBoxCallback(new WaterBoundCallback);
         waterGeom->setCullingActive(false);
         return waterGeom;
@@ -66,9 +66,9 @@ namespace SceneUtil
 
     osg::ref_ptr<osg::StateSet> createSimpleWaterStateSet(float alpha, int renderBin)
     {
-        osg::ref_ptr<osg::StateSet> stateset (new osg::StateSet);
+        osg::ref_ptr<osg::StateSet> stateset(new osg::StateSet);
 
-        osg::ref_ptr<osg::Material> material (new osg::Material);
+        osg::ref_ptr<osg::Material> material(new osg::Material);
         material->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 1.f));
         material->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1.f, 1.f, 1.f, alpha));
         material->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1.f, 1.f, 1.f, 1.f));
diff --git a/components/sceneutil/workqueue.cpp b/components/sceneutil/workqueue.cpp
index eb7a7b2cae..c398324aa9 100644
--- a/components/sceneutil/workqueue.cpp
+++ b/components/sceneutil/workqueue.cpp
@@ -7,139 +7,139 @@
 namespace SceneUtil
 {
 
-void WorkItem::waitTillDone()
-{
-    if (mDone)
-        return;
+    void WorkItem::waitTillDone()
+    {
+        if (mDone)
+            return;
+
+        std::unique_lock<std::mutex> lock(mMutex);
+        while (!mDone)
+        {
+            mCondition.wait(lock);
+        }
+    }
 
-    std::unique_lock<std::mutex> lock(mMutex);
-    while (!mDone)
+    void WorkItem::signalDone()
     {
-        mCondition.wait(lock);
+        {
+            std::unique_lock<std::mutex> lock(mMutex);
+            mDone = true;
+        }
+        mCondition.notify_all();
     }
-}
 
-void WorkItem::signalDone()
-{
+    bool WorkItem::isDone() const
     {
-        std::unique_lock<std::mutex> lock(mMutex);
-        mDone = true;
+        return mDone;
     }
-    mCondition.notify_all();
-}
 
-bool WorkItem::isDone() const
-{
-    return mDone;
-}
+    WorkQueue::WorkQueue(std::size_t workerThreads)
+        : mIsReleased(false)
+    {
+        start(workerThreads);
+    }
 
-WorkQueue::WorkQueue(std::size_t workerThreads)
-    : mIsReleased(false)
-{
-    start(workerThreads);
-}
+    WorkQueue::~WorkQueue()
+    {
+        stop();
+    }
 
-WorkQueue::~WorkQueue()
-{
-    stop();
-}
+    void WorkQueue::start(std::size_t workerThreads)
+    {
+        {
+            const std::lock_guard lock(mMutex);
+            mIsReleased = false;
+        }
+        while (mThreads.size() < workerThreads)
+            mThreads.emplace_back(std::make_unique<WorkThread>(*this));
+    }
 
-void WorkQueue::start(std::size_t workerThreads)
-{
+    void WorkQueue::stop()
     {
-        const std::lock_guard lock(mMutex);
-        mIsReleased = false;
+        {
+            std::unique_lock<std::mutex> lock(mMutex);
+            while (!mQueue.empty())
+                mQueue.pop_back();
+            mIsReleased = true;
+            mCondition.notify_all();
+        }
+
+        mThreads.clear();
     }
-    while (mThreads.size() < workerThreads)
-        mThreads.emplace_back(std::make_unique<WorkThread>(*this));
-}
 
-void WorkQueue::stop()
-{
+    void WorkQueue::addWorkItem(osg::ref_ptr<WorkItem> item, bool front)
     {
+        if (item->isDone())
+        {
+            Log(Debug::Error) << "Error: trying to add a work item that is already completed";
+            return;
+        }
+
         std::unique_lock<std::mutex> lock(mMutex);
-        while (!mQueue.empty())
-            mQueue.pop_back();
-        mIsReleased = true;
-        mCondition.notify_all();
+        if (front)
+            mQueue.push_front(std::move(item));
+        else
+            mQueue.push_back(std::move(item));
+        mCondition.notify_one();
     }
 
-    mThreads.clear();
-}
-
-void WorkQueue::addWorkItem(osg::ref_ptr<WorkItem> item, bool front)
-{
-    if (item->isDone())
+    osg::ref_ptr<WorkItem> WorkQueue::removeWorkItem()
     {
-        Log(Debug::Error) << "Error: trying to add a work item that is already completed";
-        return;
+        std::unique_lock<std::mutex> lock(mMutex);
+        while (mQueue.empty() && !mIsReleased)
+        {
+            mCondition.wait(lock);
+        }
+        if (!mQueue.empty())
+        {
+            osg::ref_ptr<WorkItem> item = std::move(mQueue.front());
+            mQueue.pop_front();
+            return item;
+        }
+        return nullptr;
     }
 
-    std::unique_lock<std::mutex> lock(mMutex);
-    if (front)
-        mQueue.push_front(std::move(item));
-    else
-        mQueue.push_back(std::move(item));
-    mCondition.notify_one();
-}
-
-osg::ref_ptr<WorkItem> WorkQueue::removeWorkItem()
-{
-    std::unique_lock<std::mutex> lock(mMutex);
-    while (mQueue.empty() && !mIsReleased)
+    unsigned int WorkQueue::getNumItems() const
     {
-        mCondition.wait(lock);
+        std::unique_lock<std::mutex> lock(mMutex);
+        return mQueue.size();
     }
-    if (!mQueue.empty())
+
+    unsigned int WorkQueue::getNumActiveThreads() const
     {
-        osg::ref_ptr<WorkItem> item = std::move(mQueue.front());
-        mQueue.pop_front();
-        return item;
+        return std::accumulate(
+            mThreads.begin(), mThreads.end(), 0u, [](auto r, const auto& t) { return r + t->isActive(); });
     }
-    return nullptr;
-}
-
-unsigned int WorkQueue::getNumItems() const
-{
-    std::unique_lock<std::mutex> lock(mMutex);
-    return mQueue.size();
-}
-
-unsigned int WorkQueue::getNumActiveThreads() const
-{
-    return std::accumulate(mThreads.begin(), mThreads.end(), 0u,
-        [] (auto r, const auto& t) { return r + t->isActive(); });
-}
 
-WorkThread::WorkThread(WorkQueue& workQueue)
-    : mWorkQueue(&workQueue)
-    , mActive(false)
-    , mThread([this] { run(); })
-{
-}
+    WorkThread::WorkThread(WorkQueue& workQueue)
+        : mWorkQueue(&workQueue)
+        , mActive(false)
+        , mThread([this] { run(); })
+    {
+    }
 
-WorkThread::~WorkThread()
-{
-    mThread.join();
-}
+    WorkThread::~WorkThread()
+    {
+        mThread.join();
+    }
 
-void WorkThread::run()
-{
-    while (true)
+    void WorkThread::run()
     {
-        osg::ref_ptr<WorkItem> item = mWorkQueue->removeWorkItem();
-        if (!item)
-            return;
-        mActive = true;
-        item->doWork();
-        item->signalDone();
-        mActive = false;
+        while (true)
+        {
+            osg::ref_ptr<WorkItem> item = mWorkQueue->removeWorkItem();
+            if (!item)
+                return;
+            mActive = true;
+            item->doWork();
+            item->signalDone();
+            mActive = false;
+        }
     }
-}
 
-bool WorkThread::isActive() const
-{
-    return mActive;
-}
+    bool WorkThread::isActive() const
+    {
+        return mActive;
+    }
 
 }
diff --git a/components/sceneutil/workqueue.hpp b/components/sceneutil/workqueue.hpp
index 6eb6a36a3e..55689bb321 100644
--- a/components/sceneutil/workqueue.hpp
+++ b/components/sceneutil/workqueue.hpp
@@ -5,10 +5,10 @@
 #include <osg/ref_ptr>
 
 #include <atomic>
+#include <condition_variable>
+#include <mutex>
 #include <queue>
 #include <thread>
-#include <mutex>
-#include <condition_variable>
 
 namespace SceneUtil
 {
@@ -31,7 +31,7 @@ namespace SceneUtil
         virtual void abort() {}
 
     private:
-        std::atomic_bool mDone {false};
+        std::atomic_bool mDone{ false };
         std::mutex mMutex;
         std::condition_variable mCondition;
     };
@@ -54,7 +54,7 @@ namespace SceneUtil
         /// Add a new work item to the back of the queue.
         /// @par The work item's waitTillDone() method may be used by the caller to wait until the work is complete.
         /// @param front If true, add item to the front of the queue. If false (default), add to the back.
-        void addWorkItem(osg::ref_ptr<WorkItem> item, bool front=false);
+        void addWorkItem(osg::ref_ptr<WorkItem> item, bool front = false);
 
         /// Get the next work item from the front of the queue. If the queue is empty, waits until a new item is added.
         /// If the workqueue is in the process of being destroyed, may return nullptr.
@@ -67,7 +67,7 @@ namespace SceneUtil
 
     private:
         bool mIsReleased;
-        std::deque<osg::ref_ptr<WorkItem> > mQueue;
+        std::deque<osg::ref_ptr<WorkItem>> mQueue;
 
         mutable std::mutex mMutex;
         std::condition_variable mCondition;
@@ -93,7 +93,6 @@ namespace SceneUtil
         void run();
     };
 
-
 }
 
 #endif
diff --git a/components/sceneutil/writescene.cpp b/components/sceneutil/writescene.cpp
index 1a605be5ae..7b6b43cb49 100644
--- a/components/sceneutil/writescene.cpp
+++ b/components/sceneutil/writescene.cpp
@@ -1,14 +1,13 @@
 #include "writescene.hpp"
 
-#include <stdexcept>
 #include <fstream>
+#include <stdexcept>
 
 #include <osgDB/Registry>
 
-
 #include "serialize.hpp"
 
-void SceneUtil::writeScene(osg::Node *node, const std::filesystem::path& filename, const std::string& format)
+void SceneUtil::writeScene(osg::Node* node, const std::filesystem::path& filename, const std::string& format)
 {
     registerSerializers();
 
diff --git a/components/sdlutil/events.hpp b/components/sdlutil/events.hpp
index ce71f04457..3ae15e448c 100644
--- a/components/sdlutil/events.hpp
+++ b/components/sdlutil/events.hpp
@@ -1,9 +1,9 @@
 #ifndef _SFO_EVENTS_H
 #define _SFO_EVENTS_H
 
-#include <SDL_version.h>
-#include <SDL_types.h>
 #include <SDL_events.h>
+#include <SDL_types.h>
+#include <SDL_version.h>
 
 ////////////
 // Events //
@@ -12,95 +12,95 @@
 namespace SDLUtil
 {
 
-/** Extended mouse event struct where we treat the wheel like an axis, like everyone expects */
-struct MouseMotionEvent : SDL_MouseMotionEvent {
-
-    Sint32 zrel;
-    Sint32 z;
-};
-
-struct TouchEvent {
-    int mDevice;
-    int mFinger;
-    float mX;
-    float mY;
-    float mPressure;
-
-    #if SDL_VERSION_ATLEAST(2, 0, 14)
-    explicit TouchEvent(const SDL_ControllerTouchpadEvent& arg)
-        : mDevice(arg.touchpad)
-        , mFinger(arg.finger)
-        , mX(arg.x)
-        , mY(arg.y)
-        , mPressure(arg.pressure)
-    {}
-    #endif
-};
-
-
-///////////////
-// Listeners //
-///////////////
-
-class MouseListener
-{
-public:
-    virtual ~MouseListener() {}
-    virtual void mouseMoved( const MouseMotionEvent &arg ) = 0;
-    virtual void mousePressed( const SDL_MouseButtonEvent &arg, Uint8 id ) = 0;
-    virtual void mouseReleased( const SDL_MouseButtonEvent &arg, Uint8 id ) = 0;
-    virtual void mouseWheelMoved( const SDL_MouseWheelEvent &arg) = 0;
-};
-
-class SensorListener
-{
-public:
-    virtual ~SensorListener() {}
-    virtual void sensorUpdated(const SDL_SensorEvent &arg) = 0;
-    virtual void displayOrientationChanged() = 0;
-};
-
-class KeyListener
-{
-public:
-    virtual ~KeyListener() {}
-    virtual void textInput (const SDL_TextInputEvent& arg) {}
-    virtual void keyPressed(const SDL_KeyboardEvent &arg) = 0;
-    virtual void keyReleased(const SDL_KeyboardEvent &arg) = 0;
-};
-
-
-class ControllerListener
-{
-public:
-    virtual ~ControllerListener() {}
-
-    virtual void buttonPressed(int deviceID, const SDL_ControllerButtonEvent &evt) = 0;
-    virtual void buttonReleased(int deviceID, const SDL_ControllerButtonEvent &evt) = 0;
-
-    virtual void axisMoved(int deviceID, const SDL_ControllerAxisEvent &arg) = 0;
-
-    virtual void controllerAdded(int deviceID, const SDL_ControllerDeviceEvent &arg) = 0;
-    virtual void controllerRemoved(const SDL_ControllerDeviceEvent &arg) = 0;
-
-    virtual void touchpadMoved(int deviceId, const TouchEvent& arg) = 0;
-    virtual void touchpadPressed(int deviceId, const TouchEvent& arg) = 0;
-    virtual void touchpadReleased(int deviceId, const TouchEvent& arg) = 0;
-
-};
-
-class WindowListener
-{
-public:
-    virtual ~WindowListener() {}
-
-    /** @remarks The window's visibility changed */
-    virtual void windowVisibilityChange( bool visible ) {}
-
-    virtual void windowClosed () {}
-
-    virtual void windowResized (int x, int y) {}
-};
+    /** Extended mouse event struct where we treat the wheel like an axis, like everyone expects */
+    struct MouseMotionEvent : SDL_MouseMotionEvent
+    {
+
+        Sint32 zrel;
+        Sint32 z;
+    };
+
+    struct TouchEvent
+    {
+        int mDevice;
+        int mFinger;
+        float mX;
+        float mY;
+        float mPressure;
+
+#if SDL_VERSION_ATLEAST(2, 0, 14)
+        explicit TouchEvent(const SDL_ControllerTouchpadEvent& arg)
+            : mDevice(arg.touchpad)
+            , mFinger(arg.finger)
+            , mX(arg.x)
+            , mY(arg.y)
+            , mPressure(arg.pressure)
+        {
+        }
+#endif
+    };
+
+    ///////////////
+    // Listeners //
+    ///////////////
+
+    class MouseListener
+    {
+    public:
+        virtual ~MouseListener() {}
+        virtual void mouseMoved(const MouseMotionEvent& arg) = 0;
+        virtual void mousePressed(const SDL_MouseButtonEvent& arg, Uint8 id) = 0;
+        virtual void mouseReleased(const SDL_MouseButtonEvent& arg, Uint8 id) = 0;
+        virtual void mouseWheelMoved(const SDL_MouseWheelEvent& arg) = 0;
+    };
+
+    class SensorListener
+    {
+    public:
+        virtual ~SensorListener() {}
+        virtual void sensorUpdated(const SDL_SensorEvent& arg) = 0;
+        virtual void displayOrientationChanged() = 0;
+    };
+
+    class KeyListener
+    {
+    public:
+        virtual ~KeyListener() {}
+        virtual void textInput(const SDL_TextInputEvent& arg) {}
+        virtual void keyPressed(const SDL_KeyboardEvent& arg) = 0;
+        virtual void keyReleased(const SDL_KeyboardEvent& arg) = 0;
+    };
+
+    class ControllerListener
+    {
+    public:
+        virtual ~ControllerListener() {}
+
+        virtual void buttonPressed(int deviceID, const SDL_ControllerButtonEvent& evt) = 0;
+        virtual void buttonReleased(int deviceID, const SDL_ControllerButtonEvent& evt) = 0;
+
+        virtual void axisMoved(int deviceID, const SDL_ControllerAxisEvent& arg) = 0;
+
+        virtual void controllerAdded(int deviceID, const SDL_ControllerDeviceEvent& arg) = 0;
+        virtual void controllerRemoved(const SDL_ControllerDeviceEvent& arg) = 0;
+
+        virtual void touchpadMoved(int deviceId, const TouchEvent& arg) = 0;
+        virtual void touchpadPressed(int deviceId, const TouchEvent& arg) = 0;
+        virtual void touchpadReleased(int deviceId, const TouchEvent& arg) = 0;
+    };
+
+    class WindowListener
+    {
+    public:
+        virtual ~WindowListener() {}
+
+        /** @remarks The window's visibility changed */
+        virtual void windowVisibilityChange(bool visible) {}
+
+        virtual void windowClosed() {}
+
+        virtual void windowResized(int x, int y) {}
+    };
 
 }
 
diff --git a/components/sdlutil/gl4es_init.cpp b/components/sdlutil/gl4es_init.cpp
index bf9e007b65..044b54ce02 100644
--- a/components/sdlutil/gl4es_init.cpp
+++ b/components/sdlutil/gl4es_init.cpp
@@ -6,31 +6,32 @@
 // For glHint
 #include <GL/gl.h>
 
-extern "C" {
+extern "C"
+{
 
-#include <gl4es/gl4esinit.h>
 #include <gl4es/gl4eshint.h>
+#include <gl4es/gl4esinit.h>
 
-static SDL_Window *gWindow;
+    static SDL_Window* gWindow;
 
-void openmw_gl4es_GetMainFBSize(int *width, int *height)
-{
-    SDL_GetWindowSize(gWindow, width, height);
-}
+    void openmw_gl4es_GetMainFBSize(int* width, int* height)
+    {
+        SDL_GetWindowSize(gWindow, width, height);
+    }
 
-void openmw_gl4es_init(SDL_Window *window)
-{
-    gWindow = window;
-    set_getprocaddress(SDL_GL_GetProcAddress);
-    set_getmainfbsize(openmw_gl4es_GetMainFBSize);
-    initialize_gl4es();
+    void openmw_gl4es_init(SDL_Window* window)
+    {
+        gWindow = window;
+        set_getprocaddress(SDL_GL_GetProcAddress);
+        set_getmainfbsize(openmw_gl4es_GetMainFBSize);
+        initialize_gl4es();
 
-    // merge glBegin/glEnd in beams and console
-    glHint(GL_BEGINEND_HINT_GL4ES, 1);
-    // dxt unpacked to 16-bit looks ugly
-    glHint(GL_AVOID16BITS_HINT_GL4ES, 1);
-}
+        // merge glBegin/glEnd in beams and console
+        glHint(GL_BEGINEND_HINT_GL4ES, 1);
+        // dxt unpacked to 16-bit looks ugly
+        glHint(GL_AVOID16BITS_HINT_GL4ES, 1);
+    }
 
-}  // extern "C"
+} // extern "C"
 
-#endif  // OPENMW_GL4ES_MANUAL_INIT
+#endif // OPENMW_GL4ES_MANUAL_INIT
diff --git a/components/sdlutil/gl4es_init.h b/components/sdlutil/gl4es_init.h
index 11371e7aef..6a19d3dfe5 100644
--- a/components/sdlutil/gl4es_init.h
+++ b/components/sdlutil/gl4es_init.h
@@ -7,7 +7,7 @@
 // which creates a context.
 //
 // GL4ES can then query the context for features and extensions.
-extern "C" void openmw_gl4es_init(SDL_Window *window);
+extern "C" void openmw_gl4es_init(SDL_Window* window);
 
-#endif  // OPENMW_GL4ES_MANUAL_INIT
-#endif  // OPENMW_COMPONENTS_SDLUTIL_GL4ES_INIT_H
+#endif // OPENMW_GL4ES_MANUAL_INIT
+#endif // OPENMW_COMPONENTS_SDLUTIL_GL4ES_INIT_H
diff --git a/components/sdlutil/imagetosurface.cpp b/components/sdlutil/imagetosurface.cpp
index 6e68c0f458..7ed399c501 100644
--- a/components/sdlutil/imagetosurface.cpp
+++ b/components/sdlutil/imagetosurface.cpp
@@ -1,28 +1,30 @@
 #include "imagetosurface.hpp"
 
-#include <osg/Image>
 #include <SDL_surface.h>
+#include <osg/Image>
 
 namespace SDLUtil
 {
 
-SurfaceUniquePtr imageToSurface(osg::Image *image, bool flip)
-{
-    int width = image->s();
-    int height = image->t();
-    SDL_Surface* surface = SDL_CreateRGBSurface(0, width, height, 32, 0xFF000000,0x00FF0000,0x0000FF00,0x000000FF);
+    SurfaceUniquePtr imageToSurface(osg::Image* image, bool flip)
+    {
+        int width = image->s();
+        int height = image->t();
+        SDL_Surface* surface
+            = SDL_CreateRGBSurface(0, width, height, 32, 0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF);
 
-    for(int x = 0; x < width; ++x)
-        for(int y = 0; y < height; ++y)
-        {
-            osg::Vec4f clr = image->getColor(x, flip ? ((height-1)-y) : y);
-            int bpp = surface->format->BytesPerPixel;
-            Uint8 *p = (Uint8 *)surface->pixels + y * surface->pitch + x * bpp;
-            *(Uint32*)(p) = SDL_MapRGBA(surface->format, static_cast<Uint8>(clr.r() * 255),
-                static_cast<Uint8>(clr.g() * 255), static_cast<Uint8>(clr.b() * 255), static_cast<Uint8>(clr.a() * 255));
-        }
+        for (int x = 0; x < width; ++x)
+            for (int y = 0; y < height; ++y)
+            {
+                osg::Vec4f clr = image->getColor(x, flip ? ((height - 1) - y) : y);
+                int bpp = surface->format->BytesPerPixel;
+                Uint8* p = (Uint8*)surface->pixels + y * surface->pitch + x * bpp;
+                *(Uint32*)(p)
+                    = SDL_MapRGBA(surface->format, static_cast<Uint8>(clr.r() * 255), static_cast<Uint8>(clr.g() * 255),
+                        static_cast<Uint8>(clr.b() * 255), static_cast<Uint8>(clr.a() * 255));
+            }
 
-    return SurfaceUniquePtr(surface, SDL_FreeSurface);
-}
+        return SurfaceUniquePtr(surface, SDL_FreeSurface);
+    }
 
 }
diff --git a/components/sdlutil/imagetosurface.hpp b/components/sdlutil/imagetosurface.hpp
index 9ce56b9090..2222545de3 100644
--- a/components/sdlutil/imagetosurface.hpp
+++ b/components/sdlutil/imagetosurface.hpp
@@ -12,10 +12,10 @@ namespace osg
 
 namespace SDLUtil
 {
-    typedef std::unique_ptr<SDL_Surface, void (*)(SDL_Surface *)> SurfaceUniquePtr;
+    typedef std::unique_ptr<SDL_Surface, void (*)(SDL_Surface*)> SurfaceUniquePtr;
 
     /// Convert an osg::Image to an SDL_Surface.
-    SurfaceUniquePtr imageToSurface(osg::Image* image, bool flip=false);
+    SurfaceUniquePtr imageToSurface(osg::Image* image, bool flip = false);
 
 }
 
diff --git a/components/sdlutil/sdlcursormanager.cpp b/components/sdlutil/sdlcursormanager.cpp
index 340da4d35a..09e192ba16 100644
--- a/components/sdlutil/sdlcursormanager.cpp
+++ b/components/sdlutil/sdlcursormanager.cpp
@@ -2,15 +2,15 @@
 
 #include <stdexcept>
 
-#include <SDL_mouse.h>
 #include <SDL_endian.h>
-#include <SDL_render.h>
 #include <SDL_hints.h>
+#include <SDL_mouse.h>
+#include <SDL_render.h>
 
-#include <osg/GraphicsContext>
 #include <osg/Geometry>
-#include <osg/Texture2D>
+#include <osg/GraphicsContext>
 #include <osg/TexMat>
+#include <osg/Texture2D>
 #include <osg/Version>
 #include <osgViewer/GraphicsWindow>
 
@@ -27,9 +27,9 @@ USE_GRAPHICSWINDOW()
 namespace SDLUtil
 {
 
-    SDLCursorManager::SDLCursorManager() :
-        mEnabled(false),
-        mInitialized(false)
+    SDLCursorManager::SDLCursorManager()
+        : mEnabled(false)
+        , mInitialized(false)
     {
     }
 
@@ -37,7 +37,7 @@ namespace SDLUtil
     {
         CursorMap::const_iterator curs_iter = mCursorMap.begin();
 
-        while(curs_iter != mCursorMap.end())
+        while (curs_iter != mCursorMap.end())
         {
             SDL_FreeCursor(curs_iter->second);
             ++curs_iter;
@@ -48,18 +48,18 @@ namespace SDLUtil
 
     void SDLCursorManager::setEnabled(bool enabled)
     {
-        if(mInitialized && enabled == mEnabled)
+        if (mInitialized && enabled == mEnabled)
             return;
 
         mInitialized = true;
         mEnabled = enabled;
 
-        //turn on hardware cursors
-        if(enabled)
+        // turn on hardware cursors
+        if (enabled)
         {
             _setGUICursor(mCurrentCursor);
         }
-        //turn off hardware cursors
+        // turn off hardware cursors
         else
         {
             SDL_ShowCursor(SDL_FALSE);
@@ -72,21 +72,23 @@ namespace SDLUtil
         _setGUICursor(name);
     }
 
-    void SDLCursorManager::_setGUICursor(const std::string &name)
+    void SDLCursorManager::_setGUICursor(const std::string& name)
     {
         auto it = mCursorMap.find(name);
         if (it != mCursorMap.end())
             SDL_SetCursor(it->second);
     }
 
-    void SDLCursorManager::createCursor(const std::string& name, int rotDegrees, osg::Image* image, Uint8 hotspot_x, Uint8 hotspot_y, int cursorWidth, int cursorHeight)
+    void SDLCursorManager::createCursor(const std::string& name, int rotDegrees, osg::Image* image, Uint8 hotspot_x,
+        Uint8 hotspot_y, int cursorWidth, int cursorHeight)
     {
 #ifndef ANDROID
         _createCursorFromResource(name, rotDegrees, image, hotspot_x, hotspot_y, cursorWidth, cursorHeight);
 #endif
     }
 
-    SDLUtil::SurfaceUniquePtr decompress(osg::ref_ptr<osg::Image> source, float rotDegrees, int cursorWidth, int cursorHeight)
+    SDLUtil::SurfaceUniquePtr decompress(
+        osg::ref_ptr<osg::Image> source, float rotDegrees, int cursorWidth, int cursorHeight)
     {
         int width = source->s();
         int height = source->t();
@@ -95,32 +97,27 @@ namespace SDLUtil
         osg::ref_ptr<osg::Image> decompressedImage = new osg::Image;
         decompressedImage->setFileName(source->getFileName());
         decompressedImage->allocateImage(width, height, 1, useAlpha ? GL_RGBA : GL_RGB, GL_UNSIGNED_BYTE);
-        for (int s=0; s<width; ++s)
-            for (int t=0; t<height; ++t)
-                decompressedImage->setColor(source->getColor(s,t,0), s,t,0);
+        for (int s = 0; s < width; ++s)
+            for (int t = 0; t < height; ++t)
+                decompressedImage->setColor(source->getColor(s, t, 0), s, t, 0);
 
         Uint32 redMask = 0x000000ff;
         Uint32 greenMask = 0x0000ff00;
         Uint32 blueMask = 0x00ff0000;
         Uint32 alphaMask = useAlpha ? 0xff000000 : 0;
 
-        SDL_Surface *cursorSurface = SDL_CreateRGBSurfaceFrom(decompressedImage->data(),
-                                                              width,
-                                                              height,
-                                                              decompressedImage->getPixelSizeInBits(),
-                                                              decompressedImage->getRowSizeInBytes(),
-                                                              redMask,
-                                                              greenMask,
-                                                              blueMask,
-                                                              alphaMask);
+        SDL_Surface* cursorSurface = SDL_CreateRGBSurfaceFrom(decompressedImage->data(), width, height,
+            decompressedImage->getPixelSizeInBits(), decompressedImage->getRowSizeInBytes(), redMask, greenMask,
+            blueMask, alphaMask);
 
-        SDL_Surface *targetSurface = SDL_CreateRGBSurface(0, cursorWidth, cursorHeight, 32, redMask, greenMask, blueMask, alphaMask);
-        SDL_Renderer *renderer = SDL_CreateSoftwareRenderer(targetSurface);
+        SDL_Surface* targetSurface
+            = SDL_CreateRGBSurface(0, cursorWidth, cursorHeight, 32, redMask, greenMask, blueMask, alphaMask);
+        SDL_Renderer* renderer = SDL_CreateSoftwareRenderer(targetSurface);
 
         SDL_RenderClear(renderer);
 
         SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "1");
-        SDL_Texture *cursorTexture = SDL_CreateTextureFromSurface(renderer, cursorSurface);
+        SDL_Texture* cursorTexture = SDL_CreateTextureFromSurface(renderer, cursorSurface);
 
         SDL_RenderCopyEx(renderer, cursorTexture, nullptr, nullptr, -rotDegrees, nullptr, SDL_FLIP_VERTICAL);
 
@@ -131,19 +128,23 @@ namespace SDLUtil
         return SDLUtil::SurfaceUniquePtr(targetSurface, SDL_FreeSurface);
     }
 
-    void SDLCursorManager::_createCursorFromResource(const std::string& name, int rotDegrees, osg::Image* image, Uint8 hotspot_x, Uint8 hotspot_y, int cursorWidth, int cursorHeight)
+    void SDLCursorManager::_createCursorFromResource(const std::string& name, int rotDegrees, osg::Image* image,
+        Uint8 hotspot_x, Uint8 hotspot_y, int cursorWidth, int cursorHeight)
     {
         if (mCursorMap.find(name) != mCursorMap.end())
             return;
 
-        try {
+        try
+        {
             auto surface = decompress(image, static_cast<float>(rotDegrees), cursorWidth, cursorHeight);
 
-            //set the cursor and store it for later
+            // set the cursor and store it for later
             SDL_Cursor* curs = SDL_CreateColorCursor(surface.get(), hotspot_x, hotspot_y);
 
             mCursorMap.insert(CursorMap::value_type(std::string(name), curs));
-        } catch (std::exception& e) {
+        }
+        catch (std::exception& e)
+        {
             Log(Debug::Warning) << e.what();
             Log(Debug::Warning) << "Using default cursor.";
             return;
diff --git a/components/sdlutil/sdlcursormanager.hpp b/components/sdlutil/sdlcursormanager.hpp
index 7d0efe9879..0815ff4f40 100644
--- a/components/sdlutil/sdlcursormanager.hpp
+++ b/components/sdlutil/sdlcursormanager.hpp
@@ -27,13 +27,15 @@ namespace SDLUtil
 
         /// \brief Tell the manager that the cursor has changed, giving the
         ///        name of the cursor we changed to ("arrow", "ibeam", etc)
-        virtual void cursorChanged(const std::string &name);
+        virtual void cursorChanged(const std::string& name);
 
-        virtual void createCursor(const std::string &name, int rotDegrees, osg::Image* image, Uint8 hotspot_x, Uint8 hotspot_y, int cursorWidth, int cursorHeight);
+        virtual void createCursor(const std::string& name, int rotDegrees, osg::Image* image, Uint8 hotspot_x,
+            Uint8 hotspot_y, int cursorWidth, int cursorHeight);
 
     private:
-        void _createCursorFromResource(const std::string &name, int rotDegrees, osg::Image* image, Uint8 hotspot_x, Uint8 hotspot_y, int cursorWidth, int cursorHeight);
-        void _putPixel(SDL_Surface *surface, int x, int y, Uint32 pixel);
+        void _createCursorFromResource(const std::string& name, int rotDegrees, osg::Image* image, Uint8 hotspot_x,
+            Uint8 hotspot_y, int cursorWidth, int cursorHeight);
+        void _putPixel(SDL_Surface* surface, int x, int y, Uint32 pixel);
 
         void _setGUICursor(const std::string& name);
 
diff --git a/components/sdlutil/sdlgraphicswindow.cpp b/components/sdlutil/sdlgraphicswindow.cpp
index ca59ac68c4..61ade61a35 100644
--- a/components/sdlutil/sdlgraphicswindow.cpp
+++ b/components/sdlutil/sdlgraphicswindow.cpp
@@ -9,258 +9,264 @@
 namespace SDLUtil
 {
 
-GraphicsWindowSDL2::~GraphicsWindowSDL2()
-{
-    close(true);
-}
-
-GraphicsWindowSDL2::GraphicsWindowSDL2(osg::GraphicsContext::Traits *traits)
-    : mWindow(nullptr)
-    , mContext(nullptr)
-    , mValid(false)
-    , mRealized(false)
-    , mOwnsWindow(false)
-{
-    _traits = traits;
+    GraphicsWindowSDL2::~GraphicsWindowSDL2()
+    {
+        close(true);
+    }
 
-    init();
-    if(GraphicsWindowSDL2::valid())
+    GraphicsWindowSDL2::GraphicsWindowSDL2(osg::GraphicsContext::Traits* traits)
+        : mWindow(nullptr)
+        , mContext(nullptr)
+        , mValid(false)
+        , mRealized(false)
+        , mOwnsWindow(false)
     {
-        setState(new osg::State);
-        getState()->setGraphicsContext(this);
+        _traits = traits;
 
-        if(_traits.valid() && _traits->sharedContext.valid())
+        init();
+        if (GraphicsWindowSDL2::valid())
         {
-            getState()->setContextID(_traits->sharedContext->getState()->getContextID());
-            incrementContextIDUsageCount(getState()->getContextID());
-        }
-        else
-        {
-            getState()->setContextID(osg::GraphicsContext::createNewContextID());
+            setState(new osg::State);
+            getState()->setGraphicsContext(this);
+
+            if (_traits.valid() && _traits->sharedContext.valid())
+            {
+                getState()->setContextID(_traits->sharedContext->getState()->getContextID());
+                incrementContextIDUsageCount(getState()->getContextID());
+            }
+            else
+            {
+                getState()->setContextID(osg::GraphicsContext::createNewContextID());
+            }
         }
     }
-}
 
+    bool GraphicsWindowSDL2::setWindowDecorationImplementation(bool flag)
+    {
+        if (!mWindow)
+            return false;
 
-bool GraphicsWindowSDL2::setWindowDecorationImplementation(bool flag)
-{
-    if(!mWindow) return false;
-
-    SDL_SetWindowBordered(mWindow, flag ? SDL_TRUE : SDL_FALSE);
-    return true;
-}
+        SDL_SetWindowBordered(mWindow, flag ? SDL_TRUE : SDL_FALSE);
+        return true;
+    }
 
-bool GraphicsWindowSDL2::setWindowRectangleImplementation(int x, int y, int width, int height)
-{
-    if(!mWindow) return false;
+    bool GraphicsWindowSDL2::setWindowRectangleImplementation(int x, int y, int width, int height)
+    {
+        if (!mWindow)
+            return false;
 
-    int w,h;
-    SDL_GetWindowSize(mWindow, &w, &h);
-    int dw,dh;
-    SDL_GL_GetDrawableSize(mWindow, &dw, &dh);
+        int w, h;
+        SDL_GetWindowSize(mWindow, &w, &h);
+        int dw, dh;
+        SDL_GL_GetDrawableSize(mWindow, &dw, &dh);
 
-    SDL_SetWindowPosition(mWindow, x, y);
-    SDL_SetWindowSize(mWindow, width / (dw / w), height / (dh / h));
-    return true;
-}
+        SDL_SetWindowPosition(mWindow, x, y);
+        SDL_SetWindowSize(mWindow, width / (dw / w), height / (dh / h));
+        return true;
+    }
 
-void GraphicsWindowSDL2::setWindowName(const std::string &name)
-{
-    if(!mWindow) return;
+    void GraphicsWindowSDL2::setWindowName(const std::string& name)
+    {
+        if (!mWindow)
+            return;
 
-    SDL_SetWindowTitle(mWindow, name.c_str());
-    _traits->windowName = name;
-}
+        SDL_SetWindowTitle(mWindow, name.c_str());
+        _traits->windowName = name;
+    }
 
-void GraphicsWindowSDL2::setCursor(MouseCursor mouseCursor)
-{
-    _traits->useCursor = false;
-}
+    void GraphicsWindowSDL2::setCursor(MouseCursor mouseCursor)
+    {
+        _traits->useCursor = false;
+    }
 
+    void GraphicsWindowSDL2::init()
+    {
+        if (mValid)
+            return;
 
-void GraphicsWindowSDL2::init()
-{
-    if(mValid) return;
+        if (!_traits.valid())
+            return;
 
-    if(!_traits.valid())
-        return;
+        WindowData* inheritedWindowData = dynamic_cast<WindowData*>(_traits->inheritedWindowData.get());
+        mWindow = inheritedWindowData ? inheritedWindowData->mWindow : nullptr;
 
-    WindowData *inheritedWindowData = dynamic_cast<WindowData*>(_traits->inheritedWindowData.get());
-    mWindow = inheritedWindowData ? inheritedWindowData->mWindow : nullptr;
+        mOwnsWindow = (mWindow == nullptr);
+        if (mOwnsWindow)
+        {
+            OSG_FATAL << "Error: No SDL window provided." << std::endl;
+            return;
+        }
 
-    mOwnsWindow = (mWindow == nullptr);
-    if(mOwnsWindow)
-    {
-        OSG_FATAL<<"Error: No SDL window provided."<<std::endl;
-        return;
-    }
+        // SDL will change the current context when it creates a new one, so we
+        // have to get the current one to be able to restore it afterward.
+        SDL_Window* oldWin = SDL_GL_GetCurrentWindow();
+        SDL_GLContext oldCtx = SDL_GL_GetCurrentContext();
 
-    // SDL will change the current context when it creates a new one, so we
-    // have to get the current one to be able to restore it afterward.
-    SDL_Window *oldWin = SDL_GL_GetCurrentWindow();
-    SDL_GLContext oldCtx = SDL_GL_GetCurrentContext();
-   
 #if defined(ANDROID) || defined(OPENMW_GL4ES_MANUAL_INIT)
-    int major = 1;
-    int minor = 1;
-    char *ver = getenv("OPENMW_GLES_VERSION");
-
-    if (ver && strcmp(ver, "2") == 0) {
-        major = 2;
-        minor = 0;
-    } else if (ver && strcmp(ver, "3") == 0) {
-        major = 3;
-        minor = 2;
-    }
+        int major = 1;
+        int minor = 1;
+        char* ver = getenv("OPENMW_GLES_VERSION");
 
-    SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
-    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, major);
-    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, minor);
-#endif
-    
-    mContext = SDL_GL_CreateContext(mWindow);
-    if(!mContext)
-    {
-        OSG_FATAL<< "Error: Unable to create OpenGL graphics context: "<<SDL_GetError() <<std::endl;
-        return;
-    }
+        if (ver && strcmp(ver, "2") == 0)
+        {
+            major = 2;
+            minor = 0;
+        }
+        else if (ver && strcmp(ver, "3") == 0)
+        {
+            major = 3;
+            minor = 2;
+        }
 
-#ifdef OPENMW_GL4ES_MANUAL_INIT
-    openmw_gl4es_init(mWindow);
+        SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
+        SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, major);
+        SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, minor);
 #endif
 
-    setSwapInterval(_traits->vsync);
-
-    // Update traits with what we've actually been given
-    // Use intermediate to avoid signed/unsigned mismatch
-    int intermediateLocation;
-    SDL_GL_GetAttribute(SDL_GL_RED_SIZE, &intermediateLocation);
-    _traits->red = intermediateLocation;
-    SDL_GL_GetAttribute(SDL_GL_GREEN_SIZE, &intermediateLocation);
-    _traits->green = intermediateLocation;
-    SDL_GL_GetAttribute(SDL_GL_BLUE_SIZE, &intermediateLocation);
-    _traits->blue = intermediateLocation;
-    SDL_GL_GetAttribute(SDL_GL_ALPHA_SIZE, &intermediateLocation);
-    _traits->alpha = intermediateLocation;
-    SDL_GL_GetAttribute(SDL_GL_DEPTH_SIZE, &intermediateLocation);
-    _traits->depth = intermediateLocation;
-    SDL_GL_GetAttribute(SDL_GL_STENCIL_SIZE, &intermediateLocation);
-    _traits->stencil = intermediateLocation;
-
-    SDL_GL_GetAttribute(SDL_GL_DOUBLEBUFFER, &intermediateLocation);
-    _traits->doubleBuffer = intermediateLocation;
-    SDL_GL_GetAttribute(SDL_GL_MULTISAMPLEBUFFERS, &intermediateLocation);
-    _traits->sampleBuffers = intermediateLocation;
-    SDL_GL_GetAttribute(SDL_GL_MULTISAMPLESAMPLES, &intermediateLocation);
-    _traits->samples = intermediateLocation;
-
-    SDL_GL_MakeCurrent(oldWin, oldCtx);
-
-    mValid = true;
-
-    getEventQueue()->syncWindowRectangleWithGraphicsContext();
-}
+        mContext = SDL_GL_CreateContext(mWindow);
+        if (!mContext)
+        {
+            OSG_FATAL << "Error: Unable to create OpenGL graphics context: " << SDL_GetError() << std::endl;
+            return;
+        }
 
+#ifdef OPENMW_GL4ES_MANUAL_INIT
+        openmw_gl4es_init(mWindow);
+#endif
 
-bool GraphicsWindowSDL2::realizeImplementation()
-{
-    if(mRealized)
-    {
-        OSG_NOTICE<< "GraphicsWindowSDL2::realizeImplementation() Already realized" <<std::endl;
-        return true;
+        setSwapInterval(_traits->vsync);
+
+        // Update traits with what we've actually been given
+        // Use intermediate to avoid signed/unsigned mismatch
+        int intermediateLocation;
+        SDL_GL_GetAttribute(SDL_GL_RED_SIZE, &intermediateLocation);
+        _traits->red = intermediateLocation;
+        SDL_GL_GetAttribute(SDL_GL_GREEN_SIZE, &intermediateLocation);
+        _traits->green = intermediateLocation;
+        SDL_GL_GetAttribute(SDL_GL_BLUE_SIZE, &intermediateLocation);
+        _traits->blue = intermediateLocation;
+        SDL_GL_GetAttribute(SDL_GL_ALPHA_SIZE, &intermediateLocation);
+        _traits->alpha = intermediateLocation;
+        SDL_GL_GetAttribute(SDL_GL_DEPTH_SIZE, &intermediateLocation);
+        _traits->depth = intermediateLocation;
+        SDL_GL_GetAttribute(SDL_GL_STENCIL_SIZE, &intermediateLocation);
+        _traits->stencil = intermediateLocation;
+
+        SDL_GL_GetAttribute(SDL_GL_DOUBLEBUFFER, &intermediateLocation);
+        _traits->doubleBuffer = intermediateLocation;
+        SDL_GL_GetAttribute(SDL_GL_MULTISAMPLEBUFFERS, &intermediateLocation);
+        _traits->sampleBuffers = intermediateLocation;
+        SDL_GL_GetAttribute(SDL_GL_MULTISAMPLESAMPLES, &intermediateLocation);
+        _traits->samples = intermediateLocation;
+
+        SDL_GL_MakeCurrent(oldWin, oldCtx);
+
+        mValid = true;
+
+        getEventQueue()->syncWindowRectangleWithGraphicsContext();
     }
 
-    if(!mValid) init();
-    if(!mValid) return false;
+    bool GraphicsWindowSDL2::realizeImplementation()
+    {
+        if (mRealized)
+        {
+            OSG_NOTICE << "GraphicsWindowSDL2::realizeImplementation() Already realized" << std::endl;
+            return true;
+        }
 
-    SDL_ShowWindow(mWindow);
+        if (!mValid)
+            init();
+        if (!mValid)
+            return false;
 
-    getEventQueue()->syncWindowRectangleWithGraphicsContext();
+        SDL_ShowWindow(mWindow);
 
-    mRealized = true;
+        getEventQueue()->syncWindowRectangleWithGraphicsContext();
 
-    return true;
-}
+        mRealized = true;
 
-bool GraphicsWindowSDL2::makeCurrentImplementation()
-{
-    if(!mRealized)
-    {
-        OSG_WARN<<"Warning: GraphicsWindow not realized, cannot do makeCurrent."<<std::endl;
-        return false;
+        return true;
     }
 
-    return SDL_GL_MakeCurrent(mWindow, mContext)==0;
-}
-
-bool GraphicsWindowSDL2::releaseContextImplementation()
-{
-    if(!mRealized)
+    bool GraphicsWindowSDL2::makeCurrentImplementation()
     {
-        OSG_WARN<< "Warning: GraphicsWindow not realized, cannot do releaseContext." <<std::endl;
-        return false;
+        if (!mRealized)
+        {
+            OSG_WARN << "Warning: GraphicsWindow not realized, cannot do makeCurrent." << std::endl;
+            return false;
+        }
+
+        return SDL_GL_MakeCurrent(mWindow, mContext) == 0;
     }
 
-    return SDL_GL_MakeCurrent(nullptr, nullptr)==0;
-}
+    bool GraphicsWindowSDL2::releaseContextImplementation()
+    {
+        if (!mRealized)
+        {
+            OSG_WARN << "Warning: GraphicsWindow not realized, cannot do releaseContext." << std::endl;
+            return false;
+        }
 
+        return SDL_GL_MakeCurrent(nullptr, nullptr) == 0;
+    }
 
-void GraphicsWindowSDL2::closeImplementation()
-{
-    if(mContext)
-        SDL_GL_DeleteContext(mContext);
-    mContext = nullptr;
+    void GraphicsWindowSDL2::closeImplementation()
+    {
+        if (mContext)
+            SDL_GL_DeleteContext(mContext);
+        mContext = nullptr;
 
-    if(mWindow && mOwnsWindow)
-        SDL_DestroyWindow(mWindow);
-    mWindow = nullptr;
+        if (mWindow && mOwnsWindow)
+            SDL_DestroyWindow(mWindow);
+        mWindow = nullptr;
 
-    mValid = false;
-    mRealized = false;
-}
+        mValid = false;
+        mRealized = false;
+    }
 
-void GraphicsWindowSDL2::swapBuffersImplementation()
-{
-    if(!mRealized) return;
+    void GraphicsWindowSDL2::swapBuffersImplementation()
+    {
+        if (!mRealized)
+            return;
 
-    SDL_GL_SwapWindow(mWindow);
-}
+        SDL_GL_SwapWindow(mWindow);
+    }
 
-void GraphicsWindowSDL2::setSyncToVBlank(bool on)
-{
-    SDL_Window *oldWin = SDL_GL_GetCurrentWindow();
-    SDL_GLContext oldCtx = SDL_GL_GetCurrentContext();
+    void GraphicsWindowSDL2::setSyncToVBlank(bool on)
+    {
+        SDL_Window* oldWin = SDL_GL_GetCurrentWindow();
+        SDL_GLContext oldCtx = SDL_GL_GetCurrentContext();
 
-    SDL_GL_MakeCurrent(mWindow, mContext);
+        SDL_GL_MakeCurrent(mWindow, mContext);
 
-    setSwapInterval(on);
+        setSwapInterval(on);
 
-    SDL_GL_MakeCurrent(oldWin, oldCtx);
-}
+        SDL_GL_MakeCurrent(oldWin, oldCtx);
+    }
 
-void GraphicsWindowSDL2::setSwapInterval(bool enable)
-{
-    if (enable)
+    void GraphicsWindowSDL2::setSwapInterval(bool enable)
     {
-        if (SDL_GL_SetSwapInterval(-1) == -1)
+        if (enable)
         {
-            OSG_NOTICE << "Adaptive vsync unsupported" << std::endl;
-            if (SDL_GL_SetSwapInterval(1) == -1)
+            if (SDL_GL_SetSwapInterval(-1) == -1)
             {
-                OSG_NOTICE << "Vertical synchronization unsupported, disabling" << std::endl;
-                SDL_GL_SetSwapInterval(0);
+                OSG_NOTICE << "Adaptive vsync unsupported" << std::endl;
+                if (SDL_GL_SetSwapInterval(1) == -1)
+                {
+                    OSG_NOTICE << "Vertical synchronization unsupported, disabling" << std::endl;
+                    SDL_GL_SetSwapInterval(0);
+                }
             }
         }
+        else
+        {
+            SDL_GL_SetSwapInterval(0);
+        }
     }
-    else
+
+    void GraphicsWindowSDL2::raiseWindow()
     {
-        SDL_GL_SetSwapInterval(0);
+        SDL_RaiseWindow(mWindow);
     }
-}
-
-void GraphicsWindowSDL2::raiseWindow()
-{
-    SDL_RaiseWindow(mWindow);
-}
 
 }
diff --git a/components/sdlutil/sdlgraphicswindow.hpp b/components/sdlutil/sdlgraphicswindow.hpp
index 559deda675..366ac55f4d 100644
--- a/components/sdlutil/sdlgraphicswindow.hpp
+++ b/components/sdlutil/sdlgraphicswindow.hpp
@@ -8,82 +8,87 @@
 namespace SDLUtil
 {
 
-class GraphicsWindowSDL2 : public osgViewer::GraphicsWindow
-{
-    SDL_Window*     mWindow;
-    SDL_GLContext   mContext;
+    class GraphicsWindowSDL2 : public osgViewer::GraphicsWindow
+    {
+        SDL_Window* mWindow;
+        SDL_GLContext mContext;
 
-    bool            mValid;
-    bool            mRealized;
-    bool            mOwnsWindow;
+        bool mValid;
+        bool mRealized;
+        bool mOwnsWindow;
 
-    void init();
+        void init();
 
-    virtual ~GraphicsWindowSDL2();
+        virtual ~GraphicsWindowSDL2();
 
-public:
-    GraphicsWindowSDL2(osg::GraphicsContext::Traits *traits);
+    public:
+        GraphicsWindowSDL2(osg::GraphicsContext::Traits* traits);
 
-    bool isSameKindAs(const Object* object) const override { return dynamic_cast<const GraphicsWindowSDL2*>(object)!=nullptr; }
-    const char* libraryName() const override { return "osgViewer"; }
-    const char* className() const override { return "GraphicsWindowSDL2"; }
+        bool isSameKindAs(const Object* object) const override
+        {
+            return dynamic_cast<const GraphicsWindowSDL2*>(object) != nullptr;
+        }
+        const char* libraryName() const override { return "osgViewer"; }
+        const char* className() const override { return "GraphicsWindowSDL2"; }
 
-    bool valid() const override { return mValid; }
+        bool valid() const override { return mValid; }
 
-    /** Realise the GraphicsContext.*/
-    bool realizeImplementation()override ;
+        /** Realise the GraphicsContext.*/
+        bool realizeImplementation() override;
 
-    /** Return true if the graphics context has been realised and is ready to use.*/
-    bool isRealizedImplementation() const override { return mRealized; }
+        /** Return true if the graphics context has been realised and is ready to use.*/
+        bool isRealizedImplementation() const override { return mRealized; }
 
-    /** Close the graphics context.*/
-    void closeImplementation() override;
+        /** Close the graphics context.*/
+        void closeImplementation() override;
 
-    /** Make this graphics context current.*/
-    bool makeCurrentImplementation() override;
+        /** Make this graphics context current.*/
+        bool makeCurrentImplementation() override;
 
-    /** Release the graphics context.*/
-    bool releaseContextImplementation() override;
+        /** Release the graphics context.*/
+        bool releaseContextImplementation() override;
 
-    /** Swap the front and back buffers.*/
-    void swapBuffersImplementation() override;
+        /** Swap the front and back buffers.*/
+        void swapBuffersImplementation() override;
 
-    /** Set sync-to-vblank. */
-    void setSyncToVBlank(bool on) override;
+        /** Set sync-to-vblank. */
+        void setSyncToVBlank(bool on) override;
 
-    /** Set Window decoration.*/
-    bool setWindowDecorationImplementation(bool flag) override;
+        /** Set Window decoration.*/
+        bool setWindowDecorationImplementation(bool flag) override;
 
-    /** Raise specified window */
-    void raiseWindow() override;
+        /** Raise specified window */
+        void raiseWindow() override;
 
-    /** Set the window's position and size.*/
-    bool setWindowRectangleImplementation(int x, int y, int width, int height) override;
+        /** Set the window's position and size.*/
+        bool setWindowRectangleImplementation(int x, int y, int width, int height) override;
 
-    /** Set the name of the window */
-    void setWindowName(const std::string &name) override;
+        /** Set the name of the window */
+        void setWindowName(const std::string& name) override;
 
-    /** Set mouse cursor to a specific shape.*/
-    void setCursor(MouseCursor cursor) override;
+        /** Set mouse cursor to a specific shape.*/
+        void setCursor(MouseCursor cursor) override;
 
-    /** Get focus.*/
-    void grabFocus() override {}
+        /** Get focus.*/
+        void grabFocus() override {}
 
-    /** Get focus on if the pointer is in this window.*/
-    void grabFocusIfPointerInWindow() override {}
+        /** Get focus on if the pointer is in this window.*/
+        void grabFocusIfPointerInWindow() override {}
 
-    /** WindowData is used to pass in the SDL2 window handle attached to the GraphicsContext::Traits structure. */
-    struct WindowData : public osg::Referenced
-    {
-        WindowData(SDL_Window *window) : mWindow(window)
-        { }
+        /** WindowData is used to pass in the SDL2 window handle attached to the GraphicsContext::Traits structure. */
+        struct WindowData : public osg::Referenced
+        {
+            WindowData(SDL_Window* window)
+                : mWindow(window)
+            {
+            }
 
-        SDL_Window *mWindow;
-    };
+            SDL_Window* mWindow;
+        };
 
-private:
-    void setSwapInterval(bool enable);
-};
+    private:
+        void setSwapInterval(bool enable);
+    };
 
 }
 
diff --git a/components/sdlutil/sdlinputwrapper.cpp b/components/sdlutil/sdlinputwrapper.cpp
index 0f28a959fe..40a82fdbd4 100644
--- a/components/sdlutil/sdlinputwrapper.cpp
+++ b/components/sdlutil/sdlinputwrapper.cpp
@@ -8,30 +8,30 @@
 namespace SDLUtil
 {
 
-InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> viewer, bool grab) :
-        mSDLWindow(window),
-        mViewer(viewer),
-        mMouseListener(nullptr),
-        mSensorListener(nullptr),
-        mKeyboardListener(nullptr),
-        mWindowListener(nullptr),
-        mConListener(nullptr),
-        mWarpX(0),
-        mWarpY(0),
-        mWarpCompensate(false),
-        mWrapPointer(false),
-        mAllowGrab(grab),
-        mWantMouseVisible(false),
-        mWantGrab(false),
-        mWantRelative(false),
-        mGrabPointer(false),
-        mMouseRelative(false),
-        mFirstMouseMove(true),
-        mMouseZ(0),
-        mMouseX(0),
-        mMouseY(0),
-        mWindowHasFocus(true),
-        mMouseInWindow(true)
+    InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> viewer, bool grab)
+        : mSDLWindow(window)
+        , mViewer(viewer)
+        , mMouseListener(nullptr)
+        , mSensorListener(nullptr)
+        , mKeyboardListener(nullptr)
+        , mWindowListener(nullptr)
+        , mConListener(nullptr)
+        , mWarpX(0)
+        , mWarpY(0)
+        , mWarpCompensate(false)
+        , mWrapPointer(false)
+        , mAllowGrab(grab)
+        , mWantMouseVisible(false)
+        , mWantGrab(false)
+        , mWantRelative(false)
+        , mGrabPointer(false)
+        , mMouseRelative(false)
+        , mFirstMouseMove(true)
+        , mMouseZ(0)
+        , mMouseX(0)
+        , mMouseY(0)
+        , mWindowHasFocus(true)
+        , mMouseInWindow(true)
     {
         Uint32 flags = SDL_GetWindowFlags(mSDLWindow);
         mWindowHasFocus = (flags & SDL_WINDOW_INPUT_FOCUS);
@@ -39,15 +39,13 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
         _setWindowScale();
     }
 
-    InputWrapper::~InputWrapper()
-    {
-    }
+    InputWrapper::~InputWrapper() {}
 
     void InputWrapper::_setWindowScale()
     {
-        int w,h;
+        int w, h;
         SDL_GetWindowSize(mSDLWindow, &w, &h);
-        int dw,dh;
+        int dw, dh;
         SDL_GL_GetDrawableSize(mSDLWindow, &dw, &dh);
         mScaleX = dw / w;
         mScaleY = dh / h;
@@ -76,13 +74,13 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
             return;
         }
 
-        while(SDL_PollEvent(&evt))
+        while (SDL_PollEvent(&evt))
         {
-            switch(evt.type)
+            switch (evt.type)
             {
                 case SDL_MOUSEMOTION:
                     // Ignore this if it happened due to a warp
-                    if(!_handleWarpMotion(evt.motion))
+                    if (!_handleWarpMotion(evt.motion))
                     {
                         // If in relative mode, don't trigger events unless window has focus
                         if (!mWantRelative || mWindowHasFocus)
@@ -111,7 +109,8 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
 
                     if (!isModifierHeld(KMOD_ALT) && evt.key.keysym.sym >= SDLK_F1 && evt.key.keysym.sym <= SDLK_F12)
                     {
-                        mViewer->getEventQueue()->keyPress(osgGA::GUIEventAdapter::KEY_F1 + (evt.key.keysym.sym - SDLK_F1));
+                        mViewer->getEventQueue()->keyPress(
+                            osgGA::GUIEventAdapter::KEY_F1 + (evt.key.keysym.sym - SDLK_F1));
                     }
 
                     break;
@@ -120,8 +119,10 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
                     {
                         mKeyboardListener->keyReleased(evt.key);
 
-                        if (!isModifierHeld(KMOD_ALT) && evt.key.keysym.sym >= SDLK_F1 && evt.key.keysym.sym <= SDLK_F12)
-                            mViewer->getEventQueue()->keyRelease(osgGA::GUIEventAdapter::KEY_F1 + (evt.key.keysym.sym - SDLK_F1));
+                        if (!isModifierHeld(KMOD_ALT) && evt.key.keysym.sym >= SDLK_F1
+                            && evt.key.keysym.sym <= SDLK_F12)
+                            mViewer->getEventQueue()->keyRelease(
+                                osgGA::GUIEventAdapter::KEY_F1 + (evt.key.keysym.sym - SDLK_F1));
                     }
 
                     break;
@@ -132,7 +133,7 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
                     break;
                 case SDL_KEYMAPCHANGED:
                     break;
-                case SDL_JOYHATMOTION: //As we manage everything with GameController, don't even bother with these.
+                case SDL_JOYHATMOTION: // As we manage everything with GameController, don't even bother with these.
                 case SDL_JOYAXISMOTION:
                 case SDL_JOYBUTTONDOWN:
                 case SDL_JOYBUTTONUP:
@@ -140,26 +141,27 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
                 case SDL_JOYDEVICEREMOVED:
                     break;
                 case SDL_CONTROLLERDEVICEADDED:
-                    if(mConListener)
-                        mConListener->controllerAdded(1, evt.cdevice); //We only support one joystick, so give everything a generic deviceID
+                    if (mConListener)
+                        mConListener->controllerAdded(
+                            1, evt.cdevice); // We only support one joystick, so give everything a generic deviceID
                     break;
                 case SDL_CONTROLLERDEVICEREMOVED:
-                    if(mConListener)
+                    if (mConListener)
                         mConListener->controllerRemoved(evt.cdevice);
                     break;
                 case SDL_CONTROLLERBUTTONDOWN:
-                    if(mConListener)
+                    if (mConListener)
                         mConListener->buttonPressed(1, evt.cbutton);
                     break;
                 case SDL_CONTROLLERBUTTONUP:
-                    if(mConListener)
+                    if (mConListener)
                         mConListener->buttonReleased(1, evt.cbutton);
                     break;
                 case SDL_CONTROLLERAXISMOTION:
-                    if(mConListener)
+                    if (mConListener)
                         mConListener->axisMoved(1, evt.caxis);
                     break;
-                #if SDL_VERSION_ATLEAST(2, 0, 14)
+#if SDL_VERSION_ATLEAST(2, 0, 14)
                 case SDL_CONTROLLERSENSORUPDATE:
                     // controller sensor data is received on demand
                     break;
@@ -172,7 +174,7 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
                 case SDL_CONTROLLERTOUCHPADUP:
                     mConListener->touchpadReleased(1, TouchEvent(evt.ctouchpad));
                     break;
-                #endif
+#endif
                 case SDL_WINDOWEVENT:
                     handleWindowEvent(evt);
                     break;
@@ -184,7 +186,8 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
                     switch (evt.display.event)
                     {
                         case SDL_DISPLAYEVENT_ORIENTATION:
-                            if (mSensorListener && evt.display.display == (unsigned int) Settings::Manager::getInt("screen", "Video"))
+                            if (mSensorListener
+                                && evt.display.display == (unsigned int)Settings::Manager::getInt("screen", "Video"))
                                 mSensorListener->displayOrientationChanged();
                             break;
                         default:
@@ -215,7 +218,8 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
                     break;
 
                 case SDL_APP_LOWMEMORY:
-                    Log(Debug::Warning) << "System reports that free RAM on device is running low. You may encounter an unexpected behaviour.";
+                    Log(Debug::Warning) << "System reports that free RAM on device is running low. You may encounter "
+                                           "an unexpected behaviour.";
                     break;
 
                 default:
@@ -227,7 +231,8 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
 
     void InputWrapper::handleWindowEvent(const SDL_Event& evt)
     {
-        switch (evt.window.event) {
+        switch (evt.window.event)
+        {
             case SDL_WINDOWEVENT_ENTER:
                 mMouseInWindow = true;
                 updateMouseSettings();
@@ -241,13 +246,13 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
                 // so we ignore window moved events (improves window movement performance)
                 break;
             case SDL_WINDOWEVENT_SIZE_CHANGED:
-                int w,h;
+                int w, h;
                 SDL_GL_GetDrawableSize(mSDLWindow, &w, &h);
-                int x,y;
-                SDL_GetWindowPosition(mSDLWindow, &x,&y);
-                mViewer->getCamera()->getGraphicsContext()->resized(x,y,w,h);
+                int x, y;
+                SDL_GetWindowPosition(mSDLWindow, &x, &y);
+                mViewer->getCamera()->getGraphicsContext()->resized(x, y, w, h);
 
-                mViewer->getEventQueue()->windowResize(x,y,w,h);
+                mViewer->getEventQueue()->windowResize(x, y, w, h);
 
                 if (mWindowListener)
                     mWindowListener->windowResized(w, h);
@@ -331,7 +336,7 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
         SDL_ShowCursor(mWantMouseVisible || !mWindowHasFocus);
 
         bool relative = mWantRelative && mMouseInWindow && mWindowHasFocus;
-        if(mMouseRelative == relative)
+        if (mMouseRelative == relative)
             return;
 
         mMouseRelative = relative;
@@ -343,10 +348,10 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
         // also use wrapping if no-grab was specified in options (SDL_SetRelativeMouseMode
         // appears to eat the mouse cursor when pausing in a debugger)
         bool success = mAllowGrab && SDL_SetRelativeMouseMode(relative ? SDL_TRUE : SDL_FALSE) == 0;
-        if(relative && !success)
+        if (relative && !success)
             mWrapPointer = true;
 
-        //now remove all mouse events using the old setting from the queue
+        // now remove all mouse events using the old setting from the queue
         SDL_PumpEvents();
         SDL_FlushEvent(SDL_MOUSEMOTION);
     }
@@ -355,11 +360,11 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
     ///        of warpMouse()
     bool InputWrapper::_handleWarpMotion(const SDL_MouseMotionEvent& evt)
     {
-        if(!mWarpCompensate)
+        if (!mWarpCompensate)
             return false;
 
-        //this was a warp event, signal the caller to eat it.
-        if(evt.x == mWarpX && evt.y == mWarpY)
+        // this was a warp event, signal the caller to eat it.
+        if (evt.x == mWarpX && evt.y == mWarpY)
         {
             mWarpCompensate = false;
             return true;
@@ -371,9 +376,9 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
     /// \brief Wrap the mouse to the viewport
     void InputWrapper::_wrapMousePointer(const SDL_MouseMotionEvent& evt)
     {
-        //don't wrap if we don't want relative movements, support relative
-        //movements natively, or aren't grabbing anyways
-        if(!mMouseRelative || !mWrapPointer || !mGrabPointer)
+        // don't wrap if we don't want relative movements, support relative
+        // movements natively, or aren't grabbing anyways
+        if (!mMouseRelative || !mWrapPointer || !mGrabPointer)
             return;
 
         int width = 0;
@@ -381,26 +386,26 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
 
         SDL_GetWindowSize(mSDLWindow, &width, &height);
 
-        const int FUDGE_FACTOR_X = width/4;
-        const int FUDGE_FACTOR_Y = height/4;
+        const int FUDGE_FACTOR_X = width / 4;
+        const int FUDGE_FACTOR_Y = height / 4;
 
-        //warp the mouse if it's about to go outside the window
-        if(evt.x - FUDGE_FACTOR_X < 0  || evt.x + FUDGE_FACTOR_X > width
-                || evt.y - FUDGE_FACTOR_Y < 0 || evt.y + FUDGE_FACTOR_Y > height)
+        // warp the mouse if it's about to go outside the window
+        if (evt.x - FUDGE_FACTOR_X < 0 || evt.x + FUDGE_FACTOR_X > width || evt.y - FUDGE_FACTOR_Y < 0
+            || evt.y + FUDGE_FACTOR_Y > height)
         {
             warpMouse(width / 2, height / 2);
         }
     }
 
     /// \brief Package mouse and mousewheel motions into a single event
-    MouseMotionEvent InputWrapper::_packageMouseMotion(const SDL_Event &evt)
+    MouseMotionEvent InputWrapper::_packageMouseMotion(const SDL_Event& evt)
     {
         MouseMotionEvent pack_evt = {};
         pack_evt.x = mMouseX * mScaleX;
         pack_evt.y = mMouseY * mScaleY;
         pack_evt.z = mMouseZ;
 
-        if(evt.type == SDL_MOUSEMOTION)
+        if (evt.type == SDL_MOUSEMOTION)
         {
             pack_evt.x = mMouseX = evt.motion.x * mScaleX;
             pack_evt.y = mMouseY = evt.motion.y * mScaleY;
@@ -415,7 +420,7 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
                 mFirstMouseMove = false;
             }
         }
-        else if(evt.type == SDL_MOUSEWHEEL)
+        else if (evt.type == SDL_MOUSEWHEEL)
         {
             mMouseZ += pack_evt.zrel = (evt.wheel.y * 120);
             pack_evt.z = mMouseZ;
diff --git a/components/sdlutil/sdlinputwrapper.hpp b/components/sdlutil/sdlinputwrapper.hpp
index e50431e1fc..abdc5b05fc 100644
--- a/components/sdlutil/sdlinputwrapper.hpp
+++ b/components/sdlutil/sdlinputwrapper.hpp
@@ -21,7 +21,7 @@ namespace SDLUtil
     class InputWrapper
     {
     public:
-        InputWrapper(SDL_Window *window, osg::ref_ptr<osgViewer::Viewer> viewer, bool grab);
+        InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> viewer, bool grab);
         ~InputWrapper();
 
         void setMouseEventCallback(MouseListener* listen) { mMouseListener = listen; }
@@ -34,7 +34,7 @@ namespace SDLUtil
         bool isModifierHeld(int mod);
         bool isKeyDown(SDL_Scancode key);
 
-        void setMouseVisible (bool visible);
+        void setMouseVisible(bool visible);
         void setMouseRelative(bool relative);
         bool getMouseRelative() { return mMouseRelative; }
         void setGrabPointer(bool grab);
@@ -47,7 +47,7 @@ namespace SDLUtil
         void handleWindowEvent(const SDL_Event& evt);
 
         bool _handleWarpMotion(const SDL_MouseMotionEvent& evt);
-        void _wrapMousePointer(const SDL_MouseMotionEvent &evt);
+        void _wrapMousePointer(const SDL_MouseMotionEvent& evt);
         MouseMotionEvent _packageMouseMotion(const SDL_Event& evt);
         void _setWindowScale();
 
diff --git a/components/sdlutil/sdlmappings.cpp b/components/sdlutil/sdlmappings.cpp
index d480262f82..83c1aa20b3 100644
--- a/components/sdlutil/sdlmappings.cpp
+++ b/components/sdlutil/sdlmappings.cpp
@@ -11,7 +11,7 @@ namespace SDLUtil
 {
     std::string sdlControllerButtonToString(int button)
     {
-        switch(button)
+        switch (button)
         {
             case SDL_CONTROLLER_BUTTON_A:
                 return "A Button";
@@ -50,7 +50,7 @@ namespace SDLUtil
 
     std::string sdlControllerAxisToString(int axis)
     {
-        switch(axis)
+        switch (axis)
         {
             case SDL_CONTROLLER_AXIS_LEFTX:
                 return "Left Stick X";
@@ -71,13 +71,13 @@ namespace SDLUtil
 
     MyGUI::MouseButton sdlMouseButtonToMyGui(Uint8 button)
     {
-        //The right button is the second button, according to MyGUI
-        if(button == SDL_BUTTON_RIGHT)
+        // The right button is the second button, according to MyGUI
+        if (button == SDL_BUTTON_RIGHT)
             button = SDL_BUTTON_MIDDLE;
-        else if(button == SDL_BUTTON_MIDDLE)
+        else if (button == SDL_BUTTON_MIDDLE)
             button = SDL_BUTTON_RIGHT;
 
-        //MyGUI's buttons are 0 indexed
+        // MyGUI's buttons are 0 indexed
         return MyGUI::MouseButton::Enum(button - 1);
     }
 
@@ -200,19 +200,19 @@ namespace SDLUtil
             keyMap[SDLK_DELETE] = MyGUI::KeyCode::Delete;
             keyMap[SDLK_APPLICATION] = MyGUI::KeyCode::AppMenu;
 
-            //The function of the Ctrl and Meta keys are switched on macOS compared to other platforms.
-            //For instance] = Cmd+C versus Ctrl+C to copy from the system clipboard
-            #if defined(__APPLE__)
+// The function of the Ctrl and Meta keys are switched on macOS compared to other platforms.
+// For instance] = Cmd+C versus Ctrl+C to copy from the system clipboard
+#if defined(__APPLE__)
             keyMap[SDLK_LGUI] = MyGUI::KeyCode::LeftControl;
             keyMap[SDLK_RGUI] = MyGUI::KeyCode::RightControl;
             keyMap[SDLK_LCTRL] = MyGUI::KeyCode::LeftWindows;
             keyMap[SDLK_RCTRL] = MyGUI::KeyCode::RightWindows;
-            #else
+#else
             keyMap[SDLK_LGUI] = MyGUI::KeyCode::LeftWindows;
             keyMap[SDLK_RGUI] = MyGUI::KeyCode::RightWindows;
             keyMap[SDLK_LCTRL] = MyGUI::KeyCode::LeftControl;
             keyMap[SDLK_RCTRL] = MyGUI::KeyCode::RightControl;
-            #endif
+#endif
             return keyMap;
         }
 
diff --git a/components/sdlutil/sdlvideowrapper.cpp b/components/sdlutil/sdlvideowrapper.cpp
index ad8fbba566..17c67154ad 100644
--- a/components/sdlutil/sdlvideowrapper.cpp
+++ b/components/sdlutil/sdlvideowrapper.cpp
@@ -10,7 +10,7 @@
 namespace SDLUtil
 {
 
-    VideoWrapper::VideoWrapper(SDL_Window *window, osg::ref_ptr<osgViewer::Viewer> viewer)
+    VideoWrapper::VideoWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> viewer)
         : mWindow(window)
         , mViewer(viewer)
         , mGamma(1.f)
@@ -55,13 +55,15 @@ namespace SDLUtil
         Uint16 red[256], green[256], blue[256];
         for (int i = 0; i < 256; i++)
         {
-            float k = i/256.0f;
+            float k = i / 256.0f;
             k = (k - 0.5f) * contrast + 0.5f;
-            k = pow(k, 1.f/gamma);
+            k = pow(k, 1.f / gamma);
             k *= 256;
-            float value = k*256;
-            if (value > 65535)  value = 65535;
-            else if (value < 0) value = 0;
+            float value = k * 256;
+            if (value > 65535)
+                value = 65535;
+            else if (value < 0)
+                value = 0;
 
             red[i] = green[i] = blue[i] = static_cast<Uint16>(value);
         }
@@ -76,9 +78,9 @@ namespace SDLUtil
         if (SDL_GetWindowFlags(mWindow) & SDL_WINDOW_MAXIMIZED)
             SDL_RestoreWindow(mWindow);
 
-        int w,h;
+        int w, h;
         SDL_GetWindowSize(mWindow, &w, &h);
-        int dw,dh;
+        int dw, dh;
         SDL_GL_GetDrawableSize(mWindow, &dw, &dh);
 
         if (windowMode == Settings::WindowMode::Fullscreen || windowMode == Settings::WindowMode::WindowedFullscreen)
@@ -88,7 +90,8 @@ namespace SDLUtil
             mode.w = width / (dw / w);
             mode.h = height / (dh / h);
             SDL_SetWindowDisplayMode(mWindow, &mode);
-            SDL_SetWindowFullscreen(mWindow, windowMode == Settings::WindowMode::Fullscreen ? SDL_WINDOW_FULLSCREEN : SDL_WINDOW_FULLSCREEN_DESKTOP);
+            SDL_SetWindowFullscreen(mWindow,
+                windowMode == Settings::WindowMode::Fullscreen ? SDL_WINDOW_FULLSCREEN : SDL_WINDOW_FULLSCREEN_DESKTOP);
         }
         else
         {
diff --git a/components/sdlutil/sdlvideowrapper.hpp b/components/sdlutil/sdlvideowrapper.hpp
index b9bcd66b5c..ace3be6276 100644
--- a/components/sdlutil/sdlvideowrapper.hpp
+++ b/components/sdlutil/sdlvideowrapper.hpp
@@ -43,7 +43,7 @@ namespace SDLUtil
         bool mHasSetGammaContrast;
 
         // Store system gamma ramp on window creation. Restore system gamma ramp on exit
-        Uint16 mOldSystemGammaRamp[256*3];
+        Uint16 mOldSystemGammaRamp[256 * 3];
     };
 
 }
diff --git a/components/serialization/binaryreader.hpp b/components/serialization/binaryreader.hpp
index 79776a26a7..a553c5b084 100644
--- a/components/serialization/binaryreader.hpp
+++ b/components/serialization/binaryreader.hpp
@@ -14,14 +14,18 @@ namespace Serialization
 {
     struct NotEnoughData : std::runtime_error
     {
-        NotEnoughData() : std::runtime_error("Not enough data") {}
+        NotEnoughData()
+            : std::runtime_error("Not enough data")
+        {
+        }
     };
 
     class BinaryReader
     {
     public:
         explicit BinaryReader(const std::byte* pos, const std::byte* end)
-            : mPos(pos), mEnd(end)
+            : mPos(pos)
+            , mEnd(end)
         {
             assert(mPos <= mEnd);
         }
@@ -62,7 +66,7 @@ namespace Serialization
                 std::memcpy(data, mPos, size);
                 mPos += size;
                 if constexpr (!Misc::IS_LITTLE_ENDIAN)
-                    std::for_each(data, data + count, [&] (T& v) { v = Misc::fromLittleEndian(v); });
+                    std::for_each(data, data + count, [&](T& v) { v = Misc::fromLittleEndian(v); });
             }
             else
             {
diff --git a/components/serialization/binarywriter.hpp b/components/serialization/binarywriter.hpp
index 64ec00d5bf..28f1333fba 100644
--- a/components/serialization/binarywriter.hpp
+++ b/components/serialization/binarywriter.hpp
@@ -14,14 +14,18 @@ namespace Serialization
 {
     struct NotEnoughSpace : std::runtime_error
     {
-        NotEnoughSpace() : std::runtime_error("Not enough space") {}
+        NotEnoughSpace()
+            : std::runtime_error("Not enough space")
+        {
+        }
     };
 
     struct BinaryWriter
     {
     public:
         explicit BinaryWriter(std::byte* dest, const std::byte* end)
-            : mDest(dest), mEnd(end)
+            : mDest(dest)
+            , mEnd(end)
         {
             assert(mDest <= mEnd);
         }
@@ -61,7 +65,7 @@ namespace Serialization
                     mDest += size;
                 }
                 else
-                    std::for_each(data, data + count, [&] (const T& v) { writeValue(v); });
+                    std::for_each(data, data + count, [&](const T& v) { writeValue(v); });
             }
             else
             {
diff --git a/components/serialization/format.hpp b/components/serialization/format.hpp
index 29fc0ec42d..9197ef13c3 100644
--- a/components/serialization/format.hpp
+++ b/components/serialization/format.hpp
@@ -3,11 +3,11 @@
 
 #include <algorithm>
 #include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <type_traits>
 #include <utility>
 #include <vector>
-#include <cstdint>
 
 namespace Serialization
 {
@@ -18,13 +18,19 @@ namespace Serialization
     };
 
     template <class>
-    struct IsContiguousContainer : std::false_type {};
+    struct IsContiguousContainer : std::false_type
+    {
+    };
 
-    template <class ... Args>
-    struct IsContiguousContainer<std::vector<Args ...>> : std::true_type {};
+    template <class... Args>
+    struct IsContiguousContainer<std::vector<Args...>> : std::true_type
+    {
+    };
 
     template <class T, std::size_t n>
-    struct IsContiguousContainer<std::array<T, n>> : std::true_type {};
+    struct IsContiguousContainer<std::array<T, n>> : std::true_type
+    {
+    };
 
     template <class T>
     inline constexpr bool isContiguousContainer = IsContiguousContainer<std::decay_t<T>>::value;
@@ -38,18 +44,17 @@ namespace Serialization
             if constexpr (std::is_arithmetic_v<T> || std::is_enum_v<T>)
                 visitor(self(), data, size);
             else
-                std::for_each(data, data + size, [&] (auto& v) { visitor(self(), v); });
+                std::for_each(data, data + size, [&](auto& v) { visitor(self(), v); });
         }
 
         template <class Visitor, class T, std::size_t size>
-        void operator()(Visitor&& visitor, T(& data)[size]) const
+        void operator()(Visitor&& visitor, T (&data)[size]) const
         {
             self()(std::forward<Visitor>(visitor), data, size);
         }
 
         template <class Visitor, class T>
-        auto operator()(Visitor&& visitor, T&& value) const
-            -> std::enable_if_t<isContiguousContainer<T>>
+        auto operator()(Visitor&& visitor, T&& value) const -> std::enable_if_t<isContiguousContainer<T>>
         {
             if constexpr (mode == Mode::Write)
                 visitor(self(), static_cast<std::uint64_t>(value.size()));
diff --git a/components/serialization/osgyaml.hpp b/components/serialization/osgyaml.hpp
index 866d1db2fe..40160f129b 100644
--- a/components/serialization/osgyaml.hpp
+++ b/components/serialization/osgyaml.hpp
@@ -35,7 +35,7 @@ namespace Serialization
 namespace YAML
 {
 
-    template<>
+    template <>
     struct convert<osg::Vec2f>
     {
         static Node encode(const osg::Vec2f& rhs) { return Serialization::encodeOSGVec(rhs); }
@@ -43,7 +43,7 @@ namespace YAML
         static bool decode(const Node& node, osg::Vec2f& rhs) { return Serialization::decodeOSGVec(node, rhs); }
     };
 
-    template<>
+    template <>
     struct convert<osg::Vec3f>
     {
         static Node encode(const osg::Vec3f& rhs) { return Serialization::encodeOSGVec(rhs); }
@@ -51,7 +51,7 @@ namespace YAML
         static bool decode(const Node& node, osg::Vec3f& rhs) { return Serialization::decodeOSGVec(node, rhs); }
     };
 
-    template<>
+    template <>
     struct convert<osg::Vec4f>
     {
         static Node encode(const osg::Vec4f& rhs) { return Serialization::encodeOSGVec(rhs); }
diff --git a/components/settings/categories.hpp b/components/settings/categories.hpp
index 246d6c2a44..6b7ebcecc5 100644
--- a/components/settings/categories.hpp
+++ b/components/settings/categories.hpp
@@ -4,8 +4,8 @@
 #include <map>
 #include <set>
 #include <string>
-#include <utility>
 #include <string_view>
+#include <utility>
 
 namespace Settings
 {
diff --git a/components/settings/parser.cpp b/components/settings/parser.cpp
index 3232855989..5ec41c5f4b 100644
--- a/components/settings/parser.cpp
+++ b/components/settings/parser.cpp
@@ -3,16 +3,16 @@
 #include <sstream>
 
 #include <components/debug/debuglog.hpp>
-#include <components/misc/strings/algorithm.hpp>
 #include <components/files/conversion.hpp>
+#include <components/misc/strings/algorithm.hpp>
 
-#include <fstream>
 #include <filesystem>
+#include <fstream>
 
 #include <Base64.h>
 
-void Settings::SettingsFileParser::loadSettingsFile(const std::filesystem::path &file, CategorySettingValueMap& settings,
-                                                    bool base64Encoded, bool overrideExisting)
+void Settings::SettingsFileParser::loadSettingsFile(
+    const std::filesystem::path& file, CategorySettingValueMap& settings, bool base64Encoded, bool overrideExisting)
 {
     mFile = file;
     std::ifstream fstream;
@@ -39,7 +39,7 @@ void Settings::SettingsFileParser::loadSettingsFile(const std::filesystem::path
     {
         ++mLine;
         std::string line;
-        std::getline( stream.get(), line );
+        std::getline(stream.get(), line);
 
         size_t i = 0;
         if (!skipWhiteSpace(i, line))
@@ -54,9 +54,9 @@ void Settings::SettingsFileParser::loadSettingsFile(const std::filesystem::path
             if (end == std::string::npos)
                 fail("unterminated category");
 
-            currentCategory = line.substr(i+1, end - (i+1));
+            currentCategory = line.substr(i + 1, end - (i + 1));
             Misc::StringUtils::trim(currentCategory);
-            i = end+1;
+            i = end + 1;
         }
 
         if (!skipWhiteSpace(i, line))
@@ -69,10 +69,10 @@ void Settings::SettingsFileParser::loadSettingsFile(const std::filesystem::path
         if (settingEnd == std::string::npos)
             fail("unterminated setting name");
 
-        std::string setting = line.substr(i, (settingEnd-i));
+        std::string setting = line.substr(i, (settingEnd - i));
         Misc::StringUtils::trim(setting);
 
-        size_t valueBegin = settingEnd+1;
+        size_t valueBegin = settingEnd + 1;
         std::string value = line.substr(valueBegin);
         Misc::StringUtils::trim(value);
 
@@ -83,13 +83,15 @@ void Settings::SettingsFileParser::loadSettingsFile(const std::filesystem::path
     }
 }
 
-void Settings::SettingsFileParser::saveSettingsFile(const std::filesystem::path &file, const CategorySettingValueMap& settings)
+void Settings::SettingsFileParser::saveSettingsFile(
+    const std::filesystem::path& file, const CategorySettingValueMap& settings)
 {
     using CategorySettingStatusMap = std::map<CategorySetting, bool>;
 
     // No options have been written to the file yet.
     CategorySettingStatusMap written;
-    for (auto it = settings.begin(); it != settings.end(); ++it) {
+    for (auto it = settings.begin(); it != settings.end(); ++it)
+    {
         written[it->first] = false;
     }
 
@@ -117,7 +119,8 @@ void Settings::SettingsFileParser::saveSettingsFile(const std::filesystem::path
     std::stringstream ostream;
 
     // For every line in the input file...
-    while (!istream.eof() && !istream.fail()) {
+    while (!istream.eof() && !istream.fail())
+    {
         std::string line;
         std::getline(istream, line);
 
@@ -134,7 +137,8 @@ void Settings::SettingsFileParser::saveSettingsFile(const std::filesystem::path
         }
 
         // Don't add additional newlines at the end of the file otherwise.
-        if (istream.eof()) continue;
+        if (istream.eof())
+            continue;
 
         // Queue entirely blank lines to add them if desired.
         if (!skipWhiteSpace(i, line))
@@ -147,16 +151,19 @@ void Settings::SettingsFileParser::saveSettingsFile(const std::filesystem::path
         existing = true;
 
         // Copy comments.
-        if (line[i] == '#') {
+        if (line[i] == '#')
+        {
             ostream << line << std::endl;
             continue;
         }
 
         // Category heading.
-        if (line[i] == '[') {
+        if (line[i] == '[')
+        {
             size_t end = line.find(']', i);
             // This should never happen unless the player edited the file while playing.
-            if (end == std::string::npos) {
+            if (end == std::string::npos)
+            {
                 ostream << "# unterminated category: " << line << std::endl;
                 changed = true;
                 continue;
@@ -169,8 +176,8 @@ void Settings::SettingsFileParser::saveSettingsFile(const std::filesystem::path
                 {
                     if (mit->second == false && mit->first.first == currentCategory)
                     {
-                        Log(Debug::Verbose) << "Added new setting: [" << currentCategory << "] "
-                                << mit->first.second << " = " << settings.at(mit->first);
+                        Log(Debug::Verbose) << "Added new setting: [" << currentCategory << "] " << mit->first.second
+                                            << " = " << settings.at(mit->first);
                         ostream << mit->first.second << " = " << settings.at(mit->first) << std::endl;
                         mit->second = true;
                         changed = true;
@@ -181,7 +188,7 @@ void Settings::SettingsFileParser::saveSettingsFile(const std::filesystem::path
             }
 
             // Update the current category.
-            currentCategory = line.substr(i+1, end - (i+1));
+            currentCategory = line.substr(i + 1, end - (i + 1));
             Misc::StringUtils::trim(currentCategory);
 
             // Write the (new) current category to the file.
@@ -191,7 +198,7 @@ void Settings::SettingsFileParser::saveSettingsFile(const std::filesystem::path
             // A setting can apparently follow the category on an input line.  That's rather
             // inconvenient, since it makes it more likely to have duplicative sections,
             // which our algorithm doesn't like.  Do the best we can.
-            i = end+1;
+            i = end + 1;
         }
 
         // Truncate trailing whitespace, since we're changing the file anayway.
@@ -201,7 +208,8 @@ void Settings::SettingsFileParser::saveSettingsFile(const std::filesystem::path
         // If we've found settings before the first category, something's wrong.  This
         // should never happen unless the player edited the file while playing, since
         // the loadSettingsFile() logic rejects it.
-        if (currentCategory.empty()) {
+        if (currentCategory.empty())
+        {
             ostream << "# empty category name: " << line << std::endl;
             changed = true;
             continue;
@@ -210,16 +218,17 @@ void Settings::SettingsFileParser::saveSettingsFile(const std::filesystem::path
         // Which setting was at this location in the input file?
         size_t settingEnd = line.find('=', i);
         // This should never happen unless the player edited the file while playing.
-        if (settingEnd == std::string::npos) {
+        if (settingEnd == std::string::npos)
+        {
             ostream << "# unterminated setting name: " << line << std::endl;
             changed = true;
             continue;
         }
-        std::string setting = line.substr(i, (settingEnd-i));
+        std::string setting = line.substr(i, (settingEnd - i));
         Misc::StringUtils::trim(setting);
 
         // Get the existing value so we can see if we've changed it.
-        size_t valueBegin = settingEnd+1;
+        size_t valueBegin = settingEnd + 1;
         std::string value = line.substr(valueBegin);
         Misc::StringUtils::trim(value);
 
@@ -232,7 +241,8 @@ void Settings::SettingsFileParser::saveSettingsFile(const std::filesystem::path
         // happen if the player edited the file while playing, because loadSettingsFile()
         // will accept anything and pass it along in the map, but in the future, we might
         // want to handle invalid settings more gracefully here.
-        if (finder == written.end()) {
+        if (finder == written.end())
+        {
             ostream << "# invalid setting: " << line << std::endl;
             changed = true;
             continue;
@@ -244,9 +254,10 @@ void Settings::SettingsFileParser::saveSettingsFile(const std::filesystem::path
         // Mark that setting as written.
         finder->second = true;
         // Did we really change it?
-        if (value != settings.at(key)) {
-            Log(Debug::Verbose) << "Changed setting: [" << currentCategory << "] "
-                    << setting << " = " << settings.at(key);
+        if (value != settings.at(key))
+        {
+            Log(Debug::Verbose) << "Changed setting: [" << currentCategory << "] " << setting << " = "
+                                << settings.at(key);
             changed = true;
         }
         // No need to write the current line, because we just emitted a replacement.
@@ -260,10 +271,12 @@ void Settings::SettingsFileParser::saveSettingsFile(const std::filesystem::path
 
     // Ensure that all options in the current category have been written.  We must complete
     // the current category at the end of the file before moving on to any new categories.
-    for (CategorySettingStatusMap::iterator mit = written.begin(); mit != written.end(); ++mit) {
-        if (mit->second == false && mit->first.first == currentCategory) {
-            Log(Debug::Verbose) << "Added new setting: [" << mit->first.first << "] "
-                    << mit->first.second << " = " << settings.at(mit->first);
+    for (CategorySettingStatusMap::iterator mit = written.begin(); mit != written.end(); ++mit)
+    {
+        if (mit->second == false && mit->first.first == currentCategory)
+        {
+            Log(Debug::Verbose) << "Added new setting: [" << mit->first.first << "] " << mit->first.second << " = "
+                                << settings.at(mit->first);
             ostream << mit->first.second << " = " << settings.at(mit->first) << std::endl;
             mit->second = true;
             changed = true;
@@ -272,11 +285,13 @@ void Settings::SettingsFileParser::saveSettingsFile(const std::filesystem::path
 
     // If there was absolutely nothing in the file (or more likely the file didn't
     // exist), start the newly created file with a helpful comment.
-    if (!existing) {
+    if (!existing)
+    {
         ostream << "# This is the OpenMW user 'settings.cfg' file.  This file only contains" << std::endl;
         ostream << "# explicitly changed settings.  If you would like to revert a setting" << std::endl;
         ostream << "# to its default, simply remove it from this file.  For available" << std::endl;
-        ostream << "# settings, see the file 'files/settings-default.cfg' in our source repo or the documentation at:" << std::endl;
+        ostream << "# settings, see the file 'files/settings-default.cfg' in our source repo or the documentation at:"
+                << std::endl;
         ostream << "#" << std::endl;
         ostream << "#   https://openmw.readthedocs.io/en/master/reference/modding/settings/index.html" << std::endl;
     }
@@ -285,18 +300,21 @@ void Settings::SettingsFileParser::saveSettingsFile(const std::filesystem::path
     // It's possible that there are entirely new categories, or that the input file had
     // disappeared completely, so we need ensure that all settings are written to the file
     // regardless of those issues.
-    for (CategorySettingStatusMap::iterator mit = written.begin(); mit != written.end(); ++mit) {
+    for (CategorySettingStatusMap::iterator mit = written.begin(); mit != written.end(); ++mit)
+    {
         // If the setting hasn't been written yet.
-        if (mit->second == false) {
+        if (mit->second == false)
+        {
             // If the catgory has changed, write a new category header.
-            if (mit->first.first != currentCategory) {
+            if (mit->first.first != currentCategory)
+            {
                 currentCategory = mit->first.first;
                 Log(Debug::Verbose) << "Created new setting section: " << mit->first.first;
                 ostream << std::endl;
                 ostream << "[" << currentCategory << "]" << std::endl;
             }
-            Log(Debug::Verbose) << "Added new setting: [" << mit->first.first << "] "
-                    << mit->first.second << " = " << settings.at(mit->first);
+            Log(Debug::Verbose) << "Added new setting: [" << mit->first.first << "] " << mit->first.second << " = "
+                                << settings.at(mit->first);
             // Then write the setting.  No need to mark it as written because we're done.
             ostream << mit->first.second << " = " << settings.at(mit->first) << std::endl;
             changed = true;
@@ -304,7 +322,8 @@ void Settings::SettingsFileParser::saveSettingsFile(const std::filesystem::path
     }
 
     // Now install the newly written file in the requested place.
-    if (changed) {
+    if (changed)
+    {
         Log(Debug::Info) << "Updating settings file: " << file;
         std::ofstream ofstream;
         ofstream.open(file);
diff --git a/components/settings/parser.hpp b/components/settings/parser.hpp
index a062a39fa2..6c2da6f8e1 100644
--- a/components/settings/parser.hpp
+++ b/components/settings/parser.hpp
@@ -3,18 +3,18 @@
 
 #include "categories.hpp"
 
-#include <string>
 #include <filesystem>
+#include <string>
 
 namespace Settings
 {
     class SettingsFileParser
     {
     public:
-        void loadSettingsFile(const std::filesystem::path &file, CategorySettingValueMap& settings,
-                              bool base64Encoded = false, bool overrideExisting = false);
+        void loadSettingsFile(const std::filesystem::path& file, CategorySettingValueMap& settings,
+            bool base64Encoded = false, bool overrideExisting = false);
 
-        void saveSettingsFile(const std::filesystem::path &file, const CategorySettingValueMap& settings);
+        void saveSettingsFile(const std::filesystem::path& file, const CategorySettingValueMap& settings);
 
     private:
         /// Increment i until it longer points to a whitespace character
diff --git a/components/settings/settings.cpp b/components/settings/settings.cpp
index b252af2ccf..5dfadd9d50 100644
--- a/components/settings/settings.cpp
+++ b/components/settings/settings.cpp
@@ -10,270 +10,273 @@
 namespace Settings
 {
 
-CategorySettingValueMap Manager::mDefaultSettings = CategorySettingValueMap();
-CategorySettingValueMap Manager::mUserSettings = CategorySettingValueMap();
-CategorySettingVector Manager::mChangedSettings = CategorySettingVector();
+    CategorySettingValueMap Manager::mDefaultSettings = CategorySettingValueMap();
+    CategorySettingValueMap Manager::mUserSettings = CategorySettingValueMap();
+    CategorySettingVector Manager::mChangedSettings = CategorySettingVector();
 
-void Manager::clear()
-{
-    mDefaultSettings.clear();
-    mUserSettings.clear();
-    mChangedSettings.clear();
-}
+    void Manager::clear()
+    {
+        mDefaultSettings.clear();
+        mUserSettings.clear();
+        mChangedSettings.clear();
+    }
 
-std::filesystem::path Manager::load(const Files::ConfigurationManager& cfgMgr, bool loadEditorSettings)
-{
-    SettingsFileParser parser;
-    const std::vector<std::filesystem::path>& paths = cfgMgr.getActiveConfigPaths();
-    if (paths.empty())
-        throw std::runtime_error("No config dirs! ConfigurationManager::readConfiguration must be called first.");
+    std::filesystem::path Manager::load(const Files::ConfigurationManager& cfgMgr, bool loadEditorSettings)
+    {
+        SettingsFileParser parser;
+        const std::vector<std::filesystem::path>& paths = cfgMgr.getActiveConfigPaths();
+        if (paths.empty())
+            throw std::runtime_error("No config dirs! ConfigurationManager::readConfiguration must be called first.");
+
+        // Create file name strings for either the engine or the editor.
+        std::string defaultSettingsFile;
+        std::string userSettingsFile;
+
+        if (!loadEditorSettings)
+        {
+            defaultSettingsFile = "defaults.bin";
+            userSettingsFile = "settings.cfg";
+        }
+        else
+        {
+            defaultSettingsFile = "defaults-cs.bin";
+            userSettingsFile = "openmw-cs.cfg";
+        }
+
+        // Create the settings manager and load default settings file.
+        const auto defaultsBin = paths.front() / defaultSettingsFile;
+        if (!std::filesystem::exists(defaultsBin))
+            throw std::runtime_error("No default settings file found! Make sure the file \"" + defaultSettingsFile
+                + "\" was properly installed.");
+        parser.loadSettingsFile(defaultsBin, mDefaultSettings, true, false);
+
+        // Load "settings.cfg" or "openmw-cs.cfg" from every config dir except the last one as additional default
+        // settings.
+        for (int i = 0; i < static_cast<int>(paths.size()) - 1; ++i)
+        {
+            const auto additionalDefaults = paths[i] / userSettingsFile;
+            if (std::filesystem::exists(additionalDefaults))
+                parser.loadSettingsFile(additionalDefaults, mDefaultSettings, false, true);
+        }
+
+        // Load "settings.cfg" or "openmw-cs.cfg" from the last config dir as user settings. This path will be used to
+        // save modified settings.
+        auto settingspath = paths.back() / userSettingsFile;
+        if (std::filesystem::exists(settingspath))
+            parser.loadSettingsFile(settingspath, mUserSettings, false, false);
+
+        return settingspath;
+    }
 
-    // Create file name strings for either the engine or the editor.
-    std::string defaultSettingsFile;
-    std::string userSettingsFile;
+    void Manager::saveUser(const std::filesystem::path& file)
+    {
+        SettingsFileParser parser;
+        parser.saveSettingsFile(file, mUserSettings);
+    }
 
-    if (!loadEditorSettings)
+    const std::string& Manager::getString(std::string_view setting, std::string_view category)
     {
-        defaultSettingsFile = "defaults.bin";
-        userSettingsFile = "settings.cfg";
+        const auto key = std::make_pair(category, setting);
+        CategorySettingValueMap::iterator it = mUserSettings.find(key);
+        if (it != mUserSettings.end())
+            return it->second;
+
+        it = mDefaultSettings.find(key);
+        if (it != mDefaultSettings.end())
+            return it->second;
+
+        std::string error("Trying to retrieve a non-existing setting: ");
+        error += setting;
+        error += ".\nMake sure the defaults.bin file was properly installed.";
+        throw std::runtime_error(error);
     }
-    else
+
+    std::vector<std::string> Manager::getStringArray(std::string_view setting, std::string_view category)
     {
-        defaultSettingsFile = "defaults-cs.bin";
-        userSettingsFile = "openmw-cs.cfg";
+        // TODO: it is unclear how to handle empty value -
+        // there is no difference between empty serialized array
+        // and a serialized array which has one empty value
+        std::vector<std::string> values;
+        const std::string& value = getString(setting, category);
+        if (value.empty())
+            return values;
+
+        Misc::StringUtils::split(value, values, ",");
+        for (auto& item : values)
+            Misc::StringUtils::trim(item);
+        return values;
     }
 
-    // Create the settings manager and load default settings file.
-    const auto defaultsBin = paths.front() / defaultSettingsFile;
-    if (!std::filesystem::exists(defaultsBin))
-        throw std::runtime_error ("No default settings file found! Make sure the file \"" + defaultSettingsFile + "\" was properly installed.");
-    parser.loadSettingsFile(defaultsBin, mDefaultSettings, true, false);
+    float Manager::getFloat(std::string_view setting, std::string_view category)
+    {
+        const std::string& value = getString(setting, category);
+        std::stringstream stream(value);
+        float number = 0.f;
+        stream >> number;
+        return number;
+    }
 
-    // Load "settings.cfg" or "openmw-cs.cfg" from every config dir except the last one as additional default settings.
-    for (int i = 0; i < static_cast<int>(paths.size()) - 1; ++i)
+    double Manager::getDouble(std::string_view setting, std::string_view category)
     {
-        const auto additionalDefaults = paths[i] / userSettingsFile;
-        if (std::filesystem::exists(additionalDefaults))
-            parser.loadSettingsFile(additionalDefaults, mDefaultSettings, false, true);
+        const std::string& value = getString(setting, category);
+        std::stringstream stream(value);
+        double number = 0.0;
+        stream >> number;
+        return number;
     }
 
-    // Load "settings.cfg" or "openmw-cs.cfg" from the last config dir as user settings. This path will be used to save modified settings.
-    auto settingspath = paths.back() / userSettingsFile;
-    if (std::filesystem::exists(settingspath))
-        parser.loadSettingsFile(settingspath, mUserSettings, false, false);
+    int Manager::getInt(std::string_view setting, std::string_view category)
+    {
+        const std::string& value = getString(setting, category);
+        std::stringstream stream(value);
+        int number = 0;
+        stream >> number;
+        return number;
+    }
 
-    return settingspath;
-}
+    std::int64_t Manager::getInt64(std::string_view setting, std::string_view category)
+    {
+        const std::string& value = getString(setting, category);
+        std::stringstream stream(value);
+        std::int64_t number = 0;
+        stream >> number;
+        return number;
+    }
 
-void Manager::saveUser(const std::filesystem::path &file)
-{
-    SettingsFileParser parser;
-    parser.saveSettingsFile(file, mUserSettings);
-}
+    bool Manager::getBool(std::string_view setting, std::string_view category)
+    {
+        const std::string& string = getString(setting, category);
+        return Misc::StringUtils::ciEqual(string, "true");
+    }
 
-const std::string& Manager::getString(std::string_view setting, std::string_view category)
-{
-    const auto key = std::make_pair(category, setting);
-    CategorySettingValueMap::iterator it = mUserSettings.find(key);
-    if (it != mUserSettings.end())
-        return it->second;
-
-    it = mDefaultSettings.find(key);
-    if (it != mDefaultSettings.end())
-        return it->second;
-
-    std::string error("Trying to retrieve a non-existing setting: ");
-    error += setting;
-    error += ".\nMake sure the defaults.bin file was properly installed.";
-    throw std::runtime_error(error);
-}
+    osg::Vec2f Manager::getVector2(std::string_view setting, std::string_view category)
+    {
+        const std::string& value = getString(setting, category);
+        std::stringstream stream(value);
+        float x, y;
+        stream >> x >> y;
+        if (stream.fail())
+            throw std::runtime_error(std::string("Can't parse 2d vector: " + value));
+        return { x, y };
+    }
 
-std::vector<std::string> Manager::getStringArray(std::string_view setting, std::string_view category)
-{
-    // TODO: it is unclear how to handle empty value -
-    // there is no difference between empty serialized array
-    // and a serialized array which has one empty value
-    std::vector<std::string> values;
-    const std::string& value = getString(setting, category);
-    if (value.empty())
-        return values;
+    osg::Vec3f Manager::getVector3(std::string_view setting, std::string_view category)
+    {
+        const std::string& value = getString(setting, category);
+        std::stringstream stream(value);
+        float x, y, z;
+        stream >> x >> y >> z;
+        if (stream.fail())
+            throw std::runtime_error(std::string("Can't parse 3d vector: " + value));
+        return { x, y, z };
+    }
 
-    Misc::StringUtils::split(value, values, ",");
-    for (auto& item : values)
-        Misc::StringUtils::trim(item);
-    return values;
-}
+    void Manager::setString(std::string_view setting, std::string_view category, const std::string& value)
+    {
+        auto found = mUserSettings.find(std::make_pair(category, setting));
+        if (found != mUserSettings.end())
+        {
+            if (found->second == value)
+                return;
+        }
 
-float Manager::getFloat(std::string_view setting, std::string_view category)
-{
-    const std::string& value = getString(setting, category);
-    std::stringstream stream(value);
-    float number = 0.f;
-    stream >> number;
-    return number;
-}
+        CategorySettingValueMap::key_type key(category, setting);
 
-double Manager::getDouble(std::string_view setting, std::string_view category)
-{
-    const std::string& value = getString(setting, category);
-    std::stringstream stream(value);
-    double number = 0.0;
-    stream >> number;
-    return number;
-}
+        mUserSettings[key] = value;
 
-int Manager::getInt(std::string_view setting, std::string_view category)
-{
-    const std::string& value = getString(setting, category);
-    std::stringstream stream(value);
-    int number = 0;
-    stream >> number;
-    return number;
-}
+        mChangedSettings.insert(std::move(key));
+    }
 
-std::int64_t Manager::getInt64(std::string_view setting, std::string_view category)
-{
-    const std::string& value = getString(setting, category);
-    std::stringstream stream(value);
-    std::int64_t number = 0;
-    stream >> number;
-    return number;
-}
+    void Manager::setStringArray(
+        std::string_view setting, std::string_view category, const std::vector<std::string>& value)
+    {
+        std::stringstream stream;
 
-bool Manager::getBool(std::string_view setting, std::string_view category)
-{
-    const std::string& string = getString(setting, category);
-    return Misc::StringUtils::ciEqual(string, "true");
-}
+        // TODO: escape delimeters, new line characters, etc.
+        for (size_t i = 0; i < value.size(); ++i)
+        {
+            std::string item = value[i];
+            Misc::StringUtils::trim(item);
+            stream << item;
 
-osg::Vec2f Manager::getVector2(std::string_view setting, std::string_view category)
-{
-    const std::string& value = getString(setting, category);
-    std::stringstream stream(value);
-    float x, y;
-    stream >> x >> y;
-    if (stream.fail())
-        throw std::runtime_error(std::string("Can't parse 2d vector: " + value));
-    return {x, y};
-}
+            if (i < value.size() - 1)
+                stream << ",";
+        }
 
-osg::Vec3f Manager::getVector3(std::string_view setting, std::string_view category)
-{
-    const std::string& value = getString(setting, category);
-    std::stringstream stream(value);
-    float x, y, z;
-    stream >> x >> y >> z;
-    if (stream.fail())
-        throw std::runtime_error(std::string("Can't parse 3d vector: " + value));
-    return {x, y, z};
-}
+        setString(setting, category, stream.str());
+    }
 
-void Manager::setString(std::string_view setting, std::string_view category, const std::string &value)
-{
-    auto found = mUserSettings.find(std::make_pair(category, setting));
-    if (found != mUserSettings.end())
+    void Manager::setInt(std::string_view setting, std::string_view category, const int value)
     {
-        if (found->second == value)
-            return;
+        std::ostringstream stream;
+        stream << value;
+        setString(setting, category, stream.str());
     }
 
-    CategorySettingValueMap::key_type key(category, setting);
-
-    mUserSettings[key] = value;
-
-    mChangedSettings.insert(std::move(key));
-}
-
-void Manager::setStringArray(std::string_view setting, std::string_view category, const std::vector<std::string> &value)
-{
-    std::stringstream stream;
-
-    // TODO: escape delimeters, new line characters, etc.
-    for (size_t i = 0; i < value.size(); ++i)
+    void Manager::setInt64(std::string_view setting, std::string_view category, const std::int64_t value)
     {
-        std::string item = value[i];
-        Misc::StringUtils::trim(item);
-        stream << item;
-
-        if (i < value.size() - 1)
-            stream << ",";
+        std::ostringstream stream;
+        stream << value;
+        setString(setting, category, stream.str());
     }
 
-    setString(setting, category, stream.str());
-}
-
-void Manager::setInt(std::string_view setting, std::string_view category, const int value)
-{
-    std::ostringstream stream;
-    stream << value;
-    setString(setting, category, stream.str());
-}
-
-void Manager::setInt64(std::string_view setting, std::string_view category, const std::int64_t value)
-{
-    std::ostringstream stream;
-    stream << value;
-    setString(setting, category, stream.str());
-}
-
-void Manager::setFloat (std::string_view setting, std::string_view category, const float value)
-{
-    std::ostringstream stream;
-    stream << value;
-    setString(setting, category, stream.str());
-}
+    void Manager::setFloat(std::string_view setting, std::string_view category, const float value)
+    {
+        std::ostringstream stream;
+        stream << value;
+        setString(setting, category, stream.str());
+    }
 
-void Manager::setDouble (std::string_view setting, std::string_view category, const double value)
-{
-    std::ostringstream stream;
-    stream << value;
-    setString(setting, category, stream.str());
-}
+    void Manager::setDouble(std::string_view setting, std::string_view category, const double value)
+    {
+        std::ostringstream stream;
+        stream << value;
+        setString(setting, category, stream.str());
+    }
 
-void Manager::setBool(std::string_view setting, std::string_view category, const bool value)
-{
-    setString(setting, category, value ? "true" : "false");
-}
+    void Manager::setBool(std::string_view setting, std::string_view category, const bool value)
+    {
+        setString(setting, category, value ? "true" : "false");
+    }
 
-void Manager::setVector2 (std::string_view setting, std::string_view category, const osg::Vec2f value)
-{
-    std::ostringstream stream;
-    stream << value.x() << " " << value.y();
-    setString(setting, category, stream.str());
-}
+    void Manager::setVector2(std::string_view setting, std::string_view category, const osg::Vec2f value)
+    {
+        std::ostringstream stream;
+        stream << value.x() << " " << value.y();
+        setString(setting, category, stream.str());
+    }
 
-void Manager::setVector3 (std::string_view setting, std::string_view category, const osg::Vec3f value)
-{
-    std::ostringstream stream;
-    stream << value.x() << ' ' << value.y() << ' ' << value.z();
-    setString(setting, category, stream.str());
-}
+    void Manager::setVector3(std::string_view setting, std::string_view category, const osg::Vec3f value)
+    {
+        std::ostringstream stream;
+        stream << value.x() << ' ' << value.y() << ' ' << value.z();
+        setString(setting, category, stream.str());
+    }
 
-CategorySettingVector Manager::getPendingChanges()
-{
-    return mChangedSettings;
-}
+    CategorySettingVector Manager::getPendingChanges()
+    {
+        return mChangedSettings;
+    }
 
-CategorySettingVector Manager::getPendingChanges(const CategorySettingVector& filter)
-{
-    CategorySettingVector intersection;
-    std::set_intersection(mChangedSettings.begin(), mChangedSettings.end(),
-                          filter.begin(), filter.end(),
-                          std::inserter(intersection, intersection.begin()));
-    return intersection;
-}
+    CategorySettingVector Manager::getPendingChanges(const CategorySettingVector& filter)
+    {
+        CategorySettingVector intersection;
+        std::set_intersection(mChangedSettings.begin(), mChangedSettings.end(), filter.begin(), filter.end(),
+            std::inserter(intersection, intersection.begin()));
+        return intersection;
+    }
 
-void Manager::resetPendingChanges()
-{
-    mChangedSettings.clear();
-}
+    void Manager::resetPendingChanges()
+    {
+        mChangedSettings.clear();
+    }
 
-void Manager::resetPendingChanges(const CategorySettingVector& filter)
-{
-    for (const auto& key : filter)
+    void Manager::resetPendingChanges(const CategorySettingVector& filter)
     {
-        mChangedSettings.erase(key);
+        for (const auto& key : filter)
+        {
+            mChangedSettings.erase(key);
+        }
     }
-}
 
 }
diff --git a/components/settings/settings.hpp b/components/settings/settings.hpp
index e5e841e3de..6efd494e9c 100644
--- a/components/settings/settings.hpp
+++ b/components/settings/settings.hpp
@@ -3,15 +3,15 @@
 
 #include "categories.hpp"
 
-#include <set>
 #include <map>
+#include <set>
 #include <string>
 #include <string_view>
 #include <vector>
 
+#include <filesystem>
 #include <osg/Vec2f>
 #include <osg/Vec3f>
-#include <filesystem>
 
 namespace Files
 {
@@ -45,7 +45,7 @@ namespace Settings
         static std::filesystem::path load(const Files::ConfigurationManager& cfgMgr, bool loadEditorSettings = false);
         ///< load settings from all active config dirs. Returns the path of the last loaded file.
 
-        static void saveUser (const std::filesystem::path &file);
+        static void saveUser(const std::filesystem::path& file);
         ///< save user settings to file
 
         static void resetPendingChanges();
@@ -75,7 +75,8 @@ namespace Settings
         static void setFloat(std::string_view setting, std::string_view category, float value);
         static void setDouble(std::string_view setting, std::string_view category, double value);
         static void setString(std::string_view setting, std::string_view category, const std::string& value);
-        static void setStringArray(std::string_view setting, std::string_view category, const std::vector<std::string> &value);
+        static void setStringArray(
+            std::string_view setting, std::string_view category, const std::vector<std::string>& value);
         static void setBool(std::string_view setting, std::string_view category, bool value);
         static void setVector2(std::string_view setting, std::string_view category, osg::Vec2f value);
         static void setVector3(std::string_view setting, std::string_view category, osg::Vec3f value);
diff --git a/components/settings/shadermanager.hpp b/components/settings/shadermanager.hpp
index 9cfca7d945..9f78e8f1bb 100644
--- a/components/settings/shadermanager.hpp
+++ b/components/settings/shadermanager.hpp
@@ -1,10 +1,10 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_SHADERMANAGER_H
 #define OPENMW_COMPONENTS_SETTINGS_SHADERMANAGER_H
 
-#include <unordered_map>
 #include <filesystem>
-#include <optional>
 #include <fstream>
+#include <optional>
+#include <unordered_map>
 #include <vector>
 
 #include <yaml-cpp/yaml.h>
@@ -13,9 +13,9 @@
 #include <osg/Vec3f>
 #include <osg/Vec4f>
 
-#include <components/serialization/osgyaml.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/files/conversion.hpp>
+#include <components/serialization/osgyaml.hpp>
 
 namespace Settings
 {
@@ -30,11 +30,10 @@ namespace Settings
      *    MY_VEC2: [0.23, 0.34]
      *   TECHNIQUE2:
      *    MY_VEC3: [0.22, 0.33, 0.20]
-    */
+     */
     class ShaderManager
     {
     public:
-
         enum class Mode
         {
             Normal,
@@ -51,27 +50,19 @@ namespace Settings
             return instance;
         }
 
-        Mode getMode()
-        {
-            return mMode;
-        }
+        Mode getMode() { return mMode; }
 
-        void setMode(Mode mode)
-        {
-            mMode = mode;
-        }
+        void setMode(Mode mode) { mMode = mode; }
 
-        const YAML::Node& getRoot()
-        {
-            return mData;
-        }
+        const YAML::Node& getRoot() { return mData; }
 
         template <class T>
         bool setValue(const std::string& tname, const std::string& uname, const T& value)
         {
             if (mData.IsNull())
             {
-                Log(Debug::Warning) << "Failed setting " << tname << ", " << uname << " : shader settings failed to load";
+                Log(Debug::Warning) << "Failed setting " << tname << ", " << uname
+                                    << " : shader settings failed to load";
                 return false;
             }
 
@@ -84,7 +75,8 @@ namespace Settings
         {
             if (mData.IsNull())
             {
-                Log(Debug::Warning) << "Failed getting " << tname << ", " << uname << " : shader settings failed to load";
+                Log(Debug::Warning) << "Failed getting " << tname << ", " << uname
+                                    << " : shader settings failed to load";
                 return std::nullopt;
             }
 
@@ -97,15 +89,16 @@ namespace Settings
 
                 return value.as<T>();
             }
-            catch(const YAML::BadConversion&)
+            catch (const YAML::BadConversion&)
             {
-                Log(Debug::Warning) << "Failed retrieving " << tname << ", " << uname << " : mismatched types in config file.";
+                Log(Debug::Warning) << "Failed retrieving " << tname << ", " << uname
+                                    << " : mismatched types in config file.";
             }
 
             return std::nullopt;
         }
 
-        bool load(const std::filesystem::path &path)
+        bool load(const std::filesystem::path& path)
         {
             mData = YAML::Null;
             mPath = path;
@@ -124,7 +117,7 @@ namespace Settings
 
             try
             {
-                std::ifstream file{mPath};
+                std::ifstream file{ mPath };
                 mData = YAML::Load(file);
                 mData.SetStyle(YAML::EmitterStyle::Block);
 
@@ -133,9 +126,9 @@ namespace Settings
 
                 return true;
             }
-            catch(const YAML::Exception& e)
+            catch (const YAML::Exception& e)
             {
-                Log(Debug::Error) << "Shader settings failed to load, " <<  e.msg;
+                Log(Debug::Error) << "Shader settings failed to load, " << e.msg;
             }
 
             return false;
diff --git a/components/shader/removedalphafunc.cpp b/components/shader/removedalphafunc.cpp
index 6b701b8900..9153ada5b7 100644
--- a/components/shader/removedalphafunc.cpp
+++ b/components/shader/removedalphafunc.cpp
@@ -6,15 +6,15 @@
 
 namespace Shader
 {
-    std::array<osg::ref_ptr<RemovedAlphaFunc>, GL_ALWAYS - GL_NEVER + 1> RemovedAlphaFunc::sInstances{
-        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
-    };
+    std::array<osg::ref_ptr<RemovedAlphaFunc>, GL_ALWAYS - GL_NEVER + 1> RemovedAlphaFunc::sInstances{ nullptr, nullptr,
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr };
 
     osg::ref_ptr<RemovedAlphaFunc> RemovedAlphaFunc::getInstance(GLenum func)
     {
         assert(func >= GL_NEVER && func <= GL_ALWAYS);
         if (!sInstances[func - GL_NEVER])
-            sInstances[func - GL_NEVER] = new RemovedAlphaFunc(static_cast<osg::AlphaFunc::ComparisonFunction>(func), 1.0);
+            sInstances[func - GL_NEVER]
+                = new RemovedAlphaFunc(static_cast<osg::AlphaFunc::ComparisonFunction>(func), 1.0);
         return sInstances[func - GL_NEVER];
     }
 }
diff --git a/components/shader/removedalphafunc.hpp b/components/shader/removedalphafunc.hpp
index c744391e56..31f7305293 100644
--- a/components/shader/removedalphafunc.hpp
+++ b/components/shader/removedalphafunc.hpp
@@ -17,15 +17,18 @@ namespace Shader
 
         RemovedAlphaFunc()
             : osg::AlphaFunc()
-        {}
+        {
+        }
 
         RemovedAlphaFunc(ComparisonFunction func, float ref)
             : osg::AlphaFunc(func, ref)
-        {}
+        {
+        }
 
         RemovedAlphaFunc(const RemovedAlphaFunc& raf, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY)
             : osg::AlphaFunc(raf, copyop)
-        {}
+        {
+        }
 
         META_StateAttribute(Shader, RemovedAlphaFunc, ALPHAFUNC);
 
@@ -37,4 +40,4 @@ namespace Shader
         static std::array<osg::ref_ptr<RemovedAlphaFunc>, GL_ALWAYS - GL_NEVER + 1> sInstances;
     };
 }
-#endif //OPENMW_COMPONENTS_REMOVEDALPHAFUNC_H
+#endif // OPENMW_COMPONENTS_REMOVEDALPHAFUNC_H
diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index 80652eb499..9f31412713 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -1,20 +1,20 @@
 #include "shadermanager.hpp"
 
-#include <fstream>
 #include <algorithm>
-#include <sstream>
-#include <regex>
-#include <filesystem>
-#include <set>
-#include <unordered_map>
 #include <chrono>
-#include <osg/Program>
-#include <osgViewer/Viewer>
 #include <components/debug/debuglog.hpp>
+#include <components/files/conversion.hpp>
 #include <components/misc/strings/algorithm.hpp>
 #include <components/misc/strings/format.hpp>
 #include <components/settings/settings.hpp>
-#include <components/files/conversion.hpp>
+#include <filesystem>
+#include <fstream>
+#include <osg/Program>
+#include <osgViewer/Viewer>
+#include <regex>
+#include <set>
+#include <sstream>
+#include <unordered_map>
 
 namespace Shader
 {
@@ -26,14 +26,14 @@ namespace Shader
 
     ShaderManager::~ShaderManager() = default;
 
-    void ShaderManager::setShaderPath(const std::filesystem::path &path)
+    void ShaderManager::setShaderPath(const std::filesystem::path& path)
     {
         mPath = path;
     }
 
     bool addLineDirectivesAfterConditionalBlocks(std::string& source)
     {
-        for (size_t position = 0; position < source.length(); )
+        for (size_t position = 0; position < source.length();)
         {
             size_t foundPos = source.find("#endif", position);
             foundPos = std::min(foundPos, source.find("#elif", position));
@@ -74,12 +74,15 @@ namespace Shader
 
     // Recursively replaces include statements with the actual source of the included files.
     // Adjusts #line statements accordingly and detects cyclic includes.
-    // cycleIncludeChecker is the set of files that include this file directly or indirectly, and is intentionally not a reference to allow automatic cleanup.
-    static bool parseIncludes(const std::filesystem::path& shaderPath, std::string& source, const std::string& fileName, int& fileNumber, std::set<std::filesystem::path> cycleIncludeChecker,std::set<std::filesystem::path>& includedFiles)
+    // cycleIncludeChecker is the set of files that include this file directly or indirectly, and is intentionally not a
+    // reference to allow automatic cleanup.
+    static bool parseIncludes(const std::filesystem::path& shaderPath, std::string& source, const std::string& fileName,
+        int& fileNumber, std::set<std::filesystem::path> cycleIncludeChecker,
+        std::set<std::filesystem::path>& includedFiles)
     {
         includedFiles.insert(shaderPath / fileName);
         // An include is cyclic if it is being included by itself
-        if (cycleIncludeChecker.insert(shaderPath/fileName).second == false)
+        if (cycleIncludeChecker.insert(shaderPath / fileName).second == false)
         {
             Log(Debug::Error) << "Shader " << fileName << " error: Detected cyclic #includes";
             return false;
@@ -136,14 +139,16 @@ namespace Shader
             buffer << includeFstream.rdbuf();
             std::string stringRepresentation = buffer.str();
             if (!addLineDirectivesAfterConditionalBlocks(stringRepresentation)
-                || !parseIncludes(shaderPath, stringRepresentation, includeFilename, fileNumber, cycleIncludeChecker, includedFiles))
+                || !parseIncludes(
+                    shaderPath, stringRepresentation, includeFilename, fileNumber, cycleIncludeChecker, includedFiles))
             {
                 Log(Debug::Error) << "In file included from " << fileName << "." << lineNumber;
                 return false;
             }
 
             std::stringstream toInsert;
-            toInsert << "#line 0 " << includedFileNumber << "\n" << stringRepresentation << "\n#line " << lineNumber << " 0\n";
+            toInsert << "#line 0 " << includedFileNumber << "\n"
+                     << stringRepresentation << "\n#line " << lineNumber << " 0\n";
 
             source.replace(foundPos, (end - foundPos + 1), toInsert.str());
         }
@@ -201,7 +206,8 @@ namespace Shader
         lineNumber += std::count(source.begin() + lineDirectivePosition, source.begin() + overallEnd, '\n');
 
         std::string replacement;
-        for (std::vector<std::string>::const_iterator element = listElements.cbegin(); element != listElements.cend(); element++)
+        for (std::vector<std::string>::const_iterator element = listElements.cbegin(); element != listElements.cend();
+             element++)
         {
             std::string contentInstance = content;
             size_t foundIterator;
@@ -214,18 +220,18 @@ namespace Shader
         return true;
     }
 
-    bool parseLinkDirective(std::string& source, std::string& linkTarget, const std::string& templateName, size_t foundPos)
+    bool parseLinkDirective(
+        std::string& source, std::string& linkTarget, const std::string& templateName, size_t foundPos)
     {
         size_t endPos = foundPos + 5;
         size_t lineEnd = source.find_first_of('\n', endPos);
         // If lineEnd = npos, this is the last line, so no need to check
         std::string linkStatement = source.substr(endPos, lineEnd - endPos);
-        std::regex linkRegex(
-            R"r(\s*"([^"]+)"\s*)r" // Find any quoted string as the link name -> match[1]
-            R"r((if\s+)r" // Begin optional condition -> match[2]
-                R"r((!)?\s*)r" // Optional ! -> match[3]
-                R"r(([_a-zA-Z0-9]+)?)r" // The condition -> match[4]
-            R"r()?\s*)r" // End optional condition -> match[2]
+        std::regex linkRegex(R"r(\s*"([^"]+)"\s*)r" // Find any quoted string as the link name -> match[1]
+                             R"r((if\s+)r" // Begin optional condition -> match[2]
+                             R"r((!)?\s*)r" // Optional ! -> match[3]
+                             R"r(([_a-zA-Z0-9]+)?)r" // The condition -> match[4]
+                             R"r()?\s*)r" // End optional condition -> match[2]
         );
         std::smatch linkMatch;
         bool hasCondition = false;
@@ -252,7 +258,7 @@ namespace Shader
             bool condition = !(linkConditionExpression.empty() || linkConditionExpression == "0");
             if (linkMatch[3].str() == "!")
                 condition = !condition;
-            
+
             if (!condition)
                 linkTarget.clear();
         }
@@ -261,7 +267,9 @@ namespace Shader
         return true;
     }
 
-    bool parseDirectives(std::string& source, std::vector<std::string>& linkedShaderTemplateNames, const ShaderManager::DefineMap& defines, const ShaderManager::DefineMap& globalDefines, const std::string& templateName)
+    bool parseDirectives(std::string& source, std::vector<std::string>& linkedShaderTemplateNames,
+        const ShaderManager::DefineMap& defines, const ShaderManager::DefineMap& globalDefines,
+        const std::string& templateName)
     {
         const char escapeCharacter = '$';
         size_t foundPos = 0;
@@ -312,7 +320,7 @@ namespace Shader
                 Log(Debug::Error) << "Shader " << templateName << " error: Unexpected EOF";
                 return false;
             }
-            std::string define = source.substr(foundPos+1, endPos - (foundPos+1));
+            std::string define = source.substr(foundPos + 1, endPos - (foundPos + 1));
             ShaderManager::DefineMap::const_iterator defineFound = defines.find(define);
             ShaderManager::DefineMap::const_iterator globalDefineFound = globalDefines.find(define);
             if (define == "foreach")
@@ -380,7 +388,7 @@ namespace Shader
             mLastAutoRecompileTime = std::filesystem::file_time_type::clock::now();
         }
 
-        void addShaderFiles(const std::string& templateName,const ShaderManager::DefineMap& defines )
+        void addShaderFiles(const std::string& templateName, const ShaderManager::DefineMap& defines)
         {
             const std::set<std::filesystem::path>& shaderFiles = templateIncludedFiles[templateName];
             for (const std::filesystem::path& file : shaderFiles)
@@ -389,9 +397,10 @@ namespace Shader
             }
         }
 
-        void update(ShaderManager& Manager,osgViewer::Viewer& viewer)
+        void update(ShaderManager& Manager, osgViewer::Viewer& viewer)
         {
-            auto timeSinceLastCheckMillis = std::chrono::duration_cast<std::chrono::milliseconds>(std::filesystem::file_time_type::clock::now() - mLastAutoRecompileTime);
+            auto timeSinceLastCheckMillis = std::chrono::duration_cast<std::chrono::milliseconds>(
+                std::filesystem::file_time_type::clock::now() - mLastAutoRecompileTime);
             if ((mHotReloadEnabled && timeSinceLastCheckMillis.count() > 200) || mTriggerReload == true)
             {
                 reloadTouchedShaders(Manager, viewer);
@@ -402,7 +411,7 @@ namespace Shader
         void reloadTouchedShaders(ShaderManager& Manager, osgViewer::Viewer& viewer)
         {
             bool threadsRunningToStop = false;
-            for (auto& [pathShaderToTest,  shaderKeys]: mShaderFiles)
+            for (auto& [pathShaderToTest, shaderKeys] : mShaderFiles)
             {
 
                 std::filesystem::file_time_type write_time = std::filesystem::last_write_time(pathShaderToTest);
@@ -415,11 +424,13 @@ namespace Shader
                             viewer.stopThreading();
                     }
 
-                    for (const auto& [templateName, shaderDefines]: shaderKeys)
+                    for (const auto& [templateName, shaderDefines] : shaderKeys)
                     {
-                        ShaderManager::ShaderMap::iterator shaderIt = Manager.mShaders.find(std::make_pair(templateName, shaderDefines));
+                        ShaderManager::ShaderMap::iterator shaderIt
+                            = Manager.mShaders.find(std::make_pair(templateName, shaderDefines));
 
-                        ShaderManager::TemplateMap::iterator templateIt = Manager.mShaderTemplates.find(templateName); //Can't be Null, if we're here it means the template was added
+                        ShaderManager::TemplateMap::iterator templateIt = Manager.mShaderTemplates.find(
+                            templateName); // Can't be Null, if we're here it means the template was added
                         std::string& shaderSource = templateIt->second;
                         std::set<std::filesystem::path> insertedPaths;
                         std::filesystem::path path = (std::filesystem::path(Manager.mPath) / templateName);
@@ -436,19 +447,20 @@ namespace Shader
                         int fileNumber = 1;
                         std::string source = buffer.str();
                         if (!addLineDirectivesAfterConditionalBlocks(source)
-                            || !parseIncludes(std::filesystem::path(Manager.mPath), source, templateName, fileNumber, {}, insertedPaths))
+                            || !parseIncludes(std::filesystem::path(Manager.mPath), source, templateName, fileNumber,
+                                {}, insertedPaths))
                         {
                             break;
                         }
                         shaderSource = source;
 
                         std::vector<std::string> linkedShaderNames;
-                        if (!Manager.createSourceFromTemplate(shaderSource, linkedShaderNames, templateName, shaderDefines))
+                        if (!Manager.createSourceFromTemplate(
+                                shaderSource, linkedShaderNames, templateName, shaderDefines))
                         {
                             break;
                         }
                         shaderIt->second->setShaderSource(shaderSource);
-                            
                     }
                 }
             }
@@ -458,7 +470,8 @@ namespace Shader
         }
     };
 
-    osg::ref_ptr<osg::Shader> ShaderManager::getShader(const std::string &templateName, const ShaderManager::DefineMap &defines, osg::Shader::Type shaderType)
+    osg::ref_ptr<osg::Shader> ShaderManager::getShader(
+        const std::string& templateName, const ShaderManager::DefineMap& defines, osg::Shader::Type shaderType)
     {
         std::unique_lock<std::mutex> lock(mMutex);
 
@@ -501,7 +514,7 @@ namespace Shader
                 return nullptr;
             }
 
-            osg::ref_ptr<osg::Shader> shader (new osg::Shader(shaderType));
+            osg::ref_ptr<osg::Shader> shader(new osg::Shader(shaderType));
             shader->setShaderSource(shaderSource);
             // Assign a unique prefix to allow the SharedStateManager to compare shaders efficiently.
             // Append shader source filename for debugging.
@@ -519,14 +532,17 @@ namespace Shader
         return shaderIt->second;
     }
 
-    osg::ref_ptr<osg::Program> ShaderManager::getProgram(osg::ref_ptr<osg::Shader> vertexShader, osg::ref_ptr<osg::Shader> fragmentShader, const osg::Program* programTemplate)
+    osg::ref_ptr<osg::Program> ShaderManager::getProgram(osg::ref_ptr<osg::Shader> vertexShader,
+        osg::ref_ptr<osg::Shader> fragmentShader, const osg::Program* programTemplate)
     {
         std::lock_guard<std::mutex> lock(mMutex);
         ProgramMap::iterator found = mPrograms.find(std::make_pair(vertexShader, fragmentShader));
         if (found == mPrograms.end())
         {
-            if (!programTemplate) programTemplate = mProgramTemplate;
-            osg::ref_ptr<osg::Program> program = programTemplate ? cloneProgram(programTemplate) : osg::ref_ptr<osg::Program>(new osg::Program);
+            if (!programTemplate)
+                programTemplate = mProgramTemplate;
+            osg::ref_ptr<osg::Program> program
+                = programTemplate ? cloneProgram(programTemplate) : osg::ref_ptr<osg::Program>(new osg::Program);
             program->addShader(vertexShader);
             program->addShader(fragmentShader);
             addLinkedShaders(vertexShader, program);
@@ -550,21 +566,23 @@ namespace Shader
         return DefineMap(mGlobalDefines);
     }
 
-    void ShaderManager::setGlobalDefines(DefineMap & globalDefines)
+    void ShaderManager::setGlobalDefines(DefineMap& globalDefines)
     {
         mGlobalDefines = globalDefines;
-        for (const auto& [key, shader]: mShaders)
+        for (const auto& [key, shader] : mShaders)
         {
             std::string templateId = key.first;
             ShaderManager::DefineMap defines = key.second;
             if (shader == nullptr)
-                // I'm not sure how to handle a shader that was already broken as there's no way to get a potential replacement to the nodes that need it.
+                // I'm not sure how to handle a shader that was already broken as there's no way to get a potential
+                // replacement to the nodes that need it.
                 continue;
             std::string shaderSource = mShaderTemplates[templateId];
             std::vector<std::string> linkedShaderNames;
             if (!createSourceFromTemplate(shaderSource, linkedShaderNames, templateId, defines))
-                // We just broke the shader and there's no way to force existing objects back to fixed-function mode as we would when creating the shader.
-                // If we put a nullptr in the shader map, we just lose the ability to put a working one in later.
+                // We just broke the shader and there's no way to force existing objects back to fixed-function mode as
+                // we would when creating the shader. If we put a nullptr in the shader map, we just lose the ability to
+                // put a working one in later.
                 continue;
             shader->setShaderSource(shaderSource);
 
@@ -572,7 +590,7 @@ namespace Shader
         }
     }
 
-    void ShaderManager::releaseGLObjects(osg::State *state)
+    void ShaderManager::releaseGLObjects(osg::State* state)
     {
         std::lock_guard<std::mutex> lock(mMutex);
         for (const auto& [_, shader] : mShaders)
@@ -584,7 +602,9 @@ namespace Shader
             program->releaseGLObjects(state);
     }
 
-    bool ShaderManager::createSourceFromTemplate(std::string& source, std::vector<std::string>& linkedShaderTemplateNames, const std::string& templateName, const ShaderManager::DefineMap& defines)
+    bool ShaderManager::createSourceFromTemplate(std::string& source,
+        std::vector<std::string>& linkedShaderTemplateNames, const std::string& templateName,
+        const ShaderManager::DefineMap& defines)
     {
         if (!parseDefines(source, defines, mGlobalDefines, templateName))
             return false;
@@ -593,7 +613,8 @@ namespace Shader
         return true;
     }
 
-    void ShaderManager::getLinkedShaders(osg::ref_ptr<osg::Shader> shader, const std::vector<std::string>& linkedShaderNames, const DefineMap& defines)
+    void ShaderManager::getLinkedShaders(
+        osg::ref_ptr<osg::Shader> shader, const std::vector<std::string>& linkedShaderNames, const DefineMap& defines)
     {
         mLinkedShaders.erase(shader);
         if (linkedShaderNames.empty())
@@ -624,9 +645,9 @@ namespace Shader
         {
             // Texture units from `8 - numberOfShadowMaps` to `8` are used for shadows, so we skip them here.
             // TODO: Maybe instead of fixed texture units use `reserveGlobalTextureUnits` for shadows as well.
-            static const int numberOfShadowMaps = Settings::Manager::getBool("enable shadows", "Shadows") ?
-                                                  std::clamp(Settings::Manager::getInt("number of shadow maps", "Shadows"), 1, 8) :
-                                                  0;
+            static const int numberOfShadowMaps = Settings::Manager::getBool("enable shadows", "Shadows")
+                ? std::clamp(Settings::Manager::getInt("number of shadow maps", "Shadows"), 1, 8)
+                : 0;
             if (getAvailableTextureUnits() >= 8 && getAvailableTextureUnits() - 1 < 8)
                 mReservedTextureUnits = mMaxTextureUnits - (8 - numberOfShadowMaps);
         }
diff --git a/components/shader/shadermanager.hpp b/components/shader/shadermanager.hpp
index 55bc1cb04a..e057867ee3 100644
--- a/components/shader/shadermanager.hpp
+++ b/components/shader/shadermanager.hpp
@@ -1,20 +1,21 @@
 #ifndef OPENMW_COMPONENTS_SHADERMANAGER_H
 #define OPENMW_COMPONENTS_SHADERMANAGER_H
 
-#include <string>
+#include <array>
 #include <map>
+#include <memory>
 #include <mutex>
+#include <string>
 #include <vector>
-#include <array>
-#include <memory>
 
 #include <osg/ref_ptr>
 
-#include <osg/Shader>
-#include <osg/Program>
 #include <filesystem>
+#include <osg/Program>
+#include <osg/Shader>
 
-namespace osgViewer {
+namespace osgViewer
+{
     class Viewer;
 }
 
@@ -30,7 +31,7 @@ namespace Shader
         ShaderManager();
         ~ShaderManager();
 
-        void setShaderPath(const std::filesystem::path &path);
+        void setShaderPath(const std::filesystem::path& path);
 
         typedef std::map<std::string, std::string> DefineMap;
 
@@ -40,9 +41,11 @@ namespace Shader
         /// @param shaderType The type of shader (usually vertex or fragment shader).
         /// @note May return nullptr on failure.
         /// @note Thread safe.
-        osg::ref_ptr<osg::Shader> getShader(const std::string& templateName, const DefineMap& defines, osg::Shader::Type shaderType);
+        osg::ref_ptr<osg::Shader> getShader(
+            const std::string& templateName, const DefineMap& defines, osg::Shader::Type shaderType);
 
-        osg::ref_ptr<osg::Program> getProgram(osg::ref_ptr<osg::Shader> vertexShader, osg::ref_ptr<osg::Shader> fragmentShader, const osg::Program* programTemplate=nullptr);
+        osg::ref_ptr<osg::Program> getProgram(osg::ref_ptr<osg::Shader> vertexShader,
+            osg::ref_ptr<osg::Shader> fragmentShader, const osg::Program* programTemplate = nullptr);
 
         const osg::Program* getProgramTemplate() const { return mProgramTemplate; }
         void setProgramTemplate(const osg::Program* program) { mProgramTemplate = program; }
@@ -55,12 +58,15 @@ namespace Shader
 
         /// Set the DefineMap used to construct all shaders
         /// @param defines The DefineMap to use
-        /// @note This will change the source code for any shaders already created, potentially causing problems if they're being used to render a frame. It is recommended that any associated Viewers have their threading stopped while this function is running if any shaders are in use.
-        void setGlobalDefines(DefineMap & globalDefines);
+        /// @note This will change the source code for any shaders already created, potentially causing problems if
+        /// they're being used to render a frame. It is recommended that any associated Viewers have their threading
+        /// stopped while this function is running if any shaders are in use.
+        void setGlobalDefines(DefineMap& globalDefines);
 
         void releaseGLObjects(osg::State* state);
 
-        bool createSourceFromTemplate(std::string& source, std::vector<std::string>& linkedShaderTemplateNames, const std::string& templateName, const ShaderManager::DefineMap& defines);
+        bool createSourceFromTemplate(std::string& source, std::vector<std::string>& linkedShaderTemplateNames,
+            const std::string& templateName, const ShaderManager::DefineMap& defines);
 
         void setMaxTextureUnits(int maxTextureUnits) { mMaxTextureUnits = maxTextureUnits; }
         int getMaxTextureUnits() const { return mMaxTextureUnits; }
@@ -77,8 +83,10 @@ namespace Shader
         void update(osgViewer::Viewer& viewer);
         void setHotReloadEnabled(bool value);
         void triggerShaderReload();
+
     private:
-        void getLinkedShaders(osg::ref_ptr<osg::Shader> shader, const std::vector<std::string>& linkedShaderNames, const DefineMap& defines);
+        void getLinkedShaders(osg::ref_ptr<osg::Shader> shader, const std::vector<std::string>& linkedShaderNames,
+            const DefineMap& defines);
         void addLinkedShaders(osg::ref_ptr<osg::Shader> shader, osg::ref_ptr<osg::Program> program);
 
         std::filesystem::path mPath;
@@ -90,13 +98,14 @@ namespace Shader
         TemplateMap mShaderTemplates;
 
         typedef std::pair<std::string, DefineMap> MapKey;
-        typedef std::map<MapKey, osg::ref_ptr<osg::Shader> > ShaderMap;
+        typedef std::map<MapKey, osg::ref_ptr<osg::Shader>> ShaderMap;
         ShaderMap mShaders;
 
-        typedef std::map<std::pair<osg::ref_ptr<osg::Shader>, osg::ref_ptr<osg::Shader> >, osg::ref_ptr<osg::Program> > ProgramMap;
+        typedef std::map<std::pair<osg::ref_ptr<osg::Shader>, osg::ref_ptr<osg::Shader>>, osg::ref_ptr<osg::Program>>
+            ProgramMap;
         ProgramMap mPrograms;
 
-        typedef std::vector<osg::ref_ptr<osg::Shader> > ShaderList;
+        typedef std::vector<osg::ref_ptr<osg::Shader>> ShaderList;
         typedef std::map<osg::ref_ptr<osg::Shader>, ShaderList> LinkedShadersMap;
         LinkedShadersMap mLinkedShaders;
 
@@ -107,17 +116,19 @@ namespace Shader
         int mMaxTextureUnits = 0;
         int mReservedTextureUnits = 0;
         std::unique_ptr<HotReloadManager> mHotReloadManager;
-        std::array<int, 2> mReservedTextureUnitsBySlot = {-1, -1};
+        std::array<int, 2> mReservedTextureUnitsBySlot = { -1, -1 };
     };
 
     bool parseForeachDirective(std::string& source, const std::string& templateName, size_t foundPos);
-    bool parseLinkDirective(std::string& source, std::string& linkTarget, const std::string& templateName, size_t foundPos);
+    bool parseLinkDirective(
+        std::string& source, std::string& linkTarget, const std::string& templateName, size_t foundPos);
 
     bool parseDefines(std::string& source, const ShaderManager::DefineMap& defines,
         const ShaderManager::DefineMap& globalDefines, const std::string& templateName);
 
-    bool parseDirectives(std::string& source, std::vector<std::string>& linkedShaderTemplateNames, const ShaderManager::DefineMap& defines,
-        const ShaderManager::DefineMap& globalDefines, const std::string& templateName);
+    bool parseDirectives(std::string& source, std::vector<std::string>& linkedShaderTemplateNames,
+        const ShaderManager::DefineMap& defines, const ShaderManager::DefineMap& globalDefines,
+        const std::string& templateName);
 }
 
 #endif
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 207caff086..7576a4df98 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -1,33 +1,33 @@
 #include "shadervisitor.hpp"
 
-#include <unordered_set>
-#include <unordered_map>
 #include <set>
+#include <unordered_map>
+#include <unordered_set>
 
 #include <osg/AlphaFunc>
 #include <osg/BlendFunc>
-#include <osg/Geometry>
+#include <osg/ColorMaski>
 #include <osg/GLExtensions>
+#include <osg/Geometry>
 #include <osg/Material>
 #include <osg/Multisample>
 #include <osg/Texture>
 #include <osg/ValueObject>
-#include <osg/ColorMaski>
 
 #include <osgParticle/ParticleSystem>
 
 #include <osgUtil/TangentSpaceGenerator>
 
 #include <components/debug/debuglog.hpp>
-#include <components/misc/strings/algorithm.hpp>
 #include <components/misc/osguservalues.hpp>
-#include <components/stereo/stereomanager.hpp>
+#include <components/misc/strings/algorithm.hpp>
 #include <components/resource/imagemanager.hpp>
-#include <components/vfs/manager.hpp>
-#include <components/sceneutil/riggeometry.hpp>
-#include <components/sceneutil/morphgeometry.hpp>
 #include <components/sceneutil/depth.hpp>
+#include <components/sceneutil/morphgeometry.hpp>
+#include <components/sceneutil/riggeometry.hpp>
 #include <components/sceneutil/riggeometryosgaextension.hpp>
+#include <components/stereo/stereomanager.hpp>
+#include <components/vfs/manager.hpp>
 
 #include "removedalphafunc.hpp"
 #include "shadermanager.hpp"
@@ -35,14 +35,14 @@
 namespace Shader
 {
     /**
-    * Miniature version of osg::StateSet used to track state added by the shader visitor which should be ignored when
-    * it's applied a second time, and removed when shaders are removed.
-    * Actual StateAttributes aren't kept as they're recoverable from the StateSet this is attached to - we just want
-    * the TypeMemberPair as that uniquely identifies which of those StateAttributes it was we're tracking.
-    * Not all StateSet features have been added yet - we implement an equivalently-named method to each of the StateSet
-    * methods called in createProgram, and implement new ones as they're needed.
-    * When expanding tracking to cover new things, ensure they're accounted for in ensureFFP.
-    */
+     * Miniature version of osg::StateSet used to track state added by the shader visitor which should be ignored when
+     * it's applied a second time, and removed when shaders are removed.
+     * Actual StateAttributes aren't kept as they're recoverable from the StateSet this is attached to - we just want
+     * the TypeMemberPair as that uniquely identifies which of those StateAttributes it was we're tracking.
+     * Not all StateSet features have been added yet - we implement an equivalently-named method to each of the StateSet
+     * methods called in createProgram, and implement new ones as they're needed.
+     * When expanding tracking to cover new things, ensure they're accounted for in ensureFFP.
+     */
     class AddedState : public osg::Object
     {
     public:
@@ -60,12 +60,12 @@ namespace Shader
         void setMode(osg::StateAttribute::GLMode mode) { mModes.emplace(mode); }
         void setAttribute(osg::StateAttribute::TypeMemberPair typeMemberPair) { mAttributes.emplace(typeMemberPair); }
 
-        void setAttribute(const osg::StateAttribute* attribute)
+        void setAttribute(const osg::StateAttribute* attribute) { mAttributes.emplace(attribute->getTypeMemberPair()); }
+        template <typename T>
+        void setAttribute(osg::ref_ptr<T> attribute)
         {
-            mAttributes.emplace(attribute->getTypeMemberPair());
+            setAttribute(attribute.get());
         }
-        template<typename T>
-        void setAttribute(osg::ref_ptr<T> attribute) { setAttribute(attribute.get()); }
 
         void setAttributeAndModes(const osg::StateAttribute* attribute)
         {
@@ -73,18 +73,27 @@ namespace Shader
             InterrogateModesHelper helper(this);
             attribute->getModeUsage(helper);
         }
-        template<typename T>
-        void setAttributeAndModes(osg::ref_ptr<T> attribute) { setAttributeAndModes(attribute.get()); }
+        template <typename T>
+        void setAttributeAndModes(osg::ref_ptr<T> attribute)
+        {
+            setAttributeAndModes(attribute.get());
+        }
 
         void setTextureMode(unsigned int unit, osg::StateAttribute::GLMode mode) { mTextureModes[unit].emplace(mode); }
-        void setTextureAttribute(int unit, osg::StateAttribute::TypeMemberPair typeMemberPair) { mTextureAttributes[unit].emplace(typeMemberPair); }
+        void setTextureAttribute(int unit, osg::StateAttribute::TypeMemberPair typeMemberPair)
+        {
+            mTextureAttributes[unit].emplace(typeMemberPair);
+        }
 
         void setTextureAttribute(unsigned int unit, const osg::StateAttribute* attribute)
         {
             mTextureAttributes[unit].emplace(attribute->getTypeMemberPair());
         }
-        template<typename T>
-        void setTextureAttribute(unsigned int unit, osg::ref_ptr<T> attribute) { setTextureAttribute(unit, attribute.get()); }
+        template <typename T>
+        void setTextureAttribute(unsigned int unit, osg::ref_ptr<T> attribute)
+        {
+            setTextureAttribute(unit, attribute.get());
+        }
 
         void setTextureAttributeAndModes(unsigned int unit, const osg::StateAttribute* attribute)
         {
@@ -92,13 +101,22 @@ namespace Shader
             InterrogateModesHelper helper(this, unit);
             attribute->getModeUsage(helper);
         }
-        template<typename T>
-        void setTextureAttributeAndModes(unsigned int unit, osg::ref_ptr<T> attribute) { setTextureAttributeAndModes(unit, attribute.get()); }
+        template <typename T>
+        void setTextureAttributeAndModes(unsigned int unit, osg::ref_ptr<T> attribute)
+        {
+            setTextureAttributeAndModes(unit, attribute.get());
+        }
 
         bool hasUniform(const std::string& name) { return mUniforms.count(name); }
         bool hasMode(osg::StateAttribute::GLMode mode) { return mModes.count(mode); }
-        bool hasAttribute(const osg::StateAttribute::TypeMemberPair &typeMemberPair) { return mAttributes.count(typeMemberPair); }
-        bool hasAttribute(osg::StateAttribute::Type type, unsigned int member) { return hasAttribute(osg::StateAttribute::TypeMemberPair(type, member)); }
+        bool hasAttribute(const osg::StateAttribute::TypeMemberPair& typeMemberPair)
+        {
+            return mAttributes.count(typeMemberPair);
+        }
+        bool hasAttribute(osg::StateAttribute::Type type, unsigned int member)
+        {
+            return hasAttribute(osg::StateAttribute::TypeMemberPair(type, member));
+        }
         bool hasTextureMode(int unit, osg::StateAttribute::GLMode mode)
         {
             auto it = mTextureModes.find(unit);
@@ -109,11 +127,15 @@ namespace Shader
         }
 
         const std::set<osg::StateAttribute::TypeMemberPair>& getAttributes() { return mAttributes; }
-        const std::unordered_map<unsigned int, std::set<osg::StateAttribute::TypeMemberPair>>& getTextureAttributes() { return mTextureAttributes; }
+        const std::unordered_map<unsigned int, std::set<osg::StateAttribute::TypeMemberPair>>& getTextureAttributes()
+        {
+            return mTextureAttributes;
+        }
 
         bool empty()
         {
-            return mUniforms.empty() && mModes.empty() && mAttributes.empty() && mTextureModes.empty() && mTextureAttributes.empty();
+            return mUniforms.empty() && mModes.empty() && mAttributes.empty() && mTextureModes.empty()
+                && mTextureAttributes.empty();
         }
 
         META_Object(Shader, AddedState)
@@ -125,9 +147,13 @@ namespace Shader
             InterrogateModesHelper(AddedState* tracker, unsigned int textureUnit = 0)
                 : mTracker(tracker)
                 , mTextureUnit(textureUnit)
-            {}
+            {
+            }
             void usesMode(osg::StateAttribute::GLMode mode) override { mTracker->setMode(mode); }
-            void usesTextureMode(osg::StateAttribute::GLMode mode) override { mTracker->setTextureMode(mTextureUnit, mode); }
+            void usesTextureMode(osg::StateAttribute::GLMode mode) override
+            {
+                mTracker->setTextureMode(mTextureUnit, mode);
+            }
 
         private:
             AddedState* mTracker;
@@ -162,7 +188,8 @@ namespace Shader
     {
     }
 
-    ShaderVisitor::ShaderVisitor(ShaderManager& shaderManager, Resource::ImageManager& imageManager, const std::string &defaultShaderPrefix)
+    ShaderVisitor::ShaderVisitor(
+        ShaderManager& shaderManager, Resource::ImageManager& imageManager, const std::string& defaultShaderPrefix)
         : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
         , mForceShaders(false)
         , mAllowedToModifyStateSets(true)
@@ -210,7 +237,8 @@ namespace Shader
         if (!object.getUserDataContainer())
             return object.getOrCreateUserDataContainer();
 
-        osg::ref_ptr<osg::UserDataContainer> newUserData = static_cast<osg::UserDataContainer *>(object.getUserDataContainer()->clone(osg::CopyOp::SHALLOW_COPY));
+        osg::ref_ptr<osg::UserDataContainer> newUserData
+            = static_cast<osg::UserDataContainer*>(object.getUserDataContainer()->clone(osg::CopyOp::SHALLOW_COPY));
         object.setUserDataContainer(newUserData);
         return newUserData.get();
     }
@@ -220,7 +248,7 @@ namespace Shader
         if (!stateSet.getUserDataContainer())
             return nullptr;
 
-        return static_cast<osg::StateSet *>(stateSet.getUserDataContainer()->getUserObject("removedState"));
+        return static_cast<osg::StateSet*>(stateSet.getUserDataContainer()->getUserObject("removedState"));
     }
 
     void updateRemovedState(osg::UserDataContainer& userData, osg::StateSet* removedState)
@@ -251,7 +279,8 @@ namespace Shader
         addedState->setName("addedState");
     }
 
-    const char* defaultTextures[] = { "diffuseMap", "normalMap", "emissiveMap", "darkMap", "detailMap", "envMap", "specularMap", "decalMap", "bumpMap", "glossMap" };
+    const char* defaultTextures[] = { "diffuseMap", "normalMap", "emissiveMap", "darkMap", "detailMap", "envMap",
+        "specularMap", "decalMap", "bumpMap", "glossMap" };
     bool isTextureNameRecognized(std::string_view name)
     {
         return std::find(std::begin(defaultTextures), std::end(defaultTextures), name) != std::end(defaultTextures);
@@ -280,13 +309,13 @@ namespace Shader
             const osg::Texture* normalMap = nullptr;
             const osg::Texture* specularMap = nullptr;
             const osg::Texture* bumpMap = nullptr;
-            for(unsigned int unit=0;unit<texAttributes.size();++unit)
+            for (unsigned int unit = 0; unit < texAttributes.size(); ++unit)
             {
-                const osg::StateAttribute *attr = stateset->getTextureAttribute(unit, osg::StateAttribute::TEXTURE);
+                const osg::StateAttribute* attr = stateset->getTextureAttribute(unit, osg::StateAttribute::TEXTURE);
                 if (attr)
                 {
-                    // If textures ever get removed in createProgram, expand this to check we're operating on main texture attribute list
-                    // rather than the removed list
+                    // If textures ever get removed in createProgram, expand this to check we're operating on main
+                    // texture attribute list rather than the removed list
                     if (addedState && addedState->hasTextureMode(unit, GL_TEXTURE_2D))
                         continue;
 
@@ -312,7 +341,8 @@ namespace Shader
                                 mRequirements.back().mShaderRequired = true;
                                 if (!writableStateSet)
                                     writableStateSet = getWritableStateSet(node);
-                                // normal maps are by default off since the FFP can't render them, now that we'll use shaders switch to On
+                                // normal maps are by default off since the FFP can't render them, now that we'll use
+                                // shaders switch to On
                                 writableStateSet->setTextureMode(unit, GL_TEXTURE_2D, osg::StateAttribute::ON);
                                 normalMap = texture;
                             }
@@ -371,11 +401,12 @@ namespace Shader
                 }
                 // Avoid using the auto-detected normal map if it's already being used as a bump map.
                 // It's probably not an actual normal map.
-                bool hasNamesakeBumpMap = image && bumpMap && bumpMap->getImage(0) && image->getFileName() == bumpMap->getImage(0)->getFileName();
+                bool hasNamesakeBumpMap = image && bumpMap && bumpMap->getImage(0)
+                    && image->getFileName() == bumpMap->getImage(0)->getFileName();
 
                 if (!hasNamesakeBumpMap && image)
                 {
-                    osg::ref_ptr<osg::Texture2D> normalMapTex (new osg::Texture2D(image));
+                    osg::ref_ptr<osg::Texture2D> normalMapTex(new osg::Texture2D(image));
                     normalMapTex->setTextureSize(image->s(), image->t());
                     normalMapTex->setWrap(osg::Texture::WRAP_S, diffuseMap->getWrap(osg::Texture::WRAP_S));
                     normalMapTex->setWrap(osg::Texture::WRAP_T, diffuseMap->getWrap(osg::Texture::WRAP_T));
@@ -400,13 +431,15 @@ namespace Shader
                 Misc::StringUtils::replaceLast(specularMapFileName, ".", mSpecularMapPattern + ".");
                 if (mImageManager.getVFS()->exists(specularMapFileName))
                 {
-                    osg::ref_ptr<osg::Image> image (mImageManager.getImage(specularMapFileName));
-                    osg::ref_ptr<osg::Texture2D> specularMapTex (new osg::Texture2D(image));
+                    osg::ref_ptr<osg::Image> image(mImageManager.getImage(specularMapFileName));
+                    osg::ref_ptr<osg::Texture2D> specularMapTex(new osg::Texture2D(image));
                     specularMapTex->setTextureSize(image->s(), image->t());
                     specularMapTex->setWrap(osg::Texture::WRAP_S, diffuseMap->getWrap(osg::Texture::WRAP_S));
                     specularMapTex->setWrap(osg::Texture::WRAP_T, diffuseMap->getWrap(osg::Texture::WRAP_T));
-                    specularMapTex->setFilter(osg::Texture::MIN_FILTER, diffuseMap->getFilter(osg::Texture::MIN_FILTER));
-                    specularMapTex->setFilter(osg::Texture::MAG_FILTER, diffuseMap->getFilter(osg::Texture::MAG_FILTER));
+                    specularMapTex->setFilter(
+                        osg::Texture::MIN_FILTER, diffuseMap->getFilter(osg::Texture::MIN_FILTER));
+                    specularMapTex->setFilter(
+                        osg::Texture::MAG_FILTER, diffuseMap->getFilter(osg::Texture::MAG_FILTER));
                     specularMapTex->setMaxAnisotropy(diffuseMap->getMaxAnisotropy());
                     specularMapTex->setName("specularMap");
 
@@ -425,15 +458,18 @@ namespace Shader
         if (osg::ref_ptr<osg::StateSet> removedState = getRemovedState(*stateset))
             removedAttributes = removedState->getAttributeList();
 
-        for (const auto* attributeMap : std::initializer_list<const osg::StateSet::AttributeList*>{ &attributes, &removedAttributes })
+        for (const auto* attributeMap :
+            std::initializer_list<const osg::StateSet::AttributeList*>{ &attributes, &removedAttributes })
         {
-            for (osg::StateSet::AttributeList::const_iterator it = attributeMap->begin(); it != attributeMap->end(); ++it)
+            for (osg::StateSet::AttributeList::const_iterator it = attributeMap->begin(); it != attributeMap->end();
+                 ++it)
             {
                 if (addedState && attributeMap != &removedAttributes && addedState->hasAttribute(it->first))
                     continue;
                 if (it->first.first == osg::StateAttribute::MATERIAL)
                 {
-                    // This should probably be moved out of ShaderRequirements and be applied directly now it's a uniform instead of a define
+                    // This should probably be moved out of ShaderRequirements and be applied directly now it's a
+                    // uniform instead of a define
                     if (!mRequirements.back().mMaterialOverridden || it->second.second & osg::StateAttribute::PROTECTED)
                     {
                         if (it->second.second & osg::StateAttribute::OVERRIDE)
@@ -444,25 +480,25 @@ namespace Shader
                         int colorMode;
                         switch (mat->getColorMode())
                         {
-                        case osg::Material::OFF:
-                            colorMode = 0;
-                            break;
-                        case osg::Material::EMISSION:
-                            colorMode = 1;
-                            break;
-                        default:
-                        case osg::Material::AMBIENT_AND_DIFFUSE:
-                            colorMode = 2;
-                            break;
-                        case osg::Material::AMBIENT:
-                            colorMode = 3;
-                            break;
-                        case osg::Material::DIFFUSE:
-                            colorMode = 4;
-                            break;
-                        case osg::Material::SPECULAR:
-                            colorMode = 5;
-                            break;
+                            case osg::Material::OFF:
+                                colorMode = 0;
+                                break;
+                            case osg::Material::EMISSION:
+                                colorMode = 1;
+                                break;
+                            default:
+                            case osg::Material::AMBIENT_AND_DIFFUSE:
+                                colorMode = 2;
+                                break;
+                            case osg::Material::AMBIENT:
+                                colorMode = 3;
+                                break;
+                            case osg::Material::DIFFUSE:
+                                colorMode = 4;
+                                break;
+                            case osg::Material::SPECULAR:
+                                colorMode = 5;
+                                break;
                         }
 
                         mRequirements.back().mColorMode = colorMode;
@@ -470,7 +506,8 @@ namespace Shader
                 }
                 else if (it->first.first == osg::StateAttribute::ALPHAFUNC)
                 {
-                    if (!mRequirements.back().mAlphaTestOverridden || it->second.second & osg::StateAttribute::PROTECTED)
+                    if (!mRequirements.back().mAlphaTestOverridden
+                        || it->second.second & osg::StateAttribute::PROTECTED)
                     {
                         if (it->second.second & osg::StateAttribute::OVERRIDE)
                             mRequirements.back().mAlphaTestOverridden = true;
@@ -482,21 +519,23 @@ namespace Shader
                 }
                 else if (it->first.first == osg::StateAttribute::BLENDFUNC)
                 {
-                    if (!mRequirements.back().mBlendFuncOverridden || it->second.second & osg::StateAttribute::PROTECTED)
+                    if (!mRequirements.back().mBlendFuncOverridden
+                        || it->second.second & osg::StateAttribute::PROTECTED)
                     {
                         if (it->second.second & osg::StateAttribute::OVERRIDE)
                             mRequirements.back().mBlendFuncOverridden = true;
 
                         const osg::BlendFunc* blend = static_cast<const osg::BlendFunc*>(it->second.first.get());
-                        mRequirements.back().mAdditiveBlending =
-                            blend->getSource() == osg::BlendFunc::SRC_ALPHA && blend->getDestination() == osg::BlendFunc::ONE;
+                        mRequirements.back().mAdditiveBlending = blend->getSource() == osg::BlendFunc::SRC_ALPHA
+                            && blend->getDestination() == osg::BlendFunc::ONE;
                     }
                 }
             }
         }
 
         unsigned int alphaBlend = stateset->getMode(GL_BLEND);
-        if (alphaBlend != osg::StateAttribute::INHERIT && (!mRequirements.back().mAlphaBlendOverridden || alphaBlend & osg::StateAttribute::PROTECTED))
+        if (alphaBlend != osg::StateAttribute::INHERIT
+            && (!mRequirements.back().mAlphaBlendOverridden || alphaBlend & osg::StateAttribute::PROTECTED))
         {
             if (alphaBlend & osg::StateAttribute::OVERRIDE)
                 mRequirements.back().mAlphaBlendOverridden = true;
@@ -519,7 +558,7 @@ namespace Shader
         mRequirements.pop_back();
     }
 
-    void ShaderVisitor::createProgram(const ShaderRequirements &reqs)
+    void ShaderVisitor::createProgram(const ShaderRequirements& reqs)
     {
         if (!reqs.mShaderRequired && !mForceShaders)
         {
@@ -528,21 +567,21 @@ namespace Shader
         }
 
         /**
-        * The shader visitor is supposed to be idempotent and undoable.
-        * That means we need to back up state we've removed (so it can be restored and/or considered by further
-        * applications of the visitor) and track which state we added (so it can be removed and/or ignored by further
-        * applications of the visitor).
-        * Before editing writableStateSet in a way that explicitly removes state or might overwrite existing state, it
-        * should be copied to removedState, another StateSet, unless it's there already or was added by a previous
-        * application of the visitor (is in previousAddedState).
-        * If it's a new class of state that's not already handled by ReinstateRemovedStateVisitor::apply, make sure to
-        * add handling there.
-        * Similarly, any time new state is added to writableStateSet, the equivalent method should be called on
-        * addedState.
-        * If that method doesn't exist yet, implement it - we don't use a full StateSet as we only need to check
-        * existence, not equality, and don't need to actually get the value as we can get it from writableStateSet
-        * instead.
-        */
+         * The shader visitor is supposed to be idempotent and undoable.
+         * That means we need to back up state we've removed (so it can be restored and/or considered by further
+         * applications of the visitor) and track which state we added (so it can be removed and/or ignored by further
+         * applications of the visitor).
+         * Before editing writableStateSet in a way that explicitly removes state or might overwrite existing state, it
+         * should be copied to removedState, another StateSet, unless it's there already or was added by a previous
+         * application of the visitor (is in previousAddedState).
+         * If it's a new class of state that's not already handled by ReinstateRemovedStateVisitor::apply, make sure to
+         * add handling there.
+         * Similarly, any time new state is added to writableStateSet, the equivalent method should be called on
+         * addedState.
+         * If that method doesn't exist yet, implement it - we don't use a full StateSet as we only need to check
+         * existence, not equality, and don't need to actually get the value as we can get it from writableStateSet
+         * instead.
+         */
         osg::Node& node = *reqs.mNode;
         osg::StateSet* writableStateSet = nullptr;
         if (mAllowedToModifyStateSets)
@@ -555,12 +594,13 @@ namespace Shader
             previousAddedState = new AddedState;
 
         ShaderManager::DefineMap defineMap;
-        for (unsigned int i=0; i<sizeof(defaultTextures)/sizeof(defaultTextures[0]); ++i)
+        for (unsigned int i = 0; i < sizeof(defaultTextures) / sizeof(defaultTextures[0]); ++i)
         {
             defineMap[defaultTextures[i]] = "0";
             defineMap[std::string(defaultTextures[i]) + std::string("UV")] = "0";
         }
-        for (std::map<int, std::string>::const_iterator texIt = reqs.mTextures.begin(); texIt != reqs.mTextures.end(); ++texIt)
+        for (std::map<int, std::string>::const_iterator texIt = reqs.mTextures.begin(); texIt != reqs.mTextures.end();
+             ++texIt)
         {
             defineMap[texIt->second] = "1";
             defineMap[texIt->second + std::string("UV")] = std::to_string(texIt->first);
@@ -601,10 +641,12 @@ namespace Shader
                     removedState->setAttribute(alphaFunc->first, alphaFunc->second);
             }
             // This prevents redundant glAlphaFunc calls while letting the shadows bin still see the test
-            writableStateSet->setAttribute(RemovedAlphaFunc::getInstance(reqs.mAlphaFunc), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+            writableStateSet->setAttribute(RemovedAlphaFunc::getInstance(reqs.mAlphaFunc),
+                osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
             addedState->setAttribute(RemovedAlphaFunc::getInstance(reqs.mAlphaFunc));
 
-            // Blending won't work with A2C as we use the alpha channel for coverage. gl_SampleCoverage from ARB_sample_shading would save the day, but requires GLSL 130
+            // Blending won't work with A2C as we use the alpha channel for coverage. gl_SampleCoverage from
+            // ARB_sample_shading would save the day, but requires GLSL 130
             if (mConvertAlphaTestToAlphaToCoverage && !reqs.mAlphaBlend)
             {
                 writableStateSet->setMode(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB, osg::StateAttribute::ON);
@@ -613,7 +655,8 @@ namespace Shader
             }
 
             // Adjusting coverage isn't safe with blending on as blending requires the alpha to be intact.
-            // Maybe we could also somehow (e.g. userdata) detect when the diffuse map has coverage-preserving mip maps in the future
+            // Maybe we could also somehow (e.g. userdata) detect when the diffuse map has coverage-preserving mip maps
+            // in the future
             if (!reqs.mAlphaBlend)
                 defineMap["adjustCoverage"] = "1";
 
@@ -639,7 +682,8 @@ namespace Shader
             writableStateSet->setAttribute(new osg::ColorMaski(1, false, false, false, false));
         }
 
-        if (writableStateSet->getMode(GL_ALPHA_TEST) != osg::StateAttribute::INHERIT && !previousAddedState->hasMode(GL_ALPHA_TEST))
+        if (writableStateSet->getMode(GL_ALPHA_TEST) != osg::StateAttribute::INHERIT
+            && !previousAddedState->hasMode(GL_ALPHA_TEST))
             removedState->setMode(GL_ALPHA_TEST, writableStateSet->getMode(GL_ALPHA_TEST));
         // This disables the deprecated fixed-function alpha test
         writableStateSet->setMode(GL_ALPHA_TEST, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED);
@@ -665,8 +709,10 @@ namespace Shader
         if (!node.getUserValue("shaderPrefix", shaderPrefix))
             shaderPrefix = mDefaultShaderPrefix;
 
-        osg::ref_ptr<osg::Shader> vertexShader (mShaderManager.getShader(shaderPrefix + "_vertex.glsl", defineMap, osg::Shader::VERTEX));
-        osg::ref_ptr<osg::Shader> fragmentShader (mShaderManager.getShader(shaderPrefix + "_fragment.glsl", defineMap, osg::Shader::FRAGMENT));
+        osg::ref_ptr<osg::Shader> vertexShader(
+            mShaderManager.getShader(shaderPrefix + "_vertex.glsl", defineMap, osg::Shader::VERTEX));
+        osg::ref_ptr<osg::Shader> fragmentShader(
+            mShaderManager.getShader(shaderPrefix + "_fragment.glsl", defineMap, osg::Shader::FRAGMENT));
 
         if (vertexShader && fragmentShader)
         {
@@ -674,9 +720,11 @@ namespace Shader
             writableStateSet->setAttributeAndModes(program, osg::StateAttribute::ON);
             addedState->setAttributeAndModes(program);
 
-            for (std::map<int, std::string>::const_iterator texIt = reqs.mTextures.begin(); texIt != reqs.mTextures.end(); ++texIt)
+            for (std::map<int, std::string>::const_iterator texIt = reqs.mTextures.begin();
+                 texIt != reqs.mTextures.end(); ++texIt)
             {
-                writableStateSet->addUniform(new osg::Uniform(texIt->second.c_str(), texIt->first), osg::StateAttribute::ON);
+                writableStateSet->addUniform(
+                    new osg::Uniform(texIt->second.c_str(), texIt->first), osg::StateAttribute::ON);
                 addedState->addUniform(texIt->second);
             }
         }
@@ -705,16 +753,16 @@ namespace Shader
             writableStateSet = getWritableStateSet(node);
 
         /**
-        * We might have been using shaders temporarily with the node (e.g. if a GlowUpdater applied a temporary
-        * environment map for a temporary enchantment).
-        * We therefore need to remove any state doing so added, and restore any that it removed.
-        * This is kept track of in createProgram in the StateSet's userdata.
-        * If new classes of state get added, handling it here is required - not all StateSet features are implemented
-        * in AddedState yet as so far they've not been necessary.
-        * Removed state requires no particular special handling as it's dealt with by merging StateSets.
-        * We don't need to worry about state in writableStateSet having the OVERRIDE flag as if it's in both, it's also
-        * in addedState, and gets removed first.
-        */
+         * We might have been using shaders temporarily with the node (e.g. if a GlowUpdater applied a temporary
+         * environment map for a temporary enchantment).
+         * We therefore need to remove any state doing so added, and restore any that it removed.
+         * This is kept track of in createProgram in the StateSet's userdata.
+         * If new classes of state get added, handling it here is required - not all StateSet features are implemented
+         * in AddedState yet as so far they've not been necessary.
+         * Removed state requires no particular special handling as it's dealt with by merging StateSets.
+         * We don't need to worry about state in writableStateSet having the OVERRIDE flag as if it's in both, it's also
+         * in addedState, and gets removed first.
+         */
 
         // user data is normally shallow copied so shared with the original stateset - we'll need to copy before edits
         osg::ref_ptr<osg::UserDataContainer> writableUserData;
@@ -730,7 +778,8 @@ namespace Shader
             writableUserData->removeUserObject(index);
 
             // O(n log n) to use StateSet::removeX, but this is O(n)
-            for (auto itr = writableStateSet->getUniformList().begin(); itr != writableStateSet->getUniformList().end();)
+            for (auto itr = writableStateSet->getUniformList().begin();
+                 itr != writableStateSet->getUniformList().end();)
             {
                 if (addedState->hasUniform(itr->first))
                     writableStateSet->getUniformList().erase(itr++);
@@ -753,7 +802,8 @@ namespace Shader
 
             for (unsigned int unit = 0; unit < writableStateSet->getTextureModeList().size(); ++unit)
             {
-                for (auto itr = writableStateSet->getTextureModeList()[unit].begin(); itr != writableStateSet->getTextureModeList()[unit].end();)
+                for (auto itr = writableStateSet->getTextureModeList()[unit].begin();
+                     itr != writableStateSet->getTextureModeList()[unit].end();)
                 {
                     if (addedState->hasTextureMode(unit, itr->first))
                         writableStateSet->getTextureModeList()[unit].erase(itr++);
@@ -769,17 +819,16 @@ namespace Shader
             }
         }
 
-
         if (osg::ref_ptr<osg::StateSet> removedState = getRemovedState(*writableStateSet))
         {
             if (!writableUserData)
             {
-            if (mAllowedToModifyStateSets)
-                writableUserData = writableStateSet->getUserDataContainer();
-            else
-                writableUserData = getWritableUserDataContainer(*writableStateSet);
+                if (mAllowedToModifyStateSets)
+                    writableUserData = writableStateSet->getUserDataContainer();
+                else
+                    writableUserData = getWritableUserDataContainer(*writableStateSet);
             }
-            
+
             unsigned int index = writableUserData->getUserObjectIndex("removedState");
             writableUserData->removeUserObject(index);
 
@@ -796,7 +845,8 @@ namespace Shader
         if (mAllowedToModifyStateSets && (useShader || generateTangents))
         {
             // make sure that all UV sets are there
-            for (std::map<int, std::string>::const_iterator it = reqs.mTextures.begin(); it != reqs.mTextures.end(); ++it)
+            for (std::map<int, std::string>::const_iterator it = reqs.mTextures.begin(); it != reqs.mTextures.end();
+                 ++it)
             {
                 if (sourceGeometry.getTexCoordArray(it->first) == nullptr)
                 {
@@ -807,7 +857,7 @@ namespace Shader
 
             if (generateTangents)
             {
-                osg::ref_ptr<osgUtil::TangentSpaceGenerator> generator (new osgUtil::TangentSpaceGenerator);
+                osg::ref_ptr<osgUtil::TangentSpaceGenerator> generator(new osgUtil::TangentSpaceGenerator);
                 generator->generate(&sourceGeometry, reqs.mTexStageRequiringTangents);
 
                 sourceGeometry.setTexCoordArray(7, generator->getTangentArray(), osg::Array::BIND_PER_VERTEX);
@@ -880,7 +930,6 @@ namespace Shader
                     osgaRig->setSourceRigGeometry(sourceOsgaRigGeometry);
                 }
             }
-
         }
         else
             ensureFFP(drawable);
@@ -899,12 +948,12 @@ namespace Shader
         mAutoUseNormalMaps = use;
     }
 
-    void ShaderVisitor::setNormalMapPattern(const std::string &pattern)
+    void ShaderVisitor::setNormalMapPattern(const std::string& pattern)
     {
         mNormalMapPattern = pattern;
     }
 
-    void ShaderVisitor::setNormalHeightMapPattern(const std::string &pattern)
+    void ShaderVisitor::setNormalHeightMapPattern(const std::string& pattern)
     {
         mNormalHeightMapPattern = pattern;
     }
@@ -914,7 +963,7 @@ namespace Shader
         mAutoUseSpecularMaps = use;
     }
 
-    void ShaderVisitor::setSpecularMapPattern(const std::string &pattern)
+    void ShaderVisitor::setSpecularMapPattern(const std::string& pattern)
     {
         mSpecularMapPattern = pattern;
     }
@@ -961,7 +1010,7 @@ namespace Shader
                 unsigned int index = writableUserData->getUserObjectIndex("removedState");
                 writableUserData->removeUserObject(index);
 
-                for (const auto&[mode, value] : removedState->getModeList())
+                for (const auto& [mode, value] : removedState->getModeList())
                     writableStateSet->setMode(mode, value);
 
                 for (const auto& attribute : removedState->getAttributeList())
@@ -969,7 +1018,7 @@ namespace Shader
 
                 for (unsigned int unit = 0; unit < removedState->getTextureModeList().size(); ++unit)
                 {
-                    for (const auto&[mode, value] : removedState->getTextureModeList()[unit])
+                    for (const auto& [mode, value] : removedState->getTextureModeList()[unit])
                         writableStateSet->setTextureMode(unit, mode, value);
                 }
             }
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index 02323f528f..d23db34755 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -21,7 +21,8 @@ namespace Shader
     class ShaderVisitor : public osg::NodeVisitor
     {
     public:
-        ShaderVisitor(ShaderManager& shaderManager, Resource::ImageManager& imageManager, const std::string& defaultShaderPrefix);
+        ShaderVisitor(
+            ShaderManager& shaderManager, Resource::ImageManager& imageManager, const std::string& defaultShaderPrefix);
 
         void setProgramTemplate(const osg::Program* programTemplate) { mProgramTemplate = programTemplate; }
 
@@ -30,8 +31,10 @@ namespace Shader
         void setForceShaders(bool force);
 
         /// Set if we are allowed to modify StateSets encountered in the graph (default true).
-        /// @par If set to false, then instead of modifying, the StateSet will be cloned and this new StateSet will be assigned to the node.
-        /// @par This option is useful when the ShaderVisitor is run on a "live" subgraph that may have already been submitted for rendering.
+        /// @par If set to false, then instead of modifying, the StateSet will be cloned and this new StateSet will be
+        /// assigned to the node.
+        /// @par This option is useful when the ShaderVisitor is run on a "live" subgraph that may have already been
+        /// submitted for rendering.
         void setAllowedToModifyStateSets(bool allowed);
 
         /// Automatically use normal maps if a file with suitable name exists (see normal map pattern).
diff --git a/components/sqlite3/request.hpp b/components/sqlite3/request.hpp
index 0a74bf1cb3..d4737a41f9 100644
--- a/components/sqlite3/request.hpp
+++ b/components/sqlite3/request.hpp
@@ -22,43 +22,43 @@ namespace Sqlite3
     inline void bindParameter(sqlite3& db, sqlite3_stmt& stmt, int index, int value)
     {
         if (const int ec = sqlite3_bind_int(&stmt, index, value); ec != SQLITE_OK)
-            throw std::runtime_error("Failed to bind int to parameter " + std::to_string(index)
-                                     + ": " + std::string(sqlite3_errmsg(&db)));
+            throw std::runtime_error(
+                "Failed to bind int to parameter " + std::to_string(index) + ": " + std::string(sqlite3_errmsg(&db)));
     }
 
     inline void bindParameter(sqlite3& db, sqlite3_stmt& stmt, int index, std::int64_t value)
     {
         if (const int ec = sqlite3_bind_int64(&stmt, index, value); ec != SQLITE_OK)
-            throw std::runtime_error("Failed to bind int64 to parameter " + std::to_string(index)
-                                     + ": " + std::string(sqlite3_errmsg(&db)));
+            throw std::runtime_error(
+                "Failed to bind int64 to parameter " + std::to_string(index) + ": " + std::string(sqlite3_errmsg(&db)));
     }
 
     inline void bindParameter(sqlite3& db, sqlite3_stmt& stmt, int index, double value)
     {
         if (const int ec = sqlite3_bind_double(&stmt, index, value); ec != SQLITE_OK)
-            throw std::runtime_error("Failed to bind double to parameter " + std::to_string(index)
-                                     + ": " + std::string(sqlite3_errmsg(&db)));
+            throw std::runtime_error("Failed to bind double to parameter " + std::to_string(index) + ": "
+                + std::string(sqlite3_errmsg(&db)));
     }
 
     inline void bindParameter(sqlite3& db, sqlite3_stmt& stmt, int index, std::string_view value)
     {
         if (sqlite3_bind_text(&stmt, index, value.data(), static_cast<int>(value.size()), SQLITE_STATIC) != SQLITE_OK)
-            throw std::runtime_error("Failed to bind text to parameter " + std::to_string(index)
-                                     + ": " + std::string(sqlite3_errmsg(&db)));
+            throw std::runtime_error(
+                "Failed to bind text to parameter " + std::to_string(index) + ": " + std::string(sqlite3_errmsg(&db)));
     }
 
     inline void bindParameter(sqlite3& db, sqlite3_stmt& stmt, int index, const std::vector<std::byte>& value)
     {
         if (sqlite3_bind_blob(&stmt, index, value.data(), static_cast<int>(value.size()), SQLITE_STATIC) != SQLITE_OK)
-            throw std::runtime_error("Failed to bind blob to parameter " + std::to_string(index)
-                                     + ": " + std::string(sqlite3_errmsg(&db)));
+            throw std::runtime_error(
+                "Failed to bind blob to parameter " + std::to_string(index) + ": " + std::string(sqlite3_errmsg(&db)));
     }
 
     inline void bindParameter(sqlite3& db, sqlite3_stmt& stmt, int index, const ConstBlob& value)
     {
         if (sqlite3_bind_blob(&stmt, index, value.mData, value.mSize, SQLITE_STATIC) != SQLITE_OK)
-            throw std::runtime_error("Failed to bind blob to parameter " + std::to_string(index)
-                                     + ": " + std::string(sqlite3_errmsg(&db)));
+            throw std::runtime_error(
+                "Failed to bind blob to parameter " + std::to_string(index) + ": " + std::string(sqlite3_errmsg(&db)));
     }
 
     template <typename T>
@@ -74,11 +74,16 @@ namespace Sqlite3
     {
         switch (value)
         {
-            case SQLITE_INTEGER: return "SQLITE_INTEGER";
-            case SQLITE_FLOAT: return "SQLITE_FLOAT";
-            case SQLITE_TEXT: return "SQLITE_TEXT";
-            case SQLITE_BLOB: return "SQLITE_BLOB";
-            case SQLITE_NULL: return "SQLITE_NULL";
+            case SQLITE_INTEGER:
+                return "SQLITE_INTEGER";
+            case SQLITE_FLOAT:
+                return "SQLITE_FLOAT";
+            case SQLITE_TEXT:
+                return "SQLITE_TEXT";
+            case SQLITE_BLOB:
+                return "SQLITE_BLOB";
+            case SQLITE_NULL:
+                return "SQLITE_NULL";
         }
         return "unsupported(" + std::to_string(value) + ")";
     }
@@ -88,7 +93,7 @@ namespace Sqlite3
     {
         if (type != SQLITE_NULL)
             throw std::logic_error("Type of column " + std::to_string(index) + " is " + sqliteTypeToString(type)
-                                   + " that does not match expected output type: SQLITE_INTEGER or SQLITE_FLOAT");
+                + " that does not match expected output type: SQLITE_INTEGER or SQLITE_FLOAT");
         value = nullptr;
     }
 
@@ -108,20 +113,20 @@ namespace Sqlite3
                 return;
         }
         throw std::logic_error("Type of column " + std::to_string(index) + " is " + sqliteTypeToString(type)
-                               + " that does not match expected output type: SQLITE_INTEGER or SQLITE_FLOAT or SQLITE_NULL");
+            + " that does not match expected output type: SQLITE_INTEGER or SQLITE_FLOAT or SQLITE_NULL");
     }
 
     inline void copyColumn(sqlite3& db, sqlite3_stmt& statement, int index, int type, std::string& value)
     {
         if (type != SQLITE_TEXT)
             throw std::logic_error("Type of column " + std::to_string(index) + " is " + sqliteTypeToString(type)
-                                   + " that does not match expected output type: SQLITE_TEXT");
+                + " that does not match expected output type: SQLITE_TEXT");
         const unsigned char* const text = sqlite3_column_text(&statement, index);
         if (text == nullptr)
         {
             if (const int ec = sqlite3_errcode(&db); ec != SQLITE_OK)
-                throw std::runtime_error("Failed to read text from column " + std::to_string(index)
-                                         + ": " + sqlite3_errmsg(&db));
+                throw std::runtime_error(
+                    "Failed to read text from column " + std::to_string(index) + ": " + sqlite3_errmsg(&db));
             value.clear();
             return;
         }
@@ -129,8 +134,8 @@ namespace Sqlite3
         if (size <= 0)
         {
             if (const int ec = sqlite3_errcode(&db); ec != SQLITE_OK)
-                throw std::runtime_error("Failed to get column bytes " + std::to_string(index)
-                                         + ": " + sqlite3_errmsg(&db));
+                throw std::runtime_error(
+                    "Failed to get column bytes " + std::to_string(index) + ": " + sqlite3_errmsg(&db));
             value.clear();
             return;
         }
@@ -142,13 +147,13 @@ namespace Sqlite3
     {
         if (type != SQLITE_BLOB)
             throw std::logic_error("Type of column " + std::to_string(index) + " is " + sqliteTypeToString(type)
-                                   + " that does not match expected output type: SQLITE_BLOB");
+                + " that does not match expected output type: SQLITE_BLOB");
         const void* const blob = sqlite3_column_blob(&statement, index);
         if (blob == nullptr)
         {
             if (const int ec = sqlite3_errcode(&db); ec != SQLITE_OK)
-                throw std::runtime_error("Failed to read blob from column " + std::to_string(index)
-                                         + ": " + sqlite3_errmsg(&db));
+                throw std::runtime_error(
+                    "Failed to read blob from column " + std::to_string(index) + ": " + sqlite3_errmsg(&db));
             value.clear();
             return;
         }
@@ -156,8 +161,8 @@ namespace Sqlite3
         if (size <= 0)
         {
             if (const int ec = sqlite3_errcode(&db); ec != SQLITE_OK)
-                throw std::runtime_error("Failed to get column bytes " + std::to_string(index)
-                                         + ": " + sqlite3_errmsg(&db));
+                throw std::runtime_error(
+                    "Failed to get column bytes " + std::to_string(index) + ": " + sqlite3_errmsg(&db));
             value.clear();
             return;
         }
@@ -172,8 +177,8 @@ namespace Sqlite3
         {
             const int column = index - 1;
             if (const int number = sqlite3_column_count(&statement); column >= number)
-                throw std::out_of_range("Column number is out of range: " + std::to_string(column)
-                                        + " >= " + std::to_string(number));
+                throw std::out_of_range(
+                    "Column number is out of range: " + std::to_string(column) + " >= " + std::to_string(number));
             const int type = sqlite3_column_type(&statement, column);
             switch (type)
             {
@@ -186,7 +191,7 @@ namespace Sqlite3
                     break;
                 default:
                     throw std::runtime_error("Column " + std::to_string(column)
-                                             + " has unnsupported column type: " + sqliteTypeToString(type));
+                        + " has unnsupported column type: " + sqliteTypeToString(type));
             }
             getColumnsImpl<index - 1>(db, statement, row);
         }
@@ -205,8 +210,8 @@ namespace Sqlite3
         getColumns(db, statement, tuple);
     }
 
-    template <class ... Args>
-    inline void getRow(sqlite3& db, sqlite3_stmt& statement, std::tuple<Args ...>& row)
+    template <class... Args>
+    inline void getRow(sqlite3& db, sqlite3_stmt& statement, std::tuple<Args...>& row)
     {
         getColumns(db, statement, row);
     }
@@ -219,18 +224,18 @@ namespace Sqlite3
         it = std::move(row);
     }
 
-    template <class T, class ... Args>
-    inline void prepare(sqlite3& db, Statement<T>& statement, Args&& ... args)
+    template <class T, class... Args>
+    inline void prepare(sqlite3& db, Statement<T>& statement, Args&&... args)
     {
         if (statement.mNeedReset)
         {
             if (sqlite3_reset(statement.mHandle.get()) == SQLITE_OK
-                    && sqlite3_clear_bindings(statement.mHandle.get()) == SQLITE_OK)
+                && sqlite3_clear_bindings(statement.mHandle.get()) == SQLITE_OK)
                 statement.mNeedReset = false;
             else
                 statement.mHandle = makeStatementHandle(db, statement.mQuery.text());
         }
-        statement.mQuery.bind(db, *statement.mHandle, std::forward<Args>(args) ...);
+        statement.mQuery.bind(db, *statement.mHandle, std::forward<Args>(args)...);
     }
 
     template <class T>
@@ -238,37 +243,39 @@ namespace Sqlite3
     {
         switch (sqlite3_step(statement.mHandle.get()))
         {
-            case SQLITE_ROW: return true;
-            case SQLITE_DONE: return false;
+            case SQLITE_ROW:
+                return true;
+            case SQLITE_DONE:
+                return false;
         }
         throw std::runtime_error("Failed to execute statement step: " + std::string(sqlite3_errmsg(&db)));
     }
 
-    template <class T, class I, class ... Args>
-    inline I request(sqlite3& db, Statement<T>& statement, I out, std::size_t max, Args&& ... args)
+    template <class T, class I, class... Args>
+    inline I request(sqlite3& db, Statement<T>& statement, I out, std::size_t max, Args&&... args)
     {
         try
         {
             statement.mNeedReset = true;
-            prepare(db, statement, std::forward<Args>(args) ...);
+            prepare(db, statement, std::forward<Args>(args)...);
             for (std::size_t i = 0; executeStep(db, statement) && i < max; ++i)
                 getRow(db, *statement.mHandle, *out++);
             return out;
         }
         catch (const std::exception& e)
         {
-            throw std::runtime_error("Failed perform request \"" + std::string(statement.mQuery.text())
-                                    + "\": " + std::string(e.what()));
+            throw std::runtime_error(
+                "Failed perform request \"" + std::string(statement.mQuery.text()) + "\": " + std::string(e.what()));
         }
     }
 
-    template <class T, class ... Args>
-    inline int execute(sqlite3& db, Statement<T>& statement, Args&& ... args)
+    template <class T, class... Args>
+    inline int execute(sqlite3& db, Statement<T>& statement, Args&&... args)
     {
         try
         {
             statement.mNeedReset = true;
-            prepare(db, statement, std::forward<Args>(args) ...);
+            prepare(db, statement, std::forward<Args>(args)...);
             if (executeStep(db, statement))
                 throw std::logic_error("Execute cannot return rows");
             return sqlite3_changes(&db);
@@ -276,7 +283,7 @@ namespace Sqlite3
         catch (const std::exception& e)
         {
             throw std::runtime_error("Failed to execute statement \"" + std::string(statement.mQuery.text())
-                                     + "\": " + std::string(e.what()));
+                + "\": " + std::string(e.what()));
         }
     }
 }
diff --git a/components/sqlite3/statement.cpp b/components/sqlite3/statement.cpp
index 07ca6b8ddf..56b13d81c1 100644
--- a/components/sqlite3/statement.cpp
+++ b/components/sqlite3/statement.cpp
@@ -10,15 +10,16 @@ namespace Sqlite3
 {
     void CloseSqlite3Stmt::operator()(sqlite3_stmt* handle) const noexcept
     {
-         sqlite3_finalize(handle);
+        sqlite3_finalize(handle);
     }
 
     StatementHandle makeStatementHandle(sqlite3& db, std::string_view query)
     {
         sqlite3_stmt* stmt = nullptr;
-        if (const int ec = sqlite3_prepare_v2(&db, query.data(), static_cast<int>(query.size()), &stmt, nullptr); ec != SQLITE_OK)
-            throw std::runtime_error("Failed to prepare statement for query \"" + std::string(query) + "\": "
-                                     + std::string(sqlite3_errmsg(&db)));
+        if (const int ec = sqlite3_prepare_v2(&db, query.data(), static_cast<int>(query.size()), &stmt, nullptr);
+            ec != SQLITE_OK)
+            throw std::runtime_error("Failed to prepare statement for query \"" + std::string(query)
+                + "\": " + std::string(sqlite3_errmsg(&db)));
         return StatementHandle(stmt);
     }
 }
diff --git a/components/sqlite3/statement.hpp b/components/sqlite3/statement.hpp
index 469e63933c..31d8c531ee 100644
--- a/components/sqlite3/statement.hpp
+++ b/components/sqlite3/statement.hpp
@@ -26,9 +26,11 @@ namespace Sqlite3
         StatementHandle mHandle;
         Query mQuery;
 
-        explicit Statement(sqlite3& db, Query query = Query {})
-            : mHandle(makeStatementHandle(db, query.text())),
-              mQuery(std::move(query)) {}
+        explicit Statement(sqlite3& db, Query query = Query{})
+            : mHandle(makeStatementHandle(db, query.text()))
+            , mQuery(std::move(query))
+        {
+        }
     };
 }
 
diff --git a/components/sqlite3/transaction.cpp b/components/sqlite3/transaction.cpp
index bafd6e8d32..17f5bcdc76 100644
--- a/components/sqlite3/transaction.cpp
+++ b/components/sqlite3/transaction.cpp
@@ -15,12 +15,17 @@ namespace Sqlite3
         {
             switch (mode)
             {
-                case TransactionMode::Default: return "BEGIN";
-                case TransactionMode::Deferred: return "BEGIN DEFERRED";
-                case TransactionMode::Immediate: return "BEGIN IMMEDIATE";
-                case TransactionMode::Exclusive: return "BEGIN EXCLUSIVE";
+                case TransactionMode::Default:
+                    return "BEGIN";
+                case TransactionMode::Deferred:
+                    return "BEGIN DEFERRED";
+                case TransactionMode::Immediate:
+                    return "BEGIN IMMEDIATE";
+                case TransactionMode::Exclusive:
+                    return "BEGIN EXCLUSIVE";
             }
-            throw std::logic_error("Invalid transaction mode: " + std::to_string(static_cast<std::underlying_type_t<TransactionMode>>(mode)));
+            throw std::logic_error("Invalid transaction mode: "
+                + std::to_string(static_cast<std::underlying_type_t<TransactionMode>>(mode)));
         }
     }
 
@@ -37,15 +42,17 @@ namespace Sqlite3
     {
         if (const int ec = sqlite3_exec(&db, getBeginStatement(mode), nullptr, nullptr, nullptr); ec != SQLITE_OK)
         {
-            (void) mDb.release();
-            throw std::runtime_error("Failed to start transaction: " + std::string(sqlite3_errmsg(&db)) + " (" + std::to_string(ec) + ")");
+            (void)mDb.release();
+            throw std::runtime_error(
+                "Failed to start transaction: " + std::string(sqlite3_errmsg(&db)) + " (" + std::to_string(ec) + ")");
         }
     }
 
     void Transaction::commit()
     {
         if (const int ec = sqlite3_exec(mDb.get(), "COMMIT", nullptr, nullptr, nullptr); ec != SQLITE_OK)
-            throw std::runtime_error("Failed to commit transaction: " + std::string(sqlite3_errmsg(mDb.get())) + " (" + std::to_string(ec) + ")");
-        (void) mDb.release();
+            throw std::runtime_error("Failed to commit transaction: " + std::string(sqlite3_errmsg(mDb.get())) + " ("
+                + std::to_string(ec) + ")");
+        (void)mDb.release();
     }
 }
diff --git a/components/std140/ubo.hpp b/components/std140/ubo.hpp
index 6154cd32ac..d9f31dd056 100644
--- a/components/std140/ubo.hpp
+++ b/components/std140/ubo.hpp
@@ -1,15 +1,15 @@
 #ifndef COMPONENTS_STD140_UBO_H
 #define COMPONENTS_STD140_UBO_H
 
+#include <osg/Matrixf>
 #include <osg/Vec2f>
 #include <osg/Vec4f>
-#include <osg/Matrixf>
 
 #include <cstdint>
-#include <tuple>
 #include <cstring>
 #include <string>
 #include <string_view>
+#include <tuple>
 
 namespace std140
 {
@@ -81,9 +81,10 @@ namespace std140
     class UBO
     {
     private:
-
-        template<typename T, typename... Args>
-        struct contains : std::bool_constant<(std::is_base_of_v<Args, T> || ...)> { };
+        template <typename T, typename... Args>
+        struct contains : std::bool_constant<(std::is_base_of_v<Args, T> || ...)>
+        {
+        };
 
         static_assert((contains<CArgs, Mat4, Vec4, Vec3, Vec2, Float, Int, UInt, Bool>() && ...));
 
@@ -100,15 +101,13 @@ namespace std140
         {
             bool found = false;
             std::size_t size = 0;
-            ((
-                found = found || std::is_same_v<T, CArgs>,
-                size += (found ? 0 : sizeof(typename CArgs::Value) + roundUpRemainder(size, CArgs::sAlign))
-            ) , ...);
+            ((found = found || std::is_same_v<T, CArgs>,
+                 size += (found ? 0 : sizeof(typename CArgs::Value) + roundUpRemainder(size, CArgs::sAlign))),
+                ...);
             return size + roundUpRemainder(size, T::sAlign);
         }
 
     public:
-
         static constexpr size_t getGPUSize()
         {
             std::size_t size = 0;
@@ -119,7 +118,8 @@ namespace std140
         static std::string getDefinition(const std::string& name)
         {
             std::string structDefinition = "struct " + name + " {\n";
-            ((structDefinition += ("    " + std::string(CArgs::sTypeName) + " " + std::string(CArgs::sName) + ";\n")), ...);
+            ((structDefinition += ("    " + std::string(CArgs::sTypeName) + " " + std::string(CArgs::sName) + ";\n")),
+                ...);
             return structDefinition + "};";
         }
 
@@ -140,19 +140,16 @@ namespace std140
 
         void copyTo(BufferType& buffer) const
         {
-            const auto copy = [&] (const auto& v) {
+            const auto copy = [&](const auto& v) {
                 static_assert(std::is_standard_layout_v<std::decay_t<decltype(v.mValue)>>);
                 constexpr std::size_t offset = getOffset<std::decay_t<decltype(v)>>();
                 std::memcpy(buffer.data() + offset, &v.mValue, sizeof(v.mValue));
             };
 
-            std::apply([&] (const auto& ... v) { (copy(v) , ...); }, mData);
+            std::apply([&](const auto&... v) { (copy(v), ...); }, mData);
         }
 
-        const auto& getData() const
-        {
-            return mData;
-        }
+        const auto& getData() const { return mData; }
 
     private:
         std::tuple<CArgs...> mData;
diff --git a/components/stereo/frustum.cpp b/components/stereo/frustum.cpp
index 3aad4cad42..54f2cb723f 100644
--- a/components/stereo/frustum.cpp
+++ b/components/stereo/frustum.cpp
@@ -1,11 +1,11 @@
-#include "stereomanager.hpp"
 #include "multiview.hpp"
+#include "stereomanager.hpp"
 
-#include <osg/io_utils>
+#include <osg/DisplaySettings>
 #include <osg/Texture2D>
-#include <osg/Texture2DMultisample>
 #include <osg/Texture2DArray>
-#include <osg/DisplaySettings>
+#include <osg/Texture2DMultisample>
+#include <osg/io_utils>
 
 #include <osgUtil/CullVisitor>
 #include <osgUtil/RenderStage>
@@ -18,12 +18,12 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/sceneutil/statesetupdater.hpp>
-#include <components/sceneutil/visitor.hpp>
-#include <components/sceneutil/util.hpp>
-#include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/color.hpp>
+#include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/mwshadowtechnique.hpp>
+#include <components/sceneutil/statesetupdater.hpp>
+#include <components/sceneutil/util.hpp>
+#include <components/sceneutil/visitor.hpp>
 
 #include <components/settings/settings.hpp>
 
@@ -37,10 +37,10 @@ namespace Stereo
             : Stereo::InitialFrustumCallback(camera)
             , mSfm(sfm)
         {
-
         }
 
-        void setInitialFrustum(osg::CullStack& cullStack, osg::BoundingBoxd& bb, bool& nearCulling, bool& farCulling) const override
+        void setInitialFrustum(
+            osg::CullStack& cullStack, osg::BoundingBoxd& bb, bool& nearCulling, bool& farCulling) const override
         {
             auto cm = cullStack.getCullingMode();
             nearCulling = !!(cm & osg::CullSettings::NEAR_PLANE_CULLING);
@@ -53,11 +53,13 @@ namespace Stereo
 
     struct ShadowFrustumCallback final : public SceneUtil::MWShadowTechnique::CustomFrustumCallback
     {
-        ShadowFrustumCallback(StereoFrustumManager* parent) : mParent(parent)
+        ShadowFrustumCallback(StereoFrustumManager* parent)
+            : mParent(parent)
         {
         }
 
-        void operator()(osgUtil::CullVisitor& cv, osg::BoundingBoxd& customClipSpace, osgUtil::CullVisitor*& sharedFrustumHint) override
+        void operator()(osgUtil::CullVisitor& cv, osg::BoundingBoxd& customClipSpace,
+            osgUtil::CullVisitor*& sharedFrustumHint) override
         {
             mParent->customFrustumCallback(cv, customClipSpace, sharedFrustumHint);
         }
@@ -65,18 +67,19 @@ namespace Stereo
         StereoFrustumManager* mParent;
     };
 
-    void joinBoundingBoxes(const osg::Matrix& masterProjection, const osg::Matrix& slaveProjection, osg::BoundingBoxd& bb)
+    void joinBoundingBoxes(
+        const osg::Matrix& masterProjection, const osg::Matrix& slaveProjection, osg::BoundingBoxd& bb)
     {
-        static const std::array<osg::Vec3d, 8> clipCorners = {{
-            {-1.0, -1.0, -1.0},
-            { 1.0, -1.0, -1.0},
-            { 1.0, -1.0,  1.0},
-            {-1.0, -1.0,  1.0},
-            {-1.0,  1.0, -1.0},
-            { 1.0,  1.0, -1.0},
-            { 1.0,  1.0,  1.0},
-            {-1.0,  1.0,  1.0},
-        }};
+        static const std::array<osg::Vec3d, 8> clipCorners = { {
+            { -1.0, -1.0, -1.0 },
+            { 1.0, -1.0, -1.0 },
+            { 1.0, -1.0, 1.0 },
+            { -1.0, -1.0, 1.0 },
+            { -1.0, 1.0, -1.0 },
+            { 1.0, 1.0, -1.0 },
+            { 1.0, 1.0, 1.0 },
+            { -1.0, 1.0, 1.0 },
+        } };
 
         osg::Matrix slaveClipToView;
         slaveClipToView.invert(slaveProjection);
@@ -116,8 +119,7 @@ namespace Stereo
             mShadowTechnique->setCustomFrustumCallback(nullptr);
     }
 
-    void StereoFrustumManager::setShadowTechnique(
-        SceneUtil::MWShadowTechnique* shadowTechnique)
+    void StereoFrustumManager::setShadowTechnique(SceneUtil::MWShadowTechnique* shadowTechnique)
     {
         if (mShadowTechnique)
             mShadowTechnique->setCustomFrustumCallback(nullptr);
@@ -127,9 +129,7 @@ namespace Stereo
     }
 
     void StereoFrustumManager::customFrustumCallback(
-        osgUtil::CullVisitor& cv, 
-        osg::BoundingBoxd& customClipSpace,
-        osgUtil::CullVisitor*& sharedFrustumHint)
+        osgUtil::CullVisitor& cv, osg::BoundingBoxd& customClipSpace, osgUtil::CullVisitor*& sharedFrustumHint)
     {
         auto it = mSharedFrustums.find(&cv);
         if (it != mSharedFrustums.end())
diff --git a/components/stereo/frustum.hpp b/components/stereo/frustum.hpp
index d6a624987d..e1cc03dc4c 100644
--- a/components/stereo/frustum.hpp
+++ b/components/stereo/frustum.hpp
@@ -1,15 +1,15 @@
 #ifndef STEREO_FRUSTUM_H
 #define STEREO_FRUSTUM_H
 
-#include <osg/Matrix>
-#include <osg/Vec3>
+#include <osg/BoundingBox>
 #include <osg/Camera>
+#include <osg/Matrix>
 #include <osg/StateSet>
-#include <osg/BoundingBox>
+#include <osg/Vec3>
 
-#include <memory>
 #include <array>
 #include <map>
+#include <memory>
 
 #include <components/stereo/types.hpp>
 
@@ -41,8 +41,9 @@ namespace Stereo
     struct MultiviewFrustumCallback;
     struct ShadowFrustumCallback;
 
-    void joinBoundingBoxes(const osg::Matrix& masterProjection, const osg::Matrix& slaveProjection, osg::BoundingBoxd& bb);
-    
+    void joinBoundingBoxes(
+        const osg::Matrix& masterProjection, const osg::Matrix& slaveProjection, osg::BoundingBoxd& bb);
+
     class StereoFrustumManager
     {
     public:
@@ -55,13 +56,14 @@ namespace Stereo
 
         void setShadowTechnique(SceneUtil::MWShadowTechnique* shadowTechnique);
 
-        void customFrustumCallback(osgUtil::CullVisitor& cv, osg::BoundingBoxd& customClipSpace, osgUtil::CullVisitor*& sharedFrustumHint);
+        void customFrustumCallback(
+            osgUtil::CullVisitor& cv, osg::BoundingBoxd& customClipSpace, osgUtil::CullVisitor*& sharedFrustumHint);
 
     private:
         osg::ref_ptr<osg::Camera> mCamera;
         osg::ref_ptr<SceneUtil::MWShadowTechnique> mShadowTechnique;
         osg::ref_ptr<ShadowFrustumCallback> mShadowFrustumCallback;
-        std::map< osgUtil::CullVisitor*, osgUtil::CullVisitor*> mSharedFrustums;
+        std::map<osgUtil::CullVisitor*, osgUtil::CullVisitor*> mSharedFrustums;
         osg::BoundingBoxd mBoundingBox;
 
         std::unique_ptr<MultiviewFrustumCallback> mMultiviewFrustumCallback;
diff --git a/components/stereo/multiview.cpp b/components/stereo/multiview.cpp
index e0cac44714..f12e2ed5a0 100644
--- a/components/stereo/multiview.cpp
+++ b/components/stereo/multiview.cpp
@@ -3,18 +3,18 @@
 #include <osg/FrameBufferObject>
 #include <osg/GLExtensions>
 #include <osg/Texture2D>
-#include <osg/Texture2DMultisample>
 #include <osg/Texture2DArray>
-#include <osgUtil/RenderStage>
+#include <osg/Texture2DMultisample>
 #include <osgUtil/CullVisitor>
+#include <osgUtil/RenderStage>
 
 #ifdef OSG_HAS_MULTIVIEW
 #include <osg/Texture2DMultisampleArray>
 #endif
 
+#include <components/debug/debuglog.hpp>
 #include <components/sceneutil/nodecallback.hpp>
 #include <components/settings/settings.hpp>
-#include <components/debug/debuglog.hpp>
 #include <components/stereo/stereomanager.hpp>
 
 #include <algorithm>
@@ -128,8 +128,8 @@ namespace Stereo
                 && ds->getVertexBufferHint() == osg::DisplaySettings::VertexBufferHint::NO_PREFERENCE)
             {
                 // Note that this only works if this code is executed before realize() is called on the viewer.
-                // The hint is read by the state object only once, before the user realize operations are run. 
-                // Therefore we have to set this hint without access to a graphics context to let us determine 
+                // The hint is read by the state object only once, before the user realize operations are run.
+                // Therefore we have to set this hint without access to a graphics context to let us determine
                 // if multiview will actually be supported or not. So if the user has requested multiview, we
                 // will just have to set it regardless.
                 ds->setVertexBufferHint(osg::DisplaySettings::VertexBufferHint::VERTEX_BUFFER_OBJECT);
@@ -179,7 +179,6 @@ namespace Stereo
             return;
         }
 
-
         // OSG already bound this texture ID, giving it a target.
         // Delete it and make a new texture ID.
         glBindTexture(GL_TEXTURE_2D, 0);
@@ -193,11 +192,12 @@ namespace Stereo
 
         {
             ////// OSG BUG
-            // Texture views require immutable storage. 
+            // Texture views require immutable storage.
             // OSG should always give immutable storage to sized internal formats, but does not do so for depth formats.
-            // Fortunately, we can just call glTexStorage3D here to make it immutable. This probably discards depth info for that frame, but whatever.
+            // Fortunately, we can just call glTexStorage3D here to make it immutable. This probably discards depth info
+            // for that frame, but whatever.
 #ifndef GL_TEXTURE_IMMUTABLE_FORMAT
-#define GL_TEXTURE_IMMUTABLE_FORMAT 0x912F 
+#define GL_TEXTURE_IMMUTABLE_FORMAT 0x912F
 #endif
             // Store any current binding and re-apply it after so i don't mess with state.
             GLint oldBinding = 0;
@@ -207,10 +207,11 @@ namespace Stereo
             glBindTexture(GL_TEXTURE_2D_ARRAY, sourceId);
             GLint immutable = 0;
             glGetTexParameteriv(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_IMMUTABLE_FORMAT, &immutable);
-            if(!immutable)
+            if (!immutable)
             {
                 // It wasn't immutable, so make it immutable.
-                gl->glTexStorage3D(GL_TEXTURE_2D_ARRAY, 1, internalFormat, sourceTextureObject->_profile._width, sourceTextureObject->_profile._height, 2);
+                gl->glTexStorage3D(GL_TEXTURE_2D_ARRAY, 1, internalFormat, sourceTextureObject->_profile._width,
+                    sourceTextureObject->_profile._height, 2);
                 state.checkGLErrors("after Texture2DViewSubloadCallback::load()::glTexStorage3D");
             }
             glBindTexture(GL_TEXTURE_2D_ARRAY, oldBinding);
@@ -226,11 +227,13 @@ namespace Stereo
         // Nothing to do
     }
 
-    osg::ref_ptr<osg::Texture2D> createTextureView_Texture2DFromTexture2DArray(osg::Texture2DArray* textureArray, int layer)
+    osg::ref_ptr<osg::Texture2D> createTextureView_Texture2DFromTexture2DArray(
+        osg::Texture2DArray* textureArray, int layer)
     {
         if (!getTextureViewSupported())
         {
-            Log(Debug::Error) << "createTextureView_Texture2DFromTexture2DArray: Tried to use a texture view but glTextureView is not supported";
+            Log(Debug::Error) << "createTextureView_Texture2DFromTexture2DArray: Tried to use a texture view but "
+                                 "glTextureView is not supported";
             return nullptr;
         }
 
@@ -240,18 +243,22 @@ namespace Stereo
         texture2d->setBorderColor(textureArray->getBorderColor());
         texture2d->setBorderWidth(textureArray->getBorderWidth());
         texture2d->setLODBias(textureArray->getLODBias());
-        texture2d->setFilter(osg::Texture::FilterParameter::MAG_FILTER, textureArray->getFilter(osg::Texture::FilterParameter::MAG_FILTER));
-        texture2d->setFilter(osg::Texture::FilterParameter::MIN_FILTER, textureArray->getFilter(osg::Texture::FilterParameter::MIN_FILTER));
+        texture2d->setFilter(osg::Texture::FilterParameter::MAG_FILTER,
+            textureArray->getFilter(osg::Texture::FilterParameter::MAG_FILTER));
+        texture2d->setFilter(osg::Texture::FilterParameter::MIN_FILTER,
+            textureArray->getFilter(osg::Texture::FilterParameter::MIN_FILTER));
         texture2d->setInternalFormat(textureArray->getInternalFormat());
         texture2d->setNumMipmapLevels(textureArray->getNumMipmapLevels());
         return texture2d;
     }
 
 #ifdef OSG_HAS_MULTIVIEW
-    //! Draw callback that, if set on a RenderStage, resolves MSAA after draw. Needed when using custom fbo/resolve fbos on renderstages in combination with multiview.
+    //! Draw callback that, if set on a RenderStage, resolves MSAA after draw. Needed when using custom fbo/resolve fbos
+    //! on renderstages in combination with multiview.
     struct MultiviewMSAAResolveCallback : public osgUtil::RenderBin::DrawCallback
     {
-        void drawImplementation(osgUtil::RenderBin* bin, osg::RenderInfo& renderInfo, osgUtil::RenderLeaf*& previous) override
+        void drawImplementation(
+            osgUtil::RenderBin* bin, osg::RenderInfo& renderInfo, osgUtil::RenderLeaf*& previous) override
         {
             osgUtil::RenderStage* stage = static_cast<osgUtil::RenderStage*>(bin);
             auto msaaFbo = stage->getFrameBufferObject();
@@ -280,7 +287,8 @@ namespace Stereo
             {
                 mLayers[i]->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
                 mMsaaLayers[i]->apply(state, osg::FrameBufferObject::READ_FRAMEBUFFER);
-                ext->glBlitFramebuffer(0, 0, mWidth, mHeight, 0, 0, mWidth, mHeight, GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT, GL_NEAREST);
+                ext->glBlitFramebuffer(0, 0, mWidth, mHeight, 0, 0, mWidth, mHeight,
+                    GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT, GL_NEAREST);
             }
             msaaFbo->apply(state, osg::FrameBufferObject::READ_DRAW_FRAMEBUFFER);
         }
@@ -311,7 +319,8 @@ namespace Stereo
                 // Intentionally not using ref& so attachment can be non-const
                 for (auto [component, attachment] : attachments)
                 {
-                    osg::Texture2DMultisampleArray* texture = static_cast<osg::Texture2DMultisampleArray*>(attachment.getTexture());
+                    osg::Texture2DMultisampleArray* texture
+                        = static_cast<osg::Texture2DMultisampleArray*>(attachment.getTexture());
                     mMsaaLayers[i]->setAttachment(component, osg::FrameBufferAttachment(texture, i));
                     mWidth = texture->getTextureWidth();
                     mHeight = texture->getTextureHeight();
@@ -338,7 +347,8 @@ namespace Stereo
 #endif
     }
 
-    void setMultiviewMatrices(osg::StateSet* stateset, const std::array<osg::Matrix, 2>& projection, bool createInverseMatrices)
+    void setMultiviewMatrices(
+        osg::StateSet* stateset, const std::array<osg::Matrix, 2>& projection, bool createInverseMatrices)
     {
         auto* projUniform = stateset->getUniform("projectionMatrixMultiView");
         if (!projUniform)
@@ -368,22 +378,22 @@ namespace Stereo
     {
         switch (tex->getTextureTarget())
         {
-        case GL_TEXTURE_2D:
-            static_cast<osg::Texture2D*>(tex)->setTextureSize(w, h);
-            break;
-        case GL_TEXTURE_2D_ARRAY:
-            static_cast<osg::Texture2DArray*>(tex)->setTextureSize(w, h, 2);
-            break;
-        case GL_TEXTURE_2D_MULTISAMPLE:
-            static_cast<osg::Texture2DMultisample*>(tex)->setTextureSize(w, h);
-            break;
+            case GL_TEXTURE_2D:
+                static_cast<osg::Texture2D*>(tex)->setTextureSize(w, h);
+                break;
+            case GL_TEXTURE_2D_ARRAY:
+                static_cast<osg::Texture2DArray*>(tex)->setTextureSize(w, h, 2);
+                break;
+            case GL_TEXTURE_2D_MULTISAMPLE:
+                static_cast<osg::Texture2DMultisample*>(tex)->setTextureSize(w, h);
+                break;
 #ifdef OSG_HAS_MULTIVIEW
-        case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
-            static_cast<osg::Texture2DMultisampleArray*>(tex)->setTextureSize(w, h, 2);
-            break;
+            case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
+                static_cast<osg::Texture2DMultisampleArray*>(tex)->setTextureSize(w, h, 2);
+                break;
 #endif
-        default:
-            throw std::logic_error("Invalid texture type received");
+            default:
+                throw std::logic_error("Invalid texture type received");
         }
     }
 
@@ -429,30 +439,30 @@ namespace Stereo
     {
         switch (tex->getTextureTarget())
         {
-        case GL_TEXTURE_2D:
-        {
-            auto* tex2d = static_cast<osg::Texture2D*>(tex);
-            return osg::FrameBufferAttachment(tex2d);
-        }
-        case GL_TEXTURE_2D_MULTISAMPLE:
-        {
-            auto* tex2dMsaa = static_cast<osg::Texture2DMultisample*>(tex);
-            return osg::FrameBufferAttachment(tex2dMsaa);
-        }
+            case GL_TEXTURE_2D:
+            {
+                auto* tex2d = static_cast<osg::Texture2D*>(tex);
+                return osg::FrameBufferAttachment(tex2d);
+            }
+            case GL_TEXTURE_2D_MULTISAMPLE:
+            {
+                auto* tex2dMsaa = static_cast<osg::Texture2DMultisample*>(tex);
+                return osg::FrameBufferAttachment(tex2dMsaa);
+            }
 #ifdef OSG_HAS_MULTIVIEW
-        case GL_TEXTURE_2D_ARRAY:
-        {
-            auto* tex2dArray = static_cast<osg::Texture2DArray*>(tex);
-            return osg::FrameBufferAttachment(tex2dArray, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, 0);
-        }
-        case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
-        {
-            auto* tex2dMsaaArray = static_cast<osg::Texture2DMultisampleArray*>(tex);
-            return osg::FrameBufferAttachment(tex2dMsaaArray, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, 0);
-        }
+            case GL_TEXTURE_2D_ARRAY:
+            {
+                auto* tex2dArray = static_cast<osg::Texture2DArray*>(tex);
+                return osg::FrameBufferAttachment(tex2dArray, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, 0);
+            }
+            case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
+            {
+                auto* tex2dMsaaArray = static_cast<osg::Texture2DMultisampleArray*>(tex);
+                return osg::FrameBufferAttachment(tex2dMsaaArray, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, 0);
+            }
 #endif
-        default:
-            throw std::logic_error("Invalid texture type received");
+            default:
+                throw std::logic_error("Invalid texture type received");
         }
     }
 
@@ -465,7 +475,8 @@ namespace Stereo
 #endif
     }
 
-    class UpdateRenderStagesCallback : public SceneUtil::NodeCallback<UpdateRenderStagesCallback, osg::Node*, osgUtil::CullVisitor*>
+    class UpdateRenderStagesCallback
+        : public SceneUtil::NodeCallback<UpdateRenderStagesCallback, osg::Node*, osgUtil::CullVisitor*>
     {
     public:
         UpdateRenderStagesCallback(Stereo::MultiviewFramebuffer* multiviewFramebuffer)
@@ -521,9 +532,7 @@ namespace Stereo
     {
     }
 
-    MultiviewFramebuffer::~MultiviewFramebuffer()
-    {
-    }
+    MultiviewFramebuffer::~MultiviewFramebuffer() {}
 
     void MultiviewFramebuffer::attachColorComponent(GLint sourceFormat, GLint sourceType, GLint internalFormat)
     {
@@ -531,7 +540,9 @@ namespace Stereo
         {
 #ifdef OSG_HAS_MULTIVIEW
             mMultiviewColorTexture = createTextureArray(sourceFormat, sourceType, internalFormat);
-            mMultiviewFbo->setAttachment(osg::Camera::COLOR_BUFFER, osg::FrameBufferAttachment(mMultiviewColorTexture, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, 0));
+            mMultiviewFbo->setAttachment(osg::Camera::COLOR_BUFFER,
+                osg::FrameBufferAttachment(
+                    mMultiviewColorTexture, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, 0));
             for (unsigned i = 0; i < 2; i++)
             {
                 mColorTexture[i] = createTextureView_Texture2DFromTexture2DArray(mMultiviewColorTexture.get(), i);
@@ -544,7 +555,8 @@ namespace Stereo
             for (unsigned i = 0; i < 2; i++)
             {
                 if (mSamples > 1)
-                    mLayerMsaaFbo[i]->setAttachment(osg::Camera::COLOR_BUFFER, osg::FrameBufferAttachment(new osg::RenderBuffer(mWidth, mHeight, internalFormat, mSamples)));
+                    mLayerMsaaFbo[i]->setAttachment(osg::Camera::COLOR_BUFFER,
+                        osg::FrameBufferAttachment(new osg::RenderBuffer(mWidth, mHeight, internalFormat, mSamples)));
                 mColorTexture[i] = createTexture(sourceFormat, sourceType, internalFormat);
                 mLayerFbo[i]->setAttachment(osg::Camera::COLOR_BUFFER, osg::FrameBufferAttachment(mColorTexture[i]));
             }
@@ -557,11 +569,14 @@ namespace Stereo
         {
 #ifdef OSG_HAS_MULTIVIEW
             mMultiviewDepthTexture = createTextureArray(sourceFormat, sourceType, internalFormat);
-            mMultiviewFbo->setAttachment(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(mMultiviewDepthTexture, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, 0));
+            mMultiviewFbo->setAttachment(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER,
+                osg::FrameBufferAttachment(
+                    mMultiviewDepthTexture, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, 0));
             for (unsigned i = 0; i < 2; i++)
             {
                 mDepthTexture[i] = createTextureView_Texture2DFromTexture2DArray(mMultiviewDepthTexture.get(), i);
-                mLayerFbo[i]->setAttachment(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(mDepthTexture[i]));
+                mLayerFbo[i]->setAttachment(
+                    osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(mDepthTexture[i]));
             }
 #endif
         }
@@ -570,9 +585,11 @@ namespace Stereo
             for (unsigned i = 0; i < 2; i++)
             {
                 if (mSamples > 1)
-                    mLayerMsaaFbo[i]->setAttachment(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(new osg::RenderBuffer(mWidth, mHeight, internalFormat, mSamples)));
+                    mLayerMsaaFbo[i]->setAttachment(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER,
+                        osg::FrameBufferAttachment(new osg::RenderBuffer(mWidth, mHeight, internalFormat, mSamples)));
                 mDepthTexture[i] = createTexture(sourceFormat, sourceType, internalFormat);
-                mLayerFbo[i]->setAttachment(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(mDepthTexture[i]));
+                mLayerFbo[i]->setAttachment(
+                    osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(mDepthTexture[i]));
             }
         }
     }
@@ -618,20 +635,24 @@ namespace Stereo
         {
             if (mMultiviewColorTexture)
             {
-                camera->attach(osg::Camera::COLOR_BUFFER, mMultiviewColorTexture, 0, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, false, mSamples);
-                camera->getBufferAttachmentMap()[osg::Camera::COLOR_BUFFER]._internalFormat = mMultiviewColorTexture->getInternalFormat();
+                camera->attach(osg::Camera::COLOR_BUFFER, mMultiviewColorTexture, 0,
+                    osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, false, mSamples);
+                camera->getBufferAttachmentMap()[osg::Camera::COLOR_BUFFER]._internalFormat
+                    = mMultiviewColorTexture->getInternalFormat();
                 camera->getBufferAttachmentMap()[osg::Camera::COLOR_BUFFER]._mipMapGeneration = false;
             }
             if (mMultiviewDepthTexture)
             {
-                camera->attach(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, mMultiviewDepthTexture, 0, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, false, mSamples);
-                camera->getBufferAttachmentMap()[osg::Camera::PACKED_DEPTH_STENCIL_BUFFER]._internalFormat = mMultiviewDepthTexture->getInternalFormat();
+                camera->attach(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, mMultiviewDepthTexture, 0,
+                    osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, false, mSamples);
+                camera->getBufferAttachmentMap()[osg::Camera::PACKED_DEPTH_STENCIL_BUFFER]._internalFormat
+                    = mMultiviewDepthTexture->getInternalFormat();
                 camera->getBufferAttachmentMap()[osg::Camera::PACKED_DEPTH_STENCIL_BUFFER]._mipMapGeneration = false;
             }
         }
 #endif
         camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
-        
+
         if (!mCullCallback)
             mCullCallback = new UpdateRenderStagesCallback(this);
         camera->addCullCallback(mCullCallback);
@@ -672,7 +693,8 @@ namespace Stereo
         return texture;
     }
 
-    osg::Texture2DArray* MultiviewFramebuffer::createTextureArray(GLint sourceFormat, GLint sourceType, GLint internalFormat)
+    osg::Texture2DArray* MultiviewFramebuffer::createTextureArray(
+        GLint sourceFormat, GLint sourceType, GLint internalFormat)
     {
         osg::Texture2DArray* textureArray = new osg::Texture2DArray;
         textureArray->setTextureSize(mWidth, mHeight, 2);
@@ -687,8 +709,8 @@ namespace Stereo
         return textureArray;
     }
 
-
-    osg::FrameBufferAttachment makeSingleLayerAttachmentFromMultilayerAttachment(osg::FrameBufferAttachment attachment, int layer)
+    osg::FrameBufferAttachment makeSingleLayerAttachmentFromMultilayerAttachment(
+        osg::FrameBufferAttachment attachment, int layer)
     {
         osg::Texture* tex = attachment.getTexture();
 
@@ -705,7 +727,8 @@ namespace Stereo
         return osg::FrameBufferAttachment();
     }
 
-    MultiviewFramebufferResolve::MultiviewFramebufferResolve(osg::FrameBufferObject* msaaFbo, osg::FrameBufferObject* resolveFbo, GLbitfield blitMask)
+    MultiviewFramebufferResolve::MultiviewFramebufferResolve(
+        osg::FrameBufferObject* msaaFbo, osg::FrameBufferObject* resolveFbo, GLbitfield blitMask)
         : mResolveFbo(resolveFbo)
         , mMsaaFbo(msaaFbo)
         , mBlitMask(blitMask)
@@ -719,7 +742,7 @@ namespace Stereo
 
         osg::GLExtensions* ext = state.get<osg::GLExtensions>();
 
-        for (int view : {0, 1})
+        for (int view : { 0, 1 })
         {
             mResolveLayers[view]->apply(state, osg::FrameBufferObject::BindTarget::DRAW_FRAMEBUFFER);
             mMsaaLayers[view]->apply(state, osg::FrameBufferObject::BindTarget::READ_FRAMEBUFFER);
@@ -740,12 +763,16 @@ namespace Stereo
         for (auto component : components)
         {
             const auto& msaaAttachment = mMsaaFbo->getAttachment(component);
-            mMsaaLayers[0]->setAttachment(component, makeSingleLayerAttachmentFromMultilayerAttachment(msaaAttachment, 0));
-            mMsaaLayers[1]->setAttachment(component, makeSingleLayerAttachmentFromMultilayerAttachment(msaaAttachment, 1));
+            mMsaaLayers[0]->setAttachment(
+                component, makeSingleLayerAttachmentFromMultilayerAttachment(msaaAttachment, 0));
+            mMsaaLayers[1]->setAttachment(
+                component, makeSingleLayerAttachmentFromMultilayerAttachment(msaaAttachment, 1));
 
             const auto& resolveAttachment = mResolveFbo->getAttachment(component);
-            mResolveLayers[0]->setAttachment(component, makeSingleLayerAttachmentFromMultilayerAttachment(resolveAttachment, 0));
-            mResolveLayers[1]->setAttachment(component, makeSingleLayerAttachmentFromMultilayerAttachment(resolveAttachment, 1));
+            mResolveLayers[0]->setAttachment(
+                component, makeSingleLayerAttachmentFromMultilayerAttachment(resolveAttachment, 0));
+            mResolveLayers[1]->setAttachment(
+                component, makeSingleLayerAttachmentFromMultilayerAttachment(resolveAttachment, 1));
 
             mWidth = msaaAttachment.getTexture()->getTextureWidth();
             mHeight = msaaAttachment.getTexture()->getTextureHeight();
@@ -760,7 +787,6 @@ namespace Stereo
             MultiviewFrustumCallback(Stereo::InitialFrustumCallback* ifc)
                 : mIfc(ifc)
             {
-
             }
 
             void setInitialFrustum(osg::CullStack& cullStack, osg::Polytope& frustum) const override
@@ -789,7 +815,7 @@ namespace Stereo
     {
 #ifdef OSG_HAS_MULTIVIEW
         osg::ref_ptr<osg::Camera> camera;
-        if(mCamera.lock(camera))
+        if (mCamera.lock(camera))
             camera->setInitialFrustumCallback(nullptr);
 #endif
     }
diff --git a/components/stereo/multiview.hpp b/components/stereo/multiview.hpp
index 418c69e159..f4750a9cea 100644
--- a/components/stereo/multiview.hpp
+++ b/components/stereo/multiview.hpp
@@ -1,10 +1,10 @@
 #ifndef STEREO_MULTIVIEW_H
 #define STEREO_MULTIVIEW_H
 
-#include <osg/ref_ptr>
-#include <osg/GL>
 #include <osg/Camera>
 #include <osg/FrameBufferObject>
+#include <osg/GL>
+#include <osg/ref_ptr>
 
 #include <array>
 #include <memory>
@@ -32,16 +32,19 @@ namespace Stereo
     //! Check if Multiview should be used. Results are undefined if called before configureExtensions().
     bool getMultiview();
 
-    //! Use the provided context to check what extensions are supported and configure use of multiview based on extensions and settings.
+    //! Use the provided context to check what extensions are supported and configure use of multiview based on
+    //! extensions and settings.
     void configureExtensions(unsigned int contextID);
 
     //! Sets the appropriate vertex buffer hint on OSG's display settings if needed
     void setVertexBufferHint();
 
     //! Creates a Texture2D as a texture view into a Texture2DArray
-    osg::ref_ptr<osg::Texture2D> createTextureView_Texture2DFromTexture2DArray(osg::Texture2DArray* textureArray, int layer);
+    osg::ref_ptr<osg::Texture2D> createTextureView_Texture2DFromTexture2DArray(
+        osg::Texture2DArray* textureArray, int layer);
 
-    //! Class that manages the specifics of GL_OVR_Multiview aware framebuffers, separating the layers into separate framebuffers, and disabling
+    //! Class that manages the specifics of GL_OVR_Multiview aware framebuffers, separating the layers into separate
+    //! framebuffers, and disabling
     class MultiviewFramebuffer
     {
     public:
@@ -88,25 +91,32 @@ namespace Stereo
     void setMultiviewMSAAResolveCallback(osgUtil::RenderStage* renderStage);
 
     //! Sets up or updates multiview matrices for the given stateset
-    void setMultiviewMatrices(osg::StateSet* stateset, const std::array<osg::Matrix, 2>& projection, bool createInverseMatrices = false);
+    void setMultiviewMatrices(
+        osg::StateSet* stateset, const std::array<osg::Matrix, 2>& projection, bool createInverseMatrices = false);
 
-    //! Sets the width/height of a texture by first down-casting it to the appropriate type. Sets depth to 2 always for Texture2DArray and Texture2DMultisampleArray.
+    //! Sets the width/height of a texture by first down-casting it to the appropriate type. Sets depth to 2 always for
+    //! Texture2DArray and Texture2DMultisampleArray.
     void setMultiviewCompatibleTextureSize(osg::Texture* tex, int w, int h);
 
-    //! Creates a texture (Texture2D, Texture2DMultisample, Texture2DArray, or Texture2DMultisampleArray) based on multiview settings and sample count.
+    //! Creates a texture (Texture2D, Texture2DMultisample, Texture2DArray, or Texture2DMultisampleArray) based on
+    //! multiview settings and sample count.
     osg::ref_ptr<osg::Texture> createMultiviewCompatibleTexture(int width, int height, int samples);
 
-    //! Returns a framebuffer attachment from the texture, returning a multiview attachment if the texture is one of Texture2DArray or Texture2DMultisampleArray
+    //! Returns a framebuffer attachment from the texture, returning a multiview attachment if the texture is one of
+    //! Texture2DArray or Texture2DMultisampleArray
     osg::FrameBufferAttachment createMultiviewCompatibleAttachment(osg::Texture* tex);
 
-    //! If OSG has multiview, returns the magic number used to tell OSG to create a multiview attachment. Otherwise returns 0.
+    //! If OSG has multiview, returns the magic number used to tell OSG to create a multiview attachment. Otherwise
+    //! returns 0.
     unsigned int osgFaceControlledByMultiviewShader();
 
-    //! Implements resolving a multisamples multiview framebuffer. Does not automatically reflect changes to the fbo attachments, must call dirty() when the fbo attachments change.
+    //! Implements resolving a multisamples multiview framebuffer. Does not automatically reflect changes to the fbo
+    //! attachments, must call dirty() when the fbo attachments change.
     class MultiviewFramebufferResolve
     {
     public:
-        MultiviewFramebufferResolve(osg::FrameBufferObject* msaaFbo, osg::FrameBufferObject* resolveFbo, GLbitfield blitMask);
+        MultiviewFramebufferResolve(
+            osg::FrameBufferObject* msaaFbo, osg::FrameBufferObject* resolveFbo, GLbitfield blitMask);
 
         void resolveImplementation(osg::State& state);
 
@@ -129,13 +139,15 @@ namespace Stereo
         int mHeight = -1;
     };
 
-    //! Wrapper for osg::CullSettings::InitialFrustumCallback, to avoid exposing osg multiview interfaces outside of multiview.cpp
+    //! Wrapper for osg::CullSettings::InitialFrustumCallback, to avoid exposing osg multiview interfaces outside of
+    //! multiview.cpp
     struct InitialFrustumCallback
     {
         InitialFrustumCallback(osg::Camera* camera);
         virtual ~InitialFrustumCallback();
 
-        virtual void setInitialFrustum(osg::CullStack& cullStack, osg::BoundingBoxd& bb, bool& nearCulling, bool& farCulling) const = 0;
+        virtual void setInitialFrustum(
+            osg::CullStack& cullStack, osg::BoundingBoxd& bb, bool& nearCulling, bool& farCulling) const = 0;
 
         osg::observer_ptr<osg::Camera> mCamera;
     };
diff --git a/components/stereo/stereomanager.cpp b/components/stereo/stereomanager.cpp
index 29dca8fb4a..55e11d35aa 100644
--- a/components/stereo/stereomanager.cpp
+++ b/components/stereo/stereomanager.cpp
@@ -1,12 +1,12 @@
 #include "stereomanager.hpp"
-#include "multiview.hpp"
 #include "frustum.hpp"
+#include "multiview.hpp"
 
-#include <osg/io_utils>
+#include <osg/DisplaySettings>
 #include <osg/Texture2D>
-#include <osg/Texture2DMultisample>
 #include <osg/Texture2DArray>
-#include <osg/DisplaySettings>
+#include <osg/Texture2DMultisample>
+#include <osg/io_utils>
 
 #include <osgUtil/CullVisitor>
 #include <osgUtil/RenderStage>
@@ -20,11 +20,11 @@
 #include <components/debug/debuglog.hpp>
 #include <components/misc/constants.hpp>
 
+#include <components/sceneutil/color.hpp>
+#include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/statesetupdater.hpp>
-#include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/util.hpp>
-#include <components/sceneutil/depth.hpp>
-#include <components/sceneutil/color.hpp>
+#include <components/sceneutil/visitor.hpp>
 
 #include <components/settings/settings.hpp>
 
@@ -34,7 +34,10 @@ namespace Stereo
     class StereoUpdateCallback final : public osg::Callback
     {
     public:
-        StereoUpdateCallback(Manager* stereoView) : stereoView(stereoView) {}
+        StereoUpdateCallback(Manager* stereoView)
+            : stereoView(stereoView)
+        {
+        }
 
         bool run(osg::Object* object, osg::Object* data) override
         {
@@ -61,22 +64,22 @@ namespace Stereo
             stateset->addUniform(new osg::Uniform("projectionMatrix", osg::Matrixf{}));
         }
 
-        virtual void apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/) override
-        {
-        }
+        virtual void apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/) override {}
 
         void applyLeft(osg::StateSet* stateset, osgUtil::CullVisitor* nv) override
         {
             auto* uProjectionMatrix = stateset->getUniform("projectionMatrix");
             if (uProjectionMatrix)
-                uProjectionMatrix->set(mManager->computeEyeViewOffset(0) * mManager->computeEyeProjection(0, SceneUtil::AutoDepth::isReversed()));
+                uProjectionMatrix->set(mManager->computeEyeViewOffset(0)
+                    * mManager->computeEyeProjection(0, SceneUtil::AutoDepth::isReversed()));
         }
 
         void applyRight(osg::StateSet* stateset, osgUtil::CullVisitor* nv) override
         {
             auto* uProjectionMatrix = stateset->getUniform("projectionMatrix");
             if (uProjectionMatrix)
-                uProjectionMatrix->set(mManager->computeEyeViewOffset(1) * mManager->computeEyeProjection(1, SceneUtil::AutoDepth::isReversed()));
+                uProjectionMatrix->set(mManager->computeEyeViewOffset(1)
+                    * mManager->computeEyeProjection(1, SceneUtil::AutoDepth::isReversed()));
         }
 
     private:
@@ -132,7 +135,7 @@ namespace Stereo
         , mUpdateCallback(new StereoUpdateCallback(this))
         , mMasterProjectionMatrix(osg::Matrixd::identity())
         , mEyeResolutionOverriden(false)
-        , mEyeResolutionOverride(0,0)
+        , mEyeResolutionOverride(0, 0)
         , mFrustumManager(nullptr)
         , mUpdateViewCallback(nullptr)
     {
@@ -152,9 +155,7 @@ namespace Stereo
         }
     }
 
-    Manager::~Manager()
-    {
-    }
+    Manager::~Manager() {}
 
     void Manager::initializeStereo(osg::GraphicsContext* gc)
     {
@@ -164,13 +165,12 @@ namespace Stereo
         auto ci = gc->getState()->getContextID();
         configureExtensions(ci);
 
-        if(getMultiview())
+        if (getMultiview())
             setupOVRMultiView2Technique();
         else
             setupBruteForceTechnique();
 
         updateStereoFramebuffer();
-
     }
 
     void Manager::shaderStereoDefines(Shader::ShaderManager::DefineMap& defines) const
@@ -192,8 +192,8 @@ namespace Stereo
         mEyeResolutionOverride = eyeResolution;
         mEyeResolutionOverriden = true;
 
-        //if (mMultiviewFramebuffer)
-        //    updateStereoFramebuffer();
+        // if (mMultiviewFramebuffer)
+        //     updateStereoFramebuffer();
     }
 
     void Manager::screenResolutionChanged()
@@ -229,7 +229,7 @@ namespace Stereo
         ds->setStereo(true);
         ds->setStereoMode(osg::DisplaySettings::StereoMode::HORIZONTAL_SPLIT);
         ds->setUseSceneViewForStereoHint(true);
-        
+
         mMainCamera->addCullCallback(new BruteForceStereoStatesetUpdateCallback(this));
 
         struct ComputeStereoMatricesCallback : public osgUtil::SceneView::ComputeStereoMatricesCallback
@@ -237,7 +237,6 @@ namespace Stereo
             ComputeStereoMatricesCallback(Manager* sv)
                 : mManager(sv)
             {
-
             }
 
             osg::Matrixd computeLeftEyeProjection(const osg::Matrixd& projection) const override
@@ -246,10 +245,7 @@ namespace Stereo
                 return mManager->computeEyeViewOffset(0) * mManager->computeEyeProjection(0, false);
             }
 
-            osg::Matrixd computeLeftEyeView(const osg::Matrixd& view) const override
-            {
-                return view;
-            }
+            osg::Matrixd computeLeftEyeView(const osg::Matrixd& view) const override { return view; }
 
             osg::Matrixd computeRightEyeProjection(const osg::Matrixd& projection) const override
             {
@@ -257,10 +253,7 @@ namespace Stereo
                 return mManager->computeEyeViewOffset(1) * mManager->computeEyeProjection(1, false);
             }
 
-            osg::Matrixd computeRightEyeView(const osg::Matrixd& view) const override
-            {
-                return view;
-            }
+            osg::Matrixd computeRightEyeView(const osg::Matrixd& view) const override { return view; }
 
             Manager* mManager;
         };
@@ -298,16 +291,19 @@ namespace Stereo
 
     void Manager::updateStereoFramebuffer()
     {
-        //VR-TODO: in VR, still need to have this framebuffer attached before the postprocessor is created
-        //auto samples = Settings::Manager::getInt("antialiasing", "Video");
-        //auto eyeRes = eyeResolution();
-
-        //if (mMultiviewFramebuffer)
-        //    mMultiviewFramebuffer->detachFrom(mMainCamera);
-        //mMultiviewFramebuffer = std::make_shared<MultiviewFramebuffer>(static_cast<int>(eyeRes.x()), static_cast<int>(eyeRes.y()), samples);
-        //mMultiviewFramebuffer->attachColorComponent(SceneUtil::Color::colorSourceFormat(), SceneUtil::Color::colorSourceType(), SceneUtil::Color::colorInternalFormat());
-        //mMultiviewFramebuffer->attachDepthComponent(SceneUtil::AutoDepth::depthSourceFormat(), SceneUtil::AutoDepth::depthSourceType(), SceneUtil::AutoDepth::depthInternalFormat());
-        //mMultiviewFramebuffer->attachTo(mMainCamera);
+        // VR-TODO: in VR, still need to have this framebuffer attached before the postprocessor is created
+        // auto samples = Settings::Manager::getInt("antialiasing", "Video");
+        // auto eyeRes = eyeResolution();
+
+        // if (mMultiviewFramebuffer)
+        //     mMultiviewFramebuffer->detachFrom(mMainCamera);
+        // mMultiviewFramebuffer = std::make_shared<MultiviewFramebuffer>(static_cast<int>(eyeRes.x()),
+        // static_cast<int>(eyeRes.y()), samples);
+        // mMultiviewFramebuffer->attachColorComponent(SceneUtil::Color::colorSourceFormat(),
+        // SceneUtil::Color::colorSourceType(), SceneUtil::Color::colorInternalFormat());
+        // mMultiviewFramebuffer->attachDepthComponent(SceneUtil::AutoDepth::depthSourceFormat(),
+        // SceneUtil::AutoDepth::depthSourceType(), SceneUtil::AutoDepth::depthInternalFormat());
+        // mMultiviewFramebuffer->attachTo(mMainCamera);
     }
 
     void Manager::update()
@@ -328,7 +324,7 @@ namespace Stereo
             if (SceneUtil::AutoDepth::isReversed())
             {
                 mProjectionMatrixReverseZ[0] = mView[0].perspectiveMatrix(near_, far_, true);
-                mProjectionMatrixReverseZ[1] =  mView[1].perspectiveMatrix(near_, far_, true);
+                mProjectionMatrixReverseZ[1] = mView[1].perspectiveMatrix(near_, far_, true);
             }
 
             View masterView;
@@ -345,16 +341,10 @@ namespace Stereo
             auto viewMatrix = mMainCamera->getViewMatrix();
             auto projectionMatrix = mMainCamera->getProjectionMatrix();
             auto s = ds->getEyeSeparation() * Constants::UnitsPerMeter;
-            mViewOffsetMatrix[0] = osg::Matrixd(
-                1.0, 0.0, 0.0, 0.0,
-                0.0, 1.0, 0.0, 0.0,
-                0.0, 0.0, 1.0, 0.0,
-                s, 0.0, 0.0, 1.0);
-            mViewOffsetMatrix[1] = osg::Matrixd(
-                1.0, 0.0, 0.0, 0.0,
-                0.0, 1.0, 0.0, 0.0,
-                0.0, 0.0, 1.0, 0.0,
-                -s, 0.0, 0.0, 1.0);
+            mViewOffsetMatrix[0]
+                = osg::Matrixd(1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, s, 0.0, 0.0, 1.0);
+            mViewOffsetMatrix[1]
+                = osg::Matrixd(1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, -s, 0.0, 0.0, 1.0);
             mProjectionMatrix[0] = ds->computeLeftEyeProjectionImplementation(projectionMatrix);
             mProjectionMatrix[1] = ds->computeRightEyeProjectionImplementation(projectionMatrix);
             if (SceneUtil::AutoDepth::isReversed())
@@ -365,18 +355,16 @@ namespace Stereo
         }
 
         mFrustumManager->update(
-            { 
-                mViewOffsetMatrix[0] * mProjectionMatrix[0],
-                mViewOffsetMatrix[1] * mProjectionMatrix[1]
-            });
+            { mViewOffsetMatrix[0] * mProjectionMatrix[0], mViewOffsetMatrix[1] * mProjectionMatrix[1] });
     }
 
     void Manager::updateMultiviewStateset(osg::StateSet* stateset)
     {
         std::array<osg::Matrix, 2> projectionMatrices;
 
-        for (int view : {0, 1})
-            projectionMatrices[view] = computeEyeViewOffset(view) * computeEyeProjection(view, SceneUtil::AutoDepth::isReversed());
+        for (int view : { 0, 1 })
+            projectionMatrices[view]
+                = computeEyeViewOffset(view) * computeEyeProjection(view, SceneUtil::AutoDepth::isReversed());
 
         Stereo::setMultiviewMatrices(stateset, projectionMatrices, true);
     }
@@ -414,7 +402,8 @@ namespace Stereo
 
     bool getStereo()
     {
-        static bool stereo = Settings::Manager::getBool("stereo enabled", "Stereo") || osg::DisplaySettings::instance().get()->getStereo();
+        static bool stereo = Settings::Manager::getBool("stereo enabled", "Stereo")
+            || osg::DisplaySettings::instance().get()->getStereo();
         return stereo;
     }
 
diff --git a/components/stereo/stereomanager.hpp b/components/stereo/stereomanager.hpp
index 815f55f156..159741d77e 100644
--- a/components/stereo/stereomanager.hpp
+++ b/components/stereo/stereomanager.hpp
@@ -1,14 +1,14 @@
 #ifndef STEREO_MANAGER_H
 #define STEREO_MANAGER_H
 
-#include <osg/Matrix>
-#include <osg/Vec3>
 #include <osg/Camera>
+#include <osg/Matrix>
 #include <osg/StateSet>
+#include <osg/Vec3>
 #include <osgUtil/CullVisitor>
 
-#include <memory>
 #include <array>
+#include <memory>
 
 #include <components/shader/shadermanager.hpp>
 
@@ -76,7 +76,7 @@ namespace Stereo
 
         const std::shared_ptr<MultiviewFramebuffer>& multiviewFramebuffer() { return mMultiviewFramebuffer; };
 
-        //! Sets rendering resolution of each eye to eyeResolution. 
+        //! Sets rendering resolution of each eye to eyeResolution.
         //! Once set, there will no longer be any connection between rendering resolution and screen/window resolution.
         void overrideEyeResolution(const osg::Vec2i& eyeResolution);
 
@@ -86,9 +86,12 @@ namespace Stereo
         //! Get current eye resolution
         osg::Vec2i eyeResolution();
 
-        //! The projection intended for rendering. When reverse Z is enabled, this is not the same as the camera's projection matrix, 
-        //! and therefore must be provided to the manager explicitly.
-        void setMasterProjectionMatrix(const osg::Matrixd& projectionMatrix) { mMasterProjectionMatrix = projectionMatrix; }
+        //! The projection intended for rendering. When reverse Z is enabled, this is not the same as the camera's
+        //! projection matrix, and therefore must be provided to the manager explicitly.
+        void setMasterProjectionMatrix(const osg::Matrixd& projectionMatrix)
+        {
+            mMasterProjectionMatrix = projectionMatrix;
+        }
 
         //! Causes the subgraph represented by the node to draw to the full viewport.
         //! This has no effect if stereo is not enabled
@@ -107,18 +110,18 @@ namespace Stereo
         void setupOVRMultiView2Technique();
 
         osg::ref_ptr<osgViewer::Viewer> mViewer;
-        osg::ref_ptr<osg::Camera>       mMainCamera;
-        osg::ref_ptr<osg::Callback>     mUpdateCallback;
-        std::string                     mError;
-        osg::Matrixd                     mMasterProjectionMatrix;
+        osg::ref_ptr<osg::Camera> mMainCamera;
+        osg::ref_ptr<osg::Callback> mUpdateCallback;
+        std::string mError;
+        osg::Matrixd mMasterProjectionMatrix;
         std::shared_ptr<MultiviewFramebuffer> mMultiviewFramebuffer;
-        bool                            mEyeResolutionOverriden;
-        osg::Vec2i                      mEyeResolutionOverride;
+        bool mEyeResolutionOverriden;
+        osg::Vec2i mEyeResolutionOverride;
 
-        std::array<View, 2>         mView;
-        std::array<osg::Matrixd, 2>  mViewOffsetMatrix;
-        std::array<osg::Matrixd, 2>  mProjectionMatrix;
-        std::array<osg::Matrixd, 2>  mProjectionMatrixReverseZ;
+        std::array<View, 2> mView;
+        std::array<osg::Matrixd, 2> mViewOffsetMatrix;
+        std::array<osg::Matrixd, 2> mProjectionMatrix;
+        std::array<osg::Matrixd, 2> mProjectionMatrixReverseZ;
 
         std::unique_ptr<StereoFrustumManager> mFrustumManager;
         std::shared_ptr<UpdateViewCallback> mUpdateViewCallback;
diff --git a/components/stereo/types.cpp b/components/stereo/types.cpp
index 4829e32b55..99b7da5ad1 100644
--- a/components/stereo/types.cpp
+++ b/components/stereo/types.cpp
@@ -58,7 +58,7 @@ namespace Stereo
         {
             // When applied as an offset to an existing view matrix,
             // that view matrix will already convert points to a camera space
-            // with opengl conventions. So we need to convert offsets to opengl 
+            // with opengl conventions. So we need to convert offsets to opengl
             // conventions.
             float y = position.y();
             float z = position.z();
@@ -108,13 +108,15 @@ namespace Stereo
         matrix[9] = (tanUp + tanDown) / tanHeight;
         matrix[13] = 0;
 
-        if (reverseZ) {
+        if (reverseZ)
+        {
             matrix[2] = 0;
             matrix[6] = 0;
             matrix[10] = (2.f * near) / (far - near);
             matrix[14] = ((2.f * near) * far) / (far - near);
         }
-        else {
+        else
+        {
             matrix[2] = 0;
             matrix[6] = 0;
             matrix[10] = -(far + near) / (far - near);
@@ -131,9 +133,7 @@ namespace Stereo
 
     bool FieldOfView::operator==(const FieldOfView& rhs) const
     {
-        return angleDown == rhs.angleDown
-            && angleUp == rhs.angleUp
-            && angleLeft == rhs.angleLeft
+        return angleDown == rhs.angleDown && angleUp == rhs.angleUp && angleLeft == rhs.angleLeft
             && angleRight == rhs.angleRight;
     }
 
@@ -142,25 +142,20 @@ namespace Stereo
         return pose == rhs.pose && fov == rhs.fov;
     }
 
-    std::ostream& operator <<(
-        std::ostream& os,
-        const Pose& pose)
+    std::ostream& operator<<(std::ostream& os, const Pose& pose)
     {
         os << "position=" << pose.position << ", orientation=" << pose.orientation;
         return os;
     }
 
-    std::ostream& operator <<(
-        std::ostream& os,
-        const FieldOfView& fov)
+    std::ostream& operator<<(std::ostream& os, const FieldOfView& fov)
     {
-        os << "left=" << fov.angleLeft << ", right=" << fov.angleRight << ", down=" << fov.angleDown << ", up=" << fov.angleUp;
+        os << "left=" << fov.angleLeft << ", right=" << fov.angleRight << ", down=" << fov.angleDown
+           << ", up=" << fov.angleUp;
         return os;
     }
 
-    std::ostream& operator <<(
-        std::ostream& os,
-        const View& view)
+    std::ostream& operator<<(std::ostream& os, const View& view)
     {
         os << "pose=< " << view.pose << " >, fov=< " << view.fov << " >";
         return os;
diff --git a/components/stereo/types.hpp b/components/stereo/types.hpp
index 9f2aa074d5..463d496282 100644
--- a/components/stereo/types.hpp
+++ b/components/stereo/types.hpp
@@ -4,22 +4,21 @@
 #include <osg/Matrix>
 #include <osg/Vec3>
 
-
 namespace Stereo
 {
     enum class Eye
     {
-        Left = 0, 
-        Right = 1, 
+        Left = 0,
+        Right = 1,
         Center = 2
     };
 
     struct Pose
     {
         //! Position in space
-        osg::Vec3 position{ 0,0,0 };
+        osg::Vec3 position{ 0, 0, 0 };
         //! Orientation in space.
-        osg::Quat orientation{ 0,0,0,1 };
+        osg::Quat orientation{ 0, 0, 0, 1 };
 
         //! Add one pose to another
         Pose operator+(const Pose& rhs);
@@ -34,11 +33,12 @@ namespace Stereo
         bool operator==(const Pose& rhs) const;
     };
 
-    struct FieldOfView {
-        float    angleLeft{ 0.f };
-        float    angleRight{ 0.f };
-        float    angleUp{ 0.f };
-        float    angleDown{ 0.f };
+    struct FieldOfView
+    {
+        float angleLeft{ 0.f };
+        float angleRight{ 0.f };
+        float angleUp{ 0.f };
+        float angleDown{ 0.f };
 
         bool operator==(const FieldOfView& rhs) const;
     };
@@ -53,9 +53,9 @@ namespace Stereo
         osg::Matrix perspectiveMatrix(float near, float far, bool reverseZ);
     };
 
-    std::ostream& operator <<(std::ostream& os, const Pose& pose);
-    std::ostream& operator <<(std::ostream& os, const FieldOfView& fov);
-    std::ostream& operator <<(std::ostream& os, const View& view);
+    std::ostream& operator<<(std::ostream& os, const Pose& pose);
+    std::ostream& operator<<(std::ostream& os, const FieldOfView& fov);
+    std::ostream& operator<<(std::ostream& os, const View& view);
 }
 
 #endif
diff --git a/components/terrain/buffercache.cpp b/components/terrain/buffercache.cpp
index 658c431b1b..6dc4f8dab9 100644
--- a/components/terrain/buffercache.cpp
+++ b/components/terrain/buffercache.cpp
@@ -9,167 +9,168 @@
 namespace
 {
 
-template <typename IndexArrayType>
-osg::ref_ptr<IndexArrayType> createIndexBuffer(unsigned int flags, unsigned int verts)
-{
-    // LOD level n means every 2^n-th vertex is kept, but we currently handle LOD elsewhere.
-    size_t lodLevel = 0;//(flags >> (4*4));
+    template <typename IndexArrayType>
+    osg::ref_ptr<IndexArrayType> createIndexBuffer(unsigned int flags, unsigned int verts)
+    {
+        // LOD level n means every 2^n-th vertex is kept, but we currently handle LOD elsewhere.
+        size_t lodLevel = 0; //(flags >> (4*4));
 
-    size_t lodDeltas[4];
-    for (int i=0; i<4; ++i)
-        lodDeltas[i] = (flags >> (4*i)) & (0xf);
+        size_t lodDeltas[4];
+        for (int i = 0; i < 4; ++i)
+            lodDeltas[i] = (flags >> (4 * i)) & (0xf);
 
-    bool anyDeltas = (lodDeltas[Terrain::North] || lodDeltas[Terrain::South] || lodDeltas[Terrain::West] || lodDeltas[Terrain::East]);
+        bool anyDeltas = (lodDeltas[Terrain::North] || lodDeltas[Terrain::South] || lodDeltas[Terrain::West]
+            || lodDeltas[Terrain::East]);
 
-    size_t increment = static_cast<size_t>(1) << lodLevel;
-    assert(increment < verts);
+        size_t increment = static_cast<size_t>(1) << lodLevel;
+        assert(increment < verts);
 
-    osg::ref_ptr<IndexArrayType> indices (new IndexArrayType(osg::PrimitiveSet::TRIANGLES));
-    indices->reserve((verts-1)*(verts-1)*2*3 / increment);
+        osg::ref_ptr<IndexArrayType> indices(new IndexArrayType(osg::PrimitiveSet::TRIANGLES));
+        indices->reserve((verts - 1) * (verts - 1) * 2 * 3 / increment);
 
-    size_t rowStart = 0, colStart = 0, rowEnd = verts-1, colEnd = verts-1;
-    // If any edge needs stitching we'll skip all edges at this point,
-    // mainly because stitching one edge would have an effect on corners and on the adjacent edges
-    if (anyDeltas)
-    {
-        colStart += increment;
-        colEnd -= increment;
-        rowEnd -= increment;
-        rowStart += increment;
-    }
-    for (size_t row = rowStart; row < rowEnd; row += increment)
-    {
-        for (size_t col = colStart; col < colEnd; col += increment)
+        size_t rowStart = 0, colStart = 0, rowEnd = verts - 1, colEnd = verts - 1;
+        // If any edge needs stitching we'll skip all edges at this point,
+        // mainly because stitching one edge would have an effect on corners and on the adjacent edges
+        if (anyDeltas)
         {
-            // diamond pattern
-            if ((row + col%2) % 2 == 1)
-            {
-                indices->push_back(verts*(col+increment)+row);
-                indices->push_back(verts*(col+increment)+row+increment);
-                indices->push_back(verts*col+row+increment);
-
-                indices->push_back(verts*col+row);
-                indices->push_back(verts*(col+increment)+row);
-                indices->push_back(verts*(col)+row+increment);
-            }
-            else
+            colStart += increment;
+            colEnd -= increment;
+            rowEnd -= increment;
+            rowStart += increment;
+        }
+        for (size_t row = rowStart; row < rowEnd; row += increment)
+        {
+            for (size_t col = colStart; col < colEnd; col += increment)
             {
-                indices->push_back(verts*col+row);
-                indices->push_back(verts*(col+increment)+row+increment);
-                indices->push_back(verts*col+row+increment);
-
-                indices->push_back(verts*col+row);
-                indices->push_back(verts*(col+increment)+row);
-                indices->push_back(verts*(col+increment)+row+increment);
+                // diamond pattern
+                if ((row + col % 2) % 2 == 1)
+                {
+                    indices->push_back(verts * (col + increment) + row);
+                    indices->push_back(verts * (col + increment) + row + increment);
+                    indices->push_back(verts * col + row + increment);
+
+                    indices->push_back(verts * col + row);
+                    indices->push_back(verts * (col + increment) + row);
+                    indices->push_back(verts * (col) + row + increment);
+                }
+                else
+                {
+                    indices->push_back(verts * col + row);
+                    indices->push_back(verts * (col + increment) + row + increment);
+                    indices->push_back(verts * col + row + increment);
+
+                    indices->push_back(verts * col + row);
+                    indices->push_back(verts * (col + increment) + row);
+                    indices->push_back(verts * (col + increment) + row + increment);
+                }
             }
         }
-    }
 
-    size_t innerStep = increment;
-    if (anyDeltas)
-    {
-        // Now configure LOD transitions at the edges - this is pretty tedious,
-        // and some very long and boring code, but it works great
-
-        // South
-        size_t row = 0;
-        size_t outerStep = static_cast<size_t>(1) << (lodDeltas[Terrain::South] + lodLevel);
-        for (size_t col = 0; col < verts-1; col += outerStep)
+        size_t innerStep = increment;
+        if (anyDeltas)
         {
-            indices->push_back(verts*col+row);
-            indices->push_back(verts*(col+outerStep)+row);
-            // Make sure not to touch the right edge
-            if (col+outerStep == verts-1)
-                indices->push_back(verts*(col+outerStep-innerStep)+row+innerStep);
-            else
-                indices->push_back(verts*(col+outerStep)+row+innerStep);
-
-            for (size_t i = 0; i < outerStep; i += innerStep)
+            // Now configure LOD transitions at the edges - this is pretty tedious,
+            // and some very long and boring code, but it works great
+
+            // South
+            size_t row = 0;
+            size_t outerStep = static_cast<size_t>(1) << (lodDeltas[Terrain::South] + lodLevel);
+            for (size_t col = 0; col < verts - 1; col += outerStep)
             {
-                // Make sure not to touch the left or right edges
-                if (col+i == 0 || col+i == verts-1-innerStep)
-                    continue;
-                indices->push_back(verts*(col)+row);
-                indices->push_back(verts*(col+i+innerStep)+row+innerStep);
-                indices->push_back(verts*(col+i)+row+innerStep);
+                indices->push_back(verts * col + row);
+                indices->push_back(verts * (col + outerStep) + row);
+                // Make sure not to touch the right edge
+                if (col + outerStep == verts - 1)
+                    indices->push_back(verts * (col + outerStep - innerStep) + row + innerStep);
+                else
+                    indices->push_back(verts * (col + outerStep) + row + innerStep);
+
+                for (size_t i = 0; i < outerStep; i += innerStep)
+                {
+                    // Make sure not to touch the left or right edges
+                    if (col + i == 0 || col + i == verts - 1 - innerStep)
+                        continue;
+                    indices->push_back(verts * (col) + row);
+                    indices->push_back(verts * (col + i + innerStep) + row + innerStep);
+                    indices->push_back(verts * (col + i) + row + innerStep);
+                }
             }
-        }
 
-        // North
-        row = verts-1;
-        outerStep = size_t(1) << (lodDeltas[Terrain::North] + lodLevel);
-        for (size_t col = 0; col < verts-1; col += outerStep)
-        {
-            indices->push_back(verts*(col+outerStep)+row);
-            indices->push_back(verts*col+row);
-            // Make sure not to touch the left edge
-            if (col == 0)
-                indices->push_back(verts*(col+innerStep)+row-innerStep);
-            else
-                indices->push_back(verts*col+row-innerStep);
-
-            for (size_t i = 0; i < outerStep; i += innerStep)
+            // North
+            row = verts - 1;
+            outerStep = size_t(1) << (lodDeltas[Terrain::North] + lodLevel);
+            for (size_t col = 0; col < verts - 1; col += outerStep)
             {
-                // Make sure not to touch the left or right edges
-                if (col+i == 0 || col+i == verts-1-innerStep)
-                    continue;
-                indices->push_back(verts*(col+i)+row-innerStep);
-                indices->push_back(verts*(col+i+innerStep)+row-innerStep);
-                indices->push_back(verts*(col+outerStep)+row);
+                indices->push_back(verts * (col + outerStep) + row);
+                indices->push_back(verts * col + row);
+                // Make sure not to touch the left edge
+                if (col == 0)
+                    indices->push_back(verts * (col + innerStep) + row - innerStep);
+                else
+                    indices->push_back(verts * col + row - innerStep);
+
+                for (size_t i = 0; i < outerStep; i += innerStep)
+                {
+                    // Make sure not to touch the left or right edges
+                    if (col + i == 0 || col + i == verts - 1 - innerStep)
+                        continue;
+                    indices->push_back(verts * (col + i) + row - innerStep);
+                    indices->push_back(verts * (col + i + innerStep) + row - innerStep);
+                    indices->push_back(verts * (col + outerStep) + row);
+                }
             }
-        }
 
-        // West
-        size_t col = 0;
-        outerStep = size_t(1) << (lodDeltas[Terrain::West] + lodLevel);
-        for (row = 0; row < verts-1; row += outerStep)
-        {
-            indices->push_back(verts*col+row+outerStep);
-            indices->push_back(verts*col+row);
-            // Make sure not to touch the top edge
-            if (row+outerStep == verts-1)
-                indices->push_back(verts*(col+innerStep)+row+outerStep-innerStep);
-            else
-                indices->push_back(verts*(col+innerStep)+row+outerStep);
-
-            for (size_t i = 0; i < outerStep; i += innerStep)
+            // West
+            size_t col = 0;
+            outerStep = size_t(1) << (lodDeltas[Terrain::West] + lodLevel);
+            for (row = 0; row < verts - 1; row += outerStep)
             {
-                // Make sure not to touch the top or bottom edges
-                if (row+i == 0 || row+i == verts-1-innerStep)
-                    continue;
-                indices->push_back(verts*col+row);
-                indices->push_back(verts*(col+innerStep)+row+i);
-                indices->push_back(verts*(col+innerStep)+row+i+innerStep);
+                indices->push_back(verts * col + row + outerStep);
+                indices->push_back(verts * col + row);
+                // Make sure not to touch the top edge
+                if (row + outerStep == verts - 1)
+                    indices->push_back(verts * (col + innerStep) + row + outerStep - innerStep);
+                else
+                    indices->push_back(verts * (col + innerStep) + row + outerStep);
+
+                for (size_t i = 0; i < outerStep; i += innerStep)
+                {
+                    // Make sure not to touch the top or bottom edges
+                    if (row + i == 0 || row + i == verts - 1 - innerStep)
+                        continue;
+                    indices->push_back(verts * col + row);
+                    indices->push_back(verts * (col + innerStep) + row + i);
+                    indices->push_back(verts * (col + innerStep) + row + i + innerStep);
+                }
             }
-        }
 
-        // East
-        col = verts-1;
-        outerStep = size_t(1) << (lodDeltas[Terrain::East] + lodLevel);
-        for (row = 0; row < verts-1; row += outerStep)
-        {
-            indices->push_back(verts*col+row);
-            indices->push_back(verts*col+row+outerStep);
-            // Make sure not to touch the bottom edge
-            if (row == 0)
-                indices->push_back(verts*(col-innerStep)+row+innerStep);
-            else
-                indices->push_back(verts*(col-innerStep)+row);
-
-            for (size_t i = 0; i < outerStep; i += innerStep)
+            // East
+            col = verts - 1;
+            outerStep = size_t(1) << (lodDeltas[Terrain::East] + lodLevel);
+            for (row = 0; row < verts - 1; row += outerStep)
             {
-                // Make sure not to touch the top or bottom edges
-                if (row+i == 0 || row+i == verts-1-innerStep)
-                    continue;
-                indices->push_back(verts*col+row+outerStep);
-                indices->push_back(verts*(col-innerStep)+row+i+innerStep);
-                indices->push_back(verts*(col-innerStep)+row+i);
+                indices->push_back(verts * col + row);
+                indices->push_back(verts * col + row + outerStep);
+                // Make sure not to touch the bottom edge
+                if (row == 0)
+                    indices->push_back(verts * (col - innerStep) + row + innerStep);
+                else
+                    indices->push_back(verts * (col - innerStep) + row);
+
+                for (size_t i = 0; i < outerStep; i += innerStep)
+                {
+                    // Make sure not to touch the top or bottom edges
+                    if (row + i == 0 || row + i == verts - 1 - innerStep)
+                        continue;
+                    indices->push_back(verts * col + row + outerStep);
+                    indices->push_back(verts * (col - innerStep) + row + i + innerStep);
+                    indices->push_back(verts * (col - innerStep) + row + i);
+                }
             }
         }
-    }
 
-    return indices;
-}
+        return indices;
+    }
 
 }
 
@@ -186,15 +187,15 @@ namespace Terrain
 
         int vertexCount = numVerts * numVerts;
 
-        osg::ref_ptr<osg::Vec2Array> uvs (new osg::Vec2Array(osg::Array::BIND_PER_VERTEX));
+        osg::ref_ptr<osg::Vec2Array> uvs(new osg::Vec2Array(osg::Array::BIND_PER_VERTEX));
         uvs->reserve(vertexCount);
 
         for (unsigned int col = 0; col < numVerts; ++col)
         {
             for (unsigned int row = 0; row < numVerts; ++row)
             {
-                uvs->push_back(osg::Vec2f(col / static_cast<float>(numVerts-1),
-                                          ((numVerts-1) - row) / static_cast<float>(numVerts-1)));
+                uvs->push_back(osg::Vec2f(
+                    col / static_cast<float>(numVerts - 1), ((numVerts - 1) - row) / static_cast<float>(numVerts - 1)));
             }
         }
 
@@ -217,7 +218,7 @@ namespace Terrain
 
         osg::ref_ptr<osg::DrawElements> buffer;
 
-        if (numVerts*numVerts <= (0xffffu))
+        if (numVerts * numVerts <= (0xffffu))
             buffer = createIndexBuffer<osg::DrawElementsUShort>(flags, numVerts);
         else
             buffer = createIndexBuffer<osg::DrawElementsUInt>(flags, numVerts);
@@ -241,7 +242,7 @@ namespace Terrain
         }
     }
 
-    void BufferCache::releaseGLObjects(osg::State *state)
+    void BufferCache::releaseGLObjects(osg::State* state)
     {
         {
             std::lock_guard<std::mutex> lock(mIndexBufferMutex);
diff --git a/components/terrain/buffercache.hpp b/components/terrain/buffercache.hpp
index 929dbad6ff..a5ec425e5a 100644
--- a/components/terrain/buffercache.hpp
+++ b/components/terrain/buffercache.hpp
@@ -1,9 +1,9 @@
 #ifndef COMPONENTS_TERRAIN_BUFFERCACHE_H
 #define COMPONENTS_TERRAIN_BUFFERCACHE_H
 
-#include <osg/ref_ptr>
 #include <osg/Array>
 #include <osg/PrimitiveSet>
+#include <osg/ref_ptr>
 
 #include <map>
 #include <mutex>
@@ -18,7 +18,7 @@ namespace Terrain
         /// @param flags first 4*4 bits are LOD deltas on each edge, respectively (4 bits each)
         ///              next 4 bits are LOD level of the index buffer (LOD 0 = don't omit any vertices)
         /// @note Thread safe.
-        osg::ref_ptr<osg::DrawElements> getIndexBuffer (unsigned int numVerts, unsigned int flags);
+        osg::ref_ptr<osg::DrawElements> getIndexBuffer(unsigned int numVerts, unsigned int flags);
 
         /// @note Thread safe.
         osg::ref_ptr<osg::Vec2Array> getUVBuffer(unsigned int numVerts);
@@ -30,10 +30,10 @@ namespace Terrain
     private:
         // Index buffers are shared across terrain batches where possible. There is one index buffer for each
         // combination of LOD deltas and index buffer LOD we may need.
-        std::map<std::pair<int, int>, osg::ref_ptr<osg::DrawElements> > mIndexBufferMap;
+        std::map<std::pair<int, int>, osg::ref_ptr<osg::DrawElements>> mIndexBufferMap;
         std::mutex mIndexBufferMutex;
 
-        std::map<int, osg::ref_ptr<osg::Vec2Array> > mUvBufferMap;
+        std::map<int, osg::ref_ptr<osg::Vec2Array>> mUvBufferMap;
         std::mutex mUvBufferMutex;
     };
 
diff --git a/components/terrain/cellborder.cpp b/components/terrain/cellborder.cpp
index fb6593483d..b3f5c721c9 100644
--- a/components/terrain/cellborder.cpp
+++ b/components/terrain/cellborder.cpp
@@ -1,8 +1,8 @@
 #include "cellborder.hpp"
 
+#include <osg/Geometry>
 #include <osg/Material>
 #include <osg/PolygonMode>
-#include <osg/Geometry>
 
 #include "world.hpp"
 
@@ -13,102 +13,100 @@
 namespace Terrain
 {
 
-CellBorder::CellBorder(Terrain::World *world, osg::Group *root, int borderMask, Resource::SceneManager* sceneManager)
-    : mWorld(world)
-    , mSceneManager(sceneManager)
-    , mRoot(root)
-    , mBorderMask(borderMask)
-{
-}
+    CellBorder::CellBorder(
+        Terrain::World* world, osg::Group* root, int borderMask, Resource::SceneManager* sceneManager)
+        : mWorld(world)
+        , mSceneManager(sceneManager)
+        , mRoot(root)
+        , mBorderMask(borderMask)
+    {
+    }
 
-osg::ref_ptr<osg::Group> CellBorder::createBorderGeometry(float x, float y, float size, Terrain::Storage* terrain, Resource::SceneManager* sceneManager, int mask,
-    float offset, osg::Vec4f color)
-{
-    const int cellSize = ESM::Land::REAL_SIZE;
-    const int borderSegments = 40;
+    osg::ref_ptr<osg::Group> CellBorder::createBorderGeometry(float x, float y, float size, Terrain::Storage* terrain,
+        Resource::SceneManager* sceneManager, int mask, float offset, osg::Vec4f color)
+    {
+        const int cellSize = ESM::Land::REAL_SIZE;
+        const int borderSegments = 40;
 
-    osg::Vec3 cellCorner = osg::Vec3(x * cellSize,y * cellSize,0);
-    size *= cellSize;
+        osg::Vec3 cellCorner = osg::Vec3(x * cellSize, y * cellSize, 0);
+        size *= cellSize;
 
-    osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array;
-    osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array;
-    osg::ref_ptr<osg::Vec3Array> normals = new osg::Vec3Array;
+        osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array;
+        osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array;
+        osg::ref_ptr<osg::Vec3Array> normals = new osg::Vec3Array;
 
-    normals->push_back(osg::Vec3(0.0f,-1.0f, 0.0f));
+        normals->push_back(osg::Vec3(0.0f, -1.0f, 0.0f));
 
-    float borderStep = size / ((float)borderSegments);
+        float borderStep = size / ((float)borderSegments);
 
-    for (int i = 0; i <= 2 * borderSegments; ++i)
-    {
-        osg::Vec3f pos = i < borderSegments ?
-            osg::Vec3(i * borderStep,0.0f,0.0f) :
-            osg::Vec3(size, (i - borderSegments) * borderStep,0.0f);
+        for (int i = 0; i <= 2 * borderSegments; ++i)
+        {
+            osg::Vec3f pos = i < borderSegments ? osg::Vec3(i * borderStep, 0.0f, 0.0f)
+                                                : osg::Vec3(size, (i - borderSegments) * borderStep, 0.0f);
 
-        pos += cellCorner;
-        pos += osg::Vec3f(0,0, terrain->getHeightAt(pos) + offset);
+            pos += cellCorner;
+            pos += osg::Vec3f(0, 0, terrain->getHeightAt(pos) + offset);
 
-        vertices->push_back(pos);
+            vertices->push_back(pos);
 
-        osg::Vec4f col = i % 2 == 0 ?
-            osg::Vec4f(0,0,0,1) :
-            color;
+            osg::Vec4f col = i % 2 == 0 ? osg::Vec4f(0, 0, 0, 1) : color;
 
-        colors->push_back(col);
-    }
+            colors->push_back(col);
+        }
 
-    osg::ref_ptr<osg::Geometry> border = new osg::Geometry;
-    border->setVertexArray(vertices.get());
-    border->setNormalArray(normals.get());
-    border->setNormalBinding(osg::Geometry::BIND_OVERALL);
-    border->setColorArray(colors.get());
-    border->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
+        osg::ref_ptr<osg::Geometry> border = new osg::Geometry;
+        border->setVertexArray(vertices.get());
+        border->setNormalArray(normals.get());
+        border->setNormalBinding(osg::Geometry::BIND_OVERALL);
+        border->setColorArray(colors.get());
+        border->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
 
-    border->addPrimitiveSet(new osg::DrawArrays(GL_LINE_STRIP,0,vertices->size()));
+        border->addPrimitiveSet(new osg::DrawArrays(GL_LINE_STRIP, 0, vertices->size()));
 
-    osg::ref_ptr<osg::Group> borderGroup = new osg::Group;
-    borderGroup->addChild(border.get());
+        osg::ref_ptr<osg::Group> borderGroup = new osg::Group;
+        borderGroup->addChild(border.get());
 
-    osg::StateSet *stateSet = borderGroup->getOrCreateStateSet();
-    osg::ref_ptr<osg::Material> material (new osg::Material);
-    material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
-    stateSet->setAttribute(material);
+        osg::StateSet* stateSet = borderGroup->getOrCreateStateSet();
+        osg::ref_ptr<osg::Material> material(new osg::Material);
+        material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
+        stateSet->setAttribute(material);
 
-    osg::PolygonMode* polygonmode = new osg::PolygonMode;
-    polygonmode->setMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::LINE);
-    stateSet->setAttributeAndModes(polygonmode,osg::StateAttribute::ON);
+        osg::PolygonMode* polygonmode = new osg::PolygonMode;
+        polygonmode->setMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::LINE);
+        stateSet->setAttributeAndModes(polygonmode, osg::StateAttribute::ON);
 
-    sceneManager->recreateShaders(borderGroup, "debug");
-    borderGroup->setNodeMask(mask);
+        sceneManager->recreateShaders(borderGroup, "debug");
+        borderGroup->setNodeMask(mask);
 
-    return borderGroup;
-}
+        return borderGroup;
+    }
 
-void CellBorder::createCellBorderGeometry(int x, int y)
-{
-    auto borderGroup = createBorderGeometry(x, y, 1.f, mWorld->getStorage(), mSceneManager, mBorderMask);
-    mRoot->addChild(borderGroup);
+    void CellBorder::createCellBorderGeometry(int x, int y)
+    {
+        auto borderGroup = createBorderGeometry(x, y, 1.f, mWorld->getStorage(), mSceneManager, mBorderMask);
+        mRoot->addChild(borderGroup);
 
-    mCellBorderNodes[std::make_pair(x,y)] = borderGroup;
-}
+        mCellBorderNodes[std::make_pair(x, y)] = borderGroup;
+    }
 
-void CellBorder::destroyCellBorderGeometry(int x, int y)
-{
-    CellGrid::iterator it = mCellBorderNodes.find(std::make_pair(x,y));
+    void CellBorder::destroyCellBorderGeometry(int x, int y)
+    {
+        CellGrid::iterator it = mCellBorderNodes.find(std::make_pair(x, y));
 
-    if (it == mCellBorderNodes.end())
-        return;
+        if (it == mCellBorderNodes.end())
+            return;
 
-    osg::ref_ptr<osg::Node> borderNode = it->second;
-    mRoot->removeChild(borderNode);
+        osg::ref_ptr<osg::Node> borderNode = it->second;
+        mRoot->removeChild(borderNode);
 
-    mCellBorderNodes.erase(it);
-}
+        mCellBorderNodes.erase(it);
+    }
 
-void CellBorder::destroyCellBorderGeometry()
-{
-    for (const auto& v : mCellBorderNodes)
-        mRoot->removeChild(v.second);
-    mCellBorderNodes.clear();
-}
+    void CellBorder::destroyCellBorderGeometry()
+    {
+        for (const auto& v : mCellBorderNodes)
+            mRoot->removeChild(v.second);
+        mCellBorderNodes.clear();
+    }
 
 }
diff --git a/components/terrain/cellborder.hpp b/components/terrain/cellborder.hpp
index 4481816a55..5e674819eb 100644
--- a/components/terrain/cellborder.hpp
+++ b/components/terrain/cellborder.hpp
@@ -20,9 +20,9 @@ namespace Terrain
     class CellBorder
     {
     public:
-        typedef std::map<std::pair<int, int>, osg::ref_ptr<osg::Node> > CellGrid; 
+        typedef std::map<std::pair<int, int>, osg::ref_ptr<osg::Node>> CellGrid;
 
-        CellBorder(Terrain::World *world, osg::Group *root, int borderMask, Resource::SceneManager* sceneManager);
+        CellBorder(Terrain::World* world, osg::Group* root, int borderMask, Resource::SceneManager* sceneManager);
 
         void createCellBorderGeometry(int x, int y);
         void destroyCellBorderGeometry(int x, int y);
@@ -32,12 +32,13 @@ namespace Terrain
         */
         void destroyCellBorderGeometry();
 
-        static osg::ref_ptr<osg::Group> createBorderGeometry(float x, float y, float size, Storage* terrain, Resource::SceneManager* sceneManager, int mask, float offset = 10.0, osg::Vec4f color = { 1,1,0,0 });
+        static osg::ref_ptr<osg::Group> createBorderGeometry(float x, float y, float size, Storage* terrain,
+            Resource::SceneManager* sceneManager, int mask, float offset = 10.0, osg::Vec4f color = { 1, 1, 0, 0 });
 
     protected:
-        Terrain::World *mWorld;
+        Terrain::World* mWorld;
         Resource::SceneManager* mSceneManager;
-        osg::Group *mRoot;
+        osg::Group* mRoot;
 
         CellGrid mCellBorderNodes;
         int mBorderMask;
diff --git a/components/terrain/chunkmanager.cpp b/components/terrain/chunkmanager.cpp
index ae4fd339aa..9e6e0cc150 100644
--- a/components/terrain/chunkmanager.cpp
+++ b/components/terrain/chunkmanager.cpp
@@ -1,7 +1,7 @@
 #include "chunkmanager.hpp"
 
-#include <osg/Texture2D>
 #include <osg/Material>
+#include <osg/Texture2D>
 
 #include <osgUtil/IncrementalCompileOperation>
 
@@ -10,279 +10,304 @@
 
 #include <components/sceneutil/lightmanager.hpp>
 
-#include "terraindrawable.hpp"
+#include "compositemaprenderer.hpp"
 #include "material.hpp"
 #include "storage.hpp"
+#include "terraindrawable.hpp"
 #include "texturemanager.hpp"
-#include "compositemaprenderer.hpp"
 
 namespace Terrain
 {
 
-ChunkManager::ChunkManager(Storage *storage, Resource::SceneManager *sceneMgr, TextureManager* textureManager, CompositeMapRenderer* renderer)
-    : GenericResourceManager<ChunkId>(nullptr)
-    , mStorage(storage)
-    , mSceneManager(sceneMgr)
-    , mTextureManager(textureManager)
-    , mCompositeMapRenderer(renderer)
-    , mNodeMask(0)
-    , mCompositeMapSize(512)
-    , mCompositeMapLevel(1.f)
-    , mMaxCompGeometrySize(1.f)
-{
-    mMultiPassRoot = new osg::StateSet;
-    mMultiPassRoot->setRenderingHint(osg::StateSet::OPAQUE_BIN);
-    osg::ref_ptr<osg::Material> material (new osg::Material);
-    material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
-    mMultiPassRoot->setAttributeAndModes(material, osg::StateAttribute::ON);
-}
-
-struct FindChunkTemplate
-{
-    void operator() (ChunkId id, osg::Object* obj)
+    ChunkManager::ChunkManager(Storage* storage, Resource::SceneManager* sceneMgr, TextureManager* textureManager,
+        CompositeMapRenderer* renderer)
+        : GenericResourceManager<ChunkId>(nullptr)
+        , mStorage(storage)
+        , mSceneManager(sceneMgr)
+        , mTextureManager(textureManager)
+        , mCompositeMapRenderer(renderer)
+        , mNodeMask(0)
+        , mCompositeMapSize(512)
+        , mCompositeMapLevel(1.f)
+        , mMaxCompGeometrySize(1.f)
     {
-        if (std::get<0>(id) == std::get<0>(mId) && std::get<1>(id) == std::get<1>(mId))
-            mFoundTemplate = obj;
+        mMultiPassRoot = new osg::StateSet;
+        mMultiPassRoot->setRenderingHint(osg::StateSet::OPAQUE_BIN);
+        osg::ref_ptr<osg::Material> material(new osg::Material);
+        material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
+        mMultiPassRoot->setAttributeAndModes(material, osg::StateAttribute::ON);
     }
-    ChunkId mId;
-    osg::ref_ptr<osg::Object> mFoundTemplate;
-};
 
-osg::ref_ptr<osg::Node> ChunkManager::getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile)
-{
-    // Override lod with the vertexLodMod adjusted value.
-    // TODO: maybe we can refactor this code by moving all vertexLodMod code into this class.
-    lod = static_cast<unsigned char>(lodFlags >> (4*4));
-    ChunkId id = std::make_tuple(center, lod, lodFlags);
-    osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(id);
-    if (obj)
-        return static_cast<osg::Node*>(obj.get());
-    else
+    struct FindChunkTemplate
     {
-        FindChunkTemplate find;
-        find.mId = id;
-        mCache->call(find);
-        TerrainDrawable* templateGeometry = find.mFoundTemplate ? static_cast<TerrainDrawable*>(find.mFoundTemplate.get()) : nullptr;
-        osg::ref_ptr<osg::Node> node = createChunk(size, center, lod, lodFlags, compile, templateGeometry);
-        mCache->addEntryToObjectCache(id, node.get());
-        return node;
-    }
-}
-
-void ChunkManager::reportStats(unsigned int frameNumber, osg::Stats *stats) const
-{
-    stats->setAttribute(frameNumber, "Terrain Chunk", mCache->getCacheSize());
-}
+        void operator()(ChunkId id, osg::Object* obj)
+        {
+            if (std::get<0>(id) == std::get<0>(mId) && std::get<1>(id) == std::get<1>(mId))
+                mFoundTemplate = obj;
+        }
+        ChunkId mId;
+        osg::ref_ptr<osg::Object> mFoundTemplate;
+    };
 
-void ChunkManager::clearCache()
-{
-    GenericResourceManager<ChunkId>::clearCache();
+    osg::ref_ptr<osg::Node> ChunkManager::getChunk(float size, const osg::Vec2f& center, unsigned char lod,
+        unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile)
+    {
+        // Override lod with the vertexLodMod adjusted value.
+        // TODO: maybe we can refactor this code by moving all vertexLodMod code into this class.
+        lod = static_cast<unsigned char>(lodFlags >> (4 * 4));
+        ChunkId id = std::make_tuple(center, lod, lodFlags);
+        osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(id);
+        if (obj)
+            return static_cast<osg::Node*>(obj.get());
+        else
+        {
+            FindChunkTemplate find;
+            find.mId = id;
+            mCache->call(find);
+            TerrainDrawable* templateGeometry
+                = find.mFoundTemplate ? static_cast<TerrainDrawable*>(find.mFoundTemplate.get()) : nullptr;
+            osg::ref_ptr<osg::Node> node = createChunk(size, center, lod, lodFlags, compile, templateGeometry);
+            mCache->addEntryToObjectCache(id, node.get());
+            return node;
+        }
+    }
 
-    mBufferCache.clearCache();
-}
+    void ChunkManager::reportStats(unsigned int frameNumber, osg::Stats* stats) const
+    {
+        stats->setAttribute(frameNumber, "Terrain Chunk", mCache->getCacheSize());
+    }
 
-void ChunkManager::releaseGLObjects(osg::State *state)
-{
-    GenericResourceManager<ChunkId>::releaseGLObjects(state);
-    mBufferCache.releaseGLObjects(state);
-}
+    void ChunkManager::clearCache()
+    {
+        GenericResourceManager<ChunkId>::clearCache();
 
-osg::ref_ptr<osg::Texture2D> ChunkManager::createCompositeMapRTT()
-{
-    osg::ref_ptr<osg::Texture2D> texture = new osg::Texture2D;
-    texture->setTextureWidth(mCompositeMapSize);
-    texture->setTextureHeight(mCompositeMapSize);
-    texture->setInternalFormat(GL_RGB);
-    texture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
-    texture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-    texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-    texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-
-    return texture;
-}
+        mBufferCache.clearCache();
+    }
 
-void ChunkManager::createCompositeMapGeometry(float chunkSize, const osg::Vec2f& chunkCenter, const osg::Vec4f& texCoords, CompositeMap& compositeMap)
-{
-    if (chunkSize > mMaxCompGeometrySize)
+    void ChunkManager::releaseGLObjects(osg::State* state)
     {
-        createCompositeMapGeometry(chunkSize/2.f, chunkCenter + osg::Vec2f(chunkSize/4.f, chunkSize/4.f), osg::Vec4f(texCoords.x() + texCoords.z()/2.f, texCoords.y(), texCoords.z()/2.f, texCoords.w()/2.f), compositeMap);
-        createCompositeMapGeometry(chunkSize/2.f, chunkCenter + osg::Vec2f(-chunkSize/4.f, chunkSize/4.f), osg::Vec4f(texCoords.x(), texCoords.y(), texCoords.z()/2.f, texCoords.w()/2.f), compositeMap);
-        createCompositeMapGeometry(chunkSize/2.f, chunkCenter + osg::Vec2f(chunkSize/4.f, -chunkSize/4.f), osg::Vec4f(texCoords.x() + texCoords.z()/2.f, texCoords.y()+texCoords.w()/2.f, texCoords.z()/2.f, texCoords.w()/2.f), compositeMap);
-        createCompositeMapGeometry(chunkSize/2.f, chunkCenter + osg::Vec2f(-chunkSize/4.f, -chunkSize/4.f), osg::Vec4f(texCoords.x(), texCoords.y()+texCoords.w()/2.f, texCoords.z()/2.f, texCoords.w()/2.f), compositeMap);
+        GenericResourceManager<ChunkId>::releaseGLObjects(state);
+        mBufferCache.releaseGLObjects(state);
     }
-    else
-    {
-        float left = texCoords.x()*2.f-1;
-        float top = texCoords.y()*2.f-1;
-        float width = texCoords.z()*2.f;
-        float height = texCoords.w()*2.f;
 
-        std::vector<osg::ref_ptr<osg::StateSet> > passes = createPasses(chunkSize, chunkCenter, true);
-        for (std::vector<osg::ref_ptr<osg::StateSet> >::iterator it = passes.begin(); it != passes.end(); ++it)
-        {
-            osg::ref_ptr<osg::Geometry> geom = osg::createTexturedQuadGeometry(osg::Vec3(left,top,0), osg::Vec3(width,0,0), osg::Vec3(0,height,0));
-            geom->setUseDisplayList(false); // don't bother making a display list for an object that is just rendered once.
-            geom->setUseVertexBufferObjects(false);
-            geom->setTexCoordArray(1, geom->getTexCoordArray(0), osg::Array::BIND_PER_VERTEX);
+    osg::ref_ptr<osg::Texture2D> ChunkManager::createCompositeMapRTT()
+    {
+        osg::ref_ptr<osg::Texture2D> texture = new osg::Texture2D;
+        texture->setTextureWidth(mCompositeMapSize);
+        texture->setTextureHeight(mCompositeMapSize);
+        texture->setInternalFormat(GL_RGB);
+        texture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
+        texture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+        texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+        texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
 
-            geom->setStateSet(*it);
+        return texture;
+    }
 
-            compositeMap.mDrawables.emplace_back(geom);
+    void ChunkManager::createCompositeMapGeometry(
+        float chunkSize, const osg::Vec2f& chunkCenter, const osg::Vec4f& texCoords, CompositeMap& compositeMap)
+    {
+        if (chunkSize > mMaxCompGeometrySize)
+        {
+            createCompositeMapGeometry(chunkSize / 2.f, chunkCenter + osg::Vec2f(chunkSize / 4.f, chunkSize / 4.f),
+                osg::Vec4f(
+                    texCoords.x() + texCoords.z() / 2.f, texCoords.y(), texCoords.z() / 2.f, texCoords.w() / 2.f),
+                compositeMap);
+            createCompositeMapGeometry(chunkSize / 2.f, chunkCenter + osg::Vec2f(-chunkSize / 4.f, chunkSize / 4.f),
+                osg::Vec4f(texCoords.x(), texCoords.y(), texCoords.z() / 2.f, texCoords.w() / 2.f), compositeMap);
+            createCompositeMapGeometry(chunkSize / 2.f, chunkCenter + osg::Vec2f(chunkSize / 4.f, -chunkSize / 4.f),
+                osg::Vec4f(texCoords.x() + texCoords.z() / 2.f, texCoords.y() + texCoords.w() / 2.f,
+                    texCoords.z() / 2.f, texCoords.w() / 2.f),
+                compositeMap);
+            createCompositeMapGeometry(chunkSize / 2.f, chunkCenter + osg::Vec2f(-chunkSize / 4.f, -chunkSize / 4.f),
+                osg::Vec4f(
+                    texCoords.x(), texCoords.y() + texCoords.w() / 2.f, texCoords.z() / 2.f, texCoords.w() / 2.f),
+                compositeMap);
+        }
+        else
+        {
+            float left = texCoords.x() * 2.f - 1;
+            float top = texCoords.y() * 2.f - 1;
+            float width = texCoords.z() * 2.f;
+            float height = texCoords.w() * 2.f;
+
+            std::vector<osg::ref_ptr<osg::StateSet>> passes = createPasses(chunkSize, chunkCenter, true);
+            for (std::vector<osg::ref_ptr<osg::StateSet>>::iterator it = passes.begin(); it != passes.end(); ++it)
+            {
+                osg::ref_ptr<osg::Geometry> geom = osg::createTexturedQuadGeometry(
+                    osg::Vec3(left, top, 0), osg::Vec3(width, 0, 0), osg::Vec3(0, height, 0));
+                geom->setUseDisplayList(
+                    false); // don't bother making a display list for an object that is just rendered once.
+                geom->setUseVertexBufferObjects(false);
+                geom->setTexCoordArray(1, geom->getTexCoordArray(0), osg::Array::BIND_PER_VERTEX);
+
+                geom->setStateSet(*it);
+
+                compositeMap.mDrawables.emplace_back(geom);
+            }
         }
     }
-}
 
-std::vector<osg::ref_ptr<osg::StateSet> > ChunkManager::createPasses(float chunkSize, const osg::Vec2f &chunkCenter, bool forCompositeMap)
-{
-    std::vector<LayerInfo> layerList;
-    std::vector<osg::ref_ptr<osg::Image> > blendmaps;
-    mStorage->getBlendmaps(chunkSize, chunkCenter, blendmaps, layerList);
+    std::vector<osg::ref_ptr<osg::StateSet>> ChunkManager::createPasses(
+        float chunkSize, const osg::Vec2f& chunkCenter, bool forCompositeMap)
+    {
+        std::vector<LayerInfo> layerList;
+        std::vector<osg::ref_ptr<osg::Image>> blendmaps;
+        mStorage->getBlendmaps(chunkSize, chunkCenter, blendmaps, layerList);
 
-    bool useShaders = mSceneManager->getForceShaders();
-    if (!mSceneManager->getClampLighting())
-        useShaders = true; // always use shaders when lighting is unclamped, this is to avoid lighting seams between a terrain chunk with normal maps and one without normal maps
+        bool useShaders = mSceneManager->getForceShaders();
+        if (!mSceneManager->getClampLighting())
+            useShaders = true; // always use shaders when lighting is unclamped, this is to avoid lighting seams between
+                               // a terrain chunk with normal maps and one without normal maps
 
-    std::vector<TextureLayer> layers;
-    {
-        for (std::vector<LayerInfo>::const_iterator it = layerList.begin(); it != layerList.end(); ++it)
+        std::vector<TextureLayer> layers;
         {
-            TextureLayer textureLayer;
-            textureLayer.mParallax = it->mParallax;
-            textureLayer.mSpecular = it->mSpecular;
+            for (std::vector<LayerInfo>::const_iterator it = layerList.begin(); it != layerList.end(); ++it)
+            {
+                TextureLayer textureLayer;
+                textureLayer.mParallax = it->mParallax;
+                textureLayer.mSpecular = it->mSpecular;
 
-            textureLayer.mDiffuseMap = mTextureManager->getTexture(it->mDiffuseMap);
+                textureLayer.mDiffuseMap = mTextureManager->getTexture(it->mDiffuseMap);
 
-            if (!forCompositeMap && !it->mNormalMap.empty())
-                textureLayer.mNormalMap = mTextureManager->getTexture(it->mNormalMap);
+                if (!forCompositeMap && !it->mNormalMap.empty())
+                    textureLayer.mNormalMap = mTextureManager->getTexture(it->mNormalMap);
 
-            if (it->requiresShaders())
-                useShaders = true;
+                if (it->requiresShaders())
+                    useShaders = true;
 
-            layers.push_back(textureLayer);
+                layers.push_back(textureLayer);
+            }
         }
-    }
 
-    if (forCompositeMap)
-        useShaders = false;
+        if (forCompositeMap)
+            useShaders = false;
 
-    std::vector<osg::ref_ptr<osg::Texture2D> > blendmapTextures;
-    for (std::vector<osg::ref_ptr<osg::Image> >::const_iterator it = blendmaps.begin(); it != blendmaps.end(); ++it)
-    {
-        osg::ref_ptr<osg::Texture2D> texture (new osg::Texture2D);
-        texture->setImage(*it);
-        texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-        texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-        texture->setResizeNonPowerOfTwoHint(false);
-        blendmapTextures.push_back(texture);
-    }
-
-    float blendmapScale = mStorage->getBlendmapScale(chunkSize);
-
-    return ::Terrain::createPasses(useShaders, mSceneManager, layers, blendmapTextures, blendmapScale, blendmapScale);
-}
+        std::vector<osg::ref_ptr<osg::Texture2D>> blendmapTextures;
+        for (std::vector<osg::ref_ptr<osg::Image>>::const_iterator it = blendmaps.begin(); it != blendmaps.end(); ++it)
+        {
+            osg::ref_ptr<osg::Texture2D> texture(new osg::Texture2D);
+            texture->setImage(*it);
+            texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+            texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+            texture->setResizeNonPowerOfTwoHint(false);
+            blendmapTextures.push_back(texture);
+        }
 
-osg::ref_ptr<osg::Node> ChunkManager::createChunk(float chunkSize, const osg::Vec2f &chunkCenter, unsigned char lod, unsigned int lodFlags, bool compile, TerrainDrawable* templateGeometry)
-{
-    osg::ref_ptr<TerrainDrawable> geometry (new TerrainDrawable);
+        float blendmapScale = mStorage->getBlendmapScale(chunkSize);
 
-    if (!templateGeometry)
-    {
-        osg::ref_ptr<osg::Vec3Array> positions (new osg::Vec3Array);
-        osg::ref_ptr<osg::Vec3Array> normals (new osg::Vec3Array);
-        osg::ref_ptr<osg::Vec4ubArray> colors (new osg::Vec4ubArray);
-        colors->setNormalize(true);
-
-        mStorage->fillVertexBuffers(lod, chunkSize, chunkCenter, positions, normals, colors);
-
-        osg::ref_ptr<osg::VertexBufferObject> vbo (new osg::VertexBufferObject);
-        positions->setVertexBufferObject(vbo);
-        normals->setVertexBufferObject(vbo);
-        colors->setVertexBufferObject(vbo);
-    
-        geometry->setVertexArray(positions);
-        geometry->setNormalArray(normals, osg::Array::BIND_PER_VERTEX);
-        geometry->setColorArray(colors, osg::Array::BIND_PER_VERTEX);
+        return ::Terrain::createPasses(
+            useShaders, mSceneManager, layers, blendmapTextures, blendmapScale, blendmapScale);
     }
-    else
+
+    osg::ref_ptr<osg::Node> ChunkManager::createChunk(float chunkSize, const osg::Vec2f& chunkCenter, unsigned char lod,
+        unsigned int lodFlags, bool compile, TerrainDrawable* templateGeometry)
     {
-        // Unfortunately we need to copy vertex data because of poor coupling with VertexBufferObject.
-        osg::ref_ptr<osg::Array> positions = static_cast<osg::Array*>(templateGeometry->getVertexArray()->clone(osg::CopyOp::DEEP_COPY_ALL));
-        osg::ref_ptr<osg::Array> normals = static_cast<osg::Array*>(templateGeometry->getNormalArray()->clone(osg::CopyOp::DEEP_COPY_ALL));
-        osg::ref_ptr<osg::Array> colors = static_cast<osg::Array*>(templateGeometry->getColorArray()->clone(osg::CopyOp::DEEP_COPY_ALL));
-
-        osg::ref_ptr<osg::VertexBufferObject> vbo (new osg::VertexBufferObject);
-        positions->setVertexBufferObject(vbo);
-        normals->setVertexBufferObject(vbo);
-        colors->setVertexBufferObject(vbo);
-    
-        geometry->setVertexArray(positions);
-        geometry->setNormalArray(normals, osg::Array::BIND_PER_VERTEX);
-        geometry->setColorArray(colors, osg::Array::BIND_PER_VERTEX);
-    }
-    
-    geometry->setUseDisplayList(false);
-    geometry->setUseVertexBufferObjects(true);
+        osg::ref_ptr<TerrainDrawable> geometry(new TerrainDrawable);
 
-    if (chunkSize <= 1.f)
-        geometry->setLightListCallback(new SceneUtil::LightListCallback);
+        if (!templateGeometry)
+        {
+            osg::ref_ptr<osg::Vec3Array> positions(new osg::Vec3Array);
+            osg::ref_ptr<osg::Vec3Array> normals(new osg::Vec3Array);
+            osg::ref_ptr<osg::Vec4ubArray> colors(new osg::Vec4ubArray);
+            colors->setNormalize(true);
 
-    unsigned int numVerts = (mStorage->getCellVertices()-1) * chunkSize / (1 << lod) + 1;
+            mStorage->fillVertexBuffers(lod, chunkSize, chunkCenter, positions, normals, colors);
 
-    geometry->addPrimitiveSet(mBufferCache.getIndexBuffer(numVerts, lodFlags));
+            osg::ref_ptr<osg::VertexBufferObject> vbo(new osg::VertexBufferObject);
+            positions->setVertexBufferObject(vbo);
+            normals->setVertexBufferObject(vbo);
+            colors->setVertexBufferObject(vbo);
 
-    bool useCompositeMap = chunkSize >= mCompositeMapLevel;
-    unsigned int numUvSets = useCompositeMap ? 1 : 2;
+            geometry->setVertexArray(positions);
+            geometry->setNormalArray(normals, osg::Array::BIND_PER_VERTEX);
+            geometry->setColorArray(colors, osg::Array::BIND_PER_VERTEX);
+        }
+        else
+        {
+            // Unfortunately we need to copy vertex data because of poor coupling with VertexBufferObject.
+            osg::ref_ptr<osg::Array> positions
+                = static_cast<osg::Array*>(templateGeometry->getVertexArray()->clone(osg::CopyOp::DEEP_COPY_ALL));
+            osg::ref_ptr<osg::Array> normals
+                = static_cast<osg::Array*>(templateGeometry->getNormalArray()->clone(osg::CopyOp::DEEP_COPY_ALL));
+            osg::ref_ptr<osg::Array> colors
+                = static_cast<osg::Array*>(templateGeometry->getColorArray()->clone(osg::CopyOp::DEEP_COPY_ALL));
+
+            osg::ref_ptr<osg::VertexBufferObject> vbo(new osg::VertexBufferObject);
+            positions->setVertexBufferObject(vbo);
+            normals->setVertexBufferObject(vbo);
+            colors->setVertexBufferObject(vbo);
+
+            geometry->setVertexArray(positions);
+            geometry->setNormalArray(normals, osg::Array::BIND_PER_VERTEX);
+            geometry->setColorArray(colors, osg::Array::BIND_PER_VERTEX);
+        }
 
-    geometry->setTexCoordArrayList(osg::Geometry::ArrayList(numUvSets, mBufferCache.getUVBuffer(numVerts)));
+        geometry->setUseDisplayList(false);
+        geometry->setUseVertexBufferObjects(true);
 
-    geometry->createClusterCullingCallback();
+        if (chunkSize <= 1.f)
+            geometry->setLightListCallback(new SceneUtil::LightListCallback);
 
-    geometry->setStateSet(mMultiPassRoot);
+        unsigned int numVerts = (mStorage->getCellVertices() - 1) * chunkSize / (1 << lod) + 1;
 
-    if (templateGeometry)
-    {
-        if (templateGeometry->getCompositeMap())
-        {
-            geometry->setCompositeMap(templateGeometry->getCompositeMap());
-            geometry->setCompositeMapRenderer(mCompositeMapRenderer);
-        }
-        geometry->setPasses(templateGeometry->getPasses());
-    }
-    else
-    {
-        if (useCompositeMap)
-        {
-            osg::ref_ptr<CompositeMap> compositeMap = new CompositeMap;
-            compositeMap->mTexture = createCompositeMapRTT();
+        geometry->addPrimitiveSet(mBufferCache.getIndexBuffer(numVerts, lodFlags));
+
+        bool useCompositeMap = chunkSize >= mCompositeMapLevel;
+        unsigned int numUvSets = useCompositeMap ? 1 : 2;
 
-            createCompositeMapGeometry(chunkSize, chunkCenter, osg::Vec4f(0,0,1,1), *compositeMap);
+        geometry->setTexCoordArrayList(osg::Geometry::ArrayList(numUvSets, mBufferCache.getUVBuffer(numVerts)));
 
-            mCompositeMapRenderer->addCompositeMap(compositeMap.get(), false);
+        geometry->createClusterCullingCallback();
 
-            geometry->setCompositeMap(compositeMap);
-            geometry->setCompositeMapRenderer(mCompositeMapRenderer);
+        geometry->setStateSet(mMultiPassRoot);
 
-            TextureLayer layer;
-            layer.mDiffuseMap = compositeMap->mTexture;
-            layer.mParallax = false;
-            layer.mSpecular = false;
-            geometry->setPasses(::Terrain::createPasses(mSceneManager->getForceShaders() || !mSceneManager->getClampLighting(), mSceneManager, std::vector<TextureLayer>(1, layer), std::vector<osg::ref_ptr<osg::Texture2D> >(), 1.f, 1.f));
+        if (templateGeometry)
+        {
+            if (templateGeometry->getCompositeMap())
+            {
+                geometry->setCompositeMap(templateGeometry->getCompositeMap());
+                geometry->setCompositeMapRenderer(mCompositeMapRenderer);
+            }
+            geometry->setPasses(templateGeometry->getPasses());
         }
         else
         {
-            geometry->setPasses(createPasses(chunkSize, chunkCenter, false));
+            if (useCompositeMap)
+            {
+                osg::ref_ptr<CompositeMap> compositeMap = new CompositeMap;
+                compositeMap->mTexture = createCompositeMapRTT();
+
+                createCompositeMapGeometry(chunkSize, chunkCenter, osg::Vec4f(0, 0, 1, 1), *compositeMap);
+
+                mCompositeMapRenderer->addCompositeMap(compositeMap.get(), false);
+
+                geometry->setCompositeMap(compositeMap);
+                geometry->setCompositeMapRenderer(mCompositeMapRenderer);
+
+                TextureLayer layer;
+                layer.mDiffuseMap = compositeMap->mTexture;
+                layer.mParallax = false;
+                layer.mSpecular = false;
+                geometry->setPasses(::Terrain::createPasses(
+                    mSceneManager->getForceShaders() || !mSceneManager->getClampLighting(), mSceneManager,
+                    std::vector<TextureLayer>(1, layer), std::vector<osg::ref_ptr<osg::Texture2D>>(), 1.f, 1.f));
+            }
+            else
+            {
+                geometry->setPasses(createPasses(chunkSize, chunkCenter, false));
+            }
         }
-    }
 
-    geometry->setupWaterBoundingBox(-1, chunkSize * mStorage->getCellWorldSize() / numVerts);
+        geometry->setupWaterBoundingBox(-1, chunkSize * mStorage->getCellWorldSize() / numVerts);
 
-    if (!templateGeometry && compile && mSceneManager->getIncrementalCompileOperation())
-    {
-        mSceneManager->getIncrementalCompileOperation()->add(geometry);
-    }
-    geometry->setNodeMask(mNodeMask);
+        if (!templateGeometry && compile && mSceneManager->getIncrementalCompileOperation())
+        {
+            mSceneManager->getIncrementalCompileOperation()->add(geometry);
+        }
+        geometry->setNodeMask(mNodeMask);
 
-    return geometry;
-}
+        return geometry;
+    }
 
 }
diff --git a/components/terrain/chunkmanager.hpp b/components/terrain/chunkmanager.hpp
index 9b85e81330..34fa2aa4ae 100644
--- a/components/terrain/chunkmanager.hpp
+++ b/components/terrain/chunkmanager.hpp
@@ -34,9 +34,11 @@ namespace Terrain
     class ChunkManager : public Resource::GenericResourceManager<ChunkId>, public QuadTreeWorld::ChunkManager
     {
     public:
-        ChunkManager(Storage* storage, Resource::SceneManager* sceneMgr, TextureManager* textureManager, CompositeMapRenderer* renderer);
+        ChunkManager(Storage* storage, Resource::SceneManager* sceneMgr, TextureManager* textureManager,
+            CompositeMapRenderer* renderer);
 
-        osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile) override;
+        osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags,
+            bool activeGrid, const osg::Vec3f& viewPoint, bool compile) override;
 
         void setCompositeMapSize(unsigned int size) { mCompositeMapSize = size; }
         void setCompositeMapLevel(float level) { mCompositeMapLevel = level; }
@@ -52,13 +54,16 @@ namespace Terrain
         void releaseGLObjects(osg::State* state) override;
 
     private:
-        osg::ref_ptr<osg::Node> createChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool compile, TerrainDrawable* templateGeometry);
+        osg::ref_ptr<osg::Node> createChunk(float size, const osg::Vec2f& center, unsigned char lod,
+            unsigned int lodFlags, bool compile, TerrainDrawable* templateGeometry);
 
         osg::ref_ptr<osg::Texture2D> createCompositeMapRTT();
 
-        void createCompositeMapGeometry(float chunkSize, const osg::Vec2f& chunkCenter, const osg::Vec4f& texCoords, CompositeMap& map);
+        void createCompositeMapGeometry(
+            float chunkSize, const osg::Vec2f& chunkCenter, const osg::Vec4f& texCoords, CompositeMap& map);
 
-        std::vector<osg::ref_ptr<osg::StateSet> > createPasses(float chunkSize, const osg::Vec2f& chunkCenter, bool forCompositeMap);
+        std::vector<osg::ref_ptr<osg::StateSet>> createPasses(
+            float chunkSize, const osg::Vec2f& chunkCenter, bool forCompositeMap);
 
         Terrain::Storage* mStorage;
         Resource::SceneManager* mSceneManager;
diff --git a/components/terrain/compositemaprenderer.cpp b/components/terrain/compositemaprenderer.cpp
index 55da3d347a..5319820c83 100644
--- a/components/terrain/compositemaprenderer.cpp
+++ b/components/terrain/compositemaprenderer.cpp
@@ -1,199 +1,191 @@
 #include "compositemaprenderer.hpp"
 
 #include <osg/FrameBufferObject>
-#include <osg/Texture2D>
 #include <osg/RenderInfo>
+#include <osg/Texture2D>
 
 #include <algorithm>
 
 namespace Terrain
 {
 
-CompositeMapRenderer::CompositeMapRenderer()
-    : mTargetFrameRate(120)
-    , mMinimumTimeAvailable(0.0025)
-{
-    setSupportsDisplayList(false);
-    setCullingActive(false);
-
-    mFBO = new osg::FrameBufferObject;
-
-    getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
-}
-
-CompositeMapRenderer::~CompositeMapRenderer()
-{
-}
+    CompositeMapRenderer::CompositeMapRenderer()
+        : mTargetFrameRate(120)
+        , mMinimumTimeAvailable(0.0025)
+    {
+        setSupportsDisplayList(false);
+        setCullingActive(false);
 
-void CompositeMapRenderer::drawImplementation(osg::RenderInfo &renderInfo) const
-{
-    double dt = mTimer.time_s();
-    dt = std::min(dt, 0.2);
-    mTimer.setStartTick();
-    double targetFrameTime = 1.0/static_cast<double>(mTargetFrameRate);
-    double conservativeTimeRatio(0.75);
-    double availableTime = std::max((targetFrameTime - dt)*conservativeTimeRatio,
-                                    mMinimumTimeAvailable);
+        mFBO = new osg::FrameBufferObject;
 
-    std::lock_guard<std::mutex> lock(mMutex);
+        getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+    }
 
-    if (mImmediateCompileSet.empty() && mCompileSet.empty())
-        return;
+    CompositeMapRenderer::~CompositeMapRenderer() {}
 
-    while (!mImmediateCompileSet.empty())
+    void CompositeMapRenderer::drawImplementation(osg::RenderInfo& renderInfo) const
     {
-        osg::ref_ptr<CompositeMap> node = *mImmediateCompileSet.begin();
-        mImmediateCompileSet.erase(node);
+        double dt = mTimer.time_s();
+        dt = std::min(dt, 0.2);
+        mTimer.setStartTick();
+        double targetFrameTime = 1.0 / static_cast<double>(mTargetFrameRate);
+        double conservativeTimeRatio(0.75);
+        double availableTime = std::max((targetFrameTime - dt) * conservativeTimeRatio, mMinimumTimeAvailable);
 
-        mMutex.unlock();
-        compile(*node, renderInfo, nullptr);
-        mMutex.lock();
-    }
+        std::lock_guard<std::mutex> lock(mMutex);
 
-    double timeLeft = availableTime;
+        if (mImmediateCompileSet.empty() && mCompileSet.empty())
+            return;
 
-    while (!mCompileSet.empty() && timeLeft > 0)
-    {
-        osg::ref_ptr<CompositeMap> node = *mCompileSet.begin();
-        mCompileSet.erase(node);
+        while (!mImmediateCompileSet.empty())
+        {
+            osg::ref_ptr<CompositeMap> node = *mImmediateCompileSet.begin();
+            mImmediateCompileSet.erase(node);
+
+            mMutex.unlock();
+            compile(*node, renderInfo, nullptr);
+            mMutex.lock();
+        }
 
-        mMutex.unlock();
-        compile(*node, renderInfo, &timeLeft);
-        mMutex.lock();
+        double timeLeft = availableTime;
 
-        if (node->mCompiled < node->mDrawables.size())
+        while (!mCompileSet.empty() && timeLeft > 0)
         {
-            // We did not compile the map fully.
-            // Place it back to queue to continue work in the next time.
-            mCompileSet.insert(node);
+            osg::ref_ptr<CompositeMap> node = *mCompileSet.begin();
+            mCompileSet.erase(node);
+
+            mMutex.unlock();
+            compile(*node, renderInfo, &timeLeft);
+            mMutex.lock();
+
+            if (node->mCompiled < node->mDrawables.size())
+            {
+                // We did not compile the map fully.
+                // Place it back to queue to continue work in the next time.
+                mCompileSet.insert(node);
+            }
         }
+        mTimer.setStartTick();
     }
-    mTimer.setStartTick();
-}
 
-void CompositeMapRenderer::compile(CompositeMap &compositeMap, osg::RenderInfo &renderInfo, double* timeLeft) const
-{
-    // if there are no more external references we can assume the texture is no longer required
-    if (compositeMap.mTexture->referenceCount() <= 1)
+    void CompositeMapRenderer::compile(CompositeMap& compositeMap, osg::RenderInfo& renderInfo, double* timeLeft) const
     {
-        compositeMap.mCompiled = compositeMap.mDrawables.size();
-        return;
-    }
+        // if there are no more external references we can assume the texture is no longer required
+        if (compositeMap.mTexture->referenceCount() <= 1)
+        {
+            compositeMap.mCompiled = compositeMap.mDrawables.size();
+            return;
+        }
 
-    osg::Timer timer;
-    osg::State& state = *renderInfo.getState();
-    osg::GLExtensions* ext = state.get<osg::GLExtensions>();
+        osg::Timer timer;
+        osg::State& state = *renderInfo.getState();
+        osg::GLExtensions* ext = state.get<osg::GLExtensions>();
 
-    if (!mFBO)
-        return;
+        if (!mFBO)
+            return;
 
-    if (!ext->isFrameBufferObjectSupported)
-        return;
+        if (!ext->isFrameBufferObjectSupported)
+            return;
 
-    osg::FrameBufferAttachment attach (compositeMap.mTexture);
-    mFBO->setAttachment(osg::Camera::COLOR_BUFFER, attach);
-    mFBO->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+        osg::FrameBufferAttachment attach(compositeMap.mTexture);
+        mFBO->setAttachment(osg::Camera::COLOR_BUFFER, attach);
+        mFBO->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
 
-    GLenum status = ext->glCheckFramebufferStatus(GL_FRAMEBUFFER_EXT);
+        GLenum status = ext->glCheckFramebufferStatus(GL_FRAMEBUFFER_EXT);
 
-    if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
-    {
-        GLuint fboId = state.getGraphicsContext() ? state.getGraphicsContext()->getDefaultFboId() : 0;
-        ext->glBindFramebuffer(GL_FRAMEBUFFER_EXT, fboId);
-        OSG_ALWAYS << "Error attaching FBO" << std::endl;
-        return;
-    }
+        if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
+        {
+            GLuint fboId = state.getGraphicsContext() ? state.getGraphicsContext()->getDefaultFboId() : 0;
+            ext->glBindFramebuffer(GL_FRAMEBUFFER_EXT, fboId);
+            OSG_ALWAYS << "Error attaching FBO" << std::endl;
+            return;
+        }
 
-    // inform State that Texture attribute has changed due to compiling of FBO texture
-    // should OSG be doing this on its own?
-    state.haveAppliedTextureAttribute(state.getActiveTextureUnit(), osg::StateAttribute::TEXTURE);
+        // inform State that Texture attribute has changed due to compiling of FBO texture
+        // should OSG be doing this on its own?
+        state.haveAppliedTextureAttribute(state.getActiveTextureUnit(), osg::StateAttribute::TEXTURE);
 
-    for (unsigned int i=compositeMap.mCompiled; i<compositeMap.mDrawables.size(); ++i)
-    {
-        osg::Drawable* drw = compositeMap.mDrawables[i];
-        osg::StateSet* stateset = drw->getStateSet();
+        for (unsigned int i = compositeMap.mCompiled; i < compositeMap.mDrawables.size(); ++i)
+        {
+            osg::Drawable* drw = compositeMap.mDrawables[i];
+            osg::StateSet* stateset = drw->getStateSet();
 
-        if (stateset)
-            renderInfo.getState()->pushStateSet(stateset);
+            if (stateset)
+                renderInfo.getState()->pushStateSet(stateset);
 
-        renderInfo.getState()->apply();
+            renderInfo.getState()->apply();
 
-        glViewport(0,0,compositeMap.mTexture->getTextureWidth(), compositeMap.mTexture->getTextureHeight());
-        drw->drawImplementation(renderInfo);
+            glViewport(0, 0, compositeMap.mTexture->getTextureWidth(), compositeMap.mTexture->getTextureHeight());
+            drw->drawImplementation(renderInfo);
 
-        if (stateset)
-            renderInfo.getState()->popStateSet();
+            if (stateset)
+                renderInfo.getState()->popStateSet();
 
-        ++compositeMap.mCompiled;
+            ++compositeMap.mCompiled;
 
-        compositeMap.mDrawables[i] = nullptr;
+            compositeMap.mDrawables[i] = nullptr;
 
-        if (timeLeft)
-        {
-            *timeLeft -= timer.time_s();
-            timer.setStartTick();
+            if (timeLeft)
+            {
+                *timeLeft -= timer.time_s();
+                timer.setStartTick();
 
-            if (*timeLeft <= 0)
-                break;
+                if (*timeLeft <= 0)
+                    break;
+            }
         }
-    }
-    if (compositeMap.mCompiled == compositeMap.mDrawables.size())
-        compositeMap.mDrawables = std::vector<osg::ref_ptr<osg::Drawable>>();
+        if (compositeMap.mCompiled == compositeMap.mDrawables.size())
+            compositeMap.mDrawables = std::vector<osg::ref_ptr<osg::Drawable>>();
 
-    state.haveAppliedAttribute(osg::StateAttribute::VIEWPORT);
+        state.haveAppliedAttribute(osg::StateAttribute::VIEWPORT);
 
-    GLuint fboId = state.getGraphicsContext() ? state.getGraphicsContext()->getDefaultFboId() : 0;
-    ext->glBindFramebuffer(GL_FRAMEBUFFER_EXT, fboId);
-}
-
-void CompositeMapRenderer::setMinimumTimeAvailableForCompile(double time)
-{
-    mMinimumTimeAvailable = time;
-}
-
-void CompositeMapRenderer::setTargetFrameRate(float framerate)
-{
-    mTargetFrameRate = framerate;
-}
-
-void CompositeMapRenderer::addCompositeMap(CompositeMap* compositeMap, bool immediate)
-{
-    std::lock_guard<std::mutex> lock(mMutex);
-    if (immediate)
-        mImmediateCompileSet.insert(compositeMap);
-    else
-        mCompileSet.insert(compositeMap);
-}
+        GLuint fboId = state.getGraphicsContext() ? state.getGraphicsContext()->getDefaultFboId() : 0;
+        ext->glBindFramebuffer(GL_FRAMEBUFFER_EXT, fboId);
+    }
 
-void CompositeMapRenderer::setImmediate(CompositeMap* compositeMap)
-{
-    std::lock_guard<std::mutex> lock(mMutex);
-    CompileSet::iterator found = mCompileSet.find(compositeMap);
-    if (found == mCompileSet.end())
-        return;
-    else
+    void CompositeMapRenderer::setMinimumTimeAvailableForCompile(double time)
     {
-        mImmediateCompileSet.insert(compositeMap);
-        mCompileSet.erase(found);
+        mMinimumTimeAvailable = time;
     }
-}
 
-unsigned int CompositeMapRenderer::getCompileSetSize() const
-{
-    std::lock_guard<std::mutex> lock(mMutex);
-    return mCompileSet.size();
-}
+    void CompositeMapRenderer::setTargetFrameRate(float framerate)
+    {
+        mTargetFrameRate = framerate;
+    }
 
-CompositeMap::CompositeMap()
-    : mCompiled(0)
-{
-}
+    void CompositeMapRenderer::addCompositeMap(CompositeMap* compositeMap, bool immediate)
+    {
+        std::lock_guard<std::mutex> lock(mMutex);
+        if (immediate)
+            mImmediateCompileSet.insert(compositeMap);
+        else
+            mCompileSet.insert(compositeMap);
+    }
 
-CompositeMap::~CompositeMap()
-{
+    void CompositeMapRenderer::setImmediate(CompositeMap* compositeMap)
+    {
+        std::lock_guard<std::mutex> lock(mMutex);
+        CompileSet::iterator found = mCompileSet.find(compositeMap);
+        if (found == mCompileSet.end())
+            return;
+        else
+        {
+            mImmediateCompileSet.insert(compositeMap);
+            mCompileSet.erase(found);
+        }
+    }
 
-}
+    unsigned int CompositeMapRenderer::getCompileSetSize() const
+    {
+        std::lock_guard<std::mutex> lock(mMutex);
+        return mCompileSet.size();
+    }
 
+    CompositeMap::CompositeMap()
+        : mCompiled(0)
+    {
+    }
 
+    CompositeMap::~CompositeMap() {}
 
 }
diff --git a/components/terrain/compositemaprenderer.hpp b/components/terrain/compositemaprenderer.hpp
index f0021c88fe..eeecec75dc 100644
--- a/components/terrain/compositemaprenderer.hpp
+++ b/components/terrain/compositemaprenderer.hpp
@@ -3,8 +3,8 @@
 
 #include <osg/Drawable>
 
-#include <set>
 #include <mutex>
+#include <set>
 
 namespace osg
 {
@@ -21,13 +21,14 @@ namespace Terrain
     public:
         CompositeMap();
         ~CompositeMap();
-        std::vector<osg::ref_ptr<osg::Drawable> > mDrawables;
+        std::vector<osg::ref_ptr<osg::Drawable>> mDrawables;
         osg::ref_ptr<osg::Texture2D> mTexture;
         unsigned int mCompiled;
     };
 
     /**
-     * @brief The CompositeMapRenderer is responsible for updating composite map textures in a blocking or non-blocking way.
+     * @brief The CompositeMapRenderer is responsible for updating composite map textures in a blocking or non-blocking
+     * way.
      */
     class CompositeMapRenderer : public osg::Drawable
     {
@@ -46,7 +47,7 @@ namespace Terrain
         void setTargetFrameRate(float framerate);
 
         /// Add a composite map to be rendered
-        void addCompositeMap(CompositeMap* map, bool immediate=false);
+        void addCompositeMap(CompositeMap* map, bool immediate = false);
 
         /// Mark this composite map to be required for the current frame
         void setImmediate(CompositeMap* map);
@@ -58,7 +59,7 @@ namespace Terrain
         double mMinimumTimeAvailable;
         mutable osg::Timer mTimer;
 
-        typedef std::set<osg::ref_ptr<CompositeMap> > CompileSet;
+        typedef std::set<osg::ref_ptr<CompositeMap>> CompileSet;
 
         mutable CompileSet mCompileSet;
         mutable CompileSet mImmediateCompileSet;
diff --git a/components/terrain/heightcull.hpp b/components/terrain/heightcull.hpp
index d7db5fbccb..24222078a6 100644
--- a/components/terrain/heightcull.hpp
+++ b/components/terrain/heightcull.hpp
@@ -1,8 +1,8 @@
 #ifndef COMPONENTS_TERRAIN_HEIGHTCULL_H
 #define COMPONENTS_TERRAIN_HEIGHTCULL_H
 
-#include <osg/ref_ptr>
 #include <osg/Referenced>
+#include <osg/ref_ptr>
 
 #include <limits>
 
@@ -19,38 +19,21 @@ namespace Terrain
     class HeightCullCallback : public SceneUtil::NodeCallback<HeightCullCallback>
     {
     public:
-        void setLowZ(float z)
-        {
-            mLowZ = z;
-        }
-        float getLowZ() const
-        {
-            return mLowZ;
-        }
+        void setLowZ(float z) { mLowZ = z; }
+        float getLowZ() const { return mLowZ; }
 
-        void setHighZ(float highZ)
-        {
-            mHighZ = highZ;
-        }
-        float getHighZ() const
-        {
-            return mHighZ;
-        }
+        void setHighZ(float highZ) { mHighZ = highZ; }
+        float getHighZ() const { return mHighZ; }
 
-        void setCullMask(unsigned int mask)
-        {
-            mMask = mask;
-        }
-        unsigned int getCullMask() const
-        {
-            return mMask;
-        }
+        void setCullMask(unsigned int mask) { mMask = mask; }
+        unsigned int getCullMask() const { return mMask; }
 
         void operator()(osg::Node* node, osg::NodeVisitor* nv)
         {
             if (mLowZ <= mHighZ)
                 traverse(node, nv);
         }
+
     private:
         float mLowZ{ -std::numeric_limits<float>::max() };
         float mHighZ{ std::numeric_limits<float>::max() };
diff --git a/components/terrain/material.cpp b/components/terrain/material.cpp
index 1c6770e6bc..c56d376aeb 100644
--- a/components/terrain/material.cpp
+++ b/components/terrain/material.cpp
@@ -1,17 +1,17 @@
 #include "material.hpp"
 
-#include <osg/Fog>
+#include <osg/BlendFunc>
+#include <osg/Capability>
 #include <osg/Depth>
+#include <osg/Fog>
 #include <osg/TexEnvCombine>
-#include <osg/Texture2D>
 #include <osg/TexMat>
-#include <osg/BlendFunc>
-#include <osg/Capability>
+#include <osg/Texture2D>
 
-#include <components/stereo/stereomanager.hpp>
 #include <components/resource/scenemanager.hpp>
-#include <components/shader/shadermanager.hpp>
 #include <components/sceneutil/depth.hpp>
+#include <components/shader/shadermanager.hpp>
+#include <components/stereo/stereomanager.hpp>
 
 #include <mutex>
 
@@ -33,13 +33,14 @@ namespace
             if (texMat == mTexMatMap.end())
             {
                 osg::Matrixf matrix;
-                float scale = (blendmapScale/(static_cast<float>(blendmapScale)+1.f));
+                float scale = (blendmapScale / (static_cast<float>(blendmapScale) + 1.f));
                 matrix.preMultTranslate(osg::Vec3f(0.5f, 0.5f, 0.f));
                 matrix.preMultScale(osg::Vec3f(scale, scale, 1.f));
                 matrix.preMultTranslate(osg::Vec3f(-0.5f, -0.5f, 0.f));
                 // We need to nudge the blendmap to look like vanilla.
-                // This causes visible seams unless the blendmap's resolution is doubled, but Vanilla also doubles the blendmap, apparently.
-                matrix.preMultTranslate(osg::Vec3f(1.0f/blendmapScale/4.0f, 1.0f/blendmapScale/4.0f, 0.f));
+                // This causes visible seams unless the blendmap's resolution is doubled, but Vanilla also doubles the
+                // blendmap, apparently.
+                matrix.preMultTranslate(osg::Vec3f(1.0f / blendmapScale / 4.0f, 1.0f / blendmapScale / 4.0f, 0.f));
 
                 texMat = mTexMatMap.insert(std::make_pair(blendmapScale, new osg::TexMat(matrix))).first;
             }
@@ -66,8 +67,10 @@ namespace
             auto texMat = mTexMatMap.find(layerTileSize);
             if (texMat == mTexMatMap.end())
             {
-                texMat = mTexMatMap.insert(std::make_pair(layerTileSize,
-                    new osg::TexMat(osg::Matrix::scale(osg::Vec3f(layerTileSize, layerTileSize, 1.f))))).first;
+                texMat = mTexMatMap
+                             .insert(std::make_pair(layerTileSize,
+                                 new osg::TexMat(osg::Matrix::scale(osg::Vec3f(layerTileSize, layerTileSize, 1.f)))))
+                             .first;
             }
             return texMat->second;
         }
@@ -196,18 +199,19 @@ namespace
 
 namespace Terrain
 {
-    std::vector<osg::ref_ptr<osg::StateSet> > createPasses(bool useShaders, Resource::SceneManager* sceneManager, const std::vector<TextureLayer> &layers,
-                                                           const std::vector<osg::ref_ptr<osg::Texture2D> > &blendmaps, int blendmapScale, float layerTileSize)
+    std::vector<osg::ref_ptr<osg::StateSet>> createPasses(bool useShaders, Resource::SceneManager* sceneManager,
+        const std::vector<TextureLayer>& layers, const std::vector<osg::ref_ptr<osg::Texture2D>>& blendmaps,
+        int blendmapScale, float layerTileSize)
     {
         auto& shaderManager = sceneManager->getShaderManager();
-        std::vector<osg::ref_ptr<osg::StateSet> > passes;
+        std::vector<osg::ref_ptr<osg::StateSet>> passes;
 
         unsigned int blendmapIndex = 0;
         for (std::vector<TextureLayer>::const_iterator it = layers.begin(); it != layers.end(); ++it)
         {
             bool firstLayer = (it == layers.begin());
 
-            osg::ref_ptr<osg::StateSet> stateset (new osg::StateSet);
+            osg::ref_ptr<osg::StateSet> stateset(new osg::StateSet);
 
             if (!blendmaps.empty())
             {
@@ -232,7 +236,8 @@ namespace Terrain
                 stateset->setTextureAttributeAndModes(0, it->mDiffuseMap);
 
                 if (layerTileSize != 1.f)
-                    stateset->setTextureAttributeAndModes(0, LayerTexMat::value(layerTileSize), osg::StateAttribute::ON);
+                    stateset->setTextureAttributeAndModes(
+                        0, LayerTexMat::value(layerTileSize), osg::StateAttribute::ON);
 
                 stateset->addUniform(UniformCollection::value().mDiffuseMap);
 
@@ -259,8 +264,10 @@ namespace Terrain
                 defineMap["writeNormals"] = (it == layers.end() - 1) ? "1" : "0";
                 Stereo::Manager::instance().shaderStereoDefines(defineMap);
 
-                osg::ref_ptr<osg::Shader> vertexShader = shaderManager.getShader("terrain_vertex.glsl", defineMap, osg::Shader::VERTEX);
-                osg::ref_ptr<osg::Shader> fragmentShader = shaderManager.getShader("terrain_fragment.glsl", defineMap, osg::Shader::FRAGMENT);
+                osg::ref_ptr<osg::Shader> vertexShader
+                    = shaderManager.getShader("terrain_vertex.glsl", defineMap, osg::Shader::VERTEX);
+                osg::ref_ptr<osg::Shader> fragmentShader
+                    = shaderManager.getShader("terrain_fragment.glsl", defineMap, osg::Shader::FRAGMENT);
                 if (!vertexShader || !fragmentShader)
                 {
                     // Try again without shader. Error already logged by above
@@ -277,7 +284,8 @@ namespace Terrain
                 stateset->setTextureAttributeAndModes(0, tex.get());
 
                 if (layerTileSize != 1.f)
-                    stateset->setTextureAttributeAndModes(0, LayerTexMat::value(layerTileSize), osg::StateAttribute::ON);
+                    stateset->setTextureAttributeAndModes(
+                        0, LayerTexMat::value(layerTileSize), osg::StateAttribute::ON);
 
                 // Multiply by the alpha map
                 if (!blendmaps.empty())
@@ -290,7 +298,6 @@ namespace Terrain
                     stateset->setTextureAttributeAndModes(1, BlendmapTexMat::value(blendmapScale));
                     stateset->setTextureAttributeAndModes(1, TexEnvCombine::value(), osg::StateAttribute::ON);
                 }
-
             }
 
             passes.push_back(stateset);
diff --git a/components/terrain/material.hpp b/components/terrain/material.hpp
index 975bff2533..1dbf6d8fc8 100644
--- a/components/terrain/material.hpp
+++ b/components/terrain/material.hpp
@@ -24,9 +24,9 @@ namespace Terrain
         bool mSpecular;
     };
 
-    std::vector<osg::ref_ptr<osg::StateSet> > createPasses(bool useShaders, Resource::SceneManager* sceneManager,
-                                                           const std::vector<TextureLayer>& layers,
-                                                           const std::vector<osg::ref_ptr<osg::Texture2D> >& blendmaps, int blendmapScale, float layerTileSize);
+    std::vector<osg::ref_ptr<osg::StateSet>> createPasses(bool useShaders, Resource::SceneManager* sceneManager,
+        const std::vector<TextureLayer>& layers, const std::vector<osg::ref_ptr<osg::Texture2D>>& blendmaps,
+        int blendmapScale, float layerTileSize);
 
 }
 
diff --git a/components/terrain/quadtreenode.cpp b/components/terrain/quadtreenode.cpp
index 81d3ccb32d..c4b83ef9d0 100644
--- a/components/terrain/quadtreenode.cpp
+++ b/components/terrain/quadtreenode.cpp
@@ -10,144 +10,140 @@
 namespace Terrain
 {
 
-float distance(const osg::BoundingBox& box, const osg::Vec3f& v)
-{
-    if (box.contains(v))
-        return 0;
-    else
+    float distance(const osg::BoundingBox& box, const osg::Vec3f& v)
     {
-        osg::Vec3f maxDist(0,0,0);
-        if (v.x() < box.xMin())
-            maxDist.x() = box.xMin() - v.x();
-        else if (v.x() > box.xMax())
-            maxDist.x() = v.x() - box.xMax();
-        if (v.y() < box.yMin())
-            maxDist.y() = box.yMin() - v.y();
-        else if (v.y() > box.yMax())
-            maxDist.y() = v.y() - box.yMax();
-        if (v.z() < box.zMin())
-            maxDist.z() = box.zMin() - v.z();
-        else if (v.z() > box.zMax())
-            maxDist.z() = v.z() - box.zMax();
-        return maxDist.length();
+        if (box.contains(v))
+            return 0;
+        else
+        {
+            osg::Vec3f maxDist(0, 0, 0);
+            if (v.x() < box.xMin())
+                maxDist.x() = box.xMin() - v.x();
+            else if (v.x() > box.xMax())
+                maxDist.x() = v.x() - box.xMax();
+            if (v.y() < box.yMin())
+                maxDist.y() = box.yMin() - v.y();
+            else if (v.y() > box.yMax())
+                maxDist.y() = v.y() - box.yMax();
+            if (v.z() < box.zMin())
+                maxDist.z() = box.zMin() - v.z();
+            else if (v.z() > box.zMax())
+                maxDist.z() = v.z() - box.zMax();
+            return maxDist.length();
+        }
     }
-}
 
-ChildDirection reflect(ChildDirection dir, Direction dir2)
-{
-    assert(dir != Root);
-    const int lookupTable[4][4] =
+    ChildDirection reflect(ChildDirection dir, Direction dir2)
     {
-        // NW  NE  SW  SE
-        {  SW, SE, NW, NE }, // N
-        {  NE, NW, SE, SW }, // E
-        {  SW, SE, NW, NE }, // S
-        {  NE, NW, SE, SW }  // W
-    };
-    return (ChildDirection)lookupTable[dir2][dir];
-}
+        assert(dir != Root);
+        const int lookupTable[4][4] = {
+            // NW  NE  SW  SE
+            { SW, SE, NW, NE }, // N
+            { NE, NW, SE, SW }, // E
+            { SW, SE, NW, NE }, // S
+            { NE, NW, SE, SW } // W
+        };
+        return (ChildDirection)lookupTable[dir2][dir];
+    }
 
-bool adjacent(ChildDirection dir, Direction dir2)
-{
-    assert(dir != Root);
-    const bool lookupTable[4][4] =
+    bool adjacent(ChildDirection dir, Direction dir2)
     {
-        // NW    NE    SW     SE
-        {  true, true, false, false }, // N
-        {  false, true, false, true }, // E
-        {  false, false, true, true }, // S
-        {  true, false, true, false }  // W
-    };
-    return lookupTable[dir2][dir];
-}
+        assert(dir != Root);
+        const bool lookupTable[4][4] = {
+            // NW    NE    SW     SE
+            { true, true, false, false }, // N
+            { false, true, false, true }, // E
+            { false, false, true, true }, // S
+            { true, false, true, false } // W
+        };
+        return lookupTable[dir2][dir];
+    }
 
-QuadTreeNode* searchNeighbour (QuadTreeNode* currentNode, Direction dir)
-{
-    if (currentNode->getDirection() == Root)
-        return nullptr; // Arrived at root node, the root node does not have neighbours
-
-    QuadTreeNode* nextNode;
-    if (adjacent(currentNode->getDirection(), dir))
-        nextNode = searchNeighbour(currentNode->getParent(), dir);
-    else
-        nextNode = currentNode->getParent();
-
-    if (nextNode && nextNode->getNumChildren())
-        return nextNode->getChild(reflect(currentNode->getDirection(), dir));
-    else
-        return nullptr;
-}
+    QuadTreeNode* searchNeighbour(QuadTreeNode* currentNode, Direction dir)
+    {
+        if (currentNode->getDirection() == Root)
+            return nullptr; // Arrived at root node, the root node does not have neighbours
+
+        QuadTreeNode* nextNode;
+        if (adjacent(currentNode->getDirection(), dir))
+            nextNode = searchNeighbour(currentNode->getParent(), dir);
+        else
+            nextNode = currentNode->getParent();
+
+        if (nextNode && nextNode->getNumChildren())
+            return nextNode->getChild(reflect(currentNode->getDirection(), dir));
+        else
+            return nullptr;
+    }
 
-QuadTreeNode::QuadTreeNode(QuadTreeNode* parent, ChildDirection direction, float size, const osg::Vec2f& center)
-    : mParent(parent)
-    , mDirection(direction)
-    , mValidBounds(false)
-    , mSize(size)
-    , mCenter(center)
-{
-    for (unsigned int i=0; i<4; ++i)
-        mNeighbours[i] = nullptr;
-}
+    QuadTreeNode::QuadTreeNode(QuadTreeNode* parent, ChildDirection direction, float size, const osg::Vec2f& center)
+        : mParent(parent)
+        , mDirection(direction)
+        , mValidBounds(false)
+        , mSize(size)
+        , mCenter(center)
+    {
+        for (unsigned int i = 0; i < 4; ++i)
+            mNeighbours[i] = nullptr;
+    }
 
-QuadTreeNode::~QuadTreeNode()
-{
-}
+    QuadTreeNode::~QuadTreeNode() {}
 
-QuadTreeNode *QuadTreeNode::getNeighbour(Direction dir)
-{
-    return mNeighbours[dir];
-}
+    QuadTreeNode* QuadTreeNode::getNeighbour(Direction dir)
+    {
+        return mNeighbours[dir];
+    }
 
-float QuadTreeNode::distance(const osg::Vec3f& v) const
-{
-    const osg::BoundingBox& box = getBoundingBox();
-    return Terrain::distance(box, v);
-}
+    float QuadTreeNode::distance(const osg::Vec3f& v) const
+    {
+        const osg::BoundingBox& box = getBoundingBox();
+        return Terrain::distance(box, v);
+    }
 
-void QuadTreeNode::initNeighbours()
-{
-    for (int i=0; i<4; ++i)
-        mNeighbours[i] = searchNeighbour(this, (Direction)i);
+    void QuadTreeNode::initNeighbours()
+    {
+        for (int i = 0; i < 4; ++i)
+            mNeighbours[i] = searchNeighbour(this, (Direction)i);
 
-    for (unsigned int i=0; i<getNumChildren(); ++i)
-        getChild(i)->initNeighbours();
-}
+        for (unsigned int i = 0; i < getNumChildren(); ++i)
+            getChild(i)->initNeighbours();
+    }
 
-void QuadTreeNode::traverseNodes(ViewData* vd, const osg::Vec3f& viewPoint, LodCallback* lodCallback)
-{
-    if (!hasValidBounds())
-        return;
-    LodCallback::ReturnValue lodResult = lodCallback->isSufficientDetail(this, distance(viewPoint));
-    if (lodResult == LodCallback::StopTraversal)
-        return;
-    else if (lodResult == LodCallback::Deeper && getNumChildren())
+    void QuadTreeNode::traverseNodes(ViewData* vd, const osg::Vec3f& viewPoint, LodCallback* lodCallback)
     {
-        for (unsigned int i=0; i<getNumChildren(); ++i)
-            getChild(i)->traverseNodes(vd, viewPoint, lodCallback);
+        if (!hasValidBounds())
+            return;
+        LodCallback::ReturnValue lodResult = lodCallback->isSufficientDetail(this, distance(viewPoint));
+        if (lodResult == LodCallback::StopTraversal)
+            return;
+        else if (lodResult == LodCallback::Deeper && getNumChildren())
+        {
+            for (unsigned int i = 0; i < getNumChildren(); ++i)
+                getChild(i)->traverseNodes(vd, viewPoint, lodCallback);
+        }
+        else
+            vd->add(this);
     }
-    else
-        vd->add(this);
-}
 
-void QuadTreeNode::setBoundingBox(const osg::BoundingBox &boundingBox)
-{
-    mBoundingBox = boundingBox;
-    mValidBounds = boundingBox.valid();
-}
+    void QuadTreeNode::setBoundingBox(const osg::BoundingBox& boundingBox)
+    {
+        mBoundingBox = boundingBox;
+        mValidBounds = boundingBox.valid();
+    }
 
-const osg::BoundingBox &QuadTreeNode::getBoundingBox() const
-{
-    return mBoundingBox;
-}
+    const osg::BoundingBox& QuadTreeNode::getBoundingBox() const
+    {
+        return mBoundingBox;
+    }
 
-float QuadTreeNode::getSize() const
-{
-    return mSize;
-}
+    float QuadTreeNode::getSize() const
+    {
+        return mSize;
+    }
 
-const osg::Vec2f &QuadTreeNode::getCenter() const
-{
-    return mCenter;
-}
+    const osg::Vec2f& QuadTreeNode::getCenter() const
+    {
+        return mCenter;
+    }
 
 }
diff --git a/components/terrain/quadtreenode.hpp b/components/terrain/quadtreenode.hpp
index aba78b8b3a..ac2dd8d08f 100644
--- a/components/terrain/quadtreenode.hpp
+++ b/components/terrain/quadtreenode.hpp
@@ -29,7 +29,7 @@ namespace Terrain
             StopTraversal,
             StopTraversalAndUse
         };
-        virtual ReturnValue isSufficientDetail(QuadTreeNode *node, float dist) = 0;
+        virtual ReturnValue isSufficientDetail(QuadTreeNode* node, float dist) = 0;
     };
 
     class ViewData;
@@ -62,7 +62,7 @@ namespace Terrain
         ChildDirection getDirection() { return mDirection; }
 
         /// Get neighbour node in this direction
-        QuadTreeNode* getNeighbour (Direction dir);
+        QuadTreeNode* getNeighbour(Direction dir);
 
         /// Initialize neighbours - do this after the quadtree is built
         void initNeighbours();
diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index 5f39c4fc28..1476a7d3aa 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -1,38 +1,39 @@
 #include "quadtreeworld.hpp"
 
-#include <osgUtil/CullVisitor>
-#include <osg/ShapeDrawable>
-#include <osg/PolygonMode>
 #include <osg/Material>
+#include <osg/PolygonMode>
+#include <osg/ShapeDrawable>
+#include <osgUtil/CullVisitor>
 
 #include <limits>
 
-#include <components/misc/constants.hpp>
-#include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/loadinglistener/reporter.hpp>
+#include <components/misc/constants.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/sceneutil/positionattitudetransform.hpp>
 
-#include "quadtreenode.hpp"
-#include "storage.hpp"
-#include "viewdata.hpp"
 #include "chunkmanager.hpp"
 #include "compositemaprenderer.hpp"
-#include "terraindrawable.hpp"
 #include "heightcull.hpp"
+#include "quadtreenode.hpp"
+#include "storage.hpp"
+#include "terraindrawable.hpp"
+#include "viewdata.hpp"
 
 namespace
 {
 
     bool isPowerOfTwo(int x)
     {
-        return ( (x > 0) && ((x & (x - 1)) == 0) );
+        return ((x > 0) && ((x & (x - 1)) == 0));
     }
 
-    int nextPowerOfTwo (int v)
+    int nextPowerOfTwo(int v)
     {
-        if (isPowerOfTwo(v)) return v;
-        int depth=0;
-        while(v)
+        if (isPowerOfTwo(v))
+            return v;
+        int depth = 0;
+        while (v)
         {
             v >>= 1;
             depth++;
@@ -40,10 +41,11 @@ namespace
         return 1 << depth;
     }
 
-    unsigned int Log2( unsigned int n )
+    unsigned int Log2(unsigned int n)
     {
         unsigned int targetlevel = 0;
-        while (n >>= 1) ++targetlevel;
+        while (n >>= 1)
+            ++targetlevel;
         return targetlevel;
     }
 
@@ -52,549 +54,582 @@ namespace
 namespace Terrain
 {
 
-class DefaultLodCallback : public LodCallback
-{
-public:
-    DefaultLodCallback(float factor, float minSize, float viewDistance, const osg::Vec4i& grid, float distanceModifier=0.f)
-        : mFactor(factor)
-        , mMinSize(minSize)
-        , mViewDistance(viewDistance)
-        , mActiveGrid(grid)
-        , mDistanceModifier(distanceModifier)
+    class DefaultLodCallback : public LodCallback
     {
-    }
+    public:
+        DefaultLodCallback(
+            float factor, float minSize, float viewDistance, const osg::Vec4i& grid, float distanceModifier = 0.f)
+            : mFactor(factor)
+            , mMinSize(minSize)
+            , mViewDistance(viewDistance)
+            , mActiveGrid(grid)
+            , mDistanceModifier(distanceModifier)
+        {
+        }
 
-    ReturnValue isSufficientDetail(QuadTreeNode* node, float dist) override
-    {
-        const osg::Vec2f& center = node->getCenter();
-        bool activeGrid = (center.x() > mActiveGrid.x() && center.y() > mActiveGrid.y() && center.x() < mActiveGrid.z() && center.y() < mActiveGrid.w());
+        ReturnValue isSufficientDetail(QuadTreeNode* node, float dist) override
+        {
+            const osg::Vec2f& center = node->getCenter();
+            bool activeGrid = (center.x() > mActiveGrid.x() && center.y() > mActiveGrid.y()
+                && center.x() < mActiveGrid.z() && center.y() < mActiveGrid.w());
 
-        if (node->getSize()>1)
+            if (node->getSize() > 1)
+            {
+                float halfSize = node->getSize() / 2;
+                osg::Vec4i nodeBounds(static_cast<int>(center.x() - halfSize), static_cast<int>(center.y() - halfSize),
+                    static_cast<int>(center.x() + halfSize), static_cast<int>(center.y() + halfSize));
+                bool intersects = (std::max(nodeBounds.x(), mActiveGrid.x()) < std::min(nodeBounds.z(), mActiveGrid.z())
+                    && std::max(nodeBounds.y(), mActiveGrid.y()) < std::min(nodeBounds.w(), mActiveGrid.w()));
+                // to prevent making chunks who will cross the activegrid border
+                if (intersects)
+                    return Deeper;
+            }
+            dist = std::max(0.f, dist + mDistanceModifier);
+            if (dist > mViewDistance && !activeGrid) // for Scene<->ObjectPaging sync the activegrid must remain loaded
+                return StopTraversal;
+            return getNativeLodLevel(node, mMinSize) <= convertDistanceToLodLevel(dist, mMinSize, mFactor)
+                ? StopTraversalAndUse
+                : Deeper;
+        }
+        static unsigned int getNativeLodLevel(const QuadTreeNode* node, float minSize)
         {
-            float halfSize = node->getSize()/2;
-            osg::Vec4i nodeBounds (static_cast<int>(center.x() - halfSize), static_cast<int>(center.y() - halfSize), static_cast<int>(center.x() + halfSize), static_cast<int>(center.y() + halfSize));
-            bool intersects = (std::max(nodeBounds.x(), mActiveGrid.x()) < std::min(nodeBounds.z(), mActiveGrid.z()) && std::max(nodeBounds.y(), mActiveGrid.y()) < std::min(nodeBounds.w(), mActiveGrid.w()));
-            // to prevent making chunks who will cross the activegrid border
-            if (intersects)
-                return Deeper;
+            return Log2(static_cast<unsigned int>(node->getSize() / minSize));
+        }
+        static unsigned int convertDistanceToLodLevel(float dist, float minSize, float factor)
+        {
+            return Log2(static_cast<unsigned int>(dist / (Constants::CellSizeInUnits * minSize * factor)));
         }
-        dist = std::max(0.f, dist + mDistanceModifier);
-        if (dist > mViewDistance && !activeGrid) // for Scene<->ObjectPaging sync the activegrid must remain loaded
-            return StopTraversal;
-        return getNativeLodLevel(node, mMinSize) <= convertDistanceToLodLevel(dist, mMinSize, mFactor) ? StopTraversalAndUse : Deeper;
-    }
-    static unsigned int getNativeLodLevel(const QuadTreeNode* node, float minSize)
-    {
-        return Log2(static_cast<unsigned int>(node->getSize()/minSize));
-    }
-    static unsigned int convertDistanceToLodLevel(float dist, float minSize, float factor)
-    {
-        return Log2(static_cast<unsigned int>(dist/(Constants::CellSizeInUnits*minSize*factor)));
-    }
 
-private:
-    float mFactor;
-    float mMinSize;
-    float mViewDistance;
-    osg::Vec4i mActiveGrid;
-    float mDistanceModifier;
-};
+    private:
+        float mFactor;
+        float mMinSize;
+        float mViewDistance;
+        osg::Vec4i mActiveGrid;
+        float mDistanceModifier;
+    };
 
-class RootNode : public QuadTreeNode
-{
-public:
-    RootNode(float size, const osg::Vec2f& center)
-        : QuadTreeNode(nullptr, Root, size, center)
-        , mWorld(nullptr)
+    class RootNode : public QuadTreeNode
     {
-    }
+    public:
+        RootNode(float size, const osg::Vec2f& center)
+            : QuadTreeNode(nullptr, Root, size, center)
+            , mWorld(nullptr)
+        {
+        }
 
-    void setWorld(QuadTreeWorld* world)
-    {
-        mWorld = world;
-    }
+        void setWorld(QuadTreeWorld* world) { mWorld = world; }
 
-    void accept(osg::NodeVisitor &nv) override
-    {
-        if (!nv.validNodeMask(*this))
-            return;
-        nv.pushOntoNodePath(this);
-        mWorld->accept(nv);
-        nv.popFromNodePath();
-    }
+        void accept(osg::NodeVisitor& nv) override
+        {
+            if (!nv.validNodeMask(*this))
+                return;
+            nv.pushOntoNodePath(this);
+            mWorld->accept(nv);
+            nv.popFromNodePath();
+        }
 
-private:
-    QuadTreeWorld* mWorld;
-};
+    private:
+        QuadTreeWorld* mWorld;
+    };
 
-class QuadTreeBuilder
-{
-public:
-    QuadTreeBuilder(Terrain::Storage* storage, float minSize)
-        : mStorage(storage)
-        , mMinX(0.f), mMaxX(0.f), mMinY(0.f), mMaxY(0.f)
-        , mMinSize(minSize)
+    class QuadTreeBuilder
     {
-    }
+    public:
+        QuadTreeBuilder(Terrain::Storage* storage, float minSize)
+            : mStorage(storage)
+            , mMinX(0.f)
+            , mMaxX(0.f)
+            , mMinY(0.f)
+            , mMaxY(0.f)
+            , mMinSize(minSize)
+        {
+        }
 
-    void build()
-    {
-        mStorage->getBounds(mMinX, mMaxX, mMinY, mMaxY);
+        void build()
+        {
+            mStorage->getBounds(mMinX, mMaxX, mMinY, mMaxY);
 
-        int origSizeX = static_cast<int>(mMaxX - mMinX);
-        int origSizeY = static_cast<int>(mMaxY - mMinY);
+            int origSizeX = static_cast<int>(mMaxX - mMinX);
+            int origSizeY = static_cast<int>(mMaxY - mMinY);
 
-        // Dividing a quad tree only works well for powers of two, so round up to the nearest one
-        int size = nextPowerOfTwo(std::max(origSizeX, origSizeY));
+            // Dividing a quad tree only works well for powers of two, so round up to the nearest one
+            int size = nextPowerOfTwo(std::max(origSizeX, origSizeY));
 
-        float centerX = (mMinX+mMaxX)/2.f + (size-origSizeX)/2.f;
-        float centerY = (mMinY+mMaxY)/2.f + (size-origSizeY)/2.f;
+            float centerX = (mMinX + mMaxX) / 2.f + (size - origSizeX) / 2.f;
+            float centerY = (mMinY + mMaxY) / 2.f + (size - origSizeY) / 2.f;
 
-        mRootNode = new RootNode(size, osg::Vec2f(centerX, centerY));
-        addChildren(mRootNode);
+            mRootNode = new RootNode(size, osg::Vec2f(centerX, centerY));
+            addChildren(mRootNode);
 
-        mRootNode->initNeighbours();
-        float cellWorldSize = mStorage->getCellWorldSize();
-        mRootNode->setInitialBound(osg::BoundingSphere(osg::BoundingBox(osg::Vec3(mMinX*cellWorldSize, mMinY*cellWorldSize, 0), osg::Vec3(mMaxX*cellWorldSize, mMaxY*cellWorldSize, 0))));
-    }
+            mRootNode->initNeighbours();
+            float cellWorldSize = mStorage->getCellWorldSize();
+            mRootNode->setInitialBound(
+                osg::BoundingSphere(osg::BoundingBox(osg::Vec3(mMinX * cellWorldSize, mMinY * cellWorldSize, 0),
+                    osg::Vec3(mMaxX * cellWorldSize, mMaxY * cellWorldSize, 0))));
+        }
 
-    void addChildren(QuadTreeNode* parent)
-    {
-        float halfSize = parent->getSize()/2.f;
-        osg::BoundingBox boundingBox;
-        for (unsigned int i=0; i<4; ++i)
+        void addChildren(QuadTreeNode* parent)
         {
-            osg::ref_ptr<QuadTreeNode> child = addChild(parent, static_cast<ChildDirection>(i), halfSize);
-            if (child)
+            float halfSize = parent->getSize() / 2.f;
+            osg::BoundingBox boundingBox;
+            for (unsigned int i = 0; i < 4; ++i)
             {
-                boundingBox.expandBy(child->getBoundingBox());
-                parent->addChildNode(child);
+                osg::ref_ptr<QuadTreeNode> child = addChild(parent, static_cast<ChildDirection>(i), halfSize);
+                if (child)
+                {
+                    boundingBox.expandBy(child->getBoundingBox());
+                    parent->addChildNode(child);
+                }
             }
-        }
 
-        if (!boundingBox.valid())
-            parent->removeChildren(0, 4);
-        else
-            parent->setBoundingBox(boundingBox);
-    }
+            if (!boundingBox.valid())
+                parent->removeChildren(0, 4);
+            else
+                parent->setBoundingBox(boundingBox);
+        }
 
-    osg::ref_ptr<QuadTreeNode> addChild(QuadTreeNode* parent, ChildDirection direction, float size)
-    {
-        float halfSize = size/2.f;
-        osg::Vec2f center;
-        switch (direction)
+        osg::ref_ptr<QuadTreeNode> addChild(QuadTreeNode* parent, ChildDirection direction, float size)
         {
-        case SW:
-            center = parent->getCenter() + osg::Vec2f(-halfSize,-halfSize);
-            break;
-        case SE:
-            center = parent->getCenter() + osg::Vec2f(halfSize, -halfSize);
-            break;
-        case NW:
-            center = parent->getCenter() + osg::Vec2f(-halfSize, halfSize);
-            break;
-        case NE:
-            center = parent->getCenter() + osg::Vec2f(halfSize, halfSize);
-            break;
-        default:
-            break;
-        }
+            float halfSize = size / 2.f;
+            osg::Vec2f center;
+            switch (direction)
+            {
+                case SW:
+                    center = parent->getCenter() + osg::Vec2f(-halfSize, -halfSize);
+                    break;
+                case SE:
+                    center = parent->getCenter() + osg::Vec2f(halfSize, -halfSize);
+                    break;
+                case NW:
+                    center = parent->getCenter() + osg::Vec2f(-halfSize, halfSize);
+                    break;
+                case NE:
+                    center = parent->getCenter() + osg::Vec2f(halfSize, halfSize);
+                    break;
+                default:
+                    break;
+            }
 
-        osg::ref_ptr<QuadTreeNode> node = new QuadTreeNode(parent, direction, size, center);
+            osg::ref_ptr<QuadTreeNode> node = new QuadTreeNode(parent, direction, size, center);
 
-        if (center.x() - halfSize > mMaxX
-                || center.x() + halfSize < mMinX
-                || center.y() - halfSize > mMaxY
-                || center.y() + halfSize < mMinY )
+            if (center.x() - halfSize > mMaxX || center.x() + halfSize < mMinX || center.y() - halfSize > mMaxY
+                || center.y() + halfSize < mMinY)
             // Out of bounds of the actual terrain - this will happen because
             // we rounded the size up to the next power of two
-        {
-            // Still create and return an empty node so as to not break the assumption that each QuadTreeNode has either 4 or 0 children.
-            return node;
-        }
+            {
+                // Still create and return an empty node so as to not break the assumption that each QuadTreeNode has
+                // either 4 or 0 children.
+                return node;
+            }
 
-        // Do not add child nodes for default cells without data.
-        // size = 1 means that the single shape covers the whole cell.
-        if (node->getSize() == 1 && !mStorage->hasData(center.x()-0.5, center.y()-0.5))
-            return node;
+            // Do not add child nodes for default cells without data.
+            // size = 1 means that the single shape covers the whole cell.
+            if (node->getSize() == 1 && !mStorage->hasData(center.x() - 0.5, center.y() - 0.5))
+                return node;
 
-        if (node->getSize() <= mMinSize)
-        {
-            // We arrived at a leaf.
-            // Since the tree is used for LOD level selection instead of culling, we do not need to load the actual height data here.
-            constexpr float minZ = -std::numeric_limits<float>::max();
-            constexpr float maxZ = std::numeric_limits<float>::max();
-            float cellWorldSize = mStorage->getCellWorldSize();
-            osg::BoundingBox boundingBox(osg::Vec3f((center.x()-halfSize)*cellWorldSize, (center.y()-halfSize)*cellWorldSize, minZ),
-                                    osg::Vec3f((center.x()+halfSize)*cellWorldSize, (center.y()+halfSize)*cellWorldSize, maxZ));
-            node->setBoundingBox(boundingBox);
-            return node;
-        }
-        else
-        {
-            addChildren(node);
-            return node;
+            if (node->getSize() <= mMinSize)
+            {
+                // We arrived at a leaf.
+                // Since the tree is used for LOD level selection instead of culling, we do not need to load the actual
+                // height data here.
+                constexpr float minZ = -std::numeric_limits<float>::max();
+                constexpr float maxZ = std::numeric_limits<float>::max();
+                float cellWorldSize = mStorage->getCellWorldSize();
+                osg::BoundingBox boundingBox(
+                    osg::Vec3f((center.x() - halfSize) * cellWorldSize, (center.y() - halfSize) * cellWorldSize, minZ),
+                    osg::Vec3f((center.x() + halfSize) * cellWorldSize, (center.y() + halfSize) * cellWorldSize, maxZ));
+                node->setBoundingBox(boundingBox);
+                return node;
+            }
+            else
+            {
+                addChildren(node);
+                return node;
+            }
         }
-    }
 
-    osg::ref_ptr<RootNode> getRootNode()
-    {
-        return mRootNode;
-    }
+        osg::ref_ptr<RootNode> getRootNode() { return mRootNode; }
 
-private:
-    Terrain::Storage* mStorage;
+    private:
+        Terrain::Storage* mStorage;
 
-    float mMinX, mMaxX, mMinY, mMaxY;
-    float mMinSize;
+        float mMinX, mMaxX, mMinY, mMaxY;
+        float mMinSize;
 
-    osg::ref_ptr<RootNode> mRootNode;
-};
+        osg::ref_ptr<RootNode> mRootNode;
+    };
 
-class DebugChunkManager : public QuadTreeWorld::ChunkManager
-{
-public:
-    DebugChunkManager(Resource::SceneManager* sceneManager, Storage* storage, unsigned int nodeMask) : mSceneManager(sceneManager), mStorage(storage), mNodeMask(nodeMask) {}
-    osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& chunkCenter, unsigned char lod, unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile)
+    class DebugChunkManager : public QuadTreeWorld::ChunkManager
     {
-        osg::Vec3f center = { chunkCenter.x(), chunkCenter.y(), 0 };
-        auto chunkBorder = CellBorder::createBorderGeometry(center.x() - size / 2.f, center.y() - size / 2.f, size, mStorage, mSceneManager, mNodeMask, 5.f, { 1, 0, 0, 0 });
-        osg::ref_ptr<SceneUtil::PositionAttitudeTransform> pat = new SceneUtil::PositionAttitudeTransform;
-        pat->setPosition(-center*Constants::CellSizeInUnits);
-        pat->addChild(chunkBorder);
-        return pat;
-    }
-    unsigned int getNodeMask() { return mNodeMask; }
-private:
-    Resource::SceneManager* mSceneManager;
-    Storage* mStorage;
-    unsigned int mNodeMask;
-};
-
-QuadTreeWorld::QuadTreeWorld(osg::Group *parent, osg::Group *compileRoot, Resource::ResourceSystem *resourceSystem, Storage *storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask, int compMapResolution, float compMapLevel, float lodFactor, int vertexLodMod, float maxCompGeometrySize, bool debugChunks)
-    : TerrainGrid(parent, compileRoot, resourceSystem, storage, nodeMask, preCompileMask, borderMask)
-    , mViewDataMap(new ViewDataMap)
-    , mQuadTreeBuilt(false)
-    , mLodFactor(lodFactor)
-    , mVertexLodMod(vertexLodMod)
-    , mViewDistance(std::numeric_limits<float>::max())
-    , mMinSize(1/8.f)
-    , mDebugTerrainChunks(debugChunks)
-{
-    mChunkManager->setCompositeMapSize(compMapResolution);
-    mChunkManager->setCompositeMapLevel(compMapLevel);
-    mChunkManager->setMaxCompositeGeometrySize(maxCompGeometrySize);
-    mChunkManagers.push_back(mChunkManager.get());
-
-    if (mDebugTerrainChunks)
+    public:
+        DebugChunkManager(Resource::SceneManager* sceneManager, Storage* storage, unsigned int nodeMask)
+            : mSceneManager(sceneManager)
+            , mStorage(storage)
+            , mNodeMask(nodeMask)
+        {
+        }
+        osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& chunkCenter, unsigned char lod,
+            unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile)
+        {
+            osg::Vec3f center = { chunkCenter.x(), chunkCenter.y(), 0 };
+            auto chunkBorder = CellBorder::createBorderGeometry(center.x() - size / 2.f, center.y() - size / 2.f, size,
+                mStorage, mSceneManager, mNodeMask, 5.f, { 1, 0, 0, 0 });
+            osg::ref_ptr<SceneUtil::PositionAttitudeTransform> pat = new SceneUtil::PositionAttitudeTransform;
+            pat->setPosition(-center * Constants::CellSizeInUnits);
+            pat->addChild(chunkBorder);
+            return pat;
+        }
+        unsigned int getNodeMask() { return mNodeMask; }
+
+    private:
+        Resource::SceneManager* mSceneManager;
+        Storage* mStorage;
+        unsigned int mNodeMask;
+    };
+
+    QuadTreeWorld::QuadTreeWorld(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem,
+        Storage* storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask,
+        int compMapResolution, float compMapLevel, float lodFactor, int vertexLodMod, float maxCompGeometrySize,
+        bool debugChunks)
+        : TerrainGrid(parent, compileRoot, resourceSystem, storage, nodeMask, preCompileMask, borderMask)
+        , mViewDataMap(new ViewDataMap)
+        , mQuadTreeBuilt(false)
+        , mLodFactor(lodFactor)
+        , mVertexLodMod(vertexLodMod)
+        , mViewDistance(std::numeric_limits<float>::max())
+        , mMinSize(1 / 8.f)
+        , mDebugTerrainChunks(debugChunks)
     {
-        mDebugChunkManager = std::make_unique<DebugChunkManager>(mResourceSystem->getSceneManager(), mStorage, borderMask);
-        addChunkManager(mDebugChunkManager.get());
-    }
-}
-
-QuadTreeWorld::~QuadTreeWorld()
-{
-}
+        mChunkManager->setCompositeMapSize(compMapResolution);
+        mChunkManager->setCompositeMapLevel(compMapLevel);
+        mChunkManager->setMaxCompositeGeometrySize(maxCompGeometrySize);
+        mChunkManagers.push_back(mChunkManager.get());
 
-/// get the level of vertex detail to render this node at, expressed relative to the native resolution of the vertex data set,
-/// NOT relative to mMinSize as is the case with node LODs.
-unsigned int getVertexLod(QuadTreeNode* node, int vertexLodMod)
-{
-    unsigned int vertexLod = DefaultLodCallback::getNativeLodLevel(node, 1);
-    if (vertexLodMod > 0)
-    {
-        vertexLod = static_cast<unsigned int>(std::max(0, static_cast<int>(vertexLod)-vertexLodMod));
-    }
-    else if (vertexLodMod < 0)
-    {
-        float size = node->getSize();
-        // Stop to simplify at this level since with size = 1 the node already covers the whole cell and has getCellVertices() vertices.
-        while (size < 1)
+        if (mDebugTerrainChunks)
         {
-            size *= 2;
-            vertexLodMod = std::min(0, vertexLodMod+1);
+            mDebugChunkManager
+                = std::make_unique<DebugChunkManager>(mResourceSystem->getSceneManager(), mStorage, borderMask);
+            addChunkManager(mDebugChunkManager.get());
         }
-        vertexLod += std::abs(vertexLodMod);
     }
-    return vertexLod;
-}
 
-/// get the flags to use for stitching in the index buffer so that chunks of different LOD connect seamlessly
-unsigned int getLodFlags(QuadTreeNode* node, unsigned int ourVertexLod, int vertexLodMod, const ViewData* vd)
-{
-    unsigned int lodFlags = 0;
-    for (unsigned int i=0; i<4; ++i)
+    QuadTreeWorld::~QuadTreeWorld() {}
+
+    /// get the level of vertex detail to render this node at, expressed relative to the native resolution of the vertex
+    /// data set, NOT relative to mMinSize as is the case with node LODs.
+    unsigned int getVertexLod(QuadTreeNode* node, int vertexLodMod)
     {
-        QuadTreeNode* neighbour = node->getNeighbour(static_cast<Direction>(i));
-
-        // If the neighbour isn't currently rendering itself,
-        // go up until we find one. NOTE: We don't need to go down,
-        // because in that case neighbour's detail would be higher than
-        // our detail and the neighbour would handle stitching by itself.
-        while (neighbour && !vd->contains(neighbour))
-            neighbour = neighbour->getParent();
-        unsigned int lod = 0;
-        if (neighbour)
-            lod = getVertexLod(neighbour, vertexLodMod);
-
-        if (lod <= ourVertexLod) // We only need to worry about neighbours less detailed than we are -
-            lod = 0;         // neighbours with more detail will do the stitching themselves
-        // Use 4 bits for each LOD delta
-        if (lod > 0)
+        unsigned int vertexLod = DefaultLodCallback::getNativeLodLevel(node, 1);
+        if (vertexLodMod > 0)
         {
-            lodFlags |= (lod - ourVertexLod) << (4*i);
+            vertexLod = static_cast<unsigned int>(std::max(0, static_cast<int>(vertexLod) - vertexLodMod));
         }
+        else if (vertexLodMod < 0)
+        {
+            float size = node->getSize();
+            // Stop to simplify at this level since with size = 1 the node already covers the whole cell and has
+            // getCellVertices() vertices.
+            while (size < 1)
+            {
+                size *= 2;
+                vertexLodMod = std::min(0, vertexLodMod + 1);
+            }
+            vertexLod += std::abs(vertexLodMod);
+        }
+        return vertexLod;
     }
-    // Use the remaining bits for our vertex LOD
-    lodFlags |= (ourVertexLod << (4*4));
-    return lodFlags;
-}
 
-void QuadTreeWorld::loadRenderingNode(ViewDataEntry& entry, ViewData* vd, float cellWorldSize, const osg::Vec4i &gridbounds, bool compile)
-{
-    if (!vd->hasChanged() && entry.mRenderingNode)
-        return;
-
-    if (vd->hasChanged())
+    /// get the flags to use for stitching in the index buffer so that chunks of different LOD connect seamlessly
+    unsigned int getLodFlags(QuadTreeNode* node, unsigned int ourVertexLod, int vertexLodMod, const ViewData* vd)
     {
-        unsigned int ourVertexLod = getVertexLod(entry.mNode, mVertexLodMod);
-        // have to recompute the lodFlags in case a neighbour has changed LOD.
-        unsigned int lodFlags = getLodFlags(entry.mNode, ourVertexLod, mVertexLodMod, vd);
-        if (lodFlags != entry.mLodFlags)
+        unsigned int lodFlags = 0;
+        for (unsigned int i = 0; i < 4; ++i)
         {
-            entry.mRenderingNode = nullptr;
-            entry.mLodFlags = lodFlags;
+            QuadTreeNode* neighbour = node->getNeighbour(static_cast<Direction>(i));
+
+            // If the neighbour isn't currently rendering itself,
+            // go up until we find one. NOTE: We don't need to go down,
+            // because in that case neighbour's detail would be higher than
+            // our detail and the neighbour would handle stitching by itself.
+            while (neighbour && !vd->contains(neighbour))
+                neighbour = neighbour->getParent();
+            unsigned int lod = 0;
+            if (neighbour)
+                lod = getVertexLod(neighbour, vertexLodMod);
+
+            if (lod <= ourVertexLod) // We only need to worry about neighbours less detailed than we are -
+                lod = 0; // neighbours with more detail will do the stitching themselves
+            // Use 4 bits for each LOD delta
+            if (lod > 0)
+            {
+                lodFlags |= (lod - ourVertexLod) << (4 * i);
+            }
         }
+        // Use the remaining bits for our vertex LOD
+        lodFlags |= (ourVertexLod << (4 * 4));
+        return lodFlags;
     }
 
-    if (!entry.mRenderingNode)
+    void QuadTreeWorld::loadRenderingNode(
+        ViewDataEntry& entry, ViewData* vd, float cellWorldSize, const osg::Vec4i& gridbounds, bool compile)
     {
-        osg::ref_ptr<SceneUtil::PositionAttitudeTransform> pat = new SceneUtil::PositionAttitudeTransform;
-        pat->setPosition(osg::Vec3f(entry.mNode->getCenter().x()*cellWorldSize, entry.mNode->getCenter().y()*cellWorldSize, 0.f));
+        if (!vd->hasChanged() && entry.mRenderingNode)
+            return;
 
-        const osg::Vec2f& center = entry.mNode->getCenter();
-        bool activeGrid = (center.x() > gridbounds.x() && center.y() > gridbounds.y() && center.x() < gridbounds.z() && center.y() < gridbounds.w());
+        if (vd->hasChanged())
+        {
+            unsigned int ourVertexLod = getVertexLod(entry.mNode, mVertexLodMod);
+            // have to recompute the lodFlags in case a neighbour has changed LOD.
+            unsigned int lodFlags = getLodFlags(entry.mNode, ourVertexLod, mVertexLodMod, vd);
+            if (lodFlags != entry.mLodFlags)
+            {
+                entry.mRenderingNode = nullptr;
+                entry.mLodFlags = lodFlags;
+            }
+        }
 
-        for (QuadTreeWorld::ChunkManager* m : mChunkManagers)
+        if (!entry.mRenderingNode)
         {
-            osg::ref_ptr<osg::Node> n = m->getChunk(entry.mNode->getSize(), entry.mNode->getCenter(), DefaultLodCallback::getNativeLodLevel(entry.mNode, mMinSize), entry.mLodFlags, activeGrid, vd->getViewPoint(), compile);
-            if (n) pat->addChild(n);
+            osg::ref_ptr<SceneUtil::PositionAttitudeTransform> pat = new SceneUtil::PositionAttitudeTransform;
+            pat->setPosition(osg::Vec3f(
+                entry.mNode->getCenter().x() * cellWorldSize, entry.mNode->getCenter().y() * cellWorldSize, 0.f));
+
+            const osg::Vec2f& center = entry.mNode->getCenter();
+            bool activeGrid = (center.x() > gridbounds.x() && center.y() > gridbounds.y() && center.x() < gridbounds.z()
+                && center.y() < gridbounds.w());
+
+            for (QuadTreeWorld::ChunkManager* m : mChunkManagers)
+            {
+                osg::ref_ptr<osg::Node> n = m->getChunk(entry.mNode->getSize(), entry.mNode->getCenter(),
+                    DefaultLodCallback::getNativeLodLevel(entry.mNode, mMinSize), entry.mLodFlags, activeGrid,
+                    vd->getViewPoint(), compile);
+                if (n)
+                    pat->addChild(n);
+            }
+            entry.mRenderingNode = pat;
         }
-        entry.mRenderingNode = pat;
     }
-}
 
-void updateWaterCullingView(HeightCullCallback* callback, ViewData* vd, osgUtil::CullVisitor* cv, float cellworldsize, bool outofworld)
-{
-    if (!(cv->getTraversalMask() & callback->getCullMask()))
-        return;
-    float lowZ = std::numeric_limits<float>::max();
-    float highZ = callback->getHighZ();
-    if (cv->getEyePoint().z() <= highZ || outofworld)
+    void updateWaterCullingView(
+        HeightCullCallback* callback, ViewData* vd, osgUtil::CullVisitor* cv, float cellworldsize, bool outofworld)
     {
-        callback->setLowZ(-std::numeric_limits<float>::max());
-        return;
-    }
-    cv->pushCurrentMask();
-    static bool debug = getenv("OPENMW_WATER_CULLING_DEBUG") != nullptr;
-    for (unsigned int i=0; i<vd->getNumEntries(); ++i)
-    {
-        ViewDataEntry& entry = vd->getEntry(i);
-        osg::BoundingBox bb = static_cast<TerrainDrawable*>(entry.mRenderingNode->asGroup()->getChild(0))->getWaterBoundingBox();
-        if (!bb.valid())
-            continue;
-        osg::Vec3f ofs (entry.mNode->getCenter().x()*cellworldsize, entry.mNode->getCenter().y()*cellworldsize, 0.f);
-        bb._min += ofs; bb._max += ofs;
-        bb._min.z() = highZ;
-        bb._max.z() = highZ;
-        if (cv->isCulled(bb))
-            continue;
-        lowZ = bb._min.z();
-
-        if (!debug)
-            break;
-        osg::Box* b = new osg::Box;
-        b->set(bb.center(), bb._max - bb.center());
-        osg::ShapeDrawable* drw = new osg::ShapeDrawable(b);
-        static osg::ref_ptr<osg::StateSet> stateset = nullptr;
-        if (!stateset)
+        if (!(cv->getTraversalMask() & callback->getCullMask()))
+            return;
+        float lowZ = std::numeric_limits<float>::max();
+        float highZ = callback->getHighZ();
+        if (cv->getEyePoint().z() <= highZ || outofworld)
+        {
+            callback->setLowZ(-std::numeric_limits<float>::max());
+            return;
+        }
+        cv->pushCurrentMask();
+        static bool debug = getenv("OPENMW_WATER_CULLING_DEBUG") != nullptr;
+        for (unsigned int i = 0; i < vd->getNumEntries(); ++i)
         {
-            stateset = new osg::StateSet;
-            stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
-            stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
-            stateset->setAttributeAndModes(new osg::PolygonMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::LINE), osg::StateAttribute::ON);
-            osg::Material* m = new osg::Material;
-            m->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,1,1));
-            m->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,1));
-            m->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,1));
-            stateset->setAttributeAndModes(m, osg::StateAttribute::ON);
-            stateset->setRenderBinDetails(100,"RenderBin");
+            ViewDataEntry& entry = vd->getEntry(i);
+            osg::BoundingBox bb
+                = static_cast<TerrainDrawable*>(entry.mRenderingNode->asGroup()->getChild(0))->getWaterBoundingBox();
+            if (!bb.valid())
+                continue;
+            osg::Vec3f ofs(
+                entry.mNode->getCenter().x() * cellworldsize, entry.mNode->getCenter().y() * cellworldsize, 0.f);
+            bb._min += ofs;
+            bb._max += ofs;
+            bb._min.z() = highZ;
+            bb._max.z() = highZ;
+            if (cv->isCulled(bb))
+                continue;
+            lowZ = bb._min.z();
+
+            if (!debug)
+                break;
+            osg::Box* b = new osg::Box;
+            b->set(bb.center(), bb._max - bb.center());
+            osg::ShapeDrawable* drw = new osg::ShapeDrawable(b);
+            static osg::ref_ptr<osg::StateSet> stateset = nullptr;
+            if (!stateset)
+            {
+                stateset = new osg::StateSet;
+                stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
+                stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+                stateset->setAttributeAndModes(
+                    new osg::PolygonMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::LINE),
+                    osg::StateAttribute::ON);
+                osg::Material* m = new osg::Material;
+                m->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(0, 0, 1, 1));
+                m->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0, 0, 0, 1));
+                m->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(0, 0, 0, 1));
+                stateset->setAttributeAndModes(m, osg::StateAttribute::ON);
+                stateset->setRenderBinDetails(100, "RenderBin");
+            }
+            drw->setStateSet(stateset);
+            drw->accept(*cv);
         }
-        drw->setStateSet(stateset);
-        drw->accept(*cv);
+        callback->setLowZ(lowZ);
+        cv->popCurrentMask();
     }
-    callback->setLowZ(lowZ);
-    cv->popCurrentMask();
-}
 
-void QuadTreeWorld::accept(osg::NodeVisitor &nv)
-{
-    bool isCullVisitor = nv.getVisitorType() == osg::NodeVisitor::CULL_VISITOR;
-    if (!isCullVisitor && nv.getVisitorType() != osg::NodeVisitor::INTERSECTION_VISITOR)
-        return;
-
-    osg::Object * viewer = isCullVisitor ? static_cast<osgUtil::CullVisitor*>(&nv)->getCurrentCamera() : nullptr;
-    bool needsUpdate = true;
-    osg::Vec3f viewPoint = viewer ? nv.getViewPoint() : nv.getEyePoint();
-    ViewData *vd = mViewDataMap->getViewData(viewer, viewPoint, mActiveGrid, needsUpdate);
-    if (needsUpdate)
+    void QuadTreeWorld::accept(osg::NodeVisitor& nv)
     {
-        vd->reset();
-        DefaultLodCallback lodCallback(mLodFactor, mMinSize, mViewDistance, mActiveGrid);
-        mRootNode->traverseNodes(vd, viewPoint, &lodCallback);
-    }
+        bool isCullVisitor = nv.getVisitorType() == osg::NodeVisitor::CULL_VISITOR;
+        if (!isCullVisitor && nv.getVisitorType() != osg::NodeVisitor::INTERSECTION_VISITOR)
+            return;
 
-    const float cellWorldSize = mStorage->getCellWorldSize();
+        osg::Object* viewer = isCullVisitor ? static_cast<osgUtil::CullVisitor*>(&nv)->getCurrentCamera() : nullptr;
+        bool needsUpdate = true;
+        osg::Vec3f viewPoint = viewer ? nv.getViewPoint() : nv.getEyePoint();
+        ViewData* vd = mViewDataMap->getViewData(viewer, viewPoint, mActiveGrid, needsUpdate);
+        if (needsUpdate)
+        {
+            vd->reset();
+            DefaultLodCallback lodCallback(mLodFactor, mMinSize, mViewDistance, mActiveGrid);
+            mRootNode->traverseNodes(vd, viewPoint, &lodCallback);
+        }
 
-    for (unsigned int i=0; i<vd->getNumEntries(); ++i)
-    {
-        ViewDataEntry& entry = vd->getEntry(i);
-        loadRenderingNode(entry, vd, cellWorldSize, mActiveGrid, false);
-        entry.mRenderingNode->accept(nv);
-    }
+        const float cellWorldSize = mStorage->getCellWorldSize();
 
-    if (mHeightCullCallback && isCullVisitor)
-        updateWaterCullingView(mHeightCullCallback, vd, static_cast<osgUtil::CullVisitor*>(&nv), mStorage->getCellWorldSize(), !isGridEmpty());
+        for (unsigned int i = 0; i < vd->getNumEntries(); ++i)
+        {
+            ViewDataEntry& entry = vd->getEntry(i);
+            loadRenderingNode(entry, vd, cellWorldSize, mActiveGrid, false);
+            entry.mRenderingNode->accept(nv);
+        }
 
-    vd->setChanged(false);
+        if (mHeightCullCallback && isCullVisitor)
+            updateWaterCullingView(mHeightCullCallback, vd, static_cast<osgUtil::CullVisitor*>(&nv),
+                mStorage->getCellWorldSize(), !isGridEmpty());
 
-    double referenceTime = nv.getFrameStamp() ? nv.getFrameStamp()->getReferenceTime() : 0.0;
-    if (referenceTime != 0.0)
-    {
-        vd->setLastUsageTimeStamp(referenceTime);
-        mViewDataMap->clearUnusedViews(referenceTime);
+        vd->setChanged(false);
+
+        double referenceTime = nv.getFrameStamp() ? nv.getFrameStamp()->getReferenceTime() : 0.0;
+        if (referenceTime != 0.0)
+        {
+            vd->setLastUsageTimeStamp(referenceTime);
+            mViewDataMap->clearUnusedViews(referenceTime);
+        }
     }
-}
 
-void QuadTreeWorld::ensureQuadTreeBuilt()
-{
-    std::lock_guard<std::mutex> lock(mQuadTreeMutex);
-    if (mQuadTreeBuilt)
-        return;
+    void QuadTreeWorld::ensureQuadTreeBuilt()
+    {
+        std::lock_guard<std::mutex> lock(mQuadTreeMutex);
+        if (mQuadTreeBuilt)
+            return;
 
-    QuadTreeBuilder builder(mStorage, mMinSize);
-    builder.build();
+        QuadTreeBuilder builder(mStorage, mMinSize);
+        builder.build();
 
-    mRootNode = builder.getRootNode();
-    mRootNode->setWorld(this);
-    mQuadTreeBuilt = true;
-}
+        mRootNode = builder.getRootNode();
+        mRootNode->setWorld(this);
+        mQuadTreeBuilt = true;
+    }
 
-void QuadTreeWorld::enable(bool enabled)
-{
-    if (enabled)
+    void QuadTreeWorld::enable(bool enabled)
     {
-        ensureQuadTreeBuilt();
+        if (enabled)
+        {
+            ensureQuadTreeBuilt();
 
-        if (!mRootNode->getNumParents())
-            mTerrainRoot->addChild(mRootNode);
+            if (!mRootNode->getNumParents())
+                mTerrainRoot->addChild(mRootNode);
+        }
+        else if (mRootNode)
+            mTerrainRoot->removeChild(mRootNode);
     }
-    else if (mRootNode)
-        mTerrainRoot->removeChild(mRootNode);
-}
-
-View* QuadTreeWorld::createView()
-{
-    return mViewDataMap->createIndependentView();
-}
 
-void QuadTreeWorld::preload(View *view, const osg::Vec3f &viewPoint, const osg::Vec4i &grid, std::atomic<bool> &abort, Loading::Reporter& reporter)
-{
-    ensureQuadTreeBuilt();
-    const float cellWorldSize = mStorage->getCellWorldSize();
-
-    ViewData* vd = static_cast<ViewData*>(view);
-    vd->setViewPoint(viewPoint);
-    vd->setActiveGrid(grid);
+    View* QuadTreeWorld::createView()
+    {
+        return mViewDataMap->createIndependentView();
+    }
 
-    for (unsigned int pass=0; pass<3; ++pass)
+    void QuadTreeWorld::preload(View* view, const osg::Vec3f& viewPoint, const osg::Vec4i& grid,
+        std::atomic<bool>& abort, Loading::Reporter& reporter)
     {
-        unsigned int startEntry = vd->getNumEntries();
+        ensureQuadTreeBuilt();
+        const float cellWorldSize = mStorage->getCellWorldSize();
 
-        float distanceModifier=0.f;
-        if (pass == 1)
-            distanceModifier = 1024;
-        else if (pass == 2)
-            distanceModifier = -1024;
-        DefaultLodCallback lodCallback(mLodFactor, mMinSize, mViewDistance, grid, distanceModifier);
-        mRootNode->traverseNodes(vd, viewPoint, &lodCallback);
+        ViewData* vd = static_cast<ViewData*>(view);
+        vd->setViewPoint(viewPoint);
+        vd->setActiveGrid(grid);
 
-        if (pass==0)
+        for (unsigned int pass = 0; pass < 3; ++pass)
         {
-            std::size_t progressTotal = 0;
-            for (unsigned int i = 0, n = vd->getNumEntries(); i < n; ++i)
-                 progressTotal += vd->getEntry(i).mNode->getSize();
+            unsigned int startEntry = vd->getNumEntries();
 
-            reporter.addTotal(progressTotal);
-        }
+            float distanceModifier = 0.f;
+            if (pass == 1)
+                distanceModifier = 1024;
+            else if (pass == 2)
+                distanceModifier = -1024;
+            DefaultLodCallback lodCallback(mLodFactor, mMinSize, mViewDistance, grid, distanceModifier);
+            mRootNode->traverseNodes(vd, viewPoint, &lodCallback);
 
-        for (unsigned int i=startEntry; i<vd->getNumEntries() && !abort; ++i)
-        {
-            ViewDataEntry& entry = vd->getEntry(i);
+            if (pass == 0)
+            {
+                std::size_t progressTotal = 0;
+                for (unsigned int i = 0, n = vd->getNumEntries(); i < n; ++i)
+                    progressTotal += vd->getEntry(i).mNode->getSize();
+
+                reporter.addTotal(progressTotal);
+            }
+
+            for (unsigned int i = startEntry; i < vd->getNumEntries() && !abort; ++i)
+            {
+                ViewDataEntry& entry = vd->getEntry(i);
 
-            loadRenderingNode(entry, vd, cellWorldSize, grid, true);
-            if (pass==0) reporter.addProgress(entry.mNode->getSize());
-            entry.mNode = nullptr; // Clear node lest we break the neighbours search for the next pass
+                loadRenderingNode(entry, vd, cellWorldSize, grid, true);
+                if (pass == 0)
+                    reporter.addProgress(entry.mNode->getSize());
+                entry.mNode = nullptr; // Clear node lest we break the neighbours search for the next pass
+            }
         }
     }
-}
 
-void QuadTreeWorld::reportStats(unsigned int frameNumber, osg::Stats *stats)
-{
-    if (mCompositeMapRenderer)
-        stats->setAttribute(frameNumber, "Composite", mCompositeMapRenderer->getCompileSetSize());
-}
+    void QuadTreeWorld::reportStats(unsigned int frameNumber, osg::Stats* stats)
+    {
+        if (mCompositeMapRenderer)
+            stats->setAttribute(frameNumber, "Composite", mCompositeMapRenderer->getCompileSetSize());
+    }
 
-void QuadTreeWorld::loadCell(int x, int y)
-{
-    // fallback behavior only for undefined cells (every other is already handled in quadtree)
-    float dummy;
-    if (mChunkManager && !mStorage->getMinMaxHeights(1, osg::Vec2f(x+0.5, y+0.5), dummy, dummy))
-        TerrainGrid::loadCell(x,y);
-    else
-        World::loadCell(x,y);
-}
+    void QuadTreeWorld::loadCell(int x, int y)
+    {
+        // fallback behavior only for undefined cells (every other is already handled in quadtree)
+        float dummy;
+        if (mChunkManager && !mStorage->getMinMaxHeights(1, osg::Vec2f(x + 0.5, y + 0.5), dummy, dummy))
+            TerrainGrid::loadCell(x, y);
+        else
+            World::loadCell(x, y);
+    }
 
-void QuadTreeWorld::unloadCell(int x, int y)
-{
-    // fallback behavior only for undefined cells (every other is already handled in quadtree)
-    float dummy;
-    if (mChunkManager && !mStorage->getMinMaxHeights(1, osg::Vec2f(x+0.5, y+0.5), dummy, dummy))
-        TerrainGrid::unloadCell(x,y);
-    else
-        World::unloadCell(x,y);
-}
+    void QuadTreeWorld::unloadCell(int x, int y)
+    {
+        // fallback behavior only for undefined cells (every other is already handled in quadtree)
+        float dummy;
+        if (mChunkManager && !mStorage->getMinMaxHeights(1, osg::Vec2f(x + 0.5, y + 0.5), dummy, dummy))
+            TerrainGrid::unloadCell(x, y);
+        else
+            World::unloadCell(x, y);
+    }
 
-void QuadTreeWorld::addChunkManager(QuadTreeWorld::ChunkManager* m)
-{
-    mChunkManagers.push_back(m);
-    mTerrainRoot->setNodeMask(mTerrainRoot->getNodeMask()|m->getNodeMask());
-    if (m->getViewDistance())
-        m->setMaxLodLevel(DefaultLodCallback::convertDistanceToLodLevel(m->getViewDistance() + mViewDataMap->getReuseDistance(), mMinSize, mLodFactor));
-}
+    void QuadTreeWorld::addChunkManager(QuadTreeWorld::ChunkManager* m)
+    {
+        mChunkManagers.push_back(m);
+        mTerrainRoot->setNodeMask(mTerrainRoot->getNodeMask() | m->getNodeMask());
+        if (m->getViewDistance())
+            m->setMaxLodLevel(DefaultLodCallback::convertDistanceToLodLevel(
+                m->getViewDistance() + mViewDataMap->getReuseDistance(), mMinSize, mLodFactor));
+    }
 
-void QuadTreeWorld::rebuildViews()
-{
-    mViewDataMap->rebuildViews();
-}
+    void QuadTreeWorld::rebuildViews()
+    {
+        mViewDataMap->rebuildViews();
+    }
 
-void QuadTreeWorld::setViewDistance(float viewDistance)
-{
-    if (mViewDistance == viewDistance)
-        return;
-    mViewDistance = viewDistance;
-    mViewDataMap->rebuildViews();
-}
+    void QuadTreeWorld::setViewDistance(float viewDistance)
+    {
+        if (mViewDistance == viewDistance)
+            return;
+        mViewDistance = viewDistance;
+        mViewDataMap->rebuildViews();
+    }
 
 }
diff --git a/components/terrain/quadtreeworld.hpp b/components/terrain/quadtreeworld.hpp
index d03ed613d4..7bb4ae691e 100644
--- a/components/terrain/quadtreeworld.hpp
+++ b/components/terrain/quadtreeworld.hpp
@@ -3,9 +3,9 @@
 
 #include "terraingrid.hpp"
 
-#include <mutex>
-#include <memory>
 #include <atomic>
+#include <memory>
+#include <mutex>
 
 namespace osg
 {
@@ -20,14 +20,18 @@ namespace Terrain
     class ViewDataMap;
     class ViewData;
     struct ViewDataEntry;
-    
+
     class DebugChunkManager;
 
     /// @brief Terrain implementation that loads cells into a Quad Tree, with geometry LOD and texture LOD.
-    class QuadTreeWorld : public TerrainGrid // note: derived from TerrainGrid is only to render default cells (see loadCell)
+    class QuadTreeWorld
+        : public TerrainGrid // note: derived from TerrainGrid is only to render default cells (see loadCell)
     {
     public:
-        QuadTreeWorld(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask, int compMapResolution, float comMapLevel, float lodFactor, int vertexLodMod, float maxCompGeometrySize, bool debugChunks);
+        QuadTreeWorld(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem,
+            Storage* storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask,
+            int compMapResolution, float comMapLevel, float lodFactor, int vertexLodMod, float maxCompGeometrySize,
+            bool debugChunks);
 
         ~QuadTreeWorld();
 
@@ -37,14 +41,15 @@ namespace Terrain
 
         void setViewDistance(float distance) override;
 
-        void cacheCell(View *view, int x, int y) override {}
+        void cacheCell(View* view, int x, int y) override {}
         /// @note Not thread safe.
         void loadCell(int x, int y) override;
         /// @note Not thread safe.
         void unloadCell(int x, int y) override;
 
         View* createView() override;
-        void preload(View* view, const osg::Vec3f& eyePoint, const osg::Vec4i &cellgrid, std::atomic<bool>& abort, Loading::Reporter& reporter) override;
+        void preload(View* view, const osg::Vec3f& eyePoint, const osg::Vec4i& cellgrid, std::atomic<bool>& abort,
+            Loading::Reporter& reporter) override;
         void rebuildViews() override;
 
         void reportStats(unsigned int frameNumber, osg::Stats* stats) override;
@@ -52,8 +57,10 @@ namespace Terrain
         class ChunkManager
         {
         public:
-            virtual ~ChunkManager(){}
-            virtual osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile) = 0;
+            virtual ~ChunkManager() {}
+            virtual osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& center, unsigned char lod,
+                unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile)
+                = 0;
             virtual unsigned int getNodeMask() { return 0; }
 
             void setViewDistance(float viewDistance) { mViewDistance = viewDistance; }
@@ -62,6 +69,7 @@ namespace Terrain
             // Automatically set by addChunkManager based on getViewDistance()
             unsigned int getMaxLodLevel() const { return mMaxLodLevel; }
             void setMaxLodLevel(unsigned int level) { mMaxLodLevel = level; }
+
         private:
             float mViewDistance = 0.f;
             unsigned int mMaxLodLevel = ~0u;
@@ -70,7 +78,8 @@ namespace Terrain
 
     private:
         void ensureQuadTreeBuilt();
-        void loadRenderingNode(ViewDataEntry& entry, ViewData* vd, float cellWorldSize, const osg::Vec4i &gridbounds, bool compile);
+        void loadRenderingNode(
+            ViewDataEntry& entry, ViewData* vd, float cellWorldSize, const osg::Vec4i& gridbounds, bool compile);
 
         osg::ref_ptr<RootNode> mRootNode;
 
diff --git a/components/terrain/storage.hpp b/components/terrain/storage.hpp
index cdde06e47d..e2269707ab 100644
--- a/components/terrain/storage.hpp
+++ b/components/terrain/storage.hpp
@@ -3,10 +3,10 @@
 
 #include <vector>
 
+#include <osg/Array>
 #include <osg/Vec2f>
 #include <osg/Vec3f>
 #include <osg/ref_ptr>
-#include <osg/Array>
 
 #include "defs.hpp"
 
@@ -33,7 +33,7 @@ namespace Terrain
         virtual bool hasData(int cellX, int cellY)
         {
             float dummy;
-            return getMinMaxHeights(1, osg::Vec2f(cellX+0.5, cellY+0.5), dummy, dummy);
+            return getMinMaxHeights(1, osg::Vec2f(cellX + 0.5, cellY + 0.5), dummy, dummy);
         }
 
         /// Get the minimum and maximum heights of a terrain region.
@@ -44,7 +44,7 @@ namespace Terrain
         /// @param min min height will be stored here
         /// @param max max height will be stored here
         /// @return true if there was data available for this terrain chunk
-        virtual bool getMinMaxHeights (float size, const osg::Vec2f& center, float& min, float& max) = 0;
+        virtual bool getMinMaxHeights(float size, const osg::Vec2f& center, float& min, float& max) = 0;
 
         /// Fill vertex buffers for a terrain chunk.
         /// @note May be called from background threads. Make sure to only call thread-safe functions from here!
@@ -57,12 +57,12 @@ namespace Terrain
         /// @param positions buffer to write vertices
         /// @param normals buffer to write vertex normals
         /// @param colours buffer to write vertex colours
-        virtual void fillVertexBuffers (int lodLevel, float size, const osg::Vec2f& center,
-                                osg::ref_ptr<osg::Vec3Array> positions,
-                                osg::ref_ptr<osg::Vec3Array> normals,
-                                osg::ref_ptr<osg::Vec4ubArray> colours) = 0;
+        virtual void fillVertexBuffers(int lodLevel, float size, const osg::Vec2f& center,
+            osg::ref_ptr<osg::Vec3Array> positions, osg::ref_ptr<osg::Vec3Array> normals,
+            osg::ref_ptr<osg::Vec4ubArray> colours)
+            = 0;
 
-        typedef std::vector<osg::ref_ptr<osg::Image> > ImageVector;
+        typedef std::vector<osg::ref_ptr<osg::Image>> ImageVector;
         /// Create textures holding layer blend values for a terrain chunk.
         /// @note The terrain chunk shouldn't be larger than one cell since otherwise we might
         ///       have to do a ridiculous amount of different layers. For larger chunks, composite maps should be used.
@@ -71,10 +71,11 @@ namespace Terrain
         /// @param chunkCenter center of the chunk in cell units
         /// @param blendmaps created blendmaps will be written here
         /// @param layerList names of the layer textures used will be written here
-        virtual void getBlendmaps (float chunkSize, const osg::Vec2f& chunkCenter, ImageVector& blendmaps,
-                               std::vector<LayerInfo>& layerList) = 0;
+        virtual void getBlendmaps(
+            float chunkSize, const osg::Vec2f& chunkCenter, ImageVector& blendmaps, std::vector<LayerInfo>& layerList)
+            = 0;
 
-        virtual float getHeightAt (const osg::Vec3f& worldPos) = 0;
+        virtual float getHeightAt(const osg::Vec3f& worldPos) = 0;
 
         /// Get the transformation factor for mapping cell units to world units.
         virtual float getCellWorldSize() = 0;
diff --git a/components/terrain/terraindrawable.cpp b/components/terrain/terraindrawable.cpp
index 231b6f4fed..785d56be2a 100644
--- a/components/terrain/terraindrawable.cpp
+++ b/components/terrain/terraindrawable.cpp
@@ -10,159 +10,156 @@
 namespace Terrain
 {
 
-TerrainDrawable::TerrainDrawable()
-{
-
-}
+    TerrainDrawable::TerrainDrawable() {}
 
-TerrainDrawable::~TerrainDrawable()
-{
+    TerrainDrawable::~TerrainDrawable() {}
 
-}
-
-TerrainDrawable::TerrainDrawable(const TerrainDrawable &copy, const osg::CopyOp &copyop)
-    : osg::Geometry(copy, copyop)
-    , mPasses(copy.mPasses)
-    , mLightListCallback(copy.mLightListCallback)
-{
+    TerrainDrawable::TerrainDrawable(const TerrainDrawable& copy, const osg::CopyOp& copyop)
+        : osg::Geometry(copy, copyop)
+        , mPasses(copy.mPasses)
+        , mLightListCallback(copy.mLightListCallback)
+    {
+    }
 
-}
+    void TerrainDrawable::accept(osg::NodeVisitor& nv)
+    {
+        if (nv.getVisitorType() != osg::NodeVisitor::CULL_VISITOR)
+        {
+            osg::Geometry::accept(nv);
+        }
+        else if (nv.validNodeMask(*this))
+        {
+            nv.pushOntoNodePath(this);
+            cull(static_cast<osgUtil::CullVisitor*>(&nv));
+            nv.popFromNodePath();
+        }
+    }
 
-void TerrainDrawable::accept(osg::NodeVisitor &nv)
-{
-    if (nv.getVisitorType() != osg::NodeVisitor::CULL_VISITOR)
+    inline float distance(const osg::Vec3& coord, const osg::Matrix& matrix)
     {
-        osg::Geometry::accept(nv);
+        return -((float)coord[0] * (float)matrix(0, 2) + (float)coord[1] * (float)matrix(1, 2)
+            + (float)coord[2] * (float)matrix(2, 2) + matrix(3, 2));
     }
-    else if (nv.validNodeMask(*this))
+
+    // canot use ClusterCullingCallback::cull: viewpoint != eyepoint
+    //  !osgfixpotential!
+    bool clusterCull(osg::ClusterCullingCallback* cb, const osg::Vec3f& eyePoint, bool shadowcam)
     {
-        nv.pushOntoNodePath(this);
-        cull(static_cast<osgUtil::CullVisitor*>(&nv));
-        nv.popFromNodePath();
+        float _deviation = cb->getDeviation();
+        const osg::Vec3& _controlPoint = cb->getControlPoint();
+        osg::Vec3 _normal = cb->getNormal();
+        if (shadowcam)
+            _normal = _normal * -1; // inverting for shadowcam frontfaceculing
+        float _radius = cb->getRadius();
+        if (_deviation <= -1.0f)
+            return false;
+        osg::Vec3 eye_cp = eyePoint - _controlPoint;
+        float radius = eye_cp.length();
+        if (radius < _radius)
+            return false;
+        float deviation = (eye_cp * _normal) / radius;
+        return deviation < _deviation;
     }
-}
 
-inline float distance(const osg::Vec3& coord,const osg::Matrix& matrix)
-{
-    return -((float)coord[0]*(float)matrix(0,2)+(float)coord[1]*(float)matrix(1,2)+(float)coord[2]*(float)matrix(2,2)+matrix(3,2));
-}
+    void TerrainDrawable::cull(osgUtil::CullVisitor* cv)
+    {
+        const osg::BoundingBox& bb = getBoundingBox();
 
-//canot use ClusterCullingCallback::cull: viewpoint != eyepoint
-// !osgfixpotential!
-bool clusterCull(osg::ClusterCullingCallback* cb, const osg::Vec3f& eyePoint, bool shadowcam)
-{
-    float _deviation = cb->getDeviation();
-    const osg::Vec3& _controlPoint = cb->getControlPoint();
-    osg::Vec3 _normal = cb->getNormal();
-    if (shadowcam) _normal = _normal * -1; //inverting for shadowcam frontfaceculing
-    float _radius = cb->getRadius();
-    if (_deviation<=-1.0f) return false;
-    osg::Vec3 eye_cp = eyePoint - _controlPoint;
-    float radius = eye_cp.length();
-    if (radius<_radius) return false;
-    float deviation = (eye_cp * _normal)/radius;
-    return deviation < _deviation;
-}
+        if (_cullingActive && cv->isCulled(getBoundingBox()))
+            return;
 
-void TerrainDrawable::cull(osgUtil::CullVisitor *cv)
-{
-    const osg::BoundingBox& bb = getBoundingBox();
+        bool shadowcam = cv->getCurrentCamera()->getName() == "ShadowCamera";
 
-    if (_cullingActive && cv->isCulled(getBoundingBox()))
-        return;
+        if (cv->getCullingMode() & osg::CullStack::CLUSTER_CULLING
+            && clusterCull(mClusterCullingCallback, cv->getEyePoint(), shadowcam))
+            return;
 
-    bool shadowcam = cv->getCurrentCamera()->getName() == "ShadowCamera";
+        osg::RefMatrix& matrix = *cv->getModelViewMatrix();
 
-    if (cv->getCullingMode() & osg::CullStack::CLUSTER_CULLING && clusterCull(mClusterCullingCallback, cv->getEyePoint(), shadowcam))
-        return;
+        if (cv->getComputeNearFarMode() != osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR && bb.valid())
+        {
+            if (!cv->updateCalculatedNearFar(matrix, *this, false))
+                return;
+        }
 
-    osg::RefMatrix& matrix = *cv->getModelViewMatrix();
+        float depth = bb.valid() ? distance(bb.center(), matrix) : 0.0f;
+        if (osg::isNaN(depth))
+            return;
 
-    if (cv->getComputeNearFarMode() != osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR && bb.valid())
-    {
-        if (!cv->updateCalculatedNearFar(matrix, *this, false))
+        if (shadowcam)
+        {
+            cv->addDrawableAndDepth(this, &matrix, depth);
             return;
+        }
+
+        if (mCompositeMap && mCompositeMapRenderer)
+        {
+            mCompositeMapRenderer->setImmediate(mCompositeMap);
+            mCompositeMapRenderer = nullptr;
+        }
+
+        bool pushedLight = mLightListCallback && mLightListCallback->pushLightState(this, cv);
+
+        osg::StateSet* stateset = getStateSet();
+        if (stateset)
+            cv->pushStateSet(stateset);
+
+        for (PassVector::const_iterator it = mPasses.begin(); it != mPasses.end(); ++it)
+        {
+            cv->pushStateSet(*it);
+            cv->addDrawableAndDepth(this, &matrix, depth);
+            cv->popStateSet();
+        }
+
+        if (stateset)
+            cv->popStateSet();
+        if (pushedLight)
+            cv->popStateSet();
     }
 
-    float depth = bb.valid() ? distance(bb.center(),matrix) : 0.0f;
-    if (osg::isNaN(depth))
-        return;
-
-    if (shadowcam)
+    void TerrainDrawable::createClusterCullingCallback()
     {
-        cv->addDrawableAndDepth(this, &matrix, depth);
-        return;
+        mClusterCullingCallback = new osg::ClusterCullingCallback(this);
     }
 
-    if (mCompositeMap && mCompositeMapRenderer)
+    void TerrainDrawable::setPasses(const TerrainDrawable::PassVector& passes)
     {
-        mCompositeMapRenderer->setImmediate(mCompositeMap);
-        mCompositeMapRenderer = nullptr;
+        mPasses = passes;
     }
 
-    bool pushedLight = mLightListCallback && mLightListCallback->pushLightState(this, cv);
-
-    osg::StateSet* stateset = getStateSet();
-    if (stateset)
-        cv->pushStateSet(stateset);
-
-    for (PassVector::const_iterator it = mPasses.begin(); it != mPasses.end(); ++it)
+    void TerrainDrawable::setLightListCallback(SceneUtil::LightListCallback* lightListCallback)
     {
-        cv->pushStateSet(*it);
-        cv->addDrawableAndDepth(this, &matrix, depth);
-        cv->popStateSet();
+        mLightListCallback = lightListCallback;
     }
 
-    if (stateset)
-        cv->popStateSet();
-    if (pushedLight)
-        cv->popStateSet();
-}
-
-void TerrainDrawable::createClusterCullingCallback()
-{
-    mClusterCullingCallback = new osg::ClusterCullingCallback(this);
-}
-
-void TerrainDrawable::setPasses(const TerrainDrawable::PassVector &passes)
-{
-    mPasses = passes;
-}
-
-void TerrainDrawable::setLightListCallback(SceneUtil::LightListCallback *lightListCallback)
-{
-    mLightListCallback = lightListCallback;
-}
-
-void TerrainDrawable::setupWaterBoundingBox(float waterheight, float margin)
-{
-    osg::Vec3Array* vertices = static_cast<osg::Vec3Array*>(getVertexArray());
-    for (unsigned int i=0; i<vertices->size(); ++i)
+    void TerrainDrawable::setupWaterBoundingBox(float waterheight, float margin)
     {
-        const osg::Vec3f& vertex = (*vertices)[i];
-        if (vertex.z() <= waterheight)
-            mWaterBoundingBox.expandBy(vertex);
-    }
-    if (mWaterBoundingBox.valid())
-    {
-        const osg::BoundingBox& bb = getBoundingBox();
-        mWaterBoundingBox.xMin() = std::max(bb.xMin(), mWaterBoundingBox.xMin() - margin);
-        mWaterBoundingBox.yMin() = std::max(bb.yMin(), mWaterBoundingBox.yMin() - margin);
-        mWaterBoundingBox.xMax() = std::min(bb.xMax(), mWaterBoundingBox.xMax() + margin);
-        mWaterBoundingBox.xMax() = std::min(bb.xMax(), mWaterBoundingBox.xMax() + margin);
+        osg::Vec3Array* vertices = static_cast<osg::Vec3Array*>(getVertexArray());
+        for (unsigned int i = 0; i < vertices->size(); ++i)
+        {
+            const osg::Vec3f& vertex = (*vertices)[i];
+            if (vertex.z() <= waterheight)
+                mWaterBoundingBox.expandBy(vertex);
+        }
+        if (mWaterBoundingBox.valid())
+        {
+            const osg::BoundingBox& bb = getBoundingBox();
+            mWaterBoundingBox.xMin() = std::max(bb.xMin(), mWaterBoundingBox.xMin() - margin);
+            mWaterBoundingBox.yMin() = std::max(bb.yMin(), mWaterBoundingBox.yMin() - margin);
+            mWaterBoundingBox.xMax() = std::min(bb.xMax(), mWaterBoundingBox.xMax() + margin);
+            mWaterBoundingBox.xMax() = std::min(bb.xMax(), mWaterBoundingBox.xMax() + margin);
+        }
     }
-}
 
-void TerrainDrawable::compileGLObjects(osg::RenderInfo &renderInfo) const
-{
-    for (PassVector::const_iterator it = mPasses.begin(); it != mPasses.end(); ++it)
+    void TerrainDrawable::compileGLObjects(osg::RenderInfo& renderInfo) const
     {
-        osg::StateSet* stateset = *it;
-        stateset->compileGLObjects(*renderInfo.getState());
-    }
+        for (PassVector::const_iterator it = mPasses.begin(); it != mPasses.end(); ++it)
+        {
+            osg::StateSet* stateset = *it;
+            stateset->compileGLObjects(*renderInfo.getState());
+        }
 
-    osg::Geometry::compileGLObjects(renderInfo);
-}
+        osg::Geometry::compileGLObjects(renderInfo);
+    }
 
 }
-
diff --git a/components/terrain/terraindrawable.hpp b/components/terrain/terraindrawable.hpp
index 721abe7481..b94f47df97 100644
--- a/components/terrain/terraindrawable.hpp
+++ b/components/terrain/terraindrawable.hpp
@@ -30,9 +30,12 @@ namespace Terrain
     class TerrainDrawable : public osg::Geometry
     {
     public:
-        osg::Object* cloneType() const override { return new TerrainDrawable (); }
-        osg::Object* clone(const osg::CopyOp& copyop) const override { return new TerrainDrawable (*this,copyop); }
-        bool isSameKindAs(const osg::Object* obj) const override { return dynamic_cast<const TerrainDrawable *>(obj)!=nullptr; }
+        osg::Object* cloneType() const override { return new TerrainDrawable(); }
+        osg::Object* clone(const osg::CopyOp& copyop) const override { return new TerrainDrawable(*this, copyop); }
+        bool isSameKindAs(const osg::Object* obj) const override
+        {
+            return dynamic_cast<const TerrainDrawable*>(obj) != nullptr;
+        }
         const char* className() const override { return "TerrainDrawable"; }
         const char* libraryName() const override { return "Terrain"; }
 
@@ -40,12 +43,12 @@ namespace Terrain
         ~TerrainDrawable(); // has to be defined in the cpp file because we only forward declared some members.
         TerrainDrawable(const TerrainDrawable& copy, const osg::CopyOp& copyop);
 
-        void accept(osg::NodeVisitor &nv) override;
+        void accept(osg::NodeVisitor& nv) override;
         void cull(osgUtil::CullVisitor* cv);
 
-        typedef std::vector<osg::ref_ptr<osg::StateSet> > PassVector;
-        void setPasses (const PassVector& passes);
-        const PassVector& getPasses() const {  return mPasses; }
+        typedef std::vector<osg::ref_ptr<osg::StateSet>> PassVector;
+        void setPasses(const PassVector& passes);
+        const PassVector& getPasses() const { return mPasses; }
 
         void setLightListCallback(SceneUtil::LightListCallback* lightListCallback);
 
@@ -73,5 +76,4 @@ namespace Terrain
 
 }
 
-
 #endif
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index 6467b549f1..c59756a835 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -2,131 +2,135 @@
 
 #include <memory>
 
-#include <osg/Group>
 #include <osg/ComputeBoundsVisitor>
+#include <osg/Group>
 
-#include <components/sceneutil/positionattitudetransform.hpp>
 #include "chunkmanager.hpp"
 #include "compositemaprenderer.hpp"
-#include "view.hpp"
-#include "storage.hpp"
 #include "heightcull.hpp"
+#include "storage.hpp"
+#include "view.hpp"
+#include <components/sceneutil/positionattitudetransform.hpp>
 
 namespace Terrain
 {
 
-class MyView : public View
-{
-public:
-    osg::ref_ptr<osg::Node> mLoaded;
+    class MyView : public View
+    {
+    public:
+        osg::ref_ptr<osg::Node> mLoaded;
 
-    void reset() override {}
-};
+        void reset() override {}
+    };
 
-TerrainGrid::TerrainGrid(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask)
-    : Terrain::World(parent, compileRoot, resourceSystem, storage, nodeMask, preCompileMask, borderMask)
-    , mNumSplits(4)
-{
-}
-
-TerrainGrid::TerrainGrid(osg::Group* parent, Storage* storage, unsigned int nodeMask)
-    : Terrain::World(parent, storage, nodeMask)
-    , mNumSplits(4)
-{
-}
+    TerrainGrid::TerrainGrid(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem,
+        Storage* storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask)
+        : Terrain::World(parent, compileRoot, resourceSystem, storage, nodeMask, preCompileMask, borderMask)
+        , mNumSplits(4)
+    {
+    }
 
-TerrainGrid::~TerrainGrid()
-{
-    while (!mGrid.empty())
+    TerrainGrid::TerrainGrid(osg::Group* parent, Storage* storage, unsigned int nodeMask)
+        : Terrain::World(parent, storage, nodeMask)
+        , mNumSplits(4)
     {
-        TerrainGrid::unloadCell(mGrid.begin()->first.first, mGrid.begin()->first.second);
     }
-}
 
-void TerrainGrid::cacheCell(View* view, int x, int y)
-{
-    osg::Vec2f center(x+0.5f, y+0.5f);
-    static_cast<MyView*>(view)->mLoaded =  buildTerrain(nullptr, 1.f, center);
-}
+    TerrainGrid::~TerrainGrid()
+    {
+        while (!mGrid.empty())
+        {
+            TerrainGrid::unloadCell(mGrid.begin()->first.first, mGrid.begin()->first.second);
+        }
+    }
 
-osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chunkSize, const osg::Vec2f& chunkCenter)
-{
-    if (chunkSize * mNumSplits > 1.f)
+    void TerrainGrid::cacheCell(View* view, int x, int y)
     {
-        // keep splitting
-        osg::ref_ptr<osg::Group> group (new osg::Group);
-        if (parent)
-            parent->addChild(group);
-
-        float newChunkSize = chunkSize/2.f;
-        buildTerrain(group, newChunkSize, chunkCenter + osg::Vec2f(newChunkSize/2.f, newChunkSize/2.f));
-        buildTerrain(group, newChunkSize, chunkCenter + osg::Vec2f(newChunkSize/2.f, -newChunkSize/2.f));
-        buildTerrain(group, newChunkSize, chunkCenter + osg::Vec2f(-newChunkSize/2.f, newChunkSize/2.f));
-        buildTerrain(group, newChunkSize, chunkCenter + osg::Vec2f(-newChunkSize/2.f, -newChunkSize/2.f));
-        return group;
+        osg::Vec2f center(x + 0.5f, y + 0.5f);
+        static_cast<MyView*>(view)->mLoaded = buildTerrain(nullptr, 1.f, center);
     }
-    else
+
+    osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain(
+        osg::Group* parent, float chunkSize, const osg::Vec2f& chunkCenter)
     {
-        osg::ref_ptr<osg::Node> node = mChunkManager->getChunk(chunkSize, chunkCenter, 0, 0, false, osg::Vec3f(), true);
-        if (!node)
-            return nullptr;
-
-        const float cellWorldSize = mStorage->getCellWorldSize();
-        osg::ref_ptr<SceneUtil::PositionAttitudeTransform> pat = new SceneUtil::PositionAttitudeTransform;
-        pat->setPosition(osg::Vec3f(chunkCenter.x()*cellWorldSize, chunkCenter.y()*cellWorldSize, 0.f));
-        pat->addChild(node);
-        if (parent)
-            parent->addChild(pat);
-        return pat;
+        if (chunkSize * mNumSplits > 1.f)
+        {
+            // keep splitting
+            osg::ref_ptr<osg::Group> group(new osg::Group);
+            if (parent)
+                parent->addChild(group);
+
+            float newChunkSize = chunkSize / 2.f;
+            buildTerrain(group, newChunkSize, chunkCenter + osg::Vec2f(newChunkSize / 2.f, newChunkSize / 2.f));
+            buildTerrain(group, newChunkSize, chunkCenter + osg::Vec2f(newChunkSize / 2.f, -newChunkSize / 2.f));
+            buildTerrain(group, newChunkSize, chunkCenter + osg::Vec2f(-newChunkSize / 2.f, newChunkSize / 2.f));
+            buildTerrain(group, newChunkSize, chunkCenter + osg::Vec2f(-newChunkSize / 2.f, -newChunkSize / 2.f));
+            return group;
+        }
+        else
+        {
+            osg::ref_ptr<osg::Node> node
+                = mChunkManager->getChunk(chunkSize, chunkCenter, 0, 0, false, osg::Vec3f(), true);
+            if (!node)
+                return nullptr;
+
+            const float cellWorldSize = mStorage->getCellWorldSize();
+            osg::ref_ptr<SceneUtil::PositionAttitudeTransform> pat = new SceneUtil::PositionAttitudeTransform;
+            pat->setPosition(osg::Vec3f(chunkCenter.x() * cellWorldSize, chunkCenter.y() * cellWorldSize, 0.f));
+            pat->addChild(node);
+            if (parent)
+                parent->addChild(pat);
+            return pat;
+        }
     }
-}
 
-void TerrainGrid::loadCell(int x, int y)
-{
-    if (mGrid.find(std::make_pair(x, y)) != mGrid.end())
-        return; // already loaded
+    void TerrainGrid::loadCell(int x, int y)
+    {
+        if (mGrid.find(std::make_pair(x, y)) != mGrid.end())
+            return; // already loaded
 
-    osg::Vec2f center(x+0.5f, y+0.5f);
-    osg::ref_ptr<osg::Node> terrainNode = buildTerrain(nullptr, 1.f, center);
-    if (!terrainNode)
-        return; // no terrain defined
+        osg::Vec2f center(x + 0.5f, y + 0.5f);
+        osg::ref_ptr<osg::Node> terrainNode = buildTerrain(nullptr, 1.f, center);
+        if (!terrainNode)
+            return; // no terrain defined
 
-    TerrainGrid::World::loadCell(x,y);
+        TerrainGrid::World::loadCell(x, y);
 
-    mTerrainRoot->addChild(terrainNode);
+        mTerrainRoot->addChild(terrainNode);
 
-    mGrid[std::make_pair(x,y)] = terrainNode;
-    updateWaterCulling();
-}
+        mGrid[std::make_pair(x, y)] = terrainNode;
+        updateWaterCulling();
+    }
 
-void TerrainGrid::unloadCell(int x, int y)
-{
-    CellBorder::CellGrid::iterator it = mGrid.find(std::make_pair(x,y));
-    if (it == mGrid.end())
-        return;
+    void TerrainGrid::unloadCell(int x, int y)
+    {
+        CellBorder::CellGrid::iterator it = mGrid.find(std::make_pair(x, y));
+        if (it == mGrid.end())
+            return;
 
-    Terrain::World::unloadCell(x,y);
+        Terrain::World::unloadCell(x, y);
 
-    osg::ref_ptr<osg::Node> terrainNode = it->second;
-    mTerrainRoot->removeChild(terrainNode);
+        osg::ref_ptr<osg::Node> terrainNode = it->second;
+        mTerrainRoot->removeChild(terrainNode);
 
-    mGrid.erase(it);
-    updateWaterCulling();
-}
+        mGrid.erase(it);
+        updateWaterCulling();
+    }
 
-void TerrainGrid::updateWaterCulling()
-{
-    if (!mHeightCullCallback) return;
+    void TerrainGrid::updateWaterCulling()
+    {
+        if (!mHeightCullCallback)
+            return;
 
-    osg::ComputeBoundsVisitor computeBoundsVisitor;
-    mTerrainRoot->accept(computeBoundsVisitor);
-    float lowZ = computeBoundsVisitor.getBoundingBox()._min.z();
-    mHeightCullCallback->setLowZ(lowZ);
-}
+        osg::ComputeBoundsVisitor computeBoundsVisitor;
+        mTerrainRoot->accept(computeBoundsVisitor);
+        float lowZ = computeBoundsVisitor.getBoundingBox()._min.z();
+        mHeightCullCallback->setLowZ(lowZ);
+    }
 
-View *TerrainGrid::createView()
-{
-    return new MyView;
-}
+    View* TerrainGrid::createView()
+    {
+        return new MyView;
+    }
 
 }
diff --git a/components/terrain/terraingrid.hpp b/components/terrain/terraingrid.hpp
index f09beb0cdc..ca5044c2f8 100644
--- a/components/terrain/terraingrid.hpp
+++ b/components/terrain/terraingrid.hpp
@@ -26,8 +26,9 @@ namespace Terrain
     class TerrainGrid : public Terrain::World
     {
     public:
-        TerrainGrid(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, unsigned int nodeMask, unsigned int preCompileMask=~0u, unsigned int borderMask=0);
-        TerrainGrid(osg::Group* parent, Storage* storage, unsigned int nodeMask=~0u);
+        TerrainGrid(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem,
+            Storage* storage, unsigned int nodeMask, unsigned int preCompileMask = ~0u, unsigned int borderMask = 0);
+        TerrainGrid(osg::Group* parent, Storage* storage, unsigned int nodeMask = ~0u);
         ~TerrainGrid();
 
         void cacheCell(View* view, int x, int y) override;
@@ -44,7 +45,7 @@ namespace Terrain
         bool isGridEmpty() const { return mGrid.empty(); }
 
     private:
-        osg::ref_ptr<osg::Node> buildTerrain (osg::Group* parent, float chunkSize, const osg::Vec2f& chunkCenter);
+        osg::ref_ptr<osg::Node> buildTerrain(osg::Group* parent, float chunkSize, const osg::Vec2f& chunkCenter);
         void updateWaterCulling();
 
         // split each ESM::Cell into mNumSplits*mNumSplits terrain chunks
diff --git a/components/terrain/texturemanager.cpp b/components/terrain/texturemanager.cpp
index c28b13f1dc..ff4a84707e 100644
--- a/components/terrain/texturemanager.cpp
+++ b/components/terrain/texturemanager.cpp
@@ -3,62 +3,60 @@
 #include <osg/Stats>
 #include <osg/Texture2D>
 
-#include <components/resource/scenemanager.hpp>
 #include <components/resource/imagemanager.hpp>
 #include <components/resource/objectcache.hpp>
+#include <components/resource/scenemanager.hpp>
 
 namespace Terrain
 {
 
-TextureManager::TextureManager(Resource::SceneManager *sceneMgr)
-    : ResourceManager(sceneMgr->getVFS())
-    , mSceneManager(sceneMgr)
-{
-
-}
-
-struct UpdateTextureFilteringFunctor
-{
-    UpdateTextureFilteringFunctor(Resource::SceneManager* sceneMgr)
-        : mSceneManager(sceneMgr)
+    TextureManager::TextureManager(Resource::SceneManager* sceneMgr)
+        : ResourceManager(sceneMgr->getVFS())
+        , mSceneManager(sceneMgr)
     {
     }
-    Resource::SceneManager* mSceneManager;
 
-    void operator()(std::string, osg::Object* obj)
+    struct UpdateTextureFilteringFunctor
+    {
+        UpdateTextureFilteringFunctor(Resource::SceneManager* sceneMgr)
+            : mSceneManager(sceneMgr)
+        {
+        }
+        Resource::SceneManager* mSceneManager;
+
+        void operator()(std::string, osg::Object* obj)
+        {
+            mSceneManager->applyFilterSettings(static_cast<osg::Texture2D*>(obj));
+        }
+    };
+
+    void TextureManager::updateTextureFiltering()
     {
-        mSceneManager->applyFilterSettings(static_cast<osg::Texture2D*>(obj));
+        UpdateTextureFilteringFunctor f(mSceneManager);
+        mCache->call(f);
     }
-};
 
-void TextureManager::updateTextureFiltering()
-{
-    UpdateTextureFilteringFunctor f(mSceneManager);
-    mCache->call(f);
-}
-
-osg::ref_ptr<osg::Texture2D> TextureManager::getTexture(const std::string &name)
-{
-    // don't bother with case folding, since there is only one way of referring to terrain textures we can assume the case is always the same
-    osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(name);
-    if (obj)
-        return static_cast<osg::Texture2D*>(obj.get());
-    else
+    osg::ref_ptr<osg::Texture2D> TextureManager::getTexture(const std::string& name)
     {
-        osg::ref_ptr<osg::Texture2D> texture (new osg::Texture2D(mSceneManager->getImageManager()->getImage(name)));
-        texture->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
-        texture->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
-        mSceneManager->applyFilterSettings(texture);
-        mCache->addEntryToObjectCache(name, texture.get());
-        return texture;
+        // don't bother with case folding, since there is only one way of referring to terrain textures we can assume
+        // the case is always the same
+        osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(name);
+        if (obj)
+            return static_cast<osg::Texture2D*>(obj.get());
+        else
+        {
+            osg::ref_ptr<osg::Texture2D> texture(new osg::Texture2D(mSceneManager->getImageManager()->getImage(name)));
+            texture->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
+            texture->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
+            mSceneManager->applyFilterSettings(texture);
+            mCache->addEntryToObjectCache(name, texture.get());
+            return texture;
+        }
     }
-}
-
-void TextureManager::reportStats(unsigned int frameNumber, osg::Stats *stats) const
-{
-    stats->setAttribute(frameNumber, "Terrain Texture", mCache->getCacheSize());
-}
-
 
+    void TextureManager::reportStats(unsigned int frameNumber, osg::Stats* stats) const
+    {
+        stats->setAttribute(frameNumber, "Terrain Texture", mCache->getCacheSize());
+    }
 
 }
diff --git a/components/terrain/texturemanager.hpp b/components/terrain/texturemanager.hpp
index 46c363055d..ae3e41f138 100644
--- a/components/terrain/texturemanager.hpp
+++ b/components/terrain/texturemanager.hpp
@@ -31,7 +31,6 @@ namespace Terrain
 
     private:
         Resource::SceneManager* mSceneManager;
-
     };
 
 }
diff --git a/components/terrain/viewdata.cpp b/components/terrain/viewdata.cpp
index 033b5f5faa..0de4090478 100644
--- a/components/terrain/viewdata.cpp
+++ b/components/terrain/viewdata.cpp
@@ -5,202 +5,203 @@
 namespace Terrain
 {
 
-ViewData::ViewData()
-    : mNumEntries(0)
-    , mLastUsageTimeStamp(0.0)
-    , mChanged(false)
-    , mHasViewPoint(false)
-    , mWorldUpdateRevision(0)
-{
-}
-
-ViewData::~ViewData()
-{
-}
-
-void ViewData::copyFrom(const ViewData& other)
-{
-    mNumEntries = other.mNumEntries;
-    mEntries = other.mEntries;
-    mChanged = other.mChanged;
-    mHasViewPoint = other.mHasViewPoint;
-    mViewPoint = other.mViewPoint;
-    mActiveGrid = other.mActiveGrid;
-    mWorldUpdateRevision = other.mWorldUpdateRevision;
-}
+    ViewData::ViewData()
+        : mNumEntries(0)
+        , mLastUsageTimeStamp(0.0)
+        , mChanged(false)
+        , mHasViewPoint(false)
+        , mWorldUpdateRevision(0)
+    {
+    }
 
-void ViewData::add(QuadTreeNode *node)
-{
-    unsigned int index = mNumEntries++;
+    ViewData::~ViewData() {}
 
-    if (index+1 > mEntries.size())
-        mEntries.resize(index+1);
+    void ViewData::copyFrom(const ViewData& other)
+    {
+        mNumEntries = other.mNumEntries;
+        mEntries = other.mEntries;
+        mChanged = other.mChanged;
+        mHasViewPoint = other.mHasViewPoint;
+        mViewPoint = other.mViewPoint;
+        mActiveGrid = other.mActiveGrid;
+        mWorldUpdateRevision = other.mWorldUpdateRevision;
+    }
 
-    ViewDataEntry& entry = mEntries[index];
-    if (entry.set(node))
-        mChanged = true;
-}
+    void ViewData::add(QuadTreeNode* node)
+    {
+        unsigned int index = mNumEntries++;
 
-void ViewData::setViewPoint(const osg::Vec3f &viewPoint)
-{
-    mViewPoint = viewPoint;
-    mHasViewPoint = true;
-}
+        if (index + 1 > mEntries.size())
+            mEntries.resize(index + 1);
 
-// NOTE: As a performance optimisation, we cache mRenderingNodes from previous frames here.
-// If this cache becomes invalid (e.g. through mWorldUpdateRevision), we need to use clear() instead of reset().
-void ViewData::reset()
-{
-    // clear any unused entries
-    for (unsigned int i=mNumEntries; i<mEntries.size(); ++i)
-        mEntries[i].set(nullptr);
+        ViewDataEntry& entry = mEntries[index];
+        if (entry.set(node))
+            mChanged = true;
+    }
 
-    // reset index for next frame
-    mNumEntries = 0;
-    mChanged = false;
-}
+    void ViewData::setViewPoint(const osg::Vec3f& viewPoint)
+    {
+        mViewPoint = viewPoint;
+        mHasViewPoint = true;
+    }
 
-void ViewData::clear()
-{
-    for (unsigned int i=0; i<mEntries.size(); ++i)
-        mEntries[i].set(nullptr);
-    mNumEntries = 0;
-    mLastUsageTimeStamp = 0;
-    mChanged = false;
-    mHasViewPoint = false;
-}
+    // NOTE: As a performance optimisation, we cache mRenderingNodes from previous frames here.
+    // If this cache becomes invalid (e.g. through mWorldUpdateRevision), we need to use clear() instead of reset().
+    void ViewData::reset()
+    {
+        // clear any unused entries
+        for (unsigned int i = mNumEntries; i < mEntries.size(); ++i)
+            mEntries[i].set(nullptr);
 
-bool ViewData::suitableToUse(const osg::Vec4i &activeGrid) const
-{
-    return hasViewPoint() && activeGrid == mActiveGrid && getNumEntries();
-}
+        // reset index for next frame
+        mNumEntries = 0;
+        mChanged = false;
+    }
 
-bool ViewData::contains(QuadTreeNode *node) const
-{
-    for (unsigned int i=0; i<mNumEntries; ++i)
-        if (mEntries[i].mNode == node)
-            return true;
-    return false;
-}
+    void ViewData::clear()
+    {
+        for (unsigned int i = 0; i < mEntries.size(); ++i)
+            mEntries[i].set(nullptr);
+        mNumEntries = 0;
+        mLastUsageTimeStamp = 0;
+        mChanged = false;
+        mHasViewPoint = false;
+    }
 
-ViewDataEntry::ViewDataEntry()
-    : mNode(nullptr)
-    , mLodFlags(0)
-{
-}
+    bool ViewData::suitableToUse(const osg::Vec4i& activeGrid) const
+    {
+        return hasViewPoint() && activeGrid == mActiveGrid && getNumEntries();
+    }
 
-bool ViewDataEntry::set(QuadTreeNode *node)
-{
-    if (node == mNode)
+    bool ViewData::contains(QuadTreeNode* node) const
+    {
+        for (unsigned int i = 0; i < mNumEntries; ++i)
+            if (mEntries[i].mNode == node)
+                return true;
         return false;
-    else
+    }
+
+    ViewDataEntry::ViewDataEntry()
+        : mNode(nullptr)
+        , mLodFlags(0)
     {
-        mNode = node;
-        // clear cached data
-        mRenderingNode = nullptr;
-        return true;
     }
-}
 
-ViewData *ViewDataMap::getViewData(osg::Object *viewer, const osg::Vec3f& viewPoint, const osg::Vec4i &activeGrid, bool& needsUpdate)
-{
-    ViewerMap::const_iterator found = mViewers.find(viewer);
-    ViewData* vd = nullptr;
-    if (found == mViewers.end())
+    bool ViewDataEntry::set(QuadTreeNode* node)
     {
-        vd = createOrReuseView();
-        mViewers[viewer] = vd;
+        if (node == mNode)
+            return false;
+        else
+        {
+            mNode = node;
+            // clear cached data
+            mRenderingNode = nullptr;
+            return true;
+        }
     }
-    else
-        vd = found->second;
-    needsUpdate = false;
 
-    if (!(vd->suitableToUse(activeGrid) && (vd->getViewPoint()-viewPoint).length2() < mReuseDistance*mReuseDistance && vd->getWorldUpdateRevision() >= mWorldUpdateRevision))
+    ViewData* ViewDataMap::getViewData(
+        osg::Object* viewer, const osg::Vec3f& viewPoint, const osg::Vec4i& activeGrid, bool& needsUpdate)
     {
-        float shortestDist = viewer ? mReuseDistance*mReuseDistance : std::numeric_limits<float>::max();
-        const ViewData* mostSuitableView = nullptr;
-        for (const ViewData* other : mUsedViews)
+        ViewerMap::const_iterator found = mViewers.find(viewer);
+        ViewData* vd = nullptr;
+        if (found == mViewers.end())
         {
-            if (other->suitableToUse(activeGrid) && other->getWorldUpdateRevision() >= mWorldUpdateRevision)
+            vd = createOrReuseView();
+            mViewers[viewer] = vd;
+        }
+        else
+            vd = found->second;
+        needsUpdate = false;
+
+        if (!(vd->suitableToUse(activeGrid)
+                && (vd->getViewPoint() - viewPoint).length2() < mReuseDistance * mReuseDistance
+                && vd->getWorldUpdateRevision() >= mWorldUpdateRevision))
+        {
+            float shortestDist = viewer ? mReuseDistance * mReuseDistance : std::numeric_limits<float>::max();
+            const ViewData* mostSuitableView = nullptr;
+            for (const ViewData* other : mUsedViews)
             {
-                float dist = (viewPoint-other->getViewPoint()).length2();
-                if (dist < shortestDist)
+                if (other->suitableToUse(activeGrid) && other->getWorldUpdateRevision() >= mWorldUpdateRevision)
                 {
-                    shortestDist = dist;
-                    mostSuitableView = other;
+                    float dist = (viewPoint - other->getViewPoint()).length2();
+                    if (dist < shortestDist)
+                    {
+                        shortestDist = dist;
+                        mostSuitableView = other;
+                    }
                 }
             }
-        }
-        if (mostSuitableView && mostSuitableView != vd)
-        {
-            vd->copyFrom(*mostSuitableView);
-            return vd;
-        }
-        else if (!mostSuitableView)
-        {
-            if (vd->getWorldUpdateRevision() != mWorldUpdateRevision)
+            if (mostSuitableView && mostSuitableView != vd)
+            {
+                vd->copyFrom(*mostSuitableView);
+                return vd;
+            }
+            else if (!mostSuitableView)
             {
-                vd->setWorldUpdateRevision(mWorldUpdateRevision);
-                vd->clear();
+                if (vd->getWorldUpdateRevision() != mWorldUpdateRevision)
+                {
+                    vd->setWorldUpdateRevision(mWorldUpdateRevision);
+                    vd->clear();
+                }
+                vd->setViewPoint(viewPoint);
+                vd->setActiveGrid(activeGrid);
+                needsUpdate = true;
             }
-            vd->setViewPoint(viewPoint);
-            vd->setActiveGrid(activeGrid);
-            needsUpdate = true;
         }
+        return vd;
     }
-    return vd;
-}
 
-ViewData *ViewDataMap::createOrReuseView()
-{
-    ViewData* vd = nullptr;
-    if (mUnusedViews.size())
+    ViewData* ViewDataMap::createOrReuseView()
     {
-        vd = mUnusedViews.front();
-        mUnusedViews.pop_front();
-    }
-    else
-    {
-        mViewVector.emplace_back();
-        vd = &mViewVector.back();
+        ViewData* vd = nullptr;
+        if (mUnusedViews.size())
+        {
+            vd = mUnusedViews.front();
+            mUnusedViews.pop_front();
+        }
+        else
+        {
+            mViewVector.emplace_back();
+            vd = &mViewVector.back();
+        }
+        mUsedViews.push_back(vd);
+        vd->setWorldUpdateRevision(mWorldUpdateRevision);
+        return vd;
     }
-    mUsedViews.push_back(vd);
-    vd->setWorldUpdateRevision(mWorldUpdateRevision);
-    return vd;
-}
 
-ViewData *ViewDataMap::createIndependentView() const
-{
-    ViewData* vd = new ViewData;
-    vd->setWorldUpdateRevision(mWorldUpdateRevision);
-    return vd;
-}
-
-void ViewDataMap::clearUnusedViews(double referenceTime)
-{
-    for (ViewerMap::iterator it = mViewers.begin(); it != mViewers.end(); )
+    ViewData* ViewDataMap::createIndependentView() const
     {
-        if (it->second->getLastUsageTimeStamp() + mExpiryDelay < referenceTime)
-            mViewers.erase(it++);
-        else
-            ++it;
+        ViewData* vd = new ViewData;
+        vd->setWorldUpdateRevision(mWorldUpdateRevision);
+        return vd;
     }
-    for (std::deque<ViewData*>::iterator it = mUsedViews.begin(); it != mUsedViews.end(); )
+
+    void ViewDataMap::clearUnusedViews(double referenceTime)
     {
-        if ((*it)->getLastUsageTimeStamp() + mExpiryDelay < referenceTime)
+        for (ViewerMap::iterator it = mViewers.begin(); it != mViewers.end();)
         {
-            (*it)->clear();
-            mUnusedViews.push_back(*it);
-            it = mUsedViews.erase(it);
+            if (it->second->getLastUsageTimeStamp() + mExpiryDelay < referenceTime)
+                mViewers.erase(it++);
+            else
+                ++it;
+        }
+        for (std::deque<ViewData*>::iterator it = mUsedViews.begin(); it != mUsedViews.end();)
+        {
+            if ((*it)->getLastUsageTimeStamp() + mExpiryDelay < referenceTime)
+            {
+                (*it)->clear();
+                mUnusedViews.push_back(*it);
+                it = mUsedViews.erase(it);
+            }
+            else
+                ++it;
         }
-        else
-            ++it;
     }
-}
 
-void ViewDataMap::rebuildViews()
-{
-    ++mWorldUpdateRevision;
-}
+    void ViewDataMap::rebuildViews()
+    {
+        ++mWorldUpdateRevision;
+    }
 
 }
diff --git a/components/terrain/viewdata.hpp b/components/terrain/viewdata.hpp
index 125ee7dfc0..eb9f2da5e9 100644
--- a/components/terrain/viewdata.hpp
+++ b/components/terrain/viewdata.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_TERRAIN_VIEWDATA_H
 #define OPENMW_COMPONENTS_TERRAIN_VIEWDATA_H
 
-#include <vector>
 #include <deque>
+#include <vector>
 
 #include <osg/Node>
 
@@ -60,8 +60,16 @@ namespace Terrain
         void setViewPoint(const osg::Vec3f& viewPoint);
         const osg::Vec3f& getViewPoint() const { return mViewPoint; }
 
-        void setActiveGrid(const osg::Vec4i &grid) { if (grid != mActiveGrid) {mActiveGrid = grid;mEntries.clear();mNumEntries=0;} }
-        const osg::Vec4i &getActiveGrid() const { return mActiveGrid;}
+        void setActiveGrid(const osg::Vec4i& grid)
+        {
+            if (grid != mActiveGrid)
+            {
+                mActiveGrid = grid;
+                mEntries.clear();
+                mNumEntries = 0;
+            }
+        }
+        const osg::Vec4i& getActiveGrid() const { return mActiveGrid; }
 
         unsigned int getWorldUpdateRevision() const { return mWorldUpdateRevision; }
         void setWorldUpdateRevision(int updateRevision) { mWorldUpdateRevision = updateRevision; }
@@ -81,13 +89,18 @@ namespace Terrain
     {
     public:
         ViewDataMap()
-            : mReuseDistance(150) // large value should be safe because the visibility of each node is still updated individually for each camera even if the base view was reused.
-                                  // this value also serves as a threshold for when a newly loaded LOD gets unloaded again so that if you hover around an LOD transition point the LODs won't keep loading and unloading all the time.
+            : mReuseDistance(
+                150) // large value should be safe because the visibility of each node is still updated individually for
+                     // each camera even if the base view was reused. this value also serves as a threshold for when a
+                     // newly loaded LOD gets unloaded again so that if you hover around an LOD transition point the
+                     // LODs won't keep loading and unloading all the time.
             , mExpiryDelay(1.f)
             , mWorldUpdateRevision(0)
-        {}
+        {
+        }
 
-        ViewData* getViewData(osg::Object* viewer, const osg::Vec3f& viewPoint, const osg::Vec4i &activeGrid, bool& needsUpdate);
+        ViewData* getViewData(
+            osg::Object* viewer, const osg::Vec3f& viewPoint, const osg::Vec4i& activeGrid, bool& needsUpdate);
 
         ViewData* createOrReuseView();
         ViewData* createIndependentView() const;
diff --git a/components/terrain/world.cpp b/components/terrain/world.cpp
index 5798784e83..56a74f9f4c 100644
--- a/components/terrain/world.cpp
+++ b/components/terrain/world.cpp
@@ -1,148 +1,152 @@
 #include "world.hpp"
 
-#include <osg/Group>
 #include <osg/Camera>
+#include <osg/Group>
 
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 
-#include "storage.hpp"
-#include "texturemanager.hpp"
 #include "chunkmanager.hpp"
 #include "compositemaprenderer.hpp"
 #include "heightcull.hpp"
+#include "storage.hpp"
+#include "texturemanager.hpp"
 
 namespace Terrain
 {
 
-World::World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask)
-    : mStorage(storage)
-    , mParent(parent)
-    , mResourceSystem(resourceSystem)
-    , mBorderVisible(false)
-    , mHeightCullCallback(new HeightCullCallback)
-{
-    mTerrainRoot = new osg::Group;
-    mTerrainRoot->setNodeMask(nodeMask);
-    mTerrainRoot->setName("Terrain Root");
-
-    osg::ref_ptr<osg::Camera> compositeCam = new osg::Camera;
-    compositeCam->setRenderOrder(osg::Camera::PRE_RENDER, -1);
-    compositeCam->setProjectionMatrix(osg::Matrix::identity());
-    compositeCam->setViewMatrix(osg::Matrix::identity());
-    compositeCam->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
-    compositeCam->setClearMask(0);
-    compositeCam->setNodeMask(preCompileMask);
-    mCompositeMapCamera = compositeCam;
-
-    compileRoot->addChild(compositeCam);
-
-    mCompositeMapRenderer = new CompositeMapRenderer;
-    compositeCam->addChild(mCompositeMapRenderer);
-
-    mParent->addChild(mTerrainRoot);
-
-    mTextureManager = std::make_unique<TextureManager>(mResourceSystem->getSceneManager());
-    mChunkManager = std::make_unique<ChunkManager>(mStorage, mResourceSystem->getSceneManager(), mTextureManager.get(), mCompositeMapRenderer);
-    mChunkManager->setNodeMask(nodeMask);
-    mCellBorder = std::make_unique<CellBorder>(this,mTerrainRoot.get(),borderMask,mResourceSystem->getSceneManager());
-
-    mResourceSystem->addResourceManager(mChunkManager.get());
-    mResourceSystem->addResourceManager(mTextureManager.get());
-}
-
-World::World(osg::Group* parent, Storage* storage, unsigned int nodeMask)
-    : mStorage(storage)
-    , mParent(parent)
-    , mCompositeMapCamera(nullptr)
-    , mCompositeMapRenderer(nullptr)
-    , mResourceSystem(nullptr)
-    , mTextureManager(nullptr)
-    , mChunkManager(nullptr)
-    , mCellBorder(nullptr)
-    , mBorderVisible(false)
-    , mHeightCullCallback(nullptr)
-{
-    mTerrainRoot = new osg::Group;
-    mTerrainRoot->setNodeMask(nodeMask);
-
-    mParent->addChild(mTerrainRoot);
-}
+    World::World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem,
+        Storage* storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask)
+        : mStorage(storage)
+        , mParent(parent)
+        , mResourceSystem(resourceSystem)
+        , mBorderVisible(false)
+        , mHeightCullCallback(new HeightCullCallback)
+    {
+        mTerrainRoot = new osg::Group;
+        mTerrainRoot->setNodeMask(nodeMask);
+        mTerrainRoot->setName("Terrain Root");
+
+        osg::ref_ptr<osg::Camera> compositeCam = new osg::Camera;
+        compositeCam->setRenderOrder(osg::Camera::PRE_RENDER, -1);
+        compositeCam->setProjectionMatrix(osg::Matrix::identity());
+        compositeCam->setViewMatrix(osg::Matrix::identity());
+        compositeCam->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
+        compositeCam->setClearMask(0);
+        compositeCam->setNodeMask(preCompileMask);
+        mCompositeMapCamera = compositeCam;
+
+        compileRoot->addChild(compositeCam);
+
+        mCompositeMapRenderer = new CompositeMapRenderer;
+        compositeCam->addChild(mCompositeMapRenderer);
+
+        mParent->addChild(mTerrainRoot);
+
+        mTextureManager = std::make_unique<TextureManager>(mResourceSystem->getSceneManager());
+        mChunkManager = std::make_unique<ChunkManager>(
+            mStorage, mResourceSystem->getSceneManager(), mTextureManager.get(), mCompositeMapRenderer);
+        mChunkManager->setNodeMask(nodeMask);
+        mCellBorder
+            = std::make_unique<CellBorder>(this, mTerrainRoot.get(), borderMask, mResourceSystem->getSceneManager());
+
+        mResourceSystem->addResourceManager(mChunkManager.get());
+        mResourceSystem->addResourceManager(mTextureManager.get());
+    }
 
-World::~World()
-{
-    if (mResourceSystem && mChunkManager)
-        mResourceSystem->removeResourceManager(mChunkManager.get());
-    if (mResourceSystem && mTextureManager)
-        mResourceSystem->removeResourceManager(mTextureManager.get());
+    World::World(osg::Group* parent, Storage* storage, unsigned int nodeMask)
+        : mStorage(storage)
+        , mParent(parent)
+        , mCompositeMapCamera(nullptr)
+        , mCompositeMapRenderer(nullptr)
+        , mResourceSystem(nullptr)
+        , mTextureManager(nullptr)
+        , mChunkManager(nullptr)
+        , mCellBorder(nullptr)
+        , mBorderVisible(false)
+        , mHeightCullCallback(nullptr)
+    {
+        mTerrainRoot = new osg::Group;
+        mTerrainRoot->setNodeMask(nodeMask);
 
-    mParent->removeChild(mTerrainRoot);
+        mParent->addChild(mTerrainRoot);
+    }
 
-    if (mCompositeMapCamera && mCompositeMapRenderer)
+    World::~World()
     {
-        mCompositeMapCamera->removeChild(mCompositeMapRenderer);
-        mCompositeMapCamera->getParent(0)->removeChild(mCompositeMapCamera);
+        if (mResourceSystem && mChunkManager)
+            mResourceSystem->removeResourceManager(mChunkManager.get());
+        if (mResourceSystem && mTextureManager)
+            mResourceSystem->removeResourceManager(mTextureManager.get());
+
+        mParent->removeChild(mTerrainRoot);
+
+        if (mCompositeMapCamera && mCompositeMapRenderer)
+        {
+            mCompositeMapCamera->removeChild(mCompositeMapRenderer);
+            mCompositeMapCamera->getParent(0)->removeChild(mCompositeMapCamera);
+        }
     }
-}
 
-void World::setBordersVisible(bool visible)
-{
-    mBorderVisible = visible;
-
-    if (visible)
+    void World::setBordersVisible(bool visible)
     {
-        for (std::set<std::pair<int,int>>::iterator it = mLoadedCells.begin(); it != mLoadedCells.end(); ++it)
-            mCellBorder->createCellBorderGeometry(it->first,it->second);
+        mBorderVisible = visible;
+
+        if (visible)
+        {
+            for (std::set<std::pair<int, int>>::iterator it = mLoadedCells.begin(); it != mLoadedCells.end(); ++it)
+                mCellBorder->createCellBorderGeometry(it->first, it->second);
+        }
+        else
+            mCellBorder->destroyCellBorderGeometry();
     }
-    else
-        mCellBorder->destroyCellBorderGeometry();
-}
 
-void World::loadCell(int x, int y)
-{
-    if (mBorderVisible)
-        mCellBorder->createCellBorderGeometry(x,y);
+    void World::loadCell(int x, int y)
+    {
+        if (mBorderVisible)
+            mCellBorder->createCellBorderGeometry(x, y);
 
-    mLoadedCells.insert(std::pair<int,int>(x,y));
-}
+        mLoadedCells.insert(std::pair<int, int>(x, y));
+    }
 
-void World::unloadCell(int x, int y)
-{
-    if (mBorderVisible)
-        mCellBorder->destroyCellBorderGeometry(x,y);
+    void World::unloadCell(int x, int y)
+    {
+        if (mBorderVisible)
+            mCellBorder->destroyCellBorderGeometry(x, y);
 
-    mLoadedCells.erase(std::pair<int,int>(x,y));
-}
+        mLoadedCells.erase(std::pair<int, int>(x, y));
+    }
 
-void World::setTargetFrameRate(float rate)
-{
-    mCompositeMapRenderer->setTargetFrameRate(rate);
-}
+    void World::setTargetFrameRate(float rate)
+    {
+        mCompositeMapRenderer->setTargetFrameRate(rate);
+    }
 
-float World::getHeightAt(const osg::Vec3f &worldPos)
-{
-    return mStorage->getHeightAt(worldPos);
-}
+    float World::getHeightAt(const osg::Vec3f& worldPos)
+    {
+        return mStorage->getHeightAt(worldPos);
+    }
 
-void World::updateTextureFiltering()
-{
-    if (mTextureManager)
-        mTextureManager->updateTextureFiltering();
-}
+    void World::updateTextureFiltering()
+    {
+        if (mTextureManager)
+            mTextureManager->updateTextureFiltering();
+    }
 
-void World::clearAssociatedCaches()
-{
-    if (mChunkManager)
-        mChunkManager->clearCache();
-}
+    void World::clearAssociatedCaches()
+    {
+        if (mChunkManager)
+            mChunkManager->clearCache();
+    }
 
-osg::Callback* World::getHeightCullCallback(float highz, unsigned int mask)
-{
-    if (!mHeightCullCallback) return nullptr;
+    osg::Callback* World::getHeightCullCallback(float highz, unsigned int mask)
+    {
+        if (!mHeightCullCallback)
+            return nullptr;
 
-    mHeightCullCallback->setHighZ(highz);
-    mHeightCullCallback->setCullMask(mask);
-    return mHeightCullCallback;
-}
+        mHeightCullCallback->setHighZ(highz);
+        mHeightCullCallback->setCullMask(mask);
+        return mHeightCullCallback;
+    }
 
 }
diff --git a/components/terrain/world.hpp b/components/terrain/world.hpp
index 09e8adaef0..04665118b3 100644
--- a/components/terrain/world.hpp
+++ b/components/terrain/world.hpp
@@ -1,9 +1,9 @@
 #ifndef COMPONENTS_TERRAIN_WORLD_H
 #define COMPONENTS_TERRAIN_WORLD_H
 
-#include <osg/ref_ptr>
 #include <osg/Referenced>
 #include <osg/Vec3f>
+#include <osg/ref_ptr>
 
 #include <memory>
 #include <set>
@@ -37,7 +37,7 @@ namespace Terrain
     class CompositeMapRenderer;
     class View;
     class HeightCullCallback;
-    
+
     /**
      * @brief The basic interface for a terrain world. How the terrain chunks are paged and displayed
      *  is up to the implementation.
@@ -49,7 +49,8 @@ namespace Terrain
         /// @param storage Storage instance to get terrain data from (heights, normals, colors, textures..)
         /// @param nodeMask mask for the terrain root
         /// @param preCompileMask mask for pre compiling textures
-        World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask);
+        World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage,
+            unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask);
         World(osg::Group* parent, Storage* storage, unsigned int nodeMask);
         virtual ~World();
 
@@ -60,7 +61,7 @@ namespace Terrain
         /// @note Thread safe.
         void updateTextureFiltering();
 
-        float getHeightAt (const osg::Vec3f& worldPos);
+        float getHeightAt(const osg::Vec3f& worldPos);
 
         /// Clears the cached land and landtexture data.
         /// @note Thread safe.
@@ -89,7 +90,10 @@ namespace Terrain
 
         /// @note Thread safe, as long as you do not attempt to load into the same view from multiple threads.
 
-        virtual void preload(View* view, const osg::Vec3f& viewPoint, const osg::Vec4i &cellgrid, std::atomic<bool>& abort, Loading::Reporter& reporter) {}
+        virtual void preload(View* view, const osg::Vec3f& viewPoint, const osg::Vec4i& cellgrid,
+            std::atomic<bool>& abort, Loading::Reporter& reporter)
+        {
+        }
 
         virtual void rebuildViews() {}
 
@@ -101,7 +105,7 @@ namespace Terrain
 
         osg::Callback* getHeightCullCallback(float highz, unsigned int mask);
 
-        void setActiveGrid(const osg::Vec4i &grid) { mActiveGrid = grid; }
+        void setActiveGrid(const osg::Vec4i& grid) { mActiveGrid = grid; }
 
     protected:
         Storage* mStorage;
@@ -121,7 +125,7 @@ namespace Terrain
 
         bool mBorderVisible;
 
-        std::set<std::pair<int,int>> mLoadedCells;
+        std::set<std::pair<int, int>> mLoadedCells;
         osg::ref_ptr<HeightCullCallback> mHeightCullCallback;
 
         osg::Vec4i mActiveGrid;
diff --git a/components/to_utf8/gen_iconv.cpp b/components/to_utf8/gen_iconv.cpp
index 75d83fb1a7..062b1173fc 100644
--- a/components/to_utf8/gen_iconv.cpp
+++ b/components/to_utf8/gen_iconv.cpp
@@ -2,116 +2,123 @@
 
 #include <iostream>
 
-#include <iconv.h>
 #include <cassert>
+#include <iconv.h>
 
-void tab() { std::cout << "   "; }
+void tab()
+{
+    std::cout << "   ";
+}
 
 // write one number with a space in front of it and a comma after it
 void num(char i, bool last)
 {
-  // Convert i to its integer value, i.e. -128 to 127. Printing it directly
-  // would result in non-printable characters in the source code, which is bad.
-  std::cout << " " << static_cast<int>(i);
-  if(!last) std::cout << ",";
+    // Convert i to its integer value, i.e. -128 to 127. Printing it directly
+    // would result in non-printable characters in the source code, which is bad.
+    std::cout << " " << static_cast<int>(i);
+    if (!last)
+        std::cout << ",";
 }
 
 // Write one table entry (UTF8 value), 1-5 bytes
-void writeChar(char *value, int length, bool last, const std::string &comment="")
+void writeChar(char* value, int length, bool last, const std::string& comment = "")
 {
-  assert(length >= 1 && length <= 5);
-  tab();
-  num(length, false);
-  for(int i=0;i<5;i++)
-    num(value[i], last && i==4);
+    assert(length >= 1 && length <= 5);
+    tab();
+    num(length, false);
+    for (int i = 0; i < 5; i++)
+        num(value[i], last && i == 4);
 
-  if(comment != "")
-    std::cout << " // " << comment;
+    if (comment != "")
+        std::cout << " // " << comment;
 
-  std::cout << std::endl;
+    std::cout << std::endl;
 }
 
 // What to write on missing characters
 void writeMissing(bool last)
 {
-  // Just write a space character
-  char value[5];
-  value[0] = ' ';
-  for(int i=1; i<5; i++)
-    value[i] = 0;
-  writeChar(value, 1, last, "not part of this charset");
+    // Just write a space character
+    char value[5];
+    value[0] = ' ';
+    for (int i = 1; i < 5; i++)
+        value[i] = 0;
+    writeChar(value, 1, last, "not part of this charset");
 }
 
-int write_table(const std::string &charset, const std::string &tableName)
+int write_table(const std::string& charset, const std::string& tableName)
 {
-  // Write table header
-  std::cout << "const static signed char " << tableName << "[] =\n{\n";
+    // Write table header
+    std::cout << "const static signed char " << tableName << "[] =\n{\n";
 
-  // Open conversion system
-  iconv_t cd = iconv_open ("UTF-8", charset.c_str());
+    // Open conversion system
+    iconv_t cd = iconv_open("UTF-8", charset.c_str());
 
-  // Convert each character from 0 to 255
-  for(int i=0; i<256; i++)
+    // Convert each character from 0 to 255
+    for (int i = 0; i < 256; i++)
     {
-      bool last = (i==255);
+        bool last = (i == 255);
 
-      char input = i;
-      char *iptr = &input;
-      size_t ileft = 1;
+        char input = i;
+        char* iptr = &input;
+        size_t ileft = 1;
 
-      char output[5];
-      for(int k=0; k<5; k++) output[k] = 0;
-      char *optr = output;
-      size_t oleft = 5;
+        char output[5];
+        for (int k = 0; k < 5; k++)
+            output[k] = 0;
+        char* optr = output;
+        size_t oleft = 5;
 
-      size_t res = iconv(cd, &iptr, &ileft, &optr, &oleft);
+        size_t res = iconv(cd, &iptr, &ileft, &optr, &oleft);
 
-      if(res) writeMissing(last);
-      else writeChar(output, 5-oleft, last);
+        if (res)
+            writeMissing(last);
+        else
+            writeChar(output, 5 - oleft, last);
     }
 
-  iconv_close (cd);
+    iconv_close(cd);
 
-  // Finish table
-  std::cout << "};\n";
+    // Finish table
+    std::cout << "};\n";
 
-  return 0;
+    return 0;
 }
 
 int main()
 {
-  // Write header guard
-  std::cout << "#ifndef COMPONENTS_TOUTF8_TABLE_GEN_H\n#define COMPONENTS_TOUTF8_TABLE_GEN_H\n\n";
+    // Write header guard
+    std::cout << "#ifndef COMPONENTS_TOUTF8_TABLE_GEN_H\n#define COMPONENTS_TOUTF8_TABLE_GEN_H\n\n";
 
-  // Write namespace
-  std::cout << "namespace ToUTF8\n{\n\n";
+    // Write namespace
+    std::cout << "namespace ToUTF8\n{\n\n";
 
-  // Central European and Eastern European languages that use Latin script, such as
-  // Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, Croatian, Serbian (Latin script), Romanian and Albanian.
-  std::cout << "\n/// Central European and Eastern European languages that use Latin script,"
-               "\n/// such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, Croatian,"
-               "\n/// Serbian (Latin script), Romanian and Albanian."
-               "\n";
-  write_table("WINDOWS-1250", "windows_1250");
+    // Central European and Eastern European languages that use Latin script, such as
+    // Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, Croatian, Serbian (Latin script), Romanian and Albanian.
+    std::cout << "\n/// Central European and Eastern European languages that use Latin script,"
+                 "\n/// such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, Croatian,"
+                 "\n/// Serbian (Latin script), Romanian and Albanian."
+                 "\n";
+    write_table("WINDOWS-1250", "windows_1250");
 
-  // Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic and other languages
-  std::cout << "\n/// Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic"
-               "\n/// and other languages"
-               "\n";
-  write_table("WINDOWS-1251", "windows_1251");
+    // Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic and other languages
+    std::cout << "\n/// Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic"
+                 "\n/// and other languages"
+                 "\n";
+    write_table("WINDOWS-1251", "windows_1251");
 
-  // English
-  std::cout << "\n/// Latin alphabet used by English and some other Western languages"
-               "\n";
-  write_table("WINDOWS-1252", "windows_1252");
+    // English
+    std::cout << "\n/// Latin alphabet used by English and some other Western languages"
+                 "\n";
+    write_table("WINDOWS-1252", "windows_1252");
 
-  write_table("CP437", "cp437");
+    write_table("CP437", "cp437");
 
-  // Close namespace
-  std::cout << "\n}\n\n";
+    // Close namespace
+    std::cout << "\n}\n\n";
 
-  // Close header guard
-  std::cout << "#endif\n\n";
+    // Close header guard
+    std::cout << "#endif\n\n";
 
-  return 0;
+    return 0;
 }
diff --git a/components/to_utf8/tables_gen.hpp b/components/to_utf8/tables_gen.hpp
index b7659979eb..b25bb54bab 100644
--- a/components/to_utf8/tables_gen.hpp
+++ b/components/to_utf8/tables_gen.hpp
@@ -4,1053 +4,221 @@
 namespace ToUTF8
 {
 
+    /// Central European and Eastern European languages that use Latin script,
+    /// such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, Croatian,
+    /// Serbian (Latin script), Romanian and Albanian.
+    const static signed char windows_1250[] = { 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 1, 3, 0, 0, 0, 0,
+        1, 4, 0, 0, 0, 0, 1, 5, 0, 0, 0, 0, 1, 6, 0, 0, 0, 0, 1, 7, 0, 0, 0, 0, 1, 8, 0, 0, 0, 0, 1, 9, 0, 0, 0, 0, 1,
+        10, 0, 0, 0, 0, 1, 11, 0, 0, 0, 0, 1, 12, 0, 0, 0, 0, 1, 13, 0, 0, 0, 0, 1, 14, 0, 0, 0, 0, 1, 15, 0, 0, 0, 0,
+        1, 16, 0, 0, 0, 0, 1, 17, 0, 0, 0, 0, 1, 18, 0, 0, 0, 0, 1, 19, 0, 0, 0, 0, 1, 20, 0, 0, 0, 0, 1, 21, 0, 0, 0,
+        0, 1, 22, 0, 0, 0, 0, 1, 23, 0, 0, 0, 0, 1, 24, 0, 0, 0, 0, 1, 25, 0, 0, 0, 0, 1, 26, 0, 0, 0, 0, 1, 27, 0, 0,
+        0, 0, 1, 28, 0, 0, 0, 0, 1, 29, 0, 0, 0, 0, 1, 30, 0, 0, 0, 0, 1, 31, 0, 0, 0, 0, 1, 32, 0, 0, 0, 0, 1, 33, 0,
+        0, 0, 0, 1, 34, 0, 0, 0, 0, 1, 35, 0, 0, 0, 0, 1, 36, 0, 0, 0, 0, 1, 37, 0, 0, 0, 0, 1, 38, 0, 0, 0, 0, 1, 39,
+        0, 0, 0, 0, 1, 40, 0, 0, 0, 0, 1, 41, 0, 0, 0, 0, 1, 42, 0, 0, 0, 0, 1, 43, 0, 0, 0, 0, 1, 44, 0, 0, 0, 0, 1,
+        45, 0, 0, 0, 0, 1, 46, 0, 0, 0, 0, 1, 47, 0, 0, 0, 0, 1, 48, 0, 0, 0, 0, 1, 49, 0, 0, 0, 0, 1, 50, 0, 0, 0, 0,
+        1, 51, 0, 0, 0, 0, 1, 52, 0, 0, 0, 0, 1, 53, 0, 0, 0, 0, 1, 54, 0, 0, 0, 0, 1, 55, 0, 0, 0, 0, 1, 56, 0, 0, 0,
+        0, 1, 57, 0, 0, 0, 0, 1, 58, 0, 0, 0, 0, 1, 59, 0, 0, 0, 0, 1, 60, 0, 0, 0, 0, 1, 61, 0, 0, 0, 0, 1, 62, 0, 0,
+        0, 0, 1, 63, 0, 0, 0, 0, 1, 64, 0, 0, 0, 0, 1, 65, 0, 0, 0, 0, 1, 66, 0, 0, 0, 0, 1, 67, 0, 0, 0, 0, 1, 68, 0,
+        0, 0, 0, 1, 69, 0, 0, 0, 0, 1, 70, 0, 0, 0, 0, 1, 71, 0, 0, 0, 0, 1, 72, 0, 0, 0, 0, 1, 73, 0, 0, 0, 0, 1, 74,
+        0, 0, 0, 0, 1, 75, 0, 0, 0, 0, 1, 76, 0, 0, 0, 0, 1, 77, 0, 0, 0, 0, 1, 78, 0, 0, 0, 0, 1, 79, 0, 0, 0, 0, 1,
+        80, 0, 0, 0, 0, 1, 81, 0, 0, 0, 0, 1, 82, 0, 0, 0, 0, 1, 83, 0, 0, 0, 0, 1, 84, 0, 0, 0, 0, 1, 85, 0, 0, 0, 0,
+        1, 86, 0, 0, 0, 0, 1, 87, 0, 0, 0, 0, 1, 88, 0, 0, 0, 0, 1, 89, 0, 0, 0, 0, 1, 90, 0, 0, 0, 0, 1, 91, 0, 0, 0,
+        0, 1, 92, 0, 0, 0, 0, 1, 93, 0, 0, 0, 0, 1, 94, 0, 0, 0, 0, 1, 95, 0, 0, 0, 0, 1, 96, 0, 0, 0, 0, 1, 97, 0, 0,
+        0, 0, 1, 98, 0, 0, 0, 0, 1, 99, 0, 0, 0, 0, 1, 100, 0, 0, 0, 0, 1, 101, 0, 0, 0, 0, 1, 102, 0, 0, 0, 0, 1, 103,
+        0, 0, 0, 0, 1, 104, 0, 0, 0, 0, 1, 105, 0, 0, 0, 0, 1, 106, 0, 0, 0, 0, 1, 107, 0, 0, 0, 0, 1, 108, 0, 0, 0, 0,
+        1, 109, 0, 0, 0, 0, 1, 110, 0, 0, 0, 0, 1, 111, 0, 0, 0, 0, 1, 112, 0, 0, 0, 0, 1, 113, 0, 0, 0, 0, 1, 114, 0,
+        0, 0, 0, 1, 115, 0, 0, 0, 0, 1, 116, 0, 0, 0, 0, 1, 117, 0, 0, 0, 0, 1, 118, 0, 0, 0, 0, 1, 119, 0, 0, 0, 0, 1,
+        120, 0, 0, 0, 0, 1, 121, 0, 0, 0, 0, 1, 122, 0, 0, 0, 0, 1, 123, 0, 0, 0, 0, 1, 124, 0, 0, 0, 0, 1, 125, 0, 0,
+        0, 0, 1, 126, 0, 0, 0, 0, 1, 127, 0, 0, 0, 0, 3, -30, -126, -84, 0, 0, 1, 32, 0, 0, 0,
+        0, // not part of this charset
+        3, -30, -128, -102, 0, 0, 1, 32, 0, 0, 0, 0, // not part of this charset
+        3, -30, -128, -98, 0, 0, 3, -30, -128, -90, 0, 0, 3, -30, -128, -96, 0, 0, 3, -30, -128, -95, 0, 0, 1, 32, 0, 0,
+        0, 0, // not part of this charset
+        3, -30, -128, -80, 0, 0, 2, -59, -96, 0, 0, 0, 3, -30, -128, -71, 0, 0, 2, -59, -102, 0, 0, 0, 2, -59, -92, 0,
+        0, 0, 2, -59, -67, 0, 0, 0, 2, -59, -71, 0, 0, 0, 1, 32, 0, 0, 0, 0, // not part of this charset
+        3, -30, -128, -104, 0, 0, 3, -30, -128, -103, 0, 0, 3, -30, -128, -100, 0, 0, 3, -30, -128, -99, 0, 0, 3, -30,
+        -128, -94, 0, 0, 3, -30, -128, -109, 0, 0, 3, -30, -128, -108, 0, 0, 1, 32, 0, 0, 0,
+        0, // not part of this charset
+        3, -30, -124, -94, 0, 0, 2, -59, -95, 0, 0, 0, 3, -30, -128, -70, 0, 0, 2, -59, -101, 0, 0, 0, 2, -59, -91, 0,
+        0, 0, 2, -59, -66, 0, 0, 0, 2, -59, -70, 0, 0, 0, 2, -62, -96, 0, 0, 0, 2, -53, -121, 0, 0, 0, 2, -53, -104, 0,
+        0, 0, 2, -59, -127, 0, 0, 0, 2, -62, -92, 0, 0, 0, 2, -60, -124, 0, 0, 0, 2, -62, -90, 0, 0, 0, 2, -62, -89, 0,
+        0, 0, 2, -62, -88, 0, 0, 0, 2, -62, -87, 0, 0, 0, 2, -59, -98, 0, 0, 0, 2, -62, -85, 0, 0, 0, 2, -62, -84, 0, 0,
+        0, 2, -62, -83, 0, 0, 0, 2, -62, -82, 0, 0, 0, 2, -59, -69, 0, 0, 0, 2, -62, -80, 0, 0, 0, 2, -62, -79, 0, 0, 0,
+        2, -53, -101, 0, 0, 0, 2, -59, -126, 0, 0, 0, 2, -62, -76, 0, 0, 0, 2, -62, -75, 0, 0, 0, 2, -62, -74, 0, 0, 0,
+        2, -62, -73, 0, 0, 0, 2, -62, -72, 0, 0, 0, 2, -60, -123, 0, 0, 0, 2, -59, -97, 0, 0, 0, 2, -62, -69, 0, 0, 0,
+        2, -60, -67, 0, 0, 0, 2, -53, -99, 0, 0, 0, 2, -60, -66, 0, 0, 0, 2, -59, -68, 0, 0, 0, 2, -59, -108, 0, 0, 0,
+        2, -61, -127, 0, 0, 0, 2, -61, -126, 0, 0, 0, 2, -60, -126, 0, 0, 0, 2, -61, -124, 0, 0, 0, 2, -60, -71, 0, 0,
+        0, 2, -60, -122, 0, 0, 0, 2, -61, -121, 0, 0, 0, 2, -60, -116, 0, 0, 0, 2, -61, -119, 0, 0, 0, 2, -60, -104, 0,
+        0, 0, 2, -61, -117, 0, 0, 0, 2, -60, -102, 0, 0, 0, 2, -61, -115, 0, 0, 0, 2, -61, -114, 0, 0, 0, 2, -60, -114,
+        0, 0, 0, 2, -60, -112, 0, 0, 0, 2, -59, -125, 0, 0, 0, 2, -59, -121, 0, 0, 0, 2, -61, -109, 0, 0, 0, 2, -61,
+        -108, 0, 0, 0, 2, -59, -112, 0, 0, 0, 2, -61, -106, 0, 0, 0, 2, -61, -105, 0, 0, 0, 2, -59, -104, 0, 0, 0, 2,
+        -59, -82, 0, 0, 0, 2, -61, -102, 0, 0, 0, 2, -59, -80, 0, 0, 0, 2, -61, -100, 0, 0, 0, 2, -61, -99, 0, 0, 0, 2,
+        -59, -94, 0, 0, 0, 2, -61, -97, 0, 0, 0, 2, -59, -107, 0, 0, 0, 2, -61, -95, 0, 0, 0, 2, -61, -94, 0, 0, 0, 2,
+        -60, -125, 0, 0, 0, 2, -61, -92, 0, 0, 0, 2, -60, -70, 0, 0, 0, 2, -60, -121, 0, 0, 0, 2, -61, -89, 0, 0, 0, 2,
+        -60, -115, 0, 0, 0, 2, -61, -87, 0, 0, 0, 2, -60, -103, 0, 0, 0, 2, -61, -85, 0, 0, 0, 2, -60, -101, 0, 0, 0, 2,
+        -61, -83, 0, 0, 0, 2, -61, -82, 0, 0, 0, 2, -60, -113, 0, 0, 0, 2, -60, -111, 0, 0, 0, 2, -59, -124, 0, 0, 0, 2,
+        -59, -120, 0, 0, 0, 2, -61, -77, 0, 0, 0, 2, -61, -76, 0, 0, 0, 2, -59, -111, 0, 0, 0, 2, -61, -74, 0, 0, 0, 2,
+        -61, -73, 0, 0, 0, 2, -59, -103, 0, 0, 0, 2, -59, -81, 0, 0, 0, 2, -61, -70, 0, 0, 0, 2, -59, -79, 0, 0, 0, 2,
+        -61, -68, 0, 0, 0, 2, -61, -67, 0, 0, 0, 2, -59, -93, 0, 0, 0, 2, -53, -103, 0, 0, 0 };
 
-/// Central European and Eastern European languages that use Latin script,
-/// such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, Croatian,
-/// Serbian (Latin script), Romanian and Albanian.
-const static signed char windows_1250[] =
-{
-    1, 0, 0, 0, 0, 0,
-    1, 1, 0, 0, 0, 0,
-    1, 2, 0, 0, 0, 0,
-    1, 3, 0, 0, 0, 0,
-    1, 4, 0, 0, 0, 0,
-    1, 5, 0, 0, 0, 0,
-    1, 6, 0, 0, 0, 0,
-    1, 7, 0, 0, 0, 0,
-    1, 8, 0, 0, 0, 0,
-    1, 9, 0, 0, 0, 0,
-    1, 10, 0, 0, 0, 0,
-    1, 11, 0, 0, 0, 0,
-    1, 12, 0, 0, 0, 0,
-    1, 13, 0, 0, 0, 0,
-    1, 14, 0, 0, 0, 0,
-    1, 15, 0, 0, 0, 0,
-    1, 16, 0, 0, 0, 0,
-    1, 17, 0, 0, 0, 0,
-    1, 18, 0, 0, 0, 0,
-    1, 19, 0, 0, 0, 0,
-    1, 20, 0, 0, 0, 0,
-    1, 21, 0, 0, 0, 0,
-    1, 22, 0, 0, 0, 0,
-    1, 23, 0, 0, 0, 0,
-    1, 24, 0, 0, 0, 0,
-    1, 25, 0, 0, 0, 0,
-    1, 26, 0, 0, 0, 0,
-    1, 27, 0, 0, 0, 0,
-    1, 28, 0, 0, 0, 0,
-    1, 29, 0, 0, 0, 0,
-    1, 30, 0, 0, 0, 0,
-    1, 31, 0, 0, 0, 0,
-    1, 32, 0, 0, 0, 0,
-    1, 33, 0, 0, 0, 0,
-    1, 34, 0, 0, 0, 0,
-    1, 35, 0, 0, 0, 0,
-    1, 36, 0, 0, 0, 0,
-    1, 37, 0, 0, 0, 0,
-    1, 38, 0, 0, 0, 0,
-    1, 39, 0, 0, 0, 0,
-    1, 40, 0, 0, 0, 0,
-    1, 41, 0, 0, 0, 0,
-    1, 42, 0, 0, 0, 0,
-    1, 43, 0, 0, 0, 0,
-    1, 44, 0, 0, 0, 0,
-    1, 45, 0, 0, 0, 0,
-    1, 46, 0, 0, 0, 0,
-    1, 47, 0, 0, 0, 0,
-    1, 48, 0, 0, 0, 0,
-    1, 49, 0, 0, 0, 0,
-    1, 50, 0, 0, 0, 0,
-    1, 51, 0, 0, 0, 0,
-    1, 52, 0, 0, 0, 0,
-    1, 53, 0, 0, 0, 0,
-    1, 54, 0, 0, 0, 0,
-    1, 55, 0, 0, 0, 0,
-    1, 56, 0, 0, 0, 0,
-    1, 57, 0, 0, 0, 0,
-    1, 58, 0, 0, 0, 0,
-    1, 59, 0, 0, 0, 0,
-    1, 60, 0, 0, 0, 0,
-    1, 61, 0, 0, 0, 0,
-    1, 62, 0, 0, 0, 0,
-    1, 63, 0, 0, 0, 0,
-    1, 64, 0, 0, 0, 0,
-    1, 65, 0, 0, 0, 0,
-    1, 66, 0, 0, 0, 0,
-    1, 67, 0, 0, 0, 0,
-    1, 68, 0, 0, 0, 0,
-    1, 69, 0, 0, 0, 0,
-    1, 70, 0, 0, 0, 0,
-    1, 71, 0, 0, 0, 0,
-    1, 72, 0, 0, 0, 0,
-    1, 73, 0, 0, 0, 0,
-    1, 74, 0, 0, 0, 0,
-    1, 75, 0, 0, 0, 0,
-    1, 76, 0, 0, 0, 0,
-    1, 77, 0, 0, 0, 0,
-    1, 78, 0, 0, 0, 0,
-    1, 79, 0, 0, 0, 0,
-    1, 80, 0, 0, 0, 0,
-    1, 81, 0, 0, 0, 0,
-    1, 82, 0, 0, 0, 0,
-    1, 83, 0, 0, 0, 0,
-    1, 84, 0, 0, 0, 0,
-    1, 85, 0, 0, 0, 0,
-    1, 86, 0, 0, 0, 0,
-    1, 87, 0, 0, 0, 0,
-    1, 88, 0, 0, 0, 0,
-    1, 89, 0, 0, 0, 0,
-    1, 90, 0, 0, 0, 0,
-    1, 91, 0, 0, 0, 0,
-    1, 92, 0, 0, 0, 0,
-    1, 93, 0, 0, 0, 0,
-    1, 94, 0, 0, 0, 0,
-    1, 95, 0, 0, 0, 0,
-    1, 96, 0, 0, 0, 0,
-    1, 97, 0, 0, 0, 0,
-    1, 98, 0, 0, 0, 0,
-    1, 99, 0, 0, 0, 0,
-    1, 100, 0, 0, 0, 0,
-    1, 101, 0, 0, 0, 0,
-    1, 102, 0, 0, 0, 0,
-    1, 103, 0, 0, 0, 0,
-    1, 104, 0, 0, 0, 0,
-    1, 105, 0, 0, 0, 0,
-    1, 106, 0, 0, 0, 0,
-    1, 107, 0, 0, 0, 0,
-    1, 108, 0, 0, 0, 0,
-    1, 109, 0, 0, 0, 0,
-    1, 110, 0, 0, 0, 0,
-    1, 111, 0, 0, 0, 0,
-    1, 112, 0, 0, 0, 0,
-    1, 113, 0, 0, 0, 0,
-    1, 114, 0, 0, 0, 0,
-    1, 115, 0, 0, 0, 0,
-    1, 116, 0, 0, 0, 0,
-    1, 117, 0, 0, 0, 0,
-    1, 118, 0, 0, 0, 0,
-    1, 119, 0, 0, 0, 0,
-    1, 120, 0, 0, 0, 0,
-    1, 121, 0, 0, 0, 0,
-    1, 122, 0, 0, 0, 0,
-    1, 123, 0, 0, 0, 0,
-    1, 124, 0, 0, 0, 0,
-    1, 125, 0, 0, 0, 0,
-    1, 126, 0, 0, 0, 0,
-    1, 127, 0, 0, 0, 0,
-    3, -30, -126, -84, 0, 0,
-    1, 32, 0, 0, 0, 0, // not part of this charset
-    3, -30, -128, -102, 0, 0,
-    1, 32, 0, 0, 0, 0, // not part of this charset
-    3, -30, -128, -98, 0, 0,
-    3, -30, -128, -90, 0, 0,
-    3, -30, -128, -96, 0, 0,
-    3, -30, -128, -95, 0, 0,
-    1, 32, 0, 0, 0, 0, // not part of this charset
-    3, -30, -128, -80, 0, 0,
-    2, -59, -96, 0, 0, 0,
-    3, -30, -128, -71, 0, 0,
-    2, -59, -102, 0, 0, 0,
-    2, -59, -92, 0, 0, 0,
-    2, -59, -67, 0, 0, 0,
-    2, -59, -71, 0, 0, 0,
-    1, 32, 0, 0, 0, 0, // not part of this charset
-    3, -30, -128, -104, 0, 0,
-    3, -30, -128, -103, 0, 0,
-    3, -30, -128, -100, 0, 0,
-    3, -30, -128, -99, 0, 0,
-    3, -30, -128, -94, 0, 0,
-    3, -30, -128, -109, 0, 0,
-    3, -30, -128, -108, 0, 0,
-    1, 32, 0, 0, 0, 0, // not part of this charset
-    3, -30, -124, -94, 0, 0,
-    2, -59, -95, 0, 0, 0,
-    3, -30, -128, -70, 0, 0,
-    2, -59, -101, 0, 0, 0,
-    2, -59, -91, 0, 0, 0,
-    2, -59, -66, 0, 0, 0,
-    2, -59, -70, 0, 0, 0,
-    2, -62, -96, 0, 0, 0,
-    2, -53, -121, 0, 0, 0,
-    2, -53, -104, 0, 0, 0,
-    2, -59, -127, 0, 0, 0,
-    2, -62, -92, 0, 0, 0,
-    2, -60, -124, 0, 0, 0,
-    2, -62, -90, 0, 0, 0,
-    2, -62, -89, 0, 0, 0,
-    2, -62, -88, 0, 0, 0,
-    2, -62, -87, 0, 0, 0,
-    2, -59, -98, 0, 0, 0,
-    2, -62, -85, 0, 0, 0,
-    2, -62, -84, 0, 0, 0,
-    2, -62, -83, 0, 0, 0,
-    2, -62, -82, 0, 0, 0,
-    2, -59, -69, 0, 0, 0,
-    2, -62, -80, 0, 0, 0,
-    2, -62, -79, 0, 0, 0,
-    2, -53, -101, 0, 0, 0,
-    2, -59, -126, 0, 0, 0,
-    2, -62, -76, 0, 0, 0,
-    2, -62, -75, 0, 0, 0,
-    2, -62, -74, 0, 0, 0,
-    2, -62, -73, 0, 0, 0,
-    2, -62, -72, 0, 0, 0,
-    2, -60, -123, 0, 0, 0,
-    2, -59, -97, 0, 0, 0,
-    2, -62, -69, 0, 0, 0,
-    2, -60, -67, 0, 0, 0,
-    2, -53, -99, 0, 0, 0,
-    2, -60, -66, 0, 0, 0,
-    2, -59, -68, 0, 0, 0,
-    2, -59, -108, 0, 0, 0,
-    2, -61, -127, 0, 0, 0,
-    2, -61, -126, 0, 0, 0,
-    2, -60, -126, 0, 0, 0,
-    2, -61, -124, 0, 0, 0,
-    2, -60, -71, 0, 0, 0,
-    2, -60, -122, 0, 0, 0,
-    2, -61, -121, 0, 0, 0,
-    2, -60, -116, 0, 0, 0,
-    2, -61, -119, 0, 0, 0,
-    2, -60, -104, 0, 0, 0,
-    2, -61, -117, 0, 0, 0,
-    2, -60, -102, 0, 0, 0,
-    2, -61, -115, 0, 0, 0,
-    2, -61, -114, 0, 0, 0,
-    2, -60, -114, 0, 0, 0,
-    2, -60, -112, 0, 0, 0,
-    2, -59, -125, 0, 0, 0,
-    2, -59, -121, 0, 0, 0,
-    2, -61, -109, 0, 0, 0,
-    2, -61, -108, 0, 0, 0,
-    2, -59, -112, 0, 0, 0,
-    2, -61, -106, 0, 0, 0,
-    2, -61, -105, 0, 0, 0,
-    2, -59, -104, 0, 0, 0,
-    2, -59, -82, 0, 0, 0,
-    2, -61, -102, 0, 0, 0,
-    2, -59, -80, 0, 0, 0,
-    2, -61, -100, 0, 0, 0,
-    2, -61, -99, 0, 0, 0,
-    2, -59, -94, 0, 0, 0,
-    2, -61, -97, 0, 0, 0,
-    2, -59, -107, 0, 0, 0,
-    2, -61, -95, 0, 0, 0,
-    2, -61, -94, 0, 0, 0,
-    2, -60, -125, 0, 0, 0,
-    2, -61, -92, 0, 0, 0,
-    2, -60, -70, 0, 0, 0,
-    2, -60, -121, 0, 0, 0,
-    2, -61, -89, 0, 0, 0,
-    2, -60, -115, 0, 0, 0,
-    2, -61, -87, 0, 0, 0,
-    2, -60, -103, 0, 0, 0,
-    2, -61, -85, 0, 0, 0,
-    2, -60, -101, 0, 0, 0,
-    2, -61, -83, 0, 0, 0,
-    2, -61, -82, 0, 0, 0,
-    2, -60, -113, 0, 0, 0,
-    2, -60, -111, 0, 0, 0,
-    2, -59, -124, 0, 0, 0,
-    2, -59, -120, 0, 0, 0,
-    2, -61, -77, 0, 0, 0,
-    2, -61, -76, 0, 0, 0,
-    2, -59, -111, 0, 0, 0,
-    2, -61, -74, 0, 0, 0,
-    2, -61, -73, 0, 0, 0,
-    2, -59, -103, 0, 0, 0,
-    2, -59, -81, 0, 0, 0,
-    2, -61, -70, 0, 0, 0,
-    2, -59, -79, 0, 0, 0,
-    2, -61, -68, 0, 0, 0,
-    2, -61, -67, 0, 0, 0,
-    2, -59, -93, 0, 0, 0,
-    2, -53, -103, 0, 0, 0
-};
-
-/// Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic
-/// and other languages
-const static signed char windows_1251[] =
-{
-    1, 0, 0, 0, 0, 0,
-    1, 1, 0, 0, 0, 0,
-    1, 2, 0, 0, 0, 0,
-    1, 3, 0, 0, 0, 0,
-    1, 4, 0, 0, 0, 0,
-    1, 5, 0, 0, 0, 0,
-    1, 6, 0, 0, 0, 0,
-    1, 7, 0, 0, 0, 0,
-    1, 8, 0, 0, 0, 0,
-    1, 9, 0, 0, 0, 0,
-    1, 10, 0, 0, 0, 0,
-    1, 11, 0, 0, 0, 0,
-    1, 12, 0, 0, 0, 0,
-    1, 13, 0, 0, 0, 0,
-    1, 14, 0, 0, 0, 0,
-    1, 15, 0, 0, 0, 0,
-    1, 16, 0, 0, 0, 0,
-    1, 17, 0, 0, 0, 0,
-    1, 18, 0, 0, 0, 0,
-    1, 19, 0, 0, 0, 0,
-    1, 20, 0, 0, 0, 0,
-    1, 21, 0, 0, 0, 0,
-    1, 22, 0, 0, 0, 0,
-    1, 23, 0, 0, 0, 0,
-    1, 24, 0, 0, 0, 0,
-    1, 25, 0, 0, 0, 0,
-    1, 26, 0, 0, 0, 0,
-    1, 27, 0, 0, 0, 0,
-    1, 28, 0, 0, 0, 0,
-    1, 29, 0, 0, 0, 0,
-    1, 30, 0, 0, 0, 0,
-    1, 31, 0, 0, 0, 0,
-    1, 32, 0, 0, 0, 0,
-    1, 33, 0, 0, 0, 0,
-    1, 34, 0, 0, 0, 0,
-    1, 35, 0, 0, 0, 0,
-    1, 36, 0, 0, 0, 0,
-    1, 37, 0, 0, 0, 0,
-    1, 38, 0, 0, 0, 0,
-    1, 39, 0, 0, 0, 0,
-    1, 40, 0, 0, 0, 0,
-    1, 41, 0, 0, 0, 0,
-    1, 42, 0, 0, 0, 0,
-    1, 43, 0, 0, 0, 0,
-    1, 44, 0, 0, 0, 0,
-    1, 45, 0, 0, 0, 0,
-    1, 46, 0, 0, 0, 0,
-    1, 47, 0, 0, 0, 0,
-    1, 48, 0, 0, 0, 0,
-    1, 49, 0, 0, 0, 0,
-    1, 50, 0, 0, 0, 0,
-    1, 51, 0, 0, 0, 0,
-    1, 52, 0, 0, 0, 0,
-    1, 53, 0, 0, 0, 0,
-    1, 54, 0, 0, 0, 0,
-    1, 55, 0, 0, 0, 0,
-    1, 56, 0, 0, 0, 0,
-    1, 57, 0, 0, 0, 0,
-    1, 58, 0, 0, 0, 0,
-    1, 59, 0, 0, 0, 0,
-    1, 60, 0, 0, 0, 0,
-    1, 61, 0, 0, 0, 0,
-    1, 62, 0, 0, 0, 0,
-    1, 63, 0, 0, 0, 0,
-    1, 64, 0, 0, 0, 0,
-    1, 65, 0, 0, 0, 0,
-    1, 66, 0, 0, 0, 0,
-    1, 67, 0, 0, 0, 0,
-    1, 68, 0, 0, 0, 0,
-    1, 69, 0, 0, 0, 0,
-    1, 70, 0, 0, 0, 0,
-    1, 71, 0, 0, 0, 0,
-    1, 72, 0, 0, 0, 0,
-    1, 73, 0, 0, 0, 0,
-    1, 74, 0, 0, 0, 0,
-    1, 75, 0, 0, 0, 0,
-    1, 76, 0, 0, 0, 0,
-    1, 77, 0, 0, 0, 0,
-    1, 78, 0, 0, 0, 0,
-    1, 79, 0, 0, 0, 0,
-    1, 80, 0, 0, 0, 0,
-    1, 81, 0, 0, 0, 0,
-    1, 82, 0, 0, 0, 0,
-    1, 83, 0, 0, 0, 0,
-    1, 84, 0, 0, 0, 0,
-    1, 85, 0, 0, 0, 0,
-    1, 86, 0, 0, 0, 0,
-    1, 87, 0, 0, 0, 0,
-    1, 88, 0, 0, 0, 0,
-    1, 89, 0, 0, 0, 0,
-    1, 90, 0, 0, 0, 0,
-    1, 91, 0, 0, 0, 0,
-    1, 92, 0, 0, 0, 0,
-    1, 93, 0, 0, 0, 0,
-    1, 94, 0, 0, 0, 0,
-    1, 95, 0, 0, 0, 0,
-    1, 96, 0, 0, 0, 0,
-    1, 97, 0, 0, 0, 0,
-    1, 98, 0, 0, 0, 0,
-    1, 99, 0, 0, 0, 0,
-    1, 100, 0, 0, 0, 0,
-    1, 101, 0, 0, 0, 0,
-    1, 102, 0, 0, 0, 0,
-    1, 103, 0, 0, 0, 0,
-    1, 104, 0, 0, 0, 0,
-    1, 105, 0, 0, 0, 0,
-    1, 106, 0, 0, 0, 0,
-    1, 107, 0, 0, 0, 0,
-    1, 108, 0, 0, 0, 0,
-    1, 109, 0, 0, 0, 0,
-    1, 110, 0, 0, 0, 0,
-    1, 111, 0, 0, 0, 0,
-    1, 112, 0, 0, 0, 0,
-    1, 113, 0, 0, 0, 0,
-    1, 114, 0, 0, 0, 0,
-    1, 115, 0, 0, 0, 0,
-    1, 116, 0, 0, 0, 0,
-    1, 117, 0, 0, 0, 0,
-    1, 118, 0, 0, 0, 0,
-    1, 119, 0, 0, 0, 0,
-    1, 120, 0, 0, 0, 0,
-    1, 121, 0, 0, 0, 0,
-    1, 122, 0, 0, 0, 0,
-    1, 123, 0, 0, 0, 0,
-    1, 124, 0, 0, 0, 0,
-    1, 125, 0, 0, 0, 0,
-    1, 126, 0, 0, 0, 0,
-    1, 127, 0, 0, 0, 0,
-    2, -48, -126, 0, 0, 0,
-    2, -48, -125, 0, 0, 0,
-    3, -30, -128, -102, 0, 0,
-    2, -47, -109, 0, 0, 0,
-    3, -30, -128, -98, 0, 0,
-    3, -30, -128, -90, 0, 0,
-    3, -30, -128, -96, 0, 0,
-    3, -30, -128, -95, 0, 0,
-    3, -30, -126, -84, 0, 0,
-    3, -30, -128, -80, 0, 0,
-    2, -48, -119, 0, 0, 0,
-    3, -30, -128, -71, 0, 0,
-    2, -48, -118, 0, 0, 0,
-    2, -48, -116, 0, 0, 0,
-    2, -48, -117, 0, 0, 0,
-    2, -48, -113, 0, 0, 0,
-    2, -47, -110, 0, 0, 0,
-    3, -30, -128, -104, 0, 0,
-    3, -30, -128, -103, 0, 0,
-    3, -30, -128, -100, 0, 0,
-    3, -30, -128, -99, 0, 0,
-    3, -30, -128, -94, 0, 0,
-    3, -30, -128, -109, 0, 0,
-    3, -30, -128, -108, 0, 0,
-    1, 32, 0, 0, 0, 0, // not part of this charset
-    3, -30, -124, -94, 0, 0,
-    2, -47, -103, 0, 0, 0,
-    3, -30, -128, -70, 0, 0,
-    2, -47, -102, 0, 0, 0,
-    2, -47, -100, 0, 0, 0,
-    2, -47, -101, 0, 0, 0,
-    2, -47, -97, 0, 0, 0,
-    2, -62, -96, 0, 0, 0,
-    2, -48, -114, 0, 0, 0,
-    2, -47, -98, 0, 0, 0,
-    2, -48, -120, 0, 0, 0,
-    2, -62, -92, 0, 0, 0,
-    2, -46, -112, 0, 0, 0,
-    2, -62, -90, 0, 0, 0,
-    2, -62, -89, 0, 0, 0,
-    2, -48, -127, 0, 0, 0,
-    2, -62, -87, 0, 0, 0,
-    2, -48, -124, 0, 0, 0,
-    2, -62, -85, 0, 0, 0,
-    2, -62, -84, 0, 0, 0,
-    2, -62, -83, 0, 0, 0,
-    2, -62, -82, 0, 0, 0,
-    2, -48, -121, 0, 0, 0,
-    2, -62, -80, 0, 0, 0,
-    2, -62, -79, 0, 0, 0,
-    2, -48, -122, 0, 0, 0,
-    2, -47, -106, 0, 0, 0,
-    2, -46, -111, 0, 0, 0,
-    2, -62, -75, 0, 0, 0,
-    2, -62, -74, 0, 0, 0,
-    2, -62, -73, 0, 0, 0,
-    2, -47, -111, 0, 0, 0,
-    3, -30, -124, -106, 0, 0,
-    2, -47, -108, 0, 0, 0,
-    2, -62, -69, 0, 0, 0,
-    2, -47, -104, 0, 0, 0,
-    2, -48, -123, 0, 0, 0,
-    2, -47, -107, 0, 0, 0,
-    2, -47, -105, 0, 0, 0,
-    2, -48, -112, 0, 0, 0,
-    2, -48, -111, 0, 0, 0,
-    2, -48, -110, 0, 0, 0,
-    2, -48, -109, 0, 0, 0,
-    2, -48, -108, 0, 0, 0,
-    2, -48, -107, 0, 0, 0,
-    2, -48, -106, 0, 0, 0,
-    2, -48, -105, 0, 0, 0,
-    2, -48, -104, 0, 0, 0,
-    2, -48, -103, 0, 0, 0,
-    2, -48, -102, 0, 0, 0,
-    2, -48, -101, 0, 0, 0,
-    2, -48, -100, 0, 0, 0,
-    2, -48, -99, 0, 0, 0,
-    2, -48, -98, 0, 0, 0,
-    2, -48, -97, 0, 0, 0,
-    2, -48, -96, 0, 0, 0,
-    2, -48, -95, 0, 0, 0,
-    2, -48, -94, 0, 0, 0,
-    2, -48, -93, 0, 0, 0,
-    2, -48, -92, 0, 0, 0,
-    2, -48, -91, 0, 0, 0,
-    2, -48, -90, 0, 0, 0,
-    2, -48, -89, 0, 0, 0,
-    2, -48, -88, 0, 0, 0,
-    2, -48, -87, 0, 0, 0,
-    2, -48, -86, 0, 0, 0,
-    2, -48, -85, 0, 0, 0,
-    2, -48, -84, 0, 0, 0,
-    2, -48, -83, 0, 0, 0,
-    2, -48, -82, 0, 0, 0,
-    2, -48, -81, 0, 0, 0,
-    2, -48, -80, 0, 0, 0,
-    2, -48, -79, 0, 0, 0,
-    2, -48, -78, 0, 0, 0,
-    2, -48, -77, 0, 0, 0,
-    2, -48, -76, 0, 0, 0,
-    2, -48, -75, 0, 0, 0,
-    2, -48, -74, 0, 0, 0,
-    2, -48, -73, 0, 0, 0,
-    2, -48, -72, 0, 0, 0,
-    2, -48, -71, 0, 0, 0,
-    2, -48, -70, 0, 0, 0,
-    2, -48, -69, 0, 0, 0,
-    2, -48, -68, 0, 0, 0,
-    2, -48, -67, 0, 0, 0,
-    2, -48, -66, 0, 0, 0,
-    2, -48, -65, 0, 0, 0,
-    2, -47, -128, 0, 0, 0,
-    2, -47, -127, 0, 0, 0,
-    2, -47, -126, 0, 0, 0,
-    2, -47, -125, 0, 0, 0,
-    2, -47, -124, 0, 0, 0,
-    2, -47, -123, 0, 0, 0,
-    2, -47, -122, 0, 0, 0,
-    2, -47, -121, 0, 0, 0,
-    2, -47, -120, 0, 0, 0,
-    2, -47, -119, 0, 0, 0,
-    2, -47, -118, 0, 0, 0,
-    2, -47, -117, 0, 0, 0,
-    2, -47, -116, 0, 0, 0,
-    2, -47, -115, 0, 0, 0,
-    2, -47, -114, 0, 0, 0,
-    2, -47, -113, 0, 0, 0
-};
+    /// Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic
+    /// and other languages
+    const static signed char windows_1251[] = { 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 1, 3, 0, 0, 0, 0,
+        1, 4, 0, 0, 0, 0, 1, 5, 0, 0, 0, 0, 1, 6, 0, 0, 0, 0, 1, 7, 0, 0, 0, 0, 1, 8, 0, 0, 0, 0, 1, 9, 0, 0, 0, 0, 1,
+        10, 0, 0, 0, 0, 1, 11, 0, 0, 0, 0, 1, 12, 0, 0, 0, 0, 1, 13, 0, 0, 0, 0, 1, 14, 0, 0, 0, 0, 1, 15, 0, 0, 0, 0,
+        1, 16, 0, 0, 0, 0, 1, 17, 0, 0, 0, 0, 1, 18, 0, 0, 0, 0, 1, 19, 0, 0, 0, 0, 1, 20, 0, 0, 0, 0, 1, 21, 0, 0, 0,
+        0, 1, 22, 0, 0, 0, 0, 1, 23, 0, 0, 0, 0, 1, 24, 0, 0, 0, 0, 1, 25, 0, 0, 0, 0, 1, 26, 0, 0, 0, 0, 1, 27, 0, 0,
+        0, 0, 1, 28, 0, 0, 0, 0, 1, 29, 0, 0, 0, 0, 1, 30, 0, 0, 0, 0, 1, 31, 0, 0, 0, 0, 1, 32, 0, 0, 0, 0, 1, 33, 0,
+        0, 0, 0, 1, 34, 0, 0, 0, 0, 1, 35, 0, 0, 0, 0, 1, 36, 0, 0, 0, 0, 1, 37, 0, 0, 0, 0, 1, 38, 0, 0, 0, 0, 1, 39,
+        0, 0, 0, 0, 1, 40, 0, 0, 0, 0, 1, 41, 0, 0, 0, 0, 1, 42, 0, 0, 0, 0, 1, 43, 0, 0, 0, 0, 1, 44, 0, 0, 0, 0, 1,
+        45, 0, 0, 0, 0, 1, 46, 0, 0, 0, 0, 1, 47, 0, 0, 0, 0, 1, 48, 0, 0, 0, 0, 1, 49, 0, 0, 0, 0, 1, 50, 0, 0, 0, 0,
+        1, 51, 0, 0, 0, 0, 1, 52, 0, 0, 0, 0, 1, 53, 0, 0, 0, 0, 1, 54, 0, 0, 0, 0, 1, 55, 0, 0, 0, 0, 1, 56, 0, 0, 0,
+        0, 1, 57, 0, 0, 0, 0, 1, 58, 0, 0, 0, 0, 1, 59, 0, 0, 0, 0, 1, 60, 0, 0, 0, 0, 1, 61, 0, 0, 0, 0, 1, 62, 0, 0,
+        0, 0, 1, 63, 0, 0, 0, 0, 1, 64, 0, 0, 0, 0, 1, 65, 0, 0, 0, 0, 1, 66, 0, 0, 0, 0, 1, 67, 0, 0, 0, 0, 1, 68, 0,
+        0, 0, 0, 1, 69, 0, 0, 0, 0, 1, 70, 0, 0, 0, 0, 1, 71, 0, 0, 0, 0, 1, 72, 0, 0, 0, 0, 1, 73, 0, 0, 0, 0, 1, 74,
+        0, 0, 0, 0, 1, 75, 0, 0, 0, 0, 1, 76, 0, 0, 0, 0, 1, 77, 0, 0, 0, 0, 1, 78, 0, 0, 0, 0, 1, 79, 0, 0, 0, 0, 1,
+        80, 0, 0, 0, 0, 1, 81, 0, 0, 0, 0, 1, 82, 0, 0, 0, 0, 1, 83, 0, 0, 0, 0, 1, 84, 0, 0, 0, 0, 1, 85, 0, 0, 0, 0,
+        1, 86, 0, 0, 0, 0, 1, 87, 0, 0, 0, 0, 1, 88, 0, 0, 0, 0, 1, 89, 0, 0, 0, 0, 1, 90, 0, 0, 0, 0, 1, 91, 0, 0, 0,
+        0, 1, 92, 0, 0, 0, 0, 1, 93, 0, 0, 0, 0, 1, 94, 0, 0, 0, 0, 1, 95, 0, 0, 0, 0, 1, 96, 0, 0, 0, 0, 1, 97, 0, 0,
+        0, 0, 1, 98, 0, 0, 0, 0, 1, 99, 0, 0, 0, 0, 1, 100, 0, 0, 0, 0, 1, 101, 0, 0, 0, 0, 1, 102, 0, 0, 0, 0, 1, 103,
+        0, 0, 0, 0, 1, 104, 0, 0, 0, 0, 1, 105, 0, 0, 0, 0, 1, 106, 0, 0, 0, 0, 1, 107, 0, 0, 0, 0, 1, 108, 0, 0, 0, 0,
+        1, 109, 0, 0, 0, 0, 1, 110, 0, 0, 0, 0, 1, 111, 0, 0, 0, 0, 1, 112, 0, 0, 0, 0, 1, 113, 0, 0, 0, 0, 1, 114, 0,
+        0, 0, 0, 1, 115, 0, 0, 0, 0, 1, 116, 0, 0, 0, 0, 1, 117, 0, 0, 0, 0, 1, 118, 0, 0, 0, 0, 1, 119, 0, 0, 0, 0, 1,
+        120, 0, 0, 0, 0, 1, 121, 0, 0, 0, 0, 1, 122, 0, 0, 0, 0, 1, 123, 0, 0, 0, 0, 1, 124, 0, 0, 0, 0, 1, 125, 0, 0,
+        0, 0, 1, 126, 0, 0, 0, 0, 1, 127, 0, 0, 0, 0, 2, -48, -126, 0, 0, 0, 2, -48, -125, 0, 0, 0, 3, -30, -128, -102,
+        0, 0, 2, -47, -109, 0, 0, 0, 3, -30, -128, -98, 0, 0, 3, -30, -128, -90, 0, 0, 3, -30, -128, -96, 0, 0, 3, -30,
+        -128, -95, 0, 0, 3, -30, -126, -84, 0, 0, 3, -30, -128, -80, 0, 0, 2, -48, -119, 0, 0, 0, 3, -30, -128, -71, 0,
+        0, 2, -48, -118, 0, 0, 0, 2, -48, -116, 0, 0, 0, 2, -48, -117, 0, 0, 0, 2, -48, -113, 0, 0, 0, 2, -47, -110, 0,
+        0, 0, 3, -30, -128, -104, 0, 0, 3, -30, -128, -103, 0, 0, 3, -30, -128, -100, 0, 0, 3, -30, -128, -99, 0, 0, 3,
+        -30, -128, -94, 0, 0, 3, -30, -128, -109, 0, 0, 3, -30, -128, -108, 0, 0, 1, 32, 0, 0, 0,
+        0, // not part of this charset
+        3, -30, -124, -94, 0, 0, 2, -47, -103, 0, 0, 0, 3, -30, -128, -70, 0, 0, 2, -47, -102, 0, 0, 0, 2, -47, -100, 0,
+        0, 0, 2, -47, -101, 0, 0, 0, 2, -47, -97, 0, 0, 0, 2, -62, -96, 0, 0, 0, 2, -48, -114, 0, 0, 0, 2, -47, -98, 0,
+        0, 0, 2, -48, -120, 0, 0, 0, 2, -62, -92, 0, 0, 0, 2, -46, -112, 0, 0, 0, 2, -62, -90, 0, 0, 0, 2, -62, -89, 0,
+        0, 0, 2, -48, -127, 0, 0, 0, 2, -62, -87, 0, 0, 0, 2, -48, -124, 0, 0, 0, 2, -62, -85, 0, 0, 0, 2, -62, -84, 0,
+        0, 0, 2, -62, -83, 0, 0, 0, 2, -62, -82, 0, 0, 0, 2, -48, -121, 0, 0, 0, 2, -62, -80, 0, 0, 0, 2, -62, -79, 0,
+        0, 0, 2, -48, -122, 0, 0, 0, 2, -47, -106, 0, 0, 0, 2, -46, -111, 0, 0, 0, 2, -62, -75, 0, 0, 0, 2, -62, -74, 0,
+        0, 0, 2, -62, -73, 0, 0, 0, 2, -47, -111, 0, 0, 0, 3, -30, -124, -106, 0, 0, 2, -47, -108, 0, 0, 0, 2, -62, -69,
+        0, 0, 0, 2, -47, -104, 0, 0, 0, 2, -48, -123, 0, 0, 0, 2, -47, -107, 0, 0, 0, 2, -47, -105, 0, 0, 0, 2, -48,
+        -112, 0, 0, 0, 2, -48, -111, 0, 0, 0, 2, -48, -110, 0, 0, 0, 2, -48, -109, 0, 0, 0, 2, -48, -108, 0, 0, 0, 2,
+        -48, -107, 0, 0, 0, 2, -48, -106, 0, 0, 0, 2, -48, -105, 0, 0, 0, 2, -48, -104, 0, 0, 0, 2, -48, -103, 0, 0, 0,
+        2, -48, -102, 0, 0, 0, 2, -48, -101, 0, 0, 0, 2, -48, -100, 0, 0, 0, 2, -48, -99, 0, 0, 0, 2, -48, -98, 0, 0, 0,
+        2, -48, -97, 0, 0, 0, 2, -48, -96, 0, 0, 0, 2, -48, -95, 0, 0, 0, 2, -48, -94, 0, 0, 0, 2, -48, -93, 0, 0, 0, 2,
+        -48, -92, 0, 0, 0, 2, -48, -91, 0, 0, 0, 2, -48, -90, 0, 0, 0, 2, -48, -89, 0, 0, 0, 2, -48, -88, 0, 0, 0, 2,
+        -48, -87, 0, 0, 0, 2, -48, -86, 0, 0, 0, 2, -48, -85, 0, 0, 0, 2, -48, -84, 0, 0, 0, 2, -48, -83, 0, 0, 0, 2,
+        -48, -82, 0, 0, 0, 2, -48, -81, 0, 0, 0, 2, -48, -80, 0, 0, 0, 2, -48, -79, 0, 0, 0, 2, -48, -78, 0, 0, 0, 2,
+        -48, -77, 0, 0, 0, 2, -48, -76, 0, 0, 0, 2, -48, -75, 0, 0, 0, 2, -48, -74, 0, 0, 0, 2, -48, -73, 0, 0, 0, 2,
+        -48, -72, 0, 0, 0, 2, -48, -71, 0, 0, 0, 2, -48, -70, 0, 0, 0, 2, -48, -69, 0, 0, 0, 2, -48, -68, 0, 0, 0, 2,
+        -48, -67, 0, 0, 0, 2, -48, -66, 0, 0, 0, 2, -48, -65, 0, 0, 0, 2, -47, -128, 0, 0, 0, 2, -47, -127, 0, 0, 0, 2,
+        -47, -126, 0, 0, 0, 2, -47, -125, 0, 0, 0, 2, -47, -124, 0, 0, 0, 2, -47, -123, 0, 0, 0, 2, -47, -122, 0, 0, 0,
+        2, -47, -121, 0, 0, 0, 2, -47, -120, 0, 0, 0, 2, -47, -119, 0, 0, 0, 2, -47, -118, 0, 0, 0, 2, -47, -117, 0, 0,
+        0, 2, -47, -116, 0, 0, 0, 2, -47, -115, 0, 0, 0, 2, -47, -114, 0, 0, 0, 2, -47, -113, 0, 0, 0 };
 
-/// Latin alphabet used by English and some other Western languages
-const static signed char windows_1252[] =
-{
-    1, 0, 0, 0, 0, 0,
-    1, 1, 0, 0, 0, 0,
-    1, 2, 0, 0, 0, 0,
-    1, 3, 0, 0, 0, 0,
-    1, 4, 0, 0, 0, 0,
-    1, 5, 0, 0, 0, 0,
-    1, 6, 0, 0, 0, 0,
-    1, 7, 0, 0, 0, 0,
-    1, 8, 0, 0, 0, 0,
-    1, 9, 0, 0, 0, 0,
-    1, 10, 0, 0, 0, 0,
-    1, 11, 0, 0, 0, 0,
-    1, 12, 0, 0, 0, 0,
-    1, 13, 0, 0, 0, 0,
-    1, 14, 0, 0, 0, 0,
-    1, 15, 0, 0, 0, 0,
-    1, 16, 0, 0, 0, 0,
-    1, 17, 0, 0, 0, 0,
-    1, 18, 0, 0, 0, 0,
-    1, 19, 0, 0, 0, 0,
-    1, 20, 0, 0, 0, 0,
-    1, 21, 0, 0, 0, 0,
-    1, 22, 0, 0, 0, 0,
-    1, 23, 0, 0, 0, 0,
-    1, 24, 0, 0, 0, 0,
-    1, 25, 0, 0, 0, 0,
-    1, 26, 0, 0, 0, 0,
-    1, 27, 0, 0, 0, 0,
-    1, 28, 0, 0, 0, 0,
-    1, 29, 0, 0, 0, 0,
-    1, 30, 0, 0, 0, 0,
-    1, 31, 0, 0, 0, 0,
-    1, 32, 0, 0, 0, 0,
-    1, 33, 0, 0, 0, 0,
-    1, 34, 0, 0, 0, 0,
-    1, 35, 0, 0, 0, 0,
-    1, 36, 0, 0, 0, 0,
-    1, 37, 0, 0, 0, 0,
-    1, 38, 0, 0, 0, 0,
-    1, 39, 0, 0, 0, 0,
-    1, 40, 0, 0, 0, 0,
-    1, 41, 0, 0, 0, 0,
-    1, 42, 0, 0, 0, 0,
-    1, 43, 0, 0, 0, 0,
-    1, 44, 0, 0, 0, 0,
-    1, 45, 0, 0, 0, 0,
-    1, 46, 0, 0, 0, 0,
-    1, 47, 0, 0, 0, 0,
-    1, 48, 0, 0, 0, 0,
-    1, 49, 0, 0, 0, 0,
-    1, 50, 0, 0, 0, 0,
-    1, 51, 0, 0, 0, 0,
-    1, 52, 0, 0, 0, 0,
-    1, 53, 0, 0, 0, 0,
-    1, 54, 0, 0, 0, 0,
-    1, 55, 0, 0, 0, 0,
-    1, 56, 0, 0, 0, 0,
-    1, 57, 0, 0, 0, 0,
-    1, 58, 0, 0, 0, 0,
-    1, 59, 0, 0, 0, 0,
-    1, 60, 0, 0, 0, 0,
-    1, 61, 0, 0, 0, 0,
-    1, 62, 0, 0, 0, 0,
-    1, 63, 0, 0, 0, 0,
-    1, 64, 0, 0, 0, 0,
-    1, 65, 0, 0, 0, 0,
-    1, 66, 0, 0, 0, 0,
-    1, 67, 0, 0, 0, 0,
-    1, 68, 0, 0, 0, 0,
-    1, 69, 0, 0, 0, 0,
-    1, 70, 0, 0, 0, 0,
-    1, 71, 0, 0, 0, 0,
-    1, 72, 0, 0, 0, 0,
-    1, 73, 0, 0, 0, 0,
-    1, 74, 0, 0, 0, 0,
-    1, 75, 0, 0, 0, 0,
-    1, 76, 0, 0, 0, 0,
-    1, 77, 0, 0, 0, 0,
-    1, 78, 0, 0, 0, 0,
-    1, 79, 0, 0, 0, 0,
-    1, 80, 0, 0, 0, 0,
-    1, 81, 0, 0, 0, 0,
-    1, 82, 0, 0, 0, 0,
-    1, 83, 0, 0, 0, 0,
-    1, 84, 0, 0, 0, 0,
-    1, 85, 0, 0, 0, 0,
-    1, 86, 0, 0, 0, 0,
-    1, 87, 0, 0, 0, 0,
-    1, 88, 0, 0, 0, 0,
-    1, 89, 0, 0, 0, 0,
-    1, 90, 0, 0, 0, 0,
-    1, 91, 0, 0, 0, 0,
-    1, 92, 0, 0, 0, 0,
-    1, 93, 0, 0, 0, 0,
-    1, 94, 0, 0, 0, 0,
-    1, 95, 0, 0, 0, 0,
-    1, 96, 0, 0, 0, 0,
-    1, 97, 0, 0, 0, 0,
-    1, 98, 0, 0, 0, 0,
-    1, 99, 0, 0, 0, 0,
-    1, 100, 0, 0, 0, 0,
-    1, 101, 0, 0, 0, 0,
-    1, 102, 0, 0, 0, 0,
-    1, 103, 0, 0, 0, 0,
-    1, 104, 0, 0, 0, 0,
-    1, 105, 0, 0, 0, 0,
-    1, 106, 0, 0, 0, 0,
-    1, 107, 0, 0, 0, 0,
-    1, 108, 0, 0, 0, 0,
-    1, 109, 0, 0, 0, 0,
-    1, 110, 0, 0, 0, 0,
-    1, 111, 0, 0, 0, 0,
-    1, 112, 0, 0, 0, 0,
-    1, 113, 0, 0, 0, 0,
-    1, 114, 0, 0, 0, 0,
-    1, 115, 0, 0, 0, 0,
-    1, 116, 0, 0, 0, 0,
-    1, 117, 0, 0, 0, 0,
-    1, 118, 0, 0, 0, 0,
-    1, 119, 0, 0, 0, 0,
-    1, 120, 0, 0, 0, 0,
-    1, 121, 0, 0, 0, 0,
-    1, 122, 0, 0, 0, 0,
-    1, 123, 0, 0, 0, 0,
-    1, 124, 0, 0, 0, 0,
-    1, 125, 0, 0, 0, 0,
-    1, 126, 0, 0, 0, 0,
-    1, 127, 0, 0, 0, 0,
-    3, -30, -126, -84, 0, 0,
-    1, 32, 0, 0, 0, 0, // not part of this charset
-    3, -30, -128, -102, 0, 0,
-    2, -58, -110, 0, 0, 0,
-    3, -30, -128, -98, 0, 0,
-    3, -30, -128, -90, 0, 0,
-    3, -30, -128, -96, 0, 0,
-    3, -30, -128, -95, 0, 0,
-    2, -53, -122, 0, 0, 0,
-    3, -30, -128, -80, 0, 0,
-    2, -59, -96, 0, 0, 0,
-    3, -30, -128, -71, 0, 0,
-    2, -59, -110, 0, 0, 0,
-    1, 32, 0, 0, 0, 0, // not part of this charset
-    2, -59, -67, 0, 0, 0,
-    1, 32, 0, 0, 0, 0, // not part of this charset
-    1, 32, 0, 0, 0, 0, // not part of this charset
-    3, -30, -128, -104, 0, 0,
-    3, -30, -128, -103, 0, 0,
-    3, -30, -128, -100, 0, 0,
-    3, -30, -128, -99, 0, 0,
-    3, -30, -128, -94, 0, 0,
-    3, -30, -128, -109, 0, 0,
-    3, -30, -128, -108, 0, 0,
-    2, -53, -100, 0, 0, 0,
-    3, -30, -124, -94, 0, 0,
-    2, -59, -95, 0, 0, 0,
-    3, -30, -128, -70, 0, 0,
-    2, -59, -109, 0, 0, 0,
-    1, 32, 0, 0, 0, 0, // not part of this charset
-    2, -59, -66, 0, 0, 0,
-    2, -59, -72, 0, 0, 0,
-    2, -62, -96, 0, 0, 0,
-    2, -62, -95, 0, 0, 0,
-    2, -62, -94, 0, 0, 0,
-    2, -62, -93, 0, 0, 0,
-    2, -62, -92, 0, 0, 0,
-    2, -62, -91, 0, 0, 0,
-    2, -62, -90, 0, 0, 0,
-    2, -62, -89, 0, 0, 0,
-    2, -62, -88, 0, 0, 0,
-    2, -62, -87, 0, 0, 0,
-    2, -62, -86, 0, 0, 0,
-    2, -62, -85, 0, 0, 0,
-    2, -62, -84, 0, 0, 0,
-    2, -62, -83, 0, 0, 0,
-    2, -62, -82, 0, 0, 0,
-    2, -62, -81, 0, 0, 0,
-    2, -62, -80, 0, 0, 0,
-    2, -62, -79, 0, 0, 0,
-    2, -62, -78, 0, 0, 0,
-    2, -62, -77, 0, 0, 0,
-    2, -62, -76, 0, 0, 0,
-    2, -62, -75, 0, 0, 0,
-    2, -62, -74, 0, 0, 0,
-    2, -62, -73, 0, 0, 0,
-    2, -62, -72, 0, 0, 0,
-    2, -62, -71, 0, 0, 0,
-    2, -62, -70, 0, 0, 0,
-    2, -62, -69, 0, 0, 0,
-    2, -62, -68, 0, 0, 0,
-    2, -62, -67, 0, 0, 0,
-    2, -62, -66, 0, 0, 0,
-    2, -62, -65, 0, 0, 0,
-    2, -61, -128, 0, 0, 0,
-    2, -61, -127, 0, 0, 0,
-    2, -61, -126, 0, 0, 0,
-    2, -61, -125, 0, 0, 0,
-    2, -61, -124, 0, 0, 0,
-    2, -61, -123, 0, 0, 0,
-    2, -61, -122, 0, 0, 0,
-    2, -61, -121, 0, 0, 0,
-    2, -61, -120, 0, 0, 0,
-    2, -61, -119, 0, 0, 0,
-    2, -61, -118, 0, 0, 0,
-    2, -61, -117, 0, 0, 0,
-    2, -61, -116, 0, 0, 0,
-    2, -61, -115, 0, 0, 0,
-    2, -61, -114, 0, 0, 0,
-    2, -61, -113, 0, 0, 0,
-    2, -61, -112, 0, 0, 0,
-    2, -61, -111, 0, 0, 0,
-    2, -61, -110, 0, 0, 0,
-    2, -61, -109, 0, 0, 0,
-    2, -61, -108, 0, 0, 0,
-    2, -61, -107, 0, 0, 0,
-    2, -61, -106, 0, 0, 0,
-    2, -61, -105, 0, 0, 0,
-    2, -61, -104, 0, 0, 0,
-    2, -61, -103, 0, 0, 0,
-    2, -61, -102, 0, 0, 0,
-    2, -61, -101, 0, 0, 0,
-    2, -61, -100, 0, 0, 0,
-    2, -61, -99, 0, 0, 0,
-    2, -61, -98, 0, 0, 0,
-    2, -61, -97, 0, 0, 0,
-    2, -61, -96, 0, 0, 0,
-    2, -61, -95, 0, 0, 0,
-    2, -61, -94, 0, 0, 0,
-    2, -61, -93, 0, 0, 0,
-    2, -61, -92, 0, 0, 0,
-    2, -61, -91, 0, 0, 0,
-    2, -61, -90, 0, 0, 0,
-    2, -61, -89, 0, 0, 0,
-    2, -61, -88, 0, 0, 0,
-    2, -61, -87, 0, 0, 0,
-    2, -61, -86, 0, 0, 0,
-    2, -61, -85, 0, 0, 0,
-    2, -61, -84, 0, 0, 0,
-    2, -61, -83, 0, 0, 0,
-    2, -61, -82, 0, 0, 0,
-    2, -61, -81, 0, 0, 0,
-    2, -61, -80, 0, 0, 0,
-    2, -61, -79, 0, 0, 0,
-    2, -61, -78, 0, 0, 0,
-    2, -61, -77, 0, 0, 0,
-    2, -61, -76, 0, 0, 0,
-    2, -61, -75, 0, 0, 0,
-    2, -61, -74, 0, 0, 0,
-    2, -61, -73, 0, 0, 0,
-    2, -61, -72, 0, 0, 0,
-    2, -61, -71, 0, 0, 0,
-    2, -61, -70, 0, 0, 0,
-    2, -61, -69, 0, 0, 0,
-    2, -61, -68, 0, 0, 0,
-    2, -61, -67, 0, 0, 0,
-    2, -61, -66, 0, 0, 0,
-    2, -61, -65, 0, 0, 0
-};
-const static signed char cp437[] =
-{
-    1, 0, 0, 0, 0, 0,
-    1, 1, 0, 0, 0, 0,
-    1, 2, 0, 0, 0, 0,
-    1, 3, 0, 0, 0, 0,
-    1, 4, 0, 0, 0, 0,
-    1, 5, 0, 0, 0, 0,
-    1, 6, 0, 0, 0, 0,
-    1, 7, 0, 0, 0, 0,
-    1, 8, 0, 0, 0, 0,
-    1, 9, 0, 0, 0, 0,
-    1, 10, 0, 0, 0, 0,
-    1, 11, 0, 0, 0, 0,
-    1, 12, 0, 0, 0, 0,
-    1, 13, 0, 0, 0, 0,
-    1, 14, 0, 0, 0, 0,
-    1, 15, 0, 0, 0, 0,
-    1, 16, 0, 0, 0, 0,
-    1, 17, 0, 0, 0, 0,
-    1, 18, 0, 0, 0, 0,
-    1, 19, 0, 0, 0, 0,
-    1, 20, 0, 0, 0, 0,
-    1, 21, 0, 0, 0, 0,
-    1, 22, 0, 0, 0, 0,
-    1, 23, 0, 0, 0, 0,
-    1, 24, 0, 0, 0, 0,
-    1, 25, 0, 0, 0, 0,
-    1, 26, 0, 0, 0, 0,
-    1, 27, 0, 0, 0, 0,
-    1, 28, 0, 0, 0, 0,
-    1, 29, 0, 0, 0, 0,
-    1, 30, 0, 0, 0, 0,
-    1, 31, 0, 0, 0, 0,
-    1, 32, 0, 0, 0, 0,
-    1, 33, 0, 0, 0, 0,
-    1, 34, 0, 0, 0, 0,
-    1, 35, 0, 0, 0, 0,
-    1, 36, 0, 0, 0, 0,
-    1, 37, 0, 0, 0, 0,
-    1, 38, 0, 0, 0, 0,
-    1, 39, 0, 0, 0, 0,
-    1, 40, 0, 0, 0, 0,
-    1, 41, 0, 0, 0, 0,
-    1, 42, 0, 0, 0, 0,
-    1, 43, 0, 0, 0, 0,
-    1, 44, 0, 0, 0, 0,
-    1, 45, 0, 0, 0, 0,
-    1, 46, 0, 0, 0, 0,
-    1, 47, 0, 0, 0, 0,
-    1, 48, 0, 0, 0, 0,
-    1, 49, 0, 0, 0, 0,
-    1, 50, 0, 0, 0, 0,
-    1, 51, 0, 0, 0, 0,
-    1, 52, 0, 0, 0, 0,
-    1, 53, 0, 0, 0, 0,
-    1, 54, 0, 0, 0, 0,
-    1, 55, 0, 0, 0, 0,
-    1, 56, 0, 0, 0, 0,
-    1, 57, 0, 0, 0, 0,
-    1, 58, 0, 0, 0, 0,
-    1, 59, 0, 0, 0, 0,
-    1, 60, 0, 0, 0, 0,
-    1, 61, 0, 0, 0, 0,
-    1, 62, 0, 0, 0, 0,
-    1, 63, 0, 0, 0, 0,
-    1, 64, 0, 0, 0, 0,
-    1, 65, 0, 0, 0, 0,
-    1, 66, 0, 0, 0, 0,
-    1, 67, 0, 0, 0, 0,
-    1, 68, 0, 0, 0, 0,
-    1, 69, 0, 0, 0, 0,
-    1, 70, 0, 0, 0, 0,
-    1, 71, 0, 0, 0, 0,
-    1, 72, 0, 0, 0, 0,
-    1, 73, 0, 0, 0, 0,
-    1, 74, 0, 0, 0, 0,
-    1, 75, 0, 0, 0, 0,
-    1, 76, 0, 0, 0, 0,
-    1, 77, 0, 0, 0, 0,
-    1, 78, 0, 0, 0, 0,
-    1, 79, 0, 0, 0, 0,
-    1, 80, 0, 0, 0, 0,
-    1, 81, 0, 0, 0, 0,
-    1, 82, 0, 0, 0, 0,
-    1, 83, 0, 0, 0, 0,
-    1, 84, 0, 0, 0, 0,
-    1, 85, 0, 0, 0, 0,
-    1, 86, 0, 0, 0, 0,
-    1, 87, 0, 0, 0, 0,
-    1, 88, 0, 0, 0, 0,
-    1, 89, 0, 0, 0, 0,
-    1, 90, 0, 0, 0, 0,
-    1, 91, 0, 0, 0, 0,
-    1, 92, 0, 0, 0, 0,
-    1, 93, 0, 0, 0, 0,
-    1, 94, 0, 0, 0, 0,
-    1, 95, 0, 0, 0, 0,
-    1, 96, 0, 0, 0, 0,
-    1, 97, 0, 0, 0, 0,
-    1, 98, 0, 0, 0, 0,
-    1, 99, 0, 0, 0, 0,
-    1, 100, 0, 0, 0, 0,
-    1, 101, 0, 0, 0, 0,
-    1, 102, 0, 0, 0, 0,
-    1, 103, 0, 0, 0, 0,
-    1, 104, 0, 0, 0, 0,
-    1, 105, 0, 0, 0, 0,
-    1, 106, 0, 0, 0, 0,
-    1, 107, 0, 0, 0, 0,
-    1, 108, 0, 0, 0, 0,
-    1, 109, 0, 0, 0, 0,
-    1, 110, 0, 0, 0, 0,
-    1, 111, 0, 0, 0, 0,
-    1, 112, 0, 0, 0, 0,
-    1, 113, 0, 0, 0, 0,
-    1, 114, 0, 0, 0, 0,
-    1, 115, 0, 0, 0, 0,
-    1, 116, 0, 0, 0, 0,
-    1, 117, 0, 0, 0, 0,
-    1, 118, 0, 0, 0, 0,
-    1, 119, 0, 0, 0, 0,
-    1, 120, 0, 0, 0, 0,
-    1, 121, 0, 0, 0, 0,
-    1, 122, 0, 0, 0, 0,
-    1, 123, 0, 0, 0, 0,
-    1, 124, 0, 0, 0, 0,
-    1, 125, 0, 0, 0, 0,
-    1, 126, 0, 0, 0, 0,
-    1, 127, 0, 0, 0, 0,
-    2, -61, -121, 0, 0, 0,
-    2, -61, -68, 0, 0, 0,
-    2, -61, -87, 0, 0, 0,
-    2, -61, -94, 0, 0, 0,
-    2, -61, -92, 0, 0, 0,
-    2, -61, -96, 0, 0, 0,
-    2, -61, -91, 0, 0, 0,
-    2, -61, -89, 0, 0, 0,
-    2, -61, -86, 0, 0, 0,
-    2, -61, -85, 0, 0, 0,
-    2, -61, -88, 0, 0, 0,
-    2, -61, -81, 0, 0, 0,
-    2, -61, -82, 0, 0, 0,
-    2, -61, -84, 0, 0, 0,
-    2, -61, -124, 0, 0, 0,
-    2, -61, -123, 0, 0, 0,
-    2, -61, -119, 0, 0, 0,
-    2, -61, -90, 0, 0, 0,
-    2, -61, -122, 0, 0, 0,
-    2, -61, -76, 0, 0, 0,
-    2, -61, -74, 0, 0, 0,
-    2, -61, -78, 0, 0, 0,
-    2, -61, -69, 0, 0, 0,
-    2, -61, -71, 0, 0, 0,
-    2, -61, -65, 0, 0, 0,
-    2, -61, -106, 0, 0, 0,
-    2, -61, -100, 0, 0, 0,
-    2, -62, -94, 0, 0, 0,
-    2, -62, -93, 0, 0, 0,
-    2, -62, -91, 0, 0, 0,
-    3, -30, -126, -89, 0, 0,
-    2, -58, -110, 0, 0, 0,
-    2, -61, -95, 0, 0, 0,
-    2, -61, -83, 0, 0, 0,
-    2, -61, -77, 0, 0, 0,
-    2, -61, -70, 0, 0, 0,
-    2, -61, -79, 0, 0, 0,
-    2, -61, -111, 0, 0, 0,
-    2, -62, -86, 0, 0, 0,
-    2, -62, -70, 0, 0, 0,
-    2, -62, -65, 0, 0, 0,
-    3, -30, -116, -112, 0, 0,
-    2, -62, -84, 0, 0, 0,
-    2, -62, -67, 0, 0, 0,
-    2, -62, -68, 0, 0, 0,
-    2, -62, -95, 0, 0, 0,
-    2, -62, -85, 0, 0, 0,
-    2, -62, -69, 0, 0, 0,
-    3, -30, -106, -111, 0, 0,
-    3, -30, -106, -110, 0, 0,
-    3, -30, -106, -109, 0, 0,
-    3, -30, -108, -126, 0, 0,
-    3, -30, -108, -92, 0, 0,
-    3, -30, -107, -95, 0, 0,
-    3, -30, -107, -94, 0, 0,
-    3, -30, -107, -106, 0, 0,
-    3, -30, -107, -107, 0, 0,
-    3, -30, -107, -93, 0, 0,
-    3, -30, -107, -111, 0, 0,
-    3, -30, -107, -105, 0, 0,
-    3, -30, -107, -99, 0, 0,
-    3, -30, -107, -100, 0, 0,
-    3, -30, -107, -101, 0, 0,
-    3, -30, -108, -112, 0, 0,
-    3, -30, -108, -108, 0, 0,
-    3, -30, -108, -76, 0, 0,
-    3, -30, -108, -84, 0, 0,
-    3, -30, -108, -100, 0, 0,
-    3, -30, -108, -128, 0, 0,
-    3, -30, -108, -68, 0, 0,
-    3, -30, -107, -98, 0, 0,
-    3, -30, -107, -97, 0, 0,
-    3, -30, -107, -102, 0, 0,
-    3, -30, -107, -108, 0, 0,
-    3, -30, -107, -87, 0, 0,
-    3, -30, -107, -90, 0, 0,
-    3, -30, -107, -96, 0, 0,
-    3, -30, -107, -112, 0, 0,
-    3, -30, -107, -84, 0, 0,
-    3, -30, -107, -89, 0, 0,
-    3, -30, -107, -88, 0, 0,
-    3, -30, -107, -92, 0, 0,
-    3, -30, -107, -91, 0, 0,
-    3, -30, -107, -103, 0, 0,
-    3, -30, -107, -104, 0, 0,
-    3, -30, -107, -110, 0, 0,
-    3, -30, -107, -109, 0, 0,
-    3, -30, -107, -85, 0, 0,
-    3, -30, -107, -86, 0, 0,
-    3, -30, -108, -104, 0, 0,
-    3, -30, -108, -116, 0, 0,
-    3, -30, -106, -120, 0, 0,
-    3, -30, -106, -124, 0, 0,
-    3, -30, -106, -116, 0, 0,
-    3, -30, -106, -112, 0, 0,
-    3, -30, -106, -128, 0, 0,
-    2, -50, -79, 0, 0, 0,
-    2, -61, -97, 0, 0, 0,
-    2, -50, -109, 0, 0, 0,
-    2, -49, -128, 0, 0, 0,
-    2, -50, -93, 0, 0, 0,
-    2, -49, -125, 0, 0, 0,
-    2, -62, -75, 0, 0, 0,
-    2, -49, -124, 0, 0, 0,
-    2, -50, -90, 0, 0, 0,
-    2, -50, -104, 0, 0, 0,
-    2, -50, -87, 0, 0, 0,
-    2, -50, -76, 0, 0, 0,
-    3, -30, -120, -98, 0, 0,
-    2, -49, -122, 0, 0, 0,
-    2, -50, -75, 0, 0, 0,
-    3, -30, -120, -87, 0, 0,
-    3, -30, -119, -95, 0, 0,
-    2, -62, -79, 0, 0, 0,
-    3, -30, -119, -91, 0, 0,
-    3, -30, -119, -92, 0, 0,
-    3, -30, -116, -96, 0, 0,
-    3, -30, -116, -95, 0, 0,
-    2, -61, -73, 0, 0, 0,
-    3, -30, -119, -120, 0, 0,
-    2, -62, -80, 0, 0, 0,
-    3, -30, -120, -103, 0, 0,
-    2, -62, -73, 0, 0, 0,
-    3, -30, -120, -102, 0, 0,
-    3, -30, -127, -65, 0, 0,
-    2, -62, -78, 0, 0, 0,
-    3, -30, -106, -96, 0, 0,
-    2, -62, -96, 0, 0, 0
-};
+    /// Latin alphabet used by English and some other Western languages
+    const static signed char windows_1252[] = { 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 1, 3, 0, 0, 0, 0,
+        1, 4, 0, 0, 0, 0, 1, 5, 0, 0, 0, 0, 1, 6, 0, 0, 0, 0, 1, 7, 0, 0, 0, 0, 1, 8, 0, 0, 0, 0, 1, 9, 0, 0, 0, 0, 1,
+        10, 0, 0, 0, 0, 1, 11, 0, 0, 0, 0, 1, 12, 0, 0, 0, 0, 1, 13, 0, 0, 0, 0, 1, 14, 0, 0, 0, 0, 1, 15, 0, 0, 0, 0,
+        1, 16, 0, 0, 0, 0, 1, 17, 0, 0, 0, 0, 1, 18, 0, 0, 0, 0, 1, 19, 0, 0, 0, 0, 1, 20, 0, 0, 0, 0, 1, 21, 0, 0, 0,
+        0, 1, 22, 0, 0, 0, 0, 1, 23, 0, 0, 0, 0, 1, 24, 0, 0, 0, 0, 1, 25, 0, 0, 0, 0, 1, 26, 0, 0, 0, 0, 1, 27, 0, 0,
+        0, 0, 1, 28, 0, 0, 0, 0, 1, 29, 0, 0, 0, 0, 1, 30, 0, 0, 0, 0, 1, 31, 0, 0, 0, 0, 1, 32, 0, 0, 0, 0, 1, 33, 0,
+        0, 0, 0, 1, 34, 0, 0, 0, 0, 1, 35, 0, 0, 0, 0, 1, 36, 0, 0, 0, 0, 1, 37, 0, 0, 0, 0, 1, 38, 0, 0, 0, 0, 1, 39,
+        0, 0, 0, 0, 1, 40, 0, 0, 0, 0, 1, 41, 0, 0, 0, 0, 1, 42, 0, 0, 0, 0, 1, 43, 0, 0, 0, 0, 1, 44, 0, 0, 0, 0, 1,
+        45, 0, 0, 0, 0, 1, 46, 0, 0, 0, 0, 1, 47, 0, 0, 0, 0, 1, 48, 0, 0, 0, 0, 1, 49, 0, 0, 0, 0, 1, 50, 0, 0, 0, 0,
+        1, 51, 0, 0, 0, 0, 1, 52, 0, 0, 0, 0, 1, 53, 0, 0, 0, 0, 1, 54, 0, 0, 0, 0, 1, 55, 0, 0, 0, 0, 1, 56, 0, 0, 0,
+        0, 1, 57, 0, 0, 0, 0, 1, 58, 0, 0, 0, 0, 1, 59, 0, 0, 0, 0, 1, 60, 0, 0, 0, 0, 1, 61, 0, 0, 0, 0, 1, 62, 0, 0,
+        0, 0, 1, 63, 0, 0, 0, 0, 1, 64, 0, 0, 0, 0, 1, 65, 0, 0, 0, 0, 1, 66, 0, 0, 0, 0, 1, 67, 0, 0, 0, 0, 1, 68, 0,
+        0, 0, 0, 1, 69, 0, 0, 0, 0, 1, 70, 0, 0, 0, 0, 1, 71, 0, 0, 0, 0, 1, 72, 0, 0, 0, 0, 1, 73, 0, 0, 0, 0, 1, 74,
+        0, 0, 0, 0, 1, 75, 0, 0, 0, 0, 1, 76, 0, 0, 0, 0, 1, 77, 0, 0, 0, 0, 1, 78, 0, 0, 0, 0, 1, 79, 0, 0, 0, 0, 1,
+        80, 0, 0, 0, 0, 1, 81, 0, 0, 0, 0, 1, 82, 0, 0, 0, 0, 1, 83, 0, 0, 0, 0, 1, 84, 0, 0, 0, 0, 1, 85, 0, 0, 0, 0,
+        1, 86, 0, 0, 0, 0, 1, 87, 0, 0, 0, 0, 1, 88, 0, 0, 0, 0, 1, 89, 0, 0, 0, 0, 1, 90, 0, 0, 0, 0, 1, 91, 0, 0, 0,
+        0, 1, 92, 0, 0, 0, 0, 1, 93, 0, 0, 0, 0, 1, 94, 0, 0, 0, 0, 1, 95, 0, 0, 0, 0, 1, 96, 0, 0, 0, 0, 1, 97, 0, 0,
+        0, 0, 1, 98, 0, 0, 0, 0, 1, 99, 0, 0, 0, 0, 1, 100, 0, 0, 0, 0, 1, 101, 0, 0, 0, 0, 1, 102, 0, 0, 0, 0, 1, 103,
+        0, 0, 0, 0, 1, 104, 0, 0, 0, 0, 1, 105, 0, 0, 0, 0, 1, 106, 0, 0, 0, 0, 1, 107, 0, 0, 0, 0, 1, 108, 0, 0, 0, 0,
+        1, 109, 0, 0, 0, 0, 1, 110, 0, 0, 0, 0, 1, 111, 0, 0, 0, 0, 1, 112, 0, 0, 0, 0, 1, 113, 0, 0, 0, 0, 1, 114, 0,
+        0, 0, 0, 1, 115, 0, 0, 0, 0, 1, 116, 0, 0, 0, 0, 1, 117, 0, 0, 0, 0, 1, 118, 0, 0, 0, 0, 1, 119, 0, 0, 0, 0, 1,
+        120, 0, 0, 0, 0, 1, 121, 0, 0, 0, 0, 1, 122, 0, 0, 0, 0, 1, 123, 0, 0, 0, 0, 1, 124, 0, 0, 0, 0, 1, 125, 0, 0,
+        0, 0, 1, 126, 0, 0, 0, 0, 1, 127, 0, 0, 0, 0, 3, -30, -126, -84, 0, 0, 1, 32, 0, 0, 0,
+        0, // not part of this charset
+        3, -30, -128, -102, 0, 0, 2, -58, -110, 0, 0, 0, 3, -30, -128, -98, 0, 0, 3, -30, -128, -90, 0, 0, 3, -30, -128,
+        -96, 0, 0, 3, -30, -128, -95, 0, 0, 2, -53, -122, 0, 0, 0, 3, -30, -128, -80, 0, 0, 2, -59, -96, 0, 0, 0, 3,
+        -30, -128, -71, 0, 0, 2, -59, -110, 0, 0, 0, 1, 32, 0, 0, 0, 0, // not part of this charset
+        2, -59, -67, 0, 0, 0, 1, 32, 0, 0, 0, 0, // not part of this charset
+        1, 32, 0, 0, 0, 0, // not part of this charset
+        3, -30, -128, -104, 0, 0, 3, -30, -128, -103, 0, 0, 3, -30, -128, -100, 0, 0, 3, -30, -128, -99, 0, 0, 3, -30,
+        -128, -94, 0, 0, 3, -30, -128, -109, 0, 0, 3, -30, -128, -108, 0, 0, 2, -53, -100, 0, 0, 0, 3, -30, -124, -94,
+        0, 0, 2, -59, -95, 0, 0, 0, 3, -30, -128, -70, 0, 0, 2, -59, -109, 0, 0, 0, 1, 32, 0, 0, 0,
+        0, // not part of this charset
+        2, -59, -66, 0, 0, 0, 2, -59, -72, 0, 0, 0, 2, -62, -96, 0, 0, 0, 2, -62, -95, 0, 0, 0, 2, -62, -94, 0, 0, 0, 2,
+        -62, -93, 0, 0, 0, 2, -62, -92, 0, 0, 0, 2, -62, -91, 0, 0, 0, 2, -62, -90, 0, 0, 0, 2, -62, -89, 0, 0, 0, 2,
+        -62, -88, 0, 0, 0, 2, -62, -87, 0, 0, 0, 2, -62, -86, 0, 0, 0, 2, -62, -85, 0, 0, 0, 2, -62, -84, 0, 0, 0, 2,
+        -62, -83, 0, 0, 0, 2, -62, -82, 0, 0, 0, 2, -62, -81, 0, 0, 0, 2, -62, -80, 0, 0, 0, 2, -62, -79, 0, 0, 0, 2,
+        -62, -78, 0, 0, 0, 2, -62, -77, 0, 0, 0, 2, -62, -76, 0, 0, 0, 2, -62, -75, 0, 0, 0, 2, -62, -74, 0, 0, 0, 2,
+        -62, -73, 0, 0, 0, 2, -62, -72, 0, 0, 0, 2, -62, -71, 0, 0, 0, 2, -62, -70, 0, 0, 0, 2, -62, -69, 0, 0, 0, 2,
+        -62, -68, 0, 0, 0, 2, -62, -67, 0, 0, 0, 2, -62, -66, 0, 0, 0, 2, -62, -65, 0, 0, 0, 2, -61, -128, 0, 0, 0, 2,
+        -61, -127, 0, 0, 0, 2, -61, -126, 0, 0, 0, 2, -61, -125, 0, 0, 0, 2, -61, -124, 0, 0, 0, 2, -61, -123, 0, 0, 0,
+        2, -61, -122, 0, 0, 0, 2, -61, -121, 0, 0, 0, 2, -61, -120, 0, 0, 0, 2, -61, -119, 0, 0, 0, 2, -61, -118, 0, 0,
+        0, 2, -61, -117, 0, 0, 0, 2, -61, -116, 0, 0, 0, 2, -61, -115, 0, 0, 0, 2, -61, -114, 0, 0, 0, 2, -61, -113, 0,
+        0, 0, 2, -61, -112, 0, 0, 0, 2, -61, -111, 0, 0, 0, 2, -61, -110, 0, 0, 0, 2, -61, -109, 0, 0, 0, 2, -61, -108,
+        0, 0, 0, 2, -61, -107, 0, 0, 0, 2, -61, -106, 0, 0, 0, 2, -61, -105, 0, 0, 0, 2, -61, -104, 0, 0, 0, 2, -61,
+        -103, 0, 0, 0, 2, -61, -102, 0, 0, 0, 2, -61, -101, 0, 0, 0, 2, -61, -100, 0, 0, 0, 2, -61, -99, 0, 0, 0, 2,
+        -61, -98, 0, 0, 0, 2, -61, -97, 0, 0, 0, 2, -61, -96, 0, 0, 0, 2, -61, -95, 0, 0, 0, 2, -61, -94, 0, 0, 0, 2,
+        -61, -93, 0, 0, 0, 2, -61, -92, 0, 0, 0, 2, -61, -91, 0, 0, 0, 2, -61, -90, 0, 0, 0, 2, -61, -89, 0, 0, 0, 2,
+        -61, -88, 0, 0, 0, 2, -61, -87, 0, 0, 0, 2, -61, -86, 0, 0, 0, 2, -61, -85, 0, 0, 0, 2, -61, -84, 0, 0, 0, 2,
+        -61, -83, 0, 0, 0, 2, -61, -82, 0, 0, 0, 2, -61, -81, 0, 0, 0, 2, -61, -80, 0, 0, 0, 2, -61, -79, 0, 0, 0, 2,
+        -61, -78, 0, 0, 0, 2, -61, -77, 0, 0, 0, 2, -61, -76, 0, 0, 0, 2, -61, -75, 0, 0, 0, 2, -61, -74, 0, 0, 0, 2,
+        -61, -73, 0, 0, 0, 2, -61, -72, 0, 0, 0, 2, -61, -71, 0, 0, 0, 2, -61, -70, 0, 0, 0, 2, -61, -69, 0, 0, 0, 2,
+        -61, -68, 0, 0, 0, 2, -61, -67, 0, 0, 0, 2, -61, -66, 0, 0, 0, 2, -61, -65, 0, 0, 0 };
+    const static signed char cp437[] = { 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 1, 3, 0, 0, 0, 0, 1, 4,
+        0, 0, 0, 0, 1, 5, 0, 0, 0, 0, 1, 6, 0, 0, 0, 0, 1, 7, 0, 0, 0, 0, 1, 8, 0, 0, 0, 0, 1, 9, 0, 0, 0, 0, 1, 10, 0,
+        0, 0, 0, 1, 11, 0, 0, 0, 0, 1, 12, 0, 0, 0, 0, 1, 13, 0, 0, 0, 0, 1, 14, 0, 0, 0, 0, 1, 15, 0, 0, 0, 0, 1, 16,
+        0, 0, 0, 0, 1, 17, 0, 0, 0, 0, 1, 18, 0, 0, 0, 0, 1, 19, 0, 0, 0, 0, 1, 20, 0, 0, 0, 0, 1, 21, 0, 0, 0, 0, 1,
+        22, 0, 0, 0, 0, 1, 23, 0, 0, 0, 0, 1, 24, 0, 0, 0, 0, 1, 25, 0, 0, 0, 0, 1, 26, 0, 0, 0, 0, 1, 27, 0, 0, 0, 0,
+        1, 28, 0, 0, 0, 0, 1, 29, 0, 0, 0, 0, 1, 30, 0, 0, 0, 0, 1, 31, 0, 0, 0, 0, 1, 32, 0, 0, 0, 0, 1, 33, 0, 0, 0,
+        0, 1, 34, 0, 0, 0, 0, 1, 35, 0, 0, 0, 0, 1, 36, 0, 0, 0, 0, 1, 37, 0, 0, 0, 0, 1, 38, 0, 0, 0, 0, 1, 39, 0, 0,
+        0, 0, 1, 40, 0, 0, 0, 0, 1, 41, 0, 0, 0, 0, 1, 42, 0, 0, 0, 0, 1, 43, 0, 0, 0, 0, 1, 44, 0, 0, 0, 0, 1, 45, 0,
+        0, 0, 0, 1, 46, 0, 0, 0, 0, 1, 47, 0, 0, 0, 0, 1, 48, 0, 0, 0, 0, 1, 49, 0, 0, 0, 0, 1, 50, 0, 0, 0, 0, 1, 51,
+        0, 0, 0, 0, 1, 52, 0, 0, 0, 0, 1, 53, 0, 0, 0, 0, 1, 54, 0, 0, 0, 0, 1, 55, 0, 0, 0, 0, 1, 56, 0, 0, 0, 0, 1,
+        57, 0, 0, 0, 0, 1, 58, 0, 0, 0, 0, 1, 59, 0, 0, 0, 0, 1, 60, 0, 0, 0, 0, 1, 61, 0, 0, 0, 0, 1, 62, 0, 0, 0, 0,
+        1, 63, 0, 0, 0, 0, 1, 64, 0, 0, 0, 0, 1, 65, 0, 0, 0, 0, 1, 66, 0, 0, 0, 0, 1, 67, 0, 0, 0, 0, 1, 68, 0, 0, 0,
+        0, 1, 69, 0, 0, 0, 0, 1, 70, 0, 0, 0, 0, 1, 71, 0, 0, 0, 0, 1, 72, 0, 0, 0, 0, 1, 73, 0, 0, 0, 0, 1, 74, 0, 0,
+        0, 0, 1, 75, 0, 0, 0, 0, 1, 76, 0, 0, 0, 0, 1, 77, 0, 0, 0, 0, 1, 78, 0, 0, 0, 0, 1, 79, 0, 0, 0, 0, 1, 80, 0,
+        0, 0, 0, 1, 81, 0, 0, 0, 0, 1, 82, 0, 0, 0, 0, 1, 83, 0, 0, 0, 0, 1, 84, 0, 0, 0, 0, 1, 85, 0, 0, 0, 0, 1, 86,
+        0, 0, 0, 0, 1, 87, 0, 0, 0, 0, 1, 88, 0, 0, 0, 0, 1, 89, 0, 0, 0, 0, 1, 90, 0, 0, 0, 0, 1, 91, 0, 0, 0, 0, 1,
+        92, 0, 0, 0, 0, 1, 93, 0, 0, 0, 0, 1, 94, 0, 0, 0, 0, 1, 95, 0, 0, 0, 0, 1, 96, 0, 0, 0, 0, 1, 97, 0, 0, 0, 0,
+        1, 98, 0, 0, 0, 0, 1, 99, 0, 0, 0, 0, 1, 100, 0, 0, 0, 0, 1, 101, 0, 0, 0, 0, 1, 102, 0, 0, 0, 0, 1, 103, 0, 0,
+        0, 0, 1, 104, 0, 0, 0, 0, 1, 105, 0, 0, 0, 0, 1, 106, 0, 0, 0, 0, 1, 107, 0, 0, 0, 0, 1, 108, 0, 0, 0, 0, 1,
+        109, 0, 0, 0, 0, 1, 110, 0, 0, 0, 0, 1, 111, 0, 0, 0, 0, 1, 112, 0, 0, 0, 0, 1, 113, 0, 0, 0, 0, 1, 114, 0, 0,
+        0, 0, 1, 115, 0, 0, 0, 0, 1, 116, 0, 0, 0, 0, 1, 117, 0, 0, 0, 0, 1, 118, 0, 0, 0, 0, 1, 119, 0, 0, 0, 0, 1,
+        120, 0, 0, 0, 0, 1, 121, 0, 0, 0, 0, 1, 122, 0, 0, 0, 0, 1, 123, 0, 0, 0, 0, 1, 124, 0, 0, 0, 0, 1, 125, 0, 0,
+        0, 0, 1, 126, 0, 0, 0, 0, 1, 127, 0, 0, 0, 0, 2, -61, -121, 0, 0, 0, 2, -61, -68, 0, 0, 0, 2, -61, -87, 0, 0, 0,
+        2, -61, -94, 0, 0, 0, 2, -61, -92, 0, 0, 0, 2, -61, -96, 0, 0, 0, 2, -61, -91, 0, 0, 0, 2, -61, -89, 0, 0, 0, 2,
+        -61, -86, 0, 0, 0, 2, -61, -85, 0, 0, 0, 2, -61, -88, 0, 0, 0, 2, -61, -81, 0, 0, 0, 2, -61, -82, 0, 0, 0, 2,
+        -61, -84, 0, 0, 0, 2, -61, -124, 0, 0, 0, 2, -61, -123, 0, 0, 0, 2, -61, -119, 0, 0, 0, 2, -61, -90, 0, 0, 0, 2,
+        -61, -122, 0, 0, 0, 2, -61, -76, 0, 0, 0, 2, -61, -74, 0, 0, 0, 2, -61, -78, 0, 0, 0, 2, -61, -69, 0, 0, 0, 2,
+        -61, -71, 0, 0, 0, 2, -61, -65, 0, 0, 0, 2, -61, -106, 0, 0, 0, 2, -61, -100, 0, 0, 0, 2, -62, -94, 0, 0, 0, 2,
+        -62, -93, 0, 0, 0, 2, -62, -91, 0, 0, 0, 3, -30, -126, -89, 0, 0, 2, -58, -110, 0, 0, 0, 2, -61, -95, 0, 0, 0,
+        2, -61, -83, 0, 0, 0, 2, -61, -77, 0, 0, 0, 2, -61, -70, 0, 0, 0, 2, -61, -79, 0, 0, 0, 2, -61, -111, 0, 0, 0,
+        2, -62, -86, 0, 0, 0, 2, -62, -70, 0, 0, 0, 2, -62, -65, 0, 0, 0, 3, -30, -116, -112, 0, 0, 2, -62, -84, 0, 0,
+        0, 2, -62, -67, 0, 0, 0, 2, -62, -68, 0, 0, 0, 2, -62, -95, 0, 0, 0, 2, -62, -85, 0, 0, 0, 2, -62, -69, 0, 0, 0,
+        3, -30, -106, -111, 0, 0, 3, -30, -106, -110, 0, 0, 3, -30, -106, -109, 0, 0, 3, -30, -108, -126, 0, 0, 3, -30,
+        -108, -92, 0, 0, 3, -30, -107, -95, 0, 0, 3, -30, -107, -94, 0, 0, 3, -30, -107, -106, 0, 0, 3, -30, -107, -107,
+        0, 0, 3, -30, -107, -93, 0, 0, 3, -30, -107, -111, 0, 0, 3, -30, -107, -105, 0, 0, 3, -30, -107, -99, 0, 0, 3,
+        -30, -107, -100, 0, 0, 3, -30, -107, -101, 0, 0, 3, -30, -108, -112, 0, 0, 3, -30, -108, -108, 0, 0, 3, -30,
+        -108, -76, 0, 0, 3, -30, -108, -84, 0, 0, 3, -30, -108, -100, 0, 0, 3, -30, -108, -128, 0, 0, 3, -30, -108, -68,
+        0, 0, 3, -30, -107, -98, 0, 0, 3, -30, -107, -97, 0, 0, 3, -30, -107, -102, 0, 0, 3, -30, -107, -108, 0, 0, 3,
+        -30, -107, -87, 0, 0, 3, -30, -107, -90, 0, 0, 3, -30, -107, -96, 0, 0, 3, -30, -107, -112, 0, 0, 3, -30, -107,
+        -84, 0, 0, 3, -30, -107, -89, 0, 0, 3, -30, -107, -88, 0, 0, 3, -30, -107, -92, 0, 0, 3, -30, -107, -91, 0, 0,
+        3, -30, -107, -103, 0, 0, 3, -30, -107, -104, 0, 0, 3, -30, -107, -110, 0, 0, 3, -30, -107, -109, 0, 0, 3, -30,
+        -107, -85, 0, 0, 3, -30, -107, -86, 0, 0, 3, -30, -108, -104, 0, 0, 3, -30, -108, -116, 0, 0, 3, -30, -106,
+        -120, 0, 0, 3, -30, -106, -124, 0, 0, 3, -30, -106, -116, 0, 0, 3, -30, -106, -112, 0, 0, 3, -30, -106, -128, 0,
+        0, 2, -50, -79, 0, 0, 0, 2, -61, -97, 0, 0, 0, 2, -50, -109, 0, 0, 0, 2, -49, -128, 0, 0, 0, 2, -50, -93, 0, 0,
+        0, 2, -49, -125, 0, 0, 0, 2, -62, -75, 0, 0, 0, 2, -49, -124, 0, 0, 0, 2, -50, -90, 0, 0, 0, 2, -50, -104, 0, 0,
+        0, 2, -50, -87, 0, 0, 0, 2, -50, -76, 0, 0, 0, 3, -30, -120, -98, 0, 0, 2, -49, -122, 0, 0, 0, 2, -50, -75, 0,
+        0, 0, 3, -30, -120, -87, 0, 0, 3, -30, -119, -95, 0, 0, 2, -62, -79, 0, 0, 0, 3, -30, -119, -91, 0, 0, 3, -30,
+        -119, -92, 0, 0, 3, -30, -116, -96, 0, 0, 3, -30, -116, -95, 0, 0, 2, -61, -73, 0, 0, 0, 3, -30, -119, -120, 0,
+        0, 2, -62, -80, 0, 0, 0, 3, -30, -120, -103, 0, 0, 2, -62, -73, 0, 0, 0, 3, -30, -120, -102, 0, 0, 3, -30, -127,
+        -65, 0, 0, 2, -62, -78, 0, 0, 0, 3, -30, -106, -96, 0, 0, 2, -62, -96, 0, 0, 0 };
 
 }
 
 #endif
-
diff --git a/components/to_utf8/to_utf8.cpp b/components/to_utf8/to_utf8.cpp
index 6e04db8db4..c4c35f9320 100644
--- a/components/to_utf8/to_utf8.cpp
+++ b/components/to_utf8/to_utf8.cpp
@@ -1,9 +1,9 @@
 #include "to_utf8.hpp"
 
-#include <vector>
+#include <algorithm>
 #include <cassert>
 #include <stdexcept>
-#include <algorithm>
+#include <vector>
 
 #include <components/debug/debuglog.hpp>
 
@@ -39,7 +39,6 @@
    even in the cases where some conversion is necessary.
  */
 
-
 // Generated tables
 #include "tables_gen.hpp"
 
@@ -49,7 +48,7 @@ namespace
 {
     std::string_view::iterator skipAscii(std::string_view input)
     {
-        return std::find_if(input.begin(), input.end(), [] (unsigned char v) { return v == 0 || v >= 128; });
+        return std::find_if(input.begin(), input.end(), [](unsigned char v) { return v == 0 || v >= 128; });
     }
 
     std::basic_string_view<signed char> getTranslationArray(FromType sourceEncoding)
@@ -57,13 +56,13 @@ namespace
         switch (sourceEncoding)
         {
             case ToUTF8::WINDOWS_1252:
-                return {ToUTF8::windows_1252, std::size(ToUTF8::windows_1252)};
+                return { ToUTF8::windows_1252, std::size(ToUTF8::windows_1252) };
             case ToUTF8::WINDOWS_1250:
-                return {ToUTF8::windows_1250, std::size(ToUTF8::windows_1250)};
+                return { ToUTF8::windows_1250, std::size(ToUTF8::windows_1250) };
             case ToUTF8::WINDOWS_1251:
-                return {ToUTF8::windows_1251, std::size(ToUTF8::windows_1251)};
+                return { ToUTF8::windows_1251, std::size(ToUTF8::windows_1251) };
             case ToUTF8::CP437:
-                return {ToUTF8::cp437, std::size(ToUTF8::cp437)};
+                return { ToUTF8::cp437, std::size(ToUTF8::cp437) };
         }
         throw std::logic_error("Invalid source encoding: " + std::to_string(sourceEncoding));
     }
@@ -102,7 +101,8 @@ StatelessUtf8Encoder::StatelessUtf8Encoder(FromType sourceEncoding)
 {
 }
 
-std::string_view StatelessUtf8Encoder::getUtf8(std::string_view input, BufferAllocationPolicy bufferAllocationPolicy, std::string& buffer) const
+std::string_view StatelessUtf8Encoder::getUtf8(
+    std::string_view input, BufferAllocationPolicy bufferAllocationPolicy, std::string& buffer) const
 {
     if (input.empty())
         return input;
@@ -118,12 +118,12 @@ std::string_view StatelessUtf8Encoder::getUtf8(std::string_view input, BufferAll
     const auto [outlen, ascii] = getLength(input);
 
     // If we're pure ascii, then don't bother converting anything.
-    if(ascii)
+    if (ascii)
         return std::string_view(input.data(), outlen);
 
     // Make sure the output is large enough
     resize(outlen, bufferAllocationPolicy, buffer);
-    char *out = buffer.data();
+    char* out = buffer.data();
 
     // Translate
     for (auto it = input.begin(); it != input.end() && *it != 0; ++it)
@@ -139,7 +139,8 @@ std::string_view StatelessUtf8Encoder::getUtf8(std::string_view input, BufferAll
     return std::string_view(buffer.data(), outlen);
 }
 
-std::string_view StatelessUtf8Encoder::getLegacyEnc(std::string_view input, BufferAllocationPolicy bufferAllocationPolicy, std::string& buffer) const
+std::string_view StatelessUtf8Encoder::getLegacyEnc(
+    std::string_view input, BufferAllocationPolicy bufferAllocationPolicy, std::string& buffer) const
 {
     if (input.empty())
         return input;
@@ -155,12 +156,12 @@ std::string_view StatelessUtf8Encoder::getLegacyEnc(std::string_view input, Buff
     const auto [outlen, ascii] = getLengthLegacyEnc(input);
 
     // If we're pure ascii, then don't bother converting anything.
-    if(ascii)
+    if (ascii)
         return std::string_view(input.data(), outlen);
 
     // Make sure the output is large enough
     resize(outlen, bufferAllocationPolicy, buffer);
-    char *out = buffer.data();
+    char* out = buffer.data();
 
     // Translate
     for (auto it = input.begin(); it != input.end() && *it != 0;)
@@ -196,7 +197,7 @@ std::pair<std::size_t, bool> StatelessUtf8Encoder::getLength(std::string_view in
     // were some non-ascii characters to deal with. Go to slow-mode for
     // the rest of the string.
     if (it == input.end() || *it == 0)
-        return {it - input.begin(), true};
+        return { it - input.begin(), true };
 
     std::size_t len = it - input.begin();
 
@@ -206,15 +207,14 @@ std::pair<std::size_t, bool> StatelessUtf8Encoder::getLength(std::string_view in
         // lookup table.
         len += mTranslationArray[static_cast<unsigned char>(*it) * 6];
         ++it;
-    }
-    while (it != input.end() && *it != 0);
+    } while (it != input.end() && *it != 0);
 
-    return {len, false};
+    return { len, false };
 }
 
 // Translate one character 'ch' using the translation array 'arr', and
 // advance the output pointer accordingly.
-void StatelessUtf8Encoder::copyFromArray(unsigned char ch, char* &out) const
+void StatelessUtf8Encoder::copyFromArray(unsigned char ch, char*& out) const
 {
     // Optimize for ASCII values
     if (ch < 128)
@@ -223,7 +223,7 @@ void StatelessUtf8Encoder::copyFromArray(unsigned char ch, char* &out) const
         return;
     }
 
-    const signed char *in = &mTranslationArray[ch * 6];
+    const signed char* in = &mTranslationArray[ch * 6];
     int len = *(in++);
     memcpy(out, in, len);
     out += len;
@@ -239,7 +239,7 @@ std::pair<std::size_t, bool> StatelessUtf8Encoder::getLengthLegacyEnc(std::strin
     // were some non-ascii characters to deal with. Go to slow-mode for
     // the rest of the string.
     if (it == input.end() || *it == 0)
-        return {it - input.begin(), true};
+        return { it - input.begin(), true };
 
     std::size_t len = it - input.begin();
     std::size_t symbolLen = 0;
@@ -251,7 +251,9 @@ std::pair<std::size_t, bool> StatelessUtf8Encoder::getLengthLegacyEnc(std::strin
         // lookup table.
         switch (static_cast<unsigned char>(*it))
         {
-            case 0xe2: symbolLen -= 2; break;
+            case 0xe2:
+                symbolLen -= 2;
+                break;
             case 0xc2:
             case 0xcb:
             case 0xc4:
@@ -260,7 +262,9 @@ std::pair<std::size_t, bool> StatelessUtf8Encoder::getLengthLegacyEnc(std::strin
             case 0xd0:
             case 0xd1:
             case 0xd2:
-            case 0xc5: symbolLen -= 1; break;
+            case 0xc5:
+                symbolLen -= 1;
+                break;
             default:
                 len += symbolLen;
                 symbolLen = 0;
@@ -268,13 +272,13 @@ std::pair<std::size_t, bool> StatelessUtf8Encoder::getLengthLegacyEnc(std::strin
         }
 
         ++it;
-    }
-    while (it != input.end() && *it != 0);
+    } while (it != input.end() && *it != 0);
 
-    return {len, false};
+    return { len, false };
 }
 
-void StatelessUtf8Encoder::copyFromArrayLegacyEnc(std::string_view::iterator& chp, std::string_view::iterator end, char* &out) const
+void StatelessUtf8Encoder::copyFromArrayLegacyEnc(
+    std::string_view::iterator& chp, std::string_view::iterator end, char*& out) const
 {
     unsigned char ch = *(chp++);
     // Optimize for ASCII values
@@ -287,7 +291,9 @@ void StatelessUtf8Encoder::copyFromArrayLegacyEnc(std::string_view::iterator& ch
     int len = 1;
     switch (ch)
     {
-        case 0xe2: len = 3; break;
+        case 0xe2:
+            len = 3;
+            break;
         case 0xc2:
         case 0xcb:
         case 0xc4:
@@ -296,7 +302,9 @@ void StatelessUtf8Encoder::copyFromArrayLegacyEnc(std::string_view::iterator& ch
         case 0xd0:
         case 0xd1:
         case 0xd2:
-        case 0xc5: len = 2; break;
+        case 0xc5:
+            len = 2;
+            break;
     }
 
     if (len == 1) // There is no 1 length utf-8 glyph that is not 0x20 (empty space)
@@ -319,7 +327,8 @@ void StatelessUtf8Encoder::copyFromArrayLegacyEnc(std::string_view::iterator& ch
 
     for (int i = 128; i < 256; i++)
     {
-        unsigned char b1 = mTranslationArray[i*6 + 1], b2 = mTranslationArray[i*6 + 2], b3 = mTranslationArray[i*6 + 3];
+        unsigned char b1 = mTranslationArray[i * 6 + 1], b2 = mTranslationArray[i * 6 + 2],
+                      b3 = mTranslationArray[i * 6 + 3];
         if (b1 == ch && b2 == ch2 && (len != 3 || b3 == ch3))
         {
             *(out++) = (char)i;
@@ -357,7 +366,8 @@ ToUTF8::FromType ToUTF8::calculateEncoding(std::string_view encodingName)
     else if (encodingName == "win1252")
         return ToUTF8::WINDOWS_1252;
     else
-        throw std::runtime_error("Unknown encoding '" + std::string(encodingName) + "', see openmw --help for available options.");
+        throw std::runtime_error(
+            "Unknown encoding '" + std::string(encodingName) + "', see openmw --help for available options.");
 }
 
 std::string ToUTF8::encodingUsingMessage(std::string_view encodingName)
@@ -369,5 +379,6 @@ std::string ToUTF8::encodingUsingMessage(std::string_view encodingName)
     else if (encodingName == "win1252")
         return "Using default (English) font encoding.";
     else
-        throw std::runtime_error("Unknown encoding '" + std::string(encodingName) + "', see openmw --help for available options.");
+        throw std::runtime_error(
+            "Unknown encoding '" + std::string(encodingName) + "', see openmw --help for available options.");
 }
diff --git a/components/to_utf8/to_utf8.hpp b/components/to_utf8/to_utf8.hpp
index 918f03aa9f..765663149b 100644
--- a/components/to_utf8/to_utf8.hpp
+++ b/components/to_utf8/to_utf8.hpp
@@ -1,21 +1,22 @@
 #ifndef COMPONENTS_TOUTF8_H
 #define COMPONENTS_TOUTF8_H
 
-#include <string>
 #include <cstring>
-#include <vector>
+#include <string>
 #include <string_view>
+#include <vector>
 
 namespace ToUTF8
 {
     // These are all the currently supported code pages
     enum FromType
     {
-        WINDOWS_1250,      // Central ane Eastern European languages
-        WINDOWS_1251,      // Cyrillic languages
-        WINDOWS_1252,       // Used by English version of Morrowind (and
-            // probably others)
-        CP437           // Used for fonts (*.fnt) if data files encoding is 1252. Otherwise, uses the same encoding as the data files.
+        WINDOWS_1250, // Central ane Eastern European languages
+        WINDOWS_1251, // Cyrillic languages
+        WINDOWS_1252, // Used by English version of Morrowind (and
+                      // probably others)
+        CP437 // Used for fonts (*.fnt) if data files encoding is 1252. Otherwise, uses the same encoding as the data
+              // files.
     };
 
     enum class BufferAllocationPolicy
@@ -29,44 +30,47 @@ namespace ToUTF8
 
     class StatelessUtf8Encoder
     {
-        public:
-            explicit StatelessUtf8Encoder(FromType sourceEncoding);
+    public:
+        explicit StatelessUtf8Encoder(FromType sourceEncoding);
 
-            /// Convert to UTF8 from the previously given code page.
-            /// Returns a view to passed buffer that will be resized to fit output if it's too small.
-            std::string_view getUtf8(std::string_view input, BufferAllocationPolicy bufferAllocationPolicy, std::string& buffer) const;
+        /// Convert to UTF8 from the previously given code page.
+        /// Returns a view to passed buffer that will be resized to fit output if it's too small.
+        std::string_view getUtf8(
+            std::string_view input, BufferAllocationPolicy bufferAllocationPolicy, std::string& buffer) const;
 
-            /// Convert from UTF-8 to sourceEncoding.
-            /// Returns a view to passed buffer that will be resized to fit output if it's too small.
-            std::string_view getLegacyEnc(std::string_view input, BufferAllocationPolicy bufferAllocationPolicy, std::string& buffer) const;
+        /// Convert from UTF-8 to sourceEncoding.
+        /// Returns a view to passed buffer that will be resized to fit output if it's too small.
+        std::string_view getLegacyEnc(
+            std::string_view input, BufferAllocationPolicy bufferAllocationPolicy, std::string& buffer) const;
 
-        private:
-            inline std::pair<std::size_t, bool> getLength(std::string_view input) const;
-            inline void copyFromArray(unsigned char chp, char* &out) const;
-            inline std::pair<std::size_t, bool> getLengthLegacyEnc(std::string_view input) const;
-            inline void copyFromArrayLegacyEnc(std::string_view::iterator& chp, std::string_view::iterator end, char* &out) const;
+    private:
+        inline std::pair<std::size_t, bool> getLength(std::string_view input) const;
+        inline void copyFromArray(unsigned char chp, char*& out) const;
+        inline std::pair<std::size_t, bool> getLengthLegacyEnc(std::string_view input) const;
+        inline void copyFromArrayLegacyEnc(
+            std::string_view::iterator& chp, std::string_view::iterator end, char*& out) const;
 
-            const std::basic_string_view<signed char> mTranslationArray;
+        const std::basic_string_view<signed char> mTranslationArray;
     };
 
     class Utf8Encoder
     {
-        public:
-            explicit Utf8Encoder(FromType sourceEncoding);
+    public:
+        explicit Utf8Encoder(FromType sourceEncoding);
 
-            /// Convert to UTF8 from the previously given code page.
-            /// Returns a view to internal buffer invalidate by next getUtf8 or getLegacyEnc call if input is not
-            /// ASCII-only string. Otherwise returns a view to the input.
-            std::string_view getUtf8(std::string_view input);
+        /// Convert to UTF8 from the previously given code page.
+        /// Returns a view to internal buffer invalidate by next getUtf8 or getLegacyEnc call if input is not
+        /// ASCII-only string. Otherwise returns a view to the input.
+        std::string_view getUtf8(std::string_view input);
 
-            /// Convert from UTF-8 to sourceEncoding.
-            /// Returns a view to internal buffer invalidate by next getUtf8 or getLegacyEnc call if input is not
-            /// ASCII-only string. Otherwise returns a view to the input.
-            std::string_view getLegacyEnc(std::string_view input);
+        /// Convert from UTF-8 to sourceEncoding.
+        /// Returns a view to internal buffer invalidate by next getUtf8 or getLegacyEnc call if input is not
+        /// ASCII-only string. Otherwise returns a view to the input.
+        std::string_view getLegacyEnc(std::string_view input);
 
-        private:
-            std::string mBuffer;
-            StatelessUtf8Encoder mImpl;
+    private:
+        std::string mBuffer;
+        StatelessUtf8Encoder mImpl;
     };
 }
 
diff --git a/components/translation/translation.cpp b/components/translation/translation.cpp
index bc6ba1c44d..30ba12853f 100644
--- a/components/translation/translation.cpp
+++ b/components/translation/translation.cpp
@@ -9,11 +9,10 @@ namespace Translation
     {
     }
 
-    void Storage::loadTranslationData(const Files::Collections& dataFileCollections,
-                                      const std::string& esmFileName)
+    void Storage::loadTranslationData(const Files::Collections& dataFileCollections, const std::string& esmFileName)
     {
         std::string esmNameNoExtension(Misc::StringUtils::lowerCase(esmFileName));
-        //changing the extension
+        // changing the extension
         size_t dotPos = esmNameNoExtension.rfind('.');
         if (dotPos != std::string::npos)
             esmNameNoExtension.resize(dotPos);
@@ -23,20 +22,17 @@ namespace Translation
         loadData(mTopicIDs, esmNameNoExtension, ".mrk", dataFileCollections);
     }
 
-    void Storage::loadData(ContainerType& container,
-                           const std::string& fileNameNoExtension,
-                           const std::string& extension,
-                           const Files::Collections& dataFileCollections)
+    void Storage::loadData(ContainerType& container, const std::string& fileNameNoExtension,
+        const std::string& extension, const Files::Collections& dataFileCollections)
     {
         std::string fileName = fileNameNoExtension + extension;
 
-        if (dataFileCollections.getCollection (extension).doesExist (fileName))
+        if (dataFileCollections.getCollection(extension).doesExist(fileName))
         {
-            std::ifstream stream (
-                dataFileCollections.getCollection (extension).getPath (fileName).c_str());
+            std::ifstream stream(dataFileCollections.getCollection(extension).getPath(fileName).c_str());
 
             if (!stream.is_open())
-                throw std::runtime_error ("failed to open translation file: " + fileName);
+                throw std::runtime_error("failed to open translation file: " + fileName);
 
             loadDataFromStream(container, stream);
         }
@@ -47,9 +43,9 @@ namespace Translation
         std::string line;
         while (!stream.eof() && !stream.fail())
         {
-            std::getline( stream, line );
+            std::getline(stream, line);
             if (!line.empty() && *line.rbegin() == '\r')
-              line.resize(line.size() - 1);
+                line.resize(line.size() - 1);
 
             if (!line.empty())
             {
@@ -70,8 +66,7 @@ namespace Translation
 
     std::string Storage::translateCellName(const std::string& cellName) const
     {
-        std::map<std::string, std::string>::const_iterator entry =
-            mCellNamesTranslations.find(cellName);
+        std::map<std::string, std::string>::const_iterator entry = mCellNamesTranslations.find(cellName);
 
         if (entry == mCellNamesTranslations.end())
             return cellName;
@@ -83,9 +78,8 @@ namespace Translation
     {
         std::string result = topicStandardForm(phrase);
 
-        //seeking for the topic ID
-        std::map<std::string, std::string>::const_iterator topicIDIterator =
-            mTopicIDs.find(result);
+        // seeking for the topic ID
+        std::map<std::string, std::string>::const_iterator topicIDIterator = mTopicIDs.find(result);
 
         if (topicIDIterator != mTopicIDs.end())
             result = topicIDIterator->second;
@@ -95,8 +89,7 @@ namespace Translation
 
     std::string Storage::topicStandardForm(const std::string& phrase) const
     {
-        std::map<std::string, std::string>::const_iterator phraseFormsIterator =
-            mPhraseForms.find(phrase);
+        std::map<std::string, std::string>::const_iterator phraseFormsIterator = mPhraseForms.find(phrase);
 
         if (phraseFormsIterator != mPhraseForms.end())
             return phraseFormsIterator->second;
@@ -111,8 +104,6 @@ namespace Translation
 
     bool Storage::hasTranslation() const
     {
-        return !mCellNamesTranslations.empty() ||
-               !mTopicIDs.empty() ||
-               !mPhraseForms.empty();
+        return !mCellNamesTranslations.empty() || !mTopicIDs.empty() || !mPhraseForms.empty();
     }
 }
diff --git a/components/translation/translation.hpp b/components/translation/translation.hpp
index 6a3f84ba14..ee679c4f9b 100644
--- a/components/translation/translation.hpp
+++ b/components/translation/translation.hpp
@@ -1,8 +1,8 @@
 #ifndef COMPONENTS_TRANSLATION_DATA_H
 #define COMPONENTS_TRANSLATION_DATA_H
 
-#include <components/to_utf8/to_utf8.hpp>
 #include <components/files/collections.hpp>
+#include <components/to_utf8/to_utf8.hpp>
 
 namespace Translation
 {
@@ -11,8 +11,7 @@ namespace Translation
     public:
         Storage();
 
-        void loadTranslationData(const Files::Collections& dataFileCollections,
-                                 const std::string& esmFileName);
+        void loadTranslationData(const Files::Collections& dataFileCollections, const std::string& esmFileName);
 
         std::string translateCellName(const std::string& cellName) const;
         std::string topicID(const std::string& phrase) const;
@@ -27,14 +26,11 @@ namespace Translation
     private:
         typedef std::map<std::string, std::string> ContainerType;
 
-        void loadData(ContainerType& container,
-                      const std::string& fileNameNoExtension,
-                      const std::string& extension,
-                      const Files::Collections& dataFileCollections);
+        void loadData(ContainerType& container, const std::string& fileNameNoExtension, const std::string& extension,
+            const Files::Collections& dataFileCollections);
 
         void loadDataFromStream(ContainerType& container, std::istream& stream);
 
-
         ToUTF8::Utf8Encoder* mEncoder;
         ContainerType mCellNamesTranslations, mTopicIDs, mPhraseForms;
     };
diff --git a/components/version/version.cpp b/components/version/version.cpp
index eec374b97a..85eea712b3 100644
--- a/components/version/version.cpp
+++ b/components/version/version.cpp
@@ -6,33 +6,33 @@
 namespace Version
 {
 
-Version getOpenmwVersion(const std::filesystem::path &resourcePath)
-{
-    std::ifstream stream (resourcePath / "version");
+    Version getOpenmwVersion(const std::filesystem::path& resourcePath)
+    {
+        std::ifstream stream(resourcePath / "version");
 
-    Version v;
-    std::getline(stream, v.mVersion);
-    std::getline(stream, v.mCommitHash);
-    std::getline(stream, v.mTagHash);
-    return v;
-}
+        Version v;
+        std::getline(stream, v.mVersion);
+        std::getline(stream, v.mCommitHash);
+        std::getline(stream, v.mTagHash);
+        return v;
+    }
 
-std::string Version::describe() const
-{
-    std::string str = "OpenMW version " + mVersion;
-    std::string rev = mCommitHash;
-    if (!rev.empty())
+    std::string Version::describe() const
     {
-        rev = rev.substr(0, 10);
-        str += "\nRevision: " + rev;
+        std::string str = "OpenMW version " + mVersion;
+        std::string rev = mCommitHash;
+        if (!rev.empty())
+        {
+            rev = rev.substr(0, 10);
+            str += "\nRevision: " + rev;
+        }
+        return str;
     }
-    return str;
-}
 
-std::string getOpenmwVersionDescription(const std::filesystem::path &resourcePath)
-{
-    Version v = getOpenmwVersion(resourcePath);
-    return v.describe();
-}
+    std::string getOpenmwVersionDescription(const std::filesystem::path& resourcePath)
+    {
+        Version v = getOpenmwVersion(resourcePath);
+        return v.describe();
+    }
 
 }
diff --git a/components/version/version.hpp b/components/version/version.hpp
index 6c1998bb60..f6427a4823 100644
--- a/components/version/version.hpp
+++ b/components/version/version.hpp
@@ -1,8 +1,8 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
 
-#include <string>
 #include <filesystem>
+#include <string>
 
 namespace Version
 {
@@ -17,13 +17,11 @@ namespace Version
     };
 
     /// Read OpenMW version from the version file located in resourcePath.
-    Version getOpenmwVersion(const std::filesystem::path &resourcePath);
+    Version getOpenmwVersion(const std::filesystem::path& resourcePath);
 
     /// Helper function to getOpenmwVersion and describe() it
-    std::string getOpenmwVersionDescription(const std::filesystem::path &resourcePath);
+    std::string getOpenmwVersionDescription(const std::filesystem::path& resourcePath);
 
 }
 
-
 #endif // VERSION_HPP
-
diff --git a/components/vfs/archive.hpp b/components/vfs/archive.hpp
index 52706ae9fc..604a77e002 100644
--- a/components/vfs/archive.hpp
+++ b/components/vfs/archive.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_RESOURCE_ARCHIVE_H
 #define OPENMW_COMPONENTS_RESOURCE_ARCHIVE_H
 
-#include <map>
 #include <filesystem>
+#include <map>
 
 #include <components/files/istreamptr.hpp>
 
@@ -24,11 +24,12 @@ namespace VFS
     public:
         virtual ~Archive() {}
 
-        /// List all resources contained in this archive, and run the resource names through the given normalize function.
-        virtual void listResources(std::map<std::string, File*>& out, char (*normalize_function) (char)) = 0;
+        /// List all resources contained in this archive, and run the resource names through the given normalize
+        /// function.
+        virtual void listResources(std::map<std::string, File*>& out, char (*normalize_function)(char)) = 0;
 
         /// True if this archive contains the provided normalized file.
-        virtual bool contains(const std::string& file, char (*normalize_function) (char)) const = 0;
+        virtual bool contains(const std::string& file, char (*normalize_function)(char)) const = 0;
 
         virtual std::string getDescription() const = 0;
     };
diff --git a/components/vfs/bsaarchive.cpp b/components/vfs/bsaarchive.cpp
index f2c09cf848..81cab046f7 100644
--- a/components/vfs/bsaarchive.cpp
+++ b/components/vfs/bsaarchive.cpp
@@ -1,125 +1,121 @@
 #include "bsaarchive.hpp"
 
-#include <memory>
 #include <algorithm>
 #include <istream>
+#include <memory>
 
 namespace VFS
 {
 
-BsaArchive::BsaArchive(const std::filesystem::path &filename)
-{
-    mFile = std::make_unique<Bsa::BSAFile>();
-    mFile->open(filename);
-
-    const Bsa::BSAFile::FileList &filelist = mFile->getList();
-    for(Bsa::BSAFile::FileList::const_iterator it = filelist.begin();it != filelist.end();++it)
+    BsaArchive::BsaArchive(const std::filesystem::path& filename)
     {
-        mResources.emplace_back(&*it, mFile.get());
+        mFile = std::make_unique<Bsa::BSAFile>();
+        mFile->open(filename);
+
+        const Bsa::BSAFile::FileList& filelist = mFile->getList();
+        for (Bsa::BSAFile::FileList::const_iterator it = filelist.begin(); it != filelist.end(); ++it)
+        {
+            mResources.emplace_back(&*it, mFile.get());
+        }
     }
-}
 
-BsaArchive::BsaArchive()
-{
-}
+    BsaArchive::BsaArchive() {}
 
-BsaArchive::~BsaArchive() {
-}
+    BsaArchive::~BsaArchive() {}
 
-void BsaArchive::listResources(std::map<std::string, File *> &out, char (*normalize_function)(char))
-{
-    for (std::vector<BsaArchiveFile>::iterator it = mResources.begin(); it != mResources.end(); ++it)
+    void BsaArchive::listResources(std::map<std::string, File*>& out, char (*normalize_function)(char))
     {
-        std::string ent = it->mInfo->name();
-        std::transform(ent.begin(), ent.end(), ent.begin(), normalize_function);
+        for (std::vector<BsaArchiveFile>::iterator it = mResources.begin(); it != mResources.end(); ++it)
+        {
+            std::string ent = it->mInfo->name();
+            std::transform(ent.begin(), ent.end(), ent.begin(), normalize_function);
 
-        out[ent] = &*it;
+            out[ent] = &*it;
+        }
     }
-}
 
-bool BsaArchive::contains(const std::string& file, char (*normalize_function)(char)) const
-{
-    for (const auto& it : mResources)
+    bool BsaArchive::contains(const std::string& file, char (*normalize_function)(char)) const
     {
-        std::string ent = it.mInfo->name();
-        std::transform(ent.begin(), ent.end(), ent.begin(), normalize_function);
-        if(file == ent)
-            return true;
+        for (const auto& it : mResources)
+        {
+            std::string ent = it.mInfo->name();
+            std::transform(ent.begin(), ent.end(), ent.begin(), normalize_function);
+            if (file == ent)
+                return true;
+        }
+        return false;
     }
-    return false;
-}
 
-std::string BsaArchive::getDescription() const
-{
-    return std::string{"BSA: "} + mFile->getFilename();
-}
-
-// ------------------------------------------------------------------------------
-
-BsaArchiveFile::BsaArchiveFile(const Bsa::BSAFile::FileStruct *info, Bsa::BSAFile* bsa)
-    : mInfo(info)
-    , mFile(bsa)
-{
-
-}
+    std::string BsaArchive::getDescription() const
+    {
+        return std::string{ "BSA: " } + mFile->getFilename();
+    }
 
-Files::IStreamPtr BsaArchiveFile::open()
-{
-    return mFile->getFile(mInfo);
-}
+    // ------------------------------------------------------------------------------
 
-CompressedBsaArchive::CompressedBsaArchive(const std::filesystem::path &filename)
-    : Archive()
-{
-    mCompressedFile = std::make_unique<Bsa::CompressedBSAFile>();
-    mCompressedFile->open(filename);
-
-    const Bsa::BSAFile::FileList &filelist = mCompressedFile->getList();
-    for(Bsa::BSAFile::FileList::const_iterator it = filelist.begin();it != filelist.end();++it)
+    BsaArchiveFile::BsaArchiveFile(const Bsa::BSAFile::FileStruct* info, Bsa::BSAFile* bsa)
+        : mInfo(info)
+        , mFile(bsa)
     {
-        mCompressedResources.emplace_back(&*it, mCompressedFile.get());
     }
-}
 
-void CompressedBsaArchive::listResources(std::map<std::string, File *> &out, char (*normalize_function)(char))
-{
-    for (std::vector<CompressedBsaArchiveFile>::iterator it = mCompressedResources.begin(); it != mCompressedResources.end(); ++it)
+    Files::IStreamPtr BsaArchiveFile::open()
     {
-        std::string ent = it->mInfo->name();
-        std::transform(ent.begin(), ent.end(), ent.begin(), normalize_function);
-
-        out[ent] = &*it;
+        return mFile->getFile(mInfo);
     }
-}
 
-bool CompressedBsaArchive::contains(const std::string& file, char (*normalize_function)(char)) const
-{
-    for (const auto& it : mCompressedResources)
+    CompressedBsaArchive::CompressedBsaArchive(const std::filesystem::path& filename)
+        : Archive()
     {
-        std::string ent = it.mInfo->name();
-        std::transform(ent.begin(), ent.end(), ent.begin(), normalize_function);
-        if(file == ent)
-            return true;
+        mCompressedFile = std::make_unique<Bsa::CompressedBSAFile>();
+        mCompressedFile->open(filename);
+
+        const Bsa::BSAFile::FileList& filelist = mCompressedFile->getList();
+        for (Bsa::BSAFile::FileList::const_iterator it = filelist.begin(); it != filelist.end(); ++it)
+        {
+            mCompressedResources.emplace_back(&*it, mCompressedFile.get());
+        }
     }
-    return false;
-}
 
-std::string CompressedBsaArchive::getDescription() const
-{
-    return std::string{"BSA: "} + mCompressedFile->getFilename();
-}
+    void CompressedBsaArchive::listResources(std::map<std::string, File*>& out, char (*normalize_function)(char))
+    {
+        for (std::vector<CompressedBsaArchiveFile>::iterator it = mCompressedResources.begin();
+             it != mCompressedResources.end(); ++it)
+        {
+            std::string ent = it->mInfo->name();
+            std::transform(ent.begin(), ent.end(), ent.begin(), normalize_function);
+
+            out[ent] = &*it;
+        }
+    }
 
+    bool CompressedBsaArchive::contains(const std::string& file, char (*normalize_function)(char)) const
+    {
+        for (const auto& it : mCompressedResources)
+        {
+            std::string ent = it.mInfo->name();
+            std::transform(ent.begin(), ent.end(), ent.begin(), normalize_function);
+            if (file == ent)
+                return true;
+        }
+        return false;
+    }
 
-CompressedBsaArchiveFile::CompressedBsaArchiveFile(const Bsa::BSAFile::FileStruct *info, Bsa::CompressedBSAFile* bsa)
-    : mInfo(info)
-    , mCompressedFile(bsa)
-{
+    std::string CompressedBsaArchive::getDescription() const
+    {
+        return std::string{ "BSA: " } + mCompressedFile->getFilename();
+    }
 
-}
+    CompressedBsaArchiveFile::CompressedBsaArchiveFile(
+        const Bsa::BSAFile::FileStruct* info, Bsa::CompressedBSAFile* bsa)
+        : mInfo(info)
+        , mCompressedFile(bsa)
+    {
+    }
 
-Files::IStreamPtr CompressedBsaArchiveFile::open()
-{
-    return mCompressedFile->getFile(mInfo);
-}
+    Files::IStreamPtr CompressedBsaArchiveFile::open()
+    {
+        return mCompressedFile->getFile(mInfo);
+    }
 
 }
diff --git a/components/vfs/bsaarchive.hpp b/components/vfs/bsaarchive.hpp
index 23811c045b..9d1b6123e5 100644
--- a/components/vfs/bsaarchive.hpp
+++ b/components/vfs/bsaarchive.hpp
@@ -34,15 +34,14 @@ namespace VFS
         Bsa::CompressedBSAFile* mCompressedFile;
     };
 
-
     class BsaArchive : public Archive
     {
     public:
-        BsaArchive(const std::filesystem::path &filename);
+        BsaArchive(const std::filesystem::path& filename);
         BsaArchive();
         virtual ~BsaArchive();
-        void listResources(std::map<std::string, File*>& out, char (*normalize_function) (char)) override;
-        bool contains(const std::string& file, char (*normalize_function) (char)) const override;
+        void listResources(std::map<std::string, File*>& out, char (*normalize_function)(char)) override;
+        bool contains(const std::string& file, char (*normalize_function)(char)) const override;
         std::string getDescription() const override;
 
     protected:
@@ -53,10 +52,10 @@ namespace VFS
     class CompressedBsaArchive : public Archive
     {
     public:
-        CompressedBsaArchive(const std::filesystem::path &filename);
+        CompressedBsaArchive(const std::filesystem::path& filename);
         virtual ~CompressedBsaArchive() {}
-        void listResources(std::map<std::string, File*>& out, char (*normalize_function) (char)) override;
-        bool contains(const std::string& file, char (*normalize_function) (char)) const override;
+        void listResources(std::map<std::string, File*>& out, char (*normalize_function)(char)) override;
+        bool contains(const std::string& file, char (*normalize_function)(char)) const override;
         std::string getDescription() const override;
 
     private:
diff --git a/components/vfs/filesystemarchive.cpp b/components/vfs/filesystemarchive.cpp
index d04b827d62..ca74768732 100644
--- a/components/vfs/filesystemarchive.cpp
+++ b/components/vfs/filesystemarchive.cpp
@@ -11,41 +11,42 @@
 namespace VFS
 {
 
-    FileSystemArchive::FileSystemArchive(const std::filesystem::path &path)
+    FileSystemArchive::FileSystemArchive(const std::filesystem::path& path)
         : mBuiltIndex(false)
         , mPath(path)
     {
-
     }
 
-    void FileSystemArchive::listResources(std::map<std::string, File *> &out, char (*normalize_function)(char))
+    void FileSystemArchive::listResources(std::map<std::string, File*>& out, char (*normalize_function)(char))
     {
         if (!mBuiltIndex)
         {
             const auto str = mPath.u8string();
-            size_t prefix = str.size ();
+            size_t prefix = str.size();
 
-            if (!mPath.empty() && str [prefix - 1] != '\\' && str [prefix - 1] != '/')
+            if (!mPath.empty() && str[prefix - 1] != '\\' && str[prefix - 1] != '/')
                 ++prefix;
 
-            for (const auto& i :
-                    std::filesystem::recursive_directory_iterator(mPath))
+            for (const auto& i : std::filesystem::recursive_directory_iterator(mPath))
             {
-                if(std::filesystem::is_directory (i))
+                if (std::filesystem::is_directory(i))
                     continue;
 
-                const auto& path = i.path ();
+                const auto& path = i.path();
                 const auto& proper = Files::pathToUnicodeString(path);
 
                 FileSystemArchiveFile file(path);
 
                 std::string searchable;
 
-                std::transform(std::next(proper.begin(), static_cast<std::string::difference_type>(prefix)), proper.end(), std::back_inserter(searchable), normalize_function);
+                std::transform(std::next(proper.begin(), static_cast<std::string::difference_type>(prefix)),
+                    proper.end(), std::back_inserter(searchable), normalize_function);
 
                 const auto inserted = mIndex.insert(std::make_pair(searchable, file));
                 if (!inserted.second)
-                    Log(Debug::Warning) << "Warning: found duplicate file for '" << proper << "', please check your file system for two files with the same name in different cases.";
+                    Log(Debug::Warning)
+                        << "Warning: found duplicate file for '" << proper
+                        << "', please check your file system for two files with the same name in different cases.";
                 else
                     out[inserted.first->first] = &inserted.first->second;
             }
@@ -72,7 +73,7 @@ namespace VFS
 
     // ----------------------------------------------------------------------------------
 
-    FileSystemArchiveFile::FileSystemArchiveFile(const std::filesystem::path &path)
+    FileSystemArchiveFile::FileSystemArchiveFile(const std::filesystem::path& path)
         : mPath(path)
     {
     }
diff --git a/components/vfs/filesystemarchive.hpp b/components/vfs/filesystemarchive.hpp
index 678eb19f95..e1ebbd96f0 100644
--- a/components/vfs/filesystemarchive.hpp
+++ b/components/vfs/filesystemarchive.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_RESOURCE_FILESYSTEMARCHIVE_H
 #define OPENMW_COMPONENTS_RESOURCE_FILESYSTEMARCHIVE_H
 
-#include <filesystem>
 #include "archive.hpp"
+#include <filesystem>
 
 #include <string>
 
@@ -12,7 +12,7 @@ namespace VFS
     class FileSystemArchiveFile : public File
     {
     public:
-        FileSystemArchiveFile(const std::filesystem::path &path);
+        FileSystemArchiveFile(const std::filesystem::path& path);
 
         Files::IStreamPtr open() override;
 
@@ -20,27 +20,25 @@ namespace VFS
 
     private:
         std::filesystem::path mPath;
-
     };
 
     class FileSystemArchive : public Archive
     {
     public:
-        FileSystemArchive(const std::filesystem::path &path);
+        FileSystemArchive(const std::filesystem::path& path);
 
-        void listResources(std::map<std::string, File*>& out, char (*normalize_function) (char)) override;
+        void listResources(std::map<std::string, File*>& out, char (*normalize_function)(char)) override;
 
-        bool contains(const std::string& file, char (*normalize_function) (char)) const override;
+        bool contains(const std::string& file, char (*normalize_function)(char)) const override;
 
         std::string getDescription() const override;
 
     private:
-        typedef std::map <std::string, FileSystemArchiveFile> index;
+        typedef std::map<std::string, FileSystemArchiveFile> index;
         index mIndex;
 
         bool mBuiltIndex;
         std::filesystem::path mPath;
-
     };
 
 }
diff --git a/components/vfs/manager.cpp b/components/vfs/manager.cpp
index 118227a5f1..c74ec01ff8 100644
--- a/components/vfs/manager.cpp
+++ b/components/vfs/manager.cpp
@@ -1,12 +1,12 @@
 #include "manager.hpp"
 
-#include <stdexcept>
-#include <istream>
 #include <algorithm>
+#include <istream>
+#include <stdexcept>
 
-#include <components/misc/strings/lower.hpp>
 #include <components/files/configurationmanager.hpp>
 #include <components/files/conversion.hpp>
+#include <components/misc/strings/lower.hpp>
 
 #include "archive.hpp"
 
@@ -37,7 +37,6 @@ namespace VFS
     Manager::Manager(bool strict)
         : mStrict(strict)
     {
-
     }
 
     Manager::~Manager() {}
@@ -69,7 +68,7 @@ namespace VFS
         return getNormalized(normalized);
     }
 
-    Files::IStreamPtr Manager::getNormalized(const std::string &normalizedName) const
+    Files::IStreamPtr Manager::getNormalized(const std::string& normalizedName) const
     {
         std::map<std::string, File*>::const_iterator found = mIndex.find(normalizedName);
         if (found == mIndex.end())
@@ -96,15 +95,15 @@ namespace VFS
     {
         std::string normalized(name);
         normalize_path(normalized, mStrict);
-        for(auto it = mArchives.rbegin(); it != mArchives.rend(); ++it)
+        for (auto it = mArchives.rbegin(); it != mArchives.rend(); ++it)
         {
-            if((*it)->contains(normalized, mStrict ? &strict_normalize_char : &nonstrict_normalize_char))
+            if ((*it)->contains(normalized, mStrict ? &strict_normalize_char : &nonstrict_normalize_char))
                 return (*it)->getDescription();
         }
         return {};
     }
 
-    std::filesystem::path Manager::getAbsoluteFileName(const std::filesystem::path &name) const
+    std::filesystem::path Manager::getAbsoluteFileName(const std::filesystem::path& name) const
     {
         std::string normalized = Files::pathToUnicodeString(name);
         normalize_path(normalized, mStrict);
diff --git a/components/vfs/manager.hpp b/components/vfs/manager.hpp
index 8ba6790928..4c7993c421 100644
--- a/components/vfs/manager.hpp
+++ b/components/vfs/manager.hpp
@@ -3,11 +3,11 @@
 
 #include <components/files/istreamptr.hpp>
 
-#include <vector>
+#include <filesystem>
 #include <map>
 #include <memory>
 #include <string>
-#include <filesystem>
+#include <vector>
 
 namespace VFS
 {
@@ -19,7 +19,11 @@ namespace VFS
     class IteratorPair
     {
     public:
-        IteratorPair(Iterator first, Iterator last) : mFirst(first), mLast(last) {}
+        IteratorPair(Iterator first, Iterator last)
+            : mFirst(first)
+            , mLast(last)
+        {
+        }
         Iterator begin() const { return mFirst; }
         Iterator end() const { return mLast; }
 
@@ -38,11 +42,18 @@ namespace VFS
         class RecursiveDirectoryIterator
         {
         public:
-            RecursiveDirectoryIterator(std::map<std::string, File*>::const_iterator it) : mIt(it) {}
+            RecursiveDirectoryIterator(std::map<std::string, File*>::const_iterator it)
+                : mIt(it)
+            {
+            }
             const std::string& operator*() const { return mIt->first; }
             const std::string* operator->() const { return &mIt->first; }
             bool operator!=(const RecursiveDirectoryIterator& other) { return mIt != other.mIt; }
-            RecursiveDirectoryIterator& operator++() { ++mIt; return *this; }
+            RecursiveDirectoryIterator& operator++()
+            {
+                ++mIt;
+                return *this;
+            }
 
         private:
             std::map<std::string, File*>::const_iterator mIt;
@@ -60,7 +71,8 @@ namespace VFS
         // Empty the file index and unregister archives.
         void reset();
 
-        /// Register the given archive. All files contained in it will be added to the index on the next buildIndex() call.
+        /// Register the given archive. All files contained in it will be added to the index on the next buildIndex()
+        /// call.
         void addArchive(std::unique_ptr<Archive>&& archive);
 
         /// Build the file index. Should be called when all archives have been registered.
@@ -95,7 +107,7 @@ namespace VFS
         /// Retrieve the absolute path to the file
         /// @note Throws an exception if the file can not be found.
         /// @note May be called from any thread once the index has been built.
-        std::filesystem::path getAbsoluteFileName(const std::filesystem::path &name) const;
+        std::filesystem::path getAbsoluteFileName(const std::filesystem::path& name) const;
 
     private:
         bool mStrict;
diff --git a/components/vfs/registerarchives.cpp b/components/vfs/registerarchives.cpp
index b496958381..a095d9a3a9 100644
--- a/components/vfs/registerarchives.cpp
+++ b/components/vfs/registerarchives.cpp
@@ -1,19 +1,20 @@
 #include "registerarchives.hpp"
 
-#include <set>
 #include <filesystem>
+#include <set>
 #include <stdexcept>
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/vfs/manager.hpp>
 #include <components/vfs/bsaarchive.hpp>
 #include <components/vfs/filesystemarchive.hpp>
+#include <components/vfs/manager.hpp>
 
 namespace VFS
 {
 
-    void registerArchives(VFS::Manager *vfs, const Files::Collections &collections, const std::vector<std::string> &archives, bool useLooseFiles)
+    void registerArchives(VFS::Manager* vfs, const Files::Collections& collections,
+        const std::vector<std::string>& archives, bool useLooseFiles)
     {
         const Files::PathContainer& dataDirs = collections.getPaths();
 
@@ -40,7 +41,7 @@ namespace VFS
         if (useLooseFiles)
         {
             std::set<std::filesystem::path> seen;
-            for (const auto &dataDir : dataDirs)
+            for (const auto& dataDir : dataDirs)
             {
                 if (seen.insert(dataDir).second)
                 {
diff --git a/components/vfs/registerarchives.hpp b/components/vfs/registerarchives.hpp
index 1ef13f0f9e..dac29f87a3 100644
--- a/components/vfs/registerarchives.hpp
+++ b/components/vfs/registerarchives.hpp
@@ -8,7 +8,7 @@ namespace VFS
     class Manager;
 
     /// @brief Register BSA and file system archives based on the given OpenMW configuration.
-    void registerArchives (VFS::Manager* vfs, const Files::Collections& collections,
+    void registerArchives(VFS::Manager* vfs, const Files::Collections& collections,
         const std::vector<std::string>& archives, bool useLooseFiles);
 }
 
diff --git a/components/widgets/box.cpp b/components/widgets/box.cpp
index f9a2e26142..4ef2e94d48 100644
--- a/components/widgets/box.cpp
+++ b/components/widgets/box.cpp
@@ -9,36 +9,36 @@ namespace Gui
     // If the 3.4.2 become a required minimum version, the ComboBox class may be removed.
     void ComboBox::setPropertyOverride(const std::string& _key, const std::string& _value)
     {
-#if MYGUI_VERSION >= MYGUI_DEFINE_VERSION(3,4,2)
-        MyGUI::ComboBox::setPropertyOverride (_key, _value);
+#if MYGUI_VERSION >= MYGUI_DEFINE_VERSION(3, 4, 2)
+        MyGUI::ComboBox::setPropertyOverride(_key, _value);
 #else
         if (_key == "AddItem")
         {
             const std::string value = MyGUI::LanguageManager::getInstance().replaceTags(_value);
-            MyGUI::ComboBox::setPropertyOverride (_key, value);
+            MyGUI::ComboBox::setPropertyOverride(_key, value);
         }
         else
         {
-            MyGUI::ComboBox::setPropertyOverride (_key, _value);
+            MyGUI::ComboBox::setPropertyOverride(_key, _value);
         }
 #endif
     }
 
-    void AutoSizedWidget::notifySizeChange (MyGUI::Widget* w)
+    void AutoSizedWidget::notifySizeChange(MyGUI::Widget* w)
     {
-        MyGUI::Widget * parent = w->getParent();
+        MyGUI::Widget* parent = w->getParent();
         if (parent != nullptr)
         {
             if (mExpandDirection.isLeft())
             {
-                int hdiff = getRequestedSize ().width - w->getSize().width;
+                int hdiff = getRequestedSize().width - w->getSize().width;
                 w->setPosition(w->getPosition() - MyGUI::IntPoint(hdiff, 0));
             }
-            w->setSize(getRequestedSize ());
+            w->setSize(getRequestedSize());
 
             while (parent != nullptr)
             {
-                Box * b = dynamic_cast<Box*>(parent);
+                Box* b = dynamic_cast<Box*>(parent);
                 if (b)
                     b->notifyChildrenSizeChanged();
                 else
@@ -48,28 +48,27 @@ namespace Gui
         }
     }
 
-
     MyGUI::IntSize AutoSizedTextBox::getRequestedSize()
     {
-        return getCaption().empty() ? MyGUI::IntSize{0, 0} : getTextSize();
+        return getCaption().empty() ? MyGUI::IntSize{ 0, 0 } : getTextSize();
     }
 
     void AutoSizedTextBox::setCaption(const MyGUI::UString& _value)
     {
         TextBox::setCaption(_value);
 
-        notifySizeChange (this);
+        notifySizeChange(this);
     }
 
     void AutoSizedTextBox::setPropertyOverride(const std::string& _key, const std::string& _value)
     {
         if (_key == "ExpandDirection")
         {
-            mExpandDirection = MyGUI::Align::parse (_value);
+            mExpandDirection = MyGUI::Align::parse(_value);
         }
         else
         {
-            Gui::TextBox::setPropertyOverride (_key, _value);
+            Gui::TextBox::setPropertyOverride(_key, _value);
         }
     }
 
@@ -80,12 +79,13 @@ namespace Gui
 
         if (mShrink)
         {
-            // MyGUI needs to know the widget size for wordwrapping, but we will know the widget size only after wordwrapping.
-            // To solve this issue, use the maximum tooltip width first for wordwrapping, then resize widget to its actual used space.
+            // MyGUI needs to know the widget size for wordwrapping, but we will know the widget size only after
+            // wordwrapping. To solve this issue, use the maximum tooltip width first for wordwrapping, then resize
+            // widget to its actual used space.
             if (mWasResized)
             {
                 int maxLineWidth = 0;
-                const MyGUI::VectorLineInfo & lines = getSubWidgetText()->castType<MyGUI::EditText>()->getLineInfo();
+                const MyGUI::VectorLineInfo& lines = getSubWidgetText()->castType<MyGUI::EditText>()->getLineInfo();
                 for (unsigned int i = 0; i < lines.size(); ++i)
                     maxLineWidth = std::max(maxLineWidth, lines[i].width);
 
@@ -112,7 +112,7 @@ namespace Gui
         EditBox::setCaption(_value);
         mWasResized = false;
 
-        notifySizeChange (this);
+        notifySizeChange(this);
     }
 
     void AutoSizedEditBox::initialiseOverride()
@@ -127,7 +127,7 @@ namespace Gui
     {
         if (_key == "ExpandDirection")
         {
-            mExpandDirection = MyGUI::Align::parse (_value);
+            mExpandDirection = MyGUI::Align::parse(_value);
         }
         else if (_key == "Shrink")
         {
@@ -135,7 +135,7 @@ namespace Gui
         }
         else
         {
-            Gui::EditBox::setPropertyOverride (_key, _value);
+            Gui::EditBox::setPropertyOverride(_key, _value);
         }
     }
 
@@ -145,7 +145,7 @@ namespace Gui
         if (isUserString("TextPadding"))
             padding = MyGUI::IntSize::parse(getUserString("TextPadding"));
 
-        MyGUI::IntSize size = getTextSize() + MyGUI::IntSize(padding.width,padding.height);
+        MyGUI::IntSize size = getTextSize() + MyGUI::IntSize(padding.width, padding.height);
         return size;
     }
 
@@ -153,18 +153,18 @@ namespace Gui
     {
         Button::setCaption(_value);
 
-        notifySizeChange (this);
+        notifySizeChange(this);
     }
 
     void AutoSizedButton::setPropertyOverride(const std::string& _key, const std::string& _value)
     {
         if (_key == "ExpandDirection")
         {
-            mExpandDirection = MyGUI::Align::parse (_value);
+            mExpandDirection = MyGUI::Align::parse(_value);
         }
         else
         {
-            Gui::Button::setPropertyOverride (_key, _value);
+            Gui::Button::setPropertyOverride(_key, _value);
         }
     }
     Box::Box()
@@ -174,7 +174,7 @@ namespace Gui
     {
     }
 
-    void Box::notifyChildrenSizeChanged ()
+    void Box::notifyChildrenSizeChanged()
     {
         align();
     }
@@ -193,19 +193,19 @@ namespace Gui
         return true;
     }
 
-    void HBox::align ()
+    void HBox::align()
     {
-        unsigned int count = getChildCount ();
+        unsigned int count = getChildCount();
         size_t h_stretched_count = 0;
         int total_width = 0;
         int total_height = 0;
-        std::vector< std::pair<MyGUI::IntSize, bool> > sizes;
+        std::vector<std::pair<MyGUI::IntSize, bool>> sizes;
         sizes.resize(count);
 
         for (unsigned int i = 0; i < count; ++i)
         {
             MyGUI::Widget* w = getChildAt(i);
-            bool hstretch = w->getUserString ("HStretch") == "true";
+            bool hstretch = w->getUserString("HStretch") == "true";
             bool hidden = w->getUserString("Hidden") == "true";
             if (hidden)
                 continue;
@@ -213,9 +213,9 @@ namespace Gui
             AutoSizedWidget* aw = dynamic_cast<AutoSizedWidget*>(w);
             if (aw)
             {
-                sizes[i] = std::make_pair(aw->getRequestedSize (), hstretch);
-                total_width += aw->getRequestedSize ().width;
-                total_height = std::max(total_height, aw->getRequestedSize ().height);
+                sizes[i] = std::make_pair(aw->getRequestedSize(), hstretch);
+                total_width += aw->getRequestedSize().width;
+                total_height = std::max(total_height, aw->getRequestedSize().height);
             }
             else
             {
@@ -225,19 +225,20 @@ namespace Gui
                     total_height = std::max(total_height, w->getSize().height);
             }
 
-            if (i != count-1)
+            if (i != count - 1)
                 total_width += mSpacing;
         }
 
-        if (mAutoResize && (total_width+mPadding*2 != getClientCoord().width || total_height+mPadding*2 != getClientCoord().height))
+        if (mAutoResize
+            && (total_width + mPadding * 2 != getClientCoord().width
+                || total_height + mPadding * 2 != getClientCoord().height))
         {
             int xmargin = getSize().width - getClientCoord().width;
             int ymargin = getSize().height - getClientCoord().height;
-            setSize(MyGUI::IntSize(total_width+mPadding*2 + xmargin, total_height+mPadding*2 + ymargin));
+            setSize(MyGUI::IntSize(total_width + mPadding * 2 + xmargin, total_height + mPadding * 2 + ymargin));
             return;
         }
 
-
         int curX = 0;
         for (unsigned int i = 0; i < count; ++i)
         {
@@ -250,20 +251,21 @@ namespace Gui
             if (hidden)
                 continue;
 
-            bool vstretch = w->getUserString ("VStretch") == "true";
-            int max_height = getClientCoord().height - mPadding*2;
+            bool vstretch = w->getUserString("VStretch") == "true";
+            int max_height = getClientCoord().height - mPadding * 2;
             int height = vstretch ? max_height : sizes[i].first.height;
 
             MyGUI::IntCoord widgetCoord;
             widgetCoord.left = curX;
-            widgetCoord.top = mPadding + (getClientCoord().height-mPadding*2 - height) / 2;
+            widgetCoord.top = mPadding + (getClientCoord().height - mPadding * 2 - height) / 2;
 
             int width = 0;
             if (sizes[i].second)
             {
                 if (h_stretched_count == 0)
                     throw std::logic_error("unexpected");
-                width = sizes[i].first.width + (getClientCoord().width-mPadding*2 - total_width)/h_stretched_count;
+                width
+                    = sizes[i].first.width + (getClientCoord().width - mPadding * 2 - total_width) / h_stretched_count;
             }
             else
                 width = sizes[i].first.width;
@@ -273,26 +275,26 @@ namespace Gui
             w->setCoord(widgetCoord);
             curX += width;
 
-            if (i != count-1)
+            if (i != count - 1)
                 curX += mSpacing;
         }
     }
 
     void HBox::setPropertyOverride(const std::string& _key, const std::string& _value)
     {
-        if (!Box::_setPropertyImpl (_key, _value))
+        if (!Box::_setPropertyImpl(_key, _value))
             MyGUI::Widget::setPropertyOverride(_key, _value);
     }
 
-    void HBox::setSize (const MyGUI::IntSize& _value)
+    void HBox::setSize(const MyGUI::IntSize& _value)
     {
-        MyGUI::Widget::setSize (_value);
+        MyGUI::Widget::setSize(_value);
         align();
     }
 
-    void HBox::setCoord (const MyGUI::IntCoord& _value)
+    void HBox::setCoord(const MyGUI::IntCoord& _value)
     {
-        MyGUI::Widget::setCoord (_value);
+        MyGUI::Widget::setCoord(_value);
         align();
     }
 
@@ -309,10 +311,10 @@ namespace Gui
         align();
     }
 
-    MyGUI::IntSize HBox::getRequestedSize ()
+    MyGUI::IntSize HBox::getRequestedSize()
     {
-        MyGUI::IntSize size(0,0);
-        for (unsigned int i = 0; i < getChildCount (); ++i)
+        MyGUI::IntSize size(0, 0);
+        for (unsigned int i = 0; i < getChildCount(); ++i)
         {
             bool hidden = getChildAt(i)->getUserString("Hidden") == "true";
             if (hidden)
@@ -321,39 +323,36 @@ namespace Gui
             AutoSizedWidget* w = dynamic_cast<AutoSizedWidget*>(getChildAt(i));
             if (w)
             {
-                MyGUI::IntSize requested = w->getRequestedSize ();
+                MyGUI::IntSize requested = w->getRequestedSize();
                 size.height = std::max(size.height, requested.height);
                 size.width = size.width + requested.width;
-                if (i != getChildCount()-1)
+                if (i != getChildCount() - 1)
                     size.width += mSpacing;
             }
             else
             {
-                MyGUI::IntSize requested = getChildAt(i)->getSize ();
+                MyGUI::IntSize requested = getChildAt(i)->getSize();
                 size.height = std::max(size.height, requested.height);
 
                 if (getChildAt(i)->getUserString("HStretch") != "true")
                     size.width = size.width + requested.width;
 
-                if (i != getChildCount()-1)
+                if (i != getChildCount() - 1)
                     size.width += mSpacing;
             }
-            size.height += mPadding*2;
-            size.width += mPadding*2;
+            size.height += mPadding * 2;
+            size.width += mPadding * 2;
         }
         return size;
     }
 
-
-
-
-    void VBox::align ()
+    void VBox::align()
     {
-        unsigned int count = getChildCount ();
+        unsigned int count = getChildCount();
         size_t v_stretched_count = 0;
         int total_height = 0;
         int total_width = 0;
-        std::vector< std::pair<MyGUI::IntSize, bool> > sizes;
+        std::vector<std::pair<MyGUI::IntSize, bool>> sizes;
         sizes.resize(count);
         for (unsigned int i = 0; i < count; ++i)
         {
@@ -363,14 +362,14 @@ namespace Gui
             if (hidden)
                 continue;
 
-            bool vstretch = w->getUserString ("VStretch") == "true";
+            bool vstretch = w->getUserString("VStretch") == "true";
             v_stretched_count += vstretch;
             AutoSizedWidget* aw = dynamic_cast<AutoSizedWidget*>(w);
             if (aw)
             {
-                sizes[i] = std::make_pair(aw->getRequestedSize (), vstretch);
-                total_height += aw->getRequestedSize ().height;
-                total_width = std::max(total_width, aw->getRequestedSize ().width);
+                sizes[i] = std::make_pair(aw->getRequestedSize(), vstretch);
+                total_height += aw->getRequestedSize().height;
+                total_width = std::max(total_width, aw->getRequestedSize().width);
             }
             else
             {
@@ -381,22 +380,24 @@ namespace Gui
                     total_width = std::max(total_width, w->getSize().width);
             }
 
-            if (i != count-1)
+            if (i != count - 1)
                 total_height += mSpacing;
         }
 
-        if (mAutoResize && (total_width+mPadding*2 != getClientCoord().width || total_height+mPadding*2 != getClientCoord().height))
+        if (mAutoResize
+            && (total_width + mPadding * 2 != getClientCoord().width
+                || total_height + mPadding * 2 != getClientCoord().height))
         {
             int xmargin = getSize().width - getClientCoord().width;
             int ymargin = getSize().height - getClientCoord().height;
-            setSize(MyGUI::IntSize(total_width+mPadding*2 + xmargin, total_height+mPadding*2 + ymargin));
+            setSize(MyGUI::IntSize(total_width + mPadding * 2 + xmargin, total_height + mPadding * 2 + ymargin));
             return;
         }
 
         int curY = 0;
         for (unsigned int i = 0; i < count; ++i)
         {
-            if (i==0)
+            if (i == 0)
                 curY += mPadding;
 
             MyGUI::Widget* w = getChildAt(i);
@@ -405,20 +406,21 @@ namespace Gui
             if (hidden)
                 continue;
 
-            bool hstretch = w->getUserString ("HStretch") == "true";
-            int maxWidth = getClientCoord().width - mPadding*2;
+            bool hstretch = w->getUserString("HStretch") == "true";
+            int maxWidth = getClientCoord().width - mPadding * 2;
             int width = hstretch ? maxWidth : sizes[i].first.width;
 
             MyGUI::IntCoord widgetCoord;
             widgetCoord.top = curY;
-            widgetCoord.left = mPadding + (getClientCoord().width-mPadding*2 - width) / 2;
+            widgetCoord.left = mPadding + (getClientCoord().width - mPadding * 2 - width) / 2;
 
             int height = 0;
             if (sizes[i].second)
             {
                 if (v_stretched_count == 0)
                     throw std::logic_error("unexpected");
-                height = sizes[i].first.height + (getClientCoord().height-mPadding*2 - total_height)/v_stretched_count;
+                height = sizes[i].first.height
+                    + (getClientCoord().height - mPadding * 2 - total_height) / v_stretched_count;
             }
             else
                 height = sizes[i].first.height;
@@ -428,26 +430,26 @@ namespace Gui
             w->setCoord(widgetCoord);
             curY += height;
 
-            if (i != count-1)
+            if (i != count - 1)
                 curY += mSpacing;
         }
     }
 
     void VBox::setPropertyOverride(const std::string& _key, const std::string& _value)
     {
-        if (!Box::_setPropertyImpl (_key, _value))
+        if (!Box::_setPropertyImpl(_key, _value))
             MyGUI::Widget::setPropertyOverride(_key, _value);
     }
 
-    void VBox::setSize (const MyGUI::IntSize& _value)
+    void VBox::setSize(const MyGUI::IntSize& _value)
     {
-        MyGUI::Widget::setSize (_value);
+        MyGUI::Widget::setSize(_value);
         align();
     }
 
-    void VBox::setCoord (const MyGUI::IntCoord& _value)
+    void VBox::setCoord(const MyGUI::IntCoord& _value)
     {
-        MyGUI::Widget::setCoord (_value);
+        MyGUI::Widget::setCoord(_value);
         align();
     }
 
@@ -459,10 +461,10 @@ namespace Gui
         setWidgetClient(client);
     }
 
-    MyGUI::IntSize VBox::getRequestedSize ()
+    MyGUI::IntSize VBox::getRequestedSize()
     {
-        MyGUI::IntSize size(0,0);
-        for (unsigned int i = 0; i < getChildCount (); ++i)
+        MyGUI::IntSize size(0, 0);
+        for (unsigned int i = 0; i < getChildCount(); ++i)
         {
             bool hidden = getChildAt(i)->getUserString("Hidden") == "true";
             if (hidden)
@@ -471,25 +473,25 @@ namespace Gui
             AutoSizedWidget* w = dynamic_cast<AutoSizedWidget*>(getChildAt(i));
             if (w)
             {
-                MyGUI::IntSize requested = w->getRequestedSize ();
+                MyGUI::IntSize requested = w->getRequestedSize();
                 size.width = std::max(size.width, requested.width);
                 size.height = size.height + requested.height;
-                if (i != getChildCount()-1)
+                if (i != getChildCount() - 1)
                     size.height += mSpacing;
             }
             else
             {
-                MyGUI::IntSize requested = getChildAt(i)->getSize ();
+                MyGUI::IntSize requested = getChildAt(i)->getSize();
                 size.width = std::max(size.width, requested.width);
 
                 if (getChildAt(i)->getUserString("VStretch") != "true")
                     size.height = size.height + requested.height;
 
-                if (i != getChildCount()-1)
+                if (i != getChildCount() - 1)
                     size.height += mSpacing;
             }
-            size.height += mPadding*2;
-            size.width += mPadding*2;
+            size.height += mPadding * 2;
+            size.width += mPadding * 2;
         }
         return size;
     }
diff --git a/components/widgets/box.hpp b/components/widgets/box.hpp
index 1b1b71f156..c004033eed 100644
--- a/components/widgets/box.hpp
+++ b/components/widgets/box.hpp
@@ -1,11 +1,11 @@
 #ifndef OPENMW_WIDGETS_BOX_H
 #define OPENMW_WIDGETS_BOX_H
 
-#include <MyGUI_Widget.h>
-#include <MyGUI_TextBox.h>
-#include <MyGUI_EditBox.h>
 #include <MyGUI_Button.h>
 #include <MyGUI_ComboBox.h>
+#include <MyGUI_EditBox.h>
+#include <MyGUI_TextBox.h>
+#include <MyGUI_Widget.h>
 
 #include "fontwrapper.hpp"
 
@@ -13,7 +13,7 @@ namespace Gui
 {
     class ComboBox : public FontWrapper<MyGUI::ComboBox>
     {
-        MYGUI_RTTI_DERIVED( ComboBox )
+        MYGUI_RTTI_DERIVED(ComboBox)
 
     protected:
         void setPropertyOverride(const std::string& _key, const std::string& _value) override;
@@ -21,23 +21,26 @@ namespace Gui
 
     class Button : public FontWrapper<MyGUI::Button>
     {
-        MYGUI_RTTI_DERIVED( Button )
+        MYGUI_RTTI_DERIVED(Button)
     };
 
     class TextBox : public FontWrapper<MyGUI::TextBox>
     {
-        MYGUI_RTTI_DERIVED( TextBox )
+        MYGUI_RTTI_DERIVED(TextBox)
     };
 
     class EditBox : public FontWrapper<MyGUI::EditBox>
     {
-        MYGUI_RTTI_DERIVED( EditBox )
+        MYGUI_RTTI_DERIVED(EditBox)
     };
 
     class AutoSizedWidget
     {
     public:
-        AutoSizedWidget() : mExpandDirection(MyGUI::Align::Right) {}
+        AutoSizedWidget()
+            : mExpandDirection(MyGUI::Align::Right)
+        {
+        }
 
         virtual MyGUI::IntSize getRequestedSize() = 0;
 
@@ -51,7 +54,7 @@ namespace Gui
 
     class AutoSizedTextBox : public AutoSizedWidget, public TextBox
     {
-        MYGUI_RTTI_DERIVED( AutoSizedTextBox )
+        MYGUI_RTTI_DERIVED(AutoSizedTextBox)
 
     public:
         MyGUI::IntSize getRequestedSize() override;
@@ -64,10 +67,9 @@ namespace Gui
 
     class AutoSizedEditBox : public AutoSizedWidget, public EditBox
     {
-        MYGUI_RTTI_DERIVED( AutoSizedEditBox )
+        MYGUI_RTTI_DERIVED(AutoSizedEditBox)
 
     public:
-
         MyGUI::IntSize getRequestedSize() override;
         void setCaption(const MyGUI::UString& _value) override;
 
@@ -84,7 +86,7 @@ namespace Gui
 
     class AutoSizedButton : public AutoSizedWidget, public Button
     {
-        MYGUI_RTTI_DERIVED( AutoSizedButton )
+        MYGUI_RTTI_DERIVED(AutoSizedButton)
 
     public:
         MyGUI::IntSize getRequestedSize() override;
@@ -122,20 +124,20 @@ namespace Gui
 
     class Spacer : public AutoSizedWidget, public MyGUI::Widget
     {
-        MYGUI_RTTI_DERIVED( Spacer )
+        MYGUI_RTTI_DERIVED(Spacer)
     public:
         Spacer();
 
-        MyGUI::IntSize getRequestedSize() override { return MyGUI::IntSize(0,0); }
+        MyGUI::IntSize getRequestedSize() override { return MyGUI::IntSize(0, 0); }
     };
 
     class HBox : public Box, public MyGUI::Widget
     {
-        MYGUI_RTTI_DERIVED( HBox )
+        MYGUI_RTTI_DERIVED(HBox)
 
     public:
-        void setSize (const MyGUI::IntSize &_value) override;
-        void setCoord (const MyGUI::IntCoord &_value) override;
+        void setSize(const MyGUI::IntSize& _value) override;
+        void setCoord(const MyGUI::IntCoord& _value) override;
 
     protected:
         void initialiseOverride() override;
@@ -150,11 +152,11 @@ namespace Gui
 
     class VBox : public Box, public MyGUI::Widget
     {
-        MYGUI_RTTI_DERIVED( VBox)
+        MYGUI_RTTI_DERIVED(VBox)
 
     public:
-        void setSize (const MyGUI::IntSize &_value) override;
-        void setCoord (const MyGUI::IntCoord &_value) override;
+        void setSize(const MyGUI::IntSize& _value) override;
+        void setCoord(const MyGUI::IntCoord& _value) override;
 
     protected:
         void initialiseOverride() override;
diff --git a/components/widgets/fontwrapper.hpp b/components/widgets/fontwrapper.hpp
index 3396792f34..e72b99a77b 100644
--- a/components/widgets/fontwrapper.hpp
+++ b/components/widgets/fontwrapper.hpp
@@ -7,35 +7,35 @@
 
 namespace Gui
 {
-    template<class T>
+    template <class T>
     class FontWrapper : public T
     {
     public:
         void setFontName(const std::string& name) override
         {
             T::setFontName(name);
-            T::setPropertyOverride ("FontHeight", getFontSize());
+            T::setPropertyOverride("FontHeight", getFontSize());
         }
 
     protected:
         void setPropertyOverride(const std::string& _key, const std::string& _value) override
         {
-            T::setPropertyOverride (_key, _value);
+            T::setPropertyOverride(_key, _value);
 
             // There is a bug in MyGUI: when it initializes the FontName property, it reset the font height.
             // We should restore it.
             if (_key == "FontName")
             {
-                T::setPropertyOverride ("FontHeight", getFontSize());
+                T::setPropertyOverride("FontHeight", getFontSize());
             }
         }
 
     private:
-
         std::string getFontSize()
         {
             // Note: we can not use the FontLoader here, so there is a code duplication a bit.
-            static const std::string fontSize = std::to_string(std::clamp(Settings::Manager::getInt("font size", "GUI"), 12, 18));
+            static const std::string fontSize
+                = std::to_string(std::clamp(Settings::Manager::getInt("font size", "GUI"), 12, 18));
             return fontSize;
         }
     };
diff --git a/components/widgets/imagebutton.cpp b/components/widgets/imagebutton.cpp
index 6d71588830..fc187a49bc 100644
--- a/components/widgets/imagebutton.cpp
+++ b/components/widgets/imagebutton.cpp
@@ -34,7 +34,7 @@ namespace Gui
         updateImage();
     }
 
-    void ImageButton::setPropertyOverride(const std::string &_key, const std::string &_value)
+    void ImageButton::setPropertyOverride(const std::string& _key, const std::string& _value)
     {
         if (_key == "ImageHighlighted")
             mImageHighlighted = _value;
@@ -99,8 +99,7 @@ namespace Gui
             const int height = static_cast<int>(std::round(mTextureRect.height * scale));
             setImageTile(MyGUI::IntSize(width, height));
             MyGUI::IntCoord scaledSize(static_cast<int>(std::round(mTextureRect.left * scale)),
-                                       static_cast<int>(std::round(mTextureRect.top * scale)),
-                                       width, height);
+                static_cast<int>(std::round(mTextureRect.top * scale)), width, height);
             setImageCoord(scaledSize);
         }
 
@@ -113,7 +112,7 @@ namespace Gui
         if (!texture)
         {
             Log(Debug::Error) << "ImageButton: can't find image " << mImageNormal;
-            return MyGUI::IntSize(0,0);
+            return MyGUI::IntSize(0, 0);
         }
 
         if (mUseWholeTexture)
@@ -122,7 +121,7 @@ namespace Gui
         return MyGUI::IntSize(mTextureRect.width, mTextureRect.height);
     }
 
-    void ImageButton::setImage(const std::string &image)
+    void ImageButton::setImage(const std::string& image)
     {
         size_t extpos = image.find_last_of('.');
         std::string imageNoExt = image.substr(0, extpos);
@@ -147,13 +146,13 @@ namespace Gui
         Base::onMouseButtonReleased(_left, _top, _id);
     }
 
-    void ImageButton::onKeySetFocus(MyGUI::Widget *_old)
+    void ImageButton::onKeySetFocus(MyGUI::Widget* _old)
     {
         mKeyFocus = true;
         updateImage();
     }
 
-    void ImageButton::onKeyLostFocus(MyGUI::Widget *_new)
+    void ImageButton::onKeyLostFocus(MyGUI::Widget* _new)
     {
         mKeyFocus = false;
         updateImage();
diff --git a/components/widgets/imagebutton.hpp b/components/widgets/imagebutton.hpp
index 6e3fc17335..923f168ba4 100644
--- a/components/widgets/imagebutton.hpp
+++ b/components/widgets/imagebutton.hpp
@@ -20,7 +20,8 @@ namespace Gui
 
         static void setDefaultNeedKeyFocus(bool enabled);
 
-        /// Set mImageNormal, mImageHighlighted and mImagePushed based on file convention (image_idle.ext, image_over.ext and image_pressed.ext)
+        /// Set mImageNormal, mImageHighlighted and mImagePushed based on file convention (image_idle.ext,
+        /// image_over.ext and image_pressed.ext)
         void setImage(const std::string& image);
 
         void setTextureRect(MyGUI::IntCoord coord);
diff --git a/components/widgets/list.cpp b/components/widgets/list.cpp
index 8f62efd26b..92cf237875 100644
--- a/components/widgets/list.cpp
+++ b/components/widgets/list.cpp
@@ -1,7 +1,7 @@
 #include "list.hpp"
 
-#include <MyGUI_Gui.h>
 #include <MyGUI_Button.h>
+#include <MyGUI_Gui.h>
 #include <MyGUI_ImageBox.h>
 
 namespace Gui
@@ -22,9 +22,9 @@ namespace Gui
         if (mClient == nullptr)
             mClient = this;
 
-        mScrollView = mClient->createWidgetReal<MyGUI::ScrollView>(
-            "MW_ScrollView", MyGUI::FloatCoord(0.0, 0.0, 1.0, 1.0),
-            MyGUI::Align::Top | MyGUI::Align::Left | MyGUI::Align::Stretch, getName() + "_ScrollView");
+        mScrollView
+            = mClient->createWidgetReal<MyGUI::ScrollView>("MW_ScrollView", MyGUI::FloatCoord(0.0, 0.0, 1.0, 1.0),
+                MyGUI::Align::Top | MyGUI::Align::Left | MyGUI::Align::Stretch, getName() + "_ScrollView");
     }
 
     void MWList::addItem(std::string_view name)
@@ -55,16 +55,15 @@ namespace Gui
         }
 
         mItemHeight = 0;
-        int i=0;
-        for (std::vector<std::string>::const_iterator it=mItems.begin();
-            it!=mItems.end(); ++it)
+        int i = 0;
+        for (std::vector<std::string>::const_iterator it = mItems.begin(); it != mItems.end(); ++it)
         {
             if (*it != "")
             {
                 if (mListItemSkin.empty())
                     return;
-                MyGUI::Button* button = mScrollView->createWidget<MyGUI::Button>(
-                    mListItemSkin, MyGUI::IntCoord(0, mItemHeight, mScrollView->getSize().width - scrollBarWidth - 2, 24),
+                MyGUI::Button* button = mScrollView->createWidget<MyGUI::Button>(mListItemSkin,
+                    MyGUI::IntCoord(0, mItemHeight, mScrollView->getSize().width - scrollBarWidth - 2, 24),
                     MyGUI::Align::Left | MyGUI::Align::Top, getName() + "_item_" + (*it));
                 button->setCaption((*it));
                 button->getSubWidgetText()->setWordWrap(true);
@@ -91,7 +90,8 @@ namespace Gui
             ++i;
         }
 
-        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the scrollbar is hidden
+        // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the
+        // scrollbar is hidden
         mScrollView->setVisibleVScroll(false);
         mScrollView->setCanvasSize(mClient->getSize().width, std::max(mItemHeight, mClient->getSize().height));
         mScrollView->setVisibleVScroll(true);
@@ -100,12 +100,12 @@ namespace Gui
             redraw(true);
 
         int viewRange = mScrollView->getCanvasSize().height;
-        if(viewPosition > viewRange)
+        if (viewPosition > viewRange)
             viewPosition = viewRange;
         mScrollView->setViewOffset(MyGUI::IntPoint(0, -viewPosition));
     }
 
-    void MWList::setPropertyOverride(const std::string &_key, const std::string &_value)
+    void MWList::setPropertyOverride(const std::string& _key, const std::string& _value)
     {
         if (_key == "ListItemSkin")
             mListItemSkin = _value;
@@ -126,8 +126,8 @@ namespace Gui
 
     void MWList::removeItem(const std::string& name)
     {
-        assert( std::find(mItems.begin(), mItems.end(), name) != mItems.end() );
-        mItems.erase( std::find(mItems.begin(), mItems.end(), name) );
+        assert(std::find(mItems.begin(), mItems.end(), name) != mItems.end());
+        mItems.erase(std::find(mItems.begin(), mItems.end(), name));
     }
 
     void MWList::clear()
@@ -137,11 +137,12 @@ namespace Gui
 
     void MWList::onMouseWheelMoved(MyGUI::Widget* _sender, int _rel)
     {
-        //NB view offset is negative
-        if (mScrollView->getViewOffset().top + _rel*0.3f > 0)
+        // NB view offset is negative
+        if (mScrollView->getViewOffset().top + _rel * 0.3f > 0)
             mScrollView->setViewOffset(MyGUI::IntPoint(0, 0));
         else
-            mScrollView->setViewOffset(MyGUI::IntPoint(0, static_cast<int>(mScrollView->getViewOffset().top + _rel*0.3)));
+            mScrollView->setViewOffset(
+                MyGUI::IntPoint(0, static_cast<int>(mScrollView->getViewOffset().top + _rel * 0.3)));
     }
 
     void MWList::onItemSelected(MyGUI::Widget* _sender)
diff --git a/components/widgets/list.hpp b/components/widgets/list.hpp
index 8d27d16ffa..a0df792696 100644
--- a/components/widgets/list.hpp
+++ b/components/widgets/list.hpp
@@ -30,7 +30,6 @@ namespace Gui
          */
         EventHandle_Widget eventWidgetSelected;
 
-
         /**
          * Call after the size of the list changed, or items were inserted/removed
          */
@@ -40,7 +39,8 @@ namespace Gui
         void addSeparator(); ///< add a seperator between the current and the next item.
         void removeItem(const std::string& name);
         unsigned int getItemCount();
-        std::string getItemNameAt(unsigned int at); ///< \attention if there are separators, this method will return "" at the place where the separator is
+        std::string getItemNameAt(unsigned int at); ///< \attention if there are separators, this method will return ""
+                                                    ///< at the place where the separator is
         void clear();
 
         MyGUI::Button* getItemWidget(std::string_view name);
diff --git a/components/widgets/numericeditbox.cpp b/components/widgets/numericeditbox.cpp
index c6ff9628ee..be031e4d83 100644
--- a/components/widgets/numericeditbox.cpp
+++ b/components/widgets/numericeditbox.cpp
@@ -20,7 +20,7 @@ namespace Gui
         eventEditTextChange -= MyGUI::newDelegate(this, &NumericEditBox::onEditTextChange);
     }
 
-    void NumericEditBox::onEditTextChange(MyGUI::EditBox *sender)
+    void NumericEditBox::onEditTextChange(MyGUI::EditBox* sender)
     {
         std::string newCaption = sender->getCaption();
         if (newCaption.empty())
@@ -84,12 +84,12 @@ namespace Gui
     {
         if (key == MyGUI::KeyCode::ArrowUp)
         {
-            setValue(std::min(mValue+1, mMaxValue));
+            setValue(std::min(mValue + 1, mMaxValue));
             eventValueChanged(mValue);
         }
         else if (key == MyGUI::KeyCode::ArrowDown)
         {
-            setValue(std::max(mValue-1, mMinValue));
+            setValue(std::max(mValue - 1, mMinValue));
             eventValueChanged(mValue);
         }
         else if (character == 0 || (character >= '0' && character <= '9'))
diff --git a/components/widgets/numericeditbox.hpp b/components/widgets/numericeditbox.hpp
index e1f33e887e..c8f363f8fd 100644
--- a/components/widgets/numericeditbox.hpp
+++ b/components/widgets/numericeditbox.hpp
@@ -17,8 +17,9 @@ namespace Gui
 
     public:
         NumericEditBox()
-            : mValue(0), mMinValue(std::numeric_limits<int>::min()),
-            mMaxValue(std::numeric_limits<int>::max())
+            : mValue(0)
+            , mMinValue(std::numeric_limits<int>::min())
+            , mMaxValue(std::numeric_limits<int>::max())
         {
         }
 
@@ -29,11 +30,12 @@ namespace Gui
         EventHandle_ValueChanged eventValueChanged;
 
         /// @note Does not trigger eventValueChanged
-        void setValue (int value);
+        void setValue(int value);
         int getValue();
 
         void setMinValue(int minValue);
         void setMaxValue(int maxValue);
+
     private:
         void onEditTextChange(MyGUI::EditBox* sender);
         void onKeyLostFocus(MyGUI::Widget* _new) override;
diff --git a/components/widgets/sharedstatebutton.cpp b/components/widgets/sharedstatebutton.cpp
index 91436a1b96..ff24db1cfb 100644
--- a/components/widgets/sharedstatebutton.cpp
+++ b/components/widgets/sharedstatebutton.cpp
@@ -18,7 +18,7 @@ namespace Gui
         }
     }
 
-    void SharedStateButton::shareStateWith(const ButtonGroup &shared)
+    void SharedStateButton::shareStateWith(const ButtonGroup& shared)
     {
         mSharedWith = shared;
     }
@@ -37,14 +37,14 @@ namespace Gui
         updateButtonState();
     }
 
-    void SharedStateButton::onMouseSetFocus(MyGUI::Widget *_old)
+    void SharedStateButton::onMouseSetFocus(MyGUI::Widget* _old)
     {
         mIsMouseFocus = true;
         Base::onMouseSetFocus(_old);
         updateButtonState();
     }
 
-    void SharedStateButton::onMouseLostFocus(MyGUI::Widget *_new)
+    void SharedStateButton::onMouseLostFocus(MyGUI::Widget* _new)
     {
         mIsMouseFocus = false;
         Base::onMouseLostFocus(_new);
@@ -68,7 +68,7 @@ namespace Gui
         }
     }
 
-    bool SharedStateButton::_setState(const std::string &_value)
+    bool SharedStateButton::_setState(const std::string& _value)
     {
         bool ret = _setWidgetState(_value);
         if (ret)
diff --git a/components/widgets/sharedstatebutton.hpp b/components/widgets/sharedstatebutton.hpp
index d643bf2430..688d949f6e 100644
--- a/components/widgets/sharedstatebutton.hpp
+++ b/components/widgets/sharedstatebutton.hpp
@@ -12,10 +12,11 @@ namespace Gui
 
     typedef std::vector<SharedStateButton*> ButtonGroup;
 
-    /// @brief A button that applies its own state changes to other widgets, to do this you define it as part of a ButtonGroup.
+    /// @brief A button that applies its own state changes to other widgets, to do this you define it as part of a
+    /// ButtonGroup.
     class SharedStateButton final : public FontWrapper<MyGUI::Button>
     {
-    MYGUI_RTTI_DERIVED(SharedStateButton)
+        MYGUI_RTTI_DERIVED(SharedStateButton)
 
     public:
         SharedStateButton();
@@ -31,10 +32,10 @@ namespace Gui
 
         void shutdownOverride() override;
 
-        bool _setState(const std::string &_value);
+        bool _setState(const std::string& _value);
 
     public:
-        void shareStateWith(const ButtonGroup &shared);
+        void shareStateWith(const ButtonGroup& shared);
 
         /// @note The ButtonGroup connection will be destroyed when any widget in the group gets destroyed.
         static void createButtonGroup(ButtonGroup group);
diff --git a/components/widgets/tags.cpp b/components/widgets/tags.cpp
index 93b0fca447..488913233c 100644
--- a/components/widgets/tags.cpp
+++ b/components/widgets/tags.cpp
@@ -7,53 +7,58 @@
 namespace Gui
 {
 
-bool replaceTag(const MyGUI::UString& tag, MyGUI::UString& out)
-{
-    std::string fontcolour = "fontcolour=";
-    size_t fontcolourLength = fontcolour.length();
+    bool replaceTag(const MyGUI::UString& tag, MyGUI::UString& out)
+    {
+        std::string fontcolour = "fontcolour=";
+        size_t fontcolourLength = fontcolour.length();
 
-    std::string fontcolourhtml = "fontcolourhtml=";
-    size_t fontcolourhtmlLength = fontcolourhtml.length();
+        std::string fontcolourhtml = "fontcolourhtml=";
+        size_t fontcolourhtmlLength = fontcolourhtml.length();
 
-    if (tag.compare(0, fontcolourLength, fontcolour) == 0)
-    {
-        std::string fallbackName = "FontColor_color_" + tag.substr(fontcolourLength);
-        std::string_view str = Fallback::Map::getString(fallbackName);
-        if (str.empty())
-            throw std::runtime_error("Unknown fallback name: " + fallbackName);
-
-        std::string ret[3];
-        unsigned int j=0;
-        for(unsigned int i=0;i<str.length();++i)
+        if (tag.compare(0, fontcolourLength, fontcolour) == 0)
         {
-            if(str[i]==',') j++;
-            else if (str[i] != ' ') ret[j]+=str[i];
+            std::string fallbackName = "FontColor_color_" + tag.substr(fontcolourLength);
+            std::string_view str = Fallback::Map::getString(fallbackName);
+            if (str.empty())
+                throw std::runtime_error("Unknown fallback name: " + fallbackName);
+
+            std::string ret[3];
+            unsigned int j = 0;
+            for (unsigned int i = 0; i < str.length(); ++i)
+            {
+                if (str[i] == ',')
+                    j++;
+                else if (str[i] != ' ')
+                    ret[j] += str[i];
+            }
+            MyGUI::Colour col(MyGUI::utility::parseInt(ret[0]) / 255.f, MyGUI::utility::parseInt(ret[1]) / 255.f,
+                MyGUI::utility::parseInt(ret[2]) / 255.f);
+            out = col.print();
+            return true;
         }
-        MyGUI::Colour col (MyGUI::utility::parseInt(ret[0])/255.f,MyGUI::utility::parseInt(ret[1])/255.f,MyGUI::utility::parseInt(ret[2])/255.f);
-        out = col.print();
-        return true;
-    }
-    else if (tag.compare(0, fontcolourhtmlLength, fontcolourhtml) == 0)
-    {
-        std::string fallbackName = "FontColor_color_" + tag.substr(fontcolourhtmlLength);
-        std::string_view str = Fallback::Map::getString(fallbackName);
-        if (str.empty())
-            throw std::runtime_error("Unknown fallback name: " + fallbackName);
-
-        std::string ret[3];
-        unsigned int j=0;
-        for(unsigned int i=0;i<str.length();++i)
+        else if (tag.compare(0, fontcolourhtmlLength, fontcolourhtml) == 0)
         {
-            if(str[i]==',') j++;
-            else if (str[i] != ' ') ret[j]+=str[i];
+            std::string fallbackName = "FontColor_color_" + tag.substr(fontcolourhtmlLength);
+            std::string_view str = Fallback::Map::getString(fallbackName);
+            if (str.empty())
+                throw std::runtime_error("Unknown fallback name: " + fallbackName);
+
+            std::string ret[3];
+            unsigned int j = 0;
+            for (unsigned int i = 0; i < str.length(); ++i)
+            {
+                if (str[i] == ',')
+                    j++;
+                else if (str[i] != ' ')
+                    ret[j] += str[i];
+            }
+            std::stringstream html;
+            html << "#" << std::hex << MyGUI::utility::parseInt(ret[0]) << MyGUI::utility::parseInt(ret[1])
+                 << MyGUI::utility::parseInt(ret[2]);
+            out = html.str();
+            return true;
         }
-        std::stringstream html;
-        html << "#" << std::hex << MyGUI::utility::parseInt(ret[0]) << MyGUI::utility::parseInt(ret[1]) << MyGUI::utility::parseInt(ret[2]);
-        out = html.str();
-        return true;
+        return false;
     }
-    return false;
-
-}
 
 }
diff --git a/components/widgets/tags.hpp b/components/widgets/tags.hpp
index 3914d2800a..8999cfa960 100644
--- a/components/widgets/tags.hpp
+++ b/components/widgets/tags.hpp
@@ -2,14 +2,14 @@
 #define OPENMW_WIDGETS_TAGS_H
 
 #include <MyGUI_UString.h>
-#include <string>
 #include <map>
+#include <string>
 
 namespace Gui
 {
 
-/// Try to replace a tag. Returns true on success and writes the result to \a out.
-bool replaceTag (const MyGUI::UString& tag, MyGUI::UString& out);
+    /// Try to replace a tag. Returns true on success and writes the result to \a out.
+    bool replaceTag(const MyGUI::UString& tag, MyGUI::UString& out);
 
 }
 
diff --git a/components/widgets/widgets.cpp b/components/widgets/widgets.cpp
index a5ff0b677d..8a7ebd9ccb 100644
--- a/components/widgets/widgets.cpp
+++ b/components/widgets/widgets.cpp
@@ -2,10 +2,10 @@
 
 #include <MyGUI_FactoryManager.h>
 
-#include "list.hpp"
-#include "numericeditbox.hpp"
 #include "box.hpp"
 #include "imagebutton.hpp"
+#include "list.hpp"
+#include "numericeditbox.hpp"
 #include "sharedstatebutton.hpp"
 #include "windowcaption.hpp"
 
diff --git a/components/widgets/windowcaption.cpp b/components/widgets/windowcaption.cpp
index 0fed4beadf..e7f2bb214c 100644
--- a/components/widgets/windowcaption.cpp
+++ b/components/widgets/windowcaption.cpp
@@ -24,7 +24,7 @@ namespace Gui
             throw std::runtime_error("WindowCaption needs an EditBox Client widget in its skin");
     }
 
-    void WindowCaption::setCaption(const MyGUI::UString &_value)
+    void WindowCaption::setCaption(const MyGUI::UString& _value)
     {
         EditBox::setCaption(_value);
         align();
@@ -48,7 +48,7 @@ namespace Gui
         MyGUI::Widget* caption = mClient;
         caption->setSize(textSize.width + 24, caption->getHeight());
 
-        int barwidth = (getWidth()-caption->getWidth())/2;
+        int barwidth = (getWidth() - caption->getWidth()) / 2;
         caption->setPosition(barwidth, caption->getTop());
         if (mLeft)
             mLeft->setCoord(0, mLeft->getTop(), barwidth, mLeft->getHeight());
diff --git a/components/widgets/windowcaption.hpp b/components/widgets/windowcaption.hpp
index 256c82831c..a86ca0cb87 100644
--- a/components/widgets/windowcaption.hpp
+++ b/components/widgets/windowcaption.hpp
@@ -14,7 +14,7 @@ namespace Gui
     public:
         WindowCaption();
 
-        void setCaption(const MyGUI::UString &_value) override;
+        void setCaption(const MyGUI::UString& _value) override;
         void initialiseOverride() override;
 
         void setSize(const MyGUI::IntSize& _value) override;